Merge remote-tracking branch 'origin/2.3-develop' into RE-develop

Author: tomreece

.github/ISSUE_TEMPLATE.md

@@ -28,8 +28,8 @@
 
 ### Expected result
 <!--- Tell us what should happen -->
-1. [Screenshot, logs]
+1. [Screenshots, logs or description]
 
 ### Actual result
 <!--- Tell us what happens instead -->
-1. [Screenshot, logs]
+1. [Screenshots, logs or description]

app/code/Magento/Backend/etc/adminhtml/di.xml

@@ -145,9 +145,6 @@
                 <item name="dev" xsi:type="const">Magento\Config\Model\Config\Structure\ElementVisibilityInterface::HIDDEN</item>
                 <item name="general/locale/code" xsi:type="const">Magento\Config\Model\Config\Structure\ElementVisibilityInterface::DISABLED</item>
             </argument>
-            <argument name="exemptions" xsi:type="array">
-                <item name="dev/debug/debug_logging" xsi:type="string"/>
-            </argument>
         </arguments>
     </type>
     <type name="Magento\Backend\Model\Search\Config\Result\Builder">

app/code/Magento/Braintree/Test/Unit/Gateway/Response/PayPal/VaultDetailsHandlerTest.php

@@ -88,7 +88,7 @@ protected function setUp()
 
         $this->paymentInfoMock = $this->getMockBuilder(Payment::class)
             ->disableOriginalConstructor()
-            ->setMethods(['__wakeup'])
+            ->setMethods(['__wakeup', 'getExtensionAttributes'])
             ->getMock();
 
         $this->paymentTokenMock = $objectManager->getObject(PaymentToken::class);
@@ -107,6 +107,10 @@ protected function setUp()
             ->setMethods(['create'])
             ->getMock();
 
+        $this->paymentInfoMock->expects(self::any())
+            ->method('getExtensionAttributes')
+            ->willReturn($this->paymentExtensionMock);
+
         $this->subject = [
             'payment' => $this->paymentDataObjectMock,
         ];
@@ -184,7 +188,7 @@ public function testHandleWithoutToken()
             ->method('create');
 
         $this->handler->handle($this->subject, $response);
