raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-04 02:31:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adapt OrderContents#remove to allow deleting line item without passing a quantity

Browse Source
This commit is contained in:
Matt-Yorkley
2021-05-11 13:29:49 +01:00
parent a5ccaf9595
commit 5ff8436c1a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/bulk_line_items_controller.rb
View File

@@ -49,7 +49,7 @@ module Admin
load_line_item
authorize! :update, order
order.contents.remove(@line_item.variant, @line_item.quantity)
order.contents.remove(@line_item.variant)
render body: nil, status: :no_content # No Content, does not trigger ng resource auto-update
end

4
app/models/spree/order_contents.rb
View File

@@ -19,7 +19,7 @@ module Spree
# Get current line item for variant
# Remove variant qty from line_item
def remove(variant, quantity = 1, shipment = nil)
def remove(variant, quantity = nil, shipment = nil)
line_item = remove_from_line_item(variant, quantity, shipment)
update_shipment(shipment)
update_order
@@ -66,7 +66,7 @@ module Spree
def remove_from_line_item(variant, quantity, shipment = nil)
line_item = find_line_item_by_variant(variant, true)
line_item.quantity += -quantity
quantity.present? ? line_item.quantity += -quantity : line_item.quantity = 0
line_item.target_shipment = shipment
if line_item.quantity == 0