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.

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

allow order to transit from resumed state to returned state #7554

Merged
merged 1 commit into from Sep 2, 2016

Conversation

Projects
None yet
5 participants
@nimish13
Contributor

nimish13 commented Aug 25, 2016

Currently, if you resume an cancel order and try to return that order it will raise an exception because transition from resumed state to returned state is not possible

@damianlegawiec

This comment has been minimized.

Show comment
Hide comment
@damianlegawiec

damianlegawiec Aug 26, 2016

Member

Hi @nimish13 could you fix the indentation issues? Thanks!

Member

damianlegawiec commented Aug 26, 2016

Hi @nimish13 could you fix the indentation issues? Thanks!

@nimish13

This comment has been minimized.

Show comment
Hide comment
@nimish13

nimish13 Aug 26, 2016

Contributor

@damianlegawiec Indentation issues are fixed. Please have a look

Contributor

nimish13 commented Aug 26, 2016

@damianlegawiec Indentation issues are fixed. Please have a look

@tanmay3011

This comment has been minimized.

Show comment
Hide comment
@tanmay3011

tanmay3011 Aug 28, 2016

Collaborator

@nimish13 Squash commits

Collaborator

tanmay3011 commented Aug 28, 2016

@nimish13 Squash commits

@nimish13

This comment has been minimized.

Show comment
Hide comment
@nimish13

nimish13 Sep 2, 2016

Contributor
Contributor

nimish13 commented Sep 2, 2016

@damianlegawiec damianlegawiec merged commit e76c30c into spree:master Sep 2, 2016

1 of 3 checks passed

ci/circleci Your tests failed on CircleCI
Details
continuous-integration/travis-ci/pr The Travis CI build failed
Details
hound No violations found. Woof!
@krzysiek1507

This comment has been minimized.

Show comment
Hide comment
@krzysiek1507

krzysiek1507 Sep 3, 2016

Contributor

@damianlegawiec should we backport this to 3-1-stable and 3-0-stable?

Contributor

krzysiek1507 commented Sep 3, 2016

@damianlegawiec should we backport this to 3-1-stable and 3-0-stable?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment