Merged

VirtoCommerce.OrderModule.Data/Notifications/InvoiceEmailNotification.cs

@@ -0,0 +1,26 @@
+using VirtoCommerce.Domain.Order.Model;
+using VirtoCommerce.Platform.Core.Notifications;
+
+namespace VirtoCommerce.OrderModule.Data.Notifications
+{
+    public class InvoiceEmailNotification : OrderEmailNotificationBase
+    {
+        public InvoiceEmailNotification(IEmailNotificationSendingGateway gateway)
+            : base(gateway)
+        {
+        }
+
+        /// <summary>
+        /// For templates back compatibility
+        /// </summary>
+        [NotificationParameter("Order")]
+        public CustomerOrder Order
+        {
+            get
+            {
+                return base.CustomerOrder;
+            }
+        }
+
+    }
+}

VirtoCommerce.OrderModule.Data/Notifications/NewOrderStatusEmailNotification.cs

@@ -21,5 +21,6 @@ public NewOrderStatusEmailNotification(IEmailNotificationSendingGateway gateway)
 
         [NotificationParameter("New order status")]
         public string NewStatus { get; set; }
+
     }
 }

VirtoCommerce.OrderModule.Data/Notifications/OrderEmailNotificationBase.cs

@@ -9,11 +9,11 @@
 
 namespace VirtoCommerce.OrderModule.Data.Notifications
 {
-    public class OrderEmailNotificationBase : EmailNotification
+    public abstract class OrderEmailNotificationBase : EmailNotification
     {
         public OrderEmailNotificationBase(IEmailNotificationSendingGateway gateway) : base(gateway) { }
 
-        [NotificationParameter("CustomerOrder")]
-        public CustomerOrder CustomerOrder { get; set; }
+        [NotificationParameter("Customer Order")]
+        public CustomerOrder CustomerOrder { get; set; }        
     }
 }

VirtoCommerce.OrderModule.Data/Notifications/OrderPaidEmailNotification.cs

@@ -15,6 +15,5 @@ public OrderPaidEmailNotification(IEmailNotificationSendingGateway gateway)
             : base(gateway)
         {
         }
-
     }
 }

VirtoCommerce.OrderModule.Data/Observers/OrderNotificationObserver.cs

@@ -46,19 +46,19 @@ public void OnNext(OrderChangedEvent changeEvent)
                 //Collection of order notifications
                 var notifications = new List<OrderEmailNotificationBase>();
 
-                if(IsOrderCanceled(changeEvent))
+                if (IsOrderCanceled(changeEvent))
                 {
                     var notification = _notificationManager.GetNewNotification<CancelOrderEmailNotification>(changeEvent.ModifiedOrder.StoreId, "Store", changeEvent.ModifiedOrder.LanguageCode);
                     notifications.Add(notification);
                 }
 
-                if(changeEvent.ChangeState == EntryState.Added && !changeEvent.ModifiedOrder.IsPrototype)
+                if (changeEvent.ChangeState == EntryState.Added && !changeEvent.ModifiedOrder.IsPrototype)
                 {
                     var notification = _notificationManager.GetNewNotification<OrderCreateEmailNotification>(changeEvent.ModifiedOrder.StoreId, "Store", changeEvent.ModifiedOrder.LanguageCode);
                     notifications.Add(notification);
                 }
 
-                if(IsNewStatus(changeEvent))
+                if (IsNewStatus(changeEvent))
                 {
                     var notification = _notificationManager.GetNewNotification<NewOrderStatusEmailNotification>(changeEvent.ModifiedOrder.StoreId, "Store", changeEvent.ModifiedOrder.LanguageCode);
 
@@ -68,19 +68,19 @@ public void OnNext(OrderChangedEvent changeEvent)
                     notifications.Add(notification);
                 }
 
-                if(IsOrderPaid(changeEvent))
+                if (IsOrderPaid(changeEvent))
                 {
                     var notification = _notificationManager.GetNewNotification<OrderPaidEmailNotification>(changeEvent.ModifiedOrder.StoreId, "Store", changeEvent.ModifiedOrder.LanguageCode);
                     notifications.Add(notification);
                 }
 
-                if(IsOrderSent(changeEvent))
+                if (IsOrderSent(changeEvent))
                 {
                     var notification = _notificationManager.GetNewNotification<OrderSentEmailNotification>(changeEvent.ModifiedOrder.StoreId, "Store", changeEvent.ModifiedOrder.LanguageCode);
                     notifications.Add(notification);
                 }
 
-                foreach(var notification in notifications)
+                foreach (var notification in notifications)
                 {
                     notification.CustomerOrder = changeEvent.ModifiedOrder;
                     SetNotificationParameters(notification, changeEvent);

VirtoCommerce.OrderModule.Data/VirtoCommerce.OrderModule.Data.csproj

@@ -180,7 +180,7 @@
     <Compile Include="Model\ShipmentItemEntity.cs" />
     <Compile Include="Model\TaxDetailEntity.cs" />
     <Compile Include="Notifications\CancelOrderEmailNotification.cs" />
-    <Compile Include="Notifications\Invoice.cs" />
+    <Compile Include="Notifications\InvoiceEmailNotification.cs" />
     <Compile Include="Notifications\NewOrderStatusEmailNotification.cs" />
     <Compile Include="Notifications\OrderCreateEmailNotification.cs" />
     <Compile Include="Notifications\OrderEmailNotificationBase.cs" />

VirtoCommerce.OrderModule.Web/Controllers/Api/OrderModuleController.cs

@@ -440,32 +440,33 @@ public IHttpActionResult PostProcessPayment(webModel.PaymentCallbackParameters c
         [HttpGet]
         [Route("invoice/{orderNumber}")]
         [SwaggerFileResponse]
-        public HttpResponseMessage GetInvoicePdf(string orderNumber)
+        public IHttpActionResult GetInvoicePdf(string orderNumber)
         {
             var oderSearchResult = _searchService.SearchCustomerOrders(new CustomerOrderSearchCriteria
             {
                 Number = orderNumber,
                 Take = 1
             });
+
             var order = oderSearchResult.Results.FirstOrDefault();
 
-            var invoice = _notificationManager.GetNewNotification("Invoice", null, null, "en-US") as Invoice;
-            if (invoice != null)
-            {
-                invoice.Order = order;
-                _notificationTemplateResolver.ResolveTemplate(invoice);
-            }
+            if (order == null)
+                throw new NullReferenceException("order not found");
 
-            var pdf = PdfGenerator.GeneratePdf(invoice.Body, PdfSharp.PageSize.A4);
-            var stream = new MemoryStream();
+            var invoice = _notificationManager.GetNewNotification<InvoiceEmailNotification>(order.StoreId, "Store", order.LanguageCode);
+
+            ((InvoiceEmailNotification)invoice).CustomerOrder = order;
+            _notificationTemplateResolver.ResolveTemplate(invoice);
 
+            var stream = new MemoryStream();
+            var pdf = PdfGenerator.GeneratePdf(invoice.Body, PdfSharp.PageSize.A4);
             pdf.Save(stream, false);
             stream.Seek(0, SeekOrigin.Begin);
 
             var result = new HttpResponseMessage(HttpStatusCode.OK) { Content = new StreamContent(stream) };
             result.Content.Headers.ContentType = new MediaTypeHeaderValue("application/pdf");
 
-            return result;
+            return ResponseMessage(result);
         }
 
         private CustomerOrderSearchCriteria FilterOrderSearchCriteria(string userName, CustomerOrderSearchCriteria criteria)
@@ -475,16 +476,16 @@ private CustomerOrderSearchCriteria FilterOrderSearchCriteria(string userName, C
             {
                 //Get defined user 'read' permission scopes
                 var readPermissionScopes = _securityService.GetUserPermissions(userName)
-                                                      .Where(x => x.Id.StartsWith(OrderPredefinedPermissions.Read))
-                                                      .SelectMany(x => x.AssignedScopes)
-                                                      .ToList();
+                    .Where(x => x.Id.StartsWith(OrderPredefinedPermissions.Read))
+                    .SelectMany(x => x.AssignedScopes)
+                    .ToList();
 
                 //Check user has a scopes
                 //Stores
                 criteria.StoreIds = readPermissionScopes.OfType<OrderStoreScope>()
-                                                         .Select(x => x.Scope)
-                                                         .Where(x => !String.IsNullOrEmpty(x))
-                                                         .ToArray();
+                    .Select(x => x.Scope)
+                    .Where(x => !String.IsNullOrEmpty(x))
+                    .ToArray();
 
                 var responsibleScope = readPermissionScopes.OfType<OrderResponsibleScope>().FirstOrDefault();
                 //employee id

VirtoCommerce.OrderModule.Web/Module.cs

@@ -71,20 +71,7 @@ public override void Initialize()
             _container.RegisterType<ICustomerOrderService, CustomerOrderServiceImpl>();
             _container.RegisterType<ICustomerOrderSearchService, CustomerOrderServiceImpl>();
             _container.RegisterType<ICustomerOrderBuilder, CustomerOrderBuilderImpl>();
-
-            var emailNotificationSendingGateway = _container.Resolve<IEmailNotificationSendingGateway>();
-            var notificationManager = _container.Resolve<INotificationManager>();
-            notificationManager.RegisterNotificationType(() => new Invoice(emailNotificationSendingGateway)
-            {
-                Description = "The invoice for order",
-                DisplayName = "The invoice for order",
-                Type = "Invoice",
-                NotificationTemplate = new NotificationTemplate
-                {
-                    Body = InvoiceResource.Body,
-                    Language = "en-US"
-                }
-            });
+
         }
 
         public override void PostInitialize()
@@ -157,6 +144,18 @@ public override void PostInitialize()
                 }
             });
 
+            notificationManager.RegisterNotificationType(() => new InvoiceEmailNotification(_container.Resolve<IEmailNotificationSendingGateway>())
+            {
+                Description = "The template for for customer order invoice (used for PDF generation)",
+                DisplayName = "The invoice for customer order",
+                NotificationTemplate = new NotificationTemplate
+                {
+                    Body = InvoiceResource.Body,
+                    Subject = InvoiceResource.Subject,
+                    Language = "en-US"
+                }
+            });
+
             var securityScopeService = _container.Resolve<IPermissionScopeService>();
             securityScopeService.RegisterSope(() => new OrderStoreScope());
             securityScopeService.RegisterSope(() => new OrderResponsibleScope());

VirtoCommerce.OrderModule.Web/Resources/InvoiceResource.resx

@@ -124,8 +124,8 @@
 <body style="font-family: Arial, Helvetica, sans-serif;">
     <div style="border: 1px solid #E0DCDA;">
         <div style="background-color: #E0DCDA; margin: 2px; padding: 10px;">
-            <span style="width: 400px;">Invoice Details {{ order.number }}</span>
-            <span style="width: 400px;">Status: {{ order.status }}</span>
+            <span style="width: 400px;">Invoice Details {{ customer_order.number }}</span>
+            <span style="width: 400px;">Status: {{ customer_order.status }}</span>
         </div>
       	<img src="http://www.startupguys.net/wp-content/uploads/2016/03/virto-commerce-logo.png" width="150" />
         <div style="font-size: 12px; padding: 10px;">
@@ -134,8 +134,8 @@
                 <span style="width: 150px;"><strong>Order Number</strong></span>
             </div>
             <div>
-                <span style="width: 150px;">{{ order.created_date }}</span>
-                <span style="width: 150px;">{{ order.number }}</span>
+                <span style="width: 150px;">{{ customer_order.created_date }}</span>
+                <span style="width: 150px;">{{ customer_order.number }}</span>
             </div>
         </div>
         <div style="padding: 10px;">
@@ -149,7 +149,7 @@
             <span style="width: 100px;"><strong>Line Price</strong></span>
         </div>
       	<table style="font-size: 12px;">
-        	{% for line_item in order.items %}
+        	{% for line_item in customer_order.items %}
               	<tr>
                   	<td style="text-align: center; vertical-align: top; width: 30px;"><p>{{ forloop.index }}</p></td>
                   	<td style="vertical-align: top; width: 200px;"><p>{{ line_item.name }}</p><p style="color: #999; font-size: 11px;">SKU: {{ line_item.sku }}</p></td>
@@ -163,38 +163,41 @@
             <div>
                 <span style="width: 300px;"></span>
                 <span style="width: 100px;">Shipping:</span>
-                <span style="width: 100px;">${{ order.shipping_total | round: 2 }}</span>
+                <span style="width: 100px;">${{ customer_order.shipping_total | round: 2 }}</span>
             </div>
             <div>
                 <span style="width: 300px;"></span>
                 <span style="width: 100px;">Total Fees:</span>
-                <span style="width: 100px;">${{ order.fee_total | round: 2 }}</span>
+                <span style="width: 100px;">${{ customer_order.fee_total | round: 2 }}</span>
             </div>
             <br />
             <div>
                 <span style="width: 300px;"></span>
                 <span style="width: 100px;">Order Subtotal:</span>
-                <span style="width: 100px;">${{ order.sub_total | round: 2 }}</span>
+                <span style="width: 100px;">${{ customer_order.sub_total | round: 2 }}</span>
             </div>
             <div>
                 <span style="width: 300px;"></span>
                 <span style="width: 100px;">GST:</span>
-                <span style="width: 100px;">${{ order.tax_total | round: 2 }}</span>
+                <span style="width: 100px;">${{ customer_order.tax_total | round: 2 }}</span>
             </div>
             <br />
             <div>
                 <span style="width: 300px;"></span>
                 <span style="font-size: 14px; width: 100px;"><strong>Total:</strong></span>
-                <span style="font-size: 14px; width: 100px;"><strong>${{ order.total | round: 2 }}</strong></span>
+                <span style="font-size: 14px; width: 100px;"><strong>${{ customer_order.total | round: 2 }}</strong></span>
             </div>
             <div>
                 <span style="width: 300px;"></span>
                 <span style="width: 100px;">Currency:</span>
-                <span style="width: 100px;">{{ order.currency }}</span>
+                <span style="width: 100px;">{{ customer_order.currency }}</span>
             </div>
         </div>
     </div>
 </body>
 &lt;/html&gt;</value>
   </data>
+  <data name="Subject" xml:space="preserve">
+    <value>Invoice for order - &lt;strong&gt;{{ customer_order.number }}&lt;/strong&gt;</value>
+  </data>
 </root>