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

[-] BO : getCartsRuleByCode should be retrocompatible

Browse Source
This commit is contained in:
gRoussac
2013-11-22 11:40:47 +01:00
parent f7d4dc979f
commit dd79348748
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/CartRule.php
+3 -3
View File
@@ -1195,14 +1195,14 @@ class CartRuleCore extends ObjectModel
* @param $id_lang * @param $id_lang
* @return array * @return array
*/ */
public static function getCartsRuleByCode($name, $id_lang) public static function getCartsRuleByCode($name, $id_lang, $extended = false)
{ {
return Db::getInstance()->executeS(' return Db::getInstance()->executeS('
SELECT cr.*, crl.* SELECT cr.*, crl.*
FROM '._DB_PREFIX_.'cart_rule cr FROM '._DB_PREFIX_.'cart_rule cr
LEFT JOIN '._DB_PREFIX_.'cart_rule_lang crl ON (cr.id_cart_rule = crl.id_cart_rule AND crl.id_lang = '.(int)$id_lang.') LEFT JOIN '._DB_PREFIX_.'cart_rule_lang crl ON (cr.id_cart_rule = crl.id_cart_rule AND crl.id_lang = '.(int)$id_lang.')
WHERE code LIKE \'%'.pSQL($name).'%\' OR name LIKE \'%'.pSQL($name).'%\' WHERE code LIKE \'%'.pSQL($name).'%\''
'); .($extended ? ' OR name LIKE \'%'.pSQL($name).'%\'' : ''));
} }
} }
controllers/admin/AdminCartRulesController.php
+1 -1
View File
@@ -595,7 +595,7 @@ class AdminCartRulesControllerCore extends AdminController
public function displayAjaxSearchCartRuleVouchers() public function displayAjaxSearchCartRuleVouchers()
{ {
$found = false; $found = false;
if ($vouchers = CartRule::getCartsRuleByCode(Tools::getValue('q'), (int)$this->context->language->id)) if ($vouchers = CartRule::getCartsRuleByCode(Tools::getValue('q'), (int)$this->context->language->id, true))
$found = true; $found = true;
echo Tools::jsonEncode(array('found' => $found, 'vouchers' => $vouchers)); echo Tools::jsonEncode(array('found' => $found, 'vouchers' => $vouchers));
} }