From d0847d23e0cc2c95a9b604a886eaf5d22b88a7a2 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Wed, 17 Apr 2024 15:32:01 +0530 Subject: [PATCH 1/9] Fixed: design issue in new list header design when switching from mobile to desktop view --- admin/themes/default/template/helpers/list/list_header.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/themes/default/template/helpers/list/list_header.tpl b/admin/themes/default/template/helpers/list/list_header.tpl index bf7678e4f..ca8600b9a 100644 --- a/admin/themes/default/template/helpers/list/list_header.tpl +++ b/admin/themes/default/template/helpers/list/list_header.tpl @@ -167,7 +167,7 @@ $(form).find('table.table .field_optional').hide(); $(form).find('table.table .field_optional').each(function(i, val) { if (list_fields_visibility.includes($(this).data('key'))) { - $(this).show(); + $(this).css('display', ''); } }); updateListVisibility(list_fields_visibility) From 7b03d06a38af916c9a9641148081254244b52b6f Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Thu, 2 May 2024 15:40:47 +0530 Subject: [PATCH 2/9] Revert PR #789 and display occupancy on room type detail page using referer --- controllers/front/CategoryController.php | 16 -- controllers/front/ProductController.php | 27 ++- js/admin/orders.js | 7 - modules/blockcart/ajax-cart.js | 3 + .../AdminHotelRoomsBookingController.php | 13 -- .../helpers/view/_partials/booking-rooms.tpl | 170 +++++------------- .../_partials/room_type_list.tpl | 2 - .../js/modules/blockcart/ajax-cart.js | 3 + .../hotel-reservation-theme/js/occupancy.js | 16 ++ 9 files changed, 88 insertions(+), 169 deletions(-) diff --git a/controllers/front/CategoryController.php b/controllers/front/CategoryController.php index 3823504ab..0fc5f8efb 100644 --- a/controllers/front/CategoryController.php +++ b/controllers/front/CategoryController.php @@ -181,22 +181,6 @@ class CategoryControllerCore extends FrontController $booking_data = $objBookingDetail->dataForFrontSearch($bookingParams); - // set default occupancies in required format - if (isset($booking_data['rm_data']) && $booking_data['rm_data']) { - foreach ($booking_data['rm_data'] as &$roomTypeData) { - $occupancy = array( - array( - 'adults' => $roomTypeData['adults'], - 'children' => 0, - 'child_ages' => array(), - ), - ); - - $roomTypeData['occupancies'] = $occupancy; - $roomTypeData['occupancy_adults'] = $roomTypeData['adults']; // only one room by default - } - } - $obj_booking_detail = new HotelBookingDetail(); $num_days = $obj_booking_detail->getNumberOfDays($date_from, $date_to); diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php index ec77ebd09..1028ae6e0 100644 --- a/controllers/front/ProductController.php +++ b/controllers/front/ProductController.php @@ -427,14 +427,27 @@ class ProductControllerCore extends FrontController if (Configuration::get('PS_FRONT_ROOM_UNIT_SELECTION_TYPE') == HotelBookingDetail::PS_ROOM_UNIT_SELECTION_TYPE_QUANTITY) { $occupancy_value = 1; } else { - $occupancy_value = array( - array( - 'adults' => $room_info_by_product_id['adults'], - 'children' => 0, - 'child_ages' => array(), - ), - ); + $useDefaultOccupancy = true; + // if coming from hotel page do not set occupancy, otherwise set base adult occupancy + if (isset($_SERVER['HTTP_REFERER']) && $_SERVER['HTTP_REFERER'] == Tools::secureReferrer($_SERVER['HTTP_REFERER'])) { // Assure us the previous page was one of the site + $idCategoryHotel = $hotel_branch_obj->id_category; + $categoryPageLink = $this->context->link->getCategoryLink($idCategoryHotel); + if (Tools::strpos($_SERVER['HTTP_REFERER'], $categoryPageLink) === 0) { + $useDefaultOccupancy = false; + } + } + + if ($useDefaultOccupancy) { + $occupancy_value = array( + array( + 'adults' => $room_info_by_product_id['adults'], + 'children' => 0, + 'child_ages' => array(), + ), + ); + } } + $this->assignBookingFormVars($this->product->id, $date_from, $date_to, $occupancy_value); $this->assignServiceProductVars(); diff --git a/js/admin/orders.js b/js/admin/orders.js index 8a551b4fa..097961a27 100644 --- a/js/admin/orders.js +++ b/js/admin/orders.js @@ -2515,13 +2515,6 @@ const AddRoomBookingModal = { $('#new_product .booking_guest_occupancy').removeClass('disabled'); setRoomTypeGuestOccupancy($('#new_product .booking_occupancy_wrapper')); } - if (data.room_type_info) { - $('#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); - $('#new_product .num_adults').attr('max', data.room_type_info.max_adults); - $('#new_product .num_children').attr('max', data.room_type_info.max_children); - } // Keep product variable current_product = data; diff --git a/modules/blockcart/ajax-cart.js b/modules/blockcart/ajax-cart.js index c1cb4b1e7..9dfd93abd 100644 --- a/modules/blockcart/ajax-cart.js +++ b/modules/blockcart/ajax-cart.js @@ -478,6 +478,9 @@ var ajaxCart = { else $(callerElement).removeProp('disabled'); } + if (!addedFromProductPage) { + resetOccupancyField($(callerElement).closest('.booking_room_fields').find('.booking_occupancy_wrapper')); + } emptyCustomizations(); }, diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php index 0edf2d641..ea23a4bfb 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php @@ -819,19 +819,6 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $objHotelRoomType = new HotelRoomType(); foreach ($booking_data['rm_data'] as $key_bk_data => $value_bk_data) { $booking_data['rm_data'][$key_bk_data]['room_type_info'] = $objHotelRoomType->getRoomTypeInfoByIdProduct($value_bk_data['id_product']); - - // set default occupancies in required format - $occupancy = array( - array( - 'adults' => $value_bk_data['adults'], - 'children' => 0, - 'child_ages' => array(), - ), - ); - - $booking_data['rm_data'][$key_bk_data]['occupancies'] = $occupancy; - $booking_data['rm_data'][$key_bk_data]['occupancy_adults'] = $booking_data['rm_data'][$key_bk_data]['adults']; // only one room by default - if (isset($value_bk_data['data']['booked']) && $value_bk_data['data']['booked']) { foreach ($value_bk_data['data']['booked'] as $booked_k1 => $booked_v1) { if (isset($booked_v1['detail']) && $booked_v1['detail']) { diff --git a/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/booking-rooms.tpl b/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/booking-rooms.tpl index 20013d8d0..70bcd1cd3 100644 --- a/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/booking-rooms.tpl +++ b/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/booking-rooms.tpl @@ -56,79 +56,40 @@