MAGETWO-57136: [GitHub] Wrong initialization sequence in mage.priceBox widget (price-box.js) #6117

Author: omiroshnichenko

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

@@ -2,6 +2,7 @@
  * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 define([
     'jquery',
     'Magento_Catalog/js/price-utils',
@@ -29,6 +30,7 @@ define([
          */
         _init: function initPriceBox() {
             var box = this.element;
+
             box.trigger('updatePrice');
             this.cache.displayPrices = utils.deepClone(this.options.prices);
         },
@@ -70,7 +72,8 @@ define([
         updatePrice: function updatePrice(newPrices) {
             var prices = this.cache.displayPrices,
                 additionalPrice = {},
-                pricesCode = [];
+                pricesCode = [],
+                priceValue, origin, final;
 
             this.cache.additionalPriceObject = this.cache.additionalPriceObject || {};
 
@@ -89,19 +92,19 @@ define([
                     pricesCode = _.keys(additional);
                 }
                 _.each(pricesCode, function (priceCode) {
-                    var priceValue = additional[priceCode] || {};
+                    priceValue = additional[priceCode] || {};
                     priceValue.amount = +priceValue.amount || 0;
                     priceValue.adjustments = priceValue.adjustments || {};
 
                     additionalPrice[priceCode] = additionalPrice[priceCode] || {
-                        'amount': 0,
-                        'adjustments': {}
-                    };
-                    additionalPrice[priceCode].amount =  0 + (additionalPrice[priceCode].amount || 0)
-                        + priceValue.amount;
+                            'amount': 0,
+                            'adjustments': {}
+                        };
+                    additionalPrice[priceCode].amount =  0 + (additionalPrice[priceCode].amount || 0) +
+                        priceValue.amount;
                     _.each(priceValue.adjustments, function (adValue, adCode) {
-                        additionalPrice[priceCode].adjustments[adCode] = 0
-                            + (additionalPrice[priceCode].adjustments[adCode] || 0) + adValue;
+                        additionalPrice[priceCode].adjustments[adCode] = 0 +
+                            (additionalPrice[priceCode].adjustments[adCode] || 0) + adValue;
                     });
                 });
             });
@@ -110,8 +113,8 @@ define([
                 this.cache.displayPrices = utils.deepClone(this.options.prices);
             } else {
                 _.each(additionalPrice, function (option, priceCode) {
-                    var origin = this.options.prices[priceCode] || {},
-                        final = prices[priceCode] || {};
+                    origin = this.options.prices[priceCode] || {};
+                    final = prices[priceCode] || {};
                     option.amount = option.amount || 0;
                     origin.amount = origin.amount || 0;
                     origin.adjustments = origin.adjustments || {};
@@ -127,6 +130,7 @@ define([
             this.element.trigger('reloadPrice');
         },
 
+        /*eslint-disable no-extra-parens*/
         /**
          * Render price unit block.
          */
@@ -135,16 +139,19 @@ define([
                 priceTemplate = mageTemplate(this.options.priceTemplate);
 
             _.each(this.cache.displayPrices, function (price, priceCode) {
-                price.final = _.reduce(price.adjustments, function(memo, amount) {
+                price.final = _.reduce(price.adjustments, function (memo, amount) {
                     return memo + amount;
                 }, price.amount);
 
                 price.formatted = utils.formatPrice(price.final, priceFormat);
 
-                $('[data-price-type="' + priceCode + '"]', this.element).html(priceTemplate({data: price}));
+                $('[data-price-type="' + priceCode + '"]', this.element).html(priceTemplate({
+                    data: price
+                }));
             }, this);
         },
 
+        /*eslint-enable no-extra-parens*/
         /**
          * Overwrites initial (default) prices object.
          * @param {Object} prices
@@ -177,6 +184,7 @@ define([
             var box = this.element,
                 priceHolders = $('[data-price-type]', box),
                 prices = this.options.prices;
+
             this.options.productId = box.data('productId');
 
             if (_.isEmpty(prices)) {
@@ -199,10 +207,7 @@ define([
         _setDefaultsFromPriceConfig: function _setDefaultsFromPriceConfig() {
             var config = this.options.priceConfig;
 
-            if (config) {
-                if (+config.productId !== +this.options.productId) {
-                    return;
-                }
+            if (config && config.prices) {
                 this.options.prices = config.prices;
             }
         }

dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt

@@ -43,7 +43,6 @@ app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js
 app/code/Magento/Catalog/view/adminhtml/web/js/custom-options.js
 app/code/Magento/Catalog/view/adminhtml/web/js/new-category-dialog.js
 app/code/Magento/Catalog/view/adminhtml/web/js/product-gallery.js
-app/code/Magento/Catalog/view/base/web/js/price-box.js
 app/code/Magento/Catalog/view/base/web/js/price-option-date.js
 app/code/Magento/Catalog/view/base/web/js/price-option-file.js
 app/code/Magento/Catalog/view/base/web/js/price-options.js