From ee482d520c9d0f4215516869e0fa3339f8648598 Mon Sep 17 00:00:00 2001 From: Rob H Date: Fri, 23 Nov 2012 10:51:14 +1100 Subject: [PATCH] Replace order information display for Confirm and Complete stages of checkout --- app/assets/stylesheets/store/openfoodweb.css.scss | 5 +++++ .../spree/shared/_order_details_steps_data.html.erb | 11 ++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/store/openfoodweb.css.scss b/app/assets/stylesheets/store/openfoodweb.css.scss index 24c0b1fd5a..5af6ca1b33 100644 --- a/app/assets/stylesheets/store/openfoodweb.css.scss +++ b/app/assets/stylesheets/store/openfoodweb.css.scss @@ -225,3 +225,8 @@ fieldset#product-distributor-details { } } } + +/* Alert for EFT Payment during checkout process */ +div#eft-payment-alert { + border: 2px solid red; +} diff --git a/app/views/spree/shared/_order_details_steps_data.html.erb b/app/views/spree/shared/_order_details_steps_data.html.erb index 04e8d4d65a..96214287f8 100644 --- a/app/views/spree/shared/_order_details_steps_data.html.erb +++ b/app/views/spree/shared/_order_details_steps_data.html.erb @@ -9,7 +9,7 @@
-
<%= "Distributor Details" %> <%=# link_to "(#{t(:edit)})", checkout_state_path(:address) unless @order.completed? %>
+
<%= "Distributor Details" %> <%# link_to "(#{t(:edit)})", checkout_state_path(:address) unless @order.completed? %>
Distributor: <%= order.distributor.name %>
Address: <%= order.distributor.address.address1 + ", " + order.distributor.address.city %> @@ -24,16 +24,13 @@
-->
-
+
id="eft-payment-alert"<% end %>>
<%= t(:payment_information) %> <%= link_to "(#{t(:edit)})", checkout_state_path(:payment) unless @order.completed? %>
<% if order.payment_method.name.include? "PayPal" %> -
Your payment via Paypal has been processed successfully.
+
Your payment via PayPal has been processed successfully.
<% elsif order.payment_method.name.include? "EFT" %> - Please pay by direct debit:

- Eaterprises Australia
- BSB: XXX-XXX
- Acct: XXXXXXX + <%= order.payment_method.description.html_safe %> <% elsif order.creditcards.empty? == false %> <%= image_tag "creditcards/icons/#{order.creditcards.first.cc_type}.png" %>