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

Add missing address2 details #3643

Merged
merged 2 commits into from
Feb 13, 2018

Conversation

mattt416
Copy link
Contributor

@mattt416 mattt416 commented Feb 3, 2018

Closes #3601

When providing an address on the order page, the form has two address
fields. However, when you enter details in the second address field
(address2) those details are not included in the order confirmation or
the order confirmation email.

This commit updates both to correctly include the full address details.

Note that if we don't check for the existence of address.address2 and
shippingAddress.address2 in server/methods/core/orders.js then we'll
see undefined for address2 in the contents of the e-mail.

When providing an address on the order page, the form has two address
fields.  However, when you enter details in the second address field
(address2) those details are not included in the order confirmation or
the order confirmation email.

This commit updates both to correctly include the full address details.

Note that if we don't check for the existence of address.address2 and
shippingAddress.address2 in server/methods/core/orders.js then we'll
see undefined for address2 in the contents of the e-mail.

Closes reactioncommerce#3601
@pmn4
Copy link
Collaborator

pmn4 commented Feb 5, 2018

lgtm

prinzdezibel
prinzdezibel previously approved these changes Feb 10, 2018
Copy link
Contributor

@prinzdezibel prinzdezibel left a comment

Choose a reason for hiding this comment

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

Thank you @mattt416 .

I've verified that it works and the mail format is compliant to common mail format requirements, like that for UPS: https://pe.usps.com/text/pub28/28c2_003.htm

@mattt416
Copy link
Contributor Author

mattt416 commented Feb 10, 2018

Thanks @prinzdezibel ! The ternary in the template feels a bit clumsy, so happy to adjust this if others think it should be moved out. I'll need some guidance though as I'd have no idea where to move it to. :)

@brent-hoover brent-hoover dismissed prinzdezibel’s stale review February 11, 2018 23:30

Only Jeremy should be approving Community PR's

@spencern spencern changed the base branch from master to release-1.8.0 February 13, 2018 16:28
@spencern spencern merged commit 70e8a22 into reactioncommerce:release-1.8.0 Feb 13, 2018
This was referenced Feb 15, 2018
@spencern spencern mentioned this pull request Mar 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants