- updated email templates with name variable for ProductUnit

24198 · 24198 · commit 2038bbffedee · 2020-07-31T09:15:40.000+02:00
- updated migration version for the application to load the new templates
diff --git a/src/Marello/Bundle/InvoiceBundle/Migrations/Data/ORM/UpdateEmailTemplates.php b/src/Marello/Bundle/InvoiceBundle/Migrations/Data/ORM/UpdateEmailTemplates.php
@@ -43,6 +43,6 @@ public function getEmailsDir()
      */
     public function getVersion()
     {
-        return '1.1';
+        return '1.2';
     }
 }
diff --git a/src/Marello/Bundle/InvoiceBundle/Migrations/Data/ORM/data/email_templates/marello_send_invoice.html.twig b/src/Marello/Bundle/InvoiceBundle/Migrations/Data/ORM/data/email_templates/marello_send_invoice.html.twig
@@ -512,7 +512,7 @@
                                                     {{ item.quantity }}
                                                 </td>
                                                 <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
-                                                    {{ item.productUnit|marello_format_product_unit }}
+                                                    {{ item.productUnit.name }}
                                                 </td>
                                                 <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; text-align:right; font-weight: 300;">
                                                     {{ item.price|oro_format_currency({'currency': entity.currency}) }}
diff --git a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/UpdateEmailTemplatesProductUnit.php b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/UpdateEmailTemplatesProductUnit.php
@@ -43,6 +43,6 @@ public function getEmailsDir()
      */
     public function getVersion()
     {
-        return '1.5';
+        return '1.6';
     }
 }
diff --git a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_accepted_confirmation.html.twig b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_accepted_confirmation.html.twig
@@ -538,7 +538,7 @@
                                                     {{ item.quantity }}
                                                 </td>
                                                 <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
-                                                    {{ item.productUnit|marello_format_product_unit }}
+                                                    {{ item.productUnit.name }}
                                                 </td>
                                                 <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; text-align:right; font-weight: 300;">
                                                     {{ item.price|oro_format_currency({'currency': entity.currency}) }}
diff --git a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_cancelled.html.twig b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_cancelled.html.twig
@@ -512,7 +512,7 @@
                                                     {{ item.quantity }}
                                                 </td>
                                                 <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
-                                                    {{ item.productUnit|marello_format_product_unit }}
+                                                    {{ item.productUnit.name }}
                                                 </td>
                                                 <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; text-align:right; font-weight: 300;">
                                                     {{ item.price|oro_format_currency({'currency': entity.currency}) }}
diff --git a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_credited.html.twig b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_credited.html.twig
@@ -512,7 +512,7 @@
                                                     {{ item.quantity }}
                                                 </td>
                                                 <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
-                                                    {{ item.productUnit|marello_format_product_unit }}
+                                                    {{ item.productUnit.name }}
                                                 </td>
                                                 <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; text-align:right; font-weight: 300;">
                                                     {{ item.price|oro_format_currency({'currency': entity.currency}) }}
diff --git a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_invoiced.html.twig b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_invoiced.html.twig
@@ -512,7 +512,7 @@
                                                     {{ item.quantity }}
                                                 </td>
                                                 <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
-                                                    {{ item.productUnit|marello_format_product_unit }}
+                                                    {{ item.productUnit.name }}
                                                 </td>
                                                 <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; text-align:right; font-weight: 300;">
                                                     {{ item.price|oro_format_currency({'currency': entity.currency}) }}
diff --git a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_paid.html.twig b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_paid.html.twig
@@ -512,7 +512,7 @@
                                                     {{ item.quantity }}
                                                 </td>
                                                 <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
-                                                    {{ item.productUnit|marello_format_product_unit }}
+                                                    {{ item.productUnit.name }}
                                                 </td>
                                                 <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; text-align:right; font-weight: 300;">
                                                     {{ item.price|oro_format_currency({'currency': entity.currency}) }}
diff --git a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_payment_reminder.html.twig b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_payment_reminder.html.twig
@@ -541,7 +541,7 @@
                                                     {{ item.quantity }}
                                                 </td>
                                                 <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
-                                                    {{ item.productUnit|marello_format_product_unit }}
+                                                    {{ item.productUnit.name }}
                                                 </td>
                                                 <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; text-align:right; font-weight: 300;">
                                                     {{ item.price|oro_format_currency({'currency': entity.currency}) }}
