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

Merge branch 'master' into template

Browse Source
This commit is contained in:
Manuel Raynaud
2013-09-09 19:24:01 +02:00
parent 82602622e3 b365443c22
commit f7abcf8756
95 changed files with 5240 additions and 4071 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/lib/Thelia/Config/Resources/config.xml
View File

@@ -149,11 +149,7 @@
<service id="smarty.plugin.thelialoop" class="Thelia\Core\Template\Smarty\Plugins\TheliaLoop" scope="request">
<tag name="thelia.parser.register_plugin"/>
<argument type="service" id="request" />
<argument type="service" id="event_dispatcher"/>
<argument type="service" id="thelia.securityContext"/>
<argument type="service" id="service_container" />
<call method="setLoopList">
<argument>%thelia.parser.loops%</argument>
</call>
@@ -219,26 +215,34 @@
<argument type="service" id="service_container" />
</service>
<service id="thelia.coupon.manager" class="Thelia\Coupon\CouponManager">
<argument type="service" id="thelia.adapter" />
<argument type="service" id="service_container" />
</service>
<service id="thelia.coupon.factory" class="Thelia\Coupon\CouponFactory">
<argument type="service" id="service_container" />
</service>
<service id="thelia.constraint.factory" class="Thelia\Constraint\ConstraintFactory">
<argument type="service" id="service_container" />
</service>
<service id="thelia.constraint.rule.available_for_everyone" class="Thelia\Constraint\Rule\AvailableForEveryoneManager">
<argument type="service" id="thelia.adapter" />
<tag name="thelia.coupon.addRule"/>
</service>
<service id="thelia.constraint.rule.available_for_x_articles" class="Thelia\Constraint\Rule\AvailableForXArticlesManager">
<argument type="service" id="thelia.translator" />
<argument type="service" id="thelia.adapter" />
<tag name="thelia.coupon.addRule"/>
</service>
<service id="thelia.constraint.rule.available_for_total_amount" class="Thelia\Constraint\Rule\AvailableForTotalAmountManager">
<argument type="service" id="thelia.translator" />
<argument type="service" id="thelia.adapter" />
<tag name="thelia.coupon.addRule"/>
</service>
<service id="thelia.coupon.type.remove_x_amount" class="Thelia\Coupon\Type\RemoveXAmount">
<argument type="service" id="thelia.translator" />
<service id="thelia.coupon.type.remove_x_amount" class="Thelia\Coupon\Type\RemoveXAmountManager">
<argument type="service" id="thelia.adapter" />
<tag name="thelia.coupon.addCoupon"/>
</service>
<service id="thelia.coupon.type.remove_x_percent" class="Thelia\Coupon\Type\RemoveXPercent">
<argument type="service" id="thelia.translator" />
<service id="thelia.coupon.type.remove_x_percent" class="Thelia\Coupon\Type\RemoveXPercentManager">
<argument type="service" id="thelia.adapter" />
<tag name="thelia.coupon.addCoupon"/>
</service>

135
core/lib/Thelia/Constraint/Rule/AvailableForEveryoneManager.php Normal file
View File

@@ -0,0 +1,135 @@
<?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\Constraint\Rule;
use InvalidArgumentException;
use Symfony\Component\Translation\Translator;
use Thelia\Constraint\ConstraintValidator;
use Thelia\Constraint\Validator\QuantityParam;
use Thelia\Constraint\Validator\RuleValidator;
use Thelia\Coupon\CouponAdapterInterface;
use Thelia\Exception\InvalidRuleException;
use Thelia\Exception\InvalidRuleValueException;
use Thelia\Type\FloatType;
/**
* Created by JetBrains PhpStorm.
* Date: 8/19/13
* Time: 3:24 PM
*
* Allow every one, perform no check
*
* @package Constraint
* @author Guillaume MOREL <gmorel@openstudio.fr>
*
*/
class AvailableForEveryoneManager extends CouponRuleAbstract
{
/** @var string Service Id from Resources/config.xml */
protected $serviceId = 'thelia.constraint.rule.available_for_everyone';
/** @var array Available Operators (Operators::CONST) */
protected $availableOperators = array();
/**
* Check validators relevancy and store them
*
* @param array $operators Operators the Admin set in BackOffice
* @param array $values Values the Admin set in BackOffice
*
* @throws \InvalidArgumentException
* @return $this
*/
public function setValidatorsFromForm(array $operators, array $values)
{
$this->setValidators();
return $this;
}
/**
* Check validators relevancy and store them
*
* @throws \InvalidArgumentException
* @return $this
*/
protected function setValidators()
{
$this->operators = array();
$this->values = array();
return $this;
}
/**
* Test if Customer meets conditions
*
* @return bool
*/
public function isMatching()
{
return true;
}
/**
* Get I18n name
*
* @return string
*/
public function getName()
{
return $this->translator->trans(
'Everybody can use it (no condition)',
array(),
'constraint'
);
}
/**
* Get I18n tooltip
*
* @return string
*/
public function getToolTip()
{
$toolTip = $this->translator->trans(
'Will return always true',
array(),
'constraint'
);
return $toolTip;
}
/**
* Generate inputs ready to be drawn
*
* @return array
*/
protected function generateInputs()
{
return array();
}
}

51
core/lib/Thelia/Constraint/Rule/AvailableForTotalAmountManager.php
View File

