Merge remote-tracking branch 'origin/MC-32772' into 2.4-develop-pr20

serhii-balko · serhii-balko · commit 0f19848cd7b3 · 2020-04-01T10:04:15.000+03:00
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js b/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js
@@ -8,8 +8,9 @@ define([
     'mage/translate',
     'underscore',
     'Magento_Catalog/js/product/view/product-ids-resolver',
+    'Magento_Catalog/js/product/view/product-info-resolver',
     'jquery-ui-modules/widget'
-], function ($, $t, _, idsResolver) {
+], function ($, $t, _, idsResolver, productInfoResolver) {
     'use strict';
 
     $.widget('mage.catalogAddToCart', {
@@ -24,7 +25,8 @@ define([
             addToCartButtonDisabledClass: 'disabled',
             addToCartButtonTextWhileAdding: '',
             addToCartButtonTextAdded: '',
-            addToCartButtonTextDefault: ''
+            addToCartButtonTextDefault: '',
+            productInfoResolver: productInfoResolver
         },
 
         /** @inheritdoc */
@@ -90,6 +92,7 @@ define([
         ajaxSubmit: function (form) {
             var self = this,
                 productIds = idsResolver(form),
+                productInfo = self.options.productInfoResolver(form),
                 formData;
 
             $(self.options.minicartSelector).trigger('contentLoading');
@@ -119,6 +122,7 @@ define([
                     $(document).trigger('ajax:addToCart', {
                         'sku': form.data().productSku,
                         'productIds': productIds,
+                        'productInfo': productInfo,
                         'form': form,
                         'response': res
                     });
@@ -172,6 +176,7 @@ define([
                     $(document).trigger('ajax:addToCart:error', {
                         'sku': form.data().productSku,
                         'productIds': productIds,
+                        'productInfo': productInfo,
                         'form': form,
                         'response': res
                     });
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/view/product-info-resolver.js b/app/code/Magento/Catalog/view/frontend/web/js/product/view/product-info-resolver.js
@@ -0,0 +1,35 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'underscore',
+    'Magento_Catalog/js/product/view/product-info'
+], function (_, productInfo) {
+    'use strict';
+
+    /**
+     * Returns info about products in form.
+     *
+     * @param {jQuery} $form
+     * @return {Array}
+     */
+    return function ($form) {
+        var product = _.findWhere($form.serializeArray(), {
+                name: 'product'
+            });
+
+        if (!_.isUndefined(product)) {
+            productInfo().push(
+                {
+                    'id': product.value
+                }
+            );
+        }
+
+        return _.uniq(productInfo(), function (item) {
+            return item.id;
+        });
+    };
+});
+
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/view/product-info.js b/app/code/Magento/Catalog/view/frontend/web/js/product/view/product-info.js
@@ -0,0 +1,12 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'ko'
+], function (ko) {
+    'use strict';
+
+    return ko.observableArray([]);
+});
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
@@ -260,7 +260,12 @@ define([
 
             if (!_.isUndefined(productData)) {
                 $(document).trigger('ajax:removeFromCart', {
-                    productIds: [productData['product_id']]
+                    productIds: [productData['product_id']],
+                    productInfo: [
+                        {
+                            'id': productData['product_id']
+                        }
+                    ]
                 });
 
                 if (window.location.href.indexOf(this.shoppingCartUrl) === 0) {
diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/requirejs-config.js b/app/code/Magento/ConfigurableProduct/view/frontend/requirejs-config.js
@@ -8,5 +8,12 @@ var config = {
         '*': {
             configurable: 'Magento_ConfigurableProduct/js/configurable'
         }
+    },
+    config: {
+        mixins: {
+            'Magento_Catalog/js/catalog-add-to-cart': {
+                'Magento_ConfigurableProduct/js/catalog-add-to-cart-mixin': true
+            }
+        }
     }
 };
diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/catalog-add-to-cart-mixin.js b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/catalog-add-to-cart-mixin.js
@@ -0,0 +1,33 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'underscore',
+    'jquery',
+    'Magento_ConfigurableProduct/js/product/view/product-info-resolver'
+], function (_, $, productInfoResolver) {
+    'use strict';
+
+    return function (widget) {
+
+        $.widget('mage.catalogAddToCart', widget, {
+            /**
+             * @param {jQuery} form
+             */
+            ajaxSubmit: function (form) {
+                var isConfigurable = !!_.find(form.serializeArray(), function (item) {
+                    return item.name.indexOf('super_attribute') !== -1;
+                });
+
+                if (isConfigurable) {
+                    this.options.productInfoResolver = productInfoResolver;
+                }
+
+                return this._super(form);
+            }
+        });
+
+        return $.mage.catalogAddToCart;
+    };
+});
diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/product/view/product-info-resolver.js b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/product/view/product-info-resolver.js
@@ -0,0 +1,47 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'underscore',
+    'Magento_Catalog/js/product/view/product-info'
+], function (_, productInfo) {
+    'use strict';
+
+    /**
+     * Returns info about configurable products in form.
+     *
+     * @param {jQuery} $form
+     * @return {Array}
+     */
+    return function ($form) {
+        var optionValues = [],
+            product = _.findWhere($form.serializeArray(), {
+                name: 'product'
+            }),
+            productId;
+
+        if (!_.isUndefined(product)) {
+            productId = product.value;
+            _.each($form.serializeArray(), function (item) {
+                if (item.name.indexOf('super_attribute') !== -1) {
+                    optionValues.push(item.value);
+                }
+            });
+            optionValues.sort();
+            productInfo().push(
+                {
+                    'id': productId,
+                    'optionValues': optionValues
+                }
+            );
+        }
+
+        return _.uniq(productInfo(), function (item) {
+            var optionValuesStr = item.optionValues ? item.optionValues.join() : '';
+
+            return item.id + optionValuesStr;
+        });
+    };
+});
+
diff --git a/app/code/Magento/GroupedProduct/view/frontend/web/js/product-ids-resolver.js b/app/code/Magento/GroupedProduct/view/frontend/web/js/product-ids-resolver.js
@@ -4,8 +4,9 @@
  */
 define([
     'jquery',
-    'Magento_Catalog/js/product/view/product-ids'
-], function ($, productIds) {
+    'Magento_Catalog/js/product/view/product-ids',
+    'Magento_Catalog/js/product/view/product-info'
+], function ($, productIds, productInfo) {
     'use strict';
 
     /**
@@ -18,6 +19,11 @@ define([
     return function (config, element) {
         $(element).find('div[data-product-id]').each(function () {
             productIds.push($(this).data('productId').toString());
+            productInfo.push(
+                {
+                    'id': $(this).data('productId').toString()
+                }
+            );
         });
 
         return productIds();
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/sidebar.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/sidebar.test.js
@@ -67,7 +67,9 @@ define([
                 sidebar._removeItemAfter(elem);
                 expect(mocks['Magento_Customer/js/customer-data'].get).toHaveBeenCalledWith('cart');
                 expect(jQuery('body').trigger).toHaveBeenCalledWith('ajax:removeFromCart', {
-                    'productIds': ['5']
+                    'productIds': ['5'], 'productInfo': [{
+                        'id': '5'
+                    }]
                 });
             });
 

Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,12 @@ var config = {`
`8`	`8`	`'*': {`
`9`	`9`	`configurable: 'Magento_ConfigurableProduct/js/configurable'`
`10`	`10`	`}`
	`11`	`+ },`
	`12`	`+ config: {`
	`13`	`+ mixins: {`
	`14`	`+ 'Magento_Catalog/js/catalog-add-to-cart': {`
	`15`	`+ 'Magento_ConfigurableProduct/js/catalog-add-to-cart-mixin': true`
	`16`	`+ }`
	`17`	`+ }`
`11`	`18`	`}`
`12`	`19`	`};`