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

Merge branch 'master' of github.com:thelia/thelia

Browse Source
This commit is contained in:
Manuel Raynaud
2013-09-17 19:12:14 +02:00
parent 60d09dc76e 9e927c40be
commit 9020de5b9a
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/lib/Thelia/Model/Product.php
View File

@@ -9,6 +9,7 @@ use Thelia\TaxEngine\Calculator;
use Propel\Runtime\Connection\ConnectionInterface; use Propel\Runtime\Connection\ConnectionInterface;
use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Event\TheliaEvents;
use Thelia\Core\Event\ProductEvent; use Thelia\Core\Event\ProductEvent;
use Propel\Runtime\ActiveQuery\Criteria;
class Product extends BaseProduct class Product extends BaseProduct
{ {
@@ -46,7 +47,7 @@ class Product extends BaseProduct
/** /**
* @return the current default category for this product * @return the current default category for this product
*/ */
public function getDefaultCategory() public function getDefaultCategoryId()
{ {
// Find default category // Find default category
$default_category = ProductCategoryQuery::create() $default_category = ProductCategoryQuery::create()
@@ -54,7 +55,7 @@ class Product extends BaseProduct
->filterByDefaultCategory(true) ->filterByDefaultCategory(true)
->findOne(); ->findOne();
return $default_category; return $default_category == null ? 0 : $default_category->getCategoryId();
} }
/** /**
@@ -88,15 +89,15 @@ class Product extends BaseProduct
*/ */
protected function addCriteriaToPositionQuery($query) protected function addCriteriaToPositionQuery($query)
{ {
// Retrourver les produits qui ont la même categorie par defaut // Find products in the same category
$produits = ProductCategoryQuery::create() $produits = ProductCategoryQuery::create()
->filterByCategory($this->getDefaultCategory()) ->filterByCategoryId($this->getDefaultCategoryId())
->filterByDefaultCategory(true) ->filterByDefaultCategory(true)
->select('product_id') ->select('product_id')
->find(); ->find();
// Filtrer la requete sur ces produits // Filtrer la requete sur ces produits
if ($produits != null) $query->filterById($produits); if ($produits != null) $query->filterById($produits, Criteria::IN);
} }
/** /**