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
diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php
index 1a5517fb4..010dcf4a8 100644
--- a/classes/PaymentModule.php
+++ b/classes/PaymentModule.php
@@ -964,7 +964,7 @@ abstract class PaymentModuleCore extends Module
return true;
} else {
- $error = Tools::displayError('Cart cannot be loaded or an order has already been placed using this cart');
+ $error = Tools::displayError('Cart cannot be loaded or a booking has already been placed using this cart');
PrestaShopLogger::addLog($error, 4, '0000001', 'Cart', intval($this->context->cart->id));
die($error);
}
diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php
index 16bd2fb7f..521b68c63 100644
--- a/classes/controller/FrontController.php
+++ b/classes/controller/FrontController.php
@@ -307,7 +307,7 @@ class FrontControllerCore extends Controller
}
if (Validate::isLoadedObject($cart) && $cart->OrderExists()) {
- PrestaShopLogger::addLog('Frontcontroller::init - Cart cannot be loaded or an order has already been placed using this cart', 1, null, 'Cart', (int)$this->context->cookie->id_cart, true);
+ PrestaShopLogger::addLog('Frontcontroller::init - Cart cannot be loaded or a booking has already been placed using this cart', 1, null, 'Cart', (int)$this->context->cookie->id_cart, true);
unset($this->context->cookie->id_cart, $cart, $this->context->cookie->checkedTOS);
$this->context->cookie->check_cgv = false;
}
diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php
index 79417ef0c..2d85e00c0 100644
--- a/controllers/front/ProductController.php
+++ b/controllers/front/ProductController.php
@@ -412,6 +412,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/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',
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.'}
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';
diff --git a/themes/hotel-reservation-theme/product.tpl b/themes/hotel-reservation-theme/product.tpl
index f9b61b47b..c10f43ae4 100644
--- a/themes/hotel-reservation-theme/product.tpl
+++ b/themes/hotel-reservation-theme/product.tpl
@@ -395,7 +395,7 @@