diff --git a/app/models/spree/order_decorator.rb b/app/models/spree/order_decorator.rb index 9892293114..0166fc10c1 100644 --- a/app/models/spree/order_decorator.rb +++ b/app/models/spree/order_decorator.rb @@ -37,7 +37,8 @@ Spree::Order.class_eval do end order.payment_required? } - go_to_state :confirm, :if => lambda { |order| order.confirmation_required? } + # NOTE: :confirm step was removed because we were not actually using it + # go_to_state :confirm, :if => lambda { |order| order.confirmation_required? } go_to_state :complete remove_transition :from => :delivery, :to => :confirm end diff --git a/spec/models/spree/order_spec.rb b/spec/models/spree/order_spec.rb index 8ed03ff0f7..d722e234d2 100644 --- a/spec/models/spree/order_spec.rb +++ b/spec/models/spree/order_spec.rb @@ -750,4 +750,15 @@ describe Spree::Order do end end end + + describe "determining checkout steps for an order" do + let!(:enterprise) { create(:enterprise) } + let!(:order) { create(:order, distributor: enterprise) } + let!(:payment_method) { create(:stripe_payment_method, distributor_ids: [enterprise.id], preferred_enterprise_id: enterprise.id) } + let!(:payment) { create(:payment, order: order, payment_method: payment_method) } + + it "does not include the :confirm step" do + expect(order.checkout_steps).to_not include "confirm" + end + end end