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

prevent deleting only item in confirmed order

Browse Source
This commit is contained in:
Guido Oliveira
2021-04-28 17:37:28 -03:00
parent 6ee6e4ed04
commit 84285ff985
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/darkswarm/controllers/edit_bought_order_controller.js.coffee
View File

@@ -3,7 +3,7 @@ Darkswarm.controller "EditBoughtOrderController", ($scope, $resource, $timeout,
$scope.removeEnabled = true
$scope.deleteLineItem = (id) ->
if Cart.has_one_line_item()
if Cart.isOnlyItemInOrder(id)
Messages.error(t 'orders_cannot_remove_the_final_item')
$scope.removeEnabled = false
$timeout (->

5
app/assets/javascripts/darkswarm/services/cart.js.coffee
View File

@@ -115,8 +115,9 @@ Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http, $modal, $roo
@line_items = []
localStorageService.clearAll() # One day this will have to be moar GRANULAR
has_one_line_item: =>
@line_items_finalised.length == 1
isOnlyItemInOrder: (id) =>
deletedItem = @line_items_finalised.find((item) -> item.id == id)
@line_items_finalised.filter((item) -> item.order_id == deletedItem.order_id).length == 1
removeFinalisedLineItem: (id) =>
@line_items_finalised = @line_items_finalised.filter (item) ->

2
app/serializers/api/line_item_serializer.rb
View File

@@ -1,5 +1,5 @@
class Api::LineItemSerializer < ActiveModel::Serializer
attributes :id, :quantity, :max_quantity, :price
attributes :id, :quantity, :max_quantity, :price, :order_id
has_one :variant, serializer: Api::VariantSerializer
end

7
spec/javascripts/unit/darkswarm/services/cart_spec.js.coffee
View File

@@ -225,9 +225,10 @@ describe 'Cart service', ->
describe "when modifying a confirmed order", ->
it "displays flash error when attempting to remove final item", ->
spyOn(RailsFlashLoader, 'loadFlash')
li = {variant: {id: 1}, quantity: 3}
Cart.line_items_finalised = [li]
expect(Cart.has_one_line_item()).toBe(true)
li = {id: 1, order_id: 1, variant: {id: 1}, quantity: 3}
li2 = {id: 2, order_id: 2, variant: {id: 2}, quantity: 1}
Cart.line_items_finalised = [li, li2]
expect(Cart.isOnlyItemInOrder(li.id)).toBe(true)
it "pops the queue", ->
Cart.update_enqueued = true