From 83a6d3d5fd5e91667adce238279cdc9d7fbe7189 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Mon, 31 Jul 2023 13:35:19 +0530 Subject: [PATCH 01/15] Changes on Preferences > General page --- controllers/admin/AdminPreferencesController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/controllers/admin/AdminPreferencesController.php b/controllers/admin/AdminPreferencesController.php index 248762512..0881b5616 100644 --- a/controllers/admin/AdminPreferencesController.php +++ b/controllers/admin/AdminPreferencesController.php @@ -95,8 +95,8 @@ class AdminPreferencesControllerCore extends AdminController $fields = array( 'PS_SSL_ENABLED' => array( 'title' => $this->l('Enable SSL'), - 'desc' => $this->l('If you own an SSL certificate for your shop\'s domain name, you can activate SSL encryption (https://) for customer account identification and order processing.'), - 'hint' => $this->l('If you want to enable SSL on all the pages of your shop, activate the "Enable on all the pages" option below.'), + 'desc' => $this->l('If you own an SSL certificate for your website\'s domain name, you can activate SSL encryption (https://) for customer account identification and order processing.'), + 'hint' => $this->l('If you want to enable SSL on all the pages of your website, activate the "Enable on all the pages" option below.'), 'validation' => 'isBool', 'cast' => 'intval', 'type' => 'bool', @@ -106,7 +106,7 @@ class AdminPreferencesControllerCore extends AdminController $fields['PS_SSL_ENABLED_EVERYWHERE'] = array( 'title' => $this->l('Enable SSL on all pages'), - 'desc' => $this->l('When enabled, all the pages of your shop will be SSL-secured.'), + 'desc' => $this->l('When enabled, all the pages of your website will be SSL-secured.'), 'validation' => 'isBool', 'cast' => 'intval', 'type' => 'bool', @@ -221,7 +221,7 @@ class AdminPreferencesControllerCore extends AdminController if (!Tools::usingSecureMode() && !Configuration::get('PS_SSL_ENABLED')) { $fields['PS_SSL_ENABLED']['type'] = 'disabled'; $fields['PS_SSL_ENABLED']['disabled'] = ''. - $this->l('Please click here to check if your shop supports HTTPS.').''; + $this->l('Please click here to check if your website supports HTTPS.').''; } $this->fields_options = array( From 9e57bf334e4438bcf253e7469d1780054246d2d8 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Wed, 2 Aug 2023 11:03:43 +0530 Subject: [PATCH 02/15] Text change on Preferences > Orders page --- controllers/admin/AdminOrderPreferencesController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminOrderPreferencesController.php b/controllers/admin/AdminOrderPreferencesController.php index 21b31f6a7..122021c2f 100644 --- a/controllers/admin/AdminOrderPreferencesController.php +++ b/controllers/admin/AdminOrderPreferencesController.php @@ -154,8 +154,8 @@ class AdminOrderPreferencesControllerCore extends AdminController ), 'PS_ROOM_PRICE_AUTO_ADD_BREAKDOWN' => array( 'title' => $this->l('Show room price breakdown'), - 'hint' => $this->l('Show a summary for prices of the auto added service add with room on shopping cart list.'), - 'desc' => $this->l('This breakdown is always visible on room that have cart rule applied for that specific room.'), + 'hint' => $this->l('Show price breakdown for rooms with auto added services in booking cart rooms list.'), + 'desc' => $this->l('This room price breakdown will always be displayed for rooms having cart rules applied to them.'), 'cast' => 'intval', 'type' => 'bool' ), From 26fc8f6630c423c5df36a3d474d67108711acbb1 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Wed, 2 Aug 2023 17:37:35 +0530 Subject: [PATCH 03/15] Text change on Preferences > Room Types page --- controllers/admin/AdminPPreferencesController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/admin/AdminPPreferencesController.php b/controllers/admin/AdminPPreferencesController.php index 1ea8b3f50..9218a7328 100644 --- a/controllers/admin/AdminPPreferencesController.php +++ b/controllers/admin/AdminPPreferencesController.php @@ -300,7 +300,7 @@ class AdminPPreferencesControllerCore extends AdminController ), 'PS_SERVICE_PRODUCT_CATEGORY_FILTER' => array( - 'title' => $this->l('Show category filter for service products'), + 'title' => $this->l('Show service products category-wise'), 'validation' => 'isBool', 'cast' => 'intval', 'required' => false, From 0f8c94f55890e23a15489dca0da343db1e5d0783 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Thu, 3 Aug 2023 12:15:03 +0530 Subject: [PATCH 04/15] Text change on HRS > Settings page --- .../hotelreservationsystem/classes/HotelReservationSystemDb.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php b/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php index 5e8a45c1e..484311892 100644 --- a/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php +++ b/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php @@ -482,7 +482,7 @@ class HotelReservationSystemDb ) ENGINE="._MYSQL_ENGINE_." DEFAULT CHARSET=utf8;", "INSERT INTO `"._DB_PREFIX_."htl_settings_link_lang` (`id_settings_link`, `id_lang`, `name`, `hint`) - SELECT 1, `id_lang`, 'General Settings', 'Configure Your hotel general gettings using this option.' + SELECT 1, `id_lang`, 'General Settings', 'Configure Your hotel general settings using this option.' FROM `"._DB_PREFIX_."lang` ORDER BY `id_lang`;", From 026ea4c2ef2163ea796ba489590eabe1727efd67 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Thu, 3 Aug 2023 20:49:31 +0530 Subject: [PATCH 05/15] Text change on Customer Service page --- .../controllers/customer_threads/helpers/view/message.tpl | 2 +- controllers/admin/AdminCustomerThreadsController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/themes/default/template/controllers/customer_threads/helpers/view/message.tpl b/admin/themes/default/template/controllers/customer_threads/helpers/view/message.tpl index cb3158f93..ad7010404 100644 --- a/admin/themes/default/template/controllers/customer_threads/helpers/view/message.tpl +++ b/admin/themes/default/template/controllers/customer_threads/helpers/view/message.tpl @@ -54,7 +54,7 @@ {/if}   - {dateFormat date=$message.date_add full=0} - {$message.date_add|substr:11:5} {if isset($message.file_name)}   {l s="Attachment"}{/if} - {if isset($message.product_name)}   {l s="Product:"} {$message.product_name|escape:'html':'UTF-8'} {/if} + {if isset($message.product_name)}   {l s="Room type/Service:"} {$message.product_name|escape:'html':'UTF-8'} {/if}

{$message.message|escape:'html':'UTF-8'|nl2br}

diff --git a/controllers/admin/AdminCustomerThreadsController.php b/controllers/admin/AdminCustomerThreadsController.php index e9534093d..9334ee295 100644 --- a/controllers/admin/AdminCustomerThreadsController.php +++ b/controllers/admin/AdminCustomerThreadsController.php @@ -712,7 +712,7 @@ class AdminCustomerThreadsControllerCore extends AdminController $content .= $this->l('Message to: ').' '.(!$message['id_employee'] ? $message['subject'] : $message['customer_name']).'
'; } if (Validate::isLoadedObject($product)) { - $content .= '
'.$this->l('Product: ').''.$product->name.'

'; + $content .= '
'.$this->l('Room type/Service: ').''.$product->name.'

'; } $content .= Tools::safeOutput($message['message']); From d115f3a2d3a7d855cbfa5c5fa7ff033b95c934c2 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Fri, 4 Aug 2023 12:10:52 +0530 Subject: [PATCH 06/15] Text change on Manage Room Types page --- .../template/controllers/products/additionalfacilities.tpl | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/admin/themes/default/template/controllers/products/additionalfacilities.tpl b/admin/themes/default/template/controllers/products/additionalfacilities.tpl index 1296aa87e..c3a58eb34 100644 --- a/admin/themes/default/template/controllers/products/additionalfacilities.tpl +++ b/admin/themes/default/template/controllers/products/additionalfacilities.tpl @@ -24,7 +24,7 @@ {l s='Room Type Additional Facilities'}
- {l s='To create new Additional facilities'} {l s='click here.'} + {l s='To create new additional facilities please visit'} {l s='Additional facilities'} {l s='page.'}
{if isset($allDemands) && $allDemands} @@ -148,10 +148,6 @@ {l s='Save and stay'} - {else} -
- {l s='No additional facilities created yet. To create please visit'} {l s='Additional facilities'} {l s='page'}. -
{/if} {/if} \ No newline at end of file From 22cbc6026fa6cd32f64b62a6ffb37478168c4ef4 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Mon, 7 Aug 2023 17:31:58 +0530 Subject: [PATCH 07/15] Text change on Modules Catalog page --- .../default/template/controllers/modules_catalog/page.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/themes/default/template/controllers/modules_catalog/page.tpl b/admin/themes/default/template/controllers/modules_catalog/page.tpl index fcdd22e60..7ed4b5485 100644 --- a/admin/themes/default/template/controllers/modules_catalog/page.tpl +++ b/admin/themes/default/template/controllers/modules_catalog/page.tpl @@ -109,7 +109,7 @@
- {l s='Explore all themes of Qloapps'}  + {l s='Explore all themes of QloApps'}  {l s='QloApps Themes'}
{/if} From c33a8096b1571067d14d601b5b59f5b8d91921cf Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Fri, 11 Aug 2023 11:50:43 +0530 Subject: [PATCH 08/15] Remove deprecated P3P header and update Powered by Header --- classes/controller/FrontController.php | 4 +--- controllers/admin/AdminMetaController.php | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php index 2f19b9f61..7f31080de 100644 --- a/classes/controller/FrontController.php +++ b/classes/controller/FrontController.php @@ -1104,9 +1104,7 @@ class FrontControllerCore extends Controller */ public function initHeader() { - /** @see P3P Policies (http://www.w3.org/TR/2002/REC-P3P-20020416/#compact_policies) */ - header('P3P: CP="IDC DSP COR CURa ADMa OUR IND PHY ONL COM STA"'); - header('Powered-By: PrestaShop'); + header('Powered-By: QloApps'); // Hooks are voluntary out the initialize array (need those variables already assigned) $this->context->smarty->assign(array( diff --git a/controllers/admin/AdminMetaController.php b/controllers/admin/AdminMetaController.php index 6ca06e6d8..570811700 100644 --- a/controllers/admin/AdminMetaController.php +++ b/controllers/admin/AdminMetaController.php @@ -468,7 +468,7 @@ class AdminMetaControllerCore extends AdminController )); // PS Comments - fwrite($write_fd, "# robots.txt automaticaly generated by qloapps e-commerce open-source solution\n"); + fwrite($write_fd, "# robots.txt automaticaly generated by QloApps open-source hotel reservation system and a booking engine solution.\n"); fwrite($write_fd, "# https://www.qloapps.com - https://forums.qloapps.com/\n"); fwrite($write_fd, "# This file is to prevent the crawling and indexing of certain parts\n"); fwrite($write_fd, "# of your site by web crawlers and spiders run by sites like Yahoo!\n"); From 04516b1854d730d497d99b25ad21f26a1ffe8d68 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Fri, 11 Aug 2023 12:13:48 +0530 Subject: [PATCH 09/15] Change contact us link --- admin/themes/default/template/helpers/modules_list/list.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/themes/default/template/helpers/modules_list/list.tpl b/admin/themes/default/template/helpers/modules_list/list.tpl index de8129f0a..29f885864 100644 --- a/admin/themes/default/template/helpers/modules_list/list.tpl +++ b/admin/themes/default/template/helpers/modules_list/list.tpl @@ -54,7 +54,7 @@
{if $controller_name == 'AdminPayment'} {l s='It seems there are no recommended payment solutions for your country.'}
- {l s='Do you think there should be one? Let us know!'} + {l s='Do you think there should be one? Let us know!'} {else}{l s='No modules available in this section.'}{/if}
From 43442bbf0164ffd687a66e5ab4aa4b84d59cc9a4 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Wed, 23 Aug 2023 16:39:45 +0530 Subject: [PATCH 10/15] Text change from Max Order Date to Max Check-out Date --- controllers/admin/AdminOrderPreferencesController.php | 10 +++++----- .../controllers/admin/AdminAddHotelController.php | 6 +++--- .../templates/admin/add_hotel/helpers/form/form.tpl | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/controllers/admin/AdminOrderPreferencesController.php b/controllers/admin/AdminOrderPreferencesController.php index 122021c2f..3feebd3b8 100644 --- a/controllers/admin/AdminOrderPreferencesController.php +++ b/controllers/admin/AdminOrderPreferencesController.php @@ -64,8 +64,8 @@ class AdminOrderPreferencesControllerCore extends AdminController 'icon' => 'icon-cogs', 'fields' => array( 'MAX_GLOBAL_BOOKING_DATE' => array( - 'title' => $this->l('Maximum Global Date to book a room'), - 'hint' => $this->l('Maximum date by which rooms of your hotels can be booked.'), + 'title' => $this->l('Maximum Global Check-out Date to book a room'), + 'hint' => $this->l('Maximum date of check-out by which rooms of your hotels can be booked.'), 'type' => 'text', 'id' => 'max_global_book_date', 'class' => 'fixed-width-xxl readonly', @@ -224,11 +224,11 @@ class AdminOrderPreferencesControllerCore extends AdminController $maxGlobalBookingDateFormatted = date('Y-m-d', strtotime($maxGlobalBookingDate)); if ($maxGlobalBookingDate == '') { - $this->errors[] = Tools::displayError('Field \'Maximum Global Date to book a room\' can not be empty.'); + $this->errors[] = Tools::displayError('Field \'Maximum Global Check-out Date to book a room\' can not be empty.'); } elseif (!Validate::isDate($maxGlobalBookingDateFormatted)) { - $this->errors[] = Tools::displayError('Field \'Maximum Global Date to book a room\' is invalid.'); + $this->errors[] = Tools::displayError('Field \'Maximum Global Check-out Date to book a room\' is invalid.'); } elseif (strtotime($maxGlobalBookingDateFormatted) < strtotime(date('Y-m-d'))) { - $this->errors[] = Tools::displayError('Field \'Maximum Global Date to book a room\' can not be a past date. Please use a future date.'); + $this->errors[] = Tools::displayError('Field \'Maximum Global Check-out Date to book a room\' can not be a past date. Please use a future date.'); } if ($globalPreparationTime === '') { diff --git a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php index 595400dce..51128046a 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php @@ -311,11 +311,11 @@ class AdminAddHotelController extends ModuleAdminController if (!$enableUseGlobalMaxOrderDate) { $maximumBookingDateFormatted = date('Y-m-d', strtotime($maximumBookingDate)); if ($maximumBookingDate == '') { - $this->errors[] = Tools::displayError('Maximum Global Date to book a room is a required field.'); + $this->errors[] = Tools::displayError('Maximum Check-out Date to book a room is a required field.'); } elseif (!Validate::isDate($maximumBookingDateFormatted)) { - $this->errors[] = Tools::displayError('Maximum Global Date to book a room is invalid.'); + $this->errors[] = Tools::displayError('Maximum Check-out Date to book a room is invalid.'); } elseif (strtotime($maximumBookingDateFormatted) < strtotime(date('Y-m-d'))) { - $this->errors[] = Tools::displayError('Maximum Global Date to book a room can not be a past date. Please use a future date.'); + $this->errors[] = Tools::displayError('Maximum Check-out Date to book a room can not be a past date. Please use a future date.'); } } diff --git a/modules/hotelreservationsystem/views/templates/admin/add_hotel/helpers/form/form.tpl b/modules/hotelreservationsystem/views/templates/admin/add_hotel/helpers/form/form.tpl index d9b047f82..33fd98ce6 100644 --- a/modules/hotelreservationsystem/views/templates/admin/add_hotel/helpers/form/form.tpl +++ b/modules/hotelreservationsystem/views/templates/admin/add_hotel/helpers/form/form.tpl @@ -330,7 +330,7 @@