From d875a602f7baebde87e74c460caefef84ba18039 Mon Sep 17 00:00:00 2001 From: shreesh arora Date: Thu, 16 Dec 2021 17:04:19 +0530 Subject: [PATCH 1/5] updated text on address page --- themes/hotel-reservation-theme/addresses.tpl | 1 - themes/hotel-reservation-theme/lang/en.php | 1 - 2 files changed, 2 deletions(-) diff --git a/themes/hotel-reservation-theme/addresses.tpl b/themes/hotel-reservation-theme/addresses.tpl index 83b636dfb..1d572ccde 100644 --- a/themes/hotel-reservation-theme/addresses.tpl +++ b/themes/hotel-reservation-theme/addresses.tpl @@ -24,7 +24,6 @@ *} {capture name=path}{l s='My account'}{$navigationPipe}{l s='My addresses'}{/capture}

{l s='My addresses'}

-

{l s='Please configure your default billing and delivery addresses when placing an order. You may also add additional addresses, which can be useful for sending gifts or receiving an order at your office.'}

{if isset($multipleAddresses) && $multipleAddresses}

{l s='Your addresses are listed below.'}

diff --git a/themes/hotel-reservation-theme/lang/en.php b/themes/hotel-reservation-theme/lang/en.php index c79faed8e..78f3175d4 100644 --- a/themes/hotel-reservation-theme/lang/en.php +++ b/themes/hotel-reservation-theme/lang/en.php @@ -13,7 +13,6 @@ $_LANG['404_8cf04a9734132302f96da8e113e80ce5'] = 'Home'; $_LANG['404_7b19b37e7fc3dfe3c3e1ad5b84c7f565'] = 'Home page'; $_LANG['addresses_d95cf4ab2cbf1dfb63f066b50558b07d'] = 'My account'; $_LANG['addresses_e45be0a0d4a0b62b15694c1a631e6e62'] = 'My addresses'; -$_LANG['addresses_a6d373cdb986fc009a5a040a4c3d8c1d'] = 'Please configure your default billing and delivery addresses when placing an order. You may also add additional addresses, which can be useful for sending gifts or receiving an order at your office.'; $_LANG['addresses_aa5e970d64eb228f31669d3411171f92'] = 'Your addresses are listed below.'; $_LANG['addresses_e380ae58f85252c076e131862857de35'] = 'Be sure to update your personal information if it has changed.'; $_LANG['addresses_06933067aafd48425d67bcb01bba5cb6'] = 'Update'; From e2c388b946806aafcc64b0a19c610fa264bf852e Mon Sep 17 00:00:00 2001 From: shreesh arora Date: Mon, 3 Jan 2022 15:20:25 +0530 Subject: [PATCH 2/5] updated text in general settings controller --- .../controllers/admin/AdminHotelGeneralSettingsController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php index 0a172b6ed..3da417831 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php @@ -87,8 +87,8 @@ class AdminHotelGeneralSettingsController extends ModuleAdminController 'title' => $this->l('Configuration'), 'fields' => array( 'WK_ROOM_LEFT_WARNING_NUMBER' => array( - 'title' => $this->l('Display remaining Number ofrooms when therooms are lower than or equal to'), - 'hint' => $this->l('Mention the minimum quantity ofrooms after which alert message of remainingrooms will get displayed to users.'), + 'title' => $this->l('Display remaining Number of rooms when the rooms are lower than or equal to'), + 'hint' => $this->l('Mention the minimum quantity of rooms after which alert message of remaining rooms will get displayed to users.'), 'validation' => 'isInt', 'cast' => 'intval', 'type' => 'text', From 2428e1943e3fb0403b5bc1152bf84ded42c98387 Mon Sep 17 00:00:00 2001 From: shreesh arora Date: Mon, 3 Jan 2022 18:47:09 +0530 Subject: [PATCH 3/5] updated readme --- README.md | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index da0977253..9575aaf7c 100644 --- a/README.md +++ b/README.md @@ -16,20 +16,27 @@

## Topics -1. [Introduction](#introduction) -2. [Requirements](#requirements) -3. [Installation & Configuration](#installation-and-configuration) -4. [License](#license) -5. [Security Vulnerabilities](#security-vulnerabilities) -6. [Documentation & Demo](#documentation--demo) -7. [Contribute](#contribute) -8. [Credits](#credits) +- [Introduction](#introduction) +- [Requirements](#requirements) + - [Hosted Server Configurations](#hosted-server-configurations) + - [Local Server Configurations](#local-server-configurations) +- [Installation and Configuration](#installation-and-configuration) +- [License](#license) +- [Security Vulnerabilities](#security-vulnerabilities) +- [Documentation & Demo](#documentation--demo) + - [QloApps Documentation https://qloapps.com/qlo-reservation-system](#qloapps-documentation-httpsqloappscomqlo-reservation-system) + - [QloApps Demo](#qloapps-demo) +- [Contribute](#contribute) +- [Credits](#credits) ### Introduction -QloApps also known as Qlo is an **Open-source and Free hotel reservation system** and booking engine.
-With the help of QloApps, you can launch your hotel booking website without any cost and take & manage online bookings . You can manage your online & On-Desk booking easily with QloApps. +QloApps is one kind of a true open-source hotel reservation system and a booking engine. The system is dedicated to channeling the power of the open-source community to serve the hospitality industry. + +From small independent hotels to big hotel chains, QloApps is a one-stop solution for all your hotel business needs. + +You will be able to launch your hotel website, showcase your property and take and manage bookings. ### Requirements From 3a1a6724aa8e779881b74df3e2d34561ea533ed6 Mon Sep 17 00:00:00 2001 From: shreesh arora Date: Thu, 13 Jan 2022 17:12:31 +0530 Subject: [PATCH 4/5] added per night text for facilities calculated for each night --- controllers/front/ProductController.php | 1 + modules/hotelreservationsystem/classes/HotelRoomTypeDemand.php | 1 + themes/hotel-reservation-theme/product.tpl | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php index cafe51955..84d78871d 100644 --- a/controllers/front/ProductController.php +++ b/controllers/front/ProductController.php @@ -409,6 +409,7 @@ class ProductControllerCore extends FrontController $this->context->smarty->assign( array( 'room_type_demands' => $roomTypeDemands, + 'WK_PRICE_CALC_METHOD_EACH_DAY' => HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY, 'product_id_hotel' => $hotel_id, 'stock_management' => Configuration::get('PS_STOCK_MANAGEMENT'), 'customizationFields' => $customization_fields, diff --git a/modules/hotelreservationsystem/classes/HotelRoomTypeDemand.php b/modules/hotelreservationsystem/classes/HotelRoomTypeDemand.php index f14af1ade..4d7cbef3e 100644 --- a/modules/hotelreservationsystem/classes/HotelRoomTypeDemand.php +++ b/modules/hotelreservationsystem/classes/HotelRoomTypeDemand.php @@ -80,6 +80,7 @@ class HotelRoomTypeDemand extends ObjectModel foreach ($roomTypeDemands as &$demand) { $idGlobalDemand = $demand['id_global_demand']; $roomTypeDemandInfo[$idGlobalDemand]['name'] = $demand['name']; + $roomTypeDemandInfo[$idGlobalDemand]['price_calc_method'] = $demand['price_calc_method']; $roomTypeDemandInfo[$idGlobalDemand]['price'] = HotelRoomTypeDemand::getPriceStatic( $idProduct, diff --git a/themes/hotel-reservation-theme/product.tpl b/themes/hotel-reservation-theme/product.tpl index 60feb80de..89be6f30d 100644 --- a/themes/hotel-reservation-theme/product.tpl +++ b/themes/hotel-reservation-theme/product.tpl @@ -381,7 +381,7 @@
{/if}
-

{$demand['name']|escape:'html':'UTF-8'} {if $product->show_price && !isset($restricted_country_mode) && !$PS_CATALOG_MODE}{convertPrice price = {$demand['price']}}{/if}

+

{$demand['name']|escape:'html':'UTF-8'} {if $product->show_price && !isset($restricted_country_mode) && !$PS_CATALOG_MODE}{convertPrice price = $demand['price']}{if $demand['price_calc_method'] == $WK_PRICE_CALC_METHOD_EACH_DAY}{l s='/night'}{/if}{/if}

{if isset($demand['adv_option']) && $demand['adv_option']}