From acded73829866a596b107cbae79b1805ec751780 Mon Sep 17 00:00:00 2001
From: David Molina Cano <128705267+davidmolinacano@users.noreply.github.com>
Date: Mon, 7 Oct 2024 08:31:04 +0200
Subject: [PATCH 1/2] PLUGINRANGERS-234 | Master file refactor step 1:
 Separated install process + autoloader (#240)

* feat: Separated install process + autoloader. First approach

* fix: Fixed several files

* feat: use Db; in upgrade 4.5.0

* fix: Fixes after testing everything carefully

* feat: Renamed buildFeedUrl to getFeedUrl

* feat: Changes to pass the Prestashop validator at 100%
---
 autoloader.php                                |  56 +++
 doofinder-ajax.php                            |   7 +-
 doofinder.php                                 | 457 ++----------------
 lib/DoofinderConfig.php                       |  66 +++
 lib/DoofinderConstants.php                    |  32 ++
 lib/EasyREST.php                              |   3 +
 lib/SearchEngine.php                          |  50 ++
 lib/UrlManager.php                            |  82 ++++
 lib/doofinder_api_index.php                   |   2 +-
 lib/doofinder_api_items.php                   |   7 +-
 lib/doofinder_api_landing.php                 |   6 +-
 lib/doofinder_api_unique_script.php           |   6 +-
 lib/doofinder_installation.php                | 273 ++++++++++-
 lib/doofinder_layer_api.php                   |   2 +-
 views/js/doofinder-onboarding.js              |   2 +-
 views/templates/admin/indexation_status.tpl   |   4 +-
 views/templates/admin/onboarding_tab.tpl      |   4 +-
 .../front/catalog/_partials/productlist.tpl   |   2 +-
 18 files changed, 627 insertions(+), 434 deletions(-)
 create mode 100644 autoloader.php
 create mode 100644 lib/DoofinderConfig.php
 create mode 100644 lib/DoofinderConstants.php
 create mode 100644 lib/SearchEngine.php
 create mode 100644 lib/UrlManager.php

diff --git a/autoloader.php b/autoloader.php
new file mode 100644
index 0000000..12902d3
--- /dev/null
+++ b/autoloader.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * NOTICE OF LICENSE
+ *
+ * This file is licenced under the Software License Agreement.
+ * With the purchase or the installation of the software in your application
+ * you accept the licence agreement.
+ *
+ * You must not modify, adapt or create derivative works of this source code
+ *
+ * @author    Doofinder
+ * @copyright Doofinder
+ * @license   GPLv3
+ */
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+class Autoloader
+{
+    public static function register()
+    {
+        spl_autoload_register(function ($class) {
+            $className = str_replace('PrestaShop\\Module\\Doofinder\\', '', $class);
+            $file = _PS_MODULE_DIR_ . 'doofinder/' . self::uncapitalize(str_replace('\\', DIRECTORY_SEPARATOR, $className) . '.php');
+            if (file_exists($file)) {
+                require_once $file;
+
+                return true;
+            } elseif (file_exists(self::pascalCaseToSnakeCase($file))) {
+                $file = self::pascalCaseToSnakeCase($file);
+                require_once $file;
+
+                return true;
+            }
+
+            return false;
+        });
+    }
+
+    private static function pascalCaseToSnakeCase($path)
+    {
+        $parts = explode('/', $path);
+        $filename = array_pop($parts);
+        // Separate PascalCase words and convert to snake_case without the leading empty element.
+        $snakeCase = strtolower(ltrim(implode('_', preg_split('/(?=[A-Z])/', basename($filename, '.php'))), '_'));
+
+        return implode('/', $parts) . '/' . $snakeCase . '.php';
+    }
+
+    private static function uncapitalize($text)
+    {
+        return strtolower($text[0]) . substr($text, 1);
+    }
+}
+Autoloader::register();
diff --git a/doofinder-ajax.php b/doofinder-ajax.php
index ad39ef4..cbb3992 100644
--- a/doofinder-ajax.php
+++ b/doofinder-ajax.php
@@ -12,6 +12,9 @@
  * @copyright Doofinder
  * @license   GPLv3
  */
+
+use PrestaShop\Module\Doofinder\Lib\DoofinderInstallation;
+
 $root_path = dirname(dirname(dirname($_SERVER['SCRIPT_FILENAME'])));
 $config_file_path = $root_path . '/config/config.inc.php';
 if (@file_exists($config_file_path)) {
@@ -26,6 +29,8 @@
     exit;
 }
 
+require_once 'autoloader.php';
+
 $doofinder = Module::getInstanceByName('doofinder');
 
 $check_api_key = Tools::getValue('check_api_key');
@@ -38,7 +43,7 @@
 if ($autoinstaller) {
     header('Content-Type:application/json; charset=utf-8');
     if (Tools::getValue('token') == Tools::encrypt('doofinder-ajax')) {
-        $doofinder->autoinstaller($shop_id);
+        DoofinderInstallation::autoinstaller($shop_id);
         echo json_encode(['success' => true]);
         exit;
     } else {
diff --git a/doofinder.php b/doofinder.php
index 329b51c..7f3aecc 100644
--- a/doofinder.php
+++ b/doofinder.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * NOTICE OF LICENSE
  *
@@ -21,6 +20,15 @@
     exit;
 }
 
+require_once 'autoloader.php';
+
+use PrestaShop\Module\Doofinder\Lib\DoofinderConfig;
+use PrestaShop\Module\Doofinder\Lib\DoofinderConstants;
+use PrestaShop\Module\Doofinder\Lib\DoofinderInstallation;
+use PrestaShop\Module\Doofinder\Lib\EasyREST;
+use PrestaShop\Module\Doofinder\Lib\SearchEngine;
+use PrestaShop\Module\Doofinder\Lib\UrlManager;
+
 class Doofinder extends Module
 {
     protected $html = '';
@@ -28,14 +36,16 @@ class Doofinder extends Module
     protected $productLinks = [];
     public $ps_layered_full_tree = true;
     public $searchBanner = false;
+    public $admin_template_dir = '';
 
-    // Feel free to change this value to your own local env or ngrok
-    const DOOMANAGER_URL = 'https://admin.doofinder.com';
-    const GS_SHORT_DESCRIPTION = 1;
-    const GS_LONG_DESCRIPTION = 2;
-    const VERSION = '4.8.9';
-    const YES = 1;
-    const NO = 0;
+    // TODO (davidmolinacano): To be deleted after complete refactor.
+    const DOOMANAGER_URL = DoofinderConstants::DOOMANAGER_URL;
+    const GS_SHORT_DESCRIPTION = DoofinderConstants::GS_SHORT_DESCRIPTION;
+    const GS_LONG_DESCRIPTION = DoofinderConstants::GS_LONG_DESCRIPTION;
+    const VERSION = DoofinderConstants::VERSION;
+    const NAME = DoofinderConstants::NAME;
+    const YES = DoofinderConstants::YES;
+    const NO = DoofinderConstants::NO;
 
     public function __construct()
     {
@@ -53,8 +63,6 @@ public function __construct()
 
         $this->confirmUninstall = $this->l('Are you sure? This will not cancel your account in Doofinder service');
         $this->admin_template_dir = '../../../../modules/' . $this->name . '/views/templates/admin/';
-
-        $olderPS17 = (version_compare(_PS_VERSION_, '1.7', '<') === true);
     }
 
     /**
@@ -65,8 +73,8 @@ public function __construct()
     public function install()
     {
         return parent::install()
-            && $this->installDb()
-            && $this->installTabs()
+            && DoofinderInstallation::installDb()
+            && DoofinderInstallation::installTabs()
             && $this->registerHook('displayHeader')
             && $this->registerHook('moduleRoutes')
             && $this->registerHook('actionProductSave')
@@ -79,38 +87,6 @@ public function install()
             && $this->registerHook('actionObjectCategoryDeleteAfter');
     }
 
-    /**
-     * Install the module database tables
-     *
-     * @return bool
-     */
-    public function installDb()
-    {
-        return Db::getInstance()->execute(
-            '
-            CREATE TABLE IF NOT EXISTS `' . _DB_PREFIX_ . 'doofinder_updates` (
-                `id_doofinder_update` INT UNSIGNED NOT NULL AUTO_INCREMENT,
-                `id_shop` INT(10) UNSIGNED NOT NULL,
-                `object` varchar(45) NOT NULL,
-                `id_object` INT(10) UNSIGNED NOT NULL,
-                `action` VARCHAR(45) NOT NULL,
-                `date_upd` DATETIME NOT NULL,
-                PRIMARY KEY (`id_doofinder_update`),
-                CONSTRAINT uc_shop_update UNIQUE KEY (id_shop,object,id_object)
-            ) ENGINE=' . _MYSQL_ENGINE_ . ' DEFAULT CHARSET=utf8 ;'
-        )
-            && Db::getInstance()->execute(
-                '
-            CREATE TABLE IF NOT EXISTS `' . _DB_PREFIX_ . 'doofinder_landing` (
-                `name` VARCHAR(45) NOT NULL,
-                `hashid` VARCHAR(45) NOT NULL,
-                `data` TEXT NOT NULL,
-                `date_upd` DATETIME NOT NULL,
-                PRIMARY KEY (`name`, `hashid`)
-            ) ENGINE=' . _MYSQL_ENGINE_ . ' DEFAULT CHARSET=utf8 ;'
-            );
-    }
-
     /**
      * Uninstall the module and its dependencies
      *
@@ -119,85 +95,9 @@ public function installDb()
     public function uninstall()
     {
         return parent::uninstall()
-            && $this->uninstallTabs()
-            && $this->deleteConfigVars()
-            && $this->uninstallDb();
-    }
-
-    /**
-     * Remove module-dependent configuration variables
-     *
-     * @return bool
-     */
-    public function deleteConfigVars()
-    {
-        $config_vars = [
-            'DF_AI_ADMIN_ENDPOINT',
-            'DF_AI_API_ENDPOINT',
-            'DF_AI_APIKEY',
-            'DF_API_KEY',
-            'DF_API_LAYER_DESCRIPTION',
-            'DF_CSS_VS',
-            'DF_CUSTOMEXPLODEATTR',
-            'DF_DEBUG',
-            'DF_DEBUG_CURL',
-            'DF_DSBL_AJAX_TKN',
-            'DF_DSBL_DFCKIE_JS',
-            'DF_DSBL_DFFAC_JS',
-            'DF_DSBL_DFLINK_JS',
-            'DF_DSBL_DFPAG_JS',
-            'DF_DSBL_FAC_CACHE',
-            'DF_DSBL_HTTPS_CURL',
-            'DF_EB_LAYER_DESCRIPTION',
-            'DF_ENABLED_V9',
-            'DF_ENABLE_HASH',
-            'DF_EXTRA_CSS',
-            'DF_FACETS_TOKEN',
-            'DF_FEATURES_SHOWN',
-            'DF_FEED_FULL_PATH',
-            'DF_FEED_INDEXED',
-            'DF_FEED_MAINCATEGORY_PATH',
-            'DF_GROUP_ATTRIBUTES_SHOWN',
-            'DF_GS_DESCRIPTION_TYPE',
-            'DF_GS_DISPLAY_PRICES',
-            'DF_GS_IMAGE_SIZE',
-            'DF_GS_PRICES_USE_TAX',
-            'DF_INSTALLATION_ID',
-            'DF_SHOW_LAYER',
-            'DF_SHOW_LAYER_MOBILE',
-            'DF_REGION',
-            'DF_RESTART_OV',
-            'DF_SHOW_PRODUCT_FEATURES',
-            'DF_SHOW_PRODUCT_VARIATIONS',
-            'DF_UPDATE_ON_SAVE_DELAY',
-            'DF_UPDATE_ON_SAVE_LAST_EXEC',
-            'DF_FEED_INDEXED',
-        ];
-
-        $hashid_vars = array_column(
-            Db::getInstance()->executeS('
-            SELECT name FROM ' . _DB_PREFIX_ . "configuration where name like 'DF_HASHID_%'"),
-            'name'
-        );
-
-        $config_vars = array_merge($config_vars, $hashid_vars);
-
-        foreach ($config_vars as $var) {
-            Configuration::deleteByName($var);
-        }
-
-        return true;
-    }
-
-    /**
-     * Removes the database tables from the module
-     *
-     * @return bool
-     */
-    public function uninstallDb()
-    {
-        return Db::getInstance()->execute('DROP TABLE `' . _DB_PREFIX_ . 'doofinder_updates`')
-            && Db::getInstance()->execute('DROP TABLE `' . _DB_PREFIX_ . 'doofinder_landing`');
+            && DoofinderInstallation::uninstallTabs()
+            && DoofinderInstallation::deleteConfigVars()
+            && DoofinderInstallation::uninstallDb();
     }
 
     /**
@@ -223,6 +123,17 @@ public function hookModuleRoutes()
         ];
     }
 
+    /**
+     * Update the hashid of the search engines of the store in the configuration.
+     * It must be declared here too to be used by upgrade 4.5.0.
+     *
+     * @return true
+     */
+    public function setSearchEnginesByConfig()
+    {
+        return SearchEngine::setSearchEnginesByConfig();
+    }
+
     /**
      * Handles the module's configuration page
      *
@@ -324,26 +235,6 @@ protected function isConfigured()
         return Db::getInstance()->getValue($sql);
     }
 
-    /**
-     * Build feed urls
-     *
-     * @param int $shop_id
-     * @param int $language
-     * @param int $currency
-     *
-     * @return string
-     */
-    protected function buildFeedUrl($shop_id, $language, $currency)
-    {
-        $shop_url = $this->getShopURL($shop_id);
-
-        return $shop_url . ltrim('modules/' . $this->name, DIRECTORY_SEPARATOR)
-            . '/feed.php?'
-            . 'currency=' . Tools::strtoupper($currency)
-            . '&language=' . Tools::strtoupper($language)
-            . '&dfsec_hash=' . Configuration::get('DF_API_KEY');
-    }
-
     /**
      * Check if the form to create a store installation has to be displayed
      *
@@ -661,7 +552,7 @@ protected function renderFeedURLs()
                 $currencyIso = Tools::strtoupper($cur['iso_code']);
                 $langIso = Tools::strtoupper($lang['iso_code']);
                 $urls[] = [
-                    'url' => $this->buildFeedUrl($this->context->shop->id, $langIso, $currencyIso),
+                    'url' => UrlManager::getFeedUrl($this->context->shop->id, $langIso, $currencyIso),
                     'lang' => $langIso,
                     'currency' => $currencyIso,
                 ];
@@ -801,7 +692,7 @@ protected function postProcess()
 
         if ($formUpdated == 'data_feed_tab') {
             if ((bool) Configuration::get('DF_UPDATE_ON_SAVE_DELAY')) {
-                $this->setSearchEnginesByConfig();
+                SearchEngine::setSearchEnginesByConfig();
             }
             if (Tools::getValue('DF_UPDATE_ON_SAVE_DELAY') && (int) Tools::getValue('DF_UPDATE_ON_SAVE_DELAY') < 5) {
                 Configuration::updateValue('DF_UPDATE_ON_SAVE_DELAY', 5);
@@ -1255,7 +1146,7 @@ private function updateItemsApi($hashid, $type, $payload)
         $response = $api->updateBulk($payload);
 
         if (isset($response['error']) && !empty($response['error'])) {
-            $this->debug(json_encode($response['error']));
+            DoofinderConfig::debug(json_encode($response['error']));
         }
     }
 
@@ -1274,7 +1165,7 @@ private function deleteItemsApi($hashid, $type, $payload)
         $response = $api->deleteBulk(json_encode($payload));
 
         if (isset($response['error']) && !empty($response['error'])) {
-            $this->debug(json_encode($response['error']));
+            DoofinderConfig::debug(json_encode($response['error']));
         }
     }
 
@@ -1285,9 +1176,9 @@ private function indexApiInvokeReindexing()
         $region = Configuration::get('DF_REGION');
         $api_key = Configuration::get('DF_API_KEY');
         $api = new DoofinderApiIndex($api_key, $region);
-        $response = $api->invokeReindexing(Configuration::get('DF_INSTALLATION_ID'), $this->getProcessCallbackUrl());
+        $response = $api->invokeReindexing(Configuration::get('DF_INSTALLATION_ID'), UrlManager::getProcessCallbackUrl());
         if (empty($response) || $response['status'] !== 200) {
-            $this->debug('Error while invoking reindexing: ' . json_encode($response));
+            DoofinderConfig::debug('Error while invoking reindexing: ' . json_encode($response));
 
             return;
         }
@@ -1297,15 +1188,13 @@ private function indexApiInvokeReindexing()
 
     private function is_valid_update_on_save()
     {
-        require_once 'lib/doofinder_installation.php';
-
         $region = Configuration::get('DF_REGION');
         $api_key = Configuration::get('DF_API_KEY');
         $api = new DoofinderInstallation($api_key, $region);
-        $decode_response = $api->is_valid_update_on_save(Configuration::get('DF_INSTALLATION_ID'));
+        $decode_response = $api->isValidUpdateOnSave(Configuration::get('DF_INSTALLATION_ID'));
 
         if (empty($decode_response)) {
-            $this->debug('Error checking search engines: ' . json_encode($decode_response));
+            DoofinderConfig::debug('Error checking search engines: ' . json_encode($decode_response));
 
             Configuration::updateValue('DF_UPDATE_ON_SAVE_DELAY', 0);
 
@@ -1395,10 +1284,7 @@ public function searchOnApi($string, $page = 1, $page_size = 12, $timeout = 8000
             $page = 1;
         }
         $query_name = Tools::getValue('df_query_name', false);
-        $debug = Configuration::get('DF_DEBUG');
-        if (isset($debug) && $debug) {
-            $this->debug('Search On API Start');
-        }
+        DoofinderConfig::debug('Search On API Start');
         $hash_id = $this->getHashId(Context::getContext()->language->id, Context::getContext()->currency->id);
         $api_key = Configuration::get('DF_API_KEY');
         $show_variations = Configuration::get('DF_SHOW_PRODUCT_VARIATIONS');
@@ -1464,9 +1350,7 @@ public function searchOnApi($string, $page = 1, $page_size = 12, $timeout = 8000
                 $product_pool = '0';
             }
 
-            if (isset($debug) && $debug) {
-                $this->debug("Product Pool: $product_pool");
-            }
+            DoofinderConfig::debug("Product Pool: $product_pool");
 
             $product_pool_attributes = implode(',', $product_pool_attributes);
 
@@ -1476,9 +1360,7 @@ public function searchOnApi($string, $page = 1, $page_size = 12, $timeout = 8000
                 $product_pool_attributes = '0';
             }
 
-            if (isset($debug) && $debug) {
-                $this->debug("Product Pool Attributes: $product_pool_attributes");
-            }
+            DoofinderConfig::debug("Product Pool Attributes: $product_pool_attributes");
             $db = Db::getInstance(_PS_USE_SQL_SLAVE_);
             $id_lang = $context->language->id;
             $sql = 'SELECT p.*, product_shop.*, stock.out_of_stock,
@@ -1554,9 +1436,8 @@ public function searchOnApi($string, $page = 1, $page_size = 12, $timeout = 8000
                 ' ORDER BY FIELD (p.`id_product`,' . pSQL($product_pool) . ') '
                 . (($show_variations) ? ' , FIELD (product_attribute_shop.`id_product_attribute`,'
                     . pSQL($product_pool_attributes) . ')' : '');
-            if (isset($debug) && $debug) {
-                $this->debug("SQL: $sql");
-            }
+
+            DoofinderConfig::debug("SQL: $sql");
 
             $result = $db->executeS($sql);
 
@@ -1599,29 +1480,6 @@ public function searchOnApi($string, $page = 1, $page_size = 12, $timeout = 8000
         }
     }
 
-    /**
-     * Update the hashid of the search engines of the store in the configuration
-     *
-     * @return true
-     */
-    public function setSearchEnginesByConfig()
-    {
-        require_once _PS_MODULE_DIR_ . 'doofinder/lib/doofinder_layer_api.php';
-        $installationID = Configuration::get('DF_INSTALLATION_ID');
-        $api_key = Configuration::get('DF_API_KEY');
-        $region = Configuration::get('DF_REGION');
-
-        $data = DoofinderLayerApi::getInstallationData($installationID, $api_key, $region);
-
-        foreach ($data['config']['search_engines'] as $lang => $currencies) {
-            foreach ($currencies as $currency => $hashid) {
-                Configuration::updateValue('DF_HASHID_' . strtoupper($currency) . '_' . strtoupper($lang), $hashid);
-            }
-        }
-
-        return true;
-    }
-
     /**
      * Checks the connection with DooManager
      *
@@ -1629,10 +1487,8 @@ public function setSearchEnginesByConfig()
      */
     public function checkOutsideConnection()
     {
-        // Require only on this function to not overload memory with not needed classes
-        require_once _PS_MODULE_DIR_ . 'doofinder/lib/EasyREST.php';
         $client = new EasyREST(true, 3);
-        $result = $client->get(sprintf('%s/auth/login', self::DOOMANAGER_URL));
+        $result = $client->get(sprintf('%s/auth/login', DoofinderConstants::DOOMANAGER_URL));
 
         return $result && $result->originalResponse && isset($result->headers['code'])
             && (strpos($result->originalResponse, 'HTTP/2 200') || $result->headers['code'] == 200);
@@ -1664,175 +1520,6 @@ public function saveApiData($apikey, $api_endpoint, $admin_endpoint)
         }
     }
 
-    /**
-     * Start the installation process
-     * If shop_id is null, install all shops
-     *
-     * @param int $shop_id
-     *
-     * @return void
-     */
-    public function autoinstaller($shop_id = null)
-    {
-        if (!empty($shop_id)) {
-            $shop = Shop::getShop($shop_id);
-            $this->createStore($shop);
-
-            return;
-        }
-
-        $shops = Shop::getShops();
-        foreach ($shops as $shop) {
-            $this->createStore($shop);
-        }
-    }
-
-    /**
-     * Create a store in Doofinder based on the Prestashop shop
-     *
-     * @param array $shop
-     *
-     * @return void
-     */
-    public function createStore($shop)
-    {
-        // Require only on this function to not overload memory with unneeded classes
-        require_once _PS_MODULE_DIR_ . 'doofinder/lib/EasyREST.php';
-        $client = new EasyREST();
-        $apikey = Configuration::getGlobalValue('DF_AI_APIKEY');
-        $languages = Language::getLanguages(true, $shop['id_shop']);
-        $currencies = Currency::getCurrenciesByIdShop($shop['id_shop']);
-        $shopId = $shop['id_shop'];
-        $shopGroupId = $shop['id_shop_group'];
-        $primary_lang = new Language(Configuration::get('PS_LANG_DEFAULT', null, $shopGroupId, $shopId));
-        $installationID = null;
-
-        $this->setDefaultShopConfig($shopGroupId, $shopId);
-
-        $shop_url = $this->getShopURL($shopId);
-        $store_data = [
-            'name' => $shop['name'],
-            'platform' => 'prestashop',
-            'primary_language' => $primary_lang->language_code,
-            'site_url' => $shop_url,
-            'search_engines' => [],
-            'plugin_version' => $this->version,
-        ];
-
-        foreach ($languages as $lang) {
-            if ($lang['active'] == 0) {
-                continue;
-            }
-            foreach ($currencies as $cur) {
-                if ($cur['deleted'] == 1 || $cur['active'] == 0) {
-                    continue;
-                }
-                $ciso = $cur['iso_code'];
-                $lang_code = $lang['language_code'];
-                $feed_url = $this->buildFeedUrl($shopId, $lang['iso_code'], $ciso);
-                $store_data['search_engines'][] = [
-                    'language' => $lang_code,
-                    'currency' => $ciso,
-                    'feed_url' => $feed_url,
-                    'callback_url' => $this->getProcessCallbackUrl(),
-                ];
-            }
-        }
-
-        $json_store_data = json_encode($store_data);
-        $this->debug('Create Store Start');
-        $this->debug(print_r($store_data, true));
-
-        $response = $client->post(
-            $this->getInstallUrl(Configuration::get('DF_REGION')),
-            $json_store_data,
-            false,
-            false,
-            'application/json',
-            ['Authorization: Token ' . $apikey]
-        );
-
-        if ($response->getResponseCode() == 200) {
-            $response = json_decode($response->response, true);
-            $installationID = @$response['installation_id'];
-            $this->debug('Create Store response:');
-            $this->debug(print_r($response, true));
-
-            if ($installationID) {
-                $this->debug("Set installation ID: $installationID");
-                Configuration::updateValue('DF_INSTALLATION_ID', $installationID, false, $shopGroupId, $shopId);
-                Configuration::updateValue('DF_ENABLED_V9', true, false, $shopGroupId, $shopId);
-                Configuration::updateValue('DF_SHOW_LAYER', true, false, $shopGroupId, $shopId);
-                Configuration::updateValue('DF_SHOW_LAYER_MOBILE', true, false, $shopGroupId, $shopId);
-                $this->setSearchEnginesByConfig();
-            } else {
-                $this->debug('Invalid installation ID');
-                exit('ko');
-            }
-        } else {
-            $error_msg = "Create Store failed with code {$response->getResponseCode()} and message '{$response->getResponseMessage()}'";
-            $response_msg = 'Response: ' . print_r($response->response, true);
-            $this->debug($error_msg);
-            $this->debug($response_msg);
-            echo $response->response;
-            exit;
-        }
-    }
-
-    /**
-     * Get Process Callback URL
-     *
-     * @return string
-     */
-    private function getProcessCallbackUrl()
-    {
-        return Context::getContext()->link->getModuleLink('doofinder', 'callback', []);
-    }
-
-    /**
-     * Set the default values in the configuration
-     *
-     * @param int $shopGroupId
-     * @param int $shopId
-     *
-     * @return void
-     */
-    public function setDefaultShopConfig($shopGroupId, $shopId)
-    {
-        $apikey = Configuration::getGlobalValue('DF_AI_APIKEY');
-        $api_endpoint = Configuration::getGlobalValue('DF_AI_API_ENDPOINT');
-        $api_endpoint_array = explode('-', $api_endpoint);
-        $region = $api_endpoint_array[0];
-
-        Configuration::updateValue('DF_ENABLE_HASH', true, false, $shopGroupId, $shopId);
-        Configuration::updateValue('DF_GS_DISPLAY_PRICES', true, false, $shopGroupId, $shopId);
-        Configuration::updateValue('DF_GS_PRICES_USE_TAX', true, false, $shopGroupId, $shopId);
-        Configuration::updateValue('DF_FEED_FULL_PATH', true, false, $shopGroupId, $shopId);
-        Configuration::updateValue('DF_SHOW_PRODUCT_VARIATIONS', 0, false, $shopGroupId, $shopId);
-        Configuration::updateValue('DF_REGION', $region, false, $shopGroupId, $shopId);
-        Configuration::updateValue('DF_API_KEY', $region . '-' . $apikey, false, $shopGroupId, $shopId);
-        Configuration::updateValue('DF_GS_DESCRIPTION_TYPE', self::GS_SHORT_DESCRIPTION, false, $shopGroupId, $shopId);
-        Configuration::updateValue('DF_FEED_MAINCATEGORY_PATH', false, false, $shopGroupId, $shopId);
-        Configuration::updateValue('DF_GS_IMAGE_SIZE', key(dfTools::getAvailableImageSizes()), false, $shopGroupId, $shopId);
-    }
-
-    /**
-     * Get store URL
-     *
-     * @param int $shop_id
-     *
-     * @return string
-     */
-    public function getShopURL($shop_id)
-    {
-        $shop = new Shop($shop_id);
-        $force_ssl = (Configuration::get('PS_SSL_ENABLED')
-            && Configuration::get('PS_SSL_ENABLED_EVERYWHERE'));
-        $url = ($force_ssl) ? 'https://' . $shop->domain_ssl : 'http://' . $shop->domain;
-
-        return $url . $this->getShopBaseURI($shop);
-    }
-
     /**
      * Check the connection to the API using the saved API KEY
      *
@@ -1978,22 +1665,6 @@ private function getWarningMultishopHtml()
         return $stop;
     }
 
-    private function getShopBaseURI($shop)
-    {
-        return $shop->physical_uri . $shop->virtual_uri;
-    }
-
-    private function debug($message)
-    {
-        $current_path = dirname($_SERVER['SCRIPT_FILENAME']);
-        if (!is_dir($current_path)) {
-            $current_path = dirname(__FILE__);
-        }
-        if (isset($debug) && $debug) {
-            error_log("$message\n", 3, $current_path . '/doofinder.log');
-        }
-    }
-
     private function displayErrorCtm($error, $link = false, $raw = false)
     {
         return $this->displayGeneralMsg($error, 'error', 'danger', $link, $raw);
@@ -2035,36 +1706,4 @@ private function searchLayerMustBeInitialized()
 
         return ($isMobile && $displayMobile) || (!$isMobile && $displayDesktop);
     }
-
-    private function installTabs()
-    {
-        $tab = new Tab();
-        $tab->active = 0;
-        $tab->class_name = 'DoofinderAdmin';
-        $tab->name = [];
-        foreach (Language::getLanguages() as $lang) {
-            $tab->name[$lang['id_lang']] = 'Doofinder admin controller';
-        }
-        $tab->id_parent = 0;
-        $tab->module = $this->name;
-
-        return $tab->save();
-    }
-
-    private function uninstallTabs()
-    {
-        $tabId = (int) Tab::getIdFromClassName('DoofinderAdmin');
-        if (!$tabId) {
-            return true;
-        }
-
-        $tab = new Tab($tabId);
-
-        return $tab->delete();
-    }
-
-    private function getInstallUrl($region)
-    {
-        return str_replace('{region}', $region, 'https://{region}-plugins.doofinder.com/install');
-    }
 }
diff --git a/lib/DoofinderConfig.php b/lib/DoofinderConfig.php
new file mode 100644
index 0000000..3c6d07f
--- /dev/null
+++ b/lib/DoofinderConfig.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * NOTICE OF LICENSE
+ *
+ * This file is licenced under the Software License Agreement.
+ * With the purchase or the installation of the software in your application
+ * you accept the licence agreement.
+ *
+ * You must not modify, adapt or create derivative works of this source code
+ *
+ * @author    Doofinder
+ * @copyright Doofinder
+ * @license   GPLv3
+ */
+
+namespace PrestaShop\Module\Doofinder\Lib;
+
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+if (!class_exists('dfTools')) {
+    require_once 'dfTools.class.php';
+}
+
+class DoofinderConfig
+{
+    public static function debug($message, $logFile = 'doofinder.log')
+    {
+        if (!defined('_PS_MODULE_DIR_')) {
+            return;
+        }
+
+        $debug = \Configuration::get('DF_DEBUG');
+        if (isset($debug) && $debug) {
+            error_log("$message\n", 3, _PS_MODULE_DIR_ . DIRECTORY_SEPARATOR . 'doofinder' . DIRECTORY_SEPARATOR . $logFile);
+        }
+    }
+
+    /**
+     * Set the default values in the configuration
+     *
+     * @param int $shopGroupId
+     * @param int $shopId
+     *
+     * @return void
+     */
+    public static function setDefaultShopConfig($shopGroupId, $shopId)
+    {
+        $apikey = \Configuration::getGlobalValue('DF_AI_APIKEY');
+        $apiEndpoint = \Configuration::getGlobalValue('DF_AI_API_ENDPOINT');
+        $apiEndpointArray = explode('-', $apiEndpoint);
+        $region = $apiEndpointArray[0];
+
+        \Configuration::updateValue('DF_ENABLE_HASH', true, false, $shopGroupId, $shopId);
+        \Configuration::updateValue('DF_GS_DISPLAY_PRICES', true, false, $shopGroupId, $shopId);
+        \Configuration::updateValue('DF_GS_PRICES_USE_TAX', true, false, $shopGroupId, $shopId);
+        \Configuration::updateValue('DF_FEED_FULL_PATH', true, false, $shopGroupId, $shopId);
+        \Configuration::updateValue('DF_SHOW_PRODUCT_VARIATIONS', 0, false, $shopGroupId, $shopId);
+        \Configuration::updateValue('DF_REGION', $region, false, $shopGroupId, $shopId);
+        \Configuration::updateValue('DF_API_KEY', $region . '-' . $apikey, false, $shopGroupId, $shopId);
+        \Configuration::updateValue('DF_GS_DESCRIPTION_TYPE', DoofinderConstants::GS_SHORT_DESCRIPTION, false, $shopGroupId, $shopId);
+        \Configuration::updateValue('DF_FEED_MAINCATEGORY_PATH', false, false, $shopGroupId, $shopId);
+        \Configuration::updateValue('DF_GS_IMAGE_SIZE', key(\dfTools::getAvailableImageSizes()), false, $shopGroupId, $shopId);
+    }
+}
diff --git a/lib/DoofinderConstants.php b/lib/DoofinderConstants.php
new file mode 100644
index 0000000..342028f
--- /dev/null
+++ b/lib/DoofinderConstants.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * NOTICE OF LICENSE
+ *
+ * This file is licenced under the Software License Agreement.
+ * With the purchase or the installation of the software in your application
+ * you accept the licence agreement.
+ *
+ * You must not modify, adapt or create derivative works of this source code
+ *
+ * @author    Doofinder
+ * @copyright Doofinder
+ * @license   GPLv3
+ */
+
+namespace PrestaShop\Module\Doofinder\Lib;
+
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+class DoofinderConstants
+{
+    // Feel free to change this value to your own local env or ngrok
+    const DOOMANAGER_URL = 'https://admin.doofinder.com';
+    const GS_SHORT_DESCRIPTION = 1;
+    const GS_LONG_DESCRIPTION = 2;
+    const VERSION = '4.8.9';
+    const NAME = 'doofinder';
+    const YES = 1;
+    const NO = 0;
+}
diff --git a/lib/EasyREST.php b/lib/EasyREST.php
index 9f656c2..b6516bb 100644
--- a/lib/EasyREST.php
+++ b/lib/EasyREST.php
@@ -9,6 +9,9 @@
  * @copyright Doofinder
  * @license   GPLv3
  */
+
+namespace PrestaShop\Module\Doofinder\Lib;
+
 if (!defined('_PS_VERSION_')) {
     exit;
 }
diff --git a/lib/SearchEngine.php b/lib/SearchEngine.php
new file mode 100644
index 0000000..3f628ed
--- /dev/null
+++ b/lib/SearchEngine.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * NOTICE OF LICENSE
+ *
+ * This file is licenced under the Software License Agreement.
+ * With the purchase or the installation of the software in your application
+ * you accept the licence agreement.
+ *
+ * You must not modify, adapt or create derivative works of this source code
+ *
+ * @author    Doofinder
+ * @copyright Doofinder
+ * @license   GPLv3
+ */
+
+namespace PrestaShop\Module\Doofinder\Lib;
+
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+if (!class_exists('DoofinderLayerApi')) {
+    require_once 'doofinder_layer_api.php';
+}
+
+class SearchEngine
+{
+    /**
+     * Update the hashid of the search engines of the store in the configuration
+     *
+     * @return true
+     */
+    public static function setSearchEnginesByConfig()
+    {
+        require_once 'doofinder_layer_api.php';
+        $installationID = \Configuration::get('DF_INSTALLATION_ID');
+        $apiKey = \Configuration::get('DF_API_KEY');
+        $region = \Configuration::get('DF_REGION');
+
+        $data = \DoofinderLayerApi::getInstallationData($installationID, $apiKey, $region);
+
+        foreach ($data['config']['search_engines'] as $lang => $currencies) {
+            foreach ($currencies as $currency => $hashid) {
+                \Configuration::updateValue('DF_HASHID_' . strtoupper($currency) . '_' . strtoupper($lang), $hashid);
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/lib/UrlManager.php b/lib/UrlManager.php
new file mode 100644
index 0000000..c150938
--- /dev/null
+++ b/lib/UrlManager.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * NOTICE OF LICENSE
+ *
+ * This file is licenced under the Software License Agreement.
+ * With the purchase or the installation of the software in your application
+ * you accept the licence agreement.
+ *
+ * You must not modify, adapt or create derivative works of this source code
+ *
+ * @author    Doofinder
+ * @copyright Doofinder
+ * @license   GPLv3
+ */
+
+namespace PrestaShop\Module\Doofinder\Lib;
+
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+class UrlManager
+{
+    const API_URL = 'https://{region}-plugins.doofinder.com';
+
+    /**
+     * Get store URL
+     *
+     * @param int $shop_id
+     *
+     * @return string
+     */
+    public static function getShopURL($shop_id)
+    {
+        $shop = new \Shop($shop_id);
+        $force_ssl = (\Configuration::get('PS_SSL_ENABLED')
+            && \Configuration::get('PS_SSL_ENABLED_EVERYWHERE'));
+        $url = ($force_ssl) ? 'https://' . $shop->domain_ssl : 'http://' . $shop->domain;
+
+        return $url . self::_getShopBaseURI($shop);
+    }
+
+    /**
+     * Build feed urls
+     *
+     * @param int $shopId
+     * @param int $language
+     * @param int $currency
+     *
+     * @return string
+     */
+    public static function getFeedUrl($shopId, $language, $currency)
+    {
+        $shopUrl = self::getShopURL($shopId);
+
+        return $shopUrl . ltrim('modules/' . DoofinderConstants::NAME, DIRECTORY_SEPARATOR)
+            . '/feed.php?'
+            . 'currency=' . \Tools::strtoupper($currency)
+            . '&language=' . \Tools::strtoupper($language)
+            . '&dfsec_hash=' . \Configuration::get('DF_API_KEY');
+    }
+
+    /**
+     * Get Process Callback URL
+     *
+     * @return string
+     */
+    public static function getProcessCallbackUrl()
+    {
+        return \Context::getContext()->link->getModuleLink('doofinder', 'callback', []);
+    }
+
+    public static function getInstallUrl($region)
+    {
+        return str_replace('{region}', $region, 'https://{region}-plugins.doofinder.com/install');
+    }
+
+    private static function _getShopBaseURI($shop)
+    {
+        return $shop->physical_uri . $shop->virtual_uri;
+    }
+}
diff --git a/lib/doofinder_api_index.php b/lib/doofinder_api_index.php
index 7a1c93f..80430f6 100644
--- a/lib/doofinder_api_index.php
+++ b/lib/doofinder_api_index.php
@@ -12,7 +12,7 @@
  * @copyright Doofinder
  * @license   GPLv3
  */
-require_once _PS_MODULE_DIR_ . 'doofinder/lib/EasyREST.php';
+use PrestaShop\Module\Doofinder\Lib\EasyREST;
 
 if (!defined('_PS_VERSION_')) {
     exit;
diff --git a/lib/doofinder_api_items.php b/lib/doofinder_api_items.php
index 3c4a30f..08ecb48 100644
--- a/lib/doofinder_api_items.php
+++ b/lib/doofinder_api_items.php
@@ -12,7 +12,7 @@
  * @copyright Doofinder
  * @license   GPLv3
  */
-require_once _PS_MODULE_DIR_ . 'doofinder/lib/EasyREST.php';
+use PrestaShop\Module\Doofinder\Lib\EasyREST;
 
 if (!defined('_PS_VERSION_')) {
     exit;
@@ -22,6 +22,11 @@
 
 class DoofinderApiItems
 {
+    private $hashid;
+    private $api_key;
+    private $api_url;
+    private $type;
+
     public function __construct($hashid, $api_key, $region, $type = 'product')
     {
         $this->hashid = $hashid;
diff --git a/lib/doofinder_api_landing.php b/lib/doofinder_api_landing.php
index 15a2648..18f486c 100644
--- a/lib/doofinder_api_landing.php
+++ b/lib/doofinder_api_landing.php
@@ -12,7 +12,7 @@
  * @copyright Doofinder
  * @license   GPLv3
  */
-require_once _PS_MODULE_DIR_ . 'doofinder/lib/EasyREST.php';
+use PrestaShop\Module\Doofinder\Lib\EasyREST;
 
 if (!defined('_PS_VERSION_')) {
     exit;
@@ -22,6 +22,10 @@
 
 class DoofinderApiLanding
 {
+    private $hashid;
+    private $api_key;
+    private $api_url;
+
     public function __construct($hashid, $api_key, $region)
     {
         $this->hashid = $hashid;
diff --git a/lib/doofinder_api_unique_script.php b/lib/doofinder_api_unique_script.php
index 7a75581..57a5df8 100644
--- a/lib/doofinder_api_unique_script.php
+++ b/lib/doofinder_api_unique_script.php
@@ -12,7 +12,7 @@
  * @copyright Doofinder
  * @license   GPLv3
  */
-require_once _PS_MODULE_DIR_ . 'doofinder/lib/EasyREST.php';
+use PrestaShop\Module\Doofinder\Lib\EasyREST;
 
 if (!defined('_PS_VERSION_')) {
     exit;
@@ -22,6 +22,10 @@
 
 class DoofinderApiUniqueScript
 {
+    private $installationId;
+    private $apiKey;
+    private $apiUrl;
+
     public function __construct($installationId, $region, $apiKey)
     {
         $this->installationId = $installationId;
diff --git a/lib/doofinder_installation.php b/lib/doofinder_installation.php
index 0dbaead..3edcbe4 100644
--- a/lib/doofinder_installation.php
+++ b/lib/doofinder_installation.php
@@ -12,23 +12,22 @@
  * @copyright Doofinder
  * @license   GPLv3
  */
-require_once _PS_MODULE_DIR_ . 'doofinder/lib/EasyREST.php';
+
+namespace PrestaShop\Module\Doofinder\Lib;
 
 if (!defined('_PS_VERSION_')) {
     exit;
 }
 
-const API_URL = 'https://{region}-plugins.doofinder.com';
-
 class DoofinderInstallation
 {
-    private $api_key;
-    private $api_url;
+    private $apiKey;
+    private $apiUrl;
 
-    public function __construct($api_key, $region)
+    public function __construct($apiKey, $region)
     {
-        $this->api_key = $api_key;
-        $this->api_url = str_replace('{region}', $region, API_URL);
+        $this->apiKey = $apiKey;
+        $this->apiUrl = str_replace('{region}', $region, UrlManager::API_URL);
     }
 
     /**
@@ -37,14 +36,14 @@ public function __construct($api_key, $region)
      * @param string $installation_id
      * @param string $callback_url
      */
-    public function is_valid_update_on_save($installation_id)
+    public function isValidUpdateOnSave($installationId)
     {
-        $api_endpoint = $this->api_url . '/' . $installation_id . '/validate-update-on-save';
+        $apiEndpoint = $this->apiUrl . '/' . $installationId . '/validate-update-on-save';
 
-        return $this->get($api_endpoint);
+        return $this->_get($apiEndpoint);
     }
 
-    private function get($url)
+    private function _get($url)
     {
         $client = new EasyREST();
 
@@ -54,9 +53,257 @@ private function get($url)
             false,
             false,
             'application/json',
-            ['Authorization: Token ' . $this->api_key]
+            ['Authorization: Token ' . $this->apiKey]
         );
 
         return json_decode($response->response, true);
     }
+
+    /**
+     * Install the module database tables
+     *
+     * @return bool
+     */
+    public static function installDb()
+    {
+        return \Db::getInstance()->execute(
+            '
+            CREATE TABLE IF NOT EXISTS `' . _DB_PREFIX_ . 'doofinder_updates` (
+                `id_doofinder_update` INT UNSIGNED NOT NULL AUTO_INCREMENT,
+                `id_shop` INT(10) UNSIGNED NOT NULL,
+                `object` varchar(45) NOT NULL,
+                `id_object` INT(10) UNSIGNED NOT NULL,
+                `action` VARCHAR(45) NOT NULL,
+                `date_upd` DATETIME NOT NULL,
+                PRIMARY KEY (`id_doofinder_update`),
+                CONSTRAINT uc_shop_update UNIQUE KEY (id_shop,object,id_object)
+            ) ENGINE=' . _MYSQL_ENGINE_ . ' DEFAULT CHARSET=utf8 ;'
+        )
+            && \Db::getInstance()->execute(
+                '
+            CREATE TABLE IF NOT EXISTS `' . _DB_PREFIX_ . 'doofinder_landing` (
+                `name` VARCHAR(45) NOT NULL,
+                `hashid` VARCHAR(45) NOT NULL,
+                `data` TEXT NOT NULL,
+                `date_upd` DATETIME NOT NULL,
+                PRIMARY KEY (`name`, `hashid`)
+            ) ENGINE=' . _MYSQL_ENGINE_ . ' DEFAULT CHARSET=utf8 ;'
+            );
+    }
+
+    /**
+     * Start the installation process
+     * If shop_id is null, install all shops
+     *
+     * @param int $shop_id
+     *
+     * @return void
+     */
+    public static function autoinstaller($shop_id = null)
+    {
+        if (!empty($shop_id)) {
+            $shop = \Shop::getShop($shop_id);
+            self::_createStore($shop);
+
+            return;
+        }
+
+        $shops = \Shop::getShops();
+        foreach ($shops as $shop) {
+            self::_createStore($shop);
+        }
+    }
+
+    /**
+     * Create a store in Doofinder based on the Prestashop shop
+     *
+     * @param array $shop
+     *
+     * @return void
+     */
+    private static function _createStore($shop)
+    {
+        $client = new EasyREST();
+        $apikey = \Configuration::getGlobalValue('DF_AI_APIKEY');
+        $languages = \Language::getLanguages(true, $shop['id_shop']);
+        $currencies = \Currency::getCurrenciesByIdShop($shop['id_shop']);
+        $shopId = $shop['id_shop'];
+        $shopGroupId = $shop['id_shop_group'];
+        $primaryLang = new \Language(\Configuration::get('PS_LANG_DEFAULT', null, $shopGroupId, $shopId));
+        $installationID = null;
+
+        DoofinderConfig::setDefaultShopConfig($shopGroupId, $shopId);
+
+        $shopUrl = UrlManager::getShopURL($shopId);
+        $storeData = [
+            'name' => $shop['name'],
+            'platform' => 'prestashop',
+            'primary_language' => $primaryLang->language_code,
+            'site_url' => $shopUrl,
+            'search_engines' => [],
+            'plugin_version' => DoofinderConstants::VERSION,
+        ];
+
+        foreach ($languages as $lang) {
+            if ($lang['active'] == 0) {
+                continue;
+            }
+            foreach ($currencies as $cur) {
+                if ($cur['deleted'] == 1 || $cur['active'] == 0) {
+                    continue;
+                }
+                $ciso = $cur['iso_code'];
+                $langCode = $lang['language_code'];
+                $feedUrl = UrlManager::getFeedUrl($shopId, $lang['iso_code'], $ciso);
+                $storeData['search_engines'][] = [
+                    'language' => $langCode,
+                    'currency' => $ciso,
+                    'feed_url' => $feedUrl,
+                    'callback_url' => UrlManager::getProcessCallbackUrl(),
+                ];
+            }
+        }
+
+        $jsonStoreData = json_encode($storeData);
+        DoofinderConfig::debug('Create Store Start');
+        DoofinderConfig::debug(print_r($storeData, true));
+
+        $response = $client->post(
+            UrlManager::getInstallUrl(\Configuration::get('DF_REGION')),
+            $jsonStoreData,
+            false,
+            false,
+            'application/json',
+            ['Authorization: Token ' . $apikey]
+        );
+
+        if ($response->getResponseCode() === 200) {
+            $response = json_decode($response->response, true);
+            $installationID = @$response['installation_id'];
+            DoofinderConfig::debug('Create Store response:');
+            DoofinderConfig::debug(print_r($response, true));
+
+            if ($installationID) {
+                DoofinderConfig::debug("Set installation ID: $installationID");
+                \Configuration::updateValue('DF_INSTALLATION_ID', $installationID, false, $shopGroupId, $shopId);
+                \Configuration::updateValue('DF_ENABLED_V9', true, false, $shopGroupId, $shopId);
+                \Configuration::updateValue('DF_SHOW_LAYER', true, false, $shopGroupId, $shopId);
+                \Configuration::updateValue('DF_SHOW_LAYER_MOBILE', true, false, $shopGroupId, $shopId);
+                SearchEngine::setSearchEnginesByConfig();
+            } else {
+                DoofinderConfig::debug('Invalid installation ID');
+                exit('ko');
+            }
+        } else {
+            $error_msg = "Create Store failed with code {$response->getResponseCode()} and message '{$response->getResponseMessage()}'";
+            $response_msg = 'Response: ' . print_r($response->response, true);
+            DoofinderConfig::debug($error_msg);
+            DoofinderConfig::debug($response_msg);
+            echo $response->response;
+            exit;
+        }
+    }
+
+    public static function installTabs()
+    {
+        $tab = new \Tab();
+        $tab->active = 0;
+        $tab->class_name = 'DoofinderAdmin';
+        $tab->name = [];
+        foreach (\Language::getLanguages() as $lang) {
+            $tab->name[$lang['id_lang']] = 'Doofinder admin controller';
+        }
+        $tab->id_parent = 0;
+        $tab->module = DoofinderConstants::NAME;
+
+        return $tab->save();
+    }
+
+    public static function uninstallTabs()
+    {
+        $tabId = (int) \Tab::getIdFromClassName('DoofinderAdmin');
+        if (!$tabId) {
+            return true;
+        }
+
+        $tab = new \Tab($tabId);
+
+        return $tab->delete();
+    }
+
+    /**
+     * Remove module-dependent configuration variables
+     *
+     * @return bool
+     */
+    public static function deleteConfigVars()
+    {
+        $config_vars = [
+            'DF_AI_ADMIN_ENDPOINT',
+            'DF_AI_API_ENDPOINT',
+            'DF_AI_APIKEY',
+            'DF_API_KEY',
+            'DF_API_LAYER_DESCRIPTION',
+            'DF_CSS_VS',
+            'DF_CUSTOMEXPLODEATTR',
+            'DF_DEBUG',
+            'DF_DEBUG_CURL',
+            'DF_DSBL_AJAX_TKN',
+            'DF_DSBL_DFCKIE_JS',
+            'DF_DSBL_DFFAC_JS',
+            'DF_DSBL_DFLINK_JS',
+            'DF_DSBL_DFPAG_JS',
+            'DF_DSBL_FAC_CACHE',
+            'DF_DSBL_HTTPS_CURL',
+            'DF_EB_LAYER_DESCRIPTION',
+            'DF_ENABLED_V9',
+            'DF_ENABLE_HASH',
+            'DF_EXTRA_CSS',
+            'DF_FACETS_TOKEN',
+            'DF_FEATURES_SHOWN',
+            'DF_FEED_FULL_PATH',
+            'DF_FEED_INDEXED',
+            'DF_FEED_MAINCATEGORY_PATH',
+            'DF_GROUP_ATTRIBUTES_SHOWN',
+            'DF_GS_DESCRIPTION_TYPE',
+            'DF_GS_DISPLAY_PRICES',
+            'DF_GS_IMAGE_SIZE',
+            'DF_GS_PRICES_USE_TAX',
+            'DF_INSTALLATION_ID',
+            'DF_SHOW_LAYER',
+            'DF_SHOW_LAYER_MOBILE',
+            'DF_REGION',
+            'DF_RESTART_OV',
+            'DF_SHOW_PRODUCT_FEATURES',
+            'DF_SHOW_PRODUCT_VARIATIONS',
+            'DF_UPDATE_ON_SAVE_DELAY',
+            'DF_UPDATE_ON_SAVE_LAST_EXEC',
+            'DF_FEED_INDEXED',
+        ];
+
+        $hashid_vars = array_column(
+            \Db::getInstance()->executeS('
+            SELECT name FROM ' . _DB_PREFIX_ . "configuration where name like 'DF_HASHID_%'"),
+            'name'
+        );
+
+        $config_vars = array_merge($config_vars, $hashid_vars);
+
+        foreach ($config_vars as $var) {
+            \Configuration::deleteByName($var);
+        }
+
+        return true;
+    }
+
+    /**
+     * Removes the database tables from the module
+     *
+     * @return bool
+     */
+    public static function uninstallDb()
+    {
+        return \Db::getInstance()->execute('DROP TABLE IF EXISTS `' . _DB_PREFIX_ . 'doofinder_updates`')
+            && \Db::getInstance()->execute('DROP TABLE IF EXISTS `' . _DB_PREFIX_ . 'doofinder_landing`');
+    }
 }
diff --git a/lib/doofinder_layer_api.php b/lib/doofinder_layer_api.php
index f602294..220e99e 100644
--- a/lib/doofinder_layer_api.php
+++ b/lib/doofinder_layer_api.php
@@ -12,7 +12,7 @@
  * @copyright Doofinder
  * @license   GPLv3
  */
-require_once _PS_MODULE_DIR_ . 'doofinder/lib/EasyREST.php';
+use PrestaShop\Module\Doofinder\Lib\EasyREST;
 
 if (!defined('_PS_VERSION_')) {
     exit;
diff --git a/views/js/doofinder-onboarding.js b/views/js/doofinder-onboarding.js
index 976db5d..4467cc4 100644
--- a/views/js/doofinder-onboarding.js
+++ b/views/js/doofinder-onboarding.js
@@ -25,7 +25,7 @@ $(document).ready(function () {
       const doofinder_regex = /.*\.doofinder\.com/gm;
       //Check that the sender is doofinder
       if (!doofinder_regex.test(event.origin)) return;
-      if (event.data) {
+      if (event.data && 'string' === typeof event.data) {
         data = event.data.split("|");
         event_name = data[0];
         event_data = JSON.parse(atob(data[1]));
diff --git a/views/templates/admin/indexation_status.tpl b/views/templates/admin/indexation_status.tpl
index d2803e8..03d9df2 100644
--- a/views/templates/admin/indexation_status.tpl
+++ b/views/templates/admin/indexation_status.tpl
@@ -49,11 +49,11 @@
 </style>
 
 <script>
-    var checkFeedUrl = "{$check_feed_url}";
+    var checkFeedUrl = "{$check_feed_url|escape:'javascript':'UTF-8'}";
 
     $( ".close" ).on( "click", function() {
         $(".doofinder-indexation-status").css("display", "none");
-        var updateFeedUrl = "{$update_feed_url}";
+        var updateFeedUrl = "{$update_feed_url|escape:'javascript':'UTF-8'}";
         $.post(updateFeedUrl, function( data ) {});
     });
 
diff --git a/views/templates/admin/onboarding_tab.tpl b/views/templates/admin/onboarding_tab.tpl
index 0788e55..45bbfbe 100644
--- a/views/templates/admin/onboarding_tab.tpl
+++ b/views/templates/admin/onboarding_tab.tpl
@@ -177,9 +177,9 @@
 		border-color: #1b1851;
 	}
 </style>
-<script type="text/javascript" src="{$module_dir}views/js/doofinder-onboarding.js" ></script>
+<script type="text/javascript" src="{$module_dir|escape:'javascript':'UTF-8'}views/js/doofinder-onboarding.js" ></script>
 <script type="text/javascript">
-	const df_module_dir = "{$module_dir}";
+	const df_module_dir = "{$module_dir|escape:'javascript':'UTF-8'}";
 	const paramsPopup = "{html_entity_decode($paramsPopup|escape:'htmlall':'UTF-8')}";
 	const installerToken = "{$tokenAjax|escape:'htmlall':'UTF-8'}";
 	{if $shop_id}
diff --git a/views/templates/front/catalog/_partials/productlist.tpl b/views/templates/front/catalog/_partials/productlist.tpl
index f1b2e80..0e43845 100644
--- a/views/templates/front/catalog/_partials/productlist.tpl
+++ b/views/templates/front/catalog/_partials/productlist.tpl
@@ -14,7 +14,7 @@
 
 {capture assign="productClasses"}{if !empty($productClass)}{$productClass}{else}col-xs-6 col-xl-4{/if}{/capture}
 
-<div style="justify-content:center" class="products{if !empty($cssClass)} {$cssClass}{/if}">
+<div style="justify-content:center" class="products{if !empty($cssClass)} {$cssClass|escape:'javascript':'UTF-8'}{/if}">
     {foreach from=$products item="product" key="position"}
         {include file="catalog/_partials/miniatures/product.tpl" product=$product position=$position productClasses=$productClasses}
     {/foreach}

From cba014623991d6e318ca32b98d9b218f9a08f191 Mon Sep 17 00:00:00 2001
From: David Molina Cano <128705267+davidmolinacano@users.noreply.github.com>
Date: Tue, 8 Oct 2024 11:02:27 +0200
Subject: [PATCH 2/2] PLUGINRANGERS-234 | Master file refactor step 2:
 HookManager and UpdateOnSave (#242)

* feat: Separated install process + autoloader. First approach

* fix: Fixed several files

* feat: use Db; in upgrade 4.5.0

* fix: Fixes after testing everything carefully

* feat: Renamed buildFeedUrl to getFeedUrl

* feat: Changes to pass the Prestashop validator at 100%

* feat: Migrated HookManager and UpdateOnSave
---
 controllers/front/landing.php |   3 +-
 doofinder.php                 | 526 +++-------------------------------
 lib/DoofinderScript.php       |  60 ++++
 lib/HookManager.php           | 140 +++++++++
 lib/SearchEngine.php          |  63 +++-
 lib/UpdateOnSave.php          | 362 +++++++++++++++++++++++
 lib/dfProduct_build.php       |   4 +
 7 files changed, 659 insertions(+), 499 deletions(-)
 create mode 100644 lib/DoofinderScript.php
 create mode 100644 lib/HookManager.php
 create mode 100644 lib/UpdateOnSave.php

diff --git a/controllers/front/landing.php b/controllers/front/landing.php
index b0c82ce..02b3d67 100644
--- a/controllers/front/landing.php
+++ b/controllers/front/landing.php
@@ -12,6 +12,7 @@
  * @copyright Doofinder
  * @license   GPLv3
  */
+use PrestaShop\Module\Doofinder\Lib\SearchEngine;
 use PrestaShop\PrestaShop\Adapter\Image\ImageRetriever;
 use PrestaShop\PrestaShop\Adapter\Product\PriceFormatter;
 use PrestaShop\PrestaShop\Adapter\Product\ProductColorsRetriever;
@@ -151,7 +152,7 @@ public function getTemplateVarPage()
 
     private function getLandingData($name, $id_shop, $id_lang, $id_currency)
     {
-        $hashid = $this->module->getHashId($id_lang, $id_currency);
+        $hashid = SearchEngine::getHashId($id_lang, $id_currency);
         $cache = $this->getLandingCache($name, $hashid);
 
         if ($cache && !$this->refreshCache($cache)) {
diff --git a/doofinder.php b/doofinder.php
index 7f3aecc..24306cc 100644
--- a/doofinder.php
+++ b/doofinder.php
@@ -25,8 +25,11 @@
 use PrestaShop\Module\Doofinder\Lib\DoofinderConfig;
 use PrestaShop\Module\Doofinder\Lib\DoofinderConstants;
 use PrestaShop\Module\Doofinder\Lib\DoofinderInstallation;
+use PrestaShop\Module\Doofinder\Lib\DoofinderScript;
 use PrestaShop\Module\Doofinder\Lib\EasyREST;
+use PrestaShop\Module\Doofinder\Lib\HookManager;
 use PrestaShop\Module\Doofinder\Lib\SearchEngine;
+use PrestaShop\Module\Doofinder\Lib\UpdateOnSave;
 use PrestaShop\Module\Doofinder\Lib\UrlManager;
 
 class Doofinder extends Module
@@ -37,6 +40,7 @@ class Doofinder extends Module
     public $ps_layered_full_tree = true;
     public $searchBanner = false;
     public $admin_template_dir = '';
+    public $hookManager;
 
     // TODO (davidmolinacano): To be deleted after complete refactor.
     const DOOMANAGER_URL = DoofinderConstants::DOOMANAGER_URL;
@@ -63,6 +67,7 @@ public function __construct()
 
         $this->confirmUninstall = $this->l('Are you sure? This will not cancel your account in Doofinder service');
         $this->admin_template_dir = '../../../../modules/' . $this->name . '/views/templates/admin/';
+        $this->hookManager = new HookManager($this);
     }
 
     /**
@@ -75,16 +80,7 @@ public function install()
         return parent::install()
             && DoofinderInstallation::installDb()
             && DoofinderInstallation::installTabs()
-            && $this->registerHook('displayHeader')
-            && $this->registerHook('moduleRoutes')
-            && $this->registerHook('actionProductSave')
-            && $this->registerHook('actionProductDelete')
-            && $this->registerHook('actionObjectCmsAddAfter')
-            && $this->registerHook('actionObjectCmsUpdateAfter')
-            && $this->registerHook('actionObjectCmsDeleteAfter')
-            && $this->registerHook('actionObjectCategoryAddAfter')
-            && $this->registerHook('actionObjectCategoryUpdateAfter')
-            && $this->registerHook('actionObjectCategoryDeleteAfter');
+            && $this->hookManager->registerHooks();
     }
 
     /**
@@ -107,20 +103,7 @@ public function uninstall()
      */
     public function hookModuleRoutes()
     {
-        return [
-            'module-doofinder-landing' => [
-                'controller' => 'landing',
-                'rule' => 'df/{landing_name}',
-                'keywords' => [
-                    'landing_name' => ['regexp' => '[_a-zA-Z0-9_-]+', 'param' => 'landing_name'],
-                ],
-                'params' => [
-                    'fc' => 'module',
-                    'module' => 'doofinder',
-                    'controller' => 'landing',
-                ],
-            ],
-        ];
+        return HookManager::getHookModuleRoutes();
     }
 
     /**
@@ -345,7 +328,7 @@ protected function renderFormDataFeed($adv = false)
         ];
 
         if (!$this->showNewShopForm(Context::getContext()->shop)) {
-            $valid_update_on_save = $this->is_valid_update_on_save();
+            $valid_update_on_save = UpdateOnSave::isValid();
             $html .= $helper->generateForm([$this->getConfigFormDataFeed($valid_update_on_save)]);
             // Search layer form
             $helper->tpl_vars['fields_value'] = $this->getConfigFormValuesSearchLayer();
@@ -655,7 +638,7 @@ protected function postProcess()
         $messages = '';
 
         if ((bool) Tools::isSubmit('submitDoofinderModuleLaunchReindexing')) {
-            $this->indexApiInvokeReindexing();
+            UpdateOnSave::indexApiInvokeReindexing();
         }
         if (((bool) Tools::isSubmit('submitDoofinderModuleDataFeed')) == true) {
             $form_values = array_merge($form_values, $this->getConfigFormValuesDataFeed());
@@ -721,33 +704,14 @@ protected function postProcess()
      */
     private function configureHookCommon($params = false)
     {
-        $lang = Tools::strtoupper($this->context->language->language_code);
-        $currency = Tools::strtoupper($this->context->currency->iso_code);
-        $search_engine_id = Configuration::get('DF_HASHID_' . $currency . '_' . $lang);
-        $df_region = Configuration::get('DF_REGION');
-        $script = Configuration::get('DOOFINDER_SCRIPT_' . $lang);
-        $extra_css = Configuration::get('DF_EXTRA_CSS');
-        $installation_ID = Configuration::get('DF_INSTALLATION_ID');
-        if (empty($df_querySelector)) {
-            $df_querySelector = '#search_query_top';
-        }
-        $self_path = dirname($_SERVER['SCRIPT_FILENAME']);
-        if (!is_dir($self_path)) {
-            $self_path = dirname(__FILE__);
-        }
-        $this->smarty->assign([
-            'ENT_QUOTES' => ENT_QUOTES,
-            'lang' => Tools::strtolower($lang),
-            'script_html' => dfTools::fixScriptTag($script),
-            'extra_css_html' => dfTools::fixStyleTag($extra_css),
-            'productLinks' => $this->productLinks,
-            'search_engine_id' => $search_engine_id,
-            'df_region' => $df_region,
-            'self' => $self_path,
-            'df_another_params' => $params,
-            'installation_ID' => $installation_ID,
-            'currency' => $currency,
-        ]);
+        $this->smarty->assign(
+            HookManager::getHookCommonSmartyAssigns(
+                $this->context->language->language_code,
+                $this->context->currency->iso_code,
+                $this->productLinks,
+                $params
+            )
+        );
     }
 
     /**
@@ -755,14 +719,13 @@ private function configureHookCommon($params = false)
      */
     public function hookHeader($params)
     {
-        if ($this->searchLayerMustBeInitialized()) {
-            $this->configureHookCommon($params);
-            if (Configuration::get('DF_ENABLED_V9')) {
-                return $this->displayScriptLiveLayer();
-            } else {
-                return $this->displayScriptV7();
-            }
+        if (!DoofinderScript::searchLayerMustBeInitialized()) {
+            return '';
         }
+
+        $this->configureHookCommon($params);
+
+        return $this->displayScriptLiveLayer();
     }
 
     /**
@@ -772,56 +735,18 @@ public function hookHeader($params)
      */
     public function displayScriptLiveLayer()
     {
-        /*
-         * loads different cart handling assets depending on the version of prestashop used
-         * (uses different javascript implementations for this purpose in prestashop 1.6.x and 1.7.x)
-         */
-        if (version_compare(_PS_VERSION_, '1.7', '<') === true) {
-            $this->context->controller->addJS(
-                $this->_path . 'views/js/add-to-cart/doofinder-add_to_cart_ps16.js'
-            );
-        } else {
-            $this->context->controller->addJS(
-                $this->_path . 'views/js/add-to-cart/doofinder-add_to_cart_ps17.js'
-            );
-        }
+        $this->context->controller->addJS(DoofinderScript::getScriptLiveLayerPath($this->_path));
 
         return $this->display(__FILE__, 'views/templates/front/scriptV9.tpl');
     }
 
-    /**
-     * Render the script for the V7 search layer
-     *
-     * @return string
-     */
-    public function displayScriptV7()
-    {
-        $extraCSS = Configuration::get('DF_EXTRA_CSS');
-        $cssVS = (int) Configuration::get('DF_CSS_VS');
-        $file = 'doofinder_custom_' . $this->context->shop->id . '_vs_' . $cssVS . '.css';
-        if ($extraCSS) {
-            $file_path = dirname($_SERVER['SCRIPT_FILENAME']) . '/views/css/' . $file;
-            if (!file_exists($file_path)) {
-                $file_path = dirname(__FILE__) . '/views/css/' . $file;
-            }
-            if (file_exists($file_path)) {
-                $this->context->controller->addCSS(
-                    $this->_path . 'views/css/' . $file,
-                    'all'
-                );
-            }
-        }
-
-        return $this->display(__FILE__, 'views/templates/front/script.tpl');
-    }
-
     /**
      * @hook actionProductSave ProductCore
      */
     public function hookActionProductSave($params)
     {
         $action = $params['product']->active ? 'update' : 'delete';
-        $this->proccessHookUpdateOnSave('product', $params['id_product'], $action);
+        HookManager::proccessHookUpdateOnSave('product', $params['id_product'], $this->context->shop->id, $action);
     }
 
     /**
@@ -829,7 +754,7 @@ public function hookActionProductSave($params)
      */
     public function hookActionProductDelete($params)
     {
-        $this->proccessHookUpdateOnSave('product', $params['id_product'], 'delete');
+        HookManager::proccessHookUpdateOnSave('product', $params['id_product'], $this->context->shop->id, 'delete');
     }
 
     /**
@@ -838,7 +763,7 @@ public function hookActionProductDelete($params)
     public function hookActionObjectCmsAddAfter($params)
     {
         if ($params['object']->active) {
-            $this->proccessHookUpdateOnSave('cms', $params['object']->id, 'update');
+            HookManager::proccessHookUpdateOnSave('cms', $params['object']->id, $this->context->shop->id, 'update');
         }
     }
 
@@ -848,7 +773,7 @@ public function hookActionObjectCmsAddAfter($params)
     public function hookActionObjectCmsUpdateAfter($params)
     {
         $action = $params['object']->active ? 'update' : 'delete';
-        $this->proccessHookUpdateOnSave('cms', $params['object']->id, $action);
+        HookManager::proccessHookUpdateOnSave('cms', $params['object']->id, $this->context->shop->id, $action);
     }
 
     /**
@@ -856,7 +781,7 @@ public function hookActionObjectCmsUpdateAfter($params)
      */
     public function hookActionObjectCmsDeleteAfter($params)
     {
-        $this->proccessHookUpdateOnSave('cms', $params['object']->id, 'delete');
+        HookManager::proccessHookUpdateOnSave('cms', $params['object']->id, $this->context->shop->id, 'delete');
     }
 
     /**
@@ -865,7 +790,7 @@ public function hookActionObjectCmsDeleteAfter($params)
     public function hookActionObjectCategoryAddAfter($params)
     {
         if ($params['object']->active) {
-            $this->proccessHookUpdateOnSave('category', $params['object']->id, 'update');
+            HookManager::proccessHookUpdateOnSave('category', $params['object']->id, $this->context->shop->id, 'update');
         }
     }
 
@@ -875,7 +800,7 @@ public function hookActionObjectCategoryAddAfter($params)
     public function hookActionObjectCategoryUpdateAfter($params)
     {
         $action = $params['object']->active ? 'update' : 'delete';
-        $this->proccessHookUpdateOnSave('category', $params['object']->id, $action);
+        HookManager::proccessHookUpdateOnSave('category', $params['object']->id, $this->context->shop->id, $action);
     }
 
     /**
@@ -883,325 +808,7 @@ public function hookActionObjectCategoryUpdateAfter($params)
      */
     public function hookActionObjectCategoryDeleteAfter($params)
     {
-        $this->proccessHookUpdateOnSave('cms', $params['object']->id, 'delete');
-    }
-
-    /**
-     * Queue the item for update on save
-     *
-     * @param string $object
-     * @param int $id_object
-     * @param string $action
-     *
-     * @return void
-     */
-    public function proccessHookUpdateOnSave($object, $id_object, $action)
-    {
-        if (Configuration::get('DF_UPDATE_ON_SAVE_DELAY')) {
-            $id_shop = $this->context->shop->id;
-
-            $this->addItemQueue($object, $id_object, $id_shop, $action);
-
-            if ($this->allowProcessItemsQueue()) {
-                $this->processItemQueue($id_shop);
-            }
-        }
-    }
-
-    /**
-     * Check if the necessary time has passed to run the update on save again
-     *
-     * @return bool
-     */
-    public function allowProcessItemsQueue()
-    {
-        if (Configuration::get('DF_UPDATE_ON_SAVE_DELAY')) {
-            $last_exec = Configuration::get('DF_UPDATE_ON_SAVE_LAST_EXEC', null, null, null, 0);
-            $delay = (int) Configuration::get('DF_UPDATE_ON_SAVE_DELAY', null, null, null, 30);
-
-            if (is_int($delay)) {
-                $last_exec_ts = strtotime($last_exec);
-
-                $diff_min = (time() - $last_exec_ts) / 60;
-
-                if ($diff_min > $delay) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Updates the execution date of the update on save
-     *
-     * @return void
-     */
-    public function setExecUpdateOnSave()
-    {
-        Configuration::updateValue('DF_UPDATE_ON_SAVE_LAST_EXEC', date('Y-m-d H:i:s'));
-    }
-
-    /**
-     * Add a item to the update on save queue
-     *
-     * @param string $object
-     * @param int $id_object
-     * @param int $id_shop
-     * @param string $action
-     *
-     * @return void
-     */
-    public function addItemQueue($object, $id_object, $id_shop, $action)
-    {
-        Db::getInstance()->insert(
-            'doofinder_updates',
-            [
-                'id_shop' => $id_shop,
-                'object' => $object,
-                'id_object' => $id_object,
-                'action' => $action,
-                'date_upd' => date('Y-m-d H:i:s'),
-            ],
-            false,
-            true,
-            Db::REPLACE
-        );
-    }
-
-    /**
-     * Process queued items from update on save to send to API
-     *
-     * @param int $id_shop
-     *
-     * @return void
-     */
-    public function processItemQueue($id_shop)
-    {
-        $this->setExecUpdateOnSave();
-
-        $languages = Language::getLanguages(true, $id_shop);
-        $currencies = Currency::getCurrenciesByIdShop($id_shop);
-
-        foreach (['product', 'cms', 'category'] as $type) {
-            $items_update = $this->getItemsQueue($id_shop, $type, 'update');
-            $items_delete = $this->getItemsQueue($id_shop, $type, 'delete');
-
-            foreach ($languages as $language) {
-                foreach ($currencies as $currency) {
-                    $this->{'send' . $type . 'Api'}($items_update, $id_shop, $language['id_lang'], $currency['id_currency']);
-                    $this->{'send' . $type . 'Api'}($items_delete, $id_shop, $language['id_lang'], $currency['id_currency'], 'delete');
-                }
-            }
-        }
-
-        $this->deleteItemsQueue($id_shop);
-    }
-
-    /**
-     * Get queued items from update on save
-     *
-     * @param int $id_shop
-     * @param string $action
-     *
-     * @return array
-     */
-    public function getItemsQueue($id_shop, $type, $action = 'update')
-    {
-        $items = Db::getInstance()->executeS(
-            '
-            SELECT id_object FROM ' . _DB_PREFIX_ . "doofinder_updates
-            WHERE object = '" . pSQL($type) . "' AND action = '" . pSQL($action) . "' AND id_shop = " . (int) $id_shop
-        );
-
-        return array_column($items, 'id_object');
-    }
-
-    /**
-     * Remove queued items from update on save
-     *
-     * @param int $id_shop
-     *
-     * @return void
-     */
-    public function deleteItemsQueue($id_shop)
-    {
-        Db::getInstance()->execute('DELETE from ' . _DB_PREFIX_ . 'doofinder_updates WHERE id_shop = ' . (int) $id_shop);
-    }
-
-    /**
-     * Update products in doofinder using the API
-     *
-     * @param array $products
-     * @param int $id_shop
-     * @param int $id_lang
-     * @param int $id_currency
-     * @param string $action
-     *
-     * @return void
-     */
-    public function sendProductApi($products, $id_shop, $id_lang, $id_currency, $action = 'update')
-    {
-        if (empty($products)) {
-            return;
-        }
-
-        $hashid = $this->getHashId($id_lang, $id_currency);
-
-        if ($hashid) {
-            if ($action == 'update') {
-                require_once 'lib/dfProduct_build.php';
-                $builder = new DfProductBuild($id_shop, $id_lang, $id_currency);
-                $builder->setProducts($products);
-                $payload = $builder->build();
-
-                $this->updateItemsApi($hashid, 'product', $payload);
-            } elseif ($action == 'delete') {
-                $this->deleteItemsApi($hashid, 'product', $products);
-            }
-        }
-    }
-
-    /**
-     * Update cms pages in doofinder using the API
-     *
-     * @param array $cms_pages
-     * @param int $id_shop
-     * @param int $id_lang
-     * @param int $id_currency
-     * @param string $action
-     *
-     * @return void
-     */
-    public function sendCmsApi($cms_pages, $id_shop, $id_lang, $id_currency, $action = 'update')
-    {
-        if (empty($cms_pages)) {
-            return;
-        }
-
-        $hashid = $this->getHashId($id_lang, $id_currency);
-
-        if ($hashid) {
-            if ($action == 'update') {
-                require_once 'lib/dfCms_build.php';
-
-                $builder = new DfCmsBuild($id_shop, $id_lang);
-                $builder->setCmsPages($cms_pages);
-                $payload = $builder->build();
-
-                $this->updateItemsApi($hashid, 'page', $payload);
-            } elseif ($action == 'delete') {
-                $this->deleteItemsApi($hashid, 'page', $cms_pages);
-            }
-        }
-    }
-
-    /**
-     * Update categores in doofinder using the API
-     *
-     * @param array $categories
-     * @param int $id_shop
-     * @param int $id_lang
-     * @param int $id_currency
-     * @param string $action
-     *
-     * @return void
-     */
-    public function sendCategoryApi($categories, $id_shop, $id_lang, $id_currency, $action = 'update')
-    {
-        if (empty($categories)) {
-            return;
-        }
-
-        $hashid = $this->getHashId($id_lang, $id_currency);
-
-        if ($hashid) {
-            if ($action == 'update') {
-                require_once 'lib/dfCategory_build.php';
-
-                $builder = new DfCategoryBuild($id_shop, $id_lang);
-                $builder->setCategories($categories);
-                $payload = $builder->build();
-
-                $this->updateItemsApi($hashid, 'category', $payload);
-            } elseif ($action == 'delete') {
-                $this->deleteItemsApi($hashid, 'category', $categories);
-            }
-        }
-    }
-
-    private function updateItemsApi($hashid, $type, $payload)
-    {
-        if (empty($payload)) {
-            return;
-        }
-
-        require_once 'lib/doofinder_api_items.php';
-
-        $apikey = explode('-', Configuration::get('DF_API_KEY'))[1];
-        $region = Configuration::get('DF_REGION');
-
-        $api = new DoofinderApiItems($hashid, $apikey, $region, $type);
-        $response = $api->updateBulk($payload);
-
-        if (isset($response['error']) && !empty($response['error'])) {
-            DoofinderConfig::debug(json_encode($response['error']));
-        }
-    }
-
-    private function deleteItemsApi($hashid, $type, $payload)
-    {
-        if (empty($payload)) {
-            return;
-        }
-
-        require_once 'lib/doofinder_api_items.php';
-
-        $apikey = explode('-', Configuration::get('DF_API_KEY'))[1];
-        $region = Configuration::get('DF_REGION');
-
-        $api = new DoofinderApiItems($hashid, $apikey, $region, $type);
-        $response = $api->deleteBulk(json_encode($payload));
-
-        if (isset($response['error']) && !empty($response['error'])) {
-            DoofinderConfig::debug(json_encode($response['error']));
-        }
-    }
-
-    private function indexApiInvokeReindexing()
-    {
-        require_once 'lib/doofinder_api_index.php';
-
-        $region = Configuration::get('DF_REGION');
-        $api_key = Configuration::get('DF_API_KEY');
-        $api = new DoofinderApiIndex($api_key, $region);
-        $response = $api->invokeReindexing(Configuration::get('DF_INSTALLATION_ID'), UrlManager::getProcessCallbackUrl());
-        if (empty($response) || $response['status'] !== 200) {
-            DoofinderConfig::debug('Error while invoking reindexing: ' . json_encode($response));
-
-            return;
-        }
-
-        Configuration::updateValue('DF_FEED_INDEXED', false);
-    }
-
-    private function is_valid_update_on_save()
-    {
-        $region = Configuration::get('DF_REGION');
-        $api_key = Configuration::get('DF_API_KEY');
-        $api = new DoofinderInstallation($api_key, $region);
-        $decode_response = $api->isValidUpdateOnSave(Configuration::get('DF_INSTALLATION_ID'));
-
-        if (empty($decode_response)) {
-            DoofinderConfig::debug('Error checking search engines: ' . json_encode($decode_response));
-
-            Configuration::updateValue('DF_UPDATE_ON_SAVE_DELAY', 0);
-
-            return false;
-        }
-
-        return @$decode_response['valid?'];
+        HookManager::proccessHookUpdateOnSave('category', $params['object']->id, $this->context->shop->id, 'delete');
     }
 
     /**
@@ -1285,7 +892,7 @@ public function searchOnApi($string, $page = 1, $page_size = 12, $timeout = 8000
         }
         $query_name = Tools::getValue('df_query_name', false);
         DoofinderConfig::debug('Search On API Start');
-        $hash_id = $this->getHashId(Context::getContext()->language->id, Context::getContext()->currency->id);
+        $hash_id = SearchEngine::getHashId(Context::getContext()->language->id, Context::getContext()->currency->id);
         $api_key = Configuration::get('DF_API_KEY');
         $show_variations = Configuration::get('DF_SHOW_PRODUCT_VARIATIONS');
         if ((int) $show_variations !== 1) {
@@ -1581,61 +1188,6 @@ public function getLanguageIdByLocale($locale)
             );
     }
 
-    /**
-     * Get the ISO of a currency
-     *
-     * @param int $id currency ID
-     *
-     * @return string
-     */
-    protected function getIsoCodeById($id)
-    {
-        return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue(
-            '
-            SELECT `iso_code` FROM ' . _DB_PREFIX_ . 'currency WHERE `id_currency` = ' . (int) $id
-        );
-    }
-
-    /**
-     * Gets the ISO code of a language code
-     *
-     * @param string $code 3-letter Month abbreviation
-     *
-     * @return string
-     */
-    protected function getLanguageCode($code)
-    {
-        // $code is in the form of 'xx-YY' where xx is the language code
-        // and 'YY' a country code identifying a variant of the language.
-        $lang_country = explode('-', $code);
-
-        return $lang_country[0];
-    }
-
-    /**
-     * Get the configuration key for the language and currency corresponding to the hashid
-     *
-     * @param int $id_lang
-     * @param int $id_currency
-     *
-     * @return string
-     */
-    public function getHashId($id_lang, $id_currency)
-    {
-        $curr_iso = strtoupper($this->getIsoCodeById($id_currency));
-        $lang = new Language($id_lang);
-
-        $hashid_key = 'DF_HASHID_' . $curr_iso . '_' . strtoupper($lang->language_code);
-        $hashid = Configuration::get($hashid_key);
-
-        if (!$hashid) {
-            $hashid_key = 'DF_HASHID_' . $curr_iso . '_' . strtoupper($this->getLanguageCode($lang->language_code));
-            $hashid = Configuration::get($hashid_key);
-        }
-
-        return $hashid;
-    }
-
     private function getBooleanFormValue()
     {
         $option = [
@@ -1694,16 +1246,4 @@ private function displayGeneralMsg($string, $type, $alert, $link = false, $raw =
 
         return $this->context->smarty->fetch($this->local_path . 'views/templates/admin/display_msg.tpl');
     }
-
-    private function searchLayerMustBeInitialized()
-    {
-        $displayMobile = Configuration::get('DF_SHOW_LAYER_MOBILE', null, null, null, true);
-        $displayDesktop = Configuration::get('DF_SHOW_LAYER', null, null, null, true);
-        $context = Context::getContext();
-        // In certain older PrestaShop 1.6 versions, the 'isMobile' method may not be directly available within the context.
-        // To address this, we check for the method's existence and, if absent, fall back on the 'getMobileDetect' version as an alternative.
-        $isMobile = method_exists($context, 'isMobile') ? $context->isMobile() : $context->getMobileDetect()->isMobile();
-
-        return ($isMobile && $displayMobile) || (!$isMobile && $displayDesktop);
-    }
 }
diff --git a/lib/DoofinderScript.php b/lib/DoofinderScript.php
new file mode 100644
index 0000000..157c86a
--- /dev/null
+++ b/lib/DoofinderScript.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * NOTICE OF LICENSE
+ *
+ * This file is licenced under the Software License Agreement.
+ * With the purchase or the installation of the software in your application
+ * you accept the licence agreement.
+ *
+ * You must not modify, adapt or create derivative works of this source code
+ *
+ * @author    Doofinder
+ * @copyright Doofinder
+ * @license   GPLv3
+ */
+
+namespace PrestaShop\Module\Doofinder\Lib;
+
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+class DoofinderScript
+{
+    /**
+     * Determines if the Doofinder search layer must be initialized based on the device type (mobile or desktop) and configuration settings.
+     *
+     * This function checks if the search layer should be displayed for the current user context (mobile or desktop) by
+     * retrieving the relevant configuration values. It ensures compatibility with older versions of PrestaShop where the
+     * 'isMobile' method may not be directly available in the context, using a fallback for mobile detection.
+     *
+     * @return bool returns `true` if the search layer should be initialized (based on the device type and configuration), `false` otherwise
+     */
+    public static function searchLayerMustBeInitialized()
+    {
+        $displayMobile = \Configuration::get('DF_SHOW_LAYER_MOBILE', null, null, null, true);
+        $displayDesktop = \Configuration::get('DF_SHOW_LAYER', null, null, null, true);
+        $context = \Context::getContext();
+        $isMobile = method_exists($context, 'isMobile') ? $context->isMobile() : $context->getMobileDetect()->isMobile();
+
+        return ($isMobile && $displayMobile) || (!$isMobile && $displayDesktop);
+    }
+
+    /**
+     * Gets the script for the Livelayer search layer according to the PrestaShop version.
+     *
+     * @return string
+     */
+    public static function getScriptLiveLayerPath($modulePath)
+    {
+        /*
+         * Loads different cart handling assets depending on the version of PrestaShop used
+         * (uses different javascript implementations for this purpose in PrestaShop 1.6.x and 1.7.x)
+         */
+        if (version_compare(_PS_VERSION_, '1.7', '<') === true) {
+            return $modulePath . 'views/js/add-to-cart/doofinder-add_to_cart_ps16.js';
+        }
+
+        return $modulePath . 'views/js/add-to-cart/doofinder-add_to_cart_ps17.js';
+    }
+}
diff --git a/lib/HookManager.php b/lib/HookManager.php
new file mode 100644
index 0000000..5d1a414
--- /dev/null
+++ b/lib/HookManager.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * NOTICE OF LICENSE
+ *
+ * This file is licenced under the Software License Agreement.
+ * With the purchase or the installation of the software in your application
+ * you accept the licence agreement.
+ *
+ * You must not modify, adapt or create derivative works of this source code
+ *
+ * @author    Doofinder
+ * @copyright Doofinder
+ * @license   GPLv3
+ */
+
+namespace PrestaShop\Module\Doofinder\Lib;
+
+if (!class_exists('dfTools')) {
+    require_once 'dfTools.class.php';
+}
+
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+class HookManager
+{
+    private $module;
+
+    public function __construct($module)
+    {
+        $this->module = $module;
+    }
+
+    /**
+     * Registers the hooks when the plugin is installed
+     *
+     * @return true
+     */
+    public function registerHooks()
+    {
+        return $this->module->registerHook('displayHeader')
+        && $this->module->registerHook('moduleRoutes')
+        && $this->module->registerHook('actionProductSave')
+        && $this->module->registerHook('actionProductDelete')
+        && $this->module->registerHook('actionObjectCmsAddAfter')
+        && $this->module->registerHook('actionObjectCmsUpdateAfter')
+        && $this->module->registerHook('actionObjectCmsDeleteAfter')
+        && $this->module->registerHook('actionObjectCategoryAddAfter')
+        && $this->module->registerHook('actionObjectCategoryUpdateAfter')
+        && $this->module->registerHook('actionObjectCategoryDeleteAfter');
+    }
+
+    /**
+     * Retrieves common variables for assigning to Smarty templates in a hook context.
+     *
+     * This function prepares a set of key variables needed for rendering Doofinder-related data in a Smarty template.
+     * These include language and currency codes, search engine ID, region, script and CSS configurations, product links, etc.
+     *
+     * @param string $languageCode The language code (e.g., 'en-us', 'fr-fr') to be used in the Smarty template.
+     * @param string $currencyCode The currency code (e.g., 'USD', 'EUR') to be used in the Smarty template.
+     * @param array $productLinks array of product-related links to be used in the template
+     * @param mixed $extraParams optional additional parameters that may be assigned to the template
+     *
+     * @return array returns an associative array of variables to be assigned to the Smarty template,
+     *               including language, script, product links, search engine ID, region, and more
+     */
+    public static function getHookCommonSmartyAssigns($languageCode, $currencyCode, $productLinks, $extraParams = false)
+    {
+        $lang = \Tools::strtoupper($languageCode);
+        $currency = \Tools::strtoupper($currencyCode);
+        $searchEngineId = \Configuration::get('DF_HASHID_' . $currency . '_' . $lang);
+        $dfRegion = \Configuration::get('DF_REGION');
+        $script = \Configuration::get('DOOFINDER_SCRIPT_' . $lang);
+        $extraCss = \Configuration::get('DF_EXTRA_CSS');
+        $installationID = \Configuration::get('DF_INSTALLATION_ID');
+        $selfPath = dirname($_SERVER['SCRIPT_FILENAME']);
+        if (!is_dir($selfPath)) {
+            $selfPath = dirname(__FILE__);
+        }
+
+        return [
+            'ENT_QUOTES' => ENT_QUOTES,
+            'lang' => $languageCode,
+            'script_html' => \DfTools::fixScriptTag($script),
+            'extra_css_html' => \DfTools::fixStyleTag($extraCss),
+            'productLinks' => $productLinks,
+            'search_engine_id' => $searchEngineId,
+            'df_region' => $dfRegion,
+            'self' => $selfPath,
+            'df_another_params' => $extraParams,
+            'installation_ID' => $installationID,
+            'currency' => $currency,
+        ];
+    }
+
+    /**
+     * Add controller routes
+     *
+     * @return array
+     */
+    public static function getHookModuleRoutes()
+    {
+        return [
+            'module-doofinder-landing' => [
+                'controller' => 'landing',
+                'rule' => 'df/{landing_name}',
+                'keywords' => [
+                    'landing_name' => ['regexp' => '[_a-zA-Z0-9_-]+', 'param' => 'landing_name'],
+                ],
+                'params' => [
+                    'fc' => 'module',
+                    'module' => 'doofinder',
+                    'controller' => 'landing',
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Queue the item for update on save
+     *
+     * @param string $object
+     * @param int $idObject
+     * @param int $shopId
+     * @param string $action
+     *
+     * @return void
+     */
+    public static function proccessHookUpdateOnSave($object, $idObject, $shopId, $action)
+    {
+        if (\Configuration::get('DF_UPDATE_ON_SAVE_DELAY')) {
+            UpdateOnSave::addItemQueue($object, $idObject, $shopId, $action);
+
+            if (UpdateOnSave::allowProcessItemsQueue()) {
+                UpdateOnSave::processItemQueue($shopId);
+            }
+        }
+    }
+}
diff --git a/lib/SearchEngine.php b/lib/SearchEngine.php
index 3f628ed..5874e05 100644
--- a/lib/SearchEngine.php
+++ b/lib/SearchEngine.php
@@ -19,12 +19,32 @@
     exit;
 }
 
-if (!class_exists('DoofinderLayerApi')) {
-    require_once 'doofinder_layer_api.php';
-}
-
 class SearchEngine
 {
+    /**
+     * Get the configuration key for the language and currency corresponding to the hashid
+     *
+     * @param int $idLang
+     * @param int $idCurrency
+     *
+     * @return string
+     */
+    public static function getHashId($idLang, $idCurrency)
+    {
+        $currIso = strtoupper(self::getIsoCodeById($idCurrency));
+        $lang = new \Language($idLang);
+
+        $hashidKey = 'DF_HASHID_' . $currIso . '_' . strtoupper($lang->language_code);
+        $hashid = \Configuration::get($hashidKey);
+
+        if (!$hashid) {
+            $hashidKey = 'DF_HASHID_' . $currIso . '_' . strtoupper(self::getLanguageCode($lang->language_code));
+            $hashid = \Configuration::get($hashidKey);
+        }
+
+        return $hashid;
+    }
+
     /**
      * Update the hashid of the search engines of the store in the configuration
      *
@@ -32,7 +52,9 @@ class SearchEngine
      */
     public static function setSearchEnginesByConfig()
     {
-        require_once 'doofinder_layer_api.php';
+        if (!class_exists('DoofinderLayerApi')) {
+            require_once 'doofinder_layer_api.php';
+        }
         $installationID = \Configuration::get('DF_INSTALLATION_ID');
         $apiKey = \Configuration::get('DF_API_KEY');
         $region = \Configuration::get('DF_REGION');
@@ -47,4 +69,35 @@ public static function setSearchEnginesByConfig()
 
         return true;
     }
+
+    /**
+     * Get the ISO of a currency
+     *
+     * @param int $id currency ID
+     *
+     * @return string
+     */
+    protected static function getIsoCodeById($id)
+    {
+        return \Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue(
+            '
+            SELECT `iso_code` FROM ' . _DB_PREFIX_ . 'currency WHERE `id_currency` = ' . (int) $id
+        );
+    }
+
+    /**
+     * Gets the ISO code of a language code
+     *
+     * @param string $code 3-letter Month abbreviation
+     *
+     * @return string
+     */
+    protected static function getLanguageCode($code)
+    {
+        // $code is in the form of 'xx-YY' where xx is the language code
+        // and 'YY' a country code identifying a variant of the language.
+        $lang_country = explode('-', $code);
+
+        return $lang_country[0];
+    }
 }
diff --git a/lib/UpdateOnSave.php b/lib/UpdateOnSave.php
new file mode 100644
index 0000000..126fd62
--- /dev/null
+++ b/lib/UpdateOnSave.php
@@ -0,0 +1,362 @@
+<?php
+/**
+ * NOTICE OF LICENSE
+ *
+ * This file is licenced under the Software License Agreement.
+ * With the purchase or the installation of the software in your application
+ * you accept the licence agreement.
+ *
+ * You must not modify, adapt or create derivative works of this source code
+ *
+ * @author    Doofinder
+ * @copyright Doofinder
+ * @license   GPLv3
+ */
+
+namespace PrestaShop\Module\Doofinder\Lib;
+
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+class UpdateOnSave
+{
+    /**
+     * Check if the necessary time has passed to run the update on save again.
+     *
+     * @return bool
+     */
+    public static function allowProcessItemsQueue()
+    {
+        if (\Configuration::get('DF_UPDATE_ON_SAVE_DELAY')) {
+            $last_exec = \Configuration::get('DF_UPDATE_ON_SAVE_LAST_EXEC', null, null, null, 0);
+            $delay = (int) \Configuration::get('DF_UPDATE_ON_SAVE_DELAY', null, null, null, 30);
+
+            if (is_int($delay)) {
+                $last_exec_ts = strtotime($last_exec);
+
+                $diff_min = (time() - $last_exec_ts) / 60;
+
+                if ($diff_min > $delay) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Add a item to the update on save queue.
+     *
+     * @param string $object
+     * @param int $idObject
+     * @param int $shopId
+     * @param string $action
+     *
+     * @return void
+     */
+    public static function addItemQueue($object, $idObject, $shopId, $action)
+    {
+        \Db::getInstance()->insert(
+            'doofinder_updates',
+            [
+                'id_shop' => $shopId,
+                'object' => $object,
+                'id_object' => $idObject,
+                'action' => $action,
+                'date_upd' => date('Y-m-d H:i:s'),
+            ],
+            false,
+            true,
+            \Db::REPLACE
+        );
+    }
+
+    /**
+     * Updates the execution date of the update on save
+     *
+     * @return void
+     */
+    public static function setExecUpdateOnSave()
+    {
+        \Configuration::updateValue('DF_UPDATE_ON_SAVE_LAST_EXEC', date('Y-m-d H:i:s'));
+    }
+
+    /**
+     * Process queued items from update on save to send to API.
+     *
+     * @param int $shopId
+     *
+     * @return void
+     */
+    public static function processItemQueue($shopId)
+    {
+        self::setExecUpdateOnSave();
+
+        $languages = \Language::getLanguages(true, $shopId);
+        $currencies = \Currency::getCurrenciesByIdShop($shopId);
+
+        foreach (['product', 'cms', 'category'] as $type) {
+            $itemsUpdate = self::getItemsQueue($shopId, $type, 'update');
+            $itemsDelete = self::getItemsQueue($shopId, $type, 'delete');
+
+            foreach ($languages as $language) {
+                foreach ($currencies as $currency) {
+                    self::{'send' . $type . 'Api'}($itemsUpdate, $shopId, $language['id_lang'], $currency['id_currency']);
+                    self::{'send' . $type . 'Api'}($itemsDelete, $shopId, $language['id_lang'], $currency['id_currency'], 'delete');
+                }
+            }
+        }
+
+        self::deleteItemsQueue($shopId);
+    }
+
+    /**
+     * Get queued items from update on save
+     *
+     * @param int $shopId
+     * @param string $action
+     *
+     * @return array
+     */
+    public static function getItemsQueue($shopId, $type, $action = 'update')
+    {
+        $items = \Db::getInstance()->executeS(
+            '
+            SELECT id_object FROM ' . _DB_PREFIX_ . "doofinder_updates
+            WHERE object = '" . pSQL($type) . "' AND action = '" . pSQL($action) . "' AND id_shop = " . (int) $shopId
+        );
+
+        return array_column($items, 'id_object');
+    }
+
+    /**
+     * Remove queued items from update on save
+     *
+     * @param int $shopId
+     *
+     * @return void
+     */
+    public static function deleteItemsQueue($shopId)
+    {
+        \Db::getInstance()->execute('DELETE from ' . _DB_PREFIX_ . 'doofinder_updates WHERE id_shop = ' . (int) $shopId);
+    }
+
+    /**
+     * Update products in Doofinder using the API
+     *
+     * @param array $products
+     * @param int $shopId
+     * @param int $idLang
+     * @param int $idCurrency
+     * @param string $action
+     *
+     * @return void
+     */
+    public static function sendProductApi($products, $shopId, $idLang, $idCurrency, $action = 'update')
+    {
+        if (empty($products)) {
+            return;
+        }
+
+        $hashid = SearchEngine::getHashId($idLang, $idCurrency);
+
+        if (!$hashid) {
+            return;
+        }
+
+        if ('update' === $action) {
+            require_once 'dfProduct_build.php';
+            $builder = new \DfProductBuild($shopId, $idLang, $idCurrency);
+            $builder->setProducts($products);
+            $payload = $builder->build();
+
+            self::updateItemsApi($hashid, 'product', $payload);
+        } elseif ('delete' === $action) {
+            self::deleteItemsApi($hashid, 'product', $products);
+        }
+    }
+
+    /**
+     * Update cms pages in Doofinder using the API
+     *
+     * @param array $cmsPages
+     * @param int $shopId
+     * @param int $idLang
+     * @param int $idCurrency
+     * @param string $action
+     *
+     * @return void
+     */
+    public static function sendCmsApi($cmsPages, $shopId, $idLang, $idCurrency, $action = 'update')
+    {
+        if (empty($cmsPages)) {
+            return;
+        }
+
+        $hashid = SearchEngine::getHashId($idLang, $idCurrency);
+
+        if ($hashid) {
+            if ('update' === $action) {
+                require_once 'dfCms_build.php';
+
+                $builder = new \DfCmsBuild($shopId, $idLang);
+                $builder->setCmsPages($cmsPages);
+                $payload = $builder->build();
+
+                self::updateItemsApi($hashid, 'page', $payload);
+            } elseif ('delete' === $action) {
+                self::deleteItemsApi($hashid, 'page', $cmsPages);
+            }
+        }
+    }
+
+    /**
+     * Update categories in Doofinder using the API
+     *
+     * @param array $categories
+     * @param int $shopId
+     * @param int $idLang
+     * @param int $idCurrency
+     * @param string $action
+     *
+     * @return void
+     */
+    public static function sendCategoryApi($categories, $shopId, $idLang, $idCurrency, $action = 'update')
+    {
+        if (empty($categories)) {
+            return;
+        }
+
+        $hashid = SearchEngine::getHashId($idLang, $idCurrency);
+
+        if ($hashid) {
+            if ('update' === $action) {
+                require_once 'dfCategory_build.php';
+
+                $builder = new \DfCategoryBuild($shopId, $idLang);
+                $builder->setCategories($categories);
+                $payload = $builder->build();
+
+                self::updateItemsApi($hashid, 'category', $payload);
+            } elseif ('delete' === $action) {
+                self::deleteItemsApi($hashid, 'category', $categories);
+            }
+        }
+    }
+
+    /**
+     * Updates items in Doofinder API.
+     *
+     * This function sends a bulk update request to the Doofinder API for the specified hashid, item type, and payload.
+     * It requires the API key and region configuration to initialize the API client and handle the response.
+     *
+     * @param string $hashid the Doofinder search engine hashid
+     * @param string $type The type of items to update (e.g., 'product', 'category', 'cms').
+     * @param array $payload The data payload containing the items to update. This is an associative array.
+     *
+     * @return void
+     */
+    private static function updateItemsApi($hashid, $type, $payload)
+    {
+        if (empty($payload)) {
+            return;
+        }
+
+        require_once 'doofinder_api_items.php';
+
+        $apikey = explode('-', \Configuration::get('DF_API_KEY'))[1];
+        $region = \Configuration::get('DF_REGION');
+
+        $api = new \DoofinderApiItems($hashid, $apikey, $region, $type);
+        $response = $api->updateBulk($payload);
+
+        if (isset($response['error']) && !empty($response['error'])) {
+            DoofinderConfig::debug(json_encode($response['error']));
+        }
+    }
+
+    /**
+     * Deletes items in Doofinder API.
+     *
+     * This function sends a bulk delete request to the Doofinder API for the specified hashid, item type, and payload.
+     * It requires the API key and region configuration to initialize the API client and handle the response.
+     *
+     * @param string $hashid the Doofinder search engine hashid
+     * @param string $type The type of items to delete (e.g., 'product', 'category', 'cms').
+     * @param array $payload The data payload containing the items to delete. This is an associative array.
+     *
+     * @return void
+     */
+    private static function deleteItemsApi($hashid, $type, $payload)
+    {
+        if (empty($payload)) {
+            return;
+        }
+
+        require_once 'doofinder_api_items.php';
+
+        $apikey = explode('-', \Configuration::get('DF_API_KEY'))[1];
+        $region = \Configuration::get('DF_REGION');
+
+        $api = new \DoofinderApiItems($hashid, $apikey, $region, $type);
+        $response = $api->deleteBulk(json_encode($payload));
+
+        if (isset($response['error']) && !empty($response['error'])) {
+            DoofinderConfig::debug(json_encode($response['error']));
+        }
+    }
+
+    /**
+     * Invokes the reindexing process via Doofinder API.
+     *
+     * This function triggers a reindexing process for the current Doofinder installation by sending a request to
+     * Doofinder API. It retrieves the API key and region from the configuration, initializes the API client, and
+     * sends the reindexing request.
+     *
+     * @return void
+     */
+    public static function indexApiInvokeReindexing()
+    {
+        require_once 'doofinder_api_index.php';
+
+        $region = \Configuration::get('DF_REGION');
+        $api_key = \Configuration::get('DF_API_KEY');
+        $api = new \DoofinderApiIndex($api_key, $region);
+        $response = $api->invokeReindexing(\Configuration::get('DF_INSTALLATION_ID'), UrlManager::getProcessCallbackUrl());
+        if (empty($response) || 200 !== $response['status']) {
+            DoofinderConfig::debug('Error while invoking reindexing: ' . json_encode($response));
+
+            return;
+        }
+
+        \Configuration::updateValue('DF_FEED_INDEXED', false);
+    }
+
+    /**
+     * Validates the Doofinder Update on Save.
+     *
+     * This function checks if the Update on Save is valid by sending a request to the Doofinder API.
+     * If the response is invalid or empty, it logs an error and updates the configuration to prevent further update delays.
+     *
+     * @return bool returns `true` if the installation is valid, otherwise `false`
+     */
+    public static function isValid()
+    {
+        $region = \Configuration::get('DF_REGION');
+        $api_key = \Configuration::get('DF_API_KEY');
+        $api = new DoofinderInstallation($api_key, $region);
+        $decode_response = $api->isValidUpdateOnSave(\Configuration::get('DF_INSTALLATION_ID'));
+
+        if (empty($decode_response['valid?'])) {
+            DoofinderConfig::debug('Error checking search engines: ' . json_encode($decode_response));
+
+            \Configuration::updateValue('DF_UPDATE_ON_SAVE_DELAY', 0);
+
+            return false;
+        }
+
+        return $decode_response['valid?'];
+    }
+}
diff --git a/lib/dfProduct_build.php b/lib/dfProduct_build.php
index 750ec58..5d25115 100644
--- a/lib/dfProduct_build.php
+++ b/lib/dfProduct_build.php
@@ -365,6 +365,10 @@ private function getVariantsInformation($product)
         if (dfTools::hasAttributes($product['id_product']) && !$product['id_product_attribute']) {
             $product_attributes = dfTools::hasProductAttributes($product['id_product'], $this->attributes_shown);
 
+            if (empty($product_attributes)) {
+                return [];
+            }
+
             $attributes = dfTools::getAttributesName($product_attributes, $this->id_lang);
 
             $names = array_column($attributes, 'name');