diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb index 9b7790c3fe..2a3c825e44 100644 --- a/app/models/spree/order.rb +++ b/app/models/spree/order.rb @@ -204,6 +204,9 @@ module Spree Spree::Money.new(total, 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 556160804b..8cdb778fec 100644 --- a/app/views/spree/orders/_totals_footer.html.haml +++ b/app/views/spree/orders/_totals_footer.html.haml @@ -25,6 +25,29 @@ = t :order_total_price %td.text-right.total %h5#order_total= order.display_total.to_html + %tr.total + %td.text-right{colspan: "3"} + %strong + = t :order_amount_paid + %td.text-right.total + %strong + = order.display_payment_total.to_html + - if order.outstanding_balance? && order.outstanding_balance > 0 + %tr.total + %td.text-right{colspan: "3"} + %h5.not-paid + = t :order_balance_due + %td.text-right.total.not-paid + %h5.not-paid + = order.display_outstanding_balance.to_html + - else + %tr.total + %td.text-right{colspan: "3"} + %h5 + = t :credit_owed + %td.text-right.total + %h5 + = order.display_outstanding_balance.to_html - if order.total_tax > 0 #tax diff --git a/app/views/spree/shared/_order_details.html.haml b/app/views/spree/shared/_order_details.html.haml index b3e5650984..de68929af7 100644 --- a/app/views/spree/shared/_order_details.html.haml +++ b/app/views/spree/shared/_order_details.html.haml @@ -1,10 +1,11 @@ .row .columns.large-6 .order-summary.text-small - .right - - if order.paid? + - if order.paid? + .right = t :order_paid - - else + - else + .right.not-paid = t :order_not_paid %span = t :order_total diff --git a/app/webpacker/css/darkswarm/checkout.scss b/app/webpacker/css/darkswarm/checkout.scss index 004a1cb917..a079de8059 100644 --- a/app/webpacker/css/darkswarm/checkout.scss +++ b/app/webpacker/css/darkswarm/checkout.scss @@ -108,3 +108,13 @@ checkout { } } } + +.not-paid { + color: #f40f0f; + font-weight: 700; +} + +.paid { + color: black; + font-weight: 400; +} \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index a0eb7aa5c0..b93a9b9563 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2206,7 +2206,9 @@ en: order_pickup_time: Ready for collection order_pickup_instructions: Collection Instructions order_produce: Produce + order_amount_paid: Amount Paid order_total_price: Total + order_balance_due: Balance Due order_includes_tax: (includes tax) order_payment_paypal_successful: Your payment via PayPal has been processed successfully. order_hub_info: Hub Info