Merge pull request #195 from oc-shopaholic/develop

Release version 1.22.5
oc-shopaholic · Jun 28, 2019 · 18a8415 · 18a8415
2 parents 2d32371 + 8422972
commit 18a8415
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 1 deletion.
diff --git a/classes/import/ImportBrandModelFromXML.php b/classes/import/ImportBrandModelFromXML.php
@@ -54,6 +54,18 @@ public function getFields() : array
         return parent::getFields();
     }
 
+    /**
+     * Start import
+     * @param $obProgressBar
+     * @throws
+     */
+    public function import($obProgressBar = null)
+    {
+        parent::import($obProgressBar);
+
+        $this->deactivateElements();
+    }
+
     /**
      * Prepare array of import data
      */

diff --git a/classes/import/ImportCategoryModelFromXML.php b/classes/import/ImportCategoryModelFromXML.php
@@ -65,6 +65,18 @@ public function getFields() : array
         return parent::getFields();
     }
 
+    /**
+     * Start import
+     * @param $obProgressBar
+     * @throws
+     */
+    public function import($obProgressBar = null)
+    {
+        parent::import($obProgressBar);
+
+        $this->deactivateElements();
+    }
+
     /**
      * Prepare array of import data
      */

diff --git a/classes/import/ImportOfferModelFromXML.php b/classes/import/ImportOfferModelFromXML.php
@@ -72,6 +72,18 @@ public function getFields() : array
         return parent::getFields();
     }
 
+    /**
+     * Start import
+     * @param $obProgressBar
+     * @throws
+     */
+    public function import($obProgressBar = null)
+    {
+        parent::import($obProgressBar);
+
+        $this->deactivateElements();
+    }
+
     /**
      * Prepare array of import data
      */

diff --git a/classes/import/ImportOfferPriceFromXML.php b/classes/import/ImportOfferPriceFromXML.php
@@ -64,6 +64,18 @@ public function getFields() : array
         return parent::getFields();
     }
 
+    /**
+     * Start import
+     * @param $obProgressBar
+     * @throws
+     */
+    public function import($obProgressBar = null)
+    {
+        parent::import($obProgressBar);
+
+        $this->deactivateElements();
+    }
+
     /**
      * Prepare array of import data
      */

diff --git a/classes/import/ImportProductModelFromXML.php b/classes/import/ImportProductModelFromXML.php
@@ -63,6 +63,18 @@ public function getFields() : array
         return parent::getFields();
     }
 
+    /**
+     * Start import
+     * @param $obProgressBar
+     * @throws
+     */
+    public function import($obProgressBar = null)
+    {
+        parent::import($obProgressBar);
+
+        $this->deactivateElements();
+    }
+
     /**
      * Prepare array of import data
      */

diff --git a/updates/version.yaml b/updates/version.yaml
@@ -99,4 +99,6 @@
 1.22.3:
     - 'Fixed attaching of children categories to parent category in script of import from XML.'
 1.22.4:
-    - 'Removed deleted offers from sorting by price.'
+    - 'Removed deleted offers from sorting by price.'
+1.22.5:
+    - 'Fixed bug with deactivating items in import from XML files.'