effective_orders 5.2.9 → 5.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc66dfb86e929b29d30edefe87326d4caeae9250f1db593e4c1955eb6fd39c32
-  data.tar.gz: 95239c7500bce2fd5d6a48cc9e1c1fe6667ea0af12f3e028820ffa3c52c0843e
+  metadata.gz: 3ee6f41ea9ce0cfac7925305431dbbe362e436288d427744245fc6dbc915c554
+  data.tar.gz: 35cbbbe657adcb8c2d7c823600f9b8c01f9e7a8de4a54a2eec4279413db035e7
 SHA512:
-  metadata.gz: a00bb7a4142c5b326412a69d1cfa1c112825933efdd565eecfc422fdb55fc54f06b56e8cde8335705b701dc43403ba4086ababa4c5c6cbeb609cc30eb1e0599e
-  data.tar.gz: 2ce6a0d26f8e9a0c3be3b5540ff25e68eb65408c126d38e9d35c89bb79109499e9b125e5ca5e9842b537a1eab4e13c16becc6b71cbfa75fb2b8a233a8e7b0c3e
+  metadata.gz: bf9913f68f1018d10eaf8a3602c410bf0d6e5a733e211bbc0e9b16066458c7bf305e522350ec02083a1cead2dcc228846b894f14c699fcaa0af5d8f62077946d
+  data.tar.gz: 5e1b5b09d51db9180f14ef8665e1dae2b34ad7f20d8f9031d96a8f1c75405ddcb6e9a2bd12f3a735fd894e55c53c7ef0698ddf375ddadf6c8edd061493bb0826

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, '')
+  end
+
 end

data/app/models/effective/order.rb

@@ -190,6 +190,31 @@ module Effective
       self
     end
 
+    def remove(*items)
+      raise 'unable to alter a purchased order' if purchased?
+      raise 'unable to alter a declined order' if declined?
+
+      removed = items.map do |item|
+        order_item = if item.kind_of?(Effective::OrderItem)
+          order_items.find { |oi| oi == item }
+        else
+          order_items.find { |oi| oi.purchasable == item }
+        end
+
+        raise("Unable to find order item for #{item}") if order_item.blank?
+        order_item
+      end
+
+      removed.each { |order_item| order_item.mark_for_destruction }
+
+      # Make sure to reset stored aggregates
+      self.total = nil
+      self.subtotal = nil
+      self.tax = nil
+
+      removed.length == 1 ? removed.first : removed
+    end
+
     # Items can be an Effective::Cart, an Effective::order, a single acts_as_purchasable, or multiple acts_as_purchasables
     # add(Product.first) => returns an Effective::OrderItem
     # add(Product.first, current_cart) => returns an array of Effective::OrderItems
@@ -249,7 +274,7 @@ module Effective
       raise('already purchased') if purchased?
       raise('must be pending or confirmed') unless pending? || confirmed?
 
-      order_items.each do |item|
+      present_order_items.each do |item|
         purchasable = item.purchasable
 
         if purchasable.blank? || purchasable.marked_for_destruction?
@@ -358,11 +383,11 @@ module Effective
     end
 
     def purchasables
-      order_items.map { |order_item| order_item.purchasable }
+      present_order_items.map { |order_item| order_item.purchasable }
     end
 
     def subtotal
-      self[:subtotal] || order_items.map { |oi| oi.subtotal }.sum
+      self[:subtotal] || present_order_items.map { |oi| oi.subtotal }.sum
     end
 
     def tax_rate
@@ -386,7 +411,7 @@ module Effective
     end
 
     def num_items
-      order_items.map { |oi| oi.quantity }.sum
+      present_order_items.map { |oi| oi.quantity }.sum
     end
 
     def send_order_receipt_to_admin?
@@ -459,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!
@@ -468,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
@@ -508,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)
@@ -586,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
@@ -640,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.9'.freeze
+  VERSION = '5.2.13'.freeze
 end

metadata

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