effective_orders 5.2.0 → 5.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79d6c5b375a23ec257f7b5d357ee38bd63ccc050b9909bff1b8b125e8b7115d5
-  data.tar.gz: bdca1e23836d7fde14bf5de938ce4803327f0396310061188217384605544e76
+  metadata.gz: b05f84b1f3b3cda586c6cb1721b3f7f2b5df015c16b03cea26842dec69e079d0
+  data.tar.gz: 7064dc16608557f87e3189737c6df2ec54a39fccdf640cb9de40c03a0805011d
 SHA512:
-  metadata.gz: '09bf234893689bd3f569f8d9eb8ba2b627b82eaf1370edbc7b130b23df40d2f588394fb5da52a3dd9e8c0ce8a671e5cc66c2ec074ff6c06672a4c931563092c5'
-  data.tar.gz: f6e1a19c93b81d872c7e6992833f02a59012778a5a7ba4f8510ffbd69e9df7b5c8669c1bec2aba48e39817a1623d2cf1c6aae6c718a02816ec7c226ced406c6e
+  metadata.gz: e2701472dd97d9fa7e8c02729abe8b403e59279ba551628efaebf35b9f0b4a72e5574a8620ee11b94b033f996f459ddd215596e9ed119b07d25f015759457eaf
+  data.tar.gz: e612099005a16265d1d3f4165de40bf23e55fbc36252f66310ef04fbc0e3a993c4fa7f72357134e5ab2850d4c78d032498054afa0c9c3ce80a4345ef29ce511a

data/app/datatables/admin/effective_orders_datatable.rb

@@ -93,7 +93,9 @@ class Admin::EffectiveOrdersDatatable < Effective::Datatable
     end
 
     if attributes[:user_id].present?
-      user = current_user.class.find(attributes[:user_id])
+      user_klass = (attributes[:user_type].safe_constantize || current_user.class)
+      user = user_klass.find(attributes[:user_id])
+
       scope = scope.where(user: user)
     end
 

data/app/datatables/effective_orders_datatable.rb

@@ -62,7 +62,8 @@ class EffectiveOrdersDatatable < Effective::Datatable
   end
 
   collection do
-    user = current_user.class.find(attributes[:user_id])
+    user_klass = (attributes[:user_type].safe_constantize || current_user.class)
+    user = user_klass.find(attributes[:user_id])
 
     scope = Effective::Order.all.deep.where(user: user)
 

data/app/models/concerns/acts_as_purchasable_parent.rb

@@ -0,0 +1,34 @@
+# Mostly for the callbacks
+
+module ActsAsPurchasableParent
+  extend ActiveSupport::Concern
+
+  module Base
+    def acts_as_purchasable_parent(*options)
+      @acts_as_purchasable_parent = options || []
+      include ::ActsAsPurchasableParent
+    end
+  end
+
+  module ClassMethods
+    def acts_as_purchasable_parent?; true; end
+
+    def before_purchase(&block)
+      send :define_method, :before_purchase do |order| self.instance_exec(order, &block) end
+    end
+
+    def after_purchase(&block)
+      send :define_method, :after_purchase 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
+  end
+
+  included do
+    has_many :orders, -> { order(:id) }, as: :parent, class_name: 'Effective::Order', dependent: :nullify
+    accepts_nested_attributes_for :orders
+  end
+
+end

data/app/models/effective/order.rb

@@ -459,13 +459,16 @@ module Effective
       self.payment = payment_to_h(payment) if self.payment.blank?
 
       begin
-        Effective::Order.transaction do
+        EffectiveResources.transaction do
           run_purchasable_callbacks(:before_purchase)
+
           save!
           update_purchasables_purchased_order!
+
+          run_purchasable_callbacks(:after_purchase)
         end
       rescue => e
-        Effective::Order.transaction do
+        EffectiveResources.transaction do
           save!(validate: false)
           update_purchasables_purchased_order!
         end
@@ -473,7 +476,6 @@ module Effective
         raise(e)
       end
 
-      run_purchasable_callbacks(:after_purchase)
       send_order_receipts! if email
 
       true
@@ -506,9 +508,11 @@ module Effective
         skip_buyer_validations: true
       )
 
-      Effective::Order.transaction do
+      EffectiveResources.transaction do
         begin
+          run_purchasable_callbacks(:before_decline)
           save!(validate: validate)
+          run_purchasable_callbacks(:after_decline)
         rescue => e
           self.state = state_was
 
@@ -519,8 +523,6 @@ module Effective
 
       raise "Failed to decline order: #{error || errors.full_messages.to_sentence}" unless error.nil?
 
-      run_purchasable_callbacks(:after_decline)
-
       true
     end
 
@@ -637,7 +639,15 @@ module Effective
     end
 
     def run_purchasable_callbacks(name)
-      order_items.each { |oi| oi.purchasable.public_send(name, self, oi) if oi.purchasable.respond_to?(name) }
+      order_items.select { |item| item.purchasable.respond_to?(name) }.each do |item|
+        EffectiveResources.transaction(item) { item.purchasable.public_send(name, self, item) }
+      end
+
+      if parent.respond_to?(name)
+        EffectiveResources.transaction(parent) { parent.public_send(name, self) }
+      end
+
+      true
     end
 
     def send_email(email, *args)

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

@@ -1,6 +1,7 @@
 = render partial: 'effective/orders/order', locals: { order: order }
 
-- if order.persisted? && order.user == current_user
+- # Show this if I'm on the effective orders checkout screen. But not on a rendered order.
+- if order.persisted? && order.user == current_user && request.path.to_s.start_with?(effective_orders.order_path(order))
   .effective-order-change-items
     = link_to 'Change Addresses', effective_orders.edit_order_path(order), rel: :nofollow, class: 'btn btn-secondary'
 

data/lib/effective_orders/engine.rb

@@ -6,6 +6,7 @@ module EffectiveOrders
     initializer 'effective_orders.active_record' do |app|
       ActiveSupport.on_load :active_record do
         ActiveRecord::Base.extend(ActsAsPurchasable::Base)
+        ActiveRecord::Base.extend(ActsAsPurchasableParent::Base)
         ActiveRecord::Base.extend(ActsAsSubscribable::Base)
         ActiveRecord::Base.extend(ActsAsSubscribableBuyer::Base)
       end

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '5.2.0'.freeze
+  VERSION = '5.2.4'.freeze
 end

data/lib/effective_orders.rb

@@ -116,7 +116,7 @@ module EffectiveOrders
 
   # The Effective::Order.payment_provider value must be in this collection
   def self.payment_providers
-    @payment_providers ||= [
+    [
       ('cheque' if cheque?),
       ('credit card' if mark_as_paid?),
       ('free' if free?),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.2.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-27 00:00:00.000000000 Z
+date: 2021-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -215,6 +215,7 @@ files:
 - app/helpers/effective_subscriptions_helper.rb
 - app/mailers/effective/orders_mailer.rb
 - app/models/concerns/acts_as_purchasable.rb
+- app/models/concerns/acts_as_purchasable_parent.rb
 - app/models/concerns/acts_as_subscribable.rb
 - app/models/concerns/acts_as_subscribable_buyer.rb
 - app/models/effective/cart.rb