From fae6dff86f896e570a9bc90477dc327df83f2a0d Mon Sep 17 00:00:00 2001 From: azhar bhat Date: Wed, 21 Jan 2026 17:17:38 +0530 Subject: [PATCH 01/52] customer service improvement --- .../controllers/orders/helpers/view/view.tpl | 6 +- .../orders/modals/_add_room_booking.tpl | 6 + .../orders/modals/_delete_room_booking.tpl | 54 ++++++++ .../orders/modals/_edit_room_tab_content.tpl | 6 + .../orders/modals/_room_reallocation.tpl | 12 ++ classes/PaymentModule.php | 6 +- controllers/admin/AdminCartsController.php | 1 + .../admin/AdminCustomerThreadsController.php | 23 +++- controllers/admin/AdminOrdersController.php | 99 ++++++++++++++- controllers/front/OrderDetailController.php | 2 +- install/data/xml/configuration.xml | 4 +- js/admin/orders.js | 120 ++++++++++++------ js/admin/reallocation.js | 1 + 13 files changed, 284 insertions(+), 56 deletions(-) create mode 100644 admin/themes/default/template/controllers/orders/modals/_delete_room_booking.tpl diff --git a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl index c0c841758..32887116b 100644 --- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -720,11 +720,11 @@ {$message['elastname']|escape:'html':'UTF-8'}{else}{$message['cfirstname']|escape:'html':'UTF-8'} {$message['clastname']|escape:'html':'UTF-8'} {/if},   - {dateFormat date=$message['date_add']} + {dateFormat date=$message.date_add full=1} - {if ($message['private'] == 1)} + {* {if ($message['private'] == 1)} {l s='Private'} - {/if} + {/if} *}

