raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-24 05:38:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

On order confirmation page and email, display distributor details instead of misc fields. HACK - this should be in the engine, not in the main app. FIXME

Browse Source
This commit is contained in:
Rohan Mitchell
2013-05-18 19:54:27 +10:00
parent d65dda4dc5
commit b7f7766893
2 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/views/spree/order_mailer/confirm_email.text.erb
View File

@@ -1,4 +1,4 @@
Dear <%= @order.bill_address.firstname %>,
Dear <%= @order.bill_address.firstname %>,
Please review and retain the following order information for your records.
@@ -22,20 +22,10 @@ Payment Details
============================================================
<%= @order.payment_method.description.html_safe %>
<% end %>
<% end %>
============================================================
Collection / Delivery Details
============================================================
Address:
<%= @order.distributor.name %>
<% address = @order.distributor.address %>
<%= address.address1 %> <%= ",\n #{address.address2}" unless address.address2.blank? %>
<%= [address.city, address.state_text, address.zipcode, address.country.name].compact.join ', ' %>
Collection time:
<%= @order.distributor.next_collection_at %>
Contact:
<%= @order.distributor.contact %>
<%= "Phone: #{@order.distributor.phone}" %>
<%= "Email: #{@order.distributor.email}" %>
<%= strip_tags render :partial => 'enterprises/distributor_details', :formats => :html, :locals => {:distributor => @order.distributor} %>
Thank you for your business.
Thank you for your support.

5
app/views/spree/shared/_order_details_steps_data.html.erb
View File

@@ -11,8 +11,7 @@
<div class="columns alpha six">
<h6><%= "Distributor Details" %> <%# link_to "(#{t(:edit)})", checkout_state_path(:address) unless @order.completed? %></h6>
<div class="address">
Distributor: <%= order.distributor.name %><br />
Address: <%= order.distributor.address.address1 + ", " + order.distributor.address.city %>
<%= render 'enterprises/distributor_details', :distributor => order.distributor %>
</div>
</div>
@@ -46,4 +45,4 @@
<% end %>
</div>
</div>
</div>
</div>