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

bug fix

Browse Source
This commit is contained in:
Etienne Roudeix
2013-09-10 19:13:28 +02:00
parent 8b209291d3
commit f70cecbbe9
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,6 @@ namespace Thelia\Core\Template\Loop;
use Propel\Runtime\ActiveQuery\Criteria; use Propel\Runtime\ActiveQuery\Criteria;
use Propel\Runtime\ActiveQuery\Join; use Propel\Runtime\ActiveQuery\Join;
use Propel\Runtime\Exception\PropelException;
use Thelia\Core\Template\Element\BaseI18nLoop; use Thelia\Core\Template\Element\BaseI18nLoop;
use Thelia\Core\Template\Element\LoopResult; use Thelia\Core\Template\Element\LoopResult;
use Thelia\Core\Template\Element\LoopResultRow; use Thelia\Core\Template\Element\LoopResultRow;
@@ -253,6 +252,11 @@ class Product extends BaseI18nLoop
$min_price = $this->getMin_price(); $min_price = $this->getMin_price();
if(null !== $min_price) { if(null !== $min_price) {
if(false === ConfigQuery::useTaxFreeAmounts()) {
// @todo
}
$isPSELeftJoinList[] = 'is_min_price'; $isPSELeftJoinList[] = 'is_min_price';
$isProductPriceFirstLeftJoin = array('is_min_price', 'min_price_data'); $isProductPriceFirstLeftJoin = array('is_min_price', 'min_price_data');
@@ -272,7 +276,6 @@ class Product extends BaseI18nLoop
$search->addJoinObject($minPriceJoinDefaultCurrency, 'is_min_price_join' . $defaultCurrencySuffix) $search->addJoinObject($minPriceJoinDefaultCurrency, 'is_min_price_join' . $defaultCurrencySuffix)
->addJoinCondition('is_min_price_join' . $defaultCurrencySuffix, '`min_price_data' . $defaultCurrencySuffix . '`.`currency_id` = ?', $defaultCurrency->getId(), null, \PDO::PARAM_INT); ->addJoinCondition('is_min_price_join' . $defaultCurrencySuffix, '`min_price_data' . $defaultCurrencySuffix . '`.`currency_id` = ?', $defaultCurrency->getId(), null, \PDO::PARAM_INT);
$MinPriceToCompareAsSQL = 'CASE WHEN `is_min_price`.PROMO=1 THEN `min_price_data' . $defaultCurrencySuffix . '`.PROMO_PRICE ELSE `min_price_data' . $defaultCurrencySuffix . '`.PRICE END';
/** /**
* In propel we trust : $currency->getRate() always returns a float. * In propel we trust : $currency->getRate() always returns a float.
* Or maybe not : rate value is checked as a float in overloaded getRate method. * Or maybe not : rate value is checked as a float in overloaded getRate method.

2
core/lib/Thelia/Model/Currency.php
View File

@@ -2,6 +2,7 @@
namespace Thelia\Model; namespace Thelia\Model;
use Propel\Runtime\Exception\PropelException;
use Thelia\Model\Base\Currency as BaseCurrency; use Thelia\Model\Base\Currency as BaseCurrency;
use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Event\TheliaEvents;
use Propel\Runtime\Connection\ConnectionInterface; use Propel\Runtime\Connection\ConnectionInterface;
@@ -85,6 +86,7 @@ class Currency extends BaseCurrency {
* Get the [rate] column value. * Get the [rate] column value.
* *
* @return double * @return double
* @throws PropelException
*/ */
public function getRate() public function getRate()
{ {