{if !$smarty.foreach.customerMessage.last}
{/if} diff --git a/admin/themes/default/template/controllers/orders/modals/_add_room_booking.tpl b/admin/themes/default/template/controllers/orders/modals/_add_room_booking.tpl index b9e6524cf..d63ce2421 100644 --- a/admin/themes/default/template/controllers/orders/modals/_add_room_booking.tpl +++ b/admin/themes/default/template/controllers/orders/modals/_add_room_booking.tpl @@ -128,6 +128,12 @@ {/if} +
+
+ + +
+
{if isset($invoices_collection) && sizeof($invoices_collection)} +
+
+ + +
+
+
@@ -139,6 +145,12 @@
+
+
+ + +
+
diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index dde838155..1e12404ef 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -704,11 +704,11 @@ abstract class PaymentModuleCore extends Module // Specify order id for message $old_message = Message::getMessageByCartId((int)$this->context->cart->id); - if ($old_message && !$old_message['private']) { + if ($old_message && $old_message['private']) { $update_message = new Message((int)$old_message['id_message']); $update_message->id_order = (int)$order->id; $update_message->update(); - + if (Tools::getValue('visibility')) { // Add this message in the customer thread $customer_thread = new CustomerThread(); $customer_thread->id_contact = 0; @@ -726,9 +726,9 @@ abstract class PaymentModuleCore extends Module $customer_message->id_employee = 0; $customer_message->message = $update_message->message; $customer_message->private = !Tools::getValue('visibility'); - if (!$customer_message->add()) { $this->errors[] = Tools::displayError('An error occurred while saving message'); + } } } diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php index f76331422..f518b8638 100644 --- a/controllers/admin/AdminCartsController.php +++ b/controllers/admin/AdminCartsController.php @@ -644,6 +644,7 @@ class AdminCartsControllerCore extends AdminController $message->message = $message_content; $message->id_cart = (int)$this->context->cart->id; $message->id_customer = (int)$this->context->cart->id_customer; + $message->private = 1; $message->save(); } } elseif (Validate::isLoadedObject($message)) { diff --git a/controllers/admin/AdminCustomerThreadsController.php b/controllers/admin/AdminCustomerThreadsController.php index d56f2da21..8d41f81e8 100644 --- a/controllers/admin/AdminCustomerThreadsController.php +++ b/controllers/admin/AdminCustomerThreadsController.php @@ -90,6 +90,14 @@ class AdminCustomerThreadsControllerCore extends AdminController 'align' => 'center', 'class' => 'fixed-width-xs' ), + 'id_order' => array( + 'title' => $this->l('ID Order'), + 'filter_key' => 'a!id_order', + 'align' => 'center', + 'optional' => true, + 'callback' => 'getOrderLink', + 'visible_default' => true, + ), 'customer' => array( 'title' => $this->l('Customer'), 'filter_key' => 'customer', @@ -172,13 +180,6 @@ class AdminCustomerThreadsControllerCore extends AdminController 'type' => 'datetime', 'optional' => true, ), - 'id_order' => array( - 'title' => $this->l('ID Order'), - 'filter_key' => 'a!id_order', - 'optional' => false, - 'visible_default' => false, - 'displayed' => false, - ), ); $this->bulk_actions = array( @@ -346,6 +347,14 @@ class AdminCustomerThreadsControllerCore extends AdminController return $customer; } + public function getOrderLink($order, $tr) + { + if ($tr['id_order']) { + return ''.'#'.$order.''; + }else{ + return '--'; + } + } public function setMedia() { diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 30026bcca..327dd6777 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -1275,6 +1275,41 @@ class AdminOrdersControllerCore extends AdminController die(Tools::jsonEncode($response)); } + public function ajaxProcessInitDeleteRoomBookingModal() + { + // set modal details + $response['hasError'] = 1; + if ($id_order = Tools::getValue('id_order') + && ($idProduct = Tools::getValue('id_product')) + && ($idOrderDetail = Tools::getValue('id_order_detail')) + && ($idRoom = Tools::getValue('id_room')) + && ($dateFrom = Tools::getValue('date_from')) + && ($dateTo = Tools::getValue('date_to')) + && ($idHtlBooking = Tools::getValue('id_htl_booking')) + && ($idHotel = Tools::getValue('id_hotel')) + ) { + $smartyVars['id_product'] = $idProduct; + $smartyVars['id_order_detail'] = $idOrderDetail; + $smartyVars['id_room'] = $idRoom; + $smartyVars['date_from'] = $dateFrom; + $smartyVars['date_to'] = $dateTo; + $smartyVars['id_htl_booking'] = $idHtlBooking; + $smartyVars['id_hotel'] = $idHotel; + $smartyVars['id_order'] = $id_order; + $this->context->smarty->assign($smartyVars); + $modal = array( + 'modal_id' => 'delete-room-booking-modal', + 'modal_class' => 'modal-md order_detail_modal', + 'modal_title' => '  '.$this->l('Delete Room'), + 'modal_content' => $this->context->smarty->fetch('controllers/orders/modals/_delete_room_booking.tpl'), + ); + $this->context->smarty->assign($modal); + $response['hasError'] = 0; + $response['modalHtml'] = $this->context->smarty->fetch('modal.tpl'); + } + die(Tools::jsonEncode($response)); + } + public function setMedia() { @@ -1558,6 +1593,17 @@ class AdminOrdersControllerCore extends AdminController if (!count($this->errors)) { // Finally, reallocate the room if ($objBookingDetail->reallocateBooking($idHtlBookingFrom, $idRoomToReallocate, $priceDiff)) { + $message = new Message(); + if ($message_content = Tools::getValue('message')) { + if (Validate::isMessage($message_content)) { + $message->message = $message_content; + $message->id_cart = (int)$this->context->cart->id; + $message->id_customer = (int)$this->context->cart->id_customer; + $message->id_order = (int)$idOrder; + $message->private = 1; + $message->save(); + } + } Tools::redirectAdmin(self::$currentIndex.'&id_order='.(int) $idOrder.'&vieworder&conf=52&token='.$this->token); } else { $this->errors[] = $this->l('Some error occured. Please try again.'); @@ -1600,6 +1646,17 @@ class AdminOrdersControllerCore extends AdminController if (!count($this->errors)) { $objBookingDetail = new HotelBookingDetail(); if ($objBookingDetail->swapBooking($idHtlBookingFrom, $idHtlBookingToSwap)) { + $message = new Message(); + if ($message_content = Tools::getValue('message')) { + if (Validate::isMessage($message_content)) { + $message->message = $message_content; + $message->id_cart = (int)$this->context->cart->id; + $message->id_customer = (int)$this->context->cart->id_customer; + $message->id_order = (int)$idOrder; + $message->private = 1; + $message->save(); + } + } Tools::redirectAdmin(self::$currentIndex.'&id_order='.(int)$idOrder.'&vieworder&conf=53&token='.$this->token); } else { $this->errors[] = $this->l('Some error occured. Please try again.'); @@ -5137,7 +5194,19 @@ class AdminOrdersControllerCore extends AdminController $order->total_discounts_tax_incl += (float)abs($cart->getOrderTotal(true, Cart::ONLY_DISCOUNTS)); // Save changes of order - $order->update(); + if($order->update()){ + $message = new Message(); + if ($message_content = Tools::getValue('message')) { + if (Validate::isMessage($message_content)) { + $message->message = $message_content; + $message->id_cart = (int)$this->context->cart->id; + $message->id_customer = (int)$this->context->cart->id_customer; + $message->id_order = (int)$order->id; + $message->private = 1; + $message->save(); + } + } + } // Update weight SUM $order_carrier = new OrderCarrier((int)$order->getIdOrderCarrier()); @@ -6197,7 +6266,19 @@ class AdminOrdersControllerCore extends AdminController $order->total_paid = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_); $order->total_paid_tax_incl = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_); $order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_); - $order->save(); + if($order->save()){ + $message = new Message(); + if ($message_content = Tools::getValue('message')) { + if (Validate::isMessage($message_content)) { + $message->message = $message_content; + $message->id_cart = (int)$this->context->cart->id; + $message->id_customer = (int)$this->context->cart->id_customer; + $message->id_order = (int)$order->id; + $message->private = 1; + $message->save(); + } + } + } // Save order invoice if (isset($order_invoice) && $order_invoice instanceof OrderInvoice) { @@ -6636,7 +6717,19 @@ class AdminOrdersControllerCore extends AdminController $objBookingDetail->id_order ); - $objBookingDetail->delete(); + if($objBookingDetail->delete()){ + $message = new Message(); + if ($message_content = Tools::getValue('message')) { + if (Validate::isMessage($message_content)) { + $message->message = $message_content; + $message->id_cart = (int)$this->context->cart->id; + $message->id_customer = (int)$this->context->cart->id_customer; + $message->id_order = (int)$order->id; + $message->private = 1; + $message->save(); + } + } + } // delete refund request of the room if exists. OrderReturnDetail::deleteReturnDetailByIdBookingDetail($id_order, $idHotelBooking); diff --git a/controllers/front/OrderDetailController.php b/controllers/front/OrderDetailController.php index 8f50f3991..25111fbad 100644 --- a/controllers/front/OrderDetailController.php +++ b/controllers/front/OrderDetailController.php @@ -490,7 +490,7 @@ class OrderDetailControllerCore extends FrontController 'deliveryAddressFormatedValues' => $deliveryAddressFormatedValues, 'deliveryState' => (Validate::isLoadedObject($addressDelivery) && $addressDelivery->id_state) ? new State($addressDelivery->id_state) : false, 'is_guest' => false, - 'messages' => CustomerMessage::getMessagesByOrderId((int) $order->id), + 'messages' => CustomerMessage::getMessagesByOrderId((int) $order->id, false), 'CUSTOMIZE_FILE' => Product::CUSTOMIZE_FILE, 'CUSTOMIZE_TEXTFIELD' => Product::CUSTOMIZE_TEXTFIELD, 'isRecyclable' => Configuration::get('PS_RECYCLABLE_PACK'), diff --git a/install/data/xml/configuration.xml b/install/data/xml/configuration.xml index 1c754ae50..932a5c6d3 100644 --- a/install/data/xml/configuration.xml +++ b/install/data/xml/configuration.xml @@ -960,7 +960,7 @@ 1 - 1 + 0 1 @@ -969,7 +969,7 @@ 1 - 1 + 0 1 diff --git a/js/admin/orders.js b/js/admin/orders.js index 0145dfa9f..50f2a0bcd 100644 --- a/js/admin/orders.js +++ b/js/admin/orders.js @@ -744,7 +744,7 @@ function initRoomEvents() var query = 'ajax=1&token='+token+'&action=addRoomOnOrder&id_order='+id_order+'&'; // query += $('#add_product_warehouse').serialize()+'&'; - query += $('#new_room select, #new_room input').serialize(); + query += $('#new_room select, #new_room input ,#new_room textarea').serialize(); if ($('select#add_product_product_invoice').val() == 0) query += '&'+$('tr#new_invoice select, tr#new_invoice input').serialize(); @@ -854,46 +854,92 @@ function initRoomEvents() } } }); + const DeleteRoomBookingModal = { + show: (data) => { + $(".loading_overlay").show(); + $.ajax({ + type: 'POST', + url: admin_order_tab_link, + dataType: 'json', + data: { + ajax: true, + action: 'initDeleteRoomBookingModal', + ...data + }, + beforeSend: function () { + $("#page-loader").show(); + }, + success: function (result) { + if (!result.hasError && result.modalHtml) { + $('#footer').next('.bootstrap').append(result.modalHtml); + $('#delete-room-booking-modal').modal('show'); + } + }, + complete: function () { + $(".loading_overlay").hide(); + $("#page-loader").hide(); + } + }); + }, + close: function() { + $('#delete-room-booking-modal').modal('hide'); + } + }; $('.delete_room_line').unbind('click').click(function(e) { - if (!confirm(txt_confirm)) - return false; - var tr_product = $(this).closest('.product-line-row'); - var id_room = tr_product.data('id_room'); - var id_product = tr_product.data('id_product'); - var id_hotel = tr_product.data('id_hotel'); - var date_from = tr_product.data('date_from'); - var date_to = tr_product.data('date_to'); - var id_order_detail = tr_product.data('id_order_detail'); - var id_htl_booking = tr_product.data('id_htl_booking'); - //var id_order_detail = $(this).closest('.product-line-row').find('td .edit_product_id_order_detail').val(); - var query = 'ajax=1&action=deleteRoomLine&token='+token+'&id_order='+id_order+'&id_htl_booking='+id_htl_booking+'&id_room='+id_room+'&id_product='+id_product+'&id_hotel='+id_hotel+'&date_from='+date_from+'&date_to='+date_to+'&id_order_detail='+id_order_detail; - query += $(this).parent().parent().find('input, select:visible, .edit_product_id_order_detail').serialize(); - $.ajax({ - type: 'POST', - url: admin_order_tab_link, - cache: false, - dataType: 'json', - data : query, - success : function(data) - { - if (data.result) - { - tr_product.fadeOut('slow', function() { - $(this).remove(); - }); - updateAmounts(data.order); - updateInvoice(data.invoices); - updateDocuments(data.documents_html); + let tr_product = $(this).closest('.product-line-row'); + const data = { + id_room : tr_product.data('id_room'), + id_product : tr_product.data('id_product'), + id_hotel : tr_product.data('id_hotel'), + date_from : tr_product.data('date_from'), + date_to : tr_product.data('date_to'), + id_order_detail : tr_product.data('id_order_detail'), + id_htl_booking : tr_product.data('id_htl_booking'), + id_order : id_order + }; + DeleteRoomBookingModal.show(data); + }); - window.location.href = admin_order_tab_link + '&conf=1&vieworder&id_order=' + data.order.id; - } - else - jAlert(data.error); - } + $(document).on('click', '#submitRoomDelete', function(e) { + e.preventDefault(); + var remark = $('#room_remark').val().trim(); + if (remark === '') { + $('#remarkGroup').addClass('has-error'); + $('#room_remark').focus(); + return false; + } + var id_room = $('input[name="id_room"]').val(); + var id_product = $('input[name="id_product"]').val(); + var id_hotel = $('input[name="id_hotel"]').val(); + var date_from = $('input[name="date_from"]').val(); + var date_to = $('input[name="date_to"]').val(); + var id_order_detail = $('input[name="id_order_detail"]').val(); + var id_htl_booking = $('input[name="id_htl_booking"]').val(); + var id_order = $('input[name="id_order"]').val(); + var query = 'ajax=1&action=deleteRoomLine&token='+token+'&id_order='+id_order+'&id_htl_booking='+id_htl_booking+'&id_room='+id_room+'&id_product='+id_product+'&id_hotel='+id_hotel+'&date_from='+date_from+'&date_to='+date_to+'&id_order_detail='+id_order_detail; + query += '&' + $(this).parent().parent().find('input, select:visible, textarea').serialize(); + $.ajax({ + type: 'POST', + url: admin_order_tab_link, + cache: false, + dataType: 'json', + data : query, + success : function(data) + { + if (data.result) + { + updateAmounts(data.order); + updateInvoice(data.invoices); + updateDocuments(data.documents_html); + window.location.href = admin_order_tab_link + '&conf=1&vieworder&id_order=' + data.order.id; + } + else + jAlert(data.error); + } }); e.preventDefault(); - }); + }); // order-payment-modal hide and show $('#add_new_payment').on('click', function(e) { @@ -1627,7 +1673,7 @@ $(document).ready(function() { if (confirm(txt_confirm)) { let query = 'ajax=1&token='+token+'&action=editRoomOnOrder&'+ - $('#edit_product').find('input, select').serialize(); + $('#edit_product').find('input, select ,textarea').serialize(); $(".loading_overlay").show(); $.ajax({ type: 'POST', diff --git a/js/admin/reallocation.js b/js/admin/reallocation.js index 0e65cd7c7..0cdf575c6 100644 --- a/js/admin/reallocation.js +++ b/js/admin/reallocation.js @@ -104,6 +104,7 @@ const RoomReallocationModal = { } else { $(".swap_avail_rooms_container").empty().text(no_swap_rm_avail_txt).addClass('text-danger'); $("#swap_room_tab .modal-footer").hide(); + $("#swap_room_tab .room_remark").closest('.form-group').hide(); } // For Rooms Reallocation From 9f641b9425ba871f5ee7b63b18dfe662534ab1d2 Mon Sep 17 00:00:00 2001 From: azhar bhat Date: Thu, 22 Jan 2026 12:16:27 +0530 Subject: [PATCH 02/52] A customer service thread is created when sending a private message through the BO order details page issue fixed --- controllers/admin/AdminOrdersController.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 327dd6777..b80854ae0 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -1800,7 +1800,22 @@ class AdminOrdersControllerCore extends AdminController if (!count($this->errors)) { //check if a thread already exist $id_customer_thread = CustomerThread::getIdCustomerThreadByEmailAndIdOrder($customer->email, $order->id); - if (!$id_customer_thread) { + if(!$id_customer_thread && !Tools::getValue('visibility')){ + $message = new Message(); + if ($message_content = Tools::getValue('message')) { + if (Validate::isMessage($message_content)) { + $message->message = $message_content; + $message->id_cart = (int)$this->context->cart->id; + $message->id_customer = (int)$this->context->cart->id_customer; + $message->id_order = (int)$order->id; + $message->private = 1; + if($message->save()){ + Tools::redirectAdmin(self::$currentIndex.'&id_order='.$order->id.'&vieworder&conf=11'.'&token='.$this->token); + } + } + } + }else{ + if (!$id_customer_thread) { $customer_thread = new CustomerThread(); $customer_thread->id_contact = (int)Configuration::get('PS_MAIL_EMAIL_MESSAGE'); $customer_thread->id_customer = (int)$order->id_customer; @@ -1861,6 +1876,7 @@ class AdminOrdersControllerCore extends AdminController } } $this->errors[] = Tools::displayError('An error occurred while sending an email to the customer.'); + } } } } else { From 6444dcc08d22a2d887c5da2956d7c0fd75f609ef Mon Sep 17 00:00:00 2001 From: azhar bhat Date: Thu, 22 Jan 2026 12:23:53 +0530 Subject: [PATCH 03/52] It shows "name validation issue fixed " git commit -m"name validation issue fixed --- install/data/xml/configuration.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/data/xml/configuration.xml b/install/data/xml/configuration.xml index 932a5c6d3..7b5f3aa97 100644 --- a/install/data/xml/configuration.xml +++ b/install/data/xml/configuration.xml @@ -957,7 +957,7 @@ 0 - 1 + 0 0 From 88cd81e36a6cdd56154d352c53b2a46b28d6235b Mon Sep 17 00:00:00 2001 From: azhar bhat Date: Fri, 23 Jan 2026 17:37:49 +0530 Subject: [PATCH 04/52] fixed please choose who to send the message to error while having filed disabled from backoffice. --- install/data/xml/configuration.xml | 3 +++ .../sass/bootstrap_lib/_grid.scss | 2 +- .../hotel-reservation-theme/sass/global.scss | 23 ++++++++++++++++--- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/install/data/xml/configuration.xml b/install/data/xml/configuration.xml index 7b5f3aa97..c77163c00 100644 --- a/install/data/xml/configuration.xml +++ b/install/data/xml/configuration.xml @@ -970,6 +970,9 @@ 0 + + + 2 1 diff --git a/themes/hotel-reservation-theme/sass/bootstrap_lib/_grid.scss b/themes/hotel-reservation-theme/sass/bootstrap_lib/_grid.scss index 7b33ecd39..72f416937 100644 --- a/themes/hotel-reservation-theme/sass/bootstrap_lib/_grid.scss +++ b/themes/hotel-reservation-theme/sass/bootstrap_lib/_grid.scss @@ -64,7 +64,7 @@ .col-lg-12 { position: relative; // Prevent columns from collapsing when empty - min-height: 1px; + // min-height: 1px; // Inner gutter via padding padding-left: ($grid-gutter-width / 2); padding-right: ($grid-gutter-width / 2); diff --git a/themes/hotel-reservation-theme/sass/global.scss b/themes/hotel-reservation-theme/sass/global.scss index 7e6cb731d..26d9406fb 100644 --- a/themes/hotel-reservation-theme/sass/global.scss +++ b/themes/hotel-reservation-theme/sass/global.scss @@ -43,10 +43,27 @@ textarea { background: $light-background; } +// #columns { +// position: relative; +// padding-bottom: 50px; +// padding-top: 15px; +// } #columns { - position: relative; - padding-bottom: 50px; - padding-top: 15px; + &:has(#center_column > *) { + position: relative; + padding-top: 15px; + padding-bottom: 50px; + } +} + +#center_column { + > .clearfix { + &:has(> div:only-child) { + > div { + padding-bottom: 0; + } + } + } } #index { From 01e84032bfe6893767a9c4f57ed333e210f1fdc2 Mon Sep 17 00:00:00 2001 From: azhar bhat Date: Fri, 23 Jan 2026 17:45:20 +0530 Subject: [PATCH 05/52] removed changes which are not related to customer service --- .../sass/bootstrap_lib/_grid.scss | 2 +- .../hotel-reservation-theme/sass/global.scss | 23 +++---------------- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/themes/hotel-reservation-theme/sass/bootstrap_lib/_grid.scss b/themes/hotel-reservation-theme/sass/bootstrap_lib/_grid.scss index 72f416937..7b33ecd39 100644 --- a/themes/hotel-reservation-theme/sass/bootstrap_lib/_grid.scss +++ b/themes/hotel-reservation-theme/sass/bootstrap_lib/_grid.scss @@ -64,7 +64,7 @@ .col-lg-12 { position: relative; // Prevent columns from collapsing when empty - // min-height: 1px; + min-height: 1px; // Inner gutter via padding padding-left: ($grid-gutter-width / 2); padding-right: ($grid-gutter-width / 2); diff --git a/themes/hotel-reservation-theme/sass/global.scss b/themes/hotel-reservation-theme/sass/global.scss index 26d9406fb..7e6cb731d 100644 --- a/themes/hotel-reservation-theme/sass/global.scss +++ b/themes/hotel-reservation-theme/sass/global.scss @@ -43,27 +43,10 @@ textarea { background: $light-background; } -// #columns { -// position: relative; -// padding-bottom: 50px; -// padding-top: 15px; -// } #columns { - &:has(#center_column > *) { - position: relative; - padding-top: 15px; - padding-bottom: 50px; - } -} - -#center_column { - > .clearfix { - &:has(> div:only-child) { - > div { - padding-bottom: 0; - } - } - } + position: relative; + padding-bottom: 50px; + padding-top: 15px; } #index { From 50275617aa5641b504759c85859c948c4c24f5c1 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Tue, 18 Nov 2025 12:10:11 +0530 Subject: [PATCH 06/52] Fixed: Getting error in growl while deleting the hotel image or while changing the cover image --- .../admin/AdminAddHotelController.php | 13 +++++----- .../views/js/HotelReservationAdmin.js | 26 ------------------- .../views/js/hotelImage.js | 6 +++-- 3 files changed, 10 insertions(+), 35 deletions(-) diff --git a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php index 57dcea009..a2b513676 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php @@ -907,6 +907,7 @@ class AdminAddHotelController extends ModuleAdminController public function ajaxProcessChangeCoverImage() { $idImage = Tools::getValue('id_image'); + $response = array('status' => false); if ($idImage) { $idHotel = Tools::getValue('id_hotel'); if ($coverImg = HotelImage::getCover($idHotel)) { @@ -918,17 +919,15 @@ class AdminAddHotelController extends ModuleAdminController $objHtlImage = new HotelImage((int) $idImage); $objHtlImage->cover = 1; if ($objHtlImage->update()) { - die(true); - } else { - die(false); + $response['status'] = true; } - } else { - die(false); } + $this->ajaxDie(json_encode($response)); } public function ajaxProcessDeleteHotelImage() { + $response = array('status' => false); if ($idImage = Tools::getValue('id_image')) { if ($idHotel = Tools::getValue('id_hotel')) { if (Validate::isLoadedObject($objHtlImage = new HotelImage((int) $idImage))) { @@ -941,12 +940,12 @@ class AdminAddHotelController extends ModuleAdminController $objHtlImage->save(); } } - die(true); + $response['status'] = true; } } } } - die(false); + $this->ajaxDie(json_encode($response)); } public function ajaxProcessUpdateSlidesPosition() diff --git a/modules/hotelreservationsystem/views/js/HotelReservationAdmin.js b/modules/hotelreservationsystem/views/js/HotelReservationAdmin.js index 33fdb3ab6..b3232b15f 100644 --- a/modules/hotelreservationsystem/views/js/HotelReservationAdmin.js +++ b/modules/hotelreservationsystem/views/js/HotelReservationAdmin.js @@ -293,32 +293,6 @@ $(document).ready(function() { } }); - // delete hotel image - $('.deleteHtlImage').on('click', function(){ - var imgId = $(this).attr('id_htl_img'); - var $this = $(this); - $.ajax({ - url: statebycountryurl, - data: { - id_htl_img: imgId, - ajax: true, - action: 'deleteHotelImage', - }, - method: 'POST', - success: function(data) { - if (data == 1) { - $this.closest('.img-container-div').remove(); - showSuccessMessage(htlImgDeleteSuccessMsg); - } else { - showErrorMessage(htlImgDeleteErrMsg); - } - }, - error: function(XMLHttpRequest, textStatus, errorThrown) { - alert(textStatus); - } - }); - }); - $('#hotel_country').on('change', function() { $('#hotel_state').empty(); $.ajax({ diff --git a/modules/hotelreservationsystem/views/js/hotelImage.js b/modules/hotelreservationsystem/views/js/hotelImage.js index ad3152c06..c1fd5f666 100644 --- a/modules/hotelreservationsystem/views/js/hotelImage.js +++ b/modules/hotelreservationsystem/views/js/hotelImage.js @@ -109,6 +109,7 @@ $(document).ready(function () { $.ajax({ type:'POST', url: adminHotelCtrlUrl, + dataType: 'json', data: { ajax: true, action: 'changeCoverImage', @@ -116,7 +117,7 @@ $(document).ready(function () { id_image: idImage, }, success: function(result) { - if (result) { + if (result.status) { // remover cover image identifier from old cover image var oldCoverImageTr = $("#hotel-image-table tbody tr.cover-image-tr"); oldCoverImageTr.removeClass("cover-image-tr").find("td.cover-image-td").removeClass("cover-image-td").find("a.changer-cover-image").removeClass("text-success").addClass("text-danger").attr("data-is-cover", "0").find("i.icon-check").removeClass("icon-check").addClass("icon-times"); @@ -149,6 +150,7 @@ $(document).ready(function () { $.ajax({ type:'POST', url: adminHotelCtrlUrl, + dataType: 'json', data: { ajax: true, action: 'deleteHotelImage', @@ -156,7 +158,7 @@ $(document).ready(function () { id_image: idImage, }, success: function(result) { - if (result) { + if (result.status) { if (parseInt(isCover)) { location.reload(); } else { From 1130f216915156dec779fca6ceb5546a4fa8b8ae Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Tue, 16 Dec 2025 12:48:28 +0530 Subject: [PATCH 07/52] Fixed: Order by and Order way not working for the lists in the Back office. --- classes/controller/AdminController.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 67d88e69a..d5299ba94 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -875,9 +875,13 @@ class AdminControllerCore extends Controller $prefix = $this->getCookieFilterPrefix(); $filters = array(); if (isset($this->list_id)) { + $postPrefixPattern = '#^(' . + preg_quote($this->list_id, '#') . 'Filter_|' . + 'submitFilter' . + ')#i'; foreach ($_POST as $key => $value) { // only process the filter fields. - if (stripos($key, $this->list_id.'Filter_') !== 0) { + if (!preg_match($postPrefixPattern, $key)) { continue; } @@ -898,9 +902,15 @@ class AdminControllerCore extends Controller } } + $getPrefixPattern = '#^(' . + preg_quote($this->list_id, '#') . 'Filter_|' . + 'submitFilter|' . + preg_quote($this->list_id, '#') . 'Orderby|' . + preg_quote($this->list_id, '#') . 'Orderway' . + ')#i'; foreach ($_GET as $key => $value) { - // only process the filter fields. - if (stripos($key, $this->list_id.'Filter_') !== 0) { + // only process the filter and order by, order way fields. + if (!preg_match($getPrefixPattern, $key)) { continue; } From 0dcfe39b0c390b202cb6ffd0b35dedb13a126e20 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Wed, 7 Jan 2026 18:29:36 +0530 Subject: [PATCH 08/52] Removed non needed code --- classes/controller/AdminController.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index d5299ba94..7e979e4d3 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -875,9 +875,9 @@ class AdminControllerCore extends Controller $prefix = $this->getCookieFilterPrefix(); $filters = array(); if (isset($this->list_id)) { - $postPrefixPattern = '#^(' . - preg_quote($this->list_id, '#') . 'Filter_|' . - 'submitFilter' . + $postPrefixPattern = '#^('. + $this->list_id.'Filter_|'. + 'submitFilter'. ')#i'; foreach ($_POST as $key => $value) { // only process the filter fields. @@ -903,10 +903,10 @@ class AdminControllerCore extends Controller } $getPrefixPattern = '#^(' . - preg_quote($this->list_id, '#') . 'Filter_|' . - 'submitFilter|' . - preg_quote($this->list_id, '#') . 'Orderby|' . - preg_quote($this->list_id, '#') . 'Orderway' . + 'submitFilter|'. + $this->list_id.'Filter_|'. + $this->list_id.'Orderby|'. + $this->list_id.'Orderway'. ')#i'; foreach ($_GET as $key => $value) { // only process the filter and order by, order way fields. From eabb8a6eecc3b01829798e0dad92426209bf0e94 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Tue, 18 Nov 2025 12:39:03 +0530 Subject: [PATCH 09/52] Fixed: Unable to update the position of the services in the back office --- controllers/admin/AdminNormalProductsController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/controllers/admin/AdminNormalProductsController.php b/controllers/admin/AdminNormalProductsController.php index 28d360e21..43838ccc8 100644 --- a/controllers/admin/AdminNormalProductsController.php +++ b/controllers/admin/AdminNormalProductsController.php @@ -2605,6 +2605,7 @@ class AdminNormalProductsControllerCore extends AdminController ->setSelectedCategories(array((int)$id_category)); $this->tpl_list_vars['category_tree'] = $tree->render(); + $this->context->smarty->assign('token', $this->token);// as tree updates the token from the smarty context // used to build the new url when changing category $this->tpl_list_vars['base_url'] = preg_replace('#&id_category=[0-9]*#', '', self::$currentIndex).'&token='.$this->token; } @@ -4513,7 +4514,7 @@ class AdminNormalProductsControllerCore extends AdminController if ($this->tabAccess['edit'] === 1) { $way = (int)(Tools::getValue('way')); $id_product = (int)Tools::getValue('id_product'); - $id_category = (int)Tools::getValue('id_category'); + $id_category = (int)Tools::getValue('id_category_hotel'); $positions = Tools::getValue('product'); $page = (int)Tools::getValue('page'); $selected_pagination = (int)Tools::getValue('selected_pagination'); @@ -4521,14 +4522,13 @@ class AdminNormalProductsControllerCore extends AdminController if (is_array($positions)) { foreach ($positions as $position => $value) { $pos = explode('_', $value); - if ((isset($pos[1]) && isset($pos[2])) && ($pos[1] == $id_category && (int)$pos[2] === $id_product)) { if ($page > 1) { $position = $position + (($page - 1) * $selected_pagination); } if ($product = new Product((int)$pos[2])) { - if (isset($position) && $product->updatePosition($way, $position)) { + if (isset($position) && $product->updatePosition($way, $position, $id_category)) { $category = new Category((int)$id_category); if (Validate::isLoadedObject($category)) { hook::Exec('categoryUpdate', array('category' => $category)); From f9925014c77de1a43d68cbc3d472a5f1f30d5d34 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Tue, 18 Nov 2025 15:20:05 +0530 Subject: [PATCH 10/52] Fixed: Getting fatal error while trying to override a class having any parent::function() call. --- classes/module/Module.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/classes/module/Module.php b/classes/module/Module.php index 1a1b4c200..0d328604c 100644 --- a/classes/module/Module.php +++ b/classes/module/Module.php @@ -3019,7 +3019,7 @@ abstract class ModuleCore ), array( ' ', - 'class '.$overrideClassName.'OverrideOriginal'.$uniq + 'class '.$overrideClassName.'OverrideOriginal'.$uniq.' extends \stdClass' ), implode('', $overrideClassFileArray) ) @@ -3037,7 +3037,7 @@ abstract class ModuleCore ), array( ' ', - 'class '.$overrideClassName.'Override'.$uniq + 'class '.$overrideClassName.'Override'.$uniq.' extends \stdClass' ), implode('', $moduleClassFileArray) ) @@ -3084,7 +3084,7 @@ abstract class ModuleCore ), array( ' ', - 'class '.$overrideClassName.'Override'.$uniq + 'class '.$overrideClassName.'Override'.$uniq.' extends \stdClass' ), implode('', $moduleClassFileArray) ) @@ -3213,7 +3213,7 @@ abstract class ModuleCore ), array( ' ', - 'class '.$overrideClassName.'Original_remove'.$uniq + 'class '.$overrideClassName.'Original_remove'.$uniq.' extends \stdClass' ), implode('', $overrideClassFileArray) ) @@ -3230,7 +3230,7 @@ abstract class ModuleCore ), array( ' ', - 'class '.$overrideClassName.'Override_remove'.$uniq + 'class '.$overrideClassName.'Override_remove'.$uniq.' extends \stdClass' ), implode('', $moduleClassFileArray) ) From 6ee830e2e4c32be73b47722347eaae652734f725 Mon Sep 17 00:00:00 2001 From: aradhana kumari Date: Tue, 13 Jan 2026 15:30:27 +0530 Subject: [PATCH 11/52] Remove Hotel Name column from the order confirmation mail --- mails/en/hotel_booking_cart_data.tpl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mails/en/hotel_booking_cart_data.tpl b/mails/en/hotel_booking_cart_data.tpl index 224fc2778..7f1d3eb67 100644 --- a/mails/en/hotel_booking_cart_data.tpl +++ b/mails/en/hotel_booking_cart_data.tpl @@ -7,7 +7,6 @@ {l s="Room Image"} {l s="Room Description"} - {l s="Hotel"} {l s="Room Capcity"} {l s="Unit Price"} {l s="Rooms Qty"} @@ -25,9 +24,6 @@ {$data_v['name']} - - {$data_v['hotel_name']} - {$rm_v['adults']} {l s='Adults'}, {$rm_v['children']} {l s='Children'} From 791e7af65f61989c8531f8f72823036957d3c1b0 Mon Sep 17 00:00:00 2001 From: aradhana kumari Date: Fri, 16 Jan 2026 18:06:47 +0530 Subject: [PATCH 12/52] Hotel wise access permission is corrected on the credit slip related to order. --- classes/order/OrderSlip.php | 2 +- controllers/admin/AdminSlipController.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/classes/order/OrderSlip.php b/classes/order/OrderSlip.php index f79952598..3f1b2694c 100644 --- a/classes/order/OrderSlip.php +++ b/classes/order/OrderSlip.php @@ -277,7 +277,7 @@ class OrderSlipCore extends ObjectModel FROM `'._DB_PREFIX_.'order_slip` os LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = os.`id_order`) WHERE os.`date_add` BETWEEN \''.pSQL($dateFrom).' 00:00:00\' AND \''.pSQL($dateTo).' 23:59:59\' - '.Shop::addSqlRestriction(Shop::SHARE_ORDER, 'o').' + '.Shop::addSqlRestriction(Shop::SHARE_ORDER, 'o'). ' ' .HotelBranchInformation::addHotelRestriction(false).' ORDER BY os.`date_add` ASC'); $slips = array(); diff --git a/controllers/admin/AdminSlipController.php b/controllers/admin/AdminSlipController.php index 78579d512..6f104daee 100644 --- a/controllers/admin/AdminSlipController.php +++ b/controllers/admin/AdminSlipController.php @@ -38,6 +38,8 @@ class AdminSlipControllerCore extends AdminController $this->_select = ' o.`id_shop`'; $this->_join .= ' LEFT JOIN '._DB_PREFIX_.'orders o ON (o.`id_order` = a.`id_order`)'; + $this->_join .= ' INNER JOIN '._DB_PREFIX_.'htl_booking_detail hbd + ON (a.`id_order` = hbd.`id_order`) ' . HotelBranchInformation::addHotelRestriction(false, 'hbd'); $this->_group = ' GROUP BY a.`id_order_slip`'; $this->addRowAction('statusChange'); From 3a82b9ad91c6521b2b8014df1be18652d2cd927e Mon Sep 17 00:00:00 2001 From: aradhana kumari Date: Thu, 15 Jan 2026 16:16:39 +0530 Subject: [PATCH 13/52] Fix module search filter issue on the Manage Modules page --- controllers/admin/AdminModulesController.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php index e9d8ab801..bec926419 100644 --- a/controllers/admin/AdminModulesController.php +++ b/controllers/admin/AdminModulesController.php @@ -1262,6 +1262,13 @@ class AdminModulesControllerCore extends AdminController if (Configuration::get('PS_SHOW_CAT_MODULES_'.(int)$this->id_employee)) { $filter_categories = explode('|', Configuration::get('PS_SHOW_CAT_MODULES_'.(int)$this->id_employee)); } + if (count($filter_categories) > 0) { + foreach ($filter_categories as $fc) { + if (!empty($fc)) { + $category_filtered[$fc] = 1; + } + } + } if (count($category_filtered) > 0 && !isset($category_filtered[$module->tab])) { return true; } From e567b0d46ac5c109edee4c6d73439c193ab09996 Mon Sep 17 00:00:00 2001 From: aradhana kumari Date: Fri, 16 Jan 2026 11:57:18 +0530 Subject: [PATCH 14/52] Fix the Employees without having access to a hotel are able to create a room type for that hotel --- controllers/admin/AdminProductsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index bf4321607..58dbcac91 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -4527,7 +4527,7 @@ class AdminProductsControllerCore extends AdminController $objRoomType = new HotelRoomType(); $objHotelInfo = new HotelBranchInformation(); - $data->assign('htl_info', $objHotelInfo->hotelsNameAndId()); + $data->assign('htl_info', HotelBranchInformation::getProfileAccessedHotels($this->context->employee->id_profile, 1)); if ($hotelRoomType = $objRoomType->getRoomTypeInfoByIdProduct($product->id)) { $data->assign('htl_room_type', $hotelRoomType); $hotelFullInfo = $objHotelInfo->hotelBranchInfoById($hotelRoomType['id_hotel']); From 4cb07af0c52273a38caabeb45383954cb7bb6e5a Mon Sep 17 00:00:00 2001 From: aradhana kumari Date: Fri, 16 Jan 2026 13:31:04 +0530 Subject: [PATCH 15/52] Update the id to id_hotel in the information tpl --- .../default/template/controllers/products/informations.tpl | 2 +- controllers/admin/AdminProductsController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/themes/default/template/controllers/products/informations.tpl b/admin/themes/default/template/controllers/products/informations.tpl index fdfa02ee0..1e76c2079 100644 --- a/admin/themes/default/template/controllers/products/informations.tpl +++ b/admin/themes/default/template/controllers/products/informations.tpl @@ -139,7 +139,7 @@

{l s='Hotel once assigned cannot be reassigned'}

diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 58dbcac91..4b302dfa9 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -3064,7 +3064,7 @@ class AdminProductsControllerCore extends AdminController if ($obj->id) { if ($this->product_exists_in_shop) { $objHotelInfo = new HotelBranchInformation(); - $hotelInfo = $objHotelInfo->hotelsNameAndId(); + $hotelInfo = HotelBranchInformation::getProfileAccessedHotels($this->context->employee->id_profile, 1); if ($hotelInfo) { $objRoomInfo = new HotelRoomInformation(); $roomStatus = $objRoomInfo->getAllRoomStatus(); From 59b724aaf5cb2cfc4781e0d522e6e291f5febd4c Mon Sep 17 00:00:00 2001 From: aradhana kumari Date: Thu, 22 Jan 2026 16:04:56 +0530 Subject: [PATCH 16/52] =?UTF-8?q?Check=20the=20condition=20and=20display?= =?UTF-8?q?=20the=20=E2=80=9CNo=20hotel=20available=E2=80=9D=20message=20i?= =?UTF-8?q?f=20no=20hotel=20is=20found?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../default/template/controllers/products/informations.tpl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/admin/themes/default/template/controllers/products/informations.tpl b/admin/themes/default/template/controllers/products/informations.tpl index 1e76c2079..cb97d2652 100644 --- a/admin/themes/default/template/controllers/products/informations.tpl +++ b/admin/themes/default/template/controllers/products/informations.tpl @@ -137,12 +137,16 @@ {l s='Select Hotel'}
+ {if isset($htl_info) && $htl_info}

{l s='Hotel once assigned cannot be reassigned'}

+ {else} +
{l s='No hotel are available'}
+ {/if}
{/if}
From cdab23d31e5773e4d7e74419f7e07255c4a3bc0f Mon Sep 17 00:00:00 2001 From: aradhana kumari Date: Fri, 21 Nov 2025 16:22:54 +0530 Subject: [PATCH 17/52] Fixed : Duplicate category is created for hotel having same name and same parent category --- .../classes/HotelBranchInformation.php | 86 ++++++++++--------- 1 file changed, 46 insertions(+), 40 deletions(-) diff --git a/modules/hotelreservationsystem/classes/HotelBranchInformation.php b/modules/hotelreservationsystem/classes/HotelBranchInformation.php index 27e679eb4..b4fb0ada8 100644 --- a/modules/hotelreservationsystem/classes/HotelBranchInformation.php +++ b/modules/hotelreservationsystem/classes/HotelBranchInformation.php @@ -730,50 +730,56 @@ class HotelBranchInformation extends ObjectModel $catName, $parent_category )) { - if (is_array($link_rewrite)) { - $objCategory = new Category($categoryExists['id_category']); - - foreach (Language::getLanguages() as $lang) { - $objCategory->link_rewrite[$lang['id_lang']] = $link_rewrite[$lang['id_lang']]; - } - - $objCategory->save(); - } - return $categoryExists['id_category']; - } else { - $category = new Category(); - foreach (Language::getLanguages(true) as $lang) { - if (is_array($name) && isset($name[$lang['id_lang']])) { - $catName = $name[$lang['id_lang']]; - } else { - $catName = $name; - } - $category->name[$lang['id_lang']] = $catName; - $category->description[$lang['id_lang']] = $this->moduleInstance->l('Hotel Branch Category', 'HotelBranchInformation'); - + $idHotel = isset($params['id_hotel']) ? $params['id_hotel'] : false; + $isHotel = isset($params['is_hotel']) ? $params['is_hotel'] : false; + $existsCatId = $categoryExists['id_category']; + $belongsToSameHotel = ($idHotel == HotelBranchInformation::getHotelIdByIdCategory($existsCatId)); + if (!$isHotel || $belongsToSameHotel) { if (is_array($link_rewrite)) { - $category->link_rewrite[$lang['id_lang']] = $link_rewrite[$lang['id_lang']]; - } else { - $category->link_rewrite[$lang['id_lang']] = Tools::link_rewrite($catName); + $objCategory = new Category($existsCatId); + + foreach (Language::getLanguages() as $lang) { + $objCategory->link_rewrite[$lang['id_lang']] = $link_rewrite[$lang['id_lang']]; + } + + $objCategory->save(); } + return $existsCatId; } - - if ($meta_title) { - $category->meta_title = $meta_title; - } - if ($meta_description) { - $category->meta_description = $meta_description; - } - if ($meta_keywords) { - $category->meta_keywords = $meta_keywords; - } - - $category->id_parent = $parent_category; - $category->groupBox = $group_ids; - $category->add(); - - return $category->id; } + + $category = new Category(); + foreach (Language::getLanguages(true) as $lang) { + if (is_array($name) && isset($name[$lang['id_lang']])) { + $catName = $name[$lang['id_lang']]; + } else { + $catName = $name; + } + $category->name[$lang['id_lang']] = $catName; + $category->description[$lang['id_lang']] = $this->moduleInstance->l('Hotel Branch Category', 'HotelBranchInformation'); + + if (is_array($link_rewrite)) { + $category->link_rewrite[$lang['id_lang']] = $link_rewrite[$lang['id_lang']]; + } else { + $category->link_rewrite[$lang['id_lang']] = Tools::link_rewrite($catName); + } + } + + if ($meta_title) { + $category->meta_title = $meta_title; + } + if ($meta_description) { + $category->meta_description = $meta_description; + } + if ($meta_keywords) { + $category->meta_keywords = $meta_keywords; + } + + $category->id_parent = $parent_category; + $category->groupBox = $group_ids; + $category->add(); + + return $category->id; } //Overrided ObjectModet::delete() to delete all the dependencies of the hotel From 9dfd4faa807afde85c95648eb43785247d966bd3 Mon Sep 17 00:00:00 2001 From: azhar bhat Date: Wed, 7 Jan 2026 17:58:33 +0530 Subject: [PATCH 18/52] Text issue fixed --- controllers/admin/AdminProductsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 4b302dfa9..0a7acb76f 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -3111,7 +3111,7 @@ class AdminProductsControllerCore extends AdminController $this->displayWarning($this->l('You must save the room type in this shop before managing hotel configuration.')); } } else { - $this->displayWarning($this->l('You must save this room type before managing hotel configuration.')); + $this->displayWarning($this->l('You must save this room type before managing rooms.')); } $this->tpl_form_vars['custom_form'] = $data->fetch(); From 35bd157769b746662a7c9bfa2f8e0c3e175e73f3 Mon Sep 17 00:00:00 2001 From: azhar bhat Date: Wed, 7 Jan 2026 18:45:05 +0530 Subject: [PATCH 19/52] Design issue in admin Modules fixed --- .../default/template/controllers/modules/configure.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/themes/default/template/controllers/modules/configure.tpl b/admin/themes/default/template/controllers/modules/configure.tpl index 24b6560a0..3d3f0d1b9 100644 --- a/admin/themes/default/template/controllers/modules/configure.tpl +++ b/admin/themes/default/template/controllers/modules/configure.tpl @@ -60,7 +60,7 @@
  • -
    {l s='Back'}
    + {l s='Back'}
    • + icon-calendar + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/qloicsexport/views/img/index.php b/modules/qloicsexport/views/img/index.php new file mode 100644 index 000000000..1ac4dd02b --- /dev/null +++ b/modules/qloicsexport/views/img/index.php @@ -0,0 +1,32 @@ += checkIn && dmy <= checkOut)) { + return [true, 'in-select-date-range', '']; + } + } + + return [true, '']; +} \ No newline at end of file diff --git a/modules/qloicsexport/views/js/index.php b/modules/qloicsexport/views/js/index.php new file mode 100644 index 000000000..1ac4dd02b --- /dev/null +++ b/modules/qloicsexport/views/js/index.php @@ -0,0 +1,32 @@ + +
    +
    +
    + +

      {l s='Export iCalendar File' mod='qloicsexport'}

    +
    +
    + +
    + {* here put all the fields for download *} +
    + +
    + +

    +
    +
    +
    + +
    +
    + + +
    +

    +
    +
    +
    + +
    +
    + + +
    +

    +
    +
    +
    +
    +
    + ** {l s='You can choose parameters from the above fields for exporting the iCalendar (.ics) file of your bookings. For all bookings, leave the fields blank.' mod='qloicsexport'} +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +{/if} \ No newline at end of file diff --git a/modules/qloicsexport/views/templates/hook/index.php b/modules/qloicsexport/views/templates/hook/index.php new file mode 100644 index 000000000..1ac4dd02b --- /dev/null +++ b/modules/qloicsexport/views/templates/hook/index.php @@ -0,0 +1,32 @@ +ppStatusDetail[$response['data']['purchase_units'][0]['payments']['captures'][0]['status_details']['reason']])) { - $smartyVars['ppstatusDetailMsg'] = $objPPOrder->ppStatusDetail[$response['data']['purchase_units'][0]['payments']['captures'][0]['status_details']['reason']]; + // Buyer making a payment in a different currency (ex: EUR) which is different from the default currency of merchant (Ex: USD), In all those cross currency cases, After Capture, transaction will fall into Pending state and will require merchant to manually go to his PayPal account and accept the payment. + $objPPOrder = new WKPayPalCommerceOrder(); + if ( + isset($response['data']['purchase_units'][0]['payments']['captures'][0]['status_details']['reason']) + && ($transactionData['pp_payment_status'] == 'PENDING' || $transactionData['pp_payment_status'] == 'DENIED') + && isset($response['data']['purchase_units'][0]['payments']['captures'][0]['status_details']['reason']) + ) { + if (isset($objPPOrder->ppStatusDetail[$response['data']['purchase_units'][0]['payments']['captures'][0]['status_details']['reason']])) { + $smartyVars['ppstatusDetailMsg'] = $objPPOrder->ppStatusDetail[$response['data']['purchase_units'][0]['payments']['captures'][0]['status_details']['reason']]; + } } - } - $smartyVars['transaction_url'] = $this->context->link->getAdminLink('AdminPaypalCommerceTransaction',Tools::getAdminTokenLite('AdminPaypalCommerceTransaction')).'&viewwk_paypal_commerce_order&id_paypal_commerce_order=' . (int)$idTrans; - $smartyVars['transaction_data'] = $transactionData; - $smartyVars['refund_data'] = $refundData; - $smartyVars['refunded_amount'] = $totalRefundedFormatted; - $smartyVars['remaining_refund'] = $remainingRefund; - $smartyVars['remaining_refund_format'] = Tools::displayPrice($remainingRefund, $orderCurrency); - $smartyVars['currency'] = $orderCurrency; - $smartyVars['WK_PAYPAL_COMMERCE_REFUND_TYPE_FULL'] = WkPaypalCommerceRefund::WK_PAYPAL_COMMERCE_REFUND_TYPE_FULL; - $smartyVars['WK_PAYPAL_COMMERCE_REFUND_TYPE_PARTIAL'] = WkPaypalCommerceRefund::WK_PAYPAL_COMMERCE_REFUND_TYPE_PARTIAL; + + $smartyVars['transaction_url'] = $this->context->link->getAdminLink('AdminPaypalCommerceTransaction',Tools::getAdminTokenLite('AdminPaypalCommerceTransaction')).'&viewwk_paypal_commerce_order&id_paypal_commerce_order=' . (int)$idTrans; + $smartyVars['transaction_data'] = $transactionData; + $smartyVars['refund_data'] = $refundData; + $smartyVars['refunded_amount'] = $totalRefundedFormatted; + $smartyVars['remaining_refund'] = $remainingRefund; + $smartyVars['remaining_refund_format'] = Tools::displayPrice($remainingRefund, $orderCurrency); + $smartyVars['currency'] = $orderCurrency; + $smartyVars['WK_PAYPAL_COMMERCE_REFUND_TYPE_FULL'] = WkPaypalCommerceRefund::WK_PAYPAL_COMMERCE_REFUND_TYPE_FULL; + $smartyVars['WK_PAYPAL_COMMERCE_REFUND_TYPE_PARTIAL'] = WkPaypalCommerceRefund::WK_PAYPAL_COMMERCE_REFUND_TYPE_PARTIAL; - $this->context->smarty->assign($smartyVars); + $this->context->smarty->assign($smartyVars); + $this->base_tpl_view = 'view.tpl'; + return parent::renderView(); + } else { + Tools::redirectAdmin(self::$currentIndex . '&token=' . $this->token); + } + } else { + Tools::redirectAdmin(self::$currentIndex . '&token=' . $this->token); } - $this->base_tpl_view = 'view.tpl'; - return parent::renderView(); } public function postProcess() diff --git a/modules/qlopaypalcommerce/views/css/front/wk_payment.css b/modules/qlopaypalcommerce/views/css/front/wk_payment.css index 27256b7ff..5843f2c29 100644 --- a/modules/qlopaypalcommerce/views/css/front/wk_payment.css +++ b/modules/qlopaypalcommerce/views/css/front/wk_payment.css @@ -45,3 +45,15 @@ @keyframes rotate { 0% {transform: rotate(0deg);} 100% {transform: rotate(360deg);}} + +p.payment_module a#qlo_paypal_btn { + background: url(../../img/paypal-payment-icon.png) 15px 8px no-repeat #fbfbfb; +} + +.qlo_paypal_methods_wrapper { + text-align: center; + padding: 20px 15px; + background: #fbfbfb; + border-radius: 3px; + border: 1px solid #d6d4d4; +} 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 @@ +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>}*g4e)H*dU zlpzudxxz3}7|ev>@IYZus3?@hV2YS@Hj68anBs~JW>jfVAyZu4uiVhz`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$?s#wq6GO*%2lcvHySrYR1c`@zy=HW(QVrC=s zb2k-1X;#pn2Qgy$cOmCwu+)XnsAZB4EuZsjd4S=uk9!OCOM{eaifW?Y1#}lV{M?IfdNK--Nxs7XSFfKv_#2d3(*n zinEhn(XB)>ylv+>3ty5>S+(AUv)Hn+=*RYpag$eD+nSx{%9DnALT<1$=Mr*Wz7^r{mT#{r9J}Y!d8C|Mzn+{F*e`@sP4Idp!JPkx##; zFXh=MXJ>73VHd>W`&Hc{E*yd$z}Um;baR`N(v_SbJv{Y0&dCYT>?f9uw>X zrydMGeLQaH-2BQ{>$dK;%?dZGUcN=|{l s='Amount' mod='qlopaypalcommerce'} {l s='Type' mod='qlopaypalcommerce'} {l s='Status' mod='qlopaypalcommerce'} + {l s='Remark' mod='qlopaypalcommerce'} {l s='Date' mod='qlopaypalcommerce'} {if $refund_data} @@ -197,6 +198,7 @@ {/if} + {$refund.refund_reason|escape:'html':'UTF-8'} {$refund.date_add|escape:'html':'UTF-8'} {/foreach} diff --git a/modules/qlopaypalcommerce/views/templates/hook/payment.tpl b/modules/qlopaypalcommerce/views/templates/hook/payment.tpl index f5bcbe0de..d1a6a8f8a 100644 --- a/modules/qlopaypalcommerce/views/templates/hook/payment.tpl +++ b/modules/qlopaypalcommerce/views/templates/hook/payment.tpl @@ -20,82 +20,114 @@ * @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0 *} -
    -
    -

    {$product['name']|escape:'html':'UTF-8'}

    +
    {$product['name']|escape:'html':'UTF-8'}
    + {if $product.price_calculation_method == Product::PRICE_CALCULATION_METHOD_PER_DAY} +
    + {if ($product.show_price && !isset($restricted_country_mode)) || isset($groups)}{if !$priceDisplay}{convertPrice price=$product.price_tax_incl}{else}{convertPrice price=$product.price_tax_exc}{/if}{/if}{l s='/night'} +
    + {/if} {if $product.allow_multiple_quantity}
    @@ -150,7 +155,21 @@
    {if ($product.show_price && !isset($restricted_country_mode)) || isset($groups)} - {if !$priceDisplay}{convertPrice price=$product.price_tax_incl}{else}{convertPrice price=$product.price_tax_exc}{/if}{if $product.price_calculation_method == Product::PRICE_CALCULATION_METHOD_PER_DAY}{l s='/Night'}{/if} + + {if !$priceDisplay} + {if $serviceSelected} + {convertPrice price=$cartRoom['selected_service'][$product['id_product']]['total_price_tax_incl']} + {else} + {convertPrice price=$product.price_tax_incl} + {/if} + {else} + {if $serviceSelected} + {convertPrice price=$cartRoom['selected_service'][$product['id_product']]['total_price_tax_excl']} + {else} + {convertPrice price=$product.price_tax_exc} + {/if} + {/if} + {/if}
    diff --git a/themes/hotel-reservation-theme/css/global.css b/themes/hotel-reservation-theme/css/global.css index 1c8ecf2e3..1f84e79ca 100644 --- a/themes/hotel-reservation-theme/css/global.css +++ b/themes/hotel-reservation-theme/css/global.css @@ -5776,10 +5776,13 @@ textarea { background: #fff; } #columns { + padding: 0; +} +#columns:has(#center_column > *) { position: relative; padding-bottom: 50px; - padding-top: 15px; } - + padding-top: 15px; +} #index .tab-content { margin-top: 35px; margin-bottom: 34px; } @@ -9049,6 +9052,11 @@ a.open_rooms_extra_services_panel { border-radius: 0 0 4px 0; box-shadow: 0 1px 0 0 rgb(0 0 0 / 13%); } +#rooms_extra_services .price-per-night { + font-size: 12px; + color: #777; + margin-bottom: 5px; +} /* fancybox changes */ diff --git a/themes/hotel-reservation-theme/js/order-opc.js b/themes/hotel-reservation-theme/js/order-opc.js index 854f90fbb..4c9ae91f1 100644 --- a/themes/hotel-reservation-theme/js/order-opc.js +++ b/themes/hotel-reservation-theme/js/order-opc.js @@ -638,6 +638,9 @@ $(document).ready(function() $(document).on('click', '#rooms_extra_services .qty_up', function(e) { e.preventDefault(); qtyfield = $(this).closest('.qty_container').find('input.qty'); + roomServiceProductValue = $(this).closest('.room_demand_block').find('.room-service-product-value'); + roomServiceProductUnitPrice = roomServiceProductValue.data('unit_price'); + roomServiceProductCurrencySign = roomServiceProductValue.data('currency_sign'); var newQuantity = parseInt(qtyfield.val()) + 1; if (qtyfield.data('max_quantity') && qtyfield.data('max_quantity') < newQuantity) { newQuantity = qtyfield.data('max_quantity'); @@ -647,6 +650,8 @@ $(document).ready(function() showErrorMessage(txtMaxQuantityAdded); } } else { + roomServiceProductTotalPriceQtyUp = newQuantity*roomServiceProductUnitPrice; + roomServiceProductValue.text(roomServiceProductCurrencySign + roomServiceProductTotalPriceQtyUp.toFixed(priceDisplayPrecision)) qtyfield.val(newQuantity).trigger('focusout'); } }); @@ -654,9 +659,15 @@ $(document).ready(function() $(document).on('click', '#rooms_extra_services .qty_down', function(e) { e.preventDefault(); qtyfield = $(this).closest('.qty_container').find('input.qty'); + roomServiceProductValue = $(this).closest('.room_demand_block').find('.room-service-product-value'); + roomServiceProductUnitPrice = roomServiceProductValue.data('unit_price'); + roomServiceProductCurrencySign = roomServiceProductValue.data('currency_sign'); var currentVal = parseInt(qtyfield.val()); if (!isNaN(currentVal) && currentVal > 1) { qtyfield.val(currentVal - 1).trigger('focusout'); + roomServiceProductTotalPriceQtyDown = qtyfield.val()*roomServiceProductUnitPrice; + roomServiceProductValue.text(roomServiceProductCurrencySign + roomServiceProductTotalPriceQtyDown.toFixed(priceDisplayPrecision)) + } else { qtyfield.val(1); if (currentVal != 1) { @@ -667,12 +678,20 @@ $(document).ready(function() $(document).on('focusout', '#rooms_extra_services .qty', function(e) { var qty_wntd = $(this).val(); - if (qty_wntd == '' || !$.isNumeric(qty_wntd)) { + roomServiceProductValue = $(this).closest('.room_demand_block').find('.room-service-product-value'); + roomServiceProductUnitPrice = roomServiceProductValue.data('unit_price'); + roomServiceProductCurrencySign = roomServiceProductValue.data('currency_sign'); + + if (qty_wntd == '' || !$.isNumeric(qty_wntd) || qty_wntd < 1) { $(this).val(1); } if ($(this).data('max_quantity') && $(this).data('max_quantity') < qty_wntd) { $(this).val(qtyfield.data('max_quantity')); } + + roomServiceProductTotalPriceQty = $(this).val()*roomServiceProductUnitPrice; + roomServiceProductValue.text(roomServiceProductCurrencySign + roomServiceProductTotalPriceQty.toFixed(priceDisplayPrecision)) + if ($(this).closest('.room_demand_block').find('.change_room_type_service_product').is(':checked')) { updateServiceProducts($(this).closest('.room_demand_block').find('.change_room_type_service_product')); } diff --git a/themes/hotel-reservation-theme/our-properties.tpl b/themes/hotel-reservation-theme/our-properties.tpl index 094f83dff..88f46e6ac 100644 --- a/themes/hotel-reservation-theme/our-properties.tpl +++ b/themes/hotel-reservation-theme/our-properties.tpl @@ -74,7 +74,7 @@ {$hotel['email']}

    - {l s='View Rooms'} + {l s='View Property'} {if ($hotel['latitude'] != 0 || $hotel['longitude'] != 0) && $viewOnMap} {l s='View on map'} {/if} diff --git a/themes/hotel-reservation-theme/product.tpl b/themes/hotel-reservation-theme/product.tpl index 9492fbc86..67f4a03fe 100644 --- a/themes/hotel-reservation-theme/product.tpl +++ b/themes/hotel-reservation-theme/product.tpl @@ -238,13 +238,13 @@
    {/block} {block name='product_info_tab_room_guests'} - {if isset($room_type_info['adults']) && isset($room_type_info['children']) } + {if isset($room_type_info['max_adults']) && isset($room_type_info['max_children']) }
    {l s='Max Capacity'}
    -

    {$room_type_info['adults']} {l s='Adults'}, {$room_type_info['children']} {if $room_type_info['children'] > 1}{l s='Children'}{else}{l s='Child'}{/if} ({l s='Max guests'}: {$room_type_info['max_guests']|escape:'htmlall':'UTF-8'})

    +

    {$room_type_info['max_adults']} {l s='Adults'}, {$room_type_info['max_children']} {if $room_type_info['max_children'] > 1}{l s='Children'}{else}{l s='Child'}{/if} ({l s='Max guests'}: {$room_type_info['max_guests']|escape:'htmlall':'UTF-8'})

    {/if} From ca1c222c36090adc88bebdf73143caf130174ee3 Mon Sep 17 00:00:00 2001 From: aradhana kumari Date: Fri, 15 May 2026 12:30:30 +0530 Subject: [PATCH 47/52] Fixed: Prevent unauthorized file read via email parameter in ajax endpoint Co-authored-by: Name --- admin/ajax.php | 3 +++ controllers/admin/AdminTranslationsController.php | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/admin/ajax.php b/admin/ajax.php index 2506e809d..d5b294f95 100644 --- a/admin/ajax.php +++ b/admin/ajax.php @@ -125,6 +125,9 @@ if (Tools::isSubmit('getZones')) { } if (Tools::isSubmit('getEmailHTML') && $email = Tools::getValue('email')) { + if (strpos($email, '..') !== false) { + die(''); + } $email_html = AdminTranslationsController::getEmailHTML($email); die($email_html); } diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php index 1232fb59e..0fd5fe809 100644 --- a/controllers/admin/AdminTranslationsController.php +++ b/controllers/admin/AdminTranslationsController.php @@ -3045,8 +3045,13 @@ class AdminTranslationsControllerCore extends AdminController $email_file = _PS_ROOT_DIR_.$email; } - $email_html = file_get_contents($email_file); + $sanitizedFilePath = realpath($email_file); + $permittedMailDir = realpath(_PS_MAIL_DIR_); - return $email_html; + if ($sanitizedFilePath === false || $permittedMailDir === false || strpos($sanitizedFilePath, $permittedMailDir) !== 0) { + return false; + } + + return file_get_contents($sanitizedFilePath); } } From 61ddc310c4fadd98ac98cdac75bc34355bc1cdaa Mon Sep 17 00:00:00 2001 From: aradhana kumari Date: Fri, 15 May 2026 14:58:01 +0530 Subject: [PATCH 48/52] fix: prevent remote code execution in AdminTranslations language pack import Co-authored-by: Name --- .../admin/AdminTranslationsController.php | 39 ++++++++++++------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php index 0fd5fe809..5f70e049c 100644 --- a/controllers/admin/AdminTranslationsController.php +++ b/controllers/admin/AdminTranslationsController.php @@ -750,24 +750,28 @@ class AdminTranslationsControllerCore extends AdminController $uniqid = uniqid(); $sandbox = _PS_CACHE_DIR_.'sandbox'.DIRECTORY_SEPARATOR.$uniqid.DIRECTORY_SEPARATOR; - if ($gz->extractList($files_paths, $sandbox)) { - foreach ($files_list as $file2check) { - //don't validate index.php, will be overwrite when extract in translation directory - if (pathinfo($file2check['filename'], PATHINFO_BASENAME) == 'index.php') { - continue; - } - - if (preg_match('@^[0-9a-z-_/\\\\]+\.php$@i', $file2check['filename'])) { - if (!@filemtime($sandbox.$file2check['filename']) || !AdminTranslationsController::checkTranslationFile(file_get_contents($sandbox.$file2check['filename']))) { - $this->errors[] = sprintf(Tools::displayError('Validation failed for: %s'), $file2check['filename']); - } - } elseif (!preg_match('@mails[0-9a-z-_/\\\\]+\.(html|tpl|txt)$@i', $file2check['filename'])) { - $this->errors[] = sprintf(Tools::displayError('Unidentified file found: %s'), $file2check['filename']); - } - } + if (!$gz->extractList($files_paths, $sandbox)) { + $this->errors[] = Tools::displayError('The archive cannot be extracted.'); Tools::deleteDirectory($sandbox, true); + return false; } + foreach ($files_list as $file2check) { + //don't validate index.php, will be overwrite when extract in translation directory + if (pathinfo($file2check['filename'], PATHINFO_BASENAME) == 'index.php') { + continue; + } + + if (preg_match('@^[0-9a-z-_/\\\\]+\.php$@i', $file2check['filename'])) { + if (!@filemtime($sandbox.$file2check['filename']) || !AdminTranslationsController::checkTranslationFile(file_get_contents($sandbox.$file2check['filename']))) { + $this->errors[] = sprintf(Tools::displayError('Validation failed for: %s'), $file2check['filename']); + } + } elseif (!preg_match('@mails[0-9a-z-_/\\\\]+\.(html|tpl|txt)$@i', $file2check['filename'])) { + $this->errors[] = sprintf(Tools::displayError('Unidentified file found: %s'), $file2check['filename']); + } + } + Tools::deleteDirectory($sandbox, true); + $i = 0; $tmp_array = array(); foreach ($files_paths as $files_path) { @@ -837,10 +841,15 @@ class AdminTranslationsControllerCore extends AdminController public static function filterTranslationFiles($list) { $kept = array(); + $allowedExtensions = array('php', 'html', 'tpl', 'txt'); foreach ($list as $file) { if ('index.php' == basename($file['filename'])) { continue; } + $extension = strtolower(pathinfo($file['filename'], PATHINFO_EXTENSION)); + if (!in_array($extension, $allowedExtensions)) { + continue; + } if (preg_match('#^modules/([^/]+)/#', $file['filename'], $m)) { if (is_dir(_PS_MODULE_DIR_.$m[1])) { $kept[] = $file; From 4d3dfb100e55c1b0b207f693c4aab4ef4aceb6b9 Mon Sep 17 00:00:00 2001 From: aradhana kumari Date: Tue, 19 May 2026 15:19:08 +0530 Subject: [PATCH 49/52] Fixed: When the hotel location field is disabled, the hotel list dropdown appears at bottom Co-authored-by: Name --- .../views/js/wk-room-search-block.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/wkroomsearchblock/views/js/wk-room-search-block.js b/modules/wkroomsearchblock/views/js/wk-room-search-block.js index 0b6c67465..8cf8d02b2 100644 --- a/modules/wkroomsearchblock/views/js/wk-room-search-block.js +++ b/modules/wkroomsearchblock/views/js/wk-room-search-block.js @@ -934,6 +934,10 @@ $(document).ready(function() { }); }); + $('select#id_hotel_button').on('chosen:showing_dropdown', function() { + setBookingSearchPositions(); + }); + $('#daterange_value').click(function () { setBookingSearchPositions(); }); @@ -979,9 +983,9 @@ function setBookingSearchPositions() { let searchForm = $('#search_hotel_block_form'); let inputFieldsAndDropdowns = [ - { input: $('#hotel_location'), dropdown: $('.location_search_results_ul')}, + { input: $('#hotel_location'), dropdown: $('.location_search_results_ul')}, { input: $('.hotel-selector-wrap'), dropdown: $('#id_hotel_button_chosen .chosen-drop')}, - { input: $('#guest_occupancy'), dropdown: $('#search_occupancy_wrapper')}, + { input: $('#guest_occupancy'), dropdown: $('#search_occupancy_wrapper')}, ]; let positionClass = 'bottom'; @@ -993,9 +997,8 @@ function setBookingSearchPositions() { // calculate max height for dropdowns let maxHeightNeeded = 0; $(inputFieldsAndDropdowns).each(function (i, inputFieldAndDropdown) { - if (!inputFieldAndDropdown.input.length) return false; + if (!inputFieldAndDropdown.input.length || !inputFieldAndDropdown.input.is(':visible')) return true; - // find needed space height let cssMaxHeight = parseInt(inputFieldAndDropdown.dropdown.css('max-height')); if (Number.isInteger(cssMaxHeight)) { maxHeightNeeded = Math.max(maxHeightNeeded, cssMaxHeight); @@ -1003,7 +1006,7 @@ function setBookingSearchPositions() { }); // determine position class - if (spaceBottom < maxHeightNeeded && spaceTop > spaceBottom) { + if (spaceTop > spaceBottom && (maxHeightNeeded === 0 || spaceBottom < maxHeightNeeded)) { positionClass = 'top'; } } From 4bf8f43c57cdf388fcdd39c7fb8e39c936838cf7 Mon Sep 17 00:00:00 2001 From: aradhana kumari Date: Wed, 20 May 2026 19:00:10 +0530 Subject: [PATCH 50/52] Add some more restrictions Co-authored-by: Name --- .../admin/AdminTranslationsController.php | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php index 5f70e049c..e56831c50 100644 --- a/controllers/admin/AdminTranslationsController.php +++ b/controllers/admin/AdminTranslationsController.php @@ -748,6 +748,11 @@ class AdminTranslationsControllerCore extends AdminController $files_list = AdminTranslationsController::filterTranslationFiles($gz->listContent()); $files_paths = AdminTranslationsController::filesListToPaths($files_list); + if (empty($files_list)) { + $this->errors[] = Tools::displayError('No valid translation files found in the archive.'); + return false; + } + $uniqid = uniqid(); $sandbox = _PS_CACHE_DIR_.'sandbox'.DIRECTORY_SEPARATOR.$uniqid.DIRECTORY_SEPARATOR; if (!$gz->extractList($files_paths, $sandbox)) { @@ -843,14 +848,24 @@ class AdminTranslationsControllerCore extends AdminController $kept = array(); $allowedExtensions = array('php', 'html', 'tpl', 'txt'); foreach ($list as $file) { - if ('index.php' == basename($file['filename'])) { - continue; - } - $extension = strtolower(pathinfo($file['filename'], PATHINFO_EXTENSION)); + $filename = $file['filename']; + $extension = strtolower(pathinfo($filename, PATHINFO_EXTENSION)); + if (!in_array($extension, $allowedExtensions)) { continue; } - if (preg_match('#^modules/([^/]+)/#', $file['filename'], $m)) { + + if ('index.php' == basename($filename)) { + continue; + } + + if ($extension === 'php' + && !preg_match('#^modules/([^/]+)/#', $filename) + && !preg_match('@^translations/[a-z]{2,3}/[a-z0-9_-]+\.php$@i', $filename)) { + continue; + } + + if (preg_match('#^modules/([^/]+)/#', $filename, $m)) { if (is_dir(_PS_MODULE_DIR_.$m[1])) { $kept[] = $file; } @@ -3055,7 +3070,7 @@ class AdminTranslationsControllerCore extends AdminController } $sanitizedFilePath = realpath($email_file); - $permittedMailDir = realpath(_PS_MAIL_DIR_); + $permittedMailDir = realpath(_PS_MAIL_DIR_) . DIRECTORY_SEPARATOR; if ($sanitizedFilePath === false || $permittedMailDir === false || strpos($sanitizedFilePath, $permittedMailDir) !== 0) { return false; From bc4e92e85abce1412b6e23cc4eb6bf8108408214 Mon Sep 17 00:00:00 2001 From: aradhana kumari Date: Fri, 22 May 2026 12:30:07 +0530 Subject: [PATCH 51/52] Remove the extra space Co-authored-by: Name --- modules/wkroomsearchblock/views/js/wk-room-search-block.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/wkroomsearchblock/views/js/wk-room-search-block.js b/modules/wkroomsearchblock/views/js/wk-room-search-block.js index 8cf8d02b2..a07e68027 100644 --- a/modules/wkroomsearchblock/views/js/wk-room-search-block.js +++ b/modules/wkroomsearchblock/views/js/wk-room-search-block.js @@ -923,6 +923,8 @@ $(document).ready(function() { // set positions of popups when required if (page_name == 'index') { + setBookingSearchPositions(); + $('#hotel_location, #id_hotel_button_chosen, #guest_occupancy').focus(function () { setBookingSearchPositions(); }); @@ -983,9 +985,9 @@ function setBookingSearchPositions() { let searchForm = $('#search_hotel_block_form'); let inputFieldsAndDropdowns = [ - { input: $('#hotel_location'), dropdown: $('.location_search_results_ul')}, + { input: $('#hotel_location'), dropdown: $('.location_search_results_ul')}, { input: $('.hotel-selector-wrap'), dropdown: $('#id_hotel_button_chosen .chosen-drop')}, - { input: $('#guest_occupancy'), dropdown: $('#search_occupancy_wrapper')}, + { input: $('#guest_occupancy'), dropdown: $('#search_occupancy_wrapper')}, ]; let positionClass = 'bottom'; From d0bbff5e12720b5ac9f8289a87387778d1ebb004 Mon Sep 17 00:00:00 2001 From: aradhana kumari Date: Tue, 26 May 2026 19:23:47 +0530 Subject: [PATCH 52/52] Update the code Co-authored-by: Name --- admin/ajax.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/admin/ajax.php b/admin/ajax.php index d5b294f95..2506e809d 100644 --- a/admin/ajax.php +++ b/admin/ajax.php @@ -125,9 +125,6 @@ if (Tools::isSubmit('getZones')) { } if (Tools::isSubmit('getEmailHTML') && $email = Tools::getValue('email')) { - if (strpos($email, '..') !== false) { - die(''); - } $email_html = AdminTranslationsController::getEmailHTML($email); die($email_html); }