From d3dba87ca186b7336a05ed6ba59030ff8f2d3e5a Mon Sep 17 00:00:00 2001 From: lauriejefferson Date: Wed, 21 Jun 2023 17:22:12 -0400 Subject: [PATCH 1/6] added styling and table rows for 'Not Paid' order confirmation' --- app/views/spree/orders/_totals_footer.html.haml | 7 +++++++ app/webpacker/css/darkswarm/checkout.scss | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/app/views/spree/orders/_totals_footer.html.haml b/app/views/spree/orders/_totals_footer.html.haml index ab8130210e..68a6b8ba33 100644 --- a/app/views/spree/orders/_totals_footer.html.haml +++ b/app/views/spree/orders/_totals_footer.html.haml @@ -23,6 +23,13 @@ = t :order_total_price %td.text-right.total %h5#order_total= order.display_total.to_html + %tr.total + %td.text-right{colspan: "3"} + %h5.not-paid + = t :order_balance_due + %td.text-right.total.not-paid + %h5#order_balance + - if order.total_tax > 0 #tax diff --git a/app/webpacker/css/darkswarm/checkout.scss b/app/webpacker/css/darkswarm/checkout.scss index 004a1cb917..b6206ce02a 100644 --- a/app/webpacker/css/darkswarm/checkout.scss +++ b/app/webpacker/css/darkswarm/checkout.scss @@ -108,3 +108,8 @@ checkout { } } } + +.not-paid { + color: #f40f0f; + font-weight: 700; +} \ No newline at end of file From 3039ef5535947608c3da152ecbbf7432e6477314 Mon Sep 17 00:00:00 2001 From: lauriejefferson Date: Fri, 23 Jun 2023 12:06:45 -0400 Subject: [PATCH 2/6] 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 From 7320bb5af1787a5a049370863b806f487984f7e9 Mon Sep 17 00:00:00 2001 From: lauriejefferson Date: Thu, 28 Sep 2023 20:02:58 -0400 Subject: [PATCH 3/6] removed styling for paid orders and removed row for non oustanding balance --- app/views/spree/orders/_totals_footer.html.haml | 1 + app/views/spree/shared/_order_details.html.haml | 7 ++++--- app/webpacker/css/darkswarm/checkout.scss | 5 +++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/views/spree/orders/_totals_footer.html.haml b/app/views/spree/orders/_totals_footer.html.haml index 00570794d3..deb971881d 100644 --- a/app/views/spree/orders/_totals_footer.html.haml +++ b/app/views/spree/orders/_totals_footer.html.haml @@ -30,6 +30,7 @@ %td.text-right.total %h5 = order.payment_total + - if order.outstanding_balance? %tr.total %td.text-right{colspan: "3"} %h5.not-paid diff --git a/app/views/spree/shared/_order_details.html.haml b/app/views/spree/shared/_order_details.html.haml index bf5118af91..677c0005e7 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.not-paid - - if order.paid? + - if order.paid? + .right.paid = 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 b6206ce02a..a079de8059 100644 --- a/app/webpacker/css/darkswarm/checkout.scss +++ b/app/webpacker/css/darkswarm/checkout.scss @@ -112,4 +112,9 @@ checkout { .not-paid { color: #f40f0f; font-weight: 700; +} + +.paid { + color: black; + font-weight: 400; } \ No newline at end of file From 0cda8d7d4c61ed4ae49b1806b50947f700f127d0 Mon Sep 17 00:00:00 2001 From: lauriejefferson Date: Wed, 4 Oct 2023 09:30:05 -0400 Subject: [PATCH 4/6] removed paid styling and added currency formatter to payment_total --- app/models/spree/order.rb | 3 +++ app/views/spree/orders/_totals_footer.html.haml | 8 ++++---- app/views/spree/shared/_order_details.html.haml | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) 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 From e056ba42dba16935eea652c34958a4cc7fcf944c Mon Sep 17 00:00:00 2001 From: lauriejefferson Date: Tue, 10 Oct 2023 17:14:16 -0400 Subject: [PATCH 5/6] added 'credit owed' label and removed red styling when balance <= 0 --- app/views/spree/orders/_totals_footer.html.haml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/views/spree/orders/_totals_footer.html.haml b/app/views/spree/orders/_totals_footer.html.haml index e3e0497c7c..360f9dbe0e 100644 --- a/app/views/spree/orders/_totals_footer.html.haml +++ b/app/views/spree/orders/_totals_footer.html.haml @@ -30,7 +30,7 @@ %td.text-right.total %strong = order.display_payment_total.to_html - - if order.outstanding_balance? + - if order.outstanding_balance? && order.outstanding_balance > 0 %tr.total %td.text-right{colspan: "3"} %h5.not-paid @@ -38,6 +38,15 @@ %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.not-paid + %h5 + = order.display_outstanding_balance.to_html + - if order.total_tax > 0 From 43232a5d6311843b9b59bf5434a419fd0b1d97d2 Mon Sep 17 00:00:00 2001 From: lauriejefferson Date: Thu, 12 Oct 2023 11:50:30 -0400 Subject: [PATCH 6/6] removed not-paid styling for credit owed --- app/views/spree/orders/_totals_footer.html.haml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/views/spree/orders/_totals_footer.html.haml b/app/views/spree/orders/_totals_footer.html.haml index 360f9dbe0e..6738feca13 100644 --- a/app/views/spree/orders/_totals_footer.html.haml +++ b/app/views/spree/orders/_totals_footer.html.haml @@ -43,12 +43,10 @@ %td.text-right{colspan: "3"} %h5 = t :credit_owed - %td.text-right.total.not-paid + %td.text-right.total %h5 = order.display_outstanding_balance.to_html - - - if order.total_tax > 0 #tax %tr#tax-row.total