effective_orders 5.2.6 → 5.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36c18b8ae581c3810b506b1109b875ca85348eb696a4349d03393d94b1a4dcde
-  data.tar.gz: 38094b154acd13da226a1f6d89ce03424c0789ab060c5ed95ec3231e197c1546
+  metadata.gz: d0353cf2ee2aded74188e0b12ebf53688b379ef454ae9427a0f7be42f58d97b2
+  data.tar.gz: 578ffb35d6763cd78abeb18857ce5f11fc9dc7a6acf452227a17e9675ad10f7a
 SHA512:
-  metadata.gz: f85cf4d158028ced1bdc215af18dde0977769d530f1161db1f8bf8cd69ce8d8015774cd938af53a69c4b1163fb67308def2bf08299822818b8572d99c780321a
-  data.tar.gz: cc7fb7ababed9e55f759e31091eb21f9db3ec11a403f8f9d2b755f14aa84cf449801302aadded96951143ad503541fee312a20b035a4ac5d367a46f419c86c25
+  metadata.gz: 0d0e19c0495b5b67fe7c66a1bf6cda6ce712221d87d6c6baea06a81212d8146ee49fc1237a193cc5340f57c19f426329b59804c97c6afc8c39d4b9a55eee9d2a
+  data.tar.gz: c59b93ef057b4fc5ef519b4752619b0fe83e03a6e39403c05a1ae92838bcbb3bb8c647878805b2e812f38f98b355ef3306576f0b6a712569d77d73b77494fc35

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].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.6'.freeze
+  VERSION = '5.2.10'.freeze
 end

metadata

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