From 8bee1d8378ee295a07b962883ccb5a416109048b Mon Sep 17 00:00:00 2001
From: "vishalsingh.qlo325" <vishalsingh.qlo325@webkul.in>
Date: Wed, 10 Sep 2025 15:54:05 +0530
Subject: [PATCH 01/19] Fixed: Getting Access denied issue on the back-office

---
 classes/Profile.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/classes/Profile.php b/classes/Profile.php
index 1a9dabda2..39637163a 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -141,11 +141,18 @@ class ProfileCore extends ObjectModel
                     );
                 }
             } else {
-                $result = Db::getInstance()->executeS('
-				SELECT *
-				FROM `'._DB_PREFIX_.'access` a
-				LEFT JOIN `'._DB_PREFIX_.'tab` t ON t.id_tab = a.id_tab
-				WHERE `id_profile` = '.(int)$id_profile);
+                if ($result = Db::getInstance()->executeS('
+                    SELECT * FROM `'._DB_PREFIX_.'access` a
+                    LEFT JOIN `'._DB_PREFIX_.'tab` t ON t.id_tab = a.id_tab
+                    WHERE `id_profile` = '.(int)$id_profile)
+                ) {
+                    foreach ($result as $key => $profileAccess) {
+                        $result[$key]['view'] = (int) $profileAccess['view'];
+                        $result[$key]['delete'] = (int) $profileAccess['delete'];
+                        $result[$key]['add'] = (int) $profileAccess['add'];
+                        $result[$key]['edit'] = (int) $profileAccess['edit'];
+                    }
+                }
 
                 foreach ($result as $row) {
                     self::$_cache_accesses[$id_profile][$type][$row[$type]] = $row;

From 311da0efe756304f0c0d8bf2ddaec1464670af0c Mon Sep 17 00:00:00 2001
From: Amit sharma <amit.sharma322@webkul.in>
Date: Fri, 5 Dec 2025 11:59:28 +0530
Subject: [PATCH 02/19] Fixed: Show the payment option in the Payment Resource
 tab on the checkout page when trying to pay using the PayPal payment method.

---
 .../views/css/front/wk_payment.css            |  16 ++
 modules/qlopaypalcommerce/views/img/index.php |  32 +++
 .../views/img/paypal-payment-icon.png         | Bin 0 -> 2223 bytes
 .../views/templates/hook/payment.tpl          | 193 ++++++++++++------
 4 files changed, 174 insertions(+), 67 deletions(-)
 create mode 100644 modules/qlopaypalcommerce/views/img/index.php
 create mode 100644 modules/qlopaypalcommerce/views/img/paypal-payment-icon.png

diff --git a/modules/qlopaypalcommerce/views/css/front/wk_payment.css b/modules/qlopaypalcommerce/views/css/front/wk_payment.css
index 27256b7ff..8a4bdeff1 100644
--- a/modules/qlopaypalcommerce/views/css/front/wk_payment.css
+++ b/modules/qlopaypalcommerce/views/css/front/wk_payment.css
@@ -45,3 +45,19 @@
 @keyframes rotate {
     0% {transform: rotate(0deg);}
     100% {transform: rotate(360deg);}}
+
+p.payment_module a#wkPaypalBtn {
+    background: url(../../img/paypal-payment-icon.png) 15px 8px no-repeat #fbfbfb;
+}
+
+.pp-btn-block {
+    text-align: center;
+    padding: 20px 0;
+    background: #fbfbfb;
+    border-radius: 3px;
+    border: 1px solid #d6d4d4;
+}
+
+#paypal-button-container{
+    padding: 0px 15px;
+}
\ No newline at end of file
diff --git a/modules/qlopaypalcommerce/views/img/index.php b/modules/qlopaypalcommerce/views/img/index.php
new file mode 100644
index 000000000..409280877
--- /dev/null
+++ b/modules/qlopaypalcommerce/views/img/index.php
@@ -0,0 +1,32 @@
+<?php
+/**
+* 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
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../');
+exit;
diff --git a/modules/qlopaypalcommerce/views/img/paypal-payment-icon.png b/modules/qlopaypalcommerce/views/img/paypal-payment-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f83a4c39de0d98543c2631ca4c18357fd452c9d9
GIT binary patch
literal 2223
zcma)8c~BF17Vd<ATv3oia9pPi8m}as4hcCVm_T3%7!x2W3PM8CArX>5(nvsLvJR*L
zU2#VgPf*Zh5giXK5l4Yyz+qKDL>CprK}I}S0jG3!U6JiL;%seAO>I|o|Bm{;_rCYu
z_ea}gE59JR&UOU=fGCa>#bT?#{yIBh-x^)!Lu~O!!{gC7qXx}Znh-#!Hl`q;Sg%Y)
zViBb}C$k+11^|b}I(a-AFImA;8TB-!9YeF|GcYy)1TVK_C{<|)3Z@{bIs>0HdbyDV
z>ePJF8kU4E$p}NVy2xA;5|_JDuF6eQan+>dAz-kDhXv3hs1mg3(+y^xg-`krmxt}`
z*ANN(0729Eq+dkEOJrb}(S(338jGr;GhmR-rNJyF7ltVygANBmFdbrWsW8lAvUzY2
z`0*iO*-UB;FIE)sF&B2?le8$B!Goae>}*<gAkAn>g<vk13(*-6gF(d*RCA62Ra&S9
zbHG#t5n@)EbQ!45XaMaIl_|z7luyEx{!)TILn8SU*kJzHD6D0WMVSG?G&-c$+w1y(
zHlwk~uQGlUZI<U`AW$q~HfEVr*gP}=Q)H}nzn{ns#MJOaMpc#`F`!}*pM>4e)H*dU
zlpzudxxz3}7|ev>@IYZus3?@hV2YS@Hj68anBs~JW>jfVAyZu4uiVhz<?_Nzh!QoL
z<VIuq)bwOpBWg5jjTvBA7`SMS&Y(7Cn-|+V`%x%j(rrZ45hkM^{LmVn?tjwTrK{;2
z21AoVrv`FVb`vlWDkmjHMb)r_QZNf}SS&h+^pUUrjne-wK7@&a?DPGvc~4zoCbDlo
zxfeTp@;_q0OmD*6?LFt~mjK{6M=TP`E%%2K#8SD?!!XBtyIXy+8_6#qdPiITqxS95
z$7Xr${%UT|LEBt@=HTbrL7SyZB%NKE8IWtTMKOzZBqYiNF~Yl6*BkLZMO8Wb4GqaZ
zzt}%4e}!z_&%TnketiPlf827&aRH0PqTGv3NLV_NKhtd=#Yv7oac=`Xosj2Pi$4U6
z5N<@W@hR3d)^@AJ`q<iU?L+4Q$8DR+U3vwg5!{U)JteS!PzU4&pPY-Ub*#lP@h@?_
z$u-37B~*`_sjNqSiqXj`9Oo=a;9o%~IW_jK{ESx#ZV|A@Aqp4A%3nsX_^rnK-m1Fp
z-q&XqB$qjtNxj-^os9G}LdJ4Bq=3IYd{dHpB%G04vM-X$E(_b_A8^UhN@-d3UhvI=
zBZ6m1HLbY%za@xo2D(=^X<Q4E9Gt|(7JL%EA+``;YA!GOBV1}|k~AfB4*QMdISe@r
zHk|z28`t|}qiakc<--1H96$^7IBew~g=cy=qVt!{5?svkK67hu=wI~;hYOwCnqwMI
z8V_2z))w`nEqfe$Iui|>`fzztGOqsBw#ZfMoi{WIX|mjs8>rvUc^7sL7R=~ADfvek
zF(6(X5lPk$HK1>n?Y-jKzPV_A`P;_b6nt0fsWm$~j{I|^vZN;Dm^PDt2UvG4q^#Ow
zgV}9FR`=$V(`Ln3+!yQSckex%f8|duxUzC6#_|%X=r7TxKV}qOB}ph7B~1~n!}k~M
zV3n>cnhZa8_c*cXJI$rR^NiO6!@6nb>l3Qp*a*?erG$Y~6`90_E`Yhhvo*Cb@{Pfh
znCtF0Bp3T?1l`htw$?<?3R0%cNkL|>s#wq6GO*%2lcvHySrYR1c`@zy=HW(QVrC=s
zb<SyL8Q-eiop(`Q0cStEvozi%Nux_#y`y3=E{XWGQqEp7&hy&Ie&B;!yOmIZ`?hVO
zU;1DHdF{QMt`ppVN4r8(9aiK87cO}pa~2v&Z5$lRzf4ldlmhCOE4689HOvj}9nMc<
z=^XO-B-+Gl@(s%MJ{?F~NO)HTwn>2k-1X;#pn2Qgy$cOmCwu+)XnsAZB4<k?*!JDR
z`s$8N_$7bN+vqcm8O;dvrmULbay4OQ*HC6~d7`H^V(f}^vXKMgA3h_8o_IE<Dt9^q
zg7_m1r>EuZsjd4S=uk9!OCOM{eaifW?Y1#}lV{M?IfdNK--Nxs7XSFfKv_#2d3(*n
zinEhn(XB)>ylv+>3ty5>S+(AUv)Hn+=*RYpag$eD+nSx{%9DnALT<<X_=D$JPR__E
z{<AM-&ktFteTt62od^B5c85*8J`ki11y(1I`33KC+ttbVX=Z)V{qp1Q;~6f!QFj|}
zoM&XI%hCs0cEw%J3S!-aa2D^Rm7~|adJA5tXEjiFdcBx2T-~ocSo`)h-sjM0=fY6l
z_g$qPiwn2T_WjGqbSOmR(6wlQp!kELbojhp{X;R4%0JCaLbX-m8BXcaJWttf1rqJv
zW^Jprb+ykarr|ER6#3^@6(6j-d&l>1<tXS}O_z-)#l9euL!N8?T8q2Ax%NFE;YHm!
zz=?)$%@bS@*h=rQ>$=Mr*Wz7^r{mT#{r9J}Y!d8C|Mzn+{F*e`@sP4Idp!JPkx##;
zFX<LhPVc>h=MXJ>73VHd>W`&Hc{E*yd$z}Um;baR`N(v_SbJv{Y0&dCYT>?f9uw>X
zrydMGeLQaH-2BQ{>$dK;%?dZGUcN=|<B#t967LQ?dFd#uDlxj*e<8%-D@CV66<huT
DI0I-b

literal 0
HcmV?d00001

diff --git a/modules/qlopaypalcommerce/views/templates/hook/payment.tpl b/modules/qlopaypalcommerce/views/templates/hook/payment.tpl
index f5bcbe0de..3951ec2a0 100644
--- a/modules/qlopaypalcommerce/views/templates/hook/payment.tpl
+++ b/modules/qlopaypalcommerce/views/templates/hook/payment.tpl
@@ -20,82 +20,141 @@
 * @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
 *}
 
-<div id="paypal-button-container"></div>
 
-<div id="wk-overlay" style="display:none;">
-    <div class="wk-spinner"></div><br/>
-    {l s='Please wait...' mod='qlopaypalcommerce'}
+<div class="row">
+    <div class="col-xs-12 col-md-12">
+        <p class="payment_module">
+            <a id="wkPaypalBtn" style="cursor:pointer;" href="javascript:void(0);"
+                title="{l s='PayPal Checkout' mod='qlopaypalcommerce'}">
+                {l s='PayPal Checkout' mod='qlopaypalcommerce'}
+            </a>
+        <div class="pp-btn-block" style="display:none;">
+            <div id="paypal-button-container"></div>
+            <div id="wk-overlay" style="display:none;">
+                <div class="wk-spinner"></div><br />
+                {l s='Please wait...' mod='qlopaypalcommerce'}
+            </div>
+        </div>
+        </p>
+    </div>
 </div>
 
 <script>
-    paypal.Buttons({
-        env: pp_environment,
-        style: {
-            layout: 'vertical',   // horizontal | vertical
-            size:   'responsive',   // medium | large | responsive
-            shape:  'rect',         // pill | rect
-            color:  'gold'         // gold | blue | silver | black,
-        },
-        commit: false,
-        createOrder: function() {
-            return fetch(create_order, {
-                method: 'POST',
-                body: JSON.stringify({
-                    'update': null,
-                    'flow': 'shortcut'
-                }),
-            }).then(function(response) {
-                return response.json();
-            }).then(function(dataJson) {
-                return dataJson.data.id;
-            });
-        },
-        onApprove: function(data, actions) {
-            $('#wk-overlay').show();
+    $(document).ready(function() {
+        var rendered = false;
 
-            return fetch(capture_order, {
-                headers: {
-                    'content-type': 'application/json'
-                },
-                body: JSON.stringify({
-                    orderID: data.orderID,
-                    getOrderData: true,
-                }),
-                method: "POST",
-            }).then(function(res) {
-                return res.json();
-            }).then(function(details) {
-                if (details.id) {
-                    const postData = {
-                        key: "order_id",
-                        value: details.id
-                    };
-                    submitForm(capture_order, postData);
-                } else if (details.details[0].issue === 'INSTRUMENT_DECLINED') {
-                    return actions.restart();
-                } else {
-                    console.log(details);
-                    window.location.replace(error_order + '?err_name=' + details.details[0].issue + '&err_msg=' + details.details[0].description);
-                }
-            });
-        },
-        onCancel: function(data) {
-            let url = cancel_order,
-                postData = {
-                    key: "error",
-                    value: JSON.stringify(data)
-                };
-            submitForm(url, postData);
-        },
-        onError: function (error) {
-            console.log(error.data.details[0].issue + ' : ' + error.data.details[0].description);
-            window.location.replace(error_order + '?err_name=' + error.data.details[0].issue + '&err_msg=' + error.data.details[0].description);
+        function initPaypalIfReady() {
+            if (rendered) return;
+
+            if (
+                typeof mp_pp_enabled !== "undefined" &&
+                mp_pp_enabled &&
+                $("#paypal-button-container").length
+            ) {
+                rendered = true;
+                $("#wkPaypalBtn").addClass("active");
+                $(".pp-btn-block").show();
+                renderPayPalButton();
+            }
         }
-    }).render('#paypal-button-container');
+        initPaypalIfReady();
+        const observer = new MutationObserver(() => initPaypalIfReady());
+        observer.observe(document.body, { childList: true, subtree: true });
+        const checkRendered = setInterval(() => {
+            if (rendered) {
+                observer.disconnect();
+                clearInterval(checkRendered);
+            }
+        }, 500);
+
+
+        $('#wkPaypalBtn').on('click', function() {
+            $(this).toggleClass("active");
+            if (!rendered) {
+                rendered = true;
+                $(".pp-btn-block").slideDown();
+                renderPayPalButton();
+            } else {
+                $(".pp-btn-block").slideToggle();
+            }
+
+        });
+    });
+
+    function renderPayPalButton() {
+        paypal.Buttons({
+            env: pp_environment,
+            style: {
+                layout: 'vertical', // horizontal | vertical
+                size: 'responsive', // medium | large | responsive
+                shape: 'rect', // pill | rect
+                color: 'gold' // gold | blue | silver | black,
+            },
+            commit: false,
+            createOrder: function() {
+                return fetch(create_order, {
+                    method: 'POST',
+                    body: JSON.stringify({
+                        'update': null,
+                        'flow': 'shortcut'
+                    }),
+                }).then(function(response) {
+                    return response.json();
+                }).then(function(dataJson) {
+                    return dataJson.data.id;
+                });
+            },
+            onApprove: function(data, actions) {
+                $('#wk-overlay').show();
+
+                return fetch(capture_order, {
+                    headers: {
+                        'content-type': 'application/json'
+                    },
+                    body: JSON.stringify({
+                        orderID: data.orderID,
+                        getOrderData: true,
+                    }),
+                    method: "POST",
+                }).then(function(res) {
+                    return res.json();
+                }).then(function(details) {
+                    if (details.id) {
+                        const postData = {
+                            key: "order_id",
+                            value: details.id
+                        };
+                        submitForm(capture_order, postData);
+                    } else if (details.details[0].issue === 'INSTRUMENT_DECLINED') {
+                        return actions.restart();
+                    } else {
+                        console.log(details);
+                        window.location.replace(error_order + '?err_name=' + details.details[0]
+                            .issue +
+                            '&err_msg=' + details.details[0].description);
+                    }
+                });
+            },
+            onCancel: function(data) {
+                let url = cancel_order,
+                    postData = {
+                        key: "error",
+                        value: JSON.stringify(data)
+                    };
+                submitForm(url, postData);
+            },
+            onError: function(error) {
+                console.log(error.data.details[0].issue + ' : ' + error.data.details[0].description);
+                window.location.replace(error_order + '?err_name=' + error.data.details[0].issue +
+                    '&err_msg=' +
+                    error.data.details[0].description);
+            }
+        }).render('#paypal-button-container');
+    }
+
 
     function submitForm(url, data) {
         let form = document.createElement('form'),
-
         input = document.createElement('input');
         input.name = data.key;
         input.value = data.value;

From 82a7e7fd2cd6b4e742cfbbebc1f5be04dd1382bb Mon Sep 17 00:00:00 2001
From: Amit sharma <amit.sharma322@webkul.in>
Date: Wed, 10 Dec 2025 17:11:26 +0530
Subject: [PATCH 03/19] Fixed: Getting warnings and deprecated error while
 trying to importing with enabling (ISO 8859-1 encoded file) the room type CVS

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

diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php
index d2819efca..1fdf0e9f2 100644
--- a/controllers/admin/AdminImportController.php
+++ b/controllers/admin/AdminImportController.php
@@ -3223,7 +3223,11 @@ class AdminImportControllerCore extends AdminController
 
     public function utf8EncodeArray($array)
     {
-        return (is_array($array) ? array_map('utf8_encode', $array) : mb_convert_encoding($array, 'UTF-8', 'ISO-8859-1'));
+        return is_array($array)
+            ? array_map(function ($item) {
+                return mb_convert_encoding($item, 'UTF-8', 'ISO-8859-1');
+            }, $array)
+            : mb_convert_encoding($array, 'UTF-8', 'ISO-8859-1');
     }
 
     protected function getNbrColumn($handle, $glue)

From 2c02b40ccf6646b963543d64a10a4e8ced836fe8 Mon Sep 17 00:00:00 2001
From: aradhana kumari <aradhana.kumari639@webkul.in>
Date: Tue, 13 Jan 2026 12:50:36 +0530
Subject: [PATCH 04/19] Update the license notice in the function that creates
 the index file

---
 classes/Tools.php | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/classes/Tools.php b/classes/Tools.php
index 47b95a4aa..2ffec4434 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -2608,29 +2608,26 @@ FileETag none
     public static function getDefaultIndexContent()
     {
         return '<?php
-/**
-* 2007-'.date('Y').' PrestaShop
-*
+/*
 * NOTICE OF LICENSE
 *
-* This source file is subject to the Open Software License (OSL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
+* 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:
-* http://opensource.org/licenses/osl-3.0.php
+* 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 license@prestashop.com so we can send you a copy immediately.
+* 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 PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
+* 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    PrestaShop SA <contact@prestashop.com>
-*  @copyright 2007-'.date('Y').' PrestaShop SA
-*  @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
+* @author Webkul IN
+* @copyright Since 2010 Webkul
+* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
 */
 
 header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");

From e7ebcd0e735df3ba673a9d0a2b6a541d2c6623c2 Mon Sep 17 00:00:00 2001
From: Amit sharma <amit.sharma322@webkul.in>
Date: Wed, 14 Jan 2026 13:53:55 +0530
Subject: [PATCH 05/19] Fixed: getting warnings in the aded or edit  room type
 after enabling the cache in the BO.

---
 classes/cache/Cache.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/classes/cache/Cache.php b/classes/cache/Cache.php
index aa91c3119..fde022518 100644
--- a/classes/cache/Cache.php
+++ b/classes/cache/Cache.php
@@ -231,7 +231,9 @@ abstract class CacheCore
             if ($ttl < 0) {
                 $ttl = 0;
             }
-
+            if(!is_array($this->keys)){
+                 $this->keys = [];
+            }
             $this->keys[$key] = ($ttl == 0) ? 0 : time() + $ttl;
             $this->_writeKeys();
             return true;

From 1a517d8601cc8cb0f69d5019760383e4efde19c4 Mon Sep 17 00:00:00 2001
From: aradhana kumari <aradhana.kumari639@webkul.in>
Date: Tue, 20 Jan 2026 15:07:43 +0530
Subject: [PATCH 06/19] Prevent enabling  duplicate advanced price rules with
 the same restrictions

---
 .../admin/AdminHotelFeaturePricesSettings.php | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php
index d5731d87f..4fe79e3d0 100644
--- a/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php
@@ -219,6 +219,56 @@ class AdminHotelFeaturePricesSettingsController extends ModuleAdminController
 
     }
 
+    public function processBulkEnableSelection()
+    {
+        if (!is_array($this->boxes) || empty($this->boxes)) {
+            return parent::processBulkEnableSelection();
+        }
+
+        $objFeaturePriceRule = new HotelRoomTypeFeaturePricingRestriction();
+        $result = true;
+
+        foreach ($this->boxes as $id) {
+            $objFeaturePricing = new $this->className((int)$id);
+
+            if ($objFeaturePricing->active) {
+                continue;
+            }
+
+            if (
+                $objFeaturePricing->getDuplicateRestrictions(
+                    $objFeaturePricing->id_product,
+                    $objFeaturePricing->getGroups($objFeaturePricing->id),
+                    $objFeaturePricing->id,
+                    $objFeaturePriceRule->getRestrictionsByIdFeaturePrice($objFeaturePricing->id),
+                )
+            ) {
+                $this->errors[] = sprintf(
+                    $this->l('Advanced price rule ID %d: Another advanced price rule with similar conditions already exists. Please update the existing rule before enabling this one.'),
+                    (int) $id
+                );
+                return;
+            }
+
+            $objFeaturePricing->setFieldsToUpdate(array('active' => true));
+            $objFeaturePricing->active = 1;
+            $isUpdated = (bool) $objFeaturePricing->update();
+            $result &= $isUpdated;
+
+            if (!$isUpdated) {
+                $this->errors[] = sprintf($this->l('Can\'t update #%d status.'), (int) $id);
+            }
+        }
+
+        if ($result) {
+            $this->redirect_after = self::$currentIndex.'&conf=5&token='.$this->token;
+        } else {
+            $this->errors[] = $this->l('An error occurred while updating the status.');
+        }
+
+        return $result;
+    }
+
     public function initToolbar()
     {
         parent::initToolbar();

From 1dd94715e70fc066b93629aae33aa39700a76b2c Mon Sep 17 00:00:00 2001
From: Amit sharma <amit.sharma322@webkul.in>
Date: Fri, 30 Jan 2026 12:25:46 +0530
Subject: [PATCH 07/19] getting a warning error while trying to export the
 theme.

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

diff --git a/controllers/admin/AdminThemesController.php b/controllers/admin/AdminThemesController.php
index 795b96943..bf38a6f5e 100644
--- a/controllers/admin/AdminThemesController.php
+++ b/controllers/admin/AdminThemesController.php
@@ -1206,7 +1206,9 @@ class AdminThemesControllerCore extends AdminController
 		');
 
         foreach ($hook_list as &$row) {
-            $row['exceptions'] = trim(preg_replace('/(,,+)/', ',', $row['exceptions']), ',');
+            if($row['exceptions']){
+                $row['exceptions'] = trim(preg_replace('/(,,+)/', ',', $row['exceptions']), ',');
+            }
         }
 
         $native_modules = $this->getNativeModule();

From 9e009178d8e43dee4ceaa73c124dc9ee2a137bdf Mon Sep 17 00:00:00 2001
From: Amit sharma <amit.sharma322@webkul.in>
Date: Thu, 5 Feb 2026 19:26:44 +0530
Subject: [PATCH 08/19] fixed: customer selection is lost when services are
 added or removed

---
 .../template/controllers/orders/form.tpl      | 26 ++++++++++++++++---
 controllers/admin/AdminOrdersController.php   |  1 +
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/admin/themes/default/template/controllers/orders/form.tpl b/admin/themes/default/template/controllers/orders/form.tpl
index 0451cd31d..1de5ef4e7 100644
--- a/admin/themes/default/template/controllers/orders/form.tpl
+++ b/admin/themes/default/template/controllers/orders/form.tpl
@@ -1572,6 +1572,7 @@
 					id_room: idRoom,
 					id_cart: idCart,
 					id_product: idProduct,
+					id_customer: id_customer,
 					id_hotel_cart_booking: idHotelCartBooking,
 					action: 'getRoomTypeCartDemands',
 					ajax: true
@@ -1877,7 +1878,7 @@
             <i class="icon-user"></i>
             {l s='Customer'}
         </div>
-        <div id="search-customer-form-group" class="form-group">
+        <div id="search-customer-form-group" {if isset($cart->id_customer) && $cart->id_customer &&  isset($customer) && $customer }style="display:none;"{/if} class="form-group">
             <label class="control-label col-lg-3">
                 <span title="" data-toggle="tooltip" class="label-tooltip" data-original-title="{l s='Search for an existing customer by typing the first letters of his/her name.'}">
                     {l s='Search for a customer'}
@@ -1904,7 +1905,26 @@
             </div>
         </div>
         <div class="row">
-            <div id="customers"></div>
+            <div id="customers">
+			 	{if isset($cart->id_customer) && $cart->id_customer && isset($customer) && $customer }
+					<div class="customerCard col-lg-4 selected-customer">
+						<div class="panel">
+							<div class="panel-heading">
+							<i class="icon-ok text-success"></i>{$customer->firstname} {$customer->lastname} <span class="pull-right">#{$customer->id}</span>
+							</div>
+							<span>{$customer->email}</span><br>
+							<span class="text-muted"></span><br>
+							<div class="panel-footer">
+							<a href="{$link->getAdminLink('AdminCustomers')}&id_customer={$customer->id}&viewcustomer&liteDisplaying=1" class="btn btn-default fancybox">
+								<i class="icon-search"></i> Details </a>
+								<button type="button" data-id_cart="6" data-customer="2" class="btn btn-default pull-right change-customer">
+									<i class="icon-refresh"></i>&nbsp;Change 
+								</button>
+							</div>
+						</div>
+					</div>
+				{/if}
+			</div>
         </div>
         {*<div id="carts">
             <button type="button" id="show_old_carts" class="btn btn-default pull-right" data-toggle="collapse" data-target="#old_carts_orders">
@@ -1962,7 +1982,7 @@
     </div>
 	{include file='controllers/orders/_current_cart_details_data.tpl'}
 
-    <form class="form-horizontal" action="{$link->getAdminLink('AdminOrders')|escape:'html':'UTF-8'}&amp;addorder=1&amp;cart_id={$cart->id}" method="post" style="display:none" id="cart_detail_form">
+    <form class="form-horizontal" action="{$link->getAdminLink('AdminOrders')|escape:'html':'UTF-8'}&amp;addorder=1&amp;cart_id={$cart->id}" method="post" {if !isset($customer) && !$customer }style="display:none;"{/if} id="cart_detail_form">
         <div class="panel" id="products_part" style="display:none;">
             <div class="panel-heading">
                 <i class="icon-shopping-cart"></i>
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 30026bcca..6a52b472f 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -437,6 +437,7 @@ class AdminOrdersControllerCore extends AdminController
                     'advance_payment_amount_without_tax' => $cart->getOrderTotal(false, Cart::ADVANCE_PAYMENT),
                     'advance_payment_amount_with_tax' => $cart->getOrderTotal(true, Cart::ADVANCE_PAYMENT),
                     'cart' => $cart,
+                    'customer' => $cart->id_customer ? new Customer($cart->id_customer): null ,
                     'currencies' => Currency::getCurrenciesByIdShop(Context::getContext()->shop->id),
                     'langs' => Language::getLanguages(true, Context::getContext()->shop->id),
                     'payment_modules' => $payment_modules,

From 93a84b44b73ec5a2ac136398ceb475ab143063d7 Mon Sep 17 00:00:00 2001
From: Amit sharma <amit.sharma322@webkul.in>
Date: Fri, 27 Feb 2026 15:36:34 +0530
Subject: [PATCH 09/19] Fix cart rule not created when no cart rule exists in
 the system.

---
 classes/CartRule.php                                        | 2 +-
 classes/webservice/WebserviceSpecificManagementBookings.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/CartRule.php b/classes/CartRule.php
index 240015b37..70bef454d 100644
--- a/classes/CartRule.php
+++ b/classes/CartRule.php
@@ -1478,7 +1478,7 @@ class CartRuleCore extends ObjectModel
     public static function isFeatureActive()
     {
         static $is_feature_active = null;
-        if ($is_feature_active === null) {
+        if ($is_feature_active === null || $is_feature_active === false) {
             $is_feature_active = (bool)Configuration::get('PS_CART_RULE_FEATURE_ACTIVE');
         }
         return $is_feature_active;
diff --git a/classes/webservice/WebserviceSpecificManagementBookings.php b/classes/webservice/WebserviceSpecificManagementBookings.php
index 10e52dab0..3a547d3c7 100644
--- a/classes/webservice/WebserviceSpecificManagementBookings.php
+++ b/classes/webservice/WebserviceSpecificManagementBookings.php
@@ -507,7 +507,7 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
                 $formattedRooms[$key]['occupancy'] = $occupancy;
                 if (isset($room['id_tax_rules_group'])) {
                     $formattedRooms[$key]['id_tax_rules_group'] = $room['id_tax_rules_group'];
-                } else if ($room['total_tax']) {
+                } else if (isset($room['total_tax'])) {
                     $formattedRooms[$key]['total_tax'] = $room['total_tax'];
                 }
             }

From 676eaee6748fa849d75874aa453260ddfc266855 Mon Sep 17 00:00:00 2001
From: Amit sharma <amit.sharma322@webkul.in>
Date: Wed, 18 Mar 2026 16:25:13 +0530
Subject: [PATCH 10/19] fixed: update property labels and clean utf8 encoding
 helper

---
 controllers/admin/AdminImportController.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php
index 1fdf0e9f2..6c7124e58 100644
--- a/controllers/admin/AdminImportController.php
+++ b/controllers/admin/AdminImportController.php
@@ -3223,11 +3223,13 @@ class AdminImportControllerCore extends AdminController
 
     public function utf8EncodeArray($array)
     {
-        return is_array($array)
-            ? array_map(function ($item) {
+        if (is_array($array)) {
+            return array_map(function ($item) {
                 return mb_convert_encoding($item, 'UTF-8', 'ISO-8859-1');
-            }, $array)
-            : mb_convert_encoding($array, 'UTF-8', 'ISO-8859-1');
+            }, $array);
+        }
+
+        return mb_convert_encoding($array, 'UTF-8', 'ISO-8859-1');
     }
 
     protected function getNbrColumn($handle, $glue)

From ef65e3ce1c1b493b7ca1fdd09e591f5216aab96e Mon Sep 17 00:00:00 2001
From: aradhana kumari <aradhana.kumari639@webkul.in>
Date: Wed, 25 Mar 2026 19:19:58 +0530
Subject: [PATCH 11/19] Fix bulk enable validation for advanced price rules

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

diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php
index 4fe79e3d0..329d3e252 100644
--- a/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php
@@ -230,6 +230,11 @@ class AdminHotelFeaturePricesSettingsController extends ModuleAdminController
 
         foreach ($this->boxes as $id) {
             $objFeaturePricing = new $this->className((int)$id);
+            if (!Validate::isLoadedObject($objFeaturePricing)) {
+                $this->errors[] = sprintf($this->l('Invalid advanced price rule ID %d.'), (int) $id);
+                $result = false;
+                continue;
+            }
 
             if ($objFeaturePricing->active) {
                 continue;
@@ -247,13 +252,13 @@ class AdminHotelFeaturePricesSettingsController extends ModuleAdminController
                     $this->l('Advanced price rule ID %d: Another advanced price rule with similar conditions already exists. Please update the existing rule before enabling this one.'),
                     (int) $id
                 );
-                return;
+                continue;
             }
 
             $objFeaturePricing->setFieldsToUpdate(array('active' => true));
             $objFeaturePricing->active = 1;
             $isUpdated = (bool) $objFeaturePricing->update();
-            $result &= $isUpdated;
+            $result = $result && $isUpdated;
 
             if (!$isUpdated) {
                 $this->errors[] = sprintf($this->l('Can\'t update #%d status.'), (int) $id);

From 6879af7bb9c7c1244e4dd5ef41c2e642630c20e7 Mon Sep 17 00:00:00 2001
From: aradhana kumari <aradhana.kumari639@webkul.in>
Date: Thu, 26 Mar 2026 17:13:08 +0530
Subject: [PATCH 12/19] Update the if condition

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

diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php
index 329d3e252..b60ceaa9e 100644
--- a/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php
@@ -252,7 +252,7 @@ class AdminHotelFeaturePricesSettingsController extends ModuleAdminController
                     $this->l('Advanced price rule ID %d: Another advanced price rule with similar conditions already exists. Please update the existing rule before enabling this one.'),
                     (int) $id
                 );
-                continue;
+                return;
             }
 
             $objFeaturePricing->setFieldsToUpdate(array('active' => true));

From 9a2606dded5e5a06ce316b493058149c3ad870e4 Mon Sep 17 00:00:00 2001
From: Amit sharma <amit.sharma322@webkul.in>
Date: Mon, 30 Mar 2026 10:56:02 +0530
Subject: [PATCH 13/19] Fixed: normalize filesystem cache key index on load

---
 classes/cache/Cache.php   | 4 +---
 classes/cache/CacheFs.php | 3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/classes/cache/Cache.php b/classes/cache/Cache.php
index fde022518..aa91c3119 100644
--- a/classes/cache/Cache.php
+++ b/classes/cache/Cache.php
@@ -231,9 +231,7 @@ abstract class CacheCore
             if ($ttl < 0) {
                 $ttl = 0;
             }
-            if(!is_array($this->keys)){
-                 $this->keys = [];
-            }
+
             $this->keys[$key] = ($ttl == 0) ? 0 : time() + $ttl;
             $this->_writeKeys();
             return true;
diff --git a/classes/cache/CacheFs.php b/classes/cache/CacheFs.php
index 37ffd1f26..9adaa6bb0 100644
--- a/classes/cache/CacheFs.php
+++ b/classes/cache/CacheFs.php
@@ -37,7 +37,8 @@ class CacheFsCore extends Cache
 
         $keys_filename = $this->getFilename(self::KEYS_NAME);
         if (@filemtime($keys_filename)) {
-            $this->keys = unserialize(file_get_contents($keys_filename));
+            $keys = @unserialize(file_get_contents($keys_filename));
+            $this->keys = is_array($keys) ? $keys : array();
         }
     }
 

From 096e975403c3192200a590358d3c4abec34d443d Mon Sep 17 00:00:00 2001
From: Amit sharma <amit.sharma322@webkul.in>
Date: Mon, 30 Mar 2026 19:13:50 +0530
Subject: [PATCH 14/19] fix: correct PayPal button render condition logic and
 remove unused variable

---
 .../qlopaypalcommerce/views/templates/hook/payment.tpl    | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/modules/qlopaypalcommerce/views/templates/hook/payment.tpl b/modules/qlopaypalcommerce/views/templates/hook/payment.tpl
index 3951ec2a0..bd5e831a7 100644
--- a/modules/qlopaypalcommerce/views/templates/hook/payment.tpl
+++ b/modules/qlopaypalcommerce/views/templates/hook/payment.tpl
@@ -46,18 +46,14 @@
         function initPaypalIfReady() {
             if (rendered) return;
 
-            if (
-                typeof mp_pp_enabled !== "undefined" &&
-                mp_pp_enabled &&
-                $("#paypal-button-container").length
-            ) {
+            if (!rendered && $("#paypal-button-container").length) {
                 rendered = true;
                 $("#wkPaypalBtn").addClass("active");
                 $(".pp-btn-block").show();
                 renderPayPalButton();
             }
         }
-        initPaypalIfReady();
+
         const observer = new MutationObserver(() => initPaypalIfReady());
         observer.observe(document.body, { childList: true, subtree: true });
         const checkRendered = setInterval(() => {

From 41f5ea288eb7770c66ceb06ed7c17d905d792749 Mon Sep 17 00:00:00 2001
From: aradhana kumari <aradhana.kumari639@webkul.in>
Date: Wed, 1 Apr 2026 19:35:03 +0530
Subject: [PATCH 15/19] Update the error message

---
 .../controllers/admin/AdminHotelFeaturePricesSettings.php    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php
index b60ceaa9e..7c2158940 100644
--- a/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php
@@ -249,9 +249,8 @@ class AdminHotelFeaturePricesSettingsController extends ModuleAdminController
                 )
             ) {
                 $this->errors[] = sprintf(
-                    $this->l('Advanced price rule ID %d: Another advanced price rule with similar conditions already exists. Please update the existing rule before enabling this one.'),
-                    (int) $id
-                );
+                    $this->l('Unable to activate Advanced Price Rule with ID #%d. A rule with similar conditions already exists.'),
+                    (int) $id);
                 return;
             }
 

From aabb921d8d0346f01b946c4c200f124ab782b1ae Mon Sep 17 00:00:00 2001
From: Amit sharma <amit.sharma322@webkul.in>
Date: Sat, 4 Apr 2026 14:39:28 +0530
Subject: [PATCH 16/19] Fixed: recursively UTF-8 encode nested arrays, skip
 non-strings, and normalize ISO-8859-1 values to prevent CSV import errors

---
 controllers/admin/AdminImportController.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php
index 6c7124e58..2e5bb151c 100644
--- a/controllers/admin/AdminImportController.php
+++ b/controllers/admin/AdminImportController.php
@@ -3224,11 +3224,23 @@ class AdminImportControllerCore extends AdminController
     public function utf8EncodeArray($array)
     {
         if (is_array($array)) {
-            return array_map(function ($item) {
-                return mb_convert_encoding($item, 'UTF-8', 'ISO-8859-1');
+            return array_map(function ($value) {
+                if (is_array($value)) {
+                    return $this->utf8EncodeArray($value);
+                }
+
+                if (!is_string($value)) {
+                    return $value;
+                }
+
+                return mb_convert_encoding($value, 'UTF-8', 'ISO-8859-1');
             }, $array);
         }
 
+        if (!is_string($array)) {
+            return $array;
+        }
+
         return mb_convert_encoding($array, 'UTF-8', 'ISO-8859-1');
     }
 

From d13eab411c1cf634c9572b1223af46c3a770b7ae Mon Sep 17 00:00:00 2001
From: Amit sharma <amit.sharma322@webkul.in>
Date: Sat, 4 Apr 2026 15:25:16 +0530
Subject: [PATCH 17/19] remove automatic button initialization from payment
 template

---
 .../views/css/front/wk_payment.css            |  6 +----
 .../views/templates/hook/payment.tpl          | 25 ++-----------------
 2 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/modules/qlopaypalcommerce/views/css/front/wk_payment.css b/modules/qlopaypalcommerce/views/css/front/wk_payment.css
index 8a4bdeff1..3e60bc297 100644
--- a/modules/qlopaypalcommerce/views/css/front/wk_payment.css
+++ b/modules/qlopaypalcommerce/views/css/front/wk_payment.css
@@ -52,12 +52,8 @@ p.payment_module a#wkPaypalBtn {
 
 .pp-btn-block {
     text-align: center;
-    padding: 20px 0;
+    padding: 20px 15px;
     background: #fbfbfb;
     border-radius: 3px;
     border: 1px solid #d6d4d4;
 }
-
-#paypal-button-container{
-    padding: 0px 15px;
-}
\ No newline at end of file
diff --git a/modules/qlopaypalcommerce/views/templates/hook/payment.tpl b/modules/qlopaypalcommerce/views/templates/hook/payment.tpl
index bd5e831a7..dc93d5a45 100644
--- a/modules/qlopaypalcommerce/views/templates/hook/payment.tpl
+++ b/modules/qlopaypalcommerce/views/templates/hook/payment.tpl
@@ -26,7 +26,7 @@
         <p class="payment_module">
             <a id="wkPaypalBtn" style="cursor:pointer;" href="javascript:void(0);"
                 title="{l s='PayPal Checkout' mod='qlopaypalcommerce'}">
-                {l s='PayPal Checkout' mod='qlopaypalcommerce'}
+                {l s='PayPal Checkout' mod='qlopaypalcommerce'} <span>{l s='(Pay with PayPal Account or Cards)' mod='qlopaypalcommerce'}</span>
             </a>
         <div class="pp-btn-block" style="display:none;">
             <div id="paypal-button-container"></div>
@@ -43,27 +43,6 @@
     $(document).ready(function() {
         var rendered = false;
 
-        function initPaypalIfReady() {
-            if (rendered) return;
-
-            if (!rendered && $("#paypal-button-container").length) {
-                rendered = true;
-                $("#wkPaypalBtn").addClass("active");
-                $(".pp-btn-block").show();
-                renderPayPalButton();
-            }
-        }
-
-        const observer = new MutationObserver(() => initPaypalIfReady());
-        observer.observe(document.body, { childList: true, subtree: true });
-        const checkRendered = setInterval(() => {
-            if (rendered) {
-                observer.disconnect();
-                clearInterval(checkRendered);
-            }
-        }, 500);
-
-
         $('#wkPaypalBtn').on('click', function() {
             $(this).toggleClass("active");
             if (!rendered) {
@@ -162,4 +141,4 @@
 
         form.submit();
     }
-</script>
\ No newline at end of file
+</script>

From 3ea50d1cdf8c5d792345aa79180b3bcc97a5de8f Mon Sep 17 00:00:00 2001
From: Amit sharma <amit.sharma322@webkul.in>
Date: Sat, 4 Apr 2026 16:19:33 +0530
Subject: [PATCH 18/19] rename PayPal selectors for clarity and remove unused
 code

---
 .../views/css/front/wk_payment.css               |  4 ++--
 .../views/templates/hook/payment.tpl             | 16 +++++++---------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/modules/qlopaypalcommerce/views/css/front/wk_payment.css b/modules/qlopaypalcommerce/views/css/front/wk_payment.css
index 3e60bc297..5843f2c29 100644
--- a/modules/qlopaypalcommerce/views/css/front/wk_payment.css
+++ b/modules/qlopaypalcommerce/views/css/front/wk_payment.css
@@ -46,11 +46,11 @@
     0% {transform: rotate(0deg);}
     100% {transform: rotate(360deg);}}
 
-p.payment_module a#wkPaypalBtn {
+p.payment_module a#qlo_paypal_btn {
     background: url(../../img/paypal-payment-icon.png) 15px 8px no-repeat #fbfbfb;
 }
 
-.pp-btn-block {
+.qlo_paypal_methods_wrapper {
     text-align: center;
     padding: 20px 15px;
     background: #fbfbfb;
diff --git a/modules/qlopaypalcommerce/views/templates/hook/payment.tpl b/modules/qlopaypalcommerce/views/templates/hook/payment.tpl
index dc93d5a45..d1a6a8f8a 100644
--- a/modules/qlopaypalcommerce/views/templates/hook/payment.tpl
+++ b/modules/qlopaypalcommerce/views/templates/hook/payment.tpl
@@ -24,12 +24,12 @@
 <div class="row">
     <div class="col-xs-12 col-md-12">
         <p class="payment_module">
-            <a id="wkPaypalBtn" style="cursor:pointer;" href="javascript:void(0);"
+            <a id="qlo_paypal_btn" style="cursor:pointer;" href="javascript:void(0);"
                 title="{l s='PayPal Checkout' mod='qlopaypalcommerce'}">
                 {l s='PayPal Checkout' mod='qlopaypalcommerce'} <span>{l s='(Pay with PayPal Account or Cards)' mod='qlopaypalcommerce'}</span>
             </a>
-        <div class="pp-btn-block" style="display:none;">
-            <div id="paypal-button-container"></div>
+        <div class="qlo_paypal_methods_wrapper" style="display:none;">
+            <div id="qlo_paypal_container"></div>
             <div id="wk-overlay" style="display:none;">
                 <div class="wk-spinner"></div><br />
                 {l s='Please wait...' mod='qlopaypalcommerce'}
@@ -43,14 +43,14 @@
     $(document).ready(function() {
         var rendered = false;
 
-        $('#wkPaypalBtn').on('click', function() {
+        $('#qlo_paypal_btn').on('click', function() {
             $(this).toggleClass("active");
             if (!rendered) {
                 rendered = true;
-                $(".pp-btn-block").slideDown();
+                $(".qlo_paypal_methods_wrapper").slideDown();
                 renderPayPalButton();
             } else {
-                $(".pp-btn-block").slideToggle();
+                $(".qlo_paypal_methods_wrapper").slideToggle();
             }
 
         });
@@ -103,7 +103,6 @@
                     } else if (details.details[0].issue === 'INSTRUMENT_DECLINED') {
                         return actions.restart();
                     } else {
-                        console.log(details);
                         window.location.replace(error_order + '?err_name=' + details.details[0]
                             .issue +
                             '&err_msg=' + details.details[0].description);
@@ -119,12 +118,11 @@
                 submitForm(url, postData);
             },
             onError: function(error) {
-                console.log(error.data.details[0].issue + ' : ' + error.data.details[0].description);
                 window.location.replace(error_order + '?err_name=' + error.data.details[0].issue +
                     '&err_msg=' +
                     error.data.details[0].description);
             }
-        }).render('#paypal-button-container');
+        }).render('#qlo_paypal_container');
     }
 
 

From e172cb5e4fbd1ffcee4987d7a34b3950a114e288 Mon Sep 17 00:00:00 2001
From: Amit sharma <amit.sharma322@webkul.in>
Date: Sat, 4 Apr 2026 17:15:58 +0530
Subject: [PATCH 19/19] Fix cart rule feature flag refresh

---
 classes/CartRule.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/classes/CartRule.php b/classes/CartRule.php
index 70bef454d..fdd5c706b 100644
--- a/classes/CartRule.php
+++ b/classes/CartRule.php
@@ -1477,10 +1477,7 @@ class CartRuleCore extends ObjectModel
      */
     public static function isFeatureActive()
     {
-        static $is_feature_active = null;
-        if ($is_feature_active === null || $is_feature_active === false) {
-            $is_feature_active = (bool)Configuration::get('PS_CART_RULE_FEATURE_ACTIVE');
-        }
+        $is_feature_active = (bool)Configuration::get('PS_CART_RULE_FEATURE_ACTIVE');
         return $is_feature_active;
     }