Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix users removing last item of confirmed order on /cart page #6528

Merged
merged 6 commits into from
Mar 4, 2021
Merged

Fix users removing last item of confirmed order on /cart page #6528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
651bdad
Fix users removing last item of confirmed order on /cart page
mprieger Dec 13, 2020
3725ba0
Update app/assets/javascripts/darkswarm/services/cart.js.coffee
andrewpbrett Jan 11, 2021
5751e24
Update app/assets/javascripts/darkswarm/controllers/edit_bought_order…
andrewpbrett Jan 11, 2021
72b7fe7
fix indentation
andrewpbrett Jan 11, 2021
6b1a1a5
update cart spec
andrewpbrett Jan 12, 2021
ad8973d
add messages object to order controller
andrewpbrett Mar 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions app/assets/javascripts/darkswarm/controllers/edit_bought_order_controller.js.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
Darkswarm.controller "EditBoughtOrderController", ($scope, $resource, Cart) ->
Darkswarm.controller "EditBoughtOrderController", ($scope, $resource, $timeout, Cart, Messages) ->
$scope.showBought = false
$scope.removeEnabled = true

$scope.deleteLineItem = (id) ->
params = {id: id}
success = (response) ->
$(".line-item-" + id).remove()
Cart.removeFinalisedLineItem(id)
fail = (error) ->
console.log error
if Cart.has_one_line_item()
Messages.error(t 'orders_cannot_remove_the_final_item')
$scope.removeEnabled = false
$timeout (->
$scope.removeEnabled = true
), 10000
else
params = {id: id}
success = (response) ->
$(".line-item-" + id).remove()
Cart.removeFinalisedLineItem(id)
fail = (error) ->
console.log error

$resource("/line_items/:id").delete(params, success, fail)
$resource("/line_items/:id").delete(params, success, fail)
3 changes: 3 additions & 0 deletions app/assets/javascripts/darkswarm/services/cart.js.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +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

removeFinalisedLineItem: (id) =>
@line_items_finalised = @line_items_finalised.filter (item) ->
item.id != id
Expand Down
2 changes: 1 addition & 1 deletion app/views/spree/orders/_bought.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@
= line_item.display_amount_with_adjustments.to_html unless line_item.quantity.nil?

%td.bought-item-delete.text-center
%a{ng: {click: "deleteLineItem(#{line_item.id})"}}
%a{ng: {click: "removeEnabled && deleteLineItem(#{line_item.id})"}}
%i.ofn-i_026-trash
7 changes: 7 additions & 0 deletions spec/javascripts/unit/darkswarm/services/cart_spec.js.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,13 @@ describe 'Cart service', ->
expect(li.quantity).toEqual 1
expect(li.max_quantity).toEqual 1

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)

it "pops the queue", ->
Cart.update_enqueued = true
spyOn(Cart, 'scheduleUpdate')
Expand Down