updated to spree 0.9
This commit is contained in:
parent
33b071798d
commit
35dffb780b
|
@ -7,22 +7,31 @@
|
|||
|
||||
<%= render :partial => 'admin/shared/order_details', :locals => {:order => @order} -%>
|
||||
|
||||
<% unless @order.payments.empty? %>
|
||||
<% if @order.bill_address %>
|
||||
<div class='adr'>
|
||||
<%# look at the most recent (= up to date) payment %>
|
||||
<% payment = @order.payments.last %>
|
||||
<% if payment.class == CreditcardPayment %>
|
||||
<h4><%= link_to t("bill_address"), edit_admin_order_creditcard_payment_url(@order, payment) %></h4>
|
||||
<h4>
|
||||
<%= link_to t("bill_address"), edit_admin_order_creditcard_payment_url(@order, @order.creditcard_payments.last) if @order.creditcard_payments.present? %>
|
||||
<%= t("bill_address") if @order.creditcard_payments.empty? %>
|
||||
</h4>
|
||||
<%= render :partial => 'admin/shared/address', :locals => {:address => @order.bill_address} %>
|
||||
<% else %>
|
||||
<% url = edit_admin_order_paypal_payment_url(@order) %> <%#, payment) %>
|
||||
<h4><%= link_to t("edit_paypal_info"), edit_admin_order_paypal_payment_url(@order, payment) %></h4>
|
||||
<% end %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<% if (payment = @order.payments.last).class != CreditcardPayment %>
|
||||
<%# look at the most recent (= up to date) payment for paypal %>
|
||||
<% url = edit_admin_order_paypal_payment_url(@order) %> <%#, payment) %>
|
||||
<div class='adr'>
|
||||
<h4><%= link_to t("edit_paypal_info"), edit_admin_order_paypal_payment_url(@order, payment) %></h4>
|
||||
(no billing address available)
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<% if @order.ship_address %>
|
||||
<div class='adr'>
|
||||
<h4><%= link_to t("ship_address"), edit_admin_order_shipment_url(@order, @order.shipments.last) %></h4>
|
||||
<h4>
|
||||
<%= link_to t("ship_address"), edit_admin_order_shipment_url(@order, @order.shipments.last) if @order.shipments.present? %>
|
||||
<%= t("ship_address") if @order.shipments.empty? %>
|
||||
</h4>
|
||||
<%= render :partial => 'admin/shared/address', :locals => {:address => @order.ship_address} %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
|
Loading…
Reference in New Issue