Add a check to prevent skipping checkout steps

fixes spree/spree#2280