diff --git a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_shipped_confirmation.html.twig b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_shipped_confirmation.html.twig
@@ -528,7 +528,7 @@
                                                     {{ item.quantity }}
                                                 </td>
                                                 <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
-                                                    {{ item.productUnit|marello_format_product_unit }}
+                                                    {{ item.productUnit.name }}
                                                 </td>
                                                 <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; text-align:right; font-weight: 300;">
                                                     {{ item.price|oro_format_currency({'currency': entity.currency}) }}
diff --git a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_shipping_prepared.html.twig b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_shipping_prepared.html.twig
@@ -544,7 +544,7 @@
                                                     {{ item.quantity }}
                                                 </td>
                                                 <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
-                                                    {{ item.productUnit|marello_format_product_unit }}
+                                                    {{ item.productUnit.name }}
                                                 </td>
                                                 <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; text-align:right; font-weight: 300;">
                                                     {{ item.price|oro_format_currency({'currency': entity.currency}) }}
diff --git a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_shipping_prepared_warehouse.html.twig b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_shipping_prepared_warehouse.html.twig
@@ -528,7 +528,7 @@
                                                     {{ item.quantity }}
                                                 </td>
                                                 <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
-                                                    {{ item.productUnit|marello_format_product_unit}}
+                                                    {{ item.productUnit.name }}
                                                 </td>
                                                 <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; text-align:right; font-weight: 300;">
                                                     {{ item.price|oro_format_currency({'currency': entity.currency}) }}
diff --git a/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/UpdateEmailTemplatesProductUnit.php b/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/UpdateEmailTemplatesProductUnit.php
@@ -42,6 +42,6 @@ public function getEmailsDir()
      */
     public function getVersion()
     {
-        return '1.3';
+        return '1.4';
     }
 }
diff --git a/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_created.html.twig b/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_created.html.twig
@@ -503,7 +503,7 @@
                                                         {{ item.quantity }}
                                                     </td>
                                                     <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
-                                                        {{ item.orderItem.productUnit|marello_format_product_unit }}
+                                                        {{ item.orderItem.productUnit.name }}
                                                     </td>
                                                 </tr>
                                             <!--{% endfor %}-->
diff --git a/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_inspection_not_ok.html.twig b/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_inspection_not_ok.html.twig
@@ -503,7 +503,7 @@
                                                         {{ item.quantity }}
                                                     </td>
                                                     <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
-                                                        {{ item.orderItem.productUnit|marello_format_product_unit }}
+                                                        {{ item.orderItem.productUnit.name }}
                                                     </td>
                                                 </tr>
                                             <!--{% endfor %}-->
diff --git a/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_not_verified.html.twig b/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_not_verified.html.twig
@@ -503,7 +503,7 @@
                                                         {{ item.quantity }}
                                                     </td>
                                                     <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
-                                                        {{ item.orderItem.productUnit|marello_format_product_unit }}
+                                                        {{ item.orderItem.productUnit.name }}
                                                     </td>
                                                 </tr>
                                             <!--{% endfor %}-->
diff --git a/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_received.html.twig b/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_received.html.twig
@@ -503,7 +503,7 @@
                                                         {{ item.quantity }}
                                                     </td>
                                                     <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
-                                                        {{ item.orderItem.productUnit|marello_format_product_unit }}
+                                                        {{ item.orderItem.productUnit.name }}
                                                     </td>
                                                 </tr>
                                             <!--{% endfor %}-->
diff --git a/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_reminder.html.twig b/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_reminder.html.twig
@@ -503,7 +503,7 @@
                                                         {{ item.quantity }}
                                                     </td>
                                                     <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
-                                                        {{ item.orderItem.productUnit|marello_format_product_unit }}
+                                                        {{ item.orderItem.productUnit.name }}
                                                     </td>
                                                 </tr>
                                             <!--{% endfor %}-->
diff --git a/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_shipping_label_warehouse.html.twig b/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_shipping_label_warehouse.html.twig
@@ -503,7 +503,7 @@
                                                         {{ item.quantity }}
                                                     </td>
                                                     <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
-                                                        {{ item.orderItem.productUnit|marello_format_product_unit }}
+                                                        {{ item.orderItem.productUnit.name }}
                                                     </td>
                                                 </tr>
                                             <!--{% endfor %}-->

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,6 @@ public function getEmailsDir()`
`43`	`43`	`*/`
`44`	`44`	`public function getVersion()`
`45`	`45`	`{`
`46`		`- return '1.1';`
	`46`	`+ return '1.2';`
`47`	`47`	`}`
`48`	`48`	`}`