+
+ Hi {firstname} {lastname},
+ Thank you for booking with {shop_name}!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Order {order_name} - Payment processed
+
+ Your payment for order with the reference {order_name} was successfully processed.
+
+ Total Booking Amount: {total_paid}
+ Partial Payment Amount: {advance_paid_amount}
+ Total Paid Amount: {total_paid_real}
+
+
+
+
+
+
+
+
+
+
+{extra_mail_content_html}
+
+
+
+
+ You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website.
+
+
+
+
+
+
+
+ If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
+
+
+
+
diff --git a/mails/en/partial_payment_accepted.txt b/mails/en/partial_payment_accepted.txt
new file mode 100644
index 000000000..799594197
--- /dev/null
+++ b/mails/en/partial_payment_accepted.txt
@@ -0,0 +1,26 @@
+
+[/{shop_url}]
+
+Hi {firstname} {lastname},
+
+Thank you for booking with {shop_name}!
+
+Order {order_name} - Payment processed
+
+Your payment for order with the reference {order_name} was successfully processed.
+
+Total Booking Amount: {total_paid}
+Partial Payment Amount: {advance_paid_amount}
+Total Paid Amount: {total_paid_real}
+
+You can review your order and download your invoice from the
+"Order history" [/{history_url}] section of your customer account by
+clicking "My account" [/{my_account_url}] on our website.
+
+If you have a guest account, you can follow your order via the
+"Guest Tracking" [/{guest_tracking_url}?id_order={order_name}] section
+on our website.
+
+{shop_name} [/{shop_url}] powered by Webkul(tm)
+[https://webkul.com]
+
diff --git a/modules/hotelreservationsystem/classes/HotelHelper.php b/modules/hotelreservationsystem/classes/HotelHelper.php
index 8aee39b6f..0b615f59a 100644
--- a/modules/hotelreservationsystem/classes/HotelHelper.php
+++ b/modules/hotelreservationsystem/classes/HotelHelper.php
@@ -199,6 +199,8 @@ class HotelHelper
Configuration::updateValue('WK_HOTEL_LOCATION_ENABLE', 1);
Configuration::updateValue('WK_HOTEL_NAME_ENABLE', 1);
+ Configuration::updateValue('WK_HOTEL_NAME_SEARCH_THRESHOLD', 5);
+ Configuration::updateValue('WK_SEARCH_AUTO_FOCUS_NEXT_FIELD', 1);
Configuration::updateValue('WK_ROOM_LEFT_WARNING_NUMBER', 10);
Configuration::updateValue('WK_HTL_ESTABLISHMENT_YEAR', 2010);
diff --git a/modules/hotelreservationsystem/classes/RoomTypeServiceProductPrice.php b/modules/hotelreservationsystem/classes/RoomTypeServiceProductPrice.php
index bfbf62f2b..7300566ee 100644
--- a/modules/hotelreservationsystem/classes/RoomTypeServiceProductPrice.php
+++ b/modules/hotelreservationsystem/classes/RoomTypeServiceProductPrice.php
@@ -72,8 +72,10 @@ class RoomTypeServiceProductPrice extends ObjectModel
if ($result = Db::getInstance()->getRow('
SELECT spp.`price`, spp.`id_tax_rules_group`, p.`auto_add_to_cart`, p.`price_addition_type`
FROM `'._DB_PREFIX_.'product` p
- LEFT JOIN `'._DB_PREFIX_.'htl_room_type_service_product` sp ON (sp.`id_product` = p.`id_product`)
- LEFT JOIN `'._DB_PREFIX_.'htl_room_type_service_product_price` spp ON (spp.`id_product` = p.`id_product`)
+ LEFT JOIN `'._DB_PREFIX_.'htl_room_type_service_product` sp
+ ON (sp.`id_product` = p.`id_product`)
+ LEFT JOIN `'._DB_PREFIX_.'htl_room_type_service_product_price` spp
+ ON (spp.`id_product` = sp.`id_product` AND spp.`id_element` = sp.`id_element` AND spp.`element_type` = sp.`element_type`)
WHERE p.`id_product`='.(int)$idProduct.
' AND sp.`id_element`='.(int)$idElement.
' AND sp.`element_type`='.(int)$elementType)
diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php
index 30b34ea38..2d8d7ff6d 100644
--- a/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php
@@ -81,6 +81,32 @@ class AdminHotelGeneralSettingsController extends ModuleAdminController
'hint' => $this->l('This option can be disabled if only one active hotel in the website.
In case of more than one active hotel, Hotel Name will always be shown in the search panel.'),
),
+ 'WK_SEARCH_AUTO_FOCUS_NEXT_FIELD' => array(
+ 'title' => $this->l('Focus next field automatically'),
+ 'cast' => 'intval',
+ 'type' => 'bool',
+ 'default' => '0',
+ 'values' => array(
+ array(
+ 'id' => 'active_on',
+ 'value' => 1,
+ ),
+ array(
+ 'id' => 'active_off',
+ 'value' => 0,
+ ),
+ ),
+ 'hint' => $this->l('Enable if you want the next booking search field to be focused automatically after setting value for a field.'),
+ ),
+ 'WK_HOTEL_NAME_SEARCH_THRESHOLD' => array(
+ 'title' => $this->l('Hotel name search threshold'),
+ 'type' => 'text',
+ 'required' => true,
+ 'validation' => 'isUnsignedInt',
+ 'hint' => $this->l('Enter the number of hotels after which user can search hotel by name.'),
+ 'desc' => $this->l('Set to 0 to always show the search box.'),
+ 'class' => 'fixed-width-xxl',
+ ),
),
'submit' => array(
'title' => $this->l('Save'),
@@ -312,6 +338,8 @@ class AdminHotelGeneralSettingsController extends ModuleAdminController
public function postProcess()
{
if (Tools::isSubmit('submitOptions'.$this->table)) {
+ $hotelNameSearchThreshold = Tools::getValue('WK_HOTEL_NAME_SEARCH_THRESHOLD');
+
// check if field is atleast in default language. Not available in default prestashop
$defaultLangId = Configuration::get('PS_LANG_DEFAULT');
$objDefaultLanguage = Language::getLanguage((int) $defaultLangId);
@@ -324,6 +352,12 @@ class AdminHotelGeneralSettingsController extends ModuleAdminController
// End occupancy fields validation
+ if (!$hotelNameSearchThreshold && $hotelNameSearchThreshold !== '0') {
+ $this->errors[] = $this->l('Hotel name search threshold field is required.');
+ } elseif (!Validate::isUnsignedInt($hotelNameSearchThreshold)) {
+ $this->errors[] = $this->l('Hotel name search threshold field is invalid.');
+ }
+
if (!trim(Tools::getValue('WK_HTL_CHAIN_NAME_'.$defaultLangId))) {
$this->errors[] = $this->l('Hotel chain name is required at least in ').$objDefaultLanguage['name'];
} else {
diff --git a/modules/hotelreservationsystem/hotelreservationsystem.php b/modules/hotelreservationsystem/hotelreservationsystem.php
index bf6473245..76a6c3bae 100644
--- a/modules/hotelreservationsystem/hotelreservationsystem.php
+++ b/modules/hotelreservationsystem/hotelreservationsystem.php
@@ -509,6 +509,7 @@ class HotelReservationSystem extends Module
'htl_room_type_global_demand',
'htl_room_type_global_demand_advance_option',
'htl_order_refund_rules',
+ 'htl_settings_link',
);
//If Admin update new language when we do entry in module all lang tables.
HotelHelper::updateLangTables($newIdLang, $langTables);
diff --git a/modules/wkroomsearchblock/classes/WkRoomSearchHelper.php b/modules/wkroomsearchblock/classes/WkRoomSearchHelper.php
index dc4ac075c..effe0f15f 100644
--- a/modules/wkroomsearchblock/classes/WkRoomSearchHelper.php
+++ b/modules/wkroomsearchblock/classes/WkRoomSearchHelper.php
@@ -228,6 +228,7 @@ class WkRoomSearchHelper
$smartyVars['hotels_info'] = $hotelsInfo;
$smartyVars['show_hotel_name'] = Configuration::get('WK_HOTEL_NAME_ENABLE');
$smartyVars['max_child_age'] = Configuration::get('WK_GLOBAL_CHILD_MAX_AGE');
+ $smartyVars['hotel_name_search_threshold'] = (int) Configuration::get('WK_HOTEL_NAME_SEARCH_THRESHOLD');
$maxOrderDate = HotelOrderRestrictDate::getMaxOrderDate($idHotel);
$smartyVars['max_order_date'] = date('Y-m-d', strtotime($maxOrderDate));
diff --git a/modules/wkroomsearchblock/controllers/front/autocompletesearch.php b/modules/wkroomsearchblock/controllers/front/autocompletesearch.php
index 4a051c103..9dfa3bed5 100644
--- a/modules/wkroomsearchblock/controllers/front/autocompletesearch.php
+++ b/modules/wkroomsearchblock/controllers/front/autocompletesearch.php
@@ -22,44 +22,51 @@ class WkRoomSearchBlockAutoCompleteSearchModuleFrontController extends ModuleFro
{
public function initContent()
{
- $result = array();
$this->display_column_left = false;
$this->display_column_right = false;
+
+ $result = array('status' => false);
$search_data = Tools::getValue('to_search_data');
$location_category_id = Tools::getValue('location_category_id');
$obj_htl_info = new HotelBranchInformation();
if (isset($search_data) && $search_data) {
- $return_data = $obj_htl_info->getHotelCategoryTree($search_data);
- if ($return_data) {
- $html = '';
- foreach ($return_data as $value) {
- $html .= '