From fe979b801fe2ac4154169564e0631bd9753ece23 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Wed, 7 Mar 2018 11:45:37 +1100 Subject: [PATCH] Improve readability by grouping depending logic --- app/models/spree/order_decorator.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/models/spree/order_decorator.rb b/app/models/spree/order_decorator.rb index 1c0248c9b1..9070ab8648 100644 --- a/app/models/spree/order_decorator.rb +++ b/app/models/spree/order_decorator.rb @@ -17,7 +17,7 @@ Spree::Order.class_eval do validates :customer, presence: true, if: :require_customer? validate :products_available_from_new_distribution, :if => lambda { distributor_id_changed? || order_cycle_id_changed? } - validate :disallow_guest_order, if: lambda { using_guest_checkout? && registered_email? } + validate :disallow_guest_order attr_accessible :order_cycle_id, :distributor_id, :customer_id before_validation :shipping_address_from_distributor @@ -92,7 +92,9 @@ Spree::Order.class_eval do end def disallow_guest_order - errors.add(:base, I18n.t('devise.failure.already_registered')) + if using_guest_checkout? && registered_email? + errors.add(:base, I18n.t('devise.failure.already_registered')) + end end def empty_with_clear_shipping_and_payments!