TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tax'

Browse Source 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
This commit is contained in:
Etienne Roudeix
2013-09-11 08:35:23 +02:00
parent 70d93d1daa a3bb124424
commit 0050d01278
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/lib/Thelia/Core/Template/Loop/Product.php
View File

@@ -84,6 +84,7 @@ class Product extends BaseI18nLoop
Argument::createBooleanTypeArgument('current_category'),
Argument::createIntTypeArgument('depth', 1),
Argument::createBooleanOrBothTypeArgument('visible', 1),
Argument::createIntTypeArgument('currency'),
new Argument(
'order',
new TypeCollection(
@@ -134,7 +135,16 @@ class Product extends BaseI18nLoop
*/
public function exec(&$pagination)
{
$currency = $this->request->getSession()->getCurrency();
$currencyId = $this->getCurrency();
if(null !== $currencyId) {
$currency = CurrencyQuery::create()->findOneById($currencyId);
if(null === $currency) {
throw new \InvalidArgumentException('Cannot found currency id: `' . $currency . '` in product_sale_elements loop');
}
} else {
$currency = $this->request->getSession()->getCurrency();
}
$defaultCurrency = CurrencyQuery::create()->findOneByByDefault(1);
$defaultCurrencySuffix = '_default_currency';