From e3a529be5df926f1dd2c06300dad4e374b8d27ba Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Mon, 28 Feb 2022 17:50:23 +0100 Subject: [PATCH] Display only shipping method that are set as front end available and update the tests as well --- app/controllers/concerns/checkout_callbacks.rb | 5 ++++- spec/system/consumer/split_checkout_spec.rb | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/controllers/concerns/checkout_callbacks.rb b/app/controllers/concerns/checkout_callbacks.rb index 66ad90f69d..af87da469f 100644 --- a/app/controllers/concerns/checkout_callbacks.rb +++ b/app/controllers/concerns/checkout_callbacks.rb @@ -46,7 +46,10 @@ module CheckoutCallbacks end def load_shipping_methods - @shipping_methods = Spree::ShippingMethod.for_distributor(@order.distributor).order(:name) + @shipping_methods = Spree::ShippingMethod. + for_distributor(@order.distributor). + display_on_checkout. + order(:name) end def redirect_to_shop? diff --git a/spec/system/consumer/split_checkout_spec.rb b/spec/system/consumer/split_checkout_spec.rb index a203276e66..edc550e755 100644 --- a/spec/system/consumer/split_checkout_spec.rb +++ b/spec/system/consumer/split_checkout_spec.rb @@ -48,6 +48,9 @@ describe "As a consumer, I want to checkout my order", js: true do name: "Payment with Fee", description: "Payment with fee", calculator: Calculator::FlatRate.new(preferred_amount: 1.23)) } + let(:shipping_backoffice_only) { + create(:shipping_method, require_ship_address: true, name: "Shipping Backoffice Only", display_on: "back_end") + } before do allow(Flipper).to receive(:enabled?).with(:split_checkout).and_return(true) @@ -291,7 +294,7 @@ describe "As a consumer, I want to checkout my order", js: true do describe "pre-selecting a shipping method" do it "preselect a shipping method if only one is available" do - order.distributor.update! shipping_methods: [free_shipping] + order.distributor.update! shipping_methods: [free_shipping, shipping_backoffice_only] visit checkout_step_path(:details)