Develop

README.markdown

@@ -7,7 +7,7 @@ Wrapper for Magento ImportExport functionality which imports data from arrays
 
 Facts
 -----
-- version: 0.6.3
+- version: 0.7.0
 - extension key: AvS_FastSimpleImport
 - extension on Magento Connect: n/a
 - Magento Connect 1.0 extension key: n/a
@@ -22,14 +22,14 @@ Description
 This module allows to import from arrays and thus using any import source, while the Magento module only imports from files. 
 ImportExport exists since Magento 1.5 CE / 1.10 EE, image import since 1.6 CE / 1.11 EE. Thus, this module needs at least 
 one of those versions.
-ImportExport has a special import format. See [specifications](http://www.integer-net.de/download/ImportExport_EN.pdf) about the expected format.
+ImportExport has a special import format. See [specifications](https://www.integer-net.com/importing-products-with-the-import-export-interface/) about the expected format.
 
 Main Features:
 
 - Fast Import using the built in Magento module ImportExport
 - Partial Indexing of only the imported products available
 - Unit tests for many test cases included
-- Importing of additional entities: Categories, Category-Product relations, attribute options (coming soon)
+- Importing of additional entities: Categories, Category-Product relations
 - Improved error messages stating which values are expected instead of a given value
 
 Please see our [**documentation**](http://avstudnitz.github.io/AvS_FastSimpleImport/) for a full list of features.
@@ -46,9 +46,10 @@ Compatibility
 Installation Instructions
 -------------------------
 1. Install the extension via GitHub, composer or a similar method.
-2. Clear the cache, logout from the admin panel and then login again.
-3. Read the [documentation](http://avstudnitz.github.io/AvS_FastSimpleImport/)
-4. Configure the extension under System -> Configuration -> Services -> FastSimpleImport.
+2. If you are using the Enterprise Edition then add ```<Enterprise_ImportExport/>``` to the ```<depends>``` node directly after ```<Mage_ImportExport/>```
+3. Clear the cache, logout from the admin panel and then login again.
+4. Read the [documentation](http://avstudnitz.github.io/AvS_FastSimpleImport/)
+5. Configure the extension at `System -> Configuration -> Services -> FastSimpleImport`.
 
 Uninstallation
 --------------

src/app/code/community/AvS/FastSimpleImport/Model/Import.php

@@ -51,7 +51,7 @@ protected function _construct()
         $this->setAllowRenameFiles(Mage::getStoreConfigFlag('fastsimpleimport/product/allow_rename_files'));
         $this->setImageAttributes(array_filter(explode(',', Mage::getStoreConfig('fastsimpleimport/product/additional_image_attributes'))));
         $this->setDisablePreprocessImageData(Mage::getStoreConfigFlag('fastsimpleimport/product/disable_preprocess_images'));
-        $this->setUnsetEmptyFields(! Mage::getStoreConfigFlag('fastsimpleimport/general/clear_field_on_empty_string'));
+        $this->setUnsetEmptyFields(Mage::getStoreConfigFlag('fastsimpleimport/general/clear_field_on_empty_string'));
         $this->setSymbolEmptyFields(Mage::getStoreConfig('fastsimpleimport/general/symbol_for_clear_field'));
         $this->setSymbolIgnoreFields(Mage::getStoreConfig('fastsimpleimport/general/symbol_for_ignore_field'));
     }
@@ -91,7 +91,7 @@ public function processProductImport($data, $behavior = NULL)
         $entityAdapter->setUnsetEmptyFields($this->getUnsetEmptyFields());
         $entityAdapter->setSymbolEmptyFields($this->getSymbolEmptyFields());
         $entityAdapter->setSymbolIgnoreFields($this->getSymbolIgnoreFields());
-	$entityAdapter->setIgnoreDuplicates($this->getIgnoreDuplicates());
+	    $entityAdapter->setIgnoreDuplicates($this->getIgnoreDuplicates());
         $this->setEntityAdapter($entityAdapter);
 
         $validationResult = $this->validateSource($data);

src/app/code/community/AvS/FastSimpleImport/Model/Import/Entity/Category.php

@@ -255,7 +255,9 @@ public function __construct()
     {
         parent::__construct();
 
-        $this->_initWebsites()
+        $this
+            ->_initOnTabAttributes()
+            ->_initWebsites()
             ->_initStores()
             ->_initCategories()
             ->_initAttributes()
@@ -342,6 +344,7 @@ protected function _importData()
             $this->_deleteCategories();
         } else {
             $this->_saveCategories();
+            $this->_saveOnTab();
         }
         Mage::dispatchEvent('catalog_category_import_finish_before', array('adapter'=>$this));
         return true;
@@ -378,8 +381,16 @@ protected function _initCategories()
                     'level' => $category->getLevel(),
                     'position' => $category->getPosition()
                 );
+
+                //allow importing by ids.
+                if (!isset($this->_categoriesWithRoots[$structure[1]])) {
+                    $this->_categoriesWithRoots[$structure[1]] = array();
+                }
+                $this->_categoriesWithRoots[$structure[1]][$category->getId()] =
+                    $this->_categoriesWithRoots[$rootCategoryName][$index];
             }
         }
+
         return $this;
     }
 
