Merge remote-tracking branch 'origin/develop' into NORD-EXT-PR-31

Author: RuslanKostiv1

.gitignore

@@ -32,6 +32,8 @@ atlassian*
 
 /pub/media/*.*
 !/pub/media/.htaccess
+/pub/media/attribute/*
+!/pub/media/attribute/.htaccess
 /pub/media/analytics/*
 /pub/media/catalog/*
 !/pub/media/catalog/.htaccess

app/code/Magento/Braintree/Gateway/Response/CardDetailsHandler.php

@@ -5,7 +5,6 @@
  */
 namespace Magento\Braintree\Gateway\Response;
 
-use \Braintree\Transaction;
 use Magento\Braintree\Gateway\Config\Config;
 use Magento\Payment\Gateway\Helper\ContextHelper;
 use Magento\Sales\Api\Data\OrderPaymentInterface;

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

@@ -11,7 +11,6 @@
 use Magento\Bundle\Model\Product\Attribute\Source\Shipment\Type as ShipmentType;
 use Magento\Framework\Stdlib\ArrayManager;
 use Magento\Ui\Component\Container;
-use Magento\Ui\Component\DynamicRows;
 use Magento\Ui\Component\Form;
 use Magento\Ui\Component\Modal;
 use Magento\Catalog\Api\Data\ProductAttributeInterface;

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

@@ -14,7 +14,6 @@
 use Magento\Framework\Pricing\SaleableInterface;
 use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface;
 use Magento\Catalog\Model\Product\Attribute\Backend\Media\EntryConverterPool;
-use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryExtensionFactory;
 
 /**
  * Catalog product model

app/code/Magento/Catalog/Model/ResourceModel/Category.php

@@ -1022,7 +1022,7 @@ public function delete($object)
         $this->getEntityManager()->delete($object);
         $this->_eventManager->dispatch(
             'catalog_category_delete_after_done',
-            ['product' => $object]
+            ['product' => $object, 'category' => $object]
         );
         return $this;
     }

app/code/Magento/Catalog/view/base/web/js/price-box.js

@@ -21,7 +21,6 @@ define([
 
     $.widget('mage.priceBox', {
         options: globalOptions,
-        cache: {},
 
         /**
          * Widget initialisation.
@@ -39,6 +38,7 @@ define([
          * Widget creating.
          */
         _create: function createPriceBox() {
+            this.cache = {};
             var box = this.element;
 
             this._setDefaultsFromPriceConfig();

app/code/Magento/Checkout/Model/Type/Onepage.php

@@ -6,7 +6,6 @@
 namespace Magento\Checkout\Model\Type;
 
 use Magento\Customer\Api\AccountManagementInterface;
-use Magento\Customer\Api\AddressMetadataInterface as AddressMetadata;
 use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\CustomerInterfaceFactory as CustomerDataFactory;

app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js

@@ -164,6 +164,8 @@ define([
             if (!availableRate && window.checkoutConfig.selectedShippingMethod) {
                 availableRate = window.checkoutConfig.selectedShippingMethod;
                 selectShippingMethodAction(window.checkoutConfig.selectedShippingMethod);
+
+                return;
             }
 
             //Unset selected shipping method if not available

app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php

@@ -7,7 +7,6 @@
 namespace Magento\ConfigurableProduct\Controller\Adminhtml\Product\Attribute;
 
 use Magento\Backend\App\Action;
-use Magento\Catalog\Controller\Adminhtml\Product;
 use Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory;
 
 class CreateOptions extends Action

app/code/Magento/ConfigurableProduct/Model/LinkManagement.php

@@ -82,7 +82,7 @@ public function getChildren($sku)
             foreach ($child->getAttributes() as $attribute) {
                 $attrCode = $attribute->getAttributeCode();
                 $value = $child->getDataUsingMethod($attrCode) ?: $child->getData($attrCode);
-                if (null !== $value && $attrCode != 'entity_id') {
+                if (null !== $value) {
                     $attributes[$attrCode] = $value;
                 }
             }