-
Notifications
You must be signed in to change notification settings - Fork 15
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
Fix order customer comment and product out of stock #7
Fix order customer comment and product out of stock #7
Conversation
a17cce9
to
02cb429
Compare
@jolelievre Would you mind pushing your last commit in a separate PR? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you please separate commits?
You mean update the dependency in a separate PR? |
Yep :) |
02cb429
to
a5a40a8
Compare
Ok @PierreRambaud I split the update into this PR #10 And @Julievrz I made the modification to use the existing wording, so I added the Product line so that the merchant can still identify which product is concerned To answer your question two templates exist one is used by the core and another one by the module |
@jolelievre my last PR #8 deleted
Because it's an email for the shop not for the customer. |
Here it's also an email for the shop : |
The wording looks good to me, but I could not find the label. ✔️ |
@@ -10,7 +10,7 @@ | |||
<!-- TITLE BEGINING --> | |||
</mj-raw> | |||
<mj-text padding-top="0" padding-bottom="20px" font-weight="600" font-size="20px"> | |||
{{ 'Hi,'|trans({}, 'Emails.Body', locale) }} | |||
{{ 'Hi {firstname} {lastname},'|trans({}, 'Emails.Body', locale) }} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As @okom3pom said, this email is for the shop, not the customer.
{{ 'Hi {firstname} {lastname},'|trans({}, 'Emails.Body', locale) }} | |
{{ 'Hi,'|trans({}, 'Emails.Body', locale) }} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Waiting to resolve @atomiix and @okom3pom feedback to validate
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM for me too once @atomiix 's feedback has been dealt with.
f505c71
to
0199f97
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some feedbacks
0199f97
to
a6a12cc
Compare
@Progi1984 @atomiix You're both right, I was just lazy updating my global config 😅 |
@jolelievre this one can be tested by a dev :) |
Thanks @jolelievre |
Also update composer dependencies so that PHP 7.3 can be used to generate the mail theme