#26314: fixed logic for updating map price for selected swatch option on product list

Author: Vaha

app/code/Magento/Msrp/view/base/web/js/msrp.js

@@ -299,8 +299,9 @@ define([
          * @param {Event} event
          * @param {mixed} priceIndex
          * @param {Object} prices
+         * @param {Object|undefined} $priceBox
          */
-        onUpdateMsrpPrice: function onUpdateMsrpPrice(event, priceIndex, prices) {
+        onUpdateMsrpPrice: function onUpdateMsrpPrice(event, priceIndex, prices, $priceBox = undefined) {
 
             var defaultMsrp,
                 defaultPrice,
@@ -322,18 +323,20 @@ define([
                 finalPrice = prices[priceIndex].finalPrice.amount;
 
                 if (msrpPrice === null || msrpPrice <= finalPrice) {
-                    this.updateNonMsrpPrice(priceUtils.formatPrice(finalPrice));
+                    this.updateNonMsrpPrice(priceUtils.formatPrice(finalPrice), $priceBox);
                 } else {
                     this.updateMsrpPrice(
                         priceUtils.formatPrice(finalPrice),
                         priceUtils.formatPrice(msrpPrice),
-                        false);
+                        false,
+                        $priceBox);
                 }
             } else {
                 this.updateMsrpPrice(
                     priceUtils.formatPrice(defaultPrice),
                     priceUtils.formatPrice(defaultMsrp),
-                    true);
+                    true,
+                    $priceBox);
             }
         },
 
@@ -343,41 +346,43 @@ define([
          * @param {String} finalPrice
          * @param {String} msrpPrice
          * @param {Boolean} useDefaultPrice
+         * @param {Object|undefined} $priceBox
          */
-        updateMsrpPrice: function (finalPrice, msrpPrice, useDefaultPrice) {
+        updateMsrpPrice: function (finalPrice, msrpPrice, useDefaultPrice, $priceBox) {
             var options = this.tierOptions || this.options;
 
-            $(this.options.fallbackPriceContainer).hide();
-            $(this.options.displayPriceContainer).show();
-            $(this.options.mapInfoLinks).show();
+            $(this.options.fallbackPriceContainer, $priceBox).hide();
+            $(this.options.displayPriceContainer, $priceBox).show();
+            $(this.options.mapInfoLinks, $priceBox).show();
 
             if (useDefaultPrice || !this.wasOpened) {
                 if (this.$popup) {
                     this.$popup.find(this.options.msrpLabelId).html(options.msrpPrice);
                     this.$popup.find(this.options.priceLabelId).html(options.realPrice);
                 }
 
-                $(this.options.displayPriceElement).html(msrpPrice);
+                $(this.options.displayPriceElement, $priceBox).html(msrpPrice);
                 this.wasOpened = true;
             }
 
             if (!useDefaultPrice) {
                 this.$popup.find(this.options.msrpPriceElement).html(msrpPrice);
                 this.$popup.find(this.options.priceElement).html(finalPrice);
-                $(this.options.displayPriceElement).html(msrpPrice);
+                $(this.options.displayPriceElement, $priceBox).html(msrpPrice);
             }
         },
 
         /**
          * Display non MAP price for irrelevant products
          *
          * @param {String} price
+         * @param {Object|undefined} $priceBox
          */
-        updateNonMsrpPrice: function (price) {
-            $(this.options.fallbackPriceElement).html(price);
-            $(this.options.displayPriceContainer).hide();
-            $(this.options.mapInfoLinks).hide();
-            $(this.options.fallbackPriceContainer).show();
+        updateNonMsrpPrice: function (price, $priceBox) {
+            $(this.options.fallbackPriceElement, $priceBox).html(price);
+            $(this.options.displayPriceContainer, $priceBox).hide();
+            $(this.options.mapInfoLinks, $priceBox).hide();
+            $(this.options.fallbackPriceContainer, $priceBox).show();
         },
 
         /**

app/code/Magento/Swatches/view/base/web/js/swatch-renderer.js

@@ -723,7 +723,9 @@ define([
                 $label = $parent.find('.' + $widget.options.classes.attributeSelectedOptionLabelClass),
                 attributeId = $parent.attr('attribute-id'),
                 $input = $parent.find('.' + $widget.options.classes.attributeInput),
-                checkAdditionalData = JSON.parse(this.options.jsonSwatchConfig[attributeId]['additional_data']);
+                checkAdditionalData = JSON.parse(this.options.jsonSwatchConfig[attributeId]['additional_data']),
+                $priceBox = $widget.element.parents($widget.options.selectorProduct)
+                    .find(this.options.selectorProductPrice);
 
             if ($widget.inProductList) {
                 $input = $widget.productForm.find(
@@ -751,16 +753,15 @@ define([
 
             $widget._Rebuild();
 
-            if ($widget.element.parents($widget.options.selectorProduct)
-                    .find(this.options.selectorProductPrice).is(':data(mage-priceBox)')
-            ) {
+            if ($priceBox.is(':data(mage-priceBox)')) {
                 $widget._UpdatePrice();
             }
 
             $(document).trigger('updateMsrpPriceBlock',
                 [
                     _.findKey($widget.options.jsonConfig.index, $widget.options.jsonConfig.defaultValues),
-                    $widget.options.jsonConfig.optionPrices
+                    $widget.options.jsonConfig.optionPrices,
+                    $priceBox
                 ]);
 
             if (parseInt(checkAdditionalData['update_product_preview_image'], 10) === 1) {