Merge pull request #2 from magento-goinc/MAGETWO-44825

MAGETWO-44825 Swatches does not update configurable product price

Author: Bomko, Alex(abomko)

app/code/Magento/Swatches/view/frontend/web/js/SwatchRenderer.js

@@ -2,24 +2,15 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-Number.prototype.formatMoney = function (c, d, t) { //this function helps format price
-    var n = this,
-        c = isNaN(c = Math.abs(c)) ? 2 : c,
-        d = d == undefined ? "." : d,
-        t = t == undefined ? "," : t,
-        s = n < 0 ? "-" : "",
-        i = parseInt(n = Math.abs(+n || 0).toFixed(c)) + "",
-        j = (j = i.length) > 3 ? j % 3 : 0;
-    return s + (j ? i.substr(0, j) + t : "") + i.substr(j).replace(/(\d{3})(?=\d)/g, "$1" + t) + (c ? d + Math.abs(n - i).toFixed(c).slice(2) : "");
-};
-
-Array.prototype.intersection = function (a) {
-    return this.filter(function (i) {
-        return a.indexOf(i) >= 0;
-    });
-};
 
-define(["jquery", "jquery/ui"], function ($) {
+define(['jquery', 'underscore', 'jquery/ui'], function ($, _) {
+    'use strict';
+
+    /**
+     * Parse params
+     * @param {String} query
+     * @returns {{}}
+     */
     $.parseParams = function (query) {
         var re = /([^&=]+)=?([^&]*)/g,
             decodeRE = /\+/g,  // Regex for replacing addition symbol with a space
@@ -176,7 +167,7 @@ define(["jquery", "jquery/ui"], function ($) {
             jsonConfig: {},                                    // option's json config
             jsonSwatchConfig: {},                              // swatch's json config
             selectorProduct: '.product-info-main',             // selector of parental block of prices and swatches (need to know where to seek for price block)
-            selectorProductPrice: '.price-final-price .price', // selector of price wrapper (need to know where set price)
+            selectorProductPrice: '[data-role=priceBox]',      // selector of price wrapper (need to know where set price)
             numberToShow: false,                               // number of controls to show (false or zero = show all)
             onlySwatches: false,                               // show only swatch controls
             enableControlLabel: true,                          // enable label for control
@@ -476,7 +467,13 @@ define(["jquery", "jquery/ui"], function ($) {
             }
 
             $widget._Rebuild();
-            $widget._UpdatePrice();
+
+            if ($widget.element.parents($widget.options.selectorProduct)
+                    .find(this.options.selectorProductPrice).is(':data(mage-priceBox)')
+            ) {
+                $widget._UpdatePrice();
+            }
+
             $widget._LoadProductMedia();
         },
 
@@ -564,7 +561,7 @@ define(["jquery", "jquery/ui"], function ($) {
                         return;
                     }
 
-                    if (products.intersection($widget.optionsMap[id][option].products).length <= 0) {
+                    if (_.intersection(products, $widget.optionsMap[id][option].products).length <= 0) {
                         $this.attr('disabled', true).addClass('disabled');
                     }
                 });
@@ -597,7 +594,7 @@ define(["jquery", "jquery/ui"], function ($) {
                 if (products.length == 0) {
                     products = $widget.optionsMap[id][option].products;
                 } else {
-                    products = products.intersection($widget.optionsMap[id][option].products);
+                    products = _.intersection(products, $widget.optionsMap[id][option].products);
                 }
             });
 
@@ -612,21 +609,48 @@ define(["jquery", "jquery/ui"], function ($) {
         _UpdatePrice: function () {
             var $widget = this,
                 $product = $widget.element.parents($widget.options.selectorProduct),
-                price = $product.find('[data-price-amount]').data('price-amount');
+                $productPrice = $product.find(this.options.selectorProductPrice),
+                options = _.object(_.keys($widget.optionsMap), {}),
+                result;
 
             $widget.element.find('.' + $widget.options.classes.attributeClass + '[option-selected]').each(function () {
-                var id = $(this).attr('attribute-id');
-                var option = $(this).attr('option-selected');
+                var attributeId = $(this).attr('attribute-id'),
+                    selectedOptionId = $(this).attr('option-selected');
+
+                options[attributeId] = selectedOptionId;
+            });
+
+            result = $widget.options.jsonConfig.optionPrices[_.findKey($widget.options.jsonConfig.index, options)];
 
-                price = $widget.optionsMap[id][option].price;
+            $productPrice.trigger(
+                'updatePrice',
+                {
+                    'prices': $widget._getPrices(result, $productPrice.priceBox('option').prices)
+                }
+            );
+
+        },
+
+        /**
+         * Get prices
+         * @param {Object} newPrices
+         * @returns {Object}
+         * @private
+         */
+        _getPrices: function (newPrices, displayPrices) {
+            var $widget = this;
+
+            if (_.isEmpty(newPrices)) {
+                newPrices = $widget.options.jsonConfig.prices;
+            }
+
+            _.each(displayPrices, function (price, code) {
+                if (newPrices[code]) {
+                    displayPrices[code].amount = newPrices[code].amount - displayPrices[code].amount;
+                }
             });
 
-            $product
-                .find($widget.options.selectorProductPrice)
-                .text($widget.options.jsonConfig.template.replace(
-                    '<%- data.price %>',
-                    price.formatMoney(2)
-                ));
+            return displayPrices;
         },
 
         /**