effective_orders 6.12.3 → 6.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f5fbabf9c4012193962576f7ef67838e17e382740ad3860ab9c9f527ce86787
-  data.tar.gz: 71f6af17259b5b62ee66b2fd993bb085dc8411ad8040c21fa0a3bc639381c655
+  metadata.gz: 6d365ebd0599f72ed9c5bbf7e9e9f26284647135153befe60799452b87fc1e0c
+  data.tar.gz: 913c9fa4e2d528382652c297d6806fb827c79974baebb9890ddd1854449f98d1
 SHA512:
-  metadata.gz: 60eff8ba4e046b46575a23c98daf14b0ba07cf548041826590ac49c3bf193cde6632437baeae38bfe011f37a3cae0e7d3d5d444aeeb0340a0990d1c93a88ce2b
-  data.tar.gz: 9b91126b76b01d50fefc86b31d1a163dfe8164c523f69a2c3a523a827c632faaf0b0b5e13e0174b01450078dd32754a76157b5c4338b39b16b47a10ca1d25c59
+  metadata.gz: d5fde239931a219f5e15a29a085dd4f056f12174fb4e6331b5b05369d8798518781e7eddae549edb3d3e8d34a9a8a18896a6a271fa0883a15161f75766cad95b
+  data.tar.gz: 2b0daaa3d6a0b0111efe48cac3db3d2b0073a3a8ed3b51ec5e9beaeaadaee604ae515cdc5c309b33c8a4ad28598bfcbdd3c6f345aa95052543588f31dcc1a6bc

data/app/helpers/effective_orders_helper.rb

@@ -45,7 +45,7 @@ module EffectiveOrdersHelper
     when :deluxe
       'Pay Now'
     when :deluxe_delayed
-      'Save now and charge me later'
+      'Save card and charge me later'
     when :etransfer
       'Pay by E-transfer'
     when :free

data/app/models/concerns/acts_as_purchasable_parent.rb

@@ -39,8 +39,19 @@ module ActsAsPurchasableParent
   end
 
   included do
-    has_many :orders, -> { order(:id) }, as: :parent, class_name: 'Effective::Order', dependent: :nullify
+    has_many :orders, -> { order(:id) }, as: :parent, class_name: 'Effective::Order'
+
     accepts_nested_attributes_for :orders
+
+    before_destroy do
+      orders.each do |order|
+        raise('unable to destroy a purchasable_parent with purchased orders') if order.purchased?
+        order.voided? ? order.save! : order.void!
+      end
+
+      true
+    end
+
   end
 
 end

data/app/models/effective/order.rb

@@ -548,13 +548,20 @@ module Effective
       return false unless delayed? 
       return false unless deferred?
       return false unless delayed_payment_intent.present?
-      return false if delayed_payment_date_future?
+      return false if delayed_payment_date_upcoming?
       return false if delayed_payment_purchase_ran_at.present? # We ran before and probably failed
 
       true
     end
 
-    def delayed_payment_date_future?
+    def delayed_payment_info
+      return unless delayed? && deferred?
+      return unless delayed_payment_date_upcoming?
+
+      "Your #{delayed_payment_method} will be charged on #{delayed_payment_date.strftime('%F')} for the full amount of $#{'%0.2f' % total_to_f}"
+    end
+
+    def delayed_payment_date_upcoming?
       return false unless delayed?
       delayed_payment_date > Time.zone.now.to_date
     end
@@ -832,6 +839,15 @@ module Effective
       unvoided!(skip_buyer_validations: true)
     end
 
+    def deluxe_delayed_purchase!
+      raise('expected a delayed order') unless delayed?
+      raise('expected a deferred order') unless deferred?
+      raise('expected delayed payment intent') unless delayed_payment_intent.present?
+      raise('expected a deluxe_delayed payment provider') unless payment_provider == 'deluxe_delayed'
+
+      Effective::DeluxeApi.new().purchase_delayed_orders!(self)
+    end
+
     # These are all the emails we send all notifications to
     def emails
       ([purchased_by.try(:email)] + [email] + [user.try(:email)] + Array(organization.try(:billing_emails))).map(&:presence).compact.uniq

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

@@ -8,6 +8,6 @@
         %tr
           %td
             - if order.delayed?
-              Your #{order.delayed_payment_method} will be charged on #{order.delayed_payment_date.strftime('%F')} for the full amount
+              Your #{order.delayed_payment_method} will be charged on #{order.delayed_payment_date.strftime('%F')}
             - else
               Waiting for payment by #{order.payment_provider}

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

@@ -8,18 +8,24 @@
 
         The payment date for this order
 
-        - if order.delayed_payment_date_future?
+        - 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')}
+    
+    - provider_locals = { order: order, deferred_url: deferred_url, declined_url: declined_url }
 
-    %p
-      Instead of charging your card right away, the following action will securely save a token
-      representing your card information. The full amount will be charged on the payment date.
+    - if order.deferred? && order.delayed?
+      %p Your existing #{order.delayed_payment_method} will be charged on the payment date.
 
-    - provider_locals = { order: order, deferred_url: deferred_url, declined_url: declined_url }
+      = collapse('Change my card info') do
+        - EffectiveOrders.delayed_providers.each do |provider|
+          = render partial: "/effective/orders/#{provider}/form", locals: provider_locals
+    - else
+      %p
+        Please enter your card information so it can be charged on the payment date.
 
-    - EffectiveOrders.delayed_providers.each do |provider|
-      = render partial: "/effective/orders/#{provider}/form", locals: provider_locals
+      - EffectiveOrders.delayed_providers.each do |provider|
+        = render partial: "/effective/orders/#{provider}/form", locals: provider_locals

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

@@ -13,7 +13,7 @@
 
         The payment date for this order
 
-        - if order.delayed_payment_date_future?
+        - 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

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.12.3'.freeze
+  VERSION = '6.12.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.12.3
+  version: 6.12.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-31 00:00:00.000000000 Z
+date: 2024-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails