Daniel/hotel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2004 from amitsharma322/gli-3349

Browse Source 
Fixed: Text-related issues on the invoice and checkout pages
This commit is contained in:
Rohit Jain
2026-11-05 16:14:08 +05:30
committed by GitHub
parent c87a624cfc b315b593cb
commit dee4111c64
38 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin-dev/themes/default/template/controllers/carts/_orders.tpl
View File

@@ -27,5 +27,5 @@
{elseif $type == 'abandoned'}
<span class="badge badge-danger">{l s='Abandoned cart'}</span>
{elseif $type == 'non_orderd'}
<span class="badge badge-danger">{l s='Non-orderd cart'}</span>
<span class="badge badge-danger">{l s='Non-ordered cart'}</span>
{/if}

8
admin-dev/themes/default/template/controllers/normal_products/informations.tpl
View File

@@ -329,7 +329,7 @@
<li>
<b>{l s='Add price in room price'}</b> : {l s='Service price will be added in room base price.'}<br>{l s='(e.g., Room price : 500, service price: 50, final room price : 550)'}
</li>
<li><b>{l s='Add price as convenience fee'}</b> : {l s='Service price will be dispalyed in order summary as "Convenience Fees"'}</li>
<li><b>{l s='Add price as convenience fee'}</b> : {l s='Service price will be displayed in order summary as "Convenience Fees"'}</li>
</ul>
</div>
</div>
@@ -358,7 +358,7 @@
<div class="form-group" id="available_for_order_container" {if (!$product->show_at_front && $product->isAssociatedToShop()) || $product->auto_add_to_cart}style="display:none;"{/if}>
<label class="control-label col-lg-3" for="">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Enable if you want this product to be sold from front office of your website.'}">
{l s='Availabe for order'}
{l s='Available for order'}
</span>
</label>
<div class="col-lg-3">
@@ -377,7 +377,7 @@
</div>
<div class="form-group" id="show_price_container" {if $product->available_for_order || (!$product->show_at_front && $product->isAssociatedToShop()) || !$product->isAssociatedToShop() || $product->auto_add_to_cart}style="display:none;"{/if}>
<label class="control-label col-lg-3" for="">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Enable if you want show product price even when product is not availabe to be sold at front office.'}">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Enable if you want show product price even when product is not available to be sold at front office.'}">
{l s='Show price'}
</span>
</label>
@@ -447,7 +447,7 @@
<div class="form-group">
<div class="col-lg-6 col-lg-offset-3">
<div class="alert alert-info">
{l s='By default all products have infinte quantity, Using this setting you can restrict customer to purchase only one product per room.'}
{l s='By default all products have infinite quantity, Using this setting you can restrict customer to purchase only one product per room.'}
</div>
</div>
</div>

2
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
View File

@@ -431,7 +431,7 @@
</select>
</div>
<div class="col-lg-6 col-md-4">
<button type="submit" class="btn btn-primary" name="submitChangeCurrency"><i class="icon-refresh"></i> {l s='Change Currencly'}</button>
<button type="submit" class="btn btn-primary" name="submitChangeCurrency"><i class="icon-refresh"></i> {l s='Change Currency'}</button>
</div>
</div>
<p class="help-block">{l s='Do not forget to update your exchange rate before making this change.'}</p>

2
admin-dev/themes/default/template/controllers/products/informations.tpl
View File

@@ -103,7 +103,7 @@
<div class="form-group">
<div class="col-lg-1"><span class="pull-right">{include file="controllers/products/multishop/checkbox.tpl" field="name" type="default" multilang="true"}</span></div>
<label class="control-label col-lg-2 required" id="name" for="name_{$id_lang}">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Write the name of the Room Type for ex. Delux, Executive etc.'} {l s='Invalid characters:'} &lt;&gt;;=#{}">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Write the name of the Room Type for ex. Deluxe, Executive etc.'} {l s='Invalid characters:'} &lt;&gt;;=#{}">
{l s='Name'}
</span>
</label>

2
admin-dev/themes/default/template/controllers/products/occupancy.tpl
View File

@@ -28,7 +28,7 @@
<div class="alert alert-info">
{l s='Below, enter the base occupancy of this room type.'}
<p><b>{l s='Note'}</b>: {l s='Minimum 1 adult is madatory in the base occupancy of the room type'}</p>
<p><b>{l s='Note'}</b>: {l s='Minimum 1 adult is mandatory in the base occupancy of the room type'}</p>
</div>
<div class="form-group">

2
admin-dev/themes/default/template/header.tpl
View File

