From 9d67f5fc6341a7a3a873e10a749ae2fec84d0728 Mon Sep 17 00:00:00 2001
From: aradhana kumari <aradhana.kumari639@webkul.in>
Date: Fri, 22 May 2026 14:51:47 +0530
Subject: [PATCH 01/35] Added: Arrival Date and Departure Date in order list

Co-authored-by: Name <sumit201@webkul.in>
---
 controllers/admin/AdminOrdersController.php | 38 ++++++++++++++++++---
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index f6c236c59..bbb6241a4 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -72,6 +72,8 @@ class AdminOrdersControllerCore extends AdminController
         ) FROM `'._DB_PREFIX_.'htl_booking_detail` hbd WHERE hbd.`id_order` = a.`id_order`) as total_guests,
         (SELECT SUM(DATEDIFF(hbd.`date_to`, hbd.`date_from`)) FROM `'._DB_PREFIX_.'htl_booking_detail` hbd WHERE hbd.`id_order` = a.`id_order`) as los,
         hbd.`id_room` AS id_room_information,
+        (SELECT GROUP_CONCAT(DISTINCT hbd.`date_from` ORDER BY hbd.`date_from` SEPARATOR \', \') FROM `'._DB_PREFIX_.'htl_booking_detail` hbd WHERE hbd.`id_order` = a.`id_order`) AS date_from,
+        (SELECT GROUP_CONCAT(DISTINCT hbd.`date_to` ORDER BY hbd.`date_to` SEPARATOR \', \') FROM `'._DB_PREFIX_.'htl_booking_detail` hbd WHERE hbd.`id_order` = a.`id_order`) AS date_to,
         (SELECT COUNT(spod.`id_service_product_order_detail`) FROM `'._DB_PREFIX_.'service_product_order_detail` spod WHERE spod.`id_order` = a.`id_order` AND spod.`id_htl_booking_detail`=0) as num_products';
 
         $this->_join = '
@@ -185,16 +187,20 @@ class AdminOrdersControllerCore extends AdminController
                 'displayed' => false,
             ),
             'date_from' => array(
-                'title' => $this->l('Check-in'),
+                'title' => $this->l('Check-in date'),
                 'filter_key' => 'hbd!date_from',
-                'type'=>'date',
-                'displayed' => false,
+                'type' => 'date',
+                'callback' => 'formatCheckInDates',
+                'optional' => true,
+                'displayed' => true,
             ),
             'date_to' => array(
                 'title' => $this->l('Check-out'),
                 'filter_key' => 'hbd!date_to',
                 'type'=>'date',
-                'displayed' => false,
+                 'callback' => 'formatCheckOutDates',
+                'optional' => true,
+                'displayed' => true,
             ),
             'total_guests' => array(
                 'title' => $this->l('Guests'),
@@ -359,6 +365,30 @@ class AdminOrdersControllerCore extends AdminController
         return Tools::displayPrice($echo, (int)$idCurrency);
     }
 
+    public function formatCheckInDates($dates, $row)
+    {
+        if (empty($dates)) {
+            return '--';
+        }
+        $formatted = array();
+        foreach (explode(', ', $dates) as $date) {
+            $formatted[] = Tools::displayDate(trim($date));
+        }
+        return implode(', ', $formatted);
+    }
+
+    public function formatCheckOutDates($dates, $row)
+    {
+        if (empty($dates)) {
+            return '--';
+        }
+        $formatted = array();
+        foreach (explode(', ', $dates) as $date) {
+            $formatted[] = Tools::displayDate(trim($date));
+        }
+        return implode(', ', $formatted);
+    }
+
     public function initPageHeaderToolbar()
     {
         if (empty($this->display)) {

From 3d35223af38d2849120f6e235778d6684e3233ac Mon Sep 17 00:00:00 2001
From: aradhana kumari <aradhana.kumari639@webkul.in>
Date: Fri, 22 May 2026 14:54:19 +0530
Subject: [PATCH 02/35] Add the text in the checkout date

Co-authored-by: Name <sumit201@webkul.in>
---
 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 bbb6241a4..caf5f1b7e 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -195,7 +195,7 @@ class AdminOrdersControllerCore extends AdminController
                 'displayed' => true,
             ),
             'date_to' => array(
-                'title' => $this->l('Check-out'),
+                'title' => $this->l('Check-out date'),
                 'filter_key' => 'hbd!date_to',
                 'type'=>'date',
                  'callback' => 'formatCheckOutDates',

From f86c618de054bce6c3a5d4ea1ff5f51c3d063c63 Mon Sep 17 00:00:00 2001
From: aradhana kumari <aradhana.kumari639@webkul.in>
Date: Fri, 12 Jun 2026 16:43:34 +0530
Subject: [PATCH 03/35] Add the Stay periods

---
 .../orders/_stay_periods_tooltip.tpl          | 49 ++++++++++++
 controllers/admin/AdminOrdersController.php   | 63 +++++++++------
 js/admin/orders_stay_periods.js               | 80 +++++++++++++++++++
 3 files changed, 168 insertions(+), 24 deletions(-)
 create mode 100644 admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl
 create mode 100644 js/admin/orders_stay_periods.js

diff --git a/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl b/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl
new file mode 100644
index 000000000..c75f4be77
--- /dev/null
+++ b/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl
@@ -0,0 +1,49 @@
+{*
+ * Hidden template used by orders_stay_periods.js to build the Stay Periods
+ * jQuery UI tooltip. The JS clones .tooltip_cont, populates .tip-body
+ * with the period rows, and passes the result as the tooltip content.
+ *}
+<style>
+    .stay-period-tooltip {
+        border: none;
+        box-shadow: 0 0 5px #aaa;
+        -webkit-box-shadow: 0 0 5px #aaa;
+        padding-bottom: 10px;
+        min-width: 260px;
+    }
+    .stay-period-tooltip .tip_date {
+        font-weight: bold;
+    }
+    .stay-period-tooltip .tip-body {
+        display: table;
+        width: 100%;
+        margin-top: 6px;
+    }
+    .stay-period-tooltip .stay_period {
+        display: table-row;
+    }
+    .stay-period-tooltip .tip_element_head,
+    .stay-period-tooltip .tip_element_value {
+        display: table-cell;
+        padding: 3px 6px;
+    }
+    .stay-period-tooltip .tip_element_value {
+        text-align: right;
+    }
+    .stay-period-tooltip .stay_period_header .tip_element_head,
+    .stay-period-tooltip .stay_period_header .tip_element_value {
+        border-bottom: 1px solid #ddd;
+        padding-bottom: 5px;
+    }
+</style>
+<div id="stay-period-tpl"
+     style="display:none;"
+     data-label-dates="{l s='Dates'}"
+     data-label-rooms="{l s='Rooms'}">
+    <div class="tooltip_cont">
+        <div class="tip_header">
+            <div class="tip_date">{l s='Stay Periods'}</div>
+        </div>
+        <div class="tip-body"></div>
+    </div>
+</div>
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index caf5f1b7e..6c40ed276 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -72,8 +72,7 @@ class AdminOrdersControllerCore extends AdminController
         ) FROM `'._DB_PREFIX_.'htl_booking_detail` hbd WHERE hbd.`id_order` = a.`id_order`) as total_guests,
         (SELECT SUM(DATEDIFF(hbd.`date_to`, hbd.`date_from`)) FROM `'._DB_PREFIX_.'htl_booking_detail` hbd WHERE hbd.`id_order` = a.`id_order`) as los,
         hbd.`id_room` AS id_room_information,
-        (SELECT GROUP_CONCAT(DISTINCT hbd.`date_from` ORDER BY hbd.`date_from` SEPARATOR \', \') FROM `'._DB_PREFIX_.'htl_booking_detail` hbd WHERE hbd.`id_order` = a.`id_order`) AS date_from,
-        (SELECT GROUP_CONCAT(DISTINCT hbd.`date_to` ORDER BY hbd.`date_to` SEPARATOR \', \') FROM `'._DB_PREFIX_.'htl_booking_detail` hbd WHERE hbd.`id_order` = a.`id_order`) AS date_to,
+        (SELECT GROUP_CONCAT(CONCAT(ps.period, \'~\', ps.cnt) ORDER BY ps.period SEPARATOR \'::\') FROM (SELECT CONCAT(hbd.`date_from`, \'|\', hbd.`date_to`) AS period, COUNT(*) AS cnt FROM `'._DB_PREFIX_.'htl_booking_detail` hbd WHERE hbd.`id_order` = a.`id_order` GROUP BY hbd.`date_from`, hbd.`date_to`) AS ps) AS stay_periods,
         (SELECT COUNT(spod.`id_service_product_order_detail`) FROM `'._DB_PREFIX_.'service_product_order_detail` spod WHERE spod.`id_order` = a.`id_order` AND spod.`id_htl_booking_detail`=0) as num_products';
 
         $this->_join = '
@@ -187,19 +186,23 @@ class AdminOrdersControllerCore extends AdminController
                 'displayed' => false,
             ),
             'date_from' => array(
-                'title' => $this->l('Check-in date'),
+                'title' => $this->l('Check-in'),
                 'filter_key' => 'hbd!date_from',
-                'type' => 'date',
-                'callback' => 'formatCheckInDates',
-                'optional' => true,
-                'displayed' => true,
+                'type'=>'date',
+                'displayed' => false,
             ),
             'date_to' => array(
-                'title' => $this->l('Check-out date'),
+                'title' => $this->l('Check-out'),
                 'filter_key' => 'hbd!date_to',
                 'type'=>'date',
-                 'callback' => 'formatCheckOutDates',
+                'displayed' => false,
+            ),
+            'stay_periods' => array(
+                'title' => $this->l('Stay Periods'),
+                'type' => 'text',
+                'callback' => 'formatStayPeriods',
                 'optional' => true,
+                'search' => false,
                 'displayed' => true,
             ),
             'total_guests' => array(
@@ -365,28 +368,33 @@ class AdminOrdersControllerCore extends AdminController
         return Tools::displayPrice($echo, (int)$idCurrency);
     }
 
-    public function formatCheckInDates($dates, $row)
+    public function formatStayPeriods($value, $row)
     {
-        if (empty($dates)) {
+        if (empty($value)) {
             return '--';
         }
         $formatted = array();
-        foreach (explode(', ', $dates) as $date) {
-            $formatted[] = Tools::displayDate(trim($date));
+        foreach (explode('::', $value) as $chunk) {
+            $countParts = explode('~', $chunk);
+            $dateParts  = explode('|', $countParts[0]);
+            if (count($dateParts) === 2) {
+                $formatted[] = array(
+                    'from'  => Tools::displayDate(trim($dateParts[0])),
+                    'to'    => Tools::displayDate(trim($dateParts[1])),
+                    'count' => isset($countParts[1]) ? (int)$countParts[1] : 1,
+                );
+            }
         }
-        return implode(', ', $formatted);
-    }
 
-    public function formatCheckOutDates($dates, $row)
-    {
-        if (empty($dates)) {
-            return '--';
+        $datesDisplay = array();
+        foreach (array_slice($formatted, 0, 2) as $entry) {
+            $datesDisplay[] = $entry['from'].' - '.$entry['to'];
         }
-        $formatted = array();
-        foreach (explode(', ', $dates) as $date) {
-            $formatted[] = Tools::displayDate(trim($date));
-        }
-        return implode(', ', $formatted);
+
+        $icon = ' <i class="icon-info-sign stay-period-tip" data-stay-tip="'
+            .htmlspecialchars(json_encode($formatted)).'"></i>';
+
+        return implode('<br>', $datesDisplay).$icon;
     }
 
     public function initPageHeaderToolbar()
@@ -1312,8 +1320,13 @@ class AdminOrdersControllerCore extends AdminController
         parent::setMedia();
 
         $this->addJqueryUI('ui.datepicker');
+        $this->addJqueryUI('ui.tooltip', 'base', true);
         $this->addJS(_PS_JS_DIR_.'vendor/d3.v3.min.js');
 
+        if ($this->display != 'view') {
+            $this->addJS(_PS_JS_DIR_.'admin/orders_stay_periods.js');
+        }
+
         if ($this->display == 'view') {
             if ($this->loadObject()) {
                 $this->addJS(_PS_JS_DIR_.'admin/orders.js');
@@ -1425,6 +1438,8 @@ class AdminOrdersControllerCore extends AdminController
 
         $this->_new_list_header_design = true;
 
+        $this->content .= $this->context->smarty->fetch('controllers/orders/_stay_periods_tooltip.tpl');
+
         return parent::renderList();
     }
 
diff --git a/js/admin/orders_stay_periods.js b/js/admin/orders_stay_periods.js
new file mode 100644
index 000000000..2c901344b
--- /dev/null
+++ b/js/admin/orders_stay_periods.js
@@ -0,0 +1,80 @@
+/**
+ * Stay Periods tooltip initialisation for the Admin Orders list.
+ * Reads structured JSON from data-stay-tip on each .stay-period-tip icon,
+ * clones the hidden #stay-period-tpl template, fills it, and returns it
+ * as the jQuery UI tooltip content.
+ */
+$(document).ready(function () {
+    var closeTimer = null;
+
+    function buildTooltip(periods) {
+        var $tpl  = $('#stay-period-tpl .tooltip_cont').clone();
+        var $body = $tpl.find('.tip-body').empty();
+
+        $body.append(
+            $('<div class="stay_period stay_period_header">').append(
+                $('<span class="tip_element_head">').text($('#stay-period-tpl').data('label-dates')),
+                $('<span class="tip_element_value">').text($('#stay-period-tpl').data('label-rooms'))
+            )
+        );
+
+        $.each(periods, function (_, p) {
+            $body.append(
+                $('<div class="stay_period">').append(
+                    $('<span class="tip_element_head">').text(p.from + ' – ' + p.to),
+                    $('<span class="tip_element_value">').text(p.count)
+                )
+            );
+        });
+        return $('<div>', {
+            'class': 'ui-tooltip ui-widget ui-corner-all ui-widget-content stay-period-tooltip',
+            'role' : 'tooltip'
+        }).append(
+            $('<div class="ui-tooltip-content">').append($tpl)
+        );
+    }
+
+    function cancelClose() {
+        clearTimeout(closeTimer);
+        closeTimer = null;
+    }
+
+    function scheduleClose($tip) {
+        cancelClose();
+        closeTimer = setTimeout(function () {
+            $tip.fadeOut(300, function () { $tip.remove(); });
+        }, 300);
+    }
+
+    $(document).on('mouseenter', '.stay-period-tip', function () {
+        cancelClose();
+
+        var periods = $(this).data('stay-tip');
+        if (!periods || !periods.length) { return; }
+
+        $('.stay-period-tooltip').stop(true).remove();
+
+        var $icon = $(this);
+        var $tip  = buildTooltip(periods).appendTo('body').hide().fadeIn(200);
+
+        var iconOffset = $icon.offset();
+        $tip.css({
+            position : 'absolute',
+            zIndex   : 9999,
+            top      : iconOffset.top + ($icon.outerHeight() / 2) - ($tip.outerHeight() / 2),
+            left     : iconOffset.left + $icon.outerWidth() + 8
+        });
+
+        $tip.on('mouseenter', function () {
+            cancelClose();
+        }).on('mouseleave', function () {
+            scheduleClose($tip);
+        });
+
+    }).on('mouseleave', '.stay-period-tip', function () {
+        var $tip = $('.stay-period-tooltip');
+        if ($tip.length) {
+            scheduleClose($tip);
+        }
+    });
+});

From d3b8bfe91f03a3f9fc2c8eb987729c756bae5760 Mon Sep 17 00:00:00 2001
From: aradhana kumari <aradhana.kumari639@webkul.in>
Date: Fri, 12 Jun 2026 16:45:46 +0530
Subject: [PATCH 04/35] Add license

---
 .../orders/_stay_periods_tooltip.tpl          | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl b/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl
index c75f4be77..f22a3e02c 100644
--- a/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl
+++ b/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl
@@ -1,8 +1,25 @@
 {*
- * Hidden template used by orders_stay_periods.js to build the Stay Periods
- * jQuery UI tooltip. The JS clones .tooltip_cont, populates .tip-body
- * with the period rows, and passes the result as the tooltip content.
- *}
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License version 3.0
+* that is bundled with this package in the file LICENSE.md
+* It is also available through the world-wide-web at this URL:
+* https://opensource.org/license/osl-3-0-php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to support@qloapps.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade this module to a newer
+* versions in the future. If you wish to customize this module for your needs
+* please refer to https://store.webkul.com/customisation-guidelines for more information.
+*
+* @author Webkul IN
+* @copyright Since 2010 Webkul
+* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+*}
+
 <style>
     .stay-period-tooltip {
         border: none;

From d5c5fe5756faa43a57db058af4de18ddafa424ac Mon Sep 17 00:00:00 2001
From: aradhana kumari <aradhana.kumari639@webkul.in>
Date: Fri, 19 Jun 2026 12:56:03 +0530
Subject: [PATCH 05/35] Update the design

Co-authored-by: Name <sumit201@webkul.in>
---
 .../themes/default/css/controllers/orders.css | 67 +++++++++++++++++++
 .../orders/_stay_periods_tooltip.tpl          | 34 +---------
 controllers/admin/AdminOrdersController.php   | 19 ++++--
 3 files changed, 82 insertions(+), 38 deletions(-)
 create mode 100644 admin/themes/default/css/controllers/orders.css

diff --git a/admin/themes/default/css/controllers/orders.css b/admin/themes/default/css/controllers/orders.css
new file mode 100644
index 000000000..5442c326d
--- /dev/null
+++ b/admin/themes/default/css/controllers/orders.css
@@ -0,0 +1,67 @@
+/**
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License version 3.0
+* that is bundled with this package in the file LICENSE.md
+* It is also available through the world-wide-web at this URL:
+* https://opensource.org/license/osl-3-0-php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to support@qloapps.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade this module to a newer
+* versions in the future. If you wish to customize this module for your needs
+* please refer to https://store.webkul.com/customisation-guidelines for more information.
+*
+* @author Webkul IN
+* @copyright Since 2010 Webkul
+* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+*/
+
+.stay-period-tooltip {
+    border: none;
+    box-shadow: 0 0 5px #aaa;
+    -webkit-box-shadow: 0 0 5px #aaa;
+    padding-bottom: 10px;
+    min-width: 260px;
+}
+.stay-period-tooltip .tip_date {
+    font-weight: bold;
+}
+.stay-period-tooltip .tip-body {
+    display: table;
+    width: 100%;
+    margin-top: 6px;
+}
+.stay-period-tooltip .stay_period {
+    display: table-row;
+}
+.stay-period-tooltip .tip_element_head,
+.stay-period-tooltip .tip_element_value {
+    display: table-cell;
+    padding: 3px 6px;
+}
+.stay-period-tooltip .tip_element_value {
+    text-align: right;
+}
+.stay-period-tooltip .stay_period_header .tip_element_head,
+.stay-period-tooltip .stay_period_header .tip_element_value {
+    border-bottom: 1px solid #ddd;
+    padding-bottom: 5px;
+}
+.stay-period-badge {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    background: #666;
+    color: #fff;
+    border-radius: 50%;
+    min-width: 24px;
+    height: 24px;
+    font-size: 11px;
+    font-weight: bold;
+    padding: 0 4px;
+    cursor: pointer;
+}
diff --git a/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl b/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl
index f22a3e02c..606c2e9e5 100644
--- a/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl
+++ b/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl
@@ -20,39 +20,7 @@
 * @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
 *}
 
-<style>
-    .stay-period-tooltip {
-        border: none;
-        box-shadow: 0 0 5px #aaa;
-        -webkit-box-shadow: 0 0 5px #aaa;
-        padding-bottom: 10px;
-        min-width: 260px;
-    }
-    .stay-period-tooltip .tip_date {
-        font-weight: bold;
-    }
-    .stay-period-tooltip .tip-body {
-        display: table;
-        width: 100%;
-        margin-top: 6px;
-    }
-    .stay-period-tooltip .stay_period {
-        display: table-row;
-    }
-    .stay-period-tooltip .tip_element_head,
-    .stay-period-tooltip .tip_element_value {
-        display: table-cell;
-        padding: 3px 6px;
-    }
-    .stay-period-tooltip .tip_element_value {
-        text-align: right;
-    }
-    .stay-period-tooltip .stay_period_header .tip_element_head,
-    .stay-period-tooltip .stay_period_header .tip_element_value {
-        border-bottom: 1px solid #ddd;
-        padding-bottom: 5px;
-    }
-</style>
+
 <div id="stay-period-tpl"
      style="display:none;"
      data-label-dates="{l s='Dates'}"
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 217d949ab..117e29bcd 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -204,6 +204,7 @@ class AdminOrdersControllerCore extends AdminController
                 'optional' => true,
                 'search' => false,
                 'displayed' => true,
+                'visible_default' => true,
             ),
             'total_guests' => array(
                 'title' => $this->l('Guests'),
@@ -221,7 +222,7 @@ class AdminOrdersControllerCore extends AdminController
                 'visible_default' => true
             ),
             'los' => array(
-                'title' => $this->l('Stay period'),
+                'title' => $this->l('Stay duration'),
                 'align' => 'text-center',
                 'type' => 'range',
                 'havingFilter' => true,
@@ -387,14 +388,21 @@ class AdminOrdersControllerCore extends AdminController
         }
 
         $datesDisplay = array();
-        foreach (array_slice($formatted, 0, 2) as $entry) {
+        foreach (array_slice($formatted, 0, 1) as $entry) {
             $datesDisplay[] = $entry['from'].' - '.$entry['to'];
         }
 
-        $icon = ' <i class="icon-info-sign stay-period-tip" data-stay-tip="'
-            .htmlspecialchars(json_encode($formatted)).'"></i>';
+        $output = implode('<br>', $datesDisplay);
 
-        return implode('<br>', $datesDisplay).$icon;
+        $totalRooms = array_sum(array_column($formatted, 'count'));
+
+        if ($totalRooms > 1) {
+            $output .= ' <span class="stay-period-badge stay-period-tip" data-stay-tip="'
+                .htmlspecialchars(json_encode($formatted)).'">+'
+                .($totalRooms - 1).'</span>';
+        }
+
+        return $output;
     }
 
     public function initPageHeaderToolbar()
@@ -1389,6 +1397,7 @@ class AdminOrdersControllerCore extends AdminController
 
         if ($this->display != 'view') {
             $this->addJS(_PS_JS_DIR_.'admin/orders_stay_periods.js');
+            $this->addCSS(__PS_BASE_URI__.$this->admin_webpath.'/themes/'.$this->bo_theme.'/css/controllers/orders.css');
         }
 
         if ($this->display == 'view') {

From 222601c91261163903df5278020c13bbb00a992c Mon Sep 17 00:00:00 2001
From: aradhana kumari <aradhana.kumari639@webkul.in>
Date: Fri, 19 Jun 2026 13:10:14 +0530
Subject: [PATCH 06/35] Update the css class name

Co-authored-by: Name <sumit201@webkul.in>
---
 .../themes/default/css/controllers/orders.css | 20 ++++++-------
 .../orders/_stay_periods_tooltip.tpl          |  8 +++---
 controllers/admin/AdminOrdersController.php   |  2 +-
 js/admin/orders_stay_periods.js               | 28 +++++++++----------
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/admin/themes/default/css/controllers/orders.css b/admin/themes/default/css/controllers/orders.css
index 5442c326d..5f7115d51 100644
--- a/admin/themes/default/css/controllers/orders.css
+++ b/admin/themes/default/css/controllers/orders.css
@@ -20,38 +20,38 @@
 * @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
 */
 
-.stay-period-tooltip {
+.qlo-stay-period-tooltip {
     border: none;
     box-shadow: 0 0 5px #aaa;
     -webkit-box-shadow: 0 0 5px #aaa;
     padding-bottom: 10px;
     min-width: 260px;
 }
-.stay-period-tooltip .tip_date {
+.qlo-stay-period-tooltip .qlo-tip-date {
     font-weight: bold;
 }
-.stay-period-tooltip .tip-body {
+.qlo-stay-period-tooltip .qlo-tip-body {
     display: table;
     width: 100%;
     margin-top: 6px;
 }
-.stay-period-tooltip .stay_period {
+.qlo-stay-period-tooltip .qlo-stay-period {
     display: table-row;
 }
-.stay-period-tooltip .tip_element_head,
-.stay-period-tooltip .tip_element_value {
+.qlo-stay-period-tooltip .qlo-tip-element-head,
+.qlo-stay-period-tooltip .qlo-tip-element-value {
     display: table-cell;
     padding: 3px 6px;
 }
-.stay-period-tooltip .tip_element_value {
+.qlo-stay-period-tooltip .qlo-tip-element-value {
     text-align: right;
 }
-.stay-period-tooltip .stay_period_header .tip_element_head,
-.stay-period-tooltip .stay_period_header .tip_element_value {
+.qlo-stay-period-tooltip .qlo-stay-period-header .qlo-tip-element-head,
+.qlo-stay-period-tooltip .qlo-stay-period-header .qlo-tip-element-value {
     border-bottom: 1px solid #ddd;
     padding-bottom: 5px;
 }
-.stay-period-badge {
+.qlo-stay-period-badge {
     display: inline-flex;
     align-items: center;
     justify-content: center;
diff --git a/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl b/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl
index 606c2e9e5..a8b7b2b1a 100644
--- a/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl
+++ b/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl
@@ -25,10 +25,10 @@
      style="display:none;"
      data-label-dates="{l s='Dates'}"
      data-label-rooms="{l s='Rooms'}">
-    <div class="tooltip_cont">
-        <div class="tip_header">
-            <div class="tip_date">{l s='Stay Periods'}</div>
+    <div class="qlo-tooltip-cont">
+        <div class="qlo-tip-header">
+            <div class="qlo-tip-date">{l s='Stay Periods'}</div>
         </div>
-        <div class="tip-body"></div>
+        <div class="qlo-tip-body"></div>
     </div>
 </div>
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 117e29bcd..bce38c46e 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -397,7 +397,7 @@ class AdminOrdersControllerCore extends AdminController
         $totalRooms = array_sum(array_column($formatted, 'count'));
 
         if ($totalRooms > 1) {
-            $output .= ' <span class="stay-period-badge stay-period-tip" data-stay-tip="'
+            $output .= ' <span class="qlo-stay-period-badge qlo-stay-period-tip" data-stay-tip="'
                 .htmlspecialchars(json_encode($formatted)).'">+'
                 .($totalRooms - 1).'</span>';
         }
diff --git a/js/admin/orders_stay_periods.js b/js/admin/orders_stay_periods.js
index 2c901344b..95fa915f8 100644
--- a/js/admin/orders_stay_periods.js
+++ b/js/admin/orders_stay_periods.js
@@ -1,6 +1,6 @@
 /**
  * Stay Periods tooltip initialisation for the Admin Orders list.
- * Reads structured JSON from data-stay-tip on each .stay-period-tip icon,
+ * Reads structured JSON from data-stay-tip on each .qlo-stay-period-tip icon,
  * clones the hidden #stay-period-tpl template, fills it, and returns it
  * as the jQuery UI tooltip content.
  */
@@ -8,26 +8,26 @@ $(document).ready(function () {
     var closeTimer = null;
 
     function buildTooltip(periods) {
-        var $tpl  = $('#stay-period-tpl .tooltip_cont').clone();
-        var $body = $tpl.find('.tip-body').empty();
+        var $tpl  = $('#stay-period-tpl .qlo-tooltip-cont').clone();
+        var $body = $tpl.find('.qlo-tip-body').empty();
 
         $body.append(
-            $('<div class="stay_period stay_period_header">').append(
-                $('<span class="tip_element_head">').text($('#stay-period-tpl').data('label-dates')),
-                $('<span class="tip_element_value">').text($('#stay-period-tpl').data('label-rooms'))
+            $('<div class="qlo-stay-period qlo-stay-period-header">').append(
+                $('<span class="qlo-tip-element-head">').text($('#stay-period-tpl').data('label-dates')),
+                $('<span class="qlo-tip-element-value">').text($('#stay-period-tpl').data('label-rooms'))
             )
         );
 
         $.each(periods, function (_, p) {
             $body.append(
-                $('<div class="stay_period">').append(
-                    $('<span class="tip_element_head">').text(p.from + ' – ' + p.to),
-                    $('<span class="tip_element_value">').text(p.count)
+                $('<div class="qlo-stay-period">').append(
+                    $('<span class="qlo-tip-element-head">').text(p.from + ' – ' + p.to),
+                    $('<span class="qlo-tip-element-value">').text(p.count)
                 )
             );
         });
         return $('<div>', {
-            'class': 'ui-tooltip ui-widget ui-corner-all ui-widget-content stay-period-tooltip',
+            'class': 'ui-tooltip ui-widget ui-corner-all ui-widget-content qlo-stay-period-tooltip',
             'role' : 'tooltip'
         }).append(
             $('<div class="ui-tooltip-content">').append($tpl)
@@ -46,13 +46,13 @@ $(document).ready(function () {
         }, 300);
     }
 
-    $(document).on('mouseenter', '.stay-period-tip', function () {
+    $(document).on('mouseenter', '.qlo-stay-period-tip', function () {
         cancelClose();
 
         var periods = $(this).data('stay-tip');
         if (!periods || !periods.length) { return; }
 
-        $('.stay-period-tooltip').stop(true).remove();
+        $('.qlo-stay-period-tooltip').stop(true).remove();
 
         var $icon = $(this);
         var $tip  = buildTooltip(periods).appendTo('body').hide().fadeIn(200);
@@ -71,8 +71,8 @@ $(document).ready(function () {
             scheduleClose($tip);
         });
 
-    }).on('mouseleave', '.stay-period-tip', function () {
-        var $tip = $('.stay-period-tooltip');
+    }).on('mouseleave', '.qlo-stay-period-tip', function () {
+        var $tip = $('.qlo-stay-period-tooltip');
         if ($tip.length) {
             scheduleClose($tip);
         }

From 8f73503ade6a2472c9e23d4c6a1591ed3b7f416a Mon Sep 17 00:00:00 2001
From: aradhana kumari <aradhana.kumari639@webkul.in>
Date: Fri, 19 Jun 2026 13:17:06 +0530
Subject: [PATCH 07/35] Remove extra line

Co-authored-by: Name <sumit201@webkul.in>
---
 .../template/controllers/orders/_stay_periods_tooltip.tpl       | 1 -
 controllers/admin/AdminOrdersController.php                     | 2 --
 2 files changed, 3 deletions(-)

diff --git a/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl b/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl
index a8b7b2b1a..67e2909b5 100644
--- a/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl
+++ b/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl
@@ -20,7 +20,6 @@
 * @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
 *}
 
-
 <div id="stay-period-tpl"
      style="display:none;"
      data-label-dates="{l s='Dates'}"
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index bce38c46e..ca0329e7a 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -393,7 +393,6 @@ class AdminOrdersControllerCore extends AdminController
         }
 
         $output = implode('<br>', $datesDisplay);
-
         $totalRooms = array_sum(array_column($formatted, 'count'));
 
         if ($totalRooms > 1) {
@@ -401,7 +400,6 @@ class AdminOrdersControllerCore extends AdminController
                 .htmlspecialchars(json_encode($formatted)).'">+'
                 .($totalRooms - 1).'</span>';
         }
-
         return $output;
     }
 

From 89efc194ea69a8a7cf18311205169e2cdeaed015 Mon Sep 17 00:00:00 2001
From: aradhana kumari <aradhana.kumari639@webkul.in>
Date: Tue, 7 Jul 2026 18:59:21 +0530
Subject: [PATCH 08/35] Add the unique stay period in the list

Co-authored-by: Name <sumit201@webkul.in>
---
 admin/themes/default/css/controllers/orders.css | 4 ++--
 controllers/admin/AdminOrdersController.php     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/admin/themes/default/css/controllers/orders.css b/admin/themes/default/css/controllers/orders.css
index 5f7115d51..b2a394443 100644
--- a/admin/themes/default/css/controllers/orders.css
+++ b/admin/themes/default/css/controllers/orders.css
@@ -58,8 +58,8 @@
     background: #666;
     color: #fff;
     border-radius: 50%;
-    min-width: 24px;
-    height: 24px;
+    width: 18px;
+    height: 18px;
     font-size: 11px;
     font-weight: bold;
     padding: 0 4px;
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index ca0329e7a..56d0a89f8 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -393,12 +393,12 @@ class AdminOrdersControllerCore extends AdminController
         }
 
         $output = implode('<br>', $datesDisplay);
-        $totalRooms = array_sum(array_column($formatted, 'count'));
+        $uniqueStayPeriods = count($formatted);
 
-        if ($totalRooms > 1) {
+        if ($uniqueStayPeriods > 1) {
             $output .= ' <span class="qlo-stay-period-badge qlo-stay-period-tip" data-stay-tip="'
                 .htmlspecialchars(json_encode($formatted)).'">+'
-                .($totalRooms - 1).'</span>';
+                .($uniqueStayPeriods - 1).'</span>';
         }
         return $output;
     }

From dc86fca756c02d85c5213a757b5688d9828ea1a3 Mon Sep 17 00:00:00 2001
From: aradhana kumari <aradhana.kumari639@webkul.in>
Date: Tue, 7 Jul 2026 19:16:13 +0530
Subject: [PATCH 09/35] Update the license of js file

Co-authored-by: Name <sumit201@webkul.in>
---
 js/admin/orders_stay_periods.js | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/js/admin/orders_stay_periods.js b/js/admin/orders_stay_periods.js
index 95fa915f8..88eef2c9c 100644
--- a/js/admin/orders_stay_periods.js
+++ b/js/admin/orders_stay_periods.js
@@ -1,9 +1,25 @@
-/**
- * Stay Periods tooltip initialisation for the Admin Orders list.
- * Reads structured JSON from data-stay-tip on each .qlo-stay-period-tip icon,
- * clones the hidden #stay-period-tpl template, fills it, and returns it
- * as the jQuery UI tooltip content.
- */
+/*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License version 3.0
+* that is bundled with this package in the file LICENSE.md
+* It is also available through the world-wide-web at this URL:
+* https://opensource.org/license/osl-3-0-php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to support@qloapps.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade this module to a newer
+* versions in the future. If you wish to customize this module for your needs
+* please refer to https://store.webkul.com/customisation-guidelines for more information.
+*
+* @author Webkul IN
+* @copyright Since 2010 Webkul
+* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+*/
+
 $(document).ready(function () {
     var closeTimer = null;
 

From 1811788a2546777d6b77cc8cdcd761ed3b2b5156 Mon Sep 17 00:00:00 2001
From: aradhana kumari <aradhana.kumari639@webkul.in>
Date: Fri, 10 Jul 2026 13:21:23 +0530
Subject: [PATCH 10/35] Update the var name

---
 .../themes/default/css/controllers/orders.css | 16 ++++-----
 .../orders/_stay_periods_tooltip.tpl          | 10 +++---
 controllers/admin/AdminOrdersController.php   | 33 ++++++++++---------
 js/admin/orders_stay_periods.js               | 22 ++++++-------
 4 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/admin/themes/default/css/controllers/orders.css b/admin/themes/default/css/controllers/orders.css
index b2a394443..d29932ff3 100644
--- a/admin/themes/default/css/controllers/orders.css
+++ b/admin/themes/default/css/controllers/orders.css
@@ -22,15 +22,13 @@
 
 .qlo-stay-period-tooltip {
     border: none;
-    box-shadow: 0 0 5px #aaa;
-    -webkit-box-shadow: 0 0 5px #aaa;
     padding-bottom: 10px;
     min-width: 260px;
 }
-.qlo-stay-period-tooltip .qlo-tip-date {
+.qlo-stay-period-tooltip .qlo-stay-period-date {
     font-weight: bold;
 }
-.qlo-stay-period-tooltip .qlo-tip-body {
+.qlo-stay-period-tooltip .qlo-stay-period-body {
     display: table;
     width: 100%;
     margin-top: 6px;
@@ -38,16 +36,16 @@
 .qlo-stay-period-tooltip .qlo-stay-period {
     display: table-row;
 }
-.qlo-stay-period-tooltip .qlo-tip-element-head,
-.qlo-stay-period-tooltip .qlo-tip-element-value {
+.qlo-stay-period-tooltip .qlo-stay-period-element-head,
+.qlo-stay-period-tooltip .qlo-stay-period-element-value {
     display: table-cell;
     padding: 3px 6px;
 }
-.qlo-stay-period-tooltip .qlo-tip-element-value {
+.qlo-stay-period-tooltip .qlo-stay-period-element-value {
     text-align: right;
 }
-.qlo-stay-period-tooltip .qlo-stay-period-header .qlo-tip-element-head,
-.qlo-stay-period-tooltip .qlo-stay-period-header .qlo-tip-element-value {
+.qlo-stay-period-tooltip .qlo-stay-period-header .qlo-stay-period-element-head,
+.qlo-stay-period-tooltip .qlo-stay-period-header .qlo-stay-period-element-value {
     border-bottom: 1px solid #ddd;
     padding-bottom: 5px;
 }
diff --git a/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl b/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl
index 67e2909b5..71f72d64d 100644
--- a/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl
+++ b/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl
@@ -20,14 +20,14 @@
 * @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
 *}
 
-<div id="stay-period-tpl"
+<div id="qlo-stay-period-tooltip"
      style="display:none;"
      data-label-dates="{l s='Dates'}"
      data-label-rooms="{l s='Rooms'}">
-    <div class="qlo-tooltip-cont">
-        <div class="qlo-tip-header">
-            <div class="qlo-tip-date">{l s='Stay Periods'}</div>
+    <div class="qlo-stay-period-cont">
+        <div class="qlo-stay-period-header">
+            <div class="qlo-stay-period-date">{l s='Stay Periods'}</div>
         </div>
-        <div class="qlo-tip-body"></div>
+        <div class="qlo-stay-period-body"></div>
     </div>
 </div>
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 56d0a89f8..f80b79fe1 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -374,33 +374,34 @@ class AdminOrdersControllerCore extends AdminController
         if (empty($value)) {
             return '--';
         }
-        $formatted = array();
-        foreach (explode('::', $value) as $chunk) {
-            $countParts = explode('~', $chunk);
-            $dateParts  = explode('|', $countParts[0]);
-            if (count($dateParts) === 2) {
-                $formatted[] = array(
-                    'from'  => Tools::displayDate(trim($dateParts[0])),
-                    'to'    => Tools::displayDate(trim($dateParts[1])),
-                    'count' => isset($countParts[1]) ? (int)$countParts[1] : 1,
+
+        $stayPeriods = array();
+        foreach (explode('::', $value) as $stays) {
+            $countStays = explode('~', $stays);
+            $stayDates  = explode('|', $countStays[0]);
+            if (count($stayDates) === 2) {
+                $stayPeriods[] = array(
+                    'from'  => Tools::displayDate(trim($stayDates[0])),
+                    'to'    => Tools::displayDate(trim($stayDates[1])),
+                    'count' => isset($countStays[1]) ? (int)$countStays[1] : 1,
                 );
             }
         }
 
         $datesDisplay = array();
-        foreach (array_slice($formatted, 0, 1) as $entry) {
-            $datesDisplay[] = $entry['from'].' - '.$entry['to'];
+        foreach (array_slice($stayPeriods, 0, 1) as $stayPeriod) {
+            $datesDisplay[] = $stayPeriod['from'].' - '.$stayPeriod['to'];
         }
 
-        $output = implode('<br>', $datesDisplay);
-        $uniqueStayPeriods = count($formatted);
+        $stayPeriodHtml = implode('<br>', $datesDisplay);
+        $uniqueStayPeriods = count($stayPeriods);
 
         if ($uniqueStayPeriods > 1) {
-            $output .= ' <span class="qlo-stay-period-badge qlo-stay-period-tip" data-stay-tip="'
-                .htmlspecialchars(json_encode($formatted)).'">+'
+            $stayPeriodHtml .= ' <span class="qlo-stay-period-badge qlo-stay-period-tip" data-stay-tip="'
+                .htmlspecialchars(json_encode($stayPeriods)).'">+'
                 .($uniqueStayPeriods - 1).'</span>';
         }
-        return $output;
+        return $stayPeriodHtml;
     }
 
     public function initPageHeaderToolbar()
diff --git a/js/admin/orders_stay_periods.js b/js/admin/orders_stay_periods.js
index 88eef2c9c..4a557dea8 100644
--- a/js/admin/orders_stay_periods.js
+++ b/js/admin/orders_stay_periods.js
@@ -23,22 +23,22 @@
 $(document).ready(function () {
     var closeTimer = null;
 
-    function buildTooltip(periods) {
-        var $tpl  = $('#stay-period-tpl .qlo-tooltip-cont').clone();
-        var $body = $tpl.find('.qlo-tip-body').empty();
+    function stayPeriodTooltip(periods) {
+        var $stayPeriodCont = $('#qlo-stay-period-tooltip .qlo-stay-period-cont').clone();
+        var $stayPeriodBody = $stayPeriodCont.find('.qlo-stay-period-body').empty();
 
-        $body.append(
+        $stayPeriodBody.append(
             $('<div class="qlo-stay-period qlo-stay-period-header">').append(
-                $('<span class="qlo-tip-element-head">').text($('#stay-period-tpl').data('label-dates')),
-                $('<span class="qlo-tip-element-value">').text($('#stay-period-tpl').data('label-rooms'))
+                $('<span class="qlo-stay-period-element-head">').text($('#qlo-stay-period-tooltip').data('label-dates')),
+                $('<span class="qlo-stay-period-element-value">').text($('#qlo-stay-period-tooltip').data('label-rooms'))
             )
         );
 
         $.each(periods, function (_, p) {
-            $body.append(
+            $stayPeriodBody.append(
                 $('<div class="qlo-stay-period">').append(
-                    $('<span class="qlo-tip-element-head">').text(p.from + ' – ' + p.to),
-                    $('<span class="qlo-tip-element-value">').text(p.count)
+                    $('<span class="qlo-stay-period-element-head">').text(p.from + ' – ' + p.to),
+                    $('<span class="qlo-stay-period-element-value">').text(p.count)
                 )
             );
         });
@@ -46,7 +46,7 @@ $(document).ready(function () {
             'class': 'ui-tooltip ui-widget ui-corner-all ui-widget-content qlo-stay-period-tooltip',
             'role' : 'tooltip'
         }).append(
-            $('<div class="ui-tooltip-content">').append($tpl)
+            $('<div class="ui-tooltip-content">').append($stayPeriodCont)
         );
     }
 
@@ -71,7 +71,7 @@ $(document).ready(function () {
         $('.qlo-stay-period-tooltip').stop(true).remove();
 
         var $icon = $(this);
-        var $tip  = buildTooltip(periods).appendTo('body').hide().fadeIn(200);
+        var $tip  = stayPeriodTooltip(periods).appendTo('body').hide().fadeIn(200);
 
         var iconOffset = $icon.offset();
         $tip.css({

From f03e9ec75e784c45c7c5cc8a2347febfd220c1ed Mon Sep 17 00:00:00 2001
From: aradhana kumari <aradhana.kumari639@webkul.in>
Date: Thu, 16 Jul 2026 11:07:26 +0530
Subject: [PATCH 11/35] Update the text

---
 .../css/controllers/{orders.css => order-stay-periods.css}  | 6 +++---
 controllers/admin/AdminOrdersController.php                 | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename admin/themes/default/css/controllers/{orders.css => order-stay-periods.css} (97%)

diff --git a/admin/themes/default/css/controllers/orders.css b/admin/themes/default/css/controllers/order-stay-periods.css
similarity index 97%
rename from admin/themes/default/css/controllers/orders.css
rename to admin/themes/default/css/controllers/order-stay-periods.css
index d29932ff3..cc599c24b 100644
--- a/admin/themes/default/css/controllers/orders.css
+++ b/admin/themes/default/css/controllers/order-stay-periods.css
@@ -56,9 +56,9 @@
     background: #666;
     color: #fff;
     border-radius: 50%;
-    width: 18px;
-    height: 18px;
-    font-size: 11px;
+    width: 21px;
+    height: 21px;
+    font-size: 10px;
     font-weight: bold;
     padding: 0 4px;
     cursor: pointer;
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index f80b79fe1..8772a0a23 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -1396,7 +1396,7 @@ class AdminOrdersControllerCore extends AdminController
 
         if ($this->display != 'view') {
             $this->addJS(_PS_JS_DIR_.'admin/orders_stay_periods.js');
-            $this->addCSS(__PS_BASE_URI__.$this->admin_webpath.'/themes/'.$this->bo_theme.'/css/controllers/orders.css');
+            $this->addCSS(__PS_BASE_URI__.$this->admin_webpath.'/themes/'.$this->bo_theme.'/css/controllers/order-stay-periods.css');
         }
 
         if ($this->display == 'view') {

From 153ec1c8567798bd99155098ecc0a340e38f25bf Mon Sep 17 00:00:00 2001
From: varun kewlani <varun.kewlani322@webkul.in>
Date: Mon, 20 Jul 2026 19:41:39 +0530
Subject: [PATCH 12/35] Fixed: QloApps (XSS + Arbitrary File Upload RCE) issue

Co-authored-by: Name <sumit201@webkul.in>
---
 .../template/helpers/list/list_header.tpl      | 10 +++++-----
 controllers/admin/AdminOrdersController.php    |  9 +++++----
 .../classes/HotelBookingDocument.php           | 18 ++++++++++++------
 .../admin/AdminBookingDocumentController.php   |  6 +++++-
 4 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/admin/themes/default/template/helpers/list/list_header.tpl b/admin/themes/default/template/helpers/list/list_header.tpl
index 77922dae1..13983743f 100644
--- a/admin/themes/default/template/helpers/list/list_header.tpl
+++ b/admin/themes/default/template/helpers/list/list_header.tpl
@@ -300,8 +300,8 @@
 															{if $params.type == 'range'}
 																{$field_name="`$list_id`Filter_{if isset($params.filter_key)}`$params.filter_key`{else}`$key`{/if}"}
 																<div class="input_range">
-																	<input type="text" class="filter form-control" name="{$field_name}[0]" placeholder="{l s='From'}" value="{if isset($smarty.post[$field_name][0]) && $smarty.post[$field_name][0]}{$smarty.post[$field_name][0]}{elseif isset($params.value.0)}{$params.value.0}{/if}">
-																	<input type="text" class="filter form-control" name="{$field_name}[1]" placeholder="{l s='To'}" value="{if isset($smarty.post[$field_name][1]) && $smarty.post[$field_name][1]}{$smarty.post[$field_name][1]}{elseif isset($params.value.1)}{$params.value.1}{/if}">
+																	<input type="text" class="filter form-control" name="{$field_name}[0]" placeholder="{l s='From'}" value="{if isset($smarty.post[$field_name][0]) && $smarty.post[$field_name][0]}{$smarty.post[$field_name][0]|escape:'html':'UTF-8'}{elseif isset($params.value.0)}{$params.value.0}{/if}">
+																	<input type="text" class="filter form-control" name="{$field_name}[1]" placeholder="{l s='To'}" value="{if isset($smarty.post[$field_name][1]) && $smarty.post[$field_name][1]}{$smarty.post[$field_name][1]|escape:'html':'UTF-8'}{elseif isset($params.value.1)}{$params.value.1}{/if}">
 																</div>
 															{elseif $params.type == 'bool'}
 																{$field_name="`$list_id`Filter_{if isset($params.filter_key)}`$params.filter_key`{else}`$key`{/if}"}
@@ -314,14 +314,14 @@
 																<div class="date_range">
 																	<div class="input-group center">
 																		<input type="text" class="filter datepicker date-input form-control" id="local_{$params.id_date}_0" name="local_{$params.name_date}[0]"  placeholder="{l s='From'}" autocomplete="off"/>
-																		<input type="hidden" id="{$params.id_date}_0" name="{$params.name_date}[0]" value="{if isset($smarty.post[$params.name_date][0]) && $smarty.post[$params.name_date][0]}{$smarty.post[$params.name_date][0]}{elseif isset($params.value.0)}{$params.value.0}{/if}">
+																		<input type="hidden" id="{$params.id_date}_0" name="{$params.name_date}[0]" value="{if isset($smarty.post[$params.name_date][0]) && $smarty.post[$params.name_date][0]}{$smarty.post[$params.name_date][0]|escape:'html':'UTF-8'}{elseif isset($params.value.0)}{$params.value.0}{/if}">
 																		<span class="input-group-addon">
 																			<i class="icon-calendar"></i>
 																		</span>
 																	</div>
 																	<div class="input-group center">
 																		<input type="text" class="filter datepicker date-input form-control" id="local_{$params.id_date}_1" name="local_{$params.name_date}[1]"  placeholder="{l s='To'}"  autocomplete="off"/>
-																		<input type="hidden" id="{$params.id_date}_1" name="{$params.name_date}[1]" value="{if isset($smarty.post[$params.name_date][1]) && $smarty.post[$params.name_date][1]}{$smarty.post[$params.name_date][1]}{elseif isset($params.value.1)}{$params.value.1}{/if}">
+																		<input type="hidden" id="{$params.id_date}_1" name="{$params.name_date}[1]" value="{if isset($smarty.post[$params.name_date][1]) && $smarty.post[$params.name_date][1]}{$smarty.post[$params.name_date][1]|escape:'html':'UTF-8'}{elseif isset($params.value.1)}{$params.value.1}{/if}">
 																		<span class="input-group-addon">
 																			<i class="icon-calendar"></i>
 																		</span>
@@ -398,7 +398,7 @@
 																{/if}
 															{else}
 																{$field_name="`$list_id`Filter_{if isset($params.filter_key)}`$params.filter_key`{else}`$key`{/if}"}
-																<input type="text" id="filter_input_{$key}" class="filter" name="{$field_name}" value="{if isset($smarty.post.$field_name) && $smarty.post.$field_name}{$smarty.post.$field_name}{else}{$params.value|escape:'html':'UTF-8'}{/if}" {if isset($params.width) && $params.width != 'auto'} style="width:{$params.width}px"{/if} />
+																<input type="text" id="filter_input_{$key}" class="filter" name="{$field_name}" value="{if isset($smarty.post.$field_name) && $smarty.post.$field_name}{$smarty.post.$field_name|escape:'html':'UTF-8'}{else}{$params.value|escape:'html':'UTF-8'}{/if}" {if isset($params.width) && $params.width != 'auto'} style="width:{$params.width}px"{/if} />
 															{/if}
 														</div>
 													</div>
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index bcbe5868c..2bcca5a6d 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -3939,10 +3939,11 @@ class AdminOrdersControllerCore extends AdminController
                 $this->errors[] = $this->l('Please select a file to upload.');
             } elseif ($objHotelBookingDocument->fileInfo['size'] > Tools::getMaxUploadSize()) {
                 $this->errors[] = $this->l('Uploaded file size is too large.');
-            } elseif(!(ImageManager::isRealImage($objHotelBookingDocument->fileInfo['tmp_name'])
-                || $objHotelBookingDocument->fileInfo['mime'] == 'application/pdf')
-            ) {
-                $this->errors[] = $this->l('Please upload an image or a PDF file only. Allowed image formats: .gif, .jpg, .jpeg and .png');
+            } else {
+                $objHotelBookingDocument->setFileType();
+                if (!$objHotelBookingDocument->file_type) {
+                    $this->errors[] = $this->l('Please upload an image or a PDF file only. Allowed image formats: .gif, .jpg, .jpeg and .png');
+                }
             }
         } else {
             $this->errors[] = Tools::displayError('You do not have permission to edit this order.');
diff --git a/modules/hotelreservationsystem/classes/HotelBookingDocument.php b/modules/hotelreservationsystem/classes/HotelBookingDocument.php
index 6c223106f..3683d9884 100644
--- a/modules/hotelreservationsystem/classes/HotelBookingDocument.php
+++ b/modules/hotelreservationsystem/classes/HotelBookingDocument.php
@@ -133,16 +133,14 @@ class HotelBookingDocument extends ObjectModel
 
     public function getDestinationFilePath()
     {
-        $fileExtension = pathinfo($this->fileInfo['rename'], PATHINFO_EXTENSION);
-
-        return $this->documentFolder.$this->id.'.'.$fileExtension;
+        return $this->documentFolder.$this->id.'.'.$this->getFileExtension();
     }
 
     public function setFileType()
     {
         if (ImageManager::isRealImage($this->fileInfo['tmp_name'])) {
             $this->file_type = self::FILE_TYPE_IMAGE;
-        } elseif ($this->fileInfo['mime'] == 'application/pdf') {
+        } elseif (substr((string) @file_get_contents($this->fileInfo['tmp_name'], false, null, 0, 5), 0, 5) === '%PDF-') {
             $this->file_type = self::FILE_TYPE_PDF;
         } else {
             $this->file_type = 0;
@@ -151,8 +149,16 @@ class HotelBookingDocument extends ObjectModel
 
     public function setFileName()
     {
-        $fileExtension = pathinfo($this->fileInfo['rename'], PATHINFO_EXTENSION);
-        $this->file_name = $this->id.'.'.$fileExtension;
+        $this->file_name = $this->id.'.'.$this->getFileExtension();
+    }
+
+    /**
+     * Extension is derived from the validated file_type, never from the
+     * uploaded filename/mime header (both are attacker-controlled).
+     */
+    public function getFileExtension()
+    {
+        return $this->file_type == self::FILE_TYPE_PDF ? 'pdf' : 'jpg';
     }
 
     public function getContentType()
diff --git a/modules/hotelreservationsystem/controllers/admin/AdminBookingDocumentController.php b/modules/hotelreservationsystem/controllers/admin/AdminBookingDocumentController.php
index c3d92c748..b161a2a27 100644
--- a/modules/hotelreservationsystem/controllers/admin/AdminBookingDocumentController.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminBookingDocumentController.php
@@ -34,7 +34,11 @@ class AdminBookingDocumentController extends ModuleAdminController
             $contentLength = $objHotelBookingDocument->getContentLength();
             $filePath = $objHotelBookingDocument->getPhysicalPath();
             $downloadFileName = $objHotelBookingDocument->getDownloadFileName();
-            $contentDisposition = Tools::getValue('is_preview') ? 'inline' : 'attachment';
+            // Only images are safe to render inline; PDFs can carry embedded JavaScript
+            // that executes when opened inline, so they always force a download instead.
+            $contentDisposition = (Tools::getValue('is_preview')
+                && $objHotelBookingDocument->file_type == HotelBookingDocument::FILE_TYPE_IMAGE)
+                ? 'inline' : 'attachment';
 
             if (Tools::file_exists_cache($filePath)) {
                 if (ob_get_level() && ob_get_length() > 0) {

From 364b1d8e49a24d1fc768b37c8f6ed93dbae51299 Mon Sep 17 00:00:00 2001
From: azhar bhat <azharbhat.qlo098@webkul.in>
Date: Tue, 21 Jul 2026 17:14:21 +0530
Subject: [PATCH 13/35] Fixed: language install failing when no remote pack
 exists for the ISO code

Co-authored-by: Name <sumit201@webkul.in>
---
 classes/Language.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/classes/Language.php b/classes/Language.php
index 0963279bb..8fd883914 100644
--- a/classes/Language.php
+++ b/classes/Language.php
@@ -935,6 +935,9 @@ class LanguageCore extends ObjectModel
 
         if (!file_exists($file)) {
             $errors[] = Tools::displayError('No language pack is available for your version.');
+            if ($install && Language::checkAndAddLanguage((string)$iso, false, true, $params)) {
+                $errors = [];
+            }
         } elseif ($install) {
             require_once(_PS_TOOL_DIR_.'tar/Tar.php');
             $gz = new Archive_Tar($file, true);

From d85191d796b1b38ddc658201c5a6c640e6617d9d Mon Sep 17 00:00:00 2001
From: varun kewlani <varun.kewlani322@webkul.in>
Date: Thu, 23 Jul 2026 20:00:59 +0530
Subject: [PATCH 14/35] Fixed: Partial and full payment issue in paypal module

Co-authored-by: Name <sumit201@webkul.in>
---
 controllers/front/ParentOrderController.php   |  2 +-
 .../classes/WkPaypalCommerceWebhook.php       | 18 +++++----------
 .../controllers/front/payment.php             | 23 ++++++++++---------
 3 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/controllers/front/ParentOrderController.php b/controllers/front/ParentOrderController.php
index a519c3305..0316ba6d4 100644
--- a/controllers/front/ParentOrderController.php
+++ b/controllers/front/ParentOrderController.php
@@ -353,7 +353,7 @@ class ParentOrderControllerCore extends FrontController
             // For Advanced Payment work
             $objAdvPayment = new HotelAdvancedPayment();
             if ($objAdvPayment->isAdvancePaymentAvailableForCurrentCart()) {
-                if (Tools::isSubmit('submitAdvPayment')) {
+                if (Tools::isSubmit('submitAdvPayment') && !$this->context->cart->orderExists()) {
                     if (Tools::getValue('payment_type') == Order::ORDER_PAYMENT_TYPE_ADVANCE) {
                         $this->context->cart->is_advance_payment = 1;
                     } else {
diff --git a/modules/qlopaypalcommerce/classes/WkPaypalCommerceWebhook.php b/modules/qlopaypalcommerce/classes/WkPaypalCommerceWebhook.php
index 4a6833f40..40fbe9878 100644
--- a/modules/qlopaypalcommerce/classes/WkPaypalCommerceWebhook.php
+++ b/modules/qlopaypalcommerce/classes/WkPaypalCommerceWebhook.php
@@ -96,14 +96,11 @@ class WkPaypalCommerceWebhook
                     // if order completed then change the status of the order
                     if ($eventData['event_type'] == 'CHECKOUT.ORDER.COMPLETED') {
                         $cartID = $transactionData['id_cart'];
-                        $objCart = new Cart($cartID);
-                        if ($objCart->is_advance_payment) {
-                            $orderStatus = Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED');
-                        } else {
-                            $orderStatus = Configuration::get('PS_OS_PAYMENT_ACCEPTED');
-                        }
                         if ($orders = WkPaypalCommerceHelper::getOrdersByCartId($cartID)) {
                             foreach ($orders as $order) {
+                                $orderStatus = $order['is_advance_payment']
+                                    ? Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED')
+                                    : Configuration::get('PS_OS_PAYMENT_ACCEPTED');
                                 $this->updatePaymentStatus(
                                     (int)$orderStatus,
                                     $order['id_order']
@@ -126,14 +123,11 @@ class WkPaypalCommerceWebhook
             $transaction_id
         )) {
             $cartID = $transactionData['id_cart'];
-            $objCart = new Cart($cartID);
-            if ($objCart->is_advance_payment) {
-                $orderStatus = Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED');
-            } else {
-                $orderStatus = Configuration::get('PS_OS_PAYMENT_ACCEPTED');
-            }
             if ($orders = WkPaypalCommerceHelper::getOrdersByCartId($cartID)) {
                 foreach ($orders as $order) {
+                    $orderStatus = $order['is_advance_payment']
+                        ? Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED')
+                        : Configuration::get('PS_OS_PAYMENT_ACCEPTED');
                     $this->updatePaymentStatus(
                         (int)$orderStatus,
                         $order['id_order']
diff --git a/modules/qlopaypalcommerce/controllers/front/payment.php b/modules/qlopaypalcommerce/controllers/front/payment.php
index 3795a5e75..8327fd779 100644
--- a/modules/qlopaypalcommerce/controllers/front/payment.php
+++ b/modules/qlopaypalcommerce/controllers/front/payment.php
@@ -126,20 +126,21 @@ class QloPaypalCommercePaymentModuleFrontController extends ModuleFrontControlle
                             $transaction_id = $this->saveOrderData($returnData);
                             if ($paypalOrderID) {
                                 $currency = $this->context->currency;
-                                $total = (float)$cart->getOrderTotal(true, Cart::BOTH);
-                                if ($cart->is_advance_payment) {
-                                    $total = (float)$cart->getOrderTotal(true, Cart::ADVANCE_PAYMENT);
-                                } else {
-                                    $total = (float)$cart->getOrderTotal(true, Cart::BOTH);
-                                }
+                                // Order status/amount must reflect what PayPal actually captured,
+                                // not the cart's is_advance_payment flag (still editable by the
+                                // customer after payment, so it cannot be trusted here).
+                                $capturedAmount = (float) (
+                                    $returnData['data']['purchase_units'][0]['payments']['captures'][0]['amount']['value'] ?? 0
+                                );
+                                $fullTotal = (float) $cart->getOrderTotal(true, Cart::BOTH);
+                                $isFullyPaid = round($capturedAmount, 2) >= round($fullTotal, 2);
+                                $total = $isFullyPaid ? $fullTotal : $capturedAmount;
 
                                 // set order status
                                 if ($returnData['data']['status'] == 'COMPLETED') {
-                                    if ($cart->is_advance_payment) {
-                                        $orderStatus = Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED');
-                                    } else {
-                                        $orderStatus = Configuration::get('PS_OS_PAYMENT_ACCEPTED');
-                                    }
+                                    $orderStatus = $isFullyPaid
+                                        ? Configuration::get('PS_OS_PAYMENT_ACCEPTED')
+                                        : Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED');
                                 } else {
                                     $orderStatus = Configuration::get('PS_OS_AWAITING_PAYMENT');
                                 }

From 1273d72657541883b16786c7813abb9ed8b71de3 Mon Sep 17 00:00:00 2001
From: varun kewlani <varun.kewlani322@webkul.in>
Date: Thu, 23 Jul 2026 20:06:09 +0530
Subject: [PATCH 15/35] Fixed: removed hardcoded rounding off

Co-authored-by: Name <sumit201@webkul.in>
---
 modules/qlopaypalcommerce/controllers/front/payment.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/qlopaypalcommerce/controllers/front/payment.php b/modules/qlopaypalcommerce/controllers/front/payment.php
index 8327fd779..cfbc48263 100644
--- a/modules/qlopaypalcommerce/controllers/front/payment.php
+++ b/modules/qlopaypalcommerce/controllers/front/payment.php
@@ -133,7 +133,8 @@ class QloPaypalCommercePaymentModuleFrontController extends ModuleFrontControlle
                                     $returnData['data']['purchase_units'][0]['payments']['captures'][0]['amount']['value'] ?? 0
                                 );
                                 $fullTotal = (float) $cart->getOrderTotal(true, Cart::BOTH);
-                                $isFullyPaid = round($capturedAmount, 2) >= round($fullTotal, 2);
+                                $isFullyPaid = Tools::ps_round($capturedAmount, _PS_PRICE_COMPUTE_PRECISION_)
+                                    >= Tools::ps_round($fullTotal, _PS_PRICE_COMPUTE_PRECISION_);
                                 $total = $isFullyPaid ? $fullTotal : $capturedAmount;
 
                                 // set order status

From 4cfe970dac4d8fe077e14d70fd00471bbf526e07 Mon Sep 17 00:00:00 2001
From: aradhana kumari <aradhana.kumari639@webkul.in>
Date: Fri, 24 Jul 2026 16:35:32 +0530
Subject: [PATCH 16/35] Rework stay-period tooltip to reuse core tooltip
 pattern

Remove the hand-rolled clone/mouseenter tooltip skeleton and switch to
jQuery UI's tooltip() widget with the shared core tooltip classes, same
pattern already used by connected-rooms.tpl.
---
 .../orders/_stay_periods_tooltip.tpl          |  33 -----
 controllers/admin/AdminOrdersController.php   |   9 +-
 js/admin/orders_stay_periods.js               | 119 +++++++-----------
 3 files changed, 53 insertions(+), 108 deletions(-)
 delete mode 100644 admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl

diff --git a/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl b/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl
deleted file mode 100644
index 71f72d64d..000000000
--- a/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-{*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License version 3.0
-* that is bundled with this package in the file LICENSE.md
-* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to support@qloapps.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade this module to a newer
-* versions in the future. If you wish to customize this module for your needs
-* please refer to https://store.webkul.com/customisation-guidelines for more information.
-*
-* @author Webkul IN
-* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
-*}
-
-<div id="qlo-stay-period-tooltip"
-     style="display:none;"
-     data-label-dates="{l s='Dates'}"
-     data-label-rooms="{l s='Rooms'}">
-    <div class="qlo-stay-period-cont">
-        <div class="qlo-stay-period-header">
-            <div class="qlo-stay-period-date">{l s='Stay Periods'}</div>
-        </div>
-        <div class="qlo-stay-period-body"></div>
-    </div>
-</div>
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 3f26e8782..64c32281f 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -397,8 +397,11 @@ class AdminOrdersControllerCore extends AdminController
         $uniqueStayPeriods = count($stayPeriods);
 
         if ($uniqueStayPeriods > 1) {
-            $stayPeriodHtml .= ' <span class="qlo-stay-period-badge qlo-stay-period-tip" data-stay-tip="'
-                .htmlspecialchars(json_encode($stayPeriods)).'">+'
+            $stayPeriodHtml .= ' <span class="badge qlo-stay-period-badge"'
+                .' data-stay-tip="'.htmlspecialchars(json_encode($stayPeriods)).'"'
+                .' data-label-title="'.htmlspecialchars($this->l('Stay Periods')).'"'
+                .' data-label-duration="'.htmlspecialchars($this->l('Duration')).'"'
+                .' data-label-rooms="'.htmlspecialchars($this->l('Rooms')).'">+'
                 .($uniqueStayPeriods - 1).'</span>';
         }
         return $stayPeriodHtml;
@@ -1513,8 +1516,6 @@ class AdminOrdersControllerCore extends AdminController
 
         $this->_new_list_header_design = true;
 
-        $this->content .= $this->context->smarty->fetch('controllers/orders/_stay_periods_tooltip.tpl');
-
         return parent::renderList();
     }
 
diff --git a/js/admin/orders_stay_periods.js b/js/admin/orders_stay_periods.js
index 4a557dea8..f028b5096 100644
--- a/js/admin/orders_stay_periods.js
+++ b/js/admin/orders_stay_periods.js
@@ -21,76 +21,53 @@
 */
 
 $(document).ready(function () {
-    var closeTimer = null;
-
-    function stayPeriodTooltip(periods) {
-        var $stayPeriodCont = $('#qlo-stay-period-tooltip .qlo-stay-period-cont').clone();
-        var $stayPeriodBody = $stayPeriodCont.find('.qlo-stay-period-body').empty();
-
-        $stayPeriodBody.append(
-            $('<div class="qlo-stay-period qlo-stay-period-header">').append(
-                $('<span class="qlo-stay-period-element-head">').text($('#qlo-stay-period-tooltip').data('label-dates')),
-                $('<span class="qlo-stay-period-element-value">').text($('#qlo-stay-period-tooltip').data('label-rooms'))
-            )
-        );
-
-        $.each(periods, function (_, p) {
-            $stayPeriodBody.append(
-                $('<div class="qlo-stay-period">').append(
-                    $('<span class="qlo-stay-period-element-head">').text(p.from + ' – ' + p.to),
-                    $('<span class="qlo-stay-period-element-value">').text(p.count)
-                )
-            );
-        });
-        return $('<div>', {
-            'class': 'ui-tooltip ui-widget ui-corner-all ui-widget-content qlo-stay-period-tooltip',
-            'role' : 'tooltip'
-        }).append(
-            $('<div class="ui-tooltip-content">').append($stayPeriodCont)
-        );
+    if (typeof window.initStayPeriodTooltips === 'undefined') {
+        window.initStayPeriodTooltips = function () {
+            if (typeof $.fn.tooltip === 'undefined' || typeof $.ui === 'undefined' || typeof $.ui.tooltip === 'undefined') {
+                return;
+            }
+            $('.qlo-stay-period-badge').each(function () {
+                if ($(this).data('ui-tooltip')) {
+                    return;
+                }
+                $(this).tooltip({
+                    items: '.qlo-stay-period-badge',
+                    content: function () {
+                        var $badge = $(this);
+                        var periods = $badge.data('stay-tip');
+                        if (!periods || !periods.length) {
+                            return '';
+                        }
+                        var html = '<div class="tooltip_cont qlo-stay-period-tooltip">';
+                        html += '<div class="tip_header"><div class="tip_date">' + $badge.data('label-title') + '</div></div>';
+                        html += '<div class="tip-body">';
+                        html += '<div class="qlo-stay-period-row qlo-stay-period-row-header">'
+                            + '<span class="tip_element_head">' + $badge.data('label-duration') + '</span>'
+                            + '<span class="tip_element_head">' + $badge.data('label-rooms') + '</span>'
+                            + '</div>';
+                        $.each(periods, function (_, p) {
+                            html += '<div class="qlo-stay-period-row">'
+                                + '<span class="tip_element_value">' + p.from + ' – ' + p.to + '</span>'
+                                + '<span class="tip_element_value">' + p.count + '</span>'
+                                + '</div>';
+                        });
+                        html += '</div></div>';
+                        return html;
+                    },
+                    position: { my: 'left top+10', at: 'left bottom', collision: 'flipfit', within: '#content' },
+                    close: function (event, ui) {
+                        ui.tooltip.hover(function () {
+                            $(this).stop(true).fadeTo(300, 1);
+                        },
+                        function () {
+                            $(this).fadeOut('300', function () {
+                                $(this).remove();
+                            });
+                        });
+                    }
+                });
+            });
+        };
     }
-
-    function cancelClose() {
-        clearTimeout(closeTimer);
-        closeTimer = null;
-    }
-
-    function scheduleClose($tip) {
-        cancelClose();
-        closeTimer = setTimeout(function () {
-            $tip.fadeOut(300, function () { $tip.remove(); });
-        }, 300);
-    }
-
-    $(document).on('mouseenter', '.qlo-stay-period-tip', function () {
-        cancelClose();
-
-        var periods = $(this).data('stay-tip');
-        if (!periods || !periods.length) { return; }
-
-        $('.qlo-stay-period-tooltip').stop(true).remove();
-
-        var $icon = $(this);
-        var $tip  = stayPeriodTooltip(periods).appendTo('body').hide().fadeIn(200);
-
-        var iconOffset = $icon.offset();
-        $tip.css({
-            position : 'absolute',
-            zIndex   : 9999,
-            top      : iconOffset.top + ($icon.outerHeight() / 2) - ($tip.outerHeight() / 2),
-            left     : iconOffset.left + $icon.outerWidth() + 8
-        });
-
-        $tip.on('mouseenter', function () {
-            cancelClose();
-        }).on('mouseleave', function () {
-            scheduleClose($tip);
-        });
-
-    }).on('mouseleave', '.qlo-stay-period-tip', function () {
-        var $tip = $('.qlo-stay-period-tooltip');
-        if ($tip.length) {
-            scheduleClose($tip);
-        }
-    });
+    window.initStayPeriodTooltips();
 });

From 9bb26f8f99f43fa5bfa04f8cc012eb746046a07b Mon Sep 17 00:00:00 2001
From: aradhana kumari <aradhana.kumari639@webkul.in>
Date: Fri, 24 Jul 2026 16:46:55 +0530
Subject: [PATCH 17/35] Simplify stay-period tooltip CSS to row-based layout

---
 .../css/controllers/order-stay-periods.css    | 46 +++----------------
 1 file changed, 7 insertions(+), 39 deletions(-)

diff --git a/admin/themes/default/css/controllers/order-stay-periods.css b/admin/themes/default/css/controllers/order-stay-periods.css
index cc599c24b..b4a87c615 100644
--- a/admin/themes/default/css/controllers/order-stay-periods.css
+++ b/admin/themes/default/css/controllers/order-stay-periods.css
@@ -20,46 +20,14 @@
 * @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
 */
 
-.qlo-stay-period-tooltip {
-    border: none;
-    padding-bottom: 10px;
-    min-width: 260px;
+.qlo-stay-period-tooltip .tip-body {
+    display: block;
 }
-.qlo-stay-period-tooltip .qlo-stay-period-date {
-    font-weight: bold;
+.qlo-stay-period-tooltip .qlo-stay-period-row {
+    display: flex;
+    justify-content: space-between;
 }
-.qlo-stay-period-tooltip .qlo-stay-period-body {
-    display: table;
-    width: 100%;
-    margin-top: 6px;
-}
-.qlo-stay-period-tooltip .qlo-stay-period {
-    display: table-row;
-}
-.qlo-stay-period-tooltip .qlo-stay-period-element-head,
-.qlo-stay-period-tooltip .qlo-stay-period-element-value {
-    display: table-cell;
-    padding: 3px 6px;
-}
-.qlo-stay-period-tooltip .qlo-stay-period-element-value {
-    text-align: right;
-}
-.qlo-stay-period-tooltip .qlo-stay-period-header .qlo-stay-period-element-head,
-.qlo-stay-period-tooltip .qlo-stay-period-header .qlo-stay-period-element-value {
+.qlo-stay-period-tooltip .qlo-stay-period-row-header {
     border-bottom: 1px solid #ddd;
-    padding-bottom: 5px;
-}
-.qlo-stay-period-badge {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    background: #666;
-    color: #fff;
-    border-radius: 50%;
-    width: 21px;
-    height: 21px;
-    font-size: 10px;
-    font-weight: bold;
-    padding: 0 4px;
-    cursor: pointer;
+    padding-bottom: 6px;
 }

From 344eec0a112d1dda49c8d3bb8ec422e5d9648a9e Mon Sep 17 00:00:00 2001
From: aradhana kumari <aradhana.kumari639@webkul.in>
Date: Mon, 3 Aug 2026 17:28:40 +0530
Subject: [PATCH 18/35] Updated: Use table in the tooltip

Co-authored-by: Name <sumit201@webkul.in>
---
 .../orders/_stay_periods_tooltip.tpl}         | 31 +++++++++++--------
 controllers/admin/AdminOrdersController.php   |  8 ++---
 js/admin/orders_stay_periods.js               | 25 +++++----------
 3 files changed, 28 insertions(+), 36 deletions(-)
 rename admin/themes/default/{css/controllers/order-stay-periods.css => template/controllers/orders/_stay_periods_tooltip.tpl} (60%)

diff --git a/admin/themes/default/css/controllers/order-stay-periods.css b/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl
similarity index 60%
rename from admin/themes/default/css/controllers/order-stay-periods.css
rename to admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl
index b4a87c615..205a6b32e 100644
--- a/admin/themes/default/css/controllers/order-stay-periods.css
+++ b/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl
@@ -1,4 +1,4 @@
-/**
+{**
 * NOTICE OF LICENSE
 *
 * This source file is subject to the Open Software License version 3.0
@@ -18,16 +18,21 @@
 * @author Webkul IN
 * @copyright Since 2010 Webkul
 * @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
-*/
+*}
 
-.qlo-stay-period-tooltip .tip-body {
-    display: block;
-}
-.qlo-stay-period-tooltip .qlo-stay-period-row {
-    display: flex;
-    justify-content: space-between;
-}
-.qlo-stay-period-tooltip .qlo-stay-period-row-header {
-    border-bottom: 1px solid #ddd;
-    padding-bottom: 6px;
-}
+<div id="qlo-stay-period-tooltip-tpl" style="display:none">
+    <div class="bootstrap tooltip_cont qlo-stay-period-tooltip">
+        <div class="tip_header">
+            <div>{l s='Stay Periods'}</div>
+        </div>
+        <table class="table qlo-stay-period-table">
+            <thead>
+                <tr>
+                    <th class="tip_element_head">{l s='Duration'}</th>
+                    <th class="tip_element_head">{l s='Rooms'}</th>
+                </tr>
+            </thead>
+            <tbody></tbody>
+        </table>
+    </div>
+</div>
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 64c32281f..6ed7db08e 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -398,10 +398,7 @@ class AdminOrdersControllerCore extends AdminController
 
         if ($uniqueStayPeriods > 1) {
             $stayPeriodHtml .= ' <span class="badge qlo-stay-period-badge"'
-                .' data-stay-tip="'.htmlspecialchars(json_encode($stayPeriods)).'"'
-                .' data-label-title="'.htmlspecialchars($this->l('Stay Periods')).'"'
-                .' data-label-duration="'.htmlspecialchars($this->l('Duration')).'"'
-                .' data-label-rooms="'.htmlspecialchars($this->l('Rooms')).'">+'
+                .' data-stay-tip="'.htmlspecialchars(json_encode($stayPeriods)).'">+'
                 .($uniqueStayPeriods - 1).'</span>';
         }
         return $stayPeriodHtml;
@@ -1402,7 +1399,6 @@ class AdminOrdersControllerCore extends AdminController
 
         if ($this->display != 'view') {
             $this->addJS(_PS_JS_DIR_.'admin/orders_stay_periods.js');
-            $this->addCSS(__PS_BASE_URI__.$this->admin_webpath.'/themes/'.$this->bo_theme.'/css/controllers/order-stay-periods.css');
         }
 
         if ($this->display == 'view') {
@@ -1501,6 +1497,8 @@ class AdminOrdersControllerCore extends AdminController
             $this->content .= $this->context->smarty->fetch('controllers/orders/_resolvable_overbookings.tpl');
         }
 
+        $this->content .= $this->context->smarty->fetch('controllers/orders/_stay_periods_tooltip.tpl');
+
         if (Tools::isSubmit('submitBulkupdateOrderStatus'.$this->table)) {
             if (Tools::getIsset('cancel')) {
                 Tools::redirectAdmin(self::$currentIndex.'&token='.$this->token);
diff --git a/js/admin/orders_stay_periods.js b/js/admin/orders_stay_periods.js
index f028b5096..d3df55f9b 100644
--- a/js/admin/orders_stay_periods.js
+++ b/js/admin/orders_stay_periods.js
@@ -33,28 +33,17 @@ $(document).ready(function () {
                 $(this).tooltip({
                     items: '.qlo-stay-period-badge',
                     content: function () {
-                        var $badge = $(this);
-                        var periods = $badge.data('stay-tip');
+                        var periods = $(this).data('stay-tip');
                         if (!periods || !periods.length) {
                             return '';
                         }
-                        var html = '<div class="tooltip_cont qlo-stay-period-tooltip">';
-                        html += '<div class="tip_header"><div class="tip_date">' + $badge.data('label-title') + '</div></div>';
-                        html += '<div class="tip-body">';
-                        html += '<div class="qlo-stay-period-row qlo-stay-period-row-header">'
-                            + '<span class="tip_element_head">' + $badge.data('label-duration') + '</span>'
-                            + '<span class="tip_element_head">' + $badge.data('label-rooms') + '</span>'
-                            + '</div>';
-                        $.each(periods, function (_, p) {
-                            html += '<div class="qlo-stay-period-row">'
-                                + '<span class="tip_element_value">' + p.from + ' – ' + p.to + '</span>'
-                                + '<span class="tip_element_value">' + p.count + '</span>'
-                                + '</div>';
-                        });
-                        html += '</div></div>';
-                        return html;
+                        var rows = $.map(periods, function (p) {
+                            return '<tr><td class="tip_element_value">' + p.from + ' – ' + p.to + '</td>'
+                                + '<td class="tip_element_value">' + p.count + '</td></tr>';
+                        }).join('');
+                        $('#qlo-stay-period-tooltip-tpl tbody').html(rows);
+                        return $('#qlo-stay-period-tooltip-tpl').html();
                     },
-                    position: { my: 'left top+10', at: 'left bottom', collision: 'flipfit', within: '#content' },
                     close: function (event, ui) {
                         ui.tooltip.hover(function () {
                             $(this).stop(true).fadeTo(300, 1);

From c15870b531f459253ef9efffe862ed1dce6bbe3f Mon Sep 17 00:00:00 2001
From: varun kewlani <varun.kewlani322@webkul.in>
Date: Fri, 14 Aug 2026 10:52:46 +0530
Subject: [PATCH 19/35] removed unnecessary file changes

---
 controllers/front/ParentOrderController.php    |  2 +-
 .../classes/WkPaypalCommerceWebhook.php        | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/controllers/front/ParentOrderController.php b/controllers/front/ParentOrderController.php
index 0316ba6d4..a519c3305 100644
--- a/controllers/front/ParentOrderController.php
+++ b/controllers/front/ParentOrderController.php
@@ -353,7 +353,7 @@ class ParentOrderControllerCore extends FrontController
             // For Advanced Payment work
             $objAdvPayment = new HotelAdvancedPayment();
             if ($objAdvPayment->isAdvancePaymentAvailableForCurrentCart()) {
-                if (Tools::isSubmit('submitAdvPayment') && !$this->context->cart->orderExists()) {
+                if (Tools::isSubmit('submitAdvPayment')) {
                     if (Tools::getValue('payment_type') == Order::ORDER_PAYMENT_TYPE_ADVANCE) {
                         $this->context->cart->is_advance_payment = 1;
                     } else {
diff --git a/modules/qlopaypalcommerce/classes/WkPaypalCommerceWebhook.php b/modules/qlopaypalcommerce/classes/WkPaypalCommerceWebhook.php
index 40fbe9878..4a6833f40 100644
--- a/modules/qlopaypalcommerce/classes/WkPaypalCommerceWebhook.php
+++ b/modules/qlopaypalcommerce/classes/WkPaypalCommerceWebhook.php
@@ -96,11 +96,14 @@ class WkPaypalCommerceWebhook
                     // if order completed then change the status of the order
                     if ($eventData['event_type'] == 'CHECKOUT.ORDER.COMPLETED') {
                         $cartID = $transactionData['id_cart'];
+                        $objCart = new Cart($cartID);
+                        if ($objCart->is_advance_payment) {
+                            $orderStatus = Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED');
+                        } else {
+                            $orderStatus = Configuration::get('PS_OS_PAYMENT_ACCEPTED');
+                        }
                         if ($orders = WkPaypalCommerceHelper::getOrdersByCartId($cartID)) {
                             foreach ($orders as $order) {
-                                $orderStatus = $order['is_advance_payment']
-                                    ? Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED')
-                                    : Configuration::get('PS_OS_PAYMENT_ACCEPTED');
                                 $this->updatePaymentStatus(
                                     (int)$orderStatus,
                                     $order['id_order']
@@ -123,11 +126,14 @@ class WkPaypalCommerceWebhook
             $transaction_id
         )) {
             $cartID = $transactionData['id_cart'];
+            $objCart = new Cart($cartID);
+            if ($objCart->is_advance_payment) {
+                $orderStatus = Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED');
+            } else {
+                $orderStatus = Configuration::get('PS_OS_PAYMENT_ACCEPTED');
+            }
             if ($orders = WkPaypalCommerceHelper::getOrdersByCartId($cartID)) {
                 foreach ($orders as $order) {
-                    $orderStatus = $order['is_advance_payment']
-                        ? Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED')
-                        : Configuration::get('PS_OS_PAYMENT_ACCEPTED');
                     $this->updatePaymentStatus(
                         (int)$orderStatus,
                         $order['id_order']

From 6039d2d2816713926c81a2785a5868a06ae84352 Mon Sep 17 00:00:00 2001
From: azhar bhat <azharbhat.qlo098@webkul.in>
Date: Fri, 14 Aug 2026 11:32:41 +0530
Subject: [PATCH 20/35] Fixed : fallback added incase lang pack not available

---
 classes/Language.php       | 3 ---
 install/models/install.php | 5 ++++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/classes/Language.php b/classes/Language.php
index 8fd883914..0963279bb 100644
--- a/classes/Language.php
+++ b/classes/Language.php
@@ -935,9 +935,6 @@ class LanguageCore extends ObjectModel
 
         if (!file_exists($file)) {
             $errors[] = Tools::displayError('No language pack is available for your version.');
-            if ($install && Language::checkAndAddLanguage((string)$iso, false, true, $params)) {
-                $errors = [];
-            }
         } elseif ($install) {
             require_once(_PS_TOOL_DIR_.'tar/Tar.php');
             $gz = new Archive_Tar($file, true);
diff --git a/install/models/install.php b/install/models/install.php
index 461237b9c..32d939aeb 100644
--- a/install/models/install.php
+++ b/install/models/install.php
@@ -347,7 +347,10 @@ class InstallModelInstall extends InstallAbstractModel
             if (InstallSession::getInstance()->safe_mode) {
                 Language::checkAndAddLanguage($iso, false, true, $params_lang);
             } else {
-                Language::downloadAndInstallLanguagePack($iso, _QLO_INSTALL_VERSION_, $params_lang);
+                $lang_pack_response = Language::downloadAndInstallLanguagePack($iso, _QLO_INSTALL_VERSION_, $params_lang);
+                if ($lang_pack_response !== true) {
+                    Language::checkAndAddLanguage($iso, false, true, $params_lang);
+                }
             }
 
             Language::loadLanguages();

From e0d88dd9483a471fc90be37cec7b1f9d4e44f5f6 Mon Sep 17 00:00:00 2001
From: varun kewlani <varun.kewlani322@webkul.in>
Date: Fri, 14 Aug 2026 12:19:51 +0530
Subject: [PATCH 21/35] removed harcoded jpg filetype sent

---
 .../classes/HotelBookingDocument.php                | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/modules/hotelreservationsystem/classes/HotelBookingDocument.php b/modules/hotelreservationsystem/classes/HotelBookingDocument.php
index 3683d9884..e38de91dc 100644
--- a/modules/hotelreservationsystem/classes/HotelBookingDocument.php
+++ b/modules/hotelreservationsystem/classes/HotelBookingDocument.php
@@ -153,12 +153,19 @@ class HotelBookingDocument extends ObjectModel
     }
 
     /**
-     * Extension is derived from the validated file_type, never from the
-     * uploaded filename/mime header (both are attacker-controlled).
+     * Extension is derived from the file's real, validated content
+     * (getimagesize()/PDF signature), never from the uploaded
+     * filename or mime header (both are attacker-controlled).
      */
     public function getFileExtension()
     {
-        return $this->file_type == self::FILE_TYPE_PDF ? 'pdf' : 'jpg';
+        if ($this->file_type == self::FILE_TYPE_PDF) {
+            return 'pdf';
+        }
+
+        $imageInfo = @getimagesize($this->fileInfo['tmp_name']);
+
+        return $imageInfo ? image_type_to_extension($imageInfo[2], false) : 'jpg';
     }
 
     public function getContentType()

From 77f2d7740decc2a22d9315a8645c6ecc9998abad Mon Sep 17 00:00:00 2001
From: amit sharma <amit.sharma322@webkul.in>
Date: Fri, 14 Aug 2026 17:21:43 +0530
Subject: [PATCH 22/35] Fixed: centralize tooltip initialization

Co-authored-by: Name <sumit201@webkul.in>
---
 admin/themes/default/img/icon-info.svg        |   4 +
 admin/themes/default/js/admin-theme.js        |  41 ++++++
 .../default/sass/partials/_tooltip.sass       |  29 ++++-
 .../template/controllers/orders/form.tpl      |   1 +
 .../controllers/products/connected-rooms.tpl  |  77 +++--------
 .../default/template/helpers/tooltip.tpl      |  36 +++++
 .../AdminOrderRefundRequestsController.php    |   1 -
 .../views/css/admin/wk_refund_request.css     |   4 +-
 .../views/js/admin/hotel_rooms_booking.js     | 123 +++---------------
 .../views/js/admin/wk_refund_request.js       |  39 ------
 .../helpers/view/view.tpl                     |  16 +--
 11 files changed, 156 insertions(+), 215 deletions(-)
 create mode 100644 admin/themes/default/img/icon-info.svg
 create mode 100644 admin/themes/default/template/helpers/tooltip.tpl

diff --git a/admin/themes/default/img/icon-info.svg b/admin/themes/default/img/icon-info.svg
new file mode 100644
index 000000000..5d4d44d02
--- /dev/null
+++ b/admin/themes/default/img/icon-info.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="8" cy="8" r="8" fill="#7EC77B"/>
+<path d="M8.06536 3C8.30937 3 8.51561 3.07032 8.6841 3.21097C8.85839 3.34693 8.94553 3.51336 8.94553 3.71027C8.94553 3.90717 8.85839 4.07595 8.6841 4.2166C8.51561 4.35724 8.30937 4.42757 8.06536 4.42757C7.82135 4.42757 7.6122 4.35724 7.43791 4.2166C7.26362 4.07595 7.17647 3.90717 7.17647 3.71027C7.17647 3.51336 7.26071 3.34693 7.42919 3.21097C7.60349 3.07032 7.81554 3 8.06536 3ZM8.78867 6.3685V11.5443C8.78867 11.9475 8.82353 12.2171 8.89325 12.353C8.96877 12.4843 9.07625 12.5827 9.21569 12.6484C9.36093 12.714 9.62237 12.7468 10 12.7468V13H6.122V12.7468C6.51126 12.7468 6.77269 12.7164 6.90632 12.6554C7.03994 12.5945 7.14452 12.4937 7.22004 12.353C7.30138 12.2124 7.34205 11.9428 7.34205 11.5443V9.06188C7.34205 8.36334 7.3159 7.91092 7.26362 7.70464C7.22295 7.55462 7.15904 7.45148 7.0719 7.39522C6.98475 7.33427 6.86565 7.3038 6.7146 7.3038C6.55192 7.3038 6.35439 7.33896 6.122 7.40928L6 7.15612L8.40523 6.3685H8.78867Z" fill="white"/>
+</svg>
diff --git a/admin/themes/default/js/admin-theme.js b/admin/themes/default/js/admin-theme.js
index 1aa61350d..7136a41b3 100644
--- a/admin/themes/default/js/admin-theme.js
+++ b/admin/themes/default/js/admin-theme.js
@@ -479,3 +479,44 @@ $(document).ready(function() {
 		$(this).prop('selected', false);
 	});
 }); //end dom ready
+
+function initTooltip($target, contentFn, items) {
+	var $elements = $target || $('.tooltip-trigger');
+	if (!$elements.length) {
+		return;
+	}
+	$elements.each(function () {
+		var $this = $(this);
+		if (!contentFn && $this.data('ui-tooltip')) {
+			return;
+		}
+		$this.tooltip({
+			content: contentFn || $this.next('.tooltip-content').html(),
+			items: items || 'span',
+			trigger: 'hover',
+			tooltipClass: 'tooltip-popup',
+			open: function (event, ui) {
+				if (event.buttons == 1 || event.buttons == 3) {
+					ui.tooltip.remove();
+				}
+				if (typeof event.originalEvent === 'undefined') {
+					return false;
+				}
+				var $id = $(ui.tooltip).attr('id');
+				if ($('div.ui-tooltip').not('#' + $id).length) {
+					return false;
+				}
+			},
+			close: function (event, ui) {
+				ui.tooltip.hover(
+					function () { $(this).stop(true).fadeTo(300, 1); },
+					function () { $(this).fadeOut(300, function () { $(this).remove(); }); }
+				);
+			}
+		});
+	});
+}
+
+$(document).ready(function () {
+	initTooltip();
+});
diff --git a/admin/themes/default/sass/partials/_tooltip.sass b/admin/themes/default/sass/partials/_tooltip.sass
index 986d49667..d1f445386 100644
--- a/admin/themes/default/sass/partials/_tooltip.sass
+++ b/admin/themes/default/sass/partials/_tooltip.sass
@@ -1,5 +1,4 @@
 .tooltip_cont
-    min-width: 280px
     width: 100%
     font-size: 14px
     font-weight: 600
@@ -7,6 +6,7 @@
         margin-bottom: 10px
     .tip-body > div
         margin-bottom: 6px
+        margin-right: 10px
 
 .tip_element_head
     font-size: 12px
@@ -28,3 +28,30 @@
     border: none
     padding: 10px
     box-shadow: 0px 0px 15px 0px rgba(0, 0, 0, 0.15)
+    width: auto
+
+.tooltip-trigger
+    cursor: pointer
+    display: inline-block
+    vertical-align: middle
+
+
+
+.ui-tooltip.tooltip-popup
+    ul
+        margin: 0
+        padding: 0 0 0 16px
+        list-style: disc
+        li
+            padding: 2px 0
+
+.tooltip-popup-row
+    display: flex
+    justify-content: space-between
+    align-items: center
+    gap: 12px
+    margin: 3px 0
+    white-space: nowrap
+    label
+        font-weight: 600
+        margin: 0
diff --git a/admin/themes/default/template/controllers/orders/form.tpl b/admin/themes/default/template/controllers/orders/form.tpl
index 1482462e9..378fd1d96 100644
--- a/admin/themes/default/template/controllers/orders/form.tpl
+++ b/admin/themes/default/template/controllers/orders/form.tpl
@@ -1396,6 +1396,7 @@
 			{
 				$("#customer_cart_details").empty();
 				$("#customer_cart_details").append(res.cart_detail_html);
+				initTooltip();
 
 				displaySummary(res);
 			}
diff --git a/admin/themes/default/template/controllers/products/connected-rooms.tpl b/admin/themes/default/template/controllers/products/connected-rooms.tpl
index 6017e4269..4da9bf497 100644
--- a/admin/themes/default/template/controllers/products/connected-rooms.tpl
+++ b/admin/themes/default/template/controllers/products/connected-rooms.tpl
@@ -20,63 +20,22 @@
 * @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
 *}
 {if isset($htl_connected_rooms) && $htl_connected_rooms|@count > 0}
-    <span class="connected-room-tooltip-trigger"
-        data-connected-details='{json_encode($htl_connected_rooms.connected_room_types)|escape:'html':'UTF-8'}'>
-        <i class="icon-random" style="color: #008abd; cursor: pointer;"></i>
-    </span>
+    {capture name='connected_room_tooltip'}
+        <div class="tooltip_cont">
+            <div class="tip_header"><div class="tip_date">{l s='Connected Rooms'}</div></div>
+            <div class="tip-body tip-body-grid">
+                {foreach from=$htl_connected_rooms.connected_room_types item=group}
+                    <div>
+                        <div class="tip_element_head">{$group.room_type_name|escape:'html':'UTF-8'}</div>
+                        <div class="tip_element_value">
+                            {foreach from=$group.connected_rooms item=room name=connected_rooms}
+                                {$room.name|escape:'html':'UTF-8'}{if !$smarty.foreach.connected_rooms.last}, {/if}
+                            {/foreach}
+                        </div>
+                    </div>
+                {/foreach}
+            </div>
+        </div>
+    {/capture}
+    {include file='helpers/tooltip.tpl' tooltip_content=$smarty.capture.connected_room_tooltip allow_html=true tooltip_icon_class='icon-random' tooltip_icon_style='color: #008abd;'}
 {/if}
-<script>
-    $(document).ready(function() {
-        {literal}
-            if (typeof window.initConnectedRoomTooltips === 'undefined') {
-                window.initConnectedRoomTooltips = function() {
-                    if (typeof $.fn.tooltip === 'undefined' || typeof $.ui === 'undefined' || typeof $.ui.tooltip === 'undefined') {
-                        return;
-                    }
-                    $('.connected-room-tooltip-trigger').each(function() {
-                        if ($(this).data('ui-tooltip')) {
-                            return;
-                        }
-                        $(this).tooltip({
-                            items: '.connected-room-tooltip-trigger',
-                            content: function() {
-                                var details = $(this).data('connected-details');
-                                if (!details || $.isEmptyObject(details)) {
-                                    return "{/literal}{l s='No rooms connected' js=1}{literal}";
-                                }
-                                var html = '<div class="tooltip_cont">';
-                                html += '<div class="tip_header"><div class="tip_date">{/literal}{l s="Connected Rooms" js=1}{literal}</div></div>';
-                                html += '<div class="tip-body tip-body-grid">';
-                                for (var typeId in details) {
-                                    var group = details[typeId];
-                                    var names = [];
-                                    for (var i = 0; i < group.connected_rooms.length; i++) {
-                                        names.push(group.connected_rooms[i].name);
-                                    }
-                                    html += '<div>';
-                                    html += '<div class="tip_element_head">' + group.room_type_name + '</div>';
-                                    html += '<div class="tip_element_value">' + names.join(', ') + '</div>';
-                                    html += '</div>';
-                                }
-                                html += '</div></div>';
-                                return html;
-                            },
-                            position: { my: "left top+10", at: "left bottom", collision: "flipfit", within: "#content" },
-                            close: function(event, ui) {
-                                ui.tooltip.hover(function() {
-                                    $(this).stop(true).fadeTo(300, 1);
-                                },
-                                function() {
-                                    $(this).fadeOut('300', function() {
-                                        $(this).remove();
-                                    });
-                                });
-                            }
-                        });
-                    });
-                };
-            }
-            window.initConnectedRoomTooltips();
-        {/literal}
-    });
-</script>
diff --git a/admin/themes/default/template/helpers/tooltip.tpl b/admin/themes/default/template/helpers/tooltip.tpl
new file mode 100644
index 000000000..ff07a3178
--- /dev/null
+++ b/admin/themes/default/template/helpers/tooltip.tpl
@@ -0,0 +1,36 @@
+{*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License version 3.0
+* that is bundled with this package in the file LICENSE.md
+* It is also available through the world-wide-web at this URL:
+* https://opensource.org/license/osl-3-0-php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to support@qloapps.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade this module to a newer
+* versions in the future. If you wish to customize this module for your needs
+* please refer to https://store.webkul.com/customisation-guidelines for more information.
+*
+* @author Webkul IN
+* @copyright Since 2010 Webkul
+* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+*}
+
+<span class="tooltip-trigger{if isset($tooltip_class) && $tooltip_class} {$tooltip_class|escape:'html':'UTF-8'}{/if}">
+	{if isset($tooltip_icon_class) && $tooltip_icon_class}
+		<i class="{$tooltip_icon_class|escape:'html':'UTF-8'}"{if isset($tooltip_icon_style) && $tooltip_icon_style} style="{$tooltip_icon_style|escape:'html':'UTF-8'}"{/if}></i>
+	{else}
+		<img src="themes/default/img/icon-info.svg" alt="" />
+	{/if}
+</span>
+<div class="tooltip-content" style="display: none;">
+	{if isset($allow_html) && $allow_html}
+		{$tooltip_content nofilter}
+	{else}
+		{$tooltip_content|escape:'html':'UTF-8'}
+	{/if}
+</div>
diff --git a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php
index 8edfba919..81fba0d1a 100644
--- a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php
@@ -350,7 +350,6 @@ class AdminOrderRefundRequestsController extends ModuleAdminController
                 'isRefundCompleted' => $objOrderReturn->hasBeenCompleted(),
                 'paymentMethods' => $paymentMethods,
                 'name_controller' => Tools::getValue('controller'),
-                'info_icon_path' => $this->context->link->getMediaLink(_MODULE_DIR_.'hotelreservationsystem/views/img/Slices/icon-info.svg'),
                 'expiry_date' => time() + (3600 * 24 * 365.25)
             )
         );
diff --git a/modules/hotelreservationsystem/views/css/admin/wk_refund_request.css b/modules/hotelreservationsystem/views/css/admin/wk_refund_request.css
index e3cd83c23..69fc03b56 100644
--- a/modules/hotelreservationsystem/views/css/admin/wk_refund_request.css
+++ b/modules/hotelreservationsystem/views/css/admin/wk_refund_request.css
@@ -24,9 +24,9 @@ body.adminorderrefundrequests .ui-tooltip {
     padding: 10px;
     box-shadow: 0px 0px 15px 0px #00000026;
 }
-.ui-tooltip.price_info-tooltip span {
+.ui-tooltip.tooltip-popup span {
     margin-left: 15px;
 }
-.ui-tooltip.price_info-tooltip label {
+.ui-tooltip.tooltip-popup label {
     font-weight: 600;
 }
\ No newline at end of file
diff --git a/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js b/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js
index 225f08bd2..5c8025f2c 100644
--- a/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js
+++ b/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js
@@ -60,118 +60,34 @@ $(document).ready(function() {
                     } else {
                         $(info.el).closest('td').find('.day-info svg circle').attr('fill', '#FF3838');
                     }
-                    $(info.el).closest('td').find('.day-info').tooltip({
-                        content: function()
-                        {
-                            $('#date-stats-tooltop .tip_date').text(info.event.extendedProps.data.date_format);
-                            $.each(info.event.extendedProps.data.stats, function(elem, val) {
-                                if (elem == 'num_part_avai') {
-                                    $('#date-stats-tooltop').find('.'+elem).hide().find('.tip_element_value').text('');
-                                } else {
-                                    $('#date-stats-tooltop').find('.'+elem).show().find('.tip_element_value').text(val);
-                                }
-                            });
-                            return $('#date-stats-tooltop').html();
-                        },
-                        items: "div",
-                        trigger : 'hover',
-                        show: {
-                            delay: 100,
-                        },
-                        hide: {
-                            delay: 300,
-                        },
-                        open: function(event, ui)
-                        {
-                            if(event.buttons == 1 || event.buttons == 3){
-                                ui.tooltip.remove();
-                            }
-
-                            if (typeof(event.originalEvent) === 'undefined') {
-                                return false;
-                            }
-
-                            var $id = $(ui.tooltip).attr('id');
-
-                            // close any lingering tooltips
-                            if ($('div.ui-tooltip').not('#' + $id).length) {
-                                return false;
-                            }
-
-                        // ajax function to pull in data and add it to the tooltip goes here
-                    },
-                    close: function(event, ui)
-                    {
-                        ui.tooltip.hover(function() {
-                            $(this).stop(true).fadeTo(300, 1);
-                        },
-                        function() {
-                            $(this).fadeOut('300', function()
-                            {
-                                $(this).remove();
-                            });
-                        });
-                    }
-                });
-                info.event.remove();
-            } else {
-                $(info.el).tooltip({
-                    content: function()
-                    {
-                        $('#date-stats-tooltop .tip_date').text(info.event.extendedProps.data.date_from_format + ' - ' +info.event.extendedProps.data.date_to_format);
+                    initTooltip($(info.el).closest('td').find('.day-info'), function() {
+                        $('#date-stats-tooltop .tip_date').text(info.event.extendedProps.data.date_format);
                         $.each(info.event.extendedProps.data.stats, function(elem, val) {
                             if (elem == 'num_part_avai') {
-                                if (val > 0) {
-                                    $('#date-stats-tooltop').find('.'+elem).show().find('.tip_element_value').text(val);
-                                } else {
-                                    $('#date-stats-tooltop').find('.'+elem).hide().find('.tip_element_value').text('');
-                                }
+                                $('#date-stats-tooltop').find('.'+elem).hide().find('.tip_element_value').text('');
                             } else {
-                                $('#date-stats-tooltop').find('.'+elem).find('.tip_element_value').text(val);
+                                $('#date-stats-tooltop').find('.'+elem).show().find('.tip_element_value').text(val);
                             }
                         });
                         return $('#date-stats-tooltop').html();
-                    },
-                    items: "div",
-                    trigger : 'hover',
-                    show: {
-                        delay: 100,
-                    },
-                    hide: {
-                        delay: 300,
-                    },
-                    open: function(event, ui)
-                    {
-                        if(event.buttons == 1 || event.buttons == 3){
-                            ui.tooltip.remove();
-                        }
-
-                            if (typeof(event.originalEvent) === 'undefined') {
-                                return false;
+                    }, 'div');
+                    info.event.remove();
+            } else {
+                initTooltip($(info.el), function() {
+                    $('#date-stats-tooltop .tip_date').text(info.event.extendedProps.data.date_from_format + ' - ' +info.event.extendedProps.data.date_to_format);
+                    $.each(info.event.extendedProps.data.stats, function(elem, val) {
+                        if (elem == 'num_part_avai') {
+                            if (val > 0) {
+                                $('#date-stats-tooltop').find('.'+elem).show().find('.tip_element_value').text(val);
+                            } else {
+                                $('#date-stats-tooltop').find('.'+elem).hide().find('.tip_element_value').text('');
                             }
-
-                            var $id = $(ui.tooltip).attr('id');
-
-                            // close any lingering tooltips
-                            if ($('div.ui-tooltip').not('#' + $id).length) {
-                                return false;
-                            }
-
-                            // ajax function to pull in data and add it to the tooltip goes here
-                        },
-                        close: function(event, ui)
-                        {
-                            ui.tooltip.hover(function() {
-                                $(this).stop(true).fadeTo(300, 1);
-                            },
-                            function() {
-                                $(this).fadeOut('300', function()
-                                {
-                                    $(this).remove();
-                                });
-                            });
+                        } else {
+                            $('#date-stats-tooltop').find('.'+elem).find('.tip_element_value').text(val);
                         }
                     });
+                    return $('#date-stats-tooltop').html();
+                }, 'div');
                 }
             },
             dayCellDidMount: (arg)  => {
@@ -515,6 +431,7 @@ $(document).ready(function() {
                 } else {
                     showSuccessMessage(removed_room_success_txt);
                     $("#htl_rooms_list").empty().append(result.data.room_tpl);
+                    initTooltip();
                     refreshCartData();
                     refreshStatsData();
                     calendar.refetchEvents();
diff --git a/modules/hotelreservationsystem/views/js/admin/wk_refund_request.js b/modules/hotelreservationsystem/views/js/admin/wk_refund_request.js
index 7bf27b61f..a74ad4bf1 100644
--- a/modules/hotelreservationsystem/views/js/admin/wk_refund_request.js
+++ b/modules/hotelreservationsystem/views/js/admin/wk_refund_request.js
@@ -41,45 +41,6 @@ $(document).ready(function() {
         $('#voucher_expiry').parent().removeClass('has-error');
     });
 
-    // initialize tootip for room price
-    if ($('#rooms_refund_info .price_info').length) {
-        $('#rooms_refund_info .price_info').each(function (i, element) {
-			$(this).find('img').tooltip({
-				content: $(this).closest('td').find('.price_info_container').html(),
-				items: "span",
-				trigger : 'hover',
-				tooltipClass: "price_info-tooltip",
-				open: function(event, ui)
-				{
-					if (typeof(event.originalEvent) === 'undefined')
-					{
-						return false;
-					}
-
-					var $id = $(ui.tooltip).attr('id');
-
-					if ($('div.ui-tooltip').not('#' + $id).length) {
-						return false;
-					}
-				},
-				close: function(event, ui)
-				{
-					ui.tooltip.hover(function()
-					{
-						$(this).stop(true).fadeTo(400, 1);
-					},
-					function()
-					{
-						$(this).fadeOut('400', function()
-						{
-							$(this).remove();
-						});
-					});
-				}
-			});
-		});
-	}
-
     $(document).on('change', '#refundTransactionAmount', function() {
 		if ($(this).is(':checked')) {
 			$(".refund_transaction_fields").show(200);
diff --git a/modules/hotelreservationsystem/views/templates/admin/order_refund_requests/helpers/view/view.tpl b/modules/hotelreservationsystem/views/templates/admin/order_refund_requests/helpers/view/view.tpl
index d8cadf9e9..3847481bf 100644
--- a/modules/hotelreservationsystem/views/templates/admin/order_refund_requests/helpers/view/view.tpl
+++ b/modules/hotelreservationsystem/views/templates/admin/order_refund_requests/helpers/view/view.tpl
@@ -171,10 +171,7 @@
 												<td>{dateFormat date=$booking['date_from'] full=$is_full_date} {l s='To' mod='hotelreservationsystem'} {dateFormat date=$booking['date_to'] full=$is_full_date}</td>
 												<td>
 													{displayPrice price=($booking['total_price_tax_incl'] + $booking['extra_service_total_price_tax_incl']) currency=$orderCurrency['id']}
-													<span class="price_info">
-														&nbsp;<img src="{$info_icon_path|escape:'htmlall':'UTF-8'}" />
-													</span>
-													<div class="price_info_container" style="display: none;">
+													{capture name='refund_total_tooltip'}
 														<div>
 															<label>{l s='Room cost:' mod='hotelreservationsystem'}</label>
 															<span class="pull-right">{displayPrice price=$booking['total_price_tax_incl'] currency=$orderCurrency['id']}</span>
@@ -183,14 +180,12 @@
 															<label>{l s='Services cost:' mod='hotelreservationsystem'}</label>
 															<span class="pull-right">{displayPrice price=$booking['extra_service_total_price_tax_incl'] currency=$orderCurrency['id']}</span>
 														</div>
-													</div>
+													{/capture}
+													{include file='helpers/tooltip.tpl' tooltip_content=$smarty.capture.refund_total_tooltip allow_html=true}
 												</td>
 												<td>
 													{displayPrice price=($booking['room_paid_amount'] + $booking['extra_service_total_paid_amount']) currency=$orderCurrency['id']}
-													<span class="price_info">
-														&nbsp;<img src="{$info_icon_path|escape:'htmlall':'UTF-8'}" />
-													</span>
-													<div class="price_info_container" style="display: none;">
+													{capture name='refund_paid_tooltip'}
 														<div>
 															<label>{l s='Room paid amount:' mod='hotelreservationsystem'}</label>
 															<span class="pull-right">{displayPrice price=$booking['room_paid_amount'] currency=$orderCurrency['id']}</span>
@@ -199,7 +194,8 @@
 															<label>{l s='Services paid amount:' mod='hotelreservationsystem'}</label>
 															<span class="pull-right">{displayPrice price=$booking['extra_service_total_paid_amount'] currency=$orderCurrency['id']}</span>
 														</div>
-													</div>
+													{/capture}
+													{include file='helpers/tooltip.tpl' tooltip_content=$smarty.capture.refund_paid_tooltip allow_html=true}
 												</td>
 												{if !$isRefundCompleted}
 													<td>

From cea201da1df55fdff189d0bd1da1bd4b14dca198 Mon Sep 17 00:00:00 2001
From: varun kewlani <varun.kewlani322@webkul.in>
Date: Mon, 17 Aug 2026 17:28:02 +0530
Subject: [PATCH 23/35] fixed issue

---
 .../qlopaypalcommerce/controllers/front/payment.php  | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/modules/qlopaypalcommerce/controllers/front/payment.php b/modules/qlopaypalcommerce/controllers/front/payment.php
index cfbc48263..458c902f0 100644
--- a/modules/qlopaypalcommerce/controllers/front/payment.php
+++ b/modules/qlopaypalcommerce/controllers/front/payment.php
@@ -129,13 +129,11 @@ class QloPaypalCommercePaymentModuleFrontController extends ModuleFrontControlle
                                 // Order status/amount must reflect what PayPal actually captured,
                                 // not the cart's is_advance_payment flag (still editable by the
                                 // customer after payment, so it cannot be trusted here).
-                                $capturedAmount = (float) (
-                                    $returnData['data']['purchase_units'][0]['payments']['captures'][0]['amount']['value'] ?? 0
-                                );
+                                $capturedAmount = isset(
+                                    $returnData['data']['purchase_units'][0]['payments']['captures'][0]['amount']['value']
+                                ) ? (float) $returnData['data']['purchase_units'][0]['payments']['captures'][0]['amount']['value'] : 0;
                                 $fullTotal = (float) $cart->getOrderTotal(true, Cart::BOTH);
-                                $isFullyPaid = Tools::ps_round($capturedAmount, _PS_PRICE_COMPUTE_PRECISION_)
-                                    >= Tools::ps_round($fullTotal, _PS_PRICE_COMPUTE_PRECISION_);
-                                $total = $isFullyPaid ? $fullTotal : $capturedAmount;
+                                $isFullyPaid = $capturedAmount >= $fullTotal;
 
                                 // set order status
                                 if ($returnData['data']['status'] == 'COMPLETED') {
@@ -151,7 +149,7 @@ class QloPaypalCommercePaymentModuleFrontController extends ModuleFrontControlle
                                 $this->module->validateOrder(
                                     $cart->id,
                                     $orderStatus,
-                                    $total,
+                                    $capturedAmount,
                                     $this->module->l('PayPal Checkout', 'payment'),
                                     null,
                                     $extraVars,

From 02d9c562f46b0a803712e8f47dce99bc590285e0 Mon Sep 17 00:00:00 2001
From: varun kewlani <varun.kewlani322@webkul.in>
Date: Mon, 17 Aug 2026 17:28:54 +0530
Subject: [PATCH 24/35] fixed issue

---
 modules/qlopaypalcommerce/controllers/front/payment.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/qlopaypalcommerce/controllers/front/payment.php b/modules/qlopaypalcommerce/controllers/front/payment.php
index 458c902f0..c1526302c 100644
--- a/modules/qlopaypalcommerce/controllers/front/payment.php
+++ b/modules/qlopaypalcommerce/controllers/front/payment.php
@@ -129,9 +129,8 @@ class QloPaypalCommercePaymentModuleFrontController extends ModuleFrontControlle
                                 // Order status/amount must reflect what PayPal actually captured,
                                 // not the cart's is_advance_payment flag (still editable by the
                                 // customer after payment, so it cannot be trusted here).
-                                $capturedAmount = isset(
-                                    $returnData['data']['purchase_units'][0]['payments']['captures'][0]['amount']['value']
-                                ) ? (float) $returnData['data']['purchase_units'][0]['payments']['captures'][0]['amount']['value'] : 0;
+                                $capturedAmount = isset($returnData['data']['purchase_units'][0]['payments']['captures'][0]['amount']['value']) ?
+                                 (float) $returnData['data']['purchase_units'][0]['payments']['captures'][0]['amount']['value'] : 0;
                                 $fullTotal = (float) $cart->getOrderTotal(true, Cart::BOTH);
                                 $isFullyPaid = $capturedAmount >= $fullTotal;
 

From 2329fa80c6c1e1ef3a7ca5652178634c3f7ae55b Mon Sep 17 00:00:00 2001
From: azhar bhat <azharbhat.qlo098@webkul.in>
Date: Mon, 17 Aug 2026 19:54:14 +0530
Subject: [PATCH 25/35] code optimized

---
 admin/themes/default/js/admin-theme.js        |   7 +-
 .../controllers/products/connected-rooms.tpl  |   2 +-
 .../default/template/helpers/tooltip.tpl      |  16 ++-
 .../views/js/admin/hotel_rooms_booking.js     | 115 +++++++++---------
 .../helpers/view/view.tpl                     |   4 +-
 5 files changed, 77 insertions(+), 67 deletions(-)

diff --git a/admin/themes/default/js/admin-theme.js b/admin/themes/default/js/admin-theme.js
index 7136a41b3..04acc90b5 100644
--- a/admin/themes/default/js/admin-theme.js
+++ b/admin/themes/default/js/admin-theme.js
@@ -478,6 +478,7 @@ $(document).ready(function() {
 	$('.no-htl-access-option').on('click', function() {
 		$(this).prop('selected', false);
 	});
+	initTooltip();
 }); //end dom ready
 
 function initTooltip($target, contentFn, items) {
@@ -515,8 +516,4 @@ function initTooltip($target, contentFn, items) {
 			}
 		});
 	});
-}
-
-$(document).ready(function () {
-	initTooltip();
-});
+}
\ No newline at end of file
diff --git a/admin/themes/default/template/controllers/products/connected-rooms.tpl b/admin/themes/default/template/controllers/products/connected-rooms.tpl
index 4da9bf497..5fe24f98c 100644
--- a/admin/themes/default/template/controllers/products/connected-rooms.tpl
+++ b/admin/themes/default/template/controllers/products/connected-rooms.tpl
@@ -37,5 +37,5 @@
             </div>
         </div>
     {/capture}
-    {include file='helpers/tooltip.tpl' tooltip_content=$smarty.capture.connected_room_tooltip allow_html=true tooltip_icon_class='icon-random' tooltip_icon_style='color: #008abd;'}
+    {include file='helpers/tooltip.tpl' tooltip_content=$smarty.capture.connected_room_tooltip tooltip_icon_class='icon-random' tooltip_icon_style='color: #008abd;' }
 {/if}
diff --git a/admin/themes/default/template/helpers/tooltip.tpl b/admin/themes/default/template/helpers/tooltip.tpl
index ff07a3178..2f5571204 100644
--- a/admin/themes/default/template/helpers/tooltip.tpl
+++ b/admin/themes/default/template/helpers/tooltip.tpl
@@ -21,16 +21,24 @@
 *}
 
 <span class="tooltip-trigger{if isset($tooltip_class) && $tooltip_class} {$tooltip_class|escape:'html':'UTF-8'}{/if}">
-	{if isset($tooltip_icon_class) && $tooltip_icon_class}
+	{if isset($tooltip_trigger_html) && $tooltip_trigger_html}
+		{$tooltip_trigger_html nofilter}
+	{elseif isset($tooltip_title) && $tooltip_title}
+		<span class="badge badge-primary">
+		{if isset($tooltip_icon_class) && $tooltip_icon_class}
+			<i class="{$tooltip_icon_class|escape:'html':'UTF-8'}"{if isset($tooltip_icon_style) && $tooltip_icon_style} style="{$tooltip_icon_style|escape:'html':'UTF-8'}"{/if}></i>
+		{/if}
+		{$tooltip_title|escape:'html':'UTF-8'}</span>
+	{elseif isset($tooltip_icon_class) && $tooltip_icon_class}
 		<i class="{$tooltip_icon_class|escape:'html':'UTF-8'}"{if isset($tooltip_icon_style) && $tooltip_icon_style} style="{$tooltip_icon_style|escape:'html':'UTF-8'}"{/if}></i>
 	{else}
 		<img src="themes/default/img/icon-info.svg" alt="" />
 	{/if}
 </span>
 <div class="tooltip-content" style="display: none;">
-	{if isset($allow_html) && $allow_html}
-		{$tooltip_content nofilter}
-	{else}
+	{if isset($allow_html) && !$allow_html}
 		{$tooltip_content|escape:'html':'UTF-8'}
+	{else}
+		{$tooltip_content nofilter}
 	{/if}
 </div>
diff --git a/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js b/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js
index 056fff315..79d4bb846 100644
--- a/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js
+++ b/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js
@@ -23,7 +23,8 @@
 $(document).ready(function() {
 
     // calender
-    if ($('#fullcalendar').length) {
+   
+     if ($('#fullcalendar').length) {
         var calendar = new FullCalendar.Calendar($('#fullcalendar').get(0), {
             initialView: 'dayGridMonth',
             initialDate: initialDate,
@@ -53,66 +54,70 @@ $(document).ready(function() {
                 if (info.event.extendedProps.is_notification) {
                     var $cell = $(info.el).closest('td');
                     $cell.css('background-color', info.event.backgroundColor);
-                    initTooltip($cell, function() {
-                        $('#date-stats-tooltop .tip_date').text(info.event.extendedProps.data.date_format);
-                        $.each(info.event.extendedProps.data.stats, function(elem, val) {
-                            if (elem == 'num_part_avai') {
-                                $('#date-stats-tooltop').find('.'+elem).hide().find('.tip_element_value').text('');
-                            } else {
-                                $('#date-stats-tooltop').find('.'+elem).show().find('.tip_element_value').text(val);
+                    if (typeof initTooltip === 'function') {
+                        initTooltip($cell, function() {
+                            $('#date-stats-tooltop .tip_date').text(info.event.extendedProps.data.date_format);
+                            $.each(info.event.extendedProps.data.stats, function(elem, val) {
+                                if (elem == 'num_part_avai') {
+                                    $('#date-stats-tooltop').find('.'+elem).hide().find('.tip_element_value').text('');
+                                } else {
+                                    $('#date-stats-tooltop').find('.'+elem).show().find('.tip_element_value').text(val);
+                                }
+                            });
+                            return $('#date-stats-tooltop').html();
+                        }, 'td');
+                        $cell.tooltip('option', {
+                            position: {
+                                my: "left top",
+                                at: "left+50% bottom-50%",
+                                collision: "flipfit"
+                            },
+                            open: function(event, ui)
+                            {
+                                if(event.buttons == 1 || event.buttons == 3){
+                                    ui.tooltip.remove();
+                                }
+
+                                if (typeof(event.originalEvent) === 'undefined') {
+                                    return false;
+                                }
+
+                                // suppress cell tooltip when hovering the search result bar
+                                if ($(event.originalEvent.target).closest('.search-result-event').length) {
+                                    ui.tooltip.remove();
+                                    $(this).removeData('ui-tooltip-id').removeAttr('aria-describedby');
+                                    return false;
+                                }
+
+                                var $id = $(ui.tooltip).attr('id');
+
+                                // close any lingering tooltips
+                                if ($('div.ui-tooltip').not('#' + $id).length) {
+                                    return false;
+                                }
                             }
                         });
-                        return $('#date-stats-tooltop').html();
-                    }, 'td');
-                    $cell.tooltip('option', {
-                        position: {
-                            my: "left top",
-                            at: "left+50% bottom-50%",
-                            collision: "flipfit"
-                        },
-                        open: function(event, ui)
-                        {
-                            if(event.buttons == 1 || event.buttons == 3){
-                                ui.tooltip.remove();
-                            }
-
-                            if (typeof(event.originalEvent) === 'undefined') {
-                                return false;
-                            }
-
-                            // suppress cell tooltip when hovering the search result bar
-                            if ($(event.originalEvent.target).closest('.search-result-event').length) {
-                                ui.tooltip.remove();
-                                $(this).removeData('ui-tooltip-id').removeAttr('aria-describedby');
-                                return false;
-                            }
-
-                            var $id = $(ui.tooltip).attr('id');
-
-                            // close any lingering tooltips
-                            if ($('div.ui-tooltip').not('#' + $id).length) {
-                                return false;
-                            }
-                        }
-                    });
+                    }
                 } else {
                     $(info.el).addClass('search-result-event');
-                    initTooltip($(info.el), function() {
-                        $('#date-stats-tooltop .tip_date').text(info.event.extendedProps.data.date_from_format + ' - ' +info.event.extendedProps.data.date_to_format);
-                        $.each(info.event.extendedProps.data.stats, function(elem, val) {
-                            if (elem == 'num_part_avai') {
-                                if (val > 0) {
-                                    $('#date-stats-tooltop').find('.'+elem).show().find('.tip_element_value').text(val);
+                    if (typeof initTooltip === 'function') {
+                        initTooltip($(info.el), function() {
+                            $('#date-stats-tooltop .tip_date').text(info.event.extendedProps.data.date_from_format + ' - ' +info.event.extendedProps.data.date_to_format);
+                            $.each(info.event.extendedProps.data.stats, function(elem, val) {
+                                if (elem == 'num_part_avai') {
+                                    if (val > 0) {
+                                        $('#date-stats-tooltop').find('.'+elem).show().find('.tip_element_value').text(val);
+                                    } else {
+                                        $('#date-stats-tooltop').find('.'+elem).hide().find('.tip_element_value').text('');
+                                    }
                                 } else {
-                                    $('#date-stats-tooltop').find('.'+elem).hide().find('.tip_element_value').text('');
+                                    $('#date-stats-tooltop').find('.'+elem).find('.tip_element_value').text(val);
                                 }
-                            } else {
-                                $('#date-stats-tooltop').find('.'+elem).find('.tip_element_value').text(val);
-                            }
-                        });
-                        return $('#date-stats-tooltop').html();
-                    }, 'div');
-                    $(info.el).tooltip('option', 'track', true);
+                            });
+                            return $('#date-stats-tooltop').html();
+                        }, 'div');
+                        $(info.el).tooltip('option', 'track', true);
+                    }
                     info.el.style.borderLeftColor = info.event.extendedProps.data.eventColor;
                     resizeSearchResultEventBar($(info.el));
                 }
diff --git a/modules/hotelreservationsystem/views/templates/admin/order_refund_requests/helpers/view/view.tpl b/modules/hotelreservationsystem/views/templates/admin/order_refund_requests/helpers/view/view.tpl
index 3847481bf..79ea77d21 100644
--- a/modules/hotelreservationsystem/views/templates/admin/order_refund_requests/helpers/view/view.tpl
+++ b/modules/hotelreservationsystem/views/templates/admin/order_refund_requests/helpers/view/view.tpl
@@ -181,7 +181,7 @@
 															<span class="pull-right">{displayPrice price=$booking['extra_service_total_price_tax_incl'] currency=$orderCurrency['id']}</span>
 														</div>
 													{/capture}
-													{include file='helpers/tooltip.tpl' tooltip_content=$smarty.capture.refund_total_tooltip allow_html=true}
+													{include file='helpers/tooltip.tpl' tooltip_content=$smarty.capture.refund_total_tooltip}
 												</td>
 												<td>
 													{displayPrice price=($booking['room_paid_amount'] + $booking['extra_service_total_paid_amount']) currency=$orderCurrency['id']}
@@ -195,7 +195,7 @@
 															<span class="pull-right">{displayPrice price=$booking['extra_service_total_paid_amount'] currency=$orderCurrency['id']}</span>
 														</div>
 													{/capture}
-													{include file='helpers/tooltip.tpl' tooltip_content=$smarty.capture.refund_paid_tooltip allow_html=true}
+													{include file='helpers/tooltip.tpl' tooltip_content=$smarty.capture.refund_paid_tooltip }
 												</td>
 												{if !$isRefundCompleted}
 													<td>

From 99a38d620ec46dfed3919feb5fdaee1e563818e1 Mon Sep 17 00:00:00 2001
From: aradhana kumari <aradhana.kumari639@webkul.in>
Date: Mon, 17 Aug 2026 20:08:46 +0530
Subject: [PATCH 26/35] Update the tooltip according the core

Co-authored-by: Name <sumit201@webkul.in>
---
 .../orders/_stay_periods_tooltip.tpl          | 19 ++++--
 controllers/admin/AdminOrdersController.php   | 14 ++---
 js/admin/orders_stay_periods.js               | 62 -------------------
 3 files changed, 19 insertions(+), 76 deletions(-)
 delete mode 100644 js/admin/orders_stay_periods.js

diff --git a/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl b/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl
index 205a6b32e..dd4ef66b4 100644
--- a/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl
+++ b/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl
@@ -20,19 +20,28 @@
 * @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
 *}
 
-<div id="qlo-stay-period-tooltip-tpl" style="display:none">
-    <div class="bootstrap tooltip_cont qlo-stay-period-tooltip">
+{capture name='stay_periods_tooltip'}
+    <div class="bootstrap tooltip_cont">
         <div class="tip_header">
             <div>{l s='Stay Periods'}</div>
         </div>
-        <table class="table qlo-stay-period-table">
+        <table class="table">
             <thead>
                 <tr>
                     <th class="tip_element_head">{l s='Duration'}</th>
                     <th class="tip_element_head">{l s='Rooms'}</th>
                 </tr>
             </thead>
-            <tbody></tbody>
+            <tbody>
+                {foreach from=$stay_periods item=stay_period}
+                    <tr>
+                        <td class="tip_element_value">{$stay_period.from} &ndash; {$stay_period.to}</td>
+                        <td class="tip_element_value center">{$stay_period.count}</td>
+                    </tr>
+                {/foreach}
+            </tbody>
         </table>
     </div>
-</div>
+{/capture}
+<span class="badge tooltip-trigger">+{$extra_stay_periods_count}</span>
+<div class="tooltip-content" style="display: none;">{$smarty.capture.stay_periods_tooltip nofilter}</div>
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index fcc70705c..b0ad075b7 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -397,9 +397,11 @@ class AdminOrdersControllerCore extends AdminController
         $uniqueStayPeriods = count($stayPeriods);
 
         if ($uniqueStayPeriods > 1) {
-            $stayPeriodHtml .= ' <span class="badge qlo-stay-period-badge"'
-                .' data-stay-tip="'.htmlspecialchars(json_encode($stayPeriods)).'">+'
-                .($uniqueStayPeriods - 1).'</span>';
+            $this->context->smarty->assign(array(
+                'stay_periods' => $stayPeriods,
+                'extra_stay_periods_count' => $uniqueStayPeriods - 1,
+            ));
+            $stayPeriodHtml .= ' '.$this->createTemplate('_stay_periods_tooltip.tpl')->fetch();
         }
         return $stayPeriodHtml;
     }
@@ -1422,10 +1424,6 @@ class AdminOrdersControllerCore extends AdminController
         $this->addJqueryUI('ui.tooltip', 'base', true);
         $this->addJS(_PS_JS_DIR_.'vendor/d3.v3.min.js');
 
-        if ($this->display != 'view') {
-            $this->addJS(_PS_JS_DIR_.'admin/orders_stay_periods.js');
-        }
-
         if ($this->display == 'view') {
             if ($this->loadObject()) {
                 $this->addJS(_PS_JS_DIR_.'admin/orders.js');
@@ -1522,8 +1520,6 @@ class AdminOrdersControllerCore extends AdminController
             $this->content .= $this->context->smarty->fetch('controllers/orders/_resolvable_overbookings.tpl');
         }
 
-        $this->content .= $this->context->smarty->fetch('controllers/orders/_stay_periods_tooltip.tpl');
-
         if (Tools::isSubmit('submitBulkupdateOrderStatus'.$this->table)) {
             if (Tools::getIsset('cancel')) {
                 Tools::redirectAdmin(self::$currentIndex.'&token='.$this->token);
diff --git a/js/admin/orders_stay_periods.js b/js/admin/orders_stay_periods.js
deleted file mode 100644
index d3df55f9b..000000000
--- a/js/admin/orders_stay_periods.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License version 3.0
-* that is bundled with this package in the file LICENSE.md
-* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to support@qloapps.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade this module to a newer
-* versions in the future. If you wish to customize this module for your needs
-* please refer to https://store.webkul.com/customisation-guidelines for more information.
-*
-* @author Webkul IN
-* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
-*/
-
-$(document).ready(function () {
-    if (typeof window.initStayPeriodTooltips === 'undefined') {
-        window.initStayPeriodTooltips = function () {
-            if (typeof $.fn.tooltip === 'undefined' || typeof $.ui === 'undefined' || typeof $.ui.tooltip === 'undefined') {
-                return;
-            }
-            $('.qlo-stay-period-badge').each(function () {
-                if ($(this).data('ui-tooltip')) {
-                    return;
-                }
-                $(this).tooltip({
-                    items: '.qlo-stay-period-badge',
-                    content: function () {
-                        var periods = $(this).data('stay-tip');
-                        if (!periods || !periods.length) {
-                            return '';
-                        }
-                        var rows = $.map(periods, function (p) {
-                            return '<tr><td class="tip_element_value">' + p.from + ' – ' + p.to + '</td>'
-                                + '<td class="tip_element_value">' + p.count + '</td></tr>';
-                        }).join('');
-                        $('#qlo-stay-period-tooltip-tpl tbody').html(rows);
-                        return $('#qlo-stay-period-tooltip-tpl').html();
-                    },
-                    close: function (event, ui) {
-                        ui.tooltip.hover(function () {
-                            $(this).stop(true).fadeTo(300, 1);
-                        },
-                        function () {
-                            $(this).fadeOut('300', function () {
-                                $(this).remove();
-                            });
-                        });
-                    }
-                });
-            });
-        };
-    }
-    window.initStayPeriodTooltips();
-});

From 329e3023e8fa22ddee71f554a1076cacbd8ad170 Mon Sep 17 00:00:00 2001
From: azhar bhat <azharbhat.qlo098@webkul.in>
Date: Mon, 17 Aug 2026 20:43:43 +0530
Subject: [PATCH 27/35] fix: code optimization

---
 admin/themes/default/js/modernizr-loads.js    |   8 +-
 .../default/template/helpers/tooltip.tpl      |  10 +-
 .../views/js/admin/hotel_rooms_booking.js     | 126 +++++++++---------
 3 files changed, 73 insertions(+), 71 deletions(-)

diff --git a/admin/themes/default/js/modernizr-loads.js b/admin/themes/default/js/modernizr-loads.js
index aa738e542..2009122da 100644
--- a/admin/themes/default/js/modernizr-loads.js
+++ b/admin/themes/default/js/modernizr-loads.js
@@ -3,6 +3,10 @@ Modernizr.load([
 		test: window.matchMedia,
 		nope: ["themes/default/js/vendor/matchMedia.js", "themes/default/js/vendor/matchMedia.addListener.js"]
 	},
-	"themes/default/js/vendor/enquire.min.js",
-	"themes/default/js/admin-theme.js",
+	{
+		load: ["themes/default/js/vendor/enquire.min.js", "themes/default/js/admin-theme.js"],
+		complete: function() {
+			$(document).trigger('QloApps:adminThemeReady');
+		}
+	}
 ]);
\ No newline at end of file
diff --git a/admin/themes/default/template/helpers/tooltip.tpl b/admin/themes/default/template/helpers/tooltip.tpl
index 2f5571204..dde9e5866 100644
--- a/admin/themes/default/template/helpers/tooltip.tpl
+++ b/admin/themes/default/template/helpers/tooltip.tpl
@@ -21,14 +21,8 @@
 *}
 
 <span class="tooltip-trigger{if isset($tooltip_class) && $tooltip_class} {$tooltip_class|escape:'html':'UTF-8'}{/if}">
-	{if isset($tooltip_trigger_html) && $tooltip_trigger_html}
-		{$tooltip_trigger_html nofilter}
-	{elseif isset($tooltip_title) && $tooltip_title}
-		<span class="badge badge-primary">
-		{if isset($tooltip_icon_class) && $tooltip_icon_class}
-			<i class="{$tooltip_icon_class|escape:'html':'UTF-8'}"{if isset($tooltip_icon_style) && $tooltip_icon_style} style="{$tooltip_icon_style|escape:'html':'UTF-8'}"{/if}></i>
-		{/if}
-		{$tooltip_title|escape:'html':'UTF-8'}</span>
+	{if isset($tooltip_title) && $tooltip_title}
+		{$tooltip_title nofilter}
 	{elseif isset($tooltip_icon_class) && $tooltip_icon_class}
 		<i class="{$tooltip_icon_class|escape:'html':'UTF-8'}"{if isset($tooltip_icon_style) && $tooltip_icon_style} style="{$tooltip_icon_style|escape:'html':'UTF-8'}"{/if}></i>
 	{else}
diff --git a/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js b/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js
index 79d4bb846..5017805f5 100644
--- a/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js
+++ b/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js
@@ -23,9 +23,9 @@
 $(document).ready(function() {
 
     // calender
-   
-     if ($('#fullcalendar').length) {
-        var calendar = new FullCalendar.Calendar($('#fullcalendar').get(0), {
+    var calendar;
+    function initBookingCalendar() {
+        calendar = new FullCalendar.Calendar($('#fullcalendar').get(0), {
             initialView: 'dayGridMonth',
             initialDate: initialDate,
             events: {
@@ -54,70 +54,66 @@ $(document).ready(function() {
                 if (info.event.extendedProps.is_notification) {
                     var $cell = $(info.el).closest('td');
                     $cell.css('background-color', info.event.backgroundColor);
-                    if (typeof initTooltip === 'function') {
-                        initTooltip($cell, function() {
-                            $('#date-stats-tooltop .tip_date').text(info.event.extendedProps.data.date_format);
-                            $.each(info.event.extendedProps.data.stats, function(elem, val) {
-                                if (elem == 'num_part_avai') {
-                                    $('#date-stats-tooltop').find('.'+elem).hide().find('.tip_element_value').text('');
-                                } else {
-                                    $('#date-stats-tooltop').find('.'+elem).show().find('.tip_element_value').text(val);
-                                }
-                            });
-                            return $('#date-stats-tooltop').html();
-                        }, 'td');
-                        $cell.tooltip('option', {
-                            position: {
-                                my: "left top",
-                                at: "left+50% bottom-50%",
-                                collision: "flipfit"
-                            },
-                            open: function(event, ui)
-                            {
-                                if(event.buttons == 1 || event.buttons == 3){
-                                    ui.tooltip.remove();
-                                }
-
-                                if (typeof(event.originalEvent) === 'undefined') {
-                                    return false;
-                                }
-
-                                // suppress cell tooltip when hovering the search result bar
-                                if ($(event.originalEvent.target).closest('.search-result-event').length) {
-                                    ui.tooltip.remove();
-                                    $(this).removeData('ui-tooltip-id').removeAttr('aria-describedby');
-                                    return false;
-                                }
-
-                                var $id = $(ui.tooltip).attr('id');
-
-                                // close any lingering tooltips
-                                if ($('div.ui-tooltip').not('#' + $id).length) {
-                                    return false;
-                                }
+                    initTooltip($cell, function() {
+                        $('#date-stats-tooltop .tip_date').text(info.event.extendedProps.data.date_format);
+                        $.each(info.event.extendedProps.data.stats, function(elem, val) {
+                            if (elem == 'num_part_avai') {
+                                $('#date-stats-tooltop').find('.'+elem).hide().find('.tip_element_value').text('');
+                            } else {
+                                $('#date-stats-tooltop').find('.'+elem).show().find('.tip_element_value').text(val);
                             }
                         });
-                    }
+                        return $('#date-stats-tooltop').html();
+                    }, 'td');
+                    $cell.tooltip('option', {
+                        position: {
+                            my: "left top",
+                            at: "left+50% bottom-50%",
+                            collision: "flipfit"
+                        },
+                        open: function(event, ui)
+                        {
+                            if(event.buttons == 1 || event.buttons == 3){
+                                ui.tooltip.remove();
+                            }
+
+                            if (typeof(event.originalEvent) === 'undefined') {
+                                return false;
+                            }
+
+                            // suppress cell tooltip when hovering the search result bar
+                            if ($(event.originalEvent.target).closest('.search-result-event').length) {
+                                ui.tooltip.remove();
+                                $(this).removeData('ui-tooltip-id').removeAttr('aria-describedby');
+                                return false;
+                            }
+
+                            var $id = $(ui.tooltip).attr('id');
+
+                            // close any lingering tooltips
+                            if ($('div.ui-tooltip').not('#' + $id).length) {
+                                return false;
+                            }
+                        }
+                    });
                 } else {
                     $(info.el).addClass('search-result-event');
-                    if (typeof initTooltip === 'function') {
-                        initTooltip($(info.el), function() {
-                            $('#date-stats-tooltop .tip_date').text(info.event.extendedProps.data.date_from_format + ' - ' +info.event.extendedProps.data.date_to_format);
-                            $.each(info.event.extendedProps.data.stats, function(elem, val) {
-                                if (elem == 'num_part_avai') {
-                                    if (val > 0) {
-                                        $('#date-stats-tooltop').find('.'+elem).show().find('.tip_element_value').text(val);
-                                    } else {
-                                        $('#date-stats-tooltop').find('.'+elem).hide().find('.tip_element_value').text('');
-                                    }
+                    initTooltip($(info.el), function() {
+                        $('#date-stats-tooltop .tip_date').text(info.event.extendedProps.data.date_from_format + ' - ' +info.event.extendedProps.data.date_to_format);
+                        $.each(info.event.extendedProps.data.stats, function(elem, val) {
+                            if (elem == 'num_part_avai') {
+                                if (val > 0) {
+                                    $('#date-stats-tooltop').find('.'+elem).show().find('.tip_element_value').text(val);
                                 } else {
-                                    $('#date-stats-tooltop').find('.'+elem).find('.tip_element_value').text(val);
+                                    $('#date-stats-tooltop').find('.'+elem).hide().find('.tip_element_value').text('');
                                 }
-                            });
-                            return $('#date-stats-tooltop').html();
-                        }, 'div');
-                        $(info.el).tooltip('option', 'track', true);
-                    }
+                            } else {
+                                $('#date-stats-tooltop').find('.'+elem).find('.tip_element_value').text(val);
+                            }
+                        });
+                        return $('#date-stats-tooltop').html();
+                    }, 'div');
+                    $(info.el).tooltip('option', 'track', true);
                     info.el.style.borderLeftColor = info.event.extendedProps.data.eventColor;
                     resizeSearchResultEventBar($(info.el));
                 }
@@ -141,6 +137,14 @@ $(document).ready(function() {
         });
     }
 
+    if ($('#fullcalendar').length) {
+        if (typeof initTooltip === 'function') {
+            initBookingCalendar();
+        } else {
+            $(document).on('QloApps:adminThemeReady', initBookingCalendar);
+        }
+    }
+
     function resizeSearchResultEventBar($bar) {
         requestAnimationFrame(function() {
             var $td = $bar.closest('td');

From fec4938fc031b0b14eed3fa2bc2c94c997cec956 Mon Sep 17 00:00:00 2001
From: azhar bhat <azharbhat.qlo098@webkul.in>
Date: Tue, 18 Aug 2026 12:24:47 +0530
Subject: [PATCH 28/35] Correct: function names

Co-authored-by: Name <sumit201@webkul.in>
---
 admin/themes/default/js/modernizr-loads.js                      | 2 +-
 .../views/js/admin/hotel_rooms_booking.js                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/themes/default/js/modernizr-loads.js b/admin/themes/default/js/modernizr-loads.js
index 2009122da..f4142963e 100644
--- a/admin/themes/default/js/modernizr-loads.js
+++ b/admin/themes/default/js/modernizr-loads.js
@@ -6,7 +6,7 @@ Modernizr.load([
 	{
 		load: ["themes/default/js/vendor/enquire.min.js", "themes/default/js/admin-theme.js"],
 		complete: function() {
-			$(document).trigger('QloApps:adminThemeReady');
+			$(document).trigger('admin-theme.js.ready');
 		}
 	}
 ]);
\ No newline at end of file
diff --git a/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js b/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js
index 5017805f5..8d37728d8 100644
--- a/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js
+++ b/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js
@@ -141,7 +141,7 @@ $(document).ready(function() {
         if (typeof initTooltip === 'function') {
             initBookingCalendar();
         } else {
-            $(document).on('QloApps:adminThemeReady', initBookingCalendar);
+            $(document).on('admin-theme.js.ready', initBookingCalendar);
         }
     }
 

From a42b645c3b1b548ad213569048fd0f6dae55676f Mon Sep 17 00:00:00 2001
From: aradhana kumari <aradhana.kumari639@webkul.in>
Date: Tue, 18 Aug 2026 13:17:41 +0530
Subject: [PATCH 29/35] Update the tooltip file according to other tooltip

Co-authored-by: Name <sumit201@webkul.in>
---
 .../template/controllers/orders/_stay_periods_tooltip.tpl     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl b/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl
index dd4ef66b4..eb98c6735 100644
--- a/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl
+++ b/admin/themes/default/template/controllers/orders/_stay_periods_tooltip.tpl
@@ -43,5 +43,5 @@
         </table>
     </div>
 {/capture}
-<span class="badge tooltip-trigger">+{$extra_stay_periods_count}</span>
-<div class="tooltip-content" style="display: none;">{$smarty.capture.stay_periods_tooltip nofilter}</div>
+{capture name='stay_periods_tooltip_title'}<span class="badge tooltip-trigger">+{$extra_stay_periods_count}</span>{/capture}
+{include file='helpers/tooltip.tpl' tooltip_content=$smarty.capture.stay_periods_tooltip tooltip_title=$smarty.capture.stay_periods_tooltip_title}

From ed6bc80e371cf9e05659479d9d7a35abae8d6e54 Mon Sep 17 00:00:00 2001
From: azhar bhat <azharbhat.qlo098@webkul.in>
Date: Tue, 18 Aug 2026 19:26:25 +0530
Subject: [PATCH 30/35] fixed : make map id optional

---
 controllers/front/ContactController.php       |  4 +-
 controllers/front/GuestTrackingController.php |  3 +-
 controllers/front/OrderDetailController.php   |  3 +-
 controllers/front/OurPropertiesController.php |  6 +--
 controllers/front/ProductController.php       |  6 +--
 .../classes/HotelBranchInformation.php        |  4 +-
 .../admin/AdminAddHotelController.php         | 12 +++---
 .../AdminHotelGeneralSettingsController.php   |  9 ++---
 .../hotelreservationsystem.php                |  2 +-
 .../views/js/HotelReservationAdmin.js         | 38 +++++++++++++------
 .../views/js/searchResultsMap.js              | 31 ++++++++++-----
 .../js/contact-form.js                        | 23 +++++++----
 .../js/order-detail.js                        | 31 ++++++++++-----
 .../js/our-properties.js                      | 23 +++++++----
 themes/hotel-reservation-theme/js/product.js  | 28 ++++++++++----
 15 files changed, 144 insertions(+), 79 deletions(-)

diff --git a/controllers/front/ContactController.php b/controllers/front/ContactController.php
index 1014a8b5f..acb21798d 100644
--- a/controllers/front/ContactController.php
+++ b/controllers/front/ContactController.php
@@ -237,11 +237,11 @@ class ContactControllerCore extends FrontController
         $this->addJS(_PS_JS_DIR_.'validate.js');
 
         // GOOGLE MAP
-        if (($PS_API_KEY = Configuration::get('PS_API_KEY')) && ($PS_MAP_ID = Configuration::get('PS_MAP_ID')) && Configuration::get('WK_GOOGLE_ACTIVE_MAP')) {
+        if (($PS_API_KEY = Configuration::get('PS_API_KEY')) && Configuration::get('WK_GOOGLE_ACTIVE_MAP')) {
             Media::addJsDef(
                 array(
                     'PS_STORES_ICON' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_STORES_ICON')),
-                    'PS_MAP_ID' => $PS_MAP_ID,
+                    'PS_MAP_ID' => Configuration::get('PS_MAP_ID'),
                 )
             );
             $this->addJS(
diff --git a/controllers/front/GuestTrackingController.php b/controllers/front/GuestTrackingController.php
index 596d54185..c685eb430 100644
--- a/controllers/front/GuestTrackingController.php
+++ b/controllers/front/GuestTrackingController.php
@@ -639,7 +639,6 @@ class GuestTrackingControllerCore extends FrontController
                             if (Validate::isLoadedObject($objHotelBranchInformation)) {
                                 if (($apiKey = Configuration::get('PS_API_KEY'))
                                     && Configuration::get('WK_GOOGLE_ACTIVE_MAP')
-                                    && ($PS_MAP_ID = Configuration::get('PS_MAP_ID'))
                                 ) {
                                     if (floatval($objHotelBranchInformation->latitude) != 0
                                         && floatval($objHotelBranchInformation->longitude) != 0
@@ -647,7 +646,7 @@ class GuestTrackingControllerCore extends FrontController
                                         Media::addJsDef(array(
                                             'PS_STORES_ICON' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_STORES_ICON')),
                                             'initiateMap' => 1,
-                                            'PS_MAP_ID' => $PS_MAP_ID,
+                                            'PS_MAP_ID' => Configuration::get('PS_MAP_ID'),
                                         ));
 
                                         $this->addJS(
diff --git a/controllers/front/OrderDetailController.php b/controllers/front/OrderDetailController.php
index 5696c7e39..217d296f4 100644
--- a/controllers/front/OrderDetailController.php
+++ b/controllers/front/OrderDetailController.php
@@ -884,7 +884,6 @@ class OrderDetailControllerCore extends FrontController
                 if (Validate::isLoadedObject($objHotelBranchInformation)) {
                     if (($apiKey = Configuration::get('PS_API_KEY'))
                         && Configuration::get('WK_GOOGLE_ACTIVE_MAP')
-                        && ($PS_MAP_ID = Configuration::get('PS_MAP_ID'))
                     ) {
                         if (floatval($objHotelBranchInformation->latitude) != 0
                             && floatval($objHotelBranchInformation->longitude) != 0
@@ -892,7 +891,7 @@ class OrderDetailControllerCore extends FrontController
                             Media::addJsDef(array(
                                 'PS_STORES_ICON' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_STORES_ICON')),
                                 'initiateMap' => 1,
-                                'PS_MAP_ID' => $PS_MAP_ID,
+                                'PS_MAP_ID' => Configuration::get('PS_MAP_ID'),
                             ));
                             $this->addJS(
                                 'https://maps.googleapis.com/maps/api/js?key='.$apiKey.'&libraries=places,marker&loading=async&callback=initMap&language='.
diff --git a/controllers/front/OurPropertiesController.php b/controllers/front/OurPropertiesController.php
index 52fd94a86..06520f044 100644
--- a/controllers/front/OurPropertiesController.php
+++ b/controllers/front/OurPropertiesController.php
@@ -111,7 +111,7 @@ class OurPropertiesControllerCore extends FrontController
                 $hotelsInfo = array_slice($hotelsInfo, $page * 10, 10);
             }
 
-            if ($displayHotelMap && Configuration::get('PS_API_KEY') && Configuration::get('WK_GOOGLE_ACTIVE_MAP') && Configuration::get('PS_MAP_ID')) {
+            if ($displayHotelMap && Configuration::get('PS_API_KEY') && Configuration::get('WK_GOOGLE_ACTIVE_MAP')) {
                 if ($hotelLocations = $objHotelInfo->getMapFormatHotelsInfo(Configuration::get('WK_MAP_HOTEL_ACTIVE_ONLY'))) {
                     $hotelLocationArray = str_replace(array('\n', '\r'), '', json_encode($hotelLocations));
                 }
@@ -144,11 +144,11 @@ class OurPropertiesControllerCore extends FrontController
         $this->addJS(_THEME_JS_DIR_.'our-properties.js');
         $this->addCSS(_THEME_CSS_DIR_.'our-properties.css');
         // GOOGLE MAP
-        if (($PS_API_KEY = Configuration::get('PS_API_KEY')) && ($PS_MAP_ID = Configuration::get('PS_MAP_ID')) && Configuration::get('WK_GOOGLE_ACTIVE_MAP')) {
+        if (($PS_API_KEY = Configuration::get('PS_API_KEY')) && Configuration::get('WK_GOOGLE_ACTIVE_MAP')) {
             Media::addJsDef(
                 array(
                     'PS_STORES_ICON' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_STORES_ICON')),
-                    'PS_MAP_ID' => $PS_MAP_ID
+                    'PS_MAP_ID' => Configuration::get('PS_MAP_ID')
                 )
             );
 
diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php
index 7430e93dd..decd83c62 100644
--- a/controllers/front/ProductController.php
+++ b/controllers/front/ProductController.php
@@ -66,9 +66,7 @@ class ProductControllerCore extends FrontController
             $this->addJqueryPlugin('jqzoom');
         }
 
-        if (($PS_API_KEY = Configuration::get('PS_API_KEY'))
-            && ($PS_MAP_ID = Configuration::get('PS_MAP_ID'))
-        ) {
+        if ($PS_API_KEY = Configuration::get('PS_API_KEY')) {
             $objHotelRoomType = new HotelRoomType();
             if ($roomTypeInfo = $objHotelRoomType->getRoomTypeInfoByIdProduct($this->product->id)) {
                 $objHotelBranchInformation = new HotelBranchInformation($roomTypeInfo['id_hotel']);
@@ -81,7 +79,7 @@ class ProductControllerCore extends FrontController
                             'longitude' => $objHotelBranchInformation->longitude,
                         ),
                         'PS_STORES_ICON' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_STORES_ICON')),
-                        'PS_MAP_ID' => $PS_MAP_ID
+                        'PS_MAP_ID' => Configuration::get('PS_MAP_ID')
                     ));
 
                     $this->addJS(
diff --git a/modules/hotelreservationsystem/classes/HotelBranchInformation.php b/modules/hotelreservationsystem/classes/HotelBranchInformation.php
index 802ae8a5e..61083fde1 100644
--- a/modules/hotelreservationsystem/classes/HotelBranchInformation.php
+++ b/modules/hotelreservationsystem/classes/HotelBranchInformation.php
@@ -55,8 +55,8 @@ class HotelBranchInformation extends ObjectModel
             'check_in' => array('type' => self::TYPE_STRING, 'required' => true),
             'check_out' => array('type' => self::TYPE_STRING, 'required' => true),
             'active' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
-            'latitude' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat'),
-            'longitude' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat'),
+            'latitude' => array('type' => self::TYPE_FLOAT, 'validate' => 'isCoordinate'),
+            'longitude' => array('type' => self::TYPE_FLOAT, 'validate' => 'isCoordinate'),
             'map_formated_address' => array('type' => self::TYPE_HTML, 'validate' => 'isCleanHtml'),
             'map_input_text' => array('type' => self::TYPE_STRING, 'validate' => 'isString'),
             'active_refund' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
diff --git a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php
index 020227614..9ebe57852 100644
--- a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php
@@ -211,7 +211,7 @@ class AdminAddHotelController extends ModuleAdminController
         }
 
         $smartyVars['state_var'] = $stateOptions;
-        $smartyVars['enabledDisplayMap'] = Configuration::get('PS_API_KEY') && Configuration::get('PS_MAP_ID') && Configuration::get('WK_GOOGLE_ACTIVE_MAP');
+        $smartyVars['enabledDisplayMap'] = Configuration::get('PS_API_KEY') && Configuration::get('WK_GOOGLE_ACTIVE_MAP');
         $smartyVars['ps_img_dir'] = _PS_IMG_.'l/';
         $smartyVars['PS_MAX_CHECKOUT_OFFSET'] = (int) Configuration::get('PS_MAX_CHECKOUT_OFFSET');
         $smartyVars['PS_MIN_BOOKING_OFFSET'] = (int) Configuration::get('PS_MIN_BOOKING_OFFSET');
@@ -258,8 +258,8 @@ class AdminAddHotelController extends ModuleAdminController
         $maxCheckoutOffset = trim(Tools::getValue('max_checkout_offset'));
         $enableUseGlobalMinBookingOffset = Tools::getValue('enable_use_global_min_booking_offset');
         $minBookingOffset = trim(Tools::getValue('min_booking_offset'));
-        $latitude = Tools::getValue('loclatitude');
-        $longitude = Tools::getValue('loclongitude');
+        $latitude = number_format((float) Tools::getValue('loclatitude'), 8, '.', '');
+        $longitude = number_format((float) Tools::getValue('loclongitude'), 8, '.', '');
         $map_formated_address = Tools::getValue('locformatedAddr');
         $map_input_text = Tools::getValue('googleInputField');
         $hotelAmenities = Tools::getValue('id_amenities', array());
@@ -610,8 +610,8 @@ class AdminAddHotelController extends ModuleAdminController
             $objHotelBranch->check_in = $check_in;
             $objHotelBranch->check_out = $check_out;
             $objHotelBranch->rating = $rating;
-            $objHotelBranch->latitude = Validate::isFloat($latitude) ? Tools::ps_round($latitude, 8) : $latitude;
-            $objHotelBranch->longitude = Validate::isFloat($longitude) ? Tools::ps_round($longitude, 8) : $longitude;
+            $objHotelBranch->latitude = Validate::isCoordinate($latitude) ? Tools::ps_round($latitude, 8) : $latitude;
+            $objHotelBranch->longitude = Validate::isCoordinate($longitude) ? Tools::ps_round($longitude, 8) : $longitude;
             $objHotelBranch->map_formated_address = $map_formated_address;
             $objHotelBranch->map_input_text = $map_input_text;
             $objHotelBranch->save();
@@ -994,7 +994,7 @@ class AdminAddHotelController extends ModuleAdminController
         // GOOGLE MAP
         $language = $this->context->language;
         $country = $this->context->country;
-        if (($PS_API_KEY = Configuration::get('PS_API_KEY')) && $PS_MAP_ID) {
+        if ($PS_API_KEY = Configuration::get('PS_API_KEY')) {
             $this->addJS(
                 'https://maps.googleapis.com/maps/api/js?key='.$PS_API_KEY.'&libraries=places,marker&loading=async&language='.
                 $language->iso_code.'&region='.$country->iso_code.'&callback=initGoogleMaps'
diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php
index c59bd79a8..8f0b51084 100644
--- a/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php
@@ -398,13 +398,15 @@ class AdminHotelGeneralSettingsController extends ModuleAdminController
                     'PS_API_KEY' => array(
                         'title' => $this->l('Google Maps API Key'),
                         'hint' => $this->l('Unique API key for Google Maps.'),
+                        'validation' => 'isGenericName',
                         'type' => 'text',
                     ),
                     'PS_MAP_ID' => array(
                         'title' => $this->l('Google Map ID'),
-                        'hint' => $this->l('Map Id for Google Maps.'),
+                        'hint' => $this->l('Map Id for Google Maps (optional).'),
+                        'validation' => 'isGenericName',
                         'type' => 'text',
-                        'desc' => $this->l('Google Maps API Key and Google Map ID is required to display Google Maps.')
+                        'desc' => $this->l('Google Maps API Key is required to display Google Maps. Google Map ID is optional.')
                     ),
                     'WK_GOOGLE_ACTIVE_MAP' => array(
                         'title' => $this->l('Display Google Maps For Hotel Location'),
@@ -621,9 +623,6 @@ class AdminHotelGeneralSettingsController extends ModuleAdminController
                 if (!Tools::getValue('PS_API_KEY')) {
                     $this->errors[] = $this->l('Please enter Google API key.');
                 }
-                if (!Tools::getValue('PS_MAP_ID')) {
-                    $this->errors[] = $this->l('Please enter Google Map Id.');
-                }
             }
             if (!trim(Tools::getValue('PS_SHOP_NAME'))) {
                 $this->errors[] = $this->l('Website name field is required');
diff --git a/modules/hotelreservationsystem/hotelreservationsystem.php b/modules/hotelreservationsystem/hotelreservationsystem.php
index 2c4e74ced..9b35b1b0d 100644
--- a/modules/hotelreservationsystem/hotelreservationsystem.php
+++ b/modules/hotelreservationsystem/hotelreservationsystem.php
@@ -288,8 +288,8 @@ class HotelReservationSystem extends Module
         if (Tools::getValue('controller') == 'category') {
             if (($apiKey = Configuration::get('PS_API_KEY'))
                 && Configuration::get('WK_GOOGLE_ACTIVE_MAP')
-                && ($PS_MAP_ID = Configuration::get('PS_MAP_ID'))
             ) {
+                $PS_MAP_ID = Configuration::get('PS_MAP_ID');
                 $idCategory = Tools::getValue('id_category');
                 $idHotel = HotelBranchInformation::getHotelIdByIdCategory($idCategory);
                 $objHotel = new HotelBranchInformation($idHotel, $this->context->language->id);
diff --git a/modules/hotelreservationsystem/views/js/HotelReservationAdmin.js b/modules/hotelreservationsystem/views/js/HotelReservationAdmin.js
index 4faafa4da..d90a1246a 100644
--- a/modules/hotelreservationsystem/views/js/HotelReservationAdmin.js
+++ b/modules/hotelreservationsystem/views/js/HotelReservationAdmin.js
@@ -84,11 +84,15 @@ var GoogleMapsManager = {
         if (!this.map) {
             var that = this;
             that.setDefaultLatLng(function() {
-                that.map = new google.maps.Map($(that.mapDiv).get(0), {
+                var mapOptions = {
                     zoom: that.defaultZoom,
                     clickableIcons: true,
-                    mapId: PS_MAP_ID
-                });
+                };
+                if (PS_MAP_ID) {
+                    mapOptions.mapId = PS_MAP_ID;
+                }
+                that.map = new google.maps.Map($(that.mapDiv).get(0), mapOptions);
+                google.maps.event.trigger(that.map, 'resize');
                 that.map.setCenter(that.defaultLatLng);
                 if (that.defaultLatLng && that.formattedAddress) {
                     that.addMarker(that.defaultLatLng, null, that.formattedAddress);
@@ -171,12 +175,22 @@ var GoogleMapsManager = {
         icon.style.width = '24px';
         icon.style.height = '24px';
 
-        var marker = new google.maps.marker.AdvancedMarkerElement({
-            position: latLng,
-            map: that.map,
-            content: icon,
-            draggable: true,
-        });
+        var marker;
+        if (PS_MAP_ID) {
+            marker = new google.maps.marker.AdvancedMarkerElement({
+                position: latLng,
+                map: that.map,
+                content: icon,
+                draggable: true,
+            });
+        } else {
+            marker = new google.maps.Marker({
+                position: latLng,
+                map: that.map,
+                icon: PS_STORES_ICON,
+                draggable: true,
+            });
+        }
         that.markers.push(marker);
         marker.addListener('dragend', function(e) {
             var latLng = {
@@ -234,10 +248,10 @@ var GoogleMapsManager = {
                 that.clearAllMarkers();
             });
 
-            var latLng = marker.position;
+            var latLng = marker.position ? marker.position : marker.getPosition();
             that.setFormVars({
-                lat: latLng.lat,
-                lng: latLng.lng,
+                lat: typeof latLng.lat === 'function' ? latLng.lat() : latLng.lat,
+                lng: typeof latLng.lng === 'function' ? latLng.lng() : latLng.lng,
                 formattedAddress: content,
                 inputText: $('#pac-input').val(),
             });
diff --git a/modules/hotelreservationsystem/views/js/searchResultsMap.js b/modules/hotelreservationsystem/views/js/searchResultsMap.js
index 766466446..522c00986 100644
--- a/modules/hotelreservationsystem/views/js/searchResultsMap.js
+++ b/modules/hotelreservationsystem/views/js/searchResultsMap.js
@@ -26,25 +26,38 @@ function initMap() {
         lng: Number(hotel_location.longitude),
     };
 
-    const map = new google.maps.Map($('#search-results-wrap .map-wrap').get(0), {
+    const mapOptions = {
         zoom: 10,
         center: hotelLocation,
         disableDefaultUI: true,
         fullscreenControl: true,
-        mapId: PS_MAP_ID
-    });
+    };
+    if (PS_MAP_ID) {
+        mapOptions.mapId = PS_MAP_ID;
+    }
+    const map = new google.maps.Map($('#search-results-wrap .map-wrap').get(0), mapOptions);
 
     let icon = document.createElement('img');
     icon.src = PS_STORES_ICON;
     icon.style.width = '24px';
     icon.style.height = '24px';
 
-    const marker = new google.maps.marker.AdvancedMarkerElement({
-        map: map,
-        position: hotelLocation,
-        title: location.hotel_name,
-        content: icon,
-    });
+    let marker;
+    if (PS_MAP_ID) {
+        marker = new google.maps.marker.AdvancedMarkerElement({
+            map: map,
+            position: hotelLocation,
+            title: location.hotel_name,
+            content: icon,
+        });
+    } else {
+        marker = new google.maps.Marker({
+            map: map,
+            position: hotelLocation,
+            title: location.hotel_name,
+            icon: PS_STORES_ICON,
+        });
+    }
 
     marker.query = location.query || null;
     marker.latitude = hotelLocation.lat;
diff --git a/themes/hotel-reservation-theme/js/contact-form.js b/themes/hotel-reservation-theme/js/contact-form.js
index 9b16260d5..e4bb06eff 100644
--- a/themes/hotel-reservation-theme/js/contact-form.js
+++ b/themes/hotel-reservation-theme/js/contact-form.js
@@ -66,7 +66,7 @@ function initMap() {
     hotelLocationArray = JSON.parse(hotelLocationArray);
 
     // Display a map on the page
-    map = new google.maps.Map(document.getElementById("map"), {mapId: PS_MAP_ID});
+    map = new google.maps.Map(document.getElementById("map"), PS_MAP_ID ? {mapId: PS_MAP_ID} : {});
     google.maps.event.trigger(map, 'resize');
 
     map.setTilt(45);
@@ -84,12 +84,21 @@ function initMap() {
         icon.style.width = '24px';
         icon.style.height = '24px';
 
-        marker = new google.maps.marker.AdvancedMarkerElement({
-            map: map,
-            position: position,
-            title: location.hotel_name,
-            content: icon,
-        });
+        if (PS_MAP_ID) {
+            marker = new google.maps.marker.AdvancedMarkerElement({
+                map: map,
+                position: position,
+                title: location.hotel_name,
+                content: icon,
+            });
+        } else {
+            marker = new google.maps.Marker({
+                map: map,
+                position: position,
+                title: location.hotel_name,
+                icon: PS_STORES_ICON,
+            });
+        }
         // Allow each marker to have an info window
         google.maps.event.addListener(marker, 'click', (function(marker, i) {
             return function() {
diff --git a/themes/hotel-reservation-theme/js/order-detail.js b/themes/hotel-reservation-theme/js/order-detail.js
index 0aa0c0e63..26b9e5a32 100644
--- a/themes/hotel-reservation-theme/js/order-detail.js
+++ b/themes/hotel-reservation-theme/js/order-detail.js
@@ -139,25 +139,38 @@ function initMap() {
             lat: Number($(this).attr('latitude')),
             lng: Number($(this).attr('longitude')),
         };
-        const map = new google.maps.Map(element, {
+        const mapOptions = {
             zoom: 10,
             center: hotelLocation,
             disableDefaultUI: true,
             fullscreenControl: true,
-            mapId: PS_MAP_ID
-        });
+        };
+        if (PS_MAP_ID) {
+            mapOptions.mapId = PS_MAP_ID;
+        }
+        const map = new google.maps.Map(element, mapOptions);
 
         let icon = document.createElement('img');
         icon.src = PS_STORES_ICON;
         icon.style.width = '24px';
         icon.style.height = '24px';
 
-        const marker = new google.maps.marker.AdvancedMarkerElement({
-            position: hotelLocation,
-            map: map,
-            title: location.hotel_name,
-            content: icon,
-        });
+        let marker;
+        if (PS_MAP_ID) {
+            marker = new google.maps.marker.AdvancedMarkerElement({
+                position: hotelLocation,
+                map: map,
+                title: location.hotel_name,
+                content: icon,
+            });
+        } else {
+            marker = new google.maps.Marker({
+                position: hotelLocation,
+                map: map,
+                title: location.hotel_name,
+                icon: PS_STORES_ICON,
+            });
+        }
 
         marker.query = location.query || null;
         marker.latitude = hotelLocation.lat;
diff --git a/themes/hotel-reservation-theme/js/our-properties.js b/themes/hotel-reservation-theme/js/our-properties.js
index 81a0d0be9..3fe12ac2c 100644
--- a/themes/hotel-reservation-theme/js/our-properties.js
+++ b/themes/hotel-reservation-theme/js/our-properties.js
@@ -34,7 +34,7 @@ function initMap() {
     hotelLocationArray = JSON.parse(hotelLocationArray);
 
     // Display a map on the page
-    map = new google.maps.Map(document.getElementById("map"), {mapId: PS_MAP_ID});
+    map = new google.maps.Map(document.getElementById("map"), PS_MAP_ID ? {mapId: PS_MAP_ID} : {});
     google.maps.event.trigger(map, 'resize');
 
     map.setTilt(45);
@@ -52,12 +52,21 @@ function initMap() {
         icon.style.width = '24px';
         icon.style.height = '24px';
 
-        marker = new google.maps.marker.AdvancedMarkerElement({
-            map: map,
-            position: position,
-            title: location.hotel_name,
-            content: icon,
-        });
+        if (PS_MAP_ID) {
+            marker = new google.maps.marker.AdvancedMarkerElement({
+                map: map,
+                position: position,
+                title: location.hotel_name,
+                content: icon,
+            });
+        } else {
+            marker = new google.maps.Marker({
+                map: map,
+                position: position,
+                title: location.hotel_name,
+                icon: PS_STORES_ICON,
+            });
+        }
 
         // Allow each marker to have an info window
         google.maps.event.addListener(marker, 'click', (function(marker, i) {
diff --git a/themes/hotel-reservation-theme/js/product.js b/themes/hotel-reservation-theme/js/product.js
index b0771177c..d7f482e49 100644
--- a/themes/hotel-reservation-theme/js/product.js
+++ b/themes/hotel-reservation-theme/js/product.js
@@ -1310,11 +1310,14 @@ function updateRoomServiceQuantity(that) {
 
 
 function initMap() {
-    const map = new google.maps.Map($('#room_type_map_tab .map-wrap').get(0), {
+    const mapOptions = {
         zoom: 10,
         streetViewControl: false,
-        mapId: PS_MAP_ID
-    });
+    };
+    if (PS_MAP_ID) {
+        mapOptions.mapId = PS_MAP_ID;
+    }
+    const map = new google.maps.Map($('#room_type_map_tab .map-wrap').get(0), mapOptions);
 
     const hotelLatLng = {
         lat: Number(hotel_location.latitude),
@@ -1326,11 +1329,20 @@ function initMap() {
     icon.src = PS_STORES_ICON;
     icon.style.width = '24px';
     icon.style.height = '24px';
-    let marker = new google.maps.marker.AdvancedMarkerElement({
-        position: hotelLatLng,
-        map: map,
-        content: icon,
-    });
+    let marker;
+    if (PS_MAP_ID) {
+        marker = new google.maps.marker.AdvancedMarkerElement({
+            position: hotelLatLng,
+            map: map,
+            content: icon,
+        });
+    } else {
+        marker = new google.maps.Marker({
+            position: hotelLatLng,
+            map: map,
+            icon: PS_STORES_ICON,
+        });
+    }
 
     const uiContent = $('#room-info-map-ui-content .hotel-info-wrap').get(0);
     map.controls[google.maps.ControlPosition.LEFT_TOP].push(uiContent);

From ba05c440c30c6717850e4ba6dc31910981d06ef9 Mon Sep 17 00:00:00 2001
From: azhar bhat <azharbhat.qlo098@webkul.in>
Date: Thu, 20 Aug 2026 11:04:51 +0530
Subject: [PATCH 31/35] text chanes

---
 .../controllers/admin/AdminHotelGeneralSettingsController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php
index 8f0b51084..40b356f49 100644
--- a/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php
@@ -400,13 +400,13 @@ class AdminHotelGeneralSettingsController extends ModuleAdminController
                         'hint' => $this->l('Unique API key for Google Maps.'),
                         'validation' => 'isGenericName',
                         'type' => 'text',
+                        'desc' => $this->l('Google Maps API Key is required to display Google Maps.')
                     ),
                     'PS_MAP_ID' => array(
                         'title' => $this->l('Google Map ID'),
                         'hint' => $this->l('Map Id for Google Maps (optional).'),
                         'validation' => 'isGenericName',
-                        'type' => 'text',
-                        'desc' => $this->l('Google Maps API Key is required to display Google Maps. Google Map ID is optional.')
+                        'type' => 'text'
                     ),
                     'WK_GOOGLE_ACTIVE_MAP' => array(
                         'title' => $this->l('Display Google Maps For Hotel Location'),

From e0854a8edf6b384f831a80ef4261cbb6fe1d9d91 Mon Sep 17 00:00:00 2001
From: aradhana kumari <aradhana.kumari639@webkul.in>
Date: Thu, 20 Aug 2026 20:18:39 +0530
Subject: [PATCH 32/35] Check pdf content

---
 .../classes/HotelBookingDocument.php           | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/modules/hotelreservationsystem/classes/HotelBookingDocument.php b/modules/hotelreservationsystem/classes/HotelBookingDocument.php
index e38de91dc..3567440e7 100644
--- a/modules/hotelreservationsystem/classes/HotelBookingDocument.php
+++ b/modules/hotelreservationsystem/classes/HotelBookingDocument.php
@@ -138,9 +138,14 @@ class HotelBookingDocument extends ObjectModel
 
     public function setFileType()
     {
-        if (ImageManager::isRealImage($this->fileInfo['tmp_name'])) {
+        $content = @file_get_contents($this->fileInfo['tmp_name']);
+        $activeContentPattern = '/\/(JavaScript|JS|OpenAction|AA|Launch|SubmitForm|ImportData)\b/i';
+
+        $this->imageInfo = @getimagesize($this->fileInfo['tmp_name']);
+
+        if ($this->imageInfo && ImageManager::isRealImage($this->fileInfo['tmp_name'])) {
             $this->file_type = self::FILE_TYPE_IMAGE;
-        } elseif (substr((string) @file_get_contents($this->fileInfo['tmp_name'], false, null, 0, 5), 0, 5) === '%PDF-') {
+        } elseif ($content !== false && substr($content, 0, 5) === '%PDF-' && !preg_match($activeContentPattern, $content)) {
             $this->file_type = self::FILE_TYPE_PDF;
         } else {
             $this->file_type = 0;
@@ -154,8 +159,9 @@ class HotelBookingDocument extends ObjectModel
 
     /**
      * Extension is derived from the file's real, validated content
-     * (getimagesize()/PDF signature), never from the uploaded
-     * filename or mime header (both are attacker-controlled).
+     * (getimagesize()/PDF signature), captured once in setFileType(),
+     * never from the uploaded filename or mime header (both are
+     * attacker-controlled).
      */
     public function getFileExtension()
     {
@@ -163,9 +169,7 @@ class HotelBookingDocument extends ObjectModel
             return 'pdf';
         }
 
-        $imageInfo = @getimagesize($this->fileInfo['tmp_name']);
-
-        return $imageInfo ? image_type_to_extension($imageInfo[2], false) : 'jpg';
+        return image_type_to_extension($this->imageInfo[2], false);
     }
 
     public function getContentType()

From 3ec760f6907ca86d10b393b4fed55f4924c092cd Mon Sep 17 00:00:00 2001
From: azhar bhat <azharbhat.qlo098@webkul.in>
Date: Fri, 21 Aug 2026 12:59:43 +0530
Subject: [PATCH 33/35] text changes

---
 classes/Language.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/Language.php b/classes/Language.php
index 0963279bb..af5923fca 100644
--- a/classes/Language.php
+++ b/classes/Language.php
@@ -919,9 +919,9 @@ class LanguageCore extends ObjectModel
         $file = _PS_TRANSLATIONS_DIR_.(string)$iso.'.gzip';
 
         if (!$lang_pack_link = Tools::file_get_contents(_QLO_API_URL_.'/lang_pack/get_lang_pack.php?version='.$version.'&iso_lang='.Tools::strtolower((string)$iso))) {
-            $errors[] = Tools::displayError('Archive cannot be downloaded from prestashop.com.');
+            $errors[] = Tools::displayError('Archive cannot be downloaded from QloApps Api.');
         } elseif (!$lang_pack = json_decode($lang_pack_link)) {
-            $errors[] = Tools::displayError('Error occurred when language was checked according to your Prestashop version.');
+            $errors[] = Tools::displayError('Error occurred when language was checked according to your QloApps version.');
         } elseif (empty($lang_pack->error) && ($content = Tools::file_get_contents($lang_pack->download_link))) {
             if (!@file_put_contents($file, $content)) {
                 if (is_writable(dirname($file))) {

From f770174174983e4e1dc5cc80c976852b459466a3 Mon Sep 17 00:00:00 2001
From: aradhana kumari <aradhana.kumari639@webkul.in>
Date: Fri, 21 Aug 2026 15:17:33 +0530
Subject: [PATCH 34/35] Fix the advance/full payment status

---
 classes/PaymentModule.php                       | 17 +++++++++++------
 .../controllers/front/payment.php               |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php
index c382f07c4..1f7df631f 100644
--- a/classes/PaymentModule.php
+++ b/classes/PaymentModule.php
@@ -229,11 +229,17 @@ abstract class PaymentModuleCore extends Module
             $this->currentOrderReference = $reference;
 
             $order_creation_failed = false;
-            $cart_total_paid = (float)Tools::ps_round((float)$this->context->cart->getOrderTotal(true, Cart::BOTH), _PS_PRICE_COMPUTE_PRECISION_);
 
-            if ($this->context->cart->is_advance_payment) {
+            $full_cart_total = (float)Tools::ps_round((float)$this->context->cart->getOrderTotal(true, Cart::BOTH), _PS_PRICE_COMPUTE_PRECISION_);
+            $amount_paid = !$dont_touch_amount ? Tools::ps_round((float)$amount_paid, _PS_PRICE_COMPUTE_PRECISION_) : $amount_paid;
+
+            if ($amount_paid >= $full_cart_total) {
+                $is_advance_payment = false;
+                $cart_total_paid = $full_cart_total;
+            } else {
+                $is_advance_payment = true;
                 $cart_total_paid = (float)Tools::ps_round(
-                    (float)$this->context->cart->getOrderTotal(true, CART::ADVANCE_PAYMENT),
+                    (float)$this->context->cart->getOrderTotal(true, Cart::ADVANCE_PAYMENT),
                     _PS_PRICE_COMPUTE_PRECISION_
                 );
             }
@@ -314,7 +320,6 @@ abstract class PaymentModuleCore extends Module
                     $order->gift_message = $this->context->cart->gift_message;
                     $order->mobile_theme = $this->context->cart->mobile_theme;
                     $order->conversion_rate = $this->context->currency->conversion_rate;
-                    $amount_paid = !$dont_touch_amount ? Tools::ps_round((float)$amount_paid, _PS_PRICE_COMPUTE_PRECISION_) : $amount_paid;
                     $order->total_paid_real = 0;
 
                     $order->total_products = (float)$this->context->cart->getOrderTotal(false, Cart::ONLY_PRODUCTS, $order->product_list, $id_carrier);
@@ -371,7 +376,7 @@ abstract class PaymentModuleCore extends Module
                     }
 
                     // advance payment information
-                    $order->is_advance_payment = $this->context->cart->is_advance_payment;
+                    $order->is_advance_payment = (int)$is_advance_payment;
                     $order->amount_paid = 0;
                     if ($order->is_advance_payment) {
                         $order->advance_paid_amount = (float)Tools::ps_round(
@@ -892,7 +897,7 @@ abstract class PaymentModuleCore extends Module
 
                                 /*for saving details of the advance payment product wise*/
                                 $objBookingDetail->total_paid_amount = $total_price['total_price_tax_incl'];
-                                if ($this->context->cart->is_advance_payment) {
+                                if ($is_advance_payment) {
                                     $prod_adv_payment = $objAdvancedPayment->getIdAdvPaymentByIdProduct($idProduct);
                                     if (!$prod_adv_payment
                                         || (isset($prod_adv_payment['payment_type']) && $prod_adv_payment['payment_type'])
diff --git a/modules/qlopaypalcommerce/controllers/front/payment.php b/modules/qlopaypalcommerce/controllers/front/payment.php
index c1526302c..c151fd52e 100644
--- a/modules/qlopaypalcommerce/controllers/front/payment.php
+++ b/modules/qlopaypalcommerce/controllers/front/payment.php
@@ -388,4 +388,4 @@ class QloPaypalCommercePaymentModuleFrontController extends ModuleFrontControlle
     {
         return _PS_PRICE_COMPUTE_PRECISION_;
     }
-}
+}
\ No newline at end of file

From 18d198b782914514ed2478278dee1639807aab95 Mon Sep 17 00:00:00 2001
From: aradhana kumari <aradhana.kumari639@webkul.in>
Date: Fri, 21 Aug 2026 16:26:27 +0530
Subject: [PATCH 35/35] Fix in the webhook also

---
 .../classes/WkPaypalCommerceWebhook.php       | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/modules/qlopaypalcommerce/classes/WkPaypalCommerceWebhook.php b/modules/qlopaypalcommerce/classes/WkPaypalCommerceWebhook.php
index 4a6833f40..db2b1a837 100644
--- a/modules/qlopaypalcommerce/classes/WkPaypalCommerceWebhook.php
+++ b/modules/qlopaypalcommerce/classes/WkPaypalCommerceWebhook.php
@@ -97,11 +97,13 @@ class WkPaypalCommerceWebhook
                     if ($eventData['event_type'] == 'CHECKOUT.ORDER.COMPLETED') {
                         $cartID = $transactionData['id_cart'];
                         $objCart = new Cart($cartID);
-                        if ($objCart->is_advance_payment) {
-                            $orderStatus = Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED');
-                        } else {
-                            $orderStatus = Configuration::get('PS_OS_PAYMENT_ACCEPTED');
-                        }
+                        $capturedAmount = isset($purchase['payments']['captures'][0]['amount']['value'])
+                            ? (float)$purchase['payments']['captures'][0]['amount']['value']
+                            : 0;
+                        $fullTotal = (float)$objCart->getOrderTotal(true, Cart::BOTH);
+                        $orderStatus = $capturedAmount >= $fullTotal
+                            ? Configuration::get('PS_OS_PAYMENT_ACCEPTED')
+                            : Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED');
                         if ($orders = WkPaypalCommerceHelper::getOrdersByCartId($cartID)) {
                             foreach ($orders as $order) {
                                 $this->updatePaymentStatus(
@@ -127,11 +129,13 @@ class WkPaypalCommerceWebhook
         )) {
             $cartID = $transactionData['id_cart'];
             $objCart = new Cart($cartID);
-            if ($objCart->is_advance_payment) {
-                $orderStatus = Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED');
-            } else {
-                $orderStatus = Configuration::get('PS_OS_PAYMENT_ACCEPTED');
-            }
+            $capturedAmount = isset($eventData['resource']['amount']['value'])
+                ? (float)$eventData['resource']['amount']['value']
+                : 0;
+            $fullTotal = (float)$objCart->getOrderTotal(true, Cart::BOTH);
+            $orderStatus = $capturedAmount >= $fullTotal
+                ? Configuration::get('PS_OS_PAYMENT_ACCEPTED')
+                : Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED');
             if ($orders = WkPaypalCommerceHelper::getOrdersByCartId($cartID)) {
                 foreach ($orders as $order) {
                     $this->updatePaymentStatus(