From 2976b0717cef4f1cb23b480e1102e2c74b9006b0 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Mon, 28 Feb 2022 16:58:01 +0100 Subject: [PATCH 1/2] Display "Update" button on the order table page unless order is complete With the split checkout, we can access this page between the different steps: for this cases, cart actions should be displayed --- app/views/spree/orders/_form.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/spree/orders/_form.html.haml b/app/views/spree/orders/_form.html.haml index e19d2bd9604..0b5d2d94442 100644 --- a/app/views/spree/orders/_form.html.haml +++ b/app/views/spree/orders/_form.html.haml @@ -22,7 +22,7 @@ = render 'bought' if show_bought_items? && @order.cart? %tfoot#edit-cart - = render 'spree/orders/form/cart_actions_row' if @order.cart? + = render 'spree/orders/form/cart_actions_row' unless @order.complete? %tr %td.text-right{colspan:"3"} From e14dad157505593ced136fb3c15e08f025e403ac Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Tue, 1 Mar 2022 10:19:33 +0100 Subject: [PATCH 2/2] Update test on payment step --- spec/system/consumer/split_checkout_spec.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/spec/system/consumer/split_checkout_spec.rb b/spec/system/consumer/split_checkout_spec.rb index bd9af52961a..6cd0d45e569 100644 --- a/spec/system/consumer/split_checkout_spec.rb +++ b/spec/system/consumer/split_checkout_spec.rb @@ -154,11 +154,7 @@ expect(page).to have_current_path("/checkout/payment") end - context "when I have an out of stock product in my cart" do - pending("awaiting closure bug #8940") do - it_behaves_like "when I have an out of stock product in my cart" - end - end + it_behaves_like "when I have an out of stock product in my cart" end end