Merge pull request #698 from magento-tsg/2.0-develop-pr3

[TSG] Backporting for 2.0 (pr3)

Author: Volodymyr Klymenko

app/code/Magento/Bundle/view/base/web/js/price-bundle.js

@@ -295,6 +295,10 @@ define([
             case 'hidden':
                 optionHash = 'bundle-option-' + optionName + '##' + optionValue;
                 optionQty = optionConfig[optionValue].qty || 0;
+                canQtyCustomize = optionConfig[optionValue].customQty === '1';
+                qtyField = element.data('qtyField');
+                qtyField.data('option', element);
+                toggleQtyField(qtyField, optionQty, optionId, optionValue, canQtyCustomize);
                 tempChanges = utils.deepClone(optionConfig[optionValue].prices);
                 tempChanges = applyTierPrice(tempChanges, optionQty, optionConfig);
                 tempChanges = applyQty(tempChanges, optionQty);

app/code/Magento/Catalog/Model/ProductRepository.php

@@ -679,6 +679,7 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
         $collection->setCurPage($searchCriteria->getCurrentPage());
         $collection->setPageSize($searchCriteria->getPageSize());
         $collection->load();
+        $collection->addCategoryIds();
 
         $searchResult = $this->searchResultsFactory->create();
         $searchResult->setSearchCriteria($searchCriteria);

app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php

@@ -632,6 +632,7 @@ public function testGetList($fieldName)
         $searchCriteriaMock->expects($this->once())->method('getPageSize')->willReturn(42);
         $collectionMock->expects($this->once())->method('setPageSize')->with(42);
         $collectionMock->expects($this->once())->method('load');
+        $collectionMock->expects($this->once())->method('addCategoryIds');
         $collectionMock->expects($this->once())->method('getItems')->willReturn([$itemsMock]);
         $collectionMock->expects($this->once())->method('getSize')->willReturn(128);
         $searchResultsMock = $this->getMock(

app/code/Magento/Catalog/view/adminhtml/web/catalog/product-attributes.js

@@ -5,7 +5,8 @@
 define([
     'jquery',
     'underscore',
-    'jquery/ui'
+    'jquery/ui',
+    'mage/translate'
 ], function ($, _) {
     'use strict';
 

app/code/Magento/Catalog/view/frontend/web/js/view/compare-products.js

@@ -4,31 +4,31 @@
  */
 define([
     'uiComponent',
-    'Magento_Customer/js/customer-data'
+    'Magento_Customer/js/customer-data',
+    'mage/translate'
 ], function (Component, customerData) {
     'use strict';
 
     var sidebarInitialized = false;
 
     function initSidebar() {
         if (sidebarInitialized) {
-            return ;
+            return;
         }
         sidebarInitialized = true;
         require([
             'jquery',
             'mage/mage'
         ], function ($) {
+            /*eslint-disable max-len*/
             $('[data-role=compare-products-sidebar]').mage('compareItems', {
-                "removeConfirmMessage": $.mage.__(
-                    "Are you sure you want to remove this item from your Compare Products list?"
-                ),
-                "removeSelector": "#compare-items a.action.delete",
-                "clearAllConfirmMessage": $.mage.__(
-                    "Are you sure you want to remove all items from your Compare Products list?"
-                ),
-                "clearAllSelector": "#compare-clear-all"
+                'removeConfirmMessage': $.mage.__('Are you sure you want to remove this item from your Compare Products list?'),
+                'removeSelector': '#compare-items a.action.delete',
+                'clearAllConfirmMessage': $.mage.__('Are you sure you want to remove all items from your Compare Products list?'),
+                'clearAllSelector': '#compare-clear-all'
             });
+
+            /*eslint-enable max-len*/
         });
     }
 

app/code/Magento/Checkout/view/frontend/web/js/sidebar.js

@@ -219,7 +219,7 @@ define([
                         var msg = response.error_message;
                         if (msg) {
                             alert({
-                                content: $.mage.__(msg)
+                                content: msg
                             });
                         }
                     }

app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js

@@ -7,7 +7,8 @@ define([
     'Magento_Customer/js/customer-data',
     'jquery',
     'ko',
-    'sidebar'
+    'sidebar',
+    'mage/translate'
 ], function (Component, customerData, $, ko) {
     'use strict';
 
@@ -67,9 +68,7 @@ define([
                 'qty': ':input.cart-item-qty',
                 'button': ':button.update-cart-item'
             },
-            'confirmMessage': $.mage.__(
-                'Are you sure you would like to remove this item from the shopping cart?'
-            )
+            'confirmMessage': $.mage.__('Are you sure you would like to remove this item from the shopping cart?')
         });
     }
 

app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml

@@ -29,7 +29,8 @@ require([
     'jquery',
     'mage/template',
     'jquery/file-uploader',
-    'domReady!'
+    'domReady!',
+    'mage/translate'
 ], function ($, mageTemplate) {
     $('#<?php echo $block->getHtmlId() ?> .fileupload').fileupload({
         dataType: 'json',

app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/product-grid.js

@@ -8,7 +8,8 @@ define([
     'jquery',
     'Magento_Ui/js/core/app',
     'underscore',
-    'notification'
+    'notification',
+    'mage/translate'
 ], function (Component, $, bootstrap, _) {
     'use strict';
 
@@ -221,9 +222,7 @@ define([
 
             if (data.items.length) {
                 this.productsModal.notification('add', {
-                    message: $.mage.__(
-                        'Choose a new product to delete and replace the current product configuration.'
-                    ),
+                    message: $.mage.__('Choose a new product to delete and replace the current product configuration.'),
                     messageContainer: this.gridSelector
                 });
             } else {

app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/select_attributes.js

@@ -51,9 +51,13 @@ define([
             this.setNotificationMessage();
         },
         setNotificationMessage: function () {
+            /*eslint-disable max-len*/
+            var msg = $.mage.__('When you remove or add an attribute, we automatically update all configurations and you will need to recreate current configurations manually.');
+
+            /*eslint-enable max-len*/
+
             if (this.mode === 'edit') {
-                this.wizard.setNotificationMessage($.mage.__('When you remove or add an attribute, we automatically ' +
-                'update all configurations and you will need to manually recreate the current configurations.'));
+                this.wizard.setNotificationMessage(msg);
             }
         },
         doSelectSavedAttributes: function () {