dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fix update english key of translations in all files

Browse Source
This commit is contained in:
lLefevre committed 2012-03-14 12:25:51 +00:00
1 parent d93eff8834
commit c21bef2acf
553 files changed
+17474 -20745
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

controllers/admin/AdminRangeWeightController.php
+3 -3
View File
@@ -74,7 +74,7 @@ class AdminRangeWeightControllerCore extends AdminController
'id' => 'id_carrier',
'name' => 'name'
),
'empty_message' => '<div style="margin:5px 0 10px 0">'.$this->l('There isn\'t any carrier available for a weight range.').'</div>'
'empty_message' => '<div style="margin:5px 0 10px 0">'.$this->l('There isn\'t any carrier available for this weight range.').'</div>'
),
array(
'type' => 'text',
@@ -119,9 +119,9 @@ class AdminRangeWeightControllerCore extends AdminController
if ($this->action == 'save' && Tools::getValue('delimiter1') >= Tools::getValue('delimiter2'))
$this->errors[] = Tools::displayError('Invalid range');
else if (!$id && RangeWeight::rangeExist((int)Tools::getValue('id_carrier'), (float)Tools::getValue('delimiter1'), (float)Tools::getValue('delimiter2')))
$this->errors[] = Tools::displayError('Range already exist');
$this->errors[] = Tools::displayError('Range already exists');
else if (!$id && RangeWeight::isOverlapping((int)Tools::getValue('id_carrier'), (float)Tools::getValue('delimiter1'), (float)Tools::getValue('delimiter2')))
$this->errors[] = Tools::displayError('Range is overlapping');
$this->errors[] = Tools::displayError('Ranges are overlapping');
else
parent::postProcess();
}