diff --git a/back-office/app/controllers/carts_controller.rb b/back-office/app/controllers/carts_controller.rb
index 3cc7ee2..b09386b 100644
--- a/back-office/app/controllers/carts_controller.rb
+++ b/back-office/app/controllers/carts_controller.rb
@@ -1,4 +1,5 @@
class CartsController < ApplicationController
active_scaffold :"cart" do |conf|
end
+
end
diff --git a/back-office/app/helpers/carts_helper.rb b/back-office/app/helpers/carts_helper.rb
index d0fea14..ee41104 100644
--- a/back-office/app/helpers/carts_helper.rb
+++ b/back-office/app/helpers/carts_helper.rb
@@ -1,2 +1,6 @@
module CartsHelper
+
+ def money(amount)
+ sprintf('%.2f KM', amount.to_f)
+ end
end
\ No newline at end of file
diff --git a/back-office/app/models/cart.rb b/back-office/app/models/cart.rb
index fc67258..299a08a 100644
--- a/back-office/app/models/cart.rb
+++ b/back-office/app/models/cart.rb
@@ -4,7 +4,22 @@ class Cart < ActiveRecord::Base
belongs_to :user
belongs_to :delivery_destination
+ def delivery_cost
+ place = Place.by_code_or_default(delivery_destination.place)
+ if delivery_destination.instant_delivery
+ place.instant_delivery_price
+ else
+ place.delivery_price
+ end
+ end
-
+ def total
+ sum = item_in_carts.inject (0) { |sum, iic| sum + (iic.price * iic.count) }
+ sum += delivery_cost
+ end
+
+ def confirmed_at
+ delivery_destination.updated_at.in_time_zone('Europe/Sarajevo')
+ end
end
diff --git a/back-office/app/models/place.rb b/back-office/app/models/place.rb
index 28f3f80..b92e8f9 100644
--- a/back-office/app/models/place.rb
+++ b/back-office/app/models/place.rb
@@ -521,4 +521,13 @@ class Place < ActiveRecord::Base
return "
+ Ime: <%= dd.name %> Adresa: Email: <%= dd.email %> Telefon: +387 <%= dd.phone %> Napomena:
+<%= dd.address %>
+<%= dd.place.to_s.strip %> <%= Place.name_from_code(dd.place.to_s) %>
+Bosna i Hercegovina
+
+
+
+<%= dd.note %>
+
+Naručeno: <%= c.confirmed_at.strftime("%A %d.%m.%Y. %H:%M") %>
+
+
+
+OVO JE NARUDŽBA ZA INSTANT DOSTAVU +
+<% end %> + +| Code | +Item name | +Amount | +Price | +Total | +
|---|---|---|---|---|
| <%= iic.item.code %> | +<%= iic.item.name %> | +<%= iic.count %> | +<%= money(iic.price) %> | +<%= money(iic.count * iic.price) %> | +
| + | Dostava | +1 | +<%= money(c.delivery_cost) %> | +<%= money(c.delivery_cost) %> | +
| UKUPNO: | ++ | + | + | <%= money(c.total) %> | +