effective_orders 5.2.1 → 5.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b2e8598ea6f759b602e70d61c5942080c2e528fc8c123b93e3396cbc2a8a26a
-  data.tar.gz: 004e0db3016e081294d9c6fe49a02eb800a13f49f7917f0d83c445e5a615ebdc
+  metadata.gz: cc1c2f6fea7135b9b7578bef447c14f3485fd68cef06a2c441c17c08fcce5628
+  data.tar.gz: eedc4248429fafb164669fb64a03b0119ae2bbd806847a8022670c0da947ffc9
 SHA512:
-  metadata.gz: 071a7b38a0c5817e3165ac17b2193288e435b0e92c3a54163bfa7997c7132f9f5c02329421198ad51e9078dc351e77a5984aafa96a2f51bef518913886bf0870
-  data.tar.gz: d2825cd0a8f2c66c6975bcdaf926ab9ac35081383547ad41965813d26a4d2ea059426340a1bba723f22f1ada37c19d2e16a0d34c23423189981fb8611ffdbbbd
+  metadata.gz: 7b7955c3e945f81015f7f3958cd70ccb80dc55fc935c7e29043a4f2b2174c700c42f9bf32dc322b3743cc2ec5d1b1c38682a24dfcf6322cd631315b63d99b049
+  data.tar.gz: 06e6e17294699a973be1d3b34a6cf0a5d97623e9e9523e9a618113f783bd7ffbefce7d2dd8ec113139feb35d69d120130ca6adb8c917c18f598439adf83012ae

data/app/datatables/admin/effective_orders_datatable.rb

@@ -93,7 +93,10 @@ class Admin::EffectiveOrdersDatatable < Effective::Datatable
     end
 
     if attributes[:user_id].present?
-      user = current_user.class.find(attributes[:user_id])
+      user_klass = (attributes[:user_type].constantize if attributes[:user_type].present?)
+      user_klass ||= 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,10 @@ class EffectiveOrdersDatatable < Effective::Datatable
   end
 
   collection do
-    user = current_user.class.find(attributes[:user_id])
+    user_klass = (attributes[:user_type].constantize if attributes[:user_type].present?)
+    user_klass ||= current_user.class
+
+    user = user_klass.find(attributes[:user_id])
 
     scope = Effective::Order.all.deep.where(user: user)
 

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,8 +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) }
-      parent.public_send(name, self) if parent.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/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '5.2.1'.freeze
+  VERSION = '5.2.5'.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.1
+  version: 5.2.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-15 00:00:00.000000000 Z
+date: 2021-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails