diff --git a/classes/Cart.php b/classes/Cart.php
index 2b3377838..dd7692a16 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -4937,7 +4937,7 @@ class CartCore extends ObjectModel
                         }
 
                         if (!count($errors)) {
-                            $numDays = $objBookingDetail->getNumberOfDays($dateFrom, $dateTo);
+                            $numDays = HotelHelper::getNumberOfDays($dateFrom, $dateTo);
                             $prodQty = $prodQty * (int) $numDays;
                             $reqRooms = 1;
 
diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php
index b169c1244..5e7031082 100644
--- a/classes/PaymentModule.php
+++ b/classes/PaymentModule.php
@@ -931,7 +931,7 @@ abstract class PaymentModuleCore extends Module
 
                                             $numDays = 1;
                                             if ($objGlobalDemand->price_calc_method == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) {
-                                                $numDays = $objBookingDetail->getNumberOfDays(
+                                                $numDays = HotelHelper::getNumberOfDays(
                                                     $objBookingDetail->date_from,
                                                     $objBookingDetail->date_to
                                                 );
@@ -1940,7 +1940,7 @@ abstract class PaymentModuleCore extends Module
                                 $cart_htl_data[$type_key]['date_diff'][$date_join]['amount_tax_incl'] += $data_v['total_price_tax_incl'];
                                 $cart_htl_data[$type_key]['date_diff'][$date_join]['amount_tax_excl'] += $data_v['total_price_tax_excl'];
                             } else {
-                                $num_days = $obj_htl_bk_dtl->getNumberOfDays($data_v['date_from'], $data_v['date_to']);
+                                $num_days = HotelHelper::getNumberOfDays($data_v['date_from'], $data_v['date_to']);
 
                                 $cart_htl_data[$type_key]['date_diff'][$date_join]['num_rm'] = 1;
                                 $cart_htl_data[$type_key]['date_diff'][$date_join]['data_form'] = $data_v['date_from'];
diff --git a/classes/webservice/WebserviceSpecificManagementBookings.php b/classes/webservice/WebserviceSpecificManagementBookings.php
index 3d8927d51..2485adbeb 100644
--- a/classes/webservice/WebserviceSpecificManagementBookings.php
+++ b/classes/webservice/WebserviceSpecificManagementBookings.php
@@ -3327,7 +3327,7 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
 
                     $qty = 1;
                     if ($objGlobalDemand->price_calc_method == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) {
-                        $numDays = $objHtlBkDtl->getNumberOfDays(
+                        $numDays = HotelHelper::getNumberOfDays(
                             $objBookingDetail->date_from,
                             $objBookingDetail->date_to
                         );
diff --git a/controllers/admin/AdminAddressesController.php b/controllers/admin/AdminAddressesController.php
index 4a6e665b6..9847509b0 100644
--- a/controllers/admin/AdminAddressesController.php
+++ b/controllers/admin/AdminAddressesController.php
@@ -31,6 +31,7 @@ class AdminAddressesControllerCore extends AdminController
 {
     /** @var array countries list */
     protected $countries_array = array();
+    protected $addressType;
 
     public function __construct()
     {
diff --git a/controllers/admin/AdminCarriersController.php b/controllers/admin/AdminCarriersController.php
index 869a6330d..258347377 100644
--- a/controllers/admin/AdminCarriersController.php
+++ b/controllers/admin/AdminCarriersController.php
@@ -691,7 +691,7 @@ elseif ((isset($_GET['status'.$this->table]) || isset($_GET['status'])) && Tools
         }
     }
 
-    public function displayEditLink($token = null, $id, $name = null)
+    public function displayEditLink($token, $id, $name = null)
     {
         if ($this->tabAccess['edit'] == 1) {
             $tpl = $this->createTemplate('helpers/list/list_action_edit.tpl');
@@ -711,7 +711,7 @@ elseif ((isset($_GET['status'.$this->table]) || isset($_GET['status'])) && Tools
         }
     }
 
-    public function displayDeleteLink($token = null, $id, $name = null)
+    public function displayDeleteLink($token, $id, $name = null)
     {
         if ($this->tabAccess['delete'] == 1) {
             $tpl = $this->createTemplate('helpers/list/list_action_delete.tpl');
diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php
index 137758897..7bab91fdd 100644
--- a/controllers/admin/AdminCartsController.php
+++ b/controllers/admin/AdminCartsController.php
@@ -623,6 +623,7 @@ class AdminCartsControllerCore extends AdminController
             #Code is added by webkul to change current cart tpl dinamically
             #################################################################
             $id_cart = Tools::getValue('id_cart');//get cart id from url
+            $objCart = new Cart($id_cart);
             $cart_detail_data = array();
             $cart_detail_data_obj = new HotelCartBookingData();
             $cart_detail_data_obj->updateIdCurrencyByIdCart($id_cart, $currency->id);
@@ -641,6 +642,7 @@ class AdminCartsControllerCore extends AdminController
 
             $this->context->smarty->assign(array(
                 'cart_detail_data' => $cart_detail_data,
+                'cart' => $objCart,
                 'currency' => new Currency((int)$this->context->cart->id_currency),
                 'occupancy_required_for_booking' => $occupancyRequiredForBooking,
                 'ajax' => true
@@ -1252,7 +1254,7 @@ class AdminCartsControllerCore extends AdminController
         return Cart::getTotalCart($id_cart, true, Cart::BOTH_WITHOUT_SHIPPING);
     }
 
-    public function displayDeleteLink($token = null, $id, $name = null)
+    public function displayDeleteLink($token, $id, $name = null)
     {
         // don't display ordered carts
         foreach ($this->_list as $row) {
diff --git a/controllers/admin/AdminCmsContentController.php b/controllers/admin/AdminCmsContentController.php
index 6708fa987..e8e0b142e 100644
--- a/controllers/admin/AdminCmsContentController.php
+++ b/controllers/admin/AdminCmsContentController.php
@@ -38,6 +38,8 @@ class AdminCmsContentControllerCore extends AdminController
     /** @var object Category() instance for navigation*/
     protected static $category = null;
 
+    protected $id_cms_category;
+
     public function __construct()
     {
         $this->bootstrap = true;
diff --git a/controllers/admin/AdminCmsController.php b/controllers/admin/AdminCmsController.php
index b39f8bf66..72bd71098 100644
--- a/controllers/admin/AdminCmsController.php
+++ b/controllers/admin/AdminCmsController.php
@@ -33,6 +33,8 @@ class AdminCmsControllerCore extends AdminController
 
     public $id_cms_category;
 
+    protected $_category;
+
     protected $position_identifier = 'id_cms';
 
     public function __construct()
diff --git a/controllers/admin/AdminCountriesController.php b/controllers/admin/AdminCountriesController.php
index becf523cb..6260236cd 100644
--- a/controllers/admin/AdminCountriesController.php
+++ b/controllers/admin/AdminCountriesController.php
@@ -70,8 +70,8 @@ class AdminCountriesControllerCore extends AdminController
         // );
 
         $zones_array = array();
-        $this->zones = Zone::getZones();
-        foreach ($this->zones as $zone) {
+        $zones = Zone::getZones();
+        foreach ($zones as $zone) {
             $zones_array[$zone['id_zone']] = $zone['name'];
         }
 
diff --git a/controllers/admin/AdminCustomerThreadsController.php b/controllers/admin/AdminCustomerThreadsController.php
index 4d120c055..088ba61d1 100644
--- a/controllers/admin/AdminCustomerThreadsController.php
+++ b/controllers/admin/AdminCustomerThreadsController.php
@@ -1365,7 +1365,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
                     if (Validate::isLoadedObject($ct) && ((isset($matches2[1]) && $ct->token == $matches2[1]) || $new_ct)) {
                         $message = imap_fetchbody($mbox, $overview->msgno, 1);
                         $message = quoted_printable_decode($message);
-                        $message = utf8_encode($message);
+                        $message = mb_convert_encoding($message, 'UTF-8', 'ISO-8859-1');
                         $message = quoted_printable_decode($message);
                         $message = nl2br($message);
                         $message = Tools::substr($message, 0, (int) CustomerMessage::$definition['fields']['message']['size']);
diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php
index cf9237c8b..c68f585c2 100644
--- a/controllers/admin/AdminCustomersController.php
+++ b/controllers/admin/AdminCustomersController.php
@@ -1333,7 +1333,7 @@ class AdminCustomersControllerCore extends AdminController
      * @param string $name
      * @return mixed
      */
-    public function displayDeleteLink($token = null, $id, $name = null)
+    public function displayDeleteLink($token, $id, $name = null)
     {
         $tpl = $this->createTemplate('helpers/list/list_action_delete.tpl');
 
diff --git a/controllers/admin/AdminGendersController.php b/controllers/admin/AdminGendersController.php
index 7331a9c4c..837f85f2e 100644
--- a/controllers/admin/AdminGendersController.php
+++ b/controllers/admin/AdminGendersController.php
@@ -29,6 +29,9 @@
  */
 class AdminGendersControllerCore extends AdminController
 {
+    protected $default_image_height;
+    protected $default_image_width;
+
     public function __construct()
     {
         $this->bootstrap = true;
diff --git a/controllers/admin/AdminGroupsController.php b/controllers/admin/AdminGroupsController.php
index 1a3269997..83510a7b2 100644
--- a/controllers/admin/AdminGroupsController.php
+++ b/controllers/admin/AdminGroupsController.php
@@ -636,7 +636,7 @@ class AdminGroupsControllerCore extends AdminController
         return parent::renderList();
     }
 
-    public function displayEditLink($token = null, $id, $name = null)
+    public function displayEditLink($token, $id, $name = null)
     {
         $tpl = $this->createTemplate('helpers/list/list_action_edit.tpl');
         if (!array_key_exists('Edit', self::$cache_lang)) {
diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php
index f529ba234..8dc006fc8 100644
--- a/controllers/admin/AdminImportController.php
+++ b/controllers/admin/AdminImportController.php
@@ -601,7 +601,7 @@ class AdminImportControllerCore extends AdminController
         $html .= '</tr></thead><tbody>';
 
         AdminImportController::setLocale();
-        for ($current_line = 0; $current_line < 10 && $line = fgetcsv($handle, MAX_LINE_SIZE, $glue); $current_line++) {
+        for ($current_line = 0; $current_line < 10 && $line = fgetcsv($handle, MAX_LINE_SIZE, $glue, escape: ""); $current_line++) {
             /* UTF-8 conversion */
             if (Tools::getValue('convert')) {
                 $line = $this->utf8EncodeArray($line);
@@ -695,7 +695,7 @@ class AdminImportControllerCore extends AdminController
         $tab = '';
         if (!empty($uniqid_path)) {
             $fd = fopen($uniqid_path, 'r');
-            $tab = fgetcsv($fd, MAX_LINE_SIZE, $separator);
+            $tab = fgetcsv($fd, MAX_LINE_SIZE, $separator, escape: "");
             fclose($fd);
             if (file_exists($uniqid_path)) {
                 @unlink($uniqid_path);
@@ -864,7 +864,7 @@ class AdminImportControllerCore extends AdminController
      * @param bool $regenerate
      * @return bool
      */
-    protected static function copyImg($id_entity, $id_image = null, $url, $entity = 'products', $regenerate = true)
+    protected static function copyImg($id_entity, $id_image = null, $url = '', $entity = 'products', $regenerate = true)
     {
         $tmpfile = tempnam(_PS_TMP_IMG_DIR_, 'ps_import');
         $watermark_types = explode(',', Configuration::get('WATERMARK_TYPES'));
@@ -997,7 +997,7 @@ class AdminImportControllerCore extends AdminController
             Configuration::get('PS_LOCATIONS_CATEGORY'),
         );
 
-        for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator); $current_line++) {
+        for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator, escape: ""); $current_line++) {
             if ($convert) {
                 $line = $this->utf8EncodeArray($line);
             }
@@ -1079,7 +1079,7 @@ class AdminImportControllerCore extends AdminController
                 ) {
                     $cat_moved[$category->id] = (int) $category_already_created['id_category'];
                     $category->id = (int)$category_already_created['id_category'];
-                    if (Validate::isDate($category_already_created['date_add'])) {
+                    if ($category_already_created['date_add'] &&  Validate::isDate($category_already_created['date_add'])) {
                         $category->date_add = $category_already_created['date_add'];
                     }
                 }
@@ -1163,7 +1163,7 @@ class AdminImportControllerCore extends AdminController
         $force_ids = Tools::getValue('forceIDs');
         $regenerate = Tools::getValue('regenerate');
         $objHotelImage = new HotelImage();
-        for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator); $current_line++) {
+        for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator, escape: ""); $current_line++) {
             if ($convert) {
                 $line = $this->utf8EncodeArray($line);
             }
@@ -1349,17 +1349,34 @@ class AdminImportControllerCore extends AdminController
                             }
 
                             $country = Country::getNameById($idLangDefault, $info['id_country']);
-                            if ($catCountry = $objHotelBranch->addCategory($country, false, $groupIds)) {
+                             if ($catCountry = $objHotelBranch->addCategory(
+                                array (
+                                    'name' => $country,
+                                    'group_ids' => $groupIds,
+                                    'parent_category' => false
+                                )
+                            )) {
                                 if ($info['id_state']) {
                                     $objState = new State();
                                     $stateName = $objState->getNameById($info['id_state']);
-                                    $catState = $objHotelBranch->addCategory($stateName, $catCountry, $groupIds);
                                 } else {
-                                    $catState = $objHotelBranch->addCategory($info['city'], $catCountry, $groupIds);
+                                    $stateName = $info['city'];
                                 }
 
-                                if ($catState) {
-                                    if ($catCity = $objHotelBranch->addCategory($info['city'], $catState, $groupIds)) {
+                                if ($catState = $objHotelBranch->addCategory(
+                                    array (
+                                        'name' => $stateName,
+                                        'group_ids' => $groupIds,
+                                        'parent_category' => $catCountry
+                                    )
+                                )) {
+                                     if ($catCity = $objHotelBranch->addCategory(
+                                        array (
+                                            'name' => $info['city'],
+                                            'group_ids' => $groupIds,
+                                            'parent_category' => $catState
+                                        )
+                                    )) {
                                         if ($objHotelBranch->id_category) {
                                             $objCategory = new Category($objHotelBranch->id_category);
                                             $objCategory->name = $objHotelBranch->hotel_name;
@@ -1372,7 +1389,14 @@ class AdminImportControllerCore extends AdminController
                                             Category::regenerateEntireNtree();
                                         } else {
                                             if ($catHotel = $objHotelBranch->addCategory(
-                                                $objHotelBranch->hotel_name, $catCity, $groupIds, 1, $objHotelBranch->id, $linkRewriteArray
+                                                array (
+                                                    'name' => $objHotelBranch->hotel_name,
+                                                    'group_ids' => $groupIds,
+                                                    'parent_category' => $catCity,
+                                                    'is_hotel' => 1,
+                                                    'id_hotel' => $objHotelBranch->id,
+                                                    'link_rewrite' => $linkRewriteArray
+                                                )
                                             )) {
                                                 $objHotelBranch = new HotelBranchInformation($objHotelBranch->id);
                                                 $objHotelBranch->id_category = $catHotel;
@@ -1474,7 +1498,7 @@ class AdminImportControllerCore extends AdminController
         Module::setBatchMode(true);
         $objRoomType = new HotelRoomType();
         $objAdvancePayment = new HotelAdvancedPayment();
-        for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator); $current_line++) {
+        for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator, escape: ""); $current_line++) {
             if ($convert) {
                 $line = $this->utf8EncodeArray($line);
             }
@@ -1958,7 +1982,7 @@ class AdminImportControllerCore extends AdminController
         $objHotelRoomType = new HotelRoomType();
         $objHotelRoomInformation = new HotelRoomInformation();
         $statuses = array_column($objHotelRoomInformation->getAllRoomStatus(), 'id');
-        for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator); $current_line++) {
+        for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator, escape: ""); $current_line++) {
             if ($convert) {
                 $line = $this->utf8EncodeArray($line);
             }
@@ -2072,7 +2096,7 @@ class AdminImportControllerCore extends AdminController
         $regenerate = Tools::getValue('regenerate');
         $shop_is_feature_active = Shop::isFeatureActive();
         Module::setBatchMode(true);
-        for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator); $current_line++) {
+        for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator, escape: ""); $current_line++) {
             if ($convert) {
                 $line = $this->utf8EncodeArray($line);
             }
@@ -2412,7 +2436,7 @@ class AdminImportControllerCore extends AdminController
         $ordersRow = array();
         $hotelRoomTypeInfo = array();
         $orderInfo = array();
-        for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator); $current_line++) {
+        for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator, escape: ""); $current_line++) {
             if ($convert) {
                 $line = $this->utf8EncodeArray($line);
             }
@@ -2713,7 +2737,7 @@ class AdminImportControllerCore extends AdminController
             $phoneRequired = true;
         }
 
-        for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator); $current_line++) {
+        for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator, escape: ""); $current_line++) {
             if ($convert) {
                 $line = $this->utf8EncodeArray($line);
             }
@@ -2899,7 +2923,7 @@ class AdminImportControllerCore extends AdminController
         $convert = Tools::getValue('convert');
         $force_ids = Tools::getValue('forceIDs');
 
-        for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator); $current_line++) {
+        for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator, escape: ""); $current_line++) {
             if ($convert) {
                 $line = $this->utf8EncodeArray($line);
             }
@@ -2966,7 +2990,7 @@ class AdminImportControllerCore extends AdminController
         $force_ids = Tools::getValue('forceIDs');
 
         // main loop, for each supply orders to import
-        for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator); ++$current_line) {
+        for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator, escape: ""); ++$current_line) {
             // if convert requested
             if ($convert) {
                 $line = $this->utf8EncodeArray($line);
@@ -3082,7 +3106,7 @@ class AdminImportControllerCore extends AdminController
         $force_ids = Tools::getValue('forceIDs');
 
         // main loop, for each supply orders details to import
-        for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator); ++$current_line) {
+        for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator, escape: ""); ++$current_line) {
             // if convert requested
             if ($convert) {
                 $line = $this->utf8EncodeArray($line);
@@ -3190,7 +3214,7 @@ class AdminImportControllerCore extends AdminController
 
     public function utf8EncodeArray($array)
     {
-        return (is_array($array) ? array_map('utf8_encode', $array) : utf8_encode($array));
+        return (is_array($array) ? array_map('utf8_encode', $array) : mb_convert_encoding($array, 'UTF-8', 'ISO-8859-1'));
     }
 
     protected function getNbrColumn($handle, $glue)
@@ -3198,7 +3222,7 @@ class AdminImportControllerCore extends AdminController
         if (!is_resource($handle)) {
             return false;
         }
-        $tmp = fgetcsv($handle, MAX_LINE_SIZE, $glue);
+        $tmp = fgetcsv($handle, MAX_LINE_SIZE, $glue, escape: "");
         AdminImportController::rewindBomAware($handle);
         return count($tmp);
     }
@@ -3226,7 +3250,7 @@ class AdminImportControllerCore extends AdminController
         AdminImportController::rewindBomAware($handle);
 
         for ($i = 0; $i < (int)Tools::getValue('skip'); ++$i) {
-            $line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator);
+            $line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator, escape: "");
         }
         return $handle;
     }
diff --git a/controllers/admin/AdminInformationController.php b/controllers/admin/AdminInformationController.php
index 0dba7d135..a68700f2a 100644
--- a/controllers/admin/AdminInformationController.php
+++ b/controllers/admin/AdminInformationController.php
@@ -108,7 +108,7 @@ class AdminInformationControllerCore extends AdminController
     public function getTestResult()
     {
         $tests_errors = array(
-            'phpversion' => $this->l('The required PHP version is between 5.6 to 7.4.'),
+            'phpversion' => $this->l('The required PHP version is between 8.1 to 8.4.'),
             'upload' => $this->l('Configure your server to allow file uploads.'),
             'system' => $this->l('Configure your server to allow the creation of directories and files with write permissions.'),
             'gd' => $this->l('Enable the GD library on your server.'),
@@ -130,7 +130,7 @@ class AdminInformationControllerCore extends AdminController
             'register_globals' => $this->l('Set PHP "register_globals" option to "Off".'),
             'gz' => $this->l('Enable GZIP compression on your server.'),
             'files' => $this->l('Some QloApps files are missing from your server.'),
-            'new_phpversion' => sprintf($this->l('You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!'), phpversion()),
+             'new_phpversion' => sprintf($this->l('You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!'), phpversion()),
             'pdo_mysql' => $this->l('PDO MySQL extension is not loaded.'),
             'openssl' => $this->l('PHP OpenSSL extension is not loaded.'),
             'curl' => $this->l('PHP Curl extension is not loaded.'),
diff --git a/controllers/admin/AdminLocalizationController.php b/controllers/admin/AdminLocalizationController.php
index 49ad2c76c..d73f93207 100644
--- a/controllers/admin/AdminLocalizationController.php
+++ b/controllers/admin/AdminLocalizationController.php
@@ -218,12 +218,12 @@ class AdminLocalizationControllerCore extends AdminController
 
     public function sortLocalizationsPack($a, $b)
     {
-        return $a['name'] > $b['name'];
+        return ($a['name'] > $b['name']) ? 1 : 0;
     }
 
     public function renderForm()
     {
-        $localizations_pack = false;
+        $localizations_pack = [];
         $this->tpl_option_vars['options_content'] = $this->renderOptions();
 
         $xml_localization = Tools::simplexml_load_file(_QLO_API_URL_.'/xml/localization.xml');
diff --git a/controllers/admin/AdminManufacturersController.php b/controllers/admin/AdminManufacturersController.php
index 68718fc3d..aee302599 100644
--- a/controllers/admin/AdminManufacturersController.php
+++ b/controllers/admin/AdminManufacturersController.php
@@ -279,7 +279,7 @@ class AdminManufacturersControllerCore extends AdminController
      * @param int $id the identifier to add to the link
      * @return string
      */
-    public function displayEditaddressesLink($token = null, $id)
+    public function displayEditaddressesLink($token, $id)
     {
         if (!array_key_exists('editaddresses', self::$cache_lang)) {
             self::$cache_lang['editaddresses'] = $this->l('Edit');
diff --git a/controllers/admin/AdminMetaController.php b/controllers/admin/AdminMetaController.php
index 49e2cd99c..c7622250d 100644
--- a/controllers/admin/AdminMetaController.php
+++ b/controllers/admin/AdminMetaController.php
@@ -36,6 +36,11 @@ class AdminMetaControllerCore extends AdminController
     /** @var ShopUrl */
     protected $url = false;
     protected $toolbar_scroll = false;
+    protected $ht_file;
+    protected $rb_file;
+    protected $rb_data;
+    protected $sm_file;
+    protected $explicitSelect;
 
     public function __construct()
     {
diff --git a/controllers/admin/AdminModulesCatalogController.php b/controllers/admin/AdminModulesCatalogController.php
index 0fe997e85..222213a5a 100644
--- a/controllers/admin/AdminModulesCatalogController.php
+++ b/controllers/admin/AdminModulesCatalogController.php
@@ -29,6 +29,7 @@ class AdminModulesCatalogControllerCore extends AdminController
     const ELEMENT_TYPE_THEME = 2;
 
     const MODULES_PER_PAGE = 18;
+    protected $themes;
 
     public function __construct()
     {
@@ -73,12 +74,12 @@ class AdminModulesCatalogControllerCore extends AdminController
             $module->element_type = self::ELEMENT_TYPE_MODULE;
             $module->logo = '../../img/questionmark.png';
 
-            if (@filemtime(_PS_ROOT_DIR_.DIRECTORY_SEPARATOR.basename(_PS_MODULE_DIR_).DIRECTORY_SEPARATOR.$module->name
-                .DIRECTORY_SEPARATOR.'logo.gif')) {
+            $logoGifPath = _PS_ROOT_DIR_.DIRECTORY_SEPARATOR.basename(_PS_MODULE_DIR_).DIRECTORY_SEPARATOR.$module->name.DIRECTORY_SEPARATOR.'logo.gif';
+            if (file_exists($logoGifPath) && @filemtime($logoGifPath)) {
                 $module->logo = 'logo.gif';
             }
-            if (@filemtime(_PS_ROOT_DIR_.DIRECTORY_SEPARATOR.basename(_PS_MODULE_DIR_).DIRECTORY_SEPARATOR.$module->name
-                .DIRECTORY_SEPARATOR.'logo.png')) {
+            $logoPngPath = _PS_ROOT_DIR_.DIRECTORY_SEPARATOR.basename(_PS_MODULE_DIR_).DIRECTORY_SEPARATOR.$module->name.DIRECTORY_SEPARATOR.'logo.png';
+            if (file_exists($logoPngPath) && @filemtime($logoPngPath)) {
                 $module->logo = 'logo.png';
             }
 
@@ -254,7 +255,7 @@ class AdminModulesCatalogControllerCore extends AdminController
         if ($criteria != 'popularity') {
             usort($list, function($a, $b) use($criteria){
                 if ($criteria == 'name') {
-                    return strnatcasecmp($a->displayName, $b->displayName);
+                    return (strnatcasecmp($a->displayName, $b->displayName)) ? 1 : 0;
                 } else if ($criteria == 'price_increasing') {
                     $priceA = $priceB = 0;
                     if (isset($a->price)) {
@@ -263,7 +264,7 @@ class AdminModulesCatalogControllerCore extends AdminController
                     if (isset($b->price)) {
                         $priceB = $b->price;
                     }
-                    return $priceA > $priceB;
+                    return ($priceA > $priceB) ? 1 : 0;
                 } else if ($criteria == 'price_decreasing') {
                     $priceA = $priceB = 0;
                     if (isset($a->price)) {
@@ -272,7 +273,7 @@ class AdminModulesCatalogControllerCore extends AdminController
                     if (isset($b->price)) {
                         $priceB = $b->price;
                     }
-                    return $priceA < $priceB;
+                    return ($priceA < $priceB) ? 1 : 0;
                 }
 
             });
@@ -316,4 +317,4 @@ class AdminModulesCatalogControllerCore extends AdminController
             'num_block_per_page' => self::MODULES_PER_PAGE
         ));
     }
-}
\ No newline at end of file
+}
diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php
index bfba269ae..c834f63e1 100644
--- a/controllers/admin/AdminModulesController.php
+++ b/controllers/admin/AdminModulesController.php
@@ -147,10 +147,10 @@ class AdminModulesControllerCore extends AdminController
     public function checkCategoriesNames($a, $b)
     {
         if ($a['name'] === $this->l('Other Modules')) {
-            return true;
+            return 1;
         }
 
-        return (bool)($a['name'] > $b['name']);
+        return ($a['name'] > $b['name']) ? 1 : 0;
     }
 
     public function setMedia()
@@ -1256,15 +1256,11 @@ class AdminModulesControllerCore extends AdminController
             }
 
             // Filter on module category
-            $category_filtered = array();
-            $filter_categories = explode('|', Configuration::get('PS_SHOW_CAT_MODULES_'.(int)$this->id_employee));
-            if (count($filter_categories) > 0) {
-                foreach ($filter_categories as $fc) {
-                    if (!empty($fc)) {
-                        $category_filtered[$fc] = 1;
-                    }
-                }
-            }
+            $category_filtered = [];
+            $filter_categories = [];
+            if (Configuration::get('PS_SHOW_CAT_MODULES_'.(int)$this->id_employee)) {
+                $filter_categories = explode('|', Configuration::get('PS_SHOW_CAT_MODULES_'.(int)$this->id_employee));
+
             if (count($category_filtered) > 0 && !isset($category_filtered[$module->tab])) {
                 return true;
             }
@@ -1404,8 +1400,11 @@ class AdminModulesControllerCore extends AdminController
         // Init
         $smarty = $this->context->smarty;
         $autocomplete_list = 'var moduleList = [';
-        $category_filtered = array();
-        $filter_categories = explode('|', Configuration::get('PS_SHOW_CAT_MODULES_'.(int)$this->id_employee));
+        $category_filtered = [];
+        $filter_categories = [];
+        if (Configuration::get('PS_SHOW_CAT_MODULES_'.(int)$this->id_employee)) {
+            $filter_categories = explode('|', Configuration::get('PS_SHOW_CAT_MODULES_'.(int)$this->id_employee));
+        }
         if (count($filter_categories) > 0) {
             foreach ($filter_categories as $fc) {
                 if (!empty($fc)) {
diff --git a/controllers/admin/AdminNormalProductsController.php b/controllers/admin/AdminNormalProductsController.php
index d204c88ff..811de34be 100644
--- a/controllers/admin/AdminNormalProductsController.php
+++ b/controllers/admin/AdminNormalProductsController.php
@@ -59,6 +59,13 @@ class AdminNormalProductsControllerCore extends AdminController
 
     protected $id_current_category;
 
+    protected $objLocationsCategory;
+
+    protected $servicesCategory;
+
+    protected $product_exists_in_shop;
+
+    protected $product_name;
 
     public function __construct()
     {
@@ -3808,7 +3815,7 @@ class AdminNormalProductsControllerCore extends AdminController
         // prices
         array_push($product_props,
             'price', 'wholesale_price', 'id_tax_rules_group', 'unit_price_ratio', 'on_sale',
-            'unity', 'minimum_quantity', 'additional_shipping_cost',
+            'unity', 'minimal_quantity', 'additional_shipping_cost',
             'available_now', 'available_later', 'available_date'
         );
 
@@ -4577,7 +4584,7 @@ class AdminNormalProductsControllerCore extends AdminController
         }
     }
 
-    public function displayPreviewLink($token = null, $id, $name = null)
+    public function displayPreviewLink($token, $id, $name = null)
     {
         $tpl = $this->createTemplate('helpers/list/list_action_preview.tpl');
         if (!array_key_exists('Bad SQL query', self::$cache_lang)) {
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 41bbb4a50..f8c205a89 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -1842,7 +1842,7 @@ class AdminOrdersControllerCore extends AdminController
                         if ($bookings) {
                             foreach ($bookings as $idHtlBooking) {
                                 $objHtlBooking = new HotelBookingDetail($idHtlBooking);
-                                $numDays = $objHtlBooking->getNumberOfDays(
+                                $numDays = HotelHelper::getNumberOfDays(
                                     $objHtlBooking->date_from,
                                     $objHtlBooking->date_to
                                 );
@@ -2046,6 +2046,8 @@ class AdminOrdersControllerCore extends AdminController
                             } else {
                                 $paymentAmount = (float) $paymentAmount;
                             }
+                        } else {
+                            $paymentAmount = $orderTotal;
                         }
 
                         if ($paymentAmount >= 0) {
@@ -3388,7 +3390,7 @@ class AdminOrdersControllerCore extends AdminController
                 /*Product price when order was created*/
                 $totalRoomsCostTE += $value['total_price_tax_excl'];
                 $total_room_tax += $value['total_price_tax_incl']-$value['total_price_tax_excl'];
-                $num_days = $objBookingDetail->getNumberOfDays($value['date_from'], $value['date_to']);
+                $num_days = HotelHelper::getNumberOfDays($value['date_from'], $value['date_to']);
                 $order_detail_data[$key]['unit_amt_tax_excl'] = $value['total_price_tax_excl']/$num_days;
                 $order_detail_data[$key]['unit_amt_tax_incl'] = $value['total_price_tax_incl']/$num_days;
                 $order_detail_data[$key]['amt_with_qty_tax_excl'] = $value['total_price_tax_excl'];
@@ -3745,7 +3747,7 @@ class AdminOrdersControllerCore extends AdminController
 
             $objHotelBookingDocument = new HotelBookingDocument();
             $objHotelBookingDocument->setFileInfoForUploadedDocument('booking_document');
-            if (!count($objHotelBookingDocument->fileInfo)) {
+            if (!$objHotelBookingDocument->fileInfo || !count($objHotelBookingDocument->fileInfo)) {
                 $this->errors[] = $this->l('Please select a file to upload.');
             } elseif ($objHotelBookingDocument->fileInfo['size'] > Tools::getMaxUploadSize()) {
                 $this->errors[] = $this->l('Uploaded file size is too large.');
@@ -4651,7 +4653,7 @@ class AdminOrdersControllerCore extends AdminController
             $req_rm = $product_informations['product_quantity'];
         }
         $obj_booking_detail = new HotelBookingDetail();
-        $num_days = $obj_booking_detail->getNumberOfDays($date_from, $date_to);
+        $num_days = HotelHelper::getNumberOfDays($date_from, $date_to);
         $product_informations['product_quantity'] = $product_informations['product_quantity'] * (int) $num_days;
 
         $obj_room_type = new HotelRoomType();
@@ -5545,7 +5547,7 @@ class AdminOrdersControllerCore extends AdminController
     /**
      * This function is called when order is changed (Add/Edit/Delete room on order)
      */
-    public function sendChangedNotification(Order $order = null)
+    public function sendChangedNotification(?Order $order = null)
     {
         if (is_null($order)) {
             $order = new Order(Tools::getValue('id_order'));
@@ -5638,8 +5640,8 @@ class AdminOrdersControllerCore extends AdminController
         $id_room = trim(Tools::getValue('id_room'));
         $id_product = trim(Tools::getValue('id_product'));
         $room_unit_price = trim(Tools::getValue('room_unit_price'));
-        $product_quantity = (int) $obj_booking_detail->getNumberOfDays($new_date_from, $new_date_to);
-        $old_product_quantity =  (int) $obj_booking_detail->getNumberOfDays($old_date_from, $old_date_to);
+        $product_quantity = (int) HotelHelper::getNumberOfDays($new_date_from, $new_date_to);
+        $old_product_quantity =  (int) HotelHelper::getNumberOfDays($old_date_from, $old_date_to);
         $qty_diff = $product_quantity - $old_product_quantity;
         $occupancy = array_shift(Tools::getValue('occupancy'));
         $adults = $occupancy['adults'];
@@ -5888,7 +5890,7 @@ class AdminOrdersControllerCore extends AdminController
                             if ($rDemand['price_calc_method'] == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) {
                                 $objBookingDemand = new HotelBookingDemands($rDemand['id_booking_demand']);
 
-                                $numDays = $obj_booking_detail->getNumberOfDays($new_date_from, $new_date_to);
+                                $numDays = HotelHelper::getNumberOfDays($new_date_from, $new_date_to);
                                 $demandPriceTE = Tools::processPriceRounding(
                                     ($objBookingDemand->unit_price_tax_excl * $numDays),
                                     1,
@@ -6170,7 +6172,7 @@ class AdminOrdersControllerCore extends AdminController
                 'error' => Tools::displayError('Booking Detail not found.'),
             )));
         }
-        $product_quantity = (int) $objBookingDetail->getNumberOfDays($objBookingDetail->date_from, $objBookingDetail->date_to);
+        $product_quantity = (int) HotelHelper::getNumberOfDays($objBookingDetail->date_from, $objBookingDetail->date_to);
         if (!Validate::isUnsignedInt($product_quantity)) {
             die(json_encode(array(
                 'result' => false,
@@ -6554,7 +6556,7 @@ class AdminOrdersControllerCore extends AdminController
         $this->ajaxDie(json_encode($response));
     }
 
-    protected function doEditProductValidation(OrderDetail $order_detail, Order $order, OrderInvoice $order_invoice = null)
+    protected function doEditProductValidation(OrderDetail $order_detail, Order $order, ?OrderInvoice $order_invoice = null)
     {
         $this->doEditValidation($order_detail, $order, $order_invoice);
 
@@ -6588,7 +6590,7 @@ class AdminOrdersControllerCore extends AdminController
      * @param OrderInvoice $order_invoice
      * @return bool
      */
-    protected function doEditRoomValidation(OrderDetail $order_detail, Order $order, OrderInvoice $order_invoice = null)
+    protected function doEditRoomValidation(OrderDetail $order_detail, Order $order, ?OrderInvoice $order_invoice = null)
     {
         $this->doEditValidation($order_detail, $order, $order_invoice);
 
@@ -6605,8 +6607,8 @@ class AdminOrdersControllerCore extends AdminController
         $id_product = trim(Tools::getValue('id_product'));
         $room_unit_price = trim(Tools::getValue('room_unit_price'));
         $obj_booking_detail = new HotelBookingDetail();
-        $product_quantity = (int) $obj_booking_detail->getNumberOfDays($new_date_from, $new_date_to);
-        $old_product_quantity =  (int) $obj_booking_detail->getNumberOfDays($old_date_from, $old_date_to);
+        $product_quantity = (int) HotelHelper::getNumberOfDays($new_date_from, $new_date_to);
+        $old_product_quantity =  (int) HotelHelper::getNumberOfDays($old_date_from, $old_date_to);
         $qty_diff = $product_quantity - $old_product_quantity;
         $occupancy = array_shift(Tools::getValue('occupancy'));
         $adults = $occupancy['adults'];
@@ -6783,7 +6785,7 @@ class AdminOrdersControllerCore extends AdminController
         }
     }
 
-    protected function doEditValidation(OrderDetail $order_detail, Order $order, OrderInvoice $order_invoice = null)
+    protected function doEditValidation(OrderDetail $order_detail, Order $order, ?OrderInvoice $order_invoice = null)
     {
         if (!Validate::isLoadedObject($order_detail)) {
             die(json_encode(array(
@@ -7414,7 +7416,7 @@ class AdminOrdersControllerCore extends AdminController
                     $this->context->currency = new Currency($objOrder->id_currency);
 
                     $objRoomTypeServiceProduct = new RoomTypeServiceProduct();
-                    $qty = Tools::getValue('service_qty');
+                    $qty = Tools::getValue('service_qty', []);
                     $price = Tools::getValue('service_price');
                     foreach ($selectedServices as $key => $service) {
                         $objProduct = new Product($service, false, $this->context->language->id);
@@ -7615,7 +7617,7 @@ class AdminOrdersControllerCore extends AdminController
 
                             // Save changes of order
                             $order->update();
-                            if (Validate::isLoadedObject($specific_price)) {
+                            if (isset($specific_price) && Validate::isLoadedObject($specific_price)) {
                                 $specific_price->delete();
                                 unset($specific_price);
                             }
@@ -8144,7 +8146,7 @@ class AdminOrdersControllerCore extends AdminController
                                 );
                                 $numDays = 1;
                                 if ($objGlobalDemand->price_calc_method == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) {
-                                    $numDays = $objHtlBkDtl->getNumberOfDays(
+                                    $numDays = HotelHelper::getNumberOfDays(
                                         $objBookingDetail->date_from,
                                         $objBookingDetail->date_to
                                     );
@@ -8238,7 +8240,7 @@ class AdminOrdersControllerCore extends AdminController
                     $objBookingDetail = new HotelBookingDetail($objBookingDemand->id_htl_booking);
                     $order = new Order($objBookingDetail->id_order);
                     if ($objBookingDemand->price_calc_method == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) {
-                        $numDays = $objBookingDetail->getNumberOfDays(
+                        $numDays = HotelHelper::getNumberOfDays(
                             $objBookingDetail->date_from,
                             $objBookingDetail->date_to
                         );
diff --git a/controllers/admin/AdminPerformanceController.php b/controllers/admin/AdminPerformanceController.php
index ac7f60298..2085a3ad6 100644
--- a/controllers/admin/AdminPerformanceController.php
+++ b/controllers/admin/AdminPerformanceController.php
@@ -625,7 +625,9 @@ class AdminPerformanceControllerCore extends AdminController
             return;
         }
 
-        Hook::exec('action'.get_class($this).ucfirst($this->action).'Before', array('controller' => $this));
+        if (!empty($this->action)) {
+            Hook::exec('action'.get_class($this).ucfirst($this->action).'Before', array('controller' => $this));
+        }
         if (Tools::isSubmit('submitAddServer')) {
             if ($this->tabAccess['add'] === '1') {
                 if (!Tools::getValue('memcachedIp')) {
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index c65497b23..f1f73fd72 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -58,6 +58,14 @@ class AdminProductsControllerCore extends AdminController
 
     protected $id_current_category;
 
+    protected $objLocationsCategory;
+
+    protected $locationsAndHotels;
+
+    protected $product_name;
+
+    protected $product_exists_in_shop;
+
     public function __construct()
     {
         $this->bootstrap = true;
@@ -2646,7 +2654,7 @@ class AdminProductsControllerCore extends AdminController
         return parent::renderList();
     }
 
-    public function displayDuplicateLink($token = null, $id, $name = null)
+    public function displayDuplicateLink($token, $id, $name = null)
     {
         return '<a href="#" title="'.$this->l('Duplicate').'"
         onclick="initDuplicateRoomType('.(int)$id.');return false;"><i class="icon-copy"></i>'.$this->l('Duplicate').'</a>';
@@ -4427,7 +4435,7 @@ class AdminProductsControllerCore extends AdminController
         // prices
         array_push($product_props,
             'price', 'wholesale_price', 'id_tax_rules_group', 'unit_price_ratio', 'on_sale',
-            'unity', 'minimum_quantity', 'additional_shipping_cost',
+            'unity', 'minimal_quantity', 'additional_shipping_cost',
             'available_now', 'available_later', 'available_date'
         );
 
@@ -5574,7 +5582,7 @@ class AdminProductsControllerCore extends AdminController
         }
     }
 
-    public function displayPreviewLink($token = null, $id, $name = null)
+    public function displayPreviewLink($token, $id, $name = null)
     {
         $tpl = $this->createTemplate('helpers/list/list_action_preview.tpl');
         if (!array_key_exists('Bad SQL query', self::$cache_lang)) {
diff --git a/controllers/admin/AdminRequestSqlController.php b/controllers/admin/AdminRequestSqlController.php
index e8c431aa1..0735acbe4 100644
--- a/controllers/admin/AdminRequestSqlController.php
+++ b/controllers/admin/AdminRequestSqlController.php
@@ -37,6 +37,8 @@ class AdminRequestSqlControllerCore extends AdminController
         array('value' => 2, 'name' => 'iso-8859-1')
     );
 
+    protected $export;
+
     public function __construct()
     {
         $this->bootstrap = true;
diff --git a/controllers/admin/AdminSearchController.php b/controllers/admin/AdminSearchController.php
index fd856dbfe..ac47c445f 100644
--- a/controllers/admin/AdminSearchController.php
+++ b/controllers/admin/AdminSearchController.php
@@ -297,7 +297,10 @@ class AdminSearchControllerCore extends AdminController
             $this->_list['modules'] = array();
             $all_modules = Module::getModulesOnDisk(true, true, Context::getContext()->employee->id);
             foreach ($all_modules as $module) {
-                if (stripos($module->name, $this->query) !== false || stripos($module->displayName, $this->query) !== false || stripos($module->description, $this->query) !== false) {
+                if ((isset($module->name) && stripos($module->name, $this->query) !== false)
+                    || (isset($module->displayName) && stripos($module->displayName, $this->query) !== false)
+                    || (isset($module->description) && stripos($module->description, $this->query) !== false)
+                ) {
                     $module->linkto = 'index.php?tab=AdminModules&tab_module='.$module->tab.'&module_name='.$module->name.'&anchor='.ucfirst($module->name).'&token='.Tools::getAdminTokenLite('AdminModules');
                     $this->_list['modules'][] = $module;
                 }
diff --git a/controllers/admin/AdminShopController.php b/controllers/admin/AdminShopController.php
index e02368fa6..3edda95e5 100644
--- a/controllers/admin/AdminShopController.php
+++ b/controllers/admin/AdminShopController.php
@@ -704,7 +704,7 @@ class AdminShopControllerCore extends AdminController
         return $object;
     }
 
-    public function displayEditLink($token = null, $id, $name = null)
+    public function displayEditLink($token, $id, $name = null)
     {
         if ($this->tabAccess['edit'] == 1) {
             $tpl = $this->createTemplate('helpers/list/list_action_edit.tpl');
diff --git a/controllers/admin/AdminShopUrlController.php b/controllers/admin/AdminShopUrlController.php
index f0e9f20ae..642d768e8 100644
--- a/controllers/admin/AdminShopUrlController.php
+++ b/controllers/admin/AdminShopUrlController.php
@@ -35,7 +35,6 @@ class AdminShopUrlControllerCore extends AdminController
         $this->table = 'shop_url';
         $this->className = 'ShopUrl';
         $this->lang = false;
-        $this->requiredDatabase = true;
         $this->multishop_context = Shop::CONTEXT_ALL;
         $this->bulk_actions = array();
 
@@ -527,7 +526,7 @@ class AdminShopUrlControllerCore extends AdminController
      * @param string $name
      * @return mixed
      */
-    public function displayDeleteLink($token = null, $id, $name = null)
+    public function displayDeleteLink($token, $id, $name = null)
     {
         $tpl = $this->createTemplate('helpers/list/list_action_delete.tpl');
 
diff --git a/controllers/admin/AdminSlipController.php b/controllers/admin/AdminSlipController.php
index 4f76e8f50..7e59f3675 100644
--- a/controllers/admin/AdminSlipController.php
+++ b/controllers/admin/AdminSlipController.php
@@ -89,7 +89,6 @@ class AdminSlipControllerCore extends AdminController
         );
 
         $this->_select = 'a.id_order_slip AS id_pdf';
-        $this->optionTitle = $this->l('Slip');
 
         $this->fields_options = array(
             'general' => array(
@@ -279,7 +278,7 @@ class AdminSlipControllerCore extends AdminController
         return '--';
     }
 
-    public function displayStatusChangeLink($token = null, $id)
+    public function displayStatusChangeLink($token, $id)
     {
         $objOrderSlip = new OrderSlip($id);
         if ($objOrderSlip->redeem_status != OrderSlip::REDEEM_STATUS_REDEEMED) {
diff --git a/controllers/admin/AdminSpecificPriceRuleController.php b/controllers/admin/AdminSpecificPriceRuleController.php
index c3b87a9de..6bccb5823 100644
--- a/controllers/admin/AdminSpecificPriceRuleController.php
+++ b/controllers/admin/AdminSpecificPriceRuleController.php
@@ -40,9 +40,9 @@ class AdminSpecificPriceRuleControllerCore extends AdminController
         $this->multishop_context = Shop::CONTEXT_ALL;
 
         /* if $_GET['id_shop'] is transmitted, virtual url can be loaded in config.php, so we wether transmit shop_id in herfs */
-        if ($this->id_shop = (int)Tools::getValue('shop_id')) {
-            $_GET['id_shop'] = $this->id_shop;
-            $_POST['id_shop'] = $this->id_shop;
+        if ($id_shop = (int)Tools::getValue('shop_id')) {
+            $_GET['id_shop'] = $id_shop;
+            $_POST['id_shop'] = $id_shop;
         }
 
         $this->list_reduction_type = array(
diff --git a/controllers/admin/AdminStatesController.php b/controllers/admin/AdminStatesController.php
index 6c549289f..75fb05415 100644
--- a/controllers/admin/AdminStatesController.php
+++ b/controllers/admin/AdminStatesController.php
@@ -35,7 +35,6 @@ class AdminStatesControllerCore extends AdminController
         $this->table = 'state';
         $this->className = 'State';
         $this->lang = false;
-        $this->requiredDatabase = true;
 
         $this->addRowAction('edit');
         $this->addRowAction('delete');
@@ -58,12 +57,12 @@ class AdminStatesControllerCore extends AdminController
         $this->_use_found_rows = false;
 
         $countries_array = $zones_array = array();
-        $this->zones = Zone::getZones();
-        $this->countries = Country::getCountries($this->context->language->id, false, true, false);
-        foreach ($this->zones as $zone) {
+        $zones = Zone::getZones();
+        $countries = Country::getCountries($this->context->language->id, false, true, false);
+        foreach ($zones as $zone) {
             $zones_array[$zone['id_zone']] = $zone['name'];
         }
-        foreach ($this->countries as $country) {
+        foreach ($countries as $country) {
             $countries_array[$country['id_country']] = $country['name'];
         }
 
diff --git a/controllers/admin/AdminStatsController.php b/controllers/admin/AdminStatsController.php
index 9e21fbe5d..09600385d 100644
--- a/controllers/admin/AdminStatsController.php
+++ b/controllers/admin/AdminStatsController.php
@@ -26,7 +26,7 @@
 
 class AdminStatsControllerCore extends AdminStatsTabController
 {
-    public static function getVisits($unique = false, $date_from, $date_to, $granularity = false)
+    public static function getVisits($unique, $date_from, $date_to, $granularity = false)
     {
         $visits = ($granularity == false) ? 0 : array();
         $objGoogleAnalytics = Module::isEnabled('qlogoogleanalytics') ? Module::getInstanceByName('qlogoogleanalytics') : false;
diff --git a/controllers/admin/AdminStatsTabController.php b/controllers/admin/AdminStatsTabController.php
index c7959af9e..25467134f 100644
--- a/controllers/admin/AdminStatsTabController.php
+++ b/controllers/admin/AdminStatsTabController.php
@@ -175,7 +175,7 @@ abstract class AdminStatsTabControllerCore extends AdminPreferencesControllerCor
 
     public function checkModulesNames($a, $b)
     {
-        return (bool)($a['displayName'] > $b['displayName']);
+        return ($a['displayName'] > $b['displayName']) ? 1 : 0;
     }
 
     protected function getModules()
diff --git a/controllers/admin/AdminStockManagementController.php b/controllers/admin/AdminStockManagementController.php
index ca604ef68..6d3bf8628 100644
--- a/controllers/admin/AdminStockManagementController.php
+++ b/controllers/admin/AdminStockManagementController.php
@@ -190,7 +190,7 @@ class AdminStockManagementControllerCore extends AdminController
             } else {
                 self::$currentIndex = self::$currentIndex.'&id_product='.(int)$product_id.'&detailsproduct';
             }
-            
+
             $this->processFilter();
             return parent::renderList();
         }
@@ -1299,7 +1299,7 @@ class AdminStockManagementControllerCore extends AdminController
      * @param int $id the identifier to add to the link
      * @return string
      */
-    public function displayAddstockLink($token = null, $id)
+    public function displayAddstockLink($token, $id)
     {
         if (!array_key_exists('AddStock', self::$cache_lang)) {
             self::$cache_lang['AddStock'] = $this->l('Add stock');
@@ -1321,7 +1321,7 @@ class AdminStockManagementControllerCore extends AdminController
      * @param int $id the identifier to add to the link
      * @return string
      */
-    public function displayRemovestockLink($token = null, $id)
+    public function displayRemovestockLink($token, $id)
     {
         if (!array_key_exists('RemoveStock', self::$cache_lang)) {
             self::$cache_lang['RemoveStock'] = $this->l('Remove stock');
@@ -1343,7 +1343,7 @@ class AdminStockManagementControllerCore extends AdminController
      * @param int $id the identifier to add to the link
      * @return string
      */
-    public function displayTransferstockLink($token = null, $id)
+    public function displayTransferstockLink($token, $id)
     {
         if (!array_key_exists('TransferStock', self::$cache_lang)) {
             self::$cache_lang['TransferStock'] = $this->l('Transfer stock');
@@ -1365,7 +1365,7 @@ class AdminStockManagementControllerCore extends AdminController
      * @param int $id the identifier to add to the link
      * @return string
      */
-    public function displayPrepareRemovestockLink($token = null, $id)
+    public function displayPrepareRemovestockLink($token, $id)
     {
         if (!array_key_exists('RemoveStock', self::$cache_lang)) {
             self::$cache_lang['RemoveStock'] = $this->l('Remove stock');
@@ -1391,7 +1391,7 @@ class AdminStockManagementControllerCore extends AdminController
      * @param int $id the identifier to add to the link
      * @return string
      */
-    public function displayPrepareTransferstockLink($token = null, $id)
+    public function displayPrepareTransferstockLink($token, $id)
     {
         if (!array_key_exists('TransferStock', self::$cache_lang)) {
             self::$cache_lang['TransferStock'] = $this->l('Transfer stock');
diff --git a/controllers/admin/AdminSupplyOrdersController.php b/controllers/admin/AdminSupplyOrdersController.php
index 485bf6d90..1e09d882f 100644
--- a/controllers/admin/AdminSupplyOrdersController.php
+++ b/controllers/admin/AdminSupplyOrdersController.php
@@ -1547,7 +1547,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
      * @param int $id the identifier to add to the link
      * @return string
      */
-    public function displayUpdateReceiptLink($token = null, $id)
+    public function displayUpdateReceiptLink($token, $id)
     {
         if (!array_key_exists('Receipt', self::$cache_lang)) {
             self::$cache_lang['Receipt'] = $this->l('Update ongoing receipt of products');
@@ -1569,7 +1569,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
      * @param int $id the identifier to add to the link
      * @return string
      */
-    public function displayChangestateLink($token = null, $id)
+    public function displayChangestateLink($token, $id)
     {
         if (!array_key_exists('State', self::$cache_lang)) {
             self::$cache_lang['State'] = $this->l('Change status');
@@ -1591,7 +1591,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
      * @param int $id the identifier to add to the link
      * @return string
      */
-    public function displayCreateSupplyOrderLink($token = null, $id)
+    public function displayCreateSupplyOrderLink($token, $id)
     {
         if (!array_key_exists('CreateSupplyOrder', self::$cache_lang)) {
             self::$cache_lang['CreateSupplyOrder'] = $this->l('Use this template to create a supply order');
diff --git a/controllers/admin/AdminTaxRulesGroupController.php b/controllers/admin/AdminTaxRulesGroupController.php
index ba62da512..62b801fd8 100644
--- a/controllers/admin/AdminTaxRulesGroupController.php
+++ b/controllers/admin/AdminTaxRulesGroupController.php
@@ -214,10 +214,8 @@ class AdminTaxRulesGroupControllerCore extends AdminController
             return;
         }
         if (!isset($obj->id)) {
-            $this->no_back = false;
             $content = parent::renderForm();
         } else {
-            $this->no_back = true;
             $this->page_header_toolbar_btn['new'] = array(
                 'href' => '#',
                 'desc' => $this->l('Add a new tax rule')
diff --git a/controllers/admin/AdminTaxesController.php b/controllers/admin/AdminTaxesController.php
index 65bf9275a..ca2787e05 100644
--- a/controllers/admin/AdminTaxesController.php
+++ b/controllers/admin/AdminTaxesController.php
@@ -138,7 +138,7 @@ class AdminTaxesControllerCore extends AdminController
      * @throws Exception
      * @throws SmartyException
      */
-    public function displayDeleteLink($token = null, $id)
+    public function displayDeleteLink($token, $id)
     {
         if (!array_key_exists('Delete', self::$cache_lang)) {
             self::$cache_lang['Delete'] = $this->l('Delete');
diff --git a/controllers/admin/AdminThemesController.php b/controllers/admin/AdminThemesController.php
index 09470ad22..e555d3ef8 100644
--- a/controllers/admin/AdminThemesController.php
+++ b/controllers/admin/AdminThemesController.php
@@ -110,6 +110,7 @@ class AdminThemesControllerCore extends AdminController
     public $table = 'theme';
     protected $toolbar_scroll = false;
     private $img_error;
+    protected $can_display_themes;
 
     public function init()
     {
@@ -579,7 +580,7 @@ class AdminThemesControllerCore extends AdminController
 
             if (0 !== $id_based = (int)Tools::getValue('based_on')) {
                 $base_theme = new Theme($id_based);
-                $this->copyTheme($base_theme->directory, $new_dir);
+                AdminThemesController::copyTheme($base_theme->directory, $new_dir);
                 $base_theme = new Theme((int)Tools::getValue('based_on'));
             }
 
diff --git a/controllers/admin/AdminTrackingController.php b/controllers/admin/AdminTrackingController.php
index a5985eb30..3144cbdec 100644
--- a/controllers/admin/AdminTrackingController.php
+++ b/controllers/admin/AdminTrackingController.php
@@ -283,7 +283,7 @@ class AdminTrackingControllerCore extends AdminController
         return $this->_helper_list->displayEnableLink($this->_list_token, $id, $value, $active, $id_category, $id_product);
     }
 
-    public function displayDeleteLink($token = null, $id, $name = null)
+    public function displayDeleteLink($token, $id, $name = null)
     {
         $this->_helper_list->currentIndex = $this->_list_index;
         $this->_helper_list->identifier = $this->identifier;
@@ -292,7 +292,7 @@ class AdminTrackingControllerCore extends AdminController
         return $this->_helper_list->displayDeleteLink($this->_list_token, $id, $name);
     }
 
-    public function displayEditLink($token = null, $id, $name = null)
+    public function displayEditLink($token, $id, $name = null)
     {
         $this->_helper_list->currentIndex = $this->_list_index;
         $this->_helper_list->identifier = $this->identifier;
diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php
index 6ccc5713c..36b5eca29 100644
--- a/controllers/admin/AdminTranslationsController.php
+++ b/controllers/admin/AdminTranslationsController.php
@@ -2805,7 +2805,7 @@ class AdminTranslationsControllerCore extends AdminController
      *
      * @return array
      */
-    protected function getAllModuleFiles($modules, $root_dir = null, $lang, $is_default = false)
+    protected function getAllModuleFiles(array $modules, ?string $root_dir, string $lang, bool $is_default = false)
     {
         $array_files = array();
         $initial_root_dir = $root_dir;
diff --git a/controllers/admin/AdminWebserviceController.php b/controllers/admin/AdminWebserviceController.php
index f44c412cb..08f86468d 100644
--- a/controllers/admin/AdminWebserviceController.php
+++ b/controllers/admin/AdminWebserviceController.php
@@ -32,6 +32,9 @@ class AdminWebserviceControllerCore extends AdminController
     /** this will be filled later */
     public $fields_form = array('webservice form');
     protected $toolbar_scroll = false;
+    protected $delete;
+    protected $id_lang_default;
+    protected $edit;
 
     public function __construct()
     {
diff --git a/controllers/front/AttachmentController.php b/controllers/front/AttachmentController.php
index e14cdb07c..f6329d4da 100644
--- a/controllers/front/AttachmentController.php
+++ b/controllers/front/AttachmentController.php
@@ -42,7 +42,7 @@ class AttachmentControllerCore extends FrontController
         header('Content-Transfer-Encoding: binary');
         header('Content-Type: '.$a->mime);
         header('Content-Length: '.filesize(_PS_DOWNLOAD_DIR_.$a->file));
-        header('Content-Disposition: attachment; filename="'.utf8_decode($a->file_name).'"');
+        header('Content-Disposition: attachment; filename="'.mb_convert_encoding($a->file_name, 'ISO-8859-1').'"');
         @set_time_limit(0);
         readfile(_PS_DOWNLOAD_DIR_.$a->file);
         exit;
diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php
index 7f2dd8e4e..13ba9de8d 100644
--- a/controllers/front/AuthController.php
+++ b/controllers/front/AuthController.php
@@ -35,6 +35,9 @@ class AuthControllerCore extends FrontController
      */
     protected $create_account;
     protected $id_country;
+    public $informations;
+    public $confirmations;
+    protected $ajaxExtraData;
 
     /**
      * Initialize auth controller
diff --git a/controllers/front/CartController.php b/controllers/front/CartController.php
index ba9e1a7ea..c91e46111 100644
--- a/controllers/front/CartController.php
+++ b/controllers/front/CartController.php
@@ -401,7 +401,7 @@ class CartControllerCore extends FrontController
 
                         if (!$this->errors) {
                             $objBookingDetail = new HotelBookingDetail();
-                            $num_days = $objBookingDetail->getNumberOfDays($date_from, $date_to);
+                            $num_days = HotelHelper::getNumberOfDays($date_from, $date_to);
                             $req_rm = $this->qty;
                             $this->qty = $this->qty * (int) $num_days;
                             $objBookingDetail = new HotelBookingDetail();
@@ -607,7 +607,7 @@ class CartControllerCore extends FrontController
                     $objHotelCartBookingData = new HotelCartBookingData();
                     $roomDemand = json_decode(Tools::getValue('roomDemands'), true);
                     $roomDemand = json_encode($roomDemand);
-                    $this->availQty = $total_available_rooms;
+                    $availQty = $total_available_rooms;
                     $update_quantity = $objHotelCartBookingData->updateCartBooking(
                         $this->id_product,
                         $occupancy,
@@ -622,7 +622,7 @@ class CartControllerCore extends FrontController
                         $id_guest
                     );
                     if ($operator == 'up') {
-                        $this->availQty = $total_available_rooms - $req_rm;
+                        $availQty = $total_available_rooms - $req_rm;
                         $this->context->cookie->currentAddedProduct = json_encode(array(
                             'date_from' => $date_from,
                             'date_to' => $date_to,
@@ -632,9 +632,9 @@ class CartControllerCore extends FrontController
                             'req_rm' => $req_rm
                         ));
                     } else {
-                        $this->availQty = $total_available_rooms + $req_rm;
+                        $availQty = $total_available_rooms + $req_rm;
                     }
-                    $this->context->cookie->avail_rooms = $this->availQty;
+                    $this->context->cookie->avail_rooms = $availQty;
                 } elseif ($product->selling_preference_type == Product::SELLING_PREFERENCE_HOTEL_STANDALONE
                     || $product->selling_preference_type == Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE
                 ) {
diff --git a/controllers/front/CategoryController.php b/controllers/front/CategoryController.php
index 1a7caa27f..5513488fa 100644
--- a/controllers/front/CategoryController.php
+++ b/controllers/front/CategoryController.php
@@ -189,7 +189,7 @@ class CategoryControllerCore extends FrontController
 
             $booking_data = $objBookingDetail->dataForFrontSearch($bookingParams);
 
-            $num_days = $objBookingDetail->getNumberOfDays($date_from, $date_to);
+            $num_days = HotelHelper::getNumberOfDays($date_from, $date_to);
 
             $warning_num = Configuration::get('WK_ROOM_LEFT_WARNING_NUMBER');
 
diff --git a/controllers/front/GuestTrackingController.php b/controllers/front/GuestTrackingController.php
index 46f858cbb..9a9df2490 100644
--- a/controllers/front/GuestTrackingController.php
+++ b/controllers/front/GuestTrackingController.php
@@ -332,7 +332,7 @@ class GuestTrackingControllerCore extends FrontController
                                             }
                                         }
                                     } else {
-                                        $num_days = $objBookingDetail->getNumberOfDays($data_v['date_from'], $data_v['date_to']);
+                                        $num_days = HotelHelper::getNumberOfDays($data_v['date_from'], $data_v['date_to']);
                                         $cartHotelData[$type_key]['date_diff'][$date_join]['num_rm'] = 1;
                                         $cartHotelData[$type_key]['date_diff'][$date_join]['data_form'] = $data_v['date_from'];
                                         $cartHotelData[$type_key]['date_diff'][$date_join]['data_to'] = $data_v['date_to'];
diff --git a/controllers/front/OrderConfirmationController.php b/controllers/front/OrderConfirmationController.php
index 0517ad6bb..f83b1fd7e 100644
--- a/controllers/front/OrderConfirmationController.php
+++ b/controllers/front/OrderConfirmationController.php
@@ -210,7 +210,7 @@ class OrderConfirmationControllerCore extends FrontController
                                         //refund_stage
                                         $cart_htl_data[$type_key]['date_diff'][$date_join]['stage_name'] = $stage_name;
                                     } else {
-                                        $num_days = $obj_htl_bk_dtl->getNumberOfDays($data_v['date_from'], $data_v['date_to']);
+                                        $num_days = HotelHelper::getNumberOfDays($data_v['date_from'], $data_v['date_to']);
 
                                         $cart_htl_data[$type_key]['date_diff'][$date_join]['num_rm'] = 1;
                                         $cart_htl_data[$type_key]['date_diff'][$date_join]['data_form'] = $data_v['date_from'];
diff --git a/controllers/front/OrderDetailController.php b/controllers/front/OrderDetailController.php
index d8548f305..e37bf0520 100644
--- a/controllers/front/OrderDetailController.php
+++ b/controllers/front/OrderDetailController.php
@@ -178,7 +178,7 @@ class OrderDetailControllerCore extends FrontController
                                         }
                                     }
                                 } else {
-                                    $num_days = $objBookingDetail->getNumberOfDays($data_v['date_from'], $data_v['date_to']);
+                                    $num_days = HotelHelper::getNumberOfDays($data_v['date_from'], $data_v['date_to']);
                                     $cartHotelData[$type_key]['date_diff'][$date_join]['num_rm'] = 1;
                                     $cartHotelData[$type_key]['date_diff'][$date_join]['data_form'] = $data_v['date_from'];
                                     $cartHotelData[$type_key]['date_diff'][$date_join]['data_to'] = $data_v['date_to'];
@@ -648,7 +648,7 @@ class OrderDetailControllerCore extends FrontController
                     if ($idsHtlBooking) {
                         foreach ($idsHtlBooking as $idHtlBooking) {
                             $objHtlBooking = new HotelBookingDetail($idHtlBooking);
-                            $numDays = $objHtlBooking->getNumberOfDays(
+                            $numDays = HotelHelper::getNumberOfDays(
                                 $objHtlBooking->date_from,
                                 $objHtlBooking->date_to
                             );
diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php
index bf60fd6c2..b6cf53e3c 100644
--- a/controllers/front/OrderOpcController.php
+++ b/controllers/front/OrderOpcController.php
@@ -29,6 +29,11 @@ class OrderOpcControllerCore extends ParentOrderController
     public $php_self = 'order-opc';
     public $isLogged;
 
+    /**
+     * @var CheckoutProcess
+     */
+    protected $checkoutProcess;
+
     protected $ajax_refresh = false;
 
     /**
diff --git a/controllers/front/ParentOrderController.php b/controllers/front/ParentOrderController.php
index 4933453a2..a519c3305 100644
--- a/controllers/front/ParentOrderController.php
+++ b/controllers/front/ParentOrderController.php
@@ -30,6 +30,7 @@ class ParentOrderControllerCore extends FrontController
     public $php_self = 'order';
 
     public $nbProducts;
+    public $link_conditions;
 
     /**
      * Initialize parent order controller
diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php
index a2e143727..808f86496 100644
--- a/controllers/front/ProductController.php
+++ b/controllers/front/ProductController.php
@@ -634,7 +634,7 @@ class ProductControllerCore extends FrontController
             }
         }
 
-        $numDays = $objBookingDetail->getNumberOfDays($dateFrom, $dateTo);
+        $numDays = HotelHelper::getNumberOfDays($dateFrom, $dateTo);
         $bookingParams = array(
             'date_from' => $dateFrom,
             'date_to' => $dateTo,
@@ -818,7 +818,6 @@ class ProductControllerCore extends FrontController
             $smartyVars['occupancies'] = $occupancy;
             $smartyVars['occupancy_adults'] = array_sum(array_column($occupancy, 'adults'));
             $smartyVars['occupancy_children'] = array_sum(array_column($occupancy, 'children'));
-            $smartyVars['occupancy_child_ages'] = array_sum(array_column($occupancy, 'child_ages'));
         }
 
         $smartyVars['hotel_location'] = $hotelLocation;
diff --git a/install/classes/controllerHttp.php b/install/classes/controllerHttp.php
index 7641dd1e3..ffc52c29f 100644
--- a/install/classes/controllerHttp.php
+++ b/install/classes/controllerHttp.php
@@ -266,7 +266,7 @@ abstract class InstallControllerHttp
      */
     public function findPreviousStep()
     {
-        return (isset(self::$steps[$this->getStepOffset($this->step) - 1])) ? self::$steps[$this->getStepOffset($this->step) - 1] : false;
+         return (isset(self::$steps[self::getStepOffset($this->step) - 1])) ? self::$steps[self::getStepOffset($this->step) - 1] : false;
     }
 
     /**
@@ -276,7 +276,7 @@ abstract class InstallControllerHttp
      */
     public function findNextStep()
     {
-        $nextStep = (isset(self::$steps[$this->getStepOffset($this->step) + 1])) ? self::$steps[$this->getStepOffset($this->step) + 1] : false;
+        $nextStep = (isset(self::$steps[self::getStepOffset($this->step) + 1])) ? self::$steps[self::getStepOffset($this->step) + 1] : false;
         if ($nextStep == 'system' && self::$instances[$nextStep]->validate()) {
             $nextStep = self::$instances[$nextStep]->findNextStep();
         }
diff --git a/install/classes/datas.php b/install/classes/datas.php
index e88a8085f..f002ca12d 100644
--- a/install/classes/datas.php
+++ b/install/classes/datas.php
@@ -150,12 +150,7 @@ class Datas
             'name' => 'newsletter',
             'default' => 1,
             'help' => 'Get news from QloApps',
-        ),
-        'send_email' => array(
-            'name' => 'send_email',
-            'default' => 1,
-            'help' => 'Send an email to the administrator after installation',
-        ),
+        )
     );
 
     protected $datas = array();
diff --git a/install/classes/simplexml.php b/install/classes/simplexml.php
index f4093bec7..ce7b308b0 100644
--- a/install/classes/simplexml.php
+++ b/install/classes/simplexml.php
@@ -31,6 +31,7 @@ class InstallSimplexmlElement extends SimpleXMLElement
      *
      * @see SimpleXMLElement::addChild()
      */
+    #[\ReturnTypeWillChange]
     public function addChild($name, $value = null, $namespace = null)
     {
         if ($value instanceof SimplexmlElement) {
@@ -57,6 +58,7 @@ class InstallSimplexmlElement extends SimpleXMLElement
      *
      * @see SimpleXMLElement::asXML()
      */
+    #[\ReturnTypeWillChange]
     public function asXML($filename = null)
     {
         $dom = new DOMDocument('1.0');
diff --git a/install/classes/sqlLoader.php b/install/classes/sqlLoader.php
index 519d11c70..6013436aa 100644
--- a/install/classes/sqlLoader.php
+++ b/install/classes/sqlLoader.php
@@ -44,7 +44,7 @@ class InstallSqlLoader
     /**
      * @param Db $db
      */
-    public function __construct(Db $db = null)
+    public function __construct(?Db $db = null)
     {
         if (is_null($db)) {
             $db = Db::getInstance();
diff --git a/install/controllers/console/process.php b/install/controllers/console/process.php
index afeadfe82..def56c22b 100644
--- a/install/controllers/console/process.php
+++ b/install/controllers/console/process.php
@@ -158,12 +158,6 @@ class InstallControllerConsoleProcess extends InstallControllerConsole
                 ));
             Tools::file_get_contents('http://www.prestashop.com/ajax/controller.php?'.$params);
         }
-
-        if ($this->datas->send_email) {
-            if (!$this->processSendEmail()) {
-                $this->printErrors();
-            }
-        }
     }
 
     /**
@@ -299,44 +293,4 @@ class InstallControllerConsoleProcess extends InstallControllerConsole
         return $this->model_install->installModulesAddons();
     }
 
-  /**
-  * PROCESS : sendEmail
-  * Send information e-mail
-  */
-  public function processSendEmail()
-  {
-      require_once _PS_INSTALL_MODELS_PATH_.'mail.php';
-      $mail = new InstallModelMail(
-      false,
-      $this->datas->smtp_server,
-      $this->datas->smtp_login,
-      $this->datas->smtp_password,
-      $this->datas->smtp_port,
-      $this->datas->smtp_encryption,
-      $this->datas->admin_email
-    );
-
-      if (file_exists(_PS_INSTALL_LANGS_PATH_.$this->language->getLanguageIso().'/mail_identifiers.txt')) {
-          $content = file_get_contents(_PS_INSTALL_LANGS_PATH_.$this->language->getLanguageIso().'/mail_identifiers.txt');
-      } else {
-          $content = file_get_contents(_PS_INSTALL_LANGS_PATH_.InstallLanguages::DEFAULT_ISO.'/mail_identifiers.txt');
-      }
-
-      $vars = array(
-      '{firstname}' => $this->datas->admin_firstname,
-      '{lastname}' => $this->datas->admin_lastname,
-      '{shop_name}' => $this->datas->shop_name,
-      '{passwd}' => $this->datas->admin_password,
-      '{email}' => $this->datas->admin_email,
-      '{shop_url}' => Tools::getHttpHost(true).__PS_BASE_URI__,
-    );
-      $content = str_replace(array_keys($vars), array_values($vars), $content);
-
-      $mail->send(
-      $this->l('%s Login information', $this->datas->shop_name),
-      $content
-    );
-
-      return true;
-  }
 }
diff --git a/install/controllers/http/configure.php b/install/controllers/http/configure.php
index a8ef6af3c..990f19f78 100644
--- a/install/controllers/http/configure.php
+++ b/install/controllers/http/configure.php
@@ -95,20 +95,20 @@ class InstallControllerHttpConfigure extends InstallControllerHttp
         // Check shop name
         if ($this->session->shop_name && !Validate::isGenericName($this->session->shop_name)) {
             $this->errors['shop_name'] = $this->l('Invalid shop name');
-        } elseif (strlen($this->session->shop_name) > 64) {
+        } elseif (Tools::strlen($this->session->shop_name) > 64) {
             $this->errors['shop_name'] = $this->l('The field %s is limited to %d characters', $this->l('shop name'), 64);
         }
 
         // Check admin name
         if ($this->session->admin_firstname && !Validate::isName($this->session->admin_firstname)) {
             $this->errors['admin_firstname'] = $this->l('Your firstname contains some invalid characters');
-        } elseif (strlen($this->session->admin_firstname) > 32) {
+        } elseif (Tools::strlen($this->session->admin_firstname) > 32) {
             $this->errors['admin_firstname'] = $this->l('The field %s is limited to %d characters', $this->l('firstname'), 32);
         }
 
         if ($this->session->admin_lastname && !Validate::isName($this->session->admin_lastname)) {
             $this->errors['admin_lastname'] = $this->l('Your lastname contains some invalid characters');
-        } elseif (strlen($this->session->admin_lastname) > 32) {
+        } elseif (Tools::strlen($this->session->admin_lastname) > 32) {
             $this->errors['admin_lastname'] = $this->l('The field %s is limited to %d characters', $this->l('lastname'), 32);
         }
 
@@ -147,7 +147,7 @@ class InstallControllerHttpConfigure extends InstallControllerHttp
         if (isset($_FILES['fileToUpload']['tmp_name']) && $_FILES['fileToUpload']['tmp_name']) {
             $file = $_FILES['fileToUpload'];
             $error = ImageManager::validateUpload($file, 300000);
-            if (!strlen($error)) {
+            if (!Tools::strlen($error)) {
                 $tmp_name = tempnam(_PS_TMP_IMG_DIR_, 'PS');
                 if (!$tmp_name || !move_uploaded_file($file['tmp_name'], $tmp_name)) {
                     return false;
diff --git a/install/controllers/http/database.php b/install/controllers/http/database.php
index 87b98a7e6..50b4af820 100644
--- a/install/controllers/http/database.php
+++ b/install/controllers/http/database.php
@@ -34,11 +34,6 @@ class InstallControllerHttpDatabase extends InstallControllerHttp
      */
     public $model_database;
 
-    /**
-     * @var InstallModelMail
-     */
-    public $model_mail;
-
     public function init()
     {
         require_once _PS_INSTALL_MODELS_PATH_.'database.php';
diff --git a/install/controllers/http/process.php b/install/controllers/http/process.php
index 373185ce2..6e9ab9659 100644
--- a/install/controllers/http/process.php
+++ b/install/controllers/http/process.php
@@ -99,8 +99,6 @@ class InstallControllerHttpProcess extends InstallControllerHttp
             $this->processInstallAddonsModules();
         } elseif (Tools::getValue('installTheme') && !empty($this->session->process_validated['installModulesAddons'])) {
             $this->processInstallTheme();
-        } elseif (Tools::getValue('sendEmail') && !empty($this->session->process_validated['installTheme'])) {
-            $this->processSendEmail();
         } else {
             // With no parameters, we consider that we are doing a new install, so session where the last process step
             // was stored can be cleaned
diff --git a/install/controllers/http/system.php b/install/controllers/http/system.php
index c046f43e3..84499d97a 100644
--- a/install/controllers/http/system.php
+++ b/install/controllers/http/system.php
@@ -87,7 +87,7 @@ class InstallControllerHttpSystem extends InstallControllerHttp
                     'title' => $this->l('Required PHP parameters'),
                     'success' => 1,
                     'checks' => array(
-                        'phpversion' => $this->l('The required PHP version is between 5.6 to 7.4'),
+                        'phpversion' => $this->l('The required PHP version is between 8.1 to 8.4'),
                         'upload' => $this->l('Cannot upload files'),
                         'system' => $this->l('Cannot create new files and folders'),
                         'gd' => $this->l('GD library is not installed'),
@@ -134,7 +134,7 @@ class InstallControllerHttpSystem extends InstallControllerHttp
                     'title' => $this->l('Recommended PHP parameters'),
                     'success' => $this->tests['optional']['success'],
                     'checks' => array(
-                        'new_phpversion' => sprintf($this->l('You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!'), phpversion()),
+                        'new_phpversion' => sprintf($this->l('You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!'), phpversion()),
                         'register_globals' => $this->l('PHP register_globals option is enabled'),
                         'gz' => $this->l('GZIP compression is not activated'),
                         'mbstring' => $this->l('Mbstring extension is not enabled'),
diff --git a/install/langs/bg/install.php b/install/langs/bg/install.php
index fccfb73bc..1f1fd353a 100644
--- a/install/langs/bg/install.php
+++ b/install/langs/bg/install.php
@@ -65,7 +65,7 @@ return array(
 		'Install Addons modules' => 'Инсталирайте модули Addons',
 		'Install theme' => 'Инсталиране на тема',
 		'Required PHP parameters' => 'Необходими PHP параметри',
-		'The required PHP version is between 5.6 to 7.4' => 'Необходимата версия на PHP е между 5.6 и 7.4',
+		'The required PHP version is between 8.1 to 8.4' => 'Необходимата версия на PHP е между 8.1 и 8.4',
 		'Cannot upload files' => 'Не могат да се качват файлове',
 		'Cannot create new files and folders' => 'Не могат да се създават нови файлове и папки',
 		'GD library is not installed' => 'GD библиотеката не е инсталирана',
@@ -83,7 +83,7 @@ return array(
 		'Permissions on files and folders' => 'Разрешения за файлове и папки',
 		'Recursive write permissions for %1$s user on %2$s' => 'Рекурсивни разрешения за запис за %1$s потребител на %2$s',
 		'Recommended PHP parameters' => 'Препоръчителни PHP параметри',
-		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!' => 'Вие използвате PHP %s версия. Скоро най-новата версия на PHP, поддържана от QloApps, ще бъде PHP 5.6. За да сте сигурни, че сте готови за бъдещето, препоръчваме ви да надстроите до PHP 5.6 сега!',
+		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!' => 'Вие използвате PHP %s версия. Скоро най-новата версия на PHP, поддържана от QloApps, ще бъде PHP 8.1. За да сте сигурни, че сте готови за бъдещето, препоръчваме ви да надстроите до PHP 8.1 сега!',
 		'PHP register_globals option is enabled' => 'Опцията PHP register_globals е активирана',
 		'GZIP compression is not activated' => 'GZIP компресията не е активирана',
 		'Mbstring extension is not enabled' => 'Разширението Mbstring не е активирано',
diff --git a/install/langs/bg/mail_identifiers.txt b/install/langs/bg/mail_identifiers.txt
deleted file mode 100644
index bcfc284cd..000000000
--- a/install/langs/bg/mail_identifiers.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Hi {firstname} {lastname},
-
-Here is your personal login information for {shop_name}:
-
-Password: {passwd}
-E-mail address: {email}
-
-{shop_name} - {shop_url}
-
-{shop_url} powered by Webkul™
\ No newline at end of file
diff --git a/install/langs/bn/install.php b/install/langs/bn/install.php
index 18924ed89..e6825eacb 100644
--- a/install/langs/bn/install.php
+++ b/install/langs/bn/install.php
@@ -65,7 +65,7 @@ return array(
 		'Install Addons modules' => 'Addons মডিউল ইনস্টল করুন',
 		'Install theme' => 'থিম ইনস্টল করুন',
 		'Required PHP parameters' => 'প্রয়োজনীয় পিএইচপি পরামিতি',
-		'The required PHP version is between 5.6 to 7.4' => 'প্রয়োজনীয় পিএইচপি সংস্করণটি 5.6 থেকে 7.4 এর মধ্যে',
+		'The required PHP version is between 8.1 to 8.4' => 'প্রয়োজনীয় পিএইচপি সংস্করণটি 8.1 থেকে 8.4 এর মধ্যে',
 		'Cannot upload files' => 'ফাইল আপলোড করা যাবে না',
 		'Cannot create new files and folders' => 'নতুন ফাইল এবং ফোল্ডার তৈরি করা যাবে না',
 		'GD library is not installed' => 'জিডি লাইব্রেরি ইনস্টল করা নেই',
@@ -83,7 +83,7 @@ return array(
 		'Permissions on files and folders' => 'ফাইল এবং ফোল্ডারে অনুমতি',
 		'Recursive write permissions for %1$s user on %2$s' => '%2$s-এ %1$s ব্যবহারকারীর জন্য পুনরাবৃত্তিমূলক লেখার অনুমতি',
 		'Recommended PHP parameters' => 'প্রস্তাবিত PHP প্যারামিটার',
-		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!' => 'আপনি PHP %s সংস্করণ ব্যবহার করছেন। শীঘ্রই, QloApps দ্বারা সমর্থিত সর্বশেষ PHP সংস্করণটি হবে PHP 5.6। আপনি ভবিষ্যতের জন্য প্রস্তুত তা নিশ্চিত করতে, আমরা আপনাকে এখনই PHP 5.6-এ আপগ্রেড করার পরামর্শ দিচ্ছি!',
+		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!' => 'আপনি PHP %s সংস্করণ ব্যবহার করছেন। শীঘ্রই, QloApps দ্বারা সমর্থিত সর্বশেষ PHP সংস্করণটি হবে PHP 8.1। আপনি ভবিষ্যতের জন্য প্রস্তুত তা নিশ্চিত করতে, আমরা আপনাকে এখনই PHP 8.1-এ আপগ্রেড করার পরামর্শ দিচ্ছি!',
 		'PHP register_globals option is enabled' => 'পিএইচপি register_globals বিকল্প সক্রিয় করা হয়েছে',
 		'GZIP compression is not activated' => 'GZIP কম্প্রেশন সক্রিয় করা হয় না',
 		'Mbstring extension is not enabled' => 'Mbstring এক্সটেনশন সক্রিয় করা নেই',
diff --git a/install/langs/bn/mail_identifiers.txt b/install/langs/bn/mail_identifiers.txt
deleted file mode 100644
index bcfc284cd..000000000
--- a/install/langs/bn/mail_identifiers.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Hi {firstname} {lastname},
-
-Here is your personal login information for {shop_name}:
-
-Password: {passwd}
-E-mail address: {email}
-
-{shop_name} - {shop_url}
-
-{shop_url} powered by Webkul™
\ No newline at end of file
diff --git a/install/langs/br/install.php b/install/langs/br/install.php
index 41257b61c..46c5ebfce 100644
--- a/install/langs/br/install.php
+++ b/install/langs/br/install.php
@@ -65,7 +65,7 @@ return array(
 		'Install Addons modules' => 'Instale módulos adicionais',
 		'Install theme' => 'Instalar tema',
 		'Required PHP parameters' => 'Parâmetros PHP necessários',
-		'The required PHP version is between 5.6 to 7.4' => 'A versão necessária do PHP está entre 5.6 e 7.4',
+		'The required PHP version is between 8.1 to 8.4' => 'A versão necessária do PHP está entre 8.1 e 8.4',
 		'Cannot upload files' => 'Não é possível fazer upload de arquivos',
 		'Cannot create new files and folders' => 'Não é possível criar novos arquivos e pastas',
 		'GD library is not installed' => 'A biblioteca GD não está instalada',
@@ -83,7 +83,7 @@ return array(
 		'Permissions on files and folders' => 'Permissões em arquivos e pastas',
 		'Recursive write permissions for %1$s user on %2$s' => 'Permissões de gravação recursivas para usuário %1$s em %2$s',
 		'Recommended PHP parameters' => 'Parâmetros PHP recomendados',
-		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!' => 'Você está usando a versão %s do PHP. Em breve, a versão mais recente do PHP suportada pelo QloApps será o PHP 5.6. Para ter certeza de que você está pronto para o futuro, recomendamos que você atualize para o PHP 5.6 agora!',
+		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!' => 'Você está usando a versão %s do PHP. Em breve, a versão mais recente do PHP suportada pelo QloApps será o PHP 8.1. Para ter certeza de que você está pronto para o futuro, recomendamos que você atualize para o PHP 8.1 agora!',
 		'PHP register_globals option is enabled' => 'A opção PHP Register_globals está habilitada',
 		'GZIP compression is not activated' => 'A compactação GZIP não está ativada',
 		'Mbstring extension is not enabled' => 'A extensão Mbstring não está habilitada',
diff --git a/install/langs/br/mail_identifiers.txt b/install/langs/br/mail_identifiers.txt
deleted file mode 100644
index bcfc284cd..000000000
--- a/install/langs/br/mail_identifiers.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Hi {firstname} {lastname},
-
-Here is your personal login information for {shop_name}:
-
-Password: {passwd}
-E-mail address: {email}
-
-{shop_name} - {shop_url}
-
-{shop_url} powered by Webkul™
\ No newline at end of file
diff --git a/install/langs/ca/install.php b/install/langs/ca/install.php
index ce83da8dc..46e4c4c1e 100644
--- a/install/langs/ca/install.php
+++ b/install/langs/ca/install.php
@@ -65,7 +65,7 @@ return array(
 		'Install Addons modules' => 'Instal·leu mòduls de complements',
 		'Install theme' => 'Instal·leu el tema',
 		'Required PHP parameters' => 'Paràmetres PHP necessaris',
-		'The required PHP version is between 5.6 to 7.4' => 'La versió de PHP necessària és entre la 5.6 i la 7.4',
+		'The required PHP version is between 8.1 to 8.4' => 'La versió de PHP necessària és entre la 8.1 i la 8.4',
 		'Cannot upload files' => 'No es poden carregar fitxers',
 		'Cannot create new files and folders' => 'No es poden crear fitxers i carpetes nous',
 		'GD library is not installed' => 'La biblioteca GD no està instal·lada',
@@ -83,7 +83,7 @@ return array(
 		'Permissions on files and folders' => 'Permisos sobre fitxers i carpetes',
 		'Recursive write permissions for %1$s user on %2$s' => 'Permisos d\'escriptura recursius per a l\'usuari de %1$s a %2$s',
 		'Recommended PHP parameters' => 'Paràmetres PHP recomanats',
-		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!' => 'Esteu utilitzant la versió de PHP %s. Aviat, la darrera versió de PHP compatible amb QloApps serà PHP 5.6. Per assegurar-vos que esteu preparat per al futur, us recomanem que actualitzeu ara a PHP 5.6!',
+		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!' => 'Esteu utilitzant la versió de PHP %s. Aviat, la darrera versió de PHP compatible amb QloApps serà PHP 8.1. Per assegurar-vos que esteu preparat per al futur, us recomanem que actualitzeu ara a PHP 8.1!',
 		'PHP register_globals option is enabled' => 'L\'opció PHP register_globals està activada',
 		'GZIP compression is not activated' => 'La compressió GZIP no està activada',
 		'Mbstring extension is not enabled' => 'L\'extensió Mbstring no està activada',
diff --git a/install/langs/cs/install.php b/install/langs/cs/install.php
index e39cb0996..68f05b08d 100644
--- a/install/langs/cs/install.php
+++ b/install/langs/cs/install.php
@@ -65,7 +65,7 @@ return array(
 		'Install Addons modules' => 'Nainstalujte moduly Addons',
 		'Install theme' => 'Nainstalujte motiv',
 		'Required PHP parameters' => 'Požadované parametry PHP',
-		'The required PHP version is between 5.6 to 7.4' => 'Požadovaná verze PHP je mezi 5.6 a 7.4',
+		'The required PHP version is between 8.1 to 8.4' => 'Požadovaná verze PHP je mezi 8.1 a 8.4',
 		'Cannot upload files' => 'Nelze nahrávat soubory',
 		'Cannot create new files and folders' => 'Nelze vytvářet nové soubory a složky',
 		'GD library is not installed' => 'Knihovna GD není nainstalována',
@@ -83,7 +83,7 @@ return array(
 		'Permissions on files and folders' => 'Oprávnění k souborům a složkám',
 		'Recursive write permissions for %1$s user on %2$s' => 'Oprávnění k rekurzivnímu zápisu pro uživatele %1$s na %2$s',
 		'Recommended PHP parameters' => 'Doporučené parametry PHP',
-		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!' => 'Používáte PHP verzi %s. Brzy bude nejnovější verze PHP podporovaná QloApps PHP 5.6. Abyste se ujistili, že jste připraveni na budoucnost, doporučujeme vám nyní upgradovat na PHP 5.6!',
+		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!' => 'Používáte PHP verzi %s. Brzy bude nejnovější verze PHP podporovaná QloApps PHP 8.1. Abyste se ujistili, že jste připraveni na budoucnost, doporučujeme vám nyní upgradovat na PHP 8.1!',
 		'PHP register_globals option is enabled' => 'Možnost PHP register_globals je povolena',
 		'GZIP compression is not activated' => 'Komprese GZIP není aktivována',
 		'Mbstring extension is not enabled' => 'Rozšíření Mbstring není povoleno',
diff --git a/install/langs/cs/mail_identifiers.txt b/install/langs/cs/mail_identifiers.txt
deleted file mode 100644
index bcfc284cd..000000000
--- a/install/langs/cs/mail_identifiers.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Hi {firstname} {lastname},
-
-Here is your personal login information for {shop_name}:
-
-Password: {passwd}
-E-mail address: {email}
-
-{shop_name} - {shop_url}
-
-{shop_url} powered by Webkul™
\ No newline at end of file
diff --git a/install/langs/de/install.php b/install/langs/de/install.php
index e1919bf06..0e64a38b1 100644
--- a/install/langs/de/install.php
+++ b/install/langs/de/install.php
@@ -63,7 +63,7 @@ return array(
 		'Install Addons modules' => 'Add-Ons-Module installieren',
 		'Install theme' => 'Theme installieren',
 		'Required PHP parameters' => 'Erforderliche PHP-Parameter',
-		'The required PHP version is between 5.6 to 7.4' => 'Die erforderliche PHP-Version liegt zwischen 5.6 und 7.4',
+		'The required PHP version is between 8.1 to 8.4' => 'Die erforderliche PHP-Version liegt zwischen 8.1 und 8.4',
 		'Cannot upload files' => 'Dateien können nicht hochgeladen werden',
 		'Cannot create new files and folders' => 'Es können keine neuen Dateien und Ordner erstellt werden',
 		'GD library is not installed' => 'Die GD-Bibliothek ist nicht installiert',
@@ -81,7 +81,7 @@ return array(
 		'Permissions on files and folders' => 'Berechtigungen für Dateien und Ordner',
 		'Recursive write permissions for %1$s user on %2$s' => 'Rekursive Schreibberechtigungen für Benutzer %1$s auf %2$s',
 		'Recommended PHP parameters' => 'Empfohlene PHP-Parameter',
-		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!' => 'Sie verwenden die PHP-Version %s. Bald wird die neueste von QloApps unterstützte PHP-Version PHP 5.6 sein. Um sicherzustellen, dass Sie für die Zukunft gerüstet sind, empfehlen wir Ihnen, jetzt auf PHP 5.6 zu aktualisieren!',
+		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!' => 'Sie verwenden die PHP-Version %s. Bald wird die neueste von QloApps unterstützte PHP-Version PHP 8.1 sein. Um sicherzustellen, dass Sie für die Zukunft gerüstet sind, empfehlen wir Ihnen, jetzt auf PHP 8.1 zu aktualisieren!',
 		'PHP register_globals option is enabled' => 'Die PHP-Option „register_globals“ ist aktiviert',
 		'GZIP compression is not activated' => 'Die GZIP-Komprimierung ist nicht aktiviert',
 		'Mbstring extension is not enabled' => 'Die Mbstring-Erweiterung ist nicht aktiviert',
diff --git a/install/langs/de/mail_identifiers.txt b/install/langs/de/mail_identifiers.txt
deleted file mode 100644
index 9926e249f..000000000
--- a/install/langs/de/mail_identifiers.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Hallo {firstname} {lastname},
-
-Ihre persönlichen Login-Daten
-
-Kennwort: {passwd}
-E-Mail-Adresse: {email}
-
-{shop_name} powered with Webkul™
diff --git a/install/langs/en/install.php b/install/langs/en/install.php
index 981f83521..e246fafbb 100644
--- a/install/langs/en/install.php
+++ b/install/langs/en/install.php
@@ -65,7 +65,7 @@ return array(
 		'Install Addons modules' => 'Install Addons modules',
 		'Install theme' => 'Install theme',
 		'Required PHP parameters' => 'Required PHP parameters',
-		'The required PHP version is between 5.6 to 7.4' => 'The required PHP version is between 5.6 to 7.4',
+		'The required PHP version is between 8.1 to 8.4' => 'The required PHP version is between 8.1 to 8.4',
 		'Cannot upload files' => 'Cannot upload files',
 		'Cannot create new files and folders' => 'Cannot create new files and folders',
 		'GD library is not installed' => 'GD library is not installed',
@@ -83,7 +83,7 @@ return array(
 		'Permissions on files and folders' => 'Permissions on files and folders',
 		'Recursive write permissions for %1$s user on %2$s' => 'Recursive write permissions for %1$s user on %2$s',
 		'Recommended PHP parameters' => 'Recommended PHP parameters',
-		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!' => 'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!',
+		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!' => 'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!',
 		'PHP register_globals option is enabled' => 'PHP register_globals option is enabled',
 		'GZIP compression is not activated' => 'GZIP compression is not activated',
 		'Mbstring extension is not enabled' => 'Mbstring extension is not enabled',
diff --git a/install/langs/en/mail_identifiers.txt b/install/langs/en/mail_identifiers.txt
deleted file mode 100644
index bcfc284cd..000000000
--- a/install/langs/en/mail_identifiers.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Hi {firstname} {lastname},
-
-Here is your personal login information for {shop_name}:
-
-Password: {passwd}
-E-mail address: {email}
-
-{shop_name} - {shop_url}
-
-{shop_url} powered by Webkul™
\ No newline at end of file
diff --git a/install/langs/es/install.php b/install/langs/es/install.php
index 8acbcd60c..1d9efdcc0 100644
--- a/install/langs/es/install.php
+++ b/install/langs/es/install.php
@@ -65,7 +65,7 @@ return array(
 		'Install Addons modules' => 'Instalar módulos de complementos',
 		'Install theme' => 'Instalar el tema',
 		'Required PHP parameters' => 'Parámetros PHP requeridos',
-		'The required PHP version is between 5.6 to 7.4' => 'La versión de PHP requerida está entre 5.6 y 7.4',
+		'The required PHP version is between 8.1 to 8.4' => 'La versión de PHP requerida está entre 8.1 y 8.4',
 		'Cannot upload files' => 'No se pueden cargar archivos',
 		'Cannot create new files and folders' => 'No se pueden crear nuevos archivos y carpetas',
 		'GD library is not installed' => 'La biblioteca GD no está instalada',
@@ -83,7 +83,7 @@ return array(
 		'Permissions on files and folders' => 'Permisos sobre archivos y carpetas',
 		'Recursive write permissions for %1$s user on %2$s' => 'Permisos de escritura recursiva para %1$s usuario en %2$s',
 		'Recommended PHP parameters' => 'Parámetros PHP recomendados',
-		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!' => 'Estás usando PHP %s versión. Pronto, la última versión de PHP compatible con QloApps será PHP 5.6. Para asegurarse de que está preparado para el futuro, le recomendamos que actualice a PHP 5.6 ahora.',
+		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!' => 'Estás usando PHP %s versión. Pronto, la última versión de PHP compatible con QloApps será PHP 8.1. Para asegurarse de que está preparado para el futuro, le recomendamos que actualice a PHP 8.1 ahora.',
 		'PHP register_globals option is enabled' => 'La opción PHP Register_globals está habilitada',
 		'GZIP compression is not activated' => 'La compresión GZIP no está activada',
 		'Mbstring extension is not enabled' => 'La extensión MBstring no está habilitada',
diff --git a/install/langs/es/mail_identifiers.txt b/install/langs/es/mail_identifiers.txt
deleted file mode 100644
index f27326f60..000000000
--- a/install/langs/es/mail_identifiers.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Hola {firstname} {lastname},
-
-Tu información personal en {shop_name} es:
-
-* Contraseña: {passwd}
-* Email: {email}
-
-{shop_name} - {shop_url}
-
-
-{shop_url} impulsado por Webkul™
\ No newline at end of file
diff --git a/install/langs/fa/Flag_of_Iran.svg b/install/langs/fa/Flag_of_Iran.svg
index c22ceacc4..d7852e9ef 100644
--- a/install/langs/fa/Flag_of_Iran.svg
+++ b/install/langs/fa/Flag_of_Iran.svg
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" height="900" width="1575" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-157.5 0 315 180"> <title>Flag of Iran</title> <rect height="180" width="315" y="0" x="-157.5" fill="#239f40"/> <rect height="60" width="315" y="60" x="-157.5" fill="#FFF"/> <rect height="60" width="315" y="120" x="-157.5" fill="#da0000"/> <g id="b4">  <g id="b2">   <g id="b" transform="translate(0,55.1)" stroke="#FFF" stroke-linecap="square" fill="none">    <path id="p" transform="scale(1.4,1.4)" d="M-9-3h12m-12,4v-2h4v2h4v-2h-2m6,2h-2v-2h4v-2m0,2v2h4v-4m-2,0v4m-14,0h0.001"/>    <path id="t" transform="scale(1.4,2)" d="m-9,2.25h8m2,0h8"/>    <use xlink:href="#p" transform="translate(0,72.6)" height="180" width="315" y="0" x="0"/>    <use xlink:href="#t" transform="translate(0,60.8)" height="180" width="315" y="0" x="0"/>   </g>   <use xlink:href="#b" transform="translate(28,0)" height="180" width="315" y="0" x="0"/>  </g>  <use xlink:href="#b2" transform="translate(-56,0)" height="180" width="315" y="0" x="0"/> </g> <use xlink:href="#b4" transform="translate(112,0)" height="180" width="315" y="0" x="0"/> <use xlink:href="#b" transform="translate(-84,0)" height="180" width="315" y="0" x="0"/> <use xlink:href="#b2" transform="translate(-140,0)" height="180" width="315" y="0" x="0"/> <g fill="#da0000" transform="matrix(0.10435863,0,0,0.10435863,-21.795982,68.941383)">  <g fill="#da0000">   <path d="m296.69,47.667s156,122,41.333,297.33c108-66,117.33-247.5-41.333-297.33z"/>   <path d="m208.86,30.334c-24.834,28-67.5,0.1665-52.833-30.334,25.667,46,52.833,8.8335,52.833,8.8335s27.166,37.166,52.833-8.8335c14.667,30.5-27.999,58.334-52.833,30.334z"/>   <path d="m208.86,410.34-17.833-23.334s-41.999,14-97.333-5.333c45.333,0,70.667-8.001,80-12.667,0,0-102.67-55.333-100.67-168,6-114,66.667-148.67,66.667-148.67s-108,157.33,50.666,288.83l-7-162.67v-119.5c9-2.167,25.5-21.167,25.5-21.167s16.5,19,25.5,21.167v119.5l-7,162.67c158.66-131.5,50.66-288.84,50.66-288.84s60.667,34.667,66.667,148.67c2,112.67-100.67,168-100.67,168,9.333,4.666,34.667,12.667,80,12.667-55.334,19.333-97.333,5.333-97.333,5.333l-17.833,23.334z"/>   <path d="m121.03,47.667s-156,122-41.333,297.33c-108-66-117.34-247.5,41.333-297.33z"/>  </g> </g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" height="900" width="1575" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-157.5 0 315 180"> <title>Flag of Iran</title> <rect height="180" width="315" y="0" x="-157.5" fill="#239f40"/> <rect height="60" width="315" y="60" x="-157.5" fill="#FFF"/> <rect height="60" width="315" y="120" x="-157.5" fill="#da0000"/> <g id="b4">  <g id="b2">   <g id="b" transform="translate(0,55.1)" stroke="#FFF" stroke-linecap="square" fill="none">    <path id="p" transform="scale(1.4,1.4)" d="M-9-3h12m-12,4v-2h4v2h4v-2h-2m6,2h-2v-2h4v-2m0,2v2h4v-4m-2,0v4m-14,0h0.001"/>    <path id="t" transform="scale(1.4,2)" d="m-9,2.25h8m2,0h8"/>    <use xlink:href="#p" transform="translate(0,72.6)" height="180" width="315" y="0" x="0"/>    <use xlink:href="#t" transform="translate(0,60.8)" height="180" width="315" y="0" x="0"/>   </g>   <use xlink:href="#b" transform="translate(28,0)" height="180" width="315" y="0" x="0"/>  </g>  <use xlink:href="#b2" transform="translate(-56,0)" height="180" width="315" y="0" x="0"/> </g> <use xlink:href="#b4" transform="translate(112,0)" height="180" width="315" y="0" x="0"/> <use xlink:href="#b" transform="translate(-84,0)" height="180" width="315" y="0" x="0"/> <use xlink:href="#b2" transform="translate(-140,0)" height="180" width="315" y="0" x="0"/> <g fill="#da0000" transform="matrix(0.10435863,0,0,0.10435863,-21.795982,68.941383)">  <g fill="#da0000">   <path d="m296.69,47.667s156,122,41.333,297.33c108-66,117.33-247.5-41.333-297.33z"/>   <path d="m208.86,30.334c-24.834,28-67.5,0.1665-52.833-30.334,28.167,46,52.833,8.8335,52.833,8.8335s27.166,37.166,52.833-8.8335c14.667,30.5-27.999,58.334-52.833,30.334z"/>   <path d="m208.86,410.34-17.833-23.334s-41.999,14-97.333-5.333c45.333,0,70.667-8.001,80-12.667,0,0-102.67-55.333-100.67-168,6-114,66.667-148.67,66.667-148.67s-108,157.33,50.666,288.83l-7-162.67v-119.5c9-2.167,25.5-21.167,25.5-21.167s16.5,19,25.5,21.167v119.5l-7,162.67c158.66-131.5,50.66-288.84,50.66-288.84s60.667,34.667,66.667,148.67c2,112.67-100.67,168-100.67,168,9.333,4.666,34.667,12.667,80,12.667-55.334,19.333-97.333,5.333-97.333,5.333l-17.833,23.334z"/>   <path d="m121.03,47.667s-156,122-41.333,297.33c-108-66-117.34-247.5,41.333-297.33z"/>  </g> </g></svg>
\ No newline at end of file
diff --git a/install/langs/fa/install.php b/install/langs/fa/install.php
index de2c9214e..39df6cfbe 100644
--- a/install/langs/fa/install.php
+++ b/install/langs/fa/install.php
@@ -65,7 +65,7 @@ return array(
 		'Install Addons modules' => 'ماژول های Addons را نصب کنید',
 		'Install theme' => 'تم را نصب کنید',
 		'Required PHP parameters' => 'پارامترهای مورد نیاز PHP',
-		'The required PHP version is between 5.6 to 7.4' => 'نسخه PHP مورد نیاز بین 5.6 تا 7.4 است',
+		'The required PHP version is between 8.1 to 8.4' => 'نسخه PHP مورد نیاز بین 8.1 تا 8.4 است',
 		'Cannot upload files' => 'نمی توان فایل ها را آپلود کرد',
 		'Cannot create new files and folders' => 'نمی توان فایل ها و پوشه های جدید ایجاد کرد',
 		'GD library is not installed' => 'کتابخانه GD نصب نشده است',
@@ -83,7 +83,7 @@ return array(
 		'Permissions on files and folders' => 'مجوزها بر روی فایل ها و پوشه ها',
 		'Recursive write permissions for %1$s user on %2$s' => 'مجوزهای نوشتن بازگشتی برای کاربر %1$s در %2$s',
 		'Recommended PHP parameters' => 'پارامترهای پیشنهادی PHP',
-		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!' => 'شما از نسخه %s PHP استفاده می کنید. به زودی آخرین نسخه PHP پشتیبانی شده توسط QloApps PHP 5.6 خواهد بود. برای اطمینان از اینکه برای آینده آماده هستید، به شما توصیه می کنیم همین حالا به PHP 5.6 ارتقا دهید!',
+		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!' => 'شما از نسخه %s PHP استفاده می کنید. به زودی آخرین نسخه PHP پشتیبانی شده توسط QloApps PHP 8.1 خواهد بود. برای اطمینان از اینکه برای آینده آماده هستید، به شما توصیه می کنیم همین حالا به PHP 8.1 ارتقا دهید!',
 		'PHP register_globals option is enabled' => 'گزینه PHP register_globals فعال است',
 		'GZIP compression is not activated' => 'فشرده سازی GZIP فعال نیست',
 		'Mbstring extension is not enabled' => 'پسوند Mbstring فعال نیست',
diff --git a/install/langs/fa/mail_identifiers.txt b/install/langs/fa/mail_identifiers.txt
deleted file mode 100644
index 866016dc3..000000000
--- a/install/langs/fa/mail_identifiers.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-سلام {firstname} {lastname},
-
-اطلاعات ورود شما به سایت {shop_name}:
-
-رمزعبور: {passwd}
-آدرس ایمیل: {email}
-
-{shop_name} - {shop_url}
-
-{shop_url} powered by Webkul™
\ No newline at end of file
diff --git a/install/langs/fr/install.php b/install/langs/fr/install.php
index 139a69ecb..1ea623ad2 100644
--- a/install/langs/fr/install.php
+++ b/install/langs/fr/install.php
@@ -65,7 +65,7 @@ return array(
 		'Install Addons modules' => 'Installer les modules complémentaires',
 		'Install theme' => 'Installer le thème',
 		'Required PHP parameters' => 'Paramètres PHP requis',
-		'The required PHP version is between 5.6 to 7.4' => 'La version PHP requise est comprise entre 5.6 et 7.4',
+		'The required PHP version is between 8.1 to 8.4' => 'La version PHP requise est comprise entre 8.1 et 8.4',
 		'Cannot upload files' => 'Impossible de télécharger des fichiers',
 		'Cannot create new files and folders' => 'Impossible de créer de nouveaux fichiers et dossiers',
 		'GD library is not installed' => 'La bibliothèque GD n\'est pas installée',
@@ -83,7 +83,7 @@ return array(
 		'Permissions on files and folders' => 'Autorisations sur les fichiers et dossiers',
 		'Recursive write permissions for %1$s user on %2$s' => 'Autorisations d\'écriture récursives pour l\'utilisateur %1$s sur %2$s',
 		'Recommended PHP parameters' => 'Paramètres PHP recommandés',
-		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!' => 'Vous utilisez la version PHP %s. Bientôt, la dernière version de PHP prise en charge par QloApps sera PHP 5.6. Pour être sûr d\'être prêt pour l\'avenir, nous vous recommandons de passer à PHP 5.6 dès maintenant !',
+		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!' => 'Vous utilisez la version PHP %s. Bientôt, la dernière version de PHP prise en charge par QloApps sera PHP 8.1. Pour être sûr d\'être prêt pour l\'avenir, nous vous recommandons de passer à PHP 8.1 dès maintenant !',
 		'PHP register_globals option is enabled' => 'L\'option PHP register_globals est activée',
 		'GZIP compression is not activated' => 'La compression GZIP n\'est pas activée',
 		'Mbstring extension is not enabled' => 'L\'extension Mbstring n\'est pas activée',
diff --git a/install/langs/fr/mail_identifiers.txt b/install/langs/fr/mail_identifiers.txt
deleted file mode 100644
index 6d4bc97e9..000000000
--- a/install/langs/fr/mail_identifiers.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Bonjour {firstname} {lastname},
-
-Voici les informations personnelles concernant votre nouvelle boutique {shop_name} :
-
-Mot de passe : {passwd}
-Adresse électronique : {email}
-
-
-{shop_name} - {shop_url}
-
-
-
-{shop_url} propulsé par Webkul™
diff --git a/install/langs/he/install.php b/install/langs/he/install.php
index acf23babc..7c8ffefb1 100644
--- a/install/langs/he/install.php
+++ b/install/langs/he/install.php
@@ -65,7 +65,7 @@ return array(
 		'Install Addons modules' => 'התקן מודולי תוספות',
 		'Install theme' => 'התקן ערכת נושא',
 		'Required PHP parameters' => 'פרמטרי PHP נדרשים',
-		'The required PHP version is between 5.6 to 7.4' => 'גרסת ה-PHP הנדרשת היא בין 5.6 ל-7.4',
+		'The required PHP version is between 8.1 to 8.4' => 'גרסת ה-PHP הנדרשת היא בין 8.1 ל-8.4',
 		'Cannot upload files' => 'לא ניתן להעלות קבצים',
 		'Cannot create new files and folders' => 'לא ניתן ליצור קבצים ותיקיות חדשים',
 		'GD library is not installed' => 'ספריית GD אינה מותקנת',
@@ -83,7 +83,7 @@ return array(
 		'Permissions on files and folders' => 'הרשאות על קבצים ותיקיות',
 		'Recursive write permissions for %1$s user on %2$s' => 'הרשאות כתיבה רקורסיביות למשתמש %1$s ב-%2$s',
 		'Recommended PHP parameters' => 'פרמטרי PHP מומלצים',
-		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!' => 'אתה משתמש בגרסת PHP %s. בקרוב, גרסת ה-PHP העדכנית הנתמכת על ידי QloApps תהיה PHP 5.6. כדי לוודא שאתה מוכן לעתיד, אנו ממליצים לך לשדרג ל-PHP 5.6 עכשיו!',
+		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!' => 'אתה משתמש בגרסת PHP %s. בקרוב, גרסת ה-PHP העדכנית הנתמכת על ידי QloApps תהיה PHP 8.1. כדי לוודא שאתה מוכן לעתיד, אנו ממליצים לך לשדרג ל-PHP 8.1 עכשיו!',
 		'PHP register_globals option is enabled' => 'אפשרות PHP register_globals מופעלת',
 		'GZIP compression is not activated' => 'דחיסת GZIP אינה מופעלת',
 		'Mbstring extension is not enabled' => 'סיומת Mbstring אינה מופעלת',
diff --git a/install/langs/he/mail_identifiers.txt b/install/langs/he/mail_identifiers.txt
deleted file mode 100644
index afc93c8c6..000000000
--- a/install/langs/he/mail_identifiers.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-היי {firstname} {lastname},
-
-הנה פרטי ההתחברות שלך לחשבונך באתר של {shop_name}:
-
-סיסמה: {passwd}
-כתובת מייל: {email}
-
-{shop_name} - {shop_url}
-
-{shop_url} מופעל באמצעות פרסטהשופ™
\ No newline at end of file
diff --git a/install/langs/hr/install.php b/install/langs/hr/install.php
index 5b804cecf..a107f258d 100644
--- a/install/langs/hr/install.php
+++ b/install/langs/hr/install.php
@@ -65,7 +65,7 @@ return array(
 		'Install Addons modules' => 'Instalirajte Addons module',
 		'Install theme' => 'Instalirajte temu',
 		'Required PHP parameters' => 'Potrebni PHP parametri',
-		'The required PHP version is between 5.6 to 7.4' => 'Potrebna verzija PHP-a je između 5.6 i 7.4',
+		'The required PHP version is between 8.1 to 8.4' => 'Potrebna verzija PHP-a je između 8.1 i 8.4',
 		'Cannot upload files' => 'Ne mogu učitati datoteke',
 		'Cannot create new files and folders' => 'Nije moguće stvoriti nove datoteke i mape',
 		'GD library is not installed' => 'GD biblioteka nije instalirana',
@@ -83,7 +83,7 @@ return array(
 		'Permissions on files and folders' => 'Dopuštenja za datoteke i mape',
 		'Recursive write permissions for %1$s user on %2$s' => 'Rekurzivna dopuštenja pisanja za %1$s korisnika na %2$s',
 		'Recommended PHP parameters' => 'Preporučeni PHP parametri',
-		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!' => 'Koristite verziju PHP %s. Uskoro će najnovija verzija PHP-a koju podržava QloApps biti PHP 5.6. Kako biste bili sigurni da ste spremni za budućnost, preporučujemo da odmah nadogradite na PHP 5.6!',
+		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!' => 'Koristite verziju PHP %s. Uskoro će najnovija verzija PHP-a koju podržava QloApps biti PHP 8.1. Kako biste bili sigurni da ste spremni za budućnost, preporučujemo da odmah nadogradite na PHP 8.1!',
 		'PHP register_globals option is enabled' => 'PHP register_globals opcija je omogućena',
 		'GZIP compression is not activated' => 'GZIP kompresija nije aktivirana',
 		'Mbstring extension is not enabled' => 'Proširenje Mbstring nije omogućeno',
diff --git a/install/langs/hr/mail_identifiers.txt b/install/langs/hr/mail_identifiers.txt
deleted file mode 100644
index bcfc284cd..000000000
--- a/install/langs/hr/mail_identifiers.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Hi {firstname} {lastname},
-
-Here is your personal login information for {shop_name}:
-
-Password: {passwd}
-E-mail address: {email}
-
-{shop_name} - {shop_url}
-
-{shop_url} powered by Webkul™
\ No newline at end of file
diff --git a/install/langs/hu/install.php b/install/langs/hu/install.php
index d2362127c..7777c8943 100644
--- a/install/langs/hu/install.php
+++ b/install/langs/hu/install.php
@@ -65,7 +65,7 @@ return array(
 		'Install Addons modules' => 'Telepítse az Addons modulokat',
 		'Install theme' => 'Telepítse a témát',
 		'Required PHP parameters' => 'Kötelező PHP paraméterek',
-		'The required PHP version is between 5.6 to 7.4' => 'A szükséges PHP verzió 5.6 és 7.4 között van',
+		'The required PHP version is between 8.1 to 8.4' => 'A szükséges PHP verzió 8.1 és 8.4 között van',
 		'Cannot upload files' => 'Nem lehet fájlokat feltölteni',
 		'Cannot create new files and folders' => 'Nem lehet új fájlokat és mappákat létrehozni',
 		'GD library is not installed' => 'A GD könyvtár nincs telepítve',
@@ -83,7 +83,7 @@ return array(
 		'Permissions on files and folders' => 'Fájlokra és mappákra vonatkozó engedélyek',
 		'Recursive write permissions for %1$s user on %2$s' => 'Rekurzív írási engedélyek %1$s felhasználó számára a %2$s webhelyen',
 		'Recommended PHP parameters' => 'Javasolt PHP paraméterek',
-		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!' => 'Ön PHP %s verziót használ. Hamarosan a QloApps által támogatott legújabb PHP verzió a PHP 5.6 lesz. A jövőre való felkészülés érdekében javasoljuk, hogy most frissítsen PHP 5.6-ra!',
+		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!' => 'Ön PHP %s verziót használ. Hamarosan a QloApps által támogatott legújabb PHP verzió a PHP 8.1 lesz. A jövőre való felkészülés érdekében javasoljuk, hogy most frissítsen PHP 8.1-ra!',
 		'PHP register_globals option is enabled' => 'A PHP register_globals opció engedélyezve van',
 		'GZIP compression is not activated' => 'A GZIP-tömörítés nincs aktiválva',
 		'Mbstring extension is not enabled' => 'Az Mbstring kiterjesztés nincs engedélyezve',
diff --git a/install/langs/hu/mail_identifiers.txt b/install/langs/hu/mail_identifiers.txt
deleted file mode 100644
index bcfc284cd..000000000
--- a/install/langs/hu/mail_identifiers.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Hi {firstname} {lastname},
-
-Here is your personal login information for {shop_name}:
-
-Password: {passwd}
-E-mail address: {email}
-
-{shop_name} - {shop_url}
-
-{shop_url} powered by Webkul™
\ No newline at end of file
diff --git a/install/langs/id/install.php b/install/langs/id/install.php
index f0dea67ce..c6e09b7e6 100644
--- a/install/langs/id/install.php
+++ b/install/langs/id/install.php
@@ -65,7 +65,7 @@ return array(
 		'Install Addons modules' => 'Instal modul Addons',
 		'Install theme' => 'Instal tema',
 		'Required PHP parameters' => 'Parameter PHP yang diperlukan',
-		'The required PHP version is between 5.6 to 7.4' => 'Versi PHP yang diperlukan adalah antara 5.6 hingga 7.4',
+		'The required PHP version is between 8.1 to 8.4' => 'Versi PHP yang diperlukan adalah antara 8.1 hingga 8.4',
 		'Cannot upload files' => 'Tidak dapat mengunggah file',
 		'Cannot create new files and folders' => 'Tidak dapat membuat file dan folder baru',
 		'GD library is not installed' => 'Perpustakaan GD tidak diinstal',
@@ -83,7 +83,7 @@ return array(
 		'Permissions on files and folders' => 'Izin pada file dan folder',
 		'Recursive write permissions for %1$s user on %2$s' => 'Izin menulis rekursif untuk %1$s pengguna di %2$s',
 		'Recommended PHP parameters' => 'Parameter PHP yang direkomendasikan',
-		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!' => 'Anda menggunakan versi PHP %s. Sebentar lagi, versi PHP terbaru yang didukung oleh QloApps adalah PHP 5.6. Untuk memastikan Anda siap menghadapi masa depan, kami menyarankan Anda untuk meningkatkan ke PHP 5.6 sekarang!',
+		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!' => 'Anda menggunakan versi PHP %s. Sebentar lagi, versi PHP terbaru yang didukung oleh QloApps adalah PHP 8.1. Untuk memastikan Anda siap menghadapi masa depan, kami menyarankan Anda untuk meningkatkan ke PHP 8.1 sekarang!',
 		'PHP register_globals option is enabled' => 'Opsi PHP register_globals diaktifkan',
 		'GZIP compression is not activated' => 'Kompresi GZIP tidak diaktifkan',
 		'Mbstring extension is not enabled' => 'Ekstensi Mbstring tidak diaktifkan',
diff --git a/install/langs/id/mail_identifiers.txt b/install/langs/id/mail_identifiers.txt
deleted file mode 100644
index 20c9fa51c..000000000
--- a/install/langs/id/mail_identifiers.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Halo {firstname} {lastname},
-
-Berikut adalah informasi login Anda ke {shop_name}:
-
-Password: {passwd}
-E-mail : {email}
-
-{shop_name} - {shop_url}
-
-{shop_url} didukung oleh Webkul™
\ No newline at end of file
diff --git a/install/langs/it/install.php b/install/langs/it/install.php
index 68d18221c..0cd48c533 100644
--- a/install/langs/it/install.php
+++ b/install/langs/it/install.php
@@ -65,7 +65,7 @@ return array(
 		'Install Addons modules' => 'Installa i moduli aggiuntivi',
 		'Install theme' => 'Installa il tema',
 		'Required PHP parameters' => 'Parametri PHP richiesti',
-		'The required PHP version is between 5.6 to 7.4' => 'La versione PHP richiesta è compresa tra 5.6 e 7.4',
+		'The required PHP version is between 8.1 to 8.4' => 'La versione PHP richiesta è compresa tra 8.1 e 8.4',
 		'Cannot upload files' => 'Impossibile caricare file',
 		'Cannot create new files and folders' => 'Impossibile creare nuovi file e cartelle',
 		'GD library is not installed' => 'La libreria GD non è installata',
@@ -83,7 +83,7 @@ return array(
 		'Permissions on files and folders' => 'Autorizzazioni su file e cartelle',
 		'Recursive write permissions for %1$s user on %2$s' => 'Autorizzazioni di scrittura ricorsiva per l\'utente %1$s su %2$s',
 		'Recommended PHP parameters' => 'Parametri PHP consigliati',
-		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!' => 'Stai utilizzando la versione PHP %s. Presto, l\'ultima versione PHP supportata da QloApps sarà PHP 5.6. Per assicurarti di essere pronto per il futuro, ti consigliamo di eseguire subito l\'aggiornamento a PHP 5.6!',
+		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!' => 'Stai utilizzando la versione PHP %s. Presto, l\'ultima versione PHP supportata da QloApps sarà PHP 8.1. Per assicurarti di essere pronto per il futuro, ti consigliamo di eseguire subito l\'aggiornamento a PHP 8.1!',
 		'PHP register_globals option is enabled' => 'L\'opzione PHP Register_globals è abilitata',
 		'GZIP compression is not activated' => 'La compressione GZIP non è attivata',
 		'Mbstring extension is not enabled' => 'L\'estensione Mbstring non è abilitata',
diff --git a/install/langs/it/mail_identifiers.txt b/install/langs/it/mail_identifiers.txt
deleted file mode 100644
index 3ee2931c5..000000000
--- a/install/langs/it/mail_identifiers.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Salve {firstname} {lastname},
-
-I dati personali di login del tuo negozio {shop_name}:
-
-* Password: {passwd}
-* Indirizzo e-mail: {email}
-
-{shop_name} - {shop_url}
-
-
-
-{shop_url} powered by Webkul™
\ No newline at end of file
diff --git a/install/langs/lt/install.php b/install/langs/lt/install.php
index 9b88b07d3..0e2013561 100644
--- a/install/langs/lt/install.php
+++ b/install/langs/lt/install.php
@@ -65,7 +65,7 @@ return array(
 		'Install Addons modules' => 'Įdiekite „Addons“ modulius',
 		'Install theme' => 'Įdiegti temą',
 		'Required PHP parameters' => 'Reikalingi PHP parametrai',
-		'The required PHP version is between 5.6 to 7.4' => 'Reikalinga PHP versija yra nuo 5.6 iki 7.4',
+		'The required PHP version is between 8.1 to 8.4' => 'Reikalinga PHP versija yra nuo 8.1 iki 8.4',
 		'Cannot upload files' => 'Nepavyksta įkelti failų',
 		'Cannot create new files and folders' => 'Negalima sukurti naujų failų ir aplankų',
 		'GD library is not installed' => 'GD biblioteka neįdiegta',
@@ -83,7 +83,7 @@ return array(
 		'Permissions on files and folders' => 'Leidimai failams ir aplankams',
 		'Recursive write permissions for %1$s user on %2$s' => 'Rekursyvūs rašymo leidimai %1$s naudotojui %2$s',
 		'Recommended PHP parameters' => 'Rekomenduojami PHP parametrai',
-		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!' => 'Naudojate PHP %s versiją. Netrukus naujausia QloApps palaikoma PHP versija bus PHP 5.6. Norėdami įsitikinti, kad esate pasirengę ateičiai, rekomenduojame dabar atnaujinti į PHP 5.6!',
+		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!' => 'Naudojate PHP %s versiją. Netrukus naujausia QloApps palaikoma PHP versija bus PHP 8.1. Norėdami įsitikinti, kad esate pasirengę ateičiai, rekomenduojame dabar atnaujinti į PHP 8.1!',
 		'PHP register_globals option is enabled' => 'PHP register_globals parinktis įjungta',
 		'GZIP compression is not activated' => 'GZIP glaudinimas nesuaktyvintas',
 		'Mbstring extension is not enabled' => 'Mbstring plėtinys neįjungtas',
diff --git a/install/langs/lt/mail_identifiers.txt b/install/langs/lt/mail_identifiers.txt
deleted file mode 100644
index bcfc284cd..000000000
--- a/install/langs/lt/mail_identifiers.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Hi {firstname} {lastname},
-
-Here is your personal login information for {shop_name}:
-
-Password: {passwd}
-E-mail address: {email}
-
-{shop_name} - {shop_url}
-
-{shop_url} powered by Webkul™
\ No newline at end of file
diff --git a/install/langs/mk/install.php b/install/langs/mk/install.php
index a041da6b8..38df71d70 100644
--- a/install/langs/mk/install.php
+++ b/install/langs/mk/install.php
@@ -65,7 +65,7 @@ return array(
 		'Install Addons modules' => 'Инсталирајте модули за додатоци',
 		'Install theme' => 'Инсталирајте ја темата',
 		'Required PHP parameters' => 'Потребни PHP параметри',
-		'The required PHP version is between 5.6 to 7.4' => 'Потребната верзија на PHP е помеѓу 5.6 и 7.4',
+		'The required PHP version is between 8.1 to 8.4' => 'Потребната верзија на PHP е помеѓу 8.1 и 8.4',
 		'Cannot upload files' => 'Не може да се прикачат датотеки',
 		'Cannot create new files and folders' => 'Не може да се создадат нови датотеки и папки',
 		'GD library is not installed' => 'Библиотеката GD не е инсталирана',
@@ -83,7 +83,7 @@ return array(
 		'Permissions on files and folders' => 'Дозволи за датотеки и папки',
 		'Recursive write permissions for %1$s user on %2$s' => 'Рекурзивни дозволи за пишување за корисникот %1$s на %2$s',
 		'Recommended PHP parameters' => 'Препорачани PHP параметри',
-		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!' => 'Ја користите верзијата на PHP %s. Наскоро, најновата верзија на PHP поддржана од QloApps ќе биде PHP 5.6. За да бидете сигурни дека сте подготвени за иднината, ви препорачуваме да го надградите на PHP 5.6 сега!',
+		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!' => 'Ја користите верзијата на PHP %s. Наскоро, најновата верзија на PHP поддржана од QloApps ќе биде PHP 8.1. За да бидете сигурни дека сте подготвени за иднината, ви препорачуваме да го надградите на PHP 8.1 сега!',
 		'PHP register_globals option is enabled' => 'Опцијата PHP register_globals е овозможена',
 		'GZIP compression is not activated' => 'Компресирањето GZIP не е активирано',
 		'Mbstring extension is not enabled' => 'Наставката Mbstring не е овозможена',
diff --git a/install/langs/mk/mail_identifiers.txt b/install/langs/mk/mail_identifiers.txt
deleted file mode 100644
index bcfc284cd..000000000
--- a/install/langs/mk/mail_identifiers.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Hi {firstname} {lastname},
-
-Here is your personal login information for {shop_name}:
-
-Password: {passwd}
-E-mail address: {email}
-
-{shop_name} - {shop_url}
-
-{shop_url} powered by Webkul™
\ No newline at end of file
diff --git a/install/langs/nl/install.php b/install/langs/nl/install.php
index 171a9621e..c764a3440 100644
--- a/install/langs/nl/install.php
+++ b/install/langs/nl/install.php
@@ -65,7 +65,7 @@ return array(
 		'Install Addons modules' => 'Installeer Add-ons-modules',
 		'Install theme' => 'Installeer thema',
 		'Required PHP parameters' => 'Vereiste PHP-parameters',
-		'The required PHP version is between 5.6 to 7.4' => 'De vereiste PHP-versie ligt tussen 5.6 en 7.4',
+		'The required PHP version is between 8.1 to 8.4' => 'De vereiste PHP-versie ligt tussen 8.1 en 8.4',
 		'Cannot upload files' => 'Kan geen bestanden uploaden',
 		'Cannot create new files and folders' => 'Kan geen nieuwe bestanden en mappen maken',
 		'GD library is not installed' => 'GD-bibliotheek is niet geïnstalleerd',
@@ -83,7 +83,7 @@ return array(
 		'Permissions on files and folders' => 'Machtigingen voor bestanden en mappen',
 		'Recursive write permissions for %1$s user on %2$s' => 'Recursieve schrijfrechten voor %1$s gebruiker op %2$s',
 		'Recommended PHP parameters' => 'Aanbevolen PHP-parameters',
-		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!' => 'Je gebruikt de PHP %s-versie. Binnenkort zal de nieuwste PHP-versie die door QloApps wordt ondersteund PHP 5.6 zijn. Om er zeker van te zijn dat je klaar bent voor de toekomst, raden wij je aan om nu te upgraden naar PHP 5.6!',
+		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!' => 'Je gebruikt de PHP %s-versie. Binnenkort zal de nieuwste PHP-versie die door QloApps wordt ondersteund PHP 8.1 zijn. Om er zeker van te zijn dat je klaar bent voor de toekomst, raden wij je aan om nu te upgraden naar PHP 8.1!',
 		'PHP register_globals option is enabled' => 'PHP register_globals optie is ingeschakeld',
 		'GZIP compression is not activated' => 'GZIP-compressie is niet geactiveerd',
 		'Mbstring extension is not enabled' => 'De Mbstring-extensie is niet ingeschakeld',
diff --git a/install/langs/nl/mail_identifiers.txt b/install/langs/nl/mail_identifiers.txt
deleted file mode 100644
index bcfc284cd..000000000
--- a/install/langs/nl/mail_identifiers.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Hi {firstname} {lastname},
-
-Here is your personal login information for {shop_name}:
-
-Password: {passwd}
-E-mail address: {email}
-
-{shop_name} - {shop_url}
-
-{shop_url} powered by Webkul™
\ No newline at end of file
diff --git a/install/langs/no/install.php b/install/langs/no/install.php
index ec71d43a3..e6455c786 100644
--- a/install/langs/no/install.php
+++ b/install/langs/no/install.php
@@ -65,7 +65,7 @@ return array(
 		'Install Addons modules' => 'Installer tilleggsmoduler',
 		'Install theme' => 'Installer tema',
 		'Required PHP parameters' => 'Nødvendige PHP-parametere',
-		'The required PHP version is between 5.6 to 7.4' => 'Den nødvendige PHP-versjonen er mellom 5.6 og 7.4',
+		'The required PHP version is between 8.1 to 8.4' => 'Den nødvendige PHP-versjonen er mellom 8.1 og 8.4',
 		'Cannot upload files' => 'Kan ikke laste opp filer',
 		'Cannot create new files and folders' => 'Kan ikke opprette nye filer og mapper',
 		'GD library is not installed' => 'GD-biblioteket er ikke installert',
@@ -83,7 +83,7 @@ return array(
 		'Permissions on files and folders' => 'Tillatelser på filer og mapper',
 		'Recursive write permissions for %1$s user on %2$s' => 'Rekursive skrivetillatelser for %1$s bruker på %2$s',
 		'Recommended PHP parameters' => 'Anbefalte PHP-parametere',
-		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!' => 'Du bruker PHP %s versjon. Snart vil den siste PHP-versjonen som støttes av QloApps være PHP 5.6. For å være sikker på at du er klar for fremtiden, anbefaler vi deg å oppgradere til PHP 5.6 nå!',
+		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!' => 'Du bruker PHP %s versjon. Snart vil den siste PHP-versjonen som støttes av QloApps være PHP 8.1. For å være sikker på at du er klar for fremtiden, anbefaler vi deg å oppgradere til PHP 8.1 nå!',
 		'PHP register_globals option is enabled' => 'Alternativet PHP register_globals er aktivert',
 		'GZIP compression is not activated' => 'GZIP-komprimering er ikke aktivert',
 		'Mbstring extension is not enabled' => 'Mbstring-utvidelse er ikke aktivert',
diff --git a/install/langs/no/mail_identifiers.txt b/install/langs/no/mail_identifiers.txt
deleted file mode 100644
index bcfc284cd..000000000
--- a/install/langs/no/mail_identifiers.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Hi {firstname} {lastname},
-
-Here is your personal login information for {shop_name}:
-
-Password: {passwd}
-E-mail address: {email}
-
-{shop_name} - {shop_url}
-
-{shop_url} powered by Webkul™
\ No newline at end of file
diff --git a/install/langs/pl/install.php b/install/langs/pl/install.php
index 0748c5e79..4d736d6bf 100644
--- a/install/langs/pl/install.php
+++ b/install/langs/pl/install.php
@@ -65,7 +65,7 @@ return array(
 		'Install Addons modules' => 'Zainstaluj moduły Addons',
 		'Install theme' => 'Zainstaluj motyw',
 		'Required PHP parameters' => 'Wymagane parametry PHP',
-		'The required PHP version is between 5.6 to 7.4' => 'Wymagana wersja PHP mieści się w przedziale od 5.6 do 7.4',
+		'The required PHP version is between 8.1 to 8.4' => 'Wymagana wersja PHP mieści się w przedziale od 8.1 do 8.4',
 		'Cannot upload files' => 'Nie można przesyłać plików',
 		'Cannot create new files and folders' => 'Nie można utworzyć nowych plików i folderów',
 		'GD library is not installed' => 'Biblioteka GD nie jest zainstalowana',
@@ -83,7 +83,7 @@ return array(
 		'Permissions on files and folders' => 'Uprawnienia do plików i folderów',
 		'Recursive write permissions for %1$s user on %2$s' => 'Rekursywne uprawnienia do zapisu dla użytkownika %1$s na %2$s',
 		'Recommended PHP parameters' => 'Zalecane parametry PHP',
-		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!' => 'Używasz wersji PHP %s. Wkrótce najnowszą wersją PHP obsługiwaną przez QloApps będzie PHP 5.6. Aby mieć pewność, że jesteś gotowy na przyszłość, zalecamy aktualizację do PHP 5.6 już teraz!',
+		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!' => 'Używasz wersji PHP %s. Wkrótce najnowszą wersją PHP obsługiwaną przez QloApps będzie PHP 8.1. Aby mieć pewność, że jesteś gotowy na przyszłość, zalecamy aktualizację do PHP 8.1 już teraz!',
 		'PHP register_globals option is enabled' => 'Opcja PHP Register_globals jest włączona',
 		'GZIP compression is not activated' => 'Kompresja GZIP nie jest aktywowana',
 		'Mbstring extension is not enabled' => 'Rozszerzenie Mbstring nie jest włączone',
diff --git a/install/langs/pl/mail_identifiers.txt b/install/langs/pl/mail_identifiers.txt
deleted file mode 100644
index f9166da80..000000000
--- a/install/langs/pl/mail_identifiers.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Witaj {firstname} {lastname}!
-
-Oto dane logowania dla sklepu {shop_name}:
-
-Hasło: {passwd}
-E-mail: {email}
-
-{shop_name} - {shop_url}
-
-{shop_url} na silniku Webkul™
\ No newline at end of file
diff --git a/install/langs/pt/install.php b/install/langs/pt/install.php
index 41257b61c..46c5ebfce 100644
--- a/install/langs/pt/install.php
+++ b/install/langs/pt/install.php
@@ -65,7 +65,7 @@ return array(
 		'Install Addons modules' => 'Instale módulos adicionais',
 		'Install theme' => 'Instalar tema',
 		'Required PHP parameters' => 'Parâmetros PHP necessários',
-		'The required PHP version is between 5.6 to 7.4' => 'A versão necessária do PHP está entre 5.6 e 7.4',
+		'The required PHP version is between 8.1 to 8.4' => 'A versão necessária do PHP está entre 8.1 e 8.4',
 		'Cannot upload files' => 'Não é possível fazer upload de arquivos',
 		'Cannot create new files and folders' => 'Não é possível criar novos arquivos e pastas',
 		'GD library is not installed' => 'A biblioteca GD não está instalada',
@@ -83,7 +83,7 @@ return array(
 		'Permissions on files and folders' => 'Permissões em arquivos e pastas',
 		'Recursive write permissions for %1$s user on %2$s' => 'Permissões de gravação recursivas para usuário %1$s em %2$s',
 		'Recommended PHP parameters' => 'Parâmetros PHP recomendados',
-		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!' => 'Você está usando a versão %s do PHP. Em breve, a versão mais recente do PHP suportada pelo QloApps será o PHP 5.6. Para ter certeza de que você está pronto para o futuro, recomendamos que você atualize para o PHP 5.6 agora!',
+		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!' => 'Você está usando a versão %s do PHP. Em breve, a versão mais recente do PHP suportada pelo QloApps será o PHP 8.1. Para ter certeza de que você está pronto para o futuro, recomendamos que você atualize para o PHP 8.1 agora!',
 		'PHP register_globals option is enabled' => 'A opção PHP Register_globals está habilitada',
 		'GZIP compression is not activated' => 'A compactação GZIP não está ativada',
 		'Mbstring extension is not enabled' => 'A extensão Mbstring não está habilitada',
diff --git a/install/langs/pt/mail_identifiers.txt b/install/langs/pt/mail_identifiers.txt
deleted file mode 100644
index c5af42bc5..000000000
--- a/install/langs/pt/mail_identifiers.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Olá {firstname} {lastname},
-
-Aqui estão os seus dados para iniciar sessão na loja {shop_name}:
-
-Palavra-passe: {passwd}
-Endereço de e-mail: {email}
-
-{shop_name} - {shop_url}
-
-{shop_url} powered by Webkul™
\ No newline at end of file
diff --git a/install/langs/qc/install.php b/install/langs/qc/install.php
index 139a69ecb..1ea623ad2 100644
--- a/install/langs/qc/install.php
+++ b/install/langs/qc/install.php
@@ -65,7 +65,7 @@ return array(
 		'Install Addons modules' => 'Installer les modules complémentaires',
 		'Install theme' => 'Installer le thème',
 		'Required PHP parameters' => 'Paramètres PHP requis',
-		'The required PHP version is between 5.6 to 7.4' => 'La version PHP requise est comprise entre 5.6 et 7.4',
+		'The required PHP version is between 8.1 to 8.4' => 'La version PHP requise est comprise entre 8.1 et 8.4',
 		'Cannot upload files' => 'Impossible de télécharger des fichiers',
 		'Cannot create new files and folders' => 'Impossible de créer de nouveaux fichiers et dossiers',
 		'GD library is not installed' => 'La bibliothèque GD n\'est pas installée',
@@ -83,7 +83,7 @@ return array(
 		'Permissions on files and folders' => 'Autorisations sur les fichiers et dossiers',
 		'Recursive write permissions for %1$s user on %2$s' => 'Autorisations d\'écriture récursives pour l\'utilisateur %1$s sur %2$s',
 		'Recommended PHP parameters' => 'Paramètres PHP recommandés',
-		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!' => 'Vous utilisez la version PHP %s. Bientôt, la dernière version de PHP prise en charge par QloApps sera PHP 5.6. Pour être sûr d\'être prêt pour l\'avenir, nous vous recommandons de passer à PHP 5.6 dès maintenant !',
+		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!' => 'Vous utilisez la version PHP %s. Bientôt, la dernière version de PHP prise en charge par QloApps sera PHP 8.1. Pour être sûr d\'être prêt pour l\'avenir, nous vous recommandons de passer à PHP 8.1 dès maintenant !',
 		'PHP register_globals option is enabled' => 'L\'option PHP register_globals est activée',
 		'GZIP compression is not activated' => 'La compression GZIP n\'est pas activée',
 		'Mbstring extension is not enabled' => 'L\'extension Mbstring n\'est pas activée',
diff --git a/install/langs/qc/mail_identifiers.txt b/install/langs/qc/mail_identifiers.txt
deleted file mode 100644
index 6d4bc97e9..000000000
--- a/install/langs/qc/mail_identifiers.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Bonjour {firstname} {lastname},
-
-Voici les informations personnelles concernant votre nouvelle boutique {shop_name} :
-
-Mot de passe : {passwd}
-Adresse électronique : {email}
-
-
-{shop_name} - {shop_url}
-
-
-
-{shop_url} propulsé par Webkul™
diff --git a/install/langs/ro/install.php b/install/langs/ro/install.php
index dcdc4ffb0..f8ef55f5a 100644
--- a/install/langs/ro/install.php
+++ b/install/langs/ro/install.php
@@ -65,7 +65,7 @@ return array(
 		'Install Addons modules' => 'Instalați module de suplimente',
 		'Install theme' => 'Instalați tema',
 		'Required PHP parameters' => 'Parametri PHP necesari',
-		'The required PHP version is between 5.6 to 7.4' => 'Versiunea PHP necesară este între 5.6 și 7.4',
+		'The required PHP version is between 8.1 to 8.4' => 'Versiunea PHP necesară este între 8.1 și 8.4',
 		'Cannot upload files' => 'Nu se pot încărca fișiere',
 		'Cannot create new files and folders' => 'Nu se pot crea fișiere și foldere noi',
 		'GD library is not installed' => 'Biblioteca GD nu este instalată',
@@ -83,7 +83,7 @@ return array(
 		'Permissions on files and folders' => 'Permisiuni pentru fișiere și foldere',
 		'Recursive write permissions for %1$s user on %2$s' => 'Permisiuni de scriere recursive pentru utilizatorul %1$s pe %2$s',
 		'Recommended PHP parameters' => 'Parametri PHP recomandați',
-		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!' => 'Utilizați versiunea PHP %s. În curând, cea mai recentă versiune PHP suportată de QloApps va fi PHP 5.6. Pentru a vă asigura că sunteți pregătit pentru viitor, vă recomandăm să faceți upgrade la PHP 5.6 acum!',
+		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!' => 'Utilizați versiunea PHP %s. În curând, cea mai recentă versiune PHP suportată de QloApps va fi PHP 8.1. Pentru a vă asigura că sunteți pregătit pentru viitor, vă recomandăm să faceți upgrade la PHP 8.1 acum!',
 		'PHP register_globals option is enabled' => 'Opțiunea PHP register_globals este activată',
 		'GZIP compression is not activated' => 'Comprimarea GZIP nu este activată',
 		'Mbstring extension is not enabled' => 'Extensia Mbstring nu este activată',
diff --git a/install/langs/ro/mail_identifiers.txt b/install/langs/ro/mail_identifiers.txt
deleted file mode 100644
index 5ce01ccb6..000000000
--- a/install/langs/ro/mail_identifiers.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Buna {firstname} {lastname},
-
-Iata datele necesare pentru autentificare la {shop_name}:
-
-Parola: {passwd}
-Adresa de e-mail: {email}
-
-{shop_name} - {shop_url}
-
-{shop_url} motorizat de Webkul™
\ No newline at end of file
diff --git a/install/langs/ru/install.php b/install/langs/ru/install.php
index 5d7642593..b58c5a711 100644
--- a/install/langs/ru/install.php
+++ b/install/langs/ru/install.php
@@ -65,7 +65,7 @@ return array(
 		'Install Addons modules' => 'Установить модули дополнений',
 		'Install theme' => 'Установить тему',
 		'Required PHP parameters' => 'Обязательные параметры PHP',
-		'The required PHP version is between 5.6 to 7.4' => 'Требуемая версия PHP — от 5.6 до 7.4.',
+		'The required PHP version is between 8.1 to 8.4' => 'Требуемая версия PHP — от 8.1 до 8.4.',
 		'Cannot upload files' => 'Не могу загрузить файлы',
 		'Cannot create new files and folders' => 'Не могу создавать новые файлы и папки',
 		'GD library is not installed' => 'Библиотека GD не установлена',
@@ -83,7 +83,7 @@ return array(
 		'Permissions on files and folders' => 'Разрешения на файлы и папки',
 		'Recursive write permissions for %1$s user on %2$s' => 'Разрешения на рекурсивную запись для пользователя %1$s на %2$s',
 		'Recommended PHP parameters' => 'Рекомендуемые параметры PHP',
-		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!' => 'Вы используете версию PHP %s. Вскоре последней версией PHP, поддерживаемой QloApps, станет PHP 5.6. Чтобы быть уверенным, что вы готовы к будущему, мы рекомендуем вам выполнить обновление до PHP 5.6 прямо сейчас!',
+		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!' => 'Вы используете версию PHP %s. Вскоре последней версией PHP, поддерживаемой QloApps, станет PHP 8.1. Чтобы быть уверенным, что вы готовы к будущему, мы рекомендуем вам выполнить обновление до PHP 8.1 прямо сейчас!',
 		'PHP register_globals option is enabled' => 'Опция PHP Register_globals включена.',
 		'GZIP compression is not activated' => 'Сжатие GZIP не активировано',
 		'Mbstring extension is not enabled' => 'Расширение Mbstring не включено',
diff --git a/install/langs/ru/mail_identifiers.txt b/install/langs/ru/mail_identifiers.txt
deleted file mode 100644
index c0b6fa2f5..000000000
--- a/install/langs/ru/mail_identifiers.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Здравствуйте, {firstname} {lastname},
-
-Ваши персональные данные для входа в {shop_name}:
-
-Электронная почта: {email}
-Пароль: {passwd}
-
-{shop_name} - {shop_url}
-
-{shop_url} под управлением Webkul™
\ No newline at end of file
diff --git a/install/langs/si/install.php b/install/langs/si/install.php
index 6d0370ea9..3dab1465c 100644
--- a/install/langs/si/install.php
+++ b/install/langs/si/install.php
@@ -65,7 +65,7 @@ return array(
 		'Install Addons modules' => 'Namestite module Addons',
 		'Install theme' => 'Namestite temo',
 		'Required PHP parameters' => 'Zahtevani parametri PHP',
-		'The required PHP version is between 5.6 to 7.4' => 'Zahtevana različica PHP je med 5.6 in 7.4',
+		'The required PHP version is between 8.1 to 8.4' => 'Zahtevana različica PHP je med 8.1 in 8.4',
 		'Cannot upload files' => 'Datotek ni mogoče naložiti',
 		'Cannot create new files and folders' => 'Ni mogoče ustvariti novih datotek in map',
 		'GD library is not installed' => 'Knjižnica GD ni nameščena',
@@ -83,7 +83,7 @@ return array(
 		'Permissions on files and folders' => 'Dovoljenja za datoteke in mape',
 		'Recursive write permissions for %1$s user on %2$s' => 'Rekurzivna dovoljenja za pisanje za uporabnika %1$s na %2$s',
 		'Recommended PHP parameters' => 'Priporočeni parametri PHP',
-		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!' => 'Uporabljate različico PHP %s. Kmalu bo najnovejša različica PHP, ki jo podpira QloApps, PHP 5.6. Da bi bili pripravljeni na prihodnost, vam priporočamo, da zdaj nadgradite na PHP 5.6!',
+		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!' => 'Uporabljate različico PHP %s. Kmalu bo najnovejša različica PHP, ki jo podpira QloApps, PHP 8.1. Da bi bili pripravljeni na prihodnost, vam priporočamo, da zdaj nadgradite na PHP 8.1!',
 		'PHP register_globals option is enabled' => 'Možnost PHP register_globals je omogočena',
 		'GZIP compression is not activated' => 'Stiskanje GZIP ni aktivirano',
 		'Mbstring extension is not enabled' => 'Razširitev Mbstring ni omogočena',
diff --git a/install/langs/si/mail_identifiers.txt b/install/langs/si/mail_identifiers.txt
deleted file mode 100644
index bcfc284cd..000000000
--- a/install/langs/si/mail_identifiers.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Hi {firstname} {lastname},
-
-Here is your personal login information for {shop_name}:
-
-Password: {passwd}
-E-mail address: {email}
-
-{shop_name} - {shop_url}
-
-{shop_url} powered by Webkul™
\ No newline at end of file
diff --git a/install/langs/sr/install.php b/install/langs/sr/install.php
index 143aa6354..0687da9f9 100644
--- a/install/langs/sr/install.php
+++ b/install/langs/sr/install.php
@@ -65,7 +65,7 @@ return array(
 		'Install Addons modules' => 'Инсталирајте Аддонс модуле',
 		'Install theme' => 'Инсталирај тему',
 		'Required PHP parameters' => 'Обавезни ПХП параметри',
-		'The required PHP version is between 5.6 to 7.4' => 'Потребна верзија ПХП-а је између 5.6 и 7.4',
+		'The required PHP version is between 8.1 to 8.4' => 'Потребна верзија ПХП-а је између 8.1 и 8.4',
 		'Cannot upload files' => 'Није могуће отпремити датотеке',
 		'Cannot create new files and folders' => 'Није могуће креирати нове датотеке и фасцикле',
 		'GD library is not installed' => 'ГД библиотека није инсталирана',
@@ -83,7 +83,7 @@ return array(
 		'Permissions on files and folders' => 'Дозволе за датотеке и фасцикле',
 		'Recursive write permissions for %1$s user on %2$s' => 'Рекурзивне дозволе за писање за корисника %1$s на %2$s',
 		'Recommended PHP parameters' => 'Препоручени ПХП параметри',
-		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!' => 'Користите верзију ПХП %s. Ускоро ће најновија верзија ПХП-а коју подржава QloApps бити ПХП 5.6. Да бисте били сигурни да сте спремни за будућност, препоручујемо вам да одмах надоградите на ПХП 5.6!',
+		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!' => 'Користите верзију ПХП %s. Ускоро ће најновија верзија ПХП-а коју подржава QloApps бити ПХП 8.1. Да бисте били сигурни да сте спремни за будућност, препоручујемо вам да одмах надоградите на ПХП 8.1!',
 		'PHP register_globals option is enabled' => 'Опција ПХП регистер_глобалс је омогућена',
 		'GZIP compression is not activated' => 'ГЗИП компресија није активирана',
 		'Mbstring extension is not enabled' => 'Мбстринг екстензија није омогућена',
diff --git a/install/langs/sr/mail_identifiers.txt b/install/langs/sr/mail_identifiers.txt
deleted file mode 100644
index bcfc284cd..000000000
--- a/install/langs/sr/mail_identifiers.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Hi {firstname} {lastname},
-
-Here is your personal login information for {shop_name}:
-
-Password: {passwd}
-E-mail address: {email}
-
-{shop_name} - {shop_url}
-
-{shop_url} powered by Webkul™
\ No newline at end of file
diff --git a/install/langs/sv/install.php b/install/langs/sv/install.php
index 15ab8687b..e96edf76e 100644
--- a/install/langs/sv/install.php
+++ b/install/langs/sv/install.php
@@ -65,7 +65,7 @@ return array(
 		'Install Addons modules' => 'Installera tilläggsmoduler',
 		'Install theme' => 'Installera tema',
 		'Required PHP parameters' => 'Nödvändiga PHP-parametrar',
-		'The required PHP version is between 5.6 to 7.4' => 'Den nödvändiga PHP-versionen är mellan 5.6 och 7.4',
+		'The required PHP version is between 8.1 to 8.4' => 'Den nödvändiga PHP-versionen är mellan 8.1 och 8.4',
 		'Cannot upload files' => 'Kan inte ladda upp filer',
 		'Cannot create new files and folders' => 'Det går inte att skapa nya filer och mappar',
 		'GD library is not installed' => 'GD-biblioteket är inte installerat',
@@ -83,7 +83,7 @@ return array(
 		'Permissions on files and folders' => 'Behörigheter för filer och mappar',
 		'Recursive write permissions for %1$s user on %2$s' => 'Rekursiva skrivbehörigheter för %1$s användare på %2$s',
 		'Recommended PHP parameters' => 'Rekommenderade PHP-parametrar',
-		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!' => 'Du använder PHP %s version. Snart kommer den senaste PHP-versionen som stöds av QloApps att vara PHP 5.6. För att vara säker på att du är redo för framtiden rekommenderar vi att du uppgraderar till PHP 5.6 nu!',
+		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!' => 'Du använder PHP %s version. Snart kommer den senaste PHP-versionen som stöds av QloApps att vara PHP 8.1. För att vara säker på att du är redo för framtiden rekommenderar vi att du uppgraderar till PHP 8.1 nu!',
 		'PHP register_globals option is enabled' => 'Alternativet PHP register_globals är aktiverat',
 		'GZIP compression is not activated' => 'GZIP-komprimering är inte aktiverad',
 		'Mbstring extension is not enabled' => 'Mbstring-tillägget är inte aktiverat',
diff --git a/install/langs/sv/mail_identifiers.txt b/install/langs/sv/mail_identifiers.txt
deleted file mode 100644
index bcfc284cd..000000000
--- a/install/langs/sv/mail_identifiers.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Hi {firstname} {lastname},
-
-Here is your personal login information for {shop_name}:
-
-Password: {passwd}
-E-mail address: {email}
-
-{shop_name} - {shop_url}
-
-{shop_url} powered by Webkul™
\ No newline at end of file
diff --git a/install/langs/tr/install.php b/install/langs/tr/install.php
index aa3787e01..fc2729727 100644
--- a/install/langs/tr/install.php
+++ b/install/langs/tr/install.php
@@ -65,7 +65,7 @@ return array(
 		'Install Addons modules' => 'Eklenti modüllerini yükleyin',
 		'Install theme' => 'TEMAYI yükle',
 		'Required PHP parameters' => 'Gerekli PHP parametreleri',
-		'The required PHP version is between 5.6 to 7.4' => 'Gerekli PHP sürümü 5.6 ila 7.4 arasındadır',
+		'The required PHP version is between 8.1 to 8.4' => 'Gerekli PHP sürümü 8.1 ila 8.4 arasındadır',
 		'Cannot upload files' => 'Dosyalar yüklenemiyor',
 		'Cannot create new files and folders' => 'Yeni dosya ve klasörler oluşturulamıyor',
 		'GD library is not installed' => 'GD kütüphanesi kurulu değil',
@@ -83,7 +83,7 @@ return array(
 		'Permissions on files and folders' => 'Dosya ve klasörlere ilişkin izinler',
 		'Recursive write permissions for %1$s user on %2$s' => '%2$s üzerinde %1$s kullanıcısı için yinelemeli yazma izinleri',
 		'Recommended PHP parameters' => 'Önerilen PHP parametreleri',
-		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!' => 'PHP %s sürümünü kullanıyorsunuz. Yakında QloApps tarafından desteklenen en son PHP sürümü PHP 5.6 olacaktır. Geleceğe hazır olduğunuzdan emin olmak için şimdi PHP 5.6\'ya yükseltmenizi öneririz!',
+		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!' => 'PHP %s sürümünü kullanıyorsunuz. Yakında QloApps tarafından desteklenen en son PHP sürümü PHP 8.1 olacaktır. Geleceğe hazır olduğunuzdan emin olmak için şimdi PHP 8.1\'ya yükseltmenizi öneririz!',
 		'PHP register_globals option is enabled' => 'PHP Register_globals seçeneği etkin',
 		'GZIP compression is not activated' => 'GZIP sıkıştırması etkin değil',
 		'Mbstring extension is not enabled' => 'Mbstring uzantısı etkin değil',
diff --git a/install/langs/tr/mail_identifiers.txt b/install/langs/tr/mail_identifiers.txt
deleted file mode 100644
index bcfc284cd..000000000
--- a/install/langs/tr/mail_identifiers.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Hi {firstname} {lastname},
-
-Here is your personal login information for {shop_name}:
-
-Password: {passwd}
-E-mail address: {email}
-
-{shop_name} - {shop_url}
-
-{shop_url} powered by Webkul™
\ No newline at end of file
diff --git a/install/langs/tw/install.php b/install/langs/tw/install.php
index 2fc5a1f87..e8c2b762b 100644
--- a/install/langs/tw/install.php
+++ b/install/langs/tw/install.php
@@ -65,7 +65,7 @@ return array(
 		'Install Addons modules' => '安裝插件模組',
 		'Install theme' => '安裝主題',
 		'Required PHP parameters' => '所需的 PHP 參數',
-		'The required PHP version is between 5.6 to 7.4' => '所需的 PHP 版本在 5.6 到 7.4 之間',
+		'The required PHP version is between 8.1 to 8.4' => '所需的 PHP 版本在 8.1 到 8.4 之間',
 		'Cannot upload files' => '無法上傳文件',
 		'Cannot create new files and folders' => '無法建立新檔案和資料夾',
 		'GD library is not installed' => 'GD庫未安裝',
@@ -83,7 +83,7 @@ return array(
 		'Permissions on files and folders' => '文件和資料夾的權限',
 		'Recursive write permissions for %1$s user on %2$s' => '%1$s 使用者對 %2$s 的遞歸寫入權限',
 		'Recommended PHP parameters' => '推薦的 PHP 參數',
-		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!' => '您正在使用 PHP %s 版本。很快，QloApps 支援的最新 PHP 版本將是 PHP 5.6。為了確保您為未來做好準備，我們建議您立即升級至 PHP 5.6！',
+		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!' => '您正在使用 PHP %s 版本。很快，QloApps 支援的最新 PHP 版本將是 PHP 8.1。為了確保您為未來做好準備，我們建議您立即升級至 PHP 8.1！',
 		'PHP register_globals option is enabled' => 'PHP register_globals 選項已啟用',
 		'GZIP compression is not activated' => 'GZIP 壓縮未激活',
 		'Mbstring extension is not enabled' => 'Mbstring 擴充功能未啟用',
diff --git a/install/langs/tw/mail_identifiers.txt b/install/langs/tw/mail_identifiers.txt
deleted file mode 100644
index a7bcf3215..000000000
--- a/install/langs/tw/mail_identifiers.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-{lastname}{firstname}您好，
-
-您在 {shop_name} 的帳號資訊如下：
-
-密碼： {passwd}
-信箱： {email}
-
-{shop_name} - {shop_url}
-
-{shop_url} 是透過 Webkul™ 建置
\ No newline at end of file
diff --git a/install/langs/vn/install.php b/install/langs/vn/install.php
index de68f101b..cb2872d3f 100644
--- a/install/langs/vn/install.php
+++ b/install/langs/vn/install.php
@@ -65,7 +65,7 @@ return array(
 		'Install Addons modules' => 'Cài đặt mô-đun Addons',
 		'Install theme' => 'Cài đặt chủ đề',
 		'Required PHP parameters' => 'Các tham số PHP bắt buộc',
-		'The required PHP version is between 5.6 to 7.4' => 'Phiên bản PHP yêu cầu là từ 5.6 đến 7.4',
+		'The required PHP version is between 8.1 to 8.4' => 'Phiên bản PHP yêu cầu là từ 8.1 đến 8.4',
 		'Cannot upload files' => 'Không thể tải tập tin lên',
 		'Cannot create new files and folders' => 'Không thể tạo tập tin và thư mục mới',
 		'GD library is not installed' => 'Thư viện GD chưa được cài đặt',
@@ -83,7 +83,7 @@ return array(
 		'Permissions on files and folders' => 'Quyền trên tập tin và thư mục',
 		'Recursive write permissions for %1$s user on %2$s' => 'Quyền ghi đệ quy cho người dùng %1$s trên %2$s',
 		'Recommended PHP parameters' => 'Tham số PHP được đề xuất',
-		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!' => 'Bạn đang sử dụng phiên bản PHP %s. Sắp tới, phiên bản PHP mới nhất được QloApps hỗ trợ sẽ là PHP 5.6. Để đảm bảo bạn đã sẵn sàng cho tương lai, chúng tôi khuyên bạn nên nâng cấp lên PHP 5.6 ngay bây giờ!',
+		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!' => 'Bạn đang sử dụng phiên bản PHP %s. Sắp tới, phiên bản PHP mới nhất được QloApps hỗ trợ sẽ là PHP 8.1. Để đảm bảo bạn đã sẵn sàng cho tương lai, chúng tôi khuyên bạn nên nâng cấp lên PHP 8.1 ngay bây giờ!',
 		'PHP register_globals option is enabled' => 'Tùy chọn PHP register_globals được bật',
 		'GZIP compression is not activated' => 'Tính năng nén GZIP chưa được kích hoạt',
 		'Mbstring extension is not enabled' => 'Tiện ích mở rộng Mbstring chưa được bật',
diff --git a/install/langs/vn/mail_identifiers.txt b/install/langs/vn/mail_identifiers.txt
deleted file mode 100644
index bcfc284cd..000000000
--- a/install/langs/vn/mail_identifiers.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Hi {firstname} {lastname},
-
-Here is your personal login information for {shop_name}:
-
-Password: {passwd}
-E-mail address: {email}
-
-{shop_name} - {shop_url}
-
-{shop_url} powered by Webkul™
\ No newline at end of file
diff --git a/install/langs/zh/install.php b/install/langs/zh/install.php
index 608b84499..d5adaf7cd 100644
--- a/install/langs/zh/install.php
+++ b/install/langs/zh/install.php
@@ -65,7 +65,7 @@ return array(
 		'Install Addons modules' => '安装附加模块',
 		'Install theme' => '安装主题',
 		'Required PHP parameters' => '必需的 PHP 参数',
-		'The required PHP version is between 5.6 to 7.4' => '所需 PHP 版本介于 5.6 至 7.4 之间',
+		'The required PHP version is between 8.1 to 8.4' => '所需 PHP 版本介于 8.1 至 8.4 之间',
 		'Cannot upload files' => '无法上传文件',
 		'Cannot create new files and folders' => '无法创建新文件和文件夹',
 		'GD library is not installed' => '未安装 GD 库',
@@ -83,7 +83,7 @@ return array(
 		'Permissions on files and folders' => '文件和文件夹的权限',
 		'Recursive write permissions for %1$s user on %2$s' => '%2$s 上 %1$s 用户的递归写入权限',
 		'Recommended PHP parameters' => '推荐的 PHP 参数',
-		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 5.6. To make sure you’re ready for the future, we recommend you to upgrade to PHP 5.6 now!' => '您正在使用 PHP %s 版本。很快，QloApps 支持的最新 PHP 版本将是 PHP 5.6。为了确保您为未来做好准备，我们建议您立即升级到 PHP 5.6！',
+		'You are using PHP %s version. Soon, the latest PHP version supported by QloApps will be PHP 8.1. To make sure you’re ready for the future, we recommend you to upgrade to PHP 8.1 now!' => '您正在使用 PHP %s 版本。很快，QloApps 支持的最新 PHP 版本将是 PHP 8.1。为了确保您为未来做好准备，我们建议您立即升级到 PHP 8.1！',
 		'PHP register_globals option is enabled' => 'PHP register_globals 选项已启用',
 		'GZIP compression is not activated' => '未激活 GZIP 压缩',
 		'Mbstring extension is not enabled' => 'Mbstring 扩展未启用',
diff --git a/install/langs/zh/mail_identifiers.txt b/install/langs/zh/mail_identifiers.txt
deleted file mode 100644
index bcfc284cd..000000000
--- a/install/langs/zh/mail_identifiers.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Hi {firstname} {lastname},
-
-Here is your personal login information for {shop_name}:
-
-Password: {passwd}
-E-mail address: {email}
-
-{shop_name} - {shop_url}
-
-{shop_url} powered by Webkul™
\ No newline at end of file
diff --git a/install/models/install.php b/install/models/install.php
index 5acdb9312..3e95362ae 100644
--- a/install/models/install.php
+++ b/install/models/install.php
@@ -34,6 +34,11 @@ class InstallModelInstall extends InstallAbstractModel
      */
     public $logger;
 
+    /**
+    * @var array
+    */
+    public $xml_loader_ids = [];
+
     public function __construct()
     {
         parent::__construct();
diff --git a/install/models/mail.php b/install/models/mail.php
deleted file mode 100644
index 3e4534d7a..000000000
--- a/install/models/mail.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/*
-* 2007-2017 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License (OSL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/osl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2017 PrestaShop SA
-*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-
-class InstallModelMail extends InstallAbstractModel
-{
-    /**
-     * @param bool $smtp_checked
-     * @param string $server
-     * @param string $login
-     * @param string $password
-     * @param int $port
-     * @param string $encryption
-     * @param string $email
-     */
-    public function __construct($smtp_checked, $server, $login, $password, $port, $encryption, $email)
-    {
-        parent::__construct();
-
-        require_once(_PS_CORE_DIR_.'/tools/swift/swift_required.php');
-
-        $this->smtp_checked = $smtp_checked;
-        $this->server = $server;
-        $this->login = $login;
-        $this->password = $password;
-        $this->port = $port;
-        $this->encryption = $encryption;
-        $this->email = $email;
-    }
-
-    /**
-     * Send a mail
-     *
-     * @param string $subject
-     * @param string $content
-     * @return bool|string false is everything was fine, or error string
-     */
-    public function send($subject, $content)
-    {
-        try {
-            // Test with custom SMTP connection
-            if ($this->smtp_checked) {
-                // Retrocompatibility
-                if (Tools::strtolower($this->encryption) === 'off') {
-                    $this->encryption = false;
-                }
-                $smtp = Swift_SmtpTransport::newInstance($this->server, $this->port, $this->encryption);
-                $smtp->setUsername($this->login);
-                $smtp->setpassword($this->password);
-                $smtp->setTimeout(5);
-                $swift = Swift_Mailer::newInstance($smtp);
-            } else {
-                // Test with normal PHP mail() call
-                $swift = Swift_Mailer::newInstance(Swift_MailTransport::newInstance());
-            }
-
-            $message = Swift_Message::newInstance();
-
-            $message
-                ->setFrom($this->email)
-                ->setTo('no-reply@'.Tools::getHttpHost(false, false, true))
-                ->setSubject($subject)
-                ->setBody($content);
-            $message = new Swift_Message($subject, $content, 'text/html');
-            if (@$swift->send($message)) {
-                $result = true;
-            } else {
-                $result = 'Could not send message';
-            }
-
-            $swift->disconnect();
-        } catch (Swift_SwiftException $e) {
-            $result = $e->getMessage();
-        }
-
-        return $result;
-    }
-}
diff --git a/install/theme/views/configure.phtml b/install/theme/views/configure.phtml
index 8165dd116..557d7d996 100644
--- a/install/theme/views/configure.phtml
+++ b/install/theme/views/configure.phtml
@@ -14,7 +14,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 	<div class="field clearfix">
 		<label for="infosShop" class="aligned"><?php echo $this->l('Website name') ?> </label>
 		<div class="contentinput">
-			<input class="text required" type="text" id="infosShop" name="shop_name" value="<?php echo htmlspecialchars($this->session->shop_name) ?>" /> <sup class="required">*</sup>
+			<input class="text required" type="text" id="infosShop" name="shop_name" value="<?php echo htmlspecialchars($this->session->shop_name ?? '') ?>" /> <sup class="required">*</sup>
 		</div>
 		<?php echo $this->displayError('shop_name') ?>
 	</div>
@@ -120,7 +120,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 	<div class="field clearfix">
 		<label for="infosFirstname" class="aligned"><?php echo $this->l('First name') ?> </label>
 		<div class="contentinput">
-			<input class="text required" type="text" id="infosFirstname" name="admin_firstname" value="<?php echo htmlspecialchars($this->session->admin_firstname) ?>" />
+			<input class="text required" type="text" id="infosFirstname" name="admin_firstname" value="<?php echo htmlspecialchars($this->session->admin_firstname ?? '') ?>" />
 			<sup class="required">*</sup>
 		</div>
 		<?php echo $this->displayError('admin_firstname') ?>
@@ -130,7 +130,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 	<div class="field clearfix">
 		<label for="infosName" class="aligned"><?php echo $this->l('Last name') ?> </label>
 		<div class="contentinput">
-			<input class="text required" type="text" id="infosName" name="admin_lastname" value="<?php echo htmlspecialchars($this->session->admin_lastname) ?>" />
+			<input class="text required" type="text" id="infosName" name="admin_lastname" value="<?php echo htmlspecialchars($this->session->admin_lastname ?? '') ?>" />
 			<sup class="required">*</sup>
 		</div>
 		<?php echo $this->displayError('admin_lastname') ?>
@@ -140,7 +140,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 	<div class="field clearfix">
 		<label for="infosEmail" class="aligned"><?php echo $this->l('E-mail address') ?> </label>
 		<div class="contentinput">
-			<input type="text" class="text required" id="infosEmail" name="admin_email" value="<?php echo htmlspecialchars($this->session->admin_email) ?>" />
+			<input type="text" class="text required" id="infosEmail" name="admin_email" value="<?php echo htmlspecialchars($this->session->admin_email ?? '') ?>" />
 			<sup class="required">*</sup>
 		</div>
 		<p class="userInfos aligned"><?php echo $this->l('This email address will be your username to access your website\'s back office.') ?></p>
@@ -151,7 +151,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 	<div class="field clearfix">
 		<label for="infosPassword" class="aligned"><?php echo $this->l('Password') ?> </label>
 		<div class="contentinput">
-			<input autocomplete="off" type="password" class="text required" id="infosPassword" name="admin_password" value="<?php echo htmlspecialchars($this->session->admin_password) ?>" />
+			<input autocomplete="off" type="password" class="text required" id="infosPassword" name="admin_password" value="<?php echo htmlspecialchars($this->session->admin_password ?? '') ?>" />
 			<sup class="required">*</sup>
 		</div>
 		<?php if ($this->displayError('admin_password')): ?>
@@ -165,7 +165,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 	<div class="field clearfix">
 		<label class="aligned" for="infosPasswordRepeat"><?php echo $this->l('Re-type to confirm') ?> </label>
 		<div class="contentinput">
-			<input type="password" autocomplete="off" class="text required" id="infosPasswordRepeat" name="admin_password_confirm" value="<?php echo htmlspecialchars($this->session->admin_password_confirm) ?>" />
+			<input type="password" autocomplete="off" class="text required" id="infosPasswordRepeat" name="admin_password_confirm" value="<?php echo htmlspecialchars($this->session->admin_password_confirm ?? '') ?>" />
 			<sup class="required">*</sup>
 		</div>
 		<?php echo $this->displayError('admin_password_confirm') ?>
diff --git a/install/upgrade/php/update_order_canada.php b/install/upgrade/php/update_order_canada.php
index 96080fa5f..35caedf78 100644
--- a/install/upgrade/php/update_order_canada.php
+++ b/install/upgrade/php/update_order_canada.php
@@ -76,12 +76,12 @@ function update_order_canada()
                 // PS_TAX_EXC = 1, PS_TAX_INC = 0
                 if ($tax_calculation_method == 1) {
                     $total_product = $product['product_price'] * $product['product_quantity'];
-                    $amount_tmp = update_order_canada_ps_round($total_product * ($product['tax_rate'] / 100), 2);
-                    $amount[$product['tax_name']]['amount'] += update_order_canada_ps_round($total_product * ($product['tax_rate'] / 100), 2);
+                    $amount_tmp = update_order_canada_ps_round($total_product * ($product['tax_rate'] / 100));
+                    $amount[$product['tax_name']]['amount'] += update_order_canada_ps_round($total_product * ($product['tax_rate'] / 100));
                 } else {
                     $total_product = $product['product_price'] * $product['product_quantity'];
-                    $amount_tmp = update_order_canada_ps_round($total_product - ($total_product / (1 + ($product['tax_rate'] / 100))), 2);
-                    $amount[$product['tax_name']]['amount'] += update_order_canada_ps_round($total_product - ($total_product / (1 + ($product['tax_rate'] / 100))), 2);
+                    $amount_tmp = update_order_canada_ps_round($total_product - ($total_product / (1 + ($product['tax_rate'] / 100))));
+                    $amount[$product['tax_name']]['amount'] += update_order_canada_ps_round($total_product - ($total_product / (1 + ($product['tax_rate'] / 100))));
                 }
                 }
 
diff --git a/modules/bankwire/bankwire.php b/modules/bankwire/bankwire.php
index 7f336cfa5..b395b10a0 100644
--- a/modules/bankwire/bankwire.php
+++ b/modules/bankwire/bankwire.php
@@ -44,7 +44,6 @@ class Bankwire extends PaymentModule
         $this->version = '1.1.6';
         $this->author = 'PrestaShop';
         $this->controllers = array('payment', 'validation');
-        $this->is_eu_compatible = 1;
 
         $this->currencies = true;
         $this->currencies_mode = 'checkbox';
@@ -300,7 +299,6 @@ class Bankwire extends PaymentModule
         $lang = new Language((int)Configuration::get('PS_LANG_DEFAULT'));
         $helper->default_form_language = $lang->id;
         $helper->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0;
-        $this->fields_form = array();
         $helper->id = (int)Tools::getValue('id_carrier');
         $helper->identifier = $this->identifier;
         $helper->submit_action = 'btnSubmit';
diff --git a/modules/blockcart/blockcart.php b/modules/blockcart/blockcart.php
index 17f8f28d3..8fd804e22 100644
--- a/modules/blockcart/blockcart.php
+++ b/modules/blockcart/blockcart.php
@@ -617,8 +617,6 @@ class Blockcart extends Module
         $lang = new Language((int) Configuration::get('PS_LANG_DEFAULT'));
         $helper->default_form_language = $lang->id;
         $helper->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0;
-        $this->fields_form = array();
-
         $helper->identifier = $this->identifier;
         $helper->submit_action = 'submitBlockCart';
         $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false).'&configure='.$this->name.'&tab_module='.$this->tab
diff --git a/modules/blockcart/controllers/front/checkroomavailabilityajaxprocess.php b/modules/blockcart/controllers/front/checkroomavailabilityajaxprocess.php
index 4aaaf9f5a..035ccf99d 100644
--- a/modules/blockcart/controllers/front/checkroomavailabilityajaxprocess.php
+++ b/modules/blockcart/controllers/front/checkroomavailabilityajaxprocess.php
@@ -18,7 +18,7 @@ class BlockcartCheckRoomAvailabilityAjaxProcessModuleFrontController extends Mod
             require_once (_PS_MODULE_DIR_.'hotelreservationsystem/define.php');
             if (Tools::getValue('delete_room_form_cart')) {
                 $objBookingDetail = new HotelBookingDetail();
-                $numDays = $objBookingDetail->getNumberOfDays($dateFrom, $dateTo);
+                $numDays = HotelHelper::getNumberOfDays($dateFrom, $dateTo);
                 $objCartBooking = new HotelCartBookingData();
                 $objRoomType = new HotelRoomType();
                 $totalAvailRooms = 0;
diff --git a/modules/blocknewsletter/blocknewsletter.php b/modules/blocknewsletter/blocknewsletter.php
index 9806d9cc8..94250124d 100644
--- a/modules/blocknewsletter/blocknewsletter.php
+++ b/modules/blocknewsletter/blocknewsletter.php
@@ -40,6 +40,14 @@ class Blocknewsletter extends Module
     const EXPORT_SUBSCRIBERS_WITHOUT_ACCOUNT = 3;
     const EXPORT_NON_SUBSCRIBERS = 4;
 
+    public $secure_key;
+    protected $hookPrepared = false;
+    protected $_html;
+    protected $_files;
+    public $valid;
+    public $error;
+
+
     public function __construct()
     {
         $this->name = 'blocknewsletter';
@@ -748,7 +756,7 @@ class Blocknewsletter extends Module
         if (!$this->uninstall(false)) {
             return false;
         }
-        if (!$this->install(false)) {
+        if (!$this->install()) {
             return false;
         }
 
diff --git a/modules/blocknewsletter/controllers/admin/AdminNewsletterController.php b/modules/blocknewsletter/controllers/admin/AdminNewsletterController.php
index 2e19512ad..d4397da6d 100644
--- a/modules/blocknewsletter/controllers/admin/AdminNewsletterController.php
+++ b/modules/blocknewsletter/controllers/admin/AdminNewsletterController.php
@@ -135,7 +135,7 @@ class AdminNewsletterController extends ModuleAdminController
         return $tpl->fetch();
     }
 
-    public function displayViewCustomerLink($token = null, $id, $name = null)
+    public function displayViewCustomerLink($token, $id, $name = null)
     {
         if (Customer::customerIdExistsStatic($id)) {
             $tpl = $this->context->smarty->createTemplate(
diff --git a/modules/cheque/cheque.php b/modules/cheque/cheque.php
index 41d630569..fc888108d 100644
--- a/modules/cheque/cheque.php
+++ b/modules/cheque/cheque.php
@@ -43,7 +43,6 @@ class Cheque extends PaymentModule
 		$this->version = '2.6.7';
 		$this->author = 'PrestaShop';
 		$this->controllers = array('payment', 'validation');
-		$this->is_eu_compatible = 1;
 
 		$this->currencies = true;
 		$this->currencies_mode = 'checkbox';
@@ -272,7 +271,6 @@ class Cheque extends PaymentModule
 		$lang = new Language((int)Configuration::get('PS_LANG_DEFAULT'));
 		$helper->default_form_language = $lang->id;
 		$helper->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0;
-		$this->fields_form = array();
 		$helper->id = (int)Tools::getValue('id_carrier');
 		$helper->identifier = $this->identifier;
 		$helper->submit_action = 'btnSubmit';
diff --git a/modules/dashactivity/dashactivity.php b/modules/dashactivity/dashactivity.php
index 598e28be4..8eef1a264 100644
--- a/modules/dashactivity/dashactivity.php
+++ b/modules/dashactivity/dashactivity.php
@@ -32,6 +32,8 @@ class Dashactivity extends Module
 {
     protected static $colors = array('#1F77B4', '#FF7F0E', '#2CA02C');
 
+    protected $push_filename;
+
     public function __construct()
     {
         $this->name = 'dashactivity';
@@ -484,7 +486,6 @@ class Dashactivity extends Module
         $lang = new Language((int)Configuration::get('PS_LANG_DEFAULT'));
         $helper->default_form_language = $lang->id;
         $helper->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0;
-        $this->fields_form = array();
         $helper->id = (int)Tools::getValue('id_carrier');
         $helper->identifier = $this->identifier;
         $helper->submit_action = 'submitDashConfig';
diff --git a/modules/dashavailability/dashavailability.php b/modules/dashavailability/dashavailability.php
index ab3bcc863..98d200c77 100644
--- a/modules/dashavailability/dashavailability.php
+++ b/modules/dashavailability/dashavailability.php
@@ -35,7 +35,7 @@ class DashAvailability extends Module
         parent::__construct();
         $this->displayName = $this->l('Dashboard Availability');
         $this->description = $this->l('Adds a block with a graphical representation of availability of your hotel`s room.');
-        $this->confirmUnsinstall = $this->l('Are you sure you want to uninstall?');
+        $this->confirmUninstall = $this->l('Are you sure you want to uninstall?');
 
         $this->allow_push = true;
     }
diff --git a/modules/dashguestcycle/dashguestcycle.php b/modules/dashguestcycle/dashguestcycle.php
index ade5cd28e..ff2c69b53 100644
--- a/modules/dashguestcycle/dashguestcycle.php
+++ b/modules/dashguestcycle/dashguestcycle.php
@@ -35,7 +35,7 @@ class DashGuestCycle extends Module
         parent::__construct();
         $this->displayName = $this->l('Dashboard Guest Cycle');
         $this->description = $this->l('Adds a block with a graphical representation of guest cycle stats.');
-        $this->confirmUnsinstall = $this->l('Are you sure you want to uninstall?');
+        $this->confirmUninstall = $this->l('Are you sure you want to uninstall?');
 
         $this->allow_push = true;
     }
diff --git a/modules/dashinsights/dashinsights.php b/modules/dashinsights/dashinsights.php
index 1cff0cb60..affaf8633 100644
--- a/modules/dashinsights/dashinsights.php
+++ b/modules/dashinsights/dashinsights.php
@@ -35,7 +35,7 @@ class DashInsights extends Module
         parent::__construct();
         $this->displayName = $this->l('Dashboard Booking Insights');
         $this->description = $this->l('Adds a block with a graphical representation of booking insights.');
-        $this->confirmUnsinstall = $this->l('Are you sure you want to uninstall?');
+        $this->confirmUninstall = $this->l('Are you sure you want to uninstall?');
 
         $this->allow_push = true;
     }
diff --git a/modules/dashoccupancy/dashoccupancy.php b/modules/dashoccupancy/dashoccupancy.php
index 4f5c0ae02..0244ab7b2 100644
--- a/modules/dashoccupancy/dashoccupancy.php
+++ b/modules/dashoccupancy/dashoccupancy.php
@@ -35,7 +35,7 @@ class DashOccupancy extends Module
         parent::__construct();
         $this->displayName = $this->l('Dashboard Occupancy');
         $this->description = $this->l('Adds a block with a graphical representation of occupancy of your hotel`s room.');
-        $this->confirmUnsinstall = $this->l('Are you sure you want to uninstall?');
+        $this->confirmUninstall = $this->l('Are you sure you want to uninstall?');
 
         $this->allow_push = true;
     }
diff --git a/modules/dashperformance/dashperformance.php b/modules/dashperformance/dashperformance.php
index 3e09452a0..c931d4ffa 100644
--- a/modules/dashperformance/dashperformance.php
+++ b/modules/dashperformance/dashperformance.php
@@ -35,7 +35,7 @@ class DashPerformance extends Module
         parent::__construct();
         $this->displayName = $this->l('Dashboard Performance');
         $this->description = $this->l('Adds a block with a graphical representation of performance of your website.');
-        $this->confirmUnsinstall = $this->l('Are you sure you want to uninstall?');
+        $this->confirmUninstall = $this->l('Are you sure you want to uninstall?');
 
         $this->allow_push = true;
     }
diff --git a/modules/dashproducts/dashproducts.php b/modules/dashproducts/dashproducts.php
index 1a738874d..30b43f1b1 100644
--- a/modules/dashproducts/dashproducts.php
+++ b/modules/dashproducts/dashproducts.php
@@ -30,6 +30,8 @@ if (!defined('_PS_VERSION_')) {
 
 class DashProducts extends Module
 {
+	protected $push_filename;
+
 	public function __construct()
 	{
 		$this->name = 'dashproducts';
@@ -124,7 +126,7 @@ class DashProducts extends Module
 		$table_recent_orders = $this->getTableRecentOrders($params['id_hotel']);
 		$table_best_sellers = $this->getTableBestSellers($params['date_from'], $params['date_to'], $params['id_hotel']);
 		$table_most_viewed = $this->getTableMostViewed($params['date_from'], $params['date_to'], $params['id_hotel']);
-		$table_top_10_most_search = $this->getTableTop10MostSearch($params['date_from'], $params['date_to'], $params['id_hotel']);
+		$table_top_10_most_search = $this->getTableTop10MostSearch($params['date_from'], $params['date_to']);
 
 		//$table_top_5_search = $this->getTableTop5Search();
 		return array(
@@ -685,7 +687,6 @@ class DashProducts extends Module
 		$lang = new Language((int)Configuration::get('PS_LANG_DEFAULT'));
 		$helper->default_form_language = $lang->id;
 		$helper->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0;
-		$this->fields_form = array();
 		$helper->id = (int)Tools::getValue('id_carrier');
 		$helper->identifier = $this->identifier;
 		$helper->submit_action = 'submitDashConfig';
diff --git a/modules/dashtrends/dashtrends.php b/modules/dashtrends/dashtrends.php
index f61ade311..b7b178878 100644
--- a/modules/dashtrends/dashtrends.php
+++ b/modules/dashtrends/dashtrends.php
@@ -35,6 +35,7 @@ class Dashtrends extends Module
     protected $dashboard_data_sum;
     protected $dashboard_data_sum_compare;
     protected $data_trends;
+    protected $push_filename;
 
     public function __construct()
     {
diff --git a/modules/hotelreservationsystem/classes/HotelAdvancedPayment.php b/modules/hotelreservationsystem/classes/HotelAdvancedPayment.php
index b2702b310..2cf0eca5b 100644
--- a/modules/hotelreservationsystem/classes/HotelAdvancedPayment.php
+++ b/modules/hotelreservationsystem/classes/HotelAdvancedPayment.php
@@ -370,8 +370,7 @@ class HotelAdvancedPayment extends ObjectModel
                         $prodAdvPayInfo['value'] = Tools::convertPrice($prodAdvPayInfo['value']);
 
                         $numdays = 0;
-                        $objBookingDtl = new HotelBookingDetail();
-                        $numdays = $objBookingDtl->getNumberOfDays($dateFrom, $dateTo);
+                        $numdays = HotelHelper::getNumberOfDays($dateFrom, $dateTo);
 
                         if ($prodRawPriceTE < $prodAdvPayInfo['value']) {
                             $advPaymentAmount = $prodRawPriceTE * $numdays;
diff --git a/modules/hotelreservationsystem/classes/HotelBookingDemands.php b/modules/hotelreservationsystem/classes/HotelBookingDemands.php
index 8cca590ba..b89b30303 100644
--- a/modules/hotelreservationsystem/classes/HotelBookingDemands.php
+++ b/modules/hotelreservationsystem/classes/HotelBookingDemands.php
@@ -35,6 +35,10 @@ class HotelBookingDemands extends ObjectModel
     /** @var TaxCalculator object */
     public $tax_calculator = null;
 
+    protected $documentsBaseDir;
+    protected $sourceIndexFile;
+    protected $documentFolder;
+
     public static $definition = array(
         'table' => 'htl_booking_demands',
         'primary' => 'id_booking_demand',
@@ -200,7 +204,7 @@ class HotelBookingDemands extends ObjectModel
                     $quantity = 1;
                     if ($this->price_calc_method == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) {
                         $objBkDetail = new HotelBookingDetail($this->id_htl_booking);
-                        $quantity = $objBkDetail->getNumberOfDays($objBkDetail->date_from, $objBkDetail->date_to);
+                        $quantity = HotelHelper::getNumberOfDays($objBkDetail->date_from, $objBkDetail->date_to);
                     }
 
                     // Rounding as per configurations
@@ -265,7 +269,7 @@ class HotelBookingDemands extends ObjectModel
                 $objBkDemand = new HotelBookingDemands($detail['id_booking_demand']);
                 if ($objBkDemand->price_calc_method == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) {
                     $objBkDetail = new HotelBookingDetail($detail['id_htl_booking']);
-                    $numDays = $objBkDetail->getNumberOfDays($objBkDetail->date_from, $objBkDetail->date_to);
+                    $numDays = HotelHelper::getNumberOfDays($objBkDetail->date_from, $objBkDetail->date_to);
                 }
 
                 $totalTaxBase = $priceTaxExcl * $numDays;
diff --git a/modules/hotelreservationsystem/classes/HotelBookingDetail.php b/modules/hotelreservationsystem/classes/HotelBookingDetail.php
index ceec86d3a..d15b53785 100644
--- a/modules/hotelreservationsystem/classes/HotelBookingDetail.php
+++ b/modules/hotelreservationsystem/classes/HotelBookingDetail.php
@@ -66,7 +66,7 @@ class HotelBookingDetail extends ObjectModel
 
     public $date_add;
     public $date_upd;
-
+    protected $moduleInstance;
     const STATUS_ALLOTED = 1;
     const STATUS_CHECKED_IN = 2;
     const STATUS_CHECKED_OUT = 3;
@@ -269,7 +269,7 @@ class HotelBookingDetail extends ObjectModel
      */
     public function getBookingData($params)
     {
-        $this->context = Context::getContext();
+        $context = Context::getContext();
 
         // extract all keys and values of the array [$params] into variables and values
         extract($this->getBookingDataParams($params));
@@ -280,11 +280,11 @@ class HotelBookingDetail extends ObjectModel
             $date_to = date('Y-m-d H:i:s', strtotime($date_to));
 
             $objRoomType = new HotelRoomType();
-            $lengthOfStay = $this->getNumberOfDays($date_from, $date_to);
+            $lengthOfStay = HotelHelper::getNumberOfDays($date_from, $date_to);
 
             // Check LOS restriction for back-office
             $applyLosRestriction = true;
-            if (isset($this->context->employee->id)) {
+            if (isset($context->employee->id)) {
                 if (!Configuration::get('PS_LOS_RESTRICTION_BO')) {
                     $applyLosRestriction = false;
                 }
@@ -500,11 +500,11 @@ class HotelBookingDetail extends ObjectModel
      */
     protected function getSearchUnavailableRooms($params)
     {
-        $this->context = Context::getContext();
+        $context = Context::getContext();
         // Check LOS restriction for back-office
         if (!isset($params['applyLosRestriction'])) {
             $applyLosRestriction = true;
-            if (isset($this->context->employee->id)) {
+            if (isset($context->employee->id)) {
                 if (!Configuration::get('PS_LOS_RESTRICTION_BO')) {
                     $applyLosRestriction = false;
                 }
@@ -513,7 +513,7 @@ class HotelBookingDetail extends ObjectModel
 
         extract($params);
 
-        $lengthOfStay = $this->getNumberOfDays($dateFrom, $dateTo);
+        $lengthOfStay = HotelHelper::getNumberOfDays($dateFrom, $dateTo);
         $stayStartDate = date('Y-m-d', strtotime($dateFrom));
 
         // Room status inactive
@@ -660,11 +660,11 @@ class HotelBookingDetail extends ObjectModel
      */
     protected function getSearchAvailableRooms($params)
     {
-        $this->context = Context::getContext();
+        $context = Context::getContext();
         // Check LOS restriction for back-office
         if (!isset($params['applyLosRestriction'])) {
             $applyLosRestriction = true;
-            if (isset($this->context->employee->id)) {
+            if (isset($context->employee->id)) {
                 if (!Configuration::get('PS_LOS_RESTRICTION_BO')) {
                     $applyLosRestriction = false;
                 }
@@ -674,9 +674,9 @@ class HotelBookingDetail extends ObjectModel
         extract($params);
 
         $stayStartDate = date('Y-m-d', strtotime($dateFrom));
-        $lengthOfStay = $this->getNumberOfDays($dateFrom, $dateTo);
+        $lengthOfStay = HotelHelper::getNumberOfDays($dateFrom, $dateTo);
 
-        if (isset($this->context->employee->id)) {
+        if (isset($context->employee->id)) {
             $QLO_OWS_SEARCH_ALGO_TYPE = Configuration::get('PS_BACKOFFICE_OWS_SEARCH_ALGO_TYPE');
             $QLO_SEARCH_TYPE = Configuration::get('PS_BACKOFFICE_SEARCH_TYPE');
         } else {
@@ -1066,7 +1066,7 @@ class HotelBookingDetail extends ObjectModel
 
         if ($part_arr) {
             // Occupancy Wise Search OR Normal Search
-            if (isset($this->context->employee->id)) {
+            if (isset($context->employee->id)) {
                 $QLO_SEARCH_TYPE = Configuration::get('PS_BACKOFFICE_SEARCH_TYPE');
             } else {
                 $QLO_SEARCH_TYPE = Configuration::get('PS_FRONT_SEARCH_TYPE');
@@ -1674,7 +1674,7 @@ class HotelBookingDetail extends ObjectModel
      */
     public function dataForFrontSearch($bookingParams)
     {
-        $this->context = Context::getContext();
+        $context = Context::getContext();
 
         if (!isset($bookingParams['search_available'])) {
             $bookingParams['search_available'] = 1;
@@ -1697,7 +1697,7 @@ class HotelBookingDetail extends ObjectModel
         if (!$only_search_data) {
             if (!empty($bookingData)) {
                 foreach ($bookingData['rm_data'] as $key => $value) {
-                    $product_feature = Product::getFrontFeaturesStatic($this->context->language->id, $value['id_product']);
+                    $product_feature = Product::getFrontFeaturesStatic($context->language->id, $value['id_product']);
                     $prod_amen = array();
                     if (!empty($amenities) && $amenities) {
                         $prod_amen = $amenities;
@@ -1725,9 +1725,9 @@ class HotelBookingDetail extends ObjectModel
                         $productPriceWithoutReduction = HotelRoomTypeFeaturePricing::getRoomTypeFeaturePricesPerDay($value['id_product'], $date_from, $date_to, self::useTax(), 0, 0, 0, 0, 1, 0, $bookingParams['occupancy']);
                         $cover_image_arr = Product::getCover($value['id_product']);
                         if (!empty($cover_image_arr)) {
-                            $cover_img = $this->context->link->getImageLink($value['link_rewrite'], $value['id_product'].'-'.$cover_image_arr['id_image'], 'home_default');
+                            $cover_img = $context->link->getImageLink($value['link_rewrite'], $value['id_product'].'-'.$cover_image_arr['id_image'], 'home_default');
                         } else {
-                            $cover_img = $this->context->link->getImageLink($value['link_rewrite'], $this->context->language->iso_code.'-default', 'home_default');
+                            $cover_img = $context->link->getImageLink($value['link_rewrite'], $context->language->iso_code.'-default', 'home_default');
                         }
                         $bookingData['rm_data'][$key]['image'] = $cover_img;
                         $bookingData['rm_data'][$key]['feature'] = $product_feature;
@@ -1750,9 +1750,9 @@ class HotelBookingDetail extends ObjectModel
                         }
 
                         if (Configuration::get('PS_REWRITING_SETTINGS')) {
-                            $bookingData['rm_data'][$key]['product_link'] = $this->context->link->getProductLink($value['id_product']).'?'.http_build_query($urlData);
+                            $bookingData['rm_data'][$key]['product_link'] = $context->link->getProductLink($value['id_product']).'?'.http_build_query($urlData);
                         } else {
-                            $bookingData['rm_data'][$key]['product_link'] = $this->context->link->getProductLink($value['id_product']).'&'.http_build_query($urlData);
+                            $bookingData['rm_data'][$key]['product_link'] = $context->link->getProductLink($value['id_product']).'&'.http_build_query($urlData);
                         }
                     }
                 }
@@ -1895,7 +1895,7 @@ class HotelBookingDetail extends ObjectModel
                 $objOrder = new Order($objOldHotelBooking->id_order);
                 $objOldOrderDetail = new OrderDetail($objOldHotelBooking->id_order_detail);
 
-                $productQty = (int)$objOldHotelBooking->getNumberOfDays($objOldHotelBooking->date_from, $objOldHotelBooking->date_to);
+                $productQty = (int) HotelHelper::getNumberOfDays($objOldHotelBooking->date_from, $objOldHotelBooking->date_to);
                 $oldRoomPriceTaxExcl = $objOldHotelBooking->total_price_tax_excl / $productQty;
 
                 // Calculate new room price per qty
@@ -1925,10 +1925,10 @@ class HotelBookingDetail extends ObjectModel
                 $cart->add();
 
                 // Save context (in order to apply cart rule)
-                $this->context = Context::getContext();
-                $this->context->cart = $cart;
-                $this->context->customer = new Customer($objOrder->id_customer);
-                $this->context->currency = new Currency($objOrder->id_currency);
+                $context = Context::getContext();
+                $context->cart = $cart;
+                $context->customer = new Customer($objOrder->id_customer);
+                $context->currency = new Currency($objOrder->id_currency);
 
                 // always add taxes even if not displayed to the customer
                 $useTaxes = true;
@@ -1953,8 +1953,8 @@ class HotelBookingDetail extends ObjectModel
                 if ($createFeaturePrice) {
                     $featurePriceParams = array();
                     $featurePriceParams = array(
-                        'id_cart' => $this->context->cart->id,
-                        'id_guest' => $this->context->cookie->id_guest,
+                        'id_cart' => $context->cart->id,
+                        'id_guest' => $context->cookie->id_guest,
                         'price' => $newRoomPriceTaxExcl,
                         'id_product' => $idNewRoomType,
                     );
@@ -1974,8 +1974,8 @@ class HotelBookingDetail extends ObjectModel
                     if ($availableRooms = $roomAvailabilityInfo['rm_data'][$idNewRoomType]['data']['available']) {
                         $roomInfo = reset($availableRooms);
                         $objCartBookingData = new HotelCartBookingData();
-                        $objCartBookingData->id_cart = $this->context->cart->id;
-                        $objCartBookingData->id_guest = $this->context->cookie->id_guest;
+                        $objCartBookingData->id_cart = $context->cart->id;
+                        $objCartBookingData->id_guest = $context->cookie->id_guest;
                         $objCartBookingData->id_customer = $objOrder->id_customer;
                         $objCartBookingData->id_currency = $objOrder->id_currency;
                         $objCartBookingData->id_product = $roomInfo['id_product'];
@@ -2051,8 +2051,8 @@ class HotelBookingDetail extends ObjectModel
                 $idNewOrderDetail = $objBookingDetail->getLastInsertedRoomIdOrderDetail($objOrder->id);
                 $objCartBookingData = new HotelCartBookingData();
                 if ($cartBookingsData = $objCartBookingData->getOnlyCartBookingData(
-                    $this->context->cart->id,
-                    $this->context->cart->id_guest,
+                    $context->cart->id,
+                    $context->cart->id_guest,
                     $idNewRoomType
                 )) {
                     foreach ($cartBookingsData as $cartBookingInfo) {
@@ -2064,7 +2064,7 @@ class HotelBookingDetail extends ObjectModel
                         $objBookingDetail->id_product = $idNewRoomType;
                         $objBookingDetail->id_order = $objOrder->id;
                         $objBookingDetail->id_order_detail = $idNewOrderDetail;
-                        $objBookingDetail->id_cart = $this->context->cart->id;
+                        $objBookingDetail->id_cart = $context->cart->id;
                         $objBookingDetail->id_room = $objCartBookingData->id_room;
                         $objBookingDetail->id_hotel = $objCartBookingData->id_hotel;
                         $objBookingDetail->id_customer = $objOrder->id_customer;
@@ -2092,8 +2092,8 @@ class HotelBookingDetail extends ObjectModel
                             $objCartBookingData->date_to,
                             $occupancy,
                             Group::getCurrent()->id,
-                            $this->context->cart->id,
-                            $this->context->cookie->id_guest,
+                            $context->cart->id,
+                            $context->cookie->id_guest,
                             $objCartBookingData->id_room,
                             0
                         );
@@ -2107,13 +2107,13 @@ class HotelBookingDetail extends ObjectModel
                         }
                         if (Validate::isLoadedObject($objHotelBranch = new HotelBranchInformation(
                             $objCartBookingData->id_hotel,
-                            $this->context->cart->id_lang
+                            $context->cart->id_lang
                         ))) {
                             $addressInfo = $objHotelBranch->getAddress($objCartBookingData->id_hotel);
                             $objBookingDetail->hotel_name = $objHotelBranch->hotel_name;
                             $objBookingDetail->city = $addressInfo['city'];
                             $objBookingDetail->state = State::getNameById($addressInfo['id_state']);
-                            $objBookingDetail->country = Country::getNameById($this->context->cart->id_lang, $addressInfo['id_country']);
+                            $objBookingDetail->country = Country::getNameById($context->cart->id_lang, $addressInfo['id_country']);
                             $objBookingDetail->zipcode = $addressInfo['postcode'];;
                             $objBookingDetail->phone = $addressInfo['phone'];
                             $objBookingDetail->email = $objHotelBranch->email;
@@ -2174,7 +2174,7 @@ class HotelBookingDetail extends ObjectModel
                 }
 
                 // delete cart feature prices after room addition success
-                HotelRoomTypeFeaturePricing::deleteFeaturePrices($this->context->cart->id);
+                HotelRoomTypeFeaturePricing::deleteFeaturePrices($context->cart->id);
 
                 // ===============================================================
                 // END: Add Process of the old booking
@@ -2590,7 +2590,7 @@ class HotelBookingDetail extends ObjectModel
             $objHotelCartBookingData = new HotelCartBookingData($idHotelCartBookingData);
             if (Validate::isLoadedObject($objHotelCartBookingData)) {
                 // calculate new prices
-                $newNumDays = $this->getNumberOfDays($newDateFrom, $newDateTo);
+                $newNumDays = HotelHelper::getNumberOfDays($newDateFrom, $newDateTo);
 
                 // update $objHotelCartBookingData
                 $objHotelCartBookingData->date_from = $newDateFrom;
@@ -2678,7 +2678,7 @@ class HotelBookingDetail extends ObjectModel
                 $order_detail_data[$key]['unit_price_without_reduction_tax_excl'] = $objOrderDetail->unit_price_tax_excl + $objOrderDetail->reduction_amount_tax_excl;
                 $order_detail_data[$key]['unit_price_without_reduction_tax_incl'] = $objOrderDetail->unit_price_tax_incl + $objOrderDetail->reduction_amount_tax_incl;
 
-                $num_days = $this->getNumberOfDays($value['date_from'], $value['date_to']);
+                $num_days = HotelHelper::getNumberOfDays($value['date_from'], $value['date_to']);
                 $order_detail_data[$key]['quantity'] = $num_days;
                 $order_detail_data[$key]['paid_unit_price_tax_excl'] = $value['total_price_tax_excl'] / $num_days;
                 $order_detail_data[$key]['paid_unit_price_tax_incl'] = $value['total_price_tax_incl'] / $num_days;
@@ -2860,7 +2860,7 @@ class HotelBookingDetail extends ObjectModel
                 $objCustomer->email = $customeremail;
                 $objCustomer->passwd = 'qloChannelCustomer';
                 $objCustomer->save();
-                $this->context->customer = $objCustomer;
+                $context->customer = $objCustomer;
                 $customerId = $objCustomer->id;
             } else {
                 $customerId = $customer_dtl[0]['id_customer']; //if already exist customer
@@ -2906,41 +2906,41 @@ class HotelBookingDetail extends ObjectModel
      */
     public function createQloCartForBookingFromChannel($params)
     {
-        $this->context = Context::getContext();
+        $context = Context::getContext();
         if ($params) {
-            if (!isset($this->context->cookie->id_guest)) {
-                Guest::setNewGuest($this->context->cookie);
+            if (!isset($context->cookie->id_guest)) {
+                Guest::setNewGuest($context->cookie);
             }
-            $this->context->cart = new Cart();
+            $context->cart = new Cart();
             $idCustomer = (int)$params['id_customer'];
             $customer = new Customer((int)$idCustomer);
-            $this->context->customer = $customer;
-            $this->context->cart->id_customer = $idCustomer;
-            if (Validate::isLoadedObject($this->context->cart) && $this->context->cart->OrderExists()) {
+            $context->customer = $customer;
+            $context->cart->id_customer = $idCustomer;
+            if (Validate::isLoadedObject($context->cart) && $context->cart->OrderExists()) {
                 return;
             }
-            if (!$this->context->cart->secure_key) {
-                $this->context->cart->secure_key = $this->context->customer->secure_key;
+            if (!$context->cart->secure_key) {
+                $context->cart->secure_key = $context->customer->secure_key;
             }
-            if (!$this->context->cart->id_shop) {
-                $this->context->cart->id_shop = (int)Configuration::get('PS_SHOP_DEFAULT');
+            if (!$context->cart->id_shop) {
+                $context->cart->id_shop = (int)Configuration::get('PS_SHOP_DEFAULT');
             }
-            if (!$this->context->cart->id_lang) {
-                $this->context->cart->id_lang = Configuration::get('PS_LANG_DEFAULT');
+            if (!$context->cart->id_lang) {
+                $context->cart->id_lang = Configuration::get('PS_LANG_DEFAULT');
             }
-            if (!$this->context->cart->id_currency) {
-                $this->context->cart->id_currency = Configuration::get('PS_CURRENCY_DEFAULT');
+            if (!$context->cart->id_currency) {
+                $context->cart->id_currency = Configuration::get('PS_CURRENCY_DEFAULT');
             }
 
-            $addresses = $customer->getAddresses((int)$this->context->cart->id_lang);
+            $addresses = $customer->getAddresses((int)$context->cart->id_lang);
 
-            if (!$this->context->cart->id_address_invoice && isset($addresses[0])) {
-                $this->context->cart->id_address_invoice = (int)$addresses[0]['id_address'];
+            if (!$context->cart->id_address_invoice && isset($addresses[0])) {
+                $context->cart->id_address_invoice = (int)$addresses[0]['id_address'];
             }
-            $this->context->cart->setNoMultishipping();
+            $context->cart->setNoMultishipping();
 
-            if ($this->context->cart->save()) {
-                return $this->context->cart->id;
+            if ($context->cart->save()) {
+                return $context->cart->id;
             }
         }
         return false;
@@ -2953,7 +2953,7 @@ class HotelBookingDetail extends ObjectModel
      */
     public function ProcessCreateQloOrderForChannelBooking($params)
     {
-        $this->context = Context::getContext();
+        $context = Context::getContext();
         $this->errors = array();
         $id_cart = $params['id_cart'];
         $date_from = date("Y-m-d", strtotime($params['date_from']));
@@ -2961,7 +2961,7 @@ class HotelBookingDetail extends ObjectModel
         $id_product = $params['id_room_type'];
 
         $objBookingDetail = new HotelBookingDetail();
-        $num_day = $objBookingDetail->getNumberOfDays($date_from, $date_to); //quantity of product
+        $num_day = HotelHelper::getNumberOfDays($date_from, $date_to); //quantity of product
         $product = new Product($id_product, false, Configuration::get('PS_LANG_DEFAULT'));
         $obj_room_type = new HotelRoomType();
         $room_info_by_id_product = $obj_room_type->getRoomTypeInfoByIdProduct($id_product);
@@ -2988,7 +2988,7 @@ class HotelBookingDetail extends ObjectModel
                     'id_room_type' => $id_product,
                     'only_search_data' => 1,
                     'id_cart' => $id_cart,
-                    'id_guest' => $this->context->cookie->id_guest,
+                    'id_guest' => $context->cookie->id_guest,
                 );
                 $hotel_room_data = $objBookingDetail->dataForFrontSearch($bookingParams);
                 $total_available_rooms = $hotel_room_data['stats']['num_avail'];
@@ -3007,21 +3007,21 @@ class HotelBookingDetail extends ObjectModel
 
             $direction = 'up';
 
-            $update_quantity = $this->context->cart->updateQty($num_day*$params['req_qty'], $id_product, null, false, $direction);
+            $update_quantity = $context->cart->updateQty($num_day*$params['req_qty'], $id_product, null, false, $direction);
 
             /*
             * To add Rooms in hotel cart
             */
-            $id_customer = $this->context->cart->id_customer;
-            $id_currency = $this->context->cart->id_currency;
+            $id_customer = $context->cart->id_customer;
+            $id_currency = $context->cart->id_currency;
 
             $hotel_room_info_arr = $hotel_room_data['rm_data'][$id_product]['data']['available'];
             $chkQty = 0;
             foreach ($hotel_room_info_arr as $key_hotel_room_info => $val_hotel_room_info) {
                 if ($chkQty < $params['req_qty']) {
                     $obj_htl_cart_booking_data = new HotelCartBookingData();
-                    $obj_htl_cart_booking_data->id_cart = $this->context->cart->id;
-                    $obj_htl_cart_booking_data->id_guest = $this->context->cookie->id_guest;
+                    $obj_htl_cart_booking_data->id_cart = $context->cart->id;
+                    $obj_htl_cart_booking_data->id_guest = $context->cookie->id_guest;
                     $obj_htl_cart_booking_data->id_customer = $id_customer;
                     $obj_htl_cart_booking_data->id_currency = $id_currency;
                     $obj_htl_cart_booking_data->id_product = $val_hotel_room_info['id_product'];
@@ -3038,11 +3038,11 @@ class HotelBookingDetail extends ObjectModel
                 }
             }
             $channelOrderPayment = new ChannelOrderPayment();
-            $total_amount = (float)$this->context->cart->getOrderTotal(true, Cart::BOTH);
+            $total_amount = (float)$context->cart->getOrderTotal(true, Cart::BOTH);
             //$this->module = Module::getInstanceByName('hotelreservationsystem');
-            $orderCreated = $channelOrderPayment->validateOrder((int) $this->context->cart->id, (int) 2, (float) $total_amount, 'Channel Manager Booking', null, array(), null, false, $this->context->cart->secure_key);
+            $orderCreated = $channelOrderPayment->validateOrder((int) $context->cart->id, (int) 2, (float) $total_amount, 'Channel Manager Booking', null, array(), null, false, $context->cart->secure_key);
             if ($orderCreated) {
-                $idOrder = Order::getOrderByCartId($this->context->cart->id);
+                $idOrder = Order::getOrderByCartId($context->cart->id);
                 $order = new Order($idOrder);
                 $order->source = 'Channel Manager Booking';
                 if ($idOrder) {
@@ -3456,7 +3456,7 @@ class HotelBookingDetail extends ObjectModel
             // enter refunded quantity in the order detail table
             $idOrderDetail = $this->id_order_detail;
             if (Validate::isLoadedObject($objOrderDetail = new OrderDetail($idOrderDetail))) {
-                $numDays = $this->getNumberOfDays(
+                $numDays = HotelHelper::getNumberOfDays(
                     $this->date_from,
                     $this->date_to
                 );
diff --git a/modules/hotelreservationsystem/classes/HotelBranchInformation.php b/modules/hotelreservationsystem/classes/HotelBranchInformation.php
index 3d25346be..375b148d8 100644
--- a/modules/hotelreservationsystem/classes/HotelBranchInformation.php
+++ b/modules/hotelreservationsystem/classes/HotelBranchInformation.php
@@ -39,6 +39,8 @@ class HotelBranchInformation extends ObjectModel
     public $date_add;
     public $date_upd;
 
+    public $moduleInstance;
+
     public static $definition = array(
         'table' => 'htl_branch_info',
         'primary' => 'id',
@@ -141,7 +143,7 @@ class HotelBranchInformation extends ObjectModel
 
         $this->id_country = $this->id_state = $this->city = $this->zipcode = $this->address = $this->phone = null;
         if ($id) {
-            if ($hotelAddress = $this->getAddress($id)) {
+            if ($hotelAddress = self::getAddress($id)) {
                 $this->id_country = $hotelAddress['id_country'];
                 $this->id_state = $hotelAddress['id_state'];
                 $this->city = $hotelAddress['city'];
@@ -174,7 +176,7 @@ class HotelBranchInformation extends ObjectModel
      * @param Context $context
      * @return bool true if succeed
      */
-    protected function initAccess($idHotel, Context $context = null)
+    protected function initAccess($idHotel, ?Context $context = null)
     {
         if (!$context) {
             $context = Context::getContext();
@@ -660,12 +662,61 @@ class HotelBranchInformation extends ObjectModel
         return $return;
     }
 
-    public function addCategory($name, $parent_cat = false, $group_ids, $ishotel = false, $idHotel = false, $link_rewrite = false, $meta_title = false, $meta_description = false, $meta_keywords = false)
+    public function getCategoryParams($params)
     {
-        $context = Context::getContext();
-        if (!$parent_cat) {
-            $parent_cat = Configuration::get('PS_LOCATIONS_CATEGORY');
+        if (!isset($params['parent_category'])) {
+            $params['parent_category'] = false;
         }
+
+        if (!isset($params['is_hotel'])) {
+            $params['is_hotel'] = false;
+        }
+
+        if (!isset($params['id_hotel'])) {
+            $params['id_hotel'] = 0;
+        }
+
+        if (!isset($params['link_rewrite'])) {
+            $params['link_rewrite'] = false;
+        }
+
+        if (!isset($params['meta_title'])) {
+            $params['meta_title'] = false;
+        }
+
+        if (!isset($params['meta_description'])) {
+            $params['meta_description'] = false;
+        }
+
+        if (!isset($params['meta_keywords'])) {
+            $params['meta_keywords'] = false;
+        }
+
+        return $params;
+    }
+
+    /**
+     * Send parameters in array form
+     * @param array $params
+     *  $params['name']: [name of the category]
+     *  $params['group_ids']: [group_ids of the category]
+     *  $params['parent_category']: [parent_category of the category]
+     *  $params['is_hotel']: [is_hotel = 1 if category is for hotel]
+     *  $params['id_hotel']: [id_hotel of the category, if category is for hotel]
+     *  $params['link_rewrite']: [link_rewrite of the category]
+     *  $params['meta_title']: [meta_title of the category]
+     *  $params['meta_description']: [meta_description of the category]
+     *  $params['meta_keywords']: [meta_keywords of the category]
+     * @return int  returns ID of the category added.
+     */
+    public function addCategory(array $params)
+    {
+        extract($this->getCategoryParams($params));
+        $context = Context::getContext();
+        if (!$parent_category) {
+        $parent_category = Configuration::get('PS_LOCATIONS_CATEGORY');
+        }
+
         if (is_array($name) && isset($name[Configuration::get('PS_LANG_DEFAULT')])) {
             $catName = $name[Configuration::get('PS_LANG_DEFAULT')];
         } else {
@@ -674,7 +725,7 @@ class HotelBranchInformation extends ObjectModel
         if ($categoryExists = Category::searchByNameAndParentCategoryId(
             Configuration::get('PS_LANG_DEFAULT'),
             $catName,
-            $parent_cat
+            $parent_category
         )) {
             if (is_array($link_rewrite)) {
                 $objCategory = new Category($categoryExists['id_category']);
@@ -705,8 +756,7 @@ class HotelBranchInformation extends ObjectModel
                     $category->link_rewrite[$lang['id_lang']] = Tools::link_rewrite($catName);
                 }
             }
-            $category->id_parent = $parent_cat;
-            $category->groupBox = $group_ids;
+
             if ($meta_title) {
                 $category->meta_title = $meta_title;
             }
@@ -716,7 +766,11 @@ class HotelBranchInformation extends ObjectModel
             if ($meta_keywords) {
                 $category->meta_keywords = $meta_keywords;
             }
+
+            $category->id_parent = $parent_category;
+            $category->groupBox = $group_ids;
             $category->add();
+
             return $category->id;
         }
     }
@@ -1257,20 +1311,44 @@ class HotelBranchInformation extends ObjectModel
                 $linkRewriteArray[$lang['id_lang']] = Tools::link_rewrite($this->hotel_name[$lang['id_lang']]);
             }
 
-            if ($catCountry = $this->addCategory($countryName, false, $groupIds)) {
+            if ($catCountry = $this->addCategory(
+                array (
+                    'name' => $countryName,
+                    'group_ids' => $groupIds,
+                    'parent_category' => false
+                )
+            )) {
                 if ($this->id_state) {
                     $objState = new State();
                     $stateName = $objState->getNameById($this->id_state);
-
-                    $catState = $this->addCategory($stateName, $catCountry, $groupIds);
                 } else {
-                    $catState = $this->addCategory($this->city, $catCountry, $groupIds);
+                    $stateName = $this->city;
                 }
-                if ($catState) {
-                    if ($catCity = $this->addCategory($this->city, $catState, $groupIds)) {
+
+                if ($catState = $this->addCategory(
+                    array (
+                        'name' => $stateName,
+                        'group_ids' => $groupIds,
+                        'parent_category' => $catCountry
+                    )
+                )) {
+                    if ($catCity = $this->addCategory(
+                        array (
+                            'name' => $this->city,
+                            'group_ids' => $groupIds,
+                            'parent_category' => $catState
+                        )
+                    )) {
                         $hotelCatName = $this->hotel_name[Configuration::get('PS_LANG_DEFAULT')];
                         if ($catHotel = $this->addCategory(
-                            $hotelCatName, $catCity, $groupIds, 1, $this->id, $linkRewriteArray
+                            array (
+                                'name' => $hotelCatName,
+                                'group_ids' => $groupIds,
+                                'parent_category' => $catCity,
+                                'is_hotel' => 1,
+                                'id_hotel' => $this->id,
+                                'link_rewrite' => $linkRewriteArray
+                            )
                         )) {
                             $this->id_category = $catHotel;
                             $this->save();
diff --git a/modules/hotelreservationsystem/classes/HotelHelper.php b/modules/hotelreservationsystem/classes/HotelHelper.php
index 9e8e85a38..f313ddcaa 100644
--- a/modules/hotelreservationsystem/classes/HotelHelper.php
+++ b/modules/hotelreservationsystem/classes/HotelHelper.php
@@ -1755,29 +1755,34 @@ class HotelHelper
         }
         $obj_country = new Country();
         $country_name = $obj_country->getNameById(Configuration::get('PS_LANG_DEFAULT'), $def_cont_id);
-        $cat_country = $this->addCategory($country_name, false, $grp_ids);
 
-        if ($cat_country) {
+        if ($cat_country = $this->addCategory(array('name' => $country_name, 'group_ids' => $grp_ids, 'parent_category' => false))) {
             $states = State::getStatesByIdCountry($def_cont_id);
             if (count($states) > 0) {
                 $state_name = $states[0]['name'];
-                $cat_state = $this->addCategory($state_name, $cat_country, $grp_ids);
+                $cat_state = $this->addCategory(array('name' => $state_name, 'group_ids' => $grp_ids, 'parent_category' => $cat_country));
             }
         }
         if (count($states) > 0) {
-            if ($cat_state) {
-                $cat_city = $this->addCategory('Demo City', $cat_state, $grp_ids);
+            if (!empty($cat_state)) {
+                $cat_city = $this->addCategory(array('name' => 'Demo City', 'group_ids' => $grp_ids, 'parent_category' => $cat_state));
             }
         } else {
-            $cat_city = $this->addCategory('Demo City', $cat_country, $grp_ids);
+            $cat_city = $this->addCategory(array('name' => 'Demo City', 'group_ids' => $grp_ids, 'parent_category' => $cat_country));
         }
-        if ($cat_city) {
-            $cat_hotel = $this->addCategory('The Hotel Prime', $cat_city, $grp_ids, 1, $htl_id);
-        }
-        if ($cat_hotel) {
-            $obj_hotel_info = new HotelBranchInformation($htl_id);
-            $obj_hotel_info->id_category = $cat_hotel;
-            $obj_hotel_info->save();
+        if (!empty($cat_city)) {
+            if ($cat_hotel = $this->addCategory(array(
+                    'name' => 'The Hotel Prime',
+                    'group_ids' => $grp_ids,
+                    'parent_category' => $cat_city,
+                    'is_hotel' => 1,
+                    'id_hotel' => $htl_id
+                )
+            )) {
+                $obj_hotel_info = new HotelBranchInformation($htl_id);
+                $obj_hotel_info->id_category = $cat_hotel;
+                $obj_hotel_info->save();
+            }
         }
         // save dummy hotel as primary hotel
         Configuration::updateValue('WK_PRIMARY_HOTEL', $htl_id);
@@ -2462,10 +2467,58 @@ class HotelHelper
         return true;
     }
 
-    public function addCategory($name, $parent_cat = false, $group_ids, $ishotel = false, $hotel_id = false)
+    public function getCategoryParams($params)
     {
-        if (!$parent_cat) {
-            $parent_cat = Configuration::get('PS_LOCATIONS_CATEGORY');
+        if (!isset($params['parent_category'])) {
+            $params['parent_category'] = false;
+        }
+
+        if (!isset($params['is_hotel'])) {
+            $params['is_hotel'] = false;
+        }
+
+        if (!isset($params['id_hotel'])) {
+            $params['id_hotel'] = 0;
+        }
+
+        if (!isset($params['link_rewrite'])) {
+            $params['link_rewrite'] = false;
+        }
+
+        if (!isset($params['meta_title'])) {
+            $params['meta_title'] = false;
+        }
+
+        if (!isset($params['meta_description'])) {
+            $params['meta_description'] = false;
+        }
+
+        if (!isset($params['meta_keywords'])) {
+            $params['meta_keywords'] = false;
+        }
+
+        return $params;
+    }
+
+    /**
+     * Send parameters in array form
+     * @param array $params
+     *  $params['name']: [name of the category]
+     *  $params['group_ids']: [group_ids of the category]
+     *  $params['parent_category']: [parent_category of the category]
+     *  $params['is_hotel']: [is_hotel = 1 if category is for hotel]
+     *  $params['id_hotel']: [id_hotel of the category, if category is for hotel]
+     *  $params['link_rewrite']: [link_rewrite of the category]
+     *  $params['meta_title']: [meta_title of the category]
+     *  $params['meta_description']: [meta_description of the category]
+     *  $params['meta_keywords']: [meta_keywords of the category]
+     * @return int  returns ID of the category added.
+     */
+    public function addCategory(array $params)
+    {
+        extract($this->getCategoryParams($params));
+        if (!$parent_category) {
+            $parent_category = Configuration::get('PS_LOCATIONS_CATEGORY');
         }
 
         if (!is_array($name)) {
@@ -2474,7 +2527,7 @@ class HotelHelper
 
         $defaultCatName = $name['en'];
         $languages = Language::getLanguages(true);
-        if ($ishotel && $hotel_id) {
+        if ($is_hotel && $id_hotel) {
             $cat_id_hotel = Db::getInstance()->getValue(
                 'SELECT `id_category` FROM `'._DB_PREFIX_.'htl_branch_info` WHERE id='.$hotel_id
             );
@@ -2494,7 +2547,7 @@ class HotelHelper
                         $obj_cat->link_rewrite[$lang['id_lang']] = Tools::link_rewrite($defaultCatName);
                     }
                 }
-                $obj_cat->id_parent = $parent_cat;
+                $obj_cat->id_parent = $parent_category;
                 $obj_cat->groupBox = $group_ids;
                 $obj_cat->save();
                 $cat_id = $obj_cat->id;
@@ -2504,7 +2557,7 @@ class HotelHelper
         }
 
         $context = Context::getContext();
-        $check_category_exists = Category::searchByNameAndParentCategoryId($context->language->id, $defaultCatName, $parent_cat);
+        $check_category_exists = Category::searchByNameAndParentCategoryId($context->language->id, $defaultCatName, $parent_category);
 
         if ($check_category_exists) {
             return $check_category_exists['id_category'];
diff --git a/modules/hotelreservationsystem/classes/HotelImage.php b/modules/hotelreservationsystem/classes/HotelImage.php
index e3e538706..228f79b99 100644
--- a/modules/hotelreservationsystem/classes/HotelImage.php
+++ b/modules/hotelreservationsystem/classes/HotelImage.php
@@ -23,7 +23,8 @@ class HotelImage extends ObjectModel
     public $id;
     public $id_hotel;
     public $cover;
-
+    public $source_index;
+    public $image_dir;
     public $image_format = 'jpg';
 
     protected static $access_rights = 0755;
diff --git a/modules/hotelreservationsystem/classes/HotelRoomTypeDemand.php b/modules/hotelreservationsystem/classes/HotelRoomTypeDemand.php
index 7be39da7f..83c33c49e 100644
--- a/modules/hotelreservationsystem/classes/HotelRoomTypeDemand.php
+++ b/modules/hotelreservationsystem/classes/HotelRoomTypeDemand.php
@@ -20,8 +20,8 @@
 
 class HotelRoomTypeDemand extends ObjectModel
 {
-    public $idProduct;
-    public $idGlobalDemand;
+    public $id_product;
+    public $id_global_demand;
     public $date_add;
     public $date_upd;
 
diff --git a/modules/hotelreservationsystem/classes/HotelRoomTypeDemandPrice.php b/modules/hotelreservationsystem/classes/HotelRoomTypeDemandPrice.php
index f4b37ffe0..1ef50d943 100644
--- a/modules/hotelreservationsystem/classes/HotelRoomTypeDemandPrice.php
+++ b/modules/hotelreservationsystem/classes/HotelRoomTypeDemandPrice.php
@@ -89,7 +89,7 @@ class HotelRoomTypeDemandPrice extends ObjectModel
                 }
                 if ($objGlobalDemand->price_calc_method == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) {
                     if ($dateFrom && $dateTo) {
-                        $numDays = $objBookingDetail->getNumberOfDays($dateFrom, $dateTo);
+                        $numDays = HotelHelper::getNumberOfDays($dateFrom, $dateTo);
                         if ($numDays > 1) {
                             $price *= $numDays;
                         }
diff --git a/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php b/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php
index d1d59d268..e4c24eb82 100644
--- a/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php
+++ b/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php
@@ -49,6 +49,8 @@ class HotelRoomTypeFeaturePricing extends ObjectModel
     const IMPACT_TYPE_PERCENTAGE = 1;
     const IMPACT_TYPE_FIXED_PRICE = 2;
 
+    protected $moduleInstance;
+
     public static $definition = array(
         'table' => 'htl_room_type_feature_pricing',
         'primary' => 'id_feature_price',
@@ -263,7 +265,7 @@ class HotelRoomTypeFeaturePricing extends ObjectModel
      * @param  [date]  $date_to    [end date of the date range]
      * @return [array|false]       [returns array containing rates of room type of a hotel if found else returns false]
      */
-    public function getHotelRoomTypesRatesAndInventoryByDate($id_hotel, $id_product=0, $date_from, $date_to)
+    public function getHotelRoomTypesRatesAndInventoryByDate($id_hotel, $id_product, $date_from, $date_to)
     {
         $hotelRoomType = new HotelRoomType();
         $context = Context::getContext();
@@ -339,7 +341,7 @@ class HotelRoomTypeFeaturePricing extends ObjectModel
      */
     public function updateRoomTypesFeaturePricesAvailability($featurePricePlans)
     {
-        $this->errors = array();
+        $errors = [];
         if ($featurePricePlans) {
             if (isset($featurePricePlans['data']) && $featurePricePlans['data']) {
                 foreach ($featurePricePlans['data'] as $roomTypeRatesData) {
@@ -381,32 +383,31 @@ class HotelRoomTypeFeaturePricing extends ObjectModel
                                             'specific_date'
                                         );
                                         if ($featurePriceExists) {
-                                            if (!$this->saveFeaturePricePlan($featurePriceExists['id'], 2, $params)) {
-                                                $this->errors[] = $this->moduleInstance->l('Some error occured while saving Feature Price Plan Info:: Date From : ', 'HotelRoomTypeFeaturePricing').$params['dateFrom'].$this->moduleInstance->l(' Date To : ', 'HotelRoomTypeFeaturePricing').$params['dateFrom'].$this->moduleInstance->l(' Room Type Id : ', 'HotelRoomTypeFeaturePricing').$params['roomTypeId'];
+                                            if (!$this->saveFeaturePricePlan(2, $params, $featurePriceExists['id'])) {
+                                                $errors[] = $this->moduleInstance->l('Some error occured while saving Feature Price Plan Info:: Date From : ', 'HotelRoomTypeFeaturePricing').$params['dateFrom'].$this->moduleInstance->l(' Date To : ', 'HotelRoomTypeFeaturePricing').$params['dateFrom'].$this->moduleInstance->l(' Room Type Id : ', 'HotelRoomTypeFeaturePricing').$params['roomTypeId'];
                                             }
                                         } else {
-                                            if (!$this->saveFeaturePricePlan(0, 2, $params)) {
-                                                $this->errors[] = $this->moduleInstance->l('Some error occured while saving Feature Price Plan Info:: Date From : ', 'HotelRoomTypeFeaturePricing').$params['dateFrom'].$this->moduleInstance->l(' Date To : ', 'HotelRoomTypeFeaturePricing').$params['dateFrom'].$this->moduleInstance->l(' Room Type Id : ', 'HotelRoomTypeFeaturePricing').$params['roomTypeId'];
+                                            if (!$this->saveFeaturePricePlan(2, $params, 0)) {
+                                                $errors[] = $this->moduleInstance->l('Some error occured while saving Feature Price Plan Info:: Date From : ', 'HotelRoomTypeFeaturePricing').$params['dateFrom'].$this->moduleInstance->l(' Date To : ', 'HotelRoomTypeFeaturePricing').$params['dateFrom'].$this->moduleInstance->l(' Room Type Id : ', 'HotelRoomTypeFeaturePricing').$params['roomTypeId'];
                                             }
                                         }
                                     } else {
                                         $params['dateSelectionType'] = self::DATE_SELECTION_TYPE_RANGE;
-                                        $featurePriceExists = $this->checkRoomTypeFeaturePriceExistance(
+                                        if ($featurePriceExists = $this->checkRoomTypeFeaturePriceExistance(
                                             $id_product,
                                             $dateFrom,
                                             $featurePriceDateTo,
                                             'date_range'
-                                        );
-                                        if ($featurePriceExists) {
+                                        )) {
                                             if ($featurePriceExists['date_from'] == $dateFrom
                                                 && $featurePriceExists['date_to'] == $featurePriceDateTo
                                             ) {
                                                 if (!$this->saveFeaturePricePlan(
-                                                    $featurePriceExists['id'],
                                                     1,
-                                                    $params
+                                                    $params,
+                                                    $featurePriceExists['id']
                                                 )) {
-                                                    $this->errors[] = $this->moduleInstance->l('Some error occured while saving Feature Price Plan Info:: Date From : ', 'HotelRoomTypeFeaturePricing').$params['dateFrom'].$this->moduleInstance->l(' Date To : ', 'HotelRoomTypeFeaturePricing').$params['dateFrom'].$this->moduleInstance->l(' Room Type Id : ', 'HotelRoomTypeFeaturePricing').$params['roomTypeId'];
+                                                    $errors[] = $this->moduleInstance->l('Some error occured while saving Feature Price Plan Info:: Date From : ', 'HotelRoomTypeFeaturePricing').$params['dateFrom'].$this->moduleInstance->l(' Date To : ', 'HotelRoomTypeFeaturePricing').$params['dateFrom'].$this->moduleInstance->l(' Room Type Id : ', 'HotelRoomTypeFeaturePricing').$params['roomTypeId'];
                                                 }
                                             } else {
                                                 for($date = $dateFrom; $date < $dateTo; $date = date('Y-m-d', strtotime('+1 day', strtotime($date)))) {
@@ -423,22 +424,22 @@ class HotelRoomTypeFeaturePricing extends ObjectModel
                                                     );
                                                     if ($featurePriceExists) {
                                                         if (!$this->saveFeaturePricePlan(
-                                                            $featurePriceExists['id'],
                                                             2,
-                                                            $params
+                                                            $params,
+                                                            $featurePriceExists['id']
                                                         )) {
-                                                            $this->errors[] = $this->moduleInstance->l('Some error occured while saving Feature Price Plan Info:: Date From : ', 'HotelRoomTypeFeaturePricing').$params['dateFrom'].$this->moduleInstance->l(' Date To : ', 'HotelRoomTypeFeaturePricing').$params['dateFrom'].$this->moduleInstance->l(' Room Type Id : ', 'HotelRoomTypeFeaturePricing').$params['roomTypeId'];
+                                                            $errors[] = $this->moduleInstance->l('Some error occured while saving Feature Price Plan Info:: Date From : ', 'HotelRoomTypeFeaturePricing').$params['dateFrom'].$this->moduleInstance->l(' Date To : ', 'HotelRoomTypeFeaturePricing').$params['dateFrom'].$this->moduleInstance->l(' Room Type Id : ', 'HotelRoomTypeFeaturePricing').$params['roomTypeId'];
                                                         }
                                                     } else {
-                                                        if (!$this->saveFeaturePricePlan(0, 2, $params)) {
-                                                            $this->errors[] = $this->moduleInstance->l('Some error occured while saving Feature Price Plan Info:: Date From : ', 'HotelRoomTypeFeaturePricing').$params['dateFrom'].$this->moduleInstance->l(' Date To : ', 'HotelRoomTypeFeaturePricing').$params['dateFrom'].$this->moduleInstance->l(' Room Type Id : ', 'HotelRoomTypeFeaturePricing').$params['roomTypeId'];
+                                                        if (!$this->saveFeaturePricePlan(2, $params, 0)) {
+                                                            $errors[] = $this->moduleInstance->l('Some error occured while saving Feature Price Plan Info:: Date From : ', 'HotelRoomTypeFeaturePricing').$params['dateFrom'].$this->moduleInstance->l(' Date To : ', 'HotelRoomTypeFeaturePricing').$params['dateFrom'].$this->moduleInstance->l(' Room Type Id : ', 'HotelRoomTypeFeaturePricing').$params['roomTypeId'];
                                                         }
                                                     }
                                                 }
                                             }
                                         } else {
-                                            if (!$this->saveFeaturePricePlan(0, 1, $params)) {
-                                                $this->errors[] = $this->moduleInstance->l('Some error occured while saving Feature Price Plan Info:: Date From : ', 'HotelRoomTypeFeaturePricing').$params['dateFrom'].$this->moduleInstance->l(' Date To : ', 'HotelRoomTypeFeaturePricing').$params['dateFrom'].$this->moduleInstance->l(' Room Type Id : ', 'HotelRoomTypeFeaturePricing').$params['roomTypeId'];
+                                            if (!$this->saveFeaturePricePlan(1, $params, 0)) {
+                                                $errors[] = $this->moduleInstance->l('Some error occured while saving Feature Price Plan Info:: Date From : ', 'HotelRoomTypeFeaturePricing').$params['dateFrom'].$this->moduleInstance->l(' Date To : ', 'HotelRoomTypeFeaturePricing').$params['dateFrom'].$this->moduleInstance->l(' Room Type Id : ', 'HotelRoomTypeFeaturePricing').$params['roomTypeId'];
                                             }
                                         }
                                     }
@@ -497,7 +498,7 @@ class HotelRoomTypeFeaturePricing extends ObjectModel
                                                                 if (!$objRoomDisableDates->updateDisableDateRanges(
                                                                     $params
                                                                 )) {
-                                                                    $this->errors[] = $this->moduleInstance->l('Some error occurred while saving disable dates for '.$dateFrom.' To '.$dateTo.' for room id-'.$room['id'], 'HotelRoomTypeFeaturePricing');
+                                                                    $errors[] = $this->moduleInstance->l('Some error occurred while saving disable dates for '.$dateFrom.' To '.$dateTo.' for room id-'.$room['id'], 'HotelRoomTypeFeaturePricing');
                                                                 }
                                                             } else {
                                                                 $hotelRoomInformation->id_status = 3;
@@ -534,7 +535,7 @@ class HotelRoomTypeFeaturePricing extends ObjectModel
                                                         if (!$objRoomDisableDates->deleteDisabledDatesForDateRange(
                                                             $params
                                                         )) {
-                                                            $this->errors[] = $this->moduleInstance->l('Some error occurred while saving deleting dates for '.$dateFrom.' To '.$dateTo.' for room id-'.$disableRoom['id'], 'HotelRoomTypeFeaturePricing');
+                                                            $errors[] = $this->moduleInstance->l('Some error occurred while saving deleting dates for '.$dateFrom.' To '.$dateTo.' for room id-'.$disableRoom['id'], 'HotelRoomTypeFeaturePricing');
                                                         }
                                                         $disabledDates = $objRoomDisableDates->getRoomDisableDates(
                                                             $disableRoom['id']
@@ -552,36 +553,24 @@ class HotelRoomTypeFeaturePricing extends ObjectModel
                                     }
                                 }
                             } else {
-                                $this->errors[] = $this->moduleInstance->l(
-                                    'Requested rooms inventory is not available.',
-                                    'HotelRoomTypeFeaturePricing'
-                                );
+                                $errors[] = $this->moduleInstance->l('Requested rooms inventory is not available.', 'HotelRoomTypeFeaturePricing');
                             }
                         }
                     } else {
-                        $this->errors[] = $this->moduleInstance->l(
-                            'Room Types for which Feature prices to be updated are not found.',
-                            'HotelRoomTypeFeaturePricing'
-                        );
+                        $errors[] = $this->moduleInstance->l('Room Types for which Feature prices to be updated are not found.', 'HotelRoomTypeFeaturePricing');
                     }
                 }
             } else {
-                $this->errors[] = $this->moduleInstance->l(
-                    'Update Information not found.',
-                    'HotelRoomTypeFeaturePricing'
-                );
+                $errors[] = $this->moduleInstance->l('Update Information not found.', 'HotelRoomTypeFeaturePricing');
             }
         } else {
-            $this->errors[] = $this->moduleInstance->l(
-                'Update Information not found.',
-                'HotelRoomTypeFeaturePricing'
-            );
+            $errors[] = $this->moduleInstance->l('Update Information not found.', 'HotelRoomTypeFeaturePricing');
         }
 
         $result = array();
-        if (count($this->errors)) {
+        if (count($errors)) {
             $result['status'] = 'failed';
-            $result['errors'] = $this->errors;
+            $result['errors'] = $errors;
         } else {
             $result['status'] = 'success';
         }
@@ -591,12 +580,12 @@ class HotelRoomTypeFeaturePricing extends ObjectModel
 
     /**
      * [saveFeaturePricePlan add or update feature price plan]
-     * @param  integer $id                [id of the feature price plan if 0 means to add else to update the feature price plan]
      * @param  [int]  $dateSelectionType [date selection type 1 or 2 (date range or specific date)]
      * @param  [array]  $params            [Room type rate plan info]
+     * @param  integer $id [id of the feature price plan if 0 means to add else to update the feature price plan]
      * @return [bool]                     [returns true is successfuly added or updated else returns false]
      */
-    public function saveFeaturePricePlan($id = 0, $dateSelectionType, $params)
+    public function saveFeaturePricePlan($dateSelectionType, $params, $id = 0)
     {
         if ($id) {
             $roomTypeFeaturePricing = new HotelRoomTypeFeaturePricing($id);
diff --git a/modules/hotelreservationsystem/classes/WebserviceSpecificManagementQlo.php b/modules/hotelreservationsystem/classes/WebserviceSpecificManagementQlo.php
index d048a24a8..54fd46e89 100644
--- a/modules/hotelreservationsystem/classes/WebserviceSpecificManagementQlo.php
+++ b/modules/hotelreservationsystem/classes/WebserviceSpecificManagementQlo.php
@@ -81,7 +81,9 @@ class WebserviceSpecificManagementQlo implements WebserviceSpecificManagementInt
             if (isset($this->wsObject->urlFragments['outputformat']) && $this->wsObject->urlFragments['outputformat'] == 'json') {
                 $outputXML = simplexml_load_string($outputXML, null, LIBXML_NOCDATA);
                 $json = json_encode($outputXML);
-                $content = preg_replace("/\\\\u([a-f0-9]{4})/e", "iconv('UCS-4LE','UTF-8',pack('V', hexdec('U$1')))", $json);
+                $content = preg_replace_callback("/\\\\u([a-f0-9]{4})/", function ($matches) {
+                    return iconv('UCS-4LE', 'UTF-8', pack('V', hexdec($matches[1])));
+                }, $json);
                 header('Content-Type: application/json');
                 die($content);
             } else {
diff --git a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php
index 41beaeb39..08813efcb 100644
--- a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php
@@ -693,16 +693,34 @@ class AdminAddHotelController extends ModuleAdminController
                 }
                 $objCountry = new Country();
                 $countryName = $objCountry->getNameById(Configuration::get('PS_LANG_DEFAULT'), $country);
-                if ($catCountry = $objHotelBranch->addCategory($countryName, false, $groupIds)) {
+                if ($catCountry = $objHotelBranch->addCategory(
+                    array (
+                        'name' => $countryName,
+                        'group_ids' => $groupIds,
+                        'parent_category' => false
+                    )
+                )) {
                     if ($state) {
                         $objState = new State();
                         $stateName = $objState->getNameById($state);
-                        $catState = $objHotelBranch->addCategory($stateName, $catCountry, $groupIds);
                     } else {
-                        $catState = $objHotelBranch->addCategory($city, $catCountry, $groupIds);
+                        $stateName = $city;
                     }
-                    if ($catState) {
-                        if ($catCity = $objHotelBranch->addCategory($city, $catState, $groupIds)) {
+
+                    if ($catState = $objHotelBranch->addCategory(
+                        array (
+                            'name' => $stateName,
+                            'group_ids' => $groupIds,
+                            'parent_category' => $catCountry
+                        )
+                    )) {
+                        if ($catCity = $objHotelBranch->addCategory(
+                            array (
+                                'name' => $city,
+                                'group_ids' => $groupIds,
+                                'parent_category' => $catState
+                            )
+                        )) {
                             $hotelCatName = $objHotelBranch->hotel_name;
                             // add/update hotel category
                             if ($objHotelBranch->id_category) {
@@ -717,15 +735,17 @@ class AdminAddHotelController extends ModuleAdminController
                                 Category::regenerateEntireNtree();
                             } else {
                                 if ($catHotel = $objHotelBranch->addCategory(
-                                    $hotelCatName,
-                                    $catCity,
-                                    $groupIds,
-                                    1,
-                                    $newIdHotel,
-                                    $linkRewriteArray,
-                                    $metaTitleArray,
-                                    $metaDescriptionArray,
-                                    $metaKeywordsArray
+                                    array (
+                                        'name' => $hotelCatName,
+                                        'group_ids' => $groupIds,
+                                        'parent_category' => $catCity,
+                                        'is_hotel' => 1,
+                                        'id_hotel' => $newIdHotel,
+                                        'link_rewrite' => $linkRewriteArray,
+                                        'meta_title' => $metaTitleArray,
+                                        'meta_description' => $metaDescriptionArray,
+                                        'meta_keywords' => $metaKeywordsArray
+                                    )
                                 )) {
                                     $objHotelBranch = new HotelBranchInformation($newIdHotel);
                                     $objHotelBranch->id_category = $catHotel;
diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelConfigurationSettingController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelConfigurationSettingController.php
index 84368f047..f44afd8f7 100644
--- a/modules/hotelreservationsystem/controllers/admin/AdminHotelConfigurationSettingController.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelConfigurationSettingController.php
@@ -173,10 +173,7 @@ class AdminHotelConfigurationSettingController extends ModuleAdminController
     public function renderForm()
     {
         $smartyVars = array();
-        $idSettingsLink = (int) Tools::getValue($this->identifier);
         $objHotelSettingsLink = $this->loadObject(true);
-
-        $smartyVars['id_hotel_settings_link'] = $idSettingsLink;
         $smartyVars['currentTab'] = $this;
         $smartyVars['currentObject'] = $objHotelSettingsLink;
 
@@ -308,7 +305,7 @@ class AdminHotelConfigurationSettingController extends ModuleAdminController
 
             if (isset($pos[2]) && (int) $pos[2] === $idSettingsLink) {
                 if ($objHotelSettingsLink = new HotelSettingsLink((int) $pos[2])) {
-                    if (isset($position) && $objHotelSettingsLink->updatePosition($way, $position, $idSettingsLink)) {
+                    if (isset($position) && $objHotelSettingsLink->updatePosition($way, $position)) {
                         $this->ajaxDie(json_encode(true));
                     } else {
                         $this->ajaxDie(json_encode(array(
diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php
index 999711379..5a055ecea 100644
--- a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php
@@ -20,6 +20,14 @@
 
 class AdminHotelRoomsBookingController extends ModuleAdminController
 {
+    protected $id_cart;
+    protected $id_guest;
+    protected $id_hotel;
+    protected $id_room_type;
+    protected $date_from;
+    protected $date_to;
+    protected $booking_product;
+    protected $occupancy;
     public function __construct()
     {
         $this->table = 'htl_booking_detail';
@@ -382,7 +390,6 @@ class AdminHotelRoomsBookingController extends ModuleAdminController
             $this->context->smarty->assign(array(
                 'occupancy_adults' => array_sum(array_column($this->occupancy, 'adults')),
                 'occupancy_children' => array_sum(array_column($this->occupancy, 'children')),
-                'occupancy_child_ages' => array_sum(array_column($this->occupancy, 'child_ages')),
             ));
         }
     }
diff --git a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php
index 5e740306c..73ca69f0a 100644
--- a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php
@@ -468,7 +468,7 @@ class AdminOrderRefundRequestsController extends ModuleAdminController
 
                         if (Tools::isSubmit('generateCreditSlip')) {
                             if ($idHtlBooking = $objOrderReturnDetail->id_htl_booking) {
-                                $numDays = $objHtlBooking->getNumberOfDays(
+                                $numDays = HotelHelper::getNumberOfDays(
                                     $objHtlBooking->date_from,
                                     $objHtlBooking->date_to
                                 );
diff --git a/modules/hotelreservationsystem/hotelreservationsystem.php b/modules/hotelreservationsystem/hotelreservationsystem.php
index 4c6c73680..b5e1dca79 100644
--- a/modules/hotelreservationsystem/hotelreservationsystem.php
+++ b/modules/hotelreservationsystem/hotelreservationsystem.php
@@ -199,7 +199,7 @@ class HotelReservationSystem extends Module
                                     1
                                 );
                             } else {
-                                $num_days = $obj_htl_bk_dtl->getNumberOfDays($data_v['date_from'], $data_v['date_to']);
+                                $num_days = HotelHelper::getNumberOfDays($data_v['date_from'], $data_v['date_to']);
 
                                 $cart_htl_data[$type_key]['date_diff'][$date_join]['num_rm'] = 1;
                                 $cart_htl_data[$type_key]['date_diff'][$date_join]['data_form'] = $data_v['date_from'];
diff --git a/modules/hotelreservationsystem/upgrade/upgrade-1.4.0.php b/modules/hotelreservationsystem/upgrade/upgrade-1.4.0.php
index 380414413..a70eb3c76 100644
--- a/modules/hotelreservationsystem/upgrade/upgrade-1.4.0.php
+++ b/modules/hotelreservationsystem/upgrade/upgrade-1.4.0.php
@@ -26,7 +26,7 @@ function upgrade_module_1_4_0($module)
     return ($module->registerHook('actionObjectProfileAddAfter')
         && $module->registerHook('actionObjectProfileDeleteBefore')
         && updateTables()
-        && createDataForNewTables($module)
+        && createDataForNewTables()
     );
 }
 
diff --git a/modules/hotelreservationsystem/upgrade/upgrade-1.4.1.php b/modules/hotelreservationsystem/upgrade/upgrade-1.4.1.php
index c731bf621..724959a4c 100644
--- a/modules/hotelreservationsystem/upgrade/upgrade-1.4.1.php
+++ b/modules/hotelreservationsystem/upgrade/upgrade-1.4.1.php
@@ -124,9 +124,8 @@ function populateRefundData()
         )
         '
     );
-    $objHtlBooking = new HotelBookingDetail();
     foreach($odrRefunds as $odrRefund) {
-        $numDays = $objHtlBooking->getNumberOfDays(
+        $numDays = HotelHelper::getNumberOfDays(
             $odrRefund['date_from'],
             $odrRefund['date_to']
         );
diff --git a/modules/qlochannelmanagerconnector/qlochannelmanagerconnector.php b/modules/qlochannelmanagerconnector/qlochannelmanagerconnector.php
index ebea1b9ad..83edb5590 100644
--- a/modules/qlochannelmanagerconnector/qlochannelmanagerconnector.php
+++ b/modules/qlochannelmanagerconnector/qlochannelmanagerconnector.php
@@ -33,8 +33,6 @@ class QloChannelManagerConnector extends Module
         $this->version = '1.0.0';
         $this->author = 'Webkul';
         $this->bootstrap = true;
-        $this->secure_key = Tools::encrypt($this->name);
-        $this->html = '';
         $this->ps_versions_compliancy = array('min' => '1.6', 'max' => '1.6');
 
         parent::__construct();
diff --git a/modules/qlocleaner/qlocleaner.php b/modules/qlocleaner/qlocleaner.php
index b48915a36..184146fe9 100644
--- a/modules/qlocleaner/qlocleaner.php
+++ b/modules/qlocleaner/qlocleaner.php
@@ -40,14 +40,12 @@ class QloCleaner extends Module
         $this->version = '1.0.1';
         $this->author = 'PrestaShop';
         $this->need_instance = 0;
-        $this->multishop_context = Shop::CONTEXT_ALL;
 
         $this->bootstrap = true;
         parent::__construct();
 
         $this->displayName = $this->l('QloApps Data Cleaner');
         $this->description = $this->l('Check and fix functional integrity constraints and remove default data');
-        $this->secure_key = Tools::encrypt($this->name);
     }
 
     public function install()
@@ -502,7 +500,6 @@ class QloCleaner extends Module
         $lang = new Language((int)Configuration::get('PS_LANG_DEFAULT'));
         $helper->default_form_language = $lang->id;
         $helper->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0;
-        $this->fields_form = array();
         $helper->id = (int)Tools::getValue('id_carrier');
         $helper->identifier = $this->identifier;
         $helper->submit_action = 'btnSubmit';
diff --git a/modules/qlohotelreview/controllers/admin/AdminHotelReviewHotelReview.php b/modules/qlohotelreview/controllers/admin/AdminHotelReviewHotelReview.php
index aad5bba8c..a3a2b418a 100644
--- a/modules/qlohotelreview/controllers/admin/AdminHotelReviewHotelReview.php
+++ b/modules/qlohotelreview/controllers/admin/AdminHotelReviewHotelReview.php
@@ -212,7 +212,7 @@ class AdminHotelReviewHotelReviewController extends ModuleAdminController
         return $tpl->fetch();
     }
 
-    public function displayApproveLink($token = null, $id, $name = null)
+    public function displayApproveLink($token, $id, $name = null)
     {
         $status = null;
         if (array_key_exists($id, $this->cacheStatus)) {
@@ -241,7 +241,7 @@ class AdminHotelReviewHotelReviewController extends ModuleAdminController
         }
     }
 
-    public function displayDisapproveLink($token = null, $id, $name = null)
+    public function displayDisapproveLink($token, $id, $name = null)
     {
         $status = null;
         if (array_key_exists($id, $this->cacheStatus)) {
diff --git a/modules/qlohotelreview/qlohotelreview.php b/modules/qlohotelreview/qlohotelreview.php
index 5d3b7cdec..a87efe181 100644
--- a/modules/qlohotelreview/qlohotelreview.php
+++ b/modules/qlohotelreview/qlohotelreview.php
@@ -26,6 +26,7 @@ require_once 'classes/RequiredFiles.php';
 
 class QloHotelReview extends Module
 {
+    public $secure_key;
     public function __construct()
     {
         $this->name = 'qlohotelreview';
@@ -34,11 +35,13 @@ class QloHotelReview extends Module
         $this->ps_versions_compliancy = array('min' => '1.6', 'max' => '1.6');
         $this->author = 'Webkul';
         $this->bootstrap = true;
+
         parent::__construct();
+
         $this->secure_key = Tools::encrypt($this->name);
         $this->displayName = $this->l('QloApps Hotel Reviews');
         $this->description = $this->l('This module allows guests to review hotels on specific categories.');
-        $this->confirmUnsinstall = $this->l('Are you sure you want to uninstall?');
+        $this->confirmUninstall = $this->l('Are you sure you want to uninstall?');
     }
 
     public function install()
@@ -372,7 +375,7 @@ class QloHotelReview extends Module
         if (!$this->uninstall(false)) {
             return false;
         }
-        if (!$this->install(false)) {
+        if (!$this->install()) {
             return false;
         }
         return true;
diff --git a/modules/qlopaypalcommerce/classes/WkPaypalCommerceHelper.php b/modules/qlopaypalcommerce/classes/WkPaypalCommerceHelper.php
index 389bd3107..250adad44 100644
--- a/modules/qlopaypalcommerce/classes/WkPaypalCommerceHelper.php
+++ b/modules/qlopaypalcommerce/classes/WkPaypalCommerceHelper.php
@@ -475,7 +475,7 @@ class WkPaypalCommerceHelper
         $roomTypeTotalTI = $roomTotalPrice['total_price_tax_incl'];
         $roomTypeTotalTE = $roomTotalPrice['total_price_tax_excl'];
 
-        $rmQty = $objBookingDetail->getNumberOfDays($dateFrom, $dateTo);
+        $rmQty = HotelHelper::getNumberOfDays($dateFrom, $dateTo);
 
         $objAdvPayment = new HotelAdvancedPayment();
         if ($advInfo = $objAdvPayment->getIdAdvPaymentByIdProduct($idProduct)) {
diff --git a/modules/qlopaypalcommerce/qlopaypalcommerce.php b/modules/qlopaypalcommerce/qlopaypalcommerce.php
index 92791cca2..05c0ec881 100644
--- a/modules/qlopaypalcommerce/qlopaypalcommerce.php
+++ b/modules/qlopaypalcommerce/qlopaypalcommerce.php
@@ -35,6 +35,7 @@ class QloPaypalCommerce extends PaymentModule
     public $paypalEmail;
     public $clientId;
     public $clientSecret;
+    public $secure_key;
 
     public function __construct()
     {
@@ -203,7 +204,6 @@ class QloPaypalCommerce extends PaymentModule
         $helper->table = $this->table;
         $lang = new Language((int) Configuration::get('PS_LANG_DEFAULT'));
         $helper->default_form_language = $lang->id;
-        $this->fields_form = array();
         $helper->identifier = $this->identifier;
         $helper->submit_action = 'btnConfigSubmit';
         $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false).
diff --git a/modules/statsbestproducts/statsbestproducts.php b/modules/statsbestproducts/statsbestproducts.php
index 6bf8e40c4..2c3163bd6 100644
--- a/modules/statsbestproducts/statsbestproducts.php
+++ b/modules/statsbestproducts/statsbestproducts.php
@@ -229,8 +229,7 @@ class StatsBestProducts extends ModuleGrid
         $values = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->query);
         $this->_totalCount = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('SELECT FOUND_ROWS()');
 
-        $objHotelBookingDetail = new HotelBookingDetail();
-        $numberOfDays = $objHotelBookingDetail->getNumberOfDays($date_from, $date_to);
+        $numberOfDays = HotelHelper::getNumberOfDays($date_from, $date_to);
         foreach ($values as &$value) {
             if (Tools::getValue('export') == false) {
                 $value['roomTypeName'] = '<a href="'.$this->context->link->getAdminLink('AdminProducts').'&id_product='.$value['id_product'].'&updateproduct" target="_blank">'.$value['roomTypeName'].'</a>';
diff --git a/modules/statsdata/statsdata.php b/modules/statsdata/statsdata.php
index 6eb26b79b..cd98854db 100644
--- a/modules/statsdata/statsdata.php
+++ b/modules/statsdata/statsdata.php
@@ -186,8 +186,6 @@ class StatsData extends Module
         $lang = new Language((int)Configuration::get('PS_LANG_DEFAULT'));
         $helper->default_form_language = $lang->id;
         $helper->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0;
-        $this->fields_form = array();
-
         $helper->identifier = $this->identifier;
         $helper->submit_action = 'submitStatsData';
         $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false).'&configure='.$this->name.'&tab_module='.$this->tab.'&module_name='.$this->name;
diff --git a/modules/wkabouthotelblock/controllers/admin/AdminAboutHotelBlockSettingController.php b/modules/wkabouthotelblock/controllers/admin/AdminAboutHotelBlockSettingController.php
index 10bc7ec01..a04606bc5 100644
--- a/modules/wkabouthotelblock/controllers/admin/AdminAboutHotelBlockSettingController.php
+++ b/modules/wkabouthotelblock/controllers/admin/AdminAboutHotelBlockSettingController.php
@@ -367,9 +367,7 @@ class AdminAboutHotelBlockSettingController extends ModuleAdminController
 
             if (isset($pos[2]) && (int) $pos[2] === $idInteriorImage) {
                 if ($objInteriorImg = new WkHotelInteriorImage((int) $pos[2])) {
-                    if (isset($position)
-                        && $objInteriorImg->updatePosition($way, $position, $idInteriorImage)
-                    ) {
+                    if (isset($position) && $objInteriorImg->updatePosition($way, $position)) {
                         echo 'ok position '.(int) $position.' for testimonial block '.(int) $pos[1].'\r\n';
                     } else {
                         echo '{"hasError" : true, "errors" : "Can not update testimonial block position '.
diff --git a/modules/wkfooterpaymentblock/classes/WkFooterPaymentBlockInfo.php b/modules/wkfooterpaymentblock/classes/WkFooterPaymentBlockInfo.php
index a0d8c7b34..641e8c4f7 100644
--- a/modules/wkfooterpaymentblock/classes/WkFooterPaymentBlockInfo.php
+++ b/modules/wkfooterpaymentblock/classes/WkFooterPaymentBlockInfo.php
@@ -52,7 +52,7 @@ class WkFooterPaymentBlockInfo extends ObjectModel
     {
         if (!parent::delete()
             || !$this->deleteImage(true)
-            || !$this->cleanPositions()
+            || !self::cleanPositions()
         ) {
             return false;
         }
diff --git a/modules/wkfooterpaymentblock/controllers/admin/AdminFooterPaymentBlockSettingController.php b/modules/wkfooterpaymentblock/controllers/admin/AdminFooterPaymentBlockSettingController.php
index ea8a57f1a..8ddd0f2d5 100644
--- a/modules/wkfooterpaymentblock/controllers/admin/AdminFooterPaymentBlockSettingController.php
+++ b/modules/wkfooterpaymentblock/controllers/admin/AdminFooterPaymentBlockSettingController.php
@@ -230,9 +230,7 @@ class AdminFooterPaymentBlockSettingController extends ModuleAdminController
 
             if (isset($pos[2]) && (int) $pos[2] === $idPaymentBlock) {
                 if ($objPaymentBlockInfo = new WkFooterPaymentBlockInfo((int) $pos[2])) {
-                    if (isset($position)
-                        && $objPaymentBlockInfo->updatePosition($way, $position, $idPaymentBlock)
-                    ) {
+                    if (isset($position) && $objPaymentBlockInfo->updatePosition($way, $position)) {
                         echo 'ok position '.(int) $position.' for payment block '.(int) $pos[1].'\r\n';
                     } else {
                         echo '{"hasError" : true, "errors" : "Can not update payment block '.
diff --git a/modules/wkhotelfeaturesblock/controllers/admin/AdminFeaturesModuleSettingController.php b/modules/wkhotelfeaturesblock/controllers/admin/AdminFeaturesModuleSettingController.php
index 7ee8505e2..d0a8560e1 100644
--- a/modules/wkhotelfeaturesblock/controllers/admin/AdminFeaturesModuleSettingController.php
+++ b/modules/wkhotelfeaturesblock/controllers/admin/AdminFeaturesModuleSettingController.php
@@ -416,9 +416,7 @@ class AdminFeaturesModuleSettingController extends ModuleAdminController
 
             if (isset($pos[2]) && (int) $pos[2] === $idFeatureBlock) {
                 if ($objFeatureBlock = new WkHotelFeaturesData((int) $pos[2])) {
-                    if (isset($position)
-                        && $objFeatureBlock->updatePosition($way, $position, $idFeatureBlock)
-                    ) {
+                    if (isset($position) && $objFeatureBlock->updatePosition($way, $position)) {
                         echo 'ok position '.(int) $position.' for amenity block '.(int) $pos[1].'\r\n';
                     } else {
                         echo '{"hasError" : true, "errors" : "Can not update amenity block position '.
diff --git a/modules/wkhotelfilterblock/wkhotelfilterblock.php b/modules/wkhotelfilterblock/wkhotelfilterblock.php
index 055f488cc..2c50393fc 100644
--- a/modules/wkhotelfilterblock/wkhotelfilterblock.php
+++ b/modules/wkhotelfilterblock/wkhotelfilterblock.php
@@ -111,7 +111,6 @@ class wkhotelfilterblock extends Module
         $helper->table = $this->table;
         $lang = new Language((int) Configuration::get('PS_LANG_DEFAULT'));
         $helper->default_form_language = $lang->id;
-        $this->fields_form = array();
         $helper->identifier = $this->identifier;
         $helper->submit_action = 'btnConfigSubmit';
         $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false).
@@ -228,8 +227,7 @@ class wkhotelfilterblock extends Module
 
                     $config = $this->getConfigFieldsValues();
 
-                    $obj_booking_detail = new HotelBookingDetail();
-                    $num_days = $obj_booking_detail->getNumberOfDays($date_from, $date_to);
+                    $num_days = HotelHelper::getNumberOfDays($date_from, $date_to);
 
                     $warning_num = Configuration::get('WK_ROOM_LEFT_WARNING_NUMBER');
                     $this->context->smarty->assign(array(
diff --git a/modules/wkroomsearchblock/classes/WkRoomSearchHelper.php b/modules/wkroomsearchblock/classes/WkRoomSearchHelper.php
index 50649e531..16b514066 100644
--- a/modules/wkroomsearchblock/classes/WkRoomSearchHelper.php
+++ b/modules/wkroomsearchblock/classes/WkRoomSearchHelper.php
@@ -56,39 +56,41 @@ class WkRoomSearchHelper
 
         // Lets validate guest occupancy fields
         // Get guest occupancy variable
-        $guestOccupancy = Tools::getValue('occupancy');
-        if (!count($guestOccupancy)) {
-            $errors[] = $objModule->l('Invalid occupancy', 'WkRoomSearchHelper');
-        } else {
-            $adultTypeErr = 0;
-            $childTypeErr = 0;
-            $childAgeErr = 0;
-            foreach ($guestOccupancy as $occupancy) {
-                if (!isset($occupancy['adults']) || !Validate::isUnsignedInt($occupancy['adults'])) {
-                    $adultTypeErr = 1;
-                }
-                if (!isset($occupancy['children']) || !Validate::isUnsignedInt($occupancy['children'])) {
-                    $childTypeErr = 1;
-                } elseif ($occupancy['children']) {
-                    if (!isset($occupancy['child_ages']) || ($occupancy['children'] != count($occupancy['child_ages']))) {
-                        $childAgeErr = 1;
-                    } else {
-                        foreach ($occupancy['child_ages'] as $childAge) {
-                            if (!Validate::isUnsignedInt($childAge)) {
-                                $childAgeErr = 1;
+        if (Configuration::get('PS_FRONT_SEARCH_TYPE') == HotelBookingDetail::SEARCH_TYPE_OWS) {
+            $guestOccupancy = Tools::getValue('occupancy');
+            if (!count($guestOccupancy)) {
+                $errors[] = $objModule->l('Invalid occupancy', 'WkRoomSearchHelper');
+            } else {
+                $adultTypeErr = 0;
+                $childTypeErr = 0;
+                $childAgeErr = 0;
+                foreach ($guestOccupancy as $occupancy) {
+                    if (!isset($occupancy['adults']) || !Validate::isUnsignedInt($occupancy['adults'])) {
+                        $adultTypeErr = 1;
+                    }
+                    if (!isset($occupancy['children']) || !Validate::isUnsignedInt($occupancy['children'])) {
+                        $childTypeErr = 1;
+                    } elseif ($occupancy['children']) {
+                        if (!isset($occupancy['child_ages']) || ($occupancy['children'] != count($occupancy['child_ages']))) {
+                            $childAgeErr = 1;
+                        } else {
+                            foreach ($occupancy['child_ages'] as $childAge) {
+                                if (!Validate::isUnsignedInt($childAge)) {
+                                    $childAgeErr = 1;
+                                }
                             }
                         }
                     }
                 }
-            }
-            if ($adultTypeErr) {
-                $errors[] = $objModule->l('Invalid adults', 'WkRoomSearchHelper');
-            }
-            if ($childTypeErr) {
-                $errors[] = $objModule->l('Invalid children', 'WkRoomSearchHelper');
-            }
-            if ($childAgeErr) {
-                $errors[] = $objModule->l('Invalid children ages', 'WkRoomSearchHelper');
+                if ($adultTypeErr) {
+                    $errors[] = $objModule->l('Invalid adults', 'WkRoomSearchHelper');
+                }
+                if ($childTypeErr) {
+                    $errors[] = $objModule->l('Invalid children', 'WkRoomSearchHelper');
+                }
+                if ($childAgeErr) {
+                    $errors[] = $objModule->l('Invalid children ages', 'WkRoomSearchHelper');
+                }
             }
         }
 
@@ -205,9 +207,6 @@ class WkRoomSearchHelper
                                 $searchedData['occupancy_children'] = array_sum(
                                     array_column($searchedData['occupancies'], 'children')
                                 );
-                                $searchedData['occupancy_child_ages'] = array_sum(
-                                    array_column($searchedData['occupancies'], 'child_ages')
-                                );
                             }
                         }
                     }
diff --git a/modules/wktestimonialblock/classes/WkHotelTestimonialData.php b/modules/wktestimonialblock/classes/WkHotelTestimonialData.php
index c0bebf508..e6afcee09 100644
--- a/modules/wktestimonialblock/classes/WkHotelTestimonialData.php
+++ b/modules/wktestimonialblock/classes/WkHotelTestimonialData.php
@@ -232,7 +232,6 @@ class WkHotelTestimonialData extends ObjectModel
                             }
                         }
                         $objTestimonialData->position = $this->getHigherPosition();
-                        $objTestimonialData->testimonial_image = ($i+1).'.jpg';
                         $objTestimonialData->active = 1;
                         $objTestimonialData->save();
                     }
diff --git a/modules/wktestimonialblock/controllers/admin/AdminTestimonialsModuleSettingController.php b/modules/wktestimonialblock/controllers/admin/AdminTestimonialsModuleSettingController.php
index 94930b146..7ccfabd0e 100644
--- a/modules/wktestimonialblock/controllers/admin/AdminTestimonialsModuleSettingController.php
+++ b/modules/wktestimonialblock/controllers/admin/AdminTestimonialsModuleSettingController.php
@@ -377,9 +377,7 @@ class AdminTestimonialsModuleSettingController extends ModuleAdminController
 
             if (isset($pos[2]) && (int) $pos[2] === $idTestimonialBlock) {
                 if ($objTestimonialBlock = new WkHotelTestimonialData((int) $pos[2])) {
-                    if (isset($position)
-                        && $objTestimonialBlock->updatePosition($way, $position, $idTestimonialBlock)
-                    ) {
+                    if (isset($position) && $objTestimonialBlock->updatePosition($way, $position)) {
                         echo 'ok position '.(int) $position.' for testimonial block '.(int) $pos[1].'\r\n';
                     } else {
                         echo '{"hasError" : true, "errors" : "Can not update testimonial block position '.