@@ -311,7 +311,7 @@
{/if}
{if isset($upgrade_info->update_available) && $upgrade_info->update_available > 0}
<li class="hidden-md hidden-sm hidden-xs"><a href="{$upgrade_info->upgrade_url}">{l s='QloApps Update Availabe:'} {$upgrade_info->latest_availabe}</a></li>
<li class="hidden-md hidden-sm hidden-xs"><a href="{$upgrade_info->upgrade_url}">{l s='QloApps Update Available:'} {$upgrade_info->latest_availabe}</a></li>
{/if}
<li class="hidden-sm hidden-xs">
<a target="_blank" href="https://qloapps.com/addons/" class="toolbar_btn" title="{l s='Explore QloApps Addons'}">

4
controllers/admin/AdminCartsController.php
View File

@@ -1633,7 +1633,7 @@ class AdminCartsControllerCore extends AdminController
}
} elseif ($serviceQuantities[$idServiceProduct] > 1) {
$response['hasError'] = true;
$response['errors'][] = Tools::displayError('Can not order multiple quanitity for service').': '.$objProduct->name;
$response['errors'][] = Tools::displayError('Can not order multiple quantity for service').': '.$objProduct->name;
}
if (!isset($serviceUnitPrices[$idServiceProduct])
@@ -1770,7 +1770,7 @@ class AdminCartsControllerCore extends AdminController
if (!$result) {
$response['hasError'] = true;
$response['errors'][] = Tools::displayError('Error while updating services, please try again after refresing the page');
$response['errors'][] = Tools::displayError('Error while updating services, please try again after refreshing the page');
}
}
} else {

2
controllers/admin/AdminCustomerThreadsController.php
View File

@@ -668,7 +668,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
if (($error = $cm->validateField('message', $cm->message, null, array(), true)) !== true) {
$this->errors[] = $error;
} elseif (!$cm->add()) {
$this->errors[] = Tools::displayError('Some error occured while saving the message');
$this->errors[] = Tools::displayError('Some error occurred while saving the message');
}
}
}

4
controllers/admin/AdminCustomersController.php
View File

@@ -1208,7 +1208,7 @@ class AdminCustomersControllerCore extends AdminController
$objCustomer->email = 'anonymous'.'-'.$objCustomer->id.'@'.Tools::link_rewrite(Configuration::get('PS_SHOP_NAME')).'_anonymous.com';
$objCustomer->deleted = Customer::STATUS_DELETED;
if (!$objCustomer->update()) {
$this->errors[] = Tools::displayError('Some error ocurred while deleting the Customer');
$this->errors[] = Tools::displayError('Some error occurred while deleting the Customer');
return;
} else {
if ($idCustomerGuest = CustomerGuestDetail::getCustomerGuestByEmail($customerEmail, false)) {
@@ -1276,7 +1276,7 @@ class AdminCustomersControllerCore extends AdminController
// not processed customers will be deleted with default process if no errors are there
unset($this->boxes[$key]);
} else {
$this->errors[] = Tools::displayError('Some error ocurred while deleting the Customer with id').': '.$idCustomer;
$this->errors[] = Tools::displayError('Some error occurred while deleting the Customer with id').': '.$idCustomer;
}
}
} else {

2
controllers/admin/AdminFeaturesController.php
View File

@@ -779,7 +779,7 @@ class AdminFeaturesControllerCore extends AdminController
$objFeature->logo = $imageName;
$objFeature->update();
} else {
$this->errors[] = $this->l('Some error occurred while uploding room feature logo. Please try again.');
$this->errors[] = $this->l('Some error occurred while uploading room feature logo. Please try again.');
}
}
}

2
controllers/admin/AdminImportController.php
View File

@@ -186,7 +186,7 @@ class AdminImportControllerCore extends AdminController
'help' => $this->l('Required if advance payment allowed.')
),
'min_len_stay' => array('label' => $this->l('Minimum length of stay (1 = No Limit)')),
'max_len_stay' => array('label' => $this->l('Maximum lenght of stay (0 = No Limit)')),
'max_len_stay' => array('label' => $this->l('Maximum length of stay (0 = No Limit)')),
'base_adults' => array('label' => $this->l('Base adults')),
'base_children' => array('label' => $this->l('Base children')),
'max_adults' => array('label' => $this->l('Maximum adults')),

2
controllers/admin/AdminModulesController.php
View File

@@ -1794,7 +1794,7 @@ class AdminModulesControllerCore extends AdminController
if (count($this->errors)) {
$response['data']['callback']['process'] = 'delete';
$response['data']['callback']['msg'] = $this->l('There was some error while installing the module, do you want to delete the uploded module');
$response['data']['callback']['msg'] = $this->l('There was some error while installing the module, do you want to delete the uploaded module');
$response['errors'] = $this->errors;
}
$this->logAndResponseAjax($response);

8
controllers/admin/AdminOrderPreferencesController.php
View File

