Fixes wrong base price on product and cart page when a special price is active

Author: mgesing

changelog.md

@@ -40,6 +40,7 @@
 * File upload of a checkout attribute was not stored on cart page.
 * Redirecting within checkout may have displayed an incorrect URL in the browser.
 * Server cannot modify cookies after HTTP headers have been sent.
+* Wrong base price on product and cart page when a special price is active.
 
 
 ## SmartStore.NET 3.1.5

src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs

@@ -1159,15 +1159,17 @@ public ProductDetailsModel PrepareProductDetailModel(
                                 model.ProductPrice.NoteWithDiscount = T("Products.Bundle.PriceWithDiscount.Note");
                             }
 
+                            var basePriceAdjustment = (_priceCalculationService.GetFinalPrice(product, true) - finalPriceWithDiscount) * (-1);
+
                             model.BasePriceInfo = product.GetBasePriceInfo(
                                 _localizationService, 
                                 _priceFormatter, 
                                 _currencyService,
                                 _taxService, 
                                 _priceCalculationService,
 								customer,
-                                currency, 
-                                (product.Price - finalPriceWithDiscount) * (-1));
+                                currency,
+                                basePriceAdjustment);
 						}
 
 						// Calculate saving.

src/Presentation/SmartStore.Web/Controllers/ShoppingCartController.cs

@@ -283,7 +283,6 @@ private ShoppingCartModel.ShoppingCartItemModel PrepareShoppingCartItemModel(Org
 				DisableWishlistButton = product.DisableWishlistButton
 			};
 
-			model.BasePrice = product.GetBasePriceInfo(_localizationService, _priceFormatter, _currencyService, _taxService, _priceCalculationService, customer, currency);
 			model.ProductUrl = _productUrlHelper.GetProductUrl(model.ProductSeName, sci);
 
 			if (item.BundleItem != null)
@@ -417,6 +416,8 @@ private ShoppingCartModel.ShoppingCartItemModel PrepareShoppingCartItemModel(Org
 					model.Discount = _priceFormatter.FormatPrice(itemDiscount);
 				}
 
+                var basePriceAdjustment = (_priceCalculationService.GetFinalPrice(product, true) - _priceCalculationService.GetUnitPrice(sci, true)) * (-1);
+
                 model.BasePrice = product.GetBasePriceInfo(
                     _localizationService, 
                     _priceFormatter,
@@ -425,7 +426,7 @@ private ShoppingCartModel.ShoppingCartItemModel PrepareShoppingCartItemModel(Org
                     _priceCalculationService,
 					customer,
                     currency,
-                    (product.Price - _priceCalculationService.GetUnitPrice(sci, true)) * (-1)
+                    basePriceAdjustment
                 );
 			}