ACP2E-291: Excl.Tax Tier Price issue on QTY Change

Author: viktym

app/code/Magento/Catalog/view/base/web/js/price-box.js

@@ -223,37 +223,42 @@ define([
          * Updates product final and base price according to tier prices
          */
         updateProductTierPrice: function updateProductTierPrice() {
-            var productQty = $(this.qtyInfo).val(),
-                tierPrice,
-                prices = {'prices': {}},
-                i;
+            var originalPrice,
+                prices = {'prices': {}};
 
             if (this.options.prices.finalPrice) {
-                var originalPrice = this.options.prices.finalPrice.amount;
-
-                for (i = 0; i < this.options.priceConfig.tierPrices.length; i++) {
-                    if (productQty >= this.options.priceConfig.tierPrices[i].qty) {
-                        tierPrice = this.options.priceConfig.tierPrices[i].price;
-                    }
-                }
-                prices.prices.finalPrice = {'amount': tierPrice - originalPrice};
+                originalPrice = this.options.prices.finalPrice.amount;
+                prices.prices.finalPrice = {'amount': this.getPrice('price') - originalPrice};
             }
 
             if (this.options.prices.basePrice) {
-                var originalBasePrice = this.options.prices.basePrice.amount,
-                    tierBasePrice,
-                    tierPriceItem;
-
-                for (i = 0; i < this.options.priceConfig.tierPrices.length; i++) {
-                    tierPriceItem = this.options.priceConfig.tierPrices[i];
-                    if (productQty >= tierPriceItem.qty && tierPriceItem.basePrice) {
-                        tierBasePrice = tierPriceItem.basePrice;
-                    }
-                }
-                prices.prices.basePrice = {'amount': tierBasePrice - originalBasePrice};
+                originalPrice = this.options.prices.basePrice.amount;
+                prices.prices.basePrice = {'amount': this.getPrice('basePrice') - originalPrice};
             }
 
             this.updatePrice(prices);
+        },
+
+        /**
+         * Returns price.
+         *
+         * @param {String} priceKey
+         * @returns {Number}
+         */
+        getPrice: function (priceKey) {
+            var productQty = $(this.qtyInfo).val(),
+                result,
+                tierPriceItem,
+                i;
+
+            for (i = 0; i < this.options.priceConfig.tierPrices.length; i++) {
+                tierPriceItem = this.options.priceConfig.tierPrices[i];
+                if (productQty >= tierPriceItem.qty && tierPriceItem[priceKey]) {
+                    result = tierPriceItem[priceKey];
+                }
+            }
+
+            return result;
         }
     });