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

fix tests

Browse Source
This commit is contained in:
Etienne Roudeix
2013-09-11 08:33:25 +02:00
parent 990ab0e094
commit a3bb124424
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,6 +86,7 @@ class Product extends BaseI18nLoop
Argument::createBooleanTypeArgument('current_category'), Argument::createBooleanTypeArgument('current_category'),
Argument::createIntTypeArgument('depth', 1), Argument::createIntTypeArgument('depth', 1),
Argument::createBooleanOrBothTypeArgument('visible', 1), Argument::createBooleanOrBothTypeArgument('visible', 1),
Argument::createIntTypeArgument('currency'),
new Argument( new Argument(
'order', 'order',
new TypeCollection( new TypeCollection(
@@ -136,7 +137,16 @@ class Product extends BaseI18nLoop
*/ */
public function exec(&$pagination) 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); $defaultCurrency = CurrencyQuery::create()->findOneByByDefault(1);
$defaultCurrencySuffix = '_default_currency'; $defaultCurrencySuffix = '_default_currency';

3
core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
View File

@@ -82,6 +82,7 @@ class ProductSaleElements extends BaseLoop
* @param $pagination * @param $pagination
* *
* @return \Thelia\Core\Template\Element\LoopResult * @return \Thelia\Core\Template\Element\LoopResult
* @throws \InvalidArgumentException
*/ */
public function exec(&$pagination) public function exec(&$pagination)
{ {
@@ -115,7 +116,7 @@ class ProductSaleElements extends BaseLoop
} }
$currencyId = $this->getCurrency(); $currencyId = $this->getCurrency();
if(null !== $currency) { if(null !== $currencyId) {
$currency = CurrencyQuery::create()->findOneById($currencyId); $currency = CurrencyQuery::create()->findOneById($currencyId);
if(null === $currency) { if(null === $currency) {
throw new \InvalidArgumentException('Cannot found currency id: `' . $currency . '` in product_sale_elements loop'); throw new \InvalidArgumentException('Cannot found currency id: `' . $currency . '` in product_sale_elements loop');

4
templates/default_save/product.html
View File

@@ -6,7 +6,7 @@ Index : {navigate to="index"}<br />
{ifloop rel="product"} {ifloop rel="product"}
{loop type="product" name="product" current="true"} {loop type="product" name="product" current="true" min_price="50" max_price="100"}
<div style="border: dashed 2px red; padding: 20px; margin: 10px;"> <div style="border: dashed 2px red; padding: 20px; margin: 10px;">
<h2>PRODUCT ({$ID}) : {$REF}</h2> <h2>PRODUCT ({$ID}) : {$REF}</h2>
@@ -66,7 +66,7 @@ Index : {navigate to="index"}<br />
{$ATTRIBUTE_TITLE} = {$ATTRIBUTE_AVAILABILITY_TITLE}<br /> {$ATTRIBUTE_TITLE} = {$ATTRIBUTE_AVAILABILITY_TITLE}<br />
{/loop} {/loop}
<br />{$WEIGHT} g <br />{$WEIGHT} g
<br /><strong>{if $IS_PROMO == 1} {$PROMO_PRICE} {currency attr="symbol"} HT // TAX : {$PROMO_PRICE_TAX} ; {$TAXED_PROMO_PRICE} {currency attr="symbol"} TTC (instead of {$PRICE HT} // TAX : {$PRICE_TAX} ; {$TAXED_PRICE} {currency attr="symbol"} TTC){else} {$PRICE} {currency attr="symbol"} HT // TAX : {$PRICE_TAX} ; {$TAXED_PRICE} {currency attr="symbol"} TTC{/if}</strong> <br /><strong>{if $IS_PROMO == 1} {$PROMO_PRICE} {currency attr="symbol"} HT // TAX : {$PROMO_PRICE_TAX} ; {$TAXED_PROMO_PRICE} {currency attr="symbol"} TTC (instead of {$PRICE_HT} // TAX : {$PRICE_TAX} ; {$TAXED_PRICE} {currency attr="symbol"} TTC){else} {$PRICE} {currency attr="symbol"} HT // TAX : {$PRICE_TAX} ; {$TAXED_PRICE} {currency attr="symbol"} TTC{/if}</strong>
<br /><br /> <br /><br />
Add Add
<select> <select>