#708 Properly calculating a minimum price for products with tier prices

Author: RomanovM

src/Plugins/Nop.Plugin.Feed.GoogleShopping/Description.txt

@@ -1,7 +1,7 @@
 Group: Promotion feeds
 FriendlyName: Google Shopping (formely Google Product Search)
 SystemName: PromotionFeed.Froogle
-Version: 1.76
+Version: 1.77
 SupportedVersions: 3.90
 Author: nopCommerce team
 DisplayOrder: 1

src/Plugins/Nop.Plugin.Feed.GoogleShopping/GoogleShoppingService.cs

@@ -353,9 +353,15 @@ public void GenerateFeed(Stream stream, Store store)
                         decimal finalPriceBase;
                         if (_googleShoppingSettings.PricesConsiderPromotions)
                         {
-                            //calculate for the maximum quantity (in case if we have tier prices)
-                            decimal minPossiblePrice = _priceCalculationService.GetFinalPrice(product,
-                                _workContext.CurrentCustomer, decimal.Zero, true, int.MaxValue);
+                            var minPossiblePrice = _priceCalculationService.GetFinalPrice(product, _workContext.CurrentCustomer);
+
+                            if (product.HasTierPrices)
+                            {
+                                //calculate price for the maximum quantity if we have tier prices, and choose minimal
+                                minPossiblePrice = Math.Min(minPossiblePrice,
+                                    _priceCalculationService.GetFinalPrice(product, _workContext.CurrentCustomer, quantity: int.MaxValue));
+                            }
+
                             decimal taxRate;
                             finalPriceBase = _taxService.GetProductPrice(product, minPossiblePrice, out taxRate);
                         }

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

@@ -234,13 +234,19 @@ protected virtual ProductOverviewModel.ProductPriceModel PrepareProductOverviewP
                                 Product minPriceProduct = null;
                                 foreach (var associatedProduct in associatedProducts)
                                 {
-                                    //calculate for the maximum quantity (in case if we have tier prices)
-                                    var tmpPrice = _priceCalculationService.GetFinalPrice(associatedProduct,
-                                        _workContext.CurrentCustomer, decimal.Zero, true, int.MaxValue);
-                                    if (!minPossiblePrice.HasValue || tmpPrice < minPossiblePrice.Value)
+                                    var tmpMinPossiblePrice = _priceCalculationService.GetFinalPrice(associatedProduct, _workContext.CurrentCustomer);
+
+                                    if (associatedProduct.HasTierPrices)
+                                    {
+                                        //calculate price for the maximum quantity if we have tier prices, and choose minimal
+                                        tmpMinPossiblePrice = Math.Min(tmpMinPossiblePrice, 
+                                            _priceCalculationService.GetFinalPrice(associatedProduct, _workContext.CurrentCustomer, quantity: int.MaxValue));
+                                    }
+
+                                    if (!minPossiblePrice.HasValue || tmpMinPossiblePrice < minPossiblePrice.Value)
                                     {
                                         minPriceProduct = associatedProduct;
-                                        minPossiblePrice = tmpPrice;
+                                        minPossiblePrice = tmpMinPossiblePrice;
                                     }
                                 }
                                 if (minPriceProduct != null && !minPriceProduct.CustomerEntersPrice)
@@ -330,10 +336,14 @@ protected virtual ProductOverviewModel.ProductPriceModel PrepareProductOverviewP
                             else
                             {
                                 //prices
+                                var minPossiblePrice = _priceCalculationService.GetFinalPrice(product, _workContext.CurrentCustomer);
 
-                                //calculate for the maximum quantity (in case if we have tier prices)
-                                decimal minPossiblePrice = _priceCalculationService.GetFinalPrice(product,
-                                    _workContext.CurrentCustomer, decimal.Zero, true, int.MaxValue);
+                                if (product.HasTierPrices)
+                                {
+                                    //calculate price for the maximum quantity if we have tier prices, and choose minimal
+                                    minPossiblePrice = Math.Min(minPossiblePrice, 
+                                        _priceCalculationService.GetFinalPrice(product, _workContext.CurrentCustomer, quantity: int.MaxValue));
+                                }
 
                                 decimal taxRate;
                                 decimal oldPriceBase = _taxService.GetProductPrice(product, product.OldPrice, out taxRate);