From 646f45c78393cc085d227efbca3d1b6c71c87bd1 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Tue, 7 May 2024 13:07:36 +0530 Subject: [PATCH 01/48] Fixed: The noticies on the Admin controllers when the identifier provided manually by editing the url does not exists in the database --- classes/order/Order.php | 2 +- controllers/admin/AdminCmsContentController.php | 6 ++++-- controllers/admin/AdminFeaturesController.php | 5 ++--- controllers/admin/AdminNormalProductsController.php | 6 ++++++ controllers/admin/AdminOrdersController.php | 10 +++++----- controllers/admin/AdminProductsController.php | 6 ++++++ controllers/admin/AdminRequestSqlController.php | 6 ++---- .../admin/AdminOrderRefundRequestsController.php | 2 +- 8 files changed, 27 insertions(+), 16 deletions(-) diff --git a/classes/order/Order.php b/classes/order/Order.php index a4e7a5e6b..dc29f2652 100644 --- a/classes/order/Order.php +++ b/classes/order/Order.php @@ -1804,7 +1804,7 @@ class OrderCore extends ObjectModel SELECT opd.`amount` as `real_paid_amount`, opd.*, op.* FROM `'._DB_PREFIX_.'order_payment_detail` opd INNER JOIN `'._DB_PREFIX_.'order_payment` op ON (opd.`id_order_payment` = op.`id_order_payment`) - WHERE `id_order` = '.$this->id + WHERE `id_order` = '.(int) $this->id ); } diff --git a/controllers/admin/AdminCmsContentController.php b/controllers/admin/AdminCmsContentController.php index 9bf088b58..6708fa987 100644 --- a/controllers/admin/AdminCmsContentController.php +++ b/controllers/admin/AdminCmsContentController.php @@ -85,6 +85,7 @@ class AdminCmsContentControllerCore extends AdminController public function initContent() { + $this->loadObject(true); $this->initTabModuleList(); $this->renderPageHeaderToolbar(); @@ -151,8 +152,9 @@ class AdminCmsContentControllerCore extends AdminController if (Tools::getValue('addcms') !== false) { $this->toolbar_title[] = $this->l('Add new'); - } elseif ($id_cms_page) { - $cms_page = new CMS($id_cms_page); + } elseif ($id_cms_page + && Validate::isLoadedObject($cms_page = new CMS($id_cms_page)) + ) { $this->toolbar_title[] = sprintf($this->l('Edit: %s'), $cms_page->meta_title[$this->context->employee->id_lang]); } } else { diff --git a/controllers/admin/AdminFeaturesController.php b/controllers/admin/AdminFeaturesController.php index c581d2604..c57d5d807 100644 --- a/controllers/admin/AdminFeaturesController.php +++ b/controllers/admin/AdminFeaturesController.php @@ -452,10 +452,9 @@ class AdminFeaturesControllerCore extends AdminController $this->initToolbar(); $this->initPageHeaderToolbar(); if ($this->display == 'edit' || $this->display == 'add') { - if (!$this->loadObject(true)) { - return; + if ($this->loadObject(true)) { + $this->content .= $this->renderForm(); } - $this->content .= $this->renderForm(); } elseif ($this->display == 'view') { // Some controllers use the view action without an object if ($this->className) { diff --git a/controllers/admin/AdminNormalProductsController.php b/controllers/admin/AdminNormalProductsController.php index 87a959951..6cd378dbf 100644 --- a/controllers/admin/AdminNormalProductsController.php +++ b/controllers/admin/AdminNormalProductsController.php @@ -398,6 +398,12 @@ class AdminNormalProductsControllerCore extends AdminController $bo_theme = 'default'; } + Media::addJsDef( + array( + 'tb_pathToImage' => '../img/loadingAnimation.gif' + ) + ); + $this->addJs(__PS_BASE_URI__.$this->admin_webpath.'/themes/'.$bo_theme.'/js/jquery.iframe-transport.js'); $this->addJs(__PS_BASE_URI__.$this->admin_webpath.'/themes/'.$bo_theme.'/js/jquery.fileupload.js'); $this->addJs(__PS_BASE_URI__.$this->admin_webpath.'/themes/'.$bo_theme.'/js/jquery.fileupload-process.js'); diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 9c6d1fe61..870ac9432 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -482,8 +482,7 @@ class AdminOrdersControllerCore extends AdminController { if ($this->display == 'view') { /** @var Order $order */ - $order = $this->loadObject(); - + $order = new Order(Tools::getValue($this->identifier)); // hotel link in header if ($idHotel = HotelBookingDetail::getIdHotelByIdOrder($order->id)) { $this->toolbar_btn['hotel'] = array( @@ -997,7 +996,9 @@ class AdminOrdersControllerCore extends AdminController $this->addJS(_PS_JS_DIR_.'vendor/d3.v3.min.js'); if ($this->tabAccess['edit'] == 1 && $this->display == 'view') { - $this->addJS(_PS_JS_DIR_.'admin/orders.js'); + if ($this->loadObject(true)) { + $this->addJS(_PS_JS_DIR_.'admin/orders.js'); + } // $this->addJS(_PS_JS_DIR_.'admin/orders-product-event.js'); // $this->addJS(_PS_JS_DIR_.'admin/orders-room-event.js'); $this->addJS(_PS_JS_DIR_.'tools.js'); @@ -2477,11 +2478,10 @@ class AdminOrdersControllerCore extends AdminController { $order = new Order(Tools::getValue('id_order')); if (!Validate::isLoadedObject($order)) { - $this->errors[] = Tools::displayError('The order cannot be found within your database.'); + return false; } $this->content .= $this->renderKpis(); - $customer = new Customer($order->id_customer); $carrier = new Carrier($order->id_carrier); $products = $this->getProducts($order); diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 811207d39..4f4277bdb 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -468,6 +468,12 @@ class AdminProductsControllerCore extends AdminController $bo_theme = 'default'; } + Media::addJsDef( + array( + 'tb_pathToImage' => '../img/loadingAnimation.gif' + ) + ); + $this->addJs(__PS_BASE_URI__.$this->admin_webpath.'/themes/'.$bo_theme.'/js/jquery.iframe-transport.js'); $this->addJs(__PS_BASE_URI__.$this->admin_webpath.'/themes/'.$bo_theme.'/js/jquery.fileupload.js'); $this->addJs(__PS_BASE_URI__.$this->admin_webpath.'/themes/'.$bo_theme.'/js/jquery.fileupload-process.js'); diff --git a/controllers/admin/AdminRequestSqlController.php b/controllers/admin/AdminRequestSqlController.php index a8e5507b1..068face35 100644 --- a/controllers/admin/AdminRequestSqlController.php +++ b/controllers/admin/AdminRequestSqlController.php @@ -283,11 +283,9 @@ class AdminRequestSqlControllerCore extends AdminController $this->initToolbar(); $this->initPageHeaderToolbar(); if ($this->display == 'edit' || $this->display == 'add') { - if (!$this->loadObject(true)) { - return; + if ($this->loadObject(true)) { + $this->content .= $this->renderForm(); } - - $this->content .= $this->renderForm(); } elseif ($this->display == 'view') { // Some controllers use the view action without an object if ($this->className) { diff --git a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php index f6eb2fb5f..916e6c1c2 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php @@ -135,7 +135,7 @@ class AdminOrderRefundRequestsController extends ModuleAdminController public function renderView() { - if (!($objOrderReturn = $this->loadObject(true))) { + if (!($objOrderReturn = $this->loadObject())) { return; } $refundStatuses = OrderReturnStateCore::getOrderReturnStates($this->context->language->id); From c91935a28d7eac3d08f5db3c00b0fe8e09858b32 Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Tue, 21 May 2024 17:50:06 +0530 Subject: [PATCH 02/48] Fixed:The option to select children's age is not showing in the popup while editing occupancy on the order detail page. --- .../controllers/orders/modals/_edit_room_tab_content.tpl | 2 ++ js/admin/orders.js | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/admin/themes/default/template/controllers/orders/modals/_edit_room_tab_content.tpl b/admin/themes/default/template/controllers/orders/modals/_edit_room_tab_content.tpl index 444182bab..02d5ae38c 100644 --- a/admin/themes/default/template/controllers/orders/modals/_edit_room_tab_content.tpl +++ b/admin/themes/default/template/controllers/orders/modals/_edit_room_tab_content.tpl @@ -89,6 +89,8 @@ + +

diff --git a/js/admin/orders.js b/js/admin/orders.js index 8a551b4fa..25d8111a3 100644 --- a/js/admin/orders.js +++ b/js/admin/orders.js @@ -523,15 +523,12 @@ function initProductEvents() $(this).val(max_child_in_room); if (elementVal == 1) { showOccupancyError(no_children_allowed_txt, $(this).closest(".occupancy_info_block")); - haserror = true; } else { showOccupancyError(max_children_txt, $(this).closest(".occupancy_info_block")); - haserror = true; } } else if (elementVal > max_allowed_for_current) { $(this).val(max_allowed_for_current); showOccupancyError(max_occupancy_reached_txt, $(this).closest(".occupancy_info_block")); - haserror = true; } } else { max_adults_in_room = $(this).closest(".booking_occupancy_wrapper").find('.max_adults').val(); From f9ccc67a4e7ffb6da88e69210aafc75d9be14973 Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Wed, 22 May 2024 12:23:38 +0530 Subject: [PATCH 03/48] Fixed:During addition of rooms in booking from backoffice, scrolling the page displaces the suggested room types from input in the modal --- admin/themes/default/sass/vendor/bootstrap-sass/_modals.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/themes/default/sass/vendor/bootstrap-sass/_modals.scss b/admin/themes/default/sass/vendor/bootstrap-sass/_modals.scss index 8240fa4ad..a126c3986 100644 --- a/admin/themes/default/sass/vendor/bootstrap-sass/_modals.scss +++ b/admin/themes/default/sass/vendor/bootstrap-sass/_modals.scss @@ -9,7 +9,7 @@ // Kill the scroll on the body .modal-open { - overflow-x: hidden; + overflow: hidden; } // Container that the modal scrolls within From c19a195d8b26ef134eb58d8206324f75e998f33e Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Wed, 22 May 2024 15:22:54 +0530 Subject: [PATCH 04/48] Fixed: Time is not shown with date for check-In and check-out status in Room Status section in back-office order detail page --- .../default/template/controllers/orders/helpers/view/view.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 f28080e92..f20d03ea1 100644 --- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -127,9 +127,9 @@ {if $data['id_status'] == $hotel_order_status['STATUS_ALLOTED']['id_status']} {l s='Alloted'} {elseif $data['id_status'] == $hotel_order_status['STATUS_CHECKED_IN']['id_status']} - {l s='Checked in on'} {dateFormat date=$data['check_in']} + {l s='Checked in on'} {dateFormat date=$data['check_in'] full=1} {elseif $data['id_status'] == $hotel_order_status['STATUS_CHECKED_OUT']['id_status']} - {l s='Checked out on'} {dateFormat date=$data['check_out']} + {l s='Checked out on'} {dateFormat date=$data['check_out'] full=1} {/if} From e7f3fd1beb23b3fb8cb5d5b9f5009f075c85f9fd Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Wed, 22 May 2024 15:48:16 +0530 Subject: [PATCH 05/48] add scrollbar in Private note on order detail page --- admin/themes/default/sass/controllers/_order.sass | 3 +++ 1 file changed, 3 insertions(+) diff --git a/admin/themes/default/sass/controllers/_order.sass b/admin/themes/default/sass/controllers/_order.sass index c5315218e..c32768ed0 100644 --- a/admin/themes/default/sass/controllers/_order.sass +++ b/admin/themes/default/sass/controllers/_order.sass @@ -77,3 +77,6 @@ .room_status_info_form .room_status white-space: normal + +#noteContent + max-height: 200px \ No newline at end of file From e879c6638d58917c81d47198a71510865fb33da0 Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Wed, 22 May 2024 18:40:30 +0530 Subject: [PATCH 06/48] Fixed:At the time of room edit mention price is tax included or excluded --- .../controllers/orders/modals/_add_room_booking.tpl | 4 ++-- .../controllers/orders/modals/_edit_room_tab_content.tpl | 2 +- .../modals/_extra_services_facilities_tab_content.tpl | 6 +++--- .../modals/_extra_services_service_products_tab_content.tpl | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) 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 63d96c205..92beca110 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 @@ -49,7 +49,7 @@
- +
{if $currency->format % 2}
{$currency->sign}
{/if} @@ -57,7 +57,7 @@
- +
{if $currency->format % 2}
{$currency->sign}
{/if} diff --git a/admin/themes/default/template/controllers/orders/modals/_edit_room_tab_content.tpl b/admin/themes/default/template/controllers/orders/modals/_edit_room_tab_content.tpl index 02d5ae38c..932b0bc19 100644 --- a/admin/themes/default/template/controllers/orders/modals/_edit_room_tab_content.tpl +++ b/admin/themes/default/template/controllers/orders/modals/_edit_room_tab_content.tpl @@ -50,7 +50,7 @@
- +
{if $currency->format % 2}
{$currency->sign}
{/if} diff --git a/admin/themes/default/template/controllers/orders/modals/_extra_services_facilities_tab_content.tpl b/admin/themes/default/template/controllers/orders/modals/_extra_services_facilities_tab_content.tpl index 1231752ca..4dee95332 100644 --- a/admin/themes/default/template/controllers/orders/modals/_extra_services_facilities_tab_content.tpl +++ b/admin/themes/default/template/controllers/orders/modals/_extra_services_facilities_tab_content.tpl @@ -31,8 +31,8 @@ {l s='Name'} - {l s='Unit Price'} - {l s='Total Price'} + {l s='Unit Price (tax excl.)'} + {l s='Total Price (tax excl.)'} {l s='Action'} @@ -77,7 +77,7 @@ {l s='Name'} {l s='Option'} - {l s='Unit Price'} + {l s='Unit Price (tax excl.)'} diff --git a/admin/themes/default/template/controllers/orders/modals/_extra_services_service_products_tab_content.tpl b/admin/themes/default/template/controllers/orders/modals/_extra_services_service_products_tab_content.tpl index 67412d3fc..ac4ce1231 100644 --- a/admin/themes/default/template/controllers/orders/modals/_extra_services_service_products_tab_content.tpl +++ b/admin/themes/default/template/controllers/orders/modals/_extra_services_service_products_tab_content.tpl @@ -33,8 +33,8 @@ {l s='Name'} {l s='Quantity'} - {l s='Unit Price'} - {l s='Total Price'} + {l s='Unit Price (tax excl.)'} + {l s='Total Price (tax excl.)'} {l s='Action'} @@ -101,7 +101,7 @@ {l s='Name'} {l s='Quantity'} - {l s='Unit Price'} + {l s='Unit Price (tax excl.)'} From 2081d72d74a4377553bfd8cc064ca28414239159 Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Wed, 22 May 2024 18:48:19 +0530 Subject: [PATCH 07/48] Fixed: Showing status booked on header even after all bookings are refunded on order detail page in back-office --- .../default/template/controllers/orders/helpers/view/view.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 74eb8d437..9f884e2b1 100644 --- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -28,9 +28,9 @@ {block name=pageTitle}

{if is_array($title)}{$title|end|strip_tags}{else}{$title|strip_tags}{/if} - {if $currentState == Configuration::get('PS_OS_REFUND')} + {if $currentState->id == Configuration::get('PS_OS_REFUND')} {l s='Refunded'} - {elseif $currentState == Configuration::get('PS_OS_CANCELED')} + {elseif $currentState->id == Configuration::get('PS_OS_CANCELED')} {l s='Cancelled'} {else} {l s='Booked'} From 3433aec4b222d5fb79e33c9575b30608ff119b83 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Mon, 27 May 2024 12:00:37 +0530 Subject: [PATCH 08/48] Updated: The google maps will now display the store icon insted of the default marker --- controllers/front/StoresController.php | 6 +++++- modules/hotelreservationsystem/hotelreservationsystem.php | 7 +++++++ .../views/js/HotelReservationAdmin.js | 1 + .../hotelreservationsystem/views/js/searchResultsMap.js | 1 + themes/hotel-reservation-theme/js/contact-form.js | 1 + themes/hotel-reservation-theme/js/order-detail.js | 1 + themes/hotel-reservation-theme/js/product.js | 1 + 7 files changed, 17 insertions(+), 1 deletion(-) diff --git a/controllers/front/StoresController.php b/controllers/front/StoresController.php index 89f21c5ac..901f5ec7d 100644 --- a/controllers/front/StoresController.php +++ b/controllers/front/StoresController.php @@ -208,8 +208,12 @@ class StoresControllerCore extends FrontController */ protected function assignStores() { - $this->context->smarty->assign('hasStoreIcon', Tools::file_get_contents($this->context->link->getMediaLink(_PS_IMG_DIR_.Configuration::get('PS_STORES_ICON')))); // by webkul to get media link. + $hasStoreIcon = false; + if (Tools::file_get_contents($this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_STORES_ICON')))) { // by webkul to get media link. + $hasStoreIcon = true; + } + $this->context->smarty->assign('hasStoreIcon', $hasStoreIcon); $distance_unit = Configuration::get('PS_DISTANCE_UNIT'); if (!in_array($distance_unit, array('km', 'mi'))) { $distance_unit = 'km'; diff --git a/modules/hotelreservationsystem/hotelreservationsystem.php b/modules/hotelreservationsystem/hotelreservationsystem.php index bf6473245..0466fcf00 100644 --- a/modules/hotelreservationsystem/hotelreservationsystem.php +++ b/modules/hotelreservationsystem/hotelreservationsystem.php @@ -87,6 +87,9 @@ class HotelReservationSystem extends Module public function hookActionFrontControllerSetMedia() { + Media::addJsDef(array( + 'PS_STORES_ICON' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_STORES_ICON')) + )); if (Configuration::get('WK_CUSTOMER_SUPPORT_PHONE_NUMBER') != '' || Configuration::get('WK_CUSTOMER_SUPPORT_EMAIL') != '' ) { @@ -492,6 +495,10 @@ class HotelReservationSystem extends Module public function hookDisplayBackOfficeHeader() { + Media::addJsDef(array( + 'PS_STORES_ICON' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_STORES_ICON')) + )); + $this->context->controller->addCSS($this->_path.'views/css/admin/css/hotel_admin_tab_logo.css'); } diff --git a/modules/hotelreservationsystem/views/js/HotelReservationAdmin.js b/modules/hotelreservationsystem/views/js/HotelReservationAdmin.js index c923b0eea..160df0a5f 100644 --- a/modules/hotelreservationsystem/views/js/HotelReservationAdmin.js +++ b/modules/hotelreservationsystem/views/js/HotelReservationAdmin.js @@ -217,6 +217,7 @@ var GoogleMapsManager = { position: latLng, map: that.map, draggable: true, + icon: PS_STORES_ICON }); that.markers.push(marker); marker.addListener('dragend', function(e) { diff --git a/modules/hotelreservationsystem/views/js/searchResultsMap.js b/modules/hotelreservationsystem/views/js/searchResultsMap.js index cc58afebd..f24c762c4 100644 --- a/modules/hotelreservationsystem/views/js/searchResultsMap.js +++ b/modules/hotelreservationsystem/views/js/searchResultsMap.js @@ -34,6 +34,7 @@ function initMap() { position: hotelLocation, map: map, title: hotel_name, + icon: PS_STORES_ICON }); marker.addListener('click', function() { diff --git a/themes/hotel-reservation-theme/js/contact-form.js b/themes/hotel-reservation-theme/js/contact-form.js index 8a77661d6..4f8f51dc2 100644 --- a/themes/hotel-reservation-theme/js/contact-form.js +++ b/themes/hotel-reservation-theme/js/contact-form.js @@ -93,6 +93,7 @@ function initMap() { map: map, title: location.hotel_name, animation: google.maps.Animation.DROP, + icon: PS_STORES_ICON }); // Allow each marker to have an info window diff --git a/themes/hotel-reservation-theme/js/order-detail.js b/themes/hotel-reservation-theme/js/order-detail.js index 6a54f74b0..26d1fcb99 100644 --- a/themes/hotel-reservation-theme/js/order-detail.js +++ b/themes/hotel-reservation-theme/js/order-detail.js @@ -115,6 +115,7 @@ function initMap() { position: hotelLocation, map: map, title: hotel_name, + icon: PS_STORES_ICON }); marker.addListener('click', function() { diff --git a/themes/hotel-reservation-theme/js/product.js b/themes/hotel-reservation-theme/js/product.js index 4974d31e2..4d340fcf9 100644 --- a/themes/hotel-reservation-theme/js/product.js +++ b/themes/hotel-reservation-theme/js/product.js @@ -1275,6 +1275,7 @@ function initMap() { const marker = new google.maps.Marker({ position: hotelLatLng, map: map, + icon: PS_STORES_ICON }); const uiContent = $('#room-info-map-ui-content .hotel-info-wrap').get(0); From cbf7a64e114c07fd008c7a4e75f75f894063fd30 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Tue, 28 May 2024 17:09:18 +0530 Subject: [PATCH 09/48] Added: option to view new customers in Admin Customer list using the KPI and the new customers option in dashboard --- .../admin/AdminCustomersController.php | 20 +++++++++++++++++++ controllers/admin/AdminStatsController.php | 2 +- modules/dashactivity/views/js/dashactivity.js | 4 ++++ .../templates/hook/dashboard_zone_one.tpl | 2 +- 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php index 6c763f10c..cdc291da4 100644 --- a/controllers/admin/AdminCustomersController.php +++ b/controllers/admin/AdminCustomersController.php @@ -217,6 +217,23 @@ class AdminCustomersControllerCore extends AdminController $this->redirect_after = $this->context->link->getAdminLink('AdminCustomers'); } + if (Tools::getValue('action') == 'filterOnlyNewCustomer') { + if (($dateFrom = Tools::getValue('date_from')) + && ($dateTo = Tools::getValue('date_to')) + && strtotime($dateTo) >= strtotime($dateFrom) + ) { + $this->processResetFilters(); + $this->context->cookie->{'submitFilter'.$this->table} = true; + $prefix = $this->getCookieFilterPrefix(); + //Updating the date format of the filter dates to the desired format. + $dateFrom = date('Y-m-d', strtotime($dateFrom)); + $dateTo = date('Y-m-d', strtotime($dateTo)); + $this->context->cookie->{$prefix.$this->table.'Filter_date_add'} = json_encode(array($dateFrom, $dateTo)); + } + + $this->redirect_after = $this->context->link->getAdminLink('AdminCustomers'); + } + parent::postProcess(); } @@ -739,6 +756,9 @@ class AdminCustomersControllerCore extends AdminController $helper->color = 'color4'; $helper->title = $this->l('New Customers', null, null, false); $nbDaysNewCustomers = Validate::isUnsignedInt(Configuration::get('PS_KPI_NEW_CUSTOMERS_NB_DAYS')) ? Configuration::get('PS_KPI_NEW_CUSTOMERS_NB_DAYS') : 30; + $date_from = date('Y-m-d', strtotime('-'.$nbDaysNewCustomers.' day')); + $date_to = date('Y-m-d'); + $helper->href = $this->context->link->getAdminLink('AdminCustomers').'&filterOnlyNewCustomer=1&date_from='.$date_from.'&date_to='.$date_to; $helper->subtitle = sprintf($this->l('%d Days', null, null, false), (int) $nbDaysNewCustomers); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=total_new_customers'; $helper->tooltip = $this->l('The total number of new customers who registered in given period of time.', null, null, false); diff --git a/controllers/admin/AdminStatsController.php b/controllers/admin/AdminStatsController.php index 2de11a362..86e20a67f 100644 --- a/controllers/admin/AdminStatsController.php +++ b/controllers/admin/AdminStatsController.php @@ -1885,7 +1885,7 @@ class AdminStatsControllerCore extends AdminStatsTabController public static function getTotalNewCustomers($nbDaysNewCustomers) { - $maxDateAdd = date('Y-m-d H:i:s', strtotime('-'.$nbDaysNewCustomers.' day')); + $maxDateAdd = date('Y-m-d', strtotime('-'.$nbDaysNewCustomers.' day')); $sql = 'SELECT COUNT(c.`id_customer`) FROM `'._DB_PREFIX_.'customer` c WHERE c.`date_add` >= "'.pSQL($maxDateAdd).'" AND c.`deleted` = 0'; diff --git a/modules/dashactivity/views/js/dashactivity.js b/modules/dashactivity/views/js/dashactivity.js index a84820e02..8343efa89 100644 --- a/modules/dashactivity/views/js/dashactivity.js +++ b/modules/dashactivity/views/js/dashactivity.js @@ -58,6 +58,8 @@ $(document).ready(function() { $('#date-start').change(function() { start = Date.parseDate($('#date-start').val(), 'Y-m-d'); end = Date.parseDate($('#date-end').val(), 'Y-m-d'); + var url = $('#dash_filter_new_customers').data('href') + '&date_from='+start.format('Y-m-d')+ '&date_to='+ end.format('Y-m-d'); + $('#dash_filter_new_customers').attr('href', url); $('#customers-newsletters-subtitle').html(sprintf(date_subtitle, start.format(date_format), end.format(date_format))); $('#traffic-subtitle').html(sprintf(date_subtitle, start.format(date_format), end.format(date_format))); @@ -66,6 +68,8 @@ $(document).ready(function() { $('#date-end').change(function() { start = Date.parseDate($('#date-start').val(), 'Y-m-d'); end = Date.parseDate($('#date-end').val(), 'Y-m-d'); + var url = $('#dash_filter_new_customers').data('href') + '&date_from='+start.format('Y-m-d')+ '&date_to='+ end.format('Y-m-d'); + $('#dash_filter_new_customers').attr('href', url); $('#customers-newsletters-subtitle').html(sprintf(date_subtitle, start.format(date_format), end.format(date_format))); $('#traffic-subtitle').html(sprintf(date_subtitle, start.format(date_format), end.format(date_format))); diff --git a/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl b/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl index 95cee2cd3..a0d0a48c8 100644 --- a/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl +++ b/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl @@ -121,7 +121,7 @@
  • - + {l s="New Customers" mod='dashactivity'} From 19e74a7ff27d66dd1c05a19046668e7faf95dca8 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Wed, 29 May 2024 09:56:56 +0530 Subject: [PATCH 10/48] Added: Admin can now filter the using banned status of the customer in the listing in the admin customer controller --- controllers/admin/AdminCustomersController.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php index cdc291da4..3344f23a2 100644 --- a/controllers/admin/AdminCustomersController.php +++ b/controllers/admin/AdminCustomersController.php @@ -170,6 +170,11 @@ class AdminCustomersControllerCore extends AdminController 'type' => 'datetime', 'search' => false, 'havingFilter' => true + ), + 'deleted' => array( + 'title' => $this->l('Banned'), + 'type' => 'bool', + 'displayed' => false, ) )); @@ -217,14 +222,14 @@ class AdminCustomersControllerCore extends AdminController $this->redirect_after = $this->context->link->getAdminLink('AdminCustomers'); } - if (Tools::getValue('action') == 'filterOnlyNewCustomer') { + $prefix = $this->getCookieFilterPrefix(); + if (Tools::getValue('filterOnlyNewCustomer')) { if (($dateFrom = Tools::getValue('date_from')) && ($dateTo = Tools::getValue('date_to')) && strtotime($dateTo) >= strtotime($dateFrom) ) { $this->processResetFilters(); $this->context->cookie->{'submitFilter'.$this->table} = true; - $prefix = $this->getCookieFilterPrefix(); //Updating the date format of the filter dates to the desired format. $dateFrom = date('Y-m-d', strtotime($dateFrom)); $dateTo = date('Y-m-d', strtotime($dateTo)); @@ -235,6 +240,10 @@ class AdminCustomersControllerCore extends AdminController } parent::postProcess(); + $filters = $this->context->cookie->getFamily($prefix.$this->table.'Filter_'); + if (isset($filters[$prefix.$this->table.'Filter_deleted']) && $filters[$prefix.$this->table.'Filter_deleted'] == 1) { + $this->deleted = false; + } } public function initContent() From 04132d354cc2c6cd2ccf14b07c3615318c58dae3 Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Sat, 1 Jun 2024 13:57:13 +0530 Subject: [PATCH 11/48] Fixed: Text mentioned in the manual allotment is not visible on the order detail page in back-office --- .../controllers/orders/helpers/view/view.tpl | 6 ++- .../orders/modals/_room_allotment_comment.tpl | 28 +++++++++++ controllers/admin/AdminOrdersController.php | 24 ++++++++++ js/admin/orders.js | 46 +++++++++++++++++++ 4 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 admin/themes/default/template/controllers/orders/modals/_room_allotment_comment.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 9f884e2b1..ab8516fb5 100644 --- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -125,7 +125,7 @@ {if $data['id_status'] == $hotel_order_status['STATUS_ALLOTED']['id_status']} - {l s='Alloted'} + {l s='Alloted'} {if $data['booking_type'] == HotelBookingDetail::ALLOTMENT_MANUAL}({l s='Manually'}){/if} {elseif $data['id_status'] == $hotel_order_status['STATUS_CHECKED_IN']['id_status']} {l s='Checked in on'} {dateFormat date=$data['check_in'] full=1} {elseif $data['id_status'] == $hotel_order_status['STATUS_CHECKED_OUT']['id_status']} @@ -140,6 +140,10 @@ {/if} + + {if $data['booking_type'] == HotelBookingDetail::ALLOTMENT_MANUAL && $data['comment'] != ''} + + {/if} {/foreach} diff --git a/admin/themes/default/template/controllers/orders/modals/_room_allotment_comment.tpl b/admin/themes/default/template/controllers/orders/modals/_room_allotment_comment.tpl new file mode 100644 index 000000000..859ee5cb0 --- /dev/null +++ b/admin/themes/default/template/controllers/orders/modals/_room_allotment_comment.tpl @@ -0,0 +1,28 @@ +{* +* Since 2010 Webkul. +* +* NOTICE OF LICENSE +* +* All right is reserved, +* Please go through this link for complete license : https://store.webkul.com/license.html +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade this module to 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 IN +* @license https://store.webkul.com/license.html +*} + +
    +
    {$comment}
    + + {if isset($loaderImg) && $loaderImg} +
    + +
    + {/if} +
    diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index c08b5f111..ef9e6ad44 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -779,6 +779,30 @@ class AdminOrdersControllerCore extends AdminController die(Tools::jsonEncode($response)); } + public function ajaxProcessInitRoomAllotmentCommentModal() + { + $response['hasError'] = 1; + if (Validate::isLoadedObject($objBookingDetail = new HotelBookingDetail(Tools::getValue('id_hotel_booking')))) { + if ($objBookingDetail->booking_type == HotelBookingDetail::ALLOTMENT_MANUAL) { + // get booking information by order + $this->context->smarty->assign('comment', $objBookingDetail->comment); + $modal = array( + 'modal_id' => 'room-allotment-comment-modal', + 'modal_class' => 'modal-md order_detail_modal', + 'modal_title' => '  '.$this->l('Room Manual Allotment Comment'), + 'modal_content' => $this->context->smarty->fetch('controllers/orders/modals/_room_allotment_comment.tpl'), + 'modal_actions' => array(), + ); + + $this->context->smarty->assign($modal); + $response['hasError'] = 0; + $response['modalHtml'] = $this->context->smarty->fetch('modal.tpl'); + } + } + + die(Tools::jsonEncode($response)); + } + public function ajaxProcessInitRoomReallocationModal() { // set modal details diff --git a/js/admin/orders.js b/js/admin/orders.js index 25d8111a3..4eaab342f 100644 --- a/js/admin/orders.js +++ b/js/admin/orders.js @@ -1705,6 +1705,18 @@ $(document).ready(function() { // End: RoomStatusModal: Processes // ====================================== + + // Start: RoomAllotmentCommentModal: Processes + $(document).on('click', '.manual_allotment_comment', function(e){ + e.preventDefault(); + + RoomAllotmentCommentModal.show(this); + }); + // End: RoomAllotmentCommentModal: Processes + // ====================================== + + + // Start: RoomReallocationModal: Processes // For processing room reallocation and swapping $(document).on('click', '.room_reallocate_swap', function(e) { @@ -2718,6 +2730,40 @@ const CancelRoomBookingModal = { } }; +// Modal object to handle comment on rooms for manual cancellation +const RoomAllotmentCommentModal = { + show: function(element) { + $(".loading_overlay").show(); + let idHtlBooking = parseInt($(element).attr('data-id_hotel_booking_detail')); + $.ajax({ + type: 'POST', + headers: { + "cache-control": "no-cache" + }, + url: admin_order_tab_link, + dataType: 'JSON', + cache: false, + data: 'ajax=true&id_hotel_booking='+idHtlBooking+'&action=initRoomAllotmentCommentModal', + success: function(result) { + if (result.hasError == 0 && result.modalHtml) { + $('#footer').next('.bootstrap').append(result.modalHtml); + + $('#room-allotment-comment-modal').modal('show'); + + } else { + showErrorMessage(txtSomeErr); + } + }, + complete: function() { + $(".loading_overlay").hide(); + } + }); + }, + close: function() { + $('#room-allotment-comment-modal').modal('hide'); + } +}; + function updateAdditionalServices(element) { var id_room_type_service_product_order_detail = $(element).data('id_room_type_service_product_order_detail'); From 0dbd6290480ccaaf7beae25b0282ee57fa51ba1f Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Sat, 1 Jun 2024 15:31:21 +0530 Subject: [PATCH 12/48] Fixed:Should have some gap between Refund status and refund amount on order detail page. --- admin/themes/default/sass/controllers/_order.sass | 5 ++++- .../template/controllers/orders/helpers/view/view.tpl | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/admin/themes/default/sass/controllers/_order.sass b/admin/themes/default/sass/controllers/_order.sass index c32768ed0..d061c8615 100644 --- a/admin/themes/default/sass/controllers/_order.sass +++ b/admin/themes/default/sass/controllers/_order.sass @@ -79,4 +79,7 @@ white-space: normal #noteContent - max-height: 200px \ No newline at end of file + max-height: 200px + +.panel-refund-request .refunded_amount + margin-top: 2px \ No newline at end of file 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 ab8516fb5..1ddf349a9 100644 --- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -785,7 +785,7 @@

{/if} -
+
 {l s='Refund Requests'}
@@ -816,7 +816,7 @@ {$return_info.state_name} {if $return_info.refunded_amount > 0} -  {displayPrice price=$return_info.refunded_amount currency=$currency->id} +  {displayPrice price=$return_info.refunded_amount currency=$currency->id} {/if} From 4740b83032f86d0e95cc7bf6a6ef73103aacd77a Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Sat, 1 Jun 2024 15:58:26 +0530 Subject: [PATCH 13/48] Fixed: Children's age with Under 1 showing 0 in order detail page in back-office --- .../controllers/orders/_overbookings.tpl | 10 +++++++--- .../controllers/orders/_product_line.tpl | 6 +++++- .../classes/HotelBookingDetail.php | 16 ++++++++++------ 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/admin/themes/default/template/controllers/orders/_overbookings.tpl b/admin/themes/default/template/controllers/orders/_overbookings.tpl index b2b89fa6c..154adbccf 100644 --- a/admin/themes/default/template/controllers/orders/_overbookings.tpl +++ b/admin/themes/default/template/controllers/orders/_overbookings.tpl @@ -43,15 +43,19 @@ {if $order->with_occupancy && $data['children']}
- +
{if isset($data['child_ages']) && $data['child_ages']} {foreach $data['child_ages'] as $childAge}

- {l s='Child %s : %s years' sprintf=[$childAge@iteration, $childAge]} + {if $childAge == 0} + {l s='Child %s : Under 1' sprintf=[$childAge@iteration]} + {else} + {l s='Child %s : %s years' sprintf=[$childAge@iteration, $childAge]} + {/if}

{/foreach} {/if} diff --git a/admin/themes/default/template/controllers/orders/_product_line.tpl b/admin/themes/default/template/controllers/orders/_product_line.tpl index 6247eb54e..8777cb0a7 100644 --- a/admin/themes/default/template/controllers/orders/_product_line.tpl +++ b/admin/themes/default/template/controllers/orders/_product_line.tpl @@ -70,7 +70,11 @@ {if isset($data['child_ages']) && $data['child_ages']} {foreach $data['child_ages'] as $childAge}

- {l s='Child %s : %s years' sprintf=[$childAge@iteration, $childAge]} + {if $childAge == 0} + {l s='Child %s : Under 1' sprintf=[$childAge@iteration]} + {else} + {l s='Child %s : %s years' sprintf=[$childAge@iteration, $childAge]} + {/if}

{/foreach} {/if} diff --git a/modules/hotelreservationsystem/classes/HotelBookingDetail.php b/modules/hotelreservationsystem/classes/HotelBookingDetail.php index 047e1de46..eca7ee72f 100644 --- a/modules/hotelreservationsystem/classes/HotelBookingDetail.php +++ b/modules/hotelreservationsystem/classes/HotelBookingDetail.php @@ -3100,15 +3100,19 @@ class HotelBookingDetail extends ObjectModel } } - if ($bookedRoomInfoFlag && !$roomCount && $result) { + if (!$roomCount && $result) { $link = new Link(); foreach ($result as $key => $bookingInfo) { - $result[$key]['booked_room_info'] = $this->chechRoomBooked($bookingInfo['id_room'], $bookingInfo['date_from'], $bookingInfo['date_to']); - $result[$key]['orders_filter_link'] = $link->getAdminLink('AdminOrders'); + $result[$key]['child_ages'] = json_decode($bookingInfo['child_ages'], true); - // if need only rooms which are available to resolve overbooking the unset booked rooms - if ($bookedRoomInfoFlag == 2 && $result[$key]['booked_room_info']) { - unset($result[$key]); + if ($bookedRoomInfoFlag) { + $result[$key]['booked_room_info'] = $this->chechRoomBooked($bookingInfo['id_room'], $bookingInfo['date_from'], $bookingInfo['date_to']); + $result[$key]['orders_filter_link'] = $link->getAdminLink('AdminOrders'); + + // if need only rooms which are available to resolve overbooking the unset booked rooms + if ($bookedRoomInfoFlag == 2 && $result[$key]['booked_room_info']) { + unset($result[$key]); + } } } } From 033ffd5acb835cb7034ce01c0175fff2c002f642 Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Tue, 4 Jun 2024 16:26:17 +0530 Subject: [PATCH 14/48] Updated: Text mentioned in the manual allotment is not visible on the order detail page --- .../controllers/orders/_product_line.tpl | 2 +- .../controllers/orders/helpers/view/view.tpl | 21 ++++---- .../orders/modals/_room_reallocation.tpl | 32 +++++++++--- controllers/admin/AdminOrdersController.php | 2 +- js/admin/orders.js | 50 +++++++++++++++++-- 5 files changed, 87 insertions(+), 20 deletions(-) diff --git a/admin/themes/default/template/controllers/orders/_product_line.tpl b/admin/themes/default/template/controllers/orders/_product_line.tpl index 8777cb0a7..720d82ef2 100644 --- a/admin/themes/default/template/controllers/orders/_product_line.tpl +++ b/admin/themes/default/template/controllers/orders/_product_line.tpl @@ -240,7 +240,7 @@
+
+
+ +
 
+
+
+ +
+
+
 
 
-
- -
 
+
+ +
@@ -90,15 +100,25 @@
+
+
+ +
 
+
+
+ +
+
+
 
 
-
- -
 
+
+ +
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index b7b60278b..08f42a0ac 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -2950,9 +2950,9 @@ class AdminOrdersControllerCore extends AdminController ), 'isCancelledRoom' => $isCancelledRoom, 'orderDocuments' => $order->getDocuments(), - 'ROOM_STATUS_ALLOTED' => HotelBookingDetail::STATUS_ALLOTED, 'ROOM_STATUS_CHECKED_IN' => HotelBookingDetail::STATUS_CHECKED_IN, 'ROOM_STATUS_CHECKED_OUT' => HotelBookingDetail::STATUS_CHECKED_OUT, + 'ALLOTMENT_MANUAL' => HotelBookingDetail::ALLOTMENT_MANUAL, ); return parent::renderView(); diff --git a/js/admin/orders.js b/js/admin/orders.js index 4eaab342f..a792c3e59 100644 --- a/js/admin/orders.js +++ b/js/admin/orders.js @@ -306,11 +306,17 @@ function init() e.preventDefault(); }); + // voucher modal show and close $('#add_voucher').unbind('click').click(function(e) { e.preventDefault(); VoucherModal.show(); }); + $(document).on('hidden.bs.modal', '#voucher-modal', function(){ + $('#voucher-modal').remove(); + }); + // End: voucher modal show and close + $(document).on('change','#discount_type', function(e) { // Percent type if ($(this).val() == 1) @@ -342,11 +348,18 @@ function init() $('select[name=discount_invoice]').attr('disabled', false); }); + // payment information modal show and close $('.open_payment_information').unbind('click').click(function(e) { e.preventDefault(); OrderPaymentDetailModal.show($(this)); }); + $(document).on('hidden.bs.modal', '#payment-detail-modal', function(){ + $('#payment-detail-modal').remove(); + }); + // End: payment information modal show and close + + initRoomEvents(); initProductEvents(); } @@ -1168,15 +1181,21 @@ function initRoomEvents() e.preventDefault(); }); + // order-payment-modal hide and show $('#add_new_payment').on('click', function(e) { e.preventDefault(); OrderPaymentModal.show(); }); + $(document).on('hidden.bs.modal', '#order-payment-modal', function(){ + $('#order-payment-modal').remove(); + }); + $('#cancle_add_payment').on('click', function(e) { e.preventDefault(); OrderPaymentModal.hide(); }); + // end order-payment-modal hide and show } function addRoomRefreshTotal() { var quantity = parseInt($('#add_product_product_quantity').val()); @@ -1644,6 +1663,10 @@ $(document).ready(function() { DocumentNoteModal.show($(this)); }); + $(document).on('hidden.bs.modal', '#document-note-modal', function(){ + $('#document-note-modal').remove(); + }); + $(document).on('click', '.submitDocumentNote', function(e) { e.preventDefault(); DocumentNoteModal.submit(); @@ -1658,6 +1681,10 @@ $(document).ready(function() { TravellerModal.show(); }); + $(document).on('hidden.bs.modal', '#traveller-modal', function(){ + $('#traveller-modal').remove(); + }); + $(document).on('click', '.submitTravellerInfo', function(e) { e.preventDefault(); TravellerModal.submit(); @@ -1698,6 +1725,10 @@ $(document).ready(function() { RoomStatusModal.show($(this)); }); + $(document).on('hidden.bs.modal', '#room-status-modal', function(){ + $('#room-status-modal').remove(); + }); + $(document).on('click', '.submitRoomStatus', function(e) { e.preventDefault(); RoomStatusModal.submit(); @@ -1712,11 +1743,13 @@ $(document).ready(function() { RoomAllotmentCommentModal.show(this); }); + + $(document).on('hidden.bs.modal', '#room-allotment-comment-modal', function(){ + $('#room-allotment-comment-modal').remove(); + }); // End: RoomAllotmentCommentModal: Processes // ====================================== - - // Start: RoomReallocationModal: Processes // For processing room reallocation and swapping $(document).on('click', '.room_reallocate_swap', function(e) { @@ -1822,6 +1855,10 @@ $(document).ready(function() { CancelRoomBookingModal.show(); }); + $(document).on('hidden.bs.modal', '#cancel-room-booking-modal', function(){ + $('#cancel-room-booking-modal').remove(); + }); + $(document).on('click', '.submitCancelBooking', function(e) { e.preventDefault(); CancelRoomBookingModal.submit(); @@ -2304,18 +2341,25 @@ const RoomReallocationModal = { success: function(result) { if (result.hasError == 0 && result.modalHtml) { $('#footer').next('.bootstrap').append(result.modalHtml); - $(".modal_id_htl_booking").val(roomObj.data('id_htl_booking')); $("input.modal_curr_room_num").val(roomObj.data('room_num')); $("span.modal_curr_room_num").text(roomObj.data('room_num') + ', ' + roomObj.data('room_type_name')); $(".cust_name").text(roomObj.data('cust_name')); $(".cust_email").text(roomObj.data('cust_email')); + $(".modal_curr_allotent_type").text(roomObj.data('allotment_type_label')); // reset price difference fields $("#reallocation_price_diff").val(0); $("#reallocation_price_diff_block").hide(); $(".realloc_roomtype_change_message").hide(); + if (roomObj.data('allotment_type') == ALLOTMENT_MANUAL) { + $(".allotment_comment_block .modal_curr_allotment_comment").text(roomObj.data('comment')); + $(".allotment_comment_block").show(); + } else { + $(".allotment_comment_block").hide(); + } + // For Rooms Swapping var json_arr_rm_swp = roomObj.data('avail_rm_swap'); if (roomObj.data('avail_rm_swap') != 'false' && json_arr_rm_swp.length != 0) { From 190907346b24d1eb4d197026a345480b3be2a2ab Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Wed, 5 Jun 2024 16:21:22 +0530 Subject: [PATCH 15/48] Updated: decimal maximum limit is removed from price validation Validate::isPrice() --- classes/Validate.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/Validate.php b/classes/Validate.php index 63dcacc75..9a080dd61 100644 --- a/classes/Validate.php +++ b/classes/Validate.php @@ -233,7 +233,7 @@ class ValidateCore */ public static function isPrice($price) { - return preg_match('/^[0-9]{1,10}(\.[0-9]{1,9})?$/', $price); + return preg_match('/^[0-9]{1,10}(\.[0-9]{1,})?$/', $price); } /** @@ -244,7 +244,7 @@ class ValidateCore */ public static function isNegativePrice($price) { - return preg_match('/^[-]?[0-9]{1,10}(\.[0-9]{1,9})?$/', $price); + return preg_match('/^[-]?[0-9]{1,10}(\.[0-9]{1,})?$/', $price); } /** From 2a1e2df946f6284c4a0c4b5866e75dd009ef4d73 Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Thu, 6 Jun 2024 15:29:13 +0530 Subject: [PATCH 16/48] Updated: Set the order currency at first element of currencies in Add Payment form in Back-office order detail page --- controllers/admin/AdminOrdersController.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 08f42a0ac..970e130f1 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -630,11 +630,23 @@ class AdminOrdersControllerCore extends AdminController $payment_methods[] = $module->displayName; } } + + // Set the order currency at first element of currencies + if ($currencies = Currency::getCurrenciesByIdShop($objOrder->id_shop)) { + foreach ($currencies as $key => $currency) { + if ($currency['id_currency'] == $objOrder->id_currency) { + unset($currencies[$key]); + array_unshift($currencies, $currency); + break; + } + } + } + $this->context->smarty->assign( array( 'current_index' => self::$currentIndex, 'order' => $objOrder, - 'currencies' => Currency::getCurrenciesByIdShop($objOrder->id_shop), + 'currencies' => $currencies, 'payment_methods' => $payment_methods, 'payment_types' => $this->getPaymentsTypes(), 'invoices_collection' => $objOrder->getInvoicesCollection(), From 5098c0ce678fd1287e6752c45dd2884190d31c79 Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Fri, 7 Jun 2024 11:32:15 +0530 Subject: [PATCH 17/48] Fixed: Add room booking modal element comes multiple time in the html when open the modal multiple times --- js/admin/orders.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/js/admin/orders.js b/js/admin/orders.js index cfb99a362..bda5ba196 100644 --- a/js/admin/orders.js +++ b/js/admin/orders.js @@ -1802,6 +1802,10 @@ $(document).ready(function() { $('.submitAddRoom').attr('disabled', true); } }); + + $(document).on('hidden.bs.modal', '#add-room-booking-modal', function(){ + $('#add-room-booking-modal').remove(); + }); // End: AddRoomBookingModal: Processes // ====================================== From ba321cbf16d08d9d39750b6b80dccf2c5d9c8896 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Fri, 7 Jun 2024 12:53:58 +0530 Subject: [PATCH 18/48] Added measurement unit with the average lead time in the KPI --- controllers/admin/AdminStatsController.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/controllers/admin/AdminStatsController.php b/controllers/admin/AdminStatsController.php index 86e20a67f..cdcfcca53 100644 --- a/controllers/admin/AdminStatsController.php +++ b/controllers/admin/AdminStatsController.php @@ -959,6 +959,12 @@ class AdminStatsControllerCore extends AdminStatsTabController case 'average_lead_time': $dateToday = date('Y-m-d'); $value = Tools::ps_round(AdminStatsController::getAverageLeadTime(), 2); + if ($value && $value <= 1) { + $value .= ' '.$this->l('day'); + } else { + $value .= ' '.$this->l('days'); + } + break; case 'average_guest_in_booking': $dateToday = date('Y-m-d'); From c1bb83eefc4c70f25c812755bfc2d9e4025a6094 Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Tue, 11 Jun 2024 11:51:22 +0530 Subject: [PATCH 19/48] Updated: Detailed price and tax information in total costs section in Order Detail page of Back-office --- .../controllers/orders/helpers/view/view.tpl | 100 +++++++++++------- 1 file changed, 59 insertions(+), 41 deletions(-) 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 6fc92ec12..047541e76 100644 --- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -924,7 +924,7 @@ {assign var=additional_service_price_tax_incl value=($order->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE) + $totalDemandsPriceTI)} {if $room_price_tax_excl} - {l s='Total Rooms Cost (tax excl.)'} + {l s='Total Rooms Cost (Tax excl.)'} {displayPrice price=$room_price_tax_excl currency=$currency->id} @@ -933,34 +933,16 @@ {/if} {if isset($additional_service_price_tax_excl) && $additional_service_price_tax_excl > 0} - {l s='Total Extra services (tax excl.)'} + {l s='Total Extra services (Tax excl.)'} {displayPrice price=($additional_service_price_tax_excl - $totalConvenienceFeeTE) currency=$currency->id} {/if} - {* {if $room_price_tax_excl} - - {l s='Total Rooms Tax'} - - {displayPrice price=($room_price_tax_incl - $room_price_tax_excl) currency=$currency->id} - - - - {/if} - {if isset($additional_service_price_tax_excl) && $additional_service_price_tax_excl > 0} - - {l s='Extra services Tax'} - - {displayPrice price=($additional_service_price_tax_incl - $additional_service_price_tax_excl) currency=$currency->id} - - - - {/if} *} {if $service_products_price_tax_excl} - {l s='Total service products cost (tax excl.)'} + {l s='Total service products cost (Tax excl.)'} {displayPrice price=$service_products_price_tax_excl currency=$currency->id} @@ -968,10 +950,64 @@ {/if} + {if isset($totalConvenienceFeeTE) && $totalConvenienceFeeTE > 0} + + {l s='Convenience Fee (Tax excl.)'} + + {displayPrice price=$totalConvenienceFeeTE currency=$currency->id} + + + + {/if} + + {if $room_price_tax_excl} + + {l s='Total Rooms Tax'} + + {displayPrice price=($room_price_tax_incl - $room_price_tax_excl) currency=$currency->id} + + + + {/if} + {if isset($additional_service_price_tax_excl) && $additional_service_price_tax_excl > 0} + + {l s='Extra services Tax'} + + {displayPrice price=(($additional_service_price_tax_incl - $additional_service_price_tax_excl) - ($totalConvenienceFeeTI - $totalConvenienceFeeTE)) currency=$currency->id} + + + + {/if} + {if isset($totalConvenienceFeeTE) && $totalConvenienceFeeTE > 0} + + {l s='Convenience Fee Tax'} + + {displayPrice price=($totalConvenienceFeeTI - $totalConvenienceFeeTE) currency=$currency->id} + + + + {/if} + + {* {if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)} *} + + {l s='Total Taxes'} + + {displayPrice price=(($order->total_paid_tax_incl + $order->total_discounts_tax_incl) - ($order->total_paid_tax_excl + $order->total_discounts_tax_excl)) currency=$currency->id} + + + + {* {/if} *} total_discounts_tax_incl == 0}style="display: none;"{/if}> - {l s='Discounts'} + {l s='Total Booking Amount'} - -{displayPrice price=$order_discount_price currency=$currency->id} + {displayPrice price=($order->total_paid_tax_incl + $order->total_discounts_tax_incl) currency=$currency->id} + + + + total_discounts_tax_incl == 0}style="display: none;"{/if}> + {l s='Discounts'} + + -{displayPrice price=$order->total_discounts_tax_incl currency=$currency->id} @@ -982,24 +1018,6 @@ - {if isset($totalConvenienceFeeTI) && $totalConvenienceFeeTI > 0} - - {l s='Convenience Fee'} - - {displayPrice price=$totalConvenienceFeeTE currency=$currency->id} - - - - {/if} - {* {if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)} *} - - {l s='Total Taxes'} - - {displayPrice price=($order->total_paid_tax_incl - $order->total_paid_tax_excl) currency=$currency->id} - - - - {* {/if} *} {l s='Final Booking Total'} From df643828f0a8e5104bea2bcd5c82d273125b3ca0 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Wed, 12 Jun 2024 15:21:31 +0530 Subject: [PATCH 20/48] updated the customer delete and ban process --- .../customers/helpers/view/view.tpl | 24 ++++++++++++++----- classes/Customer.php | 5 +++- .../admin/AdminCustomersController.php | 10 ++++++-- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/admin/themes/default/template/controllers/customers/helpers/view/view.tpl b/admin/themes/default/template/controllers/customers/helpers/view/view.tpl index 88da2734e..294f6dd69 100644 --- a/admin/themes/default/template/controllers/customers/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/customers/helpers/view/view.tpl @@ -146,15 +146,27 @@

- {if $customer->active} - - - {l s='Active'} + {if !$customer->deleted} + {if $customer->active} + + + {l s='Active'} + + {else} + + + {l s='Inactive'} + + {/if} + {else if $customer->deleted == Customer::STATUS_BANNED} + + + {l s='Banned'} - {else} + {else if $customer->deleted == Customer::STATUS_DELETED} - {l s='Inactive'} + {l s='Deleted'} {/if}

diff --git a/classes/Customer.php b/classes/Customer.php index a8c4c3609..fd46a853a 100644 --- a/classes/Customer.php +++ b/classes/Customer.php @@ -135,6 +135,9 @@ class CustomerCore extends ObjectModel public $groupBox; + const STATUS_BANNED = 1; + const STATUS_DELETED = 2; + protected $webserviceParameters = array( 'fields' => array( 'id_default_group' => array('xlink_resource' => 'groups'), @@ -179,7 +182,7 @@ class CustomerCore extends ObjectModel 'id_risk' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt', 'copy_post' => false), 'max_payment_days' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt', 'copy_post' => false), 'active' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool', 'copy_post' => false), - 'deleted' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool', 'copy_post' => false), + 'deleted' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt', 'copy_post' => false), 'note' => array('type' => self::TYPE_HTML, 'validate' => 'isCleanHtml', 'size' => 65000, 'copy_post' => false), 'is_guest' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool', 'copy_post' => false), 'id_shop' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'copy_post' => false), diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php index 3344f23a2..58527d92f 100644 --- a/controllers/admin/AdminCustomersController.php +++ b/controllers/admin/AdminCustomersController.php @@ -236,6 +236,11 @@ class AdminCustomersControllerCore extends AdminController $this->context->cookie->{$prefix.$this->table.'Filter_date_add'} = json_encode(array($dateFrom, $dateTo)); } + $this->redirect_after = $this->context->link->getAdminLink('AdminCustomers'); + } else if (Tools::getValue('filterOnlyBannedCustomer')) { + $this->processResetFilters(); + $this->context->cookie->{'submitFilter'.$this->table} = true; + $this->context->cookie->{$prefix.$this->table.'Filter_deleted'} = Customer::STATUS_BANNED; $this->redirect_after = $this->context->link->getAdminLink('AdminCustomers'); } @@ -779,6 +784,7 @@ class AdminCustomersControllerCore extends AdminController $helper->color = 'color2'; $helper->title = $this->l('Banned Customers', null, null, false); $helper->subtitle = $this->l('All Time', null, null, false); + $helper->href = $this->context->link->getAdminLink('AdminCustomers').'&filterOnlyBannedCustomer=1'; $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=total_banned_customers'; $helper->tooltip = $this->l('The total number of banned customers.', null, null, false); $kpis[] = $helper; @@ -988,7 +994,7 @@ class AdminCustomersControllerCore extends AdminController if (Validate::isLoadedObject($objCustomer = $this->loadObject())) { if ($this->delete_mode == 'real' && Order::getCustomerOrders($objCustomer->id, true)) { $objCustomer->email = 'anonymous'.'-'.$objCustomer->id.'@'.Tools::getShopDomain(); - $objCustomer->deleted = 1; + $objCustomer->deleted = Customer::STATUS_DELETED; if (!$objCustomer->update()) { $this->errors[] = Tools::displayError('Some error ocurred while deleting the Customer'); return; @@ -1029,7 +1035,7 @@ class AdminCustomersControllerCore extends AdminController // check if customer has orders for email change else customer will be deleted if (Order::getCustomerOrders($objCustomer->id, true)) { $objCustomer->email = 'anonymous'.'-'.$objCustomer->id.'@'.Tools::getShopDomain(); - $objCustomer->deleted = 1; + $objCustomer->deleted = Customer::STATUS_DELETED; if ($objCustomer->update()) { // unset the customer which is processed // not processed customers will be deleted with default process if no errors are there From 67dcad12e4e163b1bd18ed867be1969ecea50a31 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Wed, 12 Jun 2024 19:04:43 +0530 Subject: [PATCH 21/48] Removed extra spaces to fix error caused by smarty --- .../template/controllers/customers/helpers/view/view.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/themes/default/template/controllers/customers/helpers/view/view.tpl b/admin/themes/default/template/controllers/customers/helpers/view/view.tpl index 294f6dd69..18145ce07 100644 --- a/admin/themes/default/template/controllers/customers/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/customers/helpers/view/view.tpl @@ -158,12 +158,12 @@ {l s='Inactive'} {/if} - {else if $customer->deleted == Customer::STATUS_BANNED} + {elseif $customer->deleted == Customer::STATUS_BANNED} {l s='Banned'} - {else if $customer->deleted == Customer::STATUS_DELETED} + {elseif $customer->deleted == Customer::STATUS_DELETED} {l s='Deleted'} From 5d5071b487644a4d7d7a59304e59543af1061715 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Thu, 13 Jun 2024 09:58:22 +0530 Subject: [PATCH 22/48] Updated the newsletter deletion process for the deleted customers with new flow --- modules/blocknewsletter/blocknewsletter.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/blocknewsletter/blocknewsletter.php b/modules/blocknewsletter/blocknewsletter.php index a7a0612d6..d4ab3bbe2 100644 --- a/modules/blocknewsletter/blocknewsletter.php +++ b/modules/blocknewsletter/blocknewsletter.php @@ -84,11 +84,23 @@ class Blocknewsletter extends Module 'actionCustomerAccountAdd', 'registerGDPRConsent', 'actionExportGDPRData', + 'actionObjectCustomerUpdateBefore', 'actionDeleteGDPRCustomer' ) ); } + public function hookActionObjectCustomerUpdateBefore($params) + { + $objCustomer = new Customer ($params['object']->id); + if ($params['object']->deleted == Customer::STATUS_DELETED + && ($register_status = $this->isNewsletterRegistered($objCustomer->email)) + && $register_status > 0 + ) { + $this->unregister($objCustomer->email, $register_status); + } + } + public function hookActionExportGDPRData($customer) { if (!Tools::isEmpty($customer['email']) && Validate::isEmail($customer['email'])) { From 134a25e324f1ab89f896a4cdeaaf6d702ea496ba Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Fri, 14 Jun 2024 12:47:26 +0530 Subject: [PATCH 23/48] revert changes made for new customer KPI to keep this pr focus only on new flow of banned customer --- .../admin/AdminCustomersController.php | 19 +------------------ controllers/admin/AdminStatsController.php | 7 +------ modules/dashactivity/views/js/dashactivity.js | 5 ----- .../templates/hook/dashboard_zone_one.tpl | 2 +- 4 files changed, 3 insertions(+), 30 deletions(-) diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php index 58527d92f..350e822d1 100644 --- a/controllers/admin/AdminCustomersController.php +++ b/controllers/admin/AdminCustomersController.php @@ -223,21 +223,7 @@ class AdminCustomersControllerCore extends AdminController } $prefix = $this->getCookieFilterPrefix(); - if (Tools::getValue('filterOnlyNewCustomer')) { - if (($dateFrom = Tools::getValue('date_from')) - && ($dateTo = Tools::getValue('date_to')) - && strtotime($dateTo) >= strtotime($dateFrom) - ) { - $this->processResetFilters(); - $this->context->cookie->{'submitFilter'.$this->table} = true; - //Updating the date format of the filter dates to the desired format. - $dateFrom = date('Y-m-d', strtotime($dateFrom)); - $dateTo = date('Y-m-d', strtotime($dateTo)); - $this->context->cookie->{$prefix.$this->table.'Filter_date_add'} = json_encode(array($dateFrom, $dateTo)); - } - - $this->redirect_after = $this->context->link->getAdminLink('AdminCustomers'); - } else if (Tools::getValue('filterOnlyBannedCustomer')) { + if (Tools::getValue('filterOnlyBannedCustomer')) { $this->processResetFilters(); $this->context->cookie->{'submitFilter'.$this->table} = true; $this->context->cookie->{$prefix.$this->table.'Filter_deleted'} = Customer::STATUS_BANNED; @@ -770,9 +756,6 @@ class AdminCustomersControllerCore extends AdminController $helper->color = 'color4'; $helper->title = $this->l('New Customers', null, null, false); $nbDaysNewCustomers = Validate::isUnsignedInt(Configuration::get('PS_KPI_NEW_CUSTOMERS_NB_DAYS')) ? Configuration::get('PS_KPI_NEW_CUSTOMERS_NB_DAYS') : 30; - $date_from = date('Y-m-d', strtotime('-'.$nbDaysNewCustomers.' day')); - $date_to = date('Y-m-d'); - $helper->href = $this->context->link->getAdminLink('AdminCustomers').'&filterOnlyNewCustomer=1&date_from='.$date_from.'&date_to='.$date_to; $helper->subtitle = sprintf($this->l('%d Days', null, null, false), (int) $nbDaysNewCustomers); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=total_new_customers'; $helper->tooltip = $this->l('The total number of new customers who registered in given period of time.', null, null, false); diff --git a/controllers/admin/AdminStatsController.php b/controllers/admin/AdminStatsController.php index 87d5fdcd5..d7d233e26 100644 --- a/controllers/admin/AdminStatsController.php +++ b/controllers/admin/AdminStatsController.php @@ -965,11 +965,6 @@ class AdminStatsControllerCore extends AdminStatsTabController case 'average_lead_time': $dateToday = date('Y-m-d'); $value = Tools::ps_round(AdminStatsController::getAverageLeadTime(), 2); - if ($value && $value <= 1) { - $value .= ' '.$this->l('day'); - } else { - $value .= ' '.$this->l('days'); - } break; case 'average_guest_in_booking': @@ -1897,7 +1892,7 @@ class AdminStatsControllerCore extends AdminStatsTabController public static function getTotalNewCustomers($nbDaysNewCustomers) { - $maxDateAdd = date('Y-m-d', strtotime('-'.$nbDaysNewCustomers.' day')); + $maxDateAdd = date('Y-m-d H:i:s', strtotime('-'.$nbDaysNewCustomers.' day')); $sql = 'SELECT COUNT(c.`id_customer`) FROM `'._DB_PREFIX_.'customer` c WHERE c.`date_add` >= "'.pSQL($maxDateAdd).'" AND c.`deleted` = 0'; diff --git a/modules/dashactivity/views/js/dashactivity.js b/modules/dashactivity/views/js/dashactivity.js index 8343efa89..1bdf4e422 100644 --- a/modules/dashactivity/views/js/dashactivity.js +++ b/modules/dashactivity/views/js/dashactivity.js @@ -58,9 +58,6 @@ $(document).ready(function() { $('#date-start').change(function() { start = Date.parseDate($('#date-start').val(), 'Y-m-d'); end = Date.parseDate($('#date-end').val(), 'Y-m-d'); - var url = $('#dash_filter_new_customers').data('href') + '&date_from='+start.format('Y-m-d')+ '&date_to='+ end.format('Y-m-d'); - $('#dash_filter_new_customers').attr('href', url); - $('#customers-newsletters-subtitle').html(sprintf(date_subtitle, start.format(date_format), end.format(date_format))); $('#traffic-subtitle').html(sprintf(date_subtitle, start.format(date_format), end.format(date_format))); }); @@ -68,8 +65,6 @@ $(document).ready(function() { $('#date-end').change(function() { start = Date.parseDate($('#date-start').val(), 'Y-m-d'); end = Date.parseDate($('#date-end').val(), 'Y-m-d'); - var url = $('#dash_filter_new_customers').data('href') + '&date_from='+start.format('Y-m-d')+ '&date_to='+ end.format('Y-m-d'); - $('#dash_filter_new_customers').attr('href', url); $('#customers-newsletters-subtitle').html(sprintf(date_subtitle, start.format(date_format), end.format(date_format))); $('#traffic-subtitle').html(sprintf(date_subtitle, start.format(date_format), end.format(date_format))); diff --git a/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl b/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl index a0d0a48c8..95cee2cd3 100644 --- a/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl +++ b/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl @@ -121,7 +121,7 @@
  • - + {l s="New Customers" mod='dashactivity'} From a66501186c125a4fc45a3d11ba54ecf89d83869c Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Tue, 18 Jun 2024 17:58:28 +0530 Subject: [PATCH 24/48] Fixed: Occupancy not selected properly while adding room to the order from back-office --- js/admin/orders.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/js/admin/orders.js b/js/admin/orders.js index bda5ba196..307495a03 100644 --- a/js/admin/orders.js +++ b/js/admin/orders.js @@ -2580,6 +2580,10 @@ const AddRoomBookingModal = { $('#add_product_product_price_tax_incl').val(data.price_tax_incl); $('#add_product_product_price_tax_excl').val(data.price_tax_excl); + $("#new_product .max_adults").val(data.room_type_info.max_adults); + $("#new_product .max_children").val(data.room_type_info.max_children); + $("#new_product .max_guests").val(data.room_type_info.max_guests); + //Added by webkul to set curent date in the date fields by default var date_in = $.datepicker.formatDate('dd-mm-yy', new Date()); var date_out = $.datepicker.formatDate('dd-mm-yy', new Date(new Date().getTime()+24*60*60*1000)); From e2875cfac6358f40d32b6467e9814f0074e1aef9 Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Tue, 18 Jun 2024 18:53:30 +0530 Subject: [PATCH 25/48] Fixed: check-in and check-out both must be visible with date and time in order detail page --- .../controllers/orders/helpers/view/view.tpl | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) 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 047541e76..ed5046dd3 100644 --- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -97,11 +97,10 @@ - - + - - + + @@ -111,26 +110,24 @@ {foreach from=$htl_booking_order_data item=data} - - - - - - - - {*{if ($order->hasBeenPaid())}{/if} - {if $display_warehouse}{/if} - {if ($order->hasBeenDelivered())}{/if} - *} - - - - - - From d7f764c331b5b2669ca5e51fca5d936b779f693c Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Mon, 15 Jul 2024 15:12:24 +0530 Subject: [PATCH 42/48] Fixed: fatal error on admin products and admin normal products caused when the id in url in not unsigned int --- controllers/admin/AdminNormalProductsController.php | 2 +- controllers/admin/AdminProductsController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminNormalProductsController.php b/controllers/admin/AdminNormalProductsController.php index 9db549acb..738ba8e78 100644 --- a/controllers/admin/AdminNormalProductsController.php +++ b/controllers/admin/AdminNormalProductsController.php @@ -2818,7 +2818,7 @@ class AdminNormalProductsControllerCore extends AdminController } // let's calculate this once for all - if (!Validate::isLoadedObject($this->object) && Tools::getValue('id_product')) { + if (!Validate::isLoadedObject($this->object) && Validate::isUnsignedId(Tools::getValue('id_product'))) { $this->errors[] = 'Unable to load object'; } else { $this->_displayDraftWarning($this->object->active); diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 3587c6bf3..8ee93fda1 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -2851,7 +2851,7 @@ class AdminProductsControllerCore extends AdminController } // let's calculate this once for all - if (!Validate::isLoadedObject($this->object) && Tools::getValue('id_product')) { + if (!Validate::isLoadedObject($this->object) && Validate::isUnsignedId(Tools::getValue('id_product'))) { $this->errors[] = 'Unable to load object'; } else { $this->_displayDraftWarning($this->object->active); From ea94bb82a9ddd3fa468d7196ca66c33e717aa0be Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Tue, 16 Jul 2024 15:16:45 +0530 Subject: [PATCH 43/48] fixed the flow for the ps_stores_icon assign process --- controllers/front/CategoryController.php | 6 +++++- controllers/front/ContactController.php | 5 +++++ controllers/front/OrderDetailController.php | 1 + controllers/front/ProductController.php | 3 ++- .../controllers/admin/AdminAddHotelController.php | 1 + modules/hotelreservationsystem/hotelreservationsystem.php | 7 ------- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/controllers/front/CategoryController.php b/controllers/front/CategoryController.php index cd78e3395..5072ed2d3 100644 --- a/controllers/front/CategoryController.php +++ b/controllers/front/CategoryController.php @@ -59,7 +59,11 @@ class CategoryControllerCore extends FrontController $this->addCSS(_THEME_CSS_DIR_.'occupancy.css'); $this->addJS(_THEME_JS_DIR_.'occupancy.js'); - + Media::addJsDef( + array( + 'PS_STORES_ICON' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_STORES_ICON')), + ) + ); $scenes = Scene::getScenes($this->category->id, $this->context->language->id, true, false); if ($scenes && count($scenes)) { $this->addJS(_THEME_JS_DIR_.'scenes.js'); diff --git a/controllers/front/ContactController.php b/controllers/front/ContactController.php index 5a65c9795..0124fb8d0 100644 --- a/controllers/front/ContactController.php +++ b/controllers/front/ContactController.php @@ -235,6 +235,11 @@ class ContactControllerCore extends FrontController // GOOGLE MAP if (($PS_API_KEY = Configuration::get('PS_API_KEY')) && Configuration::get('WK_GOOGLE_ACTIVE_MAP')) { + Media::addJsDef( + array( + 'PS_STORES_ICON' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_STORES_ICON')), + ) + ); $this->addJS( 'https://maps.googleapis.com/maps/api/js?key='.$PS_API_KEY. '&libraries=places&language='.$this->context->language->iso_code.'®ion='.$this->context->country->iso_code diff --git a/controllers/front/OrderDetailController.php b/controllers/front/OrderDetailController.php index d7b3d9ca7..5e1da2853 100644 --- a/controllers/front/OrderDetailController.php +++ b/controllers/front/OrderDetailController.php @@ -811,6 +811,7 @@ class OrderDetailControllerCore extends FrontController 'map_input_text' => $objHotelBranchInformation->map_input_text, ), 'hotel_name' => $objHotelBranchInformation->hotel_name, + 'PS_STORES_ICON' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_STORES_ICON')) )); $this->addJS( diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php index ac7a4b8a4..724de5910 100644 --- a/controllers/front/ProductController.php +++ b/controllers/front/ProductController.php @@ -78,7 +78,8 @@ class ProductControllerCore extends FrontController 'hotel_location' => array( 'latitude' => $objHotelBranchInformation->latitude, 'longitude' => $objHotelBranchInformation->longitude, - ) + ), + 'PS_STORES_ICON' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_STORES_ICON')) )); $this->addJS( diff --git a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php index 0fa3ea369..9d57defca 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php @@ -778,6 +778,7 @@ class AdminAddHotelController extends ModuleAdminController 'sortRowsUrl' => $this->context->link->getAdminLink('AdminAddHotel'), 'primaryHotelId' => Configuration::get('WK_PRIMARY_HOTEL'), 'disableHotelMsg' => $this->l('Primary hotel for website will be updated to first available active hotel.', null, true), + 'PS_STORES_ICON' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_STORES_ICON')), ) ); // GOOGLE MAP diff --git a/modules/hotelreservationsystem/hotelreservationsystem.php b/modules/hotelreservationsystem/hotelreservationsystem.php index ec016ecba..065640113 100644 --- a/modules/hotelreservationsystem/hotelreservationsystem.php +++ b/modules/hotelreservationsystem/hotelreservationsystem.php @@ -87,9 +87,6 @@ class HotelReservationSystem extends Module public function hookActionFrontControllerSetMedia() { - Media::addJsDef(array( - 'PS_STORES_ICON' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_STORES_ICON')) - )); if (Configuration::get('WK_CUSTOMER_SUPPORT_PHONE_NUMBER') != '' || Configuration::get('WK_CUSTOMER_SUPPORT_EMAIL') != '' ) { @@ -501,10 +498,6 @@ class HotelReservationSystem extends Module public function hookDisplayBackOfficeHeader() { - Media::addJsDef(array( - 'PS_STORES_ICON' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_STORES_ICON')) - )); - $this->context->controller->addCSS($this->_path.'views/css/admin/css/hotel_admin_tab_logo.css'); } From d8b0367d322362b97921725d81d4830315d728e6 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Tue, 16 Jul 2024 17:25:58 +0530 Subject: [PATCH 44/48] Added validation for the controllers which displays the errors after invalid id is provided in the url --- controllers/admin/AdminNormalProductsController.php | 4 +--- controllers/admin/AdminOrdersController.php | 2 +- controllers/admin/AdminProductsController.php | 4 +--- .../controllers/admin/AdminAddHotelController.php | 11 ++++++----- .../admin/AdminOrderRefundRulesController.php | 7 +++---- 5 files changed, 12 insertions(+), 16 deletions(-) diff --git a/controllers/admin/AdminNormalProductsController.php b/controllers/admin/AdminNormalProductsController.php index 738ba8e78..919e04252 100644 --- a/controllers/admin/AdminNormalProductsController.php +++ b/controllers/admin/AdminNormalProductsController.php @@ -2818,9 +2818,7 @@ class AdminNormalProductsControllerCore extends AdminController } // let's calculate this once for all - if (!Validate::isLoadedObject($this->object) && Validate::isUnsignedId(Tools::getValue('id_product'))) { - $this->errors[] = 'Unable to load object'; - } else { + if ($this->loadObject(true)) { $this->_displayDraftWarning($this->object->active); // if there was an error while saving, we don't want to lose posted data diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 9c8b679ff..2a5e0b9f5 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -991,7 +991,7 @@ class AdminOrdersControllerCore extends AdminController $this->addJS(_PS_JS_DIR_.'vendor/d3.v3.min.js'); if ($this->tabAccess['edit'] == 1 && $this->display == 'view') { - if ($this->loadObject(true)) { + if ($this->loadObject()) { $this->addJS(_PS_JS_DIR_.'admin/orders.js'); } // add js for reallocation process diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 4a785ab5f..6b58c036b 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -2863,9 +2863,7 @@ class AdminProductsControllerCore extends AdminController } // let's calculate this once for all - if (!Validate::isLoadedObject($this->object) && Validate::isUnsignedId(Tools::getValue('id_product'))) { - $this->errors[] = 'Unable to load object'; - } else { + if ($this->loadObject(true)) { $this->_displayDraftWarning($this->object->active); // if there was an error while saving, we don't want to lose posted data diff --git a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php index 0fa3ea369..938068c9c 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php @@ -104,6 +104,9 @@ class AdminAddHotelController extends ModuleAdminController public function renderForm() { + if (!$this->loadObject(true)) { + return; + } $smartyVars = array(); //tinymce setup $smartyVars['path_css'] = _THEME_CSS_DIR_; @@ -125,7 +128,7 @@ class AdminAddHotelController extends ModuleAdminController $smartyVars['defaultCountry'] = $country->name[Configuration::get('PS_LANG_DEFAULT')]; $idCountry = null; - if ($this->display == 'edit') { + if ($this->object->id) { $idHotel = Tools::getValue('id'); $hotelBranchInfo = new HotelBranchInformation($idHotel); $objCategory = new Category($hotelBranchInfo->id_category); @@ -168,13 +171,11 @@ class AdminAddHotelController extends ModuleAdminController } } $smartyVars['order_restrict_date_info'] = $restrictDateInfo; - } - - // manage state option - if ($this->display == 'add') { + } else { $idCountry = Tools::getValue('hotel_country'); } + // manage state option $stateOptions = null; if ($idCountry) { $stateOptions = State::getStatesByIdCountry($idCountry); diff --git a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRulesController.php b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRulesController.php index 588444904..cb297db48 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRulesController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRulesController.php @@ -141,14 +141,13 @@ class AdminOrderRefundRulesController extends ModuleAdminController $smartyVars = array(); $objCurrency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT')); $smartyVars['objCurrency'] = $objCurrency; - - if ($this->display == 'edit' - && $refundRuleInfo = $this->loadObject(true) + if (($refundRuleInfo = $this->loadObject(true)) + && $this->object->id ) { $smartyVars['edit'] = 1; $idRefundRule = Tools::getValue('id_refund_rule'); $objRefundRule = new HotelOrderRefundRules(); - $smartyVars['refund_rules_info'] = (array)$refundRuleInfo; + $smartyVars['refund_rules_info'] = (array) $refundRuleInfo; } //lang vars From c300cd571e0d6065d5f4824a665ee3ef70a1d142 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Tue, 16 Jul 2024 17:32:59 +0530 Subject: [PATCH 45/48] Removed the PS_STORES_ICON from the category front controller and added in hotel reservation system --- controllers/front/CategoryController.php | 5 ----- modules/hotelreservationsystem/hotelreservationsystem.php | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/controllers/front/CategoryController.php b/controllers/front/CategoryController.php index 5072ed2d3..fb3b1a784 100644 --- a/controllers/front/CategoryController.php +++ b/controllers/front/CategoryController.php @@ -59,11 +59,6 @@ class CategoryControllerCore extends FrontController $this->addCSS(_THEME_CSS_DIR_.'occupancy.css'); $this->addJS(_THEME_JS_DIR_.'occupancy.js'); - Media::addJsDef( - array( - 'PS_STORES_ICON' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_STORES_ICON')), - ) - ); $scenes = Scene::getScenes($this->category->id, $this->context->language->id, true, false); if ($scenes && count($scenes)) { $this->addJS(_THEME_JS_DIR_.'scenes.js'); diff --git a/modules/hotelreservationsystem/hotelreservationsystem.php b/modules/hotelreservationsystem/hotelreservationsystem.php index 065640113..eaf939daa 100644 --- a/modules/hotelreservationsystem/hotelreservationsystem.php +++ b/modules/hotelreservationsystem/hotelreservationsystem.php @@ -310,6 +310,7 @@ class HotelReservationSystem extends Module 'map_input_text' => $objHotel->map_input_text, ), 'hotel_name' => $objHotel->hotel_name, + 'PS_STORES_ICON' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_STORES_ICON')), )); $this->context->controller->addJS( From 706a25030326d8fac2d14926a140767073fc4c8c Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Tue, 16 Jul 2024 18:55:40 +0530 Subject: [PATCH 46/48] Fixed the issues for hotel features caused by manually adding an invalid id url --- .../controllers/admin/AdminHotelfeaturesController.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelfeaturesController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelfeaturesController.php index b9bd62f20..77d352ac0 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelfeaturesController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelfeaturesController.php @@ -58,6 +58,10 @@ class AdminHotelFeaturesController extends ModuleAdminController public function renderForm() { + if (!$this->loadObject(true)) { + return; + } + $smartyVars = array(); //lang vars $languages = Language::getLanguages(false); @@ -66,7 +70,7 @@ class AdminHotelFeaturesController extends ModuleAdminController $smartyVars['languages'] = $languages; $smartyVars['currentLang'] = $currentLang; $smartyVars['ps_img_dir'] = _PS_IMG_.'l/'; - if ($id = Tools::getValue('id')) { + if ($id = $this->object->id) { $smartyVars['edit'] = 1; if (Validate::isLoadedObject($objFeatures = new HotelFeatures($id))) { $featureInfo = (array) $objFeatures; From 509382929f5c3f76dcd103c0315ab7f150b279bf Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Wed, 17 Jul 2024 11:46:26 +0530 Subject: [PATCH 47/48] Fixed the total count of the service products for the list in the back office --- controllers/admin/AdminNormalProductsController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/controllers/admin/AdminNormalProductsController.php b/controllers/admin/AdminNormalProductsController.php index 0c6018ec8..f9cbe2f08 100644 --- a/controllers/admin/AdminNormalProductsController.php +++ b/controllers/admin/AdminNormalProductsController.php @@ -208,7 +208,6 @@ class AdminNormalProductsControllerCore extends AdminController // show the list of the product according to the booking or service products $this->_where .= ' AND a.`booking_product` = 0'; - $this->_use_found_rows = false; $this->_group = 'GROUP BY a.`id_product`'; $this->fields_list = array(); From 4564d5210764e641c61bff171e1c943b0b284628 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Tue, 23 Jul 2024 11:29:00 +0530 Subject: [PATCH 48/48] optimized code for admin translation and removed non required variables --- controllers/admin/AdminTranslationsController.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php index dcc382886..8b5dcfb04 100644 --- a/controllers/admin/AdminTranslationsController.php +++ b/controllers/admin/AdminTranslationsController.php @@ -961,7 +961,6 @@ class AdminTranslationsControllerCore extends AdminController static $str_write = ''; static $array_check_duplicate = array(); static $module_existing_translations = array(); - static $empty_translation_fields = array(); // Set file_name in static var, this allow to open and wright the file just one time if (!isset($cache_file[$theme_name.'-'.$file_name])) { @@ -1016,11 +1015,10 @@ class AdminTranslationsControllerCore extends AdminController } if (array_key_exists($post_key, $_POST) && !in_array($pattern, $array_check_duplicate)) { + $array_check_duplicate[] = $pattern; if ($_POST[$post_key] == '') { - $empty_translation_fields[] = $pattern; continue; } - $array_check_duplicate[] = $pattern; $str_write .= '$_MODULE['.$pattern.'] = \''.pSQL(str_replace(array("\r\n", "\r", "\n"), ' ', $_POST[$post_key])).'\';'."\n"; $this->total_expression++; } @@ -1030,9 +1028,7 @@ class AdminTranslationsControllerCore extends AdminController if ($copyExistingTranslations) { foreach ($module_existing_translations as $key => $value) { - if (!in_array('\''.$key.'\'', $array_check_duplicate) - && !in_array('\''.$key.'\'', $empty_translation_fields) - ) { + if (!in_array('\''.$key.'\'', $array_check_duplicate)) { $str_write .= '$_MODULE[\''.$key.'\'] = \''.pSQL(str_replace(array("\r\n", "\r", "\n"), ' ', $value)).'\';'."\n"; } }
    {l s='Room No.'}{l s='Room Type'}{l s='Room'} {l s='Duration'}{l s='Documents'}{l s='Room Status'}{l s='Check-In'}{l s='Check-Out'} {l s='Allotment'} {l s='Action'}
    - {$data['room_num']} - + {$data['room_num']}
    {$data['room_type_name']|escape:'html':'UTF-8'}     		{dateFormat date=$data['date_from']} - {dateFormat date=$data['date_to']} - - {if $data.num_checkin_documents > 0}{$data.num_checkin_documents}{else}{l s='Upload'}{/if} {l s='Documents'} - + {if ($data['id_status'] == $hotel_order_status['STATUS_CHECKED_IN']['id_status']) || ($data['id_status'] == $hotel_order_status['STATUS_CHECKED_OUT']['id_status'])} + {l s='Checked in on'}
    {dateFormat date=$data['check_in'] full=1}     + {else} + -- + {/if}     		- {if $data['id_status'] == $hotel_order_status['STATUS_ALLOTED']['id_status']} - {l s='Alloted'} - {elseif $data['id_status'] == $hotel_order_status['STATUS_CHECKED_IN']['id_status']} - {l s='Checked in on'} {dateFormat date=$data['check_in'] full=1} - {elseif $data['id_status'] == $hotel_order_status['STATUS_CHECKED_OUT']['id_status']} - {l s='Checked out on'} {dateFormat date=$data['check_out'] full=1} + {if $data['id_status'] == $hotel_order_status['STATUS_CHECKED_OUT']['id_status']} + {l s='Checked out on'}
    {dateFormat date=$data['check_out'] full=1}     + {else} + -- {/if}     		@@ -141,6 +138,10 @@ {/if} + + {if $data.num_checkin_documents > 0}{$data.num_checkin_documents} {else}{/if} + + {if $data.is_refunded || $data.is_cancelled} {if $data.is_cancelled}{l s='Cancelled'}{else}{l s='Refunded'}{/if} {else} From 38c8b6d8bf36adfe1545a085aecb54c798c25d5c Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Tue, 18 Jun 2024 20:13:30 +0530 Subject: [PATCH 26/48] Updated: ROOMS STATUS section display for documents and allotment message --- .../template/controllers/orders/helpers/view/view.tpl | 2 +- .../controllers/orders/modals/_room_allotment_comment.tpl | 2 +- controllers/admin/AdminOrdersController.php | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) 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 ed5046dd3..7b9b78b28 100644 --- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -139,7 +139,7 @@ - {if $data.num_checkin_documents > 0}{$data.num_checkin_documents} {else}{/if} + {if $data.num_checkin_documents > 0}{$data.num_checkin_documents}{else}0{/if} {if $data.is_refunded || $data.is_cancelled} diff --git a/admin/themes/default/template/controllers/orders/modals/_room_allotment_comment.tpl b/admin/themes/default/template/controllers/orders/modals/_room_allotment_comment.tpl index 859ee5cb0..6fbec41ee 100644 --- a/admin/themes/default/template/controllers/orders/modals/_room_allotment_comment.tpl +++ b/admin/themes/default/template/controllers/orders/modals/_room_allotment_comment.tpl @@ -18,7 +18,7 @@ *}
    -
    {$comment}
    +
    {l s='Allotment remark'}: {$comment}
    {if isset($loaderImg) && $loaderImg}
    diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 1760c6d34..52ced56f8 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -781,10 +781,13 @@ class AdminOrdersControllerCore extends AdminController if ($objBookingDetail->booking_type == HotelBookingDetail::ALLOTMENT_MANUAL) { // get booking information by order $this->context->smarty->assign('comment', $objBookingDetail->comment); + + $title = $objBookingDetail->room_num.' - '.$objBookingDetail->room_type_name.' ('. + Tools::displayDate($objBookingDetail->date_from).' - '.Tools::displayDate($objBookingDetail->date_to).')'; $modal = array( 'modal_id' => 'room-allotment-comment-modal', 'modal_class' => 'modal-md order_detail_modal', - 'modal_title' => '  '.$this->l('Room Manual Allotment Comment'), + 'modal_title' => '  '.$title, 'modal_content' => $this->context->smarty->fetch('controllers/orders/modals/_room_allotment_comment.tpl'), 'modal_actions' => array(), ); From b898c489b4a3ad935836b33a4c63370532a97076 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Fri, 21 Jun 2024 19:35:51 +0530 Subject: [PATCH 27/48] Fixed: Error on AdminTranslationController while translating modules, also optimized the translation process for the modules --- .../admin/AdminTranslationsController.php | 33 ++++++++++++++----- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php index 5f275f62d..c448ba1a7 100644 --- a/controllers/admin/AdminTranslationsController.php +++ b/controllers/admin/AdminTranslationsController.php @@ -954,7 +954,7 @@ class AdminTranslationsControllerCore extends AdminController * * @throws PrestaShopException */ - protected function findAndWriteTranslationsIntoFile($file_name, $files, $theme_name, $module_name, $dir = false) + protected function findAndWriteTranslationsIntoFile($file_name, $files, $theme_name, $module_name, $dir = false, $copyExistingTranslations = false) { // These static vars allow to use file to write just one time. static $cache_file = array(); @@ -964,7 +964,12 @@ class AdminTranslationsControllerCore extends AdminController // Set file_name in static var, this allow to open and wright the file just one time if (!isset($cache_file[$theme_name.'-'.$file_name])) { - require $file_name; + if (file_exists($file_name)) { + require $file_name; + } else { + $_MODULE = array(); + } + $module_existing_translations = $_MODULE; $str_write = ''; $cache_file[$theme_name.'-'.$file_name] = true; @@ -1018,13 +1023,14 @@ class AdminTranslationsControllerCore extends AdminController $this->total_expression++; } } - foreach ($module_existing_translations as $key => $value) { - if (!in_array('\''.$key.'\'', $array_check_duplicate)) { - $str_write .= '$_MODULE[\''.$key.'\'] = \''.pSQL(str_replace(array("\r\n", "\r", "\n"), ' ', $value)).'\';'."\n"; + } + } - } + if ($copyExistingTranslations) { + foreach ($module_existing_translations as $key => $value) { + if (!in_array('\''.$key.'\'', $array_check_duplicate)) { + $str_write .= '$_MODULE[\''.$key.'\'] = \''.pSQL(str_replace(array("\r\n", "\r", "\n"), ' ', $value)).'\';'."\n"; } - } } @@ -1056,6 +1062,8 @@ class AdminTranslationsControllerCore extends AdminController unset($files[$key]); } elseif ($type_clear === 'directory' && (!is_dir($path.$file) || in_array($file, $arr_exclude))) { unset($files[$key]); + } else if ($file == 'index.php') { + unset($files[$key]); } } @@ -1468,8 +1476,15 @@ class AdminTranslationsControllerCore extends AdminController $arr_files = $this->getAllModuleFiles($modules, null, $this->lang_selected->iso_code, true); // Find and write all translation modules files - foreach ($arr_files as $value) { - $this->findAndWriteTranslationsIntoFile($value['file_name'], $value['files'], $value['theme'], $value['module'], $value['dir']); + foreach ($arr_files as $key => $value) { + $copyExistingTranslations = false; + if (!isset($arr_files[$key + 1]) + || ($arr_files[$key + 1]['module'] != $value['module']) + ) { + $copyExistingTranslations = true; + } + + $this->findAndWriteTranslationsIntoFile($value['file_name'], $value['files'], $value['theme'], $value['module'], $value['dir'], $copyExistingTranslations); } // Clear modules cache From 0af629acfddb9b0b4b7464e55409c1130040f4e0 Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Mon, 24 Jun 2024 20:49:31 +0530 Subject: [PATCH 28/48] Added: option to add/edit customer address from order detail page of BO --- .../controllers/orders/helpers/view/view.tpl | 31 ++++++++++++++++++- classes/Address.php | 1 - controllers/admin/AdminOrdersController.php | 10 +++++- js/admin/orders.js | 15 +++++++++ 4 files changed, 54 insertions(+), 3 deletions(-) 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 7b9b78b28..c435db224 100644 --- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -756,6 +756,35 @@
    +
    +
    +  {l s='Guest Address'} + {if $can_edit} + {if $idGuestAddress} + + {l s='Edit'} + + {else} + + {l s='Add Address'} + + {/if} + {/if} +
    +
    + {if $guestFormatedAddress} + {$guestFormatedAddress} + {else} +
    +
    + + {l s='Guest address not found.'} +
    +
    + {/if} +
    +
    + {* Order Internal notes *} {if (sizeof($messages))}
    @@ -1280,4 +1309,4 @@ {addJsDefL name=txt_booking_document_delete_confirm}{l s='Are you sure?' js=1}{/addJsDefL} {addJsDefL name=txt_booking_document_delete_success}{l s='Document deleted successfully.' js=1}{/addJsDefL} {/strip} -{/block} \ No newline at end of file +{/block} diff --git a/classes/Address.php b/classes/Address.php index 10c3cf0c4..48a30bd26 100644 --- a/classes/Address.php +++ b/classes/Address.php @@ -517,5 +517,4 @@ class AddressCore extends ObjectModel ) '); } - } diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 52ced56f8..c83255ad6 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -2783,9 +2783,17 @@ class AdminOrdersControllerCore extends AdminController // Overbookings information of the order $orderOverBookings = $objHotelBookingDetail->getOverbookedRooms($order->id, 0, '', '', 0, 0, 1); + // Guest address info + $guestFormatedAddress = ''; + if ($idGuestAddress = Customer::getCustomerIdAddress($order->id_customer)) { + $guestFormatedAddress = AddressFormat::generateAddress(new Address($idGuestAddress), array(), "
    "); + } + $this->tpl_view_vars = array( - // refund info + 'guestFormatedAddress' => $guestFormatedAddress, + 'idGuestAddress' => $idGuestAddress, 'orderOverBookings' => $orderOverBookings, + // refund info 'refund_allowed' => (int) $order->isReturnable(), 'applicable_refund_policies' => $applicableRefundPolicies, 'returns' => OrderReturn::getOrdersReturn($order->id_customer, $order->id), diff --git a/js/admin/orders.js b/js/admin/orders.js index 307495a03..51ac73a12 100644 --- a/js/admin/orders.js +++ b/js/admin/orders.js @@ -1248,7 +1248,22 @@ function setRoomTypeGuestOccupancy(booking_occupancy_wrapper) /* Refund system script */ var flagRefund = ''; +// when submit from ajax from guest address controller the function will be called from the controller header +function getSummary() +{ + return; +} $(document).ready(function() { + // when click edit/add guest address we have to initialize fancybox + $('.fancybox').fancybox({ + 'type': 'iframe', + 'width': '90%', + 'height': '90%', + afterClose: function() { + location.reload(); + }, + }); + $('#desc-order-partial_refund').click(function() { $('.cancel_product_change_link:visible').trigger('click'); if (flagRefund == 'partial') { From d02b845ccea3d337dff3c91361b5f7b304f1c26c Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Tue, 25 Jun 2024 12:33:10 +0530 Subject: [PATCH 29/48] Fixed: The Admin is unable to remove tranlsations by submitting empty field --- controllers/admin/AdminTranslationsController.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php index c448ba1a7..dcc382886 100644 --- a/controllers/admin/AdminTranslationsController.php +++ b/controllers/admin/AdminTranslationsController.php @@ -961,6 +961,7 @@ class AdminTranslationsControllerCore extends AdminController static $str_write = ''; static $array_check_duplicate = array(); static $module_existing_translations = array(); + static $empty_translation_fields = array(); // Set file_name in static var, this allow to open and wright the file just one time if (!isset($cache_file[$theme_name.'-'.$file_name])) { @@ -1016,6 +1017,7 @@ class AdminTranslationsControllerCore extends AdminController if (array_key_exists($post_key, $_POST) && !in_array($pattern, $array_check_duplicate)) { if ($_POST[$post_key] == '') { + $empty_translation_fields[] = $pattern; continue; } $array_check_duplicate[] = $pattern; @@ -1028,13 +1030,15 @@ class AdminTranslationsControllerCore extends AdminController if ($copyExistingTranslations) { foreach ($module_existing_translations as $key => $value) { - if (!in_array('\''.$key.'\'', $array_check_duplicate)) { + if (!in_array('\''.$key.'\'', $array_check_duplicate) + && !in_array('\''.$key.'\'', $empty_translation_fields) + ) { $str_write .= '$_MODULE[\''.$key.'\'] = \''.pSQL(str_replace(array("\r\n", "\r", "\n"), ' ', $value)).'\';'."\n"; } } } - if (isset($cache_file[$theme_name.'-'.$file_name]) && $str_write != " Date: Tue, 2 Jul 2024 16:41:18 +0530 Subject: [PATCH 30/48] Updated the store icon name to location icon to make it more relevant for QloApps --- controllers/admin/AdminThemesController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminThemesController.php b/controllers/admin/AdminThemesController.php index 3a25fe8bb..971be0c5b 100644 --- a/controllers/admin/AdminThemesController.php +++ b/controllers/admin/AdminThemesController.php @@ -186,8 +186,8 @@ class AdminThemesControllerCore extends AdminController 'thumb' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_FAVICON').(Tools::getValue('conf') ? sprintf('?%04d', rand(0, 9999)) : '')) ), 'PS_STORES_ICON' => array( - 'title' => $this->l('Store icon'), - 'hint' => $this->l('Will appear on the store locator (inside Google Maps).').'
    '.$this->l('Suggested size: 30x30, transparent GIF.'), + 'title' => $this->l('Location icon'), + 'hint' => $this->l('Will appear at hotel locations on Google Maps.').'
    '.$this->l('Suggested size: 30x30, transparent GIF.'), 'type' => 'file', 'name' => 'PS_STORES_ICON', 'tab' => 'icons', From 151b68577726b8f477fab0fabad33b596be3b1c8 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Thu, 4 Jul 2024 12:13:08 +0530 Subject: [PATCH 31/48] Updated the banned customer filter process using banned customer KPI --- controllers/admin/AdminCustomersController.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php index 350e822d1..17671e5f8 100644 --- a/controllers/admin/AdminCustomersController.php +++ b/controllers/admin/AdminCustomersController.php @@ -222,15 +222,8 @@ class AdminCustomersControllerCore extends AdminController $this->redirect_after = $this->context->link->getAdminLink('AdminCustomers'); } - $prefix = $this->getCookieFilterPrefix(); - if (Tools::getValue('filterOnlyBannedCustomer')) { - $this->processResetFilters(); - $this->context->cookie->{'submitFilter'.$this->table} = true; - $this->context->cookie->{$prefix.$this->table.'Filter_deleted'} = Customer::STATUS_BANNED; - $this->redirect_after = $this->context->link->getAdminLink('AdminCustomers'); - } - parent::postProcess(); + $prefix = $this->getCookieFilterPrefix(); $filters = $this->context->cookie->getFamily($prefix.$this->table.'Filter_'); if (isset($filters[$prefix.$this->table.'Filter_deleted']) && $filters[$prefix.$this->table.'Filter_deleted'] == 1) { $this->deleted = false; @@ -767,7 +760,7 @@ class AdminCustomersControllerCore extends AdminController $helper->color = 'color2'; $helper->title = $this->l('Banned Customers', null, null, false); $helper->subtitle = $this->l('All Time', null, null, false); - $helper->href = $this->context->link->getAdminLink('AdminCustomers').'&filterOnlyBannedCustomer=1'; + $helper->href = $this->context->link->getAdminLink('AdminCustomers').'&customerFilter_deleted=1'; $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=total_banned_customers'; $helper->tooltip = $this->l('The total number of banned customers.', null, null, false); $kpis[] = $helper; From 5e276db6be9d5b330dfd0750b01dcf121df4fd43 Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Tue, 9 Jul 2024 13:22:33 +0530 Subject: [PATCH 32/48] Revert: Code for - Added: option to add/edit customer address from order detail page of BO --- .../controllers/orders/helpers/view/view.tpl | 29 ------------------- controllers/admin/AdminOrdersController.php | 8 ----- js/admin/orders.js | 15 ---------- 3 files changed, 52 deletions(-) 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 135959c42..fa85718d8 100644 --- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -758,35 +758,6 @@
    -
    -
    -  {l s='Guest Address'} - {if $can_edit} - {if $idGuestAddress} - - {l s='Edit'} - - {else} - - {l s='Add Address'} - - {/if} - {/if} -
    -
    - {if $guestFormatedAddress} - {$guestFormatedAddress} - {else} -
    -
    - - {l s='Guest address not found.'} -
    -
    - {/if} -
    -
    - {* Order Internal notes *} {if (sizeof($messages))}
    diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 8710cc160..e1d0df03b 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -2892,15 +2892,7 @@ class AdminOrdersControllerCore extends AdminController // Overbookings information of the order $orderOverBookings = $objHotelBookingDetail->getOverbookedRooms($order->id, 0, '', '', 0, 0, 1); - // Guest address info - $guestFormatedAddress = ''; - if ($idGuestAddress = Customer::getCustomerIdAddress($order->id_customer)) { - $guestFormatedAddress = AddressFormat::generateAddress(new Address($idGuestAddress), array(), "
    "); - } - $this->tpl_view_vars = array( - 'guestFormatedAddress' => $guestFormatedAddress, - 'idGuestAddress' => $idGuestAddress, 'totalRefundedRooms' => $totalRefundedRooms, 'orderOverBookings' => $orderOverBookings, // refund info diff --git a/js/admin/orders.js b/js/admin/orders.js index d85d8c93b..ac60ba167 100644 --- a/js/admin/orders.js +++ b/js/admin/orders.js @@ -1248,22 +1248,7 @@ function setRoomTypeGuestOccupancy(booking_occupancy_wrapper) /* Refund system script */ var flagRefund = ''; -// when submit from ajax from guest address controller the function will be called from the controller header -function getSummary() -{ - return; -} $(document).ready(function() { - // when click edit/add guest address we have to initialize fancybox - $('.fancybox').fancybox({ - 'type': 'iframe', - 'width': '90%', - 'height': '90%', - afterClose: function() { - location.reload(); - }, - }); - // when change order state to cancel or refund then show modal of bookings cancellation $(document).on('change', '#id_order_state', function(e) { if ($(this).val() == PS_OS_CANCELED || $(this).val() == PS_OS_REFUND) { From 778e097cfff18491e3225c34faf80740b46db846 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Tue, 9 Jul 2024 18:23:33 +0530 Subject: [PATCH 33/48] Optimized code for invalid id in url for the admin --- controllers/admin/AdminNormalProductsController.php | 11 ++++------- controllers/admin/AdminProductsController.php | 7 +------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/controllers/admin/AdminNormalProductsController.php b/controllers/admin/AdminNormalProductsController.php index 0521be007..9db549acb 100644 --- a/controllers/admin/AdminNormalProductsController.php +++ b/controllers/admin/AdminNormalProductsController.php @@ -396,12 +396,6 @@ class AdminNormalProductsControllerCore extends AdminController $bo_theme = 'default'; } - Media::addJsDef( - array( - 'tb_pathToImage' => '../img/loadingAnimation.gif' - ) - ); - $this->addJs(__PS_BASE_URI__.$this->admin_webpath.'/themes/'.$bo_theme.'/js/jquery.iframe-transport.js'); $this->addJs(__PS_BASE_URI__.$this->admin_webpath.'/themes/'.$bo_theme.'/js/jquery.fileupload.js'); $this->addJs(__PS_BASE_URI__.$this->admin_webpath.'/themes/'.$bo_theme.'/js/jquery.fileupload-process.js'); @@ -1399,7 +1393,10 @@ class AdminNormalProductsControllerCore extends AdminController parent::postProcess(); } - if ($this->display == 'edit' || $this->display == 'add') { + if (in_array($this->display, array('add', 'edit')) + && $this->tabAccess[$this->display] == '1' + && $this->loadObject(true) + ) { $this->addJqueryUI(array( 'ui.core', 'ui.widget' diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 63ed01393..3587c6bf3 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -469,12 +469,6 @@ class AdminProductsControllerCore extends AdminController $bo_theme = 'default'; } - Media::addJsDef( - array( - 'tb_pathToImage' => '../img/loadingAnimation.gif' - ) - ); - $this->addJs(__PS_BASE_URI__.$this->admin_webpath.'/themes/'.$bo_theme.'/js/jquery.iframe-transport.js'); $this->addJs(__PS_BASE_URI__.$this->admin_webpath.'/themes/'.$bo_theme.'/js/jquery.fileupload.js'); $this->addJs(__PS_BASE_URI__.$this->admin_webpath.'/themes/'.$bo_theme.'/js/jquery.fileupload-process.js'); @@ -1463,6 +1457,7 @@ class AdminProductsControllerCore extends AdminController if (in_array($this->display, array('add', 'edit')) && $this->tabAccess[$this->display] == '1' + && $this->loadObject(true) ) { $this->addJqueryUI(array( 'ui.core', From afdb1b588e3f04bbd085fdaccf61c17144e995f6 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Wed, 10 Jul 2024 10:14:02 +0530 Subject: [PATCH 34/48] Added requried comment in the admin customers controller to the code used to display the deleted customers --- controllers/admin/AdminCustomersController.php | 1 + controllers/admin/AdminStatsController.php | 1 - modules/dashactivity/views/js/dashactivity.js | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php index bef4cd9c9..ffbd77fe6 100644 --- a/controllers/admin/AdminCustomersController.php +++ b/controllers/admin/AdminCustomersController.php @@ -223,6 +223,7 @@ class AdminCustomersControllerCore extends AdminController } parent::postProcess(); + // Added this to check if the filter for the banned(deleted) is used, since $this->delete = true will not display the deleted customers. $prefix = $this->getCookieFilterPrefix(); $filters = $this->context->cookie->getFamily($prefix.$this->table.'Filter_'); if (isset($filters[$prefix.$this->table.'Filter_deleted']) && $filters[$prefix.$this->table.'Filter_deleted'] == 1) { diff --git a/controllers/admin/AdminStatsController.php b/controllers/admin/AdminStatsController.php index d7d233e26..782f989f8 100644 --- a/controllers/admin/AdminStatsController.php +++ b/controllers/admin/AdminStatsController.php @@ -965,7 +965,6 @@ class AdminStatsControllerCore extends AdminStatsTabController case 'average_lead_time': $dateToday = date('Y-m-d'); $value = Tools::ps_round(AdminStatsController::getAverageLeadTime(), 2); - break; case 'average_guest_in_booking': $dateToday = date('Y-m-d'); diff --git a/modules/dashactivity/views/js/dashactivity.js b/modules/dashactivity/views/js/dashactivity.js index 1bdf4e422..a84820e02 100644 --- a/modules/dashactivity/views/js/dashactivity.js +++ b/modules/dashactivity/views/js/dashactivity.js @@ -58,6 +58,7 @@ $(document).ready(function() { $('#date-start').change(function() { start = Date.parseDate($('#date-start').val(), 'Y-m-d'); end = Date.parseDate($('#date-end').val(), 'Y-m-d'); + $('#customers-newsletters-subtitle').html(sprintf(date_subtitle, start.format(date_format), end.format(date_format))); $('#traffic-subtitle').html(sprintf(date_subtitle, start.format(date_format), end.format(date_format))); }); From 2cac5680d8622a85775269c12389c67cf0f0e374 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Sat, 13 Jul 2024 10:24:21 +0530 Subject: [PATCH 35/48] Updated the defination lable of the store icon to map icon --- controllers/admin/AdminThemesController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminThemesController.php b/controllers/admin/AdminThemesController.php index 971be0c5b..09470ad22 100644 --- a/controllers/admin/AdminThemesController.php +++ b/controllers/admin/AdminThemesController.php @@ -186,8 +186,8 @@ class AdminThemesControllerCore extends AdminController 'thumb' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_FAVICON').(Tools::getValue('conf') ? sprintf('?%04d', rand(0, 9999)) : '')) ), 'PS_STORES_ICON' => array( - 'title' => $this->l('Location icon'), - 'hint' => $this->l('Will appear at hotel locations on Google Maps.').'
    '.$this->l('Suggested size: 30x30, transparent GIF.'), + 'title' => $this->l('Map icon'), + 'hint' => $this->l('This icon will be displayed at hotel locations on Google Maps.').'
    '.$this->l('Suggested size: 30x30, transparent GIF.'), 'type' => 'file', 'name' => 'PS_STORES_ICON', 'tab' => 'icons', From 03fcae193229c49402741aca44477609b3fdd7cb Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Sat, 13 Jul 2024 10:26:17 +0530 Subject: [PATCH 36/48] Fixed: Unused code removed came from merging the conflicts with develop branch --- controllers/admin/AdminOrdersController.php | 1 + js/admin/orders.js | 210 -------------------- 2 files changed, 1 insertion(+), 210 deletions(-) diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index e1d0df03b..73f3b62de 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -4860,6 +4860,7 @@ class AdminOrdersControllerCore extends AdminController 'tax_excl' => $totalRoomPriceAfterTE, 'tax_incl' => $totalRoomPriceAfterTI, ); + if ($update_htl_tables = $obj_booking_detail->UpdateHotelCartHotelOrderOnOrderEdit( $id_order, $id_room, diff --git a/js/admin/orders.js b/js/admin/orders.js index ac60ba167..850efcacc 100644 --- a/js/admin/orders.js +++ b/js/admin/orders.js @@ -1757,38 +1757,6 @@ $(document).ready(function() { // End: RoomAllotmentCommentModal: Processes // ====================================== - // Start: RoomReallocationModal: Processes - // For processing room reallocation and swapping - $(document).on('click', '.room_reallocate_swap', function(e) { - e.preventDefault(); - RoomReallocationModal.show($(this)); - }); - - $(document).on('hidden.bs.modal', '#room-reallocation-modal', function(){ - location.reload(); - }); - - /*For reallocating rooms in the modal*/ - $(document).on('click', '#realloc_allocated_rooms', function(e){ - if (RoomReallocationModal.reallocate() == false) { - return false; - } - }); - /*For swaping rooms in the modal*/ - $(document).on('click', '#swap_allocated_rooms', function(){ - if (RoomReallocationModal.swap() == false) { - return false; - } - }); - - // change room type for reallocation - $(document).on("change", "#realloc_avail_room_type", function(e) { - e.preventDefault(); - RoomReallocationModal.changeRoomType($(this)); - }); - // End: RoomReallocationModal: Processes - // ====================================== - // Start: AddRoomBookingModal: Processes /*For adding rooms to the order*/ $(document).on('click', '#add_room', function(e){ @@ -2345,184 +2313,6 @@ const RoomStatusModal = { } }; -// Modal object to handle room reallocation processes -const RoomReallocationModal = { - show: function(roomObj) { - $(".loading_overlay").show(); - $.ajax({ - type: 'POST', - headers: { - "cache-control": "no-cache" - }, - url: admin_order_tab_link, - dataType: 'JSON', - cache: false, - data: 'ajax=true&id_order='+id_order+'&action=InitRoomReallocationModal', - success: function(result) { - if (result.hasError == 0 && result.modalHtml) { - $('#footer').next('.bootstrap').append(result.modalHtml); - $(".modal_id_htl_booking").val(roomObj.data('id_htl_booking')); - $("input.modal_curr_room_num").val(roomObj.data('room_num')); - $("span.modal_curr_room_num").text(roomObj.data('room_num') + ', ' + roomObj.data('room_type_name')); - $(".cust_name").text(roomObj.data('cust_name')); - $(".cust_email").text(roomObj.data('cust_email')); - $(".modal_curr_allotent_type").text(roomObj.data('allotment_type_label')); - - // reset price difference fields - $("#reallocation_price_diff").val(0); - $("#reallocation_price_diff_block").hide(); - $(".realloc_roomtype_change_message").hide(); - - if (roomObj.data('allotment_type') == ALLOTMENT_MANUAL) { - $(".allotment_comment_block .modal_curr_allotment_comment").text(roomObj.data('comment')); - $(".allotment_comment_block").show(); - } else { - $(".allotment_comment_block").hide(); - } - - // For Rooms Swapping - var json_arr_rm_swp = roomObj.data('avail_rm_swap'); - if (roomObj.data('avail_rm_swap') != 'false' && json_arr_rm_swp.length != 0) { - html = ''; - $(".swap_avail_rooms_container").empty().append(html); - } else { - $(".swap_avail_rooms_container").empty().text(no_swap_rm_avail_txt).addClass('text-danger'); - $("#swap_room_tab .modal-footer").hide(); - } - - // For Rooms Reallocation - var json_arr_realloc_room_types = roomObj.data('avail_realloc_room_types'); - if (roomObj.data('avail_realloc_room_types') != 'false' && json_arr_realloc_room_types.length != 0) { - var idCurrentRoomType = roomObj.data('id_room_type'); - var roomsTypesHtml = ''; - - setRoomsForReallocation(json_arr_realloc_room_types[idCurrentRoomType]['rooms']); - - $(".realloc_avail_room_type_container").empty().append(roomsTypesHtml); - } else { - $(".realloc_avail_rooms_container").empty().text(no_realloc_rm_avail_txt).addClass('text-danger'); - $(".realloc_avail_room_type_container").empty().text(no_realloc_rm_type_avail_txt).addClass('text-danger'); - $("#reallocate_room_tab .modal-footer").hide(); - } - - $('#room-reallocation-modal').modal('show'); - } else { - showErrorMessage(txtSomeErr); - } - }, - complete: function() { - $(".loading_overlay").hide(); - } - }); - }, - swap: function() { - $(".error_text").text(''); - var room_to_swap = $('#swap_avail_rooms').val(); - if (typeof room_to_swap == 'undefined' || room_to_swap == 0) { - $("#swap_sel_rm_err_p").text(slct_rm_err); - return false; - } - - return true; - }, - reallocate: function(reallocateBtnObj) { - $(".error_text").text(''); - var room_to_reallocate = $('#realloc_avail_rooms').val(); - var room_type_to_reallocate = $('#realloc_avail_room_type').val(); - - if (typeof room_type_to_reallocate == 'undefined' || room_type_to_reallocate == 0) { - $("#realloc_sel_rm_type_err_p").text(slct_rm_type_err); - return false; - } - - if (typeof room_to_reallocate == 'undefined' || room_to_reallocate == 0) { - $("#realloc_sel_rm_err_p").text(slct_rm_err); - return false; - } - - return true; - }, - changeRoomType: function(roomTypeObj) { - $(".loading_overlay").show(); - var idHotelBooking = roomTypeObj.data('id_htl_booking'); - $("#reallocation_price_diff").val(0); - $("#reallocation_price_diff_block").hide(); - if (parseInt(idHotelBooking) > 0) { - var optionSelected = roomTypeObj.find('option:selected'); - var roomsAvailable = JSON.parse(optionSelected.attr('rooms_available')); - - // set the rooms of the selceted room type - setRoomsForReallocation(roomsAvailable); - - // send an ajax for fetching if price has changes in the new room type seleceted - $.ajax({ - type: 'POST', - headers: { - "cache-control": "no-cache" - }, - url: admin_order_tab_link, - dataType: 'JSON', - cache: false, - data: { - id_htl_booking: idHotelBooking, - id_new_room_type: roomTypeObj.val(), - action: 'changeRoomTypeToReallocate', - ajax: true - }, - success: function(result) { - if (result.success == 1) { - // has room type changed for reallocation - if (result.has_room_type_change == 1) { - $(".realloc_roomtype_change_message").show(); - // has room type price changed for reallocation - if (result.has_price_changes == 1) { - $("#reallocation_price_diff").val(result.price_diff); - $("#reallocation_price_diff_block").show(); - } - } else { - $(".realloc_roomtype_change_message").hide(); - } - $('#room_type_change_info').empty(); - if (result.is_changes_present == 1) { - } - } else if (typeof(result.error) != 'undefinded' && result.error) { - showErrorMessage(result.error); - } else { - showErrorMessage(txtSomeErr); - } - }, - error: function(XMLHttpRequest, textStatus, errorThrown) { - showErrorMessage(txtSomeErr); - }, - complete: function() { - $(".loading_overlay").hide(); - } - }); - } else { - $(".loading_overlay").hide(); - showErrorMessage(txtSomeErr); - return false; - } - }, - close: function() { - $('#room-reallocation-modal').modal('hide'); - }, - submit: function() { - } -}; - // Modal object to handle adding rooms to order processes const AddRoomBookingModal = { show: function() { From 60e9437f0fbb03f4ecb9ab1b9b88e72994fa9d94 Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Sat, 13 Jul 2024 11:14:25 +0530 Subject: [PATCH 37/48] Fixed: Select 1 instead of Select age in the child age when age is already selected while order edit and also while creating booking in backoffice --- .../template/controllers/orders/_current_cart_details_data.tpl | 2 +- .../controllers/orders/modals/_edit_room_tab_content.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl b/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl index fb6f389c2..07f87ca73 100644 --- a/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl +++ b/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl @@ -92,7 +92,7 @@ {foreach $data['child_ages'] as $childAge}

    - + {for $age=1 to ($max_child_age-1)} From c63768eb81a453d4ba1a91f1fe428d6269d2fe39 Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Sat, 13 Jul 2024 11:41:14 +0530 Subject: [PATCH 38/48] Fixed: Unable to save the occupancy while editing booking when the room has been reallocated once. --- .../classes/HotelBookingDetail.php | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/modules/hotelreservationsystem/classes/HotelBookingDetail.php b/modules/hotelreservationsystem/classes/HotelBookingDetail.php index 9f5984083..472802aea 100644 --- a/modules/hotelreservationsystem/classes/HotelBookingDetail.php +++ b/modules/hotelreservationsystem/classes/HotelBookingDetail.php @@ -2098,6 +2098,14 @@ class HotelBookingDetail extends ObjectModel // Reinject quantity in stock $objOldOrderDetail->reinjectQuantity($objOldOrderDetail, $objOldOrderDetail->product_quantity, $deleteQty); + // retrieve and delete HotelCartBookingData row + $idHotelCartBookingData = Db::getInstance()->getValue('SELECT `id` FROM `'._DB_PREFIX_.'htl_cart_booking_data` + WHERE date_from = "'.pSQL($objOldHotelBooking->date_from).'" AND date_to = "'.pSQL($objOldHotelBooking->date_to).'" + AND id_room = '.(int) $objOldHotelBooking->id_room.' AND `id_order` = '.(int) $objOldHotelBooking->id_order + ); + $objCartBookingData = new HotelCartBookingData($idHotelCartBookingData); + $objCartBookingData->delete(); + // delete the booking detail $objOldHotelBooking = new HotelBookingDetail($idHotelBooking); $objOldHotelBooking->delete(); @@ -2107,6 +2115,19 @@ class HotelBookingDetail extends ObjectModel // =============================================================== } else { // If we are reallocating to the same room type then we need to update only the room details + // update in the cart booking data + // retrieve HotelCartBookingData row + $idHotelCartBookingData = Db::getInstance()->getValue('SELECT `id` FROM `'._DB_PREFIX_.'htl_cart_booking_data` + WHERE date_from = "'.pSQL($objOldHotelBooking->date_from).'" AND date_to = "'.pSQL($objOldHotelBooking->date_to).'" + AND id_room = '.(int) $objOldHotelBooking->id_room.' AND `id_order` = '.(int) $objOldHotelBooking->id_order + ); + $objCartBookingData = new HotelCartBookingData($idHotelCartBookingData); + $objCartBookingData->id_room = $idRoom; + // set backorder to 0 as available reallocate rooms will always be free + $objOldHotelBooking->is_back_order = 0; + $objCartBookingData->save(); + + // update in the hotel booking detail table $objOldHotelBooking->id_room = $idRoom; $objOldHotelBooking->room_num = $objHotelRoomInfo->room_num; // set backorder to 0 as available reallocate rooms will always be free From d3d3d05a6459e6e58c3b1cdb6f8e87c15a3a4ea8 Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Sat, 13 Jul 2024 12:01:26 +0530 Subject: [PATCH 39/48] Fixed: Text years is wrong if child age is 1 in bookings list and overbookings list in order details page in back office --- .../default/template/controllers/orders/_overbookings.tpl | 2 +- .../default/template/controllers/orders/_product_line.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/themes/default/template/controllers/orders/_overbookings.tpl b/admin/themes/default/template/controllers/orders/_overbookings.tpl index 154adbccf..8f0064708 100644 --- a/admin/themes/default/template/controllers/orders/_overbookings.tpl +++ b/admin/themes/default/template/controllers/orders/_overbookings.tpl @@ -54,7 +54,7 @@ {if $childAge == 0} {l s='Child %s : Under 1' sprintf=[$childAge@iteration]} {else} - {l s='Child %s : %s years' sprintf=[$childAge@iteration, $childAge]} + {l s='Child %s : %s' sprintf=[$childAge@iteration, $childAge]} {if $childAge > 1}{l s='years'}{else}{l s='year'}{/if} {/if}

    {/foreach} diff --git a/admin/themes/default/template/controllers/orders/_product_line.tpl b/admin/themes/default/template/controllers/orders/_product_line.tpl index 099a0ef73..11ab4b428 100644 --- a/admin/themes/default/template/controllers/orders/_product_line.tpl +++ b/admin/themes/default/template/controllers/orders/_product_line.tpl @@ -73,7 +73,7 @@ {if $childAge == 0} {l s='Child %s : Under 1' sprintf=[$childAge@iteration]} {else} - {l s='Child %s : %s years' sprintf=[$childAge@iteration, $childAge]} + {l s='Child %s : %s' sprintf=[$childAge@iteration, $childAge]} {if $childAge > 1}{l s='years'}{else}{l s='year'}{/if} {/if}

    {/foreach} From b18f9f3612b24118b04b704c8c137c9e521691a3 Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Sat, 13 Jul 2024 14:41:33 +0530 Subject: [PATCH 40/48] Updated:: Admin can edit occupancy after order from backoffice whether order is created with occupancy or with rooms selection by guest --- .../orders/modals/_edit_room_tab_content.tpl | 98 +++++++++---------- 1 file changed, 47 insertions(+), 51 deletions(-) diff --git a/admin/themes/default/template/controllers/orders/modals/_edit_room_tab_content.tpl b/admin/themes/default/template/controllers/orders/modals/_edit_room_tab_content.tpl index c8faf37de..1bb98114b 100644 --- a/admin/themes/default/template/controllers/orders/modals/_edit_room_tab_content.tpl +++ b/admin/themes/default/template/controllers/orders/modals/_edit_room_tab_content.tpl @@ -67,57 +67,55 @@
    - {if $order->with_occupancy} -
    -
    - -
    -
    - - - -
    -
    {l s='Room - 1'}
    -
    -
    -
    - - -
    -
    -
    -
    - - - ({l s='Below'} {$max_child_age|escape:'htmlall':'UTF-8'} {l s='years'}) -
    +
    +
    + +
    +
    + + + +
    +
    {l s='Room - 1'}
    +
    +
    +
    + +
    - -

    -
    +
    - -
    -
    - {if isset($data['child_ages']) && $data['child_ages']} - {foreach $data['child_ages'] as $childAge} -

    - -

    - {/foreach} - {/if} -
    + + + ({l s='Below'} {$max_child_age|escape:'htmlall':'UTF-8'} {l s='years'}) +
    +
    +
    + +

    +
    +
    + +
    +
    + {if isset($data['child_ages']) && $data['child_ages']} + {foreach $data['child_ages'] as $childAge} +

    + +

    + {/foreach} + {/if}
    @@ -126,9 +124,7 @@
    - {else} - - {/if} +
    From 91558046dd937d736411043e477fb2df37a5890a Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Sat, 13 Jul 2024 15:00:58 +0530 Subject: [PATCH 41/48] Removed: Unused file when order edit process --- .../controllers/orders/_new_product.tpl | 196 ------------------ 1 file changed, 196 deletions(-) delete mode 100644 admin/themes/default/template/controllers/orders/_new_product.tpl diff --git a/admin/themes/default/template/controllers/orders/_new_product.tpl b/admin/themes/default/template/controllers/orders/_new_product.tpl deleted file mode 100644 index 525795c10..000000000 --- a/admin/themes/default/template/controllers/orders/_new_product.tpl +++ /dev/null @@ -1,196 +0,0 @@ -{* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} -