effective_orders 5.2.7 → 5.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 419b2992feb9ade2fb499b58fc73083cd8a4f1079fb1e355477bf32c0f75a3f4
-  data.tar.gz: f31d171a1fd01cdf25dc897080e61797f9d7f2c98b769bde536e59046bee8761
+  metadata.gz: 9ed1d4a8621f678e9117f8e6e562220ebe988ce26febfbf30cf7b842ff1a2c04
+  data.tar.gz: 97271616a90392d36fbe3ff5302b5f3437a6fafb010ca478a386a28265939aaa
 SHA512:
-  metadata.gz: d8c6d641ed49d7560d37351dea431f39252cd9e29a0a523c3f4173b9bb72a61315c1ed332a9979938626a80ced4235baafd5c7f753ca6a37c3d1ac97cb4ef3a8
-  data.tar.gz: 6624bddc0a1e3c51b8f13cb3bb3f61830831ec7207233cc420187af0e5dc5cee5a49466fe5ea0896d58caff8980d5c4c1b3a3111ad7e603632ce0b535c5e8ea2
+  metadata.gz: bd81818649ad2d7527492260d7e84ad2cbf4a2fbc3af3d0aef32f2385bec5b7ae891ec176e02955a6e479090f1092a19ea1b06bcea9fdbc79fb62466e6ca2aab
+  data.tar.gz: c1d4d06ced8f1b9910c6b0610ca44a6dfb981448400876df1f1bdcd68d282e1d4ee1984c018adcca6bd1be367b548d02a9769bd9cb312fa850cacf7ca08e5113

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

@@ -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
 
@@ -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?
@@ -318,9 +343,9 @@ module Effective
       Effective::Order.new(self)
     end
 
-    # For moneris and moneris_checkout. Just a unique value.
+    # For moneris and moneris_checkout. Just a unique value. Must be 50 characters or fewer or will raise moneris error.
     def transaction_id
-      [to_param, billing_name.to_s.parameterize.presence, Time.zone.now.to_i, rand(10000)].compact.join('-')
+      [to_param, billing_name.to_s.parameterize.first(20).presence, Time.zone.now.to_i, rand(1000..9999)].compact.join('-')
     end
 
     def billing_first_name
@@ -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?

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '5.2.7'.freeze
+  VERSION = '5.2.11'.freeze
 end

metadata

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