From e8692fec4c5a74c4ab343e8dda3eff49738043de Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Fri, 20 Mar 2020 09:30:33 +0100 Subject: [PATCH] Temporarily hide OC selector in checkout page --- app/views/checkout/edit.html.haml | 2 +- app/views/shopping_shared/_header.html.haml | 5 +++-- spec/features/consumer/shopping/embedded_shopfronts_spec.rb | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/views/checkout/edit.html.haml b/app/views/checkout/edit.html.haml index 312b7b5a79..27271ae6d3 100644 --- a/app/views/checkout/edit.html.haml +++ b/app/views/checkout/edit.html.haml @@ -15,7 +15,7 @@ %strong = pickup_time current_order_cycle - = render partial: "shopping_shared/header" + = render partial: "shopping_shared/header", locals: { hide_oc_selector: true } %accordion{"close-others" => "false"} %checkout.row{"ng-controller" => "CheckoutCtrl"} diff --git a/app/views/shopping_shared/_header.html.haml b/app/views/shopping_shared/_header.html.haml index 03661a22ea..37806539e2 100644 --- a/app/views/shopping_shared/_header.html.haml +++ b/app/views/shopping_shared/_header.html.haml @@ -10,5 +10,6 @@ = distributor.name %location= distributor.address.city - .show-for-large-up.large-4.columns - = render partial: "shopping_shared/order_cycles" + - unless defined? hide_oc_selector + .show-for-large-up.large-4.columns + = render partial: "shopping_shared/order_cycles" diff --git a/spec/features/consumer/shopping/embedded_shopfronts_spec.rb b/spec/features/consumer/shopping/embedded_shopfronts_spec.rb index 4a70dbf672..290c6af516 100644 --- a/spec/features/consumer/shopping/embedded_shopfronts_spec.rb +++ b/spec/features/consumer/shopping/embedded_shopfronts_spec.rb @@ -53,7 +53,7 @@ feature "Using embedded shopfront functionality", js: true do expect(page).to have_text 'Your shopping cart' find('a#checkout-link').click - expect(page).to have_text 'Checkout now' + expect(page).to have_text 'Ok, ready to checkout?' click_button 'Login' login_with_modal