Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2007 Skip shipment creation for payment step #2431

Merged
merged 2 commits into from
Jul 25, 2018
Merged

2007 Skip shipment creation for payment step #2431

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7f7e42
Skip shipment creation for payment step
mkllnk Jul 5, 2018
2334f08
Less invasive modifying the checkout state machine
mkllnk Jul 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions app/models/spree/order_decorator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,14 @@
checkout_flow do
go_to_state :address
go_to_state :delivery
go_to_state :payment, :if => lambda { |order|
# Fix for #2191
if order.shipping_method.andand.delivery?
if order.ship_address.andand.valid?
order.create_shipment!
order.update_totals
end
end
go_to_state :payment, if: ->(order) {
order.update_totals
order.payment_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
remove_transition from: :delivery, to: :confirm
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if that is the only thing we modify, isn't there a way from Spree to just remove this transition to avoid having to duplicate all the other steps? Having that single line will make it immediately obvious that that is the only change.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. I had another read about the Spree state machine and added another commit.

end

# -- Scopes
Expand Down