effective_orders 6.19.0 → 6.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3879f534782ca13d9e41ecdc23919ab4b115e35ecfcff92ba36fe080129f64ec
-  data.tar.gz: 548b7af6a30b01ff4def2f8f0d47d18fd08a571113308b87465ca5561d10e835
+  metadata.gz: fe4877e8b611ca4cf5aae18c2f43d0e62a6dc333e76634c74d098efe952199b6
+  data.tar.gz: 7fdb4b4fda03ea47a941a032ee320fff2a6f432fd452e596bb2cfae40ed04569
 SHA512:
-  metadata.gz: 240a0c1162e876ffda52a2cc3278e23d4c032ec658790acac9f66765e7f9f6a911adefedd933fb7bf3237a2c296ff29ebee6c974fbaf7bb3f8c99b04d66b8159
-  data.tar.gz: 6940a82ad6bdfb23d1dffa2fbe73d210a7cac872829ac16d59ef52a5c43216815815b95a4b97301d47061bef9144273a16768a55fa6c56b15e77777b5165be2e
+  metadata.gz: 35d1d862fc154790c9e03ab1e01cd679340ae2c6da181cb26c6206fbaa6d6e3d1788e2b98516ba204e4e575ad98b12331ce81db0c41f5883fab3ca6ce99d1c70
+  data.tar.gz: 468b756bce436cacd7e9132d126edff379f61991dc984cc1ac140dec93750459caa379aedd184c9c5f846770d2566ecf16639c0f2980baa7557acf8746e72c63

data/app/models/effective/order.rb

@@ -810,7 +810,7 @@ module Effective
 
       # Went from delayed to cheque
       if delayed_payment? && !delayed_payment_provider?
-        assign_attributes(delayed_payment: false, delayed_payment_date: nil, delayed_payment_intent: nil, delayed_payment_total: nil)
+        assign_attributes(delayed_payment_intent: nil, delayed_payment_total: nil)
       end
 
       if current_user&.email.present?

data/app/views/effective/orders/deferred.html.haml

@@ -2,9 +2,26 @@
   %h1.effective-heading= @page_title
 
   %p.effective-orders-page-content
-    You have indicated that this order will be paid by #{@order.payment_provider}.
-    Your order will not be considered purchased until we receive your payment.
-    Please contact us at your earliest convenience.
+    - if @order.delayed? && @order.deferred? && @order.delayed_payment_provider?
+      %p 
+        = succeed('.') do
+          - distance = distance_of_time_in_words(Time.zone.now, @order.delayed_payment_date.beginning_of_day)
+
+          The payment date for this order
+
+          - if @order.delayed_payment_date_upcoming?
+            is in #{distance} from now on #{@order.delayed_payment_date.strftime('%F')}
+          - elsif @order.delayed_payment_date_today?
+            was today
+          - else
+            was #{distance} ago on #{@order.delayed_payment_date.strftime('%F')}
+
+      %p Your existing #{@order.delayed_payment_method} will be charged on the payment date.
+
+    - elsif @order.deferred?
+      You have indicated that this order will be paid by #{@order.payment_provider}.
+      Your order will not be considered purchased until we receive your payment.
+      Please contact us at your earliest convenience.
 
   = render @order
 

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.19.0'.freeze
+  VERSION = '6.19.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.19.0
+  version: 6.19.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-16 00:00:00.000000000 Z
+date: 2025-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails