From e3e53b1504bca35e0855190126d0fe49ed898db4 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Sun, 5 Sep 2021 21:17:15 +0100 Subject: [PATCH] Ensure feature toggle works for non-logged-in users --- app/models/spree/order.rb | 2 +- app/models/spree/order/checkout.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb index 301f17a422..1d37534b07 100644 --- a/app/models/spree/order.rb +++ b/app/models/spree/order.rb @@ -21,7 +21,7 @@ module Spree order.payment_required? } go_to_state :confirmation, if: ->(order) { - Flipper.enabled? :split_checkout, order.user + Flipper.enabled? :split_checkout } go_to_state :complete end diff --git a/app/models/spree/order/checkout.rb b/app/models/spree/order/checkout.rb index dd4d0a80e6..d1e0d5d36c 100644 --- a/app/models/spree/order/checkout.rb +++ b/app/models/spree/order/checkout.rb @@ -141,7 +141,7 @@ module Spree private def validate_shipping_method! - return unless user && Flipper.enabled?(:split_checkout, user) + return unless Flipper.enabled?(:split_checkout) return if shipping_method.present? errors.add :shipping_method, I18n.t('split_checkout.errors.select_a_shipping_method') @@ -149,7 +149,7 @@ module Spree end def validate_payment_method! - return unless user && Flipper.enabled?(:split_checkout, user) + return unless Flipper.enabled?(:split_checkout) return if payments.any? errors.add :payment_method, I18n.t('split_checkout.errors.select_a_payment_method')