From 24f000469c14695074478c4a63d90104f2379a76 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Mon, 23 May 2022 09:00:56 +0530 Subject: [PATCH] Change feature price name to Advanced Price Rule --- .../template/controllers/products/prices.tpl | 10 ++++---- .../admin/AdminHotelFeaturePricesSettings.php | 24 +++++++++---------- .../hotelreservationsystem.php | 2 +- .../helpers/view/view.tpl | 4 ++-- .../helpers/form/form.tpl | 18 +++++++------- .../helpers/options/options.tpl | 4 ++-- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/admin/themes/default/template/controllers/products/prices.tpl b/admin/themes/default/template/controllers/products/prices.tpl index be2fed22f..4c646b26b 100644 --- a/admin/themes/default/template/controllers/products/prices.tpl +++ b/admin/themes/default/template/controllers/products/prices.tpl @@ -383,17 +383,17 @@ $(document).ready(function () {
-

{l s='Feature Price Plans'}

+

{l s='Advanced Price Rules'}

- {l s='You can set feature price plans by visiting '} - {l s='create feature price plans'} + {l s='You can set advanced price rules by visiting '} + {l s='create advanced price rules.'}
- + @@ -455,7 +455,7 @@ $(document).ready(function () { {else} {/if} diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php index 5dc2bfe1b..c282a13d2 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php @@ -60,7 +60,7 @@ public function __construct() 'align' => 'center', ), 'ftr_price_name' => array( - 'title' => $this->l('Feature Name'), + 'title' => $this->l('Rule Name'), 'align' => 'center', 'havingFilter' => true, ), @@ -155,7 +155,7 @@ public function initToolbar() parent::initToolbar(); $this->page_header_toolbar_btn['new'] = array( 'href' => self::$currentIndex.'&add'.$this->table.'&token='.$this->token, - 'desc' => $this->l('Add Feature Price'), + 'desc' => $this->l('Add new rule'), 'imgclass' => 'new' ); } @@ -220,10 +220,10 @@ public function postProcess() if (Configuration::updateValue('HTL_FEATURE_PRICING_PRIORITY', $priorityConfig)) { Tools::redirectAdmin(self::$currentIndex.'&conf=4&token='.$this->token); } else { - $this->errors[] = $this->l('Some error occurred while updating feature price priorities.'); + $this->errors[] = $this->l('Some error occurred while updating advanced price rule priorities.'); } } else { - $this->errors[] = $this->l('Duplicate values selected for feature price priorities.'); + $this->errors[] = $this->l('Duplicate values selected for advanced price rule priorities.'); } } else { parent::postProcess(); @@ -289,7 +289,7 @@ public function processSave() } if ($isPlanTypeExists) { - $this->errors[] = $this->l('A feature price rule already exists in which some dates are common with this + $this->errors[] = $this->l('An advanced price rule already exists in which some dates are common with this plan. Please select a different date range.'); } else { if (!$roomTypeId) { @@ -297,7 +297,7 @@ public function processSave() } if (!Tools::getValue('feature_price_name_'.$defaultLangId)) { $this->errors[] = sprintf( - $this->l('Feature price rule name is required at least in %s'), + $this->l('Advanced price rule name is required at least in %s'), $objDefaultLang->name ); } @@ -307,10 +307,10 @@ public function processSave() ); foreach ($languages as $language) { if (!Validate::isCatalogName(Tools::getValue('feature_price_name_'.$language['id_lang']))) { - $this->errors[] = $this->l('Feature price name is invalid in ').$language['name']; + $this->errors[] = $this->l('Advanced price rule name is invalid in ').$language['name']; } elseif (Tools::strlen(Tools::getValue('feature_price_name_'.$language['id_lang'])) > $validateRules['sizeLang']['feature_price_name']) { sprintf( - $this->l('Feature price Name field is too long (%2$d chars max).'), + $this->l('Advanced price rule Name field is too long (%2$d chars max).'), $validateRules['sizeLang']['feature_price_name'] ); } @@ -318,10 +318,10 @@ public function processSave() if ($dateSelectionType == 1) { if ($dateFrom == '') { - $this->errors[] = $this->l('Please choose Date from for the feature price.'); + $this->errors[] = $this->l('Please choose Date from for the advanced price rule.'); } if ($dateTo == '') { - $this->errors[] = $this->l('Please choose Date to for the feature price.'); + $this->errors[] = $this->l('Please choose Date to for the advanced price rule.'); } $dateFrom = date('Y-m-d', strtotime($dateFrom)); $dateTo = date('Y-m-d', strtotime($dateTo)); @@ -345,7 +345,7 @@ public function processSave() } } else { if ($specificDate == '') { - $this->errors[] = $this->l('Please choose Date from for the feature price.'); + $this->errors[] = $this->l('Please choose Date from for the advanced price rule.'); } $specificDate = date('Y-m-d', strtotime($specificDate)); if (!Validate::isDate($specificDate)) { @@ -406,7 +406,7 @@ public function processSave() Tools::redirectAdmin(self::$currentIndex.'&conf=4&token='.$this->token); } } else { - $this->errors[] = $this->l('Some error occured while saving feature price rule.'); + $this->errors[] = $this->l('Some error occured while saving advanced price rule.'); } } } diff --git a/modules/hotelreservationsystem/hotelreservationsystem.php b/modules/hotelreservationsystem/hotelreservationsystem.php index 0a0c2544f..b3a2fff78 100644 --- a/modules/hotelreservationsystem/hotelreservationsystem.php +++ b/modules/hotelreservationsystem/hotelreservationsystem.php @@ -596,7 +596,7 @@ public function callInstallTab() //Controllers which are to be used in this modules but we have not to create tab for those ontrollers... $this->installTab('AdminOrderRestrictSettings', 'order restrict configuration', false, false); $this->installTab('AdminHotelGeneralSettings', 'Hotel General configuration', false, false); - $this->installTab('AdminHotelFeaturePricesSettings', 'feature pricing configuration', false, false); + $this->installTab('AdminHotelFeaturePricesSettings', 'Advanced Price Rules', false, false); $this->installTab('AdminRoomTypeGlobalDemand', 'Additional demand configuration', false, false); $this->installTab('AdminAssignHotelFeatures', 'Assign Hotel Features', false, false); diff --git a/modules/hotelreservationsystem/views/templates/admin/hotel_configuration_setting/helpers/view/view.tpl b/modules/hotelreservationsystem/views/templates/admin/hotel_configuration_setting/helpers/view/view.tpl index efa042a9f..e354b8d0a 100644 --- a/modules/hotelreservationsystem/views/templates/admin/hotel_configuration_setting/helpers/view/view.tpl +++ b/modules/hotelreservationsystem/views/templates/admin/hotel_configuration_setting/helpers/view/view.tpl @@ -23,9 +23,9 @@ diff --git a/modules/hotelreservationsystem/views/templates/admin/hotel_feature_prices_settings/helpers/form/form.tpl b/modules/hotelreservationsystem/views/templates/admin/hotel_feature_prices_settings/helpers/form/form.tpl index 19ebc6c7c..d6c896369 100644 --- a/modules/hotelreservationsystem/views/templates/admin/hotel_feature_prices_settings/helpers/form/form.tpl +++ b/modules/hotelreservationsystem/views/templates/admin/hotel_feature_prices_settings/helpers/form/form.tpl @@ -20,9 +20,9 @@
{if isset($edit)} -  {l s='Edit Feature Price Rule' mod='hotelreservationsystem'} +  {l s='Edit Advanced Price Rule' mod='hotelreservationsystem'} {else} -  {l s='Add New Feature Price Rule' mod='hotelreservationsystem'} +  {l s='Add New Advanced Price Rule' mod='hotelreservationsystem'} {/if}
@@ -34,7 +34,7 @@ {l s='Room Type :' mod='hotelreservationsystem'}
- +
- **{l s='Enter room type name and select the room for which you are going to create this feature price plan.' mod='hotelreservationsystem'} + **{l s='Enter room type name and select the room for which you are going to create this advanced price rule.' mod='hotelreservationsystem'}
{foreach from=$languages item=language} {assign var="feature_price_name" value="feature_price_name_`$language.id_lang`"} - + {/foreach}
{if $languages|@count > 1} @@ -115,7 +115,7 @@
date_selection_type) && $objFeaturePrice->date_selection_type == 2}style="display:none;"{/if}> @@ -242,7 +242,7 @@
@@ -259,7 +259,7 @@ {* select group accesses *}
diff --git a/modules/hotelreservationsystem/views/templates/admin/hotel_feature_prices_settings/helpers/options/options.tpl b/modules/hotelreservationsystem/views/templates/admin/hotel_feature_prices_settings/helpers/options/options.tpl index 6aca5511a..09813e6ae 100644 --- a/modules/hotelreservationsystem/views/templates/admin/hotel_feature_prices_settings/helpers/options/options.tpl +++ b/modules/hotelreservationsystem/views/templates/admin/hotel_feature_prices_settings/helpers/options/options.tpl @@ -1,11 +1,11 @@

{l s='Priority management' mod='hotelreservationsystem'}

- {l s='Sometimes one customer can fit into multiple Feature price rules. In this case priorities allow you to define which rule applies to the Room Type.' mod='hotelreservationsystem'} + {l s='Sometimes one customer can fit into multiple advanced price rules. In this case priorities allow you to define which rule applies to the room type.' mod='hotelreservationsystem'}
- +
#{l s='Id'}{l s='Plan Name'}{l s='Rule Name'} {l s='Impact way'} {l s='Impact Type'} {l s='Impact Value'}
- {l s='No feature price plans.'} + {l s='No advanced price rules.'}