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 ad7010404..d006ce679 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="Room type/Service:"} {$message.product_name|escape:'html':'UTF-8'} {/if} + {if isset($message.product_name)}   {l s="Room type:"} {$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 9334ee295..35d34bae6 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('Room type/Service: ').''.$product->name.'

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

'; } $content .= Tools::safeOutput($message['message']); diff --git a/controllers/admin/AdminMetaController.php b/controllers/admin/AdminMetaController.php index 570811700..6d7d01cc6 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 open-source hotel reservation system and a booking engine solution.\n"); + fwrite($write_fd, "# robots.txt automaticaly generated by QloApps - open-source hotel management 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"); diff --git a/controllers/admin/AdminOrderPreferencesController.php b/controllers/admin/AdminOrderPreferencesController.php index 3feebd3b8..a68aaa501 100644 --- a/controllers/admin/AdminOrderPreferencesController.php +++ b/controllers/admin/AdminOrderPreferencesController.php @@ -65,7 +65,7 @@ class AdminOrderPreferencesControllerCore extends AdminController 'fields' => array( 'MAX_GLOBAL_BOOKING_DATE' => array( '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.'), + 'hint' => $this->l('Maximum date of check-out for which rooms of your hotels can be booked.'), 'type' => 'text', 'id' => 'max_global_book_date', 'class' => 'fixed-width-xxl readonly', @@ -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 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.'), + 'hint' => $this->l('Show price breakdown for rooms with auto added services on checkout page.'), + 'desc' => $this->l('This room price breakdown will be shown if cart rule for specific room type is applied on that room.'), 'cast' => 'intval', 'type' => 'bool' ), diff --git a/controllers/admin/AdminPPreferencesController.php b/controllers/admin/AdminPPreferencesController.php index 31e265bf1..89087e0ae 100644 --- a/controllers/admin/AdminPPreferencesController.php +++ b/controllers/admin/AdminPPreferencesController.php @@ -300,7 +300,8 @@ class AdminPPreferencesControllerCore extends AdminController ), 'PS_SERVICE_PRODUCT_CATEGORY_FILTER' => array( - 'title' => $this->l('Show service products category-wise'), + 'title' => $this->l('Display services by category'), + 'hint' => $this->l('If enabled, services will be grouped and displayed as per their default category. Else all services will be displayed together.'), 'validation' => 'isBool', 'cast' => 'intval', 'required' => false,