effective_orders 5.2.10 → 5.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0353cf2ee2aded74188e0b12ebf53688b379ef454ae9427a0f7be42f58d97b2
-  data.tar.gz: 578ffb35d6763cd78abeb18857ce5f11fc9dc7a6acf452227a17e9675ad10f7a
+  metadata.gz: ae0df61fdb7c2803f9995ae38a41bcc827bd99d454d3675b7584ffe04b5500af
+  data.tar.gz: 0b5bb484fa7dde9ea40562bf36376e43ec006a0e7b56ed73495a660970e23180
 SHA512:
-  metadata.gz: 0d0e19c0495b5b67fe7c66a1bf6cda6ce712221d87d6c6baea06a81212d8146ee49fc1237a193cc5340f57c19f426329b59804c97c6afc8c39d4b9a55eee9d2a
-  data.tar.gz: c59b93ef057b4fc5ef519b4752619b0fe83e03a6e39403c05a1ae92838bcbb3bb8c647878805b2e812f38f98b355ef3306576f0b6a712569d77d73b77494fc35
+  metadata.gz: 8957ad6317f7a94de506f9e3ab55ea1df775ce589c744e3c49dd65929df2a63221930622c01163ba5b88292b8c5b34652e32d3025cefd0c4e56281e6ebb6bc5d
+  data.tar.gz: b05fc9a89f5ddd375dd0569a6b6e92b0ea06669a83e540e77730ace9983a3cfd47065785bcc4d9beb5a840452c295511dada7e132933cbbbe61f597dd5f095f1

data/app/helpers/effective_moneris_checkout_helper.rb

@@ -1,4 +1,5 @@
 module EffectiveMonerisCheckoutHelper
+  SCRUB = /[^\w\d#,\s]/
 
   def moneris_checkout_preload_request(order)
     # Make the Preload Request
@@ -19,8 +20,8 @@ module EffectiveMonerisCheckoutHelper
       language: 'en',
 
       contact_details: {
-        first_name: order.billing_first_name,
-        last_name: order.billing_last_name,
+        first_name: moneris_checkout_scrub(order.billing_first_name),
+        last_name: moneris_checkout_scrub(order.billing_last_name),
         email: order.email,
       }
     }
@@ -28,9 +29,9 @@ module EffectiveMonerisCheckoutHelper
     if (address = order.billing_address).present?
       params.merge!(
         billing_details: {
-          address_1: address.address1,
-          address_2: address.address2,
-          city: address.city,
+          address_1: moneris_checkout_scrub(address.address1),
+          address_2: moneris_checkout_scrub(address.address2),
+          city: moneris_checkout_scrub(address.city),
           province: address.state_code,
           country: address.country_code,
           postal_code: address.postal_code
@@ -41,8 +42,8 @@ module EffectiveMonerisCheckoutHelper
     if (address = order.shipping_address).present?
       params.merge!(
         shipping_details: {
-          address_1: address.address1,
-          address_2: address.address2,
+          address_1: moneris_checkout_scrub(address.address1),
+          address_2: moneris_checkout_scrub(address.address2),
           city: address.city,
           province: address.state_code,
           country: address.country_code,
@@ -62,4 +63,9 @@ module EffectiveMonerisCheckoutHelper
     }
   end
 
+  def moneris_checkout_scrub(value)
+    return value unless value.kind_of?(String)
+    value.gsub(SCRUB, '').first(50)
+  end
+
 end

data/app/models/effective/order.rb

@@ -484,7 +484,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 +493,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 +533,7 @@ module Effective
         skip_buyer_validations: true
       )
 
-      EffectiveResources.transaction do
+      Effective::Order.transaction do
         begin
           run_purchasable_callbacks(:before_decline)
           save!(validate: validate)
@@ -611,7 +611,7 @@ module Effective
 
     def assign_order_totals
       self.subtotal = present_order_items.map { |oi| oi.subtotal }.sum
-      self.tax_rate = get_tax_rate() unless (tax_rate || 0) > 0
+      self.tax_rate = get_tax_rate()
       self.tax = get_tax()
       self.total = subtotal + (tax || 0)
     end
@@ -665,11 +665,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/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '5.2.10'.freeze
+  VERSION = '5.2.14'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 5.2.10
+  version: 5.2.14
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-22 00:00:00.000000000 Z
+date: 2022-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails