PfdService 7 and OrderProcService AssignRewardPoints fix, Ressource string update

Author: Markus Falk

src/Libraries/Nop.Services/Common/PdfService7.cs

@@ -566,9 +566,10 @@ public virtual void PrintOrdersToPdf(Stream stream, IList<Order> orders, int lan
                 //empty Line
                 tabPage.AddHeaderCell(new Cell(1, col).Add("\n").AddStyle(styleCell));
                 //Invoice
-                paraPdf = new Paragraph(new Text(_localizationService.GetResource(order.InvoiceId != null? "PDFInvoice.Invoice" :"PDFInvoice.Order", lang.Id)).AddStyle(styleTitle));
-                if (order.InvoiceId != null)
-                    paraPdf.Add(new Text(" " + order.InvoiceId).AddStyle(styleTitle));
+                var invoiceID = (order.InvoiceId != null && order.InvoiceId != "ToBeAssigned") ? order.InvoiceId : null;
+                paraPdf = new Paragraph(new Text(_localizationService.GetResource(invoiceID != null? "PDFInvoice.Invoice" :"PDFInvoice.Order", lang.Id)).AddStyle(styleTitle));
+                if (invoiceID != null)
+                    paraPdf.Add(new Text(" " + invoiceID).AddStyle(styleTitle));
                 tabPage.AddHeaderCell(new Cell(1, col - 3).Add(paraPdf).AddStyle(styleCell));
                 paraPdf = new Paragraph();
                 if (order.InvoiceDateUtc.HasValue)
@@ -852,7 +853,7 @@ public virtual void PrintOrdersToPdf(Stream stream, IList<Order> orders, int lan
                     }
                     //order total incl.
                     lstSummary.Add(new Tuple<string, decimal, bool, bool, bool, bool>("PDFInvoice.OrderAmountIncl", order.OrderAmountIncl, true, true, false, false));
-                    
+
                     //shipping non taxable
                     var shippTuple = Tuple.Create("PDFInvoice.Shipping", order.OrderShippingNonTaxable, false, false, order.ShippingStatus != ShippingStatus.ShippingNotRequired, false);
                     lstSummary.Add(shippTuple);

src/Libraries/Nop.Services/Orders/OrderProcessingService.cs

@@ -835,7 +835,7 @@ protected virtual void AwardRewardPoints(Order order)
             var points = new RewardPoints(_rewardPointService);
 
             //earned points
-            decimal usedPurchasedRewardPointsAmount = order.RedeemedRewardPointsEntry.UsedAmountPurchased;
+            decimal usedPurchasedRewardPointsAmount = order.RedeemedRewardPointsEntry != null ? order.RedeemedRewardPointsEntry.UsedAmountPurchased : decimal.Zero;
 
             bool includingTax = order.CustomerTaxDisplayType == TaxDisplayType.IncludingTax;
             decimal amount = _rewardPointService.GetRewardPointsBaseAmount(includingTax ? order.EarnedRewardPointsBaseAmountIncl : order.EarnedRewardPointsBaseAmountExcl, usedPurchasedRewardPointsAmount);

src/Presentation/Nop.Web/App_Data/Localization/defaultResources.nopres.xml

@@ -6787,7 +6787,7 @@
     <Value>Assign Invoice ID from Task</Value>
   </LocaleResource>
   <LocaleResource Name="Admin.Configuration.Settings.Order.AssignInvoiceIdentFromTask.Hint">
-    <Value>Assign invoice id using background task. This assures that the same invoice id isn't used more than ones and that there are no wholes in the number series.</Value>
+    <Value>Assign invoice id using background task. This assures that the same invoice id isn't used more than ones and that there are no wholes in the number series. Please note: Activate the task manually in System/Schedule tasks.</Value>
   </LocaleResource>
   <LocaleResource Name="Admin.Configuration.Settings.Order.AutoUpdateOrderTotalsOnEditingOrder">
     <Value>Auto update order totals</Value>