Merge remote-tracking branch 'l3/MC-40943' into L3-PR-20210310

Author: veloraven

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -1855,7 +1855,7 @@ protected function _saveProducts()
                 }
 
                 $productTypeModel = $this->_productTypeModels[$productType];
-                if (!empty($rowData['tax_class_name'])) {
+                if (isset($rowData['tax_class_name']) && strlen($rowData['tax_class_name'])) {
                     $rowData['tax_class_id'] =
                         $this->taxClassProcessor->upsertTaxClass($rowData['tax_class_name'], $productTypeModel);
                 }

app/code/Magento/CatalogImportExport/Model/Import/Product/TaxClassProcessor.php

@@ -7,9 +7,25 @@
 
 use Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType;
 use Magento\Tax\Model\ClassModel;
+use Magento\Tax\Model\ClassModelFactory;
+use Magento\Tax\Model\ResourceModel\TaxClass\Collection;
+use Magento\Tax\Model\ResourceModel\TaxClass\CollectionFactory;
 
+/**
+ * Imported products tax class processor
+ */
 class TaxClassProcessor
 {
+    /**
+     * Empty tax class name
+     */
+    private const CLASS_NONE_NAME = 'none';
+
+    /**
+     * Empty tax class ID
+     */
+    private const CLASS_NONE_ID = 0;
+
     /**
      * Tax attribute code.
      */
@@ -25,24 +41,24 @@ class TaxClassProcessor
     /**
      * Instance of tax class collection factory.
      *
-     * @var \Magento\Tax\Model\ResourceModel\TaxClass\CollectionFactory
+     * @var CollectionFactory
      */
     protected $collectionFactory;
 
     /**
      * Instance of tax model factory.
      *
-     * @var \Magento\Tax\Model\ClassModelFactory
+     * @var ClassModelFactory
      */
     protected $classModelFactory;
 
     /**
-     * @param \Magento\Tax\Model\ResourceModel\TaxClass\CollectionFactory $collectionFactory
-     * @param \Magento\Tax\Model\ClassModelFactory $classModelFactory
+     * @param CollectionFactory $collectionFactory
+     * @param ClassModelFactory $classModelFactory
      */
     public function __construct(
-        \Magento\Tax\Model\ResourceModel\TaxClass\CollectionFactory $collectionFactory,
-        \Magento\Tax\Model\ClassModelFactory $classModelFactory
+        CollectionFactory $collectionFactory,
+        ClassModelFactory $classModelFactory
     ) {
         $this->collectionFactory = $collectionFactory;
         $this->classModelFactory = $classModelFactory;
@@ -59,9 +75,9 @@ protected function initTaxClasses()
         if (empty($this->taxClasses)) {
             $collection = $this->collectionFactory->create();
             $collection->addFieldToFilter('class_type', ClassModel::TAX_CLASS_TYPE_PRODUCT);
-            /* @var $collection \Magento\Tax\Model\ResourceModel\TaxClass\Collection */
+            /* @var $collection Collection */
             foreach ($collection as $taxClass) {
-                $this->taxClasses[$taxClass->getClassName()] = $taxClass->getId();
+                $this->taxClasses[mb_strtolower($taxClass->getClassName())] = $taxClass->getId();
             }
         }
         return $this;
@@ -76,7 +92,7 @@ protected function initTaxClasses()
      */
     protected function createTaxClass($taxClassName, AbstractType $productTypeModel)
     {
-        /** @var \Magento\Tax\Model\ClassModelFactory $taxClass */
+        /** @var ClassModelFactory $taxClass */
         $taxClass = $this->classModelFactory->create();
         $taxClass->setClassType(ClassModel::TAX_CLASS_TYPE_PRODUCT);
         $taxClass->setClassName($taxClassName);
@@ -98,10 +114,22 @@ protected function createTaxClass($taxClassName, AbstractType $productTypeModel)
      */
     public function upsertTaxClass($taxClassName, AbstractType $productTypeModel)
     {
-        if (!isset($this->taxClasses[$taxClassName])) {
-            $this->taxClasses[$taxClassName] = $this->createTaxClass($taxClassName, $productTypeModel);
+        $normalizedTaxClassName = mb_strtolower($taxClassName);
+
+        if ($normalizedTaxClassName === (string) self::CLASS_NONE_ID) {
+            $normalizedTaxClassName = self::CLASS_NONE_NAME;
+        }
+
+        if (!isset($this->taxClasses[$normalizedTaxClassName])) {
+            $this->taxClasses[$normalizedTaxClassName] = $normalizedTaxClassName === self::CLASS_NONE_NAME
+                ? self::CLASS_NONE_ID
+                : $this->createTaxClass($taxClassName, $productTypeModel);
+        }
+        if ($normalizedTaxClassName === self::CLASS_NONE_NAME) {
+            // Add None option to tax_class_id options.
+            $productTypeModel->addAttributeOption(self::ATRR_CODE, self::CLASS_NONE_ID, self::CLASS_NONE_ID);
         }
 
-        return $this->taxClasses[$taxClassName];
+        return $this->taxClasses[$normalizedTaxClassName];
     }
 }

app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/TaxClassProcessorTest.php

@@ -101,4 +101,22 @@ public function testUpsertTaxClassNotExist()
         $taxClassId = $this->taxClassProcessor->upsertTaxClass('noExistClassName', $this->product);
         $this->assertEquals(self::TEST_JUST_CREATED_TAX_CLASS_ID, $taxClassId);
     }
+
+    public function testUpsertTaxClassExistCaseInsensitive()
+    {
+        $taxClassId = $this->taxClassProcessor->upsertTaxClass(strtoupper(self::TEST_TAX_CLASS_NAME), $this->product);
+        $this->assertEquals(self::TEST_TAX_CLASS_ID, $taxClassId);
+    }
+
+    public function testUpsertTaxClassNone()
+    {
+        $taxClassId = $this->taxClassProcessor->upsertTaxClass('none', $this->product);
+        $this->assertEquals(0, $taxClassId);
+    }
+
+    public function testUpsertTaxClassZero()
+    {
+        $taxClassId = $this->taxClassProcessor->upsertTaxClass(0, $this->product);
+        $this->assertEquals(0, $taxClassId);
+    }
 }

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php

@@ -3526,4 +3526,42 @@ public function testImportInvalidAdditionalImages(): void
             $errors->getErrorByRowNumber(0)[0]->getErrorMessage()
         );
     }
