From d79ef4963cd3dedd55578e1745e292b99688f478 Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Wed, 4 Jun 2025 12:08:01 +0530
Subject: [PATCH 01/42] Fixed: filter related issues in the Back office

---
 .../controllers/products/informations.tpl     |  2 +-
 classes/controller/AdminController.php        |  5 ++-
 .../admin/AdminNormalProductsController.php   | 31 +++++++++++++++---
 controllers/admin/AdminProductsController.php | 32 +++++++++++++++----
 .../AdminHotelRoomModuleSettingController.php |  1 +
 5 files changed, 56 insertions(+), 15 deletions(-)

diff --git a/admin/themes/default/template/controllers/products/informations.tpl b/admin/themes/default/template/controllers/products/informations.tpl
index d67bdffb0..fdfa02ee0 100644
--- a/admin/themes/default/template/controllers/products/informations.tpl
+++ b/admin/themes/default/template/controllers/products/informations.tpl
@@ -455,7 +455,7 @@
 				<p class="help-block">{l s='Please note that position numbering starts from 0. A position of 0 means room type will be displayed at the topmost position.'}</p>
 				<div class="alert alert-info">
 					{l s='You can manage positions of the room types of this hotel from'}
-					<a href="{$link->getAdminLink('AdminProducts')}&id_category={$htl_full_info['id_category']}">{l s='here.'}</a>
+					<a href="{$link->getAdminLink('AdminProducts')}&submitResetproduct&submitFilterproduct=1&productFilter_a!id_category_default={$htl_full_info['id_category']}">{l s='here.'}</a>
 				</div>
 			</div>
 		</div>
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 80e71feba..2dcb41a51 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -878,9 +878,8 @@ class AdminControllerCore extends Controller
             }
         }
 
-        if (empty($filters)) {
-            $filters = $this->context->cookie->getFamily($prefix.$this->list_id.'Filter_');
-        }
+        // To merge the older filters with the new ones, and replace if new data is added to filter.
+        $filters = array_merge($this->context->cookie->getFamily($prefix.$this->list_id.'Filter_'), $filters);
 
         foreach ($filters as $key => $value) {
             $key_org = $key;
diff --git a/controllers/admin/AdminNormalProductsController.php b/controllers/admin/AdminNormalProductsController.php
index d204c88ff..12d070ce4 100644
--- a/controllers/admin/AdminNormalProductsController.php
+++ b/controllers/admin/AdminNormalProductsController.php
@@ -139,6 +139,7 @@ class AdminNormalProductsControllerCore extends AdminController
             }
         }
 
+        $catFitlerKey = $this->table.'Filter_a!id_category_default';
         if (Tools::getValue('reset_filter_category')) {
             $this->context->cookie->id_category_products_filter = false;
         }
@@ -149,6 +150,9 @@ class AdminNormalProductsControllerCore extends AdminController
                 Tools::redirectAdmin($this->context->link->getAdminLink('AdminNormalProducts'));
             }
         }
+        if (!Tools::getValue($catFitlerKey)) {
+            $this->context->cookie->id_category_products_filter = false;
+        }
         /* Join categories table */
         if ($id_category = (int)Tools::getValue('productFilter_cl!name')) {
             $this->_category = new Category((int)$id_category);
@@ -160,6 +164,21 @@ class AdminNormalProductsControllerCore extends AdminController
             } elseif ($id_category = $this->context->cookie->id_category_products_filter) {
                 $this->id_current_category = $id_category;
             }
