effective_orders 5.2.2 → 5.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7da6644ca7ccf8e9bcc7b2326e0b68e7290bb75ab21324a81ae7e94cc912473
-  data.tar.gz: 41de16ee30c34ec82299e9e372d7df60a9ae862a0fb44ae4accfb964910ae5c4
+  metadata.gz: 36c18b8ae581c3810b506b1109b875ca85348eb696a4349d03393d94b1a4dcde
+  data.tar.gz: 38094b154acd13da226a1f6d89ce03424c0789ab060c5ed95ec3231e197c1546
 SHA512:
-  metadata.gz: 06cc3930613fa6359f603df842a44ec24d85e4d104aad2f41c964eaf800f1b98d16e2e04a3a91cfe9f7ec6a56b3516e69b579a1b709cbbe413306f60fcf20070
-  data.tar.gz: b5d5f0e94ef38065f924d66fca1f6124baf15b956639c216e72a1da13e205fcf22304c9be410c07e2ee79f147f8abda0c17d1cb4cedc2a7eaa49fbbf6893ee0b
+  metadata.gz: f85cf4d158028ced1bdc215af18dde0977769d530f1161db1f8bf8cd69ce8d8015774cd938af53a69c4b1163fb67308def2bf08299822818b8572d99c780321a
+  data.tar.gz: cc7fb7ababed9e55f759e31091eb21f9db3ec11a403f8f9d2b755f14aa84cf449801302aadded96951143ad503541fee312a20b035a4ac5d367a46f419c86c25

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

@@ -596,7 +596,7 @@ module Effective
     end
 
     def assign_email
-      self.email = user&.email
+      self.email = user&.email if user&.email.present?
     end
 
     def assign_last_address

data/lib/effective_orders/version.rb

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