Tax calculatation round fix in Gross > Net scenarios

muratcakir · muratcakir · commit d9e97c1d940f · 2014-04-02T19:57:37.000+02:00
diff --git a/src/Libraries/SmartStore.Services/Orders/OrderTotalCalculationService.cs b/src/Libraries/SmartStore.Services/Orders/OrderTotalCalculationService.cs
@@ -179,13 +179,32 @@ public virtual void GetShoppingCartSubTotal(IList<OrganizedShoppingCartItem> car
             decimal subTotalInclTaxWithoutDiscount = decimal.Zero;
 
             foreach (var shoppingCartItem in cart)
-            {
-                decimal taxRate = decimal.Zero;
-                decimal sciSubTotal = _priceCalculationService.GetSubTotal(shoppingCartItem, true);
+			{
+				#region Obsolete (RoundFix)
+				//decimal taxRate = decimal.Zero;
+				//decimal sciSubTotal = _priceCalculationService.GetSubTotal(shoppingCartItem, true);
+
+				//decimal sciExclTax = _taxService.GetProductPrice(shoppingCartItem.Item.Product, sciSubTotal, false, customer, out taxRate);
+				//decimal sciInclTax = _taxService.GetProductPrice(shoppingCartItem.Item.Product, sciSubTotal, true, customer, out taxRate);
+				#endregion
+
+				#region RoundFix
+				int temQuantity = shoppingCartItem.Item.Quantity;
+				shoppingCartItem.Item.Quantity = 1;
+
+				decimal taxRate = decimal.Zero;
+				decimal sciSubTotal = _priceCalculationService.GetSubTotal(shoppingCartItem, true);
+
+				//Adaption to eliminate rounding erro
+				decimal sciExclTax = _taxService.GetProductPrice(shoppingCartItem.Item.Product, sciSubTotal, false, customer, out taxRate);
+				sciExclTax = Math.Round(sciExclTax, 2) * temQuantity;
+				decimal sciInclTax = _taxService.GetProductPrice(shoppingCartItem.Item.Product, sciSubTotal, true, customer, out taxRate);
+				sciInclTax = Math.Round(sciInclTax, 2) * temQuantity;
+
+				shoppingCartItem.Item.Quantity = temQuantity;
+				#endregion
 
-                decimal sciExclTax = _taxService.GetProductPrice(shoppingCartItem.Item.Product, sciSubTotal, false, customer, out taxRate);
-                decimal sciInclTax = _taxService.GetProductPrice(shoppingCartItem.Item.Product, sciSubTotal, true, customer, out taxRate);
-                subTotalExclTaxWithoutDiscount += sciExclTax;
+				subTotalExclTaxWithoutDiscount += sciExclTax;
                 subTotalInclTaxWithoutDiscount += sciInclTax;
 
                 //tax rates
diff --git a/src/Libraries/SmartStore.Services/Tax/TaxService.cs b/src/Libraries/SmartStore.Services/Tax/TaxService.cs
@@ -165,9 +165,15 @@ protected decimal CalculatePrice(decimal price, decimal percent, bool increase)
                 result = price * (1 + percent / 100);
             }
             else
-            {
-                result = price - (price) / (100 + percent) * percent;
-            }
+			{
+				#region Obsolete (RoundFix)
+				//result = price - (price) / (100 + percent) * percent;
+				#endregion
+
+				#region RoundFix
+				result = price - Math.Round((price) / (100 + percent) * percent, 2);
+				#endregion
+			}
             return result;
         }
 
diff --git a/src/Presentation/SmartStore.Web/Controllers/ShoppingCartController.cs b/src/Presentation/SmartStore.Web/Controllers/ShoppingCartController.cs
@@ -316,13 +316,23 @@ private ShoppingCartModel.ShoppingCartItemModel PrepareShoppingCartItemModel(Org
 			{
 				//sub total
 				decimal taxRate = decimal.Zero;
-				decimal shoppingCartItemSubTotalWithDiscountBase = _taxService.GetProductPrice(product, _priceCalculationService.GetSubTotal(sci, true), out taxRate);
+
+				#region Obsolete (RoundFix)
+				//decimal shoppingCartItemSubTotalWithDiscountBase = _taxService.GetProductPrice(product, _priceCalculationService.GetSubTotal(sci, true), out taxRate);
+				//decimal shoppingCartItemSubTotalWithDiscount = _currencyService.ConvertFromPrimaryStoreCurrency(shoppingCartItemSubTotalWithDiscountBase, _workContext.WorkingCurrency);
+				//model.SubTotal = _priceFormatter.FormatPrice(shoppingCartItemSubTotalWithDiscount);
+				//// display an applied discount amount
+				//decimal shoppingCartItemSubTotalWithoutDiscountBase = _taxService.GetProductPrice(product, _priceCalculationService.GetSubTotal(sci, false), out taxRate);
+				#endregion
+
+				#region RoundFix
+				decimal shoppingCartItemSubTotalWithDiscountBase = Math.Round(_taxService.GetProductPrice(product, _priceCalculationService.GetUnitPrice(sci, true), out taxRate), 2) * sci.Item.Quantity;
 				decimal shoppingCartItemSubTotalWithDiscount = _currencyService.ConvertFromPrimaryStoreCurrency(shoppingCartItemSubTotalWithDiscountBase, _workContext.WorkingCurrency);
-				
 				model.SubTotal = _priceFormatter.FormatPrice(shoppingCartItemSubTotalWithDiscount);
+				// display an applied discount amount
+				decimal shoppingCartItemSubTotalWithoutDiscountBase = Math.Round(_taxService.GetProductPrice(product, _priceCalculationService.GetUnitPrice(sci, false), out taxRate), 2) * sci.Item.Quantity;
+				#endregion
 
-				//display an applied discount amount
-				decimal shoppingCartItemSubTotalWithoutDiscountBase = _taxService.GetProductPrice(product, _priceCalculationService.GetSubTotal(sci, false), out taxRate);
 				decimal shoppingCartItemDiscountBase = shoppingCartItemSubTotalWithoutDiscountBase - shoppingCartItemSubTotalWithDiscountBase;
 
 				if (shoppingCartItemDiscountBase > decimal.Zero)
