effective_orders 6.18.3 → 6.18.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db369e138fd81a06777542fe77c48ac02e78afce689814c6e077e2d5dca7eb70
-  data.tar.gz: 3bf2190e5199a568bba9dd26900193f589cc5260ebf4a042192f72e0154b340d
+  metadata.gz: 6d30ecbd0854168592005b06f14661ded4e48e61a8b4b4a181e652c0c3826cbc
+  data.tar.gz: 42506cd1c6268406fa3e7cb8802799905d5e10fc0ace73fd4982c7f8500cb9de
 SHA512:
-  metadata.gz: c7c3b27cecbb229a85f3dd4bb68e78869ac4fd7a9d25973fad201660efd9ce7af79b834c9ca4c19011a9c379ea4abcb01ceb84721f777ff4fb65ff3d8cbdf305
-  data.tar.gz: 470be08bf37435f36f12e31c7118f70545821f1a52357a9c7cc5e51143a50a73cff32b18497cbedb122d63fca021cabb1f2acfa27c62235c05f787ce8e8dcd5a
+  metadata.gz: bc88b76583abd395fda539b6a237218f3e625fc88f83c878b0d0d71e114a2002c701aaf574bee9cc179a15fd6d24a9291a642bf66c407c8e729a5783a4fc0595
+  data.tar.gz: 215adf0b221c134a2925c52ed4312ed1daec375cd0977db3a82464fe35e7bc9dff5c16e613c635faf7191a42398c856a3d9b72eb3cba5ea2085525377109a5d6

data/app/models/effective/order.rb

@@ -160,7 +160,8 @@ module Effective
 
     # Used by the rake effective_orders:purchase_delayed_orders task
     scope :delayed_ready_to_purchase, -> { 
-      delayed.deferred.delayed_payment_provider.delayed_payment_date_past.where(delayed_payment_purchase_ran_at: nil)
+      delayed.deferred.delayed_payment_provider.delayed_payment_date_past
+        .where(delayed_payment_purchase_ran_at: nil).where.not(delayed_payment_intent: nil)
     }
 
     # effective_reports
@@ -807,6 +808,11 @@ module Effective
         deferred_by: (deferred_by.presence || current_user)
       )
 
+      # 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)
+      end
+
       if current_user&.email.present?
         assign_attributes(email: current_user.email)
       end

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.18.3'.freeze
+  VERSION = '6.18.4'.freeze
 end

metadata

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