From 3039ef5535947608c3da152ecbbf7432e6477314 Mon Sep 17 00:00:00 2001 From: lauriejefferson Date: Fri, 23 Jun 2023 12:06:45 -0400 Subject: [PATCH] updated order partials and locales --- app/views/spree/orders/_totals_footer.html.haml | 10 +++++++++- app/views/spree/shared/_order_details.html.haml | 2 +- config/locales/en.yml | 2 ++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/views/spree/orders/_totals_footer.html.haml b/app/views/spree/orders/_totals_footer.html.haml index 68a6b8ba33..00570794d3 100644 --- a/app/views/spree/orders/_totals_footer.html.haml +++ b/app/views/spree/orders/_totals_footer.html.haml @@ -23,12 +23,20 @@ = t :order_total_price %td.text-right.total %h5#order_total= order.display_total.to_html + %tr.total + %td.text-right{colspan: "3"} + %h5 + = t :order_amount_paid + %td.text-right.total + %h5 + = order.payment_total %tr.total %td.text-right{colspan: "3"} %h5.not-paid = t :order_balance_due %td.text-right.total.not-paid - %h5#order_balance + %h5.not-paid#balance_due + = order.display_outstanding_balance.to_html - if order.total_tax > 0 diff --git a/app/views/spree/shared/_order_details.html.haml b/app/views/spree/shared/_order_details.html.haml index b559074bf5..bf5118af91 100644 --- a/app/views/spree/shared/_order_details.html.haml +++ b/app/views/spree/shared/_order_details.html.haml @@ -1,7 +1,7 @@ .row .columns.large-6 .order-summary.text-small - .right + .right.not-paid - if order.paid? = t :order_paid - else diff --git a/config/locales/en.yml b/config/locales/en.yml index 7138fa4759..35d3efac67 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2125,7 +2125,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