Merge pull request #121 from rbrown/rb

Category Import fixes

Author: sprankhub

Model/Import/Category.php

@@ -41,6 +41,7 @@
 use Magento\Framework\Filesystem;
 use Magento\UrlRewrite\Model\UrlPersistInterface;
 use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Eav\Model\Entity\Attribute\Source\Boolean;
 
 /**
  * Entity Adapter for importing Magento Categories
@@ -274,6 +275,8 @@ public function __construct(
             $this->getErrorAggregator()->addErrorMessageTemplate($errorCode, $message);
         }
 
+        $this->config                       = $config;
+
         $this->initOnTapAttributes()
             ->initWebsites()
             ->initStores()
@@ -283,7 +286,6 @@ public function __construct(
 
         $this->entityTable                  = $this->defaultCategory->getResource()->getEntityTable();
         $this->categoryImportVersionFeature = $this->versionFeatures->create('CategoryImportVersion');
-        $this->config                       = $config;
     }
 
     /**
@@ -335,7 +337,13 @@ public function getAttributeOptions(AbstractAttribute $attribute): array
 
         if ($attribute->usesSource()) {
             // should attribute has index (option value) instead of a label?
-            $index = in_array($attribute->getAttributeCode(), $this->indexValueAttributes) ? 'value' : 'label';
+            $index = 'label';
+            if (
+                in_array($attribute->getAttributeCode(), $this->indexValueAttributes) ||
+                $attribute->getSourceModel() == Boolean::class
+            ) {
+                $index = 'value';
+            };
 
             // only default (admin) store values used
             /** @var Attribute $attribute */
@@ -954,13 +962,13 @@ private function saveCategories(): self
 
                     $time = !empty($rowData[CategoryModel::KEY_CREATED_AT])
                         ? strtotime($rowData[CategoryModel::KEY_CREATED_AT])
-                        : null;
+                        : 'now';
 
                     // entity table data
                     $entityRow = [
                         CategoryInterface::KEY_PARENT_ID => $parentCategory['entity_id'],
                         CategoryInterface::KEY_LEVEL => $parentCategory[CategoryInterface::KEY_LEVEL] + 1,
-                        CategoryInterface::KEY_CREATED_AT => (new DateTime($time))
+                        CategoryInterface::KEY_CREATED_AT => (new \DateTime($time))
                             ->format(DateTime::DATETIME_PHP_FORMAT),
                         CategoryInterface::KEY_UPDATED_AT => "now()",
                         CategoryInterface::KEY_POSITION => $rowData[CategoryInterface::KEY_POSITION]