+
+    /**
+     * Test that product tax classes "none", "0" are imported correctly
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+     * @magentoAppIsolation enabled
+     */
+    public function testImportProductWithTaxClassNone(): void
+    {
+        $pathToFile = __DIR__ . '/_files/product_tax_class_none_import.csv';
+        $importModel = $this->createImportModel($pathToFile);
+        $this->assertErrorsCount(0, $importModel->validateData());
+        $importModel->importData();
+        $simpleProduct = $this->getProductBySku('simple');
+        $this->assertSame('0', (string) $simpleProduct->getTaxClassId());
+        $simpleProduct = $this->getProductBySku('simple2');
+        $this->assertSame('0', (string) $simpleProduct->getTaxClassId());
+    }
+
+    /**
+     * @param int $count
+     * @param ProcessingErrorAggregatorInterface $errors
+     */
+    private function assertErrorsCount(int $count, ProcessingErrorAggregatorInterface $errors): void
+    {
+        $this->assertEquals(
+            $count,
+            $errors->getErrorsCount(),
+            array_reduce(
+                $errors->getAllErrors(),
+                function ($output, $error) {
+                    return "$output\n{$error->getErrorMessage()}";
+                },
+                ''
+            )
+        );
+    }
 }

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_tax_class_none_import.csv

@@ -0,0 +1,3 @@
+"sku","tax_class_name"
+"simple","none"
+"simple2","0"