Merge remote-tracking branch 'origin/MC-24044' into 2.4-develop-pr144

Author: zakdma

app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js

@@ -578,7 +578,7 @@ define([
             _.each(elements, function (element) {
                 var selected = element.options[element.selectedIndex],
                     config = selected && selected.config,
-                    priceValue = {};
+                    priceValue = this._calculatePrice({});
 
                 if (config && config.allowedProducts.length === 1) {
                     priceValue = this._calculatePrice(config);
@@ -632,12 +632,10 @@ define([
          */
         _calculatePrice: function (config) {
             var displayPrices = $(this.options.priceHolderSelector).priceBox('option').prices,
-                newPrices = this.options.spConfig.optionPrices[_.first(config.allowedProducts)];
+                newPrices = this.options.spConfig.optionPrices[_.first(config.allowedProducts)] || {};
 
             _.each(displayPrices, function (price, code) {
-                if (newPrices[code]) {
-                    displayPrices[code].amount = newPrices[code].amount - displayPrices[code].amount;
-                }
+                displayPrices[code].amount = newPrices[code] ? newPrices[code].amount - displayPrices[code].amount : 0;
             });
 
             return displayPrices;

dev/tests/js/jasmine/tests/app/code/Magento/ConfigurableProduct/view/frontend/js/configurable.test.js

@@ -3,6 +3,7 @@
  * See COPYING.txt for license details.
  */
 
+/* eslint-disable max-nested-callbacks */
 define([
     'jquery',
     'Magento_ConfigurableProduct/js/configurable'
@@ -17,37 +18,69 @@ define([
             'class=\'super-attribute-select\'>' +
             '<option value=\'\'></option>' +
             '</select>',
-            selectElement = $(option);
+        selectElement = $(option);
 
     beforeEach(function () {
         widget = new Configurable();
         widget.options = {
-            spConfig: {
-                chooseText: 'Chose an Option...',
-                attributes:
+            settings: [
                 {
-                    'size': {
-                        options: [
-                            {
-                                id: '2',
-                                value: '2'
-                            },
-                            {
-                                id: 3,
-                                value: 'red'
-
+                    selectedIndex: 0,
+                    options: [
+                        {
+                            label: 'Chose an Option...'
+                        },
+                        {
+                            label: 'red',
+                            config: {
+                                id: '4',
+                                label: 'red',
+                                products: [
+                                    '4'
+                                ],
+                                initialLabel: 'red',
+                                allowedProducts: ['4']
                             }
-                        ]
+                        }
+                    ]
+                }
+            ],
+            priceHolderSelector: 'testSelector',
+            spConfig: {
+                chooseText: 'Chose an Option...',
+                optionPrices: {
+                    4: {
+                        testPrice1: {
+                            amount: 40
+                        },
+                        testPrice2: {
+                            amount: 30
+                        }
                     }
                 },
+                attributes:
+                    {
+                        'size': {
+                            options: [
+                                {
+                                    id: '2',
+                                    value: '2'
+                                },
+                                {
+                                    id: 3,
+                                    value: 'red'
+
+                                }
+                            ]
+                        }
+                    },
                 prices: {
                     finalPrice: {
                         amount: 12
                     }
                 }
             },
-            values: {
-            }
+            values: {}
         };
     });
 
@@ -65,5 +98,30 @@ define([
             widget._fillSelect(selectElement[0]);
             expect(widget.options.values.size).toBe(undefined);
         });
+
+        it('check if widget will return correct price values in case option is selected or not.', function () {
+            var result;
+
+            spyOn($.fn, 'priceBox').and.callFake(function () {
+                return {
+                    prices: {
+                        testPrice1: {
+                            amount: 10
+                        },
+                        testPrice2: {
+                            amount: 20
+                        }
+                    }
+                };
+            });
+            result = widget._getPrices().prices;
+            expect(result.testPrice1.amount).toBe(0);
+            expect(result.testPrice2.amount).toBe(0);
+
+            widget.options.settings[0].selectedIndex = 1;
+            result = widget._getPrices().prices;
+            expect(result.testPrice1.amount).toBe(30);
+            expect(result.testPrice2.amount).toBe(10);
+        });
     });
 });