@@ -416,7 +427,7 @@ protected function _initWebsites()
     /**
      * Initialize customer attributes.
      *
-     * @return Mage_ImportExport_Model_Import_Entity_Customer
+     * @return $this
      */
     protected function _initAttributes()
     {
@@ -656,6 +667,7 @@ protected function _getUploader()
             $this->_fileUploader    = new Mage_ImportExport_Model_Import_Uploader();
 
             $this->_fileUploader->init();
+            $this->_fileUploader->removeValidateCallback('catalog_product_image');
             $this->_fileUploader->setFilesDispersion(false);
 
             $tmpDir     = Mage::getConfig()->getOptions()->getMediaDir() . '/import';
@@ -795,22 +807,22 @@ public function getWebsiteCodes()
      */
     protected function _getParentCategory($rowData)
     {
-        $categoryParts = $this->_explodeEscaped('/',$rowData[self::COL_CATEGORY]);
+        $categoryParts = $this->_explodeEscaped('/', $rowData[self::COL_CATEGORY]);
         array_pop($categoryParts);
-        $parent = $this->_implodeEscaped('/',$categoryParts);
+        $parent = $this->_implodeEscaped('/', $categoryParts);
 
-        if ($parent)
-        {
-            if (isset($this->_categoriesWithRoots[$rowData[self::COL_ROOT]][$parent]))
-            {
+        if ($parent) {
+            if (isset($this->_categoriesWithRoots[$rowData[self::COL_ROOT]][$parent])) {
                 return $this->_categoriesWithRoots[$rowData[self::COL_ROOT]][$parent];
             } elseif (isset($this->_newCategory[$rowData[self::COL_ROOT]][$parent])) {
                 return $this->_newCategory[$rowData[self::COL_ROOT]][$parent];
             } else {
                 return false;
             }
-        } else {
+        } elseif (isset($this->_categoriesWithRoots[$rowData[self::COL_ROOT]])) {
             return reset($this->_categoriesWithRoots[$rowData[self::COL_ROOT]]);
+        } else {
+            return false;
         }
     }
 
@@ -877,9 +889,14 @@ public function validateRow(array $rowData, $rowNum)
             $root = $rowData[self::COL_ROOT];
             $category = $rowData[self::COL_CATEGORY];
 
+            //check if the root exists
+            if (! isset($this->_categoriesWithRoots[$root])) {
+                $this->addRowError(self::ERROR_INVALID_ROOT, $rowNum);
+                return false;
+            }
+
             //check if parent category exists
-            if ($this->_getParentCategory($rowData) === false)
-            {
+            if ($this->_getParentCategory($rowData) === false) {
 
                 $this->addRowError(self::ERROR_PARENT_NOT_FOUND, $rowNum);
                 return false;
@@ -899,14 +916,6 @@ public function validateRow(array $rowData, $rowNum)
                 }
             }
 
-            //check if the root exists
-            if (! isset($this->_categoriesWithRoots[$root]))
-            {
-                $this->addRowError(self::ERROR_INVALID_ROOT, $rowNum);
-                return false;
-            }
-
-
             // check simple attributes
             foreach ($this->_attributes as $attrCode => $attrParams) {
                 if (isset($rowData[$attrCode]) && strlen($rowData[$attrCode])) {
@@ -947,10 +956,10 @@ public function getAffectedEntityIds()
                 if (!$this->isRowAllowedToImport($rowData, $rowNum)) {
                     continue;
                 }
-                if (!isset($this->_newCategory[$rowData[self::COL_CATEGORY]]['entity_id'])) {
+                if (!isset($this->_newCategory[$rowData[self::COL_ROOT]][$rowData[self::COL_CATEGORY]]['entity_id'])) {
                     continue;
                 }
-                $categoryIds[] = $this->_newCategory[$rowData[self::COL_CATEGORY]]['entity_id'];
+                $categoryIds[] = $this->_newCategory[$rowData[self::COL_ROOT]][$rowData[self::COL_CATEGORY]]['entity_id'];
             }
         }
         return $categoryIds;
@@ -1107,26 +1116,36 @@ protected function _indexDeleteEvents()
      */
     protected function _reindexUpdatedCategories()
     {
-        $entityIds = $this->_getProcessedCategoryIds();
-
-        $categoryFlatHelper = Mage::helper('catalog/category_flat');
-        if ($categoryFlatHelper->isAvailable() && $categoryFlatHelper->isAccessible()) {
-            Mage::dispatchEvent('fastsimpleimport_reindex_category_before_flat', array('entity_id' => &$entityIds));
-            Mage::getResourceSingleton('catalog/category_flat')->reindexAll();
-        }
 
-        if (Mage::getResourceModel('ecomdev_urlrewrite/indexer')) {
-            Mage::dispatchEvent('fastsimpleimport_reindex_category_before_ecomdev_urlrewrite', array('entity_id' => &$entityIds));
-            Mage::getResourceSingleton('ecomdev_urlrewrite/indexer')->updateCategoryRewrites($entityIds);
+        if (Mage::helper('core')->isModuleEnabled('Enterprise_Index')) {
+            Mage::dispatchEvent('fastsimpleimport_reindex_category_enterprise_before');
+            Mage::getSingleton('enterprise_index/observer')->refreshIndex(Mage::getModel('cron/schedule'));
         } else {
-            Mage::dispatchEvent('fastsimpleimport_reindex_category_before_urlrewrite', array('entity_id' => &$entityIds));
-            /* @var $urlModel Mage_Catalog_Model_Url */
-            $urlModel = Mage::getSingleton('catalog/url');
-            $urlModel->clearStoreInvalidRewrites();
-            foreach ($entityIds as $productId) {
-                $urlModel->refreshCategoryRewrite($productId);
+            $entityIds = $this->_getProcessedCategoryIds();
+
+            $categoryFlatHelper = Mage::helper('catalog/category_flat');
+            if ($categoryFlatHelper->isAvailable() && $categoryFlatHelper->isAccessible()) {
+
+                Mage::dispatchEvent('fastsimpleimport_reindex_category_before_flat', array('entity_id' => &$entityIds));
+                Mage::getResourceSingleton('catalog/category_flat')->reindexAll();
+            }
+
+            if (Mage::helper('core')->isModuleEnabled('EcomDev_UrlRewrite')) {
+
+                Mage::dispatchEvent('fastsimpleimport_reindex_category_before_ecomdev_urlrewrite', array('entity_id' => &$entityIds));
+                Mage::getResourceSingleton('ecomdev_urlrewrite/indexer')->updateCategoryRewrites($entityIds);
+            } else {
+
+                Mage::dispatchEvent('fastsimpleimport_reindex_category_before_urlrewrite', array('entity_id' => &$entityIds));
+                /* @var $urlModel Mage_Catalog_Model_Url */
+                $urlModel = Mage::getSingleton('catalog/url');
+                $urlModel->clearStoreInvalidRewrites();
+                foreach ($entityIds as $productId) {
+                    $urlModel->refreshCategoryRewrite($productId);
+                }
             }
         }
+
         Mage::dispatchEvent('fastsimpleimport_reindex_category_after', array('entity_id' => &$entityIds));
 
         return $this;
@@ -1243,4 +1262,160 @@ protected function _saveValidatedBunches()
         }
         return $this;
     }
+
+
+    /**
+     * @param $sku
+     * @return array|false
+     */
+    public function getEntityByCategory($root, $category)
+    {
+        if (isset($this->_categoriesWithRoots[$root][$category])) {
+            return $this->_categoriesWithRoots[$root][$category];
+        }
+
+        if (isset($this->_newCategory[$root][$category])) {
+            return $this->_newCategory[$root][$category];
+        }
+
+        return false;
+    }
+
+
+    /**
+     * @return $this
+     */
+    protected function _initOnTabAttributes()
+    {
+        if (Mage::helper('core')->isModuleEnabled('OnTap_Merchandiser')) {
+            $this->_particularAttributes = array_merge($this->_particularAttributes, array( 
+                '_ontap_heroproducts',
+                '_ontap_attribute',
+                '_ontap_attribute_value',
+                '_ontap_attribute_logic',
+                '_ontap_ruled_only',
+                '_ontap_automatic_sort'
+            ));
+        }
+        return $this;
+    }
+
+    /**
+     * Stock item saving.
+     * Overwritten in order to fix bug with stock data import
+     * See http://www.magentocommerce.com/bug-tracking/issue/?issue=13539
+     * See https://github.com/avstudnitz/AvS_FastSimpleImport/issues/3
+     *
+     * @return Mage_ImportExport_Model_Import_Entity_Product
+     */
+    protected function _saveOnTab()
+    {
+        if (! Mage::helper('core')->isModuleEnabled('OnTap_Merchandiser')) {
+            return $this;
+        }
+
+        $entityTable = Mage::getSingleton('core/resource')->getTableName('merchandiser_category_values');
+        $categoryId = null;
+        $attributeIdsByCode = array();
+
+        while ($bunch = $this->_dataSourceModel->getNextBunch()) {
+            $onTapData = array();
+
+            // Format bunch to stock data rows
+            foreach ($bunch as $rowNum => $rowData) {
+                $this->_filterRowData($rowData);
+                if (!$this->isRowAllowedToImport($rowData, $rowNum)) {
+                    continue;
+                }
+
+                if (self::SCOPE_DEFAULT == $this->getRowScope($rowData)) {
+                    $category = $this->getEntityByCategory($rowData[self::COL_ROOT], $rowData[self::COL_CATEGORY]);
+                    $categoryId = (int) $category['entity_id'];
+
+                    $onTapData[$categoryId] = array(
+                        'category_id' => $categoryId,
+                        'heroproducts'     => '',
+                        'attribute_codes'  => '',
+                        'smart_attributes' => '',
+                        'ruled_only'       => '',
+                        'automatic_sort'   => ''
+                    );
+                }
+
+                //we have a non-SCOPE_DEFAULT row, we check if it has a stock_id, if not, skip it.
+                if (self::SCOPE_DEFAULT == $this->getRowScope($rowData)) {
+                    if (isset($rowData['_ontap_ruled_only'])) {
+                        $onTapData[$categoryId]['ruled_only'] = (int) $rowData['_ontap_ruled_only'];
+                    }
+                    if (isset($rowData['_ontap_automatic_sort'])) {
+                        $onTapData[$categoryId]['automatic_sort'] = $rowData['_ontap_automatic_sort'];
+                    }
+                }
+
+                //get the _ontab_* smart attribute values and map them to the new keys that are present in the database.
+                $smartAttributes = array_intersect_key($rowData, array(
+                    '_ontap_attribute' => '',
+                    '_ontap_attribute_value' => '',
+                    '_ontap_attribute_logic' => '',
+                ));
+
+                //only add if we've found data
+                //todo check if we've got all values, there should be three, else it will throw an error here.
+                if ($smartAttributes) {
+                    if (! isset($onTapData[$categoryId]['attribute_codes'])) {
+                        $onTapData[$categoryId]['attribute_codes'] = array();
+                        $onTapData[$categoryId]['smart_attributes'] = array();
+                    }
+
+                    $smartAttributes = array_combine(array('attribute', 'value', 'link'),  $smartAttributes);
+
+                    if (! isset($attributeIdsByCode[$smartAttributes['attribute']])) {
+                        $attributeIdsByCode[$smartAttributes['attribute']] =
+                            Mage::getSingleton('catalog/product')
+                                ->getResource()
+                                ->getAttribute($smartAttributes['attribute'])
+                                ->getId();
+                    }
+
+                    $attributeCode = $smartAttributes['attribute'];
+                    $smartAttributes['attribute'] = $attributeIdsByCode[$smartAttributes['attribute']];
+
+                    $onTapData[$categoryId]['attribute_codes'][] = $attributeCode;
+                    $onTapData[$categoryId]['smart_attributes'][] = $smartAttributes;
+                }
+
+                if (isset($rowData['_ontap_heroproducts'])) {
+                    if (! isset($onTapData[$categoryId]['heroproducts'])) {
+                        $onTapData[$categoryId]['heroproducts'] = array();
+                    }
+                    $onTapData[$categoryId]['heroproducts'][] = $rowData['_ontap_heroproducts'];
+                }
+            }
+
+            if ($onTapData) {
+                //flatten data
+                foreach ($onTapData as $catId => &$onTapRow) {
+                    if (! empty($onTapRow['attribute_codes'])) {
+                        $onTapRow['attribute_codes'] = implode(',', array_unique($onTapRow['attribute_codes']));
+                    }
+                    if (! empty($onTapRow['heroproducts'])) {
+                        $onTapRow['heroproducts'] = implode(',', $onTapRow['heroproducts']);
+                    }
+                    if (! empty($onTapRow['smart_attributes'])) {
+                        $onTapRow['smart_attributes'] = serialize($onTapRow['smart_attributes']);
+                    }
+
+                    if (count($onTapRow) <= 1) {
+                        unset($onTapData[$catId]);
+                    }
+                }
+
+                //Insert Data
+                if ($onTapData) {
+                    $this->_connection->insertOnDuplicate($entityTable, $onTapData);
+                }
+            }
+        }
+        return $this;
+    }
 }