diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 57daada08..06373ecc5 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -5,7 +5,7 @@ allow to create a customer in admin panel translation is implemented : - I18n directory in template or module. - - multiple extensions are available. We choose to used php but you can use other. + - multiple extensions are available. We choose to use php but you can use other. - You can translate your template or module from the admin. - Admin hook exists. With this hooks, a module can insert code in admin pages + Admin hooks exist. With this hooks, a module can insert code in admin pages diff --git a/core/lib/Thelia/Action/Coupon.php b/core/lib/Thelia/Action/Coupon.php index 776041527..1b77eb488 100755 --- a/core/lib/Thelia/Action/Coupon.php +++ b/core/lib/Thelia/Action/Coupon.php @@ -25,14 +25,14 @@ namespace Thelia\Action; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Thelia\Condition\ConditionFactory; -use Thelia\Condition\ConditionManagerInterface; +use Thelia\Condition\Implementation\ConditionInterface; use Thelia\Core\Event\Coupon\CouponConsumeEvent; use Thelia\Core\Event\Coupon\CouponCreateOrUpdateEvent; use Thelia\Core\Event\TheliaEvents; use Thelia\Core\HttpFoundation\Request; use Thelia\Coupon\CouponFactory; use Thelia\Coupon\CouponManager; -use Thelia\Coupon\ConditionCollection; +use Thelia\Condition\ConditionCollection; use Thelia\Coupon\Type\CouponInterface; use Thelia\Model\Coupon as CouponModel; use Thelia\Model\CouponQuery; @@ -94,6 +94,7 @@ class Coupon extends BaseAction implements EventSubscriberInterface public function consume(CouponConsumeEvent $event) { $totalDiscount = 0; + $isValid = false; /** @var CouponFactory $couponFactory */ $couponFactory = $this->container->get('thelia.coupon.factory'); @@ -104,40 +105,40 @@ class Coupon extends BaseAction implements EventSubscriberInterface /** @var CouponInterface $coupon */ $coupon = $couponFactory->buildCouponFromCode($event->getCode()); - $isValid = $coupon->isMatching(); + if ($coupon) { + $isValid = $coupon->isMatching(); + if ($isValid) { + /** @var Request $request */ + $request = $this->container->get('request'); + $consumedCoupons = $request->getSession()->getConsumedCoupons(); - if ($isValid) { - /** @var Request $request */ - $request = $this->container->get('request'); - $consumedCoupons = $request->getSession()->getConsumedCoupons(); + if (!isset($consumedCoupons) || !$consumedCoupons) { + $consumedCoupons = array(); + } - if (!isset($consumedCoupons) || !$consumedCoupons) { - $consumedCoupons = array(); + // Prevent accumulation of the same Coupon on a Checkout + $consumedCoupons[$event->getCode()] = $event->getCode(); + + $request->getSession()->setConsumedCoupons($consumedCoupons); + + $totalDiscount = $couponManager->getDiscount(); + // @todo insert false product in cart with the name of the coupon and the discount as negative price + + // Decrement coupon quantity + // @todo move this part in after order event + $couponQuery = CouponQuery::create(); + $couponModel = $couponQuery->findOneByCode($coupon->getCode()); + $couponManager->decrementQuantity($couponModel); + + $request + ->getSession() + ->getCart() + ->setDiscount($totalDiscount) + ->save(); } - - // Prevent accumulation of the same Coupon on a Checkout - $consumedCoupons[$event->getCode()] = $event->getCode(); - - $request->getSession()->setConsumedCoupons($consumedCoupons); - - $totalDiscount = $couponManager->getDiscount(); - // @todo insert false product in cart with the name of the coupon and the discount as negative price - - // Decrement coupon quantity - // @todo move this part in after order event - $couponQuery = CouponQuery::create(); - $couponModel = $couponQuery->findOneByCode($coupon->getCode()); - $couponManager->decrementeQuantity($couponModel); - - $request - ->getSession() - ->getCart() - ->setDiscount($totalDiscount) - ->save() - ; - } + $event->setIsValid($isValid); $event->setDiscount($totalDiscount); } @@ -154,7 +155,7 @@ class Coupon extends BaseAction implements EventSubscriberInterface $coupon->setDispatcher($this->getDispatcher()); // Set default condition if none found - /** @var ConditionManagerInterface $noConditionRule */ + /** @var ConditionInterface $noConditionRule */ $noConditionRule = $this->container->get('thelia.condition.match_for_everyone'); /** @var ConditionFactory $conditionFactory */ $conditionFactory = $this->container->get('thelia.condition.factory'); diff --git a/core/lib/Thelia/Action/Product.php b/core/lib/Thelia/Action/Product.php index 3917827d1..4fccbf3f6 100644 --- a/core/lib/Thelia/Action/Product.php +++ b/core/lib/Thelia/Action/Product.php @@ -113,7 +113,7 @@ class Product extends BaseAction implements EventSubscriberInterface ->save() ; - // Update the rewriten URL, if required + // Update the rewritten URL, if required $product->setRewrittenUrl($event->getLocale(), $event->getUrl()); // Update default category (ifd required) @@ -282,8 +282,12 @@ class Product extends BaseAction implements EventSubscriberInterface $product->setTemplateId($template_id)->save($con); + // Create a new default product sale element + $product->createProductSaleElement($con, 0, 0, 0, $event->getCurrencyId(), true); + // Store all the stuff ! $con->commit(); + } catch (\Exception $ex) { $con->rollback(); diff --git a/core/lib/Thelia/Action/ProductSaleElement.php b/core/lib/Thelia/Action/ProductSaleElement.php index 9c40025d8..cad3be374 100644 --- a/core/lib/Thelia/Action/ProductSaleElement.php +++ b/core/lib/Thelia/Action/ProductSaleElement.php @@ -67,7 +67,7 @@ class ProductSaleElement extends BaseAction implements EventSubscriberInterface if ($salesElement == null) { // Create a new default product sale element - $salesElement = $event->getProduct()->createDefaultProductSaleElement($con, 0, 0, 0, $event->getCurrencyId(), true); + $salesElement = $event->getProduct()->createProductSaleElement($con, 0, 0, 0, $event->getCurrencyId(), true); } else { // This (new) one is the default $salesElement->setIsDefault(true)->save($con); diff --git a/core/lib/Thelia/Coupon/ConditionCollection.php b/core/lib/Thelia/Condition/ConditionCollection.php similarity index 86% rename from core/lib/Thelia/Coupon/ConditionCollection.php rename to core/lib/Thelia/Condition/ConditionCollection.php index f9513160b..14b4076f6 100644 --- a/core/lib/Thelia/Coupon/ConditionCollection.php +++ b/core/lib/Thelia/Condition/ConditionCollection.php @@ -21,17 +21,17 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon; +namespace Thelia\Condition; use Symfony\Component\DependencyInjection\ContainerInterface; -use Thelia\Condition\ConditionManagerInterface; +use Thelia\Condition\Implementation\ConditionInterface; /** * Created by JetBrains PhpStorm. * Date: 8/19/13 * Time: 3:24 PM * - * Manage a set of ConditionManagerInterface + * Manage a set of ConditionInterface * * @package Condition * @author Guillaume MOREL @@ -39,13 +39,13 @@ use Thelia\Condition\ConditionManagerInterface; */ class ConditionCollection { - /** @var array Array of ConditionManagerInterface */ + /** @var array Array of ConditionInterface */ protected $conditions = array(); /** * Get Conditions * - * @return array Array of ConditionManagerInterface + * @return array Array of ConditionInterface */ public function getConditions() { @@ -53,13 +53,13 @@ class ConditionCollection } /** - * Add a ConditionManagerInterface to the Collection + * Add a ConditionInterface to the Collection * - * @param ConditionManagerInterface $condition Condition + * @param ConditionInterface $condition Condition * * @return $this */ - public function add(ConditionManagerInterface $condition) + public function add(ConditionInterface $condition) { $this->conditions[] = $condition; @@ -84,7 +84,7 @@ class ConditionCollection public function __toString() { $arrayToSerialize = array(); - /** @var ConditionManagerInterface $condition */ + /** @var ConditionInterface $condition */ foreach ($this->getConditions() as $condition) { $arrayToSerialize[] = $condition->getSerializableCondition(); } diff --git a/core/lib/Thelia/Condition/ConditionEvaluator.php b/core/lib/Thelia/Condition/ConditionEvaluator.php index 327c80a3d..49e566158 100644 --- a/core/lib/Thelia/Condition/ConditionEvaluator.php +++ b/core/lib/Thelia/Condition/ConditionEvaluator.php @@ -24,8 +24,9 @@ namespace Thelia\Condition; use Symfony\Component\DependencyInjection\ContainerInterface; +use Thelia\Condition\Implementation\ConditionInterface; use Thelia\Condition\Operators; -use Thelia\Coupon\ConditionCollection; +use Thelia\Condition\ConditionCollection; /** @@ -51,7 +52,7 @@ class ConditionEvaluator public function isMatching(ConditionCollection $conditions) { $isMatching = true; - /** @var ConditionManagerInterface $condition */ + /** @var ConditionInterface $condition */ foreach ($conditions->getConditions() as $condition) { if (!$condition->isMatching()) { $isMatching = false; diff --git a/core/lib/Thelia/Condition/ConditionFactory.php b/core/lib/Thelia/Condition/ConditionFactory.php index 3e1c771ee..b472dcb0f 100644 --- a/core/lib/Thelia/Condition/ConditionFactory.php +++ b/core/lib/Thelia/Condition/ConditionFactory.php @@ -24,8 +24,9 @@ namespace Thelia\Condition; use Symfony\Component\DependencyInjection\ContainerInterface; +use Thelia\Condition\Implementation\ConditionInterface; use Thelia\Coupon\FacadeInterface; -use Thelia\Coupon\ConditionCollection; +use Thelia\Condition\ConditionCollection; /** @@ -58,7 +59,7 @@ class ConditionFactory public function __construct(ContainerInterface $container) { $this->container = $container; - $this->adapter = $container->get('thelia.adapter'); + $this->adapter = $container->get('thelia.facade'); } /** @@ -71,7 +72,7 @@ class ConditionFactory public function serializeConditionCollection(ConditionCollection $collection) { if ($collection->isEmpty()) { - /** @var ConditionManagerInterface $conditionNone */ + /** @var ConditionInterface $conditionNone */ $conditionNone = $this->container->get( 'thelia.condition.match_for_everyone' ); @@ -80,7 +81,7 @@ class ConditionFactory $serializableConditions = array(); $conditions = $collection->getConditions(); if ($conditions !== null) { - /** @var $condition ConditionManagerInterface */ + /** @var $condition ConditionInterface */ foreach ($conditions as $condition) { $serializableConditions[] = $condition->getSerializableCondition(); } @@ -106,7 +107,7 @@ class ConditionFactory /** @var SerializableCondition $condition */ foreach ($unserializedConditions as $condition) { if ($this->container->has($condition->conditionServiceId)) { - /** @var ConditionManagerInterface $conditionManager */ + /** @var ConditionInterface $conditionManager */ $conditionManager = $this->build( $condition->conditionServiceId, (array) $condition->operators, @@ -129,7 +130,7 @@ class ConditionFactory * @param array $values Values setting this Condition * * @throws \InvalidArgumentException - * @return ConditionManagerInterface Ready to use Condition or false + * @return ConditionInterface Ready to use Condition or false */ public function build($conditionServiceId, array $operators, array $values) { @@ -137,7 +138,7 @@ class ConditionFactory return false; } - /** @var ConditionManagerInterface $condition */ + /** @var ConditionInterface $condition */ $condition = $this->container->get($conditionServiceId); $condition->setValidatorsFromForm($operators, $values); @@ -157,7 +158,7 @@ class ConditionFactory return false; } - /** @var ConditionManagerInterface $condition */ + /** @var ConditionInterface $condition */ $condition = $this->container->get($conditionServiceId); return $condition->getValidators(); diff --git a/core/lib/Thelia/Coupon/RuleOrganizer.php b/core/lib/Thelia/Condition/ConditionOrganizer.php similarity index 87% rename from core/lib/Thelia/Coupon/RuleOrganizer.php rename to core/lib/Thelia/Condition/ConditionOrganizer.php index 673f27404..f678142ab 100644 --- a/core/lib/Thelia/Coupon/RuleOrganizer.php +++ b/core/lib/Thelia/Condition/ConditionOrganizer.php @@ -21,27 +21,27 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon; +namespace Thelia\Condition; /** * Created by JetBrains PhpStorm. * Date: 8/19/13 * Time: 3:24 PM * - * Manage how Coupons could interact with a Checkout + * Manage how Condition could interact with each others * * @package Condition * @author Guillaume MOREL * */ -class RuleOrganizer implements RuleOrganizerInterface +class ConditionOrganizer implements ConditionOrganizerInterface { /** - * Organize ConditionManagerInterface + * Organize ConditionInterface * - * @param array $conditions Array of ConditionManagerInterface + * @param array $conditions Array of ConditionInterface * - * @return array Array of ConditionManagerInterface sorted + * @return array Array of ConditionInterface sorted */ public function organize(array $conditions) { diff --git a/core/lib/Thelia/Coupon/RuleOrganizerInterface.php b/core/lib/Thelia/Condition/ConditionOrganizerInterface.php similarity index 87% rename from core/lib/Thelia/Coupon/RuleOrganizerInterface.php rename to core/lib/Thelia/Condition/ConditionOrganizerInterface.php index 93dd12ee9..00f8d55b8 100644 --- a/core/lib/Thelia/Coupon/RuleOrganizerInterface.php +++ b/core/lib/Thelia/Condition/ConditionOrganizerInterface.php @@ -21,27 +21,27 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon; +namespace Thelia\Condition; /** * Created by JetBrains PhpStorm. * Date: 8/19/13 * Time: 3:24 PM * - * Manage how Condition could interact with a Checkout + * Manage how Condition could interact with each other * * @package Condition * @author Guillaume MOREL * */ -interface RuleOrganizerInterface +interface ConditionOrganizerInterface { /** - * Organize ConditionManagerInterface + * Organize ConditionInterface * - * @param array $conditions Array of ConditionManagerInterface + * @param array $conditions Array of ConditionInterface * - * @return array Array of ConditionManagerInterface sorted + * @return array Array of ConditionInterface sorted */ public function organize(array $conditions); } \ No newline at end of file diff --git a/core/lib/Thelia/Condition/ConditionManagerAbstract.php b/core/lib/Thelia/Condition/Implementation/ConditionAbstract.php similarity index 90% rename from core/lib/Thelia/Condition/ConditionManagerAbstract.php rename to core/lib/Thelia/Condition/Implementation/ConditionAbstract.php index bf38ef387..71bd2f60e 100644 --- a/core/lib/Thelia/Condition/ConditionManagerAbstract.php +++ b/core/lib/Thelia/Condition/Implementation/ConditionAbstract.php @@ -21,9 +21,12 @@ /* */ /**********************************************************************************/ -namespace Thelia\Condition; +namespace Thelia\Condition\Implementation; use Symfony\Component\Intl\Exception\NotImplementedException; +use Thelia\Condition\ConditionEvaluator; +use Thelia\Condition\Operators; +use Thelia\Condition\SerializableCondition; use Thelia\Core\Translation\Translator; use Thelia\Coupon\FacadeInterface; use Thelia\Exception\InvalidConditionValueException; @@ -35,13 +38,13 @@ use Thelia\Type\FloatType; * Date: 8/19/13 * Time: 3:24 PM * - * Assist in writing a condition of whether the Rule is applied or not + * Assist in writing a condition of whether the Condition is applied or not * * @package Constraint * @author Guillaume MOREL * */ -abstract class ConditionManagerAbstract implements ConditionManagerInterface +abstract class ConditionAbstract implements ConditionInterface { /** @var string Service Id from Resources/config.xml */ @@ -54,7 +57,7 @@ abstract class ConditionManagerAbstract implements ConditionManagerInterface protected $validators = array(); /** @var FacadeInterface Provide necessary value from Thelia */ - protected $adapter = null; + protected $facade = null; /** @var Translator Service Translator */ protected $translator = null; @@ -71,13 +74,13 @@ abstract class ConditionManagerAbstract implements ConditionManagerInterface /** * Constructor * - * @param FacadeInterface $adapter Service adapter + * @param FacadeInterface $facade Service Facade */ - public function __construct(FacadeInterface $adapter) + public function __construct(FacadeInterface $facade) { - $this->adapter = $adapter; - $this->translator = $adapter->getTranslator(); - $this->conditionValidator = $adapter->getConditionEvaluator(); + $this->facade = $facade; + $this->translator = $facade->getTranslator(); + $this->conditionValidator = $facade->getConditionEvaluator(); } /** @@ -181,9 +184,9 @@ abstract class ConditionManagerAbstract implements ConditionManagerInterface * @return bool * @throws \Thelia\Exception\InvalidConditionValueException */ - protected function IsCurrencyValid($currencyValue) + protected function isCurrencyValid($currencyValue) { - $availableCurrencies = $this->adapter->getAvailableCurrencies(); + $availableCurrencies = $this->facade->getAvailableCurrencies(); /** @var Currency $currency */ $currencyFound = false; foreach ($availableCurrencies as $currency) { diff --git a/core/lib/Thelia/Condition/ConditionManagerInterface.php b/core/lib/Thelia/Condition/Implementation/ConditionInterface.php similarity index 95% rename from core/lib/Thelia/Condition/ConditionManagerInterface.php rename to core/lib/Thelia/Condition/Implementation/ConditionInterface.php index ceda090bf..10759eaa7 100644 --- a/core/lib/Thelia/Condition/ConditionManagerInterface.php +++ b/core/lib/Thelia/Condition/Implementation/ConditionInterface.php @@ -21,8 +21,9 @@ /* */ /**********************************************************************************/ -namespace Thelia\Condition; +namespace Thelia\Condition\Implementation; +use Thelia\Condition\SerializableCondition; use Thelia\Core\Translation\Translator; use Thelia\Coupon\FacadeInterface; @@ -37,7 +38,7 @@ use Thelia\Coupon\FacadeInterface; * @author Guillaume MOREL * */ -interface ConditionManagerInterface +interface ConditionInterface { /** * Constructor @@ -47,7 +48,7 @@ interface ConditionManagerInterface function __construct(FacadeInterface $adapter); /** - * Get Rule Service id + * Get Condition Service id * * @return string */ diff --git a/core/lib/Thelia/Condition/Implementation/MatchForEveryoneManager.php b/core/lib/Thelia/Condition/Implementation/MatchForEveryone.php similarity index 97% rename from core/lib/Thelia/Condition/Implementation/MatchForEveryoneManager.php rename to core/lib/Thelia/Condition/Implementation/MatchForEveryone.php index 00108a3b0..22d696339 100644 --- a/core/lib/Thelia/Condition/Implementation/MatchForEveryoneManager.php +++ b/core/lib/Thelia/Condition/Implementation/MatchForEveryone.php @@ -24,7 +24,7 @@ namespace Thelia\Condition\Implementation; use InvalidArgumentException; -use Thelia\Condition\ConditionManagerAbstract; +use Thelia\Condition\Implementation\ConditionAbstract; /** * Created by JetBrains PhpStorm. @@ -37,7 +37,7 @@ use Thelia\Condition\ConditionManagerAbstract; * @author Guillaume MOREL * */ -class MatchForEveryoneManager extends ConditionManagerAbstract +class MatchForEveryone extends ConditionAbstract { /** @var string Service Id from Resources/config.xml */ protected $serviceId = 'thelia.condition.match_for_everyone'; diff --git a/core/lib/Thelia/Condition/Implementation/MatchForTotalAmountManager.php b/core/lib/Thelia/Condition/Implementation/MatchForTotalAmount.php similarity index 92% rename from core/lib/Thelia/Condition/Implementation/MatchForTotalAmountManager.php rename to core/lib/Thelia/Condition/Implementation/MatchForTotalAmount.php index bc158c878..09b63ef00 100644 --- a/core/lib/Thelia/Condition/Implementation/MatchForTotalAmountManager.php +++ b/core/lib/Thelia/Condition/Implementation/MatchForTotalAmount.php @@ -24,7 +24,7 @@ namespace Thelia\Condition\Implementation; use Symfony\Component\Intl\Exception\NotImplementedException; -use Thelia\Condition\ConditionManagerAbstract; +use Thelia\Condition\Implementation\ConditionAbstract; use Thelia\Condition\Operators; use Thelia\Exception\InvalidConditionOperatorException; use Thelia\Model\Currency; @@ -42,7 +42,7 @@ use Thelia\Model\CurrencyQuery; * @author Guillaume MOREL * */ -class MatchForTotalAmountManager extends ConditionManagerAbstract +class MatchForTotalAmount extends ConditionAbstract { /** Condition 1st parameter : price */ CONST INPUT1 = 'price'; @@ -124,7 +124,7 @@ class MatchForTotalAmountManager extends ConditionManagerAbstract $this->isPriceValid($priceValue); - $this->IsCurrencyValid($currencyValue); + $this->isCurrencyValid($currencyValue); $this->operators = array( @@ -146,26 +146,13 @@ class MatchForTotalAmountManager extends ConditionManagerAbstract */ 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; - } - $condition1 = $this->conditionValidator->variableOpComparison( - $this->adapter->getCartTotalPrice(), + $this->facade->getCartTotalPrice(), $this->operators[self::INPUT1], $this->values[self::INPUT1] ); $condition2 = $this->conditionValidator->variableOpComparison( - $this->adapter->getCheckoutCurrency(), + $this->facade->getCheckoutCurrency(), $this->operators[self::INPUT2], $this->values[self::INPUT2] ); diff --git a/core/lib/Thelia/Condition/Implementation/MatchForXArticlesManager.php b/core/lib/Thelia/Condition/Implementation/MatchForXArticles.php similarity index 97% rename from core/lib/Thelia/Condition/Implementation/MatchForXArticlesManager.php rename to core/lib/Thelia/Condition/Implementation/MatchForXArticles.php index 05de953d0..f1c1ebaac 100644 --- a/core/lib/Thelia/Condition/Implementation/MatchForXArticlesManager.php +++ b/core/lib/Thelia/Condition/Implementation/MatchForXArticles.php @@ -24,7 +24,7 @@ namespace Thelia\Condition\Implementation; use InvalidArgumentException; -use Thelia\Condition\ConditionManagerAbstract; +use Thelia\Condition\Implementation\ConditionAbstract; use Thelia\Condition\Operators; use Thelia\Exception\InvalidConditionOperatorException; use Thelia\Exception\InvalidConditionValueException; @@ -40,7 +40,7 @@ use Thelia\Exception\InvalidConditionValueException; * @author Guillaume MOREL * */ -class MatchForXArticlesManager extends ConditionManagerAbstract +class MatchForXArticles extends ConditionAbstract { /** Condition 1st parameter : quantity */ CONST INPUT1 = 'quantity'; @@ -124,7 +124,7 @@ class MatchForXArticlesManager extends ConditionManagerAbstract public function isMatching() { $condition1 = $this->conditionValidator->variableOpComparison( - $this->adapter->getNbArticlesInCart(), + $this->facade->getNbArticlesInCart(), $this->operators[self::INPUT1], $this->values[self::INPUT1] ); diff --git a/core/lib/Thelia/Condition/SerializableCondition.php b/core/lib/Thelia/Condition/SerializableCondition.php index 31163cdda..cd2f1de44 100644 --- a/core/lib/Thelia/Condition/SerializableCondition.php +++ b/core/lib/Thelia/Condition/SerializableCondition.php @@ -28,7 +28,7 @@ namespace Thelia\Condition; * Date: 8/19/13 * Time: 3:24 PM * - * A condition set by an admin ready to be serialized and stored in DataBase + * A condition ready to be serialized and stored in DataBase * * @package Condition * @author Guillaume MOREL diff --git a/core/lib/Thelia/Config/Resources/coupon.xml b/core/lib/Thelia/Config/Resources/coupon.xml index fc327911c..d0d763ea2 100644 --- a/core/lib/Thelia/Config/Resources/coupon.xml +++ b/core/lib/Thelia/Config/Resources/coupon.xml @@ -9,7 +9,7 @@ - + @@ -19,12 +19,12 @@ - - + + - - + + @@ -35,21 +35,22 @@ - - + + - - + + - - + + + diff --git a/core/lib/Thelia/Controller/Admin/CouponController.php b/core/lib/Thelia/Controller/Admin/CouponController.php index 167a13d55..b382dbb30 100755 --- a/core/lib/Thelia/Controller/Admin/CouponController.php +++ b/core/lib/Thelia/Controller/Admin/CouponController.php @@ -26,13 +26,13 @@ namespace Thelia\Controller\Admin; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Routing\Router; use Thelia\Condition\ConditionFactory; -use Thelia\Condition\ConditionManagerInterface; +use Thelia\Condition\Implementation\ConditionInterface; use Thelia\Core\Security\Resource\AdminResources; use Thelia\Core\Event\Coupon\CouponCreateOrUpdateEvent; use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Security\AccessManager; use Thelia\Coupon\CouponManager; -use Thelia\Coupon\ConditionCollection; +use Thelia\Condition\ConditionCollection; use Thelia\Coupon\Type\CouponInterface; use Thelia\Form\CouponCreationForm; use Thelia\Form\Exception\FormValidationException; @@ -227,7 +227,7 @@ class CouponController extends BaseAdminController $args['conditionsObject'] = array(); - /** @var ConditionManagerInterface $condition */ + /** @var ConditionInterface $condition */ foreach ($conditions->getConditions() as $condition) { $args['conditionsObject'][] = array( 'serviceId' => $condition->getServiceId(), @@ -519,7 +519,7 @@ class CouponController extends BaseAdminController $couponManager = $this->container->get('thelia.coupon.manager'); $availableConditions = $couponManager->getAvailableConditions(); $cleanedConditions = array(); - /** @var ConditionManagerInterface $availableCondition */ + /** @var ConditionInterface $availableCondition */ foreach ($availableConditions as $availableCondition) { $condition = array(); $condition['serviceId'] = $availableCondition->getServiceId(); @@ -564,7 +564,7 @@ class CouponController extends BaseAdminController protected function cleanConditionForTemplate(ConditionCollection $conditions) { $cleanedConditions = array(); - /** @var $condition ConditionManagerInterface */ + /** @var $condition ConditionInterface */ foreach ($conditions->getConditions() as $condition) { $cleanedConditions[] = $condition->getToolTip(); } diff --git a/core/lib/Thelia/Controller/Admin/HomeController.php b/core/lib/Thelia/Controller/Admin/HomeController.php index e8711f97d..0fcee29ca 100644 --- a/core/lib/Thelia/Controller/Admin/HomeController.php +++ b/core/lib/Thelia/Controller/Admin/HomeController.php @@ -41,6 +41,8 @@ class HomeController extends BaseAdminController public function loadStatsAjaxAction() { + if (null !== $response = $this->checkAuth(self::RESOURCE_CODE, array(), AccessManager::VIEW)) return $response; + $data = new \stdClass(); $data->title = "Stats on " . $this->getRequest()->query->get('month', date('m')) . "/" . $this->getRequest()->query->get('year', date('Y')); diff --git a/core/lib/Thelia/Controller/Admin/ProductController.php b/core/lib/Thelia/Controller/Admin/ProductController.php index 67f2d1597..461517896 100644 --- a/core/lib/Thelia/Controller/Admin/ProductController.php +++ b/core/lib/Thelia/Controller/Admin/ProductController.php @@ -652,7 +652,7 @@ class ProductController extends AbstractCrudController $this->dispatch( TheliaEvents::PRODUCT_SET_TEMPLATE, - new ProductSetTemplateEvent($product, $template_id) + new ProductSetTemplateEvent($product, $template_id, $this->getCurrentEditionCurrency()->getId()) ); } @@ -1201,10 +1201,10 @@ class ProductController extends AbstractCrudController } return new JsonResponse(array( - 'price_with_tax' => NumberFormat::getInstance($this->getRequest())->format($price_with_tax, null, '.'), - 'price_without_tax' => NumberFormat::getInstance($this->getRequest())->format($price_without_tax, null, '.'), - 'sale_price_with_tax' => NumberFormat::getInstance($this->getRequest())->format($sale_price_with_tax, null, '.'), - 'sale_price_without_tax' => NumberFormat::getInstance($this->getRequest())->format($sale_price_without_tax, null, '.') + 'price_with_tax' => NumberFormat::getInstance($this->getRequest())->formatStandardNumber($price_with_tax), + 'price_without_tax' => NumberFormat::getInstance($this->getRequest())->formatStandardNumber($price_without_tax), + 'sale_price_with_tax' => NumberFormat::getInstance($this->getRequest())->formatStandardNumber($sale_price_with_tax), + 'sale_price_without_tax' => NumberFormat::getInstance($this->getRequest())->formatStandardNumber($sale_price_without_tax) )); } @@ -1236,7 +1236,8 @@ class ProductController extends AbstractCrudController if ($convert != 0) { $return_price = $prix * Currency::getDefaultCurrency()->getRate(); } + // Format the number using '.', to perform further calculation - return NumberFormat::getInstance($this->getRequest())->format($return_price, null, '.'); + return NumberFormat::getInstance($this->getRequest())->formatStandardNumber($return_price); } } diff --git a/core/lib/Thelia/Controller/Admin/TranslationsController.php b/core/lib/Thelia/Controller/Admin/TranslationsController.php index 7bea68e6f..cb7c3f072 100644 --- a/core/lib/Thelia/Controller/Admin/TranslationsController.php +++ b/core/lib/Thelia/Controller/Admin/TranslationsController.php @@ -94,6 +94,10 @@ class TranslationsController extends BaseAdminController case 'pf' : $template = new TemplateDefinition($item_id, TemplateDefinition::PDF); break; + + case 'ma' : + $template = new TemplateDefinition($item_id, TemplateDefinition::EMAIL); + break; } if ($template) { diff --git a/core/lib/Thelia/Core/Event/Coupon/CouponCreateOrUpdateEvent.php b/core/lib/Thelia/Core/Event/Coupon/CouponCreateOrUpdateEvent.php index f890fd8cd..19edf4e45 100644 --- a/core/lib/Thelia/Core/Event/Coupon/CouponCreateOrUpdateEvent.php +++ b/core/lib/Thelia/Core/Event/Coupon/CouponCreateOrUpdateEvent.php @@ -23,7 +23,7 @@ namespace Thelia\Core\Event\Coupon; use Thelia\Core\Event\ActionEvent; -use Thelia\Coupon\ConditionCollection; +use Thelia\Condition\ConditionCollection; use Thelia\Model\Coupon; /** @@ -39,7 +39,7 @@ use Thelia\Model\Coupon; */ class CouponCreateOrUpdateEvent extends ActionEvent { - /** @var ConditionCollection Array of ConditionManagerInterface */ + /** @var ConditionCollection Array of ConditionInterface */ protected $conditions = null; /** @var string Coupon code (ex: XMAS) */ @@ -280,7 +280,7 @@ class CouponCreateOrUpdateEvent extends ActionEvent /** * Get Conditions * - * @return null|ConditionCollection Array of ConditionManagerInterface + * @return null|ConditionCollection Array of ConditionInterface */ public function getConditions() { @@ -290,7 +290,7 @@ class CouponCreateOrUpdateEvent extends ActionEvent /** * Set Conditions * - * @param ConditionCollection $conditions Array of ConditionManagerInterface + * @param ConditionCollection $conditions Array of ConditionInterface * * @return $this */ diff --git a/core/lib/Thelia/Core/Event/Product/ProductSetTemplateEvent.php b/core/lib/Thelia/Core/Event/Product/ProductSetTemplateEvent.php index 1847ca48f..af28ca73f 100644 --- a/core/lib/Thelia/Core/Event/Product/ProductSetTemplateEvent.php +++ b/core/lib/Thelia/Core/Event/Product/ProductSetTemplateEvent.php @@ -22,18 +22,19 @@ /*************************************************************************************/ namespace Thelia\Core\Event\Product; - use Thelia\Model\Product; class ProductSetTemplateEvent extends ProductEvent { - public $template_id = null; + protected $template_id = null; + protected $currency_id = 0; - public function __construct(Product $product = null, $template_id) + public function __construct(Product $product = null, $template_id, $currency_id) { parent::__construct($product); $this->template_id = $template_id; + $this->currency_id = $currency_id; } public function getTemplateId() @@ -48,4 +49,15 @@ class ProductSetTemplateEvent extends ProductEvent return $this; } -} + public function getCurrencyId() + { + return $this->currency_id; + } + + public function setCurrencyId($currency_id) + { + $this->currency_id = $currency_id; + + return $this; + } +} \ No newline at end of file diff --git a/core/lib/Thelia/Core/Event/TheliaEvents.php b/core/lib/Thelia/Core/Event/TheliaEvents.php index 1dfcb673c..9ffd5c795 100755 --- a/core/lib/Thelia/Core/Event/TheliaEvents.php +++ b/core/lib/Thelia/Core/Event/TheliaEvents.php @@ -38,20 +38,6 @@ final class TheliaEvents */ const BOOT = "thelia.boot"; - /** - * ACTION event - * - * Sent if no action are already present in Thelia action process ( see Thelia\Routing\Matcher\ActionMatcher) - */ - const ACTION = "thelia.action"; - - /** - * INCLUDE event - * - * Sent before starting thelia inclusion - */ - const INCLUSION = "thelia.include"; - /** * Sent before the logout of the customer. */ @@ -681,7 +667,7 @@ final class TheliaEvents const MAILTRANSPORTER_CONFIG = 'action.mailertransporter.config'; /** - * sent when Thelia try to generate a rewriten url + * sent when Thelia try to generate a rewritten url */ const GENERATE_REWRITTENURL = 'action.generate_rewritenurl'; diff --git a/core/lib/Thelia/Core/Template/Loop/Attribute.php b/core/lib/Thelia/Core/Template/Loop/Attribute.php index 97b540f96..66964c8b8 100755 --- a/core/lib/Thelia/Core/Template/Loop/Attribute.php +++ b/core/lib/Thelia/Core/Template/Loop/Attribute.php @@ -120,6 +120,12 @@ class Attribute extends BaseI18nLoop implements PropelSearchLoopInterface if (! is_null($tpl_id)) $template[] = $tpl_id; } } + + // franck@cqfdev.fr - 05/12/2013 : if the given product has no template + // or if the product cannot be found, do not return anything. + if (empty($template)) { + return null; + } } if (! empty($template)) { @@ -177,7 +183,6 @@ class Attribute extends BaseI18nLoop implements PropelSearchLoopInterface } return $search; - } public function parseResults(LoopResult $loopResult) diff --git a/core/lib/Thelia/Core/Template/Loop/Coupon.php b/core/lib/Thelia/Core/Template/Loop/Coupon.php index f11fd0e9a..e211103da 100755 --- a/core/lib/Thelia/Core/Template/Loop/Coupon.php +++ b/core/lib/Thelia/Core/Template/Loop/Coupon.php @@ -26,7 +26,7 @@ namespace Thelia\Core\Template\Loop; use Propel\Runtime\ActiveQuery\Criteria; use Propel\Runtime\Util\PropelModelPager; use Thelia\Condition\ConditionFactory; -use Thelia\Condition\ConditionManagerInterface; +use Thelia\Condition\Implementation\ConditionInterface; use Thelia\Core\HttpFoundation\Request; use Thelia\Core\Template\Element\BaseI18nLoop; use Thelia\Core\Template\Element\LoopResult; @@ -106,7 +106,7 @@ class Coupon extends BaseI18nLoop implements PropelSearchLoopInterface /** @var CouponInterface $couponManager */ $couponManager = $this->container->get($coupon->getType()); $couponManager->set( - $this->container->get('thelia.adapter'), + $this->container->get('thelia.facade'), $coupon->getCode(), $coupon->getTitle(), $coupon->getShortDescription(), @@ -125,7 +125,7 @@ class Coupon extends BaseI18nLoop implements PropelSearchLoopInterface $daysLeftBeforeExpiration = floor($datediff/(60*60*24)); $cleanedConditions = array(); - /** @var ConditionManagerInterface $condition */ + /** @var ConditionInterface $condition */ foreach ($conditions->getConditions() as $condition) { $cleanedConditions[] = $condition->getToolTip(); } diff --git a/core/lib/Thelia/Core/Template/Loop/Feature.php b/core/lib/Thelia/Core/Template/Loop/Feature.php index 6f7f12c71..74d165562 100755 --- a/core/lib/Thelia/Core/Template/Loop/Feature.php +++ b/core/lib/Thelia/Core/Template/Loop/Feature.php @@ -110,6 +110,7 @@ class Feature extends BaseI18nLoop implements PropelSearchLoopInterface $this->useFeaturePosition = true; if (null !== $product) { + // Find all template assigned to the products. $products = ProductQuery::create()->findById($product); @@ -125,6 +126,12 @@ class Feature extends BaseI18nLoop implements PropelSearchLoopInterface if (! is_null($tpl_id)) $template[] = $tpl_id; } } + + // franck@cqfdev.fr - 05/12/2013 : if the given product has no template + // or if the product cannot be found, do not return anything. + if (empty($template)) { + return null; + } } if (! empty($template)) { diff --git a/core/lib/Thelia/Core/Template/Loop/Template.php b/core/lib/Thelia/Core/Template/Loop/Template.php index c5b6a95f3..fc9505449 100644 --- a/core/lib/Thelia/Core/Template/Loop/Template.php +++ b/core/lib/Thelia/Core/Template/Loop/Template.php @@ -64,7 +64,8 @@ class Template extends BaseLoop implements ArraySearchLoopInterface new Type\EnumListType(array( 'front-office', 'back-office', - 'pdf' + 'pdf', + 'email' )) ) ) @@ -80,6 +81,8 @@ class Template extends BaseLoop implements ArraySearchLoopInterface $templateType = TemplateDefinition::BACK_OFFICE; else if ($type == 'pdf') $templateType = TemplateDefinition::PDF; + else if ($type == 'email') + $templateType = TemplateDefinition::EMAIL; return TemplateHelper::getInstance()->getList($templateType); } diff --git a/core/lib/Thelia/Core/Template/TemplateHelper.php b/core/lib/Thelia/Core/Template/TemplateHelper.php index 4f33e1a42..9b93aae96 100644 --- a/core/lib/Thelia/Core/Template/TemplateHelper.php +++ b/core/lib/Thelia/Core/Template/TemplateHelper.php @@ -131,19 +131,19 @@ class TemplateHelper } /** - * Récursively examine files in a directory tree, and extract translatable strings. + * Recursively examine files in a directory tree, and extract translatable strings. * * Returns an array of translatable strings, each item having with the following structure: - * 'files' an arfray of file names in which the string appears, + * 'files' an array of file names in which the string appears, * 'text' the translatable text * 'translation' => the text translation, or an empty string if none available. * 'dollar' => true if the translatable text contains a $ * * @param string $directory the path to the directory to examine * @param string $walkMode type of file scanning: WALK_MODE_PHP or WALK_MODE_TEMPLATE - * @param Thelia\Core\Translation\Translator $translator the current translator + * @param \Thelia\Core\Translation\Translator $translator the current translator * @param string $currentLocale the current locale - * @param array $strings the liste of strings + * @param array $strings the list of strings * @throws \InvalidArgumentException if $walkMode contains an invalid value * @return number the total number of translatable texts */ @@ -258,15 +258,15 @@ class TemplateHelper fwrite($fp, ");\n"); - @fclose($fh); + @fclose($fp); } else { throw new \RuntimeException( - $this->getTranslator()->trans( - "Failed to open translation file %file. Please be sure that this file is writable by your Web server", - array('%file' => $file) - ) + Translator::getInstance()->trans( + 'Failed to open translation file %file. Please be sure that this file is writable by your Web server', + array('%file' => $file) + ) ); } } diff --git a/core/lib/Thelia/Coupon/CouponFactory.php b/core/lib/Thelia/Coupon/CouponFactory.php index 603fcaa77..214dd0d9c 100644 --- a/core/lib/Thelia/Coupon/CouponFactory.php +++ b/core/lib/Thelia/Coupon/CouponFactory.php @@ -24,7 +24,6 @@ namespace Thelia\Coupon; use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\Translation\Exception\NotFoundResourceException; use Thelia\Condition\ConditionFactory; use Thelia\Coupon\Type\CouponInterface; use Thelia\Exception\CouponExpiredException; @@ -48,7 +47,7 @@ class CouponFactory protected $container = null; /** @var FacadeInterface Provide necessary value from Thelia*/ - protected $adapter; + protected $facade; /** * Constructor @@ -58,7 +57,7 @@ class CouponFactory public function __construct(ContainerInterface $container) { $this->container = $container; - $this->adapter = $container->get('thelia.adapter'); + $this->facade = $container->get('thelia.facade'); } /** @@ -68,17 +67,14 @@ class CouponFactory * * @throws \Thelia\Exception\CouponExpiredException * @throws \Thelia\Exception\InvalidConditionException - * @throws \Symfony\Component\Translation\Exception\NotFoundResourceException * @return CouponInterface ready to be processed */ public function buildCouponFromCode($couponCode) { /** @var Coupon $couponModel */ - $couponModel = $this->adapter->findOneCouponByCode($couponCode); + $couponModel = $this->facade->findOneCouponByCode($couponCode); if ($couponModel === null) { - throw new NotFoundResourceException( - 'Coupon ' . $couponCode . ' not found in Database' - ); + return false; } if ($couponModel->getExpirationDate() < new \DateTime()) { @@ -86,8 +82,8 @@ class CouponFactory } /** @var CouponInterface $couponInterface */ - $couponInterface = $this->buildCouponInterfaceFromModel($couponModel); - if ($couponInterface->getConditions()->isEmpty()) { + $couponInterface = $this->buildCouponFromModel($couponModel); + if ($couponInterface && $couponInterface->getConditions()->isEmpty()) { throw new InvalidConditionException( get_class($couponInterface) ); @@ -103,7 +99,7 @@ class CouponFactory * * @return CouponInterface ready to use CouponInterface object instance */ - protected function buildCouponInterfaceFromModel(Coupon $model) + public function buildCouponFromModel(Coupon $model) { $isCumulative = ($model->getIsCumulative() == 1 ? true : false); $isRemovingPostage = ($model->getIsRemovingPostage() == 1 ? true : false); @@ -115,7 +111,7 @@ class CouponFactory /** @var CouponInterface $couponManager*/ $couponManager = $this->container->get($model->getType()); $couponManager->set( - $this->adapter, + $this->facade, $model->getCode(), $model->getTitle(), $model->getShortDescription(), diff --git a/core/lib/Thelia/Coupon/CouponManager.php b/core/lib/Thelia/Coupon/CouponManager.php index 1b446f1e0..c4eff7888 100644 --- a/core/lib/Thelia/Coupon/CouponManager.php +++ b/core/lib/Thelia/Coupon/CouponManager.php @@ -24,7 +24,7 @@ namespace Thelia\Coupon; use Symfony\Component\DependencyInjection\ContainerInterface; -use Thelia\Condition\ConditionManagerInterface; +use Thelia\Condition\Implementation\ConditionInterface; use Thelia\Coupon\Type\CouponInterface; use Thelia\Model\Coupon; @@ -42,7 +42,7 @@ use Thelia\Model\Coupon; class CouponManager { /** @var FacadeInterface Provides necessary value from Thelia */ - protected $adapter = null; + protected $facade = null; /** @var ContainerInterface Service Container */ protected $container = null; @@ -64,8 +64,8 @@ class CouponManager public function __construct(ContainerInterface $container) { $this->container = $container; - $this->adapter = $container->get('thelia.adapter'); - $this->coupons = $this->adapter->getCurrentCoupons(); + $this->facade = $container->get('thelia.facade'); + $this->coupons = $this->facade->getCurrentCoupons(); } @@ -87,12 +87,12 @@ class CouponManager $discount = $this->getEffect($couponsKept); if ($isRemovingPostage) { - $postage = $this->adapter->getCheckoutPostagePrice(); + $postage = $this->facade->getCheckoutPostagePrice(); $discount += $postage; } // Just In Case test - $checkoutTotalPrice = $this->adapter->getCartTotalPrice(); + $checkoutTotalPrice = $this->facade->getCartTotalPrice(); if ($discount >= $checkoutTotalPrice) { $discount = $checkoutTotalPrice; } @@ -164,7 +164,7 @@ class CouponManager /** @var CouponInterface $coupon */ foreach ($coupons as $coupon) { - if ($coupon->isMatching($this->adapter)) { + if ($coupon->isMatching($this->facade)) { $couponsKept[] = $coupon; } } @@ -184,7 +184,7 @@ class CouponManager $discount = 0.00; /** @var CouponInterface $coupon */ foreach ($coupons as $coupon) { - $discount += $coupon->exec($this->adapter); + $discount += $coupon->exec($this->facade); } return $discount; @@ -213,9 +213,9 @@ class CouponManager /** * Add an available ConstraintManager (Services) * - * @param ConditionManagerInterface $condition ConditionManagerInterface + * @param ConditionInterface $condition ConditionInterface */ - public function addAvailableCondition(ConditionManagerInterface $condition) + public function addAvailableCondition(ConditionInterface $condition) { $this->availableConditions[] = $condition; } @@ -237,20 +237,21 @@ class CouponManager * * @param \Thelia\Model\Coupon $coupon Coupon consumed * - * @return bool + * @return int Usage left after decremental */ - public function decrementeQuantity(Coupon $coupon) + public function decrementQuantity(Coupon $coupon) { - $ret = true; + $ret = -1; try { - $oldMaxUsage = $coupon->getMaxUsage(); + $usageLeft = $coupon->getMaxUsage(); - if ($oldMaxUsage > 0) { - $oldMaxUsage--; - $coupon->setMaxUsage($$oldMaxUsage); + if ($usageLeft > 0) { + $usageLeft--; + $coupon->setMaxUsage($usageLeft); $coupon->save(); + $ret = $usageLeft; } } catch(\Exception $e) { diff --git a/core/lib/Thelia/Coupon/Type/CouponAbstract.php b/core/lib/Thelia/Coupon/Type/CouponAbstract.php index d3107faa7..98c258c27 100644 --- a/core/lib/Thelia/Coupon/Type/CouponAbstract.php +++ b/core/lib/Thelia/Coupon/Type/CouponAbstract.php @@ -27,8 +27,8 @@ use Symfony\Component\Intl\Exception\NotImplementedException; use Thelia\Condition\ConditionEvaluator; use Thelia\Core\Translation\Translator; use Thelia\Coupon\FacadeInterface; -use Thelia\Coupon\ConditionCollection; -use Thelia\Coupon\RuleOrganizerInterface; +use Thelia\Condition\ConditionCollection; +use Thelia\Condition\ConditionOrganizerInterface; use Thelia\Exception\InvalidConditionException; /** @@ -45,15 +45,15 @@ use Thelia\Exception\InvalidConditionException; abstract class CouponAbstract implements CouponInterface { /** @var FacadeInterface Provide necessary value from Thelia */ - protected $adapter = null; + protected $facade = null; /** @var Translator Service Translator */ protected $translator = null; - /** @var RuleOrganizerInterface */ + /** @var ConditionOrganizerInterface */ protected $organizer = null; - /** @var ConditionCollection Array of ConditionManagerInterface */ + /** @var ConditionCollection Array of ConditionInterface */ protected $conditions = null; /** @var ConditionEvaluator Condition validator */ @@ -104,19 +104,19 @@ abstract class CouponAbstract implements CouponInterface /** * Constructor * - * @param FacadeInterface $adapter Service adapter + * @param FacadeInterface $facade Service facade */ - public function __construct(FacadeInterface $adapter) + public function __construct(FacadeInterface $facade) { - $this->adapter = $adapter; - $this->translator = $adapter->getTranslator(); - $this->conditionEvaluator = $adapter->getConditionEvaluator(); + $this->facade = $facade; + $this->translator = $facade->getTranslator(); + $this->conditionEvaluator = $facade->getConditionEvaluator(); } /** * Set Condition Organizer * - * @param RuleOrganizerInterface $organizer Manage Condition groups (&& and ||) + * @param ConditionOrganizerInterface $organizer Manage Condition groups (&& and ||) * * @return $this */ @@ -214,7 +214,7 @@ abstract class CouponAbstract implements CouponInterface * Replace the existing Conditions by those given in parameter * If one Condition is badly implemented, no Condition will be added * - * @param ConditionCollection $conditions ConditionManagerInterface to add + * @param ConditionCollection $conditions ConditionInterface to add * * @return $this * @throws \Thelia\Exception\InvalidConditionException diff --git a/core/lib/Thelia/Coupon/Type/CouponInterface.php b/core/lib/Thelia/Coupon/Type/CouponInterface.php index b88039b5c..63c7e4267 100644 --- a/core/lib/Thelia/Coupon/Type/CouponInterface.php +++ b/core/lib/Thelia/Coupon/Type/CouponInterface.php @@ -23,7 +23,8 @@ namespace Thelia\Coupon\Type; -use Thelia\Coupon\ConditionCollection; +use Thelia\Condition\ConditionCollection; +use Thelia\Coupon\FacadeInterface; /** * Created by JetBrains PhpStorm. @@ -62,7 +63,7 @@ interface CouponInterface /** * Set Coupon * - * @param CouponInterface $adapter Provides necessary value from Thelia + * @param FacadeInterface $facade Provides necessary value from Thelia * @param string $code Coupon code (ex: XMAS) * @param string $title Coupon title (ex: Coupon for XMAS) * @param string $shortDescription Coupon short description @@ -77,7 +78,7 @@ interface CouponInterface * @param \Datetime $expirationDate When the Code is expiring */ public function set( - $adapter, + FacadeInterface $facade, $code, $title, $shortDescription, @@ -139,20 +140,20 @@ interface CouponInterface /** * Return condition to validate the Coupon or not * - * @return ConditionCollection A set of ConditionManagerInterface + * @return ConditionCollection A set of ConditionInterface */ public function getConditions(); /** - * Replace the existing Rules by those given in parameter - * If one Rule is badly implemented, no Rule will be added + * Replace the existing Conditions by those given in parameter + * If one Condition is badly implemented, no Condition will be added * - * @param ConditionCollection $rules ConditionManagerInterface to add + * @param ConditionCollection $conditions ConditionInterface to add * * @return $this * @throws \Thelia\Exception\InvalidConditionException */ - public function setConditions(ConditionCollection $rules); + public function setConditions(ConditionCollection $conditions); /** * Return Coupon expiration date @@ -198,7 +199,7 @@ interface CouponInterface * A positive value * * Effects could also affect something else than the final Checkout price - * CouponAdapter $adapter could be use to directly pass a Session value + * FacadeInterface $facade could be used to directly pass a Session value * some would wish to modify * Hence affecting a wide variety of Thelia elements * @@ -207,7 +208,7 @@ interface CouponInterface public function exec(); /** - * Check if the current Coupon is matching its conditions (Rules) + * Check if the current Coupon is matching its conditions * Thelia variables are given by the FacadeInterface * * @return bool diff --git a/core/lib/Thelia/Coupon/Type/RemoveXAmountManager.php b/core/lib/Thelia/Coupon/Type/RemoveXAmount.php similarity index 94% rename from core/lib/Thelia/Coupon/Type/RemoveXAmountManager.php rename to core/lib/Thelia/Coupon/Type/RemoveXAmount.php index 1f9e12420..1609ffc3e 100644 --- a/core/lib/Thelia/Coupon/Type/RemoveXAmountManager.php +++ b/core/lib/Thelia/Coupon/Type/RemoveXAmount.php @@ -23,6 +23,7 @@ namespace Thelia\Coupon\Type; +use Thelia\Coupon\FacadeInterface; use Thelia\Coupon\Type\CouponAbstract; /** @@ -36,7 +37,7 @@ use Thelia\Coupon\Type\CouponAbstract; * @author Guillaume MOREL * */ -class RemoveXAmountManager extends CouponAbstract +class RemoveXAmount extends CouponAbstract { /** @var string Service Id */ protected $serviceId = 'thelia.coupon.type.remove_x_amount'; @@ -44,7 +45,7 @@ class RemoveXAmountManager extends CouponAbstract /** * Set Coupon * - * @param CouponInterface $adapter Provides necessary value from Thelia + * @param FacadeInterface $facade Provides necessary value from Thelia * @param string $code Coupon code (ex: XMAS) * @param string $title Coupon title (ex: Coupon for XMAS) * @param string $shortDescription Coupon short description @@ -59,7 +60,7 @@ class RemoveXAmountManager extends CouponAbstract * @param \Datetime $expirationDate When the Code is expiring */ public function set( - $adapter, + FacadeInterface $facade, $code, $title, $shortDescription, @@ -87,7 +88,7 @@ class RemoveXAmountManager extends CouponAbstract $this->isEnabled = $isEnabled; $this->maxUsage = $maxUsage; $this->expirationDate = $expirationDate; - $this->adapter = $adapter; + $this->facade = $facade; } /** @@ -97,7 +98,7 @@ class RemoveXAmountManager extends CouponAbstract */ public function getName() { - return $this->adapter + return $this->facade ->getTranslator() ->trans('Remove X amount to total cart', array(), 'constraint'); } @@ -109,7 +110,7 @@ class RemoveXAmountManager extends CouponAbstract */ public function getToolTip() { - $toolTip = $this->adapter + $toolTip = $this->facade ->getTranslator() ->trans( 'This coupon will remove the entered amount to the customer total checkout. If the discount is superior to the total checkout price the customer will only pay the postage. Unless if the coupon is set to remove postage too.', diff --git a/core/lib/Thelia/Coupon/Type/RemoveXPercentManager.php b/core/lib/Thelia/Coupon/Type/RemoveXPercent.php similarity index 92% rename from core/lib/Thelia/Coupon/Type/RemoveXPercentManager.php rename to core/lib/Thelia/Coupon/Type/RemoveXPercent.php index b0a8e82cd..931ddad67 100644 --- a/core/lib/Thelia/Coupon/Type/RemoveXPercentManager.php +++ b/core/lib/Thelia/Coupon/Type/RemoveXPercent.php @@ -23,8 +23,9 @@ namespace Thelia\Coupon\Type; +use Thelia\Coupon\FacadeInterface; use Thelia\Coupon\Type\CouponAbstract; -use Thelia\Exception\MissingAdapterException; +use Thelia\Exception\MissingFacadeException; /** * Created by JetBrains PhpStorm. @@ -35,7 +36,7 @@ use Thelia\Exception\MissingAdapterException; * @author Guillaume MOREL * */ -class RemoveXPercentManager extends CouponAbstract +class RemoveXPercent extends CouponAbstract { /** @var string Service Id */ protected $serviceId = 'thelia.coupon.type.remove_x_percent'; @@ -45,7 +46,7 @@ class RemoveXPercentManager extends CouponAbstract /** * Set Coupon * - * @param CouponInterface $adapter Provides necessary value from Thelia + * @param FacadeInterface $facade Provides necessary value from Thelia * @param string $code Coupon code (ex: XMAS) * @param string $title Coupon title (ex: Coupon for XMAS) * @param string $shortDescription Coupon short description @@ -60,7 +61,7 @@ class RemoveXPercentManager extends CouponAbstract * @param \Datetime $expirationDate When the Code is expiring */ public function set( - $adapter, + FacadeInterface $facade, $code, $title, $shortDescription, @@ -87,14 +88,14 @@ class RemoveXPercentManager extends CouponAbstract $this->isEnabled = $isEnabled; $this->maxUsage = $maxUsage; $this->expirationDate = $expirationDate; - $this->adapter = $adapter; + $this->facade = $facade; } /** * Return effects generated by the coupon * A negative value * - * @throws \Thelia\Exception\MissingAdapterException + * @throws \Thelia\Exception\MissingFacadeException * @throws \InvalidArgumentException * @return float */ @@ -106,7 +107,7 @@ class RemoveXPercentManager extends CouponAbstract ); } - $basePrice = $this->adapter->getCartTotalPrice(); + $basePrice = $this->facade->getCartTotalPrice(); return $basePrice * (( $this->percent ) / 100); } @@ -119,7 +120,7 @@ class RemoveXPercentManager extends CouponAbstract */ public function getName() { - return $this->adapter + return $this->facade ->getTranslator() ->trans('Remove X percent to total cart', array(), 'constraint'); } @@ -131,7 +132,7 @@ class RemoveXPercentManager extends CouponAbstract */ public function getToolTip() { - $toolTip = $this->adapter + $toolTip = $this->facade ->getTranslator() ->trans( 'This coupon will remove the entered percentage to the customer total checkout. If the discount is superior to the total checkout price the customer will only pay the postage. Unless if the coupon is set to remove postage too.', diff --git a/core/lib/Thelia/Exception/MissingAdapterException.php b/core/lib/Thelia/Exception/MissingFacadeException.php similarity index 96% rename from core/lib/Thelia/Exception/MissingAdapterException.php rename to core/lib/Thelia/Exception/MissingFacadeException.php index 3659dcc68..5616e9575 100644 --- a/core/lib/Thelia/Exception/MissingAdapterException.php +++ b/core/lib/Thelia/Exception/MissingFacadeException.php @@ -30,13 +30,13 @@ use Thelia\Log\Tlog; * Date: 8/19/13 * Time: 3:24 PM * - * Thrown when the Adapter is not set + * Thrown when the Facade is not set * * @package Coupon * @author Guillaume MOREL * */ -class MissingAdapterException extends \RuntimeException +class MissingFacadeException extends \RuntimeException { /** * {@inheritdoc} diff --git a/core/lib/Thelia/Form/CartAdd.php b/core/lib/Thelia/Form/CartAdd.php index 59d13765d..98e12acde 100755 --- a/core/lib/Thelia/Form/CartAdd.php +++ b/core/lib/Thelia/Form/CartAdd.php @@ -141,7 +141,7 @@ class CartAdd extends BaseForm ->filterByProductId($data["product"]) ->findOne(); - if ($productSaleElements->getQuantity() < $value && ConfigQuery::read("verifyStock", 1) == 1) { + if ($productSaleElements->getQuantity() < $value && ConfigQuery::checkAvailableStock()) { $context->addViolation("quantity value is not valid"); } } diff --git a/core/lib/Thelia/Form/CategoryModificationForm.php b/core/lib/Thelia/Form/CategoryModificationForm.php index 943c0d941..567f9e41f 100644 --- a/core/lib/Thelia/Form/CategoryModificationForm.php +++ b/core/lib/Thelia/Form/CategoryModificationForm.php @@ -38,7 +38,7 @@ class CategoryModificationForm extends CategoryCreationForm ->add("id", "hidden", array("constraints" => array(new GreaterThan(array('value' => 0))))) ->add("url", "text", array( - "label" => Translator::getInstance()->trans("Rewriten URL *"), + "label" => Translator::getInstance()->trans("Rewritten URL *"), "constraints" => array(new NotBlank()), "label_attr" => array("for" => "rewriten_url") )) diff --git a/core/lib/Thelia/Form/ContentModificationForm.php b/core/lib/Thelia/Form/ContentModificationForm.php index 14789ab84..c3887b88e 100644 --- a/core/lib/Thelia/Form/ContentModificationForm.php +++ b/core/lib/Thelia/Form/ContentModificationForm.php @@ -45,7 +45,7 @@ class ContentModificationForm extends ContentCreationForm ->add("id", "hidden", array("constraints" => array(new GreaterThan(array('value' => 0))))) ->add("url", "text", array( - "label" => Translator::getInstance()->trans("Rewriten URL *"), + "label" => Translator::getInstance()->trans("Rewritten URL *"), "constraints" => array(new NotBlank()), "label_attr" => array("for" => "rewritten_url") )) diff --git a/core/lib/Thelia/Form/FolderModificationForm.php b/core/lib/Thelia/Form/FolderModificationForm.php index 0ff90868c..9c4e4c601 100644 --- a/core/lib/Thelia/Form/FolderModificationForm.php +++ b/core/lib/Thelia/Form/FolderModificationForm.php @@ -38,7 +38,7 @@ class FolderModificationForm extends FolderCreationForm ->add("id", "hidden", array("constraints" => array(new GreaterThan(array('value' => 0))))) ->add("url", "text", array( - "label" => Translator::getInstance()->trans("Rewriten URL *"), + "label" => Translator::getInstance()->trans("Rewritten URL *"), "constraints" => array(new NotBlank()), "label_attr" => array("for" => "rewriten_url") )) diff --git a/core/lib/Thelia/Form/ProductModificationForm.php b/core/lib/Thelia/Form/ProductModificationForm.php index 34785cf45..15a629302 100644 --- a/core/lib/Thelia/Form/ProductModificationForm.php +++ b/core/lib/Thelia/Form/ProductModificationForm.php @@ -47,7 +47,7 @@ class ProductModificationForm extends ProductCreationForm )) ->add("url", "text", array( - "label" => Translator::getInstance()->trans("Rewriten URL *"), + "label" => Translator::getInstance()->trans("Rewritten URL *"), "constraints" => array(new NotBlank()), "label_attr" => array("for" => "rewriten_url_field") )) diff --git a/core/lib/Thelia/Log/Destination/TlogDestinationFile.php b/core/lib/Thelia/Log/Destination/TlogDestinationFile.php index 5d9089ebe..80aa3ec25 100755 --- a/core/lib/Thelia/Log/Destination/TlogDestinationFile.php +++ b/core/lib/Thelia/Log/Destination/TlogDestinationFile.php @@ -78,10 +78,10 @@ class TlogDestinationFile extends AbstractTlogDestination } while (file_exists($file_path_bk)); - rename($file_path, $file_path_bk); + @rename($file_path, $file_path_bk); - touch($file_path); - chmod($file_path, 0666); + @touch($file_path); + @chmod($file_path, 0666); } $this->fh = fopen($file_path, $mode); diff --git a/core/lib/Thelia/Model/Cart.php b/core/lib/Thelia/Model/Cart.php index 36b604258..c1f28bc3d 100755 --- a/core/lib/Thelia/Model/Cart.php +++ b/core/lib/Thelia/Model/Cart.php @@ -36,7 +36,7 @@ class Cart extends BaseCart if ($product && $productSaleElements && $product->getVisible() == 1 && - ($productSaleElements->getQuantity() > $cartItem->getQuantity() || ! ConfigQuery::read("verifyStock", 1))) + ($productSaleElements->getQuantity() > $cartItem->getQuantity() || ! ConfigQuery::checkAvailableStock())) { $item = new CartItem(); diff --git a/core/lib/Thelia/Model/CartItem.php b/core/lib/Thelia/Model/CartItem.php index 5432bd1ab..ef72c070c 100755 --- a/core/lib/Thelia/Model/CartItem.php +++ b/core/lib/Thelia/Model/CartItem.php @@ -51,7 +51,7 @@ class CartItem extends BaseCartItem $value = $currentQuantity; } - if(ConfigQuery::read("verifyStock", 1) == 1) + if(ConfigQuery::checkAvailableStock()) { $productSaleElements = $this->getProductSaleElements(); @@ -75,7 +75,7 @@ class CartItem extends BaseCartItem $value = $currentQuantity; } - if(ConfigQuery::read("verifyStock", 1) == 1) + if(ConfigQuery::checkAvailableStock()) { $productSaleElements = $this->getProductSaleElements(); diff --git a/core/lib/Thelia/Model/Category.php b/core/lib/Thelia/Model/Category.php index 067c54fc1..8b8b53e4f 100755 --- a/core/lib/Thelia/Model/Category.php +++ b/core/lib/Thelia/Model/Category.php @@ -115,6 +115,8 @@ class Category extends BaseCategory */ public function postDelete(ConnectionInterface $con = null) { + $this->markRewritenUrlObsolete(); + $this->dispatchEvent(TheliaEvents::AFTER_DELETECATEGORY, new CategoryEvent($this)); } } \ No newline at end of file diff --git a/core/lib/Thelia/Model/ConfigQuery.php b/core/lib/Thelia/Model/ConfigQuery.php index e2f6a3975..e34ae5e16 100755 --- a/core/lib/Thelia/Model/ConfigQuery.php +++ b/core/lib/Thelia/Model/ConfigQuery.php @@ -77,9 +77,9 @@ class ConfigQuery extends BaseConfigQuery { return self::read("page_not_found_view", '404.html'); } - public static function getPassedUrlView() + public static function getObsoleteRewrittenUrlView() { - return self::read('passed_url_view', 'passed-url'); + return self::read('obsolete_rewriten_url_view', 'obsolete-rewritten-url'); } public static function useTaxFreeAmounts() @@ -87,6 +87,11 @@ class ConfigQuery extends BaseConfigQuery { return self::read('use_tax_free_amounts', 'default') == 1; } + public static function checkAvailableStock() + { + return self::read('check-available-stock', 1) != 0; + } + /* smtp config */ public static function isSmtpEnable() { diff --git a/core/lib/Thelia/Model/Content.php b/core/lib/Thelia/Model/Content.php index 6417c8b56..3a002e6d1 100755 --- a/core/lib/Thelia/Model/Content.php +++ b/core/lib/Thelia/Model/Content.php @@ -148,6 +148,8 @@ class Content extends BaseContent public function postDelete(ConnectionInterface $con = null) { + $this->markRewritenUrlObsolete(); + $this->dispatchEvent(TheliaEvents::AFTER_DELETECONTENT, new ContentEvent($this)); } } diff --git a/core/lib/Thelia/Model/Folder.php b/core/lib/Thelia/Model/Folder.php index 4b32e7591..9249c94e2 100755 --- a/core/lib/Thelia/Model/Folder.php +++ b/core/lib/Thelia/Model/Folder.php @@ -100,6 +100,8 @@ class Folder extends BaseFolder public function postDelete(ConnectionInterface $con = null) { + $this->markRewritenUrlObsolete(); + $this->dispatchEvent(TheliaEvents::AFTER_DELETEFOLDER, new FolderEvent($this)); } } diff --git a/core/lib/Thelia/Model/Product.php b/core/lib/Thelia/Model/Product.php index 1b3f1eefa..12b98c890 100755 --- a/core/lib/Thelia/Model/Product.php +++ b/core/lib/Thelia/Model/Product.php @@ -202,7 +202,7 @@ class Product extends BaseProduct ->save($con) ; - // Create an empty product price in the default currency + // Create an empty product price in the provided currency $product_price = new ProductPrice(); $product_price @@ -263,12 +263,8 @@ class Product extends BaseProduct */ public function postDelete(ConnectionInterface $con = null) { - RewritingUrlQuery::create() - ->filterByView($this->getRewrittenUrlViewName()) - ->filterByViewId($this->getId()) - ->update(array( - "View" => ConfigQuery::getPassedUrlView() - )); + $this->markRewritenUrlObsolete(); + $this->dispatchEvent(TheliaEvents::AFTER_DELETEPRODUCT, new ProductEvent($this)); } } diff --git a/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php b/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php index 0a8af40c8..bcbbb9afd 100644 --- a/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php +++ b/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php @@ -29,18 +29,19 @@ use Thelia\Exception\UrlRewritingException; use Thelia\Model\RewritingUrlQuery; use Thelia\Model\RewritingUrl; use Thelia\Tools\URL; +use Thelia\Model\ConfigQuery; /** - * A trait for managing Rewriten URLs from model classes + * A trait for managing Rewritten URLs from model classes */ trait UrlRewritingTrait { /** - * @returns string the view name of the rewriten object (e.g., 'category', 'product') + * @returns string the view name of the rewritten object (e.g., 'category', 'product') */ protected abstract function getRewrittenUrlViewName(); /** - * Get the object URL for the given locale, rewriten if rewriting is enabled. + * Get the object URL for the given locale, rewritten if rewriting is enabled. * * @param string $locale a valid locale (e.g. en_US) */ @@ -53,7 +54,7 @@ trait UrlRewritingTrait { } /** - * Generate a rewriten URL from the object title, and store it in the rewriting table + * Generate a rewritten URL from the object title, and store it in the rewriting table * * @param string $locale a valid locale (e.g. en_US) */ @@ -112,7 +113,7 @@ trait UrlRewritingTrait { } /** - * return the rewriten URL for the given locale + * return the rewritten URL for the given locale * * @param string $locale a valid locale (e.g. en_US) * @return null @@ -137,7 +138,19 @@ trait UrlRewritingTrait { } /** - * Set the rewriten URL for the given locale + * Mark the current URL as obseolete + */ + public function markRewritenUrlObsolete() { + RewritingUrlQuery::create() + ->filterByView($this->getRewrittenUrlViewName()) + ->filterByViewId($this->getId()) + ->update(array( + "View" => ConfigQuery::getObsoleteRewrittenUrlView() + )); + } + + /** + * Set the rewritten URL for the given locale * * @param string $locale a valid locale (e.g. en_US) * @param $url the wanted url diff --git a/core/lib/Thelia/Tests/Action/FolderTest.php b/core/lib/Thelia/Tests/Action/FolderTest.php index 7ef88aa0d..c433411ee 100644 --- a/core/lib/Thelia/Tests/Action/FolderTest.php +++ b/core/lib/Thelia/Tests/Action/FolderTest.php @@ -162,14 +162,19 @@ class FolderTest extends BaseAction public function testUpdatePositionDown() { - $folder = FolderQuery::create() - ->filterByPosition(1) + $nextFolder = FolderQuery::create() + ->filterByPosition(2) ->findOne(); - if (null === $folder) { + if (null === $nextFolder) { $this->fail('use fixtures before launching test, there is no folder in database'); } + $folder = FolderQuery::create() + ->filterByPosition(1) + ->filterByParent($nextFolder->getParent()) + ->findOne(); + $newPosition = $folder->getPosition()+1; $event = new UpdatePositionEvent($folder->getId(), UpdatePositionEvent::POSITION_DOWN); diff --git a/core/lib/Thelia/Tests/Condition/ConditionCollectionTest.php b/core/lib/Thelia/Tests/Condition/ConditionCollectionTest.php new file mode 100644 index 000000000..46f639521 --- /dev/null +++ b/core/lib/Thelia/Tests/Condition/ConditionCollectionTest.php @@ -0,0 +1,186 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Condition; +use Thelia\Condition\Implementation\MatchForTotalAmount; +use Thelia\Model\CurrencyQuery; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Unit Test ConditionCollection Class + * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2013-11-17 at 18:59:24. + * + * @package Condition + * @author Guillaume MOREL + * + */ +class ConditionCollectionTest extends \PHPUnit_Framework_TestCase +{ + /** + * @var ConditionCollection + */ + protected $object; + + /** + * Sets up the fixture, for example, opens a network connection. + * This method is called before a test is executed. + */ + protected function setUp() + { + } + + + /** + * Generate adapter stub + * + * @param int $cartTotalPrice Cart total price + * @param string $checkoutCurrency Checkout currency + * @param string $i18nOutput Output from each translation + * + * @return \PHPUnit_Framework_MockObject_MockObject + */ + public function generateFacadeStub($cartTotalPrice = 400, $checkoutCurrency = 'EUR', $i18nOutput = '') + { + $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade') + ->disableOriginalConstructor() + ->getMock(); + + $currencies = CurrencyQuery::create(); + $currencies = $currencies->find(); + $stubFacade->expects($this->any()) + ->method('getAvailableCurrencies') + ->will($this->returnValue($currencies)); + + $stubFacade->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue($cartTotalPrice)); + + $stubFacade->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue($checkoutCurrency)); + + $stubFacade->expects($this->any()) + ->method('getConditionEvaluator') + ->will($this->returnValue(new ConditionEvaluator())); + + $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator') + ->disableOriginalConstructor() + ->getMock(); + $stubTranslator->expects($this->any()) + ->method('trans') + ->will($this->returnValue($i18nOutput)); + + $stubFacade->expects($this->any()) + ->method('getTranslator') + ->will($this->returnValue($stubTranslator)); + + return $stubFacade; + } + + /** + * Tears down the fixture, for example, closes a network connection. + * This method is called after a test is executed. + */ + protected function tearDown() + { + } + + /** + * @covers Thelia\Condition\ConditionCollection::getConditions + * @covers Thelia\Condition\ConditionCollection::add + */ + public function testGetConditions() + { + $stubFacade = $this->generateFacadeStub(); + + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::EQUAL, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 400, + MatchForTotalAmount::INPUT2 => 'EUR'); + $condition1->setValidatorsFromForm($operators, $values); + + $collection = new ConditionCollection(); + $collection->add($condition1); + + $expected = $condition1; + $actual = $collection->getConditions()[0]; + + $this->assertEquals($expected, $actual); + + $this->assertFalse($collection->isEmpty()); + } + + /** + * @covers Thelia\Condition\ConditionCollection::isEmpty + */ + public function testIsEmpty() + { + $collection = new ConditionCollection(); + $this->assertTrue($collection->isEmpty()); + } + + /** + * @covers Thelia\Condition\ConditionCollection::__toString + */ + public function test__toString() + { + $stubFacade = $this->generateFacadeStub(); + + $condition1 = new MatchForTotalAmount($stubFacade); + $operators1 = array( + MatchForTotalAmount::INPUT1 => Operators::SUPERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values1 = array( + MatchForTotalAmount::INPUT1 => 400, + MatchForTotalAmount::INPUT2 => 'EUR'); + $condition1->setValidatorsFromForm($operators1, $values1); + + $condition2 = new MatchForTotalAmount($stubFacade); + $operators2 = array( + MatchForTotalAmount::INPUT1 => Operators::INFERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values2 = array( + MatchForTotalAmount::INPUT1 => 600, + MatchForTotalAmount::INPUT2 => 'EUR'); + $condition2->setValidatorsFromForm($operators2, $values2); + + $collection = new ConditionCollection(); + $collection->add($condition1); + $collection->add($condition2); + + $expected = '[{"conditionServiceId":"thelia.condition.match_for_total_amount","operators":{"price":">","currency":"=="},"values":{"price":400,"currency":"EUR"}},{"conditionServiceId":"thelia.condition.match_for_total_amount","operators":{"price":"<","currency":"=="},"values":{"price":600,"currency":"EUR"}}]'; + $actual = $collection->__toString();; + + $this->assertEquals($expected, $actual); + + } +} diff --git a/core/lib/Thelia/Tests/Condition/ConditionEvaluatorTest.php b/core/lib/Thelia/Tests/Condition/ConditionEvaluatorTest.php index dac865a7d..2c85e05e5 100644 --- a/core/lib/Thelia/Tests/Condition/ConditionEvaluatorTest.php +++ b/core/lib/Thelia/Tests/Condition/ConditionEvaluatorTest.php @@ -25,9 +25,7 @@ namespace Thelia\Condition\Implementation; use Thelia\Condition\ConditionEvaluator; use Thelia\Condition\Operators; -use Thelia\Coupon\FacadeInterface; -use Thelia\Coupon\ConditionCollection; -use Thelia\Model\CurrencyQuery; +use Thelia\Condition\ConditionCollection; /** * Created by JetBrains PhpStorm. @@ -51,328 +49,11 @@ class ConditionEvaluatorTest extends \PHPUnit_Framework_TestCase { } - public function testTestSuccess1Rules() - { - $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator') - ->disableOriginalConstructor() - ->getMock(); - - /** @var FacadeInterface $stubFacade */ - $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade') - ->disableOriginalConstructor() - ->getMock(); - - $stubFacade->expects($this->any()) - ->method('getTranslator') - ->will($this->returnValue($stubTranslator)); - $stubFacade->expects($this->any()) - ->method('getConditionEvaluator') - ->will($this->returnValue(new ConditionEvaluator())); - - $currencies = CurrencyQuery::create(); - $currencies = $currencies->find(); - $stubFacade->expects($this->any()) - ->method('getAvailableCurrencies') - ->will($this->returnValue($currencies)); - - $stubContainer = $this->getMockBuilder('\Symfony\Component\DependencyInjection\Container') - ->disableOriginalConstructor() - ->getMock(); - - $stubMatchForTotalAmountManager = $this->getMockBuilder('\Thelia\Condition\Implementation\MatchForTotalAmountManager') - ->disableOriginalConstructor() - ->getMock(); - $stubMatchForTotalAmountManager->expects($this->any()) - ->method('isMatching') - ->will($this->returnValue(true)); - - $stubContainer->expects($this->any()) - ->method('get') - ->will($this->returnValue($stubMatchForTotalAmountManager)); - - $stubContainer->expects($this->any()) - ->method('has') - ->will($this->returnValue(true)); - - $stubFacade->expects($this->any()) - ->method('getContainer') - ->will($this->returnValue($stubContainer)); - $stubFacade->expects($this->any()) - ->method('getCheckoutCurrency') - ->will($this->returnValue('EUR')); - $stubFacade->expects($this->any()) - ->method('getCartTotalPrice') - ->will($this->returnValue(401.00)); - - $condition1 = new MatchForTotalAmountManager($stubFacade); - $operators = array( - MatchForTotalAmountManager::INPUT1 => '>', - MatchForTotalAmountManager::INPUT2 => '==' - ); - $values = array( - MatchForTotalAmountManager::INPUT1 => 400.00, - MatchForTotalAmountManager::INPUT2 => 'EUR'); - $condition1->setValidatorsFromForm($operators, $values); - - $conditions = new ConditionCollection(); - $conditions->add($condition1); - - $conditionEvaluator = new ConditionEvaluator(); - $isValid = $conditionEvaluator->isMatching($conditions); - - $expected = true; - $actual =$isValid; - $this->assertEquals($expected, $actual); - } - - public function testTestFail1Rules() - { - $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator') - ->disableOriginalConstructor() - ->getMock(); - - /** @var FacadeInterface $stubFacade */ - $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade') - ->disableOriginalConstructor() - ->getMock(); - - $stubFacade->expects($this->any()) - ->method('getTranslator') - ->will($this->returnValue($stubTranslator)); - $stubFacade->expects($this->any()) - ->method('getConditionEvaluator') - ->will($this->returnValue(new ConditionEvaluator())); - - $currencies = CurrencyQuery::create(); - $currencies = $currencies->find(); - $stubFacade->expects($this->any()) - ->method('getAvailableCurrencies') - ->will($this->returnValue($currencies)); - - $stubContainer = $this->getMockBuilder('\Symfony\Component\DependencyInjection\Container') - ->disableOriginalConstructor() - ->getMock(); - - $stubMatchForTotalAmountManager = $this->getMockBuilder('\Thelia\Condition\Implementation\MatchForTotalAmountManager') - ->disableOriginalConstructor() - ->getMock(); - $stubMatchForTotalAmountManager->expects($this->any()) - ->method('isMatching') - ->will($this->returnValue(true)); - - $stubContainer->expects($this->any()) - ->method('get') - ->will($this->returnValue($stubMatchForTotalAmountManager)); - - $stubContainer->expects($this->any()) - ->method('has') - ->will($this->returnValue(true)); - - $stubFacade->expects($this->any()) - ->method('getContainer') - ->will($this->returnValue($stubContainer)); - $stubFacade->expects($this->any()) - ->method('getCheckoutCurrency') - ->will($this->returnValue('EUR')); - $stubFacade->expects($this->any()) - ->method('getCartTotalPrice') - ->will($this->returnValue(400.00)); - - $condition1 = new MatchForTotalAmountManager($stubFacade); - $operators = array( - MatchForTotalAmountManager::INPUT1 => '>', - MatchForTotalAmountManager::INPUT2 => '==' - ); - $values = array( - MatchForTotalAmountManager::INPUT1 => 400.00, - MatchForTotalAmountManager::INPUT2 => 'EUR'); - $condition1->setValidatorsFromForm($operators, $values); - - $conditions = new ConditionCollection(); - $conditions->add($condition1); - - $conditionEvaluator = new ConditionEvaluator(); - $isValid = $conditionEvaluator->isMatching($conditions); - - $expected = false; - $actual =$isValid; - $this->assertEquals($expected, $actual, 'Conditions evaluator always think Customer is matching conditions'); - } - - public function testTestSuccess2Rules() - { - $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator') - ->disableOriginalConstructor() - ->getMock(); - - /** @var FacadeInterface $stubFacade */ - $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade') - ->disableOriginalConstructor() - ->getMock(); - - $stubFacade->expects($this->any()) - ->method('getTranslator') - ->will($this->returnValue($stubTranslator)); - $stubFacade->expects($this->any()) - ->method('getConditionEvaluator') - ->will($this->returnValue(new ConditionEvaluator())); - - $currencies = CurrencyQuery::create(); - $currencies = $currencies->find(); - $stubFacade->expects($this->any()) - ->method('getAvailableCurrencies') - ->will($this->returnValue($currencies)); - - $stubContainer = $this->getMockBuilder('\Symfony\Component\DependencyInjection\Container') - ->disableOriginalConstructor() - ->getMock(); - - $stubMatchForTotalAmountManager = $this->getMockBuilder('\Thelia\Condition\Implementation\MatchForTotalAmountManager') - ->disableOriginalConstructor() - ->getMock(); - $stubMatchForTotalAmountManager->expects($this->any()) - ->method('isMatching') - ->will($this->returnValue(true)); - - $stubContainer->expects($this->any()) - ->method('get') - ->will($this->returnValue($stubMatchForTotalAmountManager)); - - $stubContainer->expects($this->any()) - ->method('has') - ->will($this->returnValue(true)); - - $stubFacade->expects($this->any()) - ->method('getContainer') - ->will($this->returnValue($stubContainer)); - $stubFacade->expects($this->any()) - ->method('getCheckoutCurrency') - ->will($this->returnValue('EUR')); - $stubFacade->expects($this->any()) - ->method('getCartTotalPrice') - ->will($this->returnValue(401.00)); - $stubFacade->expects($this->any()) - ->method('getNbArticlesInCart') - ->will($this->returnValue(5)); - - $condition1 = new MatchForTotalAmountManager($stubFacade); - $operators = array( - MatchForTotalAmountManager::INPUT1 => '>', - MatchForTotalAmountManager::INPUT2 => '==' - ); - $values = array( - MatchForTotalAmountManager::INPUT1 => 400.00, - MatchForTotalAmountManager::INPUT2 => 'EUR'); - $condition1->setValidatorsFromForm($operators, $values); - - $condition2 = new MatchForXArticlesManager($stubFacade); - $operators = array( - MatchForXArticlesManager::INPUT1 => '>' - ); - $values = array( - MatchForXArticlesManager::INPUT1 => 4 - ); - $condition2->setValidatorsFromForm($operators, $values); - - $conditions = new ConditionCollection(); - $conditions->add($condition1); - $conditions->add($condition2); - - $conditionEvaluator = new ConditionEvaluator(); - $isValid = $conditionEvaluator->isMatching($conditions); - - $expected = true; - $actual =$isValid; - $this->assertEquals($expected, $actual); - } - - public function testTestFail2Rules() - { - $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator') - ->disableOriginalConstructor() - ->getMock(); - - /** @var FacadeInterface $stubFacade */ - $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade') - ->disableOriginalConstructor() - ->getMock(); - - $stubFacade->expects($this->any()) - ->method('getTranslator') - ->will($this->returnValue($stubTranslator)); - $stubFacade->expects($this->any()) - ->method('getConditionEvaluator') - ->will($this->returnValue(new ConditionEvaluator())); - - $currencies = CurrencyQuery::create(); - $currencies = $currencies->find(); - $stubFacade->expects($this->any()) - ->method('getAvailableCurrencies') - ->will($this->returnValue($currencies)); - - $stubContainer = $this->getMockBuilder('\Symfony\Component\DependencyInjection\Container') - ->disableOriginalConstructor() - ->getMock(); - - $stubMatchForTotalAmountManager = $this->getMockBuilder('\Thelia\Condition\Implementation\MatchForTotalAmountManager') - ->disableOriginalConstructor() - ->getMock(); - $stubMatchForTotalAmountManager->expects($this->any()) - ->method('isMatching') - ->will($this->returnValue(true)); - - $stubContainer->expects($this->any()) - ->method('get') - ->will($this->returnValue($stubMatchForTotalAmountManager)); - - $stubContainer->expects($this->any()) - ->method('has') - ->will($this->returnValue(true)); - - $stubFacade->expects($this->any()) - ->method('getContainer') - ->will($this->returnValue($stubContainer)); - $stubFacade->expects($this->any()) - ->method('getCheckoutCurrency') - ->will($this->returnValue('EUR')); - $stubFacade->expects($this->any()) - ->method('getCartTotalPrice') - ->will($this->returnValue(400.00)); - $stubFacade->expects($this->any()) - ->method('getNbArticlesInCart') - ->will($this->returnValue(5)); - - $condition1 = new MatchForTotalAmountManager($stubFacade); - $operators = array( - MatchForTotalAmountManager::INPUT1 => '>', - MatchForTotalAmountManager::INPUT2 => '==' - ); - $values = array( - MatchForTotalAmountManager::INPUT1 => 400.00, - MatchForTotalAmountManager::INPUT2 => 'EUR'); - $condition1->setValidatorsFromForm($operators, $values); - - $condition2 = new MatchForXArticlesManager($stubFacade); - $operators = array( - MatchForXArticlesManager::INPUT1 => '>' - ); - $values = array( - MatchForXArticlesManager::INPUT1 => 4 - ); - $condition2->setValidatorsFromForm($operators, $values); - - $conditions = new ConditionCollection(); - $conditions->add($condition1); - $conditions->add($condition2); - - $conditionEvaluator = new ConditionEvaluator(); - $isValid = $conditionEvaluator->isMatching($conditions); - - $expected = false; - $actual =$isValid; - $this->assertEquals($expected, $actual, 'Conditions evaluator always think Customer is matching conditions'); - } - + /** + * Test vatiable comparison + * + * @covers Thelia\Condition\ConditionEvaluator::variableOpComparison + */ public function testVariableOpComparisonSuccess() { $conditionEvaluator = new ConditionEvaluator(); @@ -409,6 +90,11 @@ class ConditionEvaluatorTest extends \PHPUnit_Framework_TestCase } + /** + * Test vatiable comparison + * + * @covers Thelia\Condition\ConditionEvaluator::variableOpComparison + */ public function testVariableOpComparisonFail() { $conditionEvaluator = new ConditionEvaluator(); @@ -440,7 +126,10 @@ class ConditionEvaluatorTest extends \PHPUnit_Framework_TestCase } /** + * Test vatiable comparison + * * @expectedException \Exception + * @covers Thelia\Condition\ConditionEvaluator::variableOpComparison */ public function testVariableOpComparisonException() { @@ -450,6 +139,68 @@ class ConditionEvaluatorTest extends \PHPUnit_Framework_TestCase $this->assertEquals($expected, $actual); } + /** + * Test condition collection matching + * + * @covers Thelia\Condition\ConditionEvaluator::isMatching + */ + public function testIsMatchingTrue() + { + $stubConditionTrue1 = $this->getMockBuilder('\Thelia\Condition\Implementation\MatchForXArticles') + ->disableOriginalConstructor() + ->getMock(); + $stubConditionTrue1->expects($this->any()) + ->method('isMatching') + ->will($this->returnValue(true)); + + $stubConditionTrue2 = $this->getMockBuilder('\Thelia\Condition\Implementation\MatchForXArticles') + ->disableOriginalConstructor() + ->getMock(); + $stubConditionTrue2->expects($this->any()) + ->method('isMatching') + ->will($this->returnValue(true)); + + $collection = new ConditionCollection(); + $collection->add($stubConditionTrue1); + $collection->add($stubConditionTrue2); + + $conitionEvaluator = new ConditionEvaluator(); + $actual = $conitionEvaluator->isMatching($collection); + + $this->assertTrue($actual); + } + + /** + * Test condition collection matching + * + * @covers Thelia\Condition\ConditionEvaluator::isMatching + */ + public function testIsMatchingFalse() + { + $stubConditionTrue = $this->getMockBuilder('\Thelia\Condition\Implementation\MatchForXArticles') + ->disableOriginalConstructor() + ->getMock(); + $stubConditionTrue->expects($this->any()) + ->method('isMatching') + ->will($this->returnValue(true)); + + $stubConditionFalse = $this->getMockBuilder('\Thelia\Condition\Implementation\MatchForXArticles') + ->disableOriginalConstructor() + ->getMock(); + $stubConditionFalse->expects($this->any()) + ->method('isMatching') + ->will($this->returnValue(false)); + + $collection = new ConditionCollection(); + $collection->add($stubConditionTrue); + $collection->add($stubConditionFalse); + + $conitionEvaluator = new ConditionEvaluator(); + $actual = $conitionEvaluator->isMatching($collection); + + $this->assertFalse($actual); + } + /** * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. diff --git a/core/lib/Thelia/Tests/Condition/ConditionFactoryTest.php b/core/lib/Thelia/Tests/Condition/ConditionFactoryTest.php index 28e81ee77..37fde4cea 100644 --- a/core/lib/Thelia/Tests/Condition/ConditionFactoryTest.php +++ b/core/lib/Thelia/Tests/Condition/ConditionFactoryTest.php @@ -27,7 +27,7 @@ use Thelia\Condition\ConditionEvaluator; use Thelia\Condition\ConditionFactory; use Thelia\Condition\Operators; use Thelia\Coupon\FacadeInterface; -use Thelia\Coupon\ConditionCollection; +use Thelia\Condition\ConditionCollection; use Thelia\Model\CurrencyQuery; /** @@ -84,7 +84,7 @@ class ConditionFactoryTest extends \PHPUnit_Framework_TestCase ->getMock(); $stubContainer->expects($this->any()) ->method('get') - ->will($this->returnValue(new MatchForTotalAmountManager($stubFacade))); + ->will($this->returnValue(new MatchForTotalAmount($stubFacade))); $stubContainer->expects($this->any()) ->method('has') @@ -94,14 +94,14 @@ class ConditionFactoryTest extends \PHPUnit_Framework_TestCase ->method('getContainer') ->will($this->returnValue($stubContainer)); - $condition1 = new MatchForTotalAmountManager($stubFacade); + $condition1 = new MatchForTotalAmount($stubFacade); $operators = array( - MatchForTotalAmountManager::INPUT1 => Operators::SUPERIOR, - MatchForTotalAmountManager::INPUT2 => Operators::EQUAL + MatchForTotalAmount::INPUT1 => Operators::SUPERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL ); $values = array( - MatchForTotalAmountManager::INPUT1 => 40.00, - MatchForTotalAmountManager::INPUT2 => 'EUR' + MatchForTotalAmount::INPUT1 => 40.00, + MatchForTotalAmount::INPUT2 => 'EUR' ); $condition1->setValidatorsFromForm($operators, $values); @@ -148,7 +148,7 @@ class ConditionFactoryTest extends \PHPUnit_Framework_TestCase ->getMock(); $stubContainer->expects($this->any()) ->method('get') - ->will($this->returnValue(new MatchForTotalAmountManager($stubFacade))); + ->will($this->returnValue(new MatchForTotalAmount($stubFacade))); $stubContainer->expects($this->any()) ->method('has') @@ -158,14 +158,14 @@ class ConditionFactoryTest extends \PHPUnit_Framework_TestCase ->method('getContainer') ->will($this->returnValue($stubContainer)); - $condition1 = new MatchForTotalAmountManager($stubFacade); + $condition1 = new MatchForTotalAmount($stubFacade); $operators = array( - MatchForTotalAmountManager::INPUT1 => Operators::SUPERIOR, - MatchForTotalAmountManager::INPUT2 => Operators::EQUAL + MatchForTotalAmount::INPUT1 => Operators::SUPERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL ); $values = array( - MatchForTotalAmountManager::INPUT1 => 40.00, - MatchForTotalAmountManager::INPUT2 => 'EUR' + MatchForTotalAmount::INPUT1 => 40.00, + MatchForTotalAmount::INPUT2 => 'EUR' ); $condition1->setValidatorsFromForm($operators, $values); @@ -210,7 +210,7 @@ class ConditionFactoryTest extends \PHPUnit_Framework_TestCase ->getMock(); $stubContainer->expects($this->any()) ->method('get') - ->will($this->returnValue(new MatchForTotalAmountManager($stubFacade))); + ->will($this->returnValue(new MatchForTotalAmount($stubFacade))); $stubContainer->expects($this->any()) ->method('has') @@ -220,25 +220,25 @@ class ConditionFactoryTest extends \PHPUnit_Framework_TestCase ->method('getContainer') ->will($this->returnValue($stubContainer)); - $condition1 = new MatchForTotalAmountManager($stubFacade); + $condition1 = new MatchForTotalAmount($stubFacade); $operators = array( - MatchForTotalAmountManager::INPUT1 => Operators::SUPERIOR, - MatchForTotalAmountManager::INPUT2 => Operators::EQUAL + MatchForTotalAmount::INPUT1 => Operators::SUPERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL ); $values = array( - MatchForTotalAmountManager::INPUT1 => 40.00, - MatchForTotalAmountManager::INPUT2 => 'EUR' + MatchForTotalAmount::INPUT1 => 40.00, + MatchForTotalAmount::INPUT2 => 'EUR' ); $condition1->setValidatorsFromForm($operators, $values); - $condition2 = new MatchForTotalAmountManager($stubFacade); + $condition2 = new MatchForTotalAmount($stubFacade); $operators = array( - MatchForTotalAmountManager::INPUT1 => Operators::SUPERIOR, - MatchForTotalAmountManager::INPUT2 => Operators::EQUAL + MatchForTotalAmount::INPUT1 => Operators::SUPERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL ); $values = array( - MatchForTotalAmountManager::INPUT1 => 400.00, - MatchForTotalAmountManager::INPUT2 => 'EUR' + MatchForTotalAmount::INPUT1 => 400.00, + MatchForTotalAmount::INPUT2 => 'EUR' ); $condition2->setValidatorsFromForm($operators, $values); @@ -287,7 +287,7 @@ class ConditionFactoryTest extends \PHPUnit_Framework_TestCase $stubContainer = $this->getMockBuilder('\Symfony\Component\DependencyInjection\Container') ->disableOriginalConstructor() ->getMock(); - $condition1 = new MatchForTotalAmountManager($stubFacade); + $condition1 = new MatchForTotalAmount($stubFacade); $stubContainer->expects($this->any()) ->method('get') ->will($this->returnValue($condition1)); @@ -301,12 +301,12 @@ class ConditionFactoryTest extends \PHPUnit_Framework_TestCase ->will($this->returnValue($stubContainer)); $operators = array( - MatchForTotalAmountManager::INPUT1 => Operators::SUPERIOR, - MatchForTotalAmountManager::INPUT2 => Operators::EQUAL + MatchForTotalAmount::INPUT1 => Operators::SUPERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL ); $values = array( - MatchForTotalAmountManager::INPUT1 => 40.00, - MatchForTotalAmountManager::INPUT2 => 'EUR' + MatchForTotalAmount::INPUT1 => 40.00, + MatchForTotalAmount::INPUT2 => 'EUR' ); $condition1->setValidatorsFromForm($operators, $values); @@ -352,7 +352,7 @@ class ConditionFactoryTest extends \PHPUnit_Framework_TestCase $stubContainer = $this->getMockBuilder('\Symfony\Component\DependencyInjection\Container') ->disableOriginalConstructor() ->getMock(); - $condition1 = new MatchForTotalAmountManager($stubFacade); + $condition1 = new MatchForTotalAmount($stubFacade); $stubContainer->expects($this->any()) ->method('get') ->will($this->returnValue($condition1)); @@ -366,12 +366,12 @@ class ConditionFactoryTest extends \PHPUnit_Framework_TestCase ->will($this->returnValue($stubContainer)); $operators = array( - MatchForTotalAmountManager::INPUT1 => Operators::SUPERIOR, - MatchForTotalAmountManager::INPUT2 => Operators::EQUAL + MatchForTotalAmount::INPUT1 => Operators::SUPERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL ); $values = array( - MatchForTotalAmountManager::INPUT1 => 40.00, - MatchForTotalAmountManager::INPUT2 => 'EUR' + MatchForTotalAmount::INPUT1 => 40.00, + MatchForTotalAmount::INPUT2 => 'EUR' ); $condition1->setValidatorsFromForm($operators, $values); @@ -387,6 +387,66 @@ class ConditionFactoryTest extends \PHPUnit_Framework_TestCase } + /** + * Test condition serialization if collection is empty + * + * @covers Thelia\Condition\ConditionFactory::serializeConditionCollection + */ + public function testSerializeConditionCollectionEmpty() + { + $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator') + ->disableOriginalConstructor() + ->getMock(); + + /** @var FacadeInterface $stubFacade */ + $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade') + ->disableOriginalConstructor() + ->getMock(); + + $stubFacade->expects($this->any()) + ->method('getTranslator') + ->will($this->returnValue($stubTranslator)); + $stubFacade->expects($this->any()) + ->method('getConditionEvaluator') + ->will($this->returnValue(new ConditionEvaluator())); + + $currencies = CurrencyQuery::create(); + $currencies = $currencies->find(); + $stubFacade->expects($this->any()) + ->method('getAvailableCurrencies') + ->will($this->returnValue($currencies)); + + $stubContainer = $this->getMockBuilder('\Symfony\Component\DependencyInjection\Container') + ->disableOriginalConstructor() + ->getMock(); + $stubContainer->expects($this->any()) + ->method('get') + ->will($this->returnValue(new MatchForEveryone($stubFacade))); + + $stubContainer->expects($this->any()) + ->method('has') + ->will($this->returnValue(true)); + + $stubFacade->expects($this->any()) + ->method('getContainer') + ->will($this->returnValue($stubContainer)); + + + $conditions = new ConditionCollection(); + + $conditionFactory = new ConditionFactory($stubContainer); + + + $conditionNone = new MatchForEveryone($stubFacade); + $expectedCollection = new ConditionCollection(); + $expectedCollection->add($conditionNone); + + $expected = $conditionFactory->serializeConditionCollection($expectedCollection); + $actual = $conditionFactory->serializeConditionCollection($conditions); + + $this->assertEquals($expected, $actual); + } + /** * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. diff --git a/core/lib/Thelia/Tests/Condition/Implementation/MatchForEveryoneManagerTest.php b/core/lib/Thelia/Tests/Condition/Implementation/MatchForEveryoneTest.php similarity index 58% rename from core/lib/Thelia/Tests/Condition/Implementation/MatchForEveryoneManagerTest.php rename to core/lib/Thelia/Tests/Condition/Implementation/MatchForEveryoneTest.php index ba097f750..f59fe04ef 100644 --- a/core/lib/Thelia/Tests/Condition/Implementation/MatchForEveryoneManagerTest.php +++ b/core/lib/Thelia/Tests/Condition/Implementation/MatchForEveryoneTest.php @@ -33,13 +33,13 @@ use Thelia\Model\Currency; * Date: 8/19/13 * Time: 3:24 PM * - * Unit Test MatchForEveryoneManager Class + * Unit Test MatchForEveryone Class * * @package Condition * @author Guillaume MOREL * */ -class MatchForEveryoneManagerTest extends \PHPUnit_Framework_TestCase +class MatchForEveryoneTest extends \PHPUnit_Framework_TestCase { /** @var FacadeInterface $stubTheliaAdapter */ protected $stubTheliaAdapter = null; @@ -49,10 +49,11 @@ class MatchForEveryoneManagerTest extends \PHPUnit_Framework_TestCase * * @param int $cartTotalPrice Cart total price * @param string $checkoutCurrency Checkout currency + * @param string $i18nOutput Output from each translation * * @return \PHPUnit_Framework_MockObject_MockObject */ - public function generateAdapterStub($cartTotalPrice = 400, $checkoutCurrency = 'EUR') + public function generateFacadeStub($cartTotalPrice = 400, $checkoutCurrency = 'EUR', $i18nOutput = '') { $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade') ->disableOriginalConstructor() @@ -70,6 +71,17 @@ class MatchForEveryoneManagerTest extends \PHPUnit_Framework_TestCase ->method('getConditionEvaluator') ->will($this->returnValue(new ConditionEvaluator())); + $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator') + ->disableOriginalConstructor() + ->getMock(); + $stubTranslator->expects($this->any()) + ->method('trans') + ->will($this->returnValue($i18nOutput)); + + $stubFacade->expects($this->any()) + ->method('getTranslator') + ->will($this->returnValue($stubTranslator)); + $currency1 = new Currency(); $currency1->setCode('EUR'); $currency2 = new Currency(); @@ -84,15 +96,15 @@ class MatchForEveryoneManagerTest extends \PHPUnit_Framework_TestCase /** * Check if validity test on BackOffice inputs are working * - * @covers Thelia\Condition\Implementation\MatchForEveryoneManager::setValidators + * @covers Thelia\Condition\Implementation\MatchForEveryone::setValidators * */ public function testValidBackOfficeInputOperator() { - $stubFacade = $this->generateAdapterStub(399, 'EUR'); + $stubFacade = $this->generateFacadeStub(399, 'EUR'); /** @var FacadeInterface $stubFacade */ - $condition1 = new MatchForEveryoneManager($stubFacade); + $condition1 = new MatchForEveryone($stubFacade); $operators = array(); $values = array(); $condition1->setValidatorsFromForm($operators, $values); @@ -107,15 +119,15 @@ class MatchForEveryoneManagerTest extends \PHPUnit_Framework_TestCase /** * Check if condition is always matching * - * @covers Thelia\Condition\Implementation\MatchForEveryoneManager::isMatching + * @covers Thelia\Condition\Implementation\MatchForEveryone::isMatching * */ public function testIsMatching() { - $stubFacade = $this->generateAdapterStub(399, 'EUR'); + $stubFacade = $this->generateFacadeStub(399, 'EUR'); /** @var FacadeInterface $stubFacade */ - $condition1 = new MatchForEveryoneManager($stubFacade); + $condition1 = new MatchForEveryone($stubFacade); $isValid = $condition1->isMatching(); @@ -124,4 +136,67 @@ class MatchForEveryoneManagerTest extends \PHPUnit_Framework_TestCase $this->assertEquals($expected, $actual); } + /** + * Check getName i18n + * + * @covers Thelia\Condition\Implementation\MatchForEveryone::getName + * + */ + public function testGetName() + { + $stubFacade = $this->generateFacadeStub(399, 'EUR', 'Everybody can use it (no condition)'); + + /** @var FacadeInterface $stubFacade */ + $condition1 = new MatchForEveryone($stubFacade); + + $actual = $condition1->getName(); + $expected = 'Everybody can use it (no condition)'; + $this->assertEquals($expected, $actual); + } + + /** + * Check tooltip i18n + * + * @covers Thelia\Condition\Implementation\MatchForEveryone::getToolTip + * + */ + public function testGetToolTip() + { + $stubFacade = $this->generateFacadeStub(399, 'EUR', 'Will return always true'); + + /** @var FacadeInterface $stubFacade */ + $condition1 = new MatchForEveryone($stubFacade); + + $actual = $condition1->getToolTip(); + $expected = 'Will return always true'; + $this->assertEquals($expected, $actual); + } + + /** + * Check validator + * + * @covers Thelia\Condition\Implementation\MatchForEveryone::generateInputs + * @covers Thelia\Condition\Implementation\MatchForEveryone::setValidatorsFromForm + */ + public function testGetValidator() + { + $stubFacade = $this->generateFacadeStub(399, 'EUR'); + + /** @var FacadeInterface $stubFacade */ + $condition1 = new MatchForEveryone($stubFacade); + $actual1 = $condition1->setValidatorsFromForm(array(), array()); + $expected1 = $condition1; + $actual2 = $condition1->getValidators(); + + $validators = array(); + $validators['inputs'] = array(); + $validators['setOperators'] = array(); + $validators['setValues'] = array(); + $expected2 = $validators; + + $this->assertEquals($expected1, $actual1); + $this->assertEquals($expected2, $actual2); + + + } } diff --git a/core/lib/Thelia/Tests/Condition/Implementation/MatchForTotalAmountManagerTest.php b/core/lib/Thelia/Tests/Condition/Implementation/MatchForTotalAmountManagerTest.php deleted file mode 100644 index 465f27225..000000000 --- a/core/lib/Thelia/Tests/Condition/Implementation/MatchForTotalAmountManagerTest.php +++ /dev/null @@ -1,610 +0,0 @@ -. */ -/* */ -/**********************************************************************************/ - -namespace Thelia\Condition\Implementation; - -use Thelia\Condition\ConditionEvaluator; -use Thelia\Condition\Operators; -use Thelia\Coupon\FacadeInterface; -use Thelia\Exception\InvalidConditionValueException; -use Thelia\Model\Currency; - -/** - * Created by JetBrains PhpStorm. - * Date: 8/19/13 - * Time: 3:24 PM - * - * Unit Test MatchForTotalAmountManager Class - * - * @package Condition - * @author Guillaume MOREL - * - */ -class MatchForTotalAmountManagerTest extends \PHPUnit_Framework_TestCase -{ - /** @var FacadeInterface $stubTheliaAdapter */ - protected $stubTheliaAdapter = null; - - /** - * Generate adapter stub - * - * @param int $cartTotalPrice Cart total price - * @param string $checkoutCurrency Checkout currency - * - * @return \PHPUnit_Framework_MockObject_MockObject - */ - public function generateAdapterStub($cartTotalPrice = 400, $checkoutCurrency = 'EUR') - { - $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade') - ->disableOriginalConstructor() - ->getMock(); - - $stubFacade->expects($this->any()) - ->method('getCartTotalPrice') - ->will($this->returnValue($cartTotalPrice)); - - $stubFacade->expects($this->any()) - ->method('getCheckoutCurrency') - ->will($this->returnValue($checkoutCurrency)); - - $stubFacade->expects($this->any()) - ->method('getConditionEvaluator') - ->will($this->returnValue(new ConditionEvaluator())); - - $currency1 = new Currency(); - $currency1->setCode('EUR'); - $currency2 = new Currency(); - $currency2->setCode('USD'); - $stubFacade->expects($this->any()) - ->method('getAvailableCurrencies') - ->will($this->returnValue(array($currency1, $currency2))); - - return $stubFacade; - } - - /** - * Sets up the fixture, for example, opens a network connection. - * This method is called before a test is executed. - */ - protected function setUp() - { - - } - - /** - * Check if validity test on BackOffice inputs are working - * - * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::setValidators - * @expectedException \Thelia\Exception\InvalidConditionOperatorException - * - */ - public function testInValidBackOfficeInputOperator() - { - $stubFacade = $this->generateAdapterStub(399, 'EUR'); - - /** @var FacadeInterface $stubFacade */ - $condition1 = new MatchForTotalAmountManager($stubFacade); - $operators = array( - MatchForTotalAmountManager::INPUT1 => Operators::IN, - MatchForTotalAmountManager::INPUT2 => Operators::EQUAL - ); - $values = array( - MatchForTotalAmountManager::INPUT1 => '400', - MatchForTotalAmountManager::INPUT2 => 'EUR'); - $condition1->setValidatorsFromForm($operators, $values); - - $isValid = $condition1->isMatching(); - - $expected = true; - $actual =$isValid; - $this->assertEquals($expected, $actual); - } - - /** - * Check if validity test on BackOffice inputs are working - * - * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::setValidators - * @expectedException \Thelia\Exception\InvalidConditionOperatorException - * - */ - public function testInValidBackOfficeInputOperator2() - { - $stubFacade = $this->generateAdapterStub(399, 'EUR'); - - /** @var FacadeInterface $stubFacade */ - $condition1 = new MatchForTotalAmountManager($stubFacade); - $operators = array( - MatchForTotalAmountManager::INPUT1 => Operators::SUPERIOR, - MatchForTotalAmountManager::INPUT2 => Operators::INFERIOR - ); - $values = array( - MatchForTotalAmountManager::INPUT1 => '400', - MatchForTotalAmountManager::INPUT2 => 'EUR'); - $condition1->setValidatorsFromForm($operators, $values); - - $isValid = $condition1->isMatching(); - - $expected = true; - $actual =$isValid; - $this->assertEquals($expected, $actual); - } - - /** - * Check if validity test on BackOffice inputs are working - * - * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::setValidators - * @expectedException \Thelia\Exception\InvalidConditionValueException - * - */ - public function testInValidBackOfficeInputValue() - { - /** @var FacadeInterface $stubFacade */ - $stubFacade = $this->generateAdapterStub(399, 'EUR'); - - $condition1 = new MatchForTotalAmountManager($stubFacade); - $operators = array( - MatchForTotalAmountManager::INPUT1 => Operators::SUPERIOR, - MatchForTotalAmountManager::INPUT2 => Operators::EQUAL - ); - $values = array( - MatchForTotalAmountManager::INPUT1 => 'X', - MatchForTotalAmountManager::INPUT2 => 'EUR'); - $condition1->setValidatorsFromForm($operators, $values); - - $isValid = $condition1->isMatching(); - - $expected = true; - $actual =$isValid; - $this->assertEquals($expected, $actual); - } - - /** - * Check if validity test on BackOffice inputs are working - * - * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::setValidators - * @expectedException \Thelia\Exception\InvalidConditionValueException - * - */ - public function testInValidBackOfficeInputValue2() - { - /** @var FacadeInterface $stubFacade */ - $stubFacade = $this->generateAdapterStub(399, 'EUR'); - - $condition1 = new MatchForTotalAmountManager($stubFacade); - $operators = array( - MatchForTotalAmountManager::INPUT1 => Operators::SUPERIOR, - MatchForTotalAmountManager::INPUT2 => Operators::EQUAL - ); - $values = array( - MatchForTotalAmountManager::INPUT1 => 400, - MatchForTotalAmountManager::INPUT2 => 'FLA'); - $condition1->setValidatorsFromForm($operators, $values); - - $isValid = $condition1->isMatching(); - - $expected = true; - $actual =$isValid; - $this->assertEquals($expected, $actual); - } - - /** - * Check if test inferior operator is working - * - * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::isMatching - * - */ - public function testMatchingConditionInferior() - { - /** @var FacadeInterface $stubFacade */ - $stubFacade = $this->generateAdapterStub(399, 'EUR'); - - $condition1 = new MatchForTotalAmountManager($stubFacade); - $operators = array( - MatchForTotalAmountManager::INPUT1 => Operators::INFERIOR, - MatchForTotalAmountManager::INPUT2 => Operators::EQUAL - ); - $values = array( - MatchForTotalAmountManager::INPUT1 => 400.00, - MatchForTotalAmountManager::INPUT2 => 'EUR'); - $condition1->setValidatorsFromForm($operators, $values); - - $isValid = $condition1->isMatching(); - - $expected = true; - $actual =$isValid; - $this->assertEquals($expected, $actual); - } - - /** - * Check if test inferior operator is working - * - * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::isMatching - * - */ - public function testNotMatchingConditionInferior() - { - /** @var FacadeInterface $stubFacade */ - $stubFacade = $this->generateAdapterStub(400, 'EUR'); - - $condition1 = new MatchForTotalAmountManager($stubFacade); - $operators = array( - MatchForTotalAmountManager::INPUT1 => Operators::INFERIOR, - MatchForTotalAmountManager::INPUT2 => Operators::EQUAL - ); - $values = array( - MatchForTotalAmountManager::INPUT1 => 400.00, - MatchForTotalAmountManager::INPUT2 => 'EUR'); - $condition1->setValidatorsFromForm($operators, $values); - - $isValid = $condition1->isMatching(); - - $expected = false; - $actual =$isValid; - $this->assertEquals($expected, $actual); - } - - /** - * Check if test inferior operator is working - * - * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::isMatching - * - */ - public function testMatchingConditionInferiorEquals() - { - /** @var FacadeInterface $stubFacade */ - $stubFacade = $this->generateAdapterStub(400, 'EUR'); - - $condition1 = new MatchForTotalAmountManager($stubFacade); - $operators = array( - MatchForTotalAmountManager::INPUT1 => Operators::INFERIOR_OR_EQUAL, - MatchForTotalAmountManager::INPUT2 => Operators::EQUAL - ); - $values = array( - MatchForTotalAmountManager::INPUT1 => 400.00, - MatchForTotalAmountManager::INPUT2 => 'EUR'); - $condition1->setValidatorsFromForm($operators, $values); - - $isValid = $condition1->isMatching(); - - $expected = true; - $actual =$isValid; - $this->assertEquals($expected, $actual); - } - - /** - * Check if test inferior operator is working - * - * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::isMatching - * - */ - public function testMatchingConditionInferiorEquals2() - { - /** @var FacadeInterface $stubFacade */ - $stubFacade = $this->generateAdapterStub(399, 'EUR'); - - $condition1 = new MatchForTotalAmountManager($stubFacade); - $operators = array( - MatchForTotalAmountManager::INPUT1 => Operators::INFERIOR_OR_EQUAL, - MatchForTotalAmountManager::INPUT2 => Operators::EQUAL - ); - $values = array( - MatchForTotalAmountManager::INPUT1 => 400.00, - MatchForTotalAmountManager::INPUT2 => 'EUR'); - $condition1->setValidatorsFromForm($operators, $values); - - $isValid = $condition1->isMatching(); - - $expected = true; - $actual =$isValid; - $this->assertEquals($expected, $actual); - } - - /** - * Check if test inferior operator is working - * - * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::isMatching - * - */ - public function testNotMatchingConditionInferiorEquals() - { - /** @var FacadeInterface $stubFacade */ - $stubFacade = $this->generateAdapterStub(401, 'EUR'); - - $condition1 = new MatchForTotalAmountManager($stubFacade); - $operators = array( - MatchForTotalAmountManager::INPUT1 => Operators::INFERIOR_OR_EQUAL, - MatchForTotalAmountManager::INPUT2 => Operators::EQUAL - ); - $values = array( - MatchForTotalAmountManager::INPUT1 => 400.00, - MatchForTotalAmountManager::INPUT2 => 'EUR'); - $condition1->setValidatorsFromForm($operators, $values); - - $isValid = $condition1->isMatching(); - - $expected = false; - $actual =$isValid; - $this->assertEquals($expected, $actual); - } - - /** - * Check if test equals operator is working - * - * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::isMatching - * - */ - public function testMatchingConditionEqual() - { - /** @var FacadeInterface $stubFacade */ - $stubFacade = $this->generateAdapterStub(400, 'EUR'); - - $condition1 = new MatchForTotalAmountManager($stubFacade); - $operators = array( - MatchForTotalAmountManager::INPUT1 => Operators::EQUAL, - MatchForTotalAmountManager::INPUT2 => Operators::EQUAL - ); - $values = array( - MatchForTotalAmountManager::INPUT1 => 400.00, - MatchForTotalAmountManager::INPUT2 => 'EUR'); - $condition1->setValidatorsFromForm($operators, $values); - - $isValid = $condition1->isMatching(); - - $expected = true; - $actual =$isValid; - $this->assertEquals($expected, $actual); - } - - /** - * Check if test equals operator is working - * - * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::isMatching - * - */ - public function testNotMatchingConditionEqual() - { - /** @var FacadeInterface $stubFacade */ - $stubFacade = $this->generateAdapterStub(399, 'EUR'); - - $condition1 = new MatchForTotalAmountManager($stubFacade); - $operators = array( - MatchForTotalAmountManager::INPUT1 => Operators::EQUAL, - MatchForTotalAmountManager::INPUT2 => Operators::EQUAL - ); - $values = array( - MatchForTotalAmountManager::INPUT1 => 400.00, - MatchForTotalAmountManager::INPUT2 => 'EUR'); - $condition1->setValidatorsFromForm($operators, $values); - - $isValid = $condition1->isMatching(); - - $expected = false; - $actual =$isValid; - $this->assertEquals($expected, $actual); - } - - /** - * Check if test superior operator is working - * - * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::isMatching - * - */ - public function testMatchingConditionSuperiorEquals() - { - /** @var FacadeInterface $stubFacade */ - $stubFacade = $this->generateAdapterStub(401, 'EUR'); - - $condition1 = new MatchForTotalAmountManager($stubFacade); - $operators = array( - MatchForTotalAmountManager::INPUT1 => Operators::SUPERIOR_OR_EQUAL, - MatchForTotalAmountManager::INPUT2 => Operators::EQUAL - ); - $values = array( - MatchForTotalAmountManager::INPUT1 => 400.00, - MatchForTotalAmountManager::INPUT2 => 'EUR'); - $condition1->setValidatorsFromForm($operators, $values); - - $isValid = $condition1->isMatching(); - - $expected = true; - $actual =$isValid; - $this->assertEquals($expected, $actual); - } - - /** - * Check if test superior operator is working - * - * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::isMatching - * - */ - public function testMatchingConditionSuperiorEquals2() - { - /** @var FacadeInterface $stubFacade */ - $stubFacade = $this->generateAdapterStub(400, 'EUR'); - - $condition1 = new MatchForTotalAmountManager($stubFacade); - $operators = array( - MatchForTotalAmountManager::INPUT1 => Operators::SUPERIOR_OR_EQUAL, - MatchForTotalAmountManager::INPUT2 => Operators::EQUAL - ); - $values = array( - MatchForTotalAmountManager::INPUT1 => 400.00, - MatchForTotalAmountManager::INPUT2 => 'EUR'); - $condition1->setValidatorsFromForm($operators, $values); - - $isValid = $condition1->isMatching(); - - $expected = true; - $actual =$isValid; - $this->assertEquals($expected, $actual); - } - - /** - * Check if test superior operator is working - * - * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::isMatching - * - */ - public function testNotMatchingConditionSuperiorEquals() - { - /** @var FacadeInterface $stubFacade */ - $stubFacade = $this->generateAdapterStub(399, 'EUR'); - - $condition1 = new MatchForTotalAmountManager($stubFacade); - $operators = array( - MatchForTotalAmountManager::INPUT1 => Operators::SUPERIOR_OR_EQUAL, - MatchForTotalAmountManager::INPUT2 => Operators::EQUAL - ); - $values = array( - MatchForTotalAmountManager::INPUT1 => 400.00, - MatchForTotalAmountManager::INPUT2 => 'EUR'); - $condition1->setValidatorsFromForm($operators, $values); - - $isValid = $condition1->isMatching(); - - $expected = false; - $actual =$isValid; - $this->assertEquals($expected, $actual); - } - - /** - * Check if test superior operator is working - * - * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::isMatching - * - */ - public function testMatchingConditionSuperior() - { - /** @var FacadeInterface $stubFacade */ - $stubFacade = $this->generateAdapterStub(401, 'EUR'); - - $condition1 = new MatchForTotalAmountManager($stubFacade); - $operators = array( - MatchForTotalAmountManager::INPUT1 => Operators::SUPERIOR, - MatchForTotalAmountManager::INPUT2 => Operators::EQUAL - ); - $values = array( - MatchForTotalAmountManager::INPUT1 => 400.00, - MatchForTotalAmountManager::INPUT2 => 'EUR'); - $condition1->setValidatorsFromForm($operators, $values); - - $isValid = $condition1->isMatching(); - - $expected = true; - $actual =$isValid; - $this->assertEquals($expected, $actual); - } - - /** - * Check if test superior operator is working - * - * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::isMatching - * - */ - public function testNotMatchingConditionSuperior() - { - /** @var FacadeInterface $stubFacade */ - $stubFacade = $this->generateAdapterStub(399, 'EUR'); - - $condition1 = new MatchForTotalAmountManager($stubFacade); - $operators = array( - MatchForTotalAmountManager::INPUT1 => Operators::SUPERIOR, - MatchForTotalAmountManager::INPUT2 => Operators::EQUAL - ); - $values = array( - MatchForTotalAmountManager::INPUT1 => 400.00, - MatchForTotalAmountManager::INPUT2 => 'EUR'); - $condition1->setValidatorsFromForm($operators, $values); - - $isValid = $condition1->isMatching(); - - $expected = false; - $actual =$isValid; - $this->assertEquals($expected, $actual); - } - - /** - * Check currency is checked - * - * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::isMatching - * - */ - public function testMatchingConditionCurrency() - { - /** @var FacadeInterface $stubFacade */ - $stubFacade = $this->generateAdapterStub(400, 'EUR'); - - $condition1 = new MatchForTotalAmountManager($stubFacade); - $operators = array( - MatchForTotalAmountManager::INPUT1 => Operators::EQUAL, - MatchForTotalAmountManager::INPUT2 => Operators::EQUAL - ); - $values = array( - MatchForTotalAmountManager::INPUT1 => 400.00, - MatchForTotalAmountManager::INPUT2 => 'EUR'); - $condition1->setValidatorsFromForm($operators, $values); - - $isValid = $condition1->isMatching(); - - $expected = true; - $actual =$isValid; - $this->assertEquals($expected, $actual); - } - - /** - * Check currency is checked - * - * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::isMatching - * - */ - public function testNotMatchingConditionCurrency() - { - /** @var FacadeInterface $stubFacade */ - $stubFacade = $this->generateAdapterStub(400.00, 'EUR'); - - $condition1 = new MatchForTotalAmountManager($stubFacade); - $operators = array( - MatchForTotalAmountManager::INPUT1 => Operators::EQUAL, - MatchForTotalAmountManager::INPUT2 => Operators::EQUAL - ); - $values = array( - MatchForTotalAmountManager::INPUT1 => 400.00, - MatchForTotalAmountManager::INPUT2 => 'USD'); - $condition1->setValidatorsFromForm($operators, $values); - - $isValid = $condition1->isMatching(); - - $expected = false; - $actual =$isValid; - $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() - { - } - -} diff --git a/core/lib/Thelia/Tests/Condition/Implementation/MatchForTotalAmountTest.php b/core/lib/Thelia/Tests/Condition/Implementation/MatchForTotalAmountTest.php new file mode 100644 index 000000000..d28bf198d --- /dev/null +++ b/core/lib/Thelia/Tests/Condition/Implementation/MatchForTotalAmountTest.php @@ -0,0 +1,976 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Condition\Implementation; + +use Thelia\Condition\ConditionEvaluator; +use Thelia\Condition\ConditionFactory; +use Thelia\Condition\Operators; +use Thelia\Condition\ConditionCollection; +use Thelia\Coupon\FacadeInterface; +use Thelia\Exception\InvalidConditionValueException; +use Thelia\Model\Currency; +use Thelia\Model\CurrencyQuery; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Unit Test MatchForTotalAmount Class + * + * @package Condition + * @author Guillaume MOREL + * + */ +class MatchForTotalAmountTest extends \PHPUnit_Framework_TestCase +{ + /** @var FacadeInterface $stubTheliaAdapter */ + protected $stubTheliaAdapter = null; + + /** + * Generate adapter stub + * + * @param int $cartTotalPrice Cart total price + * @param string $checkoutCurrency Checkout currency + * + * @return \PHPUnit_Framework_MockObject_MockObject + */ + public function generateAdapterStub($cartTotalPrice = 400, $checkoutCurrency = 'EUR') + { + $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade') + ->disableOriginalConstructor() + ->getMock(); + + $stubFacade->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue($cartTotalPrice)); + + $stubFacade->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue($checkoutCurrency)); + + $stubFacade->expects($this->any()) + ->method('getConditionEvaluator') + ->will($this->returnValue(new ConditionEvaluator())); + + $currency1 = new Currency(); + $currency1->setCode('EUR'); + $currency2 = new Currency(); + $currency2->setCode('USD'); + $stubFacade->expects($this->any()) + ->method('getAvailableCurrencies') + ->will($this->returnValue(array($currency1, $currency2))); + + return $stubFacade; + } + + /** + * Sets up the fixture, for example, opens a network connection. + * This method is called before a test is executed. + */ + protected function setUp() + { + + } + + /** + * Check if validity test on BackOffice inputs are working + * + * @covers Thelia\Condition\Implementation\MatchForTotalAmount::setValidators + * @expectedException \Thelia\Exception\InvalidConditionOperatorException + * + */ + public function testInValidBackOfficeInputOperator() + { + $stubFacade = $this->generateAdapterStub(399, 'EUR'); + + /** @var FacadeInterface $stubFacade */ + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::IN, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => '400', + MatchForTotalAmount::INPUT2 => 'EUR'); + $condition1->setValidatorsFromForm($operators, $values); + + $isValid = $condition1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if validity test on BackOffice inputs are working + * + * @covers Thelia\Condition\Implementation\MatchForTotalAmount::setValidators + * @expectedException \Thelia\Exception\InvalidConditionOperatorException + * + */ + public function testInValidBackOfficeInputOperator2() + { + $stubFacade = $this->generateAdapterStub(399, 'EUR'); + + /** @var FacadeInterface $stubFacade */ + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::SUPERIOR, + MatchForTotalAmount::INPUT2 => Operators::INFERIOR + ); + $values = array( + MatchForTotalAmount::INPUT1 => '400', + MatchForTotalAmount::INPUT2 => 'EUR'); + $condition1->setValidatorsFromForm($operators, $values); + + $isValid = $condition1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if validity test on BackOffice inputs are working + * + * @covers Thelia\Condition\Implementation\MatchForTotalAmount::setValidators + * @expectedException \Thelia\Exception\InvalidConditionValueException + * + */ + public function testInValidBackOfficeInputValue() + { + /** @var FacadeInterface $stubFacade */ + $stubFacade = $this->generateAdapterStub(399, 'EUR'); + + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::SUPERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 'X', + MatchForTotalAmount::INPUT2 => 'EUR'); + $condition1->setValidatorsFromForm($operators, $values); + + $isValid = $condition1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if validity test on BackOffice inputs are working + * + * @covers Thelia\Condition\Implementation\MatchForTotalAmount::setValidators + * @expectedException \Thelia\Exception\InvalidConditionValueException + * + */ + public function testInValidBackOfficeInputValue2() + { + /** @var FacadeInterface $stubFacade */ + $stubFacade = $this->generateAdapterStub(399, 'EUR'); + + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::SUPERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 400, + MatchForTotalAmount::INPUT2 => 'FLA'); + $condition1->setValidatorsFromForm($operators, $values); + + $isValid = $condition1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test inferior operator is working + * + * @covers Thelia\Condition\Implementation\MatchForTotalAmount::isMatching + * + */ + public function testMatchingConditionInferior() + { + /** @var FacadeInterface $stubFacade */ + $stubFacade = $this->generateAdapterStub(399, 'EUR'); + + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::INFERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 400.00, + MatchForTotalAmount::INPUT2 => 'EUR'); + $condition1->setValidatorsFromForm($operators, $values); + + $isValid = $condition1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test inferior operator is working + * + * @covers Thelia\Condition\Implementation\MatchForTotalAmount::isMatching + * + */ + public function testNotMatchingConditionInferior() + { + /** @var FacadeInterface $stubFacade */ + $stubFacade = $this->generateAdapterStub(400, 'EUR'); + + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::INFERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 400.00, + MatchForTotalAmount::INPUT2 => 'EUR'); + $condition1->setValidatorsFromForm($operators, $values); + + $isValid = $condition1->isMatching(); + + $expected = false; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test inferior operator is working + * + * @covers Thelia\Condition\Implementation\MatchForTotalAmount::isMatching + * + */ + public function testMatchingConditionInferiorEquals() + { + /** @var FacadeInterface $stubFacade */ + $stubFacade = $this->generateAdapterStub(400, 'EUR'); + + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::INFERIOR_OR_EQUAL, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 400.00, + MatchForTotalAmount::INPUT2 => 'EUR'); + $condition1->setValidatorsFromForm($operators, $values); + + $isValid = $condition1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test inferior operator is working + * + * @covers Thelia\Condition\Implementation\MatchForTotalAmount::isMatching + * + */ + public function testMatchingConditionInferiorEquals2() + { + /** @var FacadeInterface $stubFacade */ + $stubFacade = $this->generateAdapterStub(399, 'EUR'); + + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::INFERIOR_OR_EQUAL, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 400.00, + MatchForTotalAmount::INPUT2 => 'EUR'); + $condition1->setValidatorsFromForm($operators, $values); + + $isValid = $condition1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test inferior operator is working + * + * @covers Thelia\Condition\Implementation\MatchForTotalAmount::isMatching + * + */ + public function testNotMatchingConditionInferiorEquals() + { + /** @var FacadeInterface $stubFacade */ + $stubFacade = $this->generateAdapterStub(401, 'EUR'); + + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::INFERIOR_OR_EQUAL, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 400.00, + MatchForTotalAmount::INPUT2 => 'EUR'); + $condition1->setValidatorsFromForm($operators, $values); + + $isValid = $condition1->isMatching(); + + $expected = false; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test equals operator is working + * + * @covers Thelia\Condition\Implementation\MatchForTotalAmount::isMatching + * + */ + public function testMatchingConditionEqual() + { + /** @var FacadeInterface $stubFacade */ + $stubFacade = $this->generateAdapterStub(400, 'EUR'); + + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::EQUAL, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 400.00, + MatchForTotalAmount::INPUT2 => 'EUR'); + $condition1->setValidatorsFromForm($operators, $values); + + $isValid = $condition1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test equals operator is working + * + * @covers Thelia\Condition\Implementation\MatchForTotalAmount::isMatching + * + */ + public function testNotMatchingConditionEqual() + { + /** @var FacadeInterface $stubFacade */ + $stubFacade = $this->generateAdapterStub(399, 'EUR'); + + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::EQUAL, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 400.00, + MatchForTotalAmount::INPUT2 => 'EUR'); + $condition1->setValidatorsFromForm($operators, $values); + + $isValid = $condition1->isMatching(); + + $expected = false; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test superior operator is working + * + * @covers Thelia\Condition\Implementation\MatchForTotalAmount::isMatching + * + */ + public function testMatchingConditionSuperiorEquals() + { + /** @var FacadeInterface $stubFacade */ + $stubFacade = $this->generateAdapterStub(401, 'EUR'); + + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::SUPERIOR_OR_EQUAL, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 400.00, + MatchForTotalAmount::INPUT2 => 'EUR'); + $condition1->setValidatorsFromForm($operators, $values); + + $isValid = $condition1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test superior operator is working + * + * @covers Thelia\Condition\Implementation\MatchForTotalAmount::isMatching + * + */ + public function testMatchingConditionSuperiorEquals2() + { + /** @var FacadeInterface $stubFacade */ + $stubFacade = $this->generateAdapterStub(400, 'EUR'); + + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::SUPERIOR_OR_EQUAL, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 400.00, + MatchForTotalAmount::INPUT2 => 'EUR'); + $condition1->setValidatorsFromForm($operators, $values); + + $isValid = $condition1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test superior operator is working + * + * @covers Thelia\Condition\Implementation\MatchForTotalAmount::isMatching + * + */ + public function testNotMatchingConditionSuperiorEquals() + { + /** @var FacadeInterface $stubFacade */ + $stubFacade = $this->generateAdapterStub(399, 'EUR'); + + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::SUPERIOR_OR_EQUAL, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 400.00, + MatchForTotalAmount::INPUT2 => 'EUR'); + $condition1->setValidatorsFromForm($operators, $values); + + $isValid = $condition1->isMatching(); + + $expected = false; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test superior operator is working + * + * @covers Thelia\Condition\Implementation\MatchForTotalAmount::isMatching + * + */ + public function testMatchingConditionSuperior() + { + /** @var FacadeInterface $stubFacade */ + $stubFacade = $this->generateAdapterStub(401, 'EUR'); + + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::SUPERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 400.00, + MatchForTotalAmount::INPUT2 => 'EUR'); + $condition1->setValidatorsFromForm($operators, $values); + + $isValid = $condition1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test superior operator is working + * + * @covers Thelia\Condition\Implementation\MatchForTotalAmount::isMatching + * + */ + public function testNotMatchingConditionSuperior() + { + /** @var FacadeInterface $stubFacade */ + $stubFacade = $this->generateAdapterStub(399, 'EUR'); + + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::SUPERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 400.00, + MatchForTotalAmount::INPUT2 => 'EUR'); + $condition1->setValidatorsFromForm($operators, $values); + + $isValid = $condition1->isMatching(); + + $expected = false; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check currency is checked + * + * @covers Thelia\Condition\Implementation\MatchForTotalAmount::isMatching + * + */ + public function testMatchingConditionCurrency() + { + /** @var FacadeInterface $stubFacade */ + $stubFacade = $this->generateAdapterStub(400, 'EUR'); + + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::EQUAL, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 400.00, + MatchForTotalAmount::INPUT2 => 'EUR'); + $condition1->setValidatorsFromForm($operators, $values); + + $isValid = $condition1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check currency is checked + * + * @covers Thelia\Condition\Implementation\MatchForTotalAmount::isMatching + * + */ + public function testNotMatchingConditionCurrency() + { + /** @var FacadeInterface $stubFacade */ + $stubFacade = $this->generateAdapterStub(400.00, 'EUR'); + + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::EQUAL, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 400.00, + MatchForTotalAmount::INPUT2 => 'USD'); + $condition1->setValidatorsFromForm($operators, $values); + + $isValid = $condition1->isMatching(); + + $expected = false; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check unknown currency + * + * @covers Thelia\Condition\Implementation\ConditionAbstract::isCurrencyValid + * @expectedException \Thelia\Exception\InvalidConditionValueException + * + */ + public function testUnknownCurrencyCode() + { + $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator') + ->disableOriginalConstructor() + ->getMock(); + + /** @var FacadeInterface $stubFacade */ + $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade') + ->disableOriginalConstructor() + ->getMock(); + + $stubFacade->expects($this->any()) + ->method('getTranslator') + ->will($this->returnValue($stubTranslator)); + $stubFacade->expects($this->any()) + ->method('getConditionEvaluator') + ->will($this->returnValue(new ConditionEvaluator())); + + $currencies = CurrencyQuery::create(); + $currencies = $currencies->find(); + $stubFacade->expects($this->any()) + ->method('getAvailableCurrencies') + ->will($this->returnValue($currencies)); + + + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::EQUAL, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 400.00, + MatchForTotalAmount::INPUT2 => 'UNK'); + $condition1->setValidatorsFromForm($operators, $values); + + + $stubContainer = $this->getMockBuilder('\Symfony\Component\DependencyInjection\Container') + ->disableOriginalConstructor() + ->getMock(); + $stubContainer->expects($this->any()) + ->method('get') + ->will($this->returnValue($condition1)); + + $stubContainer->expects($this->any()) + ->method('has') + ->will($this->returnValue(true)); + + $stubFacade->expects($this->any()) + ->method('getContainer') + ->will($this->returnValue($stubContainer)); + + $conditionFactory = new ConditionFactory($stubContainer); + + $collection = new ConditionCollection(); + $collection->add($condition1); + + $serialized = $conditionFactory->serializeConditionCollection($collection); + $unserialized = $conditionFactory->unserializeConditionCollection($serialized); + } + + /** + * Check invalid currency + * + * @covers Thelia\Condition\Implementation\ConditionAbstract::isPriceValid + * @expectedException \Thelia\Exception\InvalidConditionValueException + * + */ + public function testInvalidCurrencyValue() + { + $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator') + ->disableOriginalConstructor() + ->getMock(); + + /** @var FacadeInterface $stubFacade */ + $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade') + ->disableOriginalConstructor() + ->getMock(); + + $stubFacade->expects($this->any()) + ->method('getTranslator') + ->will($this->returnValue($stubTranslator)); + $stubFacade->expects($this->any()) + ->method('getConditionEvaluator') + ->will($this->returnValue(new ConditionEvaluator())); + + $currencies = CurrencyQuery::create(); + $currencies = $currencies->find(); + $stubFacade->expects($this->any()) + ->method('getAvailableCurrencies') + ->will($this->returnValue($currencies)); + + + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::EQUAL, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 'notfloat', + MatchForTotalAmount::INPUT2 => 'EUR'); + $condition1->setValidatorsFromForm($operators, $values); + + + $stubContainer = $this->getMockBuilder('\Symfony\Component\DependencyInjection\Container') + ->disableOriginalConstructor() + ->getMock(); + $stubContainer->expects($this->any()) + ->method('get') + ->will($this->returnValue($condition1)); + + $stubContainer->expects($this->any()) + ->method('has') + ->will($this->returnValue(true)); + + $stubFacade->expects($this->any()) + ->method('getContainer') + ->will($this->returnValue($stubContainer)); + + $conditionFactory = new ConditionFactory($stubContainer); + + $collection = new ConditionCollection(); + $collection->add($condition1); + + $serialized = $conditionFactory->serializeConditionCollection($collection); + $unserialized = $conditionFactory->unserializeConditionCollection($serialized); + } + + /** + * Check invalid currency + * + * @covers Thelia\Condition\Implementation\ConditionAbstract::isPriceValid + * @expectedException \Thelia\Exception\InvalidConditionValueException + * + */ + public function testPriceAsZero() + { + $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator') + ->disableOriginalConstructor() + ->getMock(); + + /** @var FacadeInterface $stubFacade */ + $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade') + ->disableOriginalConstructor() + ->getMock(); + + $stubFacade->expects($this->any()) + ->method('getTranslator') + ->will($this->returnValue($stubTranslator)); + $stubFacade->expects($this->any()) + ->method('getConditionEvaluator') + ->will($this->returnValue(new ConditionEvaluator())); + + $currencies = CurrencyQuery::create(); + $currencies = $currencies->find(); + $stubFacade->expects($this->any()) + ->method('getAvailableCurrencies') + ->will($this->returnValue($currencies)); + + + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::EQUAL, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 0.00, + MatchForTotalAmount::INPUT2 => 'EUR'); + $condition1->setValidatorsFromForm($operators, $values); + + + $stubContainer = $this->getMockBuilder('\Symfony\Component\DependencyInjection\Container') + ->disableOriginalConstructor() + ->getMock(); + $stubContainer->expects($this->any()) + ->method('get') + ->will($this->returnValue($condition1)); + + $stubContainer->expects($this->any()) + ->method('has') + ->will($this->returnValue(true)); + + $stubFacade->expects($this->any()) + ->method('getContainer') + ->will($this->returnValue($stubContainer)); + + $conditionFactory = new ConditionFactory($stubContainer); + + $collection = new ConditionCollection(); + $collection->add($condition1); + + $serialized = $conditionFactory->serializeConditionCollection($collection); + $unserialized = $conditionFactory->unserializeConditionCollection($serialized); + } + + /** + * Generate adapter stub + * + * @param int $cartTotalPrice Cart total price + * @param string $checkoutCurrency Checkout currency + * @param string $i18nOutput Output from each translation + * + * @return \PHPUnit_Framework_MockObject_MockObject + */ + public function generateFacadeStub($cartTotalPrice = 400, $checkoutCurrency = 'EUR', $i18nOutput = '') + { + $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade') + ->disableOriginalConstructor() + ->getMock(); + + $stubFacade->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue($cartTotalPrice)); + + $stubFacade->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue($checkoutCurrency)); + + $stubFacade->expects($this->any()) + ->method('getConditionEvaluator') + ->will($this->returnValue(new ConditionEvaluator())); + + $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator') + ->disableOriginalConstructor() + ->getMock(); + $stubTranslator->expects($this->any()) + ->method('trans') + ->will($this->returnValue($i18nOutput)); + + $stubFacade->expects($this->any()) + ->method('getTranslator') + ->will($this->returnValue($stubTranslator)); + + $currency1 = new Currency(); + $currency1->setCode('EUR'); + $currency2 = new Currency(); + $currency2->setCode('USD'); + $stubFacade->expects($this->any()) + ->method('getAvailableCurrencies') + ->will($this->returnValue(array($currency1, $currency2))); + + return $stubFacade; + } + + /** + * Check getName i18n + * + * @covers Thelia\Condition\Implementation\MatchForTotalAmount::getName + * + */ + public function testGetName() + { + $stubFacade = $this->generateFacadeStub(399, 'EUR', 'Cart total amount'); + + /** @var FacadeInterface $stubFacade */ + $condition1 = new MatchForTotalAmount($stubFacade); + + $actual = $condition1->getName(); + $expected = 'Cart total amount'; + $this->assertEquals($expected, $actual); + } + + /** + * Check tooltip i18n + * + * @covers Thelia\Condition\Implementation\MatchForTotalAmount::getToolTip + * + */ + public function testGetToolTip() + { + $stubFacade = $this->generateFacadeStub(399, 'EUR', 'If cart total amount is %operator% %amount% %currency%'); + + /** @var FacadeInterface $stubFacade */ + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::EQUAL, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 400.00, + MatchForTotalAmount::INPUT2 => 'EUR'); + $condition1->setValidatorsFromForm($operators, $values); + + $actual = $condition1->getToolTip(); + $expected = 'If cart total amount is %operator% %amount% %currency%'; + $this->assertEquals($expected, $actual); + } + + /** + * Check validator + * + * @covers Thelia\Condition\Implementation\MatchForTotalAmount::generateInputs + * + */ + public function testGetValidator() + { + $stubFacade = $this->generateFacadeStub(399, 'EUR', 'Price'); + + /** @var FacadeInterface $stubFacade */ + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::EQUAL, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 400.00, + MatchForTotalAmount::INPUT2 => 'EUR'); + $condition1->setValidatorsFromForm($operators, $values); + + $actual = $condition1->getValidators(); + + $validators = array( + 'inputs' => array( + MatchForTotalAmount::INPUT1 => array( + 'title' => 'Price', + 'availableOperators' => array( + '<' => 'Price', + '<=' => 'Price', + '==' => 'Price', + '>=' => 'Price', + '>' => 'Price' + ), + 'availableValues' => '', + 'type' => 'text', + 'class' => 'form-control', + 'value' => '', + 'selectedOperator' => '' + ), + MatchForTotalAmount::INPUT2 => array( + 'title' => 'Price', + 'availableOperators' => array('==' => 'Price'), + 'availableValues' => array( + 'EUR' => '€', + 'USD' => '$', + 'GBP' => '£', + ), + 'type' => 'select', + 'class' => 'form-control', + 'value' => '', + 'selectedOperator' => Operators::EQUAL + ) + ), + 'setOperators' => array( + 'price' => '==', + 'currency' => '==' + ), + 'setValues' => array( + 'price' => 400, + 'currency' => 'EUR' + ) + ); + $expected = $validators; + + $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() + { + } + +} diff --git a/core/lib/Thelia/Tests/Condition/Implementation/MatchForXArticlesManagerTest.php b/core/lib/Thelia/Tests/Condition/Implementation/MatchForXArticlesTest.php similarity index 71% rename from core/lib/Thelia/Tests/Condition/Implementation/MatchForXArticlesManagerTest.php rename to core/lib/Thelia/Tests/Condition/Implementation/MatchForXArticlesTest.php index a618d3dcd..f33ef0468 100644 --- a/core/lib/Thelia/Tests/Condition/Implementation/MatchForXArticlesManagerTest.php +++ b/core/lib/Thelia/Tests/Condition/Implementation/MatchForXArticlesTest.php @@ -33,13 +33,13 @@ use Thelia\Coupon\FacadeInterface; * Date: 8/19/13 * Time: 3:24 PM * - * Unit Test MatchForXArticlesManager Class + * Unit Test MatchForXArticles Class * * @package Constraint * @author Guillaume MOREL * */ -class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase +class MatchForXArticlesTest extends \PHPUnit_Framework_TestCase { /** @@ -54,7 +54,7 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase /** * Check if validity test on BackOffice inputs are working * - * @covers Thelia\Condition\Implementation\MatchForXArticlesManager::setValidators + * @covers Thelia\Condition\Implementation\MatchForXArticles::setValidators * @expectedException \Thelia\Exception\InvalidConditionOperatorException */ public function testInValidBackOfficeInputOperator() @@ -72,12 +72,12 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase ->method('getConditionEvaluator') ->will($this->returnValue(new ConditionEvaluator())); - $condition1 = new MatchForXArticlesManager($stubFacade); + $condition1 = new MatchForXArticles($stubFacade); $operators = array( - MatchForXArticlesManager::INPUT1 => Operators::IN + MatchForXArticles::INPUT1 => Operators::IN ); $values = array( - MatchForXArticlesManager::INPUT1 => 5 + MatchForXArticles::INPUT1 => 5 ); $condition1->setValidatorsFromForm($operators, $values); @@ -91,7 +91,7 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase /** * Check if validity test on BackOffice inputs are working * - * @covers Thelia\Condition\Implementation\MatchForXArticlesManager::setValidators + * @covers Thelia\Condition\Implementation\MatchForXArticles::setValidators * @expectedException \Thelia\Exception\InvalidConditionValueException */ public function testInValidBackOfficeInputValue() @@ -108,12 +108,12 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase ->method('getConditionEvaluator') ->will($this->returnValue(new ConditionEvaluator())); - $condition1 = new MatchForXArticlesManager($stubFacade); + $condition1 = new MatchForXArticles($stubFacade); $operators = array( - MatchForXArticlesManager::INPUT1 => Operators::SUPERIOR + MatchForXArticles::INPUT1 => Operators::SUPERIOR ); $values = array( - MatchForXArticlesManager::INPUT1 => 'X' + MatchForXArticles::INPUT1 => 'X' ); $condition1->setValidatorsFromForm($operators, $values); @@ -127,7 +127,7 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase /** * Check if test inferior operator is working * - * @covers Thelia\Condition\Implementation\MatchForXArticlesManager::isMatching + * @covers Thelia\Condition\Implementation\MatchForXArticles::isMatching * */ public function testMatchingRuleInferior() @@ -144,12 +144,12 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase ->method('getConditionEvaluator') ->will($this->returnValue(new ConditionEvaluator())); - $condition1 = new MatchForXArticlesManager($stubFacade); + $condition1 = new MatchForXArticles($stubFacade); $operators = array( - MatchForXArticlesManager::INPUT1 => Operators::INFERIOR + MatchForXArticles::INPUT1 => Operators::INFERIOR ); $values = array( - MatchForXArticlesManager::INPUT1 => 5 + MatchForXArticles::INPUT1 => 5 ); $condition1->setValidatorsFromForm($operators, $values); @@ -163,7 +163,7 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase /** * Check if test inferior operator is working * - * @covers Thelia\Condition\Implementation\MatchForXArticlesManager::isMatching + * @covers Thelia\Condition\Implementation\MatchForXArticles::isMatching * */ public function testNotMatchingRuleInferior() @@ -180,12 +180,12 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase ->method('getConditionEvaluator') ->will($this->returnValue(new ConditionEvaluator())); - $condition1 = new MatchForXArticlesManager($stubFacade); + $condition1 = new MatchForXArticles($stubFacade); $operators = array( - MatchForXArticlesManager::INPUT1 => Operators::INFERIOR + MatchForXArticles::INPUT1 => Operators::INFERIOR ); $values = array( - MatchForXArticlesManager::INPUT1 => 4, + MatchForXArticles::INPUT1 => 4, ); $condition1->setValidatorsFromForm($operators, $values); @@ -199,7 +199,7 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase /** * Check if test inferior operator is working * - * @covers Thelia\Condition\Implementation\MatchForXArticlesManager::isMatching + * @covers Thelia\Condition\Implementation\MatchForXArticles::isMatching * */ public function testMatchingRuleInferiorEquals() @@ -216,12 +216,12 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase ->method('getConditionEvaluator') ->will($this->returnValue(new ConditionEvaluator())); - $condition1 = new MatchForXArticlesManager($stubFacade); + $condition1 = new MatchForXArticles($stubFacade); $operators = array( - MatchForXArticlesManager::INPUT1 => Operators::INFERIOR_OR_EQUAL, + MatchForXArticles::INPUT1 => Operators::INFERIOR_OR_EQUAL, ); $values = array( - MatchForXArticlesManager::INPUT1 => 5, + MatchForXArticles::INPUT1 => 5, ); $condition1->setValidatorsFromForm($operators, $values); @@ -235,7 +235,7 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase /** * Check if test inferior operator is working * - * @covers Thelia\Condition\Implementation\MatchForXArticlesManager::isMatching + * @covers Thelia\Condition\Implementation\MatchForXArticles::isMatching * */ public function testMatchingRuleInferiorEquals2() @@ -252,12 +252,12 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase ->method('getConditionEvaluator') ->will($this->returnValue(new ConditionEvaluator())); - $condition1 = new MatchForXArticlesManager($stubFacade); + $condition1 = new MatchForXArticles($stubFacade); $operators = array( - MatchForXArticlesManager::INPUT1 => Operators::INFERIOR_OR_EQUAL + MatchForXArticles::INPUT1 => Operators::INFERIOR_OR_EQUAL ); $values = array( - MatchForXArticlesManager::INPUT1 => 4 + MatchForXArticles::INPUT1 => 4 ); $condition1->setValidatorsFromForm($operators, $values); @@ -271,7 +271,7 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase /** * Check if test inferior operator is working * - * @covers Thelia\Condition\Implementation\MatchForXArticlesManager::isMatching + * @covers Thelia\Condition\Implementation\MatchForXArticles::isMatching * */ public function testNotMatchingRuleInferiorEquals() @@ -288,12 +288,12 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase ->method('getConditionEvaluator') ->will($this->returnValue(new ConditionEvaluator())); - $condition1 = new MatchForXArticlesManager($stubFacade); + $condition1 = new MatchForXArticles($stubFacade); $operators = array( - MatchForXArticlesManager::INPUT1 => Operators::INFERIOR_OR_EQUAL + MatchForXArticles::INPUT1 => Operators::INFERIOR_OR_EQUAL ); $values = array( - MatchForXArticlesManager::INPUT1 => 3 + MatchForXArticles::INPUT1 => 3 ); $condition1->setValidatorsFromForm($operators, $values); @@ -307,7 +307,7 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase /** * Check if test equals operator is working * - * @covers Thelia\Condition\Implementation\MatchForXArticlesManager::isMatching + * @covers Thelia\Condition\Implementation\MatchForXArticles::isMatching * */ public function testMatchingRuleEqual() @@ -324,12 +324,12 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase ->method('getConditionEvaluator') ->will($this->returnValue(new ConditionEvaluator())); - $condition1 = new MatchForXArticlesManager($stubFacade); + $condition1 = new MatchForXArticles($stubFacade); $operators = array( - MatchForXArticlesManager::INPUT1 => Operators::EQUAL + MatchForXArticles::INPUT1 => Operators::EQUAL ); $values = array( - MatchForXArticlesManager::INPUT1 => 4 + MatchForXArticles::INPUT1 => 4 ); $condition1->setValidatorsFromForm($operators, $values); @@ -343,7 +343,7 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase /** * Check if test equals operator is working * - * @covers Thelia\Condition\Implementation\MatchForXArticlesManager::isMatching + * @covers Thelia\Condition\Implementation\MatchForXArticles::isMatching * */ public function testNotMatchingRuleEqual() @@ -360,12 +360,12 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase ->method('getConditionEvaluator') ->will($this->returnValue(new ConditionEvaluator())); - $condition1 = new MatchForXArticlesManager($stubFacade); + $condition1 = new MatchForXArticles($stubFacade); $operators = array( - MatchForXArticlesManager::INPUT1 => Operators::EQUAL + MatchForXArticles::INPUT1 => Operators::EQUAL ); $values = array( - MatchForXArticlesManager::INPUT1 => 5 + MatchForXArticles::INPUT1 => 5 ); $condition1->setValidatorsFromForm($operators, $values); @@ -379,7 +379,7 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase /** * Check if test superior operator is working * - * @covers Thelia\Condition\Implementation\MatchForXArticlesManager::isMatching + * @covers Thelia\Condition\Implementation\MatchForXArticles::isMatching * */ public function testMatchingRuleSuperiorEquals() @@ -396,12 +396,12 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase ->method('getConditionEvaluator') ->will($this->returnValue(new ConditionEvaluator())); - $condition1 = new MatchForXArticlesManager($stubFacade); + $condition1 = new MatchForXArticles($stubFacade); $operators = array( - MatchForXArticlesManager::INPUT1 => Operators::SUPERIOR_OR_EQUAL + MatchForXArticles::INPUT1 => Operators::SUPERIOR_OR_EQUAL ); $values = array( - MatchForXArticlesManager::INPUT1 => 4 + MatchForXArticles::INPUT1 => 4 ); $condition1->setValidatorsFromForm($operators, $values); @@ -415,7 +415,7 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase /** * Check if test superior operator is working * - * @covers Thelia\Condition\Implementation\MatchForXArticlesManager::isMatching + * @covers Thelia\Condition\Implementation\MatchForXArticles::isMatching * */ public function testMatchingRuleSuperiorEquals2() @@ -432,12 +432,12 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase ->method('getConditionEvaluator') ->will($this->returnValue(new ConditionEvaluator())); - $condition1 = new MatchForXArticlesManager($stubFacade); + $condition1 = new MatchForXArticles($stubFacade); $operators = array( - MatchForXArticlesManager::INPUT1 => Operators::SUPERIOR_OR_EQUAL + MatchForXArticles::INPUT1 => Operators::SUPERIOR_OR_EQUAL ); $values = array( - MatchForXArticlesManager::INPUT1 => 3 + MatchForXArticles::INPUT1 => 3 ); $condition1->setValidatorsFromForm($operators, $values); @@ -451,7 +451,7 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase /** * Check if test superior operator is working * - * @covers Thelia\Condition\Implementation\MatchForXArticlesManager::isMatching + * @covers Thelia\Condition\Implementation\MatchForXArticles::isMatching * */ public function testNotMatchingRuleSuperiorEquals() @@ -468,12 +468,12 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase ->method('getConditionEvaluator') ->will($this->returnValue(new ConditionEvaluator())); - $condition1 = new MatchForXArticlesManager($stubFacade); + $condition1 = new MatchForXArticles($stubFacade); $operators = array( - MatchForXArticlesManager::INPUT1 => Operators::SUPERIOR_OR_EQUAL + MatchForXArticles::INPUT1 => Operators::SUPERIOR_OR_EQUAL ); $values = array( - MatchForXArticlesManager::INPUT1 => 5 + MatchForXArticles::INPUT1 => 5 ); $condition1->setValidatorsFromForm($operators, $values); @@ -487,7 +487,7 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase /** * Check if test superior operator is working * - * @covers Thelia\Condition\Implementation\MatchForXArticlesManager::isMatching + * @covers Thelia\Condition\Implementation\MatchForXArticles::isMatching * */ public function testMatchingRuleSuperior() @@ -504,12 +504,12 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase ->method('getConditionEvaluator') ->will($this->returnValue(new ConditionEvaluator())); - $condition1 = new MatchForXArticlesManager($stubFacade); + $condition1 = new MatchForXArticles($stubFacade); $operators = array( - MatchForXArticlesManager::INPUT1 => Operators::SUPERIOR + MatchForXArticles::INPUT1 => Operators::SUPERIOR ); $values = array( - MatchForXArticlesManager::INPUT1 => 3 + MatchForXArticles::INPUT1 => 3 ); $condition1->setValidatorsFromForm($operators, $values); @@ -523,7 +523,7 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase /** * Check if test superior operator is working * - * @covers Thelia\Condition\Implementation\MatchForXArticlesManager::isMatching + * @covers Thelia\Condition\Implementation\MatchForXArticles::isMatching * */ public function testNotMatchingRuleSuperior() @@ -540,12 +540,12 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase ->method('getConditionEvaluator') ->will($this->returnValue(new ConditionEvaluator())); - $condition1 = new MatchForXArticlesManager($stubFacade); + $condition1 = new MatchForXArticles($stubFacade); $operators = array( - MatchForXArticlesManager::INPUT1 => Operators::SUPERIOR + MatchForXArticles::INPUT1 => Operators::SUPERIOR ); $values = array( - MatchForXArticlesManager::INPUT1 => 4 + MatchForXArticles::INPUT1 => 4 ); $condition1->setValidatorsFromForm($operators, $values); @@ -570,12 +570,12 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase ->method('getConditionEvaluator') ->will($this->returnValue(new ConditionEvaluator())); - $condition1 = new MatchForXArticlesManager($stubFacade); + $condition1 = new MatchForXArticles($stubFacade); $operators = array( - MatchForXArticlesManager::INPUT1 => Operators::SUPERIOR + MatchForXArticles::INPUT1 => Operators::SUPERIOR ); $values = array( - MatchForXArticlesManager::INPUT1 => 4 + MatchForXArticles::INPUT1 => 4 ); $condition1->setValidatorsFromForm($operators, $values); @@ -606,17 +606,17 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase ->method('getConditionEvaluator') ->will($this->returnValue(new ConditionEvaluator())); - $condition1 = new MatchForXArticlesManager($stubFacade); + $condition1 = new MatchForXArticles($stubFacade); $operators = array( - MatchForXArticlesManager::INPUT1 => Operators::SUPERIOR + MatchForXArticles::INPUT1 => Operators::SUPERIOR ); $values = array( - MatchForXArticlesManager::INPUT1 => 4 + MatchForXArticles::INPUT1 => 4 ); $condition1->setValidatorsFromForm($operators, $values); $expected = array( - MatchForXArticlesManager::INPUT1 => array( + MatchForXArticles::INPUT1 => array( Operators::INFERIOR, Operators::INFERIOR_OR_EQUAL, Operators::EQUAL, @@ -630,6 +630,142 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase } + /** + * Generate adapter stub + * + * @param int $cartTotalPrice Cart total price + * @param string $checkoutCurrency Checkout currency + * @param string $i18nOutput Output from each translation + * + * @return \PHPUnit_Framework_MockObject_MockObject + */ + public function generateFacadeStub($cartTotalPrice = 400, $checkoutCurrency = 'EUR', $i18nOutput = '') + { + $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade') + ->disableOriginalConstructor() + ->getMock(); + + $stubFacade->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue($cartTotalPrice)); + + $stubFacade->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue($checkoutCurrency)); + + $stubFacade->expects($this->any()) + ->method('getConditionEvaluator') + ->will($this->returnValue(new ConditionEvaluator())); + + $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator') + ->disableOriginalConstructor() + ->getMock(); + $stubTranslator->expects($this->any()) + ->method('trans') + ->will($this->returnValue($i18nOutput)); + + $stubFacade->expects($this->any()) + ->method('getTranslator') + ->will($this->returnValue($stubTranslator)); + + return $stubFacade; + } + + /** + * Check getName i18n + * + * @covers Thelia\Condition\Implementation\MatchForXArticles::getName + * + */ + public function testGetName() + { + $stubFacade = $this->generateFacadeStub(399, 'EUR', 'Number of articles in cart'); + + /** @var FacadeInterface $stubFacade */ + $condition1 = new MatchForXArticles($stubFacade); + + $actual = $condition1->getName(); + $expected = 'Number of articles in cart'; + $this->assertEquals($expected, $actual); + } + + /** + * Check tooltip i18n + * + * @covers Thelia\Condition\Implementation\MatchForXArticles::getToolTip + * + */ + public function testGetToolTip() + { + $stubFacade = $this->generateFacadeStub(399, 'EUR', 'If cart products quantity is superior to 4'); + + /** @var FacadeInterface $stubFacade */ + $condition1 = new MatchForXArticles($stubFacade); + $operators = array( + MatchForXArticles::INPUT1 => Operators::SUPERIOR + ); + $values = array( + MatchForXArticles::INPUT1 => 4 + ); + $condition1->setValidatorsFromForm($operators, $values); + + $actual = $condition1->getToolTip(); + $expected = 'If cart products quantity is superior to 4'; + $this->assertEquals($expected, $actual); + } + + /** + * Check validator + * + * @covers Thelia\Condition\Implementation\MatchForXArticles::generateInputs + * + */ + public function testGetValidator() + { + $stubFacade = $this->generateFacadeStub(399, 'EUR', 'Price'); + + /** @var FacadeInterface $stubFacade */ + $condition1 = new MatchForXArticles($stubFacade); + $operators = array( + MatchForXArticles::INPUT1 => Operators::SUPERIOR + ); + $values = array( + MatchForXArticles::INPUT1 => 4 + ); + $condition1->setValidatorsFromForm($operators, $values); + + $actual = $condition1->getValidators(); + + $validators = array( + 'inputs' => array( + MatchForXArticles::INPUT1 => array( + 'title' => 'Price', + 'availableOperators' => array( + '<' => 'Price', + '<=' => 'Price', + '==' => 'Price', + '>=' => 'Price', + '>' => 'Price' + ), + 'type' => 'text', + 'class' => 'form-control', + 'value' => '', + 'selectedOperator' => '' + ) + ), + 'setOperators' => array( + 'quantity' => '>' + ), + 'setValues' => array( + 'quantity' => 4 + ) + ); + $expected = $validators; + + $this->assertEquals($expected, $actual); + + } + /** * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. diff --git a/core/lib/Thelia/Tests/Coupon/BaseFacadeTest.php b/core/lib/Thelia/Tests/Coupon/BaseFacadeTest.php new file mode 100644 index 000000000..6e1619aac --- /dev/null +++ b/core/lib/Thelia/Tests/Coupon/BaseFacadeTest.php @@ -0,0 +1,272 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Coupon; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Unit Test BaseFacade Class + * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2013-11-17 at 18:59:24. + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class BaseFacadeTest 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() + { + } + + /** + * 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\BaseFacade::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\BaseFacade::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\BaseFacade::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.' + ); + } + + /** + * @covers Thelia\Coupon\BaseFacade::getCheckoutTotalPrice + * @todo Implement testGetCheckoutTotalPrice(). + */ + public function testGetCheckoutTotalPrice() + { + // Remove the following lines when you implement this test. + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); + } + + /** + * @covers Thelia\Coupon\BaseFacade::getCheckoutPostagePrice + * @todo Implement testGetCheckoutPostagePrice(). + */ + public function testGetCheckoutPostagePrice() + { + // Remove the following lines when you implement this test. + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); + } + + /** + * @covers Thelia\Coupon\BaseFacade::getCartTotalPrice + * @todo Implement testGetCartTotalPrice(). + */ + public function testGetCartTotalPrice() + { + // Remove the following lines when you implement this test. + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); + } + + /** + * @covers Thelia\Coupon\BaseFacade::getCheckoutCurrency + * @todo Implement testGetCheckoutCurrency(). + */ + public function testGetCheckoutCurrency() + { + // Remove the following lines when you implement this test. + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); + } + + /** + * @covers Thelia\Coupon\BaseFacade::getNbArticlesInCart + * @todo Implement testGetNbArticlesInCart(). + */ + public function testGetNbArticlesInCart() + { + // Remove the following lines when you implement this test. + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); + } + + /** + * @covers Thelia\Coupon\BaseFacade::getCurrentCoupons + * @todo Implement testGetCurrentCoupons(). + */ + public function testGetCurrentCoupons() + { + // Remove the following lines when you implement this test. + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); + } + + /** + * @covers Thelia\Coupon\BaseFacade::findOneCouponByCode + * @todo Implement testFindOneCouponByCode(). + */ + public function testFindOneCouponByCode() + { + // Remove the following lines when you implement this test. + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); + } + + /** + * @covers Thelia\Coupon\BaseFacade::getContainer + * @todo Implement testGetContainer(). + */ + public function testGetContainer() + { + // Remove the following lines when you implement this test. + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); + } + + /** + * @covers Thelia\Coupon\BaseFacade::getTranslator + * @todo Implement testGetTranslator(). + */ + public function testGetTranslator() + { + // Remove the following lines when you implement this test. + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); + } + + /** + * @covers Thelia\Coupon\BaseFacade::getMainCurrency + * @todo Implement testGetMainCurrency(). + */ + public function testGetMainCurrency() + { + // Remove the following lines when you implement this test. + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); + } + + /** + * @covers Thelia\Coupon\BaseFacade::getRequest + * @todo Implement testGetRequest(). + */ + public function testGetRequest() + { + // Remove the following lines when you implement this test. + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); + } + + /** + * @covers Thelia\Coupon\BaseFacade::getConditionEvaluator + * @todo Implement testGetConditionEvaluator(). + */ + public function testGetConditionEvaluator() + { + // Remove the following lines when you implement this test. + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); + } + + /** + * @covers Thelia\Coupon\BaseFacade::getAvailableCurrencies + * @todo Implement testGetAvailableCurrencies(). + */ + public function testGetAvailableCurrencies() + { + // Remove the following lines when you implement this test. + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); + } + + /** + * @covers Thelia\Coupon\BaseFacade::getDispatcher + * @todo Implement testGetDispatcher(). + */ + public function testGetDispatcher() + { + // Remove the following lines when you implement this test. + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); + } + + /** + * @covers Thelia\Coupon\BaseFacade::getCartFromTrait + * @todo Implement testGetCartFromTrait(). + */ + public function testGetCartFromTrait() + { + // 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 new file mode 100644 index 000000000..b70bdf247 --- /dev/null +++ b/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php @@ -0,0 +1,405 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Coupon; +use Thelia\Condition\ConditionCollection; +use Thelia\Condition\ConditionEvaluator; +use Thelia\Condition\ConditionFactory; +use Thelia\Condition\Implementation\MatchForTotalAmount; +use Thelia\Condition\Operators; +use Thelia\Coupon\Type\RemoveXAmount; +use Thelia\Model\Coupon; +use Thelia\Model\CurrencyQuery; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Unit Test CouponFactory Class + * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2013-11-17 at 18:59:24. + * + * @package Coupon + * @author Guillaume MOREL + * + */ +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() + { + } + + /** + * Generate adapter stub + * + * @param int $cartTotalPrice Cart total price + * @param string $checkoutCurrency Checkout currency + * @param string $i18nOutput Output from each translation + * + * @return \PHPUnit_Framework_MockObject_MockObject + */ + public function generateFacadeStub($cartTotalPrice = 400, $checkoutCurrency = 'EUR', $i18nOutput = '') + { + $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade') + ->disableOriginalConstructor() + ->getMock(); + + $currencies = CurrencyQuery::create(); + $currencies = $currencies->find(); + $stubFacade->expects($this->any()) + ->method('getAvailableCurrencies') + ->will($this->returnValue($currencies)); + + $stubFacade->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue($cartTotalPrice)); + + $stubFacade->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue($checkoutCurrency)); + + $stubFacade->expects($this->any()) + ->method('getConditionEvaluator') + ->will($this->returnValue(new ConditionEvaluator())); + + $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator') + ->disableOriginalConstructor() + ->getMock(); + $stubTranslator->expects($this->any()) + ->method('trans') + ->will($this->returnValue($i18nOutput)); + + $stubFacade->expects($this->any()) + ->method('getTranslator') + ->will($this->returnValue($stubTranslator)); + + return $stubFacade; + } + + /** + * Generate a valid Coupon model + */ + public function generateCouponModel($facade, ConditionFactory $conditionFactory) + { + // Coupons + $coupon1 = new Coupon(); + $coupon1->setCode('XMAS'); + $coupon1->setType('thelia.coupon.type.remove_x_amount'); + $coupon1->setTitle('Christmas coupon'); + $coupon1->setShortDescription('Coupon for Christmas removing 10€ if your total checkout is more than 40€'); + $coupon1->setDescription('Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras at luctus tellus. Integer turpis mauris, aliquet vitae risus tristique, pellentesque vestibulum urna. Vestibulum sodales laoreet lectus dictum suscipit. Praesent vulputate, sem id varius condimentum, quam magna tempor elit, quis venenatis ligula nulla eget libero. Cras egestas euismod tellus, id pharetra leo suscipit quis. Donec lacinia ac lacus et ultricies. Nunc in porttitor neque. Proin at quam congue, consectetur orci sed, congue nulla. Nulla eleifend nunc ligula, nec pharetra elit tempus quis. Vivamus vel mauris sed est dictum blandit. Maecenas blandit dapibus velit ut sollicitudin. In in euismod mauris, consequat viverra magna. Cras velit velit, sollicitudin commodo tortor gravida, tempus varius nulla. + +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.'); + $coupon1->setAmount(10.00); + $coupon1->setIsUsed(true); + $coupon1->setIsEnabled(true); + $date = new \DateTime(); + $coupon1->setExpirationDate($date->setTimestamp(strtotime("today + 3 months"))); + + $condition1 = new MatchForTotalAmount($facade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::SUPERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 40.00, + MatchForTotalAmount::INPUT2 => 'EUR' + ); + $condition1->setValidatorsFromForm($operators, $values); + + $condition2 = new MatchForTotalAmount($facade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::INFERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 400.00, + MatchForTotalAmount::INPUT2 => 'EUR' + ); + $condition2->setValidatorsFromForm($operators, $values); + + $conditions = new ConditionCollection(); + $conditions->add($condition1); + $conditions->add($condition2); + + $serializedConditions = $conditionFactory->serializeConditionCollection($conditions); + $coupon1->setSerializedConditions($serializedConditions); + + + $coupon1->setMaxUsage(40); + $coupon1->setIsCumulative(true); + $coupon1->setIsRemovingPostage(false); + $coupon1->setIsAvailableOnSpecialOffers(true); + + return $coupon1; + } + + /** + * 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\CouponFactory::buildCouponFromCode + */ + public function testBuildCouponFromCode() + { + $stubFacade = $this->generateFacadeStub(); + + $stubContainer = $this->getMock('\Symfony\Component\DependencyInjection\Container'); + + $conditionFactory = new ConditionFactory($stubContainer); + $couponModel = $this->generateCouponModel($stubFacade, $conditionFactory); + $stubFacade->expects($this->any()) + ->method('findOneCouponByCode') + ->will($this->returnValue($couponModel)); + + $couponManager = new RemoveXAmount($stubFacade); + + + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::SUPERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 40.00, + MatchForTotalAmount::INPUT2 => 'EUR' + ); + $condition1->setValidatorsFromForm($operators, $values); + + $condition2 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::INFERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 400.00, + MatchForTotalAmount::INPUT2 => 'EUR' + ); + $condition2->setValidatorsFromForm($operators, $values); + + $conditions = new ConditionCollection(); + $conditions->add($condition1); + $conditions->add($condition2); + $stubConditionFactory = $this->getMockBuilder('\Thelia\Condition\ConditionFactory') + ->disableOriginalConstructor() + ->getMock(); + $stubConditionFactory->expects($this->any()) + ->method('unserializeConditionCollection') + ->will($this->returnValue($conditions)); + + + $stubContainer->expects($this->any()) + ->method('get') + ->will($this->onConsecutiveCalls($stubFacade, $couponManager, $stubConditionFactory)); + + $stubContainer->expects($this->any()) + ->method('has') + ->will($this->returnValue(true)); + + $factory = new CouponFactory($stubContainer); + $expected = $couponManager; + $actual = $factory->buildCouponFromCode('XMAS'); + + $this->assertEquals($expected, $actual); + } + + /** + * @covers Thelia\Coupon\CouponFactory::buildCouponFromCode + */ + public function testBuildCouponFromCodeUnknownCode() + { + $stubFacade = $this->generateFacadeStub(); + + $stubContainer = $this->getMock('\Symfony\Component\DependencyInjection\Container'); + + $conditionFactory = new ConditionFactory($stubContainer); + $stubFacade->expects($this->any()) + ->method('findOneCouponByCode') + ->will($this->returnValue(null)); + + $couponManager = new RemoveXAmount($stubFacade); + + + + $stubContainer->expects($this->any()) + ->method('get') + ->will($this->onConsecutiveCalls($stubFacade, $couponManager)); + + $stubContainer->expects($this->any()) + ->method('has') + ->will($this->returnValue(true)); + + $factory = new CouponFactory($stubContainer); + $actual = $factory->buildCouponFromCode('XMAS'); + $expected = false; + + $this->assertEquals($expected, $actual, 'CouponFactory->buildCouponFromCode should return false if the given code is unknown'); + + } + + /** + * @covers Thelia\Coupon\CouponFactory::buildCouponFromCode + * @expectedException \Thelia\Exception\CouponExpiredException + */ + public function testBuildCouponFromCodeExpiredCoupon() + { + $stubFacade = $this->generateFacadeStub(); + + $stubContainer = $this->getMock('\Symfony\Component\DependencyInjection\Container'); + + $conditionFactory = new ConditionFactory($stubContainer); + $couponModel = $this->generateCouponModel($stubFacade, $conditionFactory); + $date = new \DateTime(); + $couponModel->setExpirationDate($date->setTimestamp(strtotime("today - 3 months"))); + $stubFacade->expects($this->any()) + ->method('findOneCouponByCode') + ->will($this->returnValue($couponModel)); + + $couponManager = new RemoveXAmount($stubFacade); + + + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::SUPERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 40.00, + MatchForTotalAmount::INPUT2 => 'EUR' + ); + $condition1->setValidatorsFromForm($operators, $values); + + $condition2 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::INFERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 400.00, + MatchForTotalAmount::INPUT2 => 'EUR' + ); + $condition2->setValidatorsFromForm($operators, $values); + + $conditions = new ConditionCollection(); + $conditions->add($condition1); + $conditions->add($condition2); + $stubConditionFactory = $this->getMockBuilder('\Thelia\Condition\ConditionFactory') + ->disableOriginalConstructor() + ->getMock(); + $stubConditionFactory->expects($this->any()) + ->method('unserializeConditionCollection') + ->will($this->returnValue($conditions)); + + + $stubContainer->expects($this->any()) + ->method('get') + ->will($this->onConsecutiveCalls($stubFacade, $couponManager, $stubConditionFactory)); + + $stubContainer->expects($this->any()) + ->method('has') + ->will($this->returnValue(true)); + + $factory = new CouponFactory($stubContainer); + $actual = $factory->buildCouponFromCode('XMAS'); + + } + + /** + * @covers Thelia\Coupon\CouponFactory::buildCouponFromCode + * @expectedException \Thelia\Exception\InvalidConditionException + */ + public function testBuildCouponFromCodeNoConditionCoupon() + { + $stubFacade = $this->generateFacadeStub(); + + $stubContainer = $this->getMock('\Symfony\Component\DependencyInjection\Container'); + + $conditionFactory = new ConditionFactory($stubContainer); + $couponModel = $this->generateCouponModel($stubFacade, $conditionFactory); + $stubFacade->expects($this->any()) + ->method('findOneCouponByCode') + ->will($this->returnValue($couponModel)); + + $couponManager = new RemoveXAmount($stubFacade); + + + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::SUPERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 40.00, + MatchForTotalAmount::INPUT2 => 'EUR' + ); + $condition1->setValidatorsFromForm($operators, $values); + + $condition2 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::INFERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 400.00, + MatchForTotalAmount::INPUT2 => 'EUR' + ); + $condition2->setValidatorsFromForm($operators, $values); + + $conditions = new ConditionCollection(); + $stubConditionFactory = $this->getMockBuilder('\Thelia\Condition\ConditionFactory') + ->disableOriginalConstructor() + ->getMock(); + $stubConditionFactory->expects($this->any()) + ->method('unserializeConditionCollection') + ->will($this->returnValue($conditions)); + + + $stubContainer->expects($this->any()) + ->method('get') + ->will($this->onConsecutiveCalls($stubFacade, $couponManager, $stubConditionFactory)); + + $stubContainer->expects($this->any()) + ->method('has') + ->will($this->returnValue(true)); + + $factory = new CouponFactory($stubContainer); + $actual = $factory->buildCouponFromCode('XMAS'); + + } +} diff --git a/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php b/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php new file mode 100644 index 000000000..bf4b9f1e9 --- /dev/null +++ b/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php @@ -0,0 +1,580 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Coupon; +use Thelia\Condition\ConditionCollection; +use Thelia\Condition\ConditionEvaluator; +use Thelia\Condition\ConditionFactory; +use Thelia\Condition\Implementation\MatchForTotalAmount; +use Thelia\Condition\Operators; +use Thelia\Coupon\Type\RemoveXAmount; +use Thelia\Model\Coupon; +use Thelia\Model\CurrencyQuery; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Unit Test CouponManager Class + * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2013-11-17 at 18:59:24. + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class CouponManagerTest 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() + { + } + + /** + * Tears down the fixture, for example, closes a network connection. + * This method is called after a test is executed. + */ + protected function tearDown() + { + } + + + /** + * Generate a valid Coupon model + */ + public function generateCouponModel($facade, ConditionFactory $conditionFactory) + { + // Coupons + $coupon1 = new Coupon(); + $coupon1->setCode('XMAS'); + $coupon1->setType('thelia.coupon.type.remove_x_amount'); + $coupon1->setTitle('Christmas coupon'); + $coupon1->setShortDescription('Coupon for Christmas removing 10€ if your total checkout is more than 40€'); + $coupon1->setDescription('Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras at luctus tellus. Integer turpis mauris, aliquet vitae risus tristique, pellentesque vestibulum urna. Vestibulum sodales laoreet lectus dictum suscipit. Praesent vulputate, sem id varius condimentum, quam magna tempor elit, quis venenatis ligula nulla eget libero. Cras egestas euismod tellus, id pharetra leo suscipit quis. Donec lacinia ac lacus et ultricies. Nunc in porttitor neque. Proin at quam congue, consectetur orci sed, congue nulla. Nulla eleifend nunc ligula, nec pharetra elit tempus quis. Vivamus vel mauris sed est dictum blandit. Maecenas blandit dapibus velit ut sollicitudin. In in euismod mauris, consequat viverra magna. Cras velit velit, sollicitudin commodo tortor gravida, tempus varius nulla. + +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.'); + $coupon1->setAmount(10.00); + $coupon1->setIsUsed(true); + $coupon1->setIsEnabled(true); + $date = new \DateTime(); + $coupon1->setExpirationDate($date->setTimestamp(strtotime("today + 3 months"))); + + $condition1 = new MatchForTotalAmount($facade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::SUPERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 40.00, + MatchForTotalAmount::INPUT2 => 'EUR' + ); + $condition1->setValidatorsFromForm($operators, $values); + + $condition2 = new MatchForTotalAmount($facade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::INFERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 400.00, + MatchForTotalAmount::INPUT2 => 'EUR' + ); + $condition2->setValidatorsFromForm($operators, $values); + + $conditions = new ConditionCollection(); + $conditions->add($condition1); + $conditions->add($condition2); + + $serializedConditions = $conditionFactory->serializeConditionCollection($conditions); + $coupon1->setSerializedConditions($serializedConditions); + + + $coupon1->setMaxUsage(40); + $coupon1->setIsCumulative(true); + $coupon1->setIsRemovingPostage(true); + $coupon1->setIsAvailableOnSpecialOffers(true); + + return $coupon1; + } + + /** + * @covers Thelia\Coupon\CouponManager::getDiscount + * @covers Thelia\Coupon\CouponManager::isCouponRemovingPostage + * @covers Thelia\Coupon\CouponManager::sortCoupons + * @covers Thelia\Coupon\CouponManager::getEffect + */ + public function testGetDiscountCumulativeRemovingPostage() + { + $stubFacade = $this->generateFacadeStub(); + $stubContainer = $this->getMock('\Symfony\Component\DependencyInjection\Container'); + + $conditionFactory = new ConditionFactory($stubContainer); + + $conditions = new ConditionCollection(); + $stubConditionFactory = $this->getMockBuilder('\Thelia\Condition\ConditionFactory') + ->disableOriginalConstructor() + ->getMock(); + $stubConditionFactory->expects($this->any()) + ->method('unserializeConditionCollection') + ->will($this->returnValue($conditions)); + + $couponManager = new RemoveXAmount($stubFacade); + $stubContainer->expects($this->any()) + ->method('get') + ->will($this->onConsecutiveCalls($stubFacade, $couponManager, $stubConditionFactory, clone $couponManager, $stubConditionFactory, $stubFacade)); + $stubContainer->expects($this->any()) + ->method('has') + ->will($this->returnValue(true)); + + $couponFactory = new CouponFactory($stubContainer); + $model1 = $this->generateCouponModel($stubFacade, $conditionFactory); + $model1->setAmount(21.00); + $coupon1 = $couponFactory->buildCouponFromModel($model1); + + $model2 = $this->generateCouponModel($stubFacade, $conditionFactory); + $model2->setCode('XMAS2')->setIsRemovingPostage(true)->setAmount(21.50); + $coupon2 = $couponFactory->buildCouponFromModel($model2); + + $stubFacade->expects($this->any()) + ->method('getCurrentCoupons') + ->will($this->returnValue(array($coupon1, $coupon2))); + $stubFacade->expects($this->any()) + ->method('getCheckoutPostagePrice') + ->will($this->returnValue(8.30)); + $stubFacade->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(122.53)); + + $couponManager = new CouponManager($stubContainer); + $couponManager->addAvailableCoupon($coupon1); + $couponManager->addAvailableCoupon($coupon2); + $actual = $couponManager->getDiscount(); + $expected = 50.80; + + $this->assertEquals($expected, $actual); + } + + /** + * @covers Thelia\Coupon\CouponManager::getDiscount + * @covers Thelia\Coupon\CouponManager::isCouponRemovingPostage + * @covers Thelia\Coupon\CouponManager::sortCoupons + * @covers Thelia\Coupon\CouponManager::getEffect + */ + public function testGetDiscountNonCumulativeNotRemovingPostage() + { + $stubFacade = $this->generateFacadeStub(); + $stubContainer = $this->getMock('\Symfony\Component\DependencyInjection\Container'); + + $conditionFactory = new ConditionFactory($stubContainer); + + $conditions = new ConditionCollection(); + $stubConditionFactory = $this->getMockBuilder('\Thelia\Condition\ConditionFactory') + ->disableOriginalConstructor() + ->getMock(); + $stubConditionFactory->expects($this->any()) + ->method('unserializeConditionCollection') + ->will($this->returnValue($conditions)); + + $couponManager = new RemoveXAmount($stubFacade); + $stubContainer->expects($this->any()) + ->method('get') + ->will($this->onConsecutiveCalls($stubFacade, $couponManager, $stubConditionFactory, clone $couponManager, $stubConditionFactory, $stubFacade)); + $stubContainer->expects($this->any()) + ->method('has') + ->will($this->returnValue(true)); + + $couponFactory = new CouponFactory($stubContainer); + $model1 = $this->generateCouponModel($stubFacade, $conditionFactory); + $model1->setAmount(21.00); + $coupon1 = $couponFactory->buildCouponFromModel($model1); + + $model2 = $this->generateCouponModel($stubFacade, $conditionFactory); + $model2->setCode('XMAS2')->setIsRemovingPostage(false)->setAmount(21.50)->setIsCumulative(false); + $coupon2 = $couponFactory->buildCouponFromModel($model2); + + $stubFacade->expects($this->any()) + ->method('getCurrentCoupons') + ->will($this->returnValue(array($coupon1, $coupon2))); + $stubFacade->expects($this->any()) + ->method('getCheckoutPostagePrice') + ->will($this->returnValue(8.30)); + $stubFacade->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(122.53)); + + $couponManager = new CouponManager($stubContainer); + $couponManager->addAvailableCoupon($coupon1); + $couponManager->addAvailableCoupon($coupon2); + $actual = $couponManager->getDiscount(); + $expected = 21.50; + + $this->assertEquals($expected, $actual); + } + + /** + * @covers Thelia\Coupon\CouponManager::getDiscount + * @covers Thelia\Coupon\CouponManager::isCouponRemovingPostage + * @covers Thelia\Coupon\CouponManager::sortCoupons + * @covers Thelia\Coupon\CouponManager::getEffect + */ + public function testGetDiscountGreaterThanCartAmount() + { + $stubFacade = $this->generateFacadeStub(12.25); + $stubFacade->expects($this->any()) + ->method('getCheckoutPostagePrice') + ->will($this->returnValue(8.30)); + + $stubContainer = $this->getMock('\Symfony\Component\DependencyInjection\Container'); + + $conditionFactory = new ConditionFactory($stubContainer); + + $conditions = new ConditionCollection(); + $stubConditionFactory = $this->getMockBuilder('\Thelia\Condition\ConditionFactory') + ->disableOriginalConstructor() + ->getMock(); + $stubConditionFactory->expects($this->any()) + ->method('unserializeConditionCollection') + ->will($this->returnValue($conditions)); + + $couponManager = new RemoveXAmount($stubFacade); + $stubContainer->expects($this->any()) + ->method('get') + ->will($this->onConsecutiveCalls($stubFacade, $couponManager, $stubConditionFactory, clone $couponManager, $stubConditionFactory, $stubFacade)); + $stubContainer->expects($this->any()) + ->method('has') + ->will($this->returnValue(true)); + + $couponFactory = new CouponFactory($stubContainer); + $model1 = $this->generateCouponModel($stubFacade, $conditionFactory); + $model1->setAmount(21.00); + $coupon1 = $couponFactory->buildCouponFromModel($model1); + + $model2 = $this->generateCouponModel($stubFacade, $conditionFactory); + $model2->setCode('XMAS2')->setIsRemovingPostage(false)->setAmount(21.50)->setIsCumulative(false); + $coupon2 = $couponFactory->buildCouponFromModel($model2); + + $stubFacade->expects($this->any()) + ->method('getCurrentCoupons') + ->will($this->returnValue(array($coupon1, $coupon2))); + + $couponManager = new CouponManager($stubContainer); + $couponManager->addAvailableCoupon($coupon1); + $couponManager->addAvailableCoupon($coupon2); + $actual = $couponManager->getDiscount(); + $expected = 12.25; + + $this->assertEquals($expected, $actual); + } + + /** + * @covers Thelia\Coupon\CouponManager::addAvailableCoupon + * @covers Thelia\Coupon\CouponManager::getAvailableCoupons + */ + public function testGetAvailableCoupons() + { + $stubFacade = $this->generateFacadeStub(); + $stubContainer = $this->getMock('\Symfony\Component\DependencyInjection\Container'); + + $conditionFactory = new ConditionFactory($stubContainer); + + + + $stubFacade->expects($this->any()) + ->method('getCurrentCoupons') + ->will($this->returnValue(array())); + + $conditions = new ConditionCollection(); + $stubConditionFactory = $this->getMockBuilder('\Thelia\Condition\ConditionFactory') + ->disableOriginalConstructor() + ->getMock(); + $stubConditionFactory->expects($this->any()) + ->method('unserializeConditionCollection') + ->will($this->returnValue($conditions)); + + $couponManager = new RemoveXAmount($stubFacade); + $stubContainer->expects($this->any()) + ->method('get') + ->will($this->onConsecutiveCalls($stubFacade, $couponManager, $stubConditionFactory, $stubFacade)); + $stubContainer->expects($this->any()) + ->method('has') + ->will($this->returnValue(true)); + + $couponFactory = new CouponFactory($stubContainer); + $model1 = $this->generateCouponModel($stubFacade, $conditionFactory); + $coupon1 = $couponFactory->buildCouponFromModel($model1); + $coupon2 = clone $coupon1; + + + $couponManager = new CouponManager($stubContainer); + $couponManager->addAvailableCoupon($coupon1); + $couponManager->addAvailableCoupon($coupon2); + $actual = $couponManager->getAvailableCoupons(); + $expected = array($coupon1, $coupon2); + + $this->assertEquals($expected, $actual); + } + + /** + * @covers Thelia\Coupon\CouponManager::addAvailableCondition + * @covers Thelia\Coupon\CouponManager::getAvailableConditions + */ + public function testGetAvailableConditions() + { + $stubFacade = $this->generateFacadeStub(); + $stubContainer = $this->getMock('\Symfony\Component\DependencyInjection\Container'); + + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::SUPERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 40.00, + MatchForTotalAmount::INPUT2 => 'EUR' + ); + $condition1->setValidatorsFromForm($operators, $values); + + $condition2 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::INFERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 400.00, + MatchForTotalAmount::INPUT2 => 'EUR' + ); + $condition2->setValidatorsFromForm($operators, $values); + + $conditions = new ConditionCollection(); + $conditions->add($condition1); + $conditions->add($condition2); + + $stubFacade->expects($this->any()) + ->method('getCurrentCoupons') + ->will($this->returnValue(array())); + + $stubContainer->expects($this->any()) + ->method('get') + ->will($this->onConsecutiveCalls($stubFacade)); + + + $couponManager = new CouponManager($stubContainer); + $couponManager->addAvailableCondition($condition1); + $couponManager->addAvailableCondition($condition2); + $actual = $couponManager->getAvailableConditions(); + $expected = array($condition1, $condition2); + + $this->assertEquals($expected, $actual); + } + + /** + * @covers Thelia\Coupon\CouponManager::decrementQuantity + */ + public function testDecrementeQuantity() + { + $stubFacade = $this->generateFacadeStub(); + $stubContainer = $this->getMock('\Symfony\Component\DependencyInjection\Container'); + + $coupon = new RemoveXAmount($stubFacade); + $date = new \DateTime(); + $coupon->set($stubFacade, 'XMAS', '', '', '', 21.00, true, true, true, true, 254, $date->setTimestamp(strtotime("today + 3 months")) ); + + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::SUPERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 40.00, + MatchForTotalAmount::INPUT2 => 'EUR' + ); + $condition1->setValidatorsFromForm($operators, $values); + + $condition2 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::INFERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 400.00, + MatchForTotalAmount::INPUT2 => 'EUR' + ); + $condition2->setValidatorsFromForm($operators, $values); + + $conditions = new ConditionCollection(); + $conditions->add($condition1); + $conditions->add($condition2); + $coupon->setConditions($conditions); + + $stubFacade->expects($this->any()) + ->method('getCurrentCoupons') + ->will($this->returnValue(array($coupon))); + + $stubContainer->expects($this->any()) + ->method('get') + ->will($this->onConsecutiveCalls($stubFacade)); + + + $couponManager = new CouponManager($stubContainer); + + + $stubModel = $this->getMockBuilder('\Thelia\Model\Coupon') + ->disableOriginalConstructor() + ->getMock(); + $stubModel->expects($this->any()) + ->method('getMaxUsage') + ->will($this->returnValue(21)); + $stubModel->expects($this->any()) + ->method('setMaxUsage') + ->will($this->returnValue(true)); + + $actual = $couponManager->decrementQuantity($stubModel); + $expected = 20; + + $this->assertEquals($expected, $actual); + } + + /** + * @covers Thelia\Coupon\CouponManager::decrementQuantity + */ + public function testDecrementeQuantityIllimited() + { + $stubFacade = $this->generateFacadeStub(); + $stubContainer = $this->getMock('\Symfony\Component\DependencyInjection\Container'); + + $coupon = new RemoveXAmount($stubFacade); + $date = new \DateTime(); + $coupon->set($stubFacade, 'XMAS', '', '', '', 21.00, true, true, true, true, 254, $date->setTimestamp(strtotime("today + 3 months")) ); + + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::SUPERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 40.00, + MatchForTotalAmount::INPUT2 => 'EUR' + ); + $condition1->setValidatorsFromForm($operators, $values); + + $condition2 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::INFERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 400.00, + MatchForTotalAmount::INPUT2 => 'EUR' + ); + $condition2->setValidatorsFromForm($operators, $values); + + $conditions = new ConditionCollection(); + $conditions->add($condition1); + $conditions->add($condition2); + $coupon->setConditions($conditions); + + $stubFacade->expects($this->any()) + ->method('getCurrentCoupons') + ->will($this->returnValue(array($coupon))); + + $stubContainer->expects($this->any()) + ->method('get') + ->will($this->onConsecutiveCalls($stubFacade)); + + + $couponManager = new CouponManager($stubContainer); + + + $stubModel = $this->getMockBuilder('\Thelia\Model\Coupon') + ->disableOriginalConstructor() + ->getMock(); + $stubModel->expects($this->any()) + ->method('getMaxUsage') + ->will($this->returnValue(-1)); + $stubModel->expects($this->any()) + ->method('setMaxUsage') + ->will($this->returnValue(true)); + + $actual = $couponManager->decrementQuantity($stubModel); + $expected = -1; + + $this->assertEquals($expected, $actual); + } + + /** + * Generate adapter stub + * + * @param int $cartTotalPrice Cart total price + * @param string $checkoutCurrency Checkout currency + * @param string $i18nOutput Output from each translation + * + * @return \PHPUnit_Framework_MockObject_MockObject + */ + public function generateFacadeStub($cartTotalPrice = 400, $checkoutCurrency = 'EUR', $i18nOutput = '') + { + $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade') + ->disableOriginalConstructor() + ->getMock(); + + $currencies = CurrencyQuery::create(); + $currencies = $currencies->find(); + $stubFacade->expects($this->any()) + ->method('getAvailableCurrencies') + ->will($this->returnValue($currencies)); + + $stubFacade->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue($cartTotalPrice)); + + $stubFacade->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue($checkoutCurrency)); + + $stubFacade->expects($this->any()) + ->method('getConditionEvaluator') + ->will($this->returnValue(new ConditionEvaluator())); + + $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator') + ->disableOriginalConstructor() + ->getMock(); + $stubTranslator->expects($this->any()) + ->method('trans') + ->will($this->returnValue($i18nOutput)); + + $stubFacade->expects($this->any()) + ->method('getTranslator') + ->will($this->returnValue($stubTranslator)); + + return $stubFacade; + } +} diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php new file mode 100644 index 000000000..41971d4a6 --- /dev/null +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php @@ -0,0 +1,214 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Coupon\Type; +use Thelia\Condition\ConditionCollection; +use Thelia\Condition\ConditionEvaluator; +use Thelia\Condition\Implementation\MatchForTotalAmount; +use Thelia\Condition\Operators; +use Thelia\Coupon\FacadeInterface; +use Thelia\Model\CurrencyQuery; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Unit Test RemoveXAmount Class + * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2013-11-17 at 18:59:24. + * + * @package Coupon + * @author Guillaume MOREL + * + */ +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() + { + } + + /** + * Generate adapter stub + * + * @param int $cartTotalPrice Cart total price + * @param string $checkoutCurrency Checkout currency + * @param string $i18nOutput Output from each translation + * + * @return \PHPUnit_Framework_MockObject_MockObject + */ + public function generateFacadeStub($cartTotalPrice = 400, $checkoutCurrency = 'EUR', $i18nOutput = '') + { + $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade') + ->disableOriginalConstructor() + ->getMock(); + + $currencies = CurrencyQuery::create(); + $currencies = $currencies->find(); + $stubFacade->expects($this->any()) + ->method('getAvailableCurrencies') + ->will($this->returnValue($currencies)); + + $stubFacade->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue($cartTotalPrice)); + + $stubFacade->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue($checkoutCurrency)); + + $stubFacade->expects($this->any()) + ->method('getConditionEvaluator') + ->will($this->returnValue(new ConditionEvaluator())); + + $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator') + ->disableOriginalConstructor() + ->getMock(); + $stubTranslator->expects($this->any()) + ->method('trans') + ->will($this->returnValue($i18nOutput)); + + $stubFacade->expects($this->any()) + ->method('getTranslator') + ->will($this->returnValue($stubTranslator)); + + return $stubFacade; + } + + /** + * @covers Thelia\Coupon\Type\RemoveXAmount::set + * @covers Thelia\Coupon\Type\CouponAbstract::getCode + * @covers Thelia\Coupon\Type\RemoveXAmount::getTitle + * @covers Thelia\Coupon\Type\RemoveXAmount::getShortDescription + * @covers Thelia\Coupon\Type\RemoveXAmount::getDescription + * @covers Thelia\Coupon\Type\RemoveXAmount::isCumulative + * @covers Thelia\Coupon\Type\RemoveXAmount::isRemovingPostage + * @covers Thelia\Coupon\Type\RemoveXAmount::isAvailableOnSpecialOffers + * @covers Thelia\Coupon\Type\RemoveXAmount::isEnabled + * @covers Thelia\Coupon\Type\RemoveXAmount::getMaxUsage + * @covers Thelia\Coupon\Type\RemoveXAmount::getExpirationDate + * @covers Thelia\Coupon\Type\RemoveXAmount::setConditions + */ + public function testSet() + { + $stubFacade = $this->generateFacadeStub(); + + $coupon = new RemoveXAmount($stubFacade); + $date = new \DateTime(); + $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.'; + + $coupon->set($stubFacade, 'XMAS', 'XMAS Coupon', 'Coupon for Springbreak removing 10€ if you have a cart between 40.00€ and 400.00€ (excluded)', $description, 10.00, true, true, true, true, 254, $date->setTimestamp(strtotime("today + 3 months")) ); + + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::SUPERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 40.00, + MatchForTotalAmount::INPUT2 => 'EUR' + ); + $condition1->setValidatorsFromForm($operators, $values); + + $condition2 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::INFERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 400.00, + MatchForTotalAmount::INPUT2 => 'EUR' + ); + $condition2->setValidatorsFromForm($operators, $values); + + $conditions = new ConditionCollection(); + $conditions->add($condition1); + $conditions->add($condition2); + $coupon->setConditions($conditions); + + $this->assertEquals('XMAS', $coupon->getCode()); + $this->assertEquals('XMAS Coupon', $coupon->getTitle()); + $this->assertEquals('Coupon for Springbreak removing 10€ if you have a cart between 40.00€ and 400.00€ (excluded)', $coupon->getShortDescription()); + $this->assertEquals($description, $coupon->getDescription()); + $this->assertEquals(true, $coupon->isCumulative()); + $this->assertEquals(true, $coupon->isRemovingPostage()); + $this->assertEquals(true, $coupon->isAvailableOnSpecialOffers()); + $this->assertEquals(true, $coupon->isEnabled()); + + $this->assertEquals(254, $coupon->getMaxUsage()); + $this->assertEquals($date, $coupon->getExpirationDate()); + + $this->assertEquals(10.00, $coupon->exec()); + } + + /** + * @covers Thelia\Coupon\Type\RemoveXAmount::getName + */ + public function testGetName() + { + $stubFacade = $this->generateFacadeStub(399, 'EUR', 'Remove X amount to total cart'); + + /** @var FacadeInterface $stubFacade */ + $coupon = new RemoveXAmount($stubFacade); + + $actual = $coupon->getName(); + $expected = 'Remove X amount to total cart'; + $this->assertEquals($expected, $actual); + } + + /** + * @covers Thelia\Coupon\Type\RemoveXAmount::getToolTip + */ + public function testGetToolTip() + { + $tooltip = 'This coupon will remove the entered amount to the customer total checkout. If the discount is superior to the total checkout price the customer will only pay the postage. Unless if the coupon is set to remove postage too.'; + $stubFacade = $this->generateFacadeStub(399, 'EUR', $tooltip); + + /** @var FacadeInterface $stubFacade */ + $coupon = new RemoveXAmount($stubFacade); + + $actual = $coupon->getToolTip(); + $expected = $tooltip; + $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() + { + } +} diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php new file mode 100644 index 000000000..475e46aba --- /dev/null +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php @@ -0,0 +1,204 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Coupon\Type; +use Thelia\Condition\ConditionCollection; +use Thelia\Condition\ConditionEvaluator; +use Thelia\Condition\Implementation\MatchForTotalAmount; +use Thelia\Condition\Operators; +use Thelia\Coupon\FacadeInterface; +use Thelia\Model\CurrencyQuery; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Unit Test RemoveXPercent Class + * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2013-11-17 at 18:59:24. + * + * @package Coupon + * @author Guillaume MOREL + * + */ +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() + { + } + + /** + * Generate adapter stub + * + * @param int $cartTotalPrice Cart total price + * @param string $checkoutCurrency Checkout currency + * @param string $i18nOutput Output from each translation + * + * @return \PHPUnit_Framework_MockObject_MockObject + */ + public function generateFacadeStub($cartTotalPrice = 400, $checkoutCurrency = 'EUR', $i18nOutput = '') + { + $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade') + ->disableOriginalConstructor() + ->getMock(); + + $currencies = CurrencyQuery::create(); + $currencies = $currencies->find(); + $stubFacade->expects($this->any()) + ->method('getAvailableCurrencies') + ->will($this->returnValue($currencies)); + + $stubFacade->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue($cartTotalPrice)); + + $stubFacade->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue($checkoutCurrency)); + + $stubFacade->expects($this->any()) + ->method('getConditionEvaluator') + ->will($this->returnValue(new ConditionEvaluator())); + + $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator') + ->disableOriginalConstructor() + ->getMock(); + $stubTranslator->expects($this->any()) + ->method('trans') + ->will($this->returnValue($i18nOutput)); + + $stubFacade->expects($this->any()) + ->method('getTranslator') + ->will($this->returnValue($stubTranslator)); + + return $stubFacade; + } + + /** + * @covers Thelia\Coupon\Type\RemoveXPercent::set + * @covers Thelia\Coupon\Type\RemoveXPercent::exec + */ + public function testSet() + { + $stubFacade = $this->generateFacadeStub(); + + $coupon = new RemoveXPercent($stubFacade); + $date = new \DateTime(); + $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.'; + + $coupon->set($stubFacade, 'XMAS', 'XMAS Coupon', 'Coupon for Springbreak removing 10% if you have a cart between 40.00€ and 400.00€ (excluded)', $description, 10.00, true, true, true, true, 254, $date->setTimestamp(strtotime("today + 3 months")) ); + + $condition1 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::SUPERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 40.00, + MatchForTotalAmount::INPUT2 => 'EUR' + ); + $condition1->setValidatorsFromForm($operators, $values); + + $condition2 = new MatchForTotalAmount($stubFacade); + $operators = array( + MatchForTotalAmount::INPUT1 => Operators::INFERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL + ); + $values = array( + MatchForTotalAmount::INPUT1 => 400.00, + MatchForTotalAmount::INPUT2 => 'EUR' + ); + $condition2->setValidatorsFromForm($operators, $values); + + $conditions = new ConditionCollection(); + $conditions->add($condition1); + $conditions->add($condition2); + $coupon->setConditions($conditions); + + $this->assertEquals('XMAS', $coupon->getCode()); + $this->assertEquals('XMAS Coupon', $coupon->getTitle()); + $this->assertEquals('Coupon for Springbreak removing 10% if you have a cart between 40.00€ and 400.00€ (excluded)', $coupon->getShortDescription()); + $this->assertEquals($description, $coupon->getDescription()); + $this->assertEquals(true, $coupon->isCumulative()); + $this->assertEquals(true, $coupon->isRemovingPostage()); + $this->assertEquals(true, $coupon->isAvailableOnSpecialOffers()); + $this->assertEquals(true, $coupon->isEnabled()); + + $this->assertEquals(254, $coupon->getMaxUsage()); + $this->assertEquals($date, $coupon->getExpirationDate()); + + $this->assertEquals(40.00, $coupon->exec()); + } + + /** + * @covers Thelia\Coupon\Type\RemoveXPercent::getName + */ + public function testGetName() + { + $stubFacade = $this->generateFacadeStub(399, 'EUR', 'Remove X percent to total cart'); + + /** @var FacadeInterface $stubFacade */ + $coupon = new RemoveXPercent($stubFacade); + + $actual = $coupon->getName(); + $expected = 'Remove X percent to total cart'; + $this->assertEquals($expected, $actual); + } + + /** + * @covers Thelia\Coupon\Type\RemoveXPercent::getToolTip + */ + public function testGetToolTip() + { + $tooltip = 'This coupon will remove the entered percentage to the customer total checkout. If the discount is superior to the total checkout price the customer will only pay the postage. Unless if the coupon is set to remove postage too.'; + $stubFacade = $this->generateFacadeStub(399, 'EUR', $tooltip); + + /** @var FacadeInterface $stubFacade */ + $coupon = new RemoveXPercent($stubFacade); + + $actual = $coupon->getToolTip(); + $expected = $tooltip; + $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() + { + } +} diff --git a/core/lib/Thelia/Tools/NumberFormat.php b/core/lib/Thelia/Tools/NumberFormat.php index ae25404d7..f3e69129b 100644 --- a/core/lib/Thelia/Tools/NumberFormat.php +++ b/core/lib/Thelia/Tools/NumberFormat.php @@ -39,6 +39,22 @@ class NumberFormat return new NumberFormat($request); } + /** + * Get a standard number, with '.' as decimal point and no thousands separator + * so that this number can be used to perform calculations. + * + * @param float $number the number + * @param string $decimals number of decimal figures + */ + public function formatStandardNumber($number, $decimals = null) { + + $lang = $this->request->getSession()->getLang(); + + if ($decimals == null) $decimals = $lang->getDecimals(); + + return number_format($number, $decimals, '.', ''); + } + public function format($number, $decimals = null, $decPoint = null, $thousandsSep = null) { $lang = $this->request->getSession()->getLang(); diff --git a/core/lib/Thelia/Tools/URL.php b/core/lib/Thelia/Tools/URL.php index d00c5c4ab..85f5289cd 100755 --- a/core/lib/Thelia/Tools/URL.php +++ b/core/lib/Thelia/Tools/URL.php @@ -286,7 +286,7 @@ class URL } /** - * Genenerate the file part of a rewriten URL from a given baseString, using a view, a view id and a locale + * Genenerate the file part of a rewritten URL from a given baseString, using a view, a view id and a locale * * @param $view * @param $viewId diff --git a/install/faker.php b/install/faker.php index 23b6b048a..30a55f397 100755 --- a/install/faker.php +++ b/install/faker.php @@ -1,12 +1,12 @@ getContainer(); /** @var FacadeInterface $adapter */ - $adapter = $container->get('thelia.adapter'); + $adapter = $container->get('thelia.facade'); // Coupons $coupon1 = new Thelia\Model\Coupon(); @@ -669,25 +669,25 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua $date = new \DateTime(); $coupon1->setExpirationDate($date->setTimestamp(strtotime("today + 3 months"))); - $condition1 = new MatchForTotalAmountManager($adapter); + $condition1 = new MatchForTotalAmount($adapter); $operators = array( - MatchForTotalAmountManager::INPUT1 => Operators::SUPERIOR, - MatchForTotalAmountManager::INPUT2 => Operators::EQUAL + MatchForTotalAmount::INPUT1 => Operators::SUPERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL ); $values = array( - MatchForTotalAmountManager::INPUT1 => 40.00, - MatchForTotalAmountManager::INPUT2 => 'EUR' + MatchForTotalAmount::INPUT1 => 40.00, + MatchForTotalAmount::INPUT2 => 'EUR' ); $condition1->setValidatorsFromForm($operators, $values); - $condition2 = new MatchForTotalAmountManager($adapter); + $condition2 = new MatchForTotalAmount($adapter); $operators = array( - MatchForTotalAmountManager::INPUT1 => Operators::INFERIOR, - MatchForTotalAmountManager::INPUT2 => Operators::EQUAL + MatchForTotalAmount::INPUT1 => Operators::INFERIOR, + MatchForTotalAmount::INPUT2 => Operators::EQUAL ); $values = array( - MatchForTotalAmountManager::INPUT1 => 400.00, - MatchForTotalAmountManager::INPUT2 => 'EUR' + MatchForTotalAmount::INPUT1 => 400.00, + MatchForTotalAmount::INPUT2 => 'EUR' ); $condition2->setValidatorsFromForm($operators, $values); @@ -727,12 +727,12 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua $date = new \DateTime(); $coupon2->setExpirationDate($date->setTimestamp(strtotime("today + 1 months"))); - $condition1 = new MatchForXArticlesManager($adapter); + $condition1 = new MatchForXArticles($adapter); $operators = array( - MatchForXArticlesManager::INPUT1 => Operators::SUPERIOR, + MatchForXArticles::INPUT1 => Operators::SUPERIOR, ); $values = array( - MatchForXArticlesManager::INPUT1 => 4, + MatchForXArticles::INPUT1 => 4, ); $condition1->setValidatorsFromForm($operators, $values); $conditions = new ConditionCollection(); @@ -771,7 +771,7 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua $date = new \DateTime(); $coupon3->setExpirationDate($date->setTimestamp(strtotime("today + 2 months"))); - $condition1 = new MatchForEveryoneManager($adapter); + $condition1 = new MatchForEveryone($adapter); $operators = array(); $values = array(); $condition1->setValidatorsFromForm($operators, $values); diff --git a/install/faker_add_ecotax.php b/install/faker_add_ecotax.php index 4a9c8de39..e158fcbfc 100755 --- a/install/faker_add_ecotax.php +++ b/install/faker_add_ecotax.php @@ -1,12 +1,8 @@ 'Images', 'Documents' => 'Documents', 'Rewritten URL' => 'Rewritten URL', - 'Rewriten URL' => 'Rewriten URL', 'Top level' => 'Top level', 'Visibility' => 'Visibility', 'Category created on %date_create. Last modification: %date_change' => 'Category created on %date_create. Last modification: %date_change', diff --git a/templates/backOffice/default/I18n/es_ES.php b/templates/backOffice/default/I18n/es_ES.php index 6884502b9..58f83ebb2 100755 --- a/templates/backOffice/default/I18n/es_ES.php +++ b/templates/backOffice/default/I18n/es_ES.php @@ -308,9 +308,7 @@ return array ( 'Conclusion' => '', 'A short post-description information' => '', 'Short conclusion' => '', - 'Rewriten URL *' => '', 'Rewritten URL' => '', - 'Rewriten URL' => '', 'Parent category *' => '', 'Top level' => '', 'Visibility' => '', diff --git a/templates/backOffice/default/I18n/fr_FR.php b/templates/backOffice/default/I18n/fr_FR.php index 4d482cb30..4de1389cc 100755 --- a/templates/backOffice/default/I18n/fr_FR.php +++ b/templates/backOffice/default/I18n/fr_FR.php @@ -1,341 +1,341 @@ 'Page non trouvée', - 'The server returned a "404 Not Found"' => 'Le serveur à retourné l\'erreur "404 non trouvé"', - 'The page you\'ve requested was not found. Please check the page address, and try again.' => 'La page que vous avez demandé n\'est pas disponible.', - 'Thelia Back Office' => 'Thelia Back Office', - 'Version %ver' => 'Version %ver', - 'View site' => 'Voir le site', - 'View shop' => 'Voir la boutique', - 'Profil' => 'Profile', - 'Close administation session' => 'Quitter l\'interface d\'administration', - 'Logout' => 'Se déconnecter', - 'Home' => 'Accueil', - 'Customers' => 'Clients', - 'Orders' => 'Commandes', - 'All orders' => 'Toutes les commandes', - 'Catalog' => 'Catalogue', - 'Folders' => 'Dossier', - 'Coupons' => 'Codes Promo', - 'Configuration' => 'Configuration', - 'Modules' => 'Modules', - 'Search' => 'Recherche', - 'Thelia, the open source e-commerce solution' => 'Thelia, solution e-commerce libre', - '© Thelia 2013' => '© Thelia 2013', - 'Published by OpenStudio' => 'Edité par OpenStudio', - 'Thelia support forum' => 'Communauté Thelia', - 'Thelia contributions' => 'Contributions Thelia', - 'Thelia Mailing System' => 'Configuration des envois de mails', - 'Administration logs' => 'Gestion des logs', - 'Show logs' => 'Voir les loge', - 'Period' => 'Période', - 'From' => 'De', - 'To' => 'A', - 'Administrators' => 'Administrateurs', - 'Resources' => 'Ressources', - 'Back-office users' => 'Utilisateurs du back-office', - 'Taxes' => 'Taxes', - 'Create a new administrator' => 'Créer un nouvel administrateur', - 'Login' => 'Connexion', - 'First Name' => 'Prénom', - 'Last Name' => 'Nom', - 'Profile' => 'Profile', - 'Actions' => 'Actions', - 'Superadministrator' => 'Super-administrateur', - 'Change this administrator' => 'Modifier cet administrateur', - 'Delete this administrator' => 'Supprimer cet administrateur', - 'FirstName' => 'Prénom', - 'LastName' => 'Nom', - 'Password' => 'Mot de passe', - 'Create' => 'Créer', - 'Cancel' => 'Annuler', - 'Leave empty to keep current password' => 'Laisser ce champ vide pour ne pas modifier le mot de passe', - 'Update a new administrator' => 'Modifier cet administrateur', - 'Update' => 'Mettre à jour', - 'Delete administrator' => 'Supprimer un administrateur', - 'Do you really want to delete this administrator ?' => 'Confirmez-vous la suppression de cet adminisrateur ?', - 'You can\'t delete this administrator' => 'Vous ne pouvez pas supprimer cet administrateur', - 'They are some administrator which are linked to this administrator. Please edit/remove them before deleting this administrator.' => 'Cet administrateur est lié avec un ou plusieurs autres administrateurs. Supprimez ou modifiez ces administrateur d\'abord.', - 'Label' => 'Libellé', - 'Company' => 'Entreprise', - 'Edit a language' => 'Modifier une langue', - 'Edit this language' => 'Modifier cette langue', - 'Current product template' => 'Gabarit de produit actuel', - 'Do not use a product template' => 'Ne pas utiliser de gabarit', - 'Apply' => 'Appliquer', - 'Product Attributes' => 'Déclinaisons du produit', - 'ID' => 'ID', - 'Attribute Name' => 'Nom de la déclinaison', - 'This product template does not contains any features' => 'Ce gabarit de produit ne comporte aucune caractéristique', - 'Product Features' => 'Caractéristiques du produit', - 'Feature Name' => 'Nom de la caractéristique', - 'Feature value for this product' => 'Valeur de la caractéristique', - 'Use Ctrl+click to select more than one value. You can also clear selected values.' => 'Utilisez Ctrl+clic pour choisir plus d\'une valeur. Vous pouvez aussi tout désélectionner.', - 'Enter here the feature value as free text' => 'Indiquez ici la valeur de la caractéristique', - 'Feature value' => 'Valeur de la caractéristique', - 'Related content' => 'Contenu associé', - 'You can attach here some content to this product' => 'Attachez ici un ou plusieurs contenus à ce produit', - 'Select a folder...' => 'Choisissez un dossier de contenu...', - 'Select a folder to get its content' => 'Choisissez un dossier de contenu pour lister ses contenus', - 'Select a folder content...' => 'Choisissez un dossier de contenu...', - 'Select a content and click (+) to add it to this product' => 'Chosiissez un contenu, et cliquez [+] pour l\'attacher au produit', - 'No available content in this folder' => 'Ce dossier est vide de contenus', - 'No folders found' => 'Aucun dossier n\'a été trouvé.', - 'Content title' => 'Titre du contenu', - 'Position' => 'Position', - 'Delete this content' => 'Supprimer ce contenu', - 'Category title' => 'Titre de la catégorie', - 'Enter new category position' => 'Classement de la catégorie ', - 'Lire la suite' => 'Lire la suite', - 'Value' => 'Valeur', - 'Title' => 'Civilité', - 'Product attributes' => 'Attributs produit', - 'Categories' => 'Catégories', - 'Top level categories' => 'Catégories de niveau 1 ', - 'Add a new category' => 'Ajouter une catégorie', - 'Online' => 'En ligne', - 'Browse this category' => 'Parcourir cette catégorie', - 'Edit this category' => 'Editer cette catégorie', - 'Delete this category and all its contents' => 'Supprimer cette catégorie et tout ce qu\'elle contient ? ', - 'This category has no sub-categories. To create a new one, click the + button above.' => 'Cette catégorie n\'a pas de sous-catégorie. Pour en créer une nouvelle, cliquez sur le bouton + ci-dessus.', - 'This category has no sub-categories.' => 'Cette catégorie n\'a pas de sous-catégorie.', - 'Top level Products' => 'Produits mis en avant', - 'Add a new product' => 'Ajouter un nouveau produit', - 'Reference' => 'Reference', - 'Product title' => 'Titre du produit', - 'This category doesn\'t contains any products. To add a new product, click the + button above.' => 'Cette catégorie n\'a aucun produit. Pour créer un nouveau product, cliques sur le bouton + ci-dessus. ', - 'Name' => 'Nom', - 'Enter here the category name in the default language (%title)' => 'Entrer ici le nom de la catégorie dans la langue par défaut (%title)', - 'Create a new category' => 'Créer une catégorie', - 'Create this category' => 'Créer cette catégorie', - 'Enter here the product reference' => 'Entrez ici la nouvelle référence produit', - 'Enter here the product name in the default language (%title)' => 'Entrez ici le nom du produit dans la langue par défaut (%title)', - 'Product price' => 'Prix du produit', - 'Enter here the product price in the default currency (%title)' => 'ntrez ici le prix du produit dans la langue par défaut (%title)', - 'Select a tax tule' => 'Sélectionnez une règle de taxes', - 'Select here the tax applicable to this product' => 'Sélectionnez ici la taxe applicable sur ce produit', - 'Product weight' => 'Poids du produit', - 'Kg' => 'Kg', - 'Enter here the product weight, in Kilogrammes' => 'Entrez ici le poids du produit, en Kilogrammes', - 'Create a new product' => 'Créer un nouveau produit', - 'Create this product' => 'Créer ce produit', - 'Delete category' => 'Supprimer cette catégorie', - 'Do you really want to delete this category and all its content ?' => 'Voulez-vous vraiment supprimer cette catégorie et tout ce qu\'elle contient ?', - 'Delete product' => 'Supprimer ce produit', - 'Do you really want to delete this product ?' => 'Voulez-vous vraiment supprimer ce produit ?', - 'Enter new product position' => 'Classement du produit', - 'Edit category' => 'Editer la catégorie', - 'Edit category %title' => 'Editer le titre de la catégorie : %title', - 'Thelia configuration' => 'Configuration thelia', - 'Product catalog configuration' => 'Configuration du catalogue produit', - 'Product templates' => 'Template produit', - 'Product features' => 'Caractéristiques produit', - 'Mailing templates' => 'Template e-mail', - 'Currencies' => 'Monnaie', - 'Taxes rules' => 'Règles de taxes', - 'Shipping configuration' => 'Configuration du transport', - 'Countries' => 'Pays', - 'Shipping zones' => 'Zones de livraison', - 'System parameters' => 'Paramètres système ', - 'System variables' => 'Gestion des variables', - 'Administration profiles' => 'Gestion des administrateurs', - 'Languages & URLs' => 'Langues et URLs', - 'Mailing system' => 'Envoi des e-mails', - 'System logs' => 'Journal des logs', - 'And' => 'Et', - 'Edit' => 'Editer', - 'Delete' => 'Supprimer', - 'Code :' => 'Code', - 'code' => 'code', - 'Title :' => 'Titre', - 'title' => 'titre', - 'Is enabled' => 'Est valide', - 'Is available on special offers' => 'Est valide sur les offres promotionnelles', - 'Is cumulative' => 'Est cumulable', - 'Is removing postage' => 'Offre les frais de port', - 'Expiration date :' => 'Date de fin de validité', - 'yyyy-mm-dd' => 'jjjj--mm--aa', - 'Is unlimited' => 'Est illimité', - 'Max usage :' => 'Utilisations max', - 'max usage' => 'utilisations max', - 'Type :' => 'Type', - 'Please select a coupon type' => 'Merci d\'entrer le type de code', - 'Amount :' => 'Montant', - '14.50' => '14.50', - 'Short description :' => 'Description courte', - 'short description' => 'description court', - 'Long description :' => 'Description longue', - 'long description' => 'description longue', - 'Save your modifications' => 'Enregistrer les modifications', - 'Conditions' => 'Conditions', - 'Save this condition' => 'Enregistrer cette condition', - 'Condition\'s category :' => 'Type de condition', - 'Please select a condition category' => 'Merci d\'entrer le type de condition', - 'Coupon' => 'Code promo', - 'Coupons : ' => 'Codes promo', - 'Create a new coupon' => 'Créer un nouveau code promo', - 'Browse' => 'Parcourir', - 'List' => 'Liste', - 'Enabled coupons' => 'Codes promo disponibles', - 'Code' => 'Code', - 'Days before expiration' => 'Jours de validité', - 'Usage left' => 'Utilisation restante', - 'Unlimited' => 'Illimité', - 'Disabled coupons' => 'Codes désactivés', - 'Expiration date' => 'Date de fin', - 'Amount' => 'Montant', - 'Update coupon' => 'Mettre à jour le code', - 'Please retry' => 'Merci de réessayer', - 'Please select another condition' => 'Merci de sélectionner une autre condition', - 'Edit a customer' => 'Editer un client', - 'Editing customer "%name"' => 'Edition du client "%name"', - 'Customer informations' => 'Informations client', - 'Firstname' => 'Prénom', - 'Lastname' => 'Nom', - 'Default address' => 'Adresse par défaut', - 'Address' => 'Adresse', - 'Additional address' => 'Adresse complémentaire', - 'Zip code' => 'Code postal', - 'City' => 'Ville', - 'Other addresses' => 'Autres adresses', - 'Add a new address' => 'Ajouter une nouvelle adresse', - 'Phone' => 'Téléphone', - 'Edit this address' => 'Editer cette adresse', - 'Use this address by default' => 'Utiliser comme adresse par défaut', - 'Delete this customer and all his orders' => 'Supprimer ce client et toutes ses commandes', - 'orders for this customer' => 'commandes pour ce client', - 'Order n°' => 'Commande n° ', - 'Date & Hour' => 'Date et heure', - 'Status' => 'Etat', - 'Create this address' => 'Créer cette adresse', - 'Use address by default' => 'Utiliser comme adresse par défaut', - 'Do you really want to use this address by default ?' => 'Voulez-vous vraiment utiliser cette adresse comme adresse par défaut ?', - 'Delete address' => 'Supprimer cette adresse', - 'Do you really want to delete this address ?' => 'Voulez-vous vraiment supprimer cette adresse ?', - 'Customer' => 'Client', - 'Customers list' => 'Liste des clients', - 'Add a new Customer' => 'Ajouter un client', - 'Edit this customer' => 'Modifier ce client', - 'Send a mail to this customer' => 'Contacter ce client par mail', - 'Email address' => 'Adresse e-mail', - 'Create a new customer' => 'Ajouter un client', - 'Create this customer' => 'Ajouter ce client', - 'Delete customer' => 'Supprimer ce client', - 'Do you really want to delete this customer ?' => 'Voulez-vous supprimer ce client ? ', - 'Back' => 'Retour', - 'Save' => ' Enregistrer', - 'Description' => 'Description', - 'Back-office home' => 'Accueil administration', - 'Dashboard' => 'Tableau de bord', - 'Sales' => 'Ventes', - 'New customers' => 'Nouveaux clients', - 'First orders' => 'Premières commandes', - 'Aborted orders' => 'Paniers abandonnés', - 'Shop Informations' => 'Informations sur le magasin', - 'Products' => 'Produits', - 'Online products' => 'Produits en ligne', - 'Offline products' => 'Produits hors ligne', - 'Sales statistics' => 'Statistiques de vente', - 'Today' => 'Aujourd\'hui', - 'This month' => 'Ce mois', - 'This year' => 'Cette année', - 'Overall sales' => 'Total des ventes', - 'Sales excluding shipping' => 'Ventes hors frais de port', - 'Yesterday sales' => 'Ventes de la veille', - 'Average cart' => 'Panier moyen', - 'Previous month sales' => 'Ventes du mois précédent', - 'Previous year sales' => 'Ventes de l\année précédente', - 'Thelia informations' => 'Informations Thelia', - 'Current version' => 'Version en cours', - 'Latest version available' => 'Dernière version disponible', - 'News' => 'Actualités', - 'Click here' => 'Cliquez ici', - 'Editing %cat' => 'Edition de %cat', - 'No' => 'Non', - 'Yes' => 'Oui', - 'OK' => 'OK', - 'Save and close' => 'Enregistrer et fermer', - 'Quantity' => 'Quantité', - 'deactivate' => 'désactiver', - 'en_US' => 'en_US', - 'd-m-Y' => 'j-m-A', - 'Username' => 'Nom d\'utilisateur', - 'Host :' => 'Host', - 'Host' => 'Host', - 'Port :' => 'Port', - 'Port' => 'Port', - 'Username :' => 'Nom d\'utilisateur', - 'Password :' => 'Mot de passe', - 'Source IP :' => 'IP source', - 'Source IP' => 'IP source', - 'Variable name' => 'Nom de la variable', - 'Purpose' => 'Objet', - 'Edit an order' => 'Editer une commande', - 'Ordered products' => 'Produits commandés', - 'Invoice and Delivery' => 'Livraison et facturation', - 'Cart' => 'Panier', - 'Product' => 'Produit', - 'Unit. price' => 'Prix unitaire', - 'Tax' => 'Taxes', - 'Unit taxed price' => 'Prix unitaire TTC', - 'Taxed total' => 'Montant total des taxes', - 'Total without discount' => 'Montant total hors remises', - 'Discount' => 'Remise', - 'Coupon code' => 'Code promo', - 'Total including discount' => 'Total avec remise', - 'Postage' => 'Frais de livraison', - 'Total' => 'Total', - 'Payment information' => 'Informations de paiement', - 'Payment module' => 'Module de paiement', - 'Transaction reference' => 'Référence de la transaction', - 'Delivery module' => 'Module de livraison', - 'tracking reference' => 'Reference Tracking', - 'Invoice informations' => 'Informations de facturation', - 'Download invoice as PDF' => 'Télécharger la facture au format PDF', - 'PDF | Invoice' => 'Facure PDF', - 'Edit invoice address' => 'Editer l\'adresse de facturation', - 'Invoice reference' => 'Facture ref', - 'Invoice date' => 'Facture date', - 'Street address' => 'Adresse', - 'Country' => 'Pays', - 'Delivery address' => 'Adresse de livraison', - 'Download purchase order as PDF' => 'Télécharger le bon de commande au format PDF', - 'PDF | Purchase order' => 'Bon de commande PDF', - 'Edit delivery address' => 'Editer l\'adresse de livraison', - 'Edit order address' => 'Editer l\'adresse de commande ', - 'Confirm changes' => 'Valider les modifications', - 'Edit this order' => 'Editer cette commande ', - 'Cancel this order' => 'Annuler cette commande', - 'Delete an order' => 'Supprimer une commande', - 'Do you really want to cancel this order ?' => 'Voulez-vous vraiment sup primer cette commande ? ', - 'View' => 'Voir', - 'customer ref' => 'ref client', - 'company' => 'entreprise', - 'firstname & lastname' => 'Prénom & nom', - 'last order' => 'Dernière commande', - 'order amount' => 'Montant de la commande', - 'Add' => 'Ajouter', - 'Warning' => 'Attention', - 'Edit a system variable' => 'Modifier une variable système', - 'Editing variable "%name"' => 'Modification de la variable "%name" ', - 'Edit variable %name' => 'Modifier de la variable "%name" ', - 'Variable value' => 'Valeur de la variable', - 'Variable created on %date_create. Last modification: %date_change' => 'Variable créée le %date_create. Dernière modification: %date_change', - 'Sorry, variable ID=%id was not found.' => 'Désolé, la variable ID=%id n\'a pas été trouvée.', - 'Thelia System Variables' => 'Variables Thelia', - 'Thelia system variables' => 'Variables Thelia', - 'Add a new variable' => 'Ajouter une variable', - 'Save chages' => 'Enregistrer les modifications', - 'Save changes' => 'Enregistrer les modifications', - 'Action' => 'Action', - 'Change this variable' => 'Modifier cette variable', - 'Cancel changes and revert to original value' => 'Annuler les modifications et revenir à la version antérieure', - 'Delete this variable' => 'Supprimer cette variable', - 'This variable could not be changed.' => 'Cette variable ne peut pas être modifiée', - 'Variable purpose' => 'Objet de la variable', - 'Create a new variable' => 'Créer une nouvelle variable', - 'Create this variable' => 'Ajouter cette variable', - 'Delete a variable' => 'Supprimer une variable', - 'Do you really want to delete this variable ?' => 'Voulez-vous vraiment supprimer cette variable ?', + 'Page not found' => 'Page non trouvée', + 'The server returned a "404 Not Found"' => 'Le serveur à retourné l\'erreur "404 non trouvé"', + 'The page you\'ve requested was not found. Please check the page address, and try again.' => 'La page que vous avez demandé n\'est pas disponible.', + 'Thelia Back Office' => 'Thelia Back Office', + 'Version %ver' => 'Version %ver', + 'View site' => 'Voir le site', + 'View shop' => 'Voir la boutique', + 'Profil' => 'Profile', + 'Close administation session' => 'Quitter l\'interface d\'administration', + 'Logout' => 'Se déconnecter', + 'Home' => 'Accueil', + 'Customers' => 'Clients', + 'Orders' => 'Commandes', + 'All orders' => 'Toutes les commandes', + 'Catalog' => 'Catalogue', + 'Folders' => 'Dossier', + 'Coupons' => 'Codes Promo', + 'Configuration' => 'Configuration', + 'Modules' => 'Modules', + 'Search' => 'Recherche', + 'Thelia, the open source e-commerce solution' => 'Thelia, solution e-commerce libre', + '© Thelia 2013' => '© Thelia 2013', + 'Published by OpenStudio' => 'Edité par OpenStudio', + 'Thelia support forum' => 'Communauté Thelia', + 'Thelia contributions' => 'Contributions Thelia', + 'Thelia Mailing System' => 'Configuration des envois de mails', + 'Administration logs' => 'Gestion des logs', + 'Show logs' => 'Voir les loge', + 'Period' => 'Période', + 'From' => 'De', + 'To' => 'A', + 'Administrators' => 'Administrateurs', + 'Resources' => 'Ressources', + 'Back-office users' => 'Utilisateurs du back-office', + 'Taxes' => 'Taxes', + 'Create a new administrator' => 'Créer un nouvel administrateur', + 'Login' => 'Connexion', + 'First Name' => 'Prénom', + 'Last Name' => 'Nom', + 'Profile' => 'Profile', + 'Actions' => 'Actions', + 'Superadministrator' => 'Super-administrateur', + 'Change this administrator' => 'Modifier cet administrateur', + 'Delete this administrator' => 'Supprimer cet administrateur', + 'FirstName' => 'Prénom', + 'LastName' => 'Nom', + 'Password' => 'Mot de passe', + 'Create' => 'Créer', + 'Cancel' => 'Annuler', + 'Leave empty to keep current password' => 'Laisser ce champ vide pour ne pas modifier le mot de passe', + 'Update a new administrator' => 'Modifier cet administrateur', + 'Update' => 'Mettre à jour', + 'Delete administrator' => 'Supprimer un administrateur', + 'Do you really want to delete this administrator ?' => 'Confirmez-vous la suppression de cet adminisrateur ?', + 'You can\'t delete this administrator' => 'Vous ne pouvez pas supprimer cet administrateur', + 'They are some administrator which are linked to this administrator. Please edit/remove them before deleting this administrator.' => 'Cet administrateur est lié avec un ou plusieurs autres administrateurs. Supprimez ou modifiez ces administrateur d\'abord.', + 'Label' => 'Libellé', + 'Company' => 'Entreprise', + 'Edit a language' => 'Modifier une langue', + 'Edit this language' => 'Modifier cette langue', + 'Current product template' => 'Gabarit de produit actuel', + 'Do not use a product template' => 'Ne pas utiliser de gabarit', + 'Apply' => 'Appliquer', + 'Product Attributes' => 'Déclinaisons du produit', + 'ID' => 'ID', + 'Attribute Name' => 'Nom de la déclinaison', + 'This product template does not contains any features' => 'Ce gabarit de produit ne comporte aucune caractéristique', + 'Product Features' => 'Caractéristiques du produit', + 'Feature Name' => 'Nom de la caractéristique', + 'Feature value for this product' => 'Valeur de la caractéristique', + 'Use Ctrl+click to select more than one value. You can also clear selected values.' => 'Utilisez Ctrl+clic pour choisir plus d\'une valeur. Vous pouvez aussi tout désélectionner.', + 'Enter here the feature value as free text' => 'Indiquez ici la valeur de la caractéristique', + 'Feature value' => 'Valeur de la caractéristique', + 'Related content' => 'Contenu associé', + 'You can attach here some content to this product' => 'Attachez ici un ou plusieurs contenus à ce produit', + 'Select a folder...' => 'Choisissez un dossier de contenu...', + 'Select a folder to get its content' => 'Choisissez un dossier de contenu pour lister ses contenus', + 'Select a folder content...' => 'Choisissez un dossier de contenu...', + 'Select a content and click (+) to add it to this product' => 'Chosiissez un contenu, et cliquez [+] pour l\'attacher au produit', + 'No available content in this folder' => 'Ce dossier est vide de contenus', + 'No folders found' => 'Aucun dossier n\'a été trouvé.', + 'Content title' => 'Titre du contenu', + 'Position' => 'Position', + 'Delete this content' => 'Supprimer ce contenu', + 'Category title' => 'Titre de la catégorie', + 'Enter new category position' => 'Classement de la catégorie ', + 'Lire la suite' => 'Lire la suite', + 'Value' => 'Valeur', + 'Title' => 'Civilité', + 'Product attributes' => 'Attributs produit', + 'Categories' => 'Catégories', + 'Top level categories' => 'Catégories de niveau 1 ', + 'Add a new category' => 'Ajouter une catégorie', + 'Online' => 'En ligne', + 'Browse this category' => 'Parcourir cette catégorie', + 'Edit this category' => 'Editer cette catégorie', + 'Delete this category and all its contents' => 'Supprimer cette catégorie et tout ce qu\'elle contient ? ', + 'This category has no sub-categories. To create a new one, click the + button above.' => 'Cette catégorie n\'a pas de sous-catégorie. Pour en créer une nouvelle, cliquez sur le bouton + ci-dessus.', + 'This category has no sub-categories.' => 'Cette catégorie n\'a pas de sous-catégorie.', + 'Top level Products' => 'Produits mis en avant', + 'Add a new product' => 'Ajouter un nouveau produit', + 'Reference' => 'Reference', + 'Product title' => 'Titre du produit', + 'This category doesn\'t contains any products. To add a new product, click the + button above.' => 'Cette catégorie n\'a aucun produit. Pour créer un nouveau product, cliques sur le bouton + ci-dessus. ', + 'Name' => 'Nom', + 'Enter here the category name in the default language (%title)' => 'Entrer ici le nom de la catégorie dans la langue par défaut (%title)', + 'Create a new category' => 'Créer une catégorie', + 'Create this category' => 'Créer cette catégorie', + 'Enter here the product reference' => 'Entrez ici la nouvelle référence produit', + 'Enter here the product name in the default language (%title)' => 'Entrez ici le nom du produit dans la langue par défaut (%title)', + 'Product price' => 'Prix du produit', + 'Enter here the product price in the default currency (%title)' => 'ntrez ici le prix du produit dans la langue par défaut (%title)', + 'Select a tax tule' => 'Sélectionnez une règle de taxes', + 'Select here the tax applicable to this product' => 'Sélectionnez ici la taxe applicable sur ce produit', + 'Product weight' => 'Poids du produit', + 'Kg' => 'Kg', + 'Enter here the product weight, in Kilogrammes' => 'Entrez ici le poids du produit, en Kilogrammes', + 'Create a new product' => 'Créer un nouveau produit', + 'Create this product' => 'Créer ce produit', + 'Delete category' => 'Supprimer cette catégorie', + 'Do you really want to delete this category and all its content ?' => 'Voulez-vous vraiment supprimer cette catégorie et tout ce qu\'elle contient ?', + 'Delete product' => 'Supprimer ce produit', + 'Do you really want to delete this product ?' => 'Voulez-vous vraiment supprimer ce produit ?', + 'Enter new product position' => 'Classement du produit', + 'Edit category' => 'Editer la catégorie', + 'Edit category %title' => 'Editer le titre de la catégorie : %title', + 'Thelia configuration' => 'Configuration thelia', + 'Product catalog configuration' => 'Configuration du catalogue produit', + 'Product templates' => 'Template produit', + 'Product features' => 'Caractéristiques produit', + 'Mailing templates' => 'Template e-mail', + 'Currencies' => 'Monnaie', + 'Taxes rules' => 'Règles de taxes', + 'Shipping configuration' => 'Configuration du transport', + 'Countries' => 'Pays', + 'Shipping zones' => 'Zones de livraison', + 'System parameters' => 'Paramètres système ', + 'System variables' => 'Gestion des variables', + 'Administration profiles' => 'Gestion des administrateurs', + 'Languages & URLs' => 'Langues et URLs', + 'Mailing system' => 'Envoi des e-mails', + 'System logs' => 'Journal des logs', + 'And' => 'Et', + 'Edit' => 'Editer', + 'Delete' => 'Supprimer', + 'Code :' => 'Code', + 'code' => 'code', + 'Title :' => 'Titre', + 'title' => 'titre', + 'Is enabled' => 'Est valide', + 'Is available on special offers' => 'Est valide sur les offres promotionnelles', + 'Is cumulative' => 'Est cumulable', + 'Is removing postage' => 'Offre les frais de port', + 'Expiration date :' => 'Date de fin de validité', + 'yyyy-mm-dd' => 'jjjj--mm--aa', + 'Is unlimited' => 'Est illimité', + 'Max usage :' => 'Utilisations max', + 'max usage' => 'utilisations max', + 'Type :' => 'Type', + 'Please select a coupon type' => 'Merci d\'entrer le type de code', + 'Amount :' => 'Montant', + '14.50' => '14.50', + 'Short description :' => 'Description courte', + 'short description' => 'description court', + 'Long description :' => 'Description longue', + 'long description' => 'description longue', + 'Save your modifications' => 'Enregistrer les modifications', + 'Conditions' => 'Conditions', + 'Save this condition' => 'Enregistrer cette condition', + 'Condition\'s category :' => 'Type de condition', + 'Please select a condition category' => 'Merci d\'entrer le type de condition', + 'Coupon' => 'Code promo', + 'Coupons : ' => 'Codes promo', + 'Create a new coupon' => 'Créer un nouveau code promo', + 'Browse' => 'Parcourir', + 'List' => 'Liste', + 'Enabled coupons' => 'Codes promo disponibles', + 'Code' => 'Code', + 'Days before expiration' => 'Jours de validité', + 'Usage left' => 'Utilisation restante', + 'Unlimited' => 'Illimité', + 'Disabled coupons' => 'Codes désactivés', + 'Expiration date' => 'Date de fin', + 'Amount' => 'Montant', + 'Update coupon' => 'Mettre à jour le code', + 'Please retry' => 'Merci de réessayer', + 'Please select another condition' => 'Merci de sélectionner une autre condition', + 'Edit a customer' => 'Editer un client', + 'Editing customer "%name"' => 'Edition du client "%name"', + 'Customer informations' => 'Informations client', + 'Firstname' => 'Prénom', + 'Lastname' => 'Nom', + 'Default address' => 'Adresse par défaut', + 'Address' => 'Adresse', + 'Additional address' => 'Adresse complémentaire', + 'Zip code' => 'Code postal', + 'City' => 'Ville', + 'Other addresses' => 'Autres adresses', + 'Add a new address' => 'Ajouter une nouvelle adresse', + 'Phone' => 'Téléphone', + 'Edit this address' => 'Editer cette adresse', + 'Use this address by default' => 'Utiliser comme adresse par défaut', + 'Delete this customer and all his orders' => 'Supprimer ce client et toutes ses commandes', + 'orders for this customer' => 'commandes pour ce client', + 'Order n°' => 'Commande n° ', + 'Date & Hour' => 'Date et heure', + 'Status' => 'Etat', + 'Create this address' => 'Créer cette adresse', + 'Use address by default' => 'Utiliser comme adresse par défaut', + 'Do you really want to use this address by default ?' => 'Voulez-vous vraiment utiliser cette adresse comme adresse par défaut ?', + 'Delete address' => 'Supprimer cette adresse', + 'Do you really want to delete this address ?' => 'Voulez-vous vraiment supprimer cette adresse ?', + 'Customer' => 'Client', + 'Customers list' => 'Liste des clients', + 'Add a new Customer' => 'Ajouter un client', + 'Edit this customer' => 'Modifier ce client', + 'Send a mail to this customer' => 'Contacter ce client par mail', + 'Email address' => 'Adresse e-mail', + 'Create a new customer' => 'Ajouter un client', + 'Create this customer' => 'Ajouter ce client', + 'Delete customer' => 'Supprimer ce client', + 'Do you really want to delete this customer ?' => 'Voulez-vous supprimer ce client ? ', + 'Back' => 'Retour', + 'Save' => ' Enregistrer', + 'Description' => 'Description', + 'Back-office home' => 'Accueil administration', + 'Dashboard' => 'Tableau de bord', + 'Sales' => 'Ventes', + 'New customers' => 'Nouveaux clients', + 'First orders' => 'Premières commandes', + 'Aborted orders' => 'Paniers abandonnés', + 'Shop Informations' => 'Informations sur le magasin', + 'Products' => 'Produits', + 'Online products' => 'Produits en ligne', + 'Offline products' => 'Produits hors ligne', + 'Sales statistics' => 'Statistiques de vente', + 'Today' => 'Aujourd\'hui', + 'This month' => 'Ce mois', + 'This year' => 'Cette année', + 'Overall sales' => 'Total des ventes', + 'Sales excluding shipping' => 'Ventes hors frais de port', + 'Yesterday sales' => 'Ventes de la veille', + 'Average cart' => 'Panier moyen', + 'Previous month sales' => 'Ventes du mois précédent', + 'Previous year sales' => 'Ventes de l\année précédente', + 'Thelia informations' => 'Informations Thelia', + 'Current version' => 'Version en cours', + 'Latest version available' => 'Dernière version disponible', + 'News' => 'Actualités', + 'Click here' => 'Cliquez ici', + 'Editing %cat' => 'Edition de %cat', + 'No' => 'Non', + 'Yes' => 'Oui', + 'OK' => 'OK', + 'Save and close' => 'Enregistrer et fermer', + 'Quantity' => 'Quantité', + 'deactivate' => 'désactiver', + 'en_US' => 'en_US', + 'd-m-Y' => 'j-m-A', + 'Username' => 'Nom d\'utilisateur', + 'Host :' => 'Host', + 'Host' => 'Host', + 'Port :' => 'Port', + 'Port' => 'Port', + 'Username :' => 'Nom d\'utilisateur', + 'Password :' => 'Mot de passe', + 'Source IP :' => 'IP source', + 'Source IP' => 'IP source', + 'Variable name' => 'Nom de la variable', + 'Purpose' => 'Objet', + 'Edit an order' => 'Editer une commande', + 'Ordered products' => 'Produits commandés', + 'Invoice and Delivery' => 'Livraison et facturation', + 'Cart' => 'Panier', + 'Product' => 'Produit', + 'Unit. price' => 'Prix unitaire', + 'Tax' => 'Taxes', + 'Unit taxed price' => 'Prix unitaire TTC', + 'Taxed total' => 'Montant total des taxes', + 'Total without discount' => 'Montant total hors remises', + 'Discount' => 'Remise', + 'Coupon code' => 'Code promo', + 'Total including discount' => 'Total avec remise', + 'Postage' => 'Frais de livraison', + 'Total' => 'Total', + 'Payment information' => 'Informations de paiement', + 'Payment module' => 'Module de paiement', + 'Transaction reference' => 'Référence de la transaction', + 'Delivery module' => 'Module de livraison', + 'tracking reference' => 'Reference Tracking', + 'Invoice informations' => 'Informations de facturation', + 'Download invoice as PDF' => 'Télécharger la facture au format PDF', + 'PDF | Invoice' => 'Facure PDF', + 'Edit invoice address' => 'Editer l\'adresse de facturation', + 'Invoice reference' => 'Facture ref', + 'Invoice date' => 'Facture date', + 'Street address' => 'Adresse', + 'Country' => 'Pays', + 'Delivery address' => 'Adresse de livraison', + 'Download purchase order as PDF' => 'Télécharger le bon de commande au format PDF', + 'PDF | Purchase order' => 'Bon de commande PDF', + 'Edit delivery address' => 'Editer l\'adresse de livraison', + 'Edit order address' => 'Editer l\'adresse de commande ', + 'Confirm changes' => 'Valider les modifications', + 'Edit this order' => 'Editer cette commande ', + 'Cancel this order' => 'Annuler cette commande', + 'Delete an order' => 'Supprimer une commande', + 'Do you really want to cancel this order ?' => 'Voulez-vous vraiment sup primer cette commande ? ', + 'View' => 'Voir', + 'customer ref' => 'ref client', + 'company' => 'entreprise', + 'firstname & lastname' => 'Prénom & nom', + 'last order' => 'Dernière commande', + 'order amount' => 'Montant de la commande', + 'Add' => 'Ajouter', + 'Warning' => 'Attention', + 'Edit a system variable' => 'Modifier une variable système', + 'Editing variable "%name"' => 'Modification de la variable "%name" ', + 'Edit variable %name' => 'Modifier de la variable "%name" ', + 'Variable value' => 'Valeur de la variable', + 'Variable created on %date_create. Last modification: %date_change' => 'Variable créée le %date_create. Dernière modification: %date_change', + 'Sorry, variable ID=%id was not found.' => 'Désolé, la variable ID=%id n\'a pas été trouvée.', + 'Thelia System Variables' => 'Variables Thelia', + 'Thelia system variables' => 'Variables Thelia', + 'Add a new variable' => 'Ajouter une variable', + 'Save chages' => 'Enregistrer les modifications', + 'Save changes' => 'Enregistrer les modifications', + 'Action' => 'Action', + 'Change this variable' => 'Modifier cette variable', + 'Cancel changes and revert to original value' => 'Annuler les modifications et revenir à la version antérieure', + 'Delete this variable' => 'Supprimer cette variable', + 'This variable could not be changed.' => 'Cette variable ne peut pas être modifiée', + 'Variable purpose' => 'Objet de la variable', + 'Create a new variable' => 'Créer une nouvelle variable', + 'Create this variable' => 'Ajouter cette variable', + 'Delete a variable' => 'Supprimer une variable', + 'Do you really want to delete this variable ?' => 'Voulez-vous vraiment supprimer cette variable ?', ); diff --git a/templates/backOffice/default/I18n/it_IT.php b/templates/backOffice/default/I18n/it_IT.php index 6884502b9..58f83ebb2 100755 --- a/templates/backOffice/default/I18n/it_IT.php +++ b/templates/backOffice/default/I18n/it_IT.php @@ -308,9 +308,7 @@ return array ( 'Conclusion' => '', 'A short post-description information' => '', 'Short conclusion' => '', - 'Rewriten URL *' => '', 'Rewritten URL' => '', - 'Rewriten URL' => '', 'Parent category *' => '', 'Top level' => '', 'Visibility' => '', diff --git a/templates/backOffice/default/admin-layout.tpl b/templates/backOffice/default/admin-layout.tpl old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/administrators.html b/templates/backOffice/default/administrators.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/ajax/language-update-modal.html b/templates/backOffice/default/ajax/language-update-modal.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/ajax/logger.html b/templates/backOffice/default/ajax/logger.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/ajax/product-attributes-tab.html b/templates/backOffice/default/ajax/product-attributes-tab.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/ajax/product-related-tab.html b/templates/backOffice/default/ajax/product-related-tab.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/ajax/template-attribute-list.html b/templates/backOffice/default/ajax/template-attribute-list.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/ajax/template-feature-list.html b/templates/backOffice/default/ajax/template-feature-list.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/img/ajax-loader.gif b/templates/backOffice/default/assets/img/ajax-loader.gif old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/img/bg.jpg b/templates/backOffice/default/assets/img/bg.jpg old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/img/deconnexion.png b/templates/backOffice/default/assets/img/deconnexion.png old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/img/header.jpg b/templates/backOffice/default/assets/img/header.jpg old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/img/logo-light.png b/templates/backOffice/default/assets/img/logo-light.png old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/img/logo.png b/templates/backOffice/default/assets/img/logo.png old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/img/top-bar-logo-save.png b/templates/backOffice/default/assets/img/top-bar-logo-save.png old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/img/top-bar-logo.png b/templates/backOffice/default/assets/img/top-bar-logo.png old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/img/top.jpg b/templates/backOffice/default/assets/img/top.jpg old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/bootstrap-editable/bootstrap-editable.js b/templates/backOffice/default/assets/js/bootstrap-editable/bootstrap-editable.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/bootstrap-select/bootstrap-select.js b/templates/backOffice/default/assets/js/bootstrap-select/bootstrap-select.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/bootstrap-switch/bootstrap-switch.js b/templates/backOffice/default/assets/js/bootstrap-switch/bootstrap-switch.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/bootstrap/bootstrap.js b/templates/backOffice/default/assets/js/bootstrap/bootstrap.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/coupon.js b/templates/backOffice/default/assets/js/coupon.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/document-upload.js b/templates/backOffice/default/assets/js/document-upload.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/dropzone.js b/templates/backOffice/default/assets/js/dropzone.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/image-upload.js b/templates/backOffice/default/assets/js/image-upload.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/jquery.jqplot.min.js b/templates/backOffice/default/assets/js/jqplot/jquery.jqplot.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.BezierCurveRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.BezierCurveRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.barRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.barRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.blockRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.blockRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.bubbleRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.bubbleRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.canvasAxisLabelRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.canvasAxisLabelRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.canvasAxisTickRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.canvasAxisTickRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.canvasOverlay.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.canvasOverlay.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.canvasTextRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.canvasTextRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.categoryAxisRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.categoryAxisRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.ciParser.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.ciParser.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.cursor.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.cursor.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.dateAxisRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.dateAxisRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.donutRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.donutRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.dragable.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.dragable.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.enhancedLegendRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.enhancedLegendRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.funnelRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.funnelRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.highlighter.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.highlighter.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.json2.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.json2.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.logAxisRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.logAxisRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.mekkoAxisRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.mekkoAxisRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.mekkoRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.mekkoRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.meterGaugeRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.meterGaugeRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.mobile.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.mobile.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.ohlcRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.ohlcRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.pieRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.pieRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.pointLabels.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.pointLabels.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.pyramidAxisRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.pyramidAxisRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.pyramidGridRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.pyramidGridRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.pyramidRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.pyramidRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.trendline.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.trendline.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jquery.typewatch.js b/templates/backOffice/default/assets/js/jquery.typewatch.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jquery.ui/jquery.ui.datepicker/i18n/jquery.ui.datepicker-es_ES.js b/templates/backOffice/default/assets/js/jquery.ui/jquery.ui.datepicker/i18n/jquery.ui.datepicker-es_ES.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jquery.ui/jquery.ui.datepicker/i18n/jquery.ui.datepicker-fr_FR.js b/templates/backOffice/default/assets/js/jquery.ui/jquery.ui.datepicker/i18n/jquery.ui.datepicker-fr_FR.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jquery.ui/jquery.ui.datepicker/i18n/jquery.ui.datepicker-it_IT.js.js b/templates/backOffice/default/assets/js/jquery.ui/jquery.ui.datepicker/i18n/jquery.ui.datepicker-it_IT.js.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jquery.ui/jquery.ui.datepicker/i18n/readme.txt b/templates/backOffice/default/assets/js/jquery.ui/jquery.ui.datepicker/i18n/readme.txt old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jquery.ui/jquery.ui.datepicker/jquery.ui.datepicker.css b/templates/backOffice/default/assets/js/jquery.ui/jquery.ui.datepicker/jquery.ui.datepicker.css old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jquery.ui/jquery.ui.datepicker/jquery.ui.datepicker.js b/templates/backOffice/default/assets/js/jquery.ui/jquery.ui.datepicker/jquery.ui.datepicker.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jquery.ui/jquery.ui.theme.css b/templates/backOffice/default/assets/js/jquery.ui/jquery.ui.theme.css old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/json2.js b/templates/backOffice/default/assets/js/json2.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/libs/jquery.js b/templates/backOffice/default/assets/js/libs/jquery.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/main.js b/templates/backOffice/default/assets/js/main.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/tablesorter/jquery.metadata.js b/templates/backOffice/default/assets/js/tablesorter/jquery.metadata.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/tablesorter/jquery.tablesorter.min.js b/templates/backOffice/default/assets/js/tablesorter/jquery.tablesorter.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/tablesorter/jquery.tablesorter.widgets-filter-formatter.js b/templates/backOffice/default/assets/js/tablesorter/jquery.tablesorter.widgets-filter-formatter.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/tablesorter/jquery.tablesorter.widgets.js b/templates/backOffice/default/assets/js/tablesorter/jquery.tablesorter.widgets.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/less/main.less b/templates/backOffice/default/assets/less/main.less old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/less/thelia/bootstrap-editable.less b/templates/backOffice/default/assets/less/thelia/bootstrap-editable.less old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/less/thelia/bootstrap-select.less b/templates/backOffice/default/assets/less/thelia/bootstrap-select.less old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/less/thelia/bootstrap-switch.less b/templates/backOffice/default/assets/less/thelia/bootstrap-switch.less old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/less/thelia/dropzone.less b/templates/backOffice/default/assets/less/thelia/dropzone.less old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/less/thelia/grid.less b/templates/backOffice/default/assets/less/thelia/grid.less old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/less/thelia/jqplot.less b/templates/backOffice/default/assets/less/thelia/jqplot.less old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/less/thelia/logger.less b/templates/backOffice/default/assets/less/thelia/logger.less old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/less/thelia/thelia.less b/templates/backOffice/default/assets/less/thelia/thelia.less old mode 100644 new mode 100755 index 2189b9307..41b37d4ca --- a/templates/backOffice/default/assets/less/thelia/thelia.less +++ b/templates/backOffice/default/assets/less/thelia/thelia.less @@ -138,17 +138,6 @@ } } - .Blocmoncompte { - float: right; - margin: 0px; - padding: 0px; - margin-top: 35px; - - color: white; - font-size: 13px; - text-shadow: 0px 1px 0px rgba(0,0,0,0.8); - } - dt { float: left; margin-right: 15px; @@ -172,6 +161,16 @@ width: 100%; } +.btn-group { + white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page) + > .btn { + float: inherit; + } + > .btn + .btn { + margin-left: -4px; + } +} + // -- Login form -------------------------------------------------------------- .form-signin { diff --git a/templates/backOffice/default/assets/less/thelia/wizard.less b/templates/backOffice/default/assets/less/thelia/wizard.less old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/attribute-edit.html b/templates/backOffice/default/attribute-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/attributes.html b/templates/backOffice/default/attributes.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/category-edit.html b/templates/backOffice/default/category-edit.html index 62f9290f1..7225ddf6e 100755 --- a/templates/backOffice/default/category-edit.html +++ b/templates/backOffice/default/category-edit.html @@ -84,7 +84,7 @@ {$label} : - + {/form_field} diff --git a/templates/backOffice/default/config-store.html b/templates/backOffice/default/config-store.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/configs/variables.conf b/templates/backOffice/default/configs/variables.conf old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/configuration.html b/templates/backOffice/default/configuration.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/content-edit.html b/templates/backOffice/default/content-edit.html old mode 100644 new mode 100755 index 8bccc01d4..ae92061b9 --- a/templates/backOffice/default/content-edit.html +++ b/templates/backOffice/default/content-edit.html @@ -85,7 +85,7 @@ {$label} : - + {/form_field} diff --git a/templates/backOffice/default/countries.html b/templates/backOffice/default/countries.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/country-edit.html b/templates/backOffice/default/country-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/coupon/condition-input-ajax.html b/templates/backOffice/default/coupon/condition-input-ajax.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/coupon/conditions.html b/templates/backOffice/default/coupon/conditions.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/coupon/form.html b/templates/backOffice/default/coupon/form.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/currencies.html b/templates/backOffice/default/currencies.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/currency-edit.html b/templates/backOffice/default/currency-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/customer-edit.html b/templates/backOffice/default/customer-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/customers.html b/templates/backOffice/default/customers.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/document-edit.html b/templates/backOffice/default/document-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/feature-edit.html b/templates/backOffice/default/feature-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/features.html b/templates/backOffice/default/features.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/folder-edit.html b/templates/backOffice/default/folder-edit.html old mode 100644 new mode 100755 index 2b8b6bfe4..82f57af68 --- a/templates/backOffice/default/folder-edit.html +++ b/templates/backOffice/default/folder-edit.html @@ -85,7 +85,7 @@ {$label} : - + {/form_field} diff --git a/templates/backOffice/default/folders.html b/templates/backOffice/default/folders.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/image-edit.html b/templates/backOffice/default/image-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/admin-utilities-position-block.html b/templates/backOffice/default/includes/admin-utilities-position-block.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/admin-utilities-sortable-column-header.html b/templates/backOffice/default/includes/admin-utilities-sortable-column-header.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/catalog-breadcrumb.html b/templates/backOffice/default/includes/catalog-breadcrumb.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/confirmation-modal.html b/templates/backOffice/default/includes/confirmation-modal.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/content-folder-management.html b/templates/backOffice/default/includes/content-folder-management.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/customer_address_form_fields.html b/templates/backOffice/default/includes/customer_address_form_fields.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/document-upload-form.html b/templates/backOffice/default/includes/document-upload-form.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/document-upload-list-ajax.html b/templates/backOffice/default/includes/document-upload-list-ajax.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/folder-breadcrumb.html b/templates/backOffice/default/includes/folder-breadcrumb.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/generic-confirm-dialog.html b/templates/backOffice/default/includes/generic-confirm-dialog.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/generic-js-dialog.html b/templates/backOffice/default/includes/generic-js-dialog.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/image-upload-form.html b/templates/backOffice/default/includes/image-upload-form.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/image-upload-list-ajax.html b/templates/backOffice/default/includes/image-upload-list-ajax.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/module-block.html b/templates/backOffice/default/includes/module-block.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/notifications.html b/templates/backOffice/default/includes/notifications.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/product-details-tab.html b/templates/backOffice/default/includes/product-details-tab.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/product-general-tab.html b/templates/backOffice/default/includes/product-general-tab.html old mode 100644 new mode 100755 index 84b9a836d..f91aeff9e --- a/templates/backOffice/default/includes/product-general-tab.html +++ b/templates/backOffice/default/includes/product-general-tab.html @@ -53,7 +53,7 @@ {$label} : - + {/form_field} diff --git a/templates/backOffice/default/includes/standard-description-form-fields.html b/templates/backOffice/default/includes/standard-description-form-fields.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/languages.html b/templates/backOffice/default/languages.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/mailing-system.html b/templates/backOffice/default/mailing-system.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/message-edit.html b/templates/backOffice/default/message-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/messages.html b/templates/backOffice/default/messages.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/module-configure.html b/templates/backOffice/default/module-configure.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/module-edit.html b/templates/backOffice/default/module-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/modules.html b/templates/backOffice/default/modules.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/order-edit.html b/templates/backOffice/default/order-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/orders.html b/templates/backOffice/default/orders.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/product-edit.html b/templates/backOffice/default/product-edit.html old mode 100644 new mode 100755 index 5c6250a09..37e28edab --- a/templates/backOffice/default/product-edit.html +++ b/templates/backOffice/default/product-edit.html @@ -108,7 +108,7 @@
-
{intl l="Please wait, loading"}
+ {module_include location='product-edit'}
diff --git a/templates/backOffice/default/profile-edit.html b/templates/backOffice/default/profile-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/profiles.html b/templates/backOffice/default/profiles.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/search.html b/templates/backOffice/default/search.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/shipping-configuration-edit.html b/templates/backOffice/default/shipping-configuration-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/shipping-configuration.html b/templates/backOffice/default/shipping-configuration.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/shipping-zones-edit.html b/templates/backOffice/default/shipping-zones-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/shipping-zones.html b/templates/backOffice/default/shipping-zones.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/system-logs.html b/templates/backOffice/default/system-logs.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/tax-edit.html b/templates/backOffice/default/tax-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/tax-rule-edit.html b/templates/backOffice/default/tax-rule-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/taxes-rules.html b/templates/backOffice/default/taxes-rules.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/template-edit.html b/templates/backOffice/default/template-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/templates.html b/templates/backOffice/default/templates.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/translations.html b/templates/backOffice/default/translations.html old mode 100644 new mode 100755 index fa41a3cf6..5a48e5277 --- a/templates/backOffice/default/translations.html +++ b/templates/backOffice/default/translations.html @@ -45,6 +45,7 @@ + @@ -91,6 +92,19 @@ + {else if $item_to_translate == 'ma'} +
+
+ + + +
+
{else if $item_to_translate == 'pf'}
diff --git a/templates/backOffice/default/variable-edit.html b/templates/backOffice/default/variable-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/variables.html b/templates/backOffice/default/variables.html old mode 100644 new mode 100755 diff --git a/templates/email/default/I18n/en_US.php b/templates/email/default/I18n/en_US.php new file mode 100644 index 000000000..6d8ef0f1b --- /dev/null +++ b/templates/email/default/I18n/en_US.php @@ -0,0 +1,4 @@ + 'Supprimer cette adresse', 'Delivery address' => 'Adresse de livraison', 'Delivery Information' => 'Informations de livraison', - 'Demo product description' => 'Example de description de produit', - 'Demo product title' => 'Example de titre', + 'Demo product description' => 'Exemple de description de produit', + 'Demo product title' => 'Exemple de titre', 'Description' => 'Description', 'Do you have an account?' => 'Avez-vous déjà un compte ?', 'Do you really want to delete this address ?' => 'Voulez-vous vraiment supprimer cette adresse ?', @@ -58,11 +58,11 @@ return array( 'Email address' => 'Adresse e-mail', 'Email Address' => 'Adresse e-mail', 'Follow us' => 'Suivez-nous', - 'Forgot your Password?' => 'Mot de passé oublié ?', + 'Forgot your Password?' => 'Mot de passe oublié ?', 'Free shipping' => 'Livraison gratuite', 'Go home' => 'Retour à l\'accueil', 'Grid' => 'Grille', - 'Home address' => 'Résidence principal', + 'Home address' => 'Résidence principale', 'Home' => 'Accueil', 'In Stock' => 'Disponible', 'instead of' => 'au lieu de', @@ -91,7 +91,7 @@ return array( 'Name descending' => 'Nom décroissant', 'Name' => 'Nom', 'Need help ?' => 'Besoin d\'aide? ', - 'Newsletter Subscription' => 'Inscription à la newslatter', + 'Newsletter Subscription' => 'Inscription à la newsletter', 'Newsletter' => 'Newsletter', 'Next product' => 'Produits suivants', 'Next Step' => 'Etape suivante', @@ -211,4 +211,4 @@ return array( 'Your Cart' => 'Votre panier', 'Your email address' => 'Votre adresse e-mail', 'Your order will be confirmed by us upon receipt of your payment.' => 'Votre commande sera confirmée à réception de votre pavement.', -); \ No newline at end of file +); diff --git a/templates/frontOffice/default/account-password.html b/templates/frontOffice/default/account-password.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/account-update.html b/templates/frontOffice/default/account-update.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/account.html b/templates/frontOffice/default/account.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/address-update.html b/templates/frontOffice/default/address-update.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/address.html b/templates/frontOffice/default/address.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/218x146.png b/templates/frontOffice/default/assets/img/218x146.png old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/280x196.png b/templates/frontOffice/default/assets/img/280x196.png old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/700x320.png b/templates/frontOffice/default/assets/img/700x320.png old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/ajax-loader.gif b/templates/frontOffice/default/assets/img/ajax-loader.gif old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/carousel/1200x390.png b/templates/frontOffice/default/assets/img/carousel/1200x390.png old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/carousel/slider1.jpg b/templates/frontOffice/default/assets/img/carousel/slider1.jpg old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/carousel/slider2.jpg b/templates/frontOffice/default/assets/img/carousel/slider2.jpg old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/carousel/slider3.jpg b/templates/frontOffice/default/assets/img/carousel/slider3.jpg old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/email/header.jpg b/templates/frontOffice/default/assets/img/email/header.jpg old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/email/logo.gif b/templates/frontOffice/default/assets/img/email/logo.gif old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/favicon.ico b/templates/frontOffice/default/assets/img/favicon.ico old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/favicon.png b/templates/frontOffice/default/assets/img/favicon.png old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/logo.gif b/templates/frontOffice/default/assets/img/logo.gif old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/payment/american-express.png b/templates/frontOffice/default/assets/img/payment/american-express.png old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/payment/cheque.png b/templates/frontOffice/default/assets/img/payment/cheque.png old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/payment/kwixo.png b/templates/frontOffice/default/assets/img/payment/kwixo.png old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/payment/mastercard.png b/templates/frontOffice/default/assets/img/payment/mastercard.png old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/payment/visa.png b/templates/frontOffice/default/assets/img/payment/visa.png old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/product/1/118x85.png b/templates/frontOffice/default/assets/img/product/1/118x85.png old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/product/1/560x445.png b/templates/frontOffice/default/assets/img/product/1/560x445.png old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/js/libs/jquery.js b/templates/frontOffice/default/assets/js/libs/jquery.js old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/js/plugins/bootbox/bootbox.js b/templates/frontOffice/default/assets/js/plugins/bootbox/bootbox.js old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/js/plugins/bootbox/bootbox.min.js b/templates/frontOffice/default/assets/js/plugins/bootbox/bootbox.min.js old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/js/script.js b/templates/frontOffice/default/assets/js/script.js old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/less/fontawesome/bootstrap.less b/templates/frontOffice/default/assets/less/fontawesome/bootstrap.less old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/less/fontawesome/core.less b/templates/frontOffice/default/assets/less/fontawesome/core.less old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/less/fontawesome/extras.less b/templates/frontOffice/default/assets/less/fontawesome/extras.less old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/less/fontawesome/font-awesome-ie7.less b/templates/frontOffice/default/assets/less/fontawesome/font-awesome-ie7.less old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/less/fontawesome/font-awesome.less b/templates/frontOffice/default/assets/less/fontawesome/font-awesome.less old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/less/fontawesome/icons.less b/templates/frontOffice/default/assets/less/fontawesome/icons.less old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/less/fontawesome/mixins.less b/templates/frontOffice/default/assets/less/fontawesome/mixins.less old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/less/fontawesome/path.less b/templates/frontOffice/default/assets/less/fontawesome/path.less old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/less/fontawesome/variables.less b/templates/frontOffice/default/assets/less/fontawesome/variables.less old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/less/thelia/account.less b/templates/frontOffice/default/assets/less/thelia/account.less old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/less/thelia/buttons.less b/templates/frontOffice/default/assets/less/thelia/buttons.less old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/less/thelia/cart.less b/templates/frontOffice/default/assets/less/thelia/cart.less old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/less/thelia/category.less b/templates/frontOffice/default/assets/less/thelia/category.less old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/less/thelia/checkout.less b/templates/frontOffice/default/assets/less/thelia/checkout.less old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/cart.html b/templates/frontOffice/default/cart.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/category.html b/templates/frontOffice/default/category.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/contact-success.html b/templates/frontOffice/default/contact-success.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/contact.html b/templates/frontOffice/default/contact.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/content.html b/templates/frontOffice/default/content.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/currency.html b/templates/frontOffice/default/currency.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/email/order.html b/templates/frontOffice/default/email/order.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/email/password-reset.html b/templates/frontOffice/default/email/password-reset.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/email/password.html b/templates/frontOffice/default/email/password.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/email/register.html b/templates/frontOffice/default/email/register.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/email/template.tpl b/templates/frontOffice/default/email/template.tpl old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/includes/addedToCart.html b/templates/frontOffice/default/includes/addedToCart.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/includes/asides/articles.html b/templates/frontOffice/default/includes/asides/articles.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/includes/categories-filters.html b/templates/frontOffice/default/includes/categories-filters.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/includes/menu.html b/templates/frontOffice/default/includes/menu.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/includes/mini-cart.html b/templates/frontOffice/default/includes/mini-cart.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/includes/product-empty.html b/templates/frontOffice/default/includes/product-empty.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/includes/single-product.html b/templates/frontOffice/default/includes/single-product.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/includes/toolbar.html b/templates/frontOffice/default/includes/toolbar.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/index.html b/templates/frontOffice/default/index.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/language.html b/templates/frontOffice/default/language.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/layout.tpl b/templates/frontOffice/default/layout.tpl old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/login.html b/templates/frontOffice/default/login.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/misc/breadcrumb.tpl b/templates/frontOffice/default/misc/breadcrumb.tpl old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/misc/checkout-progress.tpl b/templates/frontOffice/default/misc/checkout-progress.tpl old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/modal-address.html b/templates/frontOffice/default/modal-address.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/newsletter.html b/templates/frontOffice/default/newsletter.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/order-delivery.html b/templates/frontOffice/default/order-delivery.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/order-invoice.html b/templates/frontOffice/default/order-invoice.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/order-placed.html b/templates/frontOffice/default/order-placed.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/password.html b/templates/frontOffice/default/password.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/product.html b/templates/frontOffice/default/product.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/register.html b/templates/frontOffice/default/register.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/search.html b/templates/frontOffice/default/search.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/view_all.html b/templates/frontOffice/default/view_all.html old mode 100644 new mode 100755 diff --git a/templates/pdf/default/I18n/en_US.php b/templates/pdf/default/I18n/en_US.php old mode 100644 new mode 100755 diff --git a/templates/pdf/default/I18n/es_ES.php b/templates/pdf/default/I18n/es_ES.php old mode 100644 new mode 100755 diff --git a/templates/pdf/default/I18n/fr_FR.php b/templates/pdf/default/I18n/fr_FR.php old mode 100644 new mode 100755 diff --git a/templates/pdf/default/I18n/it_IT.php b/templates/pdf/default/I18n/it_IT.php old mode 100644 new mode 100755 diff --git a/templates/pdf/default/delivery.html b/templates/pdf/default/delivery.html old mode 100644 new mode 100755 diff --git a/templates/pdf/default/invoice.html b/templates/pdf/default/invoice.html old mode 100644 new mode 100755 diff --git a/web/robots.txt b/web/robots.txt old mode 100644 new mode 100755