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.

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

#23 - Overhaul OrderManager.completeOrder() #103

Closed
wants to merge 27 commits into from
Closed

#23 - Overhaul OrderManager.completeOrder() #103

wants to merge 27 commits into from

Conversation

AndreasZaschka
Copy link

Overhaul OrderManager.completeOrder(), now completeOrder() returns new Object containing status and list of elements due to the status.
Returning OrderCompletionResult with status FAILED_PRODUCTS_UNDERSTOCKED returns the list of products, that are understocked, other status same way.

Andreas Zaschka and others added 23 commits October 13, 2014 13:04
#23

Conflicts:
	src/main/java/org/salespointframework/order/PersistentOrderManager.java
	src/test/java/org/salespointframework/order/OrderManagerTests.java
@AndreasZaschka AndreasZaschka added the lifecycle: feedback requested Information missing label Oct 17, 2015
@odrotbohm
Copy link
Member

Any chance you avoid all formatting related changes? It's rally hard to see what has really changed.

@AndreasZaschka
Copy link
Author

good question, tried to rebase to master. But looks like that this is the diff of both branches.
Maybe you can give me a hint for that.
I`d say, only commits with '#23 ...' are important

@odrotbohm
Copy link
Member

Well, I am not really in charge of changing what's in this PR and I don't have the time to dive into the changes and find out what actually has been changed. So I guess we need to get to a PR that is reduced to only the intended changes.

From a quick glance it looks like your formatting changes replace tabbed indentation with spaces. Please make sure you use the Eclipse formatter defined in etc.

@odrotbohm
Copy link
Member

Can we actually close this one?

@AndreasZaschka
Copy link
Author

Yes, the actual one is too dirty with other commits.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants