From 828aac9a49ecf9ccae7f6f3cc35ee20dcefe715d Mon Sep 17 00:00:00 2001 From: "adam.harbas@a-net.ba" Date: Tue, 12 Jan 2016 15:43:11 +0100 Subject: [PATCH] Gift info added to trello --- back-office/app/models/cart.rb | 5 +++-- front-api/views/cart_trello.erb | 12 ++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/back-office/app/models/cart.rb b/back-office/app/models/cart.rb index 299a08a..82b6b77 100644 --- a/back-office/app/models/cart.rb +++ b/back-office/app/models/cart.rb @@ -5,7 +5,9 @@ class Cart < ActiveRecord::Base belongs_to :delivery_destination 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 place.instant_delivery_price else @@ -21,5 +23,4 @@ class Cart < ActiveRecord::Base def confirmed_at delivery_destination.updated_at.in_time_zone('Europe/Sarajevo') end - end diff --git a/front-api/views/cart_trello.erb b/front-api/views/cart_trello.erb index f26709e..8f1bfa4 100644 --- a/front-api/views/cart_trello.erb +++ b/front-api/views/cart_trello.erb @@ -22,6 +22,18 @@ Bosna i Hercegovina **Napomena: ** <%= 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") %>