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

// Carrier association + discount association

Browse Source
This commit is contained in:
rMalie
2011-07-22 15:53:07 +00:00
parent 0652f0a5de
commit 0aba3ba000
12 changed files with 93 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Currency.php
+4 -4
View File
@@ -180,14 +180,14 @@ class CurrencyCore extends ObjectModel
*
* @return array Currencies
*/
static public function getCurrencies($object = false, $active = 1, Context $context = null)
static public function getCurrencies($object = false, $active = 1, Shop $shop = null)
{
if (!$context)
$context = Context::getContext();
if (!$shop)
$shop = new Shop(Context::getContext()->shop->getID(true));
$sql = 'SELECT *
FROM `'._DB_PREFIX_.'currency` c
'.$context->shop->sqlAsso('currency', 'c', false).'
'.$shop->sqlAsso('currency', 'c', false).'
WHERE `deleted` = 0'
.($active == 1 ? ' AND c.`active` = 1' : '').'
ORDER BY `name` ASC';