nopSolutions#1917 We should not include shipping total when calculating reward points to be granted

Author: AndreiMaz

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

@@ -191,6 +191,13 @@ decimal GetTaxTotal(IList<ShoppingCartItem> cart, out SortedDictionary<decimal,
         /// <returns>true - reward points could use; false - cannot be used.</returns>
         bool CheckMinimumRewardPointsToUseRequirement(int rewardPoints);
 
+        /// <summary>
+        /// Calculate how order total (maximum amount) for which reward points could be earned/reduced
+        /// </summary>
+        /// <param name="orderShippingInclTax">Order shipping (including tax)</param>
+        /// <param name="orderTotal">Order total</param>
+        /// <returns>Applicable order total</returns>
+        decimal CalculateApplicableOrderTotalForRewardPoints(decimal orderShippingInclTax, decimal orderTotal);
         /// <summary>
         /// Calculate how much reward points will be earned/reduced based on certain amount spent
         /// </summary>

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

@@ -765,7 +765,8 @@ protected virtual void SendNotificationsAndSaveNotes(Order order)
         /// <param name="order">Order</param>
         protected virtual void AwardRewardPoints(Order order)
         {
-            int points = _orderTotalCalculationService.CalculateRewardPoints(order.Customer, order.OrderTotal);
+            var totalForRewardPoints = _orderTotalCalculationService.CalculateApplicableOrderTotalForRewardPoints(order.OrderShippingInclTax, order.OrderTotal);
+            int points = _orderTotalCalculationService.CalculateRewardPoints(order.Customer, totalForRewardPoints);
             if (points == 0)
                 return;
 
@@ -795,7 +796,8 @@ protected virtual void AwardRewardPoints(Order order)
         /// <param name="order">Order</param>
         protected virtual void ReduceRewardPoints(Order order)
         {
-            int points = _orderTotalCalculationService.CalculateRewardPoints(order.Customer, order.OrderTotal);
+            var totalForRewardPoints = _orderTotalCalculationService.CalculateApplicableOrderTotalForRewardPoints(order.OrderShippingInclTax, order.OrderTotal);
+            int points = _orderTotalCalculationService.CalculateRewardPoints(order.Customer, totalForRewardPoints);
             if (points == 0)
                 return;
 

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

@@ -1389,6 +1389,19 @@ public virtual bool CheckMinimumRewardPointsToUseRequirement(int rewardPoints)
             return rewardPoints >= _rewardPointsSettings.MinimumRewardPointsToUse;
         }
 
+        /// <summary>
+        /// Calculate how order total (maximum amount) for which reward points could be earned/reduced
+        /// </summary>
+        /// <param name="orderShippingInclTax">Order shipping (including tax)</param>
+        /// <param name="orderTotal">Order total</param>
+        /// <returns>Applicable order total</returns>
+        public virtual decimal CalculateApplicableOrderTotalForRewardPoints(decimal orderShippingInclTax, decimal orderTotal)
+        {
+            //do you give reward points for order total? or do you exclude shipping?
+            //since shipping costs vary some of store owners don't give reward points based on shipping total
+            //you can put your custom logic here
+            return orderTotal - orderShippingInclTax;
+        }
         /// <summary>
         /// Calculate how much reward points will be earned/reduced based on certain amount spent
         /// </summary>

src/Presentation/Nop.Web/Factories/ShoppingCartModelFactory.cs

@@ -1025,11 +1025,12 @@ public virtual OrderTotalsModel PrepareOrderTotalsModel(IList<ShoppingCartItem>
                     }
                 }
                 else
+                {
                     model.HideShippingTotal = _shippingSettings.HideShippingTotal;
+                }
 
                 //payment method fee
-                var paymentMethodSystemName = _workContext.CurrentCustomer.GetAttribute<string>(
-                    SystemCustomerAttributeNames.SelectedPaymentMethod, _storeContext.CurrentStore.Id);
+                var paymentMethodSystemName = _workContext.CurrentCustomer.GetAttribute<string>(SystemCustomerAttributeNames.SelectedPaymentMethod, _storeContext.CurrentStore.Id);
                 decimal paymentMethodAdditionalFee = _paymentService.GetAdditionalHandlingFee(cart, paymentMethodSystemName);
                 decimal paymentMethodAdditionalFeeWithTaxBase = _taxService.GetPaymentMethodAdditionalFee(paymentMethodAdditionalFee, _workContext.CurrentCustomer);
                 if (paymentMethodAdditionalFeeWithTaxBase > decimal.Zero)
@@ -1132,8 +1133,14 @@ public virtual OrderTotalsModel PrepareOrderTotalsModel(IList<ShoppingCartItem>
                     _rewardPointsSettings.DisplayHowMuchWillBeEarned &&
                     shoppingCartTotalBase.HasValue)
                 {
-                    model.WillEarnRewardPoints = _orderTotalCalculationService
-                        .CalculateRewardPoints(_workContext.CurrentCustomer, shoppingCartTotalBase.Value);
+                    decimal? shippingBaseInclTax = model.RequiresShipping
+                        ? _orderTotalCalculationService.GetShoppingCartShippingTotal(cart, true)
+                        : 0;
+                    if (shippingBaseInclTax.HasValue)
+                    {
+                        var totalForRewardPoints = _orderTotalCalculationService.CalculateApplicableOrderTotalForRewardPoints(shippingBaseInclTax.Value, shoppingCartTotalBase.Value);
+                        model.WillEarnRewardPoints = _orderTotalCalculationService.CalculateRewardPoints(_workContext.CurrentCustomer, totalForRewardPoints);
+                    }
                 }
 
             }