@@ -287,9 +287,9 @@ class AdminOrderPreferencesControllerCore extends AdminController
'js' => "changeOverbookingOrderAction()"
),
'PS_MAX_OVERBOOKING_PER_HOTEL_PER_DAY' => array(
'title' => $this->l('Maximun hotel overbookings per date'),
'title' => $this->l('Maximum hotel overbookings per date'),
'hint' => $this->l('Enter the maximum number of the overbookings on any date can be created for a hotel.(Set 0 for no limit)'),
'desc' => $this->l('When maximun number of the overbookings on any date in the booking duration is reached, then the new overbooking order will be cancelled.(Set 0 for no limit)'),
'desc' => $this->l('When maximum number of the overbookings on any date in the booking duration is reached, then the new overbooking order will be cancelled.(Set 0 for no limit)'),
'validation' => 'isInt',
'type' => 'text',
'class' => 'fixed-width-xxl',
@@ -444,7 +444,7 @@ class AdminOrderPreferencesControllerCore extends AdminController
if (!$idCountry) {
$this->errors[] = Tools::displayError('Field country is required');
} elseif (!Validate::isLoadedObject($objCountry = new Country($idCountry))) {
$this->errors[] = Tools::displayError('Invaid country');
$this->errors[] = Tools::displayError('Invalid country');
} elseif ($objCountry->zip_code_format && !$objCountry->checkZipCode($postcode)) {
$this->errors[] = sprintf($this->l('The Zip/Postal code you\'ve entered is invalid. It must follow this format: %s'), str_replace('C', $objCountry->iso_code, str_replace('N', '0', str_replace('L', 'A', $objCountry->zip_code_format))));
} elseif (!$postcode && $objCountry->need_zip_code) {
@@ -456,7 +456,7 @@ class AdminOrderPreferencesControllerCore extends AdminController
} elseif ($objCountry->contains_states && !$idSate) {
$this->errors[] = Tools::displayError('Field State is required');
} elseif (!Validate::isLoadedObject(new State($idSate))) {
$this->errors[] = Tools::displayError('Invaid state');
$this->errors[] = Tools::displayError('Invalid state');
}
if (!$city || $city == '') {

14
controllers/admin/AdminOrdersController.php
View File

@@ -1737,7 +1737,7 @@ class AdminOrdersControllerCore extends AdminController
$message->save();
Tools::redirectAdmin(self::$currentIndex.'&id_order='.(int) $idOrder.'&vieworder&conf=52&token='.$this->token);
} else {
$this->errors[] = $this->l('Some error occured. Please try again.');
$this->errors[] = $this->l('Some error occurred. Please try again.');
}
}
} else {
@@ -1794,7 +1794,7 @@ class AdminOrdersControllerCore extends AdminController
$message->save();
Tools::redirectAdmin(self::$currentIndex.'&id_order='.(int)$idOrder.'&vieworder&conf=53&token='.$this->token);
} else {
$this->errors[] = $this->l('Some error occured. Please try again.');
$this->errors[] = $this->l('Some error occurred. Please try again.');
}
}
} else {
@@ -5182,13 +5182,13 @@ class AdminOrdersControllerCore extends AdminController
} else {
die(json_encode(array(
'result' => false,
'error' => Tools::displayError('Some error occured Please try again.'),
'error' => Tools::displayError('Some error occurred. Please try again.'),
)));
}
} else {
die(json_encode(array(
'result' => false,
'error' => Tools::displayError('Some error occured Please try again.'),
'error' => Tools::displayError('Some error occurred. Please try again.'),
)));
}
@@ -7463,7 +7463,7 @@ class AdminOrdersControllerCore extends AdminController
if ($id_hotel == '') {
die(json_encode(array(
'result' => false,
'error' => Tools::displayError('Hotel Id is mising.'),
'error' => Tools::displayError('Hotel ID is missing.'),
)));
} elseif ($id_room == '') {
die(json_encode(array(
@@ -8012,7 +8012,7 @@ class AdminOrdersControllerCore extends AdminController
}
} elseif (is_array($serviceQuantities) && isset($serviceQuantities[$idRoomTypeServiceProductOrderDetail]) && $serviceQuantities[$idRoomTypeServiceProductOrderDetail] > 1) {
$response['hasError'] = true;
$response['errors'][] = Tools::displayError('Can not order multiple quanitity for service').': '.$objServiceProductOrderDetail->name;
$response['errors'][] = Tools::displayError('Cannot order multiple quantity for service').': '.$objServiceProductOrderDetail->name;
}
if (!isset($serviceUnitPrices[$idRoomTypeServiceProductOrderDetail])
@@ -8148,7 +8148,7 @@ class AdminOrdersControllerCore extends AdminController
if (!$result) {
$response['hasError'] = true;
$response['errors'][] = Tools::displayError('Error while updating service, please try again after refresing the page');
$response['errors'][] = Tools::displayError('Error while updating service, please try again after refreshing the page');
} else {
$this->sendChangedNotification($objOrder);
$response['service_panel']= $servicesBlock = $this->processRenderServicesPanel(

4
controllers/admin/AdminPPreferencesController.php
View File

@@ -189,8 +189,8 @@ class AdminPPreferencesControllerCore extends AdminController
'identifier' => 'id',
),
'PS_LOS_RESTRICTION_BO' => array(
'title' => $this->l('Apply Min and Max lenght of stay restrictions for back-office search'),
'hint' => $this->l('While searching for available rooms from back-office, apply minimum and maximum lenght of stay restrictions'),
'title' => $this->l('Apply Min and Max length of stay restrictions for back-office search'),
'hint' => $this->l('While searching for available rooms from back-office, apply minimum and maximum length of stay restrictions'),
'validation' => 'isBool',
'cast' => 'intval',
'required' => false,

2
controllers/admin/AdminProductsController.php
View File

@@ -3084,7 +3084,7 @@ class AdminProductsControllerCore extends AdminController
// add text for normal product and booking product
$this->tpl_form_vars['booking_product_text'] = array(
'name'=> $this->l('Room Type'),
'name_title'=> $this->l('Write the name of the Room Type for ex. Delux, Executive etc. Invalid characters <>;=#{}')
'name_title'=> $this->l('Write the name of the Room Type for ex. Deluxe, Executive etc. Invalid characters <>;=#{}')
);
$this->tpl_form_vars['normal_product_text'] = array(
'name'=> $this->l('Name'),

4
controllers/front/CartController.php
View File

@@ -282,7 +282,7 @@ class CartControllerCore extends FrontController
$this->id_address_delivery,
(int)Tools::getValue('new_id_address_delivery')
)) {
//$error_message = $this->l('Error durring product duplication');
//$error_message = $this->l('Error during product duplication');
// For the moment no translations
$error_message = 'Error durring product duplication';
}
@@ -318,7 +318,7 @@ class CartControllerCore extends FrontController
if ($occupancy = Tools::getValue('occupancy')) {
$this->qty = count($occupancy);
} else {
$this->errors[] = Tools::displayError('Invalid occupnacy.');
$this->errors[] = Tools::displayError('Invalid occupancy.');
}
} else {
$occupancy = Tools::getValue('qty');

4
controllers/front/ProductController.php
View File

@@ -1627,7 +1627,7 @@ class ProductControllerCore extends FrontController
$objRoomTypeServiceProduct = new RoomTypeServiceProduct();
$n = RoomTypeServiceProduct::WK_NUM_RESULTS;
if (Configuration::get('PS_SERVICE_PRODUCT_CATEGORY_FILTER') && !$id_category) {
$response['error'] = Tools::displayError('Invaild Request, please try again');
$response['error'] = Tools::displayError('Invalid Request, please try again');
}
if (empty($response['error'])) {
$response['status'] = true;
@@ -1656,7 +1656,7 @@ class ProductControllerCore extends FrontController
$response['error'] = Tools::displayError('Room Type not Found');
}
} else {
$response['error'] = Tools::displayError('Invaild Request, please try again');
$response['error'] = Tools::displayError('Invalid Request, please try again');
}
} else {
$response['error'] = Tools::displayError('Unable to process request, please try again');

2
modules/blockcart/blockcart.tpl
View File

@@ -429,7 +429,7 @@
{/block}
{block name='blockcart_js_vars'}
{strip}
{addJsDefL name=someErrorCondition}{l s='Some Error occured.Please try again.' mod='blockcart' js=1}{/addJsDefL}
{addJsDefL name=someErrorCondition}{l s='Some Error occurred.Please try again.' mod='blockcart' js=1}{/addJsDefL}
{addJsDef CUSTOMIZE_TEXTFIELD=$CUSTOMIZE_TEXTFIELD}
{addJsDef img_dir=$img_dir|escape:'quotes':'UTF-8'}
{addJsDef generated_date=$smarty.now|intval}

4
modules/blocknavigationmenu/views/templates/admin/custom_navigation_link_setting/helpers/form/form.tpl
View File

@@ -127,7 +127,7 @@
<div class="col-lg-10">
{foreach from=$languages item=language}
{assign var="navigation_link_name" value="navigation_link_name_`$language.id_lang`"}
<input type="text" id="{$navigation_link_name}" name="{$navigation_link_name}" value="{if isset($navigationLinkInfo.name[$language.id_lang]) && $navigationLinkInfo.name[$language.id_lang]}{$navigationLinkInfo.name[$language.id_lang]|escape:'htmlall':'UTF-8'}{else if isset($smarty.post.$navigation_link_name)}{$smarty.post.$navigation_link_name|escape:'htmlall':'UTF-8'}{/if}" data-lang-name="{$language.name}" placeholder="{l s='Enter exlore link name' mod='blocknavigationmenu'}" class="form-control navigation_link_name_all" {if $currentLang.id_lang != $language.id_lang}style="display:none;"{/if}/>
<input type="text" id="{$navigation_link_name}" name="{$navigation_link_name}" value="{if isset($navigationLinkInfo.name[$language.id_lang]) && $navigationLinkInfo.name[$language.id_lang]}{$navigationLinkInfo.name[$language.id_lang]|escape:'htmlall':'UTF-8'}{else if isset($smarty.post.$navigation_link_name)}{$smarty.post.$navigation_link_name|escape:'htmlall':'UTF-8'}{/if}" data-lang-name="{$language.name}" placeholder="{l s='Enter explore link name' mod='blocknavigationmenu'}" class="form-control navigation_link_name_all" {if $currentLang.id_lang != $language.id_lang}style="display:none;"{/if}/>
{/foreach}
</div>
{if $languages|@count > 1}
@@ -171,7 +171,7 @@
<div class="form-group custom_redirect_link_div {if isset($smarty.post.is_custom_redirect_link)}{if $smarty.post.is_custom_redirect_link}hidden{/if}{elseif isset($navigationLinkInfo['is_custom_link']) && !$navigationLinkInfo['is_custom_link']}hidden{elseif !isset($navigationLinkInfo['is_custom_link'])}hidden{/if}">
<label class="control-label col-lg-3">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='enter the url to which you want to redirect your guests for this nevigation link.' mod='blocknavigationmenu'}">
title="{l s='enter the url to which you want to redirect your guests for this navigation link.' mod='blocknavigationmenu'}">
{l s='Custom redirect url' mod='blocknavigationmenu'}
</span>
</label>

2
modules/dashinsights/dashinsights.php
View File

@@ -364,7 +364,7 @@ class DashInsights extends Module
array('key' => $this->l('Mon'), 'name' => $this->l('Monday')),
array('key' => $this->l('Tue'), 'name' => $this->l('Tuesday')),
array('key' => $this->l('Wed'), 'name' => $this->l('Wednesday')),
array('key' => $this->l('Thu'), 'name' => $this->l('Thrusday')),
array('key' => $this->l('Thu'), 'name' => $this->l('Thursday')),
array('key' => $this->l('Fri'), 'name' => $this->l('Friday')),
array('key' => $this->l('Sat'), 'name' => $this->l('Saturday'))
);

4
modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php
View File

@@ -509,7 +509,7 @@ class AdminHotelFeaturePricesSettingsController extends ModuleAdminController
$rowsToHighlight = [];
if (!$restrictions) {
$this->errors[] = $this->l('Atleast one restriction is required while creating advance price rule.');
$this->errors[] = $this->l('At least one restriction is required while creating advance price rule.');
} else {
foreach ($restrictions as $restrictionKey => $restriction) {
if (!$restriction['is_special_days_exists']) {
@@ -665,7 +665,7 @@ class AdminHotelFeaturePricesSettingsController extends ModuleAdminController
Tools::redirectAdmin(self::$currentIndex.'&conf='.$conf.'&token='.$this->token);
}
} else {
$this->errors[] = $this->l('Some error occured while saving advanced price rule.');
$this->errors[] = $this->l('Some error occurred while saving advanced price rule.');
}
}
if (isset($idFeaturePrice) && $idFeaturePrice) {

6
modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php
View File

@@ -244,7 +244,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController
if ($objBookingDetail->reallocateBooking($idHtlBookingFrom, $idRoomToReallocate, $priceDiff)) {
Tools::redirectAdmin(self::$currentIndex.'&id_order='.(int) $idOrder.'&vieworder&conf=52&token='.$this->token);
} else {
$this->errors[] = $this->l('Some error occured. Please try again.');
$this->errors[] = $this->l('Some error occurred. Please try again.');
}
}
} else {
@@ -286,7 +286,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController
if ($objBookingDetail->swapBooking($idHtlBookingFrom, $idHtlBookingToSwap)) {
Tools::redirectAdmin(self::$currentIndex.'&id_order='.(int)$idOrder.'&vieworder&conf=53&token='.$this->token);
} else {
$this->errors[] = $this->l('Some error occured. Please try again.');
$this->errors[] = $this->l('Some error occurred. Please try again.');
}
}
} else {
@@ -763,7 +763,7 @@ public function ajaxProcessGetCalenderData()
}
if ($product->booking_product || !Product::isSellableAsStandalone($product->id)) {
// cannot be added without room type or is a booking product.
$this->errors[] = $this->l('This product is either a room type or extra service and cannot be added thorugh this method.');
$this->errors[] = $this->l('This product is either a room type or extra service and cannot be added through this method.');
} elseif (!$product->allow_multiple_quantity) {
// check if product already exists in cart.
if ($id_cart) {

2
modules/hotelreservationsystem/views/templates/admin/add_hotel/helpers/form/form.tpl
View File

@@ -740,7 +740,7 @@
{addJsDefL name=coverImgErrorMsg}{l s='Error while changing cover image' js=1 mod='hotelreservationsystem'}{/addJsDefL}
{addJsDefL name=deleteImgSuccessMsg}{l s='Image deleted successfully' js=1 mod='hotelreservationsystem'}{/addJsDefL}
{addJsDefL name=deleteImgErrorMsg}{l s='Something went wrong while deleteing image. Please try again later !!' js=1 mod='hotelreservationsystem'}{/addJsDefL}
{addJsDefL name=deleteImgErrorMsg}{l s='Something went wrong while deleting image. Please try again later !!' js=1 mod='hotelreservationsystem'}{/addJsDefL}
{addJsDef enabledDisplayMap = $enabledDisplayMap}
{addJsDef defaultCountry = $defaultCountry}

2
modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/view.tpl
View File

@@ -188,7 +188,7 @@
<div class="col-sm-8">
<div class="panel">
<div class="panel-heading">
<i class="icon-info"></i> {if !isset($booking_product) || (isset($booking_product) && $booking_product == 1)}{l s='Booking Calender' mod='hotelreservationsystem'}{else}{l s='Service Products' mod='hotelreservationsystem'}{/if }
<i class="icon-info"></i> {if !isset($booking_product) || (isset($booking_product) && $booking_product == 1)}{l s='Booking Calendar' mod='hotelreservationsystem'}{else}{l s='Service Products' mod='hotelreservationsystem'}{/if }
<button type="button" class="btn btn-primary {if $total_products_in_cart|intval == 0}disabled{/if}" id="cart_btn" data-toggle="modal" data-target="#cartModal"><i class="icon-shopping-cart"></i> {l s='Cart' mod='hotelreservationsystem'} <span class="badge" id="cart_record">{$total_products_in_cart}</span></button>
</div>
{if !isset($booking_product) || (isset($booking_product) && $booking_product == 1)}

4
modules/qlocleaner/qlocleaner.php
View File

@@ -98,12 +98,12 @@ class QloCleaner extends Module
} elseif (Tools::getValue('submitTruncateCatalog') && Tools::getValue('checkTruncateCatalog')) {
self::truncate('catalog');
Hook::exec('actionCleanData', array('method' => 'catalog'));
$html .= $this->displayConfirmation($this->l('Catalog truncated successfuly, please run functional Integrity constraints to clean the database.'));
$html .= $this->displayConfirmation($this->l('Catalog truncated successfully, please run functional Integrity constraints to clean the database.'));
Cache::getInstance()->flush();
} elseif (Tools::getValue('submitTruncateSales') && Tools::getValue('checkTruncateSales')) {
self::truncate('sales');
Hook::exec('actionCleanData', array('method' => 'sales'));
$html .= $this->displayConfirmation($this->l('Orders and customers truncated successfuly, please run functional Integrity constraints to clean the database'));
$html .= $this->displayConfirmation($this->l('Orders and customers truncated successfully, please run functional Integrity constraints to clean the database'));
Cache::getInstance()->flush();
}

2
modules/qlocleaner/views/templates/admin/databases_cleaning_conf.tpl
View File

@@ -20,7 +20,7 @@
* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
*}
<p>{l s='The following queries successfuly cleaned your database:' mod='qlocleaner'}<p>
<p>{l s='The following queries successfully cleaned your database:' mod='qlocleaner'}<p>
<ul>
{foreach $logs as $query => $entries}
<li>

