effective_orders 5.2.12 → 5.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6fc5fddf4893dd467c30bd2ae4f505b1c4f4f191e819601364bc230d8530627
-  data.tar.gz: 6a157d58abcf4836b1324b17dbee3fcb502e23e2924d59daa1ef8a957cb91fbb
+  metadata.gz: f39960e8a8f551838180f27b80909a6aaeab1b2188ed64940dc3fe35a97a44a7
+  data.tar.gz: 7910cdfe509ba84be703aad6bc452bfd53e9b8760027cc17e1bac280b9d373ac
 SHA512:
-  metadata.gz: 9c98604d9238a92c62d41422b31f63001144fa47eaa5dbcf7359cf98ec849e8846d07db9be11e498df0024b66212bb674afcc646ab9f7bf4922c8b446a947ba5
-  data.tar.gz: 537d27c651f334bb17a189d4f3085eca6f0b33e9aaa742ea9ae270f5f3f6d00746d56007a10a5abbe2941ecbd083ae42a052bfbeecc627f0a79e31076b2dcb7c
+  metadata.gz: 87a550796efef35f0175625db99570302027b6f091cb5fdea1510b3a3d4c7691c26c947e6a0e6e4dc95b11bc683fc333fa3590605b5313b527df64186b77c26a
+  data.tar.gz: 1b73bd83140864c0fbb70ee9bbbe684f5e36abdeb2ecb68cd10ba4bbebc7cc4c83d34673760c2e2fc15484d678b651b563293881ee0449eb5f09eb72639d20f0

data/app/helpers/effective_moneris_checkout_helper.rb

@@ -65,7 +65,7 @@ module EffectiveMonerisCheckoutHelper
 
   def moneris_checkout_scrub(value)
     return value unless value.kind_of?(String)
-    value.gsub(SCRUB, '')
+    value.gsub(SCRUB, '').first(50)
   end
 
 end

data/app/models/effective/order.rb

@@ -333,8 +333,12 @@ module Effective
         else payment_card.to_s
       end unless payment_provider == 'free'
 
+      last4 = if payment[:active_card] && payment[:active_card].include?('**** **** ****')
+        payment[:active_card][15,4]
+      end
+
       # stripe, moneris, moneris_checkout
-      last4 = (payment[:active_card] || payment['f4l4'] || payment['first6last4']).to_s.last(4)
+      last4 ||= (payment['f4l4'] || payment['first6last4']).to_s.last(4)
 
       [card, '-', last4].compact.join(' ')
     end
@@ -484,7 +488,7 @@ module Effective
       self.payment = payment_to_h(payment) if self.payment.blank?
 
       begin
-        EffectiveResources.transaction do
+        Effective::Order.transaction do
           run_purchasable_callbacks(:before_purchase)
 
           save!
@@ -493,7 +497,7 @@ module Effective
           run_purchasable_callbacks(:after_purchase)
         end
       rescue => e
-        EffectiveResources.transaction do
+        Effective::Order.transaction do
           save!(validate: false)
           update_purchasables_purchased_order!
         end
@@ -533,7 +537,7 @@ module Effective
         skip_buyer_validations: true
       )
 
-      EffectiveResources.transaction do
+      Effective::Order.transaction do
         begin
           run_purchasable_callbacks(:before_decline)
           save!(validate: validate)
@@ -665,11 +669,19 @@ module Effective
 
     def run_purchasable_callbacks(name)
       order_items.select { |item| item.purchasable.respond_to?(name) }.each do |item|
-        EffectiveResources.transaction(item) { item.purchasable.public_send(name, self, item) }
+        if item.class.respond_to?(:transaction)
+          item.class.transaction { item.purchasable.public_send(name, self, item) }
+        else
+          item.purchasable.public_send(name, self, item)
+        end
       end
 
       if parent.respond_to?(name)
-        EffectiveResources.transaction(parent) { parent.public_send(name, self) }
+        if parent.class.respond_to?(:transaction)
+          parent.class.transaction { parent.public_send(name, self) }
+        else
+          parent.public_send(name, self)
+        end
       end
 
       true

data/app/models/effective/order_item.rb

@@ -68,7 +68,7 @@ module Effective
     # first or build
     def qb_item_name
       raise('expected EffectiveQbSync gem') unless defined?(EffectiveQbSync)
-      (qb_order_item || build_qb_order_item(name: purchasable.qb_item_name)).name
+      (qb_order_item || build_qb_order_item(name: purchasable&.qb_item_name)).name
     end
 
   end

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '5.2.12'.freeze
+  VERSION = '5.2.16'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 5.2.12
+  version: 5.2.16
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-04 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails