effective_orders 5.2.3 → 5.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b71f36aac1ec66c0744301209933bc4f642137519bf720a904f5b845f9970dff
-  data.tar.gz: 1aa4ccb644014cf6d3e1aa4913dc75e475f2b69c67332f8c3a6e07c6612f9259
+  metadata.gz: 419b2992feb9ade2fb499b58fc73083cd8a4f1079fb1e355477bf32c0f75a3f4
+  data.tar.gz: f31d171a1fd01cdf25dc897080e61797f9d7f2c98b769bde536e59046bee8761
 SHA512:
-  metadata.gz: 720181b8b9446f583bb12c19dbb181fd9d31e7615cdccecaf4d6b10bcedbd10217ca1a8af85dca01974274a1f989901fb5aacc8825b2f48993b39ab6ea22f992
-  data.tar.gz: 857d43e8ffec647adf71a12088eee4800c364f687bb45a154b75df486c6759ffd4b10c462243f82f7a2907c12e902ffbf099134a8e7cfa76d68124105dd88e72
+  metadata.gz: d8c6d641ed49d7560d37351dea431f39252cd9e29a0a523c3f4173b9bb72a61315c1ed332a9979938626a80ced4235baafd5c7f753ca6a37c3d1ac97cb4ef3a8
+  data.tar.gz: 6624bddc0a1e3c51b8f13cb3bb3f61830831ec7207233cc420187af0e5dc5cee5a49466fe5ea0896d58caff8980d5c4c1b3a3111ad7e603632ce0b535c5e8ea2

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

@@ -320,7 +320,7 @@ module Effective
 
     # For moneris and moneris_checkout. Just a unique value.
     def transaction_id
-      [to_param, billing_name.to_s.parameterize.presence, Time.zone.now.to_i].compact.join('-')
+      [to_param, billing_name.to_s.parameterize.presence, Time.zone.now.to_i, rand(10000)].compact.join('-')
     end
 
     def billing_first_name
@@ -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.3'.freeze
+  VERSION = '5.2.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 5.2.3
+  version: 5.2.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-03 00:00:00.000000000 Z
+date: 2021-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails