From 19565cdff5f52169d4fae5dde36d091303f31851 Mon Sep 17 00:00:00 2001 From: azhar bhat Date: Thu, 16 Jul 2026 13:12:55 +0530 Subject: [PATCH] additional facilities removed --- admin/filemanager/js/jquery.contextMenu.js | 2 +- .../controllers/carts/helpers/view/view.tpl | 74 +-- .../orders/_cart_booking_demands.tpl | 113 ---- .../orders/_cart_booking_services.tpl | 45 ++ .../orders/_current_cart_details_data.tpl | 21 +- .../controllers/orders/_product_line.tpl | 4 +- .../template/controllers/orders/form.tpl | 109 +--- .../controllers/orders/helpers/view/view.tpl | 26 +- .../_add_order_extra_services_tab_content.tpl | 8 +- .../orders/modals/_edit_room_booking.tpl | 3 - .../orders/modals/_extra_services.tpl | 3 +- ..._extra_services_facilities_tab_content.tpl | 181 ------ ..._services_service_products_tab_content.tpl | 12 +- .../_room_extra_services_content.tpl | 9 +- .../orders/modals/_room_reallocation.tpl | 4 +- .../products/additionalfacilities.tpl | 156 ----- .../controllers/search/helpers/view/view.tpl | 13 - classes/Cart.php | 61 +- classes/CartRule.php | 14 +- classes/PaymentModule.php | 118 +--- classes/Product.php | 90 --- classes/order/Order.php | 6 +- classes/order/OrderInvoice.php | 65 -- classes/order/OrderReturn.php | 26 - classes/pdf/HTMLTemplateInvoice.php | 88 +-- .../WebserviceSpecificManagementBookings.php | 318 +--------- controllers/admin/AdminCartsController.php | 64 +- controllers/admin/AdminImportController.php | 51 -- controllers/admin/AdminOrdersController.php | 590 +----------------- controllers/admin/AdminProductsController.php | 172 +---- controllers/admin/AdminSearchController.php | 58 -- controllers/admin/AdminStatsController.php | 19 +- controllers/front/CartController.php | 4 - controllers/front/GuestTrackingController.php | 63 +- .../front/OrderConfirmationController.php | 48 +- controllers/front/OrderDetailController.php | 65 +- controllers/front/OrderOpcController.php | 63 +- controllers/front/ProductController.php | 78 +-- js/admin/orders.js | 220 +------ js/admin/products.js | 15 - mails/en/booking_extra_demands.tpl | 166 ----- mails/en/booking_extra_demands.txt | 40 -- mails/en/booking_extra_services.tpl | 89 +++ mails/en/order_conf.html | 2 +- mails/en/order_conf.txt | 2 +- mails/en/order_conf_admin.html | 2 +- mails/en/order_conf_admin.txt | 2 +- mails/en/overbooking.html | 2 +- mails/en/overbooking.txt | 2 +- mails/en/overbooking_admin.html | 2 +- mails/en/overbooking_admin.txt | 2 +- .../en/booking_extra_services_text.tpl} | 46 +- modules/blockcart/ajax-cart.js | 43 +- modules/blockcart/blockcart.php | 12 +- modules/blockcart/cartrow.tpl | 2 +- .../templates/hook/dashboard_zone_two.tpl | 4 +- .../classes/HotelBookingDemands.php | 302 --------- .../classes/HotelBookingDetail.php | 55 -- .../classes/HotelCartBookingData.php | 221 +------ .../classes/HotelOrderRefundRules.php | 15 +- .../classes/HotelReservationSystemDb.php | 100 +-- .../classes/HotelRoomTypeDemand.php | 387 ------------ .../classes/HotelRoomTypeDemandPrice.php | 168 ----- .../classes/HotelRoomTypeGlobalDemand.php | 183 ------ ...HotelRoomTypeGlobalDemandAdvanceOption.php | 126 ---- .../classes/ServiceProductOrderDetail.php | 1 - .../AdminHotelRoomsBookingController.php | 1 - .../admin/AdminRoomTypeGlobalDemand.php | 345 ---------- modules/hotelreservationsystem/define.php | 5 - .../hotelreservationsystem.php | 81 --- .../helpers/view/_partials/booking-cart.tpl | 2 +- .../_partials/index.php | 32 - .../_partials/price_calc_method_badge.tpl | 27 - .../helpers/form/form.tpl | 287 --------- .../helpers/form/index.php | 32 - .../room_type_global_demand/helpers/index.php | 32 - .../admin/room_type_global_demand/index.php | 32 - modules/qlocleaner/qlocleaner.php | 14 - .../classes/WkPaypalCommerceHelper.php | 24 - .../qlostatsserviceproducts.php | 119 ---- .../templates/hook/services_content_block.tpl | 11 +- ...tpl => invoice.additinal-services-tab.tpl} | 49 +- pdf/invoice.tax-tab.tpl | 2 - pdf/invoice.tpl | 4 +- .../_partials/booking-form.tpl | 35 +- .../_partials/cart_booking_demands.tpl | 191 ------ .../_partials/cart_booking_services.tpl | 105 ++++ .../_partials/order-extra-services.tpl | 51 +- .../_partials/order-room-detail.tpl | 16 +- .../cart-total-block.tpl | 6 +- themes/hotel-reservation-theme/css/global.css | 12 +- .../css/order-confirmation.css | 14 +- .../css/order-detail.css | 14 +- .../hotel-reservation-theme/css/order-opc.css | 8 +- .../hotel-reservation-theme/css/product.css | 41 +- .../guest-tracking.tpl | 2 - .../js/modules/blockcart/ajax-cart.js | 46 +- .../js/order-confirmation.js | 8 +- .../js/order-detail.js | 6 +- .../hotel-reservation-theme/js/order-opc.js | 89 +-- themes/hotel-reservation-theme/js/product.js | 27 +- .../modules/blockcart/cartrow.tpl | 2 +- .../order-confirmation.tpl | 33 +- .../hotel-reservation-theme/order-detail.tpl | 24 +- themes/hotel-reservation-theme/order-opc.tpl | 3 +- themes/hotel-reservation-theme/product.tpl | 34 - .../shopping-cart-detail.tpl | 12 +- .../hotel-reservation-theme/shopping-cart.tpl | 2 +- 108 files changed, 519 insertions(+), 6416 deletions(-) delete mode 100644 admin/themes/default/template/controllers/orders/_cart_booking_demands.tpl create mode 100644 admin/themes/default/template/controllers/orders/_cart_booking_services.tpl delete mode 100644 admin/themes/default/template/controllers/orders/modals/_extra_services_facilities_tab_content.tpl delete mode 100644 admin/themes/default/template/controllers/products/additionalfacilities.tpl delete mode 100644 mails/en/booking_extra_demands.tpl delete mode 100644 mails/en/booking_extra_demands.txt create mode 100644 mails/en/booking_extra_services.tpl rename mails/en/{booking_extra_demands_text.tpl => ‎mails/en/booking_extra_services_text.tpl} (53%) delete mode 100644 modules/hotelreservationsystem/classes/HotelBookingDemands.php delete mode 100644 modules/hotelreservationsystem/classes/HotelRoomTypeDemand.php delete mode 100644 modules/hotelreservationsystem/classes/HotelRoomTypeDemandPrice.php delete mode 100644 modules/hotelreservationsystem/classes/HotelRoomTypeGlobalDemand.php delete mode 100644 modules/hotelreservationsystem/classes/HotelRoomTypeGlobalDemandAdvanceOption.php delete mode 100644 modules/hotelreservationsystem/controllers/admin/AdminRoomTypeGlobalDemand.php delete mode 100644 modules/hotelreservationsystem/views/templates/admin/room_type_global_demand/_partials/index.php delete mode 100644 modules/hotelreservationsystem/views/templates/admin/room_type_global_demand/_partials/price_calc_method_badge.tpl delete mode 100644 modules/hotelreservationsystem/views/templates/admin/room_type_global_demand/helpers/form/form.tpl delete mode 100644 modules/hotelreservationsystem/views/templates/admin/room_type_global_demand/helpers/form/index.php delete mode 100644 modules/hotelreservationsystem/views/templates/admin/room_type_global_demand/helpers/index.php delete mode 100644 modules/hotelreservationsystem/views/templates/admin/room_type_global_demand/index.php rename pdf/{invoice.extra-demands-tab.tpl => invoice.additinal-services-tab.tpl} (62%) delete mode 100644 themes/hotel-reservation-theme/_partials/cart_booking_demands.tpl create mode 100644 themes/hotel-reservation-theme/_partials/cart_booking_services.tpl diff --git a/admin/filemanager/js/jquery.contextMenu.js b/admin/filemanager/js/jquery.contextMenu.js index 103a58582..136efe9b7 100644 --- a/admin/filemanager/js/jquery.contextMenu.js +++ b/admin/filemanager/js/jquery.contextMenu.js @@ -125,7 +125,7 @@ var // currently active contextMenu trigger offset = {top: y, left: x}; } - // correct offset if viewport demands it + // correct offset if viewport it var bottom = $win.scrollTop() + $win.height(), right = $win.scrollLeft() + $win.width(), height = opt.$menu.height(), diff --git a/admin/themes/default/template/controllers/carts/helpers/view/view.tpl b/admin/themes/default/template/controllers/carts/helpers/view/view.tpl index b26103a19..c4cacfa00 100644 --- a/admin/themes/default/template/controllers/carts/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/carts/helpers/view/view.tpl @@ -107,92 +107,42 @@ {displayWtPriceWithCurrency price=$room['feature_price_tax_excl'] currency=$currency} - {if (isset($room['selected_demands']) && $room['selected_demands']) || (isset($room['selected_services']) && $room['selected_services'])} - - {displayWtPriceWithCurrency price=($room['demand_price'] + $room['additional_service_price'] + $room['additional_services_auto_add_price'])|escape:'html':'UTF-8' currency=$currency} + {if isset($room['selected_services']) && $room['selected_services']} + + {displayWtPriceWithCurrency price=($room['additional_service_price'] + $room['additional_services_auto_add_price'])|escape:'html':'UTF-8' currency=$currency} {else} {displayWtPriceWithCurrency price=0 currency=$currency} {/if} - {if (isset($room['selected_demands']) && $room['selected_demands']) || (isset($room['selected_services']) && $room['selected_services'])} - {displayWtPriceWithCurrency price=($room['amt_with_qty'] + $room['additional_services_auto_add_price'] + $room['demand_price'] + $room['additional_service_price'])|escape:'html':'UTF-8' currency=$currency} + {if isset($room['selected_services']) && $room['selected_services']} + {displayWtPriceWithCurrency price=($room['amt_with_qty'] + $room['additional_services_auto_add_price'] + $room['additional_service_price'])|escape:'html':'UTF-8' currency=$currency} {else} {displayWtPriceWithCurrency price=$room['amt_with_qty']|escape:'html':'UTF-8' currency=$currency} {/if} -