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

product loop

Browse Source
This commit is contained in:
Etienne Roudeix
2013-07-03 13:20:55 +02:00
parent 40f8c42fae
commit b4a2862131
7 changed files with 85 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/lib/Thelia/Model/CategoryQuery.php
View File

@@ -35,7 +35,7 @@ class CategoryQuery extends BaseCategoryQuery
*
* find all category children for a given category. an array of \Thelia\Model\Category is return
*
* @param $categoryId the category id
* @param $categoryId the category id or an array of id
* @param int $depth max depth you want to search
* @param int $currentPos don't change this param, it is used for recursion
* @return \Thelia\Model\Category[]
@@ -43,17 +43,25 @@ class CategoryQuery extends BaseCategoryQuery
public static function findAllChild($categoryId, $depth = 0, $currentPos = 0)
{
$result = array();
$currentPos++;
if($depth == $currentPos && $depth != 0) return;
if(is_array($categoryId)) {
foreach($categoryId as $categorySingleId) {
$result = array_merge($result, (array) self::findAllChild($categorySingleId, $depth, $currentPos));
}
} else {
$currentPos++;
$categories = self::create()
->filterByParent($categoryId)
->find();
if($depth == $currentPos && $depth != 0) return;
foreach ($categories as $category) {
array_push($result, $category);
$result = array_merge($result, (array) self::findAllChild($category->getId(), $depth, $currentPos));
$categories = self::create()
->filterByParent($categoryId)
->find();
foreach ($categories as $category) {
array_push($result, $category);
$result = array_merge($result, (array) self::findAllChild($category->getId(), $depth, $currentPos));
}
}
return $result;

4
core/lib/Thelia/Model/ProductPeer.php
View File

@@ -18,8 +18,4 @@ use Thelia\Model\om\BaseProductPeer;
*/
class ProductPeer extends BaseProductPeer
{
public static function getPriceDependingOnPromoExpression()
{
return 'IF(' . self::PROMO . '=1, ' . self::PRICE2 . ', ' . self::PRICE . ')';
}
}

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

@@ -18,15 +18,4 @@ use Thelia\Model\om\BaseProductQuery;
*/
class ProductQuery extends BaseProductQuery
{
public function filterByPriceDependingOnPromo($minPrice = null, $maxPrice = null)
{
if ($minPrice !== null) {
$this->where(ProductPeer::getPriceDependingOnPromoExpression() . ' ' . \Criteria::GREATER_EQUAL . ' ?', $minPrice);
}
if ($maxPrice !== null) {
$this->where(ProductPeer::getPriceDependingOnPromoExpression() . ' ' . \Criteria::LESS_EQUAL . ' ?', $maxPrice);
}
return $this;
}
}