Merge branch 'issue-7636-Category-discount-makes-prices-display-three-times' into 4.80-bug-fixes

Author: skoshelev

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

@@ -458,28 +458,33 @@ protected virtual async Task<ProductPriceModel> PrepareProductPriceModelAsync(Pr
         var finalPriceWithoutDiscount = await _currencyService.ConvertFromPrimaryStoreCurrencyAsync(finalPriceWithoutDiscountBase, currentCurrency);
         var finalPriceWithDiscount = await _currencyService.ConvertFromPrimaryStoreCurrencyAsync(finalPriceWithDiscountBase, currentCurrency);
 
-        var strikeThroughPrice = decimal.Zero;
-
+        model.Price = await _priceFormatter.FormatPriceAsync(finalPriceWithoutDiscount);
         if (finalPriceWithoutDiscountBase != oldPriceBase && oldPriceBase > decimal.Zero)
-            strikeThroughPrice = oldPrice;
-
-        if (finalPriceWithoutDiscountBase != finalPriceWithDiscountBase)
-            strikeThroughPrice = finalPriceWithoutDiscount;
-
-        if (strikeThroughPrice > decimal.Zero)
         {
-            model.OldPrice = await _priceFormatter.FormatPriceAsync(strikeThroughPrice);
-            model.OldPriceValue = strikeThroughPrice;
+            model.OldPrice = await _priceFormatter.FormatPriceAsync(oldPrice);
+            model.OldPriceValue = oldPrice;
         }
         else
         {
             model.OldPrice = null;
             model.OldPriceValue = null;
         }
 
-        model.Price = await _priceFormatter.FormatPriceAsync(finalPriceWithDiscount);
-        if (hasMultiplePrices)
-            model.Price = string.Format(await _localizationService.GetResourceAsync("Products.PriceRangeFrom"), model.Price);
+        if (addPriceRangeFrom)
+        {
+            var strikeThroughPrice = decimal.Zero;
+
+            if (finalPriceWithoutDiscountBase != finalPriceWithDiscountBase)
+                strikeThroughPrice = finalPriceWithoutDiscount;
+
+            if (strikeThroughPrice > decimal.Zero)
+            {
+                model.OldPrice = await _priceFormatter.FormatPriceAsync(strikeThroughPrice);
+                model.OldPriceValue = strikeThroughPrice;
+            }
+
+            model.Price = await _priceFormatter.FormatPriceAsync(finalPriceWithDiscount);
+        }
 
         if (finalPriceWithoutDiscountBase != finalPriceWithDiscountBase)
         {
@@ -489,6 +494,9 @@ protected virtual async Task<ProductPriceModel> PrepareProductPriceModelAsync(Pr
 
         model.PriceValue = finalPriceWithDiscount;
 
+        if (hasMultiplePrices)
+            model.Price = string.Format(await _localizationService.GetResourceAsync("Products.PriceRangeFrom"), model.Price);
+
         //property for German market
         //we display tax/shipping info only with "shipping enabled" for this product
         //we also ensure this it's not free shipping