From 7bc2677e7f72628593079b5cefdd397c3eb35fdd Mon Sep 17 00:00:00 2001 From: artem-dudarev Date: Tue, 17 Apr 2018 18:02:31 +0200 Subject: [PATCH] Fixed notification templates --- .../OrderNotificationResource.Designer.cs | 22 +++++++++---------- .../Resources/OrderNotificationResource.resx | 20 ++++++++--------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/VirtoCommerce.OrderModule.Web/Resources/OrderNotificationResource.Designer.cs b/VirtoCommerce.OrderModule.Web/Resources/OrderNotificationResource.Designer.cs index e8295dc3..fe24ac36 100644 --- a/VirtoCommerce.OrderModule.Web/Resources/OrderNotificationResource.Designer.cs +++ b/VirtoCommerce.OrderModule.Web/Resources/OrderNotificationResource.Designer.cs @@ -19,7 +19,7 @@ namespace VirtoCommerce.OrderModule.Web.Resources { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class OrderNotificationResource { @@ -61,7 +61,7 @@ internal OrderNotificationResource() { } /// - /// Looks up a localized string similar to Your order <strong>{{ customer_order.number }}</strong>.<br> Cancelation order reason - <strong>{{ customer_order.cancel_reason}}</strong>.. + /// Looks up a localized string similar to Your order <strong>{{ customer_order.number }}</strong> has been canceled.<br/>Cancellation reason: <strong>{{ customer_order.cancel_reason}}</strong>.. /// public static string CancelOrderNotificationBody { get { @@ -70,7 +70,7 @@ public static string CancelOrderNotificationBody { } /// - /// Looks up a localized string similar to Your order was canceled. + /// Looks up a localized string similar to Your order has been canceled. /// public static string CancelOrderNotificationSubject { get { @@ -79,7 +79,7 @@ public static string CancelOrderNotificationSubject { } /// - /// Looks up a localized string similar to Your order number - <strong>{{ customer_order.number }}</strong>.. + /// Looks up a localized string similar to Thank you for placing an order.<br/>Order number: <strong>{{ customer_order.number }}</strong>. /// public static string CreateOrderNotificationBody { get { @@ -88,7 +88,7 @@ public static string CreateOrderNotificationBody { } /// - /// Looks up a localized string similar to Your order created. + /// Looks up a localized string similar to You placed an order. /// public static string CreateOrderNotificationSubject { get { @@ -97,7 +97,7 @@ public static string CreateOrderNotificationSubject { } /// - /// Looks up a localized string similar to Your order <strong>{{ customer_order.number }}</strong> change status from <strong>{{ old_status }}<strong> to <strong>{{ new_status }}<strong>.. + /// Looks up a localized string similar to The status of your order <strong>{{ customer_order.number }}</strong> has been changed from <strong>{{ old_status }}</strong> to <strong>{{ new_status }}</strong>.. /// public static string NewOrderStatusNotificationBody { get { @@ -106,7 +106,7 @@ public static string NewOrderStatusNotificationBody { } /// - /// Looks up a localized string similar to Your order status has been change. + /// Looks up a localized string similar to The status of your order has been changed. /// public static string NewOrderStatusNotificatonSubject { get { @@ -115,7 +115,7 @@ public static string NewOrderStatusNotificatonSubject { } /// - /// Looks up a localized string similar to Thank you for paying <strong>{{ customer_order.number }}</strong> order.<br> You had paid <strong>{{ customer_order.total | round: 2}} {{ customer_order.currency }}</strong>.<br> Paid date - <strong>{{ customer_order.modified_date }}</strong>.. + /// Looks up a localized string similar to Thank you for paying for your order <strong>{{ customer_order.number }}</strong>.<br/>You paid <strong>{{ customer_order.total | round: 2}} {{ customer_order.currency }}</strong>.<br/>Paid date: <strong>{{ customer_order.modified_date }}</strong>.. /// public static string OrderPaidNotificationBody { get { @@ -124,7 +124,7 @@ public static string OrderPaidNotificationBody { } /// - /// Looks up a localized string similar to Your order was fully paid. + /// Looks up a localized string similar to Your order has been fully paid. /// public static string OrderPaidNotificationSubject { get { @@ -133,7 +133,7 @@ public static string OrderPaidNotificationSubject { } /// - /// Looks up a localized string similar to Your order <strong>{{ customer_order.number}}</strong> was sent.<br> Number of sent parcels - <strong>{{ customer_order.shipments | size}}</strong>.<br> Parcels tracking numbers:<br> {% for shipment in customer_order.shipments %} <br><strong>{{ shipment.number}}</strong> {% endfor %}<br><br>Sent date - <strong>{{ customer_order.modified_date }}</strong>.. + /// Looks up a localized string similar to Your order <strong>{{ customer_order.number}}</strong> has been sent.<br/>Number of sent parcels: <strong>{{ customer_order.shipments | size}}</strong>.<br/>Parcels tracking numbers:<br/>{% for shipment in customer_order.shipments %}<br/><strong>{{ shipment.number}}</strong>{% endfor %}<br/><br/>Sent date: <strong>{{ customer_order.modified_date }}</strong>.. /// public static string OrderSentNotificationBody { get { @@ -142,7 +142,7 @@ public static string OrderSentNotificationBody { } /// - /// Looks up a localized string similar to Your order was sent. + /// Looks up a localized string similar to Your order has been sent. /// public static string OrderSentNotificationSubject { get { diff --git a/VirtoCommerce.OrderModule.Web/Resources/OrderNotificationResource.resx b/VirtoCommerce.OrderModule.Web/Resources/OrderNotificationResource.resx index efb3987e..ccce5b5a 100644 --- a/VirtoCommerce.OrderModule.Web/Resources/OrderNotificationResource.resx +++ b/VirtoCommerce.OrderModule.Web/Resources/OrderNotificationResource.resx @@ -118,33 +118,33 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Your order <strong>{{ customer_order.number }}</strong>.<br> Cancelation order reason - <strong>{{ customer_order.cancel_reason}}</strong>. + Your order <strong>{{ customer_order.number }}</strong> has been canceled.<br/>Cancellation reason: <strong>{{ customer_order.cancel_reason}}</strong>. - Your order was canceled + Your order has been canceled - Your order number - <strong>{{ customer_order.number }}</strong>. + Thank you for placing an order.<br/>Order number: <strong>{{ customer_order.number }}</strong> - Your order created + You placed an order - Your order <strong>{{ customer_order.number }}</strong> change status from <strong>{{ old_status }}<strong> to <strong>{{ new_status }}<strong>. + The status of your order <strong>{{ customer_order.number }}</strong> has been changed from <strong>{{ old_status }}</strong> to <strong>{{ new_status }}</strong>. - Your order status has been change + The status of your order has been changed - Thank you for paying <strong>{{ customer_order.number }}</strong> order.<br> You had paid <strong>{{ customer_order.total | round: 2}} {{ customer_order.currency }}</strong>.<br> Paid date - <strong>{{ customer_order.modified_date }}</strong>. + Thank you for paying for your order <strong>{{ customer_order.number }}</strong>.<br/>You paid <strong>{{ customer_order.total | round: 2}} {{ customer_order.currency }}</strong>.<br/>Paid date: <strong>{{ customer_order.modified_date }}</strong>. - Your order was fully paid + Your order has been fully paid - Your order <strong>{{ customer_order.number}}</strong> was sent.<br> Number of sent parcels - <strong>{{ customer_order.shipments | size}}</strong>.<br> Parcels tracking numbers:<br> {% for shipment in customer_order.shipments %} <br><strong>{{ shipment.number}}</strong> {% endfor %}<br><br>Sent date - <strong>{{ customer_order.modified_date }}</strong>. + Your order <strong>{{ customer_order.number}}</strong> has been sent.<br/>Number of sent parcels: <strong>{{ customer_order.shipments | size}}</strong>.<br/>Parcels tracking numbers:<br/>{% for shipment in customer_order.shipments %}<br/><strong>{{ shipment.number}}</strong>{% endfor %}<br/><br/>Sent date: <strong>{{ customer_order.modified_date }}</strong>. - Your order was sent + Your order has been sent \ No newline at end of file