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

Improve wording on order confirmation email #16063

Merged
merged 1 commit into from Nov 4, 2019

Conversation

@atomiix
Copy link
Contributor

atomiix commented Oct 22, 2019

Questions Answers
Branch? develop
Description? Change wording to handle the case when payment validation is waiting
Type? improvement
Category? FO
BC breaks? no
Deprecations? no
Fixed ticket? Fixes #15940
How to test? Order a product and chose check/bank wire as payment method and then check your confirmation mail

This change is Reviewable

@atomiix atomiix added this to the 1.7.7.0 milestone Oct 22, 2019
@atomiix atomiix requested a review from PrestaShop/prestashop-core-developers as a code owner Oct 22, 2019
@@ -615,7 +615,7 @@ public function validateOrder(
'{order_name}' => $order->getUniqReference(),
'{date}' => Tools::displayDate(date('Y-m-d H:i:s'), null, 1),
'{carrier}' => ($virtual_product || !isset($carrier->name)) ? $this->trans('No carrier', array(), 'Admin.Payment.Notification') : $carrier->name,
'{payment}' => Tools::substr($order->payment, 0, 255),
'{payment}' => Tools::substr($order->payment, 0, 255) . ($order->hasBeenPaid() ? '' : ' ' . $this->trans('(waiting for validation)', array(), 'Admin.Payment.Notification')),

This comment has been minimized.

Copy link
@LouiseBonnard

LouiseBonnard Oct 22, 2019

Contributor
Suggested change
'{payment}' => Tools::substr($order->payment, 0, 255) . ($order->hasBeenPaid() ? '' : ' ' . $this->trans('(waiting for validation)', array(), 'Admin.Payment.Notification')),
'{payment}' => Tools::substr($order->payment, 0, 255) . ($order->hasBeenPaid() ? '' : ' ' . $this->trans('(waiting for validation)', array(), 'Emails.Body')),
@@ -50,7 +50,7 @@
<tr>
<td align="left" style="font-size:0px;padding:10px 25px;padding-top:0px;padding-bottom:25px;word-break:break-word;">
<div style="font-family:Open sans, arial, sans-serif;font-size:16px;line-height:25px;text-align:left;color:#363A41;">
{{ 'Thank you for shopping on [1]{shop_name}[/1]!'|trans({'[1]': '<span class="label">', '[/1]': '</span>'}, 'Emails.Body', locale)|raw }}
{{ 'Thank you for your order on [1]{shop_name}[/1]!'|trans({'[1]': '<span class="label">', '[/1]': '</span>'}, 'Emails.Body', locale)|raw }}

This comment has been minimized.

Copy link
@jolelievre

jolelievre Oct 22, 2019

Contributor

Did you make the modification in the mjml sources?

This comment has been minimized.

Copy link
@atomiix

atomiix Oct 22, 2019

Author Contributor

Yes, but didn't make a PR for now as I'm not sure this one will be accepted as it.

This comment has been minimized.

Copy link
@jolelievre

jolelievre Oct 22, 2019

Contributor

Ok, perfect 😉

@atomiix atomiix force-pushed the atomiix:improve-order-conf-email branch from d91a3ae to 7a27234 Oct 22, 2019
@matks
matks approved these changes Oct 30, 2019
@matks

This comment has been minimized.

Copy link
Contributor

matks commented Oct 30, 2019

@atomiix PR is

Do we need to create another PR on MJML sources ?

@Robin-Fischer-PS Robin-Fischer-PS self-assigned this Nov 4, 2019
@Robin-Fischer-PS

This comment has been minimized.

Copy link

Robin-Fischer-PS commented Nov 4, 2019

Hi @atomiix ! It's OK for me.

Please note that I couldn't test it on a payment without manual validation.

@PierreRambaud PierreRambaud merged commit d6656ea into PrestaShop:develop Nov 4, 2019
2 checks passed
2 checks passed
PrettyCI Code formatting
Details
Travis CI - Pull Request Build Passed
Details
@PierreRambaud

This comment has been minimized.

Copy link
Contributor

PierreRambaud commented Nov 4, 2019

Thanks @atomiix

@atomiix atomiix deleted the atomiix:improve-order-conf-email branch Nov 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.