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

[-] BO : #PSFV-702 - "Ranges are overlapping" after modifying the default ones

Browse Source
This commit is contained in:
vAugagneur
2012-03-26 12:38:18 +00:00
parent 7efa883764
commit e09cd8c5d7
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/RangePrice.php
+7 -6
View File
@@ -77,14 +77,15 @@ class RangePriceCore extends ObjectModel
public static function isOverlapping($id_carrier, $delimiter1, $delimiter2)
{
return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
SELECT count(*)
return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('SELECT count(*)
FROM `'._DB_PREFIX_.'range_price`
WHERE `id_carrier` = '.(int)$id_carrier.'
AND (`delimiter1` BETWEEN '.(float)$delimiter1.' AND '.(float)$delimiter2.'
OR `delimiter2` BETWEEN '.(float)$delimiter1.' AND '.(float)$delimiter2.'
OR '.(float)$delimiter1.' BETWEEN `delimiter1` AND `delimiter1`
OR '.(float)$delimiter2.' BETWEEN `delimiter1` AND `delimiter1`)');
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`)
)');
}
/**
classes/RangeWeight.php
+6 -6
View File
@@ -77,14 +77,14 @@ class RangeWeightCore extends ObjectModel
public static function isOverlapping($id_carrier, $delimiter1, $delimiter2)
{
return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
SELECT count(*)
return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('SELECT count(*)
FROM `'._DB_PREFIX_.'range_weight`
WHERE `id_carrier` = '.(int)$id_carrier.'
AND (`delimiter1` BETWEEN '.(float)$delimiter1.' AND '.(float)$delimiter2.'
OR `delimiter2` BETWEEN '.(float)$delimiter1.' AND '.(float)$delimiter2.'
OR '.(float)$delimiter1.' BETWEEN `delimiter1` AND `delimiter1`
OR '.(float)$delimiter2.' BETWEEN `delimiter1` AND `delimiter1`)');
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`)
)');
}
/**