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

Merge branch 'tax'

Browse Source
This commit is contained in:
Etienne Roudeix
2013-10-24 20:26:26 +02:00
parent 1f3315a3ec d8611c2965
commit a0b59c8549
8 changed files with 525 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
core/lib/Thelia/Core/Template/Element/BaseLoop.php
View File

@@ -23,12 +23,18 @@
namespace Thelia\Core\Template\Element;
use Propel\Runtime\ActiveQuery\Criteria;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Thelia\Core\Template\Element\Exception\SearchLoopException;
use Thelia\Core\Template\Loop\Argument\Argument;
use Propel\Runtime\ActiveQuery\ModelCriteria;
use Thelia\Core\Security\SecurityContext;
use Thelia\Type\AlphaNumStringListType;
use Thelia\Type\EnumListType;
use Thelia\Type\EnumType;
use Thelia\Type\TypeCollection;
/**
*
@@ -84,13 +90,43 @@ abstract class BaseLoop
*/
protected function getDefaultArgs()
{
return array(
Argument::createIntTypeArgument('offset', 0),
Argument::createIntTypeArgument('page'),
Argument::createIntTypeArgument('limit', PHP_INT_MAX),
$defaultArgs = array(
Argument::createBooleanTypeArgument('backend_context', false),
Argument::createBooleanTypeArgument('force_return', false),
);
if(true === $this->countable) {
$defaultArgs = array_merge($defaultArgs, array(
Argument::createIntTypeArgument('offset', 0),
Argument::createIntTypeArgument('page'),
Argument::createIntTypeArgument('limit', PHP_INT_MAX),
));
}
if($this instanceof SearchLoopInterface) {
$defaultArgs = array_merge($defaultArgs, array(
Argument::createAnyTypeArgument('search_term'),
new Argument(
'search_in',
new TypeCollection(
new EnumListType($this->getSearchIn())
)
),
new Argument(
'search_mode',
new TypeCollection(
new EnumType(array(
SearchLoopInterface::MODE_ANY_WORD,
SearchLoopInterface::MODE_SENTENCE,
SearchLoopInterface::MODE_STRICT_SENTENCE,
))
),
SearchLoopInterface::MODE_STRICT_SENTENCE
)
));
}
return $defaultArgs;
}
/**
@@ -205,6 +241,30 @@ abstract class BaseLoop
*/
protected function search(ModelCriteria $search, &$pagination = null)
{
if($this instanceof SearchLoopInterface) {
$searchTerm = $this->getSearch_term();
$searchIn = $this->getSearch_in();
$searchMode = $this->getSearch_mode();
if(null !== $searchTerm && null !== $searchIn) {
switch($searchMode) {
case SearchLoopInterface::MODE_ANY_WORD:
$searchCriteria = Criteria::IN;
$searchTerm = explode(' ', $searchTerm);
break;
case SearchLoopInterface::MODE_SENTENCE:
$searchCriteria = Criteria::LIKE;
$searchTerm = '%' . $searchTerm . '%';
break;
case SearchLoopInterface::MODE_STRICT_SENTENCE:
$searchCriteria = Criteria::EQUAL;
break;
}
$this->doSearch($search, $searchTerm, $searchIn, $searchCriteria);
}
}
if ($this->getArgValue('page') !== null) {
return $this->searchWithPagination($search, $pagination);
} else {

40
core/lib/Thelia/Core/Template/Element/Exception/SearchLoopException.php Normal file
View File

@@ -0,0 +1,40 @@
<?php
/*************************************************************************************/
/* */
/* Thelia */
/* */
/* Copyright (c) OpenStudio */
/* email : info@thelia.net */
/* web : http://www.thelia.net */
/* */
/* This program is free software; you can redistribute it and/or modify */
/* it under the terms of the GNU General Public License as published by */
/* the Free Software Foundation; either version 3 of the License */
/* */
/* This program is distributed in the hope that it will be useful, */
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
/* GNU General Public License for more details. */
/* */
/* You should have received a copy of the GNU General Public License */
/* along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* */
/*************************************************************************************/
namespace Thelia\Core\Template\Element\Exception;
class SearchLoopException extends \RuntimeException
{
const UNKNOWN_EXCEPTION = 0;
public function __construct($message, $code = null, $arguments = array(), $previous = null)
{
if (is_array($arguments)) {
$this->arguments = $arguments;
}
if ($code === null) {
$code = self::UNKNOWN_EXCEPTION;
}
parent::__construct($message, $code, $previous);
}
}

44
core/lib/Thelia/Core/Template/Element/SearchLoopInterface.php Normal file
View File

@@ -0,0 +1,44 @@
<?php
/*************************************************************************************/
/* */
/* Thelia */
/* */
/* Copyright (c) OpenStudio */
/* email : info@thelia.net */
/* web : http://www.thelia.net */
/* */
/* This program is free software; you can redistribute it and/or modify */
/* it under the terms of the GNU General Public License as published by */
/* the Free Software Foundation; either version 3 of the License */
/* */
/* This program is distributed in the hope that it will be useful, */
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
/* GNU General Public License for more details. */
/* */
/* You should have received a copy of the GNU General Public License */
/* along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* */
/*************************************************************************************/
namespace Thelia\Core\Template\Element;
use Symfony\Component\Validator\ExecutionContextInterface;
/**
*
* @author Etienne Roudeix <eroudeix@openstudio.fr>
*
*/
interface SearchLoopInterface
{
const MODE_ANY_WORD = 'any_word';
const MODE_SENTENCE = 'sentence';
const MODE_STRICT_SENTENCE = 'strict_sentence';
/**
* @return array of available field to search in
*/
public function getSearchIn();
public function doSearch(&$search, $searchTerm, $searchIn, $searchCriteria);
}

44
core/lib/Thelia/Core/Template/Loop/Customer.php
View File

@@ -28,6 +28,7 @@ use Thelia\Core\Template\Element\BaseLoop;
use Thelia\Core\Template\Element\LoopResult;
use Thelia\Core\Template\Element\LoopResultRow;
use Thelia\Core\Template\Element\SearchLoopInterface;
use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
use Thelia\Core\Template\Loop\Argument\Argument;
@@ -44,7 +45,7 @@ use Thelia\Type;
* @package Thelia\Core\Template\Loop
* @author Etienne Roudeix <eroudeix@openstudio.fr>
*/
class Customer extends BaseLoop
class Customer extends BaseLoop implements SearchLoopInterface
{
public $timestampable = true;
@@ -67,6 +68,47 @@ class Customer extends BaseLoop
);
}
public function getSearchIn()
{
return array(
"ref",
"firstname",
"lastname",
"email",
);
}
/**
* @param CustomerQuery $search
* @param $searchTerm
* @param $searchIn
* @param $searchCriteria
*/
public function doSearch(&$search, $searchTerm, $searchIn, $searchCriteria)
{
$search->_and();
foreach($searchIn as $index => $searchInElement) {
if($index > 0) {
$search->_or();
}
switch($searchInElement) {
case "ref":
$search->filterByRef($searchTerm, $searchCriteria);
break;
case "firstname":
$search->filterByFirstname($searchTerm, $searchCriteria);
break;
case "lastname":
$search->filterByLastname($searchTerm, $searchCriteria);
break;
case "email":
$search->filterByEmail($searchTerm, $searchCriteria);
break;
}
}
}
/**
* @param $pagination
*

60
core/lib/Thelia/Core/Template/Loop/Order.php
View File

@@ -28,8 +28,12 @@ use Thelia\Core\Template\Element\BaseLoop;
use Thelia\Core\Template\Element\LoopResult;
use Thelia\Core\Template\Element\LoopResultRow;
use Thelia\Core\Template\Element\SearchLoopInterface;
use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
use Thelia\Core\Template\Loop\Argument\Argument;
use Thelia\Model\CustomerQuery;
use Thelia\Model\OrderAddress;
use Thelia\Model\OrderAddressQuery;
use Thelia\Model\OrderQuery;
use Thelia\Type\TypeCollection;
use Thelia\Type;
@@ -38,8 +42,9 @@ use Thelia\Type;
* @package Thelia\Core\Template\Loop
*
* @author Franck Allimant <franck@cqfdev.fr>
* @author Etienne Roudeix <eroudeix@openstudio.fr>
*/
class Order extends BaseLoop
class Order extends BaseLoop implements SearchLoopInterface
{
public $countable = true;
public $timestampable = true;
@@ -74,6 +79,59 @@ class Order extends BaseLoop
);
}
public function getSearchIn()
{
return array(
"ref",
"customer_ref",
"customer_firstname",
"customer_lastname",
"customer_email",
);
}
/**
* @param OrderQuery $search
* @param $searchTerm
* @param $searchIn
* @param $searchCriteria
*/
public function doSearch(&$search, $searchTerm, $searchIn, $searchCriteria)
{
$search->_and();
foreach($searchIn as $index => $searchInElement) {
if($index > 0) {
$search->_or();
}
switch($searchInElement) {
case "ref":
$search->filterByRef($searchTerm, $searchCriteria);
break;
case "customer_ref":
$search->filterByCustomer(
CustomerQuery::create()->filterByRef($searchTerm, $searchCriteria)->find()
);
break;
case "customer_firstname":
$search->filterByOrderAddressRelatedByInvoiceOrderAddressId(
OrderAddressQuery::create()->filterByFirstname($searchTerm, $searchCriteria)->find()
);
break;
case "customer_lastname":
$search->filterByOrderAddressRelatedByInvoiceOrderAddressId(
OrderAddressQuery::create()->filterByLastname($searchTerm, $searchCriteria)->find()
);
break;
case "customer_email":
$search->filterByCustomer(
CustomerQuery::create()->filterByEmail($searchTerm, $searchCriteria)->find()
);
break;
}
}
}
/**
* @param $pagination
*

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

@@ -30,6 +30,7 @@ use Thelia\Core\Template\Element\BaseLoop;
use Thelia\Core\Template\Element\LoopResult;
use Thelia\Core\Template\Element\LoopResultRow;
use Thelia\Core\Template\Element\SearchLoopInterface;
use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
use Thelia\Core\Template\Loop\Argument\Argument;
@@ -53,7 +54,7 @@ use Thelia\Type;
* @package Thelia\Core\Template\Loop
* @author Etienne Roudeix <eroudeix@openstudio.fr>
*/
class Product extends BaseI18nLoop
class Product extends BaseI18nLoop implements SearchLoopInterface
{
public $timestampable = true;
public $versionable = true;
@@ -129,6 +130,39 @@ class Product extends BaseI18nLoop
);
}
public function getSearchIn()
{
return array(
"ref",
"title",
);
}
/**
* @param ProductQuery $search
* @param $searchTerm
* @param $searchIn
* @param $searchCriteria
*/
public function doSearch(&$search, $searchTerm, $searchIn, $searchCriteria)
{
$search->_and();
foreach($searchIn as $index => $searchInElement) {
if($index > 0) {
$search->_or();
}
switch($searchInElement) {
case "ref":
$search->filterByRef($searchTerm, $searchCriteria);
break;
case "title":
$search->where("CASE WHEN NOT ISNULL(`requested_locale_i18n`.ID) THEN `requested_locale_i18n`.`TITLE` ELSE `default_locale_i18n`.`TITLE` END ".$searchCriteria." ?", $searchTerm, \PDO::PARAM_STR);
break;
}
}
}
/**
* @param $pagination
*

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

@@ -2,6 +2,7 @@
namespace Thelia\Model;
use Propel\Runtime\ActiveQuery\Criteria;
use Propel\Runtime\Exception\PropelException;
use Propel\Runtime\Propel;
use Thelia\Model\Base\OrderQuery as BaseOrderQuery;
@@ -52,4 +53,5 @@ class OrderQuery extends BaseOrderQuery
return $obj;
}
} // OrderQuery