diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb index f68dbe3d78..968f2abc4f 100644 --- a/app/models/spree/order.rb +++ b/app/models/spree/order.rb @@ -188,6 +188,9 @@ module Spree Spree::Money.new(total, currency: currency) end + def display_payment_total + Spree::Money.new(self.payment_total, currency: currency) + end def to_param number.to_s.parameterize.upcase end diff --git a/app/views/spree/orders/_totals_footer.html.haml b/app/views/spree/orders/_totals_footer.html.haml index deb971881d..e3e0497c7c 100644 --- a/app/views/spree/orders/_totals_footer.html.haml +++ b/app/views/spree/orders/_totals_footer.html.haml @@ -25,18 +25,18 @@ %h5#order_total= order.display_total.to_html %tr.total %td.text-right{colspan: "3"} - %h5 + %strong = t :order_amount_paid %td.text-right.total - %h5 - = order.payment_total + %strong + = order.display_payment_total.to_html - if order.outstanding_balance? %tr.total %td.text-right{colspan: "3"} %h5.not-paid = t :order_balance_due %td.text-right.total.not-paid - %h5.not-paid#balance_due + %h5.not-paid = order.display_outstanding_balance.to_html diff --git a/app/views/spree/shared/_order_details.html.haml b/app/views/spree/shared/_order_details.html.haml index 677c0005e7..aa60cfb8df 100644 --- a/app/views/spree/shared/_order_details.html.haml +++ b/app/views/spree/shared/_order_details.html.haml @@ -2,7 +2,7 @@ .columns.large-6 .order-summary.text-small - if order.paid? - .right.paid + .right = t :order_paid - else .right.not-paid