@@ -32,6 +32,8 @@ use Thelia\Constraint\Validator\RuleValidator;
use Thelia\Exception\InvalidRuleException;
use Thelia\Exception\InvalidRuleOperatorException;
use Thelia\Exception\InvalidRuleValueException;
use Thelia\Model\Currency;
use Thelia\Model\CurrencyQuery;
use Thelia\Type\FloatType;
/**
@@ -297,7 +299,7 @@ class AvailableForTotalAmountManager extends CouponRuleAbstract
*/
public function getName()
{
return $this->adapter->get('thelia.translator')->trans(
return $this->translator->trans(
'Cart total amount',
array(),
'constraint'
@@ -328,6 +330,53 @@ class AvailableForTotalAmountManager extends CouponRuleAbstract
return $toolTip;
}
/**
* Generate inputs ready to be drawn
*
* @return array
*/
protected function generateInputs()
{
$currencies = CurrencyQuery::create()->find();
$cleanedCurrencies = array();
/** @var Currency $currency */
foreach ($currencies as $currency) {
$cleanedCurrencies[$currency->getCode()] = $currency->getSymbol();
}
$name1 = $this->translator->trans(
'Price',
array(),
'constraint'
);
$name2 = $this->translator->trans(
'Currency',
array(),
'constraint'
);
return array(
self::INPUT1 => array(
'title' => $name1,
'availableOperators' => $this->availableOperators[self::INPUT1],
'availableValues' => '',
'type' => 'text',
'class' => 'form-control',
'value' => '',
'selectedOperator' => ''
),
self::INPUT2 => array(
'title' => $name2,
'availableOperators' => $this->availableOperators[self::INPUT2],
'availableValues' => $cleanedCurrencies,
'type' => 'select',
'class' => 'form-control',
'value' => '',
'selectedOperator' => Operators::EQUAL
)
);
}
// /**
// * Populate a Rule from a form admin
// *

25
core/lib/Thelia/Constraint/Rule/AvailableForXArticlesManager.php
View File

@@ -297,4 +297,29 @@ class AvailableForXArticlesManager extends CouponRuleAbstract
// return $this;
// }
/**
* Generate inputs ready to be drawn
*
* @return array
*/
protected function generateInputs()
{
$name1 = $this->translator->trans(
'Quantity',
array(),
'constraint'
);
return array(
self::INPUT1 => array(
'title' => $name1,
'availableOperators' => $this->availableOperators[self::INPUT1],
'type' => 'text',
'class' => 'form-control',
'value' => '',
'selectedOperator' => ''
)
);
}
}

32
core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php
View File

@@ -188,9 +188,35 @@ abstract class CouponRuleAbstract implements CouponRuleInterface
*/
public function getValidators()
{
return array(
$this->operators,
$this->values
$this->validators = $this->generateInputs();
$translatedInputs = array();
foreach ($this->validators as $key => $validator) {
$translatedOperators = array();
foreach ($validator['availableOperators'] as $availableOperators) {
$translatedOperators[$availableOperators] = Operators::getI18n(
$this->translator,
$availableOperators
);
}
$validator['availableOperators'] = $translatedOperators;
$translatedInputs[$key] = $validator;
}
return $translatedInputs;
}
/**
* Generate inputs ready to be drawn
*
* @throws \Thelia\Exception\NotImplementedException
* @return array
*/
protected function generateInputs()
{
throw new \Thelia\Exception\NotImplementedException(
'The generateInputs method must be implemented in ' . get_class()
);
}

2
core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php
View File

@@ -141,4 +141,6 @@ interface CouponRuleInterface
}

4
core/lib/Thelia/Constraint/Rule/Operators.php
View File

@@ -52,9 +52,9 @@ abstract class Operators
/** Param1 is different to Param2 */
CONST DIFFERENT = '!=';
/** Param1 is in Param2 */
CONST IN = 'in';
CONST IN = 'in';
/** Param1 is not in Param2 */
CONST OUT = 'out';
CONST OUT = 'out';
// /**
// * Check if a parameter is valid against a ComparableInterface from its operator

93
core/lib/Thelia/Controller/Admin/CouponController.php
View File

@@ -24,6 +24,7 @@
namespace Thelia\Controller\Admin;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Router;
use Thelia\Constraint\ConstraintFactory;
use Thelia\Constraint\ConstraintFactoryTest;
use Thelia\Constraint\Rule\AvailableForTotalAmount;
@@ -38,7 +39,9 @@ use Thelia\Core\Security\Exception\AuthenticationException;
use Thelia\Core\Security\Exception\AuthorizationException;
use Thelia\Core\Translation\Translator;
use Thelia\Coupon\CouponAdapterInterface;
use Thelia\Coupon\CouponManager;
use Thelia\Coupon\CouponRuleCollection;
use Thelia\Coupon\Type\CouponInterface;
use Thelia\Form\CouponCreationForm;
use Thelia\Form\Exception\FormValidationException;
use Thelia\Log\Tlog;
@@ -142,7 +145,7 @@ class CouponController extends BaseAdminController
$i18n = new I18n();
/** @var Lang $lang */
$lang = $this->getSession()->get('lang');
$lang = $this->getSession()->getLang();
$eventToDispatch = TheliaEvents::COUPON_UPDATE;
if ($this->getRequest()->isMethod('POST')) {
@@ -172,14 +175,16 @@ class CouponController extends BaseAdminController
'locale' => $coupon->getLocale(),
);
/** @var CouponAdapterInterface $adapter */
$adapter = $this->container->get('thelia.adapter');
/** @var Translator $translator */
$translator = $this->container->get('thelia.translator');
$args['rulesObject'] = array();
/** @var ConstraintFactory $constraintFactory */
$constraintFactory = $this->container->get('thelia.constraint.factory');
$rules = $constraintFactory->unserializeCouponRuleCollection(
$coupon->getSerializedRules()
);
/** @var CouponRuleInterface $rule */
foreach ($coupon->getRules()->getRules() as $rule) {
foreach ($rules as $rule) {
$args['rulesObject'][] = array(
'name' => $rule->getName(),
'tooltip' => $rule->getToolTip(),
@@ -194,6 +199,15 @@ class CouponController extends BaseAdminController
$this->getParserContext()->addForm($changeForm);
}
$args['availableCoupons'] = $this->getAvailableCoupons();
$args['availableRules'] = $this->getAvailableRules();
$args['urlAjaxGetRuleInput'] = $this->getRouteFromRouter(
'router.admin',
'admin.coupon.rule.input',
array('ruleId' => 'ruleId'),
Router::ABSOLUTE_URL
);
$args['formAction'] = 'admin/coupon/update/' . $couponId;
return $this->render(
@@ -316,7 +330,7 @@ class CouponController extends BaseAdminController
/**
* Manage Coupons read display
*
* @param int $couponId Coupon Id
* @param string $ruleId Rule service id
*
* @return \Symfony\Component\HttpFoundation\Response
*/
@@ -324,16 +338,21 @@ class CouponController extends BaseAdminController
{
$this->checkAuth('ADMIN', 'admin.coupon.read');
// @todo uncomment
// if (!$this->getRequest()->isXmlHttpRequest()) {
// $this->redirect('index');
// }
if (!$this->getRequest()->isXmlHttpRequest()) {
$this->redirect(
$this->getRoute(
'admin',
array(),
Router::ABSOLUTE_URL
)
);
}
/** @var ConstraintFactory $constraintFactory */
$constraintFactory = $this->container->get('thelia.constraint.factory');
$inputs = $constraintFactory->getInputs($ruleId);
if (!$inputs) {
if ($inputs === null) {
return $this->pageNotFound();
}
@@ -489,6 +508,52 @@ class CouponController extends BaseAdminController
return $this;
}
/**
* Get all available rules
*
* @return array
*/
protected function getAvailableRules()
{
/** @var CouponManager $couponManager */
$couponManager = $this->container->get('thelia.coupon.manager');
$availableRules = $couponManager->getAvailableRules();
$cleanedRules = array();
/** @var CouponRuleInterface $availableRule */
foreach ($availableRules as $availableRule) {
$rule = array();
$rule['serviceId'] = $availableRule->getServiceId();
$rule['name'] = $availableRule->getName();
$rule['toolTip'] = $availableRule->getToolTip();
$cleanedRules[] = $rule;
}
return $cleanedRules;
}
/**
* Get all available coupons
*
* @return array
*/
protected function getAvailableCoupons()
{
/** @var CouponManager $couponManager */
$couponManager = $this->container->get('thelia.coupon.manager');
$availableCoupons = $couponManager->getAvailableCoupons();
$cleanedRules = array();
/** @var CouponInterface $availableCoupon */
foreach ($availableCoupons as $availableCoupon) {
$rule = array();
$rule['serviceId'] = $availableCoupon->getServiceId();
$rule['name'] = $availableCoupon->getName();
$rule['toolTip'] = $availableCoupon->getToolTip();
$cleanedRules[] = $rule;
}
return $cleanedRules;
}
// /**
// * Validation Rule creation
// *
@@ -511,4 +576,6 @@ class CouponController extends BaseAdminController
// }
// }
}

4
core/lib/Thelia/Core/DependencyInjection/Compiler/RegisterRulePass.php
View File

@@ -55,11 +55,11 @@ class RegisterRulePass implements CompilerPassInterface
}
$couponManager = $container->getDefinition('thelia.coupon.manager');
$services = $container->findTaggedServiceIds("thelia.coupon.addCoupon");
$services = $container->findTaggedServiceIds("thelia.coupon.addRule");
foreach ($services as $id => $rule) {
$couponManager->addMethodCall(
'addAvailableCoupon',
'addAvailableRule',
array(
new Reference($id)
)

5
core/lib/Thelia/Core/Template/Element/BaseI18nLoop.php
View File

@@ -59,11 +59,12 @@ abstract class BaseI18nLoop extends BaseLoop
* @param array $columns the i18n columns
* @param string $foreignTable the specified table (default to criteria table)
* @param string $foreignKey the foreign key in this table (default to criteria table)
* @param bool $forceReturn
*
* @return mixed the locale
*/
protected function configureI18nProcessing(ModelCriteria $search, $columns = array('TITLE', 'CHAPO', 'DESCRIPTION', 'POSTSCRIPTUM'), $foreignTable = null, $foreignKey = 'ID', $forceReturn = false) {
protected function configureI18nProcessing(ModelCriteria $search, $columns = array('TITLE', 'CHAPO', 'DESCRIPTION', 'POSTSCRIPTUM'), $foreignTable = null, $foreignKey = 'ID', $forceReturn = false)
{
/* manage translations */
return ModelCriteriaTools::getI18n(
$this->getBackend_context(),

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

@@ -23,6 +23,7 @@
namespace Thelia\Core\Template\Element;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Thelia\Core\Template\Loop\Argument\Argument;
@@ -52,6 +53,9 @@ abstract class BaseLoop
*/
protected $securityContext;
/** @var ContainerInterface Service Container */
protected $container = null;
protected $args;
public $countable = true;
@@ -61,15 +65,15 @@ abstract class BaseLoop
/**
* Create a new Loop
*
* @param Request $request
* @param EventDispatcherInterface $dispatcher
* @param SecurityContext $securityContext
* @param ContainerInterface $container
*/
public function __construct(Request $request, EventDispatcherInterface $dispatcher, SecurityContext $securityContext)
public function __construct(ContainerInterface $container)
{
$this->request = $request;
$this->dispatcher = $dispatcher;
$this->securityContext = $securityContext;
$this->container = $container;
$this->request = $container->get('request');
$this->dispatcher = $container->get('event_dispatcher');
$this->securityContext = $container->get('thelia.securityContext');
$this->args = $this->getArgDefinitions()->addArguments($this->getDefaultArgs(), false);
}

2
core/lib/Thelia/Core/Template/Loop/Address.php
View File

@@ -87,7 +87,7 @@ class Address extends BaseLoop
$customer = $this->getCustomer();
if ($customer === 'current') {
$currentCustomer = $this->request->getSession()->getCustomerUser();
$currentCustomer = $this->securityContext->getCustomerUser();
if ($currentCustomer === null) {
return new LoopResult();
} else {

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

@@ -81,7 +81,7 @@ class Customer extends BaseLoop
$current = $this->getCurrent();
if ($current === true) {
$currentCustomer = $this->request->getSession()->getCustomerUser();
$currentCustomer = $this->securityContext->getCustomerUser();
if ($currentCustomer === null) {
return new LoopResult();
} else {

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

@@ -34,6 +34,7 @@ use Thelia\Core\Template\Loop\Argument\Argument;
use Thelia\Log\Tlog;
use Thelia\Model\CategoryQuery;
use Thelia\Model\CountryQuery;
use Thelia\Model\Map\FeatureProductTableMap;
use Thelia\Model\Map\ProductPriceTableMap;
use Thelia\Model\Map\ProductSaleElementsTableMap;
@@ -333,10 +334,10 @@ class Product extends BaseI18nLoop
foreach($isProductPriceLeftJoinList as $pSE => $isProductPriceLeftJoin) {
$booleanMatchedPriceList[] = 'CASE WHEN `' . $pSE . '`.PROMO=1 THEN `' . $isProductPriceLeftJoin . '`.PROMO_PRICE ELSE `' . $isProductPriceLeftJoin . '`.PRICE END';
}
$search->withColumn('MAX(' . implode(' OR ', $booleanMatchedPromoList) . ')', 'main_product_is_promo');
$search->withColumn('MAX(' . implode(' OR ', $booleanMatchedNewnessList) . ')', 'main_product_is_new');
$search->withColumn('MAX(' . implode(' OR ', $booleanMatchedPriceList) . ')', 'real_highest_price');
$search->withColumn('MIN(' . implode(' OR ', $booleanMatchedPriceList) . ')', 'real_lowest_price');
$search->withColumn('ROUND(MAX(' . implode(' OR ', $booleanMatchedPromoList) . '), 2)', 'main_product_is_promo');
$search->withColumn('ROUND(MAX(' . implode(' OR ', $booleanMatchedNewnessList) . '), 2)', 'main_product_is_new');
$search->withColumn('ROUND(MAX(' . implode(' OR ', $booleanMatchedPriceList) . '), 2)', 'real_highest_price');
$search->withColumn('ROUND(MIN(' . implode(' OR ', $booleanMatchedPriceList) . '), 2)', 'real_lowest_price');
$current = $this->getCurrent();
@@ -509,6 +510,12 @@ class Product extends BaseI18nLoop
foreach ($products as $product) {
$loopResultRow = new LoopResultRow($loopResult, $product, $this->versionable, $this->timestampable, $this->countable);
$price = $product->getRealLowestPrice();
$taxedPrice = $product->getTaxedPrice(
CountryQuery::create()->findOneById(64) // @TODO : make it magic
);
$loopResultRow->set("ID", $product->getId())
->set("REF",$product->getRef())
->set("IS_TRANSLATED",$product->getVirtualColumn('IS_TRANSLATED'))
@@ -518,7 +525,9 @@ class Product extends BaseI18nLoop
->set("DESCRIPTION", $product->getVirtualColumn('i18n_DESCRIPTION'))
->set("POSTSCRIPTUM", $product->getVirtualColumn('i18n_POSTSCRIPTUM'))
->set("URL", $product->getUrl($locale))
->set("BEST_PRICE", $product->getVirtualColumn('real_lowest_price'))
->set("BEST_PRICE", $price)
->set("BEST_PRICE_TAX", $taxedPrice - $price)
->set("BEST_TAXED_PRICE", $taxedPrice)
->set("IS_PROMO", $product->getVirtualColumn('main_product_is_promo'))
->set("IS_NEW", $product->getVirtualColumn('main_product_is_new'))
->set("POSITION", $product->getPosition())

18
core/lib/Thelia/Core/Template/Loop/ProductSaleElement.php → core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
View File

@@ -35,6 +35,7 @@ use Thelia\Log\Tlog;
use Thelia\Model\Base\ProductSaleElementsQuery;
use Thelia\Model\ConfigQuery;
use Thelia\Model\CountryQuery;
use Thelia\Type\TypeCollection;
use Thelia\Type;
@@ -124,6 +125,15 @@ class ProductSaleElements extends BaseLoop
foreach ($PSEValues as $PSEValue) {
$loopResultRow = new LoopResultRow($loopResult, $PSEValue, $this->versionable, $this->timestampable, $this->countable);
$price = $PSEValue->getPrice();
$taxedPrice = $PSEValue->getTaxedPrice(
CountryQuery::create()->findOneById(64) // @TODO : make it magic
);
$promoPrice = $PSEValue->getPromoPrice();
$taxedPromoPrice = $PSEValue->getTaxedPromoPrice(
CountryQuery::create()->findOneById(64) // @TODO : make it magic
);
$loopResultRow->set("ID", $PSEValue->getId())
->set("QUANTITY", $PSEValue->getQuantity())
->set("IS_PROMO", $PSEValue->getPromo() === 1 ? 1 : 0)
@@ -131,8 +141,12 @@ class ProductSaleElements extends BaseLoop
->set("WEIGHT", $PSEValue->getWeight())
->set("CURRENCY", $PSEValue->getVirtualColumn('price_CURRENCY_ID'))
->set("PRICE", $PSEValue->getVirtualColumn('price_PRICE'))
->set("PROMO_PRICE", $PSEValue->getVirtualColumn('price_PROMO_PRICE'));
->set("PRICE", $price)
->set("PRICE_TAX", $taxedPrice - $price)
->set("TAXED_PRICE", $taxedPrice)
->set("PROMO_PRICE", $promoPrice)
->set("PROMO_PRICE_TAX", $taxedPromoPrice - $promoPrice)
->set("TAXED_PROMO_PRICE", $taxedPromoPrice);
$loopResult->addRow($loopResultRow);
}

21
core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
View File

@@ -23,6 +23,7 @@
namespace Thelia\Core\Template\Smarty\Plugins;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Thelia\Core\Template\Element\BaseLoop;
use Thelia\Core\Template\Smarty\AbstractSmartyPlugin;
use Thelia\Core\Template\Smarty\SmartyPluginDescriptor;
@@ -44,14 +45,22 @@ class TheliaLoop extends AbstractSmartyPlugin
protected $dispatcher;
protected $securityContext;
/** @var ContainerInterface Service Container */
protected $container = null;
protected $loopstack = array();
protected $varstack = array();
public function __construct(Request $request, EventDispatcherInterface $dispatcher, SecurityContext $securityContext)
/**
* @param ContainerInterface $container
*/
public function __construct(ContainerInterface $container)
{
$this->request = $request;
$this->dispatcher = $dispatcher;
$this->securityContext = $securityContext;
$this->container = $container;
$this->request = $container->get('request');
$this->dispatcher = $container->get('event_dispatcher');
$this->securityContext = $container->get('thelia.securityContext');
}
/**
@@ -315,9 +324,7 @@ class TheliaLoop extends AbstractSmartyPlugin
}
$loop = $class->newInstance(
$this->request,
$this->dispatcher,
$this->securityContext
$this->container
);
$loop->initializeArgs($smartyParams);

2
core/lib/Thelia/Coupon/CouponBaseAdapter.php
View File

@@ -147,7 +147,7 @@ class CouponBaseAdapter implements CouponAdapterInterface
*/
public function getCurrentCoupons()
{
$couponFactory = new CouponFactory($this);
$couponFactory = $this->container->get('thelia.coupon.factory');
// @todo Get from Session
$couponCodes = array('XMAS', 'SPRINGBREAK');

34
core/lib/Thelia/Coupon/CouponFactory.php
View File

@@ -23,7 +23,9 @@
namespace Thelia\Coupon;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\Translation\Exception\NotFoundResourceException;
use Thelia\Constraint\ConstraintFactory;
use Thelia\Constraint\Rule\CouponRuleInterface;
use Thelia\Coupon\Type\CouponInterface;
use Thelia\Exception\CouponExpiredException;
@@ -44,17 +46,21 @@ use Symfony\Component\Serializer\Encoder\JsonEncoder;
*/
class CouponFactory
{
/** @var ContainerInterface Service Container */
protected $container = null;
/** @var CouponAdapterInterface Provide necessary value from Thelia*/
protected $adapter;
/**
* Constructor
*
* @param CouponAdapterInterface $adapter Provide necessary value from Thelia
* @param ContainerInterface $container Service container
*/
function __construct(CouponAdapterInterface $adapter)
function __construct(ContainerInterface $container)
{
$this->adapter = $adapter;
$this->container = $container;
$this->adapter = $container->get('thelia.adapter');
}
/**
@@ -102,10 +108,15 @@ class CouponFactory
{
$isCumulative = ($model->getIsCumulative() == 1 ? true : false);
$isRemovingPostage = ($model->getIsRemovingPostage() == 1 ? true : false);
$couponClass = $model->getType();
/** @var CouponInterface $coupon*/
$coupon = new $couponClass(
if (!$this->container->has($model->getType())) {
return false;
}
/** @var CouponInterface $couponManager*/
$couponManager = $this->container->get($model->getType());
$couponManager->set(
$this->adapter,
$model->getCode(),
$model->getTitle(),
$model->getShortDescription(),
@@ -119,12 +130,15 @@ class CouponFactory
$model->getExpirationDate()
);
/** @var CouponRuleCollection $rules */
$rules = unserialize(base64_decode($model->getSerializedRules()));
/** @var ConstraintFactory $constraintFactory */
$constraintFactory = $this->container->get('thelia.constraint.factory');
$rules = $constraintFactory->unserializeCouponRuleCollection(
$model->getSerializedRules()
);
$coupon->setRules($rules);
$couponManager->setRules($rules);
return $coupon;
return $couponManager;
}

46
core/lib/Thelia/Coupon/CouponManager.php
View File

@@ -49,6 +49,12 @@ class CouponManager
/** @var array CouponInterface to process*/
protected $coupons = array();
/** @var array Available Coupons (Services) */
protected $availableCoupons = array();
/** @var array Available Rules (Services) */
protected $availableRules = array();
/**
* Constructor
*
@@ -208,4 +214,44 @@ class CouponManager
return $rule;
}
/**
* Add an available CouponManager (Services)
*
* @param CouponInterface $coupon CouponManager
*/
public function addAvailableCoupon(CouponInterface $coupon)
{
$this->availableCoupons[] = $coupon;
}
/**
* Get all available CouponManagers (Services)
*
* @return array
*/
public function getAvailableCoupons()
{
return $this->availableCoupons;
}
/**
* Add an available ConstraintManager (Services)
*
* @param CouponRuleInterface $rule CouponRuleInterface
*/
public function addAvailableRule(CouponRuleInterface $rule)
{
$this->availableRules[] = $rule;
}
/**
* Get all available ConstraintManagers (Services)
*
* @return array
*/
public function getAvailableRules()
{
return $this->availableRules;
}
}

2
core/lib/Thelia/Coupon/CouponRuleCollection.php
View File

@@ -82,7 +82,7 @@ class CouponRuleCollection
*/
public function isEmpty()
{
return isEmpty($this->rules);
return (empty($this->rules));
}
/**

48
core/lib/Thelia/Coupon/Type/CouponAbstract.php
View File

@@ -25,6 +25,7 @@ namespace Thelia\Coupon\Type;
use Symfony\Component\Intl\Exception\NotImplementedException;
use Thelia\Constraint\ConstraintManager;
use Thelia\Constraint\ConstraintValidator;
use Thelia\Coupon\CouponAdapterInterface;
use Thelia\Coupon\CouponRuleCollection;
use Thelia\Coupon\RuleOrganizerInterface;
@@ -43,17 +44,23 @@ use Thelia\Exception\InvalidRuleException;
*/
abstract class CouponAbstract implements CouponInterface
{
/** @var CouponAdapterInterface Provides necessary value from Thelia */
/** @var string Service Id */
protected $serviceId = null;
/** @var CouponAdapterInterface Provide necessary value from Thelia */
protected $adapter = null;
/** @var Translator Service Translator */
protected $translator = null;
/** @var RuleOrganizerInterface */
protected $organizer = null;
/** @var CouponRuleCollection Array of CouponRuleInterface */
protected $rules = null;
/** @var ConstraintManager CouponRuleInterface Manager*/
protected $constraintManager = null;
/** @var ConstraintValidator Constraint validator */
protected $constraintValidator = null;
/** @var string Coupon code (ex: XMAS) */
protected $code = null;
@@ -88,6 +95,18 @@ abstract class CouponAbstract implements CouponInterface
/** @var bool if Coupon is available for Products already on special offers */
protected $isAvailableOnSpecialOffers = false;
/**
* Constructor
*
* @param CouponAdapterInterface $adapter Service adapter
*/
function __construct(CouponAdapterInterface $adapter)
{
$this->adapter = $adapter;
$this->translator = $adapter->getTranslator();
}
/**
* Set Rule Organizer
*
@@ -197,10 +216,6 @@ abstract class CouponAbstract implements CouponInterface
public function setRules(CouponRuleCollection $rules)
{
$this->rules = $rules;
$this->constraintManager = new ConstraintManager(
$this->adapter,
$this->rules
);
return $this;
}
@@ -209,14 +224,11 @@ abstract class CouponAbstract implements CouponInterface
* Check if the current Coupon is matching its conditions (Rules)
* Thelia variables are given by the CouponAdapterInterface
*
* @param CouponAdapterInterface $adapter allowing to gather
* all necessary Thelia variables
*
* @return bool
*/
public function isMatching(CouponAdapterInterface $adapter)
public function isMatching()
{
return $this->constraintManager->isMatching();
return $this->constraintValidator->test($this->rules);
}
/**
@@ -278,4 +290,16 @@ abstract class CouponAbstract implements CouponInterface
return $ret;
}
/**
* Get Coupon Manager service Id
*
* @return string
*/
public function getServiceId()
{
return $this->serviceId;
}
}

43
core/lib/Thelia/Coupon/Type/CouponInterface.php
View File

@@ -39,6 +39,37 @@ use Thelia\Coupon\CouponRuleCollection;
*/
interface CouponInterface
{
/**
* Set Coupon
*
* @param CouponInterface $adapter Provides necessary value from Thelia
* @param string $code Coupon code (ex: XMAS)
* @param string $title Coupon title (ex: Coupon for XMAS)
* @param string $shortDescription Coupon short description
* @param string $description Coupon description
* @param float $effect Coupon amount/percentage to deduce
* @param bool $isCumulative If Coupon is cumulative
* @param bool $isRemovingPostage If Coupon is removing postage
* @param bool $isAvailableOnSpecialOffers If available on Product already
* on special offer price
* @param bool $isEnabled False if Coupon is disabled by admin
* @param int $maxUsage How many usage left
* @param \Datetime $expirationDate When the Code is expiring
*/
public function set(
$adapter,
$code,
$title,
$shortDescription,
$description,
$effect,
$isCumulative,
$isRemovingPostage,
$isAvailableOnSpecialOffers,
$isEnabled,
$maxUsage,
\DateTime $expirationDate);
/**
* Return Coupon code (ex: XMAS)
*
@@ -107,12 +138,9 @@ interface CouponInterface
* Check if the current Coupon is matching its conditions (Rules)
* Thelia variables are given by the CouponAdapterInterface
*
* @param CouponAdapterInterface $adapter allowing to gather
* all necessary Thelia variables
*
* @return bool
*/
public function isMatching(CouponAdapterInterface $adapter);
public function isMatching();
/**
* Replace the existing Rules by those given in parameter
@@ -177,4 +205,11 @@ interface CouponInterface
*/
public function getToolTip();
/**
* Get Coupon Manager service Id
*
* @return string
*/
public function getServiceId();
}

13
core/lib/Thelia/Coupon/Type/RemoveXAmount.php → core/lib/Thelia/Coupon/Type/RemoveXAmountManager.php
View File

@@ -37,10 +37,13 @@ use Thelia\Coupon\Type\CouponAbstract;
* @author Guillaume MOREL <gmorel@openstudio.fr>
*
*/
class RemoveXAmount extends CouponAbstract
class RemoveXAmountManager extends CouponAbstract
{
/** @var string Service Id */
protected $serviceId = 'thelia.coupon.type.remove_x_amount';
/**
* Constructor
* Set Coupon
*
* @param CouponInterface $adapter Provides necessary value from Thelia
* @param string $code Coupon code (ex: XMAS)
@@ -56,7 +59,7 @@ class RemoveXAmount extends CouponAbstract
* @param int $maxUsage How many usage left
* @param \Datetime $expirationDate When the Code is expiring
*/
function __construct(
public function set(
$adapter,
$code,
$title,
@@ -97,7 +100,7 @@ class RemoveXAmount extends CouponAbstract
{
return $this->adapter
->getTranslator()
->trans('Remove X amount to total cart', null, 'constraint');
->trans('Remove X amount to total cart', array(), 'constraint');
}
/**
@@ -111,7 +114,7 @@ class RemoveXAmount extends CouponAbstract
->getTranslator()
->trans(
'This coupon will remove the entered amount to the customer total checkout. If the discount is superior to the total checkout price the customer will only pay the postage. Unless if the coupon is set to remove postage too.',
null,
array(),
'constraint'
);

13
core/lib/Thelia/Coupon/Type/RemoveXPercent.php → core/lib/Thelia/Coupon/Type/RemoveXPercentManager.php
View File

@@ -36,12 +36,15 @@ use Thelia\Exception\MissingAdapterException;
* @author Guillaume MOREL <gmorel@openstudio.fr>
*
*/
class RemoveXPercent extends CouponAbstract
class RemoveXPercentManager extends CouponAbstract
{
/** @var string Service Id */
protected $serviceId = 'thelia.coupon.type.remove_x_percent';
protected $percent = 0;
/**
* Constructor
* Set Coupon
*
* @param CouponInterface $adapter Provides necessary value from Thelia
* @param string $code Coupon code (ex: XMAS)
@@ -57,7 +60,7 @@ class RemoveXPercent extends CouponAbstract
* @param int $maxUsage How many usage left
* @param \Datetime $expirationDate When the Code is expiring
*/
function __construct(
public function set(
$adapter,
$code,
$title,
@@ -119,7 +122,7 @@ class RemoveXPercent extends CouponAbstract
{
return $this->adapter
->getTranslator()
->trans('Remove X percent to total cart', null, 'constraint');
->trans('Remove X percent to total cart', array(), 'constraint');
}
/**
@@ -133,7 +136,7 @@ class RemoveXPercent extends CouponAbstract
->getTranslator()
->trans(
'This coupon will remove the entered percentage to the customer total checkout. If the discount is superior to the total checkout price the customer will only pay the postage. Unless if the coupon is set to remove postage too.',
null,
array(),
'constraint'
);

44
core/lib/Thelia/Exception/TaxEngineException.php Executable 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\Exception;
use Thelia\Log\Tlog;
class TaxEngineException extends \RuntimeException
{
const UNKNOWN_EXCEPTION = 0;
const UNDEFINED_PRODUCT = 501;
const UNDEFINED_COUNTRY = 502;
const UNDEFINED_TAX_RULES_COLLECTION = 503;
const BAD_AMOUNT_FORMAT = 601;
public function __construct($message, $code = null, $previous = null) {
if($code === null) {
$code = self::UNKNOWN_EXCEPTION;
}
parent::__construct($message, $code, $previous);
}
}

7
core/lib/Thelia/Model/Base/Country.php
View File

@@ -1631,7 +1631,10 @@ abstract class Country implements ActiveRecordInterface
$taxRuleCountriesToDelete = $this->getTaxRuleCountries(new Criteria(), $con)->diff($taxRuleCountries);
$this->taxRuleCountriesScheduledForDeletion = $taxRuleCountriesToDelete;
//since at least one column in the foreign key is at the same time a PK
//we can not just set a PK to NULL in the lines below. We have to store
//a backup of all values, so we are able to manipulate these items based on the onDelete value later.
$this->taxRuleCountriesScheduledForDeletion = clone $taxRuleCountriesToDelete;
foreach ($taxRuleCountriesToDelete as $taxRuleCountryRemoved) {
$taxRuleCountryRemoved->setCountry(null);
@@ -1724,7 +1727,7 @@ abstract class Country implements ActiveRecordInterface
$this->taxRuleCountriesScheduledForDeletion = clone $this->collTaxRuleCountries;
$this->taxRuleCountriesScheduledForDeletion->clear();
}
$this->taxRuleCountriesScheduledForDeletion[]= $taxRuleCountry;
$this->taxRuleCountriesScheduledForDeletion[]= clone $taxRuleCountry;
$taxRuleCountry->setCountry(null);
}

4
core/lib/Thelia/Model/Base/CountryQuery.php
View File

@@ -616,7 +616,7 @@ abstract class CountryQuery extends ModelCriteria
*
* @return ChildCountryQuery The current query, for fluid interface
*/
public function joinTaxRuleCountry($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
public function joinTaxRuleCountry($relationAlias = null, $joinType = Criteria::INNER_JOIN)
{
$tableMap = $this->getTableMap();
$relationMap = $tableMap->getRelation('TaxRuleCountry');
@@ -651,7 +651,7 @@ abstract class CountryQuery extends ModelCriteria
*
* @return \Thelia\Model\TaxRuleCountryQuery A secondary query class using the current class as primary query
*/
public function useTaxRuleCountryQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
public function useTaxRuleCountryQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
{
return $this
->joinTaxRuleCountry($relationAlias, $joinType)

14
core/lib/Thelia/Model/Base/Tax.php
View File

@@ -791,10 +791,9 @@ abstract class Tax implements ActiveRecordInterface
if ($this->taxRuleCountriesScheduledForDeletion !== null) {
if (!$this->taxRuleCountriesScheduledForDeletion->isEmpty()) {
foreach ($this->taxRuleCountriesScheduledForDeletion as $taxRuleCountry) {
// need to save related object because we set the relation to null
$taxRuleCountry->save($con);
}
\Thelia\Model\TaxRuleCountryQuery::create()
->filterByPrimaryKeys($this->taxRuleCountriesScheduledForDeletion->getPrimaryKeys(false))
->delete($con);
$this->taxRuleCountriesScheduledForDeletion = null;
}
}
@@ -1346,7 +1345,10 @@ abstract class Tax implements ActiveRecordInterface
$taxRuleCountriesToDelete = $this->getTaxRuleCountries(new Criteria(), $con)->diff($taxRuleCountries);
$this->taxRuleCountriesScheduledForDeletion = $taxRuleCountriesToDelete;
//since at least one column in the foreign key is at the same time a PK
//we can not just set a PK to NULL in the lines below. We have to store
//a backup of all values, so we are able to manipulate these items based on the onDelete value later.
$this->taxRuleCountriesScheduledForDeletion = clone $taxRuleCountriesToDelete;
foreach ($taxRuleCountriesToDelete as $taxRuleCountryRemoved) {
$taxRuleCountryRemoved->setTax(null);
@@ -1439,7 +1441,7 @@ abstract class Tax implements ActiveRecordInterface
$this->taxRuleCountriesScheduledForDeletion = clone $this->collTaxRuleCountries;
$this->taxRuleCountriesScheduledForDeletion->clear();
}
$this->taxRuleCountriesScheduledForDeletion[]= $taxRuleCountry;
$this->taxRuleCountriesScheduledForDeletion[]= clone $taxRuleCountry;
$taxRuleCountry->setTax(null);
}

4
core/lib/Thelia/Model/Base/TaxQuery.php
View File

@@ -432,7 +432,7 @@ abstract class TaxQuery extends ModelCriteria
*
* @return ChildTaxQuery The current query, for fluid interface
*/
public function joinTaxRuleCountry($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
public function joinTaxRuleCountry($relationAlias = null, $joinType = Criteria::INNER_JOIN)
{
$tableMap = $this->getTableMap();
$relationMap = $tableMap->getRelation('TaxRuleCountry');
@@ -467,7 +467,7 @@ abstract class TaxQuery extends ModelCriteria
*
* @return \Thelia\Model\TaxRuleCountryQuery A secondary query class using the current class as primary query
*/
public function useTaxRuleCountryQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
public function useTaxRuleCountryQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
{
return $this
->joinTaxRuleCountry($relationAlias, $joinType)

247
core/lib/Thelia/Model/Base/TaxRule.php
View File

@@ -67,24 +67,6 @@ abstract class TaxRule implements ActiveRecordInterface
*/
protected $id;
/**
* The value for the code field.
* @var string
*/
protected $code;
/**
* The value for the title field.
* @var string
*/
protected $title;
/**
* The value for the description field.
* @var string
*/
protected $description;
/**
* The value for the created_at field.
* @var string
@@ -420,39 +402,6 @@ abstract class TaxRule implements ActiveRecordInterface
return $this->id;
}
/**
* Get the [code] column value.
*
* @return string
*/
public function getCode()
{
return $this->code;
}
/**
* Get the [title] column value.
*
* @return string
*/
public function getTitle()
{
return $this->title;
}
/**
* Get the [description] column value.
*
* @return string
*/
public function getDescription()
{
return $this->description;
}
/**
* Get the [optionally formatted] temporal [created_at] column value.
*
@@ -514,69 +463,6 @@ abstract class TaxRule implements ActiveRecordInterface
return $this;
} // setId()
/**
* Set the value of [code] column.
*
* @param string $v new value
* @return \Thelia\Model\TaxRule The current object (for fluent API support)
*/
public function setCode($v)
{
if ($v !== null) {
$v = (string) $v;
}
if ($this->code !== $v) {
$this->code = $v;
$this->modifiedColumns[] = TaxRuleTableMap::CODE;
}
return $this;
} // setCode()
/**
* Set the value of [title] column.
*
* @param string $v new value
* @return \Thelia\Model\TaxRule The current object (for fluent API support)
*/
public function setTitle($v)
{
if ($v !== null) {
$v = (string) $v;
}
if ($this->title !== $v) {
$this->title = $v;
$this->modifiedColumns[] = TaxRuleTableMap::TITLE;
}
return $this;
} // setTitle()
/**
* Set the value of [description] column.
*
* @param string $v new value
* @return \Thelia\Model\TaxRule The current object (for fluent API support)
*/
public function setDescription($v)
{
if ($v !== null) {
$v = (string) $v;
}
if ($this->description !== $v) {
$this->description = $v;
$this->modifiedColumns[] = TaxRuleTableMap::DESCRIPTION;
}
return $this;
} // setDescription()
/**
* Sets the value of [created_at] column to a normalized version of the date/time value specified.
*
@@ -659,22 +545,13 @@ abstract class TaxRule implements ActiveRecordInterface
$col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : TaxRuleTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
$this->id = (null !== $col) ? (int) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : TaxRuleTableMap::translateFieldName('Code', TableMap::TYPE_PHPNAME, $indexType)];
$this->code = (null !== $col) ? (string) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : TaxRuleTableMap::translateFieldName('Title', TableMap::TYPE_PHPNAME, $indexType)];
$this->title = (null !== $col) ? (string) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : TaxRuleTableMap::translateFieldName('Description', TableMap::TYPE_PHPNAME, $indexType)];
$this->description = (null !== $col) ? (string) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : TaxRuleTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
$col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : TaxRuleTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
if ($col === '0000-00-00 00:00:00') {
$col = null;
}
$this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : TaxRuleTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
$col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : TaxRuleTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
if ($col === '0000-00-00 00:00:00') {
$col = null;
}
@@ -687,7 +564,7 @@ abstract class TaxRule implements ActiveRecordInterface
$this->ensureConsistency();
}
return $startcol + 6; // 6 = TaxRuleTableMap::NUM_HYDRATE_COLUMNS.
return $startcol + 3; // 3 = TaxRuleTableMap::NUM_HYDRATE_COLUMNS.
} catch (Exception $e) {
throw new PropelException("Error populating \Thelia\Model\TaxRule object", 0, $e);
@@ -968,15 +845,6 @@ abstract class TaxRule implements ActiveRecordInterface
if ($this->isColumnModified(TaxRuleTableMap::ID)) {
$modifiedColumns[':p' . $index++] = 'ID';
}
if ($this->isColumnModified(TaxRuleTableMap::CODE)) {
$modifiedColumns[':p' . $index++] = 'CODE';
}
if ($this->isColumnModified(TaxRuleTableMap::TITLE)) {
$modifiedColumns[':p' . $index++] = 'TITLE';
}
if ($this->isColumnModified(TaxRuleTableMap::DESCRIPTION)) {
$modifiedColumns[':p' . $index++] = 'DESCRIPTION';
}
if ($this->isColumnModified(TaxRuleTableMap::CREATED_AT)) {
$modifiedColumns[':p' . $index++] = 'CREATED_AT';
}
@@ -997,15 +865,6 @@ abstract class TaxRule implements ActiveRecordInterface
case 'ID':
$stmt->bindValue($identifier, $this->id, PDO::PARAM_INT);
break;
case 'CODE':
$stmt->bindValue($identifier, $this->code, PDO::PARAM_STR);
break;
case 'TITLE':
$stmt->bindValue($identifier, $this->title, PDO::PARAM_STR);
break;
case 'DESCRIPTION':
$stmt->bindValue($identifier, $this->description, PDO::PARAM_STR);
break;
case 'CREATED_AT':
$stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR);
break;
@@ -1078,18 +937,9 @@ abstract class TaxRule implements ActiveRecordInterface
return $this->getId();
break;
case 1:
return $this->getCode();
break;
case 2:
return $this->getTitle();
break;
case 3:
return $this->getDescription();
break;
case 4:
return $this->getCreatedAt();
break;
case 5:
case 2:
return $this->getUpdatedAt();
break;
default:
@@ -1122,11 +972,8 @@ abstract class TaxRule implements ActiveRecordInterface
$keys = TaxRuleTableMap::getFieldNames($keyType);
$result = array(
$keys[0] => $this->getId(),
$keys[1] => $this->getCode(),
$keys[2] => $this->getTitle(),
$keys[3] => $this->getDescription(),
$keys[4] => $this->getCreatedAt(),
$keys[5] => $this->getUpdatedAt(),
$keys[1] => $this->getCreatedAt(),
$keys[2] => $this->getUpdatedAt(),
);
$virtualColumns = $this->virtualColumns;
foreach($virtualColumns as $key => $virtualColumn)
@@ -1182,18 +1029,9 @@ abstract class TaxRule implements ActiveRecordInterface
$this->setId($value);
break;
case 1:
$this->setCode($value);
break;
case 2:
$this->setTitle($value);
break;
case 3:
$this->setDescription($value);
break;
case 4:
$this->setCreatedAt($value);
break;
case 5:
case 2:
$this->setUpdatedAt($value);
break;
} // switch()
@@ -1221,11 +1059,8 @@ abstract class TaxRule implements ActiveRecordInterface
$keys = TaxRuleTableMap::getFieldNames($keyType);
if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]);
if (array_key_exists($keys[1], $arr)) $this->setCode($arr[$keys[1]]);
if (array_key_exists($keys[2], $arr)) $this->setTitle($arr[$keys[2]]);
if (array_key_exists($keys[3], $arr)) $this->setDescription($arr[$keys[3]]);
if (array_key_exists($keys[4], $arr)) $this->setCreatedAt($arr[$keys[4]]);
if (array_key_exists($keys[5], $arr)) $this->setUpdatedAt($arr[$keys[5]]);
if (array_key_exists($keys[1], $arr)) $this->setCreatedAt($arr[$keys[1]]);
if (array_key_exists($keys[2], $arr)) $this->setUpdatedAt($arr[$keys[2]]);
}
/**
@@ -1238,9 +1073,6 @@ abstract class TaxRule implements ActiveRecordInterface
$criteria = new Criteria(TaxRuleTableMap::DATABASE_NAME);
if ($this->isColumnModified(TaxRuleTableMap::ID)) $criteria->add(TaxRuleTableMap::ID, $this->id);
if ($this->isColumnModified(TaxRuleTableMap::CODE)) $criteria->add(TaxRuleTableMap::CODE, $this->code);
if ($this->isColumnModified(TaxRuleTableMap::TITLE)) $criteria->add(TaxRuleTableMap::TITLE, $this->title);
if ($this->isColumnModified(TaxRuleTableMap::DESCRIPTION)) $criteria->add(TaxRuleTableMap::DESCRIPTION, $this->description);
if ($this->isColumnModified(TaxRuleTableMap::CREATED_AT)) $criteria->add(TaxRuleTableMap::CREATED_AT, $this->created_at);
if ($this->isColumnModified(TaxRuleTableMap::UPDATED_AT)) $criteria->add(TaxRuleTableMap::UPDATED_AT, $this->updated_at);
@@ -1306,9 +1138,6 @@ abstract class TaxRule implements ActiveRecordInterface
*/
public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
{
$copyObj->setCode($this->getCode());
$copyObj->setTitle($this->getTitle());
$copyObj->setDescription($this->getDescription());
$copyObj->setCreatedAt($this->getCreatedAt());
$copyObj->setUpdatedAt($this->getUpdatedAt());
@@ -1723,7 +1552,10 @@ abstract class TaxRule implements ActiveRecordInterface
$taxRuleCountriesToDelete = $this->getTaxRuleCountries(new Criteria(), $con)->diff($taxRuleCountries);
$this->taxRuleCountriesScheduledForDeletion = $taxRuleCountriesToDelete;
//since at least one column in the foreign key is at the same time a PK
//we can not just set a PK to NULL in the lines below. We have to store
//a backup of all values, so we are able to manipulate these items based on the onDelete value later.
$this->taxRuleCountriesScheduledForDeletion = clone $taxRuleCountriesToDelete;
foreach ($taxRuleCountriesToDelete as $taxRuleCountryRemoved) {
$taxRuleCountryRemoved->setTaxRule(null);
@@ -1816,7 +1648,7 @@ abstract class TaxRule implements ActiveRecordInterface
$this->taxRuleCountriesScheduledForDeletion = clone $this->collTaxRuleCountries;
$this->taxRuleCountriesScheduledForDeletion->clear();
}
$this->taxRuleCountriesScheduledForDeletion[]= $taxRuleCountry;
$this->taxRuleCountriesScheduledForDeletion[]= clone $taxRuleCountry;
$taxRuleCountry->setTaxRule(null);
}
@@ -2104,9 +1936,6 @@ abstract class TaxRule implements ActiveRecordInterface
public function clear()
{
$this->id = null;
$this->code = null;
$this->title = null;
$this->description = null;
$this->created_at = null;
$this->updated_at = null;
$this->alreadyInSave = false;
@@ -2286,6 +2115,54 @@ abstract class TaxRule implements ActiveRecordInterface
return $this->getTranslation($this->getLocale(), $con);
}
/**
* Get the [title] column value.
*
* @return string
*/
public function getTitle()
{
return $this->getCurrentTranslation()->getTitle();
}
/**
* Set the value of [title] column.
*
* @param string $v new value
* @return \Thelia\Model\TaxRuleI18n The current object (for fluent API support)
*/
public function setTitle($v)
{ $this->getCurrentTranslation()->setTitle($v);
return $this;
}
/**
* Get the [description] column value.
*
* @return string
*/
public function getDescription()
{
return $this->getCurrentTranslation()->getDescription();
}
/**
* Set the value of [description] column.
*
* @param string $v new value
* @return \Thelia\Model\TaxRuleI18n The current object (for fluent API support)
*/
public function setDescription($v)
{ $this->getCurrentTranslation()->setDescription($v);
return $this;
}
/**
* Code to be run before persisting the object
* @param ConnectionInterface $con

190
core/lib/Thelia/Model/Base/TaxRuleCountry.php
View File

@@ -60,12 +60,6 @@ abstract class TaxRuleCountry implements ActiveRecordInterface
*/
protected $virtualColumns = array();
/**
* The value for the id field.
* @var int
*/
protected $id;
/**
* The value for the tax_rule_id field.
* @var int
@@ -85,10 +79,10 @@ abstract class TaxRuleCountry implements ActiveRecordInterface
protected $tax_id;
/**
* The value for the none field.
* The value for the position field.
* @var int
*/
protected $none;
protected $position;
/**
* The value for the created_at field.
@@ -379,17 +373,6 @@ abstract class TaxRuleCountry implements ActiveRecordInterface
return array_keys(get_object_vars($this));
}
/**
* Get the [id] column value.
*
* @return int
*/
public function getId()
{
return $this->id;
}
/**
* Get the [tax_rule_id] column value.
*
@@ -424,14 +407,14 @@ abstract class TaxRuleCountry implements ActiveRecordInterface
}
/**
* Get the [none] column value.
* Get the [position] column value.
*
* @return int
*/
public function getNone()
public function getPosition()
{
return $this->none;
return $this->position;
}
/**
@@ -474,27 +457,6 @@ abstract class TaxRuleCountry implements ActiveRecordInterface
}
}
/**
* Set the value of [id] column.
*
* @param int $v new value
* @return \Thelia\Model\TaxRuleCountry The current object (for fluent API support)
*/
public function setId($v)
{
if ($v !== null) {
$v = (int) $v;
}
if ($this->id !== $v) {
$this->id = $v;
$this->modifiedColumns[] = TaxRuleCountryTableMap::ID;
}
return $this;
} // setId()
/**
* Set the value of [tax_rule_id] column.
*
@@ -571,25 +533,25 @@ abstract class TaxRuleCountry implements ActiveRecordInterface
} // setTaxId()
/**
* Set the value of [none] column.
* Set the value of [position] column.
*
* @param int $v new value
* @return \Thelia\Model\TaxRuleCountry The current object (for fluent API support)
*/
public function setNone($v)
public function setPosition($v)
{
if ($v !== null) {
$v = (int) $v;
}
if ($this->none !== $v) {
$this->none = $v;
$this->modifiedColumns[] = TaxRuleCountryTableMap::NONE;
if ($this->position !== $v) {
$this->position = $v;
$this->modifiedColumns[] = TaxRuleCountryTableMap::POSITION;
}
return $this;
} // setNone()
} // setPosition()
/**
* Sets the value of [created_at] column to a normalized version of the date/time value specified.
@@ -670,28 +632,25 @@ abstract class TaxRuleCountry implements ActiveRecordInterface
try {
$col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : TaxRuleCountryTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
$this->id = (null !== $col) ? (int) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : TaxRuleCountryTableMap::translateFieldName('TaxRuleId', TableMap::TYPE_PHPNAME, $indexType)];
$col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : TaxRuleCountryTableMap::translateFieldName('TaxRuleId', TableMap::TYPE_PHPNAME, $indexType)];
$this->tax_rule_id = (null !== $col) ? (int) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : TaxRuleCountryTableMap::translateFieldName('CountryId', TableMap::TYPE_PHPNAME, $indexType)];
$col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : TaxRuleCountryTableMap::translateFieldName('CountryId', TableMap::TYPE_PHPNAME, $indexType)];
$this->country_id = (null !== $col) ? (int) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : TaxRuleCountryTableMap::translateFieldName('TaxId', TableMap::TYPE_PHPNAME, $indexType)];
$col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : TaxRuleCountryTableMap::translateFieldName('TaxId', TableMap::TYPE_PHPNAME, $indexType)];
$this->tax_id = (null !== $col) ? (int) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : TaxRuleCountryTableMap::translateFieldName('None', TableMap::TYPE_PHPNAME, $indexType)];
$this->none = (null !== $col) ? (int) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : TaxRuleCountryTableMap::translateFieldName('Position', TableMap::TYPE_PHPNAME, $indexType)];
$this->position = (null !== $col) ? (int) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : TaxRuleCountryTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
$col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : TaxRuleCountryTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
if ($col === '0000-00-00 00:00:00') {
$col = null;
}
$this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : TaxRuleCountryTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
$col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : TaxRuleCountryTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
if ($col === '0000-00-00 00:00:00') {
$col = null;
}
@@ -704,7 +663,7 @@ abstract class TaxRuleCountry implements ActiveRecordInterface
$this->ensureConsistency();
}
return $startcol + 7; // 7 = TaxRuleCountryTableMap::NUM_HYDRATE_COLUMNS.
return $startcol + 6; // 6 = TaxRuleCountryTableMap::NUM_HYDRATE_COLUMNS.
} catch (Exception $e) {
throw new PropelException("Error populating \Thelia\Model\TaxRuleCountry object", 0, $e);
@@ -958,9 +917,6 @@ abstract class TaxRuleCountry implements ActiveRecordInterface
// check the columns in natural order for more readable SQL queries
if ($this->isColumnModified(TaxRuleCountryTableMap::ID)) {
$modifiedColumns[':p' . $index++] = 'ID';
}
if ($this->isColumnModified(TaxRuleCountryTableMap::TAX_RULE_ID)) {
$modifiedColumns[':p' . $index++] = 'TAX_RULE_ID';
}
@@ -970,8 +926,8 @@ abstract class TaxRuleCountry implements ActiveRecordInterface
if ($this->isColumnModified(TaxRuleCountryTableMap::TAX_ID)) {
$modifiedColumns[':p' . $index++] = 'TAX_ID';
}
if ($this->isColumnModified(TaxRuleCountryTableMap::NONE)) {
$modifiedColumns[':p' . $index++] = 'NONE';
if ($this->isColumnModified(TaxRuleCountryTableMap::POSITION)) {
$modifiedColumns[':p' . $index++] = 'POSITION';
}
if ($this->isColumnModified(TaxRuleCountryTableMap::CREATED_AT)) {
$modifiedColumns[':p' . $index++] = 'CREATED_AT';
@@ -990,9 +946,6 @@ abstract class TaxRuleCountry implements ActiveRecordInterface
$stmt = $con->prepare($sql);
foreach ($modifiedColumns as $identifier => $columnName) {
switch ($columnName) {
case 'ID':
$stmt->bindValue($identifier, $this->id, PDO::PARAM_INT);
break;
case 'TAX_RULE_ID':
$stmt->bindValue($identifier, $this->tax_rule_id, PDO::PARAM_INT);
break;
@@ -1002,8 +955,8 @@ abstract class TaxRuleCountry implements ActiveRecordInterface
case 'TAX_ID':
$stmt->bindValue($identifier, $this->tax_id, PDO::PARAM_INT);
break;
case 'NONE':
$stmt->bindValue($identifier, $this->none, PDO::PARAM_INT);
case 'POSITION':
$stmt->bindValue($identifier, $this->position, PDO::PARAM_INT);
break;
case 'CREATED_AT':
$stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR);
@@ -1067,24 +1020,21 @@ abstract class TaxRuleCountry implements ActiveRecordInterface
{
switch ($pos) {
case 0:
return $this->getId();
break;
case 1:
return $this->getTaxRuleId();
break;
case 2:
case 1:
return $this->getCountryId();
break;
case 3:
case 2:
return $this->getTaxId();
break;
case 4:
return $this->getNone();
case 3:
return $this->getPosition();
break;
case 5:
case 4:
return $this->getCreatedAt();
break;
case 6:
case 5:
return $this->getUpdatedAt();
break;
default:
@@ -1110,19 +1060,18 @@ abstract class TaxRuleCountry implements ActiveRecordInterface
*/
public function toArray($keyType = TableMap::TYPE_PHPNAME, $includeLazyLoadColumns = true, $alreadyDumpedObjects = array(), $includeForeignObjects = false)
{
if (isset($alreadyDumpedObjects['TaxRuleCountry'][$this->getPrimaryKey()])) {
if (isset($alreadyDumpedObjects['TaxRuleCountry'][serialize($this->getPrimaryKey())])) {
return '*RECURSION*';
}
$alreadyDumpedObjects['TaxRuleCountry'][$this->getPrimaryKey()] = true;
$alreadyDumpedObjects['TaxRuleCountry'][serialize($this->getPrimaryKey())] = true;
$keys = TaxRuleCountryTableMap::getFieldNames($keyType);
$result = array(
$keys[0] => $this->getId(),
$keys[1] => $this->getTaxRuleId(),
$keys[2] => $this->getCountryId(),
$keys[3] => $this->getTaxId(),
$keys[4] => $this->getNone(),
$keys[5] => $this->getCreatedAt(),
$keys[6] => $this->getUpdatedAt(),
$keys[0] => $this->getTaxRuleId(),
$keys[1] => $this->getCountryId(),
$keys[2] => $this->getTaxId(),
$keys[3] => $this->getPosition(),
$keys[4] => $this->getCreatedAt(),
$keys[5] => $this->getUpdatedAt(),
);
$virtualColumns = $this->virtualColumns;
foreach($virtualColumns as $key => $virtualColumn)
@@ -1175,24 +1124,21 @@ abstract class TaxRuleCountry implements ActiveRecordInterface
{
switch ($pos) {
case 0:
$this->setId($value);
break;
case 1:
$this->setTaxRuleId($value);
break;
case 2:
case 1:
$this->setCountryId($value);
break;
case 3:
case 2:
$this->setTaxId($value);
break;
case 4:
$this->setNone($value);
case 3:
$this->setPosition($value);
break;
case 5:
case 4:
$this->setCreatedAt($value);
break;
case 6:
case 5:
$this->setUpdatedAt($value);
break;
} // switch()
@@ -1219,13 +1165,12 @@ abstract class TaxRuleCountry implements ActiveRecordInterface
{
$keys = TaxRuleCountryTableMap::getFieldNames($keyType);
if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]);
if (array_key_exists($keys[1], $arr)) $this->setTaxRuleId($arr[$keys[1]]);
if (array_key_exists($keys[2], $arr)) $this->setCountryId($arr[$keys[2]]);
if (array_key_exists($keys[3], $arr)) $this->setTaxId($arr[$keys[3]]);
if (array_key_exists($keys[4], $arr)) $this->setNone($arr[$keys[4]]);
if (array_key_exists($keys[5], $arr)) $this->setCreatedAt($arr[$keys[5]]);
if (array_key_exists($keys[6], $arr)) $this->setUpdatedAt($arr[$keys[6]]);
if (array_key_exists($keys[0], $arr)) $this->setTaxRuleId($arr[$keys[0]]);
if (array_key_exists($keys[1], $arr)) $this->setCountryId($arr[$keys[1]]);
if (array_key_exists($keys[2], $arr)) $this->setTaxId($arr[$keys[2]]);
if (array_key_exists($keys[3], $arr)) $this->setPosition($arr[$keys[3]]);
if (array_key_exists($keys[4], $arr)) $this->setCreatedAt($arr[$keys[4]]);
if (array_key_exists($keys[5], $arr)) $this->setUpdatedAt($arr[$keys[5]]);
}
/**
@@ -1237,11 +1182,10 @@ abstract class TaxRuleCountry implements ActiveRecordInterface
{
$criteria = new Criteria(TaxRuleCountryTableMap::DATABASE_NAME);
if ($this->isColumnModified(TaxRuleCountryTableMap::ID)) $criteria->add(TaxRuleCountryTableMap::ID, $this->id);
if ($this->isColumnModified(TaxRuleCountryTableMap::TAX_RULE_ID)) $criteria->add(TaxRuleCountryTableMap::TAX_RULE_ID, $this->tax_rule_id);
if ($this->isColumnModified(TaxRuleCountryTableMap::COUNTRY_ID)) $criteria->add(TaxRuleCountryTableMap::COUNTRY_ID, $this->country_id);
if ($this->isColumnModified(TaxRuleCountryTableMap::TAX_ID)) $criteria->add(TaxRuleCountryTableMap::TAX_ID, $this->tax_id);
if ($this->isColumnModified(TaxRuleCountryTableMap::NONE)) $criteria->add(TaxRuleCountryTableMap::NONE, $this->none);
if ($this->isColumnModified(TaxRuleCountryTableMap::POSITION)) $criteria->add(TaxRuleCountryTableMap::POSITION, $this->position);
if ($this->isColumnModified(TaxRuleCountryTableMap::CREATED_AT)) $criteria->add(TaxRuleCountryTableMap::CREATED_AT, $this->created_at);
if ($this->isColumnModified(TaxRuleCountryTableMap::UPDATED_AT)) $criteria->add(TaxRuleCountryTableMap::UPDATED_AT, $this->updated_at);
@@ -1259,29 +1203,39 @@ abstract class TaxRuleCountry implements ActiveRecordInterface
public function buildPkeyCriteria()
{
$criteria = new Criteria(TaxRuleCountryTableMap::DATABASE_NAME);
$criteria->add(TaxRuleCountryTableMap::ID, $this->id);
$criteria->add(TaxRuleCountryTableMap::TAX_RULE_ID, $this->tax_rule_id);
$criteria->add(TaxRuleCountryTableMap::COUNTRY_ID, $this->country_id);
$criteria->add(TaxRuleCountryTableMap::TAX_ID, $this->tax_id);
return $criteria;
}
/**
* Returns the primary key for this object (row).
* @return int
* Returns the composite primary key for this object.
* The array elements will be in same order as specified in XML.
* @return array
*/
public function getPrimaryKey()
{
return $this->getId();
$pks = array();
$pks[0] = $this->getTaxRuleId();
$pks[1] = $this->getCountryId();
$pks[2] = $this->getTaxId();
return $pks;
}
/**
* Generic method to set the primary key (id column).
* Set the [composite] primary key.
*
* @param int $key Primary key.
* @param array $keys The elements of the composite key (order must match the order in XML file).
* @return void
*/
public function setPrimaryKey($key)
public function setPrimaryKey($keys)
{
$this->setId($key);
$this->setTaxRuleId($keys[0]);
$this->setCountryId($keys[1]);
$this->setTaxId($keys[2]);
}
/**
@@ -1291,7 +1245,7 @@ abstract class TaxRuleCountry implements ActiveRecordInterface
public function isPrimaryKeyNull()
{
return null === $this->getId();
return (null === $this->getTaxRuleId()) && (null === $this->getCountryId()) && (null === $this->getTaxId());
}
/**
@@ -1307,11 +1261,10 @@ abstract class TaxRuleCountry implements ActiveRecordInterface
*/
public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
{
$copyObj->setId($this->getId());
$copyObj->setTaxRuleId($this->getTaxRuleId());
$copyObj->setCountryId($this->getCountryId());
$copyObj->setTaxId($this->getTaxId());
$copyObj->setNone($this->getNone());
$copyObj->setPosition($this->getPosition());
$copyObj->setCreatedAt($this->getCreatedAt());
$copyObj->setUpdatedAt($this->getUpdatedAt());
if ($makeNew) {
@@ -1499,11 +1452,10 @@ abstract class TaxRuleCountry implements ActiveRecordInterface
*/
public function clear()
{
$this->id = null;
$this->tax_rule_id = null;
$this->country_id = null;
$this->tax_id = null;
$this->none = null;
$this->position = null;
$this->created_at = null;
$this->updated_at = null;
$this->alreadyInSave = false;

126
core/lib/Thelia/Model/Base/TaxRuleCountryQuery.php
View File

@@ -21,19 +21,17 @@ use Thelia\Model\Map\TaxRuleCountryTableMap;
*
*
*
* @method ChildTaxRuleCountryQuery orderById($order = Criteria::ASC) Order by the id column
* @method ChildTaxRuleCountryQuery orderByTaxRuleId($order = Criteria::ASC) Order by the tax_rule_id column
* @method ChildTaxRuleCountryQuery orderByCountryId($order = Criteria::ASC) Order by the country_id column
* @method ChildTaxRuleCountryQuery orderByTaxId($order = Criteria::ASC) Order by the tax_id column
* @method ChildTaxRuleCountryQuery orderByNone($order = Criteria::ASC) Order by the none column
* @method ChildTaxRuleCountryQuery orderByPosition($order = Criteria::ASC) Order by the position column
* @method ChildTaxRuleCountryQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
* @method ChildTaxRuleCountryQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
*
* @method ChildTaxRuleCountryQuery groupById() Group by the id column
* @method ChildTaxRuleCountryQuery groupByTaxRuleId() Group by the tax_rule_id column
* @method ChildTaxRuleCountryQuery groupByCountryId() Group by the country_id column
* @method ChildTaxRuleCountryQuery groupByTaxId() Group by the tax_id column
* @method ChildTaxRuleCountryQuery groupByNone() Group by the none column
* @method ChildTaxRuleCountryQuery groupByPosition() Group by the position column
* @method ChildTaxRuleCountryQuery groupByCreatedAt() Group by the created_at column
* @method ChildTaxRuleCountryQuery groupByUpdatedAt() Group by the updated_at column
*
@@ -56,19 +54,17 @@ use Thelia\Model\Map\TaxRuleCountryTableMap;
* @method ChildTaxRuleCountry findOne(ConnectionInterface $con = null) Return the first ChildTaxRuleCountry matching the query
* @method ChildTaxRuleCountry findOneOrCreate(ConnectionInterface $con = null) Return the first ChildTaxRuleCountry matching the query, or a new ChildTaxRuleCountry object populated from the query conditions when no match is found
*
* @method ChildTaxRuleCountry findOneById(int $id) Return the first ChildTaxRuleCountry filtered by the id column
* @method ChildTaxRuleCountry findOneByTaxRuleId(int $tax_rule_id) Return the first ChildTaxRuleCountry filtered by the tax_rule_id column
* @method ChildTaxRuleCountry findOneByCountryId(int $country_id) Return the first ChildTaxRuleCountry filtered by the country_id column
* @method ChildTaxRuleCountry findOneByTaxId(int $tax_id) Return the first ChildTaxRuleCountry filtered by the tax_id column
* @method ChildTaxRuleCountry findOneByNone(int $none) Return the first ChildTaxRuleCountry filtered by the none column
* @method ChildTaxRuleCountry findOneByPosition(int $position) Return the first ChildTaxRuleCountry filtered by the position column
* @method ChildTaxRuleCountry findOneByCreatedAt(string $created_at) Return the first ChildTaxRuleCountry filtered by the created_at column
* @method ChildTaxRuleCountry findOneByUpdatedAt(string $updated_at) Return the first ChildTaxRuleCountry filtered by the updated_at column
*
* @method array findById(int $id) Return ChildTaxRuleCountry objects filtered by the id column
* @method array findByTaxRuleId(int $tax_rule_id) Return ChildTaxRuleCountry objects filtered by the tax_rule_id column
* @method array findByCountryId(int $country_id) Return ChildTaxRuleCountry objects filtered by the country_id column
* @method array findByTaxId(int $tax_id) Return ChildTaxRuleCountry objects filtered by the tax_id column
* @method array findByNone(int $none) Return ChildTaxRuleCountry objects filtered by the none column
* @method array findByPosition(int $position) Return ChildTaxRuleCountry objects filtered by the position column
* @method array findByCreatedAt(string $created_at) Return ChildTaxRuleCountry objects filtered by the created_at column
* @method array findByUpdatedAt(string $updated_at) Return ChildTaxRuleCountry objects filtered by the updated_at column
*
@@ -118,10 +114,10 @@ abstract class TaxRuleCountryQuery extends ModelCriteria
* Go fast if the query is untouched.
*
* <code>
* $obj = $c->findPk(12, $con);
* $obj = $c->findPk(array(12, 34, 56), $con);
* </code>
*
* @param mixed $key Primary key to use for the query
* @param array[$tax_rule_id, $country_id, $tax_id] $key Primary key to use for the query
* @param ConnectionInterface $con an optional connection object
*
* @return ChildTaxRuleCountry|array|mixed the result, formatted by the current formatter
@@ -131,7 +127,7 @@ abstract class TaxRuleCountryQuery extends ModelCriteria
if ($key === null) {
return null;
}
if ((null !== ($obj = TaxRuleCountryTableMap::getInstanceFromPool((string) $key))) && !$this->formatter) {
if ((null !== ($obj = TaxRuleCountryTableMap::getInstanceFromPool(serialize(array((string) $key[0], (string) $key[1], (string) $key[2]))))) && !$this->formatter) {
// the object is already in the instance pool
return $obj;
}
@@ -159,10 +155,12 @@ abstract class TaxRuleCountryQuery extends ModelCriteria
*/
protected function findPkSimple($key, $con)
{
$sql = 'SELECT ID, TAX_RULE_ID, COUNTRY_ID, TAX_ID, NONE, CREATED_AT, UPDATED_AT FROM tax_rule_country WHERE ID = :p0';
$sql = 'SELECT TAX_RULE_ID, COUNTRY_ID, TAX_ID, POSITION, CREATED_AT, UPDATED_AT FROM tax_rule_country WHERE TAX_RULE_ID = :p0 AND COUNTRY_ID = :p1 AND TAX_ID = :p2';
try {
$stmt = $con->prepare($sql);
$stmt->bindValue(':p0', $key, PDO::PARAM_INT);
$stmt->bindValue(':p0', $key[0], PDO::PARAM_INT);
$stmt->bindValue(':p1', $key[1], PDO::PARAM_INT);
$stmt->bindValue(':p2', $key[2], PDO::PARAM_INT);
$stmt->execute();
} catch (Exception $e) {
Propel::log($e->getMessage(), Propel::LOG_ERR);
@@ -172,7 +170,7 @@ abstract class TaxRuleCountryQuery extends ModelCriteria
if ($row = $stmt->fetch(\PDO::FETCH_NUM)) {
$obj = new ChildTaxRuleCountry();
$obj->hydrate($row);
TaxRuleCountryTableMap::addInstanceToPool($obj, (string) $key);
TaxRuleCountryTableMap::addInstanceToPool($obj, serialize(array((string) $key[0], (string) $key[1], (string) $key[2])));
}
$stmt->closeCursor();
@@ -201,7 +199,7 @@ abstract class TaxRuleCountryQuery extends ModelCriteria
/**
* Find objects by primary key
* <code>
* $objs = $c->findPks(array(12, 56, 832), $con);
* $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con);
* </code>
* @param array $keys Primary keys to use for the query
* @param ConnectionInterface $con an optional connection object
@@ -231,8 +229,11 @@ abstract class TaxRuleCountryQuery extends ModelCriteria
*/
public function filterByPrimaryKey($key)
{
$this->addUsingAlias(TaxRuleCountryTableMap::TAX_RULE_ID, $key[0], Criteria::EQUAL);
$this->addUsingAlias(TaxRuleCountryTableMap::COUNTRY_ID, $key[1], Criteria::EQUAL);
$this->addUsingAlias(TaxRuleCountryTableMap::TAX_ID, $key[2], Criteria::EQUAL);
return $this->addUsingAlias(TaxRuleCountryTableMap::ID, $key, Criteria::EQUAL);
return $this;
}
/**
@@ -244,49 +245,19 @@ abstract class TaxRuleCountryQuery extends ModelCriteria
*/
public function filterByPrimaryKeys($keys)
{
return $this->addUsingAlias(TaxRuleCountryTableMap::ID, $keys, Criteria::IN);
}
/**
* Filter the query on the id column
*
* Example usage:
* <code>
* $query->filterById(1234); // WHERE id = 1234
* $query->filterById(array(12, 34)); // WHERE id IN (12, 34)
* $query->filterById(array('min' => 12)); // WHERE id > 12
* </code>
*
* @param mixed $id The value to use as filter.
* Use scalar values for equality.
* Use array values for in_array() equivalent.
* Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
* @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
*
* @return ChildTaxRuleCountryQuery The current query, for fluid interface
*/
public function filterById($id = null, $comparison = null)
{
if (is_array($id)) {
$useMinMax = false;
if (isset($id['min'])) {
$this->addUsingAlias(TaxRuleCountryTableMap::ID, $id['min'], Criteria::GREATER_EQUAL);
$useMinMax = true;
}
if (isset($id['max'])) {
$this->addUsingAlias(TaxRuleCountryTableMap::ID, $id['max'], Criteria::LESS_EQUAL);
$useMinMax = true;
}
if ($useMinMax) {
return $this;
}
if (null === $comparison) {
$comparison = Criteria::IN;
}
if (empty($keys)) {
return $this->add(null, '1<>1', Criteria::CUSTOM);
}
foreach ($keys as $key) {
$cton0 = $this->getNewCriterion(TaxRuleCountryTableMap::TAX_RULE_ID, $key[0], Criteria::EQUAL);
$cton1 = $this->getNewCriterion(TaxRuleCountryTableMap::COUNTRY_ID, $key[1], Criteria::EQUAL);
$cton0->addAnd($cton1);
$cton2 = $this->getNewCriterion(TaxRuleCountryTableMap::TAX_ID, $key[2], Criteria::EQUAL);
$cton0->addAnd($cton2);
$this->addOr($cton0);
}
return $this->addUsingAlias(TaxRuleCountryTableMap::ID, $id, $comparison);
return $this;
}
/**
@@ -419,16 +390,16 @@ abstract class TaxRuleCountryQuery extends ModelCriteria
}
/**
* Filter the query on the none column
* Filter the query on the position column
*
* Example usage:
* <code>
* $query->filterByNone(1234); // WHERE none = 1234
* $query->filterByNone(array(12, 34)); // WHERE none IN (12, 34)
* $query->filterByNone(array('min' => 12)); // WHERE none > 12
* $query->filterByPosition(1234); // WHERE position = 1234
* $query->filterByPosition(array(12, 34)); // WHERE position IN (12, 34)
* $query->filterByPosition(array('min' => 12)); // WHERE position > 12
* </code>
*
* @param mixed $none The value to use as filter.
* @param mixed $position The value to use as filter.
* Use scalar values for equality.
* Use array values for in_array() equivalent.
* Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
@@ -436,16 +407,16 @@ abstract class TaxRuleCountryQuery extends ModelCriteria
*
* @return ChildTaxRuleCountryQuery The current query, for fluid interface
*/
public function filterByNone($none = null, $comparison = null)
public function filterByPosition($position = null, $comparison = null)
{
if (is_array($none)) {
if (is_array($position)) {
$useMinMax = false;
if (isset($none['min'])) {
$this->addUsingAlias(TaxRuleCountryTableMap::NONE, $none['min'], Criteria::GREATER_EQUAL);
if (isset($position['min'])) {
$this->addUsingAlias(TaxRuleCountryTableMap::POSITION, $position['min'], Criteria::GREATER_EQUAL);
$useMinMax = true;
}
if (isset($none['max'])) {
$this->addUsingAlias(TaxRuleCountryTableMap::NONE, $none['max'], Criteria::LESS_EQUAL);
if (isset($position['max'])) {
$this->addUsingAlias(TaxRuleCountryTableMap::POSITION, $position['max'], Criteria::LESS_EQUAL);
$useMinMax = true;
}
if ($useMinMax) {
@@ -456,7 +427,7 @@ abstract class TaxRuleCountryQuery extends ModelCriteria
}
}
return $this->addUsingAlias(TaxRuleCountryTableMap::NONE, $none, $comparison);
return $this->addUsingAlias(TaxRuleCountryTableMap::POSITION, $position, $comparison);
}
/**
@@ -578,7 +549,7 @@ abstract class TaxRuleCountryQuery extends ModelCriteria
*
* @return ChildTaxRuleCountryQuery The current query, for fluid interface
*/
public function joinTax($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
public function joinTax($relationAlias = null, $joinType = Criteria::INNER_JOIN)
{
$tableMap = $this->getTableMap();
$relationMap = $tableMap->getRelation('Tax');
@@ -613,7 +584,7 @@ abstract class TaxRuleCountryQuery extends ModelCriteria
*
* @return \Thelia\Model\TaxQuery A secondary query class using the current class as primary query
*/
public function useTaxQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
public function useTaxQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
{
return $this
->joinTax($relationAlias, $joinType)
@@ -653,7 +624,7 @@ abstract class TaxRuleCountryQuery extends ModelCriteria
*
* @return ChildTaxRuleCountryQuery The current query, for fluid interface
*/
public function joinTaxRule($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
public function joinTaxRule($relationAlias = null, $joinType = Criteria::INNER_JOIN)
{
$tableMap = $this->getTableMap();
$relationMap = $tableMap->getRelation('TaxRule');
@@ -688,7 +659,7 @@ abstract class TaxRuleCountryQuery extends ModelCriteria
*
* @return \Thelia\Model\TaxRuleQuery A secondary query class using the current class as primary query
*/
public function useTaxRuleQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
public function useTaxRuleQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
{
return $this
->joinTaxRule($relationAlias, $joinType)
@@ -728,7 +699,7 @@ abstract class TaxRuleCountryQuery extends ModelCriteria
*
* @return ChildTaxRuleCountryQuery The current query, for fluid interface
*/
public function joinCountry($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
public function joinCountry($relationAlias = null, $joinType = Criteria::INNER_JOIN)
{
$tableMap = $this->getTableMap();
$relationMap = $tableMap->getRelation('Country');
@@ -763,7 +734,7 @@ abstract class TaxRuleCountryQuery extends ModelCriteria
*
* @return \Thelia\Model\CountryQuery A secondary query class using the current class as primary query
*/
public function useCountryQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
public function useCountryQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
{
return $this
->joinCountry($relationAlias, $joinType)
@@ -780,7 +751,10 @@ abstract class TaxRuleCountryQuery extends ModelCriteria
public function prune($taxRuleCountry = null)
{
if ($taxRuleCountry) {
$this->addUsingAlias(TaxRuleCountryTableMap::ID, $taxRuleCountry->getId(), Criteria::NOT_EQUAL);
$this->addCond('pruneCond0', $this->getAliasedColName(TaxRuleCountryTableMap::TAX_RULE_ID), $taxRuleCountry->getTaxRuleId(), Criteria::NOT_EQUAL);
$this->addCond('pruneCond1', $this->getAliasedColName(TaxRuleCountryTableMap::COUNTRY_ID), $taxRuleCountry->getCountryId(), Criteria::NOT_EQUAL);
$this->addCond('pruneCond2', $this->getAliasedColName(TaxRuleCountryTableMap::TAX_ID), $taxRuleCountry->getTaxId(), Criteria::NOT_EQUAL);
$this->combine(array('pruneCond0', 'pruneCond1', 'pruneCond2'), Criteria::LOGICAL_OR);
}
return $this;

118
core/lib/Thelia/Model/Base/TaxRuleI18n.php
View File

@@ -66,6 +66,18 @@ abstract class TaxRuleI18n implements ActiveRecordInterface
*/
protected $locale;
/**
* The value for the title field.
* @var string
*/
protected $title;
/**
* The value for the description field.
* @var string
*/
protected $description;
/**
* @var TaxRule
*/
@@ -368,6 +380,28 @@ abstract class TaxRuleI18n implements ActiveRecordInterface
return $this->locale;
}
/**
* Get the [title] column value.
*
* @return string
*/
public function getTitle()
{
return $this->title;
}
/**
* Get the [description] column value.
*
* @return string
*/
public function getDescription()
{
return $this->description;
}
/**
* Set the value of [id] column.
*
@@ -414,6 +448,48 @@ abstract class TaxRuleI18n implements ActiveRecordInterface
return $this;
} // setLocale()
/**
* Set the value of [title] column.
*
* @param string $v new value
* @return \Thelia\Model\TaxRuleI18n The current object (for fluent API support)
*/
public function setTitle($v)
{
if ($v !== null) {
$v = (string) $v;
}
if ($this->title !== $v) {
$this->title = $v;
$this->modifiedColumns[] = TaxRuleI18nTableMap::TITLE;
}
return $this;
} // setTitle()
/**
* Set the value of [description] column.
*
* @param string $v new value
* @return \Thelia\Model\TaxRuleI18n The current object (for fluent API support)
*/
public function setDescription($v)
{
if ($v !== null) {
$v = (string) $v;
}
if ($this->description !== $v) {
$this->description = $v;
$this->modifiedColumns[] = TaxRuleI18nTableMap::DESCRIPTION;
}
return $this;
} // setDescription()
/**
* Indicates whether the columns in this object are only set to default values.
*
@@ -460,6 +536,12 @@ abstract class TaxRuleI18n implements ActiveRecordInterface
$col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : TaxRuleI18nTableMap::translateFieldName('Locale', TableMap::TYPE_PHPNAME, $indexType)];
$this->locale = (null !== $col) ? (string) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : TaxRuleI18nTableMap::translateFieldName('Title', TableMap::TYPE_PHPNAME, $indexType)];
$this->title = (null !== $col) ? (string) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : TaxRuleI18nTableMap::translateFieldName('Description', TableMap::TYPE_PHPNAME, $indexType)];
$this->description = (null !== $col) ? (string) $col : null;
$this->resetModified();
$this->setNew(false);
@@ -468,7 +550,7 @@ abstract class TaxRuleI18n implements ActiveRecordInterface
$this->ensureConsistency();
}
return $startcol + 2; // 2 = TaxRuleI18nTableMap::NUM_HYDRATE_COLUMNS.
return $startcol + 4; // 4 = TaxRuleI18nTableMap::NUM_HYDRATE_COLUMNS.
} catch (Exception $e) {
throw new PropelException("Error populating \Thelia\Model\TaxRuleI18n object", 0, $e);
@@ -695,6 +777,12 @@ abstract class TaxRuleI18n implements ActiveRecordInterface
if ($this->isColumnModified(TaxRuleI18nTableMap::LOCALE)) {
$modifiedColumns[':p' . $index++] = 'LOCALE';
}
if ($this->isColumnModified(TaxRuleI18nTableMap::TITLE)) {
$modifiedColumns[':p' . $index++] = 'TITLE';
}
if ($this->isColumnModified(TaxRuleI18nTableMap::DESCRIPTION)) {
$modifiedColumns[':p' . $index++] = 'DESCRIPTION';
}
$sql = sprintf(
'INSERT INTO tax_rule_i18n (%s) VALUES (%s)',
@@ -712,6 +800,12 @@ abstract class TaxRuleI18n implements ActiveRecordInterface
case 'LOCALE':
$stmt->bindValue($identifier, $this->locale, PDO::PARAM_STR);
break;
case 'TITLE':
$stmt->bindValue($identifier, $this->title, PDO::PARAM_STR);
break;
case 'DESCRIPTION':
$stmt->bindValue($identifier, $this->description, PDO::PARAM_STR);
break;
}
}
$stmt->execute();
@@ -773,6 +867,12 @@ abstract class TaxRuleI18n implements ActiveRecordInterface
case 1:
return $this->getLocale();
break;
case 2:
return $this->getTitle();
break;
case 3:
return $this->getDescription();
break;
default:
return null;
break;
@@ -804,6 +904,8 @@ abstract class TaxRuleI18n implements ActiveRecordInterface
$result = array(
$keys[0] => $this->getId(),
$keys[1] => $this->getLocale(),
$keys[2] => $this->getTitle(),
$keys[3] => $this->getDescription(),
);
$virtualColumns = $this->virtualColumns;
foreach($virtualColumns as $key => $virtualColumn)
@@ -855,6 +957,12 @@ abstract class TaxRuleI18n implements ActiveRecordInterface
case 1:
$this->setLocale($value);
break;
case 2:
$this->setTitle($value);
break;
case 3:
$this->setDescription($value);
break;
} // switch()
}
@@ -881,6 +989,8 @@ abstract class TaxRuleI18n implements ActiveRecordInterface
if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]);
if (array_key_exists($keys[1], $arr)) $this->setLocale($arr[$keys[1]]);
if (array_key_exists($keys[2], $arr)) $this->setTitle($arr[$keys[2]]);
if (array_key_exists($keys[3], $arr)) $this->setDescription($arr[$keys[3]]);
}
/**
@@ -894,6 +1004,8 @@ abstract class TaxRuleI18n implements ActiveRecordInterface
if ($this->isColumnModified(TaxRuleI18nTableMap::ID)) $criteria->add(TaxRuleI18nTableMap::ID, $this->id);
if ($this->isColumnModified(TaxRuleI18nTableMap::LOCALE)) $criteria->add(TaxRuleI18nTableMap::LOCALE, $this->locale);
if ($this->isColumnModified(TaxRuleI18nTableMap::TITLE)) $criteria->add(TaxRuleI18nTableMap::TITLE, $this->title);
if ($this->isColumnModified(TaxRuleI18nTableMap::DESCRIPTION)) $criteria->add(TaxRuleI18nTableMap::DESCRIPTION, $this->description);
return $criteria;
}
@@ -966,6 +1078,8 @@ abstract class TaxRuleI18n implements ActiveRecordInterface
{
$copyObj->setId($this->getId());
$copyObj->setLocale($this->getLocale());
$copyObj->setTitle($this->getTitle());
$copyObj->setDescription($this->getDescription());
if ($makeNew) {
$copyObj->setNew(true);
}
@@ -1051,6 +1165,8 @@ abstract class TaxRuleI18n implements ActiveRecordInterface
{
$this->id = null;
$this->locale = null;
$this->title = null;
$this->description = null;
$this->alreadyInSave = false;
$this->clearAllReferences();
$this->applyDefaultValues();

68
core/lib/Thelia/Model/Base/TaxRuleI18nQuery.php
View File

@@ -23,9 +23,13 @@ use Thelia\Model\Map\TaxRuleI18nTableMap;
*
* @method ChildTaxRuleI18nQuery orderById($order = Criteria::ASC) Order by the id column
* @method ChildTaxRuleI18nQuery orderByLocale($order = Criteria::ASC) Order by the locale column
* @method ChildTaxRuleI18nQuery orderByTitle($order = Criteria::ASC) Order by the title column
* @method ChildTaxRuleI18nQuery orderByDescription($order = Criteria::ASC) Order by the description column
*
* @method ChildTaxRuleI18nQuery groupById() Group by the id column
* @method ChildTaxRuleI18nQuery groupByLocale() Group by the locale column
* @method ChildTaxRuleI18nQuery groupByTitle() Group by the title column
* @method ChildTaxRuleI18nQuery groupByDescription() Group by the description column
*
* @method ChildTaxRuleI18nQuery leftJoin($relation) Adds a LEFT JOIN clause to the query
* @method ChildTaxRuleI18nQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
@@ -40,9 +44,13 @@ use Thelia\Model\Map\TaxRuleI18nTableMap;
*
* @method ChildTaxRuleI18n findOneById(int $id) Return the first ChildTaxRuleI18n filtered by the id column
* @method ChildTaxRuleI18n findOneByLocale(string $locale) Return the first ChildTaxRuleI18n filtered by the locale column
* @method ChildTaxRuleI18n findOneByTitle(string $title) Return the first ChildTaxRuleI18n filtered by the title column
* @method ChildTaxRuleI18n findOneByDescription(string $description) Return the first ChildTaxRuleI18n filtered by the description column
*
* @method array findById(int $id) Return ChildTaxRuleI18n objects filtered by the id column
* @method array findByLocale(string $locale) Return ChildTaxRuleI18n objects filtered by the locale column
* @method array findByTitle(string $title) Return ChildTaxRuleI18n objects filtered by the title column
* @method array findByDescription(string $description) Return ChildTaxRuleI18n objects filtered by the description column
*
*/
abstract class TaxRuleI18nQuery extends ModelCriteria
@@ -131,7 +139,7 @@ abstract class TaxRuleI18nQuery extends ModelCriteria
*/
protected function findPkSimple($key, $con)
{
$sql = 'SELECT ID, LOCALE FROM tax_rule_i18n WHERE ID = :p0 AND LOCALE = :p1';
$sql = 'SELECT ID, LOCALE, TITLE, DESCRIPTION FROM tax_rule_i18n WHERE ID = :p0 AND LOCALE = :p1';
try {
$stmt = $con->prepare($sql);
$stmt->bindValue(':p0', $key[0], PDO::PARAM_INT);
@@ -304,6 +312,64 @@ abstract class TaxRuleI18nQuery extends ModelCriteria
return $this->addUsingAlias(TaxRuleI18nTableMap::LOCALE, $locale, $comparison);
}
/**
* Filter the query on the title column
*
* Example usage:
* <code>
* $query->filterByTitle('fooValue'); // WHERE title = 'fooValue'
* $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%'
* </code>
*
* @param string $title The value to use as filter.
* Accepts wildcards (* and % trigger a LIKE)
* @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
*
* @return ChildTaxRuleI18nQuery The current query, for fluid interface
*/
public function filterByTitle($title = null, $comparison = null)
{
if (null === $comparison) {
if (is_array($title)) {
$comparison = Criteria::IN;
} elseif (preg_match('/[\%\*]/', $title)) {
$title = str_replace('*', '%', $title);
$comparison = Criteria::LIKE;
}
}
return $this->addUsingAlias(TaxRuleI18nTableMap::TITLE, $title, $comparison);
}
/**
* Filter the query on the description column
*
* Example usage:
* <code>
* $query->filterByDescription('fooValue'); // WHERE description = 'fooValue'
* $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%'
* </code>
*
* @param string $description The value to use as filter.
* Accepts wildcards (* and % trigger a LIKE)
* @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
*
* @return ChildTaxRuleI18nQuery The current query, for fluid interface
*/
public function filterByDescription($description = null, $comparison = null)
{
if (null === $comparison) {
if (is_array($description)) {
$comparison = Criteria::IN;
} elseif (preg_match('/[\%\*]/', $description)) {
$description = str_replace('*', '%', $description);
$comparison = Criteria::LIKE;
}
}
return $this->addUsingAlias(TaxRuleI18nTableMap::DESCRIPTION, $description, $comparison);
}
/**
* Filter the query by a related \Thelia\Model\TaxRule object
*

105
core/lib/Thelia/Model/Base/TaxRuleQuery.php
View File

@@ -23,16 +23,10 @@ use Thelia\Model\Map\TaxRuleTableMap;
*
*
* @method ChildTaxRuleQuery orderById($order = Criteria::ASC) Order by the id column
* @method ChildTaxRuleQuery orderByCode($order = Criteria::ASC) Order by the code column
* @method ChildTaxRuleQuery orderByTitle($order = Criteria::ASC) Order by the title column
* @method ChildTaxRuleQuery orderByDescription($order = Criteria::ASC) Order by the description column
* @method ChildTaxRuleQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
* @method ChildTaxRuleQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
*
* @method ChildTaxRuleQuery groupById() Group by the id column
* @method ChildTaxRuleQuery groupByCode() Group by the code column
* @method ChildTaxRuleQuery groupByTitle() Group by the title column
* @method ChildTaxRuleQuery groupByDescription() Group by the description column
* @method ChildTaxRuleQuery groupByCreatedAt() Group by the created_at column
* @method ChildTaxRuleQuery groupByUpdatedAt() Group by the updated_at column
*
@@ -56,16 +50,10 @@ use Thelia\Model\Map\TaxRuleTableMap;
* @method ChildTaxRule findOneOrCreate(ConnectionInterface $con = null) Return the first ChildTaxRule matching the query, or a new ChildTaxRule object populated from the query conditions when no match is found
*
* @method ChildTaxRule findOneById(int $id) Return the first ChildTaxRule filtered by the id column
* @method ChildTaxRule findOneByCode(string $code) Return the first ChildTaxRule filtered by the code column
* @method ChildTaxRule findOneByTitle(string $title) Return the first ChildTaxRule filtered by the title column
* @method ChildTaxRule findOneByDescription(string $description) Return the first ChildTaxRule filtered by the description column
* @method ChildTaxRule findOneByCreatedAt(string $created_at) Return the first ChildTaxRule filtered by the created_at column
* @method ChildTaxRule findOneByUpdatedAt(string $updated_at) Return the first ChildTaxRule filtered by the updated_at column
*
* @method array findById(int $id) Return ChildTaxRule objects filtered by the id column
* @method array findByCode(string $code) Return ChildTaxRule objects filtered by the code column
* @method array findByTitle(string $title) Return ChildTaxRule objects filtered by the title column
* @method array findByDescription(string $description) Return ChildTaxRule objects filtered by the description column
* @method array findByCreatedAt(string $created_at) Return ChildTaxRule objects filtered by the created_at column
* @method array findByUpdatedAt(string $updated_at) Return ChildTaxRule objects filtered by the updated_at column
*
@@ -156,7 +144,7 @@ abstract class TaxRuleQuery extends ModelCriteria
*/
protected function findPkSimple($key, $con)
{
$sql = 'SELECT ID, CODE, TITLE, DESCRIPTION, CREATED_AT, UPDATED_AT FROM tax_rule WHERE ID = :p0';
$sql = 'SELECT ID, CREATED_AT, UPDATED_AT FROM tax_rule WHERE ID = :p0';
try {
$stmt = $con->prepare($sql);
$stmt->bindValue(':p0', $key, PDO::PARAM_INT);
@@ -286,93 +274,6 @@ abstract class TaxRuleQuery extends ModelCriteria
return $this->addUsingAlias(TaxRuleTableMap::ID, $id, $comparison);
}
/**
* Filter the query on the code column
*
* Example usage:
* <code>
* $query->filterByCode('fooValue'); // WHERE code = 'fooValue'
* $query->filterByCode('%fooValue%'); // WHERE code LIKE '%fooValue%'
* </code>
*
* @param string $code The value to use as filter.
* Accepts wildcards (* and % trigger a LIKE)
* @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
*
* @return ChildTaxRuleQuery The current query, for fluid interface
*/
public function filterByCode($code = null, $comparison = null)
{
if (null === $comparison) {
if (is_array($code)) {
$comparison = Criteria::IN;
} elseif (preg_match('/[\%\*]/', $code)) {
$code = str_replace('*', '%', $code);
$comparison = Criteria::LIKE;
}
}
return $this->addUsingAlias(TaxRuleTableMap::CODE, $code, $comparison);
}
/**
* Filter the query on the title column
*
* Example usage:
* <code>
* $query->filterByTitle('fooValue'); // WHERE title = 'fooValue'
* $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%'
* </code>
*
* @param string $title The value to use as filter.
* Accepts wildcards (* and % trigger a LIKE)
* @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
*
* @return ChildTaxRuleQuery The current query, for fluid interface
*/
public function filterByTitle($title = null, $comparison = null)
{
if (null === $comparison) {
if (is_array($title)) {
$comparison = Criteria::IN;
} elseif (preg_match('/[\%\*]/', $title)) {
$title = str_replace('*', '%', $title);
$comparison = Criteria::LIKE;
}
}
return $this->addUsingAlias(TaxRuleTableMap::TITLE, $title, $comparison);
}
/**
* Filter the query on the description column
*
* Example usage:
* <code>
* $query->filterByDescription('fooValue'); // WHERE description = 'fooValue'
* $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%'
* </code>
*
* @param string $description The value to use as filter.
* Accepts wildcards (* and % trigger a LIKE)
* @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
*
* @return ChildTaxRuleQuery The current query, for fluid interface
*/
public function filterByDescription($description = null, $comparison = null)
{
if (null === $comparison) {
if (is_array($description)) {
$comparison = Criteria::IN;
} elseif (preg_match('/[\%\*]/', $description)) {
$description = str_replace('*', '%', $description);
$comparison = Criteria::LIKE;
}
}
return $this->addUsingAlias(TaxRuleTableMap::DESCRIPTION, $description, $comparison);
}
/**
* Filter the query on the created_at column
*
@@ -563,7 +464,7 @@ abstract class TaxRuleQuery extends ModelCriteria
*
* @return ChildTaxRuleQuery The current query, for fluid interface
*/
public function joinTaxRuleCountry($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
public function joinTaxRuleCountry($relationAlias = null, $joinType = Criteria::INNER_JOIN)
{
$tableMap = $this->getTableMap();
$relationMap = $tableMap->getRelation('TaxRuleCountry');
@@ -598,7 +499,7 @@ abstract class TaxRuleQuery extends ModelCriteria
*
* @return \Thelia\Model\TaxRuleCountryQuery A secondary query class using the current class as primary query
*/
public function useTaxRuleCountryQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
public function useTaxRuleCountryQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
{
return $this
->joinTaxRuleCountry($relationAlias, $joinType)

5
core/lib/Thelia/Model/Cart.php
View File

@@ -71,4 +71,9 @@ class Cart extends BaseCart
->findOne()
;
}
public function getTaxedAmount()
{
}
}

130
core/lib/Thelia/Model/Map/TaxRuleCountryTableMap.php
View File

@@ -57,7 +57,7 @@ class TaxRuleCountryTableMap extends TableMap
/**
* The total number of columns
*/
const NUM_COLUMNS = 7;
const NUM_COLUMNS = 6;
/**
* The number of lazy-loaded columns
@@ -67,12 +67,7 @@ class TaxRuleCountryTableMap extends TableMap
/**
* The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
*/
const NUM_HYDRATE_COLUMNS = 7;
/**
* the column name for the ID field
*/
const ID = 'tax_rule_country.ID';
const NUM_HYDRATE_COLUMNS = 6;
/**
* the column name for the TAX_RULE_ID field
@@ -90,9 +85,9 @@ class TaxRuleCountryTableMap extends TableMap
const TAX_ID = 'tax_rule_country.TAX_ID';
/**
* the column name for the NONE field
* the column name for the POSITION field
*/
const NONE = 'tax_rule_country.NONE';
const POSITION = 'tax_rule_country.POSITION';
/**
* the column name for the CREATED_AT field
@@ -116,12 +111,12 @@ class TaxRuleCountryTableMap extends TableMap
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
protected static $fieldNames = array (
self::TYPE_PHPNAME => array('Id', 'TaxRuleId', 'CountryId', 'TaxId', 'None', 'CreatedAt', 'UpdatedAt', ),
self::TYPE_STUDLYPHPNAME => array('id', 'taxRuleId', 'countryId', 'taxId', 'none', 'createdAt', 'updatedAt', ),
self::TYPE_COLNAME => array(TaxRuleCountryTableMap::ID, TaxRuleCountryTableMap::TAX_RULE_ID, TaxRuleCountryTableMap::COUNTRY_ID, TaxRuleCountryTableMap::TAX_ID, TaxRuleCountryTableMap::NONE, TaxRuleCountryTableMap::CREATED_AT, TaxRuleCountryTableMap::UPDATED_AT, ),
self::TYPE_RAW_COLNAME => array('ID', 'TAX_RULE_ID', 'COUNTRY_ID', 'TAX_ID', 'NONE', 'CREATED_AT', 'UPDATED_AT', ),
self::TYPE_FIELDNAME => array('id', 'tax_rule_id', 'country_id', 'tax_id', 'none', 'created_at', 'updated_at', ),
self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, )
self::TYPE_PHPNAME => array('TaxRuleId', 'CountryId', 'TaxId', 'Position', 'CreatedAt', 'UpdatedAt', ),
self::TYPE_STUDLYPHPNAME => array('taxRuleId', 'countryId', 'taxId', 'position', 'createdAt', 'updatedAt', ),
self::TYPE_COLNAME => array(TaxRuleCountryTableMap::TAX_RULE_ID, TaxRuleCountryTableMap::COUNTRY_ID, TaxRuleCountryTableMap::TAX_ID, TaxRuleCountryTableMap::POSITION, TaxRuleCountryTableMap::CREATED_AT, TaxRuleCountryTableMap::UPDATED_AT, ),
self::TYPE_RAW_COLNAME => array('TAX_RULE_ID', 'COUNTRY_ID', 'TAX_ID', 'POSITION', 'CREATED_AT', 'UPDATED_AT', ),
self::TYPE_FIELDNAME => array('tax_rule_id', 'country_id', 'tax_id', 'position', 'created_at', 'updated_at', ),
self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, )
);
/**
@@ -131,12 +126,12 @@ class TaxRuleCountryTableMap extends TableMap
* e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
*/
protected static $fieldKeys = array (
self::TYPE_PHPNAME => array('Id' => 0, 'TaxRuleId' => 1, 'CountryId' => 2, 'TaxId' => 3, 'None' => 4, 'CreatedAt' => 5, 'UpdatedAt' => 6, ),
self::TYPE_STUDLYPHPNAME => array('id' => 0, 'taxRuleId' => 1, 'countryId' => 2, 'taxId' => 3, 'none' => 4, 'createdAt' => 5, 'updatedAt' => 6, ),
self::TYPE_COLNAME => array(TaxRuleCountryTableMap::ID => 0, TaxRuleCountryTableMap::TAX_RULE_ID => 1, TaxRuleCountryTableMap::COUNTRY_ID => 2, TaxRuleCountryTableMap::TAX_ID => 3, TaxRuleCountryTableMap::NONE => 4, TaxRuleCountryTableMap::CREATED_AT => 5, TaxRuleCountryTableMap::UPDATED_AT => 6, ),
self::TYPE_RAW_COLNAME => array('ID' => 0, 'TAX_RULE_ID' => 1, 'COUNTRY_ID' => 2, 'TAX_ID' => 3, 'NONE' => 4, 'CREATED_AT' => 5, 'UPDATED_AT' => 6, ),
self::TYPE_FIELDNAME => array('id' => 0, 'tax_rule_id' => 1, 'country_id' => 2, 'tax_id' => 3, 'none' => 4, 'created_at' => 5, 'updated_at' => 6, ),
self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, )
self::TYPE_PHPNAME => array('TaxRuleId' => 0, 'CountryId' => 1, 'TaxId' => 2, 'Position' => 3, 'CreatedAt' => 4, 'UpdatedAt' => 5, ),
self::TYPE_STUDLYPHPNAME => array('taxRuleId' => 0, 'countryId' => 1, 'taxId' => 2, 'position' => 3, 'createdAt' => 4, 'updatedAt' => 5, ),
self::TYPE_COLNAME => array(TaxRuleCountryTableMap::TAX_RULE_ID => 0, TaxRuleCountryTableMap::COUNTRY_ID => 1, TaxRuleCountryTableMap::TAX_ID => 2, TaxRuleCountryTableMap::POSITION => 3, TaxRuleCountryTableMap::CREATED_AT => 4, TaxRuleCountryTableMap::UPDATED_AT => 5, ),
self::TYPE_RAW_COLNAME => array('TAX_RULE_ID' => 0, 'COUNTRY_ID' => 1, 'TAX_ID' => 2, 'POSITION' => 3, 'CREATED_AT' => 4, 'UPDATED_AT' => 5, ),
self::TYPE_FIELDNAME => array('tax_rule_id' => 0, 'country_id' => 1, 'tax_id' => 2, 'position' => 3, 'created_at' => 4, 'updated_at' => 5, ),
self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, )
);
/**
@@ -155,11 +150,10 @@ class TaxRuleCountryTableMap extends TableMap
$this->setPackage('Thelia.Model');
$this->setUseIdGenerator(false);
// columns
$this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
$this->addForeignKey('TAX_RULE_ID', 'TaxRuleId', 'INTEGER', 'tax_rule', 'ID', false, null, null);
$this->addForeignKey('COUNTRY_ID', 'CountryId', 'INTEGER', 'country', 'ID', false, null, null);
$this->addForeignKey('TAX_ID', 'TaxId', 'INTEGER', 'tax', 'ID', false, null, null);
$this->addColumn('NONE', 'None', 'TINYINT', false, null, null);
$this->addForeignPrimaryKey('TAX_RULE_ID', 'TaxRuleId', 'INTEGER' , 'tax_rule', 'ID', true, null, null);
$this->addForeignPrimaryKey('COUNTRY_ID', 'CountryId', 'INTEGER' , 'country', 'ID', true, null, null);
$this->addForeignPrimaryKey('TAX_ID', 'TaxId', 'INTEGER' , 'tax', 'ID', true, null, null);
$this->addColumn('POSITION', 'Position', 'INTEGER', true, null, null);
$this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
$this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
} // initialize()
@@ -169,7 +163,7 @@ class TaxRuleCountryTableMap extends TableMap
*/
public function buildRelations()
{
$this->addRelation('Tax', '\\Thelia\\Model\\Tax', RelationMap::MANY_TO_ONE, array('tax_id' => 'id', ), 'SET NULL', 'RESTRICT');
$this->addRelation('Tax', '\\Thelia\\Model\\Tax', RelationMap::MANY_TO_ONE, array('tax_id' => 'id', ), 'CASCADE', 'RESTRICT');
$this->addRelation('TaxRule', '\\Thelia\\Model\\TaxRule', RelationMap::MANY_TO_ONE, array('tax_rule_id' => 'id', ), 'CASCADE', 'RESTRICT');
$this->addRelation('Country', '\\Thelia\\Model\\Country', RelationMap::MANY_TO_ONE, array('country_id' => 'id', ), 'CASCADE', 'RESTRICT');
} // buildRelations()
@@ -187,6 +181,59 @@ class TaxRuleCountryTableMap extends TableMap
);
} // getBehaviors()
/**
* Adds an object to the instance pool.
*
* Propel keeps cached copies of objects in an instance pool when they are retrieved
* from the database. In some cases you may need to explicitly add objects
* to the cache in order to ensure that the same objects are always returned by find*()
* and findPk*() calls.
*
* @param \Thelia\Model\TaxRuleCountry $obj A \Thelia\Model\TaxRuleCountry object.
* @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally).
*/
public static function addInstanceToPool($obj, $key = null)
{
if (Propel::isInstancePoolingEnabled()) {
if (null === $key) {
$key = serialize(array((string) $obj->getTaxRuleId(), (string) $obj->getCountryId(), (string) $obj->getTaxId()));
} // if key === null
self::$instances[$key] = $obj;
}
}
/**
* Removes an object from the instance pool.
*
* Propel keeps cached copies of objects in an instance pool when they are retrieved
* from the database. In some cases -- especially when you override doDelete
* methods in your stub classes -- you may need to explicitly remove objects
* from the cache in order to prevent returning objects that no longer exist.
*
* @param mixed $value A \Thelia\Model\TaxRuleCountry object or a primary key value.
*/
public static function removeInstanceFromPool($value)
{
if (Propel::isInstancePoolingEnabled() && null !== $value) {
if (is_object($value) && $value instanceof \Thelia\Model\TaxRuleCountry) {
$key = serialize(array((string) $value->getTaxRuleId(), (string) $value->getCountryId(), (string) $value->getTaxId()));
} elseif (is_array($value) && count($value) === 3) {
// assume we've been passed a primary key";
$key = serialize(array((string) $value[0], (string) $value[1], (string) $value[2]));
} elseif ($value instanceof Criteria) {
self::$instances = [];
return;
} else {
$e = new PropelException("Invalid value passed to removeInstanceFromPool(). Expected primary key or \Thelia\Model\TaxRuleCountry object; got " . (is_object($value) ? get_class($value) . ' object.' : var_export($value, true)));
throw $e;
}
unset(self::$instances[$key]);
}
}
/**
* Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
*
@@ -201,11 +248,11 @@ class TaxRuleCountryTableMap extends TableMap
public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
{
// If the PK cannot be derived from the row, return NULL.
if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null) {
if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('TaxRuleId', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 1 + $offset : static::translateFieldName('CountryId', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 2 + $offset : static::translateFieldName('TaxId', TableMap::TYPE_PHPNAME, $indexType)] === null) {
return null;
}
return (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
return serialize(array((string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('TaxRuleId', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 1 + $offset : static::translateFieldName('CountryId', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 2 + $offset : static::translateFieldName('TaxId', TableMap::TYPE_PHPNAME, $indexType)]));
}
/**
@@ -223,11 +270,7 @@ class TaxRuleCountryTableMap extends TableMap
public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
{
return (int) $row[
$indexType == TableMap::TYPE_NUM
? 0 + $offset
: self::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)
];
return $pks;
}
/**
@@ -325,19 +368,17 @@ class TaxRuleCountryTableMap extends TableMap
public static function addSelectColumns(Criteria $criteria, $alias = null)
{
if (null === $alias) {
$criteria->addSelectColumn(TaxRuleCountryTableMap::ID);
$criteria->addSelectColumn(TaxRuleCountryTableMap::TAX_RULE_ID);
$criteria->addSelectColumn(TaxRuleCountryTableMap::COUNTRY_ID);
$criteria->addSelectColumn(TaxRuleCountryTableMap::TAX_ID);
$criteria->addSelectColumn(TaxRuleCountryTableMap::NONE);
$criteria->addSelectColumn(TaxRuleCountryTableMap::POSITION);
$criteria->addSelectColumn(TaxRuleCountryTableMap::CREATED_AT);
$criteria->addSelectColumn(TaxRuleCountryTableMap::UPDATED_AT);
} else {
$criteria->addSelectColumn($alias . '.ID');
$criteria->addSelectColumn($alias . '.TAX_RULE_ID');
$criteria->addSelectColumn($alias . '.COUNTRY_ID');
$criteria->addSelectColumn($alias . '.TAX_ID');
$criteria->addSelectColumn($alias . '.NONE');
$criteria->addSelectColumn($alias . '.POSITION');
$criteria->addSelectColumn($alias . '.CREATED_AT');
$criteria->addSelectColumn($alias . '.UPDATED_AT');
}
@@ -391,7 +432,18 @@ class TaxRuleCountryTableMap extends TableMap
$criteria = $values->buildPkeyCriteria();
} else { // it's a primary key, or an array of pks
$criteria = new Criteria(TaxRuleCountryTableMap::DATABASE_NAME);
$criteria->add(TaxRuleCountryTableMap::ID, (array) $values, Criteria::IN);
// primary key is composite; we therefore, expect
// the primary key passed to be an array of pkey values
if (count($values) == count($values, COUNT_RECURSIVE)) {
// array is not multi-dimensional
$values = array($values);
}
foreach ($values as $value) {
$criterion = $criteria->getNewCriterion(TaxRuleCountryTableMap::TAX_RULE_ID, $value[0]);
$criterion->addAnd($criteria->getNewCriterion(TaxRuleCountryTableMap::COUNTRY_ID, $value[1]));
$criterion->addAnd($criteria->getNewCriterion(TaxRuleCountryTableMap::TAX_ID, $value[2]));
$criteria->addOr($criterion);
}
}
$query = TaxRuleCountryQuery::create()->mergeWith($criteria);

44
core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php
View File

@@ -57,7 +57,7 @@ class TaxRuleI18nTableMap extends TableMap
/**
* The total number of columns
*/
const NUM_COLUMNS = 2;
const NUM_COLUMNS = 4;
/**
* The number of lazy-loaded columns
@@ -67,7 +67,7 @@ class TaxRuleI18nTableMap extends TableMap
/**
* The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
*/
const NUM_HYDRATE_COLUMNS = 2;
const NUM_HYDRATE_COLUMNS = 4;
/**
* the column name for the ID field
@@ -79,6 +79,16 @@ class TaxRuleI18nTableMap extends TableMap
*/
const LOCALE = 'tax_rule_i18n.LOCALE';
/**
* the column name for the TITLE field
*/
const TITLE = 'tax_rule_i18n.TITLE';
/**
* the column name for the DESCRIPTION field
*/
const DESCRIPTION = 'tax_rule_i18n.DESCRIPTION';
/**
* The default string format for model objects of the related table
*/
@@ -91,12 +101,12 @@ class TaxRuleI18nTableMap extends TableMap
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
protected static $fieldNames = array (
self::TYPE_PHPNAME => array('Id', 'Locale', ),
self::TYPE_STUDLYPHPNAME => array('id', 'locale', ),
self::TYPE_COLNAME => array(TaxRuleI18nTableMap::ID, TaxRuleI18nTableMap::LOCALE, ),
self::TYPE_RAW_COLNAME => array('ID', 'LOCALE', ),
self::TYPE_FIELDNAME => array('id', 'locale', ),
self::TYPE_NUM => array(0, 1, )
self::TYPE_PHPNAME => array('Id', 'Locale', 'Title', 'Description', ),
self::TYPE_STUDLYPHPNAME => array('id', 'locale', 'title', 'description', ),
self::TYPE_COLNAME => array(TaxRuleI18nTableMap::ID, TaxRuleI18nTableMap::LOCALE, TaxRuleI18nTableMap::TITLE, TaxRuleI18nTableMap::DESCRIPTION, ),
self::TYPE_RAW_COLNAME => array('ID', 'LOCALE', 'TITLE', 'DESCRIPTION', ),
self::TYPE_FIELDNAME => array('id', 'locale', 'title', 'description', ),
self::TYPE_NUM => array(0, 1, 2, 3, )
);
/**
@@ -106,12 +116,12 @@ class TaxRuleI18nTableMap extends TableMap
* e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
*/
protected static $fieldKeys = array (
self::TYPE_PHPNAME => array('Id' => 0, 'Locale' => 1, ),
self::TYPE_STUDLYPHPNAME => array('id' => 0, 'locale' => 1, ),
self::TYPE_COLNAME => array(TaxRuleI18nTableMap::ID => 0, TaxRuleI18nTableMap::LOCALE => 1, ),
self::TYPE_RAW_COLNAME => array('ID' => 0, 'LOCALE' => 1, ),
self::TYPE_FIELDNAME => array('id' => 0, 'locale' => 1, ),
self::TYPE_NUM => array(0, 1, )
self::TYPE_PHPNAME => array('Id' => 0, 'Locale' => 1, 'Title' => 2, 'Description' => 3, ),
self::TYPE_STUDLYPHPNAME => array('id' => 0, 'locale' => 1, 'title' => 2, 'description' => 3, ),
self::TYPE_COLNAME => array(TaxRuleI18nTableMap::ID => 0, TaxRuleI18nTableMap::LOCALE => 1, TaxRuleI18nTableMap::TITLE => 2, TaxRuleI18nTableMap::DESCRIPTION => 3, ),
self::TYPE_RAW_COLNAME => array('ID' => 0, 'LOCALE' => 1, 'TITLE' => 2, 'DESCRIPTION' => 3, ),
self::TYPE_FIELDNAME => array('id' => 0, 'locale' => 1, 'title' => 2, 'description' => 3, ),
self::TYPE_NUM => array(0, 1, 2, 3, )
);
/**
@@ -132,6 +142,8 @@ class TaxRuleI18nTableMap extends TableMap
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'tax_rule', 'ID', true, null, null);
$this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'LONGVARCHAR', false, null, null);
} // initialize()
/**
@@ -331,9 +343,13 @@ class TaxRuleI18nTableMap extends TableMap
if (null === $alias) {
$criteria->addSelectColumn(TaxRuleI18nTableMap::ID);
$criteria->addSelectColumn(TaxRuleI18nTableMap::LOCALE);
$criteria->addSelectColumn(TaxRuleI18nTableMap::TITLE);
$criteria->addSelectColumn(TaxRuleI18nTableMap::DESCRIPTION);
} else {
$criteria->addSelectColumn($alias . '.ID');
$criteria->addSelectColumn($alias . '.LOCALE');
$criteria->addSelectColumn($alias . '.TITLE');
$criteria->addSelectColumn($alias . '.DESCRIPTION');
}
}

54
core/lib/Thelia/Model/Map/TaxRuleTableMap.php
View File

@@ -57,7 +57,7 @@ class TaxRuleTableMap extends TableMap
/**
* The total number of columns
*/
const NUM_COLUMNS = 6;
const NUM_COLUMNS = 3;
/**
* The number of lazy-loaded columns
@@ -67,28 +67,13 @@ class TaxRuleTableMap extends TableMap
/**
* The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
*/
const NUM_HYDRATE_COLUMNS = 6;
const NUM_HYDRATE_COLUMNS = 3;
/**
* the column name for the ID field
*/
const ID = 'tax_rule.ID';
/**
* the column name for the CODE field
*/
const CODE = 'tax_rule.CODE';
/**
* the column name for the TITLE field
*/
const TITLE = 'tax_rule.TITLE';
/**
* the column name for the DESCRIPTION field
*/
const DESCRIPTION = 'tax_rule.DESCRIPTION';
/**
* the column name for the CREATED_AT field
*/
@@ -120,12 +105,12 @@ class TaxRuleTableMap extends TableMap
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
protected static $fieldNames = array (
self::TYPE_PHPNAME => array('Id', 'Code', 'Title', 'Description', 'CreatedAt', 'UpdatedAt', ),
self::TYPE_STUDLYPHPNAME => array('id', 'code', 'title', 'description', 'createdAt', 'updatedAt', ),
self::TYPE_COLNAME => array(TaxRuleTableMap::ID, TaxRuleTableMap::CODE, TaxRuleTableMap::TITLE, TaxRuleTableMap::DESCRIPTION, TaxRuleTableMap::CREATED_AT, TaxRuleTableMap::UPDATED_AT, ),
self::TYPE_RAW_COLNAME => array('ID', 'CODE', 'TITLE', 'DESCRIPTION', 'CREATED_AT', 'UPDATED_AT', ),
self::TYPE_FIELDNAME => array('id', 'code', 'title', 'description', 'created_at', 'updated_at', ),
self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, )
self::TYPE_PHPNAME => array('Id', 'CreatedAt', 'UpdatedAt', ),
self::TYPE_STUDLYPHPNAME => array('id', 'createdAt', 'updatedAt', ),
self::TYPE_COLNAME => array(TaxRuleTableMap::ID, TaxRuleTableMap::CREATED_AT, TaxRuleTableMap::UPDATED_AT, ),
self::TYPE_RAW_COLNAME => array('ID', 'CREATED_AT', 'UPDATED_AT', ),
self::TYPE_FIELDNAME => array('id', 'created_at', 'updated_at', ),
self::TYPE_NUM => array(0, 1, 2, )
);
/**
@@ -135,12 +120,12 @@ class TaxRuleTableMap extends TableMap
* e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
*/
protected static $fieldKeys = array (
self::TYPE_PHPNAME => array('Id' => 0, 'Code' => 1, 'Title' => 2, 'Description' => 3, 'CreatedAt' => 4, 'UpdatedAt' => 5, ),
self::TYPE_STUDLYPHPNAME => array('id' => 0, 'code' => 1, 'title' => 2, 'description' => 3, 'createdAt' => 4, 'updatedAt' => 5, ),
self::TYPE_COLNAME => array(TaxRuleTableMap::ID => 0, TaxRuleTableMap::CODE => 1, TaxRuleTableMap::TITLE => 2, TaxRuleTableMap::DESCRIPTION => 3, TaxRuleTableMap::CREATED_AT => 4, TaxRuleTableMap::UPDATED_AT => 5, ),
self::TYPE_RAW_COLNAME => array('ID' => 0, 'CODE' => 1, 'TITLE' => 2, 'DESCRIPTION' => 3, 'CREATED_AT' => 4, 'UPDATED_AT' => 5, ),
self::TYPE_FIELDNAME => array('id' => 0, 'code' => 1, 'title' => 2, 'description' => 3, 'created_at' => 4, 'updated_at' => 5, ),
self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, )
self::TYPE_PHPNAME => array('Id' => 0, 'CreatedAt' => 1, 'UpdatedAt' => 2, ),
self::TYPE_STUDLYPHPNAME => array('id' => 0, 'createdAt' => 1, 'updatedAt' => 2, ),
self::TYPE_COLNAME => array(TaxRuleTableMap::ID => 0, TaxRuleTableMap::CREATED_AT => 1, TaxRuleTableMap::UPDATED_AT => 2, ),
self::TYPE_RAW_COLNAME => array('ID' => 0, 'CREATED_AT' => 1, 'UPDATED_AT' => 2, ),
self::TYPE_FIELDNAME => array('id' => 0, 'created_at' => 1, 'updated_at' => 2, ),
self::TYPE_NUM => array(0, 1, 2, )
);
/**
@@ -160,9 +145,6 @@ class TaxRuleTableMap extends TableMap
$this->setUseIdGenerator(true);
// columns
$this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
$this->addColumn('CODE', 'Code', 'VARCHAR', false, 45, null);
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'LONGVARCHAR', false, null, null);
$this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
$this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
} // initialize()
@@ -187,7 +169,7 @@ class TaxRuleTableMap extends TableMap
{
return array(
'timestampable' => array('create_column' => 'created_at', 'update_column' => 'updated_at', ),
'i18n' => array('i18n_table' => '%TABLE%_i18n', 'i18n_phpname' => '%PHPNAME%I18n', 'i18n_columns' => '', 'locale_column' => 'locale', 'locale_length' => '5', 'default_locale' => '', 'locale_alias' => '', ),
'i18n' => array('i18n_table' => '%TABLE%_i18n', 'i18n_phpname' => '%PHPNAME%I18n', 'i18n_columns' => 'title, description', 'locale_column' => 'locale', 'locale_length' => '5', 'default_locale' => '', 'locale_alias' => '', ),
);
} // getBehaviors()
/**
@@ -341,16 +323,10 @@ class TaxRuleTableMap extends TableMap
{
if (null === $alias) {
$criteria->addSelectColumn(TaxRuleTableMap::ID);
$criteria->addSelectColumn(TaxRuleTableMap::CODE);
$criteria->addSelectColumn(TaxRuleTableMap::TITLE);
$criteria->addSelectColumn(TaxRuleTableMap::DESCRIPTION);
$criteria->addSelectColumn(TaxRuleTableMap::CREATED_AT);
$criteria->addSelectColumn(TaxRuleTableMap::UPDATED_AT);
} else {
$criteria->addSelectColumn($alias . '.ID');
$criteria->addSelectColumn($alias . '.CODE');
$criteria->addSelectColumn($alias . '.TITLE');
$criteria->addSelectColumn($alias . '.DESCRIPTION');
$criteria->addSelectColumn($alias . '.CREATED_AT');
$criteria->addSelectColumn($alias . '.UPDATED_AT');
}

2
core/lib/Thelia/Model/Map/TaxTableMap.php
View File

@@ -160,7 +160,7 @@ class TaxTableMap extends TableMap
*/
public function buildRelations()
{
$this->addRelation('TaxRuleCountry', '\\Thelia\\Model\\TaxRuleCountry', RelationMap::ONE_TO_MANY, array('id' => 'tax_id', ), 'SET NULL', 'RESTRICT', 'TaxRuleCountries');
$this->addRelation('TaxRuleCountry', '\\Thelia\\Model\\TaxRuleCountry', RelationMap::ONE_TO_MANY, array('id' => 'tax_id', ), 'CASCADE', 'RESTRICT', 'TaxRuleCountries');
$this->addRelation('TaxI18n', '\\Thelia\\Model\\TaxI18n', RelationMap::ONE_TO_MANY, array('id' => 'id', ), 'CASCADE', null, 'TaxI18ns');
} // buildRelations()

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

@@ -2,8 +2,10 @@
namespace Thelia\Model;
use Propel\Runtime\Exception\PropelException;
use Thelia\Model\Base\Product as BaseProduct;
use Thelia\Tools\URL;
use Thelia\TaxEngine\Calculator;
class Product extends BaseProduct
{
@@ -11,4 +13,21 @@ class Product extends BaseProduct
{
return URL::getInstance()->retrieve('product', $this->getId(), $locale)->toString();
}
public function getRealLowestPrice($virtualColumnName = 'real_lowest_price')
{
try {
$amount = $this->getVirtualColumn($virtualColumnName);
} catch(PropelException $e) {
throw new PropelException("Virtual column `$virtualColumnName` does not exist in Product::getRealLowestPrice");
}
return $amount;
}
public function getTaxedPrice(Country $country)
{
$taxCalculator = new Calculator();
return $taxCalculator->load($this, $country)->getTaxedPrice($this->getRealLowestPrice());
}
}

35
core/lib/Thelia/Model/ProductSaleElements.php
View File

@@ -3,8 +3,41 @@
namespace Thelia\Model;
use Thelia\Model\Base\ProductSaleElements as BaseProductSaleElements;
use Thelia\TaxEngine\Calculator;
class ProductSaleElements extends BaseProductSaleElements
class ProductSaleElements extends BaseProductSaleElements
{
public function getPrice($virtualColumnName = 'price_PRICE')
{
try {
$amount = $this->getVirtualColumn($virtualColumnName);
} catch(PropelException $e) {
throw new PropelException("Virtual column `$virtualColumnName` does not exist in ProductSaleElements::getPrice");
}
return $amount;
}
public function getPromoPrice($virtualColumnName = 'price_PROMO_PRICE')
{
try {
$amount = $this->getVirtualColumn($virtualColumnName);
} catch(PropelException $e) {
throw new PropelException("Virtual column `$virtualColumnName` does not exist in ProductSaleElements::getPromoPrice");
}
return $amount;
}
public function getTaxedPrice(Country $country)
{
$taxCalculator = new Calculator();
return $taxCalculator->load($this->getProduct(), $country)->getTaxedPrice($this->getPrice());
}
public function getTaxedPromoPrice(Country $country)
{
$taxCalculator = new Calculator();
return $taxCalculator->load($this->getProduct(), $country)->getTaxedPrice($this->getPromoPrice());
}
}

39
core/lib/Thelia/Model/Tax.php
View File

@@ -2,8 +2,45 @@
namespace Thelia\Model;
use Thelia\Exception\TaxEngineException;
use Thelia\Model\Base\Tax as BaseTax;
class Tax extends BaseTax {
class Tax extends BaseTax
{
public function calculateTax($amount)
{
if(false === filter_var($amount, FILTER_VALIDATE_FLOAT)) {
throw new TaxEngineException('BAD AMOUNT FORMAT', TaxEngineException::BAD_AMOUNT_FORMAT);
}
$rate = $this->getRate();
if($rate === null) {
return 0;
}
return $amount * $rate * 0.01;
}
public function getTaxRuleCountryPosition()
{
try {
$taxRuleCountryPosition = $this->getVirtualColumn(TaxRuleQuery::ALIAS_FOR_TAX_RULE_COUNTRY_POSITION);
} catch(PropelException $e) {
throw new PropelException("Virtual column `" . TaxRuleQuery::ALIAS_FOR_TAX_RULE_COUNTRY_POSITION . "` does not exist in Tax::getTaxRuleCountryPosition");
}
return $taxRuleCountryPosition;
}
public function getTaxRuleRateSum()
{
try {
$taxRuleRateSum = $this->getVirtualColumn(TaxRuleQuery::ALIAS_FOR_TAX_RATE_SUM);
} catch(PropelException $e) {
throw new PropelException("Virtual column `" . TaxRuleQuery::ALIAS_FOR_TAX_RATE_SUM . "` does not exist in Tax::getTaxRuleRateSum");
}
return $taxRuleRateSum;
}
}

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

@@ -2,8 +2,10 @@
namespace Thelia\Model;
use Propel\Runtime\ActiveQuery\Criteria;
use Thelia\Model\Base\TaxRuleQuery as BaseTaxRuleQuery;
use Thelia\Model\Map\TaxRuleCountryTableMap;
use Thelia\Model\Map\TaxTableMap;
/**
* Skeleton subclass for performing query and update operations on the 'tax_rule' table.
@@ -15,6 +17,26 @@ use Thelia\Model\Base\TaxRuleQuery as BaseTaxRuleQuery;
* long as it does not already exist in the output directory.
*
*/
class TaxRuleQuery extends BaseTaxRuleQuery {
class TaxRuleQuery extends BaseTaxRuleQuery
{
const ALIAS_FOR_TAX_RULE_COUNTRY_POSITION = 'taxRuleCountryPosition';
const ALIAS_FOR_TAX_RATE_SUM = 'taxRateSum';
public function getTaxCalculatorGroupedCollection(Product $product, Country $country)
{
$search = TaxQuery::create()
->filterByTaxRuleCountry(
TaxRuleCountryQuery::create()
->filterByCountry($country, Criteria::EQUAL)
->filterByTaxRuleId($product->getTaxRuleId())
->groupByPosition()
->orderByPosition()
->find()
)
->withColumn(TaxRuleCountryTableMap::POSITION, self::ALIAS_FOR_TAX_RULE_COUNTRY_POSITION)
->withColumn('ROUND(SUM(' . TaxTableMap::RATE . '), 2)', self::ALIAS_FOR_TAX_RATE_SUM)
;
return $search->find();
}
} // TaxRuleQuery

95
core/lib/Thelia/TaxEngine/Calculator.php Executable file
View File

@@ -0,0 +1,95 @@
<?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\TaxEngine;
use Thelia\Exception\TaxEngineException;
use Thelia\Model\Country;
use Thelia\Model\Product;
use Thelia\Model\TaxRuleQuery;
/**
* Class Calculator
* @package Thelia\TaxEngine
* @author Etienne Roudeix <eroudeix@openstudio.fr>
*/
class Calculator
{
protected $taxRuleQuery = null;
protected $taxRulesGroupedCollection = null;
protected $product = null;
protected $country = null;
public function __construct()
{
$this->taxRuleQuery = new TaxRuleQuery();
}
public function load(Product $product, Country $country)
{
$this->product = null;
$this->country = null;
$this->taxRulesGroupedCollection = null;
if($product->getId() === null) {
throw new TaxEngineException('Product id is empty in Calculator::load', TaxEngineException::UNDEFINED_PRODUCT);
}
if($country->getId() === null) {
throw new TaxEngineException('Country id is empty in Calculator::load', TaxEngineException::UNDEFINED_COUNTRY);
}
$this->product = $product;
$this->country = $country;
$this->taxRulesGroupedCollection = $this->taxRuleQuery->getTaxCalculatorGroupedCollection($product, $country);
return $this;
}
public function getTaxAmount($amount)
{
if(null === $this->taxRulesGroupedCollection) {
throw new TaxEngineException('Tax rules collection is empty in Calculator::getTaxAmount', TaxEngineException::UNDEFINED_TAX_RULES_COLLECTION);
}
if(false === filter_var($amount, FILTER_VALIDATE_FLOAT)) {
throw new TaxEngineException('BAD AMOUNT FORMAT', TaxEngineException::BAD_AMOUNT_FORMAT);
}
$totalTaxAmount = 0;
foreach($this->taxRulesGroupedCollection as $taxRule) {
$rateSum = $taxRule->getTaxRuleRateSum();
$taxAmount = $amount * $rateSum * 0.01;
$totalTaxAmount += $taxAmount;
$amount += $taxAmount;
}
return $totalTaxAmount;
}
public function getTaxedPrice($amount)
{
return $amount + $this->getTaxAmount($amount);
}
}

56
core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php
View File

@@ -632,34 +632,34 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase
}
public function testGetValidators()
{
$stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter')
->disableOriginalConstructor()
->getMock();
$stubAdapter->expects($this->any())
->method('getNbArticlesInCart')
->will($this->returnValue(4));
$rule1 = new AvailableForXArticlesManager($stubAdapter);
$operators = array(
AvailableForXArticlesManager::INPUT1 => Operators::SUPERIOR
);
$values = array(
AvailableForXArticlesManager::INPUT1 => 4
);
$rule1->setValidatorsFromForm($operators, $values);
$expected = array(
$operators,
$values
);
$actual = $rule1->getValidators();
$this->assertEquals($expected, $actual);
}
// public function testGetValidators()
// {
// $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter')
// ->disableOriginalConstructor()
// ->getMock();
//
// $stubAdapter->expects($this->any())
// ->method('getNbArticlesInCart')
// ->will($this->returnValue(4));
//
// $rule1 = new AvailableForXArticlesManager($stubAdapter);
// $operators = array(
// AvailableForXArticlesManager::INPUT1 => Operators::SUPERIOR
// );
// $values = array(
// AvailableForXArticlesManager::INPUT1 => 4
// );
// $rule1->setValidatorsFromForm($operators, $values);
//
// $expected = array(
// $operators,
// $values
// );
// $actual = $rule1->getValidators();
//
// $this->assertEquals($expected, $actual);
//
// }
/**

8
core/lib/Thelia/Tests/Constraint/Rule/OperatorsTest.php
View File

@@ -48,6 +48,14 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase
{
}
public function testSomething()
{
// Stop here and mark this test as incomplete.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
}
// /**
// *
// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator

198
core/lib/Thelia/Tests/Constraint/Validator/CustomerParamTest.php
View File

@@ -43,119 +43,127 @@ use Thelia\Model\Customer;
class CustomerParamTest extends \PHPUnit_Framework_TestCase
{
/** @var CouponAdapterInterface $stubTheliaAdapter */
protected $stubTheliaAdapter = null;
/**
* Sets up the fixture, for example, opens a network connection.
* This method is called before a test is executed.
*/
protected function setUp()
public function testSomething()
{
/** @var CouponAdapterInterface $stubTheliaAdapter */
$this->stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock();
}
/**
* Generate valid CouponBaseAdapter
*
* @param int $customerId Customer id
*
* @return CouponAdapterInterface
*/
protected function generateValidCouponBaseAdapterMock($customerId = 4521)
{
$customer = new Customer();
$customer->setId($customerId);
$customer->setFirstname('Firstname');
$customer->setLastname('Lastname');
$customer->setEmail('em@il.com');
/** @var CouponAdapterInterface $stubTheliaAdapter */
$stubTheliaAdapter = $this->getMock(
'Thelia\Coupon\CouponBaseAdapter',
array('getCustomer'),
array()
// Stop here and mark this test as incomplete.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
$stubTheliaAdapter->expects($this->any())
->method('getCustomer')
->will($this->returnValue($customer));
return $stubTheliaAdapter;
}
/**
*
* @covers Thelia\Coupon\Parameter\QuantityParam::compareTo
*
*/
public function testCanUseCoupon()
{
$customerId = 4521;
$couponValidForCustomerId = 4521;
$adapter = $this->generateValidCouponBaseAdapterMock($customerId);
$customerParam = new CustomerParam($adapter, $couponValidForCustomerId);
$expected = 0;
$actual = $customerParam->compareTo($customerId);
$this->assertEquals($expected, $actual);
}
// /**
// *
// * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo
// *
// */
// public function testCanNotUseCouponTest()
// {
// /** @var CouponAdapterInterface $stubTheliaAdapter */
// protected $stubTheliaAdapter = null;
//
// /**
// * Sets up the fixture, for example, opens a network connection.
// * This method is called before a test is executed.
// */
// protected function setUp()
// {
// /** @var CouponAdapterInterface $stubTheliaAdapter */
// $this->stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock();
// }
//
// /**
// * Generate valid CouponBaseAdapter
// *
// * @param int $customerId Customer id
// *
// * @return CouponAdapterInterface
// */
// protected function generateValidCouponBaseAdapterMock($customerId = 4521)
// {
// $customer = new Customer();
// $customer->setId($customerId);
// $customer->setFirstname('Firstname');
// $customer->setLastname('Lastname');
// $customer->setEmail('em@il.com');
//
// /** @var CouponAdapterInterface $stubTheliaAdapter */
// $stubTheliaAdapter = $this->getMock(
// 'Thelia\Coupon\CouponBaseAdapter',
// array('getCustomer'),
// array()
// );
// $stubTheliaAdapter->expects($this->any())
// ->method('getCustomer')
// ->will($this->returnValue($customer));
//
// return $stubTheliaAdapter;
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo
// * @expectedException InvalidArgumentException
// *
// */
// public function testCanNotUseCouponCustomerNotFoundTest()
// public function testCanUseCoupon()
// {
// $customerId = 4521;
// $couponValidForCustomerId = 4521;
//
// $adapter = $this->generateValidCouponBaseAdapterMock($customerId);
//
// $customerParam = new CustomerParam($adapter, $couponValidForCustomerId);
//
// $expected = 0;
// $actual = $customerParam->compareTo($customerId);
// $this->assertEquals($expected, $actual);
// }
//
//// /**
//// *
//// * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo
//// *
//// */
//// public function testCanNotUseCouponTest()
//// {
////
//// }
////
//// /**
//// *
//// * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo
//// * @expectedException InvalidArgumentException
//// *
//// */
//// public function testCanNotUseCouponCustomerNotFoundTest()
//// {
////
//// }
//
//
//
//
//// /**
//// * Test is the object is serializable
//// * If no data is lost during the process
//// */
//// public function isSerializableTest()
//// {
//// $adapter = new CouponBaseAdapter();
//// $intValidator = 42;
//// $intToValidate = -1;
////
//// $param = new QuantityParam($adapter, $intValidator);
////
//// $serialized = base64_encode(serialize($param));
//// /** @var QuantityParam $unserialized */
//// $unserialized = base64_decode(serialize($serialized));
////
//// $this->assertEquals($param->getValue(), $unserialized->getValue());
//// $this->assertEquals($param->getInteger(), $unserialized->getInteger());
////
//// $new = new QuantityParam($adapter, $unserialized->getInteger());
//// $this->assertEquals($param->getInteger(), $new->getInteger());
//// }
//
// /**
// * Test is the object is serializable
// * If no data is lost during the process
// * Tears down the fixture, for example, closes a network connection.
// * This method is called after a test is executed.
// */
// public function isSerializableTest()
// protected function tearDown()
// {
// $adapter = new CouponBaseAdapter();
// $intValidator = 42;
// $intToValidate = -1;
//
// $param = new QuantityParam($adapter, $intValidator);
//
// $serialized = base64_encode(serialize($param));
// /** @var QuantityParam $unserialized */
// $unserialized = base64_decode(serialize($serialized));
//
// $this->assertEquals($param->getValue(), $unserialized->getValue());
// $this->assertEquals($param->getInteger(), $unserialized->getInteger());
//
// $new = new QuantityParam($adapter, $unserialized->getInteger());
// $this->assertEquals($param->getInteger(), $new->getInteger());
// }
/**
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
{
}
}

217
core/lib/Thelia/Tests/Constraint/Validator/DateParamTest.php
View File

@@ -39,113 +39,120 @@ use Thelia\Constraint\Validator\DateParam;
*/
class DateParamTest extends \PHPUnit_Framework_TestCase
{
/**
* Sets up the fixture, for example, opens a network connection.
* This method is called before a test is executed.
*/
protected function setUp()
public function testSomething()
{
// Stop here and mark this test as incomplete.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
}
/**
*
* @covers Thelia\Coupon\Parameter\DateParam::compareTo
*
*/
public function testInferiorDate()
{
$adapter = new CouponBaseAdapter();
$dateValidator = new \DateTime("2012-07-08");
$dateToValidate = new \DateTime("2012-07-07");
$dateParam = new DateParam($adapter, $dateValidator);
$expected = 1;
$actual = $dateParam->compareTo($dateToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\DateParam::compareTo
*
*/
public function testEqualsDate()
{
$adapter = new CouponBaseAdapter();
$dateValidator = new \DateTime("2012-07-08");
$dateToValidate = new \DateTime("2012-07-08");
$dateParam = new DateParam($adapter, $dateValidator);
$expected = 0;
$actual = $dateParam->compareTo($dateToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\DateParam::compareTo
*
*/
public function testSuperiorDate()
{
$adapter = new CouponBaseAdapter();
$dateValidator = new \DateTime("2012-07-08");
$dateToValidate = new \DateTime("2012-07-09");
$dateParam = new DateParam($adapter, $dateValidator);
$expected = -1;
$actual = $dateParam->compareTo($dateToValidate);
$this->assertEquals($expected, $actual);
}
/**
* @covers Thelia\Coupon\Parameter\DateParam::compareTo
* @expectedException InvalidArgumentException
*/
public function testInvalidArgumentException()
{
$adapter = new CouponBaseAdapter();
$dateValidator = new \DateTime("2012-07-08");
$dateToValidate = 1377012588;
$dateParam = new DateParam($adapter, $dateValidator);
$dateParam->compareTo($dateToValidate);
}
/**
* Test is the object is serializable
* If no data is lost during the process
*/
public function isSerializableTest()
{
$adapter = new CouponBaseAdapter();
$dateValidator = new \DateTime("2012-07-08");
$param = new DateParam($adapter, $dateValidator);
$serialized = base64_encode(serialize($param));
/** @var DateParam $unserialized */
$unserialized = base64_decode(serialize($serialized));
$this->assertEquals($param->getValue(), $unserialized->getValue());
$this->assertEquals($param->getDateTime(), $unserialized->getDateTime());
$new = new DateParam($adapter, $unserialized->getDateTime());
$this->assertEquals($param->getDateTime(), $new->getDateTime());
}
/**
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
{
}
// /**
// * Sets up the fixture, for example, opens a network connection.
// * This method is called before a test is executed.
// */
// protected function setUp()
// {
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\DateParam::compareTo
// *
// */
// public function testInferiorDate()
// {
// $adapter = new CouponBaseAdapter();
// $dateValidator = new \DateTime("2012-07-08");
// $dateToValidate = new \DateTime("2012-07-07");
//
// $dateParam = new DateParam($adapter, $dateValidator);
//
// $expected = 1;
// $actual = $dateParam->compareTo($dateToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\DateParam::compareTo
// *
// */
// public function testEqualsDate()
// {
// $adapter = new CouponBaseAdapter();
// $dateValidator = new \DateTime("2012-07-08");
// $dateToValidate = new \DateTime("2012-07-08");
//
// $dateParam = new DateParam($adapter, $dateValidator);
//
// $expected = 0;
// $actual = $dateParam->compareTo($dateToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\DateParam::compareTo
// *
// */
// public function testSuperiorDate()
// {
// $adapter = new CouponBaseAdapter();
// $dateValidator = new \DateTime("2012-07-08");
// $dateToValidate = new \DateTime("2012-07-09");
//
// $dateParam = new DateParam($adapter, $dateValidator);
//
// $expected = -1;
// $actual = $dateParam->compareTo($dateToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// * @covers Thelia\Coupon\Parameter\DateParam::compareTo
// * @expectedException InvalidArgumentException
// */
// public function testInvalidArgumentException()
// {
// $adapter = new CouponBaseAdapter();
// $dateValidator = new \DateTime("2012-07-08");
// $dateToValidate = 1377012588;
//
// $dateParam = new DateParam($adapter, $dateValidator);
//
// $dateParam->compareTo($dateToValidate);
// }
//
// /**
// * Test is the object is serializable
// * If no data is lost during the process
// */
// public function isSerializableTest()
// {
// $adapter = new CouponBaseAdapter();
// $dateValidator = new \DateTime("2012-07-08");
//
// $param = new DateParam($adapter, $dateValidator);
//
// $serialized = base64_encode(serialize($param));
// /** @var DateParam $unserialized */
// $unserialized = base64_decode(serialize($serialized));
//
// $this->assertEquals($param->getValue(), $unserialized->getValue());
// $this->assertEquals($param->getDateTime(), $unserialized->getDateTime());
//
// $new = new DateParam($adapter, $unserialized->getDateTime());
// $this->assertEquals($param->getDateTime(), $new->getDateTime());
// }
//
//
// /**
// * Tears down the fixture, for example, closes a network connection.
// * This method is called after a test is executed.
// */
// protected function tearDown()
// {
// }
}

219
core/lib/Thelia/Tests/Constraint/Validator/IntegerParamTest.php
View File

@@ -40,113 +40,120 @@ use Thelia\Constraint\Validator\IntegerParam;
class IntegerParamTest extends \PHPUnit_Framework_TestCase
{
/**
* Sets up the fixture, for example, opens a network connection.
* This method is called before a test is executed.
*/
protected function setUp()
{
}
/**
*
* @covers Thelia\Coupon\Parameter\IntegerParam::compareTo
*
*/
public function testInferiorInteger()
{
$adapter = new CouponBaseAdapter();
$intValidator = 42;
$intToValidate = 41;
$integerParam = new IntegerParam($adapter, $intValidator);
$expected = 1;
$actual = $integerParam->compareTo($intToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\IntegerParam::compareTo
*
*/
public function testEqualsInteger()
{
$adapter = new CouponBaseAdapter();
$intValidator = 42;
$intToValidate = 42;
$integerParam = new IntegerParam($adapter, $intValidator);
$expected = 0;
$actual = $integerParam->compareTo($intToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\IntegerParam::compareTo
*
*/
public function testSuperiorInteger()
{
$adapter = new CouponBaseAdapter();
$intValidator = 42;
$intToValidate = 43;
$integerParam = new IntegerParam($adapter, $intValidator);
$expected = -1;
$actual = $integerParam->compareTo($intToValidate);
$this->assertEquals($expected, $actual);
}
/**
* @covers Thelia\Coupon\Parameter\IntegerParam::compareTo
* @expectedException InvalidArgumentException
*/
public function testInvalidArgumentException()
{
$adapter = new CouponBaseAdapter();
$intValidator = 42;
$intToValidate = '42';
$integerParam = new IntegerParam($adapter, $intValidator);
$expected = 0;
$actual = $integerParam->compareTo($intToValidate);
$this->assertEquals($expected, $actual);
}
/**
* Test is the object is serializable
* If no data is lost during the process
*/
public function isSerializableTest()
{
$adapter = new CouponBaseAdapter();
$intValidator = 42;
$param = new IntegerParam($adapter, $intValidator);
$serialized = base64_encode(serialize($param));
/** @var IntegerParam $unserialized */
$unserialized = base64_decode(serialize($serialized));
$this->assertEquals($param->getValue(), $unserialized->getValue());
$this->assertEquals($param->getInteger(), $unserialized->getInteger());
$new = new IntegerParam($adapter, $unserialized->getInteger());
$this->assertEquals($param->getInteger(), $new->getInteger());
}
/**
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
public function testSomething()
{
// Stop here and mark this test as incomplete.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
}
// /**
// * Sets up the fixture, for example, opens a network connection.
// * This method is called before a test is executed.
// */
// protected function setUp()
// {
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\IntegerParam::compareTo
// *
// */
// public function testInferiorInteger()
// {
// $adapter = new CouponBaseAdapter();
// $intValidator = 42;
// $intToValidate = 41;
//
// $integerParam = new IntegerParam($adapter, $intValidator);
//
// $expected = 1;
// $actual = $integerParam->compareTo($intToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\IntegerParam::compareTo
// *
// */
// public function testEqualsInteger()
// {
// $adapter = new CouponBaseAdapter();
// $intValidator = 42;
// $intToValidate = 42;
//
// $integerParam = new IntegerParam($adapter, $intValidator);
//
// $expected = 0;
// $actual = $integerParam->compareTo($intToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\IntegerParam::compareTo
// *
// */
// public function testSuperiorInteger()
// {
// $adapter = new CouponBaseAdapter();
// $intValidator = 42;
// $intToValidate = 43;
//
// $integerParam = new IntegerParam($adapter, $intValidator);
//
// $expected = -1;
// $actual = $integerParam->compareTo($intToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// * @covers Thelia\Coupon\Parameter\IntegerParam::compareTo
// * @expectedException InvalidArgumentException
// */
// public function testInvalidArgumentException()
// {
// $adapter = new CouponBaseAdapter();
// $intValidator = 42;
// $intToValidate = '42';
//
// $integerParam = new IntegerParam($adapter, $intValidator);
//
// $expected = 0;
// $actual = $integerParam->compareTo($intToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// * Test is the object is serializable
// * If no data is lost during the process
// */
// public function isSerializableTest()
// {
// $adapter = new CouponBaseAdapter();
// $intValidator = 42;
//
// $param = new IntegerParam($adapter, $intValidator);
//
// $serialized = base64_encode(serialize($param));
// /** @var IntegerParam $unserialized */
// $unserialized = base64_decode(serialize($serialized));
//
// $this->assertEquals($param->getValue(), $unserialized->getValue());
// $this->assertEquals($param->getInteger(), $unserialized->getInteger());
//
// $new = new IntegerParam($adapter, $unserialized->getInteger());
// $this->assertEquals($param->getInteger(), $new->getInteger());
// }
//
// /**
// * Tears down the fixture, for example, closes a network connection.
// * This method is called after a test is executed.
// */
// protected function tearDown()
// {
// }
}

269
core/lib/Thelia/Tests/Constraint/Validator/IntervalParamTest.php
View File

@@ -39,139 +39,146 @@ use Thelia\Constraint\Validator\IntervalParam;
*/
class IntervalParamTest extends \PHPUnit_Framework_TestCase
{
/**
* Sets up the fixture, for example, opens a network connection.
* This method is called before a test is executed.
*/
protected function setUp()
public function testSomething()
{
// Stop here and mark this test as incomplete.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
}
/**
*
* @covers Thelia\Coupon\Parameter\IntervalParam::compareTo
*
*/
public function testInferiorDate()
{
$adapter = new CouponBaseAdapter();
$dateValidatorStart = new \DateTime("2012-07-08");
$dateValidatorInterval = new \DateInterval("P1M"); //1month
$dateToValidate = new \DateTime("2012-07-07");
$dateParam = new IntervalParam($adapter, $dateValidatorStart, $dateValidatorInterval);
$expected = 1;
$actual = $dateParam->compareTo($dateToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\IntervalParam::compareTo
*
*/
public function testEqualsDate()
{
$adapter = new CouponBaseAdapter();
$dateValidatorStart = new \DateTime("2012-07-08");
$dateValidatorInterval = new \DateInterval("P1M"); //1month
$dateToValidate = new \DateTime("2012-07-08");
echo '1 ' . date_format($dateValidatorStart, 'g:ia \o\n l jS F Y') . "\n";
echo '2 ' . date_format($dateToValidate, 'g:ia \o\n l jS F Y') . "\n";
$dateParam = new IntervalParam($adapter, $dateValidatorStart, $dateValidatorInterval);
$expected = 0;
$actual = $dateParam->compareTo($dateToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\IntervalParam::compareTo
*
*/
public function testEqualsDate2()
{
$adapter = new CouponBaseAdapter();
$dateValidatorStart = new \DateTime("2012-07-08");
$dateValidatorInterval = new \DateInterval("P1M"); //1month
$dateToValidate = new \DateTime("2012-08-08");
$dateParam = new IntervalParam($adapter, $dateValidatorStart, $dateValidatorInterval);
$expected = 0;
$actual = $dateParam->compareTo($dateToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\IntervalParam::compareTo
*
*/
public function testSuperiorDate()
{
$adapter = new CouponBaseAdapter();
$dateValidatorStart = new \DateTime("2012-07-08");
$dateValidatorInterval = new \DateInterval("P1M"); //1month
$dateToValidate = new \DateTime("2012-08-09");
$dateParam = new IntervalParam($adapter, $dateValidatorStart, $dateValidatorInterval);
$expected = -1;
$actual = $dateParam->compareTo($dateToValidate);
$this->assertEquals($expected, $actual);
}
/**
* @covers Thelia\Coupon\Parameter\DateParam::compareTo
* @expectedException InvalidArgumentException
*/
public function testInvalidArgumentException()
{
$adapter = new CouponBaseAdapter();
$dateValidatorStart = new \DateTime("2012-07-08");
$dateValidatorInterval = new \DateInterval("P1M"); //1month
$dateToValidate = 1377012588;
$dateParam = new IntervalParam($adapter, $dateValidatorStart, $dateValidatorInterval);
$dateParam->compareTo($dateToValidate);
}
/**
* Test is the object is serializable
* If no data is lost during the process
*/
public function isSerializableTest()
{
$adapter = new CouponBaseAdapter();
$dateValidatorStart = new \DateTime("2012-07-08");
$dateValidatorInterval = new \DateInterval("P1M"); //1month
$param = new IntervalParam($adapter, $dateValidatorStart, $dateValidatorInterval);
$serialized = base64_encode(serialize($param));
/** @var IntervalParam $unserialized */
$unserialized = base64_decode(serialize($serialized));
$this->assertEquals($param->getValue(), $unserialized->getValue());
$this->assertEquals($param->getDatePeriod(), $unserialized->getDatePeriod());
$new = new IntervalParam($adapter, $unserialized->getStart(), $unserialized->getInterval());
$this->assertEquals($param->getDatePeriod(), $new->getDatePeriod());
}
/**
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
{
}
// /**
// * Sets up the fixture, for example, opens a network connection.
// * This method is called before a test is executed.
// */
// protected function setUp()
// {
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\IntervalParam::compareTo
// *
// */
// public function testInferiorDate()
// {
// $adapter = new CouponBaseAdapter();
// $dateValidatorStart = new \DateTime("2012-07-08");
// $dateValidatorInterval = new \DateInterval("P1M"); //1month
// $dateToValidate = new \DateTime("2012-07-07");
//
// $dateParam = new IntervalParam($adapter, $dateValidatorStart, $dateValidatorInterval);
//
// $expected = 1;
// $actual = $dateParam->compareTo($dateToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\IntervalParam::compareTo
// *
// */
// public function testEqualsDate()
// {
// $adapter = new CouponBaseAdapter();
// $dateValidatorStart = new \DateTime("2012-07-08");
// $dateValidatorInterval = new \DateInterval("P1M"); //1month
// $dateToValidate = new \DateTime("2012-07-08");
//
// echo '1 ' . date_format($dateValidatorStart, 'g:ia \o\n l jS F Y') . "\n";
// echo '2 ' . date_format($dateToValidate, 'g:ia \o\n l jS F Y') . "\n";
//
// $dateParam = new IntervalParam($adapter, $dateValidatorStart, $dateValidatorInterval);
//
// $expected = 0;
// $actual = $dateParam->compareTo($dateToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\IntervalParam::compareTo
// *
// */
// public function testEqualsDate2()
// {
// $adapter = new CouponBaseAdapter();
// $dateValidatorStart = new \DateTime("2012-07-08");
// $dateValidatorInterval = new \DateInterval("P1M"); //1month
// $dateToValidate = new \DateTime("2012-08-08");
//
// $dateParam = new IntervalParam($adapter, $dateValidatorStart, $dateValidatorInterval);
//
// $expected = 0;
// $actual = $dateParam->compareTo($dateToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\IntervalParam::compareTo
// *
// */
// public function testSuperiorDate()
// {
// $adapter = new CouponBaseAdapter();
// $dateValidatorStart = new \DateTime("2012-07-08");
// $dateValidatorInterval = new \DateInterval("P1M"); //1month
// $dateToValidate = new \DateTime("2012-08-09");
//
// $dateParam = new IntervalParam($adapter, $dateValidatorStart, $dateValidatorInterval);
//
// $expected = -1;
// $actual = $dateParam->compareTo($dateToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// * @covers Thelia\Coupon\Parameter\DateParam::compareTo
// * @expectedException InvalidArgumentException
// */
// public function testInvalidArgumentException()
// {
// $adapter = new CouponBaseAdapter();
// $dateValidatorStart = new \DateTime("2012-07-08");
// $dateValidatorInterval = new \DateInterval("P1M"); //1month
// $dateToValidate = 1377012588;
//
// $dateParam = new IntervalParam($adapter, $dateValidatorStart, $dateValidatorInterval);
//
// $dateParam->compareTo($dateToValidate);
// }
//
// /**
// * Test is the object is serializable
// * If no data is lost during the process
// */
// public function isSerializableTest()
// {
// $adapter = new CouponBaseAdapter();
// $dateValidatorStart = new \DateTime("2012-07-08");
// $dateValidatorInterval = new \DateInterval("P1M"); //1month
//
// $param = new IntervalParam($adapter, $dateValidatorStart, $dateValidatorInterval);
//
// $serialized = base64_encode(serialize($param));
// /** @var IntervalParam $unserialized */
// $unserialized = base64_decode(serialize($serialized));
//
// $this->assertEquals($param->getValue(), $unserialized->getValue());
// $this->assertEquals($param->getDatePeriod(), $unserialized->getDatePeriod());
//
// $new = new IntervalParam($adapter, $unserialized->getStart(), $unserialized->getInterval());
// $this->assertEquals($param->getDatePeriod(), $new->getDatePeriod());
// }
//
// /**
// * Tears down the fixture, for example, closes a network connection.
// * This method is called after a test is executed.
// */
// protected function tearDown()
// {
// }
}

375
core/lib/Thelia/Tests/Constraint/Validator/PriceParamTest.php
View File

@@ -40,191 +40,198 @@ use Thelia\Constraint\Validator\PriceParam;
class PriceParamTest extends \PHPUnit_Framework_TestCase
{
/**
* Sets up the fixture, for example, opens a network connection.
* This method is called before a test is executed.
*/
protected function setUp()
{
}
/**
*
* @covers Thelia\Coupon\Parameter\PriceParam::compareTo
*
*/
public function testInferiorPrice()
{
$adapter = new CouponBaseAdapter();
$priceValidator = 42.50;
$priceToValidate = 1.00;
$integerParam = new PriceParam($adapter, $priceValidator, 'EUR');
$expected = 1;
$actual = $integerParam->compareTo($priceToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\PriceParam::compareTo
*
*/
public function testInferiorPrice2()
{
$adapter = new CouponBaseAdapter();
$priceValidator = 42.50;
$priceToValidate = 42.49;
$integerParam = new PriceParam($adapter, $priceValidator, 'EUR');
$expected = 1;
$actual = $integerParam->compareTo($priceToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\PriceParam::compareTo
*
*/
public function testEqualsPrice()
{
$adapter = new CouponBaseAdapter();
$priceValidator = 42.50;
$priceToValidate = 42.50;
$integerParam = new PriceParam($adapter, $priceValidator, 'EUR');
$expected = 0;
$actual = $integerParam->compareTo($priceToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\PriceParam::compareTo
*
*/
public function testSuperiorPrice()
{
$adapter = new CouponBaseAdapter();
$priceValidator = 42.50;
$priceToValidate = 42.51;
$integerParam = new PriceParam($adapter, $priceValidator, 'EUR');
$expected = -1;
$actual = $integerParam->compareTo($priceToValidate);
$this->assertEquals($expected, $actual);
}
/**
* @covers Thelia\Coupon\Parameter\PriceParam::compareTo
* @expectedException InvalidArgumentException
*/
public function testInvalidArgumentException()
{
$adapter = new CouponBaseAdapter();
$priceValidator = 42.50;
$priceToValidate = '42.50';
$integerParam = new PriceParam($adapter, $priceValidator, 'EUR');
$expected = 0;
$actual = $integerParam->compareTo($priceToValidate);
$this->assertEquals($expected, $actual);
}
/**
* @covers Thelia\Coupon\Parameter\PriceParam::compareTo
* @expectedException InvalidArgumentException
*/
public function testInvalidArgumentException2()
{
$adapter = new CouponBaseAdapter();
$priceValidator = 42.50;
$priceToValidate = -1;
$integerParam = new PriceParam($adapter, $priceValidator, 'EUR');
$expected = 0;
$actual = $integerParam->compareTo($priceToValidate);
$this->assertEquals($expected, $actual);
}
/**
* @covers Thelia\Coupon\Parameter\PriceParam::compareTo
* @expectedException InvalidArgumentException
*/
public function testInvalidArgumentException3()
{
$adapter = new CouponBaseAdapter();
$priceValidator = 42.50;
$priceToValidate = 0;
$integerParam = new PriceParam($adapter, $priceValidator, 'EUR');
$expected = 0;
$actual = $integerParam->compareTo($priceToValidate);
$this->assertEquals($expected, $actual);
}
/**
* @covers Thelia\Coupon\Parameter\PriceParam::compareTo
* @expectedException InvalidArgumentException
*/
public function testInvalidArgumentException4()
{
$adapter = new CouponBaseAdapter();
$priceValidator = 42.50;
$priceToValidate = 1;
$integerParam = new PriceParam($adapter, $priceValidator, 'GBP');
$expected = 0;
$actual = $integerParam->compareTo($priceToValidate);
$this->assertEquals($expected, $actual);
}
/**
* Test is the object is serializable
* If no data is lost during the process
*/
public function isSerializableTest()
{
$adapter = new CouponBaseAdapter();
$priceValidator = 42.50;
$param = new PriceParam($adapter, $priceValidator, 'GBP');
$serialized = base64_encode(serialize($param));
/** @var PriceParam $unserialized */
$unserialized = base64_decode(serialize($serialized));
$this->assertEquals($param->getValue(), $unserialized->getValue());
$this->assertEquals($param->getPrice(), $unserialized->getPrice());
$this->assertEquals($param->getCurrency(), $unserialized->getCurrency());
$new = new PriceParam($adapter, $unserialized->getPrice(), $unserialized->getCurrency());
$this->assertEquals($param->getPrice(), $new->getPrice());
$this->assertEquals($param->getCurrency(), $new->getCurrency());
}
/**
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
public function testSomething()
{
// Stop here and mark this test as incomplete.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
}
// /**
// * Sets up the fixture, for example, opens a network connection.
// * This method is called before a test is executed.
// */
// protected function setUp()
// {
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\PriceParam::compareTo
// *
// */
// public function testInferiorPrice()
// {
// $adapter = new CouponBaseAdapter();
//
// $priceValidator = 42.50;
// $priceToValidate = 1.00;
//
// $integerParam = new PriceParam($adapter, $priceValidator, 'EUR');
//
// $expected = 1;
// $actual = $integerParam->compareTo($priceToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\PriceParam::compareTo
// *
// */
// public function testInferiorPrice2()
// {
// $adapter = new CouponBaseAdapter();
//
// $priceValidator = 42.50;
// $priceToValidate = 42.49;
//
// $integerParam = new PriceParam($adapter, $priceValidator, 'EUR');
//
// $expected = 1;
// $actual = $integerParam->compareTo($priceToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\PriceParam::compareTo
// *
// */
// public function testEqualsPrice()
// {
// $adapter = new CouponBaseAdapter();
//
// $priceValidator = 42.50;
// $priceToValidate = 42.50;
//
// $integerParam = new PriceParam($adapter, $priceValidator, 'EUR');
//
// $expected = 0;
// $actual = $integerParam->compareTo($priceToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\PriceParam::compareTo
// *
// */
// public function testSuperiorPrice()
// {
// $adapter = new CouponBaseAdapter();
//
// $priceValidator = 42.50;
// $priceToValidate = 42.51;
//
// $integerParam = new PriceParam($adapter, $priceValidator, 'EUR');
//
// $expected = -1;
// $actual = $integerParam->compareTo($priceToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// * @covers Thelia\Coupon\Parameter\PriceParam::compareTo
// * @expectedException InvalidArgumentException
// */
// public function testInvalidArgumentException()
// {
// $adapter = new CouponBaseAdapter();
//
// $priceValidator = 42.50;
// $priceToValidate = '42.50';
//
// $integerParam = new PriceParam($adapter, $priceValidator, 'EUR');
//
// $expected = 0;
// $actual = $integerParam->compareTo($priceToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// * @covers Thelia\Coupon\Parameter\PriceParam::compareTo
// * @expectedException InvalidArgumentException
// */
// public function testInvalidArgumentException2()
// {
// $adapter = new CouponBaseAdapter();
//
// $priceValidator = 42.50;
// $priceToValidate = -1;
//
// $integerParam = new PriceParam($adapter, $priceValidator, 'EUR');
//
// $expected = 0;
// $actual = $integerParam->compareTo($priceToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// * @covers Thelia\Coupon\Parameter\PriceParam::compareTo
// * @expectedException InvalidArgumentException
// */
// public function testInvalidArgumentException3()
// {
// $adapter = new CouponBaseAdapter();
//
// $priceValidator = 42.50;
// $priceToValidate = 0;
//
// $integerParam = new PriceParam($adapter, $priceValidator, 'EUR');
//
// $expected = 0;
// $actual = $integerParam->compareTo($priceToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// * @covers Thelia\Coupon\Parameter\PriceParam::compareTo
// * @expectedException InvalidArgumentException
// */
// public function testInvalidArgumentException4()
// {
// $adapter = new CouponBaseAdapter();
// $priceValidator = 42.50;
// $priceToValidate = 1;
//
// $integerParam = new PriceParam($adapter, $priceValidator, 'GBP');
//
// $expected = 0;
// $actual = $integerParam->compareTo($priceToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// * Test is the object is serializable
// * If no data is lost during the process
// */
// public function isSerializableTest()
// {
// $adapter = new CouponBaseAdapter();
// $priceValidator = 42.50;
//
// $param = new PriceParam($adapter, $priceValidator, 'GBP');
//
// $serialized = base64_encode(serialize($param));
// /** @var PriceParam $unserialized */
// $unserialized = base64_decode(serialize($serialized));
//
// $this->assertEquals($param->getValue(), $unserialized->getValue());
// $this->assertEquals($param->getPrice(), $unserialized->getPrice());
// $this->assertEquals($param->getCurrency(), $unserialized->getCurrency());
//
// $new = new PriceParam($adapter, $unserialized->getPrice(), $unserialized->getCurrency());
// $this->assertEquals($param->getPrice(), $new->getPrice());
// $this->assertEquals($param->getCurrency(), $new->getCurrency());
// }
//
// /**
// * Tears down the fixture, for example, closes a network connection.
// * This method is called after a test is executed.
// */
// protected function tearDown()
// {
// }
}

291
core/lib/Thelia/Tests/Constraint/Validator/QuantityParamTest.php
View File

@@ -40,150 +40,157 @@ use Thelia\Constraint\Validator\QuantityParam;
*/
class QuantityParamTest extends \PHPUnit_Framework_TestCase
{
/**
* Sets up the fixture, for example, opens a network connection.
* This method is called before a test is executed.
*/
protected function setUp()
public function testSomething()
{
// Stop here and mark this test as incomplete.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
}
/**
*
* @covers Thelia\Coupon\Parameter\QuantityParam::compareTo
*
*/
public function testInferiorQuantity()
{
$adapter = new CouponBaseAdapter();
$intValidator = 42;
$intToValidate = 0;
$integerParam = new QuantityParam($adapter, $intValidator);
$expected = 1;
$actual = $integerParam->compareTo($intToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\QuantityParam::compareTo
*
*/
public function testInferiorQuantity2()
{
$adapter = new CouponBaseAdapter();
$intValidator = 42;
$intToValidate = 41;
$integerParam = new QuantityParam($adapter, $intValidator);
$expected = 1;
$actual = $integerParam->compareTo($intToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\QuantityParam::compareTo
*
*/
public function testEqualsQuantity()
{
$adapter = new CouponBaseAdapter();
$intValidator = 42;
$intToValidate = 42;
$integerParam = new QuantityParam($adapter, $intValidator);
$expected = 0;
$actual = $integerParam->compareTo($intToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\QuantityParam::compareTo
*
*/
public function testSuperiorQuantity()
{
$adapter = new CouponBaseAdapter();
$intValidator = 42;
$intToValidate = 43;
$integerParam = new QuantityParam($adapter, $intValidator);
$expected = -1;
$actual = $integerParam->compareTo($intToValidate);
$this->assertEquals($expected, $actual);
}
/**
* @covers Thelia\Coupon\Parameter\QuantityParam::compareTo
* @expectedException InvalidArgumentException
*/
public function testInvalidArgumentException()
{
$adapter = new CouponBaseAdapter();
$intValidator = 42;
$intToValidate = '42';
$integerParam = new QuantityParam($adapter, $intValidator);
$expected = 0;
$actual = $integerParam->compareTo($intToValidate);
$this->assertEquals($expected, $actual);
}
/**
* @covers Thelia\Coupon\Parameter\QuantityParam::compareTo
* @expectedException InvalidArgumentException
*/
public function testInvalidArgumentException2()
{
$adapter = new CouponBaseAdapter();
$intValidator = 42;
$intToValidate = -1;
$integerParam = new QuantityParam($adapter, $intValidator);
$expected = 0;
$actual = $integerParam->compareTo($intToValidate);
$this->assertEquals($expected, $actual);
}
/**
* Test is the object is serializable
* If no data is lost during the process
*/
public function isSerializableTest()
{
$adapter = new CouponBaseAdapter();
$intValidator = 42;
$intToValidate = -1;
$param = new QuantityParam($adapter, $intValidator);
$serialized = base64_encode(serialize($param));
/** @var QuantityParam $unserialized */
$unserialized = base64_decode(serialize($serialized));
$this->assertEquals($param->getValue(), $unserialized->getValue());
$this->assertEquals($param->getInteger(), $unserialized->getInteger());
$new = new QuantityParam($adapter, $unserialized->getInteger());
$this->assertEquals($param->getInteger(), $new->getInteger());
}
/**
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
{
}
// /**
// * Sets up the fixture, for example, opens a network connection.
// * This method is called before a test is executed.
// */
// protected function setUp()
// {
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo
// *
// */
// public function testInferiorQuantity()
// {
// $adapter = new CouponBaseAdapter();
// $intValidator = 42;
// $intToValidate = 0;
//
// $integerParam = new QuantityParam($adapter, $intValidator);
//
// $expected = 1;
// $actual = $integerParam->compareTo($intToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo
// *
// */
// public function testInferiorQuantity2()
// {
// $adapter = new CouponBaseAdapter();
// $intValidator = 42;
// $intToValidate = 41;
//
// $integerParam = new QuantityParam($adapter, $intValidator);
//
// $expected = 1;
// $actual = $integerParam->compareTo($intToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo
// *
// */
// public function testEqualsQuantity()
// {
// $adapter = new CouponBaseAdapter();
// $intValidator = 42;
// $intToValidate = 42;
//
// $integerParam = new QuantityParam($adapter, $intValidator);
//
// $expected = 0;
// $actual = $integerParam->compareTo($intToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo
// *
// */
// public function testSuperiorQuantity()
// {
// $adapter = new CouponBaseAdapter();
// $intValidator = 42;
// $intToValidate = 43;
//
// $integerParam = new QuantityParam($adapter, $intValidator);
//
// $expected = -1;
// $actual = $integerParam->compareTo($intToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo
// * @expectedException InvalidArgumentException
// */
// public function testInvalidArgumentException()
// {
// $adapter = new CouponBaseAdapter();
// $intValidator = 42;
// $intToValidate = '42';
//
// $integerParam = new QuantityParam($adapter, $intValidator);
//
// $expected = 0;
// $actual = $integerParam->compareTo($intToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo
// * @expectedException InvalidArgumentException
// */
// public function testInvalidArgumentException2()
// {
// $adapter = new CouponBaseAdapter();
// $intValidator = 42;
// $intToValidate = -1;
//
// $integerParam = new QuantityParam($adapter, $intValidator);
//
// $expected = 0;
// $actual = $integerParam->compareTo($intToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// * Test is the object is serializable
// * If no data is lost during the process
// */
// public function isSerializableTest()
// {
// $adapter = new CouponBaseAdapter();
// $intValidator = 42;
// $intToValidate = -1;
//
// $param = new QuantityParam($adapter, $intValidator);
//
// $serialized = base64_encode(serialize($param));
// /** @var QuantityParam $unserialized */
// $unserialized = base64_decode(serialize($serialized));
//
// $this->assertEquals($param->getValue(), $unserialized->getValue());
// $this->assertEquals($param->getInteger(), $unserialized->getInteger());
//
// $new = new QuantityParam($adapter, $unserialized->getInteger());
// $this->assertEquals($param->getInteger(), $new->getInteger());
// }
//
// /**
// * Tears down the fixture, for example, closes a network connection.
// * This method is called after a test is executed.
// */
// protected function tearDown()
// {
// }
}

519
core/lib/Thelia/Tests/Constraint/Validator/RepeatedDateParamTest.php
View File

@@ -40,264 +40,271 @@ use Thelia\Constraint\Validator\RepeatedDateParam;
*/
class RepeatedDateParamTest extends \PHPUnit_Framework_TestCase
{
/**
* Sets up the fixture, for example, opens a network connection.
* This method is called before a test is executed.
*/
protected function setUp()
public function testSomething()
{
// Stop here and mark this test as incomplete.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
}
/**
*
* @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo
*
*/
public function testInferiorDate()
{
$adapter = new CouponBaseAdapter();
$startDateValidator = new \DateTime("2012-07-08");
$dateToValidate = new \DateTime("2012-07-07");
$repeatedDateParam = new RepeatedDateParam($adapter);
$repeatedDateParam->setFrom($startDateValidator);
$repeatedDateParam->repeatEveryMonth();
$expected = -1;
$actual = $repeatedDateParam->compareTo($dateToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo
*
*/
public function testEqualsDateRepeatEveryMonthOneTimeFirstPeriod()
{
$adapter = new CouponBaseAdapter();
$startDateValidator = new \DateTime("2012-07-08");
$dateToValidate = new \DateTime("2012-07-08");
$repeatedDateParam = new RepeatedDateParam($adapter);
$repeatedDateParam->setFrom($startDateValidator);
$repeatedDateParam->repeatEveryMonth();
$expected = 0;
$actual = $repeatedDateParam->compareTo($dateToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo
*
*/
public function testEqualsDateRepeatEveryMonthOneTimeSecondPeriod()
{
$adapter = new CouponBaseAdapter();
$startDateValidator = new \DateTime("2012-07-08");
$dateToValidate = new \DateTime("2012-08-08");
$repeatedDateParam = new RepeatedDateParam($adapter);
$repeatedDateParam->setFrom($startDateValidator);
$repeatedDateParam->repeatEveryMonth(1, 1);
$expected = 0;
$actual = $repeatedDateParam->compareTo($dateToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo
*
*/
public function testEqualsDateRepeatEveryMonthTenTimesThirdPeriod()
{
$adapter = new CouponBaseAdapter();
$startDateValidator = new \DateTime("2012-07-08");
$dateToValidate = new \DateTime("2012-09-08");
$repeatedDateParam = new RepeatedDateParam($adapter);
$repeatedDateParam->setFrom($startDateValidator);
$repeatedDateParam->repeatEveryMonth(1, 10);
$expected = 0;
$actual = $repeatedDateParam->compareTo($dateToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo
*
*/
public function testEqualsDateRepeatEveryMonthTenTimesTensPeriod()
{
$adapter = new CouponBaseAdapter();
$startDateValidator = new \DateTime("2012-07-08");
$dateToValidate = new \DateTime("2013-05-08");
$repeatedDateParam = new RepeatedDateParam($adapter);
$repeatedDateParam->setFrom($startDateValidator);
$repeatedDateParam->repeatEveryMonth(1, 10);
$expected = 0;
$actual = $repeatedDateParam->compareTo($dateToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo
*
*/
public function testEqualsDateRepeatEveryFourMonthTwoTimesSecondPeriod()
{
$adapter = new CouponBaseAdapter();
$startDateValidator = new \DateTime("2012-07-08");
$dateToValidate = new \DateTime("2012-11-08");
$repeatedDateParam = new RepeatedDateParam($adapter);
$repeatedDateParam->setFrom($startDateValidator);
$repeatedDateParam->repeatEveryMonth(4, 2);
$expected = 0;
$actual = $repeatedDateParam->compareTo($dateToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo
*
*/
public function testEqualsDateRepeatEveryFourMonthTwoTimesLastPeriod()
{
$adapter = new CouponBaseAdapter();
$startDateValidator = new \DateTime("2012-07-08");
$dateToValidate = new \DateTime("2013-03-08");
$repeatedDateParam = new RepeatedDateParam($adapter);
$repeatedDateParam->setFrom($startDateValidator);
$repeatedDateParam->repeatEveryMonth(4, 2);
$expected = 0;
$actual = $repeatedDateParam->compareTo($dateToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo
*
*/
public function testNotEqualsDateRepeatEveryFourMonthTwoTimes1()
{
$adapter = new CouponBaseAdapter();
$startDateValidator = new \DateTime("2012-07-08");
$dateToValidate = new \DateTime("2012-08-08");
$repeatedDateParam = new RepeatedDateParam($adapter);
$repeatedDateParam->setFrom($startDateValidator);
$repeatedDateParam->repeatEveryMonth(4, 2);
$expected = -1;
$actual = $repeatedDateParam->compareTo($dateToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo
*
*/
public function testNotEqualsDateRepeatEveryFourMonthTwoTimes2()
{
$adapter = new CouponBaseAdapter();
$startDateValidator = new \DateTime("2012-07-08");
$dateToValidate = new \DateTime("2012-12-08");
$repeatedDateParam = new RepeatedDateParam($adapter);
$repeatedDateParam->setFrom($startDateValidator);
$repeatedDateParam->repeatEveryMonth(4, 2);
$expected = -1;
$actual = $repeatedDateParam->compareTo($dateToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo
*
*/
public function testSuperiorDateRepeatEveryFourMonthTwoTimes()
{
$adapter = new CouponBaseAdapter();
$startDateValidator = new \DateTime("2012-07-08");
$dateToValidate = new \DateTime("2013-03-09");
$repeatedDateParam = new RepeatedDateParam($adapter);
$repeatedDateParam->setFrom($startDateValidator);
$repeatedDateParam->repeatEveryMonth(4, 2);
$expected = -1;
$actual = $repeatedDateParam->compareTo($dateToValidate);
$this->assertEquals($expected, $actual);
}
/**
* @covers Thelia\Coupon\Parameter\DateParam::compareTo
* @expectedException InvalidArgumentException
*/
public function testInvalidArgumentException()
{
$adapter = new CouponBaseAdapter();
$startDateValidator = new \DateTime("2012-07-08");
$dateToValidate = 1377012588;
$repeatedDateParam = new RepeatedDateParam($adapter);
$repeatedDateParam->setFrom($startDateValidator);
$repeatedDateParam->repeatEveryMonth(4, 2);
$repeatedDateParam->compareTo($dateToValidate);
}
/**
* Test is the object is serializable
* If no data is lost during the process
*/
public function isSerializableTest()
{
$adapter = new CouponBaseAdapter();
$startDateValidator = new \DateTime("2012-07-08");
$param = new RepeatedDateParam($adapter);
$param->setFrom($startDateValidator);
$param->repeatEveryMonth(4, 2);
$serialized = base64_encode(serialize($param));
/** @var RepeatedDateParam $unserialized */
$unserialized = base64_decode(serialize($serialized));
$this->assertEquals($param->getValue(), $unserialized->getValue());
$this->assertEquals($param->getDatePeriod(), $unserialized->getDatePeriod());
$new = new RepeatedDateParam($adapter);
$new->setFrom($unserialized->getFrom());
$new->repeatEveryMonth($unserialized->getFrequency(), $unserialized->getNbRepetition());
$this->assertEquals($param->getDatePeriod(), $new->getDatePeriod());
}
/**
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
{
}
// /**
// * Sets up the fixture, for example, opens a network connection.
// * This method is called before a test is executed.
// */
// protected function setUp()
// {
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo
// *
// */
// public function testInferiorDate()
// {
// $adapter = new CouponBaseAdapter();
// $startDateValidator = new \DateTime("2012-07-08");
// $dateToValidate = new \DateTime("2012-07-07");
//
// $repeatedDateParam = new RepeatedDateParam($adapter);
// $repeatedDateParam->setFrom($startDateValidator);
// $repeatedDateParam->repeatEveryMonth();
//
// $expected = -1;
// $actual = $repeatedDateParam->compareTo($dateToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo
// *
// */
// public function testEqualsDateRepeatEveryMonthOneTimeFirstPeriod()
// {
// $adapter = new CouponBaseAdapter();
// $startDateValidator = new \DateTime("2012-07-08");
// $dateToValidate = new \DateTime("2012-07-08");
//
// $repeatedDateParam = new RepeatedDateParam($adapter);
// $repeatedDateParam->setFrom($startDateValidator);
// $repeatedDateParam->repeatEveryMonth();
//
// $expected = 0;
// $actual = $repeatedDateParam->compareTo($dateToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo
// *
// */
// public function testEqualsDateRepeatEveryMonthOneTimeSecondPeriod()
// {
// $adapter = new CouponBaseAdapter();
// $startDateValidator = new \DateTime("2012-07-08");
// $dateToValidate = new \DateTime("2012-08-08");
//
// $repeatedDateParam = new RepeatedDateParam($adapter);
// $repeatedDateParam->setFrom($startDateValidator);
// $repeatedDateParam->repeatEveryMonth(1, 1);
//
// $expected = 0;
// $actual = $repeatedDateParam->compareTo($dateToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo
// *
// */
// public function testEqualsDateRepeatEveryMonthTenTimesThirdPeriod()
// {
// $adapter = new CouponBaseAdapter();
// $startDateValidator = new \DateTime("2012-07-08");
// $dateToValidate = new \DateTime("2012-09-08");
//
// $repeatedDateParam = new RepeatedDateParam($adapter);
// $repeatedDateParam->setFrom($startDateValidator);
// $repeatedDateParam->repeatEveryMonth(1, 10);
//
// $expected = 0;
// $actual = $repeatedDateParam->compareTo($dateToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo
// *
// */
// public function testEqualsDateRepeatEveryMonthTenTimesTensPeriod()
// {
// $adapter = new CouponBaseAdapter();
// $startDateValidator = new \DateTime("2012-07-08");
// $dateToValidate = new \DateTime("2013-05-08");
//
// $repeatedDateParam = new RepeatedDateParam($adapter);
// $repeatedDateParam->setFrom($startDateValidator);
// $repeatedDateParam->repeatEveryMonth(1, 10);
//
// $expected = 0;
// $actual = $repeatedDateParam->compareTo($dateToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo
// *
// */
// public function testEqualsDateRepeatEveryFourMonthTwoTimesSecondPeriod()
// {
// $adapter = new CouponBaseAdapter();
// $startDateValidator = new \DateTime("2012-07-08");
// $dateToValidate = new \DateTime("2012-11-08");
//
// $repeatedDateParam = new RepeatedDateParam($adapter);
// $repeatedDateParam->setFrom($startDateValidator);
// $repeatedDateParam->repeatEveryMonth(4, 2);
//
// $expected = 0;
// $actual = $repeatedDateParam->compareTo($dateToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo
// *
// */
// public function testEqualsDateRepeatEveryFourMonthTwoTimesLastPeriod()
// {
// $adapter = new CouponBaseAdapter();
// $startDateValidator = new \DateTime("2012-07-08");
// $dateToValidate = new \DateTime("2013-03-08");
//
// $repeatedDateParam = new RepeatedDateParam($adapter);
// $repeatedDateParam->setFrom($startDateValidator);
// $repeatedDateParam->repeatEveryMonth(4, 2);
//
// $expected = 0;
// $actual = $repeatedDateParam->compareTo($dateToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo
// *
// */
// public function testNotEqualsDateRepeatEveryFourMonthTwoTimes1()
// {
// $adapter = new CouponBaseAdapter();
// $startDateValidator = new \DateTime("2012-07-08");
// $dateToValidate = new \DateTime("2012-08-08");
//
// $repeatedDateParam = new RepeatedDateParam($adapter);
// $repeatedDateParam->setFrom($startDateValidator);
// $repeatedDateParam->repeatEveryMonth(4, 2);
//
// $expected = -1;
// $actual = $repeatedDateParam->compareTo($dateToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo
// *
// */
// public function testNotEqualsDateRepeatEveryFourMonthTwoTimes2()
// {
// $adapter = new CouponBaseAdapter();
// $startDateValidator = new \DateTime("2012-07-08");
// $dateToValidate = new \DateTime("2012-12-08");
//
// $repeatedDateParam = new RepeatedDateParam($adapter);
// $repeatedDateParam->setFrom($startDateValidator);
// $repeatedDateParam->repeatEveryMonth(4, 2);
//
// $expected = -1;
// $actual = $repeatedDateParam->compareTo($dateToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo
// *
// */
// public function testSuperiorDateRepeatEveryFourMonthTwoTimes()
// {
// $adapter = new CouponBaseAdapter();
// $startDateValidator = new \DateTime("2012-07-08");
// $dateToValidate = new \DateTime("2013-03-09");
//
// $repeatedDateParam = new RepeatedDateParam($adapter);
// $repeatedDateParam->setFrom($startDateValidator);
// $repeatedDateParam->repeatEveryMonth(4, 2);
//
// $expected = -1;
// $actual = $repeatedDateParam->compareTo($dateToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// * @covers Thelia\Coupon\Parameter\DateParam::compareTo
// * @expectedException InvalidArgumentException
// */
// public function testInvalidArgumentException()
// {
// $adapter = new CouponBaseAdapter();
// $startDateValidator = new \DateTime("2012-07-08");
// $dateToValidate = 1377012588;
//
// $repeatedDateParam = new RepeatedDateParam($adapter);
// $repeatedDateParam->setFrom($startDateValidator);
// $repeatedDateParam->repeatEveryMonth(4, 2);
//
// $repeatedDateParam->compareTo($dateToValidate);
// }
//
// /**
// * Test is the object is serializable
// * If no data is lost during the process
// */
// public function isSerializableTest()
// {
// $adapter = new CouponBaseAdapter();
// $startDateValidator = new \DateTime("2012-07-08");
//
// $param = new RepeatedDateParam($adapter);
// $param->setFrom($startDateValidator);
// $param->repeatEveryMonth(4, 2);
//
// $serialized = base64_encode(serialize($param));
// /** @var RepeatedDateParam $unserialized */
// $unserialized = base64_decode(serialize($serialized));
//
// $this->assertEquals($param->getValue(), $unserialized->getValue());
// $this->assertEquals($param->getDatePeriod(), $unserialized->getDatePeriod());
//
// $new = new RepeatedDateParam($adapter);
// $new->setFrom($unserialized->getFrom());
// $new->repeatEveryMonth($unserialized->getFrequency(), $unserialized->getNbRepetition());
// $this->assertEquals($param->getDatePeriod(), $new->getDatePeriod());
// }
//
// /**
// * Tears down the fixture, for example, closes a network connection.
// * This method is called after a test is executed.
// */
// protected function tearDown()
// {
// }
}

755
core/lib/Thelia/Tests/Constraint/Validator/RepeatedIntervalParamTest.php
View File

@@ -40,381 +40,388 @@ use Thelia\Constraint\Validator\RepeatedIntervalParam;
class RepeatedIntervalParamTest extends \PHPUnit_Framework_TestCase
{
/**
* Sets up the fixture, for example, opens a network connection.
* This method is called before a test is executed.
*/
protected function setUp()
{
}
/**
*
* @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo
*
*/
public function testInferiorDate()
{
$adapter = new CouponBaseAdapter();
$startDateValidator = new \DateTime("2012-07-08");
$dateToValidate = new \DateTime("2012-07-07");
$duration = 10;
$RepeatedIntervalParam = new RepeatedIntervalParam($adapter);
$RepeatedIntervalParam->setFrom($startDateValidator);
$RepeatedIntervalParam->setDurationInDays($duration);
$RepeatedIntervalParam->repeatEveryMonth();
$expected = -1;
$actual = $RepeatedIntervalParam->compareTo($dateToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo
*
*/
public function testEqualsDateRepeatEveryMonthOneTimeFirstPeriodBeginning()
{
$adapter = new CouponBaseAdapter();
$startDateValidator = new \DateTime("2012-07-08");
$dateToValidate = new \DateTime("2012-07-08");
$duration = 10;
$RepeatedIntervalParam = new RepeatedIntervalParam($adapter);
$RepeatedIntervalParam->setFrom($startDateValidator);
$RepeatedIntervalParam->setDurationInDays($duration);
$RepeatedIntervalParam->repeatEveryMonth();
$expected = 0;
$actual = $RepeatedIntervalParam->compareTo($dateToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo
*
*/
public function testEqualsDateRepeatEveryMonthOneTimeFirstPeriodMiddle()
{
$adapter = new CouponBaseAdapter();
$startDateValidator = new \DateTime("2012-07-08");
$dateToValidate = new \DateTime("2012-07-13");
$duration = 10;
$RepeatedIntervalParam = new RepeatedIntervalParam($adapter);
$RepeatedIntervalParam->setFrom($startDateValidator);
$RepeatedIntervalParam->setDurationInDays($duration);
$RepeatedIntervalParam->repeatEveryMonth();
$expected = 0;
$actual = $RepeatedIntervalParam->compareTo($dateToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo
*
*/
public function testEqualsDateRepeatEveryMonthOneTimeFirstPeriodEnding()
{
$adapter = new CouponBaseAdapter();
$startDateValidator = new \DateTime("2012-07-08");
$dateToValidate = new \DateTime("2012-07-18");
$duration = 10;
$RepeatedIntervalParam = new RepeatedIntervalParam($adapter);
$RepeatedIntervalParam->setFrom($startDateValidator);
$RepeatedIntervalParam->setDurationInDays($duration);
$RepeatedIntervalParam->repeatEveryMonth();
$expected = 0;
$actual = $RepeatedIntervalParam->compareTo($dateToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo
*
*/
public function testEqualsDateRepeatEveryMonthOneTimeSecondPeriodBeginning()
{
$adapter = new CouponBaseAdapter();
$startDateValidator = new \DateTime("2012-08-08");
$dateToValidate = new \DateTime("2012-08-08");
$duration = 10;
$RepeatedIntervalParam = new RepeatedIntervalParam($adapter);
$RepeatedIntervalParam->setFrom($startDateValidator);
$RepeatedIntervalParam->setDurationInDays($duration);
$RepeatedIntervalParam->repeatEveryMonth();
$expected = 0;
$actual = $RepeatedIntervalParam->compareTo($dateToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo
*
*/
public function testEqualsDateRepeatEveryMonthOneTimeSecondPeriodMiddle()
{
$adapter = new CouponBaseAdapter();
$startDateValidator = new \DateTime("2012-08-08");
$dateToValidate = new \DateTime("2012-08-13");
$duration = 10;
$RepeatedIntervalParam = new RepeatedIntervalParam($adapter);
$RepeatedIntervalParam->setFrom($startDateValidator);
$RepeatedIntervalParam->setDurationInDays($duration);
$RepeatedIntervalParam->repeatEveryMonth();
$expected = 0;
$actual = $RepeatedIntervalParam->compareTo($dateToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo
*
*/
public function testEqualsDateRepeatEveryMonthOneTimeSecondPeriodEnding()
{
$adapter = new CouponBaseAdapter();
$startDateValidator = new \DateTime("2012-08-08");
$dateToValidate = new \DateTime("2012-08-18");
$duration = 10;
$RepeatedIntervalParam = new RepeatedIntervalParam($adapter);
$RepeatedIntervalParam->setFrom($startDateValidator);
$RepeatedIntervalParam->setDurationInDays($duration);
$RepeatedIntervalParam->repeatEveryMonth();
$expected = 0;
$actual = $RepeatedIntervalParam->compareTo($dateToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo
*
*/
public function testEqualsDateRepeatEveryMonthFourTimeLastPeriodBeginning()
{
$adapter = new CouponBaseAdapter();
$startDateValidator = new \DateTime("2012-10-08");
$dateToValidate = new \DateTime("2012-10-08");
$duration = 10;
$RepeatedIntervalParam = new RepeatedIntervalParam($adapter);
$RepeatedIntervalParam->setFrom($startDateValidator);
$RepeatedIntervalParam->setDurationInDays($duration);
$RepeatedIntervalParam->repeatEveryMonth(1, 4);
$expected = 0;
$actual = $RepeatedIntervalParam->compareTo($dateToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo
*
*/
public function testEqualsDateRepeatEveryMonthFourTimeLastPeriodMiddle()
{
$adapter = new CouponBaseAdapter();
$startDateValidator = new \DateTime("2012-10-08");
$dateToValidate = new \DateTime("2012-10-13");
$duration = 10;
$RepeatedIntervalParam = new RepeatedIntervalParam($adapter);
$RepeatedIntervalParam->setFrom($startDateValidator);
$RepeatedIntervalParam->setDurationInDays($duration);
$RepeatedIntervalParam->repeatEveryMonth(1, 4);
$expected = 0;
$actual = $RepeatedIntervalParam->compareTo($dateToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo
*
*/
public function testEqualsDateRepeatEveryMonthFourTimeLastPeriodEnding()
{
$adapter = new CouponBaseAdapter();
$startDateValidator = new \DateTime("2012-10-08");
$dateToValidate = new \DateTime("2012-10-18");
$duration = 10;
$RepeatedIntervalParam = new RepeatedIntervalParam($adapter);
$RepeatedIntervalParam->setFrom($startDateValidator);
$RepeatedIntervalParam->setDurationInDays($duration);
$RepeatedIntervalParam->repeatEveryMonth(1, 4);
$expected = 0;
$actual = $RepeatedIntervalParam->compareTo($dateToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo
*
*/
public function testNotEqualsDateRepeatEveryMonthFourTimeInTheBeginning()
{
$adapter = new CouponBaseAdapter();
$startDateValidator = new \DateTime("2012-10-08");
$dateToValidate = new \DateTime("2012-07-19");
$duration = 10;
$RepeatedIntervalParam = new RepeatedIntervalParam($adapter);
$RepeatedIntervalParam->setFrom($startDateValidator);
$RepeatedIntervalParam->setDurationInDays($duration);
$RepeatedIntervalParam->repeatEveryMonth(1, 4);
$expected = -1;
$actual = $RepeatedIntervalParam->compareTo($dateToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo
*
*/
public function testNotEqualsDateRepeatEveryMonthFourTimeInTheMiddle()
{
$adapter = new CouponBaseAdapter();
$startDateValidator = new \DateTime("2012-10-08");
$dateToValidate = new \DateTime("2012-08-01");
$duration = 10;
$RepeatedIntervalParam = new RepeatedIntervalParam($adapter);
$RepeatedIntervalParam->setFrom($startDateValidator);
$RepeatedIntervalParam->setDurationInDays($duration);
$RepeatedIntervalParam->repeatEveryMonth(1, 4);
$expected = -1;
$actual = $RepeatedIntervalParam->compareTo($dateToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo
*
*/
public function testNotEqualsDateRepeatEveryMonthFourTimeInTheEnd()
{
$adapter = new CouponBaseAdapter();
$startDateValidator = new \DateTime("2012-10-08");
$dateToValidate = new \DateTime("2012-08-07");
$duration = 10;
$RepeatedIntervalParam = new RepeatedIntervalParam($adapter);
$RepeatedIntervalParam->setFrom($startDateValidator);
$RepeatedIntervalParam->setDurationInDays($duration);
$RepeatedIntervalParam->repeatEveryMonth(1, 4);
$expected = -1;
$actual = $RepeatedIntervalParam->compareTo($dateToValidate);
$this->assertEquals($expected, $actual);
}
/**
*
* @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo
*
*/
public function testSuperiorDateRepeatEveryMonthFourTime()
{
$adapter = new CouponBaseAdapter();
$startDateValidator = new \DateTime("2012-07-08");
$dateToValidate = new \DateTime("2012-10-19");
$duration = 10;
$RepeatedIntervalParam = new RepeatedIntervalParam($adapter);
$RepeatedIntervalParam->setFrom($startDateValidator);
$RepeatedIntervalParam->setDurationInDays($duration);
$RepeatedIntervalParam->repeatEveryMonth(1, 0);
$expected = -1;
$actual = $RepeatedIntervalParam->compareTo($dateToValidate);
$this->assertEquals($expected, $actual);
}
/**
* @covers Thelia\Coupon\Parameter\DateParam::compareTo
* @expectedException \InvalidArgumentException
*/
public function testInvalidArgumentException()
{
$adapter = new CouponBaseAdapter();
$startDateValidator = new \DateTime("2012-07-08");
$dateToValidate = 1377012588;
$duration = 10;
$RepeatedIntervalParam = new RepeatedIntervalParam($adapter);
$RepeatedIntervalParam->setFrom($startDateValidator);
$RepeatedIntervalParam->setDurationInDays($duration);
$RepeatedIntervalParam->repeatEveryMonth(1, 4);
$RepeatedIntervalParam->compareTo($dateToValidate);
}
/**
* Test is the object is serializable
* If no data is lost during the process
*/
public function isSerializableTest()
{
$adapter = new CouponBaseAdapter();
$startDateValidator = new \DateTime("2012-07-08");
$dateToValidate = 1377012588;
$duration = 10;
$param = new RepeatedIntervalParam($adapter);
$param->setFrom($startDateValidator);
$param->setDurationInDays($duration);
$param->repeatEveryMonth(1, 4);
$serialized = base64_encode(serialize($param));
/** @var RepeatedIntervalParam $unserialized */
$unserialized = base64_decode(serialize($serialized));
$this->assertEquals($param->getValue(), $unserialized->getValue());
$this->assertEquals($param->getDatePeriod(), $unserialized->getDatePeriod());
$new = new RepeatedIntervalParam($adapter);
$new->setFrom($unserialized->getFrom());
$new->repeatEveryMonth($unserialized->getFrequency(), $unserialized->getNbRepetition());
$new->setDurationInDays($unserialized->getDurationInDays());
$this->assertEquals($param->getDatePeriod(), $new->getDatePeriod());
}
/**
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
public function testSomething()
{
// Stop here and mark this test as incomplete.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
}
// /**
// * Sets up the fixture, for example, opens a network connection.
// * This method is called before a test is executed.
// */
// protected function setUp()
// {
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo
// *
// */
// public function testInferiorDate()
// {
// $adapter = new CouponBaseAdapter();
// $startDateValidator = new \DateTime("2012-07-08");
// $dateToValidate = new \DateTime("2012-07-07");
// $duration = 10;
//
// $RepeatedIntervalParam = new RepeatedIntervalParam($adapter);
// $RepeatedIntervalParam->setFrom($startDateValidator);
// $RepeatedIntervalParam->setDurationInDays($duration);
//
// $RepeatedIntervalParam->repeatEveryMonth();
//
// $expected = -1;
// $actual = $RepeatedIntervalParam->compareTo($dateToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo
// *
// */
// public function testEqualsDateRepeatEveryMonthOneTimeFirstPeriodBeginning()
// {
// $adapter = new CouponBaseAdapter();
// $startDateValidator = new \DateTime("2012-07-08");
// $dateToValidate = new \DateTime("2012-07-08");
// $duration = 10;
//
// $RepeatedIntervalParam = new RepeatedIntervalParam($adapter);
// $RepeatedIntervalParam->setFrom($startDateValidator);
// $RepeatedIntervalParam->setDurationInDays($duration);
// $RepeatedIntervalParam->repeatEveryMonth();
//
// $expected = 0;
// $actual = $RepeatedIntervalParam->compareTo($dateToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo
// *
// */
// public function testEqualsDateRepeatEveryMonthOneTimeFirstPeriodMiddle()
// {
// $adapter = new CouponBaseAdapter();
// $startDateValidator = new \DateTime("2012-07-08");
// $dateToValidate = new \DateTime("2012-07-13");
// $duration = 10;
//
// $RepeatedIntervalParam = new RepeatedIntervalParam($adapter);
// $RepeatedIntervalParam->setFrom($startDateValidator);
// $RepeatedIntervalParam->setDurationInDays($duration);
// $RepeatedIntervalParam->repeatEveryMonth();
//
// $expected = 0;
// $actual = $RepeatedIntervalParam->compareTo($dateToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo
// *
// */
// public function testEqualsDateRepeatEveryMonthOneTimeFirstPeriodEnding()
// {
// $adapter = new CouponBaseAdapter();
// $startDateValidator = new \DateTime("2012-07-08");
// $dateToValidate = new \DateTime("2012-07-18");
// $duration = 10;
//
// $RepeatedIntervalParam = new RepeatedIntervalParam($adapter);
// $RepeatedIntervalParam->setFrom($startDateValidator);
// $RepeatedIntervalParam->setDurationInDays($duration);
// $RepeatedIntervalParam->repeatEveryMonth();
//
// $expected = 0;
// $actual = $RepeatedIntervalParam->compareTo($dateToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo
// *
// */
// public function testEqualsDateRepeatEveryMonthOneTimeSecondPeriodBeginning()
// {
// $adapter = new CouponBaseAdapter();
// $startDateValidator = new \DateTime("2012-08-08");
// $dateToValidate = new \DateTime("2012-08-08");
// $duration = 10;
//
// $RepeatedIntervalParam = new RepeatedIntervalParam($adapter);
// $RepeatedIntervalParam->setFrom($startDateValidator);
// $RepeatedIntervalParam->setDurationInDays($duration);
// $RepeatedIntervalParam->repeatEveryMonth();
//
// $expected = 0;
// $actual = $RepeatedIntervalParam->compareTo($dateToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo
// *
// */
// public function testEqualsDateRepeatEveryMonthOneTimeSecondPeriodMiddle()
// {
// $adapter = new CouponBaseAdapter();
// $startDateValidator = new \DateTime("2012-08-08");
// $dateToValidate = new \DateTime("2012-08-13");
// $duration = 10;
//
// $RepeatedIntervalParam = new RepeatedIntervalParam($adapter);
// $RepeatedIntervalParam->setFrom($startDateValidator);
// $RepeatedIntervalParam->setDurationInDays($duration);
// $RepeatedIntervalParam->repeatEveryMonth();
//
// $expected = 0;
// $actual = $RepeatedIntervalParam->compareTo($dateToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo
// *
// */
// public function testEqualsDateRepeatEveryMonthOneTimeSecondPeriodEnding()
// {
// $adapter = new CouponBaseAdapter();
// $startDateValidator = new \DateTime("2012-08-08");
// $dateToValidate = new \DateTime("2012-08-18");
// $duration = 10;
//
// $RepeatedIntervalParam = new RepeatedIntervalParam($adapter);
// $RepeatedIntervalParam->setFrom($startDateValidator);
// $RepeatedIntervalParam->setDurationInDays($duration);
// $RepeatedIntervalParam->repeatEveryMonth();
//
// $expected = 0;
// $actual = $RepeatedIntervalParam->compareTo($dateToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo
// *
// */
// public function testEqualsDateRepeatEveryMonthFourTimeLastPeriodBeginning()
// {
// $adapter = new CouponBaseAdapter();
// $startDateValidator = new \DateTime("2012-10-08");
// $dateToValidate = new \DateTime("2012-10-08");
// $duration = 10;
//
// $RepeatedIntervalParam = new RepeatedIntervalParam($adapter);
// $RepeatedIntervalParam->setFrom($startDateValidator);
// $RepeatedIntervalParam->setDurationInDays($duration);
// $RepeatedIntervalParam->repeatEveryMonth(1, 4);
//
// $expected = 0;
// $actual = $RepeatedIntervalParam->compareTo($dateToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo
// *
// */
// public function testEqualsDateRepeatEveryMonthFourTimeLastPeriodMiddle()
// {
// $adapter = new CouponBaseAdapter();
// $startDateValidator = new \DateTime("2012-10-08");
// $dateToValidate = new \DateTime("2012-10-13");
// $duration = 10;
//
// $RepeatedIntervalParam = new RepeatedIntervalParam($adapter);
// $RepeatedIntervalParam->setFrom($startDateValidator);
// $RepeatedIntervalParam->setDurationInDays($duration);
// $RepeatedIntervalParam->repeatEveryMonth(1, 4);
//
// $expected = 0;
// $actual = $RepeatedIntervalParam->compareTo($dateToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo
// *
// */
// public function testEqualsDateRepeatEveryMonthFourTimeLastPeriodEnding()
// {
// $adapter = new CouponBaseAdapter();
// $startDateValidator = new \DateTime("2012-10-08");
// $dateToValidate = new \DateTime("2012-10-18");
// $duration = 10;
//
// $RepeatedIntervalParam = new RepeatedIntervalParam($adapter);
// $RepeatedIntervalParam->setFrom($startDateValidator);
// $RepeatedIntervalParam->setDurationInDays($duration);
// $RepeatedIntervalParam->repeatEveryMonth(1, 4);
//
// $expected = 0;
// $actual = $RepeatedIntervalParam->compareTo($dateToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo
// *
// */
// public function testNotEqualsDateRepeatEveryMonthFourTimeInTheBeginning()
// {
// $adapter = new CouponBaseAdapter();
// $startDateValidator = new \DateTime("2012-10-08");
// $dateToValidate = new \DateTime("2012-07-19");
// $duration = 10;
//
// $RepeatedIntervalParam = new RepeatedIntervalParam($adapter);
// $RepeatedIntervalParam->setFrom($startDateValidator);
// $RepeatedIntervalParam->setDurationInDays($duration);
// $RepeatedIntervalParam->repeatEveryMonth(1, 4);
//
// $expected = -1;
// $actual = $RepeatedIntervalParam->compareTo($dateToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo
// *
// */
// public function testNotEqualsDateRepeatEveryMonthFourTimeInTheMiddle()
// {
// $adapter = new CouponBaseAdapter();
// $startDateValidator = new \DateTime("2012-10-08");
// $dateToValidate = new \DateTime("2012-08-01");
// $duration = 10;
//
// $RepeatedIntervalParam = new RepeatedIntervalParam($adapter);
// $RepeatedIntervalParam->setFrom($startDateValidator);
// $RepeatedIntervalParam->setDurationInDays($duration);
// $RepeatedIntervalParam->repeatEveryMonth(1, 4);
//
// $expected = -1;
// $actual = $RepeatedIntervalParam->compareTo($dateToValidate);
// $this->assertEquals($expected, $actual);
// }
//
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo
// *
// */
// public function testNotEqualsDateRepeatEveryMonthFourTimeInTheEnd()
// {
// $adapter = new CouponBaseAdapter();
// $startDateValidator = new \DateTime("2012-10-08");
// $dateToValidate = new \DateTime("2012-08-07");
// $duration = 10;
//
// $RepeatedIntervalParam = new RepeatedIntervalParam($adapter);
// $RepeatedIntervalParam->setFrom($startDateValidator);
// $RepeatedIntervalParam->setDurationInDays($duration);
// $RepeatedIntervalParam->repeatEveryMonth(1, 4);
//
// $expected = -1;
// $actual = $RepeatedIntervalParam->compareTo($dateToValidate);
// $this->assertEquals($expected, $actual);
// }
//
//
//
// /**
// *
// * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo
// *
// */
// public function testSuperiorDateRepeatEveryMonthFourTime()
// {
// $adapter = new CouponBaseAdapter();
// $startDateValidator = new \DateTime("2012-07-08");
// $dateToValidate = new \DateTime("2012-10-19");
// $duration = 10;
//
// $RepeatedIntervalParam = new RepeatedIntervalParam($adapter);
// $RepeatedIntervalParam->setFrom($startDateValidator);
// $RepeatedIntervalParam->setDurationInDays($duration);
// $RepeatedIntervalParam->repeatEveryMonth(1, 0);
//
// $expected = -1;
// $actual = $RepeatedIntervalParam->compareTo($dateToValidate);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// * @covers Thelia\Coupon\Parameter\DateParam::compareTo
// * @expectedException \InvalidArgumentException
// */
// public function testInvalidArgumentException()
// {
// $adapter = new CouponBaseAdapter();
// $startDateValidator = new \DateTime("2012-07-08");
// $dateToValidate = 1377012588;
// $duration = 10;
//
// $RepeatedIntervalParam = new RepeatedIntervalParam($adapter);
// $RepeatedIntervalParam->setFrom($startDateValidator);
// $RepeatedIntervalParam->setDurationInDays($duration);
// $RepeatedIntervalParam->repeatEveryMonth(1, 4);
//
// $RepeatedIntervalParam->compareTo($dateToValidate);
// }
//
// /**
// * Test is the object is serializable
// * If no data is lost during the process
// */
// public function isSerializableTest()
// {
// $adapter = new CouponBaseAdapter();
// $startDateValidator = new \DateTime("2012-07-08");
// $dateToValidate = 1377012588;
// $duration = 10;
//
// $param = new RepeatedIntervalParam($adapter);
// $param->setFrom($startDateValidator);
// $param->setDurationInDays($duration);
// $param->repeatEveryMonth(1, 4);
//
// $serialized = base64_encode(serialize($param));
// /** @var RepeatedIntervalParam $unserialized */
// $unserialized = base64_decode(serialize($serialized));
//
// $this->assertEquals($param->getValue(), $unserialized->getValue());
// $this->assertEquals($param->getDatePeriod(), $unserialized->getDatePeriod());
//
// $new = new RepeatedIntervalParam($adapter);
// $new->setFrom($unserialized->getFrom());
// $new->repeatEveryMonth($unserialized->getFrequency(), $unserialized->getNbRepetition());
// $new->setDurationInDays($unserialized->getDurationInDays());
// $this->assertEquals($param->getDatePeriod(), $new->getDatePeriod());
// }
//
// /**
// * Tears down the fixture, for example, closes a network connection.
// * This method is called after a test is executed.
// */
// protected function tearDown()
// {
// }
}

34
core/lib/Thelia/Tests/Core/Template/Element/BaseLoopTestor.php
View File

@@ -23,6 +23,7 @@
namespace Thelia\Tests\Core\Template\Element;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\EventDispatcher\EventDispatcher;
use Thelia\Core\HttpFoundation\Request;
use Thelia\Core\Security\SecurityContext;
@@ -34,11 +35,9 @@ use Thelia\Core\HttpFoundation\Session\Session;
* @author Etienne Roudeix <eroudeix@openstudio.fr>
*
*/
abstract class BaseLoopTestor extends \Thelia\Tests\TestCaseWithURLToolSetup
abstract class BaseLoopTestor extends \PHPUnit_Framework_TestCase
{
protected $request;
protected $dispatcher;
protected $securityContext;
protected $container;
protected $instance;
@@ -57,12 +56,35 @@ abstract class BaseLoopTestor extends \Thelia\Tests\TestCaseWithURLToolSetup
public function setUp()
{
$this->request = new Request();
$this->container = new ContainerBuilder();
$session = new Session(new MockArraySessionStorage());
$request = new Request();
$request->setSession($session);
/*$stubEventdispatcher = $this->getMockBuilder('\Symfony\Component\EventDispatcher\EventDispatcher')
->disableOriginalConstructor()
->getMock();
$stubSecurityContext = $this->getMockBuilder('\Thelia\Core\Security\SecurityContext')
->disableOriginalConstructor()
->getMock();*/
/*$stubAdapter->expects($this->any())
->method('getTranslator')
->will($this->returnValue($stubTranslator));*/
/*$this->request = new Request();
$this->request->setSession(new Session(new MockArraySessionStorage()));
$this->dispatcher = new EventDispatcher();
$this->securityContext = new SecurityContext($this->request);
$this->securityContext = new SecurityContext($this->request);*/
$this->container->set('request', $request);
$this->container->set('event_dispatcher', new EventDispatcher());
$this->container->set('thelia.securityContext', new SecurityContext($request));
$this->instance = $this->getTestedInstance();
$this->instance->initializeArgs($this->getMandatoryArguments());

2
core/lib/Thelia/Tests/Core/Template/Loop/AccessoryTest.php
View File

@@ -41,7 +41,7 @@ class AccessoryTest extends BaseLoopTestor
public function getTestedInstance()
{
return new Accessory($this->request, $this->dispatcher, $this->securityContext);
return new Accessory($this->container);
}
public function getMandatoryArguments()

2
core/lib/Thelia/Tests/Core/Template/Loop/AddressTest.php
View File

@@ -41,7 +41,7 @@ class AddressTest extends BaseLoopTestor
public function getTestedInstance()
{
return new Address($this->request, $this->dispatcher, $this->securityContext);
return new Address($this->container);
}
public function getMandatoryArguments()

2
core/lib/Thelia/Tests/Core/Template/Loop/AssociatedContentTest.php
View File

@@ -41,7 +41,7 @@ class AssociatedContentTest extends BaseLoopTestor
public function getTestedInstance()
{
return new AssociatedContent($this->request, $this->dispatcher, $this->securityContext);
return new AssociatedContent($this->container);
}
public function getMandatoryArguments()

2
core/lib/Thelia/Tests/Core/Template/Loop/AttributeAvailabilityTest.php
View File

@@ -41,7 +41,7 @@ class AttributeAvailabilityTest extends BaseLoopTestor
public function getTestedInstance()
{
return new AttributeAvailability($this->request, $this->dispatcher, $this->securityContext);
return new AttributeAvailability($this->container);
}
public function getMandatoryArguments()

2
core/lib/Thelia/Tests/Core/Template/Loop/AttributeCombinationTest.php
View File

@@ -41,7 +41,7 @@ class AttributeCombinationTest extends BaseLoopTestor
public function getTestedInstance()
{
return new AttributeCombination($this->request, $this->dispatcher, $this->securityContext);
return new AttributeCombination($this->container);
}
public function getMandatoryArguments()

2
core/lib/Thelia/Tests/Core/Template/Loop/AttributeTest.php
View File

@@ -41,7 +41,7 @@ class AttributeTest extends BaseLoopTestor
public function getTestedInstance()
{
return new Attribute($this->request, $this->dispatcher, $this->securityContext);
return new Attribute($this->container);
}
public function getMandatoryArguments()

2
core/lib/Thelia/Tests/Core/Template/Loop/CategoryTest.php
View File

@@ -41,7 +41,7 @@ class CategoryTest extends BaseLoopTestor
public function getTestedInstance()
{
return new Category($this->request, $this->dispatcher, $this->securityContext);
return new Category($this->container);
}
public function getMandatoryArguments()

2
core/lib/Thelia/Tests/Core/Template/Loop/ContentTest.php
View File

@@ -41,7 +41,7 @@ class ContentTest extends BaseLoopTestor
public function getTestedInstance()
{
return new Content($this->request, $this->dispatcher, $this->securityContext);
return new Content($this->container);
}
public function getMandatoryArguments()

2
core/lib/Thelia/Tests/Core/Template/Loop/CountryTest.php
View File

@@ -41,7 +41,7 @@ class CountryTest extends BaseLoopTestor
public function getTestedInstance()
{
return new Country($this->request, $this->dispatcher, $this->securityContext);
return new Country($this->container);
}
public function getMandatoryArguments()

2
core/lib/Thelia/Tests/Core/Template/Loop/CurrencyTest.php
View File

@@ -41,7 +41,7 @@ class CurrencyTest extends BaseLoopTestor
public function getTestedInstance()
{
return new Currency($this->request, $this->dispatcher, $this->securityContext);
return new Currency($this->container);
}
public function getMandatoryArguments()

2
core/lib/Thelia/Tests/Core/Template/Loop/CustomerTest.php
View File

@@ -41,7 +41,7 @@ class CustomerTest extends BaseLoopTestor
public function getTestedInstance()
{
return new Customer($this->request, $this->dispatcher, $this->securityContext);
return new Customer($this->container);
}
public function getMandatoryArguments()

2
core/lib/Thelia/Tests/Core/Template/Loop/FeatureAvailabilityTest.php
View File

@@ -41,7 +41,7 @@ class FeatureAvailabilityTest extends BaseLoopTestor
public function getTestedInstance()
{
return new FeatureAvailability($this->request, $this->dispatcher, $this->securityContext);
return new FeatureAvailability($this->container);
}
public function getMandatoryArguments()

2
core/lib/Thelia/Tests/Core/Template/Loop/FeatureTest.php
View File

@@ -41,7 +41,7 @@ class FeatureTest extends BaseLoopTestor
public function getTestedInstance()
{
return new Feature($this->request, $this->dispatcher, $this->securityContext);
return new Feature($this->container);
}
public function getMandatoryArguments()

2
core/lib/Thelia/Tests/Core/Template/Loop/FeatureValueTest.php
View File

@@ -41,7 +41,7 @@ class FeatureValueTest extends BaseLoopTestor
public function getTestedInstance()
{
return new FeatureValue($this->request, $this->dispatcher, $this->securityContext);
return new FeatureValue($this->container);
}
public function getMandatoryArguments()

2
core/lib/Thelia/Tests/Core/Template/Loop/FolderTest.php
View File

@@ -41,7 +41,7 @@ class FolderTest extends BaseLoopTestor
public function getTestedInstance()
{
return new Folder($this->request, $this->dispatcher, $this->securityContext);
return new Folder($this->container);
}
public function getMandatoryArguments()

2
core/lib/Thelia/Tests/Core/Template/Loop/ProductSaleElementTest.php
View File

@@ -41,7 +41,7 @@ class ProductSaleElementsTest extends BaseLoopTestor
public function getTestedInstance()
{
return new ProductSaleElements($this->request, $this->dispatcher, $this->securityContext);
return new ProductSaleElements($this->container);
}
public function getMandatoryArguments()

6
core/lib/Thelia/Tests/Core/Template/Loop/ProductTest.php
View File

@@ -32,7 +32,7 @@ use Thelia\Core\Template\Loop\Product;
* @author Etienne Roudeix <eroudeix@openstudio.fr>
*
*/
/*class ProductTest extends BaseLoopTestor
class ProductTest extends BaseLoopTestor
{
public function getTestedClassName()
{
@@ -41,11 +41,11 @@ use Thelia\Core\Template\Loop\Product;
public function getTestedInstance()
{
return new Product($this->request, $this->dispatcher, $this->securityContext);
return new Product($this->container);
}
public function getMandatoryArguments()
{
return array();
}
}*/
}

2
core/lib/Thelia/Tests/Core/Template/Loop/TitleTest.php
View File

@@ -41,7 +41,7 @@ class TitleTest extends BaseLoopTestor
public function getTestedInstance()
{
return new Title($this->request, $this->dispatcher, $this->securityContext);
return new Title($this->container);
}
public function getMandatoryArguments()

113
core/lib/Thelia/Tests/Coupon/CouponBaseAdapterTest.php
View File

@@ -36,61 +36,68 @@ namespace Thelia\Coupon;
*/
class CouponBaseAdapterTest extends \PHPUnit_Framework_TestCase
{
/**
* @var CouponBaseAdapter
*/
protected $object;
/**
* Sets up the fixture, for example, opens a network connection.
* This method is called before a test is executed.
*/
protected function setUp()
public function testSomething()
{
$this->object = new CouponBaseAdapter;
}
/**
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
{
}
/**
* @covers Thelia\Coupon\CouponBaseAdapter::getCart
* @todo Implement testGetCart().
*/
public function testGetCart()
{
// Remove the following lines when you implement this test.
// Stop here and mark this test as incomplete.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
}
/**
* @covers Thelia\Coupon\CouponBaseAdapter::getDeliveryAddress
* @todo Implement testGetDeliveryAddress().
*/
public function testGetDeliveryAddress()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
}
/**
* @covers Thelia\Coupon\CouponBaseAdapter::getCustomer
* @todo Implement testGetCustomer().
*/
public function testGetCustomer()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
'This test has not been implemented yet.'
);
}
// /**
// * @var CouponBaseAdapter
// */
// protected $object;
//
// /**
// * Sets up the fixture, for example, opens a network connection.
// * This method is called before a test is executed.
// */
// protected function setUp()
// {
// $this->object = new CouponBaseAdapter;
// }
//
// /**
// * Tears down the fixture, for example, closes a network connection.
// * This method is called after a test is executed.
// */
// protected function tearDown()
// {
// }
//
// /**
// * @covers Thelia\Coupon\CouponBaseAdapter::getCart
// * @todo Implement testGetCart().
// */
// public function testGetCart()
// {
// // Remove the following lines when you implement this test.
// $this->markTestIncomplete(
// 'This test has not been implemented yet.'
// );
// }
//
// /**
// * @covers Thelia\Coupon\CouponBaseAdapter::getDeliveryAddress
// * @todo Implement testGetDeliveryAddress().
// */
// public function testGetDeliveryAddress()
// {
// // Remove the following lines when you implement this test.
// $this->markTestIncomplete(
// 'This test has not been implemented yet.'
// );
// }
//
// /**
// * @covers Thelia\Coupon\CouponBaseAdapter::getCustomer
// * @todo Implement testGetCustomer().
// */
// public function testGetCustomer()
// {
// // Remove the following lines when you implement this test.
// $this->markTestIncomplete(
// 'This test has not been implemented yet.'
// );
// }
}

577
core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php
View File

@@ -46,293 +46,300 @@ require_once 'CouponManagerTest.php';
*/
class CouponFactoryTest extends \PHPUnit_Framework_TestCase
{
/**
* Sets up the fixture, for example, opens a network connection.
* This method is called before a test is executed.
*/
protected function setUp()
public function testSomething()
{
}
/**
* Fake CouponQuery->findByCode
*
* @param string $code Coupon code
* @param string $type Coupon type (object)
* @param string $title Coupon title
* @param string $shortDescription Coupon short description
* @param string $description Coupon description
* @param float $amount Coupon amount
* @param bool $isUsed If Coupon has been used yet
* @param bool $isEnabled If Coupon is enabled
* @param \DateTime $expirationDate When Coupon expires
* @param CouponRuleCollection $rules Coupon rules
* @param bool $isCumulative If Coupon is cumulative
* @param bool $isRemovingPostage If Coupon is removing postage
*
* @return Coupon
*/
public function generateCouponModelMock(
$code = null,
$type = null,
$title = null,
$shortDescription = null,
$description = null,
$amount = null,
$isUsed = null,
$isEnabled = null,
$expirationDate = null,
$rules = null,
$isCumulative = null,
$isRemovingPostage = null
) {
$coupon = $this->generateValidCoupon(
$code,
$type,
$title,
$shortDescription,
$description,
$amount,
$isUsed,
$isEnabled,
$expirationDate,
$rules,
$isCumulative,
$isRemovingPostage
// Stop here and mark this test as incomplete.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
/** @var CouponAdapterInterface $stubCouponBaseAdapter */
$stubCouponBaseAdapter = $this->getMock(
'Thelia\Coupon\CouponBaseAdapter',
array('findOneCouponByCode'),
array()
);
$stubCouponBaseAdapter->expects($this->any())
->method('findOneCouponByCode')
->will($this->returnValue($coupon));
return $stubCouponBaseAdapter;
}
/**
* Test if an expired Coupon is build or not (superior)
*
* @covers Thelia\Coupon\CouponFactory::buildCouponFromCode
* @expectedException \Thelia\Exception\CouponExpiredException
*/
public function testBuildCouponFromCodeExpiredDateBefore()
{
$date = new \DateTime();
$date->setTimestamp(strtotime("today - 2 months"));
/** @var CouponAdapterInterface $mockAdapter */
$mockAdapter = $this->generateCouponModelMock(null, null, null, null, null, null, null, null, $date);
$couponFactory = new CouponFactory($mockAdapter);
$coupon = $couponFactory->buildCouponFromCode('XMAS1');
}
/**
* Test if an expired Coupon is build or not (equal)
*
* @covers Thelia\Coupon\CouponFactory::buildCouponFromCode
* @expectedException \Thelia\Exception\CouponExpiredException
*/
public function testBuildCouponFromCodeExpiredDateEquals()
{
$date = new \DateTime();
/** @var CouponAdapterInterface $mockAdapter */
$mockAdapter = $this->generateCouponModelMock(null, null, null, null, null, null, null, null, $date);
$couponFactory = new CouponFactory($mockAdapter);
$coupon = $couponFactory->buildCouponFromCode('XMAS1');
}
/**
* Test if an expired Coupon is build or not (equal)
*
* @covers Thelia\Coupon\CouponFactory::buildCouponFromCode
* @expectedException \Thelia\Exception\InvalidRuleException
*/
public function testBuildCouponFromCodeWithoutRule()
{
/** @var CouponAdapterInterface $mockAdapter */
$mockAdapter = $this->generateCouponModelMock(null, null, null, null, null, null, null, null, null, new CouponRuleCollection(array()));
$couponFactory = new CouponFactory($mockAdapter);
$coupon = $couponFactory->buildCouponFromCode('XMAS1');
}
/**
* Test if a CouponInterface can be built from database
*
* @covers Thelia\Coupon\CouponFactory::buildCouponFromCode
*/
public function testBuildCouponFromCode()
{
/** @var CouponAdapterInterface $mockAdapter */
$mockAdapter = $this->generateCouponModelMock();
$couponFactory = new CouponFactory($mockAdapter);
/** @var CouponInterface $coupon */
$coupon = $couponFactory->buildCouponFromCode('XMAS1');
$this->assertEquals('XMAS1', $coupon->getCode());
$this->assertEquals('Thelia\Coupon\Type\RemoveXAmount', get_class($coupon));
$this->assertEquals(CouponManagerTest::VALID_TITLE, $coupon->getTitle());
$this->assertEquals(CouponManagerTest::VALID_SHORT_DESCRIPTION, $coupon->getShortDescription());
$this->assertEquals(CouponManagerTest::VALID_DESCRIPTION, $coupon->getDescription());
$this->assertEquals(10.00, $coupon->getDiscount());
$this->assertEquals(1, $coupon->isEnabled());
$date = new \DateTime();
$date->setTimestamp(strtotime("today + 2 months"));
$this->assertEquals($date, $coupon->getExpirationDate());
$rules = $this->generateValidRules();
$this->assertEquals($rules, $coupon->getRules());
$this->assertEquals(1, $coupon->isCumulative());
$this->assertEquals(0, $coupon->isRemovingPostage());
}
/**
* Generate valid CouponRuleInterfaces
*
* @return CouponRuleCollection Set of CouponRuleInterface
*/
protected function generateValidRules()
{
$rule1 = new AvailableForTotalAmount(
, array(
AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator(
Operators::SUPERIOR,
new PriceParam(
, 40.00, 'EUR'
)
)
)
);
$rule2 = new AvailableForTotalAmount(
, array(
AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator(
Operators::INFERIOR,
new PriceParam(
, 400.00, 'EUR'
)
)
)
);
$rules = new CouponRuleCollection(array($rule1, $rule2));
return $rules;
}
/**
* Generate valid CouponInterface
*
* @param string $code Coupon code
* @param string $type Coupon type (object)
* @param string $title Coupon title
* @param string $shortDescription Coupon short description
* @param string $description Coupon description
* @param float $amount Coupon amount
* @param bool $isUsed If Coupon has been used yet
* @param bool $isEnabled If Coupon is enabled
* @param \DateTime $expirationDate When Coupon expires
* @param CouponRuleCollection $rules Coupon rules
* @param bool $isCumulative If Coupon is cumulative
* @param bool $isRemovingPostage If Coupon is removing postage
*
* @return Coupon
*/
public function generateValidCoupon(
$code = null,
$type = null,
$title = null,
$shortDescription = null,
$description = null,
$amount = null,
$isUsed = null,
$isEnabled = null,
$expirationDate = null,
$rules = null,
$isCumulative = null,
$isRemovingPostage = null
) {
$coupon = new Coupon();
if ($code === null) {
$code = 'XMAS1';
}
$coupon->setCode($code);
if ($type === null) {
$type = 'Thelia\Coupon\Type\RemoveXAmount';
}
$coupon->setType($type);
if ($title === null) {
$title = CouponManagerTest::VALID_TITLE;
}
$coupon->setTitle($title);
if ($shortDescription === null) {
$shortDescription = CouponManagerTest::VALID_SHORT_DESCRIPTION;
}
$coupon->setShortDescription($shortDescription);
if ($description === null) {
$description = CouponManagerTest::VALID_DESCRIPTION;
}
$coupon->setDescription($description);
if ($amount === null) {
$amount = 10.00;
}
$coupon->setAmount($amount);
if ($isUsed === null) {
$isUsed = 1;
}
$coupon->setIsUsed($isUsed);
if ($isEnabled === null) {
$isEnabled = 1;
}
$coupon->setIsEnabled($isEnabled);
if ($isCumulative === null) {
$isCumulative = 1;
}
if ($isRemovingPostage === null) {
$isRemovingPostage = 0;
}
if ($expirationDate === null) {
$date = new \DateTime();
$coupon->setExpirationDate(
$date->setTimestamp(strtotime("today + 2 months"))
);
}
if ($rules === null) {
$rules = $this->generateValidRules();
}
$coupon->setSerializedRules(base64_encode(serialize($rules)));
$coupon->setIsCumulative($isCumulative);
$coupon->setIsRemovingPostage($isRemovingPostage);
return $coupon;
}
/**
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
{
}
// /**
// * Sets up the fixture, for example, opens a network connection.
// * This method is called before a test is executed.
// */
// protected function setUp()
// {
// }
//
// /**
// * Fake CouponQuery->findByCode
// *
// * @param string $code Coupon code
// * @param string $type Coupon type (object)
// * @param string $title Coupon title
// * @param string $shortDescription Coupon short description
// * @param string $description Coupon description
// * @param float $amount Coupon amount
// * @param bool $isUsed If Coupon has been used yet
// * @param bool $isEnabled If Coupon is enabled
// * @param \DateTime $expirationDate When Coupon expires
// * @param CouponRuleCollection $rules Coupon rules
// * @param bool $isCumulative If Coupon is cumulative
// * @param bool $isRemovingPostage If Coupon is removing postage
// *
// * @return Coupon
// */
// public function generateCouponModelMock(
// $code = null,
// $type = null,
// $title = null,
// $shortDescription = null,
// $description = null,
// $amount = null,
// $isUsed = null,
// $isEnabled = null,
// $expirationDate = null,
// $rules = null,
// $isCumulative = null,
// $isRemovingPostage = null
// ) {
// $coupon = $this->generateValidCoupon(
// $code,
// $type,
// $title,
// $shortDescription,
// $description,
// $amount,
// $isUsed,
// $isEnabled,
// $expirationDate,
// $rules,
// $isCumulative,
// $isRemovingPostage
// );
//
// /** @var CouponAdapterInterface $stubCouponBaseAdapter */
// $stubCouponBaseAdapter = $this->getMock(
// 'Thelia\Coupon\CouponBaseAdapter',
// array('findOneCouponByCode'),
// array()
// );
// $stubCouponBaseAdapter->expects($this->any())
// ->method('findOneCouponByCode')
// ->will($this->returnValue($coupon));
//
// return $stubCouponBaseAdapter;
// }
//
//
//
// /**
// * Test if an expired Coupon is build or not (superior)
// *
// * @covers Thelia\Coupon\CouponFactory::buildCouponFromCode
// * @expectedException \Thelia\Exception\CouponExpiredException
// */
// public function testBuildCouponFromCodeExpiredDateBefore()
// {
// $date = new \DateTime();
// $date->setTimestamp(strtotime("today - 2 months"));
//
// /** @var CouponAdapterInterface $mockAdapter */
// $mockAdapter = $this->generateCouponModelMock(null, null, null, null, null, null, null, null, $date);
// $couponFactory = new CouponFactory($mockAdapter);
// $coupon = $couponFactory->buildCouponFromCode('XMAS1');
// }
//
// /**
// * Test if an expired Coupon is build or not (equal)
// *
// * @covers Thelia\Coupon\CouponFactory::buildCouponFromCode
// * @expectedException \Thelia\Exception\CouponExpiredException
// */
// public function testBuildCouponFromCodeExpiredDateEquals()
// {
// $date = new \DateTime();
//
// /** @var CouponAdapterInterface $mockAdapter */
// $mockAdapter = $this->generateCouponModelMock(null, null, null, null, null, null, null, null, $date);
// $couponFactory = new CouponFactory($mockAdapter);
// $coupon = $couponFactory->buildCouponFromCode('XMAS1');
// }
//
// /**
// * Test if an expired Coupon is build or not (equal)
// *
// * @covers Thelia\Coupon\CouponFactory::buildCouponFromCode
// * @expectedException \Thelia\Exception\InvalidRuleException
// */
// public function testBuildCouponFromCodeWithoutRule()
// {
// /** @var CouponAdapterInterface $mockAdapter */
// $mockAdapter = $this->generateCouponModelMock(null, null, null, null, null, null, null, null, null, new CouponRuleCollection(array()));
// $couponFactory = new CouponFactory($mockAdapter);
// $coupon = $couponFactory->buildCouponFromCode('XMAS1');
// }
//
// /**
// * Test if a CouponInterface can be built from database
// *
// * @covers Thelia\Coupon\CouponFactory::buildCouponFromCode
// */
// public function testBuildCouponFromCode()
// {
// /** @var CouponAdapterInterface $mockAdapter */
// $mockAdapter = $this->generateCouponModelMock();
// $couponFactory = new CouponFactory($mockAdapter);
// /** @var CouponInterface $coupon */
// $coupon = $couponFactory->buildCouponFromCode('XMAS1');
//
// $this->assertEquals('XMAS1', $coupon->getCode());
// $this->assertEquals('Thelia\Coupon\Type\RemoveXAmount', get_class($coupon));
// $this->assertEquals(CouponManagerTest::VALID_TITLE, $coupon->getTitle());
// $this->assertEquals(CouponManagerTest::VALID_SHORT_DESCRIPTION, $coupon->getShortDescription());
// $this->assertEquals(CouponManagerTest::VALID_DESCRIPTION, $coupon->getDescription());
// $this->assertEquals(10.00, $coupon->getDiscount());
// $this->assertEquals(1, $coupon->isEnabled());
//
// $date = new \DateTime();
// $date->setTimestamp(strtotime("today + 2 months"));
// $this->assertEquals($date, $coupon->getExpirationDate());
//
// $rules = $this->generateValidRules();
// $this->assertEquals($rules, $coupon->getRules());
//
// $this->assertEquals(1, $coupon->isCumulative());
// $this->assertEquals(0, $coupon->isRemovingPostage());
// }
//
// /**
// * Generate valid CouponRuleInterfaces
// *
// * @return CouponRuleCollection Set of CouponRuleInterface
// */
// protected function generateValidRules()
// {
//// $rule1 = new AvailableForTotalAmount(
//// , array(
//// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator(
//// Operators::SUPERIOR,
//// new PriceParam(
//// , 40.00, 'EUR'
//// )
//// )
//// )
//// );
//// $rule2 = new AvailableForTotalAmount(
//// , array(
//// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator(
//// Operators::INFERIOR,
//// new PriceParam(
//// , 400.00, 'EUR'
//// )
//// )
//// )
//// );
//// $rules = new CouponRuleCollection(array($rule1, $rule2));
////
//// return $rules;
// }
//
// /**
// * Generate valid CouponInterface
// *
// * @param string $code Coupon code
// * @param string $type Coupon type (object)
// * @param string $title Coupon title
// * @param string $shortDescription Coupon short description
// * @param string $description Coupon description
// * @param float $amount Coupon amount
// * @param bool $isUsed If Coupon has been used yet
// * @param bool $isEnabled If Coupon is enabled
// * @param \DateTime $expirationDate When Coupon expires
// * @param CouponRuleCollection $rules Coupon rules
// * @param bool $isCumulative If Coupon is cumulative
// * @param bool $isRemovingPostage If Coupon is removing postage
// *
// * @return Coupon
// */
// public function generateValidCoupon(
// $code = null,
// $type = null,
// $title = null,
// $shortDescription = null,
// $description = null,
// $amount = null,
// $isUsed = null,
// $isEnabled = null,
// $expirationDate = null,
// $rules = null,
// $isCumulative = null,
// $isRemovingPostage = null
// ) {
// $coupon = new Coupon();
//
// if ($code === null) {
// $code = 'XMAS1';
// }
// $coupon->setCode($code);
//
// if ($type === null) {
// $type = 'Thelia\Coupon\Type\RemoveXAmount';
// }
// $coupon->setType($type);
//
// if ($title === null) {
// $title = CouponManagerTest::VALID_TITLE;
// }
// $coupon->setTitle($title);
//
// if ($shortDescription === null) {
// $shortDescription = CouponManagerTest::VALID_SHORT_DESCRIPTION;
// }
// $coupon->setShortDescription($shortDescription);
//
// if ($description === null) {
// $description = CouponManagerTest::VALID_DESCRIPTION;
// }
// $coupon->setDescription($description);
//
// if ($amount === null) {
// $amount = 10.00;
// }
// $coupon->setAmount($amount);
//
// if ($isUsed === null) {
// $isUsed = 1;
// }
// $coupon->setIsUsed($isUsed);
//
// if ($isEnabled === null) {
// $isEnabled = 1;
// }
// $coupon->setIsEnabled($isEnabled);
//
// if ($isCumulative === null) {
// $isCumulative = 1;
// }
// if ($isRemovingPostage === null) {
// $isRemovingPostage = 0;
// }
//
// if ($expirationDate === null) {
// $date = new \DateTime();
// $coupon->setExpirationDate(
// $date->setTimestamp(strtotime("today + 2 months"))
// );
// }
//
// if ($rules === null) {
// $rules = $this->generateValidRules();
// }
//
// $coupon->setSerializedRules(base64_encode(serialize($rules)));
//
// $coupon->setIsCumulative($isCumulative);
// $coupon->setIsRemovingPostage($isRemovingPostage);
//
// return $coupon;
// }
//
// /**
// * Tears down the fixture, for example, closes a network connection.
// * This method is called after a test is executed.
// */
// protected function tearDown()
// {
// }
}

1517
core/lib/Thelia/Tests/Coupon/CouponManagerTest.php
View File

File diff suppressed because it is too large Load Diff

71
core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php
View File

@@ -41,39 +41,46 @@ use Thelia\Constraint\Rule\Operators;
*/
class CouponRuleCollectionTest extends \PHPUnit_Framework_TestCase
{
/**
*
*/
public function testRuleSerialisation()
public function testSomething()
{
$rule1 = new AvailableForTotalAmount(
, array(
AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator(
Operators::SUPERIOR,
new PriceParam(
, 40.00, 'EUR'
)
)
)
// Stop here and mark this test as incomplete.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
$rule2 = new AvailableForTotalAmount(
, array(
AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator(
Operators::INFERIOR,
new PriceParam(
, 400.00, 'EUR'
)
)
)
);
$rules = new CouponRuleCollection(array($rule1, $rule2));
$serializedRules = base64_encode(serialize($rules));
$unserializedRules = unserialize(base64_decode($serializedRules));
$expected = $rules;
$actual = $unserializedRules;
$this->assertEquals($expected, $actual);
}
// /**
// *
// */
// public function testRuleSerialisation()
// {
//// $rule1 = new AvailableForTotalAmount(
//// , array(
//// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator(
//// Operators::SUPERIOR,
//// new PriceParam(
//// , 40.00, 'EUR'
//// )
//// )
//// )
//// );
//// $rule2 = new AvailableForTotalAmount(
//// , array(
//// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator(
//// Operators::INFERIOR,
//// new PriceParam(
//// , 400.00, 'EUR'
//// )
//// )
//// )
//// );
//// $rules = new CouponRuleCollection(array($rule1, $rule2));
////
//// $serializedRules = base64_encode(serialize($rules));
//// $unserializedRules = unserialize(base64_decode($serializedRules));
////
//// $expected = $rules;
//// $actual = $unserializedRules;
////
//// $this->assertEquals($expected, $actual);
// }
}

665
core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php
View File

@@ -25,11 +25,11 @@ namespace Thelia\Coupon;
use Thelia\Constraint\Validator\PriceParam;
use Thelia\Constraint\Validator\RuleValidator;
use Thelia\Constraint\Rule\AvailableForTotalAmount;
use Thelia\Constraint\Rule\AvailableForTotalAmountManager;
use Thelia\Constraint\Rule\Operators;
use Thelia\Coupon\Type\RemoveXAmount;
use Thelia\Coupon\Type\RemoveXAmountManager;
require_once '../CouponManagerTest.php';
//require_once '../CouponManagerTest.php';
/**
* Created by JetBrains PhpStorm.
@@ -44,334 +44,341 @@ require_once '../CouponManagerTest.php';
*/
class RemoveXAmountTest extends \PHPUnit_Framework_TestCase
{
/**
* Sets up the fixture, for example, opens a network connection.
* This method is called before a test is executed.
*/
protected function setUp()
public function testSomething()
{
}
/**
* Test if a Coupon is well displayed
*
* @covers Thelia\Coupon\type\RemoveXAmount::getCode
* @covers Thelia\Coupon\type\RemoveXAmount::getTitle
* @covers Thelia\Coupon\type\RemoveXAmount::getShortDescription
* @covers Thelia\Coupon\type\RemoveXAmount::getDescription
*
*/
public function testDisplay()
{
$coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, true, true);
$expected = CouponManagerTest::VALID_CODE;
$actual = $coupon->getCode();
$this->assertEquals($expected, $actual);
$expected = CouponManagerTest::VALID_TITLE;
$actual = $coupon->getTitle();
$this->assertEquals($expected, $actual);
$expected = CouponManagerTest::VALID_SHORT_DESCRIPTION;
$actual = $coupon->getShortDescription();
$this->assertEquals($expected, $actual);
$expected = CouponManagerTest::VALID_DESCRIPTION;
$actual = $coupon->getDescription();
$this->assertEquals($expected, $actual);
}
/**
* Test if a Coupon can be Cumulative
*
* @covers Thelia\Coupon\type\RemoveXAmount::isCumulative
*
*/
public function testIsCumulative()
{
$coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, true, true);
$actual = $coupon->isCumulative();
$this->assertTrue($actual);
}
/**
* Test if a Coupon can be non cumulative
*
* @covers Thelia\Coupon\type\RemoveXAmount::isCumulative
*
*/
public function testIsNotCumulative()
{
$coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
$actual = $coupon->isCumulative();
$this->assertFalse($actual);
}
/**
* Test if a Coupon can remove postage
*
* @covers Thelia\Coupon\type\RemoveXAmount::isRemovingPostage
*
*/
public function testIsRemovingPostage()
{
$coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, true, true);
$actual = $coupon->isRemovingPostage();
$this->assertTrue($actual);
}
/**
* Test if a Coupon won't remove postage if not set to
*
* @covers Thelia\Coupon\type\RemoveXAmount::isRemovingPostage
*/
public function testIsNotRemovingPostage()
{
$coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
$actual = $coupon->isRemovingPostage();
$this->assertFalse($actual);
}
/**
* Test if a Coupon has the effect expected (discount 10euros)
*
* @covers Thelia\Coupon\type\RemoveXAmount::getEffect
*/
public function testGetEffect()
{
$adapter = new CouponBaseAdapter();
$coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
$expected = 10;
$actual = $coupon->getDiscount();
$this->assertEquals($expected, $actual);
}
/**
* Test Coupon rule setter
*
* @covers Thelia\Coupon\type\RemoveXAmount::setRules
* @covers Thelia\Coupon\type\RemoveXAmount::getRules
*/
public function testSetRulesValid()
{
// Given
$rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
Operators::EQUAL,
20.00
// Stop here and mark this test as incomplete.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
$rule1 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
Operators::INFERIOR,
100.23
);
$rule2 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
Operators::SUPERIOR,
421.23
);
$coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
// When
$coupon->setRules(new CouponRuleCollection(array($rule0, $rule1, $rule2)));
// Then
$expected = 3;
$this->assertCount($expected, $coupon->getRules()->getRules());
}
/**
* Test Coupon rule setter
*
* @covers Thelia\Coupon\type\RemoveXAmount::setRules
* @expectedException \Thelia\Exception\InvalidRuleException
*
*/
public function testSetRulesInvalid()
{
// Given
$rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
Operators::EQUAL,
20.00
);
$rule1 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
Operators::INFERIOR,
100.23
);
$rule2 = $this;
$coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
// When
$coupon->setRules(new CouponRuleCollection(array($rule0, $rule1, $rule2)));
}
/**
* Test Coupon effect for rule Total Amount < 400
*
* @covers Thelia\Coupon\type\RemoveXAmount::getEffect
*
*/
public function testGetEffectIfTotalAmountInferiorTo400Valid()
{
// Given
$adapter = new CouponBaseAdapter();
$rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
Operators::INFERIOR,
400.00
);
$coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
// When
$coupon->setRules(new CouponRuleCollection(array($rule0)));
// Then
$expected = 10.00;
$actual = $coupon->getDiscount();
$this->assertEquals($expected, $actual);
}
/**
* Test Coupon effect for rule Total Amount <= 400
*
* @covers Thelia\Coupon\type\RemoveXAmount::getEffect
*
*/
public function testGetEffectIfTotalAmountInferiorOrEqualTo400Valid()
{
// Given
$adapter = new CouponBaseAdapter();
$rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
Operators::INFERIOR_OR_EQUAL,
400.00
);
$coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
// When
$coupon->setRules(new CouponRuleCollection(array($rule0)));
// Then
$expected = 10.00;
$actual = $coupon->getDiscount();
$this->assertEquals($expected, $actual);
}
/**
* Test Coupon effect for rule Total Amount == 400
*
* @covers Thelia\Coupon\type\RemoveXAmount::getEffect
*
*/
public function testGetEffectIfTotalAmountEqualTo400Valid()
{
// Given
$adapter = new CouponBaseAdapter();
$rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
Operators::EQUAL,
400.00
);
$coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
// When
$coupon->setRules(new CouponRuleCollection(array($rule0)));
// Then
$expected = 10.00;
$actual = $coupon->getDiscount();
$this->assertEquals($expected, $actual);
}
/**
* Test Coupon effect for rule Total Amount >= 400
*
* @covers Thelia\Coupon\type\RemoveXAmount::getEffect
*
*/
public function testGetEffectIfTotalAmountSuperiorOrEqualTo400Valid()
{
// Given
$adapter = new CouponBaseAdapter();
$rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
Operators::SUPERIOR_OR_EQUAL,
400.00
);
$coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
// When
$coupon->setRules(new CouponRuleCollection(array($rule0)));
// Then
$expected = 10.00;
$actual = $coupon->getDiscount();
$this->assertEquals($expected, $actual);
}
/**
* Test Coupon effect for rule Total Amount > 400
*
* @covers Thelia\Coupon\type\RemoveXAmount::getEffect
*
*/
public function testGetEffectIfTotalAmountSuperiorTo400Valid()
{
// Given
$adapter = new CouponBaseAdapter();
$rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
Operators::SUPERIOR,
400.00
);
$coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
// When
$coupon->setRules(new CouponRuleCollection(array($rule0)));
// Then
$expected = 10.00;
$actual = $coupon->getDiscount();
$this->assertEquals($expected, $actual);
}
/**
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
{
}
/**
* Generate valid rule AvailableForTotalAmount
* according to given operator and amount
*
* @param string $operator Operators::CONST
* @param float $amount Amount with 2 decimals
*
* @return AvailableForTotalAmount
*/
protected function generateValidRuleAvailableForTotalAmountOperatorTo($operator, $amount)
{
$adapter = new CouponBaseAdapter();
$validators = array(
AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator(
$operator,
new PriceParam(
$adapter,
$amount,
'EUR'
)
)
);
return new AvailableForTotalAmount($adapter, $validators);
}
// /**
// * Sets up the fixture, for example, opens a network connection.
// * This method is called before a test is executed.
// */
// protected function setUp()
// {
//
// }
//
// /**
// * Test if a Coupon is well displayed
// *
// * @covers Thelia\Coupon\type\RemoveXAmountManager::getCode
// * @covers Thelia\Coupon\type\RemoveXAmountManager::getTitle
// * @covers Thelia\Coupon\type\RemoveXAmountManager::getShortDescription
// * @covers Thelia\Coupon\type\RemoveXAmountManager::getDescription
// *
// */
// public function testDisplay()
// {
// $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, true, true);
//
// $expected = CouponManagerTest::VALID_CODE;
// $actual = $coupon->getCode();
// $this->assertEquals($expected, $actual);
//
// $expected = CouponManagerTest::VALID_TITLE;
// $actual = $coupon->getTitle();
// $this->assertEquals($expected, $actual);
//
// $expected = CouponManagerTest::VALID_SHORT_DESCRIPTION;
// $actual = $coupon->getShortDescription();
// $this->assertEquals($expected, $actual);
//
// $expected = CouponManagerTest::VALID_DESCRIPTION;
// $actual = $coupon->getDescription();
// $this->assertEquals($expected, $actual);
// }
//
// /**
// * Test if a Coupon can be Cumulative
// *
// * @covers Thelia\Coupon\type\RemoveXAmountManager::isCumulative
// *
// */
// public function testIsCumulative()
// {
// $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, true, true);
//
// $actual = $coupon->isCumulative();
// $this->assertTrue($actual);
// }
//
// /**
// * Test if a Coupon can be non cumulative
// *
// * @covers Thelia\Coupon\type\RemoveXAmountManager::isCumulative
// *
// */
// public function testIsNotCumulative()
// {
// $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
//
// $actual = $coupon->isCumulative();
// $this->assertFalse($actual);
// }
//
//
// /**
// * Test if a Coupon can remove postage
// *
// * @covers Thelia\Coupon\type\RemoveXAmountManager::isRemovingPostage
// *
// */
// public function testIsRemovingPostage()
// {
// $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, true, true);
//
// $actual = $coupon->isRemovingPostage();
// $this->assertTrue($actual);
// }
//
// /**
// * Test if a Coupon won't remove postage if not set to
// *
// * @covers Thelia\Coupon\type\RemoveXAmountManager::isRemovingPostage
// */
// public function testIsNotRemovingPostage()
// {
// $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
//
// $actual = $coupon->isRemovingPostage();
// $this->assertFalse($actual);
// }
//
//
// /**
// * Test if a Coupon has the effect expected (discount 10euros)
// *
// * @covers Thelia\Coupon\type\RemoveXAmountManager::getEffect
// */
// public function testGetEffect()
// {
// $adapter = new CouponBaseAdapter();
// $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
//
// $expected = 10;
// $actual = $coupon->getDiscount();
// $this->assertEquals($expected, $actual);
// }
//
// /**
// * Test Coupon rule setter
// *
// * @covers Thelia\Coupon\type\RemoveXAmountManager::setRules
// * @covers Thelia\Coupon\type\RemoveXAmountManager::getRules
// */
// public function testSetRulesValid()
// {
// // Given
// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
// Operators::EQUAL,
// 20.00
// );
// $rule1 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
// Operators::INFERIOR,
// 100.23
// );
// $rule2 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
// Operators::SUPERIOR,
// 421.23
// );
//
// $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
//
// // When
// $coupon->setRules(new CouponRuleCollection(array($rule0, $rule1, $rule2)));
//
// // Then
// $expected = 3;
// $this->assertCount($expected, $coupon->getRules()->getRules());
// }
//
// /**
// * Test Coupon rule setter
// *
// * @covers Thelia\Coupon\type\RemoveXAmountManager::setRules
// * @expectedException \Thelia\Exception\InvalidRuleException
// *
// */
// public function testSetRulesInvalid()
// {
// // Given
// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
// Operators::EQUAL,
// 20.00
// );
// $rule1 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
// Operators::INFERIOR,
// 100.23
// );
// $rule2 = $this;
//
// $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
//
// // When
// $coupon->setRules(new CouponRuleCollection(array($rule0, $rule1, $rule2)));
// }
//
// /**
// * Test Coupon effect for rule Total Amount < 400
// *
// * @covers Thelia\Coupon\type\RemoveXAmountManager::getEffect
// *
// */
// public function testGetEffectIfTotalAmountInferiorTo400Valid()
// {
// // Given
// $adapter = new CouponBaseAdapter();
// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
// Operators::INFERIOR,
// 400.00
// );
// $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
//
// // When
// $coupon->setRules(new CouponRuleCollection(array($rule0)));
//
// // Then
// $expected = 10.00;
// $actual = $coupon->getDiscount();
// $this->assertEquals($expected, $actual);
// }
//
// /**
// * Test Coupon effect for rule Total Amount <= 400
// *
// * @covers Thelia\Coupon\type\RemoveXAmountManager::getEffect
// *
// */
// public function testGetEffectIfTotalAmountInferiorOrEqualTo400Valid()
// {
// // Given
// $adapter = new CouponBaseAdapter();
// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
// Operators::INFERIOR_OR_EQUAL,
// 400.00
// );
// $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
//
// // When
// $coupon->setRules(new CouponRuleCollection(array($rule0)));
//
// // Then
// $expected = 10.00;
// $actual = $coupon->getDiscount();
// $this->assertEquals($expected, $actual);
// }
//
// /**
// * Test Coupon effect for rule Total Amount == 400
// *
// * @covers Thelia\Coupon\type\RemoveXAmountManager::getEffect
// *
// */
// public function testGetEffectIfTotalAmountEqualTo400Valid()
// {
// // Given
// $adapter = new CouponBaseAdapter();
// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
// Operators::EQUAL,
// 400.00
// );
// $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
//
// // When
// $coupon->setRules(new CouponRuleCollection(array($rule0)));
//
// // Then
// $expected = 10.00;
// $actual = $coupon->getDiscount();
// $this->assertEquals($expected, $actual);
// }
//
// /**
// * Test Coupon effect for rule Total Amount >= 400
// *
// * @covers Thelia\Coupon\type\RemoveXAmountManager::getEffect
// *
// */
// public function testGetEffectIfTotalAmountSuperiorOrEqualTo400Valid()
// {
// // Given
// $adapter = new CouponBaseAdapter();
// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
// Operators::SUPERIOR_OR_EQUAL,
// 400.00
// );
// $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
//
// // When
// $coupon->setRules(new CouponRuleCollection(array($rule0)));
//
// // Then
// $expected = 10.00;
// $actual = $coupon->getDiscount();
// $this->assertEquals($expected, $actual);
// }
//
// /**
// * Test Coupon effect for rule Total Amount > 400
// *
// * @covers Thelia\Coupon\type\RemoveXAmountManager::getEffect
// *
// */
// public function testGetEffectIfTotalAmountSuperiorTo400Valid()
// {
// // Given
// $adapter = new CouponBaseAdapter();
// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
// Operators::SUPERIOR,
// 400.00
// );
// $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
//
// // When
// $coupon->setRules(new CouponRuleCollection(array($rule0)));
//
// // Then
// $expected = 10.00;
// $actual = $coupon->getDiscount();
// $this->assertEquals($expected, $actual);
// }
//
//
//
// /**
// * Tears down the fixture, for example, closes a network connection.
// * This method is called after a test is executed.
// */
// protected function tearDown()
// {
// }
//
// /**
// * Generate valid rule AvailableForTotalAmount
// * according to given operator and amount
// *
// * @param string $operator Operators::CONST
// * @param float $amount Amount with 2 decimals
// *
// * @return AvailableForTotalAmount
// */
// protected function generateValidRuleAvailableForTotalAmountOperatorTo($operator, $amount)
// {
// $adapter = new CouponBaseAdapter();
// $validators = array(
// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator(
// $operator,
// new PriceParam(
// $adapter,
// $amount,
// 'EUR'
// )
// )
// );
//
// return new AvailableForTotalAmount($adapter, $validators);
// }
}

41
core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentForCategoryYTest.php
View File

@@ -36,28 +36,35 @@ namespace Thelia\Coupon;
*/
class RemoveXPercentForCategoryYTest extends \PHPUnit_Framework_TestCase
{
/**
* Sets up the fixture, for example, opens a network connection.
* This method is called before a test is executed.
*/
protected function setUp()
{
}
public function incompleteTest()
public function testSomething()
{
// Stop here and mark this test as incomplete.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
}
/**
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
{
}
// /**
// * Sets up the fixture, for example, opens a network connection.
// * This method is called before a test is executed.
// */
// protected function setUp()
// {
// }
//
// public function incompleteTest()
// {
// $this->markTestIncomplete(
// 'This test has not been implemented yet.'
// );
// }
//
// /**
// * Tears down the fixture, for example, closes a network connection.
// * This method is called after a test is executed.
// */
// protected function tearDown()
// {
// }
}

807
core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php
View File

@@ -24,14 +24,14 @@
namespace Thelia\Coupon;
use PHPUnit_Framework_TestCase;
use Thelia\Constraint\Rule\AvailableForTotalAmount;
use Thelia\Constraint\Rule\AvailableForTotalAmountManager;
use Thelia\Constraint\Rule\Operators;
use Thelia\Constraint\Validator\PriceParam;
use Thelia\Constraint\Validator\RuleValidator;
use Thelia\Coupon\Type\CouponInterface;
use Thelia\Coupon\Type\RemoveXPercent;
use Thelia\Coupon\Type\RemoveXPercentManager;
require_once '../CouponManagerTest.php';
//require_once '../CouponManagerTest.php';
/**
* Created by JetBrains PhpStorm.
@@ -47,405 +47,412 @@ require_once '../CouponManagerTest.php';
class RemoveXPercentTest extends \PHPUnit_Framework_TestCase
{
/**
* Sets up the fixture, for example, opens a network connection.
* This method is called before a test is executed.
*/
protected function setUp()
public function testSomething()
{
}
/**
* Test if a Coupon can be Cumulative
*
* @covers Thelia\Coupon\type\RemoveXAmount::isCumulative
*
*/
public function testIsCumulative()
{
$coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, true, true);
$actual = $coupon->isCumulative();
$this->assertTrue($actual);
}
/**
* Test if a Coupon can be non cumulative
*
* @covers Thelia\Coupon\type\RemoveXAmount::isCumulative
*
*/
public function testIsNotCumulative()
{
$coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
$actual = $coupon->isCumulative();
$this->assertFalse($actual);
}
/**
* Test if a Coupon can remove postage
*
* @covers Thelia\Coupon\type\RemoveXAmount::isRemovingPostage
*
*/
public function testIsRemovingPostage()
{
$coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, true, true);
$actual = $coupon->isRemovingPostage();
$this->assertTrue($actual);
}
/**
* Test if a Coupon won't remove postage if not set to
*
* @covers Thelia\Coupon\type\RemoveXAmount::isRemovingPostage
*/
public function testIsNotRemovingPostage()
{
$coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
$actual = $coupon->isRemovingPostage();
$this->assertFalse($actual);
}
/**
* Test if a Coupon has the effect expected (discount 10euros)
*
* @covers Thelia\Coupon\type\RemoveXAmount::getEffect
*/
public function testGetEffect()
{
$adapter = $this->generateFakeAdapter(245);
$coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
$expected = 24.50;
$actual = $coupon->getDiscount($adapter);
$this->assertEquals($expected, $actual);
}
/**
* Test Coupon rule setter
*
* @covers Thelia\Coupon\type\RemoveXAmount::setRules
* @covers Thelia\Coupon\type\RemoveXAmount::getRules
*/
public function testSetRulesValid()
{
// Given
$rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
Operators::EQUAL,
20.00
// Stop here and mark this test as incomplete.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
$rule1 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
Operators::INFERIOR,
100.23
);
$rule2 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
Operators::SUPERIOR,
421.23
);
$coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
// When
$coupon->setRules(new CouponRuleCollection(array($rule0, $rule1, $rule2)));
// Then
$expected = 3;
$this->assertCount($expected, $coupon->getRules()->getRules());
}
/**
* Test Coupon rule setter
*
* @covers Thelia\Coupon\type\RemoveXAmount::setRules
* @expectedException \Thelia\Exception\InvalidRuleException
*
*/
public function testSetRulesInvalid()
{
// Given
$rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
Operators::EQUAL,
20.00
);
$rule1 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
Operators::INFERIOR,
100.23
);
$rule2 = $this;
$coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
// When
$coupon->setRules(new CouponRuleCollection(array($rule0, $rule1, $rule2)));
}
/**
* Test Coupon effect for rule Total Amount < 400
*
* @covers Thelia\Coupon\type\RemoveXAmount::getEffect
*
*/
public function testGetEffectIfTotalAmountInferiorTo400Valid()
{
// Given
$rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
Operators::INFERIOR,
400.00
);
$coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
// When
$coupon->setRules(new CouponRuleCollection(array($rule0)));
// Then
$expected = 24.50;
$actual = $coupon->getDiscount();
$this->assertEquals($expected, $actual);
}
/**
* Test Coupon effect for rule Total Amount <= 400
*
* @covers Thelia\Coupon\type\RemoveXAmount::getEffect
*
*/
public function testGetEffectIfTotalAmountInferiorOrEqualTo400Valid()
{
// Given
$rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
Operators::INFERIOR_OR_EQUAL,
400.00
);
$coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
// When
$coupon->setRules(new CouponRuleCollection(array($rule0)));
// Then
$expected = 24.50;
$actual = $coupon->getDiscount();
$this->assertEquals($expected, $actual);
}
/**
* Test Coupon effect for rule Total Amount == 400
*
* @covers Thelia\Coupon\type\RemoveXAmount::getEffect
*
*/
public function testGetEffectIfTotalAmountEqualTo400Valid()
{
// Given
$rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
Operators::EQUAL,
400.00
);
$coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
// When
$coupon->setRules(new CouponRuleCollection(array($rule0)));
// Then
$expected = 24.50;
$actual = $coupon->getDiscount();
$this->assertEquals($expected, $actual);
}
/**
* Test Coupon effect for rule Total Amount >= 400
*
* @covers Thelia\Coupon\type\RemoveXAmount::getEffect
*
*/
public function testGetEffectIfTotalAmountSuperiorOrEqualTo400Valid()
{
// Given
$rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
Operators::SUPERIOR_OR_EQUAL,
400.00
);
$coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
// When
$coupon->setRules(new CouponRuleCollection(array($rule0)));
// Then
$expected = 24.50;
$actual = $coupon->getDiscount();
$this->assertEquals($expected, $actual);
}
/**
* Test Coupon effect for rule Total Amount > 400
*
* @covers Thelia\Coupon\type\RemoveXAmount::getEffect
*
*/
public function testGetEffectIfTotalAmountSuperiorTo400Valid()
{
// Given
$rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
Operators::SUPERIOR,
400.00
);
$coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
// When
$coupon->setRules(new CouponRuleCollection(array($rule0)));
// Then
$expected = 24.50;
$actual = $coupon->getDiscount();
$this->assertEquals($expected, $actual);
}
/**
* Generate valid CouponInterface
*
* @param string $code Coupon Code
* @param string $title Coupon Title
* @param string $shortDescription Coupon short
* description
* @param string $description Coupon description
* @param float $amount Coupon discount
* @param bool $isEnabled Is Coupon enabled
* @param \DateTime $expirationDate Coupon expiration date
* @param CouponRuleCollection $rules Coupon rules
* @param bool $isCumulative If is cumulative
* @param bool $isRemovingPostage If is removing postage
* @param bool $isAvailableOnSpecialOffers If is available on
* special offers or not
* @param int $maxUsage How many time a Coupon
* can be used
*
* @return CouponInterface
*/
public function generateValidCoupon(
$code = null,
$title = null,
$shortDescription = null,
$description = null,
$percent = null,
$isEnabled = null,
$expirationDate = null,
$rules = null,
$isCumulative = null,
$isRemovingPostage = null,
$isAvailableOnSpecialOffers = null,
$maxUsage = null
) {
$adapter = $this->generateFakeAdapter(245);
if ($code === null) {
$code = CouponManagerTest::VALID_CODE;
}
if ($title === null) {
$title = CouponManagerTest::VALID_TITLE;
}
if ($shortDescription === null) {
$shortDescription = CouponManagerTest::VALID_SHORT_DESCRIPTION;
}
if ($description === null) {
$description = CouponManagerTest::VALID_DESCRIPTION;
}
if ($percent === null) {
$percent = 10.00;
}
if ($isEnabled === null) {
$isEnabled = true;
}
if ($isCumulative === null) {
$isCumulative = true;
}
if ($isRemovingPostage === null) {
$isRemovingPostage = false;
}
if ($isAvailableOnSpecialOffers === null) {
$isAvailableOnSpecialOffers = true;
}
if ($maxUsage === null) {
$maxUsage = 40;
}
if ($expirationDate === null) {
$expirationDate = new \DateTime();
$expirationDate->setTimestamp(strtotime("today + 2 months"));
}
$coupon = new RemoveXPercent($adapter, $code, $title, $shortDescription, $description, $percent, $isCumulative, $isRemovingPostage, $isAvailableOnSpecialOffers, $isEnabled, $maxUsage, $expirationDate);
if ($rules === null) {
$rules = CouponManagerTest::generateValidRules();
}
$coupon->setRules($rules);
return $coupon;
}
/**
* Generate valid rule AvailableForTotalAmount
* according to given operator and amount
*
* @param string $operator Operators::CONST
* @param float $amount Amount with 2 decimals
*
* @return AvailableForTotalAmount
*/
protected function generateValidRuleAvailableForTotalAmountOperatorTo($operator, $amount)
{
$adapter = new CouponBaseAdapter();
$validators = array(
AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator(
$operator,
new PriceParam(
$adapter,
$amount,
'EUR'
)
)
);
return new AvailableForTotalAmount($adapter, $validators);
}
/**
* Generate a fake Adapter
*
* @param float $cartTotalPrice Cart total price
*
* @return \PHPUnit_Framework_MockObject_MockObject
*/
public function generateFakeAdapter($cartTotalPrice)
{
$stubCouponBaseAdapter = $this->getMock(
'Thelia\Coupon\CouponBaseAdapter',
array(
'getCartTotalPrice'
),
array()
);
$stubCouponBaseAdapter->expects($this->any())
->method('getCartTotalPrice')
->will($this->returnValue(($cartTotalPrice)));
return $stubCouponBaseAdapter;
}
/**
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
{
}
// /**
// * Sets up the fixture, for example, opens a network connection.
// * This method is called before a test is executed.
// */
// protected function setUp()
// {
// }
//
// /**
// * Test if a Coupon can be Cumulative
// *
// * @covers Thelia\Coupon\type\RemoveXPercentManager::isCumulative
// *
// */
// public function testIsCumulative()
// {
// $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, true, true);
//
// $actual = $coupon->isCumulative();
// $this->assertTrue($actual);
// }
//
// /**
// * Test if a Coupon can be non cumulative
// *
// * @covers Thelia\Coupon\type\RemoveXPercentManager::isCumulative
// *
// */
// public function testIsNotCumulative()
// {
// $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
//
// $actual = $coupon->isCumulative();
// $this->assertFalse($actual);
// }
//
//
// /**
// * Test if a Coupon can remove postage
// *
// * @covers Thelia\Coupon\type\RemoveXPercentManager::isRemovingPostage
// *
// */
// public function testIsRemovingPostage()
// {
// $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, true, true);
//
// $actual = $coupon->isRemovingPostage();
// $this->assertTrue($actual);
// }
//
// /**
// * Test if a Coupon won't remove postage if not set to
// *
// * @covers Thelia\Coupon\type\RemoveXPercentManager::isRemovingPostage
// */
// public function testIsNotRemovingPostage()
// {
// $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
//
// $actual = $coupon->isRemovingPostage();
// $this->assertFalse($actual);
// }
//
//
// /**
// * Test if a Coupon has the effect expected (discount 10euros)
// *
// * @covers Thelia\Coupon\type\RemoveXPercentManager::getEffect
// */
// public function testGetEffect()
// {
// $adapter = $this->generateFakeAdapter(245);
// $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
//
// $expected = 24.50;
// $actual = $coupon->getDiscount($adapter);
// $this->assertEquals($expected, $actual);
// }
//
// /**
// * Test Coupon rule setter
// *
// * @covers Thelia\Coupon\type\RemoveXPercentManager::setRules
// * @covers Thelia\Coupon\type\RemoveXPercentManager::getRules
// */
// public function testSetRulesValid()
// {
// // Given
// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
// Operators::EQUAL,
// 20.00
// );
// $rule1 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
// Operators::INFERIOR,
// 100.23
// );
// $rule2 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
// Operators::SUPERIOR,
// 421.23
// );
//
// $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
//
// // When
// $coupon->setRules(new CouponRuleCollection(array($rule0, $rule1, $rule2)));
//
// // Then
// $expected = 3;
// $this->assertCount($expected, $coupon->getRules()->getRules());
// }
//
// /**
// * Test Coupon rule setter
// *
// * @covers Thelia\Coupon\type\RemoveXPercentManager::setRules
// * @expectedException \Thelia\Exception\InvalidRuleException
// *
// */
// public function testSetRulesInvalid()
// {
// // Given
// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
// Operators::EQUAL,
// 20.00
// );
// $rule1 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
// Operators::INFERIOR,
// 100.23
// );
// $rule2 = $this;
//
// $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
//
// // When
// $coupon->setRules(new CouponRuleCollection(array($rule0, $rule1, $rule2)));
// }
//
// /**
// * Test Coupon effect for rule Total Amount < 400
// *
// * @covers Thelia\Coupon\type\RemoveXPercentManager::getEffect
// *
// */
// public function testGetEffectIfTotalAmountInferiorTo400Valid()
// {
// // Given
// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
// Operators::INFERIOR,
// 400.00
// );
// $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
//
// // When
// $coupon->setRules(new CouponRuleCollection(array($rule0)));
//
// // Then
// $expected = 24.50;
// $actual = $coupon->getDiscount();
// $this->assertEquals($expected, $actual);
// }
//
// /**
// * Test Coupon effect for rule Total Amount <= 400
// *
// * @covers Thelia\Coupon\type\RemoveXPercentManager::getEffect
// *
// */
// public function testGetEffectIfTotalAmountInferiorOrEqualTo400Valid()
// {
// // Given
// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
// Operators::INFERIOR_OR_EQUAL,
// 400.00
// );
// $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
//
// // When
// $coupon->setRules(new CouponRuleCollection(array($rule0)));
//
// // Then
// $expected = 24.50;
// $actual = $coupon->getDiscount();
// $this->assertEquals($expected, $actual);
// }
//
// /**
// * Test Coupon effect for rule Total Amount == 400
// *
// * @covers Thelia\Coupon\type\RemoveXPercentManager::getEffect
// *
// */
// public function testGetEffectIfTotalAmountEqualTo400Valid()
// {
// // Given
// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
// Operators::EQUAL,
// 400.00
// );
// $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
//
// // When
// $coupon->setRules(new CouponRuleCollection(array($rule0)));
//
// // Then
// $expected = 24.50;
// $actual = $coupon->getDiscount();
// $this->assertEquals($expected, $actual);
// }
//
// /**
// * Test Coupon effect for rule Total Amount >= 400
// *
// * @covers Thelia\Coupon\type\RemoveXPercentManager::getEffect
// *
// */
// public function testGetEffectIfTotalAmountSuperiorOrEqualTo400Valid()
// {
// // Given
// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
// Operators::SUPERIOR_OR_EQUAL,
// 400.00
// );
// $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
//
// // When
// $coupon->setRules(new CouponRuleCollection(array($rule0)));
//
// // Then
// $expected = 24.50;
// $actual = $coupon->getDiscount();
// $this->assertEquals($expected, $actual);
// }
//
// /**
// * Test Coupon effect for rule Total Amount > 400
// *
// * @covers Thelia\Coupon\type\RemoveXPercentManager::getEffect
// *
// */
// public function testGetEffectIfTotalAmountSuperiorTo400Valid()
// {
// // Given
// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
// Operators::SUPERIOR,
// 400.00
// );
// $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
//
// // When
// $coupon->setRules(new CouponRuleCollection(array($rule0)));
//
// // Then
// $expected = 24.50;
// $actual = $coupon->getDiscount();
// $this->assertEquals($expected, $actual);
// }
//
// /**
// * Generate valid CouponInterface
// *
// * @param string $code Coupon Code
// * @param string $title Coupon Title
// * @param string $shortDescription Coupon short
// * description
// * @param string $description Coupon description
// * @param float $amount Coupon discount
// * @param bool $isEnabled Is Coupon enabled
// * @param \DateTime $expirationDate Coupon expiration date
// * @param CouponRuleCollection $rules Coupon rules
// * @param bool $isCumulative If is cumulative
// * @param bool $isRemovingPostage If is removing postage
// * @param bool $isAvailableOnSpecialOffers If is available on
// * special offers or not
// * @param int $maxUsage How many time a Coupon
// * can be used
// *
// * @return CouponInterface
// */
// public function generateValidCoupon(
// $code = null,
// $title = null,
// $shortDescription = null,
// $description = null,
// $percent = null,
// $isEnabled = null,
// $expirationDate = null,
// $rules = null,
// $isCumulative = null,
// $isRemovingPostage = null,
// $isAvailableOnSpecialOffers = null,
// $maxUsage = null
// ) {
// $adapter = $this->generateFakeAdapter(245);
//
// if ($code === null) {
// $code = CouponManagerTest::VALID_CODE;
// }
// if ($title === null) {
// $title = CouponManagerTest::VALID_TITLE;
// }
// if ($shortDescription === null) {
// $shortDescription = CouponManagerTest::VALID_SHORT_DESCRIPTION;
// }
// if ($description === null) {
// $description = CouponManagerTest::VALID_DESCRIPTION;
// }
// if ($percent === null) {
// $percent = 10.00;
// }
// if ($isEnabled === null) {
// $isEnabled = true;
// }
// if ($isCumulative === null) {
// $isCumulative = true;
// }
// if ($isRemovingPostage === null) {
// $isRemovingPostage = false;
// }
// if ($isAvailableOnSpecialOffers === null) {
// $isAvailableOnSpecialOffers = true;
// }
// if ($maxUsage === null) {
// $maxUsage = 40;
// }
//
// if ($expirationDate === null) {
// $expirationDate = new \DateTime();
// $expirationDate->setTimestamp(strtotime("today + 2 months"));
// }
//
// $coupon = new RemoveXPercent($adapter, $code, $title, $shortDescription, $description, $percent, $isCumulative, $isRemovingPostage, $isAvailableOnSpecialOffers, $isEnabled, $maxUsage, $expirationDate);
//
// if ($rules === null) {
// $rules = CouponManagerTest::generateValidRules();
// }
//
// $coupon->setRules($rules);
//
// return $coupon;
// }
//
//
// /**
// * Generate valid rule AvailableForTotalAmount
// * according to given operator and amount
// *
// * @param string $operator Operators::CONST
// * @param float $amount Amount with 2 decimals
// *
// * @return AvailableForTotalAmount
// */
// protected function generateValidRuleAvailableForTotalAmountOperatorTo($operator, $amount)
// {
// $adapter = new CouponBaseAdapter();
// $validators = array(
// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator(
// $operator,
// new PriceParam(
// $adapter,
// $amount,
// 'EUR'
// )
// )
// );
//
// return new AvailableForTotalAmount($adapter, $validators);
// }
//
// /**
// * Generate a fake Adapter
// *
// * @param float $cartTotalPrice Cart total price
// *
// * @return \PHPUnit_Framework_MockObject_MockObject
// */
// public function generateFakeAdapter($cartTotalPrice)
// {
// $stubCouponBaseAdapter = $this->getMock(
// 'Thelia\Coupon\CouponBaseAdapter',
// array(
// 'getCartTotalPrice'
// ),
// array()
// );
//
// $stubCouponBaseAdapter->expects($this->any())
// ->method('getCartTotalPrice')
// ->will($this->returnValue(($cartTotalPrice)));
//
// return $stubCouponBaseAdapter;
// }
//
// /**
// * Tears down the fixture, for example, closes a network connection.
// * This method is called after a test is executed.
// */
// protected function tearDown()
// {
// }
}

2
core/lib/Thelia/Tests/Rewriting/RewritingResolverTest.php
View File

@@ -61,7 +61,7 @@ class RewritingResolverTest extends \PHPUnit_Framework_TestCase
$resolver = new RewritingResolver();
$method = $this->getMethod('getOtherParameters');
$actual = $method->invoke($resolver);
$method->invoke($resolver);
}
public function testGetOtherParameters()

169
core/lib/Thelia/Tests/TaxEngine/CalculatorTest.php Executable file
View File

@@ -0,0 +1,169 @@
<?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\Tests\TaxEngine;
use Propel\Runtime\Collection\ObjectCollection;
use Thelia\Model\Country;
use Thelia\Model\CountryQuery;
use Thelia\Model\Product;
use Thelia\Model\ProductQuery;
use Thelia\Model\Tax;
use Thelia\TaxEngine\Calculator;
/**
*
* @author Etienne Roudeix <eroudeix@openstudio.fr>
*
*/
class CalculatorTest extends \PHPUnit_Framework_TestCase
{
protected function getMethod($name)
{
$class = new \ReflectionClass('\Thelia\TaxEngine\Calculator');
$method = $class->getMethod($name);
$method->setAccessible(true);
return $method;
}
protected function getProperty($name)
{
$class = new \ReflectionClass('\Thelia\TaxEngine\Calculator');
$property = $class->getProperty($name);
$property->setAccessible(true);
return $property;
}
/**
* @expectedException \Thelia\Exception\TaxEngineException
* @expectedExceptionCode 501
*/
public function testLoadEmptyProductException()
{
$calculator = new Calculator();
$calculator->load(new Product(), CountryQuery::create()->findOne());
}
/**
* @expectedException \Thelia\Exception\TaxEngineException
* @expectedExceptionCode 502
*/
public function testLoadEmptyCountryException()
{
$calculator = new Calculator();
$calculator->load(ProductQuery::create()->findOne(), new Country());
}
public function testLoad()
{
$productQuery = ProductQuery::create()->findOneById(1);
$countryQuery = CountryQuery::create()->findOneById(64);
$calculator = new Calculator();
$taxRuleQuery = $this->getMock('\Thelia\Model\TaxRuleQuery', array('getTaxCalculatorGroupedCollection'));
$taxRuleQuery->expects($this->once())
->method('getTaxCalculatorGroupedCollection')
->with($productQuery, $countryQuery)
->will($this->returnValue('foo'));
$rewritingUrlQuery = $this->getProperty('taxRuleQuery');
$rewritingUrlQuery->setValue($calculator, $taxRuleQuery);
$calculator->load($productQuery, $countryQuery);
$this->assertEquals(
$productQuery,
$this->getProperty('product')->getValue($calculator)
);
$this->assertEquals(
$countryQuery,
$this->getProperty('country')->getValue($calculator)
);
$this->assertEquals(
'foo',
$this->getProperty('taxRulesGroupedCollection')->getValue($calculator)
);
}
/**
* @expectedException \Thelia\Exception\TaxEngineException
* @expectedExceptionCode 503
*/
public function testGetTaxAmountBadTaxRulesCollection()
{
$calculator = new Calculator();
$calculator->getTaxAmount(500);
}
/**
* @expectedException \Thelia\Exception\TaxEngineException
* @expectedExceptionCode 601
*/
public function testGetTaxAmountBadAmount()
{
$taxRulesGroupedCollection = new ObjectCollection();
$calculator = new Calculator();
$rewritingUrlQuery = $this->getProperty('taxRulesGroupedCollection');
$rewritingUrlQuery->setValue($calculator, $taxRulesGroupedCollection);
$calculator->getTaxAmount('foo');
}
public function testGetTaxAmountAndGetTaxedPrice()
{
$taxRulesGroupedCollection = new ObjectCollection();
$taxRulesGroupedCollection->setModel('\Thelia\Model\Tax');
$tax = new Tax();
$tax->setVirtualColumn('taxRateSum', 10);
$taxRulesGroupedCollection->append($tax);
$tax = new Tax();
$tax->setVirtualColumn('taxRateSum', 8);
$taxRulesGroupedCollection->append($tax);
$calculator = new Calculator();
$rewritingUrlQuery = $this->getProperty('taxRulesGroupedCollection');
$rewritingUrlQuery->setValue($calculator, $taxRulesGroupedCollection);
$taxAmount = $calculator->getTaxAmount(500);
$taxedPrice = $calculator->getTaxedPrice(500);
/*
* expect :
* tax 1 = 500*0.10 = 50 // amout with tax 1 : 550
* tax 2 = 550*0.08 = 44 // amout with tax 2 : 594
* total tax amount = 94
*/
$this->assertEquals(94, $taxAmount);
$this->assertEquals(594, $taxedPrice);
}
}

16
core/lib/Thelia/Tools/URL.php
View File

@@ -189,6 +189,14 @@ class URL
{
if(ConfigQuery::isRewritingEnable()) {
$this->retriever->loadViewUrl($view, $viewLocale, $viewId);
} else {
$allParametersWithoutView = array();
$allParametersWithoutView['locale'] = $viewLocale;
if(null !== $viewId) {
$allParametersWithoutView[$view . '_id'] = $viewId;
}
$this->retriever->rewrittenUrl = null;
$this->retriever->url = URL::getInstance()->viewUrl($view, $allParametersWithoutView);
}
return $this->retriever;
@@ -220,6 +228,14 @@ class URL
}
$this->retriever->loadSpecificUrl($view, $viewLocale, $viewId, $allOtherParameters);
} else {
$allParametersWithoutView = $viewOtherParameters;
$allParametersWithoutView['locale'] = $viewLocale;
if(null !== $viewId) {
$allParametersWithoutView[$view . '_id'] = $viewId;
}
$this->retriever->rewrittenUrl = null;
$this->retriever->url = URL::getInstance()->viewUrl($view, $allParametersWithoutView);
}
return $this->retriever;

93
install/faker.php
View File

@@ -1,6 +1,9 @@
<?php
use Thelia\Constraint\ConstraintFactory;
use Thelia\Constraint\ConstraintManager;
use Thelia\Constraint\Rule\AvailableForTotalAmount;
use Thelia\Constraint\Rule\AvailableForTotalAmountManager;
use Thelia\Constraint\Rule\AvailableForXArticlesManager;
use Thelia\Constraint\Rule\Operators;
use Thelia\Coupon\CouponRuleCollection;
use Thelia\Model\ProductImage;
@@ -380,6 +383,7 @@ function createProduct($faker, $category, $position, &$productIdList)
$product->addCategory($category);
$product->setVisible(rand(1, 10)>7 ? 0 : 1);
$product->setPosition($position);
$product->setTaxRuleId(1);
setI18n($faker, $product);
$product->save();
@@ -498,12 +502,11 @@ function generateCouponFixtures($thelia)
{
$container = $thelia->getContainer();
$adapter = $container->get('thelia.adapter');
$translator = $container->get('thelia.translator');
// Coupons
$coupon1 = new Thelia\Model\Coupon();
$coupon1->setCode('XMAS');
$coupon1->setType('Thelia\Coupon\Type\RemoveXAmount');
$coupon1->setType('thelia.coupon.type.remove_x_amount');
$coupon1->setTitle('Christmas coupon');
$coupon1->setShortDescription('Coupon for Christmas removing 10€ if your total checkout is more than 40€');
$coupon1->setDescription('Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras at luctus tellus. Integer turpis mauris, aliquet vitae risus tristique, pellentesque vestibulum urna. Vestibulum sodales laoreet lectus dictum suscipit. Praesent vulputate, sem id varius condimentum, quam magna tempor elit, quis venenatis ligula nulla eget libero. Cras egestas euismod tellus, id pharetra leo suscipit quis. Donec lacinia ac lacus et ultricies. Nunc in porttitor neque. Proin at quam congue, consectetur orci sed, congue nulla. Nulla eleifend nunc ligula, nec pharetra elit tempus quis. Vivamus vel mauris sed est dictum blandit. Maecenas blandit dapibus velit ut sollicitudin. In in euismod mauris, consequat viverra magna. Cras velit velit, sollicitudin commodo tortor gravida, tempus varius nulla.
@@ -521,33 +524,89 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua
$date = new \DateTime();
$coupon1->setExpirationDate($date->setTimestamp(strtotime("today + 2 months")));
$rule1 = new AvailableForTotalAmount($adapter);
$operators = array(AvailableForTotalAmount::PARAM1_PRICE => Operators::SUPERIOR);
$values = array(
AvailableForTotalAmount::PARAM1_PRICE => 40.00,
AvailableForTotalAmount::PARAM1_CURRENCY => 'EUR'
$rule1 = new AvailableForTotalAmountManager($adapter);
$operators = array(
AvailableForTotalAmountManager::INPUT1 => Operators::SUPERIOR,
AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL
);
$rule1->populateFromForm($operators, $values);
$values = array(
AvailableForTotalAmountManager::INPUT1 => 40.00,
AvailableForTotalAmountManager::INPUT2 => 'EUR'
);
$rule1->setValidatorsFromForm($operators, $values);
$rule2 = new AvailableForTotalAmount($adapter);
$operators = array(AvailableForTotalAmount::PARAM1_PRICE => Operators::INFERIOR);
$values = array(
AvailableForTotalAmount::PARAM1_PRICE => 400.00,
AvailableForTotalAmount::PARAM1_CURRENCY => 'EUR'
$rule2 = new AvailableForTotalAmountManager($adapter);
$operators = array(
AvailableForTotalAmountManager::INPUT1 => Operators::INFERIOR,
AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL
);
$rule2->populateFromForm($operators, $values);
$values = array(
AvailableForTotalAmountManager::INPUT1 => 400.00,
AvailableForTotalAmountManager::INPUT2 => 'EUR'
);
$rule2->setValidatorsFromForm($operators, $values);
$rules = new CouponRuleCollection();
$rules->add($rule1);
$rules->add($rule2);
/** @var ConstraintManager $constraintManager */
$constraintManager = new ConstraintManager($container);
/** @var ConstraintFactory $constraintFactory */
$constraintFactory = $container->get('thelia.constraint.factory');
$serializedRules = $constraintManager->serializeCouponRuleCollection($rules);
$serializedRules = $constraintFactory->serializeCouponRuleCollection($rules);
$coupon1->setSerializedRules($serializedRules);
$coupon1->setIsCumulative(1);
$coupon1->setIsRemovingPostage(0);
$coupon1->save();
// Coupons
$coupon2 = new Thelia\Model\Coupon();
$coupon2->setCode('SPRINGBREAK');
$coupon2->setType('thelia.coupon.type.remove_x_percent');
$coupon2->setTitle('Springbreak coupon');
$coupon2->setShortDescription('Coupon for Springbreak removing 10% if you have more than 4 articles in your cart');
$coupon2->setDescription('Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras at luctus tellus. Integer turpis mauris, aliquet vitae risus tristique, pellentesque vestibulum urna. Vestibulum sodales laoreet lectus dictum suscipit. Praesent vulputate, sem id varius condimentum, quam magna tempor elit, quis venenatis ligula nulla eget libero. Cras egestas euismod tellus, id pharetra leo suscipit quis. Donec lacinia ac lacus et ultricies. Nunc in porttitor neque. Proin at quam congue, consectetur orci sed, congue nulla. Nulla eleifend nunc ligula, nec pharetra elit tempus quis. Vivamus vel mauris sed est dictum blandit. Maecenas blandit dapibus velit ut sollicitudin. In in euismod mauris, consequat viverra magna. Cras velit velit, sollicitudin commodo tortor gravida, tempus varius nulla.
Donec rhoncus leo mauris, id porttitor ante luctus tempus. Curabitur quis augue feugiat, ullamcorper mauris ac, interdum mi. Quisque aliquam lorem vitae felis lobortis, id interdum turpis mattis. Vestibulum diam massa, ornare congue blandit quis, facilisis at nisl. In tortor metus, venenatis non arcu nec, sollicitudin ornare nisl. Nunc erat risus, varius nec urna at, iaculis lacinia elit. Aenean ut felis tempus, tincidunt odio non, sagittis nisl. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec vitae hendrerit elit. Nunc sit amet gravida risus, euismod lobortis massa. Nam a erat mauris. Nam a malesuada lorem. Nulla id accumsan dolor, sed rhoncus tellus. Quisque dictum felis sed leo auctor, at volutpat lectus viverra. Morbi rutrum, est ac aliquam imperdiet, nibh sem sagittis justo, ac mattis magna lacus eu nulla.
Duis interdum lectus nulla, nec pellentesque sapien condimentum at. Suspendisse potenti. Sed eu purus tellus. Nunc quis rhoncus metus. Fusce vitae tellus enim. Interdum et malesuada fames ac ante ipsum primis in faucibus. Etiam tempor porttitor erat vitae iaculis. Sed est elit, consequat non ornare vitae, vehicula eget lectus. Etiam consequat sapien mauris, eget consectetur magna imperdiet eget. Nunc sollicitudin luctus velit, in commodo nulla adipiscing fermentum. Fusce nisi sapien, posuere vitae metus sit amet, facilisis sollicitudin dui. Fusce ultricies auctor enim sit amet iaculis. Morbi at vestibulum enim, eget adipiscing eros.
Praesent ligula lorem, faucibus ut metus quis, fermentum iaculis erat. Pellentesque elit erat, lacinia sed semper ac, sagittis vel elit. Nam eu convallis est. Curabitur rhoncus odio vitae consectetur pellentesque. Nam vitae arcu nec ante scelerisque dignissim vel nec neque. Suspendisse augue nulla, mollis eget dui et, tempor facilisis erat. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ac diam ipsum. Donec convallis dui ultricies velit auctor, non lobortis nulla ultrices. Morbi vitae dignissim ante, sit amet lobortis tortor. Nunc dapibus condimentum augue, in molestie neque congue non.
Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesuada tortor vel erat volutpat tincidunt. In vehicula diam est, a convallis eros scelerisque ut. Donec aliquet venenatis iaculis. Ut a arcu gravida, placerat dui eu, iaculis nisl. Quisque adipiscing orci sit amet dui dignissim lacinia. Sed vulputate lorem non dolor adipiscing ornare. Morbi ornare id nisl id aliquam. Ut fringilla elit ante, nec lacinia enim fermentum sit amet. Aenean rutrum lorem eu convallis pharetra. Cras malesuada varius metus, vitae gravida velit. Nam a varius ipsum, ac commodo dolor. Phasellus nec elementum elit. Etiam vel adipiscing leo.');
$coupon2->setAmount(10.00);
$coupon2->setIsUsed(1);
$coupon2->setIsEnabled(1);
$date = new \DateTime();
$coupon2->setExpirationDate($date->setTimestamp(strtotime("today + 2 months")));
$rule1 = new AvailableForXArticlesManager($adapter);
$operators = array(
AvailableForXArticlesManager::INPUT1 => Operators::SUPERIOR,
);
$values = array(
AvailableForXArticlesManager::INPUT1 => 4,
);
$rule1->setValidatorsFromForm($operators, $values);
$rules = new CouponRuleCollection();
$rules->add($rule1);
/** @var ConstraintFactory $constraintFactory */
$constraintFactory = $container->get('thelia.constraint.factory');
$serializedRules = $constraintFactory->serializeCouponRuleCollection($rules);
$coupon2->setSerializedRules($serializedRules);
$coupon2->setIsCumulative(0);
$coupon2->setIsRemovingPostage(1);
$coupon2->save();
}

22
install/insert.sql
View File

@@ -1109,3 +1109,25 @@ INSERT INTO `country_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `po
(268, 'en_UK', 'USA - Alabama', '', '', ''),
(268, 'es_ES', 'USA - Alabama', '', '', ''),
(268, 'fr_FR', 'USA - Alabama', '', '', '');
INSERT INTO `tax` (`id`, `rate`, `created_at`, `updated_at`)
VALUES
(1, '19.6', NOW(), NOW());
INSERT INTO `tax_i18n` (`id`, `locale`, `title`)
VALUES
(1, 'fr_FR', 'TVA française à 19.6%'),
(1, 'en_UK', 'french 19.6% tax');
INSERT INTO `tax_rule` (`id`, `created_at`, `updated_at`)
VALUES
(1, NOW(), NOW());
INSERT INTO `tax_rule_i18n` (`id`, `locale`, `title`)
VALUES
(1, 'fr_FR', 'TVA française à 19.6%'),
(1, 'en_UK', 'french 19.6% tax');
INSERT INTO `tax_rule_country` (`tax_rule_id`, `country_id`, `tax_id`, `position`, `created_at`, `updated_at`)
VALUES
(1, 64, 1, 1, NOW(), NOW());

18
install/thelia.sql
View File

@@ -126,9 +126,6 @@ DROP TABLE IF EXISTS `tax_rule`;
CREATE TABLE `tax_rule`
(
`id` INTEGER NOT NULL AUTO_INCREMENT,
`code` VARCHAR(45),
`title` VARCHAR(255),
`description` TEXT,
`created_at` DATETIME,
`updated_at` DATETIME,
PRIMARY KEY (`id`)
@@ -142,14 +139,13 @@ DROP TABLE IF EXISTS `tax_rule_country`;
CREATE TABLE `tax_rule_country`
(
`id` INTEGER NOT NULL,
`tax_rule_id` INTEGER,
`country_id` INTEGER,
`tax_id` INTEGER,
`none` TINYINT,
`tax_rule_id` INTEGER NOT NULL,
`country_id` INTEGER NOT NULL,
`tax_id` INTEGER NOT NULL,
`position` INTEGER NOT NULL,
`created_at` DATETIME,
`updated_at` DATETIME,
PRIMARY KEY (`id`),
PRIMARY KEY (`tax_rule_id`,`country_id`,`tax_id`),
INDEX `idx_tax_rule_country_tax_id` (`tax_id`),
INDEX `idx_tax_rule_country_tax_rule_id` (`tax_rule_id`),
INDEX `idx_tax_rule_country_country_id` (`country_id`),
@@ -157,7 +153,7 @@ CREATE TABLE `tax_rule_country`
FOREIGN KEY (`tax_id`)
REFERENCES `tax` (`id`)
ON UPDATE RESTRICT
ON DELETE SET NULL,
ON DELETE CASCADE,
CONSTRAINT `fk_tax_rule_country_tax_rule_id`
FOREIGN KEY (`tax_rule_id`)
REFERENCES `tax_rule` (`id`)
@@ -1574,6 +1570,8 @@ CREATE TABLE `tax_rule_i18n`
(
`id` INTEGER NOT NULL,
`locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
`title` VARCHAR(255),
`description` TEXT,
PRIMARY KEY (`id`,`locale`),
CONSTRAINT `tax_rule_i18n_FK_1`
FOREIGN KEY (`id`)

16
local/config/schema.xml
View File

@@ -96,19 +96,19 @@
</table>
<table name="tax_rule" namespace="Thelia\Model">
<column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
<column name="code" size="45" type="VARCHAR" />
<column name="title" size="255" type="VARCHAR" />
<column name="description" type="LONGVARCHAR" />
<behavior name="timestampable" />
<behavior name="i18n" />
<behavior name="i18n">
<parameter name="i18n_columns" value="title, description" />
</behavior>
</table>
<table name="tax_rule_country" namespace="Thelia\Model">
<column name="id" primaryKey="true" required="true" type="INTEGER" />
<column name="tax_rule_id" type="INTEGER" />
<column name="country_id" type="INTEGER" />
<column name="tax_id" type="INTEGER" />
<column name="none" type="TINYINT" />
<foreign-key foreignTable="tax" name="fk_tax_rule_country_tax_id" onDelete="SET NULL" onUpdate="RESTRICT">
<column name="tax_rule_id" primaryKey="true" required="true" type="INTEGER" />
<column name="country_id" primaryKey="true" required="true" type="INTEGER" />
<column name="tax_id" primaryKey="true" required="true" type="INTEGER" />
<column name="position" required="true" type="INTEGER" />
<foreign-key foreignTable="tax" name="fk_tax_rule_country_tax_id" onDelete="CASCADE" onUpdate="RESTRICT">
<reference foreign="id" local="tax_id" />
</foreign-key>
<foreign-key foreignTable="tax_rule" name="fk_tax_rule_country_tax_rule_id" onDelete="CASCADE" onUpdate="RESTRICT">

BIN
templates/admin/default/assets/img/ajax-loader.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

6
templates/admin/default/assets/less/thelia/thelia.less
View File

@@ -247,4 +247,10 @@
.ui-slider{
margin-top: 23px;
}
.loading{
background: url("@{imgDir}/ajax-loader.gif") no-repeat;
height: 24px;
width: 24px;
}

29
templates/admin/default/coupon-update.html
View File

@@ -36,6 +36,35 @@
<script>
$(function($){
miniBrowser(0, '/test_to_remove/datas_coupon_edit.json');
$('#effect').on('change', function (e) {
var optionSelected = $("option:selected", this);
$('#effectToolTip').html(optionSelected.attr("data-description"));
});
$('#category-rule').on('change', function (e) {
$('#rule-add-operators-values').html('<div class="loading" ></div>');
var url = "{$urlAjaxGetRuleInput}";
url = url.replace('ruleId', $(this).val())
console.log(url);
$.ajax({
url: url,
statusCode: {
404: function() {
$('#rule-add-operators-values').html(
'{intl l='Please select another rule'}'
);
}
}
}).done(function(data) {
$('#rule-add-operators-values').html(data);
});
});
});
</script>
{/block}

39
templates/admin/default/coupon/form.html
View File

@@ -104,13 +104,13 @@
<label for="effect">{intl l='Effect :'}</label>
{form_field form=$form field='effect'}
<select name="{$name}" value="{$value}" id="effect" class="col-md-12 form-control">
<option value="1" data-description="More description n°1 about item">Remove x percents for category Y</option>
<option value="2" data-description="More description n°2 about item">Remove x percents</option>
<option value="3" data-description="More description n°3 about item">Remove x amount</option>
{foreach from=$availableCoupons item=availableCoupon}
<option value="{$availableCoupon.serviceId}" data-description="{$availableCoupon.toolTip}">{$availableCoupon.name}</option>
{/foreach}
</select>
{if $error}{$message}{/if}
{/form_field}
<span class="help-block">More description n°1 about item</span>
<span id="effectToolTip" class="help-block">{$availableCoupons.0.toolTip}</span>
</div>
</div>
@@ -194,8 +194,11 @@
<section class="row">
<div class="col-md-12 general-block-decorator clearfix">
<a title="{intl l='Save this rule'}" class="btn btn-default btn-primary pull-right">
<span class="glyphicon glyphicon-plus-sign"></span>
</a>
<div class="form-group col-md-2">
<div id="rule-add-organizer" class="form-group col-md-2">
<label for="type">{intl l='Condition type :'}</label>
<label class="radio">
<input type="radio" name="type" id="type" value="1" checked> {intl l='And'}
@@ -205,30 +208,16 @@
</label>
</div>
<div class="form-group col-md-4">
<label for="category-rule">{intl l='Rule\'s category :'}</label>
<div id="rule-add-type" class="form-group col-md-4">
<label for="categoryRule">{intl l='Rule\'s category :'}</label>
<select name="categoryRule" id="category-rule" class="form-control">
<option value="1" selected>Total amount</option>
<option value="2">Date</option>
<option value="3">NbArtFromCategory</option>
</select>
<label for="category-rule">Rule's category :</label>
<select name="categoryRule" id="category-rule" class="form-control">
<option value="1">Total amount</option>
<option value="2" selected>Date</option>
<option value="3">NbArtFromCategory</option>
</select>
<label for="category-rule">Rule's category :</label>
<select name="categoryRule" id="category-rule" class="form-control">
<option value="1">Total amount</option>
<option value="2">Date</option>
<option value="3" selected>NbArtFromCategory</option>
{foreach from=$availableRules item=availableRule}
<option value="{$availableRule.serviceId}" data-description="{$availableRule.toolTip}">{$availableRule.name}</option>
{/foreach}
</select>
</div>
<div class="form-group col-md-6">
<div id="rule-add-operators-values" class="form-group col-md-6">
<label for="operator">{intl l='Operator :'}</label>
<div class="row">
<div class="col-lg-6">

75
templates/admin/default/coupon/rule-input-ajax.html
View File

@@ -1 +1,74 @@
test
{*test*}
{*{$ruleId}*}
{*{$inputs|var_dump}*}
{foreach from=$inputs key=name item=input}
<label for="operator">{$input.title}</label>
<div class="row">
<div class="col-lg-6">
<select class="form-control" id="{$name}[operator]" name="{$name}[operator]">
{foreach from=$input.availableOperators key=k item=availableOperator}
<option value="{$availableOperator}">{$availableOperator}</option>
{/foreach}
</select>
</div>
<div class="input-group col-lg-6">
{if $input.type == 'select'}
<select class="{$input.class}" id="{$name}[value]" name="{$name}[value]">
{foreach from=$input.availableValues key=code item=availableValue}
<option value="{$code}">{$availableValue}</option>
{/foreach}
</select>
{else}
<input type="{$input.type}" class="{$input.class}" id="{$name}[value]" name="{$name}[value]">
{*<span class="input-group-addon">€</span>*}
{/if}
</div>
</div>
{/foreach}
{*<label for="operator">Operator :</label>*}
{*<div class="row">*}
{*<div class="col-lg-6">*}
{*<select class="form-control" id="operator" name="operator">*}
{*<option value="1">is superior to</option>*}
{*<option value="2">equals to</option>*}
{*<option value="3">is inferior to</option>*}
{*<option value="4">is inferior or equals to</option>*}
{*<option value="5">is superior or equals to</option>*}
{*</select>*}
{*</div>*}
{*<div data-date-format="dd/mm/yyyy" data-date="12/02/2012" class="input-group col-lg-6 date">*}
{*<input type="text" class="form-control" name="value">*}
{*<span class="input-group-addon"><span class="glyphicon glyphicon-th"></span></span>*}
{*</div>*}
{*</div>*}
{*<label for="operator">Operator :</label>*}
{*<div class="row">*}
{*<div class="col-lg-6">*}
{*<select class="form-control" id="operator" name="operator">*}
{*<option value="1">is superior to</option>*}
{*<option value="2">equals to</option>*}
{*<option value="3">is inferior to</option>*}
{*<option value="4">is inferior or equals to</option>*}
{*<option value="5">is superior or equals to</option>*}
{*</select>*}
{*</div>*}
{*<div class="col-lg-6">*}
{*<input type="text" class="form-control" name="value">*}
{*</div>*}
{*</div>*}
{*<div class="row">*}
{*<div class="col-lg-12">*}
{*<table class="table table-bordered">*}
{*<tbody><tr>*}
{*<td id="minibrowser-breadcrumb"><div><span> &gt; </span><a href="#">Racine</a></div></td>*}
{*</tr>*}
{*<tr>*}
{*<th><span class="icon-th-list"></span> Categories list</th>*}
{*</tr>*}
{*<tr>*}
{*<td id="minibrowser-categories"><div><p><a href="#">Boyaux</a></p><p><a href="#">Epices / condiments</a></p><p><a href="#">Emballage</a></p><p><a href="#">Petits matériels</a></p><p><a href="#">Materiel de cuisine</a></p><p><a href="#">Bacs</a></p><p><a href="#">Hygiène &amp; entretien</a></p><p><a href="#">Art de la table</a></p><p><a href="#">Matériels</a></p></div></td>*}
{*</tr>*}
{*</tbody></table>*}
{*</div>*}
{*</div>*}

14
templates/default_save/category.html
View File

@@ -1,3 +1,9 @@
<html>
<head>
{debugbar_renderHead}
</head>
<body>
<h1>Category page</h1>
<div style="border: solid 8px; margin: 0px; padding: 0px; width: 45%; float: left">
@@ -26,6 +32,8 @@
<h4>#TITLE</h4>
<p>#DESCRIPTION</p>
<p>Starting by #BEST_PRICE € HT (TAX : #BEST_PRICE_TAX ; #BEST_TAXED_PRICE € TTC)</p>
{ifloop rel="ft"}
<h5>Features</h5>
<ul>
@@ -140,4 +148,8 @@
{/loop}
</ul>
</div>
</div>
{debugbar_render}
</body>
</html>

4
templates/default_save/product.html
View File

@@ -13,6 +13,8 @@ Index : {navigate to="index"}<br />
<h3>#TITLE</h3>
<p>#DESCRIPTION</p>
<p>Starting by #BEST_PRICE € HT (TAX : #BEST_PRICE_TAX ; #BEST_TAXED_PRICE € TTC)</p>
{ifloop rel="acc"}
<h4>Accessories</h4>
<ul>
@@ -64,7 +66,7 @@ Index : {navigate to="index"}<br />
#ATTRIBUTE_TITLE = #ATTRIBUTE_AVAILABILITY_TITLE<br />
{/loop}
<br />#WEIGHT g
<br /><strong>{if #IS_PROMO == 1} #PROMO_PRICE € (instead of #PRICE) {else} #PRICE € {/if}</strong>
<br /><strong>{if #IS_PROMO == 1} #PROMO_PRICE € HT // TAX : #PROMO_PRICE_TAX ; #TAXED_PROMO_PRICE € TTC (instead of #PRICE HT // TAX : #PRICE_TAX ; #TAXED_PRICE € TTC){else} #PRICE € HT // TAX : #PRICE_TAX ; #TAXED_PRICE € TTC{/if}</strong>
<br /><br />
Add
<select>