effective_orders 5.2.4 → 5.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b05f84b1f3b3cda586c6cb1721b3f7f2b5df015c16b03cea26842dec69e079d0
-  data.tar.gz: 7064dc16608557f87e3189737c6df2ec54a39fccdf640cb9de40c03a0805011d
+  metadata.gz: 7850176b4c32949c586aa453834799cb0063919a1eb7437e5111f2a280e19fc0
+  data.tar.gz: e5753a21c4ba634a779bce34c0dafae0d94492db53f51bbb89720f860ea17985
 SHA512:
-  metadata.gz: e2701472dd97d9fa7e8c02729abe8b403e59279ba551628efaebf35b9f0b4a72e5574a8620ee11b94b033f996f459ddd215596e9ed119b07d25f015759457eaf
-  data.tar.gz: e612099005a16265d1d3f4165de40bf23e55fbc36252f66310ef04fbc0e3a993c4fa7f72357134e5ab2850d4c78d032498054afa0c9c3ce80a4345ef29ce511a
+  metadata.gz: 6251dfd17f63fce47aa1484d26bfb68afaa24f080819f8f8a00ffc21e280e36396c0d25ee6d0fc400af01120539d39f71aaef91bdb8770d9f28a87dd5198b4d6
+  data.tar.gz: 65a6ad794d855f8057f5e14051ec1d0b7099e21e54b864238f61b5a020f17f0f1a93042a30c74dcd0b5b581385ac1e466eb075344054958506a9ee2ad7e7605a

data/app/datatables/admin/effective_orders_datatable.rb

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

@@ -103,7 +103,7 @@ module Effective
     end
 
     # User validations -- An admin skips these when working in the admin/ namespace
-    with_options unless: -> { pending? || skip_buyer_validations? } do
+    with_options unless: -> { pending? || skip_buyer_validations? || purchased? } do
       validates :tax_rate, presence: { message: "can't be determined based on billing address" }
       validates :tax, presence: true
 
@@ -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.4'.freeze
+  VERSION = '5.2.8'.freeze
 end

metadata

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