2
modules/qlocleaner/views/templates/admin/functional_integrity_conf.tpl
View File

@@ -20,7 +20,7 @@
* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
*}
{* {$query|escape:'htmlall':'UTF-8'} *}
<p>{l s='The following queries successfuly fixed broken data:' mod='qlocleaner'}<p>
<p>{l s='The following queries successfully fixed broken data:' mod='qlocleaner'}<p>
<ul>
{foreach $logs as $query => $entries}
<li>

2
modules/qlocmconnector/controllers/admin/AdminQloappsChannelManagerConnectorController.php
View File

@@ -67,7 +67,7 @@ class AdminQloappsChannelManagerConnectorController extends ModuleAdminControlle
'callback' => 'setPriceCurrency',
),
'total_paid_real' => array(
'title' => $this->l('Recieved amount'),
'title' => $this->l('Received amount'),
'align' => 'text-center',
'type' => 'range',
'validation' => 'isFloat',

2
modules/qlocmconnector/views/templates/admin/qloapps_channel_manager_connector/qcmc_channel_manager_connect_info.tpl
View File

@@ -113,7 +113,7 @@
</ul>
</div>
<div class="qcm_info_explore">
{l s='To know channel manager freatures and work-flow in details' mod='qlocmconnector'} <a class="qcm-link" href="https://qloapps.com/qloapps-channel-manager/">{l s='Visit Documentation' mod='qlocmconnector'}</a>
{l s='To know channel manager features and work-flow in details' mod='qlocmconnector'} <a class="qcm-link" href="https://qloapps.com/qloapps-channel-manager/">{l s='Visit Documentation' mod='qlocmconnector'}</a>
</div>
</div>
</div>

2
modules/qloduitkupayment/qloduitkupayment.php
View File

@@ -175,7 +175,7 @@ class QloDuitkuPayment extends PaymentModule
array(
'type' => 'select',
'label' => $this->l('Environment'),
'hint' => $this->l('Select current environment to use for Cashfree transaction. Select Sanbox to test configurations and production to accept payment live.'),
'hint' => $this->l('Select current environment to use for Cashfree transaction. Select Sandbox to test configurations and production to accept payment live.'),
'name' => 'QDP_DUITKU_PAYMENT_ENVIRONMENT',
'class' => 'input fixed-width-lg',
'options' => array(

6
modules/qloduitkupayment/views/templates/front/validation_error.tpl
View File

@@ -22,11 +22,11 @@
<h2 class="page-heading">{l s='Order Error' mod='qloduitkupayment'}</h2>
<p class="alert alert-danger">
{l s='Somthing went wrong during order creation. Contact admin from ' mod='qloduitkupayment'}
{l s='Something went wrong during order creation. Contact admin from ' mod='qloduitkupayment'}
<a href="{$link->getPageLink('contact')}" target="_blank">{l s='contact us' mod='qloduitkupayment'}</a>
{l s='page.' mod='qloduitkupayment'}
<br>
{l s='Please Quote following trasaction id during conversation.' mod='qloduitkupayment'}
{l s='Please Quote following transaction id during conversation.' mod='qloduitkupayment'}
<br>
{l s='Trasaction Id: ' mod='qloduitkupayment'}<strong>{$txn_id|escape:'html':'UTF-8'}</strong>
{l s='Transaction Id: ' mod='qloduitkupayment'}<strong>{$txn_id|escape:'html':'UTF-8'}</strong>
</p>

2
modules/statsorigin/statsorigin.php
View File

@@ -144,7 +144,7 @@ class StatsOrigin extends ModuleGraph
{
$this->_titles['main'][] = $this->l('Top ten referral websites');
if (Tools::getValue('export')) {
$this->_titles['main'][] = $this->l('Referal percentage');
$this->_titles['main'][] = $this->l('Referral percentage');
}
$websites = $this->getOrigins($this->getDate());
$total = 0;

4
pdf/invoice.tax-tab.tpl
View File

@@ -69,9 +69,9 @@
{if isset($showTaxName) && $showTaxName}
<td class="white">{$line.tax_name|escape:'html':'UTF-8'}</td>
{/if}
<td class="white">—</td>
<td class="white">-</td>
{if $display_tax_bases_in_breakdowns}
<td class="white">—</td>
<td class="white">-</td>
{/if}
<td class="white">
{displayPrice currency=$order->id_currency price=$line.total_amount}

2
themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl
View File

@@ -434,7 +434,7 @@
{/block}
{block name='blockcart_js_vars'}
{strip}
{addJsDefL name=someErrorCondition}{l s='Some Error occured.Please try again.' mod='blockcart' js=1}{/addJsDefL}
{addJsDefL name=someErrorCondition}{l s='Some Error occurred.Please try again.' mod='blockcart' js=1}{/addJsDefL}
{addJsDef CUSTOMIZE_TEXTFIELD=$CUSTOMIZE_TEXTFIELD}
{addJsDef img_dir=$img_dir|escape:'quotes':'UTF-8'}
{addJsDef generated_date=$smarty.now|intval}

2
themes/hotel-reservation-theme/order-detail.tpl
View File

@@ -1177,7 +1177,7 @@
{addJsDefL name=mail_sending_err}{l s='Some error occurred while sending mail to the customer' js=1}{/addJsDefL}
{addJsDefL name=refund_request_sending_error}{l s='Some error occurred while processing request for booking cancellation.' js=1}{/addJsDefL}
{addJsDefL name=no_bookings_selected}{l s='Please select at least one room or service to proceed for cancellation.' js=1}{/addJsDefL}
{addJsDefL name=refund_request_success_txt}{l s='Request for booking cancellation is successffully created.' js=1}{/addJsDefL}
{addJsDefL name=refund_request_success_txt}{l s='Request for booking cancellation is successfully created.' js=1}{/addJsDefL}
{addJsDefL name=order_message_choose_txt}{l s='-- Choose --' js=1}{/addJsDefL}
{addJsDefL name=order_message_success_txt}{l s='Order message sent successfully.' js=1}{/addJsDefL}
{addJsDefL name=cancel_req_txt}{l s='Cancel Request' js=1}{/addJsDefL}

4
themes/hotel-reservation-theme/product.tpl
View File

@@ -896,7 +896,7 @@
{addJsDef currency_format = $currency->format}
{addJsDef currency_blank = $currency->blank}
{addJsDefL name=correct_date_cond}{l s='Check Out Date should be greater than Check in date.' js=1}{/addJsDefL}
{addJsDefL name=some_error_cond}{l s='Some error occured .Please try again.' js=1}{/addJsDefL}
{addJsDefL name=some_error_cond}{l s='Some error occurred .Please try again.' js=1}{/addJsDefL}
{addJsDefL name=unavail_qty_text}{l s='Required quantity of rooms are Not available.' js=1}{/addJsDefL}
{addJsDefL name=out_of_stock_cond}{l s='No room is available for this period.' js=1}{/addJsDefL}
{addJsDefL name=wrong_qty_cond}{l s='you are trying for a invalid quantity.' js=1}{/addJsDefL}
@@ -907,7 +907,7 @@
{addJsDefL name=service_removed_txt}{l s='Service removed' js=1}{/addJsDefL}
{addJsDefL name=service_updated_txt}{l s='Service updated' js=1}{/addJsDefL}
{addJsDefL name=max_service_product_qty_txt}{l s='Maximum allowed quantity in the cart is' js=1}{/addJsDefL}
{addJsDefL name=out_of_stock_text}{l s='Requested quantitity is out of stock' js=1}{/addJsDefL}
{addJsDefL name=out_of_stock_text}{l s='Requested quantity is out of stock' js=1}{/addJsDefL}
{/strip}
{/block}
{/if}

10
themes/hotel-reservation-theme/shopping-cart-detail.tpl
View File

@@ -151,7 +151,7 @@
{/if}
</div>
<p class="total_price_detial">
{l s='Total %s price' sprintf=$data_v['selling_object_plural_name']|escape:'html':'UTF-8'} {if $use_taxes && $display_tax_label}{if $priceDisplay} {l s='(Excl.'} {else}{l s='(Incl.)'}{/if} {l s='all taxes.)'}{/if}
{l s='Total %s price' sprintf=$data_v['selling_object_plural_name']|escape:'html':'UTF-8'} {if $use_taxes && $display_tax_label}{if $priceDisplay} {l s='(Excl.'} {else}{l s='(Incl.'}{/if} {l s='all taxes.)'}{/if}
</p>
</div>
</div>
@@ -265,7 +265,7 @@
</span>
</p>
<p class="total_price_detial">
{l s='Unit price'} {if $use_taxes && $display_tax_label}{if $priceDisplay} {l s='(Excl.'} {else}{l s='(Incl.)'}{/if} {l s='all taxes.)'}{/if}
{l s='Unit price'} {if $use_taxes && $display_tax_label}{if $priceDisplay} {l s='(Excl.'} {else}{l s='(Incl.'}{/if} {l s='all taxes.)'}{/if}
</p>
</div>
{if $product.allow_multiple_quantity}
@@ -297,7 +297,7 @@
</span>
</p>
<p class="total_price_detial">
{l s='Total price'} {if $use_taxes && $display_tax_label}{if $priceDisplay} {l s='(Excl.'} {else}{l s='(Incl.)'}{/if} {l s='all taxes.)'}{/if}
{l s='Total price'} {if $use_taxes && $display_tax_label}{if $priceDisplay} {l s='(Excl.'} {else}{l s='(Incl.'}{/if} {l s='all taxes.)'}{/if}
</p>
</div>
</div>
@@ -356,7 +356,7 @@
</span>
</p>
<p class="total_price_detial">
{l s='Unit price'} {if $use_taxes && $display_tax_label}{if $priceDisplay} {l s='(Excl.'} {else}{l s='(Incl.)'}{/if} {l s='all taxes.)'}{/if}
{l s='Unit price'} {if $use_taxes && $display_tax_label}{if $priceDisplay} {l s='(Excl.'} {else}{l s='(Incl.'}{/if} {l s='all taxes.)'}{/if}
</p>
</div>
{if $product.allow_multiple_quantity}
@@ -389,7 +389,7 @@
</span>
</p>
<p class="total_price_detial">
{l s='Total price'} {if $use_taxes && $display_tax_label}{if $priceDisplay} {l s='(Excl.'} {else}{l s='(Incl.)'}{/if} {l s='all taxes.)'}{/if}
{l s='Total price'} {if $use_taxes && $display_tax_label}{if $priceDisplay} {l s='(Excl.'} {else}{l s='(Incl.'}{/if} {l s='all taxes.)'}{/if}
</p>
</div>
</div>