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

[-] BO : fixed bug #PSCFV-521 - range fix

Browse Source
This commit is contained in:
vAugagneur
2012-05-15 09:39:47 +00:00
parent 53504c37a3
commit 9d5f8b3fda
3 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminRangeWeightController.php
+13 -7
View File
@@ -115,13 +115,19 @@ class AdminRangeWeightControllerCore extends AdminController
public function postProcess()
{
$id = (int)Tools::getValue('id_'.$this->table);
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 exists');
else if (!$id && RangeWeight::isOverlapping((int)Tools::getValue('id_carrier'), (float)Tools::getValue('delimiter1'), (float)Tools::getValue('delimiter2')))
$this->errors[] = Tools::displayError('Ranges are overlapping');
$id = (int)Tools::getValue('id_'.$this->table);
if (Tools::getValue('submitAdd'.$this->table))
{
if (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 exists');
else if (RangeWeight::isOverlapping((int)Tools::getValue('id_carrier'), (float)Tools::getValue('delimiter1'), (float)Tools::getValue('delimiter2'), ($id ? (int)$id : null)))
$this->errors[] = Tools::displayError('Ranges are overlapping');
else if (!count($this->errors))
parent::postProcess();
}
else
parent::postProcess();
}