-        self::assertNull($this->paymentInfoMock->getExtensionAttributes());
+        self::assertNotNull($this->paymentInfoMock->getExtensionAttributes());
     }
 
     /**

app/code/Magento/Braintree/Test/Unit/Gateway/Response/VaultDetailsHandlerTest.php

@@ -80,9 +80,11 @@ protected function setUp()
 
         $this->payment = $this->getMockBuilder(Payment::class)
             ->disableOriginalConstructor()
-            ->setMethods(['__wakeup'])
+            ->setMethods(['__wakeup', 'getExtensionAttributes'])
             ->getMock();
 
+        $this->payment->expects(self::any())->method('getExtensionAttributes')->willReturn($this->paymentExtension);
+
         $config = $this->getConfigMock();
 
         $this->paymentHandler = new VaultDetailsHandler(

app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/QuoteUpdaterTest.php

@@ -13,6 +13,7 @@
 use Magento\Braintree\Observer\DataAssignObserver;
 use Magento\Braintree\Gateway\Config\PayPal\Config;
 use Magento\Braintree\Model\Paypal\Helper\QuoteUpdater;
+use Magento\Quote\Api\Data\CartExtensionInterface;
 
 /**
  * Class QuoteUpdaterTest
@@ -281,7 +282,7 @@ private function updateQuoteStep(\PHPUnit_Framework_MockObject_MockObject $quote
      */
     private function getQuoteMock()
     {
-        return $this->getMockBuilder(Quote::class)
+        $quoteMock = $this->getMockBuilder(Quote::class)
             ->setMethods(
                 [
                     'getIsVirtual',
@@ -291,9 +292,21 @@ private function getQuoteMock()
                     'collectTotals',
                     'getShippingAddress',
                     'getBillingAddress',
+                    'getExtensionAttributes'
                 ]
             )->disableOriginalConstructor()
             ->getMock();
+
+        $cartExtensionMock = $this->getMockBuilder(CartExtensionInterface::class)
+            ->setMethods(['setShippingAssignments'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $quoteMock->expects(self::any())
+            ->method('getExtensionAttributes')
+            ->willReturn($cartExtensionMock);
+
+        return $quoteMock;
     }
 
     /**

app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php

@@ -314,7 +314,8 @@ protected function getBundleOptions()
                         'template' => 'ui/dynamic-rows/templates/collapsible',
                         'additionalClasses' => 'admin__field-wide',
                         'dataScope' => 'data.bundle_options',
-                        'bundleSelectionsName' => 'product_bundle_container.bundle_selections'
+                        'isDefaultFieldScope' => 'is_default',
+                        'bundleSelectionsName' => 'product_bundle_container.bundle_selections',
                     ],
                 ],
             ],
@@ -378,7 +379,10 @@ protected function getBundleOptions()
                                                     'selection_qty' => '',
                                                 ],
                                                 'links' => ['insertData' => '${ $.provider }:${ $.dataProvider }'],
-                                                'source' => 'product'
+                                                'imports' => [
+                                                    'inputType' => '${$.provider}:${$.dataScope}.type',
+                                                ],
+                                                'source' => 'product',
                                             ],
                                         ],
                                     ],
@@ -594,11 +598,14 @@ protected function getBundleSelections()
                     'config' => [
                         'componentType' => Container::NAME,
                         'isTemplate' => true,
-                        'component' => 'Magento_Bundle/js/components/bundle-record',
+                        'component' => 'Magento_Ui/js/dynamic-rows/record',
                         'is_collection' => true,
                         'imports' => [
-                            'onTypeChanged' => '${ $.provider }:${ $.bundleOptionsDataScope }.type'
-                        ]
+                            'inputType' => '${$.parentName}:inputType',
+                        ],
+                        'exports' => [
+                            'isDefaultValue' => '${$.parentName}:isDefaultValue.${$.index}',
+                        ],
                     ],
                 ],
             ],
@@ -691,11 +698,15 @@ protected function getBundleSelections()
                                 'componentType' => Form\Field::NAME,
                                 'formElement' => Form\Element\Checkbox::NAME,
                                 'dataType' => Form\Element\DataType\Price::NAME,
+                                'component' => 'Magento_Bundle/js/components/bundle-user-defined-checkbox',
                                 'label' => __('User Defined'),
                                 'dataScope' => 'selection_can_change_qty',
                                 'value' => '1',
                                 'valueMap' => ['true' => '1', 'false' => '0'],
                                 'sortOrder' => 110,
+                                'imports' => [
+                                    'inputType' => '${$.parentName}:inputType',
+                                ],
                             ],
                         ],
                     ],

app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-checkbox.js

@@ -14,7 +14,10 @@ define([
             clearing: false,
             parentContainer: '',
             parentSelections: '',
-            changer: ''
+            changer: '',
+            exports: {
+                value: '${$.parentName}:isDefaultValue'
+            }
         },
 
         /**
@@ -58,10 +61,6 @@ define([
 
             this.prefer = typeMap[type];
             this.elementTmpl(this.templates[typeMap[type]]);
-
-            if (this.prefer === 'radio' && this.checked()) {
-                this.clearValues();
-            }
         },
 
         /**

app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows-grid.js

@@ -14,7 +14,57 @@ define([
             label: '',
             columnsHeader: false,
             columnsHeaderAfterRender: true,
-            addButton: false
+            addButton: false,
+            isDefaultFieldScope: 'is_default',
+            defaultRecords: {
+                use: [],
+                moreThanOne: false,
+                state: {}
+            },
+            listens: {
+                inputType: 'onInputTypeChange',
+                isDefaultValue: 'onIsDefaultValue'
+            }
+        },
+
+        /**
+         * Handler for type select.
+         *
+         * @param {String} inputType - changed.
+         */
+        onInputTypeChange: function (inputType) {
+            if (this.defaultRecords.moreThanOne && (inputType === 'radio' || inputType === 'select')) {
+                _.each(this.defaultRecords.use, function (index, counter) {
+                    this.source.set(
+                        this.dataScope + '.bundle_selections.' + index + '.' + this.isDefaultFieldScope,
+                        counter ? '0' : '1'
+                    );
+                }.bind(this));
+            }
+        },
+
+        /**
+         * Handler for is_default field.
+         *
+         * @param {Object} data - changed data.
+         */
+        onIsDefaultValue: function (data) {
+            var cb,
+                use = 0;
+
+            this.defaultRecords.use = [];
+
+            cb = function (elem, key) {
+
+                if (~~elem) {
+                    this.defaultRecords.use.push(key);
+                    use++;
+                }
+
+                this.defaultRecords.moreThanOne = use > 1;
+            }.bind(this);
+
+            _.each(data, cb);
         },
 
         /**
@@ -29,7 +79,6 @@ define([
                 recordIndex;
 
             this.parsePagesData(data);
-            this.templates.record.bundleOptionsDataScope = this.dataScope;
 
             if (newData.length) {
                 if (this.insertData().length) {

app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-user-defined-checkbox.js

@@ -0,0 +1,30 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Ui/js/form/element/single-checkbox'
+], function (Checkbox) {
+    'use strict';
+
+    return Checkbox.extend({
+        defaults: {
+            listens: {
+                inputType: 'onInputTypeChange'
+            }
+        },
+
+        /**
+         * Handler for "inputType" property
+         *
+         * @param {String} data
+         */
+        onInputTypeChange: function (data) {
+            data === 'checkbox' || data === 'multi' ?
+                this.clear()
+                    .visible(false) :
+                this.visible(true);
+        }
+    });
+});

app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php

@@ -213,6 +213,22 @@ public function getProductAttributeValue($product, $attribute)
         return (string)$value == '' ? __('No') : $value;
     }
 
+    /**
+     * Check if any of the products has a value set for the attribute
+     *
+     * @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute
+     * @return bool
+     */
+    public function hasAttributeValueForProducts($attribute)
+    {
+        foreach ($this->getItems() as $item) {
+            if ($item->hasData($attribute->getAttributeCode())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * Retrieve Print URL
      *