[Mail] Update mail templates

src/Sylius/Bundle/CoreBundle/Resources/translations/messages.en.yml

@@ -145,10 +145,16 @@ sylius:
             name: Order comment
         shipment_confirmation:
             name: Shipment confirmation
+            content: Your order has been sent. Thank you for a successful transaction.
         user_confirmation:
             name: User confirmation
+            registered: You have just been registered.
+            thank_you: Thank you
         password_reset:
+            content: To reset your password - please visit
+            hello: Hello
             name: Password reset
+            regards: Regards, the Team.
 
     shipping_method_resolver:
         by_zones_and_channel: By zones and channel

src/Sylius/Bundle/CoreBundle/Resources/views/Email/orderComment.html.twig

@@ -1,11 +1,9 @@
 {% block subject %}
-    {% autoescape false %}
-    {{ 'email.order_comment.subject'|trans }}
-    {% endautoescape %}
+    {{ 'sylius.email.order_comment.name'|trans }} {{ order.number }}
 {% endblock %}
 
 {% block body %}
-    <h1>{{ 'email.order_comment.header'|trans }}</h1>
+    <h1>{{ 'sylius.ui.order'|trans }} {{ 'sylius.ui.number'|trans~':' }}{{ order.number }}</h1>
     {% if comment %}
         <h3>{{ comment.comment }}</h3>
     {% endif %}

src/Sylius/Bundle/CoreBundle/Resources/views/Email/orderConfirmation.html.twig

@@ -1,6 +1,7 @@
 {% block subject %}
-    {% autoescape false %}
-    {{ 'email.order_confirmation.subject'|trans }}
-    {% endautoescape %}
+    {{ 'sylius.email.order_confirmation.name'|trans }}
+{% endblock %}
+
+{% block body %}
+    {% include "SyliusWebBundle:Frontend/Account:Order/_detail.html.twig" %}
 {% endblock %}
-{% block body %}{% endblock %}

src/Sylius/Bundle/CoreBundle/Resources/views/Email/passwordReset.html.twig

@@ -1,13 +1,12 @@
 {% block subject %}
-    {% autoescape false %}
-    {{ 'user.password_reset.subject'|trans }}
-    {% endautoescape %}
+    {{ 'sylius.email.password_reset.name'|trans }}
 {% endblock %}
+
 {% block body %}
-    <h3>Hello {{ user.username }}</h3>
+    <h3>{{ 'sylius.email.password_reset.hello'|trans }} {{ user.username }}</h3>
 
-    To reset your password - please visit {{ url('sylius_user_password_reset', { 'token' : user.confirmationToken}) }}
+    {{ 'sylius.email.password_reset.content'|trans }} {{ url('sylius_user_password_reset', { 'token' : user.confirmationToken}) }}
     <br/><br/>
-    Regards,<br/>
-    the Team.
+
+    {{ 'sylius.email.password_reset.regards'|trans }}
 {% endblock %}

src/Sylius/Bundle/CoreBundle/Resources/views/Email/shipmentConfirmation.html.twig

@@ -1,6 +1,7 @@
 {% block subject %}
-    {% autoescape false %}
-    {{ 'email.shipment_confirmation.subject'|trans }}
-    {% endautoescape %}
+    {{ 'sylius.email.shipment_confirmation.name'|trans }}
+{% endblock %}
+
+{% block body %}
+    {{ 'sylius.email.shipment_confirmation.content'|trans }}
 {% endblock %}
-{% block body %}{% endblock %}

src/Sylius/Bundle/CoreBundle/Resources/views/Email/userConfirmation.html.twig

@@ -1,6 +1,10 @@
 {% block subject %}
-    {% autoescape false %}
-    {{ 'email.customer_welcome.subject'|trans }}
-    {% endautoescape %}
+    {{ 'sylius.ui.welcome_to_our_store'|trans }}
+{% endblock %}
+
+{% block body %}
+    {{ 'sylius.ui.welcome_to_our_store'|trans }}
+    <br/><br/>
+    {{ 'sylius.email.user_confirmation.registered'|trans }}<br/>
+    {{ 'sylius.email.user_confirmation.thank_you'|trans }} {{ user.username }}.
 {% endblock %}
-{% block body %}{% endblock %}

src/Sylius/Bundle/UiBundle/Resources/translations/messages.en.yml

@@ -80,6 +80,7 @@ sylius:
         filter: Filter
         go: Go
         generate_coupons: Generate coupons
+        hello: Hello
         in: In
         info: Info
         item: Item