From ff4f3be64dc30075d848509af8937986cff561af Mon Sep 17 00:00:00 2001 From: franck Date: Sun, 8 Sep 2013 12:29:20 +0200 Subject: [PATCH 001/212] Added windows version of reset_install script --- reset_install.bat | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 reset_install.bat diff --git a/reset_install.bat b/reset_install.bat new file mode 100644 index 000000000..d117e525b --- /dev/null +++ b/reset_install.bat @@ -0,0 +1,35 @@ +echo off +REM @author Guillaume MOREL +REM v0.1 + +echo [WARN] This script will reset this Thelia2 install + +if exist local\config\database.yml ( + echo [INFO] Downloading vendors + composer install --prefer-dist + + cd local\config\ + + echo [INFO] Building Models file + ..\..\bin\propel build -v --output-dir=../../core/lib/ + + echo [INFO] Building SQL CREATE file + ..\..\bin\propel sql:build -v --output-dir=../../install/ + + + echo [INFO] Reloaded Thelia2 database + cd ..\.. + del install\sqldb.map + php Thelia thelia:dev:reloadDB + + echo [INFO] Installing fixtures + php install\faker.php + + echo [INFO] Adding admin + php Thelia thelia:create-admin + + echo [SUCCESS] Reset done +) +) else ( + echo [FAILED] Please add your database informations in local\config\database.yml and start this script again. +) \ No newline at end of file From e78ba1f6701881871d13ad1325c6fd26fb1fc1e9 Mon Sep 17 00:00:00 2001 From: gmorel Date: Sun, 8 Sep 2013 17:36:21 +0200 Subject: [PATCH 002/212] WIP - Refactor Coupon : is Customer matching Coupon rules --- core/lib/Thelia/Config/Resources/config.xml | 4 +- ...raintManager.php => ConstraintFactory.php} | 56 +- .../Thelia/Constraint/ConstraintValidator.php | 133 +++ ...php => AvailableForTotalAmountManager.php} | 282 +++++-- ...s.php => AvailableForXArticlesManager.php} | 173 ++-- .../Constraint/Rule/CouponRuleAbstract.php | 141 ++-- .../Constraint/Rule/CouponRuleInterface.php | 57 +- core/lib/Thelia/Constraint/Rule/Operators.php | 128 +-- core/lib/Thelia/Coupon/CouponFactory.php | 22 +- ...agerTest.php => ConstraintFactoryTest.php} | 137 ++-- .../Constraint/ConstraintValidatorTest.php | 337 ++++++++ .../Rule/AvailableForTotalAmountTest.php | 763 ++++++++++++------ .../Rule/AvailableForXArticlesTest.php | 698 ++++++++++------ .../Tests/Constraint/Rule/OperatorsTest.php | 718 ++++++++-------- 14 files changed, 2415 insertions(+), 1234 deletions(-) rename core/lib/Thelia/Constraint/{ConstraintManager.php => ConstraintFactory.php} (84%) create mode 100644 core/lib/Thelia/Constraint/ConstraintValidator.php rename core/lib/Thelia/Constraint/Rule/{AvailableForTotalAmount.php => AvailableForTotalAmountManager.php} (51%) rename core/lib/Thelia/Constraint/Rule/{AvailableForXArticles.php => AvailableForXArticlesManager.php} (62%) rename core/lib/Thelia/Tests/Constraint/{ConstraintManagerTest.php => ConstraintFactoryTest.php} (59%) create mode 100644 core/lib/Thelia/Tests/Constraint/ConstraintValidatorTest.php diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml index 70eeb6ba8..3b23901cc 100755 --- a/core/lib/Thelia/Config/Resources/config.xml +++ b/core/lib/Thelia/Config/Resources/config.xml @@ -220,11 +220,11 @@ - + - + diff --git a/core/lib/Thelia/Constraint/ConstraintManager.php b/core/lib/Thelia/Constraint/ConstraintFactory.php similarity index 84% rename from core/lib/Thelia/Constraint/ConstraintManager.php rename to core/lib/Thelia/Constraint/ConstraintFactory.php index 4505229b2..699459847 100644 --- a/core/lib/Thelia/Constraint/ConstraintManager.php +++ b/core/lib/Thelia/Constraint/ConstraintFactory.php @@ -25,9 +25,7 @@ namespace Thelia\Constraint; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\Serializer\Encoder\JsonEncoder; -use Symfony\Component\Serializer\Encoder\XmlEncoder; -use Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer; -use Symfony\Component\Serializer\Serializer; +use Thelia\Constraint\Rule\AvailableForTotalAmountManager; use Thelia\Constraint\Rule\CouponRuleInterface; use Thelia\Constraint\Rule\SerializableRule; use Thelia\Coupon\CouponAdapterInterface; @@ -45,7 +43,7 @@ use Thelia\Coupon\CouponRuleCollection; * @author Guillaume MOREL * */ -class ConstraintManager +class ConstraintFactory { /** @var ContainerInterface Service Container */ protected $container = null; @@ -67,28 +65,6 @@ class ConstraintManager $this->adapter = $container->get('thelia.adapter'); } - /** - * Check if the current Coupon is matching its conditions (Rules) - * Thelia variables are given by the CouponAdapterInterface - * - * @param CouponRuleCollection $collection A collection of rules - * - * @return bool - */ - public function isMatching(CouponRuleCollection $collection) - { - $isMatching = true; - - /** @var CouponRuleInterface $rule */ - foreach ($collection->getRules() as $rule) { - if (!$rule->isMatching($this->adapter)) { - $isMatching = false; - } - } - - return $isMatching; - } - /** * Serialize a collection of rules * @@ -128,8 +104,8 @@ class ConstraintManager foreach ($unserializedRules as $rule) { if ($this->container->has($rule->ruleServiceId)) { /** @var CouponRuleInterface $couponRule */ - $couponRule = $this->container->get($rule->ruleServiceId); - $couponRule->populateFromForm( + $couponRule = $this->build( + $rule->ruleServiceId, (array) $rule->operators, (array) $rule->values ); @@ -140,4 +116,28 @@ class ConstraintManager return $collection; } + + + /** + * Build a Coupon Rule from form + * + * @param string $ruleServiceId Rule class name + * @param array $operators Rule Operator (<, >, = ) + * @param array $values Values setting this Rule + * + * @throws \InvalidArgumentException + * @return CouponRuleInterface Ready to use Rule or false + */ + public function build($ruleServiceId, array $operators, array $values) + { + if (!$this->container->has($ruleServiceId)) { + return false; + } + + /** @var CouponRuleInterface $rule */ + $rule = $this->container->get($ruleServiceId); + $rule->setValidatorsFromForm($operators, $values); + + return $rule; + } } \ No newline at end of file diff --git a/core/lib/Thelia/Constraint/ConstraintValidator.php b/core/lib/Thelia/Constraint/ConstraintValidator.php new file mode 100644 index 000000000..edacee317 --- /dev/null +++ b/core/lib/Thelia/Constraint/ConstraintValidator.php @@ -0,0 +1,133 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Constraint; + +use Symfony\Component\DependencyInjection\ContainerInterface; +use Symfony\Component\Serializer\Encoder\JsonEncoder; +use Thelia\Constraint\Rule\AvailableForTotalAmountManager; +use Thelia\Constraint\Rule\CouponRuleInterface; +use Thelia\Constraint\Rule\Operators; +use Thelia\Coupon\CouponRuleCollection; + + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Validate Constraints + * + * @package Constraint + * @author Guillaume MOREL + * + */ +class ConstraintValidator +{ + + /** + * Check if a Customer meets SerializableRule + * + * @param CouponRuleCollection $rules Rules to check against the Customer + * + * @return bool + */ + public function test(CouponRuleCollection $rules) + { + $isMatching = true; + /** @var CouponRuleInterface $rule */ + foreach ($rules->getRules() as $rule) { + if (!$rule->isMatching()) { + $isMatching = false; + } + } + + return $isMatching; + + } + + /** + * Do variable comparison + * + * @param mixed $v1 Variable 1 + * @param string $o Operator + * + * @param mixed $v2 Variable 2 + * @throws \Exception + * @return bool + */ + public function variableOpComparison($v1, $o, $v2) { + if ($o == Operators::DIFFERENT) { + return ($v1 != $v2); + } // could put this elsewhere... +// $operators = str_split($o); +// foreach($o as $operator) { + switch ($o) { // return will exit switch, foreach loop, function + case Operators::SUPERIOR : // > + if ($v1 > $v2) { + return true; + } else { + continue; + } break; + case Operators::SUPERIOR_OR_EQUAL : // >= + if ($v1 >= $v2) { + return true; + } else { + continue; + } break; + case Operators::INFERIOR : // < + if ($v1 < $v2) { + return true; + } else { + continue; + } break; + case Operators::INFERIOR_OR_EQUAL : // <= + if ($v1 <= $v2) { + return true; + } else { + continue; + } break; + case Operators::EQUAL : // == + if ($v1 == $v2) { + return true; + } else { + continue; + } break; + case Operators::IN: + if (in_array($v1, $v2)) { // in + return true; + } else { + continue; + } break; + case Operators::OUT: + if (!in_array($v1, $v2)) { // not in + return true; + } else { + continue; + } break; + default: throw new \Exception('Unrecognized operator ' . $o); + } +// } + return false; + } +} \ No newline at end of file diff --git a/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmount.php b/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmountManager.php similarity index 51% rename from core/lib/Thelia/Constraint/Rule/AvailableForTotalAmount.php rename to core/lib/Thelia/Constraint/Rule/AvailableForTotalAmountManager.php index 1cb85734a..98663fd4a 100644 --- a/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmount.php +++ b/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmountManager.php @@ -25,12 +25,14 @@ namespace Thelia\Constraint\Rule; use Symfony\Component\Intl\Exception\NotImplementedException; use Symfony\Component\Translation\Translator; +use Thelia\Constraint\ConstraintValidator; use Thelia\Coupon\CouponAdapterInterface; use Thelia\Constraint\Validator\PriceParam; use Thelia\Constraint\Validator\RuleValidator; use Thelia\Exception\InvalidRuleException; use Thelia\Exception\InvalidRuleOperatorException; use Thelia\Exception\InvalidRuleValueException; +use Thelia\Type\FloatType; /** * Created by JetBrains PhpStorm. @@ -44,26 +46,33 @@ use Thelia\Exception\InvalidRuleValueException; * @author Guillaume MOREL * */ -class AvailableForTotalAmount extends CouponRuleAbstract +class AvailableForTotalAmountManager extends CouponRuleAbstract { /** Rule 1st parameter : price */ - CONST PARAM1_PRICE = 'price'; + CONST INPUT1 = 'price'; /** Rule 1st parameter : currency */ - CONST PARAM1_CURRENCY = 'currency'; + CONST INPUT2 = 'currency'; /** @var string Service Id from Resources/config.xml */ protected $serviceId = 'thelia.constraint.rule.available_for_total_amount'; /** @var array Available Operators (Operators::CONST) */ protected $availableOperators = array( - Operators::INFERIOR, - Operators::EQUAL, - Operators::SUPERIOR, + self::INPUT1 => array( + Operators::INFERIOR, + Operators::INFERIOR_OR_EQUAL, + Operators::EQUAL, + Operators::SUPERIOR_OR_EQUAL, + Operators::SUPERIOR + ), + self::INPUT2 => array( + Operators::EQUAL, + ) ); - /** @var RuleValidator Price Validator */ - protected $priceValidator = null; +// /** @var RuleValidator Price Validator */ +// protected $priceValidator = null; /** * Check if backoffice inputs are relevant or not @@ -96,34 +105,146 @@ class AvailableForTotalAmount extends CouponRuleAbstract return $this->isPriceValid($price->getPrice(), $price->getCurrency()); } +// /** +// * Check if Checkout inputs are relevant or not +// * +// * @throws InvalidRuleValueException if Value is not allowed +// * @return bool +// */ +// public function checkCheckoutInput() +// { +// $currency = $this->adapter->getCheckoutCurrency(); +// if (empty($currency)) { +// throw new InvalidRuleValueException( +// get_class(), self::PARAM1_CURRENCY +// ); +// } +// +// $price = $this->adapter->getCartTotalPrice(); +// if (empty($price)) { +// throw new InvalidRuleValueException( +// get_class(), self::PARAM1_PRICE +// ); +// } +// +// $this->paramsToValidate = array( +// self::PARAM1_PRICE => $this->adapter->getCartTotalPrice(), +// self::PARAM1_CURRENCY => $this->adapter->getCheckoutCurrency() +// ); +// +// return $this->isPriceValid($price, $currency); +// } + /** - * Check if Checkout inputs are relevant or not + * Check validators relevancy and store them * - * @throws InvalidRuleValueException if Value is not allowed - * @return bool + * @param array $operators Operators the Admin set in BackOffice + * @param array $values Values the Admin set in BackOffice + * + * @throws \InvalidArgumentException + * @return $this */ - public function checkCheckoutInput() + public function setValidatorsFromForm(array $operators, array $values) { - $currency = $this->adapter->getCheckoutCurrency(); - if (empty($currency)) { - throw new InvalidRuleValueException( - get_class(), self::PARAM1_CURRENCY - ); - } - - $price = $this->adapter->getCartTotalPrice(); - if (empty($price)) { - throw new InvalidRuleValueException( - get_class(), self::PARAM1_PRICE - ); - } - - $this->paramsToValidate = array( - self::PARAM1_PRICE => $this->adapter->getCartTotalPrice(), - self::PARAM1_CURRENCY => $this->adapter->getCheckoutCurrency() + $this->setValidators( + $operators[self::INPUT1], + $values[self::INPUT1], + $operators[self::INPUT2], + $values[self::INPUT2] ); - return $this->isPriceValid($price, $currency); + return $this; + } + + /** + * Check validators relevancy and store them + * + * @param string $priceOperator Price Operator ex < + * @param float $priceValue Price set to meet condition + * @param string $currencyOperator Currency Operator ex = + * @param string $currencyValue Currency set to meet condition + * + * @throws \InvalidArgumentException + * @return $this + */ + protected function setValidators($priceOperator, $priceValue, $currencyOperator, $currencyValue) + { + $isOperator1Legit = $this->isOperatorLegit( + $priceOperator, + $this->availableOperators[self::INPUT1] + ); + if (!$isOperator1Legit) { + throw new \InvalidArgumentException( + 'Operator for price field is not legit' + ); + } + + $isOperator1Legit = $this->isOperatorLegit( + $currencyOperator, + $this->availableOperators[self::INPUT2] + ); + if (!$isOperator1Legit) { + throw new \InvalidArgumentException( + 'Operator for currency field is not legit' + ); + } + + $floatType = new FloatType(); + if (!$floatType->isValid($priceValue) || $priceValue <= 0) { + throw new \InvalidArgumentException( + 'Value for price field is not legit' + ); + } + + // @todo check currency is legit or not + + $this->operators = array( + self::INPUT1 => $priceOperator, + self::INPUT2 => $currencyOperator, + ); + $this->values = array( + self::INPUT1 => $priceValue, + self::INPUT2 => $currencyValue, + ); + + return $this; + } + + /** + * Test if Customer meets conditions + * + * @return bool + */ + public function isMatching() + { + $isOperator1Legit = $this->isOperatorLegit( + $this->operators[self::INPUT1], + $this->availableOperators[self::INPUT1] + ); + $isOperator2Legit = $this->isOperatorLegit( + $this->operators[self::INPUT2], + $this->availableOperators[self::INPUT2] + ); + + if (!$isOperator1Legit || !$isOperator2Legit) { + return false; + } + + $constrainValidator = new ConstraintValidator(); + $constraint1 =$constrainValidator->variableOpComparison( + $this->adapter->getCartTotalPrice(), + $this->operators[self::INPUT1], + $this->values[self::INPUT1] + ); + $constraint2 =$constrainValidator->variableOpComparison( + $this->adapter->getCheckoutCurrency(), + $this->operators[self::INPUT2], + $this->values[self::INPUT2] + ); + if ($constraint1 && $constraint2) { + return true; + } + return false; } /** @@ -154,20 +275,20 @@ class AvailableForTotalAmount extends CouponRuleAbstract return true; } - /** - * Generate current Rule param to be validated from adapter - * - * @return $this - */ - protected function setParametersToValidate() - { - $this->paramsToValidate = array( - self::PARAM1_PRICE => $this->adapter->getCartTotalPrice(), - self::PARAM1_CURRENCY => $this->adapter->getCheckoutCurrency() - ); - - return $this; - } +// /** +// * Generate current Rule param to be validated from adapter +// * +// * @return $this +// */ +// protected function setParametersToValidate() +// { +// $this->paramsToValidate = array( +// self::PARAM1_PRICE => $this->adapter->getCartTotalPrice(), +// self::PARAM1_CURRENCY => $this->adapter->getCheckoutCurrency() +// ); +// +// return $this; +// } /** * Get I18n name @@ -207,38 +328,38 @@ class AvailableForTotalAmount extends CouponRuleAbstract return $toolTip; } - /** - * Populate a Rule from a form admin - * - * @param array $operators Rule Operator set by the Admin - * @param array $values Rule Values set by the Admin - * - * @throws \InvalidArgumentException - * @return $this - */ - public function populateFromForm(array $operators, array $values) - { - if ($values[self::PARAM1_PRICE] === null - || $values[self::PARAM1_CURRENCY] === null - ) { - throw new \InvalidArgumentException( - 'The Rule ' . get_class() . 'needs at least a quantity set (' . self::PARAM1_PRICE . ', ' . self::PARAM1_CURRENCY . ')' - ); - } - - $this->priceValidator = new RuleValidator( - $operators[self::PARAM1_PRICE], - new PriceParam( - $this->translator, - $values[self::PARAM1_PRICE], - $values[self::PARAM1_CURRENCY] - ) - ); - - $this->validators = array(self::PARAM1_PRICE => $this->priceValidator); - - return $this; - } +// /** +// * Populate a Rule from a form admin +// * +// * @param array $operators Rule Operator set by the Admin +// * @param array $values Rule Values set by the Admin +// * +// * @throws \InvalidArgumentException +// * @return $this +// */ +// public function populateFromForm(array $operators, array $values) +// { +// if ($values[self::PARAM1_PRICE] === null +// || $values[self::PARAM1_CURRENCY] === null +// ) { +// throw new \InvalidArgumentException( +// 'The Rule ' . get_class() . 'needs at least a quantity set (' . self::PARAM1_PRICE . ', ' . self::PARAM1_CURRENCY . ')' +// ); +// } +// +// $this->priceValidator = new RuleValidator( +// $operators[self::PARAM1_PRICE], +// new PriceParam( +// $this->translator, +// $values[self::PARAM1_PRICE], +// $values[self::PARAM1_CURRENCY] +// ) +// ); +// +// $this->validators = array(self::PARAM1_PRICE => $this->priceValidator); +// +// return $this; +// } /** * Return a serializable Rule @@ -249,14 +370,9 @@ class AvailableForTotalAmount extends CouponRuleAbstract { $serializableRule = new SerializableRule(); $serializableRule->ruleServiceId = $this->serviceId; - $serializableRule->operators = array( - self::PARAM1_PRICE => $this->priceValidator->getOperator() - ); + $serializableRule->operators = $this->operators; - $serializableRule->values = array( - self::PARAM1_PRICE => $this->priceValidator->getParam()->getPrice(), - self::PARAM1_CURRENCY => $this->priceValidator->getParam()->getCurrency() - ); + $serializableRule->values = $this->values; return $serializableRule; } diff --git a/core/lib/Thelia/Constraint/Rule/AvailableForXArticles.php b/core/lib/Thelia/Constraint/Rule/AvailableForXArticlesManager.php similarity index 62% rename from core/lib/Thelia/Constraint/Rule/AvailableForXArticles.php rename to core/lib/Thelia/Constraint/Rule/AvailableForXArticlesManager.php index a15562128..f56596bc2 100644 --- a/core/lib/Thelia/Constraint/Rule/AvailableForXArticles.php +++ b/core/lib/Thelia/Constraint/Rule/AvailableForXArticlesManager.php @@ -25,10 +25,13 @@ 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. @@ -41,19 +44,23 @@ use Thelia\Exception\InvalidRuleValueException; * @author Guillaume MOREL * */ -class AvailableForXArticles extends CouponRuleAbstract +class AvailableForXArticlesManager extends CouponRuleAbstract { /** Rule 1st parameter : quantity */ - CONST PARAM1_QUANTITY = 'quantity'; + CONST INPUT1 = 'quantity'; /** @var string Service Id from Resources/config.xml */ protected $serviceId = 'thelia.constraint.rule.available_for_x_articles'; /** @var array Available Operators (Operators::CONST) */ protected $availableOperators = array( - Operators::INFERIOR, - Operators::EQUAL, - Operators::SUPERIOR, + self::INPUT1 => array( + Operators::INFERIOR, + Operators::INFERIOR_OR_EQUAL, + Operators::EQUAL, + Operators::SUPERIOR_OR_EQUAL, + Operators::SUPERIOR + ) ); /** @var QuantityParam Quantity Validator */ @@ -107,24 +114,100 @@ class AvailableForXArticles extends CouponRuleAbstract return $this; } +// /** +// * Check if Checkout inputs are relevant or not +// * +// * @throws \Thelia\Exception\InvalidRuleValueException +// * @return bool +// */ +// public function checkCheckoutInput() +// { +// if (!isset($this->paramsToValidate) +// || empty($this->paramsToValidate) +// ||!isset($this->paramsToValidate[self::PARAM1_QUANTITY]) +// ) { +// throw new InvalidRuleValueException(get_class(), self::PARAM1_QUANTITY); +// } +// +// $price = $this->paramsToValidate[self::PARAM1_QUANTITY]; +// +// return $this->isQuantityValid($price); +// } + /** - * Check if Checkout inputs are relevant or not + * Check validators relevancy and store them * - * @throws \Thelia\Exception\InvalidRuleValueException - * @return bool + * @param array $operators Operators the Admin set in BackOffice + * @param array $values Values the Admin set in BackOffice + * + * @throws \InvalidArgumentException + * @return $this */ - public function checkCheckoutInput() + public function setValidatorsFromForm(array $operators, array $values) { - if (!isset($this->paramsToValidate) - || empty($this->paramsToValidate) - ||!isset($this->paramsToValidate[self::PARAM1_QUANTITY]) - ) { - throw new InvalidRuleValueException(get_class(), self::PARAM1_QUANTITY); + $this->setValidators( + $operators[self::INPUT1], + $values[self::INPUT1] + ); + + return $this; + } + + /** + * Check validators relevancy and store them + * + * @param string $quantityOperator Quantity Operator ex < + * @param int $quantityValue Quantity set to meet condition + * + * @throws \InvalidArgumentException + * @return $this + */ + protected function setValidators($quantityOperator, $quantityValue) + { + $isOperator1Legit = $this->isOperatorLegit( + $quantityOperator, + $this->availableOperators[self::INPUT1] + ); + if (!$isOperator1Legit) { + throw new \InvalidArgumentException( + 'Operator for quantity field is not legit' + ); } - $price = $this->paramsToValidate[self::PARAM1_QUANTITY]; + if (!is_int($quantityValue) || $quantityValue <= 0) { + throw new \InvalidArgumentException( + 'Value for quantity field is not legit' + ); + } - return $this->isQuantityValid($price); + $this->operators = array( + self::INPUT1 => $quantityOperator, + ); + $this->values = array( + self::INPUT1 => $quantityValue, + ); + + return $this; + } + + /** + * Test if Customer meets conditions + * + * @return bool + */ + public function isMatching() + { + $constrainValidator = new ConstraintValidator(); + $constraint1 =$constrainValidator->variableOpComparison( + $this->adapter->getNbArticlesInCart(), + $this->operators[self::INPUT1], + $this->values[self::INPUT1] + ); + + if ($constraint1) { + return true; + } + return false; } /** @@ -184,35 +267,35 @@ class AvailableForXArticles extends CouponRuleAbstract return $toolTip; } - /** - * Populate a Rule from a form admin - * - * @param array $operators Rule Operator set by the Admin - * @param array $values Rule Values set by the Admin - * - * @throws InvalidArgumentException - * @return $this - */ - public function populateFromForm(array $operators, array $values) - { - if ($values[self::PARAM1_QUANTITY] === null) { - throw new InvalidArgumentException( - 'The Rule ' . get_class() . 'needs at least a quantity set (' . self::PARAM1_QUANTITY. ')' - ); - } - - $this->quantityValidator = new RuleValidator( - $operators[self::PARAM1_QUANTITY], - new QuantityParam( - $this->adapter, - $values[self::PARAM1_QUANTITY] - ) - ); - - $this->validators = array(self::PARAM1_QUANTITY => $this->quantityValidator); - - return $this; - } +// /** +// * Populate a Rule from a form admin +// * +// * @param array $operators Rule Operator set by the Admin +// * @param array $values Rule Values set by the Admin +// * +// * @throws InvalidArgumentException +// * @return $this +// */ +// public function populateFromForm(array $operators, array $values) +// { +// if ($values[self::PARAM1_QUANTITY] === null) { +// throw new InvalidArgumentException( +// 'The Rule ' . get_class() . 'needs at least a quantity set (' . self::PARAM1_QUANTITY. ')' +// ); +// } +// +// $this->quantityValidator = new RuleValidator( +// $operators[self::PARAM1_QUANTITY], +// new QuantityParam( +// $this->adapter, +// $values[self::PARAM1_QUANTITY] +// ) +// ); +// +// $this->validators = array(self::PARAM1_QUANTITY => $this->quantityValidator); +// +// return $this; +// } /** * Return a serializable Rule diff --git a/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php b/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php index fa5544c00..1c781d97f 100644 --- a/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php +++ b/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php @@ -67,6 +67,12 @@ abstract class CouponRuleAbstract implements CouponRuleInterface /** @var Translator Service Translator */ protected $translator = null; + /** @var array Operators set by Admin in BackOffice */ + protected $operators = array(); + + /** @var array Values set by Admin in BackOffice */ + protected $values = array(); + /** * Constructor * @@ -78,59 +84,61 @@ abstract class CouponRuleAbstract implements CouponRuleInterface $this->translator = $adapter->getTranslator(); } - /** - * Check validator relevancy and store them - * - * @param array $validators Array of RuleValidator - * validating $paramsToValidate against - * - * @return $this - * @throws InvalidRuleException - */ - protected function setValidators(array $validators) - { - foreach ($validators as $validator) { - if (!$validator instanceof RuleValidator) { - throw new InvalidRuleException(get_class()); - } - if (!in_array($validator->getOperator(), $this->availableOperators)) { - throw new InvalidRuleOperatorException( - get_class(), - $validator->getOperator() - ); - } - } - $this->validators = $validators; +// /** +// * Check validator relevancy and store them +// * +// * @param array $validators Array of RuleValidator +// * validating $paramsToValidate against +// * +// * @return $this +// * @throws InvalidRuleException +// */ +// protected function setValidators(array $validators) +// { +// foreach ($validators as $validator) { +// if (!$validator instanceof RuleValidator) { +// throw new InvalidRuleException(get_class()); +// } +// if (!in_array($validator->getOperator(), $this->availableOperators)) { +// throw new InvalidRuleOperatorException( +// get_class(), +// $validator->getOperator() +// ); +// } +// } +// $this->validators = $validators; +// +// return $this; +// } - return $this; - } - /** - * Check if the current Checkout matches this condition - * - * @return bool - */ - public function isMatching() - { - $this->checkBackOfficeInput(); - $this->checkCheckoutInput(); - $isMatching = true; - /** @var $validator RuleValidator*/ - foreach ($this->validators as $param => $validator) { - $a = $this->paramsToValidate[$param]; - $operator = $validator->getOperator(); - /** @var ComparableInterface, RuleParameterAbstract $b */ - $b = $validator->getParam(); - - if (!Operators::isValid($a, $operator, $b)) { - $isMatching = false; - } - } - - return $isMatching; - - } +// /** +// * Check if the current Checkout matches this condition +// * +// * @return bool +// */ +// public function isMatching() +// { +// $this->checkBackOfficeInput(); +// $this->checkCheckoutInput(); +// +// $isMatching = true; +// /** @var $validator RuleValidator*/ +// foreach ($this->validators as $param => $validator) { +// $a = $this->paramsToValidate[$param]; +// $operator = $validator->getOperator(); +// /** @var ComparableInterface, RuleParameterAbstract $b */ +// $b = $validator->getParam(); +// +// if (!Operators::isValid($a, $operator, $b)) { +// $isMatching = false; +// } +// } +// +// return $isMatching; +// +// } /** * Return all available Operators for this Rule @@ -162,16 +170,16 @@ abstract class CouponRuleAbstract implements CouponRuleInterface return true; } - /** - * Generate current Rule param to be validated from adapter - * - * @throws \Thelia\Exception\NotImplementedException - * @return $this - */ - protected function setParametersToValidate() - { - throw new \Thelia\Exception\NotImplementedException(); - } +// /** +// * Generate current Rule param to be validated from adapter +// * +// * @throws \Thelia\Exception\NotImplementedException +// * @return $this +// */ +// protected function setParametersToValidate() +// { +// throw new \Thelia\Exception\NotImplementedException(); +// } /** * Return all validators @@ -194,6 +202,17 @@ abstract class CouponRuleAbstract implements CouponRuleInterface return $this->serviceId; } - + /** + * Validate if Operator given is available for this Coupon + * + * @param string $operator Operator to validate ex < + * @param array $availableOperators Available operators + * + * @return bool + */ + protected function isOperatorLegit($operator, array $availableOperators) + { + return in_array($operator, $availableOperators); + } } \ No newline at end of file diff --git a/core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php b/core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php index ac856d212..4c5575159 100644 --- a/core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php +++ b/core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php @@ -46,6 +46,13 @@ interface CouponRuleInterface */ function __construct(CouponAdapterInterface $adapter); + /** + * Get Rule Service id + * + * @return string + */ + public function getServiceId(); + /** * Check if backoffice inputs are relevant or not * @@ -53,15 +60,33 @@ interface CouponRuleInterface */ public function checkBackOfficeInput(); - /** - * Check if Checkout inputs are relevant or not - * - * @return bool - */ - public function checkCheckoutInput(); +// /** +// * Check if Checkout inputs are relevant or not +// * +// * @return bool +// */ +// public function checkCheckoutInput(); /** - * Check if the current Checkout matches this condition + * 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); + +// /** +// * Check if the current Checkout matches this condition +// * +// * @return bool +// */ +// public function isMatching(); + + /** + * Test if Customer meets conditions * * @return bool */ @@ -96,15 +121,15 @@ interface CouponRuleInterface */ public function getValidators(); - /** - * Populate a Rule from a form admin - * - * @param array $operators Rule Operator set by the Admin - * @param array $values Rule Values set by the Admin - * - * @return bool - */ - public function populateFromForm(array$operators, array $values); +// /** +// * Populate a Rule from a form admin +// * +// * @param array $operators Rule Operator set by the Admin +// * @param array $values Rule Values set by the Admin +// * +// * @return bool +// */ +// public function populateFromForm(array$operators, array $values); /** diff --git a/core/lib/Thelia/Constraint/Rule/Operators.php b/core/lib/Thelia/Constraint/Rule/Operators.php index 61e8337c6..237c6a5e0 100644 --- a/core/lib/Thelia/Constraint/Rule/Operators.php +++ b/core/lib/Thelia/Constraint/Rule/Operators.php @@ -51,62 +51,66 @@ abstract class Operators CONST SUPERIOR = '>'; /** Param1 is different to Param2 */ CONST DIFFERENT = '!='; + /** Param1 is in Param2 */ + CONST IN = 'in'; + /** Param1 is not in Param2 */ + CONST OUT = 'out'; - /** - * Check if a parameter is valid against a ComparableInterface from its operator - * - * @param mixed $a Parameter to validate - * @param string $operator Operator to validate against - * @param ComparableInterface $b Comparable to validate against - * - * @return bool - */ - public static function isValid($a, $operator, ComparableInterface $b) - { - $ret = false; - - try { - $comparison = $b->compareTo($a); - } catch (\Exception $e) { - return false; - } - - switch ($operator) { - case self::INFERIOR: - if ($comparison == 1) { - return true; - } - break; - case self::INFERIOR_OR_EQUAL: - if ($comparison == 1 || $comparison == 0) { - return true; - } - break; - case self::EQUAL: - if ($comparison == 0) { - return true; - } - break; - case self::SUPERIOR_OR_EQUAL: - if ($comparison == -1 || $comparison == 0) { - return true; - } - break; - case self::SUPERIOR: - if ($comparison == -1) { - return true; - } - break; - case self::DIFFERENT: - if ($comparison != 0) { - return true; - } - break; - default: - } - - return $ret; - } +// /** +// * Check if a parameter is valid against a ComparableInterface from its operator +// * +// * @param mixed $a Parameter to validate +// * @param string $operator Operator to validate against +// * @param ComparableInterface $b Comparable to validate against +// * +// * @return bool +// */ +// public static function isValid($a, $operator, ComparableInterface $b) +// { +// $ret = false; +// +// try { +// $comparison = $b->compareTo($a); +// } catch (\Exception $e) { +// return false; +// } +// +// switch ($operator) { +// case self::INFERIOR: +// if ($comparison == 1) { +// return true; +// } +// break; +// case self::INFERIOR_OR_EQUAL: +// if ($comparison == 1 || $comparison == 0) { +// return true; +// } +// break; +// case self::EQUAL: +// if ($comparison == 0) { +// return true; +// } +// break; +// case self::SUPERIOR_OR_EQUAL: +// if ($comparison == -1 || $comparison == 0) { +// return true; +// } +// break; +// case self::SUPERIOR: +// if ($comparison == -1) { +// return true; +// } +// break; +// case self::DIFFERENT: +// if ($comparison != 0) { +// return true; +// } +// break; +// default: +// } +// +// return $ret; +// } /** * Get operator translation @@ -162,6 +166,20 @@ abstract class Operators 'constraint' ); break; + case self::IN: + $ret = $translator->trans( + 'in', + array(), + 'constraint' + ); + break; + case self::OUT: + $ret = $translator->trans( + 'not in', + array(), + 'constraint' + ); + break; default: } diff --git a/core/lib/Thelia/Coupon/CouponFactory.php b/core/lib/Thelia/Coupon/CouponFactory.php index 3ff064601..b23eb56ea 100644 --- a/core/lib/Thelia/Coupon/CouponFactory.php +++ b/core/lib/Thelia/Coupon/CouponFactory.php @@ -128,25 +128,5 @@ class CouponFactory } -// /** -// * Build a Coupon Rule from form -// * -// * @param string $type Rule class name -// * @param string $operator Rule Operator (<, >, = ) -// * @param array $values Values setting this Rule -// * -// * @return CouponRuleInterface Ready to use Rule or false -// */ -// public function buildCouponRuleFromForm($ruleServiceId, $operator, array $values) -// { -// /** @var CouponAdapterInterface $adapter */ -// $adapter = $this->container->get('thelia.adapter'); -// $validator = new PriceParam() -// try { -// $rule = new AvailableForTotalAmount($adapter, $validators); -// $rule = new $type($adapter, $validators); -// } catch (\Exception $e) { -// return false; -// } -// } + } diff --git a/core/lib/Thelia/Tests/Constraint/ConstraintManagerTest.php b/core/lib/Thelia/Tests/Constraint/ConstraintFactoryTest.php similarity index 59% rename from core/lib/Thelia/Tests/Constraint/ConstraintManagerTest.php rename to core/lib/Thelia/Tests/Constraint/ConstraintFactoryTest.php index a5f55cee1..70d6e498c 100644 --- a/core/lib/Thelia/Tests/Constraint/ConstraintManagerTest.php +++ b/core/lib/Thelia/Tests/Constraint/ConstraintFactoryTest.php @@ -24,17 +24,11 @@ namespace Thelia\Constraint; use Symfony\Component\DependencyInjection\ContainerBuilder; -use Thelia\Constraint\Rule\AvailableForXArticles; -use Thelia\Constraint\Validator\PriceParam; -use Thelia\Constraint\Validator\RuleValidator; -use Thelia\Constraint\Rule\AvailableForTotalAmount; +use Thelia\Constraint\Rule\AvailableForTotalAmountManager; +use Thelia\Constraint\Rule\AvailableForXArticlesManager; use Thelia\Constraint\Rule\Operators; use Thelia\Coupon\CouponBaseAdapter; -use Thelia\Coupon\CouponBaseAdapterTest; use Thelia\Coupon\CouponRuleCollection; -use Thelia\Coupon\Type\CouponInterface; -use Thelia\Coupon\Type\RemoveXAmount; -use Thelia\Tools\PhpUnitUtils; /** * Created by JetBrains PhpStorm. @@ -47,7 +41,7 @@ use Thelia\Tools\PhpUnitUtils; * @author Guillaume MOREL * */ -class ConstraintManagerTest extends \PHPUnit_Framework_TestCase +class ConstraintFactoryTest extends \PHPUnit_Framework_TestCase { /** @@ -59,9 +53,9 @@ class ConstraintManagerTest extends \PHPUnit_Framework_TestCase } /** - * Check the if the Constraint Manager is able to check RuleValidators + * Check the Rules serialization module */ - public function testIsMatching() + public function testBuild() { $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator') ->disableOriginalConstructor() @@ -75,43 +69,68 @@ class ConstraintManagerTest extends \PHPUnit_Framework_TestCase ->method('getTranslator') ->will($this->returnValue($stubTranslator)); - $stubAdapter->expects($this->any()) - ->method('getCartTotalPrice') - ->will($this->returnValue(321.98)); - - $stubAdapter->expects($this->any()) - ->method('getCheckoutCurrency') - ->will($this->returnValue('USD')); - - $rule1 = new AvailableForTotalAmount($stubAdapter); - $operators = array(AvailableForTotalAmount::PARAM1_PRICE => Operators::SUPERIOR); - $values = array( - AvailableForTotalAmount::PARAM1_PRICE => 40.00, - AvailableForTotalAmount::PARAM1_CURRENCY => 'USD' + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::SUPERIOR, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL ); - $rule1->populateFromForm($operators, $values); - - $rule2 = new AvailableForTotalAmount($stubAdapter); - $operators = array(AvailableForTotalAmount::PARAM1_PRICE => Operators::INFERIOR); $values = array( - AvailableForTotalAmount::PARAM1_PRICE => 400.00, - AvailableForTotalAmount::PARAM1_CURRENCY => 'USD' + AvailableForTotalAmountManager::INPUT1 => 40.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR' ); - $rule2->populateFromForm($operators, $values); - - $rules = new CouponRuleCollection(); - $rules->add($rule1); - $rules->add($rule2); + $rule1->setValidatorsFromForm($operators, $values); /** @var ConstraintManager $constraintManager */ - $constraintManager = new ConstraintManager($this->getContainer()); + $constraintFactory = new ConstraintFactory($this->getContainer()); + $ruleManager1 = $constraintFactory->build($rule1->getServiceId(), $operators, $values); - $expected = true; - $actual = $constraintManager->isMatching($rules); + $expected = $rule1; + $actual = $ruleManager1; - $this->assertEquals($expected, $actual, 'The ConstraintManager is no more able to check if a Rule is matching'); + $this->assertEquals($expected, $actual); + $this->assertEquals($rule1->getServiceId(), $ruleManager1->getServiceId()); + $this->assertEquals($rule1->getValidators(), $ruleManager1->getValidators()); } + /** + * Check the Rules serialization module + */ + public function testBuildFail() + { + $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getTranslator') + ->will($this->returnValue($stubTranslator)); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::SUPERIOR, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL + ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 40.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR' + ); + $rule1->setValidatorsFromForm($operators, $values); + + /** @var ConstraintManager $constraintManager */ + $constraintFactory = new ConstraintFactory($this->getContainer()); + $ruleManager1 = $constraintFactory->build('unset.service', $operators, $values); + + $expected = false; + $actual = $ruleManager1; + + $this->assertEquals($expected, $actual); + } + + /** * Check the Rules serialization module */ @@ -129,31 +148,37 @@ class ConstraintManagerTest extends \PHPUnit_Framework_TestCase ->method('getTranslator') ->will($this->returnValue($stubTranslator)); - $rule1 = new AvailableForTotalAmount($stubAdapter); - $operators = array(AvailableForTotalAmount::PARAM1_PRICE => Operators::SUPERIOR); - $values = array( - AvailableForTotalAmount::PARAM1_PRICE => 40.00, - AvailableForTotalAmount::PARAM1_CURRENCY => 'EUR' + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $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($stubAdapter); - $operators = array(AvailableForTotalAmount::PARAM1_PRICE => Operators::INFERIOR); - $values = array( - AvailableForTotalAmount::PARAM1_PRICE => 400.00, - AvailableForTotalAmount::PARAM1_CURRENCY => 'EUR' + $rule2 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::SUPERIOR, + 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($this->getContainer()); + $constraintFactory = new ConstraintFactory($this->getContainer()); - $serializedRules = $constraintManager->serializeCouponRuleCollection($rules); - $unserializedRules = $constraintManager->unserializeCouponRuleCollection($serializedRules); + $serializedRules = $constraintFactory->serializeCouponRuleCollection($rules); + $unserializedRules = $constraintFactory->unserializeCouponRuleCollection($serializedRules); $expected = (string)$rules; $actual = (string)$unserializedRules; @@ -182,8 +207,8 @@ class ConstraintManagerTest extends \PHPUnit_Framework_TestCase ->method('getTranslator') ->will($this->returnValue($stubTranslator)); - $rule1 = new AvailableForTotalAmount($stubAdapter); - $rule2 = new AvailableForXArticles($stubAdapter); + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $rule2 = new AvailableForXArticlesManager($stubAdapter); $adapter = new CouponBaseAdapter($container); diff --git a/core/lib/Thelia/Tests/Constraint/ConstraintValidatorTest.php b/core/lib/Thelia/Tests/Constraint/ConstraintValidatorTest.php new file mode 100644 index 000000000..28ac4b952 --- /dev/null +++ b/core/lib/Thelia/Tests/Constraint/ConstraintValidatorTest.php @@ -0,0 +1,337 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Constraint; + +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Thelia\Constraint\Rule\AvailableForTotalAmountManager; +use Thelia\Constraint\Rule\AvailableForXArticlesManager; +use Thelia\Constraint\Rule\Operators; +use Thelia\Coupon\CouponBaseAdapter; +use Thelia\Coupon\CouponRuleCollection; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Unit Test ConstraintValidator Class + * + * @package Constraint + * @author Guillaume MOREL + * + */ +class ConstraintValidatorTest extends \PHPUnit_Framework_TestCase +{ + + /** + * Sets up the fixture, for example, opens a network connection. + * This method is called before a test is executed. + */ + public function setUp() + { + } + + public function testTestSuccess1Rules() + { + $ConstraintValidator = new ConstraintValidator(); + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(401)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => '>', + AvailableForTotalAmountManager::INPUT2 => '==' + ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); + + + $rules = new CouponRuleCollection(); + $rules->add($rule1); + + $isValid = $ConstraintValidator->test($rules); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + public function testTestFail1Rules() + { + $ConstraintValidator = new ConstraintValidator(); + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(400)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => '>', + AvailableForTotalAmountManager::INPUT2 => '==' + ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); + + + $rules = new CouponRuleCollection(); + $rules->add($rule1); + + $isValid = $ConstraintValidator->test($rules); + + $expected = false; + $actual =$isValid; + $this->assertEquals($expected, $actual, 'Constraints validator always think Customer is matching rules'); + } + + public function testTestSuccess2Rules() + { + $ConstraintValidator = new ConstraintValidator(); + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(401)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + $stubAdapter->expects($this->any()) + ->method('getNbArticlesInCart') + ->will($this->returnValue(5)); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => '>', + AvailableForTotalAmountManager::INPUT2 => '==' + ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); + + $rule2 = new AvailableForXArticlesManager($stubAdapter); + $operators = array( + AvailableForXArticlesManager::INPUT1 => '>' + ); + $values = array( + AvailableForXArticlesManager::INPUT1 => 4 + ); + $rule2->setValidatorsFromForm($operators, $values); + + $rules = new CouponRuleCollection(); + $rules->add($rule1); + $rules->add($rule2); + + $isValid = $ConstraintValidator->test($rules); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + public function testTestFail2Rules() + { + $ConstraintValidator = new ConstraintValidator(); + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(400)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + $stubAdapter->expects($this->any()) + ->method('getNbArticlesInCart') + ->will($this->returnValue(5)); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => '>', + AvailableForTotalAmountManager::INPUT2 => '==' + ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); + + $rule2 = new AvailableForXArticlesManager($stubAdapter); + $operators = array( + AvailableForXArticlesManager::INPUT1 => '>' + ); + $values = array( + AvailableForXArticlesManager::INPUT1 => 4 + ); + $rule2->setValidatorsFromForm($operators, $values); + + $rules = new CouponRuleCollection(); + $rules->add($rule1); + $rules->add($rule2); + + $isValid = $ConstraintValidator->test($rules); + + $expected = false; + $actual =$isValid; + $this->assertEquals($expected, $actual, 'Constraints validator always think Customer is matching rules'); + } + + + public function testVariableOpComparisonSuccess() + { + $ConstraintValidator = new ConstraintValidator(); + $expected = true; + $actual = $ConstraintValidator->variableOpComparison(1, Operators::EQUAL, 1); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(1, Operators::DIFFERENT, 2); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(1, Operators::SUPERIOR, 0); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(1, Operators::INFERIOR, 2); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(1, Operators::INFERIOR_OR_EQUAL, 1); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(1, Operators::INFERIOR_OR_EQUAL, 2); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(1, Operators::SUPERIOR_OR_EQUAL, 1); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(1, Operators::SUPERIOR_OR_EQUAL, 0); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(1, Operators::IN, array(1, 2, 3)); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(1, Operators::OUT, array(0, 2, 3)); + $this->assertEquals($expected, $actual); + + } + + public function testVariableOpComparisonFail() + { + $ConstraintValidator = new ConstraintValidator(); + $expected = false; + $actual = $ConstraintValidator->variableOpComparison(2, Operators::EQUAL, 1); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(2, Operators::DIFFERENT, 2); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(0, Operators::SUPERIOR, 0); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(3, Operators::INFERIOR, 2); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(2, Operators::INFERIOR_OR_EQUAL, 1); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(3, Operators::SUPERIOR_OR_EQUAL, 4); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(0, Operators::IN, array(1, 2, 3)); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(2, Operators::OUT, array(0, 2, 3)); + $this->assertEquals($expected, $actual); + + } + + /** + * @expectedException \Exception + */ + public function testVariableOpComparisonException() + { + $ConstraintValidator = new ConstraintValidator(); + $expected = true; + $actual = $ConstraintValidator->variableOpComparison(1, 'bad', 1); + $this->assertEquals($expected, $actual); + } + + /** + * Get Mocked Container with 2 Rules + * + * @return ContainerBuilder + */ + public function getContainer() + { + $container = new ContainerBuilder(); + + $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getTranslator') + ->will($this->returnValue($stubTranslator)); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $rule2 = new AvailableForXArticlesManager($stubAdapter); + + $adapter = new CouponBaseAdapter($container); + + $container->set('thelia.constraint.rule.available_for_total_amount', $rule1); + $container->set('thelia.constraint.rule.available_for_x_articles', $rule2); + $container->set('thelia.adapter', $adapter); + + return $container; + } + + /** + * Tears down the fixture, for example, closes a network connection. + * This method is called after a test is executed. + */ + protected function tearDown() + { + } +} diff --git a/core/lib/Thelia/Tests/Constraint/Rule/AvailableForTotalAmountTest.php b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForTotalAmountTest.php index f13e59238..bfcde8a21 100644 --- a/core/lib/Thelia/Tests/Constraint/Rule/AvailableForTotalAmountTest.php +++ b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForTotalAmountTest.php @@ -23,12 +23,8 @@ 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\Exception\InvalidRuleOperatorException; -use Thelia\Exception\InvalidRuleValueException; /** * Created by JetBrains PhpStorm. @@ -52,344 +48,613 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - /** @var CouponAdapterInterface $stubTheliaAdapter */ - $this->stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); +// /** @var CouponAdapterInterface $stubTheliaAdapter */ +// $this->stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); } - /** - * Generate valid CouponBaseAdapter - * - * @param float $cartTotalPrice Total amount of the current Cart - * - * @return CouponAdapterInterface - */ - protected function generateValidCouponBaseAdapterMock($cartTotalPrice = 421.23) - { - /** @var CouponAdapterInterface $stubTheliaAdapter */ - $stubTheliaAdapter = $this->getMock( - 'Thelia\Coupon\CouponBaseAdapter', - array('getCartTotalPrice'), - array() - ); - $stubTheliaAdapter->expects($this->any()) - ->method('getCartTotalPrice') - ->will($this->returnValue($cartTotalPrice)); +// /** +// * Generate valid CouponBaseAdapter +// * +// * @param float $cartTotalPrice Total amount of the current Cart +// * +// * @return CouponAdapterInterface +// */ +// protected function generateValidCouponBaseAdapterMock($cartTotalPrice = 421.23) +// { +// /** @var CouponAdapterInterface $stubTheliaAdapter */ +// $stubTheliaAdapter = $this->getMock( +// 'Thelia\Coupon\CouponBaseAdapter', +// array('getCartTotalPrice'), +// array() +// ); +// $stubTheliaAdapter->expects($this->any()) +// ->method('getCartTotalPrice') +// ->will($this->returnValue($cartTotalPrice)); +// +// return $stubTheliaAdapter; +// } - return $stubTheliaAdapter; - } +// /** +// * Check if validity test on BackOffice inputs are working +// * +// * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkBackOfficeInput +// * +// */ +// public function testValidBackOfficeInput() +// { +// $adapter = new CouponBaseAdapter(); +// +// $validators = array( +// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( +// Operators::SUPERIOR, +// new PriceParam( +// $adapter, 421.23, 'EUR' +// ) +// ) +// ); +// $rule = new AvailableForTotalAmount($adapter, $validators); +// +// $expected = true; +// $actual = $rule->checkBackOfficeInput(); +// $this->assertEquals($expected, $actual); +// } - /** - * Check if validity test on BackOffice inputs are working - * - * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkBackOfficeInput - * - */ - public function testValidBackOfficeInput() - { - $adapter = new CouponBaseAdapter(); +// /** +// * Check if validity test on BackOffice inputs are working +// * +// * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkBackOfficeInput +// * @expectedException \Thelia\Exception\InvalidRuleOperatorException +// * +// */ +// public function testInValidBackOfficeInputOperator() +// { +// $adapter = new CouponBaseAdapter(); +// +// $validators = array( +// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( +// 'X', +// new PriceParam( +// $adapter, 421.23, 'EUR' +// ) +// ) +// ); +// +// $rule = new AvailableForTotalAmount($adapter, $validators); +// +// $expected = false; +// $actual = $rule->checkBackOfficeInput(); +// $this->assertEquals($expected, $actual); +// } - $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::SUPERIOR, - new PriceParam( - $adapter, 421.23, 'EUR' - ) - ) - ); - $rule = new AvailableForTotalAmount($adapter, $validators); +// /** +// * Check if validity test on BackOffice inputs are working +// * +// * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkBackOfficeInput +// * @expectedException \ErrorException +// * +// */ +// public function testInValidBackOfficeInputValue() +// { +// $adapter = $this->generateValidCouponBaseAdapterMock(); +// +// $validators = array( +// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( +// Operators::SUPERIOR, +// 421 +// ) +// ); +// +// $rule = new AvailableForTotalAmount($adapter, $validators); +// +// $expected = false; +// $actual = $rule->checkBackOfficeInput(); +// $this->assertEquals($expected, $actual); +// } - $expected = true; - $actual = $rule->checkBackOfficeInput(); - $this->assertEquals($expected, $actual); - } - - /** - * Check if validity test on BackOffice inputs are working - * - * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkBackOfficeInput - * @expectedException \Thelia\Exception\InvalidRuleOperatorException - * - */ - public function testInValidBackOfficeInputOperator() - { - $adapter = new CouponBaseAdapter(); - - $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - 'X', - new PriceParam( - $adapter, 421.23, 'EUR' - ) - ) - ); - - $rule = new AvailableForTotalAmount($adapter, $validators); - - $expected = false; - $actual = $rule->checkBackOfficeInput(); - $this->assertEquals($expected, $actual); - } - - /** - * Check if validity test on BackOffice inputs are working - * - * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkBackOfficeInput - * @expectedException \ErrorException - * - */ - public function testInValidBackOfficeInputValue() - { - $adapter = $this->generateValidCouponBaseAdapterMock(); - - $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::SUPERIOR, - 421 - ) - ); - - $rule = new AvailableForTotalAmount($adapter, $validators); - - $expected = false; - $actual = $rule->checkBackOfficeInput(); - $this->assertEquals($expected, $actual); - } - - - - /** - * Check if validity test on FrontOffice inputs are working - * - * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkCheckoutInput - * - */ - public function testValidCheckoutInput() - { - $adapter = $this->stubTheliaAdapter; - - $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::SUPERIOR, - new PriceParam( - $adapter, 421.23, 'EUR' - ) - ) - ); - - $rule = new AvailableForTotalAmount($adapter, $validators); - - $expected = true; - $actual = $rule->checkCheckoutInput(); - $this->assertEquals($expected, $actual); - } - - /** - * Check if validity test on FrontOffice inputs are working - * - * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkCheckoutInput - * @expectedException \Thelia\Exception\InvalidRuleValueException - * - */ - public function testInValidCheckoutInputValue() - { - $adapter = $this->generateValidCouponBaseAdapterMock(421); - - $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::SUPERIOR, - new PriceParam( - $adapter, 421.23, 'EUR' - ) - ) - ); - - $rule = new AvailableForTotalAmount($adapter, $validators); - - $expected = false; - $actual = $rule->checkCheckoutInput(); - $this->assertEquals($expected, $actual); - } - - /** - * Check if validity test on FrontOffice inputs are working - * - * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkCheckoutInput - * @expectedException \Thelia\Exception\InvalidRuleValueException - * - */ - public function testInValidCheckoutInputType() - { - $adapter = $this->generateValidCouponBaseAdapterMock(421); - - $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::SUPERIOR, - new PriceParam( - $adapter, 421.23, 'EUR' - ) - ) - ); - - $rule = new AvailableForTotalAmount($adapter, $validators); - - $expected = false; - $actual = $rule->checkCheckoutInput(); - $this->assertEquals($expected, $actual); - } /** * Check if test inferior operator is working * - * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::isMatching + * @covers Thelia\Constraint\Rule\AvailableForTotalAmountManager::isMatching * */ public function testMatchingRuleInferior() { - $adapter = $this->generateValidCouponBaseAdapterMock(421.22); + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); - $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::INFERIOR, - new PriceParam( - $adapter, 421.23, 'EUR' - ) - ) + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(399)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::INFERIOR, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); - $rule = new AvailableForTotalAmount($adapter, $validators); + $isValid = $rule1->isMatching(); $expected = true; - $actual = $rule->isMatching(); + $actual =$isValid; $this->assertEquals($expected, $actual); } /** * Check if test inferior operator is working * - * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::isMatching + * @covers Thelia\Constraint\Rule\AvailableForTotalAmountManager::isMatching * */ public function testNotMatchingRuleInferior() { - $adapter = $this->generateValidCouponBaseAdapterMock(421.23); + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); - $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::INFERIOR, - new PriceParam( - $adapter, 421.23, 'EUR' - ) - ) + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(400)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::INFERIOR, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); - $rule = new AvailableForTotalAmount($adapter, $validators); + $isValid = $rule1->isMatching(); $expected = false; - $actual = $rule->isMatching(); + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test inferior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForTotalAmountManager::isMatching + * + */ + public function testMatchingRuleInferiorEquals() + { + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(400)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::INFERIOR_OR_EQUAL, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL + ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test inferior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForTotalAmountManager::isMatching + * + */ + public function testMatchingRuleInferiorEquals2() + { + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(399)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::INFERIOR_OR_EQUAL, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL + ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test inferior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForTotalAmountManager::isMatching + * + */ + public function testNotMatchingRuleInferiorEquals() + { + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(401)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::INFERIOR_OR_EQUAL, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL + ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = false; + $actual =$isValid; $this->assertEquals($expected, $actual); } /** * Check if test equals operator is working * - * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::isMatching + * @covers Thelia\Constraint\Rule\AvailableForTotalAmountManager::isMatching * */ public function testMatchingRuleEqual() { - $adapter = $this->stubTheliaAdapter; + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); - $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::EQUAL, - new PriceParam( - $adapter, 421.23, 'EUR' - ) - ) + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(400)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::EQUAL, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); - $rule = new AvailableForTotalAmount($adapter, $validators); + $isValid = $rule1->isMatching(); $expected = true; - $actual = $rule->isMatching(); + $actual =$isValid; $this->assertEquals($expected, $actual); } /** * Check if test equals operator is working * - * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::isMatching + * @covers Thelia\Constraint\Rule\AvailableForTotalAmountManager::isMatching * */ public function testNotMatchingRuleEqual() { - $adapter = $this->generateValidCouponBaseAdapterMock(421.22); + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); - $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::EQUAL, - new PriceParam( - $adapter, 421.23, 'EUR' - ) - ) + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(399)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::EQUAL, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); - $rule = new AvailableForTotalAmount($adapter, $validators); + $isValid = $rule1->isMatching(); $expected = false; - $actual = $rule->isMatching(); + $actual =$isValid; $this->assertEquals($expected, $actual); } /** * Check if test superior operator is working * - * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::isMatching + * @covers Thelia\Constraint\Rule\AvailableForTotalAmountManager::isMatching + * + */ + public function testMatchingRuleSuperiorEquals() + { + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(401)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::SUPERIOR_OR_EQUAL, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL + ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test superior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForTotalAmountManager::isMatching + * + */ + public function testMatchingRuleSuperiorEquals2() + { + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(400)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::SUPERIOR_OR_EQUAL, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL + ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test superior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForTotalAmountManager::isMatching + * + */ + public function testNotMatchingRuleSuperiorEquals() + { + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(399.00)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::SUPERIOR_OR_EQUAL, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL + ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = false; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + + /** + * Check if test superior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForTotalAmountManager::isMatching * */ public function testMatchingRuleSuperior() { - $adapter = $this->generateValidCouponBaseAdapterMock(421.24); + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); - $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::SUPERIOR, - new PriceParam( - $adapter, 421.23, 'EUR' - ) - ) + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(401)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::SUPERIOR, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); - $rule = new AvailableForTotalAmount($adapter, $validators); + $isValid = $rule1->isMatching(); $expected = true; - $actual = $rule->isMatching(); + $actual =$isValid; $this->assertEquals($expected, $actual); } /** * Check if test superior operator is working * - * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::isMatching + * @covers Thelia\Constraint\Rule\AvailableForTotalAmountManager::isMatching * */ public function testNotMatchingRuleSuperior() { - $adapter = $this->generateValidCouponBaseAdapterMock(421.23); + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); - $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::SUPERIOR, - new PriceParam( - $adapter, 421.23, 'EUR' - ) - ) + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(399.00)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::SUPERIOR, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); - $rule = new AvailableForTotalAmount($adapter, $validators); + $isValid = $rule1->isMatching(); $expected = false; - $actual = $rule->isMatching(); + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + + /** + * Check currency is checked + * + * @covers Thelia\Constraint\Rule\AvailableForTotalAmountManager::isMatching + * + */ + public function testMatchingRuleCurrency() + { + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(400.00)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::EQUAL, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL + ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check currency is checked + * + * @covers Thelia\Constraint\Rule\AvailableForTotalAmountManager::isMatching + * + */ + public function testNotMatchingRuleCurrency() + { + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(400.00)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::EQUAL, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL + ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'USD'); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = false; + $actual =$isValid; $this->assertEquals($expected, $actual); } diff --git a/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php index a40591d13..d7b7523aa 100644 --- a/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php +++ b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php @@ -23,11 +23,8 @@ namespace Thelia\Coupon; -use Thelia\Constraint\Rule\AvailableForXArticles; +use Thelia\Constraint\Rule\AvailableForXArticlesManager; use Thelia\Constraint\Rule\Operators; -use Thelia\Constraint\Validator\QuantityParam; -use Thelia\Constraint\Validator\RuleValidator; -use Thelia\Exception\InvalidRuleOperatorException; /** * Created by JetBrains PhpStorm. @@ -43,8 +40,8 @@ use Thelia\Exception\InvalidRuleOperatorException; class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase { - /** @var CouponAdapterInterface $stubTheliaAdapter */ - protected $stubTheliaAdapter = null; +// /** @var CouponAdapterInterface $stubTheliaAdapter */ +// protected $stubTheliaAdapter = null; /** * Sets up the fixture, for example, opens a network connection. @@ -52,54 +49,54 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - /** @var CouponAdapterInterface $stubTheliaAdapter */ - $this->stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); +// /** @var CouponAdapterInterface $stubTheliaAdapter */ +// $this->stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); } - /** - * Generate valid CouponBaseAdapter - * - * @param int $nbArticlesInCart Total articles in the current Cart - * - * @return CouponAdapterInterface - */ - protected function generateValidCouponBaseAdapterMock($nbArticlesInCart = 4) - { - /** @var CouponAdapterInterface $stubTheliaAdapter */ - $stubTheliaAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') - ->disableOriginalConstructor() - ->setMethods(array('getNbArticlesInCart')) - ->getMock(); - $stubTheliaAdapter->expects($this->any()) - ->method('getNbArticlesInCart') - ->will($this->returnValue($nbArticlesInCart)); +// /** +// * Generate valid CouponBaseAdapter +// * +// * @param int $nbArticlesInCart Total articles in the current Cart +// * +// * @return CouponAdapterInterface +// */ +// protected function generateValidCouponBaseAdapterMock($nbArticlesInCart = 4) +// { +// /** @var CouponAdapterInterface $stubTheliaAdapter */ +// $stubTheliaAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') +// ->disableOriginalConstructor() +// ->setMethods(array('getNbArticlesInCart')) +// ->getMock(); +// $stubTheliaAdapter->expects($this->any()) +// ->method('getNbArticlesInCart') +// ->will($this->returnValue($nbArticlesInCart)); +// +// return $stubTheliaAdapter; +// } - return $stubTheliaAdapter; - } - - /** - * Check if validity test on BackOffice inputs are working - * - * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkBackOfficeInput - * - */ - public function testValidBackOfficeInput() - { - $translator = $this->getMockBuilder('\Thelia\Core\Translation\Translator') - ->disableOriginalConstructor() - ->getMock(); - - $rule = new AvailableForXArticles($translator); - $operators = array(AvailableForXArticles::PARAM1_QUANTITY => Operators::SUPERIOR); - $values = array( - AvailableForXArticles::PARAM1_QUANTITY => 4 - ); - $rule->populateFromForm($operators, $values); - - $expected = true; - $actual = $rule->checkBackOfficeInput(); - $this->assertEquals($expected, $actual); - } +// /** +// * Check if validity test on BackOffice inputs are working +// * +// * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkBackOfficeInput +// * +// */ +// public function testValidBackOfficeInput() +// { +// $translator = $this->getMockBuilder('\Thelia\Core\Translation\Translator') +// ->disableOriginalConstructor() +// ->getMock(); +// +// $rule = new AvailableForXArticles($translator); +// $operators = array(AvailableForXArticles::PARAM1_QUANTITY => Operators::SUPERIOR); +// $values = array( +// AvailableForXArticles::PARAM1_QUANTITY => 4 +// ); +// $rule->populateFromForm($operators, $values); +// +// $expected = true; +// $actual = $rule->checkBackOfficeInput(); +// $this->assertEquals($expected, $actual); +// } // /** // * Check if validity test on BackOffice inputs are working @@ -126,7 +123,7 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase // $actual = $rule->checkBackOfficeInput(); // $this->assertEquals($expected, $actual); // } -// + // /** // * Check if validity test on BackOffice inputs are working // * @@ -152,7 +149,7 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase // $actual = $rule->checkBackOfficeInput(); // $this->assertEquals($expected, $actual); // } -// + // /** // * Check if validity test on BackOffice inputs are working // * @@ -178,212 +175,395 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase // $actual = $rule->checkBackOfficeInput(); // $this->assertEquals($expected, $actual); // } -// -// -// -// -// -// /** -// * Check if validity test on FrontOffice inputs are working -// * -// * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkCheckoutInput -// */ -// public function testValidCheckoutInput() -// { -// $adapter = $this->stubTheliaAdapter; -// $validators = array( -// AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( -// Operators::SUPERIOR, -// new QuantityParam( -// $adapter, -// 4 -// ) -// ) -// ); -// $rule = new AvailableForXArticles($adapter, $validators); -// -// $expected = true; -// $actual = $rule->checkCheckoutInput(); -// $this->assertEquals($expected, $actual); -// } -// -// /** -// * Check if validity test on FrontOffice inputs are working -// * -// * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkCheckoutInput -// * @expectedException \Thelia\Exception\InvalidRuleValueException -// */ -// public function testInValidCheckoutInputFloat() -// { -// $adapter = $this->generateValidCouponBaseAdapterMock(4.5); -// $validators = array( -// AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( -// Operators::SUPERIOR, -// new QuantityParam( -// $adapter, -// 4 -// ) -// ) -// ); -// $rule = new AvailableForXArticles($adapter, $validators); -// -// $expected = false; -// $actual = $rule->checkCheckoutInput(); -// $this->assertEquals($expected, $actual); -// } -// -// /** -// * Check if validity test on FrontOffice inputs are working -// * -// * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkCheckoutInput -// * @expectedException \Thelia\Exception\InvalidRuleValueException -// */ -// public function testInValidCheckoutInputNegative() -// { -// $adapter = $this->generateValidCouponBaseAdapterMock(-1); -// -// $validators = array( -// AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( -// Operators::SUPERIOR, -// new QuantityParam( -// $adapter, -// 4 -// ) -// ) -// ); -// $rule = new AvailableForXArticles($adapter, $validators); -// -// $expected = false; -// $actual = $rule->checkCheckoutInput(); -// $this->assertEquals($expected, $actual); -// } -// -// /** -// * Check if validity test on FrontOffice inputs are working -// * -// * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkCheckoutInput -// * @expectedException \Thelia\Exception\InvalidRuleValueException -// */ -// public function testInValidCheckoutInputString() -// { -// $adapter = $this->generateValidCouponBaseAdapterMock('bad'); -// -// $validators = array( -// AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( -// Operators::SUPERIOR, -// new QuantityParam( -// $adapter, -// 4 -// ) -// ) -// ); -// $rule = new AvailableForXArticles($adapter, $validators); -// -// $expected = false; -// $actual = $rule->checkCheckoutInput(); -// $this->assertEquals($expected, $actual); -// } -// -// /** -// * Check if test inferior operator is working -// * -// * @covers Thelia\Coupon\Rule\AvailableForXArticles::isMatching -// * -// */ -// public function testMatchingRuleInferior() -// { -// $adapter = $this->stubTheliaAdapter; -// $validators = array( -// AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( -// Operators::INFERIOR, -// new QuantityParam( -// $adapter, -// 5 -// ) -// ) -// ); -// $rule = new AvailableForXArticles($adapter, $validators); -// -// $expected = true; -// $actual = $rule->isMatching(); -// $this->assertEquals($expected, $actual); -// } -// -// /** -// * Check if test equals operator is working -// * -// * @covers Thelia\Coupon\Rule\AvailableForXArticles::isMatching -// * -// */ -// public function testMatchingRuleEqual() -// { -// $adapter = $this->stubTheliaAdapter; -// $validators = array( -// AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( -// Operators::EQUAL, -// new QuantityParam( -// $adapter, -// 4 -// ) -// ) -// ); -// $rule = new AvailableForXArticles($adapter, $validators); -// -// $expected = true; -// $actual = $rule->isMatching(); -// $this->assertEquals($expected, $actual); -// } -// -// /** -// * Check if test superior operator is working -// * -// * @covers Thelia\Coupon\Rule\AvailableForXArticles::isMatching -// * -// */ -// public function testMatchingRuleSuperior() -// { -// $adapter = $this->stubTheliaAdapter; -// $validators = array( -// AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( -// Operators::SUPERIOR, -// new QuantityParam( -// $adapter, -// 3 -// ) -// ) -// ); -// $rule = new AvailableForXArticles($adapter, $validators); -// -// $expected = true; -// $actual = $rule->isMatching(); -// $this->assertEquals($expected, $actual); -// } -// -// /** -// * Check if test unavailable operator is working -// * -// * @covers Thelia\Coupon\Rule\AvailableForXArticles::isMatching -// * @expectedException \Thelia\Exception\InvalidRuleOperatorException -// * -// */ -// public function testNotMatchingRule() -// { -// $adapter = $this->stubTheliaAdapter; -// $validators = array( -// AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( -// Operators::DIFFERENT, -// new QuantityParam( -// $adapter, -// 3 -// ) -// ) -// ); -// $rule = new AvailableForXArticles($adapter, $validators); -// -// $expected = false; -// $actual = $rule->isMatching(); -// $this->assertEquals($expected, $actual); -// } + + + + + + /** + * Check if test inferior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForXArticlesManager::isMatching + * + */ + public function testMatchingRuleInferior() + { + $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::INFERIOR + ); + $values = array( + AvailableForXArticlesManager::INPUT1 => 5 + ); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test inferior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForXArticlesManager::isMatching + * + */ + public function testNotMatchingRuleInferior() + { + $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::INFERIOR + ); + $values = array( + AvailableForXArticlesManager::INPUT1 => 4, + ); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = false; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test inferior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForXArticlesManager::isMatching + * + */ + public function testMatchingRuleInferiorEquals() + { + $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::INFERIOR_OR_EQUAL, + ); + $values = array( + AvailableForXArticlesManager::INPUT1 => 5, + ); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test inferior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForXArticlesManager::isMatching + * + */ + public function testMatchingRuleInferiorEquals2() + { + $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::INFERIOR_OR_EQUAL + ); + $values = array( + AvailableForXArticlesManager::INPUT1 => 4 + ); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test inferior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForXArticlesManager::isMatching + * + */ + public function testNotMatchingRuleInferiorEquals() + { + $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::INFERIOR_OR_EQUAL + ); + $values = array( + AvailableForXArticlesManager::INPUT1 => 3 + ); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = false; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test equals operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForXArticlesManager::isMatching + * + */ + public function testMatchingRuleEqual() + { + $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::EQUAL + ); + $values = array( + AvailableForXArticlesManager::INPUT1 => 4 + ); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test equals operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForXArticlesManager::isMatching + * + */ + public function testNotMatchingRuleEqual() + { + $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::EQUAL + ); + $values = array( + AvailableForXArticlesManager::INPUT1 => 5 + ); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = false; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test superior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForXArticlesManager::isMatching + * + */ + public function testMatchingRuleSuperiorEquals() + { + $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_OR_EQUAL + ); + $values = array( + AvailableForXArticlesManager::INPUT1 => 4 + ); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test superior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForXArticlesManager::isMatching + * + */ + public function testMatchingRuleSuperiorEquals2() + { + $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_OR_EQUAL + ); + $values = array( + AvailableForXArticlesManager::INPUT1 => 3 + ); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test superior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForXArticlesManager::isMatching + * + */ + public function testNotMatchingRuleSuperiorEquals() + { + $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_OR_EQUAL + ); + $values = array( + AvailableForXArticlesManager::INPUT1 => 5 + ); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = false; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + + /** + * Check if test superior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForXArticlesManager::isMatching + * + */ + public function testMatchingRuleSuperior() + { + $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 => 3 + ); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test superior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForXArticlesManager::isMatching + * + */ + public function testNotMatchingRuleSuperior() + { + $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); + + $isValid = $rule1->isMatching(); + + $expected = false; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } /** diff --git a/core/lib/Thelia/Tests/Constraint/Rule/OperatorsTest.php b/core/lib/Thelia/Tests/Constraint/Rule/OperatorsTest.php index aecd303b2..01d753201 100644 --- a/core/lib/Thelia/Tests/Constraint/Rule/OperatorsTest.php +++ b/core/lib/Thelia/Tests/Constraint/Rule/OperatorsTest.php @@ -48,365 +48,365 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase { } - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorInferiorValidBefore() - { - $adapter = new CouponBaseAdapter(); - // Given - $a = 11; - $operator = Operators::INFERIOR; - $b = new QuantityParam($adapter, 12); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertTrue($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorInferiorInvalidEquals() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 12; - $operator = Operators::INFERIOR; - $b = new QuantityParam($adapter, 12); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertFalse($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorInferiorInvalidAfter() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 13; - $operator = Operators::INFERIOR; - $b = new QuantityParam($adapter, 12); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertFalse($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorInferiorOrEqualValidEqual() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 11; - $operator = Operators::INFERIOR_OR_EQUAL; - $b = new QuantityParam($adapter, 11); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertTrue($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorInferiorOrEqualValidBefore() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 10; - $operator = Operators::INFERIOR_OR_EQUAL; - $b = new QuantityParam($adapter, 11); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertTrue($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorInferiorOrEqualInValidAfter() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 12; - $operator = Operators::INFERIOR_OR_EQUAL; - $b = new QuantityParam($adapter, 11); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertFalse($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorEqualValidEqual() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 12; - $operator = Operators::EQUAL; - $b = new QuantityParam($adapter, 12); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertTrue($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorEqualInValidBefore() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 11; - $operator = Operators::EQUAL; - $b = new QuantityParam($adapter, 12); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertFalse($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorEqualInValidAfter() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 13; - $operator = Operators::EQUAL; - $b = new QuantityParam($adapter, 12); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertFalse($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorSuperiorOrEqualValidEqual() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 13; - $operator = Operators::SUPERIOR_OR_EQUAL; - $b = new QuantityParam($adapter, 13); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertTrue($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorSuperiorOrEqualAfter() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 14; - $operator = Operators::SUPERIOR_OR_EQUAL; - $b = new QuantityParam($adapter, 13); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertTrue($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorSuperiorOrEqualInvalidBefore() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 12; - $operator = Operators::SUPERIOR_OR_EQUAL; - $b = new QuantityParam($adapter, 13); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertFalse($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorSuperiorValidAfter() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 13; - $operator = Operators::SUPERIOR; - $b = new QuantityParam($adapter, 12); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertTrue($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorSuperiorInvalidEqual() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 12; - $operator = Operators::SUPERIOR; - $b = new QuantityParam($adapter, 12); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertFalse($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorSuperiorInvalidBefore() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 11; - $operator = Operators::SUPERIOR; - $b = new QuantityParam($adapter, 12); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertFalse($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorDifferentValid() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 12; - $operator = Operators::DIFFERENT; - $b = new QuantityParam($adapter, 11); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertTrue($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorDifferentInvalidEquals() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 11; - $operator = Operators::DIFFERENT; - $b = new QuantityParam($adapter, 11); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertFalse($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorInValid() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 12; - $operator = 'X'; - $b = new QuantityParam($adapter, 11); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertFalse($actual); - } +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorInferiorValidBefore() +// { +// $adapter = new CouponBaseAdapter(); +// // Given +// $a = 11; +// $operator = Operators::INFERIOR; +// $b = new QuantityParam($adapter, 12); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertTrue($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorInferiorInvalidEquals() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 12; +// $operator = Operators::INFERIOR; +// $b = new QuantityParam($adapter, 12); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertFalse($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorInferiorInvalidAfter() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 13; +// $operator = Operators::INFERIOR; +// $b = new QuantityParam($adapter, 12); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertFalse($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorInferiorOrEqualValidEqual() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 11; +// $operator = Operators::INFERIOR_OR_EQUAL; +// $b = new QuantityParam($adapter, 11); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertTrue($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorInferiorOrEqualValidBefore() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 10; +// $operator = Operators::INFERIOR_OR_EQUAL; +// $b = new QuantityParam($adapter, 11); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertTrue($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorInferiorOrEqualInValidAfter() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 12; +// $operator = Operators::INFERIOR_OR_EQUAL; +// $b = new QuantityParam($adapter, 11); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertFalse($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorEqualValidEqual() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 12; +// $operator = Operators::EQUAL; +// $b = new QuantityParam($adapter, 12); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertTrue($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorEqualInValidBefore() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 11; +// $operator = Operators::EQUAL; +// $b = new QuantityParam($adapter, 12); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertFalse($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorEqualInValidAfter() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 13; +// $operator = Operators::EQUAL; +// $b = new QuantityParam($adapter, 12); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertFalse($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorSuperiorOrEqualValidEqual() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 13; +// $operator = Operators::SUPERIOR_OR_EQUAL; +// $b = new QuantityParam($adapter, 13); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertTrue($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorSuperiorOrEqualAfter() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 14; +// $operator = Operators::SUPERIOR_OR_EQUAL; +// $b = new QuantityParam($adapter, 13); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertTrue($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorSuperiorOrEqualInvalidBefore() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 12; +// $operator = Operators::SUPERIOR_OR_EQUAL; +// $b = new QuantityParam($adapter, 13); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertFalse($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorSuperiorValidAfter() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 13; +// $operator = Operators::SUPERIOR; +// $b = new QuantityParam($adapter, 12); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertTrue($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorSuperiorInvalidEqual() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 12; +// $operator = Operators::SUPERIOR; +// $b = new QuantityParam($adapter, 12); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertFalse($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorSuperiorInvalidBefore() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 11; +// $operator = Operators::SUPERIOR; +// $b = new QuantityParam($adapter, 12); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertFalse($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorDifferentValid() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 12; +// $operator = Operators::DIFFERENT; +// $b = new QuantityParam($adapter, 11); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertTrue($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorDifferentInvalidEquals() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 11; +// $operator = Operators::DIFFERENT; +// $b = new QuantityParam($adapter, 11); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertFalse($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorInValid() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 12; +// $operator = 'X'; +// $b = new QuantityParam($adapter, 11); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertFalse($actual); +// } From 447488f06337286e1d15142bbc9b0fe44b39209f Mon Sep 17 00:00:00 2001 From: gmorel Date: Sun, 8 Sep 2013 18:00:31 +0200 Subject: [PATCH 003/212] WIP - Refactor Coupon : is Customer matching Coupon rules (increase code coverage) --- .../Rule/AvailableForTotalAmountManager.php | 134 +++++++-------- .../Rule/AvailableForXArticlesManager.php | 158 ++++++++---------- .../Constraint/Rule/CouponRuleAbstract.php | 72 +++++--- .../Constraint/Rule/CouponRuleInterface.php | 14 +- .../Rule/AvailableForXArticlesTest.php | 96 +++++++++++ 5 files changed, 277 insertions(+), 197 deletions(-) diff --git a/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmountManager.php b/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmountManager.php index 98663fd4a..3fe051a20 100644 --- a/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmountManager.php +++ b/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmountManager.php @@ -74,36 +74,36 @@ class AvailableForTotalAmountManager extends CouponRuleAbstract // /** @var RuleValidator Price Validator */ // protected $priceValidator = null; - /** - * Check if backoffice inputs are relevant or not - * - * @throws InvalidRuleOperatorException if Operator is not allowed - * @throws InvalidRuleValueException if Value is not allowed - * @return bool - */ - public function checkBackOfficeInput() - { - if (!isset($this->validators) - || empty($this->validators) - ||!isset($this->validators[self::PARAM1_PRICE]) - ||!isset($this->validators[self::PARAM1_PRICE]) - ) { - throw new InvalidRuleValueException(get_class(), self::PARAM1_PRICE); - } - - /** @var RuleValidator $ruleValidator */ - $ruleValidator = $this->validators[self::PARAM1_PRICE]; - /** @var PriceParam $price */ - $price = $ruleValidator->getParam(); - - if (!$price instanceof PriceParam) { - throw new InvalidRuleValueException(get_class(), self::PARAM1_PRICE); - } - - $this->checkBackOfficeInputsOperators(); - - return $this->isPriceValid($price->getPrice(), $price->getCurrency()); - } +// /** +// * Check if backoffice inputs are relevant or not +// * +// * @throws InvalidRuleOperatorException if Operator is not allowed +// * @throws InvalidRuleValueException if Value is not allowed +// * @return bool +// */ +// public function checkBackOfficeInput() +// { +// if (!isset($this->validators) +// || empty($this->validators) +// ||!isset($this->validators[self::PARAM1_PRICE]) +// ||!isset($this->validators[self::PARAM1_PRICE]) +// ) { +// throw new InvalidRuleValueException(get_class(), self::PARAM1_PRICE); +// } +// +// /** @var RuleValidator $ruleValidator */ +// $ruleValidator = $this->validators[self::PARAM1_PRICE]; +// /** @var PriceParam $price */ +// $price = $ruleValidator->getParam(); +// +// if (!$price instanceof PriceParam) { +// throw new InvalidRuleValueException(get_class(), self::PARAM1_PRICE); +// } +// +// $this->checkBackOfficeInputsOperators(); +// +// return $this->isPriceValid($price->getPrice(), $price->getCurrency()); +// } // /** // * Check if Checkout inputs are relevant or not @@ -247,33 +247,33 @@ class AvailableForTotalAmountManager extends CouponRuleAbstract return false; } - /** - * Check if a price is valid - * - * @param float $price Price to check - * @param string $currency Price currency - * - * @throws InvalidRuleValueException if Value is not allowed - * @return bool - */ - protected function isPriceValid($price, $currency) - { - $priceValidator = $this->priceValidator; - - /** @var PriceParam $param */ - $param = $priceValidator->getParam(); - if ($currency == $param->getCurrency()) { - try { - $priceValidator->getParam()->compareTo($price); - } catch(\InvalidArgumentException $e) { - throw new InvalidRuleValueException(get_class(), self::PARAM1_PRICE); - } - } else { - throw new InvalidRuleValueException(get_class(), self::PARAM1_CURRENCY); - } - - return true; - } +// /** +// * Check if a price is valid +// * +// * @param float $price Price to check +// * @param string $currency Price currency +// * +// * @throws InvalidRuleValueException if Value is not allowed +// * @return bool +// */ +// protected function isPriceValid($price, $currency) +// { +// $priceValidator = $this->priceValidator; +// +// /** @var PriceParam $param */ +// $param = $priceValidator->getParam(); +// if ($currency == $param->getCurrency()) { +// try { +// $priceValidator->getParam()->compareTo($price); +// } catch(\InvalidArgumentException $e) { +// throw new InvalidRuleValueException(get_class(), self::PARAM1_PRICE); +// } +// } else { +// throw new InvalidRuleValueException(get_class(), self::PARAM1_CURRENCY); +// } +// +// return true; +// } // /** // * Generate current Rule param to be validated from adapter @@ -312,15 +312,15 @@ class AvailableForTotalAmountManager extends CouponRuleAbstract public function getToolTip() { $i18nOperator = Operators::getI18n( - $this->translator, $this->priceValidator->getOperator() + $this->translator, $this->operators[self::INPUT1] ); $toolTip = $this->translator->trans( 'If cart total amount is %operator% %amount% %currency%', array( '%operator%' => $i18nOperator, - '%amount%' => $this->priceValidator->getParam()->getPrice(), - '%currency%' => $this->priceValidator->getParam()->getCurrency() + '%amount%' => $this->values[self::INPUT1], + '%currency%' => $this->values[self::INPUT2] ), 'constraint' ); @@ -361,21 +361,7 @@ class AvailableForTotalAmountManager extends CouponRuleAbstract // return $this; // } - /** - * Return a serializable Rule - * - * @return SerializableRule - */ - public function getSerializableRule() - { - $serializableRule = new SerializableRule(); - $serializableRule->ruleServiceId = $this->serviceId; - $serializableRule->operators = $this->operators; - $serializableRule->values = $this->values; - - return $serializableRule; - } diff --git a/core/lib/Thelia/Constraint/Rule/AvailableForXArticlesManager.php b/core/lib/Thelia/Constraint/Rule/AvailableForXArticlesManager.php index f56596bc2..d726447eb 100644 --- a/core/lib/Thelia/Constraint/Rule/AvailableForXArticlesManager.php +++ b/core/lib/Thelia/Constraint/Rule/AvailableForXArticlesManager.php @@ -63,56 +63,56 @@ class AvailableForXArticlesManager extends CouponRuleAbstract ) ); - /** @var QuantityParam Quantity Validator */ - protected $quantityValidator = null; +// /** @var QuantityParam Quantity Validator */ +// protected $quantityValidator = null; - /** - * Check if backoffice inputs are relevant or not - * - * @throws InvalidRuleOperatorException if Operator is not allowed - * @throws InvalidRuleValueException if Value is not allowed - * @return bool - */ - public function checkBackOfficeInput() - { - if (!isset($this->validators) - || empty($this->validators) - ||!isset($this->validators[self::PARAM1_QUANTITY]) - ||!isset($this->validators[self::PARAM1_QUANTITY]) - ) { - throw new InvalidRuleValueException(get_class(), self::PARAM1_QUANTITY); - } +// /** +// * Check if backoffice inputs are relevant or not +// * +// * @throws InvalidRuleOperatorException if Operator is not allowed +// * @throws InvalidRuleValueException if Value is not allowed +// * @return bool +// */ +// public function checkBackOfficeInput() +// { +// if (!isset($this->validators) +// || empty($this->validators) +// ||!isset($this->validators[self::PARAM1_QUANTITY]) +// ||!isset($this->validators[self::PARAM1_QUANTITY]) +// ) { +// throw new InvalidRuleValueException(get_class(), self::PARAM1_QUANTITY); +// } +// +// /** @var RuleValidator $ruleValidator */ +// $ruleValidator = $this->validators[self::PARAM1_QUANTITY]; +// /** @var QuantityParam $quantity */ +// $quantity = $ruleValidator->getParam(); +// +// if (!$quantity instanceof QuantityParam) { +// throw new InvalidRuleValueException(get_class(), self::PARAM1_QUANTITY); +// } +// +// $this->checkBackOfficeInputsOperators(); +// +// return $this->isQuantityValid($quantity->getInteger()); +// } - /** @var RuleValidator $ruleValidator */ - $ruleValidator = $this->validators[self::PARAM1_QUANTITY]; - /** @var QuantityParam $quantity */ - $quantity = $ruleValidator->getParam(); - - if (!$quantity instanceof QuantityParam) { - throw new InvalidRuleValueException(get_class(), self::PARAM1_QUANTITY); - } - - $this->checkBackOfficeInputsOperators(); - - return $this->isQuantityValid($quantity->getInteger()); - } - - /** - * Generate current Rule param to be validated from adapter - * - * @param CouponAdapterInterface $adapter allowing to gather - * all necessary Thelia variables - * - * @return $this - */ - protected function setParametersToValidate() - { - $this->paramsToValidate = array( - self::PARAM1_QUANTITY => $this->adapter->getNbArticlesInCart() - ); - - return $this; - } +// /** +// * Generate current Rule param to be validated from adapter +// * +// * @param CouponAdapterInterface $adapter allowing to gather +// * all necessary Thelia variables +// * +// * @return $this +// */ +// protected function setParametersToValidate() +// { +// $this->paramsToValidate = array( +// self::PARAM1_QUANTITY => $this->adapter->getNbArticlesInCart() +// ); +// +// return $this; +// } // /** // * Check if Checkout inputs are relevant or not @@ -210,25 +210,25 @@ class AvailableForXArticlesManager extends CouponRuleAbstract return false; } - /** - * Check if a quantity is valid - * - * @param int $quantity Quantity to check - * - * @throws InvalidRuleValueException if Value is not allowed - * @return bool - */ - protected function isQuantityValid($quantity) - { - $quantityValidator = $this->quantityValidator; - try { - $quantityValidator->getParam()->compareTo($quantity); - } catch(InvalidArgumentException $e) { - throw new InvalidRuleValueException(get_class(), self::PARAM1_QUANTITY); - } - - return true; - } +// /** +// * Check if a quantity is valid +// * +// * @param int $quantity Quantity to check +// * +// * @throws InvalidRuleValueException if Value is not allowed +// * @return bool +// */ +// protected function isQuantityValid($quantity) +// { +// $quantityValidator = $this->quantityValidator; +// try { +// $quantityValidator->getParam()->compareTo($quantity); +// } catch(InvalidArgumentException $e) { +// throw new InvalidRuleValueException(get_class(), self::PARAM1_QUANTITY); +// } +// +// return true; +// } /** * Get I18n name @@ -252,14 +252,14 @@ class AvailableForXArticlesManager extends CouponRuleAbstract public function getToolTip() { $i18nOperator = Operators::getI18n( - $this->translator, $this->priceValidator->getOperator() + $this->translator, $this->operators[self::INPUT1] ); $toolTip = $this->translator->trans( 'If cart products quantity is %operator% %quantity%', array( '%operator%' => $i18nOperator, - '%quantity%' => $this->quantityValidator->getParam()->getInteger(), + '%quantity%' => $this->values[self::INPUT1] ), 'constraint' ); @@ -297,24 +297,4 @@ class AvailableForXArticlesManager extends CouponRuleAbstract // return $this; // } - /** - * Return a serializable Rule - * - * @return SerializableRule - */ - public function getSerializableRule() - { - $serializableRule = new SerializableRule(); - $serializableRule->ruleServiceId = $this->serviceId; - $serializableRule->operators = array( - self::PARAM1_QUANTITY => $this->quantityValidator->getOperator() - ); - - $serializableRule->values = array( - self::PARAM1_QUANTITY => $this->quantityValidator->getInteger() - ); - - return $serializableRule; - } - } \ No newline at end of file diff --git a/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php b/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php index 1c781d97f..7465633bf 100644 --- a/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php +++ b/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php @@ -44,10 +44,10 @@ use Thelia\Exception\InvalidRuleOperatorException; */ abstract class CouponRuleAbstract implements CouponRuleInterface { - /** Operator key in $validators */ - CONST OPERATOR = 'operator'; - /** Value key in $validators */ - CONST VALUE = 'value'; +// /** Operator key in $validators */ +// CONST OPERATOR = 'operator'; +// /** Value key in $validators */ +// CONST VALUE = 'value'; /** @var string Service Id from Resources/config.xml */ protected $serviceId = null; @@ -58,8 +58,8 @@ abstract class CouponRuleAbstract implements CouponRuleInterface /** @var array Parameters validating parameters against */ protected $validators = array(); - /** @var array Parameters to be validated */ - protected $paramsToValidate = array(); +// /** @var array Parameters to be validated */ +// protected $paramsToValidate = array(); /** @var CouponAdapterInterface Provide necessary value from Thelia */ protected $adapter = null; @@ -150,25 +150,25 @@ abstract class CouponRuleAbstract implements CouponRuleInterface return $this->availableOperators; } - /** - * Check if Operators set for this Rule in the BackOffice are legit - * - * @throws InvalidRuleOperatorException if Operator is not allowed - * @return bool - */ - protected function checkBackOfficeInputsOperators() - { - /** @var RuleValidator $param */ - foreach ($this->validators as $key => $param) { - $operator = $param->getOperator(); - if (!isset($operator) - ||!in_array($operator, $this->availableOperators) - ) { - throw new InvalidRuleOperatorException(get_class(), $key); - } - } - return true; - } +// /** +// * Check if Operators set for this Rule in the BackOffice are legit +// * +// * @throws InvalidRuleOperatorException if Operator is not allowed +// * @return bool +// */ +// protected function checkBackOfficeInputsOperators() +// { +// /** @var RuleValidator $param */ +// foreach ($this->validators as $key => $param) { +// $operator = $param->getOperator(); +// if (!isset($operator) +// ||!in_array($operator, $this->availableOperators) +// ) { +// throw new InvalidRuleOperatorException(get_class(), $key); +// } +// } +// return true; +// } // /** // * Generate current Rule param to be validated from adapter @@ -183,13 +183,15 @@ abstract class CouponRuleAbstract implements CouponRuleInterface /** * Return all validators - * Serialization purpose * * @return array */ public function getValidators() { - return $this->validators; + return array( + $this->operators, + $this->values + ); } /** @@ -215,4 +217,20 @@ abstract class CouponRuleAbstract implements CouponRuleInterface return in_array($operator, $availableOperators); } + /** + * Return a serializable Rule + * + * @return SerializableRule + */ + public function getSerializableRule() + { + $serializableRule = new SerializableRule(); + $serializableRule->ruleServiceId = $this->serviceId; + $serializableRule->operators = $this->operators; + + $serializableRule->values = $this->values; + + return $serializableRule; + } + } \ No newline at end of file diff --git a/core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php b/core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php index 4c5575159..79a48aff9 100644 --- a/core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php +++ b/core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php @@ -53,12 +53,12 @@ interface CouponRuleInterface */ public function getServiceId(); - /** - * Check if backoffice inputs are relevant or not - * - * @return bool - */ - public function checkBackOfficeInput(); +// /** +// * Check if backoffice inputs are relevant or not +// * +// * @return bool +// */ +// public function checkBackOfficeInput(); // /** // * Check if Checkout inputs are relevant or not @@ -115,7 +115,7 @@ interface CouponRuleInterface public function getToolTip(); /** - * Get validators + * Return all validators * * @return array */ diff --git a/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php index d7b7523aa..3247e4b9a 100644 --- a/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php +++ b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php @@ -25,6 +25,7 @@ namespace Thelia\Coupon; use Thelia\Constraint\Rule\AvailableForXArticlesManager; use Thelia\Constraint\Rule\Operators; +use Thelia\Constraint\Rule\SerializableRule; /** * Created by JetBrains PhpStorm. @@ -565,6 +566,101 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase $this->assertEquals($expected, $actual); } + public function testGetSerializableRule() + { + $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); + + $serializableRule = $rule1->getSerializableRule(); + + $expected = new SerializableRule(); + $expected->ruleServiceId = $rule1->getServiceId(); + $expected->operators = $operators; + $expected->values = $values; + + $actual = $serializableRule; + + $this->assertEquals($expected, $actual); + + } + + public function testGetAvailableOperators() + { + $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( + AvailableForXArticlesManager::INPUT1 => array( + Operators::INFERIOR, + Operators::INFERIOR_OR_EQUAL, + Operators::EQUAL, + Operators::SUPERIOR_OR_EQUAL, + Operators::SUPERIOR + ) + ); + $actual = $rule1->getAvailableOperators(); + + $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); + + } + /** * Tears down the fixture, for example, closes a network connection. From b637ad79f438ffb8a3c6a0b045320971be2bfb33 Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Mon, 9 Sep 2013 08:05:43 +0200 Subject: [PATCH 004/212] fix phpdoc --- .../Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php index a65e15a8e..e9c91b7df 100755 --- a/core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php +++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php @@ -293,13 +293,11 @@ class TheliaLoop extends AbstractSmartyPlugin } /** + * @param $smartyParams * - * find the loop class with his name and construct an instance of this class - * - * @param string $name - * @return \Thelia\Core\Template\Element\BaseLoop - * @throws InvalidElementException - * @throws ElementNotFoundException + * @return object + * @throws \Thelia\Core\Template\Element\Exception\InvalidElementException + * @throws \Thelia\Core\Template\Element\Exception\ElementNotFoundException */ protected function createLoopInstance($smartyParams) { From f2a80e4b6a69fbbcec66d1599c628d4266916f5e Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Mon, 9 Sep 2013 09:02:50 +0200 Subject: [PATCH 005/212] clean some code --- core/lib/Thelia/Core/Thelia.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php index 64f8e9a61..e5148e408 100755 --- a/core/lib/Thelia/Core/Thelia.php +++ b/core/lib/Thelia/Core/Thelia.php @@ -76,7 +76,6 @@ class Thelia extends Kernel $definePropel = new DefinePropel(new DatabaseConfiguration(), Yaml::parse(THELIA_ROOT . '/local/config/database.yml')); - $propelConfig = $definePropel->getConfig(); $serviceContainer = Propel::getServiceContainer(); $serviceContainer->setAdapterClass('thelia', 'mysql'); $manager = new ConnectionManagerSingle(); @@ -84,7 +83,6 @@ class Thelia extends Kernel $serviceContainer->setConnectionManager('thelia', $manager); if ($this->isDebug()) { - //$serviceContainer->setLogger('defaultLogger', Tlog::getInstance()); $con = Propel::getConnection(\Thelia\Model\Map\ProductTableMap::DATABASE_NAME); $con->useDebug(true); } From 51731017bd1fe3b69ae97c05f7798ec6662a07ea Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Mon, 9 Sep 2013 09:10:56 +0200 Subject: [PATCH 006/212] create customer admin controller and index controller --- .../Thelia/Config/Resources/routing/admin.xml | 8 ++++ .../Controller/Admin/CustomerController.php | 40 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 core/lib/Thelia/Controller/Admin/CustomerController.php diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml index e8262117b..15dd8acd0 100755 --- a/core/lib/Thelia/Config/Resources/routing/admin.xml +++ b/core/lib/Thelia/Config/Resources/routing/admin.xml @@ -31,6 +31,14 @@ Thelia\Controller\Admin\CategoryController::defaultAction + + + + Thelia\Controller\Admin\CustomerController::indexAction + + + + diff --git a/core/lib/Thelia/Controller/Admin/CustomerController.php b/core/lib/Thelia/Controller/Admin/CustomerController.php new file mode 100644 index 000000000..eabfee0ce --- /dev/null +++ b/core/lib/Thelia/Controller/Admin/CustomerController.php @@ -0,0 +1,40 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Controller\Admin; + + +/** + * Class CustomerController + * @package Thelia\Controller\Admin + * @author Manuel Raynaud + */ +class CustomerController extends BaseAdminController +{ + public function indexAction() + { + if (null !== $response = $this->checkAuth("admin.customers.view")) return $response; + + return $this->render("customers"); + } +} \ No newline at end of file From 2d6787e58893aa9a97f3e1df752fb9bba3c8a02b Mon Sep 17 00:00:00 2001 From: gmorel Date: Mon, 9 Sep 2013 10:03:00 +0200 Subject: [PATCH 007/212] WIP - Coupon : add rule input ajax controller --- core/lib/Thelia/Config/Resources/config.xml | 2 +- .../Thelia/Config/Resources/routing/admin.xml | 3 ++ .../Thelia/Constraint/ConstraintFactory.php | 19 ++++++++++ .../Controller/Admin/CouponController.php | 35 +++++++++++++++++++ .../admin/default/coupon/rule-input-ajax.html | 1 + 5 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 templates/admin/default/coupon/rule-input-ajax.html diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml index 7081a5e93..26a132e23 100755 --- a/core/lib/Thelia/Config/Resources/config.xml +++ b/core/lib/Thelia/Config/Resources/config.xml @@ -221,7 +221,7 @@ - + diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml index 94c5f3da6..ff0827c73 100755 --- a/core/lib/Thelia/Config/Resources/routing/admin.xml +++ b/core/lib/Thelia/Config/Resources/routing/admin.xml @@ -84,6 +84,9 @@ Thelia\Controller\Admin\CouponController::readAction + + Thelia\Controller\Admin\CouponController::getRuleInputAction + diff --git a/core/lib/Thelia/Constraint/ConstraintFactory.php b/core/lib/Thelia/Constraint/ConstraintFactory.php index 699459847..e96509172 100644 --- a/core/lib/Thelia/Constraint/ConstraintFactory.php +++ b/core/lib/Thelia/Constraint/ConstraintFactory.php @@ -140,4 +140,23 @@ class ConstraintFactory return $rule; } + + /** + * Get Coupon Rule inputs from serviceId + * + * @param string $ruleServiceId Rule class name + * + * @return array Ready to be drawn rule inputs + */ + public function getInputs($ruleServiceId) + { + if (!$this->container->has($ruleServiceId)) { + return false; + } + + /** @var CouponRuleInterface $rule */ + $rule = $this->container->get($ruleServiceId); + + return $rule->getValidators(); + } } \ No newline at end of file diff --git a/core/lib/Thelia/Controller/Admin/CouponController.php b/core/lib/Thelia/Controller/Admin/CouponController.php index 758e0b616..769a8c406 100755 --- a/core/lib/Thelia/Controller/Admin/CouponController.php +++ b/core/lib/Thelia/Controller/Admin/CouponController.php @@ -24,6 +24,8 @@ namespace Thelia\Controller\Admin; use Symfony\Component\HttpFoundation\Request; +use Thelia\Constraint\ConstraintFactory; +use Thelia\Constraint\ConstraintFactoryTest; use Thelia\Constraint\Rule\AvailableForTotalAmount; use Thelia\Constraint\Rule\CouponRuleInterface; use Thelia\Constraint\Validator\PriceParam; @@ -311,6 +313,39 @@ class CouponController extends BaseAdminController return $this->render('coupon-read', array('couponId' => $couponId)); } + /** + * Manage Coupons read display + * + * @param int $couponId Coupon Id + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function getRuleInputAction($ruleId) + { + $this->checkAuth('ADMIN', 'admin.coupon.read'); + + // @todo uncomment +// if (!$this->getRequest()->isXmlHttpRequest()) { +// $this->redirect('index'); +// } + + /** @var ConstraintFactory $constraintFactory */ + $constraintFactory = $this->container->get('thelia.constraint.factory'); + $inputs = $constraintFactory->getInputs($ruleId); + + if (!$inputs) { + return $this->pageNotFound(); + } + + return $this->render( + 'coupon/rule-input-ajax', + array( + 'ruleId' => $ruleId, + 'inputs' => $inputs + ) + ); + } + /** * Build a Coupon from its form * diff --git a/templates/admin/default/coupon/rule-input-ajax.html b/templates/admin/default/coupon/rule-input-ajax.html new file mode 100644 index 000000000..30d74d258 --- /dev/null +++ b/templates/admin/default/coupon/rule-input-ajax.html @@ -0,0 +1 @@ +test \ No newline at end of file From 0a5281c1e683dc7bdc633c2e4ce1667e2b04befd Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Mon, 9 Sep 2013 10:48:41 +0200 Subject: [PATCH 008/212] tax engine model --- .../Thelia/Exception/TaxEngineException.php | 41 ++++++++++++ core/lib/Thelia/TaxEngine/Calculator.php | 65 +++++++++++++++++++ local/config/schema.xml | 14 ++-- 3 files changed, 113 insertions(+), 7 deletions(-) create mode 100755 core/lib/Thelia/Exception/TaxEngineException.php create mode 100755 core/lib/Thelia/TaxEngine/Calculator.php diff --git a/core/lib/Thelia/Exception/TaxEngineException.php b/core/lib/Thelia/Exception/TaxEngineException.php new file mode 100755 index 000000000..b51aeef44 --- /dev/null +++ b/core/lib/Thelia/Exception/TaxEngineException.php @@ -0,0 +1,41 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Exception; + +use Thelia\Log\Tlog; + +class TaxEngineException extends \RuntimeException +{ + const UNKNOWN_EXCEPTION = 0; + + const UNDEFINED_PRODUCT = 501; + const UNDEFINED_COUNTRY = 502; + + public function __construct($message, $code = null, $previous = null) { + if($code === null) { + $code = self::UNKNOWN_EXCEPTION; + } + parent::__construct($message, $code, $previous); + } +} diff --git a/core/lib/Thelia/TaxEngine/Calculator.php b/core/lib/Thelia/TaxEngine/Calculator.php new file mode 100755 index 000000000..0e1216783 --- /dev/null +++ b/core/lib/Thelia/TaxEngine/Calculator.php @@ -0,0 +1,65 @@ +. */ +/* */ +/*************************************************************************************/ +namespace Thelia\TaxEngine; + +use Thelia\Exception\TaxEngineException; +use Thelia\Model\Country; +use Thelia\Model\Product; + +/** + * Class Calculator + * @package Thelia\TaxEngine + * @author Etienne Roudeix + */ +class Calculator +{ + protected $taxRulesCollection = null; + + protected $product = null; + protected $country = null; + + public function __construct() + { + return $this; + } + + public function load(Product $product, Country $country) + { + 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; + + return $this; + } + + public function getTaxAmount() + { + + } +} diff --git a/local/config/schema.xml b/local/config/schema.xml index e6e68c4b2..55036197f 100755 --- a/local/config/schema.xml +++ b/local/config/schema.xml @@ -96,19 +96,19 @@ - - + + +
- - - + + - - + + From ca9ec3b089c0e71cb2c29a9479f6cf0d4112dcb7 Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Mon, 9 Sep 2013 11:01:31 +0200 Subject: [PATCH 009/212] tax engine model --- core/lib/Thelia/Model/Base/Country.php | 7 +- core/lib/Thelia/Model/Base/CountryQuery.php | 4 +- core/lib/Thelia/Model/Base/Tax.php | 14 +- core/lib/Thelia/Model/Base/TaxQuery.php | 4 +- core/lib/Thelia/Model/Base/TaxRule.php | 247 +++++------------- core/lib/Thelia/Model/Base/TaxRuleCountry.php | 190 +++++--------- .../Thelia/Model/Base/TaxRuleCountryQuery.php | 126 ++++----- core/lib/Thelia/Model/Base/TaxRuleI18n.php | 118 ++++++++- .../Thelia/Model/Base/TaxRuleI18nQuery.php | 68 ++++- core/lib/Thelia/Model/Base/TaxRuleQuery.php | 105 +------- .../Model/Map/TaxRuleCountryTableMap.php | 130 ++++++--- .../Thelia/Model/Map/TaxRuleI18nTableMap.php | 44 +++- core/lib/Thelia/Model/Map/TaxRuleTableMap.php | 54 ++-- core/lib/Thelia/Model/Map/TaxTableMap.php | 2 +- install/thelia.sql | 18 +- local/config/schema.xml | 6 +- 16 files changed, 535 insertions(+), 602 deletions(-) diff --git a/core/lib/Thelia/Model/Base/Country.php b/core/lib/Thelia/Model/Base/Country.php index e0541a151..90fd48880 100755 --- a/core/lib/Thelia/Model/Base/Country.php +++ b/core/lib/Thelia/Model/Base/Country.php @@ -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); } diff --git a/core/lib/Thelia/Model/Base/CountryQuery.php b/core/lib/Thelia/Model/Base/CountryQuery.php index 6c3a1c950..1e565e9c0 100755 --- a/core/lib/Thelia/Model/Base/CountryQuery.php +++ b/core/lib/Thelia/Model/Base/CountryQuery.php @@ -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) diff --git a/core/lib/Thelia/Model/Base/Tax.php b/core/lib/Thelia/Model/Base/Tax.php index 02e6bc3b0..ed4bb40f7 100755 --- a/core/lib/Thelia/Model/Base/Tax.php +++ b/core/lib/Thelia/Model/Base/Tax.php @@ -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); } diff --git a/core/lib/Thelia/Model/Base/TaxQuery.php b/core/lib/Thelia/Model/Base/TaxQuery.php index 307ace57c..07316bf69 100755 --- a/core/lib/Thelia/Model/Base/TaxQuery.php +++ b/core/lib/Thelia/Model/Base/TaxQuery.php @@ -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) diff --git a/core/lib/Thelia/Model/Base/TaxRule.php b/core/lib/Thelia/Model/Base/TaxRule.php index d33d47e2b..61f21d4e1 100755 --- a/core/lib/Thelia/Model/Base/TaxRule.php +++ b/core/lib/Thelia/Model/Base/TaxRule.php @@ -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 diff --git a/core/lib/Thelia/Model/Base/TaxRuleCountry.php b/core/lib/Thelia/Model/Base/TaxRuleCountry.php index 66f6f585b..0cc3e74eb 100755 --- a/core/lib/Thelia/Model/Base/TaxRuleCountry.php +++ b/core/lib/Thelia/Model/Base/TaxRuleCountry.php @@ -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; diff --git a/core/lib/Thelia/Model/Base/TaxRuleCountryQuery.php b/core/lib/Thelia/Model/Base/TaxRuleCountryQuery.php index b4d4cd1c2..5674643f7 100755 --- a/core/lib/Thelia/Model/Base/TaxRuleCountryQuery.php +++ b/core/lib/Thelia/Model/Base/TaxRuleCountryQuery.php @@ -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. * * - * $obj = $c->findPk(12, $con); + * $obj = $c->findPk(array(12, 34, 56), $con); * * - * @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 * - * $objs = $c->findPks(array(12, 56, 832), $con); + * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * * @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: - * - * $query->filterById(1234); // WHERE id = 1234 - * $query->filterById(array(12, 34)); // WHERE id IN (12, 34) - * $query->filterById(array('min' => 12)); // WHERE id > 12 - * - * - * @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: * - * $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 * * - * @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; diff --git a/core/lib/Thelia/Model/Base/TaxRuleI18n.php b/core/lib/Thelia/Model/Base/TaxRuleI18n.php index b1efadd6a..711dba307 100755 --- a/core/lib/Thelia/Model/Base/TaxRuleI18n.php +++ b/core/lib/Thelia/Model/Base/TaxRuleI18n.php @@ -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(); diff --git a/core/lib/Thelia/Model/Base/TaxRuleI18nQuery.php b/core/lib/Thelia/Model/Base/TaxRuleI18nQuery.php index 02667f4ac..dfb3e100c 100755 --- a/core/lib/Thelia/Model/Base/TaxRuleI18nQuery.php +++ b/core/lib/Thelia/Model/Base/TaxRuleI18nQuery.php @@ -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: + * + * $query->filterByTitle('fooValue'); // WHERE title = 'fooValue' + * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' + * + * + * @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: + * + * $query->filterByDescription('fooValue'); // WHERE description = 'fooValue' + * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' + * + * + * @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 * diff --git a/core/lib/Thelia/Model/Base/TaxRuleQuery.php b/core/lib/Thelia/Model/Base/TaxRuleQuery.php index 2fb478b7a..8ee264415 100755 --- a/core/lib/Thelia/Model/Base/TaxRuleQuery.php +++ b/core/lib/Thelia/Model/Base/TaxRuleQuery.php @@ -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: - * - * $query->filterByCode('fooValue'); // WHERE code = 'fooValue' - * $query->filterByCode('%fooValue%'); // WHERE code LIKE '%fooValue%' - * - * - * @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: - * - * $query->filterByTitle('fooValue'); // WHERE title = 'fooValue' - * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' - * - * - * @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: - * - * $query->filterByDescription('fooValue'); // WHERE description = 'fooValue' - * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' - * - * - * @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) diff --git a/core/lib/Thelia/Model/Map/TaxRuleCountryTableMap.php b/core/lib/Thelia/Model/Map/TaxRuleCountryTableMap.php index 42b4e6f59..5282d67fa 100755 --- a/core/lib/Thelia/Model/Map/TaxRuleCountryTableMap.php +++ b/core/lib/Thelia/Model/Map/TaxRuleCountryTableMap.php @@ -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); diff --git a/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php b/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php index 1f0ed1e96..012ad2e72 100755 --- a/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php @@ -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'); } } diff --git a/core/lib/Thelia/Model/Map/TaxRuleTableMap.php b/core/lib/Thelia/Model/Map/TaxRuleTableMap.php index cc5f628b9..391e23b6d 100755 --- a/core/lib/Thelia/Model/Map/TaxRuleTableMap.php +++ b/core/lib/Thelia/Model/Map/TaxRuleTableMap.php @@ -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'); } diff --git a/core/lib/Thelia/Model/Map/TaxTableMap.php b/core/lib/Thelia/Model/Map/TaxTableMap.php index 6d43f20e9..11e5047ce 100755 --- a/core/lib/Thelia/Model/Map/TaxTableMap.php +++ b/core/lib/Thelia/Model/Map/TaxTableMap.php @@ -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() diff --git a/install/thelia.sql b/install/thelia.sql index 2fb3723ca..d38d45379 100755 --- a/install/thelia.sql +++ b/install/thelia.sql @@ -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`) diff --git a/local/config/schema.xml b/local/config/schema.xml index 55036197f..c6005593f 100755 --- a/local/config/schema.xml +++ b/local/config/schema.xml @@ -104,9 +104,9 @@
- - - + + + From 54dd496f5206b3465308e05f93e81c9647d0aa56 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Mon, 9 Sep 2013 11:07:14 +0200 Subject: [PATCH 010/212] update format smarty plugin --- core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php index daaff3fc1..3deffc1aa 100644 --- a/core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php +++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php @@ -113,9 +113,15 @@ class Format extends AbstractSmartyPlugin throw new SmartyPluginException("number is a mandatory parameter in format_number function"); } + $number = $params["number"]; + + if(empty($number)) { + return ""; + } + $lang = $this->request->getSession()->getLang(); - $number = $params["number"]; + $decimals = array_key_exists("decimals", $params) ? $params["decimals"] : $lang->getDecimals(); $decPoint = array_key_exists("dec_point", $params) ? $params["dec_point"] : $lang->getDecimalSeparator(); $thousandsSep = array_key_exists("thousands_sep", $params) ? $params["thousands_sep"] : $lang->getThousandsSeparator(); From 8e77e4b5303c1cdaa00ff81f3285acfdb87518ed Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Mon, 9 Sep 2013 11:07:51 +0200 Subject: [PATCH 011/212] create admin customer view and add output info in customer loop --- .../Thelia/Core/Template/Loop/Customer.php | 15 +++ core/lib/Thelia/Model/Order.php | 11 ++ templates/admin/default/customers.html | 108 ++++++++++++++++++ 3 files changed, 134 insertions(+) create mode 100644 templates/admin/default/customers.html diff --git a/core/lib/Thelia/Core/Template/Loop/Customer.php b/core/lib/Thelia/Core/Template/Loop/Customer.php index 1a4b84105..cbf9e4fda 100755 --- a/core/lib/Thelia/Core/Template/Loop/Customer.php +++ b/core/lib/Thelia/Core/Template/Loop/Customer.php @@ -64,6 +64,7 @@ class Customer extends BaseLoop ) ), Argument::createBooleanTypeArgument('reseller'), + Argument::createBooleanTypeArgument('last_order'), Argument::createIntTypeArgument('sponsor') ); } @@ -130,6 +131,20 @@ class Customer extends BaseLoop $loopResultRow->set("SPONSOR", $customer->getSponsor()); $loopResultRow->set("DISCOUNT", $customer->getDiscount()); + $lastOrderDate = ""; + $lastOrderAmount = ""; + + if ($this->getLastOrder()) { + $order = $customer->getOrders()->getFirst(); + if ($order) { + $lastOrderDate = $order->getCreatedAt(); + $lastOrderAmount = $order->getTotalAmount(); + } + } + + $loopResultRow->set("LASTORDER_DATE", $lastOrderDate); + $loopResultRow->set("LASTORDER_AMOUNT", $lastOrderAmount); + $loopResult->addRow($loopResultRow); } diff --git a/core/lib/Thelia/Model/Order.php b/core/lib/Thelia/Model/Order.php index 91582750a..ccdd152b5 100755 --- a/core/lib/Thelia/Model/Order.php +++ b/core/lib/Thelia/Model/Order.php @@ -6,4 +6,15 @@ use Thelia\Model\Base\Order as BaseOrder; class Order extends BaseOrder { + /** + * calculate the total amount + * + * @TODO create body method + * + * @return int + */ + public function getTotalAmount() + { + return 0; + } } diff --git a/templates/admin/default/customers.html b/templates/admin/default/customers.html new file mode 100644 index 000000000..0e68677dd --- /dev/null +++ b/templates/admin/default/customers.html @@ -0,0 +1,108 @@ +{extends file="admin-layout.tpl"} + +{block name="page-title"}{intl l='Customer'}{/block} + +{block name="check-permissions"}admin.customer.view{/block} + +{block name="main-content"} +
+
+ + + {module_include location='customer_top'} + +
+
+
+
+ + + {ifloop rel="customer_list"} + + + + + + + {module_include location='category_list_header'} + + + + + + + + + + + + + {loop name="customer_list" type="customer" visible="*" last_order="1" backend_context="1"} + + + + + + + + {module_include location='customer_list_row'} + + + + + + + + {/loop} + + {/ifloop} +
+ {intl l="Customers list"} + + {module_include location='customer_list_caption'} + + {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.customers.create"} + + + + {/loop} +
+ {intl l="customer ref"} + + {intl l="company"} + + {intl l="firstname & lastname"} + + {intl l="last order"} + {intl l='order amount'}{intl l='Actions'}
{#REF} + {#COMPANY} + + {#FIRSTNAME} {#LASTNAME} + + {format_date date=#LASTORDER_DATE} + + {format_number number=#LASTORDER_AMOUNT} + +
+ + {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.customer.edit"} + + {/loop} + {loop type="auth" name="can_send_mail" roles="ADMIN" permissions="admin.customer.sendMail"} + + {/loop} + {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.customer.delete"} + + {/loop} +
+
+ + + + + + {module_include location='customer_bottom'} + + + +{/block} \ No newline at end of file From 2548fb9e3cbef5b04d07beafe4539a91da988261 Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Mon, 9 Sep 2013 11:28:02 +0200 Subject: [PATCH 012/212] insert 19.6 tva --- core/lib/Thelia/Model/TaxRuleQuery.php | 13 ++++++++++++- core/lib/Thelia/TaxEngine/Calculator.php | 9 ++++++++- install/insert.sql | 22 ++++++++++++++++++++++ 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/core/lib/Thelia/Model/TaxRuleQuery.php b/core/lib/Thelia/Model/TaxRuleQuery.php index 8cb79562d..833048fcf 100755 --- a/core/lib/Thelia/Model/TaxRuleQuery.php +++ b/core/lib/Thelia/Model/TaxRuleQuery.php @@ -2,6 +2,7 @@ namespace Thelia\Model; +use Propel\Runtime\ActiveQuery\Criteria; use Thelia\Model\Base\TaxRuleQuery as BaseTaxRuleQuery; @@ -15,6 +16,16 @@ 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 +{ + public function getTaxCalculatorCollection(Product $product, Country $country) + { + $search = TaxRuleCountryQuery::create() + ->filterByCountry($country, Criteria::EQUAL) + ->filterByTaxRuleId($product->getTaxRuleId()) + ->orderByPosition() + ->find(); + return $search; + } } // TaxRuleQuery diff --git a/core/lib/Thelia/TaxEngine/Calculator.php b/core/lib/Thelia/TaxEngine/Calculator.php index 0e1216783..2648b4d6d 100755 --- a/core/lib/Thelia/TaxEngine/Calculator.php +++ b/core/lib/Thelia/TaxEngine/Calculator.php @@ -25,6 +25,7 @@ namespace Thelia\TaxEngine; use Thelia\Exception\TaxEngineException; use Thelia\Model\Country; use Thelia\Model\Product; +use Thelia\Model\TaxRuleQuery; /** * Class Calculator @@ -33,6 +34,8 @@ use Thelia\Model\Product; */ class Calculator { + protected $taxRuleQuery = null; + protected $taxRulesCollection = null; protected $product = null; @@ -40,6 +43,8 @@ class Calculator public function __construct() { + $this->taxRuleQuery = new TaxRuleQuery(); + return $this; } @@ -55,11 +60,13 @@ class Calculator $this->product = $product; $this->country = $country; + $this->taxRulesCollection = $this->taxRuleQuery->getTaxCalculatorCollection($product, $country); + return $this; } public function getTaxAmount() { - + } } diff --git a/install/insert.sql b/install/insert.sql index 344381a37..917966893 100755 --- a/install/insert.sql +++ b/install/insert.sql @@ -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()); \ No newline at end of file From a178835f6ba2e63f138922d0342af2cda4d41fcb Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Mon, 9 Sep 2013 11:31:41 +0200 Subject: [PATCH 013/212] tax faker --- install/faker.php | 1 + 1 file changed, 1 insertion(+) diff --git a/install/faker.php b/install/faker.php index f1e7691d7..a2f52654e 100755 --- a/install/faker.php +++ b/install/faker.php @@ -371,6 +371,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(); From 77fc36fc91d865b79cdd5f372939143012bde4c5 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Mon, 9 Sep 2013 12:46:27 +0200 Subject: [PATCH 014/212] escae output only if it's not an object --- .../Thelia/Core/Template/Smarty/SmartyParser.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php b/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php index 85619bc8a..a6dbf3715 100755 --- a/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php +++ b/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php @@ -65,9 +65,7 @@ class SmartyParser extends Smarty implements ParserInterface $this->setTemplate($template ?: ConfigQuery::read('active-template', 'default')); $this->debugging = $debug; - - $this->escape_html = true; - + // Prevent smarty ErrorException: Notice: Undefined index bla bla bla... $this->error_reporting = E_ALL ^ E_NOTICE; @@ -86,6 +84,7 @@ class SmartyParser extends Smarty implements ParserInterface $this->registerFilter('pre', array($this, "preThelia")); $this->registerFilter('output', array($this, "removeBlankLines")); + $this->registerFilter('variable', array(__CLASS__, "theliaEscape")); } public function preThelia($tpl_source, \Smarty_Internal_Template $template) @@ -101,6 +100,15 @@ class SmartyParser extends Smarty implements ParserInterface return preg_replace("/(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+/", "\n", $tpl_source); } + public static function theliaEscape($content, $smarty) + { + if(!is_object($content)) { + return htmlspecialchars($content ,ENT_QUOTES, Smarty::$_CHARSET); + } else { + return $content; + } + } + public function setTemplate($template_path_from_template_base) { $this->template = $template_path_from_template_base; From 0ddf88e46eef1320f144d88d22507e33cba64650 Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Mon, 9 Sep 2013 14:24:50 +0200 Subject: [PATCH 015/212] tax engine --- .../lib/Thelia/Core/Template/Loop/Address.php | 2 +- .../Thelia/Core/Template/Loop/Customer.php | 2 +- .../lib/Thelia/Core/Template/Loop/Product.php | 14 ++++--- .../Thelia/Exception/TaxEngineException.php | 3 ++ core/lib/Thelia/Model/Product.php | 19 +++++++++ core/lib/Thelia/Model/Tax.php | 39 ++++++++++++++++++- core/lib/Thelia/Model/TaxRuleQuery.php | 31 ++++++++++----- core/lib/Thelia/TaxEngine/Calculator.php | 26 +++++++++++-- templates/default/category.html | 2 + 9 files changed, 117 insertions(+), 21 deletions(-) diff --git a/core/lib/Thelia/Core/Template/Loop/Address.php b/core/lib/Thelia/Core/Template/Loop/Address.php index 757cc11b8..3ac9370f8 100755 --- a/core/lib/Thelia/Core/Template/Loop/Address.php +++ b/core/lib/Thelia/Core/Template/Loop/Address.php @@ -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 { diff --git a/core/lib/Thelia/Core/Template/Loop/Customer.php b/core/lib/Thelia/Core/Template/Loop/Customer.php index 1a4b84105..ad801dc5f 100755 --- a/core/lib/Thelia/Core/Template/Loop/Customer.php +++ b/core/lib/Thelia/Core/Template/Loop/Customer.php @@ -80,7 +80,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 { diff --git a/core/lib/Thelia/Core/Template/Loop/Product.php b/core/lib/Thelia/Core/Template/Loop/Product.php index 4d785b8b0..f52b314a9 100755 --- a/core/lib/Thelia/Core/Template/Loop/Product.php +++ b/core/lib/Thelia/Core/Template/Loop/Product.php @@ -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(); @@ -518,7 +519,10 @@ 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", $product->getRealLowestPrice()) + ->set("BEST_TAXED_PRICE", $product->getTaxedPrice( + CountryQuery::create()->findOneById(64) // @TODO : make it magic + )) ->set("IS_PROMO", $product->getVirtualColumn('main_product_is_promo')) ->set("IS_NEW", $product->getVirtualColumn('main_product_is_new')) ->set("POSITION", $product->getPosition()) diff --git a/core/lib/Thelia/Exception/TaxEngineException.php b/core/lib/Thelia/Exception/TaxEngineException.php index b51aeef44..2a2718d4b 100755 --- a/core/lib/Thelia/Exception/TaxEngineException.php +++ b/core/lib/Thelia/Exception/TaxEngineException.php @@ -31,6 +31,9 @@ class TaxEngineException extends \RuntimeException 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) { diff --git a/core/lib/Thelia/Model/Product.php b/core/lib/Thelia/Model/Product.php index 6c7ffbe44..66e2a80ad 100755 --- a/core/lib/Thelia/Model/Product.php +++ b/core/lib/Thelia/Model/Product.php @@ -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(); + } } diff --git a/core/lib/Thelia/Model/Tax.php b/core/lib/Thelia/Model/Tax.php index ed61876ae..21efbae6a 100755 --- a/core/lib/Thelia/Model/Tax.php +++ b/core/lib/Thelia/Model/Tax.php @@ -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; + } } diff --git a/core/lib/Thelia/Model/TaxRuleQuery.php b/core/lib/Thelia/Model/TaxRuleQuery.php index 833048fcf..b14e0f55d 100755 --- a/core/lib/Thelia/Model/TaxRuleQuery.php +++ b/core/lib/Thelia/Model/TaxRuleQuery.php @@ -4,7 +4,8 @@ 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. @@ -18,14 +19,26 @@ use Thelia\Model\Base\TaxRuleQuery as BaseTaxRuleQuery; */ class TaxRuleQuery extends BaseTaxRuleQuery { - public function getTaxCalculatorCollection(Product $product, Country $country) - { - $search = TaxRuleCountryQuery::create() - ->filterByCountry($country, Criteria::EQUAL) - ->filterByTaxRuleId($product->getTaxRuleId()) - ->orderByPosition() - ->find(); + const ALIAS_FOR_TAX_RULE_COUNTRY_POSITION = 'taxRuleCountryPosition'; + const ALIAS_FOR_TAX_RATE_SUM = 'taxRateSum'; - return $search; + 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) + ; + + //var_dump($search->toString()); + + return $search->find(); } } // TaxRuleQuery diff --git a/core/lib/Thelia/TaxEngine/Calculator.php b/core/lib/Thelia/TaxEngine/Calculator.php index 2648b4d6d..b0dcbb2fa 100755 --- a/core/lib/Thelia/TaxEngine/Calculator.php +++ b/core/lib/Thelia/TaxEngine/Calculator.php @@ -36,7 +36,7 @@ class Calculator { protected $taxRuleQuery = null; - protected $taxRulesCollection = null; + protected $taxRulesGroupedCollection = null; protected $product = null; protected $country = null; @@ -44,12 +44,14 @@ class Calculator public function __construct() { $this->taxRuleQuery = new TaxRuleQuery(); - - return $this; } 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); } @@ -60,13 +62,29 @@ class Calculator $this->product = $product; $this->country = $country; - $this->taxRulesCollection = $this->taxRuleQuery->getTaxCalculatorCollection($product, $country); + $this->taxRulesGroupedCollection = $this->taxRuleQuery->getTaxCalculatorGroupedCollection($product, $country); return $this; } public function getTaxAmount() { + if(null === $this->taxRulesGroupedCollection) { + throw new TaxEngineException('Tax rules collection is empty in Calculator::getTaxAmount', TaxEngineException::UNDEFINED_TAX_RULES_COLLECTION); + } + $amount = $this->product->getRealLowestPrice(); + + $taxRateAmount = 0; + foreach($this->taxRulesGroupedCollection as $taxRule) { + $taxRateAmount += $taxRule->getTaxRuleRateSum(); + } + + return $amount * $taxRateAmount * 0.01; + } + + public function getTaxedPrice() + { + return $this->product->getRealLowestPrice() + $this->getTaxAmount(); } } diff --git a/templates/default/category.html b/templates/default/category.html index dd5c6a20a..4aae69cec 100755 --- a/templates/default/category.html +++ b/templates/default/category.html @@ -26,6 +26,8 @@

#TITLE

#DESCRIPTION

+

Starting by #BEST_PRICE € HT (#BEST_TAXED_PRICE € TTC)

+ {ifloop rel="ft"}
Features
    From d4ec36e920776a7021ec42ce45d48f0bf77788fd Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Mon, 9 Sep 2013 14:29:11 +0200 Subject: [PATCH 016/212] mock getTotalAmoutn in order class --- core/lib/Thelia/Model/Order.php | 2 +- templates/admin/default/customers.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/lib/Thelia/Model/Order.php b/core/lib/Thelia/Model/Order.php index ccdd152b5..f8e6db193 100755 --- a/core/lib/Thelia/Model/Order.php +++ b/core/lib/Thelia/Model/Order.php @@ -15,6 +15,6 @@ class Order extends BaseOrder { */ public function getTotalAmount() { - return 0; + return 2; } } diff --git a/templates/admin/default/customers.html b/templates/admin/default/customers.html index 0e68677dd..e49e12e29 100644 --- a/templates/admin/default/customers.html +++ b/templates/admin/default/customers.html @@ -70,11 +70,11 @@ {module_include location='customer_list_row'} - {format_date date=#LASTORDER_DATE} + {format_date date=$LASTORDER_DATE} - {format_number number=#LASTORDER_AMOUNT} + {format_number number=$LASTORDER_AMOUNT}
    From fa36b64f51341d335e66f174bc0cbca66f049b48 Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Mon, 9 Sep 2013 14:44:39 +0200 Subject: [PATCH 017/212] debug bar --- templates/default/category.html | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/templates/default/category.html b/templates/default/category.html index 4aae69cec..081c28ca5 100755 --- a/templates/default/category.html +++ b/templates/default/category.html @@ -1,3 +1,9 @@ + + + {debugbar_renderHead} + + +

    Category page

    @@ -142,4 +148,8 @@ {/loop}
- \ No newline at end of file + + + {debugbar_render} + + \ No newline at end of file From 7d4003741cbbe8569090ccc43bad060950925186 Mon Sep 17 00:00:00 2001 From: gmorel Date: Mon, 9 Sep 2013 15:35:21 +0200 Subject: [PATCH 018/212] Working - Fix #category-rule replaced by parser when writing jawascript --- core/lib/Thelia/Core/Template/Smarty/SmartyParser.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php b/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php index 85619bc8a..735aa3e32 100755 --- a/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php +++ b/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php @@ -90,8 +90,8 @@ class SmartyParser extends Smarty implements ParserInterface public function preThelia($tpl_source, \Smarty_Internal_Template $template) { - $new_source = preg_replace('`{#([a-zA-Z][a-zA-Z0-9\-_]*)(.*)}`', '{\$$1$2}', $tpl_source); - $new_source = preg_replace('`#([a-zA-Z][a-zA-Z0-9\-_]*)`', '{\$$1|dieseCanceller:\'#$1\'}', $new_source); + $new_source = preg_replace('`{#([a-zA-Z][a-zA-Z0-9_]*)(.*)}`', '{\$$1$2}', $tpl_source); + $new_source = preg_replace('`#([a-zA-Z][a-zA-Z0-9_]*)`', '{\$$1|dieseCanceller:\'#$1\'}', $new_source); return $new_source; } From 66454ef3f030332b4366b21124c9ccde6ed155a3 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Mon, 9 Sep 2013 16:03:38 +0200 Subject: [PATCH 019/212] finish simple list customer page in backoffice --- .../Controller/Admin/CustomerController.php | 2 +- templates/admin/default/customers.html | 37 +++++++++++++++++-- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/core/lib/Thelia/Controller/Admin/CustomerController.php b/core/lib/Thelia/Controller/Admin/CustomerController.php index eabfee0ce..04c8842cd 100644 --- a/core/lib/Thelia/Controller/Admin/CustomerController.php +++ b/core/lib/Thelia/Controller/Admin/CustomerController.php @@ -35,6 +35,6 @@ class CustomerController extends BaseAdminController { if (null !== $response = $this->checkAuth("admin.customers.view")) return $response; - return $this->render("customers"); + return $this->render("customers", array("display_customer" => 20)); } } \ No newline at end of file diff --git a/templates/admin/default/customers.html b/templates/admin/default/customers.html index e49e12e29..e126b9f77 100644 --- a/templates/admin/default/customers.html +++ b/templates/admin/default/customers.html @@ -1,3 +1,4 @@ + {extends file="admin-layout.tpl"} {block name="page-title"}{intl l='Customer'}{/block} @@ -5,6 +6,9 @@ {block name="check-permissions"}admin.customer.view{/block} {block name="main-content"} + {assign var=customer_page value={$smarty.get.page|default:1}} + +
@@ -21,7 +25,7 @@ {module_include location='customer_list_caption'} {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.customers.create"} - + {/loop} @@ -31,7 +35,7 @@ - {intl l="customer ref"} + {intl l="customer ref"} {$customer_current_page} toto @@ -55,7 +59,7 @@ - {loop name="customer_list" type="customer" visible="*" last_order="1" backend_context="1"} + {loop name="customer_list" type="customer" visible="*" last_order="1" backend_context="1" page={$customer_page} limit={$display_customer}} {#REF} @@ -102,6 +106,33 @@ {module_include location='customer_bottom'} +
+
+ +
    + {if #customer_page != 1} +
  • «
    • + {else} +
  • «
    • + {/if} + + {pageloop rel="customer_list"} + {if #PAGE != #CURRENT} +
  • #PAGE
    • + {else} +
  • #PAGE
    • + {/if} + + {if #PAGE == #LAST && #LAST != #CURRENT} +
  • »
    • + {else} +
  • »
    • + {/if} + {/pageloop} +
+
+
+
From 849520eff9a0ba4eaf01f4fe3d5c642abe4024a7 Mon Sep 17 00:00:00 2001 From: gmorel Date: Mon, 9 Sep 2013 16:08:12 +0200 Subject: [PATCH 020/212] Working - Add Symfony2 routing ability to Thelia router --- .../Controller/Admin/BaseAdminController.php | 23 +++++++++++++-- core/lib/Thelia/Controller/BaseController.php | 29 +++++++++++++------ 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/core/lib/Thelia/Controller/Admin/BaseAdminController.php b/core/lib/Thelia/Controller/Admin/BaseAdminController.php index 298cd0182..5461b8d3f 100755 --- a/core/lib/Thelia/Controller/Admin/BaseAdminController.php +++ b/core/lib/Thelia/Controller/Admin/BaseAdminController.php @@ -22,6 +22,9 @@ /*************************************************************************************/ namespace Thelia\Controller\Admin; +use Symfony\Component\Routing\Exception\InvalidParameterException; +use Symfony\Component\Routing\Exception\MissingMandatoryParametersException; +use Symfony\Component\Routing\Exception\RouteNotFoundException; use Thelia\Controller\BaseController; use Symfony\Component\HttpFoundation\Response; use Thelia\Core\Security\Exception\AuthorizationException; @@ -211,12 +214,26 @@ class BaseAdminController extends BaseController /** * Return the route path defined for the givent route ID * - * @param string $routeId a route ID, as defines in Config/Resources/routing/admin.xml + * @param string $routeId a route ID, as defines in Config/Resources/routing/admin.xml + * @param mixed $parameters An array of parameters + * @param Boolean|string $referenceType The type of reference to be generated (one of the constants) + * + * @throws RouteNotFoundException If the named route doesn't exist + * @throws MissingMandatoryParametersException When some parameters are missing that are mandatory for the route + * @throws InvalidParameterException When a parameter value for a placeholder is not correct because + * it does not match the requirement + * @throws \InvalidArgumentException When the router doesn't exist + * @return string The generated URL * * @see \Thelia\Controller\BaseController::getRouteFromRouter() */ - protected function getRoute($routeId) { - return $this->getRouteFromRouter('router.admin', $routeId); + protected function getRoute($routeId, $parameters = array(), $referenceType = Router::ABSOLUTE_PATH) { + return $this->getRouteFromRouter( + 'router.admin', + $routeId, + $parameters, + $referenceType + ); } /** diff --git a/core/lib/Thelia/Controller/BaseController.php b/core/lib/Thelia/Controller/BaseController.php index e5b098f02..666e8ca32 100755 --- a/core/lib/Thelia/Controller/BaseController.php +++ b/core/lib/Thelia/Controller/BaseController.php @@ -25,6 +25,10 @@ namespace Thelia\Controller; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\DependencyInjection\ContainerAware; +use Symfony\Component\Routing\Exception\InvalidParameterException; +use Symfony\Component\Routing\Exception\MissingMandatoryParametersException; +use Symfony\Component\Routing\Exception\RouteNotFoundException; +use Symfony\Component\Routing\Router; use Thelia\Core\Security\SecurityContext; use Thelia\Tools\URL; use Thelia\Tools\Redirect; @@ -216,20 +220,27 @@ class BaseController extends ContainerAware /** * Get a route path from the route id. * - * @param $routerName - * @param $routeId + * @param string $routerName Router name + * @param string $routeId The name of the route + * @param mixed $parameters An array of parameters + * @param Boolean|string $referenceType The type of reference to be generated (one of the constants) * - * @return mixed - * @throws InvalidArgumentException + * @throws RouteNotFoundException If the named route doesn't exist + * @throws MissingMandatoryParametersException When some parameters are missing that are mandatory for the route + * @throws InvalidParameterException When a parameter value for a placeholder is not correct because + * it does not match the requirement + * @throws \InvalidArgumentException When the router doesn't exist + * @return string The generated URL */ - protected function getRouteFromRouter($routerName, $routeId) { - $route = $this->container->get($routerName)->getRouteCollection()->get($routeId); + protected function getRouteFromRouter($routerName, $routeId, $parameters = array(), $referenceType = Router::ABSOLUTE_PATH) { + /** @var Router $router */ + $router = $this->container->get($routerName); - if ($route == null) { - throw new \InvalidArgumentException(sprintf("Route ID '%s' does not exists.", $routeId)); + if ($router == null) { + throw new \InvalidArgumentException(sprintf("Router '%s' does not exists.", $routerName)); } - return $route->getPath(); + return $router->generate($routeId, $parameters, $referenceType); } /** From 3618199c05e73a9a0c93e88e03074b55797f6b92 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Mon, 9 Sep 2013 16:08:42 +0200 Subject: [PATCH 021/212] remove test --- templates/admin/default/customers.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/admin/default/customers.html b/templates/admin/default/customers.html index e126b9f77..923941c4e 100644 --- a/templates/admin/default/customers.html +++ b/templates/admin/default/customers.html @@ -35,7 +35,7 @@ - {intl l="customer ref"} {$customer_current_page} toto + {intl l="customer ref"} From ca4df159107495a985ebbb6d73c2dd6c74a0db45 Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Mon, 9 Sep 2013 16:27:46 +0200 Subject: [PATCH 022/212] tax in loops --- .../lib/Thelia/Core/Template/Loop/Product.php | 13 ++++--- ...aleElement.php => ProductSaleElements.php} | 18 ++++++++-- core/lib/Thelia/Model/Product.php | 2 +- core/lib/Thelia/Model/ProductSaleElements.php | 35 ++++++++++++++++++- core/lib/Thelia/Model/TaxRuleQuery.php | 2 -- core/lib/Thelia/TaxEngine/Calculator.php | 16 ++++++--- core/lib/Thelia/Tools/URL.php | 16 +++++++++ templates/default/category.html | 2 +- templates/default/product.html | 4 ++- 9 files changed, 91 insertions(+), 17 deletions(-) rename core/lib/Thelia/Core/Template/Loop/{ProductSaleElement.php => ProductSaleElements.php} (87%) diff --git a/core/lib/Thelia/Core/Template/Loop/Product.php b/core/lib/Thelia/Core/Template/Loop/Product.php index f52b314a9..b7a7c13fe 100755 --- a/core/lib/Thelia/Core/Template/Loop/Product.php +++ b/core/lib/Thelia/Core/Template/Loop/Product.php @@ -510,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')) @@ -519,10 +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->getRealLowestPrice()) - ->set("BEST_TAXED_PRICE", $product->getTaxedPrice( - CountryQuery::create()->findOneById(64) // @TODO : make it magic - )) + ->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()) diff --git a/core/lib/Thelia/Core/Template/Loop/ProductSaleElement.php b/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php similarity index 87% rename from core/lib/Thelia/Core/Template/Loop/ProductSaleElement.php rename to core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php index 7a1a0b8c8..ec4c73230 100755 --- a/core/lib/Thelia/Core/Template/Loop/ProductSaleElement.php +++ b/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php @@ -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); } diff --git a/core/lib/Thelia/Model/Product.php b/core/lib/Thelia/Model/Product.php index 66e2a80ad..06c4640d0 100755 --- a/core/lib/Thelia/Model/Product.php +++ b/core/lib/Thelia/Model/Product.php @@ -28,6 +28,6 @@ class Product extends BaseProduct public function getTaxedPrice(Country $country) { $taxCalculator = new Calculator(); - return $taxCalculator->load($this, $country)->getTaxedPrice(); + return $taxCalculator->load($this, $country)->getTaxedPrice($this->getRealLowestPrice()); } } diff --git a/core/lib/Thelia/Model/ProductSaleElements.php b/core/lib/Thelia/Model/ProductSaleElements.php index cec9c49a7..184e37d0a 100755 --- a/core/lib/Thelia/Model/ProductSaleElements.php +++ b/core/lib/Thelia/Model/ProductSaleElements.php @@ -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()); + } } diff --git a/core/lib/Thelia/Model/TaxRuleQuery.php b/core/lib/Thelia/Model/TaxRuleQuery.php index b14e0f55d..f9c6cf1e5 100755 --- a/core/lib/Thelia/Model/TaxRuleQuery.php +++ b/core/lib/Thelia/Model/TaxRuleQuery.php @@ -37,8 +37,6 @@ class TaxRuleQuery extends BaseTaxRuleQuery ->withColumn('ROUND(SUM(' . TaxTableMap::RATE . '), 2)', self::ALIAS_FOR_TAX_RATE_SUM) ; - //var_dump($search->toString()); - return $search->find(); } } // TaxRuleQuery diff --git a/core/lib/Thelia/TaxEngine/Calculator.php b/core/lib/Thelia/TaxEngine/Calculator.php index b0dcbb2fa..ec6e3c78d 100755 --- a/core/lib/Thelia/TaxEngine/Calculator.php +++ b/core/lib/Thelia/TaxEngine/Calculator.php @@ -67,14 +67,16 @@ class Calculator return $this; } - public function getTaxAmount() + public function getTaxAmount($amount) { + if(false === filter_var($amount, FILTER_VALIDATE_FLOAT)) { + throw new TaxEngineException('BAD AMOUNT FORMAT', TaxEngineException::BAD_AMOUNT_FORMAT); + } + if(null === $this->taxRulesGroupedCollection) { throw new TaxEngineException('Tax rules collection is empty in Calculator::getTaxAmount', TaxEngineException::UNDEFINED_TAX_RULES_COLLECTION); } - $amount = $this->product->getRealLowestPrice(); - $taxRateAmount = 0; foreach($this->taxRulesGroupedCollection as $taxRule) { $taxRateAmount += $taxRule->getTaxRuleRateSum(); @@ -83,8 +85,12 @@ class Calculator return $amount * $taxRateAmount * 0.01; } - public function getTaxedPrice() + public function getTaxedPrice($amount) { - return $this->product->getRealLowestPrice() + $this->getTaxAmount(); + if(false === filter_var($amount, FILTER_VALIDATE_FLOAT)) { + throw new TaxEngineException('BAD AMOUNT FORMAT', TaxEngineException::BAD_AMOUNT_FORMAT); + } + + return $amount + $this->getTaxAmount($amount); } } diff --git a/core/lib/Thelia/Tools/URL.php b/core/lib/Thelia/Tools/URL.php index 161175bbf..e43591ffc 100755 --- a/core/lib/Thelia/Tools/URL.php +++ b/core/lib/Thelia/Tools/URL.php @@ -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; diff --git a/templates/default/category.html b/templates/default/category.html index 081c28ca5..a888605ff 100755 --- a/templates/default/category.html +++ b/templates/default/category.html @@ -32,7 +32,7 @@

#TITLE

#DESCRIPTION

-

Starting by #BEST_PRICE € HT (#BEST_TAXED_PRICE € TTC)

+

Starting by #BEST_PRICE € HT (TAX : #BEST_PRICE_TAX ; #BEST_TAXED_PRICE € TTC)

{ifloop rel="ft"}
Features
diff --git a/templates/default/product.html b/templates/default/product.html index 4f82b5fb8..4280fc88c 100755 --- a/templates/default/product.html +++ b/templates/default/product.html @@ -13,6 +13,8 @@ Index : {navigate to="index"}

#TITLE

#DESCRIPTION

+

Starting by #BEST_PRICE € HT (TAX : #BEST_PRICE_TAX ; #BEST_TAXED_PRICE € TTC)

+ {ifloop rel="acc"}

Accessories

    @@ -64,7 +66,7 @@ Index : {navigate to="index"}
    #ATTRIBUTE_TITLE = #ATTRIBUTE_AVAILABILITY_TITLE
    {/loop}
    #WEIGHT g -
    {if #IS_PROMO == 1} #PROMO_PRICE € (instead of #PRICE) {else} #PRICE € {/if} +
    {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}

    Add - - - + {foreach from=$availableCoupons item=availableCoupon} + + {/foreach} {if $error}{$message}{/if} {/form_field} - More description n°1 about item + {$availableCoupons.0.toolTip} @@ -206,25 +206,11 @@
    - + - - - - - -
    diff --git a/templates/admin/default/coupon/rule-input-ajax.html b/templates/admin/default/coupon/rule-input-ajax.html index 30d74d258..7feda80ee 100644 --- a/templates/admin/default/coupon/rule-input-ajax.html +++ b/templates/admin/default/coupon/rule-input-ajax.html @@ -1 +1,74 @@ -test \ No newline at end of file +{*test*} +{*{$ruleId}*} +{*{$inputs|var_dump}*} + +{foreach from=$inputs key=name item=input} + +
    +
    + +
    +
    + {if $input.type == 'select'} + + {else} + + {*€*} + {/if} +
    +
    +{/foreach} + {**} + {*
    *} + {*
    *} + {**} + {*
    *} + {*
    *} + {**} + {**} + {*
    *} + {*
    *} + {**} + {*
    *} + {*
    *} + {**} + {*
    *} + {*
    *} + {**} + {*
    *} + {*
    *} + {*
    *} + {*
    *} + {**} + {**} + {**} + {**} + {**} + {**} + {**} + {**} + {**} + {**} + {*
    Categories list
    *} + {*
    *} + {*
    *} \ No newline at end of file From e839c92549e72cf4185cdc045a032c60b5b7d1ba Mon Sep 17 00:00:00 2001 From: gmorel Date: Mon, 9 Sep 2013 16:46:22 +0200 Subject: [PATCH 024/212] WIP - Coupon - unit test : no more fatal but some fails --- .../Thelia/Tests/Coupon/CouponFactoryTest.php | 46 +++++++-------- .../Tests/Coupon/CouponRuleCollectionTest.php | 58 +++++++++---------- .../Tests/Coupon/Type/RemoveXAmountTest.php | 2 +- .../Tests/Coupon/Type/RemoveXPercentTest.php | 6 +- 4 files changed, 56 insertions(+), 56 deletions(-) diff --git a/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php b/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php index c4006be0d..bbcae5196 100644 --- a/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php +++ b/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php @@ -203,29 +203,29 @@ class CouponFactoryTest extends \PHPUnit_Framework_TestCase */ 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; +// $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; } /** diff --git a/core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php b/core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php index e1ad4ecdd..49f1cf322 100644 --- a/core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php +++ b/core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php @@ -46,34 +46,34 @@ class CouponRuleCollectionTest extends \PHPUnit_Framework_TestCase */ 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); +// $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); } } diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php index 480e88305..df7912786 100644 --- a/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php @@ -29,7 +29,7 @@ use Thelia\Constraint\Rule\AvailableForTotalAmountManager; use Thelia\Constraint\Rule\Operators; use Thelia\Coupon\Type\RemoveXAmountManager; -require_once '../CouponManagerTest.php'; +//require_once '../CouponManagerTest.php'; /** * Created by JetBrains PhpStorm. diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php index a7448aa30..3df6b7d43 100644 --- a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php @@ -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. From 0fb331a5cbdeabc2a4025a67b71e865b03934656 Mon Sep 17 00:00:00 2001 From: gmorel Date: Mon, 9 Sep 2013 16:59:53 +0200 Subject: [PATCH 025/212] WIP - Coupon - unit test : no more fatal but some skipped/incomplete --- core/lib/Thelia/Constraint/Rule/Operators.php | 4 +- .../Rule/AvailableForXArticlesTest.php | 56 +- .../Tests/Constraint/Rule/OperatorsTest.php | 8 + .../Validator/CustomerParamTest.php | 198 +-- .../Constraint/Validator/DateParamTest.php | 217 +-- .../Constraint/Validator/IntegerParamTest.php | 219 +-- .../Validator/IntervalParamTest.php | 269 +-- .../Constraint/Validator/PriceParamTest.php | 375 ++-- .../Validator/QuantityParamTest.php | 291 ++-- .../Validator/RepeatedDateParamTest.php | 519 +++--- .../Validator/RepeatedIntervalParamTest.php | 755 ++++---- .../Tests/Coupon/CouponBaseAdapterTest.php | 113 +- .../Thelia/Tests/Coupon/CouponFactoryTest.php | 575 +++---- .../Thelia/Tests/Coupon/CouponManagerTest.php | 1513 +++++++++-------- .../Tests/Coupon/CouponRuleCollectionTest.php | 73 +- .../Tests/Coupon/Type/RemoveXAmountTest.php | 659 +++---- .../Type/RemoveXPercentForCategoryYTest.php | 41 +- .../Tests/Coupon/Type/RemoveXPercentTest.php | 801 ++++----- 18 files changed, 3400 insertions(+), 3286 deletions(-) diff --git a/core/lib/Thelia/Constraint/Rule/Operators.php b/core/lib/Thelia/Constraint/Rule/Operators.php index 237c6a5e0..41640810c 100644 --- a/core/lib/Thelia/Constraint/Rule/Operators.php +++ b/core/lib/Thelia/Constraint/Rule/Operators.php @@ -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 diff --git a/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php index 3247e4b9a..cc5caee2a 100644 --- a/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php +++ b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php @@ -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); +// +// } /** diff --git a/core/lib/Thelia/Tests/Constraint/Rule/OperatorsTest.php b/core/lib/Thelia/Tests/Constraint/Rule/OperatorsTest.php index 01d753201..c86e827b6 100644 --- a/core/lib/Thelia/Tests/Constraint/Rule/OperatorsTest.php +++ b/core/lib/Thelia/Tests/Constraint/Rule/OperatorsTest.php @@ -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 diff --git a/core/lib/Thelia/Tests/Constraint/Validator/CustomerParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/CustomerParamTest.php index 2cdec7846..afb7b8c80 100644 --- a/core/lib/Thelia/Tests/Constraint/Validator/CustomerParamTest.php +++ b/core/lib/Thelia/Tests/Constraint/Validator/CustomerParamTest.php @@ -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() - { - } - } diff --git a/core/lib/Thelia/Tests/Constraint/Validator/DateParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/DateParamTest.php index 45b7f00ae..53a5c70eb 100644 --- a/core/lib/Thelia/Tests/Constraint/Validator/DateParamTest.php +++ b/core/lib/Thelia/Tests/Constraint/Validator/DateParamTest.php @@ -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() +// { +// } } diff --git a/core/lib/Thelia/Tests/Constraint/Validator/IntegerParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/IntegerParamTest.php index 0c7184dde..edf71b138 100644 --- a/core/lib/Thelia/Tests/Constraint/Validator/IntegerParamTest.php +++ b/core/lib/Thelia/Tests/Constraint/Validator/IntegerParamTest.php @@ -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() +// { +// } } diff --git a/core/lib/Thelia/Tests/Constraint/Validator/IntervalParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/IntervalParamTest.php index 77abdbe24..e98c5f719 100644 --- a/core/lib/Thelia/Tests/Constraint/Validator/IntervalParamTest.php +++ b/core/lib/Thelia/Tests/Constraint/Validator/IntervalParamTest.php @@ -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() +// { +// } } diff --git a/core/lib/Thelia/Tests/Constraint/Validator/PriceParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/PriceParamTest.php index 1cdee6bd2..4eb04a77e 100644 --- a/core/lib/Thelia/Tests/Constraint/Validator/PriceParamTest.php +++ b/core/lib/Thelia/Tests/Constraint/Validator/PriceParamTest.php @@ -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() +// { +// } } diff --git a/core/lib/Thelia/Tests/Constraint/Validator/QuantityParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/QuantityParamTest.php index 198e6e611..afcc62f6e 100644 --- a/core/lib/Thelia/Tests/Constraint/Validator/QuantityParamTest.php +++ b/core/lib/Thelia/Tests/Constraint/Validator/QuantityParamTest.php @@ -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() +// { +// } } diff --git a/core/lib/Thelia/Tests/Constraint/Validator/RepeatedDateParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/RepeatedDateParamTest.php index 875453666..677117348 100644 --- a/core/lib/Thelia/Tests/Constraint/Validator/RepeatedDateParamTest.php +++ b/core/lib/Thelia/Tests/Constraint/Validator/RepeatedDateParamTest.php @@ -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() +// { +// } } diff --git a/core/lib/Thelia/Tests/Constraint/Validator/RepeatedIntervalParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/RepeatedIntervalParamTest.php index 2b3bd00c8..513e85836 100644 --- a/core/lib/Thelia/Tests/Constraint/Validator/RepeatedIntervalParamTest.php +++ b/core/lib/Thelia/Tests/Constraint/Validator/RepeatedIntervalParamTest.php @@ -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() +// { +// } } diff --git a/core/lib/Thelia/Tests/Coupon/CouponBaseAdapterTest.php b/core/lib/Thelia/Tests/Coupon/CouponBaseAdapterTest.php index 78fd5e74f..45f097a77 100644 --- a/core/lib/Thelia/Tests/Coupon/CouponBaseAdapterTest.php +++ b/core/lib/Thelia/Tests/Coupon/CouponBaseAdapterTest.php @@ -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.' +// ); +// } } diff --git a/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php b/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php index bbcae5196..261f0e100 100644 --- a/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php +++ b/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php @@ -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)); +// /** +// * Sets up the fixture, for example, opens a network connection. +// * This method is called before a test is executed. +// */ +// protected function setUp() +// { +// } // -// 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() - { - } +// /** +// * 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() +// { +// } } diff --git a/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php b/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php index 62d091ff4..5a3d7881f 100644 --- a/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php +++ b/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php @@ -44,761 +44,768 @@ use Thelia\Tools\PhpUnitUtils; */ class CouponManagerTest extends \PHPUnit_Framework_TestCase { - CONST VALID_CODE = 'XMAS'; - CONST VALID_TITLE = 'XMAS coupon'; - CONST VALID_SHORT_DESCRIPTION = 'Coupon for Christmas removing 10€ if your total checkout is more than 40€'; - CONST VALID_DESCRIPTION = '

    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.'; - - /** - * 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 getDiscount() behaviour - * Entering : 1 valid Coupon (If 40 < total amount 400) - 10euros - * - * @covers Thelia\Coupon\CouponManager::getDiscount - */ - public function testGetDiscountOneCoupon() - { - $cartTotalPrice = 100.00; - $checkoutTotalPrice = 120.00; - - /** @var CouponInterface $coupon */ - $coupon = self::generateValidCoupon(); - - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter(array($coupon), $cartTotalPrice, $checkoutTotalPrice); - - $couponManager = new CouponManager($stubCouponBaseAdapter); - $discount = $couponManager->getDiscount(); - - $expected = 10.00; - $actual = $discount; - $this->assertEquals($expected, $actual); - } - - /** - * Test getDiscount() behaviour - * Entering : 1 valid Coupon (If 40 < total amount 400) - 10euros - * 1 valid Coupon (If total amount > 20) - 15euros - * - * @covers Thelia\Coupon\CouponManager::getDiscount - */ - public function testGetDiscountTwoCoupon() - { - $adapter = new CouponBaseAdapter(); - $cartTotalPrice = 100.00; - $checkoutTotalPrice = 120.00; - - /** @var CouponInterface $coupon1 */ - $coupon1 = self::generateValidCoupon(); - $rule1 = new AvailableForTotalAmount( - $adapter, array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::SUPERIOR, - new PriceParam( - $adapter, 40.00, 'EUR' - ) - ) - ) + // Stop here and mark this test as incomplete. + $this->markTestIncomplete( + 'This test has not been implemented yet.' ); - $rules = new CouponRuleCollection(array($rule1)); - /** @var CouponInterface $coupon2 */ - $coupon2 = $this->generateValidCoupon('XMAS2', null, null, null, 15.00, null, null, $rules); - - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter(array($coupon1, $coupon2), $cartTotalPrice, $checkoutTotalPrice); - - $couponManager = new CouponManager($stubCouponBaseAdapter); - $discount = $couponManager->getDiscount(); - - $expected = 25.00; - $actual = $discount; - $this->assertEquals($expected, $actual); - } - - /** - * Test getDiscount() behaviour - * For a Cart of 21euros - * Entering : 1 valid Coupon (If total amount > 20) - 30euros - * - * @covers Thelia\Coupon\CouponManager::getDiscount - */ - public function testGetDiscountAlwaysInferiorToPrice() - { - $adapter = new CouponBaseAdapter(); - $cartTotalPrice = 21.00; - $checkoutTotalPrice = 26.00; - - $rule1 = new AvailableForTotalAmount( - $adapter, array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::SUPERIOR, - new PriceParam( - $adapter, 20.00, 'EUR' - ) - ) - ) - ); - $rules = new CouponRuleCollection(array($rule1)); - /** @var CouponInterface $coupon */ - $coupon = $this->generateValidCoupon('XMAS2', null, null, null, 30.00, null, null, $rules); - - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter(array($coupon), $cartTotalPrice, $checkoutTotalPrice); - - $couponManager = new CouponManager($stubCouponBaseAdapter); - $discount = $couponManager->getDiscount(); - - $expected = 21.00; - $actual = $discount; - $this->assertEquals($expected, $actual); - } - - - /** - * Check if removing postage on discout is working - * @covers Thelia\Coupon\CouponManager::isCouponRemovingPostage - * @covers Thelia\Coupon\CouponManager::sortCoupons - */ - public function testIsCouponRemovingPostage() - { - $adapter = new CouponBaseAdapter(); - $cartTotalPrice = 21.00; - $checkoutTotalPrice = 27.00; - - $rule1 = new AvailableForTotalAmount( - $adapter, array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::SUPERIOR, - new PriceParam( - $adapter, 20.00, 'EUR' - ) - ) - ) - ); - $rules = new CouponRuleCollection(array($rule1)); - /** @var CouponInterface $coupon */ - $coupon = $this->generateValidCoupon('XMAS2', null, null, null, 30.00, null, null, $rules, null, true); - - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter(array($coupon), $cartTotalPrice, $checkoutTotalPrice); - - $couponManager = new CouponManager($stubCouponBaseAdapter); - $discount = $couponManager->getDiscount(); - - $expected = 21.00; - $actual = $discount; - $this->assertEquals($expected, $actual); - } - - /** - * Testing how multiple Coupon behaviour - * Entering 1 Coupon not cumulative - * - * @covers Thelia\Coupon\CouponManager::sortCoupons - */ - public function testCouponCumulationOneCouponNotCumulative() - { - $cartTotalPrice = 100.00; - $checkoutTotalPrice = 120.00; - - // Given - /** @var CouponInterface $coupon */ - $couponCumulative1 = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false); - - $coupons = array($couponCumulative1); - - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); - - // When - $sortedCoupons = PhpUnitUtils::callMethod( - new CouponManager($stubCouponBaseAdapter), - 'sortCoupons', - array($coupons) - ); - - // Then - $expected = $coupons; - $actual = $sortedCoupons; - - $this->assertSame($expected, $actual, 'Array Sorted despite there is only once'); - } - - /** - * Testing how multiple Coupon behaviour - * Entering 1 Coupon cumulative - * - * @covers Thelia\Coupon\CouponManager::sortCoupons - */ - public function testCouponCumulationOneCouponCumulative() - { - $cartTotalPrice = 100.00; - $checkoutTotalPrice = 120.00; - - // Given - /** @var CouponInterface $coupon */ - $couponCumulative1 = $this->generateValidCoupon(null, null, null, null, null, null, null, null, true); - - $coupons = array($couponCumulative1); - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); - - // When - $sortedCoupons = PhpUnitUtils::callMethod( - new CouponManager($stubCouponBaseAdapter), - 'sortCoupons', - array($coupons) - ); - - // Then - $expected = $coupons; - $actual = $sortedCoupons; - - $this->assertSame($expected, $actual, 'Array Sorted despite there is only once'); - } - - /** - * Testing how multiple Coupon behaviour - * Entering 1 Coupon cumulative - * 1 Coupon cumulative - * - * @covers Thelia\Coupon\CouponManager::sortCoupons - */ - public function testCouponCumulationTwoCouponCumulative() - { - $cartTotalPrice = 100.00; - $checkoutTotalPrice = 120.00; - - // Given - /** @var CouponInterface $coupon */ - $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, true); - $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, true); - - $coupons = array($couponCumulative1, $couponCumulative2); - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); - - // When - $sortedCoupons = PhpUnitUtils::callMethod( - new CouponManager($stubCouponBaseAdapter), - 'sortCoupons', - array($coupons) - ); - - // Then - $expected = $coupons; - $actual = $sortedCoupons; - - $this->assertSame($expected, $actual, 'Array Sorted despite both Coupon can be accumulated'); - } - - /** - * Testing how multiple Coupon behaviour - * Entering 1 Coupon cumulative - * 1 Coupon non cumulative - * - * @covers Thelia\Coupon\CouponManager::sortCoupons - */ - public function testCouponCumulationOneCouponCumulativeOneNonCumulative() - { - $cartTotalPrice = 100.00; - $checkoutTotalPrice = 120.00; - - // Given - /** @var CouponInterface $coupon */ - $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, true); - $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, false); - - $coupons = array($couponCumulative1, $couponCumulative2); - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); - - // When - $sortedCoupons = PhpUnitUtils::callMethod( - new CouponManager($stubCouponBaseAdapter), - 'sortCoupons', - array($coupons) - ); - - // Then - $expected = array($couponCumulative2); - $actual = $sortedCoupons; - - $this->assertSame($expected, $actual, 'Array Sorted despite both Coupon can be accumulated'); - } - - /** - * Testing how multiple Coupon behaviour - * Entering 1 Coupon non cumulative - * 1 Coupon cumulative - * - * @covers Thelia\Coupon\CouponManager::sortCoupons - */ - public function testCouponCumulationOneCouponNonCumulativeOneCumulative() - { - $cartTotalPrice = 100.00; - $checkoutTotalPrice = 120.00; - - // Given - /** @var CouponInterface $coupon */ - $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, false); - $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, true); - - $coupons = array($couponCumulative1, $couponCumulative2); - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); - - // When - $sortedCoupons = PhpUnitUtils::callMethod( - new CouponManager($stubCouponBaseAdapter), - 'sortCoupons', - array($coupons) - ); - - // Then - $expected = array($couponCumulative2); - $actual = $sortedCoupons; - - $this->assertSame($expected, $actual, 'Array Sorted despite both Coupon can be accumulated'); - } - - /** - * Testing how multiple Coupon behaviour - * Entering 1 Coupon non cumulative - * 1 Coupon non cumulative - * - * @covers Thelia\Coupon\CouponManager::sortCoupons - */ - public function testCouponCumulationTwoCouponNonCumulative() - { - $cartTotalPrice = 100.00; - $checkoutTotalPrice = 120.00; - - // Given - /** @var CouponInterface $coupon */ - $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, false); - $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, false); - - $coupons = array($couponCumulative1, $couponCumulative2); - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); - - // When - $sortedCoupons = PhpUnitUtils::callMethod( - new CouponManager($stubCouponBaseAdapter), - 'sortCoupons', - array($coupons) - ); - - // Then - $expected = array($couponCumulative2); - $actual = $sortedCoupons; - - $this->assertSame($expected, $actual, 'Array Sorted despite both Coupon can be accumulated'); - } - - /** - * Testing how multiple Coupon behaviour - * Entering 1 Coupon cumulative expired - * - * @covers Thelia\Coupon\CouponManager::sortCoupons - */ - public function testCouponCumulationOneCouponCumulativeExpired() - { - $cartTotalPrice = 100.00; - $checkoutTotalPrice = 120.00; - - // Given - /** @var CouponInterface $coupon */ - $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, new \DateTime(), null, true); - - $coupons = array($couponCumulative1); - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); - - // When - $sortedCoupons = PhpUnitUtils::callMethod( - new CouponManager($stubCouponBaseAdapter), - 'sortCoupons', - array($coupons) - ); - - // Then - $expected = array(); - $actual = $sortedCoupons; - - $this->assertSame($expected, $actual, 'Coupon expired ignored'); - } - - /** - * Testing how multiple Coupon behaviour - * Entering 1 Coupon cumulative expired - * 1 Coupon cumulative expired - * - * @covers Thelia\Coupon\CouponManager::sortCoupons - */ - public function testCouponCumulationTwoCouponCumulativeExpired() - { - $cartTotalPrice = 100.00; - $checkoutTotalPrice = 120.00; - - // Given - /** @var CouponInterface $coupon */ - $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, new \DateTime(), null, true); - $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, new \DateTime(), null, true); - - $coupons = array($couponCumulative1, $couponCumulative2); - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); - - // When - $sortedCoupons = PhpUnitUtils::callMethod( - new CouponManager($stubCouponBaseAdapter), - 'sortCoupons', - array($coupons) - ); - - // Then - $expected = array(); - $actual = $sortedCoupons; - - $this->assertSame($expected, $actual, 'Coupon expired ignored'); - } - - /** - * Testing how multiple Coupon behaviour - * Entering 1 Coupon cumulative expired - * 1 Coupon cumulative valid - * - * @covers Thelia\Coupon\CouponManager::sortCoupons - */ - public function testCouponCumulationOneCouponCumulativeExpiredOneNonExpired() - { - $cartTotalPrice = 100.00; - $checkoutTotalPrice = 120.00; - - // Given - /** @var CouponInterface $coupon */ - $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, new \DateTime(), null, true); - $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, true); - - $coupons = array($couponCumulative1, $couponCumulative2); - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); - - // When - $sortedCoupons = PhpUnitUtils::callMethod( - new CouponManager($stubCouponBaseAdapter), - 'sortCoupons', - array($coupons) - ); - - // Then - $expected = array($couponCumulative2); - $actual = $sortedCoupons; - - $this->assertSame($expected, $actual, 'Coupon expired ignored'); - } - - /** - * Testing how multiple Coupon behaviour - * Entering 1 Coupon cumulative valid - * 1 Coupon cumulative expired - * - * @covers Thelia\Coupon\CouponManager::sortCoupons - */ - public function testCouponCumulationOneCouponCumulativeNonExpiredOneExpired() - { - $cartTotalPrice = 100.00; - $checkoutTotalPrice = 120.00; - - // Given - /** @var CouponInterface $coupon */ - $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, true); - $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, new \DateTime(), null, true); - - $coupons = array($couponCumulative1, $couponCumulative2); - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); - - // When - $sortedCoupons = PhpUnitUtils::callMethod( - new CouponManager($stubCouponBaseAdapter), - 'sortCoupons', - array($coupons) - ); - - // Then - $expected = array($couponCumulative1); - $actual = $sortedCoupons; - - $this->assertSame($expected, $actual, 'Coupon expired ignored'); - } - - /** - * Testing how multiple Coupon behaviour - * Entering 1 Coupon cumulative valid - * 1 Coupon cumulative valid - * 1 Coupon cumulative valid - * 1 Coupon cumulative valid - * - * @covers Thelia\Coupon\CouponManager::sortCoupons - */ - public function testCouponCumulationFourCouponCumulative() - { - $cartTotalPrice = 100.00; - $checkoutTotalPrice = 120.00; - - // Given - /** @var CouponInterface $coupon */ - $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, true); - $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, true); - $couponCumulative3 = $this->generateValidCoupon('XMAS3', null, null, null, null, null, null, null, true); - $couponCumulative4 = $this->generateValidCoupon('XMAS4', null, null, null, null, null, null, null, true); - - $coupons = array($couponCumulative1, $couponCumulative2, $couponCumulative3, $couponCumulative4); - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); - - // When - $sortedCoupons = PhpUnitUtils::callMethod( - new CouponManager($stubCouponBaseAdapter), - 'sortCoupons', - array($coupons) - ); - - // Then - $expected = $coupons; - $actual = $sortedCoupons; - - $this->assertSame($expected, $actual, 'Coupon cumulative ignored'); - } - - /** - * Testing how multiple Coupon behaviour - * Entering 1 Coupon cumulative valid - * 1 Coupon cumulative valid - * 1 Coupon cumulative valid - * 1 Coupon non cumulative valid - * - * @covers Thelia\Coupon\CouponManager::sortCoupons - */ - public function testCouponCumulationThreeCouponCumulativeOneNonCumulative() - { - $cartTotalPrice = 100.00; - $checkoutTotalPrice = 120.00; - - // Given - /** @var CouponInterface $coupon */ - $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, true); - $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, true); - $couponCumulative3 = $this->generateValidCoupon('XMAS3', null, null, null, null, null, null, null, true); - $couponCumulative4 = $this->generateValidCoupon('XMAS4', null, null, null, null, null, null, null, false); - - $coupons = array($couponCumulative1, $couponCumulative2, $couponCumulative3, $couponCumulative4); - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); - - // When - $sortedCoupons = PhpUnitUtils::callMethod( - new CouponManager($stubCouponBaseAdapter), - 'sortCoupons', - array($coupons) - ); - - // Then - $expected = array($couponCumulative4); - $actual = $sortedCoupons; - - $this->assertSame($expected, $actual, 'Coupon cumulative ignored'); - } - - - /** - * Generate valid CouponRuleInterfaces - * - * @return array Array of CouponRuleInterface - */ - public static function generateValidRules() - { - $adapter = new CouponBaseAdapter(); - $rule1 = new AvailableForTotalAmount( - $adapter, array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::SUPERIOR, - new PriceParam( - $adapter, 40.00, 'EUR' - ) - ) - ) - ); - $rule2 = new AvailableForTotalAmount( - $adapter, array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::INFERIOR, - new PriceParam( - $adapter, 400.00, 'EUR' - ) - ) - ) - ); - $rules = new CouponRuleCollection(array($rule1, $rule2)); - - return $rules; - } - - /** - * Tears down the fixture, for example, closes a network connection. - * This method is called after a test is executed. - */ - protected function tearDown() - { - } - - /** - * Generate a fake Adapter - * - * @param array $coupons Coupons - * @param float $cartTotalPrice Cart total price - * @param float $checkoutTotalPrice Checkout total price - * @param float $postagePrice Checkout postage price - * - * @return \PHPUnit_Framework_MockObject_MockObject - */ - public function generateFakeAdapter(array $coupons, $cartTotalPrice, $checkoutTotalPrice, $postagePrice = 6.00) - { - $stubCouponBaseAdapter = $this->getMock( - 'Thelia\Coupon\CouponBaseAdapter', - array( - 'getCurrentCoupons', - 'getCartTotalPrice', - 'getCheckoutTotalPrice', - 'getCheckoutPostagePrice' - ), - array() - ); - - $stubCouponBaseAdapter->expects($this->any()) - ->method('getCurrentCoupons') - ->will($this->returnValue(($coupons))); - - // Return Cart product amount = $cartTotalPrice euros - $stubCouponBaseAdapter->expects($this->any()) - ->method('getCartTotalPrice') - ->will($this->returnValue($cartTotalPrice)); - - // Return Checkout amount = $checkoutTotalPrice euros - $stubCouponBaseAdapter->expects($this->any()) - ->method('getCheckoutTotalPrice') - ->will($this->returnValue($checkoutTotalPrice)); - - $stubCouponBaseAdapter->expects($this->any()) - ->method('getCheckoutPostagePrice') - ->will($this->returnValue($postagePrice)); - - return $stubCouponBaseAdapter; - } - - /** - * 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 static function generateValidCoupon( - $code = null, - $title = null, - $shortDescription = null, - $description = null, - $amount = null, - $isEnabled = null, - $expirationDate = null, - $rules = null, - $isCumulative = null, - $isRemovingPostage = null, - $isAvailableOnSpecialOffers = null, - $maxUsage = null - ) { - $adapter = new CouponBaseAdapter(); - if ($code === null) { - $code = self::VALID_CODE; - } - if ($title === null) { - $title = self::VALID_TITLE; - } - if ($shortDescription === null) { - $shortDescription = self::VALID_SHORT_DESCRIPTION; - } - if ($description === null) { - $description = self::VALID_DESCRIPTION; - } - if ($amount === null) { - $amount = 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 RemoveXAmount($adapter, $code, $title, $shortDescription, $description, $amount, $isCumulative, $isRemovingPostage, $isAvailableOnSpecialOffers, $isEnabled, $maxUsage, $expirationDate); - - if ($rules === null) { - $rules = self::generateValidRules(); - } - - $coupon->setRules($rules); - - return $coupon; } +// CONST VALID_CODE = 'XMAS'; +// CONST VALID_TITLE = 'XMAS coupon'; +// CONST VALID_SHORT_DESCRIPTION = 'Coupon for Christmas removing 10€ if your total checkout is more than 40€'; +// CONST VALID_DESCRIPTION = '

    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.'; +// +// /** +// * Sets up the fixture, for example, opens a network connection. +// * This method is called before a test is executed. +// */ +// protected function setUp() +// { +// } +// +// /** +// * Test getDiscount() behaviour +// * Entering : 1 valid Coupon (If 40 < total amount 400) - 10euros +// * +// * @covers Thelia\Coupon\CouponManager::getDiscount +// */ +// public function testGetDiscountOneCoupon() +// { +// $cartTotalPrice = 100.00; +// $checkoutTotalPrice = 120.00; +// +// /** @var CouponInterface $coupon */ +// $coupon = self::generateValidCoupon(); +// +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter(array($coupon), $cartTotalPrice, $checkoutTotalPrice); +// +// $couponManager = new CouponManager($stubCouponBaseAdapter); +// $discount = $couponManager->getDiscount(); +// +// $expected = 10.00; +// $actual = $discount; +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * Test getDiscount() behaviour +// * Entering : 1 valid Coupon (If 40 < total amount 400) - 10euros +// * 1 valid Coupon (If total amount > 20) - 15euros +// * +// * @covers Thelia\Coupon\CouponManager::getDiscount +// */ +// public function testGetDiscountTwoCoupon() +// { +// $adapter = new CouponBaseAdapter(); +// $cartTotalPrice = 100.00; +// $checkoutTotalPrice = 120.00; +// +// /** @var CouponInterface $coupon1 */ +// $coupon1 = self::generateValidCoupon(); +// $rule1 = new AvailableForTotalAmount( +// $adapter, array( +// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( +// Operators::SUPERIOR, +// new PriceParam( +// $adapter, 40.00, 'EUR' +// ) +// ) +// ) +// ); +// $rules = new CouponRuleCollection(array($rule1)); +// /** @var CouponInterface $coupon2 */ +// $coupon2 = $this->generateValidCoupon('XMAS2', null, null, null, 15.00, null, null, $rules); +// +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter(array($coupon1, $coupon2), $cartTotalPrice, $checkoutTotalPrice); +// +// $couponManager = new CouponManager($stubCouponBaseAdapter); +// $discount = $couponManager->getDiscount(); +// +// $expected = 25.00; +// $actual = $discount; +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * Test getDiscount() behaviour +// * For a Cart of 21euros +// * Entering : 1 valid Coupon (If total amount > 20) - 30euros +// * +// * @covers Thelia\Coupon\CouponManager::getDiscount +// */ +// public function testGetDiscountAlwaysInferiorToPrice() +// { +// $adapter = new CouponBaseAdapter(); +// $cartTotalPrice = 21.00; +// $checkoutTotalPrice = 26.00; +// +// $rule1 = new AvailableForTotalAmount( +// $adapter, array( +// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( +// Operators::SUPERIOR, +// new PriceParam( +// $adapter, 20.00, 'EUR' +// ) +// ) +// ) +// ); +// $rules = new CouponRuleCollection(array($rule1)); +// /** @var CouponInterface $coupon */ +// $coupon = $this->generateValidCoupon('XMAS2', null, null, null, 30.00, null, null, $rules); +// +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter(array($coupon), $cartTotalPrice, $checkoutTotalPrice); +// +// $couponManager = new CouponManager($stubCouponBaseAdapter); +// $discount = $couponManager->getDiscount(); +// +// $expected = 21.00; +// $actual = $discount; +// $this->assertEquals($expected, $actual); +// } +// +// +// /** +// * Check if removing postage on discout is working +// * @covers Thelia\Coupon\CouponManager::isCouponRemovingPostage +// * @covers Thelia\Coupon\CouponManager::sortCoupons +// */ +// public function testIsCouponRemovingPostage() +// { +// $adapter = new CouponBaseAdapter(); +// $cartTotalPrice = 21.00; +// $checkoutTotalPrice = 27.00; +// +// $rule1 = new AvailableForTotalAmount( +// $adapter, array( +// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( +// Operators::SUPERIOR, +// new PriceParam( +// $adapter, 20.00, 'EUR' +// ) +// ) +// ) +// ); +// $rules = new CouponRuleCollection(array($rule1)); +// /** @var CouponInterface $coupon */ +// $coupon = $this->generateValidCoupon('XMAS2', null, null, null, 30.00, null, null, $rules, null, true); +// +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter(array($coupon), $cartTotalPrice, $checkoutTotalPrice); +// +// $couponManager = new CouponManager($stubCouponBaseAdapter); +// $discount = $couponManager->getDiscount(); +// +// $expected = 21.00; +// $actual = $discount; +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * Testing how multiple Coupon behaviour +// * Entering 1 Coupon not cumulative +// * +// * @covers Thelia\Coupon\CouponManager::sortCoupons +// */ +// public function testCouponCumulationOneCouponNotCumulative() +// { +// $cartTotalPrice = 100.00; +// $checkoutTotalPrice = 120.00; +// +// // Given +// /** @var CouponInterface $coupon */ +// $couponCumulative1 = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false); +// +// $coupons = array($couponCumulative1); +// +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); +// +// // When +// $sortedCoupons = PhpUnitUtils::callMethod( +// new CouponManager($stubCouponBaseAdapter), +// 'sortCoupons', +// array($coupons) +// ); +// +// // Then +// $expected = $coupons; +// $actual = $sortedCoupons; +// +// $this->assertSame($expected, $actual, 'Array Sorted despite there is only once'); +// } +// +// /** +// * Testing how multiple Coupon behaviour +// * Entering 1 Coupon cumulative +// * +// * @covers Thelia\Coupon\CouponManager::sortCoupons +// */ +// public function testCouponCumulationOneCouponCumulative() +// { +// $cartTotalPrice = 100.00; +// $checkoutTotalPrice = 120.00; +// +// // Given +// /** @var CouponInterface $coupon */ +// $couponCumulative1 = $this->generateValidCoupon(null, null, null, null, null, null, null, null, true); +// +// $coupons = array($couponCumulative1); +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); +// +// // When +// $sortedCoupons = PhpUnitUtils::callMethod( +// new CouponManager($stubCouponBaseAdapter), +// 'sortCoupons', +// array($coupons) +// ); +// +// // Then +// $expected = $coupons; +// $actual = $sortedCoupons; +// +// $this->assertSame($expected, $actual, 'Array Sorted despite there is only once'); +// } +// +// /** +// * Testing how multiple Coupon behaviour +// * Entering 1 Coupon cumulative +// * 1 Coupon cumulative +// * +// * @covers Thelia\Coupon\CouponManager::sortCoupons +// */ +// public function testCouponCumulationTwoCouponCumulative() +// { +// $cartTotalPrice = 100.00; +// $checkoutTotalPrice = 120.00; +// +// // Given +// /** @var CouponInterface $coupon */ +// $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, true); +// $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, true); +// +// $coupons = array($couponCumulative1, $couponCumulative2); +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); +// +// // When +// $sortedCoupons = PhpUnitUtils::callMethod( +// new CouponManager($stubCouponBaseAdapter), +// 'sortCoupons', +// array($coupons) +// ); +// +// // Then +// $expected = $coupons; +// $actual = $sortedCoupons; +// +// $this->assertSame($expected, $actual, 'Array Sorted despite both Coupon can be accumulated'); +// } +// +// /** +// * Testing how multiple Coupon behaviour +// * Entering 1 Coupon cumulative +// * 1 Coupon non cumulative +// * +// * @covers Thelia\Coupon\CouponManager::sortCoupons +// */ +// public function testCouponCumulationOneCouponCumulativeOneNonCumulative() +// { +// $cartTotalPrice = 100.00; +// $checkoutTotalPrice = 120.00; +// +// // Given +// /** @var CouponInterface $coupon */ +// $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, true); +// $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, false); +// +// $coupons = array($couponCumulative1, $couponCumulative2); +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); +// +// // When +// $sortedCoupons = PhpUnitUtils::callMethod( +// new CouponManager($stubCouponBaseAdapter), +// 'sortCoupons', +// array($coupons) +// ); +// +// // Then +// $expected = array($couponCumulative2); +// $actual = $sortedCoupons; +// +// $this->assertSame($expected, $actual, 'Array Sorted despite both Coupon can be accumulated'); +// } +// +// /** +// * Testing how multiple Coupon behaviour +// * Entering 1 Coupon non cumulative +// * 1 Coupon cumulative +// * +// * @covers Thelia\Coupon\CouponManager::sortCoupons +// */ +// public function testCouponCumulationOneCouponNonCumulativeOneCumulative() +// { +// $cartTotalPrice = 100.00; +// $checkoutTotalPrice = 120.00; +// +// // Given +// /** @var CouponInterface $coupon */ +// $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, false); +// $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, true); +// +// $coupons = array($couponCumulative1, $couponCumulative2); +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); +// +// // When +// $sortedCoupons = PhpUnitUtils::callMethod( +// new CouponManager($stubCouponBaseAdapter), +// 'sortCoupons', +// array($coupons) +// ); +// +// // Then +// $expected = array($couponCumulative2); +// $actual = $sortedCoupons; +// +// $this->assertSame($expected, $actual, 'Array Sorted despite both Coupon can be accumulated'); +// } +// +// /** +// * Testing how multiple Coupon behaviour +// * Entering 1 Coupon non cumulative +// * 1 Coupon non cumulative +// * +// * @covers Thelia\Coupon\CouponManager::sortCoupons +// */ +// public function testCouponCumulationTwoCouponNonCumulative() +// { +// $cartTotalPrice = 100.00; +// $checkoutTotalPrice = 120.00; +// +// // Given +// /** @var CouponInterface $coupon */ +// $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, false); +// $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, false); +// +// $coupons = array($couponCumulative1, $couponCumulative2); +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); +// +// // When +// $sortedCoupons = PhpUnitUtils::callMethod( +// new CouponManager($stubCouponBaseAdapter), +// 'sortCoupons', +// array($coupons) +// ); +// +// // Then +// $expected = array($couponCumulative2); +// $actual = $sortedCoupons; +// +// $this->assertSame($expected, $actual, 'Array Sorted despite both Coupon can be accumulated'); +// } +// +// /** +// * Testing how multiple Coupon behaviour +// * Entering 1 Coupon cumulative expired +// * +// * @covers Thelia\Coupon\CouponManager::sortCoupons +// */ +// public function testCouponCumulationOneCouponCumulativeExpired() +// { +// $cartTotalPrice = 100.00; +// $checkoutTotalPrice = 120.00; +// +// // Given +// /** @var CouponInterface $coupon */ +// $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, new \DateTime(), null, true); +// +// $coupons = array($couponCumulative1); +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); +// +// // When +// $sortedCoupons = PhpUnitUtils::callMethod( +// new CouponManager($stubCouponBaseAdapter), +// 'sortCoupons', +// array($coupons) +// ); +// +// // Then +// $expected = array(); +// $actual = $sortedCoupons; +// +// $this->assertSame($expected, $actual, 'Coupon expired ignored'); +// } +// +// /** +// * Testing how multiple Coupon behaviour +// * Entering 1 Coupon cumulative expired +// * 1 Coupon cumulative expired +// * +// * @covers Thelia\Coupon\CouponManager::sortCoupons +// */ +// public function testCouponCumulationTwoCouponCumulativeExpired() +// { +// $cartTotalPrice = 100.00; +// $checkoutTotalPrice = 120.00; +// +// // Given +// /** @var CouponInterface $coupon */ +// $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, new \DateTime(), null, true); +// $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, new \DateTime(), null, true); +// +// $coupons = array($couponCumulative1, $couponCumulative2); +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); +// +// // When +// $sortedCoupons = PhpUnitUtils::callMethod( +// new CouponManager($stubCouponBaseAdapter), +// 'sortCoupons', +// array($coupons) +// ); +// +// // Then +// $expected = array(); +// $actual = $sortedCoupons; +// +// $this->assertSame($expected, $actual, 'Coupon expired ignored'); +// } +// +// /** +// * Testing how multiple Coupon behaviour +// * Entering 1 Coupon cumulative expired +// * 1 Coupon cumulative valid +// * +// * @covers Thelia\Coupon\CouponManager::sortCoupons +// */ +// public function testCouponCumulationOneCouponCumulativeExpiredOneNonExpired() +// { +// $cartTotalPrice = 100.00; +// $checkoutTotalPrice = 120.00; +// +// // Given +// /** @var CouponInterface $coupon */ +// $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, new \DateTime(), null, true); +// $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, true); +// +// $coupons = array($couponCumulative1, $couponCumulative2); +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); +// +// // When +// $sortedCoupons = PhpUnitUtils::callMethod( +// new CouponManager($stubCouponBaseAdapter), +// 'sortCoupons', +// array($coupons) +// ); +// +// // Then +// $expected = array($couponCumulative2); +// $actual = $sortedCoupons; +// +// $this->assertSame($expected, $actual, 'Coupon expired ignored'); +// } +// +// /** +// * Testing how multiple Coupon behaviour +// * Entering 1 Coupon cumulative valid +// * 1 Coupon cumulative expired +// * +// * @covers Thelia\Coupon\CouponManager::sortCoupons +// */ +// public function testCouponCumulationOneCouponCumulativeNonExpiredOneExpired() +// { +// $cartTotalPrice = 100.00; +// $checkoutTotalPrice = 120.00; +// +// // Given +// /** @var CouponInterface $coupon */ +// $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, true); +// $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, new \DateTime(), null, true); +// +// $coupons = array($couponCumulative1, $couponCumulative2); +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); +// +// // When +// $sortedCoupons = PhpUnitUtils::callMethod( +// new CouponManager($stubCouponBaseAdapter), +// 'sortCoupons', +// array($coupons) +// ); +// +// // Then +// $expected = array($couponCumulative1); +// $actual = $sortedCoupons; +// +// $this->assertSame($expected, $actual, 'Coupon expired ignored'); +// } +// +// /** +// * Testing how multiple Coupon behaviour +// * Entering 1 Coupon cumulative valid +// * 1 Coupon cumulative valid +// * 1 Coupon cumulative valid +// * 1 Coupon cumulative valid +// * +// * @covers Thelia\Coupon\CouponManager::sortCoupons +// */ +// public function testCouponCumulationFourCouponCumulative() +// { +// $cartTotalPrice = 100.00; +// $checkoutTotalPrice = 120.00; +// +// // Given +// /** @var CouponInterface $coupon */ +// $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, true); +// $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, true); +// $couponCumulative3 = $this->generateValidCoupon('XMAS3', null, null, null, null, null, null, null, true); +// $couponCumulative4 = $this->generateValidCoupon('XMAS4', null, null, null, null, null, null, null, true); +// +// $coupons = array($couponCumulative1, $couponCumulative2, $couponCumulative3, $couponCumulative4); +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); +// +// // When +// $sortedCoupons = PhpUnitUtils::callMethod( +// new CouponManager($stubCouponBaseAdapter), +// 'sortCoupons', +// array($coupons) +// ); +// +// // Then +// $expected = $coupons; +// $actual = $sortedCoupons; +// +// $this->assertSame($expected, $actual, 'Coupon cumulative ignored'); +// } +// +// /** +// * Testing how multiple Coupon behaviour +// * Entering 1 Coupon cumulative valid +// * 1 Coupon cumulative valid +// * 1 Coupon cumulative valid +// * 1 Coupon non cumulative valid +// * +// * @covers Thelia\Coupon\CouponManager::sortCoupons +// */ +// public function testCouponCumulationThreeCouponCumulativeOneNonCumulative() +// { +// $cartTotalPrice = 100.00; +// $checkoutTotalPrice = 120.00; +// +// // Given +// /** @var CouponInterface $coupon */ +// $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, true); +// $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, true); +// $couponCumulative3 = $this->generateValidCoupon('XMAS3', null, null, null, null, null, null, null, true); +// $couponCumulative4 = $this->generateValidCoupon('XMAS4', null, null, null, null, null, null, null, false); +// +// $coupons = array($couponCumulative1, $couponCumulative2, $couponCumulative3, $couponCumulative4); +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); +// +// // When +// $sortedCoupons = PhpUnitUtils::callMethod( +// new CouponManager($stubCouponBaseAdapter), +// 'sortCoupons', +// array($coupons) +// ); +// +// // Then +// $expected = array($couponCumulative4); +// $actual = $sortedCoupons; +// +// $this->assertSame($expected, $actual, 'Coupon cumulative ignored'); +// } +// +// +// /** +// * Generate valid CouponRuleInterfaces +// * +// * @return array Array of CouponRuleInterface +// */ +// public static function generateValidRules() +// { +// $adapter = new CouponBaseAdapter(); +// $rule1 = new AvailableForTotalAmount( +// $adapter, array( +// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( +// Operators::SUPERIOR, +// new PriceParam( +// $adapter, 40.00, 'EUR' +// ) +// ) +// ) +// ); +// $rule2 = new AvailableForTotalAmount( +// $adapter, array( +// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( +// Operators::INFERIOR, +// new PriceParam( +// $adapter, 400.00, 'EUR' +// ) +// ) +// ) +// ); +// $rules = new CouponRuleCollection(array($rule1, $rule2)); +// +// return $rules; +// } +// +// /** +// * Tears down the fixture, for example, closes a network connection. +// * This method is called after a test is executed. +// */ +// protected function tearDown() +// { +// } +// +// /** +// * Generate a fake Adapter +// * +// * @param array $coupons Coupons +// * @param float $cartTotalPrice Cart total price +// * @param float $checkoutTotalPrice Checkout total price +// * @param float $postagePrice Checkout postage price +// * +// * @return \PHPUnit_Framework_MockObject_MockObject +// */ +// public function generateFakeAdapter(array $coupons, $cartTotalPrice, $checkoutTotalPrice, $postagePrice = 6.00) +// { +// $stubCouponBaseAdapter = $this->getMock( +// 'Thelia\Coupon\CouponBaseAdapter', +// array( +// 'getCurrentCoupons', +// 'getCartTotalPrice', +// 'getCheckoutTotalPrice', +// 'getCheckoutPostagePrice' +// ), +// array() +// ); +// +// $stubCouponBaseAdapter->expects($this->any()) +// ->method('getCurrentCoupons') +// ->will($this->returnValue(($coupons))); +// +// // Return Cart product amount = $cartTotalPrice euros +// $stubCouponBaseAdapter->expects($this->any()) +// ->method('getCartTotalPrice') +// ->will($this->returnValue($cartTotalPrice)); +// +// // Return Checkout amount = $checkoutTotalPrice euros +// $stubCouponBaseAdapter->expects($this->any()) +// ->method('getCheckoutTotalPrice') +// ->will($this->returnValue($checkoutTotalPrice)); +// +// $stubCouponBaseAdapter->expects($this->any()) +// ->method('getCheckoutPostagePrice') +// ->will($this->returnValue($postagePrice)); +// +// return $stubCouponBaseAdapter; +// } +// +// /** +// * 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 static function generateValidCoupon( +// $code = null, +// $title = null, +// $shortDescription = null, +// $description = null, +// $amount = null, +// $isEnabled = null, +// $expirationDate = null, +// $rules = null, +// $isCumulative = null, +// $isRemovingPostage = null, +// $isAvailableOnSpecialOffers = null, +// $maxUsage = null +// ) { +// $adapter = new CouponBaseAdapter(); +// if ($code === null) { +// $code = self::VALID_CODE; +// } +// if ($title === null) { +// $title = self::VALID_TITLE; +// } +// if ($shortDescription === null) { +// $shortDescription = self::VALID_SHORT_DESCRIPTION; +// } +// if ($description === null) { +// $description = self::VALID_DESCRIPTION; +// } +// if ($amount === null) { +// $amount = 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 RemoveXAmount($adapter, $code, $title, $shortDescription, $description, $amount, $isCumulative, $isRemovingPostage, $isAvailableOnSpecialOffers, $isEnabled, $maxUsage, $expirationDate); +// +// if ($rules === null) { +// $rules = self::generateValidRules(); +// } +// +// $coupon->setRules($rules); +// +// return $coupon; +// } } diff --git a/core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php b/core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php index 49f1cf322..803000779 100644 --- a/core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php +++ b/core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php @@ -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' -// ) -// ) -// ) -// ); -// $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); + // Stop here and mark this test as incomplete. + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); } +// /** +// * +// */ +// 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); +// } } diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php index df7912786..8467852ac 100644 --- a/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php @@ -44,334 +44,341 @@ use Thelia\Coupon\Type\RemoveXAmountManager; */ 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\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 + // 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\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); } +// /** +// * 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); +// } } diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentForCategoryYTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentForCategoryYTest.php index 1ea0c67bb..ac13d4ea0 100644 --- a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentForCategoryYTest.php +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentForCategoryYTest.php @@ -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() +// { +// } } diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php index 3df6b7d43..7fc327df6 100644 --- a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php @@ -47,405 +47,412 @@ use Thelia\Coupon\Type\RemoveXPercentManager; 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\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 + // 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\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() - { } +// /** +// * 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() +// { +// } } From 02d758ae9a0a4d2173109d248512468a40060c94 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Mon, 9 Sep 2013 17:30:18 +0200 Subject: [PATCH 026/212] start integration default template --- .../bootstrap-magnify/bootstrap-magnify.css | 19 + .../bootstrap-magnify.min.css | 1 + .../glyphicons-halflings-regular.eot | Bin 0 -> 14079 bytes .../glyphicons-halflings-regular.svg | 228 ++ .../glyphicons-halflings-regular.ttf | Bin 0 -> 29512 bytes .../glyphicons-halflings-regular.woff | Bin 0 -> 16448 bytes .../font/fontawesome/fontawesome-webfont.eot | Bin 0 -> 37405 bytes .../font/fontawesome/fontawesome-webfont.svg | 399 ++++ .../font/fontawesome/fontawesome-webfont.ttf | Bin 0 -> 79076 bytes .../font/fontawesome/fontawesome-webfont.woff | Bin 0 -> 43572 bytes templates/default/assets/img/218x146.png | Bin 0 -> 2132 bytes templates/default/assets/img/280x196.png | Bin 0 -> 2950 bytes templates/default/assets/img/700x320.png | Bin 0 -> 14846 bytes .../default/assets/img/carousel/1200x390.png | Bin 0 -> 11534 bytes templates/default/assets/img/logo.gif | Bin 0 -> 2159 bytes .../assets/img/payment/american-express.png | Bin 0 -> 3753 bytes .../default/assets/img/payment/cheque.png | Bin 0 -> 4090 bytes .../default/assets/img/payment/kwixo.png | Bin 0 -> 3940 bytes .../default/assets/img/payment/mastercard.png | Bin 0 -> 3733 bytes templates/default/assets/img/payment/visa.png | Bin 0 -> 3158 bytes .../default/assets/img/product/1/118x85.png | Bin 0 -> 1642 bytes .../default/assets/img/product/1/560x445.png | Bin 0 -> 6299 bytes .../default/assets/js/bootstrap/affix.js | 126 ++ .../default/assets/js/bootstrap/alert.js | 98 + .../default/assets/js/bootstrap/button.js | 109 + .../default/assets/js/bootstrap/carousel.js | 217 ++ .../default/assets/js/bootstrap/collapse.js | 179 ++ .../default/assets/js/bootstrap/dropdown.js | 154 ++ .../default/assets/js/bootstrap/modal.js | 246 +++ .../default/assets/js/bootstrap/popover.js | 117 + .../default/assets/js/bootstrap/scrollspy.js | 158 ++ templates/default/assets/js/bootstrap/tab.js | 135 ++ .../default/assets/js/bootstrap/tooltip.js | 386 ++++ .../default/assets/js/bootstrap/transition.js | 56 + templates/default/assets/js/libs/jquery.js | 6 + .../bootstrap-magnify/bootstrap-magnify.js | 120 + .../bootstrap-magnify.min.js | 1 + .../js/plugins/menu-aim/jquery.menu-aim.js | 323 +++ templates/default/assets/js/script.js | 151 ++ .../default/assets/less/bootstrap/alerts.less | 67 + .../default/assets/less/bootstrap/badges.less | 51 + .../assets/less/bootstrap/bootstrap.less | 59 + .../assets/less/bootstrap/breadcrumbs.less | 23 + .../assets/less/bootstrap/button-groups.less | 248 +++ .../assets/less/bootstrap/buttons.less | 160 ++ .../assets/less/bootstrap/carousel.less | 209 ++ .../default/assets/less/bootstrap/close.less | 33 + .../default/assets/less/bootstrap/code.less | 56 + .../less/bootstrap/component-animations.less | 29 + .../assets/less/bootstrap/dropdowns.less | 193 ++ .../default/assets/less/bootstrap/forms.less | 353 +++ .../assets/less/bootstrap/glyphicons.less | 232 ++ .../default/assets/less/bootstrap/grid.less | 346 +++ .../assets/less/bootstrap/input-groups.less | 127 ++ .../assets/less/bootstrap/jumbotron.less | 40 + .../default/assets/less/bootstrap/labels.less | 58 + .../assets/less/bootstrap/list-group.less | 88 + .../default/assets/less/bootstrap/media.less | 56 + .../default/assets/less/bootstrap/mixins.less | 723 ++++++ .../default/assets/less/bootstrap/modals.less | 141 ++ .../default/assets/less/bootstrap/navbar.less | 621 ++++++ .../default/assets/less/bootstrap/navs.less | 229 ++ .../assets/less/bootstrap/normalize.less | 396 ++++ .../default/assets/less/bootstrap/pager.less | 55 + .../assets/less/bootstrap/pagination.less | 83 + .../default/assets/less/bootstrap/panels.less | 148 ++ .../assets/less/bootstrap/popovers.less | 133 ++ .../default/assets/less/bootstrap/print.less | 100 + .../assets/less/bootstrap/progress-bars.less | 95 + .../less/bootstrap/responsive-utilities.less | 220 ++ .../assets/less/bootstrap/scaffolding.less | 130 ++ .../default/assets/less/bootstrap/tables.less | 236 ++ .../default/assets/less/bootstrap/theme.less | 232 ++ .../assets/less/bootstrap/thumbnails.less | 31 + .../assets/less/bootstrap/tooltip.less | 95 + .../default/assets/less/bootstrap/type.less | 238 ++ .../assets/less/bootstrap/utilities.less | 42 + .../assets/less/bootstrap/variables.less | 620 ++++++ .../default/assets/less/bootstrap/wells.less | 29 + .../assets/less/fontawesome/bootstrap.less | 84 + .../default/assets/less/fontawesome/core.less | 129 ++ .../assets/less/fontawesome/extras.less | 93 + .../less/fontawesome/font-awesome-ie7.less | 1953 +++++++++++++++++ .../assets/less/fontawesome/font-awesome.less | 33 + .../assets/less/fontawesome/icons.less | 381 ++++ .../assets/less/fontawesome/mixins.less | 48 + .../default/assets/less/fontawesome/path.less | 14 + .../assets/less/fontawesome/variables.less | 735 +++++++ .../bootstrap-magnify/bootstrap-magnify.less | 20 + templates/default/assets/less/styles.less | 15 + .../default/assets/less/thelia/account.less | 65 + .../default/assets/less/thelia/blocks.less | 253 +++ .../assets/less/thelia/breadcrumbs.less | 10 + .../default/assets/less/thelia/buttons.less | 97 + .../default/assets/less/thelia/cart.less | 72 + .../default/assets/less/thelia/category.less | 126 ++ .../default/assets/less/thelia/checkout.less | 110 + .../default/assets/less/thelia/filters.less | 34 + .../default/assets/less/thelia/footer.less | 75 + .../default/assets/less/thelia/forms.less | 57 + .../default/assets/less/thelia/global.less | 81 + .../default/assets/less/thelia/header.less | 36 + .../default/assets/less/thelia/import.less | 35 + .../default/assets/less/thelia/labels.less | 7 + .../default/assets/less/thelia/navbar.less | 204 ++ .../default/assets/less/thelia/page-home.less | 29 + .../assets/less/thelia/pagination.less | 13 + .../default/assets/less/thelia/panels.less | 48 + .../default/assets/less/thelia/path.less | 14 + .../default/assets/less/thelia/price.less | 46 + .../default/assets/less/thelia/product.less | 109 + .../default/assets/less/thelia/toolbars.less | 43 + .../default/assets/less/thelia/variables.less | 136 ++ .../assets/themes/default/less/import.less | 4 + .../assets/themes/default/less/theme.less | 1170 ++++++++++ .../assets/themes/default/less/variables.less | 115 + templates/default/index.html | 462 ++-- templates/default/layout.tpl | 405 ++++ templates/{default => default_save}/404.html | 0 .../{default => default_save}/address.html | 0 .../address_edit.html | 0 .../address_list.html | 0 .../bootstrap/css/bootstrap-responsive.css | 0 .../css/bootstrap-responsive.min.css | 0 .../assets/bootstrap/css/bootstrap.css | 0 .../assets/bootstrap/css/bootstrap.min.css | 0 .../img/glyphicons-halflings-white.png | Bin .../bootstrap/img/glyphicons-halflings.png | Bin .../assets/bootstrap/js/bootstrap.js | 0 .../assets/bootstrap/js/bootstrap.min.js | 0 .../assets/css/img/bg.jpg | Bin .../assets/css/style.less | 0 .../assets/img/logo-thelia-34px.png | Bin .../assets/img/test-background.jpg | Bin .../assets/js/jquery.min.js | 0 templates/{default => default_save}/cart.html | 0 .../{default => default_save}/category.html | 0 .../{default => default_save}/connexion.html | 0 .../{default => default_save}/customer.html | 0 .../{default => default_save}/debug.html | 0 .../delivery_list.html | 0 .../{default => default_save}/folder.html | 0 .../{default => default_save}/i18n/en.php | 0 .../{default => default_save}/i18n/fr.php | 0 .../{default => default_save}/images.html | 0 .../{default => default_save}/included.html | 0 .../includes/footer.html | 0 .../includes/header.html | 0 templates/default_save/index.html | 151 ++ .../{default => default_save}/login.html | 0 .../{default => default_save}/myaccount.html | 0 .../{default => default_save}/pagination.html | 0 .../{default => default_save}/product.html | 0 .../{default => default_save}/tester.html | 0 154 files changed, 17638 insertions(+), 128 deletions(-) create mode 100755 templates/default/assets/css/plugins/bootstrap-magnify/bootstrap-magnify.css create mode 100755 templates/default/assets/css/plugins/bootstrap-magnify/bootstrap-magnify.min.css create mode 100755 templates/default/assets/font/bootstrap/glyphicons-halflings-regular.eot create mode 100755 templates/default/assets/font/bootstrap/glyphicons-halflings-regular.svg create mode 100755 templates/default/assets/font/bootstrap/glyphicons-halflings-regular.ttf create mode 100755 templates/default/assets/font/bootstrap/glyphicons-halflings-regular.woff create mode 100755 templates/default/assets/font/fontawesome/fontawesome-webfont.eot create mode 100755 templates/default/assets/font/fontawesome/fontawesome-webfont.svg create mode 100755 templates/default/assets/font/fontawesome/fontawesome-webfont.ttf create mode 100755 templates/default/assets/font/fontawesome/fontawesome-webfont.woff create mode 100644 templates/default/assets/img/218x146.png create mode 100644 templates/default/assets/img/280x196.png create mode 100644 templates/default/assets/img/700x320.png create mode 100644 templates/default/assets/img/carousel/1200x390.png create mode 100644 templates/default/assets/img/logo.gif create mode 100644 templates/default/assets/img/payment/american-express.png create mode 100644 templates/default/assets/img/payment/cheque.png create mode 100644 templates/default/assets/img/payment/kwixo.png create mode 100644 templates/default/assets/img/payment/mastercard.png create mode 100644 templates/default/assets/img/payment/visa.png create mode 100644 templates/default/assets/img/product/1/118x85.png create mode 100644 templates/default/assets/img/product/1/560x445.png create mode 100755 templates/default/assets/js/bootstrap/affix.js create mode 100755 templates/default/assets/js/bootstrap/alert.js create mode 100755 templates/default/assets/js/bootstrap/button.js create mode 100755 templates/default/assets/js/bootstrap/carousel.js create mode 100755 templates/default/assets/js/bootstrap/collapse.js create mode 100755 templates/default/assets/js/bootstrap/dropdown.js create mode 100755 templates/default/assets/js/bootstrap/modal.js create mode 100755 templates/default/assets/js/bootstrap/popover.js create mode 100755 templates/default/assets/js/bootstrap/scrollspy.js create mode 100755 templates/default/assets/js/bootstrap/tab.js create mode 100755 templates/default/assets/js/bootstrap/tooltip.js create mode 100755 templates/default/assets/js/bootstrap/transition.js create mode 100644 templates/default/assets/js/libs/jquery.js create mode 100755 templates/default/assets/js/plugins/bootstrap-magnify/bootstrap-magnify.js create mode 100755 templates/default/assets/js/plugins/bootstrap-magnify/bootstrap-magnify.min.js create mode 100755 templates/default/assets/js/plugins/menu-aim/jquery.menu-aim.js create mode 100644 templates/default/assets/js/script.js create mode 100755 templates/default/assets/less/bootstrap/alerts.less create mode 100755 templates/default/assets/less/bootstrap/badges.less create mode 100755 templates/default/assets/less/bootstrap/bootstrap.less create mode 100755 templates/default/assets/less/bootstrap/breadcrumbs.less create mode 100755 templates/default/assets/less/bootstrap/button-groups.less create mode 100755 templates/default/assets/less/bootstrap/buttons.less create mode 100755 templates/default/assets/less/bootstrap/carousel.less create mode 100755 templates/default/assets/less/bootstrap/close.less create mode 100755 templates/default/assets/less/bootstrap/code.less create mode 100755 templates/default/assets/less/bootstrap/component-animations.less create mode 100755 templates/default/assets/less/bootstrap/dropdowns.less create mode 100755 templates/default/assets/less/bootstrap/forms.less create mode 100755 templates/default/assets/less/bootstrap/glyphicons.less create mode 100755 templates/default/assets/less/bootstrap/grid.less create mode 100755 templates/default/assets/less/bootstrap/input-groups.less create mode 100755 templates/default/assets/less/bootstrap/jumbotron.less create mode 100755 templates/default/assets/less/bootstrap/labels.less create mode 100755 templates/default/assets/less/bootstrap/list-group.less create mode 100755 templates/default/assets/less/bootstrap/media.less create mode 100755 templates/default/assets/less/bootstrap/mixins.less create mode 100755 templates/default/assets/less/bootstrap/modals.less create mode 100755 templates/default/assets/less/bootstrap/navbar.less create mode 100755 templates/default/assets/less/bootstrap/navs.less create mode 100755 templates/default/assets/less/bootstrap/normalize.less create mode 100755 templates/default/assets/less/bootstrap/pager.less create mode 100755 templates/default/assets/less/bootstrap/pagination.less create mode 100755 templates/default/assets/less/bootstrap/panels.less create mode 100755 templates/default/assets/less/bootstrap/popovers.less create mode 100755 templates/default/assets/less/bootstrap/print.less create mode 100755 templates/default/assets/less/bootstrap/progress-bars.less create mode 100755 templates/default/assets/less/bootstrap/responsive-utilities.less create mode 100755 templates/default/assets/less/bootstrap/scaffolding.less create mode 100755 templates/default/assets/less/bootstrap/tables.less create mode 100755 templates/default/assets/less/bootstrap/theme.less create mode 100755 templates/default/assets/less/bootstrap/thumbnails.less create mode 100755 templates/default/assets/less/bootstrap/tooltip.less create mode 100755 templates/default/assets/less/bootstrap/type.less create mode 100755 templates/default/assets/less/bootstrap/utilities.less create mode 100755 templates/default/assets/less/bootstrap/variables.less create mode 100755 templates/default/assets/less/bootstrap/wells.less create mode 100644 templates/default/assets/less/fontawesome/bootstrap.less create mode 100644 templates/default/assets/less/fontawesome/core.less create mode 100644 templates/default/assets/less/fontawesome/extras.less create mode 100644 templates/default/assets/less/fontawesome/font-awesome-ie7.less create mode 100644 templates/default/assets/less/fontawesome/font-awesome.less create mode 100644 templates/default/assets/less/fontawesome/icons.less create mode 100644 templates/default/assets/less/fontawesome/mixins.less create mode 100644 templates/default/assets/less/fontawesome/path.less create mode 100644 templates/default/assets/less/fontawesome/variables.less create mode 100755 templates/default/assets/less/plugins/bootstrap-magnify/bootstrap-magnify.less create mode 100755 templates/default/assets/less/styles.less create mode 100644 templates/default/assets/less/thelia/account.less create mode 100755 templates/default/assets/less/thelia/blocks.less create mode 100755 templates/default/assets/less/thelia/breadcrumbs.less create mode 100644 templates/default/assets/less/thelia/buttons.less create mode 100644 templates/default/assets/less/thelia/cart.less create mode 100644 templates/default/assets/less/thelia/category.less create mode 100644 templates/default/assets/less/thelia/checkout.less create mode 100755 templates/default/assets/less/thelia/filters.less create mode 100755 templates/default/assets/less/thelia/footer.less create mode 100755 templates/default/assets/less/thelia/forms.less create mode 100755 templates/default/assets/less/thelia/global.less create mode 100755 templates/default/assets/less/thelia/header.less create mode 100755 templates/default/assets/less/thelia/import.less create mode 100755 templates/default/assets/less/thelia/labels.less create mode 100755 templates/default/assets/less/thelia/navbar.less create mode 100755 templates/default/assets/less/thelia/page-home.less create mode 100755 templates/default/assets/less/thelia/pagination.less create mode 100755 templates/default/assets/less/thelia/panels.less create mode 100644 templates/default/assets/less/thelia/path.less create mode 100755 templates/default/assets/less/thelia/price.less create mode 100755 templates/default/assets/less/thelia/product.less create mode 100755 templates/default/assets/less/thelia/toolbars.less create mode 100755 templates/default/assets/less/thelia/variables.less create mode 100755 templates/default/assets/themes/default/less/import.less create mode 100755 templates/default/assets/themes/default/less/theme.less create mode 100755 templates/default/assets/themes/default/less/variables.less mode change 100755 => 100644 templates/default/index.html create mode 100644 templates/default/layout.tpl rename templates/{default => default_save}/404.html (100%) rename templates/{default => default_save}/address.html (100%) rename templates/{default => default_save}/address_edit.html (100%) rename templates/{default => default_save}/address_list.html (100%) rename templates/{default => default_save}/assets/bootstrap/css/bootstrap-responsive.css (100%) rename templates/{default => default_save}/assets/bootstrap/css/bootstrap-responsive.min.css (100%) rename templates/{default => default_save}/assets/bootstrap/css/bootstrap.css (100%) rename templates/{default => default_save}/assets/bootstrap/css/bootstrap.min.css (100%) rename templates/{default => default_save}/assets/bootstrap/img/glyphicons-halflings-white.png (100%) rename templates/{default => default_save}/assets/bootstrap/img/glyphicons-halflings.png (100%) rename templates/{default => default_save}/assets/bootstrap/js/bootstrap.js (100%) rename templates/{default => default_save}/assets/bootstrap/js/bootstrap.min.js (100%) rename templates/{default => default_save}/assets/css/img/bg.jpg (100%) rename templates/{default => default_save}/assets/css/style.less (100%) rename templates/{default => default_save}/assets/img/logo-thelia-34px.png (100%) rename templates/{default => default_save}/assets/img/test-background.jpg (100%) rename templates/{default => default_save}/assets/js/jquery.min.js (100%) rename templates/{default => default_save}/cart.html (100%) rename templates/{default => default_save}/category.html (100%) rename templates/{default => default_save}/connexion.html (100%) rename templates/{default => default_save}/customer.html (100%) rename templates/{default => default_save}/debug.html (100%) rename templates/{default => default_save}/delivery_list.html (100%) rename templates/{default => default_save}/folder.html (100%) rename templates/{default => default_save}/i18n/en.php (100%) rename templates/{default => default_save}/i18n/fr.php (100%) rename templates/{default => default_save}/images.html (100%) rename templates/{default => default_save}/included.html (100%) rename templates/{default => default_save}/includes/footer.html (100%) rename templates/{default => default_save}/includes/header.html (100%) create mode 100755 templates/default_save/index.html rename templates/{default => default_save}/login.html (100%) rename templates/{default => default_save}/myaccount.html (100%) rename templates/{default => default_save}/pagination.html (100%) rename templates/{default => default_save}/product.html (100%) rename templates/{default => default_save}/tester.html (100%) diff --git a/templates/default/assets/css/plugins/bootstrap-magnify/bootstrap-magnify.css b/templates/default/assets/css/plugins/bootstrap-magnify/bootstrap-magnify.css new file mode 100755 index 000000000..a24a8e142 --- /dev/null +++ b/templates/default/assets/css/plugins/bootstrap-magnify/bootstrap-magnify.css @@ -0,0 +1,19 @@ +.magnify { + position: relative; + cursor: none +} + +.magnify-large { + position: absolute; + display: none; + width: 175px; + height: 175px; + + -webkit-box-shadow: 0 0 0 7px rgba(255, 255, 255, 0.85), 0 0 7px 7px rgba(0, 0, 0, 0.25), inset 0 0 40px 2px rgba(0, 0, 0, 0.25); + -moz-box-shadow: 0 0 0 7px rgba(255, 255, 255, 0.85), 0 0 7px 7px rgba(0, 0, 0, 0.25), inset 0 0 40px 2px rgba(0, 0, 0, 0.25); + box-shadow: 0 0 0 7px rgba(255, 255, 255, 0.85), 0 0 7px 7px rgba(0, 0, 0, 0.25), inset 0 0 40px 2px rgba(0, 0, 0, 0.25); + + -webkit-border-radius: 100%; + -moz-border-radius: 100%; + border-radius: 100% +} \ No newline at end of file diff --git a/templates/default/assets/css/plugins/bootstrap-magnify/bootstrap-magnify.min.css b/templates/default/assets/css/plugins/bootstrap-magnify/bootstrap-magnify.min.css new file mode 100755 index 000000000..15b9cc170 --- /dev/null +++ b/templates/default/assets/css/plugins/bootstrap-magnify/bootstrap-magnify.min.css @@ -0,0 +1 @@ +.magnify{position:relative;cursor:none}.magnify-large{position:absolute;display:none;width:175px;height:175px;-webkit-box-shadow:0 0 0 7px rgba(255,255,255,0.85),0 0 7px 7px rgba(0,0,0,0.25),inset 0 0 40px 2px rgba(0,0,0,0.25);-moz-box-shadow:0 0 0 7px rgba(255,255,255,0.85),0 0 7px 7px rgba(0,0,0,0.25),inset 0 0 40px 2px rgba(0,0,0,0.25);box-shadow:0 0 0 7px rgba(255,255,255,0.85),0 0 7px 7px rgba(0,0,0,0.25),inset 0 0 40px 2px rgba(0,0,0,0.25);-webkit-border-radius:100%;-moz-border-radius:100%;border-radius:100%} \ No newline at end of file diff --git a/templates/default/assets/font/bootstrap/glyphicons-halflings-regular.eot b/templates/default/assets/font/bootstrap/glyphicons-halflings-regular.eot new file mode 100755 index 0000000000000000000000000000000000000000..87eaa434234e2a984c261e0450a2f4ad837aa7b4 GIT binary patch literal 14079 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 literal 0 HcmV?d00001 diff --git a/templates/default/assets/font/bootstrap/glyphicons-halflings-regular.svg b/templates/default/assets/font/bootstrap/glyphicons-halflings-regular.svg new file mode 100755 index 000000000..5fee06854 --- /dev/null +++ b/templates/default/assets/font/bootstrap/glyphicons-halflings-regular.svg @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/templates/default/assets/font/bootstrap/glyphicons-halflings-regular.ttf b/templates/default/assets/font/bootstrap/glyphicons-halflings-regular.ttf new file mode 100755 index 0000000000000000000000000000000000000000..be784dc1d5bcb92ab155f578f3723524a3dd9688 GIT binary patch literal 29512 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 DlhOCh literal 0 HcmV?d00001 diff --git a/templates/default/assets/font/bootstrap/glyphicons-halflings-regular.woff b/templates/default/assets/font/bootstrap/glyphicons-halflings-regular.woff new file mode 100755 index 0000000000000000000000000000000000000000..2cc3e4852a5a42e6aadd6284e067b66e14a57bc7 GIT binary patch literal 16448 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�-A&iY%khEsGVMaq&$BJA^QAs8x>7-g_ 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 k3oQ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/templates/default/assets/font/fontawesome/fontawesome-webfont.ttf b/templates/default/assets/font/fontawesome/fontawesome-webfont.ttf new file mode 100755 index 0000000000000000000000000000000000000000..d3659246915cacb0c9204271f1f9fc5f77049eac GIT binary patch literal 79076 zcmd4434B!5y$62Jx!dgfl1wJaOp=*N2qchXlCUL1*hxS(6#+4z2!bdGh~hR1qKGS6 zYHii1)k;^p*w+o;)K!q$t7haS?ZrNXZgbQTi5;wSKh*ZbndL#bJ&+8MUt2W`Pezjnp+O= z-9F^&k?+5F%i68~oqpyWh9y zdnHv;lslDH&^fAw_pG7f1dcyuf`&t3QxpS<_UX3o}ee-@q2t8 zugBw&J>0`QlKYg~aOd4a?vw5l?)Th(cmK^nqyK;W!vF)tN*T>6{g?jWCQZTrAAWQ# zY*EXt1%NzLiwHFTr60gHX5Nk7W4+2A42mr2lGG9R#$|8ZJIHcIW-A}qs>V)i)ua>R z9mQc2nMpK^7oL)|C)BJ|iA+Fe-grwWpw-4}l5Op+aW6}z+qzh5yrqh1Pc-IlXPHPc z85zpbk!A9?H`djM)oi%FPMuSW+j%M3mc*Yd@oO4u!xa`wg_tV5L&7^6k?{sxyrzk_ zb@A4guvZfarld`-D8|Qa^;mrn98b{dgRLM+4%{M0!%jx8`-wLBs=f= zkrG!PF;3p|+82$(2?3I)vN{&O6p^M&3neMx)pSL7@kR^?OC=M@ls6EZqBbz5LDg3$tr_PGox4tm#p6J!@jJR9AI$Z{x&C zlO{IqJz7uf?YNoloz0@JV%2B;oTVB9qi7A8fp@|0JGU)1y!w<{VSs zvcPkaf+1~E(r95z6%TjGm{1y1`Jpyn{$5*c-?V09up5nYy~n{Kmh(_MdO$pEm3M4CZc7szC-7`B5FsTSCPV0NUXvFzrbA z+grkZ6=M=HK6D-n2K+&z+vvuG2Kjl$1Ld9U-Piro{I9cjJLPLb5#tfVp*w?>jl5lmR;v+p!C7?bB)X^jxvnD4d{^jcZMj>(r3YOx(>Z-%mswHPap95Gh1 zmicTqyOw=Nw5#Fl&Ef&p(8X>vZs{_9ZmjywcVt_!nJw?rN@^n@8)IKBr2th02x;q5 zY5ZGgp;f7pM~fvr?J+fb@Y*ut`g1V7=-FW`> z*ICz|YYrT^CcS>=B^S-CZ%jAhuYTr5m+V|G|K7a+x+K|YP3iPrH{RSVbxY?+7fDx2 zH%a$Mk4m4DBsJZZY-BZBB@2Y6GJy35|$csWJF-L zvm6vD8Ock8`eYo3kSi8cOP(~49x3%fbz&L5Cl->1g_J4Qmt+r}DVdLOyf_&#=%|bo zIXRM)ON$sI*Uwzx*G`Cct6~w0jY#0g;(QXe7JESv-INo;#NJTMf6#qd>T5Hkw!XeL zE{-E(U`|9_ny z`#vsp)*HF{&dz$4q2oxJXG?SWQMu9gM(5tIWND2oCSFSi_KV?Uek3W6BulQAB+p!+ zq%xC2$2L0#FZ`d+!aqK$D#m+AjI@kCpBy#%qwkfL`xnP*)KExFx>j;&w<%wcLfB2P zcj;P9Gh@lNZidauibFNiZj0u}-yU5Yz1=tzjZ%Uo`Ms2v-&rhfMQ>-DC?Aa)zvTC! z4C=k&)Z400IVgb(sSCK7R+F;g(2S}(tfT7>1#~M@eWGULSH`c*nphI4!rNG~Q2VcN zRlMhHcg-iL7L%SaX{uW6jkB;fV_h|xhnnPchP|0q+*F`#99lw^3>y)c1VMR8SdwR? zycEgr9P~RuwhV#<8A*X~SiGhwyxA{8SL*bC7yU=<;0bnCdH8IeS z;gFATwu!-s&fb00_?_`x<9A1QKX$P3vg(+7+`7$6?l|)Dkvo=bUN_DitKKy3;A8o0 z-^M=t@$AQ_BlwOb$0%nSk(h^Fbb)Xr<4nsgQHczcDy?^0{&@pE$7WKbP(=KIps3 z5J{FnP4DDInp2uxHAE+uOqbX@Cqzc2Oo3L!d;st1(iOr=;!1TZ7D zSfiSbU+M*xYf7hukW3K;3;G_Hniwq`Ac&6Q)mC7McF_M~8CA1TxC5j$I0GW9T}%&E zgB?+%L$4e<^a?-ZaeUPusGVoCR@@tMxb7I=>~ZRqzjg&#bW+1zHn+=uV@kKU=lLpJ z|K{{~>|b-0*Uz+BBlm@z&e4VMwz{2;o9jg3h#Q4@h~99BZTYn$#G~zrmKBbOEpfN? z^052%mZ;bH6;E)p)qYjG&FQcQSCzL+s^CGVDBILDd5ObebJpEs+gw`MwyV|RG7C?P z@}Sr|3bd@bk583mN*e&%V`d#}<0vQ?oA-nN4O9`|+QnELqZ`+BRX`dZGzpjjc501d z)QOX-W;k#_kC;;&*jduqp{&a-%Ng12%J;L}MBQe5%cjd$`ds~MdWJwx^%I1!^c?ph z+TRzs=diTPC&x;_$aR){fn-l;|2OGZDpYj02-hRJ41?Kjks%oQUM%pjM6SDbQSz zB;(z@oBdap#VI>2`M!Lg!{M}aS-6e=M{GsxuVOL1YU4a+#85a(gf1Io3S+-Al6=Mj zE7$pq{J&cmw=S?%Soryo$Pd3oV_|IkGRXlTlEK{4`mlgwz`h0ff@o`;#gi$l1e)bi z>M{(l&MK18U*Bm+Jj<@JIgIZ(Dv5kLDTo)It?!Sr&S<@iOKiZ%Ryx>Zht1eHlqI@K z&D3|+M~&}B`^|TYwHd(vGv0(KdY8FFftw~|BYB!w%*8xaEY>c0IIt;%0+0#FKqMwc z7!;Gh1`eJuesSX9!4s_h1iR{}@u;!Jc=YH|ww684*2;s%Fboka0ar#&QmyKh%9$-FaKGPIok6G#hY#FY&apfr# zaia)Z7O1nZ$09tcFzjM}r;$?}9uK%;zmrLH;S`SZ+q;y2Kk9epXqIzMBu~E8C1kCj z3$QQgnCAp!9a3EZ7Z%U{Q8OJ5wRF?!Vw&BvXpFls*X}bi)n4y7CIK?RBQa^*Q$ikPN~KtAgwnpfv-9>& z?ro?vGJZeHRW_tpPOw&)5?Cpd>I4k{x~CPZi^+96AK4p^uuA8Ie73isNww%hw)9Tm1R8s03*0@83R7vQUYm5P6M4Yv=w*} zgKKV)rgVfTO?LLSt|@7ujdi2hEaU$1`!@A~fH6P~Wc@yu!@;_(RwL(O@4Zh`A)_GV z4j6aR%4cy1yyUoy%_|;`(;i<~_Z@x{8;AWN`4pSRWcEsa+ABD*X&12!?@vZf08y2{ zZA(YwOeAf4yPRiao6L?G9`4||$BinQME0Am>Ab$Yrlvgqi|Hj}9_g(b-$ptN3+?y7)m7jalwt8?Ym0)tAEX@s+{ldcdaLhv;Cn^lYu79Db&t!w z-^wgojPHMXgjBnq`8VGJ2v;Q|6G_&ms_xidAn`U{WaHL5EakSn_YqOYI$8AS?km^d zj72m|Ujkp(NpsQ4fX=0OO&ti95di==4{Wodv0_;i7dH4CbY+;%na+GtT(rFf3p=HK5l@0P2)mxTSYpB~4RJNBCwoH}!`h3J|;NuX$TGEgBGIoY2_7ZuW&Ohy|K$v+{FyF}T+6r0;-R4&DpwYk3W3EMSF(T?9r8el#ldwz zgk8F;6EBGUmpH)?mNSv8a;C_1$C!m}WtLcdr!3_*9Xhnh7|iDg(Q}~t+*g>z`1@CK zodlPe0w3X(Is{w}BRmk%?SL@kiK=emwKb-QnASPb%pjRtg+LT<&xpaz^ls`^bLAC3 ze`xv*s}Ic28OOYyNU}OO<*l!7{@RVnmiC)2T;_}IK=c_%q9-P^k}ua;N1 zc8qTuf6$tY@Hb;&SLHQRruxUVjUxcV`UbwEvFN21x;Y5{0vypi6R}Z=e=O#78wZ8K zgMn(=&WA}e6NOJF9)Y7*1=WO>ofi0NX#a{4Ds}GFHM1(8fw=e!#?POroKv`L z_J_V2n6___wXr_dHn@-9@zev8;>$M22zLv9#ub}8&2iDX2blJ;j~OQ(Sa*?Q+FWth zBv50Um&GSN@YIJ{*-N{3zhwNu>{m>dltIv(0&iivF3_8;acndp8GE(g_@Z$_;9-p| z#8OoTPSOfz3$aeK*p(NWYmne2resB36V6;4qy#jP7=SLhtx3k{5Z`mAcd+cab8PNN zvaF`2jQ*1mw{6ZDUTpXt+!Iw36~W42dDE<>a-1s?DyUPaEr651iaDE$zD(KvpS;uQs7R(d0}GZdTM+0>B_mGf zo$QmwPn-bLlwPej)m?YT9oN-0At`SD{fVzU(eADcqyYU> zzihM_H?6{*y0GF@$|I|ohqW-zsz^Dq;W`vqB{^sig&uCBK|h3nwm(zV`NZ#>wVrt9>}viOm+V7-X#pnoXUaXcmEvq}~h zvdD;YKAXp?%Zp30glpL$#%^Nb8HVfmEYBL^I?0*w6h{$RqRaG8U4Z37VQ)CSA1O$> z%)U&8zC&uQ^|t!|U;KCDCl*^%UHvfry1H(xuI?6p4|jLt??&;rrn~#dnl)6cyIakk zxLLjFU-~CpWbWx7QvZmwP8#1~8AX920tZpthCmjv9FSx0Cgtjc5lpqE6Zv#94Y~Y4 zI-BG_NGNu?*=uCd2_uk5@E<0!X*ST-mrmx}iO7;{_&WxpaxN z0~i2232--XTq@ZC^>ll(ql=TEh7u%E8=b%{Ev$omX(>Jj0|2mVppaO5Dx?zY)zR( zvv{5UKs*Jhv6H{IU~$NJyKe4NkOM$h%vvCX2o^SM z5>!B3VFDrcYvs;xFrG@q{pAyDjk(6$x@I#Ugw27~*;#YqZ#A7xON>2jtcX)ywIVN6 zL4?b*V*izamjco>2uV$3BIG{tA}EpyP>8He3XQfJu{{^KPolpCr^kSOhVVa7-$@w9 zWJDoYHffhZr+?cypkw#|>oezUW57==+gU%5H+j#D(eL!*Xt1K56dUNw=TOlA(iX$AFiE#ww1V zRa$~slEIRYIFi-U{)JyZo65kXkq~m^7ve~WGHYwxob($V?QP9Gfel<(F+lV$NFfmG!3WFKq~>CPz|b4IyW!xw%tgi??3be@^Fj zrzm?m9S*H|wb51C8}>#P%E45S@gC!iiA&@k8C{Gse$m0bCyjG-yT|Qm;~V)aK_m7~ z$ECMU*)((MB#U3sf+?`877MrY3Gt}Y=BV;s^*cV}N0~siBWPDNIa=kl1uQP=KjAK5 zOyB`OBpBm`9}% zgz&;9uVUq@!fed$Ypq(YKmvFD1l6aqhQNXq8yeG-CyXDL>5g3g`IW0HgDpJ^=HIe( z#|z7U7I(*%&YN@PRXuBBG26YLG2U_Wm-Jg6-P+sh93S8P@VdsK^=quM!(UO>lV!)5 z^uYNc#o~~;eVOKDj8!-zmCemp&6u;JIWW25vQ4-2o!iwhudc4ltti}y@e=DA;yR4k z0!a#*aMI2E9bHPgTTathbf_3H0^mZQ3w@W}97qzsbh*Zqhl}CxD)am5D;*V`4vWua z*DF0COT&h!&CjN%YI+`s&tY8AwT|{o!r`zg<3rPvjSennI_hAoq;sEI=Ck_!H@?_# z>w+84WqyAkkvYH|nej`~^+EP<_iZi7kjD827sqJ&{golV!{e@=JU;oI&Bpg0`QrpV z;MP>Nva;I7xU4uibLho&aRPn3OuAK){9#OLHw(wZq4sXx5{|NJrqh&yx)T6U1AL}y z)y(UseIP6rfjR3W^rw5Z$#g1BD+<3UIoWPfj>J2=IH?O@6qE)MAPpZ$a3O#KlEUhO zY#>Cko+a&pf4{}Q{pT!EC)%k-dGd2agw1pCe`y;r@Jbk z%C5i_3+Fwx;=YL?&Vo}81gx@!t9Ve+EXgYxuktv35xZ8Qk9TM<$9;ht15@zti!WYW zno)16P*E#q9*c#s$iwMNro{Yix$)exh3(v}aIUURJ!pK%_{jZDsdC-sQ7pCzDrV1S zaVa4sVvT!}j$m!>IQw+hw$&j;Wm<*ZI`PuDKT_dk4dMeJrhP(o zvQgSQJO}Cr&O!PgngegjW3JmVQxGC0E5yZdtX)h5Avmyb;Bni-g(+aqv97bs!G_N^ ztU22pEdB6=^5Pt5D(7MbTK?o3o&oiBF$hD$gFwUa4~>1>8HV1ejtu>NRzIFuopu`f zsI6q^PyFSK6Hc=)_@pti6QRX3cTm&9VysN$gYr7$S?_^0Oh#b5l_bT&Nr`eQjwH-I zA#xgy;$D{SDLCdtiVp134@mxh)Na!>QbuD$yG5f^9EDYo$Z;J1uiHJ=7UF~QqsO~+ zv`fbt*F}r}>5=}2#`=TWIQIV7HjltdDeRP{|EW=aUzy-oEj6``MC_*as3kNue-+Y zt_eP}J3AxE;Ndq@o4xT`Ycck=SYml{p zieun$K-q%DNBg{x_cCw-WVI1un^*mDRhC~Jvg!HX=s5B!y`2pV<&1vykBO&@{-^5N z)5$+3P-=5l9tcq>TZl@1-{>F8u>n4qPCUg1o=hhH2T~QmmkAnMhiq+>M8ySsgf%4u z?6PSL!Vbla2Rz;Ly4}Y8aW6=Q|*$`Wnc1y@9^Ep4rq=oJ@i z)0VJoU7R(>JHj4MxFg=k;&qVFKl_S-e!X(vE!HOv{PMyoc-LI`%L7kXZ!*`b_ILDC z1B^|Ux}7dO)vJxc)v(2T zFv|K-O=myP4cC+ZkLS!pAcrlA$7Tyn9#^XeYo{){ z@{VUW4FF|C{4DF|wMM?!PrtK5jnpW`UjEE)bC!85R`!~a1-=-U+q2(zCTs_jQ?sFe zZ|9`t{fn2)n34(!1cM@QH#7Tw6Xv>ESSXH07KLdQtk`K2OPCD(7yA_PTLo*)((Vq= zsLd&Zy(^tln^V&QzaRQ>Sx=dU!TVcSkg{?I>H-aqAL z(Bz1IYRk-iT2y+oAN}%2RLhutns38wj8rfBdcAs+x|h5&AWaqYhghQ4p7)MB_{j2}9u5jNzP` zArlSoZsJ&yruPu+7T2oqn+`M7AVO?&v8&K zXMa1I@e~b{*a&05+RF;2xbF}f{d8!_D9()W(;@0b^%v*Z~oY48vOoIv^MH<5y% zP+7@5Q)gWm#R81c8dF~!nW7}0P#oe&{!M6iCF;>B9L@1epZc<5SAPJCNm5N}Uu=;u zM;FqR8vbT}2Q)`_CN?K}6A2^2-b^5|Il&K@2az!%Mn!THl4hMdPd%&jqE1jhavbEPXe)q$$a2`{jTm#Pifv`DUr`p|UavfrRL zz9<-)L%_t1Il@<-&z}#nL-RqtpQ<$of>;Hq`O7WIPAj^lh>8B zl1xr>!mN@kk*|E}{J&(~;k~-UV@=0v+9vkaPwc)-lxU2{YNk||v+S7G4-}vF@z1U} zwDhNCzDqR6tg^DUc(N%J-8r+4D)&$K`+}327fc`1C26Ej#Dh&K_NidHWHuY*L}5v^ zw8Jz*tdnAgMp;8jFpVx6(DwHW!$CBzq=Wpl#t*oBT%wXl7&&qB$#)}TCcinhy(4R+ z89s>8i0=uEEHKoj>;=|_77zmM7W@R;8U??a#PO@`S5R(KZ_DL|Iwd;`2_`s5UR%hlNV zdDs4dE5CQ}yrFXbm)o8MJFUiGTJ>A_;QW@1tbh_aS>;Q7&tv=Y?hDR8_=9iocUB!7 zdf;)^ZM&QQkZ7g!li+GdZidLfZp1;xwi`W8rg^g*$`W*lYzA+&1lPK zSR$G1C9?5QECn&^vQ4{%w{Yq3N zI)bYB0jRBss^IDOX$!TL))Kw*S-dk_^fwppG|3C<)-WMh7+buQdI|fOofs)WTO|A1 z;Pu3kG=9CHJ8(}BIwb2MO6OM?Yq+>#E|Nr!nB$rS?U^IrgaS{O27-0LYb6{g_`5@; z2UDb@y2CBslzyClZxGxWm*92pM=2sl9M$dT z?i^U(F-xnpx&vNo1UqHrQ{UOg?k7qFrAldlFwsEN5+Dje7ZUAXTz(|M#k`xtkI4sm z!OTPW_7|J+rF-$Rg7xjatPhyuDmjd%+-rP^(l#6GqY`BF%l;G*<%f-csXU6$7q-9j z0Ln+i11N&#fJSqkx=a0wx*hZ%(P(FB$JyE~EC=5vZ^*GEg46l%30K$l=un{r(JL_|BV(1rM4Fe*>U@Ib%x9(|IMft+JINl`_&sKO> zaSfXFp3G2%3MvsbiF#o_%Ov7KiH{<$!74a>xLAs8@Xa-)YNo5u1ejoTWA6*A!|hG9 z!%Yf)g{u1friw@=vZ2X%S3tV)Zqo+jE1H-MN%I!7nTxqqd&6}bPe^U4C^e9dh!|&$;{o=X1`0pIyqgI5dkz zbL8*0xiR7rWWwN~B;Y0|ynCz3>LHQ#!nP5z{17OMcGgNnGkgHy_CmySYm4cphM_i@ z>4LctoOo#cU~vi3knX~ecEHHhMRUGIpfY`+`UN%h zl?(Umxp4FJY@u-xcquWM}q-=#^WED(g23s%;kmdHA{ z3+M@U9+Ut%i$4lL0q>p2r;XQsyBmwXELgE7u%GE)j__ol$@t@|KO21D4)?*Zr@67K zvT9tw%Pq3pwV*4?t>=IExh)-E`r;Qpl(MA)HL0>xcg!Qhmg?few*||9t;*K;uiwbD zi`ESq&u_WBSzVCn%Y-78ic53qwF}#)_?20<*7WutKf0^V=a#Lhge~O_TUYPhA^1G3 z8_3Vxuu7H4FOa6g+`XWU3J9c|3JXD}3Je}jRVk!X8qu(wk|v$g-+#`enF?EZ=l+!) zX0Asza|1$$KnKOYXzzu~=FMBx+Mi{tVfl`mKfSJaWz8*xD>USw-)P*GEPTM?5(VZ- zrhxUO7|F$9DFk2_b72b1L5;Sy0LN*#57gVyj&oScKKRCTGY-x4Hy*r|-N#;G_vN3B z25$Ibv_87~ynuXp;7%izf5%AO83^3TehHiOU*5?xZ|&T8?N=$#%~!A8xbv--{_+<- zxjy>E8v@a2;Jn?&k7w1sY5b9e-l&~b`vwac|MLdP&rc1Yt%IO@%HiELQ#u!r-vO&V zYN~H+I}_ASbK?eNpqSa>c#H62C0V~8yb!o{lp|jkfEX;zIzVXi#zp6^Ltj3@_mA{~ z-Nr66R&SbQ^Eq~V#@};%MIi7I_9Am$u&UkWQzLa%aoLl2^@*kVcfdz)DX0Yj$S=E5W#`HsPIGb3&?_>P^(jl6TsiX^#Oh`CW8id)W^hy4|k3 zj1HUADL-=}+udDRQ&UOi!qs(k!1wr3FIO*@;AaT*?M48d!hAqoB@`QtjNA;!0ZE`C z2vbBltU@89_K(l>JvN|vv${i(-J0>=Mn0`N`>ihSwjLR>b7n(Y|ep<>LCV@TP!|aj#guW6Zr0A2e`$!|Yys zI0ddR3kSkM)(`ikoG~yq%?HKxEFEE-j*>7`7bQoWcu;2eI?O|nhQ_goEEpo9oFHHM zHn{6RFT~6fu85K>mZ9q4x58qG!xv*Y^Ng!J#$u$kGzM`T`iv-ohQ?50`0~P&5>>6@ z*iX8de)HHTnfoi&vpNVarUSO960GN%6e0!)C1N8J^r+y5!PGQqsrHU4rIkj8s9~SU z1ds*-TLG4^OVAO8N3jt=vY`!^<_}F<7^-S*?HxZzJJ;X|RfF#!>9u2E~Z~%`CHyF&B$ZDb=f=ozO9_p;CxRhFnm8 z=b--1F(&J-a81+n)P-LX_pu?uT~ppwEKoJAyQynS&&q2SpVt}}50AQH7RR_@U6CFJ z=#WTL5F}ttG!-~3nMx#D=HqEQQfN6(r`O~M@ zf6AOUtQ3`K%~s(#91IAmsJN4XCaRJVIjoo$b{E*`ic)-{Mn+5ZUoajs<{6K@0P-AS zhvsQZo5nRQoz`q-Dc}*giJLhJhBT7nx$O6h=bn9*^?Xm10MsT!iV`A52v6`!M~ap{ zMgxa&OiMepUZq!Pvrctk*^aVmzTwsa?mLqkZV2uU)Moi-f`}QUT(Smc6;oLx%`GF$mX3D6+u?b!Y zdv;dI!Wsaqu^D%(NuGxA4WwxkO($_Q=nK-d5gTqwtRc$~Xa(NyqKm{jRmoAX{-ncG zu@eksEOuStxk%E@GKg6QkKAM=$1@)5fX=gSBM0+5I2YquK1bL5PB~Y60&8BeX{ zRv1d*OkRt+S_Qu~9mHw@jsWQ$GP*99!73$;J3I@;eeWju2jcXDSoz7fn68$|4-y;= zNs(kI!9V{)0aTKw+-+BMrhGnF3Mpp54rXv9)0Ro_y!psrPZ)kXo!O0>CHze10T2k?XOV;NnNbLP9~9fZ*V zx}!A609#Y;AoRs&tZ+mdT=II5{)NWjUFZ<}H)*bldpt#t!>qw_X4L=aXmDfwWI3=e z&yM`VcECAe>VwU5B(55{da*2*$b*Ai#yE0A;NMOTkfBe(=tp^})Zhp09FZwclrm_a zrb8vH6GsP`49HkIB_Umg-8v8p=v6v}ApZj=lxiOfga|Y>V^;Z$+0$2_f1P^sZ_cS) z)ttU$er3oR32vUXlDvvS_M(`8Y*m$H@enz_3^dU(0dI)U+#rw)&5zh6irI%);hNei)kZLn30_2?Zy ztq8wZ-Fe059^AWU57XEKr48YmUfnV&_3FKM?RhnSE5DAtTlzL#%&CMqrMO8IcwY*7 zgD$j!ILH#NrM-YZU^yL^Jjs~m3B@Qa#{q77X(#|8P?86HuAVi%sIRl$^$xs+54|#U zh+>&4*+QJcq1VX|Fsn&J-_GQ(*Rs9o6B3MnAQMgZ@-IYvYkG*zsPD9h&^1HPXJMh= z^*TMQz!5Na^&Q#lN%4S6M=|H~wENMIAo;wb^14@IlTK1e zpmZO$d0c@hP|;PjN|7@#G4nT!TTG^Abe6xh&TCE8G|K(2MHh{$kLK4tbL5Gao?|To zPrS5;UED7>)x_3$oi=Up@(U)*&%i`&@wf&*9u{Xq@~(^3G||KL;}%8vqkCR@Vt}?2hA62&5gBo40zm&dAUhCBAqPsi((U*{X@?{4i~10 zq*h=L3f?Kee%Pcy)Qk;S1cV4|4^h!S9Igl>Qw&ywcc4ZZD;l{JkPN*?#6SY)0eS^g zBW<7*yD}68&VkDu%yCd2hFB1<{Ob?PSph}zA%wHS_F^85tjqdQd$6Wc*TcK~cH8zu zz1^XQzh?Kba81M2y3=mESGRR}!j1=RuHmAgYp7^VV`))~gNiz)xx;o8<=GE8e67lE zZs~Ic0s&W_h3{5ceU1-($mwlWl&;Rgjn)QDxkhRAIzRN!mM?^4IwgpE05EK`K;=)wJ+y*{} z?u9Ge^09yADS}^tg9VM95b`Jw1;a=YI1=0>5#y8uO(c4t*u7YoI>?SHjUY{UacH$M zTCsJ2RjgeKck~V8>;Hb<%IhDhYmx1K4rYL>G7KT=Je5J)^>=@R&1N^U*?ijF*V}@X zo;o;2kl!VW1spAP4_&|VJmdKHrc^z~>UZ3*FMRVM`GE01Z|(Q2sJDWng*~ID=rT6X zWH3=*Ht)x~4!pI0e}4ZpKbluop9m&3hMS6}>9WhibZh+z&t7Ha^3})oE$p59vtfE3 z+oKMD#VsRIbFfNl<844b$=YEK3#0&gN@7Ozs|z-jbQ_5dED>5J^sgbXFa~La#3v^s zuqB{-$pwv+p|DW^J=LZ>wW!4y=+E>=$`TEs4kcMWzOEsKxF^m;Wpj9<`jb7^=G3ZM zUpnB9HD)JSlb~`xeOKLu{a?RsN5~i?gv)$&>!(aA3nv>>t;_e#nfT1c2cM#{12oRHee;4-tt8k0;aQlS@Pu4VAz?WR;5F5e5lBLkeO&I6R`m!_^pb2hzUU zDs|oY**!mjQB`wg!WoNsQVn(E%ack+s3B1n!FaO%mPOeIH$F45wszn0)>KWsz05yx z>iRn4Z82uC(2neLmuXm)~uWQgDDGJHavLog;&p-JtGlcx9q%N%fdbIqoh%*A3y$){p!N? zq2SDgb@2s6?w{HCbv~QV`bHMPpnYeF z6D@yw$@TM_Jgp07Mnj?K%!RFb$VGR6Cy_6wd zEd;Uk$V_8`%?kw+*eSe97E%vlmWPX(S~s5MOm!n77MXBTbgV*_q$(^16y()xiag-Y z50Xh`MzA(HQpLskl~^$1G|k~*V@{bhJ$ZUwU=uH3 zT?TcPAgxVDtG5DMgb@uF`Pq4cmdSvJNp8TC`Z_-yg z>0!RTl=dSWEh$9L+sR%Z`cWb!U?xS8%OGGtlqW30luY9YIPezuLt+}ez(9kb?(oOK zs~XE%x!1ue)IQ_#Nb=!}X)hDuBik;1m=7>WUSLL&!O{3EnAu8)w}QQqj9m8um(2K- zhV%j^8|@(!3Ot&k7!6|yakBrw)DIgw7wt=_97r8g?oguB9I~XU$hIHeMb7vFW|`;-B!wo-7Ow3&Of1}) zK#{eQJI65O@|+2|789%mPRUgOY<*|Hkd8u4N-?4!12Oj)7c_iTSbGy7X}b&fLqjwO z*vF?}5|2cxkPVldaW@>O)zWRPNKql0GpvIqjt-~b6OAn@l?0^?d$lHvOBhU2l?)eX z;m6U$nz6d8z^sUWxf`a37(ZG_!(s<^hsEKvS{#lRtJUJOTGOh8mQoC(dcetX(y^ z-Wr_PGb8Mu8VCeEnnTw^jW(OJYu-!>#t{k)3d?mMzpq#wb_@Q~4qc0=dNZ`bx+<#; zy3G!uu6?INgOji7fqA~2%Qj1y%;nD$+TfO;_s?r5Xl3o^>^b+^b60J%)|Zt z>$X+6aLeNMGOZ3&Yhy#KUXiUXm#W%2!{KDJ6Yj~$TjWq!hBF0P047)X#aQo|vI|9P6u^g-mGgSaJTK9-I za0)nd65@_vKP3lpECN6Y@H#O`P_)9P3r^u!J>bx231Lsg5xCyhf!M!-l`_kU2Z3yf z))Ojavn(DHFa|RCCYRk|v)F8k)xRh(?GIBMH_YtZKcoMqN#&ukP}$n@$*)g-cEim- z-Icv_=%d$vfAViSac%zkPIKRB5vsL%mtK`~= z=P++};X3Q$>P&0J>NV?w_5i%9{BtIkE8{9%foUzBK5K=mhVTD&9}DU>)a|O2-La&- z)(5$XiSvcch-rI2dT%<-!A!RlkZ8NG=++)bEXrSnIL<@!B%Z$0A30V+C zZ5?6ef8XFM5RtJ@TyO#VgyXDHSfrClcIe!5jZNyx_m9US;9KC**`zHdA247z3eZNR zH)JU#76g=3LClEg)!=cYa238}0YDz!^+1Tx?x0Fso|{gq(U8qIrPHJP9U=MRdpfvN z(;Fr=*aEU#7O4o^>=V;XvsBfo`}j0A`QzF|UqgAFXY&0)a6hFa4?EwkS{kF3a=e%YXaAP|#AO#M8`sTtMQ<_kZ~xnt z`;@gC*blg5<`5e?)g|N5?T zsq8CL7qa_K{>U^XBGe@Clc0AJ$e6o3ZO)*6MSw$co*3aVgkPqXO~Onn2@#aAz%f5c z0LoUx-jQ=fzX6Kjlk2Q6iGKK13eAIe0+flEX%48n~zArad~ji=|3sKX}BK&qx@O= zAv&*sm+4zdi0(V=p$lq=2oy{s*0Ye}O@&ceqqHa?b(l10ORTcKKHB_f_6j zUdKbm*WW0I6;(tXV0GKBx{W(|z!$wIl3HqrL*MG)5!i(2< zAsPtA%imzLL%gp1wo0GZdD~UnjMpBo2n1@&f6n%>$}c!sqWm5(8_u77{cA>?#*zf2 zI1%koji^iD7K(i->bc?r@6U@;U9mGmO2!lY*9Y; zuu|q4ddF3!D4#b++Vg^Ub%*TgSnYkm!`9L>g}-CPz{^ljus^ZiIK5tH{zfAw*vw3M z3tyA&=}G4wZxOhC4`gIna9?nF1T+w5g?}mG0&a0JY=16TbTldL9UvqGy&aDc(8yj% z^(q=<1-%IDW?W?KoYJEt1DbDAbF%WuPdCArszSDTcZ+upvM(~2?PZOtjXT)2GU@f` z+bnEV+`ndXDn6riYD3kOmWpxVo2Om9d|UgP9yFC~8iwlRuNgmXFy4VaP4EbkuPSRC4NPs|(ODyrN z^Se~v$Dhn+pHvg*K?WHB{bqTV=!OGCVuxF&?7F>a3qPw`%s>SZv;NFDyAykT|klK;4HgJFLWo)bZ9MAD>zfImT>Z zSQNU-_>5X-eNA(B@`fiu?CMg%V_w#<2gV08OO}*R&Sx{3Qh{S%`mzVRCY#d6 z*;7rinbq%&x})-fj^NU+Ozpniv!+4dDD>fCd^&(7V1JZ=1V+#;oF*P?OK7=3ffB9& zEXRp@34=^0z788bY(QvZfKa5sj|g%dQIbK!Cdt)AaJ=FOTL7YGVKf60r#}{}oiVMx zl0ytVuijP0{Jv1oGWP0b5FOBq($Oq*ywb8%-xfOL!KeD#nr)3;l|%ObE6~WK-Nxo74ga z049iBGlf6_sv_jti!9tzqo%s8b>SFj;DClKO*{4E4AZ`01UOa-QMNp-6eiCGxaa)? z5IPLb!#I)TRc(;_LzWF`Dt1qZPK3OK)|^W*frz)#UQU}jjvWxNbx@8M#uGdeRCPi> zBJ`3VMvwzcb;-2$w4&V)hLO0TOeQa;-Kw5x(wiom;%Az3h`7KCvt(he+h@>Rw=cN% zwlQ-p#LiP^^9&$yUIB0|%2~j+mgMKkT6ww{+WagNRIBv&2h{>#W7x#LXUb=)1r72AX)5=Yp(F(eH4fn^B#tEC*OyYXO+pjUDyUV_C}0S(R&R}qCWhdj*iq{Fr>dfE zvoVHE$dBJGG?i^y#hhcCwjM>%`a)wOBMn7qV~nHR2p?8xR|=aI+9euBgEj2kDn80E zs$I(IJs*Amb+9Bwc25bkTT6!G6I{i~=sIyQl zuMMH@j&=yJLWm?QN@(Gv3(PW0)lik~NTC`Mc2MjgRUPKNFc{hpe2KMGTN4M0Mq{Zl7$q%OlR~e$WNHmHn(mOrq`1mLAp1Z? zgwU>zwq!@BL%bYVkJ{Mzrw- z0@KS02|i9RWBIV8)@#wQkj^SZ#jQC0iX7Hsm&?_{R z*=3X9F*Rozj&&d*i5&ee#Df(Wo$?NepMIka+wHwLXAQe{NflsU6%+zxRIBNcg# zjyPUWzB?3zI>jf3WSQxWnp;;nj0ekA89h^N+-}hkc@jTv9e!mluM)%;bs2`+3Td=z zg=AW-mUV>h3~{e4`e~y7{DULJWhZV$Ix5LWYw+$ zyj2?_apDWI9Lg3Aky~NUU`60ftD;%`vgT5CuhW7!nL&*!G)8L3U9MWJPN!96_~?`t zripbs6t`N2v9ytsgAXsTVuZqgyK?5XxR?W>H&xw=DACNOFwCnGP}Fk8Dl>)a77Qqc z+Z{m@tjwjW9;+g2nnROa7|F$VBg(7?U9hvLSHYaQFpVshQkY|cEY~9zwcVi z$DUmD3=fPeSJa>)<86A-6XIG$z-Fn_bf<X~j}>pSeswiai#x7;04^a=|oHdzXu3Tiik z_twGB!iup-<%>wx!n(HuDjeATlAIHv#S~XL9g&T6i-|(Y@H9U`!KsRHFMu5Od(Rd%3fnX zJh)k2H5Zn!L{yS^1MM?yEh|7N!J0P#i#xKq6aOPbwUDZg{l@Fqydn|lZ)6o|2r06@ zBRBRBj>ecpS^68w6vbTFf!Uj9%YY1)RPf)|K|Vt=O2ktyhMfalYkniDMZFH+ee#QF zbFfG?{PgiBRT`)K65n<5=OZG}oaBeiHv1F4e}kcbzKF&{%pBP%lHDnd!|)i8!jd#Z z2zeDmyg3NZNY*Tvvw}Jj`hUrg6iCYG``M(nW)SK1Lj^9q2LU{TXC8g9g!T8VQKf8N zGGeCqWPk{c0Sv()8KXizPXdR5HPp|do)H#@R%~Q2bTivS5(VF4&%M#i52!mTZ%L^s=lE*jf zTe|gnt@oO#Gka8J^yjW^J&X6%d|tttRE}?5x^KhdOVpm3Q?KdO zt~ZSZIiPUKBDQv1V>nTHAn!WMr?J%*VPk4k7rv04e{|83>(reGDih(xacq;gN#IBR zV)trWA$yO*YvVGE0p-@Hj=tB9|k1ad6?A-rYcFlF?tyqDYM`vkWV6A3>yDBh70xqB)5Q0FU zQHAyMty0bSm`gCpYKBaBU*)4%CZ!_7~#?4z&4v2pLK?NK*^0X}ng*P%_l z-BmvV@311}(>`wMKtRK_H z1HydcE#nyfu5m1oU2(xpH(el?vwKV&ZETxmEMuRkPOy87Z3)p8iHYwP5dvByt(G=P z*GT)MJ8_F7wy=s(f#k^a7ONX;9K<2t`TAFe$;1QTEBkBn%p_=iBrx3&wX3VGs=?;3U{FLCw+2!nHR9369 zPLJ1>Uvz~<0ZqJa+1~qZKX0X7U$=Dc!DX|o&fUA6)>+FA?p?Z0R~s77-GATSW$Sd5 zv|Pcz;PQH$*(z0zo?PA3vSjro3sUB(X-P{{YQZI|%@cF=$6e<{WS0s$>F51?5EyfS z!rQx)h}@se|NZj_*Kcl;5#y>rU9Berl5bCs!X`~zcvpJ)qUG21-JM=u?X=FHZ*^8L zPv6})_43p?%iHc=IB^nFde|O|p7GSy1@0KPw{>bA9r9CK_l~O*2R<;xUKg-5M`RDk zBKF@gp2-+Xw)I<}*7hh7BbQ+h-XUYtz$OIzMf*lIqCzBK1%fY1kO+Nb;}8fMpZS13 zS|H-~R>a&uY)C(CA_To+FB#5g0{@c+C_hMFf?)J12=e-$H7#rWlr>_D#qry0nvo@s ze=gO_zc7;uE|{+UELQmD1Rh2m##icpYW$Rc%J`}AaeO;(fZV+CB^;@~f9UT@*31Fg zn53NAt6r~OPx=n>S^~J4f=AO?N#sot9N{2BvV@+1e@gDtj!4c;>h+K8yzP>qzioT% z(MPuP3vJUqPFw!*b1vO6P&VM~pQ<*Gh55a&M-{!ou`>LfYrt{gCe0b+0 zm&lgwAA9uI+wzaw9G>Yme$m21n=b1c`djz%%+hW?yDV85t1vFby)GMjX!?q!SD~_X zw1*e$a%8OCNz!cd+a3&dZwP=24sdu*pwTop$q;PeilPM57j&%e8+~gOANi2-5~e_S~|Irp&)&*3#MRCiQ>Jaqzjw)#*gm`21$ZE#v0izDa$n z^iJt$EnmF4XT^ldXvWfMo7v!FJpJH`?T!UJ^Jtx~b$MIk_;7i}l&P(gm(6Wi*3?lx z&G@D{pe~HBcoTg$8J8P34Br?tt|R&sH}p;G1uiWZW}0A|z#c~CJqQzk zZH!z$+%Om^Y;3?p;$m2i69qsLa{LPFM|h7A-JI?qK^Xmlu*6mgESA&;$>#4pVfn|t z6%9|^cPmp`cJ^Fpv%6Hsa#u@w#qO(S&Fty<>FkYD5^u4O>J8zEiFu3XFTU=oC3jB7 z_cXvaUh1xLtF;pvyQa?1^e&vxyrhOBl$mKw=<;Q1C#+rdZ1yIT%w5hs_uR97&v*YOHl5d46R8^O^!Q5cX1&$2acog6S|Nm|$MoZ)B_3~npry5Q z{+z}4c+}RaEhZfsbQzrYHP(TH#tmqA zS5ba1`SZ>89I+EQNfD2M{T2hX$ndCZ8^%WUq9wnj{y=!)yzNEfikQ%nY(WeoX4O_k zS{E4PK3xt8!eR#73DEe~q`{D9z0eZZ{z>`ZlG)9n>H=q|q+ndrv^(dlylG)` zhbIC?z(OOq7%_{^Z)PT~Eubqkxs-!HK7VG_#HR7VP*wGenLE4gVzZ9tm7Lg@9UG{< zlkSU#>ujj7lDrA5&`{jZ>ovy!IY+eJG2(t?-~4aikNnr?>c{SBY&@Gr824Dw}?UeiljrHK{FOOB$8qg+A^U%O-CSLD&Yr2 zrVaYQWSf#hNr)-enD$<02_V5G9)wWO1AEM1^kr=g;8h!1r(5+= z*b25S%vfUojN6$Bc=AdpY`1-A9-};+- z_doRUqSnZcCB?PvTNg~LQI=2Mu#{c$XRhy++ctR27{vRtt#hJrq{^r^j#42*_>#tv zP?iu=sh<$Jbom0Gp~ADS<>^07zWAB-Jx}jByL`?pi$^lbT1V|K@4w~#gX>$Uao$8t z>jM8uzvEeYjoT#v6TE0~`0@BS7XQ!rckP}wzWd_K+t=I~l#SL3htJiv_{dxLT=u|U z7qx_UEGn*x2xDApOe`!^MS6Z)2t=jMhDz6-UjtqUlG`tIxcI*u)s|Z zF(-JtiUieR3bs|6m59y?`H2{>YsAK(Q?XXa?RgYWI3{<%y|Hp&#clcivoGjr3_7$m zj!IXFBhP41e)r+6Yaa^6JbztuZr!rvSl`-n+Sj)Q#W!H4P!X@_nAK5H)jqK*QKPjR zO!C2l%8WyA&AewXX@8&6q)uVZrN+lXTb5Q%gwCQAHisSIypm9yP1nt4-@Z_8&Ff%~ zuHIdLR!>iL_n~=vuP90fcRo06e*2bblWLobN|Mc!w;#T-N^1lgIXP>^-p3x?*-aWk zykv9_r#005q5!)8tFTjOqV-jJqNr)Ki=bcJCLlDesT#|>gg2N@agJ$er3QaWvj z_Zo#aAhb|ur0I@cghH!_cTs}6NZe>J<~d4Sm5v&%Bh=8dd49u`ZF`f=8DwkZPbdl0R@JsnSv9`*qW$jbN#}R8PEVdw;}gzmH~Z}QdijN$uX(4~oh_ewP3aG`!6YelygkMic{ZBYEnW<;@>5@k7#lJGCXI% zum~SjKO`k{%i#f(QD?lHRNo!66yhElge0#sls51-ne${T4=;~N4gPWbd(c(~e)r+m z8e9r*6i0BsM~*}<^gj`D;e5DG=!P0-E-oOYPWHlkkJNoK{V8T{va@Lu~5!@|Dw+E0-B3mbb#WJ@YlRmQOS;RUQhrU2xVcxo_eMv1#CaLdV2F zP3#}5%BpK>s>?3^eVi?vb3>hSGO4RBEO9zZ3afR=kNjmfO_<%YoR9ev(0AR4D;w}9 z)EH&}6hx4NBdFvNhYFAlRDs74a@wIbb2imEnTlXJ9puP z1s;>~EJz|Y4N|}CSR2!?bx@0xo*0X6}&1Iz}4=1uU>TH z0b`#2kU=o6=t1_^@Ya;}Lpf57%g);b2fJXNLB97F`PbwZE0py=3+PR}QaJsmU{Zo#U?|V+gq3{0^-9Qdwm0M!vr!;%5rBJ*F z;}P72o;Dwn}6ufaep$WjZwYRbp=A&Zqf0zQLpot_o78YS!AQ<`$LB~BPF z@Cv>*h!;c=ZAt0_Wxy{mELltlg*ocxY4EDrWR)U(%k<}Jtc0LE&t7X=q(ym!8Tdn+&@G?K`Q1kUECx2g9_zu%PLxo)T zsqz%fYk~{t0Kf$=?SIe~BKn-%=Ib!GiFPk(u*b+lI_3>I3-R0n_g5XgxP1Ji)?ctyufNXb=J*klZT{07iG9lMWFN3Qr4+mmY<_uqZTHf-6E?=Q z`m6uSoPYi4kaIDQV-(+FkFof}4`=oV-Uc^d+v?m_47Q;@Mx*d09vRq|`(gmzFD^mE z`G4HCzWdxrxS%32d&X_dc-LL&Z;%g$<6q&aL2mk59vZHbQa#^UGw|E8I4m{Nk%UHe9^xb-)L9N+Vt(r$~xKGHNVw!1qQMS=U2w8fzVer>2#Ij~^%W4FqP$siLWllWn`d^6+dHk_o=u0aZ2%mbTS zY{77{n>za1QON6Nubv%h6GJYG$y~FzsdHDk&Lf!|PLt%(mG8WAC%<(%`0cLFro}a8 zcuZrJnp14S_pf1={`*2KttqQ0LrKC5>Ek^|kM%$&4++8>D+OUCA*Cee02~2ZT@P+SK3Pl1z|LsULZ>mF zAZg0X1ZWQDjw`Hoiy32QcPICyDCi!Cf4q`>~~y zeVLm}E`4>--6QQuY@@=E=MrKGa64!kcA}d2588UTB+@|;`dtCn#(HW;?W!5QlQtbZ zba2z8PU9G3%JQBig>z?WZDn(dRGpVsX_-*v?pogEu9{$}%*(5mTAC}@F1hj9?>~Fv z5)qx?vQ*WgwBXG8sh7;DtekVn)br+;DonTCc;jt2%{lLmEj2T@)fO~F^Yf$ig+6~( zZAE>3MQxSeS6EMJ4F$E^X4Y)EW7Wf3CQjV)Fo*xW+&^xB+v9MSKWB1qIU9Fqs9Lt$ ziO@jL@F7#BHJrNUA-OCkdR-Q?S@|KtS|)i|%Wj0IRGnp>=%s4Q-Ku{~){R!+&xm{o zgoz`h8!jP~b!f?D9pKZ!%O#BwKnSPND2@_*Nx;?^_8eL17#0kd^HDHEZiN#bUFI%> z!`ROY?x(<+-4r-;g;B^#;;*@oB=L7Lv3bf0NaFY1FLWc0NjKG6L9-C8vlq=;VSba# z=l8wcSY&~G{;?Y%pP$)QO!D~=bwt;xVHV-?W>7~N)Hdc95W_Rokv@Z7xZ9Xh*)OSM zFFLQ=fc$1NoMiV>ZCSTV`RELlL=`z5#cg+Wn#G##A!(P|cQjqaMzGSk(*qKvVyCZf z^adL-0f@y;m;slta&R>4J{GSh{nR39Q0YY#gG;f)y9bW!K5U9M^>lihCPN-JWqjTN zHu*r_`XfOYJq5wK|Wgp z|72aQtKBcR75DTMw_t1hnZeH*c&jgFQG*{+3(k2C%8;t*X&S{z1gAoljXlr(+{dWXD* z<1g8^(xdD+_U^mK4!D1P19#C;R06!usa(K0n}?maDJc@5Fr~TS*X{#6@oLY?HgpY# z#VO!JDU3K#vr()Y=#9x>+h+Dq&`xANOJrRkBk3|Xk^&V^+G0vC_cST>4rl;UNj*%^ z99Wh_q6CY|leiXfeG)ihF9)st1AWU5$eIJZPc<2Pxk|93a;@cP=5y#u@czqeQJW< z$8$I~!0iGtkq9%OYqj@jU40O$4^SWsxi6i&3g9nbs2=T`{pt(Xarcy}cJJ15Y3k=ER6C>`y zEY0lfA&TP4W1M6tUOuO27ncBY(@7G&WIfSjuLn|+hI9@T4OsZQjArGh=0e)lPxjGt z5>lk2Fb+Bj-TZAjd^UKMJ}e?9v_(>dW;Pxg8a)FkdP`1{T8i=#-`Jr`ni-GL9j*jr}pc*&b-k~W}W2g2U62~c<)ycTn=bJNds{r^XP;S6;cUT2m% znWDCF$64Txp2UJftVkUDvki0o*WlG)19Q^SLyy1w>VGSvGTLW`YIfo#a!A^*B4jyg z(8P`Wk~QYVY5}`&>1DW zjIVFyWyqne`X9sMM+1~<#`>3meRFkze%h}FFJS>5=*!BcQv?PAuAjJ)fnHTA!(W|2 zB56VQW3w^+DCfB$l9AOpyc{Z0s3LI=p=|WS){bpDiPE@kKJW>?Cv*Ibd}h=@^O5|M zeVwL%Ei8{yL!&ei@)E-SQXI39`cC%s4q<;mBr?*Z7^O8Ie<@N3?2F;2(WRsmmpo`K zOcx<7GwhgR0%A5@B%Y|l|9GM?5y5|`{~$F1kpyL7tj;IHEr%|}ly{Zh{-pA|N!0z_ zy~$*6Uw1H=>g!7dgWY{}-%U>@v1qcNbu$@eL&+figRZg~f~>bc*ca6MQ+_?p{j4{L zRN%V7CPXO#4wua6+GxSQ&@gOwu&p4CH*!OfaKsx!jUk`TA*4=eW+Wg-0xEp$-DHsU z2gSZ%l59&(X%LMr+1J{{3y@BGvc6T*{SSQ-#aZC z(^tR_IZOQaY`s+ZAlKtT{23nX(T94GD0W1ma2C}`{oGaf0{<3!1N9m$S(v3ZftrHK zQ&dZ82o*pr8<|Y?nx(l`s*}zd)?b-`6d8e~Q|+(eiBjEHwK`L2>P+?qg5RMcET;uj zEq39k$-KX2X&yzrwyE_RlBYsomW@u&qp|S8%}GSP&e+^hdO^TQQqSa$Ir@nzHcB$V zBFryg8y`oK@@AtugN)(5Rm?DvXyRlh#bD7QdO#UvilD8G=7wAWqpm#7c0-uohp3ewo*23p9T;D7{T!? zkO~>uyqi=^RG0>9Y3?Q`vkU7qBjO;W`-4GZY6N1zV7i}###+dng`mhWumQp*#95?n z7oFQ`A)sSz>545!_zGl2qcq?{bABPkOCzrVfVm*+vV;n^fB=HvrMe-J*OgE}UO6Cx za&0|;vb&D;(x-W;?I(NTMU;R3Bt9>9_o^ zO?XZ>b}6bBwi#3~g}p!rOCAUwv(iJ_6;AK9p=xJrO4zp$Y=wHjLcIaSh9Td2YdF`a zU*!-FP-VqehAAcTet{1);)(cF&HFQbUEp2N%!Xscz=L1o{+=|az!ud|EdUc;ebfcL zY%G{Ikf)H0rGDlL?iT7(;@M~T_u{NzFgU<7NOUB)mEC_#sEe@^qdu(#Bs9JwyTxoyTW)a+@Q6C6NO5WTh^pU8aZ;waT1Nl|6 zkCIMRKE2*n0rku>CqT4t)M0Q|quyVhLDZa9$b|BOnjwQ|OOrvK$7vo^Ox z3|iNiw$&3ae(j@U^A>MkGiQDzIB)iv?ThC2()bOnBOiIU%s^RMMqdhTp$kgUr(sZ) zW|;e(M;nmEkY?EuVo0OC)=#Hc4okG!Qhrl@xZ`BsU@$3Aa(xYFdu_rwk@8~Y7Qa1GQOq`YpX#M%s!e&AH76#0v#m+F zB{2!ye*SLoz_Q+&svz}iW*?JsW4Qs44zfTo&s9DuX1fY!LG8J|VviG3oZ3zfk(lab zDmxC;*Qx#Iq>~giR_Hrtzd#J)EIm4Osccn8g^yl#Kq&wI;dNJe!$bPfneCROi@AHT zsO}Rq5Y(tTv6sHD)q4pVNnK=%6BQ zswRm!!o|sCGfS#vm?UjrsAmCU*4d-RUL^#rg1tz1kvF$?lfwWHu4E;CSruWy5&9tgI zFW}cxTb0KDUfb&Os_ofk>GjolXsTfNpSH~e%@6Wa0gVSVgXRh69e({LrDB0J=wn!E zrvggszt<8~K+2x}Z&f~nBjco6rgUJ&eGTqXR<|w7j4QEgAQO#XTO(H?p;|EsrjpZ| zvO4)17`zmcnJJe!DQ~{nclhnYeQzp|qQ5Do-ei5Jy+b9f<&DZ{yS=F_R^Eg^iVF4s z11tx2kAIw}MEhCdfQKG#sOo2mSNrF7tC{R7`bDY9~8o3THRKKP1wThEL4c7^R?lSf*Ksu_DnrU;@w( z2Sn>d0{1HcEPa?bH6u06T2YcY1J_msfDKT zbFA*7<6c8?aWVUg(6cmH(|Bq6!7a9EUcS{UZizHGPFgw4|IE=u0{$IoIqsCD?GbCJ zs9F8^43^eqieHSwmU(7YX{pd12Zc_wByN|t+WocI!}X(A8`#$%XpOm z-9egiFc0;3>uT{3odkd2|6jUAOg{bcD^EW1=C8y*|K%39OCD#bbyWo_A{Aa=z_sS- z4K8c zri4Lz+#%?`w^aW^8TMHh+^20h43g7+liFu{2h zd60+GiZ&i4W7KL2>*#Bzajk?&%GHw3+-9*zY=?RwTsvw5uA&yH?79s1iu0?a(239S zvP1G&WRrT4?isyt8M+*F%Xi_&sF_1gqFXWzBLAjvzUV{Ld4vx`a;(vbB{7TrRC8T%IV<>Y+=UCzRikeCzJvdDtDtA7nq7OkQ}1+`)mA;wLFv z$)aUe)2(~BpM+8>QO5rSsfzC=lDyir=7Q#U95SEQw@vMJfmKqHI?1zq=23dcLUpF4$ zo@4N0caCi7p9TYR|6|}$S}dFv<@%PSm*XQ1`z#O2nehsn#W6?^3luX@#6qCHXb2~r z8%djnE6@<^16nL6G6`@l!l`$D6rNMb|N07{zw=<~tcrSY1?np@r-s#y6K9si9sJhM z-;$o=r>XqdUB4txdH2#-d1>3EK;DviVtOD+tRK2oYytRHi(DwO+U{A4C{sV)F8(7AG%k;L4IEL?Z>Vfw#1n zYI2LUrz4dca*RWh1s>~jir_qjOwlrNcLzVpo;{^8TFfTsF=}Y|det~q{W(_CvY>03WhKFK&!8Q)Oorrub2z`EFG=6?yEyeLE74b2RxU+fo&2Fwer*&d^WU9q!w%lux_27$k z-Lr2V^Jic13sW1GH@D<_ee?4i#Zgz~SvN)Uo2tu_g?VS&^?Qs(7G`YgxfK=WybFQW zbP>fVBYh#7DeB@SRk7@52F?*w!*d=3hXwFedFbF!ay}&mNXG?IhdkKzahd}MhGc%7 z?u$ul`iK&t1Jz+A4n?Q~(aNW3g}Gn{Lv@OaF^;v8P;#jFq5>AD+c+y=QIc#&S+JkV zrh}wSYv@{}BZpcV_^#ie36l?&s3$_6AR^>m3JynHVk8mb&N1p5CI~R{5?v6>a^-3m z^Qt2h2dRv1fE}v@za`>jUmWwpC!@h=yF*b@FFt=2V)+Ojq=@>wYZ%+}+%JR=(~2n7 z&pvy0ee;;QDyw&0AbQri3$Co0v3O>q_`&`650n|q9=HF*{Vc-l545 z62E4f{+d=Kad?}$HePV$q*be@OJC8X-@KY%$xd%k`?`*%&Nwv)PJuvgU5fQ10&;7j zpHo=Z-5!WKFQ{;L`N`z+=3}`CG zgmIQ|rhQR!>TRw&+JhTRcJ5gndL23s+<^hbC+*}xqkA689eIF!z-4eeoN$o;6!IoQ z#_gop$|nO9_mSAp=ppVa`C%a|Jv`E;mdqJ5t+F$EL6CV(;Y)j}TIWZ`L^jTye_>Iy zs4CjE;)o$?u)yo6P#hJHtmukXA^pMyT^o^WerxiBY6eHT{zyfocYIA(`Mjmf zCC=qo9)zqRtCt~&pNMG)4saHgCYZUVT_DJJfuI+jw0`p&(i6?{7?|ca%5O;Jghz3~ z#VO5k<%{E_e=H_b?Suy{1-m)+rorkMIMyAG>(J>rl{~Ehap22C{xH1mC>U@we9U$pnW#wXlv|G{ zcO$~eAmOz3?70Ab$Bpw49*j`mc}C@;^i9VPthrB^bKcrbY6B8Nk#cM5z;Rc19USbb zX}L|cbSg%?8K5HQj1s7Y7pibLqaUlqO6GbYfHg2VhWlG=u&|oUNHV3QlH9rcFMS=W zuG+pgVK*0;?TNkHuUgfiDhLTlME1FU!u03FC(@dQ5AMHY-n4)Yu7d;9=3TP?!G$Uy z#PIo?+Nz=!Igxo0{#ml*#eUgjxWE{Im0NSk{A>ISL5YcZb;NUuVq8ik%M?E>I z5Cz^A@&L0N61g=%`v-ms_+w%VN+fJhgQ$eye}F8~Kvk%k_2Re8@C_^~Nt5-IX48%8 zX18ZmuzB;8R=4CRwOf1+v+No-aoxB)h|zcDyt;v{ET1+^_yY;p?SaKKD$D>)V9__hw(1cPmZ zduSjFqE<)51*SB}i@__Ze`7-l7O&jPkyGZs^*eL7!aP<<=@6GNX^|Hw|3~?&sI?lB z4s*ZJ&MxlmI?m=Z+3J>5ES07HrQGslSGRJx-PkV~lEA;+EN=lbBwcQng4yfVx!=9c zh57)Nf+l_huo{q>!BUL;pW}ZyU5CUFot_OsH)o2(Y$kBpR$XBK`nf~h?6`}j1_VRA=9 zQG6+4!SL@3ui$fPaVVD6DX;K~h?7TtpK3)_Q>*z3@=-;;>ie(;L83{`hUbb0sS;= zz=WNnj6ssy&NzsQWsR6s zY|1z}l}dj<{Uh<=$I~Camq=Wre7Kse5`s^&w@$3Q=N`0=Y0RgR+P}+$cWQuW2(FM$ zM!7Di;4zo{uJVt8x6_lSurY<~TkQSLlT(|d=VK?Q0=&Jfe9la4^-Xu*&CX(Devs)a zyAGHb;LrlxXQPj(aHyJTVe5k}hzPU{Bqtxmu>8y7*np-vL?`j#RJ8#IECIp)P_dpq z4phW7ZoOnNp0iWgqSPx}cAf)w?0UD;%DTOJy=`^J=eP6`l<8}l3`Nq(P3p}ppLeXb z>GfXLZFNfT^R0KFSLyZY1;aVl-+%x0=fL4Of9Q7ES1;Y;77lW3{hQ$(lSzAY@{aH~ zc|v-(d(YCmr$kaIku9Oe`xHnpw{jULPn7Jok?t^x;JLt zjO`aYSK&;5&hmd`NX|5>xJvj?b!U7oth?xaVLr(VRB1ta?^jByI1dHP6Y!`xty7JD z%b^8{Q!>&bV&px8pb`>Fejsa>(XPc{Hg)KE&K30~csclXiqC!SA9G|q$jM@sMx}a< zyw9yiPT7O?VMBFbzaFek&Si#A!)1~>NVXCrwa)TsqKK9k;|eom5nDtd=NqCip^Cv5 zhE7fQN>25`=`k<`RmGY;WKo{`!0L8bZhzavoR*Zu4d0JzzWrzA-P^4Oqto&Ww(NBs ze_%AR;@q&8FLRkt_yac8!rXY#$xLtGZgIFRx3l6ue|wG05dD`@b+0S;{=(uk8pKyd z>X&BcstIk=42zD!K{*HoiZ}#XLKqoA<2$61RvZcj?RJOlw5ST{TbWCsj65DG2n7nB#+I$=Ek zGR37yAHfcW$UoxM13RJ{qI<_}?j5%$8Wpd`%^teh8F(oO8HaPUaeugQ)r7%n2XA8c<;AKqc$72<@RUnom^o^^^ ziTj4~JcwmRt4%y1Ukb@Pyt{Li95k97assSl0|0y{ZB^zKPdH2a$ezuk*PD9{c9!fb zbvnS+aJFH{^Tqq3#3hBEZ6EwUN2A3o<@G|5o|ZD&JDoH>?ij9f!s0fInpAq!3j4)BR#< zSwX?kg06yPLT_%x*ds^lyT`GAv(PJ63%!y~3PFaosq_oo%kak0f`Vn;xi!u0r##Xt z&uDq*wD2UJ!Q8mBlha`qY2PbB9&jN2q1q9G_XcOa*%BWy?Ymh&;t-4}yaD-m&mkWI z4G3kqH5nSODA}_U>Wqm%pfha6mZCB-;sUsj&`PDdk%K3G#JT|wdg1+N=a2TEJ1%6r z-)MvTbg^Q6)dSa*n#}0HkXMJ@qq$mQg z`y4OLoKMf;zW~I^2@WL5P#DD2&^ZD5$2B#Fg(xG#7cx>(G-5DECG#|eO-TAvY)<+= zPl2tdyu+0`PjCfKVZ{g>6Du==Q&=>GL}l>_r7jvUnnps3k-a4CcKVb)SG!B;^En-4 zRC*M;vq@4&B^}w}BPX5{DOQsC`3Q&}iKK(WlxTB1=JYxdS~UnHzPe71(sZiS;q+mb zXm_!sZ^xPI#J(AcL=dMvKVL}}E5H5vb>e#6swf=JxW2MZNh%+oqHp~!SN=J?i-fy# zx)Lo=`qFbOR!R)U+XX541$$gNk9XY;4zN)`0K`#N9<6 z5|PT#J=76>O2Uwk)~8+)qq&HDY)JskKCk#%L^PXZ$>Q?oV*p$qD)&rSL1Wu4h#gd^ zl^yKd{x!=GJx44Ty%tHbx%2Xit$SapWpCOIM$s?lD}IE|dD#XG!4DpQvS;kempV&| z3p@zDW3ib3bj<9b5IzV?g_uN4e#d3mVsVWh>$GmQI^SR#AHHunMj}~+szOwr)Mj{L z*cym-n$5P&Cfkmy5PnBS0SJ^udjR#v0QzGBL7ve#`J89Ng@0(bPK)qf+_nw-1yLL1 zjz7c65eLxaop4@lId=uMbj3e^@ca>w2x}2{$tag~S1#ybHPjW#FWEPo)_cGtxL&!D zavs67ztm;fZ*~6R;otAk=NT_GF~J}glq{e5E2nk8#id;SG+sninWi3og5Chlv=TQE zwGE=2qy>r*K-8D9G-ll2KHS7r=~27JL0%I)DbeszGoU$2s-$o+rxoA$=`pAEpvBdG zaaU)a?69rX*=+`4%f4uI?!`sXuKI>}`I>%V~W=8xED(wNCe88)AWp&PbteVP~Kso*zL-U0-#qZQ|n0 znC-)uwV@Aq2f%ZWmx5jZ`;G$(Rz)%3E@#9tbs;cVhU79TmFV?>U=;T`tq=I#eCU2w zVm0bLKeii`SNq`hWb=W$y~+X_8+Oxf4Jmvn5a=YE> zG_y^=Fjy|NxE9WHTJd0u%W^s8#bxVRMDqb^i>FXuVCx}bmy?OUDkLI<3$?Z?$^mJ& z*9Y>|McSFLtRrJQb(*O@mH32nYlWqcU{dtcWP+0T2YS8H`6HL{SFWgWjP3_| z&kr0%gI@XRulSt%JqxR6G=)ufTGv`!3!K&-i%V#?+wD$eQEZWav4h>~vRfVL@3|~J zR_6kjWi9-dJY#VImnlB=e>h)_eAf?BV31l{^;t0-Bn_x}n_;Ne2MO}54QNK9Hv+fR zrj8!~3%Fm%D``#48^5%=Oe)YzUi}o=Xx0Vf;^L-IT~XZYGr>m|^{d38TR+ERxjEVgg4$b*O%>`(`E8>E<7_LTPc^ImTM<@XfiPZ#^{uKFa z6eIi$N!%cW9fGwYM>8?z-~-ZlXU|?8X-cWnREH};n0ssn{3C9UC~pVZ-B(8@vtzUG znTwQ7A>~(L0nLBwUY-A#U-zxo@5kBX5PDyurad0Ij!x$h}vh zI9iQD569#2aip`wHjCM>9A!Oz^=O7Orw1|_F#R>Kl$Jg~Kh|lc@)_hsfCH$n>k#Z9 z9QQ=v!nK?=g0yqgA>2H!6TaHUM4hLh4u>KUu5l$qMu3CY+BPlSVB5h>n^wBsdCQLN z7G2%!?U&BGy{qhY=Tz5A#hYpojL>MAx#`Vh==OP~x6iq#r}g!siYYCNYv<_oO|j0J ziB&a4t|@sXEw$6iC+g(paC=2_ti&m%o|##2trJc)80ZwoL9@n)ry*deqvmZ4-E?Ml45CFt@2VWmqnxo zeS_4HX31CjoX_FsgM=FT_L<#*u+eMPOACcZDq#GmUS4p9s-mu8$W8WODH%ZrwQJ^K z{nUZxNJMnlz!1_dqg%mAE)_y>N(^Gx1cPNbg~Y&G!bAyq7!Vc@WlSJAMgj{@S4U@8 zolCm^+f&UHT2V@W3I|oBQK9q^_YTBiAJ=;oJJZjxEr`j8Abe)$2fKtu<$A5nWHorc zcth!*QT<=lGn98HzkkpBQqOOz?UI{?%_obpj(>iM((4Iq3~zTmwL3c0ZZaYu-e!i>%xO1SHs`iX{L+5- z8tuMoSnFJ8?1jN*|L16}RtAQeCtZ447Z`!F?bOIL);i+p5-m3#*75MW7d>NB2~q-2 z&uoULD@%-2o)~#A^p8H&QV<&gMqS;tF$2;mx)E^1jgq7rhUd6Zw-lzaI=e?}^-wSZ z_8DH_bICdSC5`z|`)xz*AKA(?_Xiiu=JbbaME{JumxeV!369kfZU zsNTAjJ)!fo#irBh$e%UEqk}95 zgG@Li4q&q&f+cxDhUO3u1p$<&mppysN2B?HST8s~VClfIK`;=LdK+zGmBV3+8=8`r zm&|mu-??bk#gRa)B+uVd(;0FG3mnKuF3XDw!q()Xkh3LP7O!Y=yFA6Ur7cDN*vyKs z*6+6Rc|d)kL0^#W1@8;4Gn1LiBdPwV*TX4jguaGK40izyXMOmi{>XL-^+&Uam4W!$ z)Nk%Hb;P^R7fEjw!SZAVTc~ z2+=&@GH8&o@<4vEFmux8=y-J8%piI0&+>^3klgrShtrCgu^KUQuF-r$^Bv8PFiR3} zM5iOw`9?Us3wxknhFA}g1pMJ8GJ?Ol49nkviNJ+{$UxmcJOkss z+Q#~ZdWw-nh9kACp1Lv?3UZIGVBJAH0?&yw&w#e;;uMJ-W!0fFWM9c;B`UMe2WKbT z?g1nlqQUXRER!H3lJttV7CInwD15HHJ^fgWiT zj4|s@3ZgkbQD5kB7p}?oTpsponQ~b&DR^AQ_VOzc0`j9PD<&GF%hq43Lq zb#c>k>A-VMODq9gH$N-9&#wmpYj&@;R!0lgPhrm#L??B`3JPK!lcEJ|&eB9}l|{dl ziO&2YR`Ty1URLSttg7lfvV3{^r|e_piZYKFWE+*;HU4Pp@)xHC#x?vVy>4t{WByr| zI%CPCMQi6o>*}I&9>pnqW(H|NVzd2c+1%y;`6I`>>O_gwZ66ffcC(FoT4U7_n1;&5o$3F46jcLa2hMu(VlhT0rbCW6kDeE#Bjowen z{K}(Ff#t>j<`vI#D$}dN6e0tQ+GeX{tL>hFvswB!x5HK`To4qmBekH+enoUW)uj=& z!P-Y{Nb2B0*dQ-H+{kzebiDapL!5yeAr*1LShLGtcyzC)_&F!y$M1Oofy3?37rVqp zo#VSjF6BIs(eB`LPDB(}2H0)--{me)V9W1>O=ichner{G)lwqPHAm8MK?y}bIJ38z z@bC63hc6eRB{?sG^rRuN)Tq*ltVk5`t7xBucX&RRDK-ijaAsyREEhCIil#Um3fXON zNdP9lV6)lRPx<}8-rrBzV7JyDYp<-M4d4UHpapgixOJN5Ry z7nKj(*G2+TWnPK$9s&nG{q&_N_IhdIV}+&s@YwdbClAftzJ0EA;oR*P2v<(%-22ug z%+}XAA-yXQiLfWXc>M7%9v5!9uVBoWg8T5&M?=}S=d2gn$uX`_Z^%^;tjlWeWVI30 zkW}gnX18DR#3h$JAw0oPGRcDnWm*Fd(4)*>?z$APD|ql7S4gfiu)4<3Fx559&y)*< zhUH2^Ni6RXjO^qHoiXvS@@l{EWO`OFLkOkh9gQWh zPlChrYW$*0t|$);D7Sxc*ygdwI>8X}1Po$fcw9-* zp5yFdHs+2NI}`4kFf-_wH_zcTH#;_Ltti+%X=zHYKPp_5A2H~wYjnnNpdez<6&C3A zkpXAmypCz^vDKnO?+zy--7nY;H{Yxcj}xD}U-1{!7dZCD@;93c$K=-=YG1nek*R^o zq9U8A${Af$HPhWjM1DpNsOM0$3AFw?f~1g{0#9vdk$=5&Q?ub|1 z@nA))!(*um7yaaoP)Y4LlWeAA-&2W-`M{p-nak?o+tQNH=t%HIwwkCoR+dT)uA z>9tPFx+j_Vw7 zipjdXw5W^cN$b~Z&9{%6n_socHF3T0(}cG%G$G#{wzIIyWW1XH1o{L#WxM%{M3LNH&-(fqy*=mW` zcI?=;X6CH!b#rI8G&rHVFB@DQak( zHJiRUB=c5%;Hg+QeFOdq;o*_+Ygo9d^-z)Gk>eq)TD-6>S_pL@SO?u}DlDuS+j%Jj z+U2cnvpd?xvk!B-^wOut`5XmBt62PL7CC$T__9*pHaH@N#%D>o2Hb|nS7%aq;alKP2xb25lhNbf@< zq~$&;GoxEVhzK{qQw{x?S4a<*&)CHpo35*A8&aJ`ZLC@5i`?@sGdkzgn5RF-4g!HDJ(n(4G$z) zoe4DU03h97c}sl$WvQB_3n#YDom+SGmYcS0eq`#po^a*LHB)vjudkmInRrNfx3FkJ zLqoJfoH6|ghTxBE;+{P(1cRY4ZsgD2JA6Y?Q8+xYB-v57e9I+2kuGYTF=Il5)1!;BKC9>_HsyRqfmDs%Y5}LJd|EYKW%DY2dQ5P&h(Duu$KHk>GOp| zdgs8$dxTrW3kKd7?n3(sW?_ZNdr_JVx!{ZTz8tAyLxEsZbk*zscHev3|PK2TP6z^v6- z(zj&aDsOJa{%S&B{0m*8M_+`YTf`3Q34wyVq``Tr74c5F=WRMi|0C+ zsl^(6F#SOh9EJ4}^rtX~*eW2aRzDn%sXGO>RWk6f5{D#4v(qa0Cudi081*u6bg3|&tsUeP7qts;lcTZrr z0e`>>@&ups5^4?QyCQ)qLkI)y{DiaVtdP3%j-c`hr$AO%EbZAICMs>WYRepbNd}`#=Hi7oLLYo)N9Q5RyPV| z`9T?RHbsNkJaD=M@&eRB{MTdVg3 zB?NGjrIISSRB}IHu#3e-`Z8-(T(W4H=r&gEy1c??G7I>m)+71^!6A5UC9Gq1`fkyr zH3(1|5KSWcreJVrWrM60L~EJTV0y}E7Ogr#fY$do*&^DYw6zUsG`hWl z&hLu`V*1#M0>_$|(`O79RV;MPbXQC%sVgYFH|a{2l>234m_d`38LbN)MSf2rSQj=} zoPrq|C1FtvyDy9QS5Nenmy1rfarfBHN|OY@=Pc48>T1k=fz>Pt^tb#Y@w7Xr#ac7q{w@yopHN}IWkZ5IATfm+#oyS~Ei>5G} zXtHRPc}x#?WO}2(>_$Xd!*C1A?M}ZfFW+8h4C~6}u@|`A6YkkwDoB+VRmEG1p{vj~ zuc*Z9nHbiKh@4ql&&2jT7wp%Qa#5+rAnNzp45FkP5BAmgVp~PAAes!U(B&;+WhIi$ zYW6W}K-T+gP*8C&v%z7oYEctWTP(RGV5Ly!L6||a-DNXK1_63DS`ogoS^{QMTd_gZ zK)7fB^LvW^?~Yk5J#D5mH3K-Y79=zsaG8)*$57`J((+L8}*R z%wo|>78%S2v&f_qFPZavUN5wgosw&MzFp@u6nZg@F-Qf$JjPlqnAT>8$+yU49~&(( zm?fh#9G(_(%c8|rruCb>CR?Y~VbJF3wLz<>t*D#m+73nqON~Go@4z!cla(-eoS7qt^M2llM%VB8O@sd1zLi$uxb6 zxwx(<--Jyr>#r{boAn?#6jks-(gumbO3;fjF+zg#IJjJ5EG~s;hxVzVoB>GyCW3Md zjNc1D8?kVH3INX6>C+Ph&AaY#RZJwklTPXV0;el39Q2Cj1 zge~r>z3I@!v8d!+yX%reeL+?wzWv5e7me9;^T6M*p$l`K|6=Bx{o5v8G^NG%o_LrU z+#NIaOv-aX#9A_Ia%W4TyvT^?ipO$kuo8Mx>zTFax>=?p!c8@8=jg1Lyt`z{9m_kd z7AF74TlY=;?AA|Oia&XO#-GIV8N2ab*F$dxCN;Epl<)`NVdlK#_-O@+GOZ8OO9aIr z3oqps|LUt*JcsK^wrQ4QH>zOs}dgbKzHrcx}H%z7*_M6(X8Y=uI zzfNbj2OP8fp|C$$*|?;tc*3S>txH>?))KGPT^g?oR#paEDwpk#PTq0Dv3I-do4&{7 z>!;1?*{9wpC+TLe4F>gZ8Jz1L`MQ7r3%N~87KiR5gojPFzG~!x2~DaCxa{9m*6#_i|hsOfR_~z8m3PhD&*%=HqeEWa1j@gH#13kShUA zATH8W?Xl7ASvwq3{-`VbW92^$us~|B>aA*rEXMH9%0Cv?m5zfG+i7cAYV9=mh*G-u z|J(lk|HhyRQqC3}P|mYC;e7m43gHartO2Ku-Ely9xO`k`p`WETY*12uv727luhtc` zWj`Vgk;X1CRO%aWn?^lD?210i)=$#FE;0$HocxDtI7fxUQKg^PModz~7{oT{9@xxl z@|rT1&f*P9FHi4%uWr5V%N-M*x)%*>AklyNd(BP)bV+!YokSJ>7fVC~%FxL9tUtyXj8)b zOyANw-um#ZJC>>^wn?%pZ(D3ufUodT5kK$|dlIK&TuwCN~?T%!?cN-1)d+ z+%wA0pX&M9DVTWey8)YIY`JoI|D6=}cH4{0d0U0U8CtmX@QIr*ykJbRRrhDKrs0{s z`&yL8ezgw{2rvHe%l~!JtE}M8+nDbcd$husF~zfgx$Wi?hwGfh)>5o#m0zsNjLT^> zVqmS4szB&8-TIL-WGR{B(Lz|0yMpoLgoc*07DwS*+-{F)29lJ-rJU?rL%uMuk_Aoh zRIj!h{D5}orfD$i%R%rGB&2Bo535)vaCuOjnWS+40@WpQB?t=<*ap#b2w_rW9Q82J zgF&yh8{RZJUW1^y!TA%}oort@HdS}tv}UXAS$BaSE}$JhZ|bKC^*`!@7uiR}nUBJU ztn1PKfHFCq`YtnmS3sEPhj+dX`v8~gMcFBa5jo zs>LY36*QNB_q$l&r=at%+apcUT!9-<3o7mAt1A|O0SF-OWNi#PBDk57&kdytM32={ z8>>VRR@{RPFcnzrVjdK;BC!@m-yk!fwZ)eLWa-1)%ifyZkdR=qP^ z))sB4mVk*1TDOq}aNmI|X(sqkEY!JLIQ$S#5 z*-;#7s$UW_wS}vT4T2OXU)t8Q+h~J$2Y-TWGmywebLt`OKjj(VHxtyWhPCTDNWnGH zK{^=J9y%6-1fmnvEP5K9iEf20ehKI|T8uDJhms6oY-IE5#4Qnl2z3mlZ_*UDl4UF$ zRghLCFQ5T5B??8+7)hj|OnjsYvzYU_y}~!)S}{D^<8^k<-L6N#$3mT>$XfJt<$rG4 zFt@t;_4S)pfHLe=P96S(@;j@cm$ActU{MyEe!~xywDP|4_qX<4oqCWhnLe>n(pqg= z?bZKLRaq&>R-<|Rvd-=E^IZCJA1dZvJi%Wk$pL>0Td=4uZm4Yt=nG2P+8$X{FxFgL zaPemY;mI~@AQYYy%)i5uFT)X9u~jxLU(;O@etyL{%km4KZt1>xveoy|VfA!f=k@!0 z+B$YVyKx(nQV(7+J$a+mjASHuavPz(?gvDgV_#zDS=k?(*D0dVs) zGNDX>nGP>k-y3>ZLr$R(M^eWhYQ*S8S6{np<)OU1L&}pkUdBY>yQ$QTPre|Q4y8YH z`0~py6DMAF=AIsrPudmgmdd z^Y7$b(|b~izn`Rh)D8(}y5`^343^*M-mBq_LUaBMgsDIFxN&X(CY1H3fS(GP}M$g3TJp*Zlp= zIa}B47~^{tG;Y~E^le^Gr13J;_XN5gEECr}|HyMnr%SU{=}482VNG^=^g$o zg)@HHKBBbj_jnra2cO})*>{jQ;&0;60U3KRlx`)@bR6YyJzW z_u21ezb)Z8{ditYCJ*j;SsGrCB=TBtUzvGVKs^O|pW2o=ccUH}{8pkInSRL6_%oy< zza_gqaV;XfgqKC{=lrPsNH^0n3D@+D(pcu2?(wW4n~v{`^vf+{v}>wo=2s7YV;V`+ zNT@?GeFya#M|I28FO2js()kZ%h50X~wlh<9KI%kmRL2#4M0LzO8>}@`}U<52!UovXgY)~5qg29 z!Gtu>bf9V0L3Vgl)w}ho`qir{YUwQmFq4E#CX+$Ld@+u3WSEE%}f^kSXTQ_%-e43O$A4!s~UNb^Ghi*7ww(Yna;5-|#}??#3q@uT5Gs>BY%ClfQY} z@RY78r>A^)d*AJ6r*58ld0P84b=rk#A2-cy+S>H&^v3B=Pyb}bp&2J-dCl`K&iicsq4`hEzqnx0f=3p-u;7D*Eem%q zJin;0Xw9M*?y0}my!X4f96M$4%EhM^f4HQ3$rDSixAwH2Z#&v{t=(w9+A+Cfd&e6~ zXDnT{^y1Qwmvt@sN@uKdXXp9lEz2+9?EC79BP(8CId!GH@*DSGT2;TwSoO@Rs}F2{ z;N5Pc`?>D7S6^7uv}SnCwY9OeJ!@a;+1qnt-7~#T@7oXdJa}RKo$FuP(7WNxhRYki zv*EM88GZeI$NQe|ySQ=6#{C;#>hJ5nvT4z#OPfB~tZn{aOYfE|Tbs5HY`wItXWNBs zH@3HLAJ~57bL~6c*qPaRYUiiB`gaZQdUbc>?)|&Z?f(9r?mYv0PVc$2=e@nHdynqD zxG%Az`@9ls2K<9zs1J@3AAAI8A$Hh|dl|yr-l=P^)K-T0pm3HO0@}hFH zWbpg=Y5tCyQ$6+X%7yYX8f0)yl?ayCylqN z-POVB8`Ya;uQ_a?!s^`<(sJ;nBlyIXj&5ZoT`Yx7d5pd&j@mKR4Ji zcxI?&=&Qqb4xb%aFxvG{>qCPNy?Lbhho^ zj`tmRj(_s`*B(_Leebc&k3IX?jmO&`cOHN5MAwNUC$2wn{tHLHaIN+)M(`Ua*mUeV zEdCfiB=Tb2_=JCTu`@7DO5o%G*L8)N3YuU;?Gepz-FJON$73zH@*9>(U}ZWS(Mh~b z^L#|7Q1_LHPNVgABRUgnqS1)X#-`Azh{nFw^g={miQ)HyBKljgR=SS8+BaZlu;$nn ztoS(IcWaLI#w?^BsD7NgC_%1^V>8yti}9&_zZyHd^O%d$RixYTDPyNqBPL-7?OwFE zIkp2Wtj3x4N^m=nw+_F1vK939fD3z>*h=&NYiB1~b@;ek=`@38Vrx>dz3^;mra9Dtoj&J^b5EL23uqxN zqIU9^H$V)L8(=zd&We1N)XHDb(K>Y;Vii+kJa zX#@4qM(U?cw3)WhR@z3}u_e_Gy!^Nm4;}8NJ+znh(SABW2dPMhNFtdODiJ4@%6Onp zrva*vK~*xzLi9QeTm4?FjvR8yBcBFoh=yr|M)6eE5qg-8(lI(tKS__!=jl;;j2@>G z^aSDO59y2a6n%-FrZ3Y;`YAjY`O|coeukdG6NS&x&(d@BbMzJZd3v6Hfxb$=NN4D4 zbe6u3jkSIWzqIhn^dkKVou^-=m+05%8}#dRfqsL26VE1olYWa{rr)ODq2Hy8^m}xP zejks+{sFy0e@L&=AJJ>{$8?3hMX%GJ&>Qrp^k?+v^d|iUe)#Y&>23NedWZg+-le~x zZ`0r6LDave@6bQcRr*J|M*l?LrGKXD^e^-t{VTms|3)9sztau+9(_pvK_Ah7Vq5M1 zqL1mn=@a@N`jqhgB>gYlq#q!@;|?^=(Gx7mQY_7|g%-=&0#IpmbOKFdz5xW>Cz}&7Nwn0x;#p|qI5-+ zt`5`o-Y{Jjr0dX6vTR7Mo2>e-uB2QpIf|Cy<{&pLn|@}T3XP$>oKd6a(LAmL_FNFzl>cNBx8Pn%0# z+Tp6hT`eO-2^uskrIJt$shq=LO15U1+|3PIhF|4H$divq(Lpw%eLHp7QLGYA%TNc> zxF?kp__zt#vML#Is7g*HX*;^btECilGn`=%7yhJIw)JON(vWRD-P-< zZl!Hq@qCA;Y;G#Lk*i8}QOL@jlvEN8Lc@@gmvk@bYLdf~ipHTKF=2JC$L*plDU~6~ zDb=YGR9NFOH6kIDp0p)^0Kl;9v}!q`cp)fWV}h0bEpK3h{9RjRIRX@t2msSu4Z|4QMC{iSyT+EoGh6& zQgR$?D9~g+Bm*fjA?@3_kO&YFs7T-l;<)-KFRH#_6e8NKN`}$MhZRGrN@HRr%DU<$ z3@)j#5r=2^2!Mv!$O=L+ESDFcFH<+mf$T}>)8rXNGPqfioRlM(C99fNtZEhWovKP@ zlY6oCTYM2naRN3^8v)ej_Pa18?w2eKu|dy4LDO9YbtCx<--jrl{_E@ zqY(-&#U0m;Yo$^~1{$C|Ga+-s$SXpvDirJSoQ7#EhUgARVejdH^6hMp3WZDx!CAb8 z$jK9Of(9BUWcl{QN}?I~a7*T?AqO_EB|XWlxG8v4=qxKcI#(6RoJkz{PxnSq40YqgS}6 zp~142_2Hu&G|M4_Z15z&t1EExzEa6z8X*tNw|idwdO-I&=u?kp51g4uH^t~I0V(w0R`i!MK%Eu#E1}U3CL{$FlFGs zgped#nB#l|XHl|HgSKFVkN1FAkHfcSfOH3QFTo?i=jGtrH8@S*kTdWLnCCLD4^$k8 zAwpLnWJ9E;MJO#+OL^4wG|PqZdB*j1Ps~_GfJ*e3QV^&(M})E9l|`fs!igAy?CS=s zrJO-!Tg08LR7LNSsqj>lmnyoKSA|IEWq?C;jyRwNdQYgWDxXxcd`wgka^fhIIe9`( zh`$M0z~2O3%u4Q7{d`CU6*D0%JZjLsD4H&Dw}P;dG9+6h0Z_a`)sn@y0&6Tpcn|QF zJM3FtC|W)w!+FMNO%sC&%O(;1jgegB3ZR(A@h(v4uwk4V6nu^k+rmUaVs%XEOb(?rgNiIUkfy$G?PS#D#E=2L%!~6(5M4v$3@^7R!VSC zQPd7RKmd>lIUztMWC;f~zEa?zG_PtbODL|}kped1GIOC<6^abJsEg=$8}P2%uI?6Z z1*A!1d9|RGD0Z}VV99``pAagANCtT^+SCblATwidEN6w!2#El(5K#%ESvGL% zqA9f8)}9MPzTia=hFOcq76RlJQUG01dU>4tPP{DJao;V)b<>Ft*duYp9En$)p}6cR zVwuddV>a6u_#t@&BHEfH!y=0v?JFja<$7?ZvhQ(s>JMj$Vb#^L10OtT0w=yla~(^? zVOe1W(bSiD7}_ExF^p->ibIe+Rz@f@T>@^fsD?|&057E^WOc;6oXt-w{|xNk!fAHp)%8gkPx zQ^(RvNf?Gd3^8?C#1^+QVk4+ozT+PD5frc-0934$3b$9m zrn;t&tDKk^2q?&RD`y2k`0hYi5B|sgkNw{!CZ;6w?I7|^asQLCo&KD-h^W{%)BCmw zzC{Sy2m&Fe$iV!~{(js1-_nZ!^FT4Q*0=j+z271P0Rgi(Wvjh2)pz`6U^^fnAkhCS zBvUJQlW%qc0+L(<0*X55#~ku(W~^@n0+N>c?Zfmfb}+30VzY1f%_hI?|MHT;`$O%T zSv$FXvy1N>{U9I!jI|2{WGh?4Z@-M%?|VLifPf>}BQ>2_>$`pD%`W}lSVGWEFkBmb zYvXS=`W^dU{#ITv<8(V)M<)=FTt*NOm{$-Gq;BRZ$R1Z?gYWrr+V5Dve~MI)Z~gB7 z{}Y_#%b)okgG?y-f5(7;Ol|Sbxd9FJjP&$&zztvkNO}g}VS{DO)?hEo0f^5BJ7&{;(MUO5E?jpdmFzytbK0qntFzxZ*$3z%aKL=^IS zd!a$V6kt$5zT>Cjx}?D6k%EqGd=?2kN45tkCrk)_dHW;P)@dlLs$sQA;N3wGB^lqq zkQT8Eio`mpB=5nIsw2@JN+U0pw%KSQqgf61gF6O;ht#AJ?Er_TDh0ZRV_}7riYa zW;2(tlo%G-fVqAN5Z85s5CbJkM9z&SN0=L?qPGt~LPEh%WiKK%hAE_cgNRw|-FTIm7&@6#pkFa2B!_ z@Pgn=l~gQOT2I{2jk$;U4kc66uuzutbNpjf;xqgWu*d9V^Sv^lUtb`IZotki7%!#6 zB}Sha$Cfmnw+;39F(c+TBR^83W)St@+60I-2#CSZd}#Vy!tiy<&^>zUqGpT5@}dgu zixrF8ETDy|x3#6}$8&^r(}zw~Q?r03k>l(1{YKgtDQUj<*ELj{XO1`D%zdU~w&V06 zbW7I0TSp+G>`|-LDDoa2(FinJ=Mnnl0Hxe72bjLM3 zz7xD&GCg`S_MIH~JB}uvh9y|M{2O(RLzgz{9`xNPg-;AaYfGT-&p7e0c0v^5YB+bR zfHXM$l}oMIPmm65SrGnwdjnUKe8Ikbr+r4Zz|JQ>myjpWQ9CLI#6o8I%h45`4n-cH zhxp&o{?MREF**)xm0`%zAoba56D5GX+J9$tXeqc$(c7=Ul|~XKZk~;>&dD&`R37eFaeR${wNpZxSDI-t9^H~at%iM(k z@Fc|HMql34N$o|1Ss!`&*W9NVwLeXvkP)!?M(nr~>WiM;_w}qanbyvrtr`ux>hlxZ zW0`5&tFE*wE%t^vYA5Sh2W@6MMc#CmEGCUD7oJo|bPgEG=-6QkCybQ&7Oxl612JJN zUQ8t{M;S!?F0F@GdHay*nz_a&j?!<*$M3ilJF(5M=2rURf89LYGXHQFzkg7f-qMpX z&n^{5J!tuk)tfo3k*z#On%SaVPxFj%3qMpkUZ=hRdo(bP^XE49l6||LzPjY!D|MbQ z?XSdIYY_^lF~pDQ$oEh|St}G6r-m1$LsZf2rM-aO6@8Zqn;JFC5vXV66-}O&Ji8w& zOZ1PMwsa!d}}V;n*`hzMGS8}qAY zreB;u8QD-w9V#*B}NcMi*tcb~JroNW>RUZ0ceD8Hs^lm319Tyh-PJQ%cL=D3MF!9uk`kBDls z$M(aJ%+~LhRoZ*K;-^?a%#BGc`&4|WFu?4cP%i;)6;6AGW)Y(vRi)-`e|qmq74YDbZ8tsVVI69C?kxO}fAf19NqOS+sy*}%&aHA^ zXg+Mg^?p5}n`p7NXokdTW+(7!O(j@m{_9KnWuERZ^Lyv(fg|@iKewsq)qf{mSEmg! z!LXW6_0vJ}#{USz@`m_Qy}odi-K?M8?43fzZm`bVFG9Ij6e>Pd_<7+;<|st*m8+yl z&$%AzKp@+*^ukW3oQdM#=2a)I4aRw(sNli)&>X4LHPT(=>}Lj|n4wnWrxGu18!sN3 zzn%9uCkcIK9CWq3O3U(TXZU!#^OqSF>Z-jUs+4=pFd?^8(tsnc%RnkYzh)`hQt#!tZHn zBN`2IVVnA$vz8rg1J|`)3s+kvtlH`Fv?d9j-qs_L+d^EG`~)l@&A6mBogtW0CV&}G6kIl zb+PR|ta_F~b7RMF#MJ&Qf+WNb6{s~$R*dWjt-`1^`D6w(nMll~Yz3DNKyqnnf7VN!?6-L_Ga0P^o513Ave z$Lj%59=QXqq$=NKwhK3yFDab91kqm+wFyLm`cVoi&{9PotCu%>#r`j4$pU_yn0w`g zDG&W$S4?Vd5qX?{a2Ye`g7LxSM|}Y+fUmyf;R;wHK{^R!&G3_cXlRh0r9Go*6q2~H z%spSMzgQ`h&Vc&iUOyUrV)j$f+G)5< z_QlmQds0MIN|VdCBM*;R0@D!MF%E>+yoK#iL!=*;uO2LutTe#nIo>FYTUy%(OMx52 zQ|E@J)BY|`AeKqRH4ju>I?{cu9(gkC+V%hArjMOiEkKyEBfaR%IPG1q8l9QK&nVt`h12_1bY zXvr&q359!4Q)&ZeUr-;g1M3Q`q$t($v2P%_6i&q;6kZsAgp^$xj7D1?ocDsn2Xu9; z5FMgnGy0*}0(2a^HnaD5Pda8t;iFu1n}hCz_tQl#EjpGG#cba|i^G7jsH^r}Wn`*x zWnu2ODuJ6(_{cBb-|BMQKU(qf5af@k1v9(wudR58V_9ELWg7VT&Q08Y_U-=^4@h=2 z$<(Os+cg7_PW?sE)w1t}&(brdH&N>Es3$% z-8s6K;EH-IiLm`P(?+Sqw){Ll|M72{>&1B7nwy(y6ABXrHxW3->4R&}c1c5PPA$!M zXV)dHwN~zNqC7WF9w+mlpST%R$z6=Nw9%`$E}o277KD9>+7AbHWU^IytffrxF=evK zH1971Dtt=7#L5fNFgJ!l5`7xMOu99}nKuNF+KKo-g3JkcVA&s`KzlTW47})I&8rXn zpRd4=af3A*HatfEUE)h|T`b|HD^TZkc<5c?l0&cCVUe9=a56O833XVeErU|!r%f3} zA&M7WpySxlxjnM-K8w5!ktSpyTu?!1ZKU;_g!>NDy1bz5I2_MVyF#C1d*4`)+WKwf zC+a~X9gqjAsmG>6M`rG{KdA&??d7rI`ODp}>}TIx{_^~%KBY?y+KYDtH`Eo>BVlXv z=HE3v5mKN)V~w`g)?>Mj2yYSoiKf#)QM6+hb3`QVi0UK{6ig`!h++?DEP-)eUJ@2^SHpb6Nnx(OeYY+~C913Igw}B1 zubUInnT>)*e*M~Xn91eV-1}9W6KuJK%`I*3azzcK8C@wD4?8Z!#H5*|uq#3=JsvFo zs4QO9RgaTd73;!Mf_p6O7jmpdU+;!l$z5jEd=gx(c2b3LCPx+Ubm< z^US@;P-cps!f2K=bqI(5TAm_;fbF`Q+ul>bnwXf4u6QoGoqc@gm$ufP|A21dN9`=C z8eaBsnrH$xMR=H75e!n#&)3x9P0q_%3knMe*!%o=eHqn#973xOGqshe)z}ei6C z^(qV9h3GnOHGe^^^8Oq9_I`aNVajx_(i%Zn20@~k@pOK7^GyD@#I&gr4R@EKovcQL z(VXsIb+3DDyLRv&L*DGheWd7?(*vF#29?v=*VWcpD;g2k?Wt-bzc8OWY)OL+M2twLpz+k6K}<)s;7kx$`K4_{YpNN5CTecW^Y zT8^2H@G0J==pK4H`A3Z}3PU0UYY_Qz_Y0I`(kZCGQqR4Q_iI*?df7gj$)(00= znzdecqR23v27^Q(>~MiG6I)^=B2DBcN0;1|N;!>pIZ%WTZS2x?jHFCjH~1F?;4+YrG|d(~e}#?&z-cEvQ5o<|s5p9d=x%imfjD zYxw=i_L=+?+>BCpla~doX|q%>JAH$hAszO z37;b{Rur#zb&@fDcA(^vP;fkx^Mb&Fx9^g23~<8g7;4#%|A*!?`YDcDf9j!j*79pSHpKBpA%>qDGUN2_xSwnOQ-vAe-Mie ze|AVX?f{l;T69jFW^}_KiKNh49MTxGmOw?n)i2^Ho~xd9G7@xDn04qb-%%3>dE8izwhTPG@xlAGqNL`ZmjzWEXt*!w zLRUZ)LZ5^PC>kSIf}b)NwB4iA9FHyk@x z+WW{qOtMo|q%c5A8(z-Vf%I7odZrncCJT_7wpg596djb}HtVc2^$cF9`K<69=Y-HA?AwrxDG`z!~EL&{(5AG|Nme<*uioVw@B$Pwvuk zn&b}j$u{$eg(w@h+~?xxR&nA3FPgqNr6rFTi{^D~6WIt~-;AdLsO@z64y$;|`fL-YW?kuJs z|2cBA!VR7r#XMQ5)gk_2jn6wZ#*< z)pYZW`3^vAASTE>$Y9g9Xk-6RS|N*fina^ap}pF9sy~ON(Mr8Zyt7(%PyuEY9ssfp ze(Gonsf@Gj;4!5ayb2*S*nk?+RAZUbS;8hyL*vqyD~)OYgchKD1I=$ZiqFwO64cX& z>EU8^15GU9Om6t*PPC+Y{I_^%L~`;u6!FUdOw}bS`KkCLlA$hWT{R8-HqkNmQ^Ija zVih$(2GrPD;^CyXX}wstmKY|4)n-^T9n1~Gqc}C-zGtz~zMM<#Hte+NkSkV1X!VEF z`;bN&=NZ7|-Px|w=N0D`OvljM z^~T|Z*2Xhvf>fLo3hPK3TEu8->-V<#D4|sW_czr}10(sO!xmNMR}8Q!LhSBUp(9O> z_BSLG!7G7T%f8{ik(LgR#)^@D+xVwn6xRGrZ-&jU!fyVkwqN5P7&bzYXTtZyybR`ec9lsTZd9(tDP)3kUEF0T-9#Hzo4Db5Jaf z-$y7Ij#-KwC!<#eHqUV+9g_Ob$gLylrp=_3EahuN<#sdshp8kT1OWl%C#AF2_0z)5 z4xrUZ(WFHI%y<&rMW9gi;m*pZf{Te`fqi-2f;7~a0InJ5>BL7Wy#HG z7p%Ka27(jlY6{SMJ9VI_jK6O<4b$L);;l&M!EM9VIbq7iGzwu_|F9EvB-lt00YD}8 z2~8qM`I~1zL#aWGIY`0*>&rb&{Brcqln%Gg%>0tSrh9M91aVNd!}+S=`S7O-_icw5 zmzsG6F7nFI5M>@otj!uh28>AYJaK~wB1XPwbd42sJO> zxgyMox#;;`kAz_)Ae3C;YbmhXsM^>Bq?stfGu67_a4C!jd<~gi#3l>#WBVunS+;EP zY{&2y;>6{==V;-#=#j$kz0=F*4^Js6ZJ#l0ZF2B!P)5r>OB($ zxpK~@R^7IE2hJWm#C~GkK^qKbR@p=Q4-r|5tkw$RtnKI?30#B_(H1*~qER2Bech{f zC2opa7MV+dtD)W6{@noxB-d9me_rr+2WfK17rTmyhXIOE zpp^LvN^4gN&YlZ5kzmH-&-5#@rJkNgAIL)_iS$#3yxJl*U?R?NE|dx{54X5J_&d%% zBa%%keARe7)~-%FR|r?phgcf8h&xCcQgj?96g5NaCvM7G6B0sIXrC3E7Q?!0|6Cn1 zC=V$Za$xPU(Z#%pI_h78UP{)$AYa_P3cqoiR$^;3J4{ywhFCMEk}6-lIdiU9OAF00 ztu-<;?-Yg=@uZb+zr~~!^cD3zBo}p6_AT z%X`|qD^V9RCt=GL_2cZIPilhe8vL|qL}a9)D=Zvv1WTcuKHiw;8c@?nlu^b|(xau7 zDod18Z|7p!QdP(OJ0>K52FcgDA!la+Yp)~{l$yYg#3WRh#HGBm8UztlEc>t5EO)Lq z?oB|)!`aJP*$ccpAW{FFo*IEwuz2Ef)aW&*f-R;s-f5njGX-~yg^O#De=XkDWQ=} zxy-#tr$Mk#PPwQlELhTVU=EKa`|;7@mfN0SX_}F^PpV^R`6Stp!Bd#1X7!596cZdH zMUM7G3&TmY&AvXOc^*dK>JK_aIi5WkJb1A+V|vX~SQ}G$Njg|~ihhgMjAWCmEWecLlm%TV*sKSQP|DBI!LIyy0%C4$L<*T(i26{j=fEAHFG z*%)Jw2?up+>GN@koGuTJz)!5?4mNhAh`x+;1`M1~9jqY@38Ey*tA2&kN5oDT+gVp% z-e~>(6_Bo)gHm>R(t}y$;Em|mYL3JoTuz61jo@fP?zx9XYh~20MG76`Ra|ZG%I)F_%NqIKn&ff9v?~k!R~CxazkY66E5(lhB5UMs zHvq9~3keq|kPM#DwgYTuigIOV+)dNsc-`Di*|=by6pirs@3jX-NN(oib+^oI%s>s1 z5#%l->&JN&1+KC3r!apAg5PnLy|x-mW6M9vScX-&HPTu?2|! z+9@7ZL-aP5HKc$IPxy(YF7lSpV2`zn{b8UFP4qGSldoXa>Y$xgc7TsbpyV~~2mZoY zI@`kB_q7)yDb$ZhF{5<5;?v6cFjfy7rl#!#l?oY66v}uuJ3qPmtSZkAx%T`ubnJeX zjflSW&UGYDG_6oi%X(cGvpS8#MRIJ^K2`?7_{tnNW>5S_f50g#Gd?&LOG~j4AFKNy z1WGk#IlgE60V{sNz-}f2NYF@N=9?>|(n{te^buinJ@6LM%(9I8e%mtUd5##p^#=W5 z!C=;7ijoDI3i-GwIy0~l#@d`mAYNWrQJ7N|*^|8d)9PXpGFWd)65SCgV&tuC6`T)l ztSXf{Iwbdr8b8KSf-KQHh-Uw>;0W*^esUalNxt!r8(g<*^40p~x zv~!W+sC1b>kw>M^hkC@fOsI_DcfN*7kFjW7w4VIIvIM&@GHm>3Z1Ze$@@;ZS?X;Kr zb|-IYk&Uul?fj}iQDcg^*PaB^1~Gr^cnN?|cBF>jHrh#A+=;R##DKeJs16@1*Acno zWEAU4J@-Z@|FrbIS$R-+QhDChmJG(<+c`Ksnt8KWUdqB~p@hH9P*F|<4UfG;oqhe~ zd_E?YAeyjAloP*bl70@_ez1lF?38(g5>w z&+wE+sF#(GTzAsQ*Bl^yZTM5+HhwbqaPV?(duZa}NoFa!3^;XgL2f>Zc1hkQi6eBC z*0_fLhMixHs;&`(u2)qV3kxDY9)5O)z~n7oek`=4mI@V&!}Gdhlt=4bM(^)@%T34T zrz<_dH$7+(Bve*duTU-1s2Z+h085%<-mp*&eE_%(;=rw~5B6~e*vVi5UR_(ZI@DeHqWz%cys zcFi#IE8aYyM=h+3ACa<(IZHB%dxGavB+FMvhRh6Pue2Or2>3wP(Rr9q!%YVnF%g7F zVNV_Y$X1chskLmYu53??@9x@cqsnU}=yKd1V>&?T z9wnTNYo4fOK)e4f{sLp|FsvBsF7smcak1Qa)=4TtT~oirQGugpes?#dNoY~`M!aeI zTIbxdFO8(<%F60i`(BHLH_R=u8obC*ahuoidW)sS`S^Zwy%et7+}WoKRfh_#(LAfk z+4=n_1cy7tc~5s>U;quCW+1V8xApn7D`5=SJ+yPY&c65Eq|Ssi;*weBIvD9Qw{(Q__|$sNwf||j4Z#=kEq5Tj0HT+To=vv zqry_-?cAbpo-P-y`$7{5EDC^_dxIGmnCnicI>RSu_E68{U|?N}*c}W!eN&v)W+#n5 z9U;|R*ZrK;H&;f^yLZDIJ9FtbU5~~^BbF&b?m%QJTy(yIWDaAaI1+`VS|RXU{l*(Z zQuVXlz+Anv80g3FAzauoxd$>O;T@eY{BdpE*M4+&DSY1GY_{jBKI4Sg26pVCw|2ZF zZaYt{yhnZVRcOBlRj)US-15=cXG}Qbya%i8ayZ!!DuZZpEcbwk805HKF(!Haa_bm`>Sf2SBDwDN3b_2#=5}q3KTW~dkd^%->O61xm;up zXzN`7zLnE$E6CaM4mWe<*nNLlqutE+ywvc}*0BHiKp#+o6jZuO^-PM->mXW=c2X4b z$JsQZBYx;1eM|wEM9YgA#$^%`W52r=trmEUs}0wVKO805G!JzVK#*aaAlYo8K4h?) z!<&44S%nyKUe;rNz5a{Nu?tm95BCNm*8-pf8fGmlHoK{VoYKk3 zO2=_?Q+qNxVdB>!3H+K1H=koRYDCGnJt+u(dr3)M-k=58>qd3lg901jzSsf^{; z+A7h6Ala*_r$oblT#N8C%>1F$swH)XT?pIl2K&NAaf_Irl{dD4Vh!e_de3O>yngY~ ze8U*`m`*Z!guF8ksH?w~__SZ{v<72e2ctnv=D?t2+|ip5lFJSz9J>GuybS`4N>z z3N1)({5uLS(kG5A?-eu~}4ZkHzmz~wSV#&GsniwuEs$rU!Ii@ak9FNfNADGD@k{w~- zakA61wHK9U)P5AG2+%>UV1h7ccI_@-4W{Xu-YQ+ozajK=WD?FUtpgq9x7%rwt7L=K zj_ip%?&>_THV~*R!l7ZRDJ2K_XtO0oSnNFj;p!IAc~GT$*^^xrS#L3r9}H$ACX@Dy zFrCn_OsH*}n@XsRd^d}D*ZsX5pP)HMnoToiJ+Ga+6OL7YJ$rvWOsmc$tog0!Wzi_p zzfLE?Jzo0v$0G~xlEqvXE=-lBUh%u1s5?9!FXLk_Qq`aLzyTofHugz$Rsp z;h_QN5+%ws^A}K=k|*bg2GyC{8MdQYftKqP7Afek}E8lMJ2(u z@r3E_QpQcOWaA}Mb}3GCA~9pSKvwBW`H(kzjj8;wXnoV-up<{|*nI2E1xiR7JJ(Av zW!d)Rfu4DQxRXHA*CT|&K`CZNFCNmrF$mtlA_bO9b3>JotHWN6+&x3ZZpy(N5?h6K zma+U^b=uET=MQPffxkYMSmFezdyM!5k3}g`dYPWTFdG8h^&=RZe`lK>Yn1U^aQTa* zyZp*-wv6@Ui2|0;sZ0}wG1IRN`ZfcmSRs$(n3G~~9x(ruFhj;m_|K7x$9=ua+ZI6# z%a?)4Xu|lcY^>LDIj7~8u4NMxBc$%Vh?2Cc;Lj0E)@t(M>$r1EG*2G%l4tdVdkFpr z*@%Wd)P#NIe=gMt*GXqTuSt4r2W~flz2DeD_{VO7z2EKPUSGky0nbrWr`Y7ro0Y;* zKC&rGmt~D8ON$^}Y~5b&G67FU6D9wmG5b#eYQgkGn6j4QVsJRRXUpBRLS=h|pBQW+ zjag$s-M@q(Yz8qI@uhjJ0 zDms0rY)->!9WtwIPY_Z#dI{E4c$M(p0^HxdZwn!#Hvw|3A9R~f$yQ#YOCARB+;jvE zkzd}e*|dF|DF-7yO0ZVai>8^{Y~^Q=?)~!c(WufZaCZd~J$M8dPN!7C6+LQnH!RVZ z^V5f`WvPPiD&jU>p~Lg4yndn8DK@mBHS?H7ayRSF$kTQl>H8DovY&u^9v@*0!f zJvmouKWlesFYtnn>Bvd4Cy_;?-YJc)A_xG% z-{S4o0bJ~~@;sgLbxjyZg>JbKu6a#i=lB<4D&YPwhnW);y(_M}0eAf4wrY2WJVZ1u zxr*D6{OjQ6>2e}HWAU=6WtfW{@;0__GHUAg$3b2f13&i0 zG;_P5_U^my0#6N3Ow&=ndj~w%L>?V7j^bxT&!f`T@(c7ffkC~w5e`))<4Wk%NqI?t zKz6T8@bW+K@Wi#f9tr8j8o8S!k6gu)ldiB#fe}OR}WJD?3JleQq%G8(+tY?yCfZ4nQrfsk_4N>cML6j|u$yEz15{*>ysLCZaD$4TmEzr4wy|cr&)_0eI=7o0w z^kR=5yCEI?fl%7`q{}y`Uq}hWQ%X|xLKShxPgvcyl~~)#xHe}|=!7upvcySVAv_Ye zI{=~dputf^!rR>_jDtT8|7u|%lU<2alZ9a|wHhG!yRv&~o&MA7Ith{q$-Y>-S?{+` zFjKVJ6{by0HrK`B7ttK5iq!>n9>-PAVP;<}az&co#>r%Uh6S~rlM z-zJmjq&*)Sa}6Z=3iyiGM;37jx_wH6ff~|B{(GpC1zQq|XV85s8HeH7dV}?CqyfM) zE#NhsmNJteK!E{lbZF`@w6l%kw}@IO=5zanyK!MZgBKZ`eBzS$id%4xyv{vl!IYC> zmZXNu_4Gbw5>l~3wzQiiY0IzaF7~k?|3lNAmpQI;JlSpura8CBYhoi0UbA|&vvhcE zzf!&NHJlD7_^6pz_$a}Bd%8!ybDb+F%j^?wqDE)KLJnd2(UbSHEkM%qe6J$K_bF{} zqVRG(r)W4oD<57io}riQw4dnNu>#CTNc zkf>0>$1_dlUr zt*>ad0B?KKqmfXf#!IaP`z0(L4CK@`h}_h>daV%FAhtzElPJ6e`OK2yVf=+61>ml^ z$b(lmF@#m+RnjOSKhFk1FNJj9{T!)}NEDBGe+B!6MKG>g08?U9t2lVhcA{FZ%a377 z)=L&!k7-zOH^osC))=c-tkG0ykdjaC%s`4)}oFrLsJ}@*e z9Y&P*kuZkwCv?BDxQn8(7oefnBR?upuNf^k_46YkfS5F*je3*}63+piTTRsspj5rp zPgm@UWnM_gSLZZJwm){@a$15}J5hMYd-6?y=TH4Z-{DbNuZ^JKig*OcJGpg2Ztz>uHa%p&yb?+BQ6Jl?&IQ3 zSirmRvw`6dbF1l|m1zMDU)m(OGN(p!EUm{!lAH_6W<0dyveQz(yH4>q!sYCr9=bO) z&G9Z+>r=6#6Xc{& zl43l>i7HNd9jyt_t=}UQ($)iwyJrX>qRF=-&tT|adT{2Ge-`Ng4MS#(89b3<0Sji* z5rCj$^dSZ+v7f%45IEV`PxKuFSE-`@{+rW1c1F*ko4fJ~EGs#DC8v$6PG8F+?~|C* zjU^0KIT$=uRIX3|(xSv%J-2adxYrLI*2!4*+UUX!PSsgcu=j7=#Kz&iGQ=9j{`NGg zCwt{@kVoXx-WeoRrizT20gaO(VhDjUg9gN%2Bo_&U+C@DNCE4&D-9*T+0quCvV9Iu z&t0)_EG@kF746#XM?8MC>Z=!vg%d9W=h3Xt+zOVc!=*}AaBLg?5)Rt#@ac359VB1! zqG9EPS3M)Pu#HCgo76kKJaoA8g=^^2)SVaCv%k1Mb8YrI=j;d1uml85DcL1RS!eH* z60uWqvdB`h4wf)-uC|%Un^OF=pk){l8x(^pFFyoJx>w@$t7Q-1Ny#oza_7pTR>#bx zU_+SC$gE3kR2eI3Ttw|Z4|Yh*(EDd5}HZQnZ9VWQDh zLd5-{y3_v1beXolX8!n?LR+nVZtc~28n4^=5XIHdkD-nelnNpO? z9WZGCR@Ct`d3df%i1MeVL9-olNA89MH~%8c7D!FTzkFFCHon2miG!_9dtq(nmD4*eZZD2Y`KQzsV}r?$$+DWS_r z$TP68kl}W=CcG@kHFMaTxTl5QID!o$t>xI?%hs!{Yt|08D8(7-G^{I{+S+(ovW8h~ z(gxY@ z*3}a2AEHo3UAaD`w@L4mP;!~}0ABsNh)2TEouL*N5iRv%k9t z;_!{~iycX%<)qN1iXukA>NR56A@=|g6R&-vWb9qc;)VR}0!~wBpz+eh?o1oYZ`$|` z)&fcUTd$~^>55d~Le;&<95Ih1=Hz?i;+0i-6wq{QU(Bf+`_PY#d~SBH=2&|?lV80) z_9E-}2ETz?Gd-V&tm=v!CuDy+JhL znWiI$@1;`EgdE1O28xA^T@bMO1E2Q4BC>TC;@1u$ z@L1rvje++oga^giCd^m#ZT|%EMfS$`6KBTEw=s}JP-Pm`N=J2;ZG3D|q`$|rbGK|v zo?hdRomA%2Sa*$PQhhD?7{Lnt&+qyhfv;z|ta~@pC{Acsg0C`qsllj* zTTC3&JZ{<7im_W4PfD=?NG9ivkhiZqRRs7bZz~WcO%u-$hD2wOQtNCXQ^Tak0bBV6 zUUZzZe>(D-_2R=awaAH13xGf85uv(@e30#FMhlDC8l!Ykvmb({QJP9rH5#;MP%pS( z^oVL#!`)2uoPd}}wZ;8R3nJkm{RpY4;zMV3^tyMtqAO~6?U-rO!gZE?SOo+^p{5Zk z6$5BYya*N+&xiJY`ZZZ4(+`;@`MtSp_X73Aj{y2q|*2 z4x5}@`rbpIc6U47#vwGfTp2gI(WDs6{-UCJw`ZccqEqSJpMibooHU|QnF&BMbAzJb zhMXUjv(W7vRR9?FXlhd81?;Eso6tTN?#nj!n5OV@c1Z znF?5ow8WBF{`d!W^za6?-9a6Q}G2aRBQ))D1<{E2tgvOzCe^QC0DbNskH3x6MBlyW=#p^+39G&n!AoyZ_I zZ?@!NQ8@5>Oh7OQ1h6$S7~LAIL9-~YbIh#yDhJ; zWa`i1*;+REqWd7O=5)Q zi`SfX8C=ep{p>Zz7yo-i*Qxaef%tRv-D&z=dnCN_x}N?DV=rrfrjR>n>1m(}bOVp_ zTHZDqcj}tXrU~xbOf>WGYI3=3n@XJssL{hUfH~NIWTLi&8Rq$=wM;e(0v;ldNUo%d z^R+QY0Dyb`FoW%)JaC}&x8onlFEhx@wzFGFd+o#&na82kL!SMV*)J7ADB^f0#(sv& z+|~jpRout8aCGR63{n??{wuOF53{j9bP4_C^Jj&Nf9O?>7HrTcG9H%G3>~u>#xtV+TYq2ylBch_vdoipu1~`~XOFg3lAe}eE{nf} z4lwtSF30QFI^q1c+n!iytrhO`5OzjtP(a0!a_9YURRK+2th$Z&oQ&v{% z%%?`qZtWP{)V+wcttQOW#9q{GRHhB1t%~wc{P6z(KtR90LPfikeUu?OUT^ZGo>wXZ z>%>-_$6D*0qA$f$wX2N{S4BuuSLk$kfi-KKO%kflIZ4l*Y*bEe*STY}JP8bNCq7Ic z%>=(DH52p?tRQ#vlAKo=n2SQb^vo6=)4%T4aV6$gn*RHC!io zWJ+UFLMzVLl2l|x)(i1wJ>EFIL`T{z5oV?+10?H_GYmta?eb)COOd_!mP*VOK#v@j zB8;Ds&FBWKI|5h{i;YmjEtKm*pLA!UpPag?C-WHV_gk!mHB*~{|MQIgzYdTH6i z#~E*n%1%;RxCdA$c$iQ@#Dne1rs7#omQ{|s9&Kk2Ao7(;V+Q?JGtrR^BW|9dS+O?u z%B0wYWFjh=KsTVC7reB}ufCutBs+GImHNg3W5MO9#)8 zMS<{&QGyng@D{KGFU#0E!aFRM5VqWD76h|_cma6eYk44oM0_@il@J5w;uWilNOptK zBZ(3r7PE^N>kNw7A=>p4y zMIM$dD!qI+3xqZvhY{o!$tH_Ltl?`#9(yJ##AJ{SK>yifMFFcra7(fPINU~A6h)(1 zmc#~LCcNMw4xV>f6gzJ=@(yD2IF7z_H?Q(e31p+4CyHQ_WI9y@+&0l{G)W@C#U%1J zqgAjFoI9ctftS@fBG~P4lA@6IJUBoxgKUr_gGxMrVBrC~1wo47&>L%b(Ig^xi;6-3 za9jz9k^q8T5{w2S8U@Ly@{(1Q9TtOKFt{Zm&@mD{wp!6(v{;NHSZ%!Ir4ws23pTL^ z$5Nq64omlYlFROp0qocX6Zjnh&Y2ab5rPQ;%+q#2oAb{eGLn$0W3}vFF7SaG}I8j-WCEQ!j0?{3^lxwAQU46 zAg*Ayn6U*aZ!_>b5e&_CCFHOZ8&Bx$r zsTx5v2&&zPHJNxjF)IdxEK3AORWyJ}AQtQat~4NuB#zz?{Up|d$by-+)_~JYA&tih za9I&aL@2J6aOIkakr(XP8D8nIG&pK)9zm`%Ff9f53Ac1Dqnq4Rim{C48%vt8RBkkY zV9rDgI6KF_LE(}`w^#oRg^pU0&lOiwiQ}#DI60E|1bNNd_SWsXQqHXFrrGV|4#7@*NJ|Cqo}`@7r0USQ7&pi|07vuWajztZ!}kCb5S!CZ%*Z*^tXug_f;at zc$6NwVs?%y{<3dGb%<9v8Z?zzn>)d&no2+ZBy!EdZ<^{gwdiAp<~Y>{Z^B>dn-XJo zDcQ_XImI^iosz0C2)WBPpd#)N`~JYh>qtVs9KZ>sZ>rF1Yx+_2p%Ym42i(R!7}8mG zFx0nEM^j{w~T=U{;9Gn*UfeH2Rr z=U^uG1+9WF&Mb2Af0#U9ATc2qHONJC(G;w1mV(wTs=6E^$LyOsxEb6`ZVtDSThF-S zlt8iT+=MJ5LNNK)t4rLt@>i^x2?r+M!vtmWzFJXJ64TU9AfX5`@C#OX2M17H_Qn z)}nQaPh*Q6OcqaTD19Nj_|VejSBblBt&e$Inqe!8EbEKiC2beqaeV<8`bn#0{T$In^WiIha|I7Zy<^Ufwsd8td zt=4C5;6whG>Y5t;_xOu*{4e<%6ZQA_{V&%wO-#jKcltdmuefsMODor|UA^auRWGla z;D=lzmLB9A%)VM%W2dZ|(B0hV|Ia$#K|lF3I{bA9{RvD|*DyX&@%49C9$b0)f3CdZ zs?}@PV#(vZC7Y9!&s@ju{}3*?w9W|R=!dZMD@{27a{l#)ju&vdykjSUX|Fs8Fnht! z)%r9HpJjgZAVPscAzB7D054>4cu1l3T{7l+nB9?5g3n=?Qsk_x0aSV!`YKekd?_a zhS|4c*wrq>wy98UY0@c!F{7KPm)O^i_#S4u2g{;9YV`yQp(W!V=1PEDW+v&;ou#$% zI`a%JgyVi*4CF0#hqbu$VuOG<@urpg?!I~TI+MI<#lC|p=NT<~_E?PbRvz59Vv{U3 zwVZz7?tLpa$(Yh`G5M<1VYlQ1BJV%Gp|xZAhI5xB^jGWhj@HDIb2sQOunvW+r}=oR zhL;2#rzCuhyKO}wHrLJhiouUfk5s)0Mw zs~RlE#fy!WhE?f124-KFIBiwxj=}aBAoRgrgPgNRqOMz-_a$dX>7zJ1xvx3O9%Oiy zDe5w``FJ~`Meu)uB$v~c?-()=L9h!xt&oGmxA1~~@1ma@4P2OuaY_0`iE;NXr4zEO zCE|8uk}`yh5K`$OQu;J!DpT=D!{r;G;t2f`1kg`GQ2qXSU3u*n&{Aa2??IQwECdj) zk^i;s6e_Cy5G;Lj0yAS7+BX}2q5Xnqy{!7T~KE~G;PV5t} z7O!SjnO$YADBXfaNua%?QrJsw+KT|F#E{fn(o| z8Pl(KB+D$XiMpWTB;OhZ`XL~W&*xo=_9vy?rr*HjakzOLZY^J>p^IV1*zFw8hQG$& z$UaJxx6V+YR&kXT?2mK0#RkGv-R7vHLsefV{j-1Q)OPWzuc?Kh@z>1yeH^>TDrwSu zTua;I?e0zGuCk{6=44KG#usF24?(|AOK@3=(UdjEoaI}>3AJ-mgr98XncWlWf8x8< zH*3f8lLS_~UuN0hF5TeoaK*4O|A&bo@b@aK$8=b2Ovm$|TmV=60Pflsa#!Paz*a$4 zUmbFyhh)=XDZ)Nrh3Ap#4l$;yerJ;CVVA*_nVU?XY#2P0PNpcfDana!(s9Z`xaOke zTl;3tm|5R)fzL1_s@mt+x5D6A$u6QDlG^(E+UjdtBd6D#HEZ#?^H$7<>%{-k$H8gU z2TJ?OHXw%Pg*R^%->#0S9<5c&HuSBXUhmHtI+eLiP9W*SYcDe|A-RX5&g808%QSCo z-K^QknJX7|tZdEJc4^%ZSKlRy$ts#xSv%5e_gp$}ZeQOo=5Lu5dmBC_H+kD*iJ>W!odFnjI{3t{-Cf-tyQ5ZI?X-@4K3xnEvK9oHM;hOn zGa75Hms=9j8`__*UOGF}=68mo{?1v8KYiM!dsfe$>y7~7S1Y`Q#4U1-8BCJRCpVf@ z?WXTuG|)O{*34k2wXJ_(_p%3I@Y}V~V>guN#>sI?MP_57jsH8jhjhyg)qQtN@WcPG ze`0+n>pYh2=rJkcD);ypjhi~|qo=HPQ*xKd9*9)5tYTXb?x;AmF(+@GEcBEKstSXp z)n68+`*7WfPnGOKs7$}Gg<9G`!WW`tE1)I&qA@SsDS82>cngn1Y@7BfX?7kv=FB)> za5_bazK{KQ)22WGe{l8pzSq@-KmK>6km7?S2mcJq`-=?Ci&--?uk(ewS!7_7Hp=pK zeXqE&6hZ5T#Joabl(TuQMjn6)OVA$xZ?t-C)V8Q0<7ul4VybVa?q$+p?5ak^`3 z_m$6X+5P)FF8IcE>syu$1`NbZBuDb6M?P`nz_#usRzu92>F8NqdyYeRNh@3NT+aBk z!7~?zzmk}F;N3%){@~hKL)Yw|yXC>4IViVFURU?JPyFUHdq4Nin(oN1GaCMHbMFBk zM{)NL@649#dw09nPr6=IPnJ%1r>;|RZ*sS>v4w4Hxqv&iF*b*7FgDE?Fs233tAPYe zNu1=8Kte*O4?Jm*h$n=H5L(DXAXvA4XJ)VIBxCZt@BjaK!Mbg;voo`^Gr#$j@3*0Q z^SsIR($Wd*7K2Ov`nqfdD%5RSk=&oFoq#F_^OcjSoW7}YIov0PI8$e;=UG)X<~406 z{xV_L(`yG#>^`S@=5(EzQL~(};nfFjdf>p?He5MNtiFAoZMn_(48D!TB_K)g;)TA) z!%ZOkUvux+Ik~xi*X7--ZuhWizQ$-3I~E>&>+Z`Q{AfX&Z`%TQeb=Trlj^1AD{qyh zN2)ls#ERB6QED}oZ4?-n28ZfcT`IsSh^-lwT$Gg)*;pPqQWsA$3}HgWzWd>50((Z~ zm1Ts*(~E>~c)wcOzw8#L?VJk-5*{O0Z>$vqM!Q-i{o%u#S3m3tnLk=^UUW%voOSiN z-D^8M^cxRtmukW_J=1$?BHdk)SUqP@Y1jh?q^XDAns)adT>8@#4*I52%^~lm#kE~N z9x^_y&*-xUykRg!F#~+}BDUS$1CFoU**IrlpsxSW>^)bwGM?=ZO`hAmY4Z4nR#za| zI$`UP>m!_+<<-gQ%l16>(Dr`pAw+V{@lnY0MHy9#=HLxzj%bW1u^58iHYV!sfOKQl zWdXY!$7!#^kHhQ8br#RKUeaoq-az)r&bnwP;z;_#O%%gTM6Xw=?Z$vuYpmyt-uS@A zx$%ix_9R=^Eluq3wy*0xca?Qqa!K^O1^d8>0|zF~h;(;Hys>05=Dqru^gpdTcP(uT zdQx}aI4#L=YFOdA>8&4KwUk+(Yo&?ius2{w&7<`(kPkF1ZR=gv?y|?0(s#5S*faZ3 zf8D^qoW`B7b7t+`3#V+E(ApVrG(;NOC$4B7ym+6fZu|v3?NgHH)?4A6ZmreeRI<kJ9C$ZV1K#Dh5M|QW7JICPhN*M4veQf4^f3LWQY8=ySawY_GCrQOv{i+Yb{g5np^|3%eNjt{ z(T3zX=y7L#cOx>&-b+*2GM?q#(WTEV#3nm1LULi%Zm}{}7i@*ZFCZAl@Me^PXR09y zUI-8icb3vhHX_tCgS7{mCtefr7M@HyQ#BDBF%0ILmlv%{Ul@)oGU#ImVwoC;p~;G z?_bGWCp|N3e&;;1MtTMxRAbpFqRp<;y2eIq$sTcQP+RVa@jO zQCBqc8*m-?Y}~lRo^eg?Kab=BXe9Ci4($$vLl{aRiZzmWXq87+MTrRngAg(nj=K02 z>Al+@m40=B0w@ov^#;Y{H@6S`@X)MThkiJ){HX~Ci>wxV*8%Z{+d zaR?4wMVT~ErczlnF4`4R8;oirXM#KrmW-7Y92+C)9za!N4c@w7EVw=x1lVd=4bZcA zXyQ;JgF1w6&{$L|qD9o9tTaxPsS;&whUhWqS)-GpQjL*x&uOX})g?^j@jztXYRqVh ztv*u=aoTx7SByshj)*6|FqmICP?93&EeH$>*(PRel);n*AY%&wjlB8te9qYrQJmkl z)L`nn^^nO>1DBI485w*CX474Djp+aS3cq*_M%)7H!L-k=1v1hQ%u+_*3HCT@d8b3# z%T8~beyE~vdfR4RPVo}iY?ITarBi<_FMkJcPvcCk{Y-i)H!jGyU=}?8QAmhIav_Gz zSHxw+{6O3gVhVs^7|LKIVi*Cko+b@Qcf5Yx-UUuuo5n`WZAP zqOomdaV_$7Xbj=E@C}Fz;G3}+kZ4RVl3tPidB@uR^ZdTDn%In~w*d7WcVxbUF&Ivs z1*w5;`Bn%G*D|Sr@2#4Btf^_PNp!3Ef$#nLdmkM9=q#`er@lHnV#BT-ucPq+oTlhY z&=}^GZPc=HCLyx2;U*gxfJO;Ah(39Go1n?Orz>aFMkDirw3bl{I)VKqV>5tBqJw<| zT&-k8`d22~sa($ zB+*AT5=XO0hYG5xLJnQ*mnfpG9`k5gBb1LxfMZ2J#OQ(*O~ql4>2xmj7)OoM(z$!_ z+4Qu=bW=e#Nu!niOlnb9F3P$8V-y}^yg}B$;w2@QGm~LYJ5X{+CNml5AWq>~1Dnf$ zIpkB2?C8|7*N%l6Lo-&+@OIE%QK!+?FKp@EQLQjD8l#|L%!=ymS8gYVf{`5V=xte8 zuhr;8P)nT#^L}(S&<)+^1sSTUrV6`7Kc6`{aO~Is7GWA@%xHkUnvhOZMgl})l|WtJ+mIq1u1Oi0E57j$Ft2` zfYQ&)kas>Pn=r81NvB8iL4RJZB)l~Ss)AZV?6xFKUAC*@U`#Zn9%lounn|D-d2_ix>}ww*O9u#tM2EP(5tplB#ni#^8x9;guwi_!x>B9ey{Ai| zZEtFIZEG7-XSdhtIwPjOrG2JIr>@p+uVdO;YgaG2{+S;=bNwQkXr&_!C^yfv#z~jV ztgW4S$)xjVYHBpMTz~y7XfyNt+cwot+tN@L4?3N}#&WAI(ooabSkn-(S<4&oxp-N_ zmTC2yZd>ulrmn6{kC5?S#>aJ#cpRd_FWAjw&P(D-VkpAS3>5<3Wr#K1*Mp)?tCfDD zQh_9)wd}{ljRXnv>p_A<+%F?tf__vB^iPe_VRpzQMzIv3HwS1*)b4rM${cPX;Zcf_ zSmWw~bu4G+!(@i+H`v@+O5le`#zUAmvmX;@E>pvtCI0G*uqFO>K(|g@w)SY{-Unbm zFMxhx0~;i4or9=a%d~G2`~2Rw6E5AGpysi|9Y@zr>u|q5x{P7s)Ggy(6O>-7NKa1!bpZVJ=8)0CWH=ge911sL|5O)~cY2Y{;7mw%Y0(5*26`TB{$8<)XLt0mY_yTXI)%=Pt5zfcOE*lvv<$YEsOPyy)T(o zw)bt^*w?<&^iqd=V8GpxJi2yKc@_S+tI8K){EfmKAW0x`+O4*4ZT= z!!EbQ^n#?9K+7MaiSYz5sY;d(m6*iH7lGcTCoab+5Pg~a_HanDS-wIfiH3Yg$HZnC z;`-jVLk>=DZ1dxg0I&NbP@Z&q@xH&!sOB7@x9`QLnkS;xp=F1RWXE!|wC&D!-@S9c z>9>aoM29PYq&PvkkZ3lK2(g$)g-m+WV$ z{jw~XjhCw}iI)4;F>-YBtf6sd3x|{C!DLpR_mQ_tDhRxCM@OBsx`YpwOKt2+Cj0*N znSwgH_7t`Ds3Q69oyq-6FzO~&yxd8T8{8i zG=-;mDOIio&04iIFq|s#Pk50`?4}~j{Lyx^$EhDvuTp=aK1C9d9=Jg*Xdlg)9Vj>2lfXr_6wtAG(s74}aT?bByCfBOGodU%HO zBg+g@r&73X1UQQ-W}Y9)*YqEwD_(Ri^N%r3{^S2(Lg^phShBBgz<{JfvOrek`iwP- z-|)>mL;ZpJ;{X0v^1tb&`Jt+)zuG~L#q=~>kdqUO<<`cZFwMe={7cYoX7cN(v3 z(a0v_1%uqBqVlA&`Q`d1NTSgZbMGYoKkK7s=~2TsFewinf<32Fq+ii#xuE_1c_%V? zzqauC0CI;kgy)}RoNk?UiCJI9>(A|Ce#~^vHch@8hxl_b=@^u)GFg=z zTCqaK&$Q~yaTyHUGb$gv3nSQ^le1D||J6Z966HpG^Fuk@3>hmwOx2@rak3mSde*9c zD=CkxhQ_F3Mwb3kM6zMhr_zH3>Cb~sg2AzC^T{^~g*ogIf<2Ed51bAt{IW=0O~;}} zzrr7mMbZD^SR&>}|0kkWbT-xsWxr++wX%%WqDTShU1@MADg9wQZvOtkWO6Xw@A0J4 z>6FLQpT@^T&>0VcNz8V^Isi<1(En&%#j8AEaLAMPC~Ya55^aaTphtyQc1cf*pT;s= zGV5!@pwE&}mN+$CjL?VpFAL zI-P#^PLNEdQfbfd&p_P7gg}%QROJtQMtxA3FqL4%lRHePav6sH&D68It{1GWhF-k!NF{a zBkHkF<8n=>u3@6goDuD%DsnQytS4ifWTI!Q^@!6Sk18sDKDcPi)0AAU#yE|~BGkX&7V;i(sdDVjh2DfZQa1I7enWpec4Lw8 z4fPE;C!goH?gVFg+a%BFK*vPsIdY!=#tQ@&oavq5JZn*&TMFg;mW@x>o}oFjc4b*^ ztdsFnNAn<o7|c8Lb)Om(bqsm@ zsWet>4$6>JgY-s&VbEXzl#DJaqvO*31%iPd8>$WU`W;w591QhFOP6aWaI)6orqQTyg$>^A!&kEP)ctAUL#;n z)M+HuQKXLOH;tQM5R9AFC{eOzp>f(W854>$fvmr$r+Yk}VUmEszs2*9hA`=5*>O97 zY;4RkOW&9$!aZ_i6csKrSVWZj!?AEJvU9qZXf+D;>42>uN3NWwJ}age8an|^ZS0d$ zeH*dKp3G*+wMUyOhWa+rsWV)FNql-^A53FYKbiWDu0_JHoP3P))R^VwVbL-N$$Dg- zE~ZBM<^(h~s$d)YKnj=p3>TPmCRtiyKuUau^HdQAZJJV1M#`SIq<0Zbb5?1ZkB&UU zHc)b$i@+{DaY6r3%FmBoS460%HBS=-Hw0Y zE&1K&4qa4v>%>PV9;?3SP;&W^D`r19`-&sWlSA#H12_ES=#m+!2M%4i*4uHVGrIoX zbvN976w=(>J#HRh(Ga zv9fE|Yaib^d*RkqGw1p}vuCW@x?tAe$nVIC-$Hhr!(Yiaj_XY8wH&$9Ov`}RWY)-}HA{K9} zh5I6QDqXSIA^l#6G0BQ0b`TOyU4?a{G7cjyG@xn@v&|9dchyIFPNnnZMk~2={2YrO zp6jo6OE=jJ{u(z}XL)L{P?bkOYi#^I9WByLvGIkx`+)}!*p=fN zY?4~`E0TH2z|>Wbd@K!r{KzV_12ANS26~UT{jDXca(h}u=fcbdj5^NDQykovbCzSJ8Vi^S1IxD)h%kTGvunJ zMA@LKLe>AaZW_!KY5kukYln9NotyOG{}GkxUkBk4D#H$lyt zbm~oz9(51iT}`T!^>%wxS}47lN`V^iAi%8i`n*mF&uf14CAU%&sX5d#Y8|zm+DEk3 z_fSugu?f`)eY&U~iK6{*(LPFp-W%FSwFsU$%~{W%X`e0LH|Fui^utnK!#5ep4i6~QJ|00;G7+Do;Bq=^C z`ptYc>XbCbL3RV=P4=HONYWW_oHC}f8zv8;@vl4H>c` z8G+0FsBf`pzgqG8n-@+fOHSC>vP$}5nO-m$JZ}GjYwn%A@uwR@(Th)7RBpE${0$B) z_S7dX%{;V8AGAAp3%$wTVm!r@G5>R83pVg?%dlaAWw!cxud8ffi%Ka5;ro7*xw<{n zkq|d(S%YB0F=Dy8v#1AGQ4Q1tYBT;0IfXecl3%nRj-jDag_^@mDrGgJdZCM`u4c>s zt7f5-CtiB_$w%M(4gJ@@-DDEkCS8LVan$&0ELMlO>cl$HR8_y@_(KP4y*HkE^ncY> z(3Uow|6D(K;sxbJKinWSJ-fAbh*QyJoJ}Ee8it|&*b-B5Cyh|?!^O(ytH3A!yN1Mi zIV9r|-Ae$+*p1S?SWKnnY&dx=WsI7s75HH?HPd+1svKJbCDj&1XyQIxd-?{&9Oh&4 z{AMI&Dn_X$EhZJ3(J}cP23)`};$s#Qt{F>HsfOdFs~D@cL#JcFHhBkLGiC)2j;+OG zykCETZZ^c@T`WmtMo&P? z0)liTFI~zj!_pQ}=Zv<+Ki(j zrnlU@dv}x82$T+R_`ZoVb*Dz?gzn&ZV;2cBWb-s?MEMJgI>%-F4j&hC@q3Jn+l-kvrxtWjLW%!8 z_QR6-cgg`#9?C&zxpB^n$37$$v$5<6;2|r1`5$~%Uj8@Mz@gp)sW~-`XnEgQlikEu zCc36og^lFUMs8uAC7Vg)x4&_bU3&M@P<2Jec!zyaBUXB#Q*>itU(!3=MtiWTZD#gl zPWOTJpgiTELR1%ZF13c*h9r^fTh6L&Ehek%AWWQpLPY{2n-ACsV-z+tD&R$Dn`3Q+j<4az)LLq$>3ER?~Lr0|3TmFGS zb($i50gz3!C~$j-q#xXY0hPc^vtN)taRM2J35cJX(WBTYbfh=$ozdEGZhKd?f09nn>h9IC%0V!$@9w>`fh~7~4Ni(LZEbT} ztaI%~cTlXIbA#X6QdgBMx1VEB?pC{WK;1ELb53^w@i**CxbM)nCCna+L$)I(4h!l{@8WuC@5VMLH=Hwu0NG(S{t~}RE$wNe1)=z}# zP&VGbID1za2;;*rC<8%k*$x8F5Wa|i7%oE+(gZvYk6IKfvFj)w#$XAW{TK!&W9mY_d);DO;PmDX&s zefqLLcI(?Lp7R!{+ z(i`q0^#N$Tbtx-j5mG_y!*9WAEYbr)WbPtb9MG4cq$jv9^cwqcD%6spLY)S*PosSr z?Gp?}Cgz)3HcZu2`p}j^TUlTFHW@z$Wc)OOtd6mU%{~PWWn}PtTson0m*>tp;0ya= zMvR|=g7kBSwf3~MKdcW*Y*Z4^Z<*-cj-W+eXhUKzkb%- zi(ElhB-pp?s4A$^0SKWxNFQC+7mT3u7tQNik5bKTPkvAbSQgm)HMN%J`o8Mfi^0>g z@TE(_$HFWUHPo@@U~lc@%9)E6&#vyPZ?@Fd_-&AZ5CDcMxiwpo=9sJGX<1o}NfB)>834+opiQ0ei^Uq@+|#ChMND-zDs6Lb|^Sb;g~%8l6?=&mj}W^41X3o#E-{AtJmlamUxSd zJ}!xv$_jVI8dx-$e2qT8g8GrB3j3J+9lD%tC$!BRJGc=JU#xI}yV;1=-IU$K~Z6#J%WZ zkU$AR*|VO$U#rwIw3O8Fr>PCs%ah&i6`t0O6WdLUvBIFU8nvw0)U~F`zI6Xm9z=Kz zNYf0ui0jdg=WI0d$wzc*{M3Gz}( zq0(xSI(DA)-_l1k$E%V??U334cJ=q21akq)n;2P21*v~YH$B4>2nI(oDcU z52%u&38Z*v+C1wA*NSjNS?Z##MRr>};84Ltyb-Ocay$kc ziN+~5mC@I%5=H4{5EaE$coo+ois0vBBfO$SlX(rk3Zf`oqloWlkrTt;oDq9pem;71 zI7?PwRb`0*ik}Z(Mvs%TL)n6;^fD<3J)!jZxKy}kaxq^<>F^zAdp=0SbJ0FBJ%Xy_ z`OGy%wGj)I1f>lCG+s9~w zB#E6d;#Dk2pk9UHiu@uQjRi$-7F7;q4{q3!nijZ@B9&Fb7orINMeRh0NzNujpHq z$DumFp;iiy!YFnDYtd4+94=!ssB1(Uv@_+O!h7kCn3}<{E=y(_359j7@t;y^;t2Kw{P>{%; zq6>Dxv-p~i@;y&ARgiW{V~^Rf_i0aVZ_J;(eG(Kf-$s?gc$VYha*Xu@3S|Jl9c#B3 zXGuXhsTj6e=Y54RnJKXi5&jH7WRDPxfB@+!5U`!!hdx`JF#Yk<4hlT=1D@O=O#>3|7c7l7vNTXja0 z?pEOb>vvbNK&>Wc6|YP8{#qxfRrJfH{-p)GowI};g$(6{xQVPKMloo754)tfy&jLj zVAPLdRmj{dOc6j*6vSXA6%>^!^e*G4W86#ZuZS#%-ld8y%occ%mes&<)V7LnP68&{ zFRR6b77A^d=cVVt8n_k>$e5QVa}@gGDCD~Nm<#kvc9qE-Sr)B%|f<%WQk z!-7+*3zu~Jet;Gc;mUHHjwuvV&GjTok4A!iY$6#9cP{I{ z`24mLf6~$_8(6-*v2L)+$ino9#wv{e5WQJ}auFK}Fajf*yg}Aea|A^hB#>$#B~i4e z$R%@>!zM_lQebB0zfMzVMg9(P>XcK%WhGN`fyW9Xe${62O5~3QHACr0QQAt(PQfar z#cokbTLmKyDm|9>zRWG8ro} zsS2ZDMYBY=2$I%qXD$=C$M5&MLE7n*l5Xku-@Z)5uUoeH#;xG2WlG}w{qnQ^P;CD! z>D+e}HKh@^ZRR7IjKt&)`jz4`5&4t;2P#uP8j;XaQxABB-$#Y>B6TQ{-;Gm*5giHL z#6-$s5ENMmM+N1q@-9|16O1jU6B`)m*Zj0r!!kP2=0q<*{7|~Pa~W=+Zb)J=~5x!E;Ab# zR;Sbcf7>GBgY;5DEcPgC?8X#KEU=CaR=nAi)n69Zpa z$I0-`Sl>#ABT8(X%j=pj4|=v5S*B48twg`^i#rAWfKKe*)z@ohjr!FJgI)zU?F|NJ z?Q#YC8sp*G8Fk&25xepEJ4D?9UT9v|(y*kvueqMW5aLg8 zK5vzQ6HG_+fL7CjzuY>%*HII8`bEKHtqXN@EzG{Nz382Fx#iXSV@KQ^jWO6eEBA${(Tz$b4}RlpR1U#%183H*Rggxv;%L68=N7T6XV z!M&n^H)eh)>IQgWo~T>R3)0g%5zRL4)BjEMYSRcBk2#Nwz$^2Z=>&qOLzVEBHg!It zw-7r#f;S*_a(`<7$suSDw8v&QFRrU%%9M;nIgwRs6%N+zZt+H4VT)A*PE*7Sg^X@P zM2;l}Z7DTkcYVn9+K#D9Hg^j=@e3Wq z=+(p^hlk70bLRwV1n-rS(jrO9jz;neQT;`~XfatE<6^>V^+v;fd;%@7}yVIt)|MdsZR%3*Nui)rNx(_8hSKJcVtKO|cwYa4zdO zXi%%!#T#&v>wQn6mYWBv(bAm3%yN&WQmG7Drb}<319a+mD&;{9lsRUz!2$HktKk5V z<7KTiSg6-&ZPGC?V3U8fI=%E@HUVBcH=U-K4^TTssY#>k@ezR6h7JxNplJskba2dd!cE(@>J-r#TQ8k` zYhTr^!X)uU_l5?gfm7?IZFn>3y>)iQturqkXn);RGqG)9!%U^JCDdEr6{&ZL6YYVv zhRM}k3bxhPUDFy02z2V{X=O*Rnz(*KorO7l3Jg=H!81{C1ORvMy#Ne<3BMRtxLeQ5 z+!1IB*tHy#9s@M1H8^|`@Rc{}wW>J)q?gguqvWmbNRf@gD95gjh-60-f6$AOwU8*A z2id?}EaehCy8$#c(A4ly4nqT@YNbF%-ypr%Aj^SyY>;~FS#nm)`7=HH%y1xJ>{1Qp zmvDeD>|S_=qN1|;PE*`&4x{D=sBUUDYKJJMn(`~q1O{a6s@#%G9wEp|jK#!h@lJp# zF|fA`X2k$VU@_x_F%dIfg#C&r-ilF?dEmQ~w3u3v$$X}keu6zJq%_vvrO6P1-D7$) z&w@=_6(-@+3Lor%3F$gcui;hZuilV`rq=zVZmRU|g!k`$pBealoq;g{pZ1h12b^UP zO>94|>(_(A<$pZ~8U>Y#2K1J{EXsVM6f_XR?et}9*B(B+b}c-bSu5L%itF8o>m4lA zn>}N_K}pT%Z)}HeQSUoO)J{BOE99&FUt`r;8ZK0ixpY($sFBRJ9j!ZkS*$s{mTRUa zW8A&qH@xDJGXec?9>bxrtIT+cwGmi7kRp9LMGhpHxFbyt`T|_1D`B`>l zeQU1%`a=CnYZ?58S6`xaImBxKn&;m16eS?qiK0br1bc0imoFux7ky|A^hV{&i9 zgv@u&Q0Y$`O?}(OcSLMLSZ@f1=ALhW=2q2+aIzwm%xFT4~J5NB$J1Gd0AT1lTk~`WvI35P)ij(+#JM-xzF04L8k$k^6J{4;8UJRa5P#HC9rWQdd*o zp}t4`l*laDgC1+vq8N@Yhy+3Oe~d+cS;Jp6tMWIpS-&Eb1dD}OGhsI6SclMnNStNM zf!}OGsT<>sm?H}Zb2NZPLUZW#5JcB3V5o=mGbFYv!hQlEYK~&!T;kt_Bqmwehrv#a z*>d=^W&ch1ykY=+XK z@N1?3uerQF>NK03(fV@piJl$;0p7!DQ10N%Vx`bu?`SX#86NRPqaRF=7J&yQ?2)do zs4X*ufKU3|2K8=W+i;}OTvZtWAKz6`Wqw*!&Rc|vkhAr&R%a+w)-tUt>Hu1^hHkn& z8oj+SLw|QpO)IO{v#m7?jz2NCx()BQRnMhcLB-F0W?f=ko%rRBy)EUTPEsfb<`_7q=$eg zjdI7{8BsCU_vC(t`(AL29!kFywpuLKFqnPLIm0dMq!-t$1fE5UTuy-oix7U~%vECVwa#~LC!fyUdz#iG*{GE~*ZUU$A;+Fd7ZcJdQRo zr&C4$^o{Z3-XP{4`R$D%;vPs7U2<+j%Tj=uzX-dS0xgO9f z)az@(N`ra$9FV!iWYpKf3qAC;wFTY^JT{4hUl1e1VjU5-I+$tBiuDxl!zx6+@b*8nelF8y8l2`H!cNI#K22jd8D0LAVhzIyt6Y5dsRmyH3V z!t4!WQctf@2NXe(MSnn{f(j566*N7VX{Vn8r*8Cvo%G=FZ(&-O>6{H831{a03Z6GT zb0;_fuDwLs1iN?MwDZ8t;AXHm)8j|w8Oj`mYZrDM?E-H+bL1KDsdQ{F7yvJ4o|y+H z{WUYu0iP?f-utO}Sbw}fmKPwkddC9R5`YCJC5~b4A>;tCM+k0P-J}_P5 zcQCc~fb`yp)TJj*T$%!}SCl_iUO|2y+dAvip;=qE&SEZ_we>=HWoPf6w=MztbZ=*7 zhr{m&Pk#0I<6k`vZ@90lva;+xbkoO$X*`mFuqiZNwK8^Pz_F% zqCOmvUKxTTX+nuo`^ObsCO4p1h7*o?Y)!RySi1GABYLxrRX~;B>`>9=zNUa{_ern|RNmHR0Pw!fX&&S3*+xOz zYFxLurflc<#VMuo7`)i&S1If26>6WO%&$_EmnoJ0VZm{J&t%iMI@+i-`C|V5=MAbG zZ{&PU^s^60HdkYraZkv(QCnW=Y*aP8xa-kLj#`&XuZal31(9i{4#LwazbhpfMO)BX zm#~nB2xW9ULBh#NsJw{V2TQeBs7I2n*ccCm(LkjKgliHvEOCTnIfdNTE*hO@@ESlE zC2;l44pf8c@Z2fNh5OgiFi|_+bm1lRlUJfXZ0C@wd|7_b&}qM;WChzyT#E=+-<5=o2=#n;8cxMp)Kvt&UhsYXob& zz57D#lAij7CiiU6Vs>z>$;2t_Cefxq0z0d)XJ|#(&a7R_X>V#J*(;p+; zaNvqRpy~WZUKeiY*|ufXwCVk8X3c18FiRm-Oz?uujvQLQ-HZi}<>uHV}O$7?nQFh7|3+G3J%G)ytg3GBn99_|Iu>uBx!!BdwoNT@?tLOuUX^N3{uk zIteoz@t376V=tlM7Y3blw_3-mr8{&=l_`sXh!#l(DWz6}ltC03;vju0=l4Ou44WoC zxUz3a9_BfbjopHod_HD_4lKpFgB3bP6i*Q+Yi1~904Q@QWytbx0a`)P8IorXsXvF) zZs)^f|Ha5=mcO8=6Eq8UsXat{jb`qy-MgRnc)UJzz<&PT zk;5*R&({@5_C%L%y5#4~#qCq4cE$w_chmZHm9&9ow8gx6G@8>jGOKmaNEoNGTljEh zKK|oU!`ra?6%;btmcm;2-RChSin0T ztJPxxCp{L6$2xqfs;zZ?TN^VoSv$3De%qn8>Z&#{C6a`XtxFBBNUfi!(CQSEmc6-b zl0v6dfTQ?&TUB)%Q*Ooi$p2n#tCD6{x3yJ+$Ew=I%&JK8&-m!i@^3N%Zv{6cUf8zn zg~UFcg46D=s@kvR6uQh!xx1=cThaWgL2dCb!V99Od_VzAAOPyYMDQuWIq_rKsRk<- zQlLtK5Ed;J93Iy@=r#~S0&@o)YQ)M45XNc=bP>y)WCjeyv+4^x_@mh%ftKUwG-oyW zBd8mrt04~aG~rQ9L4uU54Hk|Bm6EBK#&ZIVrwSnRu%Ou^B+nFRTEzh#Jl2q4@fQiR zR-D3uli>HD2b?VNlAB%797humn#$45B)%SJMr^EcJT*l-kbIBJW42fu6dYP=;uI!gq5wyRK2s-X#7jg!kCrFskrtdmLmapuE({=mDKvp+Qt)(GZU~$|ZUQ2R$4CKD zZZ2A3!g=BXVl5ZZeTDEvqV+hD3L^j}o6!V-MWqY_9joRo zYNw?x0jr!IR;6KSmDV&_RpYS7)c_dmRmPCd>$K<~alN$~1`T|IOQ8%}LZ%COEdv|-!dQ#&ivMj^V3c$BHw3-gLidNV=$Mu$T4>k*{ zls2=wv#d-6Y}ff(4`V%`(nl(2eQSNh)~hrqA*)g}8uXJwN-kpWv6cgItH-=%kwXZ2 zG<22G0ilWodecvp3YwwSoB}{Yf&s#i#;62<1AuYT>_?DOLOsywI7Y{EG-@`$eEp)< zZnap9CY`{DQ=A5cpenbZZj4@1na2)5n+|nrtx;oLpfQXK22@%`E%8m)K z)}qn(@SHC@-Z@#p94sy2giXVsm(%eHS? z)B4(i`iT_~`huv@m7=zs4f1mn6Lxn^WWDu%JF1plqnR>M>yEmd8hrt;FGcZ`2g%kE zs)6dD=3}p)V2Ji(!#Un zezBl(!;Qm#M-w`n`P^62X71ZE{^E&k`uFG~KxOKgx_i7`gep2PeL` zz;|-y=?ku%t~m;CsP8ye!C&(3qD8kY?d5fV{m-}V>-zlWPutv|zCZOZ^aTK1f3NuP zn~w4EHnZgW;Cn!8Pc~03i&b$})V*l5VqoEmW8q6?+pmLKiq|9&x(;B5;b;RP*Uhp> zLmaQ_#)}ZMOiG-yS#&^|7!3UdFp*wDR^MZEJ;ownY(3_taLdB!^#iW5DnWm^y0;=w zn2Yh*ef4Mr|?0(4HzQZx5@Y`IrI~&3QuJ@*aC|iM2VBF3C+92 zOjVB;0a^SLH$Xq^OPLdmH^(w3Vlg;1b~FZ5(&m#@&8?L?s;aX^i}#y zNDrVE9Mf0vJM{Wt*r^|(e;~fh!BO6mXTfR3c3&bRgQ2WNG=DT0a(qop9xVDzGsK=c zOc5e^NGzqqUP|+YM4>!CBTKPE1W8l2@`P!>S+tlDV%{JYmj)yW`$e-8Mbnp z<#E!eroN_R_mXb%hxRx2!BpQyX^51DPD(O&U;pq%Qj*uCad=A~mI!Vk80_1)5xiU| zM^69c#Xj*JSVfRy+Ji`pvRDJfiXIj$H5kk5D(1J_0&T4UTl@UVNV(C#EG!vRJ_NtB zOzC$!kc3iEQRV{_y`TE9-F06F(ioc@T#Gg*z*Csvoo4p@DvTE1QUi!zyuYj`KZvoa{@8)1- zrF+J!TWpL(LbQOZioalVZT@<=(uXM;Kd^$?gl)AO_II{tjp0sc7iN% zMJq6d@%P~-NIhAg9^l2n{ak;@G1T*#C<<}m=d3B&y?k6Mdj8~AUjK}#%qEJo@mDP} zF^)F>XOryUm?L*nrvhcqFR`T zNG7nF2$6@M!*z_%XkkSVY>=daXGZ+%q8kz&3_)}tODx=1&^pFMP+73H4q&|=T8khV z1X_b=-J;lSJ#MRlTz$=5Hd<{H^+3Tef`7}zqnpmP z+138_1J|^1G^4Kqg4V*a2BoP{ZzzvfSCr`>C#cjc1gy@iwZ(CSj#sX!aWngkew@&L*L5rwy zK%ixfZf{HDqL8M;SLaqi#!IRPtySXgREX9a~MC&eaTLx)MV7Fqvla-s7uio znO_HEzGAYA7M<1{_9kl9U<3rv`VD`KiFhE0*1Bk9#4)b|I>d`W7j_K8hHv!gk_9Dn zfh>4u9IYwkg=CPNBd5Z6K`SrI;XT;AI>T%cdS`7_s&st0!sy~%Cu;v|!@5~@b+518 zunesX2c^?T{v`c@R}BJi zEU(r!FX`Pn*Dflnt*Bt8g`Ku4hIQE5z`O;~u&N>MP?iNcIv!n6Hcsm<+x7XdZ-Sn8 zczxqN&f9cOmeuIoJgZr{sz2a+ZrQm@oaHCl`fr@TTR%P`Z?5gVZr?yh&-Q25Zvjl| zp(~~&ujjR>8^G4~&Mi7#gL+iU8n|rft|s(!REExe9eTR0lGV-Z&unozga+sAr+UZ7 z1kT-5$2q3v{CxWrDdrfZLZf9F6+$Csi#%qA(JI>oXrl=#Ff$~JMJ6<68ZBVt#d-`1 zh24C}MT!nyeAP8OmLIa)4@pm6e;J_R4^pY?pM0LKD4c)#$mN$`Mt5Cy{gXch^gTU2 z?N6*;{RI82^x%`y?&u{aUft#HH1kT>Gxd@~G|Nqax-oOUpaxgG~C;(^V z4C(*?0C?JCU}RumWB7NMfq}i@KM=4tFaSl60b>gQsZ$4Y0C?JkRJ~5bFbsB^q>+FM z78V#lh=GAy_!DDa05(P>!~-BC!~j#olkrgO@cCjlPVP=r`sCKJ9s9Fgm*|!7^bbVc zcSfXDIAAcc2f74M2C?rY-H!JP3sBd{*jXTS&aFKRQW4`qAk4uX8c z_d;#ff&F}rJ+YmW@A>W$hjm*)^E5Wz+#mmgnt# zCW&*+h($k!G;{Z9xd}Dzd!gw?6)%}OGMAIBd1!br_mfM8htiX|ZYwp{P|nYt$_Ij`81qnciKw zFGz>^NOZKE6{6cfGP8+J7|<^YE z5bV!IavzRk`u(+gnx8)a?q!Jp0C?JCU|d*uHqm?`8btWbEQsHRw^cuet+l7v!$(jH|s0V!#$3sKlSP2V1IrrAQ&wVDNmd(d z_u28;<=9QLdte`Af5RciVV1)c$4yQWP8Cj%oEe;5oY%QTxx90o=2ql(#ofhylZTwg zI!`yxMV<#d?|J_5lJfHLYVexpwZ~h;JH~sRkC)F0UoGE#zCZjj{NDJx`JV`o2*?W9 z7w8hWDezs8QBYRUiD09UGhrNIlfr(5`-E47ABhl%h>2Jc@g>qBGAnXQw4auvL z|E1)l+N4fNy_Uw6R+4rnohN--`m>CPj0qWEGLtelWj@GK$V$jsl=UcEDBB`?Q}(MI zpPUIfmvS9)%W}`;{>yXAtH@iC_blHgzajrpfk;7I!HR-Ug;j-@ib9Ik6!R5#mFShM zD!EpwQ@Wx|scccXQu%@kxr!x~8dVn62GwQN7itu0(rPx<^3^)kmefhq9jNC z0C?JCU}RumY-f^W5MclTCLm@6LIws0FrNVc6$1eM0C?JMkjqZOKoo}m5xfwiD??m1 z#<*~SZH+Nu2P$4dgdjn;(4oc@C>M(VW5t8k*DC!lUMSY~n@p0`Ilnm=KxA6(!RWf-Vnhz>kb2?MSnsf-?4q6UlxEaW(o{Q@4S2F&_g zYn<1(!z~>6JX66r>U1ceh&;18wIf`iO0G#Z%fgG2%{-b-VKJ=uV52RCT%f6L;M44~5hnw5j%`-y3QU z)lmGJe8-=Q$2HVH8t@GzagAK2J3pkuz0^4-d2}C1Um^R!iEW zo%zhnOyhyxow=Qvo*R&~3ZoNq9EX{inVH#PW(J2jajJV}1uxN)x~h5_s;htfYE`JB ze;!<}TwnP=Ke$yj6{=K0mAfjpS8l7^S-A&Q7^tC+2AXK0jSjl#VFHttJ1X~9?#2|R zu>reaSL}w}u?P0VUf3J^U|;Nq{c!*uf&+074#puk6o=t(9DyTo6pqF*I2Om@c+6lU zW-*6N*o-Zh$5w2^2{;ia;bfeGQ*j!$<8+*XGjSHq#yL0_=iz)@fD3UEF2*Ie6qn(0 zT!AZb6|TlLxE9ypdfb2;aT9KaiCbX7h65J@eGK5i#|{h;AVdU-7&|Kyl?N(4BuJ4V z#{w3ygb|kUP&^C|$0P7aJPMD-WAIo!4v)tZa4VjOC*d~SjyrHC?!w);2T#Vmcna>r zQ}HxB9nZis@hm(W&%tx?JUkySzzgvrycjRROYt(i9IwDD@hZF;ufc2aI=milz#H)< zycuu7Tk$r$9q+(9@h-d@@49|WNAWRy9G}1^@hN;7pTTGGIeZ>p zz!z~pzJxF1EBGqDhOgrr_$I!EZ{s`oF20BF;|KU5euN+6C-^CThM(gX_$7XYU*k9U zEgrz{@O%6Lf5e~gXZ!_!#ozFE`~&~QzwmGT2MCkIF%`C+$Uh(>}B>?MM650rU_$kPf1Q=@2@U4x_{A2s)CEqNC{; zI+l*3<7tLA(k#uIjC>7 z-w(oO=9z(&3%(JTO_v@)Yh^(OM$U!Yjtkg3+ z8Hy&aCQK{HjLZ*(kx0w!x^giJSW(^0u~E-sC2D?T%cV{nSR>Q%6DJV7XDqC&k%)dG zQm?68(F+FB85;e-8npQ^ZtTfOr0oS6`P35ad>Xxe(RE}XIiBDMsSE3+nTSo>a)ygm;`aI$hj45) z$BLnXUW+XT0RuzEjlN7&e^(D58+xVEsEHlI$-2DHLL!Tk_r``kLMsmP)KtJ|hkjJ5 zodQH!Z^)sRy`8z>knlWZwfv|ri)pEo2oa^8%zEXt0u?QuSZHnAipHvyByv&v(J55z zMYGWJxcsgWp+lr_#O|d2vM~F35OhmD4Xq%U5=%~Ch1QB&#=!40?1a_l97#k|j2LKq z8!e?cflNi0qZ0YiKo75RJR{L`tUyGrmDCd}a%I?XWEk=t*F$R%iL5=2S01m#QTfMk z&lZKqdVKUaR!cgZu-!hRP$b1>ozhS)OqPx>h$QoQ$LZ4cWa2L~e666xh<iEs`zz z8RN1DyaJhmy|%gq;!WN>k=3CX8Jx{&vvfJ_WnLcIDf_AdH(6TBU1hg4k$6_n?`U=@ zIHjT1Ws2wpel%oo7NKm!dFt`8dYnBXVcIa&XH6k~ROiiOZ`2w1yn|ifpkN2JO)X#? zaBx+=cQnL{jV8v)TbOMD!^_vNz;E;NopD9aA}MB zV!}D^)iNs`rgdgiK1|C_e9?ETRJ0Xxi#(|f5}C(_ie-&4lDlR1Fw}cFD1OJU?1#2)EKjPaTY=GG=- zJK?*xm=T%t+JSPyWLVfu<^{gzftb)CHpdmLTbKn>8>*C=q1)lPnI}^YzG$YopQ#&b zDp08%>kbzxA-KXwW@S|=bvaQ-uya4)6AYR>IaYP2Wre)E6*;0F3U}ydoxXC3ciAD> zb-{JOD`=`e(-+gO%xwjwNJU)ZZ(UD;zja-Vzjd}cS9^7SXU)Xsct(45Xu}ohkjq9r zuwo@NP_k|)ZFMf4jolL88gK2Lxy;I?3$?gsK5Z27VT!ReuKvNOT~YxDW@;@3Y8qNY zgUW7;rC4QQal3qhaWSrzhU`eKtvL*X?B%yqHlHksx$E}H5sp+-(gw+oGjZJq1J`SP-goi7~01yn7l!Z@+2n)>18`66&9#)YQvW?GdflhMQ&%Kg;i zh$c*SLKU7R$7O;lt4%t7v}{<{QxeqLE=5plZB0;K76zLQCr#(-j7_G@cEPG8h?$wV zI_|=F_v6%0*A%4bmA-M&GR(P|xt4zVsrBpJ$^K5Pz8rM9E+}7jHUq&)uV7dx8nMN9 z{fyAGu2aIC+c?`UO1`cLoc5g7sW+9+b)r#q zm@HQ9%u&x|(OSvbDa}K+0!HjvHfN+cH@j`aN^iz=YUi0qcmLlmb*$dFTXXRAI!kkt zIXAaSHJiI5uBN$N9;7skCBEj?()j7IGDZcn;WAkGQO%UjFTF8&@f(ZnL1KmVKEG*) zN!4=d%TedXR wKR5n@sM`5}7KXJ&;oFk`aftYr2h7i^W==Jm{tIe%siXh^0003|xQtN%02oC%ivR!s literal 0 HcmV?d00001 diff --git a/templates/default/assets/img/218x146.png b/templates/default/assets/img/218x146.png new file mode 100644 index 0000000000000000000000000000000000000000..07f043b12dea28a6c680b837b6512081b608b1c1 GIT binary patch literal 2132 zcmV-a2&?yrP)vpR+ z422bY3`sMJdH<&!2uV}G7j4N9*680^JuB^pv~{tKLvb&2&NC4WY9nUvoa5~eWPbpi z6pKcz_;}iu&3y~ac^lV^_2L@MZ9d9>1Fb<6jzRdrnk;TUj*mub8ijw+SSL1W7KPj( z3Li=HIL=oBeFkCl!{-WzQ%acyiXHn%5Qn-u>LnNDo|7fx zt=KYXj!zJU#=$22KfD2KYVaP-O(8aFNk+4;cOcV_p0u6K8DrZC<(P)o|gvCZCrzQF)H@YqOGl-4UPRk7^quT<-6NoK=W~^Ls zQX8Kj{o`oW;pF)@xC0^*Mk^LI(QvX)0f?yB0I!Mrr?CKp9o&ZYT2eHqEu0F#(7caC z#g-sX1*C_Dllkd{p>3Otrhi#o^Q!V1USaIqSJHn1ZR>cnyLbjJPLS;L>p9%wi)H%_O#2YP|Y)x_jF-{im_XAh!9rxV7|>eskvZ52LXmB6%sbM`8Yh zr*UWzIkUuSK$}xP=i4Jga|($q{Ud|e-dV$E<*~51pV%_g3CBx+dHBuC6KG|53@rdi zua!a5i;aHEGBH;-MbH9(^jaCTt=K%&iU3QQyA3wEO(<=z4BrDju-{An&!ZXezO>4h<>*UMjXi#Z!n)6OU*C5Q{C3rs%bl@i?lDEn;I7 zP0?%lFlf!S@3r!1ie5{9kS1_6h|QtL&)~r(8qk2AMA~Z=&|tB-!C=%}Y^6hkX!_@1 zKm!VZP;3wy?-h^OP%2zRF0N5xy;gQDRcPE;Y$Y_X*K%Y-6BhvCU{gXv#pZ2j@(DoJ zYZbR~(3r6~OA#GIuOgTWKy21)mC+P~jWHsH1wbOU+QB<`$HrUPVyj-O zf`+dm#6t>zL~ON}yzo_oV+w#kY$%!_JzEO^>BQ#Hw+tBR)Cu{ojuEYWB>hKQo6c5LFXdja@7bDEAi zFu`d=xjlM70r0OQzi(5#a;`cZ6ZbCwj_AY1i5p1jXu8uedoKY+$4k>(6ySBuIT_Vf z#PTbyl+z@4Am~P65zD>q%r~0hr!>Nam$JOXk&R+GGE^p_F{`(_PmOIX3+TIO>zgq;MH$ zK6~i;kX9QxJ(~I?GCq{%z#hKux(;%h?AjvrNo1%1gwmikjAT6_PLrXjPa?+#BAcDo zO=yFcCVnxR{@A~GD9wxP`G~@V)}_P-pFM7M>|a~}xcIQRf1-7W(}Y)q>5u(O3P7l> zhQt{xDYj@tGrVIXDFD9mpy-XZ5gR!xnpa0;bpi#jqgmei@>qwTtk!Q^iOn@Yv%F%NDF8vZC*#7$X}6m& z@dIeKS1f~4WPhF3-|qM8<+5;FY=UNbpP3ROlUBy5#p*|{5o@%c&P$ypMl-$7yqy5# z=W)Yr#G1J#w40YYO^jx{JYZ1(g8b;?_-j8{vk7wufM)2m)&)SgwDP>7a=0(SEPg zOMkE?>whjAlR6E!(%B@oCtT$Ql@(UfX`|cbd9>M;&UUd?#pM#$+TJb+v{`ITFXHy5 z^pCmg<+Mu*?doMtL+%*2i4DZcIc+qOISsiP-g;3Jgq3sJEVkC)o#C5`ZQ9l>-x+<+ zppCs&Y>eibiLK(U*}6-{uH62Mlcq~ zY_L(eYw0vhToyEWuVuh`JMG?SqEL$_>$Qwnlhf|K5erAFi!C{vphpnwSU6hwbd23y z192Oy257%$GMixe*wVmn^5WEvL>nv@8ykq0*mWV|lZeZPX1eBJZ*kesY?lG-EG{D& zx8h>&;=YEW`6lk#9ZQ4ePAsl9+P?>ijo2T>HT|Xk{BP|)0R{jn6z7%;EJ3{h0000< KMNUMnLSTX+cM!Dz literal 0 HcmV?d00001 diff --git a/templates/default/assets/img/280x196.png b/templates/default/assets/img/280x196.png new file mode 100644 index 0000000000000000000000000000000000000000..0df3c940339ed8bc204069195706a482aafab03b GIT binary patch literal 2950 zcmV;13wiX3P)+Amh{`~y>_4W1p`}@*M28;jz3gbycK~#9! z?49d&;yMh4Z6q5g?VQH%|FFkNpiQXb*wS_aEc|2E%&ZwGAJUe$e2Mw*`#lolKl2?P zbTE-|HjYj@EGyprF~R7e41-<@3^N&H^;F_8uLA}YD%auoCBR^zXhr5h!1Vd!ER>2; zWF7#_ASwMa5cYh?!0D#oY6NLFUgD zO6bi^APW_lO~HVn^i;x+?F$B)OPhfKi^>2c%nWfdWXwZ@VSN7FLForuq{y@f1BWur zpXmq=DKc%rKxZoVqVfk!vM|xZfoV{bL&$dBpd!-<%qF7pM`RqZ_0Ry!W}?zmWWZor z6y@>`HUUKj2xfaxX(=)&Fs)|#RfB=KgaCt{=@SW{EV=?=>p=@W!Ys{H!jMcGgbc_P-8`=bIv~*jh|FqhGrdD!*bo>| z`1t9Kaoru6D;*11O#rkWR>2sY$k6Xrp7B(K&mFWeBu4{q1?$aloXEHlgvoxd6HTT) zMP?ODIx1P5Nq*AaG?|#0|I6(Q_WHUKtYFi?rQ>N?&4N*Mwe+rF9ZXVWjJQ}&!yx24 zr;1ety~q@-L?+vqL0YV5|8s58O6)y?x?mTqU4uksEJA)3YgvuyG+iy$icG<72aw2^ zYkDLmHp^rjBSpqy!4O7dMhG+UU0we5)*uUZjmVUMNlzoC)85}8pw&iu{4W7nun7u= zA+CUaKC2zQ5Em_rd$W_slufZNh3lKX zb72>eDFK5h*wlIHHXGVSWQuleT751VF&C+2Qnnt7!01ILSUDJB$S7Sw**@Ro(ozuA zBw5I?Ok`BKR0KvZGDZVNXqj}ahq5j6T2~MhTO5ZiblbNc%D`w_4=k6Mah4Z0FW6;Z zw5Xj8D!qjLq+sliA>Mzt4O z0jAu=7(EzKV_YLLr6=4pt%m?P)=9h*l=VB2#?4*oj4kF((JT;Dnr_^-v5(?h2^GfDyQCMeCs$jNBEt4m9d5 zlVU-#7>rnC7h=<)7bF=9M$vi*4wy`4 z3z4b1?oF{)K)}LOXPJbphbl0d1xeT8lBsGhkx*o+z-ZPAXgA9w+x1WdMztWhn`M%@ zg1RduH4Bmf7czC0N!EI(1EbpYU^>5x{>ofI9T?SuBqK|+CP# z1%pxUg(e`F@`cIS*E!tjXdGC4)yJ^yE|%%$3alM235Z-AgTZLGDelu4A4Fyhm2o(* zCD8AM4uqWlmKW>^l%jyC2ctc35w@S@1vYoXfg4r&ZHlPV^z_3swOt$%W>T+Bhw*tfZyB>nlGUYsoJ)Mp@g~1-O0OyjTWcyqe^{;$99gmq@0-slc zx`OZPHQBOZ^Vh)H$R#5(mKuW5AH$Y5#Q}wg54yMzP>IW z_qoKIfI-{hDxLofBE-8nt&05fn7fT*D`s*>(FruW%$iuCNg0wFyPDQ zXSS#|ig zVI_8Wr2W@Dl^)DRuDlvBjC)$l@9~TBnaeMf_^!v#1eo)|Dgs6h2KY#-Fg)s`u;+3I zrGL}zBf(`VGQ24mf{9Fwnf`;8*`g3dWkO{Lm_u^>`yyef)`0=F9&VpE)Q3twU=HU` zMZloJw0mrG63Q?Z0wz}P(G^hG77X%{RAMMYz$}0{TwMWg4F>w$I~kQ+z}#E`g{{Hh z9!VvJ(vQm`nDeKTm1-pz>@y@qP~tcpmcjHQLpy+JCo+Xl`pNR=d6`V_3c?OxaIQc| zC4LWI87{pm;61=JDA+Yn`Zx2R87_V6A?yJLEHaf)hBy1j1kB}RDeMCV=nBHnKCpFr zL+oOy{`~4pPz^X3fyf9#!a~c8$CMsAkb*=ygWtiJt z&X-fy1PTC5Me6}cW$43nhC{od1XI|0KtpkcLgS$XQ&6zMP+~w5hxS7YCchwgT`0ss zahpIvfJtBcH!Ki6Vg3NYEF1}NgoUzE{s6%&KDO@ZL;9f&i@L(hopi5 w^P1xg<_+cz<_+cz<_+cz<_+dq$NvHh0M;0WpN0^}o&W#<07*qoM6N<$g43REMgRZ+ literal 0 HcmV?d00001 diff --git a/templates/default/assets/img/700x320.png b/templates/default/assets/img/700x320.png new file mode 100644 index 0000000000000000000000000000000000000000..32c9edcb1ae18acc6389656a5c1b870b9cb09eb0 GIT binary patch literal 14846 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 literal 0 HcmV?d00001 diff --git a/templates/default/assets/img/carousel/1200x390.png b/templates/default/assets/img/carousel/1200x390.png new file mode 100644 index 0000000000000000000000000000000000000000..2de73de499e827a7631831706a03ab272d77d86e GIT binary patch literal 11534 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 literal 0 HcmV?d00001 diff --git a/templates/default/assets/img/logo.gif b/templates/default/assets/img/logo.gif new file mode 100644 index 0000000000000000000000000000000000000000..cfa396641bac0e35bf9ba6f1b3f188a8ffa639fb GIT binary patch literal 2159 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 literal 0 HcmV?d00001 diff --git a/templates/default/assets/img/payment/kwixo.png b/templates/default/assets/img/payment/kwixo.png new file mode 100644 index 0000000000000000000000000000000000000000..2055f9c8a639a7d76fc4dc163acab4722129b49d GIT binary patch literal 3940 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 literal 0 HcmV?d00001 diff --git a/templates/default/assets/img/product/1/118x85.png b/templates/default/assets/img/product/1/118x85.png new file mode 100644 index 0000000000000000000000000000000000000000..cf9e98b4a72ddbea84a6ec86630d215076936a30 GIT binary patch literal 1642 zcmV-w29^1VP)@9*#Q z^z`uX@b2#J^YioZ@$vHV^8Wt*_xJbs`1t$#`~3X;_V)I<(*3^x00qiPL_t(|+N_${ zcH-|9^Ibu~}>(NYC(+rb&FQT?o6s0m83W3;^hv_u-O{7$3j;_-kyhSsF1B z3bL-EWqyRviH&y&GZJ}0%w)_E)x{&@j--XvFcHnVI9hk(MiUF*=VG?Tbgf031=Qt7 zP^C@Yw-%YZPnw;tCWH)Zz?qbMh`EGRjH_dD#h4w^&9I{oYOpwrk5XY+zqqroT#Xx_ zSn)a@;&PZE?eX1JuLZia-t^g!qMr$Kx?RWe1lt+5mT%53>&|!(Zr185+3PJv!SYkH zseqNVe*A^R!M&wq*wq%JVCDZ*Q!ia&UOwaU%TE41+Xh|BinKT6DQ>tt6Y@Lvww6)D z){n^#Q@f-cxhYP;zbbC^8Lzrj(+W5>Hj{+a7OP}n&A2syN}sn6u9tLBzC)Cn36D4p zC$;!hY!ldVn2h)+^(0U}eNS5c7%a4ETrFMrQT_{XeCp(t+HQl_(z4gEO@s}F^(42P zuSGS+iM(4beveX6wH!v`3dW}(ZX7U~nCRX7*kJ3&IPm1uEZ~tCyFEvWIU`qV#jnBI z#w{0sF6CVr23GQ;*X!-XxQC45x@y-0Zj`yS%|Y8;%t8psYCH_%QoXK%wT(N&hIfqH z^->e#nynV$LI`;c3nc|`Fn_IeAjDvY5Vgkb+H*FI3uL#lej##E!+O)W-okEj>0#sX z%#R(m38C9Am8Y0|wj!Myls*hV0H1cPnbD~N*Ht^3+;YdgL^KZf=2 zIW^6z#_h3SMD7YUtNB^=gN<#|=X)+S_6fDKxnb+ac&~d77pNq4QOfb7YTi4W8+KUy zT(^y~t*c<+*0$cTMhJx!afkiiP0I}y&OOPvvsuxyo+1w|bJg;FWa6)Okd@!V#$?W? zGFPkjcuurWE#I+NuIY^$WM&TOGu*7Rxns@zI4Shmrv^ELiyA@0TE)+;TFRopEq(TRk<0+{rV0P=|l^=D?V&*ufhPq$~&%thR%7 zK=T5q1m7`~#uE$h#8z(|^pBerw%Q&cA+N>m} z1Cx5_Q`s2WxDg4nc8`U_c`}zf$4RT8&I!4#@?qOLS+A2B1#4{%+$dM^C33GJziny4 z!8fXgoo(w~c>2_(WFPvQq;1<9fAZGQep)=$)SS-rqzZ(l^>erh7JacT7}!{i>!;(| zy`7@DGQPT6Yr$^Sp>TLI64N0~U4l4a$TfJ2?rmGE|P7vx7;dy|YUY@~f=ToJd8)cX|Q1)u{d;MW&o zZ`lVnK6id2aZ_rhU7d0shrQndeZ3O;`)*l9+O%<+Z0obM=}W$w`{ozSrDA)1etZfw zfw>DF<3w|AT=iC(>UC=PL+G!~dw37KPiN#;p!Ub;Kd+2UwiV+pVtKCRHXnt@k#_ds zLtarfE*_F&NkLOB2lS7ML|?Cyo8hZZBGk#)t{)o|k{|p`H;!*kesI{ z2gPTV^^+XwP_ML~a6kDsu#@33AU|t8T~gEM;ZPe69|js>yWw)UOZj+ih`Z)-dwqQQ zs0cZK5hIGaxckuzYAr|>;SHw|@ olstM+fl^Zw*Ppri`%i!Y09A)WHSZ7COaK4?07*qoM6N<$f=a$pRsaA1 literal 0 HcmV?d00001 diff --git a/templates/default/assets/img/product/1/560x445.png b/templates/default/assets/img/product/1/560x445.png new file mode 100644 index 0000000000000000000000000000000000000000..37fea1775723b73842ecf37f0073e253c85166ac GIT binary patch literal 6299 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 scrollHeight - offsetBottom) ? 'bottom' : + offsetTop != null && (scrollTop <= offsetTop) ? 'top' : false + + if (this.affixed === affix) return + if (this.unpin) this.$element.css('top', '') + + this.affixed = affix + this.unpin = affix == 'bottom' ? position.top - scrollTop : null + + this.$element.removeClass(Affix.RESET).addClass('affix' + (affix ? '-' + affix : '')) + + if (affix == 'bottom') { + this.$element.offset({ top: document.body.offsetHeight - offsetBottom - this.$element.height() }) + } + } + + + // AFFIX PLUGIN DEFINITION + // ======================= + + var old = $.fn.affix + + $.fn.affix = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.affix') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.affix', (data = new Affix(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.affix.Constructor = Affix + + + // AFFIX NO CONFLICT + // ================= + + $.fn.affix.noConflict = function () { + $.fn.affix = old + return this + } + + + // AFFIX DATA-API + // ============== + + $(window).on('load', function () { + $('[data-spy="affix"]').each(function () { + var $spy = $(this) + var data = $spy.data() + + data.offset = data.offset || {} + + if (data.offsetBottom) data.offset.bottom = data.offsetBottom + if (data.offsetTop) data.offset.top = data.offsetTop + + $spy.affix(data) + }) + }) + +}(window.jQuery); diff --git a/templates/default/assets/js/bootstrap/alert.js b/templates/default/assets/js/bootstrap/alert.js new file mode 100755 index 000000000..663029ed8 --- /dev/null +++ b/templates/default/assets/js/bootstrap/alert.js @@ -0,0 +1,98 @@ +/* ======================================================================== + * Bootstrap: alert.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#alerts + * ======================================================================== + * Copyright 2013 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // ALERT CLASS DEFINITION + // ====================== + + var dismiss = '[data-dismiss="alert"]' + var Alert = function (el) { + $(el).on('click', dismiss, this.close) + } + + Alert.prototype.close = function (e) { + var $this = $(this) + var selector = $this.attr('data-target') + + if (!selector) { + selector = $this.attr('href') + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7 + } + + var $parent = $(selector) + + if (e) e.preventDefault() + + if (!$parent.length) { + $parent = $this.hasClass('alert') ? $this : $this.parent() + } + + $parent.trigger(e = $.Event('close.bs.alert')) + + if (e.isDefaultPrevented()) return + + $parent.removeClass('in') + + function removeElement() { + $parent.trigger('closed.bs.alert').remove() + } + + $.support.transition && $parent.hasClass('fade') ? + $parent + .one($.support.transition.end, removeElement) + .emulateTransitionEnd(150) : + removeElement() + } + + + // ALERT PLUGIN DEFINITION + // ======================= + + var old = $.fn.alert + + $.fn.alert = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.alert') + + if (!data) $this.data('bs.alert', (data = new Alert(this))) + if (typeof option == 'string') data[option].call($this) + }) + } + + $.fn.alert.Constructor = Alert + + + // ALERT NO CONFLICT + // ================= + + $.fn.alert.noConflict = function () { + $.fn.alert = old + return this + } + + + // ALERT DATA-API + // ============== + + $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close) + +}(window.jQuery); diff --git a/templates/default/assets/js/bootstrap/button.js b/templates/default/assets/js/bootstrap/button.js new file mode 100755 index 000000000..fc73b555f --- /dev/null +++ b/templates/default/assets/js/bootstrap/button.js @@ -0,0 +1,109 @@ +/* ======================================================================== + * Bootstrap: button.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#buttons + * ======================================================================== + * Copyright 2013 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // BUTTON PUBLIC CLASS DEFINITION + // ============================== + + var Button = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, Button.DEFAULTS, options) + } + + Button.DEFAULTS = { + loadingText: 'loading...' + } + + Button.prototype.setState = function (state) { + var d = 'disabled' + var $el = this.$element + var val = $el.is('input') ? 'val' : 'html' + var data = $el.data() + + state = state + 'Text' + + if (!data.resetText) $el.data('resetText', $el[val]()) + + $el[val](data[state] || this.options[state]) + + // push to event loop to allow forms to submit + setTimeout(function () { + state == 'loadingText' ? + $el.addClass(d).attr(d, d) : + $el.removeClass(d).removeAttr(d); + }, 0) + } + + Button.prototype.toggle = function () { + var $parent = this.$element.closest('[data-toggle="buttons"]') + + if ($parent.length) { + var $input = this.$element.find('input') + .prop('checked', !this.$element.hasClass('active')) + .trigger('change') + if ($input.prop('type') === 'radio') $parent.find('.active').removeClass('active') + } + + this.$element.toggleClass('active') + } + + + // BUTTON PLUGIN DEFINITION + // ======================== + + var old = $.fn.button + + $.fn.button = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.button') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.button', (data = new Button(this, options))) + + if (option == 'toggle') data.toggle() + else if (option) data.setState(option) + }) + } + + $.fn.button.Constructor = Button + + + // BUTTON NO CONFLICT + // ================== + + $.fn.button.noConflict = function () { + $.fn.button = old + return this + } + + + // BUTTON DATA-API + // =============== + + $(document).on('click.bs.button.data-api', '[data-toggle^=button]', function (e) { + var $btn = $(e.target) + if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') + $btn.button('toggle') + e.preventDefault() + }) + +}(window.jQuery); diff --git a/templates/default/assets/js/bootstrap/carousel.js b/templates/default/assets/js/bootstrap/carousel.js new file mode 100755 index 000000000..d8c4c243c --- /dev/null +++ b/templates/default/assets/js/bootstrap/carousel.js @@ -0,0 +1,217 @@ +/* ======================================================================== + * Bootstrap: carousel.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#carousel + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // CAROUSEL CLASS DEFINITION + // ========================= + + var Carousel = function (element, options) { + this.$element = $(element) + this.$indicators = this.$element.find('.carousel-indicators') + this.options = options + this.paused = + this.sliding = + this.interval = + this.$active = + this.$items = null + + this.options.pause == 'hover' && this.$element + .on('mouseenter', $.proxy(this.pause, this)) + .on('mouseleave', $.proxy(this.cycle, this)) + } + + Carousel.DEFAULTS = { + interval: 5000 + , pause: 'hover' + , wrap: true + } + + Carousel.prototype.cycle = function (e) { + e || (this.paused = false) + + this.interval && clearInterval(this.interval) + + this.options.interval + && !this.paused + && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) + + return this + } + + Carousel.prototype.getActiveIndex = function () { + this.$active = this.$element.find('.item.active') + this.$items = this.$active.parent().children() + + return this.$items.index(this.$active) + } + + Carousel.prototype.to = function (pos) { + var that = this + var activeIndex = this.getActiveIndex() + + if (pos > (this.$items.length - 1) || pos < 0) return + + if (this.sliding) return this.$element.one('slid', function () { that.to(pos) }) + if (activeIndex == pos) return this.pause().cycle() + + return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos])) + } + + Carousel.prototype.pause = function (e) { + e || (this.paused = true) + + if (this.$element.find('.next, .prev').length && $.support.transition.end) { + this.$element.trigger($.support.transition.end) + this.cycle(true) + } + + this.interval = clearInterval(this.interval) + + return this + } + + Carousel.prototype.next = function () { + if (this.sliding) return + return this.slide('next') + } + + Carousel.prototype.prev = function () { + if (this.sliding) return + return this.slide('prev') + } + + Carousel.prototype.slide = function (type, next) { + var $active = this.$element.find('.item.active') + var $next = next || $active[type]() + var isCycling = this.interval + var direction = type == 'next' ? 'left' : 'right' + var fallback = type == 'next' ? 'first' : 'last' + var that = this + + if (!$next.length) { + if (!this.options.wrap) return + $next = this.$element.find('.item')[fallback]() + } + + this.sliding = true + + isCycling && this.pause() + + var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction }) + + if ($next.hasClass('active')) return + + if (this.$indicators.length) { + this.$indicators.find('.active').removeClass('active') + this.$element.one('slid', function () { + var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()]) + $nextIndicator && $nextIndicator.addClass('active') + }) + } + + if ($.support.transition && this.$element.hasClass('slide')) { + this.$element.trigger(e) + if (e.isDefaultPrevented()) return + $next.addClass(type) + $next[0].offsetWidth // force reflow + $active.addClass(direction) + $next.addClass(direction) + $active + .one($.support.transition.end, function () { + $next.removeClass([type, direction].join(' ')).addClass('active') + $active.removeClass(['active', direction].join(' ')) + that.sliding = false + setTimeout(function () { that.$element.trigger('slid') }, 0) + }) + .emulateTransitionEnd(600) + } else { + this.$element.trigger(e) + if (e.isDefaultPrevented()) return + $active.removeClass('active') + $next.addClass('active') + this.sliding = false + this.$element.trigger('slid') + } + + isCycling && this.cycle() + + return this + } + + + // CAROUSEL PLUGIN DEFINITION + // ========================== + + var old = $.fn.carousel + + $.fn.carousel = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.carousel') + var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option) + var action = typeof option == 'string' ? option : options.slide + + if (!data) $this.data('bs.carousel', (data = new Carousel(this, options))) + if (typeof option == 'number') data.to(option) + else if (action) data[action]() + else if (options.interval) data.pause().cycle() + }) + } + + $.fn.carousel.Constructor = Carousel + + + // CAROUSEL NO CONFLICT + // ==================== + + $.fn.carousel.noConflict = function () { + $.fn.carousel = old + return this + } + + + // CAROUSEL DATA-API + // ================= + + $(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) { + var $this = $(this), href + var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 + var options = $.extend({}, $target.data(), $this.data()) + var slideIndex = $this.attr('data-slide-to') + if (slideIndex) options.interval = false + + $target.carousel(options) + + if (slideIndex = $this.attr('data-slide-to')) { + $target.data('bs.carousel').to(slideIndex) + } + + e.preventDefault() + }) + + $(window).on('load', function () { + $('[data-ride="carousel"]').each(function () { + var $carousel = $(this) + $carousel.carousel($carousel.data()) + }) + }) + +}(window.jQuery); diff --git a/templates/default/assets/js/bootstrap/collapse.js b/templates/default/assets/js/bootstrap/collapse.js new file mode 100755 index 000000000..92cc0bc76 --- /dev/null +++ b/templates/default/assets/js/bootstrap/collapse.js @@ -0,0 +1,179 @@ +/* ======================================================================== + * Bootstrap: collapse.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#collapse + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // COLLAPSE PUBLIC CLASS DEFINITION + // ================================ + + var Collapse = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, Collapse.DEFAULTS, options) + this.transitioning = null + + if (this.options.parent) this.$parent = $(this.options.parent) + if (this.options.toggle) this.toggle() + } + + Collapse.DEFAULTS = { + toggle: true + } + + Collapse.prototype.dimension = function () { + var hasWidth = this.$element.hasClass('width') + return hasWidth ? 'width' : 'height' + } + + Collapse.prototype.show = function () { + if (this.transitioning || this.$element.hasClass('in')) return + + var startEvent = $.Event('show.bs.collapse') + this.$element.trigger(startEvent) + if (startEvent.isDefaultPrevented()) return + + var actives = this.$parent && this.$parent.find('> .panel > .in') + + if (actives && actives.length) { + var hasData = actives.data('bs.collapse') + if (hasData && hasData.transitioning) return + actives.collapse('hide') + hasData || actives.data('bs.collapse', null) + } + + var dimension = this.dimension() + + this.$element + .removeClass('collapse') + .addClass('collapsing') + [dimension](0) + + this.transitioning = 1 + + var complete = function () { + this.$element + .removeClass('collapsing') + .addClass('in') + [dimension]('auto') + this.transitioning = 0 + this.$element.trigger('shown.bs.collapse') + } + + if (!$.support.transition) return complete.call(this) + + var scrollSize = $.camelCase(['scroll', dimension].join('-')) + + this.$element + .one($.support.transition.end, $.proxy(complete, this)) + .emulateTransitionEnd(350) + [dimension](this.$element[0][scrollSize]) + } + + Collapse.prototype.hide = function () { + if (this.transitioning || !this.$element.hasClass('in')) return + + var startEvent = $.Event('hide.bs.collapse') + this.$element.trigger(startEvent) + if (startEvent.isDefaultPrevented()) return + + var dimension = this.dimension() + + this.$element + [dimension](this.$element[dimension]()) + [0].offsetHeight + + this.$element + .addClass('collapsing') + .removeClass('collapse') + .removeClass('in') + + this.transitioning = 1 + + var complete = function () { + this.transitioning = 0 + this.$element + .trigger('hidden.bs.collapse') + .removeClass('collapsing') + .addClass('collapse') + } + + if (!$.support.transition) return complete.call(this) + + this.$element + [dimension](0) + .one($.support.transition.end, $.proxy(complete, this)) + .emulateTransitionEnd(350) + } + + Collapse.prototype.toggle = function () { + this[this.$element.hasClass('in') ? 'hide' : 'show']() + } + + + // COLLAPSE PLUGIN DEFINITION + // ========================== + + var old = $.fn.collapse + + $.fn.collapse = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.collapse') + var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option) + + if (!data) $this.data('bs.collapse', (data = new Collapse(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.collapse.Constructor = Collapse + + + // COLLAPSE NO CONFLICT + // ==================== + + $.fn.collapse.noConflict = function () { + $.fn.collapse = old + return this + } + + + // COLLAPSE DATA-API + // ================= + + $(document).on('click.bs.collapse.data-api', '[data-toggle=collapse]', function (e) { + var $this = $(this), href + var target = $this.attr('data-target') + || e.preventDefault() + || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 + var $target = $(target) + var data = $target.data('bs.collapse') + var option = data ? 'toggle' : $this.data() + var parent = $this.attr('data-parent') + var $parent = parent && $(parent) + + if (!data || !data.transitioning) { + if ($parent) $parent.find('[data-toggle=collapse][data-parent="' + parent + '"]').not($this).addClass('collapsed') + $this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed') + } + + $target.collapse(option) + }) + +}(window.jQuery); diff --git a/templates/default/assets/js/bootstrap/dropdown.js b/templates/default/assets/js/bootstrap/dropdown.js new file mode 100755 index 000000000..6093f11a8 --- /dev/null +++ b/templates/default/assets/js/bootstrap/dropdown.js @@ -0,0 +1,154 @@ +/* ======================================================================== + * Bootstrap: dropdown.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#dropdowns + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // DROPDOWN CLASS DEFINITION + // ========================= + + var backdrop = '.dropdown-backdrop' + var toggle = '[data-toggle=dropdown]' + var Dropdown = function (element) { + var $el = $(element).on('click.bs.dropdown', this.toggle) + } + + Dropdown.prototype.toggle = function (e) { + var $this = $(this) + + if ($this.is('.disabled, :disabled')) return + + var $parent = getParent($this) + var isActive = $parent.hasClass('open') + + clearMenus() + + if (!isActive) { + if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) { + // if mobile we we use a backdrop because click events don't delegate + $('

    ').insertAfter($(this)).on('click', clearMenus) + } + + $parent.trigger(e = $.Event('show.bs.dropdown')) + + if (e.isDefaultPrevented()) return + + $parent + .toggleClass('open') + .trigger('shown.bs.dropdown') + + $this.focus() + } + + return false + } + + Dropdown.prototype.keydown = function (e) { + if (!/(38|40|27)/.test(e.keyCode)) return + + var $this = $(this) + + e.preventDefault() + e.stopPropagation() + + if ($this.is('.disabled, :disabled')) return + + var $parent = getParent($this) + var isActive = $parent.hasClass('open') + + if (!isActive || (isActive && e.keyCode == 27)) { + if (e.which == 27) $parent.find(toggle).focus() + return $this.click() + } + + var $items = $('[role=menu] li:not(.divider):visible a', $parent) + + if (!$items.length) return + + var index = $items.index($items.filter(':focus')) + + if (e.keyCode == 38 && index > 0) index-- // up + if (e.keyCode == 40 && index < $items.length - 1) index++ // down + if (!~index) index=0 + + $items.eq(index).focus() + } + + function clearMenus() { + $(backdrop).remove() + $(toggle).each(function (e) { + var $parent = getParent($(this)) + if (!$parent.hasClass('open')) return + $parent.trigger(e = $.Event('hide.bs.dropdown')) + if (e.isDefaultPrevented()) return + $parent.removeClass('open').trigger('hidden.bs.dropdown') + }) + } + + function getParent($this) { + var selector = $this.attr('data-target') + + if (!selector) { + selector = $this.attr('href') + selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + } + + var $parent = selector && $(selector) + + return $parent && $parent.length ? $parent : $this.parent() + } + + + // DROPDOWN PLUGIN DEFINITION + // ========================== + + var old = $.fn.dropdown + + $.fn.dropdown = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('dropdown') + + if (!data) $this.data('dropdown', (data = new Dropdown(this))) + if (typeof option == 'string') data[option].call($this) + }) + } + + $.fn.dropdown.Constructor = Dropdown + + + // DROPDOWN NO CONFLICT + // ==================== + + $.fn.dropdown.noConflict = function () { + $.fn.dropdown = old + return this + } + + + // APPLY TO STANDARD DROPDOWN ELEMENTS + // =================================== + + $(document) + .on('click.bs.dropdown.data-api', clearMenus) + .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) + .on('click.bs.dropdown.data-api' , toggle, Dropdown.prototype.toggle) + .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) + +}(window.jQuery); diff --git a/templates/default/assets/js/bootstrap/modal.js b/templates/default/assets/js/bootstrap/modal.js new file mode 100755 index 000000000..65eba481e --- /dev/null +++ b/templates/default/assets/js/bootstrap/modal.js @@ -0,0 +1,246 @@ +/* ======================================================================== + * Bootstrap: modal.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#modals + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // MODAL CLASS DEFINITION + // ====================== + + var Modal = function (element, options) { + this.options = options + this.$element = $(element) + this.$backdrop = + this.isShown = null + + if (this.options.remote) this.$element.load(this.options.remote) + } + + Modal.DEFAULTS = { + backdrop: true + , keyboard: true + , show: true + } + + Modal.prototype.toggle = function (_relatedTarget) { + return this[!this.isShown ? 'show' : 'hide'](_relatedTarget) + } + + Modal.prototype.show = function (_relatedTarget) { + var that = this + var e = $.Event('show.bs.modal', { relatedTarget: _relatedTarget }) + + this.$element.trigger(e) + + if (this.isShown || e.isDefaultPrevented()) return + + this.isShown = true + + this.escape() + + this.$element.on('click.dismiss.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this)) + + this.backdrop(function () { + var transition = $.support.transition && that.$element.hasClass('fade') + + if (!that.$element.parent().length) { + that.$element.appendTo(document.body) // don't move modals dom position + } + + that.$element.show() + + if (transition) { + that.$element[0].offsetWidth // force reflow + } + + that.$element + .addClass('in') + .attr('aria-hidden', false) + + that.enforceFocus() + + var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget }) + + transition ? + that.$element.find('.modal-dialog') // wait for modal to slide in + .one($.support.transition.end, function () { + that.$element.focus().trigger(e) + }) + .emulateTransitionEnd(300) : + that.$element.focus().trigger(e) + }) + } + + Modal.prototype.hide = function (e) { + if (e) e.preventDefault() + + e = $.Event('hide.bs.modal') + + this.$element.trigger(e) + + if (!this.isShown || e.isDefaultPrevented()) return + + this.isShown = false + + this.escape() + + $(document).off('focusin.bs.modal') + + this.$element + .removeClass('in') + .attr('aria-hidden', true) + .off('click.dismiss.modal') + + $.support.transition && this.$element.hasClass('fade') ? + this.$element + .one($.support.transition.end, $.proxy(this.hideModal, this)) + .emulateTransitionEnd(300) : + this.hideModal() + } + + Modal.prototype.enforceFocus = function () { + $(document) + .off('focusin.bs.modal') // guard against infinite focus loop + .on('focusin.bs.modal', $.proxy(function (e) { + if (this.$element[0] !== e.target && !this.$element.has(e.target).length) { + this.$element.focus() + } + }, this)) + } + + Modal.prototype.escape = function () { + if (this.isShown && this.options.keyboard) { + this.$element.on('keyup.dismiss.bs.modal', $.proxy(function (e) { + e.which == 27 && this.hide() + }, this)) + } else if (!this.isShown) { + this.$element.off('keyup.dismiss.bs.modal') + } + } + + Modal.prototype.hideModal = function () { + var that = this + this.$element.hide() + this.backdrop(function () { + that.removeBackdrop() + that.$element.trigger('hidden.bs.modal') + }) + } + + Modal.prototype.removeBackdrop = function () { + this.$backdrop && this.$backdrop.remove() + this.$backdrop = null + } + + Modal.prototype.backdrop = function (callback) { + var that = this + var animate = this.$element.hasClass('fade') ? 'fade' : '' + + if (this.isShown && this.options.backdrop) { + var doAnimate = $.support.transition && animate + + this.$backdrop = $('
    ') + .appendTo(document.body) + + this.$element.on('click.dismiss.modal', $.proxy(function (e) { + if (e.target !== e.currentTarget) return + this.options.backdrop == 'static' + ? this.$element[0].focus.call(this.$element[0]) + : this.hide.call(this) + }, this)) + + if (doAnimate) this.$backdrop[0].offsetWidth // force reflow + + this.$backdrop.addClass('in') + + if (!callback) return + + doAnimate ? + this.$backdrop + .one($.support.transition.end, callback) + .emulateTransitionEnd(150) : + callback() + + } else if (!this.isShown && this.$backdrop) { + this.$backdrop.removeClass('in') + + $.support.transition && this.$element.hasClass('fade')? + this.$backdrop + .one($.support.transition.end, callback) + .emulateTransitionEnd(150) : + callback() + + } else if (callback) { + callback() + } + } + + + // MODAL PLUGIN DEFINITION + // ======================= + + var old = $.fn.modal + + $.fn.modal = function (option, _relatedTarget) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.modal') + var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option) + + if (!data) $this.data('bs.modal', (data = new Modal(this, options))) + if (typeof option == 'string') data[option](_relatedTarget) + else if (options.show) data.show(_relatedTarget) + }) + } + + $.fn.modal.Constructor = Modal + + + // MODAL NO CONFLICT + // ================= + + $.fn.modal.noConflict = function () { + $.fn.modal = old + return this + } + + + // MODAL DATA-API + // ============== + + $(document).on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) { + var $this = $(this) + var href = $this.attr('href') + var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7 + var option = $target.data('modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data()) + + e.preventDefault() + + $target + .modal(option, this) + .one('hide', function () { + $this.is(':visible') && $this.focus() + }) + }) + + $(document) + .on('show.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') }) + .on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') }) + +}(window.jQuery); diff --git a/templates/default/assets/js/bootstrap/popover.js b/templates/default/assets/js/bootstrap/popover.js new file mode 100755 index 000000000..ecd37ac23 --- /dev/null +++ b/templates/default/assets/js/bootstrap/popover.js @@ -0,0 +1,117 @@ +/* ======================================================================== + * Bootstrap: popover.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#popovers + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // POPOVER PUBLIC CLASS DEFINITION + // =============================== + + var Popover = function (element, options) { + this.init('popover', element, options) + } + + if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js') + + Popover.DEFAULTS = $.extend({} , $.fn.tooltip.Constructor.DEFAULTS, { + placement: 'right' + , trigger: 'click' + , content: '' + , template: '

    ' + }) + + + // NOTE: POPOVER EXTENDS tooltip.js + // ================================ + + Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype) + + Popover.prototype.constructor = Popover + + Popover.prototype.getDefaults = function () { + return Popover.DEFAULTS + } + + Popover.prototype.setContent = function () { + var $tip = this.tip() + var title = this.getTitle() + var content = this.getContent() + + $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title) + $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content) + + $tip.removeClass('fade top bottom left right in') + + // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do + // this manually by checking the contents. + if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide() + } + + Popover.prototype.hasContent = function () { + return this.getTitle() || this.getContent() + } + + Popover.prototype.getContent = function () { + var $e = this.$element + var o = this.options + + return $e.attr('data-content') + || (typeof o.content == 'function' ? + o.content.call($e[0]) : + o.content) + } + + Popover.prototype.arrow = function () { + return this.$arrow = this.$arrow || this.tip().find('.arrow') + } + + Popover.prototype.tip = function () { + if (!this.$tip) this.$tip = $(this.options.template) + return this.$tip + } + + + // POPOVER PLUGIN DEFINITION + // ========================= + + var old = $.fn.popover + + $.fn.popover = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.popover') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.popover', (data = new Popover(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.popover.Constructor = Popover + + + // POPOVER NO CONFLICT + // =================== + + $.fn.popover.noConflict = function () { + $.fn.popover = old + return this + } + +}(window.jQuery); diff --git a/templates/default/assets/js/bootstrap/scrollspy.js b/templates/default/assets/js/bootstrap/scrollspy.js new file mode 100755 index 000000000..10f95f249 --- /dev/null +++ b/templates/default/assets/js/bootstrap/scrollspy.js @@ -0,0 +1,158 @@ +/* ======================================================================== + * Bootstrap: scrollspy.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#scrollspy + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // SCROLLSPY CLASS DEFINITION + // ========================== + + function ScrollSpy(element, options) { + var href + var process = $.proxy(this.process, this) + + this.$element = $(element).is('body') ? $(window) : $(element) + this.$body = $('body') + this.$scrollElement = this.$element.on('scroll.bs.scroll-spy.data-api', process) + this.options = $.extend({}, ScrollSpy.DEFAULTS, options) + this.selector = (this.options.target + || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 + || '') + ' .nav li > a' + this.offsets = $([]) + this.targets = $([]) + this.activeTarget = null + + this.refresh() + this.process() + } + + ScrollSpy.DEFAULTS = { + offset: 10 + } + + ScrollSpy.prototype.refresh = function () { + var offsetMethod = this.$element[0] == window ? 'offset' : 'position' + + this.offsets = $([]) + this.targets = $([]) + + var self = this + var $targets = this.$body + .find(this.selector) + .map(function () { + var $el = $(this) + var href = $el.data('target') || $el.attr('href') + var $href = /^#\w/.test(href) && $(href) + + return ($href + && $href.length + && [[ $href[offsetMethod]().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]]) || null + }) + .sort(function (a, b) { return a[0] - b[0] }) + .each(function () { + self.offsets.push(this[0]) + self.targets.push(this[1]) + }) + } + + ScrollSpy.prototype.process = function () { + var scrollTop = this.$scrollElement.scrollTop() + this.options.offset + var scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight + var maxScroll = scrollHeight - this.$scrollElement.height() + var offsets = this.offsets + var targets = this.targets + var activeTarget = this.activeTarget + var i + + if (scrollTop >= maxScroll) { + return activeTarget != (i = targets.last()[0]) && this.activate(i) + } + + for (i = offsets.length; i--;) { + activeTarget != targets[i] + && scrollTop >= offsets[i] + && (!offsets[i + 1] || scrollTop <= offsets[i + 1]) + && this.activate( targets[i] ) + } + } + + ScrollSpy.prototype.activate = function (target) { + this.activeTarget = target + + $(this.selector) + .parents('.active') + .removeClass('active') + + var selector = this.selector + + '[data-target="' + target + '"],' + + this.selector + '[href="' + target + '"]' + + var active = $(selector) + .parents('li') + .addClass('active') + + if (active.parent('.dropdown-menu').length) { + active = active + .closest('li.dropdown') + .addClass('active') + } + + active.trigger('activate') + } + + + // SCROLLSPY PLUGIN DEFINITION + // =========================== + + var old = $.fn.scrollspy + + $.fn.scrollspy = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.scrollspy') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.scrollspy', (data = new ScrollSpy(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.scrollspy.Constructor = ScrollSpy + + + // SCROLLSPY NO CONFLICT + // ===================== + + $.fn.scrollspy.noConflict = function () { + $.fn.scrollspy = old + return this + } + + + // SCROLLSPY DATA-API + // ================== + + $(window).on('load', function () { + $('[data-spy="scroll"]').each(function () { + var $spy = $(this) + $spy.scrollspy($spy.data()) + }) + }) + +}(window.jQuery); diff --git a/templates/default/assets/js/bootstrap/tab.js b/templates/default/assets/js/bootstrap/tab.js new file mode 100755 index 000000000..e1c155920 --- /dev/null +++ b/templates/default/assets/js/bootstrap/tab.js @@ -0,0 +1,135 @@ +/* ======================================================================== + * Bootstrap: tab.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#tabs + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // TAB CLASS DEFINITION + // ==================== + + var Tab = function (element) { + this.element = $(element) + } + + Tab.prototype.show = function () { + var $this = this.element + var $ul = $this.closest('ul:not(.dropdown-menu)') + var selector = $this.attr('data-target') + + if (!selector) { + selector = $this.attr('href') + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + } + + if ($this.parent('li').hasClass('active')) return + + var previous = $ul.find('.active:last a')[0] + var e = $.Event('show.bs.tab', { + relatedTarget: previous + }) + + $this.trigger(e) + + if (e.isDefaultPrevented()) return + + var $target = $(selector) + + this.activate($this.parent('li'), $ul) + this.activate($target, $target.parent(), function () { + $this.trigger({ + type: 'shown.bs.tab' + , relatedTarget: previous + }) + }) + } + + Tab.prototype.activate = function (element, container, callback) { + var $active = container.find('> .active') + var transition = callback + && $.support.transition + && $active.hasClass('fade') + + function next() { + $active + .removeClass('active') + .find('> .dropdown-menu > .active') + .removeClass('active') + + element.addClass('active') + + if (transition) { + element[0].offsetWidth // reflow for transition + element.addClass('in') + } else { + element.removeClass('fade') + } + + if (element.parent('.dropdown-menu')) { + element.closest('li.dropdown').addClass('active') + } + + callback && callback() + } + + transition ? + $active + .one($.support.transition.end, next) + .emulateTransitionEnd(150) : + next() + + $active.removeClass('in') + } + + + // TAB PLUGIN DEFINITION + // ===================== + + var old = $.fn.tab + + $.fn.tab = function ( option ) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.tab') + + if (!data) $this.data('bs.tab', (data = new Tab(this))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.tab.Constructor = Tab + + + // TAB NO CONFLICT + // =============== + + $.fn.tab.noConflict = function () { + $.fn.tab = old + return this + } + + + // TAB DATA-API + // ============ + + $(document).on('click.bs.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) { + e.preventDefault() + $(this).tab('show') + }) + +}(window.jQuery); diff --git a/templates/default/assets/js/bootstrap/tooltip.js b/templates/default/assets/js/bootstrap/tooltip.js new file mode 100755 index 000000000..89802287a --- /dev/null +++ b/templates/default/assets/js/bootstrap/tooltip.js @@ -0,0 +1,386 @@ +/* ======================================================================== + * Bootstrap: tooltip.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#tooltip + * Inspired by the original jQuery.tipsy by Jason Frame + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // TOOLTIP PUBLIC CLASS DEFINITION + // =============================== + + var Tooltip = function (element, options) { + this.type = + this.options = + this.enabled = + this.timeout = + this.hoverState = + this.$element = null + + this.init('tooltip', element, options) + } + + Tooltip.DEFAULTS = { + animation: true + , placement: 'top' + , selector: false + , template: '
    ' + , trigger: 'hover focus' + , title: '' + , delay: 0 + , html: false + , container: false + } + + Tooltip.prototype.init = function (type, element, options) { + this.enabled = true + this.type = type + this.$element = $(element) + this.options = this.getOptions(options) + + var triggers = this.options.trigger.split(' ') + + for (var i = triggers.length; i--;) { + var trigger = triggers[i] + + if (trigger == 'click') { + this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this)) + } else if (trigger != 'manual') { + var eventIn = trigger == 'hover' ? 'mouseenter' : 'focus' + var eventOut = trigger == 'hover' ? 'mouseleave' : 'blur' + + this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this)) + this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this)) + } + } + + this.options.selector ? + (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : + this.fixTitle() + } + + Tooltip.prototype.getDefaults = function () { + return Tooltip.DEFAULTS + } + + Tooltip.prototype.getOptions = function (options) { + options = $.extend({}, this.getDefaults(), this.$element.data(), options) + + if (options.delay && typeof options.delay == 'number') { + options.delay = { + show: options.delay + , hide: options.delay + } + } + + return options + } + + Tooltip.prototype.getDelegateOptions = function () { + var options = {} + var defaults = this.getDefaults() + + this._options && $.each(this._options, function (key, value) { + if (defaults[key] != value) options[key] = value + }) + + return options + } + + Tooltip.prototype.enter = function (obj) { + var self = obj instanceof this.constructor ? + obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type) + + clearTimeout(self.timeout) + + self.hoverState = 'in' + + if (!self.options.delay || !self.options.delay.show) return self.show() + + self.timeout = setTimeout(function () { + if (self.hoverState == 'in') self.show() + }, self.options.delay.show) + } + + Tooltip.prototype.leave = function (obj) { + var self = obj instanceof this.constructor ? + obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type) + + clearTimeout(self.timeout) + + self.hoverState = 'out' + + if (!self.options.delay || !self.options.delay.hide) return self.hide() + + self.timeout = setTimeout(function () { + if (self.hoverState == 'out') self.hide() + }, self.options.delay.hide) + } + + Tooltip.prototype.show = function () { + var e = $.Event('show.bs.'+ this.type) + + if (this.hasContent() && this.enabled) { + this.$element.trigger(e) + + if (e.isDefaultPrevented()) return + + var $tip = this.tip() + + this.setContent() + + if (this.options.animation) $tip.addClass('fade') + + var placement = typeof this.options.placement == 'function' ? + this.options.placement.call(this, $tip[0], this.$element[0]) : + this.options.placement + + var autoToken = /\s?auto?\s?/i + var autoPlace = autoToken.test(placement) + if (autoPlace) placement = placement.replace(autoToken, '') || 'top' + + $tip + .detach() + .css({ top: 0, left: 0, display: 'block' }) + .addClass(placement) + + this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element) + + var pos = this.getPosition() + var actualWidth = $tip[0].offsetWidth + var actualHeight = $tip[0].offsetHeight + + if (autoPlace) { + var $parent = this.$element.parent() + + var orgPlacement = placement + var docScroll = document.documentElement.scrollTop || document.body.scrollTop + var parentWidth = this.options.container == 'body' ? window.innerWidth : $parent.outerWidth() + var parentHeight = this.options.container == 'body' ? window.innerHeight : $parent.outerHeight() + var parentLeft = this.options.container == 'body' ? 0 : $parent.offset().left + + placement = placement == 'bottom' && pos.top + pos.height + actualHeight - docScroll > parentHeight ? 'top' : + placement == 'top' && pos.top - docScroll - actualHeight < 0 ? 'bottom' : + placement == 'right' && pos.right + actualWidth > parentWidth ? 'left' : + placement == 'left' && pos.left - actualWidth < parentLeft ? 'right' : + placement + + $tip + .removeClass(orgPlacement) + .addClass(placement) + } + + var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight) + + this.applyPlacement(calculatedOffset, placement) + this.$element.trigger('shown.bs.' + this.type) + } + } + + Tooltip.prototype.applyPlacement = function(offset, placement) { + var replace + var $tip = this.tip() + var width = $tip[0].offsetWidth + var height = $tip[0].offsetHeight + + // manually read margins because getBoundingClientRect includes difference + var marginTop = parseInt($tip.css('margin-top'), 10) + var marginLeft = parseInt($tip.css('margin-left'), 10) + + // we must check for NaN for ie 8/9 + if (isNaN(marginTop)) marginTop = 0 + if (isNaN(marginLeft)) marginLeft = 0 + + offset.top = offset.top + marginTop + offset.left = offset.left + marginLeft + + $tip + .offset(offset) + .addClass('in') + + // check to see if placing tip in new offset caused the tip to resize itself + var actualWidth = $tip[0].offsetWidth + var actualHeight = $tip[0].offsetHeight + + if (placement == 'top' && actualHeight != height) { + replace = true + offset.top = offset.top + height - actualHeight + } + + if (/bottom|top/.test(placement)) { + var delta = 0 + + if (offset.left < 0) { + delta = offset.left * -2 + offset.left = 0 + + $tip.offset(offset) + + actualWidth = $tip[0].offsetWidth + actualHeight = $tip[0].offsetHeight + } + + this.replaceArrow(delta - width + actualWidth, actualWidth, 'left') + } else { + this.replaceArrow(actualHeight - height, actualHeight, 'top') + } + + if (replace) $tip.offset(offset) + } + + Tooltip.prototype.replaceArrow = function(delta, dimension, position) { + this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + "%") : '') + } + + Tooltip.prototype.setContent = function () { + var $tip = this.tip() + var title = this.getTitle() + + $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title) + $tip.removeClass('fade in top bottom left right') + } + + Tooltip.prototype.hide = function () { + var that = this + var $tip = this.tip() + var e = $.Event('hide.bs.' + this.type) + + function complete() { + if (that.hoverState != 'in') $tip.detach() + } + + this.$element.trigger(e) + + if (e.isDefaultPrevented()) return + + $tip.removeClass('in') + + $.support.transition && this.$tip.hasClass('fade') ? + $tip + .one($.support.transition.end, complete) + .emulateTransitionEnd(150) : + complete() + + this.$element.trigger('hidden.bs.' + this.type) + + return this + } + + Tooltip.prototype.fixTitle = function () { + var $e = this.$element + if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { + $e.attr('data-original-title', $e.attr('title') || '').attr('title', '') + } + } + + Tooltip.prototype.hasContent = function () { + return this.getTitle() + } + + Tooltip.prototype.getPosition = function () { + var el = this.$element[0] + return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : { + width: el.offsetWidth + , height: el.offsetHeight + }, this.$element.offset()) + } + + Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) { + return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } : + placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } : + placement == 'left' ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } : + /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width } + } + + Tooltip.prototype.getTitle = function () { + var title + var $e = this.$element + var o = this.options + + title = $e.attr('data-original-title') + || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) + + return title + } + + Tooltip.prototype.tip = function () { + return this.$tip = this.$tip || $(this.options.template) + } + + Tooltip.prototype.arrow = function () { + return this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow') + } + + Tooltip.prototype.validate = function () { + if (!this.$element[0].parentNode) { + this.hide() + this.$element = null + this.options = null + } + } + + Tooltip.prototype.enable = function () { + this.enabled = true + } + + Tooltip.prototype.disable = function () { + this.enabled = false + } + + Tooltip.prototype.toggleEnabled = function () { + this.enabled = !this.enabled + } + + Tooltip.prototype.toggle = function (e) { + var self = e ? $(e.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type) : this + self.tip().hasClass('in') ? self.leave(self) : self.enter(self) + } + + Tooltip.prototype.destroy = function () { + this.hide().$element.off('.' + this.type).removeData('bs.' + this.type) + } + + + // TOOLTIP PLUGIN DEFINITION + // ========================= + + var old = $.fn.tooltip + + $.fn.tooltip = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.tooltip') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.tooltip.Constructor = Tooltip + + + // TOOLTIP NO CONFLICT + // =================== + + $.fn.tooltip.noConflict = function () { + $.fn.tooltip = old + return this + } + +}(window.jQuery); diff --git a/templates/default/assets/js/bootstrap/transition.js b/templates/default/assets/js/bootstrap/transition.js new file mode 100755 index 000000000..e8f318beb --- /dev/null +++ b/templates/default/assets/js/bootstrap/transition.js @@ -0,0 +1,56 @@ +/* ======================================================================== + * Bootstrap: transition.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#transitions + * ======================================================================== + * Copyright 2013 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/) + // ============================================================ + + function transitionEnd() { + var el = document.createElement('bootstrap') + + var transEndEventNames = { + 'WebkitTransition' : 'webkitTransitionEnd' + , 'MozTransition' : 'transitionend' + , 'OTransition' : 'oTransitionEnd otransitionend' + , 'transition' : 'transitionend' + } + + for (var name in transEndEventNames) { + if (el.style[name] !== undefined) { + return { end: transEndEventNames[name] } + } + } + } + + // http://blog.alexmaccaw.com/css-transitions + $.fn.emulateTransitionEnd = function (duration) { + var called = false, $el = this + $(this).one($.support.transition.end, function () { called = true }) + var callback = function () { if (!called) $($el).trigger($.support.transition.end) } + setTimeout(callback, duration) + return this + } + + $(function () { + $.support.transition = transitionEnd() + }) + +}(window.jQuery); diff --git a/templates/default/assets/js/libs/jquery.js b/templates/default/assets/js/libs/jquery.js new file mode 100644 index 000000000..e01079755 --- /dev/null +++ b/templates/default/assets/js/libs/jquery.js @@ -0,0 +1,6 @@ +/*! jQuery v1.10.1 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license + +*/ +(function(e,t){var n,r,i=typeof t,o=e.location,a=e.document,s=a.documentElement,l=e.jQuery,u=e.$,c={},p=[],f="1.10.1",d=p.concat,h=p.push,g=p.slice,m=p.indexOf,y=c.toString,v=c.hasOwnProperty,b=f.trim,x=function(e,t){return new x.fn.init(e,t,r)},w=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=/\S+/g,C=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,k=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,E=/^[\],:{}\s]*$/,S=/(?:^|:|,)(?:\s*\[)+/g,A=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,j=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,D=/^-ms-/,L=/-([\da-z])/gi,H=function(e,t){return t.toUpperCase()},q=function(e){(a.addEventListener||"load"===e.type||"complete"===a.readyState)&&(_(),x.ready())},_=function(){a.addEventListener?(a.removeEventListener("DOMContentLoaded",q,!1),e.removeEventListener("load",q,!1)):(a.detachEvent("onreadystatechange",q),e.detachEvent("onload",q))};x.fn=x.prototype={jquery:f,constructor:x,init:function(e,n,r){var i,o;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof x?n[0]:n,x.merge(this,x.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:a,!0)),k.test(i[1])&&x.isPlainObject(n))for(i in n)x.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(o=a.getElementById(i[2]),o&&o.parentNode){if(o.id!==i[2])return r.find(e);this.length=1,this[0]=o}return this.context=a,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):x.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),x.makeArray(e,this))},selector:"",length:0,toArray:function(){return g.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=x.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return x.each(this,e,t)},ready:function(e){return x.ready.promise().done(e),this},slice:function(){return this.pushStack(g.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(x.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:h,sort:[].sort,splice:[].splice},x.fn.init.prototype=x.fn,x.extend=x.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},l=1,u=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},l=2),"object"==typeof s||x.isFunction(s)||(s={}),u===l&&(s=this,--l);u>l;l++)if(null!=(o=arguments[l]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(x.isPlainObject(r)||(n=x.isArray(r)))?(n?(n=!1,a=e&&x.isArray(e)?e:[]):a=e&&x.isPlainObject(e)?e:{},s[i]=x.extend(c,a,r)):r!==t&&(s[i]=r));return s},x.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),noConflict:function(t){return e.$===x&&(e.$=u),t&&e.jQuery===x&&(e.jQuery=l),x},isReady:!1,readyWait:1,holdReady:function(e){e?x.readyWait++:x.ready(!0)},ready:function(e){if(e===!0?!--x.readyWait:!x.isReady){if(!a.body)return setTimeout(x.ready);x.isReady=!0,e!==!0&&--x.readyWait>0||(n.resolveWith(a,[x]),x.fn.trigger&&x(a).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===x.type(e)},isArray:Array.isArray||function(e){return"array"===x.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?c[y.call(e)]||"object":typeof e},isPlainObject:function(e){var n;if(!e||"object"!==x.type(e)||e.nodeType||x.isWindow(e))return!1;try{if(e.constructor&&!v.call(e,"constructor")&&!v.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(r){return!1}if(x.support.ownLast)for(n in e)return v.call(e,n);for(n in e);return n===t||v.call(e,n)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||a;var r=k.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=x.buildFragment([e],t,i),i&&x(i).remove(),x.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=x.trim(n),n&&E.test(n.replace(A,"@").replace(j,"]").replace(S,"")))?Function("return "+n)():(x.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||x.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&x.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(D,"ms-").replace(L,H)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:b&&!b.call("\ufeff\u00a0")?function(e){return null==e?"":b.call(e)}:function(e){return null==e?"":(e+"").replace(C,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?x.merge(n,"string"==typeof e?[e]:e):h.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(m)return m.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return d.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),x.isFunction(e)?(r=g.call(arguments,2),i=function(){return e.apply(n||this,r.concat(g.call(arguments)))},i.guid=e.guid=e.guid||x.guid++,i):t},access:function(e,n,r,i,o,a,s){var l=0,u=e.length,c=null==r;if("object"===x.type(r)){o=!0;for(l in r)x.access(e,n,l,r[l],!0,a,s)}else if(i!==t&&(o=!0,x.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(x(e),n)})),n))for(;u>l;l++)n(e[l],r,s?i:i.call(e[l],l,n(e[l],r)));return o?e:c?n.call(e):u?n(e[0],r):a},now:function(){return(new Date).getTime()},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),x.ready.promise=function(t){if(!n)if(n=x.Deferred(),"complete"===a.readyState)setTimeout(x.ready);else if(a.addEventListener)a.addEventListener("DOMContentLoaded",q,!1),e.addEventListener("load",q,!1);else{a.attachEvent("onreadystatechange",q),e.attachEvent("onload",q);var r=!1;try{r=null==e.frameElement&&a.documentElement}catch(i){}r&&r.doScroll&&function o(){if(!x.isReady){try{r.doScroll("left")}catch(e){return setTimeout(o,50)}_(),x.ready()}}()}return n.promise(t)},x.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){c["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=x.type(e);return x.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=x(a),function(e,t){var n,r,i,o,a,s,l,u,c,p,f,d,h,g,m,y,v,b="sizzle"+-new Date,w=e.document,T=0,C=0,N=lt(),k=lt(),E=lt(),S=!1,A=function(){return 0},j=typeof t,D=1<<31,L={}.hasOwnProperty,H=[],q=H.pop,_=H.push,M=H.push,O=H.slice,F=H.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},B="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",P="[\\x20\\t\\r\\n\\f]",R="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",W=R.replace("w","w#"),$="\\["+P+"*("+R+")"+P+"*(?:([*^$|!~]?=)"+P+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+W+")|)|)"+P+"*\\]",I=":("+R+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+$.replace(3,8)+")*)|.*)\\)|)",z=RegExp("^"+P+"+|((?:^|[^\\\\])(?:\\\\.)*)"+P+"+$","g"),X=RegExp("^"+P+"*,"+P+"*"),U=RegExp("^"+P+"*([>+~]|"+P+")"+P+"*"),V=RegExp(P+"*[+~]"),Y=RegExp("="+P+"*([^\\]'\"]*)"+P+"*\\]","g"),J=RegExp(I),G=RegExp("^"+W+"$"),Q={ID:RegExp("^#("+R+")"),CLASS:RegExp("^\\.("+R+")"),TAG:RegExp("^("+R.replace("w","w*")+")"),ATTR:RegExp("^"+$),PSEUDO:RegExp("^"+I),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+P+"*(even|odd|(([+-]|)(\\d*)n|)"+P+"*(?:([+-]|)"+P+"*(\\d+)|))"+P+"*\\)|)","i"),bool:RegExp("^(?:"+B+")$","i"),needsContext:RegExp("^"+P+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+P+"*((?:-\\d)?\\d*)"+P+"*\\)|)(?=[^-]|$)","i")},K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,et=/^(?:input|select|textarea|button)$/i,tt=/^h\d$/i,nt=/'|\\/g,rt=RegExp("\\\\([\\da-f]{1,6}"+P+"?|("+P+")|.)","ig"),it=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(55296|r>>10,56320|1023&r)};try{M.apply(H=O.call(w.childNodes),w.childNodes),H[w.childNodes.length].nodeType}catch(ot){M={apply:H.length?function(e,t){_.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function at(e,t,n,i){var o,a,s,l,u,c,d,m,y,x;if((t?t.ownerDocument||t:w)!==f&&p(t),t=t||f,n=n||[],!e||"string"!=typeof e)return n;if(1!==(l=t.nodeType)&&9!==l)return[];if(h&&!i){if(o=Z.exec(e))if(s=o[1]){if(9===l){if(a=t.getElementById(s),!a||!a.parentNode)return n;if(a.id===s)return n.push(a),n}else if(t.ownerDocument&&(a=t.ownerDocument.getElementById(s))&&v(t,a)&&a.id===s)return n.push(a),n}else{if(o[2])return M.apply(n,t.getElementsByTagName(e)),n;if((s=o[3])&&r.getElementsByClassName&&t.getElementsByClassName)return M.apply(n,t.getElementsByClassName(s)),n}if(r.qsa&&(!g||!g.test(e))){if(m=d=b,y=t,x=9===l&&e,1===l&&"object"!==t.nodeName.toLowerCase()){c=bt(e),(d=t.getAttribute("id"))?m=d.replace(nt,"\\$&"):t.setAttribute("id",m),m="[id='"+m+"'] ",u=c.length;while(u--)c[u]=m+xt(c[u]);y=V.test(e)&&t.parentNode||t,x=c.join(",")}if(x)try{return M.apply(n,y.querySelectorAll(x)),n}catch(T){}finally{d||t.removeAttribute("id")}}}return At(e.replace(z,"$1"),t,n,i)}function st(e){return K.test(e+"")}function lt(){var e=[];function t(n,r){return e.push(n+=" ")>o.cacheLength&&delete t[e.shift()],t[n]=r}return t}function ut(e){return e[b]=!0,e}function ct(e){var t=f.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function pt(e,t,n){e=e.split("|");var r,i=e.length,a=n?null:t;while(i--)(r=o.attrHandle[e[i]])&&r!==t||(o.attrHandle[e[i]]=a)}function ft(e,t){var n=e.getAttributeNode(t);return n&&n.specified?n.value:e[t]===!0?t.toLowerCase():null}function dt(e,t){return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}function ht(e){return"input"===e.nodeName.toLowerCase()?e.defaultValue:t}function gt(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||D)-(~e.sourceIndex||D);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function mt(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function yt(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function vt(e){return ut(function(t){return t=+t,ut(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}s=at.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},r=at.support={},p=at.setDocument=function(e){var n=e?e.ownerDocument||e:w,i=n.parentWindow;return n!==f&&9===n.nodeType&&n.documentElement?(f=n,d=n.documentElement,h=!s(n),i&&i.frameElement&&i.attachEvent("onbeforeunload",function(){p()}),r.attributes=ct(function(e){return e.innerHTML="",pt("type|href|height|width",dt,"#"===e.firstChild.getAttribute("href")),pt(B,ft,null==e.getAttribute("disabled")),e.className="i",!e.getAttribute("className")}),r.input=ct(function(e){return e.innerHTML="",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")}),pt("value",ht,r.attributes&&r.input),r.getElementsByTagName=ct(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),r.getElementsByClassName=ct(function(e){return e.innerHTML="
    ",e.firstChild.className="i",2===e.getElementsByClassName("i").length}),r.getById=ct(function(e){return d.appendChild(e).id=b,!n.getElementsByName||!n.getElementsByName(b).length}),r.getById?(o.find.ID=function(e,t){if(typeof t.getElementById!==j&&h){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){return e.getAttribute("id")===t}}):(delete o.find.ID,o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){var n=typeof e.getAttributeNode!==j&&e.getAttributeNode("id");return n&&n.value===t}}),o.find.TAG=r.getElementsByTagName?function(e,n){return typeof n.getElementsByTagName!==j?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},o.find.CLASS=r.getElementsByClassName&&function(e,n){return typeof n.getElementsByClassName!==j&&h?n.getElementsByClassName(e):t},m=[],g=[],(r.qsa=st(n.querySelectorAll))&&(ct(function(e){e.innerHTML="",e.querySelectorAll("[selected]").length||g.push("\\["+P+"*(?:value|"+B+")"),e.querySelectorAll(":checked").length||g.push(":checked")}),ct(function(e){var t=n.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("t",""),e.querySelectorAll("[t^='']").length&&g.push("[*^$]="+P+"*(?:''|\"\")"),e.querySelectorAll(":enabled").length||g.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),g.push(",.*:")})),(r.matchesSelector=st(y=d.webkitMatchesSelector||d.mozMatchesSelector||d.oMatchesSelector||d.msMatchesSelector))&&ct(function(e){r.disconnectedMatch=y.call(e,"div"),y.call(e,"[s!='']:x"),m.push("!=",I)}),g=g.length&&RegExp(g.join("|")),m=m.length&&RegExp(m.join("|")),v=st(d.contains)||d.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},r.sortDetached=ct(function(e){return 1&e.compareDocumentPosition(n.createElement("div"))}),A=d.compareDocumentPosition?function(e,t){if(e===t)return S=!0,0;var i=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t);return i?1&i||!r.sortDetached&&t.compareDocumentPosition(e)===i?e===n||v(w,e)?-1:t===n||v(w,t)?1:c?F.call(c,e)-F.call(c,t):0:4&i?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return S=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:c?F.call(c,e)-F.call(c,t):0;if(o===a)return gt(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?gt(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},n):f},at.matches=function(e,t){return at(e,null,null,t)},at.matchesSelector=function(e,t){if((e.ownerDocument||e)!==f&&p(e),t=t.replace(Y,"='$1']"),!(!r.matchesSelector||!h||m&&m.test(t)||g&&g.test(t)))try{var n=y.call(e,t);if(n||r.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(i){}return at(t,f,null,[e]).length>0},at.contains=function(e,t){return(e.ownerDocument||e)!==f&&p(e),v(e,t)},at.attr=function(e,n){(e.ownerDocument||e)!==f&&p(e);var i=o.attrHandle[n.toLowerCase()],a=i&&L.call(o.attrHandle,n.toLowerCase())?i(e,n,!h):t;return a===t?r.attributes||!h?e.getAttribute(n):(a=e.getAttributeNode(n))&&a.specified?a.value:null:a},at.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},at.uniqueSort=function(e){var t,n=[],i=0,o=0;if(S=!r.detectDuplicates,c=!r.sortStable&&e.slice(0),e.sort(A),S){while(t=e[o++])t===e[o]&&(i=n.push(o));while(i--)e.splice(n[i],1)}return e},a=at.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=a(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=a(t);return n},o=at.selectors={cacheLength:50,createPseudo:ut,match:Q,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(rt,it),e[3]=(e[4]||e[5]||"").replace(rt,it),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||at.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&at.error(e[0]),e},PSEUDO:function(e){var n,r=!e[5]&&e[2];return Q.CHILD.test(e[0])?null:(e[3]&&e[4]!==t?e[2]=e[4]:r&&J.test(r)&&(n=bt(r,!0))&&(n=r.indexOf(")",r.length-n)-r.length)&&(e[0]=e[0].slice(0,n),e[2]=r.slice(0,n)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(rt,it).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=N[e+" "];return t||(t=RegExp("(^|"+P+")"+e+"("+P+"|$)"))&&N(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==j&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=at.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,l){var u,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!l&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[b]||(m[b]={}),u=c[e]||[],d=u[0]===T&&u[1],f=u[0]===T&&u[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[T,d,f];break}}else if(v&&(u=(t[b]||(t[b]={}))[e])&&u[0]===T)f=u[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[b]||(p[b]={}))[e]=[T,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=o.pseudos[e]||o.setFilters[e.toLowerCase()]||at.error("unsupported pseudo: "+e);return r[b]?r(t):r.length>1?(n=[e,e,"",t],o.setFilters.hasOwnProperty(e.toLowerCase())?ut(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=F.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:ut(function(e){var t=[],n=[],r=l(e.replace(z,"$1"));return r[b]?ut(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:ut(function(e){return function(t){return at(e,t).length>0}}),contains:ut(function(e){return function(t){return(t.textContent||t.innerText||a(t)).indexOf(e)>-1}}),lang:ut(function(e){return G.test(e||"")||at.error("unsupported lang: "+e),e=e.replace(rt,it).toLowerCase(),function(t){var n;do if(n=h?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===d},focus:function(e){return e===f.activeElement&&(!f.hasFocus||f.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!o.pseudos.empty(e)},header:function(e){return tt.test(e.nodeName)},input:function(e){return et.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:vt(function(){return[0]}),last:vt(function(e,t){return[t-1]}),eq:vt(function(e,t,n){return[0>n?n+t:n]}),even:vt(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:vt(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:vt(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:vt(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}};for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})o.pseudos[n]=mt(n);for(n in{submit:!0,reset:!0})o.pseudos[n]=yt(n);function bt(e,t){var n,r,i,a,s,l,u,c=k[e+" "];if(c)return t?0:c.slice(0);s=e,l=[],u=o.preFilter;while(s){(!n||(r=X.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),l.push(i=[])),n=!1,(r=U.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(z," ")}),s=s.slice(n.length));for(a in o.filter)!(r=Q[a].exec(s))||u[a]&&!(r=u[a](r))||(n=r.shift(),i.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?at.error(e):k(e,l).slice(0)}function xt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function wt(e,t,n){var r=t.dir,o=n&&"parentNode"===r,a=C++;return t.first?function(t,n,i){while(t=t[r])if(1===t.nodeType||o)return e(t,n,i)}:function(t,n,s){var l,u,c,p=T+" "+a;if(s){while(t=t[r])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[r])if(1===t.nodeType||o)if(c=t[b]||(t[b]={}),(u=c[r])&&u[0]===p){if((l=u[1])===!0||l===i)return l===!0}else if(u=c[r]=[p],u[1]=e(t,n,s)||i,u[1]===!0)return!0}}function Tt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function Ct(e,t,n,r,i){var o,a=[],s=0,l=e.length,u=null!=t;for(;l>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),u&&t.push(s));return a}function Nt(e,t,n,r,i,o){return r&&!r[b]&&(r=Nt(r)),i&&!i[b]&&(i=Nt(i,o)),ut(function(o,a,s,l){var u,c,p,f=[],d=[],h=a.length,g=o||St(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:Ct(g,f,e,s,l),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,l),r){u=Ct(y,d),r(u,[],s,l),c=u.length;while(c--)(p=u[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){u=[],c=y.length;while(c--)(p=y[c])&&u.push(m[c]=p);i(null,y=[],u,l)}c=y.length;while(c--)(p=y[c])&&(u=i?F.call(o,p):f[c])>-1&&(o[u]=!(a[u]=p))}}else y=Ct(y===a?y.splice(h,y.length):y),i?i(null,a,y,l):M.apply(a,y)})}function kt(e){var t,n,r,i=e.length,a=o.relative[e[0].type],s=a||o.relative[" "],l=a?1:0,c=wt(function(e){return e===t},s,!0),p=wt(function(e){return F.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==u)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;i>l;l++)if(n=o.relative[e[l].type])f=[wt(Tt(f),n)];else{if(n=o.filter[e[l].type].apply(null,e[l].matches),n[b]){for(r=++l;i>r;r++)if(o.relative[e[r].type])break;return Nt(l>1&&Tt(f),l>1&&xt(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(z,"$1"),n,r>l&&kt(e.slice(l,r)),i>r&&kt(e=e.slice(r)),i>r&&xt(e))}f.push(n)}return Tt(f)}function Et(e,t){var n=0,r=t.length>0,a=e.length>0,s=function(s,l,c,p,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,C=u,N=s||a&&o.find.TAG("*",d&&l.parentNode||l),k=T+=null==C?1:Math.random()||.1;for(w&&(u=l!==f&&l,i=n);null!=(h=N[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,l,c)){p.push(h);break}w&&(T=k,i=++n)}r&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,r&&b!==v){g=0;while(m=t[g++])m(x,y,l,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=q.call(p));y=Ct(y)}M.apply(p,y),w&&!s&&y.length>0&&v+t.length>1&&at.uniqueSort(p)}return w&&(T=k,u=C),x};return r?ut(s):s}l=at.compile=function(e,t){var n,r=[],i=[],o=E[e+" "];if(!o){t||(t=bt(e)),n=t.length;while(n--)o=kt(t[n]),o[b]?r.push(o):i.push(o);o=E(e,Et(i,r))}return o};function St(e,t,n){var r=0,i=t.length;for(;i>r;r++)at(e,t[r],n);return n}function At(e,t,n,i){var a,s,u,c,p,f=bt(e);if(!i&&1===f.length){if(s=f[0]=f[0].slice(0),s.length>2&&"ID"===(u=s[0]).type&&r.getById&&9===t.nodeType&&h&&o.relative[s[1].type]){if(t=(o.find.ID(u.matches[0].replace(rt,it),t)||[])[0],!t)return n;e=e.slice(s.shift().value.length)}a=Q.needsContext.test(e)?0:s.length;while(a--){if(u=s[a],o.relative[c=u.type])break;if((p=o.find[c])&&(i=p(u.matches[0].replace(rt,it),V.test(s[0].type)&&t.parentNode||t))){if(s.splice(a,1),e=i.length&&xt(s),!e)return M.apply(n,i),n;break}}}return l(e,f)(i,t,!h,n,V.test(e)),n}o.pseudos.nth=o.pseudos.eq;function jt(){}jt.prototype=o.filters=o.pseudos,o.setFilters=new jt,r.sortStable=b.split("").sort(A).join("")===b,p(),[0,0].sort(A),r.detectDuplicates=S,x.find=at,x.expr=at.selectors,x.expr[":"]=x.expr.pseudos,x.unique=at.uniqueSort,x.text=at.getText,x.isXMLDoc=at.isXML,x.contains=at.contains}(e);var O={};function F(e){var t=O[e]={};return x.each(e.match(T)||[],function(e,n){t[n]=!0}),t}x.Callbacks=function(e){e="string"==typeof e?O[e]||F(e):x.extend({},e);var n,r,i,o,a,s,l=[],u=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=l.length,n=!0;l&&o>a;a++)if(l[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,l&&(u?u.length&&c(u.shift()):r?l=[]:p.disable())},p={add:function(){if(l){var t=l.length;(function i(t){x.each(t,function(t,n){var r=x.type(n);"function"===r?e.unique&&p.has(n)||l.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=l.length:r&&(s=t,c(r))}return this},remove:function(){return l&&x.each(arguments,function(e,t){var r;while((r=x.inArray(t,l,r))>-1)l.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?x.inArray(e,l)>-1:!(!l||!l.length)},empty:function(){return l=[],o=0,this},disable:function(){return l=u=r=t,this},disabled:function(){return!l},lock:function(){return u=t,r||p.disable(),this},locked:function(){return!u},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],!l||i&&!u||(n?u.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},x.extend({Deferred:function(e){var t=[["resolve","done",x.Callbacks("once memory"),"resolved"],["reject","fail",x.Callbacks("once memory"),"rejected"],["notify","progress",x.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return x.Deferred(function(n){x.each(t,function(t,o){var a=o[0],s=x.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&x.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?x.extend(e,r):r}},i={};return r.pipe=r.then,x.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=g.call(arguments),r=n.length,i=1!==r||e&&x.isFunction(e.promise)?r:0,o=1===i?e:x.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?g.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,l,u;if(r>1)for(s=Array(r),l=Array(r),u=Array(r);r>t;t++)n[t]&&x.isFunction(n[t].promise)?n[t].promise().done(a(t,u,n)).fail(o.reject).progress(a(t,l,s)):--i;return i||o.resolveWith(u,n),o.promise()}}),x.support=function(t){var n,r,o,s,l,u,c,p,f,d=a.createElement("div");if(d.setAttribute("className","t"),d.innerHTML="
    a",n=d.getElementsByTagName("*")||[],r=d.getElementsByTagName("a")[0],!r||!r.style||!n.length)return t;s=a.createElement("select"),u=s.appendChild(a.createElement("option")),o=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t.getSetAttribute="t"!==d.className,t.leadingWhitespace=3===d.firstChild.nodeType,t.tbody=!d.getElementsByTagName("tbody").length,t.htmlSerialize=!!d.getElementsByTagName("link").length,t.style=/top/.test(r.getAttribute("style")),t.hrefNormalized="/a"===r.getAttribute("href"),t.opacity=/^0.5/.test(r.style.opacity),t.cssFloat=!!r.style.cssFloat,t.checkOn=!!o.value,t.optSelected=u.selected,t.enctype=!!a.createElement("form").enctype,t.html5Clone="<:nav>"!==a.createElement("nav").cloneNode(!0).outerHTML,t.inlineBlockNeedsLayout=!1,t.shrinkWrapBlocks=!1,t.pixelPosition=!1,t.deleteExpando=!0,t.noCloneEvent=!0,t.reliableMarginRight=!0,t.boxSizingReliable=!0,o.checked=!0,t.noCloneChecked=o.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!u.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}o=a.createElement("input"),o.setAttribute("value",""),t.input=""===o.getAttribute("value"),o.value="t",o.setAttribute("type","radio"),t.radioValue="t"===o.value,o.setAttribute("checked","t"),o.setAttribute("name","t"),l=a.createDocumentFragment(),l.appendChild(o),t.appendChecked=o.checked,t.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip;for(f in x(t))break;return t.ownLast="0"!==f,x(function(){var n,r,o,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",l=a.getElementsByTagName("body")[0];l&&(n=a.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",l.appendChild(n).appendChild(d),d.innerHTML="
    t
    ",o=d.getElementsByTagName("td"),o[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===o[0].offsetHeight,o[0].style.display="",o[1].style.display="none",t.reliableHiddenOffsets=p&&0===o[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",x.swap(l,null!=l.style.zoom?{zoom:1}:{},function(){t.boxSizing=4===d.offsetWidth}),e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(a.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="
    ",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(l.style.zoom=1)),l.removeChild(n),n=d=o=r=null) +}),n=s=l=u=r=o=null,t}({});var B=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;function R(e,n,r,i){if(x.acceptData(e)){var o,a,s=x.expando,l=e.nodeType,u=l?x.cache:e,c=l?e[s]:e[s]&&s;if(c&&u[c]&&(i||u[c].data)||r!==t||"string"!=typeof n)return c||(c=l?e[s]=p.pop()||x.guid++:s),u[c]||(u[c]=l?{}:{toJSON:x.noop}),("object"==typeof n||"function"==typeof n)&&(i?u[c]=x.extend(u[c],n):u[c].data=x.extend(u[c].data,n)),a=u[c],i||(a.data||(a.data={}),a=a.data),r!==t&&(a[x.camelCase(n)]=r),"string"==typeof n?(o=a[n],null==o&&(o=a[x.camelCase(n)])):o=a,o}}function W(e,t,n){if(x.acceptData(e)){var r,i,o=e.nodeType,a=o?x.cache:e,s=o?e[x.expando]:x.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){x.isArray(t)?t=t.concat(x.map(t,x.camelCase)):t in r?t=[t]:(t=x.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;while(i--)delete r[t[i]];if(n?!I(r):!x.isEmptyObject(r))return}(n||(delete a[s].data,I(a[s])))&&(o?x.cleanData([e],!0):x.support.deleteExpando||a!=a.window?delete a[s]:a[s]=null)}}}x.extend({cache:{},noData:{applet:!0,embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?x.cache[e[x.expando]]:e[x.expando],!!e&&!I(e)},data:function(e,t,n){return R(e,t,n)},removeData:function(e,t){return W(e,t)},_data:function(e,t,n){return R(e,t,n,!0)},_removeData:function(e,t){return W(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&x.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),x.fn.extend({data:function(e,n){var r,i,o=null,a=0,s=this[0];if(e===t){if(this.length&&(o=x.data(s),1===s.nodeType&&!x._data(s,"parsedAttrs"))){for(r=s.attributes;r.length>a;a++)i=r[a].name,0===i.indexOf("data-")&&(i=x.camelCase(i.slice(5)),$(s,i,o[i]));x._data(s,"parsedAttrs",!0)}return o}return"object"==typeof e?this.each(function(){x.data(this,e)}):arguments.length>1?this.each(function(){x.data(this,e,n)}):s?$(s,e,x.data(s,e)):null},removeData:function(e){return this.each(function(){x.removeData(this,e)})}});function $(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(P,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:B.test(r)?x.parseJSON(r):r}catch(o){}x.data(e,n,r)}else r=t}return r}function I(e){var t;for(t in e)if(("data"!==t||!x.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}x.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=x._data(e,n),r&&(!i||x.isArray(r)?i=x._data(e,n,x.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=x.queue(e,t),r=n.length,i=n.shift(),o=x._queueHooks(e,t),a=function(){x.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return x._data(e,n)||x._data(e,n,{empty:x.Callbacks("once memory").add(function(){x._removeData(e,t+"queue"),x._removeData(e,n)})})}}),x.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?x.queue(this[0],e):n===t?this:this.each(function(){var t=x.queue(this,e,n);x._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&x.dequeue(this,e)})},dequeue:function(e){return this.each(function(){x.dequeue(this,e)})},delay:function(e,t){return e=x.fx?x.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=x.Deferred(),a=this,s=this.length,l=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=x._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(l));return l(),o.promise(n)}});var z,X,U=/[\t\r\n\f]/g,V=/\r/g,Y=/^(?:input|select|textarea|button|object)$/i,J=/^(?:a|area)$/i,G=/^(?:checked|selected)$/i,Q=x.support.getSetAttribute,K=x.support.input;x.fn.extend({attr:function(e,t){return x.access(this,x.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){x.removeAttr(this,e)})},prop:function(e,t){return x.access(this,x.prop,e,t,arguments.length>1)},removeProp:function(e){return e=x.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,l="string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).addClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=x.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,l=0===arguments.length||"string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).removeClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?x.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e,r="boolean"==typeof t;return x.isFunction(e)?this.each(function(n){x(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var o,a=0,s=x(this),l=t,u=e.match(T)||[];while(o=u[a++])l=r?l:!s.hasClass(o),s[l?"addClass":"removeClass"](o)}else(n===i||"boolean"===n)&&(this.className&&x._data(this,"__className__",this.className),this.className=this.className||e===!1?"":x._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(U," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=x.isFunction(e),this.each(function(n){var o;1===this.nodeType&&(o=i?e.call(this,n,x(this).val()):e,null==o?o="":"number"==typeof o?o+="":x.isArray(o)&&(o=x.map(o,function(e){return null==e?"":e+""})),r=x.valHooks[this.type]||x.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=x.valHooks[o.type]||x.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(V,""):null==n?"":n)}}}),x.extend({valHooks:{option:{get:function(e){var t=x.find.attr(e,"value");return null!=t?t:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,l=0>i?s:o?i:0;for(;s>l;l++)if(n=r[l],!(!n.selected&&l!==i||(x.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&x.nodeName(n.parentNode,"optgroup"))){if(t=x(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n,r,i=e.options,o=x.makeArray(t),a=i.length;while(a--)r=i[a],(r.selected=x.inArray(x(r).val(),o)>=0)&&(n=!0);return n||(e.selectedIndex=-1),o}}},attr:function(e,n,r){var o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return typeof e.getAttribute===i?x.prop(e,n,r):(1===s&&x.isXMLDoc(e)||(n=n.toLowerCase(),o=x.attrHooks[n]||(x.expr.match.bool.test(n)?X:z)),r===t?o&&"get"in o&&null!==(a=o.get(e,n))?a:(a=x.find.attr(e,n),null==a?t:a):null!==r?o&&"set"in o&&(a=o.set(e,r,n))!==t?a:(e.setAttribute(n,r+""),r):(x.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(T);if(o&&1===e.nodeType)while(n=o[i++])r=x.propFix[n]||n,x.expr.match.bool.test(n)?K&&Q||!G.test(n)?e[r]=!1:e[x.camelCase("default-"+n)]=e[r]=!1:x.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!x.support.radioValue&&"radio"===t&&x.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!x.isXMLDoc(e),a&&(n=x.propFix[n]||n,o=x.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var t=x.find.attr(e,"tabindex");return t?parseInt(t,10):Y.test(e.nodeName)||J.test(e.nodeName)&&e.href?0:-1}}}}),X={set:function(e,t,n){return t===!1?x.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&x.propFix[n]||n,n):e[x.camelCase("default-"+n)]=e[n]=!0,n}},x.each(x.expr.match.bool.source.match(/\w+/g),function(e,n){var r=x.expr.attrHandle[n]||x.find.attr;x.expr.attrHandle[n]=K&&Q||!G.test(n)?function(e,n,i){var o=x.expr.attrHandle[n],a=i?t:(x.expr.attrHandle[n]=t)!=r(e,n,i)?n.toLowerCase():null;return x.expr.attrHandle[n]=o,a}:function(e,n,r){return r?t:e[x.camelCase("default-"+n)]?n.toLowerCase():null}}),K&&Q||(x.attrHooks.value={set:function(e,n,r){return x.nodeName(e,"input")?(e.defaultValue=n,t):z&&z.set(e,n,r)}}),Q||(z={set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},x.expr.attrHandle.id=x.expr.attrHandle.name=x.expr.attrHandle.coords=function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&""!==i.value?i.value:null},x.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&r.specified?r.value:t},set:z.set},x.attrHooks.contenteditable={set:function(e,t,n){z.set(e,""===t?!1:t,n)}},x.each(["width","height"],function(e,n){x.attrHooks[n]={set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}}})),x.support.hrefNormalized||x.each(["href","src"],function(e,t){x.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),x.support.style||(x.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),x.support.optSelected||(x.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}}),x.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){x.propFix[this.toLowerCase()]=this}),x.support.enctype||(x.propFix.enctype="encoding"),x.each(["radio","checkbox"],function(){x.valHooks[this]={set:function(e,n){return x.isArray(n)?e.checked=x.inArray(x(e).val(),n)>=0:t}},x.support.checkOn||(x.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}function at(){try{return a.activeElement}catch(e){}}x.event={global:{},add:function(e,n,r,o,a){var s,l,u,c,p,f,d,h,g,m,y,v=x._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=x.guid++),(l=v.events)||(l=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof x===i||e&&x.event.triggered===e.type?t:x.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(T)||[""],u=n.length;while(u--)s=rt.exec(n[u])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),g&&(p=x.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=x.event.special[g]||{},d=x.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&x.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=l[g])||(h=l[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),x.event.global[g]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,l,u,c,p,f,d,h,g,m=x.hasData(e)&&x._data(e);if(m&&(c=m.events)){t=(t||"").match(T)||[""],u=t.length;while(u--)if(s=rt.exec(t[u])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=x.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),l=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));l&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||x.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)x.event.remove(e,d+t[u],n,r,!0);x.isEmptyObject(c)&&(delete m.handle,x._removeData(e,"events"))}},trigger:function(n,r,i,o){var s,l,u,c,p,f,d,h=[i||a],g=v.call(n,"type")?n.type:n,m=v.call(n,"namespace")?n.namespace.split("."):[];if(u=f=i=i||a,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+x.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),l=0>g.indexOf(":")&&"on"+g,n=n[x.expando]?n:new x.Event(g,"object"==typeof n&&n),n.isTrigger=o?2:3,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:x.makeArray(r,[n]),p=x.event.special[g]||{},o||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!o&&!p.noBubble&&!x.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(u=u.parentNode);u;u=u.parentNode)h.push(u),f=u;f===(i.ownerDocument||a)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((u=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(x._data(u,"events")||{})[n.type]&&x._data(u,"handle"),s&&s.apply(u,r),s=l&&u[l],s&&x.acceptData(u)&&s.apply&&s.apply(u,r)===!1&&n.preventDefault();if(n.type=g,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(h.pop(),r)===!1)&&x.acceptData(i)&&l&&i[g]&&!x.isWindow(i)){f=i[l],f&&(i[l]=null),x.event.triggered=g;try{i[g]()}catch(y){}x.event.triggered=t,f&&(i[l]=f)}return n.result}},dispatch:function(e){e=x.event.fix(e);var n,r,i,o,a,s=[],l=g.call(arguments),u=(x._data(this,"events")||{})[e.type]||[],c=x.event.special[e.type]||{};if(l[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=x.event.handlers.call(this,e,u),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((x.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,l),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],l=n.delegateCount,u=e.target;if(l&&u.nodeType&&(!e.button||"click"!==e.type))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(o=[],a=0;l>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?x(r,this).index(u)>=0:x.find(r,this,null,[u]).length),o[r]&&o.push(i);o.length&&s.push({elem:u,handlers:o})}return n.length>l&&s.push({elem:this,handlers:n.slice(l)}),s},fix:function(e){if(e[x.expando])return e;var t,n,r,i=e.type,o=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new x.Event(o),t=r.length;while(t--)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||a),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,o,s=n.button,l=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||a,o=i.documentElement,r=i.body,e.pageX=n.clientX+(o&&o.scrollLeft||r&&r.scrollLeft||0)-(o&&o.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(o&&o.scrollTop||r&&r.scrollTop||0)-(o&&o.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&l&&(e.relatedTarget=l===e.target?n.toElement:l),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==at()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===at()&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},click:{trigger:function(){return x.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t},_default:function(e){return x.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=x.extend(new x.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?x.event.trigger(i,null,t):x.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},x.removeEvent=a.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},x.Event=function(e,n){return this instanceof x.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&x.extend(this,n),this.timeStamp=e&&e.timeStamp||x.now(),this[x.expando]=!0,t):new x.Event(e,n)},x.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},x.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){x.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!x.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),x.support.submitBubbles||(x.event.special.submit={setup:function(){return x.nodeName(this,"form")?!1:(x.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=x.nodeName(n,"input")||x.nodeName(n,"button")?n.form:t;r&&!x._data(r,"submitBubbles")&&(x.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),x._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&x.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return x.nodeName(this,"form")?!1:(x.event.remove(this,"._submit"),t)}}),x.support.changeBubbles||(x.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(x.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),x.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),x.event.simulate("change",this,e,!0)})),!1):(x.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!x._data(t,"changeBubbles")&&(x.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||x.event.simulate("change",this.parentNode,e,!0)}),x._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return x.event.remove(this,"._change"),!Z.test(this.nodeName)}}),x.support.focusinBubbles||x.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){x.event.simulate(t,e.target,x.event.fix(e),!0)};x.event.special[t]={setup:function(){0===n++&&a.addEventListener(e,r,!0)},teardown:function(){0===--n&&a.removeEventListener(e,r,!0)}}}),x.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return x().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=x.guid++)),this.each(function(){x.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,x(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){x.event.remove(this,e,r,n)})},trigger:function(e,t){return this.each(function(){x.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?x.event.trigger(e,n,r,!0):t}});var st=/^.[^:#\[\.,]*$/,lt=/^(?:parents|prev(?:Until|All))/,ut=x.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};x.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(x(e).filter(function(){for(t=0;i>t;t++)if(x.contains(r[t],this))return!0}));for(t=0;i>t;t++)x.find(e,r[t],n);return n=this.pushStack(i>1?x.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},has:function(e){var t,n=x(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(x.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e||[],!0))},filter:function(e){return this.pushStack(ft(this,e||[],!1))},is:function(e){return!!ft(this,"string"==typeof e&&ut.test(e)?x(e):e||[],!1).length},closest:function(e,t){var n,r=0,i=this.length,o=[],a=ut.test(e)||"string"!=typeof e?x(e,t||this.context):0;for(;i>r;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(11>n.nodeType&&(a?a.index(n)>-1:1===n.nodeType&&x.find.matchesSelector(n,e))){n=o.push(n);break}return this.pushStack(o.length>1?x.unique(o):o)},index:function(e){return e?"string"==typeof e?x.inArray(this[0],x(e)):x.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?x(e,t):x.makeArray(e&&e.nodeType?[e]:e),r=x.merge(this.get(),n);return this.pushStack(x.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}x.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return x.dir(e,"parentNode")},parentsUntil:function(e,t,n){return x.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return x.dir(e,"nextSibling")},prevAll:function(e){return x.dir(e,"previousSibling")},nextUntil:function(e,t,n){return x.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return x.dir(e,"previousSibling",n)},siblings:function(e){return x.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return x.sibling(e.firstChild)},contents:function(e){return x.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:x.merge([],e.childNodes)}},function(e,t){x.fn[e]=function(n,r){var i=x.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=x.filter(r,i)),this.length>1&&(ct[e]||(i=x.unique(i)),lt.test(e)&&(i=i.reverse())),this.pushStack(i)}}),x.extend({filter:function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?x.find.matchesSelector(r,e)?[r]:[]:x.find.matches(e,x.grep(t,function(e){return 1===e.nodeType}))},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!x(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(x.isFunction(t))return x.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return x.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(st.test(t))return x.filter(t,e,n);t=x.filter(t,e)}return x.grep(e,function(e){return x.inArray(e,t)>=0!==n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/\s*$/g,At={option:[1,""],legend:[1,"
    ","
    "],area:[1,"",""],param:[1,"",""],thead:[1,"","
    "],tr:[2,"","
    "],col:[2,"","
    "],td:[3,"","
    "],_default:x.support.htmlSerialize?[0,"",""]:[1,"X
    ","
    "]},jt=dt(a),Dt=jt.appendChild(a.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,x.fn.extend({text:function(e){return x.access(this,function(e){return e===t?x.text(this):this.empty().append((this[0]&&this[0].ownerDocument||a).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?x.filter(e,this):this,i=0;for(;null!=(n=r[i]);i++)t||1!==n.nodeType||x.cleanData(Ft(n)),n.parentNode&&(t&&x.contains(n.ownerDocument,n)&&_t(Ft(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&x.cleanData(Ft(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&x.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return x.clone(this,e,t)})},html:function(e){return x.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!x.support.htmlSerialize&&mt.test(e)||!x.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(x.cleanData(Ft(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=x.map(this,function(e){return[e.nextSibling,e.parentNode]}),t=0;return this.domManip(arguments,function(n){var r=e[t++],i=e[t++];i&&(r&&r.parentNode!==i&&(r=this.nextSibling),x(this).remove(),i.insertBefore(n,r))},!0),t?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t,n){e=d.apply([],e);var r,i,o,a,s,l,u=0,c=this.length,p=this,f=c-1,h=e[0],g=x.isFunction(h);if(g||!(1>=c||"string"!=typeof h||x.support.checkClone)&&Nt.test(h))return this.each(function(r){var i=p.eq(r);g&&(e[0]=h.call(this,r,i.html())),i.domManip(e,t,n)});if(c&&(l=x.buildFragment(e,this[0].ownerDocument,!1,!n&&this),r=l.firstChild,1===l.childNodes.length&&(l=r),r)){for(a=x.map(Ft(l,"script"),Ht),o=a.length;c>u;u++)i=l,u!==f&&(i=x.clone(i,!0,!0),o&&x.merge(a,Ft(i,"script"))),t.call(this[u],i,u);if(o)for(s=a[a.length-1].ownerDocument,x.map(a,qt),u=0;o>u;u++)i=a[u],kt.test(i.type||"")&&!x._data(i,"globalEval")&&x.contains(s,i)&&(i.src?x._evalUrl(i.src):x.globalEval((i.text||i.textContent||i.innerHTML||"").replace(St,"")));l=r=null}return this}});function Lt(e,t){return x.nodeName(e,"table")&&x.nodeName(1===t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function Ht(e){return e.type=(null!==x.find.attr(e,"type"))+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function _t(e,t){var n,r=0;for(;null!=(n=e[r]);r++)x._data(n,"globalEval",!t||x._data(t[r],"globalEval"))}function Mt(e,t){if(1===t.nodeType&&x.hasData(e)){var n,r,i,o=x._data(e),a=x._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)x.event.add(t,n,s[n][r])}a.data&&(a.data=x.extend({},a.data))}}function Ot(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!x.support.noCloneEvent&&t[x.expando]){i=x._data(t);for(r in i.events)x.removeEvent(t,r,i.handle);t.removeAttribute(x.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),x.support.html5Clone&&e.innerHTML&&!x.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Ct.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}x.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){x.fn[e]=function(e){var n,r=0,i=[],o=x(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),x(o[r])[t](n),h.apply(i,n.get());return this.pushStack(i)}});function Ft(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||x.nodeName(o,n)?s.push(o):x.merge(s,Ft(o,n));return n===t||n&&x.nodeName(e,n)?x.merge([e],s):s}function Bt(e){Ct.test(e.type)&&(e.defaultChecked=e.checked)}x.extend({clone:function(e,t,n){var r,i,o,a,s,l=x.contains(e.ownerDocument,e);if(x.support.html5Clone||x.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(x.support.noCloneEvent&&x.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(r=Ft(o),s=Ft(e),a=0;null!=(i=s[a]);++a)r[a]&&Ot(i,r[a]);if(t)if(n)for(s=s||Ft(e),r=r||Ft(o),a=0;null!=(i=s[a]);a++)Mt(i,r[a]);else Mt(e,o);return r=Ft(o,"script"),r.length>0&&_t(r,!l&&Ft(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,l,u,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===x.type(o))x.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),l=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[l]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!x.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!x.support.tbody){o="table"!==l||xt.test(o)?""!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)x.nodeName(u=o.childNodes[i],"tbody")&&!u.childNodes.length&&o.removeChild(u)}x.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),x.support.appendChecked||x.grep(Ft(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===x.inArray(o,r))&&(a=x.contains(o.ownerDocument,o),s=Ft(f.appendChild(o),"script"),a&&_t(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,l=x.expando,u=x.cache,c=x.support.deleteExpando,f=x.event.special;for(;null!=(n=e[s]);s++)if((t||x.acceptData(n))&&(o=n[l],a=o&&u[o])){if(a.events)for(r in a.events)f[r]?x.event.remove(n,r):x.removeEvent(n,r,a.handle); +u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(l):n[l]=null,p.push(o))}},_evalUrl:function(e){return x.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})}}),x.fn.extend({wrapAll:function(e){if(x.isFunction(e))return this.each(function(t){x(this).wrapAll(e.call(this,t))});if(this[0]){var t=x(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return x.isFunction(e)?this.each(function(t){x(this).wrapInner(e.call(this,t))}):this.each(function(){var t=x(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=x.isFunction(e);return this.each(function(n){x(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){x.nodeName(this,"body")||x(this).replaceWith(this.childNodes)}).end()}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+w+")(.*)$","i"),Yt=RegExp("^("+w+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+w+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===x.css(e,"display")||!x.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=x._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=x._data(r,"olddisplay",ln(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&x._data(r,"olddisplay",i?n:x.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}x.fn.extend({css:function(e,n){return x.access(this,function(e,n,r){var i,o,a={},s=0;if(x.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=x.css(e,n[s],!1,o);return a}return r!==t?x.style(e,n,r):x.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){var t="boolean"==typeof e;return this.each(function(){(t?e:nn(this))?x(this).show():x(this).hide()})}}),x.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":x.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,l=x.camelCase(n),u=e.style;if(n=x.cssProps[l]||(x.cssProps[l]=tn(u,l)),s=x.cssHooks[n]||x.cssHooks[l],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:u[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(x.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||x.cssNumber[l]||(r+="px"),x.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(u[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{u[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,l=x.camelCase(n);return n=x.cssProps[l]||(x.cssProps[l]=tn(e.style,l)),s=x.cssHooks[n]||x.cssHooks[l],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||x.isNumeric(o)?o||0:a):a}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s.getPropertyValue(n)||s[n]:t,u=e.style;return s&&(""!==l||x.contains(e.ownerDocument,e)||(l=x.style(e,n)),Yt.test(l)&&Ut.test(n)&&(i=u.width,o=u.minWidth,a=u.maxWidth,u.minWidth=u.maxWidth=u.width=l,l=s.width,u.width=i,u.minWidth=o,u.maxWidth=a)),l}):a.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s[n]:t,u=e.style;return null==l&&u&&u[n]&&(l=u[n]),Yt.test(l)&&!zt.test(n)&&(i=u.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),u.left="fontSize"===n?"1em":l,l=u.pixelLeft+"px",u.left=i,a&&(o.left=a)),""===l?"auto":l});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=x.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=x.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=x.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=x.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=x.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(x.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function ln(e){var t=a,n=Gt[e];return n||(n=un(e,t),"none"!==n&&n||(Pt=(Pt||x("