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

[-] BO : fixed #PSTEST-944 & #PSTEST-945 range bugs

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13857 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vAugagneur
2012-03-05 16:56:21 +00:00
parent 000e05602b
commit 5f0cd5ee54
5 changed files with 684 additions and 631 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminRangeWeightController.php
+5
View File
@@ -115,8 +115,13 @@ 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 exist');
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');
else
parent::postProcess();
}