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 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15306 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vAugagneur
2012-05-15 09:39:47 +00:00
parent fa1caba6e5
commit c9d6e1bcec
3 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/range/Range.php
+5 -4
View File
@@ -65,15 +65,16 @@ class RangeCore extends ObjectModel
AND `delimiter1` = '.(float)$delimiter1.' AND `delimiter2`='.(float)$delimiter2);
}
public static function isOverlapping($id_carrier, $delimiter1, $delimiter2)
public static function isOverlapping($id_carrier, $delimiter1, $delimiter2, $id_rang = null)
{
return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('SELECT count(*)
FROM `'._DB_PREFIX_.static::$range_table.'`
WHERE `id_carrier` = '.(int)$id_carrier.'
AND ((`delimiter1` > '.(float)$delimiter1.' AND `delimiter1` <= '.(float)$delimiter2.')
OR (`delimiter2` > '.(float)$delimiter1.' AND `delimiter2` <= '.(float)$delimiter2.')
AND ((`delimiter1` >= '.(float)$delimiter1.' AND `delimiter1` < '.(float)$delimiter2.')
OR (`delimiter2` > '.(float)$delimiter1.' AND `delimiter2` < '.(float)$delimiter2.')
OR ('.(float)$delimiter1.' > `delimiter1` AND '.(float)$delimiter1.' < `delimiter2`)
OR ('.(float)$delimiter2.' < `delimiter1` AND '.(float)$delimiter2.' > `delimiter2`)
)');
)
'.(!is_null($id_rang) ? ' AND `'.pSQL(static::$range_identifier).'` != '.(int)$id_rang : ''));
}
}