senaduka/old-ribica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gift info added to trello

Browse Source
This commit is contained in:
adam.harbas@a-net.ba
2016-01-12 15:43:11 +01:00
parent 54d7cdb04e
commit 828aac9a49
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
back-office/app/models/cart.rb
View File

@@ -5,7 +5,9 @@ class Cart < ActiveRecord::Base
belongs_to :delivery_destination belongs_to :delivery_destination
def delivery_cost def delivery_cost
place = Place.by_code_or_default(delivery_destination.place) place = delivery_destination.gift ? Place.by_code_or_default(delivery_destination.recipient_place)
: Place.by_code_or_default(delivery_destination.place)
if delivery_destination.instant_delivery if delivery_destination.instant_delivery
place.instant_delivery_price place.instant_delivery_price
else else
@@ -21,5 +23,4 @@ class Cart < ActiveRecord::Base
def confirmed_at def confirmed_at
delivery_destination.updated_at.in_time_zone('Europe/Sarajevo') delivery_destination.updated_at.in_time_zone('Europe/Sarajevo')
end end
end end

12
front-api/views/cart_trello.erb
View File

@@ -22,6 +22,18 @@ Bosna i Hercegovina
**Napomena: ** **Napomena: **
<%= dd.note %> <%= dd.note %>
<% if dd.gift %>
**Poklon **
**Name: **<%= dd.recipient_name %>
**Postal code: **<%= dd.recipient_postal_code %>
**Place: **<%= dd.recipient_place %>
**Address: **<%= dd.recipient_address %>
**Phone: **<%= dd.recipient_phone %>
**Email: **<%= dd.recipient_email %>
<% end %>
<% if dd.instant_delivery %>
**Naručeno:** <%= @cart.updated_at.in_time_zone("Europe/Sarajevo").strftime("%A %d.%m.%Y. %H:%M") %> **Naručeno:** <%= @cart.updated_at.in_time_zone("Europe/Sarajevo").strftime("%A %d.%m.%Y. %H:%M") %>