+
+            $idFilterCategory = false;
+            if (!Tools::isSubmit($catFitlerKey)) {
+                $prefix = $this->getCookieFilterPrefix();
+                $idFilterCategory = $this->context->cookie->{$prefix.$catFitlerKey};
+            }
+
+            if ($idFilterCategory) {
+                $this->id_current_category = $idFilterCategory;
+                $this->context->cookie->id_category_products_filter = $idFilterCategory;
+            } else {
+                $this->id_current_category = false;
+                $this->context->cookie->id_category_products_filter = false;
+            }
+
             if ($this->id_current_category) {
                 $this->_category = new Category((int)$this->id_current_category);
             } else {
@@ -550,8 +569,9 @@ class AdminNormalProductsControllerCore extends AdminController
 
     public function getList($id_lang, $orderBy = null, $orderWay = null, $start = 0, $limit = null, $id_lang_shop = null)
     {
-        $orderByPriceFinal = (empty($orderBy) ? ($this->context->cookie->__get($this->table.'Orderby') ? $this->context->cookie->__get($this->table.'Orderby') : 'id_'.$this->table) : $orderBy);
-        $orderWayPriceFinal = (empty($orderWay) ? ($this->context->cookie->__get($this->table.'Orderway') ? $this->context->cookie->__get($this->table.'Orderby') : 'ASC') : $orderWay);
+        $prefix = $this->getCookieFilterPrefix();
+        $orderByPriceFinal = (empty($orderBy) ? ($this->context->cookie->__get($prefix.$this->table.'Orderby') ? $this->context->cookie->__get($prefix.$this->table.'Orderby') : 'id_'.$this->table) : $orderBy);
+        $orderWayPriceFinal = (empty($orderWay) ? ($this->context->cookie->__get($prefix.$this->table.'Orderway') ? $this->context->cookie->__get($prefix.$this->table.'Orderby') : 'ASC') : $orderWay);
         if ($orderByPriceFinal == 'price_final') {
             $orderBy = 'id_'.$this->table;
             $orderWay = 'ASC';
@@ -2560,9 +2580,10 @@ class AdminNormalProductsControllerCore extends AdminController
             // If products from all categories are displayed, we don't want to use sorting by position
             if (!$id_category) {
                 $this->_defaultOrderBy = $this->identifier;
-                if ($this->context->cookie->{$this->table.'Orderby'} == 'position') {
-                    unset($this->context->cookie->{$this->table.'Orderby'});
-                    unset($this->context->cookie->{$this->table.'Orderway'});
+                $prefix = $this->getCookieFilterPrefix();
+                if ($this->context->cookie->{$prefix.$this->table.'Orderby'} == 'position') {
+                    unset($this->context->cookie->{$prefix.$this->table.'Orderby'});
+                    unset($this->context->cookie->{$prefix.$this->table.'Orderway'});
                 }
             }
             if (!$id_category) {
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index c65497b23..36610d0b0 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -161,14 +161,32 @@ class AdminProductsControllerCore extends AdminController
             $_POST['productFilter_a!id_category_default'] = $id_category;
         }
 
+        $catFitlerKey = $this->table.'Filter_a!id_category_default';
+         if (!Tools::getValue($catFitlerKey)) {
+            $this->context->cookie->id_category_room_types_filter = false;
+        }
         if (($id_category = (int)Tools::getValue('id_category'))
-            || ($id_category = (int) Tools::getValue('productFilter_a!id_category_default'))
+            || ($id_category = (int) Tools::getValue($catFitlerKey))
         ) {
             $this->id_current_category = $id_category;
             $this->context->cookie->id_category_room_types_filter = $id_category;
         } elseif ($id_category = $this->context->cookie->id_category_room_types_filter) {
             $this->id_current_category = $id_category;
+        }  else {
+            $idFilterCategory = false;
+            if (!Tools::isSubmit($catFitlerKey)) {
+                $prefix = $this->getCookieFilterPrefix();
+                $idFilterCategory = $this->context->cookie->{$prefix.$catFitlerKey};
+            }
+
+            if ($idFilterCategory) {
+                $this->id_current_category = $idFilterCategory;
+                $this->context->cookie->id_category_room_types_filter = $idFilterCategory;
+            } else {
+                $this->context->cookie->id_category_room_types_filter = false;
+            }
         }
+
         if ($this->id_current_category) {
             $this->_category = new Category((int)$this->id_current_category);
             $this->position_group_identifier = (int) $this->id_current_category;
@@ -631,8 +649,9 @@ class AdminProductsControllerCore extends AdminController
 
     public function getList($id_lang, $orderBy = null, $orderWay = null, $start = 0, $limit = null, $id_lang_shop = null)
     {
-        $orderByPriceFinal = (empty($orderBy) ? ($this->context->cookie->__get($this->table.'Orderby') ? $this->context->cookie->__get($this->table.'Orderby') : 'id_'.$this->table) : $orderBy);
-        $orderWayPriceFinal = (empty($orderWay) ? ($this->context->cookie->__get($this->table.'Orderway') ? $this->context->cookie->__get($this->table.'Orderby') : 'ASC') : $orderWay);
+        $prefix = $this->getCookieFilterPrefix();
+        $orderByPriceFinal = (empty($orderBy) ? ($this->context->cookie->__get($prefix.$this->table.'Orderby') ? $this->context->cookie->__get($prefix.$this->table.'Orderby') : 'id_'.$this->table) : $orderBy);
+        $orderWayPriceFinal = (empty($orderWay) ? ($this->context->cookie->__get($prefix.$this->table.'Orderway') ? $this->context->cookie->__get($prefix.$this->table.'Orderby') : 'ASC') : $orderWay);
         if ($orderByPriceFinal == 'price_final') {
             $orderBy = 'id_'.$this->table;
             $orderWay = 'ASC';
@@ -2524,9 +2543,10 @@ class AdminProductsControllerCore extends AdminController
             // If products from all categories are displayed, we don't want to use sorting by position
             if (!(int) $this->id_current_category) {
                 $this->_defaultOrderBy = $this->identifier;
-                if ($this->context->cookie->{$this->table.'Orderby'} == 'position') {
-                    unset($this->context->cookie->{$this->table.'Orderby'});
-                    unset($this->context->cookie->{$this->table.'Orderway'});
+                $prefix = $this->getCookieFilterPrefix();
+                if ($this->context->cookie->{$prefix.$this->table.'Orderby'} == 'position') {
+                    unset($this->context->cookie->{$prefix.$this->table.'Orderby'});
+                    unset($this->context->cookie->{$prefix.$this->table.'Orderway'});
                 }
             }
         }
diff --git a/modules/wkhotelroom/controllers/admin/AdminHotelRoomModuleSettingController.php b/modules/wkhotelroom/controllers/admin/AdminHotelRoomModuleSettingController.php
index 4e37f08d8..0fe71a798 100644
--- a/modules/wkhotelroom/controllers/admin/AdminHotelRoomModuleSettingController.php
+++ b/modules/wkhotelroom/controllers/admin/AdminHotelRoomModuleSettingController.php
@@ -106,6 +106,7 @@ class AdminHotelRoomModuleSettingController extends ModuleAdminController
             ),
             'date_add' => array(
                 'title' => $this->l('Date Add'),
+                'filter_key' => 'a!date_add',
                 'align' => 'center',
                 'type' => 'datetime',
             ),

From caca5b698b758d1332c3ec61bb45b257eb550b95 Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Mon, 9 Jun 2025 19:28:59 +0530
Subject: [PATCH 02/42] Fixed: syntax errors and some filter related issues

---
 .../admin/AdminNormalProductsController.php        |  8 ++++----
 controllers/admin/AdminProductsController.php      | 14 +++++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/controllers/admin/AdminNormalProductsController.php b/controllers/admin/AdminNormalProductsController.php
index 01e1ebe81..2a355748c 100644
--- a/controllers/admin/AdminNormalProductsController.php
+++ b/controllers/admin/AdminNormalProductsController.php
@@ -146,7 +146,7 @@ class AdminNormalProductsControllerCore extends AdminController
             }
         }
 
-        $catFitlerKey = $this->table.'Filter_a!id_category_default';
+        $catFilterKey = $this->table.'Filter_a!id_category_default';
         if (Tools::getValue('reset_filter_category')) {
             $this->context->cookie->id_category_products_filter = false;
         }
@@ -157,7 +157,7 @@ class AdminNormalProductsControllerCore extends AdminController
                 Tools::redirectAdmin($this->context->link->getAdminLink('AdminNormalProducts'));
             }
         }
-        if (!Tools::getValue($catFitlerKey)) {
+        if (!Tools::getValue($catFilterKey)) {
             $this->context->cookie->id_category_products_filter = false;
         }
         /* Join categories table */
@@ -173,9 +173,9 @@ class AdminNormalProductsControllerCore extends AdminController
             }
 
             $idFilterCategory = false;
-            if (!Tools::isSubmit($catFitlerKey)) {
+            if (!Tools::isSubmit($catFilterKey)) {
                 $prefix = $this->getCookieFilterPrefix();
-                $idFilterCategory = $this->context->cookie->{$prefix.$catFitlerKey};
+                $idFilterCategory = $this->context->cookie->{$prefix.$catFilterKey};
             }
 
             if ($idFilterCategory) {
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 7cac1f9fe..c1850165d 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -169,22 +169,26 @@ class AdminProductsControllerCore extends AdminController
             $_POST['productFilter_a!id_category_default'] = $id_category;
         }
 
-        $catFitlerKey = $this->table.'Filter_a!id_category_default';
-         if (!Tools::getValue($catFitlerKey)) {
+        $catFilterKey = $this->table.'Filter_a!id_category_default';
+        if (!Tools::getValue($catFilterKey)) {
             $this->context->cookie->id_category_room_types_filter = false;
         }
         if (($id_category = (int)Tools::getValue('id_category'))
-            || ($id_category = (int) Tools::getValue($catFitlerKey))
+            || ($id_category = (int)Tools::getValue($catFilterKey))
         ) {
             $this->id_current_category = $id_category;
             $this->context->cookie->id_category_room_types_filter = $id_category;
+            if (Tools::isSubmit('submitResetproduct')) {
+                $this->id_current_category = false;
+                $this->context->cookie->id_category_room_types_filter = false;
+            }
         } elseif ($id_category = $this->context->cookie->id_category_room_types_filter) {
             $this->id_current_category = $id_category;
         }  else {
             $idFilterCategory = false;
-            if (!Tools::isSubmit($catFitlerKey)) {
+            if (!Tools::isSubmit($catFilterKey)) {
                 $prefix = $this->getCookieFilterPrefix();
-                $idFilterCategory = $this->context->cookie->{$prefix.$catFitlerKey};
+                $idFilterCategory = $this->context->cookie->{$prefix.$catFilterKey};
             }
 
             if ($idFilterCategory) {

From db1ad8805fd4c045241f7337d977f70d9a855c30 Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Mon, 9 Jun 2025 20:01:59 +0530
Subject: [PATCH 03/42] Fixed: Admin is unable to update the position of the
 categories

---
 classes/Category.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/classes/Category.php b/classes/Category.php
index 7524d1688..148c8dc8e 100644
--- a/classes/Category.php
+++ b/classes/Category.php
@@ -1427,7 +1427,7 @@ class CategoryCore extends ObjectModel
             '.Shop::addSqlAssociation('category', 'cp').'
             WHERE cp.`id_parent` = '.(int)$this->id_parent.'
             ORDER BY category_shop.`position` ASC')
-            ) {
+        ) {
             return false;
         }
 
@@ -1443,10 +1443,11 @@ class CategoryCore extends ObjectModel
         }
         // < and > statements rather than BETWEEN operator
         // since BETWEEN is treated differently according to databases
+        $increment = ($way ? '- 1' : '+ 1');
         $result = (Db::getInstance()->execute('
             UPDATE `'._DB_PREFIX_.'category` c '.Shop::addSqlAssociation('category', 'c').'
-            SET c.`position`= c.`position` '.($way ? '- 1' : '+ 1').',
-            category_shop.`position`= category_shop.`position` '.($way ? '- 1' : '+ 1').',
+            SET c.`position`= IF(cast(c.`position` as signed) '.$increment.' > 0, c.`position` '.$increment.', 0), ' .
+            'category_shop.`position` = IF(cast(category_shop.`position` as signed) '.$increment.' > 0, category_shop.`position` '.$increment.', 0),
             c.`date_upd` = "'.date('Y-m-d H:i:s').'"
             WHERE category_shop.`position`
             '.($way

From d77a3bc37639f1adc86a4d336b66eb1ef05f320e Mon Sep 17 00:00:00 2001
From: Sumit Panwar <sumit201@webkul.in>
Date: Thu, 12 Jun 2025 18:50:56 +0530
Subject: [PATCH 04/42] =?UTF-8?q?Fixed:It=20shows=20order=20status=20?=
 =?UTF-8?q?=E2=80=9CBooked=E2=80=9D=20when=20all=20rooms=20are=20deleted?=
 =?UTF-8?q?=20except=20refunded=20rooms?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controllers/admin/AdminOrdersController.php | 48 +++++++++++++--------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index dad09b3b0..02e981a67 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -5566,26 +5566,38 @@ class AdminOrdersControllerCore extends AdminController
      */
     public function updateOrderStatusOnOrderChange($objOrder)
     {
-        // check if new order amount is greater that old order amount and order payment is accepted
-        // then update order status to partial payment accepted
-        $currentOrderState = $objOrder->getCurrentOrderState();
-        $psOsPartialPaymentAccepted = Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED');
-        if ($currentOrderState->paid == 1 && $currentOrderState->id != $psOsPartialPaymentAccepted) {
-            // calculate due amount
-            $dueAmount = $objOrder->total_paid_tax_incl - $objOrder->total_paid_real;
-            if ($dueAmount > 0) {
-                // now change order status to partial payment
-                $objOrderHistory = new OrderHistory();
-                $objOrderHistory->id_order = $objOrder->id;
-                $objOrderHistory->id_employee = (int) $this->context->employee->id;
+        // If order is completely refunded or cancelled then change the order state
+        if ($idOrderRefundState = $objOrder->getOrderCompleteRefundStatus()) {
+            $objOrderHistory = new OrderHistory();
+            $objOrderHistory->id_order = (int)$objOrder->id;
+            $useExistingPayment = false;
+            if (!$objOrder->hasInvoice()) {
+                $useExistingPayment = true;
+            }
+            $objOrderHistory->changeIdOrderState($idOrderState, $objOrder, $useExistingPayment);
+            $objOrderHistory->add();
+        } else {
+            // check if new order amount is greater that old order amount and order payment is accepted
+            // then update order status to partial payment accepted
+            $currentOrderState = $objOrder->getCurrentOrderState();
+            $psOsPartialPaymentAccepted = Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED');
+            if ($currentOrderState->paid == 1 && $currentOrderState->id != $psOsPartialPaymentAccepted) {
+                // calculate due amount
+                $dueAmount = $objOrder->total_paid_tax_incl - $objOrder->total_paid_real;
+                if ($dueAmount > 0) {
+                    // now change order status to partial payment
+                    $objOrderHistory = new OrderHistory();
+                    $objOrderHistory->id_order = $objOrder->id;
+                    $objOrderHistory->id_employee = (int) $this->context->employee->id;
 
-                $useExistingPayment = false;
-                if (!$objOrder->hasInvoice()) {
-                    $useExistingPayment = true;
+                    $useExistingPayment = false;
+                    if (!$objOrder->hasInvoice()) {
+                        $useExistingPayment = true;
+                    }
+
+                    $objOrderHistory->changeIdOrderState($psOsPartialPaymentAccepted, $objOrder, $useExistingPayment);
+                    $objOrderHistory->add();
                 }
-
-                $objOrderHistory->changeIdOrderState($psOsPartialPaymentAccepted, $objOrder, $useExistingPayment);
-                $objOrderHistory->add();
             }
         }
     }

From 9b48cf260ea3736d55cd417526cdb6a3c46e6a67 Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Thu, 12 Jun 2025 18:59:56 +0530
Subject: [PATCH 05/42] Updated the toolbar title for the order page render
 list

---
 controllers/admin/AdminOrdersController.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 934edf868..45fa00156 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -537,6 +537,18 @@ class AdminOrdersControllerCore extends AdminController
         return $res;
     }
 
+    public function initToolbarTitle()
+    {
+        parent::initToolbarTitle();
+        switch ($this->display) {
+            case '':
+            case 'list':
+                array_pop($this->toolbar_title);
+                $this->toolbar_title[] = $this->l('Orders');
+                break;
+        }
+    }
+
     public function ajaxProcessInitBookingDocumentsModal()
     {
         $response['hasError'] = 1;

From 66cf555eaea96801753db659f5d0b764abe14d31 Mon Sep 17 00:00:00 2001
From: Sumit Panwar <sumit201@webkul.in>
Date: Fri, 13 Jun 2025 20:35:43 +0530
Subject: [PATCH 06/42] Fixed: refund status calculation

---
 classes/order/Order.php                     | 17 ++++++++++++++---
 controllers/admin/AdminOrdersController.php |  5 ++---
 controllers/front/OrderDetailController.php |  2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/classes/order/Order.php b/classes/order/Order.php
index 7dd8378f6..abcd65007 100644
--- a/classes/order/Order.php
+++ b/classes/order/Order.php
@@ -2658,25 +2658,36 @@ class OrderCore extends ObjectModel
      *
      * @return boolean: true if order has been completely refunded as per requested parameters or false
      */
-    public function hasCompletelyRefunded($action = 0, $includeCheckIn = 0)
+    public function hasCompletelyRefunded($action = 0, $includeCheckIn = 0, $mustHaveRoomsOrProducts = 1)
     {
         $res = true;
+
+        // Check if order has bookings or products for refund
+        if ($mustHaveRoomsOrProducts) {
+            $hasRoomsOrProducts = 0;
+        } else {
+            $hasRoomsOrProducts = 1;
+        }
+
         // check rooms in booking
         $objHotelBooking = new HotelBookingdetail();
         if ($orderBookings = $objHotelBooking->getOrderCurrentDataByOrderId($this->id)) {
             $res &= $this->checkList($orderBookings, $action, $includeCheckIn);
+            $hasRoomsOrProducts = 1;
         }
         // check hotel linked products
         $objServiceProductOrderDetail = new ServiceProductOrderDetail();
         if ($hotelProducts = $objServiceProductOrderDetail->getServiceProductsInOrder($this->id, 0, 0, Product::SELLING_PREFERENCE_HOTEL_STANDALONE)) {
             $res &= $this->checkList($hotelProducts, $action, false);
+            $hasRoomsOrProducts = 1;
         }
 
         if ($standaloneProducts = $objServiceProductOrderDetail->getServiceProductsInOrder($this->id, 0, 0, Product::SELLING_PREFERENCE_STANDALONE)) {
             $res &= $this->checkList($standaloneProducts, $action, false);
+            $hasRoomsOrProducts = 1;
         }
 
-        return $res;
+        return ($hasRoomsOrProducts && $res);
     }
 
     public function checkList($list, $action = 0, $includeCheckIn = 0) {
@@ -2800,7 +2811,7 @@ class OrderCore extends ObjectModel
             ) {
                 $result['errors'][] = Tools::displayError('Order status can not be set to Refunded until all bookings in the order are completely refunded.');
             } elseif ($objNewOrderState->id == Configuration::get('PS_OS_CANCELED')
-                && !$this->hasCompletelyRefunded(Order::ORDER_COMPLETE_CANCELLATION_FLAG)
+                && !$this->hasCompletelyRefunded(Order::ORDER_COMPLETE_CANCELLATION_FLAG, 0, 1)
             ) {
                 $result['errors'][] = Tools::displayError('Order status can not be set to Cancelled until all bookings in the order are cancelled.');
             } elseif ($objCurrentOrderState->id == Configuration::get('PS_OS_ERROR') && !($objNewOrderState->id == Configuration::get('PS_OS_ERROR'))) {
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 21af1d37c..b407fad6c 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -513,7 +513,7 @@ class AdminOrdersControllerCore extends AdminController
 
                 if ($this->tabAccess['edit'] === 1) {
                     if (((int) $order->isReturnable())
-                        && !$order->hasCompletelyRefunded(Order::ORDER_COMPLETE_CANCELLATION_OR_REFUND_REQUEST_FLAG)
+                        && !$order->hasCompletelyRefunded(Order::ORDER_COMPLETE_CANCELLATION_OR_REFUND_REQUEST_FLAG, 0, 0)
                     ) {
                         $orderTotalPaid = $order->getTotalPaid();
                         $orderDiscounts = $order->getCartRules();
@@ -3560,7 +3560,6 @@ class AdminOrdersControllerCore extends AdminController
             'returns' => OrderReturn::getOrdersReturn($order->id_customer, $order->id),
             'refundReqBookings' => $refundReqBookings,
             'refundReqProducts' => $refundReqProducts,
-            'completeRefundRequestOrCancel' => $order->hasCompletelyRefunded(Order::ORDER_COMPLETE_CANCELLATION_OR_REFUND_REQUEST_FLAG),
             'refundedAmount' => $refundedAmount,
             'totalDemandsPriceTI' => $totalDemandsPriceTI,
             'totalDemandsPriceTE' => $totalDemandsPriceTE,
@@ -5597,7 +5596,7 @@ class AdminOrdersControllerCore extends AdminController
     public function updateOrderStatusOnOrderChange($objOrder)
     {
         // If order is completely refunded or cancelled then change the order state
-        if ($idOrderRefundState = $objOrder->getOrderCompleteRefundStatus()) {
+        if ($idOrderState = $objOrder->getOrderCompleteRefundStatus()) {
             $objOrderHistory = new OrderHistory();
             $objOrderHistory->id_order = (int)$objOrder->id;
             $useExistingPayment = false;
diff --git a/controllers/front/OrderDetailController.php b/controllers/front/OrderDetailController.php
index 3b67fd8b6..ef4b3e49f 100644
--- a/controllers/front/OrderDetailController.php
+++ b/controllers/front/OrderDetailController.php
@@ -464,7 +464,7 @@ class OrderDetailControllerCore extends FrontController
                         'returns' => OrderReturn::getOrdersReturn($order->id_customer, $order->id),
                         'refundReqBookings' => $refundReqBookings,
                         'refundReqProducts' => $refundReqProducts,
-                        'completeRefundRequestOrCancel' => $order->hasCompletelyRefunded(Order::ORDER_COMPLETE_CANCELLATION_OR_REFUND_REQUEST_FLAG),
+                        'completeRefundRequestOrCancel' => $order->hasCompletelyRefunded(Order::ORDER_COMPLETE_CANCELLATION_OR_REFUND_REQUEST_FLAG, 0, 0),
                         'refundedAmount' => $refundedAmount,
                         'shop_name' => strval(Configuration::get('PS_SHOP_NAME')),
                         'order' => $order,

From 889d6b130173db8449cc0c2f8f55c22864c50a08 Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Sat, 14 Jun 2025 11:19:33 +0530
Subject: [PATCH 07/42] Added: new configuration for the dimension unit in for
 the bed types, revert the changes for the ps dimension unit

---
 controllers/front/ProductController.php       |  2 +-
 localization/ae.xml                           |  2 +-
 localization/be.xml                           |  2 +-
 localization/bg.xml                           |  2 +-
 localization/by.xml                           |  2 +-
 localization/cy.xml                           |  2 +-
 localization/cz.xml                           |  2 +-
 localization/de.xml                           |  2 +-
 localization/ee.xml                           |  2 +-
 localization/es.xml                           |  2 +-
 localization/fi.xml                           |  2 +-
 localization/fr.xml                           |  2 +-
 localization/gb.xml                           |  2 +-
 localization/gr.xml                           |  2 +-
 localization/hr.xml                           |  2 +-
 localization/hu.xml                           |  2 +-
 localization/ie.xml                           |  2 +-
 localization/it.xml                           |  2 +-
 localization/ke.xml                           |  2 +-
 localization/lt.xml                           |  2 +-
 localization/lu.xml                           |  2 +-
 localization/lv.xml                           |  2 +-
 localization/mt.xml                           |  2 +-
 localization/my.xml                           |  2 +-
 localization/ng.xml                           |  2 +-
 localization/nl.xml                           |  2 +-
 localization/pa.xml                           |  2 +-
 localization/pe.xml                           |  2 +-
 localization/ph.xml                           |  2 +-
 localization/pl.xml                           |  2 +-
 localization/pt.xml                           |  2 +-
 localization/ro.xml                           |  2 +-
 localization/rs.xml                           |  2 +-
 localization/se.xml                           |  2 +-
 localization/sg.xml                           |  2 +-
 localization/si.xml                           |  2 +-
 localization/sk.xml                           |  2 +-
 localization/tn.xml                           |  2 +-
 .../classes/HotelHelper.php                   | 13 ++-
 .../admin/AdminHotelBedTypesController.php    | 84 ++++++++++++++-----
 40 files changed, 112 insertions(+), 61 deletions(-)

diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php
index 2ea5cb9c3..24cc682af 100644
--- a/controllers/front/ProductController.php
+++ b/controllers/front/ProductController.php
@@ -436,7 +436,7 @@ class ProductControllerCore extends FrontController
                             'PS_SERVICE_PRODUCT_CATEGORY_FILTER' => Configuration::get('PS_SERVICE_PRODUCT_CATEGORY_FILTER'),
                             'bed_types_info' => $bedTypes,
                             'selected_bed_types' => $selectedBedTypes,
-                            'dimension_unit' => Configuration::get('PS_DIMENSION_UNIT'),
+                            'dimension_unit' => Configuration::get('WK_DIMENSION_UNIT', $this->context->language->id),
                         )
                     );
 
diff --git a/localization/ae.xml b/localization/ae.xml
index 5ee90b78b..a396613dc 100644
--- a/localization/ae.xml
+++ b/localization/ae.xml
@@ -11,7 +11,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/be.xml b/localization/be.xml
index b12218f6a..7b5a99eb6 100644
--- a/localization/be.xml
+++ b/localization/be.xml
@@ -223,7 +223,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/bg.xml b/localization/bg.xml
index acb1e1843..52c894980 100644
--- a/localization/bg.xml
+++ b/localization/bg.xml
@@ -190,7 +190,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/by.xml b/localization/by.xml
index b4b5297e7..226d187b1 100644
--- a/localization/by.xml
+++ b/localization/by.xml
@@ -23,7 +23,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/cy.xml b/localization/cy.xml
index 42a046ce6..c4bd10aef 100644
--- a/localization/cy.xml
+++ b/localization/cy.xml
@@ -192,7 +192,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/cz.xml b/localization/cz.xml
index 2b8cc6f26..c5f0ca17b 100644
--- a/localization/cz.xml
+++ b/localization/cz.xml
@@ -131,7 +131,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/de.xml b/localization/de.xml
index fe2d8f1bb..2434f4db6 100644
--- a/localization/de.xml
+++ b/localization/de.xml
@@ -190,7 +190,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/ee.xml b/localization/ee.xml
index e4a8a28ef..de7fb9c70 100644
--- a/localization/ee.xml
+++ b/localization/ee.xml
@@ -190,7 +190,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/es.xml b/localization/es.xml
index 261c16ec1..55be33e0c 100644
--- a/localization/es.xml
+++ b/localization/es.xml
@@ -223,7 +223,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/fi.xml b/localization/fi.xml
index 64a9c3b37..6847f2b0e 100644
--- a/localization/fi.xml
+++ b/localization/fi.xml
@@ -221,7 +221,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/fr.xml b/localization/fr.xml
index 742471e70..5189a36b0 100644
--- a/localization/fr.xml
+++ b/localization/fr.xml
@@ -201,7 +201,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/gb.xml b/localization/gb.xml
index 5e444ad60..3d6778734 100644
--- a/localization/gb.xml
+++ b/localization/gb.xml
@@ -130,7 +130,7 @@
   <units>
     <unit type="weight" value="Kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="mi"/>
   </units>
diff --git a/localization/gr.xml b/localization/gr.xml
index 92f950692..f66ba324a 100644
--- a/localization/gr.xml
+++ b/localization/gr.xml
@@ -254,7 +254,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/hr.xml b/localization/hr.xml
index 50f627c0b..e1825a93e 100644
--- a/localization/hr.xml
+++ b/localization/hr.xml
@@ -161,7 +161,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/hu.xml b/localization/hu.xml
index 3d2823a48..942644d96 100644
--- a/localization/hu.xml
+++ b/localization/hu.xml
@@ -221,7 +221,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/ie.xml b/localization/ie.xml
index 823866692..b94f767d4 100644
--- a/localization/ie.xml
+++ b/localization/ie.xml
@@ -192,7 +192,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/it.xml b/localization/it.xml
index 4e3937415..004799209 100644
--- a/localization/it.xml
+++ b/localization/it.xml
@@ -333,7 +333,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/ke.xml b/localization/ke.xml
index d3f056d63..488d06b86 100644
--- a/localization/ke.xml
+++ b/localization/ke.xml
@@ -19,7 +19,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/lt.xml b/localization/lt.xml
index e52cda3d7..d74acf838 100644
--- a/localization/lt.xml
+++ b/localization/lt.xml
@@ -221,7 +221,7 @@
 	<units>
 		<unit type="weight" value="kg"/>
 		<unit type="volume" value="L"/>
-		<unit type="short_distance" value="ft"/>
+		<unit type="short_distance" value="cm"/>
 		<unit type="base_distance" value="m"/>
 		<unit type="long_distance" value="km"/>
 	</units>
diff --git a/localization/lu.xml b/localization/lu.xml
index ce72f7f1d..e50bb9e7d 100644
--- a/localization/lu.xml
+++ b/localization/lu.xml
@@ -253,7 +253,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/lv.xml b/localization/lv.xml
index 3ae0933a4..ad0266fbe 100644
--- a/localization/lv.xml
+++ b/localization/lv.xml
@@ -190,7 +190,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/mt.xml b/localization/mt.xml
index 16cb3d350..e51e375b9 100644
--- a/localization/mt.xml
+++ b/localization/mt.xml
@@ -160,7 +160,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/my.xml b/localization/my.xml
index 348cb1df8..38a00cdbe 100644
--- a/localization/my.xml
+++ b/localization/my.xml
@@ -41,7 +41,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/ng.xml b/localization/ng.xml
index 75267ea9c..d6a676d87 100644
--- a/localization/ng.xml
+++ b/localization/ng.xml
@@ -19,7 +19,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/nl.xml b/localization/nl.xml
index 5584ffe60..dff561347 100644
--- a/localization/nl.xml
+++ b/localization/nl.xml
@@ -190,7 +190,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/pa.xml b/localization/pa.xml
index b06bab2a2..7cf1e0e9e 100644
--- a/localization/pa.xml
+++ b/localization/pa.xml
@@ -19,7 +19,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/pe.xml b/localization/pe.xml
index de6cf3925..68eb0fe4b 100644
--- a/localization/pe.xml
+++ b/localization/pe.xml
@@ -17,7 +17,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/ph.xml b/localization/ph.xml
index c2db1c01a..b3d56d67f 100644
--- a/localization/ph.xml
+++ b/localization/ph.xml
@@ -19,7 +19,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/pl.xml b/localization/pl.xml
index 310c07893..bfc285e25 100644
--- a/localization/pl.xml
+++ b/localization/pl.xml
@@ -190,7 +190,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/pt.xml b/localization/pt.xml
index 614b5a19f..cd18d9adf 100644
--- a/localization/pt.xml
+++ b/localization/pt.xml
@@ -221,7 +221,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/ro.xml b/localization/ro.xml
index ca172694e..6c7c66604 100644
--- a/localization/ro.xml
+++ b/localization/ro.xml
@@ -265,7 +265,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/rs.xml b/localization/rs.xml
index 5bfd40d14..4904780da 100644
--- a/localization/rs.xml
+++ b/localization/rs.xml
@@ -10,7 +10,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/se.xml b/localization/se.xml
index b71c05405..0243428c7 100644
--- a/localization/se.xml
+++ b/localization/se.xml
@@ -161,7 +161,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/sg.xml b/localization/sg.xml
index 1f115ca61..7bf58571d 100644
--- a/localization/sg.xml
+++ b/localization/sg.xml
@@ -18,7 +18,7 @@
 	<units>
 		<unit type="weight" value="kg"/>
 	    <unit type="volume" value="L"/>
-	    <unit type="short_distance" value="ft"/>
+	    <unit type="short_distance" value="cm"/>
 	    <unit type="base_distance" value="m"/>
 	    <unit type="long_distance" value="km"/>
 	</units>
diff --git a/localization/si.xml b/localization/si.xml
index 9e3f595d1..4ab65c6c6 100644
--- a/localization/si.xml
+++ b/localization/si.xml
@@ -190,7 +190,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/sk.xml b/localization/sk.xml
index 94cd6c0d4..adf6d311e 100644
--- a/localization/sk.xml
+++ b/localization/sk.xml
@@ -190,7 +190,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="l"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/localization/tn.xml b/localization/tn.xml
index 2fdd770d2..772c22009 100644
--- a/localization/tn.xml
+++ b/localization/tn.xml
@@ -16,7 +16,7 @@
   <units>
     <unit type="weight" value="kg"/>
     <unit type="volume" value="L"/>
-    <unit type="short_distance" value="ft"/>
+    <unit type="short_distance" value="cm"/>
     <unit type="base_distance" value="m"/>
     <unit type="long_distance" value="km"/>
   </units>
diff --git a/modules/hotelreservationsystem/classes/HotelHelper.php b/modules/hotelreservationsystem/classes/HotelHelper.php
index 0bb2d3f4e..edc7d39fe 100644
--- a/modules/hotelreservationsystem/classes/HotelHelper.php
+++ b/modules/hotelreservationsystem/classes/HotelHelper.php
@@ -1094,16 +1094,26 @@ class HotelHelper
             'ru' => 'Мы предлагаем элегантные номера, изысканную кухню и внимательное обслуживание для незабываемого отдыха.',
             'es' => 'Ofrecemos habitaciones elegantes, comidas gourmet y un servicio atento para una estadía inolvidable.',
         );
-
+        $defaultDimensionUnitLang = array(
+            'en' => 'ft',
+            'nl' => 'ft',
+            'fr' => 'pi',
+            'de' => 'ft',
+            'ru' => 'фут',
+            'es' => 'ft',
+        );
         $WK_HTL_CHAIN_NAME = array();
         $WK_HTL_TAG_LINE = array();
         $WK_HTL_SHORT_DESC = array();
+        $defaultDimensionUnit = array();
         foreach ($languages as $lang) {
             if (isset($htlTagLineLang[$lang['iso_code']])) {
                 $WK_HTL_TAG_LINE[$lang['id_lang']] = $htlTagLineLang[$lang['iso_code']];
                 $WK_HTL_SHORT_DESC[$lang['id_lang']] = $htlShortDescLang[$lang['iso_code']];
                 $WK_HTL_CHAIN_NAME[$lang['id_lang']] = $homeBannerTitleLang[$lang['iso_code']];
+                $defaultDimensionUnit[$lang['id_lang']] = $defaultDimensionUnitLang[$lang['iso_code']];
             } else {
+                $defaultDimensionUnit[$lang['id_lang']] = $defaultDimensionUnitLang['en'];
                 $WK_HTL_CHAIN_NAME[$lang['id_lang']] = $homeBannerTitleLang['en'];
                 $WK_HTL_TAG_LINE[$lang['id_lang']] = $htlTagLineLang['en'];
                 $WK_HTL_SHORT_DESC[$lang['id_lang']] = $htlShortDescLang['en'];
@@ -1113,6 +1123,7 @@ class HotelHelper
         Configuration::updateValue('WK_HTL_CHAIN_NAME', $WK_HTL_CHAIN_NAME);
         Configuration::updateValue('WK_HTL_TAG_LINE', $WK_HTL_TAG_LINE);
         Configuration::updateValue('WK_HTL_SHORT_DESC', $WK_HTL_SHORT_DESC);
+        Configuration::updateValue('WK_DIMENSION_UNIT', $defaultDimensionUnit);
 
         // Search Fields
         Configuration::updateValue('PS_FRONT_SEARCH_TYPE', HotelBookingDetail::SEARCH_TYPE_OWS);
diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelBedTypesController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelBedTypesController.php
index 2088899a7..fe90ca442 100644
--- a/modules/hotelreservationsystem/controllers/admin/AdminHotelBedTypesController.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelBedTypesController.php
@@ -35,24 +35,22 @@ class AdminHotelBedTypesController extends ModuleAdminController
         parent::__construct();
 
         $this->_new_list_header_design = true;
-        $this->fields_list = array(
-            'id_bed_type' => array(
-                'title' => $this->l('ID'),
-                'align' => 'center',
-            ),
-            'name' => array(
-                'title' => $this->l('Name'),
-                'align' => 'center',
-            ),
-            'width' => array(
-                'title' => $this->l('Width'),
-                'align' => 'center',
-                'suffix' => Configuration::get('PS_DIMENSION_UNIT')
-            ),
-            'length' => array(
-                'title' => $this->l('Lenght'),
-                'align' => 'center',
-                'suffix' => Configuration::get('PS_DIMENSION_UNIT')
+         // field options for global fields
+        $this->fields_options = array(
+            'global' => array(
+                'title' => $this->l('Dimension Unit Setting'),
+                'icon' => 'icon-cogs',
+                'fields' => array(
+                    'WK_DIMENSION_UNIT' => array(
+                        'title' => $this->l('Dimension Unit'),
+                        'type' => 'textLang',
+                        'lang' => true,
+                        'required' => true,
+                        'validation' => 'isGenericName',
+                        'hint' => $this->l('Enter a dimension unit for the bed types.')
+                    ),
+                ),
+                'submit' => array('title' => $this->l('Save'))
             ),
         );
 
@@ -67,6 +65,17 @@ class AdminHotelBedTypesController extends ModuleAdminController
         );
     }
 
+    public function initContent()
+    {
+        parent::initContent();
+        // to customize the view as per our requirements
+        if ($this->display != 'add' && $this->display != 'edit') {
+            $this->content = $this->renderOptions();
+            $this->content .= $this->renderList();
+            $this->context->smarty->assign('content', $this->content);
+        }
+    }
+
     public function initPageHeaderToolbar()
     {
         if (!$this->display || $this->display == 'list') {
@@ -80,6 +89,37 @@ class AdminHotelBedTypesController extends ModuleAdminController
         parent::initPageHeaderToolbar();
     }
 
+    public function initToolbar()
+    {
+        $this->toolbar_btn = array();
+    }
+
+    public function renderList()
+    {
+        // added here instead of the constructor since the dimension unit will be update in post processs.
+        $this->fields_list = array(
+            'id_bed_type' => array(
+                'title' => $this->l('ID'),
+                'align' => 'center',
+            ),
+            'name' => array(
+                'title' => $this->l('Name'),
+                'align' => 'center',
+            ),
+            'width' => array(
+                'title' => $this->l('Width'),
+                'align' => 'center',
+                'suffix' => Configuration::get('WK_DIMENSION_UNIT', $this->context->language->id)
+            ),
+            'length' => array(
+                'title' => $this->l('Lenght'),
+                'align' => 'center',
+                'suffix' => Configuration::get('WK_DIMENSION_UNIT', $this->context->language->id)
+            ),
+        );
+        return parent::renderList();
+    }
+
     public function renderForm()
     {
         if (!$this->loadObject(true)) {
@@ -107,8 +147,8 @@ class AdminHotelBedTypesController extends ModuleAdminController
                     'name' => 'width',
                     'required' => true,
                     'col' => 4,
-                    'hint' => $this->l('Enter the width of the Bed type in ').Configuration::get('PS_DIMENSION_UNIT'),
-                    'suffix' => Configuration::get('PS_DIMENSION_UNIT'),
+                    'hint' => $this->l('Enter the width of the Bed type in ').Configuration::get('WK_DIMENSION_UNIT', $this->context->language->id),
+                    'suffix' => Configuration::get('WK_DIMENSION_UNIT', $this->context->language->id),
                 ),
                 array(
                     'type' => 'text',
@@ -116,8 +156,8 @@ class AdminHotelBedTypesController extends ModuleAdminController
                     'name' => 'length',
                     'col' => 4,
                     'required' => true,
-                    'hint' => $this->l('Enter the length of the Bed type in ').Configuration::get('PS_DIMENSION_UNIT'),
-                    'suffix' => Configuration::get('PS_DIMENSION_UNIT'),
+                    'hint' => $this->l('Enter the length of the Bed type in ').Configuration::get('WK_DIMENSION_UNIT', $this->context->language->id),
+                    'suffix' => Configuration::get('WK_DIMENSION_UNIT', $this->context->language->id),
                 ),
             ),
             'submit' => array(

From 856c5045f3239be2be8ff71972c28fe8a598457a Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Sat, 14 Jun 2025 11:30:16 +0530
Subject: [PATCH 08/42] Added validation for empty dimension unit

---
 .../admin/AdminHotelBedTypesController.php    | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelBedTypesController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelBedTypesController.php
index fe90ca442..1b86ff3af 100644
--- a/modules/hotelreservationsystem/controllers/admin/AdminHotelBedTypesController.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelBedTypesController.php
@@ -96,7 +96,7 @@ class AdminHotelBedTypesController extends ModuleAdminController
 
     public function renderList()
     {
-        // added here instead of the constructor since the dimension unit will be update in post processs.
+        // added here instead of the constructor since the dimension unit will be update afer post processs.
         $this->fields_list = array(
             'id_bed_type' => array(
                 'title' => $this->l('ID'),
@@ -177,6 +177,27 @@ class AdminHotelBedTypesController extends ModuleAdminController
         return parent::renderForm();
     }
 
+    public function beforeUpdateOptions()
+    {
+        $defaultLangId = Configuration::get('PS_LANG_DEFAULT');
+        $objDefaultLanguage = Language::getLanguage((int) $defaultLangId);
+        $languages = Language::getLanguages(false);
+        if (!trim(Tools::getValue('WK_DIMENSION_UNIT_'.$defaultLangId))
+            && Tools::getValue('WK_DIMENSION_UNIT_'.$defaultLangId)
+        ) {
+            $this->errors[] = $this->l('Default dimension unit is required at least in ').$objDefaultLanguage['name'];
+        } else {
+            foreach ($languages as $lang) {
+                if (Tools::getValue('WK_DIMENSION_UNIT_'.$lang['id_lang'])
+                    && (!trim(Tools::getValue('WK_DIMENSION_UNIT_'.$lang['id_lang']))
+                    || !Validate::isGenericName(Tools::getValue('WK_DIMENSION_UNIT_'.$lang['id_lang'])))
+                ) {
+                    $this->errors[] = $this->l('Invalid dimension unit in ').$lang['name'];
+                }
+            }
+        }
+    }
+
     public function processSave()
     {
         if (!$this->loadObject(true)) {

From 0d456462a6910eb653ea8193ac08eb61d7e067ab Mon Sep 17 00:00:00 2001
From: Sumit Panwar <sumit201@webkul.in>
Date: Sat, 14 Jun 2025 12:21:28 +0530
Subject: [PATCH 09/42] Updated: if any stanalone product is present in cart
 the admin should not b able to create the booking from booking cart

---
 .../controllers/carts/helpers/view/view.tpl   |  2 +-
 controllers/admin/AdminCartsController.php    | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/admin/themes/default/template/controllers/carts/helpers/view/view.tpl b/admin/themes/default/template/controllers/carts/helpers/view/view.tpl
index 2fd68d44f..4da11944d 100644
--- a/admin/themes/default/template/controllers/carts/helpers/view/view.tpl
+++ b/admin/themes/default/template/controllers/carts/helpers/view/view.tpl
@@ -67,7 +67,7 @@
 				{l s='Created on:'} {dateFormat date=$cart_order.date_add}
 			{else}
 				<h2>{l s='No order was created from this cart.'}</h2>
-				{if $customer->id}
+				{if $customer->id && !$hotel_products && !$standalone_products}
 					<a class="btn btn-default" href="{$link->getAdminLink('AdminOrders')|escape:'html':'UTF-8'}&amp;cart_id={$cart->id|intval}&amp;addorder"><i class="icon-shopping-cart"></i> {l s='Create an order from this cart.'}</a>
 				{/if}
 			{/if}
diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php
index fa9c3abfa..4a9ef5b73 100644
--- a/controllers/admin/AdminCartsController.php
+++ b/controllers/admin/AdminCartsController.php
@@ -336,8 +336,38 @@ class AdminCartsControllerCore extends AdminController
         $helper->value = Tools::displayPrice($total_price, $currency);
         $kpi = $helper->generate();
         //end
+
+        // get standalone products in cart
+        $objServiceProductCartDetail = new ServiceProductCartDetail();
+        $hotelProducts = $objServiceProductCartDetail->getServiceProductsInCart(
+            $cart->id,
+            [Product::SELLING_PREFERENCE_HOTEL_STANDALONE, Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE],
+            $idHotel = null,
+            0,
+            null,
+            null,
+            null,
+            null,
+            0,
+            null,
+            0,
+            null,
+            1
+        );
+
+        $standaloneProducts = $objServiceProductCartDetail->getServiceProductsInCart(
+            $cart->id,
+            [Product::SELLING_PREFERENCE_STANDALONE]
+        );
+
+        if (count($standaloneProducts)) {
+            $this->context->smarty->assign('standalone_products', $standaloneProducts);
+        }
+
         $this->tpl_view_vars = array(
             'cart_htl_data' => $cartHtlData,//by webkul hotel rooms in order data
+            'standalone_products' => $standaloneProducts,
+            'hotel_products' => $hotelProducts,
             'kpi' => $kpi,
             'products' => $products,
             'discounts' => $cart->getCartRules(),

From 6024997d30b8ef35e1375af2110f5898bf8d856d Mon Sep 17 00:00:00 2001
From: azhar bhat <azharbhat.qlo098@webkul.in>
Date: Sat, 14 Jun 2025 13:16:25 +0530
Subject: [PATCH 10/42] added fax and hotelregistraionnumber with icons

---
 controllers/front/ContactController.php       |  4 ++++
 .../hotel-reservation-theme/contact-form.tpl  | 22 ++++++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/controllers/front/ContactController.php b/controllers/front/ContactController.php
index 691959cec..06e8b0759 100644
--- a/controllers/front/ContactController.php
+++ b/controllers/front/ContactController.php
@@ -298,6 +298,8 @@ class ContactControllerCore extends FrontController
         $gblHtlAddress = $shopAddress;
         $gblHtlPhone = Configuration::get('PS_SHOP_PHONE');
         $gblHtlEmail = Configuration::get('PS_SHOP_EMAIL');
+        $gblHtlRegistrationNumber = Configuration::get('PS_SHOP_DETAILS');
+        $gblHtlFax = Configuration::get('PS_SHOP_FAX');
         $objHotelInfo = new HotelBranchInformation();
         if ($hotelsInfo = $objHotelInfo->hotelBranchesInfo(false, 1, 1)) {
             foreach ($hotelsInfo as &$hotel) {
@@ -333,6 +335,8 @@ class ContactControllerCore extends FrontController
                 'gblHtlEmail' => $gblHtlEmail,
                 'displayHotelMap' => $displayHotelMap,
                 'gblHtlAddress' => $gblHtlAddress,
+                'gblHtlRegistrationNumber' => $gblHtlRegistrationNumber,
+                'gblHtlFax' => $gblHtlFax,
                 'contacts' => Contact::getContacts($this->context->language->id),
                 'message' => html_entity_decode(Tools::getValue('message')),
 	            'contactKey' => $contactKey,
diff --git a/themes/hotel-reservation-theme/contact-form.tpl b/themes/hotel-reservation-theme/contact-form.tpl
index 368421d1b..61ab718b4 100644
--- a/themes/hotel-reservation-theme/contact-form.tpl
+++ b/themes/hotel-reservation-theme/contact-form.tpl
@@ -42,7 +42,7 @@
 						<div class="htl-global-address-div col-md-8 col-sm-12">
 							{if isset($gblHtlPhone) && $gblHtlPhone }
 								<div>
-									<p class="global-address-header">{l s='Main Branch'}</p>
+									<p class="global-address-header"><i class="icon-bed"></i> {l s='Main Branch'}</p>
 									<p class="global-address-value">
 										{$gblHtlAddress}
 									</p>
@@ -50,7 +50,7 @@
 							{/if}
 							{if isset($gblHtlPhone) && $gblHtlPhone}
 								<div>
-									<p class="global-address-header">{l s='Phone'}</p>
+									<p class="global-address-header"><i class="icon-phone"></i> {l s='Phone'}</p>
 									<p class="global-address-value">
 										{$gblHtlPhone}
 									</p>
@@ -58,12 +58,28 @@
 							{/if}
 							{if isset($gblHtlEmail) && $gblHtlEmail}
 								<div>
-									<p class="global-address-header">{l s='Mail Us'}</p>
+									<p class="global-address-header"><i class="icon-envelope"></i> {l s='Mail Us'}</p>
 									<p class="global-address-value">
 										{$gblHtlEmail}
 									</p>
 								</div>
 							{/if}
+							{if isset($gblHtlRegistrationNumber) && $gblHtlRegistrationNumber}
+								<div>
+									<p class="global-address-header"><i class="icon-book"></i> {l s='Registration number'}</p>
+									<p class="global-address-value">
+										{$gblHtlRegistrationNumber}
+									</p>
+								</div>
+							{/if}
+							{if isset($gblHtlFax) && $gblHtlFax}
+								<div>
+									<p class="global-address-header"><i class="icon-fax"></i> {l s='Fax'}</p>
+									<p class="global-address-value">
+										{$gblHtlFax}
+									</p>
+								</div>
+							{/if}
 						</div>
 					{/block}
 				</div>

From 5d497b58ba2a493f9379671e705f9eabb21b827b Mon Sep 17 00:00:00 2001
From: Sumit Panwar <sumit201@webkul.in>
Date: Sat, 14 Jun 2025 14:10:03 +0530
Subject: [PATCH 11/42] =?UTF-8?q?Fixed:=20Customer=20unable=20to=20book=20?=
 =?UTF-8?q?room=20from=20frontoffice=20when=20admin=20created=20=E2=80=9Ca?=
 =?UTF-8?q?uto=20added=E2=80=9D=20service=20for=20that=20room=20during=20c?=
 =?UTF-8?q?heckout?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controllers/admin/AdminCartsController.php               | 6 +++++-
 .../classes/RoomTypeServiceProduct.php                   | 9 ++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php
index fa9c3abfa..9b8a0036d 100644
--- a/controllers/admin/AdminCartsController.php
+++ b/controllers/admin/AdminCartsController.php
@@ -1381,7 +1381,7 @@ class AdminCartsControllerCore extends AdminController
                         foreach ($languages as $lang) {
                             $objServiceProduct->link_rewrite[$lang['id_lang']] = Tools::link_rewrite($name);
                         }
-                        $objServiceProduct->available_for_order = true;
+                        $objServiceProduct->available_for_order = false;
                         $objServiceProduct->show_price = true;
                         $objServiceProduct->is_virtual = true;
                         $objServiceProduct->auto_add_to_cart = $autoAdded;
@@ -1395,6 +1395,10 @@ class AdminCartsControllerCore extends AdminController
 
                         // ======= Create Service product END =========
                         if ($objServiceProduct->save()) {
+                            $objServiceProduct->updateCategories(array(
+                                Configuration::get('PS_SERVICE_CATEGORY')
+                            ));
+
                             $objRoomTypeServiceProduct = new RoomTypeServiceProduct();
                             $objRoomTypeServiceProduct->addRoomProductLink(
                                 $objServiceProduct->id,
diff --git a/modules/hotelreservationsystem/classes/RoomTypeServiceProduct.php b/modules/hotelreservationsystem/classes/RoomTypeServiceProduct.php
index a7aed3b9f..7636092c1 100644
--- a/modules/hotelreservationsystem/classes/RoomTypeServiceProduct.php
+++ b/modules/hotelreservationsystem/classes/RoomTypeServiceProduct.php
@@ -139,9 +139,16 @@ class RoomTypeServiceProduct extends ObjectModel
     public static function getAutoAddServices($idProduct, $dateFrom = null, $dateTo = null, $priceAdditionType = null, $useTax = null, $use_reduc = 1)
     {
         if (Product::isBookingProduct($idProduct)) {
+            $context = Context::getContext();
+            $front = true;
+            if (!in_array($context->controller->controller_type, array('front', 'modulefront'))) {
+                $front = false;
+            }
+
             $sql = 'SELECT p.`id_product` FROM  `'._DB_PREFIX_.'htl_room_type_service_product` rsp
             INNER JOIN `'._DB_PREFIX_.'product` p ON (rsp.`id_product` = p.`id_product` AND p.`auto_add_to_cart` = 1)
-            WHERE p.`active` = 1 AND `id_element` = '.(int)$idProduct.' AND `element_type` = '.self::WK_ELEMENT_TYPE_ROOM_TYPE;
+            WHERE p.`active` = 1 AND `id_element` = '.(int)$idProduct.' AND `element_type` = '.self::WK_ELEMENT_TYPE_ROOM_TYPE.
+            ($front ? ' AND p.`available_for_order` = 1':'');
             if (!is_null($priceAdditionType)) {
                 $sql .= ' AND p.`price_addition_type` = '.$priceAdditionType;
             }

From de6249ffbf9742616e8269943f32b32256e11fa6 Mon Sep 17 00:00:00 2001
From: Sumit Panwar <sumit201@webkul.in>
Date: Sat, 14 Jun 2025 14:41:09 +0530
Subject: [PATCH 12/42] Fixed: When booking is deleted while reallocating,
 refund requests are not deleted

---
 .../hotelreservationsystem/classes/HotelBookingDetail.php    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/hotelreservationsystem/classes/HotelBookingDetail.php b/modules/hotelreservationsystem/classes/HotelBookingDetail.php
index d15b53785..f3dc7c140 100644
--- a/modules/hotelreservationsystem/classes/HotelBookingDetail.php
+++ b/modules/hotelreservationsystem/classes/HotelBookingDetail.php
@@ -2290,7 +2290,10 @@ class HotelBookingDetail extends ObjectModel
 
                 // delete the booking detail
                 $objOldHotelBooking = new HotelBookingDetail($idHotelBooking);
-                $objOldHotelBooking->delete();
+                if ($objOldHotelBooking->delete()) {
+                    // delete refund request of the room if exists.
+                    OrderReturnDetail::deleteReturnDetailByIdBookingDetail($objOldHotelBooking->id_order, $idHotelBooking);
+                }
 
                 // ===============================================================
                 // END Delete Process of the old booking

From f1b55f46c3e3db0b3b58a1072970772209711225 Mon Sep 17 00:00:00 2001
From: Sumit Panwar <sumit201@webkul.in>
Date: Sat, 14 Jun 2025 15:05:56 +0530
Subject: [PATCH 13/42] Fixed: Getting error when customer cancel booking when
 order status is Awaiting payment

---
 .../classes/HotelBookingDetail.php                       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/hotelreservationsystem/classes/HotelBookingDetail.php b/modules/hotelreservationsystem/classes/HotelBookingDetail.php
index d15b53785..1cc139b29 100644
--- a/modules/hotelreservationsystem/classes/HotelBookingDetail.php
+++ b/modules/hotelreservationsystem/classes/HotelBookingDetail.php
@@ -3430,18 +3430,21 @@ class HotelBookingDetail extends ObjectModel
                                 $objOrderDetail->product_quantity_refunded = $objOrderDetail->product_quantity;
                             }
 
-                            $objOrderDetail->total_price_tax_excl -= Tools::processPriceRounding(
+                            $objOrderDetail->total_price_tax_excl -= (float) Tools::processPriceRounding(
                                 $objOrderDetail->total_price_tax_excl,
                                 1,
                                 $objOrder->round_type,
                                 $objOrder->round_mode
                             );
-                            $objOrderDetail->total_price_tax_incl -= Tools::processPriceRounding(
+                            $objOrderDetail->total_price_tax_excl = $objOrderDetail->total_price_tax_excl > 0 ? $objOrderDetail->total_price_tax_excl : 0;
+
+                            $objOrderDetail->total_price_tax_incl -= (float) Tools::processPriceRounding(
                                 $objOrderDetail->total_price_tax_incl,
                                 1,
                                 $objOrder->round_type,
                                 $objOrder->round_mode
                             );
+                            $objOrderDetail->total_price_tax_incl = $objOrderDetail->total_price_tax_incl > 0 ? $objOrderDetail->total_price_tax_incl : 0;
 
                             $objOrderDetail->save();
                         }
@@ -3474,6 +3477,7 @@ class HotelBookingDetail extends ObjectModel
                         $objOrder->round_type,
                         $objOrder->round_mode
                     );
+                    $objOrderDetail->total_price_tax_incl = $objOrderDetail->total_price_tax_incl > 0 ? $objOrderDetail->total_price_tax_incl : 0;
 
                     $objOrderDetail->total_price_tax_excl -= Tools::processPriceRounding(
                         $this->total_price_tax_excl,
@@ -3481,6 +3485,7 @@ class HotelBookingDetail extends ObjectModel
                         $objOrder->round_type,
                         $objOrder->round_mode
                     );
+                    $objOrderDetail->total_price_tax_excl = $objOrderDetail->total_price_tax_excl > 0 ? $objOrderDetail->total_price_tax_excl : 0;
 
                     if (Validate::isLoadedObject($objOrder = new Order($this->id_order))) {
                         $objOrder->total_paid = Tools::ps_round(

From 536d230d3422f0e94f87213c7295d19bb4803370 Mon Sep 17 00:00:00 2001
From: azhar bhat <azharbhat.qlo098@webkul.in>
Date: Sat, 14 Jun 2025 15:22:31 +0530
Subject: [PATCH 14/42] documentation link updated

---
 .../template/controllers/dashboard/helpers/view/view.tpl    | 2 +-
 install/langs/bg/install.php                                | 6 +++---
 install/langs/bn/install.php                                | 6 +++---
 install/langs/br/install.php                                | 6 +++---
 install/langs/ca/install.php                                | 6 +++---
 install/langs/cs/install.php                                | 6 +++---
 install/langs/de/install.php                                | 4 ++--
 install/langs/en/install.php                                | 6 +++---
 install/langs/es/install.php                                | 6 +++---
 install/langs/fa/install.php                                | 6 +++---
 install/langs/fr/install.php                                | 6 +++---
 install/langs/he/install.php                                | 6 +++---
 install/langs/hr/install.php                                | 6 +++---
 install/langs/hu/install.php                                | 6 +++---
 install/langs/id/install.php                                | 6 +++---
 install/langs/it/install.php                                | 6 +++---
 install/langs/lt/install.php                                | 6 +++---
 install/langs/mk/install.php                                | 6 +++---
 install/langs/nl/install.php                                | 6 +++---
 install/langs/no/install.php                                | 6 +++---
 install/langs/pl/install.php                                | 6 +++---
 install/langs/pt/install.php                                | 6 +++---
 install/langs/qc/install.php                                | 6 +++---
 install/langs/ro/install.php                                | 6 +++---
 install/langs/ru/install.php                                | 6 +++---
 install/langs/si/install.php                                | 6 +++---
 install/langs/sr/install.php                                | 6 +++---
 install/langs/sv/install.php                                | 6 +++---
 install/langs/tr/install.php                                | 6 +++---
 install/langs/tw/install.php                                | 6 +++---
 install/langs/vn/install.php                                | 6 +++---
 install/langs/zh/install.php                                | 6 +++---
 install/theme/views/process.phtml                           | 2 +-
 33 files changed, 94 insertions(+), 94 deletions(-)

diff --git a/admin/themes/default/template/controllers/dashboard/helpers/view/view.tpl b/admin/themes/default/template/controllers/dashboard/helpers/view/view.tpl
index 593acfed7..b8574a4a9 100644
--- a/admin/themes/default/template/controllers/dashboard/helpers/view/view.tpl
+++ b/admin/themes/default/template/controllers/dashboard/helpers/view/view.tpl
@@ -128,7 +128,7 @@
                     <section class="dash_links widget panel">
                         <h3><i class="icon-link"></i> {l s="Help Center"}</h3>
                             <dl>
-                                <dt><a href="https://qloapps.com/qlo-reservation-system/" class="_blank">{l s="Official Documentation"}</a></dt>
+                                <dt><a href="https://docs.qloapps.com/" class="_blank">{l s="Official Documentation"}</a></dt>
                                 <dd>{l s="QloApps User Guide"}</dd>
                             </dl>
                             <dl>
diff --git a/install/langs/bg/install.php b/install/langs/bg/install.php
index 1f1fd353a..81c68ce0d 100644
--- a/install/langs/bg/install.php
+++ b/install/langs/bg/install.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'informations' => array(
-		'documentation' => 'https://qloapps.com/qlo-reservation-system/',
+		'documentation' => 'https://docs.qloapps.com/',
 		'documentation_upgrade' => 'https://webkul.uvdesk.com/',
 		'forum' => 'https://forums.qloapps.com/',
 		'blog' => 'https://qloapps.com/blog/',
@@ -10,7 +10,7 @@ return array(
 		'tailored_help' => 'https://webkul.uvdesk.com/',
 		'contact' => 'https://qloapps.com/contact/',
 		'services' => 'https://qloapps.com/contact/',
-		'tutorials' => 'https://qloapps.com/qlo-reservation-system/',
+		'tutorials' => 'https://docs.qloapps.com/',
 		'installation_guide' => 'https://qloapps.com/qloapps-installation-process/',
 		'install_help' => 'https://qloapps.com/install-qloapps/',
 	),
@@ -206,7 +206,7 @@ return array(
 		'Discover Your Website' => 'Открийте вашия уебсайт',
 		'Share your experience with your friends!' => 'Споделете опита си с приятелите си!',
 		'I just built an online hotel booking website with QloApps!' => 'Току-що създадох уебсайт за онлайн резервация на хотел с QloApps!',
-		'See all the features here : https://qloapps.com/qlo-reservation-system/' => 'Вижте всички функции тук: https://qloapps.com/qlo-reservation-system/',
+		'See all the features here : https://docs.qloapps.com/' => 'Вижте всички функции тук: https://docs.qloapps.com/',
 		'Tweet' => 'Tweet',
 		'Share' => 'Дял',
 		'Google+' => 'Google+',
diff --git a/install/langs/bn/install.php b/install/langs/bn/install.php
index e6825eacb..5d4ab9a3b 100644
--- a/install/langs/bn/install.php
+++ b/install/langs/bn/install.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'informations' => array(
-		'documentation' => 'https://qloapps.com/qlo-reservation-system/',
+		'documentation' => 'https://docs.qloapps.com/',
 		'documentation_upgrade' => 'https://webkul.uvdesk.com/',
 		'forum' => 'https://forums.qloapps.com/',
 		'blog' => 'https://qloapps.com/blog/',
@@ -10,7 +10,7 @@ return array(
 		'tailored_help' => 'https://webkul.uvdesk.com/',
 		'contact' => 'https://qloapps.com/contact/',
 		'services' => 'https://qloapps.com/contact/',
-		'tutorials' => 'https://qloapps.com/qlo-reservation-system/',
+		'tutorials' => 'https://docs.qloapps.com/',
 		'installation_guide' => 'https://qloapps.com/qloapps-installation-process/',
 		'install_help' => 'https://qloapps.com/install-qloapps/',
 	),
@@ -206,7 +206,7 @@ return array(
 		'Discover Your Website' => 'আপনার ওয়েবসাইট আবিষ্কার করুন',
 		'Share your experience with your friends!' => 'আপনার বন্ধুদের সাথে আপনার অভিজ্ঞতা শেয়ার করুন!',
 		'I just built an online hotel booking website with QloApps!' => 'আমি এইমাত্র QloApps দিয়ে একটি অনলাইন হোটেল বুকিং ওয়েবসাইট তৈরি করেছি!',
-		'See all the features here : https://qloapps.com/qlo-reservation-system/' => 'এখানে সমস্ত বৈশিষ্ট্য দেখুন: https://qloapps.com/qlo-reservation-system/',
+		'See all the features here : https://docs.qloapps.com/' => 'এখানে সমস্ত বৈশিষ্ট্য দেখুন: https://docs.qloapps.com/',
 		'Tweet' => 'টুইট',
 		'Share' => 'শেয়ার করুন',
 		'Google+' => 'Google+',
diff --git a/install/langs/br/install.php b/install/langs/br/install.php
index 46c5ebfce..349e667b1 100644
--- a/install/langs/br/install.php
+++ b/install/langs/br/install.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'informations' => array(
-		'documentation' => 'https://qloapps.com/qlo-reservation-system/',
+		'documentation' => 'https://docs.qloapps.com/',
 		'documentation_upgrade' => 'https://webkul.uvdesk.com/',
 		'forum' => 'https://forums.qloapps.com/',
 		'blog' => 'https://qloapps.com/blog/',
@@ -10,7 +10,7 @@ return array(
 		'tailored_help' => 'https://webkul.uvdesk.com/',
 		'contact' => 'https://qloapps.com/contact/',
 		'services' => 'https://qloapps.com/contact/',
-		'tutorials' => 'https://qloapps.com/qlo-reservation-system/',
+		'tutorials' => 'https://docs.qloapps.com/',
 		'installation_guide' => 'https://qloapps.com/qloapps-installation-process/',
 		'install_help' => 'https://qloapps.com/install-qloapps/',
 	),
@@ -206,7 +206,7 @@ return array(
 		'Discover Your Website' => 'Descubra o seu site',
 		'Share your experience with your friends!' => 'Compartilhe sua experiência com seus amigos!',
 		'I just built an online hotel booking website with QloApps!' => 'Acabei de criar um site de reservas de hotéis online com QloApps!',
-		'See all the features here : https://qloapps.com/qlo-reservation-system/' => 'Veja todos os recursos aqui: https://qloapps.com/qlo-reservation-system/',
+		'See all the features here : https://docs.qloapps.com/' => 'Veja todos os recursos aqui: https://docs.qloapps.com/',
 		'Tweet' => 'Tuitar',
 		'Share' => 'Compartilhar',
 		'Google+' => 'Google+',
diff --git a/install/langs/ca/install.php b/install/langs/ca/install.php
index 46e4c4c1e..0ddf9340a 100644
--- a/install/langs/ca/install.php
+++ b/install/langs/ca/install.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'informations' => array(
-		'documentation' => 'https://qloapps.com/qlo-reservation-system/',
+		'documentation' => 'https://docs.qloapps.com/',
 		'documentation_upgrade' => 'https://webkul.uvdesk.com/',
 		'forum' => 'https://forums.qloapps.com/',
 		'blog' => 'https://qloapps.com/blog/',
@@ -10,7 +10,7 @@ return array(
 		'tailored_help' => 'https://webkul.uvdesk.com/',
 		'contact' => 'https://qloapps.com/contact/',
 		'services' => 'https://qloapps.com/contact/',
-		'tutorials' => 'https://qloapps.com/qlo-reservation-system/',
+		'tutorials' => 'https://docs.qloapps.com/',
 		'installation_guide' => 'https://qloapps.com/qloapps-installation-process/',
 		'install_help' => 'https://qloapps.com/install-qloapps/',
 	),
@@ -206,7 +206,7 @@ return array(
 		'Discover Your Website' => 'Descobriu el vostre lloc web',
 		'Share your experience with your friends!' => 'Comparteix la teva experiència amb els teus amics!',
 		'I just built an online hotel booking website with QloApps!' => 'Acabo de crear un lloc web de reserves d\'hotels en línia amb QloApps!',
-		'See all the features here : https://qloapps.com/qlo-reservation-system/' => 'Consulteu totes les funcions aquí: https://qloapps.com/qlo-reservation-system/',
+		'See all the features here : https://docs.qloapps.com/' => 'Consulteu totes les funcions aquí: https://docs.qloapps.com/',
 		'Tweet' => 'Tuitejar',
 		'Share' => 'Compartir',
 		'Google+' => 'Google+',
diff --git a/install/langs/cs/install.php b/install/langs/cs/install.php
index 68f05b08d..64c17af2f 100644
--- a/install/langs/cs/install.php
+++ b/install/langs/cs/install.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'informations' => array(
-		'documentation' => 'https://qloapps.com/qlo-reservation-system/',
+		'documentation' => 'https://docs.qloapps.com/',
 		'documentation_upgrade' => 'https://webkul.uvdesk.com/',
 		'forum' => 'https://forums.qloapps.com/',
 		'blog' => 'https://qloapps.com/blog/',
@@ -10,7 +10,7 @@ return array(
 		'tailored_help' => 'https://webkul.uvdesk.com/',
 		'contact' => 'https://qloapps.com/contact/',
 		'services' => 'https://qloapps.com/contact/',
-		'tutorials' => 'https://qloapps.com/qlo-reservation-system/',
+		'tutorials' => 'https://docs.qloapps.com/',
 		'installation_guide' => 'https://qloapps.com/qloapps-installation-process/',
 		'install_help' => 'https://qloapps.com/install-qloapps/',
 	),
@@ -206,7 +206,7 @@ return array(
 		'Discover Your Website' => 'Objevte svůj web',
 		'Share your experience with your friends!' => 'Podělte se o své zkušenosti se svými přáteli!',
 		'I just built an online hotel booking website with QloApps!' => 'Právě jsem vytvořil webovou stránku pro online rezervaci hotelů s QloApps!',
-		'See all the features here : https://qloapps.com/qlo-reservation-system/' => 'Podívejte se na všechny funkce zde: https://qloapps.com/qlo-reservation-system/',
+		'See all the features here : https://docs.qloapps.com/' => 'Podívejte se na všechny funkce zde: https://docs.qloapps.com/',
 		'Tweet' => 'tweet',
 		'Share' => 'Podíl',
 		'Google+' => 'Google+',
diff --git a/install/langs/de/install.php b/install/langs/de/install.php
index 0e64a38b1..cee04fa28 100644
--- a/install/langs/de/install.php
+++ b/install/langs/de/install.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'informations' => array(
-		'documentation' => 'https://qloapps.com/qlo-reservation-system/',
+		'documentation' => 'https://docs.qloapps.com/',
 		'documentation_upgrade' => 'https://webkul.uvdesk.com/',
 		'forum' => 'https://forums.qloapps.com/',
 		'blog' => 'https://qloapps.com/blog/',
@@ -204,7 +204,7 @@ return array(
 		'Discover Your Website' => 'Entdecken Sie Ihre Website',
 		'Share your experience with your friends!' => 'Teilen Sie Ihre Erfahrungen mit Ihren Freunden!',
 		'I just built an online hotel booking website with QloApps!' => 'Ich habe gerade mit QloApps eine Online-Website zur Hotelbuchung erstellt!',
-		'See all the features here : https://qloapps.com/qlo-reservation-system/' => 'Alle Funktionen finden Sie hier: https://qloapps.com/qlo-reservation-system/',
+		'See all the features here : https://docs.qloapps.com/' => 'Alle Funktionen finden Sie hier: https://docs.qloapps.com/',
 		'Tweet' => 'Tweet',
 		'Share' => 'Aktie',
 		'Google+' => 'Google+',
diff --git a/install/langs/en/install.php b/install/langs/en/install.php
index e246fafbb..00360a53f 100644
--- a/install/langs/en/install.php
+++ b/install/langs/en/install.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'informations' => array(
-		'documentation' => 'https://qloapps.com/qlo-reservation-system/',
+		'documentation' => 'https://docs.qloapps.com/',
 		'documentation_upgrade' => 'https://webkul.uvdesk.com/',
 		'forum' => 'https://forums.qloapps.com/',
 		'blog' => 'https://qloapps.com/blog/',
@@ -10,7 +10,7 @@ return array(
 		'tailored_help' => 'https://webkul.uvdesk.com/',
 		'contact' => 'https://qloapps.com/contact/',
 		'services' => 'https://qloapps.com/contact/',
-		'tutorials' => 'https://qloapps.com/qlo-reservation-system/',
+		'tutorials' => 'https://docs.qloapps.com/',
 		'installation_guide' => 'https://qloapps.com/qloapps-installation-process/',
 		'install_help' => 'https://qloapps.com/install-qloapps/',
 	),
@@ -206,7 +206,7 @@ return array(
 		'Discover Your Website' => 'Discover Your Website',
 		'Share your experience with your friends!' => 'Share your experience with your friends!',
 		'I just built an online hotel booking website with QloApps!' => 'I just built an online hotel booking website with QloApps!',
-		'See all the features here : https://qloapps.com/qlo-reservation-system/' => 'See all the features here : https://qloapps.com/qlo-reservation-system/',
+		'See all the features here : https://docs.qloapps.com/' => 'See all the features here : https://docs.qloapps.com/',
 		'Tweet' => 'Tweet',
 		'Share' => 'Share',
 		'Google+' => 'Google+',
diff --git a/install/langs/es/install.php b/install/langs/es/install.php
index 1d9efdcc0..9eb2ac571 100644
--- a/install/langs/es/install.php
+++ b/install/langs/es/install.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'informations' => array(
-		'documentation' => 'https://qloapps.com/qlo-reservation-system/',
+		'documentation' => 'https://docs.qloapps.com/',
 		'documentation_upgrade' => 'https://webkul.uvdesk.com/',
 		'forum' => 'https://forums.qloapps.com/',
 		'blog' => 'https://qloapps.com/blog/',
@@ -10,7 +10,7 @@ return array(
 		'tailored_help' => 'https://webkul.uvdesk.com/',
 		'contact' => 'https://qloapps.com/contact/',
 		'services' => 'https://qloapps.com/contact/',
-		'tutorials' => 'https://qloapps.com/qlo-reservation-system/',
+		'tutorials' => 'https://docs.qloapps.com/',
 		'installation_guide' => 'https://qloapps.com/qloapps-installation-process/',
 		'install_help' => 'https://qloapps.com/install-qloapps/',
 	),
@@ -206,7 +206,7 @@ return array(
 		'Discover Your Website' => 'Descubra su sitio web',
 		'Share your experience with your friends!' => '¡Comparte tu experiencia con tus amigos!',
 		'I just built an online hotel booking website with QloApps!' => '¡Acabo de crear un sitio web de reservas de hoteles en línea con QloApps!',
-		'See all the features here : https://qloapps.com/qlo-reservation-system/' => 'Vea todas las funciones aquí: https://qloapps.com/qlo-reservation-system/',
+		'See all the features here : https://docs.qloapps.com/' => 'Vea todas las funciones aquí: https://docs.qloapps.com/',
 		'Tweet' => 'Pío',
 		'Share' => 'Compartir',
 		'Google+' => 'Google+',
diff --git a/install/langs/fa/install.php b/install/langs/fa/install.php
index 39df6cfbe..5b68b978e 100644
--- a/install/langs/fa/install.php
+++ b/install/langs/fa/install.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'informations' => array(
-		'documentation' => 'https://qloapps.com/qlo-reservation-system/',
+		'documentation' => 'https://docs.qloapps.com/',
 		'documentation_upgrade' => 'https://webkul.uvdesk.com/',
 		'forum' => 'https://forums.qloapps.com/',
 		'blog' => 'https://qloapps.com/blog/',
@@ -10,7 +10,7 @@ return array(
 		'tailored_help' => 'https://webkul.uvdesk.com/',
 		'contact' => 'https://qloapps.com/contact/',
 		'services' => 'https://qloapps.com/contact/',
-		'tutorials' => 'https://qloapps.com/qlo-reservation-system/',
+		'tutorials' => 'https://docs.qloapps.com/',
 		'installation_guide' => 'https://qloapps.com/qloapps-installation-process/',
 		'install_help' => 'https://qloapps.com/install-qloapps/',
 	),
@@ -206,7 +206,7 @@ return array(
 		'Discover Your Website' => 'وب سایت خود را کشف کنید',
 		'Share your experience with your friends!' => 'تجربه خود را با دوستان خود به اشتراک بگذارید!',
 		'I just built an online hotel booking website with QloApps!' => 'من به تازگی یک وب سایت رزرو هتل آنلاین با QloApps ایجاد کردم!',
-		'See all the features here : https://qloapps.com/qlo-reservation-system/' => 'همه ویژگی ها را اینجا ببینید: https://qloapps.com/qlo-reservation-system/',
+		'See all the features here : https://docs.qloapps.com/' => 'همه ویژگی ها را اینجا ببینید: https://docs.qloapps.com/',
 		'Tweet' => 'توییت',
 		'Share' => 'اشتراک گذاری',
 		'Google+' => '+Google',
diff --git a/install/langs/fr/install.php b/install/langs/fr/install.php
index 1ea623ad2..fd5ed5f34 100644
--- a/install/langs/fr/install.php
+++ b/install/langs/fr/install.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'informations' => array(
-		'documentation' => 'https://qloapps.com/qlo-reservation-system/',
+		'documentation' => 'https://docs.qloapps.com/',
 		'documentation_upgrade' => 'https://webkul.uvdesk.com/',
 		'forum' => 'https://forums.qloapps.com/',
 		'blog' => 'https://qloapps.com/blog/',
@@ -10,7 +10,7 @@ return array(
 		'tailored_help' => 'https://webkul.uvdesk.com/',
 		'contact' => 'https://qloapps.com/contact/',
 		'services' => 'https://qloapps.com/contact/',
-		'tutorials' => 'https://qloapps.com/qlo-reservation-system/',
+		'tutorials' => 'https://docs.qloapps.com/',
 		'installation_guide' => 'https://qloapps.com/qloapps-installation-process/',
 		'install_help' => 'https://qloapps.com/install-qloapps/',
 	),
@@ -206,7 +206,7 @@ return array(
 		'Discover Your Website' => 'Découvrez votre site Web',
 		'Share your experience with your friends!' => 'Partagez votre expérience avec vos amis !',
 		'I just built an online hotel booking website with QloApps!' => 'Je viens de créer un site de réservation d\'hôtel en ligne avec QloApps !',
-		'See all the features here : https://qloapps.com/qlo-reservation-system/' => 'Voir toutes les fonctionnalités ici : https://qloapps.com/qlo-reservation-system/',
+		'See all the features here : https://docs.qloapps.com/' => 'Voir toutes les fonctionnalités ici : https://docs.qloapps.com/',
 		'Tweet' => 'Tweeter',
 		'Share' => 'Partager',
 		'Google+' => 'Google+',
diff --git a/install/langs/he/install.php b/install/langs/he/install.php
index 7c8ffefb1..a203b5f7e 100644
--- a/install/langs/he/install.php
+++ b/install/langs/he/install.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'informations' => array(
-		'documentation' => 'https://qloapps.com/qlo-reservation-system/',
+		'documentation' => 'https://docs.qloapps.com/',
 		'documentation_upgrade' => 'https://webkul.uvdesk.com/',
 		'forum' => 'https://forums.qloapps.com/',
 		'blog' => 'https://qloapps.com/blog/',
@@ -10,7 +10,7 @@ return array(
 		'tailored_help' => 'https://webkul.uvdesk.com/',
 		'contact' => 'https://qloapps.com/contact/',
 		'services' => 'https://qloapps.com/contact/',
-		'tutorials' => 'https://qloapps.com/qlo-reservation-system/',
+		'tutorials' => 'https://docs.qloapps.com/',
 		'installation_guide' => 'https://qloapps.com/qloapps-installation-process/',
 		'install_help' => 'https://qloapps.com/install-qloapps/',
 	),
@@ -206,7 +206,7 @@ return array(
 		'Discover Your Website' => 'גלה את האתר שלך',
 		'Share your experience with your friends!' => 'שתף את החוויה שלך עם החברים שלך!',
 		'I just built an online hotel booking website with QloApps!' => 'זה עתה בניתי אתר אינטרנט להזמנת מלונות עם QloApps!',
-		'See all the features here : https://qloapps.com/qlo-reservation-system/' => 'ראה את כל התכונות כאן: https://qloapps.com/qlo-reservation-system/',
+		'See all the features here : https://docs.qloapps.com/' => 'ראה את כל התכונות כאן: https://docs.qloapps.com/',
 		'Tweet' => 'צִיוּץ',
 		'Share' => 'לַחֲלוֹק',
 		'Google+' => 'Google+',
diff --git a/install/langs/hr/install.php b/install/langs/hr/install.php
index a107f258d..dec41921c 100644
--- a/install/langs/hr/install.php
+++ b/install/langs/hr/install.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'informations' => array(
-		'documentation' => 'https://qloapps.com/qlo-reservation-system/',
+		'documentation' => 'https://docs.qloapps.com/',
 		'documentation_upgrade' => 'https://webkul.uvdesk.com/',
 		'forum' => 'https://forums.qloapps.com/',
 		'blog' => 'https://qloapps.com/blog/',
@@ -10,7 +10,7 @@ return array(
 		'tailored_help' => 'https://webkul.uvdesk.com/',
 		'contact' => 'https://qloapps.com/contact/',
 		'services' => 'https://qloapps.com/contact/',
-		'tutorials' => 'https://qloapps.com/qlo-reservation-system/',
+		'tutorials' => 'https://docs.qloapps.com/',
 		'installation_guide' => 'https://qloapps.com/qloapps-installation-process/',
 		'install_help' => 'https://qloapps.com/install-qloapps/',
 	),
@@ -206,7 +206,7 @@ return array(
 		'Discover Your Website' => 'Otkrijte svoju web stranicu',
 		'Share your experience with your friends!' => 'Podijelite svoje iskustvo s prijateljima!',
 		'I just built an online hotel booking website with QloApps!' => 'Upravo sam izradio web mjesto za online rezervaciju hotela s QloApps!',
-		'See all the features here : https://qloapps.com/qlo-reservation-system/' => 'Pogledajte sve značajke ovdje: https://qloapps.com/qlo-reservation-system/',
+		'See all the features here : https://docs.qloapps.com/' => 'Pogledajte sve značajke ovdje: https://docs.qloapps.com/',
 		'Tweet' => 'Cvrkut',
 		'Share' => 'Udio',
 		'Google+' => 'Google+',
diff --git a/install/langs/hu/install.php b/install/langs/hu/install.php
index 7777c8943..05d3a22cf 100644
--- a/install/langs/hu/install.php
+++ b/install/langs/hu/install.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'informations' => array(
-		'documentation' => 'https://qloapps.com/qlo-reservation-system/',
+		'documentation' => 'https://docs.qloapps.com/',
 		'documentation_upgrade' => 'https://webkul.uvdesk.com/',
 		'forum' => 'https://forums.qloapps.com/',
 		'blog' => 'https://qloapps.com/blog/',
@@ -10,7 +10,7 @@ return array(
 		'tailored_help' => 'https://webkul.uvdesk.com/',
 		'contact' => 'https://qloapps.com/contact/',
 		'services' => 'https://qloapps.com/contact/',
-		'tutorials' => 'https://qloapps.com/qlo-reservation-system/',
+		'tutorials' => 'https://docs.qloapps.com/',
 		'installation_guide' => 'https://qloapps.com/qloapps-installation-process/',
 		'install_help' => 'https://qloapps.com/install-qloapps/',
 	),
@@ -206,7 +206,7 @@ return array(
 		'Discover Your Website' => 'Fedezze fel webhelyét',
 		'Share your experience with your friends!' => 'Oszd meg tapasztalataidat barátaiddal!',
 		'I just built an online hotel booking website with QloApps!' => 'Most építettem egy online szállodafoglalási webhelyet a QloApps segítségével!',
-		'See all the features here : https://qloapps.com/qlo-reservation-system/' => 'Tekintse meg az összes funkciót itt: https://qloapps.com/qlo-reservation-system/',
+		'See all the features here : https://docs.qloapps.com/' => 'Tekintse meg az összes funkciót itt: https://docs.qloapps.com/',
 		'Tweet' => 'Csipog',
 		'Share' => 'Ossza meg',
 		'Google+' => 'Google+',
diff --git a/install/langs/id/install.php b/install/langs/id/install.php
index c6e09b7e6..17a88a89e 100644
--- a/install/langs/id/install.php
+++ b/install/langs/id/install.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'informations' => array(
-		'documentation' => 'https://qloapps.com/qlo-reservation-system/',
+		'documentation' => 'https://docs.qloapps.com/',
 		'documentation_upgrade' => 'https://webkul.uvdesk.com/',
 		'forum' => 'https://forums.qloapps.com/',
 		'blog' => 'https://qloapps.com/blog/',
@@ -10,7 +10,7 @@ return array(
 		'tailored_help' => 'https://webkul.uvdesk.com/',
 		'contact' => 'https://qloapps.com/contact/',
 		'services' => 'https://qloapps.com/contact/',
-		'tutorials' => 'https://qloapps.com/qlo-reservation-system/',
+		'tutorials' => 'https://docs.qloapps.com/',
 		'installation_guide' => 'https://qloapps.com/qloapps-installation-process/',
 		'install_help' => 'https://qloapps.com/install-qloapps/',
 	),
@@ -206,7 +206,7 @@ return array(
 		'Discover Your Website' => 'Temukan Situs Web Anda',
 		'Share your experience with your friends!' => 'Bagikan pengalaman Anda dengan teman-teman Anda!',
 		'I just built an online hotel booking website with QloApps!' => 'Saya baru saja membuat situs pemesanan hotel online dengan QloApps!',
-		'See all the features here : https://qloapps.com/qlo-reservation-system/' => 'Lihat semua fitur di sini: https://qloapps.com/qlo-reservation-system/',
+		'See all the features here : https://docs.qloapps.com/' => 'Lihat semua fitur di sini: https://docs.qloapps.com/',
 		'Tweet' => 'Menciak',
 		'Share' => 'Membagikan',
 		'Google+' => 'Google+',
diff --git a/install/langs/it/install.php b/install/langs/it/install.php
index 0cd48c533..e82aead3d 100644
--- a/install/langs/it/install.php
+++ b/install/langs/it/install.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'informations' => array(
-		'documentation' => 'https://qloapps.com/qlo-reservation-system/',
+		'documentation' => 'https://docs.qloapps.com/',
 		'documentation_upgrade' => 'https://webkul.uvdesk.com/',
 		'forum' => 'https://forums.qloapps.com/',
 		'blog' => 'https://qloapps.com/blog/',
@@ -10,7 +10,7 @@ return array(
 		'tailored_help' => 'https://webkul.uvdesk.com/',
 		'contact' => 'https://qloapps.com/contact/',
 		'services' => 'https://qloapps.com/contact/',
-		'tutorials' => 'https://qloapps.com/qlo-reservation-system/',
+		'tutorials' => 'https://docs.qloapps.com/',
 		'installation_guide' => 'https://qloapps.com/qloapps-installation-process/',
 		'install_help' => 'https://qloapps.com/install-qloapps/',
 	),
@@ -206,7 +206,7 @@ return array(
 		'Discover Your Website' => 'Scopri il tuo sito web',
 		'Share your experience with your friends!' => 'Condividi la tua esperienza con i tuoi amici!',
 		'I just built an online hotel booking website with QloApps!' => 'Ho appena creato un sito web di prenotazione di hotel online con QloApps!',
-		'See all the features here : https://qloapps.com/qlo-reservation-system/' => 'Vedi tutte le funzionalità qui: https://qloapps.com/qlo-reservation-system/',
+		'See all the features here : https://docs.qloapps.com/' => 'Vedi tutte le funzionalità qui: https://docs.qloapps.com/',
 		'Tweet' => 'Twitta',
 		'Share' => 'Condividere',
 		'Google+' => 'Google+',
diff --git a/install/langs/lt/install.php b/install/langs/lt/install.php
index 0e2013561..b90ba3b21 100644
--- a/install/langs/lt/install.php
+++ b/install/langs/lt/install.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'informations' => array(
-		'documentation' => 'https://qloapps.com/qlo-reservation-system/',
+		'documentation' => 'https://docs.qloapps.com/',
 		'documentation_upgrade' => 'https://webkul.uvdesk.com/',
 		'forum' => 'https://forums.qloapps.com/',
 		'blog' => 'https://qloapps.com/blog/',
@@ -10,7 +10,7 @@ return array(
 		'tailored_help' => 'https://webkul.uvdesk.com/',
 		'contact' => 'https://qloapps.com/contact/',
 		'services' => 'https://qloapps.com/contact/',
-		'tutorials' => 'https://qloapps.com/qlo-reservation-system/',
+		'tutorials' => 'https://docs.qloapps.com/',
 		'installation_guide' => 'https://qloapps.com/qloapps-installation-process/',
 		'install_help' => 'https://qloapps.com/install-qloapps/',
 	),
@@ -206,7 +206,7 @@ return array(
 		'Discover Your Website' => 'Atraskite savo svetainę',
 		'Share your experience with your friends!' => 'Pasidalinkite savo patirtimi su draugais!',
 		'I just built an online hotel booking website with QloApps!' => 'Ką tik sukūriau internetinę viešbučių užsakymo svetainę su QloApps!',
-		'See all the features here : https://qloapps.com/qlo-reservation-system/' => 'Peržiūrėkite visas funkcijas čia: https://qloapps.com/qlo-reservation-system/',
+		'See all the features here : https://docs.qloapps.com/' => 'Peržiūrėkite visas funkcijas čia: https://docs.qloapps.com/',
 		'Tweet' => 'Tviteryje',
 		'Share' => 'Dalintis',
 		'Google+' => 'Google+',
diff --git a/install/langs/mk/install.php b/install/langs/mk/install.php
index 38df71d70..81e448e72 100644
--- a/install/langs/mk/install.php
+++ b/install/langs/mk/install.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'informations' => array(
-		'documentation' => 'https://qloapps.com/qlo-reservation-system/',
+		'documentation' => 'https://docs.qloapps.com/',
 		'documentation_upgrade' => 'https://webkul.uvdesk.com/',
 		'forum' => 'https://forums.qloapps.com/',
 		'blog' => 'https://qloapps.com/blog/',
@@ -10,7 +10,7 @@ return array(
 		'tailored_help' => 'https://webkul.uvdesk.com/',
 		'contact' => 'https://qloapps.com/contact/',
 		'services' => 'https://qloapps.com/contact/',
-		'tutorials' => 'https://qloapps.com/qlo-reservation-system/',
+		'tutorials' => 'https://docs.qloapps.com/',
 		'installation_guide' => 'https://qloapps.com/qloapps-installation-process/',
 		'install_help' => 'https://qloapps.com/install-qloapps/',
 	),
@@ -206,7 +206,7 @@ return array(
 		'Discover Your Website' => 'Откријте ја вашата веб-страница',
 		'Share your experience with your friends!' => 'Споделете го вашето искуство со вашите пријатели!',
 		'I just built an online hotel booking website with QloApps!' => 'Само што изградив веб-страница за онлајн резервации на хотели со QloApps!',
-		'See all the features here : https://qloapps.com/qlo-reservation-system/' => 'Погледнете ги сите карактеристики овде: https://qloapps.com/qlo-reservation-system/',
+		'See all the features here : https://docs.qloapps.com/' => 'Погледнете ги сите карактеристики овде: https://docs.qloapps.com/',
 		'Tweet' => 'Твитнете',
 		'Share' => 'Споделете',
 		'Google+' => 'Google+',
diff --git a/install/langs/nl/install.php b/install/langs/nl/install.php
index c764a3440..9f8f32a78 100644
--- a/install/langs/nl/install.php
+++ b/install/langs/nl/install.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'informations' => array(
-		'documentation' => 'https://qloapps.com/qlo-reservation-system/',
+		'documentation' => 'https://docs.qloapps.com/',
 		'documentation_upgrade' => 'https://webkul.uvdesk.com/',
 		'forum' => 'https://forums.qloapps.com/',
 		'blog' => 'https://qloapps.com/blog/',
@@ -10,7 +10,7 @@ return array(
 		'tailored_help' => 'https://webkul.uvdesk.com/',
 		'contact' => 'https://qloapps.com/contact/',
 		'services' => 'https://qloapps.com/contact/',
-		'tutorials' => 'https://qloapps.com/qlo-reservation-system/',
+		'tutorials' => 'https://docs.qloapps.com/',
 		'installation_guide' => 'https://qloapps.com/qloapps-installation-process/',
 		'install_help' => 'https://qloapps.com/install-qloapps/',
 	),
@@ -206,7 +206,7 @@ return array(
 		'Discover Your Website' => 'Ontdek uw website',
 		'Share your experience with your friends!' => 'Deel uw ervaring met uw vrienden!',
 		'I just built an online hotel booking website with QloApps!' => 'Ik heb zojuist een online hotelboekingswebsite gebouwd met QloApps!',
-		'See all the features here : https://qloapps.com/qlo-reservation-system/' => 'Bekijk hier alle functies: https://qloapps.com/qlo-reservation-system/',
+		'See all the features here : https://docs.qloapps.com/' => 'Bekijk hier alle functies: https://docs.qloapps.com/',
 		'Tweet' => 'Tweeten',
 		'Share' => 'Deel',
 		'Google+' => 'Google+',
diff --git a/install/langs/no/install.php b/install/langs/no/install.php
index e6455c786..d54bf033a 100644
--- a/install/langs/no/install.php
+++ b/install/langs/no/install.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'informations' => array(
-		'documentation' => 'https://qloapps.com/qlo-reservation-system/',
+		'documentation' => 'https://docs.qloapps.com/',
 		'documentation_upgrade' => 'https://webkul.uvdesk.com/',
 		'forum' => 'https://forums.qloapps.com/',
 		'blog' => 'https://qloapps.com/blog/',
@@ -10,7 +10,7 @@ return array(
 		'tailored_help' => 'https://webkul.uvdesk.com/',
 		'contact' => 'https://qloapps.com/contact/',
 		'services' => 'https://qloapps.com/contact/',
-		'tutorials' => 'https://qloapps.com/qlo-reservation-system/',
+		'tutorials' => 'https://docs.qloapps.com/',
 		'installation_guide' => 'https://qloapps.com/qloapps-installation-process/',
 		'install_help' => 'https://qloapps.com/install-qloapps/',
 	),
@@ -206,7 +206,7 @@ return array(
 		'Discover Your Website' => 'Oppdag nettstedet ditt',
 		'Share your experience with your friends!' => 'Del opplevelsen din med vennene dine!',
 		'I just built an online hotel booking website with QloApps!' => 'Jeg har nettopp bygget et nettsted for hotellbestilling på nett med QloApps!',
-		'See all the features here : https://qloapps.com/qlo-reservation-system/' => 'Se alle funksjonene her: https://qloapps.com/qlo-reservation-system/',
+		'See all the features here : https://docs.qloapps.com/' => 'Se alle funksjonene her: https://docs.qloapps.com/',
 		'Tweet' => 'kvitring',
 		'Share' => 'Dele',
 		'Google+' => 'Google+',
diff --git a/install/langs/pl/install.php b/install/langs/pl/install.php
index 4d736d6bf..a349f46cc 100644
--- a/install/langs/pl/install.php
+++ b/install/langs/pl/install.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'informations' => array(
-		'documentation' => 'https://qloapps.com/qlo-reservation-system/',
+		'documentation' => 'https://docs.qloapps.com/',
 		'documentation_upgrade' => 'https://webkul.uvdesk.com/',
 		'forum' => 'https://forums.qloapps.com/',
 		'blog' => 'https://qloapps.com/blog/',
@@ -10,7 +10,7 @@ return array(
 		'tailored_help' => 'https://webkul.uvdesk.com/',
 		'contact' => 'https://qloapps.com/contact/',
 		'services' => 'https://qloapps.com/contact/',
-		'tutorials' => 'https://qloapps.com/qlo-reservation-system/',
+		'tutorials' => 'https://docs.qloapps.com/',
 		'installation_guide' => 'https://qloapps.com/qloapps-installation-process/',
 		'install_help' => 'https://qloapps.com/install-qloapps/',
 	),
@@ -206,7 +206,7 @@ return array(
 		'Discover Your Website' => 'Odkryj swoją witrynę',
 		'Share your experience with your friends!' => 'Podziel się swoim doświadczeniem ze znajomymi!',
 		'I just built an online hotel booking website with QloApps!' => 'Właśnie zbudowałem witrynę internetową do rezerwacji hoteli online za pomocą QloApps!',
-		'See all the features here : https://qloapps.com/qlo-reservation-system/' => 'Zobacz wszystkie funkcje tutaj: https://qloapps.com/qlo-reservation-system/',
+		'See all the features here : https://docs.qloapps.com/' => 'Zobacz wszystkie funkcje tutaj: https://docs.qloapps.com/',
 		'Tweet' => 'Ćwierkać',
 		'Share' => 'Udział',
 		'Google+' => 'Google+',
diff --git a/install/langs/pt/install.php b/install/langs/pt/install.php
index 46c5ebfce..349e667b1 100644
--- a/install/langs/pt/install.php
+++ b/install/langs/pt/install.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'informations' => array(
-		'documentation' => 'https://qloapps.com/qlo-reservation-system/',
+		'documentation' => 'https://docs.qloapps.com/',
 		'documentation_upgrade' => 'https://webkul.uvdesk.com/',
 		'forum' => 'https://forums.qloapps.com/',
 		'blog' => 'https://qloapps.com/blog/',
@@ -10,7 +10,7 @@ return array(
 		'tailored_help' => 'https://webkul.uvdesk.com/',
 		'contact' => 'https://qloapps.com/contact/',
 		'services' => 'https://qloapps.com/contact/',
-		'tutorials' => 'https://qloapps.com/qlo-reservation-system/',
+		'tutorials' => 'https://docs.qloapps.com/',
 		'installation_guide' => 'https://qloapps.com/qloapps-installation-process/',
 		'install_help' => 'https://qloapps.com/install-qloapps/',
 	),
@@ -206,7 +206,7 @@ return array(
 		'Discover Your Website' => 'Descubra o seu site',
 		'Share your experience with your friends!' => 'Compartilhe sua experiência com seus amigos!',
 		'I just built an online hotel booking website with QloApps!' => 'Acabei de criar um site de reservas de hotéis online com QloApps!',
-		'See all the features here : https://qloapps.com/qlo-reservation-system/' => 'Veja todos os recursos aqui: https://qloapps.com/qlo-reservation-system/',
+		'See all the features here : https://docs.qloapps.com/' => 'Veja todos os recursos aqui: https://docs.qloapps.com/',
 		'Tweet' => 'Tuitar',
 		'Share' => 'Compartilhar',
 		'Google+' => 'Google+',
diff --git a/install/langs/qc/install.php b/install/langs/qc/install.php
index 1ea623ad2..fd5ed5f34 100644
--- a/install/langs/qc/install.php
+++ b/install/langs/qc/install.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'informations' => array(
-		'documentation' => 'https://qloapps.com/qlo-reservation-system/',
+		'documentation' => 'https://docs.qloapps.com/',
 		'documentation_upgrade' => 'https://webkul.uvdesk.com/',
 		'forum' => 'https://forums.qloapps.com/',
 		'blog' => 'https://qloapps.com/blog/',
@@ -10,7 +10,7 @@ return array(
 		'tailored_help' => 'https://webkul.uvdesk.com/',
 		'contact' => 'https://qloapps.com/contact/',
 		'services' => 'https://qloapps.com/contact/',
-		'tutorials' => 'https://qloapps.com/qlo-reservation-system/',
+		'tutorials' => 'https://docs.qloapps.com/',
 		'installation_guide' => 'https://qloapps.com/qloapps-installation-process/',
 		'install_help' => 'https://qloapps.com/install-qloapps/',
 	),
@@ -206,7 +206,7 @@ return array(
 		'Discover Your Website' => 'Découvrez votre site Web',
 		'Share your experience with your friends!' => 'Partagez votre expérience avec vos amis !',
 		'I just built an online hotel booking website with QloApps!' => 'Je viens de créer un site de réservation d\'hôtel en ligne avec QloApps !',
-		'See all the features here : https://qloapps.com/qlo-reservation-system/' => 'Voir toutes les fonctionnalités ici : https://qloapps.com/qlo-reservation-system/',
+		'See all the features here : https://docs.qloapps.com/' => 'Voir toutes les fonctionnalités ici : https://docs.qloapps.com/',
 		'Tweet' => 'Tweeter',
 		'Share' => 'Partager',
 		'Google+' => 'Google+',
diff --git a/install/langs/ro/install.php b/install/langs/ro/install.php
index f8ef55f5a..6bd82e6a7 100644
--- a/install/langs/ro/install.php
+++ b/install/langs/ro/install.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'informations' => array(
-		'documentation' => 'https://qloapps.com/qlo-reservation-system/',
+		'documentation' => 'https://docs.qloapps.com/',
 		'documentation_upgrade' => 'https://webkul.uvdesk.com/',
 		'forum' => 'https://forums.qloapps.com/',
 		'blog' => 'https://qloapps.com/blog/',
@@ -10,7 +10,7 @@ return array(
 		'tailored_help' => 'https://webkul.uvdesk.com/',
 		'contact' => 'https://qloapps.com/contact/',
 		'services' => 'https://qloapps.com/contact/',
-		'tutorials' => 'https://qloapps.com/qlo-reservation-system/',
+		'tutorials' => 'https://docs.qloapps.com/',
 		'installation_guide' => 'https://qloapps.com/qloapps-installation-process/',
 		'install_help' => 'https://qloapps.com/install-qloapps/',
 	),
@@ -206,7 +206,7 @@ return array(
 		'Discover Your Website' => 'Descoperiți site-ul dvs',
 		'Share your experience with your friends!' => 'Împărtășește-ți experiența cu prietenii tăi!',
 		'I just built an online hotel booking website with QloApps!' => 'Tocmai am creat un site web de rezervare hotelieră online cu QloApps!',
-		'See all the features here : https://qloapps.com/qlo-reservation-system/' => 'Vezi toate caracteristicile aici: https://qloapps.com/qlo-reservation-system/',
+		'See all the features here : https://docs.qloapps.com/' => 'Vezi toate caracteristicile aici: https://docs.qloapps.com/',
 		'Tweet' => 'Tweet',
 		'Share' => 'Acțiune',
 		'Google+' => 'Google+',
diff --git a/install/langs/ru/install.php b/install/langs/ru/install.php
index b58c5a711..2838f5924 100644
--- a/install/langs/ru/install.php
+++ b/install/langs/ru/install.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'informations' => array(
-		'documentation' => 'https://qloapps.com/qlo-reservation-system/',
+		'documentation' => 'https://docs.qloapps.com/',
 		'documentation_upgrade' => 'https://webkul.uvdesk.com/',
 		'forum' => 'https://forums.qloapps.com/',
 		'blog' => 'https://qloapps.com/blog/',
@@ -10,7 +10,7 @@ return array(
 		'tailored_help' => 'https://webkul.uvdesk.com/',
 		'contact' => 'https://qloapps.com/contact/',
 		'services' => 'https://qloapps.com/contact/',
-		'tutorials' => 'https://qloapps.com/qlo-reservation-system/',
+		'tutorials' => 'https://docs.qloapps.com/',
 		'installation_guide' => 'https://qloapps.com/qloapps-installation-process/',
 		'install_help' => 'https://qloapps.com/install-qloapps/',
 	),
@@ -206,7 +206,7 @@ return array(
 		'Discover Your Website' => 'Откройте для себя свой веб-сайт',
 		'Share your experience with your friends!' => 'Поделитесь своим опытом с друзьями!',
 		'I just built an online hotel booking website with QloApps!' => 'Я только что создал сайт онлайн-бронирования отелей с помощью QloApps!',
-		'See all the features here : https://qloapps.com/qlo-reservation-system/' => 'Посмотреть все функции можно здесь: https://qloapps.com/qlo-reservation-system/.',
+		'See all the features here : https://docs.qloapps.com/' => 'Посмотреть все функции можно здесь: https://docs.qloapps.com/.',
 		'Tweet' => 'Твитнуть',
 		'Share' => 'Делиться',
 		'Google+' => 'Гугл+',
diff --git a/install/langs/si/install.php b/install/langs/si/install.php
index 3dab1465c..25b6e1f4c 100644
--- a/install/langs/si/install.php
+++ b/install/langs/si/install.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'informations' => array(
-		'documentation' => 'https://qloapps.com/qlo-reservation-system/',
+		'documentation' => 'https://docs.qloapps.com/',
 		'documentation_upgrade' => 'https://webkul.uvdesk.com/',
 		'forum' => 'https://forums.qloapps.com/',
 		'blog' => 'https://qloapps.com/blog/',
@@ -10,7 +10,7 @@ return array(
 		'tailored_help' => 'https://webkul.uvdesk.com/',
 		'contact' => 'https://qloapps.com/contact/',
 		'services' => 'https://qloapps.com/contact/',
-		'tutorials' => 'https://qloapps.com/qlo-reservation-system/',
+		'tutorials' => 'https://docs.qloapps.com/',
 		'installation_guide' => 'https://qloapps.com/qloapps-installation-process/',
 		'install_help' => 'https://qloapps.com/install-qloapps/',
 	),
@@ -206,7 +206,7 @@ return array(
 		'Discover Your Website' => 'Odkrijte svoje spletno mesto',
 		'Share your experience with your friends!' => 'Delite svojo izkušnjo s prijatelji!',
 		'I just built an online hotel booking website with QloApps!' => 'Pravkar sem ustvaril spletno mesto za rezervacije hotelov s QloApps!',
-		'See all the features here : https://qloapps.com/qlo-reservation-system/' => 'Oglejte si vse funkcije tukaj: https://qloapps.com/qlo-reservation-system/',
+		'See all the features here : https://docs.qloapps.com/' => 'Oglejte si vse funkcije tukaj: https://docs.qloapps.com/',
 		'Tweet' => 'Tweet',
 		'Share' => 'Deliti',
 		'Google+' => 'Google+',
diff --git a/install/langs/sr/install.php b/install/langs/sr/install.php
index 0687da9f9..a88473d2e 100644
--- a/install/langs/sr/install.php
+++ b/install/langs/sr/install.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'informations' => array(
-		'documentation' => 'https://qloapps.com/qlo-reservation-system/',
+		'documentation' => 'https://docs.qloapps.com/',
 		'documentation_upgrade' => 'https://webkul.uvdesk.com/',
 		'forum' => 'https://forums.qloapps.com/',
 		'blog' => 'https://qloapps.com/blog/',
@@ -10,7 +10,7 @@ return array(
 		'tailored_help' => 'https://webkul.uvdesk.com/',
 		'contact' => 'https://qloapps.com/contact/',
 		'services' => 'https://qloapps.com/contact/',
-		'tutorials' => 'https://qloapps.com/qlo-reservation-system/',
+		'tutorials' => 'https://docs.qloapps.com/',
 		'installation_guide' => 'https://qloapps.com/qloapps-installation-process/',
 		'install_help' => 'https://qloapps.com/install-qloapps/',
 	),
@@ -206,7 +206,7 @@ return array(
 		'Discover Your Website' => 'Откријте своју веб локацију',
 		'Share your experience with your friends!' => 'Поделите своје искуство са пријатељима!',
 		'I just built an online hotel booking website with QloApps!' => 'Управо сам направио веб локацију за резервације хотела на мрежи са QloApps!',
-		'See all the features here : https://qloapps.com/qlo-reservation-system/' => 'Погледајте све функције овде: https://qloapps.com/qlo-reservation-system/',
+		'See all the features here : https://docs.qloapps.com/' => 'Погледајте све функције овде: https://docs.qloapps.com/',
 		'Tweet' => 'Твеет',
 		'Share' => 'Објави',
 		'Google+' => 'Гоогле+',
diff --git a/install/langs/sv/install.php b/install/langs/sv/install.php
index e96edf76e..aef24ee79 100644
--- a/install/langs/sv/install.php
+++ b/install/langs/sv/install.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'informations' => array(
-		'documentation' => 'https://qloapps.com/qlo-reservation-system/',
+		'documentation' => 'https://docs.qloapps.com/',
 		'documentation_upgrade' => 'https://webkul.uvdesk.com/',
 		'forum' => 'https://forums.qloapps.com/',
 		'blog' => 'https://qloapps.com/blog/',
@@ -10,7 +10,7 @@ return array(
 		'tailored_help' => 'https://webkul.uvdesk.com/',
 		'contact' => 'https://qloapps.com/contact/',
 		'services' => 'https://qloapps.com/contact/',
-		'tutorials' => 'https://qloapps.com/qlo-reservation-system/',
+		'tutorials' => 'https://docs.qloapps.com/',
 		'installation_guide' => 'https://qloapps.com/qloapps-installation-process/',
 		'install_help' => 'https://qloapps.com/install-qloapps/',
 	),
@@ -206,7 +206,7 @@ return array(
 		'Discover Your Website' => 'Upptäck din webbplats',
 		'Share your experience with your friends!' => 'Dela din upplevelse med dina vänner!',
 		'I just built an online hotel booking website with QloApps!' => 'Jag har precis byggt en webbsida för hotellbokning online med QloApps!',
-		'See all the features here : https://qloapps.com/qlo-reservation-system/' => 'Se alla funktioner här: https://qloapps.com/qlo-reservation-system/',
+		'See all the features here : https://docs.qloapps.com/' => 'Se alla funktioner här: https://docs.qloapps.com/',
 		'Tweet' => 'Tweet',
 		'Share' => 'Dela med sig',
 		'Google+' => 'Google+',
diff --git a/install/langs/tr/install.php b/install/langs/tr/install.php
index fc2729727..e6dfe4ac5 100644
--- a/install/langs/tr/install.php
+++ b/install/langs/tr/install.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'informations' => array(
-		'documentation' => 'https://qloapps.com/qlo-reservation-system/',
+		'documentation' => 'https://docs.qloapps.com/',
 		'documentation_upgrade' => 'https://webkul.uvdesk.com/',
 		'forum' => 'https://forums.qloapps.com/',
 		'blog' => 'https://qloapps.com/blog/',
@@ -10,7 +10,7 @@ return array(
 		'tailored_help' => 'https://webkul.uvdesk.com/',
 		'contact' => 'https://qloapps.com/contact/',
 		'services' => 'https://qloapps.com/contact/',
-		'tutorials' => 'https://qloapps.com/qlo-reservation-system/',
+		'tutorials' => 'https://docs.qloapps.com/',
 		'installation_guide' => 'https://qloapps.com/qloapps-installation-process/',
 		'install_help' => 'https://qloapps.com/install-qloapps/',
 	),
@@ -206,7 +206,7 @@ return array(
 		'Discover Your Website' => 'Web Sitenizi Keşfedin',
 		'Share your experience with your friends!' => 'Deneyiminizi arkadaşlarınızla paylaşın!',
 		'I just built an online hotel booking website with QloApps!' => 'Az önce QloApps ile bir çevrimiçi otel rezervasyon web sitesi oluşturdum!',
-		'See all the features here : https://qloapps.com/qlo-reservation-system/' => 'Tüm özellikleri burada görün: https://qloapps.com/qlo-reservation-system/',
+		'See all the features here : https://docs.qloapps.com/' => 'Tüm özellikleri burada görün: https://docs.qloapps.com/',
 		'Tweet' => 'Cıvıldamak',
 		'Share' => 'Paylaşmak',
 		'Google+' => 'Google+',
diff --git a/install/langs/tw/install.php b/install/langs/tw/install.php
index e8c2b762b..9a2266bb5 100644
--- a/install/langs/tw/install.php
+++ b/install/langs/tw/install.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'informations' => array(
-		'documentation' => 'https://qloapps.com/qlo-reservation-system/',
+		'documentation' => 'https://docs.qloapps.com/',
 		'documentation_upgrade' => 'https://webkul.uvdesk.com/',
 		'forum' => 'https://forums.qloapps.com/',
 		'blog' => 'https://qloapps.com/blog/',
@@ -10,7 +10,7 @@ return array(
 		'tailored_help' => 'https://webkul.uvdesk.com/',
 		'contact' => 'https://qloapps.com/contact/',
 		'services' => 'https://qloapps.com/contact/',
-		'tutorials' => 'https://qloapps.com/qlo-reservation-system/',
+		'tutorials' => 'https://docs.qloapps.com/',
 		'installation_guide' => 'https://qloapps.com/qloapps-installation-process/',
 		'install_help' => 'https://qloapps.com/install-qloapps/',
 	),
@@ -206,7 +206,7 @@ return array(
 		'Discover Your Website' => '發現您的網站',
 		'Share your experience with your friends!' => '與您的朋友分享您的經驗！',
 		'I just built an online hotel booking website with QloApps!' => '我剛剛使用 QloApps 建立了一個線上飯店預訂網站！',
-		'See all the features here : https://qloapps.com/qlo-reservation-system/' => '在這裡查看所有功能：https://qloapps.com/qlo-reservation-system/',
+		'See all the features here : https://docs.qloapps.com/' => '在這裡查看所有功能：https://docs.qloapps.com/',
 		'Tweet' => '鳴叫',
 		'Share' => '分享',
 		'Google+' => '谷歌+',
diff --git a/install/langs/vn/install.php b/install/langs/vn/install.php
index cb2872d3f..66be02b4c 100644
--- a/install/langs/vn/install.php
+++ b/install/langs/vn/install.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'informations' => array(
-		'documentation' => 'https://qloapps.com/qlo-reservation-system/',
+		'documentation' => 'https://docs.qloapps.com/',
 		'documentation_upgrade' => 'https://webkul.uvdesk.com/',
 		'forum' => 'https://forums.qloapps.com/',
 		'blog' => 'https://qloapps.com/blog/',
@@ -10,7 +10,7 @@ return array(
 		'tailored_help' => 'https://webkul.uvdesk.com/',
 		'contact' => 'https://qloapps.com/contact/',
 		'services' => 'https://qloapps.com/contact/',
-		'tutorials' => 'https://qloapps.com/qlo-reservation-system/',
+		'tutorials' => 'https://docs.qloapps.com/',
 		'installation_guide' => 'https://qloapps.com/qloapps-installation-process/',
 		'install_help' => 'https://qloapps.com/install-qloapps/',
 	),
@@ -206,7 +206,7 @@ return array(
 		'Discover Your Website' => 'Khám phá trang web của bạn',
 		'Share your experience with your friends!' => 'Chia sẻ kinh nghiệm của bạn với bạn bè của bạn!',
 		'I just built an online hotel booking website with QloApps!' => 'Tôi vừa xây dựng một trang web đặt phòng khách sạn trực tuyến với QloApps!',
-		'See all the features here : https://qloapps.com/qlo-reservation-system/' => 'Xem tất cả các tính năng tại đây: https://qloapps.com/qlo-reservation-system/',
+		'See all the features here : https://docs.qloapps.com/' => 'Xem tất cả các tính năng tại đây: https://docs.qloapps.com/',
 		'Tweet' => 'tiếng riu ríu',
 		'Share' => 'Chia sẻ',
 		'Google+' => 'Google+',
diff --git a/install/langs/zh/install.php b/install/langs/zh/install.php
index d5adaf7cd..95ef5a5dd 100644
--- a/install/langs/zh/install.php
+++ b/install/langs/zh/install.php
@@ -1,7 +1,7 @@
 <?php
 return array(
 	'informations' => array(
-		'documentation' => 'https://qloapps.com/qlo-reservation-system/',
+		'documentation' => 'https://docs.qloapps.com/',
 		'documentation_upgrade' => 'https://webkul.uvdesk.com/',
 		'forum' => 'https://forums.qloapps.com/',
 		'blog' => 'https://qloapps.com/blog/',
@@ -10,7 +10,7 @@ return array(
 		'tailored_help' => 'https://webkul.uvdesk.com/',
 		'contact' => 'https://qloapps.com/contact/',
 		'services' => 'https://qloapps.com/contact/',
-		'tutorials' => 'https://qloapps.com/qlo-reservation-system/',
+		'tutorials' => 'https://docs.qloapps.com/',
 		'installation_guide' => 'https://qloapps.com/qloapps-installation-process/',
 		'install_help' => 'https://qloapps.com/install-qloapps/',
 	),
@@ -206,7 +206,7 @@ return array(
 		'Discover Your Website' => '发现您的网站',
 		'Share your experience with your friends!' => '与您的朋友分享您的经验！',
 		'I just built an online hotel booking website with QloApps!' => '我刚刚用 QloApps 建立了一个在线酒店预订网站！',
-		'See all the features here : https://qloapps.com/qlo-reservation-system/' => '在此处查看所有功能：https://qloapps.com/qlo-reservation-system/',
+		'See all the features here : https://docs.qloapps.com/' => '在此处查看所有功能：https://docs.qloapps.com/',
 		'Tweet' => '鸣叫',
 		'Share' => '分享',
 		'Google+' => 'Google+',
diff --git a/install/theme/views/process.phtml b/install/theme/views/process.phtml
index e8e4e886d..e0000af81 100644
--- a/install/theme/views/process.phtml
+++ b/install/theme/views/process.phtml
@@ -113,7 +113,7 @@ var admin = '<?php echo(file_exists('../admin-dev') ? '../admin-dev' : '../admin
 
 	<div class="sharing">
 		<p><?php echo $this->l('Share your experience with your friends!'); ?></p>
-		<button type="button" class="btn-twitter" onclick="psinstall_twitter_click('<?php echo $this->l('I just built an online hotel booking website with QloApps!'); ?> <?php echo $this->l('See all the features here : https://qloapps.com/qlo-reservation-system/'); ?>');">
+		<button type="button" class="btn-twitter" onclick="psinstall_twitter_click('<?php echo $this->l('I just built an online hotel booking website with QloApps!'); ?> <?php echo $this->l('See all the features here : https://docs.qloapps.com/'); ?>');">
 			<i></i> <?php echo $this->l('Tweet'); ?>
 		</button>
 		<button type="button" class="btn-facebook" onclick="psinstall_facebook_click();">

From 72e3b529aee6c34d4bcd79ac770fb5cdffebcea1 Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Sat, 14 Jun 2025 15:51:47 +0530
Subject: [PATCH 15/42] Fixed: admin is able to save cart rules with empty room
 type selections

---
 .../admin/AdminCartRulesController.php        | 41 +++++++++++--------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/controllers/admin/AdminCartRulesController.php b/controllers/admin/AdminCartRulesController.php
index 5a9614206..c1e98e27e 100644
--- a/controllers/admin/AdminCartRulesController.php
+++ b/controllers/admin/AdminCartRulesController.php
@@ -285,7 +285,7 @@ class AdminCartRulesControllerCore extends AdminController
                         if (is_array($rule_array = Tools::getValue('product_rule_'.$rule_group_id)) && count($rule_array)) {
                             foreach ($rule_array as $rule_id) {
                                 if (Tools::getValue('product_rule_'.$rule_group_id.'_'.$rule_id.'_type') == 'products'
-                                    && in_array($reduction_product, Tools::getValue('product_rule_select_'.$rule_group_id.'_'.$rule_id))) {
+                                    && in_array($reduction_product, Tools::getValue('product_rule_select_'.$rule_group_id.'_'.$rule_id, []))) {
                                     $already_restricted = true;
                                     break 2;
                                 }
@@ -432,23 +432,32 @@ class AdminCartRulesControllerCore extends AdminController
         // Add product rule restrictions
         if (Tools::getValue('product_restriction') && is_array($ruleGroupArray = Tools::getValue('product_rule_group')) && count($ruleGroupArray)) {
             foreach ($ruleGroupArray as $ruleGroupId) {
-                Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_product_rule_group` (`id_cart_rule`, `quantity`)
-				VALUES ('.(int)$currentObject->id.', '.(int)Tools::getValue('product_rule_group_'.$ruleGroupId.'_quantity').')');
-                $id_product_rule_group = Db::getInstance()->Insert_ID();
-
                 if (is_array($ruleArray = Tools::getValue('product_rule_'.$ruleGroupId)) && count($ruleArray)) {
-                    foreach ($ruleArray as $ruleId) {
-                        Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_product_rule` (`id_product_rule_group`, `type`)
-						VALUES ('.(int)$id_product_rule_group.', "'.pSQL(Tools::getValue('product_rule_'.$ruleGroupId.'_'.$ruleId.'_type')).'")');
-                        $id_product_rule = Db::getInstance()->Insert_ID();
-
-                        $values = array();
-                        foreach (Tools::getValue('product_rule_select_'.$ruleGroupId.'_'.$ruleId) as $id) {
-                            $values[] = '('.(int)$id_product_rule.','.(int)$id.')';
+                    foreach ($ruleArray as $ruleKey => $ruleId) {
+                        if (!Tools::getValue('product_rule_select_'.$ruleGroupId.'_'.$ruleId)) {
+                            unset($ruleArray[$ruleKey]);
                         }
-                        $values = array_unique($values);
-                        if (count($values)) {
-                            Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_product_rule_value` (`id_product_rule`, `id_item`) VALUES '.implode(',', $values));
+                    }
+
+                    if ($ruleArray) {
+                        Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_product_rule_group` (`id_cart_rule`, `quantity`)
+                        VALUES ('.(int)$currentObject->id.', '.(int)Tools::getValue('product_rule_group_'.$ruleGroupId.'_quantity').')');
+                        $id_product_rule_group = Db::getInstance()->Insert_ID();
+
+                        foreach ($ruleArray as $ruleId) {
+                            Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_product_rule` (`id_product_rule_group`, `type`)
+                            VALUES ('.(int)$id_product_rule_group.', "'.pSQL(Tools::getValue('product_rule_'.$ruleGroupId.'_'.$ruleId.'_type')).'")');
+                            $id_product_rule = Db::getInstance()->Insert_ID();
+                            $values = array();
+                            if ($selectedProducts = Tools::getValue('product_rule_select_'.$ruleGroupId.'_'.$ruleId)) {
+                                foreach ($selectedProducts as $id) {
+                                    $values[] = '('.(int)$id_product_rule.','.(int)$id.')';
+                                }
+                            }
+                            $values = array_unique($values);
+                            if (count($values)) {
+                                Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_product_rule_value` (`id_product_rule`, `id_item`) VALUES '.implode(',', $values));
+                            }
                         }
                     }
                 }

From 17fb585b8e950b0921b614f5b1606374e2cd6314 Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Sat, 14 Jun 2025 16:42:03 +0530
Subject: [PATCH 16/42] Fixed: error while deleting the room line

---
 controllers/admin/AdminOrdersController.php | 63 +++++++++++----------
 1 file changed, 33 insertions(+), 30 deletions(-)

diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 934edf868..68ce15de9 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -6337,40 +6337,43 @@ class AdminOrdersControllerCore extends AdminController
         }
         // update order detail for selected aditional services
         $objServiceProductCartDetail = new ServiceProductCartDetail();
-        foreach ($selectedAdditonalServices as $service) {
-            $serviceOrderDetail = new OrderDetail($service['id_order_detail']);
+         if (isset($selectedAdditonalServices[$idHotelBooking])) {
+            $objServiceProductCartDetail = new ServiceProductCartDetail();
+            foreach ($selectedAdditonalServices[$idHotelBooking]['additional_services'] as $service) {
+                $serviceOrderDetail = new OrderDetail($service['id_order_detail']);
 
-            $cart_quantity = $service['quantity'];
-            if ($service['price_calculation_method'] == Product::PRICE_CALCULATION_METHOD_PER_DAY) {
-                $cart_quantity = $cart_quantity * $product_quantity;
-            }
-            if ($cart_quantity >= $serviceOrderDetail->product_quantity) {
-                $serviceOrderDetail->delete();
-            } else {
-                $serviceOrderDetail->total_price_tax_incl -= $service['total_price_tax_incl'];
-                $serviceOrderDetail->total_price_tax_excl -= $service['total_price_tax_excl'];
-                $serviceOrderDetail->product_quantity -= $cart_quantity;
+                $cart_quantity = $service['quantity'];
+                if ($service['price_calculation_method'] == Product::PRICE_CALCULATION_METHOD_PER_DAY) {
+                    $cart_quantity = $cart_quantity * $product_quantity;
+                }
+                if ($cart_quantity >= $serviceOrderDetail->product_quantity) {
+                    $serviceOrderDetail->delete();
+                } else {
+                    $serviceOrderDetail->total_price_tax_incl -= $service['total_price_tax_incl'];
+                    $serviceOrderDetail->total_price_tax_excl -= $service['total_price_tax_excl'];
+                    $serviceOrderDetail->product_quantity -= $cart_quantity;
 
-                // update taxes
-                $res &= $serviceOrderDetail->updateTaxAmount($order);
+                    // update taxes
+                    $res &= $serviceOrderDetail->updateTaxAmount($order);
 
-                // Save order detail
-                $res &= $serviceOrderDetail->update();
-            }
+                    // Save order detail
+                    $res &= $serviceOrderDetail->update();
+                }
 
-            if (isset($roomHtlCartInfo['id'])) {
-                if ($idServiceProductCartDetail = $objServiceProductCartDetail->alreadyExists(
-                    $service['id_product'],
-                    $service['id_cart'],
-                    $roomHtlCartInfo['id']
-                )) {
-                    $objServiceProductCartDetail = new ServiceProductCartDetail((int) $idServiceProductCartDetail);
-                    $serviceQuantity = $objServiceProductCartDetail->quantity;
-                    if ($objServiceProductCartDetail->delete()
-                        && Validate::isLoadedObject(new Product((int) $service['id_product']))
-                    ) {
-                        $objCart = new Cart($service['id_cart']);
-                        $objCart->updateQty((int)abs($serviceQuantity), $service['id_product'], null, false, 'down');
+                if (isset($roomHtlCartInfo['id'])) {
+                    if ($idServiceProductCartDetail = $objServiceProductCartDetail->alreadyExists(
+                        $service['id_product'],
+                        $service['id_cart'],
+                        $roomHtlCartInfo['id']
+                    )) {
+                        $objServiceProductCartDetail = new ServiceProductCartDetail((int) $idServiceProductCartDetail);
+                        $serviceQuantity = $objServiceProductCartDetail->quantity;
+                        if ($objServiceProductCartDetail->delete()
+                            && Validate::isLoadedObject(new Product((int) $service['id_product']))
+                        ) {
+                            $objCart = new Cart($service['id_cart']);
+                            $objCart->updateQty((int)abs($serviceQuantity), $service['id_product'], null, false, 'down');
+                        }
                     }
                 }
             }

From 6a4ad12d536e8e1e525a68082e2ae2bd7a915142 Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Sat, 14 Jun 2025 16:43:34 +0530
Subject: [PATCH 17/42] Fixed: Warning on order creation from the back-office

---
 controllers/admin/AdminOrdersController.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 68ce15de9..2b94f6e92 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -2022,6 +2022,7 @@ class AdminOrdersControllerCore extends AdminController
                 if (Validate::isLoadedObject($objCart)) {
                     $this->context->cart = $objCart;
                     $this->context->currency = new Currency((int)$objCart->id_currency);
+                    $this->context->customer = new Customer((int) $objCart->id_customer);
 
                     $this->errors = HotelCartBookingData::validateCartBookings(!Configuration::get('PS_ALLOW_ADD_ALL_SERVICES_IN_BOOKING'));
 
@@ -2076,8 +2077,6 @@ class AdminOrdersControllerCore extends AdminController
                     }
 
                     if (!count($this->errors)) {
-                        $this->context->currency = new Currency((int) $objCart->id_currency);
-                        $this->context->customer = new Customer((int) $objCart->id_customer);
 
                         // Set payment module details
                         $objPaymentModule = new BoOrder();

From 871a8061df32f819822b439377864e94ad2b14ac Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Sat, 14 Jun 2025 17:31:52 +0530
Subject: [PATCH 18/42] Fixed quantity related issues with services having per
 day price calculation

---
 controllers/admin/AdminCartsController.php    | 33 +++++++++++++++----
 .../classes/ServiceProductCartDetail.php      |  2 +-
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php
index fa9c3abfa..65e3a9b1a 100644
--- a/controllers/admin/AdminCartsController.php
+++ b/controllers/admin/AdminCartsController.php
@@ -1570,25 +1570,44 @@ class AdminCartsControllerCore extends AdminController
                         }
                     }
 
-                    if (!$response['hasError']) {
+                     if (!$response['hasError']) {
                         $result = true;
                         $objServiceProductCartDetail = new ServiceProductCartDetail();
                         foreach ($selectedServiceProducts as $idServiceProduct => $selected) {
+                            $unitPrice = $serviceUnitPrices[$idServiceProduct];
+                            $updateServicePriceOnly = false;
+                            $quantity = 0;
+                            $operator = 'down';
                             if ($selected) {
                                 $operator = 'up';
-                            } else {
-                                $operator = 'down';
+                                if ($idServiceProductCartDetail = $objServiceProductCartDetail->alreadyExists(
+                                    $objHotelCartBookingData->id_cart,
+                                    $idServiceProduct,
+                                    $idCartBooking
+                                )) {
+                                    $objServiceProductCartDetail = new ServiceProductCartDetail($idServiceProductCartDetail);
+                                    if ($objServiceProductCartDetail->quantity > $serviceQuantities[$idServiceProduct]) {
+                                        $quantity = $objServiceProductCartDetail->quantity - $serviceQuantities[$idServiceProduct];
+                                        $operator = 'down';
+                                    } else if ($objServiceProductCartDetail->quantity < $serviceQuantities[$idServiceProduct]) {
+                                        $quantity = $serviceQuantities[$idServiceProduct] - $objServiceProductCartDetail->quantity;
+                                    } else {
+                                        // Only update the price no need to update quantity
+                                        $updateServicePriceOnly = true;
+                                    }
+                                } else {
+                                    $quantity = $serviceQuantities[$idServiceProduct];
+                                }
                             }
-                            $quantity = $serviceQuantities[$idServiceProduct];
-                            $unitPrice = $serviceUnitPrices[$idServiceProduct];
-                            if ($result &= $objServiceProductCartDetail->updateCartServiceProduct(
+
+                            if ($updateServicePriceOnly || ($result &= $objServiceProductCartDetail->updateCartServiceProduct(
                                 $objHotelCartBookingData->id_cart,
                                 $idServiceProduct,
                                 $operator,
                                 $quantity,
                                 0,
                                 $idCartBooking
-                            )) {
+                            ))) {
                                 $originalPrice = Product::getPriceStatic($idServiceProduct, false);
                                 // if price is different than the original service price then update the price
                                 if ($operator == 'up' && $originalPrice != $unitPrice) {
diff --git a/modules/hotelreservationsystem/classes/ServiceProductCartDetail.php b/modules/hotelreservationsystem/classes/ServiceProductCartDetail.php
index 60fc62124..2b7eb6aa0 100644
--- a/modules/hotelreservationsystem/classes/ServiceProductCartDetail.php
+++ b/modules/hotelreservationsystem/classes/ServiceProductCartDetail.php
@@ -477,7 +477,7 @@ class ServiceProductCartDetail extends ObjectModel
                 if ($quantity) {
                     $removedQuantity = $quantity;
                     $objServiceProductCartDetail->quantity -= $quantity;
-                    if ($objServiceProductCartDetail->quantity > 1) {
+                    if ($objServiceProductCartDetail->quantity > 0) {
                         $updateQunatity = $objServiceProductCartDetail->save();
                     } else {
                         $updateQunatity = $objServiceProductCartDetail->delete();

From 9d92b9b6082a032c74a0bddb9d4c192044afc9b1 Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Sat, 14 Jun 2025 17:41:48 +0530
Subject: [PATCH 19/42] Fixed: notice in update service pop up in the order
 page

---
 .../classes/ServiceProductOrderDetail.php                    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/hotelreservationsystem/classes/ServiceProductOrderDetail.php b/modules/hotelreservationsystem/classes/ServiceProductOrderDetail.php
index 646b53383..173e2fe3f 100644
--- a/modules/hotelreservationsystem/classes/ServiceProductOrderDetail.php
+++ b/modules/hotelreservationsystem/classes/ServiceProductOrderDetail.php
@@ -143,13 +143,14 @@ class ServiceProductOrderDetail extends ObjectModel
         $sql = 'SELECT spod.*';
         if (!$getTotalPrice) {
             $sql .= ', hbd.`id_product` as `id_room_type`, od.`product_price_calculation_method`,
-            hbd.`id_room`, hbd.`adults`, hbd.`children`, hbd.`date_from`, hbd.`date_to`, hbd.`room_type_name`,
+            hbd.`id_room`, hbd.`adults`, hbd.`children`, hbd.`date_from`, hbd.`date_to`, hbd.`room_type_name`, p.`max_quantity`,
             spod.`id_product` as id_product,  od.`product_allow_multiple_quantity`, od.`product_price_calculation_method`, od.`product_auto_add`, od.`product_price_addition_type`';
         }
         $sql .= ' FROM `'._DB_PREFIX_.'htl_booking_detail` hbd
             LEFT JOIN `'._DB_PREFIX_.'service_product_order_detail` spod ON(spod.`id_htl_booking_detail` = hbd.`id`)';
 
         $sql .= ' LEFT JOIN `'._DB_PREFIX_.'order_detail` od ON(od.`id_order_detail` = spod.`id_order_detail`)';
+        $sql .= ' LEFT JOIN `'._DB_PREFIX_.'product` p ON(spod.`id_product` = p.`id_product`)';
         $sql .= ' WHERE spod.`id_htl_booking_detail` IS NOT NULL';
 
         if ($idOrder) {
@@ -229,6 +230,7 @@ class ServiceProductOrderDetail extends ObjectModel
                             'unit_price_tax_incl' => $product['unit_price_tax_incl'],
                             'product_auto_add' => $product['product_auto_add'],
                             'product_price_addition_type' => $product['product_price_addition_type'],
+                            'max_quantity' => (int) $product['max_quantity']
                         );
                     } else {
                         $selectedAdditionalServices[$product['id_htl_booking_detail']]['id_order'] = $product['id_order'];
@@ -261,6 +263,7 @@ class ServiceProductOrderDetail extends ObjectModel
                                 'unit_price_tax_incl' => $product['unit_price_tax_incl'],
                                 'product_auto_add' => $product['product_auto_add'],
                                 'product_price_addition_type' => $product['product_price_addition_type'],
+                                'max_quantity' => (int) $product['max_quantity']
                             ),
                         );
                     }

From e54b6aedac884e520266c0619b1e365bf7041c87 Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Sat, 14 Jun 2025 17:42:26 +0530
Subject: [PATCH 20/42] Fixed: auto added services are not updated properly on
 room reallocate

---
 modules/hotelreservationsystem/classes/HotelBookingDetail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hotelreservationsystem/classes/HotelBookingDetail.php b/modules/hotelreservationsystem/classes/HotelBookingDetail.php
index d15b53785..683f1201a 100644
--- a/modules/hotelreservationsystem/classes/HotelBookingDetail.php
+++ b/modules/hotelreservationsystem/classes/HotelBookingDetail.php
@@ -2154,7 +2154,7 @@ class HotelBookingDetail extends ObjectModel
                                 0,
                                 0,
                                 null,
-                                0,
+                                null,
                                 null,
                                 0,
                                 $idHotelBooking

From 8ac3052a7092be4d7afd7469af5ba299fa857687 Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Sat, 14 Jun 2025 17:46:26 +0530
Subject: [PATCH 21/42] Fixed: code optmization in the admin carts controller

---
 controllers/admin/AdminCartsController.php | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php
index 65e3a9b1a..e87ff91c2 100644
--- a/controllers/admin/AdminCartsController.php
+++ b/controllers/admin/AdminCartsController.php
@@ -449,7 +449,7 @@ class AdminCartsControllerCore extends AdminController
                 die(json_encode($errors));
             }
             if ($this->context->cart->deleteProduct($id_product, $id_product_attribute, (int)Tools::getValue('id_customization'))) {
-                echo json_encode($this->ajaxReturnVars());
+                $this->ajaxDie(json_encode($this->ajaxReturnVars()));
             }
         }
     }
@@ -563,7 +563,7 @@ class AdminCartsControllerCore extends AdminController
                 }
             }
 
-            echo json_encode(array_merge($this->ajaxReturnVars(), array('errors' => $errors)));
+            $this->ajaxDie(json_encode(array_merge($this->ajaxReturnVars(), array('errors' => $errors))));
         }
     }
 
@@ -584,7 +584,7 @@ class AdminCartsControllerCore extends AdminController
                 $this->context->cart->gift_message = $gift_message;
             }
             $this->context->cart->save();
-            echo json_encode($this->ajaxReturnVars());
+            $this->ajaxDie(json_encode($this->ajaxReturnVars()));
         }
     }
 
@@ -606,7 +606,7 @@ class AdminCartsControllerCore extends AdminController
             } elseif (Validate::isLoadedObject($message)) {
                 $message->delete();
             }
-            echo json_encode($this->ajaxReturnVars());
+            $this->ajaxDie(json_encode($this->ajaxReturnVars()));
         }
     }
 
@@ -664,7 +664,7 @@ class AdminCartsControllerCore extends AdminController
                 $this->context->cart->id_lang = (int)$lang->id;
                 $this->context->cart->save();
             }
-            echo json_encode($this->ajaxReturnVars());
+            $this->ajaxDie(json_encode($this->ajaxReturnVars()));
         }
     }
 
@@ -683,7 +683,7 @@ class AdminCartsControllerCore extends AdminController
                 $errors[] = Tools::displayError('The order cannot be renewed.');
             } else {
                 $this->context->cart = $new_cart['cart'];
-                echo json_encode($this->ajaxReturnVars());
+                $this->ajaxDie(json_encode($this->ajaxReturnVars()));
             }
         }
     }
@@ -692,7 +692,7 @@ class AdminCartsControllerCore extends AdminController
     {
         if ($this->tabAccess['edit'] === 1) {
             if ($this->context->cart->removeCartRule((int)Tools::getValue('id_cart_rule'))) {
-                echo json_encode($this->ajaxReturnVars());
+                $this->ajaxDie(json_encode($this->ajaxReturnVars()));
             }
         }
     }
@@ -723,7 +723,7 @@ class AdminCartsControllerCore extends AdminController
                 $this->context->cart->addCartRule((int)$cart_rule->id);
             }
 
-            echo json_encode($this->ajaxReturnVars());
+            $this->ajaxDie(json_encode($this->ajaxReturnVars()));
         }
     }
 
@@ -741,14 +741,14 @@ class AdminCartsControllerCore extends AdminController
                     $errors[] = Tools::displayError('Can\'t add the voucher.');
                 }
             }
-            echo json_encode(array_merge($this->ajaxReturnVars(), array('errors' => $errors)));
+            $this->ajaxDie(json_encode(array_merge($this->ajaxReturnVars(), array('errors' => $errors))));
         }
     }
 
     public function ajaxProcessUpdateAddress()
     {
         if ($this->tabAccess['edit'] === 1) {
-            echo json_encode(array('addresses' => $this->context->customer->getAddresses((int)$this->context->cart->id_lang)));
+            $this->ajaxDie(json_encode(array('addresses' => $this->context->customer->getAddresses((int)$this->context->cart->id_lang))));
         }
     }
 
@@ -769,7 +769,7 @@ class AdminCartsControllerCore extends AdminController
                 /*$this->context->cart->id_address_invoice = (int)$address_invoice->id;*/
             $this->context->cart->save();
 
-            echo json_encode($this->ajaxReturnVars());
+            $this->ajaxDie(json_encode($this->ajaxReturnVars()));
         }
     }
 
@@ -886,7 +886,7 @@ class AdminCartsControllerCore extends AdminController
             $to_return = array_merge($this->ajaxReturnVars(), array('found' => false));
         }
 
-        echo json_encode($to_return);
+        $this->ajaxDie(json_encode($to_return));
     }
 
     public function ajaxReturnVars()
@@ -952,7 +952,7 @@ class AdminCartsControllerCore extends AdminController
 
     public function displayAjaxGetSummary()
     {
-        echo json_encode($this->ajaxReturnVars());
+        $this->ajaxDie(json_encode($this->ajaxReturnVars()));
     }
 
     public function ajaxProcessUpdateProductPrice()
@@ -1570,7 +1570,7 @@ class AdminCartsControllerCore extends AdminController
                         }
                     }
 
-                     if (!$response['hasError']) {
+                    if (!$response['hasError']) {
                         $result = true;
                         $objServiceProductCartDetail = new ServiceProductCartDetail();
                         foreach ($selectedServiceProducts as $idServiceProduct => $selected) {

From 5754b9fdd4f42016777fb8b7fdab6365e1009bc3 Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Sat, 14 Jun 2025 17:48:37 +0530
Subject: [PATCH 22/42] Fixed: the auto added services are not used in the
 booking webservice properly

---
 .../WebserviceSpecificManagementBookings.php           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/classes/webservice/WebserviceSpecificManagementBookings.php b/classes/webservice/WebserviceSpecificManagementBookings.php
index 0f7e99a67..2030927fd 100644
--- a/classes/webservice/WebserviceSpecificManagementBookings.php
+++ b/classes/webservice/WebserviceSpecificManagementBookings.php
@@ -1969,7 +1969,7 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
                             0,
                             0,
                             null,
-                            0,
+                            null,
                             null,
                             0,
                             $idHotelBookingDetail
@@ -2007,7 +2007,7 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
                         0,
                         0,
                         null,
-                        0,
+                        null,
                         null,
                         0,
                         $hotelBookingDetail['id']
@@ -2535,7 +2535,7 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
                 0,
                 1,
                 1,
-                0,
+                null,
                 null,
                 0,
                 $idHotelBooking
@@ -2550,7 +2550,7 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
                 0,
                 1,
                 0,
-                0,
+                null,
                 null,
                 0,
                 $idHotelBooking
@@ -2570,7 +2570,7 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
                 0,
                 0,
                 null,
-                0,
+                null,
                 null,
                 0,
                 $idHotelBooking

From 3e835cabfad515fdf06e81f13a36fd523df5e589 Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Sat, 14 Jun 2025 18:34:39 +0530
Subject: [PATCH 23/42] Fixed: warnings in the admin orders on service delete

---
 classes/controller/Controller.php           | 2 +-
 controllers/admin/AdminOrdersController.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/classes/controller/Controller.php b/classes/controller/Controller.php
index 7804f781f..a83afd4fc 100644
--- a/classes/controller/Controller.php
+++ b/classes/controller/Controller.php
@@ -604,8 +604,8 @@ abstract class ControllerCore
          * @see https://www.php.net/manual/en/language.operators.errorcontrol.php
          */
         if (!(error_reporting() & $errno)) {
+            return false;
         }
-        return false;
 
         switch ($errno) {
             case E_USER_ERROR:
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 2b94f6e92..132f84b21 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -7190,9 +7190,9 @@ class AdminOrdersControllerCore extends AdminController
             }
 
             if ($serviceProducts) {
-                if (isset($additionalServices[$idHtlBookingDetail]) && $additionalServices[$idHtlBookingDetail]) {
-                    foreach ($serviceProducts as $key => $servProduct) {
-                        $serviceProducts[$key]['price_tax_exc'] = $servProduct['price'];
+                foreach ($serviceProducts as $key => $servProduct) {
+                    $serviceProducts[$key]['price_tax_exc'] = $servProduct['price'];
+                    if (isset($additionalServices[$idHtlBookingDetail]) && $additionalServices[$idHtlBookingDetail]) {
                         if (in_array($servProduct['id_product'], array_column($additionalServices[$idHtlBookingDetail]['additional_services'], 'id_product'))) {
                             unset($serviceProducts[$key]);
                         }

From f14d321a4a9e3a20aee2968b55f186e916584173 Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Sat, 14 Jun 2025 18:35:16 +0530
Subject: [PATCH 24/42] Fixed: admin in unable to add non-assocaited service
 with room type in the cart

---
 modules/hotelreservationsystem/classes/HotelCartBookingData.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hotelreservationsystem/classes/HotelCartBookingData.php b/modules/hotelreservationsystem/classes/HotelCartBookingData.php
index 8a7a1d2c0..631d53e93 100644
--- a/modules/hotelreservationsystem/classes/HotelCartBookingData.php
+++ b/modules/hotelreservationsystem/classes/HotelCartBookingData.php
@@ -967,7 +967,7 @@ class HotelCartBookingData extends ObjectModel
                 } else {
                     if (!$product->active) {
                         $toRemoveService = 1;
-                    } else {
+                    } else if ($checkServiceRoomLink) {
                         if ($product->selling_preference_type == Product::SELLING_PREFERENCE_WITH_ROOM_TYPE) {
                             // service with room type must have association with valid hotel cart booking
                             if (Validate::isLoadedObject($objHotelCartBooking = new HotelCartBookingData($service['id_hotel_cart_booking']))) {

From 9a68369d744d879412fe684c9930f68f82474051 Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Sat, 14 Jun 2025 19:16:34 +0530
Subject: [PATCH 25/42] Fixed: non active service are displayed in the services
 popup

---
 controllers/admin/AdminCartsController.php  |  8 ++---
 controllers/admin/AdminOrdersController.php | 33 +++++++++++----------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php
index e87ff91c2..ea703232c 100644
--- a/controllers/admin/AdminCartsController.php
+++ b/controllers/admin/AdminCartsController.php
@@ -1154,8 +1154,8 @@ class AdminCartsControllerCore extends AdminController
             if (Configuration::get('PS_ALLOW_ADD_ALL_SERVICES_IN_BOOKING')) {
                 // get all services
                 $objProduct = new Product();
-                $hotelServiceProducts = $objProduct->getServiceProducts(null, Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE);
-                $roomTypeServiceProducts = $objProduct->getServiceProducts(null, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE);
+                $hotelServiceProducts = $objProduct->getServiceProducts(true, Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE);
+                $roomTypeServiceProducts = $objProduct->getServiceProducts(true, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE);
                 $serviceProducts = array_merge($roomTypeServiceProducts, $hotelServiceProducts);
             } else {
                 $objRoomTypeServiceProduct = new RoomTypeServiceProduct();
@@ -1469,8 +1469,8 @@ class AdminCartsControllerCore extends AdminController
             if (Configuration::get('PS_ALLOW_ADD_ALL_SERVICES_IN_BOOKING')) {
                 // get all services
                 $objProduct = new Product();
-                $hotelServiceProducts = $objProduct->getServiceProducts(null, Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE);
-                $roomTypeServiceProducts = $objProduct->getServiceProducts(null, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE);
+                $hotelServiceProducts = $objProduct->getServiceProducts(true, Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE);
+                $roomTypeServiceProducts = $objProduct->getServiceProducts(true, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE);
                 $serviceProducts = array_merge($roomTypeServiceProducts, $hotelServiceProducts);
             } else {
                 $objRoomTypeServiceProduct = new RoomTypeServiceProduct();
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 132f84b21..8ee4d416b 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -977,8 +977,8 @@ class AdminOrdersControllerCore extends AdminController
                 if (Configuration::get('PS_ALLOW_ADD_ALL_SERVICES_IN_BOOKING')) {
                     // get all services
                     $objProduct = new Product();
-                    $hotelServiceProducts = $objProduct->getServiceProducts(null, Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE);
-                    $roomTypeServiceProducts = $objProduct->getServiceProducts(null, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE);
+                    $hotelServiceProducts = $objProduct->getServiceProducts(true, Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE);
+                    $roomTypeServiceProducts = $objProduct->getServiceProducts(true, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE);
                     $serviceProducts = array_merge($roomTypeServiceProducts, $hotelServiceProducts);
                 } else {
                     $objRoomTypeServiceProduct = new RoomTypeServiceProduct();
@@ -4683,7 +4683,7 @@ class AdminOrdersControllerCore extends AdminController
         }
         $obj_booking_detail = new HotelBookingDetail();
         $num_days = HotelHelper::getNumberOfDays($date_from, $date_to);
-        $product_informations['product_quantity'] = $product_informations['product_quantity'] * (int) $num_days;
+        $product_informations['product_quantity'] = $req_rm * (int) $num_days;
 
         $obj_room_type = new HotelRoomType();
         $room_info_by_id_product = $obj_room_type->getRoomTypeInfoByIdProduct($product_informations['product_id']);
@@ -4698,9 +4698,7 @@ class AdminOrdersControllerCore extends AdminController
                     'date_to' => $date_to,
                     'hotel_id' => $id_hotel,
                     'id_room_type' => $product_informations['product_id'],
-                    'only_search_data' => 1,
-                    'id_cart' => $id_cart,
-                    'id_guest' => $id_guest,
+                    'only_search_data' => 1
                 );
                 $hotel_room_data = $objBookingDetail->dataForFrontSearch($bookingParams);
                 $total_available_rooms = $hotel_room_data['stats']['num_avail'];
@@ -5672,10 +5670,12 @@ class AdminOrdersControllerCore extends AdminController
         $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'));
+
+        $occupancy = Tools::getValue('occupancy');
+        $occupancy = array_shift($occupancy);
         $adults = $occupancy['adults'];
         $children = $occupancy['children'];
-        $child_ages = $occupancy['child_ages'];
+        $child_ages = isset($occupancy['child_ages']) ? $occupancy['child_ages'] : false;
 
         $totalRoomPriceBeforeTE = $obj_booking_detail->total_price_tax_excl;
         $totalRoomPriceBeforeTI = $obj_booking_detail->total_price_tax_incl;
@@ -6336,7 +6336,7 @@ class AdminOrdersControllerCore extends AdminController
         }
         // update order detail for selected aditional services
         $objServiceProductCartDetail = new ServiceProductCartDetail();
-         if (isset($selectedAdditonalServices[$idHotelBooking])) {
+        if (isset($selectedAdditonalServices[$idHotelBooking])) {
             $objServiceProductCartDetail = new ServiceProductCartDetail();
             foreach ($selectedAdditonalServices[$idHotelBooking]['additional_services'] as $service) {
                 $serviceOrderDetail = new OrderDetail($service['id_order_detail']);
@@ -6362,7 +6362,7 @@ class AdminOrdersControllerCore extends AdminController
                 if (isset($roomHtlCartInfo['id'])) {
                     if ($idServiceProductCartDetail = $objServiceProductCartDetail->alreadyExists(
                         $service['id_product'],
-                        $service['id_cart'],
+                        $selectedAdditonalServices[$idHotelBooking]['id_cart'],
                         $roomHtlCartInfo['id']
                     )) {
                         $objServiceProductCartDetail = new ServiceProductCartDetail((int) $idServiceProductCartDetail);
@@ -6370,7 +6370,7 @@ class AdminOrdersControllerCore extends AdminController
                         if ($objServiceProductCartDetail->delete()
                             && Validate::isLoadedObject(new Product((int) $service['id_product']))
                         ) {
-                            $objCart = new Cart($service['id_cart']);
+                            $objCart = new Cart($selectedAdditonalServices[$idHotelBooking]['id_cart']);
                             $objCart->updateQty((int)abs($serviceQuantity), $service['id_product'], null, false, 'down');
                         }
                     }
@@ -6645,10 +6645,11 @@ class AdminOrdersControllerCore extends AdminController
         $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'));
+        $occupancy = Tools::getValue('occupancy');
+        $occupancy = array_shift($occupancy);
         $adults = $occupancy['adults'];
         $children = $occupancy['children'];
-        $child_ages = $occupancy['child_ages'];
+        $child_ages = isset($occupancy['child_ages']) ? $occupancy['child_ages'] : false;
 
         // If order is refunded, the validate changes which are not allowed
         $objOrderReturn = new OrderReturn();
@@ -7181,8 +7182,8 @@ class AdminOrdersControllerCore extends AdminController
             if (Configuration::get('PS_ALLOW_ADD_ALL_SERVICES_IN_BOOKING')) {
                 // get all services
                 $objProduct = new Product();
-                $hotelServiceProducts = $objProduct->getServiceProducts(null, Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE);
-                $roomTypeServiceProducts = $objProduct->getServiceProducts(null, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE);
+                $hotelServiceProducts = $objProduct->getServiceProducts(true, Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE);
+                $roomTypeServiceProducts = $objProduct->getServiceProducts(true, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE);
                 $serviceProducts = array_merge($roomTypeServiceProducts, $hotelServiceProducts);
             } else {
                 $objRoomTypeServiceProduct = new RoomTypeServiceProduct();
@@ -8037,7 +8038,7 @@ class AdminOrdersControllerCore extends AdminController
                             && Validate::isLoadedObject(new Product($objServiceProductOrderDetail->id_product))
                         ) {
                             $objCart = new Cart($objServiceProductOrderDetail->id_cart);
-                            $objCart->updateQty((int) abs($quantity), $objServiceProductOrderDetail->id_product, null, false, 'down');
+                            $objCart->updateQty((int) abs($quantity), $objServiceProductOrderDetail->id_product, null, 0, 'down', 0, null, 0);
                         }
                     }
                 }

From e19a2446ebe6dee9990c435b90e9d5341c1e3aa5 Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Sat, 14 Jun 2025 19:18:10 +0530
Subject: [PATCH 26/42] Fixed: notice on room booking update

---
 admin/themes/default/template/controllers/orders/_documents.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/themes/default/template/controllers/orders/_documents.tpl b/admin/themes/default/template/controllers/orders/_documents.tpl
index 25ad36aef..6e6b536ef 100644
--- a/admin/themes/default/template/controllers/orders/_documents.tpl
+++ b/admin/themes/default/template/controllers/orders/_documents.tpl
@@ -42,7 +42,7 @@
 			</tr>
 		</thead>
 		<tbody>
-            {if $orderDocuments|count}
+            {if isset($orderDocuments) && $orderDocuments|count}
                 {foreach from=$orderDocuments item=document}
                     {if get_class($document) eq 'OrderInvoice'}
                         <tr id="invoice_{$document->id}">

From 75bc2fe569b5be9ddd56bd7062ece1edd329e364 Mon Sep 17 00:00:00 2001
From: Sumit Panwar <sumit201@webkul.in>
Date: Sat, 14 Jun 2025 19:24:48 +0530
Subject: [PATCH 27/42] Fixed: Product with selling preference hotel standalone
 and with room_type, removes from cart when added with a room type without
 option

---
 .../classes/HotelCartBookingData.php                       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/hotelreservationsystem/classes/HotelCartBookingData.php b/modules/hotelreservationsystem/classes/HotelCartBookingData.php
index 8a7a1d2c0..e99c73e3a 100644
--- a/modules/hotelreservationsystem/classes/HotelCartBookingData.php
+++ b/modules/hotelreservationsystem/classes/HotelCartBookingData.php
@@ -987,7 +987,12 @@ class HotelCartBookingData extends ObjectModel
                             }
                         } else {
                             if (ServiceProductOption::productHasOptions($service['id_product'])) {
-                                if (!Validate::isLoadedObject(new ServiceProductOption($service['id_product_option']))) {
+                                if ($product->selling_preference_type == Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE
+                                    && $service['id_hotel_cart_booking']
+                                ) {
+                                    // do nothing if service of type SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE is added with toom type
+                                    // then we will not check for options
+                                } elseif (!Validate::isLoadedObject(new ServiceProductOption($service['id_product_option']))) {
                                     $toRemoveService = 1;
                                 }
                             } elseif ($service['id_product_option']) {

From d630b13e57795bef5c33491276c4433ab6304edc Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Mon, 16 Jun 2025 10:17:43 +0530
Subject: [PATCH 28/42] Fixed: auto added services prices is added in the
 refund requests

---
 classes/order/OrderReturn.php                                   | 2 +-
 controllers/front/OrderDetailController.php                     | 2 +-
 .../hotelreservationsystem/classes/HotelOrderRefundRules.php    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/order/OrderReturn.php b/classes/order/OrderReturn.php
index f3f87e9a1..5b4079e9c 100644
--- a/classes/order/OrderReturn.php
+++ b/classes/order/OrderReturn.php
@@ -261,7 +261,7 @@ class OrderReturnCore extends ObjectModel
                         0,
                         0,
                         null,
-                        0,
+                        null,
                         null,
                         0,
                         $bookingRow['id_htl_booking']
diff --git a/controllers/front/OrderDetailController.php b/controllers/front/OrderDetailController.php
index 3b67fd8b6..5adae825d 100644
--- a/controllers/front/OrderDetailController.php
+++ b/controllers/front/OrderDetailController.php
@@ -368,7 +368,7 @@ class OrderDetailControllerCore extends FrontController
                                     0,
                                     0,
                                     0,
-                                       1,
+                                    1,
                                     1,
                                     1
                                 );
diff --git a/modules/hotelreservationsystem/classes/HotelOrderRefundRules.php b/modules/hotelreservationsystem/classes/HotelOrderRefundRules.php
index 4a013647a..b33813a9d 100644
--- a/modules/hotelreservationsystem/classes/HotelOrderRefundRules.php
+++ b/modules/hotelreservationsystem/classes/HotelOrderRefundRules.php
@@ -164,7 +164,7 @@ class HotelOrderRefundRules extends ObjectModel
                         0,
                         1,
                         1,
-                        0,
+                        null,
                         null,
                         0,
                         $objHtlBooking->id

From 3d1bf60f7f947c2e4570ca0280deb52127293c5e Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Mon, 16 Jun 2025 10:40:06 +0530
Subject: [PATCH 29/42] Fixed: warnings while tryning to export CSVs

---
 classes/controller/AdminController.php | 4 ++--
 classes/module/ModuleGrid.php          | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index d0bcaffbc..5e59550b2 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -1198,7 +1198,7 @@ class AdminControllerCore extends Controller
             }
         }
 
-        fputcsv($fd, $headers, ';', $text_delimiter);
+        fputcsv($fd, $headers, ';', $text_delimiter,  '\\');
         foreach ($this->_list as $i => $row) {
             $content = array();
             $path_to_image = false;
@@ -1222,7 +1222,7 @@ class AdminControllerCore extends Controller
                 }
                 $content[] = $field_value;
             }
-            fputcsv($fd, $content, ';', $text_delimiter);
+            fputcsv($fd, $content, ';', $text_delimiter,  '\\');
         }
 
         @fclose($fd);
diff --git a/classes/module/ModuleGrid.php b/classes/module/ModuleGrid.php
index 13f6f18ee..66f292359 100644
--- a/classes/module/ModuleGrid.php
+++ b/classes/module/ModuleGrid.php
@@ -52,6 +52,8 @@ abstract class ModuleGridCore extends Module
     /** @var ModuleGridEngine grid engine */
     protected $_render;
 
+    protected $_csv;
+
     abstract protected function getData();
 
     public function setEmployee($id_employee)

From c8ab097af4d981630e4efb059ad6197a705f10be Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Mon, 16 Jun 2025 13:33:14 +0530
Subject: [PATCH 30/42] Fixed: added type castings in the  queries to prevent
 sql injectios

---
 controllers/admin/AdminModulesController.php  |  1 +
 controllers/front/OrderOpcController.php      |  2 +-
 .../blocknavigationmenu.php                   |  6 +--
 .../classes/HotelCartBookingData.php          | 46 +++++++------------
 .../classes/HotelHelper.php                   |  2 +-
 .../classes/HotelOrderRefundRules.php         |  2 +-
 .../classes/HotelRoomInformation.php          | 10 ++--
 .../classes/HotelRoomType.php                 |  4 +-
 .../classes/HotelRoomTypeFeaturePricing.php   |  2 +-
 9 files changed, 29 insertions(+), 46 deletions(-)

diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php
index 31b58d8fe..e9d8ab801 100644
--- a/controllers/admin/AdminModulesController.php
+++ b/controllers/admin/AdminModulesController.php
@@ -748,6 +748,7 @@ class AdminModulesControllerCore extends AdminController
                     $modules_list_save = implode('|', $modules);
                 }
             } elseif (($modules = Tools::getValue($key)) && $key != 'checkAndUpdate' && $key != 'updateAll') {
+                $modules = strip_tags($modules);
                 if (strpos($modules, '|')) {
                     $modules_list_save = $modules;
                     $modules = explode('|', $modules);
diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php
index 1851a2acc..d1814c445 100644
--- a/controllers/front/OrderOpcController.php
+++ b/controllers/front/OrderOpcController.php
@@ -572,7 +572,7 @@ class OrderOpcControllerCore extends ParentOrderController
             $date_from = Tools::getValue('date_from');
             $date_to = Tools::getValue('date_to');
             $objCartBookingData = new HotelCartBookingData();
-            if ($cart_data_dlt = $objCartBookingData->deleteRoomDataFromOrderLine(
+            if ($objCartBookingData->deleteRoomDataFromOrderLine(
                 $this->context->cart->id,
                 $this->context->cart->id_guest,
                 $id_product,
diff --git a/modules/blocknavigationmenu/blocknavigationmenu.php b/modules/blocknavigationmenu/blocknavigationmenu.php
index 3000bc5ef..ea7b297c8 100644
--- a/modules/blocknavigationmenu/blocknavigationmenu.php
+++ b/modules/blocknavigationmenu/blocknavigationmenu.php
@@ -53,11 +53,7 @@ class blocknavigationmenu extends Module
 
     public function hookDisplayTopSubSecondaryBlock($params)
     {
-        Media::addJsDef(
-            array(
-                'currentPage' => Tools::getValue('controller')
-            )
-        );
+        Media::addJsDef(array('currentPage' => $this->context->controller->php_self));
         $this->context->controller->addJS($this->_path.'/views/js/htlnevigationmenu.js');
         $this->context->controller->addCSS($this->_path.'/views/css/blocknavigation.css');
 
diff --git a/modules/hotelreservationsystem/classes/HotelCartBookingData.php b/modules/hotelreservationsystem/classes/HotelCartBookingData.php
index 8a7a1d2c0..112335d6e 100644
--- a/modules/hotelreservationsystem/classes/HotelCartBookingData.php
+++ b/modules/hotelreservationsystem/classes/HotelCartBookingData.php
@@ -121,7 +121,7 @@ class HotelCartBookingData extends ObjectModel
      */
     public function getCountRoomsInCart($id_cart, $guest)
     {
-        $sql = 'SELECT Count(`id`) FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_cart` = '.$id_cart.' AND `id_guest` = '.$guest.' AND `id_order` = 0';
+        $sql = 'SELECT Count(`id`) FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_cart` = '.(int) $id_cart.' AND `id_guest` = '.(int) $guest.' AND `id_order` = 0';
         $count_rooms = Db::getInstance()->getValue($sql);
 
         if ($count_rooms) {
@@ -144,8 +144,8 @@ class HotelCartBookingData extends ObjectModel
         $sql = 'SELECT cbd.id AS id_cart_book_data, cbd.id_cart, cbd.id_guest, cbd.id_product, cbd.id_room, cbd.id_hotel, cbd.quantity, cbd.date_from, cbd.date_to, ri.room_num, pl.name AS room_type
                 FROM `'._DB_PREFIX_.'htl_cart_booking_data` AS cbd
                 INNER JOIN `'._DB_PREFIX_.'htl_room_information` AS ri ON (cbd.id_room = ri.id)
-                INNER JOIN `'._DB_PREFIX_.'product_lang` AS pl ON (cbd.id_product = pl.id_product AND pl.`id_lang`='.$id_lang.')
-                WHERE cbd.id_cart = '.$id_cart.' AND cbd.id_guest = '.$id_guest;
+                INNER JOIN `'._DB_PREFIX_.'product_lang` AS pl ON (cbd.id_product = pl.id_product AND pl.`id_lang`='.(int) $id_lang.')
+                WHERE cbd.id_cart = '.(int) $id_cart.' AND cbd.id_guest = '.(int) $id_guest;
         $cart_book_data = Db::getInstance()->executeS($sql);
 
         if ($cart_book_data) {
@@ -182,10 +182,10 @@ class HotelCartBookingData extends ObjectModel
      */
     public function getOnlyCartBookingData($id_cart, $id_guest, $id_product, $id_customer = 0)
     {
-        $sql = 'SELECT * FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_cart` = '.$id_cart.' AND `id_product` = '.$id_product;
+        $sql = 'SELECT * FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_cart` = '.(int) $id_cart.' AND `id_product` = '.(int) $id_product;
 
         if ($id_customer) {
-            $sql .=  ' AND `id_customer` = '.$id_customer;
+            $sql .=  ' AND `id_customer` = '.(int) $id_customer;
         }
 
         $cart_book_data = Db::getInstance()->executeS($sql);
@@ -209,7 +209,7 @@ class HotelCartBookingData extends ObjectModel
      */
     public function getCountRoomsByIdCartIdProduct($id_cart, $id_product, $date_from, $date_to)
     {
-        $sql = 'SELECT Count(`id`) FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_cart` = '.$id_cart.' AND `id_product` = '.$id_product." AND `date_from` <= '$date_from' AND `date_to` >= '$date_to'";
+        $sql = 'SELECT Count(`id`) FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_cart` = '.(int) $id_cart.' AND `id_product` = '.(int) $id_product." AND `date_from` <= '".pSql($date_from)."' AND `date_to` >= '".pSQL($date_to)."'";
 
         $count_rooms = Db::getInstance()->getValue($sql);
 
@@ -268,7 +268,7 @@ class HotelCartBookingData extends ObjectModel
         if ($cart_id) {
             return Db::getInstance()->getRow('
                 SELECT * FROM `'._DB_PREFIX_.'htl_cart_booking_data`
-                WHERE `id_cart`='.$cart_id.' ORDER BY `date_add` DESC
+                WHERE `id_cart`='.(int) $cart_id.' ORDER BY `date_add` DESC
             ');
         }
 
@@ -284,7 +284,7 @@ class HotelCartBookingData extends ObjectModel
      */
     public function getCartCurrentDataByOrderId($id_order)
     {
-        $result = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_order`='.$id_order);
+        $result = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_order`='.(int) $id_order);
         if ($result) {
             return $result;
         } else {
@@ -320,13 +320,13 @@ class HotelCartBookingData extends ObjectModel
      */
     public function changeProductDataByRoomId($idRoom, $idProduct, $daysDiff, $idCart)
     {
-        $cartProductQuantity = Db::getInstance()->getValue('SELECT `quantity` FROM `'._DB_PREFIX_.'cart_product` WHERE `id_cart`='.$idCart.' AND `id_product`='.$idProduct);
+        $cartProductQuantity = Db::getInstance()->getValue('SELECT `quantity` FROM `'._DB_PREFIX_.'cart_product` WHERE `id_cart`='.(int) $idCart.' AND `id_product`='.(int) $idProduct);
         $newQuantity = $cartProductQuantity - $daysDiff;
 
         if ($newQuantity > 0) {
-            return Db::getInstance()->update('cart_product', array('quantity' => $newQuantity), '`id_cart`='.$idCart.' AND `id_product`='.$idProduct);
+            return Db::getInstance()->update('cart_product', array('quantity' => $newQuantity), '`id_cart`='.(int) $idCart.' AND `id_product`='.(int) $idProduct);
         } else {
-            return Db::getInstance()->delete('cart_product', '`id_cart`='.$idCart.' AND `id_product`='.$idProduct);
+            return Db::getInstance()->delete('cart_product', '`id_cart`='.(int) $idCart.' AND `id_product`='.(int) $idProduct);
         }
     }
 
@@ -670,7 +670,7 @@ class HotelCartBookingData extends ObjectModel
      */
     public function checkExistanceOfRoomInCurrentCart($id_room, $date_from, $date_to, $id_cart, $id_guest)
     {
-        $result = Db::getInstance()->getValue('SELECT id FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_room`='.$id_room." AND `date_from`='$date_from' AND `date_to`='$date_to' AND `id_cart`=".$id_cart.' AND `id_guest`='.$id_guest);
+        $result = Db::getInstance()->getValue('SELECT id FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_room`='.(int) $id_room." AND `date_from`='".pSQL($date_from)."' AND `date_to`='".pSQL($date_to)."' AND `id_cart`=".(int) $id_cart.' AND `id_guest`='.(int) $id_guest);
 
         if ($result) {
             return $result;
@@ -720,8 +720,8 @@ class HotelCartBookingData extends ObjectModel
      */
     public function deleteRoomDataFromOrderLine($id_cart, $id_guest, $id_product, $date_from, $date_to)
     {
-        $result = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_cart`='.$id_cart.' AND `id_guest`='.$id_guest.' AND `id_product`='.$id_product." AND `date_from`= '$date_from' AND `date_to`= '$date_to'");
-
+        // To get the num_rm
+        Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_cart`='.(int) $id_cart.' AND `id_guest`='.(int) $id_guest.' AND `id_product`='.(int) $id_product." AND `date_from`= '".pSQL($date_from)."' AND `date_to`= '".pSQL($date_to)."'");
         $num_rm = Db::getInstance()->NumRows();
 
         $num_days = HotelHelper::getNumberOfDays($date_from, $date_to);
@@ -729,20 +729,6 @@ class HotelCartBookingData extends ObjectModel
         $qty = (int) $num_rm * (int) $num_days;
         if ($qty) {
             return $this->deleteCartBookingData($id_cart, $id_product, 0, $date_from, $date_to);
-            // $this->context = Context::getContext();
-            // $update_quantity = $this->context->cart->updateQty($qty, $id_product, null, false, 'down');
-
-            // if (is_array($result) && count($result)) {
-            //     $return = true;
-            //     foreach ($result as $row) {
-            //         $objHotelCartBookingData = new self($row['id']);
-            //         if (Validate::isLoadedObject($objHotelCartBookingData)) {
-            //             $return &= $objHotelCartBookingData->delete();
-            //         }
-            //     }
-            // }
-
-            // return $return;
         }
 
         return false;
@@ -818,7 +804,7 @@ class HotelCartBookingData extends ObjectModel
      */
     public function getCustomerIdRoomsByIdCartIdProduct($id_cart, $id_product, $date_from, $date_to)
     {
-        $rooms_ids = Db::getInstance()->executeS('SELECT `id_room` FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_cart`='.$id_cart.' AND `id_product`='.$id_product." AND `date_from`='$date_from' AND `date_to`='$date_to'");
+        $rooms_ids = Db::getInstance()->executeS('SELECT `id_room` FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_cart`='.(int) $id_cart.' AND `id_product`='.(int) $id_product." AND `date_from`='".pSQL($date_from)."' AND `date_to`='".pSQL($date_to)."'");
         if ($rooms_ids) {
             return $rooms_ids;
         }
@@ -1852,7 +1838,7 @@ class HotelCartBookingData extends ObjectModel
             } else {
                 Db::getInstance()->execute('
                     UPDATE `'._DB_PREFIX_.'cart_product`
-                    SET `quantity` = '.$new_qty.', `date_add` = NOW()
+                    SET `quantity` = '.(int) $new_qty.', `date_add` = NOW()
                     WHERE `id_product` = '.(int)$id_product.'
                     AND `id_cart` = '.(int)$id_cart.' AND `id_address_delivery` = '.(int)$cart->id_address_delivery
                 );
diff --git a/modules/hotelreservationsystem/classes/HotelHelper.php b/modules/hotelreservationsystem/classes/HotelHelper.php
index 79e5aa259..19a7e729c 100644
--- a/modules/hotelreservationsystem/classes/HotelHelper.php
+++ b/modules/hotelreservationsystem/classes/HotelHelper.php
@@ -2529,7 +2529,7 @@ class HotelHelper
         $languages = Language::getLanguages(true);
         if ($is_hotel && $id_hotel) {
             $cat_id_hotel = Db::getInstance()->getValue(
-                'SELECT `id_category` FROM `'._DB_PREFIX_.'htl_branch_info` WHERE id='.$id_hotel
+                'SELECT `id_category` FROM `'._DB_PREFIX_.'htl_branch_info` WHERE id='.(int) $id_hotel
             );
             if ($cat_id_hotel) {
                 $obj_cat = new Category($cat_id_hotel);
diff --git a/modules/hotelreservationsystem/classes/HotelOrderRefundRules.php b/modules/hotelreservationsystem/classes/HotelOrderRefundRules.php
index 4a013647a..2acf95b78 100644
--- a/modules/hotelreservationsystem/classes/HotelOrderRefundRules.php
+++ b/modules/hotelreservationsystem/classes/HotelOrderRefundRules.php
@@ -123,7 +123,7 @@ class HotelOrderRefundRules extends ObjectModel
      */
     public function checkIfRuleExistsByCancelationdays($days)
     {
-        return Db::getInstance()->getRow('SELECT * FROM `'._DB_PREFIX_.'htl_order_refund_rules` WHERE days='.$days);
+        return Db::getInstance()->getRow('SELECT * FROM `'._DB_PREFIX_.'htl_order_refund_rules` WHERE days='.(int) $days);
     }
 
     public function getBookingCancellationDetails($idOrder, $idOrderReturn = 0, $idHtlBooking = 0)
diff --git a/modules/hotelreservationsystem/classes/HotelRoomInformation.php b/modules/hotelreservationsystem/classes/HotelRoomInformation.php
index d1f8dc2de..62c3575f7 100644
--- a/modules/hotelreservationsystem/classes/HotelRoomInformation.php
+++ b/modules/hotelreservationsystem/classes/HotelRoomInformation.php
@@ -179,7 +179,7 @@ class HotelRoomInformation extends ObjectModel
      */
     public function getHotelRoomInfoByProductId($id_product)
     {
-        $result = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'htl_room_information` WHERE `id_product`='.$id_product);
+        $result = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'htl_room_information` WHERE `id_product`='.(int) $id_product);
         if ($result) {
             return $result;
         }
@@ -206,7 +206,7 @@ class HotelRoomInformation extends ObjectModel
      */
     public function getHotelRoomInfo($id_product, $id_hotel, $is_getNum = 0)
     {
-        $sql = "SELECT * FROM `"._DB_PREFIX_."htl_room_information` WHERE `id_product` = ".$id_product." AND `id_hotel` = ".$id_hotel;
+        $sql = "SELECT * FROM `"._DB_PREFIX_."htl_room_information` WHERE `id_product` = ".(int) $id_product." AND `id_hotel` = ".(int) $id_hotel;
 
         $rm_info = Db::getInstance()->executeS($sql);
 
@@ -229,7 +229,7 @@ class HotelRoomInformation extends ObjectModel
      */
     public function getHotelRoomInfoById($id)
     {
-        $sql = "SELECT `room_num` FROM `"._DB_PREFIX_."htl_room_information` WHERE `id` = ".$id;
+        $sql = "SELECT `room_num` FROM `"._DB_PREFIX_."htl_room_information` WHERE `id` = ".(int) $id;
         $rm_num = Db::getInstance()->getValue($sql);
 
         if ($rm_num) {
@@ -275,12 +275,12 @@ class HotelRoomInformation extends ObjectModel
 
     public function getRoomTypeAvailableRoomsForDateRange($id_hotel, $id_product, $date_from, $date_to)
     {
-        return Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'htl_room_information` where `id_hotel`='.$id_hotel.' AND `id_product`='.$id_product.' AND `id` NOT IN (SELECT `id_room` from `'._DB_PREFIX_.'htl_booking_detail` where `date_from`< \''.pSQL($date_to).'\' AND `date_to`>\''.$date_from.'\' AND `id_product`='.(int) $id_product.' AND `id_hotel`='.(int) $id_hotel.')');
+        return Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'htl_room_information` where `id_hotel`='.(int) $id_hotel.' AND `id_product`='.(int) $id_product.' AND `id` NOT IN (SELECT `id_room` from `'._DB_PREFIX_.'htl_booking_detail` where `date_from`< \''.pSQL($date_to).'\' AND `date_to`>\''.pSQL($date_from).'\' AND `id_product`='.(int) $id_product.' AND `id_hotel`='.(int) $id_hotel.')');
     }
 
     public function getRoomTypeDisabledRoomsForDateRange($id_hotel, $id_product, $date_from, $date_to)
     {
-        return Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'htl_room_information` where `id_hotel`='.$id_hotel.' AND `id_product`='.$id_product.' AND `id_status`=3 AND `id` NOT IN (SELECT `id_room` from `'._DB_PREFIX_.'htl_booking_detail` where `date_from`< \''.pSQL($date_to).'\' AND `date_to`>\''.$date_from.'\' AND `id_product`='.(int) $id_product.' AND `id_hotel`='.(int) $id_hotel.')');
+        return Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'htl_room_information` where `id_hotel`='.(int) $id_hotel.' AND `id_product`='.(int) $id_product.' AND `id_status`=3 AND `id` NOT IN (SELECT `id_room` from `'._DB_PREFIX_.'htl_booking_detail` where `date_from`< \''.pSQL($date_to).'\' AND `date_to`>\''.pSQL($date_from).'\' AND `id_product`='.(int) $id_product.' AND `id_hotel`='.(int) $id_hotel.')');
     }
 
     public function getRoomTypeBookedRoomsForDateRange($id_hotel, $id_product, $date_from, $date_to)
diff --git a/modules/hotelreservationsystem/classes/HotelRoomType.php b/modules/hotelreservationsystem/classes/HotelRoomType.php
index 03112f59b..4d82879a6 100644
--- a/modules/hotelreservationsystem/classes/HotelRoomType.php
+++ b/modules/hotelreservationsystem/classes/HotelRoomType.php
@@ -378,7 +378,7 @@ class HotelRoomType extends ObjectModel
      */
     public static function getMaxAdults($id_hotel)
     {
-        $sql = 'SELECT MAX(adults) AS max_adult FROM '._DB_PREFIX_.'htl_room_type WHERE id_hotel='.$id_hotel;
+        $sql = 'SELECT MAX(adults) AS max_adult FROM '._DB_PREFIX_.'htl_room_type WHERE id_hotel='.(int) $id_hotel;
 
         $max_adult = Db::getInstance()->getValue($sql);
 
@@ -398,7 +398,7 @@ class HotelRoomType extends ObjectModel
      */
     public static function getMaxChild($id_hotel)
     {
-        $sql = 'SELECT MAX(children) AS max_child FROM '._DB_PREFIX_.'htl_room_type WHERE id_hotel='.$id_hotel;
+        $sql = 'SELECT MAX(children) AS max_child FROM '._DB_PREFIX_.'htl_room_type WHERE id_hotel='.(int) $id_hotel;
 
         $max_child = Db::getInstance()->getValue($sql);
 
diff --git a/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php b/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php
index e20ccf9e0..6c839aa39 100644
--- a/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php
+++ b/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php
@@ -162,7 +162,7 @@ class HotelRoomTypeFeaturePricing extends ObjectModel
         return Db::getInstance()->executeS(
             'SELECT * FROM `'._DB_PREFIX_.'htl_room_type_feature_pricing`
             WHERE (`id_product`=0 OR `id_product`='.(int) $id_product.')
-            AND `active`=1 AND `date_from` <= \''.$date_to.'\' AND `date_to` >= \''.$date_from.'\''
+            AND `active`=1 AND `date_from` <= \''.pSQL($date_to).'\' AND `date_to` >= \''.pSQL($date_from).'\''
         );
     }
 

From b3fa0501e44260a6e0b37b3336880ee9653aeafe Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Mon, 16 Jun 2025 15:50:46 +0530
Subject: [PATCH 31/42] Removed: generate pdf buttton from the top of the
 credit slip controller, added button to generate voucher

---
 .../slip/_display_voucher_link.tpl            | 12 +++--
 controllers/admin/AdminSlipController.php     | 50 +++++++++++--------
 2 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/admin/themes/default/template/controllers/slip/_display_voucher_link.tpl b/admin/themes/default/template/controllers/slip/_display_voucher_link.tpl
index 9c65ed59a..64b6cf4f3 100644
--- a/admin/themes/default/template/controllers/slip/_display_voucher_link.tpl
+++ b/admin/themes/default/template/controllers/slip/_display_voucher_link.tpl
@@ -17,6 +17,12 @@
  * @license LICENSE.txt
  *}
 
-<a class="btn btn-link" href="{$link->getAdminLink('AdminCartRules')|escape:'html':'UTF-8'}&updatecart_rule&id_cart_rule={$id_cart_rule}" target="_blank">
-    #{$id_cart_rule}
-</a>
+ {if $id_cart_rule}
+    <a class="btn btn-link" href="{$link->getAdminLink('AdminCartRules')|escape:'html':'UTF-8'}&updatecart_rule&id_cart_rule={$id_cart_rule}" target="_blank">
+        #{$id_cart_rule}
+    </a>
+{else}
+    <a href="{$link->getAdminLink('AdminSlip')|escape:'html':'UTF-8'}&generateVoucher=1&id_order_slip={$row['id_order_slip']}" class="btn btn-default" title="{l s='Generate voucher for credit slip'}">
+        <i class="icon-refresh"></i> {l s='Generate Voucher'}
+    </a>
+{/if}
diff --git a/controllers/admin/AdminSlipController.php b/controllers/admin/AdminSlipController.php
index 7e59f3675..78579d512 100644
--- a/controllers/admin/AdminSlipController.php
+++ b/controllers/admin/AdminSlipController.php
@@ -108,16 +108,11 @@ class AdminSlipControllerCore extends AdminController
         parent::__construct();
 
         $this->_where = Shop::addSqlRestriction(false, 'o');
+        $this->_conf['33'] = $this->l('Voucher generated successfully');
     }
 
     public function initPageHeaderToolbar()
     {
-        $this->page_header_toolbar_btn['generate_pdf'] = array(
-            'href' => self::$currentIndex.'&token='.$this->token,
-            'desc' => $this->l('Generate PDF', null, null, false),
-            'icon' => 'process-icon-save-date'
-        );
-
         parent::initPageHeaderToolbar();
     }
 
@@ -178,6 +173,25 @@ class AdminSlipControllerCore extends AdminController
                 }
                 $this->errors[] = $this->l('No order slips were found for this period.');
             }
+        } else if (Tools::isSubmit('generateVoucher')) {
+            if (($idOrderSlip = Tools::getValue('id_order_slip'))
+                && Validate::isLoadedObject($objOrderSlip = new OrderSlip($idOrderSlip))
+            ) {
+                if ($objOrderSlip->redeem_status == OrderSlip::REDEEM_STATUS_REDEEMED) {
+                    $this->errors[] = Tools::displayError('The credit slip has already been redeemed.');
+                }
+
+                if (!count($this->errors)) {
+                    if ($objOrderSlip->generateVoucher()) {
+                        Tools::redirectAdmin(self::$currentIndex.'&token='.$this->token.'&conf=33');
+                    } else {
+                        $this->errors[] = Tools::displayError('The voucher code for this credit slip could not be generated.');
+                    }
+                }
+            } else {
+                $this->errors[] = Tools::displayError('Credit slip not found.');
+            }
+
         } else {
             return parent::postProcess();
         }
@@ -235,10 +249,7 @@ class AdminSlipControllerCore extends AdminController
 
     public function initToolbar()
     {
-        $this->toolbar_btn['save-date'] = array(
-            'href' => '#',
-            'desc' => $this->l('Generate PDF file')
-        );
+        $this->toolbar_btn = array();
     }
 
     public function printPDFIcons($id_order_slip, $tr)
@@ -267,15 +278,12 @@ class AdminSlipControllerCore extends AdminController
 
     public function displayVoucherLink($idCartRule, $row)
     {
-        if ($row['redeem_status'] == OrderSlip::REDEEM_STATUS_REDEEMED && $idCartRule) {
-            $this->context->smarty->assign(array(
-                'id_cart_rule' => (int) $idCartRule,
-            ));
+        $this->context->smarty->assign(array(
+            'id_cart_rule' => (int) $idCartRule,
+            'row' => $row
+        ));
 
-            return $this->createTemplate('_display_voucher_link.tpl')->fetch();
-        }
-
-        return '--';
+        return $this->createTemplate('_display_voucher_link.tpl')->fetch();
     }
 
     public function displayStatusChangeLink($token, $id)
@@ -317,19 +325,19 @@ class AdminSlipControllerCore extends AdminController
                     'modal_content' => $modalConfirmDelete->fetch(),
                     'modal_actions' => array(
                         array(
-                            'type' => 'button',
+                            'type' => 'link',
+                            'href' => '#',
                             'class' => 'process_update btn-primary',
                             'label' => $this->l('Change status'),
                         ),
                     ),
-
                 ));
                 $response['modalHtml'] = $tpl->fetch();
             }
         }
         $response['success'] = true;
 
-        die(Tools::jsonEncode($response));
+        $this->ajaxDie(json_encode($response));
     }
 
     public function setMedia()

From 7aa674d4a5559843b1febc903d73c98be73184ed Mon Sep 17 00:00:00 2001
From: azhar bhat <azharbhat.qlo098@webkul.in>
Date: Mon, 16 Jun 2025 16:21:43 +0530
Subject: [PATCH 32/42] Upload quota has been commited

---
 .../admin/AdminAdminPreferencesController.php | 68 +++++++++----------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/controllers/admin/AdminAdminPreferencesController.php b/controllers/admin/AdminAdminPreferencesController.php
index 8179c1f26..5b3cd1ca3 100644
--- a/controllers/admin/AdminAdminPreferencesController.php
+++ b/controllers/admin/AdminAdminPreferencesController.php
@@ -98,40 +98,40 @@ class AdminAdminPreferencesControllerCore extends AdminController
                 ),
                 'submit' => array('title' => $this->l('Save'))
             ),
-            'upload' => array(
-                'title' =>    $this->l('Upload quota'),
-                'icon' =>    'icon-cloud-upload',
-                'fields' => array(
-                    'PS_ATTACHMENT_MAXIMUM_SIZE' => array(
-                        'title' => $this->l('Maximum size for attachment'),
-                        'hint' =>  sprintf($this->l('Set the maximum size allowed for attachment files (in megabytes). This value has to be lower or equal to the maximum file upload allotted by your server (currently: %s MB).'), $upload_mb),
-                        'validation' => 'isInt',
-                        'cast' => 'intval',
-                        'type' => 'text',
-                        'suffix' => $this->l('megabytes'),
-                        'default' => '2'
-                    ),
-                    'PS_LIMIT_UPLOAD_FILE_VALUE' => array(
-                        'title' => $this->l('Maximum size for a downloadable product'),
-                        'hint' => sprintf($this->l('Define the upload limit for a downloadable product (in megabytes). This value has to be lower or equal to the maximum file upload allotted by your server (currently: %s MB).'), $upload_mb),
-                        'validation' => 'isInt',
-                        'cast' => 'intval',
-                        'type' => 'text',
-                        'suffix' => $this->l('megabytes'),
-                        'default' => '1'
-                    ),
-                    'PS_LIMIT_UPLOAD_IMAGE_VALUE' => array(
-                        'title' => $this->l('Maximum size for a product\'s image'),
-                        'hint' => sprintf($this->l('Define the upload limit for an image (in megabytes). This value has to be lower or equal to the maximum file upload allotted by your server (currently: %s MB).'), $upload_mb),
-                        'validation' => 'isInt',
-                        'cast' => 'intval',
-                        'type' => 'text',
-                        'suffix' => $this->l('megabytes'),
-                        'default' => '1'
-                    ),
-                ),
-                'submit' => array('title' => $this->l('Save'))
-            ),
+            // 'upload' => array(
+            //     'title' =>    $this->l('Upload quota'),
+            //     'icon' =>    'icon-cloud-upload',
+            //     'fields' => array(
+            //         'PS_ATTACHMENT_MAXIMUM_SIZE' => array(
+            //             'title' => $this->l('Maximum size for attachment'),
+            //             'hint' =>  sprintf($this->l('Set the maximum size allowed for attachment files (in megabytes). This value has to be lower or equal to the maximum file upload allotted by your server (currently: %s MB).'), $upload_mb),
+            //             'validation' => 'isInt',
+            //             'cast' => 'intval',
+            //             'type' => 'text',
+            //             'suffix' => $this->l('megabytes'),
+            //             'default' => '2'
+            //         ),
+            //         'PS_LIMIT_UPLOAD_FILE_VALUE' => array(
+            //             'title' => $this->l('Maximum size for a downloadable product'),
+            //             'hint' => sprintf($this->l('Define the upload limit for a downloadable product (in megabytes). This value has to be lower or equal to the maximum file upload allotted by your server (currently: %s MB).'), $upload_mb),
+            //             'validation' => 'isInt',
+            //             'cast' => 'intval',
+            //             'type' => 'text',
+            //             'suffix' => $this->l('megabytes'),
+            //             'default' => '1'
+            //         ),
+            //         'PS_LIMIT_UPLOAD_IMAGE_VALUE' => array(
+            //             'title' => $this->l('Maximum size for a product\'s image'),
+            //             'hint' => sprintf($this->l('Define the upload limit for an image (in megabytes). This value has to be lower or equal to the maximum file upload allotted by your server (currently: %s MB).'), $upload_mb),
+            //             'validation' => 'isInt',
+            //             'cast' => 'intval',
+            //             'type' => 'text',
+            //             'suffix' => $this->l('megabytes'),
+            //             'default' => '1'
+            //         ),
+            //     ),
+            //     'submit' => array('title' => $this->l('Save'))
+            // ),
             'notifications' => array(
                 'title' =>    $this->l('Notifications'),
                 'icon' =>    'icon-list-alt',

From b2c5865b5fc06b49d735a568707fe4d9aeb2c121 Mon Sep 17 00:00:00 2001
From: azhar bhat <azharbhat.qlo098@webkul.in>
Date: Mon, 16 Jun 2025 16:34:38 +0530
Subject: [PATCH 33/42] Updated the links that were not replaced with the new
 ones

---
 README.md                                | 4 ++--
 admin/themes/default/template/footer.tpl | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 7f126b4d4..0618855e5 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 <p align="center">
 	<a href="https://qloapps.com/download/"><img src="https://img.shields.io/badge/Download-Download%20QloApps%20-brightgreen" alt="Download"></a>
-	<a href="https://qloapps.com/qlo-reservation-system/"><img src="https://img.shields.io/badge/Documentation-Blog-yellowgreen" alt="Documentation"></a>
+	<a href="https://docs.qloapps.com/"><img src="https://img.shields.io/badge/Documentation-Blog-yellowgreen" alt="Documentation"></a>
 	<a href="https://forums.qloapps.com/"><img src="https://img.shields.io/badge/Forum-Help%2FSupport-green" alt="Forum"></a>
 	<a href="https://qloapps.com/addons/"><img src="https://img.shields.io/badge/Addons-Plugins-blueviolet" alt="Addons"></a>
 	<a href="https://qloapps.com/contact/"><img src="https://img.shields.io/badge/Contact-Get%20In%20Touch-blue" alt="Contact us"></a>
@@ -89,7 +89,7 @@ Please don't disclose security vulnerabilities publicly. If you find any securit
 ### Documentation & Demo
 
 #### QloApps Documentation
-[https://qloapps.com/qlo-reservation-system](https://qloapps.com/qlo-reservation-system)
+[https://docs.qloapps.com](https://docs.qloapps.com)
 #### QloApps Demo
 **Link** : https://demo.qloapps.com </br>
 **username** : demo@demo.com </br>
diff --git a/admin/themes/default/template/footer.tpl b/admin/themes/default/template/footer.tpl
index bb64572a0..cb46e18f0 100644
--- a/admin/themes/default/template/footer.tpl
+++ b/admin/themes/default/template/footer.tpl
@@ -72,7 +72,7 @@
 				{l s='Addons'}
 			</a>
 			/&nbsp;
-			<a href="https://qloapps.com/qlo-reservation-system/" class="footer_link _blank">
+			<a href="https://docs.qloapps.com/" class="footer_link _blank">
 				<i class="icon-book"></i>
 				{l s='Training'}
 			</a>

From 754f108fc0c705354747d8558a80d6f1ec190af2 Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Mon, 16 Jun 2025 17:00:45 +0530
Subject: [PATCH 34/42] Fixed: added escape in the csv functions to fix the
 deprication n warnings

---
 classes/controller/AdminController.php                        | 4 ++--
 .../controllers/admin/AdminNewsletterController.php           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 5e59550b2..62adbec94 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -1198,7 +1198,7 @@ class AdminControllerCore extends Controller
             }
         }
 
-        fputcsv($fd, $headers, ';', $text_delimiter,  '\\');
+        fputcsv($fd, $headers, ';', $text_delimiter, escape: "");
         foreach ($this->_list as $i => $row) {
             $content = array();
             $path_to_image = false;
@@ -1222,7 +1222,7 @@ class AdminControllerCore extends Controller
                 }
                 $content[] = $field_value;
             }
-            fputcsv($fd, $content, ';', $text_delimiter,  '\\');
+            fputcsv($fd, $content, ';', $text_delimiter, escape: "");
         }
 
         @fclose($fd);
diff --git a/modules/blocknewsletter/controllers/admin/AdminNewsletterController.php b/modules/blocknewsletter/controllers/admin/AdminNewsletterController.php
index d4397da6d..1e5efb34d 100644
--- a/modules/blocknewsletter/controllers/admin/AdminNewsletterController.php
+++ b/modules/blocknewsletter/controllers/admin/AdminNewsletterController.php
@@ -316,7 +316,7 @@ class AdminNewsletterController extends ModuleAdminController
 
                 $fileHandle = fopen($filePath, 'w+');
                 foreach ($subscribers as $subscriber) {
-                    fputcsv($fileHandle, $subscriber);
+                    fputcsv($fileHandle, $subscriber, ';', escape: "");
                 }
 
                 if (Tools::file_exists_cache($filePath)) {

From b88e2c7bca791fbdb54a1961eb9506104598d231 Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Mon, 16 Jun 2025 18:02:58 +0530
Subject: [PATCH 35/42] Fixed: warnings and added type casting

---
 admin/ajax_products_list.php | 6 +++---
 classes/Tools.php            | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/admin/ajax_products_list.php b/admin/ajax_products_list.php
index 2971bdd42..6f0c3dd30 100644
--- a/admin/ajax_products_list.php
+++ b/admin/ajax_products_list.php
@@ -75,7 +75,7 @@ $sqlJoin ='	LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (pl.`id_product` = p.`
 
 $sqlWhere =	' WHERE (pl.name LIKE \'%'.pSQL($query).'%\' OR p.reference LIKE \'%'.pSQL($query).'%\')'.
         (!empty($excludeIds) ? ' AND p.id_product NOT IN ('.$excludeIds.') ' : ' ').
-        (!empty($excludePackItself) ? ' AND p.id_product <> '.$excludePackItself.' ' : ' ').
+        (!empty($excludePackItself) ? ' AND p.id_product <> '.(int) $excludePackItself.' ' : ' ').
         ($excludeVirtuals ? 'AND NOT EXISTS (SELECT 1 FROM `'._DB_PREFIX_.'product_download` pd WHERE (pd.id_product = p.id_product))' : '').
         ($exclude_packs ? 'AND (p.cache_is_pack IS NULL OR p.cache_is_pack = 0)' : '').
         ($bookingProduct ? 'AND p.`booking_product` = '.(int) $bookingProduct : '');
@@ -96,7 +96,7 @@ $sql = $sqlSelect.' '.$sqlFrom.' '.$sqlJoin.' '.$sqlWhere.' '.$sqlGroupBy;
 
 $items = Db::getInstance()->executeS($sql);
 
-if ($items && ($excludeIds || strpos($_SERVER['HTTP_REFERER'], 'AdminScenes') !== false)) {
+if ($items && ($excludeIds || (isset($_SERVER['HTTP_REFERER']) && Tools::strpos($_SERVER['HTTP_REFERER'], 'AdminScenes') !== false))) {
     foreach ($items as $item) {
     	$item['name'] = str_replace('|', '&#124;', $item['name']);
         echo trim($item['name']).(!empty($item['reference']) ? ' (ref: '.$item['reference'].')' : '').'|'.(int)($item['id_product'])."\n";
@@ -151,7 +151,7 @@ if ($items && ($excludeIds || strpos($_SERVER['HTTP_REFERER'], 'AdminScenes') !=
                 'id' => (int)($item['id_product']),
                 'name' => $item['name'],
                 'ref' => (!empty($item['reference']) ? $item['reference'] : ''),
-                'image' => str_replace('http://', Tools::getShopProtocol(), $context->link->getImageLink($item['link_rewrite'], $item['id_image'], 'home_default')),
+                'image' => $item['id_image'] ? str_replace('http://', Tools::getShopProtocol(), $context->link->getImageLink($item['link_rewrite'], $item['id_image'], 'home_default')) : false,
             );
             array_push($results, $product);
         }
diff --git a/classes/Tools.php b/classes/Tools.php
index f898c10e8..365cd702b 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -1788,6 +1788,9 @@ class ToolsCore
 
     public static function strpos($str, $find, $offset = 0, $encoding = 'UTF-8')
     {
+        if (is_array($str) || is_null($str)) {
+            return false;
+        }
         if (function_exists('mb_strpos')) {
             return mb_strpos($str, $find, $offset, $encoding);
         }

From 5d30caab243bb0e3681fe5842bbd096e9c636ac6 Mon Sep 17 00:00:00 2001
From: azhar bhat <azharbhat.qlo098@webkul.in>
Date: Mon, 16 Jun 2025 19:00:12 +0530
Subject: [PATCH 36/42] icon updated

---
 themes/hotel-reservation-theme/contact-form.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/hotel-reservation-theme/contact-form.tpl b/themes/hotel-reservation-theme/contact-form.tpl
index 61ab718b4..210557e3b 100644
--- a/themes/hotel-reservation-theme/contact-form.tpl
+++ b/themes/hotel-reservation-theme/contact-form.tpl
@@ -42,7 +42,7 @@
 						<div class="htl-global-address-div col-md-8 col-sm-12">
 							{if isset($gblHtlPhone) && $gblHtlPhone }
 								<div>
-									<p class="global-address-header"><i class="icon-bed"></i> {l s='Main Branch'}</p>
+									<p class="global-address-header"><i class="icon-building"></i> {l s='Main Branch'}</p>
 									<p class="global-address-value">
 										{$gblHtlAddress}
 									</p>

From da19c3788834acabb3d736549a3089de451ddfda Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Tue, 17 Jun 2025 11:13:04 +0530
Subject: [PATCH 37/42] Fixed: older product selection is saved in cart rule
 restriction if a specific room type option is selected

---
 controllers/admin/AdminCartRulesController.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/controllers/admin/AdminCartRulesController.php b/controllers/admin/AdminCartRulesController.php
index c1e98e27e..654933669 100644
--- a/controllers/admin/AdminCartRulesController.php
+++ b/controllers/admin/AdminCartRulesController.php
@@ -277,7 +277,10 @@ class AdminCartRulesControllerCore extends AdminController
             // If the reduction is associated to a specific product, then it must be part of the product restrictions
             if ((int)Tools::getValue('reduction_product') && Tools::getValue('apply_discount_to') == 'specific' && Tools::getValue('apply_discount') != 'off') {
                 $reduction_product = (int)Tools::getValue('reduction_product');
-
+                // In case the product_restriction was unchecked then remove the older products.
+                if (!Tools::getValue('product_restriction')) {
+                    $_POST['product_rule_group'] = array();
+                }
                 // First, check if it is not already part of the restrictions
                 $already_restricted = false;
                 if (is_array($rule_group_array = Tools::getValue('product_rule_group')) && count($rule_group_array) && Tools::getValue('product_restriction')) {

From 054640ec1dfcae900562433f3039fbe6499baaa4 Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Tue, 17 Jun 2025 11:35:03 +0530
Subject: [PATCH 38/42] Fixed: issues due warnings in the room type page while
 adding new room

---
 .../themes/default/template/controllers/normal_products/seo.tpl | 2 +-
 .../default/template/controllers/products/configuration.tpl     | 2 +-
 admin/themes/default/template/controllers/products/seo.tpl      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/themes/default/template/controllers/normal_products/seo.tpl b/admin/themes/default/template/controllers/normal_products/seo.tpl
index 0a0d3d38e..5525a2534 100644
--- a/admin/themes/default/template/controllers/normal_products/seo.tpl
+++ b/admin/themes/default/template/controllers/normal_products/seo.tpl
@@ -99,7 +99,7 @@
 			{foreach from=$languages item=language}
 			<div class="alert alert-warning translatable-field lang-{$language.id_lang}">
 				<i class="icon-link"></i> {l s='The product link will look like this:'}<br/>
-				<strong>{if isset($rewritten_links[$language.id_lang][0])}{$rewritten_links[$language.id_lang][0]|escape:'html':'UTF-8'}{/if}<span id="friendly-url_{$language.id_lang}">{$product->link_rewrite[$language.id_lang]|escape:'html':'UTF-8'}</span>{if isset($rewritten_links[$language.id_lang][1])}{$rewritten_links[$language.id_lang][1]|escape:'html':'UTF-8'}{/if}</strong>
+				<strong>{if isset($rewritten_links[$language.id_lang][0])}{$rewritten_links[$language.id_lang][0]|escape:'html':'UTF-8'}{/if}<span id="friendly-url_{$language.id_lang}">{if isset($product->id)}{$product->link_rewrite[$language.id_lang]|escape:'html':'UTF-8'}{/if}</span>{if isset($rewritten_links[$language.id_lang][1])}{$rewritten_links[$language.id_lang][1]|escape:'html':'UTF-8'}{/if}</strong>
 			</div>
 			{/foreach}
 		</div>
diff --git a/admin/themes/default/template/controllers/products/configuration.tpl b/admin/themes/default/template/controllers/products/configuration.tpl
index a5680a24f..638934ba8 100644
--- a/admin/themes/default/template/controllers/products/configuration.tpl
+++ b/admin/themes/default/template/controllers/products/configuration.tpl
@@ -225,7 +225,6 @@
 			</button>
 		</div>
 	</div>
-{/if}
 
 {*Disable Dates Model*}
 <div class="modal fade" id="deactiveDatesModal" tabindex="-1" role="dialog" aria-labelledby="deactiveDatesLabel">
@@ -1886,3 +1885,4 @@
     });
 
 </script>
+{/if}
diff --git a/admin/themes/default/template/controllers/products/seo.tpl b/admin/themes/default/template/controllers/products/seo.tpl
index e0e018640..8544f75a1 100644
--- a/admin/themes/default/template/controllers/products/seo.tpl
+++ b/admin/themes/default/template/controllers/products/seo.tpl
@@ -99,7 +99,7 @@
 			{foreach from=$languages item=language}
 			<div class="alert alert-warning translatable-field lang-{$language.id_lang}">
 				<i class="icon-link"></i> {l s='The product link will look like this:'}<br/>
-				<strong>{if isset($rewritten_links[$language.id_lang][0])}{$rewritten_links[$language.id_lang][0]|escape:'html':'UTF-8'}{/if}<span id="friendly-url_{$language.id_lang}">{$product->link_rewrite[$language.id_lang]|escape:'html':'UTF-8'}</span>{if isset($rewritten_links[$language.id_lang][1])}{$rewritten_links[$language.id_lang][1]|escape:'html':'UTF-8'}{/if}</strong>
+				<strong>{if isset($rewritten_links[$language.id_lang][0])}{$rewritten_links[$language.id_lang][0]|escape:'html':'UTF-8'}{/if}<span id="friendly-url_{$language.id_lang}">{if isset($product->id)}{$product->link_rewrite[$language.id_lang]|escape:'html':'UTF-8'}{/if}</span>{if isset($rewritten_links[$language.id_lang][1])}{$rewritten_links[$language.id_lang][1]|escape:'html':'UTF-8'}{/if}</strong>
 			</div>
 			{/foreach}
 		</div>

From f9073bc76116ff83884e2318b9a62f4117c75605 Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Tue, 17 Jun 2025 13:08:04 +0530
Subject: [PATCH 39/42] Fixed: the services pop up is not updated if the admin
 adds new service in the order

---
 controllers/admin/AdminOrdersController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 8ee4d416b..8abdaba32 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -7708,10 +7708,10 @@ class AdminOrdersControllerCore extends AdminController
                         $autoAdded = Tools::getValue('new_service_auto_added');
 
                         // adjust values for auto added services
+                        $objOrderDetail = new OrderDetail($objHotelBookingDetail->id_order_detail);
                         if ($autoAdded) {
                             $productQty = 1;
                             // check if booking room type tax rule is still exist
-                            $objOrderDetail = new OrderDetail($objHotelBookingDetail->id_order_detail);
                             if (Validate::isLoadedObject($objTaxRuleGroup = new TaxRulesGroup($objOrderDetail->id_tax_rules_group))) {
                                 $idTaxRuleGroup = $objOrderDetail->id_tax_rules_group;
                             }

From 5dc42c1022e681c0c78f722f883c4ed2461c17d9 Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Tue, 17 Jun 2025 13:21:15 +0530
Subject: [PATCH 40/42] Fixed: wrong variable was used to get the service price
 tax incl while adding new service in the order in the back-office

---
 controllers/admin/AdminOrdersController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 8abdaba32..dc94527dc 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -7852,7 +7852,7 @@ class AdminOrdersControllerCore extends AdminController
                                                                 $objHotelBookingDetail->date_to,
                                                                 $objCart->id
                                                             ) / $numDays;
-                                                            $unitPriceTaxExcl = Product::getServiceProductPrice(
+                                                            $unitPriceTaxIncl = Product::getServiceProductPrice(
                                                                 (int)$product['id_product'],
                                                                 0,
                                                                 $roomHtlCartInfo['id_hotel'],

From 47ba6acf765befe37d17682580f5c2f93634c23b Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Tue, 17 Jun 2025 15:08:24 +0530
Subject: [PATCH 41/42] Fixed: notices while trying to view invoice having no
 room or prododucts

---
 classes/pdf/HTMLTemplateInvoice.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/classes/pdf/HTMLTemplateInvoice.php b/classes/pdf/HTMLTemplateInvoice.php
index 4c0d096d9..c23fdd280 100644
--- a/classes/pdf/HTMLTemplateInvoice.php
+++ b/classes/pdf/HTMLTemplateInvoice.php
@@ -646,6 +646,8 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
         $footer['additional_service_price_tax_incl'] =0;
         $footer['total_convenience_fee_te'] = 0;
         $footer['total_convenience_fee_ti'] = 0;
+        $footer['service_products_price_tax_excl'] = 0;
+        $footer['service_products_price_tax_incl'] = 0;
         if ($idsOrderDetail = array_column($order_details, 'id_order_detail')) {
             $footer['room_price_tax_excl'] = $this->order->getTotalProductsWithoutTaxes(false, true, null, null, null, $idsOrderDetail) + $this->order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 1, Product::PRICE_ADDITION_TYPE_WITH_ROOM, $idsOrderDetail);
             $footer['room_price_tax_incl'] = $this->order->getTotalProductsWithTaxes(false, true, null, null, null, $idsOrderDetail) + $this->order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 1, Product::PRICE_ADDITION_TYPE_WITH_ROOM, $idsOrderDetail);

From 23d9418f24fedfe9fb508d73d8135bc93a478305 Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Tue, 17 Jun 2025 15:12:38 +0530
Subject: [PATCH 42/42] Fixed: undefined error on room delete

---
 controllers/admin/AdminOrdersController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index dc94527dc..51b689b7f 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -6494,7 +6494,8 @@ class AdminOrdersControllerCore extends AdminController
             'invoices_collection' => $invoice_collection,
             'current_id_lang' => Context::getContext()->language->id,
             'link' => Context::getContext()->link,
-            'current_index' => self::$currentIndex
+            'current_index' => self::$currentIndex,
+            'can_edit' => ($this->tabAccess['edit'] === 1),
         ));
 
         $this->sendChangedNotification($order);