effective_orders 6.18.2 → 6.18.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30573ea76732efc461d77ac72855675f2a8de7010a81e9d651fafaceb86c75c5
-  data.tar.gz: 605bb5659cb3b7faf9e0940ed59367b3abfc09535f9f42dcb4048594f1408c09
+  metadata.gz: 6d30ecbd0854168592005b06f14661ded4e48e61a8b4b4a181e652c0c3826cbc
+  data.tar.gz: 42506cd1c6268406fa3e7cb8802799905d5e10fc0ace73fd4982c7f8500cb9de
 SHA512:
-  metadata.gz: 4f14a09c4ea459f96eb727ac1b7bd8249e1fd42f087a1afca09e3c5705837ddb5ff7b859ab81e654a1e1607f5e4875a82ae8df58c846b50cef79b0296ce9e809
-  data.tar.gz: c2863834450dad29c443746f3dc4c0db11115ffb03796dd4e35d99d707e12bc81c15cc7d609625dd9ae222f42e276e8d8aa046c089fb0572b66862efa23ceb61
+  metadata.gz: bc88b76583abd395fda539b6a237218f3e625fc88f83c878b0d0d71e114a2002c701aaf574bee9cc179a15fd6d24a9291a642bf66c407c8e729a5783a4fc0595
+  data.tar.gz: 215adf0b221c134a2925c52ed4312ed1daec375cd0977db3a82464fe35e7bc9dff5c16e613c635faf7191a42398c856a3d9b72eb3cba5ea2085525377109a5d6

data/app/models/effective/order.rb

@@ -154,12 +154,14 @@ module Effective
     scope :pending_refunds, -> { not_purchased.where('total < ?', 0) }
 
     scope :delayed, -> { where(delayed_payment: true).where.not(delayed_payment_date: nil) }
+    scope :delayed_payment_provider, -> { where(payment_provider: EffectiveOrders.delayed_providers) }
     scope :delayed_payment_date_past, -> { delayed.where(arel_table[:delayed_payment_date].lteq(Time.zone.today)) }
     scope :delayed_payment_date_upcoming, -> { delayed.where(arel_table[:delayed_payment_date].gt(Time.zone.today)) }
 
     # Used by the rake effective_orders:purchase_delayed_orders task
     scope :delayed_ready_to_purchase, -> { 
-      delayed.deferred.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
@@ -196,7 +198,8 @@ module Effective
     validates :delayed_payment_date, presence: true, if: -> { delayed_payment? }
     validates :delayed_payment_date, absence: true, unless: -> { delayed_payment? }
 
-    with_options(if: -> { delayed? && deferred? }) do
+    # deluxe_delayed
+    with_options(if: -> { delayed? && deferred? && delayed_payment_provider? }) do
       validates :delayed_payment_intent, presence: { message: 'please provide your card information' }
       validates :delayed_payment_total, presence: true
     end
@@ -248,7 +251,7 @@ module Effective
       validates :payment_provider, presence: true
 
       validate do
-        unless EffectiveOrders.deferred_providers.include?(payment_provider) || EffectiveOrders.delayed_providers.include?(payment_provider)
+        unless deferred_payment_provider? || delayed_payment_provider?
           errors.add(:payment_provider, "unknown deferred payment provider") 
         end
       end
@@ -546,6 +549,14 @@ module Effective
     def refund?
       total.to_i < 0
     end
+
+    def delayed_payment_provider?
+      payment_provider.present? && EffectiveOrders.delayed_providers.include?(payment_provider)
+    end
+
+    def deferred_payment_provider?
+      payment_provider.present? && EffectiveOrders.deferred_providers.include?(payment_provider)
+    end
     
     # A new order is created.
     # If the delayed_payment and delayed_payment date are set, it's a delayed order
@@ -558,6 +569,7 @@ module Effective
     def delayed_ready_to_purchase?
       return false unless delayed? 
       return false unless deferred?
+      return false unless delayed_payment_provider?
       return false unless delayed_payment_intent.present?
       return false if delayed_payment_date_upcoming?
       return false if delayed_payment_purchase_ran_at.present? # We ran before and probably failed
@@ -566,7 +578,7 @@ module Effective
     end
 
     def delayed_payment_info
-      return unless delayed? && deferred?
+      return unless delayed? && deferred? && delayed_payment_provider?
       return unless delayed_payment_date_upcoming?
 
       "Your #{delayed_payment_method} will be charged $#{'%0.2f' % total_to_f} on #{delayed_payment_date.strftime('%F')}"
@@ -796,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/app/views/effective/orders/_checkout_step2.html.haml

@@ -12,6 +12,10 @@
   - if EffectiveOrders.delayed? && order.delayed_payment_date_upcoming?
     = render partial: '/effective/orders/delayed/form', locals: provider_locals
 
+    - if EffectiveOrders.deferred? && !controller_path.include?('admin/') && !local_assigns[:skip_deferred]
+      %p.my-4.text-center - or -
+      = render partial: '/effective/orders/deferred/form', locals: provider_locals
+
   - elsif EffectiveOrders.free? && order.free?
     = render partial: '/effective/orders/free/form', locals: provider_locals
 
@@ -41,8 +45,8 @@
       %p.my-4.text-center - or -
       = render partial: '/effective/orders/deferred/form', locals: provider_locals
 
-  - if EffectiveResources.authorized?(controller, :admin, :effective_orders) && controller_path.include?('admin/') && order.user != current_user
-    - if EffectiveOrders.delayed? && order.delayed? && order.deferred?
+  - if EffectiveResources.authorized?(controller, :admin, :effective_orders) && controller_path.include?('admin/')
+    - if EffectiveOrders.delayed? && order.delayed? && order.deferred? && order.delayed_payment_provider?
       .effective-order-admin-purchase-actions
         = render partial: '/effective/orders/delayed/form_purchase', locals: provider_locals
 

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

@@ -7,7 +7,7 @@
       %tbody
         %tr
           %td
-            - if order.delayed?
+            - if order.delayed? && order.delayed_payment_provider?
               %p Your #{order.delayed_payment_method} will be charged on #{order.delayed_payment_date.strftime('%F')}
             - else
               %p Waiting for payment by #{order.payment_provider}.

data/app/views/effective/orders/delayed/_form.html.haml

@@ -17,7 +17,7 @@
     
     - provider_locals = { order: order, deferred_url: deferred_url, declined_url: declined_url }
 
-    - if order.deferred? && order.delayed?
+    - if order.deferred? && order.delayed? && order.delayed_payment_provider?
       %p Your existing #{order.delayed_payment_method} will be charged on the payment date.
 
       = collapse('Change my card info') do

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.18.2'.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.2
+  version: 6.18.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-06 00:00:00.000000000 Z
+date: 2025-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails