From e5ca8b0ee1009c49d69edc0fb670b563b6c51521 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Bellet <jb.bellet@gmail.com>
Date: Wed, 15 Feb 2023 11:49:53 +0100
Subject: [PATCH] Delete selected line items even if does not lead to order
 cancellation

---
 .../controllers/line_items_controller.js.coffee |  2 ++
 spec/system/admin/bulk_order_management_spec.rb | 17 +++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee b/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee
index d2dc108464..fabceb33bc 100644
--- a/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee
+++ b/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee
@@ -150,6 +150,8 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
             else
               Promise.all(LineItems.delete(item) for item in items).then(-> $scope.refreshData())
       , "js.admin.deleting_item_will_cancel_order")   
+    else
+      Promise.all(LineItems.delete(item) for item in lineItemsToDelete).then(-> $scope.refreshData())
 
   $scope.allBoxesChecked = ->
     checkedCount = $scope.filteredLineItems.reduce (count,lineItem) ->
diff --git a/spec/system/admin/bulk_order_management_spec.rb b/spec/system/admin/bulk_order_management_spec.rb
index 536d8cf98b..7a13b77ec8 100644
--- a/spec/system/admin/bulk_order_management_spec.rb
+++ b/spec/system/admin/bulk_order_management_spec.rb
@@ -784,6 +784,23 @@ describe '
               expect(o2.reload.state).to eq("complete")
             end.to have_enqueued_mail(Spree::OrderMailer, :cancel_email)
           end
+
+          it "deletes one line item and do not show any popup if it does not lead to order cancelation" do
+            expect(page).to have_selector "tr#li_#{li1.id}"
+            within("tr#li_#{li1.id} td.bulk") do
+              check "bulk"
+            end
+
+            find("div#bulk-actions-dropdown").click
+            find("div#bulk-actions-dropdown div.menu_item", text: "Delete Selected" ).click
+
+            expect(page).to have_content "Loading orders"
+
+            expect(page).to have_no_selector ".modal"
+            expect(page).to have_no_selector "tr#li_#{li1.id}"
+            expect(page).to have_selector "tr#li_#{li11.id}"
+            expect(o1.reload.state).to eq("complete")
+          end
         end
       end