Merge pull request #2581 from magento-chaika/bugfixes

Alexander Akimov · web-flow · commit aaf99a9199d3 · 2018-05-22T16:18:16.000+03:00
[Chaika] Bugfixes
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
@@ -3,14 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Controller\Adminhtml\Product\Initialization;
 
 use Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory as CustomOptionFactory;
 use Magento\Catalog\Api\Data\ProductLinkInterfaceFactory as ProductLinkFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface\Proxy as ProductRepository;
+use Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper\AttributeDefaultValueFilter;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Initialization\Helper\ProductLinks;
 use Magento\Catalog\Model\Product\Link\Resolver as LinkResolver;
+use Magento\Catalog\Model\Product\LinkTypeProvider;
 use Magento\Framework\App\ObjectManager;
 use Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper\AttributeFilter;
 
@@ -81,7 +85,7 @@ class Helper
     private $dateTimeFilter;
 
     /**
-     * @var \Magento\Catalog\Model\Product\LinkTypeProvider
+     * @var LinkTypeProvider
      */
     private $linkTypeProvider;
 
@@ -99,10 +103,10 @@ class Helper
      * @param ProductLinks $productLinks
      * @param \Magento\Backend\Helper\Js $jsHelper
      * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
-     * @param \Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory|null $customOptionFactory
-     * @param \Magento\Catalog\Api\Data\ProductLinkInterfaceFactory|null $productLinkFactory
-     * @param \Magento\Catalog\Api\ProductRepositoryInterface|null $productRepository
-     * @param \Magento\Catalog\Model\Product\LinkTypeProvider|null $linkTypeProvider
+     * @param CustomOptionFactory|null $customOptionFactory
+     * @param ProductLinkFactory |null $productLinkFactory
+     * @param ProductRepositoryInterface|null $productRepository
+     * @param LinkTypeProvider|null $linkTypeProvider
      * @param AttributeFilter|null $attributeFilter
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -113,10 +117,10 @@ public function __construct(
         \Magento\Catalog\Model\Product\Initialization\Helper\ProductLinks $productLinks,
         \Magento\Backend\Helper\Js $jsHelper,
         \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter,
-        \Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory $customOptionFactory = null,
-        \Magento\Catalog\Api\Data\ProductLinkInterfaceFactory $productLinkFactory = null,
-        \Magento\Catalog\Api\ProductRepositoryInterface $productRepository = null,
-        \Magento\Catalog\Model\Product\LinkTypeProvider $linkTypeProvider = null,
+        CustomOptionFactory $customOptionFactory = null,
+        ProductLinkFactory $productLinkFactory = null,
+        ProductRepositoryInterface $productRepository = null,
+        LinkTypeProvider $linkTypeProvider = null,
         AttributeFilter $attributeFilter = null
     ) {
         $this->request = $request;
@@ -125,16 +129,13 @@ public function __construct(
         $this->productLinks = $productLinks;
         $this->jsHelper = $jsHelper;
         $this->dateFilter = $dateFilter;
-        $this->customOptionFactory = $customOptionFactory ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory::class);
-        $this->productLinkFactory = $productLinkFactory ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Catalog\Api\Data\ProductLinkInterfaceFactory::class);
-        $this->productRepository = $productRepository ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-        $this->linkTypeProvider = $linkTypeProvider ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Catalog\Model\Product\LinkTypeProvider::class);
-        $this->attributeFilter = $attributeFilter ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(AttributeFilter::class);
+
+        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+        $this->customOptionFactory = $customOptionFactory ?: $objectManager->get(CustomOptionFactory::class);
+        $this->productLinkFactory = $productLinkFactory ?: $objectManager->get(ProductLinkFactory::class);
+        $this->productRepository = $productRepository ?: $objectManager->get(ProductRepositoryInterface::class);
+        $this->linkTypeProvider = $linkTypeProvider ?: $objectManager->get(LinkTypeProvider::class);
+        $this->attributeFilter = $attributeFilter ?: $objectManager->get(AttributeFilter::class);
     }
 
     /**
@@ -150,8 +151,7 @@ public function __construct(
      */
     public function initializeFromData(\Magento\Catalog\Model\Product $product, array $productData)
     {
-        unset($productData['custom_attributes']);
-        unset($productData['extension_attributes']);
+        unset($productData['custom_attributes'], $productData['extension_attributes']);
 
         if ($productData) {
             $stockData = isset($productData['stock_data']) ? $productData['stock_data'] : [];
@@ -199,28 +199,13 @@ public function initializeFromData(\Magento\Catalog\Model\Product $product, arra
         $productData['tier_price'] = isset($productData['tier_price']) ? $productData['tier_price'] : [];
 
         $useDefaults = (array)$this->request->getPost('use_default', []);
-
         $productData = $this->attributeFilter->prepareProductAttributes($product, $productData, $useDefaults);
-
         $product->addData($productData);
 
         if ($wasLockedMedia) {
             $product->lockAttribute('media');
         }
 
-        /**
-         * Check "Use Default Value" checkboxes values
-         */
-        foreach ($useDefaults as $attributeCode => $useDefaultState) {
-            if ($useDefaultState) {
-                $product->setData($attributeCode, null);
-                // UI component sends value even if field is disabled, so 'Use Config Settings' must be reset to false
-                if ($product->hasData('use_config_' . $attributeCode)) {
-                    $product->setData('use_config_' . $attributeCode, false);
-                }
-            }
-        }
-
         $product = $this->setProductLinks($product);
         $product = $this->fillProductOptions($product, $productOptions);
 
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
@@ -25,11 +25,57 @@ class AttributeFilter
      * @param array $useDefaults
      * @return array
      */
-    public function prepareProductAttributes(Product $product, array $productData, array $useDefaults)
+    public function prepareProductAttributes(Product $product, array $productData, array $useDefaults): array
     {
-        foreach ($productData as $attribute => $value) {
-            if ($this->isAttributeShouldNotBeUpdated($product, $useDefaults, $attribute, $value)) {
-                unset($productData[$attribute]);
+        $attributeList = $product->getAttributes();
+        foreach ($productData as $attributeCode => $attributeValue) {
+            if ($this->isAttributeShouldNotBeUpdated($product, $useDefaults, $attributeCode, $attributeValue)) {
+                unset($productData[$attributeCode]);
+            }
+
+            if (isset($useDefaults[$attributeCode]) && $useDefaults[$attributeCode] === '1') {
+                $productData = $this->prepareDefaultData($attributeList, $attributeCode, $productData);
+                $productData = $this->prepareConfigData($product, $attributeCode, $productData);
+            }
+        }
+
+        return $productData;
+    }
+
+    /**
+     * @param Product $product
+     * @param string $attributeCode
+     * @param array $productData
+     * @return array
+     */
+    private function prepareConfigData(Product $product, $attributeCode, array $productData): array
+    {
+        // UI component sends value even if field is disabled, so 'Use Config Settings' must be reset to false
+        if ($product->hasData('use_config_' . $attributeCode)) {
+            $productData['use_config_' . $attributeCode] = false;
+        }
+
+        return $productData;
+    }
+
+    /**
+     * @param array $attributeList
+     * @param string $attributeCode
+     * @param array $productData
+     * @return array
+     */
+    private function prepareDefaultData(array $attributeList, $attributeCode, array $productData): array
+    {
+        if (isset($attributeList[$attributeCode])) {
+            /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
+            $attribute = $attributeList[$attributeCode];
+            $attributeType = $attribute->getBackendType();
+            // For non-numberic types set the attributeValue to 'false' to trigger their removal from the db
+            if ($attributeType === 'varchar' || $attributeType === 'text' || $attributeType === 'datetime') {
+                $attribute->setIsRequired(false);
+                $productData[$attributeCode] = false;
+            } else {
+                $productData[$attributeCode] = null;
             }
         }
 
@@ -43,9 +89,9 @@ public function prepareProductAttributes(Product $product, array $productData, a
      * @param $value
      * @return bool
      */
-    private function isAttributeShouldNotBeUpdated(Product $product, $useDefaults, $attribute, $value)
+    private function isAttributeShouldNotBeUpdated(Product $product, $useDefaults, $attribute, $value): bool
     {
-        $considerUseDefaultsAttribute = !isset($useDefaults[$attribute]) || $useDefaults[$attribute] === "1";
+        $considerUseDefaultsAttribute = !isset($useDefaults[$attribute]) || $useDefaults[$attribute] === '1';
 
         return ($value === '' && $considerUseDefaultsAttribute && !$product->getData($attribute));
     }
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilterTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilterTest.php
@@ -3,10 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Test\Unit\Controller\Adminhtml\Product\Initialization\Helper;
 
 use Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper\AttributeFilter;
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use PHPUnit_Framework_MockObject_MockObject;
 
 class AttributeFilterTest extends \PHPUnit\Framework\TestCase
 {
@@ -16,12 +19,12 @@ class AttributeFilterTest extends \PHPUnit\Framework\TestCase
     protected $model;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var PHPUnit_Framework_MockObject_MockObject
      */
     protected $objectManagerMock;
 
     /**
-     * @var Product|\PHPUnit_Framework_MockObject_MockObject
+     * @var Product|PHPUnit_Framework_MockObject_MockObject
      */
     protected $productMock;
 
@@ -44,15 +47,25 @@ public function testPrepareProductAttributes(
         $expectedProductData,
         $initialProductData
     ) {
+        /** @var PHPUnit_Framework_MockObject_MockObject | Product $productMockMap */
         $productMockMap = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getData'])
+            ->setMethods(['getData', 'getAttributes'])
             ->getMock();
 
         if (!empty($initialProductData)) {
             $productMockMap->expects($this->any())->method('getData')->willReturnMap($initialProductData);
         }
 
+        if ($useDefaults) {
+            $productMockMap
+                ->expects($this->once())
+                ->method('getAttributes')
+                ->willReturn(
+                    $this->getProductAttributesMock($useDefaults)
+                );
+        }
+
         $actualProductData = $this->model->prepareProductAttributes($productMockMap, $requestProductData, $useDefaults);
         $this->assertEquals($expectedProductData, $actualProductData);
     }
@@ -169,7 +182,7 @@ public function setupInputDataProvider()
                     'description' => 'descr modified'
                 ],
                 'initialProductData' => [
-                    ['name', null,'testName2'],
+                    ['name', null, 'testName2'],
                     ['sku', null, 'testSku2'],
                     ['price', null, '101'],
                     ['description', null, 'descr text']
@@ -180,7 +193,8 @@ public function setupInputDataProvider()
                     'name' => 'testName3',
                     'sku' => 'testSku3',
                     'price' => '103',
-                    'special_price' => '100'
+                    'special_price' => '100',
+                    'description' => 'descr modified',
                 ],
                 'useDefaults' => [
                     'description' => '1'
@@ -190,14 +204,38 @@ public function setupInputDataProvider()
                     'sku' => 'testSku3',
                     'price' => '103',
                     'special_price' => '100',
+                    'description' => false
                 ],
                 'initialProductData' => [
-                    ['name', null,'testName2'],
+                    ['name', null, 'testName2'],
                     ['sku', null, 'testSku2'],
                     ['price', null, '101'],
                     ['description', null, 'descr text']
                 ]
             ],
         ];
     }
+
+    /**
+     * @param array $useDefaults
+     * @return array
+     */
+    private function getProductAttributesMock(array $useDefaults): array
+    {
+        $returnArray = [];
+        foreach ($useDefaults as $attributecode => $isDefault) {
+            if ($isDefault === '1') {
+                /** @var Attribute | PHPUnit_Framework_MockObject_MockObject $attribute */
+                $attribute = $this->getMockBuilder(Attribute::class)
+                    ->disableOriginalConstructor()
+                    ->getMock();
+                $attribute->expects($this->any())
+                    ->method('getBackendType')
+                    ->willReturn('varchar');
+
+                $returnArray[$attributecode] = $attribute;
+            }
+        }
+        return $returnArray;
+    }
 }
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/proceed-to-checkout.js b/app/code/Magento/Checkout/view/frontend/web/js/proceed-to-checkout.js
@@ -22,6 +22,7 @@ define([
 
                 return false;
             }
+            $(element).attr('disabled', true);
             location.href = config.checkoutUrl;
         });
 

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ define([`
`22`	`22`
`23`	`23`	`return false;`
`24`	`24`	`}`
	`25`	`+ $(element).attr('disabled', true);`
`25`	`26`	`location.href = config.checkoutUrl;`
`26`	`27`	`});`
`27`	`28`