From 898e41acfb6ab7dada1eaa381a89910f3e94520b Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Sun, 19 Aug 2018 20:23:31 +0100 Subject: [PATCH] Removed monkeypatchs to scope variants on inventory_unit and line_item decorators. We need to make the scoping somewhere else in spree2, see #2559 --- app/models/spree/inventory_unit_decorator.rb | 16 ----------- app/models/spree/line_item_decorator.rb | 28 -------------------- 2 files changed, 44 deletions(-) delete mode 100644 app/models/spree/inventory_unit_decorator.rb diff --git a/app/models/spree/inventory_unit_decorator.rb b/app/models/spree/inventory_unit_decorator.rb deleted file mode 100644 index 9868596b41..0000000000 --- a/app/models/spree/inventory_unit_decorator.rb +++ /dev/null @@ -1,16 +0,0 @@ -module Spree - InventoryUnit.class_eval do - def self.assign_opening_inventory(order) - return [] unless order.completed? - - #increase inventory to meet initial requirements - scoper = OpenFoodNetwork::ScopeVariantToHub.new(order.distributor) - order.line_items.each do |line_item| - # Scope variant to hub so that stock levels may be subtracted from VariantOverride. - scoper.scope(line_item.variant) - - increase(order, line_item.variant, line_item.quantity) - end - end - end -end diff --git a/app/models/spree/line_item_decorator.rb b/app/models/spree/line_item_decorator.rb index 6f74e19530..7af42821f6 100644 --- a/app/models/spree/line_item_decorator.rb +++ b/app/models/spree/line_item_decorator.rb @@ -110,34 +110,6 @@ Spree::LineItem.class_eval do final_weight_volume / quantity end - # MONKEYPATCH of Spree method - # Enables scoping of variant to hub/shop, stock drawn down from inventory - def update_inventory - return true unless order.completed? - - scoper.scope(variant) # this line added - - if new_record? - Spree::InventoryUnit.increase(order, variant, quantity) - elsif old_quantity = self.changed_attributes['quantity'] - if old_quantity < quantity - Spree::InventoryUnit.increase(order, variant, (quantity - old_quantity)) - elsif old_quantity > quantity - Spree::InventoryUnit.decrease(order, variant, (old_quantity - quantity)) - end - end - end - - # MONKEYPATCH of Spree method - # Enables scoping of variant to hub/shop, stock replaced to inventory - def remove_inventory - return true unless order.completed? - - scoper.scope(variant) # this line added - - Spree::InventoryUnit.decrease(order, variant, quantity) - end - # MONKEYPATCH of Spree method # Enables scoping of variant to hub/shop, so we check stock against relevant overrides if they exist # Also skips stock check if requested quantity is zero