effective_orders 5.2.9 → 5.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc66dfb86e929b29d30edefe87326d4caeae9250f1db593e4c1955eb6fd39c32
-  data.tar.gz: 95239c7500bce2fd5d6a48cc9e1c1fe6667ea0af12f3e028820ffa3c52c0843e
+  metadata.gz: d0353cf2ee2aded74188e0b12ebf53688b379ef454ae9427a0f7be42f58d97b2
+  data.tar.gz: 578ffb35d6763cd78abeb18857ce5f11fc9dc7a6acf452227a17e9675ad10f7a
 SHA512:
-  metadata.gz: a00bb7a4142c5b326412a69d1cfa1c112825933efdd565eecfc422fdb55fc54f06b56e8cde8335705b701dc43403ba4086ababa4c5c6cbeb609cc30eb1e0599e
-  data.tar.gz: 2ce6a0d26f8e9a0c3be3b5540ff25e68eb65408c126d38e9d35c89bb79109499e9b125e5ca5e9842b537a1eab4e13c16becc6b71cbfa75fb2b8a233a8e7b0c3e
+  metadata.gz: 0d0e19c0495b5b67fe7c66a1bf6cda6ce712221d87d6c6baea06a81212d8146ee49fc1237a193cc5340f57c19f426329b59804c97c6afc8c39d4b9a55eee9d2a
+  data.tar.gz: c59b93ef057b4fc5ef519b4752619b0fe83e03a6e39403c05a1ae92838bcbb3bb8c647878805b2e812f38f98b355ef3306576f0b6a712569d77d73b77494fc35

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?

data/lib/effective_orders/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 5.2.9
+  version: 5.2.10
 platform: ruby
 authors:
 - Code and Effect