effective_orders 6.10.0 → 6.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d05dc976af35c0751fd5c638d2ab2fa0ae63343230ee620694b7363e86e14a61
-  data.tar.gz: 0fc4e26794e6fa3bd90b1037eb1984c297eb1de4a60a0bce88aaeff9ae2d43c7
+  metadata.gz: 6a3716b7b619276755bac8d33027424eed7b97519fdc1454d498349074e2a022
+  data.tar.gz: 5071eb8c4733b659c1d6e72f0ad7974301af0c32d0df6701547eedddaefc723b
 SHA512:
-  metadata.gz: c5f6e85d70807fc53e113e9e11221f7d168367c5728287101b1fb8613251f5e19aedcd3dd0d0c98f4408e9504889c698d5325c3a065a1c812eaae48421ee7719
-  data.tar.gz: b0ced315e41f158d6efb30deb427f44e93577b4bd245d5b96553765e9ff04b8c7f030a829b480d5d8872042e931b959e30516909d71efbdc0c1821b7db75dd11
+  metadata.gz: 30ee25cf450e876da9a219c303c51d1469994fc055d039fe610e7abcddd3d988bc7fa5558ac17dcf05f06ff8afc0d23d6094a1aa106271b091b0fe2c69390310
+  data.tar.gz: abc8e9d7fac67cac46be97ad522f7ffce5e64a47a4a12e8bc9d6f1c17368788dceab075b9ef302f7d937872ebf7f16cbcaabd5d5f9b38ba4f316a46c5dcedc9e

data/app/models/concerns/acts_as_purchasable.rb

@@ -62,6 +62,14 @@ module ActsAsPurchasable
   module ClassMethods
     def acts_as_purchasable?; true; end
 
+    def before_defer(&block)
+      send :define_method, :before_defer do |order, order_item| self.instance_exec(order, order_item, &block) end
+    end
+
+    def after_defer(&block)
+      send :define_method, :after_defer do |order, order_item| self.instance_exec(order, order_item, &block) end
+    end
+
     def before_purchase(&block)
       send :define_method, :before_purchase do |order, order_item| self.instance_exec(order, order_item, &block) end
     end
@@ -70,6 +78,10 @@ module ActsAsPurchasable
       send :define_method, :after_purchase do |order, order_item| self.instance_exec(order, order_item, &block) end
     end
 
+    def before_decline(&block)
+      send :define_method, :before_decline do |order, order_item| self.instance_exec(order, order_item, &block) end
+    end
+
     def after_decline(&block)
       send :define_method, :after_decline do |order, order_item| self.instance_exec(order, order_item, &block) end
     end

data/app/models/concerns/acts_as_purchasable_parent.rb

@@ -13,6 +13,14 @@ module ActsAsPurchasableParent
   module ClassMethods
     def acts_as_purchasable_parent?; true; end
 
+    def before_defer(&block)
+      send :define_method, :before_defer do |order| self.instance_exec(order, &block) end
+    end
+
+    def after_defer(&block)
+      send :define_method, :after_defer do |order| self.instance_exec(order, &block) end
+    end
+
     def before_purchase(&block)
       send :define_method, :before_purchase do |order| self.instance_exec(order, &block) end
     end
@@ -21,6 +29,10 @@ module ActsAsPurchasableParent
       send :define_method, :after_purchase do |order| self.instance_exec(order, &block) end
     end
 
+    def before_decline(&block)
+      send :define_method, :before_decline do |order| self.instance_exec(order, &block) end
+    end
+
     def after_decline(&block)
       send :define_method, :after_decline do |order| self.instance_exec(order, &block) end
     end

data/app/models/effective/order.rb

@@ -696,11 +696,41 @@ module Effective
       sync_quickbooks!(skip: true)
     end
 
-    def defer!(provider: 'none', email: true)
-      return false if purchased?
+    def defer!(provider: 'none', email: true, validate: true)
+      raise('order already purchased') if purchased?
+
+      # Assign attributes
+      assign_attributes(
+        payment_provider: provider,
+
+        status: :deferred,
+        purchased_at: nil,
+        purchased_by: nil,
+
+        deferred_at: (deferred_at.presence || Time.zone.now),
+        deferred_by: (deferred_by.presence || current_user)
+      )
+
+      if current_user&.email.present?
+        assign_attributes(email: current_user.email)
+      end
+
+      error = nil
 
-      assign_attributes(payment_provider: provider)
-      deferred!
+      begin
+        Effective::Order.transaction do
+          run_purchasable_callbacks(:before_defer)
+          save!(validate: validate)
+          run_purchasable_callbacks(:after_defer)
+        end
+      rescue ActiveRecord::RecordInvalid => e
+        self.status = status_was
+
+        error = e.message
+        raise ::ActiveRecord::Rollback
+      end
+
+      raise "Failed to defer order: #{error || errors.full_messages.to_sentence}" unless error.nil?
 
       send_payment_request_to_buyer! if email
 
@@ -709,11 +739,8 @@ module Effective
 
     def decline!(payment: 'none', provider: 'none', card: 'none', validate: true)
       return false if declined?
-
       raise('order already purchased') if purchased?
 
-      error = nil
-
       assign_attributes(
         skip_buyer_validations: true,
 
@@ -726,6 +753,12 @@ module Effective
         payment_card: (card.presence || 'none')
       )
 
+      if current_user&.email.present?
+        assign_attributes(email: current_user.email)
+      end
+
+      error = nil
+
       Effective::Order.transaction do
         begin
           run_purchasable_callbacks(:before_decline)

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.10.0'.freeze
+  VERSION = '6.11.0'.freeze
 end

metadata

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