BUGFIX: get categories from active channel

- avoid category connector errors
oroinc · Aug 17, 2020 · bd403e0 · bd403e0
1 parent f982ed0
commit bd403e0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/ImportExport/Strategy/CategoryImportStrategy.php b/ImportExport/Strategy/CategoryImportStrategy.php
@@ -45,11 +45,6 @@ protected function beforeProcessEntity($entity)
     {
         $this->setOwner($entity);
 
-        return parent::beforeProcessEntity($entity);
-    }
-
-    protected function afterProcessEntity($entity)
-    {
         if ($entity instanceof Category) {
             $parent = $entity->getParentCategory();
             if ($parent instanceof Category && !$parent->getId()) {
@@ -58,6 +53,11 @@ protected function afterProcessEntity($entity)
             }
         }
 
+        return parent::beforeProcessEntity($entity);
+    }
+
+    protected function afterProcessEntity($entity)
+    {
         $this->existingCategories = [];
 
         return parent::afterProcessEntity($entity);

diff --git a/Integration/AkeneoTransport.php b/Integration/AkeneoTransport.php
@@ -184,7 +184,6 @@ public function getCategories(int $pageSize)
 
         if (!empty($akeneoChannel)) {
             foreach ($this->client->getChannelApi()->all() as $channel) {
-
                 $categoryTreeChannel = ($channel['code'] == $akeneoChannel && !empty($channel['category_tree'])) ? $channel['category_tree'] : null;
 
                 if (null !== $categoryTreeChannel) {