Fix address comparison in order details #567

Closed
wants to merge 1 commit into
from

Projects

None yet

5 participants

@cjuner
Contributor
cjuner commented May 23, 2016

Re-created and adapted PR #188 as a merge for the 5.2 branch.

Original PR text:

Currently, the address comparison in the backend order details does not include the countries of the billing and shipping addresses. However, since some customers change the country to get around certain country restrictions, it is important to compare the countries, too. This PR adds this check, by comparing the countryIds of the two addresses.
Because this fix is located in the ExtJS backend order app, I didn't include test cases.

I updated my commit to include also department, salutation and city in the address comparison. Additionally I also made department and salutation visible in the addresses in the backend order overview. This will make the applied comparison comprehensible to the user.

@shopwareBot

Hello,

thank you for creating this pull request.
I have opened an issue on our Issue Tracker for you. See the issue link: https://issues.shopware.com/#/issues/SW-15134.

Please use this issue to track the state of your pull request.

@janbuecker
Member

There are a bunch of merge conflicts after the commit (b0a8c0b) by @htkassner has been merged recently.

Could you please rebase your changes?

@andrewisplinghoff
Contributor

@janbuecker @MarcelSchmaeing I've just rebased our commit and replaced the branch so that it can be merged without conflicts.

@andrewisplinghoff andrewisplinghoff Include department, salutation, city and country in the address compa…
…rison and display all these fields, too

Before this commit, the address comparison in the backend order details did not include the departments, salutations, cities and countries of the billing and shipping addresses. However, we identified many cases where some customers change one or more of these fields on purpose, to e.g. get around certain country restrictions or just because the invoice should be sent to a different department within the same company. Therefore it is important to compare all fields of the address. This commit adds the missing checks. Additionally it displays the departments and salutations in the order overview to make the applied comparison comprehensible to the user.
57747aa
@janbuecker janbuecker removed the needs-work label May 24, 2016
@janbuecker
Member

Looks good to me. Thank you :)

Going to merge it tomorrow morning.

@janbuecker
Member

PR has been merged with 430eb43.

Thanks for the contribution, @andrewisplinghoff & @cjuner.

@janbuecker janbuecker closed this May 25, 2016
@janbuecker janbuecker added accepted and removed scheduled labels May 25, 2016
@bcremer bcremer added accepted and removed accepted labels May 25, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment