From 4e405553132713e234141e0449abf7f7e0bdb6cf Mon Sep 17 00:00:00 2001 From: gmorel Date: Mon, 19 Aug 2013 18:50:45 +0200 Subject: [PATCH 001/125] Init Coupon module design --- core/lib/Thelia/Coupon/CouponAbstract.php | 115 ++++++++++++++++++ .../Thelia/Coupon/CouponAdapterInterface.php | 60 +++++++++ core/lib/Thelia/Coupon/CouponBaseAdapter.php | 67 ++++++++++ core/lib/Thelia/Coupon/CouponFactory.php | 49 ++++++++ core/lib/Thelia/Coupon/CouponInterface.php | 89 ++++++++++++++ core/lib/Thelia/Coupon/CouponManager.php | 54 ++++++++ .../Thelia/Coupon/Rule/AvailableForDate.php | 38 ++++++ .../Coupon/Rule/AvailableForLocationX.php | 38 ++++++ .../Coupon/Rule/AvailableForNbArticles.php | 38 ++++++ .../Thelia/Coupon/Rule/AvailableForPeriod.php | 38 ++++++ .../Coupon/Rule/AvailableForRepeatedDate.php | 38 ++++++ .../Rule/AvailableForRepeatedPeriod.php | 38 ++++++ .../Coupon/Rule/AvailableForTotalAmount.php | 38 ++++++ .../AvailableForTotalAmountForCategoryY.php | 38 ++++++ .../Thelia/Coupon/Rule/CouponRuleAbstract.php | 69 +++++++++++ .../Thelia/Coupon/Rule/CuponRuleInterface.php | 60 +++++++++ core/lib/Thelia/Coupon/RuleOrganizer.php | 51 ++++++++ .../Thelia/Coupon/RuleOrganizerInterface.php | 47 +++++++ core/lib/Thelia/Coupon/Type/RemoveXAmount.php | 40 ++++++ .../Coupon/Type/RemoveXAmountForCategoryY.php | 38 ++++++ .../lib/Thelia/Coupon/Type/RemoveXPercent.php | 38 ++++++ .../Type/RemoveXPercentForAttributeY.php | 38 ++++++ .../Type/RemoveXPercentForCategoryY.php | 38 ++++++ ...RemoveXPercentForProductSaleElementIdY.php | 38 ++++++ .../Coupon/Type/RemoveXPercentForProductY.php | 38 ++++++ .../Tests/Coupon/CouponBaseAdapterTest.php | 66 ++++++++++ .../Thelia/Tests/Coupon/CouponFactoryTest.php | 42 +++++++ .../Thelia/Tests/Coupon/CouponManagerTest.php | 42 +++++++ .../Rule/AvailableForNbArticlesTest.php | 26 ++++ .../Thelia/Tests/Coupon/RuleOrganizerTest.php | 42 +++++++ .../Type/RemoveXAmountForCategoryYTest.php | 26 ++++ .../Tests/Coupon/Type/RemoveXAmountTest.php | 26 ++++ .../Type/RemoveXPercentForCategoryYTest.php | 26 ++++ .../Tests/Coupon/Type/RemoveXPercentTest.php | 26 ++++ 34 files changed, 1555 insertions(+) create mode 100644 core/lib/Thelia/Coupon/CouponAbstract.php create mode 100644 core/lib/Thelia/Coupon/CouponAdapterInterface.php create mode 100644 core/lib/Thelia/Coupon/CouponBaseAdapter.php create mode 100644 core/lib/Thelia/Coupon/CouponFactory.php create mode 100644 core/lib/Thelia/Coupon/CouponInterface.php create mode 100644 core/lib/Thelia/Coupon/CouponManager.php create mode 100644 core/lib/Thelia/Coupon/Rule/AvailableForDate.php create mode 100644 core/lib/Thelia/Coupon/Rule/AvailableForLocationX.php create mode 100644 core/lib/Thelia/Coupon/Rule/AvailableForNbArticles.php create mode 100644 core/lib/Thelia/Coupon/Rule/AvailableForPeriod.php create mode 100644 core/lib/Thelia/Coupon/Rule/AvailableForRepeatedDate.php create mode 100644 core/lib/Thelia/Coupon/Rule/AvailableForRepeatedPeriod.php create mode 100644 core/lib/Thelia/Coupon/Rule/AvailableForTotalAmount.php create mode 100644 core/lib/Thelia/Coupon/Rule/AvailableForTotalAmountForCategoryY.php create mode 100644 core/lib/Thelia/Coupon/Rule/CouponRuleAbstract.php create mode 100644 core/lib/Thelia/Coupon/Rule/CuponRuleInterface.php create mode 100644 core/lib/Thelia/Coupon/RuleOrganizer.php create mode 100644 core/lib/Thelia/Coupon/RuleOrganizerInterface.php create mode 100644 core/lib/Thelia/Coupon/Type/RemoveXAmount.php create mode 100644 core/lib/Thelia/Coupon/Type/RemoveXAmountForCategoryY.php create mode 100644 core/lib/Thelia/Coupon/Type/RemoveXPercent.php create mode 100644 core/lib/Thelia/Coupon/Type/RemoveXPercentForAttributeY.php create mode 100644 core/lib/Thelia/Coupon/Type/RemoveXPercentForCategoryY.php create mode 100644 core/lib/Thelia/Coupon/Type/RemoveXPercentForProductSaleElementIdY.php create mode 100644 core/lib/Thelia/Coupon/Type/RemoveXPercentForProductY.php create mode 100644 core/lib/Thelia/Tests/Coupon/CouponBaseAdapterTest.php create mode 100644 core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php create mode 100644 core/lib/Thelia/Tests/Coupon/CouponManagerTest.php create mode 100644 core/lib/Thelia/Tests/Coupon/Rule/AvailableForNbArticlesTest.php create mode 100644 core/lib/Thelia/Tests/Coupon/RuleOrganizerTest.php create mode 100644 core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountForCategoryYTest.php create mode 100644 core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php create mode 100644 core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentForCategoryYTest.php create mode 100644 core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php diff --git a/core/lib/Thelia/Coupon/CouponAbstract.php b/core/lib/Thelia/Coupon/CouponAbstract.php new file mode 100644 index 000000000..8c78dd924 --- /dev/null +++ b/core/lib/Thelia/Coupon/CouponAbstract.php @@ -0,0 +1,115 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Coupon; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Assist in writing a CouponInterface + * + * @package Coupon + * @author Guillaume MOREL + * + */ +abstract class CouponAbstract implements CouponInterface +{ + /** @var RuleOrganizerInterface */ + protected $organizer = null; + + + /** + * Return Coupon code (ex: XMAS) + * + * @return string + */ + public function getCode() + { + // TODO: Implement getCode() method. + } + + /** + * Return Coupon title (ex: Coupon for XMAS) + * + * @return string + */ + public function getTitle() + { + // TODO: Implement getTitle() method. + } + + /** + * Return Coupon short description + * + * @return string + */ + public function getShortDescription() + { + // TODO: Implement getShortDescription() method. + } + + /** + * Return Coupon description + * + * @return string + */ + public function getDescription() + { + // TODO: Implement getDescription() method. + } + + /** + * If Coupon is cumulative or prevent any accumulation + * If is cumulative you can sum Coupon effects + * If not cancel all other Coupon and take the last given + * + * @return string + */ + public function isCumulative() + { + // TODO: Implement isCumulative() method. + } + + /** + * If Coupon is removing Checkout Postage + * + * @return bool + */ + public function isRemovingPostage() + { + // TODO: Implement isRemovingPostage() method. + } + + /** + * Return effects generated by the coupon + * + * @return \Closure + */ + public function getEffect() + { + // TODO: Implement getEffect() method. + } + +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/CouponAdapterInterface.php b/core/lib/Thelia/Coupon/CouponAdapterInterface.php new file mode 100644 index 000000000..ece82fe28 --- /dev/null +++ b/core/lib/Thelia/Coupon/CouponAdapterInterface.php @@ -0,0 +1,60 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Coupon; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Allow a CouponManager class to be fed with relevant Thelia data + * + * @package Coupon + * @author Guillaume MOREL + * + */ +interface CouponAdapterInterface +{ + + /** + * Return a Cart a CouponManager can process + * + * @return \Thelia\Model\Cart + */ + public function getCart(); + + /** + * Return an Address a CouponManager can process + * + * @return \Thelia\Model\Address + */ + public function getDeliveryAddress(); + + /** + * Return an Customer a CouponManager can process + * + * @return \Thelia\Model\Customer + */ + public function getCustomer(); +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/CouponBaseAdapter.php b/core/lib/Thelia/Coupon/CouponBaseAdapter.php new file mode 100644 index 000000000..35b15af41 --- /dev/null +++ b/core/lib/Thelia/Coupon/CouponBaseAdapter.php @@ -0,0 +1,67 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Coupon; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class CouponBaseAdapter implements CouponAdapterInterface +{ + /** + * Return a Cart a CouponManager can process + * + * @return \Thelia\Model\Cart + */ + public function getCart() + { + // TODO: Implement getCart() method. + } + + /** + * Return an Address a CouponManager can process + * + * @return \Thelia\Model\Address + */ + public function getDeliveryAddress() + { + // TODO: Implement getDeliveryAddress() method. + } + + /** + * Return an Customer a CouponManager can process + * + * @return \Thelia\Model\Customer + */ + public function getCustomer() + { + // TODO: Implement getCustomer() method. + } + +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/CouponFactory.php b/core/lib/Thelia/Coupon/CouponFactory.php new file mode 100644 index 000000000..f999eabff --- /dev/null +++ b/core/lib/Thelia/Coupon/CouponFactory.php @@ -0,0 +1,49 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Coupon; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Generate a CouponInterface + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class CouponFactory +{ + /** + * Build a CouponInterface from its database data + * + * @param int $couponId CouponInterface id + * + * @return CouponInterface ready to be processed + */ + public function buildCouponFromId($couponId) + { + } +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/CouponInterface.php b/core/lib/Thelia/Coupon/CouponInterface.php new file mode 100644 index 000000000..ad332ad0a --- /dev/null +++ b/core/lib/Thelia/Coupon/CouponInterface.php @@ -0,0 +1,89 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Coupon; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Represents a Coupon ready to be processed in a Checkout process + * + * @package Coupon + * @author Guillaume MOREL + * + */ +interface CouponInterface +{ + /** + * Return Coupon code (ex: XMAS) + * + * @return string + */ + public function getCode(); + + /** + * Return Coupon title (ex: Coupon for XMAS) + * + * @return string + */ + public function getTitle(); + + /** + * Return Coupon short description + * + * @return string + */ + public function getShortDescription(); + + /** + * Return Coupon description + * + * @return string + */ + public function getDescription(); + + /** + * If Coupon is cumulative or prevent any accumulation + * If is cumulative you can sum Coupon effects + * If not cancel all other Coupon and take the last given + * + * @return string + */ + public function isCumulative(); + + /** + * If Coupon is removing Checkout Postage + * + * @return bool + */ + public function isRemovingPostage(); + + /** + * Return effects generated by the coupon + * + * @return \Closure + */ + public function getEffect(); +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/CouponManager.php b/core/lib/Thelia/Coupon/CouponManager.php new file mode 100644 index 000000000..958f65db5 --- /dev/null +++ b/core/lib/Thelia/Coupon/CouponManager.php @@ -0,0 +1,54 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Coupon; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Manage how Coupons could interact with a Checkout + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class CouponManager +{ + /** @var CouponAdapterInterface Provide necessary value from Thelia*/ + protected $adapter; + + /** @var array CouponInterface to process*/ + protected $coupons = array(); + + /** + * Get Discount for the given Coupons + * + * @return float checkout discount + */ + public function getDiscount() + { + return 10.00; + } +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForDate.php b/core/lib/Thelia/Coupon/Rule/AvailableForDate.php new file mode 100644 index 000000000..f55c48973 --- /dev/null +++ b/core/lib/Thelia/Coupon/Rule/AvailableForDate.php @@ -0,0 +1,38 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Coupon\Rule; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class AvailableForDate extends AvailableForPeriod +{ + +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForLocationX.php b/core/lib/Thelia/Coupon/Rule/AvailableForLocationX.php new file mode 100644 index 000000000..c57702b2f --- /dev/null +++ b/core/lib/Thelia/Coupon/Rule/AvailableForLocationX.php @@ -0,0 +1,38 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Coupon\Rule; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class AvailableForLocationX extends CouponRuleAbstract +{ + +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForNbArticles.php b/core/lib/Thelia/Coupon/Rule/AvailableForNbArticles.php new file mode 100644 index 000000000..78bbb0e00 --- /dev/null +++ b/core/lib/Thelia/Coupon/Rule/AvailableForNbArticles.php @@ -0,0 +1,38 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Coupon\Rule; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class AvailableForNbArticles extends CouponRuleAbstract +{ + +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForPeriod.php b/core/lib/Thelia/Coupon/Rule/AvailableForPeriod.php new file mode 100644 index 000000000..1a2753dc4 --- /dev/null +++ b/core/lib/Thelia/Coupon/Rule/AvailableForPeriod.php @@ -0,0 +1,38 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Coupon\Rule; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class AvailableForPeriod extends CouponRuleAbstract +{ + +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForRepeatedDate.php b/core/lib/Thelia/Coupon/Rule/AvailableForRepeatedDate.php new file mode 100644 index 000000000..7d03a1c5b --- /dev/null +++ b/core/lib/Thelia/Coupon/Rule/AvailableForRepeatedDate.php @@ -0,0 +1,38 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Coupon\Rule; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class AvailableForRepeatedDate extends AvailableForDate +{ + +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForRepeatedPeriod.php b/core/lib/Thelia/Coupon/Rule/AvailableForRepeatedPeriod.php new file mode 100644 index 000000000..8552947c2 --- /dev/null +++ b/core/lib/Thelia/Coupon/Rule/AvailableForRepeatedPeriod.php @@ -0,0 +1,38 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Coupon\Rule; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class AvailableForRepeatedPeriod extends AvailableForPeriod +{ + +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmount.php b/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmount.php new file mode 100644 index 000000000..b90ef1da5 --- /dev/null +++ b/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmount.php @@ -0,0 +1,38 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Coupon\Rule; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class AvailableForTotalAmount extends CouponRuleAbstract +{ + +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmountForCategoryY.php b/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmountForCategoryY.php new file mode 100644 index 000000000..08bdc23e5 --- /dev/null +++ b/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmountForCategoryY.php @@ -0,0 +1,38 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Coupon\Rule; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class AvailableForTotalAmountForCategoryY extends AvailableForTotalAmount +{ + +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/CouponRuleAbstract.php b/core/lib/Thelia/Coupon/Rule/CouponRuleAbstract.php new file mode 100644 index 000000000..1c30f0321 --- /dev/null +++ b/core/lib/Thelia/Coupon/Rule/CouponRuleAbstract.php @@ -0,0 +1,69 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Coupon\Rule; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Assist in writing a condition of whether the Rule is applied or not + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class CouponRuleAbstract implements CuponRuleInterface +{ + /** + * Check if backoffice inputs are relevant or not + * + * @return bool + */ + public function checkBackOfficeIntput() + { + // TODO: Implement checkBackOfficeIntput() method. + } + + /** + * Check if Checkout inputs are relevant or not + * + * @return bool + */ + public function checkCheckoutInput() + { + // TODO: Implement checkCheckoutInput() method. + } + + /** + * Check if the current Checkout matchs this condition + * + * @return bool + */ + public function isMatching() + { + // TODO: Implement isMatching() method. + } + +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/CuponRuleInterface.php b/core/lib/Thelia/Coupon/Rule/CuponRuleInterface.php new file mode 100644 index 000000000..b0cbfa767 --- /dev/null +++ b/core/lib/Thelia/Coupon/Rule/CuponRuleInterface.php @@ -0,0 +1,60 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Coupon\Rule; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Represents a condition of whether the Rule is applied or not + * + * @package Coupon + * @author Guillaume MOREL + * + */ +interface CuponRuleInterface +{ + /** + * Check if backoffice inputs are relevant or not + * + * @return bool + */ + public function checkBackOfficeIntput(); + + /** + * Check if Checkout inputs are relevant or not + * + * @return bool + */ + public function checkCheckoutInput(); + + /** + * Check if the current Checkout matchs this condition + * + * @return bool + */ + public function isMatching(); + +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/RuleOrganizer.php b/core/lib/Thelia/Coupon/RuleOrganizer.php new file mode 100644 index 000000000..b3699fc6c --- /dev/null +++ b/core/lib/Thelia/Coupon/RuleOrganizer.php @@ -0,0 +1,51 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Coupon; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Manage how Coupons could interact with a Checkout + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class RuleOrganizer implements RuleOrganizerInterface +{ + /** + * Organize CouponRuleInterface + * + * @param array $rules Array of CouponRuleInterface + * + * @return array Array of CouponRuleInterface sorted + */ + public function organize(array $rules) + { + // TODO: Implement organize() method. + } + +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/RuleOrganizerInterface.php b/core/lib/Thelia/Coupon/RuleOrganizerInterface.php new file mode 100644 index 000000000..bc901d24c --- /dev/null +++ b/core/lib/Thelia/Coupon/RuleOrganizerInterface.php @@ -0,0 +1,47 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Coupon; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Manage how Coupons could interact with a Checkout + * + * @package Coupon + * @author Guillaume MOREL + * + */ +interface RuleOrganizerInterface +{ + /** + * Organize CouponRuleInterface + * + * @param array $rules Array of CouponRuleInterface + * + * @return array Array of CouponRuleInterface sorted + */ + public function organize(array $rules); +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Type/RemoveXAmount.php b/core/lib/Thelia/Coupon/Type/RemoveXAmount.php new file mode 100644 index 000000000..1119d4ac2 --- /dev/null +++ b/core/lib/Thelia/Coupon/Type/RemoveXAmount.php @@ -0,0 +1,40 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Coupon\Type; + +use Thelia\Coupon\CouponAbstract; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class RemoveXAmount extends CouponAbstract +{ + +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Type/RemoveXAmountForCategoryY.php b/core/lib/Thelia/Coupon/Type/RemoveXAmountForCategoryY.php new file mode 100644 index 000000000..2cd8e5db6 --- /dev/null +++ b/core/lib/Thelia/Coupon/Type/RemoveXAmountForCategoryY.php @@ -0,0 +1,38 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Coupon\Type; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class RemoveXAmountForCategoryY extends RemoveXAmount +{ + +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Type/RemoveXPercent.php b/core/lib/Thelia/Coupon/Type/RemoveXPercent.php new file mode 100644 index 000000000..638861e71 --- /dev/null +++ b/core/lib/Thelia/Coupon/Type/RemoveXPercent.php @@ -0,0 +1,38 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Coupon\Type; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class RemoveXPercent extends CouponAbstract +{ + +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Type/RemoveXPercentForAttributeY.php b/core/lib/Thelia/Coupon/Type/RemoveXPercentForAttributeY.php new file mode 100644 index 000000000..643016c93 --- /dev/null +++ b/core/lib/Thelia/Coupon/Type/RemoveXPercentForAttributeY.php @@ -0,0 +1,38 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Coupon\Type; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class RemoveXPercentForAttributeY extends RemoveXPercent +{ + +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Type/RemoveXPercentForCategoryY.php b/core/lib/Thelia/Coupon/Type/RemoveXPercentForCategoryY.php new file mode 100644 index 000000000..6ad0d21df --- /dev/null +++ b/core/lib/Thelia/Coupon/Type/RemoveXPercentForCategoryY.php @@ -0,0 +1,38 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Coupon\Type; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class RemoveXPercentForCategoryY extends RemoveXPercent +{ + +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Type/RemoveXPercentForProductSaleElementIdY.php b/core/lib/Thelia/Coupon/Type/RemoveXPercentForProductSaleElementIdY.php new file mode 100644 index 000000000..b19913617 --- /dev/null +++ b/core/lib/Thelia/Coupon/Type/RemoveXPercentForProductSaleElementIdY.php @@ -0,0 +1,38 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Coupon\Type; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class RemoveXPercentForProductSaleElementIdY extends RemoveXPercent +{ + +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Type/RemoveXPercentForProductY.php b/core/lib/Thelia/Coupon/Type/RemoveXPercentForProductY.php new file mode 100644 index 000000000..494e30fcd --- /dev/null +++ b/core/lib/Thelia/Coupon/Type/RemoveXPercentForProductY.php @@ -0,0 +1,38 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Coupon\Type; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class RemoveXPercentForProductY extends RemoveXPercent +{ + +} \ No newline at end of file diff --git a/core/lib/Thelia/Tests/Coupon/CouponBaseAdapterTest.php b/core/lib/Thelia/Tests/Coupon/CouponBaseAdapterTest.php new file mode 100644 index 000000000..57d0ce131 --- /dev/null +++ b/core/lib/Thelia/Tests/Coupon/CouponBaseAdapterTest.php @@ -0,0 +1,66 @@ +object = new CouponBaseAdapter; + } + + /** + * Tears down the fixture, for example, closes a network connection. + * This method is called after a test is executed. + */ + protected function tearDown() + { + } + + /** + * @covers Thelia\Coupon\CouponBaseAdapter::getCart + * @todo Implement testGetCart(). + */ + public function testGetCart() + { + // Remove the following lines when you implement this test. + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); + } + + /** + * @covers Thelia\Coupon\CouponBaseAdapter::getDeliveryAddress + * @todo Implement testGetDeliveryAddress(). + */ + public function testGetDeliveryAddress() + { + // Remove the following lines when you implement this test. + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); + } + + /** + * @covers Thelia\Coupon\CouponBaseAdapter::getCustomer + * @todo Implement testGetCustomer(). + */ + public function testGetCustomer() + { + // Remove the following lines when you implement this test. + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); + } +} diff --git a/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php b/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php new file mode 100644 index 000000000..9a637b299 --- /dev/null +++ b/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php @@ -0,0 +1,42 @@ +object = new CouponFactory; + } + + /** + * 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::buildCouponFromId + * @todo Implement testBuildCouponFromId(). + */ + public function testBuildCouponFromId() + { + // 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/CouponManagerTest.php b/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php new file mode 100644 index 000000000..55b48f4d9 --- /dev/null +++ b/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php @@ -0,0 +1,42 @@ +object = new CouponManager; + } + + /** + * 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\CouponManager::getDiscount + * @todo Implement testGetDiscount(). + */ + public function testGetDiscount() + { + // 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/Rule/AvailableForNbArticlesTest.php b/core/lib/Thelia/Tests/Coupon/Rule/AvailableForNbArticlesTest.php new file mode 100644 index 000000000..ed8a57833 --- /dev/null +++ b/core/lib/Thelia/Tests/Coupon/Rule/AvailableForNbArticlesTest.php @@ -0,0 +1,26 @@ +object = new RuleOrganizer; + } + + /** + * 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\RuleOrganizer::organize + * @todo Implement testOrganize(). + */ + public function testOrganize() + { + // 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/Type/RemoveXAmountForCategoryYTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountForCategoryYTest.php new file mode 100644 index 000000000..ed8a57833 --- /dev/null +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountForCategoryYTest.php @@ -0,0 +1,26 @@ + Date: Mon, 19 Aug 2013 20:02:53 +0200 Subject: [PATCH 002/125] WIP Coupon RemoveXPercent and RemoveXAmount implementation --- core/lib/Thelia/Coupon/CouponAbstract.php | 69 +++++++- .../Thelia/Coupon/CouponAdapterInterface.php | 22 +++ core/lib/Thelia/Coupon/CouponBaseAdapter.php | 20 +++ core/lib/Thelia/Coupon/Type/RemoveXAmount.php | 40 +++++ .../lib/Thelia/Coupon/Type/RemoveXPercent.php | 55 +++++++ .../Exception/MissingAdapterException.php | 50 ++++++ .../Tests/Coupon/Type/RemoveXAmountTest.php | 147 +++++++++++++++++- .../Tests/Coupon/Type/RemoveXPercentTest.php | 139 +++++++++++++++++ 8 files changed, 533 insertions(+), 9 deletions(-) create mode 100644 core/lib/Thelia/Exception/MissingAdapterException.php diff --git a/core/lib/Thelia/Coupon/CouponAbstract.php b/core/lib/Thelia/Coupon/CouponAbstract.php index 8c78dd924..b2d4f9268 100644 --- a/core/lib/Thelia/Coupon/CouponAbstract.php +++ b/core/lib/Thelia/Coupon/CouponAbstract.php @@ -23,6 +23,8 @@ namespace Thelia\Coupon; +use Symfony\Component\Intl\Exception\NotImplementedException; + /** * Created by JetBrains PhpStorm. * Date: 8/19/13 @@ -36,9 +38,57 @@ namespace Thelia\Coupon; */ abstract class CouponAbstract implements CouponInterface { + /** @var CouponAdapterInterface Provide necessary value from Thelia*/ + protected $adapter; + /** @var RuleOrganizerInterface */ protected $organizer = null; + /** @var string Coupon code (ex: XMAS) */ + protected $code = null; + + /** @var string Coupon title (ex: Coupon for XMAS) */ + protected $title = null; + + /** @var string Coupon short description */ + protected $shortDescription = null; + + /** @var string Coupon description */ + protected $description = null; + + /** @var bool if Coupon is cumulative */ + protected $isCumulative = false; + + /** @var bool if Coupon is removing postage */ + protected $isRemovingPostage = false; + + /** + * Set Adapter containing all relevant data + * + * @param CouponAdapterInterface $adapter Adapter + * + * @return $this + */ + public function setAdapter($adapter) + { + $this->adapter = $adapter; + + return $this; + } + + /** + * Set Rule Organizer + * + * @param RuleOrganizerInterface $organizer Manage Rule groups (&& and ||) + * + * @return $this + */ + public function setOrganizer($organizer) + { + $this->organizer = $organizer; + + return $this; + } /** * Return Coupon code (ex: XMAS) @@ -47,7 +97,7 @@ abstract class CouponAbstract implements CouponInterface */ public function getCode() { - // TODO: Implement getCode() method. + return $this->code; } /** @@ -57,7 +107,7 @@ abstract class CouponAbstract implements CouponInterface */ public function getTitle() { - // TODO: Implement getTitle() method. + return $this->title; } /** @@ -67,7 +117,7 @@ abstract class CouponAbstract implements CouponInterface */ public function getShortDescription() { - // TODO: Implement getShortDescription() method. + return $this->shortDescription; } /** @@ -77,7 +127,7 @@ abstract class CouponAbstract implements CouponInterface */ public function getDescription() { - // TODO: Implement getDescription() method. + return $this->description; } /** @@ -85,11 +135,11 @@ abstract class CouponAbstract implements CouponInterface * If is cumulative you can sum Coupon effects * If not cancel all other Coupon and take the last given * - * @return string + * @return bool */ public function isCumulative() { - // TODO: Implement isCumulative() method. + return $this->isCumulative; } /** @@ -99,17 +149,20 @@ abstract class CouponAbstract implements CouponInterface */ public function isRemovingPostage() { - // TODO: Implement isRemovingPostage() method. + return $this->isRemovingPostage; } /** * Return effects generated by the coupon * + * @throws \Symfony\Component\Intl\Exception\NotImplementedException * @return \Closure */ public function getEffect() { - // TODO: Implement getEffect() method. + throw new NotImplementedException( + 'Abstract method to implement (CouponAbstract->getEffect)' + ); } } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/CouponAdapterInterface.php b/core/lib/Thelia/Coupon/CouponAdapterInterface.php index ece82fe28..f36c13427 100644 --- a/core/lib/Thelia/Coupon/CouponAdapterInterface.php +++ b/core/lib/Thelia/Coupon/CouponAdapterInterface.php @@ -57,4 +57,26 @@ interface CouponAdapterInterface * @return \Thelia\Model\Customer */ public function getCustomer(); + + /** + * Return Checkout total price + * + * @return float + */ + public function getCheckoutTotalPrice(); + + /** + * Return Products total price + * + * @return float + */ + public function getCheckoutTotalPriceWithoutDiscountAndPostagePrice(); + + /** + * Return Checkout total postage (only) price + * + * @return float + */ + public function getCheckoutPostagePrice(); + } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/CouponBaseAdapter.php b/core/lib/Thelia/Coupon/CouponBaseAdapter.php index 35b15af41..bb24306e2 100644 --- a/core/lib/Thelia/Coupon/CouponBaseAdapter.php +++ b/core/lib/Thelia/Coupon/CouponBaseAdapter.php @@ -64,4 +64,24 @@ class CouponBaseAdapter implements CouponAdapterInterface // TODO: Implement getCustomer() method. } + /** + * Return Checkout total price + * + * @return float + */ + public function getCheckoutTotalPrice() + { + // TODO: Implement getCheckoutTotalPrice() method. + } + + /** + * Return Checkout total postage (only) price + * + * @return float + */ + public function getCheckoutPostagePrice() + { + // TODO: Implement getCheckoutPostagePrice() method. + } + } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Type/RemoveXAmount.php b/core/lib/Thelia/Coupon/Type/RemoveXAmount.php index 1119d4ac2..6c9a6e7ba 100644 --- a/core/lib/Thelia/Coupon/Type/RemoveXAmount.php +++ b/core/lib/Thelia/Coupon/Type/RemoveXAmount.php @@ -30,6 +30,8 @@ use Thelia\Coupon\CouponAbstract; * Date: 8/19/13 * Time: 3:24 PM * + * Allow to remove an amount from the checkout total + * * @package Coupon * @author Guillaume MOREL * @@ -37,4 +39,42 @@ use Thelia\Coupon\CouponAbstract; class RemoveXAmount extends CouponAbstract { + protected $amount = 0; + + /** + * Constructor + * + * @param string $code Coupon code (ex: XMAS) + * @param string $title Coupon title (ex: Coupon for XMAS) + * @param string $shortDescription Coupon short description + * @param string $description Coupon description + * @param float $amount Coupon amount to deduce + * @param bool $isCumulative if Coupon is cumulative + * @param bool $isRemovingPostage if Coupon is removing postage + */ + function __construct($code, $title, $shortDescription, $description, $amount, $isCumulative, $isRemovingPostage) + { + $this->code = $code; + $this->title = $title; + $this->shortDescription = $shortDescription; + $this->description = $description; + + $this->isCumulative = $isCumulative; + $this->isRemovingPostage = $isRemovingPostage; + + $this->amount = $amount; + } + + /** + * Return effects generated by the coupon + * A negative value + * + * @return float + */ + public function getEffect() + { + return -$this->amount; + } + + } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Type/RemoveXPercent.php b/core/lib/Thelia/Coupon/Type/RemoveXPercent.php index 638861e71..3f0fd43fc 100644 --- a/core/lib/Thelia/Coupon/Type/RemoveXPercent.php +++ b/core/lib/Thelia/Coupon/Type/RemoveXPercent.php @@ -23,6 +23,9 @@ namespace Thelia\Coupon\Type; +use Thelia\Coupon\CouponAbstract; +use Thelia\Exception\MissingAdapterException; + /** * Created by JetBrains PhpStorm. * Date: 8/19/13 @@ -34,5 +37,57 @@ namespace Thelia\Coupon\Type; */ class RemoveXPercent extends CouponAbstract { + protected $percent = 0; + + /** + * Constructor + * + * @param string $code Coupon code (ex: XMAS) + * @param string $title Coupon title (ex: Coupon for XMAS) + * @param string $shortDescription Coupon short description + * @param string $description Coupon description + * @param float $percent Coupon % to deduce (ex:3.14 for 3.14%) + * @param bool $isCumulative if Coupon is cumulative + * @param bool $isRemovingPostage if Coupon is removing postage + */ + function __construct($code, $title, $shortDescription, $description, $percent, $isCumulative, $isRemovingPostage) + { + $this->code = $code; + $this->title = $title; + $this->shortDescription = $shortDescription; + $this->description = $description; + + $this->isCumulative = $isCumulative; + $this->isRemovingPostage = $isRemovingPostage; + + $this->percent = $percent; + } + + /** + * Return effects generated by the coupon + * A negative value + * + * @throws \Thelia\Exception\MissingAdapterException + * @throws \InvalidArgumentException + * @return float + */ + public function getEffect() + { + if ($this->adapter === null) { + throw new MissingAdapterException( + 'Cant calculate effect : CouponAdapterInterface is missing.' + ); + } + + if ($this->percent >= 100) { + throw new \InvalidArgumentException( + 'Percentage must be inferior to 100' + ); + } + + $basePrice = $this->adapter + ->getCheckoutTotalPriceWithoutDiscountAndPostagePrice(); + return $basePrice * (( 100 - $this->percent ) / 100); + } } \ No newline at end of file diff --git a/core/lib/Thelia/Exception/MissingAdapterException.php b/core/lib/Thelia/Exception/MissingAdapterException.php new file mode 100644 index 000000000..645020cab --- /dev/null +++ b/core/lib/Thelia/Exception/MissingAdapterException.php @@ -0,0 +1,50 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Exception; + +use Thelia\Log\Tlog; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Thrown when the Adapter is not set + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class MissingAdapterException extends \RuntimeException +{ + /** + * {@inheritdoc} + */ + public function __construct($message, $code = null, $previous = null) { + + Tlog::getInstance()->addError($message); + + parent::__construct($message, $code, $previous); + } +} diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php index 4b28a1d7b..27d0e9afb 100644 --- a/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php @@ -1,20 +1,165 @@ Loremipsum'; /** * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. */ protected function setUp() { + } + + protected function generateValidCumulativeRemovingPostageCoupon() + { + $coupon = new RemoveXAmount( + self::VALID_COUPON_CODE, + self::VALID_COUPON_TITLE, + self::VALID_COUPON_SHORT_DESCRIPTION, + self::VALID_COUPON_DESCRIPTION, + 30.00, + true, + true + ); + + return $coupon; + } + + protected function generateValidNonCumulativeNonRemovingPostageCoupon() + { + $coupon = new RemoveXAmount( + self::VALID_COUPON_CODE, + self::VALID_COUPON_TITLE, + self::VALID_COUPON_SHORT_DESCRIPTION, + self::VALID_COUPON_DESCRIPTION, + 30.00, + false, + false + ); + + return $coupon; + } + + /** + * + * @covers Thelia\Coupon\type\RemoveXAmount::getCode + * @covers Thelia\Coupon\type\RemoveXAmount::getTitle + * @covers Thelia\Coupon\type\RemoveXAmount::getShortDescription + * @covers Thelia\Coupon\type\RemoveXAmount::getDescription + * + */ + public function testDisplay() + { + + $coupon = $this->generateValidCumulativeRemovingPostageCoupon(); + + $expected = self::VALID_COUPON_CODE; + $actual = $coupon->getCode(); + $this->assertEquals($expected, $actual); + + $expected = self::VALID_COUPON_TITLE; + $actual = $coupon->getTitle(); + $this->assertEquals($expected, $actual); + + $expected = self::VALID_COUPON_SHORT_DESCRIPTION; + $actual = $coupon->getShortDescription(); + $this->assertEquals($expected, $actual); + + $expected = self::VALID_COUPON_DESCRIPTION; + $actual = $coupon->getDescription(); + $this->assertEquals($expected, $actual); + + } + + + /** + * + * @covers Thelia\Coupon\type\RemoveXAmount::isCumulative + * + */ + public function testIsCumulative() + { + + $coupon = $this->generateValidCumulativeRemovingPostageCoupon(); + + $actual = $coupon->isCumulative(); + $this->assertTrue($actual); + } + + /** + * + * @covers Thelia\Coupon\type\RemoveXAmount::isCumulative + * + */ + public function testIsNotCumulative() + { + + $coupon = $this->generateValidNonCumulativeNonRemovingPostageCoupon(); + + $actual = $coupon->isCumulative(); + $this->assertFalse($actual); + } + + + /** + * + * @covers Thelia\Coupon\type\RemoveXAmount::isRemovingPostage + * + */ + public function testIsRemovingPostage() + { + + $coupon = $this->generateValidCumulativeRemovingPostageCoupon(); + + $actual = $coupon->isRemovingPostage(); + $this->assertTrue($actual); + } + + /** + * + * @covers Thelia\Coupon\type\RemoveXAmount::isRemovingPostage + * + */ + public function testIsNotRemovingPostage() + { + + $coupon = $this->generateValidNonCumulativeNonRemovingPostageCoupon(); + + $actual = $coupon->isRemovingPostage(); + $this->assertFalse($actual); + } + + + /** + * + * @covers Thelia\Coupon\type\RemoveXAmount::getEffect + * + */ + public function testGetEffect() + { + + $coupon = $this->generateValidNonCumulativeNonRemovingPostageCoupon(); + + $expected = -30.00; + $actual = $coupon->getEffect(); + $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/Type/RemoveXPercentTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php index a7aa2e65f..33372cdb2 100644 --- a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php @@ -1,6 +1,9 @@ generateValidCumulativeRemovingPostageCoupon(); + + $expected = self::VALID_COUPON_CODE; + $actual = $coupon->getCode(); + $this->assertEquals($expected, $actual); + + $expected = self::VALID_COUPON_TITLE; + $actual = $coupon->getTitle(); + $this->assertEquals($expected, $actual); + + $expected = self::VALID_COUPON_SHORT_DESCRIPTION; + $actual = $coupon->getShortDescription(); + $this->assertEquals($expected, $actual); + + $expected = self::VALID_COUPON_DESCRIPTION; + $actual = $coupon->getDescription(); + $this->assertEquals($expected, $actual); + + } + + + /** + * + * @covers Thelia\Coupon\Type\RemoveXPercent::isCumulative + * + */ + public function testIsCumulative() + { + + $coupon = $this->generateValidCumulativeRemovingPostageCoupon(); + + $actual = $coupon->isCumulative(); + $this->assertTrue($actual); + } + + /** + * + * @covers Thelia\Coupon\Type\RemoveXPercent::isCumulative + * + */ + public function testIsNotCumulative() + { + + $coupon = $this->generateValidNonCumulativeNonRemovingPostageCoupon(); + + $actual = $coupon->isCumulative(); + $this->assertFalse($actual); + } + + + /** + * + * @covers Thelia\Coupon\Type\RemoveXPercent::isRemovingPostage + * + */ + public function testIsRemovingPostage() + { + + $coupon = $this->generateValidCumulativeRemovingPostageCoupon(); + + $actual = $coupon->isRemovingPostage(); + $this->assertTrue($actual); + } + + /** + * + * @covers Thelia\Coupon\Type\RemoveXPercent::isRemovingPostage + * + */ + public function testIsNotRemovingPostage() + { + + $coupon = $this->generateValidNonCumulativeNonRemovingPostageCoupon(); + + $actual = $coupon->isRemovingPostage(); + $this->assertFalse($actual); + } + + + /** + * + * @covers Thelia\Coupon\Type\RemoveXPercent::getEffect + * + */ + public function testGetEffect() + { + + $coupon = $this->generateValidNonCumulativeNonRemovingPostageCoupon(); + + $expected = -30.00; + $actual = $coupon->getEffect(); + $this->assertEquals($expected, $actual); + } + /** * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. From df08158cff14eb0900338784a7660e363a04c33e Mon Sep 17 00:00:00 2001 From: gmorel Date: Tue, 20 Aug 2013 19:05:41 +0200 Subject: [PATCH 003/125] WIP Coupon Implementation Comparable Parameters --- .../Thelia/Coupon/CouponAdapterInterface.php | 7 + core/lib/Thelia/Coupon/CouponBaseAdapter.php | 21 ++ .../Comparable.php} | 28 +- .../lib/Thelia/Coupon/Parameter/DateParam.php | 95 +++++ .../Thelia/Coupon/Parameter/IntervalParam.php | 107 ++++++ .../Coupon/Parameter/RepeatedDateParam.php | 89 +++++ .../Parameter/RepeatedIntervalParam.php | 122 +++++++ .../Thelia/Coupon/Parameter/RepeatedParam.php | 236 +++++++++++++ .../Coupon/Rule/AvailableForXArticles.php | 77 +++++ .../Thelia/Coupon/Rule/CouponRuleAbstract.php | 18 + .../Tests/Coupon/Parameter/DateParamTest.php | 96 +++++ .../Coupon/Parameter/IntervalParamTest.php | 121 +++++++ .../Parameter/RepeatedDateParamTest.php | 238 +++++++++++++ .../Parameter/RepeatedIntervalParamTest.php | 327 ++++++++++++++++++ .../Rule/AvailableForNbArticlesTest.php | 26 -- .../Coupon/Rule/AvailableForXArticlesTest.php | 211 +++++++++++ 16 files changed, 1784 insertions(+), 35 deletions(-) rename core/lib/Thelia/Coupon/{Rule/AvailableForNbArticles.php => Parameter/Comparable.php} (70%) create mode 100644 core/lib/Thelia/Coupon/Parameter/DateParam.php create mode 100644 core/lib/Thelia/Coupon/Parameter/IntervalParam.php create mode 100644 core/lib/Thelia/Coupon/Parameter/RepeatedDateParam.php create mode 100644 core/lib/Thelia/Coupon/Parameter/RepeatedIntervalParam.php create mode 100644 core/lib/Thelia/Coupon/Parameter/RepeatedParam.php create mode 100644 core/lib/Thelia/Coupon/Rule/AvailableForXArticles.php create mode 100644 core/lib/Thelia/Tests/Coupon/Parameter/DateParamTest.php create mode 100644 core/lib/Thelia/Tests/Coupon/Parameter/IntervalParamTest.php create mode 100644 core/lib/Thelia/Tests/Coupon/Parameter/RepeatedDateParamTest.php create mode 100644 core/lib/Thelia/Tests/Coupon/Parameter/RepeatedIntervalParamTest.php delete mode 100644 core/lib/Thelia/Tests/Coupon/Rule/AvailableForNbArticlesTest.php create mode 100644 core/lib/Thelia/Tests/Coupon/Rule/AvailableForXArticlesTest.php diff --git a/core/lib/Thelia/Coupon/CouponAdapterInterface.php b/core/lib/Thelia/Coupon/CouponAdapterInterface.php index f36c13427..06e3a3ca7 100644 --- a/core/lib/Thelia/Coupon/CouponAdapterInterface.php +++ b/core/lib/Thelia/Coupon/CouponAdapterInterface.php @@ -79,4 +79,11 @@ interface CouponAdapterInterface */ public function getCheckoutPostagePrice(); + /** + * Return the number of Products in the Cart + * + * @return int + */ + public function getNbArticlesInTheCart(); + } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/CouponBaseAdapter.php b/core/lib/Thelia/Coupon/CouponBaseAdapter.php index bb24306e2..6908b3317 100644 --- a/core/lib/Thelia/Coupon/CouponBaseAdapter.php +++ b/core/lib/Thelia/Coupon/CouponBaseAdapter.php @@ -84,4 +84,25 @@ class CouponBaseAdapter implements CouponAdapterInterface // TODO: Implement getCheckoutPostagePrice() method. } + /** + * Return Products total price + * + * @return float + */ + public function getCheckoutTotalPriceWithoutDiscountAndPostagePrice() + { + // TODO: Implement getCheckoutTotalPriceWithoutDiscountAndPostagePrice() method. + } + + /** + * Return the number of Products in the Cart + * + * @return int + */ + public function getNbArticlesInTheCart() + { + // TODO: Implement getNbArticlesInTheCart() method. + } + + } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForNbArticles.php b/core/lib/Thelia/Coupon/Parameter/Comparable.php similarity index 70% rename from core/lib/Thelia/Coupon/Rule/AvailableForNbArticles.php rename to core/lib/Thelia/Coupon/Parameter/Comparable.php index 78bbb0e00..37a7faeab 100644 --- a/core/lib/Thelia/Coupon/Rule/AvailableForNbArticles.php +++ b/core/lib/Thelia/Coupon/Parameter/Comparable.php @@ -21,18 +21,28 @@ /* */ /*************************************************************************************/ -namespace Thelia\Coupon\Rule; +namespace Thelia\Coupon\Parameter; /** - * Created by JetBrains PhpStorm. - * Date: 8/19/13 - * Time: 3:24 PM - * - * @package Coupon - * @author Guillaume MOREL + * Comparable interface that allows to compare two value objects to each other for similarity. * + * @author Benjamin Eberlei + * @author Guilherme Blanco */ -class AvailableForNbArticles extends CouponRuleAbstract +interface Comparable { - + /** + * Compare the current object to the passed $other. + * + * Returns 0 if they are semantically equal, 1 if the other object + * is less than the current one, or -1 if its more than the current one. + * + * This method should not check for identity using ===, only for semantical equality for example + * when two different DateTime instances point to the exact same Date + TZ. + * + * @param mixed $other Object + * + * @return int + */ + public function compareTo($other); } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Parameter/DateParam.php b/core/lib/Thelia/Coupon/Parameter/DateParam.php new file mode 100644 index 000000000..29dab530d --- /dev/null +++ b/core/lib/Thelia/Coupon/Parameter/DateParam.php @@ -0,0 +1,95 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Coupon\Parameter; + +use Thelia\Coupon\Parameter\Comparable; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Represent a DateTime + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class DateParam implements Comparable +{ + /** @var \DateTime Date */ + protected $dateTime = null; + + /** + * Constructor + * + * @param \DateTime $dateTime DateTime + */ + public function __construct(\DateTime $dateTime) + { + $this->dateTime = $dateTime; + } + + /** + * Get DateTime + * + * @return \DateTime + */ + public function getDateTime() + { + return clone $this->dateTime; + } + + /** + * Compare the current object to the passed $other. + * + * Returns 0 if they are semantically equal, 1 if the other object + * is less than the current one, or -1 if its more than the current one. + * + * This method should not check for identity using ===, only for semantical equality for example + * when two different DateTime instances point to the exact same Date + TZ. + * + * @param mixed $other Object + * + * @return int + */ + public function compareTo($other) + { + if (!$other instanceof \DateTime) { + throw new \InvalidArgumentException('DateParam can compare only DateTime'); + } + + $ret = -1; + if ($this->dateTime == $other) { + $ret = 0; + } elseif ($this->dateTime > $other) { + $ret = 1; + } else { + $ret = -1; + } + + return $ret; + } + +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Parameter/IntervalParam.php b/core/lib/Thelia/Coupon/Parameter/IntervalParam.php new file mode 100644 index 000000000..656cf69ca --- /dev/null +++ b/core/lib/Thelia/Coupon/Parameter/IntervalParam.php @@ -0,0 +1,107 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Coupon\Parameter; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Represent an DateTime period + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class IntervalParam implements Comparable +{ + /** @var \DatePeriod Date period */ + protected $datePeriod = null; + + /** + * Constructor + * + * @param \DateTime $start Start interval + * @param \DateInterval $interval Period + */ + public function __construct(\DateTime $start, \DateInterval $interval) + { + $this->datePeriod = new \DatePeriod($start, $interval, 1); + } + + /** + * Get DatePeriod + * + * @return \DatePeriod + */ + public function getDatePeriod() + { + return clone $this->datePeriod; + } + + /** + * Compare the current object to the passed $other. + * + * Returns 0 if they are semantically equal, 1 if the other object + * is less than the current one, or -1 if its more than the current one. + * + * This method should not check for identity using ===, only for semantical equality for example + * when two different DateTime instances point to the exact same Date + TZ. + * + * @param mixed $other Object + * + * @return int + */ + public function compareTo($other) + { + if (!$other instanceof \DateTime) { + throw new \InvalidArgumentException('IntervalParam can compare only DateTime'); + } + + /** @var \DateTime Start Date */ + $startDate = null; + /** @var \DateTime End Date */ + $endDate = null; + + foreach ($this->datePeriod as $key => $value) { + if ($key == 0) { + $startDate = $value; + } + if ($key == 1) { + $endDate = $value; + } + } + + $ret = -1; + if ($startDate <= $other && $other <= $endDate) { + $ret = 0; + } elseif ($startDate > $other) { + $ret = 1; + } else { + $ret = -1; + } + + return $ret; + } +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Parameter/RepeatedDateParam.php b/core/lib/Thelia/Coupon/Parameter/RepeatedDateParam.php new file mode 100644 index 000000000..150f632b8 --- /dev/null +++ b/core/lib/Thelia/Coupon/Parameter/RepeatedDateParam.php @@ -0,0 +1,89 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Coupon\Parameter; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Represent A repeated Date across the time + * Ex : + * A date repeated every 1 months 5 times + * ---------*---*---*---*---*---*---------------------------> time + * 1 2 3 4 5 6 + * 1 : $this->from Start date of the repetition + * *--- : $this->interval Duration of a whole cycle + * x6 : $this->recurrences How many cycle + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class RepeatedDateParam extends RepeatedParam +{ + /** + * Constructor + */ + public function __construct() + { + $this->defaultConstructor(); + } + + /** + * Compare the current object to the passed $other. + * + * Returns 0 if they are semantically equal, 1 if the other object + * is less than the current one, or -1 if its more than the current one. + * + * This method should not check for identity using ===, only for semantical equality for example + * when two different DateTime instances point to the exact same Date + TZ. + * + * @param mixed $other Object + * + * @throws \InvalidArgumentException + * @return int + */ + public function compareTo($other) + { + if (!$other instanceof \DateTime) { + throw new \InvalidArgumentException('RepeatedDateParam can compare only DateTime'); + } + + $ret = -1; + $dates = array(); + /** @var $value \DateTime */ + foreach ($this->datePeriod as $value) { + $dates[$value->getTimestamp()] = $value; + } + + foreach ($dates as $date) { + if ($date == $other) { + return 0; + } + } + + return $ret; + } +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Parameter/RepeatedIntervalParam.php b/core/lib/Thelia/Coupon/Parameter/RepeatedIntervalParam.php new file mode 100644 index 000000000..4bbbd8569 --- /dev/null +++ b/core/lib/Thelia/Coupon/Parameter/RepeatedIntervalParam.php @@ -0,0 +1,122 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Coupon\Parameter; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Represent A repeated DateInterval across the time + * Ex : + * A duration of 1 month repeated every 2 months 5 times + * ---------****----****----****----****----****----****-----------------> time + * 1 2 3 4 5 6 + * 1 : $this->from Start date of the repetition + * ****---- : $this->interval Duration of a whole cycle + * x6 : $this->recurrences How many cycle + * **** : $this->durationInDays Duration of a period + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class RepeatedIntervalParam extends RepeatedParam +{ + + /** @var int duration of the param */ + protected $durationInDays = 1; + + /** + * Get how many day a Param is lasting + * + * @return int + */ + public function getDurationInDays() + { + return $this->durationInDays; + } + + /** + * Set how many day a Param is lasting + * + * @param int $durationInDays How many day a Param is lasting + * + * @return $this + */ + public function setDurationInDays($durationInDays = 1) + { + $this->durationInDays = $durationInDays; + + return $this; + } + + /** + * Constructor + */ + public function __construct() + { + $this->defaultConstructor(); + } + + /** + * Compare the current object to the passed $other. + * + * Returns 0 if they are semantically equal, 1 if the other object + * is less than the current one, or -1 if its more than the current one. + * + * This method should not check for identity using ===, only for semantical equality for example + * when two different DateTime instances point to the exact same Date + TZ. + * + * @param mixed $other Object + * + * @return int + */ + public function compareTo($other) + { + if (!$other instanceof \DateTime) { + throw new \InvalidArgumentException('RepeatedIntervalParam can compare only DateTime'); + } + + $ret = -1; + $dates = array(); + /** @var $value \DateTime */ + foreach ($this->datePeriod as $value) { + $dates[$value->getTimestamp()]['startDate'] = $value; + $endDate = new \DateTime(); + $dates[$value->getTimestamp()]['endDate'] = $endDate->setTimestamp( + $value->getTimestamp() + ($this->durationInDays * 60 *60 *24) + ); + } + + foreach ($dates as $date) { + if ($date['startDate'] <= $other && $other <= $date['endDate']) { + return 0; + } + } + + return $ret; + + } +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Parameter/RepeatedParam.php b/core/lib/Thelia/Coupon/Parameter/RepeatedParam.php new file mode 100644 index 000000000..ed5dcbf03 --- /dev/null +++ b/core/lib/Thelia/Coupon/Parameter/RepeatedParam.php @@ -0,0 +1,236 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Coupon\Parameter; + +use DateInterval; +use DatePeriod; +use DateTime; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Allow to set the way a parameter can be repeated across the time + * + * @package Coupon + * @author Guillaume MOREL + * + */ +abstract class RepeatedParam implements Comparable +{ + /** @var DateTime The start date of the period. */ + protected $from = null; + + /** @var DateInterval The interval between recurrences within the period. */ + protected $interval = null; + + /** @var int The number of recurrences. */ + protected $recurrences = null; + + /** @var DatePeriod dates recurring at regular intervals, over a given period */ + protected $datePeriod = null; + + /** + * Generate default repetition + * Every 1 week 100 times from now + * + * @return $this + */ + protected function defaultConstructor() + { + $this->from = new \DateTime(); + $this->interval = new \DateInterval('P1W'); // 1 week + $this->recurrences = 100; + $this->generateDatePeriod(); + + return $this; + } + + /** + * Generate DatePeriod from class attributes + * Will repeat every DatePeriod + * + * @return $this + */ + protected function generateDatePeriod() + { + $this->datePeriod = new DatePeriod( + $this->from, + $this->interval, + $this->recurrences + ); + + return $this; + } + + /** + * Set the Object to be repeated every days + * Ex : $obj->repeatEveryDay() will be repeated every days indefinitely + * $obj->repeatEveryDay(10) will be repeated every 10 days indefinitely + * $obj->repeatEveryDay(10, 4) will be repeated every 10 days only 4 times + * + * @param int $frequency Frequency the object will be repeated + * @param int $nbRepetition Time the object will be repeated (0 = infinite) + * + * @return $this + */ + public function repeatEveryDay($frequency = 1, $nbRepetition = 0) + { + $this->_repeatEveryPeriod($period = 'D', $frequency, $nbRepetition); + + return $this; + } + + /** + * Set the Object to be repeated every week + * Ex : $obj->repeatEveryWeek() will be repeated every week indefinitely + * $obj->repeatEveryWeek(10) will be repeated every 10 weeks (70days) indefinitely + * $obj->repeatEveryWeek(10, 4) will be repeated every 10 weeks (70days) only 4 times + * + * @param int $frequency Frequency the object will be repeated + * @param int $nbRepetition Time the object will be repeated (0 = infinite) + * + * @return $this + */ + public function repeatEveryWeek($frequency = 1, $nbRepetition = null) + { + $this->_repeatEveryPeriod($period = 'W', $frequency, $nbRepetition); + + return $this; + } + + /** + * Set the Object to be repeated every month + * Ex : $obj->repeatEveryWeek() will be repeated every month indefinitely + * $obj->repeatEveryWeek(10) will be repeated every 10 month (70days) indefinitely + * $obj->repeatEveryWeek(10, 4) will be repeated every 10 month (70days) only 4 times + * + * @param int $frequency Frequency the object will be repeated + * @param int $nbRepetition Time the object will be repeated (0 = infinite) + * + * @return $this + */ + public function repeatEveryMonth($frequency = 1, $nbRepetition = null) + { + $this->_repeatEveryPeriod($period = 'M', $frequency, $nbRepetition); + + return $this; + } + + /** + * Set the Object to be repeated every year + * Ex : $obj->repeatEveryWeek() will be repeated every year indefinitely + * $obj->repeatEveryWeek(10) will be repeated every 10 year indefinitely + * $obj->repeatEveryWeek(10, 4) will be repeated every 10 year only 4 times + * + * @param int $frequency Frequency the object will be repeated + * @param int $nbRepetition Time the object will be repeated + * + * @return $this + */ + public function repeatEveryYear($frequency = 1, $nbRepetition = null) + { + $this->_repeatEveryPeriod($period = 'Y', $frequency, $nbRepetition); + + return $this; + } + + /** + * Set the Object to be repeated every Period + * Ex : $obj->repeatEveryPeriod('D') will be repeated every day once + * $obj->repeatEveryPeriod('W', 10) will be repeated every 10 week once + * $obj->repeatEveryPeriod('M', 10, 4) will be repeated every 10 month only 4 times + * + * @param string $period Period Y|M||D|W + * @param int $frequency Frequency the object will be repeated + * @param int $nbRepetition Time the object will be repeated + * + * @return $this + */ + private function _repeatEveryPeriod($period, $frequency = 1, $nbRepetition = null) + { + if (is_numeric($frequency) && $frequency > 0) { + $this->interval = new \DateInterval('P' . $frequency . $period); + } + + if (is_numeric($nbRepetition) && $nbRepetition > 0) { + $this->recurrences = $nbRepetition; + } + + $this->generateDatePeriod(); + + return $this; + } + + + + /** + * Set Start time + * + * @param \DateTime $from Start time + * + * @return $this + */ + public function setFrom($from) + { + $this->from = $from; + + return $this; + } + + /** + * Get Start time + * + * @return \DateTime + */ + public function getFrom() + { + return clone $this->from; + } + + /** + * Set DatePeriod + * + * @param DatePeriod $datePeriod DatePeriod + * + * @return $this + */ + public function setDatePeriod(DatePeriod $datePeriod) + { + $this->datePeriod = $datePeriod; + + return $this; + } + + /** + * Get date DatePeriod + * + * @return DatePeriod + */ + public function getDatePeriod() + { + return clone $this->datePeriod; + } +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForXArticles.php b/core/lib/Thelia/Coupon/Rule/AvailableForXArticles.php new file mode 100644 index 000000000..1fac12f94 --- /dev/null +++ b/core/lib/Thelia/Coupon/Rule/AvailableForXArticles.php @@ -0,0 +1,77 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Coupon\Rule; + +use Thelia\Type\IntType; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Check a Checkout against its Product number + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class AvailableForXArticles extends CouponRuleAbstract +{ + /** + * @inheritdoc + */ + public function checkBackOfficeIntput() + { + $ret = false; + $validator = new IntType(); + $firstParam = reset($this->validators); + if ($firstParam) { + $ret = $validator->isValid($firstParam); + } + + return $ret; + } + + public function checkCheckoutInput() + { + $ret = false; + $validator = new IntType(); + $firstParam = reset($this->validated); + if ($firstParam) { + $ret = $validator->isValid($firstParam); + } + + return $ret; + } + + public function isMatching() + { + if ($this->checkBackOfficeIntput() && $this->checkCheckoutInput()) { + $firstValidatorsParam = reset($this->validators); + $firstValidatedParam = reset($this->validated); +// if($firstValidatedParam >= $firstValidatedParam) + } + } + +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/CouponRuleAbstract.php b/core/lib/Thelia/Coupon/Rule/CouponRuleAbstract.php index 1c30f0321..4a01494ae 100644 --- a/core/lib/Thelia/Coupon/Rule/CouponRuleAbstract.php +++ b/core/lib/Thelia/Coupon/Rule/CouponRuleAbstract.php @@ -36,6 +36,24 @@ namespace Thelia\Coupon\Rule; */ class CouponRuleAbstract implements CuponRuleInterface { + /** @var array Parameters validating $validated against */ + protected $validators = array(); + + /** @var array Parameters to be validated */ + protected $validated = array(); + + /** + * Constructor + * + * @param array $validators Parameters validating $validated against + * @param array $validated Parameters to be validated + */ + public function __construct(array $validators, array $validated) + { + $this->validators = $validators; + $this->validated = $validated; + } + /** * Check if backoffice inputs are relevant or not * diff --git a/core/lib/Thelia/Tests/Coupon/Parameter/DateParamTest.php b/core/lib/Thelia/Tests/Coupon/Parameter/DateParamTest.php new file mode 100644 index 000000000..7ba6610df --- /dev/null +++ b/core/lib/Thelia/Tests/Coupon/Parameter/DateParamTest.php @@ -0,0 +1,96 @@ +compareTo($dateToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\DateParam::compareTo + * + */ + public function testEquelsDate() + { + $dateValidator = new \DateTime("2012-07-08"); + $dateToValidate = new \DateTime("2012-07-08"); + + $dateParam = new DateParam($dateValidator); + + $expected = 0; + $actual = $dateParam->compareTo($dateToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\DateParam::compareTo + * + */ + public function testSuperiorDate() + { + $dateValidator = new \DateTime("2012-07-08"); + $dateToValidate = new \DateTime("2012-07-09"); + + $dateParam = new DateParam($dateValidator); + + $expected = -1; + $actual = $dateParam->compareTo($dateToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * @covers Thelia\Coupon\Parameter\DateParam::compareTo + * @expectedException InvalidArgumentException + */ + public function testInvalidArgumentException() + { + $dateValidator = new \DateTime("2012-07-08"); + $dateToValidate = 1377012588; + + $dateParam = new DateParam($dateValidator); + + $dateParam->compareTo($dateToValidate); + } + + + + /** + * 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/Parameter/IntervalParamTest.php b/core/lib/Thelia/Tests/Coupon/Parameter/IntervalParamTest.php new file mode 100644 index 000000000..0c1018af5 --- /dev/null +++ b/core/lib/Thelia/Tests/Coupon/Parameter/IntervalParamTest.php @@ -0,0 +1,121 @@ +compareTo($dateToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\IntervalParam::compareTo + * + */ + public function testEqualsDate() + { + $dateValidatorStart = new \DateTime("2012-07-08"); + $dateValidatorInterval = new \DateInterval("P1M"); //1month + $dateToValidate = new \DateTime("2012-07-08"); + + echo '1 ' . date_format($dateValidatorStart, 'g:ia \o\n l jS F Y') . "\n"; + echo '2 ' . date_format($dateToValidate, 'g:ia \o\n l jS F Y') . "\n"; + + $dateParam = new IntervalParam($dateValidatorStart, $dateValidatorInterval); + + $expected = 0; + $actual = $dateParam->compareTo($dateToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\IntervalParam::compareTo + * + */ + public function testEqualsDate2() + { + $dateValidatorStart = new \DateTime("2012-07-08"); + $dateValidatorInterval = new \DateInterval("P1M"); //1month + $dateToValidate = new \DateTime("2012-08-08"); + + $dateParam = new IntervalParam($dateValidatorStart, $dateValidatorInterval); + + $expected = 0; + $actual = $dateParam->compareTo($dateToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\IntervalParam::compareTo + * + */ + public function testSuperiorDate() + { + $dateValidatorStart = new \DateTime("2012-07-08"); + $dateValidatorInterval = new \DateInterval("P1M"); //1month + $dateToValidate = new \DateTime("2012-08-09"); + + $dateParam = new IntervalParam($dateValidatorStart, $dateValidatorInterval); + + $expected = -1; + $actual = $dateParam->compareTo($dateToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * @covers Thelia\Coupon\Parameter\DateParam::compareTo + * @expectedException InvalidArgumentException + */ + public function testInvalidArgumentException() + { + $dateValidatorStart = new \DateTime("2012-07-08"); + $dateValidatorInterval = new \DateInterval("P1M"); //1month + $dateToValidate = 1377012588; + + $dateParam = new IntervalParam($dateValidatorStart, $dateValidatorInterval); + + $dateParam->compareTo($dateToValidate); + } + + + + /** + * 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/Parameter/RepeatedDateParamTest.php b/core/lib/Thelia/Tests/Coupon/Parameter/RepeatedDateParamTest.php new file mode 100644 index 000000000..5d5f1badc --- /dev/null +++ b/core/lib/Thelia/Tests/Coupon/Parameter/RepeatedDateParamTest.php @@ -0,0 +1,238 @@ +setFrom($startDateValidator); + $repeatedDateParam->repeatEveryMonth(); + + $expected = -1; + $actual = $repeatedDateParam->compareTo($dateToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo + * + */ + public function testEqualsDateRepeatEveryMonthOneTimeFirstPeriod() + { + $startDateValidator = new \DateTime("2012-07-08"); + $dateToValidate = new \DateTime("2012-07-08"); + + $repeatedDateParam = new RepeatedDateParam(); + $repeatedDateParam->setFrom($startDateValidator); + $repeatedDateParam->repeatEveryMonth(); + + $expected = 0; + $actual = $repeatedDateParam->compareTo($dateToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo + * + */ + public function testEqualsDateRepeatEveryMonthOneTimeSecondPeriod() + { + $startDateValidator = new \DateTime("2012-07-08"); + $dateToValidate = new \DateTime("2012-08-08"); + + $repeatedDateParam = new RepeatedDateParam(); + $repeatedDateParam->setFrom($startDateValidator); + $repeatedDateParam->repeatEveryMonth(); + + $expected = 0; + $actual = $repeatedDateParam->compareTo($dateToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo + * + */ + public function testEqualsDateRepeatEveryMonthTenTimesThirdPeriod() + { + $startDateValidator = new \DateTime("2012-07-08"); + $dateToValidate = new \DateTime("2012-09-08"); + + $repeatedDateParam = new RepeatedDateParam(); + $repeatedDateParam->setFrom($startDateValidator); + $repeatedDateParam->repeatEveryMonth(1, 10); + + $expected = 0; + $actual = $repeatedDateParam->compareTo($dateToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo + * + */ + public function testEqualsDateRepeatEveryMonthTenTimesTensPeriod() + { + $startDateValidator = new \DateTime("2012-07-08"); + $dateToValidate = new \DateTime("2013-05-08"); + + $repeatedDateParam = new RepeatedDateParam(); + $repeatedDateParam->setFrom($startDateValidator); + $repeatedDateParam->repeatEveryMonth(1, 10); + + $expected = 0; + $actual = $repeatedDateParam->compareTo($dateToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo + * + */ + public function testEqualsDateRepeatEveryFourMonthTwoTimesSecondPeriod() + { + $startDateValidator = new \DateTime("2012-07-08"); + $dateToValidate = new \DateTime("2012-11-08"); + + $repeatedDateParam = new RepeatedDateParam(); + $repeatedDateParam->setFrom($startDateValidator); + $repeatedDateParam->repeatEveryMonth(4, 2); + + $expected = 0; + $actual = $repeatedDateParam->compareTo($dateToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo + * + */ + public function testEqualsDateRepeatEveryFourMonthTwoTimesLastPeriod() + { + $startDateValidator = new \DateTime("2012-07-08"); + $dateToValidate = new \DateTime("2013-03-08"); + + $repeatedDateParam = new RepeatedDateParam(); + $repeatedDateParam->setFrom($startDateValidator); + $repeatedDateParam->repeatEveryMonth(4, 2); + + $expected = 0; + $actual = $repeatedDateParam->compareTo($dateToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo + * + */ + public function testNotEqualsDateRepeatEveryFourMonthTwoTimes1() + { + $startDateValidator = new \DateTime("2012-07-08"); + $dateToValidate = new \DateTime("2012-08-08"); + + $repeatedDateParam = new RepeatedDateParam(); + $repeatedDateParam->setFrom($startDateValidator); + $repeatedDateParam->repeatEveryMonth(4, 2); + + $expected = -1; + $actual = $repeatedDateParam->compareTo($dateToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo + * + */ + public function testNotEqualsDateRepeatEveryFourMonthTwoTimes2() + { + $startDateValidator = new \DateTime("2012-07-08"); + $dateToValidate = new \DateTime("2012-12-08"); + + $repeatedDateParam = new RepeatedDateParam(); + $repeatedDateParam->setFrom($startDateValidator); + $repeatedDateParam->repeatEveryMonth(4, 2); + + $expected = -1; + $actual = $repeatedDateParam->compareTo($dateToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo + * + */ + public function testSuperiorDateRepeatEveryFourMonthTwoTimes() + { + $startDateValidator = new \DateTime("2012-07-08"); + $dateToValidate = new \DateTime("2013-03-09"); + + $repeatedDateParam = new RepeatedDateParam(); + $repeatedDateParam->setFrom($startDateValidator); + $repeatedDateParam->repeatEveryMonth(4, 2); + + $expected = -1; + $actual = $repeatedDateParam->compareTo($dateToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * @covers Thelia\Coupon\Parameter\DateParam::compareTo + * @expectedException InvalidArgumentException + */ + public function testInvalidArgumentException() + { + $startDateValidator = new \DateTime("2012-07-08"); + $dateToValidate = 1377012588; + + $repeatedDateParam = new RepeatedDateParam(); + $repeatedDateParam->setFrom($startDateValidator); + $repeatedDateParam->repeatEveryMonth(4, 2); + + $repeatedDateParam->compareTo($dateToValidate); + } + + + + /** + * 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/Parameter/RepeatedIntervalParamTest.php b/core/lib/Thelia/Tests/Coupon/Parameter/RepeatedIntervalParamTest.php new file mode 100644 index 000000000..0783bac3e --- /dev/null +++ b/core/lib/Thelia/Tests/Coupon/Parameter/RepeatedIntervalParamTest.php @@ -0,0 +1,327 @@ +setFrom($startDateValidator); + $RepeatedIntervalParam->setDurationInDays($duration); + + $RepeatedIntervalParam->repeatEveryMonth(); + + $expected = -1; + $actual = $RepeatedIntervalParam->compareTo($dateToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo + * + */ + public function testEqualsDateRepeatEveryMonthOneTimeFirstPeriodBegining() + { + $startDateValidator = new \DateTime("2012-07-08"); + $dateToValidate = new \DateTime("2012-07-08"); + $duration = 10; + + $RepeatedIntervalParam = new RepeatedIntervalParam(); + $RepeatedIntervalParam->setFrom($startDateValidator); + $RepeatedIntervalParam->setDurationInDays($duration); + $RepeatedIntervalParam->repeatEveryMonth(); + + $expected = 0; + $actual = $RepeatedIntervalParam->compareTo($dateToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo + * + */ + public function testEqualsDateRepeatEveryMonthOneTimeFirstPeriodMiddle() + { + $startDateValidator = new \DateTime("2012-07-08"); + $dateToValidate = new \DateTime("2012-07-13"); + $duration = 10; + + $RepeatedIntervalParam = new RepeatedIntervalParam(); + $RepeatedIntervalParam->setFrom($startDateValidator); + $RepeatedIntervalParam->setDurationInDays($duration); + $RepeatedIntervalParam->repeatEveryMonth(); + + $expected = 0; + $actual = $RepeatedIntervalParam->compareTo($dateToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo + * + */ + public function testEqualsDateRepeatEveryMonthOneTimeFirstPeriodEnding() + { + $startDateValidator = new \DateTime("2012-07-08"); + $dateToValidate = new \DateTime("2012-07-18"); + $duration = 10; + + $RepeatedIntervalParam = new RepeatedIntervalParam(); + $RepeatedIntervalParam->setFrom($startDateValidator); + $RepeatedIntervalParam->setDurationInDays($duration); + $RepeatedIntervalParam->repeatEveryMonth(); + + $expected = 0; + $actual = $RepeatedIntervalParam->compareTo($dateToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo + * + */ + public function testEqualsDateRepeatEveryMonthOneTimeSecondPeriodBegining() + { + $startDateValidator = new \DateTime("2012-08-08"); + $dateToValidate = new \DateTime("2012-08-08"); + $duration = 10; + + $RepeatedIntervalParam = new RepeatedIntervalParam(); + $RepeatedIntervalParam->setFrom($startDateValidator); + $RepeatedIntervalParam->setDurationInDays($duration); + $RepeatedIntervalParam->repeatEveryMonth(); + + $expected = 0; + $actual = $RepeatedIntervalParam->compareTo($dateToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo + * + */ + public function testEqualsDateRepeatEveryMonthOneTimeSecondPeriodMiddle() + { + $startDateValidator = new \DateTime("2012-08-08"); + $dateToValidate = new \DateTime("2012-08-13"); + $duration = 10; + + $RepeatedIntervalParam = new RepeatedIntervalParam(); + $RepeatedIntervalParam->setFrom($startDateValidator); + $RepeatedIntervalParam->setDurationInDays($duration); + $RepeatedIntervalParam->repeatEveryMonth(); + + $expected = 0; + $actual = $RepeatedIntervalParam->compareTo($dateToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo + * + */ + public function testEqualsDateRepeatEveryMonthOneTimeSecondPeriodEnding() + { + $startDateValidator = new \DateTime("2012-08-08"); + $dateToValidate = new \DateTime("2012-08-18"); + $duration = 10; + + $RepeatedIntervalParam = new RepeatedIntervalParam(); + $RepeatedIntervalParam->setFrom($startDateValidator); + $RepeatedIntervalParam->setDurationInDays($duration); + $RepeatedIntervalParam->repeatEveryMonth(); + + $expected = 0; + $actual = $RepeatedIntervalParam->compareTo($dateToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo + * + */ + public function testEqualsDateRepeatEveryMonthFourTimeLastPeriodBegining() + { + $startDateValidator = new \DateTime("2012-10-08"); + $dateToValidate = new \DateTime("2012-10-08"); + $duration = 10; + + $RepeatedIntervalParam = new RepeatedIntervalParam(); + $RepeatedIntervalParam->setFrom($startDateValidator); + $RepeatedIntervalParam->setDurationInDays($duration); + $RepeatedIntervalParam->repeatEveryMonth(1, 4); + + $expected = 0; + $actual = $RepeatedIntervalParam->compareTo($dateToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo + * + */ + public function testEqualsDateRepeatEveryMonthFourTimeLastPeriodMiddle() + { + $startDateValidator = new \DateTime("2012-10-08"); + $dateToValidate = new \DateTime("2012-10-13"); + $duration = 10; + + $RepeatedIntervalParam = new RepeatedIntervalParam(); + $RepeatedIntervalParam->setFrom($startDateValidator); + $RepeatedIntervalParam->setDurationInDays($duration); + $RepeatedIntervalParam->repeatEveryMonth(1, 4); + + $expected = 0; + $actual = $RepeatedIntervalParam->compareTo($dateToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo + * + */ + public function testEqualsDateRepeatEveryMonthFourTimeLastPeriodEnding() + { + $startDateValidator = new \DateTime("2012-10-08"); + $dateToValidate = new \DateTime("2012-10-18"); + $duration = 10; + + $RepeatedIntervalParam = new RepeatedIntervalParam(); + $RepeatedIntervalParam->setFrom($startDateValidator); + $RepeatedIntervalParam->setDurationInDays($duration); + $RepeatedIntervalParam->repeatEveryMonth(1, 4); + + $expected = 0; + $actual = $RepeatedIntervalParam->compareTo($dateToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo + * + */ + public function testNotEqualsDateRepeatEveryMonthFourTimeInTheBegining() + { + $startDateValidator = new \DateTime("2012-10-08"); + $dateToValidate = new \DateTime("2012-07-19"); + $duration = 10; + + $RepeatedIntervalParam = new RepeatedIntervalParam(); + $RepeatedIntervalParam->setFrom($startDateValidator); + $RepeatedIntervalParam->setDurationInDays($duration); + $RepeatedIntervalParam->repeatEveryMonth(1, 4); + + $expected = -1; + $actual = $RepeatedIntervalParam->compareTo($dateToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo + * + */ + public function testNotEqualsDateRepeatEveryMonthFourTimeInTheMiddle() + { + $startDateValidator = new \DateTime("2012-10-08"); + $dateToValidate = new \DateTime("2012-08-01"); + $duration = 10; + + $RepeatedIntervalParam = new RepeatedIntervalParam(); + $RepeatedIntervalParam->setFrom($startDateValidator); + $RepeatedIntervalParam->setDurationInDays($duration); + $RepeatedIntervalParam->repeatEveryMonth(1, 4); + + $expected = -1; + $actual = $RepeatedIntervalParam->compareTo($dateToValidate); + $this->assertEquals($expected, $actual); + } + + + /** + * + * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo + * + */ + public function testNotEqualsDateRepeatEveryMonthFourTimeInTheEnd() + { + $startDateValidator = new \DateTime("2012-10-08"); + $dateToValidate = new \DateTime("2012-08-07"); + $duration = 10; + + $RepeatedIntervalParam = new RepeatedIntervalParam(); + $RepeatedIntervalParam->setFrom($startDateValidator); + $RepeatedIntervalParam->setDurationInDays($duration); + $RepeatedIntervalParam->repeatEveryMonth(1, 4); + + $expected = -1; + $actual = $RepeatedIntervalParam->compareTo($dateToValidate); + $this->assertEquals($expected, $actual); + } + + + + /** + * + * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo + * + */ + public function testSuperiorDateRepeatEveryMonthFourTime() + { + $startDateValidator = new \DateTime("2012-10-08"); + $dateToValidate = new \DateTime("2012-10-19"); + $duration = 10; + + $RepeatedIntervalParam = new RepeatedIntervalParam(); + $RepeatedIntervalParam->setFrom($startDateValidator); + $RepeatedIntervalParam->setDurationInDays($duration); + $RepeatedIntervalParam->repeatEveryMonth(1, 4); + + $expected = -1; + $actual = $RepeatedIntervalParam->compareTo($dateToValidate); + $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/Rule/AvailableForNbArticlesTest.php b/core/lib/Thelia/Tests/Coupon/Rule/AvailableForNbArticlesTest.php deleted file mode 100644 index ed8a57833..000000000 --- a/core/lib/Thelia/Tests/Coupon/Rule/AvailableForNbArticlesTest.php +++ /dev/null @@ -1,26 +0,0 @@ -getMock( + 'CouponBaseAdapter', + array('getNbArticlesInTheCart'), + array() + ); + $stubTheliaAdapater->expects($this->any()) + ->method('getNbArticlesInTheCart') + ->will($this->returnValue(4)); + + return $stubTheliaAdapater; + } + + /** + * + * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkBackOfficeIntput + * + */ + public function testValidBackOfficeInput() + { + /** @var CouponAdapterInterface $stubTheliaAdapater */ + $stubTheliaAdapater = $this->generateValidCouponBaseAdapterMock(); + + $validators = array(4); + $validated = array($stubTheliaAdapater->getNbArticlesInTheCart()); + $rule = new AvailableForXArticles($validators, $validated); + + $expected = true; + $actual = $rule->checkBackOfficeIntput(); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkBackOfficeIntput + * + */ + public function testInValidBackOfficeInput() + { + /** @var CouponAdapterInterface $stubTheliaAdapater */ + $stubTheliaAdapater = $this->generateValidCouponBaseAdapterMock(); + + $validators = array(4.5); + $validated = array($stubTheliaAdapater->getNbArticlesInTheCart()); + $rule = new AvailableForXArticles($validators, $validated); + + $expected = false; + $actual = $rule->checkBackOfficeIntput(); + $this->assertEquals($expected, $actual); + + $validators = array(-1); + $validated = array($stubTheliaAdapater->getNbArticlesInTheCart()); + $rule = new AvailableForXArticles($validators, $validated); + + $expected = false; + $actual = $rule->checkBackOfficeIntput(); + $this->assertEquals($expected, $actual); + + $validators = array('bad'); + $validated = array($stubTheliaAdapater->getNbArticlesInTheCart()); + $rule = new AvailableForXArticles($validators, $validated); + + $expected = false; + $actual = $rule->checkBackOfficeIntput(); + $this->assertEquals($expected, $actual); + } + + + + /** + * + * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkCheckoutInput + * + */ + public function testValidCheckoutInput() + { + /** @var CouponAdapterInterface $stubTheliaAdapater */ + $stubTheliaAdapater = $this->generateValidCouponBaseAdapterMock(); + + $validators = array(4); + $validated = array($stubTheliaAdapater->getNbArticlesInTheCart()); + $rule = new AvailableForXArticles($validators, $validated); + + $expected = true; + $actual = $rule->checkCheckoutInput(); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkCheckoutInput + * + */ + public function testInValidCheckoutInput() + { + /** @var CouponAdapterInterface $stubTheliaAdapater */ + $stubTheliaAdapater = $this->generateValidCouponBaseAdapterMock(); + + $validators = array(4.5); + $validated = array($stubTheliaAdapater->getNbArticlesInTheCart()); + $rule = new AvailableForXArticles($validators, $validated); + + $expected = false; + $actual = $rule->checkCheckoutInput(); + $this->assertEquals($expected, $actual); + + $validators = array(-1); + $validated = array($stubTheliaAdapater->getNbArticlesInTheCart()); + $rule = new AvailableForXArticles($validators, $validated); + + $expected = false; + $actual = $rule->checkCheckoutInput(); + $this->assertEquals($expected, $actual); + + $validators = array('bad'); + $validated = array($stubTheliaAdapater->getNbArticlesInTheCart()); + $rule = new AvailableForXArticles($validators, $validated); + + $expected = false; + $actual = $rule->checkCheckoutInput(); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Rule\AvailableForXArticles::isMatching + * + */ + public function testMatchingRuleEqual() + { + /** @var CouponAdapterInterface $stubTheliaAdapater */ + $stubTheliaAdapater = $this->generateValidCouponBaseAdapterMock(); + + $validators = array(4); + $validated = array($stubTheliaAdapater->getNbArticlesInTheCart()); + $rule = new AvailableForXArticles($validators, $validated); + + $expected = true; + $actual = $rule->isMatching(); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Rule\AvailableForXArticles::isMatching + * + */ + public function testMatchingRuleSuperior() + { + /** @var CouponAdapterInterface $stubTheliaAdapater */ + $stubTheliaAdapater = $this->generateValidCouponBaseAdapterMock(); + + $validators = array(5); + $validated = array($stubTheliaAdapater->getNbArticlesInTheCart()); + $rule = new AvailableForXArticles($validators, $validated); + + $expected = true; + $actual = $rule->isMatching(); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Rule\AvailableForXArticles::isMatching + * + */ + public function testNotMatchingRule() + { + /** @var CouponAdapterInterface $stubTheliaAdapater */ + $stubTheliaAdapater = $this->generateValidCouponBaseAdapterMock(); + + $validators = array(3); + $validated = array($stubTheliaAdapater->getNbArticlesInTheCart()); + $rule = new AvailableForXArticles($validators, $validated); + + $expected = false; + $actual = $rule->isMatching(); + $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() + { + } + +} From c02e286d0967330cdf75168401647ed7d09f10ab Mon Sep 17 00:00:00 2001 From: gmorel Date: Wed, 21 Aug 2013 20:03:03 +0200 Subject: [PATCH 004/125] WIP Coupon Implementation CouponInterface 1st class : RemoveXAmount Implementation CouponRuleInterface 1st class : AvailableForTotalAmount --- .../Thelia/Coupon/CouponAdapterInterface.php | 51 ++- core/lib/Thelia/Coupon/CouponBaseAdapter.php | 62 ++- core/lib/Thelia/Coupon/CouponFactory.php | 48 ++- core/lib/Thelia/Coupon/CouponManager.php | 120 +++++- ...Comparable.php => ComparableInterface.php} | 53 +-- .../lib/Thelia/Coupon/Parameter/DateParam.php | 49 +-- .../Thelia/Coupon/Parameter/IntegerParam.php | 97 +++++ .../Thelia/Coupon/Parameter/IntervalParam.php | 47 +- .../Thelia/Coupon/Parameter/PriceParam.php | 116 +++++ .../Thelia/Coupon/Parameter/QuantityParam.php | 78 ++++ .../Coupon/Parameter/RepeatedDateParam.php | 47 +- .../Parameter/RepeatedIntervalParam.php | 48 ++- .../Thelia/Coupon/Parameter/RepeatedParam.php | 97 +++-- .../Thelia/Coupon/Rule/AvailableForDate.php | 68 ++- .../Coupon/Rule/AvailableForLocationX.php | 68 ++- .../Thelia/Coupon/Rule/AvailableForPeriod.php | 68 ++- .../Coupon/Rule/AvailableForRepeatedDate.php | 68 ++- .../Rule/AvailableForRepeatedPeriod.php | 68 ++- .../Coupon/Rule/AvailableForTotalAmount.php | 175 +++++++- .../AvailableForTotalAmountForCategoryY.php | 68 ++- .../Coupon/Rule/AvailableForXArticles.php | 90 ++-- .../Thelia/Coupon/Rule/CouponRuleAbstract.php | 175 +++++--- .../Coupon/Rule/CouponRuleInterface.php | 91 ++++ core/lib/Thelia/Coupon/Rule/Operators.php | 109 +++++ core/lib/Thelia/Coupon/RuleOrganizer.php | 42 +- .../Thelia/Coupon/RuleOrganizerInterface.php | 42 +- .../Coupon/{ => Type}/CouponAbstract.php | 137 ++++-- .../Coupon/{ => Type}/CouponInterface.php | 71 +-- core/lib/Thelia/Coupon/Type/RemoveXAmount.php | 61 +-- .../Coupon/Type/RemoveXAmountForCategoryY.php | 42 +- .../lib/Thelia/Coupon/Type/RemoveXPercent.php | 44 +- .../Type/RemoveXPercentForAttributeY.php | 42 +- .../Type/RemoveXPercentForCategoryY.php | 42 +- ...RemoveXPercentForProductSaleElementIdY.php | 42 +- .../Coupon/Type/RemoveXPercentForProductY.php | 42 +- .../InvalidRuleException.php} | 76 ++-- .../InvalidRuleOperatorException.php | 54 +++ .../Exception/InvalidRuleValueException.php | 54 +++ .../Tests/Coupon/CouponBaseAdapterTest.php | 32 +- .../Thelia/Tests/Coupon/CouponFactoryTest.php | 32 +- .../Thelia/Tests/Coupon/CouponManagerTest.php | 83 +++- .../Tests/Coupon/Parameter/DateParamTest.php | 34 +- .../Coupon/Parameter/IntegerParamTest.php | 128 ++++++ .../Coupon/Parameter/IntervalParamTest.php | 32 +- .../Tests/Coupon/Parameter/PriceParamTest.php | 193 +++++++++ .../Coupon/Parameter/QuantityParamTest.php | 161 +++++++ .../Parameter/RepeatedDateParamTest.php | 32 +- .../Parameter/RepeatedIntervalParamTest.php | 58 ++- .../Rule/AvailableForTotalAmountTest.php | 338 +++++++++++++++ .../Coupon/Rule/AvailableForXArticlesTest.php | 102 +++-- .../Thelia/Tests/Coupon/Rule/OperatorTest.php | 403 ++++++++++++++++++ .../Thelia/Tests/Coupon/RuleOrganizerTest.php | 32 +- .../Type/RemoveXAmountForCategoryYTest.php | 32 +- .../Tests/Coupon/Type/RemoveXAmountTest.php | 265 +++++++++++- .../Type/RemoveXPercentForCategoryYTest.php | 32 +- .../Tests/Coupon/Type/RemoveXPercentTest.php | 32 +- 56 files changed, 3919 insertions(+), 854 deletions(-) rename core/lib/Thelia/Coupon/Parameter/{Comparable.php => ComparableInterface.php} (70%) create mode 100644 core/lib/Thelia/Coupon/Parameter/IntegerParam.php create mode 100644 core/lib/Thelia/Coupon/Parameter/PriceParam.php create mode 100644 core/lib/Thelia/Coupon/Parameter/QuantityParam.php create mode 100644 core/lib/Thelia/Coupon/Rule/CouponRuleInterface.php create mode 100644 core/lib/Thelia/Coupon/Rule/Operators.php rename core/lib/Thelia/Coupon/{ => Type}/CouponAbstract.php (60%) rename core/lib/Thelia/Coupon/{ => Type}/CouponInterface.php (67%) rename core/lib/Thelia/{Coupon/Rule/CuponRuleInterface.php => Exception/InvalidRuleException.php} (60%) create mode 100644 core/lib/Thelia/Exception/InvalidRuleOperatorException.php create mode 100644 core/lib/Thelia/Exception/InvalidRuleValueException.php create mode 100644 core/lib/Thelia/Tests/Coupon/Parameter/IntegerParamTest.php create mode 100644 core/lib/Thelia/Tests/Coupon/Parameter/PriceParamTest.php create mode 100644 core/lib/Thelia/Tests/Coupon/Parameter/QuantityParamTest.php create mode 100644 core/lib/Thelia/Tests/Coupon/Rule/AvailableForTotalAmountTest.php create mode 100644 core/lib/Thelia/Tests/Coupon/Rule/OperatorTest.php diff --git a/core/lib/Thelia/Coupon/CouponAdapterInterface.php b/core/lib/Thelia/Coupon/CouponAdapterInterface.php index 06e3a3ca7..0a900183e 100644 --- a/core/lib/Thelia/Coupon/CouponAdapterInterface.php +++ b/core/lib/Thelia/Coupon/CouponAdapterInterface.php @@ -1,25 +1,25 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ namespace Thelia\Coupon; @@ -84,6 +84,13 @@ interface CouponAdapterInterface * * @return int */ - public function getNbArticlesInTheCart(); + public function getNbArticlesInTheCart(); + + /** + * Return all Coupon given during the Checkout + * + * @return array Array of CouponInterface + */ + public function getCurrentCoupons(); } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/CouponBaseAdapter.php b/core/lib/Thelia/Coupon/CouponBaseAdapter.php index 6908b3317..a79ac5407 100644 --- a/core/lib/Thelia/Coupon/CouponBaseAdapter.php +++ b/core/lib/Thelia/Coupon/CouponBaseAdapter.php @@ -1,25 +1,25 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ namespace Thelia\Coupon; @@ -104,5 +104,25 @@ class CouponBaseAdapter implements CouponAdapterInterface // TODO: Implement getNbArticlesInTheCart() method. } + /** + * Return all Coupon given during the Checkout + * + * @return array Array of CouponInterface + */ + public function getCurrentCoupons() + { + $couponFactory = new CouponFactory(); + + // @todo Get from Session + $couponCodes = array('XMAS', 'SPRINGBREAK'); + + $coupons = array(); + foreach ($couponCodes as $couponCode) { + $coupons[] = $couponFactory->buildCouponFromCode($couponCode); + } + + return $coupons; + } + } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/CouponFactory.php b/core/lib/Thelia/Coupon/CouponFactory.php index f999eabff..7f74c7f21 100644 --- a/core/lib/Thelia/Coupon/CouponFactory.php +++ b/core/lib/Thelia/Coupon/CouponFactory.php @@ -1,28 +1,30 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ namespace Thelia\Coupon; +use Thelia\Coupon\Type\CouponInterface; + /** * Created by JetBrains PhpStorm. * Date: 8/19/13 @@ -39,11 +41,11 @@ class CouponFactory /** * Build a CouponInterface from its database data * - * @param int $couponId CouponInterface id + * @param int $couponCode CouponInterface id * * @return CouponInterface ready to be processed */ - public function buildCouponFromId($couponId) + public function buildCouponFromCode($couponCode) { } } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/CouponManager.php b/core/lib/Thelia/Coupon/CouponManager.php index 958f65db5..765068c96 100644 --- a/core/lib/Thelia/Coupon/CouponManager.php +++ b/core/lib/Thelia/Coupon/CouponManager.php @@ -1,28 +1,30 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ namespace Thelia\Coupon; +use Thelia\Coupon\Type\CouponInterface; + /** * Created by JetBrains PhpStorm. * Date: 8/19/13 @@ -42,13 +44,87 @@ class CouponManager /** @var array CouponInterface to process*/ protected $coupons = array(); + /** + * Constructor + * Gather Coupons from Adapter + * via $adapter->getCurrentCoupons(); + * + * @param CouponAdapterInterface $adapter Provide necessary value from Thelia + */ + function __construct($adapter) + { + $this->adapter = $adapter; + $this->coupons = $this->adapter->getCurrentCoupons(); + } + + /** * Get Discount for the given Coupons * + * @api * @return float checkout discount */ public function getDiscount() { - return 10.00; + $discount = 0.00; + + if (count($this->coupons) > 0) { + $couponsKept = $this->sortCoupons(); + $isRemovingPostage = $this->isCouponRemovingPostage($couponsKept); + + if ($isRemovingPostage) { + $postage = $this->adapter->getCheckoutPostagePrice(); + $discount -= $postage; + } + + // Just In Case test + if ($discount >= $this->adapter->getCheckoutTotalPrice()) { + $discount = 0.00; + } + } + + return $discount; + } + + /** + * Check if there is a Coupon removing Postage + * + * @param array $couponsKept Array of CouponInterface sorted + * + * @return bool + */ + protected function isCouponRemovingPostage(array $couponsKept) + { + $isRemovingPostage = false; + + /** @var CouponInterface $coupon */ + foreach ($couponsKept as $coupon) { + if ($coupon->isRemovingPostage()) { + $isRemovingPostage = true; + } + } + + return $isRemovingPostage; + } + + /** + * Sort Coupon to keep + * Coupon not cumulative cancels previous + * + * @return array Array of CouponInterface sorted + */ + protected function sortCoupons() + { + $couponsKept = array(); + + /** @var CouponInterface $coupon */ + foreach ($this->coupons as $coupon) { + if (!$coupon->isCumulative()) { + $couponsKept = array(); + $couponsKept[] = $coupon; + } + } + + return $couponsKept; } } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Parameter/Comparable.php b/core/lib/Thelia/Coupon/Parameter/ComparableInterface.php similarity index 70% rename from core/lib/Thelia/Coupon/Parameter/Comparable.php rename to core/lib/Thelia/Coupon/Parameter/ComparableInterface.php index 37a7faeab..26bb3ca30 100644 --- a/core/lib/Thelia/Coupon/Parameter/Comparable.php +++ b/core/lib/Thelia/Coupon/Parameter/ComparableInterface.php @@ -1,35 +1,36 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ namespace Thelia\Coupon\Parameter; /** - * Comparable interface that allows to compare two value objects to each other for similarity. + * Comparable interface + * Allows to compare two value objects to each other for similarity. * - * @author Benjamin Eberlei - * @author Guilherme Blanco + * @author Benjamin Eberlei + * @author Guilherme Blanco */ -interface Comparable +interface ComparableInterface { /** * Compare the current object to the passed $other. @@ -37,7 +38,7 @@ interface Comparable * Returns 0 if they are semantically equal, 1 if the other object * is less than the current one, or -1 if its more than the current one. * - * This method should not check for identity using ===, only for semantical equality for example + * This method should not check for identity using ===, only for semantically equality for example * when two different DateTime instances point to the exact same Date + TZ. * * @param mixed $other Object diff --git a/core/lib/Thelia/Coupon/Parameter/DateParam.php b/core/lib/Thelia/Coupon/Parameter/DateParam.php index 29dab530d..fa4ea7d97 100644 --- a/core/lib/Thelia/Coupon/Parameter/DateParam.php +++ b/core/lib/Thelia/Coupon/Parameter/DateParam.php @@ -1,29 +1,29 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ namespace Thelia\Coupon\Parameter; -use Thelia\Coupon\Parameter\Comparable; +use Thelia\Coupon\Parameter\ComparableInterface; /** * Created by JetBrains PhpStorm. @@ -36,7 +36,7 @@ use Thelia\Coupon\Parameter\Comparable; * @author Guillaume MOREL * */ -class DateParam implements Comparable +class DateParam implements ComparableInterface { /** @var \DateTime Date */ protected $dateTime = null; @@ -67,11 +67,12 @@ class DateParam implements Comparable * Returns 0 if they are semantically equal, 1 if the other object * is less than the current one, or -1 if its more than the current one. * - * This method should not check for identity using ===, only for semantical equality for example + * This method should not check for identity using ===, only for semantically equality for example * when two different DateTime instances point to the exact same Date + TZ. * * @param mixed $other Object * + * @throws \InvalidArgumentException * @return int */ public function compareTo($other) diff --git a/core/lib/Thelia/Coupon/Parameter/IntegerParam.php b/core/lib/Thelia/Coupon/Parameter/IntegerParam.php new file mode 100644 index 000000000..c4d6ca5e7 --- /dev/null +++ b/core/lib/Thelia/Coupon/Parameter/IntegerParam.php @@ -0,0 +1,97 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Coupon\Parameter; + +use Thelia\Coupon\Parameter\ComparableInterface; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Represent an Integer + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class IntegerParam implements ComparableInterface +{ + /** @var int Integer to compare with */ + protected $integer = 0; + + /** + * Constructor + * + * @param int $integer Integer + */ + public function __construct($integer) + { + $this->integer = $integer; + } + + /** + * Get integer + * + * @return int + */ + public function getInteger() + { + return $this->integer; + } + + + /** + * Compare the current object to the passed $other. + * + * Returns 0 if they are semantically equal, 1 if the other object + * is less than the current one, or -1 if its more than the current one. + * + * This method should not check for identity using ===, only for semantically equality for example + * when two different DateTime instances point to the exact same Date + TZ. + * + * @param mixed $other Object + * + * @throws \InvalidArgumentException + * @return int + */ + public function compareTo($other) + { + if (!is_integer($other)) { + throw new \InvalidArgumentException('IntegerParam can compare only int'); + } + + $ret = -1; + if ($this->integer == $other) { + $ret = 0; + } elseif ($this->integer > $other) { + $ret = 1; + } else { + $ret = -1; + } + + return $ret; + } + +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Parameter/IntervalParam.php b/core/lib/Thelia/Coupon/Parameter/IntervalParam.php index 656cf69ca..88444fe36 100644 --- a/core/lib/Thelia/Coupon/Parameter/IntervalParam.php +++ b/core/lib/Thelia/Coupon/Parameter/IntervalParam.php @@ -1,25 +1,25 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ namespace Thelia\Coupon\Parameter; @@ -34,7 +34,7 @@ namespace Thelia\Coupon\Parameter; * @author Guillaume MOREL * */ -class IntervalParam implements Comparable +class IntervalParam implements ComparableInterface { /** @var \DatePeriod Date period */ protected $datePeriod = null; @@ -66,11 +66,12 @@ class IntervalParam implements Comparable * Returns 0 if they are semantically equal, 1 if the other object * is less than the current one, or -1 if its more than the current one. * - * This method should not check for identity using ===, only for semantical equality for example + * This method should not check for identity using ===, only for semantically equality for example * when two different DateTime instances point to the exact same Date + TZ. * * @param mixed $other Object * + * @throws \InvalidArgumentException * @return int */ public function compareTo($other) diff --git a/core/lib/Thelia/Coupon/Parameter/PriceParam.php b/core/lib/Thelia/Coupon/Parameter/PriceParam.php new file mode 100644 index 000000000..7d74101a0 --- /dev/null +++ b/core/lib/Thelia/Coupon/Parameter/PriceParam.php @@ -0,0 +1,116 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Coupon\Parameter; + +use Thelia\Coupon\Parameter\ComparableInterface; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Represent a Price + * Positive value with currency + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class PriceParam implements ComparableInterface +{ + /** @var float Positive Float to compare with */ + protected $price = null; + + /** @var string Currency Code ISO 4217 EUR|USD|GBP */ + protected $currency = null; + + /** + * Constructor + * + * @param float $price Positive float + * @param string $currency Currency Code ISO 4217 EUR|USD|GBP + */ + public function __construct($price, $currency) + { + $this->price = $price; + $this->currency = $currency; + } + + /** + * Get currency code + * + * @return string + */ + public function getCurrency() + { + return $this->currency; + } + + /** + * Get price + * + * @return float + */ + public function getPrice() + { + return $this->price; + } + + /** + * Compare the current object to the passed $other. + * + * Returns 0 if they are semantically equal, 1 if the other object + * is less than the current one, or -1 if its more than the current one. + * + * This method should not check for identity using ===, only for semantically equality for example + * when two different DateTime instances point to the exact same Date + TZ. + * + * @param mixed $other Object + * + * @throws \InvalidArgumentException + * @return int + */ + public function compareTo($other) + { + if (!is_float($other)) { + throw new \InvalidArgumentException( + 'PriceParam can compare only positive float' + ); + } + + $epsilon = 0.00001; + + $ret = -1; + if (abs($this->price - $other) < $epsilon) { + $ret = 0; + } elseif ($this->price > $other) { + $ret = 1; + } else { + $ret = -1; + } + + return $ret; + } + +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Parameter/QuantityParam.php b/core/lib/Thelia/Coupon/Parameter/QuantityParam.php new file mode 100644 index 000000000..e4dffb221 --- /dev/null +++ b/core/lib/Thelia/Coupon/Parameter/QuantityParam.php @@ -0,0 +1,78 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Coupon\Parameter; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Represent a Quantity + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class QuantityParam extends IntegerParam +{ + + /** + * Constructor + * + * @param int $integer Integer + */ + public function __construct($integer) + { + if ($integer < 0) { + $integer = 0; + } + $this->integer = $integer; + } + + /** + * Compare the current object to the passed $other. + * + * Returns 0 if they are semantically equal, 1 if the other object + * is less than the current one, or -1 if its more than the current one. + * + * This method should not check for identity using ===, only for semantically equality for example + * when two different DateTime instances point to the exact same Date + TZ. + * + * @param mixed $other Object + * + * @throws \InvalidArgumentException + * @return int + */ + public function compareTo($other) + { + if (!is_integer($other) || $other < 0) { + throw new \InvalidArgumentException( + 'IntegerParam can compare only positive int' + ); + } + + return parent::compareTo($other); + } + +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Parameter/RepeatedDateParam.php b/core/lib/Thelia/Coupon/Parameter/RepeatedDateParam.php index 150f632b8..dc99a0d26 100644 --- a/core/lib/Thelia/Coupon/Parameter/RepeatedDateParam.php +++ b/core/lib/Thelia/Coupon/Parameter/RepeatedDateParam.php @@ -1,25 +1,25 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ namespace Thelia\Coupon\Parameter; @@ -35,7 +35,8 @@ namespace Thelia\Coupon\Parameter; * 1 2 3 4 5 6 * 1 : $this->from Start date of the repetition * *--- : $this->interval Duration of a whole cycle - * x6 : $this->recurrences How many cycle + * x5 : $this->recurrences How many repeated cycle, 1st excluded + * x6 : How many occurrence * * @package Coupon * @author Guillaume MOREL @@ -57,7 +58,7 @@ class RepeatedDateParam extends RepeatedParam * Returns 0 if they are semantically equal, 1 if the other object * is less than the current one, or -1 if its more than the current one. * - * This method should not check for identity using ===, only for semantical equality for example + * This method should not check for identity using ===, only for semantically equality for example * when two different DateTime instances point to the exact same Date + TZ. * * @param mixed $other Object diff --git a/core/lib/Thelia/Coupon/Parameter/RepeatedIntervalParam.php b/core/lib/Thelia/Coupon/Parameter/RepeatedIntervalParam.php index 4bbbd8569..4d857716f 100644 --- a/core/lib/Thelia/Coupon/Parameter/RepeatedIntervalParam.php +++ b/core/lib/Thelia/Coupon/Parameter/RepeatedIntervalParam.php @@ -1,25 +1,25 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ namespace Thelia\Coupon\Parameter; @@ -35,7 +35,8 @@ namespace Thelia\Coupon\Parameter; * 1 2 3 4 5 6 * 1 : $this->from Start date of the repetition * ****---- : $this->interval Duration of a whole cycle - * x6 : $this->recurrences How many cycle + * x5 : $this->recurrences How many repeated cycle, 1st excluded + * x6 : How many occurrence * **** : $this->durationInDays Duration of a period * * @package Coupon @@ -86,11 +87,12 @@ class RepeatedIntervalParam extends RepeatedParam * Returns 0 if they are semantically equal, 1 if the other object * is less than the current one, or -1 if its more than the current one. * - * This method should not check for identity using ===, only for semantical equality for example + * This method should not check for identity using ===, only for semantically equality for example * when two different DateTime instances point to the exact same Date + TZ. * * @param mixed $other Object * + * @throws \InvalidArgumentException * @return int */ public function compareTo($other) diff --git a/core/lib/Thelia/Coupon/Parameter/RepeatedParam.php b/core/lib/Thelia/Coupon/Parameter/RepeatedParam.php index ed5dcbf03..1d9dd4905 100644 --- a/core/lib/Thelia/Coupon/Parameter/RepeatedParam.php +++ b/core/lib/Thelia/Coupon/Parameter/RepeatedParam.php @@ -1,25 +1,25 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ namespace Thelia\Coupon\Parameter; @@ -38,7 +38,7 @@ use DateTime; * @author Guillaume MOREL * */ -abstract class RepeatedParam implements Comparable +abstract class RepeatedParam implements ComparableInterface { /** @var DateTime The start date of the period. */ protected $from = null; @@ -46,7 +46,7 @@ abstract class RepeatedParam implements Comparable /** @var DateInterval The interval between recurrences within the period. */ protected $interval = null; - /** @var int The number of recurrences. */ + /** @var int Nb time the object will be repeated (1st occurrence excluded). */ protected $recurrences = null; /** @var DatePeriod dates recurring at regular intervals, over a given period */ @@ -87,12 +87,13 @@ abstract class RepeatedParam implements Comparable /** * Set the Object to be repeated every days - * Ex : $obj->repeatEveryDay() will be repeated every days indefinitely - * $obj->repeatEveryDay(10) will be repeated every 10 days indefinitely - * $obj->repeatEveryDay(10, 4) will be repeated every 10 days only 4 times + * Ex : $obj->repeatEveryDay() will occur once + * $obj->repeatEveryDay(10) will occur once + * $obj->repeatEveryDay(10, 0) will occur once + * $obj->repeatEveryDay(10, 4) will occur every 10 days 5 times * * @param int $frequency Frequency the object will be repeated - * @param int $nbRepetition Time the object will be repeated (0 = infinite) + * @param int $nbRepetition Time the object will be repeated * * @return $this */ @@ -105,16 +106,17 @@ abstract class RepeatedParam implements Comparable /** * Set the Object to be repeated every week - * Ex : $obj->repeatEveryWeek() will be repeated every week indefinitely - * $obj->repeatEveryWeek(10) will be repeated every 10 weeks (70days) indefinitely - * $obj->repeatEveryWeek(10, 4) will be repeated every 10 weeks (70days) only 4 times + * Ex : $obj->repeatEveryWeek() will occur once + * $obj->repeatEveryWeek(10) will occur once + * $obj->repeatEveryWeek(10, 0) will occur once + * $obj->repeatEveryWeek(10, 4) will occur every 10 weeks (70days) 5 times * * @param int $frequency Frequency the object will be repeated - * @param int $nbRepetition Time the object will be repeated (0 = infinite) + * @param int $nbRepetition Time the object will be repeated * * @return $this */ - public function repeatEveryWeek($frequency = 1, $nbRepetition = null) + public function repeatEveryWeek($frequency = 1, $nbRepetition = 0) { $this->_repeatEveryPeriod($period = 'W', $frequency, $nbRepetition); @@ -123,16 +125,17 @@ abstract class RepeatedParam implements Comparable /** * Set the Object to be repeated every month - * Ex : $obj->repeatEveryWeek() will be repeated every month indefinitely - * $obj->repeatEveryWeek(10) will be repeated every 10 month (70days) indefinitely - * $obj->repeatEveryWeek(10, 4) will be repeated every 10 month (70days) only 4 times + * Ex : $obj->repeatEveryWeek() will occur once + * $obj->repeatEveryWeek(10) will occur once + * $obj->repeatEveryWeek(10, 0) will occur once + * $obj->repeatEveryWeek(10, 4) will occur every 10 month (70days) 5times * * @param int $frequency Frequency the object will be repeated - * @param int $nbRepetition Time the object will be repeated (0 = infinite) + * @param int $nbRepetition Time the object will be repeated * * @return $this */ - public function repeatEveryMonth($frequency = 1, $nbRepetition = null) + public function repeatEveryMonth($frequency = 1, $nbRepetition = 0) { $this->_repeatEveryPeriod($period = 'M', $frequency, $nbRepetition); @@ -141,16 +144,17 @@ abstract class RepeatedParam implements Comparable /** * Set the Object to be repeated every year - * Ex : $obj->repeatEveryWeek() will be repeated every year indefinitely - * $obj->repeatEveryWeek(10) will be repeated every 10 year indefinitely - * $obj->repeatEveryWeek(10, 4) will be repeated every 10 year only 4 times + * Ex : $obj->repeatEveryWeek() will occur once + * $obj->repeatEveryWeek(10) will occur once + * $obj->repeatEveryWeek(10, 0) will occur once + * $obj->repeatEveryWeek(10, 4) will occur every 10 year 5 times * * @param int $frequency Frequency the object will be repeated * @param int $nbRepetition Time the object will be repeated * * @return $this */ - public function repeatEveryYear($frequency = 1, $nbRepetition = null) + public function repeatEveryYear($frequency = 1, $nbRepetition = 0) { $this->_repeatEveryPeriod($period = 'Y', $frequency, $nbRepetition); @@ -159,9 +163,10 @@ abstract class RepeatedParam implements Comparable /** * Set the Object to be repeated every Period - * Ex : $obj->repeatEveryPeriod('D') will be repeated every day once - * $obj->repeatEveryPeriod('W', 10) will be repeated every 10 week once - * $obj->repeatEveryPeriod('M', 10, 4) will be repeated every 10 month only 4 times + * Ex : $obj->repeatEveryPeriod('D') will occur once + * $obj->repeatEveryPeriod('W', 10) will occur once + * $obj->repeatEveryPeriod('W', 10, 0) will occur once + * $obj->repeatEveryPeriod('M', 10, 4) will occur every 10 month 5 times * * @param string $period Period Y|M||D|W * @param int $frequency Frequency the object will be repeated @@ -169,13 +174,13 @@ abstract class RepeatedParam implements Comparable * * @return $this */ - private function _repeatEveryPeriod($period, $frequency = 1, $nbRepetition = null) + private function _repeatEveryPeriod($period, $frequency = 1, $nbRepetition = 0) { if (is_numeric($frequency) && $frequency > 0) { $this->interval = new \DateInterval('P' . $frequency . $period); } - if (is_numeric($nbRepetition) && $nbRepetition > 0) { + if (is_numeric($nbRepetition) && $nbRepetition >= 0) { $this->recurrences = $nbRepetition; } diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForDate.php b/core/lib/Thelia/Coupon/Rule/AvailableForDate.php index f55c48973..800db5066 100644 --- a/core/lib/Thelia/Coupon/Rule/AvailableForDate.php +++ b/core/lib/Thelia/Coupon/Rule/AvailableForDate.php @@ -1,25 +1,25 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ namespace Thelia\Coupon\Rule; @@ -34,5 +34,31 @@ namespace Thelia\Coupon\Rule; */ class AvailableForDate extends AvailableForPeriod { + /** + * Generate current Rule validator from adapter + * + * @param CouponAdapterInterface $adapter allowing to gather + * all necessary Thelia variables + * + * @throws \Symfony\Component\Intl\Exception\NotImplementedException + * @return $this + */ + protected function setValidators(CouponAdapterInterface $adapter) + { + parent::setValidators($adapter); // TODO: Change the autogenerated stub + } + /** + * Generate current Rule param to be validated from adapter + * + * @param CouponAdapterInterface $adapter allowing to gather + * all necessary Thelia variables + * + * @throws \Symfony\Component\Intl\Exception\NotImplementedException + * @return $this + */ + protected function setParametersToValidate(CouponAdapterInterface $adapter) + { + parent::setParametersToValidate($adapter); // TODO: Change the autogenerated stub + } } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForLocationX.php b/core/lib/Thelia/Coupon/Rule/AvailableForLocationX.php index c57702b2f..f0ef8926a 100644 --- a/core/lib/Thelia/Coupon/Rule/AvailableForLocationX.php +++ b/core/lib/Thelia/Coupon/Rule/AvailableForLocationX.php @@ -1,25 +1,25 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ namespace Thelia\Coupon\Rule; @@ -34,5 +34,31 @@ namespace Thelia\Coupon\Rule; */ class AvailableForLocationX extends CouponRuleAbstract { + /** + * Generate current Rule validator from adapter + * + * @param CouponAdapterInterface $adapter allowing to gather + * all necessary Thelia variables + * + * @throws \Symfony\Component\Intl\Exception\NotImplementedException + * @return $this + */ + protected function setValidators(CouponAdapterInterface $adapter) + { + parent::setValidators($adapter); // TODO: Change the autogenerated stub + } + /** + * Generate current Rule param to be validated from adapter + * + * @param CouponAdapterInterface $adapter allowing to gather + * all necessary Thelia variables + * + * @throws \Symfony\Component\Intl\Exception\NotImplementedException + * @return $this + */ + protected function setParametersToValidate(CouponAdapterInterface $adapter) + { + parent::setParametersToValidate($adapter); // TODO: Change the autogenerated stub + } } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForPeriod.php b/core/lib/Thelia/Coupon/Rule/AvailableForPeriod.php index 1a2753dc4..fe7347c46 100644 --- a/core/lib/Thelia/Coupon/Rule/AvailableForPeriod.php +++ b/core/lib/Thelia/Coupon/Rule/AvailableForPeriod.php @@ -1,25 +1,25 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ namespace Thelia\Coupon\Rule; @@ -34,5 +34,31 @@ namespace Thelia\Coupon\Rule; */ class AvailableForPeriod extends CouponRuleAbstract { + /** + * Generate current Rule validator from adapter + * + * @param CouponAdapterInterface $adapter allowing to gather + * all necessary Thelia variables + * + * @throws \Symfony\Component\Intl\Exception\NotImplementedException + * @return $this + */ + protected function setValidators(CouponAdapterInterface $adapter) + { + parent::setValidators($adapter); // TODO: Change the autogenerated stub + } + /** + * Generate current Rule param to be validated from adapter + * + * @param CouponAdapterInterface $adapter allowing to gather + * all necessary Thelia variables + * + * @throws \Symfony\Component\Intl\Exception\NotImplementedException + * @return $this + */ + protected function setParametersToValidate(CouponAdapterInterface $adapter) + { + parent::setParametersToValidate($adapter); // TODO: Change the autogenerated stub + } } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForRepeatedDate.php b/core/lib/Thelia/Coupon/Rule/AvailableForRepeatedDate.php index 7d03a1c5b..21ebd01d3 100644 --- a/core/lib/Thelia/Coupon/Rule/AvailableForRepeatedDate.php +++ b/core/lib/Thelia/Coupon/Rule/AvailableForRepeatedDate.php @@ -1,25 +1,25 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ namespace Thelia\Coupon\Rule; @@ -34,5 +34,31 @@ namespace Thelia\Coupon\Rule; */ class AvailableForRepeatedDate extends AvailableForDate { + /** + * Generate current Rule validator from adapter + * + * @param CouponAdapterInterface $adapter allowing to gather + * all necessary Thelia variables + * + * @throws \Symfony\Component\Intl\Exception\NotImplementedException + * @return $this + */ + protected function setValidators(CouponAdapterInterface $adapter) + { + parent::setValidators($adapter); // TODO: Change the autogenerated stub + } + /** + * Generate current Rule param to be validated from adapter + * + * @param CouponAdapterInterface $adapter allowing to gather + * all necessary Thelia variables + * + * @throws \Symfony\Component\Intl\Exception\NotImplementedException + * @return $this + */ + protected function setParametersToValidate(CouponAdapterInterface $adapter) + { + parent::setParametersToValidate($adapter); // TODO: Change the autogenerated stub + } } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForRepeatedPeriod.php b/core/lib/Thelia/Coupon/Rule/AvailableForRepeatedPeriod.php index 8552947c2..2824b584a 100644 --- a/core/lib/Thelia/Coupon/Rule/AvailableForRepeatedPeriod.php +++ b/core/lib/Thelia/Coupon/Rule/AvailableForRepeatedPeriod.php @@ -1,25 +1,25 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ namespace Thelia\Coupon\Rule; @@ -34,5 +34,31 @@ namespace Thelia\Coupon\Rule; */ class AvailableForRepeatedPeriod extends AvailableForPeriod { + /** + * Generate current Rule validator from adapter + * + * @param CouponAdapterInterface $adapter allowing to gather + * all necessary Thelia variables + * + * @throws \Symfony\Component\Intl\Exception\NotImplementedException + * @return $this + */ + protected function setValidators(CouponAdapterInterface $adapter) + { + parent::setValidators($adapter); // TODO: Change the autogenerated stub + } + /** + * Generate current Rule param to be validated from adapter + * + * @param CouponAdapterInterface $adapter allowing to gather + * all necessary Thelia variables + * + * @throws \Symfony\Component\Intl\Exception\NotImplementedException + * @return $this + */ + protected function setParametersToValidate(CouponAdapterInterface $adapter) + { + parent::setParametersToValidate($adapter); // TODO: Change the autogenerated stub + } } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmount.php b/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmount.php index b90ef1da5..2f1de57ba 100644 --- a/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmount.php +++ b/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmount.php @@ -1,38 +1,171 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ namespace Thelia\Coupon\Rule; +use Symfony\Component\Intl\Exception\NotImplementedException; +use Thelia\Coupon\CouponAdapterInterface; +use Thelia\Coupon\Parameter\PriceParam; +use Thelia\Exception\InvalidRuleOperatorException; +use Thelia\Exception\InvalidRuleValueException; + /** * Created by JetBrains PhpStorm. * Date: 8/19/13 * Time: 3:24 PM * + * Rule AvailableForTotalAmount + * Check if a Checkout total amount match criteria + * * @package Coupon * @author Guillaume MOREL * */ class AvailableForTotalAmount extends CouponRuleAbstract { + /** Rule 1st parameter : price */ + CONST PARAM1_PRICE = 'price'; + + /** @var array Available Operators (Operators::CONST) */ + protected $availableOperators = array( + Operators::INFERIOR, + Operators::EQUAL, + Operators::SUPERIOR, + ); + + /** @var PriceParam Price Validator */ + protected $priceValidator = null; + + /** + * Constructor + * + * @param array $validators Parameters validating $paramsToValidate against + * @param array $validated Parameters to be paramsToValidate + */ + public function __construct(array $validators, array $validated = null) + { + parent::__construct($validators, $validated); + + $this->priceValidator = $validators[self::PARAM1_PRICE][self::VALUE]; + } + + + /** + * Check if backoffice inputs are relevant or not + * + * @throws InvalidRuleOperatorException if Operator is not allowed + * @throws InvalidRuleValueException if Value is not allowed + * @return bool + */ + public function checkBackOfficeInput() + { + if (!isset($this->validators) + || empty($this->validators) + ||!isset($this->validators[self::PARAM1_PRICE]) + ||!isset($this->validators[self::PARAM1_PRICE][self::VALUE]) + ||!$this->validators[self::PARAM1_PRICE][self::VALUE] instanceof PriceParam + ) { + throw new InvalidRuleValueException(get_class(), self::PARAM1_PRICE); + } + + $this->checkBackOfficeInputsOperators(); + + /** @var PriceParam $price */ + $price = $this->validators[self::PARAM1_PRICE][self::VALUE]; + + return $this->isPriceValid($price->getPrice()); + } + + /** + * Check if Checkout inputs are relevant or not + * + * @throws InvalidRuleValueException if Value is not allowed + * @return bool + */ + public function checkCheckoutInput() + { + if (!isset($this->paramsToValidate) + || empty($this->paramsToValidate) + ||!isset($this->paramsToValidate[self::PARAM1_PRICE]) + ) { + throw new InvalidRuleValueException(get_class(), self::PARAM1_PRICE); + } + + $quantity = $this->paramsToValidate[self::PARAM1_PRICE]; + + return $this->isPriceValid($quantity); + } + + /** + * Check if a price is valid + * + * @param int $price Price to check + * + * @throws InvalidRuleValueException if Value is not allowed + * @return bool + */ + protected function isPriceValid($price) + { + $priceValidator = $this->priceValidator; + try { + $priceValidator->compareTo($price); + } catch(\InvalidArgumentException $e) { + throw new InvalidRuleValueException(get_class(), self::PARAM1_PRICE); + } + + return true; + } + + /** + * Generate current Rule validator from adapter + * + * @param CouponAdapterInterface $adapter allowing to gather + * all necessary Thelia variables + * + * @throws \Symfony\Component\Intl\Exception\NotImplementedException + * @return $this + */ + protected function setValidators(CouponAdapterInterface $adapter) + { + $adapter->getRule($this); + } + + /** + * Generate current Rule param to be validated from adapter + * + * @param CouponAdapterInterface $adapter allowing to gather + * all necessary Thelia variables + * + * @return $this + */ + protected function setParametersToValidate(CouponAdapterInterface $adapter) + { + $this->paramsToValidate = array( + self::PARAM1_PRICE => $adapter->getCheckoutTotalPrice() + ); + + return $this; + } + } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmountForCategoryY.php b/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmountForCategoryY.php index 08bdc23e5..a4153e5a1 100644 --- a/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmountForCategoryY.php +++ b/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmountForCategoryY.php @@ -1,25 +1,25 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ namespace Thelia\Coupon\Rule; @@ -34,5 +34,31 @@ namespace Thelia\Coupon\Rule; */ class AvailableForTotalAmountForCategoryY extends AvailableForTotalAmount { + /** + * Generate current Rule validator from adapter + * + * @param CouponAdapterInterface $adapter allowing to gather + * all necessary Thelia variables + * + * @throws \Symfony\Component\Intl\Exception\NotImplementedException + * @return $this + */ + protected function setValidators(CouponAdapterInterface $adapter) + { + parent::setValidators($adapter); // TODO: Change the autogenerated stub + } + /** + * Generate current Rule param to be validated from adapter + * + * @param CouponAdapterInterface $adapter allowing to gather + * all necessary Thelia variables + * + * @throws \Symfony\Component\Intl\Exception\NotImplementedException + * @return $this + */ + protected function setParametersToValidate(CouponAdapterInterface $adapter) + { + parent::setParametersToValidate($adapter); // TODO: Change the autogenerated stub + } } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForXArticles.php b/core/lib/Thelia/Coupon/Rule/AvailableForXArticles.php index 1fac12f94..7016eda95 100644 --- a/core/lib/Thelia/Coupon/Rule/AvailableForXArticles.php +++ b/core/lib/Thelia/Coupon/Rule/AvailableForXArticles.php @@ -1,25 +1,25 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ namespace Thelia\Coupon\Rule; @@ -39,39 +39,31 @@ use Thelia\Type\IntType; class AvailableForXArticles extends CouponRuleAbstract { /** - * @inheritdoc + * Generate current Rule validator from adapter + * + * @param CouponAdapterInterface $adapter allowing to gather + * all necessary Thelia variables + * + * @throws \Symfony\Component\Intl\Exception\NotImplementedException + * @return $this */ - public function checkBackOfficeIntput() + protected function setValidators(CouponAdapterInterface $adapter) { - $ret = false; - $validator = new IntType(); - $firstParam = reset($this->validators); - if ($firstParam) { - $ret = $validator->isValid($firstParam); - } - - return $ret; + parent::setValidators($adapter); // TODO: Change the autogenerated stub } - public function checkCheckoutInput() + /** + * Generate current Rule param to be validated from adapter + * + * @param CouponAdapterInterface $adapter allowing to gather + * all necessary Thelia variables + * + * @throws \Symfony\Component\Intl\Exception\NotImplementedException + * @return $this + */ + protected function setParametersToValidate(CouponAdapterInterface $adapter) { - $ret = false; - $validator = new IntType(); - $firstParam = reset($this->validated); - if ($firstParam) { - $ret = $validator->isValid($firstParam); - } - - return $ret; - } - - public function isMatching() - { - if ($this->checkBackOfficeIntput() && $this->checkCheckoutInput()) { - $firstValidatorsParam = reset($this->validators); - $firstValidatedParam = reset($this->validated); -// if($firstValidatedParam >= $firstValidatedParam) - } + parent::setParametersToValidate($adapter); // TODO: Change the autogenerated stub } } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/CouponRuleAbstract.php b/core/lib/Thelia/Coupon/Rule/CouponRuleAbstract.php index 4a01494ae..a8a51cd00 100644 --- a/core/lib/Thelia/Coupon/Rule/CouponRuleAbstract.php +++ b/core/lib/Thelia/Coupon/Rule/CouponRuleAbstract.php @@ -1,28 +1,33 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ namespace Thelia\Coupon\Rule; +use Symfony\Component\Intl\Exception\NotImplementedException; +use Thelia\Coupon\CouponAdapterInterface; +use Thelia\Coupon\Parameter\ComparableInterface; +use Thelia\Exception\InvalidRuleOperatorException; + /** * Created by JetBrains PhpStorm. * Date: 8/19/13 @@ -34,54 +39,124 @@ namespace Thelia\Coupon\Rule; * @author Guillaume MOREL * */ -class CouponRuleAbstract implements CuponRuleInterface +abstract class CouponRuleAbstract implements CouponRuleInterface { - /** @var array Parameters validating $validated against */ + /** Operator key in $validators */ + CONST OPERATOR = 'operator'; + /** Value key in $validators */ + CONST VALUE = 'value'; + + /** @var array Available Operators (Operators::CONST) */ + protected $availableOperators = array(); + + /** @var array Parameters validating parameters against */ protected $validators = array(); /** @var array Parameters to be validated */ - protected $validated = array(); + protected $paramsToValidate = array(); /** * Constructor + * Ex: + * Param 1 : + * $validators['price']['operator'] = Operators::INFERIOR + * ['value'] = new IntegerParam(10) * - * @param array $validators Parameters validating $validated against - * @param array $validated Parameters to be validated + * Param 2 : + * $paramsToValidate['price'] = 9 + * + * @param array $validators Parameters validating $paramsToValidate against + * @param array $validated Parameters to be paramsToValidate */ - public function __construct(array $validators, array $validated) + public function __construct(array $validators, array $validated = null) { $this->validators = $validators; - $this->validated = $validated; + $this->paramsToValidate = $validated; } /** - * Check if backoffice inputs are relevant or not - * - * @return bool - */ - public function checkBackOfficeIntput() - { - // TODO: Implement checkBackOfficeIntput() method. - } - - /** - * Check if Checkout inputs are relevant or not - * - * @return bool - */ - public function checkCheckoutInput() - { - // TODO: Implement checkCheckoutInput() method. - } - - /** - * Check if the current Checkout matchs this condition + * Check if the current Checkout matches this condition * * @return bool */ public function isMatching() { - // TODO: Implement isMatching() method. + $this->checkBackOfficeInput(); + $this->checkCheckoutInput(); + + $isMatching = true; + foreach ($this->validators as $param => $validator) { + $a = $this->paramsToValidate[$param]; + $operator = $validator[self::OPERATOR]; + /** @var ComparableInterface $b */ + $b = $validator[self::VALUE]; + + if (!Operators::isValidAccordingToOperator($a, $operator, $b)) { + $isMatching = false; + } + } + + return $isMatching; + } + /** + * Return all available Operators for this Rule + * + * @return array Operators::CONST + */ + public function getAvailableOperators() + { + return $this->availableOperators; + } + + /** + * Check if Operators set for this Rule in the BackOffice are legit + * + * @throws InvalidRuleOperatorException if Operator is not allowed + * @return bool + */ + protected function checkBackOfficeInputsOperators() + { + foreach ($this->validators as $key => $param) { + if (!isset($param[self::OPERATOR]) + ||!in_array($param[self::OPERATOR], $this->availableOperators) + ) { + throw new InvalidRuleOperatorException(get_class(), $key); + } + } + return true; + } + + /** + * Generate current Rule validator from adapter + * + * @param CouponAdapterInterface $adapter allowing to gather + * all necessary Thelia variables + * + * @throws \Symfony\Component\Intl\Exception\NotImplementedException + * @return $this + */ + protected function setValidators(CouponAdapterInterface $adapter) + { + throw new NotImplementedException( + 'CouponRuleInterface::setValidators needs to be implemented' + ); + } + + /** + * Generate current Rule param to be validated from adapter + * + * @param CouponAdapterInterface $adapter allowing to gather + * all necessary Thelia variables + * + * @throws \Symfony\Component\Intl\Exception\NotImplementedException + * @return $this + */ + protected function setParametersToValidate(CouponAdapterInterface $adapter) + { + throw new NotImplementedException( + 'CouponRuleInterface::setValidators needs to be implemented' + ); + } } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/CouponRuleInterface.php b/core/lib/Thelia/Coupon/Rule/CouponRuleInterface.php new file mode 100644 index 000000000..8ab6abe34 --- /dev/null +++ b/core/lib/Thelia/Coupon/Rule/CouponRuleInterface.php @@ -0,0 +1,91 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Coupon\Rule; + +use Thelia\Coupon\CouponAdapterInterface; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Represents a condition of whether the Rule is applied or not + * + * @package Coupon + * @author Guillaume MOREL + * + */ +interface CouponRuleInterface +{ + /** + * Check if backoffice inputs are relevant or not + * + * @return bool + */ + public function checkBackOfficeInput(); + + /** + * Check if Checkout inputs are relevant or not + * + * @return bool + */ + public function checkCheckoutInput(); + + /** + * Check if the current Checkout matches this condition + * + * @return bool + */ + public function isMatching(); + + /** + * Return all available Operators for this Rule + * + * @return array Operators::CONST + */ + public function getAvailableOperators(); + +// /** +// * Generate current Rule validator from adapter +// * Ex : +// * $validator = array( +// * +// * @param CouponAdapterInterface $adapter allowing to gather +// * all necessary Thelia variables +// * +// * @return array Validators : array of ComparableInterface +// */ +// public function getValidators(CouponAdapterInterface $adapter); +// +// /** +// * Retrieve all param to validate from adapter +// * +// * @param CouponAdapterInterface $adapter allowing to gather +// * all necessary Thelia variables +// * +// * @return array Validators : array of ComparableInterface +// */ +// public function getParamToValidate(CouponAdapterInterface $adapter); + +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/Operators.php b/core/lib/Thelia/Coupon/Rule/Operators.php new file mode 100644 index 000000000..c11198caf --- /dev/null +++ b/core/lib/Thelia/Coupon/Rule/Operators.php @@ -0,0 +1,109 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Coupon\Rule; + +use Thelia\Coupon\Parameter\ComparableInterface; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Represent available Operations in rule checking + * + * @package Coupon + * @author Guillaume MOREL + * + */ +abstract class Operators +{ + /** Param1 is inferior to Param2 */ + CONST INFERIOR = '<'; + /** Param1 is inferior to Param2 */ + CONST INFERIOR_OR_EQUAL = '<='; + /** Param1 is equal to Param2 */ + CONST EQUAL = '=='; + /** Param1 is superior to Param2 */ + CONST SUPERIOR_OR_EQUAL = '>='; + /** Param1 is superior to Param2 */ + CONST SUPERIOR = '>'; + /** Param1 is different to Param2 */ + CONST DIFFERENT = '!='; + + /** + * Check if a parameter is valid against a ComparableInterface from its operator + * + * @param mixed $a Parameter to validate + * @param string $operator Operator to validate against + * @param ComparableInterface $b Comparable to validate against + * + * @return bool + */ + public static function isValidAccordingToOperator($a, $operator, ComparableInterface $b) + { + $ret = false; + + try { + $comparison = $b->compareTo($a); + } catch (\Exception $e) { + return false; + } + + switch ($operator) { + case self::INFERIOR: + if ($comparison == 1) { + return true; + } + break; + case self::INFERIOR_OR_EQUAL: + if ($comparison == 1 || $comparison == 0) { + return true; + } + break; + case self::EQUAL: + if ($comparison == 0) { + return true; + } + break; + case self::SUPERIOR_OR_EQUAL: + if ($comparison == -1 || $comparison == 0) { + return true; + } + break; + case self::SUPERIOR: + if ($comparison == -1) { + return true; + } + break; + case self::DIFFERENT: + if ($comparison != 0) { + return true; + } + break; + default: + } + + return $ret; + } +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/RuleOrganizer.php b/core/lib/Thelia/Coupon/RuleOrganizer.php index b3699fc6c..4c16ea1ff 100644 --- a/core/lib/Thelia/Coupon/RuleOrganizer.php +++ b/core/lib/Thelia/Coupon/RuleOrganizer.php @@ -1,25 +1,25 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ namespace Thelia\Coupon; diff --git a/core/lib/Thelia/Coupon/RuleOrganizerInterface.php b/core/lib/Thelia/Coupon/RuleOrganizerInterface.php index bc901d24c..b8b222028 100644 --- a/core/lib/Thelia/Coupon/RuleOrganizerInterface.php +++ b/core/lib/Thelia/Coupon/RuleOrganizerInterface.php @@ -1,25 +1,25 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ namespace Thelia\Coupon; diff --git a/core/lib/Thelia/Coupon/CouponAbstract.php b/core/lib/Thelia/Coupon/Type/CouponAbstract.php similarity index 60% rename from core/lib/Thelia/Coupon/CouponAbstract.php rename to core/lib/Thelia/Coupon/Type/CouponAbstract.php index b2d4f9268..3ef3166b3 100644 --- a/core/lib/Thelia/Coupon/CouponAbstract.php +++ b/core/lib/Thelia/Coupon/Type/CouponAbstract.php @@ -1,29 +1,33 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ -namespace Thelia\Coupon; +namespace Thelia\Coupon\Type; use Symfony\Component\Intl\Exception\NotImplementedException; +use Thelia\Coupon\CouponAdapterInterface; +use Thelia\Coupon\Rule\CouponRuleInterface; +use Thelia\Coupon\RuleOrganizerInterface; +use Thelia\Exception\InvalidRuleException; /** * Created by JetBrains PhpStorm. @@ -44,6 +48,9 @@ abstract class CouponAbstract implements CouponInterface /** @var RuleOrganizerInterface */ protected $organizer = null; + /** @var array Array of CouponRuleInterface */ + protected $rules = null; + /** @var string Coupon code (ex: XMAS) */ protected $code = null; @@ -62,6 +69,9 @@ abstract class CouponAbstract implements CouponInterface /** @var bool if Coupon is removing postage */ protected $isRemovingPostage = false; + /** @var float Amount that will be removed from the Checkout (Coupon Effect) */ + protected $amount = 0; + /** * Set Adapter containing all relevant data * @@ -154,15 +164,86 @@ abstract class CouponAbstract implements CouponInterface /** * Return effects generated by the coupon - * - * @throws \Symfony\Component\Intl\Exception\NotImplementedException - * @return \Closure + * A negative value + * @ + * @return float Amount removed from the Total Checkout */ public function getEffect() { - throw new NotImplementedException( - 'Abstract method to implement (CouponAbstract->getEffect)' - ); + return -$this->amount; } + /** + * Return condition to validate the Coupon or not + * + * @return array An array of CouponRuleInterface + */ + public function getRules() + { + $arrayObject = new \ArrayObject($this->rules); + + return $arrayObject->getArrayCopy(); + } + + /** + * Add a Rule to the Coupon + * + * @param CouponRuleInterface $rule Condition needed to match + * in order to get the Coupon effect + * + * @return $this + */ + public function addRule(CouponRuleInterface $rule) + { + $this->rules[] = $rule; + + return $this; + } + + /** + * Replace the existing Rules by those given in parameter + * If one Rule is badly implemented, no Rule will be added + * + * @param array $rules CouponRuleInterface to add + * + * @return $this + * @throws \Thelia\Exception\InvalidRuleException + */ + public function setRules(array $rules) + { + foreach ($rules as $rule) { + if (!$rule instanceof CouponRuleInterface) { + throw new InvalidRuleException(get_class()); + } + } + $this->rules = array(); + foreach ($rules as $rule) { + $this->addRule($rule); + } + + return $this; + } + + /** + * Check if the current Coupon is matching its conditions (Rules) + * Thelia variables are given by the CouponAdapterInterface + * In $this->adapter + * + * @return bool + */ + public function isMatching() + { + $isMatching = true; + + /** @var CouponRuleInterface $rule */ + foreach ($this->rules as $rule) { + if (!$rule->isMatching()) { + $isMatching = false; + } + } + + return $isMatching; + } + + } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/CouponInterface.php b/core/lib/Thelia/Coupon/Type/CouponInterface.php similarity index 67% rename from core/lib/Thelia/Coupon/CouponInterface.php rename to core/lib/Thelia/Coupon/Type/CouponInterface.php index ad332ad0a..e2f49e3bb 100644 --- a/core/lib/Thelia/Coupon/CouponInterface.php +++ b/core/lib/Thelia/Coupon/Type/CouponInterface.php @@ -1,27 +1,27 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ -namespace Thelia\Coupon; +namespace Thelia\Coupon\Type; /** * Created by JetBrains PhpStorm. @@ -82,8 +82,31 @@ interface CouponInterface /** * Return effects generated by the coupon + * A negative value * - * @return \Closure + * Effects could also affect something else than the final Checkout price + * CouponAdapter could be use to directly pass a Session value + * some would wish to modify + * Hence affecting a wide variety of Thelia elements + * Ex : $this->adapter->getTheliaInternalValue + * + * @return float Amount removed from the Total Checkout */ public function getEffect(); -} \ No newline at end of file + + /** + * Return condition to validate the Coupon or not + * + * @return array An array of CouponRuleInterface + */ + public function getRules(); + + /** + * Check if the current Coupon is matching its conditions (Rules) + * Thelia variables are given by the CouponAdapterInterface + * In $this->adapter + * + * @return bool + */ + public function isMatching(); +} diff --git a/core/lib/Thelia/Coupon/Type/RemoveXAmount.php b/core/lib/Thelia/Coupon/Type/RemoveXAmount.php index 6c9a6e7ba..d7cfeb989 100644 --- a/core/lib/Thelia/Coupon/Type/RemoveXAmount.php +++ b/core/lib/Thelia/Coupon/Type/RemoveXAmount.php @@ -1,29 +1,29 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ namespace Thelia\Coupon\Type; -use Thelia\Coupon\CouponAbstract; +use Thelia\Coupon\Type\CouponAbstract; /** * Created by JetBrains PhpStorm. @@ -38,9 +38,6 @@ use Thelia\Coupon\CouponAbstract; */ class RemoveXAmount extends CouponAbstract { - - protected $amount = 0; - /** * Constructor * @@ -65,16 +62,4 @@ class RemoveXAmount extends CouponAbstract $this->amount = $amount; } - /** - * Return effects generated by the coupon - * A negative value - * - * @return float - */ - public function getEffect() - { - return -$this->amount; - } - - -} \ No newline at end of file +} diff --git a/core/lib/Thelia/Coupon/Type/RemoveXAmountForCategoryY.php b/core/lib/Thelia/Coupon/Type/RemoveXAmountForCategoryY.php index 2cd8e5db6..4a75683bc 100644 --- a/core/lib/Thelia/Coupon/Type/RemoveXAmountForCategoryY.php +++ b/core/lib/Thelia/Coupon/Type/RemoveXAmountForCategoryY.php @@ -1,25 +1,25 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ namespace Thelia\Coupon\Type; diff --git a/core/lib/Thelia/Coupon/Type/RemoveXPercent.php b/core/lib/Thelia/Coupon/Type/RemoveXPercent.php index 3f0fd43fc..5fd25ae8f 100644 --- a/core/lib/Thelia/Coupon/Type/RemoveXPercent.php +++ b/core/lib/Thelia/Coupon/Type/RemoveXPercent.php @@ -1,29 +1,29 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ namespace Thelia\Coupon\Type; -use Thelia\Coupon\CouponAbstract; +use Thelia\Coupon\Type\CouponAbstract; use Thelia\Exception\MissingAdapterException; /** diff --git a/core/lib/Thelia/Coupon/Type/RemoveXPercentForAttributeY.php b/core/lib/Thelia/Coupon/Type/RemoveXPercentForAttributeY.php index 643016c93..f0a7ef472 100644 --- a/core/lib/Thelia/Coupon/Type/RemoveXPercentForAttributeY.php +++ b/core/lib/Thelia/Coupon/Type/RemoveXPercentForAttributeY.php @@ -1,25 +1,25 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ namespace Thelia\Coupon\Type; diff --git a/core/lib/Thelia/Coupon/Type/RemoveXPercentForCategoryY.php b/core/lib/Thelia/Coupon/Type/RemoveXPercentForCategoryY.php index 6ad0d21df..717807da7 100644 --- a/core/lib/Thelia/Coupon/Type/RemoveXPercentForCategoryY.php +++ b/core/lib/Thelia/Coupon/Type/RemoveXPercentForCategoryY.php @@ -1,25 +1,25 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ namespace Thelia\Coupon\Type; diff --git a/core/lib/Thelia/Coupon/Type/RemoveXPercentForProductSaleElementIdY.php b/core/lib/Thelia/Coupon/Type/RemoveXPercentForProductSaleElementIdY.php index b19913617..bb052cd68 100644 --- a/core/lib/Thelia/Coupon/Type/RemoveXPercentForProductSaleElementIdY.php +++ b/core/lib/Thelia/Coupon/Type/RemoveXPercentForProductSaleElementIdY.php @@ -1,25 +1,25 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ namespace Thelia\Coupon\Type; diff --git a/core/lib/Thelia/Coupon/Type/RemoveXPercentForProductY.php b/core/lib/Thelia/Coupon/Type/RemoveXPercentForProductY.php index 494e30fcd..0b88ca44d 100644 --- a/core/lib/Thelia/Coupon/Type/RemoveXPercentForProductY.php +++ b/core/lib/Thelia/Coupon/Type/RemoveXPercentForProductY.php @@ -1,25 +1,25 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ namespace Thelia\Coupon\Type; diff --git a/core/lib/Thelia/Coupon/Rule/CuponRuleInterface.php b/core/lib/Thelia/Exception/InvalidRuleException.php similarity index 60% rename from core/lib/Thelia/Coupon/Rule/CuponRuleInterface.php rename to core/lib/Thelia/Exception/InvalidRuleException.php index b0cbfa767..834a6e962 100644 --- a/core/lib/Thelia/Coupon/Rule/CuponRuleInterface.php +++ b/core/lib/Thelia/Exception/InvalidRuleException.php @@ -1,60 +1,54 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ -namespace Thelia\Coupon\Rule; +namespace Thelia\Exception; + +use Thelia\Log\Tlog; /** * Created by JetBrains PhpStorm. * Date: 8/19/13 * Time: 3:24 PM * - * Represents a condition of whether the Rule is applied or not + * Thrown when a Rule is badly implemented * * @package Coupon * @author Guillaume MOREL * */ -interface CuponRuleInterface +class InvalidRuleException extends \RuntimeException { /** - * Check if backoffice inputs are relevant or not + * InvalidRuleOperatorException thrown when a Rule is badly implemented * - * @return bool + * @param string $className Class name + * @param string $parameter array key parameter */ - public function checkBackOfficeIntput(); + public function __construct($className) { - /** - * Check if Checkout inputs are relevant or not - * - * @return bool - */ - public function checkCheckoutInput(); + $message = 'Invalid Rule given to ' . $className; + Tlog::getInstance()->addError($message); - /** - * Check if the current Checkout matchs this condition - * - * @return bool - */ - public function isMatching(); - -} \ No newline at end of file + parent::__construct($message); + } +} diff --git a/core/lib/Thelia/Exception/InvalidRuleOperatorException.php b/core/lib/Thelia/Exception/InvalidRuleOperatorException.php new file mode 100644 index 000000000..82556b2ef --- /dev/null +++ b/core/lib/Thelia/Exception/InvalidRuleOperatorException.php @@ -0,0 +1,54 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Exception; + +use Thelia\Log\Tlog; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Thrown when a Rule receive an invalid Operator + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class InvalidRuleOperatorException extends \RuntimeException +{ + /** + * InvalidRuleOperatorException thrown when a Rule is given a bad Operator + * + * @param string $className Class name + * @param string $parameter array key parameter + */ + public function __construct($className, $parameter) { + + $message = 'Invalid Operator for Rule ' . $className . ' on parameter ' . $parameter; + Tlog::getInstance()->addError($message); + + parent::__construct($message); + } +} diff --git a/core/lib/Thelia/Exception/InvalidRuleValueException.php b/core/lib/Thelia/Exception/InvalidRuleValueException.php new file mode 100644 index 000000000..cbb86d16f --- /dev/null +++ b/core/lib/Thelia/Exception/InvalidRuleValueException.php @@ -0,0 +1,54 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Exception; + +use Thelia\Log\Tlog; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Thrown when a Rule receive an invalid Parameter + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class InvalidRuleValueException extends \RuntimeException +{ + /** + * InvalidRuleValueException thrown when a Rule is given a bad Parameter + * + * @param string $className Class name + * @param string $parameter array key parameter + */ + public function __construct($className, $parameter) { + + $message = 'Invalid Parameter for Rule ' . $className . ' on parameter ' . $parameter; + Tlog::getInstance()->addError($message); + + parent::__construct($message); + } +} diff --git a/core/lib/Thelia/Tests/Coupon/CouponBaseAdapterTest.php b/core/lib/Thelia/Tests/Coupon/CouponBaseAdapterTest.php index 57d0ce131..932dba9fc 100644 --- a/core/lib/Thelia/Tests/Coupon/CouponBaseAdapterTest.php +++ b/core/lib/Thelia/Tests/Coupon/CouponBaseAdapterTest.php @@ -1,8 +1,38 @@ . */ +/* */ +/**********************************************************************************/ + namespace Thelia\Coupon; /** - * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2013-08-19 at 18:26:01. + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Thrown when a Rule receive an invalid Parameter + * + * @package Coupon + * @author Guillaume MOREL + * */ class CouponBaseAdapterTest extends \PHPUnit_Framework_TestCase { diff --git a/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php b/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php index 9a637b299..465754cd3 100644 --- a/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php +++ b/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php @@ -1,8 +1,38 @@ . */ +/* */ +/**********************************************************************************/ + namespace Thelia\Coupon; /** - * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2013-08-19 at 18:06:16. + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Thrown when a Rule receive an invalid Parameter + * + * @package Coupon + * @author Guillaume MOREL + * */ class CouponFactoryTest extends \PHPUnit_Framework_TestCase { diff --git a/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php b/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php index 55b48f4d9..c7d2233f4 100644 --- a/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php +++ b/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php @@ -1,8 +1,38 @@ . */ +/* */ +/**********************************************************************************/ + namespace Thelia\Coupon; /** - * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2013-08-19 at 18:05:02. + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Thrown when a Rule receive an invalid Parameter + * + * @package Coupon + * @author Guillaume MOREL + * */ class CouponManagerTest extends \PHPUnit_Framework_TestCase { @@ -39,4 +69,55 @@ class CouponManagerTest extends \PHPUnit_Framework_TestCase 'This test has not been implemented yet.' ); } + + /** + * @covers Thelia\Coupon\CouponManager::getDiscount + * @todo Implement testGetDiscount(). + */ + public function testGetDiscountAlwaysInferiorToPrice() + { + // Remove the following lines when you implement this test. + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); + } + + /** + * @covers Thelia\Coupon\CouponManager::getDiscount + * @covers Thelia\Coupon\CouponManager::sortCoupons + * @todo Implement testGetDiscount(). + */ + public function testGetDiscountCouponNotCumulativeCancelOthers() + { + // Remove the following lines when you implement this test. + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); + } + + /** + * @covers Thelia\Coupon\CouponManager::getDiscount + * @covers Thelia\Coupon\CouponManager::sortCoupons + * @todo Implement testGetDiscount(). + */ + public function testGetDiscountCouponCumulativeCumulatesWithOthers() + { + // Remove the following lines when you implement this test. + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); + } + + /** + * @covers Thelia\Coupon\CouponManager::isCouponRemovingPostage + * @covers Thelia\Coupon\CouponManager::sortCoupons + * @todo Implement testGetDiscount(). + */ + public function testIsCouponRemovingPostage() + { + // 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/Parameter/DateParamTest.php b/core/lib/Thelia/Tests/Coupon/Parameter/DateParamTest.php index 7ba6610df..3062568c4 100644 --- a/core/lib/Thelia/Tests/Coupon/Parameter/DateParamTest.php +++ b/core/lib/Thelia/Tests/Coupon/Parameter/DateParamTest.php @@ -1,11 +1,41 @@ . */ +/* */ +/**********************************************************************************/ + namespace Thelia\Coupon; use InvalidArgumentException; use Thelia\Coupon\Parameter\DateParam; /** - * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2013-08-19 at 18:26:01. + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Thrown when a Rule receive an invalid Parameter + * + * @package Coupon + * @author Guillaume MOREL + * */ class DateParamTest extends \PHPUnit_Framework_TestCase { @@ -40,7 +70,7 @@ class DateParamTest extends \PHPUnit_Framework_TestCase * @covers Thelia\Coupon\Parameter\DateParam::compareTo * */ - public function testEquelsDate() + public function testEqualsDate() { $dateValidator = new \DateTime("2012-07-08"); $dateToValidate = new \DateTime("2012-07-08"); diff --git a/core/lib/Thelia/Tests/Coupon/Parameter/IntegerParamTest.php b/core/lib/Thelia/Tests/Coupon/Parameter/IntegerParamTest.php new file mode 100644 index 000000000..bcc24542e --- /dev/null +++ b/core/lib/Thelia/Tests/Coupon/Parameter/IntegerParamTest.php @@ -0,0 +1,128 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Coupon; + +use InvalidArgumentException; +use Thelia\Coupon\Parameter\IntegerParam; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Thrown when a Rule receive an invalid Parameter + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class IntegerParamTest extends \PHPUnit_Framework_TestCase +{ + + /** + * Sets up the fixture, for example, opens a network connection. + * This method is called before a test is executed. + */ + protected function setUp() + { + } + + /** + * + * @covers Thelia\Coupon\Parameter\IntegerParam::compareTo + * + */ + public function testInferiorInteger() + { + $intValidator = 42; + $intToValidate = 41; + + $integerParam = new IntegerParam($intValidator); + + $expected = 1; + $actual = $integerParam->compareTo($intToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\IntegerParam::compareTo + * + */ + public function testEqualsInteger() + { + $intValidator = 42; + $intToValidate = 42; + + $integerParam = new IntegerParam($intValidator); + + $expected = 0; + $actual = $integerParam->compareTo($intToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\IntegerParam::compareTo + * + */ + public function testSuperiorInteger() + { + $intValidator = 42; + $intToValidate = 43; + + $integerParam = new IntegerParam($intValidator); + + $expected = -1; + $actual = $integerParam->compareTo($intToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * @covers Thelia\Coupon\Parameter\IntegerParam::compareTo + * @expectedException InvalidArgumentException + */ + public function testInvalidArgumentException() + { + $intValidator = 42; + $intToValidate = '42'; + + $integerParam = new IntegerParam($intValidator); + + $expected = 0; + $actual = $integerParam->compareTo($intToValidate); + $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/Parameter/IntervalParamTest.php b/core/lib/Thelia/Tests/Coupon/Parameter/IntervalParamTest.php index 0c1018af5..59583bfe6 100644 --- a/core/lib/Thelia/Tests/Coupon/Parameter/IntervalParamTest.php +++ b/core/lib/Thelia/Tests/Coupon/Parameter/IntervalParamTest.php @@ -1,11 +1,41 @@ . */ +/* */ +/**********************************************************************************/ + namespace Thelia\Coupon; use InvalidArgumentException; use Thelia\Coupon\Parameter\IntervalParam; /** - * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2013-08-19 at 18:26:01. + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Thrown when a Rule receive an invalid Parameter + * + * @package Coupon + * @author Guillaume MOREL + * */ class IntervalParamTest extends \PHPUnit_Framework_TestCase { diff --git a/core/lib/Thelia/Tests/Coupon/Parameter/PriceParamTest.php b/core/lib/Thelia/Tests/Coupon/Parameter/PriceParamTest.php new file mode 100644 index 000000000..c85b5af1a --- /dev/null +++ b/core/lib/Thelia/Tests/Coupon/Parameter/PriceParamTest.php @@ -0,0 +1,193 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Coupon; + +use InvalidArgumentException; +use Thelia\Coupon\Parameter\PriceParam; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Thrown when a Rule receive an invalid Parameter + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class PriceParamTest extends \PHPUnit_Framework_TestCase +{ + + /** + * Sets up the fixture, for example, opens a network connection. + * This method is called before a test is executed. + */ + protected function setUp() + { + } + + /** + * + * @covers Thelia\Coupon\Parameter\PriceParam::compareTo + * + */ + public function testInferiorPrice() + { + $priceValidator = 42.50; + $priceToValidate = 1.00; + + $integerParam = new PriceParam($priceValidator, 'EUR'); + + $expected = 1; + $actual = $integerParam->compareTo($priceToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\PriceParam::compareTo + * + */ + public function testInferiorPrice2() + { + $priceValidator = 42.50; + $priceToValidate = 42.49; + + $integerParam = new PriceParam($priceValidator, 'EUR'); + + $expected = 1; + $actual = $integerParam->compareTo($priceToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\PriceParam::compareTo + * + */ + public function testEqualsPrice() + { + $priceValidator = 42.50; + $priceToValidate = 42.50; + + $integerParam = new PriceParam($priceValidator, 'EUR'); + + $expected = 0; + $actual = $integerParam->compareTo($priceToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\PriceParam::compareTo + * + */ + public function testSuperiorPrice() + { + $priceValidator = 42.50; + $priceToValidate = 42.51; + + $integerParam = new PriceParam($priceValidator, 'EUR'); + + $expected = -1; + $actual = $integerParam->compareTo($priceToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * @covers Thelia\Coupon\Parameter\PriceParam::compareTo + * @expectedException InvalidArgumentException + */ + public function testInvalidArgumentException() + { + $priceValidator = 42.50; + $priceToValidate = '42.50'; + + $integerParam = new PriceParam($priceValidator, 'EUR'); + + $expected = 0; + $actual = $integerParam->compareTo($priceToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * @covers Thelia\Coupon\Parameter\PriceParam::compareTo + * @expectedException InvalidArgumentException + */ + public function testInvalidArgumentException2() + { + $priceValidator = 42.50; + $priceToValidate = -1; + + $integerParam = new PriceParam($priceValidator, 'EUR'); + + $expected = 0; + $actual = $integerParam->compareTo($priceToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * @covers Thelia\Coupon\Parameter\PriceParam::compareTo + * @expectedException InvalidArgumentException + */ + public function testInvalidArgumentException3() + { + $priceValidator = 42.50; + $priceToValidate = 0; + + $integerParam = new PriceParam($priceValidator, 'EUR'); + + $expected = 0; + $actual = $integerParam->compareTo($priceToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * @covers Thelia\Coupon\Parameter\PriceParam::compareTo + * @expectedException InvalidArgumentException + */ + public function testInvalidArgumentException4() + { + $priceValidator = 42.50; + $priceToValidate = 1; + + $integerParam = new PriceParam($priceValidator, 'EUR'); + + $expected = 0; + $actual = $integerParam->compareTo($priceToValidate); + $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/Parameter/QuantityParamTest.php b/core/lib/Thelia/Tests/Coupon/Parameter/QuantityParamTest.php new file mode 100644 index 000000000..c7ee0d915 --- /dev/null +++ b/core/lib/Thelia/Tests/Coupon/Parameter/QuantityParamTest.php @@ -0,0 +1,161 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Coupon; + +use InvalidArgumentException; +use Thelia\Coupon\Parameter\QuantityParam; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Thrown when a Rule receive an invalid Parameter + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class QuantityParamTest extends \PHPUnit_Framework_TestCase +{ + + /** + * Sets up the fixture, for example, opens a network connection. + * This method is called before a test is executed. + */ + protected function setUp() + { + } + + /** + * + * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo + * + */ + public function testInferiorQuantity() + { + $intValidator = 42; + $intToValidate = 0; + + $integerParam = new QuantityParam($intValidator); + + $expected = 1; + $actual = $integerParam->compareTo($intToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo + * + */ + public function testInferiorQuantity2() + { + $intValidator = 42; + $intToValidate = 41; + + $integerParam = new QuantityParam($intValidator); + + $expected = 1; + $actual = $integerParam->compareTo($intToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo + * + */ + public function testEqualsQuantity() + { + $intValidator = 42; + $intToValidate = 42; + + $integerParam = new QuantityParam($intValidator); + + $expected = 0; + $actual = $integerParam->compareTo($intToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo + * + */ + public function testSuperiorQuantity() + { + $intValidator = 42; + $intToValidate = 43; + + $integerParam = new QuantityParam($intValidator); + + $expected = -1; + $actual = $integerParam->compareTo($intToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo + * @expectedException InvalidArgumentException + */ + public function testInvalidArgumentException() + { + $intValidator = 42; + $intToValidate = '42'; + + $integerParam = new QuantityParam($intValidator); + + $expected = 0; + $actual = $integerParam->compareTo($intToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo + * @expectedException InvalidArgumentException + */ + public function testInvalidArgumentException2() + { + $intValidator = 42; + $intToValidate = -1; + + $integerParam = new QuantityParam($intValidator); + + $expected = 0; + $actual = $integerParam->compareTo($intToValidate); + $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/Parameter/RepeatedDateParamTest.php b/core/lib/Thelia/Tests/Coupon/Parameter/RepeatedDateParamTest.php index 5d5f1badc..5e0bf033d 100644 --- a/core/lib/Thelia/Tests/Coupon/Parameter/RepeatedDateParamTest.php +++ b/core/lib/Thelia/Tests/Coupon/Parameter/RepeatedDateParamTest.php @@ -1,4 +1,26 @@ . */ +/* */ +/**********************************************************************************/ + namespace Thelia\Coupon; use InvalidArgumentException; @@ -6,7 +28,15 @@ use Symfony\Component\Intl\Exception\NotImplementedException; use Thelia\Coupon\Parameter\RepeatedDateParam; /** - * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2013-08-19 at 18:26:01. + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Thrown when a Rule receive an invalid Parameter + * + * @package Coupon + * @author Guillaume MOREL + * */ class RepeatedDateParamTest extends \PHPUnit_Framework_TestCase { diff --git a/core/lib/Thelia/Tests/Coupon/Parameter/RepeatedIntervalParamTest.php b/core/lib/Thelia/Tests/Coupon/Parameter/RepeatedIntervalParamTest.php index 0783bac3e..6830d5670 100644 --- a/core/lib/Thelia/Tests/Coupon/Parameter/RepeatedIntervalParamTest.php +++ b/core/lib/Thelia/Tests/Coupon/Parameter/RepeatedIntervalParamTest.php @@ -1,11 +1,41 @@ . */ +/* */ +/**********************************************************************************/ + namespace Thelia\Coupon; use Symfony\Component\Intl\Exception\NotImplementedException; use Thelia\Coupon\Parameter\RepeatedIntervalParam; /** - * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2013-08-19 at 18:26:01. + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Thrown when a Rule receive an invalid Parameter + * + * @package Coupon + * @author Guillaume MOREL + * */ class RepeatedIntervalParamTest extends \PHPUnit_Framework_TestCase { @@ -302,18 +332,36 @@ class RepeatedIntervalParamTest extends \PHPUnit_Framework_TestCase */ public function testSuperiorDateRepeatEveryMonthFourTime() { - $startDateValidator = new \DateTime("2012-10-08"); + $startDateValidator = new \DateTime("2012-07-08"); $dateToValidate = new \DateTime("2012-10-19"); $duration = 10; + $RepeatedIntervalParam = new RepeatedIntervalParam(); + $RepeatedIntervalParam->setFrom($startDateValidator); + $RepeatedIntervalParam->setDurationInDays($duration); + $RepeatedIntervalParam->repeatEveryMonth(1, 0); + + $expected = -1; + $actual = $RepeatedIntervalParam->compareTo($dateToValidate); + $this->assertEquals($expected, $actual); + } + + /** + * @covers Thelia\Coupon\Parameter\DateParam::compareTo + * @expectedException InvalidArgumentException + */ + public function testInvalidArgumentException() + { + $startDateValidator = new \DateTime("2012-07-08"); + $dateToValidate = 1377012588; + $duration = 10; + $RepeatedIntervalParam = new RepeatedIntervalParam(); $RepeatedIntervalParam->setFrom($startDateValidator); $RepeatedIntervalParam->setDurationInDays($duration); $RepeatedIntervalParam->repeatEveryMonth(1, 4); - $expected = -1; - $actual = $RepeatedIntervalParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); + $RepeatedIntervalParam->compareTo($dateToValidate); } /** diff --git a/core/lib/Thelia/Tests/Coupon/Rule/AvailableForTotalAmountTest.php b/core/lib/Thelia/Tests/Coupon/Rule/AvailableForTotalAmountTest.php new file mode 100644 index 000000000..aaf49e352 --- /dev/null +++ b/core/lib/Thelia/Tests/Coupon/Rule/AvailableForTotalAmountTest.php @@ -0,0 +1,338 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Coupon; + +use Thelia\Coupon\Parameter\PriceParam; +use Thelia\Coupon\Rule\AvailableForTotalAmount; +use Thelia\Coupon\Rule\Operators; +use Thelia\Exception\InvalidRuleOperatorException; +use Thelia\Exception\InvalidRuleValueException; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Thrown when a Rule receive an invalid Parameter + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class AvailableForTotalAmountTest 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() + { + } + + protected function generateValidCouponBaseAdapterMock() + { + /** @var CouponAdapterInterface $stubTheliaAdapter */ + $stubTheliaAdapter = $this->getMock( + 'CouponBaseAdapter', + array('getCheckoutTotalPrice'), + array() + ); + $stubTheliaAdapter->expects($this->any()) + ->method('getCheckoutTotalPrice') + ->will($this->returnValue(421.23)); + + return $stubTheliaAdapter; + } + + /** + * + * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkBackOfficeInput + * + */ + public function testValidBackOfficeInput() + { + /** @var CouponAdapterInterface $stubTheliaAdapter */ + $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); + + $validators = array( + AvailableForTotalAmount::PARAM1_PRICE => array( + AvailableForTotalAmount::OPERATOR => Operators::SUPERIOR, + AvailableForTotalAmount::VALUE => new PriceParam(421.23, 'EUR') + ) + ); + $validated = array( + AvailableForTotalAmount::PARAM1_PRICE => $stubTheliaAdapter->getCheckoutTotalPrice() + ); + $rule = new AvailableForTotalAmount($validators, $validated); + + $expected = true; + $actual = $rule->checkBackOfficeInput(); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkBackOfficeInput + * @expectedException \Thelia\Exception\InvalidRuleOperatorException + * + */ + public function testInValidBackOfficeInputOperator() + { + /** @var CouponAdapterInterface $stubTheliaAdapter */ + $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); + + $validators = array( + AvailableForTotalAmount::PARAM1_PRICE => array( + AvailableForTotalAmount::OPERATOR => 'X', + AvailableForTotalAmount::VALUE => new PriceParam(421.23, 'EUR') + ) + ); + + $validated = array( + AvailableForTotalAmount::PARAM1_PRICE => $stubTheliaAdapter->getCheckoutTotalPrice() + ); + $rule = new AvailableForTotalAmount($validators, $validated); + + $expected = false; + $actual = $rule->checkBackOfficeInput(); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkBackOfficeInput + * @expectedException \Thelia\Exception\InvalidRuleValueException + * + */ + public function testInValidBackOfficeInputValue() + { + /** @var CouponAdapterInterface $stubTheliaAdapter */ + $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); + + $validators = array( + AvailableForTotalAmount::PARAM1_PRICE => array( + AvailableForTotalAmount::OPERATOR => Operators::SUPERIOR, + AvailableForTotalAmount::VALUE => 421 + ) + ); + + $validated = array( + AvailableForTotalAmount::PARAM1_PRICE => $stubTheliaAdapter->getCheckoutTotalPrice() + ); + $rule = new AvailableForTotalAmount($validators, $validated); + + $expected = false; + $actual = $rule->checkBackOfficeInput(); + $this->assertEquals($expected, $actual); + } + + + + /** + * + * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkCheckoutInput + * + */ + public function testValidCheckoutInput() + { + /** @var CouponAdapterInterface $stubTheliaAdapter */ + $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); + + $validators = array( + AvailableForTotalAmount::PARAM1_PRICE => array( + AvailableForTotalAmount::OPERATOR => Operators::SUPERIOR, + AvailableForTotalAmount::VALUE => new PriceParam(421.23, 'EUR') + ) + ); + + $validated = array( + AvailableForTotalAmount::PARAM1_PRICE => $stubTheliaAdapter->getCheckoutTotalPrice() + ); + $rule = new AvailableForTotalAmount($validators, $validated); + + $expected = true; + $actual = $rule->checkCheckoutInput(); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkCheckoutInput + * @expectedException \Thelia\Exception\InvalidRuleValueException + * + */ + public function testInValidCheckoutInputValue() + { + $validators = array( + AvailableForTotalAmount::PARAM1_PRICE => array( + AvailableForTotalAmount::OPERATOR => Operators::SUPERIOR, + AvailableForTotalAmount::VALUE => new PriceParam(421.23, 'EUR') + ) + ); + + $validated = array( + AvailableForTotalAmount::PARAM1_PRICE => 421 + ); + $rule = new AvailableForTotalAmount($validators, $validated); + + $expected = false; + $actual = $rule->checkCheckoutInput(); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkCheckoutInput + * @expectedException \Thelia\Exception\InvalidRuleValueException + * + */ + public function testInValidCheckoutInputType() + { + $validators = array( + AvailableForTotalAmount::PARAM1_PRICE => array( + AvailableForTotalAmount::OPERATOR => Operators::SUPERIOR, + AvailableForTotalAmount::VALUE => new PriceParam(421.23, 'EUR') + ) + ); + + $validated = array( + AvailableForTotalAmount::PARAM1_PRICE => 421 + ); + $rule = new AvailableForTotalAmount($validators, $validated); + + $expected = false; + $actual = $rule->checkCheckoutInput(); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::isMatching + * + */ + public function testMatchingRuleEqual() + { + /** @var CouponAdapterInterface $stubTheliaAdapter */ + $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); + + $validators = array( + AvailableForTotalAmount::PARAM1_PRICE => array( + AvailableForTotalAmount::OPERATOR => Operators::EQUAL, + AvailableForTotalAmount::VALUE => new PriceParam(421.23, 'EUR') + ) + ); + + $validated = array( + AvailableForTotalAmount::PARAM1_PRICE => $stubTheliaAdapter->getCheckoutTotalPrice() + ); + $rule = new AvailableForTotalAmount($validators, $validated); + + $expected = true; + $actual = $rule->isMatching(); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::isMatching + * + */ + public function testNotMatchingRuleEqual() + { + $validators = array( + AvailableForTotalAmount::PARAM1_PRICE => array( + AvailableForTotalAmount::OPERATOR => Operators::EQUAL, + AvailableForTotalAmount::VALUE => new PriceParam(421.23, 'EUR') + ) + ); + + $validated = array( + AvailableForTotalAmount::PARAM1_PRICE => 421.22 + ); + $rule = new AvailableForTotalAmount($validators, $validated); + + $expected = false; + $actual = $rule->isMatching(); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::isMatching + * + */ + public function testMatchingRuleSuperior() + { + $validators = array( + AvailableForTotalAmount::PARAM1_PRICE => array( + AvailableForTotalAmount::OPERATOR => Operators::SUPERIOR, + AvailableForTotalAmount::VALUE => new PriceParam(421.23, 'EUR') + ) + ); + + $validated = array( + AvailableForTotalAmount::PARAM1_PRICE => 421.24 + ); + $rule = new AvailableForTotalAmount($validators, $validated); + + $expected = true; + $actual = $rule->isMatching(); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::isMatching + * + */ + public function testNotMatchingRuleSuperior() + { + $validators = array( + AvailableForTotalAmount::PARAM1_PRICE => array( + AvailableForTotalAmount::OPERATOR => Operators::SUPERIOR, + AvailableForTotalAmount::VALUE => new PriceParam(421.23, 'EUR') + ) + ); + + $validated = array( + AvailableForTotalAmount::PARAM1_PRICE => 421.23 + ); + $rule = new AvailableForTotalAmount($validators, $validated); + + $expected = false; + $actual = $rule->isMatching(); + $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/Rule/AvailableForXArticlesTest.php b/core/lib/Thelia/Tests/Coupon/Rule/AvailableForXArticlesTest.php index cb0b59853..2110f76bb 100644 --- a/core/lib/Thelia/Tests/Coupon/Rule/AvailableForXArticlesTest.php +++ b/core/lib/Thelia/Tests/Coupon/Rule/AvailableForXArticlesTest.php @@ -1,10 +1,40 @@ . */ +/* */ +/**********************************************************************************/ + namespace Thelia\Coupon; use Thelia\Coupon\Rule\AvailableForXArticles; /** - * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2013-08-19 at 18:26:01. + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Thrown when a Rule receive an invalid Parameter + * + * @package Coupon + * @author Guillaume MOREL + * */ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase { @@ -19,70 +49,70 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase protected function generateValidCouponBaseAdapterMock() { - /** @var CouponAdapterInterface $stubTheliaAdapater */ - $stubTheliaAdapater = $this->getMock( + /** @var CouponAdapterInterface $stubTheliaAdapter */ + $stubTheliaAdapter = $this->getMock( 'CouponBaseAdapter', array('getNbArticlesInTheCart'), array() ); - $stubTheliaAdapater->expects($this->any()) + $stubTheliaAdapter->expects($this->any()) ->method('getNbArticlesInTheCart') ->will($this->returnValue(4)); - return $stubTheliaAdapater; + return $stubTheliaAdapter; } /** * - * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkBackOfficeIntput + * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkBackOfficeInput * */ public function testValidBackOfficeInput() { - /** @var CouponAdapterInterface $stubTheliaAdapater */ - $stubTheliaAdapater = $this->generateValidCouponBaseAdapterMock(); + /** @var CouponAdapterInterface $stubTheliaAdapter */ + $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); $validators = array(4); - $validated = array($stubTheliaAdapater->getNbArticlesInTheCart()); + $validated = array($stubTheliaAdapter->getNbArticlesInTheCart()); $rule = new AvailableForXArticles($validators, $validated); $expected = true; - $actual = $rule->checkBackOfficeIntput(); + $actual = $rule->checkBackOfficeInput(); $this->assertEquals($expected, $actual); } /** * - * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkBackOfficeIntput + * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkBackOfficeInput * */ public function testInValidBackOfficeInput() { - /** @var CouponAdapterInterface $stubTheliaAdapater */ - $stubTheliaAdapater = $this->generateValidCouponBaseAdapterMock(); + /** @var CouponAdapterInterface $stubTheliaAdapter */ + $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); $validators = array(4.5); - $validated = array($stubTheliaAdapater->getNbArticlesInTheCart()); + $validated = array($stubTheliaAdapter->getNbArticlesInTheCart()); $rule = new AvailableForXArticles($validators, $validated); $expected = false; - $actual = $rule->checkBackOfficeIntput(); + $actual = $rule->checkBackOfficeInput(); $this->assertEquals($expected, $actual); $validators = array(-1); - $validated = array($stubTheliaAdapater->getNbArticlesInTheCart()); + $validated = array($stubTheliaAdapter->getNbArticlesInTheCart()); $rule = new AvailableForXArticles($validators, $validated); $expected = false; - $actual = $rule->checkBackOfficeIntput(); + $actual = $rule->checkBackOfficeInput(); $this->assertEquals($expected, $actual); $validators = array('bad'); - $validated = array($stubTheliaAdapater->getNbArticlesInTheCart()); + $validated = array($stubTheliaAdapter->getNbArticlesInTheCart()); $rule = new AvailableForXArticles($validators, $validated); $expected = false; - $actual = $rule->checkBackOfficeIntput(); + $actual = $rule->checkBackOfficeInput(); $this->assertEquals($expected, $actual); } @@ -95,11 +125,11 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase */ public function testValidCheckoutInput() { - /** @var CouponAdapterInterface $stubTheliaAdapater */ - $stubTheliaAdapater = $this->generateValidCouponBaseAdapterMock(); + /** @var CouponAdapterInterface $stubTheliaAdapter */ + $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); $validators = array(4); - $validated = array($stubTheliaAdapater->getNbArticlesInTheCart()); + $validated = array($stubTheliaAdapter->getNbArticlesInTheCart()); $rule = new AvailableForXArticles($validators, $validated); $expected = true; @@ -114,11 +144,11 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase */ public function testInValidCheckoutInput() { - /** @var CouponAdapterInterface $stubTheliaAdapater */ - $stubTheliaAdapater = $this->generateValidCouponBaseAdapterMock(); + /** @var CouponAdapterInterface $stubTheliaAdapter */ + $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); $validators = array(4.5); - $validated = array($stubTheliaAdapater->getNbArticlesInTheCart()); + $validated = array($stubTheliaAdapter->getNbArticlesInTheCart()); $rule = new AvailableForXArticles($validators, $validated); $expected = false; @@ -126,7 +156,7 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase $this->assertEquals($expected, $actual); $validators = array(-1); - $validated = array($stubTheliaAdapater->getNbArticlesInTheCart()); + $validated = array($stubTheliaAdapter->getNbArticlesInTheCart()); $rule = new AvailableForXArticles($validators, $validated); $expected = false; @@ -134,7 +164,7 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase $this->assertEquals($expected, $actual); $validators = array('bad'); - $validated = array($stubTheliaAdapater->getNbArticlesInTheCart()); + $validated = array($stubTheliaAdapter->getNbArticlesInTheCart()); $rule = new AvailableForXArticles($validators, $validated); $expected = false; @@ -149,11 +179,11 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase */ public function testMatchingRuleEqual() { - /** @var CouponAdapterInterface $stubTheliaAdapater */ - $stubTheliaAdapater = $this->generateValidCouponBaseAdapterMock(); + /** @var CouponAdapterInterface $stubTheliaAdapter */ + $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); $validators = array(4); - $validated = array($stubTheliaAdapater->getNbArticlesInTheCart()); + $validated = array($stubTheliaAdapter->getNbArticlesInTheCart()); $rule = new AvailableForXArticles($validators, $validated); $expected = true; @@ -168,11 +198,11 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase */ public function testMatchingRuleSuperior() { - /** @var CouponAdapterInterface $stubTheliaAdapater */ - $stubTheliaAdapater = $this->generateValidCouponBaseAdapterMock(); + /** @var CouponAdapterInterface $stubTheliaAdapter */ + $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); $validators = array(5); - $validated = array($stubTheliaAdapater->getNbArticlesInTheCart()); + $validated = array($stubTheliaAdapter->getNbArticlesInTheCart()); $rule = new AvailableForXArticles($validators, $validated); $expected = true; @@ -187,11 +217,11 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase */ public function testNotMatchingRule() { - /** @var CouponAdapterInterface $stubTheliaAdapater */ - $stubTheliaAdapater = $this->generateValidCouponBaseAdapterMock(); + /** @var CouponAdapterInterface $stubTheliaAdapter */ + $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); $validators = array(3); - $validated = array($stubTheliaAdapater->getNbArticlesInTheCart()); + $validated = array($stubTheliaAdapter->getNbArticlesInTheCart()); $rule = new AvailableForXArticles($validators, $validated); $expected = false; diff --git a/core/lib/Thelia/Tests/Coupon/Rule/OperatorTest.php b/core/lib/Thelia/Tests/Coupon/Rule/OperatorTest.php new file mode 100644 index 000000000..2fbf6f339 --- /dev/null +++ b/core/lib/Thelia/Tests/Coupon/Rule/OperatorTest.php @@ -0,0 +1,403 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Coupon; + +use Thelia\Coupon\Parameter\QuantityParam; +use Thelia\Coupon\Rule\Operators; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Thrown when a Rule receive an invalid Parameter + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class OperatorTest extends \PHPUnit_Framework_TestCase +{ + + /** + * Sets up the fixture, for example, opens a network connection. + * This method is called before a test is executed. + */ + protected function setUp() + { + } + + /** + * + * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator + * + */ + public function testOperatorInferiorValidBefore() + { + // Given + $a = 11; + $operator = Operators::INFERIOR; + $b = new QuantityParam(12); + + // When + $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + + // Then + $this->assertTrue($actual); + } + + /** + * + * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator + * + */ + public function testOperatorInferiorInvalidEquals() + { + // Given + $a = 12; + $operator = Operators::INFERIOR; + $b = new QuantityParam(12); + + // When + $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + + // Then + $this->assertFalse($actual); + } + + /** + * + * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator + * + */ + public function testOperatorInferiorInvalidAfter() + { + // Given + $a = 13; + $operator = Operators::INFERIOR; + $b = new QuantityParam(12); + + // When + $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + + // Then + $this->assertFalse($actual); + } + + /** + * + * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator + * + */ + public function testOperatorInferiorOrEqualValidEqual() + { + // Given + $a = 11; + $operator = Operators::INFERIOR_OR_EQUAL; + $b = new QuantityParam(11); + + // When + $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + + // Then + $this->assertTrue($actual); + } + + /** + * + * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator + * + */ + public function testOperatorInferiorOrEqualValidBefore() + { + // Given + $a = 10; + $operator = Operators::INFERIOR_OR_EQUAL; + $b = new QuantityParam(11); + + // When + $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + + // Then + $this->assertTrue($actual); + } + + /** + * + * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator + * + */ + public function testOperatorInferiorOrEqualInValidAfter() + { + // Given + $a = 12; + $operator = Operators::INFERIOR_OR_EQUAL; + $b = new QuantityParam(11); + + // When + $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + + // Then + $this->assertFalse($actual); + } + + /** + * + * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator + * + */ + public function testOperatorEqualValidEqual() + { + // Given + $a = 12; + $operator = Operators::EQUAL; + $b = new QuantityParam(12); + + // When + $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + + // Then + $this->assertTrue($actual); + } + + /** + * + * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator + * + */ + public function testOperatorEqualInValidBefore() + { + // Given + $a = 11; + $operator = Operators::EQUAL; + $b = new QuantityParam(12); + + // When + $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + + // Then + $this->assertFalse($actual); + } + + /** + * + * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator + * + */ + public function testOperatorEqualInValidAfter() + { + // Given + $a = 13; + $operator = Operators::EQUAL; + $b = new QuantityParam(12); + + // When + $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + + // Then + $this->assertFalse($actual); + } + + /** + * + * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator + * + */ + public function testOperatorSuperiorOrEqualValidEqual() + { + // Given + $a = 13; + $operator = Operators::SUPERIOR_OR_EQUAL; + $b = new QuantityParam(13); + + // When + $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + + // Then + $this->assertTrue($actual); + } + + /** + * + * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator + * + */ + public function testOperatorSuperiorOrEqualAfter() + { + // Given + $a = 14; + $operator = Operators::SUPERIOR_OR_EQUAL; + $b = new QuantityParam(13); + + // When + $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + + // Then + $this->assertTrue($actual); + } + + /** + * + * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator + * + */ + public function testOperatorSuperiorOrEqualInvalidBefore() + { + // Given + $a = 12; + $operator = Operators::SUPERIOR_OR_EQUAL; + $b = new QuantityParam(13); + + // When + $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + + // Then + $this->assertFalse($actual); + } + + /** + * + * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator + * + */ + public function testOperatorSuperiorValidAfter() + { + // Given + $a = 13; + $operator = Operators::SUPERIOR; + $b = new QuantityParam(12); + + // When + $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + + // Then + $this->assertTrue($actual); + } + + /** + * + * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator + * + */ + public function testOperatorSuperiorInvalidEqual() + { + // Given + $a = 12; + $operator = Operators::SUPERIOR; + $b = new QuantityParam(12); + + // When + $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + + // Then + $this->assertFalse($actual); + } + + /** + * + * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator + * + */ + public function testOperatorSuperiorInvalidBefore() + { + // Given + $a = 11; + $operator = Operators::SUPERIOR; + $b = new QuantityParam(12); + + // When + $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + + // Then + $this->assertFalse($actual); + } + + /** + * + * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator + * + */ + public function testOperatorDifferentValid() + { + // Given + $a = 12; + $operator = Operators::DIFFERENT; + $b = new QuantityParam(11); + + // When + $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + + // Then + $this->assertTrue($actual); + } + + /** + * + * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator + * + */ + public function testOperatorDifferentInvalidEquals() + { + // Given + $a = 11; + $operator = Operators::DIFFERENT; + $b = new QuantityParam(11); + + // When + $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + + // Then + $this->assertFalse($actual); + } + + /** + * + * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator + * + */ + public function testOperatorInValid() + { + // Given + $a = 12; + $operator = 'X'; + $b = new QuantityParam(11); + + // When + $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + + // Then + $this->assertFalse($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/RuleOrganizerTest.php b/core/lib/Thelia/Tests/Coupon/RuleOrganizerTest.php index e892a7b79..5c8dfc983 100644 --- a/core/lib/Thelia/Tests/Coupon/RuleOrganizerTest.php +++ b/core/lib/Thelia/Tests/Coupon/RuleOrganizerTest.php @@ -1,8 +1,38 @@ . */ +/* */ +/**********************************************************************************/ + namespace Thelia\Coupon; /** - * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2013-08-19 at 18:27:07. + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Thrown when a Rule receive an invalid Parameter + * + * @package Coupon + * @author Guillaume MOREL + * */ class RuleOrganizerTest extends \PHPUnit_Framework_TestCase { diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountForCategoryYTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountForCategoryYTest.php index ed8a57833..0178bae10 100644 --- a/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountForCategoryYTest.php +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountForCategoryYTest.php @@ -1,8 +1,38 @@ . */ +/* */ +/**********************************************************************************/ + namespace Thelia\Coupon; /** - * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2013-08-19 at 18:26:01. + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Thrown when a Rule receive an invalid Parameter + * + * @package Coupon + * @author Guillaume MOREL + * */ class RemoveXAmountForCategoryYTest extends \PHPUnit_Framework_TestCase { diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php index 27d0e9afb..f9e765b35 100644 --- a/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php @@ -1,13 +1,45 @@ . */ +/* */ +/**********************************************************************************/ + namespace Thelia\Coupon; -use PHPUnit_Framework_TestCase; +use Thelia\Coupon\Parameter\PriceParam; +use Thelia\Coupon\Rule\AvailableForTotalAmount; +use Thelia\Coupon\Rule\Operators; use Thelia\Coupon\Type\RemoveXAmount; /** - * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2013-08-19 at 18:26:01. + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Thrown when a Rule receive an invalid Parameter + * + * @package Coupon + * @author Guillaume MOREL + * */ -class RemoveXAmountTest extends PHPUnit_Framework_TestCase +class RemoveXAmountTest extends \PHPUnit_Framework_TestCase { CONST VALID_COUPON_CODE = 'XMAS'; @@ -159,6 +191,212 @@ class RemoveXAmountTest extends PHPUnit_Framework_TestCase $this->assertEquals($expected, $actual); } + /** + * + * @covers Thelia\Coupon\type\RemoveXAmount::addRule + * @covers Thelia\Coupon\type\RemoveXAmount::getRules + * + */ + public function testAddRuleValid() + { + // Given + $rule1 = $this->generateValideRuleAvailableForTotalAmountOperatorTo( + Operators::INFERIOR, + 100.23 + ); + $rule2 = $this->generateValideRuleAvailableForTotalAmountOperatorTo( + Operators::SUPERIOR, + 421.23 + ); + + $coupon = $this->generateValidNonCumulativeNonRemovingPostageCoupon(); + + // When + $coupon->addRule($rule1) + ->addRule($rule2); + + // Then + $expected = 2; + $this->assertCount($expected, $coupon->getRules()); + } + + + /** + * + * @covers Thelia\Coupon\type\RemoveXAmount::setRules + * @covers Thelia\Coupon\type\RemoveXAmount::getRules + * + */ + public function testSetRulesValid() + { + // Given + $rule0 = $this->generateValideRuleAvailableForTotalAmountOperatorTo( + Operators::EQUAL, + 20.00 + ); + $rule1 = $this->generateValideRuleAvailableForTotalAmountOperatorTo( + Operators::INFERIOR, + 100.23 + ); + $rule2 = $this->generateValideRuleAvailableForTotalAmountOperatorTo( + Operators::SUPERIOR, + 421.23 + ); + + $coupon = $this->generateValidNonCumulativeNonRemovingPostageCoupon(); + + // When + $coupon->addRule($rule0) + ->setRules(array($rule1, $rule2)); + + + // Then + $expected = 2; + $this->assertCount($expected, $coupon->getRules()); + } + + /** + * + * @covers Thelia\Coupon\type\RemoveXAmount::setRules + * @expectedException \Thelia\Exception\InvalidRuleException + * + */ + public function testSetRulesInvalid() + { + // Given + $rule0 = $this->generateValideRuleAvailableForTotalAmountOperatorTo( + Operators::EQUAL, + 20.00 + ); + $rule1 = $this->generateValideRuleAvailableForTotalAmountOperatorTo( + Operators::INFERIOR, + 100.23 + ); + $rule2 = $this; + + $coupon = $this->generateValidNonCumulativeNonRemovingPostageCoupon(); + + // When + $coupon->addRule($rule0) + ->setRules(array($rule1, $rule2)); + } + + /** + * + * @covers Thelia\Coupon\type\RemoveXAmount::getEffect + * + */ + public function testGetEffectIfTotalAmountInferiorTo400Valid() + { + // Given + $rule0 = $this->generateValideRuleAvailableForTotalAmountOperatorTo( + Operators::INFERIOR, + 400.00 + ); + $coupon = $this->generateValidNonCumulativeNonRemovingPostageCoupon(); + + // When + $coupon->addRule($rule0); + + // Then + $expected = -30.00; + $actual = $coupon->getEffect(); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\type\RemoveXAmount::getEffect + * + */ + public function testGetEffectIfTotalAmountInferiorOrEqualTo400Valid() + { + // Given + $rule0 = $this->generateValideRuleAvailableForTotalAmountOperatorTo( + Operators::INFERIOR_OR_EQUAL, + 400.00 + ); + $coupon = $this->generateValidNonCumulativeNonRemovingPostageCoupon(); + + // When + $coupon->addRule($rule0); + + // Then + $expected = -30.00; + $actual = $coupon->getEffect(); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\type\RemoveXAmount::getEffect + * + */ + public function testGetEffectIfTotalAmountEqualTo400Valid() + { + // Given + $rule0 = $this->generateValideRuleAvailableForTotalAmountOperatorTo( + Operators::EQUAL, + 400.00 + ); + $coupon = $this->generateValidNonCumulativeNonRemovingPostageCoupon(); + + // When + $coupon->addRule($rule0); + + // Then + $expected = -30.00; + $actual = $coupon->getEffect(); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\type\RemoveXAmount::getEffect + * + */ + public function testGetEffectIfTotalAmountSuperiorOrEqualTo400Valid() + { + // Given + $rule0 = $this->generateValideRuleAvailableForTotalAmountOperatorTo( + Operators::SUPERIOR_OR_EQUAL, + 400.00 + ); + $coupon = $this->generateValidNonCumulativeNonRemovingPostageCoupon(); + + // When + $coupon->addRule($rule0); + + // Then + $expected = -30.00; + $actual = $coupon->getEffect(); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\type\RemoveXAmount::getEffect + * + */ + public function testGetEffectIfTotalAmountSuperiorTo400Valid() + { + // Given + $rule0 = $this->generateValideRuleAvailableForTotalAmountOperatorTo( + Operators::SUPERIOR, + 400.00 + ); + $coupon = $this->generateValidNonCumulativeNonRemovingPostageCoupon(); + + // When + $coupon->addRule($rule0); + + // Then + $expected = -30.00; + $actual = $coupon->getEffect(); + $this->assertEquals($expected, $actual); + } + + /** * Tears down the fixture, for example, closes a network connection. @@ -168,4 +406,25 @@ class RemoveXAmountTest extends PHPUnit_Framework_TestCase { } + /** + * Generate valid rule AvailableForTotalAmount + * according to given operator and amount + * + * @param string $operator Operators::CONST + * @param float $amount Amount with 2 decimals + * + * @return AvailableForTotalAmount + */ + protected function generateValideRuleAvailableForTotalAmountOperatorTo($operator, $amount) + { + $validators = array( + AvailableForTotalAmount::PARAM1_PRICE => array( + AvailableForTotalAmount::OPERATOR => $operator, + AvailableForTotalAmount::VALUE => new PriceParam($amount, 'EUR') + ) + ); + + return new AvailableForTotalAmount($validators); + } + } diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentForCategoryYTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentForCategoryYTest.php index f2e36d0bb..39533d62b 100644 --- a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentForCategoryYTest.php +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentForCategoryYTest.php @@ -1,8 +1,38 @@ . */ +/* */ +/**********************************************************************************/ + namespace Thelia\Coupon; /** - * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2013-08-19 at 18:26:01. + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Thrown when a Rule receive an invalid Parameter + * + * @package Coupon + * @author Guillaume MOREL + * */ class RemoveXPercenForCategoryYTest extends \PHPUnit_Framework_TestCase { diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php index 33372cdb2..a2dd87f62 100644 --- a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php @@ -1,11 +1,41 @@ . */ +/* */ +/**********************************************************************************/ + namespace Thelia\Coupon; use PHPUnit_Framework_TestCase; use Thelia\Coupon\Type\RemoveXPercent; /** - * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2013-08-19 at 18:26:01. + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Thrown when a Rule receive an invalid Parameter + * + * @package Coupon + * @author Guillaume MOREL + * */ class RemoveXPercentTest extends \PHPUnit_Framework_TestCase { From fab9d2f39a4d77a1834a7c835693df4095592d1a Mon Sep 17 00:00:00 2001 From: gmorel Date: Thu, 22 Aug 2013 14:25:03 +0200 Subject: [PATCH 005/125] WIP Coupon Update Propel2 schema.xml --- local/config/schema.xml | 2173 +++++++++++++++++++-------------------- 1 file changed, 1085 insertions(+), 1088 deletions(-) diff --git a/local/config/schema.xml b/local/config/schema.xml index 59ef62cb9..062e778ad 100755 --- a/local/config/schema.xml +++ b/local/config/schema.xml @@ -1,1089 +1,1086 @@ - + - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - -
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - -
- - - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
- - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - -
- - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - -
- - - - - -
- - - - - - - - - - - -
- - - - - - - - - - - - - - -
- - - - - - - - - - - - - - -
- - - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
- - - - - - - - - - - - - -
- - - - - - - - - - - - -
- - - - - - - - -
- - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
- + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + +
+ + + + + + + + + +
+ + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + +
+ + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + +
+ + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ + + + + +
+ + + + + + + + + + + +
+ + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + +
+ + + + + + + + + +
+ + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ + + + + + + + +
+ + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+ \ No newline at end of file From 1734ed1c1f076186611ba8bf99c15dbb2b1e044b Mon Sep 17 00:00:00 2001 From: gmorel Date: Thu, 22 Aug 2013 14:50:38 +0200 Subject: [PATCH 006/125] WIP Coupon Update Coupon Model + SQL en_US changed to en_EN ? --- core/lib/Thelia/Model/Base/Attribute.php | 10 +- core/lib/Thelia/Model/Base/AttributeAv.php | 10 +- .../lib/Thelia/Model/Base/AttributeAvI18n.php | 6 +- .../Thelia/Model/Base/AttributeAvQuery.php | 6 +- core/lib/Thelia/Model/Base/AttributeI18n.php | 6 +- core/lib/Thelia/Model/Base/AttributeQuery.php | 6 +- core/lib/Thelia/Model/Base/Category.php | 10 +- .../Thelia/Model/Base/CategoryDocument.php | 10 +- .../Model/Base/CategoryDocumentI18n.php | 6 +- .../Model/Base/CategoryDocumentQuery.php | 6 +- core/lib/Thelia/Model/Base/CategoryI18n.php | 6 +- core/lib/Thelia/Model/Base/CategoryImage.php | 10 +- .../Thelia/Model/Base/CategoryImageI18n.php | 6 +- .../Thelia/Model/Base/CategoryImageQuery.php | 6 +- core/lib/Thelia/Model/Base/CategoryQuery.php | 6 +- core/lib/Thelia/Model/Base/Config.php | 10 +- core/lib/Thelia/Model/Base/ConfigI18n.php | 6 +- core/lib/Thelia/Model/Base/ConfigQuery.php | 6 +- core/lib/Thelia/Model/Base/Content.php | 10 +- .../lib/Thelia/Model/Base/ContentDocument.php | 10 +- .../Thelia/Model/Base/ContentDocumentI18n.php | 6 +- .../Model/Base/ContentDocumentQuery.php | 6 +- core/lib/Thelia/Model/Base/ContentI18n.php | 6 +- core/lib/Thelia/Model/Base/ContentImage.php | 10 +- .../Thelia/Model/Base/ContentImageI18n.php | 6 +- .../Thelia/Model/Base/ContentImageQuery.php | 6 +- core/lib/Thelia/Model/Base/ContentQuery.php | 6 +- core/lib/Thelia/Model/Base/Country.php | 10 +- core/lib/Thelia/Model/Base/CountryI18n.php | 6 +- core/lib/Thelia/Model/Base/CountryQuery.php | 6 +- core/lib/Thelia/Model/Base/Coupon.php | 1841 ++++++++++++++--- core/lib/Thelia/Model/Base/CouponOrder.php | 79 + .../Thelia/Model/Base/CouponOrderQuery.php | 79 + core/lib/Thelia/Model/Base/CouponQuery.php | 661 ++++-- core/lib/Thelia/Model/Base/Currency.php | 10 +- core/lib/Thelia/Model/Base/CurrencyI18n.php | 6 +- core/lib/Thelia/Model/Base/CurrencyQuery.php | 6 +- core/lib/Thelia/Model/Base/CustomerTitle.php | 10 +- .../Thelia/Model/Base/CustomerTitleI18n.php | 6 +- .../Thelia/Model/Base/CustomerTitleQuery.php | 6 +- core/lib/Thelia/Model/Base/Feature.php | 10 +- core/lib/Thelia/Model/Base/FeatureAv.php | 10 +- core/lib/Thelia/Model/Base/FeatureAvI18n.php | 6 +- core/lib/Thelia/Model/Base/FeatureAvQuery.php | 6 +- core/lib/Thelia/Model/Base/FeatureI18n.php | 6 +- core/lib/Thelia/Model/Base/FeatureQuery.php | 6 +- core/lib/Thelia/Model/Base/Folder.php | 10 +- core/lib/Thelia/Model/Base/FolderDocument.php | 10 +- .../Thelia/Model/Base/FolderDocumentI18n.php | 6 +- .../Thelia/Model/Base/FolderDocumentQuery.php | 6 +- core/lib/Thelia/Model/Base/FolderI18n.php | 6 +- core/lib/Thelia/Model/Base/FolderImage.php | 10 +- .../lib/Thelia/Model/Base/FolderImageI18n.php | 6 +- .../Thelia/Model/Base/FolderImageQuery.php | 6 +- core/lib/Thelia/Model/Base/FolderQuery.php | 6 +- core/lib/Thelia/Model/Base/Group.php | 10 +- core/lib/Thelia/Model/Base/GroupI18n.php | 6 +- core/lib/Thelia/Model/Base/GroupQuery.php | 6 +- core/lib/Thelia/Model/Base/Message.php | 10 +- core/lib/Thelia/Model/Base/MessageI18n.php | 6 +- core/lib/Thelia/Model/Base/MessageQuery.php | 6 +- core/lib/Thelia/Model/Base/Module.php | 10 +- core/lib/Thelia/Model/Base/ModuleI18n.php | 6 +- core/lib/Thelia/Model/Base/ModuleQuery.php | 6 +- core/lib/Thelia/Model/Base/Order.php | 25 + core/lib/Thelia/Model/Base/OrderStatus.php | 10 +- .../lib/Thelia/Model/Base/OrderStatusI18n.php | 6 +- .../Thelia/Model/Base/OrderStatusQuery.php | 6 +- core/lib/Thelia/Model/Base/Product.php | 10 +- .../lib/Thelia/Model/Base/ProductDocument.php | 10 +- .../Thelia/Model/Base/ProductDocumentI18n.php | 6 +- .../Model/Base/ProductDocumentQuery.php | 6 +- core/lib/Thelia/Model/Base/ProductI18n.php | 6 +- core/lib/Thelia/Model/Base/ProductImage.php | 10 +- .../Thelia/Model/Base/ProductImageI18n.php | 6 +- .../Thelia/Model/Base/ProductImageQuery.php | 6 +- core/lib/Thelia/Model/Base/ProductQuery.php | 6 +- core/lib/Thelia/Model/Base/Resource.php | 10 +- core/lib/Thelia/Model/Base/ResourceI18n.php | 6 +- core/lib/Thelia/Model/Base/ResourceQuery.php | 6 +- core/lib/Thelia/Model/Base/Tax.php | 10 +- core/lib/Thelia/Model/Base/TaxI18n.php | 6 +- core/lib/Thelia/Model/Base/TaxQuery.php | 6 +- core/lib/Thelia/Model/Base/TaxRule.php | 10 +- core/lib/Thelia/Model/Base/TaxRuleI18n.php | 6 +- core/lib/Thelia/Model/Base/TaxRuleQuery.php | 6 +- .../Model/Map/AttributeAvI18nTableMap.php | 2 +- .../Thelia/Model/Map/AttributeAvTableMap.php | 2 +- .../Model/Map/AttributeI18nTableMap.php | 2 +- .../Thelia/Model/Map/AttributeTableMap.php | 2 +- .../Map/CategoryDocumentI18nTableMap.php | 2 +- .../Model/Map/CategoryDocumentTableMap.php | 2 +- .../Thelia/Model/Map/CategoryI18nTableMap.php | 2 +- .../Model/Map/CategoryImageI18nTableMap.php | 2 +- .../Model/Map/CategoryImageTableMap.php | 2 +- .../lib/Thelia/Model/Map/CategoryTableMap.php | 2 +- .../Thelia/Model/Map/ConfigI18nTableMap.php | 2 +- core/lib/Thelia/Model/Map/ConfigTableMap.php | 2 +- .../Model/Map/ContentDocumentI18nTableMap.php | 2 +- .../Model/Map/ContentDocumentTableMap.php | 2 +- .../Thelia/Model/Map/ContentI18nTableMap.php | 2 +- .../Model/Map/ContentImageI18nTableMap.php | 2 +- .../Thelia/Model/Map/ContentImageTableMap.php | 2 +- core/lib/Thelia/Model/Map/ContentTableMap.php | 2 +- .../Thelia/Model/Map/CountryI18nTableMap.php | 2 +- core/lib/Thelia/Model/Map/CountryTableMap.php | 2 +- .../Thelia/Model/Map/CouponOrderTableMap.php | 3 +- core/lib/Thelia/Model/Map/CouponTableMap.php | 128 +- .../Thelia/Model/Map/CurrencyI18nTableMap.php | 2 +- .../lib/Thelia/Model/Map/CurrencyTableMap.php | 2 +- .../Model/Map/CustomerTitleI18nTableMap.php | 2 +- .../Model/Map/CustomerTitleTableMap.php | 2 +- .../Model/Map/FeatureAvI18nTableMap.php | 2 +- .../Thelia/Model/Map/FeatureAvTableMap.php | 2 +- .../Thelia/Model/Map/FeatureI18nTableMap.php | 2 +- core/lib/Thelia/Model/Map/FeatureTableMap.php | 2 +- .../Model/Map/FolderDocumentI18nTableMap.php | 2 +- .../Model/Map/FolderDocumentTableMap.php | 2 +- .../Thelia/Model/Map/FolderI18nTableMap.php | 2 +- .../Model/Map/FolderImageI18nTableMap.php | 2 +- .../Thelia/Model/Map/FolderImageTableMap.php | 2 +- core/lib/Thelia/Model/Map/FolderTableMap.php | 2 +- .../Thelia/Model/Map/GroupI18nTableMap.php | 2 +- core/lib/Thelia/Model/Map/GroupTableMap.php | 2 +- .../Thelia/Model/Map/MessageI18nTableMap.php | 2 +- core/lib/Thelia/Model/Map/MessageTableMap.php | 2 +- .../Thelia/Model/Map/ModuleI18nTableMap.php | 2 +- core/lib/Thelia/Model/Map/ModuleTableMap.php | 2 +- .../Model/Map/OrderStatusI18nTableMap.php | 2 +- .../Thelia/Model/Map/OrderStatusTableMap.php | 2 +- .../Model/Map/ProductDocumentI18nTableMap.php | 2 +- .../Model/Map/ProductDocumentTableMap.php | 2 +- .../Thelia/Model/Map/ProductI18nTableMap.php | 2 +- .../Model/Map/ProductImageI18nTableMap.php | 2 +- .../Thelia/Model/Map/ProductImageTableMap.php | 2 +- core/lib/Thelia/Model/Map/ProductTableMap.php | 2 +- .../Thelia/Model/Map/ResourceI18nTableMap.php | 2 +- .../lib/Thelia/Model/Map/ResourceTableMap.php | 2 +- core/lib/Thelia/Model/Map/TaxI18nTableMap.php | 2 +- .../Thelia/Model/Map/TaxRuleI18nTableMap.php | 2 +- core/lib/Thelia/Model/Map/TaxRuleTableMap.php | 2 +- core/lib/Thelia/Model/Map/TaxTableMap.php | 2 +- install/thelia.sql | 144 +- 143 files changed, 2772 insertions(+), 890 deletions(-) diff --git a/core/lib/Thelia/Model/Base/Attribute.php b/core/lib/Thelia/Model/Base/Attribute.php index efe4a631d..2f04404d4 100644 --- a/core/lib/Thelia/Model/Base/Attribute.php +++ b/core/lib/Thelia/Model/Base/Attribute.php @@ -132,7 +132,7 @@ abstract class Attribute implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -2554,7 +2554,7 @@ abstract class Attribute implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collAttributeAvs instanceof Collection) { @@ -2612,7 +2612,7 @@ abstract class Attribute implements ActiveRecordInterface * * @return ChildAttribute The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -2636,7 +2636,7 @@ abstract class Attribute implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildAttributeI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collAttributeI18ns) { @@ -2671,7 +2671,7 @@ abstract class Attribute implements ActiveRecordInterface * * @return ChildAttribute The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildAttributeI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/AttributeAv.php b/core/lib/Thelia/Model/Base/AttributeAv.php index 43a1be294..ab39577bd 100644 --- a/core/lib/Thelia/Model/Base/AttributeAv.php +++ b/core/lib/Thelia/Model/Base/AttributeAv.php @@ -122,7 +122,7 @@ abstract class AttributeAv implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -1903,7 +1903,7 @@ abstract class AttributeAv implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collAttributeCombinations instanceof Collection) { @@ -1950,7 +1950,7 @@ abstract class AttributeAv implements ActiveRecordInterface * * @return ChildAttributeAv The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -1974,7 +1974,7 @@ abstract class AttributeAv implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildAttributeAvI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collAttributeAvI18ns) { @@ -2009,7 +2009,7 @@ abstract class AttributeAv implements ActiveRecordInterface * * @return ChildAttributeAv The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildAttributeAvI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/AttributeAvI18n.php b/core/lib/Thelia/Model/Base/AttributeAvI18n.php index 3e7b9afcd..bcd1c7453 100644 --- a/core/lib/Thelia/Model/Base/AttributeAvI18n.php +++ b/core/lib/Thelia/Model/Base/AttributeAvI18n.php @@ -61,7 +61,7 @@ abstract class AttributeAvI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class AttributeAvI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class AttributeAvI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/AttributeAvQuery.php b/core/lib/Thelia/Model/Base/AttributeAvQuery.php index 8ebfaa8c9..4f724b4f4 100644 --- a/core/lib/Thelia/Model/Base/AttributeAvQuery.php +++ b/core/lib/Thelia/Model/Base/AttributeAvQuery.php @@ -841,7 +841,7 @@ abstract class AttributeAvQuery extends ModelCriteria * * @return ChildAttributeAvQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'AttributeAvI18n'; @@ -859,7 +859,7 @@ abstract class AttributeAvQuery extends ModelCriteria * * @return ChildAttributeAvQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -880,7 +880,7 @@ abstract class AttributeAvQuery extends ModelCriteria * * @return ChildAttributeAvI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/AttributeI18n.php b/core/lib/Thelia/Model/Base/AttributeI18n.php index 0e4a1db8f..b8865769c 100644 --- a/core/lib/Thelia/Model/Base/AttributeI18n.php +++ b/core/lib/Thelia/Model/Base/AttributeI18n.php @@ -61,7 +61,7 @@ abstract class AttributeI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class AttributeI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class AttributeI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/AttributeQuery.php b/core/lib/Thelia/Model/Base/AttributeQuery.php index cabbaf7ac..cbb690efb 100644 --- a/core/lib/Thelia/Model/Base/AttributeQuery.php +++ b/core/lib/Thelia/Model/Base/AttributeQuery.php @@ -886,7 +886,7 @@ abstract class AttributeQuery extends ModelCriteria * * @return ChildAttributeQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'AttributeI18n'; @@ -904,7 +904,7 @@ abstract class AttributeQuery extends ModelCriteria * * @return ChildAttributeQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -925,7 +925,7 @@ abstract class AttributeQuery extends ModelCriteria * * @return ChildAttributeI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/Category.php b/core/lib/Thelia/Model/Base/Category.php index 85a77a061..2f05de899 100644 --- a/core/lib/Thelia/Model/Base/Category.php +++ b/core/lib/Thelia/Model/Base/Category.php @@ -218,7 +218,7 @@ abstract class Category implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -4822,7 +4822,7 @@ abstract class Category implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collProductCategories instanceof Collection) { @@ -4894,7 +4894,7 @@ abstract class Category implements ActiveRecordInterface * * @return ChildCategory The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -4918,7 +4918,7 @@ abstract class Category implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildCategoryI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collCategoryI18ns) { @@ -4953,7 +4953,7 @@ abstract class Category implements ActiveRecordInterface * * @return ChildCategory The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildCategoryI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/CategoryDocument.php b/core/lib/Thelia/Model/Base/CategoryDocument.php index 165bfa492..7225ac46f 100644 --- a/core/lib/Thelia/Model/Base/CategoryDocument.php +++ b/core/lib/Thelia/Model/Base/CategoryDocument.php @@ -120,7 +120,7 @@ abstract class CategoryDocument implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -1640,7 +1640,7 @@ abstract class CategoryDocument implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collCategoryDocumentI18ns instanceof Collection) { @@ -1683,7 +1683,7 @@ abstract class CategoryDocument implements ActiveRecordInterface * * @return ChildCategoryDocument The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -1707,7 +1707,7 @@ abstract class CategoryDocument implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildCategoryDocumentI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collCategoryDocumentI18ns) { @@ -1742,7 +1742,7 @@ abstract class CategoryDocument implements ActiveRecordInterface * * @return ChildCategoryDocument The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildCategoryDocumentI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/CategoryDocumentI18n.php b/core/lib/Thelia/Model/Base/CategoryDocumentI18n.php index db3189cc3..f361b3184 100644 --- a/core/lib/Thelia/Model/Base/CategoryDocumentI18n.php +++ b/core/lib/Thelia/Model/Base/CategoryDocumentI18n.php @@ -61,7 +61,7 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/CategoryDocumentQuery.php b/core/lib/Thelia/Model/Base/CategoryDocumentQuery.php index 8c0a177ac..239ec6c83 100644 --- a/core/lib/Thelia/Model/Base/CategoryDocumentQuery.php +++ b/core/lib/Thelia/Model/Base/CategoryDocumentQuery.php @@ -797,7 +797,7 @@ abstract class CategoryDocumentQuery extends ModelCriteria * * @return ChildCategoryDocumentQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'CategoryDocumentI18n'; @@ -815,7 +815,7 @@ abstract class CategoryDocumentQuery extends ModelCriteria * * @return ChildCategoryDocumentQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -836,7 +836,7 @@ abstract class CategoryDocumentQuery extends ModelCriteria * * @return ChildCategoryDocumentI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/CategoryI18n.php b/core/lib/Thelia/Model/Base/CategoryI18n.php index 83d62572d..65fa17063 100644 --- a/core/lib/Thelia/Model/Base/CategoryI18n.php +++ b/core/lib/Thelia/Model/Base/CategoryI18n.php @@ -61,7 +61,7 @@ abstract class CategoryI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class CategoryI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class CategoryI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/CategoryImage.php b/core/lib/Thelia/Model/Base/CategoryImage.php index efde7b64a..17c2007f9 100644 --- a/core/lib/Thelia/Model/Base/CategoryImage.php +++ b/core/lib/Thelia/Model/Base/CategoryImage.php @@ -120,7 +120,7 @@ abstract class CategoryImage implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -1640,7 +1640,7 @@ abstract class CategoryImage implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collCategoryImageI18ns instanceof Collection) { @@ -1683,7 +1683,7 @@ abstract class CategoryImage implements ActiveRecordInterface * * @return ChildCategoryImage The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -1707,7 +1707,7 @@ abstract class CategoryImage implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildCategoryImageI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collCategoryImageI18ns) { @@ -1742,7 +1742,7 @@ abstract class CategoryImage implements ActiveRecordInterface * * @return ChildCategoryImage The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildCategoryImageI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/CategoryImageI18n.php b/core/lib/Thelia/Model/Base/CategoryImageI18n.php index ce61e9836..e59c4caca 100644 --- a/core/lib/Thelia/Model/Base/CategoryImageI18n.php +++ b/core/lib/Thelia/Model/Base/CategoryImageI18n.php @@ -61,7 +61,7 @@ abstract class CategoryImageI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class CategoryImageI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class CategoryImageI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/CategoryImageQuery.php b/core/lib/Thelia/Model/Base/CategoryImageQuery.php index 2130e757b..305b01755 100644 --- a/core/lib/Thelia/Model/Base/CategoryImageQuery.php +++ b/core/lib/Thelia/Model/Base/CategoryImageQuery.php @@ -797,7 +797,7 @@ abstract class CategoryImageQuery extends ModelCriteria * * @return ChildCategoryImageQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'CategoryImageI18n'; @@ -815,7 +815,7 @@ abstract class CategoryImageQuery extends ModelCriteria * * @return ChildCategoryImageQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -836,7 +836,7 @@ abstract class CategoryImageQuery extends ModelCriteria * * @return ChildCategoryImageI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/CategoryQuery.php b/core/lib/Thelia/Model/Base/CategoryQuery.php index 0b7df33dd..5a9c1165f 100644 --- a/core/lib/Thelia/Model/Base/CategoryQuery.php +++ b/core/lib/Thelia/Model/Base/CategoryQuery.php @@ -1461,7 +1461,7 @@ abstract class CategoryQuery extends ModelCriteria * * @return ChildCategoryQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'CategoryI18n'; @@ -1479,7 +1479,7 @@ abstract class CategoryQuery extends ModelCriteria * * @return ChildCategoryQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -1500,7 +1500,7 @@ abstract class CategoryQuery extends ModelCriteria * * @return ChildCategoryI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/Config.php b/core/lib/Thelia/Model/Base/Config.php index d687ffefe..140cdb82d 100644 --- a/core/lib/Thelia/Model/Base/Config.php +++ b/core/lib/Thelia/Model/Base/Config.php @@ -121,7 +121,7 @@ abstract class Config implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -1642,7 +1642,7 @@ abstract class Config implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collConfigI18ns instanceof Collection) { @@ -1684,7 +1684,7 @@ abstract class Config implements ActiveRecordInterface * * @return ChildConfig The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -1708,7 +1708,7 @@ abstract class Config implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildConfigI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collConfigI18ns) { @@ -1743,7 +1743,7 @@ abstract class Config implements ActiveRecordInterface * * @return ChildConfig The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildConfigI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/ConfigI18n.php b/core/lib/Thelia/Model/Base/ConfigI18n.php index 6247e15d1..e73e27514 100644 --- a/core/lib/Thelia/Model/Base/ConfigI18n.php +++ b/core/lib/Thelia/Model/Base/ConfigI18n.php @@ -61,7 +61,7 @@ abstract class ConfigI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class ConfigI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class ConfigI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/ConfigQuery.php b/core/lib/Thelia/Model/Base/ConfigQuery.php index ef47308a4..b2ddc3409 100644 --- a/core/lib/Thelia/Model/Base/ConfigQuery.php +++ b/core/lib/Thelia/Model/Base/ConfigQuery.php @@ -749,7 +749,7 @@ abstract class ConfigQuery extends ModelCriteria * * @return ChildConfigQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'ConfigI18n'; @@ -767,7 +767,7 @@ abstract class ConfigQuery extends ModelCriteria * * @return ChildConfigQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -788,7 +788,7 @@ abstract class ConfigQuery extends ModelCriteria * * @return ChildConfigI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/Content.php b/core/lib/Thelia/Model/Base/Content.php index 96ea69eef..e8514fc08 100644 --- a/core/lib/Thelia/Model/Base/Content.php +++ b/core/lib/Thelia/Model/Base/Content.php @@ -182,7 +182,7 @@ abstract class Content implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -3720,7 +3720,7 @@ abstract class Content implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collContentAssocs instanceof Collection) { @@ -3790,7 +3790,7 @@ abstract class Content implements ActiveRecordInterface * * @return ChildContent The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -3814,7 +3814,7 @@ abstract class Content implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildContentI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collContentI18ns) { @@ -3849,7 +3849,7 @@ abstract class Content implements ActiveRecordInterface * * @return ChildContent The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildContentI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/ContentDocument.php b/core/lib/Thelia/Model/Base/ContentDocument.php index 990fc4a9f..7c974c839 100644 --- a/core/lib/Thelia/Model/Base/ContentDocument.php +++ b/core/lib/Thelia/Model/Base/ContentDocument.php @@ -120,7 +120,7 @@ abstract class ContentDocument implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -1640,7 +1640,7 @@ abstract class ContentDocument implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collContentDocumentI18ns instanceof Collection) { @@ -1683,7 +1683,7 @@ abstract class ContentDocument implements ActiveRecordInterface * * @return ChildContentDocument The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -1707,7 +1707,7 @@ abstract class ContentDocument implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildContentDocumentI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collContentDocumentI18ns) { @@ -1742,7 +1742,7 @@ abstract class ContentDocument implements ActiveRecordInterface * * @return ChildContentDocument The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildContentDocumentI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/ContentDocumentI18n.php b/core/lib/Thelia/Model/Base/ContentDocumentI18n.php index 2cfc367b0..e275926c5 100644 --- a/core/lib/Thelia/Model/Base/ContentDocumentI18n.php +++ b/core/lib/Thelia/Model/Base/ContentDocumentI18n.php @@ -61,7 +61,7 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/ContentDocumentQuery.php b/core/lib/Thelia/Model/Base/ContentDocumentQuery.php index 89cf5d48b..72cc8cae4 100644 --- a/core/lib/Thelia/Model/Base/ContentDocumentQuery.php +++ b/core/lib/Thelia/Model/Base/ContentDocumentQuery.php @@ -797,7 +797,7 @@ abstract class ContentDocumentQuery extends ModelCriteria * * @return ChildContentDocumentQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'ContentDocumentI18n'; @@ -815,7 +815,7 @@ abstract class ContentDocumentQuery extends ModelCriteria * * @return ChildContentDocumentQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -836,7 +836,7 @@ abstract class ContentDocumentQuery extends ModelCriteria * * @return ChildContentDocumentI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/ContentI18n.php b/core/lib/Thelia/Model/Base/ContentI18n.php index d3974522b..14ff02b39 100644 --- a/core/lib/Thelia/Model/Base/ContentI18n.php +++ b/core/lib/Thelia/Model/Base/ContentI18n.php @@ -61,7 +61,7 @@ abstract class ContentI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class ContentI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class ContentI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/ContentImage.php b/core/lib/Thelia/Model/Base/ContentImage.php index 22c4bed10..884c20c1e 100644 --- a/core/lib/Thelia/Model/Base/ContentImage.php +++ b/core/lib/Thelia/Model/Base/ContentImage.php @@ -120,7 +120,7 @@ abstract class ContentImage implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -1640,7 +1640,7 @@ abstract class ContentImage implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collContentImageI18ns instanceof Collection) { @@ -1683,7 +1683,7 @@ abstract class ContentImage implements ActiveRecordInterface * * @return ChildContentImage The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -1707,7 +1707,7 @@ abstract class ContentImage implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildContentImageI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collContentImageI18ns) { @@ -1742,7 +1742,7 @@ abstract class ContentImage implements ActiveRecordInterface * * @return ChildContentImage The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildContentImageI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/ContentImageI18n.php b/core/lib/Thelia/Model/Base/ContentImageI18n.php index d655dec53..9fe9b4147 100644 --- a/core/lib/Thelia/Model/Base/ContentImageI18n.php +++ b/core/lib/Thelia/Model/Base/ContentImageI18n.php @@ -61,7 +61,7 @@ abstract class ContentImageI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class ContentImageI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class ContentImageI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/ContentImageQuery.php b/core/lib/Thelia/Model/Base/ContentImageQuery.php index f69464dd7..26e0ffe5c 100644 --- a/core/lib/Thelia/Model/Base/ContentImageQuery.php +++ b/core/lib/Thelia/Model/Base/ContentImageQuery.php @@ -797,7 +797,7 @@ abstract class ContentImageQuery extends ModelCriteria * * @return ChildContentImageQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'ContentImageI18n'; @@ -815,7 +815,7 @@ abstract class ContentImageQuery extends ModelCriteria * * @return ChildContentImageQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -836,7 +836,7 @@ abstract class ContentImageQuery extends ModelCriteria * * @return ChildContentImageI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/ContentQuery.php b/core/lib/Thelia/Model/Base/ContentQuery.php index 2cbbe109b..28d32cbe6 100644 --- a/core/lib/Thelia/Model/Base/ContentQuery.php +++ b/core/lib/Thelia/Model/Base/ContentQuery.php @@ -1294,7 +1294,7 @@ abstract class ContentQuery extends ModelCriteria * * @return ChildContentQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'ContentI18n'; @@ -1312,7 +1312,7 @@ abstract class ContentQuery extends ModelCriteria * * @return ChildContentQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -1333,7 +1333,7 @@ abstract class ContentQuery extends ModelCriteria * * @return ChildContentI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/Country.php b/core/lib/Thelia/Model/Base/Country.php index 704375de2..3c4247896 100644 --- a/core/lib/Thelia/Model/Base/Country.php +++ b/core/lib/Thelia/Model/Base/Country.php @@ -142,7 +142,7 @@ abstract class Country implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -2323,7 +2323,7 @@ abstract class Country implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collTaxRuleCountries instanceof Collection) { @@ -2374,7 +2374,7 @@ abstract class Country implements ActiveRecordInterface * * @return ChildCountry The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -2398,7 +2398,7 @@ abstract class Country implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildCountryI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collCountryI18ns) { @@ -2433,7 +2433,7 @@ abstract class Country implements ActiveRecordInterface * * @return ChildCountry The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildCountryI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/CountryI18n.php b/core/lib/Thelia/Model/Base/CountryI18n.php index be63955ca..270a9d3f7 100644 --- a/core/lib/Thelia/Model/Base/CountryI18n.php +++ b/core/lib/Thelia/Model/Base/CountryI18n.php @@ -61,7 +61,7 @@ abstract class CountryI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class CountryI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class CountryI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/CountryQuery.php b/core/lib/Thelia/Model/Base/CountryQuery.php index 6c3a1c950..2c709f800 100644 --- a/core/lib/Thelia/Model/Base/CountryQuery.php +++ b/core/lib/Thelia/Model/Base/CountryQuery.php @@ -972,7 +972,7 @@ abstract class CountryQuery extends ModelCriteria * * @return ChildCountryQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'CountryI18n'; @@ -990,7 +990,7 @@ abstract class CountryQuery extends ModelCriteria * * @return ChildCountryQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -1011,7 +1011,7 @@ abstract class CountryQuery extends ModelCriteria * * @return ChildCountryI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/Coupon.php b/core/lib/Thelia/Model/Base/Coupon.php index 2c3dae5c9..89a4dc9e2 100644 --- a/core/lib/Thelia/Model/Base/Coupon.php +++ b/core/lib/Thelia/Model/Base/Coupon.php @@ -18,10 +18,15 @@ use Propel\Runtime\Map\TableMap; use Propel\Runtime\Parser\AbstractParser; use Propel\Runtime\Util\PropelDateTime; use Thelia\Model\Coupon as ChildCoupon; +use Thelia\Model\CouponI18n as ChildCouponI18n; +use Thelia\Model\CouponI18nQuery as ChildCouponI18nQuery; +use Thelia\Model\CouponOrder as ChildCouponOrder; +use Thelia\Model\CouponOrderQuery as ChildCouponOrderQuery; use Thelia\Model\CouponQuery as ChildCouponQuery; -use Thelia\Model\CouponRule as ChildCouponRule; -use Thelia\Model\CouponRuleQuery as ChildCouponRuleQuery; +use Thelia\Model\CouponVersion as ChildCouponVersion; +use Thelia\Model\CouponVersionQuery as ChildCouponVersionQuery; use Thelia\Model\Map\CouponTableMap; +use Thelia\Model\Map\CouponVersionTableMap; abstract class Coupon implements ActiveRecordInterface { @@ -70,10 +75,28 @@ abstract class Coupon implements ActiveRecordInterface protected $code; /** - * The value for the action field. + * The value for the type field. * @var string */ - protected $action; + protected $type; + + /** + * The value for the title field. + * @var string + */ + protected $title; + + /** + * The value for the short_description field. + * @var string + */ + protected $short_description; + + /** + * The value for the description field. + * @var string + */ + protected $description; /** * The value for the value field. @@ -82,28 +105,28 @@ abstract class Coupon implements ActiveRecordInterface protected $value; /** - * The value for the used field. + * The value for the is_used field. * @var int */ - protected $used; + protected $is_used; /** - * The value for the available_since field. - * @var string - */ - protected $available_since; - - /** - * The value for the date_limit field. - * @var string - */ - protected $date_limit; - - /** - * The value for the activate field. + * The value for the is_enabled field. * @var int */ - protected $activate; + protected $is_enabled; + + /** + * The value for the expiration_date field. + * @var string + */ + protected $expiration_date; + + /** + * The value for the serialized_rules field. + * @var string + */ + protected $serialized_rules; /** * The value for the created_at field. @@ -118,10 +141,29 @@ abstract class Coupon implements ActiveRecordInterface protected $updated_at; /** - * @var ObjectCollection|ChildCouponRule[] Collection to store aggregation of ChildCouponRule objects. + * The value for the version field. + * Note: this column has a database default value of: 0 + * @var int */ - protected $collCouponRules; - protected $collCouponRulesPartial; + protected $version; + + /** + * @var ObjectCollection|ChildCouponOrder[] Collection to store aggregation of ChildCouponOrder objects. + */ + protected $collCouponOrders; + protected $collCouponOrdersPartial; + + /** + * @var ObjectCollection|ChildCouponI18n[] Collection to store aggregation of ChildCouponI18n objects. + */ + protected $collCouponI18ns; + protected $collCouponI18nsPartial; + + /** + * @var ObjectCollection|ChildCouponVersion[] Collection to store aggregation of ChildCouponVersion objects. + */ + protected $collCouponVersions; + protected $collCouponVersionsPartial; /** * Flag to prevent endless save loop, if this object is referenced @@ -131,17 +173,64 @@ abstract class Coupon implements ActiveRecordInterface */ protected $alreadyInSave = false; + // i18n behavior + + /** + * Current locale + * @var string + */ + protected $currentLocale = 'en_EN'; + + /** + * Current translation objects + * @var array[ChildCouponI18n] + */ + protected $currentTranslations; + + // versionable behavior + + + /** + * @var bool + */ + protected $enforceVersion = false; + /** * An array of objects scheduled for deletion. * @var ObjectCollection */ - protected $couponRulesScheduledForDeletion = null; + protected $couponOrdersScheduledForDeletion = null; + + /** + * An array of objects scheduled for deletion. + * @var ObjectCollection + */ + protected $couponI18nsScheduledForDeletion = null; + + /** + * An array of objects scheduled for deletion. + * @var ObjectCollection + */ + protected $couponVersionsScheduledForDeletion = null; + + /** + * Applies default values to this object. + * This method should be called from the object's constructor (or + * equivalent initialization method). + * @see __construct() + */ + public function applyDefaultValues() + { + $this->version = 0; + } /** * Initializes internal state of Thelia\Model\Base\Coupon object. + * @see applyDefaults() */ public function __construct() { + $this->applyDefaultValues(); } /** @@ -414,14 +503,47 @@ abstract class Coupon implements ActiveRecordInterface } /** - * Get the [action] column value. + * Get the [type] column value. * * @return string */ - public function getAction() + public function getType() { - return $this->action; + return $this->type; + } + + /** + * Get the [title] column value. + * + * @return string + */ + public function getTitle() + { + + return $this->title; + } + + /** + * Get the [short_description] column value. + * + * @return string + */ + public function getShortDescription() + { + + return $this->short_description; + } + + /** + * Get the [description] column value. + * + * @return string + */ + public function getDescription() + { + + return $this->description; } /** @@ -436,18 +558,29 @@ abstract class Coupon implements ActiveRecordInterface } /** - * Get the [used] column value. + * Get the [is_used] column value. * * @return int */ - public function getUsed() + public function getIsUsed() { - return $this->used; + return $this->is_used; } /** - * Get the [optionally formatted] temporal [available_since] column value. + * Get the [is_enabled] column value. + * + * @return int + */ + public function getIsEnabled() + { + + return $this->is_enabled; + } + + /** + * Get the [optionally formatted] temporal [expiration_date] column value. * * * @param string $format The date/time format string (either date()-style or strftime()-style). @@ -457,44 +590,24 @@ abstract class Coupon implements ActiveRecordInterface * * @throws PropelException - if unable to parse/validate the date/time value. */ - public function getAvailableSince($format = NULL) + public function getExpirationDate($format = NULL) { if ($format === null) { - return $this->available_since; + return $this->expiration_date; } else { - return $this->available_since !== null ? $this->available_since->format($format) : null; + return $this->expiration_date !== null ? $this->expiration_date->format($format) : null; } } /** - * Get the [optionally formatted] temporal [date_limit] column value. + * Get the [serialized_rules] column value. * - * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. - * - * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 - * - * @throws PropelException - if unable to parse/validate the date/time value. + * @return string */ - public function getDateLimit($format = NULL) - { - if ($format === null) { - return $this->date_limit; - } else { - return $this->date_limit !== null ? $this->date_limit->format($format) : null; - } - } - - /** - * Get the [activate] column value. - * - * @return int - */ - public function getActivate() + public function getSerializedRules() { - return $this->activate; + return $this->serialized_rules; } /** @@ -537,6 +650,17 @@ abstract class Coupon implements ActiveRecordInterface } } + /** + * Get the [version] column value. + * + * @return int + */ + public function getVersion() + { + + return $this->version; + } + /** * Set the value of [id] column. * @@ -580,25 +704,88 @@ abstract class Coupon implements ActiveRecordInterface } // setCode() /** - * Set the value of [action] column. + * Set the value of [type] column. * * @param string $v new value * @return \Thelia\Model\Coupon The current object (for fluent API support) */ - public function setAction($v) + public function setType($v) { if ($v !== null) { $v = (string) $v; } - if ($this->action !== $v) { - $this->action = $v; - $this->modifiedColumns[] = CouponTableMap::ACTION; + if ($this->type !== $v) { + $this->type = $v; + $this->modifiedColumns[] = CouponTableMap::TYPE; } return $this; - } // setAction() + } // setType() + + /** + * Set the value of [title] column. + * + * @param string $v new value + * @return \Thelia\Model\Coupon The current object (for fluent API support) + */ + public function setTitle($v) + { + if ($v !== null) { + $v = (string) $v; + } + + if ($this->title !== $v) { + $this->title = $v; + $this->modifiedColumns[] = CouponTableMap::TITLE; + } + + + return $this; + } // setTitle() + + /** + * Set the value of [short_description] column. + * + * @param string $v new value + * @return \Thelia\Model\Coupon The current object (for fluent API support) + */ + public function setShortDescription($v) + { + if ($v !== null) { + $v = (string) $v; + } + + if ($this->short_description !== $v) { + $this->short_description = $v; + $this->modifiedColumns[] = CouponTableMap::SHORT_DESCRIPTION; + } + + + return $this; + } // setShortDescription() + + /** + * Set the value of [description] column. + * + * @param string $v new value + * @return \Thelia\Model\Coupon The current object (for fluent API support) + */ + public function setDescription($v) + { + if ($v !== null) { + $v = (string) $v; + } + + if ($this->description !== $v) { + $this->description = $v; + $this->modifiedColumns[] = CouponTableMap::DESCRIPTION; + } + + + return $this; + } // setDescription() /** * Set the value of [value] column. @@ -622,88 +809,88 @@ abstract class Coupon implements ActiveRecordInterface } // setValue() /** - * Set the value of [used] column. + * Set the value of [is_used] column. * * @param int $v new value * @return \Thelia\Model\Coupon The current object (for fluent API support) */ - public function setUsed($v) + public function setIsUsed($v) { if ($v !== null) { $v = (int) $v; } - if ($this->used !== $v) { - $this->used = $v; - $this->modifiedColumns[] = CouponTableMap::USED; + if ($this->is_used !== $v) { + $this->is_used = $v; + $this->modifiedColumns[] = CouponTableMap::IS_USED; } return $this; - } // setUsed() + } // setIsUsed() /** - * Sets the value of [available_since] column to a normalized version of the date/time value specified. - * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Coupon The current object (for fluent API support) - */ - public function setAvailableSince($v) - { - $dt = PropelDateTime::newInstance($v, null, '\DateTime'); - if ($this->available_since !== null || $dt !== null) { - if ($dt !== $this->available_since) { - $this->available_since = $dt; - $this->modifiedColumns[] = CouponTableMap::AVAILABLE_SINCE; - } - } // if either are not null - - - return $this; - } // setAvailableSince() - - /** - * Sets the value of [date_limit] column to a normalized version of the date/time value specified. - * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\Coupon The current object (for fluent API support) - */ - public function setDateLimit($v) - { - $dt = PropelDateTime::newInstance($v, null, '\DateTime'); - if ($this->date_limit !== null || $dt !== null) { - if ($dt !== $this->date_limit) { - $this->date_limit = $dt; - $this->modifiedColumns[] = CouponTableMap::DATE_LIMIT; - } - } // if either are not null - - - return $this; - } // setDateLimit() - - /** - * Set the value of [activate] column. + * Set the value of [is_enabled] column. * * @param int $v new value * @return \Thelia\Model\Coupon The current object (for fluent API support) */ - public function setActivate($v) + public function setIsEnabled($v) { if ($v !== null) { $v = (int) $v; } - if ($this->activate !== $v) { - $this->activate = $v; - $this->modifiedColumns[] = CouponTableMap::ACTIVATE; + if ($this->is_enabled !== $v) { + $this->is_enabled = $v; + $this->modifiedColumns[] = CouponTableMap::IS_ENABLED; } return $this; - } // setActivate() + } // setIsEnabled() + + /** + * Sets the value of [expiration_date] column to a normalized version of the date/time value specified. + * + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\Coupon The current object (for fluent API support) + */ + public function setExpirationDate($v) + { + $dt = PropelDateTime::newInstance($v, null, '\DateTime'); + if ($this->expiration_date !== null || $dt !== null) { + if ($dt !== $this->expiration_date) { + $this->expiration_date = $dt; + $this->modifiedColumns[] = CouponTableMap::EXPIRATION_DATE; + } + } // if either are not null + + + return $this; + } // setExpirationDate() + + /** + * Set the value of [serialized_rules] column. + * + * @param string $v new value + * @return \Thelia\Model\Coupon The current object (for fluent API support) + */ + public function setSerializedRules($v) + { + if ($v !== null) { + $v = (string) $v; + } + + if ($this->serialized_rules !== $v) { + $this->serialized_rules = $v; + $this->modifiedColumns[] = CouponTableMap::SERIALIZED_RULES; + } + + + return $this; + } // setSerializedRules() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. @@ -747,6 +934,27 @@ abstract class Coupon implements ActiveRecordInterface return $this; } // setUpdatedAt() + /** + * Set the value of [version] column. + * + * @param int $v new value + * @return \Thelia\Model\Coupon The current object (for fluent API support) + */ + public function setVersion($v) + { + if ($v !== null) { + $v = (int) $v; + } + + if ($this->version !== $v) { + $this->version = $v; + $this->modifiedColumns[] = CouponTableMap::VERSION; + } + + + return $this; + } // setVersion() + /** * Indicates whether the columns in this object are only set to default values. * @@ -757,6 +965,10 @@ abstract class Coupon implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { + if ($this->version !== 0) { + return false; + } + // otherwise, everything was equal, so return TRUE return true; } // hasOnlyDefaultValues() @@ -790,41 +1002,50 @@ abstract class Coupon implements ActiveRecordInterface $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : CouponTableMap::translateFieldName('Code', TableMap::TYPE_PHPNAME, $indexType)]; $this->code = (null !== $col) ? (string) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : CouponTableMap::translateFieldName('Action', TableMap::TYPE_PHPNAME, $indexType)]; - $this->action = (null !== $col) ? (string) $col : null; + $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : CouponTableMap::translateFieldName('Type', TableMap::TYPE_PHPNAME, $indexType)]; + $this->type = (null !== $col) ? (string) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : CouponTableMap::translateFieldName('Value', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : CouponTableMap::translateFieldName('Title', TableMap::TYPE_PHPNAME, $indexType)]; + $this->title = (null !== $col) ? (string) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : CouponTableMap::translateFieldName('ShortDescription', TableMap::TYPE_PHPNAME, $indexType)]; + $this->short_description = (null !== $col) ? (string) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : CouponTableMap::translateFieldName('Description', TableMap::TYPE_PHPNAME, $indexType)]; + $this->description = (null !== $col) ? (string) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : CouponTableMap::translateFieldName('Value', TableMap::TYPE_PHPNAME, $indexType)]; $this->value = (null !== $col) ? (double) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : CouponTableMap::translateFieldName('Used', TableMap::TYPE_PHPNAME, $indexType)]; - $this->used = (null !== $col) ? (int) $col : null; + $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : CouponTableMap::translateFieldName('IsUsed', TableMap::TYPE_PHPNAME, $indexType)]; + $this->is_used = (null !== $col) ? (int) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : CouponTableMap::translateFieldName('AvailableSince', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 8 + $startcol : CouponTableMap::translateFieldName('IsEnabled', TableMap::TYPE_PHPNAME, $indexType)]; + $this->is_enabled = (null !== $col) ? (int) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 9 + $startcol : CouponTableMap::translateFieldName('ExpirationDate', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } - $this->available_since = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; + $this->expiration_date = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : CouponTableMap::translateFieldName('DateLimit', TableMap::TYPE_PHPNAME, $indexType)]; - if ($col === '0000-00-00 00:00:00') { - $col = null; - } - $this->date_limit = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; + $col = $row[TableMap::TYPE_NUM == $indexType ? 10 + $startcol : CouponTableMap::translateFieldName('SerializedRules', TableMap::TYPE_PHPNAME, $indexType)]; + $this->serialized_rules = (null !== $col) ? (string) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : CouponTableMap::translateFieldName('Activate', TableMap::TYPE_PHPNAME, $indexType)]; - $this->activate = (null !== $col) ? (int) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 8 + $startcol : CouponTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 11 + $startcol : CouponTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 9 + $startcol : CouponTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 12 + $startcol : CouponTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } $this->updated_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 13 + $startcol : CouponTableMap::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)]; + $this->version = (null !== $col) ? (int) $col : null; $this->resetModified(); $this->setNew(false); @@ -833,7 +1054,7 @@ abstract class Coupon implements ActiveRecordInterface $this->ensureConsistency(); } - return $startcol + 10; // 10 = CouponTableMap::NUM_HYDRATE_COLUMNS. + return $startcol + 14; // 14 = CouponTableMap::NUM_HYDRATE_COLUMNS. } catch (Exception $e) { throw new PropelException("Error populating \Thelia\Model\Coupon object", 0, $e); @@ -894,7 +1115,11 @@ abstract class Coupon implements ActiveRecordInterface if ($deep) { // also de-associate any related objects? - $this->collCouponRules = null; + $this->collCouponOrders = null; + + $this->collCouponI18ns = null; + + $this->collCouponVersions = null; } // if (deep) } @@ -964,6 +1189,11 @@ abstract class Coupon implements ActiveRecordInterface $isInsert = $this->isNew(); try { $ret = $this->preSave($con); + // versionable behavior + if ($this->isVersioningNecessary()) { + $this->setVersion($this->isNew() ? 1 : $this->getLastVersionNumber($con) + 1); + $createVersion = true; // for postSave hook + } if ($isInsert) { $ret = $ret && $this->preInsert($con); // timestampable behavior @@ -988,6 +1218,10 @@ abstract class Coupon implements ActiveRecordInterface $this->postUpdate($con); } $this->postSave($con); + // versionable behavior + if (isset($createVersion)) { + $this->addVersion($con); + } CouponTableMap::addInstanceToPool($this); } else { $affectedRows = 0; @@ -1029,17 +1263,51 @@ abstract class Coupon implements ActiveRecordInterface $this->resetModified(); } - if ($this->couponRulesScheduledForDeletion !== null) { - if (!$this->couponRulesScheduledForDeletion->isEmpty()) { - \Thelia\Model\CouponRuleQuery::create() - ->filterByPrimaryKeys($this->couponRulesScheduledForDeletion->getPrimaryKeys(false)) + if ($this->couponOrdersScheduledForDeletion !== null) { + if (!$this->couponOrdersScheduledForDeletion->isEmpty()) { + \Thelia\Model\CouponOrderQuery::create() + ->filterByPrimaryKeys($this->couponOrdersScheduledForDeletion->getPrimaryKeys(false)) ->delete($con); - $this->couponRulesScheduledForDeletion = null; + $this->couponOrdersScheduledForDeletion = null; } } - if ($this->collCouponRules !== null) { - foreach ($this->collCouponRules as $referrerFK) { + if ($this->collCouponOrders !== null) { + foreach ($this->collCouponOrders as $referrerFK) { + if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) { + $affectedRows += $referrerFK->save($con); + } + } + } + + if ($this->couponI18nsScheduledForDeletion !== null) { + if (!$this->couponI18nsScheduledForDeletion->isEmpty()) { + \Thelia\Model\CouponI18nQuery::create() + ->filterByPrimaryKeys($this->couponI18nsScheduledForDeletion->getPrimaryKeys(false)) + ->delete($con); + $this->couponI18nsScheduledForDeletion = null; + } + } + + if ($this->collCouponI18ns !== null) { + foreach ($this->collCouponI18ns as $referrerFK) { + if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) { + $affectedRows += $referrerFK->save($con); + } + } + } + + if ($this->couponVersionsScheduledForDeletion !== null) { + if (!$this->couponVersionsScheduledForDeletion->isEmpty()) { + \Thelia\Model\CouponVersionQuery::create() + ->filterByPrimaryKeys($this->couponVersionsScheduledForDeletion->getPrimaryKeys(false)) + ->delete($con); + $this->couponVersionsScheduledForDeletion = null; + } + } + + if ($this->collCouponVersions !== null) { + foreach ($this->collCouponVersions as $referrerFK) { if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) { $affectedRows += $referrerFK->save($con); } @@ -1078,23 +1346,32 @@ abstract class Coupon implements ActiveRecordInterface if ($this->isColumnModified(CouponTableMap::CODE)) { $modifiedColumns[':p' . $index++] = 'CODE'; } - if ($this->isColumnModified(CouponTableMap::ACTION)) { - $modifiedColumns[':p' . $index++] = 'ACTION'; + if ($this->isColumnModified(CouponTableMap::TYPE)) { + $modifiedColumns[':p' . $index++] = 'TYPE'; + } + if ($this->isColumnModified(CouponTableMap::TITLE)) { + $modifiedColumns[':p' . $index++] = 'TITLE'; + } + if ($this->isColumnModified(CouponTableMap::SHORT_DESCRIPTION)) { + $modifiedColumns[':p' . $index++] = 'SHORT_DESCRIPTION'; + } + if ($this->isColumnModified(CouponTableMap::DESCRIPTION)) { + $modifiedColumns[':p' . $index++] = 'DESCRIPTION'; } if ($this->isColumnModified(CouponTableMap::VALUE)) { $modifiedColumns[':p' . $index++] = 'VALUE'; } - if ($this->isColumnModified(CouponTableMap::USED)) { - $modifiedColumns[':p' . $index++] = 'USED'; + if ($this->isColumnModified(CouponTableMap::IS_USED)) { + $modifiedColumns[':p' . $index++] = 'IS_USED'; } - if ($this->isColumnModified(CouponTableMap::AVAILABLE_SINCE)) { - $modifiedColumns[':p' . $index++] = 'AVAILABLE_SINCE'; + if ($this->isColumnModified(CouponTableMap::IS_ENABLED)) { + $modifiedColumns[':p' . $index++] = 'IS_ENABLED'; } - if ($this->isColumnModified(CouponTableMap::DATE_LIMIT)) { - $modifiedColumns[':p' . $index++] = 'DATE_LIMIT'; + if ($this->isColumnModified(CouponTableMap::EXPIRATION_DATE)) { + $modifiedColumns[':p' . $index++] = 'EXPIRATION_DATE'; } - if ($this->isColumnModified(CouponTableMap::ACTIVATE)) { - $modifiedColumns[':p' . $index++] = 'ACTIVATE'; + if ($this->isColumnModified(CouponTableMap::SERIALIZED_RULES)) { + $modifiedColumns[':p' . $index++] = 'SERIALIZED_RULES'; } if ($this->isColumnModified(CouponTableMap::CREATED_AT)) { $modifiedColumns[':p' . $index++] = 'CREATED_AT'; @@ -1102,6 +1379,9 @@ abstract class Coupon implements ActiveRecordInterface if ($this->isColumnModified(CouponTableMap::UPDATED_AT)) { $modifiedColumns[':p' . $index++] = 'UPDATED_AT'; } + if ($this->isColumnModified(CouponTableMap::VERSION)) { + $modifiedColumns[':p' . $index++] = 'VERSION'; + } $sql = sprintf( 'INSERT INTO coupon (%s) VALUES (%s)', @@ -1119,23 +1399,32 @@ abstract class Coupon implements ActiveRecordInterface case 'CODE': $stmt->bindValue($identifier, $this->code, PDO::PARAM_STR); break; - case 'ACTION': - $stmt->bindValue($identifier, $this->action, PDO::PARAM_STR); + case 'TYPE': + $stmt->bindValue($identifier, $this->type, PDO::PARAM_STR); + break; + case 'TITLE': + $stmt->bindValue($identifier, $this->title, PDO::PARAM_STR); + break; + case 'SHORT_DESCRIPTION': + $stmt->bindValue($identifier, $this->short_description, PDO::PARAM_STR); + break; + case 'DESCRIPTION': + $stmt->bindValue($identifier, $this->description, PDO::PARAM_STR); break; case 'VALUE': $stmt->bindValue($identifier, $this->value, PDO::PARAM_STR); break; - case 'USED': - $stmt->bindValue($identifier, $this->used, PDO::PARAM_INT); + case 'IS_USED': + $stmt->bindValue($identifier, $this->is_used, PDO::PARAM_INT); break; - case 'AVAILABLE_SINCE': - $stmt->bindValue($identifier, $this->available_since ? $this->available_since->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); + case 'IS_ENABLED': + $stmt->bindValue($identifier, $this->is_enabled, PDO::PARAM_INT); break; - case 'DATE_LIMIT': - $stmt->bindValue($identifier, $this->date_limit ? $this->date_limit->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); + case 'EXPIRATION_DATE': + $stmt->bindValue($identifier, $this->expiration_date ? $this->expiration_date->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); break; - case 'ACTIVATE': - $stmt->bindValue($identifier, $this->activate, PDO::PARAM_INT); + case 'SERIALIZED_RULES': + $stmt->bindValue($identifier, $this->serialized_rules, PDO::PARAM_STR); break; case 'CREATED_AT': $stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); @@ -1143,6 +1432,9 @@ abstract class Coupon implements ActiveRecordInterface case 'UPDATED_AT': $stmt->bindValue($identifier, $this->updated_at ? $this->updated_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); break; + case 'VERSION': + $stmt->bindValue($identifier, $this->version, PDO::PARAM_INT); + break; } } $stmt->execute(); @@ -1212,29 +1504,41 @@ abstract class Coupon implements ActiveRecordInterface return $this->getCode(); break; case 2: - return $this->getAction(); + return $this->getType(); break; case 3: - return $this->getValue(); + return $this->getTitle(); break; case 4: - return $this->getUsed(); + return $this->getShortDescription(); break; case 5: - return $this->getAvailableSince(); + return $this->getDescription(); break; case 6: - return $this->getDateLimit(); + return $this->getValue(); break; case 7: - return $this->getActivate(); + return $this->getIsUsed(); break; case 8: - return $this->getCreatedAt(); + return $this->getIsEnabled(); break; case 9: + return $this->getExpirationDate(); + break; + case 10: + return $this->getSerializedRules(); + break; + case 11: + return $this->getCreatedAt(); + break; + case 12: return $this->getUpdatedAt(); break; + case 13: + return $this->getVersion(); + break; default: return null; break; @@ -1266,14 +1570,18 @@ abstract class Coupon implements ActiveRecordInterface $result = array( $keys[0] => $this->getId(), $keys[1] => $this->getCode(), - $keys[2] => $this->getAction(), - $keys[3] => $this->getValue(), - $keys[4] => $this->getUsed(), - $keys[5] => $this->getAvailableSince(), - $keys[6] => $this->getDateLimit(), - $keys[7] => $this->getActivate(), - $keys[8] => $this->getCreatedAt(), - $keys[9] => $this->getUpdatedAt(), + $keys[2] => $this->getType(), + $keys[3] => $this->getTitle(), + $keys[4] => $this->getShortDescription(), + $keys[5] => $this->getDescription(), + $keys[6] => $this->getValue(), + $keys[7] => $this->getIsUsed(), + $keys[8] => $this->getIsEnabled(), + $keys[9] => $this->getExpirationDate(), + $keys[10] => $this->getSerializedRules(), + $keys[11] => $this->getCreatedAt(), + $keys[12] => $this->getUpdatedAt(), + $keys[13] => $this->getVersion(), ); $virtualColumns = $this->virtualColumns; foreach($virtualColumns as $key => $virtualColumn) @@ -1282,8 +1590,14 @@ abstract class Coupon implements ActiveRecordInterface } if ($includeForeignObjects) { - if (null !== $this->collCouponRules) { - $result['CouponRules'] = $this->collCouponRules->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); + if (null !== $this->collCouponOrders) { + $result['CouponOrders'] = $this->collCouponOrders->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); + } + if (null !== $this->collCouponI18ns) { + $result['CouponI18ns'] = $this->collCouponI18ns->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); + } + if (null !== $this->collCouponVersions) { + $result['CouponVersions'] = $this->collCouponVersions->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } } @@ -1326,29 +1640,41 @@ abstract class Coupon implements ActiveRecordInterface $this->setCode($value); break; case 2: - $this->setAction($value); + $this->setType($value); break; case 3: - $this->setValue($value); + $this->setTitle($value); break; case 4: - $this->setUsed($value); + $this->setShortDescription($value); break; case 5: - $this->setAvailableSince($value); + $this->setDescription($value); break; case 6: - $this->setDateLimit($value); + $this->setValue($value); break; case 7: - $this->setActivate($value); + $this->setIsUsed($value); break; case 8: - $this->setCreatedAt($value); + $this->setIsEnabled($value); break; case 9: + $this->setExpirationDate($value); + break; + case 10: + $this->setSerializedRules($value); + break; + case 11: + $this->setCreatedAt($value); + break; + case 12: $this->setUpdatedAt($value); break; + case 13: + $this->setVersion($value); + break; } // switch() } @@ -1375,14 +1701,18 @@ abstract class Coupon implements ActiveRecordInterface if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]); if (array_key_exists($keys[1], $arr)) $this->setCode($arr[$keys[1]]); - if (array_key_exists($keys[2], $arr)) $this->setAction($arr[$keys[2]]); - if (array_key_exists($keys[3], $arr)) $this->setValue($arr[$keys[3]]); - if (array_key_exists($keys[4], $arr)) $this->setUsed($arr[$keys[4]]); - if (array_key_exists($keys[5], $arr)) $this->setAvailableSince($arr[$keys[5]]); - if (array_key_exists($keys[6], $arr)) $this->setDateLimit($arr[$keys[6]]); - if (array_key_exists($keys[7], $arr)) $this->setActivate($arr[$keys[7]]); - if (array_key_exists($keys[8], $arr)) $this->setCreatedAt($arr[$keys[8]]); - if (array_key_exists($keys[9], $arr)) $this->setUpdatedAt($arr[$keys[9]]); + if (array_key_exists($keys[2], $arr)) $this->setType($arr[$keys[2]]); + if (array_key_exists($keys[3], $arr)) $this->setTitle($arr[$keys[3]]); + if (array_key_exists($keys[4], $arr)) $this->setShortDescription($arr[$keys[4]]); + if (array_key_exists($keys[5], $arr)) $this->setDescription($arr[$keys[5]]); + if (array_key_exists($keys[6], $arr)) $this->setValue($arr[$keys[6]]); + if (array_key_exists($keys[7], $arr)) $this->setIsUsed($arr[$keys[7]]); + if (array_key_exists($keys[8], $arr)) $this->setIsEnabled($arr[$keys[8]]); + if (array_key_exists($keys[9], $arr)) $this->setExpirationDate($arr[$keys[9]]); + if (array_key_exists($keys[10], $arr)) $this->setSerializedRules($arr[$keys[10]]); + if (array_key_exists($keys[11], $arr)) $this->setCreatedAt($arr[$keys[11]]); + if (array_key_exists($keys[12], $arr)) $this->setUpdatedAt($arr[$keys[12]]); + if (array_key_exists($keys[13], $arr)) $this->setVersion($arr[$keys[13]]); } /** @@ -1396,14 +1726,18 @@ abstract class Coupon implements ActiveRecordInterface if ($this->isColumnModified(CouponTableMap::ID)) $criteria->add(CouponTableMap::ID, $this->id); if ($this->isColumnModified(CouponTableMap::CODE)) $criteria->add(CouponTableMap::CODE, $this->code); - if ($this->isColumnModified(CouponTableMap::ACTION)) $criteria->add(CouponTableMap::ACTION, $this->action); + if ($this->isColumnModified(CouponTableMap::TYPE)) $criteria->add(CouponTableMap::TYPE, $this->type); + if ($this->isColumnModified(CouponTableMap::TITLE)) $criteria->add(CouponTableMap::TITLE, $this->title); + if ($this->isColumnModified(CouponTableMap::SHORT_DESCRIPTION)) $criteria->add(CouponTableMap::SHORT_DESCRIPTION, $this->short_description); + if ($this->isColumnModified(CouponTableMap::DESCRIPTION)) $criteria->add(CouponTableMap::DESCRIPTION, $this->description); if ($this->isColumnModified(CouponTableMap::VALUE)) $criteria->add(CouponTableMap::VALUE, $this->value); - if ($this->isColumnModified(CouponTableMap::USED)) $criteria->add(CouponTableMap::USED, $this->used); - if ($this->isColumnModified(CouponTableMap::AVAILABLE_SINCE)) $criteria->add(CouponTableMap::AVAILABLE_SINCE, $this->available_since); - if ($this->isColumnModified(CouponTableMap::DATE_LIMIT)) $criteria->add(CouponTableMap::DATE_LIMIT, $this->date_limit); - if ($this->isColumnModified(CouponTableMap::ACTIVATE)) $criteria->add(CouponTableMap::ACTIVATE, $this->activate); + if ($this->isColumnModified(CouponTableMap::IS_USED)) $criteria->add(CouponTableMap::IS_USED, $this->is_used); + if ($this->isColumnModified(CouponTableMap::IS_ENABLED)) $criteria->add(CouponTableMap::IS_ENABLED, $this->is_enabled); + if ($this->isColumnModified(CouponTableMap::EXPIRATION_DATE)) $criteria->add(CouponTableMap::EXPIRATION_DATE, $this->expiration_date); + if ($this->isColumnModified(CouponTableMap::SERIALIZED_RULES)) $criteria->add(CouponTableMap::SERIALIZED_RULES, $this->serialized_rules); if ($this->isColumnModified(CouponTableMap::CREATED_AT)) $criteria->add(CouponTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(CouponTableMap::UPDATED_AT)) $criteria->add(CouponTableMap::UPDATED_AT, $this->updated_at); + if ($this->isColumnModified(CouponTableMap::VERSION)) $criteria->add(CouponTableMap::VERSION, $this->version); return $criteria; } @@ -1468,23 +1802,39 @@ abstract class Coupon implements ActiveRecordInterface public function copyInto($copyObj, $deepCopy = false, $makeNew = true) { $copyObj->setCode($this->getCode()); - $copyObj->setAction($this->getAction()); + $copyObj->setType($this->getType()); + $copyObj->setTitle($this->getTitle()); + $copyObj->setShortDescription($this->getShortDescription()); + $copyObj->setDescription($this->getDescription()); $copyObj->setValue($this->getValue()); - $copyObj->setUsed($this->getUsed()); - $copyObj->setAvailableSince($this->getAvailableSince()); - $copyObj->setDateLimit($this->getDateLimit()); - $copyObj->setActivate($this->getActivate()); + $copyObj->setIsUsed($this->getIsUsed()); + $copyObj->setIsEnabled($this->getIsEnabled()); + $copyObj->setExpirationDate($this->getExpirationDate()); + $copyObj->setSerializedRules($this->getSerializedRules()); $copyObj->setCreatedAt($this->getCreatedAt()); $copyObj->setUpdatedAt($this->getUpdatedAt()); + $copyObj->setVersion($this->getVersion()); if ($deepCopy) { // important: temporarily setNew(false) because this affects the behavior of // the getter/setter methods for fkey referrer objects. $copyObj->setNew(false); - foreach ($this->getCouponRules() as $relObj) { + foreach ($this->getCouponOrders() as $relObj) { if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves - $copyObj->addCouponRule($relObj->copy($deepCopy)); + $copyObj->addCouponOrder($relObj->copy($deepCopy)); + } + } + + foreach ($this->getCouponI18ns() as $relObj) { + if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves + $copyObj->addCouponI18n($relObj->copy($deepCopy)); + } + } + + foreach ($this->getCouponVersions() as $relObj) { + if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves + $copyObj->addCouponVersion($relObj->copy($deepCopy)); } } @@ -1529,37 +1879,43 @@ abstract class Coupon implements ActiveRecordInterface */ public function initRelation($relationName) { - if ('CouponRule' == $relationName) { - return $this->initCouponRules(); + if ('CouponOrder' == $relationName) { + return $this->initCouponOrders(); + } + if ('CouponI18n' == $relationName) { + return $this->initCouponI18ns(); + } + if ('CouponVersion' == $relationName) { + return $this->initCouponVersions(); } } /** - * Clears out the collCouponRules collection + * Clears out the collCouponOrders collection * * This does not modify the database; however, it will remove any associated objects, causing * them to be refetched by subsequent calls to accessor method. * * @return void - * @see addCouponRules() + * @see addCouponOrders() */ - public function clearCouponRules() + public function clearCouponOrders() { - $this->collCouponRules = null; // important to set this to NULL since that means it is uninitialized + $this->collCouponOrders = null; // important to set this to NULL since that means it is uninitialized } /** - * Reset is the collCouponRules collection loaded partially. + * Reset is the collCouponOrders collection loaded partially. */ - public function resetPartialCouponRules($v = true) + public function resetPartialCouponOrders($v = true) { - $this->collCouponRulesPartial = $v; + $this->collCouponOrdersPartial = $v; } /** - * Initializes the collCouponRules collection. + * Initializes the collCouponOrders collection. * - * By default this just sets the collCouponRules collection to an empty array (like clearcollCouponRules()); + * By default this just sets the collCouponOrders collection to an empty array (like clearcollCouponOrders()); * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * @@ -1568,17 +1924,17 @@ abstract class Coupon implements ActiveRecordInterface * * @return void */ - public function initCouponRules($overrideExisting = true) + public function initCouponOrders($overrideExisting = true) { - if (null !== $this->collCouponRules && !$overrideExisting) { + if (null !== $this->collCouponOrders && !$overrideExisting) { return; } - $this->collCouponRules = new ObjectCollection(); - $this->collCouponRules->setModel('\Thelia\Model\CouponRule'); + $this->collCouponOrders = new ObjectCollection(); + $this->collCouponOrders->setModel('\Thelia\Model\CouponOrder'); } /** - * Gets an array of ChildCouponRule objects which contain a foreign key that references this object. + * Gets an array of ChildCouponOrder objects which contain a foreign key that references this object. * * If the $criteria is not null, it is used to always fetch the results from the database. * Otherwise the results are fetched from the database the first time, then cached. @@ -1588,109 +1944,109 @@ abstract class Coupon implements ActiveRecordInterface * * @param Criteria $criteria optional Criteria object to narrow the query * @param ConnectionInterface $con optional connection object - * @return Collection|ChildCouponRule[] List of ChildCouponRule objects + * @return Collection|ChildCouponOrder[] List of ChildCouponOrder objects * @throws PropelException */ - public function getCouponRules($criteria = null, ConnectionInterface $con = null) + public function getCouponOrders($criteria = null, ConnectionInterface $con = null) { - $partial = $this->collCouponRulesPartial && !$this->isNew(); - if (null === $this->collCouponRules || null !== $criteria || $partial) { - if ($this->isNew() && null === $this->collCouponRules) { + $partial = $this->collCouponOrdersPartial && !$this->isNew(); + if (null === $this->collCouponOrders || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collCouponOrders) { // return empty collection - $this->initCouponRules(); + $this->initCouponOrders(); } else { - $collCouponRules = ChildCouponRuleQuery::create(null, $criteria) + $collCouponOrders = ChildCouponOrderQuery::create(null, $criteria) ->filterByCoupon($this) ->find($con); if (null !== $criteria) { - if (false !== $this->collCouponRulesPartial && count($collCouponRules)) { - $this->initCouponRules(false); + if (false !== $this->collCouponOrdersPartial && count($collCouponOrders)) { + $this->initCouponOrders(false); - foreach ($collCouponRules as $obj) { - if (false == $this->collCouponRules->contains($obj)) { - $this->collCouponRules->append($obj); + foreach ($collCouponOrders as $obj) { + if (false == $this->collCouponOrders->contains($obj)) { + $this->collCouponOrders->append($obj); } } - $this->collCouponRulesPartial = true; + $this->collCouponOrdersPartial = true; } - $collCouponRules->getInternalIterator()->rewind(); + $collCouponOrders->getInternalIterator()->rewind(); - return $collCouponRules; + return $collCouponOrders; } - if ($partial && $this->collCouponRules) { - foreach ($this->collCouponRules as $obj) { + if ($partial && $this->collCouponOrders) { + foreach ($this->collCouponOrders as $obj) { if ($obj->isNew()) { - $collCouponRules[] = $obj; + $collCouponOrders[] = $obj; } } } - $this->collCouponRules = $collCouponRules; - $this->collCouponRulesPartial = false; + $this->collCouponOrders = $collCouponOrders; + $this->collCouponOrdersPartial = false; } } - return $this->collCouponRules; + return $this->collCouponOrders; } /** - * Sets a collection of CouponRule objects related by a one-to-many relationship + * Sets a collection of CouponOrder objects related by a one-to-many relationship * to the current object. * It will also schedule objects for deletion based on a diff between old objects (aka persisted) * and new objects from the given Propel collection. * - * @param Collection $couponRules A Propel collection. + * @param Collection $couponOrders A Propel collection. * @param ConnectionInterface $con Optional connection object * @return ChildCoupon The current object (for fluent API support) */ - public function setCouponRules(Collection $couponRules, ConnectionInterface $con = null) + public function setCouponOrders(Collection $couponOrders, ConnectionInterface $con = null) { - $couponRulesToDelete = $this->getCouponRules(new Criteria(), $con)->diff($couponRules); + $couponOrdersToDelete = $this->getCouponOrders(new Criteria(), $con)->diff($couponOrders); - $this->couponRulesScheduledForDeletion = $couponRulesToDelete; + $this->couponOrdersScheduledForDeletion = $couponOrdersToDelete; - foreach ($couponRulesToDelete as $couponRuleRemoved) { - $couponRuleRemoved->setCoupon(null); + foreach ($couponOrdersToDelete as $couponOrderRemoved) { + $couponOrderRemoved->setCoupon(null); } - $this->collCouponRules = null; - foreach ($couponRules as $couponRule) { - $this->addCouponRule($couponRule); + $this->collCouponOrders = null; + foreach ($couponOrders as $couponOrder) { + $this->addCouponOrder($couponOrder); } - $this->collCouponRules = $couponRules; - $this->collCouponRulesPartial = false; + $this->collCouponOrders = $couponOrders; + $this->collCouponOrdersPartial = false; return $this; } /** - * Returns the number of related CouponRule objects. + * Returns the number of related CouponOrder objects. * * @param Criteria $criteria * @param boolean $distinct * @param ConnectionInterface $con - * @return int Count of related CouponRule objects. + * @return int Count of related CouponOrder objects. * @throws PropelException */ - public function countCouponRules(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) + public function countCouponOrders(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) { - $partial = $this->collCouponRulesPartial && !$this->isNew(); - if (null === $this->collCouponRules || null !== $criteria || $partial) { - if ($this->isNew() && null === $this->collCouponRules) { + $partial = $this->collCouponOrdersPartial && !$this->isNew(); + if (null === $this->collCouponOrders || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collCouponOrders) { return 0; } if ($partial && !$criteria) { - return count($this->getCouponRules()); + return count($this->getCouponOrders()); } - $query = ChildCouponRuleQuery::create(null, $criteria); + $query = ChildCouponOrderQuery::create(null, $criteria); if ($distinct) { $query->distinct(); } @@ -1700,53 +2056,524 @@ abstract class Coupon implements ActiveRecordInterface ->count($con); } - return count($this->collCouponRules); + return count($this->collCouponOrders); } /** - * Method called to associate a ChildCouponRule object to this object - * through the ChildCouponRule foreign key attribute. + * Method called to associate a ChildCouponOrder object to this object + * through the ChildCouponOrder foreign key attribute. * - * @param ChildCouponRule $l ChildCouponRule + * @param ChildCouponOrder $l ChildCouponOrder * @return \Thelia\Model\Coupon The current object (for fluent API support) */ - public function addCouponRule(ChildCouponRule $l) + public function addCouponOrder(ChildCouponOrder $l) { - if ($this->collCouponRules === null) { - $this->initCouponRules(); - $this->collCouponRulesPartial = true; + if ($this->collCouponOrders === null) { + $this->initCouponOrders(); + $this->collCouponOrdersPartial = true; } - if (!in_array($l, $this->collCouponRules->getArrayCopy(), true)) { // only add it if the **same** object is not already associated - $this->doAddCouponRule($l); + if (!in_array($l, $this->collCouponOrders->getArrayCopy(), true)) { // only add it if the **same** object is not already associated + $this->doAddCouponOrder($l); } return $this; } /** - * @param CouponRule $couponRule The couponRule object to add. + * @param CouponOrder $couponOrder The couponOrder object to add. */ - protected function doAddCouponRule($couponRule) + protected function doAddCouponOrder($couponOrder) { - $this->collCouponRules[]= $couponRule; - $couponRule->setCoupon($this); + $this->collCouponOrders[]= $couponOrder; + $couponOrder->setCoupon($this); } /** - * @param CouponRule $couponRule The couponRule object to remove. + * @param CouponOrder $couponOrder The couponOrder object to remove. * @return ChildCoupon The current object (for fluent API support) */ - public function removeCouponRule($couponRule) + public function removeCouponOrder($couponOrder) { - if ($this->getCouponRules()->contains($couponRule)) { - $this->collCouponRules->remove($this->collCouponRules->search($couponRule)); - if (null === $this->couponRulesScheduledForDeletion) { - $this->couponRulesScheduledForDeletion = clone $this->collCouponRules; - $this->couponRulesScheduledForDeletion->clear(); + if ($this->getCouponOrders()->contains($couponOrder)) { + $this->collCouponOrders->remove($this->collCouponOrders->search($couponOrder)); + if (null === $this->couponOrdersScheduledForDeletion) { + $this->couponOrdersScheduledForDeletion = clone $this->collCouponOrders; + $this->couponOrdersScheduledForDeletion->clear(); } - $this->couponRulesScheduledForDeletion[]= clone $couponRule; - $couponRule->setCoupon(null); + $this->couponOrdersScheduledForDeletion[]= clone $couponOrder; + $couponOrder->setCoupon(null); + } + + return $this; + } + + + /** + * If this collection has already been initialized with + * an identical criteria, it returns the collection. + * Otherwise if this Coupon is new, it will return + * an empty collection; or if this Coupon has previously + * been saved, it will retrieve related CouponOrders from storage. + * + * This method is protected by default in order to keep the public + * api reasonable. You can provide public methods for those you + * actually need in Coupon. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @return Collection|ChildCouponOrder[] List of ChildCouponOrder objects + */ + public function getCouponOrdersJoinOrder($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) + { + $query = ChildCouponOrderQuery::create(null, $criteria); + $query->joinWith('Order', $joinBehavior); + + return $this->getCouponOrders($query, $con); + } + + /** + * Clears out the collCouponI18ns collection + * + * This does not modify the database; however, it will remove any associated objects, causing + * them to be refetched by subsequent calls to accessor method. + * + * @return void + * @see addCouponI18ns() + */ + public function clearCouponI18ns() + { + $this->collCouponI18ns = null; // important to set this to NULL since that means it is uninitialized + } + + /** + * Reset is the collCouponI18ns collection loaded partially. + */ + public function resetPartialCouponI18ns($v = true) + { + $this->collCouponI18nsPartial = $v; + } + + /** + * Initializes the collCouponI18ns collection. + * + * By default this just sets the collCouponI18ns collection to an empty array (like clearcollCouponI18ns()); + * however, you may wish to override this method in your stub class to provide setting appropriate + * to your application -- for example, setting the initial array to the values stored in database. + * + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty + * + * @return void + */ + public function initCouponI18ns($overrideExisting = true) + { + if (null !== $this->collCouponI18ns && !$overrideExisting) { + return; + } + $this->collCouponI18ns = new ObjectCollection(); + $this->collCouponI18ns->setModel('\Thelia\Model\CouponI18n'); + } + + /** + * Gets an array of ChildCouponI18n objects which contain a foreign key that references this object. + * + * If the $criteria is not null, it is used to always fetch the results from the database. + * Otherwise the results are fetched from the database the first time, then cached. + * Next time the same method is called without $criteria, the cached collection is returned. + * If this ChildCoupon is new, it will return + * an empty collection or the current collection; the criteria is ignored on a new object. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @return Collection|ChildCouponI18n[] List of ChildCouponI18n objects + * @throws PropelException + */ + public function getCouponI18ns($criteria = null, ConnectionInterface $con = null) + { + $partial = $this->collCouponI18nsPartial && !$this->isNew(); + if (null === $this->collCouponI18ns || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collCouponI18ns) { + // return empty collection + $this->initCouponI18ns(); + } else { + $collCouponI18ns = ChildCouponI18nQuery::create(null, $criteria) + ->filterByCoupon($this) + ->find($con); + + if (null !== $criteria) { + if (false !== $this->collCouponI18nsPartial && count($collCouponI18ns)) { + $this->initCouponI18ns(false); + + foreach ($collCouponI18ns as $obj) { + if (false == $this->collCouponI18ns->contains($obj)) { + $this->collCouponI18ns->append($obj); + } + } + + $this->collCouponI18nsPartial = true; + } + + $collCouponI18ns->getInternalIterator()->rewind(); + + return $collCouponI18ns; + } + + if ($partial && $this->collCouponI18ns) { + foreach ($this->collCouponI18ns as $obj) { + if ($obj->isNew()) { + $collCouponI18ns[] = $obj; + } + } + } + + $this->collCouponI18ns = $collCouponI18ns; + $this->collCouponI18nsPartial = false; + } + } + + return $this->collCouponI18ns; + } + + /** + * Sets a collection of CouponI18n objects related by a one-to-many relationship + * to the current object. + * It will also schedule objects for deletion based on a diff between old objects (aka persisted) + * and new objects from the given Propel collection. + * + * @param Collection $couponI18ns A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildCoupon The current object (for fluent API support) + */ + public function setCouponI18ns(Collection $couponI18ns, ConnectionInterface $con = null) + { + $couponI18nsToDelete = $this->getCouponI18ns(new Criteria(), $con)->diff($couponI18ns); + + + //since at least one column in the foreign key is at the same time a PK + //we can not just set a PK to NULL in the lines below. We have to store + //a backup of all values, so we are able to manipulate these items based on the onDelete value later. + $this->couponI18nsScheduledForDeletion = clone $couponI18nsToDelete; + + foreach ($couponI18nsToDelete as $couponI18nRemoved) { + $couponI18nRemoved->setCoupon(null); + } + + $this->collCouponI18ns = null; + foreach ($couponI18ns as $couponI18n) { + $this->addCouponI18n($couponI18n); + } + + $this->collCouponI18ns = $couponI18ns; + $this->collCouponI18nsPartial = false; + + return $this; + } + + /** + * Returns the number of related CouponI18n objects. + * + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related CouponI18n objects. + * @throws PropelException + */ + public function countCouponI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) + { + $partial = $this->collCouponI18nsPartial && !$this->isNew(); + if (null === $this->collCouponI18ns || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collCouponI18ns) { + return 0; + } + + if ($partial && !$criteria) { + return count($this->getCouponI18ns()); + } + + $query = ChildCouponI18nQuery::create(null, $criteria); + if ($distinct) { + $query->distinct(); + } + + return $query + ->filterByCoupon($this) + ->count($con); + } + + return count($this->collCouponI18ns); + } + + /** + * Method called to associate a ChildCouponI18n object to this object + * through the ChildCouponI18n foreign key attribute. + * + * @param ChildCouponI18n $l ChildCouponI18n + * @return \Thelia\Model\Coupon The current object (for fluent API support) + */ + public function addCouponI18n(ChildCouponI18n $l) + { + if ($l && $locale = $l->getLocale()) { + $this->setLocale($locale); + $this->currentTranslations[$locale] = $l; + } + if ($this->collCouponI18ns === null) { + $this->initCouponI18ns(); + $this->collCouponI18nsPartial = true; + } + + if (!in_array($l, $this->collCouponI18ns->getArrayCopy(), true)) { // only add it if the **same** object is not already associated + $this->doAddCouponI18n($l); + } + + return $this; + } + + /** + * @param CouponI18n $couponI18n The couponI18n object to add. + */ + protected function doAddCouponI18n($couponI18n) + { + $this->collCouponI18ns[]= $couponI18n; + $couponI18n->setCoupon($this); + } + + /** + * @param CouponI18n $couponI18n The couponI18n object to remove. + * @return ChildCoupon The current object (for fluent API support) + */ + public function removeCouponI18n($couponI18n) + { + if ($this->getCouponI18ns()->contains($couponI18n)) { + $this->collCouponI18ns->remove($this->collCouponI18ns->search($couponI18n)); + if (null === $this->couponI18nsScheduledForDeletion) { + $this->couponI18nsScheduledForDeletion = clone $this->collCouponI18ns; + $this->couponI18nsScheduledForDeletion->clear(); + } + $this->couponI18nsScheduledForDeletion[]= clone $couponI18n; + $couponI18n->setCoupon(null); + } + + return $this; + } + + /** + * Clears out the collCouponVersions collection + * + * This does not modify the database; however, it will remove any associated objects, causing + * them to be refetched by subsequent calls to accessor method. + * + * @return void + * @see addCouponVersions() + */ + public function clearCouponVersions() + { + $this->collCouponVersions = null; // important to set this to NULL since that means it is uninitialized + } + + /** + * Reset is the collCouponVersions collection loaded partially. + */ + public function resetPartialCouponVersions($v = true) + { + $this->collCouponVersionsPartial = $v; + } + + /** + * Initializes the collCouponVersions collection. + * + * By default this just sets the collCouponVersions collection to an empty array (like clearcollCouponVersions()); + * however, you may wish to override this method in your stub class to provide setting appropriate + * to your application -- for example, setting the initial array to the values stored in database. + * + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty + * + * @return void + */ + public function initCouponVersions($overrideExisting = true) + { + if (null !== $this->collCouponVersions && !$overrideExisting) { + return; + } + $this->collCouponVersions = new ObjectCollection(); + $this->collCouponVersions->setModel('\Thelia\Model\CouponVersion'); + } + + /** + * Gets an array of ChildCouponVersion objects which contain a foreign key that references this object. + * + * If the $criteria is not null, it is used to always fetch the results from the database. + * Otherwise the results are fetched from the database the first time, then cached. + * Next time the same method is called without $criteria, the cached collection is returned. + * If this ChildCoupon is new, it will return + * an empty collection or the current collection; the criteria is ignored on a new object. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @return Collection|ChildCouponVersion[] List of ChildCouponVersion objects + * @throws PropelException + */ + public function getCouponVersions($criteria = null, ConnectionInterface $con = null) + { + $partial = $this->collCouponVersionsPartial && !$this->isNew(); + if (null === $this->collCouponVersions || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collCouponVersions) { + // return empty collection + $this->initCouponVersions(); + } else { + $collCouponVersions = ChildCouponVersionQuery::create(null, $criteria) + ->filterByCoupon($this) + ->find($con); + + if (null !== $criteria) { + if (false !== $this->collCouponVersionsPartial && count($collCouponVersions)) { + $this->initCouponVersions(false); + + foreach ($collCouponVersions as $obj) { + if (false == $this->collCouponVersions->contains($obj)) { + $this->collCouponVersions->append($obj); + } + } + + $this->collCouponVersionsPartial = true; + } + + $collCouponVersions->getInternalIterator()->rewind(); + + return $collCouponVersions; + } + + if ($partial && $this->collCouponVersions) { + foreach ($this->collCouponVersions as $obj) { + if ($obj->isNew()) { + $collCouponVersions[] = $obj; + } + } + } + + $this->collCouponVersions = $collCouponVersions; + $this->collCouponVersionsPartial = false; + } + } + + return $this->collCouponVersions; + } + + /** + * Sets a collection of CouponVersion objects related by a one-to-many relationship + * to the current object. + * It will also schedule objects for deletion based on a diff between old objects (aka persisted) + * and new objects from the given Propel collection. + * + * @param Collection $couponVersions A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildCoupon The current object (for fluent API support) + */ + public function setCouponVersions(Collection $couponVersions, ConnectionInterface $con = null) + { + $couponVersionsToDelete = $this->getCouponVersions(new Criteria(), $con)->diff($couponVersions); + + + //since at least one column in the foreign key is at the same time a PK + //we can not just set a PK to NULL in the lines below. We have to store + //a backup of all values, so we are able to manipulate these items based on the onDelete value later. + $this->couponVersionsScheduledForDeletion = clone $couponVersionsToDelete; + + foreach ($couponVersionsToDelete as $couponVersionRemoved) { + $couponVersionRemoved->setCoupon(null); + } + + $this->collCouponVersions = null; + foreach ($couponVersions as $couponVersion) { + $this->addCouponVersion($couponVersion); + } + + $this->collCouponVersions = $couponVersions; + $this->collCouponVersionsPartial = false; + + return $this; + } + + /** + * Returns the number of related CouponVersion objects. + * + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related CouponVersion objects. + * @throws PropelException + */ + public function countCouponVersions(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) + { + $partial = $this->collCouponVersionsPartial && !$this->isNew(); + if (null === $this->collCouponVersions || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collCouponVersions) { + return 0; + } + + if ($partial && !$criteria) { + return count($this->getCouponVersions()); + } + + $query = ChildCouponVersionQuery::create(null, $criteria); + if ($distinct) { + $query->distinct(); + } + + return $query + ->filterByCoupon($this) + ->count($con); + } + + return count($this->collCouponVersions); + } + + /** + * Method called to associate a ChildCouponVersion object to this object + * through the ChildCouponVersion foreign key attribute. + * + * @param ChildCouponVersion $l ChildCouponVersion + * @return \Thelia\Model\Coupon The current object (for fluent API support) + */ + public function addCouponVersion(ChildCouponVersion $l) + { + if ($this->collCouponVersions === null) { + $this->initCouponVersions(); + $this->collCouponVersionsPartial = true; + } + + if (!in_array($l, $this->collCouponVersions->getArrayCopy(), true)) { // only add it if the **same** object is not already associated + $this->doAddCouponVersion($l); + } + + return $this; + } + + /** + * @param CouponVersion $couponVersion The couponVersion object to add. + */ + protected function doAddCouponVersion($couponVersion) + { + $this->collCouponVersions[]= $couponVersion; + $couponVersion->setCoupon($this); + } + + /** + * @param CouponVersion $couponVersion The couponVersion object to remove. + * @return ChildCoupon The current object (for fluent API support) + */ + public function removeCouponVersion($couponVersion) + { + if ($this->getCouponVersions()->contains($couponVersion)) { + $this->collCouponVersions->remove($this->collCouponVersions->search($couponVersion)); + if (null === $this->couponVersionsScheduledForDeletion) { + $this->couponVersionsScheduledForDeletion = clone $this->collCouponVersions; + $this->couponVersionsScheduledForDeletion->clear(); + } + $this->couponVersionsScheduledForDeletion[]= clone $couponVersion; + $couponVersion->setCoupon(null); } return $this; @@ -1759,16 +2586,21 @@ abstract class Coupon implements ActiveRecordInterface { $this->id = null; $this->code = null; - $this->action = null; + $this->type = null; + $this->title = null; + $this->short_description = null; + $this->description = null; $this->value = null; - $this->used = null; - $this->available_since = null; - $this->date_limit = null; - $this->activate = null; + $this->is_used = null; + $this->is_enabled = null; + $this->expiration_date = null; + $this->serialized_rules = null; $this->created_at = null; $this->updated_at = null; + $this->version = null; $this->alreadyInSave = false; $this->clearAllReferences(); + $this->applyDefaultValues(); $this->resetModified(); $this->setNew(true); $this->setDeleted(false); @@ -1786,17 +2618,39 @@ abstract class Coupon implements ActiveRecordInterface public function clearAllReferences($deep = false) { if ($deep) { - if ($this->collCouponRules) { - foreach ($this->collCouponRules as $o) { + if ($this->collCouponOrders) { + foreach ($this->collCouponOrders as $o) { + $o->clearAllReferences($deep); + } + } + if ($this->collCouponI18ns) { + foreach ($this->collCouponI18ns as $o) { + $o->clearAllReferences($deep); + } + } + if ($this->collCouponVersions) { + foreach ($this->collCouponVersions as $o) { $o->clearAllReferences($deep); } } } // if ($deep) - if ($this->collCouponRules instanceof Collection) { - $this->collCouponRules->clearIterator(); + // i18n behavior + $this->currentLocale = 'en_EN'; + $this->currentTranslations = null; + + if ($this->collCouponOrders instanceof Collection) { + $this->collCouponOrders->clearIterator(); } - $this->collCouponRules = null; + $this->collCouponOrders = null; + if ($this->collCouponI18ns instanceof Collection) { + $this->collCouponI18ns->clearIterator(); + } + $this->collCouponI18ns = null; + if ($this->collCouponVersions instanceof Collection) { + $this->collCouponVersions->clearIterator(); + } + $this->collCouponVersions = null; } /** @@ -1823,6 +2677,397 @@ abstract class Coupon implements ActiveRecordInterface return $this; } + // i18n behavior + + /** + * Sets the locale for translations + * + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * + * @return ChildCoupon The current object (for fluent API support) + */ + public function setLocale($locale = 'en_EN') + { + $this->currentLocale = $locale; + + return $this; + } + + /** + * Gets the locale for translations + * + * @return string $locale Locale to use for the translation, e.g. 'fr_FR' + */ + public function getLocale() + { + return $this->currentLocale; + } + + /** + * Returns the current translation for a given locale + * + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object + * + * @return ChildCouponI18n */ + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) + { + if (!isset($this->currentTranslations[$locale])) { + if (null !== $this->collCouponI18ns) { + foreach ($this->collCouponI18ns as $translation) { + if ($translation->getLocale() == $locale) { + $this->currentTranslations[$locale] = $translation; + + return $translation; + } + } + } + if ($this->isNew()) { + $translation = new ChildCouponI18n(); + $translation->setLocale($locale); + } else { + $translation = ChildCouponI18nQuery::create() + ->filterByPrimaryKey(array($this->getPrimaryKey(), $locale)) + ->findOneOrCreate($con); + $this->currentTranslations[$locale] = $translation; + } + $this->addCouponI18n($translation); + } + + return $this->currentTranslations[$locale]; + } + + /** + * Remove the translation for a given locale + * + * @param string $locale Locale to use for the translation, e.g. 'fr_FR' + * @param ConnectionInterface $con an optional connection object + * + * @return ChildCoupon The current object (for fluent API support) + */ + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) + { + if (!$this->isNew()) { + ChildCouponI18nQuery::create() + ->filterByPrimaryKey(array($this->getPrimaryKey(), $locale)) + ->delete($con); + } + if (isset($this->currentTranslations[$locale])) { + unset($this->currentTranslations[$locale]); + } + foreach ($this->collCouponI18ns as $key => $translation) { + if ($translation->getLocale() == $locale) { + unset($this->collCouponI18ns[$key]); + break; + } + } + + return $this; + } + + /** + * Returns the current translation + * + * @param ConnectionInterface $con an optional connection object + * + * @return ChildCouponI18n */ + public function getCurrentTranslation(ConnectionInterface $con = null) + { + return $this->getTranslation($this->getLocale(), $con); + } + + // versionable behavior + + /** + * Enforce a new Version of this object upon next save. + * + * @return \Thelia\Model\Coupon + */ + public function enforceVersioning() + { + $this->enforceVersion = true; + + return $this; + } + + /** + * Checks whether the current state must be recorded as a version + * + * @return boolean + */ + public function isVersioningNecessary($con = null) + { + if ($this->alreadyInSave) { + return false; + } + + if ($this->enforceVersion) { + return true; + } + + if (ChildCouponQuery::isVersioningEnabled() && ($this->isNew() || $this->isModified()) || $this->isDeleted()) { + return true; + } + + return false; + } + + /** + * Creates a version of the current object and saves it. + * + * @param ConnectionInterface $con the connection to use + * + * @return ChildCouponVersion A version object + */ + public function addVersion($con = null) + { + $this->enforceVersion = false; + + $version = new ChildCouponVersion(); + $version->setId($this->getId()); + $version->setCode($this->getCode()); + $version->setType($this->getType()); + $version->setTitle($this->getTitle()); + $version->setShortDescription($this->getShortDescription()); + $version->setDescription($this->getDescription()); + $version->setValue($this->getValue()); + $version->setIsUsed($this->getIsUsed()); + $version->setIsEnabled($this->getIsEnabled()); + $version->setExpirationDate($this->getExpirationDate()); + $version->setSerializedRules($this->getSerializedRules()); + $version->setCreatedAt($this->getCreatedAt()); + $version->setUpdatedAt($this->getUpdatedAt()); + $version->setVersion($this->getVersion()); + $version->setCoupon($this); + $version->save($con); + + return $version; + } + + /** + * Sets the properties of the current object to the value they had at a specific version + * + * @param integer $versionNumber The version number to read + * @param ConnectionInterface $con The connection to use + * + * @return ChildCoupon The current object (for fluent API support) + */ + public function toVersion($versionNumber, $con = null) + { + $version = $this->getOneVersion($versionNumber, $con); + if (!$version) { + throw new PropelException(sprintf('No ChildCoupon object found with version %d', $version)); + } + $this->populateFromVersion($version, $con); + + return $this; + } + + /** + * Sets the properties of the current object to the value they had at a specific version + * + * @param ChildCouponVersion $version The version object to use + * @param ConnectionInterface $con the connection to use + * @param array $loadedObjects objects that been loaded in a chain of populateFromVersion calls on referrer or fk objects. + * + * @return ChildCoupon The current object (for fluent API support) + */ + public function populateFromVersion($version, $con = null, &$loadedObjects = array()) + { + $loadedObjects['ChildCoupon'][$version->getId()][$version->getVersion()] = $this; + $this->setId($version->getId()); + $this->setCode($version->getCode()); + $this->setType($version->getType()); + $this->setTitle($version->getTitle()); + $this->setShortDescription($version->getShortDescription()); + $this->setDescription($version->getDescription()); + $this->setValue($version->getValue()); + $this->setIsUsed($version->getIsUsed()); + $this->setIsEnabled($version->getIsEnabled()); + $this->setExpirationDate($version->getExpirationDate()); + $this->setSerializedRules($version->getSerializedRules()); + $this->setCreatedAt($version->getCreatedAt()); + $this->setUpdatedAt($version->getUpdatedAt()); + $this->setVersion($version->getVersion()); + + return $this; + } + + /** + * Gets the latest persisted version number for the current object + * + * @param ConnectionInterface $con the connection to use + * + * @return integer + */ + public function getLastVersionNumber($con = null) + { + $v = ChildCouponVersionQuery::create() + ->filterByCoupon($this) + ->orderByVersion('desc') + ->findOne($con); + if (!$v) { + return 0; + } + + return $v->getVersion(); + } + + /** + * Checks whether the current object is the latest one + * + * @param ConnectionInterface $con the connection to use + * + * @return Boolean + */ + public function isLastVersion($con = null) + { + return $this->getLastVersionNumber($con) == $this->getVersion(); + } + + /** + * Retrieves a version object for this entity and a version number + * + * @param integer $versionNumber The version number to read + * @param ConnectionInterface $con the connection to use + * + * @return ChildCouponVersion A version object + */ + public function getOneVersion($versionNumber, $con = null) + { + return ChildCouponVersionQuery::create() + ->filterByCoupon($this) + ->filterByVersion($versionNumber) + ->findOne($con); + } + + /** + * Gets all the versions of this object, in incremental order + * + * @param ConnectionInterface $con the connection to use + * + * @return ObjectCollection A list of ChildCouponVersion objects + */ + public function getAllVersions($con = null) + { + $criteria = new Criteria(); + $criteria->addAscendingOrderByColumn(CouponVersionTableMap::VERSION); + + return $this->getCouponVersions($criteria, $con); + } + + /** + * Compares the current object with another of its version. + * + * print_r($book->compareVersion(1)); + * => array( + * '1' => array('Title' => 'Book title at version 1'), + * '2' => array('Title' => 'Book title at version 2') + * ); + * + * + * @param integer $versionNumber + * @param string $keys Main key used for the result diff (versions|columns) + * @param ConnectionInterface $con the connection to use + * @param array $ignoredColumns The columns to exclude from the diff. + * + * @return array A list of differences + */ + public function compareVersion($versionNumber, $keys = 'columns', $con = null, $ignoredColumns = array()) + { + $fromVersion = $this->toArray(); + $toVersion = $this->getOneVersion($versionNumber, $con)->toArray(); + + return $this->computeDiff($fromVersion, $toVersion, $keys, $ignoredColumns); + } + + /** + * Compares two versions of the current object. + * + * print_r($book->compareVersions(1, 2)); + * => array( + * '1' => array('Title' => 'Book title at version 1'), + * '2' => array('Title' => 'Book title at version 2') + * ); + * + * + * @param integer $fromVersionNumber + * @param integer $toVersionNumber + * @param string $keys Main key used for the result diff (versions|columns) + * @param ConnectionInterface $con the connection to use + * @param array $ignoredColumns The columns to exclude from the diff. + * + * @return array A list of differences + */ + public function compareVersions($fromVersionNumber, $toVersionNumber, $keys = 'columns', $con = null, $ignoredColumns = array()) + { + $fromVersion = $this->getOneVersion($fromVersionNumber, $con)->toArray(); + $toVersion = $this->getOneVersion($toVersionNumber, $con)->toArray(); + + return $this->computeDiff($fromVersion, $toVersion, $keys, $ignoredColumns); + } + + /** + * Computes the diff between two versions. + * + * print_r($book->computeDiff(1, 2)); + * => array( + * '1' => array('Title' => 'Book title at version 1'), + * '2' => array('Title' => 'Book title at version 2') + * ); + * + * + * @param array $fromVersion An array representing the original version. + * @param array $toVersion An array representing the destination version. + * @param string $keys Main key used for the result diff (versions|columns). + * @param array $ignoredColumns The columns to exclude from the diff. + * + * @return array A list of differences + */ + protected function computeDiff($fromVersion, $toVersion, $keys = 'columns', $ignoredColumns = array()) + { + $fromVersionNumber = $fromVersion['Version']; + $toVersionNumber = $toVersion['Version']; + $ignoredColumns = array_merge(array( + 'Version', + ), $ignoredColumns); + $diff = array(); + foreach ($fromVersion as $key => $value) { + if (in_array($key, $ignoredColumns)) { + continue; + } + if ($toVersion[$key] != $value) { + switch ($keys) { + case 'versions': + $diff[$fromVersionNumber][$key] = $value; + $diff[$toVersionNumber][$key] = $toVersion[$key]; + break; + default: + $diff[$key] = array( + $fromVersionNumber => $value, + $toVersionNumber => $toVersion[$key], + ); + break; + } + } + } + + return $diff; + } + /** + * retrieve the last $number versions. + * + * @param Integer $number the number of record to return. + * @return PropelCollection|array \Thelia\Model\CouponVersion[] List of \Thelia\Model\CouponVersion objects + */ + public function getLastVersions($number = 10, $criteria = null, $con = null) + { + $criteria = ChildCouponVersionQuery::create(null, $criteria); + $criteria->addDescendingOrderByColumn(CouponVersionTableMap::VERSION); + $criteria->limit($number); + + return $this->getCouponVersions($criteria, $con); + } /** * Code to be run before persisting the object * @param ConnectionInterface $con diff --git a/core/lib/Thelia/Model/Base/CouponOrder.php b/core/lib/Thelia/Model/Base/CouponOrder.php index 32ae68fde..7d3c413b6 100644 --- a/core/lib/Thelia/Model/Base/CouponOrder.php +++ b/core/lib/Thelia/Model/Base/CouponOrder.php @@ -16,8 +16,10 @@ use Propel\Runtime\Exception\PropelException; use Propel\Runtime\Map\TableMap; use Propel\Runtime\Parser\AbstractParser; use Propel\Runtime\Util\PropelDateTime; +use Thelia\Model\Coupon as ChildCoupon; use Thelia\Model\CouponOrder as ChildCouponOrder; use Thelia\Model\CouponOrderQuery as ChildCouponOrderQuery; +use Thelia\Model\CouponQuery as ChildCouponQuery; use Thelia\Model\Order as ChildOrder; use Thelia\Model\OrderQuery as ChildOrderQuery; use Thelia\Model\Map\CouponOrderTableMap; @@ -97,6 +99,11 @@ abstract class CouponOrder implements ActiveRecordInterface */ protected $aOrder; + /** + * @var Coupon + */ + protected $aCoupon; + /** * Flag to prevent endless save loop, if this object is referenced * by another object which falls in this transaction. @@ -506,6 +513,10 @@ abstract class CouponOrder implements ActiveRecordInterface $this->modifiedColumns[] = CouponOrderTableMap::CODE; } + if ($this->aCoupon !== null && $this->aCoupon->getCode() !== $v) { + $this->aCoupon = null; + } + return $this; } // setCode() @@ -666,6 +677,9 @@ abstract class CouponOrder implements ActiveRecordInterface if ($this->aOrder !== null && $this->order_id !== $this->aOrder->getId()) { $this->aOrder = null; } + if ($this->aCoupon !== null && $this->code !== $this->aCoupon->getCode()) { + $this->aCoupon = null; + } } // ensureConsistency /** @@ -706,6 +720,7 @@ abstract class CouponOrder implements ActiveRecordInterface if ($deep) { // also de-associate any related objects? $this->aOrder = null; + $this->aCoupon = null; } // if (deep) } @@ -840,6 +855,13 @@ abstract class CouponOrder implements ActiveRecordInterface $this->setOrder($this->aOrder); } + if ($this->aCoupon !== null) { + if ($this->aCoupon->isModified() || $this->aCoupon->isNew()) { + $affectedRows += $this->aCoupon->save($con); + } + $this->setCoupon($this->aCoupon); + } + if ($this->isNew() || $this->isModified()) { // persist changes if ($this->isNew()) { @@ -1050,6 +1072,9 @@ abstract class CouponOrder implements ActiveRecordInterface if (null !== $this->aOrder) { $result['Order'] = $this->aOrder->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); } + if (null !== $this->aCoupon) { + $result['Coupon'] = $this->aCoupon->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); + } } return $result; @@ -1296,6 +1321,59 @@ abstract class CouponOrder implements ActiveRecordInterface return $this->aOrder; } + /** + * Declares an association between this object and a ChildCoupon object. + * + * @param ChildCoupon $v + * @return \Thelia\Model\CouponOrder The current object (for fluent API support) + * @throws PropelException + */ + public function setCoupon(ChildCoupon $v = null) + { + if ($v === null) { + $this->setCode(NULL); + } else { + $this->setCode($v->getCode()); + } + + $this->aCoupon = $v; + + // Add binding for other direction of this n:n relationship. + // If this object has already been added to the ChildCoupon object, it will not be re-added. + if ($v !== null) { + $v->addCouponOrder($this); + } + + + return $this; + } + + + /** + * Get the associated ChildCoupon object + * + * @param ConnectionInterface $con Optional Connection object. + * @return ChildCoupon The associated ChildCoupon object. + * @throws PropelException + */ + public function getCoupon(ConnectionInterface $con = null) + { + if ($this->aCoupon === null && (($this->code !== "" && $this->code !== null))) { + $this->aCoupon = ChildCouponQuery::create() + ->filterByCouponOrder($this) // here + ->findOne($con); + /* The following can be used additionally to + guarantee the related object contains a reference + to this object. This level of coupling may, however, be + undesirable since it could result in an only partially populated collection + in the referenced object. + $this->aCoupon->addCouponOrders($this); + */ + } + + return $this->aCoupon; + } + /** * Clears the current object and sets all attributes to their default values */ @@ -1329,6 +1407,7 @@ abstract class CouponOrder implements ActiveRecordInterface } // if ($deep) $this->aOrder = null; + $this->aCoupon = null; } /** diff --git a/core/lib/Thelia/Model/Base/CouponOrderQuery.php b/core/lib/Thelia/Model/Base/CouponOrderQuery.php index 6897f56dd..e3a95ea1a 100644 --- a/core/lib/Thelia/Model/Base/CouponOrderQuery.php +++ b/core/lib/Thelia/Model/Base/CouponOrderQuery.php @@ -43,6 +43,10 @@ use Thelia\Model\Map\CouponOrderTableMap; * @method ChildCouponOrderQuery rightJoinOrder($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Order relation * @method ChildCouponOrderQuery innerJoinOrder($relationAlias = null) Adds a INNER JOIN clause to the query using the Order relation * + * @method ChildCouponOrderQuery leftJoinCoupon($relationAlias = null) Adds a LEFT JOIN clause to the query using the Coupon relation + * @method ChildCouponOrderQuery rightJoinCoupon($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Coupon relation + * @method ChildCouponOrderQuery innerJoinCoupon($relationAlias = null) Adds a INNER JOIN clause to the query using the Coupon relation + * * @method ChildCouponOrder findOne(ConnectionInterface $con = null) Return the first ChildCouponOrder matching the query * @method ChildCouponOrder findOneOrCreate(ConnectionInterface $con = null) Return the first ChildCouponOrder matching the query, or a new ChildCouponOrder object populated from the query conditions when no match is found * @@ -551,6 +555,81 @@ abstract class CouponOrderQuery extends ModelCriteria ->useQuery($relationAlias ? $relationAlias : 'Order', '\Thelia\Model\OrderQuery'); } + /** + * Filter the query by a related \Thelia\Model\Coupon object + * + * @param \Thelia\Model\Coupon|ObjectCollection $coupon The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponOrderQuery The current query, for fluid interface + */ + public function filterByCoupon($coupon, $comparison = null) + { + if ($coupon instanceof \Thelia\Model\Coupon) { + return $this + ->addUsingAlias(CouponOrderTableMap::CODE, $coupon->getCode(), $comparison); + } elseif ($coupon instanceof ObjectCollection) { + if (null === $comparison) { + $comparison = Criteria::IN; + } + + return $this + ->addUsingAlias(CouponOrderTableMap::CODE, $coupon->toKeyValue('PrimaryKey', 'Code'), $comparison); + } else { + throw new PropelException('filterByCoupon() only accepts arguments of type \Thelia\Model\Coupon or Collection'); + } + } + + /** + * Adds a JOIN clause to the query using the Coupon relation + * + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return ChildCouponOrderQuery The current query, for fluid interface + */ + public function joinCoupon($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + $tableMap = $this->getTableMap(); + $relationMap = $tableMap->getRelation('Coupon'); + + // create a ModelJoin object for this join + $join = new ModelJoin(); + $join->setJoinType($joinType); + $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); + if ($previousJoin = $this->getPreviousJoin()) { + $join->setPreviousJoin($previousJoin); + } + + // add the ModelJoin to the current object + if ($relationAlias) { + $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); + $this->addJoinObject($join, $relationAlias); + } else { + $this->addJoinObject($join, 'Coupon'); + } + + return $this; + } + + /** + * Use the Coupon relation Coupon object + * + * @see useQuery() + * + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return \Thelia\Model\CouponQuery A secondary query class using the current class as primary query + */ + public function useCouponQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + return $this + ->joinCoupon($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'Coupon', '\Thelia\Model\CouponQuery'); + } + /** * Exclude object from result * diff --git a/core/lib/Thelia/Model/Base/CouponQuery.php b/core/lib/Thelia/Model/Base/CouponQuery.php index 23fdd2e4c..fa5700786 100644 --- a/core/lib/Thelia/Model/Base/CouponQuery.php +++ b/core/lib/Thelia/Model/Base/CouponQuery.php @@ -13,6 +13,7 @@ use Propel\Runtime\Collection\ObjectCollection; use Propel\Runtime\Connection\ConnectionInterface; use Propel\Runtime\Exception\PropelException; use Thelia\Model\Coupon as ChildCoupon; +use Thelia\Model\CouponI18nQuery as ChildCouponI18nQuery; use Thelia\Model\CouponQuery as ChildCouponQuery; use Thelia\Model\Map\CouponTableMap; @@ -23,63 +24,94 @@ use Thelia\Model\Map\CouponTableMap; * * @method ChildCouponQuery orderById($order = Criteria::ASC) Order by the id column * @method ChildCouponQuery orderByCode($order = Criteria::ASC) Order by the code column - * @method ChildCouponQuery orderByAction($order = Criteria::ASC) Order by the action column + * @method ChildCouponQuery orderByType($order = Criteria::ASC) Order by the type column + * @method ChildCouponQuery orderByTitle($order = Criteria::ASC) Order by the title column + * @method ChildCouponQuery orderByShortDescription($order = Criteria::ASC) Order by the short_description column + * @method ChildCouponQuery orderByDescription($order = Criteria::ASC) Order by the description column * @method ChildCouponQuery orderByValue($order = Criteria::ASC) Order by the value column - * @method ChildCouponQuery orderByUsed($order = Criteria::ASC) Order by the used column - * @method ChildCouponQuery orderByAvailableSince($order = Criteria::ASC) Order by the available_since column - * @method ChildCouponQuery orderByDateLimit($order = Criteria::ASC) Order by the date_limit column - * @method ChildCouponQuery orderByActivate($order = Criteria::ASC) Order by the activate column + * @method ChildCouponQuery orderByIsUsed($order = Criteria::ASC) Order by the is_used column + * @method ChildCouponQuery orderByIsEnabled($order = Criteria::ASC) Order by the is_enabled column + * @method ChildCouponQuery orderByExpirationDate($order = Criteria::ASC) Order by the expiration_date column + * @method ChildCouponQuery orderBySerializedRules($order = Criteria::ASC) Order by the serialized_rules column * @method ChildCouponQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column * @method ChildCouponQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column + * @method ChildCouponQuery orderByVersion($order = Criteria::ASC) Order by the version column * * @method ChildCouponQuery groupById() Group by the id column * @method ChildCouponQuery groupByCode() Group by the code column - * @method ChildCouponQuery groupByAction() Group by the action column + * @method ChildCouponQuery groupByType() Group by the type column + * @method ChildCouponQuery groupByTitle() Group by the title column + * @method ChildCouponQuery groupByShortDescription() Group by the short_description column + * @method ChildCouponQuery groupByDescription() Group by the description column * @method ChildCouponQuery groupByValue() Group by the value column - * @method ChildCouponQuery groupByUsed() Group by the used column - * @method ChildCouponQuery groupByAvailableSince() Group by the available_since column - * @method ChildCouponQuery groupByDateLimit() Group by the date_limit column - * @method ChildCouponQuery groupByActivate() Group by the activate column + * @method ChildCouponQuery groupByIsUsed() Group by the is_used column + * @method ChildCouponQuery groupByIsEnabled() Group by the is_enabled column + * @method ChildCouponQuery groupByExpirationDate() Group by the expiration_date column + * @method ChildCouponQuery groupBySerializedRules() Group by the serialized_rules column * @method ChildCouponQuery groupByCreatedAt() Group by the created_at column * @method ChildCouponQuery groupByUpdatedAt() Group by the updated_at column + * @method ChildCouponQuery groupByVersion() Group by the version column * * @method ChildCouponQuery leftJoin($relation) Adds a LEFT JOIN clause to the query * @method ChildCouponQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query * @method ChildCouponQuery innerJoin($relation) Adds a INNER JOIN clause to the query * - * @method ChildCouponQuery leftJoinCouponRule($relationAlias = null) Adds a LEFT JOIN clause to the query using the CouponRule relation - * @method ChildCouponQuery rightJoinCouponRule($relationAlias = null) Adds a RIGHT JOIN clause to the query using the CouponRule relation - * @method ChildCouponQuery innerJoinCouponRule($relationAlias = null) Adds a INNER JOIN clause to the query using the CouponRule relation + * @method ChildCouponQuery leftJoinCouponOrder($relationAlias = null) Adds a LEFT JOIN clause to the query using the CouponOrder relation + * @method ChildCouponQuery rightJoinCouponOrder($relationAlias = null) Adds a RIGHT JOIN clause to the query using the CouponOrder relation + * @method ChildCouponQuery innerJoinCouponOrder($relationAlias = null) Adds a INNER JOIN clause to the query using the CouponOrder relation + * + * @method ChildCouponQuery leftJoinCouponI18n($relationAlias = null) Adds a LEFT JOIN clause to the query using the CouponI18n relation + * @method ChildCouponQuery rightJoinCouponI18n($relationAlias = null) Adds a RIGHT JOIN clause to the query using the CouponI18n relation + * @method ChildCouponQuery innerJoinCouponI18n($relationAlias = null) Adds a INNER JOIN clause to the query using the CouponI18n relation + * + * @method ChildCouponQuery leftJoinCouponVersion($relationAlias = null) Adds a LEFT JOIN clause to the query using the CouponVersion relation + * @method ChildCouponQuery rightJoinCouponVersion($relationAlias = null) Adds a RIGHT JOIN clause to the query using the CouponVersion relation + * @method ChildCouponQuery innerJoinCouponVersion($relationAlias = null) Adds a INNER JOIN clause to the query using the CouponVersion relation * * @method ChildCoupon findOne(ConnectionInterface $con = null) Return the first ChildCoupon matching the query * @method ChildCoupon findOneOrCreate(ConnectionInterface $con = null) Return the first ChildCoupon matching the query, or a new ChildCoupon object populated from the query conditions when no match is found * * @method ChildCoupon findOneById(int $id) Return the first ChildCoupon filtered by the id column * @method ChildCoupon findOneByCode(string $code) Return the first ChildCoupon filtered by the code column - * @method ChildCoupon findOneByAction(string $action) Return the first ChildCoupon filtered by the action column + * @method ChildCoupon findOneByType(string $type) Return the first ChildCoupon filtered by the type column + * @method ChildCoupon findOneByTitle(string $title) Return the first ChildCoupon filtered by the title column + * @method ChildCoupon findOneByShortDescription(string $short_description) Return the first ChildCoupon filtered by the short_description column + * @method ChildCoupon findOneByDescription(string $description) Return the first ChildCoupon filtered by the description column * @method ChildCoupon findOneByValue(double $value) Return the first ChildCoupon filtered by the value column - * @method ChildCoupon findOneByUsed(int $used) Return the first ChildCoupon filtered by the used column - * @method ChildCoupon findOneByAvailableSince(string $available_since) Return the first ChildCoupon filtered by the available_since column - * @method ChildCoupon findOneByDateLimit(string $date_limit) Return the first ChildCoupon filtered by the date_limit column - * @method ChildCoupon findOneByActivate(int $activate) Return the first ChildCoupon filtered by the activate column + * @method ChildCoupon findOneByIsUsed(int $is_used) Return the first ChildCoupon filtered by the is_used column + * @method ChildCoupon findOneByIsEnabled(int $is_enabled) Return the first ChildCoupon filtered by the is_enabled column + * @method ChildCoupon findOneByExpirationDate(string $expiration_date) Return the first ChildCoupon filtered by the expiration_date column + * @method ChildCoupon findOneBySerializedRules(string $serialized_rules) Return the first ChildCoupon filtered by the serialized_rules column * @method ChildCoupon findOneByCreatedAt(string $created_at) Return the first ChildCoupon filtered by the created_at column * @method ChildCoupon findOneByUpdatedAt(string $updated_at) Return the first ChildCoupon filtered by the updated_at column + * @method ChildCoupon findOneByVersion(int $version) Return the first ChildCoupon filtered by the version column * * @method array findById(int $id) Return ChildCoupon objects filtered by the id column * @method array findByCode(string $code) Return ChildCoupon objects filtered by the code column - * @method array findByAction(string $action) Return ChildCoupon objects filtered by the action column + * @method array findByType(string $type) Return ChildCoupon objects filtered by the type column + * @method array findByTitle(string $title) Return ChildCoupon objects filtered by the title column + * @method array findByShortDescription(string $short_description) Return ChildCoupon objects filtered by the short_description column + * @method array findByDescription(string $description) Return ChildCoupon objects filtered by the description column * @method array findByValue(double $value) Return ChildCoupon objects filtered by the value column - * @method array findByUsed(int $used) Return ChildCoupon objects filtered by the used column - * @method array findByAvailableSince(string $available_since) Return ChildCoupon objects filtered by the available_since column - * @method array findByDateLimit(string $date_limit) Return ChildCoupon objects filtered by the date_limit column - * @method array findByActivate(int $activate) Return ChildCoupon objects filtered by the activate column + * @method array findByIsUsed(int $is_used) Return ChildCoupon objects filtered by the is_used column + * @method array findByIsEnabled(int $is_enabled) Return ChildCoupon objects filtered by the is_enabled column + * @method array findByExpirationDate(string $expiration_date) Return ChildCoupon objects filtered by the expiration_date column + * @method array findBySerializedRules(string $serialized_rules) Return ChildCoupon objects filtered by the serialized_rules column * @method array findByCreatedAt(string $created_at) Return ChildCoupon objects filtered by the created_at column * @method array findByUpdatedAt(string $updated_at) Return ChildCoupon objects filtered by the updated_at column + * @method array findByVersion(int $version) Return ChildCoupon objects filtered by the version column * */ abstract class CouponQuery extends ModelCriteria { + // versionable behavior + + /** + * Whether the versioning is enabled + */ + static $isVersioningEnabled = true; + /** * Initializes internal state of \Thelia\Model\Base\CouponQuery object. * @@ -163,7 +195,7 @@ abstract class CouponQuery extends ModelCriteria */ protected function findPkSimple($key, $con) { - $sql = 'SELECT ID, CODE, ACTION, VALUE, USED, AVAILABLE_SINCE, DATE_LIMIT, ACTIVATE, CREATED_AT, UPDATED_AT FROM coupon WHERE ID = :p0'; + $sql = 'SELECT ID, CODE, TYPE, TITLE, SHORT_DESCRIPTION, DESCRIPTION, VALUE, IS_USED, IS_ENABLED, EXPIRATION_DATE, SERIALIZED_RULES, CREATED_AT, UPDATED_AT, VERSION FROM coupon WHERE ID = :p0'; try { $stmt = $con->prepare($sql); $stmt->bindValue(':p0', $key, PDO::PARAM_INT); @@ -323,32 +355,119 @@ abstract class CouponQuery extends ModelCriteria } /** - * Filter the query on the action column + * Filter the query on the type column * * Example usage: * - * $query->filterByAction('fooValue'); // WHERE action = 'fooValue' - * $query->filterByAction('%fooValue%'); // WHERE action LIKE '%fooValue%' + * $query->filterByType('fooValue'); // WHERE type = 'fooValue' + * $query->filterByType('%fooValue%'); // WHERE type LIKE '%fooValue%' * * - * @param string $action The value to use as filter. + * @param string $type The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponQuery The current query, for fluid interface */ - public function filterByAction($action = null, $comparison = null) + public function filterByType($type = null, $comparison = null) { if (null === $comparison) { - if (is_array($action)) { + if (is_array($type)) { $comparison = Criteria::IN; - } elseif (preg_match('/[\%\*]/', $action)) { - $action = str_replace('*', '%', $action); + } elseif (preg_match('/[\%\*]/', $type)) { + $type = str_replace('*', '%', $type); $comparison = Criteria::LIKE; } } - return $this->addUsingAlias(CouponTableMap::ACTION, $action, $comparison); + return $this->addUsingAlias(CouponTableMap::TYPE, $type, $comparison); + } + + /** + * Filter the query on the title column + * + * Example usage: + * + * $query->filterByTitle('fooValue'); // WHERE title = 'fooValue' + * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' + * + * + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponQuery The current query, for fluid interface + */ + public function filterByTitle($title = null, $comparison = null) + { + if (null === $comparison) { + if (is_array($title)) { + $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $title)) { + $title = str_replace('*', '%', $title); + $comparison = Criteria::LIKE; + } + } + + return $this->addUsingAlias(CouponTableMap::TITLE, $title, $comparison); + } + + /** + * Filter the query on the short_description column + * + * Example usage: + * + * $query->filterByShortDescription('fooValue'); // WHERE short_description = 'fooValue' + * $query->filterByShortDescription('%fooValue%'); // WHERE short_description LIKE '%fooValue%' + * + * + * @param string $shortDescription The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponQuery The current query, for fluid interface + */ + public function filterByShortDescription($shortDescription = null, $comparison = null) + { + if (null === $comparison) { + if (is_array($shortDescription)) { + $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $shortDescription)) { + $shortDescription = str_replace('*', '%', $shortDescription); + $comparison = Criteria::LIKE; + } + } + + return $this->addUsingAlias(CouponTableMap::SHORT_DESCRIPTION, $shortDescription, $comparison); + } + + /** + * Filter the query on the description column + * + * Example usage: + * + * $query->filterByDescription('fooValue'); // WHERE description = 'fooValue' + * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' + * + * + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponQuery The current query, for fluid interface + */ + public function filterByDescription($description = null, $comparison = null) + { + if (null === $comparison) { + if (is_array($description)) { + $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $description)) { + $description = str_replace('*', '%', $description); + $comparison = Criteria::LIKE; + } + } + + return $this->addUsingAlias(CouponTableMap::DESCRIPTION, $description, $comparison); } /** @@ -393,16 +512,16 @@ abstract class CouponQuery extends ModelCriteria } /** - * Filter the query on the used column + * Filter the query on the is_used column * * Example usage: * - * $query->filterByUsed(1234); // WHERE used = 1234 - * $query->filterByUsed(array(12, 34)); // WHERE used IN (12, 34) - * $query->filterByUsed(array('min' => 12)); // WHERE used > 12 + * $query->filterByIsUsed(1234); // WHERE is_used = 1234 + * $query->filterByIsUsed(array(12, 34)); // WHERE is_used IN (12, 34) + * $query->filterByIsUsed(array('min' => 12)); // WHERE is_used > 12 * * - * @param mixed $used The value to use as filter. + * @param mixed $isUsed The value to use as filter. * Use scalar values for equality. * Use array values for in_array() equivalent. * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. @@ -410,16 +529,16 @@ abstract class CouponQuery extends ModelCriteria * * @return ChildCouponQuery The current query, for fluid interface */ - public function filterByUsed($used = null, $comparison = null) + public function filterByIsUsed($isUsed = null, $comparison = null) { - if (is_array($used)) { + if (is_array($isUsed)) { $useMinMax = false; - if (isset($used['min'])) { - $this->addUsingAlias(CouponTableMap::USED, $used['min'], Criteria::GREATER_EQUAL); + if (isset($isUsed['min'])) { + $this->addUsingAlias(CouponTableMap::IS_USED, $isUsed['min'], Criteria::GREATER_EQUAL); $useMinMax = true; } - if (isset($used['max'])) { - $this->addUsingAlias(CouponTableMap::USED, $used['max'], Criteria::LESS_EQUAL); + if (isset($isUsed['max'])) { + $this->addUsingAlias(CouponTableMap::IS_USED, $isUsed['max'], Criteria::LESS_EQUAL); $useMinMax = true; } if ($useMinMax) { @@ -430,20 +549,61 @@ abstract class CouponQuery extends ModelCriteria } } - return $this->addUsingAlias(CouponTableMap::USED, $used, $comparison); + return $this->addUsingAlias(CouponTableMap::IS_USED, $isUsed, $comparison); } /** - * Filter the query on the available_since column + * Filter the query on the is_enabled column * * Example usage: * - * $query->filterByAvailableSince('2011-03-14'); // WHERE available_since = '2011-03-14' - * $query->filterByAvailableSince('now'); // WHERE available_since = '2011-03-14' - * $query->filterByAvailableSince(array('max' => 'yesterday')); // WHERE available_since > '2011-03-13' + * $query->filterByIsEnabled(1234); // WHERE is_enabled = 1234 + * $query->filterByIsEnabled(array(12, 34)); // WHERE is_enabled IN (12, 34) + * $query->filterByIsEnabled(array('min' => 12)); // WHERE is_enabled > 12 * * - * @param mixed $availableSince The value to use as filter. + * @param mixed $isEnabled The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponQuery The current query, for fluid interface + */ + public function filterByIsEnabled($isEnabled = null, $comparison = null) + { + if (is_array($isEnabled)) { + $useMinMax = false; + if (isset($isEnabled['min'])) { + $this->addUsingAlias(CouponTableMap::IS_ENABLED, $isEnabled['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($isEnabled['max'])) { + $this->addUsingAlias(CouponTableMap::IS_ENABLED, $isEnabled['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(CouponTableMap::IS_ENABLED, $isEnabled, $comparison); + } + + /** + * Filter the query on the expiration_date column + * + * Example usage: + * + * $query->filterByExpirationDate('2011-03-14'); // WHERE expiration_date = '2011-03-14' + * $query->filterByExpirationDate('now'); // WHERE expiration_date = '2011-03-14' + * $query->filterByExpirationDate(array('max' => 'yesterday')); // WHERE expiration_date > '2011-03-13' + * + * + * @param mixed $expirationDate The value to use as filter. * Values can be integers (unix timestamps), DateTime objects, or strings. * Empty strings are treated as NULL. * Use scalar values for equality. @@ -453,16 +613,16 @@ abstract class CouponQuery extends ModelCriteria * * @return ChildCouponQuery The current query, for fluid interface */ - public function filterByAvailableSince($availableSince = null, $comparison = null) + public function filterByExpirationDate($expirationDate = null, $comparison = null) { - if (is_array($availableSince)) { + if (is_array($expirationDate)) { $useMinMax = false; - if (isset($availableSince['min'])) { - $this->addUsingAlias(CouponTableMap::AVAILABLE_SINCE, $availableSince['min'], Criteria::GREATER_EQUAL); + if (isset($expirationDate['min'])) { + $this->addUsingAlias(CouponTableMap::EXPIRATION_DATE, $expirationDate['min'], Criteria::GREATER_EQUAL); $useMinMax = true; } - if (isset($availableSince['max'])) { - $this->addUsingAlias(CouponTableMap::AVAILABLE_SINCE, $availableSince['max'], Criteria::LESS_EQUAL); + if (isset($expirationDate['max'])) { + $this->addUsingAlias(CouponTableMap::EXPIRATION_DATE, $expirationDate['max'], Criteria::LESS_EQUAL); $useMinMax = true; } if ($useMinMax) { @@ -473,91 +633,36 @@ abstract class CouponQuery extends ModelCriteria } } - return $this->addUsingAlias(CouponTableMap::AVAILABLE_SINCE, $availableSince, $comparison); + return $this->addUsingAlias(CouponTableMap::EXPIRATION_DATE, $expirationDate, $comparison); } /** - * Filter the query on the date_limit column + * Filter the query on the serialized_rules column * * Example usage: * - * $query->filterByDateLimit('2011-03-14'); // WHERE date_limit = '2011-03-14' - * $query->filterByDateLimit('now'); // WHERE date_limit = '2011-03-14' - * $query->filterByDateLimit(array('max' => 'yesterday')); // WHERE date_limit > '2011-03-13' + * $query->filterBySerializedRules('fooValue'); // WHERE serialized_rules = 'fooValue' + * $query->filterBySerializedRules('%fooValue%'); // WHERE serialized_rules LIKE '%fooValue%' * * - * @param mixed $dateLimit The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $serializedRules The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponQuery The current query, for fluid interface */ - public function filterByDateLimit($dateLimit = null, $comparison = null) + public function filterBySerializedRules($serializedRules = null, $comparison = null) { - if (is_array($dateLimit)) { - $useMinMax = false; - if (isset($dateLimit['min'])) { - $this->addUsingAlias(CouponTableMap::DATE_LIMIT, $dateLimit['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($dateLimit['max'])) { - $this->addUsingAlias(CouponTableMap::DATE_LIMIT, $dateLimit['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { + if (null === $comparison) { + if (is_array($serializedRules)) { $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $serializedRules)) { + $serializedRules = str_replace('*', '%', $serializedRules); + $comparison = Criteria::LIKE; } } - return $this->addUsingAlias(CouponTableMap::DATE_LIMIT, $dateLimit, $comparison); - } - - /** - * Filter the query on the activate column - * - * Example usage: - * - * $query->filterByActivate(1234); // WHERE activate = 1234 - * $query->filterByActivate(array(12, 34)); // WHERE activate IN (12, 34) - * $query->filterByActivate(array('min' => 12)); // WHERE activate > 12 - * - * - * @param mixed $activate The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildCouponQuery The current query, for fluid interface - */ - public function filterByActivate($activate = null, $comparison = null) - { - if (is_array($activate)) { - $useMinMax = false; - if (isset($activate['min'])) { - $this->addUsingAlias(CouponTableMap::ACTIVATE, $activate['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($activate['max'])) { - $this->addUsingAlias(CouponTableMap::ACTIVATE, $activate['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { - $comparison = Criteria::IN; - } - } - - return $this->addUsingAlias(CouponTableMap::ACTIVATE, $activate, $comparison); + return $this->addUsingAlias(CouponTableMap::SERIALIZED_RULES, $serializedRules, $comparison); } /** @@ -647,40 +752,81 @@ abstract class CouponQuery extends ModelCriteria } /** - * Filter the query by a related \Thelia\Model\CouponRule object + * Filter the query on the version column * - * @param \Thelia\Model\CouponRule|ObjectCollection $couponRule the related object to use as filter + * Example usage: + * + * $query->filterByVersion(1234); // WHERE version = 1234 + * $query->filterByVersion(array(12, 34)); // WHERE version IN (12, 34) + * $query->filterByVersion(array('min' => 12)); // WHERE version > 12 + * + * + * @param mixed $version The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponQuery The current query, for fluid interface + */ + public function filterByVersion($version = null, $comparison = null) + { + if (is_array($version)) { + $useMinMax = false; + if (isset($version['min'])) { + $this->addUsingAlias(CouponTableMap::VERSION, $version['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($version['max'])) { + $this->addUsingAlias(CouponTableMap::VERSION, $version['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(CouponTableMap::VERSION, $version, $comparison); + } + + /** + * Filter the query by a related \Thelia\Model\CouponOrder object + * + * @param \Thelia\Model\CouponOrder|ObjectCollection $couponOrder the related object to use as filter * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponQuery The current query, for fluid interface */ - public function filterByCouponRule($couponRule, $comparison = null) + public function filterByCouponOrder($couponOrder, $comparison = null) { - if ($couponRule instanceof \Thelia\Model\CouponRule) { + if ($couponOrder instanceof \Thelia\Model\CouponOrder) { return $this - ->addUsingAlias(CouponTableMap::ID, $couponRule->getCouponId(), $comparison); - } elseif ($couponRule instanceof ObjectCollection) { + ->addUsingAlias(CouponTableMap::CODE, $couponOrder->getCode(), $comparison); + } elseif ($couponOrder instanceof ObjectCollection) { return $this - ->useCouponRuleQuery() - ->filterByPrimaryKeys($couponRule->getPrimaryKeys()) + ->useCouponOrderQuery() + ->filterByPrimaryKeys($couponOrder->getPrimaryKeys()) ->endUse(); } else { - throw new PropelException('filterByCouponRule() only accepts arguments of type \Thelia\Model\CouponRule or Collection'); + throw new PropelException('filterByCouponOrder() only accepts arguments of type \Thelia\Model\CouponOrder or Collection'); } } /** - * Adds a JOIN clause to the query using the CouponRule relation + * Adds a JOIN clause to the query using the CouponOrder relation * * @param string $relationAlias optional alias for the relation * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return ChildCouponQuery The current query, for fluid interface */ - public function joinCouponRule($relationAlias = null, $joinType = Criteria::INNER_JOIN) + public function joinCouponOrder($relationAlias = null, $joinType = Criteria::INNER_JOIN) { $tableMap = $this->getTableMap(); - $relationMap = $tableMap->getRelation('CouponRule'); + $relationMap = $tableMap->getRelation('CouponOrder'); // create a ModelJoin object for this join $join = new ModelJoin(); @@ -695,14 +841,14 @@ abstract class CouponQuery extends ModelCriteria $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); $this->addJoinObject($join, $relationAlias); } else { - $this->addJoinObject($join, 'CouponRule'); + $this->addJoinObject($join, 'CouponOrder'); } return $this; } /** - * Use the CouponRule relation CouponRule object + * Use the CouponOrder relation CouponOrder object * * @see useQuery() * @@ -710,13 +856,159 @@ abstract class CouponQuery extends ModelCriteria * to be used as main alias in the secondary query * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return \Thelia\Model\CouponRuleQuery A secondary query class using the current class as primary query + * @return \Thelia\Model\CouponOrderQuery A secondary query class using the current class as primary query */ - public function useCouponRuleQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) + public function useCouponOrderQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { return $this - ->joinCouponRule($relationAlias, $joinType) - ->useQuery($relationAlias ? $relationAlias : 'CouponRule', '\Thelia\Model\CouponRuleQuery'); + ->joinCouponOrder($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'CouponOrder', '\Thelia\Model\CouponOrderQuery'); + } + + /** + * Filter the query by a related \Thelia\Model\CouponI18n object + * + * @param \Thelia\Model\CouponI18n|ObjectCollection $couponI18n the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponQuery The current query, for fluid interface + */ + public function filterByCouponI18n($couponI18n, $comparison = null) + { + if ($couponI18n instanceof \Thelia\Model\CouponI18n) { + return $this + ->addUsingAlias(CouponTableMap::ID, $couponI18n->getId(), $comparison); + } elseif ($couponI18n instanceof ObjectCollection) { + return $this + ->useCouponI18nQuery() + ->filterByPrimaryKeys($couponI18n->getPrimaryKeys()) + ->endUse(); + } else { + throw new PropelException('filterByCouponI18n() only accepts arguments of type \Thelia\Model\CouponI18n or Collection'); + } + } + + /** + * Adds a JOIN clause to the query using the CouponI18n relation + * + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return ChildCouponQuery The current query, for fluid interface + */ + public function joinCouponI18n($relationAlias = null, $joinType = 'LEFT JOIN') + { + $tableMap = $this->getTableMap(); + $relationMap = $tableMap->getRelation('CouponI18n'); + + // create a ModelJoin object for this join + $join = new ModelJoin(); + $join->setJoinType($joinType); + $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); + if ($previousJoin = $this->getPreviousJoin()) { + $join->setPreviousJoin($previousJoin); + } + + // add the ModelJoin to the current object + if ($relationAlias) { + $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); + $this->addJoinObject($join, $relationAlias); + } else { + $this->addJoinObject($join, 'CouponI18n'); + } + + return $this; + } + + /** + * Use the CouponI18n relation CouponI18n object + * + * @see useQuery() + * + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return \Thelia\Model\CouponI18nQuery A secondary query class using the current class as primary query + */ + public function useCouponI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN') + { + return $this + ->joinCouponI18n($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'CouponI18n', '\Thelia\Model\CouponI18nQuery'); + } + + /** + * Filter the query by a related \Thelia\Model\CouponVersion object + * + * @param \Thelia\Model\CouponVersion|ObjectCollection $couponVersion the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponQuery The current query, for fluid interface + */ + public function filterByCouponVersion($couponVersion, $comparison = null) + { + if ($couponVersion instanceof \Thelia\Model\CouponVersion) { + return $this + ->addUsingAlias(CouponTableMap::ID, $couponVersion->getId(), $comparison); + } elseif ($couponVersion instanceof ObjectCollection) { + return $this + ->useCouponVersionQuery() + ->filterByPrimaryKeys($couponVersion->getPrimaryKeys()) + ->endUse(); + } else { + throw new PropelException('filterByCouponVersion() only accepts arguments of type \Thelia\Model\CouponVersion or Collection'); + } + } + + /** + * Adds a JOIN clause to the query using the CouponVersion relation + * + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return ChildCouponQuery The current query, for fluid interface + */ + public function joinCouponVersion($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + $tableMap = $this->getTableMap(); + $relationMap = $tableMap->getRelation('CouponVersion'); + + // create a ModelJoin object for this join + $join = new ModelJoin(); + $join->setJoinType($joinType); + $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); + if ($previousJoin = $this->getPreviousJoin()) { + $join->setPreviousJoin($previousJoin); + } + + // add the ModelJoin to the current object + if ($relationAlias) { + $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); + $this->addJoinObject($join, $relationAlias); + } else { + $this->addJoinObject($join, 'CouponVersion'); + } + + return $this; + } + + /** + * Use the CouponVersion relation CouponVersion object + * + * @see useQuery() + * + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return \Thelia\Model\CouponVersionQuery A secondary query class using the current class as primary query + */ + public function useCouponVersionQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + return $this + ->joinCouponVersion($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'CouponVersion', '\Thelia\Model\CouponVersionQuery'); } /** @@ -876,4 +1168,89 @@ abstract class CouponQuery extends ModelCriteria return $this->addAscendingOrderByColumn(CouponTableMap::CREATED_AT); } + // i18n behavior + + /** + * Adds a JOIN clause to the query using the i18n relation + * + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * + * @return ChildCouponQuery The current query, for fluid interface + */ + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + { + $relationName = $relationAlias ? $relationAlias : 'CouponI18n'; + + return $this + ->joinCouponI18n($relationAlias, $joinType) + ->addJoinCondition($relationName, $relationName . '.Locale = ?', $locale); + } + + /** + * Adds a JOIN clause to the query and hydrates the related I18n object. + * Shortcut for $c->joinI18n($locale)->with() + * + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * + * @return ChildCouponQuery The current query, for fluid interface + */ + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) + { + $this + ->joinI18n($locale, null, $joinType) + ->with('CouponI18n'); + $this->with['CouponI18n']->setIsWithOneToMany(false); + + return $this; + } + + /** + * Use the I18n relation query object + * + * @see useQuery() + * + * @param string $locale Locale to use for the join condition, e.g. 'fr_FR' + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join. + * + * @return ChildCouponI18nQuery A secondary query class using the current class as primary query + */ + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + { + return $this + ->joinI18n($locale, $relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'CouponI18n', '\Thelia\Model\CouponI18nQuery'); + } + + // versionable behavior + + /** + * Checks whether versioning is enabled + * + * @return boolean + */ + static public function isVersioningEnabled() + { + return self::$isVersioningEnabled; + } + + /** + * Enables versioning + */ + static public function enableVersioning() + { + self::$isVersioningEnabled = true; + } + + /** + * Disables versioning + */ + static public function disableVersioning() + { + self::$isVersioningEnabled = false; + } + } // CouponQuery diff --git a/core/lib/Thelia/Model/Base/Currency.php b/core/lib/Thelia/Model/Base/Currency.php index 77718992f..a5ada0790 100644 --- a/core/lib/Thelia/Model/Base/Currency.php +++ b/core/lib/Thelia/Model/Base/Currency.php @@ -149,7 +149,7 @@ abstract class Currency implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -2681,7 +2681,7 @@ abstract class Currency implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collOrders instanceof Collection) { @@ -2735,7 +2735,7 @@ abstract class Currency implements ActiveRecordInterface * * @return ChildCurrency The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -2759,7 +2759,7 @@ abstract class Currency implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildCurrencyI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collCurrencyI18ns) { @@ -2794,7 +2794,7 @@ abstract class Currency implements ActiveRecordInterface * * @return ChildCurrency The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildCurrencyI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/CurrencyI18n.php b/core/lib/Thelia/Model/Base/CurrencyI18n.php index eb86a87c4..52cd7fc5b 100644 --- a/core/lib/Thelia/Model/Base/CurrencyI18n.php +++ b/core/lib/Thelia/Model/Base/CurrencyI18n.php @@ -61,7 +61,7 @@ abstract class CurrencyI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -93,7 +93,7 @@ abstract class CurrencyI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -462,7 +462,7 @@ abstract class CurrencyI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/CurrencyQuery.php b/core/lib/Thelia/Model/Base/CurrencyQuery.php index eb4b1b2f7..9b4ecf51e 100644 --- a/core/lib/Thelia/Model/Base/CurrencyQuery.php +++ b/core/lib/Thelia/Model/Base/CurrencyQuery.php @@ -1025,7 +1025,7 @@ abstract class CurrencyQuery extends ModelCriteria * * @return ChildCurrencyQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'CurrencyI18n'; @@ -1043,7 +1043,7 @@ abstract class CurrencyQuery extends ModelCriteria * * @return ChildCurrencyQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -1064,7 +1064,7 @@ abstract class CurrencyQuery extends ModelCriteria * * @return ChildCurrencyI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/CustomerTitle.php b/core/lib/Thelia/Model/Base/CustomerTitle.php index 5f8b11dd9..7f4c30d09 100644 --- a/core/lib/Thelia/Model/Base/CustomerTitle.php +++ b/core/lib/Thelia/Model/Base/CustomerTitle.php @@ -124,7 +124,7 @@ abstract class CustomerTitle implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -2106,7 +2106,7 @@ abstract class CustomerTitle implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collCustomers instanceof Collection) { @@ -2156,7 +2156,7 @@ abstract class CustomerTitle implements ActiveRecordInterface * * @return ChildCustomerTitle The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -2180,7 +2180,7 @@ abstract class CustomerTitle implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildCustomerTitleI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collCustomerTitleI18ns) { @@ -2215,7 +2215,7 @@ abstract class CustomerTitle implements ActiveRecordInterface * * @return ChildCustomerTitle The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildCustomerTitleI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/CustomerTitleI18n.php b/core/lib/Thelia/Model/Base/CustomerTitleI18n.php index c68b87123..38e47ecda 100644 --- a/core/lib/Thelia/Model/Base/CustomerTitleI18n.php +++ b/core/lib/Thelia/Model/Base/CustomerTitleI18n.php @@ -61,7 +61,7 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -99,7 +99,7 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -500,7 +500,7 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/CustomerTitleQuery.php b/core/lib/Thelia/Model/Base/CustomerTitleQuery.php index ea34c8c91..1c4be4081 100644 --- a/core/lib/Thelia/Model/Base/CustomerTitleQuery.php +++ b/core/lib/Thelia/Model/Base/CustomerTitleQuery.php @@ -825,7 +825,7 @@ abstract class CustomerTitleQuery extends ModelCriteria * * @return ChildCustomerTitleQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'CustomerTitleI18n'; @@ -843,7 +843,7 @@ abstract class CustomerTitleQuery extends ModelCriteria * * @return ChildCustomerTitleQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -864,7 +864,7 @@ abstract class CustomerTitleQuery extends ModelCriteria * * @return ChildCustomerTitleI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/Feature.php b/core/lib/Thelia/Model/Base/Feature.php index 0dddd14e0..826de003f 100644 --- a/core/lib/Thelia/Model/Base/Feature.php +++ b/core/lib/Thelia/Model/Base/Feature.php @@ -139,7 +139,7 @@ abstract class Feature implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -2628,7 +2628,7 @@ abstract class Feature implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collFeatureAvs instanceof Collection) { @@ -2686,7 +2686,7 @@ abstract class Feature implements ActiveRecordInterface * * @return ChildFeature The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -2710,7 +2710,7 @@ abstract class Feature implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildFeatureI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collFeatureI18ns) { @@ -2745,7 +2745,7 @@ abstract class Feature implements ActiveRecordInterface * * @return ChildFeature The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildFeatureI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/FeatureAv.php b/core/lib/Thelia/Model/Base/FeatureAv.php index b09a27cec..818f352a0 100644 --- a/core/lib/Thelia/Model/Base/FeatureAv.php +++ b/core/lib/Thelia/Model/Base/FeatureAv.php @@ -122,7 +122,7 @@ abstract class FeatureAv implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -1900,7 +1900,7 @@ abstract class FeatureAv implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collFeatureProducts instanceof Collection) { @@ -1947,7 +1947,7 @@ abstract class FeatureAv implements ActiveRecordInterface * * @return ChildFeatureAv The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -1971,7 +1971,7 @@ abstract class FeatureAv implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildFeatureAvI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collFeatureAvI18ns) { @@ -2006,7 +2006,7 @@ abstract class FeatureAv implements ActiveRecordInterface * * @return ChildFeatureAv The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildFeatureAvI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/FeatureAvI18n.php b/core/lib/Thelia/Model/Base/FeatureAvI18n.php index 7cbca8129..aa524c430 100644 --- a/core/lib/Thelia/Model/Base/FeatureAvI18n.php +++ b/core/lib/Thelia/Model/Base/FeatureAvI18n.php @@ -61,7 +61,7 @@ abstract class FeatureAvI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class FeatureAvI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class FeatureAvI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/FeatureAvQuery.php b/core/lib/Thelia/Model/Base/FeatureAvQuery.php index fb3796c97..6b3af4ed9 100644 --- a/core/lib/Thelia/Model/Base/FeatureAvQuery.php +++ b/core/lib/Thelia/Model/Base/FeatureAvQuery.php @@ -841,7 +841,7 @@ abstract class FeatureAvQuery extends ModelCriteria * * @return ChildFeatureAvQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'FeatureAvI18n'; @@ -859,7 +859,7 @@ abstract class FeatureAvQuery extends ModelCriteria * * @return ChildFeatureAvQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -880,7 +880,7 @@ abstract class FeatureAvQuery extends ModelCriteria * * @return ChildFeatureAvI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/FeatureI18n.php b/core/lib/Thelia/Model/Base/FeatureI18n.php index 0ede8eddb..b6070932e 100644 --- a/core/lib/Thelia/Model/Base/FeatureI18n.php +++ b/core/lib/Thelia/Model/Base/FeatureI18n.php @@ -61,7 +61,7 @@ abstract class FeatureI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class FeatureI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class FeatureI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/FeatureQuery.php b/core/lib/Thelia/Model/Base/FeatureQuery.php index 9b00e812e..f1fc81a3f 100644 --- a/core/lib/Thelia/Model/Base/FeatureQuery.php +++ b/core/lib/Thelia/Model/Base/FeatureQuery.php @@ -931,7 +931,7 @@ abstract class FeatureQuery extends ModelCriteria * * @return ChildFeatureQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'FeatureI18n'; @@ -949,7 +949,7 @@ abstract class FeatureQuery extends ModelCriteria * * @return ChildFeatureQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -970,7 +970,7 @@ abstract class FeatureQuery extends ModelCriteria * * @return ChildFeatureI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/Folder.php b/core/lib/Thelia/Model/Base/Folder.php index 6ee28e7ff..1b0c80d94 100644 --- a/core/lib/Thelia/Model/Base/Folder.php +++ b/core/lib/Thelia/Model/Base/Folder.php @@ -180,7 +180,7 @@ abstract class Folder implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -3460,7 +3460,7 @@ abstract class Folder implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collRewritings instanceof Collection) { @@ -3526,7 +3526,7 @@ abstract class Folder implements ActiveRecordInterface * * @return ChildFolder The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -3550,7 +3550,7 @@ abstract class Folder implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildFolderI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collFolderI18ns) { @@ -3585,7 +3585,7 @@ abstract class Folder implements ActiveRecordInterface * * @return ChildFolder The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildFolderI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/FolderDocument.php b/core/lib/Thelia/Model/Base/FolderDocument.php index 31e7c57a6..25b68a842 100644 --- a/core/lib/Thelia/Model/Base/FolderDocument.php +++ b/core/lib/Thelia/Model/Base/FolderDocument.php @@ -120,7 +120,7 @@ abstract class FolderDocument implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -1640,7 +1640,7 @@ abstract class FolderDocument implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collFolderDocumentI18ns instanceof Collection) { @@ -1683,7 +1683,7 @@ abstract class FolderDocument implements ActiveRecordInterface * * @return ChildFolderDocument The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -1707,7 +1707,7 @@ abstract class FolderDocument implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildFolderDocumentI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collFolderDocumentI18ns) { @@ -1742,7 +1742,7 @@ abstract class FolderDocument implements ActiveRecordInterface * * @return ChildFolderDocument The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildFolderDocumentI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/FolderDocumentI18n.php b/core/lib/Thelia/Model/Base/FolderDocumentI18n.php index d39a49af7..520160758 100644 --- a/core/lib/Thelia/Model/Base/FolderDocumentI18n.php +++ b/core/lib/Thelia/Model/Base/FolderDocumentI18n.php @@ -61,7 +61,7 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/FolderDocumentQuery.php b/core/lib/Thelia/Model/Base/FolderDocumentQuery.php index b1c41a29e..85ed5c241 100644 --- a/core/lib/Thelia/Model/Base/FolderDocumentQuery.php +++ b/core/lib/Thelia/Model/Base/FolderDocumentQuery.php @@ -797,7 +797,7 @@ abstract class FolderDocumentQuery extends ModelCriteria * * @return ChildFolderDocumentQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'FolderDocumentI18n'; @@ -815,7 +815,7 @@ abstract class FolderDocumentQuery extends ModelCriteria * * @return ChildFolderDocumentQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -836,7 +836,7 @@ abstract class FolderDocumentQuery extends ModelCriteria * * @return ChildFolderDocumentI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/FolderI18n.php b/core/lib/Thelia/Model/Base/FolderI18n.php index fcdc66705..35e69d6a6 100644 --- a/core/lib/Thelia/Model/Base/FolderI18n.php +++ b/core/lib/Thelia/Model/Base/FolderI18n.php @@ -61,7 +61,7 @@ abstract class FolderI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class FolderI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class FolderI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/FolderImage.php b/core/lib/Thelia/Model/Base/FolderImage.php index 46c39060d..73bfd11b8 100644 --- a/core/lib/Thelia/Model/Base/FolderImage.php +++ b/core/lib/Thelia/Model/Base/FolderImage.php @@ -120,7 +120,7 @@ abstract class FolderImage implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -1640,7 +1640,7 @@ abstract class FolderImage implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collFolderImageI18ns instanceof Collection) { @@ -1683,7 +1683,7 @@ abstract class FolderImage implements ActiveRecordInterface * * @return ChildFolderImage The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -1707,7 +1707,7 @@ abstract class FolderImage implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildFolderImageI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collFolderImageI18ns) { @@ -1742,7 +1742,7 @@ abstract class FolderImage implements ActiveRecordInterface * * @return ChildFolderImage The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildFolderImageI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/FolderImageI18n.php b/core/lib/Thelia/Model/Base/FolderImageI18n.php index d5cc004d1..9096c8542 100644 --- a/core/lib/Thelia/Model/Base/FolderImageI18n.php +++ b/core/lib/Thelia/Model/Base/FolderImageI18n.php @@ -61,7 +61,7 @@ abstract class FolderImageI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class FolderImageI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class FolderImageI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/FolderImageQuery.php b/core/lib/Thelia/Model/Base/FolderImageQuery.php index ca12e098e..4ea930e20 100644 --- a/core/lib/Thelia/Model/Base/FolderImageQuery.php +++ b/core/lib/Thelia/Model/Base/FolderImageQuery.php @@ -797,7 +797,7 @@ abstract class FolderImageQuery extends ModelCriteria * * @return ChildFolderImageQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'FolderImageI18n'; @@ -815,7 +815,7 @@ abstract class FolderImageQuery extends ModelCriteria * * @return ChildFolderImageQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -836,7 +836,7 @@ abstract class FolderImageQuery extends ModelCriteria * * @return ChildFolderImageI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/FolderQuery.php b/core/lib/Thelia/Model/Base/FolderQuery.php index 893bb9819..22d2f3735 100644 --- a/core/lib/Thelia/Model/Base/FolderQuery.php +++ b/core/lib/Thelia/Model/Base/FolderQuery.php @@ -1262,7 +1262,7 @@ abstract class FolderQuery extends ModelCriteria * * @return ChildFolderQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'FolderI18n'; @@ -1280,7 +1280,7 @@ abstract class FolderQuery extends ModelCriteria * * @return ChildFolderQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -1301,7 +1301,7 @@ abstract class FolderQuery extends ModelCriteria * * @return ChildFolderI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/Group.php b/core/lib/Thelia/Model/Base/Group.php index 9cfde2bdc..6b66d5f39 100644 --- a/core/lib/Thelia/Model/Base/Group.php +++ b/core/lib/Thelia/Model/Base/Group.php @@ -139,7 +139,7 @@ abstract class Group implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -2786,7 +2786,7 @@ abstract class Group implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collAdminGroups instanceof Collection) { @@ -2848,7 +2848,7 @@ abstract class Group implements ActiveRecordInterface * * @return ChildGroup The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -2872,7 +2872,7 @@ abstract class Group implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildGroupI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collGroupI18ns) { @@ -2907,7 +2907,7 @@ abstract class Group implements ActiveRecordInterface * * @return ChildGroup The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildGroupI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/GroupI18n.php b/core/lib/Thelia/Model/Base/GroupI18n.php index 4de63ea63..de90d8863 100644 --- a/core/lib/Thelia/Model/Base/GroupI18n.php +++ b/core/lib/Thelia/Model/Base/GroupI18n.php @@ -61,7 +61,7 @@ abstract class GroupI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class GroupI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class GroupI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/GroupQuery.php b/core/lib/Thelia/Model/Base/GroupQuery.php index d0eded79b..8ca963848 100644 --- a/core/lib/Thelia/Model/Base/GroupQuery.php +++ b/core/lib/Thelia/Model/Base/GroupQuery.php @@ -891,7 +891,7 @@ abstract class GroupQuery extends ModelCriteria * * @return ChildGroupQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'GroupI18n'; @@ -909,7 +909,7 @@ abstract class GroupQuery extends ModelCriteria * * @return ChildGroupQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -930,7 +930,7 @@ abstract class GroupQuery extends ModelCriteria * * @return ChildGroupI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/Message.php b/core/lib/Thelia/Model/Base/Message.php index a2327f388..f39e4ecbe 100644 --- a/core/lib/Thelia/Model/Base/Message.php +++ b/core/lib/Thelia/Model/Base/Message.php @@ -141,7 +141,7 @@ abstract class Message implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -2056,7 +2056,7 @@ abstract class Message implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collMessageI18ns instanceof Collection) { @@ -2102,7 +2102,7 @@ abstract class Message implements ActiveRecordInterface * * @return ChildMessage The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -2126,7 +2126,7 @@ abstract class Message implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildMessageI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collMessageI18ns) { @@ -2161,7 +2161,7 @@ abstract class Message implements ActiveRecordInterface * * @return ChildMessage The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildMessageI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/MessageI18n.php b/core/lib/Thelia/Model/Base/MessageI18n.php index 4d1a532fe..545e75244 100644 --- a/core/lib/Thelia/Model/Base/MessageI18n.php +++ b/core/lib/Thelia/Model/Base/MessageI18n.php @@ -61,7 +61,7 @@ abstract class MessageI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -105,7 +105,7 @@ abstract class MessageI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -538,7 +538,7 @@ abstract class MessageI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/MessageQuery.php b/core/lib/Thelia/Model/Base/MessageQuery.php index cf0155f36..938a16aab 100644 --- a/core/lib/Thelia/Model/Base/MessageQuery.php +++ b/core/lib/Thelia/Model/Base/MessageQuery.php @@ -913,7 +913,7 @@ abstract class MessageQuery extends ModelCriteria * * @return ChildMessageQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'MessageI18n'; @@ -931,7 +931,7 @@ abstract class MessageQuery extends ModelCriteria * * @return ChildMessageQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -952,7 +952,7 @@ abstract class MessageQuery extends ModelCriteria * * @return ChildMessageI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/Module.php b/core/lib/Thelia/Model/Base/Module.php index c1ee2ed8d..ebe4b4c18 100644 --- a/core/lib/Thelia/Model/Base/Module.php +++ b/core/lib/Thelia/Model/Base/Module.php @@ -127,7 +127,7 @@ abstract class Module implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -1910,7 +1910,7 @@ abstract class Module implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collGroupModules instanceof Collection) { @@ -1956,7 +1956,7 @@ abstract class Module implements ActiveRecordInterface * * @return ChildModule The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -1980,7 +1980,7 @@ abstract class Module implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildModuleI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collModuleI18ns) { @@ -2015,7 +2015,7 @@ abstract class Module implements ActiveRecordInterface * * @return ChildModule The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildModuleI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/ModuleI18n.php b/core/lib/Thelia/Model/Base/ModuleI18n.php index fbb4293ba..54cf305e4 100644 --- a/core/lib/Thelia/Model/Base/ModuleI18n.php +++ b/core/lib/Thelia/Model/Base/ModuleI18n.php @@ -61,7 +61,7 @@ abstract class ModuleI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class ModuleI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class ModuleI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/ModuleQuery.php b/core/lib/Thelia/Model/Base/ModuleQuery.php index e1bd9de68..7db21ca22 100644 --- a/core/lib/Thelia/Model/Base/ModuleQuery.php +++ b/core/lib/Thelia/Model/Base/ModuleQuery.php @@ -838,7 +838,7 @@ abstract class ModuleQuery extends ModelCriteria * * @return ChildModuleQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'ModuleI18n'; @@ -856,7 +856,7 @@ abstract class ModuleQuery extends ModelCriteria * * @return ChildModuleQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -877,7 +877,7 @@ abstract class ModuleQuery extends ModelCriteria * * @return ChildModuleI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/Order.php b/core/lib/Thelia/Model/Base/Order.php index b815aff34..ccf7922f3 100644 --- a/core/lib/Thelia/Model/Base/Order.php +++ b/core/lib/Thelia/Model/Base/Order.php @@ -2842,6 +2842,31 @@ abstract class Order implements ActiveRecordInterface return $this; } + + /** + * If this collection has already been initialized with + * an identical criteria, it returns the collection. + * Otherwise if this Order is new, it will return + * an empty collection; or if this Order has previously + * been saved, it will retrieve related CouponOrders from storage. + * + * This method is protected by default in order to keep the public + * api reasonable. You can provide public methods for those you + * actually need in Order. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @return Collection|ChildCouponOrder[] List of ChildCouponOrder objects + */ + public function getCouponOrdersJoinCoupon($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) + { + $query = ChildCouponOrderQuery::create(null, $criteria); + $query->joinWith('Coupon', $joinBehavior); + + return $this->getCouponOrders($query, $con); + } + /** * Clears the current object and sets all attributes to their default values */ diff --git a/core/lib/Thelia/Model/Base/OrderStatus.php b/core/lib/Thelia/Model/Base/OrderStatus.php index fc4a224d1..15ce7fbf7 100644 --- a/core/lib/Thelia/Model/Base/OrderStatus.php +++ b/core/lib/Thelia/Model/Base/OrderStatus.php @@ -109,7 +109,7 @@ abstract class OrderStatus implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -1812,7 +1812,7 @@ abstract class OrderStatus implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collOrders instanceof Collection) { @@ -1858,7 +1858,7 @@ abstract class OrderStatus implements ActiveRecordInterface * * @return ChildOrderStatus The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -1882,7 +1882,7 @@ abstract class OrderStatus implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildOrderStatusI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collOrderStatusI18ns) { @@ -1917,7 +1917,7 @@ abstract class OrderStatus implements ActiveRecordInterface * * @return ChildOrderStatus The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildOrderStatusI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/OrderStatusI18n.php b/core/lib/Thelia/Model/Base/OrderStatusI18n.php index 76ec4a28a..1f98739f0 100644 --- a/core/lib/Thelia/Model/Base/OrderStatusI18n.php +++ b/core/lib/Thelia/Model/Base/OrderStatusI18n.php @@ -61,7 +61,7 @@ abstract class OrderStatusI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class OrderStatusI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class OrderStatusI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/OrderStatusQuery.php b/core/lib/Thelia/Model/Base/OrderStatusQuery.php index 908efd6b6..07fcdb8dc 100644 --- a/core/lib/Thelia/Model/Base/OrderStatusQuery.php +++ b/core/lib/Thelia/Model/Base/OrderStatusQuery.php @@ -703,7 +703,7 @@ abstract class OrderStatusQuery extends ModelCriteria * * @return ChildOrderStatusQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'OrderStatusI18n'; @@ -721,7 +721,7 @@ abstract class OrderStatusQuery extends ModelCriteria * * @return ChildOrderStatusQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -742,7 +742,7 @@ abstract class OrderStatusQuery extends ModelCriteria * * @return ChildOrderStatusI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/Product.php b/core/lib/Thelia/Model/Base/Product.php index 9a1828e25..905436e1f 100644 --- a/core/lib/Thelia/Model/Base/Product.php +++ b/core/lib/Thelia/Model/Base/Product.php @@ -250,7 +250,7 @@ abstract class Product implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -5815,7 +5815,7 @@ abstract class Product implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collProductCategories instanceof Collection) { @@ -5914,7 +5914,7 @@ abstract class Product implements ActiveRecordInterface * * @return ChildProduct The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -5938,7 +5938,7 @@ abstract class Product implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildProductI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collProductI18ns) { @@ -5973,7 +5973,7 @@ abstract class Product implements ActiveRecordInterface * * @return ChildProduct The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildProductI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/ProductDocument.php b/core/lib/Thelia/Model/Base/ProductDocument.php index 58c9999ed..16503b9fb 100644 --- a/core/lib/Thelia/Model/Base/ProductDocument.php +++ b/core/lib/Thelia/Model/Base/ProductDocument.php @@ -120,7 +120,7 @@ abstract class ProductDocument implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -1640,7 +1640,7 @@ abstract class ProductDocument implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collProductDocumentI18ns instanceof Collection) { @@ -1683,7 +1683,7 @@ abstract class ProductDocument implements ActiveRecordInterface * * @return ChildProductDocument The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -1707,7 +1707,7 @@ abstract class ProductDocument implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildProductDocumentI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collProductDocumentI18ns) { @@ -1742,7 +1742,7 @@ abstract class ProductDocument implements ActiveRecordInterface * * @return ChildProductDocument The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildProductDocumentI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/ProductDocumentI18n.php b/core/lib/Thelia/Model/Base/ProductDocumentI18n.php index 2c5ca4d0c..f6c8436f8 100644 --- a/core/lib/Thelia/Model/Base/ProductDocumentI18n.php +++ b/core/lib/Thelia/Model/Base/ProductDocumentI18n.php @@ -61,7 +61,7 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/ProductDocumentQuery.php b/core/lib/Thelia/Model/Base/ProductDocumentQuery.php index 06af05a9c..32321554d 100644 --- a/core/lib/Thelia/Model/Base/ProductDocumentQuery.php +++ b/core/lib/Thelia/Model/Base/ProductDocumentQuery.php @@ -797,7 +797,7 @@ abstract class ProductDocumentQuery extends ModelCriteria * * @return ChildProductDocumentQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'ProductDocumentI18n'; @@ -815,7 +815,7 @@ abstract class ProductDocumentQuery extends ModelCriteria * * @return ChildProductDocumentQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -836,7 +836,7 @@ abstract class ProductDocumentQuery extends ModelCriteria * * @return ChildProductDocumentI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/ProductI18n.php b/core/lib/Thelia/Model/Base/ProductI18n.php index b0c74bb54..7b6e65976 100644 --- a/core/lib/Thelia/Model/Base/ProductI18n.php +++ b/core/lib/Thelia/Model/Base/ProductI18n.php @@ -61,7 +61,7 @@ abstract class ProductI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class ProductI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class ProductI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/ProductImage.php b/core/lib/Thelia/Model/Base/ProductImage.php index 0b4030ccb..364e6f00b 100644 --- a/core/lib/Thelia/Model/Base/ProductImage.php +++ b/core/lib/Thelia/Model/Base/ProductImage.php @@ -120,7 +120,7 @@ abstract class ProductImage implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -1640,7 +1640,7 @@ abstract class ProductImage implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collProductImageI18ns instanceof Collection) { @@ -1683,7 +1683,7 @@ abstract class ProductImage implements ActiveRecordInterface * * @return ChildProductImage The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -1707,7 +1707,7 @@ abstract class ProductImage implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildProductImageI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collProductImageI18ns) { @@ -1742,7 +1742,7 @@ abstract class ProductImage implements ActiveRecordInterface * * @return ChildProductImage The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildProductImageI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/ProductImageI18n.php b/core/lib/Thelia/Model/Base/ProductImageI18n.php index 634f726a3..064f09986 100644 --- a/core/lib/Thelia/Model/Base/ProductImageI18n.php +++ b/core/lib/Thelia/Model/Base/ProductImageI18n.php @@ -61,7 +61,7 @@ abstract class ProductImageI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class ProductImageI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class ProductImageI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/ProductImageQuery.php b/core/lib/Thelia/Model/Base/ProductImageQuery.php index 94cb1b361..e351c6f40 100644 --- a/core/lib/Thelia/Model/Base/ProductImageQuery.php +++ b/core/lib/Thelia/Model/Base/ProductImageQuery.php @@ -797,7 +797,7 @@ abstract class ProductImageQuery extends ModelCriteria * * @return ChildProductImageQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'ProductImageI18n'; @@ -815,7 +815,7 @@ abstract class ProductImageQuery extends ModelCriteria * * @return ChildProductImageQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -836,7 +836,7 @@ abstract class ProductImageQuery extends ModelCriteria * * @return ChildProductImageI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/ProductQuery.php b/core/lib/Thelia/Model/Base/ProductQuery.php index 3df8ecbae..9d4685f38 100644 --- a/core/lib/Thelia/Model/Base/ProductQuery.php +++ b/core/lib/Thelia/Model/Base/ProductQuery.php @@ -1872,7 +1872,7 @@ abstract class ProductQuery extends ModelCriteria * * @return ChildProductQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'ProductI18n'; @@ -1890,7 +1890,7 @@ abstract class ProductQuery extends ModelCriteria * * @return ChildProductQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -1911,7 +1911,7 @@ abstract class ProductQuery extends ModelCriteria * * @return ChildProductI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/Resource.php b/core/lib/Thelia/Model/Base/Resource.php index c6c527134..827de2643 100644 --- a/core/lib/Thelia/Model/Base/Resource.php +++ b/core/lib/Thelia/Model/Base/Resource.php @@ -116,7 +116,7 @@ abstract class Resource implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -1968,7 +1968,7 @@ abstract class Resource implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collGroupResources instanceof Collection) { @@ -2018,7 +2018,7 @@ abstract class Resource implements ActiveRecordInterface * * @return ChildResource The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -2042,7 +2042,7 @@ abstract class Resource implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildResourceI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collResourceI18ns) { @@ -2077,7 +2077,7 @@ abstract class Resource implements ActiveRecordInterface * * @return ChildResource The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildResourceI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/ResourceI18n.php b/core/lib/Thelia/Model/Base/ResourceI18n.php index c060e8776..b740bd858 100644 --- a/core/lib/Thelia/Model/Base/ResourceI18n.php +++ b/core/lib/Thelia/Model/Base/ResourceI18n.php @@ -61,7 +61,7 @@ abstract class ResourceI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -111,7 +111,7 @@ abstract class ResourceI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -576,7 +576,7 @@ abstract class ResourceI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/ResourceQuery.php b/core/lib/Thelia/Model/Base/ResourceQuery.php index 6559d6522..e12ee8f53 100644 --- a/core/lib/Thelia/Model/Base/ResourceQuery.php +++ b/core/lib/Thelia/Model/Base/ResourceQuery.php @@ -720,7 +720,7 @@ abstract class ResourceQuery extends ModelCriteria * * @return ChildResourceQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'ResourceI18n'; @@ -738,7 +738,7 @@ abstract class ResourceQuery extends ModelCriteria * * @return ChildResourceQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -759,7 +759,7 @@ abstract class ResourceQuery extends ModelCriteria * * @return ChildResourceI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/Tax.php b/core/lib/Thelia/Model/Base/Tax.php index 3e405414c..f3717366f 100644 --- a/core/lib/Thelia/Model/Base/Tax.php +++ b/core/lib/Thelia/Model/Base/Tax.php @@ -109,7 +109,7 @@ abstract class Tax implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -1762,7 +1762,7 @@ abstract class Tax implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collTaxRuleCountries instanceof Collection) { @@ -1808,7 +1808,7 @@ abstract class Tax implements ActiveRecordInterface * * @return ChildTax The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -1832,7 +1832,7 @@ abstract class Tax implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildTaxI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collTaxI18ns) { @@ -1867,7 +1867,7 @@ abstract class Tax implements ActiveRecordInterface * * @return ChildTax The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildTaxI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/TaxI18n.php b/core/lib/Thelia/Model/Base/TaxI18n.php index f8577e860..8fdec086d 100644 --- a/core/lib/Thelia/Model/Base/TaxI18n.php +++ b/core/lib/Thelia/Model/Base/TaxI18n.php @@ -61,7 +61,7 @@ abstract class TaxI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -99,7 +99,7 @@ abstract class TaxI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -500,7 +500,7 @@ abstract class TaxI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/TaxQuery.php b/core/lib/Thelia/Model/Base/TaxQuery.php index 307ace57c..0a61cbb3c 100644 --- a/core/lib/Thelia/Model/Base/TaxQuery.php +++ b/core/lib/Thelia/Model/Base/TaxQuery.php @@ -715,7 +715,7 @@ abstract class TaxQuery extends ModelCriteria * * @return ChildTaxQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'TaxI18n'; @@ -733,7 +733,7 @@ abstract class TaxQuery extends ModelCriteria * * @return ChildTaxQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -754,7 +754,7 @@ abstract class TaxQuery extends ModelCriteria * * @return ChildTaxI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/TaxRule.php b/core/lib/Thelia/Model/Base/TaxRule.php index bf318498c..101471313 100644 --- a/core/lib/Thelia/Model/Base/TaxRule.php +++ b/core/lib/Thelia/Model/Base/TaxRule.php @@ -129,7 +129,7 @@ abstract class TaxRule implements ActiveRecordInterface * Current locale * @var string */ - protected $currentLocale = 'en_US'; + protected $currentLocale = 'en_EN'; /** * Current translation objects @@ -2146,7 +2146,7 @@ abstract class TaxRule implements ActiveRecordInterface } // if ($deep) // i18n behavior - $this->currentLocale = 'en_US'; + $this->currentLocale = 'en_EN'; $this->currentTranslations = null; if ($this->collProducts instanceof Collection) { @@ -2196,7 +2196,7 @@ abstract class TaxRule implements ActiveRecordInterface * * @return ChildTaxRule The current object (for fluent API support) */ - public function setLocale($locale = 'en_US') + public function setLocale($locale = 'en_EN') { $this->currentLocale = $locale; @@ -2220,7 +2220,7 @@ abstract class TaxRule implements ActiveRecordInterface * @param ConnectionInterface $con an optional connection object * * @return ChildTaxRuleI18n */ - public function getTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!isset($this->currentTranslations[$locale])) { if (null !== $this->collTaxRuleI18ns) { @@ -2255,7 +2255,7 @@ abstract class TaxRule implements ActiveRecordInterface * * @return ChildTaxRule The current object (for fluent API support) */ - public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null) + public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null) { if (!$this->isNew()) { ChildTaxRuleI18nQuery::create() diff --git a/core/lib/Thelia/Model/Base/TaxRuleI18n.php b/core/lib/Thelia/Model/Base/TaxRuleI18n.php index 51bab6a77..86215b335 100644 --- a/core/lib/Thelia/Model/Base/TaxRuleI18n.php +++ b/core/lib/Thelia/Model/Base/TaxRuleI18n.php @@ -61,7 +61,7 @@ abstract class TaxRuleI18n implements ActiveRecordInterface /** * The value for the locale field. - * Note: this column has a database default value of: 'en_US' + * Note: this column has a database default value of: 'en_EN' * @var string */ protected $locale; @@ -87,7 +87,7 @@ abstract class TaxRuleI18n implements ActiveRecordInterface */ public function applyDefaultValues() { - $this->locale = 'en_US'; + $this->locale = 'en_EN'; } /** @@ -424,7 +424,7 @@ abstract class TaxRuleI18n implements ActiveRecordInterface */ public function hasOnlyDefaultValues() { - if ($this->locale !== 'en_US') { + if ($this->locale !== 'en_EN') { return false; } diff --git a/core/lib/Thelia/Model/Base/TaxRuleQuery.php b/core/lib/Thelia/Model/Base/TaxRuleQuery.php index 2fb478b7a..36f2edd99 100644 --- a/core/lib/Thelia/Model/Base/TaxRuleQuery.php +++ b/core/lib/Thelia/Model/Base/TaxRuleQuery.php @@ -846,7 +846,7 @@ abstract class TaxRuleQuery extends ModelCriteria * * @return ChildTaxRuleQuery The current query, for fluid interface */ - public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { $relationName = $relationAlias ? $relationAlias : 'TaxRuleI18n'; @@ -864,7 +864,7 @@ abstract class TaxRuleQuery extends ModelCriteria * * @return ChildTaxRuleQuery The current query, for fluid interface */ - public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN) + public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN) { $this ->joinI18n($locale, null, $joinType) @@ -885,7 +885,7 @@ abstract class TaxRuleQuery extends ModelCriteria * * @return ChildTaxRuleI18nQuery A secondary query class using the current class as primary query */ - public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN) { return $this ->joinI18n($locale, $relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Map/AttributeAvI18nTableMap.php b/core/lib/Thelia/Model/Map/AttributeAvI18nTableMap.php index 02a20540e..14fc79eeb 100644 --- a/core/lib/Thelia/Model/Map/AttributeAvI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/AttributeAvI18nTableMap.php @@ -151,7 +151,7 @@ class AttributeAvI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'attribute_av', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/AttributeAvTableMap.php b/core/lib/Thelia/Model/Map/AttributeAvTableMap.php index 0c5c2e1c9..138f0fa9c 100644 --- a/core/lib/Thelia/Model/Map/AttributeAvTableMap.php +++ b/core/lib/Thelia/Model/Map/AttributeAvTableMap.php @@ -106,7 +106,7 @@ class AttributeAvTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/AttributeI18nTableMap.php b/core/lib/Thelia/Model/Map/AttributeI18nTableMap.php index 8471d3e26..b60cae5b8 100644 --- a/core/lib/Thelia/Model/Map/AttributeI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/AttributeI18nTableMap.php @@ -151,7 +151,7 @@ class AttributeI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'attribute', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/AttributeTableMap.php b/core/lib/Thelia/Model/Map/AttributeTableMap.php index 773e13cab..dca811cbc 100644 --- a/core/lib/Thelia/Model/Map/AttributeTableMap.php +++ b/core/lib/Thelia/Model/Map/AttributeTableMap.php @@ -101,7 +101,7 @@ class AttributeTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/CategoryDocumentI18nTableMap.php b/core/lib/Thelia/Model/Map/CategoryDocumentI18nTableMap.php index 956afae4a..1ad7dfe2f 100644 --- a/core/lib/Thelia/Model/Map/CategoryDocumentI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/CategoryDocumentI18nTableMap.php @@ -151,7 +151,7 @@ class CategoryDocumentI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'category_document', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/CategoryDocumentTableMap.php b/core/lib/Thelia/Model/Map/CategoryDocumentTableMap.php index 8b307ea1e..83e748a1e 100644 --- a/core/lib/Thelia/Model/Map/CategoryDocumentTableMap.php +++ b/core/lib/Thelia/Model/Map/CategoryDocumentTableMap.php @@ -111,7 +111,7 @@ class CategoryDocumentTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/CategoryI18nTableMap.php b/core/lib/Thelia/Model/Map/CategoryI18nTableMap.php index 8c52aa7b2..1611b2ebf 100644 --- a/core/lib/Thelia/Model/Map/CategoryI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/CategoryI18nTableMap.php @@ -151,7 +151,7 @@ class CategoryI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'category', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/CategoryImageI18nTableMap.php b/core/lib/Thelia/Model/Map/CategoryImageI18nTableMap.php index 1d27e16ad..1c59c9db2 100644 --- a/core/lib/Thelia/Model/Map/CategoryImageI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/CategoryImageI18nTableMap.php @@ -151,7 +151,7 @@ class CategoryImageI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'category_image', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/CategoryImageTableMap.php b/core/lib/Thelia/Model/Map/CategoryImageTableMap.php index 1c7694d05..9eafe2ade 100644 --- a/core/lib/Thelia/Model/Map/CategoryImageTableMap.php +++ b/core/lib/Thelia/Model/Map/CategoryImageTableMap.php @@ -111,7 +111,7 @@ class CategoryImageTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/CategoryTableMap.php b/core/lib/Thelia/Model/Map/CategoryTableMap.php index 5e02d04c5..c3526ec5d 100644 --- a/core/lib/Thelia/Model/Map/CategoryTableMap.php +++ b/core/lib/Thelia/Model/Map/CategoryTableMap.php @@ -126,7 +126,7 @@ class CategoryTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/ConfigI18nTableMap.php b/core/lib/Thelia/Model/Map/ConfigI18nTableMap.php index b953b0ac9..a83f87b76 100644 --- a/core/lib/Thelia/Model/Map/ConfigI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ConfigI18nTableMap.php @@ -151,7 +151,7 @@ class ConfigI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'config', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/ConfigTableMap.php b/core/lib/Thelia/Model/Map/ConfigTableMap.php index ebd5d6edf..8bd68a964 100644 --- a/core/lib/Thelia/Model/Map/ConfigTableMap.php +++ b/core/lib/Thelia/Model/Map/ConfigTableMap.php @@ -116,7 +116,7 @@ class ConfigTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/ContentDocumentI18nTableMap.php b/core/lib/Thelia/Model/Map/ContentDocumentI18nTableMap.php index 7ebde93e6..a6ff890d7 100644 --- a/core/lib/Thelia/Model/Map/ContentDocumentI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ContentDocumentI18nTableMap.php @@ -151,7 +151,7 @@ class ContentDocumentI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'content_document', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/ContentDocumentTableMap.php b/core/lib/Thelia/Model/Map/ContentDocumentTableMap.php index 3d876a570..4344b70ae 100644 --- a/core/lib/Thelia/Model/Map/ContentDocumentTableMap.php +++ b/core/lib/Thelia/Model/Map/ContentDocumentTableMap.php @@ -111,7 +111,7 @@ class ContentDocumentTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/ContentI18nTableMap.php b/core/lib/Thelia/Model/Map/ContentI18nTableMap.php index f718623b0..ee9122a6c 100644 --- a/core/lib/Thelia/Model/Map/ContentI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ContentI18nTableMap.php @@ -151,7 +151,7 @@ class ContentI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'content', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/ContentImageI18nTableMap.php b/core/lib/Thelia/Model/Map/ContentImageI18nTableMap.php index 759349d27..6ff343d16 100644 --- a/core/lib/Thelia/Model/Map/ContentImageI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ContentImageI18nTableMap.php @@ -151,7 +151,7 @@ class ContentImageI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'content_image', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/ContentImageTableMap.php b/core/lib/Thelia/Model/Map/ContentImageTableMap.php index f731c51a8..c95761ab2 100644 --- a/core/lib/Thelia/Model/Map/ContentImageTableMap.php +++ b/core/lib/Thelia/Model/Map/ContentImageTableMap.php @@ -111,7 +111,7 @@ class ContentImageTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/ContentTableMap.php b/core/lib/Thelia/Model/Map/ContentTableMap.php index 4a489cedb..724c839a1 100644 --- a/core/lib/Thelia/Model/Map/ContentTableMap.php +++ b/core/lib/Thelia/Model/Map/ContentTableMap.php @@ -121,7 +121,7 @@ class ContentTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/CountryI18nTableMap.php b/core/lib/Thelia/Model/Map/CountryI18nTableMap.php index 272231464..cc60b09d2 100644 --- a/core/lib/Thelia/Model/Map/CountryI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/CountryI18nTableMap.php @@ -151,7 +151,7 @@ class CountryI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'country', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/CountryTableMap.php b/core/lib/Thelia/Model/Map/CountryTableMap.php index e7c356f08..2e4931e37 100644 --- a/core/lib/Thelia/Model/Map/CountryTableMap.php +++ b/core/lib/Thelia/Model/Map/CountryTableMap.php @@ -116,7 +116,7 @@ class CountryTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/CouponOrderTableMap.php b/core/lib/Thelia/Model/Map/CouponOrderTableMap.php index 9d91ef068..1826bcb70 100644 --- a/core/lib/Thelia/Model/Map/CouponOrderTableMap.php +++ b/core/lib/Thelia/Model/Map/CouponOrderTableMap.php @@ -152,7 +152,7 @@ class CouponOrderTableMap extends TableMap // columns $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null); $this->addForeignKey('ORDER_ID', 'OrderId', 'INTEGER', 'order', 'ID', true, null, null); - $this->addColumn('CODE', 'Code', 'VARCHAR', true, 45, null); + $this->addForeignKey('CODE', 'Code', 'VARCHAR', 'coupon', 'CODE', true, 45, null); $this->addColumn('VALUE', 'Value', 'FLOAT', true, null, null); $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null); $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null); @@ -164,6 +164,7 @@ class CouponOrderTableMap extends TableMap public function buildRelations() { $this->addRelation('Order', '\\Thelia\\Model\\Order', RelationMap::MANY_TO_ONE, array('order_id' => 'id', ), 'CASCADE', 'RESTRICT'); + $this->addRelation('Coupon', '\\Thelia\\Model\\Coupon', RelationMap::MANY_TO_ONE, array('code' => 'code', ), null, null); } // buildRelations() /** diff --git a/core/lib/Thelia/Model/Map/CouponTableMap.php b/core/lib/Thelia/Model/Map/CouponTableMap.php index d1ff79ac0..7e576a585 100644 --- a/core/lib/Thelia/Model/Map/CouponTableMap.php +++ b/core/lib/Thelia/Model/Map/CouponTableMap.php @@ -57,7 +57,7 @@ class CouponTableMap extends TableMap /** * The total number of columns */ - const NUM_COLUMNS = 10; + const NUM_COLUMNS = 14; /** * The number of lazy-loaded columns @@ -67,7 +67,7 @@ class CouponTableMap extends TableMap /** * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS) */ - const NUM_HYDRATE_COLUMNS = 10; + const NUM_HYDRATE_COLUMNS = 14; /** * the column name for the ID field @@ -80,9 +80,24 @@ class CouponTableMap extends TableMap const CODE = 'coupon.CODE'; /** - * the column name for the ACTION field + * the column name for the TYPE field */ - const ACTION = 'coupon.ACTION'; + const TYPE = 'coupon.TYPE'; + + /** + * the column name for the TITLE field + */ + const TITLE = 'coupon.TITLE'; + + /** + * the column name for the SHORT_DESCRIPTION field + */ + const SHORT_DESCRIPTION = 'coupon.SHORT_DESCRIPTION'; + + /** + * the column name for the DESCRIPTION field + */ + const DESCRIPTION = 'coupon.DESCRIPTION'; /** * the column name for the VALUE field @@ -90,24 +105,24 @@ class CouponTableMap extends TableMap const VALUE = 'coupon.VALUE'; /** - * the column name for the USED field + * the column name for the IS_USED field */ - const USED = 'coupon.USED'; + const IS_USED = 'coupon.IS_USED'; /** - * the column name for the AVAILABLE_SINCE field + * the column name for the IS_ENABLED field */ - const AVAILABLE_SINCE = 'coupon.AVAILABLE_SINCE'; + const IS_ENABLED = 'coupon.IS_ENABLED'; /** - * the column name for the DATE_LIMIT field + * the column name for the EXPIRATION_DATE field */ - const DATE_LIMIT = 'coupon.DATE_LIMIT'; + const EXPIRATION_DATE = 'coupon.EXPIRATION_DATE'; /** - * the column name for the ACTIVATE field + * the column name for the SERIALIZED_RULES field */ - const ACTIVATE = 'coupon.ACTIVATE'; + const SERIALIZED_RULES = 'coupon.SERIALIZED_RULES'; /** * the column name for the CREATED_AT field @@ -119,11 +134,25 @@ class CouponTableMap extends TableMap */ const UPDATED_AT = 'coupon.UPDATED_AT'; + /** + * the column name for the VERSION field + */ + const VERSION = 'coupon.VERSION'; + /** * The default string format for model objects of the related table */ const DEFAULT_STRING_FORMAT = 'YAML'; + // i18n behavior + + /** + * The default locale to use for translations. + * + * @var string + */ + const DEFAULT_LOCALE = 'en_EN'; + /** * holds an array of fieldnames * @@ -131,12 +160,12 @@ class CouponTableMap extends TableMap * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ protected static $fieldNames = array ( - self::TYPE_PHPNAME => array('Id', 'Code', 'Action', 'Value', 'Used', 'AvailableSince', 'DateLimit', 'Activate', 'CreatedAt', 'UpdatedAt', ), - self::TYPE_STUDLYPHPNAME => array('id', 'code', 'action', 'value', 'used', 'availableSince', 'dateLimit', 'activate', 'createdAt', 'updatedAt', ), - self::TYPE_COLNAME => array(CouponTableMap::ID, CouponTableMap::CODE, CouponTableMap::ACTION, CouponTableMap::VALUE, CouponTableMap::USED, CouponTableMap::AVAILABLE_SINCE, CouponTableMap::DATE_LIMIT, CouponTableMap::ACTIVATE, CouponTableMap::CREATED_AT, CouponTableMap::UPDATED_AT, ), - self::TYPE_RAW_COLNAME => array('ID', 'CODE', 'ACTION', 'VALUE', 'USED', 'AVAILABLE_SINCE', 'DATE_LIMIT', 'ACTIVATE', 'CREATED_AT', 'UPDATED_AT', ), - self::TYPE_FIELDNAME => array('id', 'code', 'action', 'value', 'used', 'available_since', 'date_limit', 'activate', 'created_at', 'updated_at', ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, ) + self::TYPE_PHPNAME => array('Id', 'Code', 'Type', 'Title', 'ShortDescription', 'Description', 'Value', 'IsUsed', 'IsEnabled', 'ExpirationDate', 'SerializedRules', 'CreatedAt', 'UpdatedAt', 'Version', ), + self::TYPE_STUDLYPHPNAME => array('id', 'code', 'type', 'title', 'shortDescription', 'description', 'value', 'isUsed', 'isEnabled', 'expirationDate', 'serializedRules', 'createdAt', 'updatedAt', 'version', ), + self::TYPE_COLNAME => array(CouponTableMap::ID, CouponTableMap::CODE, CouponTableMap::TYPE, CouponTableMap::TITLE, CouponTableMap::SHORT_DESCRIPTION, CouponTableMap::DESCRIPTION, CouponTableMap::VALUE, CouponTableMap::IS_USED, CouponTableMap::IS_ENABLED, CouponTableMap::EXPIRATION_DATE, CouponTableMap::SERIALIZED_RULES, CouponTableMap::CREATED_AT, CouponTableMap::UPDATED_AT, CouponTableMap::VERSION, ), + self::TYPE_RAW_COLNAME => array('ID', 'CODE', 'TYPE', 'TITLE', 'SHORT_DESCRIPTION', 'DESCRIPTION', 'VALUE', 'IS_USED', 'IS_ENABLED', 'EXPIRATION_DATE', 'SERIALIZED_RULES', 'CREATED_AT', 'UPDATED_AT', 'VERSION', ), + self::TYPE_FIELDNAME => array('id', 'code', 'type', 'title', 'short_description', 'description', 'value', 'is_used', 'is_enabled', 'expiration_date', 'serialized_rules', 'created_at', 'updated_at', 'version', ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, ) ); /** @@ -146,12 +175,12 @@ class CouponTableMap extends TableMap * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 */ protected static $fieldKeys = array ( - self::TYPE_PHPNAME => array('Id' => 0, 'Code' => 1, 'Action' => 2, 'Value' => 3, 'Used' => 4, 'AvailableSince' => 5, 'DateLimit' => 6, 'Activate' => 7, 'CreatedAt' => 8, 'UpdatedAt' => 9, ), - self::TYPE_STUDLYPHPNAME => array('id' => 0, 'code' => 1, 'action' => 2, 'value' => 3, 'used' => 4, 'availableSince' => 5, 'dateLimit' => 6, 'activate' => 7, 'createdAt' => 8, 'updatedAt' => 9, ), - self::TYPE_COLNAME => array(CouponTableMap::ID => 0, CouponTableMap::CODE => 1, CouponTableMap::ACTION => 2, CouponTableMap::VALUE => 3, CouponTableMap::USED => 4, CouponTableMap::AVAILABLE_SINCE => 5, CouponTableMap::DATE_LIMIT => 6, CouponTableMap::ACTIVATE => 7, CouponTableMap::CREATED_AT => 8, CouponTableMap::UPDATED_AT => 9, ), - self::TYPE_RAW_COLNAME => array('ID' => 0, 'CODE' => 1, 'ACTION' => 2, 'VALUE' => 3, 'USED' => 4, 'AVAILABLE_SINCE' => 5, 'DATE_LIMIT' => 6, 'ACTIVATE' => 7, 'CREATED_AT' => 8, 'UPDATED_AT' => 9, ), - self::TYPE_FIELDNAME => array('id' => 0, 'code' => 1, 'action' => 2, 'value' => 3, 'used' => 4, 'available_since' => 5, 'date_limit' => 6, 'activate' => 7, 'created_at' => 8, 'updated_at' => 9, ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, ) + self::TYPE_PHPNAME => array('Id' => 0, 'Code' => 1, 'Type' => 2, 'Title' => 3, 'ShortDescription' => 4, 'Description' => 5, 'Value' => 6, 'IsUsed' => 7, 'IsEnabled' => 8, 'ExpirationDate' => 9, 'SerializedRules' => 10, 'CreatedAt' => 11, 'UpdatedAt' => 12, 'Version' => 13, ), + self::TYPE_STUDLYPHPNAME => array('id' => 0, 'code' => 1, 'type' => 2, 'title' => 3, 'shortDescription' => 4, 'description' => 5, 'value' => 6, 'isUsed' => 7, 'isEnabled' => 8, 'expirationDate' => 9, 'serializedRules' => 10, 'createdAt' => 11, 'updatedAt' => 12, 'version' => 13, ), + self::TYPE_COLNAME => array(CouponTableMap::ID => 0, CouponTableMap::CODE => 1, CouponTableMap::TYPE => 2, CouponTableMap::TITLE => 3, CouponTableMap::SHORT_DESCRIPTION => 4, CouponTableMap::DESCRIPTION => 5, CouponTableMap::VALUE => 6, CouponTableMap::IS_USED => 7, CouponTableMap::IS_ENABLED => 8, CouponTableMap::EXPIRATION_DATE => 9, CouponTableMap::SERIALIZED_RULES => 10, CouponTableMap::CREATED_AT => 11, CouponTableMap::UPDATED_AT => 12, CouponTableMap::VERSION => 13, ), + self::TYPE_RAW_COLNAME => array('ID' => 0, 'CODE' => 1, 'TYPE' => 2, 'TITLE' => 3, 'SHORT_DESCRIPTION' => 4, 'DESCRIPTION' => 5, 'VALUE' => 6, 'IS_USED' => 7, 'IS_ENABLED' => 8, 'EXPIRATION_DATE' => 9, 'SERIALIZED_RULES' => 10, 'CREATED_AT' => 11, 'UPDATED_AT' => 12, 'VERSION' => 13, ), + self::TYPE_FIELDNAME => array('id' => 0, 'code' => 1, 'type' => 2, 'title' => 3, 'short_description' => 4, 'description' => 5, 'value' => 6, 'is_used' => 7, 'is_enabled' => 8, 'expiration_date' => 9, 'serialized_rules' => 10, 'created_at' => 11, 'updated_at' => 12, 'version' => 13, ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, ) ); /** @@ -172,14 +201,18 @@ class CouponTableMap extends TableMap // columns $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null); $this->addColumn('CODE', 'Code', 'VARCHAR', true, 45, null); - $this->addColumn('ACTION', 'Action', 'VARCHAR', true, 255, null); + $this->addColumn('TYPE', 'Type', 'VARCHAR', true, 255, null); + $this->addColumn('TITLE', 'Title', 'VARCHAR', true, 255, null); + $this->addColumn('SHORT_DESCRIPTION', 'ShortDescription', 'LONGVARCHAR', true, null, null); + $this->addColumn('DESCRIPTION', 'Description', 'CLOB', true, null, null); $this->addColumn('VALUE', 'Value', 'FLOAT', true, null, null); - $this->addColumn('USED', 'Used', 'TINYINT', false, null, null); - $this->addColumn('AVAILABLE_SINCE', 'AvailableSince', 'TIMESTAMP', false, null, null); - $this->addColumn('DATE_LIMIT', 'DateLimit', 'TIMESTAMP', false, null, null); - $this->addColumn('ACTIVATE', 'Activate', 'TINYINT', false, null, null); + $this->addColumn('IS_USED', 'IsUsed', 'TINYINT', true, null, null); + $this->addColumn('IS_ENABLED', 'IsEnabled', 'TINYINT', true, null, null); + $this->addColumn('EXPIRATION_DATE', 'ExpirationDate', 'TIMESTAMP', true, null, null); + $this->addColumn('SERIALIZED_RULES', 'SerializedRules', 'LONGVARCHAR', true, null, null); $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null); $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null); + $this->addColumn('VERSION', 'Version', 'INTEGER', false, null, 0); } // initialize() /** @@ -187,7 +220,9 @@ class CouponTableMap extends TableMap */ public function buildRelations() { - $this->addRelation('CouponRule', '\\Thelia\\Model\\CouponRule', RelationMap::ONE_TO_MANY, array('id' => 'coupon_id', ), 'CASCADE', 'RESTRICT', 'CouponRules'); + $this->addRelation('CouponOrder', '\\Thelia\\Model\\CouponOrder', RelationMap::ONE_TO_MANY, array('code' => 'code', ), null, null, 'CouponOrders'); + $this->addRelation('CouponI18n', '\\Thelia\\Model\\CouponI18n', RelationMap::ONE_TO_MANY, array('id' => 'id', ), 'CASCADE', null, 'CouponI18ns'); + $this->addRelation('CouponVersion', '\\Thelia\\Model\\CouponVersion', RelationMap::ONE_TO_MANY, array('id' => 'id', ), 'CASCADE', null, 'CouponVersions'); } // buildRelations() /** @@ -200,6 +235,8 @@ class CouponTableMap extends TableMap { return array( 'timestampable' => array('create_column' => 'created_at', 'update_column' => 'updated_at', ), + 'i18n' => array('i18n_table' => '%TABLE%_i18n', 'i18n_phpname' => '%PHPNAME%I18n', 'i18n_columns' => '', 'locale_column' => 'locale', 'locale_length' => '5', 'default_locale' => '', 'locale_alias' => '', ), + 'versionable' => array('version_column' => 'version', 'version_table' => '', 'log_created_at' => 'false', 'log_created_by' => 'false', 'log_comment' => 'false', 'version_created_at_column' => 'version_created_at', 'version_created_by_column' => 'version_created_by', 'version_comment_column' => 'version_comment', ), ); } // getBehaviors() /** @@ -209,7 +246,8 @@ class CouponTableMap extends TableMap { // Invalidate objects in ".$this->getClassNameFromBuilder($joinedTableTableMapBuilder)." instance pool, // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule. - CouponRuleTableMap::clearInstancePool(); + CouponI18nTableMap::clearInstancePool(); + CouponVersionTableMap::clearInstancePool(); } /** @@ -352,25 +390,33 @@ class CouponTableMap extends TableMap if (null === $alias) { $criteria->addSelectColumn(CouponTableMap::ID); $criteria->addSelectColumn(CouponTableMap::CODE); - $criteria->addSelectColumn(CouponTableMap::ACTION); + $criteria->addSelectColumn(CouponTableMap::TYPE); + $criteria->addSelectColumn(CouponTableMap::TITLE); + $criteria->addSelectColumn(CouponTableMap::SHORT_DESCRIPTION); + $criteria->addSelectColumn(CouponTableMap::DESCRIPTION); $criteria->addSelectColumn(CouponTableMap::VALUE); - $criteria->addSelectColumn(CouponTableMap::USED); - $criteria->addSelectColumn(CouponTableMap::AVAILABLE_SINCE); - $criteria->addSelectColumn(CouponTableMap::DATE_LIMIT); - $criteria->addSelectColumn(CouponTableMap::ACTIVATE); + $criteria->addSelectColumn(CouponTableMap::IS_USED); + $criteria->addSelectColumn(CouponTableMap::IS_ENABLED); + $criteria->addSelectColumn(CouponTableMap::EXPIRATION_DATE); + $criteria->addSelectColumn(CouponTableMap::SERIALIZED_RULES); $criteria->addSelectColumn(CouponTableMap::CREATED_AT); $criteria->addSelectColumn(CouponTableMap::UPDATED_AT); + $criteria->addSelectColumn(CouponTableMap::VERSION); } else { $criteria->addSelectColumn($alias . '.ID'); $criteria->addSelectColumn($alias . '.CODE'); - $criteria->addSelectColumn($alias . '.ACTION'); + $criteria->addSelectColumn($alias . '.TYPE'); + $criteria->addSelectColumn($alias . '.TITLE'); + $criteria->addSelectColumn($alias . '.SHORT_DESCRIPTION'); + $criteria->addSelectColumn($alias . '.DESCRIPTION'); $criteria->addSelectColumn($alias . '.VALUE'); - $criteria->addSelectColumn($alias . '.USED'); - $criteria->addSelectColumn($alias . '.AVAILABLE_SINCE'); - $criteria->addSelectColumn($alias . '.DATE_LIMIT'); - $criteria->addSelectColumn($alias . '.ACTIVATE'); + $criteria->addSelectColumn($alias . '.IS_USED'); + $criteria->addSelectColumn($alias . '.IS_ENABLED'); + $criteria->addSelectColumn($alias . '.EXPIRATION_DATE'); + $criteria->addSelectColumn($alias . '.SERIALIZED_RULES'); $criteria->addSelectColumn($alias . '.CREATED_AT'); $criteria->addSelectColumn($alias . '.UPDATED_AT'); + $criteria->addSelectColumn($alias . '.VERSION'); } } diff --git a/core/lib/Thelia/Model/Map/CurrencyI18nTableMap.php b/core/lib/Thelia/Model/Map/CurrencyI18nTableMap.php index c7e4725c1..d280f8601 100644 --- a/core/lib/Thelia/Model/Map/CurrencyI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/CurrencyI18nTableMap.php @@ -136,7 +136,7 @@ class CurrencyI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'currency', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('NAME', 'Name', 'VARCHAR', false, 45, null); } // initialize() diff --git a/core/lib/Thelia/Model/Map/CurrencyTableMap.php b/core/lib/Thelia/Model/Map/CurrencyTableMap.php index b37a6b30a..08ecf6966 100644 --- a/core/lib/Thelia/Model/Map/CurrencyTableMap.php +++ b/core/lib/Thelia/Model/Map/CurrencyTableMap.php @@ -121,7 +121,7 @@ class CurrencyTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/CustomerTitleI18nTableMap.php b/core/lib/Thelia/Model/Map/CustomerTitleI18nTableMap.php index 5344099c5..d403756fa 100644 --- a/core/lib/Thelia/Model/Map/CustomerTitleI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/CustomerTitleI18nTableMap.php @@ -141,7 +141,7 @@ class CustomerTitleI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'customer_title', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('SHORT', 'Short', 'VARCHAR', false, 10, null); $this->addColumn('LONG', 'Long', 'VARCHAR', false, 45, null); } // initialize() diff --git a/core/lib/Thelia/Model/Map/CustomerTitleTableMap.php b/core/lib/Thelia/Model/Map/CustomerTitleTableMap.php index c10ce2500..2769f365e 100644 --- a/core/lib/Thelia/Model/Map/CustomerTitleTableMap.php +++ b/core/lib/Thelia/Model/Map/CustomerTitleTableMap.php @@ -106,7 +106,7 @@ class CustomerTitleTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/FeatureAvI18nTableMap.php b/core/lib/Thelia/Model/Map/FeatureAvI18nTableMap.php index ba592b4b0..b3114e7ba 100644 --- a/core/lib/Thelia/Model/Map/FeatureAvI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/FeatureAvI18nTableMap.php @@ -151,7 +151,7 @@ class FeatureAvI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'feature_av', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/FeatureAvTableMap.php b/core/lib/Thelia/Model/Map/FeatureAvTableMap.php index 4dd944bb7..0559f7ce6 100644 --- a/core/lib/Thelia/Model/Map/FeatureAvTableMap.php +++ b/core/lib/Thelia/Model/Map/FeatureAvTableMap.php @@ -106,7 +106,7 @@ class FeatureAvTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/FeatureI18nTableMap.php b/core/lib/Thelia/Model/Map/FeatureI18nTableMap.php index dba05fb67..af0dfc263 100644 --- a/core/lib/Thelia/Model/Map/FeatureI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/FeatureI18nTableMap.php @@ -151,7 +151,7 @@ class FeatureI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'feature', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/FeatureTableMap.php b/core/lib/Thelia/Model/Map/FeatureTableMap.php index 76c2fe724..7d0af0d45 100644 --- a/core/lib/Thelia/Model/Map/FeatureTableMap.php +++ b/core/lib/Thelia/Model/Map/FeatureTableMap.php @@ -106,7 +106,7 @@ class FeatureTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/FolderDocumentI18nTableMap.php b/core/lib/Thelia/Model/Map/FolderDocumentI18nTableMap.php index 28dab9d8f..5875031fb 100644 --- a/core/lib/Thelia/Model/Map/FolderDocumentI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/FolderDocumentI18nTableMap.php @@ -151,7 +151,7 @@ class FolderDocumentI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'folder_document', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/FolderDocumentTableMap.php b/core/lib/Thelia/Model/Map/FolderDocumentTableMap.php index 1d0e3b74a..467b7a65b 100644 --- a/core/lib/Thelia/Model/Map/FolderDocumentTableMap.php +++ b/core/lib/Thelia/Model/Map/FolderDocumentTableMap.php @@ -111,7 +111,7 @@ class FolderDocumentTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/FolderI18nTableMap.php b/core/lib/Thelia/Model/Map/FolderI18nTableMap.php index d10344811..fc85b17ec 100644 --- a/core/lib/Thelia/Model/Map/FolderI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/FolderI18nTableMap.php @@ -151,7 +151,7 @@ class FolderI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'folder', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/FolderImageI18nTableMap.php b/core/lib/Thelia/Model/Map/FolderImageI18nTableMap.php index f0f87fd85..1c89165a4 100644 --- a/core/lib/Thelia/Model/Map/FolderImageI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/FolderImageI18nTableMap.php @@ -151,7 +151,7 @@ class FolderImageI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'folder_image', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/FolderImageTableMap.php b/core/lib/Thelia/Model/Map/FolderImageTableMap.php index 6dc186658..c559f9437 100644 --- a/core/lib/Thelia/Model/Map/FolderImageTableMap.php +++ b/core/lib/Thelia/Model/Map/FolderImageTableMap.php @@ -111,7 +111,7 @@ class FolderImageTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/FolderTableMap.php b/core/lib/Thelia/Model/Map/FolderTableMap.php index 1bfe2cd6e..08871715b 100644 --- a/core/lib/Thelia/Model/Map/FolderTableMap.php +++ b/core/lib/Thelia/Model/Map/FolderTableMap.php @@ -126,7 +126,7 @@ class FolderTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/GroupI18nTableMap.php b/core/lib/Thelia/Model/Map/GroupI18nTableMap.php index 57788593a..585127821 100644 --- a/core/lib/Thelia/Model/Map/GroupI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/GroupI18nTableMap.php @@ -151,7 +151,7 @@ class GroupI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'group', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/GroupTableMap.php b/core/lib/Thelia/Model/Map/GroupTableMap.php index 881a2fa84..a8c830005 100644 --- a/core/lib/Thelia/Model/Map/GroupTableMap.php +++ b/core/lib/Thelia/Model/Map/GroupTableMap.php @@ -101,7 +101,7 @@ class GroupTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/MessageI18nTableMap.php b/core/lib/Thelia/Model/Map/MessageI18nTableMap.php index bb9bfdd2e..f084515c0 100644 --- a/core/lib/Thelia/Model/Map/MessageI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/MessageI18nTableMap.php @@ -146,7 +146,7 @@ class MessageI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'message', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'LONGVARCHAR', false, null, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('DESCRIPTION_HTML', 'DescriptionHtml', 'CLOB', false, null, null); diff --git a/core/lib/Thelia/Model/Map/MessageTableMap.php b/core/lib/Thelia/Model/Map/MessageTableMap.php index 392dac824..de2a205f9 100644 --- a/core/lib/Thelia/Model/Map/MessageTableMap.php +++ b/core/lib/Thelia/Model/Map/MessageTableMap.php @@ -126,7 +126,7 @@ class MessageTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/ModuleI18nTableMap.php b/core/lib/Thelia/Model/Map/ModuleI18nTableMap.php index a8e680f1c..67b7a34ef 100644 --- a/core/lib/Thelia/Model/Map/ModuleI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ModuleI18nTableMap.php @@ -151,7 +151,7 @@ class ModuleI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'module', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/ModuleTableMap.php b/core/lib/Thelia/Model/Map/ModuleTableMap.php index cccaa890a..5370c1da1 100644 --- a/core/lib/Thelia/Model/Map/ModuleTableMap.php +++ b/core/lib/Thelia/Model/Map/ModuleTableMap.php @@ -116,7 +116,7 @@ class ModuleTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/OrderStatusI18nTableMap.php b/core/lib/Thelia/Model/Map/OrderStatusI18nTableMap.php index 1b2052c2e..5d78c474c 100644 --- a/core/lib/Thelia/Model/Map/OrderStatusI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/OrderStatusI18nTableMap.php @@ -151,7 +151,7 @@ class OrderStatusI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'order_status', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/OrderStatusTableMap.php b/core/lib/Thelia/Model/Map/OrderStatusTableMap.php index 18406d9aa..eecfe5a03 100644 --- a/core/lib/Thelia/Model/Map/OrderStatusTableMap.php +++ b/core/lib/Thelia/Model/Map/OrderStatusTableMap.php @@ -101,7 +101,7 @@ class OrderStatusTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/ProductDocumentI18nTableMap.php b/core/lib/Thelia/Model/Map/ProductDocumentI18nTableMap.php index 09e1dc0e4..103914ee6 100644 --- a/core/lib/Thelia/Model/Map/ProductDocumentI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductDocumentI18nTableMap.php @@ -151,7 +151,7 @@ class ProductDocumentI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'product_document', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/ProductDocumentTableMap.php b/core/lib/Thelia/Model/Map/ProductDocumentTableMap.php index ff50bad77..f1420cc43 100644 --- a/core/lib/Thelia/Model/Map/ProductDocumentTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductDocumentTableMap.php @@ -111,7 +111,7 @@ class ProductDocumentTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/ProductI18nTableMap.php b/core/lib/Thelia/Model/Map/ProductI18nTableMap.php index 79a01514a..8da33f15d 100644 --- a/core/lib/Thelia/Model/Map/ProductI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductI18nTableMap.php @@ -151,7 +151,7 @@ class ProductI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'product', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/ProductImageI18nTableMap.php b/core/lib/Thelia/Model/Map/ProductImageI18nTableMap.php index 39ad567f9..de3455c07 100644 --- a/core/lib/Thelia/Model/Map/ProductImageI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductImageI18nTableMap.php @@ -151,7 +151,7 @@ class ProductImageI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'product_image', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/ProductImageTableMap.php b/core/lib/Thelia/Model/Map/ProductImageTableMap.php index 36aabed3e..945799020 100644 --- a/core/lib/Thelia/Model/Map/ProductImageTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductImageTableMap.php @@ -111,7 +111,7 @@ class ProductImageTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/ProductTableMap.php b/core/lib/Thelia/Model/Map/ProductTableMap.php index 75bf5e4e6..ef2cc7ca0 100644 --- a/core/lib/Thelia/Model/Map/ProductTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductTableMap.php @@ -131,7 +131,7 @@ class ProductTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/ResourceI18nTableMap.php b/core/lib/Thelia/Model/Map/ResourceI18nTableMap.php index ec22e2fd3..8a8ce501a 100644 --- a/core/lib/Thelia/Model/Map/ResourceI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/ResourceI18nTableMap.php @@ -151,7 +151,7 @@ class ResourceI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'resource', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null); $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null); diff --git a/core/lib/Thelia/Model/Map/ResourceTableMap.php b/core/lib/Thelia/Model/Map/ResourceTableMap.php index 8d7708ddd..e56960892 100644 --- a/core/lib/Thelia/Model/Map/ResourceTableMap.php +++ b/core/lib/Thelia/Model/Map/ResourceTableMap.php @@ -101,7 +101,7 @@ class ResourceTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/TaxI18nTableMap.php b/core/lib/Thelia/Model/Map/TaxI18nTableMap.php index a06230c37..2c4c92f4f 100644 --- a/core/lib/Thelia/Model/Map/TaxI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/TaxI18nTableMap.php @@ -141,7 +141,7 @@ class TaxI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'tax', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); $this->addColumn('DESCRIPTION', 'Description', 'LONGVARCHAR', false, null, null); } // initialize() diff --git a/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php b/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php index 1f0ed1e96..689f30728 100644 --- a/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php @@ -131,7 +131,7 @@ class TaxRuleI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'tax_rule', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); } // initialize() /** diff --git a/core/lib/Thelia/Model/Map/TaxRuleTableMap.php b/core/lib/Thelia/Model/Map/TaxRuleTableMap.php index cc5f628b9..9b862de99 100644 --- a/core/lib/Thelia/Model/Map/TaxRuleTableMap.php +++ b/core/lib/Thelia/Model/Map/TaxRuleTableMap.php @@ -111,7 +111,7 @@ class TaxRuleTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/core/lib/Thelia/Model/Map/TaxTableMap.php b/core/lib/Thelia/Model/Map/TaxTableMap.php index 6d43f20e9..b941e7b52 100644 --- a/core/lib/Thelia/Model/Map/TaxTableMap.php +++ b/core/lib/Thelia/Model/Map/TaxTableMap.php @@ -101,7 +101,7 @@ class TaxTableMap extends TableMap * * @var string */ - const DEFAULT_LOCALE = 'en_US'; + const DEFAULT_LOCALE = 'en_EN'; /** * holds an array of fieldnames diff --git a/install/thelia.sql b/install/thelia.sql index 9188f164d..502bbd036 100755 --- a/install/thelia.sql +++ b/install/thelia.sql @@ -1117,42 +1117,22 @@ CREATE TABLE `coupon` ( `id` INTEGER NOT NULL AUTO_INCREMENT, `code` VARCHAR(45) NOT NULL, - `action` VARCHAR(255) NOT NULL, + `type` VARCHAR(255) NOT NULL, + `title` VARCHAR(255) NOT NULL, + `short_description` TEXT NOT NULL, + `description` LONGTEXT NOT NULL, `value` FLOAT NOT NULL, - `used` TINYINT, - `available_since` DATETIME, - `date_limit` DATETIME, - `activate` TINYINT, + `is_used` TINYINT NOT NULL, + `is_enabled` TINYINT NOT NULL, + `expiration_date` DATETIME NOT NULL, + `serialized_rules` TEXT NOT NULL, `created_at` DATETIME, `updated_at` DATETIME, + `version` INTEGER DEFAULT 0, PRIMARY KEY (`id`), UNIQUE INDEX `code_UNIQUE` (`code`) ) ENGINE=InnoDB; --- --------------------------------------------------------------------- --- coupon_rule --- --------------------------------------------------------------------- - -DROP TABLE IF EXISTS `coupon_rule`; - -CREATE TABLE `coupon_rule` -( - `id` INTEGER NOT NULL AUTO_INCREMENT, - `coupon_id` INTEGER NOT NULL, - `controller` VARCHAR(255), - `operation` VARCHAR(255), - `value` FLOAT, - `created_at` DATETIME, - `updated_at` DATETIME, - PRIMARY KEY (`id`), - INDEX `idx_coupon_rule_coupon_id` (`coupon_id`), - CONSTRAINT `fk_coupon_rule_coupon_id` - FOREIGN KEY (`coupon_id`) - REFERENCES `coupon` (`id`) - ON UPDATE RESTRICT - ON DELETE CASCADE -) ENGINE=InnoDB; - -- --------------------------------------------------------------------- -- coupon_order -- --------------------------------------------------------------------- @@ -1169,11 +1149,15 @@ CREATE TABLE `coupon_order` `updated_at` DATETIME, PRIMARY KEY (`id`), INDEX `idx_coupon_order_order_id` (`order_id`), + INDEX `fk_coupon_order_coupon_idx` (`code`), CONSTRAINT `fk_coupon_order_order_id` FOREIGN KEY (`order_id`) REFERENCES `order` (`id`) ON UPDATE RESTRICT - ON DELETE CASCADE + ON DELETE CASCADE, + CONSTRAINT `fk_coupon_order_coupon` + FOREIGN KEY (`code`) + REFERENCES `coupon` (`code`) ) ENGINE=InnoDB; -- --------------------------------------------------------------------- @@ -1466,7 +1450,7 @@ DROP TABLE IF EXISTS `category_i18n`; CREATE TABLE `category_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1487,7 +1471,7 @@ DROP TABLE IF EXISTS `product_i18n`; CREATE TABLE `product_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1508,7 +1492,7 @@ DROP TABLE IF EXISTS `country_i18n`; CREATE TABLE `country_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1529,7 +1513,7 @@ DROP TABLE IF EXISTS `tax_i18n`; CREATE TABLE `tax_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` TEXT, PRIMARY KEY (`id`,`locale`), @@ -1548,7 +1532,7 @@ DROP TABLE IF EXISTS `tax_rule_i18n`; CREATE TABLE `tax_rule_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, PRIMARY KEY (`id`,`locale`), CONSTRAINT `tax_rule_i18n_FK_1` FOREIGN KEY (`id`) @@ -1565,7 +1549,7 @@ DROP TABLE IF EXISTS `feature_i18n`; CREATE TABLE `feature_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1586,7 +1570,7 @@ DROP TABLE IF EXISTS `feature_av_i18n`; CREATE TABLE `feature_av_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1607,7 +1591,7 @@ DROP TABLE IF EXISTS `attribute_i18n`; CREATE TABLE `attribute_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1628,7 +1612,7 @@ DROP TABLE IF EXISTS `attribute_av_i18n`; CREATE TABLE `attribute_av_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1649,7 +1633,7 @@ DROP TABLE IF EXISTS `config_i18n`; CREATE TABLE `config_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1670,7 +1654,7 @@ DROP TABLE IF EXISTS `customer_title_i18n`; CREATE TABLE `customer_title_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `short` VARCHAR(10), `long` VARCHAR(45), PRIMARY KEY (`id`,`locale`), @@ -1689,7 +1673,7 @@ DROP TABLE IF EXISTS `folder_i18n`; CREATE TABLE `folder_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1710,7 +1694,7 @@ DROP TABLE IF EXISTS `content_i18n`; CREATE TABLE `content_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1731,7 +1715,7 @@ DROP TABLE IF EXISTS `product_image_i18n`; CREATE TABLE `product_image_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1752,7 +1736,7 @@ DROP TABLE IF EXISTS `product_document_i18n`; CREATE TABLE `product_document_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1773,7 +1757,7 @@ DROP TABLE IF EXISTS `currency_i18n`; CREATE TABLE `currency_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `name` VARCHAR(45), PRIMARY KEY (`id`,`locale`), CONSTRAINT `currency_i18n_FK_1` @@ -1791,7 +1775,7 @@ DROP TABLE IF EXISTS `order_status_i18n`; CREATE TABLE `order_status_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1812,7 +1796,7 @@ DROP TABLE IF EXISTS `module_i18n`; CREATE TABLE `module_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1833,7 +1817,7 @@ DROP TABLE IF EXISTS `group_i18n`; CREATE TABLE `group_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1854,7 +1838,7 @@ DROP TABLE IF EXISTS `resource_i18n`; CREATE TABLE `resource_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1875,7 +1859,7 @@ DROP TABLE IF EXISTS `message_i18n`; CREATE TABLE `message_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` TEXT, `description` LONGTEXT, `description_html` LONGTEXT, @@ -1886,6 +1870,23 @@ CREATE TABLE `message_i18n` ON DELETE CASCADE ) ENGINE=InnoDB; +-- --------------------------------------------------------------------- +-- coupon_i18n +-- --------------------------------------------------------------------- + +DROP TABLE IF EXISTS `coupon_i18n`; + +CREATE TABLE `coupon_i18n` +( + `id` INTEGER NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, + PRIMARY KEY (`id`,`locale`), + CONSTRAINT `coupon_i18n_FK_1` + FOREIGN KEY (`id`) + REFERENCES `coupon` (`id`) + ON DELETE CASCADE +) ENGINE=InnoDB; + -- --------------------------------------------------------------------- -- category_image_i18n -- --------------------------------------------------------------------- @@ -1895,7 +1896,7 @@ DROP TABLE IF EXISTS `category_image_i18n`; CREATE TABLE `category_image_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1916,7 +1917,7 @@ DROP TABLE IF EXISTS `folder_image_i18n`; CREATE TABLE `folder_image_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1937,7 +1938,7 @@ DROP TABLE IF EXISTS `content_image_i18n`; CREATE TABLE `content_image_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1958,7 +1959,7 @@ DROP TABLE IF EXISTS `category_document_i18n`; CREATE TABLE `category_document_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -1979,7 +1980,7 @@ DROP TABLE IF EXISTS `content_document_i18n`; CREATE TABLE `content_document_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -2000,7 +2001,7 @@ DROP TABLE IF EXISTS `folder_document_i18n`; CREATE TABLE `folder_document_i18n` ( `id` INTEGER NOT NULL, - `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, `title` VARCHAR(255), `description` LONGTEXT, `chapo` TEXT, @@ -2132,5 +2133,34 @@ CREATE TABLE `message_version` ON DELETE CASCADE ) ENGINE=InnoDB; +-- --------------------------------------------------------------------- +-- coupon_version +-- --------------------------------------------------------------------- + +DROP TABLE IF EXISTS `coupon_version`; + +CREATE TABLE `coupon_version` +( + `id` INTEGER NOT NULL, + `code` VARCHAR(45) NOT NULL, + `type` VARCHAR(255) NOT NULL, + `title` VARCHAR(255) NOT NULL, + `short_description` TEXT NOT NULL, + `description` LONGTEXT NOT NULL, + `value` FLOAT NOT NULL, + `is_used` TINYINT NOT NULL, + `is_enabled` TINYINT NOT NULL, + `expiration_date` DATETIME NOT NULL, + `serialized_rules` TEXT NOT NULL, + `created_at` DATETIME, + `updated_at` DATETIME, + `version` INTEGER DEFAULT 0 NOT NULL, + PRIMARY KEY (`id`,`version`), + CONSTRAINT `coupon_version_FK_1` + FOREIGN KEY (`id`) + REFERENCES `coupon` (`id`) + ON DELETE CASCADE +) ENGINE=InnoDB; + # This restores the fkey checks, after having unset them earlier SET FOREIGN_KEY_CHECKS = 1; From a9944c73f2bf92df7484019332414cddef0ca229 Mon Sep 17 00:00:00 2001 From: gmorel Date: Thu, 22 Aug 2013 15:18:43 +0200 Subject: [PATCH 007/125] WIP Coupon Use of the Serializer Symfony Component --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 67fb90100..3597db33d 100755 --- a/composer.json +++ b/composer.json @@ -36,7 +36,8 @@ "simplepie/simplepie": "dev-master", - "imagine/imagine": "dev-master" + "imagine/imagine": "dev-master", + "symfony/serializer": "2.2.*" }, "require-dev" : { "phpunit/phpunit": "3.7.*", From 73677b7c1a2d78cf11219096c72f1121f95403d4 Mon Sep 17 00:00:00 2001 From: gmorel Date: Thu, 22 Aug 2013 20:02:03 +0200 Subject: [PATCH 008/125] WIP Coupon Update Coupon Model + SQL Implementattion Fixtures for Coupon and CouponFactory --- core/lib/Thelia/Coupon/CouponFactory.php | 64 +- .../lib/Thelia/Coupon/Parameter/DateParam.php | 13 +- .../Thelia/Coupon/Parameter/IntegerParam.php | 12 +- .../Thelia/Coupon/Parameter/IntervalParam.php | 12 +- .../Thelia/Coupon/Parameter/PriceParam.php | 11 +- .../Thelia/Coupon/Parameter/QuantityParam.php | 2 +- .../Coupon/Parameter/RepeatedDateParam.php | 10 + .../Parameter/RepeatedIntervalParam.php | 10 + .../Thelia/Coupon/Parameter/RepeatedParam.php | 14 +- .../Parameter/RuleParameterInterface.php | 45 + .../Thelia/Coupon/Parameter/RuleValidator.php | 77 + .../Coupon/Rule/AvailableForTotalAmount.php | 48 +- .../Thelia/Coupon/Rule/CouponRuleAbstract.php | 54 +- .../Thelia/Coupon/Type/CouponInterface.php | 11 + core/lib/Thelia/Model/Base/Accessory.php | 13 +- core/lib/Thelia/Model/Base/Category.php | 619 +++-- .../Model/Base/CategoryAssociatedContent.php | 1553 ++++++++++++ .../Base/CategoryAssociatedContentQuery.php | 804 +++++++ core/lib/Thelia/Model/Base/CategoryQuery.php | 154 +- core/lib/Thelia/Model/Base/Content.php | 916 ++++--- core/lib/Thelia/Model/Base/ContentQuery.php | 231 +- core/lib/Thelia/Model/Base/Coupon.php | 312 ++- core/lib/Thelia/Model/Base/CouponI18n.php | 1207 ++++++++++ .../lib/Thelia/Model/Base/CouponI18nQuery.php | 475 ++++ core/lib/Thelia/Model/Base/CouponQuery.php | 183 +- core/lib/Thelia/Model/Base/CouponVersion.php | 2115 +++++++++++++++++ .../Thelia/Model/Base/CouponVersionQuery.php | 1084 +++++++++ core/lib/Thelia/Model/Base/Product.php | 619 +++-- .../Model/Base/ProductAssociatedContent.php | 1553 ++++++++++++ .../Base/ProductAssociatedContentQuery.php | 804 +++++++ core/lib/Thelia/Model/Base/ProductQuery.php | 154 +- .../Model/CategoryAssociatedContent.php | 9 + .../Model/CategoryAssociatedContentQuery.php | 20 + core/lib/Thelia/Model/CouponI18n.php | 9 + core/lib/Thelia/Model/CouponI18nQuery.php | 20 + core/lib/Thelia/Model/CouponVersion.php | 9 + core/lib/Thelia/Model/CouponVersionQuery.php | 20 + .../Thelia/Model/Map/AccessoryTableMap.php | 6 +- .../Map/CategoryAssociatedContentTableMap.php | 456 ++++ .../lib/Thelia/Model/Map/CategoryTableMap.php | 4 +- core/lib/Thelia/Model/Map/ContentTableMap.php | 6 +- .../Thelia/Model/Map/CouponI18nTableMap.php | 465 ++++ core/lib/Thelia/Model/Map/CouponTableMap.php | 72 +- .../Model/Map/CouponVersionTableMap.php | 585 +++++ .../Map/ProductAssociatedContentTableMap.php | 456 ++++ core/lib/Thelia/Model/Map/ProductTableMap.php | 4 +- .../Thelia/Model/ProductAssociatedContent.php | 9 + .../Model/ProductAssociatedContentQuery.php | 20 + .../Rule/AvailableForTotalAmountTest.php | 144 +- install/faker.php | 75 +- install/thelia.sql | 119 +- local/config/schema.xml | 94 +- 52 files changed, 14325 insertions(+), 1456 deletions(-) create mode 100644 core/lib/Thelia/Coupon/Parameter/RuleParameterInterface.php create mode 100644 core/lib/Thelia/Coupon/Parameter/RuleValidator.php create mode 100644 core/lib/Thelia/Model/Base/CategoryAssociatedContent.php create mode 100644 core/lib/Thelia/Model/Base/CategoryAssociatedContentQuery.php create mode 100644 core/lib/Thelia/Model/Base/CouponI18n.php create mode 100644 core/lib/Thelia/Model/Base/CouponI18nQuery.php create mode 100644 core/lib/Thelia/Model/Base/CouponVersion.php create mode 100644 core/lib/Thelia/Model/Base/CouponVersionQuery.php create mode 100644 core/lib/Thelia/Model/Base/ProductAssociatedContent.php create mode 100644 core/lib/Thelia/Model/Base/ProductAssociatedContentQuery.php create mode 100644 core/lib/Thelia/Model/CategoryAssociatedContent.php create mode 100644 core/lib/Thelia/Model/CategoryAssociatedContentQuery.php create mode 100644 core/lib/Thelia/Model/CouponI18n.php create mode 100644 core/lib/Thelia/Model/CouponI18nQuery.php create mode 100644 core/lib/Thelia/Model/CouponVersion.php create mode 100644 core/lib/Thelia/Model/CouponVersionQuery.php create mode 100644 core/lib/Thelia/Model/Map/CategoryAssociatedContentTableMap.php create mode 100644 core/lib/Thelia/Model/Map/CouponI18nTableMap.php create mode 100644 core/lib/Thelia/Model/Map/CouponVersionTableMap.php create mode 100644 core/lib/Thelia/Model/Map/ProductAssociatedContentTableMap.php create mode 100644 core/lib/Thelia/Model/ProductAssociatedContent.php create mode 100644 core/lib/Thelia/Model/ProductAssociatedContentQuery.php diff --git a/core/lib/Thelia/Coupon/CouponFactory.php b/core/lib/Thelia/Coupon/CouponFactory.php index 7f74c7f21..f81e95b97 100644 --- a/core/lib/Thelia/Coupon/CouponFactory.php +++ b/core/lib/Thelia/Coupon/CouponFactory.php @@ -24,6 +24,12 @@ namespace Thelia\Coupon; use Thelia\Coupon\Type\CouponInterface; +use Thelia\Coupon\Type\RemoveXAmount; +use Thelia\Model\Base\CouponQuery; +use Thelia\Model\Coupon; +use Symfony\Component\Serializer\Serializer; +use Symfony\Component\Serializer\Encoder\JsonEncoder; +use Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer; /** * Created by JetBrains PhpStorm. @@ -41,11 +47,67 @@ class CouponFactory /** * Build a CouponInterface from its database data * - * @param int $couponCode CouponInterface id + * @param string $couponCode Coupon code ex: XMAS * * @return CouponInterface ready to be processed */ public function buildCouponFromCode($couponCode) { + + $couponQuery = CouponQuery::create(); + $couponModel = $couponQuery->findByCode($couponCode); + + return $this->buildCouponInterfacFromModel($couponModel); + } + + /** + * Build a CouponInterface from its Model data contained in the DataBase + * + * @param Coupon $model Database data + * + * @return CouponInterface ready to use CouponInterface object instance + */ + protected function buildCouponInterfacFromModel(Coupon $model) + { + $isCumulative = ($model->getIsCumulative() == 1 ? true : false); + $isRemovingPostage = ($model->getIsRemovingPostage() == 1 ? true : false); + $couponClass = $model->getType(); + + /** @var CouponInterface $coupon*/ + $coupon = new $$couponClass( + $model->getCode(), + $model->getTitle(), + $model->getShortDescription(), + $model->getDescription(), + $model->getAmount(), + $isCumulative, + $isRemovingPostage + ); + + $normalizer = new GetSetMethodNormalizer(); + $encoder = new JsonEncoder(); + + $serializer = new Serializer(array($normalizer), array($encoder)); + + $o = new \ArrayObject(); + $unserializedRuleTypes = $o->unserialize( + $model->getSerializedRulesType() + ); + $unserializedRuleContents = $o->unserialize( + $model->getSerializedRulesContent() + ); + + $rules = array(); + foreach ($unserializedRuleTypes as $key => $unserializedRuleType) { + $rules[] = $serializer->deserialize( + $unserializedRuleContents[$key], + $unserializedRuleType, + 'json' + ); + } + + $coupon->setRules($rules); + + return $coupon; } } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Parameter/DateParam.php b/core/lib/Thelia/Coupon/Parameter/DateParam.php index fa4ea7d97..989477210 100644 --- a/core/lib/Thelia/Coupon/Parameter/DateParam.php +++ b/core/lib/Thelia/Coupon/Parameter/DateParam.php @@ -36,7 +36,7 @@ use Thelia\Coupon\Parameter\ComparableInterface; * @author Guillaume MOREL * */ -class DateParam implements ComparableInterface +class DateParam implements ComparableInterface, RuleParameterInterface { /** @var \DateTime Date */ protected $dateTime = null; @@ -93,4 +93,15 @@ class DateParam implements ComparableInterface return $ret; } + /** + * Get Parameter value to test against + * + * @return \Datetime + */ + public function getValue() + { + return clone $this->dateTime; + } + + } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Parameter/IntegerParam.php b/core/lib/Thelia/Coupon/Parameter/IntegerParam.php index c4d6ca5e7..14d63417b 100644 --- a/core/lib/Thelia/Coupon/Parameter/IntegerParam.php +++ b/core/lib/Thelia/Coupon/Parameter/IntegerParam.php @@ -36,7 +36,7 @@ use Thelia\Coupon\Parameter\ComparableInterface; * @author Guillaume MOREL * */ -class IntegerParam implements ComparableInterface +class IntegerParam implements ComparableInterface, RuleParameterInterface { /** @var int Integer to compare with */ protected $integer = 0; @@ -94,4 +94,14 @@ class IntegerParam implements ComparableInterface return $ret; } + /** + * Get Parameter value to test against + * + * @return int + */ + public function getValue() + { + return $this->integer; + } + } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Parameter/IntervalParam.php b/core/lib/Thelia/Coupon/Parameter/IntervalParam.php index 88444fe36..3e29d24be 100644 --- a/core/lib/Thelia/Coupon/Parameter/IntervalParam.php +++ b/core/lib/Thelia/Coupon/Parameter/IntervalParam.php @@ -34,7 +34,7 @@ namespace Thelia\Coupon\Parameter; * @author Guillaume MOREL * */ -class IntervalParam implements ComparableInterface +class IntervalParam implements ComparableInterface, RuleParameterInterface { /** @var \DatePeriod Date period */ protected $datePeriod = null; @@ -105,4 +105,14 @@ class IntervalParam implements ComparableInterface return $ret; } + + /** + * Get Parameter value to test against + * + * @return \DatePeriod + */ + public function getValue() + { + return clone $this->datePeriod; + } } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Parameter/PriceParam.php b/core/lib/Thelia/Coupon/Parameter/PriceParam.php index 7d74101a0..2f3834777 100644 --- a/core/lib/Thelia/Coupon/Parameter/PriceParam.php +++ b/core/lib/Thelia/Coupon/Parameter/PriceParam.php @@ -37,7 +37,7 @@ use Thelia\Coupon\Parameter\ComparableInterface; * @author Guillaume MOREL * */ -class PriceParam implements ComparableInterface +class PriceParam implements ComparableInterface, RuleParameterInterface { /** @var float Positive Float to compare with */ protected $price = null; @@ -113,4 +113,13 @@ class PriceParam implements ComparableInterface return $ret; } + /** + * Get Parameter value to test against + * + * @return float + */ + public function getValue() + { + return $this->price; + } } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Parameter/QuantityParam.php b/core/lib/Thelia/Coupon/Parameter/QuantityParam.php index e4dffb221..526aa4152 100644 --- a/core/lib/Thelia/Coupon/Parameter/QuantityParam.php +++ b/core/lib/Thelia/Coupon/Parameter/QuantityParam.php @@ -75,4 +75,4 @@ class QuantityParam extends IntegerParam return parent::compareTo($other); } -} \ No newline at end of file +} diff --git a/core/lib/Thelia/Coupon/Parameter/RepeatedDateParam.php b/core/lib/Thelia/Coupon/Parameter/RepeatedDateParam.php index dc99a0d26..2e99391e6 100644 --- a/core/lib/Thelia/Coupon/Parameter/RepeatedDateParam.php +++ b/core/lib/Thelia/Coupon/Parameter/RepeatedDateParam.php @@ -87,4 +87,14 @@ class RepeatedDateParam extends RepeatedParam return $ret; } + + /** + * Get Parameter value to test against + * + * @return \DatePeriod + */ + public function getValue() + { + return clone $this->datePeriod; + } } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Parameter/RepeatedIntervalParam.php b/core/lib/Thelia/Coupon/Parameter/RepeatedIntervalParam.php index 4d857716f..3c4de7348 100644 --- a/core/lib/Thelia/Coupon/Parameter/RepeatedIntervalParam.php +++ b/core/lib/Thelia/Coupon/Parameter/RepeatedIntervalParam.php @@ -121,4 +121,14 @@ class RepeatedIntervalParam extends RepeatedParam return $ret; } + + /** + * Get Parameter value to test against + * + * @return \DatePeriod + */ + public function getValue() + { + return clone $this->datePeriod; + } } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Parameter/RepeatedParam.php b/core/lib/Thelia/Coupon/Parameter/RepeatedParam.php index 1d9dd4905..dba3de0af 100644 --- a/core/lib/Thelia/Coupon/Parameter/RepeatedParam.php +++ b/core/lib/Thelia/Coupon/Parameter/RepeatedParam.php @@ -38,7 +38,7 @@ use DateTime; * @author Guillaume MOREL * */ -abstract class RepeatedParam implements ComparableInterface +abstract class RepeatedParam implements ComparableInterface, RuleParameterInterface { /** @var DateTime The start date of the period. */ protected $from = null; @@ -232,10 +232,20 @@ abstract class RepeatedParam implements ComparableInterface /** * Get date DatePeriod * - * @return DatePeriod + * @return \DatePeriod */ public function getDatePeriod() { return clone $this->datePeriod; } + + /** + * Get Parameter value to test against + * + * @return \DatePeriod + */ + public function getValue() + { + return clone $this->datePeriod; + } } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Parameter/RuleParameterInterface.php b/core/lib/Thelia/Coupon/Parameter/RuleParameterInterface.php new file mode 100644 index 000000000..4583bd799 --- /dev/null +++ b/core/lib/Thelia/Coupon/Parameter/RuleParameterInterface.php @@ -0,0 +1,45 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Coupon\Parameter; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Get a Param value + * + * @package Coupon + * @author Guillaume MOREL + * + */ +interface RuleParameterInterface +{ + /** + * Get Parameter value to test against + * + * @return mixed + */ + public function getValue(); +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Parameter/RuleValidator.php b/core/lib/Thelia/Coupon/Parameter/RuleValidator.php new file mode 100644 index 000000000..f6ffc3b13 --- /dev/null +++ b/core/lib/Thelia/Coupon/Parameter/RuleValidator.php @@ -0,0 +1,77 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Coupon\Parameter; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Allow to validate parameters + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class RuleValidator +{ + /** @var string Operator ex: Operators::INFERIOR */ + protected $operator = null; + + /** @var ComparableInterface Validator */ + protected $param = null; + + /** + * Constructor + * + * @param string $operator Operator ex: Operators::INFERIOR + * @param ComparableInterface $param Validator ex: PriceParam + */ + function __construct($operator, ComparableInterface $param) + { + $this->operator = $operator; + $this->param = $param; + } + + /** + * Get Validator Operator + * + * @return string + */ + public function getOperator() + { + return $this->operator; + } + + /** + * Get Validator Param + * + * @return ComparableInterface + */ + public function getParam() + { + return $this->param; + } + +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmount.php b/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmount.php index 2f1de57ba..2e109f9ec 100644 --- a/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmount.php +++ b/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmount.php @@ -26,6 +26,8 @@ namespace Thelia\Coupon\Rule; use Symfony\Component\Intl\Exception\NotImplementedException; use Thelia\Coupon\CouponAdapterInterface; use Thelia\Coupon\Parameter\PriceParam; +use Thelia\Coupon\Parameter\RuleValidator; +use Thelia\Exception\InvalidRuleException; use Thelia\Exception\InvalidRuleOperatorException; use Thelia\Exception\InvalidRuleValueException; @@ -53,20 +55,30 @@ class AvailableForTotalAmount extends CouponRuleAbstract Operators::SUPERIOR, ); - /** @var PriceParam Price Validator */ + /** @var RuleValidator Price Validator */ protected $priceValidator = null; /** * Constructor * - * @param array $validators Parameters validating $paramsToValidate against + * @param array $validators Array of RuleValidator + * validating $paramsToValidate against * @param array $validated Parameters to be paramsToValidate + * + * @throws \Thelia\Exception\InvalidRuleException */ public function __construct(array $validators, array $validated = null) { parent::__construct($validators, $validated); - $this->priceValidator = $validators[self::PARAM1_PRICE][self::VALUE]; + if (isset($validators[self::PARAM1_PRICE]) + && $validators[self::PARAM1_PRICE] instanceof RuleValidator + ) { + $this->priceValidator = $validators[self::PARAM1_PRICE]; + } else { + throw new InvalidRuleException(get_class()); + } + } @@ -82,16 +94,23 @@ class AvailableForTotalAmount extends CouponRuleAbstract if (!isset($this->validators) || empty($this->validators) ||!isset($this->validators[self::PARAM1_PRICE]) - ||!isset($this->validators[self::PARAM1_PRICE][self::VALUE]) - ||!$this->validators[self::PARAM1_PRICE][self::VALUE] instanceof PriceParam + ||!isset($this->validators[self::PARAM1_PRICE]) ) { throw new InvalidRuleValueException(get_class(), self::PARAM1_PRICE); } + /** @var RuleValidator $ruleValidator */ + $ruleValidator = $this->validators[self::PARAM1_PRICE]; + /** @var PriceParam $price */ + $price = $ruleValidator->getParam(); + + if (!$price instanceof PriceParam) { + throw new InvalidRuleValueException(get_class(), self::PARAM1_PRICE); + } + $this->checkBackOfficeInputsOperators(); - /** @var PriceParam $price */ - $price = $this->validators[self::PARAM1_PRICE][self::VALUE]; + return $this->isPriceValid($price->getPrice()); } @@ -128,7 +147,7 @@ class AvailableForTotalAmount extends CouponRuleAbstract { $priceValidator = $this->priceValidator; try { - $priceValidator->compareTo($price); + $priceValidator->getParam()->compareTo($price); } catch(\InvalidArgumentException $e) { throw new InvalidRuleValueException(get_class(), self::PARAM1_PRICE); } @@ -145,7 +164,7 @@ class AvailableForTotalAmount extends CouponRuleAbstract * @throws \Symfony\Component\Intl\Exception\NotImplementedException * @return $this */ - protected function setValidators(CouponAdapterInterface $adapter) + protected function setValidatorsFromAdapter(CouponAdapterInterface $adapter) { $adapter->getRule($this); } @@ -167,5 +186,16 @@ class AvailableForTotalAmount extends CouponRuleAbstract return $this; } + /** + * Return all validators + * Serialization purpose + * + * @return array + */ + public function getValidators() + { + return $this->validators; + } + } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/CouponRuleAbstract.php b/core/lib/Thelia/Coupon/Rule/CouponRuleAbstract.php index a8a51cd00..4bdd0d57d 100644 --- a/core/lib/Thelia/Coupon/Rule/CouponRuleAbstract.php +++ b/core/lib/Thelia/Coupon/Rule/CouponRuleAbstract.php @@ -26,6 +26,8 @@ namespace Thelia\Coupon\Rule; use Symfony\Component\Intl\Exception\NotImplementedException; use Thelia\Coupon\CouponAdapterInterface; use Thelia\Coupon\Parameter\ComparableInterface; +use Thelia\Coupon\Parameter\RuleValidator; +use Thelia\Exception\InvalidRuleException; use Thelia\Exception\InvalidRuleOperatorException; /** @@ -59,21 +61,48 @@ abstract class CouponRuleAbstract implements CouponRuleInterface * Constructor * Ex: * Param 1 : - * $validators['price']['operator'] = Operators::INFERIOR - * ['value'] = new IntegerParam(10) + * $priceValidator = new RuleValidator( + * Operators::INFERIOR, + * new IntegerParam(10) + * ) + * $validators[AvailableForTotalAmount::PARAM1_PRICE] = $priceValidator * * Param 2 : - * $paramsToValidate['price'] = 9 + * $paramsToValidate[AvailableForTotalAmount::PARAM1_PRICE] = 9 * - * @param array $validators Parameters validating $paramsToValidate against + * @param array $validators Array of RuleValidator + * validating $paramsToValidate against * @param array $validated Parameters to be paramsToValidate + * + * @throws InvalidRuleException */ public function __construct(array $validators, array $validated = null) { - $this->validators = $validators; + $this->setValidators($validators); $this->paramsToValidate = $validated; } + /** + * Check validator relevancy and store them + * + * @param array $validators Array of RuleValidator + * validating $paramsToValidate against + * + * @return $this + * @throws InvalidRuleException + */ + protected function setValidators(array $validators) + { + foreach ($validators as $validator) { + if (!$validator instanceof RuleValidator) { + throw new InvalidRuleException(get_class()); + } + } + $this->validators = $validators; + + return $this; + } + /** * Check if the current Checkout matches this condition * @@ -85,11 +114,12 @@ abstract class CouponRuleAbstract implements CouponRuleInterface $this->checkCheckoutInput(); $isMatching = true; + /** @var $validator RuleValidator*/ foreach ($this->validators as $param => $validator) { $a = $this->paramsToValidate[$param]; - $operator = $validator[self::OPERATOR]; - /** @var ComparableInterface $b */ - $b = $validator[self::VALUE]; + $operator = $validator->getOperator(); + /** @var ComparableInterface, RuleParameterInterface $b */ + $b = $validator->getParam(); if (!Operators::isValidAccordingToOperator($a, $operator, $b)) { $isMatching = false; @@ -118,9 +148,11 @@ abstract class CouponRuleAbstract implements CouponRuleInterface */ protected function checkBackOfficeInputsOperators() { + /** @var RuleValidator $param */ foreach ($this->validators as $key => $param) { - if (!isset($param[self::OPERATOR]) - ||!in_array($param[self::OPERATOR], $this->availableOperators) + $operator = $param->getOperator(); + if (!isset($operator) + ||!in_array($operator, $this->availableOperators) ) { throw new InvalidRuleOperatorException(get_class(), $key); } @@ -137,7 +169,7 @@ abstract class CouponRuleAbstract implements CouponRuleInterface * @throws \Symfony\Component\Intl\Exception\NotImplementedException * @return $this */ - protected function setValidators(CouponAdapterInterface $adapter) + protected function setValidatorsFromAdapter(CouponAdapterInterface $adapter) { throw new NotImplementedException( 'CouponRuleInterface::setValidators needs to be implemented' diff --git a/core/lib/Thelia/Coupon/Type/CouponInterface.php b/core/lib/Thelia/Coupon/Type/CouponInterface.php index e2f49e3bb..8c51126ea 100644 --- a/core/lib/Thelia/Coupon/Type/CouponInterface.php +++ b/core/lib/Thelia/Coupon/Type/CouponInterface.php @@ -109,4 +109,15 @@ interface CouponInterface * @return bool */ public function isMatching(); + + /** + * Replace the existing Rules by those given in parameter + * If one Rule is badly implemented, no Rule will be added + * + * @param array $rules CouponRuleInterface to add + * + * @return $this + * @throws \Thelia\Exception\InvalidRuleException + */ + public function setRules(array $rules); } diff --git a/core/lib/Thelia/Model/Base/Accessory.php b/core/lib/Thelia/Model/Base/Accessory.php index f5acd9977..f4110b19e 100644 --- a/core/lib/Thelia/Model/Base/Accessory.php +++ b/core/lib/Thelia/Model/Base/Accessory.php @@ -891,6 +891,10 @@ abstract class Accessory implements ActiveRecordInterface $modifiedColumns = array(); $index = 0; + $this->modifiedColumns[] = AccessoryTableMap::ID; + if (null !== $this->id) { + throw new PropelException('Cannot insert a value for auto-increment primary key (' . AccessoryTableMap::ID . ')'); + } // check the columns in natural order for more readable SQL queries if ($this->isColumnModified(AccessoryTableMap::ID)) { @@ -948,6 +952,13 @@ abstract class Accessory implements ActiveRecordInterface throw new PropelException(sprintf('Unable to execute INSERT statement [%s]', $sql), 0, $e); } + try { + $pk = $con->lastInsertId(); + } catch (Exception $e) { + throw new PropelException('Unable to get autoincrement id.', 0, $e); + } + $this->setId($pk); + $this->setNew(false); } @@ -1224,7 +1235,6 @@ abstract class Accessory implements ActiveRecordInterface */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) { - $copyObj->setId($this->getId()); $copyObj->setProductId($this->getProductId()); $copyObj->setAccessory($this->getAccessory()); $copyObj->setPosition($this->getPosition()); @@ -1232,6 +1242,7 @@ abstract class Accessory implements ActiveRecordInterface $copyObj->setUpdatedAt($this->getUpdatedAt()); if ($makeNew) { $copyObj->setNew(true); + $copyObj->setId(NULL); // this is a auto-increment column, so set to default value } } diff --git a/core/lib/Thelia/Model/Base/Category.php b/core/lib/Thelia/Model/Base/Category.php index 2f05de899..810283e44 100644 --- a/core/lib/Thelia/Model/Base/Category.php +++ b/core/lib/Thelia/Model/Base/Category.php @@ -22,6 +22,8 @@ use Thelia\Model\AttributeCategory as ChildAttributeCategory; use Thelia\Model\AttributeCategoryQuery as ChildAttributeCategoryQuery; use Thelia\Model\AttributeQuery as ChildAttributeQuery; use Thelia\Model\Category as ChildCategory; +use Thelia\Model\CategoryAssociatedContent as ChildCategoryAssociatedContent; +use Thelia\Model\CategoryAssociatedContentQuery as ChildCategoryAssociatedContentQuery; use Thelia\Model\CategoryDocument as ChildCategoryDocument; use Thelia\Model\CategoryDocumentQuery as ChildCategoryDocumentQuery; use Thelia\Model\CategoryI18n as ChildCategoryI18n; @@ -31,8 +33,6 @@ use Thelia\Model\CategoryImageQuery as ChildCategoryImageQuery; use Thelia\Model\CategoryQuery as ChildCategoryQuery; use Thelia\Model\CategoryVersion as ChildCategoryVersion; use Thelia\Model\CategoryVersionQuery as ChildCategoryVersionQuery; -use Thelia\Model\ContentAssoc as ChildContentAssoc; -use Thelia\Model\ContentAssocQuery as ChildContentAssocQuery; use Thelia\Model\Feature as ChildFeature; use Thelia\Model\FeatureCategory as ChildFeatureCategory; use Thelia\Model\FeatureCategoryQuery as ChildFeatureCategoryQuery; @@ -153,12 +153,6 @@ abstract class Category implements ActiveRecordInterface protected $collAttributeCategories; protected $collAttributeCategoriesPartial; - /** - * @var ObjectCollection|ChildContentAssoc[] Collection to store aggregation of ChildContentAssoc objects. - */ - protected $collContentAssocs; - protected $collContentAssocsPartial; - /** * @var ObjectCollection|ChildRewriting[] Collection to store aggregation of ChildRewriting objects. */ @@ -177,6 +171,12 @@ abstract class Category implements ActiveRecordInterface protected $collCategoryDocuments; protected $collCategoryDocumentsPartial; + /** + * @var ObjectCollection|ChildCategoryAssociatedContent[] Collection to store aggregation of ChildCategoryAssociatedContent objects. + */ + protected $collCategoryAssociatedContents; + protected $collCategoryAssociatedContentsPartial; + /** * @var ObjectCollection|ChildCategoryI18n[] Collection to store aggregation of ChildCategoryI18n objects. */ @@ -270,12 +270,6 @@ abstract class Category implements ActiveRecordInterface */ protected $attributeCategoriesScheduledForDeletion = null; - /** - * An array of objects scheduled for deletion. - * @var ObjectCollection - */ - protected $contentAssocsScheduledForDeletion = null; - /** * An array of objects scheduled for deletion. * @var ObjectCollection @@ -294,6 +288,12 @@ abstract class Category implements ActiveRecordInterface */ protected $categoryDocumentsScheduledForDeletion = null; + /** + * An array of objects scheduled for deletion. + * @var ObjectCollection + */ + protected $categoryAssociatedContentsScheduledForDeletion = null; + /** * An array of objects scheduled for deletion. * @var ObjectCollection @@ -1039,14 +1039,14 @@ abstract class Category implements ActiveRecordInterface $this->collAttributeCategories = null; - $this->collContentAssocs = null; - $this->collRewritings = null; $this->collCategoryImages = null; $this->collCategoryDocuments = null; + $this->collCategoryAssociatedContents = null; + $this->collCategoryI18ns = null; $this->collCategoryVersions = null; @@ -1331,23 +1331,6 @@ abstract class Category implements ActiveRecordInterface } } - if ($this->contentAssocsScheduledForDeletion !== null) { - if (!$this->contentAssocsScheduledForDeletion->isEmpty()) { - \Thelia\Model\ContentAssocQuery::create() - ->filterByPrimaryKeys($this->contentAssocsScheduledForDeletion->getPrimaryKeys(false)) - ->delete($con); - $this->contentAssocsScheduledForDeletion = null; - } - } - - if ($this->collContentAssocs !== null) { - foreach ($this->collContentAssocs as $referrerFK) { - if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) { - $affectedRows += $referrerFK->save($con); - } - } - } - if ($this->rewritingsScheduledForDeletion !== null) { if (!$this->rewritingsScheduledForDeletion->isEmpty()) { \Thelia\Model\RewritingQuery::create() @@ -1399,6 +1382,23 @@ abstract class Category implements ActiveRecordInterface } } + if ($this->categoryAssociatedContentsScheduledForDeletion !== null) { + if (!$this->categoryAssociatedContentsScheduledForDeletion->isEmpty()) { + \Thelia\Model\CategoryAssociatedContentQuery::create() + ->filterByPrimaryKeys($this->categoryAssociatedContentsScheduledForDeletion->getPrimaryKeys(false)) + ->delete($con); + $this->categoryAssociatedContentsScheduledForDeletion = null; + } + } + + if ($this->collCategoryAssociatedContents !== null) { + foreach ($this->collCategoryAssociatedContents as $referrerFK) { + if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) { + $affectedRows += $referrerFK->save($con); + } + } + } + if ($this->categoryI18nsScheduledForDeletion !== null) { if (!$this->categoryI18nsScheduledForDeletion->isEmpty()) { \Thelia\Model\CategoryI18nQuery::create() @@ -1668,9 +1668,6 @@ abstract class Category implements ActiveRecordInterface if (null !== $this->collAttributeCategories) { $result['AttributeCategories'] = $this->collAttributeCategories->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } - if (null !== $this->collContentAssocs) { - $result['ContentAssocs'] = $this->collContentAssocs->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); - } if (null !== $this->collRewritings) { $result['Rewritings'] = $this->collRewritings->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } @@ -1680,6 +1677,9 @@ abstract class Category implements ActiveRecordInterface if (null !== $this->collCategoryDocuments) { $result['CategoryDocuments'] = $this->collCategoryDocuments->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } + if (null !== $this->collCategoryAssociatedContents) { + $result['CategoryAssociatedContents'] = $this->collCategoryAssociatedContents->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); + } if (null !== $this->collCategoryI18ns) { $result['CategoryI18ns'] = $this->collCategoryI18ns->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } @@ -1895,12 +1895,6 @@ abstract class Category implements ActiveRecordInterface } } - foreach ($this->getContentAssocs() as $relObj) { - if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves - $copyObj->addContentAssoc($relObj->copy($deepCopy)); - } - } - foreach ($this->getRewritings() as $relObj) { if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves $copyObj->addRewriting($relObj->copy($deepCopy)); @@ -1919,6 +1913,12 @@ abstract class Category implements ActiveRecordInterface } } + foreach ($this->getCategoryAssociatedContents() as $relObj) { + if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves + $copyObj->addCategoryAssociatedContent($relObj->copy($deepCopy)); + } + } + foreach ($this->getCategoryI18ns() as $relObj) { if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves $copyObj->addCategoryI18n($relObj->copy($deepCopy)); @@ -1981,9 +1981,6 @@ abstract class Category implements ActiveRecordInterface if ('AttributeCategory' == $relationName) { return $this->initAttributeCategories(); } - if ('ContentAssoc' == $relationName) { - return $this->initContentAssocs(); - } if ('Rewriting' == $relationName) { return $this->initRewritings(); } @@ -1993,6 +1990,9 @@ abstract class Category implements ActiveRecordInterface if ('CategoryDocument' == $relationName) { return $this->initCategoryDocuments(); } + if ('CategoryAssociatedContent' == $relationName) { + return $this->initCategoryAssociatedContents(); + } if ('CategoryI18n' == $relationName) { return $this->initCategoryI18ns(); } @@ -2733,274 +2733,6 @@ abstract class Category implements ActiveRecordInterface return $this->getAttributeCategories($query, $con); } - /** - * Clears out the collContentAssocs collection - * - * This does not modify the database; however, it will remove any associated objects, causing - * them to be refetched by subsequent calls to accessor method. - * - * @return void - * @see addContentAssocs() - */ - public function clearContentAssocs() - { - $this->collContentAssocs = null; // important to set this to NULL since that means it is uninitialized - } - - /** - * Reset is the collContentAssocs collection loaded partially. - */ - public function resetPartialContentAssocs($v = true) - { - $this->collContentAssocsPartial = $v; - } - - /** - * Initializes the collContentAssocs collection. - * - * By default this just sets the collContentAssocs collection to an empty array (like clearcollContentAssocs()); - * however, you may wish to override this method in your stub class to provide setting appropriate - * to your application -- for example, setting the initial array to the values stored in database. - * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty - * - * @return void - */ - public function initContentAssocs($overrideExisting = true) - { - if (null !== $this->collContentAssocs && !$overrideExisting) { - return; - } - $this->collContentAssocs = new ObjectCollection(); - $this->collContentAssocs->setModel('\Thelia\Model\ContentAssoc'); - } - - /** - * Gets an array of ChildContentAssoc objects which contain a foreign key that references this object. - * - * If the $criteria is not null, it is used to always fetch the results from the database. - * Otherwise the results are fetched from the database the first time, then cached. - * Next time the same method is called without $criteria, the cached collection is returned. - * If this ChildCategory is new, it will return - * an empty collection or the current collection; the criteria is ignored on a new object. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @return Collection|ChildContentAssoc[] List of ChildContentAssoc objects - * @throws PropelException - */ - public function getContentAssocs($criteria = null, ConnectionInterface $con = null) - { - $partial = $this->collContentAssocsPartial && !$this->isNew(); - if (null === $this->collContentAssocs || null !== $criteria || $partial) { - if ($this->isNew() && null === $this->collContentAssocs) { - // return empty collection - $this->initContentAssocs(); - } else { - $collContentAssocs = ChildContentAssocQuery::create(null, $criteria) - ->filterByCategory($this) - ->find($con); - - if (null !== $criteria) { - if (false !== $this->collContentAssocsPartial && count($collContentAssocs)) { - $this->initContentAssocs(false); - - foreach ($collContentAssocs as $obj) { - if (false == $this->collContentAssocs->contains($obj)) { - $this->collContentAssocs->append($obj); - } - } - - $this->collContentAssocsPartial = true; - } - - $collContentAssocs->getInternalIterator()->rewind(); - - return $collContentAssocs; - } - - if ($partial && $this->collContentAssocs) { - foreach ($this->collContentAssocs as $obj) { - if ($obj->isNew()) { - $collContentAssocs[] = $obj; - } - } - } - - $this->collContentAssocs = $collContentAssocs; - $this->collContentAssocsPartial = false; - } - } - - return $this->collContentAssocs; - } - - /** - * Sets a collection of ContentAssoc objects related by a one-to-many relationship - * to the current object. - * It will also schedule objects for deletion based on a diff between old objects (aka persisted) - * and new objects from the given Propel collection. - * - * @param Collection $contentAssocs A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildCategory The current object (for fluent API support) - */ - public function setContentAssocs(Collection $contentAssocs, ConnectionInterface $con = null) - { - $contentAssocsToDelete = $this->getContentAssocs(new Criteria(), $con)->diff($contentAssocs); - - - $this->contentAssocsScheduledForDeletion = $contentAssocsToDelete; - - foreach ($contentAssocsToDelete as $contentAssocRemoved) { - $contentAssocRemoved->setCategory(null); - } - - $this->collContentAssocs = null; - foreach ($contentAssocs as $contentAssoc) { - $this->addContentAssoc($contentAssoc); - } - - $this->collContentAssocs = $contentAssocs; - $this->collContentAssocsPartial = false; - - return $this; - } - - /** - * Returns the number of related ContentAssoc objects. - * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ContentAssoc objects. - * @throws PropelException - */ - public function countContentAssocs(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) - { - $partial = $this->collContentAssocsPartial && !$this->isNew(); - if (null === $this->collContentAssocs || null !== $criteria || $partial) { - if ($this->isNew() && null === $this->collContentAssocs) { - return 0; - } - - if ($partial && !$criteria) { - return count($this->getContentAssocs()); - } - - $query = ChildContentAssocQuery::create(null, $criteria); - if ($distinct) { - $query->distinct(); - } - - return $query - ->filterByCategory($this) - ->count($con); - } - - return count($this->collContentAssocs); - } - - /** - * Method called to associate a ChildContentAssoc object to this object - * through the ChildContentAssoc foreign key attribute. - * - * @param ChildContentAssoc $l ChildContentAssoc - * @return \Thelia\Model\Category The current object (for fluent API support) - */ - public function addContentAssoc(ChildContentAssoc $l) - { - if ($this->collContentAssocs === null) { - $this->initContentAssocs(); - $this->collContentAssocsPartial = true; - } - - if (!in_array($l, $this->collContentAssocs->getArrayCopy(), true)) { // only add it if the **same** object is not already associated - $this->doAddContentAssoc($l); - } - - return $this; - } - - /** - * @param ContentAssoc $contentAssoc The contentAssoc object to add. - */ - protected function doAddContentAssoc($contentAssoc) - { - $this->collContentAssocs[]= $contentAssoc; - $contentAssoc->setCategory($this); - } - - /** - * @param ContentAssoc $contentAssoc The contentAssoc object to remove. - * @return ChildCategory The current object (for fluent API support) - */ - public function removeContentAssoc($contentAssoc) - { - if ($this->getContentAssocs()->contains($contentAssoc)) { - $this->collContentAssocs->remove($this->collContentAssocs->search($contentAssoc)); - if (null === $this->contentAssocsScheduledForDeletion) { - $this->contentAssocsScheduledForDeletion = clone $this->collContentAssocs; - $this->contentAssocsScheduledForDeletion->clear(); - } - $this->contentAssocsScheduledForDeletion[]= $contentAssoc; - $contentAssoc->setCategory(null); - } - - return $this; - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Category is new, it will return - * an empty collection; or if this Category has previously - * been saved, it will retrieve related ContentAssocs from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Category. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildContentAssoc[] List of ChildContentAssoc objects - */ - public function getContentAssocsJoinProduct($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildContentAssocQuery::create(null, $criteria); - $query->joinWith('Product', $joinBehavior); - - return $this->getContentAssocs($query, $con); - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Category is new, it will return - * an empty collection; or if this Category has previously - * been saved, it will retrieve related ContentAssocs from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Category. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildContentAssoc[] List of ChildContentAssoc objects - */ - public function getContentAssocsJoinContent($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildContentAssocQuery::create(null, $criteria); - $query->joinWith('Content', $joinBehavior); - - return $this->getContentAssocs($query, $con); - } - /** * Clears out the collRewritings collection * @@ -3730,6 +3462,249 @@ abstract class Category implements ActiveRecordInterface return $this; } + /** + * Clears out the collCategoryAssociatedContents collection + * + * This does not modify the database; however, it will remove any associated objects, causing + * them to be refetched by subsequent calls to accessor method. + * + * @return void + * @see addCategoryAssociatedContents() + */ + public function clearCategoryAssociatedContents() + { + $this->collCategoryAssociatedContents = null; // important to set this to NULL since that means it is uninitialized + } + + /** + * Reset is the collCategoryAssociatedContents collection loaded partially. + */ + public function resetPartialCategoryAssociatedContents($v = true) + { + $this->collCategoryAssociatedContentsPartial = $v; + } + + /** + * Initializes the collCategoryAssociatedContents collection. + * + * By default this just sets the collCategoryAssociatedContents collection to an empty array (like clearcollCategoryAssociatedContents()); + * however, you may wish to override this method in your stub class to provide setting appropriate + * to your application -- for example, setting the initial array to the values stored in database. + * + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty + * + * @return void + */ + public function initCategoryAssociatedContents($overrideExisting = true) + { + if (null !== $this->collCategoryAssociatedContents && !$overrideExisting) { + return; + } + $this->collCategoryAssociatedContents = new ObjectCollection(); + $this->collCategoryAssociatedContents->setModel('\Thelia\Model\CategoryAssociatedContent'); + } + + /** + * Gets an array of ChildCategoryAssociatedContent objects which contain a foreign key that references this object. + * + * If the $criteria is not null, it is used to always fetch the results from the database. + * Otherwise the results are fetched from the database the first time, then cached. + * Next time the same method is called without $criteria, the cached collection is returned. + * If this ChildCategory is new, it will return + * an empty collection or the current collection; the criteria is ignored on a new object. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @return Collection|ChildCategoryAssociatedContent[] List of ChildCategoryAssociatedContent objects + * @throws PropelException + */ + public function getCategoryAssociatedContents($criteria = null, ConnectionInterface $con = null) + { + $partial = $this->collCategoryAssociatedContentsPartial && !$this->isNew(); + if (null === $this->collCategoryAssociatedContents || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collCategoryAssociatedContents) { + // return empty collection + $this->initCategoryAssociatedContents(); + } else { + $collCategoryAssociatedContents = ChildCategoryAssociatedContentQuery::create(null, $criteria) + ->filterByCategory($this) + ->find($con); + + if (null !== $criteria) { + if (false !== $this->collCategoryAssociatedContentsPartial && count($collCategoryAssociatedContents)) { + $this->initCategoryAssociatedContents(false); + + foreach ($collCategoryAssociatedContents as $obj) { + if (false == $this->collCategoryAssociatedContents->contains($obj)) { + $this->collCategoryAssociatedContents->append($obj); + } + } + + $this->collCategoryAssociatedContentsPartial = true; + } + + $collCategoryAssociatedContents->getInternalIterator()->rewind(); + + return $collCategoryAssociatedContents; + } + + if ($partial && $this->collCategoryAssociatedContents) { + foreach ($this->collCategoryAssociatedContents as $obj) { + if ($obj->isNew()) { + $collCategoryAssociatedContents[] = $obj; + } + } + } + + $this->collCategoryAssociatedContents = $collCategoryAssociatedContents; + $this->collCategoryAssociatedContentsPartial = false; + } + } + + return $this->collCategoryAssociatedContents; + } + + /** + * Sets a collection of CategoryAssociatedContent objects related by a one-to-many relationship + * to the current object. + * It will also schedule objects for deletion based on a diff between old objects (aka persisted) + * and new objects from the given Propel collection. + * + * @param Collection $categoryAssociatedContents A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildCategory The current object (for fluent API support) + */ + public function setCategoryAssociatedContents(Collection $categoryAssociatedContents, ConnectionInterface $con = null) + { + $categoryAssociatedContentsToDelete = $this->getCategoryAssociatedContents(new Criteria(), $con)->diff($categoryAssociatedContents); + + + $this->categoryAssociatedContentsScheduledForDeletion = $categoryAssociatedContentsToDelete; + + foreach ($categoryAssociatedContentsToDelete as $categoryAssociatedContentRemoved) { + $categoryAssociatedContentRemoved->setCategory(null); + } + + $this->collCategoryAssociatedContents = null; + foreach ($categoryAssociatedContents as $categoryAssociatedContent) { + $this->addCategoryAssociatedContent($categoryAssociatedContent); + } + + $this->collCategoryAssociatedContents = $categoryAssociatedContents; + $this->collCategoryAssociatedContentsPartial = false; + + return $this; + } + + /** + * Returns the number of related CategoryAssociatedContent objects. + * + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related CategoryAssociatedContent objects. + * @throws PropelException + */ + public function countCategoryAssociatedContents(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) + { + $partial = $this->collCategoryAssociatedContentsPartial && !$this->isNew(); + if (null === $this->collCategoryAssociatedContents || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collCategoryAssociatedContents) { + return 0; + } + + if ($partial && !$criteria) { + return count($this->getCategoryAssociatedContents()); + } + + $query = ChildCategoryAssociatedContentQuery::create(null, $criteria); + if ($distinct) { + $query->distinct(); + } + + return $query + ->filterByCategory($this) + ->count($con); + } + + return count($this->collCategoryAssociatedContents); + } + + /** + * Method called to associate a ChildCategoryAssociatedContent object to this object + * through the ChildCategoryAssociatedContent foreign key attribute. + * + * @param ChildCategoryAssociatedContent $l ChildCategoryAssociatedContent + * @return \Thelia\Model\Category The current object (for fluent API support) + */ + public function addCategoryAssociatedContent(ChildCategoryAssociatedContent $l) + { + if ($this->collCategoryAssociatedContents === null) { + $this->initCategoryAssociatedContents(); + $this->collCategoryAssociatedContentsPartial = true; + } + + if (!in_array($l, $this->collCategoryAssociatedContents->getArrayCopy(), true)) { // only add it if the **same** object is not already associated + $this->doAddCategoryAssociatedContent($l); + } + + return $this; + } + + /** + * @param CategoryAssociatedContent $categoryAssociatedContent The categoryAssociatedContent object to add. + */ + protected function doAddCategoryAssociatedContent($categoryAssociatedContent) + { + $this->collCategoryAssociatedContents[]= $categoryAssociatedContent; + $categoryAssociatedContent->setCategory($this); + } + + /** + * @param CategoryAssociatedContent $categoryAssociatedContent The categoryAssociatedContent object to remove. + * @return ChildCategory The current object (for fluent API support) + */ + public function removeCategoryAssociatedContent($categoryAssociatedContent) + { + if ($this->getCategoryAssociatedContents()->contains($categoryAssociatedContent)) { + $this->collCategoryAssociatedContents->remove($this->collCategoryAssociatedContents->search($categoryAssociatedContent)); + if (null === $this->categoryAssociatedContentsScheduledForDeletion) { + $this->categoryAssociatedContentsScheduledForDeletion = clone $this->collCategoryAssociatedContents; + $this->categoryAssociatedContentsScheduledForDeletion->clear(); + } + $this->categoryAssociatedContentsScheduledForDeletion[]= clone $categoryAssociatedContent; + $categoryAssociatedContent->setCategory(null); + } + + return $this; + } + + + /** + * If this collection has already been initialized with + * an identical criteria, it returns the collection. + * Otherwise if this Category is new, it will return + * an empty collection; or if this Category has previously + * been saved, it will retrieve related CategoryAssociatedContents from storage. + * + * This method is protected by default in order to keep the public + * api reasonable. You can provide public methods for those you + * actually need in Category. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @return Collection|ChildCategoryAssociatedContent[] List of ChildCategoryAssociatedContent objects + */ + public function getCategoryAssociatedContentsJoinContent($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) + { + $query = ChildCategoryAssociatedContentQuery::create(null, $criteria); + $query->joinWith('Content', $joinBehavior); + + return $this->getCategoryAssociatedContents($query, $con); + } + /** * Clears out the collCategoryI18ns collection * @@ -4774,11 +4749,6 @@ abstract class Category implements ActiveRecordInterface $o->clearAllReferences($deep); } } - if ($this->collContentAssocs) { - foreach ($this->collContentAssocs as $o) { - $o->clearAllReferences($deep); - } - } if ($this->collRewritings) { foreach ($this->collRewritings as $o) { $o->clearAllReferences($deep); @@ -4794,6 +4764,11 @@ abstract class Category implements ActiveRecordInterface $o->clearAllReferences($deep); } } + if ($this->collCategoryAssociatedContents) { + foreach ($this->collCategoryAssociatedContents as $o) { + $o->clearAllReferences($deep); + } + } if ($this->collCategoryI18ns) { foreach ($this->collCategoryI18ns as $o) { $o->clearAllReferences($deep); @@ -4837,10 +4812,6 @@ abstract class Category implements ActiveRecordInterface $this->collAttributeCategories->clearIterator(); } $this->collAttributeCategories = null; - if ($this->collContentAssocs instanceof Collection) { - $this->collContentAssocs->clearIterator(); - } - $this->collContentAssocs = null; if ($this->collRewritings instanceof Collection) { $this->collRewritings->clearIterator(); } @@ -4853,6 +4824,10 @@ abstract class Category implements ActiveRecordInterface $this->collCategoryDocuments->clearIterator(); } $this->collCategoryDocuments = null; + if ($this->collCategoryAssociatedContents instanceof Collection) { + $this->collCategoryAssociatedContents->clearIterator(); + } + $this->collCategoryAssociatedContents = null; if ($this->collCategoryI18ns instanceof Collection) { $this->collCategoryI18ns->clearIterator(); } diff --git a/core/lib/Thelia/Model/Base/CategoryAssociatedContent.php b/core/lib/Thelia/Model/Base/CategoryAssociatedContent.php new file mode 100644 index 000000000..a731ec971 --- /dev/null +++ b/core/lib/Thelia/Model/Base/CategoryAssociatedContent.php @@ -0,0 +1,1553 @@ +modifiedColumns); + } + + /** + * Has specified column been modified? + * + * @param string $col column fully qualified name (TableMap::TYPE_COLNAME), e.g. Book::AUTHOR_ID + * @return boolean True if $col has been modified. + */ + public function isColumnModified($col) + { + return in_array($col, $this->modifiedColumns); + } + + /** + * Get the columns that have been modified in this object. + * @return array A unique list of the modified column names for this object. + */ + public function getModifiedColumns() + { + return array_unique($this->modifiedColumns); + } + + /** + * Returns whether the object has ever been saved. This will + * be false, if the object was retrieved from storage or was created + * and then saved. + * + * @return true, if the object has never been persisted. + */ + public function isNew() + { + return $this->new; + } + + /** + * Setter for the isNew attribute. This method will be called + * by Propel-generated children and objects. + * + * @param boolean $b the state of the object. + */ + public function setNew($b) + { + $this->new = (Boolean) $b; + } + + /** + * Whether this object has been deleted. + * @return boolean The deleted state of this object. + */ + public function isDeleted() + { + return $this->deleted; + } + + /** + * Specify whether this object has been deleted. + * @param boolean $b The deleted state of this object. + * @return void + */ + public function setDeleted($b) + { + $this->deleted = (Boolean) $b; + } + + /** + * Sets the modified state for the object to be false. + * @param string $col If supplied, only the specified column is reset. + * @return void + */ + public function resetModified($col = null) + { + if (null !== $col) { + while (false !== ($offset = array_search($col, $this->modifiedColumns))) { + array_splice($this->modifiedColumns, $offset, 1); + } + } else { + $this->modifiedColumns = array(); + } + } + + /** + * Compares this with another CategoryAssociatedContent instance. If + * obj is an instance of CategoryAssociatedContent, delegates to + * equals(CategoryAssociatedContent). Otherwise, returns false. + * + * @param obj The object to compare to. + * @return Whether equal to the object specified. + */ + public function equals($obj) + { + $thisclazz = get_class($this); + if (!is_object($obj) || !($obj instanceof $thisclazz)) { + return false; + } + + if ($this === $obj) { + return true; + } + + if (null === $this->getPrimaryKey() + || null === $obj->getPrimaryKey()) { + return false; + } + + return $this->getPrimaryKey() === $obj->getPrimaryKey(); + } + + /** + * If the primary key is not null, return the hashcode of the + * primary key. Otherwise, return the hash code of the object. + * + * @return int Hashcode + */ + public function hashCode() + { + if (null !== $this->getPrimaryKey()) { + return crc32(serialize($this->getPrimaryKey())); + } + + return crc32(serialize(clone $this)); + } + + /** + * Get the associative array of the virtual columns in this object + * + * @param string $name The virtual column name + * + * @return array + */ + public function getVirtualColumns() + { + return $this->virtualColumns; + } + + /** + * Checks the existence of a virtual column in this object + * + * @return boolean + */ + public function hasVirtualColumn($name) + { + return isset($this->virtualColumns[$name]); + } + + /** + * Get the value of a virtual column in this object + * + * @return mixed + */ + public function getVirtualColumn($name) + { + if (!$this->hasVirtualColumn($name)) { + throw new PropelException(sprintf('Cannot get value of inexistent virtual column %s.', $name)); + } + + return $this->virtualColumns[$name]; + } + + /** + * Set the value of a virtual column in this object + * + * @param string $name The virtual column name + * @param mixed $value The value to give to the virtual column + * + * @return CategoryAssociatedContent The current object, for fluid interface + */ + public function setVirtualColumn($name, $value) + { + $this->virtualColumns[$name] = $value; + + return $this; + } + + /** + * Logs a message using Propel::log(). + * + * @param string $msg + * @param int $priority One of the Propel::LOG_* logging levels + * @return boolean + */ + protected function log($msg, $priority = Propel::LOG_INFO) + { + return Propel::log(get_class($this) . ': ' . $msg, $priority); + } + + /** + * Populate the current object from a string, using a given parser format + * + * $book = new Book(); + * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); + * + * + * @param mixed $parser A AbstractParser instance, + * or a format name ('XML', 'YAML', 'JSON', 'CSV') + * @param string $data The source data to import from + * + * @return CategoryAssociatedContent The current object, for fluid interface + */ + public function importFrom($parser, $data) + { + if (!$parser instanceof AbstractParser) { + $parser = AbstractParser::getParser($parser); + } + + return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + } + + /** + * Export the current object properties to a string, using a given parser format + * + * $book = BookQuery::create()->findPk(9012); + * echo $book->exportTo('JSON'); + * => {"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); + * + * + * @param mixed $parser A AbstractParser instance, or a format name ('XML', 'YAML', 'JSON', 'CSV') + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy load(ed) columns. Defaults to TRUE. + * @return string The exported data + */ + public function exportTo($parser, $includeLazyLoadColumns = true) + { + if (!$parser instanceof AbstractParser) { + $parser = AbstractParser::getParser($parser); + } + + return $parser->fromArray($this->toArray(TableMap::TYPE_PHPNAME, $includeLazyLoadColumns, array(), true)); + } + + /** + * Clean up internal collections prior to serializing + * Avoids recursive loops that turn into segmentation faults when serializing + */ + public function __sleep() + { + $this->clearAllReferences(); + + return array_keys(get_object_vars($this)); + } + + /** + * Get the [id] column value. + * + * @return int + */ + public function getId() + { + + return $this->id; + } + + /** + * Get the [category_id] column value. + * + * @return int + */ + public function getCategoryId() + { + + return $this->category_id; + } + + /** + * Get the [content_id] column value. + * + * @return int + */ + public function getContentId() + { + + return $this->content_id; + } + + /** + * Get the [position] column value. + * + * @return int + */ + public function getPosition() + { + + return $this->position; + } + + /** + * Get the [optionally formatted] temporal [created_at] column value. + * + * + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. + * + * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 + * + * @throws PropelException - if unable to parse/validate the date/time value. + */ + public function getCreatedAt($format = NULL) + { + if ($format === null) { + return $this->created_at; + } else { + return $this->created_at !== null ? $this->created_at->format($format) : null; + } + } + + /** + * Get the [optionally formatted] temporal [updated_at] column value. + * + * + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. + * + * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 + * + * @throws PropelException - if unable to parse/validate the date/time value. + */ + public function getUpdatedAt($format = NULL) + { + if ($format === null) { + return $this->updated_at; + } else { + return $this->updated_at !== null ? $this->updated_at->format($format) : null; + } + } + + /** + * Set the value of [id] column. + * + * @param int $v new value + * @return \Thelia\Model\CategoryAssociatedContent The current object (for fluent API support) + */ + public function setId($v) + { + if ($v !== null) { + $v = (int) $v; + } + + if ($this->id !== $v) { + $this->id = $v; + $this->modifiedColumns[] = CategoryAssociatedContentTableMap::ID; + } + + + return $this; + } // setId() + + /** + * Set the value of [category_id] column. + * + * @param int $v new value + * @return \Thelia\Model\CategoryAssociatedContent The current object (for fluent API support) + */ + public function setCategoryId($v) + { + if ($v !== null) { + $v = (int) $v; + } + + if ($this->category_id !== $v) { + $this->category_id = $v; + $this->modifiedColumns[] = CategoryAssociatedContentTableMap::CATEGORY_ID; + } + + if ($this->aCategory !== null && $this->aCategory->getId() !== $v) { + $this->aCategory = null; + } + + + return $this; + } // setCategoryId() + + /** + * Set the value of [content_id] column. + * + * @param int $v new value + * @return \Thelia\Model\CategoryAssociatedContent The current object (for fluent API support) + */ + public function setContentId($v) + { + if ($v !== null) { + $v = (int) $v; + } + + if ($this->content_id !== $v) { + $this->content_id = $v; + $this->modifiedColumns[] = CategoryAssociatedContentTableMap::CONTENT_ID; + } + + if ($this->aContent !== null && $this->aContent->getId() !== $v) { + $this->aContent = null; + } + + + return $this; + } // setContentId() + + /** + * Set the value of [position] column. + * + * @param int $v new value + * @return \Thelia\Model\CategoryAssociatedContent The current object (for fluent API support) + */ + public function setPosition($v) + { + if ($v !== null) { + $v = (int) $v; + } + + if ($this->position !== $v) { + $this->position = $v; + $this->modifiedColumns[] = CategoryAssociatedContentTableMap::POSITION; + } + + + return $this; + } // setPosition() + + /** + * Sets the value of [created_at] column to a normalized version of the date/time value specified. + * + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\CategoryAssociatedContent The current object (for fluent API support) + */ + public function setCreatedAt($v) + { + $dt = PropelDateTime::newInstance($v, null, '\DateTime'); + if ($this->created_at !== null || $dt !== null) { + if ($dt !== $this->created_at) { + $this->created_at = $dt; + $this->modifiedColumns[] = CategoryAssociatedContentTableMap::CREATED_AT; + } + } // if either are not null + + + return $this; + } // setCreatedAt() + + /** + * Sets the value of [updated_at] column to a normalized version of the date/time value specified. + * + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\CategoryAssociatedContent The current object (for fluent API support) + */ + public function setUpdatedAt($v) + { + $dt = PropelDateTime::newInstance($v, null, '\DateTime'); + if ($this->updated_at !== null || $dt !== null) { + if ($dt !== $this->updated_at) { + $this->updated_at = $dt; + $this->modifiedColumns[] = CategoryAssociatedContentTableMap::UPDATED_AT; + } + } // if either are not null + + + return $this; + } // setUpdatedAt() + + /** + * Indicates whether the columns in this object are only set to default values. + * + * This method can be used in conjunction with isModified() to indicate whether an object is both + * modified _and_ has some values set which are non-default. + * + * @return boolean Whether the columns in this object are only been set with default values. + */ + public function hasOnlyDefaultValues() + { + // otherwise, everything was equal, so return TRUE + return true; + } // hasOnlyDefaultValues() + + /** + * Hydrates (populates) the object variables with values from the database resultset. + * + * An offset (0-based "start column") is specified so that objects can be hydrated + * with a subset of the columns in the resultset rows. This is needed, for example, + * for results of JOIN queries where the resultset row includes columns from two or + * more tables. + * + * @param array $row The row returned by DataFetcher->fetch(). + * @param int $startcol 0-based offset column which indicates which restultset column to start with. + * @param boolean $rehydrate Whether this object is being re-hydrated from the database. + * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType(). + One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * + * @return int next starting column + * @throws PropelException - Any caught Exception will be rewrapped as a PropelException. + */ + public function hydrate($row, $startcol = 0, $rehydrate = false, $indexType = TableMap::TYPE_NUM) + { + try { + + + $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : CategoryAssociatedContentTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; + $this->id = (null !== $col) ? (int) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : CategoryAssociatedContentTableMap::translateFieldName('CategoryId', TableMap::TYPE_PHPNAME, $indexType)]; + $this->category_id = (null !== $col) ? (int) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : CategoryAssociatedContentTableMap::translateFieldName('ContentId', TableMap::TYPE_PHPNAME, $indexType)]; + $this->content_id = (null !== $col) ? (int) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : CategoryAssociatedContentTableMap::translateFieldName('Position', TableMap::TYPE_PHPNAME, $indexType)]; + $this->position = (null !== $col) ? (int) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : CategoryAssociatedContentTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + if ($col === '0000-00-00 00:00:00') { + $col = null; + } + $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : CategoryAssociatedContentTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + if ($col === '0000-00-00 00:00:00') { + $col = null; + } + $this->updated_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; + $this->resetModified(); + + $this->setNew(false); + + if ($rehydrate) { + $this->ensureConsistency(); + } + + return $startcol + 6; // 6 = CategoryAssociatedContentTableMap::NUM_HYDRATE_COLUMNS. + + } catch (Exception $e) { + throw new PropelException("Error populating \Thelia\Model\CategoryAssociatedContent object", 0, $e); + } + } + + /** + * Checks and repairs the internal consistency of the object. + * + * This method is executed after an already-instantiated object is re-hydrated + * from the database. It exists to check any foreign keys to make sure that + * the objects related to the current object are correct based on foreign key. + * + * You can override this method in the stub class, but you should always invoke + * the base method from the overridden method (i.e. parent::ensureConsistency()), + * in case your model changes. + * + * @throws PropelException + */ + public function ensureConsistency() + { + if ($this->aCategory !== null && $this->category_id !== $this->aCategory->getId()) { + $this->aCategory = null; + } + if ($this->aContent !== null && $this->content_id !== $this->aContent->getId()) { + $this->aContent = null; + } + } // ensureConsistency + + /** + * Reloads this object from datastore based on primary key and (optionally) resets all associated objects. + * + * This will only work if the object has been saved and has a valid primary key set. + * + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @return void + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + */ + public function reload($deep = false, ConnectionInterface $con = null) + { + if ($this->isDeleted()) { + throw new PropelException("Cannot reload a deleted object."); + } + + if ($this->isNew()) { + throw new PropelException("Cannot reload an unsaved object."); + } + + if ($con === null) { + $con = Propel::getServiceContainer()->getReadConnection(CategoryAssociatedContentTableMap::DATABASE_NAME); + } + + // We don't need to alter the object instance pool; we're just modifying this instance + // already in the pool. + + $dataFetcher = ChildCategoryAssociatedContentQuery::create(null, $this->buildPkeyCriteria())->setFormatter(ModelCriteria::FORMAT_STATEMENT)->find($con); + $row = $dataFetcher->fetch(); + $dataFetcher->close(); + if (!$row) { + throw new PropelException('Cannot find matching row in the database to reload object values.'); + } + $this->hydrate($row, 0, true, $dataFetcher->getIndexType()); // rehydrate + + if ($deep) { // also de-associate any related objects? + + $this->aCategory = null; + $this->aContent = null; + } // if (deep) + } + + /** + * Removes this object from datastore and sets delete attribute. + * + * @param ConnectionInterface $con + * @return void + * @throws PropelException + * @see CategoryAssociatedContent::setDeleted() + * @see CategoryAssociatedContent::isDeleted() + */ + public function delete(ConnectionInterface $con = null) + { + if ($this->isDeleted()) { + throw new PropelException("This object has already been deleted."); + } + + if ($con === null) { + $con = Propel::getServiceContainer()->getWriteConnection(CategoryAssociatedContentTableMap::DATABASE_NAME); + } + + $con->beginTransaction(); + try { + $deleteQuery = ChildCategoryAssociatedContentQuery::create() + ->filterByPrimaryKey($this->getPrimaryKey()); + $ret = $this->preDelete($con); + if ($ret) { + $deleteQuery->delete($con); + $this->postDelete($con); + $con->commit(); + $this->setDeleted(true); + } else { + $con->commit(); + } + } catch (Exception $e) { + $con->rollBack(); + throw $e; + } + } + + /** + * Persists this object to the database. + * + * If the object is new, it inserts it; otherwise an update is performed. + * All modified related objects will also be persisted in the doSave() + * method. This method wraps all precipitate database operations in a + * single transaction. + * + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @throws PropelException + * @see doSave() + */ + public function save(ConnectionInterface $con = null) + { + if ($this->isDeleted()) { + throw new PropelException("You cannot save an object that has been deleted."); + } + + if ($con === null) { + $con = Propel::getServiceContainer()->getWriteConnection(CategoryAssociatedContentTableMap::DATABASE_NAME); + } + + $con->beginTransaction(); + $isInsert = $this->isNew(); + try { + $ret = $this->preSave($con); + if ($isInsert) { + $ret = $ret && $this->preInsert($con); + // timestampable behavior + if (!$this->isColumnModified(CategoryAssociatedContentTableMap::CREATED_AT)) { + $this->setCreatedAt(time()); + } + if (!$this->isColumnModified(CategoryAssociatedContentTableMap::UPDATED_AT)) { + $this->setUpdatedAt(time()); + } + } else { + $ret = $ret && $this->preUpdate($con); + // timestampable behavior + if ($this->isModified() && !$this->isColumnModified(CategoryAssociatedContentTableMap::UPDATED_AT)) { + $this->setUpdatedAt(time()); + } + } + if ($ret) { + $affectedRows = $this->doSave($con); + if ($isInsert) { + $this->postInsert($con); + } else { + $this->postUpdate($con); + } + $this->postSave($con); + CategoryAssociatedContentTableMap::addInstanceToPool($this); + } else { + $affectedRows = 0; + } + $con->commit(); + + return $affectedRows; + } catch (Exception $e) { + $con->rollBack(); + throw $e; + } + } + + /** + * Performs the work of inserting or updating the row in the database. + * + * If the object is new, it inserts it; otherwise an update is performed. + * All related objects are also updated in this method. + * + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @throws PropelException + * @see save() + */ + protected function doSave(ConnectionInterface $con) + { + $affectedRows = 0; // initialize var to track total num of affected rows + if (!$this->alreadyInSave) { + $this->alreadyInSave = true; + + // We call the save method on the following object(s) if they + // were passed to this object by their corresponding set + // method. This object relates to these object(s) by a + // foreign key reference. + + if ($this->aCategory !== null) { + if ($this->aCategory->isModified() || $this->aCategory->isNew()) { + $affectedRows += $this->aCategory->save($con); + } + $this->setCategory($this->aCategory); + } + + if ($this->aContent !== null) { + if ($this->aContent->isModified() || $this->aContent->isNew()) { + $affectedRows += $this->aContent->save($con); + } + $this->setContent($this->aContent); + } + + if ($this->isNew() || $this->isModified()) { + // persist changes + if ($this->isNew()) { + $this->doInsert($con); + } else { + $this->doUpdate($con); + } + $affectedRows += 1; + $this->resetModified(); + } + + $this->alreadyInSave = false; + + } + + return $affectedRows; + } // doSave() + + /** + * Insert the row in the database. + * + * @param ConnectionInterface $con + * + * @throws PropelException + * @see doSave() + */ + protected function doInsert(ConnectionInterface $con) + { + $modifiedColumns = array(); + $index = 0; + + $this->modifiedColumns[] = CategoryAssociatedContentTableMap::ID; + if (null !== $this->id) { + throw new PropelException('Cannot insert a value for auto-increment primary key (' . CategoryAssociatedContentTableMap::ID . ')'); + } + + // check the columns in natural order for more readable SQL queries + if ($this->isColumnModified(CategoryAssociatedContentTableMap::ID)) { + $modifiedColumns[':p' . $index++] = 'ID'; + } + if ($this->isColumnModified(CategoryAssociatedContentTableMap::CATEGORY_ID)) { + $modifiedColumns[':p' . $index++] = 'CATEGORY_ID'; + } + if ($this->isColumnModified(CategoryAssociatedContentTableMap::CONTENT_ID)) { + $modifiedColumns[':p' . $index++] = 'CONTENT_ID'; + } + if ($this->isColumnModified(CategoryAssociatedContentTableMap::POSITION)) { + $modifiedColumns[':p' . $index++] = 'POSITION'; + } + if ($this->isColumnModified(CategoryAssociatedContentTableMap::CREATED_AT)) { + $modifiedColumns[':p' . $index++] = 'CREATED_AT'; + } + if ($this->isColumnModified(CategoryAssociatedContentTableMap::UPDATED_AT)) { + $modifiedColumns[':p' . $index++] = 'UPDATED_AT'; + } + + $sql = sprintf( + 'INSERT INTO category_associated_content (%s) VALUES (%s)', + implode(', ', $modifiedColumns), + implode(', ', array_keys($modifiedColumns)) + ); + + try { + $stmt = $con->prepare($sql); + foreach ($modifiedColumns as $identifier => $columnName) { + switch ($columnName) { + case 'ID': + $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT); + break; + case 'CATEGORY_ID': + $stmt->bindValue($identifier, $this->category_id, PDO::PARAM_INT); + break; + case 'CONTENT_ID': + $stmt->bindValue($identifier, $this->content_id, PDO::PARAM_INT); + break; + case 'POSITION': + $stmt->bindValue($identifier, $this->position, PDO::PARAM_INT); + break; + case 'CREATED_AT': + $stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); + break; + case 'UPDATED_AT': + $stmt->bindValue($identifier, $this->updated_at ? $this->updated_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); + break; + } + } + $stmt->execute(); + } catch (Exception $e) { + Propel::log($e->getMessage(), Propel::LOG_ERR); + throw new PropelException(sprintf('Unable to execute INSERT statement [%s]', $sql), 0, $e); + } + + try { + $pk = $con->lastInsertId(); + } catch (Exception $e) { + throw new PropelException('Unable to get autoincrement id.', 0, $e); + } + $this->setId($pk); + + $this->setNew(false); + } + + /** + * Update the row in the database. + * + * @param ConnectionInterface $con + * + * @return Integer Number of updated rows + * @see doSave() + */ + protected function doUpdate(ConnectionInterface $con) + { + $selectCriteria = $this->buildPkeyCriteria(); + $valuesCriteria = $this->buildCriteria(); + + return $selectCriteria->doUpdate($valuesCriteria, $con); + } + + /** + * Retrieves a field from the object by name passed in as a string. + * + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. + */ + public function getByName($name, $type = TableMap::TYPE_PHPNAME) + { + $pos = CategoryAssociatedContentTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM); + $field = $this->getByPosition($pos); + + return $field; + } + + /** + * Retrieves a field from the object by Position as specified in the xml schema. + * Zero-based. + * + * @param int $pos position in xml schema + * @return mixed Value of field at $pos + */ + public function getByPosition($pos) + { + switch ($pos) { + case 0: + return $this->getId(); + break; + case 1: + return $this->getCategoryId(); + break; + case 2: + return $this->getContentId(); + break; + case 3: + return $this->getPosition(); + break; + case 4: + return $this->getCreatedAt(); + break; + case 5: + return $this->getUpdatedAt(); + break; + default: + return null; + break; + } // switch() + } + + /** + * Exports the object as an array. + * + * You can specify the key type of the array by passing one of the class + * type constants. + * + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * + * @return array an associative array containing the field names (as keys) and field values + */ + public function toArray($keyType = TableMap::TYPE_PHPNAME, $includeLazyLoadColumns = true, $alreadyDumpedObjects = array(), $includeForeignObjects = false) + { + if (isset($alreadyDumpedObjects['CategoryAssociatedContent'][$this->getPrimaryKey()])) { + return '*RECURSION*'; + } + $alreadyDumpedObjects['CategoryAssociatedContent'][$this->getPrimaryKey()] = true; + $keys = CategoryAssociatedContentTableMap::getFieldNames($keyType); + $result = array( + $keys[0] => $this->getId(), + $keys[1] => $this->getCategoryId(), + $keys[2] => $this->getContentId(), + $keys[3] => $this->getPosition(), + $keys[4] => $this->getCreatedAt(), + $keys[5] => $this->getUpdatedAt(), + ); + $virtualColumns = $this->virtualColumns; + foreach($virtualColumns as $key => $virtualColumn) + { + $result[$key] = $virtualColumn; + } + + if ($includeForeignObjects) { + if (null !== $this->aCategory) { + $result['Category'] = $this->aCategory->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); + } + if (null !== $this->aContent) { + $result['Content'] = $this->aContent->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); + } + } + + return $result; + } + + /** + * Sets a field from the object by name passed in as a string. + * + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return void + */ + public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) + { + $pos = CategoryAssociatedContentTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM); + + return $this->setByPosition($pos, $value); + } + + /** + * Sets a field from the object by Position as specified in the xml schema. + * Zero-based. + * + * @param int $pos position in xml schema + * @param mixed $value field value + * @return void + */ + public function setByPosition($pos, $value) + { + switch ($pos) { + case 0: + $this->setId($value); + break; + case 1: + $this->setCategoryId($value); + break; + case 2: + $this->setContentId($value); + break; + case 3: + $this->setPosition($value); + break; + case 4: + $this->setCreatedAt($value); + break; + case 5: + $this->setUpdatedAt($value); + break; + } // switch() + } + + /** + * Populates the object using an array. + * + * This is particularly useful when populating an object from one of the + * request arrays (e.g. $_POST). This method goes through the column + * names, checking to see whether a matching key exists in populated + * array. If so the setByName() method is called for that column. + * + * You can specify the key type of the array by additionally passing one + * of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * The default key type is the column's TableMap::TYPE_PHPNAME. + * + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. + * @return void + */ + public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) + { + $keys = CategoryAssociatedContentTableMap::getFieldNames($keyType); + + if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]); + if (array_key_exists($keys[1], $arr)) $this->setCategoryId($arr[$keys[1]]); + if (array_key_exists($keys[2], $arr)) $this->setContentId($arr[$keys[2]]); + if (array_key_exists($keys[3], $arr)) $this->setPosition($arr[$keys[3]]); + if (array_key_exists($keys[4], $arr)) $this->setCreatedAt($arr[$keys[4]]); + if (array_key_exists($keys[5], $arr)) $this->setUpdatedAt($arr[$keys[5]]); + } + + /** + * Build a Criteria object containing the values of all modified columns in this object. + * + * @return Criteria The Criteria object containing all modified values. + */ + public function buildCriteria() + { + $criteria = new Criteria(CategoryAssociatedContentTableMap::DATABASE_NAME); + + if ($this->isColumnModified(CategoryAssociatedContentTableMap::ID)) $criteria->add(CategoryAssociatedContentTableMap::ID, $this->id); + if ($this->isColumnModified(CategoryAssociatedContentTableMap::CATEGORY_ID)) $criteria->add(CategoryAssociatedContentTableMap::CATEGORY_ID, $this->category_id); + if ($this->isColumnModified(CategoryAssociatedContentTableMap::CONTENT_ID)) $criteria->add(CategoryAssociatedContentTableMap::CONTENT_ID, $this->content_id); + if ($this->isColumnModified(CategoryAssociatedContentTableMap::POSITION)) $criteria->add(CategoryAssociatedContentTableMap::POSITION, $this->position); + if ($this->isColumnModified(CategoryAssociatedContentTableMap::CREATED_AT)) $criteria->add(CategoryAssociatedContentTableMap::CREATED_AT, $this->created_at); + if ($this->isColumnModified(CategoryAssociatedContentTableMap::UPDATED_AT)) $criteria->add(CategoryAssociatedContentTableMap::UPDATED_AT, $this->updated_at); + + return $criteria; + } + + /** + * Builds a Criteria object containing the primary key for this object. + * + * Unlike buildCriteria() this method includes the primary key values regardless + * of whether or not they have been modified. + * + * @return Criteria The Criteria object containing value(s) for primary key(s). + */ + public function buildPkeyCriteria() + { + $criteria = new Criteria(CategoryAssociatedContentTableMap::DATABASE_NAME); + $criteria->add(CategoryAssociatedContentTableMap::ID, $this->id); + + return $criteria; + } + + /** + * Returns the primary key for this object (row). + * @return int + */ + public function getPrimaryKey() + { + return $this->getId(); + } + + /** + * Generic method to set the primary key (id column). + * + * @param int $key Primary key. + * @return void + */ + public function setPrimaryKey($key) + { + $this->setId($key); + } + + /** + * Returns true if the primary key for this object is null. + * @return boolean + */ + public function isPrimaryKeyNull() + { + + return null === $this->getId(); + } + + /** + * Sets contents of passed object to values from current object. + * + * If desired, this method can also make copies of all associated (fkey referrers) + * objects. + * + * @param object $copyObj An object of \Thelia\Model\CategoryAssociatedContent (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @throws PropelException + */ + public function copyInto($copyObj, $deepCopy = false, $makeNew = true) + { + $copyObj->setCategoryId($this->getCategoryId()); + $copyObj->setContentId($this->getContentId()); + $copyObj->setPosition($this->getPosition()); + $copyObj->setCreatedAt($this->getCreatedAt()); + $copyObj->setUpdatedAt($this->getUpdatedAt()); + if ($makeNew) { + $copyObj->setNew(true); + $copyObj->setId(NULL); // this is a auto-increment column, so set to default value + } + } + + /** + * Makes a copy of this object that will be inserted as a new row in table when saved. + * It creates a new object filling in the simple attributes, but skipping any primary + * keys that are defined for the table. + * + * If desired, this method can also make copies of all associated (fkey referrers) + * objects. + * + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\CategoryAssociatedContent Clone of current object. + * @throws PropelException + */ + public function copy($deepCopy = false) + { + // we use get_class(), because this might be a subclass + $clazz = get_class($this); + $copyObj = new $clazz(); + $this->copyInto($copyObj, $deepCopy); + + return $copyObj; + } + + /** + * Declares an association between this object and a ChildCategory object. + * + * @param ChildCategory $v + * @return \Thelia\Model\CategoryAssociatedContent The current object (for fluent API support) + * @throws PropelException + */ + public function setCategory(ChildCategory $v = null) + { + if ($v === null) { + $this->setCategoryId(NULL); + } else { + $this->setCategoryId($v->getId()); + } + + $this->aCategory = $v; + + // Add binding for other direction of this n:n relationship. + // If this object has already been added to the ChildCategory object, it will not be re-added. + if ($v !== null) { + $v->addCategoryAssociatedContent($this); + } + + + return $this; + } + + + /** + * Get the associated ChildCategory object + * + * @param ConnectionInterface $con Optional Connection object. + * @return ChildCategory The associated ChildCategory object. + * @throws PropelException + */ + public function getCategory(ConnectionInterface $con = null) + { + if ($this->aCategory === null && ($this->category_id !== null)) { + $this->aCategory = ChildCategoryQuery::create()->findPk($this->category_id, $con); + /* The following can be used additionally to + guarantee the related object contains a reference + to this object. This level of coupling may, however, be + undesirable since it could result in an only partially populated collection + in the referenced object. + $this->aCategory->addCategoryAssociatedContents($this); + */ + } + + return $this->aCategory; + } + + /** + * Declares an association between this object and a ChildContent object. + * + * @param ChildContent $v + * @return \Thelia\Model\CategoryAssociatedContent The current object (for fluent API support) + * @throws PropelException + */ + public function setContent(ChildContent $v = null) + { + if ($v === null) { + $this->setContentId(NULL); + } else { + $this->setContentId($v->getId()); + } + + $this->aContent = $v; + + // Add binding for other direction of this n:n relationship. + // If this object has already been added to the ChildContent object, it will not be re-added. + if ($v !== null) { + $v->addCategoryAssociatedContent($this); + } + + + return $this; + } + + + /** + * Get the associated ChildContent object + * + * @param ConnectionInterface $con Optional Connection object. + * @return ChildContent The associated ChildContent object. + * @throws PropelException + */ + public function getContent(ConnectionInterface $con = null) + { + if ($this->aContent === null && ($this->content_id !== null)) { + $this->aContent = ChildContentQuery::create()->findPk($this->content_id, $con); + /* The following can be used additionally to + guarantee the related object contains a reference + to this object. This level of coupling may, however, be + undesirable since it could result in an only partially populated collection + in the referenced object. + $this->aContent->addCategoryAssociatedContents($this); + */ + } + + return $this->aContent; + } + + /** + * Clears the current object and sets all attributes to their default values + */ + public function clear() + { + $this->id = null; + $this->category_id = null; + $this->content_id = null; + $this->position = null; + $this->created_at = null; + $this->updated_at = null; + $this->alreadyInSave = false; + $this->clearAllReferences(); + $this->resetModified(); + $this->setNew(true); + $this->setDeleted(false); + } + + /** + * Resets all references to other model objects or collections of model objects. + * + * This method is a user-space workaround for PHP's inability to garbage collect + * objects with circular references (even in PHP 5.3). This is currently necessary + * when using Propel in certain daemon or large-volume/high-memory operations. + * + * @param boolean $deep Whether to also clear the references on all referrer objects. + */ + public function clearAllReferences($deep = false) + { + if ($deep) { + } // if ($deep) + + $this->aCategory = null; + $this->aContent = null; + } + + /** + * Return the string representation of this object + * + * @return string + */ + public function __toString() + { + return (string) $this->exportTo(CategoryAssociatedContentTableMap::DEFAULT_STRING_FORMAT); + } + + // timestampable behavior + + /** + * Mark the current object so that the update date doesn't get updated during next save + * + * @return ChildCategoryAssociatedContent The current object (for fluent API support) + */ + public function keepUpdateDateUnchanged() + { + $this->modifiedColumns[] = CategoryAssociatedContentTableMap::UPDATED_AT; + + return $this; + } + + /** + * Code to be run before persisting the object + * @param ConnectionInterface $con + * @return boolean + */ + public function preSave(ConnectionInterface $con = null) + { + return true; + } + + /** + * Code to be run after persisting the object + * @param ConnectionInterface $con + */ + public function postSave(ConnectionInterface $con = null) + { + + } + + /** + * Code to be run before inserting to database + * @param ConnectionInterface $con + * @return boolean + */ + public function preInsert(ConnectionInterface $con = null) + { + return true; + } + + /** + * Code to be run after inserting to database + * @param ConnectionInterface $con + */ + public function postInsert(ConnectionInterface $con = null) + { + + } + + /** + * Code to be run before updating the object in database + * @param ConnectionInterface $con + * @return boolean + */ + public function preUpdate(ConnectionInterface $con = null) + { + return true; + } + + /** + * Code to be run after updating the object in database + * @param ConnectionInterface $con + */ + public function postUpdate(ConnectionInterface $con = null) + { + + } + + /** + * Code to be run before deleting the object in database + * @param ConnectionInterface $con + * @return boolean + */ + public function preDelete(ConnectionInterface $con = null) + { + return true; + } + + /** + * Code to be run after deleting the object in database + * @param ConnectionInterface $con + */ + public function postDelete(ConnectionInterface $con = null) + { + + } + + + /** + * Derived method to catches calls to undefined methods. + * + * Provides magic import/export method support (fromXML()/toXML(), fromYAML()/toYAML(), etc.). + * Allows to define default __call() behavior if you overwrite __call() + * + * @param string $name + * @param mixed $params + * + * @return array|string + */ + public function __call($name, $params) + { + if (0 === strpos($name, 'get')) { + $virtualColumn = substr($name, 3); + if ($this->hasVirtualColumn($virtualColumn)) { + return $this->getVirtualColumn($virtualColumn); + } + + $virtualColumn = lcfirst($virtualColumn); + if ($this->hasVirtualColumn($virtualColumn)) { + return $this->getVirtualColumn($virtualColumn); + } + } + + if (0 === strpos($name, 'from')) { + $format = substr($name, 4); + + return $this->importFrom($format, reset($params)); + } + + if (0 === strpos($name, 'to')) { + $format = substr($name, 2); + $includeLazyLoadColumns = isset($params[0]) ? $params[0] : true; + + return $this->exportTo($format, $includeLazyLoadColumns); + } + + throw new BadMethodCallException(sprintf('Call to undefined method: %s.', $name)); + } + +} diff --git a/core/lib/Thelia/Model/Base/CategoryAssociatedContentQuery.php b/core/lib/Thelia/Model/Base/CategoryAssociatedContentQuery.php new file mode 100644 index 000000000..bb03306f4 --- /dev/null +++ b/core/lib/Thelia/Model/Base/CategoryAssociatedContentQuery.php @@ -0,0 +1,804 @@ +setModelAlias($modelAlias); + } + if ($criteria instanceof Criteria) { + $query->mergeWith($criteria); + } + + return $query; + } + + /** + * Find object by primary key. + * Propel uses the instance pool to skip the database if the object exists. + * Go fast if the query is untouched. + * + * + * $obj = $c->findPk(12, $con); + * + * + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con an optional connection object + * + * @return ChildCategoryAssociatedContent|array|mixed the result, formatted by the current formatter + */ + public function findPk($key, $con = null) + { + if ($key === null) { + return null; + } + if ((null !== ($obj = CategoryAssociatedContentTableMap::getInstanceFromPool((string) $key))) && !$this->formatter) { + // the object is already in the instance pool + return $obj; + } + if ($con === null) { + $con = Propel::getServiceContainer()->getReadConnection(CategoryAssociatedContentTableMap::DATABASE_NAME); + } + $this->basePreSelect($con); + if ($this->formatter || $this->modelAlias || $this->with || $this->select + || $this->selectColumns || $this->asColumns || $this->selectModifiers + || $this->map || $this->having || $this->joins) { + return $this->findPkComplex($key, $con); + } else { + return $this->findPkSimple($key, $con); + } + } + + /** + * Find object by primary key using raw SQL to go fast. + * Bypass doSelect() and the object formatter by using generated code. + * + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object + * + * @return ChildCategoryAssociatedContent A model object, or null if the key is not found + */ + protected function findPkSimple($key, $con) + { + $sql = 'SELECT ID, CATEGORY_ID, CONTENT_ID, POSITION, CREATED_AT, UPDATED_AT FROM category_associated_content WHERE ID = :p0'; + try { + $stmt = $con->prepare($sql); + $stmt->bindValue(':p0', $key, PDO::PARAM_INT); + $stmt->execute(); + } catch (Exception $e) { + Propel::log($e->getMessage(), Propel::LOG_ERR); + throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), 0, $e); + } + $obj = null; + if ($row = $stmt->fetch(\PDO::FETCH_NUM)) { + $obj = new ChildCategoryAssociatedContent(); + $obj->hydrate($row); + CategoryAssociatedContentTableMap::addInstanceToPool($obj, (string) $key); + } + $stmt->closeCursor(); + + return $obj; + } + + /** + * Find object by primary key. + * + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object + * + * @return ChildCategoryAssociatedContent|array|mixed the result, formatted by the current formatter + */ + protected function findPkComplex($key, $con) + { + // As the query uses a PK condition, no limit(1) is necessary. + $criteria = $this->isKeepQuery() ? clone $this : $this; + $dataFetcher = $criteria + ->filterByPrimaryKey($key) + ->doSelect($con); + + return $criteria->getFormatter()->init($criteria)->formatOne($dataFetcher); + } + + /** + * Find objects by primary key + * + * $objs = $c->findPks(array(12, 56, 832), $con); + * + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object + * + * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter + */ + public function findPks($keys, $con = null) + { + if (null === $con) { + $con = Propel::getServiceContainer()->getReadConnection($this->getDbName()); + } + $this->basePreSelect($con); + $criteria = $this->isKeepQuery() ? clone $this : $this; + $dataFetcher = $criteria + ->filterByPrimaryKeys($keys) + ->doSelect($con); + + return $criteria->getFormatter()->init($criteria)->format($dataFetcher); + } + + /** + * Filter the query by primary key + * + * @param mixed $key Primary key to use for the query + * + * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface + */ + public function filterByPrimaryKey($key) + { + + return $this->addUsingAlias(CategoryAssociatedContentTableMap::ID, $key, Criteria::EQUAL); + } + + /** + * Filter the query by a list of primary keys + * + * @param array $keys The list of primary key to use for the query + * + * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface + */ + public function filterByPrimaryKeys($keys) + { + + return $this->addUsingAlias(CategoryAssociatedContentTableMap::ID, $keys, Criteria::IN); + } + + /** + * Filter the query on the id column + * + * Example usage: + * + * $query->filterById(1234); // WHERE id = 1234 + * $query->filterById(array(12, 34)); // WHERE id IN (12, 34) + * $query->filterById(array('min' => 12)); // WHERE id > 12 + * + * + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface + */ + public function filterById($id = null, $comparison = null) + { + if (is_array($id)) { + $useMinMax = false; + if (isset($id['min'])) { + $this->addUsingAlias(CategoryAssociatedContentTableMap::ID, $id['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($id['max'])) { + $this->addUsingAlias(CategoryAssociatedContentTableMap::ID, $id['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(CategoryAssociatedContentTableMap::ID, $id, $comparison); + } + + /** + * Filter the query on the category_id column + * + * Example usage: + * + * $query->filterByCategoryId(1234); // WHERE category_id = 1234 + * $query->filterByCategoryId(array(12, 34)); // WHERE category_id IN (12, 34) + * $query->filterByCategoryId(array('min' => 12)); // WHERE category_id > 12 + * + * + * @see filterByCategory() + * + * @param mixed $categoryId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface + */ + public function filterByCategoryId($categoryId = null, $comparison = null) + { + if (is_array($categoryId)) { + $useMinMax = false; + if (isset($categoryId['min'])) { + $this->addUsingAlias(CategoryAssociatedContentTableMap::CATEGORY_ID, $categoryId['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($categoryId['max'])) { + $this->addUsingAlias(CategoryAssociatedContentTableMap::CATEGORY_ID, $categoryId['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(CategoryAssociatedContentTableMap::CATEGORY_ID, $categoryId, $comparison); + } + + /** + * Filter the query on the content_id column + * + * Example usage: + * + * $query->filterByContentId(1234); // WHERE content_id = 1234 + * $query->filterByContentId(array(12, 34)); // WHERE content_id IN (12, 34) + * $query->filterByContentId(array('min' => 12)); // WHERE content_id > 12 + * + * + * @see filterByContent() + * + * @param mixed $contentId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface + */ + public function filterByContentId($contentId = null, $comparison = null) + { + if (is_array($contentId)) { + $useMinMax = false; + if (isset($contentId['min'])) { + $this->addUsingAlias(CategoryAssociatedContentTableMap::CONTENT_ID, $contentId['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($contentId['max'])) { + $this->addUsingAlias(CategoryAssociatedContentTableMap::CONTENT_ID, $contentId['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(CategoryAssociatedContentTableMap::CONTENT_ID, $contentId, $comparison); + } + + /** + * Filter the query on the position column + * + * Example usage: + * + * $query->filterByPosition(1234); // WHERE position = 1234 + * $query->filterByPosition(array(12, 34)); // WHERE position IN (12, 34) + * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 + * + * + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface + */ + public function filterByPosition($position = null, $comparison = null) + { + if (is_array($position)) { + $useMinMax = false; + if (isset($position['min'])) { + $this->addUsingAlias(CategoryAssociatedContentTableMap::POSITION, $position['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($position['max'])) { + $this->addUsingAlias(CategoryAssociatedContentTableMap::POSITION, $position['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(CategoryAssociatedContentTableMap::POSITION, $position, $comparison); + } + + /** + * Filter the query on the created_at column + * + * Example usage: + * + * $query->filterByCreatedAt('2011-03-14'); // WHERE created_at = '2011-03-14' + * $query->filterByCreatedAt('now'); // WHERE created_at = '2011-03-14' + * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' + * + * + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface + */ + public function filterByCreatedAt($createdAt = null, $comparison = null) + { + if (is_array($createdAt)) { + $useMinMax = false; + if (isset($createdAt['min'])) { + $this->addUsingAlias(CategoryAssociatedContentTableMap::CREATED_AT, $createdAt['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($createdAt['max'])) { + $this->addUsingAlias(CategoryAssociatedContentTableMap::CREATED_AT, $createdAt['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(CategoryAssociatedContentTableMap::CREATED_AT, $createdAt, $comparison); + } + + /** + * Filter the query on the updated_at column + * + * Example usage: + * + * $query->filterByUpdatedAt('2011-03-14'); // WHERE updated_at = '2011-03-14' + * $query->filterByUpdatedAt('now'); // WHERE updated_at = '2011-03-14' + * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' + * + * + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface + */ + public function filterByUpdatedAt($updatedAt = null, $comparison = null) + { + if (is_array($updatedAt)) { + $useMinMax = false; + if (isset($updatedAt['min'])) { + $this->addUsingAlias(CategoryAssociatedContentTableMap::UPDATED_AT, $updatedAt['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($updatedAt['max'])) { + $this->addUsingAlias(CategoryAssociatedContentTableMap::UPDATED_AT, $updatedAt['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(CategoryAssociatedContentTableMap::UPDATED_AT, $updatedAt, $comparison); + } + + /** + * Filter the query by a related \Thelia\Model\Category object + * + * @param \Thelia\Model\Category|ObjectCollection $category The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface + */ + public function filterByCategory($category, $comparison = null) + { + if ($category instanceof \Thelia\Model\Category) { + return $this + ->addUsingAlias(CategoryAssociatedContentTableMap::CATEGORY_ID, $category->getId(), $comparison); + } elseif ($category instanceof ObjectCollection) { + if (null === $comparison) { + $comparison = Criteria::IN; + } + + return $this + ->addUsingAlias(CategoryAssociatedContentTableMap::CATEGORY_ID, $category->toKeyValue('PrimaryKey', 'Id'), $comparison); + } else { + throw new PropelException('filterByCategory() only accepts arguments of type \Thelia\Model\Category or Collection'); + } + } + + /** + * Adds a JOIN clause to the query using the Category relation + * + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface + */ + public function joinCategory($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + $tableMap = $this->getTableMap(); + $relationMap = $tableMap->getRelation('Category'); + + // create a ModelJoin object for this join + $join = new ModelJoin(); + $join->setJoinType($joinType); + $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); + if ($previousJoin = $this->getPreviousJoin()) { + $join->setPreviousJoin($previousJoin); + } + + // add the ModelJoin to the current object + if ($relationAlias) { + $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); + $this->addJoinObject($join, $relationAlias); + } else { + $this->addJoinObject($join, 'Category'); + } + + return $this; + } + + /** + * Use the Category relation Category object + * + * @see useQuery() + * + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return \Thelia\Model\CategoryQuery A secondary query class using the current class as primary query + */ + public function useCategoryQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + return $this + ->joinCategory($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'Category', '\Thelia\Model\CategoryQuery'); + } + + /** + * Filter the query by a related \Thelia\Model\Content object + * + * @param \Thelia\Model\Content|ObjectCollection $content The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface + */ + public function filterByContent($content, $comparison = null) + { + if ($content instanceof \Thelia\Model\Content) { + return $this + ->addUsingAlias(CategoryAssociatedContentTableMap::CONTENT_ID, $content->getId(), $comparison); + } elseif ($content instanceof ObjectCollection) { + if (null === $comparison) { + $comparison = Criteria::IN; + } + + return $this + ->addUsingAlias(CategoryAssociatedContentTableMap::CONTENT_ID, $content->toKeyValue('PrimaryKey', 'Id'), $comparison); + } else { + throw new PropelException('filterByContent() only accepts arguments of type \Thelia\Model\Content or Collection'); + } + } + + /** + * Adds a JOIN clause to the query using the Content relation + * + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface + */ + public function joinContent($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + $tableMap = $this->getTableMap(); + $relationMap = $tableMap->getRelation('Content'); + + // create a ModelJoin object for this join + $join = new ModelJoin(); + $join->setJoinType($joinType); + $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); + if ($previousJoin = $this->getPreviousJoin()) { + $join->setPreviousJoin($previousJoin); + } + + // add the ModelJoin to the current object + if ($relationAlias) { + $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); + $this->addJoinObject($join, $relationAlias); + } else { + $this->addJoinObject($join, 'Content'); + } + + return $this; + } + + /** + * Use the Content relation Content object + * + * @see useQuery() + * + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return \Thelia\Model\ContentQuery A secondary query class using the current class as primary query + */ + public function useContentQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + return $this + ->joinContent($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'Content', '\Thelia\Model\ContentQuery'); + } + + /** + * Exclude object from result + * + * @param ChildCategoryAssociatedContent $categoryAssociatedContent Object to remove from the list of results + * + * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface + */ + public function prune($categoryAssociatedContent = null) + { + if ($categoryAssociatedContent) { + $this->addUsingAlias(CategoryAssociatedContentTableMap::ID, $categoryAssociatedContent->getId(), Criteria::NOT_EQUAL); + } + + return $this; + } + + /** + * Deletes all rows from the category_associated_content table. + * + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). + */ + public function doDeleteAll(ConnectionInterface $con = null) + { + if (null === $con) { + $con = Propel::getServiceContainer()->getWriteConnection(CategoryAssociatedContentTableMap::DATABASE_NAME); + } + $affectedRows = 0; // initialize var to track total num of affected rows + try { + // use transaction because $criteria could contain info + // for more than one table or we could emulating ON DELETE CASCADE, etc. + $con->beginTransaction(); + $affectedRows += parent::doDeleteAll($con); + // Because this db requires some delete cascade/set null emulation, we have to + // clear the cached instance *after* the emulation has happened (since + // instances get re-added by the select statement contained therein). + CategoryAssociatedContentTableMap::clearInstancePool(); + CategoryAssociatedContentTableMap::clearRelatedInstancePool(); + + $con->commit(); + } catch (PropelException $e) { + $con->rollBack(); + throw $e; + } + + return $affectedRows; + } + + /** + * Performs a DELETE on the database, given a ChildCategoryAssociatedContent or Criteria object OR a primary key value. + * + * @param mixed $values Criteria or ChildCategoryAssociatedContent object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public function delete(ConnectionInterface $con = null) + { + if (null === $con) { + $con = Propel::getServiceContainer()->getWriteConnection(CategoryAssociatedContentTableMap::DATABASE_NAME); + } + + $criteria = $this; + + // Set the correct dbName + $criteria->setDbName(CategoryAssociatedContentTableMap::DATABASE_NAME); + + $affectedRows = 0; // initialize var to track total num of affected rows + + try { + // use transaction because $criteria could contain info + // for more than one table or we could emulating ON DELETE CASCADE, etc. + $con->beginTransaction(); + + + CategoryAssociatedContentTableMap::removeInstanceFromPool($criteria); + + $affectedRows += ModelCriteria::delete($con); + CategoryAssociatedContentTableMap::clearRelatedInstancePool(); + $con->commit(); + + return $affectedRows; + } catch (PropelException $e) { + $con->rollBack(); + throw $e; + } + } + + // timestampable behavior + + /** + * Filter by the latest updated + * + * @param int $nbDays Maximum age of the latest update in days + * + * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface + */ + public function recentlyUpdated($nbDays = 7) + { + return $this->addUsingAlias(CategoryAssociatedContentTableMap::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL); + } + + /** + * Filter by the latest created + * + * @param int $nbDays Maximum age of in days + * + * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface + */ + public function recentlyCreated($nbDays = 7) + { + return $this->addUsingAlias(CategoryAssociatedContentTableMap::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL); + } + + /** + * Order by update date desc + * + * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface + */ + public function lastUpdatedFirst() + { + return $this->addDescendingOrderByColumn(CategoryAssociatedContentTableMap::UPDATED_AT); + } + + /** + * Order by update date asc + * + * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface + */ + public function firstUpdatedFirst() + { + return $this->addAscendingOrderByColumn(CategoryAssociatedContentTableMap::UPDATED_AT); + } + + /** + * Order by create date desc + * + * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface + */ + public function lastCreatedFirst() + { + return $this->addDescendingOrderByColumn(CategoryAssociatedContentTableMap::CREATED_AT); + } + + /** + * Order by create date asc + * + * @return ChildCategoryAssociatedContentQuery The current query, for fluid interface + */ + public function firstCreatedFirst() + { + return $this->addAscendingOrderByColumn(CategoryAssociatedContentTableMap::CREATED_AT); + } + +} // CategoryAssociatedContentQuery diff --git a/core/lib/Thelia/Model/Base/CategoryQuery.php b/core/lib/Thelia/Model/Base/CategoryQuery.php index 5a9c1165f..4c823a223 100644 --- a/core/lib/Thelia/Model/Base/CategoryQuery.php +++ b/core/lib/Thelia/Model/Base/CategoryQuery.php @@ -58,10 +58,6 @@ use Thelia\Model\Map\CategoryTableMap; * @method ChildCategoryQuery rightJoinAttributeCategory($relationAlias = null) Adds a RIGHT JOIN clause to the query using the AttributeCategory relation * @method ChildCategoryQuery innerJoinAttributeCategory($relationAlias = null) Adds a INNER JOIN clause to the query using the AttributeCategory relation * - * @method ChildCategoryQuery leftJoinContentAssoc($relationAlias = null) Adds a LEFT JOIN clause to the query using the ContentAssoc relation - * @method ChildCategoryQuery rightJoinContentAssoc($relationAlias = null) Adds a RIGHT JOIN clause to the query using the ContentAssoc relation - * @method ChildCategoryQuery innerJoinContentAssoc($relationAlias = null) Adds a INNER JOIN clause to the query using the ContentAssoc relation - * * @method ChildCategoryQuery leftJoinRewriting($relationAlias = null) Adds a LEFT JOIN clause to the query using the Rewriting relation * @method ChildCategoryQuery rightJoinRewriting($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Rewriting relation * @method ChildCategoryQuery innerJoinRewriting($relationAlias = null) Adds a INNER JOIN clause to the query using the Rewriting relation @@ -74,6 +70,10 @@ use Thelia\Model\Map\CategoryTableMap; * @method ChildCategoryQuery rightJoinCategoryDocument($relationAlias = null) Adds a RIGHT JOIN clause to the query using the CategoryDocument relation * @method ChildCategoryQuery innerJoinCategoryDocument($relationAlias = null) Adds a INNER JOIN clause to the query using the CategoryDocument relation * + * @method ChildCategoryQuery leftJoinCategoryAssociatedContent($relationAlias = null) Adds a LEFT JOIN clause to the query using the CategoryAssociatedContent relation + * @method ChildCategoryQuery rightJoinCategoryAssociatedContent($relationAlias = null) Adds a RIGHT JOIN clause to the query using the CategoryAssociatedContent relation + * @method ChildCategoryQuery innerJoinCategoryAssociatedContent($relationAlias = null) Adds a INNER JOIN clause to the query using the CategoryAssociatedContent relation + * * @method ChildCategoryQuery leftJoinCategoryI18n($relationAlias = null) Adds a LEFT JOIN clause to the query using the CategoryI18n relation * @method ChildCategoryQuery rightJoinCategoryI18n($relationAlias = null) Adds a RIGHT JOIN clause to the query using the CategoryI18n relation * @method ChildCategoryQuery innerJoinCategoryI18n($relationAlias = null) Adds a INNER JOIN clause to the query using the CategoryI18n relation @@ -870,79 +870,6 @@ abstract class CategoryQuery extends ModelCriteria ->useQuery($relationAlias ? $relationAlias : 'AttributeCategory', '\Thelia\Model\AttributeCategoryQuery'); } - /** - * Filter the query by a related \Thelia\Model\ContentAssoc object - * - * @param \Thelia\Model\ContentAssoc|ObjectCollection $contentAssoc the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildCategoryQuery The current query, for fluid interface - */ - public function filterByContentAssoc($contentAssoc, $comparison = null) - { - if ($contentAssoc instanceof \Thelia\Model\ContentAssoc) { - return $this - ->addUsingAlias(CategoryTableMap::ID, $contentAssoc->getCategoryId(), $comparison); - } elseif ($contentAssoc instanceof ObjectCollection) { - return $this - ->useContentAssocQuery() - ->filterByPrimaryKeys($contentAssoc->getPrimaryKeys()) - ->endUse(); - } else { - throw new PropelException('filterByContentAssoc() only accepts arguments of type \Thelia\Model\ContentAssoc or Collection'); - } - } - - /** - * Adds a JOIN clause to the query using the ContentAssoc relation - * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return ChildCategoryQuery The current query, for fluid interface - */ - public function joinContentAssoc($relationAlias = null, $joinType = Criteria::LEFT_JOIN) - { - $tableMap = $this->getTableMap(); - $relationMap = $tableMap->getRelation('ContentAssoc'); - - // create a ModelJoin object for this join - $join = new ModelJoin(); - $join->setJoinType($joinType); - $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); - if ($previousJoin = $this->getPreviousJoin()) { - $join->setPreviousJoin($previousJoin); - } - - // add the ModelJoin to the current object - if ($relationAlias) { - $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); - $this->addJoinObject($join, $relationAlias); - } else { - $this->addJoinObject($join, 'ContentAssoc'); - } - - return $this; - } - - /** - * Use the ContentAssoc relation ContentAssoc object - * - * @see useQuery() - * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return \Thelia\Model\ContentAssocQuery A secondary query class using the current class as primary query - */ - public function useContentAssocQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) - { - return $this - ->joinContentAssoc($relationAlias, $joinType) - ->useQuery($relationAlias ? $relationAlias : 'ContentAssoc', '\Thelia\Model\ContentAssocQuery'); - } - /** * Filter the query by a related \Thelia\Model\Rewriting object * @@ -1162,6 +1089,79 @@ abstract class CategoryQuery extends ModelCriteria ->useQuery($relationAlias ? $relationAlias : 'CategoryDocument', '\Thelia\Model\CategoryDocumentQuery'); } + /** + * Filter the query by a related \Thelia\Model\CategoryAssociatedContent object + * + * @param \Thelia\Model\CategoryAssociatedContent|ObjectCollection $categoryAssociatedContent the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCategoryQuery The current query, for fluid interface + */ + public function filterByCategoryAssociatedContent($categoryAssociatedContent, $comparison = null) + { + if ($categoryAssociatedContent instanceof \Thelia\Model\CategoryAssociatedContent) { + return $this + ->addUsingAlias(CategoryTableMap::ID, $categoryAssociatedContent->getCategoryId(), $comparison); + } elseif ($categoryAssociatedContent instanceof ObjectCollection) { + return $this + ->useCategoryAssociatedContentQuery() + ->filterByPrimaryKeys($categoryAssociatedContent->getPrimaryKeys()) + ->endUse(); + } else { + throw new PropelException('filterByCategoryAssociatedContent() only accepts arguments of type \Thelia\Model\CategoryAssociatedContent or Collection'); + } + } + + /** + * Adds a JOIN clause to the query using the CategoryAssociatedContent relation + * + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return ChildCategoryQuery The current query, for fluid interface + */ + public function joinCategoryAssociatedContent($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + $tableMap = $this->getTableMap(); + $relationMap = $tableMap->getRelation('CategoryAssociatedContent'); + + // create a ModelJoin object for this join + $join = new ModelJoin(); + $join->setJoinType($joinType); + $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); + if ($previousJoin = $this->getPreviousJoin()) { + $join->setPreviousJoin($previousJoin); + } + + // add the ModelJoin to the current object + if ($relationAlias) { + $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); + $this->addJoinObject($join, $relationAlias); + } else { + $this->addJoinObject($join, 'CategoryAssociatedContent'); + } + + return $this; + } + + /** + * Use the CategoryAssociatedContent relation CategoryAssociatedContent object + * + * @see useQuery() + * + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return \Thelia\Model\CategoryAssociatedContentQuery A secondary query class using the current class as primary query + */ + public function useCategoryAssociatedContentQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + return $this + ->joinCategoryAssociatedContent($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'CategoryAssociatedContent', '\Thelia\Model\CategoryAssociatedContentQuery'); + } + /** * Filter the query by a related \Thelia\Model\CategoryI18n object * diff --git a/core/lib/Thelia/Model/Base/Content.php b/core/lib/Thelia/Model/Base/Content.php index e8514fc08..e46d82ac4 100644 --- a/core/lib/Thelia/Model/Base/Content.php +++ b/core/lib/Thelia/Model/Base/Content.php @@ -17,9 +17,9 @@ use Propel\Runtime\Exception\PropelException; use Propel\Runtime\Map\TableMap; use Propel\Runtime\Parser\AbstractParser; use Propel\Runtime\Util\PropelDateTime; +use Thelia\Model\CategoryAssociatedContent as ChildCategoryAssociatedContent; +use Thelia\Model\CategoryAssociatedContentQuery as ChildCategoryAssociatedContentQuery; use Thelia\Model\Content as ChildContent; -use Thelia\Model\ContentAssoc as ChildContentAssoc; -use Thelia\Model\ContentAssocQuery as ChildContentAssocQuery; use Thelia\Model\ContentDocument as ChildContentDocument; use Thelia\Model\ContentDocumentQuery as ChildContentDocumentQuery; use Thelia\Model\ContentFolder as ChildContentFolder; @@ -33,6 +33,8 @@ use Thelia\Model\ContentVersion as ChildContentVersion; use Thelia\Model\ContentVersionQuery as ChildContentVersionQuery; use Thelia\Model\Folder as ChildFolder; use Thelia\Model\FolderQuery as ChildFolderQuery; +use Thelia\Model\ProductAssociatedContent as ChildProductAssociatedContent; +use Thelia\Model\ProductAssociatedContentQuery as ChildProductAssociatedContentQuery; use Thelia\Model\Rewriting as ChildRewriting; use Thelia\Model\RewritingQuery as ChildRewritingQuery; use Thelia\Model\Map\ContentTableMap; @@ -121,12 +123,6 @@ abstract class Content implements ActiveRecordInterface */ protected $version_created_by; - /** - * @var ObjectCollection|ChildContentAssoc[] Collection to store aggregation of ChildContentAssoc objects. - */ - protected $collContentAssocs; - protected $collContentAssocsPartial; - /** * @var ObjectCollection|ChildRewriting[] Collection to store aggregation of ChildRewriting objects. */ @@ -151,6 +147,18 @@ abstract class Content implements ActiveRecordInterface protected $collContentDocuments; protected $collContentDocumentsPartial; + /** + * @var ObjectCollection|ChildProductAssociatedContent[] Collection to store aggregation of ChildProductAssociatedContent objects. + */ + protected $collProductAssociatedContents; + protected $collProductAssociatedContentsPartial; + + /** + * @var ObjectCollection|ChildCategoryAssociatedContent[] Collection to store aggregation of ChildCategoryAssociatedContent objects. + */ + protected $collCategoryAssociatedContents; + protected $collCategoryAssociatedContentsPartial; + /** * @var ObjectCollection|ChildContentI18n[] Collection to store aggregation of ChildContentI18n objects. */ @@ -204,12 +212,6 @@ abstract class Content implements ActiveRecordInterface */ protected $foldersScheduledForDeletion = null; - /** - * An array of objects scheduled for deletion. - * @var ObjectCollection - */ - protected $contentAssocsScheduledForDeletion = null; - /** * An array of objects scheduled for deletion. * @var ObjectCollection @@ -234,6 +236,18 @@ abstract class Content implements ActiveRecordInterface */ protected $contentDocumentsScheduledForDeletion = null; + /** + * An array of objects scheduled for deletion. + * @var ObjectCollection + */ + protected $productAssociatedContentsScheduledForDeletion = null; + + /** + * An array of objects scheduled for deletion. + * @var ObjectCollection + */ + protected $categoryAssociatedContentsScheduledForDeletion = null; + /** * An array of objects scheduled for deletion. * @var ObjectCollection @@ -938,8 +952,6 @@ abstract class Content implements ActiveRecordInterface if ($deep) { // also de-associate any related objects? - $this->collContentAssocs = null; - $this->collRewritings = null; $this->collContentFolders = null; @@ -948,6 +960,10 @@ abstract class Content implements ActiveRecordInterface $this->collContentDocuments = null; + $this->collProductAssociatedContents = null; + + $this->collCategoryAssociatedContents = null; + $this->collContentI18ns = null; $this->collContentVersions = null; @@ -1125,23 +1141,6 @@ abstract class Content implements ActiveRecordInterface } } - if ($this->contentAssocsScheduledForDeletion !== null) { - if (!$this->contentAssocsScheduledForDeletion->isEmpty()) { - \Thelia\Model\ContentAssocQuery::create() - ->filterByPrimaryKeys($this->contentAssocsScheduledForDeletion->getPrimaryKeys(false)) - ->delete($con); - $this->contentAssocsScheduledForDeletion = null; - } - } - - if ($this->collContentAssocs !== null) { - foreach ($this->collContentAssocs as $referrerFK) { - if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) { - $affectedRows += $referrerFK->save($con); - } - } - } - if ($this->rewritingsScheduledForDeletion !== null) { if (!$this->rewritingsScheduledForDeletion->isEmpty()) { \Thelia\Model\RewritingQuery::create() @@ -1210,6 +1209,40 @@ abstract class Content implements ActiveRecordInterface } } + if ($this->productAssociatedContentsScheduledForDeletion !== null) { + if (!$this->productAssociatedContentsScheduledForDeletion->isEmpty()) { + \Thelia\Model\ProductAssociatedContentQuery::create() + ->filterByPrimaryKeys($this->productAssociatedContentsScheduledForDeletion->getPrimaryKeys(false)) + ->delete($con); + $this->productAssociatedContentsScheduledForDeletion = null; + } + } + + if ($this->collProductAssociatedContents !== null) { + foreach ($this->collProductAssociatedContents as $referrerFK) { + if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) { + $affectedRows += $referrerFK->save($con); + } + } + } + + if ($this->categoryAssociatedContentsScheduledForDeletion !== null) { + if (!$this->categoryAssociatedContentsScheduledForDeletion->isEmpty()) { + \Thelia\Model\CategoryAssociatedContentQuery::create() + ->filterByPrimaryKeys($this->categoryAssociatedContentsScheduledForDeletion->getPrimaryKeys(false)) + ->delete($con); + $this->categoryAssociatedContentsScheduledForDeletion = null; + } + } + + if ($this->collCategoryAssociatedContents !== null) { + foreach ($this->collCategoryAssociatedContents as $referrerFK) { + if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) { + $affectedRows += $referrerFK->save($con); + } + } + } + if ($this->contentI18nsScheduledForDeletion !== null) { if (!$this->contentI18nsScheduledForDeletion->isEmpty()) { \Thelia\Model\ContentI18nQuery::create() @@ -1460,9 +1493,6 @@ abstract class Content implements ActiveRecordInterface } if ($includeForeignObjects) { - if (null !== $this->collContentAssocs) { - $result['ContentAssocs'] = $this->collContentAssocs->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); - } if (null !== $this->collRewritings) { $result['Rewritings'] = $this->collRewritings->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } @@ -1475,6 +1505,12 @@ abstract class Content implements ActiveRecordInterface if (null !== $this->collContentDocuments) { $result['ContentDocuments'] = $this->collContentDocuments->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } + if (null !== $this->collProductAssociatedContents) { + $result['ProductAssociatedContents'] = $this->collProductAssociatedContents->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); + } + if (null !== $this->collCategoryAssociatedContents) { + $result['CategoryAssociatedContents'] = $this->collCategoryAssociatedContents->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); + } if (null !== $this->collContentI18ns) { $result['ContentI18ns'] = $this->collContentI18ns->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } @@ -1666,12 +1702,6 @@ abstract class Content implements ActiveRecordInterface // the getter/setter methods for fkey referrer objects. $copyObj->setNew(false); - foreach ($this->getContentAssocs() as $relObj) { - if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves - $copyObj->addContentAssoc($relObj->copy($deepCopy)); - } - } - foreach ($this->getRewritings() as $relObj) { if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves $copyObj->addRewriting($relObj->copy($deepCopy)); @@ -1696,6 +1726,18 @@ abstract class Content implements ActiveRecordInterface } } + foreach ($this->getProductAssociatedContents() as $relObj) { + if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves + $copyObj->addProductAssociatedContent($relObj->copy($deepCopy)); + } + } + + foreach ($this->getCategoryAssociatedContents() as $relObj) { + if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves + $copyObj->addCategoryAssociatedContent($relObj->copy($deepCopy)); + } + } + foreach ($this->getContentI18ns() as $relObj) { if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves $copyObj->addContentI18n($relObj->copy($deepCopy)); @@ -1749,9 +1791,6 @@ abstract class Content implements ActiveRecordInterface */ public function initRelation($relationName) { - if ('ContentAssoc' == $relationName) { - return $this->initContentAssocs(); - } if ('Rewriting' == $relationName) { return $this->initRewritings(); } @@ -1764,6 +1803,12 @@ abstract class Content implements ActiveRecordInterface if ('ContentDocument' == $relationName) { return $this->initContentDocuments(); } + if ('ProductAssociatedContent' == $relationName) { + return $this->initProductAssociatedContents(); + } + if ('CategoryAssociatedContent' == $relationName) { + return $this->initCategoryAssociatedContents(); + } if ('ContentI18n' == $relationName) { return $this->initContentI18ns(); } @@ -1772,274 +1817,6 @@ abstract class Content implements ActiveRecordInterface } } - /** - * Clears out the collContentAssocs collection - * - * This does not modify the database; however, it will remove any associated objects, causing - * them to be refetched by subsequent calls to accessor method. - * - * @return void - * @see addContentAssocs() - */ - public function clearContentAssocs() - { - $this->collContentAssocs = null; // important to set this to NULL since that means it is uninitialized - } - - /** - * Reset is the collContentAssocs collection loaded partially. - */ - public function resetPartialContentAssocs($v = true) - { - $this->collContentAssocsPartial = $v; - } - - /** - * Initializes the collContentAssocs collection. - * - * By default this just sets the collContentAssocs collection to an empty array (like clearcollContentAssocs()); - * however, you may wish to override this method in your stub class to provide setting appropriate - * to your application -- for example, setting the initial array to the values stored in database. - * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty - * - * @return void - */ - public function initContentAssocs($overrideExisting = true) - { - if (null !== $this->collContentAssocs && !$overrideExisting) { - return; - } - $this->collContentAssocs = new ObjectCollection(); - $this->collContentAssocs->setModel('\Thelia\Model\ContentAssoc'); - } - - /** - * Gets an array of ChildContentAssoc objects which contain a foreign key that references this object. - * - * If the $criteria is not null, it is used to always fetch the results from the database. - * Otherwise the results are fetched from the database the first time, then cached. - * Next time the same method is called without $criteria, the cached collection is returned. - * If this ChildContent is new, it will return - * an empty collection or the current collection; the criteria is ignored on a new object. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @return Collection|ChildContentAssoc[] List of ChildContentAssoc objects - * @throws PropelException - */ - public function getContentAssocs($criteria = null, ConnectionInterface $con = null) - { - $partial = $this->collContentAssocsPartial && !$this->isNew(); - if (null === $this->collContentAssocs || null !== $criteria || $partial) { - if ($this->isNew() && null === $this->collContentAssocs) { - // return empty collection - $this->initContentAssocs(); - } else { - $collContentAssocs = ChildContentAssocQuery::create(null, $criteria) - ->filterByContent($this) - ->find($con); - - if (null !== $criteria) { - if (false !== $this->collContentAssocsPartial && count($collContentAssocs)) { - $this->initContentAssocs(false); - - foreach ($collContentAssocs as $obj) { - if (false == $this->collContentAssocs->contains($obj)) { - $this->collContentAssocs->append($obj); - } - } - - $this->collContentAssocsPartial = true; - } - - $collContentAssocs->getInternalIterator()->rewind(); - - return $collContentAssocs; - } - - if ($partial && $this->collContentAssocs) { - foreach ($this->collContentAssocs as $obj) { - if ($obj->isNew()) { - $collContentAssocs[] = $obj; - } - } - } - - $this->collContentAssocs = $collContentAssocs; - $this->collContentAssocsPartial = false; - } - } - - return $this->collContentAssocs; - } - - /** - * Sets a collection of ContentAssoc objects related by a one-to-many relationship - * to the current object. - * It will also schedule objects for deletion based on a diff between old objects (aka persisted) - * and new objects from the given Propel collection. - * - * @param Collection $contentAssocs A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildContent The current object (for fluent API support) - */ - public function setContentAssocs(Collection $contentAssocs, ConnectionInterface $con = null) - { - $contentAssocsToDelete = $this->getContentAssocs(new Criteria(), $con)->diff($contentAssocs); - - - $this->contentAssocsScheduledForDeletion = $contentAssocsToDelete; - - foreach ($contentAssocsToDelete as $contentAssocRemoved) { - $contentAssocRemoved->setContent(null); - } - - $this->collContentAssocs = null; - foreach ($contentAssocs as $contentAssoc) { - $this->addContentAssoc($contentAssoc); - } - - $this->collContentAssocs = $contentAssocs; - $this->collContentAssocsPartial = false; - - return $this; - } - - /** - * Returns the number of related ContentAssoc objects. - * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ContentAssoc objects. - * @throws PropelException - */ - public function countContentAssocs(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) - { - $partial = $this->collContentAssocsPartial && !$this->isNew(); - if (null === $this->collContentAssocs || null !== $criteria || $partial) { - if ($this->isNew() && null === $this->collContentAssocs) { - return 0; - } - - if ($partial && !$criteria) { - return count($this->getContentAssocs()); - } - - $query = ChildContentAssocQuery::create(null, $criteria); - if ($distinct) { - $query->distinct(); - } - - return $query - ->filterByContent($this) - ->count($con); - } - - return count($this->collContentAssocs); - } - - /** - * Method called to associate a ChildContentAssoc object to this object - * through the ChildContentAssoc foreign key attribute. - * - * @param ChildContentAssoc $l ChildContentAssoc - * @return \Thelia\Model\Content The current object (for fluent API support) - */ - public function addContentAssoc(ChildContentAssoc $l) - { - if ($this->collContentAssocs === null) { - $this->initContentAssocs(); - $this->collContentAssocsPartial = true; - } - - if (!in_array($l, $this->collContentAssocs->getArrayCopy(), true)) { // only add it if the **same** object is not already associated - $this->doAddContentAssoc($l); - } - - return $this; - } - - /** - * @param ContentAssoc $contentAssoc The contentAssoc object to add. - */ - protected function doAddContentAssoc($contentAssoc) - { - $this->collContentAssocs[]= $contentAssoc; - $contentAssoc->setContent($this); - } - - /** - * @param ContentAssoc $contentAssoc The contentAssoc object to remove. - * @return ChildContent The current object (for fluent API support) - */ - public function removeContentAssoc($contentAssoc) - { - if ($this->getContentAssocs()->contains($contentAssoc)) { - $this->collContentAssocs->remove($this->collContentAssocs->search($contentAssoc)); - if (null === $this->contentAssocsScheduledForDeletion) { - $this->contentAssocsScheduledForDeletion = clone $this->collContentAssocs; - $this->contentAssocsScheduledForDeletion->clear(); - } - $this->contentAssocsScheduledForDeletion[]= $contentAssoc; - $contentAssoc->setContent(null); - } - - return $this; - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Content is new, it will return - * an empty collection; or if this Content has previously - * been saved, it will retrieve related ContentAssocs from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Content. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildContentAssoc[] List of ChildContentAssoc objects - */ - public function getContentAssocsJoinCategory($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildContentAssocQuery::create(null, $criteria); - $query->joinWith('Category', $joinBehavior); - - return $this->getContentAssocs($query, $con); - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Content is new, it will return - * an empty collection; or if this Content has previously - * been saved, it will retrieve related ContentAssocs from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Content. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildContentAssoc[] List of ChildContentAssoc objects - */ - public function getContentAssocsJoinProduct($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildContentAssocQuery::create(null, $criteria); - $query->joinWith('Product', $joinBehavior); - - return $this->getContentAssocs($query, $con); - } - /** * Clears out the collRewritings collection * @@ -3015,6 +2792,492 @@ abstract class Content implements ActiveRecordInterface return $this; } + /** + * Clears out the collProductAssociatedContents collection + * + * This does not modify the database; however, it will remove any associated objects, causing + * them to be refetched by subsequent calls to accessor method. + * + * @return void + * @see addProductAssociatedContents() + */ + public function clearProductAssociatedContents() + { + $this->collProductAssociatedContents = null; // important to set this to NULL since that means it is uninitialized + } + + /** + * Reset is the collProductAssociatedContents collection loaded partially. + */ + public function resetPartialProductAssociatedContents($v = true) + { + $this->collProductAssociatedContentsPartial = $v; + } + + /** + * Initializes the collProductAssociatedContents collection. + * + * By default this just sets the collProductAssociatedContents collection to an empty array (like clearcollProductAssociatedContents()); + * however, you may wish to override this method in your stub class to provide setting appropriate + * to your application -- for example, setting the initial array to the values stored in database. + * + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty + * + * @return void + */ + public function initProductAssociatedContents($overrideExisting = true) + { + if (null !== $this->collProductAssociatedContents && !$overrideExisting) { + return; + } + $this->collProductAssociatedContents = new ObjectCollection(); + $this->collProductAssociatedContents->setModel('\Thelia\Model\ProductAssociatedContent'); + } + + /** + * Gets an array of ChildProductAssociatedContent objects which contain a foreign key that references this object. + * + * If the $criteria is not null, it is used to always fetch the results from the database. + * Otherwise the results are fetched from the database the first time, then cached. + * Next time the same method is called without $criteria, the cached collection is returned. + * If this ChildContent is new, it will return + * an empty collection or the current collection; the criteria is ignored on a new object. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @return Collection|ChildProductAssociatedContent[] List of ChildProductAssociatedContent objects + * @throws PropelException + */ + public function getProductAssociatedContents($criteria = null, ConnectionInterface $con = null) + { + $partial = $this->collProductAssociatedContentsPartial && !$this->isNew(); + if (null === $this->collProductAssociatedContents || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collProductAssociatedContents) { + // return empty collection + $this->initProductAssociatedContents(); + } else { + $collProductAssociatedContents = ChildProductAssociatedContentQuery::create(null, $criteria) + ->filterByContent($this) + ->find($con); + + if (null !== $criteria) { + if (false !== $this->collProductAssociatedContentsPartial && count($collProductAssociatedContents)) { + $this->initProductAssociatedContents(false); + + foreach ($collProductAssociatedContents as $obj) { + if (false == $this->collProductAssociatedContents->contains($obj)) { + $this->collProductAssociatedContents->append($obj); + } + } + + $this->collProductAssociatedContentsPartial = true; + } + + $collProductAssociatedContents->getInternalIterator()->rewind(); + + return $collProductAssociatedContents; + } + + if ($partial && $this->collProductAssociatedContents) { + foreach ($this->collProductAssociatedContents as $obj) { + if ($obj->isNew()) { + $collProductAssociatedContents[] = $obj; + } + } + } + + $this->collProductAssociatedContents = $collProductAssociatedContents; + $this->collProductAssociatedContentsPartial = false; + } + } + + return $this->collProductAssociatedContents; + } + + /** + * Sets a collection of ProductAssociatedContent objects related by a one-to-many relationship + * to the current object. + * It will also schedule objects for deletion based on a diff between old objects (aka persisted) + * and new objects from the given Propel collection. + * + * @param Collection $productAssociatedContents A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildContent The current object (for fluent API support) + */ + public function setProductAssociatedContents(Collection $productAssociatedContents, ConnectionInterface $con = null) + { + $productAssociatedContentsToDelete = $this->getProductAssociatedContents(new Criteria(), $con)->diff($productAssociatedContents); + + + $this->productAssociatedContentsScheduledForDeletion = $productAssociatedContentsToDelete; + + foreach ($productAssociatedContentsToDelete as $productAssociatedContentRemoved) { + $productAssociatedContentRemoved->setContent(null); + } + + $this->collProductAssociatedContents = null; + foreach ($productAssociatedContents as $productAssociatedContent) { + $this->addProductAssociatedContent($productAssociatedContent); + } + + $this->collProductAssociatedContents = $productAssociatedContents; + $this->collProductAssociatedContentsPartial = false; + + return $this; + } + + /** + * Returns the number of related ProductAssociatedContent objects. + * + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ProductAssociatedContent objects. + * @throws PropelException + */ + public function countProductAssociatedContents(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) + { + $partial = $this->collProductAssociatedContentsPartial && !$this->isNew(); + if (null === $this->collProductAssociatedContents || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collProductAssociatedContents) { + return 0; + } + + if ($partial && !$criteria) { + return count($this->getProductAssociatedContents()); + } + + $query = ChildProductAssociatedContentQuery::create(null, $criteria); + if ($distinct) { + $query->distinct(); + } + + return $query + ->filterByContent($this) + ->count($con); + } + + return count($this->collProductAssociatedContents); + } + + /** + * Method called to associate a ChildProductAssociatedContent object to this object + * through the ChildProductAssociatedContent foreign key attribute. + * + * @param ChildProductAssociatedContent $l ChildProductAssociatedContent + * @return \Thelia\Model\Content The current object (for fluent API support) + */ + public function addProductAssociatedContent(ChildProductAssociatedContent $l) + { + if ($this->collProductAssociatedContents === null) { + $this->initProductAssociatedContents(); + $this->collProductAssociatedContentsPartial = true; + } + + if (!in_array($l, $this->collProductAssociatedContents->getArrayCopy(), true)) { // only add it if the **same** object is not already associated + $this->doAddProductAssociatedContent($l); + } + + return $this; + } + + /** + * @param ProductAssociatedContent $productAssociatedContent The productAssociatedContent object to add. + */ + protected function doAddProductAssociatedContent($productAssociatedContent) + { + $this->collProductAssociatedContents[]= $productAssociatedContent; + $productAssociatedContent->setContent($this); + } + + /** + * @param ProductAssociatedContent $productAssociatedContent The productAssociatedContent object to remove. + * @return ChildContent The current object (for fluent API support) + */ + public function removeProductAssociatedContent($productAssociatedContent) + { + if ($this->getProductAssociatedContents()->contains($productAssociatedContent)) { + $this->collProductAssociatedContents->remove($this->collProductAssociatedContents->search($productAssociatedContent)); + if (null === $this->productAssociatedContentsScheduledForDeletion) { + $this->productAssociatedContentsScheduledForDeletion = clone $this->collProductAssociatedContents; + $this->productAssociatedContentsScheduledForDeletion->clear(); + } + $this->productAssociatedContentsScheduledForDeletion[]= clone $productAssociatedContent; + $productAssociatedContent->setContent(null); + } + + return $this; + } + + + /** + * If this collection has already been initialized with + * an identical criteria, it returns the collection. + * Otherwise if this Content is new, it will return + * an empty collection; or if this Content has previously + * been saved, it will retrieve related ProductAssociatedContents from storage. + * + * This method is protected by default in order to keep the public + * api reasonable. You can provide public methods for those you + * actually need in Content. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @return Collection|ChildProductAssociatedContent[] List of ChildProductAssociatedContent objects + */ + public function getProductAssociatedContentsJoinProduct($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) + { + $query = ChildProductAssociatedContentQuery::create(null, $criteria); + $query->joinWith('Product', $joinBehavior); + + return $this->getProductAssociatedContents($query, $con); + } + + /** + * Clears out the collCategoryAssociatedContents collection + * + * This does not modify the database; however, it will remove any associated objects, causing + * them to be refetched by subsequent calls to accessor method. + * + * @return void + * @see addCategoryAssociatedContents() + */ + public function clearCategoryAssociatedContents() + { + $this->collCategoryAssociatedContents = null; // important to set this to NULL since that means it is uninitialized + } + + /** + * Reset is the collCategoryAssociatedContents collection loaded partially. + */ + public function resetPartialCategoryAssociatedContents($v = true) + { + $this->collCategoryAssociatedContentsPartial = $v; + } + + /** + * Initializes the collCategoryAssociatedContents collection. + * + * By default this just sets the collCategoryAssociatedContents collection to an empty array (like clearcollCategoryAssociatedContents()); + * however, you may wish to override this method in your stub class to provide setting appropriate + * to your application -- for example, setting the initial array to the values stored in database. + * + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty + * + * @return void + */ + public function initCategoryAssociatedContents($overrideExisting = true) + { + if (null !== $this->collCategoryAssociatedContents && !$overrideExisting) { + return; + } + $this->collCategoryAssociatedContents = new ObjectCollection(); + $this->collCategoryAssociatedContents->setModel('\Thelia\Model\CategoryAssociatedContent'); + } + + /** + * Gets an array of ChildCategoryAssociatedContent objects which contain a foreign key that references this object. + * + * If the $criteria is not null, it is used to always fetch the results from the database. + * Otherwise the results are fetched from the database the first time, then cached. + * Next time the same method is called without $criteria, the cached collection is returned. + * If this ChildContent is new, it will return + * an empty collection or the current collection; the criteria is ignored on a new object. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @return Collection|ChildCategoryAssociatedContent[] List of ChildCategoryAssociatedContent objects + * @throws PropelException + */ + public function getCategoryAssociatedContents($criteria = null, ConnectionInterface $con = null) + { + $partial = $this->collCategoryAssociatedContentsPartial && !$this->isNew(); + if (null === $this->collCategoryAssociatedContents || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collCategoryAssociatedContents) { + // return empty collection + $this->initCategoryAssociatedContents(); + } else { + $collCategoryAssociatedContents = ChildCategoryAssociatedContentQuery::create(null, $criteria) + ->filterByContent($this) + ->find($con); + + if (null !== $criteria) { + if (false !== $this->collCategoryAssociatedContentsPartial && count($collCategoryAssociatedContents)) { + $this->initCategoryAssociatedContents(false); + + foreach ($collCategoryAssociatedContents as $obj) { + if (false == $this->collCategoryAssociatedContents->contains($obj)) { + $this->collCategoryAssociatedContents->append($obj); + } + } + + $this->collCategoryAssociatedContentsPartial = true; + } + + $collCategoryAssociatedContents->getInternalIterator()->rewind(); + + return $collCategoryAssociatedContents; + } + + if ($partial && $this->collCategoryAssociatedContents) { + foreach ($this->collCategoryAssociatedContents as $obj) { + if ($obj->isNew()) { + $collCategoryAssociatedContents[] = $obj; + } + } + } + + $this->collCategoryAssociatedContents = $collCategoryAssociatedContents; + $this->collCategoryAssociatedContentsPartial = false; + } + } + + return $this->collCategoryAssociatedContents; + } + + /** + * Sets a collection of CategoryAssociatedContent objects related by a one-to-many relationship + * to the current object. + * It will also schedule objects for deletion based on a diff between old objects (aka persisted) + * and new objects from the given Propel collection. + * + * @param Collection $categoryAssociatedContents A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildContent The current object (for fluent API support) + */ + public function setCategoryAssociatedContents(Collection $categoryAssociatedContents, ConnectionInterface $con = null) + { + $categoryAssociatedContentsToDelete = $this->getCategoryAssociatedContents(new Criteria(), $con)->diff($categoryAssociatedContents); + + + $this->categoryAssociatedContentsScheduledForDeletion = $categoryAssociatedContentsToDelete; + + foreach ($categoryAssociatedContentsToDelete as $categoryAssociatedContentRemoved) { + $categoryAssociatedContentRemoved->setContent(null); + } + + $this->collCategoryAssociatedContents = null; + foreach ($categoryAssociatedContents as $categoryAssociatedContent) { + $this->addCategoryAssociatedContent($categoryAssociatedContent); + } + + $this->collCategoryAssociatedContents = $categoryAssociatedContents; + $this->collCategoryAssociatedContentsPartial = false; + + return $this; + } + + /** + * Returns the number of related CategoryAssociatedContent objects. + * + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related CategoryAssociatedContent objects. + * @throws PropelException + */ + public function countCategoryAssociatedContents(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) + { + $partial = $this->collCategoryAssociatedContentsPartial && !$this->isNew(); + if (null === $this->collCategoryAssociatedContents || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collCategoryAssociatedContents) { + return 0; + } + + if ($partial && !$criteria) { + return count($this->getCategoryAssociatedContents()); + } + + $query = ChildCategoryAssociatedContentQuery::create(null, $criteria); + if ($distinct) { + $query->distinct(); + } + + return $query + ->filterByContent($this) + ->count($con); + } + + return count($this->collCategoryAssociatedContents); + } + + /** + * Method called to associate a ChildCategoryAssociatedContent object to this object + * through the ChildCategoryAssociatedContent foreign key attribute. + * + * @param ChildCategoryAssociatedContent $l ChildCategoryAssociatedContent + * @return \Thelia\Model\Content The current object (for fluent API support) + */ + public function addCategoryAssociatedContent(ChildCategoryAssociatedContent $l) + { + if ($this->collCategoryAssociatedContents === null) { + $this->initCategoryAssociatedContents(); + $this->collCategoryAssociatedContentsPartial = true; + } + + if (!in_array($l, $this->collCategoryAssociatedContents->getArrayCopy(), true)) { // only add it if the **same** object is not already associated + $this->doAddCategoryAssociatedContent($l); + } + + return $this; + } + + /** + * @param CategoryAssociatedContent $categoryAssociatedContent The categoryAssociatedContent object to add. + */ + protected function doAddCategoryAssociatedContent($categoryAssociatedContent) + { + $this->collCategoryAssociatedContents[]= $categoryAssociatedContent; + $categoryAssociatedContent->setContent($this); + } + + /** + * @param CategoryAssociatedContent $categoryAssociatedContent The categoryAssociatedContent object to remove. + * @return ChildContent The current object (for fluent API support) + */ + public function removeCategoryAssociatedContent($categoryAssociatedContent) + { + if ($this->getCategoryAssociatedContents()->contains($categoryAssociatedContent)) { + $this->collCategoryAssociatedContents->remove($this->collCategoryAssociatedContents->search($categoryAssociatedContent)); + if (null === $this->categoryAssociatedContentsScheduledForDeletion) { + $this->categoryAssociatedContentsScheduledForDeletion = clone $this->collCategoryAssociatedContents; + $this->categoryAssociatedContentsScheduledForDeletion->clear(); + } + $this->categoryAssociatedContentsScheduledForDeletion[]= clone $categoryAssociatedContent; + $categoryAssociatedContent->setContent(null); + } + + return $this; + } + + + /** + * If this collection has already been initialized with + * an identical criteria, it returns the collection. + * Otherwise if this Content is new, it will return + * an empty collection; or if this Content has previously + * been saved, it will retrieve related CategoryAssociatedContents from storage. + * + * This method is protected by default in order to keep the public + * api reasonable. You can provide public methods for those you + * actually need in Content. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @return Collection|ChildCategoryAssociatedContent[] List of ChildCategoryAssociatedContent objects + */ + public function getCategoryAssociatedContentsJoinCategory($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) + { + $query = ChildCategoryAssociatedContentQuery::create(null, $criteria); + $query->joinWith('Category', $joinBehavior); + + return $this->getCategoryAssociatedContents($query, $con); + } + /** * Clears out the collContentI18ns collection * @@ -3677,11 +3940,6 @@ abstract class Content implements ActiveRecordInterface public function clearAllReferences($deep = false) { if ($deep) { - if ($this->collContentAssocs) { - foreach ($this->collContentAssocs as $o) { - $o->clearAllReferences($deep); - } - } if ($this->collRewritings) { foreach ($this->collRewritings as $o) { $o->clearAllReferences($deep); @@ -3702,6 +3960,16 @@ abstract class Content implements ActiveRecordInterface $o->clearAllReferences($deep); } } + if ($this->collProductAssociatedContents) { + foreach ($this->collProductAssociatedContents as $o) { + $o->clearAllReferences($deep); + } + } + if ($this->collCategoryAssociatedContents) { + foreach ($this->collCategoryAssociatedContents as $o) { + $o->clearAllReferences($deep); + } + } if ($this->collContentI18ns) { foreach ($this->collContentI18ns as $o) { $o->clearAllReferences($deep); @@ -3723,10 +3991,6 @@ abstract class Content implements ActiveRecordInterface $this->currentLocale = 'en_EN'; $this->currentTranslations = null; - if ($this->collContentAssocs instanceof Collection) { - $this->collContentAssocs->clearIterator(); - } - $this->collContentAssocs = null; if ($this->collRewritings instanceof Collection) { $this->collRewritings->clearIterator(); } @@ -3743,6 +4007,14 @@ abstract class Content implements ActiveRecordInterface $this->collContentDocuments->clearIterator(); } $this->collContentDocuments = null; + if ($this->collProductAssociatedContents instanceof Collection) { + $this->collProductAssociatedContents->clearIterator(); + } + $this->collProductAssociatedContents = null; + if ($this->collCategoryAssociatedContents instanceof Collection) { + $this->collCategoryAssociatedContents->clearIterator(); + } + $this->collCategoryAssociatedContents = null; if ($this->collContentI18ns instanceof Collection) { $this->collContentI18ns->clearIterator(); } diff --git a/core/lib/Thelia/Model/Base/ContentQuery.php b/core/lib/Thelia/Model/Base/ContentQuery.php index 28d32cbe6..d4749ce46 100644 --- a/core/lib/Thelia/Model/Base/ContentQuery.php +++ b/core/lib/Thelia/Model/Base/ContentQuery.php @@ -44,10 +44,6 @@ use Thelia\Model\Map\ContentTableMap; * @method ChildContentQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query * @method ChildContentQuery innerJoin($relation) Adds a INNER JOIN clause to the query * - * @method ChildContentQuery leftJoinContentAssoc($relationAlias = null) Adds a LEFT JOIN clause to the query using the ContentAssoc relation - * @method ChildContentQuery rightJoinContentAssoc($relationAlias = null) Adds a RIGHT JOIN clause to the query using the ContentAssoc relation - * @method ChildContentQuery innerJoinContentAssoc($relationAlias = null) Adds a INNER JOIN clause to the query using the ContentAssoc relation - * * @method ChildContentQuery leftJoinRewriting($relationAlias = null) Adds a LEFT JOIN clause to the query using the Rewriting relation * @method ChildContentQuery rightJoinRewriting($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Rewriting relation * @method ChildContentQuery innerJoinRewriting($relationAlias = null) Adds a INNER JOIN clause to the query using the Rewriting relation @@ -64,6 +60,14 @@ use Thelia\Model\Map\ContentTableMap; * @method ChildContentQuery rightJoinContentDocument($relationAlias = null) Adds a RIGHT JOIN clause to the query using the ContentDocument relation * @method ChildContentQuery innerJoinContentDocument($relationAlias = null) Adds a INNER JOIN clause to the query using the ContentDocument relation * + * @method ChildContentQuery leftJoinProductAssociatedContent($relationAlias = null) Adds a LEFT JOIN clause to the query using the ProductAssociatedContent relation + * @method ChildContentQuery rightJoinProductAssociatedContent($relationAlias = null) Adds a RIGHT JOIN clause to the query using the ProductAssociatedContent relation + * @method ChildContentQuery innerJoinProductAssociatedContent($relationAlias = null) Adds a INNER JOIN clause to the query using the ProductAssociatedContent relation + * + * @method ChildContentQuery leftJoinCategoryAssociatedContent($relationAlias = null) Adds a LEFT JOIN clause to the query using the CategoryAssociatedContent relation + * @method ChildContentQuery rightJoinCategoryAssociatedContent($relationAlias = null) Adds a RIGHT JOIN clause to the query using the CategoryAssociatedContent relation + * @method ChildContentQuery innerJoinCategoryAssociatedContent($relationAlias = null) Adds a INNER JOIN clause to the query using the CategoryAssociatedContent relation + * * @method ChildContentQuery leftJoinContentI18n($relationAlias = null) Adds a LEFT JOIN clause to the query using the ContentI18n relation * @method ChildContentQuery rightJoinContentI18n($relationAlias = null) Adds a RIGHT JOIN clause to the query using the ContentI18n relation * @method ChildContentQuery innerJoinContentI18n($relationAlias = null) Adds a INNER JOIN clause to the query using the ContentI18n relation @@ -598,79 +602,6 @@ abstract class ContentQuery extends ModelCriteria return $this->addUsingAlias(ContentTableMap::VERSION_CREATED_BY, $versionCreatedBy, $comparison); } - /** - * Filter the query by a related \Thelia\Model\ContentAssoc object - * - * @param \Thelia\Model\ContentAssoc|ObjectCollection $contentAssoc the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildContentQuery The current query, for fluid interface - */ - public function filterByContentAssoc($contentAssoc, $comparison = null) - { - if ($contentAssoc instanceof \Thelia\Model\ContentAssoc) { - return $this - ->addUsingAlias(ContentTableMap::ID, $contentAssoc->getContentId(), $comparison); - } elseif ($contentAssoc instanceof ObjectCollection) { - return $this - ->useContentAssocQuery() - ->filterByPrimaryKeys($contentAssoc->getPrimaryKeys()) - ->endUse(); - } else { - throw new PropelException('filterByContentAssoc() only accepts arguments of type \Thelia\Model\ContentAssoc or Collection'); - } - } - - /** - * Adds a JOIN clause to the query using the ContentAssoc relation - * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return ChildContentQuery The current query, for fluid interface - */ - public function joinContentAssoc($relationAlias = null, $joinType = Criteria::LEFT_JOIN) - { - $tableMap = $this->getTableMap(); - $relationMap = $tableMap->getRelation('ContentAssoc'); - - // create a ModelJoin object for this join - $join = new ModelJoin(); - $join->setJoinType($joinType); - $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); - if ($previousJoin = $this->getPreviousJoin()) { - $join->setPreviousJoin($previousJoin); - } - - // add the ModelJoin to the current object - if ($relationAlias) { - $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); - $this->addJoinObject($join, $relationAlias); - } else { - $this->addJoinObject($join, 'ContentAssoc'); - } - - return $this; - } - - /** - * Use the ContentAssoc relation ContentAssoc object - * - * @see useQuery() - * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return \Thelia\Model\ContentAssocQuery A secondary query class using the current class as primary query - */ - public function useContentAssocQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) - { - return $this - ->joinContentAssoc($relationAlias, $joinType) - ->useQuery($relationAlias ? $relationAlias : 'ContentAssoc', '\Thelia\Model\ContentAssocQuery'); - } - /** * Filter the query by a related \Thelia\Model\Rewriting object * @@ -963,6 +894,152 @@ abstract class ContentQuery extends ModelCriteria ->useQuery($relationAlias ? $relationAlias : 'ContentDocument', '\Thelia\Model\ContentDocumentQuery'); } + /** + * Filter the query by a related \Thelia\Model\ProductAssociatedContent object + * + * @param \Thelia\Model\ProductAssociatedContent|ObjectCollection $productAssociatedContent the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildContentQuery The current query, for fluid interface + */ + public function filterByProductAssociatedContent($productAssociatedContent, $comparison = null) + { + if ($productAssociatedContent instanceof \Thelia\Model\ProductAssociatedContent) { + return $this + ->addUsingAlias(ContentTableMap::ID, $productAssociatedContent->getContentId(), $comparison); + } elseif ($productAssociatedContent instanceof ObjectCollection) { + return $this + ->useProductAssociatedContentQuery() + ->filterByPrimaryKeys($productAssociatedContent->getPrimaryKeys()) + ->endUse(); + } else { + throw new PropelException('filterByProductAssociatedContent() only accepts arguments of type \Thelia\Model\ProductAssociatedContent or Collection'); + } + } + + /** + * Adds a JOIN clause to the query using the ProductAssociatedContent relation + * + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return ChildContentQuery The current query, for fluid interface + */ + public function joinProductAssociatedContent($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + $tableMap = $this->getTableMap(); + $relationMap = $tableMap->getRelation('ProductAssociatedContent'); + + // create a ModelJoin object for this join + $join = new ModelJoin(); + $join->setJoinType($joinType); + $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); + if ($previousJoin = $this->getPreviousJoin()) { + $join->setPreviousJoin($previousJoin); + } + + // add the ModelJoin to the current object + if ($relationAlias) { + $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); + $this->addJoinObject($join, $relationAlias); + } else { + $this->addJoinObject($join, 'ProductAssociatedContent'); + } + + return $this; + } + + /** + * Use the ProductAssociatedContent relation ProductAssociatedContent object + * + * @see useQuery() + * + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return \Thelia\Model\ProductAssociatedContentQuery A secondary query class using the current class as primary query + */ + public function useProductAssociatedContentQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + return $this + ->joinProductAssociatedContent($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'ProductAssociatedContent', '\Thelia\Model\ProductAssociatedContentQuery'); + } + + /** + * Filter the query by a related \Thelia\Model\CategoryAssociatedContent object + * + * @param \Thelia\Model\CategoryAssociatedContent|ObjectCollection $categoryAssociatedContent the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildContentQuery The current query, for fluid interface + */ + public function filterByCategoryAssociatedContent($categoryAssociatedContent, $comparison = null) + { + if ($categoryAssociatedContent instanceof \Thelia\Model\CategoryAssociatedContent) { + return $this + ->addUsingAlias(ContentTableMap::ID, $categoryAssociatedContent->getContentId(), $comparison); + } elseif ($categoryAssociatedContent instanceof ObjectCollection) { + return $this + ->useCategoryAssociatedContentQuery() + ->filterByPrimaryKeys($categoryAssociatedContent->getPrimaryKeys()) + ->endUse(); + } else { + throw new PropelException('filterByCategoryAssociatedContent() only accepts arguments of type \Thelia\Model\CategoryAssociatedContent or Collection'); + } + } + + /** + * Adds a JOIN clause to the query using the CategoryAssociatedContent relation + * + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return ChildContentQuery The current query, for fluid interface + */ + public function joinCategoryAssociatedContent($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + $tableMap = $this->getTableMap(); + $relationMap = $tableMap->getRelation('CategoryAssociatedContent'); + + // create a ModelJoin object for this join + $join = new ModelJoin(); + $join->setJoinType($joinType); + $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); + if ($previousJoin = $this->getPreviousJoin()) { + $join->setPreviousJoin($previousJoin); + } + + // add the ModelJoin to the current object + if ($relationAlias) { + $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); + $this->addJoinObject($join, $relationAlias); + } else { + $this->addJoinObject($join, 'CategoryAssociatedContent'); + } + + return $this; + } + + /** + * Use the CategoryAssociatedContent relation CategoryAssociatedContent object + * + * @see useQuery() + * + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return \Thelia\Model\CategoryAssociatedContentQuery A secondary query class using the current class as primary query + */ + public function useCategoryAssociatedContentQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + return $this + ->joinCategoryAssociatedContent($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'CategoryAssociatedContent', '\Thelia\Model\CategoryAssociatedContentQuery'); + } + /** * Filter the query by a related \Thelia\Model\ContentI18n object * diff --git a/core/lib/Thelia/Model/Base/Coupon.php b/core/lib/Thelia/Model/Base/Coupon.php index 89a4dc9e2..643b438b6 100644 --- a/core/lib/Thelia/Model/Base/Coupon.php +++ b/core/lib/Thelia/Model/Base/Coupon.php @@ -99,10 +99,10 @@ abstract class Coupon implements ActiveRecordInterface protected $description; /** - * The value for the value field. + * The value for the amount field. * @var double */ - protected $value; + protected $amount; /** * The value for the is_used field. @@ -123,10 +123,28 @@ abstract class Coupon implements ActiveRecordInterface protected $expiration_date; /** - * The value for the serialized_rules field. + * The value for the serialized_rules_type field. * @var string */ - protected $serialized_rules; + protected $serialized_rules_type; + + /** + * The value for the serialized_rules_content field. + * @var string + */ + protected $serialized_rules_content; + + /** + * The value for the is_cumulative field. + * @var int + */ + protected $is_cumulative; + + /** + * The value for the is_removing_postage field. + * @var int + */ + protected $is_removing_postage; /** * The value for the created_at field. @@ -547,14 +565,14 @@ abstract class Coupon implements ActiveRecordInterface } /** - * Get the [value] column value. + * Get the [amount] column value. * * @return double */ - public function getValue() + public function getAmount() { - return $this->value; + return $this->amount; } /** @@ -600,14 +618,47 @@ abstract class Coupon implements ActiveRecordInterface } /** - * Get the [serialized_rules] column value. + * Get the [serialized_rules_type] column value. * * @return string */ - public function getSerializedRules() + public function getSerializedRulesType() { - return $this->serialized_rules; + return $this->serialized_rules_type; + } + + /** + * Get the [serialized_rules_content] column value. + * + * @return string + */ + public function getSerializedRulesContent() + { + + return $this->serialized_rules_content; + } + + /** + * Get the [is_cumulative] column value. + * + * @return int + */ + public function getIsCumulative() + { + + return $this->is_cumulative; + } + + /** + * Get the [is_removing_postage] column value. + * + * @return int + */ + public function getIsRemovingPostage() + { + + return $this->is_removing_postage; } /** @@ -788,25 +839,25 @@ abstract class Coupon implements ActiveRecordInterface } // setDescription() /** - * Set the value of [value] column. + * Set the value of [amount] column. * * @param double $v new value * @return \Thelia\Model\Coupon The current object (for fluent API support) */ - public function setValue($v) + public function setAmount($v) { if ($v !== null) { $v = (double) $v; } - if ($this->value !== $v) { - $this->value = $v; - $this->modifiedColumns[] = CouponTableMap::VALUE; + if ($this->amount !== $v) { + $this->amount = $v; + $this->modifiedColumns[] = CouponTableMap::AMOUNT; } return $this; - } // setValue() + } // setAmount() /** * Set the value of [is_used] column. @@ -872,25 +923,88 @@ abstract class Coupon implements ActiveRecordInterface } // setExpirationDate() /** - * Set the value of [serialized_rules] column. + * Set the value of [serialized_rules_type] column. * * @param string $v new value * @return \Thelia\Model\Coupon The current object (for fluent API support) */ - public function setSerializedRules($v) + public function setSerializedRulesType($v) { if ($v !== null) { $v = (string) $v; } - if ($this->serialized_rules !== $v) { - $this->serialized_rules = $v; - $this->modifiedColumns[] = CouponTableMap::SERIALIZED_RULES; + if ($this->serialized_rules_type !== $v) { + $this->serialized_rules_type = $v; + $this->modifiedColumns[] = CouponTableMap::SERIALIZED_RULES_TYPE; } return $this; - } // setSerializedRules() + } // setSerializedRulesType() + + /** + * Set the value of [serialized_rules_content] column. + * + * @param string $v new value + * @return \Thelia\Model\Coupon The current object (for fluent API support) + */ + public function setSerializedRulesContent($v) + { + if ($v !== null) { + $v = (string) $v; + } + + if ($this->serialized_rules_content !== $v) { + $this->serialized_rules_content = $v; + $this->modifiedColumns[] = CouponTableMap::SERIALIZED_RULES_CONTENT; + } + + + return $this; + } // setSerializedRulesContent() + + /** + * Set the value of [is_cumulative] column. + * + * @param int $v new value + * @return \Thelia\Model\Coupon The current object (for fluent API support) + */ + public function setIsCumulative($v) + { + if ($v !== null) { + $v = (int) $v; + } + + if ($this->is_cumulative !== $v) { + $this->is_cumulative = $v; + $this->modifiedColumns[] = CouponTableMap::IS_CUMULATIVE; + } + + + return $this; + } // setIsCumulative() + + /** + * Set the value of [is_removing_postage] column. + * + * @param int $v new value + * @return \Thelia\Model\Coupon The current object (for fluent API support) + */ + public function setIsRemovingPostage($v) + { + if ($v !== null) { + $v = (int) $v; + } + + if ($this->is_removing_postage !== $v) { + $this->is_removing_postage = $v; + $this->modifiedColumns[] = CouponTableMap::IS_REMOVING_POSTAGE; + } + + + return $this; + } // setIsRemovingPostage() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. @@ -1014,8 +1128,8 @@ abstract class Coupon implements ActiveRecordInterface $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : CouponTableMap::translateFieldName('Description', TableMap::TYPE_PHPNAME, $indexType)]; $this->description = (null !== $col) ? (string) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : CouponTableMap::translateFieldName('Value', TableMap::TYPE_PHPNAME, $indexType)]; - $this->value = (null !== $col) ? (double) $col : null; + $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : CouponTableMap::translateFieldName('Amount', TableMap::TYPE_PHPNAME, $indexType)]; + $this->amount = (null !== $col) ? (double) $col : null; $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : CouponTableMap::translateFieldName('IsUsed', TableMap::TYPE_PHPNAME, $indexType)]; $this->is_used = (null !== $col) ? (int) $col : null; @@ -1029,22 +1143,31 @@ abstract class Coupon implements ActiveRecordInterface } $this->expiration_date = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 10 + $startcol : CouponTableMap::translateFieldName('SerializedRules', TableMap::TYPE_PHPNAME, $indexType)]; - $this->serialized_rules = (null !== $col) ? (string) $col : null; + $col = $row[TableMap::TYPE_NUM == $indexType ? 10 + $startcol : CouponTableMap::translateFieldName('SerializedRulesType', TableMap::TYPE_PHPNAME, $indexType)]; + $this->serialized_rules_type = (null !== $col) ? (string) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 11 + $startcol : CouponTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 11 + $startcol : CouponTableMap::translateFieldName('SerializedRulesContent', TableMap::TYPE_PHPNAME, $indexType)]; + $this->serialized_rules_content = (null !== $col) ? (string) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 12 + $startcol : CouponTableMap::translateFieldName('IsCumulative', TableMap::TYPE_PHPNAME, $indexType)]; + $this->is_cumulative = (null !== $col) ? (int) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 13 + $startcol : CouponTableMap::translateFieldName('IsRemovingPostage', TableMap::TYPE_PHPNAME, $indexType)]; + $this->is_removing_postage = (null !== $col) ? (int) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 14 + $startcol : CouponTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 12 + $startcol : CouponTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 15 + $startcol : CouponTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } $this->updated_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 13 + $startcol : CouponTableMap::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 16 + $startcol : CouponTableMap::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)]; $this->version = (null !== $col) ? (int) $col : null; $this->resetModified(); @@ -1054,7 +1177,7 @@ abstract class Coupon implements ActiveRecordInterface $this->ensureConsistency(); } - return $startcol + 14; // 14 = CouponTableMap::NUM_HYDRATE_COLUMNS. + return $startcol + 17; // 17 = CouponTableMap::NUM_HYDRATE_COLUMNS. } catch (Exception $e) { throw new PropelException("Error populating \Thelia\Model\Coupon object", 0, $e); @@ -1358,8 +1481,8 @@ abstract class Coupon implements ActiveRecordInterface if ($this->isColumnModified(CouponTableMap::DESCRIPTION)) { $modifiedColumns[':p' . $index++] = 'DESCRIPTION'; } - if ($this->isColumnModified(CouponTableMap::VALUE)) { - $modifiedColumns[':p' . $index++] = 'VALUE'; + if ($this->isColumnModified(CouponTableMap::AMOUNT)) { + $modifiedColumns[':p' . $index++] = 'AMOUNT'; } if ($this->isColumnModified(CouponTableMap::IS_USED)) { $modifiedColumns[':p' . $index++] = 'IS_USED'; @@ -1370,8 +1493,17 @@ abstract class Coupon implements ActiveRecordInterface if ($this->isColumnModified(CouponTableMap::EXPIRATION_DATE)) { $modifiedColumns[':p' . $index++] = 'EXPIRATION_DATE'; } - if ($this->isColumnModified(CouponTableMap::SERIALIZED_RULES)) { - $modifiedColumns[':p' . $index++] = 'SERIALIZED_RULES'; + if ($this->isColumnModified(CouponTableMap::SERIALIZED_RULES_TYPE)) { + $modifiedColumns[':p' . $index++] = 'SERIALIZED_RULES_TYPE'; + } + if ($this->isColumnModified(CouponTableMap::SERIALIZED_RULES_CONTENT)) { + $modifiedColumns[':p' . $index++] = 'SERIALIZED_RULES_CONTENT'; + } + if ($this->isColumnModified(CouponTableMap::IS_CUMULATIVE)) { + $modifiedColumns[':p' . $index++] = 'IS_CUMULATIVE'; + } + if ($this->isColumnModified(CouponTableMap::IS_REMOVING_POSTAGE)) { + $modifiedColumns[':p' . $index++] = 'IS_REMOVING_POSTAGE'; } if ($this->isColumnModified(CouponTableMap::CREATED_AT)) { $modifiedColumns[':p' . $index++] = 'CREATED_AT'; @@ -1411,8 +1543,8 @@ abstract class Coupon implements ActiveRecordInterface case 'DESCRIPTION': $stmt->bindValue($identifier, $this->description, PDO::PARAM_STR); break; - case 'VALUE': - $stmt->bindValue($identifier, $this->value, PDO::PARAM_STR); + case 'AMOUNT': + $stmt->bindValue($identifier, $this->amount, PDO::PARAM_STR); break; case 'IS_USED': $stmt->bindValue($identifier, $this->is_used, PDO::PARAM_INT); @@ -1423,8 +1555,17 @@ abstract class Coupon implements ActiveRecordInterface case 'EXPIRATION_DATE': $stmt->bindValue($identifier, $this->expiration_date ? $this->expiration_date->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); break; - case 'SERIALIZED_RULES': - $stmt->bindValue($identifier, $this->serialized_rules, PDO::PARAM_STR); + case 'SERIALIZED_RULES_TYPE': + $stmt->bindValue($identifier, $this->serialized_rules_type, PDO::PARAM_STR); + break; + case 'SERIALIZED_RULES_CONTENT': + $stmt->bindValue($identifier, $this->serialized_rules_content, PDO::PARAM_STR); + break; + case 'IS_CUMULATIVE': + $stmt->bindValue($identifier, $this->is_cumulative, PDO::PARAM_INT); + break; + case 'IS_REMOVING_POSTAGE': + $stmt->bindValue($identifier, $this->is_removing_postage, PDO::PARAM_INT); break; case 'CREATED_AT': $stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); @@ -1516,7 +1657,7 @@ abstract class Coupon implements ActiveRecordInterface return $this->getDescription(); break; case 6: - return $this->getValue(); + return $this->getAmount(); break; case 7: return $this->getIsUsed(); @@ -1528,15 +1669,24 @@ abstract class Coupon implements ActiveRecordInterface return $this->getExpirationDate(); break; case 10: - return $this->getSerializedRules(); + return $this->getSerializedRulesType(); break; case 11: - return $this->getCreatedAt(); + return $this->getSerializedRulesContent(); break; case 12: - return $this->getUpdatedAt(); + return $this->getIsCumulative(); break; case 13: + return $this->getIsRemovingPostage(); + break; + case 14: + return $this->getCreatedAt(); + break; + case 15: + return $this->getUpdatedAt(); + break; + case 16: return $this->getVersion(); break; default: @@ -1574,14 +1724,17 @@ abstract class Coupon implements ActiveRecordInterface $keys[3] => $this->getTitle(), $keys[4] => $this->getShortDescription(), $keys[5] => $this->getDescription(), - $keys[6] => $this->getValue(), + $keys[6] => $this->getAmount(), $keys[7] => $this->getIsUsed(), $keys[8] => $this->getIsEnabled(), $keys[9] => $this->getExpirationDate(), - $keys[10] => $this->getSerializedRules(), - $keys[11] => $this->getCreatedAt(), - $keys[12] => $this->getUpdatedAt(), - $keys[13] => $this->getVersion(), + $keys[10] => $this->getSerializedRulesType(), + $keys[11] => $this->getSerializedRulesContent(), + $keys[12] => $this->getIsCumulative(), + $keys[13] => $this->getIsRemovingPostage(), + $keys[14] => $this->getCreatedAt(), + $keys[15] => $this->getUpdatedAt(), + $keys[16] => $this->getVersion(), ); $virtualColumns = $this->virtualColumns; foreach($virtualColumns as $key => $virtualColumn) @@ -1652,7 +1805,7 @@ abstract class Coupon implements ActiveRecordInterface $this->setDescription($value); break; case 6: - $this->setValue($value); + $this->setAmount($value); break; case 7: $this->setIsUsed($value); @@ -1664,15 +1817,24 @@ abstract class Coupon implements ActiveRecordInterface $this->setExpirationDate($value); break; case 10: - $this->setSerializedRules($value); + $this->setSerializedRulesType($value); break; case 11: - $this->setCreatedAt($value); + $this->setSerializedRulesContent($value); break; case 12: - $this->setUpdatedAt($value); + $this->setIsCumulative($value); break; case 13: + $this->setIsRemovingPostage($value); + break; + case 14: + $this->setCreatedAt($value); + break; + case 15: + $this->setUpdatedAt($value); + break; + case 16: $this->setVersion($value); break; } // switch() @@ -1705,14 +1867,17 @@ abstract class Coupon implements ActiveRecordInterface if (array_key_exists($keys[3], $arr)) $this->setTitle($arr[$keys[3]]); if (array_key_exists($keys[4], $arr)) $this->setShortDescription($arr[$keys[4]]); if (array_key_exists($keys[5], $arr)) $this->setDescription($arr[$keys[5]]); - if (array_key_exists($keys[6], $arr)) $this->setValue($arr[$keys[6]]); + if (array_key_exists($keys[6], $arr)) $this->setAmount($arr[$keys[6]]); if (array_key_exists($keys[7], $arr)) $this->setIsUsed($arr[$keys[7]]); if (array_key_exists($keys[8], $arr)) $this->setIsEnabled($arr[$keys[8]]); if (array_key_exists($keys[9], $arr)) $this->setExpirationDate($arr[$keys[9]]); - if (array_key_exists($keys[10], $arr)) $this->setSerializedRules($arr[$keys[10]]); - if (array_key_exists($keys[11], $arr)) $this->setCreatedAt($arr[$keys[11]]); - if (array_key_exists($keys[12], $arr)) $this->setUpdatedAt($arr[$keys[12]]); - if (array_key_exists($keys[13], $arr)) $this->setVersion($arr[$keys[13]]); + if (array_key_exists($keys[10], $arr)) $this->setSerializedRulesType($arr[$keys[10]]); + if (array_key_exists($keys[11], $arr)) $this->setSerializedRulesContent($arr[$keys[11]]); + if (array_key_exists($keys[12], $arr)) $this->setIsCumulative($arr[$keys[12]]); + if (array_key_exists($keys[13], $arr)) $this->setIsRemovingPostage($arr[$keys[13]]); + if (array_key_exists($keys[14], $arr)) $this->setCreatedAt($arr[$keys[14]]); + if (array_key_exists($keys[15], $arr)) $this->setUpdatedAt($arr[$keys[15]]); + if (array_key_exists($keys[16], $arr)) $this->setVersion($arr[$keys[16]]); } /** @@ -1730,11 +1895,14 @@ abstract class Coupon implements ActiveRecordInterface if ($this->isColumnModified(CouponTableMap::TITLE)) $criteria->add(CouponTableMap::TITLE, $this->title); if ($this->isColumnModified(CouponTableMap::SHORT_DESCRIPTION)) $criteria->add(CouponTableMap::SHORT_DESCRIPTION, $this->short_description); if ($this->isColumnModified(CouponTableMap::DESCRIPTION)) $criteria->add(CouponTableMap::DESCRIPTION, $this->description); - if ($this->isColumnModified(CouponTableMap::VALUE)) $criteria->add(CouponTableMap::VALUE, $this->value); + if ($this->isColumnModified(CouponTableMap::AMOUNT)) $criteria->add(CouponTableMap::AMOUNT, $this->amount); if ($this->isColumnModified(CouponTableMap::IS_USED)) $criteria->add(CouponTableMap::IS_USED, $this->is_used); if ($this->isColumnModified(CouponTableMap::IS_ENABLED)) $criteria->add(CouponTableMap::IS_ENABLED, $this->is_enabled); if ($this->isColumnModified(CouponTableMap::EXPIRATION_DATE)) $criteria->add(CouponTableMap::EXPIRATION_DATE, $this->expiration_date); - if ($this->isColumnModified(CouponTableMap::SERIALIZED_RULES)) $criteria->add(CouponTableMap::SERIALIZED_RULES, $this->serialized_rules); + if ($this->isColumnModified(CouponTableMap::SERIALIZED_RULES_TYPE)) $criteria->add(CouponTableMap::SERIALIZED_RULES_TYPE, $this->serialized_rules_type); + if ($this->isColumnModified(CouponTableMap::SERIALIZED_RULES_CONTENT)) $criteria->add(CouponTableMap::SERIALIZED_RULES_CONTENT, $this->serialized_rules_content); + if ($this->isColumnModified(CouponTableMap::IS_CUMULATIVE)) $criteria->add(CouponTableMap::IS_CUMULATIVE, $this->is_cumulative); + if ($this->isColumnModified(CouponTableMap::IS_REMOVING_POSTAGE)) $criteria->add(CouponTableMap::IS_REMOVING_POSTAGE, $this->is_removing_postage); if ($this->isColumnModified(CouponTableMap::CREATED_AT)) $criteria->add(CouponTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(CouponTableMap::UPDATED_AT)) $criteria->add(CouponTableMap::UPDATED_AT, $this->updated_at); if ($this->isColumnModified(CouponTableMap::VERSION)) $criteria->add(CouponTableMap::VERSION, $this->version); @@ -1806,11 +1974,14 @@ abstract class Coupon implements ActiveRecordInterface $copyObj->setTitle($this->getTitle()); $copyObj->setShortDescription($this->getShortDescription()); $copyObj->setDescription($this->getDescription()); - $copyObj->setValue($this->getValue()); + $copyObj->setAmount($this->getAmount()); $copyObj->setIsUsed($this->getIsUsed()); $copyObj->setIsEnabled($this->getIsEnabled()); $copyObj->setExpirationDate($this->getExpirationDate()); - $copyObj->setSerializedRules($this->getSerializedRules()); + $copyObj->setSerializedRulesType($this->getSerializedRulesType()); + $copyObj->setSerializedRulesContent($this->getSerializedRulesContent()); + $copyObj->setIsCumulative($this->getIsCumulative()); + $copyObj->setIsRemovingPostage($this->getIsRemovingPostage()); $copyObj->setCreatedAt($this->getCreatedAt()); $copyObj->setUpdatedAt($this->getUpdatedAt()); $copyObj->setVersion($this->getVersion()); @@ -2590,11 +2761,14 @@ abstract class Coupon implements ActiveRecordInterface $this->title = null; $this->short_description = null; $this->description = null; - $this->value = null; + $this->amount = null; $this->is_used = null; $this->is_enabled = null; $this->expiration_date = null; - $this->serialized_rules = null; + $this->serialized_rules_type = null; + $this->serialized_rules_content = null; + $this->is_cumulative = null; + $this->is_removing_postage = null; $this->created_at = null; $this->updated_at = null; $this->version = null; @@ -2830,11 +3004,14 @@ abstract class Coupon implements ActiveRecordInterface $version->setTitle($this->getTitle()); $version->setShortDescription($this->getShortDescription()); $version->setDescription($this->getDescription()); - $version->setValue($this->getValue()); + $version->setAmount($this->getAmount()); $version->setIsUsed($this->getIsUsed()); $version->setIsEnabled($this->getIsEnabled()); $version->setExpirationDate($this->getExpirationDate()); - $version->setSerializedRules($this->getSerializedRules()); + $version->setSerializedRulesType($this->getSerializedRulesType()); + $version->setSerializedRulesContent($this->getSerializedRulesContent()); + $version->setIsCumulative($this->getIsCumulative()); + $version->setIsRemovingPostage($this->getIsRemovingPostage()); $version->setCreatedAt($this->getCreatedAt()); $version->setUpdatedAt($this->getUpdatedAt()); $version->setVersion($this->getVersion()); @@ -2881,11 +3058,14 @@ abstract class Coupon implements ActiveRecordInterface $this->setTitle($version->getTitle()); $this->setShortDescription($version->getShortDescription()); $this->setDescription($version->getDescription()); - $this->setValue($version->getValue()); + $this->setAmount($version->getAmount()); $this->setIsUsed($version->getIsUsed()); $this->setIsEnabled($version->getIsEnabled()); $this->setExpirationDate($version->getExpirationDate()); - $this->setSerializedRules($version->getSerializedRules()); + $this->setSerializedRulesType($version->getSerializedRulesType()); + $this->setSerializedRulesContent($version->getSerializedRulesContent()); + $this->setIsCumulative($version->getIsCumulative()); + $this->setIsRemovingPostage($version->getIsRemovingPostage()); $this->setCreatedAt($version->getCreatedAt()); $this->setUpdatedAt($version->getUpdatedAt()); $this->setVersion($version->getVersion()); diff --git a/core/lib/Thelia/Model/Base/CouponI18n.php b/core/lib/Thelia/Model/Base/CouponI18n.php new file mode 100644 index 000000000..bc7cc8cdc --- /dev/null +++ b/core/lib/Thelia/Model/Base/CouponI18n.php @@ -0,0 +1,1207 @@ +locale = 'en_EN'; + } + + /** + * Initializes internal state of Thelia\Model\Base\CouponI18n object. + * @see applyDefaults() + */ + public function __construct() + { + $this->applyDefaultValues(); + } + + /** + * Returns whether the object has been modified. + * + * @return boolean True if the object has been modified. + */ + public function isModified() + { + return !empty($this->modifiedColumns); + } + + /** + * Has specified column been modified? + * + * @param string $col column fully qualified name (TableMap::TYPE_COLNAME), e.g. Book::AUTHOR_ID + * @return boolean True if $col has been modified. + */ + public function isColumnModified($col) + { + return in_array($col, $this->modifiedColumns); + } + + /** + * Get the columns that have been modified in this object. + * @return array A unique list of the modified column names for this object. + */ + public function getModifiedColumns() + { + return array_unique($this->modifiedColumns); + } + + /** + * Returns whether the object has ever been saved. This will + * be false, if the object was retrieved from storage or was created + * and then saved. + * + * @return true, if the object has never been persisted. + */ + public function isNew() + { + return $this->new; + } + + /** + * Setter for the isNew attribute. This method will be called + * by Propel-generated children and objects. + * + * @param boolean $b the state of the object. + */ + public function setNew($b) + { + $this->new = (Boolean) $b; + } + + /** + * Whether this object has been deleted. + * @return boolean The deleted state of this object. + */ + public function isDeleted() + { + return $this->deleted; + } + + /** + * Specify whether this object has been deleted. + * @param boolean $b The deleted state of this object. + * @return void + */ + public function setDeleted($b) + { + $this->deleted = (Boolean) $b; + } + + /** + * Sets the modified state for the object to be false. + * @param string $col If supplied, only the specified column is reset. + * @return void + */ + public function resetModified($col = null) + { + if (null !== $col) { + while (false !== ($offset = array_search($col, $this->modifiedColumns))) { + array_splice($this->modifiedColumns, $offset, 1); + } + } else { + $this->modifiedColumns = array(); + } + } + + /** + * Compares this with another CouponI18n instance. If + * obj is an instance of CouponI18n, delegates to + * equals(CouponI18n). Otherwise, returns false. + * + * @param obj The object to compare to. + * @return Whether equal to the object specified. + */ + public function equals($obj) + { + $thisclazz = get_class($this); + if (!is_object($obj) || !($obj instanceof $thisclazz)) { + return false; + } + + if ($this === $obj) { + return true; + } + + if (null === $this->getPrimaryKey() + || null === $obj->getPrimaryKey()) { + return false; + } + + return $this->getPrimaryKey() === $obj->getPrimaryKey(); + } + + /** + * If the primary key is not null, return the hashcode of the + * primary key. Otherwise, return the hash code of the object. + * + * @return int Hashcode + */ + public function hashCode() + { + if (null !== $this->getPrimaryKey()) { + return crc32(serialize($this->getPrimaryKey())); + } + + return crc32(serialize(clone $this)); + } + + /** + * Get the associative array of the virtual columns in this object + * + * @param string $name The virtual column name + * + * @return array + */ + public function getVirtualColumns() + { + return $this->virtualColumns; + } + + /** + * Checks the existence of a virtual column in this object + * + * @return boolean + */ + public function hasVirtualColumn($name) + { + return isset($this->virtualColumns[$name]); + } + + /** + * Get the value of a virtual column in this object + * + * @return mixed + */ + public function getVirtualColumn($name) + { + if (!$this->hasVirtualColumn($name)) { + throw new PropelException(sprintf('Cannot get value of inexistent virtual column %s.', $name)); + } + + return $this->virtualColumns[$name]; + } + + /** + * Set the value of a virtual column in this object + * + * @param string $name The virtual column name + * @param mixed $value The value to give to the virtual column + * + * @return CouponI18n The current object, for fluid interface + */ + public function setVirtualColumn($name, $value) + { + $this->virtualColumns[$name] = $value; + + return $this; + } + + /** + * Logs a message using Propel::log(). + * + * @param string $msg + * @param int $priority One of the Propel::LOG_* logging levels + * @return boolean + */ + protected function log($msg, $priority = Propel::LOG_INFO) + { + return Propel::log(get_class($this) . ': ' . $msg, $priority); + } + + /** + * Populate the current object from a string, using a given parser format + * + * $book = new Book(); + * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); + * + * + * @param mixed $parser A AbstractParser instance, + * or a format name ('XML', 'YAML', 'JSON', 'CSV') + * @param string $data The source data to import from + * + * @return CouponI18n The current object, for fluid interface + */ + public function importFrom($parser, $data) + { + if (!$parser instanceof AbstractParser) { + $parser = AbstractParser::getParser($parser); + } + + return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + } + + /** + * Export the current object properties to a string, using a given parser format + * + * $book = BookQuery::create()->findPk(9012); + * echo $book->exportTo('JSON'); + * => {"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); + * + * + * @param mixed $parser A AbstractParser instance, or a format name ('XML', 'YAML', 'JSON', 'CSV') + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy load(ed) columns. Defaults to TRUE. + * @return string The exported data + */ + public function exportTo($parser, $includeLazyLoadColumns = true) + { + if (!$parser instanceof AbstractParser) { + $parser = AbstractParser::getParser($parser); + } + + return $parser->fromArray($this->toArray(TableMap::TYPE_PHPNAME, $includeLazyLoadColumns, array(), true)); + } + + /** + * Clean up internal collections prior to serializing + * Avoids recursive loops that turn into segmentation faults when serializing + */ + public function __sleep() + { + $this->clearAllReferences(); + + return array_keys(get_object_vars($this)); + } + + /** + * Get the [id] column value. + * + * @return int + */ + public function getId() + { + + return $this->id; + } + + /** + * Get the [locale] column value. + * + * @return string + */ + public function getLocale() + { + + return $this->locale; + } + + /** + * Set the value of [id] column. + * + * @param int $v new value + * @return \Thelia\Model\CouponI18n The current object (for fluent API support) + */ + public function setId($v) + { + if ($v !== null) { + $v = (int) $v; + } + + if ($this->id !== $v) { + $this->id = $v; + $this->modifiedColumns[] = CouponI18nTableMap::ID; + } + + if ($this->aCoupon !== null && $this->aCoupon->getId() !== $v) { + $this->aCoupon = null; + } + + + return $this; + } // setId() + + /** + * Set the value of [locale] column. + * + * @param string $v new value + * @return \Thelia\Model\CouponI18n The current object (for fluent API support) + */ + public function setLocale($v) + { + if ($v !== null) { + $v = (string) $v; + } + + if ($this->locale !== $v) { + $this->locale = $v; + $this->modifiedColumns[] = CouponI18nTableMap::LOCALE; + } + + + return $this; + } // setLocale() + + /** + * Indicates whether the columns in this object are only set to default values. + * + * This method can be used in conjunction with isModified() to indicate whether an object is both + * modified _and_ has some values set which are non-default. + * + * @return boolean Whether the columns in this object are only been set with default values. + */ + public function hasOnlyDefaultValues() + { + if ($this->locale !== 'en_EN') { + return false; + } + + // otherwise, everything was equal, so return TRUE + return true; + } // hasOnlyDefaultValues() + + /** + * Hydrates (populates) the object variables with values from the database resultset. + * + * An offset (0-based "start column") is specified so that objects can be hydrated + * with a subset of the columns in the resultset rows. This is needed, for example, + * for results of JOIN queries where the resultset row includes columns from two or + * more tables. + * + * @param array $row The row returned by DataFetcher->fetch(). + * @param int $startcol 0-based offset column which indicates which restultset column to start with. + * @param boolean $rehydrate Whether this object is being re-hydrated from the database. + * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType(). + One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * + * @return int next starting column + * @throws PropelException - Any caught Exception will be rewrapped as a PropelException. + */ + public function hydrate($row, $startcol = 0, $rehydrate = false, $indexType = TableMap::TYPE_NUM) + { + try { + + + $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : CouponI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; + $this->id = (null !== $col) ? (int) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : CouponI18nTableMap::translateFieldName('Locale', TableMap::TYPE_PHPNAME, $indexType)]; + $this->locale = (null !== $col) ? (string) $col : null; + $this->resetModified(); + + $this->setNew(false); + + if ($rehydrate) { + $this->ensureConsistency(); + } + + return $startcol + 2; // 2 = CouponI18nTableMap::NUM_HYDRATE_COLUMNS. + + } catch (Exception $e) { + throw new PropelException("Error populating \Thelia\Model\CouponI18n object", 0, $e); + } + } + + /** + * Checks and repairs the internal consistency of the object. + * + * This method is executed after an already-instantiated object is re-hydrated + * from the database. It exists to check any foreign keys to make sure that + * the objects related to the current object are correct based on foreign key. + * + * You can override this method in the stub class, but you should always invoke + * the base method from the overridden method (i.e. parent::ensureConsistency()), + * in case your model changes. + * + * @throws PropelException + */ + public function ensureConsistency() + { + if ($this->aCoupon !== null && $this->id !== $this->aCoupon->getId()) { + $this->aCoupon = null; + } + } // ensureConsistency + + /** + * Reloads this object from datastore based on primary key and (optionally) resets all associated objects. + * + * This will only work if the object has been saved and has a valid primary key set. + * + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @return void + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + */ + public function reload($deep = false, ConnectionInterface $con = null) + { + if ($this->isDeleted()) { + throw new PropelException("Cannot reload a deleted object."); + } + + if ($this->isNew()) { + throw new PropelException("Cannot reload an unsaved object."); + } + + if ($con === null) { + $con = Propel::getServiceContainer()->getReadConnection(CouponI18nTableMap::DATABASE_NAME); + } + + // We don't need to alter the object instance pool; we're just modifying this instance + // already in the pool. + + $dataFetcher = ChildCouponI18nQuery::create(null, $this->buildPkeyCriteria())->setFormatter(ModelCriteria::FORMAT_STATEMENT)->find($con); + $row = $dataFetcher->fetch(); + $dataFetcher->close(); + if (!$row) { + throw new PropelException('Cannot find matching row in the database to reload object values.'); + } + $this->hydrate($row, 0, true, $dataFetcher->getIndexType()); // rehydrate + + if ($deep) { // also de-associate any related objects? + + $this->aCoupon = null; + } // if (deep) + } + + /** + * Removes this object from datastore and sets delete attribute. + * + * @param ConnectionInterface $con + * @return void + * @throws PropelException + * @see CouponI18n::setDeleted() + * @see CouponI18n::isDeleted() + */ + public function delete(ConnectionInterface $con = null) + { + if ($this->isDeleted()) { + throw new PropelException("This object has already been deleted."); + } + + if ($con === null) { + $con = Propel::getServiceContainer()->getWriteConnection(CouponI18nTableMap::DATABASE_NAME); + } + + $con->beginTransaction(); + try { + $deleteQuery = ChildCouponI18nQuery::create() + ->filterByPrimaryKey($this->getPrimaryKey()); + $ret = $this->preDelete($con); + if ($ret) { + $deleteQuery->delete($con); + $this->postDelete($con); + $con->commit(); + $this->setDeleted(true); + } else { + $con->commit(); + } + } catch (Exception $e) { + $con->rollBack(); + throw $e; + } + } + + /** + * Persists this object to the database. + * + * If the object is new, it inserts it; otherwise an update is performed. + * All modified related objects will also be persisted in the doSave() + * method. This method wraps all precipitate database operations in a + * single transaction. + * + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @throws PropelException + * @see doSave() + */ + public function save(ConnectionInterface $con = null) + { + if ($this->isDeleted()) { + throw new PropelException("You cannot save an object that has been deleted."); + } + + if ($con === null) { + $con = Propel::getServiceContainer()->getWriteConnection(CouponI18nTableMap::DATABASE_NAME); + } + + $con->beginTransaction(); + $isInsert = $this->isNew(); + try { + $ret = $this->preSave($con); + if ($isInsert) { + $ret = $ret && $this->preInsert($con); + } else { + $ret = $ret && $this->preUpdate($con); + } + if ($ret) { + $affectedRows = $this->doSave($con); + if ($isInsert) { + $this->postInsert($con); + } else { + $this->postUpdate($con); + } + $this->postSave($con); + CouponI18nTableMap::addInstanceToPool($this); + } else { + $affectedRows = 0; + } + $con->commit(); + + return $affectedRows; + } catch (Exception $e) { + $con->rollBack(); + throw $e; + } + } + + /** + * Performs the work of inserting or updating the row in the database. + * + * If the object is new, it inserts it; otherwise an update is performed. + * All related objects are also updated in this method. + * + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @throws PropelException + * @see save() + */ + protected function doSave(ConnectionInterface $con) + { + $affectedRows = 0; // initialize var to track total num of affected rows + if (!$this->alreadyInSave) { + $this->alreadyInSave = true; + + // We call the save method on the following object(s) if they + // were passed to this object by their corresponding set + // method. This object relates to these object(s) by a + // foreign key reference. + + if ($this->aCoupon !== null) { + if ($this->aCoupon->isModified() || $this->aCoupon->isNew()) { + $affectedRows += $this->aCoupon->save($con); + } + $this->setCoupon($this->aCoupon); + } + + if ($this->isNew() || $this->isModified()) { + // persist changes + if ($this->isNew()) { + $this->doInsert($con); + } else { + $this->doUpdate($con); + } + $affectedRows += 1; + $this->resetModified(); + } + + $this->alreadyInSave = false; + + } + + return $affectedRows; + } // doSave() + + /** + * Insert the row in the database. + * + * @param ConnectionInterface $con + * + * @throws PropelException + * @see doSave() + */ + protected function doInsert(ConnectionInterface $con) + { + $modifiedColumns = array(); + $index = 0; + + + // check the columns in natural order for more readable SQL queries + if ($this->isColumnModified(CouponI18nTableMap::ID)) { + $modifiedColumns[':p' . $index++] = 'ID'; + } + if ($this->isColumnModified(CouponI18nTableMap::LOCALE)) { + $modifiedColumns[':p' . $index++] = 'LOCALE'; + } + + $sql = sprintf( + 'INSERT INTO coupon_i18n (%s) VALUES (%s)', + implode(', ', $modifiedColumns), + implode(', ', array_keys($modifiedColumns)) + ); + + try { + $stmt = $con->prepare($sql); + foreach ($modifiedColumns as $identifier => $columnName) { + switch ($columnName) { + case 'ID': + $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT); + break; + case 'LOCALE': + $stmt->bindValue($identifier, $this->locale, PDO::PARAM_STR); + break; + } + } + $stmt->execute(); + } catch (Exception $e) { + Propel::log($e->getMessage(), Propel::LOG_ERR); + throw new PropelException(sprintf('Unable to execute INSERT statement [%s]', $sql), 0, $e); + } + + $this->setNew(false); + } + + /** + * Update the row in the database. + * + * @param ConnectionInterface $con + * + * @return Integer Number of updated rows + * @see doSave() + */ + protected function doUpdate(ConnectionInterface $con) + { + $selectCriteria = $this->buildPkeyCriteria(); + $valuesCriteria = $this->buildCriteria(); + + return $selectCriteria->doUpdate($valuesCriteria, $con); + } + + /** + * Retrieves a field from the object by name passed in as a string. + * + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. + */ + public function getByName($name, $type = TableMap::TYPE_PHPNAME) + { + $pos = CouponI18nTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM); + $field = $this->getByPosition($pos); + + return $field; + } + + /** + * Retrieves a field from the object by Position as specified in the xml schema. + * Zero-based. + * + * @param int $pos position in xml schema + * @return mixed Value of field at $pos + */ + public function getByPosition($pos) + { + switch ($pos) { + case 0: + return $this->getId(); + break; + case 1: + return $this->getLocale(); + break; + default: + return null; + break; + } // switch() + } + + /** + * Exports the object as an array. + * + * You can specify the key type of the array by passing one of the class + * type constants. + * + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * + * @return array an associative array containing the field names (as keys) and field values + */ + public function toArray($keyType = TableMap::TYPE_PHPNAME, $includeLazyLoadColumns = true, $alreadyDumpedObjects = array(), $includeForeignObjects = false) + { + if (isset($alreadyDumpedObjects['CouponI18n'][serialize($this->getPrimaryKey())])) { + return '*RECURSION*'; + } + $alreadyDumpedObjects['CouponI18n'][serialize($this->getPrimaryKey())] = true; + $keys = CouponI18nTableMap::getFieldNames($keyType); + $result = array( + $keys[0] => $this->getId(), + $keys[1] => $this->getLocale(), + ); + $virtualColumns = $this->virtualColumns; + foreach($virtualColumns as $key => $virtualColumn) + { + $result[$key] = $virtualColumn; + } + + if ($includeForeignObjects) { + if (null !== $this->aCoupon) { + $result['Coupon'] = $this->aCoupon->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); + } + } + + return $result; + } + + /** + * Sets a field from the object by name passed in as a string. + * + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return void + */ + public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) + { + $pos = CouponI18nTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM); + + return $this->setByPosition($pos, $value); + } + + /** + * Sets a field from the object by Position as specified in the xml schema. + * Zero-based. + * + * @param int $pos position in xml schema + * @param mixed $value field value + * @return void + */ + public function setByPosition($pos, $value) + { + switch ($pos) { + case 0: + $this->setId($value); + break; + case 1: + $this->setLocale($value); + break; + } // switch() + } + + /** + * Populates the object using an array. + * + * This is particularly useful when populating an object from one of the + * request arrays (e.g. $_POST). This method goes through the column + * names, checking to see whether a matching key exists in populated + * array. If so the setByName() method is called for that column. + * + * You can specify the key type of the array by additionally passing one + * of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * The default key type is the column's TableMap::TYPE_PHPNAME. + * + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. + * @return void + */ + public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) + { + $keys = CouponI18nTableMap::getFieldNames($keyType); + + if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]); + if (array_key_exists($keys[1], $arr)) $this->setLocale($arr[$keys[1]]); + } + + /** + * Build a Criteria object containing the values of all modified columns in this object. + * + * @return Criteria The Criteria object containing all modified values. + */ + public function buildCriteria() + { + $criteria = new Criteria(CouponI18nTableMap::DATABASE_NAME); + + if ($this->isColumnModified(CouponI18nTableMap::ID)) $criteria->add(CouponI18nTableMap::ID, $this->id); + if ($this->isColumnModified(CouponI18nTableMap::LOCALE)) $criteria->add(CouponI18nTableMap::LOCALE, $this->locale); + + return $criteria; + } + + /** + * Builds a Criteria object containing the primary key for this object. + * + * Unlike buildCriteria() this method includes the primary key values regardless + * of whether or not they have been modified. + * + * @return Criteria The Criteria object containing value(s) for primary key(s). + */ + public function buildPkeyCriteria() + { + $criteria = new Criteria(CouponI18nTableMap::DATABASE_NAME); + $criteria->add(CouponI18nTableMap::ID, $this->id); + $criteria->add(CouponI18nTableMap::LOCALE, $this->locale); + + return $criteria; + } + + /** + * Returns the composite primary key for this object. + * The array elements will be in same order as specified in XML. + * @return array + */ + public function getPrimaryKey() + { + $pks = array(); + $pks[0] = $this->getId(); + $pks[1] = $this->getLocale(); + + return $pks; + } + + /** + * Set the [composite] primary key. + * + * @param array $keys The elements of the composite key (order must match the order in XML file). + * @return void + */ + public function setPrimaryKey($keys) + { + $this->setId($keys[0]); + $this->setLocale($keys[1]); + } + + /** + * Returns true if the primary key for this object is null. + * @return boolean + */ + public function isPrimaryKeyNull() + { + + return (null === $this->getId()) && (null === $this->getLocale()); + } + + /** + * Sets contents of passed object to values from current object. + * + * If desired, this method can also make copies of all associated (fkey referrers) + * objects. + * + * @param object $copyObj An object of \Thelia\Model\CouponI18n (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @throws PropelException + */ + public function copyInto($copyObj, $deepCopy = false, $makeNew = true) + { + $copyObj->setId($this->getId()); + $copyObj->setLocale($this->getLocale()); + if ($makeNew) { + $copyObj->setNew(true); + } + } + + /** + * Makes a copy of this object that will be inserted as a new row in table when saved. + * It creates a new object filling in the simple attributes, but skipping any primary + * keys that are defined for the table. + * + * If desired, this method can also make copies of all associated (fkey referrers) + * objects. + * + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\CouponI18n Clone of current object. + * @throws PropelException + */ + public function copy($deepCopy = false) + { + // we use get_class(), because this might be a subclass + $clazz = get_class($this); + $copyObj = new $clazz(); + $this->copyInto($copyObj, $deepCopy); + + return $copyObj; + } + + /** + * Declares an association between this object and a ChildCoupon object. + * + * @param ChildCoupon $v + * @return \Thelia\Model\CouponI18n The current object (for fluent API support) + * @throws PropelException + */ + public function setCoupon(ChildCoupon $v = null) + { + if ($v === null) { + $this->setId(NULL); + } else { + $this->setId($v->getId()); + } + + $this->aCoupon = $v; + + // Add binding for other direction of this n:n relationship. + // If this object has already been added to the ChildCoupon object, it will not be re-added. + if ($v !== null) { + $v->addCouponI18n($this); + } + + + return $this; + } + + + /** + * Get the associated ChildCoupon object + * + * @param ConnectionInterface $con Optional Connection object. + * @return ChildCoupon The associated ChildCoupon object. + * @throws PropelException + */ + public function getCoupon(ConnectionInterface $con = null) + { + if ($this->aCoupon === null && ($this->id !== null)) { + $this->aCoupon = ChildCouponQuery::create()->findPk($this->id, $con); + /* The following can be used additionally to + guarantee the related object contains a reference + to this object. This level of coupling may, however, be + undesirable since it could result in an only partially populated collection + in the referenced object. + $this->aCoupon->addCouponI18ns($this); + */ + } + + return $this->aCoupon; + } + + /** + * Clears the current object and sets all attributes to their default values + */ + public function clear() + { + $this->id = null; + $this->locale = null; + $this->alreadyInSave = false; + $this->clearAllReferences(); + $this->applyDefaultValues(); + $this->resetModified(); + $this->setNew(true); + $this->setDeleted(false); + } + + /** + * Resets all references to other model objects or collections of model objects. + * + * This method is a user-space workaround for PHP's inability to garbage collect + * objects with circular references (even in PHP 5.3). This is currently necessary + * when using Propel in certain daemon or large-volume/high-memory operations. + * + * @param boolean $deep Whether to also clear the references on all referrer objects. + */ + public function clearAllReferences($deep = false) + { + if ($deep) { + } // if ($deep) + + $this->aCoupon = null; + } + + /** + * Return the string representation of this object + * + * @return string + */ + public function __toString() + { + return (string) $this->exportTo(CouponI18nTableMap::DEFAULT_STRING_FORMAT); + } + + /** + * Code to be run before persisting the object + * @param ConnectionInterface $con + * @return boolean + */ + public function preSave(ConnectionInterface $con = null) + { + return true; + } + + /** + * Code to be run after persisting the object + * @param ConnectionInterface $con + */ + public function postSave(ConnectionInterface $con = null) + { + + } + + /** + * Code to be run before inserting to database + * @param ConnectionInterface $con + * @return boolean + */ + public function preInsert(ConnectionInterface $con = null) + { + return true; + } + + /** + * Code to be run after inserting to database + * @param ConnectionInterface $con + */ + public function postInsert(ConnectionInterface $con = null) + { + + } + + /** + * Code to be run before updating the object in database + * @param ConnectionInterface $con + * @return boolean + */ + public function preUpdate(ConnectionInterface $con = null) + { + return true; + } + + /** + * Code to be run after updating the object in database + * @param ConnectionInterface $con + */ + public function postUpdate(ConnectionInterface $con = null) + { + + } + + /** + * Code to be run before deleting the object in database + * @param ConnectionInterface $con + * @return boolean + */ + public function preDelete(ConnectionInterface $con = null) + { + return true; + } + + /** + * Code to be run after deleting the object in database + * @param ConnectionInterface $con + */ + public function postDelete(ConnectionInterface $con = null) + { + + } + + + /** + * Derived method to catches calls to undefined methods. + * + * Provides magic import/export method support (fromXML()/toXML(), fromYAML()/toYAML(), etc.). + * Allows to define default __call() behavior if you overwrite __call() + * + * @param string $name + * @param mixed $params + * + * @return array|string + */ + public function __call($name, $params) + { + if (0 === strpos($name, 'get')) { + $virtualColumn = substr($name, 3); + if ($this->hasVirtualColumn($virtualColumn)) { + return $this->getVirtualColumn($virtualColumn); + } + + $virtualColumn = lcfirst($virtualColumn); + if ($this->hasVirtualColumn($virtualColumn)) { + return $this->getVirtualColumn($virtualColumn); + } + } + + if (0 === strpos($name, 'from')) { + $format = substr($name, 4); + + return $this->importFrom($format, reset($params)); + } + + if (0 === strpos($name, 'to')) { + $format = substr($name, 2); + $includeLazyLoadColumns = isset($params[0]) ? $params[0] : true; + + return $this->exportTo($format, $includeLazyLoadColumns); + } + + throw new BadMethodCallException(sprintf('Call to undefined method: %s.', $name)); + } + +} diff --git a/core/lib/Thelia/Model/Base/CouponI18nQuery.php b/core/lib/Thelia/Model/Base/CouponI18nQuery.php new file mode 100644 index 000000000..9468f787f --- /dev/null +++ b/core/lib/Thelia/Model/Base/CouponI18nQuery.php @@ -0,0 +1,475 @@ +setModelAlias($modelAlias); + } + if ($criteria instanceof Criteria) { + $query->mergeWith($criteria); + } + + return $query; + } + + /** + * Find object by primary key. + * Propel uses the instance pool to skip the database if the object exists. + * Go fast if the query is untouched. + * + * + * $obj = $c->findPk(array(12, 34), $con); + * + * + * @param array[$id, $locale] $key Primary key to use for the query + * @param ConnectionInterface $con an optional connection object + * + * @return ChildCouponI18n|array|mixed the result, formatted by the current formatter + */ + public function findPk($key, $con = null) + { + if ($key === null) { + return null; + } + if ((null !== ($obj = CouponI18nTableMap::getInstanceFromPool(serialize(array((string) $key[0], (string) $key[1]))))) && !$this->formatter) { + // the object is already in the instance pool + return $obj; + } + if ($con === null) { + $con = Propel::getServiceContainer()->getReadConnection(CouponI18nTableMap::DATABASE_NAME); + } + $this->basePreSelect($con); + if ($this->formatter || $this->modelAlias || $this->with || $this->select + || $this->selectColumns || $this->asColumns || $this->selectModifiers + || $this->map || $this->having || $this->joins) { + return $this->findPkComplex($key, $con); + } else { + return $this->findPkSimple($key, $con); + } + } + + /** + * Find object by primary key using raw SQL to go fast. + * Bypass doSelect() and the object formatter by using generated code. + * + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object + * + * @return ChildCouponI18n A model object, or null if the key is not found + */ + protected function findPkSimple($key, $con) + { + $sql = 'SELECT ID, LOCALE FROM coupon_i18n WHERE ID = :p0 AND LOCALE = :p1'; + try { + $stmt = $con->prepare($sql); + $stmt->bindValue(':p0', $key[0], PDO::PARAM_INT); + $stmt->bindValue(':p1', $key[1], PDO::PARAM_STR); + $stmt->execute(); + } catch (Exception $e) { + Propel::log($e->getMessage(), Propel::LOG_ERR); + throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), 0, $e); + } + $obj = null; + if ($row = $stmt->fetch(\PDO::FETCH_NUM)) { + $obj = new ChildCouponI18n(); + $obj->hydrate($row); + CouponI18nTableMap::addInstanceToPool($obj, serialize(array((string) $key[0], (string) $key[1]))); + } + $stmt->closeCursor(); + + return $obj; + } + + /** + * Find object by primary key. + * + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object + * + * @return ChildCouponI18n|array|mixed the result, formatted by the current formatter + */ + protected function findPkComplex($key, $con) + { + // As the query uses a PK condition, no limit(1) is necessary. + $criteria = $this->isKeepQuery() ? clone $this : $this; + $dataFetcher = $criteria + ->filterByPrimaryKey($key) + ->doSelect($con); + + return $criteria->getFormatter()->init($criteria)->formatOne($dataFetcher); + } + + /** + * Find objects by primary key + * + * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); + * + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object + * + * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter + */ + public function findPks($keys, $con = null) + { + if (null === $con) { + $con = Propel::getServiceContainer()->getReadConnection($this->getDbName()); + } + $this->basePreSelect($con); + $criteria = $this->isKeepQuery() ? clone $this : $this; + $dataFetcher = $criteria + ->filterByPrimaryKeys($keys) + ->doSelect($con); + + return $criteria->getFormatter()->init($criteria)->format($dataFetcher); + } + + /** + * Filter the query by primary key + * + * @param mixed $key Primary key to use for the query + * + * @return ChildCouponI18nQuery The current query, for fluid interface + */ + public function filterByPrimaryKey($key) + { + $this->addUsingAlias(CouponI18nTableMap::ID, $key[0], Criteria::EQUAL); + $this->addUsingAlias(CouponI18nTableMap::LOCALE, $key[1], Criteria::EQUAL); + + return $this; + } + + /** + * Filter the query by a list of primary keys + * + * @param array $keys The list of primary key to use for the query + * + * @return ChildCouponI18nQuery The current query, for fluid interface + */ + public function filterByPrimaryKeys($keys) + { + if (empty($keys)) { + return $this->add(null, '1<>1', Criteria::CUSTOM); + } + foreach ($keys as $key) { + $cton0 = $this->getNewCriterion(CouponI18nTableMap::ID, $key[0], Criteria::EQUAL); + $cton1 = $this->getNewCriterion(CouponI18nTableMap::LOCALE, $key[1], Criteria::EQUAL); + $cton0->addAnd($cton1); + $this->addOr($cton0); + } + + return $this; + } + + /** + * Filter the query on the id column + * + * Example usage: + * + * $query->filterById(1234); // WHERE id = 1234 + * $query->filterById(array(12, 34)); // WHERE id IN (12, 34) + * $query->filterById(array('min' => 12)); // WHERE id > 12 + * + * + * @see filterByCoupon() + * + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponI18nQuery The current query, for fluid interface + */ + public function filterById($id = null, $comparison = null) + { + if (is_array($id)) { + $useMinMax = false; + if (isset($id['min'])) { + $this->addUsingAlias(CouponI18nTableMap::ID, $id['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($id['max'])) { + $this->addUsingAlias(CouponI18nTableMap::ID, $id['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(CouponI18nTableMap::ID, $id, $comparison); + } + + /** + * Filter the query on the locale column + * + * Example usage: + * + * $query->filterByLocale('fooValue'); // WHERE locale = 'fooValue' + * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%' + * + * + * @param string $locale The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponI18nQuery The current query, for fluid interface + */ + public function filterByLocale($locale = null, $comparison = null) + { + if (null === $comparison) { + if (is_array($locale)) { + $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $locale)) { + $locale = str_replace('*', '%', $locale); + $comparison = Criteria::LIKE; + } + } + + return $this->addUsingAlias(CouponI18nTableMap::LOCALE, $locale, $comparison); + } + + /** + * Filter the query by a related \Thelia\Model\Coupon object + * + * @param \Thelia\Model\Coupon|ObjectCollection $coupon The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponI18nQuery The current query, for fluid interface + */ + public function filterByCoupon($coupon, $comparison = null) + { + if ($coupon instanceof \Thelia\Model\Coupon) { + return $this + ->addUsingAlias(CouponI18nTableMap::ID, $coupon->getId(), $comparison); + } elseif ($coupon instanceof ObjectCollection) { + if (null === $comparison) { + $comparison = Criteria::IN; + } + + return $this + ->addUsingAlias(CouponI18nTableMap::ID, $coupon->toKeyValue('PrimaryKey', 'Id'), $comparison); + } else { + throw new PropelException('filterByCoupon() only accepts arguments of type \Thelia\Model\Coupon or Collection'); + } + } + + /** + * Adds a JOIN clause to the query using the Coupon relation + * + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return ChildCouponI18nQuery The current query, for fluid interface + */ + public function joinCoupon($relationAlias = null, $joinType = 'LEFT JOIN') + { + $tableMap = $this->getTableMap(); + $relationMap = $tableMap->getRelation('Coupon'); + + // create a ModelJoin object for this join + $join = new ModelJoin(); + $join->setJoinType($joinType); + $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); + if ($previousJoin = $this->getPreviousJoin()) { + $join->setPreviousJoin($previousJoin); + } + + // add the ModelJoin to the current object + if ($relationAlias) { + $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); + $this->addJoinObject($join, $relationAlias); + } else { + $this->addJoinObject($join, 'Coupon'); + } + + return $this; + } + + /** + * Use the Coupon relation Coupon object + * + * @see useQuery() + * + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return \Thelia\Model\CouponQuery A secondary query class using the current class as primary query + */ + public function useCouponQuery($relationAlias = null, $joinType = 'LEFT JOIN') + { + return $this + ->joinCoupon($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'Coupon', '\Thelia\Model\CouponQuery'); + } + + /** + * Exclude object from result + * + * @param ChildCouponI18n $couponI18n Object to remove from the list of results + * + * @return ChildCouponI18nQuery The current query, for fluid interface + */ + public function prune($couponI18n = null) + { + if ($couponI18n) { + $this->addCond('pruneCond0', $this->getAliasedColName(CouponI18nTableMap::ID), $couponI18n->getId(), Criteria::NOT_EQUAL); + $this->addCond('pruneCond1', $this->getAliasedColName(CouponI18nTableMap::LOCALE), $couponI18n->getLocale(), Criteria::NOT_EQUAL); + $this->combine(array('pruneCond0', 'pruneCond1'), Criteria::LOGICAL_OR); + } + + return $this; + } + + /** + * Deletes all rows from the coupon_i18n table. + * + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). + */ + public function doDeleteAll(ConnectionInterface $con = null) + { + if (null === $con) { + $con = Propel::getServiceContainer()->getWriteConnection(CouponI18nTableMap::DATABASE_NAME); + } + $affectedRows = 0; // initialize var to track total num of affected rows + try { + // use transaction because $criteria could contain info + // for more than one table or we could emulating ON DELETE CASCADE, etc. + $con->beginTransaction(); + $affectedRows += parent::doDeleteAll($con); + // Because this db requires some delete cascade/set null emulation, we have to + // clear the cached instance *after* the emulation has happened (since + // instances get re-added by the select statement contained therein). + CouponI18nTableMap::clearInstancePool(); + CouponI18nTableMap::clearRelatedInstancePool(); + + $con->commit(); + } catch (PropelException $e) { + $con->rollBack(); + throw $e; + } + + return $affectedRows; + } + + /** + * Performs a DELETE on the database, given a ChildCouponI18n or Criteria object OR a primary key value. + * + * @param mixed $values Criteria or ChildCouponI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public function delete(ConnectionInterface $con = null) + { + if (null === $con) { + $con = Propel::getServiceContainer()->getWriteConnection(CouponI18nTableMap::DATABASE_NAME); + } + + $criteria = $this; + + // Set the correct dbName + $criteria->setDbName(CouponI18nTableMap::DATABASE_NAME); + + $affectedRows = 0; // initialize var to track total num of affected rows + + try { + // use transaction because $criteria could contain info + // for more than one table or we could emulating ON DELETE CASCADE, etc. + $con->beginTransaction(); + + + CouponI18nTableMap::removeInstanceFromPool($criteria); + + $affectedRows += ModelCriteria::delete($con); + CouponI18nTableMap::clearRelatedInstancePool(); + $con->commit(); + + return $affectedRows; + } catch (PropelException $e) { + $con->rollBack(); + throw $e; + } + } + +} // CouponI18nQuery diff --git a/core/lib/Thelia/Model/Base/CouponQuery.php b/core/lib/Thelia/Model/Base/CouponQuery.php index fa5700786..196dbbdaa 100644 --- a/core/lib/Thelia/Model/Base/CouponQuery.php +++ b/core/lib/Thelia/Model/Base/CouponQuery.php @@ -28,11 +28,14 @@ use Thelia\Model\Map\CouponTableMap; * @method ChildCouponQuery orderByTitle($order = Criteria::ASC) Order by the title column * @method ChildCouponQuery orderByShortDescription($order = Criteria::ASC) Order by the short_description column * @method ChildCouponQuery orderByDescription($order = Criteria::ASC) Order by the description column - * @method ChildCouponQuery orderByValue($order = Criteria::ASC) Order by the value column + * @method ChildCouponQuery orderByAmount($order = Criteria::ASC) Order by the amount column * @method ChildCouponQuery orderByIsUsed($order = Criteria::ASC) Order by the is_used column * @method ChildCouponQuery orderByIsEnabled($order = Criteria::ASC) Order by the is_enabled column * @method ChildCouponQuery orderByExpirationDate($order = Criteria::ASC) Order by the expiration_date column - * @method ChildCouponQuery orderBySerializedRules($order = Criteria::ASC) Order by the serialized_rules column + * @method ChildCouponQuery orderBySerializedRulesType($order = Criteria::ASC) Order by the serialized_rules_type column + * @method ChildCouponQuery orderBySerializedRulesContent($order = Criteria::ASC) Order by the serialized_rules_content column + * @method ChildCouponQuery orderByIsCumulative($order = Criteria::ASC) Order by the is_cumulative column + * @method ChildCouponQuery orderByIsRemovingPostage($order = Criteria::ASC) Order by the is_removing_postage column * @method ChildCouponQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column * @method ChildCouponQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column * @method ChildCouponQuery orderByVersion($order = Criteria::ASC) Order by the version column @@ -43,11 +46,14 @@ use Thelia\Model\Map\CouponTableMap; * @method ChildCouponQuery groupByTitle() Group by the title column * @method ChildCouponQuery groupByShortDescription() Group by the short_description column * @method ChildCouponQuery groupByDescription() Group by the description column - * @method ChildCouponQuery groupByValue() Group by the value column + * @method ChildCouponQuery groupByAmount() Group by the amount column * @method ChildCouponQuery groupByIsUsed() Group by the is_used column * @method ChildCouponQuery groupByIsEnabled() Group by the is_enabled column * @method ChildCouponQuery groupByExpirationDate() Group by the expiration_date column - * @method ChildCouponQuery groupBySerializedRules() Group by the serialized_rules column + * @method ChildCouponQuery groupBySerializedRulesType() Group by the serialized_rules_type column + * @method ChildCouponQuery groupBySerializedRulesContent() Group by the serialized_rules_content column + * @method ChildCouponQuery groupByIsCumulative() Group by the is_cumulative column + * @method ChildCouponQuery groupByIsRemovingPostage() Group by the is_removing_postage column * @method ChildCouponQuery groupByCreatedAt() Group by the created_at column * @method ChildCouponQuery groupByUpdatedAt() Group by the updated_at column * @method ChildCouponQuery groupByVersion() Group by the version column @@ -77,11 +83,14 @@ use Thelia\Model\Map\CouponTableMap; * @method ChildCoupon findOneByTitle(string $title) Return the first ChildCoupon filtered by the title column * @method ChildCoupon findOneByShortDescription(string $short_description) Return the first ChildCoupon filtered by the short_description column * @method ChildCoupon findOneByDescription(string $description) Return the first ChildCoupon filtered by the description column - * @method ChildCoupon findOneByValue(double $value) Return the first ChildCoupon filtered by the value column + * @method ChildCoupon findOneByAmount(double $amount) Return the first ChildCoupon filtered by the amount column * @method ChildCoupon findOneByIsUsed(int $is_used) Return the first ChildCoupon filtered by the is_used column * @method ChildCoupon findOneByIsEnabled(int $is_enabled) Return the first ChildCoupon filtered by the is_enabled column * @method ChildCoupon findOneByExpirationDate(string $expiration_date) Return the first ChildCoupon filtered by the expiration_date column - * @method ChildCoupon findOneBySerializedRules(string $serialized_rules) Return the first ChildCoupon filtered by the serialized_rules column + * @method ChildCoupon findOneBySerializedRulesType(string $serialized_rules_type) Return the first ChildCoupon filtered by the serialized_rules_type column + * @method ChildCoupon findOneBySerializedRulesContent(string $serialized_rules_content) Return the first ChildCoupon filtered by the serialized_rules_content column + * @method ChildCoupon findOneByIsCumulative(int $is_cumulative) Return the first ChildCoupon filtered by the is_cumulative column + * @method ChildCoupon findOneByIsRemovingPostage(int $is_removing_postage) Return the first ChildCoupon filtered by the is_removing_postage column * @method ChildCoupon findOneByCreatedAt(string $created_at) Return the first ChildCoupon filtered by the created_at column * @method ChildCoupon findOneByUpdatedAt(string $updated_at) Return the first ChildCoupon filtered by the updated_at column * @method ChildCoupon findOneByVersion(int $version) Return the first ChildCoupon filtered by the version column @@ -92,11 +101,14 @@ use Thelia\Model\Map\CouponTableMap; * @method array findByTitle(string $title) Return ChildCoupon objects filtered by the title column * @method array findByShortDescription(string $short_description) Return ChildCoupon objects filtered by the short_description column * @method array findByDescription(string $description) Return ChildCoupon objects filtered by the description column - * @method array findByValue(double $value) Return ChildCoupon objects filtered by the value column + * @method array findByAmount(double $amount) Return ChildCoupon objects filtered by the amount column * @method array findByIsUsed(int $is_used) Return ChildCoupon objects filtered by the is_used column * @method array findByIsEnabled(int $is_enabled) Return ChildCoupon objects filtered by the is_enabled column * @method array findByExpirationDate(string $expiration_date) Return ChildCoupon objects filtered by the expiration_date column - * @method array findBySerializedRules(string $serialized_rules) Return ChildCoupon objects filtered by the serialized_rules column + * @method array findBySerializedRulesType(string $serialized_rules_type) Return ChildCoupon objects filtered by the serialized_rules_type column + * @method array findBySerializedRulesContent(string $serialized_rules_content) Return ChildCoupon objects filtered by the serialized_rules_content column + * @method array findByIsCumulative(int $is_cumulative) Return ChildCoupon objects filtered by the is_cumulative column + * @method array findByIsRemovingPostage(int $is_removing_postage) Return ChildCoupon objects filtered by the is_removing_postage column * @method array findByCreatedAt(string $created_at) Return ChildCoupon objects filtered by the created_at column * @method array findByUpdatedAt(string $updated_at) Return ChildCoupon objects filtered by the updated_at column * @method array findByVersion(int $version) Return ChildCoupon objects filtered by the version column @@ -195,7 +207,7 @@ abstract class CouponQuery extends ModelCriteria */ protected function findPkSimple($key, $con) { - $sql = 'SELECT ID, CODE, TYPE, TITLE, SHORT_DESCRIPTION, DESCRIPTION, VALUE, IS_USED, IS_ENABLED, EXPIRATION_DATE, SERIALIZED_RULES, CREATED_AT, UPDATED_AT, VERSION FROM coupon WHERE ID = :p0'; + $sql = 'SELECT ID, CODE, TYPE, TITLE, SHORT_DESCRIPTION, DESCRIPTION, AMOUNT, IS_USED, IS_ENABLED, EXPIRATION_DATE, SERIALIZED_RULES_TYPE, SERIALIZED_RULES_CONTENT, IS_CUMULATIVE, IS_REMOVING_POSTAGE, CREATED_AT, UPDATED_AT, VERSION FROM coupon WHERE ID = :p0'; try { $stmt = $con->prepare($sql); $stmt->bindValue(':p0', $key, PDO::PARAM_INT); @@ -471,16 +483,16 @@ abstract class CouponQuery extends ModelCriteria } /** - * Filter the query on the value column + * Filter the query on the amount column * * Example usage: * - * $query->filterByValue(1234); // WHERE value = 1234 - * $query->filterByValue(array(12, 34)); // WHERE value IN (12, 34) - * $query->filterByValue(array('min' => 12)); // WHERE value > 12 + * $query->filterByAmount(1234); // WHERE amount = 1234 + * $query->filterByAmount(array(12, 34)); // WHERE amount IN (12, 34) + * $query->filterByAmount(array('min' => 12)); // WHERE amount > 12 * * - * @param mixed $value The value to use as filter. + * @param mixed $amount The value to use as filter. * Use scalar values for equality. * Use array values for in_array() equivalent. * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. @@ -488,16 +500,16 @@ abstract class CouponQuery extends ModelCriteria * * @return ChildCouponQuery The current query, for fluid interface */ - public function filterByValue($value = null, $comparison = null) + public function filterByAmount($amount = null, $comparison = null) { - if (is_array($value)) { + if (is_array($amount)) { $useMinMax = false; - if (isset($value['min'])) { - $this->addUsingAlias(CouponTableMap::VALUE, $value['min'], Criteria::GREATER_EQUAL); + if (isset($amount['min'])) { + $this->addUsingAlias(CouponTableMap::AMOUNT, $amount['min'], Criteria::GREATER_EQUAL); $useMinMax = true; } - if (isset($value['max'])) { - $this->addUsingAlias(CouponTableMap::VALUE, $value['max'], Criteria::LESS_EQUAL); + if (isset($amount['max'])) { + $this->addUsingAlias(CouponTableMap::AMOUNT, $amount['max'], Criteria::LESS_EQUAL); $useMinMax = true; } if ($useMinMax) { @@ -508,7 +520,7 @@ abstract class CouponQuery extends ModelCriteria } } - return $this->addUsingAlias(CouponTableMap::VALUE, $value, $comparison); + return $this->addUsingAlias(CouponTableMap::AMOUNT, $amount, $comparison); } /** @@ -637,32 +649,143 @@ abstract class CouponQuery extends ModelCriteria } /** - * Filter the query on the serialized_rules column + * Filter the query on the serialized_rules_type column * * Example usage: * - * $query->filterBySerializedRules('fooValue'); // WHERE serialized_rules = 'fooValue' - * $query->filterBySerializedRules('%fooValue%'); // WHERE serialized_rules LIKE '%fooValue%' + * $query->filterBySerializedRulesType('fooValue'); // WHERE serialized_rules_type = 'fooValue' + * $query->filterBySerializedRulesType('%fooValue%'); // WHERE serialized_rules_type LIKE '%fooValue%' * * - * @param string $serializedRules The value to use as filter. + * @param string $serializedRulesType The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponQuery The current query, for fluid interface */ - public function filterBySerializedRules($serializedRules = null, $comparison = null) + public function filterBySerializedRulesType($serializedRulesType = null, $comparison = null) { if (null === $comparison) { - if (is_array($serializedRules)) { + if (is_array($serializedRulesType)) { $comparison = Criteria::IN; - } elseif (preg_match('/[\%\*]/', $serializedRules)) { - $serializedRules = str_replace('*', '%', $serializedRules); + } elseif (preg_match('/[\%\*]/', $serializedRulesType)) { + $serializedRulesType = str_replace('*', '%', $serializedRulesType); $comparison = Criteria::LIKE; } } - return $this->addUsingAlias(CouponTableMap::SERIALIZED_RULES, $serializedRules, $comparison); + return $this->addUsingAlias(CouponTableMap::SERIALIZED_RULES_TYPE, $serializedRulesType, $comparison); + } + + /** + * Filter the query on the serialized_rules_content column + * + * Example usage: + * + * $query->filterBySerializedRulesContent('fooValue'); // WHERE serialized_rules_content = 'fooValue' + * $query->filterBySerializedRulesContent('%fooValue%'); // WHERE serialized_rules_content LIKE '%fooValue%' + * + * + * @param string $serializedRulesContent The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponQuery The current query, for fluid interface + */ + public function filterBySerializedRulesContent($serializedRulesContent = null, $comparison = null) + { + if (null === $comparison) { + if (is_array($serializedRulesContent)) { + $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $serializedRulesContent)) { + $serializedRulesContent = str_replace('*', '%', $serializedRulesContent); + $comparison = Criteria::LIKE; + } + } + + return $this->addUsingAlias(CouponTableMap::SERIALIZED_RULES_CONTENT, $serializedRulesContent, $comparison); + } + + /** + * Filter the query on the is_cumulative column + * + * Example usage: + * + * $query->filterByIsCumulative(1234); // WHERE is_cumulative = 1234 + * $query->filterByIsCumulative(array(12, 34)); // WHERE is_cumulative IN (12, 34) + * $query->filterByIsCumulative(array('min' => 12)); // WHERE is_cumulative > 12 + * + * + * @param mixed $isCumulative The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponQuery The current query, for fluid interface + */ + public function filterByIsCumulative($isCumulative = null, $comparison = null) + { + if (is_array($isCumulative)) { + $useMinMax = false; + if (isset($isCumulative['min'])) { + $this->addUsingAlias(CouponTableMap::IS_CUMULATIVE, $isCumulative['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($isCumulative['max'])) { + $this->addUsingAlias(CouponTableMap::IS_CUMULATIVE, $isCumulative['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(CouponTableMap::IS_CUMULATIVE, $isCumulative, $comparison); + } + + /** + * Filter the query on the is_removing_postage column + * + * Example usage: + * + * $query->filterByIsRemovingPostage(1234); // WHERE is_removing_postage = 1234 + * $query->filterByIsRemovingPostage(array(12, 34)); // WHERE is_removing_postage IN (12, 34) + * $query->filterByIsRemovingPostage(array('min' => 12)); // WHERE is_removing_postage > 12 + * + * + * @param mixed $isRemovingPostage The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponQuery The current query, for fluid interface + */ + public function filterByIsRemovingPostage($isRemovingPostage = null, $comparison = null) + { + if (is_array($isRemovingPostage)) { + $useMinMax = false; + if (isset($isRemovingPostage['min'])) { + $this->addUsingAlias(CouponTableMap::IS_REMOVING_POSTAGE, $isRemovingPostage['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($isRemovingPostage['max'])) { + $this->addUsingAlias(CouponTableMap::IS_REMOVING_POSTAGE, $isRemovingPostage['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(CouponTableMap::IS_REMOVING_POSTAGE, $isRemovingPostage, $comparison); } /** diff --git a/core/lib/Thelia/Model/Base/CouponVersion.php b/core/lib/Thelia/Model/Base/CouponVersion.php new file mode 100644 index 000000000..5fcf14d45 --- /dev/null +++ b/core/lib/Thelia/Model/Base/CouponVersion.php @@ -0,0 +1,2115 @@ +version = 0; + } + + /** + * Initializes internal state of Thelia\Model\Base\CouponVersion object. + * @see applyDefaults() + */ + public function __construct() + { + $this->applyDefaultValues(); + } + + /** + * Returns whether the object has been modified. + * + * @return boolean True if the object has been modified. + */ + public function isModified() + { + return !empty($this->modifiedColumns); + } + + /** + * Has specified column been modified? + * + * @param string $col column fully qualified name (TableMap::TYPE_COLNAME), e.g. Book::AUTHOR_ID + * @return boolean True if $col has been modified. + */ + public function isColumnModified($col) + { + return in_array($col, $this->modifiedColumns); + } + + /** + * Get the columns that have been modified in this object. + * @return array A unique list of the modified column names for this object. + */ + public function getModifiedColumns() + { + return array_unique($this->modifiedColumns); + } + + /** + * Returns whether the object has ever been saved. This will + * be false, if the object was retrieved from storage or was created + * and then saved. + * + * @return true, if the object has never been persisted. + */ + public function isNew() + { + return $this->new; + } + + /** + * Setter for the isNew attribute. This method will be called + * by Propel-generated children and objects. + * + * @param boolean $b the state of the object. + */ + public function setNew($b) + { + $this->new = (Boolean) $b; + } + + /** + * Whether this object has been deleted. + * @return boolean The deleted state of this object. + */ + public function isDeleted() + { + return $this->deleted; + } + + /** + * Specify whether this object has been deleted. + * @param boolean $b The deleted state of this object. + * @return void + */ + public function setDeleted($b) + { + $this->deleted = (Boolean) $b; + } + + /** + * Sets the modified state for the object to be false. + * @param string $col If supplied, only the specified column is reset. + * @return void + */ + public function resetModified($col = null) + { + if (null !== $col) { + while (false !== ($offset = array_search($col, $this->modifiedColumns))) { + array_splice($this->modifiedColumns, $offset, 1); + } + } else { + $this->modifiedColumns = array(); + } + } + + /** + * Compares this with another CouponVersion instance. If + * obj is an instance of CouponVersion, delegates to + * equals(CouponVersion). Otherwise, returns false. + * + * @param obj The object to compare to. + * @return Whether equal to the object specified. + */ + public function equals($obj) + { + $thisclazz = get_class($this); + if (!is_object($obj) || !($obj instanceof $thisclazz)) { + return false; + } + + if ($this === $obj) { + return true; + } + + if (null === $this->getPrimaryKey() + || null === $obj->getPrimaryKey()) { + return false; + } + + return $this->getPrimaryKey() === $obj->getPrimaryKey(); + } + + /** + * If the primary key is not null, return the hashcode of the + * primary key. Otherwise, return the hash code of the object. + * + * @return int Hashcode + */ + public function hashCode() + { + if (null !== $this->getPrimaryKey()) { + return crc32(serialize($this->getPrimaryKey())); + } + + return crc32(serialize(clone $this)); + } + + /** + * Get the associative array of the virtual columns in this object + * + * @param string $name The virtual column name + * + * @return array + */ + public function getVirtualColumns() + { + return $this->virtualColumns; + } + + /** + * Checks the existence of a virtual column in this object + * + * @return boolean + */ + public function hasVirtualColumn($name) + { + return isset($this->virtualColumns[$name]); + } + + /** + * Get the value of a virtual column in this object + * + * @return mixed + */ + public function getVirtualColumn($name) + { + if (!$this->hasVirtualColumn($name)) { + throw new PropelException(sprintf('Cannot get value of inexistent virtual column %s.', $name)); + } + + return $this->virtualColumns[$name]; + } + + /** + * Set the value of a virtual column in this object + * + * @param string $name The virtual column name + * @param mixed $value The value to give to the virtual column + * + * @return CouponVersion The current object, for fluid interface + */ + public function setVirtualColumn($name, $value) + { + $this->virtualColumns[$name] = $value; + + return $this; + } + + /** + * Logs a message using Propel::log(). + * + * @param string $msg + * @param int $priority One of the Propel::LOG_* logging levels + * @return boolean + */ + protected function log($msg, $priority = Propel::LOG_INFO) + { + return Propel::log(get_class($this) . ': ' . $msg, $priority); + } + + /** + * Populate the current object from a string, using a given parser format + * + * $book = new Book(); + * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); + * + * + * @param mixed $parser A AbstractParser instance, + * or a format name ('XML', 'YAML', 'JSON', 'CSV') + * @param string $data The source data to import from + * + * @return CouponVersion The current object, for fluid interface + */ + public function importFrom($parser, $data) + { + if (!$parser instanceof AbstractParser) { + $parser = AbstractParser::getParser($parser); + } + + return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + } + + /** + * Export the current object properties to a string, using a given parser format + * + * $book = BookQuery::create()->findPk(9012); + * echo $book->exportTo('JSON'); + * => {"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); + * + * + * @param mixed $parser A AbstractParser instance, or a format name ('XML', 'YAML', 'JSON', 'CSV') + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy load(ed) columns. Defaults to TRUE. + * @return string The exported data + */ + public function exportTo($parser, $includeLazyLoadColumns = true) + { + if (!$parser instanceof AbstractParser) { + $parser = AbstractParser::getParser($parser); + } + + return $parser->fromArray($this->toArray(TableMap::TYPE_PHPNAME, $includeLazyLoadColumns, array(), true)); + } + + /** + * Clean up internal collections prior to serializing + * Avoids recursive loops that turn into segmentation faults when serializing + */ + public function __sleep() + { + $this->clearAllReferences(); + + return array_keys(get_object_vars($this)); + } + + /** + * Get the [id] column value. + * + * @return int + */ + public function getId() + { + + return $this->id; + } + + /** + * Get the [code] column value. + * + * @return string + */ + public function getCode() + { + + return $this->code; + } + + /** + * Get the [type] column value. + * + * @return string + */ + public function getType() + { + + return $this->type; + } + + /** + * Get the [title] column value. + * + * @return string + */ + public function getTitle() + { + + return $this->title; + } + + /** + * Get the [short_description] column value. + * + * @return string + */ + public function getShortDescription() + { + + return $this->short_description; + } + + /** + * Get the [description] column value. + * + * @return string + */ + public function getDescription() + { + + return $this->description; + } + + /** + * Get the [amount] column value. + * + * @return double + */ + public function getAmount() + { + + return $this->amount; + } + + /** + * Get the [is_used] column value. + * + * @return int + */ + public function getIsUsed() + { + + return $this->is_used; + } + + /** + * Get the [is_enabled] column value. + * + * @return int + */ + public function getIsEnabled() + { + + return $this->is_enabled; + } + + /** + * Get the [optionally formatted] temporal [expiration_date] column value. + * + * + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. + * + * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 + * + * @throws PropelException - if unable to parse/validate the date/time value. + */ + public function getExpirationDate($format = NULL) + { + if ($format === null) { + return $this->expiration_date; + } else { + return $this->expiration_date !== null ? $this->expiration_date->format($format) : null; + } + } + + /** + * Get the [serialized_rules_type] column value. + * + * @return string + */ + public function getSerializedRulesType() + { + + return $this->serialized_rules_type; + } + + /** + * Get the [serialized_rules_content] column value. + * + * @return string + */ + public function getSerializedRulesContent() + { + + return $this->serialized_rules_content; + } + + /** + * Get the [is_cumulative] column value. + * + * @return int + */ + public function getIsCumulative() + { + + return $this->is_cumulative; + } + + /** + * Get the [is_removing_postage] column value. + * + * @return int + */ + public function getIsRemovingPostage() + { + + return $this->is_removing_postage; + } + + /** + * Get the [optionally formatted] temporal [created_at] column value. + * + * + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. + * + * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 + * + * @throws PropelException - if unable to parse/validate the date/time value. + */ + public function getCreatedAt($format = NULL) + { + if ($format === null) { + return $this->created_at; + } else { + return $this->created_at !== null ? $this->created_at->format($format) : null; + } + } + + /** + * Get the [optionally formatted] temporal [updated_at] column value. + * + * + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. + * + * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 + * + * @throws PropelException - if unable to parse/validate the date/time value. + */ + public function getUpdatedAt($format = NULL) + { + if ($format === null) { + return $this->updated_at; + } else { + return $this->updated_at !== null ? $this->updated_at->format($format) : null; + } + } + + /** + * Get the [version] column value. + * + * @return int + */ + public function getVersion() + { + + return $this->version; + } + + /** + * Set the value of [id] column. + * + * @param int $v new value + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + */ + public function setId($v) + { + if ($v !== null) { + $v = (int) $v; + } + + if ($this->id !== $v) { + $this->id = $v; + $this->modifiedColumns[] = CouponVersionTableMap::ID; + } + + if ($this->aCoupon !== null && $this->aCoupon->getId() !== $v) { + $this->aCoupon = null; + } + + + return $this; + } // setId() + + /** + * Set the value of [code] column. + * + * @param string $v new value + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + */ + public function setCode($v) + { + if ($v !== null) { + $v = (string) $v; + } + + if ($this->code !== $v) { + $this->code = $v; + $this->modifiedColumns[] = CouponVersionTableMap::CODE; + } + + + return $this; + } // setCode() + + /** + * Set the value of [type] column. + * + * @param string $v new value + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + */ + public function setType($v) + { + if ($v !== null) { + $v = (string) $v; + } + + if ($this->type !== $v) { + $this->type = $v; + $this->modifiedColumns[] = CouponVersionTableMap::TYPE; + } + + + return $this; + } // setType() + + /** + * Set the value of [title] column. + * + * @param string $v new value + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + */ + public function setTitle($v) + { + if ($v !== null) { + $v = (string) $v; + } + + if ($this->title !== $v) { + $this->title = $v; + $this->modifiedColumns[] = CouponVersionTableMap::TITLE; + } + + + return $this; + } // setTitle() + + /** + * Set the value of [short_description] column. + * + * @param string $v new value + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + */ + public function setShortDescription($v) + { + if ($v !== null) { + $v = (string) $v; + } + + if ($this->short_description !== $v) { + $this->short_description = $v; + $this->modifiedColumns[] = CouponVersionTableMap::SHORT_DESCRIPTION; + } + + + return $this; + } // setShortDescription() + + /** + * Set the value of [description] column. + * + * @param string $v new value + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + */ + public function setDescription($v) + { + if ($v !== null) { + $v = (string) $v; + } + + if ($this->description !== $v) { + $this->description = $v; + $this->modifiedColumns[] = CouponVersionTableMap::DESCRIPTION; + } + + + return $this; + } // setDescription() + + /** + * Set the value of [amount] column. + * + * @param double $v new value + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + */ + public function setAmount($v) + { + if ($v !== null) { + $v = (double) $v; + } + + if ($this->amount !== $v) { + $this->amount = $v; + $this->modifiedColumns[] = CouponVersionTableMap::AMOUNT; + } + + + return $this; + } // setAmount() + + /** + * Set the value of [is_used] column. + * + * @param int $v new value + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + */ + public function setIsUsed($v) + { + if ($v !== null) { + $v = (int) $v; + } + + if ($this->is_used !== $v) { + $this->is_used = $v; + $this->modifiedColumns[] = CouponVersionTableMap::IS_USED; + } + + + return $this; + } // setIsUsed() + + /** + * Set the value of [is_enabled] column. + * + * @param int $v new value + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + */ + public function setIsEnabled($v) + { + if ($v !== null) { + $v = (int) $v; + } + + if ($this->is_enabled !== $v) { + $this->is_enabled = $v; + $this->modifiedColumns[] = CouponVersionTableMap::IS_ENABLED; + } + + + return $this; + } // setIsEnabled() + + /** + * Sets the value of [expiration_date] column to a normalized version of the date/time value specified. + * + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + */ + public function setExpirationDate($v) + { + $dt = PropelDateTime::newInstance($v, null, '\DateTime'); + if ($this->expiration_date !== null || $dt !== null) { + if ($dt !== $this->expiration_date) { + $this->expiration_date = $dt; + $this->modifiedColumns[] = CouponVersionTableMap::EXPIRATION_DATE; + } + } // if either are not null + + + return $this; + } // setExpirationDate() + + /** + * Set the value of [serialized_rules_type] column. + * + * @param string $v new value + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + */ + public function setSerializedRulesType($v) + { + if ($v !== null) { + $v = (string) $v; + } + + if ($this->serialized_rules_type !== $v) { + $this->serialized_rules_type = $v; + $this->modifiedColumns[] = CouponVersionTableMap::SERIALIZED_RULES_TYPE; + } + + + return $this; + } // setSerializedRulesType() + + /** + * Set the value of [serialized_rules_content] column. + * + * @param string $v new value + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + */ + public function setSerializedRulesContent($v) + { + if ($v !== null) { + $v = (string) $v; + } + + if ($this->serialized_rules_content !== $v) { + $this->serialized_rules_content = $v; + $this->modifiedColumns[] = CouponVersionTableMap::SERIALIZED_RULES_CONTENT; + } + + + return $this; + } // setSerializedRulesContent() + + /** + * Set the value of [is_cumulative] column. + * + * @param int $v new value + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + */ + public function setIsCumulative($v) + { + if ($v !== null) { + $v = (int) $v; + } + + if ($this->is_cumulative !== $v) { + $this->is_cumulative = $v; + $this->modifiedColumns[] = CouponVersionTableMap::IS_CUMULATIVE; + } + + + return $this; + } // setIsCumulative() + + /** + * Set the value of [is_removing_postage] column. + * + * @param int $v new value + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + */ + public function setIsRemovingPostage($v) + { + if ($v !== null) { + $v = (int) $v; + } + + if ($this->is_removing_postage !== $v) { + $this->is_removing_postage = $v; + $this->modifiedColumns[] = CouponVersionTableMap::IS_REMOVING_POSTAGE; + } + + + return $this; + } // setIsRemovingPostage() + + /** + * Sets the value of [created_at] column to a normalized version of the date/time value specified. + * + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + */ + public function setCreatedAt($v) + { + $dt = PropelDateTime::newInstance($v, null, '\DateTime'); + if ($this->created_at !== null || $dt !== null) { + if ($dt !== $this->created_at) { + $this->created_at = $dt; + $this->modifiedColumns[] = CouponVersionTableMap::CREATED_AT; + } + } // if either are not null + + + return $this; + } // setCreatedAt() + + /** + * Sets the value of [updated_at] column to a normalized version of the date/time value specified. + * + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + */ + public function setUpdatedAt($v) + { + $dt = PropelDateTime::newInstance($v, null, '\DateTime'); + if ($this->updated_at !== null || $dt !== null) { + if ($dt !== $this->updated_at) { + $this->updated_at = $dt; + $this->modifiedColumns[] = CouponVersionTableMap::UPDATED_AT; + } + } // if either are not null + + + return $this; + } // setUpdatedAt() + + /** + * Set the value of [version] column. + * + * @param int $v new value + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + */ + public function setVersion($v) + { + if ($v !== null) { + $v = (int) $v; + } + + if ($this->version !== $v) { + $this->version = $v; + $this->modifiedColumns[] = CouponVersionTableMap::VERSION; + } + + + return $this; + } // setVersion() + + /** + * Indicates whether the columns in this object are only set to default values. + * + * This method can be used in conjunction with isModified() to indicate whether an object is both + * modified _and_ has some values set which are non-default. + * + * @return boolean Whether the columns in this object are only been set with default values. + */ + public function hasOnlyDefaultValues() + { + if ($this->version !== 0) { + return false; + } + + // otherwise, everything was equal, so return TRUE + return true; + } // hasOnlyDefaultValues() + + /** + * Hydrates (populates) the object variables with values from the database resultset. + * + * An offset (0-based "start column") is specified so that objects can be hydrated + * with a subset of the columns in the resultset rows. This is needed, for example, + * for results of JOIN queries where the resultset row includes columns from two or + * more tables. + * + * @param array $row The row returned by DataFetcher->fetch(). + * @param int $startcol 0-based offset column which indicates which restultset column to start with. + * @param boolean $rehydrate Whether this object is being re-hydrated from the database. + * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType(). + One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * + * @return int next starting column + * @throws PropelException - Any caught Exception will be rewrapped as a PropelException. + */ + public function hydrate($row, $startcol = 0, $rehydrate = false, $indexType = TableMap::TYPE_NUM) + { + try { + + + $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : CouponVersionTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; + $this->id = (null !== $col) ? (int) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : CouponVersionTableMap::translateFieldName('Code', TableMap::TYPE_PHPNAME, $indexType)]; + $this->code = (null !== $col) ? (string) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : CouponVersionTableMap::translateFieldName('Type', TableMap::TYPE_PHPNAME, $indexType)]; + $this->type = (null !== $col) ? (string) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : CouponVersionTableMap::translateFieldName('Title', TableMap::TYPE_PHPNAME, $indexType)]; + $this->title = (null !== $col) ? (string) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : CouponVersionTableMap::translateFieldName('ShortDescription', TableMap::TYPE_PHPNAME, $indexType)]; + $this->short_description = (null !== $col) ? (string) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : CouponVersionTableMap::translateFieldName('Description', TableMap::TYPE_PHPNAME, $indexType)]; + $this->description = (null !== $col) ? (string) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : CouponVersionTableMap::translateFieldName('Amount', TableMap::TYPE_PHPNAME, $indexType)]; + $this->amount = (null !== $col) ? (double) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : CouponVersionTableMap::translateFieldName('IsUsed', TableMap::TYPE_PHPNAME, $indexType)]; + $this->is_used = (null !== $col) ? (int) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 8 + $startcol : CouponVersionTableMap::translateFieldName('IsEnabled', TableMap::TYPE_PHPNAME, $indexType)]; + $this->is_enabled = (null !== $col) ? (int) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 9 + $startcol : CouponVersionTableMap::translateFieldName('ExpirationDate', TableMap::TYPE_PHPNAME, $indexType)]; + if ($col === '0000-00-00 00:00:00') { + $col = null; + } + $this->expiration_date = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 10 + $startcol : CouponVersionTableMap::translateFieldName('SerializedRulesType', TableMap::TYPE_PHPNAME, $indexType)]; + $this->serialized_rules_type = (null !== $col) ? (string) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 11 + $startcol : CouponVersionTableMap::translateFieldName('SerializedRulesContent', TableMap::TYPE_PHPNAME, $indexType)]; + $this->serialized_rules_content = (null !== $col) ? (string) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 12 + $startcol : CouponVersionTableMap::translateFieldName('IsCumulative', TableMap::TYPE_PHPNAME, $indexType)]; + $this->is_cumulative = (null !== $col) ? (int) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 13 + $startcol : CouponVersionTableMap::translateFieldName('IsRemovingPostage', TableMap::TYPE_PHPNAME, $indexType)]; + $this->is_removing_postage = (null !== $col) ? (int) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 14 + $startcol : CouponVersionTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + if ($col === '0000-00-00 00:00:00') { + $col = null; + } + $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 15 + $startcol : CouponVersionTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + if ($col === '0000-00-00 00:00:00') { + $col = null; + } + $this->updated_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 16 + $startcol : CouponVersionTableMap::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)]; + $this->version = (null !== $col) ? (int) $col : null; + $this->resetModified(); + + $this->setNew(false); + + if ($rehydrate) { + $this->ensureConsistency(); + } + + return $startcol + 17; // 17 = CouponVersionTableMap::NUM_HYDRATE_COLUMNS. + + } catch (Exception $e) { + throw new PropelException("Error populating \Thelia\Model\CouponVersion object", 0, $e); + } + } + + /** + * Checks and repairs the internal consistency of the object. + * + * This method is executed after an already-instantiated object is re-hydrated + * from the database. It exists to check any foreign keys to make sure that + * the objects related to the current object are correct based on foreign key. + * + * You can override this method in the stub class, but you should always invoke + * the base method from the overridden method (i.e. parent::ensureConsistency()), + * in case your model changes. + * + * @throws PropelException + */ + public function ensureConsistency() + { + if ($this->aCoupon !== null && $this->id !== $this->aCoupon->getId()) { + $this->aCoupon = null; + } + } // ensureConsistency + + /** + * Reloads this object from datastore based on primary key and (optionally) resets all associated objects. + * + * This will only work if the object has been saved and has a valid primary key set. + * + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @return void + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + */ + public function reload($deep = false, ConnectionInterface $con = null) + { + if ($this->isDeleted()) { + throw new PropelException("Cannot reload a deleted object."); + } + + if ($this->isNew()) { + throw new PropelException("Cannot reload an unsaved object."); + } + + if ($con === null) { + $con = Propel::getServiceContainer()->getReadConnection(CouponVersionTableMap::DATABASE_NAME); + } + + // We don't need to alter the object instance pool; we're just modifying this instance + // already in the pool. + + $dataFetcher = ChildCouponVersionQuery::create(null, $this->buildPkeyCriteria())->setFormatter(ModelCriteria::FORMAT_STATEMENT)->find($con); + $row = $dataFetcher->fetch(); + $dataFetcher->close(); + if (!$row) { + throw new PropelException('Cannot find matching row in the database to reload object values.'); + } + $this->hydrate($row, 0, true, $dataFetcher->getIndexType()); // rehydrate + + if ($deep) { // also de-associate any related objects? + + $this->aCoupon = null; + } // if (deep) + } + + /** + * Removes this object from datastore and sets delete attribute. + * + * @param ConnectionInterface $con + * @return void + * @throws PropelException + * @see CouponVersion::setDeleted() + * @see CouponVersion::isDeleted() + */ + public function delete(ConnectionInterface $con = null) + { + if ($this->isDeleted()) { + throw new PropelException("This object has already been deleted."); + } + + if ($con === null) { + $con = Propel::getServiceContainer()->getWriteConnection(CouponVersionTableMap::DATABASE_NAME); + } + + $con->beginTransaction(); + try { + $deleteQuery = ChildCouponVersionQuery::create() + ->filterByPrimaryKey($this->getPrimaryKey()); + $ret = $this->preDelete($con); + if ($ret) { + $deleteQuery->delete($con); + $this->postDelete($con); + $con->commit(); + $this->setDeleted(true); + } else { + $con->commit(); + } + } catch (Exception $e) { + $con->rollBack(); + throw $e; + } + } + + /** + * Persists this object to the database. + * + * If the object is new, it inserts it; otherwise an update is performed. + * All modified related objects will also be persisted in the doSave() + * method. This method wraps all precipitate database operations in a + * single transaction. + * + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @throws PropelException + * @see doSave() + */ + public function save(ConnectionInterface $con = null) + { + if ($this->isDeleted()) { + throw new PropelException("You cannot save an object that has been deleted."); + } + + if ($con === null) { + $con = Propel::getServiceContainer()->getWriteConnection(CouponVersionTableMap::DATABASE_NAME); + } + + $con->beginTransaction(); + $isInsert = $this->isNew(); + try { + $ret = $this->preSave($con); + if ($isInsert) { + $ret = $ret && $this->preInsert($con); + } else { + $ret = $ret && $this->preUpdate($con); + } + if ($ret) { + $affectedRows = $this->doSave($con); + if ($isInsert) { + $this->postInsert($con); + } else { + $this->postUpdate($con); + } + $this->postSave($con); + CouponVersionTableMap::addInstanceToPool($this); + } else { + $affectedRows = 0; + } + $con->commit(); + + return $affectedRows; + } catch (Exception $e) { + $con->rollBack(); + throw $e; + } + } + + /** + * Performs the work of inserting or updating the row in the database. + * + * If the object is new, it inserts it; otherwise an update is performed. + * All related objects are also updated in this method. + * + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @throws PropelException + * @see save() + */ + protected function doSave(ConnectionInterface $con) + { + $affectedRows = 0; // initialize var to track total num of affected rows + if (!$this->alreadyInSave) { + $this->alreadyInSave = true; + + // We call the save method on the following object(s) if they + // were passed to this object by their corresponding set + // method. This object relates to these object(s) by a + // foreign key reference. + + if ($this->aCoupon !== null) { + if ($this->aCoupon->isModified() || $this->aCoupon->isNew()) { + $affectedRows += $this->aCoupon->save($con); + } + $this->setCoupon($this->aCoupon); + } + + if ($this->isNew() || $this->isModified()) { + // persist changes + if ($this->isNew()) { + $this->doInsert($con); + } else { + $this->doUpdate($con); + } + $affectedRows += 1; + $this->resetModified(); + } + + $this->alreadyInSave = false; + + } + + return $affectedRows; + } // doSave() + + /** + * Insert the row in the database. + * + * @param ConnectionInterface $con + * + * @throws PropelException + * @see doSave() + */ + protected function doInsert(ConnectionInterface $con) + { + $modifiedColumns = array(); + $index = 0; + + + // check the columns in natural order for more readable SQL queries + if ($this->isColumnModified(CouponVersionTableMap::ID)) { + $modifiedColumns[':p' . $index++] = 'ID'; + } + if ($this->isColumnModified(CouponVersionTableMap::CODE)) { + $modifiedColumns[':p' . $index++] = 'CODE'; + } + if ($this->isColumnModified(CouponVersionTableMap::TYPE)) { + $modifiedColumns[':p' . $index++] = 'TYPE'; + } + if ($this->isColumnModified(CouponVersionTableMap::TITLE)) { + $modifiedColumns[':p' . $index++] = 'TITLE'; + } + if ($this->isColumnModified(CouponVersionTableMap::SHORT_DESCRIPTION)) { + $modifiedColumns[':p' . $index++] = 'SHORT_DESCRIPTION'; + } + if ($this->isColumnModified(CouponVersionTableMap::DESCRIPTION)) { + $modifiedColumns[':p' . $index++] = 'DESCRIPTION'; + } + if ($this->isColumnModified(CouponVersionTableMap::AMOUNT)) { + $modifiedColumns[':p' . $index++] = 'AMOUNT'; + } + if ($this->isColumnModified(CouponVersionTableMap::IS_USED)) { + $modifiedColumns[':p' . $index++] = 'IS_USED'; + } + if ($this->isColumnModified(CouponVersionTableMap::IS_ENABLED)) { + $modifiedColumns[':p' . $index++] = 'IS_ENABLED'; + } + if ($this->isColumnModified(CouponVersionTableMap::EXPIRATION_DATE)) { + $modifiedColumns[':p' . $index++] = 'EXPIRATION_DATE'; + } + if ($this->isColumnModified(CouponVersionTableMap::SERIALIZED_RULES_TYPE)) { + $modifiedColumns[':p' . $index++] = 'SERIALIZED_RULES_TYPE'; + } + if ($this->isColumnModified(CouponVersionTableMap::SERIALIZED_RULES_CONTENT)) { + $modifiedColumns[':p' . $index++] = 'SERIALIZED_RULES_CONTENT'; + } + if ($this->isColumnModified(CouponVersionTableMap::IS_CUMULATIVE)) { + $modifiedColumns[':p' . $index++] = 'IS_CUMULATIVE'; + } + if ($this->isColumnModified(CouponVersionTableMap::IS_REMOVING_POSTAGE)) { + $modifiedColumns[':p' . $index++] = 'IS_REMOVING_POSTAGE'; + } + if ($this->isColumnModified(CouponVersionTableMap::CREATED_AT)) { + $modifiedColumns[':p' . $index++] = 'CREATED_AT'; + } + if ($this->isColumnModified(CouponVersionTableMap::UPDATED_AT)) { + $modifiedColumns[':p' . $index++] = 'UPDATED_AT'; + } + if ($this->isColumnModified(CouponVersionTableMap::VERSION)) { + $modifiedColumns[':p' . $index++] = 'VERSION'; + } + + $sql = sprintf( + 'INSERT INTO coupon_version (%s) VALUES (%s)', + implode(', ', $modifiedColumns), + implode(', ', array_keys($modifiedColumns)) + ); + + try { + $stmt = $con->prepare($sql); + foreach ($modifiedColumns as $identifier => $columnName) { + switch ($columnName) { + case 'ID': + $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT); + break; + case 'CODE': + $stmt->bindValue($identifier, $this->code, PDO::PARAM_STR); + break; + case 'TYPE': + $stmt->bindValue($identifier, $this->type, PDO::PARAM_STR); + break; + case 'TITLE': + $stmt->bindValue($identifier, $this->title, PDO::PARAM_STR); + break; + case 'SHORT_DESCRIPTION': + $stmt->bindValue($identifier, $this->short_description, PDO::PARAM_STR); + break; + case 'DESCRIPTION': + $stmt->bindValue($identifier, $this->description, PDO::PARAM_STR); + break; + case 'AMOUNT': + $stmt->bindValue($identifier, $this->amount, PDO::PARAM_STR); + break; + case 'IS_USED': + $stmt->bindValue($identifier, $this->is_used, PDO::PARAM_INT); + break; + case 'IS_ENABLED': + $stmt->bindValue($identifier, $this->is_enabled, PDO::PARAM_INT); + break; + case 'EXPIRATION_DATE': + $stmt->bindValue($identifier, $this->expiration_date ? $this->expiration_date->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); + break; + case 'SERIALIZED_RULES_TYPE': + $stmt->bindValue($identifier, $this->serialized_rules_type, PDO::PARAM_STR); + break; + case 'SERIALIZED_RULES_CONTENT': + $stmt->bindValue($identifier, $this->serialized_rules_content, PDO::PARAM_STR); + break; + case 'IS_CUMULATIVE': + $stmt->bindValue($identifier, $this->is_cumulative, PDO::PARAM_INT); + break; + case 'IS_REMOVING_POSTAGE': + $stmt->bindValue($identifier, $this->is_removing_postage, PDO::PARAM_INT); + break; + case 'CREATED_AT': + $stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); + break; + case 'UPDATED_AT': + $stmt->bindValue($identifier, $this->updated_at ? $this->updated_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); + break; + case 'VERSION': + $stmt->bindValue($identifier, $this->version, PDO::PARAM_INT); + break; + } + } + $stmt->execute(); + } catch (Exception $e) { + Propel::log($e->getMessage(), Propel::LOG_ERR); + throw new PropelException(sprintf('Unable to execute INSERT statement [%s]', $sql), 0, $e); + } + + $this->setNew(false); + } + + /** + * Update the row in the database. + * + * @param ConnectionInterface $con + * + * @return Integer Number of updated rows + * @see doSave() + */ + protected function doUpdate(ConnectionInterface $con) + { + $selectCriteria = $this->buildPkeyCriteria(); + $valuesCriteria = $this->buildCriteria(); + + return $selectCriteria->doUpdate($valuesCriteria, $con); + } + + /** + * Retrieves a field from the object by name passed in as a string. + * + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. + */ + public function getByName($name, $type = TableMap::TYPE_PHPNAME) + { + $pos = CouponVersionTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM); + $field = $this->getByPosition($pos); + + return $field; + } + + /** + * Retrieves a field from the object by Position as specified in the xml schema. + * Zero-based. + * + * @param int $pos position in xml schema + * @return mixed Value of field at $pos + */ + public function getByPosition($pos) + { + switch ($pos) { + case 0: + return $this->getId(); + break; + case 1: + return $this->getCode(); + break; + case 2: + return $this->getType(); + break; + case 3: + return $this->getTitle(); + break; + case 4: + return $this->getShortDescription(); + break; + case 5: + return $this->getDescription(); + break; + case 6: + return $this->getAmount(); + break; + case 7: + return $this->getIsUsed(); + break; + case 8: + return $this->getIsEnabled(); + break; + case 9: + return $this->getExpirationDate(); + break; + case 10: + return $this->getSerializedRulesType(); + break; + case 11: + return $this->getSerializedRulesContent(); + break; + case 12: + return $this->getIsCumulative(); + break; + case 13: + return $this->getIsRemovingPostage(); + break; + case 14: + return $this->getCreatedAt(); + break; + case 15: + return $this->getUpdatedAt(); + break; + case 16: + return $this->getVersion(); + break; + default: + return null; + break; + } // switch() + } + + /** + * Exports the object as an array. + * + * You can specify the key type of the array by passing one of the class + * type constants. + * + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * + * @return array an associative array containing the field names (as keys) and field values + */ + public function toArray($keyType = TableMap::TYPE_PHPNAME, $includeLazyLoadColumns = true, $alreadyDumpedObjects = array(), $includeForeignObjects = false) + { + if (isset($alreadyDumpedObjects['CouponVersion'][serialize($this->getPrimaryKey())])) { + return '*RECURSION*'; + } + $alreadyDumpedObjects['CouponVersion'][serialize($this->getPrimaryKey())] = true; + $keys = CouponVersionTableMap::getFieldNames($keyType); + $result = array( + $keys[0] => $this->getId(), + $keys[1] => $this->getCode(), + $keys[2] => $this->getType(), + $keys[3] => $this->getTitle(), + $keys[4] => $this->getShortDescription(), + $keys[5] => $this->getDescription(), + $keys[6] => $this->getAmount(), + $keys[7] => $this->getIsUsed(), + $keys[8] => $this->getIsEnabled(), + $keys[9] => $this->getExpirationDate(), + $keys[10] => $this->getSerializedRulesType(), + $keys[11] => $this->getSerializedRulesContent(), + $keys[12] => $this->getIsCumulative(), + $keys[13] => $this->getIsRemovingPostage(), + $keys[14] => $this->getCreatedAt(), + $keys[15] => $this->getUpdatedAt(), + $keys[16] => $this->getVersion(), + ); + $virtualColumns = $this->virtualColumns; + foreach($virtualColumns as $key => $virtualColumn) + { + $result[$key] = $virtualColumn; + } + + if ($includeForeignObjects) { + if (null !== $this->aCoupon) { + $result['Coupon'] = $this->aCoupon->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); + } + } + + return $result; + } + + /** + * Sets a field from the object by name passed in as a string. + * + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return void + */ + public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) + { + $pos = CouponVersionTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM); + + return $this->setByPosition($pos, $value); + } + + /** + * Sets a field from the object by Position as specified in the xml schema. + * Zero-based. + * + * @param int $pos position in xml schema + * @param mixed $value field value + * @return void + */ + public function setByPosition($pos, $value) + { + switch ($pos) { + case 0: + $this->setId($value); + break; + case 1: + $this->setCode($value); + break; + case 2: + $this->setType($value); + break; + case 3: + $this->setTitle($value); + break; + case 4: + $this->setShortDescription($value); + break; + case 5: + $this->setDescription($value); + break; + case 6: + $this->setAmount($value); + break; + case 7: + $this->setIsUsed($value); + break; + case 8: + $this->setIsEnabled($value); + break; + case 9: + $this->setExpirationDate($value); + break; + case 10: + $this->setSerializedRulesType($value); + break; + case 11: + $this->setSerializedRulesContent($value); + break; + case 12: + $this->setIsCumulative($value); + break; + case 13: + $this->setIsRemovingPostage($value); + break; + case 14: + $this->setCreatedAt($value); + break; + case 15: + $this->setUpdatedAt($value); + break; + case 16: + $this->setVersion($value); + break; + } // switch() + } + + /** + * Populates the object using an array. + * + * This is particularly useful when populating an object from one of the + * request arrays (e.g. $_POST). This method goes through the column + * names, checking to see whether a matching key exists in populated + * array. If so the setByName() method is called for that column. + * + * You can specify the key type of the array by additionally passing one + * of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * The default key type is the column's TableMap::TYPE_PHPNAME. + * + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. + * @return void + */ + public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) + { + $keys = CouponVersionTableMap::getFieldNames($keyType); + + if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]); + if (array_key_exists($keys[1], $arr)) $this->setCode($arr[$keys[1]]); + if (array_key_exists($keys[2], $arr)) $this->setType($arr[$keys[2]]); + if (array_key_exists($keys[3], $arr)) $this->setTitle($arr[$keys[3]]); + if (array_key_exists($keys[4], $arr)) $this->setShortDescription($arr[$keys[4]]); + if (array_key_exists($keys[5], $arr)) $this->setDescription($arr[$keys[5]]); + if (array_key_exists($keys[6], $arr)) $this->setAmount($arr[$keys[6]]); + if (array_key_exists($keys[7], $arr)) $this->setIsUsed($arr[$keys[7]]); + if (array_key_exists($keys[8], $arr)) $this->setIsEnabled($arr[$keys[8]]); + if (array_key_exists($keys[9], $arr)) $this->setExpirationDate($arr[$keys[9]]); + if (array_key_exists($keys[10], $arr)) $this->setSerializedRulesType($arr[$keys[10]]); + if (array_key_exists($keys[11], $arr)) $this->setSerializedRulesContent($arr[$keys[11]]); + if (array_key_exists($keys[12], $arr)) $this->setIsCumulative($arr[$keys[12]]); + if (array_key_exists($keys[13], $arr)) $this->setIsRemovingPostage($arr[$keys[13]]); + if (array_key_exists($keys[14], $arr)) $this->setCreatedAt($arr[$keys[14]]); + if (array_key_exists($keys[15], $arr)) $this->setUpdatedAt($arr[$keys[15]]); + if (array_key_exists($keys[16], $arr)) $this->setVersion($arr[$keys[16]]); + } + + /** + * Build a Criteria object containing the values of all modified columns in this object. + * + * @return Criteria The Criteria object containing all modified values. + */ + public function buildCriteria() + { + $criteria = new Criteria(CouponVersionTableMap::DATABASE_NAME); + + if ($this->isColumnModified(CouponVersionTableMap::ID)) $criteria->add(CouponVersionTableMap::ID, $this->id); + if ($this->isColumnModified(CouponVersionTableMap::CODE)) $criteria->add(CouponVersionTableMap::CODE, $this->code); + if ($this->isColumnModified(CouponVersionTableMap::TYPE)) $criteria->add(CouponVersionTableMap::TYPE, $this->type); + if ($this->isColumnModified(CouponVersionTableMap::TITLE)) $criteria->add(CouponVersionTableMap::TITLE, $this->title); + if ($this->isColumnModified(CouponVersionTableMap::SHORT_DESCRIPTION)) $criteria->add(CouponVersionTableMap::SHORT_DESCRIPTION, $this->short_description); + if ($this->isColumnModified(CouponVersionTableMap::DESCRIPTION)) $criteria->add(CouponVersionTableMap::DESCRIPTION, $this->description); + if ($this->isColumnModified(CouponVersionTableMap::AMOUNT)) $criteria->add(CouponVersionTableMap::AMOUNT, $this->amount); + if ($this->isColumnModified(CouponVersionTableMap::IS_USED)) $criteria->add(CouponVersionTableMap::IS_USED, $this->is_used); + if ($this->isColumnModified(CouponVersionTableMap::IS_ENABLED)) $criteria->add(CouponVersionTableMap::IS_ENABLED, $this->is_enabled); + if ($this->isColumnModified(CouponVersionTableMap::EXPIRATION_DATE)) $criteria->add(CouponVersionTableMap::EXPIRATION_DATE, $this->expiration_date); + if ($this->isColumnModified(CouponVersionTableMap::SERIALIZED_RULES_TYPE)) $criteria->add(CouponVersionTableMap::SERIALIZED_RULES_TYPE, $this->serialized_rules_type); + if ($this->isColumnModified(CouponVersionTableMap::SERIALIZED_RULES_CONTENT)) $criteria->add(CouponVersionTableMap::SERIALIZED_RULES_CONTENT, $this->serialized_rules_content); + if ($this->isColumnModified(CouponVersionTableMap::IS_CUMULATIVE)) $criteria->add(CouponVersionTableMap::IS_CUMULATIVE, $this->is_cumulative); + if ($this->isColumnModified(CouponVersionTableMap::IS_REMOVING_POSTAGE)) $criteria->add(CouponVersionTableMap::IS_REMOVING_POSTAGE, $this->is_removing_postage); + if ($this->isColumnModified(CouponVersionTableMap::CREATED_AT)) $criteria->add(CouponVersionTableMap::CREATED_AT, $this->created_at); + if ($this->isColumnModified(CouponVersionTableMap::UPDATED_AT)) $criteria->add(CouponVersionTableMap::UPDATED_AT, $this->updated_at); + if ($this->isColumnModified(CouponVersionTableMap::VERSION)) $criteria->add(CouponVersionTableMap::VERSION, $this->version); + + return $criteria; + } + + /** + * Builds a Criteria object containing the primary key for this object. + * + * Unlike buildCriteria() this method includes the primary key values regardless + * of whether or not they have been modified. + * + * @return Criteria The Criteria object containing value(s) for primary key(s). + */ + public function buildPkeyCriteria() + { + $criteria = new Criteria(CouponVersionTableMap::DATABASE_NAME); + $criteria->add(CouponVersionTableMap::ID, $this->id); + $criteria->add(CouponVersionTableMap::VERSION, $this->version); + + return $criteria; + } + + /** + * Returns the composite primary key for this object. + * The array elements will be in same order as specified in XML. + * @return array + */ + public function getPrimaryKey() + { + $pks = array(); + $pks[0] = $this->getId(); + $pks[1] = $this->getVersion(); + + return $pks; + } + + /** + * Set the [composite] primary key. + * + * @param array $keys The elements of the composite key (order must match the order in XML file). + * @return void + */ + public function setPrimaryKey($keys) + { + $this->setId($keys[0]); + $this->setVersion($keys[1]); + } + + /** + * Returns true if the primary key for this object is null. + * @return boolean + */ + public function isPrimaryKeyNull() + { + + return (null === $this->getId()) && (null === $this->getVersion()); + } + + /** + * Sets contents of passed object to values from current object. + * + * If desired, this method can also make copies of all associated (fkey referrers) + * objects. + * + * @param object $copyObj An object of \Thelia\Model\CouponVersion (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @throws PropelException + */ + public function copyInto($copyObj, $deepCopy = false, $makeNew = true) + { + $copyObj->setId($this->getId()); + $copyObj->setCode($this->getCode()); + $copyObj->setType($this->getType()); + $copyObj->setTitle($this->getTitle()); + $copyObj->setShortDescription($this->getShortDescription()); + $copyObj->setDescription($this->getDescription()); + $copyObj->setAmount($this->getAmount()); + $copyObj->setIsUsed($this->getIsUsed()); + $copyObj->setIsEnabled($this->getIsEnabled()); + $copyObj->setExpirationDate($this->getExpirationDate()); + $copyObj->setSerializedRulesType($this->getSerializedRulesType()); + $copyObj->setSerializedRulesContent($this->getSerializedRulesContent()); + $copyObj->setIsCumulative($this->getIsCumulative()); + $copyObj->setIsRemovingPostage($this->getIsRemovingPostage()); + $copyObj->setCreatedAt($this->getCreatedAt()); + $copyObj->setUpdatedAt($this->getUpdatedAt()); + $copyObj->setVersion($this->getVersion()); + if ($makeNew) { + $copyObj->setNew(true); + } + } + + /** + * Makes a copy of this object that will be inserted as a new row in table when saved. + * It creates a new object filling in the simple attributes, but skipping any primary + * keys that are defined for the table. + * + * If desired, this method can also make copies of all associated (fkey referrers) + * objects. + * + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\CouponVersion Clone of current object. + * @throws PropelException + */ + public function copy($deepCopy = false) + { + // we use get_class(), because this might be a subclass + $clazz = get_class($this); + $copyObj = new $clazz(); + $this->copyInto($copyObj, $deepCopy); + + return $copyObj; + } + + /** + * Declares an association between this object and a ChildCoupon object. + * + * @param ChildCoupon $v + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + * @throws PropelException + */ + public function setCoupon(ChildCoupon $v = null) + { + if ($v === null) { + $this->setId(NULL); + } else { + $this->setId($v->getId()); + } + + $this->aCoupon = $v; + + // Add binding for other direction of this n:n relationship. + // If this object has already been added to the ChildCoupon object, it will not be re-added. + if ($v !== null) { + $v->addCouponVersion($this); + } + + + return $this; + } + + + /** + * Get the associated ChildCoupon object + * + * @param ConnectionInterface $con Optional Connection object. + * @return ChildCoupon The associated ChildCoupon object. + * @throws PropelException + */ + public function getCoupon(ConnectionInterface $con = null) + { + if ($this->aCoupon === null && ($this->id !== null)) { + $this->aCoupon = ChildCouponQuery::create()->findPk($this->id, $con); + /* The following can be used additionally to + guarantee the related object contains a reference + to this object. This level of coupling may, however, be + undesirable since it could result in an only partially populated collection + in the referenced object. + $this->aCoupon->addCouponVersions($this); + */ + } + + return $this->aCoupon; + } + + /** + * Clears the current object and sets all attributes to their default values + */ + public function clear() + { + $this->id = null; + $this->code = null; + $this->type = null; + $this->title = null; + $this->short_description = null; + $this->description = null; + $this->amount = null; + $this->is_used = null; + $this->is_enabled = null; + $this->expiration_date = null; + $this->serialized_rules_type = null; + $this->serialized_rules_content = null; + $this->is_cumulative = null; + $this->is_removing_postage = null; + $this->created_at = null; + $this->updated_at = null; + $this->version = null; + $this->alreadyInSave = false; + $this->clearAllReferences(); + $this->applyDefaultValues(); + $this->resetModified(); + $this->setNew(true); + $this->setDeleted(false); + } + + /** + * Resets all references to other model objects or collections of model objects. + * + * This method is a user-space workaround for PHP's inability to garbage collect + * objects with circular references (even in PHP 5.3). This is currently necessary + * when using Propel in certain daemon or large-volume/high-memory operations. + * + * @param boolean $deep Whether to also clear the references on all referrer objects. + */ + public function clearAllReferences($deep = false) + { + if ($deep) { + } // if ($deep) + + $this->aCoupon = null; + } + + /** + * Return the string representation of this object + * + * @return string + */ + public function __toString() + { + return (string) $this->exportTo(CouponVersionTableMap::DEFAULT_STRING_FORMAT); + } + + /** + * Code to be run before persisting the object + * @param ConnectionInterface $con + * @return boolean + */ + public function preSave(ConnectionInterface $con = null) + { + return true; + } + + /** + * Code to be run after persisting the object + * @param ConnectionInterface $con + */ + public function postSave(ConnectionInterface $con = null) + { + + } + + /** + * Code to be run before inserting to database + * @param ConnectionInterface $con + * @return boolean + */ + public function preInsert(ConnectionInterface $con = null) + { + return true; + } + + /** + * Code to be run after inserting to database + * @param ConnectionInterface $con + */ + public function postInsert(ConnectionInterface $con = null) + { + + } + + /** + * Code to be run before updating the object in database + * @param ConnectionInterface $con + * @return boolean + */ + public function preUpdate(ConnectionInterface $con = null) + { + return true; + } + + /** + * Code to be run after updating the object in database + * @param ConnectionInterface $con + */ + public function postUpdate(ConnectionInterface $con = null) + { + + } + + /** + * Code to be run before deleting the object in database + * @param ConnectionInterface $con + * @return boolean + */ + public function preDelete(ConnectionInterface $con = null) + { + return true; + } + + /** + * Code to be run after deleting the object in database + * @param ConnectionInterface $con + */ + public function postDelete(ConnectionInterface $con = null) + { + + } + + + /** + * Derived method to catches calls to undefined methods. + * + * Provides magic import/export method support (fromXML()/toXML(), fromYAML()/toYAML(), etc.). + * Allows to define default __call() behavior if you overwrite __call() + * + * @param string $name + * @param mixed $params + * + * @return array|string + */ + public function __call($name, $params) + { + if (0 === strpos($name, 'get')) { + $virtualColumn = substr($name, 3); + if ($this->hasVirtualColumn($virtualColumn)) { + return $this->getVirtualColumn($virtualColumn); + } + + $virtualColumn = lcfirst($virtualColumn); + if ($this->hasVirtualColumn($virtualColumn)) { + return $this->getVirtualColumn($virtualColumn); + } + } + + if (0 === strpos($name, 'from')) { + $format = substr($name, 4); + + return $this->importFrom($format, reset($params)); + } + + if (0 === strpos($name, 'to')) { + $format = substr($name, 2); + $includeLazyLoadColumns = isset($params[0]) ? $params[0] : true; + + return $this->exportTo($format, $includeLazyLoadColumns); + } + + throw new BadMethodCallException(sprintf('Call to undefined method: %s.', $name)); + } + +} diff --git a/core/lib/Thelia/Model/Base/CouponVersionQuery.php b/core/lib/Thelia/Model/Base/CouponVersionQuery.php new file mode 100644 index 000000000..2ea0e23d7 --- /dev/null +++ b/core/lib/Thelia/Model/Base/CouponVersionQuery.php @@ -0,0 +1,1084 @@ +setModelAlias($modelAlias); + } + if ($criteria instanceof Criteria) { + $query->mergeWith($criteria); + } + + return $query; + } + + /** + * Find object by primary key. + * Propel uses the instance pool to skip the database if the object exists. + * Go fast if the query is untouched. + * + * + * $obj = $c->findPk(array(12, 34), $con); + * + * + * @param array[$id, $version] $key Primary key to use for the query + * @param ConnectionInterface $con an optional connection object + * + * @return ChildCouponVersion|array|mixed the result, formatted by the current formatter + */ + public function findPk($key, $con = null) + { + if ($key === null) { + return null; + } + if ((null !== ($obj = CouponVersionTableMap::getInstanceFromPool(serialize(array((string) $key[0], (string) $key[1]))))) && !$this->formatter) { + // the object is already in the instance pool + return $obj; + } + if ($con === null) { + $con = Propel::getServiceContainer()->getReadConnection(CouponVersionTableMap::DATABASE_NAME); + } + $this->basePreSelect($con); + if ($this->formatter || $this->modelAlias || $this->with || $this->select + || $this->selectColumns || $this->asColumns || $this->selectModifiers + || $this->map || $this->having || $this->joins) { + return $this->findPkComplex($key, $con); + } else { + return $this->findPkSimple($key, $con); + } + } + + /** + * Find object by primary key using raw SQL to go fast. + * Bypass doSelect() and the object formatter by using generated code. + * + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object + * + * @return ChildCouponVersion A model object, or null if the key is not found + */ + protected function findPkSimple($key, $con) + { + $sql = 'SELECT ID, CODE, TYPE, TITLE, SHORT_DESCRIPTION, DESCRIPTION, AMOUNT, IS_USED, IS_ENABLED, EXPIRATION_DATE, SERIALIZED_RULES_TYPE, SERIALIZED_RULES_CONTENT, IS_CUMULATIVE, IS_REMOVING_POSTAGE, CREATED_AT, UPDATED_AT, VERSION FROM coupon_version WHERE ID = :p0 AND VERSION = :p1'; + try { + $stmt = $con->prepare($sql); + $stmt->bindValue(':p0', $key[0], PDO::PARAM_INT); + $stmt->bindValue(':p1', $key[1], PDO::PARAM_INT); + $stmt->execute(); + } catch (Exception $e) { + Propel::log($e->getMessage(), Propel::LOG_ERR); + throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), 0, $e); + } + $obj = null; + if ($row = $stmt->fetch(\PDO::FETCH_NUM)) { + $obj = new ChildCouponVersion(); + $obj->hydrate($row); + CouponVersionTableMap::addInstanceToPool($obj, serialize(array((string) $key[0], (string) $key[1]))); + } + $stmt->closeCursor(); + + return $obj; + } + + /** + * Find object by primary key. + * + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object + * + * @return ChildCouponVersion|array|mixed the result, formatted by the current formatter + */ + protected function findPkComplex($key, $con) + { + // As the query uses a PK condition, no limit(1) is necessary. + $criteria = $this->isKeepQuery() ? clone $this : $this; + $dataFetcher = $criteria + ->filterByPrimaryKey($key) + ->doSelect($con); + + return $criteria->getFormatter()->init($criteria)->formatOne($dataFetcher); + } + + /** + * Find objects by primary key + * + * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); + * + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object + * + * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter + */ + public function findPks($keys, $con = null) + { + if (null === $con) { + $con = Propel::getServiceContainer()->getReadConnection($this->getDbName()); + } + $this->basePreSelect($con); + $criteria = $this->isKeepQuery() ? clone $this : $this; + $dataFetcher = $criteria + ->filterByPrimaryKeys($keys) + ->doSelect($con); + + return $criteria->getFormatter()->init($criteria)->format($dataFetcher); + } + + /** + * Filter the query by primary key + * + * @param mixed $key Primary key to use for the query + * + * @return ChildCouponVersionQuery The current query, for fluid interface + */ + public function filterByPrimaryKey($key) + { + $this->addUsingAlias(CouponVersionTableMap::ID, $key[0], Criteria::EQUAL); + $this->addUsingAlias(CouponVersionTableMap::VERSION, $key[1], Criteria::EQUAL); + + return $this; + } + + /** + * Filter the query by a list of primary keys + * + * @param array $keys The list of primary key to use for the query + * + * @return ChildCouponVersionQuery The current query, for fluid interface + */ + public function filterByPrimaryKeys($keys) + { + if (empty($keys)) { + return $this->add(null, '1<>1', Criteria::CUSTOM); + } + foreach ($keys as $key) { + $cton0 = $this->getNewCriterion(CouponVersionTableMap::ID, $key[0], Criteria::EQUAL); + $cton1 = $this->getNewCriterion(CouponVersionTableMap::VERSION, $key[1], Criteria::EQUAL); + $cton0->addAnd($cton1); + $this->addOr($cton0); + } + + return $this; + } + + /** + * Filter the query on the id column + * + * Example usage: + * + * $query->filterById(1234); // WHERE id = 1234 + * $query->filterById(array(12, 34)); // WHERE id IN (12, 34) + * $query->filterById(array('min' => 12)); // WHERE id > 12 + * + * + * @see filterByCoupon() + * + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponVersionQuery The current query, for fluid interface + */ + public function filterById($id = null, $comparison = null) + { + if (is_array($id)) { + $useMinMax = false; + if (isset($id['min'])) { + $this->addUsingAlias(CouponVersionTableMap::ID, $id['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($id['max'])) { + $this->addUsingAlias(CouponVersionTableMap::ID, $id['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(CouponVersionTableMap::ID, $id, $comparison); + } + + /** + * Filter the query on the code column + * + * Example usage: + * + * $query->filterByCode('fooValue'); // WHERE code = 'fooValue' + * $query->filterByCode('%fooValue%'); // WHERE code LIKE '%fooValue%' + * + * + * @param string $code The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponVersionQuery The current query, for fluid interface + */ + public function filterByCode($code = null, $comparison = null) + { + if (null === $comparison) { + if (is_array($code)) { + $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $code)) { + $code = str_replace('*', '%', $code); + $comparison = Criteria::LIKE; + } + } + + return $this->addUsingAlias(CouponVersionTableMap::CODE, $code, $comparison); + } + + /** + * Filter the query on the type column + * + * Example usage: + * + * $query->filterByType('fooValue'); // WHERE type = 'fooValue' + * $query->filterByType('%fooValue%'); // WHERE type LIKE '%fooValue%' + * + * + * @param string $type The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponVersionQuery The current query, for fluid interface + */ + public function filterByType($type = null, $comparison = null) + { + if (null === $comparison) { + if (is_array($type)) { + $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $type)) { + $type = str_replace('*', '%', $type); + $comparison = Criteria::LIKE; + } + } + + return $this->addUsingAlias(CouponVersionTableMap::TYPE, $type, $comparison); + } + + /** + * Filter the query on the title column + * + * Example usage: + * + * $query->filterByTitle('fooValue'); // WHERE title = 'fooValue' + * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' + * + * + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponVersionQuery The current query, for fluid interface + */ + public function filterByTitle($title = null, $comparison = null) + { + if (null === $comparison) { + if (is_array($title)) { + $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $title)) { + $title = str_replace('*', '%', $title); + $comparison = Criteria::LIKE; + } + } + + return $this->addUsingAlias(CouponVersionTableMap::TITLE, $title, $comparison); + } + + /** + * Filter the query on the short_description column + * + * Example usage: + * + * $query->filterByShortDescription('fooValue'); // WHERE short_description = 'fooValue' + * $query->filterByShortDescription('%fooValue%'); // WHERE short_description LIKE '%fooValue%' + * + * + * @param string $shortDescription The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponVersionQuery The current query, for fluid interface + */ + public function filterByShortDescription($shortDescription = null, $comparison = null) + { + if (null === $comparison) { + if (is_array($shortDescription)) { + $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $shortDescription)) { + $shortDescription = str_replace('*', '%', $shortDescription); + $comparison = Criteria::LIKE; + } + } + + return $this->addUsingAlias(CouponVersionTableMap::SHORT_DESCRIPTION, $shortDescription, $comparison); + } + + /** + * Filter the query on the description column + * + * Example usage: + * + * $query->filterByDescription('fooValue'); // WHERE description = 'fooValue' + * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' + * + * + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponVersionQuery The current query, for fluid interface + */ + public function filterByDescription($description = null, $comparison = null) + { + if (null === $comparison) { + if (is_array($description)) { + $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $description)) { + $description = str_replace('*', '%', $description); + $comparison = Criteria::LIKE; + } + } + + return $this->addUsingAlias(CouponVersionTableMap::DESCRIPTION, $description, $comparison); + } + + /** + * Filter the query on the amount column + * + * Example usage: + * + * $query->filterByAmount(1234); // WHERE amount = 1234 + * $query->filterByAmount(array(12, 34)); // WHERE amount IN (12, 34) + * $query->filterByAmount(array('min' => 12)); // WHERE amount > 12 + * + * + * @param mixed $amount The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponVersionQuery The current query, for fluid interface + */ + public function filterByAmount($amount = null, $comparison = null) + { + if (is_array($amount)) { + $useMinMax = false; + if (isset($amount['min'])) { + $this->addUsingAlias(CouponVersionTableMap::AMOUNT, $amount['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($amount['max'])) { + $this->addUsingAlias(CouponVersionTableMap::AMOUNT, $amount['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(CouponVersionTableMap::AMOUNT, $amount, $comparison); + } + + /** + * Filter the query on the is_used column + * + * Example usage: + * + * $query->filterByIsUsed(1234); // WHERE is_used = 1234 + * $query->filterByIsUsed(array(12, 34)); // WHERE is_used IN (12, 34) + * $query->filterByIsUsed(array('min' => 12)); // WHERE is_used > 12 + * + * + * @param mixed $isUsed The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponVersionQuery The current query, for fluid interface + */ + public function filterByIsUsed($isUsed = null, $comparison = null) + { + if (is_array($isUsed)) { + $useMinMax = false; + if (isset($isUsed['min'])) { + $this->addUsingAlias(CouponVersionTableMap::IS_USED, $isUsed['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($isUsed['max'])) { + $this->addUsingAlias(CouponVersionTableMap::IS_USED, $isUsed['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(CouponVersionTableMap::IS_USED, $isUsed, $comparison); + } + + /** + * Filter the query on the is_enabled column + * + * Example usage: + * + * $query->filterByIsEnabled(1234); // WHERE is_enabled = 1234 + * $query->filterByIsEnabled(array(12, 34)); // WHERE is_enabled IN (12, 34) + * $query->filterByIsEnabled(array('min' => 12)); // WHERE is_enabled > 12 + * + * + * @param mixed $isEnabled The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponVersionQuery The current query, for fluid interface + */ + public function filterByIsEnabled($isEnabled = null, $comparison = null) + { + if (is_array($isEnabled)) { + $useMinMax = false; + if (isset($isEnabled['min'])) { + $this->addUsingAlias(CouponVersionTableMap::IS_ENABLED, $isEnabled['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($isEnabled['max'])) { + $this->addUsingAlias(CouponVersionTableMap::IS_ENABLED, $isEnabled['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(CouponVersionTableMap::IS_ENABLED, $isEnabled, $comparison); + } + + /** + * Filter the query on the expiration_date column + * + * Example usage: + * + * $query->filterByExpirationDate('2011-03-14'); // WHERE expiration_date = '2011-03-14' + * $query->filterByExpirationDate('now'); // WHERE expiration_date = '2011-03-14' + * $query->filterByExpirationDate(array('max' => 'yesterday')); // WHERE expiration_date > '2011-03-13' + * + * + * @param mixed $expirationDate The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponVersionQuery The current query, for fluid interface + */ + public function filterByExpirationDate($expirationDate = null, $comparison = null) + { + if (is_array($expirationDate)) { + $useMinMax = false; + if (isset($expirationDate['min'])) { + $this->addUsingAlias(CouponVersionTableMap::EXPIRATION_DATE, $expirationDate['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($expirationDate['max'])) { + $this->addUsingAlias(CouponVersionTableMap::EXPIRATION_DATE, $expirationDate['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(CouponVersionTableMap::EXPIRATION_DATE, $expirationDate, $comparison); + } + + /** + * Filter the query on the serialized_rules_type column + * + * Example usage: + * + * $query->filterBySerializedRulesType('fooValue'); // WHERE serialized_rules_type = 'fooValue' + * $query->filterBySerializedRulesType('%fooValue%'); // WHERE serialized_rules_type LIKE '%fooValue%' + * + * + * @param string $serializedRulesType The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponVersionQuery The current query, for fluid interface + */ + public function filterBySerializedRulesType($serializedRulesType = null, $comparison = null) + { + if (null === $comparison) { + if (is_array($serializedRulesType)) { + $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $serializedRulesType)) { + $serializedRulesType = str_replace('*', '%', $serializedRulesType); + $comparison = Criteria::LIKE; + } + } + + return $this->addUsingAlias(CouponVersionTableMap::SERIALIZED_RULES_TYPE, $serializedRulesType, $comparison); + } + + /** + * Filter the query on the serialized_rules_content column + * + * Example usage: + * + * $query->filterBySerializedRulesContent('fooValue'); // WHERE serialized_rules_content = 'fooValue' + * $query->filterBySerializedRulesContent('%fooValue%'); // WHERE serialized_rules_content LIKE '%fooValue%' + * + * + * @param string $serializedRulesContent The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponVersionQuery The current query, for fluid interface + */ + public function filterBySerializedRulesContent($serializedRulesContent = null, $comparison = null) + { + if (null === $comparison) { + if (is_array($serializedRulesContent)) { + $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $serializedRulesContent)) { + $serializedRulesContent = str_replace('*', '%', $serializedRulesContent); + $comparison = Criteria::LIKE; + } + } + + return $this->addUsingAlias(CouponVersionTableMap::SERIALIZED_RULES_CONTENT, $serializedRulesContent, $comparison); + } + + /** + * Filter the query on the is_cumulative column + * + * Example usage: + * + * $query->filterByIsCumulative(1234); // WHERE is_cumulative = 1234 + * $query->filterByIsCumulative(array(12, 34)); // WHERE is_cumulative IN (12, 34) + * $query->filterByIsCumulative(array('min' => 12)); // WHERE is_cumulative > 12 + * + * + * @param mixed $isCumulative The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponVersionQuery The current query, for fluid interface + */ + public function filterByIsCumulative($isCumulative = null, $comparison = null) + { + if (is_array($isCumulative)) { + $useMinMax = false; + if (isset($isCumulative['min'])) { + $this->addUsingAlias(CouponVersionTableMap::IS_CUMULATIVE, $isCumulative['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($isCumulative['max'])) { + $this->addUsingAlias(CouponVersionTableMap::IS_CUMULATIVE, $isCumulative['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(CouponVersionTableMap::IS_CUMULATIVE, $isCumulative, $comparison); + } + + /** + * Filter the query on the is_removing_postage column + * + * Example usage: + * + * $query->filterByIsRemovingPostage(1234); // WHERE is_removing_postage = 1234 + * $query->filterByIsRemovingPostage(array(12, 34)); // WHERE is_removing_postage IN (12, 34) + * $query->filterByIsRemovingPostage(array('min' => 12)); // WHERE is_removing_postage > 12 + * + * + * @param mixed $isRemovingPostage The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponVersionQuery The current query, for fluid interface + */ + public function filterByIsRemovingPostage($isRemovingPostage = null, $comparison = null) + { + if (is_array($isRemovingPostage)) { + $useMinMax = false; + if (isset($isRemovingPostage['min'])) { + $this->addUsingAlias(CouponVersionTableMap::IS_REMOVING_POSTAGE, $isRemovingPostage['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($isRemovingPostage['max'])) { + $this->addUsingAlias(CouponVersionTableMap::IS_REMOVING_POSTAGE, $isRemovingPostage['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(CouponVersionTableMap::IS_REMOVING_POSTAGE, $isRemovingPostage, $comparison); + } + + /** + * Filter the query on the created_at column + * + * Example usage: + * + * $query->filterByCreatedAt('2011-03-14'); // WHERE created_at = '2011-03-14' + * $query->filterByCreatedAt('now'); // WHERE created_at = '2011-03-14' + * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' + * + * + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponVersionQuery The current query, for fluid interface + */ + public function filterByCreatedAt($createdAt = null, $comparison = null) + { + if (is_array($createdAt)) { + $useMinMax = false; + if (isset($createdAt['min'])) { + $this->addUsingAlias(CouponVersionTableMap::CREATED_AT, $createdAt['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($createdAt['max'])) { + $this->addUsingAlias(CouponVersionTableMap::CREATED_AT, $createdAt['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(CouponVersionTableMap::CREATED_AT, $createdAt, $comparison); + } + + /** + * Filter the query on the updated_at column + * + * Example usage: + * + * $query->filterByUpdatedAt('2011-03-14'); // WHERE updated_at = '2011-03-14' + * $query->filterByUpdatedAt('now'); // WHERE updated_at = '2011-03-14' + * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' + * + * + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponVersionQuery The current query, for fluid interface + */ + public function filterByUpdatedAt($updatedAt = null, $comparison = null) + { + if (is_array($updatedAt)) { + $useMinMax = false; + if (isset($updatedAt['min'])) { + $this->addUsingAlias(CouponVersionTableMap::UPDATED_AT, $updatedAt['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($updatedAt['max'])) { + $this->addUsingAlias(CouponVersionTableMap::UPDATED_AT, $updatedAt['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(CouponVersionTableMap::UPDATED_AT, $updatedAt, $comparison); + } + + /** + * Filter the query on the version column + * + * Example usage: + * + * $query->filterByVersion(1234); // WHERE version = 1234 + * $query->filterByVersion(array(12, 34)); // WHERE version IN (12, 34) + * $query->filterByVersion(array('min' => 12)); // WHERE version > 12 + * + * + * @param mixed $version The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponVersionQuery The current query, for fluid interface + */ + public function filterByVersion($version = null, $comparison = null) + { + if (is_array($version)) { + $useMinMax = false; + if (isset($version['min'])) { + $this->addUsingAlias(CouponVersionTableMap::VERSION, $version['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($version['max'])) { + $this->addUsingAlias(CouponVersionTableMap::VERSION, $version['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(CouponVersionTableMap::VERSION, $version, $comparison); + } + + /** + * Filter the query by a related \Thelia\Model\Coupon object + * + * @param \Thelia\Model\Coupon|ObjectCollection $coupon The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponVersionQuery The current query, for fluid interface + */ + public function filterByCoupon($coupon, $comparison = null) + { + if ($coupon instanceof \Thelia\Model\Coupon) { + return $this + ->addUsingAlias(CouponVersionTableMap::ID, $coupon->getId(), $comparison); + } elseif ($coupon instanceof ObjectCollection) { + if (null === $comparison) { + $comparison = Criteria::IN; + } + + return $this + ->addUsingAlias(CouponVersionTableMap::ID, $coupon->toKeyValue('PrimaryKey', 'Id'), $comparison); + } else { + throw new PropelException('filterByCoupon() only accepts arguments of type \Thelia\Model\Coupon or Collection'); + } + } + + /** + * Adds a JOIN clause to the query using the Coupon relation + * + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return ChildCouponVersionQuery The current query, for fluid interface + */ + public function joinCoupon($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + $tableMap = $this->getTableMap(); + $relationMap = $tableMap->getRelation('Coupon'); + + // create a ModelJoin object for this join + $join = new ModelJoin(); + $join->setJoinType($joinType); + $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); + if ($previousJoin = $this->getPreviousJoin()) { + $join->setPreviousJoin($previousJoin); + } + + // add the ModelJoin to the current object + if ($relationAlias) { + $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); + $this->addJoinObject($join, $relationAlias); + } else { + $this->addJoinObject($join, 'Coupon'); + } + + return $this; + } + + /** + * Use the Coupon relation Coupon object + * + * @see useQuery() + * + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return \Thelia\Model\CouponQuery A secondary query class using the current class as primary query + */ + public function useCouponQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + return $this + ->joinCoupon($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'Coupon', '\Thelia\Model\CouponQuery'); + } + + /** + * Exclude object from result + * + * @param ChildCouponVersion $couponVersion Object to remove from the list of results + * + * @return ChildCouponVersionQuery The current query, for fluid interface + */ + public function prune($couponVersion = null) + { + if ($couponVersion) { + $this->addCond('pruneCond0', $this->getAliasedColName(CouponVersionTableMap::ID), $couponVersion->getId(), Criteria::NOT_EQUAL); + $this->addCond('pruneCond1', $this->getAliasedColName(CouponVersionTableMap::VERSION), $couponVersion->getVersion(), Criteria::NOT_EQUAL); + $this->combine(array('pruneCond0', 'pruneCond1'), Criteria::LOGICAL_OR); + } + + return $this; + } + + /** + * Deletes all rows from the coupon_version table. + * + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). + */ + public function doDeleteAll(ConnectionInterface $con = null) + { + if (null === $con) { + $con = Propel::getServiceContainer()->getWriteConnection(CouponVersionTableMap::DATABASE_NAME); + } + $affectedRows = 0; // initialize var to track total num of affected rows + try { + // use transaction because $criteria could contain info + // for more than one table or we could emulating ON DELETE CASCADE, etc. + $con->beginTransaction(); + $affectedRows += parent::doDeleteAll($con); + // Because this db requires some delete cascade/set null emulation, we have to + // clear the cached instance *after* the emulation has happened (since + // instances get re-added by the select statement contained therein). + CouponVersionTableMap::clearInstancePool(); + CouponVersionTableMap::clearRelatedInstancePool(); + + $con->commit(); + } catch (PropelException $e) { + $con->rollBack(); + throw $e; + } + + return $affectedRows; + } + + /** + * Performs a DELETE on the database, given a ChildCouponVersion or Criteria object OR a primary key value. + * + * @param mixed $values Criteria or ChildCouponVersion object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public function delete(ConnectionInterface $con = null) + { + if (null === $con) { + $con = Propel::getServiceContainer()->getWriteConnection(CouponVersionTableMap::DATABASE_NAME); + } + + $criteria = $this; + + // Set the correct dbName + $criteria->setDbName(CouponVersionTableMap::DATABASE_NAME); + + $affectedRows = 0; // initialize var to track total num of affected rows + + try { + // use transaction because $criteria could contain info + // for more than one table or we could emulating ON DELETE CASCADE, etc. + $con->beginTransaction(); + + + CouponVersionTableMap::removeInstanceFromPool($criteria); + + $affectedRows += ModelCriteria::delete($con); + CouponVersionTableMap::clearRelatedInstancePool(); + $con->commit(); + + return $affectedRows; + } catch (PropelException $e) { + $con->rollBack(); + throw $e; + } + } + +} // CouponVersionQuery diff --git a/core/lib/Thelia/Model/Base/Product.php b/core/lib/Thelia/Model/Base/Product.php index 905436e1f..707bd0904 100644 --- a/core/lib/Thelia/Model/Base/Product.php +++ b/core/lib/Thelia/Model/Base/Product.php @@ -23,11 +23,11 @@ use Thelia\Model\CartItem as ChildCartItem; use Thelia\Model\CartItemQuery as ChildCartItemQuery; use Thelia\Model\Category as ChildCategory; use Thelia\Model\CategoryQuery as ChildCategoryQuery; -use Thelia\Model\ContentAssoc as ChildContentAssoc; -use Thelia\Model\ContentAssocQuery as ChildContentAssocQuery; use Thelia\Model\FeatureProduct as ChildFeatureProduct; use Thelia\Model\FeatureProductQuery as ChildFeatureProductQuery; use Thelia\Model\Product as ChildProduct; +use Thelia\Model\ProductAssociatedContent as ChildProductAssociatedContent; +use Thelia\Model\ProductAssociatedContentQuery as ChildProductAssociatedContentQuery; use Thelia\Model\ProductCategory as ChildProductCategory; use Thelia\Model\ProductCategoryQuery as ChildProductCategoryQuery; use Thelia\Model\ProductDocument as ChildProductDocument; @@ -167,12 +167,6 @@ abstract class Product implements ActiveRecordInterface protected $collProductSaleElementss; protected $collProductSaleElementssPartial; - /** - * @var ObjectCollection|ChildContentAssoc[] Collection to store aggregation of ChildContentAssoc objects. - */ - protected $collContentAssocs; - protected $collContentAssocsPartial; - /** * @var ObjectCollection|ChildProductImage[] Collection to store aggregation of ChildProductImage objects. */ @@ -209,6 +203,12 @@ abstract class Product implements ActiveRecordInterface protected $collCartItems; protected $collCartItemsPartial; + /** + * @var ObjectCollection|ChildProductAssociatedContent[] Collection to store aggregation of ChildProductAssociatedContent objects. + */ + protected $collProductAssociatedContents; + protected $collProductAssociatedContentsPartial; + /** * @var ObjectCollection|ChildProductI18n[] Collection to store aggregation of ChildProductI18n objects. */ @@ -302,12 +302,6 @@ abstract class Product implements ActiveRecordInterface */ protected $productSaleElementssScheduledForDeletion = null; - /** - * An array of objects scheduled for deletion. - * @var ObjectCollection - */ - protected $contentAssocsScheduledForDeletion = null; - /** * An array of objects scheduled for deletion. * @var ObjectCollection @@ -344,6 +338,12 @@ abstract class Product implements ActiveRecordInterface */ protected $cartItemsScheduledForDeletion = null; + /** + * An array of objects scheduled for deletion. + * @var ObjectCollection + */ + protected $productAssociatedContentsScheduledForDeletion = null; + /** * An array of objects scheduled for deletion. * @var ObjectCollection @@ -1137,8 +1137,6 @@ abstract class Product implements ActiveRecordInterface $this->collProductSaleElementss = null; - $this->collContentAssocs = null; - $this->collProductImages = null; $this->collProductDocuments = null; @@ -1151,6 +1149,8 @@ abstract class Product implements ActiveRecordInterface $this->collCartItems = null; + $this->collProductAssociatedContents = null; + $this->collProductI18ns = null; $this->collProductVersions = null; @@ -1447,23 +1447,6 @@ abstract class Product implements ActiveRecordInterface } } - if ($this->contentAssocsScheduledForDeletion !== null) { - if (!$this->contentAssocsScheduledForDeletion->isEmpty()) { - \Thelia\Model\ContentAssocQuery::create() - ->filterByPrimaryKeys($this->contentAssocsScheduledForDeletion->getPrimaryKeys(false)) - ->delete($con); - $this->contentAssocsScheduledForDeletion = null; - } - } - - if ($this->collContentAssocs !== null) { - foreach ($this->collContentAssocs as $referrerFK) { - if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) { - $affectedRows += $referrerFK->save($con); - } - } - } - if ($this->productImagesScheduledForDeletion !== null) { if (!$this->productImagesScheduledForDeletion->isEmpty()) { \Thelia\Model\ProductImageQuery::create() @@ -1566,6 +1549,23 @@ abstract class Product implements ActiveRecordInterface } } + if ($this->productAssociatedContentsScheduledForDeletion !== null) { + if (!$this->productAssociatedContentsScheduledForDeletion->isEmpty()) { + \Thelia\Model\ProductAssociatedContentQuery::create() + ->filterByPrimaryKeys($this->productAssociatedContentsScheduledForDeletion->getPrimaryKeys(false)) + ->delete($con); + $this->productAssociatedContentsScheduledForDeletion = null; + } + } + + if ($this->collProductAssociatedContents !== null) { + foreach ($this->collProductAssociatedContents as $referrerFK) { + if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) { + $affectedRows += $referrerFK->save($con); + } + } + } + if ($this->productI18nsScheduledForDeletion !== null) { if (!$this->productI18nsScheduledForDeletion->isEmpty()) { \Thelia\Model\ProductI18nQuery::create() @@ -1848,9 +1848,6 @@ abstract class Product implements ActiveRecordInterface if (null !== $this->collProductSaleElementss) { $result['ProductSaleElementss'] = $this->collProductSaleElementss->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } - if (null !== $this->collContentAssocs) { - $result['ContentAssocs'] = $this->collContentAssocs->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); - } if (null !== $this->collProductImages) { $result['ProductImages'] = $this->collProductImages->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } @@ -1869,6 +1866,9 @@ abstract class Product implements ActiveRecordInterface if (null !== $this->collCartItems) { $result['CartItems'] = $this->collCartItems->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } + if (null !== $this->collProductAssociatedContents) { + $result['ProductAssociatedContents'] = $this->collProductAssociatedContents->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); + } if (null !== $this->collProductI18ns) { $result['ProductI18ns'] = $this->collProductI18ns->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } @@ -2090,12 +2090,6 @@ abstract class Product implements ActiveRecordInterface } } - foreach ($this->getContentAssocs() as $relObj) { - if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves - $copyObj->addContentAssoc($relObj->copy($deepCopy)); - } - } - foreach ($this->getProductImages() as $relObj) { if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves $copyObj->addProductImage($relObj->copy($deepCopy)); @@ -2132,6 +2126,12 @@ abstract class Product implements ActiveRecordInterface } } + foreach ($this->getProductAssociatedContents() as $relObj) { + if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves + $copyObj->addProductAssociatedContent($relObj->copy($deepCopy)); + } + } + foreach ($this->getProductI18ns() as $relObj) { if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves $copyObj->addProductI18n($relObj->copy($deepCopy)); @@ -2245,9 +2245,6 @@ abstract class Product implements ActiveRecordInterface if ('ProductSaleElements' == $relationName) { return $this->initProductSaleElementss(); } - if ('ContentAssoc' == $relationName) { - return $this->initContentAssocs(); - } if ('ProductImage' == $relationName) { return $this->initProductImages(); } @@ -2266,6 +2263,9 @@ abstract class Product implements ActiveRecordInterface if ('CartItem' == $relationName) { return $this->initCartItems(); } + if ('ProductAssociatedContent' == $relationName) { + return $this->initProductAssociatedContents(); + } if ('ProductI18n' == $relationName) { return $this->initProductI18ns(); } @@ -3006,274 +3006,6 @@ abstract class Product implements ActiveRecordInterface return $this; } - /** - * Clears out the collContentAssocs collection - * - * This does not modify the database; however, it will remove any associated objects, causing - * them to be refetched by subsequent calls to accessor method. - * - * @return void - * @see addContentAssocs() - */ - public function clearContentAssocs() - { - $this->collContentAssocs = null; // important to set this to NULL since that means it is uninitialized - } - - /** - * Reset is the collContentAssocs collection loaded partially. - */ - public function resetPartialContentAssocs($v = true) - { - $this->collContentAssocsPartial = $v; - } - - /** - * Initializes the collContentAssocs collection. - * - * By default this just sets the collContentAssocs collection to an empty array (like clearcollContentAssocs()); - * however, you may wish to override this method in your stub class to provide setting appropriate - * to your application -- for example, setting the initial array to the values stored in database. - * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty - * - * @return void - */ - public function initContentAssocs($overrideExisting = true) - { - if (null !== $this->collContentAssocs && !$overrideExisting) { - return; - } - $this->collContentAssocs = new ObjectCollection(); - $this->collContentAssocs->setModel('\Thelia\Model\ContentAssoc'); - } - - /** - * Gets an array of ChildContentAssoc objects which contain a foreign key that references this object. - * - * If the $criteria is not null, it is used to always fetch the results from the database. - * Otherwise the results are fetched from the database the first time, then cached. - * Next time the same method is called without $criteria, the cached collection is returned. - * If this ChildProduct is new, it will return - * an empty collection or the current collection; the criteria is ignored on a new object. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @return Collection|ChildContentAssoc[] List of ChildContentAssoc objects - * @throws PropelException - */ - public function getContentAssocs($criteria = null, ConnectionInterface $con = null) - { - $partial = $this->collContentAssocsPartial && !$this->isNew(); - if (null === $this->collContentAssocs || null !== $criteria || $partial) { - if ($this->isNew() && null === $this->collContentAssocs) { - // return empty collection - $this->initContentAssocs(); - } else { - $collContentAssocs = ChildContentAssocQuery::create(null, $criteria) - ->filterByProduct($this) - ->find($con); - - if (null !== $criteria) { - if (false !== $this->collContentAssocsPartial && count($collContentAssocs)) { - $this->initContentAssocs(false); - - foreach ($collContentAssocs as $obj) { - if (false == $this->collContentAssocs->contains($obj)) { - $this->collContentAssocs->append($obj); - } - } - - $this->collContentAssocsPartial = true; - } - - $collContentAssocs->getInternalIterator()->rewind(); - - return $collContentAssocs; - } - - if ($partial && $this->collContentAssocs) { - foreach ($this->collContentAssocs as $obj) { - if ($obj->isNew()) { - $collContentAssocs[] = $obj; - } - } - } - - $this->collContentAssocs = $collContentAssocs; - $this->collContentAssocsPartial = false; - } - } - - return $this->collContentAssocs; - } - - /** - * Sets a collection of ContentAssoc objects related by a one-to-many relationship - * to the current object. - * It will also schedule objects for deletion based on a diff between old objects (aka persisted) - * and new objects from the given Propel collection. - * - * @param Collection $contentAssocs A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildProduct The current object (for fluent API support) - */ - public function setContentAssocs(Collection $contentAssocs, ConnectionInterface $con = null) - { - $contentAssocsToDelete = $this->getContentAssocs(new Criteria(), $con)->diff($contentAssocs); - - - $this->contentAssocsScheduledForDeletion = $contentAssocsToDelete; - - foreach ($contentAssocsToDelete as $contentAssocRemoved) { - $contentAssocRemoved->setProduct(null); - } - - $this->collContentAssocs = null; - foreach ($contentAssocs as $contentAssoc) { - $this->addContentAssoc($contentAssoc); - } - - $this->collContentAssocs = $contentAssocs; - $this->collContentAssocsPartial = false; - - return $this; - } - - /** - * Returns the number of related ContentAssoc objects. - * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related ContentAssoc objects. - * @throws PropelException - */ - public function countContentAssocs(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) - { - $partial = $this->collContentAssocsPartial && !$this->isNew(); - if (null === $this->collContentAssocs || null !== $criteria || $partial) { - if ($this->isNew() && null === $this->collContentAssocs) { - return 0; - } - - if ($partial && !$criteria) { - return count($this->getContentAssocs()); - } - - $query = ChildContentAssocQuery::create(null, $criteria); - if ($distinct) { - $query->distinct(); - } - - return $query - ->filterByProduct($this) - ->count($con); - } - - return count($this->collContentAssocs); - } - - /** - * Method called to associate a ChildContentAssoc object to this object - * through the ChildContentAssoc foreign key attribute. - * - * @param ChildContentAssoc $l ChildContentAssoc - * @return \Thelia\Model\Product The current object (for fluent API support) - */ - public function addContentAssoc(ChildContentAssoc $l) - { - if ($this->collContentAssocs === null) { - $this->initContentAssocs(); - $this->collContentAssocsPartial = true; - } - - if (!in_array($l, $this->collContentAssocs->getArrayCopy(), true)) { // only add it if the **same** object is not already associated - $this->doAddContentAssoc($l); - } - - return $this; - } - - /** - * @param ContentAssoc $contentAssoc The contentAssoc object to add. - */ - protected function doAddContentAssoc($contentAssoc) - { - $this->collContentAssocs[]= $contentAssoc; - $contentAssoc->setProduct($this); - } - - /** - * @param ContentAssoc $contentAssoc The contentAssoc object to remove. - * @return ChildProduct The current object (for fluent API support) - */ - public function removeContentAssoc($contentAssoc) - { - if ($this->getContentAssocs()->contains($contentAssoc)) { - $this->collContentAssocs->remove($this->collContentAssocs->search($contentAssoc)); - if (null === $this->contentAssocsScheduledForDeletion) { - $this->contentAssocsScheduledForDeletion = clone $this->collContentAssocs; - $this->contentAssocsScheduledForDeletion->clear(); - } - $this->contentAssocsScheduledForDeletion[]= $contentAssoc; - $contentAssoc->setProduct(null); - } - - return $this; - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Product is new, it will return - * an empty collection; or if this Product has previously - * been saved, it will retrieve related ContentAssocs from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Product. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildContentAssoc[] List of ChildContentAssoc objects - */ - public function getContentAssocsJoinCategory($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildContentAssocQuery::create(null, $criteria); - $query->joinWith('Category', $joinBehavior); - - return $this->getContentAssocs($query, $con); - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Product is new, it will return - * an empty collection; or if this Product has previously - * been saved, it will retrieve related ContentAssocs from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Product. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildContentAssoc[] List of ChildContentAssoc objects - */ - public function getContentAssocsJoinContent($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildContentAssocQuery::create(null, $criteria); - $query->joinWith('Content', $joinBehavior); - - return $this->getContentAssocs($query, $con); - } - /** * Clears out the collProductImages collection * @@ -4707,6 +4439,249 @@ abstract class Product implements ActiveRecordInterface return $this->getCartItems($query, $con); } + /** + * Clears out the collProductAssociatedContents collection + * + * This does not modify the database; however, it will remove any associated objects, causing + * them to be refetched by subsequent calls to accessor method. + * + * @return void + * @see addProductAssociatedContents() + */ + public function clearProductAssociatedContents() + { + $this->collProductAssociatedContents = null; // important to set this to NULL since that means it is uninitialized + } + + /** + * Reset is the collProductAssociatedContents collection loaded partially. + */ + public function resetPartialProductAssociatedContents($v = true) + { + $this->collProductAssociatedContentsPartial = $v; + } + + /** + * Initializes the collProductAssociatedContents collection. + * + * By default this just sets the collProductAssociatedContents collection to an empty array (like clearcollProductAssociatedContents()); + * however, you may wish to override this method in your stub class to provide setting appropriate + * to your application -- for example, setting the initial array to the values stored in database. + * + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty + * + * @return void + */ + public function initProductAssociatedContents($overrideExisting = true) + { + if (null !== $this->collProductAssociatedContents && !$overrideExisting) { + return; + } + $this->collProductAssociatedContents = new ObjectCollection(); + $this->collProductAssociatedContents->setModel('\Thelia\Model\ProductAssociatedContent'); + } + + /** + * Gets an array of ChildProductAssociatedContent objects which contain a foreign key that references this object. + * + * If the $criteria is not null, it is used to always fetch the results from the database. + * Otherwise the results are fetched from the database the first time, then cached. + * Next time the same method is called without $criteria, the cached collection is returned. + * If this ChildProduct is new, it will return + * an empty collection or the current collection; the criteria is ignored on a new object. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @return Collection|ChildProductAssociatedContent[] List of ChildProductAssociatedContent objects + * @throws PropelException + */ + public function getProductAssociatedContents($criteria = null, ConnectionInterface $con = null) + { + $partial = $this->collProductAssociatedContentsPartial && !$this->isNew(); + if (null === $this->collProductAssociatedContents || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collProductAssociatedContents) { + // return empty collection + $this->initProductAssociatedContents(); + } else { + $collProductAssociatedContents = ChildProductAssociatedContentQuery::create(null, $criteria) + ->filterByProduct($this) + ->find($con); + + if (null !== $criteria) { + if (false !== $this->collProductAssociatedContentsPartial && count($collProductAssociatedContents)) { + $this->initProductAssociatedContents(false); + + foreach ($collProductAssociatedContents as $obj) { + if (false == $this->collProductAssociatedContents->contains($obj)) { + $this->collProductAssociatedContents->append($obj); + } + } + + $this->collProductAssociatedContentsPartial = true; + } + + $collProductAssociatedContents->getInternalIterator()->rewind(); + + return $collProductAssociatedContents; + } + + if ($partial && $this->collProductAssociatedContents) { + foreach ($this->collProductAssociatedContents as $obj) { + if ($obj->isNew()) { + $collProductAssociatedContents[] = $obj; + } + } + } + + $this->collProductAssociatedContents = $collProductAssociatedContents; + $this->collProductAssociatedContentsPartial = false; + } + } + + return $this->collProductAssociatedContents; + } + + /** + * Sets a collection of ProductAssociatedContent objects related by a one-to-many relationship + * to the current object. + * It will also schedule objects for deletion based on a diff between old objects (aka persisted) + * and new objects from the given Propel collection. + * + * @param Collection $productAssociatedContents A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildProduct The current object (for fluent API support) + */ + public function setProductAssociatedContents(Collection $productAssociatedContents, ConnectionInterface $con = null) + { + $productAssociatedContentsToDelete = $this->getProductAssociatedContents(new Criteria(), $con)->diff($productAssociatedContents); + + + $this->productAssociatedContentsScheduledForDeletion = $productAssociatedContentsToDelete; + + foreach ($productAssociatedContentsToDelete as $productAssociatedContentRemoved) { + $productAssociatedContentRemoved->setProduct(null); + } + + $this->collProductAssociatedContents = null; + foreach ($productAssociatedContents as $productAssociatedContent) { + $this->addProductAssociatedContent($productAssociatedContent); + } + + $this->collProductAssociatedContents = $productAssociatedContents; + $this->collProductAssociatedContentsPartial = false; + + return $this; + } + + /** + * Returns the number of related ProductAssociatedContent objects. + * + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related ProductAssociatedContent objects. + * @throws PropelException + */ + public function countProductAssociatedContents(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) + { + $partial = $this->collProductAssociatedContentsPartial && !$this->isNew(); + if (null === $this->collProductAssociatedContents || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collProductAssociatedContents) { + return 0; + } + + if ($partial && !$criteria) { + return count($this->getProductAssociatedContents()); + } + + $query = ChildProductAssociatedContentQuery::create(null, $criteria); + if ($distinct) { + $query->distinct(); + } + + return $query + ->filterByProduct($this) + ->count($con); + } + + return count($this->collProductAssociatedContents); + } + + /** + * Method called to associate a ChildProductAssociatedContent object to this object + * through the ChildProductAssociatedContent foreign key attribute. + * + * @param ChildProductAssociatedContent $l ChildProductAssociatedContent + * @return \Thelia\Model\Product The current object (for fluent API support) + */ + public function addProductAssociatedContent(ChildProductAssociatedContent $l) + { + if ($this->collProductAssociatedContents === null) { + $this->initProductAssociatedContents(); + $this->collProductAssociatedContentsPartial = true; + } + + if (!in_array($l, $this->collProductAssociatedContents->getArrayCopy(), true)) { // only add it if the **same** object is not already associated + $this->doAddProductAssociatedContent($l); + } + + return $this; + } + + /** + * @param ProductAssociatedContent $productAssociatedContent The productAssociatedContent object to add. + */ + protected function doAddProductAssociatedContent($productAssociatedContent) + { + $this->collProductAssociatedContents[]= $productAssociatedContent; + $productAssociatedContent->setProduct($this); + } + + /** + * @param ProductAssociatedContent $productAssociatedContent The productAssociatedContent object to remove. + * @return ChildProduct The current object (for fluent API support) + */ + public function removeProductAssociatedContent($productAssociatedContent) + { + if ($this->getProductAssociatedContents()->contains($productAssociatedContent)) { + $this->collProductAssociatedContents->remove($this->collProductAssociatedContents->search($productAssociatedContent)); + if (null === $this->productAssociatedContentsScheduledForDeletion) { + $this->productAssociatedContentsScheduledForDeletion = clone $this->collProductAssociatedContents; + $this->productAssociatedContentsScheduledForDeletion->clear(); + } + $this->productAssociatedContentsScheduledForDeletion[]= clone $productAssociatedContent; + $productAssociatedContent->setProduct(null); + } + + return $this; + } + + + /** + * If this collection has already been initialized with + * an identical criteria, it returns the collection. + * Otherwise if this Product is new, it will return + * an empty collection; or if this Product has previously + * been saved, it will retrieve related ProductAssociatedContents from storage. + * + * This method is protected by default in order to keep the public + * api reasonable. You can provide public methods for those you + * actually need in Product. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @return Collection|ChildProductAssociatedContent[] List of ChildProductAssociatedContent objects + */ + public function getProductAssociatedContentsJoinContent($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) + { + $query = ChildProductAssociatedContentQuery::create(null, $criteria); + $query->joinWith('Content', $joinBehavior); + + return $this->getProductAssociatedContents($query, $con); + } + /** * Clears out the collProductI18ns collection * @@ -5752,11 +5727,6 @@ abstract class Product implements ActiveRecordInterface $o->clearAllReferences($deep); } } - if ($this->collContentAssocs) { - foreach ($this->collContentAssocs as $o) { - $o->clearAllReferences($deep); - } - } if ($this->collProductImages) { foreach ($this->collProductImages as $o) { $o->clearAllReferences($deep); @@ -5787,6 +5757,11 @@ abstract class Product implements ActiveRecordInterface $o->clearAllReferences($deep); } } + if ($this->collProductAssociatedContents) { + foreach ($this->collProductAssociatedContents as $o) { + $o->clearAllReferences($deep); + } + } if ($this->collProductI18ns) { foreach ($this->collProductI18ns as $o) { $o->clearAllReferences($deep); @@ -5830,10 +5805,6 @@ abstract class Product implements ActiveRecordInterface $this->collProductSaleElementss->clearIterator(); } $this->collProductSaleElementss = null; - if ($this->collContentAssocs instanceof Collection) { - $this->collContentAssocs->clearIterator(); - } - $this->collContentAssocs = null; if ($this->collProductImages instanceof Collection) { $this->collProductImages->clearIterator(); } @@ -5858,6 +5829,10 @@ abstract class Product implements ActiveRecordInterface $this->collCartItems->clearIterator(); } $this->collCartItems = null; + if ($this->collProductAssociatedContents instanceof Collection) { + $this->collProductAssociatedContents->clearIterator(); + } + $this->collProductAssociatedContents = null; if ($this->collProductI18ns instanceof Collection) { $this->collProductI18ns->clearIterator(); } diff --git a/core/lib/Thelia/Model/Base/ProductAssociatedContent.php b/core/lib/Thelia/Model/Base/ProductAssociatedContent.php new file mode 100644 index 000000000..6dce2b2c3 --- /dev/null +++ b/core/lib/Thelia/Model/Base/ProductAssociatedContent.php @@ -0,0 +1,1553 @@ +modifiedColumns); + } + + /** + * Has specified column been modified? + * + * @param string $col column fully qualified name (TableMap::TYPE_COLNAME), e.g. Book::AUTHOR_ID + * @return boolean True if $col has been modified. + */ + public function isColumnModified($col) + { + return in_array($col, $this->modifiedColumns); + } + + /** + * Get the columns that have been modified in this object. + * @return array A unique list of the modified column names for this object. + */ + public function getModifiedColumns() + { + return array_unique($this->modifiedColumns); + } + + /** + * Returns whether the object has ever been saved. This will + * be false, if the object was retrieved from storage or was created + * and then saved. + * + * @return true, if the object has never been persisted. + */ + public function isNew() + { + return $this->new; + } + + /** + * Setter for the isNew attribute. This method will be called + * by Propel-generated children and objects. + * + * @param boolean $b the state of the object. + */ + public function setNew($b) + { + $this->new = (Boolean) $b; + } + + /** + * Whether this object has been deleted. + * @return boolean The deleted state of this object. + */ + public function isDeleted() + { + return $this->deleted; + } + + /** + * Specify whether this object has been deleted. + * @param boolean $b The deleted state of this object. + * @return void + */ + public function setDeleted($b) + { + $this->deleted = (Boolean) $b; + } + + /** + * Sets the modified state for the object to be false. + * @param string $col If supplied, only the specified column is reset. + * @return void + */ + public function resetModified($col = null) + { + if (null !== $col) { + while (false !== ($offset = array_search($col, $this->modifiedColumns))) { + array_splice($this->modifiedColumns, $offset, 1); + } + } else { + $this->modifiedColumns = array(); + } + } + + /** + * Compares this with another ProductAssociatedContent instance. If + * obj is an instance of ProductAssociatedContent, delegates to + * equals(ProductAssociatedContent). Otherwise, returns false. + * + * @param obj The object to compare to. + * @return Whether equal to the object specified. + */ + public function equals($obj) + { + $thisclazz = get_class($this); + if (!is_object($obj) || !($obj instanceof $thisclazz)) { + return false; + } + + if ($this === $obj) { + return true; + } + + if (null === $this->getPrimaryKey() + || null === $obj->getPrimaryKey()) { + return false; + } + + return $this->getPrimaryKey() === $obj->getPrimaryKey(); + } + + /** + * If the primary key is not null, return the hashcode of the + * primary key. Otherwise, return the hash code of the object. + * + * @return int Hashcode + */ + public function hashCode() + { + if (null !== $this->getPrimaryKey()) { + return crc32(serialize($this->getPrimaryKey())); + } + + return crc32(serialize(clone $this)); + } + + /** + * Get the associative array of the virtual columns in this object + * + * @param string $name The virtual column name + * + * @return array + */ + public function getVirtualColumns() + { + return $this->virtualColumns; + } + + /** + * Checks the existence of a virtual column in this object + * + * @return boolean + */ + public function hasVirtualColumn($name) + { + return isset($this->virtualColumns[$name]); + } + + /** + * Get the value of a virtual column in this object + * + * @return mixed + */ + public function getVirtualColumn($name) + { + if (!$this->hasVirtualColumn($name)) { + throw new PropelException(sprintf('Cannot get value of inexistent virtual column %s.', $name)); + } + + return $this->virtualColumns[$name]; + } + + /** + * Set the value of a virtual column in this object + * + * @param string $name The virtual column name + * @param mixed $value The value to give to the virtual column + * + * @return ProductAssociatedContent The current object, for fluid interface + */ + public function setVirtualColumn($name, $value) + { + $this->virtualColumns[$name] = $value; + + return $this; + } + + /** + * Logs a message using Propel::log(). + * + * @param string $msg + * @param int $priority One of the Propel::LOG_* logging levels + * @return boolean + */ + protected function log($msg, $priority = Propel::LOG_INFO) + { + return Propel::log(get_class($this) . ': ' . $msg, $priority); + } + + /** + * Populate the current object from a string, using a given parser format + * + * $book = new Book(); + * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); + * + * + * @param mixed $parser A AbstractParser instance, + * or a format name ('XML', 'YAML', 'JSON', 'CSV') + * @param string $data The source data to import from + * + * @return ProductAssociatedContent The current object, for fluid interface + */ + public function importFrom($parser, $data) + { + if (!$parser instanceof AbstractParser) { + $parser = AbstractParser::getParser($parser); + } + + return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); + } + + /** + * Export the current object properties to a string, using a given parser format + * + * $book = BookQuery::create()->findPk(9012); + * echo $book->exportTo('JSON'); + * => {"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); + * + * + * @param mixed $parser A AbstractParser instance, or a format name ('XML', 'YAML', 'JSON', 'CSV') + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy load(ed) columns. Defaults to TRUE. + * @return string The exported data + */ + public function exportTo($parser, $includeLazyLoadColumns = true) + { + if (!$parser instanceof AbstractParser) { + $parser = AbstractParser::getParser($parser); + } + + return $parser->fromArray($this->toArray(TableMap::TYPE_PHPNAME, $includeLazyLoadColumns, array(), true)); + } + + /** + * Clean up internal collections prior to serializing + * Avoids recursive loops that turn into segmentation faults when serializing + */ + public function __sleep() + { + $this->clearAllReferences(); + + return array_keys(get_object_vars($this)); + } + + /** + * Get the [id] column value. + * + * @return int + */ + public function getId() + { + + return $this->id; + } + + /** + * Get the [product_id] column value. + * + * @return int + */ + public function getProductId() + { + + return $this->product_id; + } + + /** + * Get the [content_id] column value. + * + * @return int + */ + public function getContentId() + { + + return $this->content_id; + } + + /** + * Get the [position] column value. + * + * @return int + */ + public function getPosition() + { + + return $this->position; + } + + /** + * Get the [optionally formatted] temporal [created_at] column value. + * + * + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. + * + * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 + * + * @throws PropelException - if unable to parse/validate the date/time value. + */ + public function getCreatedAt($format = NULL) + { + if ($format === null) { + return $this->created_at; + } else { + return $this->created_at !== null ? $this->created_at->format($format) : null; + } + } + + /** + * Get the [optionally formatted] temporal [updated_at] column value. + * + * + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is NULL, then the raw \DateTime object will be returned. + * + * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 + * + * @throws PropelException - if unable to parse/validate the date/time value. + */ + public function getUpdatedAt($format = NULL) + { + if ($format === null) { + return $this->updated_at; + } else { + return $this->updated_at !== null ? $this->updated_at->format($format) : null; + } + } + + /** + * Set the value of [id] column. + * + * @param int $v new value + * @return \Thelia\Model\ProductAssociatedContent The current object (for fluent API support) + */ + public function setId($v) + { + if ($v !== null) { + $v = (int) $v; + } + + if ($this->id !== $v) { + $this->id = $v; + $this->modifiedColumns[] = ProductAssociatedContentTableMap::ID; + } + + + return $this; + } // setId() + + /** + * Set the value of [product_id] column. + * + * @param int $v new value + * @return \Thelia\Model\ProductAssociatedContent The current object (for fluent API support) + */ + public function setProductId($v) + { + if ($v !== null) { + $v = (int) $v; + } + + if ($this->product_id !== $v) { + $this->product_id = $v; + $this->modifiedColumns[] = ProductAssociatedContentTableMap::PRODUCT_ID; + } + + if ($this->aProduct !== null && $this->aProduct->getId() !== $v) { + $this->aProduct = null; + } + + + return $this; + } // setProductId() + + /** + * Set the value of [content_id] column. + * + * @param int $v new value + * @return \Thelia\Model\ProductAssociatedContent The current object (for fluent API support) + */ + public function setContentId($v) + { + if ($v !== null) { + $v = (int) $v; + } + + if ($this->content_id !== $v) { + $this->content_id = $v; + $this->modifiedColumns[] = ProductAssociatedContentTableMap::CONTENT_ID; + } + + if ($this->aContent !== null && $this->aContent->getId() !== $v) { + $this->aContent = null; + } + + + return $this; + } // setContentId() + + /** + * Set the value of [position] column. + * + * @param int $v new value + * @return \Thelia\Model\ProductAssociatedContent The current object (for fluent API support) + */ + public function setPosition($v) + { + if ($v !== null) { + $v = (int) $v; + } + + if ($this->position !== $v) { + $this->position = $v; + $this->modifiedColumns[] = ProductAssociatedContentTableMap::POSITION; + } + + + return $this; + } // setPosition() + + /** + * Sets the value of [created_at] column to a normalized version of the date/time value specified. + * + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ProductAssociatedContent The current object (for fluent API support) + */ + public function setCreatedAt($v) + { + $dt = PropelDateTime::newInstance($v, null, '\DateTime'); + if ($this->created_at !== null || $dt !== null) { + if ($dt !== $this->created_at) { + $this->created_at = $dt; + $this->modifiedColumns[] = ProductAssociatedContentTableMap::CREATED_AT; + } + } // if either are not null + + + return $this; + } // setCreatedAt() + + /** + * Sets the value of [updated_at] column to a normalized version of the date/time value specified. + * + * @param mixed $v string, integer (timestamp), or \DateTime value. + * Empty strings are treated as NULL. + * @return \Thelia\Model\ProductAssociatedContent The current object (for fluent API support) + */ + public function setUpdatedAt($v) + { + $dt = PropelDateTime::newInstance($v, null, '\DateTime'); + if ($this->updated_at !== null || $dt !== null) { + if ($dt !== $this->updated_at) { + $this->updated_at = $dt; + $this->modifiedColumns[] = ProductAssociatedContentTableMap::UPDATED_AT; + } + } // if either are not null + + + return $this; + } // setUpdatedAt() + + /** + * Indicates whether the columns in this object are only set to default values. + * + * This method can be used in conjunction with isModified() to indicate whether an object is both + * modified _and_ has some values set which are non-default. + * + * @return boolean Whether the columns in this object are only been set with default values. + */ + public function hasOnlyDefaultValues() + { + // otherwise, everything was equal, so return TRUE + return true; + } // hasOnlyDefaultValues() + + /** + * Hydrates (populates) the object variables with values from the database resultset. + * + * An offset (0-based "start column") is specified so that objects can be hydrated + * with a subset of the columns in the resultset rows. This is needed, for example, + * for results of JOIN queries where the resultset row includes columns from two or + * more tables. + * + * @param array $row The row returned by DataFetcher->fetch(). + * @param int $startcol 0-based offset column which indicates which restultset column to start with. + * @param boolean $rehydrate Whether this object is being re-hydrated from the database. + * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType(). + One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * + * @return int next starting column + * @throws PropelException - Any caught Exception will be rewrapped as a PropelException. + */ + public function hydrate($row, $startcol = 0, $rehydrate = false, $indexType = TableMap::TYPE_NUM) + { + try { + + + $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : ProductAssociatedContentTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; + $this->id = (null !== $col) ? (int) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : ProductAssociatedContentTableMap::translateFieldName('ProductId', TableMap::TYPE_PHPNAME, $indexType)]; + $this->product_id = (null !== $col) ? (int) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : ProductAssociatedContentTableMap::translateFieldName('ContentId', TableMap::TYPE_PHPNAME, $indexType)]; + $this->content_id = (null !== $col) ? (int) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : ProductAssociatedContentTableMap::translateFieldName('Position', TableMap::TYPE_PHPNAME, $indexType)]; + $this->position = (null !== $col) ? (int) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : ProductAssociatedContentTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + if ($col === '0000-00-00 00:00:00') { + $col = null; + } + $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : ProductAssociatedContentTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + if ($col === '0000-00-00 00:00:00') { + $col = null; + } + $this->updated_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; + $this->resetModified(); + + $this->setNew(false); + + if ($rehydrate) { + $this->ensureConsistency(); + } + + return $startcol + 6; // 6 = ProductAssociatedContentTableMap::NUM_HYDRATE_COLUMNS. + + } catch (Exception $e) { + throw new PropelException("Error populating \Thelia\Model\ProductAssociatedContent object", 0, $e); + } + } + + /** + * Checks and repairs the internal consistency of the object. + * + * This method is executed after an already-instantiated object is re-hydrated + * from the database. It exists to check any foreign keys to make sure that + * the objects related to the current object are correct based on foreign key. + * + * You can override this method in the stub class, but you should always invoke + * the base method from the overridden method (i.e. parent::ensureConsistency()), + * in case your model changes. + * + * @throws PropelException + */ + public function ensureConsistency() + { + if ($this->aProduct !== null && $this->product_id !== $this->aProduct->getId()) { + $this->aProduct = null; + } + if ($this->aContent !== null && $this->content_id !== $this->aContent->getId()) { + $this->aContent = null; + } + } // ensureConsistency + + /** + * Reloads this object from datastore based on primary key and (optionally) resets all associated objects. + * + * This will only work if the object has been saved and has a valid primary key set. + * + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. + * @return void + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + */ + public function reload($deep = false, ConnectionInterface $con = null) + { + if ($this->isDeleted()) { + throw new PropelException("Cannot reload a deleted object."); + } + + if ($this->isNew()) { + throw new PropelException("Cannot reload an unsaved object."); + } + + if ($con === null) { + $con = Propel::getServiceContainer()->getReadConnection(ProductAssociatedContentTableMap::DATABASE_NAME); + } + + // We don't need to alter the object instance pool; we're just modifying this instance + // already in the pool. + + $dataFetcher = ChildProductAssociatedContentQuery::create(null, $this->buildPkeyCriteria())->setFormatter(ModelCriteria::FORMAT_STATEMENT)->find($con); + $row = $dataFetcher->fetch(); + $dataFetcher->close(); + if (!$row) { + throw new PropelException('Cannot find matching row in the database to reload object values.'); + } + $this->hydrate($row, 0, true, $dataFetcher->getIndexType()); // rehydrate + + if ($deep) { // also de-associate any related objects? + + $this->aProduct = null; + $this->aContent = null; + } // if (deep) + } + + /** + * Removes this object from datastore and sets delete attribute. + * + * @param ConnectionInterface $con + * @return void + * @throws PropelException + * @see ProductAssociatedContent::setDeleted() + * @see ProductAssociatedContent::isDeleted() + */ + public function delete(ConnectionInterface $con = null) + { + if ($this->isDeleted()) { + throw new PropelException("This object has already been deleted."); + } + + if ($con === null) { + $con = Propel::getServiceContainer()->getWriteConnection(ProductAssociatedContentTableMap::DATABASE_NAME); + } + + $con->beginTransaction(); + try { + $deleteQuery = ChildProductAssociatedContentQuery::create() + ->filterByPrimaryKey($this->getPrimaryKey()); + $ret = $this->preDelete($con); + if ($ret) { + $deleteQuery->delete($con); + $this->postDelete($con); + $con->commit(); + $this->setDeleted(true); + } else { + $con->commit(); + } + } catch (Exception $e) { + $con->rollBack(); + throw $e; + } + } + + /** + * Persists this object to the database. + * + * If the object is new, it inserts it; otherwise an update is performed. + * All modified related objects will also be persisted in the doSave() + * method. This method wraps all precipitate database operations in a + * single transaction. + * + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @throws PropelException + * @see doSave() + */ + public function save(ConnectionInterface $con = null) + { + if ($this->isDeleted()) { + throw new PropelException("You cannot save an object that has been deleted."); + } + + if ($con === null) { + $con = Propel::getServiceContainer()->getWriteConnection(ProductAssociatedContentTableMap::DATABASE_NAME); + } + + $con->beginTransaction(); + $isInsert = $this->isNew(); + try { + $ret = $this->preSave($con); + if ($isInsert) { + $ret = $ret && $this->preInsert($con); + // timestampable behavior + if (!$this->isColumnModified(ProductAssociatedContentTableMap::CREATED_AT)) { + $this->setCreatedAt(time()); + } + if (!$this->isColumnModified(ProductAssociatedContentTableMap::UPDATED_AT)) { + $this->setUpdatedAt(time()); + } + } else { + $ret = $ret && $this->preUpdate($con); + // timestampable behavior + if ($this->isModified() && !$this->isColumnModified(ProductAssociatedContentTableMap::UPDATED_AT)) { + $this->setUpdatedAt(time()); + } + } + if ($ret) { + $affectedRows = $this->doSave($con); + if ($isInsert) { + $this->postInsert($con); + } else { + $this->postUpdate($con); + } + $this->postSave($con); + ProductAssociatedContentTableMap::addInstanceToPool($this); + } else { + $affectedRows = 0; + } + $con->commit(); + + return $affectedRows; + } catch (Exception $e) { + $con->rollBack(); + throw $e; + } + } + + /** + * Performs the work of inserting or updating the row in the database. + * + * If the object is new, it inserts it; otherwise an update is performed. + * All related objects are also updated in this method. + * + * @param ConnectionInterface $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @throws PropelException + * @see save() + */ + protected function doSave(ConnectionInterface $con) + { + $affectedRows = 0; // initialize var to track total num of affected rows + if (!$this->alreadyInSave) { + $this->alreadyInSave = true; + + // We call the save method on the following object(s) if they + // were passed to this object by their corresponding set + // method. This object relates to these object(s) by a + // foreign key reference. + + if ($this->aProduct !== null) { + if ($this->aProduct->isModified() || $this->aProduct->isNew()) { + $affectedRows += $this->aProduct->save($con); + } + $this->setProduct($this->aProduct); + } + + if ($this->aContent !== null) { + if ($this->aContent->isModified() || $this->aContent->isNew()) { + $affectedRows += $this->aContent->save($con); + } + $this->setContent($this->aContent); + } + + if ($this->isNew() || $this->isModified()) { + // persist changes + if ($this->isNew()) { + $this->doInsert($con); + } else { + $this->doUpdate($con); + } + $affectedRows += 1; + $this->resetModified(); + } + + $this->alreadyInSave = false; + + } + + return $affectedRows; + } // doSave() + + /** + * Insert the row in the database. + * + * @param ConnectionInterface $con + * + * @throws PropelException + * @see doSave() + */ + protected function doInsert(ConnectionInterface $con) + { + $modifiedColumns = array(); + $index = 0; + + $this->modifiedColumns[] = ProductAssociatedContentTableMap::ID; + if (null !== $this->id) { + throw new PropelException('Cannot insert a value for auto-increment primary key (' . ProductAssociatedContentTableMap::ID . ')'); + } + + // check the columns in natural order for more readable SQL queries + if ($this->isColumnModified(ProductAssociatedContentTableMap::ID)) { + $modifiedColumns[':p' . $index++] = 'ID'; + } + if ($this->isColumnModified(ProductAssociatedContentTableMap::PRODUCT_ID)) { + $modifiedColumns[':p' . $index++] = 'PRODUCT_ID'; + } + if ($this->isColumnModified(ProductAssociatedContentTableMap::CONTENT_ID)) { + $modifiedColumns[':p' . $index++] = 'CONTENT_ID'; + } + if ($this->isColumnModified(ProductAssociatedContentTableMap::POSITION)) { + $modifiedColumns[':p' . $index++] = 'POSITION'; + } + if ($this->isColumnModified(ProductAssociatedContentTableMap::CREATED_AT)) { + $modifiedColumns[':p' . $index++] = 'CREATED_AT'; + } + if ($this->isColumnModified(ProductAssociatedContentTableMap::UPDATED_AT)) { + $modifiedColumns[':p' . $index++] = 'UPDATED_AT'; + } + + $sql = sprintf( + 'INSERT INTO product_associated_content (%s) VALUES (%s)', + implode(', ', $modifiedColumns), + implode(', ', array_keys($modifiedColumns)) + ); + + try { + $stmt = $con->prepare($sql); + foreach ($modifiedColumns as $identifier => $columnName) { + switch ($columnName) { + case 'ID': + $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT); + break; + case 'PRODUCT_ID': + $stmt->bindValue($identifier, $this->product_id, PDO::PARAM_INT); + break; + case 'CONTENT_ID': + $stmt->bindValue($identifier, $this->content_id, PDO::PARAM_INT); + break; + case 'POSITION': + $stmt->bindValue($identifier, $this->position, PDO::PARAM_INT); + break; + case 'CREATED_AT': + $stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); + break; + case 'UPDATED_AT': + $stmt->bindValue($identifier, $this->updated_at ? $this->updated_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); + break; + } + } + $stmt->execute(); + } catch (Exception $e) { + Propel::log($e->getMessage(), Propel::LOG_ERR); + throw new PropelException(sprintf('Unable to execute INSERT statement [%s]', $sql), 0, $e); + } + + try { + $pk = $con->lastInsertId(); + } catch (Exception $e) { + throw new PropelException('Unable to get autoincrement id.', 0, $e); + } + $this->setId($pk); + + $this->setNew(false); + } + + /** + * Update the row in the database. + * + * @param ConnectionInterface $con + * + * @return Integer Number of updated rows + * @see doSave() + */ + protected function doUpdate(ConnectionInterface $con) + { + $selectCriteria = $this->buildPkeyCriteria(); + $valuesCriteria = $this->buildCriteria(); + + return $selectCriteria->doUpdate($valuesCriteria, $con); + } + + /** + * Retrieves a field from the object by name passed in as a string. + * + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return mixed Value of field. + */ + public function getByName($name, $type = TableMap::TYPE_PHPNAME) + { + $pos = ProductAssociatedContentTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM); + $field = $this->getByPosition($pos); + + return $field; + } + + /** + * Retrieves a field from the object by Position as specified in the xml schema. + * Zero-based. + * + * @param int $pos position in xml schema + * @return mixed Value of field at $pos + */ + public function getByPosition($pos) + { + switch ($pos) { + case 0: + return $this->getId(); + break; + case 1: + return $this->getProductId(); + break; + case 2: + return $this->getContentId(); + break; + case 3: + return $this->getPosition(); + break; + case 4: + return $this->getCreatedAt(); + break; + case 5: + return $this->getUpdatedAt(); + break; + default: + return null; + break; + } // switch() + } + + /** + * Exports the object as an array. + * + * You can specify the key type of the array by passing one of the class + * type constants. + * + * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * + * @return array an associative array containing the field names (as keys) and field values + */ + public function toArray($keyType = TableMap::TYPE_PHPNAME, $includeLazyLoadColumns = true, $alreadyDumpedObjects = array(), $includeForeignObjects = false) + { + if (isset($alreadyDumpedObjects['ProductAssociatedContent'][$this->getPrimaryKey()])) { + return '*RECURSION*'; + } + $alreadyDumpedObjects['ProductAssociatedContent'][$this->getPrimaryKey()] = true; + $keys = ProductAssociatedContentTableMap::getFieldNames($keyType); + $result = array( + $keys[0] => $this->getId(), + $keys[1] => $this->getProductId(), + $keys[2] => $this->getContentId(), + $keys[3] => $this->getPosition(), + $keys[4] => $this->getCreatedAt(), + $keys[5] => $this->getUpdatedAt(), + ); + $virtualColumns = $this->virtualColumns; + foreach($virtualColumns as $key => $virtualColumn) + { + $result[$key] = $virtualColumn; + } + + if ($includeForeignObjects) { + if (null !== $this->aProduct) { + $result['Product'] = $this->aProduct->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); + } + if (null !== $this->aContent) { + $result['Content'] = $this->aContent->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); + } + } + + return $result; + } + + /** + * Sets a field from the object by name passed in as a string. + * + * @param string $name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * Defaults to TableMap::TYPE_PHPNAME. + * @return void + */ + public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) + { + $pos = ProductAssociatedContentTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM); + + return $this->setByPosition($pos, $value); + } + + /** + * Sets a field from the object by Position as specified in the xml schema. + * Zero-based. + * + * @param int $pos position in xml schema + * @param mixed $value field value + * @return void + */ + public function setByPosition($pos, $value) + { + switch ($pos) { + case 0: + $this->setId($value); + break; + case 1: + $this->setProductId($value); + break; + case 2: + $this->setContentId($value); + break; + case 3: + $this->setPosition($value); + break; + case 4: + $this->setCreatedAt($value); + break; + case 5: + $this->setUpdatedAt($value); + break; + } // switch() + } + + /** + * Populates the object using an array. + * + * This is particularly useful when populating an object from one of the + * request arrays (e.g. $_POST). This method goes through the column + * names, checking to see whether a matching key exists in populated + * array. If so the setByName() method is called for that column. + * + * You can specify the key type of the array by additionally passing one + * of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * The default key type is the column's TableMap::TYPE_PHPNAME. + * + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. + * @return void + */ + public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) + { + $keys = ProductAssociatedContentTableMap::getFieldNames($keyType); + + if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]); + if (array_key_exists($keys[1], $arr)) $this->setProductId($arr[$keys[1]]); + if (array_key_exists($keys[2], $arr)) $this->setContentId($arr[$keys[2]]); + if (array_key_exists($keys[3], $arr)) $this->setPosition($arr[$keys[3]]); + if (array_key_exists($keys[4], $arr)) $this->setCreatedAt($arr[$keys[4]]); + if (array_key_exists($keys[5], $arr)) $this->setUpdatedAt($arr[$keys[5]]); + } + + /** + * Build a Criteria object containing the values of all modified columns in this object. + * + * @return Criteria The Criteria object containing all modified values. + */ + public function buildCriteria() + { + $criteria = new Criteria(ProductAssociatedContentTableMap::DATABASE_NAME); + + if ($this->isColumnModified(ProductAssociatedContentTableMap::ID)) $criteria->add(ProductAssociatedContentTableMap::ID, $this->id); + if ($this->isColumnModified(ProductAssociatedContentTableMap::PRODUCT_ID)) $criteria->add(ProductAssociatedContentTableMap::PRODUCT_ID, $this->product_id); + if ($this->isColumnModified(ProductAssociatedContentTableMap::CONTENT_ID)) $criteria->add(ProductAssociatedContentTableMap::CONTENT_ID, $this->content_id); + if ($this->isColumnModified(ProductAssociatedContentTableMap::POSITION)) $criteria->add(ProductAssociatedContentTableMap::POSITION, $this->position); + if ($this->isColumnModified(ProductAssociatedContentTableMap::CREATED_AT)) $criteria->add(ProductAssociatedContentTableMap::CREATED_AT, $this->created_at); + if ($this->isColumnModified(ProductAssociatedContentTableMap::UPDATED_AT)) $criteria->add(ProductAssociatedContentTableMap::UPDATED_AT, $this->updated_at); + + return $criteria; + } + + /** + * Builds a Criteria object containing the primary key for this object. + * + * Unlike buildCriteria() this method includes the primary key values regardless + * of whether or not they have been modified. + * + * @return Criteria The Criteria object containing value(s) for primary key(s). + */ + public function buildPkeyCriteria() + { + $criteria = new Criteria(ProductAssociatedContentTableMap::DATABASE_NAME); + $criteria->add(ProductAssociatedContentTableMap::ID, $this->id); + + return $criteria; + } + + /** + * Returns the primary key for this object (row). + * @return int + */ + public function getPrimaryKey() + { + return $this->getId(); + } + + /** + * Generic method to set the primary key (id column). + * + * @param int $key Primary key. + * @return void + */ + public function setPrimaryKey($key) + { + $this->setId($key); + } + + /** + * Returns true if the primary key for this object is null. + * @return boolean + */ + public function isPrimaryKeyNull() + { + + return null === $this->getId(); + } + + /** + * Sets contents of passed object to values from current object. + * + * If desired, this method can also make copies of all associated (fkey referrers) + * objects. + * + * @param object $copyObj An object of \Thelia\Model\ProductAssociatedContent (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @throws PropelException + */ + public function copyInto($copyObj, $deepCopy = false, $makeNew = true) + { + $copyObj->setProductId($this->getProductId()); + $copyObj->setContentId($this->getContentId()); + $copyObj->setPosition($this->getPosition()); + $copyObj->setCreatedAt($this->getCreatedAt()); + $copyObj->setUpdatedAt($this->getUpdatedAt()); + if ($makeNew) { + $copyObj->setNew(true); + $copyObj->setId(NULL); // this is a auto-increment column, so set to default value + } + } + + /** + * Makes a copy of this object that will be inserted as a new row in table when saved. + * It creates a new object filling in the simple attributes, but skipping any primary + * keys that are defined for the table. + * + * If desired, this method can also make copies of all associated (fkey referrers) + * objects. + * + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return \Thelia\Model\ProductAssociatedContent Clone of current object. + * @throws PropelException + */ + public function copy($deepCopy = false) + { + // we use get_class(), because this might be a subclass + $clazz = get_class($this); + $copyObj = new $clazz(); + $this->copyInto($copyObj, $deepCopy); + + return $copyObj; + } + + /** + * Declares an association between this object and a ChildProduct object. + * + * @param ChildProduct $v + * @return \Thelia\Model\ProductAssociatedContent The current object (for fluent API support) + * @throws PropelException + */ + public function setProduct(ChildProduct $v = null) + { + if ($v === null) { + $this->setProductId(NULL); + } else { + $this->setProductId($v->getId()); + } + + $this->aProduct = $v; + + // Add binding for other direction of this n:n relationship. + // If this object has already been added to the ChildProduct object, it will not be re-added. + if ($v !== null) { + $v->addProductAssociatedContent($this); + } + + + return $this; + } + + + /** + * Get the associated ChildProduct object + * + * @param ConnectionInterface $con Optional Connection object. + * @return ChildProduct The associated ChildProduct object. + * @throws PropelException + */ + public function getProduct(ConnectionInterface $con = null) + { + if ($this->aProduct === null && ($this->product_id !== null)) { + $this->aProduct = ChildProductQuery::create()->findPk($this->product_id, $con); + /* The following can be used additionally to + guarantee the related object contains a reference + to this object. This level of coupling may, however, be + undesirable since it could result in an only partially populated collection + in the referenced object. + $this->aProduct->addProductAssociatedContents($this); + */ + } + + return $this->aProduct; + } + + /** + * Declares an association between this object and a ChildContent object. + * + * @param ChildContent $v + * @return \Thelia\Model\ProductAssociatedContent The current object (for fluent API support) + * @throws PropelException + */ + public function setContent(ChildContent $v = null) + { + if ($v === null) { + $this->setContentId(NULL); + } else { + $this->setContentId($v->getId()); + } + + $this->aContent = $v; + + // Add binding for other direction of this n:n relationship. + // If this object has already been added to the ChildContent object, it will not be re-added. + if ($v !== null) { + $v->addProductAssociatedContent($this); + } + + + return $this; + } + + + /** + * Get the associated ChildContent object + * + * @param ConnectionInterface $con Optional Connection object. + * @return ChildContent The associated ChildContent object. + * @throws PropelException + */ + public function getContent(ConnectionInterface $con = null) + { + if ($this->aContent === null && ($this->content_id !== null)) { + $this->aContent = ChildContentQuery::create()->findPk($this->content_id, $con); + /* The following can be used additionally to + guarantee the related object contains a reference + to this object. This level of coupling may, however, be + undesirable since it could result in an only partially populated collection + in the referenced object. + $this->aContent->addProductAssociatedContents($this); + */ + } + + return $this->aContent; + } + + /** + * Clears the current object and sets all attributes to their default values + */ + public function clear() + { + $this->id = null; + $this->product_id = null; + $this->content_id = null; + $this->position = null; + $this->created_at = null; + $this->updated_at = null; + $this->alreadyInSave = false; + $this->clearAllReferences(); + $this->resetModified(); + $this->setNew(true); + $this->setDeleted(false); + } + + /** + * Resets all references to other model objects or collections of model objects. + * + * This method is a user-space workaround for PHP's inability to garbage collect + * objects with circular references (even in PHP 5.3). This is currently necessary + * when using Propel in certain daemon or large-volume/high-memory operations. + * + * @param boolean $deep Whether to also clear the references on all referrer objects. + */ + public function clearAllReferences($deep = false) + { + if ($deep) { + } // if ($deep) + + $this->aProduct = null; + $this->aContent = null; + } + + /** + * Return the string representation of this object + * + * @return string + */ + public function __toString() + { + return (string) $this->exportTo(ProductAssociatedContentTableMap::DEFAULT_STRING_FORMAT); + } + + // timestampable behavior + + /** + * Mark the current object so that the update date doesn't get updated during next save + * + * @return ChildProductAssociatedContent The current object (for fluent API support) + */ + public function keepUpdateDateUnchanged() + { + $this->modifiedColumns[] = ProductAssociatedContentTableMap::UPDATED_AT; + + return $this; + } + + /** + * Code to be run before persisting the object + * @param ConnectionInterface $con + * @return boolean + */ + public function preSave(ConnectionInterface $con = null) + { + return true; + } + + /** + * Code to be run after persisting the object + * @param ConnectionInterface $con + */ + public function postSave(ConnectionInterface $con = null) + { + + } + + /** + * Code to be run before inserting to database + * @param ConnectionInterface $con + * @return boolean + */ + public function preInsert(ConnectionInterface $con = null) + { + return true; + } + + /** + * Code to be run after inserting to database + * @param ConnectionInterface $con + */ + public function postInsert(ConnectionInterface $con = null) + { + + } + + /** + * Code to be run before updating the object in database + * @param ConnectionInterface $con + * @return boolean + */ + public function preUpdate(ConnectionInterface $con = null) + { + return true; + } + + /** + * Code to be run after updating the object in database + * @param ConnectionInterface $con + */ + public function postUpdate(ConnectionInterface $con = null) + { + + } + + /** + * Code to be run before deleting the object in database + * @param ConnectionInterface $con + * @return boolean + */ + public function preDelete(ConnectionInterface $con = null) + { + return true; + } + + /** + * Code to be run after deleting the object in database + * @param ConnectionInterface $con + */ + public function postDelete(ConnectionInterface $con = null) + { + + } + + + /** + * Derived method to catches calls to undefined methods. + * + * Provides magic import/export method support (fromXML()/toXML(), fromYAML()/toYAML(), etc.). + * Allows to define default __call() behavior if you overwrite __call() + * + * @param string $name + * @param mixed $params + * + * @return array|string + */ + public function __call($name, $params) + { + if (0 === strpos($name, 'get')) { + $virtualColumn = substr($name, 3); + if ($this->hasVirtualColumn($virtualColumn)) { + return $this->getVirtualColumn($virtualColumn); + } + + $virtualColumn = lcfirst($virtualColumn); + if ($this->hasVirtualColumn($virtualColumn)) { + return $this->getVirtualColumn($virtualColumn); + } + } + + if (0 === strpos($name, 'from')) { + $format = substr($name, 4); + + return $this->importFrom($format, reset($params)); + } + + if (0 === strpos($name, 'to')) { + $format = substr($name, 2); + $includeLazyLoadColumns = isset($params[0]) ? $params[0] : true; + + return $this->exportTo($format, $includeLazyLoadColumns); + } + + throw new BadMethodCallException(sprintf('Call to undefined method: %s.', $name)); + } + +} diff --git a/core/lib/Thelia/Model/Base/ProductAssociatedContentQuery.php b/core/lib/Thelia/Model/Base/ProductAssociatedContentQuery.php new file mode 100644 index 000000000..d387f40ed --- /dev/null +++ b/core/lib/Thelia/Model/Base/ProductAssociatedContentQuery.php @@ -0,0 +1,804 @@ +setModelAlias($modelAlias); + } + if ($criteria instanceof Criteria) { + $query->mergeWith($criteria); + } + + return $query; + } + + /** + * Find object by primary key. + * Propel uses the instance pool to skip the database if the object exists. + * Go fast if the query is untouched. + * + * + * $obj = $c->findPk(12, $con); + * + * + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con an optional connection object + * + * @return ChildProductAssociatedContent|array|mixed the result, formatted by the current formatter + */ + public function findPk($key, $con = null) + { + if ($key === null) { + return null; + } + if ((null !== ($obj = ProductAssociatedContentTableMap::getInstanceFromPool((string) $key))) && !$this->formatter) { + // the object is already in the instance pool + return $obj; + } + if ($con === null) { + $con = Propel::getServiceContainer()->getReadConnection(ProductAssociatedContentTableMap::DATABASE_NAME); + } + $this->basePreSelect($con); + if ($this->formatter || $this->modelAlias || $this->with || $this->select + || $this->selectColumns || $this->asColumns || $this->selectModifiers + || $this->map || $this->having || $this->joins) { + return $this->findPkComplex($key, $con); + } else { + return $this->findPkSimple($key, $con); + } + } + + /** + * Find object by primary key using raw SQL to go fast. + * Bypass doSelect() and the object formatter by using generated code. + * + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object + * + * @return ChildProductAssociatedContent A model object, or null if the key is not found + */ + protected function findPkSimple($key, $con) + { + $sql = 'SELECT ID, PRODUCT_ID, CONTENT_ID, POSITION, CREATED_AT, UPDATED_AT FROM product_associated_content WHERE ID = :p0'; + try { + $stmt = $con->prepare($sql); + $stmt->bindValue(':p0', $key, PDO::PARAM_INT); + $stmt->execute(); + } catch (Exception $e) { + Propel::log($e->getMessage(), Propel::LOG_ERR); + throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), 0, $e); + } + $obj = null; + if ($row = $stmt->fetch(\PDO::FETCH_NUM)) { + $obj = new ChildProductAssociatedContent(); + $obj->hydrate($row); + ProductAssociatedContentTableMap::addInstanceToPool($obj, (string) $key); + } + $stmt->closeCursor(); + + return $obj; + } + + /** + * Find object by primary key. + * + * @param mixed $key Primary key to use for the query + * @param ConnectionInterface $con A connection object + * + * @return ChildProductAssociatedContent|array|mixed the result, formatted by the current formatter + */ + protected function findPkComplex($key, $con) + { + // As the query uses a PK condition, no limit(1) is necessary. + $criteria = $this->isKeepQuery() ? clone $this : $this; + $dataFetcher = $criteria + ->filterByPrimaryKey($key) + ->doSelect($con); + + return $criteria->getFormatter()->init($criteria)->formatOne($dataFetcher); + } + + /** + * Find objects by primary key + * + * $objs = $c->findPks(array(12, 56, 832), $con); + * + * @param array $keys Primary keys to use for the query + * @param ConnectionInterface $con an optional connection object + * + * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter + */ + public function findPks($keys, $con = null) + { + if (null === $con) { + $con = Propel::getServiceContainer()->getReadConnection($this->getDbName()); + } + $this->basePreSelect($con); + $criteria = $this->isKeepQuery() ? clone $this : $this; + $dataFetcher = $criteria + ->filterByPrimaryKeys($keys) + ->doSelect($con); + + return $criteria->getFormatter()->init($criteria)->format($dataFetcher); + } + + /** + * Filter the query by primary key + * + * @param mixed $key Primary key to use for the query + * + * @return ChildProductAssociatedContentQuery The current query, for fluid interface + */ + public function filterByPrimaryKey($key) + { + + return $this->addUsingAlias(ProductAssociatedContentTableMap::ID, $key, Criteria::EQUAL); + } + + /** + * Filter the query by a list of primary keys + * + * @param array $keys The list of primary key to use for the query + * + * @return ChildProductAssociatedContentQuery The current query, for fluid interface + */ + public function filterByPrimaryKeys($keys) + { + + return $this->addUsingAlias(ProductAssociatedContentTableMap::ID, $keys, Criteria::IN); + } + + /** + * Filter the query on the id column + * + * Example usage: + * + * $query->filterById(1234); // WHERE id = 1234 + * $query->filterById(array(12, 34)); // WHERE id IN (12, 34) + * $query->filterById(array('min' => 12)); // WHERE id > 12 + * + * + * @param mixed $id The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildProductAssociatedContentQuery The current query, for fluid interface + */ + public function filterById($id = null, $comparison = null) + { + if (is_array($id)) { + $useMinMax = false; + if (isset($id['min'])) { + $this->addUsingAlias(ProductAssociatedContentTableMap::ID, $id['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($id['max'])) { + $this->addUsingAlias(ProductAssociatedContentTableMap::ID, $id['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(ProductAssociatedContentTableMap::ID, $id, $comparison); + } + + /** + * Filter the query on the product_id column + * + * Example usage: + * + * $query->filterByProductId(1234); // WHERE product_id = 1234 + * $query->filterByProductId(array(12, 34)); // WHERE product_id IN (12, 34) + * $query->filterByProductId(array('min' => 12)); // WHERE product_id > 12 + * + * + * @see filterByProduct() + * + * @param mixed $productId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildProductAssociatedContentQuery The current query, for fluid interface + */ + public function filterByProductId($productId = null, $comparison = null) + { + if (is_array($productId)) { + $useMinMax = false; + if (isset($productId['min'])) { + $this->addUsingAlias(ProductAssociatedContentTableMap::PRODUCT_ID, $productId['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($productId['max'])) { + $this->addUsingAlias(ProductAssociatedContentTableMap::PRODUCT_ID, $productId['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(ProductAssociatedContentTableMap::PRODUCT_ID, $productId, $comparison); + } + + /** + * Filter the query on the content_id column + * + * Example usage: + * + * $query->filterByContentId(1234); // WHERE content_id = 1234 + * $query->filterByContentId(array(12, 34)); // WHERE content_id IN (12, 34) + * $query->filterByContentId(array('min' => 12)); // WHERE content_id > 12 + * + * + * @see filterByContent() + * + * @param mixed $contentId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildProductAssociatedContentQuery The current query, for fluid interface + */ + public function filterByContentId($contentId = null, $comparison = null) + { + if (is_array($contentId)) { + $useMinMax = false; + if (isset($contentId['min'])) { + $this->addUsingAlias(ProductAssociatedContentTableMap::CONTENT_ID, $contentId['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($contentId['max'])) { + $this->addUsingAlias(ProductAssociatedContentTableMap::CONTENT_ID, $contentId['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(ProductAssociatedContentTableMap::CONTENT_ID, $contentId, $comparison); + } + + /** + * Filter the query on the position column + * + * Example usage: + * + * $query->filterByPosition(1234); // WHERE position = 1234 + * $query->filterByPosition(array(12, 34)); // WHERE position IN (12, 34) + * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 + * + * + * @param mixed $position The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildProductAssociatedContentQuery The current query, for fluid interface + */ + public function filterByPosition($position = null, $comparison = null) + { + if (is_array($position)) { + $useMinMax = false; + if (isset($position['min'])) { + $this->addUsingAlias(ProductAssociatedContentTableMap::POSITION, $position['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($position['max'])) { + $this->addUsingAlias(ProductAssociatedContentTableMap::POSITION, $position['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(ProductAssociatedContentTableMap::POSITION, $position, $comparison); + } + + /** + * Filter the query on the created_at column + * + * Example usage: + * + * $query->filterByCreatedAt('2011-03-14'); // WHERE created_at = '2011-03-14' + * $query->filterByCreatedAt('now'); // WHERE created_at = '2011-03-14' + * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' + * + * + * @param mixed $createdAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildProductAssociatedContentQuery The current query, for fluid interface + */ + public function filterByCreatedAt($createdAt = null, $comparison = null) + { + if (is_array($createdAt)) { + $useMinMax = false; + if (isset($createdAt['min'])) { + $this->addUsingAlias(ProductAssociatedContentTableMap::CREATED_AT, $createdAt['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($createdAt['max'])) { + $this->addUsingAlias(ProductAssociatedContentTableMap::CREATED_AT, $createdAt['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(ProductAssociatedContentTableMap::CREATED_AT, $createdAt, $comparison); + } + + /** + * Filter the query on the updated_at column + * + * Example usage: + * + * $query->filterByUpdatedAt('2011-03-14'); // WHERE updated_at = '2011-03-14' + * $query->filterByUpdatedAt('now'); // WHERE updated_at = '2011-03-14' + * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' + * + * + * @param mixed $updatedAt The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildProductAssociatedContentQuery The current query, for fluid interface + */ + public function filterByUpdatedAt($updatedAt = null, $comparison = null) + { + if (is_array($updatedAt)) { + $useMinMax = false; + if (isset($updatedAt['min'])) { + $this->addUsingAlias(ProductAssociatedContentTableMap::UPDATED_AT, $updatedAt['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($updatedAt['max'])) { + $this->addUsingAlias(ProductAssociatedContentTableMap::UPDATED_AT, $updatedAt['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(ProductAssociatedContentTableMap::UPDATED_AT, $updatedAt, $comparison); + } + + /** + * Filter the query by a related \Thelia\Model\Product object + * + * @param \Thelia\Model\Product|ObjectCollection $product The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildProductAssociatedContentQuery The current query, for fluid interface + */ + public function filterByProduct($product, $comparison = null) + { + if ($product instanceof \Thelia\Model\Product) { + return $this + ->addUsingAlias(ProductAssociatedContentTableMap::PRODUCT_ID, $product->getId(), $comparison); + } elseif ($product instanceof ObjectCollection) { + if (null === $comparison) { + $comparison = Criteria::IN; + } + + return $this + ->addUsingAlias(ProductAssociatedContentTableMap::PRODUCT_ID, $product->toKeyValue('PrimaryKey', 'Id'), $comparison); + } else { + throw new PropelException('filterByProduct() only accepts arguments of type \Thelia\Model\Product or Collection'); + } + } + + /** + * Adds a JOIN clause to the query using the Product relation + * + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return ChildProductAssociatedContentQuery The current query, for fluid interface + */ + public function joinProduct($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + $tableMap = $this->getTableMap(); + $relationMap = $tableMap->getRelation('Product'); + + // create a ModelJoin object for this join + $join = new ModelJoin(); + $join->setJoinType($joinType); + $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); + if ($previousJoin = $this->getPreviousJoin()) { + $join->setPreviousJoin($previousJoin); + } + + // add the ModelJoin to the current object + if ($relationAlias) { + $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); + $this->addJoinObject($join, $relationAlias); + } else { + $this->addJoinObject($join, 'Product'); + } + + return $this; + } + + /** + * Use the Product relation Product object + * + * @see useQuery() + * + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return \Thelia\Model\ProductQuery A secondary query class using the current class as primary query + */ + public function useProductQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + return $this + ->joinProduct($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'Product', '\Thelia\Model\ProductQuery'); + } + + /** + * Filter the query by a related \Thelia\Model\Content object + * + * @param \Thelia\Model\Content|ObjectCollection $content The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildProductAssociatedContentQuery The current query, for fluid interface + */ + public function filterByContent($content, $comparison = null) + { + if ($content instanceof \Thelia\Model\Content) { + return $this + ->addUsingAlias(ProductAssociatedContentTableMap::CONTENT_ID, $content->getId(), $comparison); + } elseif ($content instanceof ObjectCollection) { + if (null === $comparison) { + $comparison = Criteria::IN; + } + + return $this + ->addUsingAlias(ProductAssociatedContentTableMap::CONTENT_ID, $content->toKeyValue('PrimaryKey', 'Id'), $comparison); + } else { + throw new PropelException('filterByContent() only accepts arguments of type \Thelia\Model\Content or Collection'); + } + } + + /** + * Adds a JOIN clause to the query using the Content relation + * + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return ChildProductAssociatedContentQuery The current query, for fluid interface + */ + public function joinContent($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + $tableMap = $this->getTableMap(); + $relationMap = $tableMap->getRelation('Content'); + + // create a ModelJoin object for this join + $join = new ModelJoin(); + $join->setJoinType($joinType); + $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); + if ($previousJoin = $this->getPreviousJoin()) { + $join->setPreviousJoin($previousJoin); + } + + // add the ModelJoin to the current object + if ($relationAlias) { + $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); + $this->addJoinObject($join, $relationAlias); + } else { + $this->addJoinObject($join, 'Content'); + } + + return $this; + } + + /** + * Use the Content relation Content object + * + * @see useQuery() + * + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return \Thelia\Model\ContentQuery A secondary query class using the current class as primary query + */ + public function useContentQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + return $this + ->joinContent($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'Content', '\Thelia\Model\ContentQuery'); + } + + /** + * Exclude object from result + * + * @param ChildProductAssociatedContent $productAssociatedContent Object to remove from the list of results + * + * @return ChildProductAssociatedContentQuery The current query, for fluid interface + */ + public function prune($productAssociatedContent = null) + { + if ($productAssociatedContent) { + $this->addUsingAlias(ProductAssociatedContentTableMap::ID, $productAssociatedContent->getId(), Criteria::NOT_EQUAL); + } + + return $this; + } + + /** + * Deletes all rows from the product_associated_content table. + * + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). + */ + public function doDeleteAll(ConnectionInterface $con = null) + { + if (null === $con) { + $con = Propel::getServiceContainer()->getWriteConnection(ProductAssociatedContentTableMap::DATABASE_NAME); + } + $affectedRows = 0; // initialize var to track total num of affected rows + try { + // use transaction because $criteria could contain info + // for more than one table or we could emulating ON DELETE CASCADE, etc. + $con->beginTransaction(); + $affectedRows += parent::doDeleteAll($con); + // Because this db requires some delete cascade/set null emulation, we have to + // clear the cached instance *after* the emulation has happened (since + // instances get re-added by the select statement contained therein). + ProductAssociatedContentTableMap::clearInstancePool(); + ProductAssociatedContentTableMap::clearRelatedInstancePool(); + + $con->commit(); + } catch (PropelException $e) { + $con->rollBack(); + throw $e; + } + + return $affectedRows; + } + + /** + * Performs a DELETE on the database, given a ChildProductAssociatedContent or Criteria object OR a primary key value. + * + * @param mixed $values Criteria or ChildProductAssociatedContent object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public function delete(ConnectionInterface $con = null) + { + if (null === $con) { + $con = Propel::getServiceContainer()->getWriteConnection(ProductAssociatedContentTableMap::DATABASE_NAME); + } + + $criteria = $this; + + // Set the correct dbName + $criteria->setDbName(ProductAssociatedContentTableMap::DATABASE_NAME); + + $affectedRows = 0; // initialize var to track total num of affected rows + + try { + // use transaction because $criteria could contain info + // for more than one table or we could emulating ON DELETE CASCADE, etc. + $con->beginTransaction(); + + + ProductAssociatedContentTableMap::removeInstanceFromPool($criteria); + + $affectedRows += ModelCriteria::delete($con); + ProductAssociatedContentTableMap::clearRelatedInstancePool(); + $con->commit(); + + return $affectedRows; + } catch (PropelException $e) { + $con->rollBack(); + throw $e; + } + } + + // timestampable behavior + + /** + * Filter by the latest updated + * + * @param int $nbDays Maximum age of the latest update in days + * + * @return ChildProductAssociatedContentQuery The current query, for fluid interface + */ + public function recentlyUpdated($nbDays = 7) + { + return $this->addUsingAlias(ProductAssociatedContentTableMap::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL); + } + + /** + * Filter by the latest created + * + * @param int $nbDays Maximum age of in days + * + * @return ChildProductAssociatedContentQuery The current query, for fluid interface + */ + public function recentlyCreated($nbDays = 7) + { + return $this->addUsingAlias(ProductAssociatedContentTableMap::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL); + } + + /** + * Order by update date desc + * + * @return ChildProductAssociatedContentQuery The current query, for fluid interface + */ + public function lastUpdatedFirst() + { + return $this->addDescendingOrderByColumn(ProductAssociatedContentTableMap::UPDATED_AT); + } + + /** + * Order by update date asc + * + * @return ChildProductAssociatedContentQuery The current query, for fluid interface + */ + public function firstUpdatedFirst() + { + return $this->addAscendingOrderByColumn(ProductAssociatedContentTableMap::UPDATED_AT); + } + + /** + * Order by create date desc + * + * @return ChildProductAssociatedContentQuery The current query, for fluid interface + */ + public function lastCreatedFirst() + { + return $this->addDescendingOrderByColumn(ProductAssociatedContentTableMap::CREATED_AT); + } + + /** + * Order by create date asc + * + * @return ChildProductAssociatedContentQuery The current query, for fluid interface + */ + public function firstCreatedFirst() + { + return $this->addAscendingOrderByColumn(ProductAssociatedContentTableMap::CREATED_AT); + } + +} // ProductAssociatedContentQuery diff --git a/core/lib/Thelia/Model/Base/ProductQuery.php b/core/lib/Thelia/Model/Base/ProductQuery.php index 9d4685f38..8a4d4ed18 100644 --- a/core/lib/Thelia/Model/Base/ProductQuery.php +++ b/core/lib/Thelia/Model/Base/ProductQuery.php @@ -64,10 +64,6 @@ use Thelia\Model\Map\ProductTableMap; * @method ChildProductQuery rightJoinProductSaleElements($relationAlias = null) Adds a RIGHT JOIN clause to the query using the ProductSaleElements relation * @method ChildProductQuery innerJoinProductSaleElements($relationAlias = null) Adds a INNER JOIN clause to the query using the ProductSaleElements relation * - * @method ChildProductQuery leftJoinContentAssoc($relationAlias = null) Adds a LEFT JOIN clause to the query using the ContentAssoc relation - * @method ChildProductQuery rightJoinContentAssoc($relationAlias = null) Adds a RIGHT JOIN clause to the query using the ContentAssoc relation - * @method ChildProductQuery innerJoinContentAssoc($relationAlias = null) Adds a INNER JOIN clause to the query using the ContentAssoc relation - * * @method ChildProductQuery leftJoinProductImage($relationAlias = null) Adds a LEFT JOIN clause to the query using the ProductImage relation * @method ChildProductQuery rightJoinProductImage($relationAlias = null) Adds a RIGHT JOIN clause to the query using the ProductImage relation * @method ChildProductQuery innerJoinProductImage($relationAlias = null) Adds a INNER JOIN clause to the query using the ProductImage relation @@ -92,6 +88,10 @@ use Thelia\Model\Map\ProductTableMap; * @method ChildProductQuery rightJoinCartItem($relationAlias = null) Adds a RIGHT JOIN clause to the query using the CartItem relation * @method ChildProductQuery innerJoinCartItem($relationAlias = null) Adds a INNER JOIN clause to the query using the CartItem relation * + * @method ChildProductQuery leftJoinProductAssociatedContent($relationAlias = null) Adds a LEFT JOIN clause to the query using the ProductAssociatedContent relation + * @method ChildProductQuery rightJoinProductAssociatedContent($relationAlias = null) Adds a RIGHT JOIN clause to the query using the ProductAssociatedContent relation + * @method ChildProductQuery innerJoinProductAssociatedContent($relationAlias = null) Adds a INNER JOIN clause to the query using the ProductAssociatedContent relation + * * @method ChildProductQuery leftJoinProductI18n($relationAlias = null) Adds a LEFT JOIN clause to the query using the ProductI18n relation * @method ChildProductQuery rightJoinProductI18n($relationAlias = null) Adds a RIGHT JOIN clause to the query using the ProductI18n relation * @method ChildProductQuery innerJoinProductI18n($relationAlias = null) Adds a INNER JOIN clause to the query using the ProductI18n relation @@ -996,79 +996,6 @@ abstract class ProductQuery extends ModelCriteria ->useQuery($relationAlias ? $relationAlias : 'ProductSaleElements', '\Thelia\Model\ProductSaleElementsQuery'); } - /** - * Filter the query by a related \Thelia\Model\ContentAssoc object - * - * @param \Thelia\Model\ContentAssoc|ObjectCollection $contentAssoc the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildProductQuery The current query, for fluid interface - */ - public function filterByContentAssoc($contentAssoc, $comparison = null) - { - if ($contentAssoc instanceof \Thelia\Model\ContentAssoc) { - return $this - ->addUsingAlias(ProductTableMap::ID, $contentAssoc->getProductId(), $comparison); - } elseif ($contentAssoc instanceof ObjectCollection) { - return $this - ->useContentAssocQuery() - ->filterByPrimaryKeys($contentAssoc->getPrimaryKeys()) - ->endUse(); - } else { - throw new PropelException('filterByContentAssoc() only accepts arguments of type \Thelia\Model\ContentAssoc or Collection'); - } - } - - /** - * Adds a JOIN clause to the query using the ContentAssoc relation - * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return ChildProductQuery The current query, for fluid interface - */ - public function joinContentAssoc($relationAlias = null, $joinType = Criteria::LEFT_JOIN) - { - $tableMap = $this->getTableMap(); - $relationMap = $tableMap->getRelation('ContentAssoc'); - - // create a ModelJoin object for this join - $join = new ModelJoin(); - $join->setJoinType($joinType); - $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); - if ($previousJoin = $this->getPreviousJoin()) { - $join->setPreviousJoin($previousJoin); - } - - // add the ModelJoin to the current object - if ($relationAlias) { - $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); - $this->addJoinObject($join, $relationAlias); - } else { - $this->addJoinObject($join, 'ContentAssoc'); - } - - return $this; - } - - /** - * Use the ContentAssoc relation ContentAssoc object - * - * @see useQuery() - * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return \Thelia\Model\ContentAssocQuery A secondary query class using the current class as primary query - */ - public function useContentAssocQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) - { - return $this - ->joinContentAssoc($relationAlias, $joinType) - ->useQuery($relationAlias ? $relationAlias : 'ContentAssoc', '\Thelia\Model\ContentAssocQuery'); - } - /** * Filter the query by a related \Thelia\Model\ProductImage object * @@ -1507,6 +1434,79 @@ abstract class ProductQuery extends ModelCriteria ->useQuery($relationAlias ? $relationAlias : 'CartItem', '\Thelia\Model\CartItemQuery'); } + /** + * Filter the query by a related \Thelia\Model\ProductAssociatedContent object + * + * @param \Thelia\Model\ProductAssociatedContent|ObjectCollection $productAssociatedContent the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildProductQuery The current query, for fluid interface + */ + public function filterByProductAssociatedContent($productAssociatedContent, $comparison = null) + { + if ($productAssociatedContent instanceof \Thelia\Model\ProductAssociatedContent) { + return $this + ->addUsingAlias(ProductTableMap::ID, $productAssociatedContent->getProductId(), $comparison); + } elseif ($productAssociatedContent instanceof ObjectCollection) { + return $this + ->useProductAssociatedContentQuery() + ->filterByPrimaryKeys($productAssociatedContent->getPrimaryKeys()) + ->endUse(); + } else { + throw new PropelException('filterByProductAssociatedContent() only accepts arguments of type \Thelia\Model\ProductAssociatedContent or Collection'); + } + } + + /** + * Adds a JOIN clause to the query using the ProductAssociatedContent relation + * + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return ChildProductQuery The current query, for fluid interface + */ + public function joinProductAssociatedContent($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + $tableMap = $this->getTableMap(); + $relationMap = $tableMap->getRelation('ProductAssociatedContent'); + + // create a ModelJoin object for this join + $join = new ModelJoin(); + $join->setJoinType($joinType); + $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); + if ($previousJoin = $this->getPreviousJoin()) { + $join->setPreviousJoin($previousJoin); + } + + // add the ModelJoin to the current object + if ($relationAlias) { + $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); + $this->addJoinObject($join, $relationAlias); + } else { + $this->addJoinObject($join, 'ProductAssociatedContent'); + } + + return $this; + } + + /** + * Use the ProductAssociatedContent relation ProductAssociatedContent object + * + * @see useQuery() + * + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return \Thelia\Model\ProductAssociatedContentQuery A secondary query class using the current class as primary query + */ + public function useProductAssociatedContentQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + return $this + ->joinProductAssociatedContent($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'ProductAssociatedContent', '\Thelia\Model\ProductAssociatedContentQuery'); + } + /** * Filter the query by a related \Thelia\Model\ProductI18n object * diff --git a/core/lib/Thelia/Model/CategoryAssociatedContent.php b/core/lib/Thelia/Model/CategoryAssociatedContent.php new file mode 100644 index 000000000..9296e6274 --- /dev/null +++ b/core/lib/Thelia/Model/CategoryAssociatedContent.php @@ -0,0 +1,9 @@ +setPhpName('Accessory'); $this->setClassName('\\Thelia\\Model\\Accessory'); $this->setPackage('Thelia.Model'); - $this->setUseIdGenerator(false); + $this->setUseIdGenerator(true); $this->setIsCrossRef(true); // columns $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null); @@ -429,6 +429,10 @@ class AccessoryTableMap extends TableMap $criteria = $criteria->buildCriteria(); // build Criteria from Accessory object } + if ($criteria->containsKey(AccessoryTableMap::ID) && $criteria->keyContainsValue(AccessoryTableMap::ID) ) { + throw new PropelException('Cannot insert a value for auto-increment primary key ('.AccessoryTableMap::ID.')'); + } + // Set the correct dbName $query = AccessoryQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/CategoryAssociatedContentTableMap.php b/core/lib/Thelia/Model/Map/CategoryAssociatedContentTableMap.php new file mode 100644 index 000000000..c78d59506 --- /dev/null +++ b/core/lib/Thelia/Model/Map/CategoryAssociatedContentTableMap.php @@ -0,0 +1,456 @@ + array('Id', 'CategoryId', 'ContentId', 'Position', 'CreatedAt', 'UpdatedAt', ), + self::TYPE_STUDLYPHPNAME => array('id', 'categoryId', 'contentId', 'position', 'createdAt', 'updatedAt', ), + self::TYPE_COLNAME => array(CategoryAssociatedContentTableMap::ID, CategoryAssociatedContentTableMap::CATEGORY_ID, CategoryAssociatedContentTableMap::CONTENT_ID, CategoryAssociatedContentTableMap::POSITION, CategoryAssociatedContentTableMap::CREATED_AT, CategoryAssociatedContentTableMap::UPDATED_AT, ), + self::TYPE_RAW_COLNAME => array('ID', 'CATEGORY_ID', 'CONTENT_ID', 'POSITION', 'CREATED_AT', 'UPDATED_AT', ), + self::TYPE_FIELDNAME => array('id', 'category_id', 'content_id', 'position', 'created_at', 'updated_at', ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, ) + ); + + /** + * holds an array of keys for quick access to the fieldnames array + * + * first dimension keys are the type constants + * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 + */ + protected static $fieldKeys = array ( + self::TYPE_PHPNAME => array('Id' => 0, 'CategoryId' => 1, 'ContentId' => 2, 'Position' => 3, 'CreatedAt' => 4, 'UpdatedAt' => 5, ), + self::TYPE_STUDLYPHPNAME => array('id' => 0, 'categoryId' => 1, 'contentId' => 2, 'position' => 3, 'createdAt' => 4, 'updatedAt' => 5, ), + self::TYPE_COLNAME => array(CategoryAssociatedContentTableMap::ID => 0, CategoryAssociatedContentTableMap::CATEGORY_ID => 1, CategoryAssociatedContentTableMap::CONTENT_ID => 2, CategoryAssociatedContentTableMap::POSITION => 3, CategoryAssociatedContentTableMap::CREATED_AT => 4, CategoryAssociatedContentTableMap::UPDATED_AT => 5, ), + self::TYPE_RAW_COLNAME => array('ID' => 0, 'CATEGORY_ID' => 1, 'CONTENT_ID' => 2, 'POSITION' => 3, 'CREATED_AT' => 4, 'UPDATED_AT' => 5, ), + self::TYPE_FIELDNAME => array('id' => 0, 'category_id' => 1, 'content_id' => 2, 'position' => 3, 'created_at' => 4, 'updated_at' => 5, ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, ) + ); + + /** + * Initialize the table attributes and columns + * Relations are not initialized by this method since they are lazy loaded + * + * @return void + * @throws PropelException + */ + public function initialize() + { + // attributes + $this->setName('category_associated_content'); + $this->setPhpName('CategoryAssociatedContent'); + $this->setClassName('\\Thelia\\Model\\CategoryAssociatedContent'); + $this->setPackage('Thelia.Model'); + $this->setUseIdGenerator(true); + // columns + $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null); + $this->addForeignKey('CATEGORY_ID', 'CategoryId', 'INTEGER', 'category', 'ID', true, null, null); + $this->addForeignKey('CONTENT_ID', 'ContentId', 'INTEGER', 'content', 'ID', true, null, null); + $this->addColumn('POSITION', 'Position', 'INTEGER', true, null, null); + $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null); + $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null); + } // initialize() + + /** + * Build the RelationMap objects for this table relationships + */ + public function buildRelations() + { + $this->addRelation('Category', '\\Thelia\\Model\\Category', RelationMap::MANY_TO_ONE, array('category_id' => 'id', ), 'CASCADE', 'RESTRICT'); + $this->addRelation('Content', '\\Thelia\\Model\\Content', RelationMap::MANY_TO_ONE, array('content_id' => 'id', ), 'CASCADE', 'RESTRICT'); + } // buildRelations() + + /** + * + * Gets the list of behaviors registered for this table + * + * @return array Associative array (name => parameters) of behaviors + */ + public function getBehaviors() + { + return array( + 'timestampable' => array('create_column' => 'created_at', 'update_column' => 'updated_at', ), + ); + } // getBehaviors() + + /** + * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table. + * + * For tables with a single-column primary key, that simple pkey value will be returned. For tables with + * a multi-column primary key, a serialize()d version of the primary key will be returned. + * + * @param array $row resultset row. + * @param int $offset The 0-based offset for reading from the resultset row. + * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + */ + public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) + { + // If the PK cannot be derived from the row, return NULL. + if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null) { + return null; + } + + return (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; + } + + /** + * Retrieves the primary key from the DB resultset row + * For tables with a single-column primary key, that simple pkey value will be returned. For tables with + * a multi-column primary key, an array of the primary key columns will be returned. + * + * @param array $row resultset row. + * @param int $offset The 0-based offset for reading from the resultset row. + * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * + * @return mixed The primary key of the row + */ + public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) + { + + return (int) $row[ + $indexType == TableMap::TYPE_NUM + ? 0 + $offset + : self::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType) + ]; + } + + /** + * The class that the tableMap will make instances of. + * + * If $withPrefix is true, the returned path + * uses a dot-path notation which is translated into a path + * relative to a location on the PHP include_path. + * (e.g. path.to.MyClass -> 'path/to/MyClass.php') + * + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName + */ + public static function getOMClass($withPrefix = true) + { + return $withPrefix ? CategoryAssociatedContentTableMap::CLASS_DEFAULT : CategoryAssociatedContentTableMap::OM_CLASS; + } + + /** + * Populates an object of the default type or an object that inherit from the default. + * + * @param array $row row returned by DataFetcher->fetch(). + * @param int $offset The 0-based offset for reading from the resultset row. + * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType(). + One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + * @return array (CategoryAssociatedContent object, last column rank) + */ + public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) + { + $key = CategoryAssociatedContentTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType); + if (null !== ($obj = CategoryAssociatedContentTableMap::getInstanceFromPool($key))) { + // We no longer rehydrate the object, since this can cause data loss. + // See http://www.propelorm.org/ticket/509 + // $obj->hydrate($row, $offset, true); // rehydrate + $col = $offset + CategoryAssociatedContentTableMap::NUM_HYDRATE_COLUMNS; + } else { + $cls = CategoryAssociatedContentTableMap::OM_CLASS; + $obj = new $cls(); + $col = $obj->hydrate($row, $offset, false, $indexType); + CategoryAssociatedContentTableMap::addInstanceToPool($obj, $key); + } + + return array($obj, $col); + } + + /** + * The returned array will contain objects of the default type or + * objects that inherit from the default. + * + * @param DataFetcherInterface $dataFetcher + * @return array + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function populateObjects(DataFetcherInterface $dataFetcher) + { + $results = array(); + + // set the class once to avoid overhead in the loop + $cls = static::getOMClass(false); + // populate the object(s) + while ($row = $dataFetcher->fetch()) { + $key = CategoryAssociatedContentTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType()); + if (null !== ($obj = CategoryAssociatedContentTableMap::getInstanceFromPool($key))) { + // We no longer rehydrate the object, since this can cause data loss. + // See http://www.propelorm.org/ticket/509 + // $obj->hydrate($row, 0, true); // rehydrate + $results[] = $obj; + } else { + $obj = new $cls(); + $obj->hydrate($row); + $results[] = $obj; + CategoryAssociatedContentTableMap::addInstanceToPool($obj, $key); + } // if key exists + } + + return $results; + } + /** + * Add all the columns needed to create a new object. + * + * Note: any columns that were marked with lazyLoad="true" in the + * XML schema will not be added to the select list and only loaded + * on demand. + * + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function addSelectColumns(Criteria $criteria, $alias = null) + { + if (null === $alias) { + $criteria->addSelectColumn(CategoryAssociatedContentTableMap::ID); + $criteria->addSelectColumn(CategoryAssociatedContentTableMap::CATEGORY_ID); + $criteria->addSelectColumn(CategoryAssociatedContentTableMap::CONTENT_ID); + $criteria->addSelectColumn(CategoryAssociatedContentTableMap::POSITION); + $criteria->addSelectColumn(CategoryAssociatedContentTableMap::CREATED_AT); + $criteria->addSelectColumn(CategoryAssociatedContentTableMap::UPDATED_AT); + } else { + $criteria->addSelectColumn($alias . '.ID'); + $criteria->addSelectColumn($alias . '.CATEGORY_ID'); + $criteria->addSelectColumn($alias . '.CONTENT_ID'); + $criteria->addSelectColumn($alias . '.POSITION'); + $criteria->addSelectColumn($alias . '.CREATED_AT'); + $criteria->addSelectColumn($alias . '.UPDATED_AT'); + } + } + + /** + * Returns the TableMap related to this object. + * This method is not needed for general use but a specific application could have a need. + * @return TableMap + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function getTableMap() + { + return Propel::getServiceContainer()->getDatabaseMap(CategoryAssociatedContentTableMap::DATABASE_NAME)->getTable(CategoryAssociatedContentTableMap::TABLE_NAME); + } + + /** + * Add a TableMap instance to the database for this tableMap class. + */ + public static function buildTableMap() + { + $dbMap = Propel::getServiceContainer()->getDatabaseMap(CategoryAssociatedContentTableMap::DATABASE_NAME); + if (!$dbMap->hasTable(CategoryAssociatedContentTableMap::TABLE_NAME)) { + $dbMap->addTableObject(new CategoryAssociatedContentTableMap()); + } + } + + /** + * Performs a DELETE on the database, given a CategoryAssociatedContent or Criteria object OR a primary key value. + * + * @param mixed $values Criteria or CategoryAssociatedContent object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function doDelete($values, ConnectionInterface $con = null) + { + if (null === $con) { + $con = Propel::getServiceContainer()->getWriteConnection(CategoryAssociatedContentTableMap::DATABASE_NAME); + } + + if ($values instanceof Criteria) { + // rename for clarity + $criteria = $values; + } elseif ($values instanceof \Thelia\Model\CategoryAssociatedContent) { // it's a model object + // create criteria based on pk values + $criteria = $values->buildPkeyCriteria(); + } else { // it's a primary key, or an array of pks + $criteria = new Criteria(CategoryAssociatedContentTableMap::DATABASE_NAME); + $criteria->add(CategoryAssociatedContentTableMap::ID, (array) $values, Criteria::IN); + } + + $query = CategoryAssociatedContentQuery::create()->mergeWith($criteria); + + if ($values instanceof Criteria) { CategoryAssociatedContentTableMap::clearInstancePool(); + } elseif (!is_object($values)) { // it's a primary key, or an array of pks + foreach ((array) $values as $singleval) { CategoryAssociatedContentTableMap::removeInstanceFromPool($singleval); + } + } + + return $query->delete($con); + } + + /** + * Deletes all rows from the category_associated_content table. + * + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). + */ + public static function doDeleteAll(ConnectionInterface $con = null) + { + return CategoryAssociatedContentQuery::create()->doDeleteAll($con); + } + + /** + * Performs an INSERT on the database, given a CategoryAssociatedContent or Criteria object. + * + * @param mixed $criteria Criteria or CategoryAssociatedContent object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function doInsert($criteria, ConnectionInterface $con = null) + { + if (null === $con) { + $con = Propel::getServiceContainer()->getWriteConnection(CategoryAssociatedContentTableMap::DATABASE_NAME); + } + + if ($criteria instanceof Criteria) { + $criteria = clone $criteria; // rename for clarity + } else { + $criteria = $criteria->buildCriteria(); // build Criteria from CategoryAssociatedContent object + } + + if ($criteria->containsKey(CategoryAssociatedContentTableMap::ID) && $criteria->keyContainsValue(CategoryAssociatedContentTableMap::ID) ) { + throw new PropelException('Cannot insert a value for auto-increment primary key ('.CategoryAssociatedContentTableMap::ID.')'); + } + + + // Set the correct dbName + $query = CategoryAssociatedContentQuery::create()->mergeWith($criteria); + + try { + // use transaction because $criteria could contain info + // for more than one table (I guess, conceivably) + $con->beginTransaction(); + $pk = $query->doInsert($con); + $con->commit(); + } catch (PropelException $e) { + $con->rollBack(); + throw $e; + } + + return $pk; + } + +} // CategoryAssociatedContentTableMap +// This is the static code needed to register the TableMap for this table with the main Propel class. +// +CategoryAssociatedContentTableMap::buildTableMap(); diff --git a/core/lib/Thelia/Model/Map/CategoryTableMap.php b/core/lib/Thelia/Model/Map/CategoryTableMap.php index c3526ec5d..f94b14e5f 100644 --- a/core/lib/Thelia/Model/Map/CategoryTableMap.php +++ b/core/lib/Thelia/Model/Map/CategoryTableMap.php @@ -193,10 +193,10 @@ class CategoryTableMap extends TableMap $this->addRelation('ProductCategory', '\\Thelia\\Model\\ProductCategory', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'ProductCategories'); $this->addRelation('FeatureCategory', '\\Thelia\\Model\\FeatureCategory', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'FeatureCategories'); $this->addRelation('AttributeCategory', '\\Thelia\\Model\\AttributeCategory', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'AttributeCategories'); - $this->addRelation('ContentAssoc', '\\Thelia\\Model\\ContentAssoc', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'ContentAssocs'); $this->addRelation('Rewriting', '\\Thelia\\Model\\Rewriting', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'Rewritings'); $this->addRelation('CategoryImage', '\\Thelia\\Model\\CategoryImage', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'CategoryImages'); $this->addRelation('CategoryDocument', '\\Thelia\\Model\\CategoryDocument', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'CategoryDocuments'); + $this->addRelation('CategoryAssociatedContent', '\\Thelia\\Model\\CategoryAssociatedContent', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'CategoryAssociatedContents'); $this->addRelation('CategoryI18n', '\\Thelia\\Model\\CategoryI18n', RelationMap::ONE_TO_MANY, array('id' => 'id', ), 'CASCADE', null, 'CategoryI18ns'); $this->addRelation('CategoryVersion', '\\Thelia\\Model\\CategoryVersion', RelationMap::ONE_TO_MANY, array('id' => 'id', ), 'CASCADE', null, 'CategoryVersions'); $this->addRelation('Product', '\\Thelia\\Model\\Product', RelationMap::MANY_TO_MANY, array(), 'CASCADE', 'RESTRICT', 'Products'); @@ -228,10 +228,10 @@ class CategoryTableMap extends TableMap ProductCategoryTableMap::clearInstancePool(); FeatureCategoryTableMap::clearInstancePool(); AttributeCategoryTableMap::clearInstancePool(); - ContentAssocTableMap::clearInstancePool(); RewritingTableMap::clearInstancePool(); CategoryImageTableMap::clearInstancePool(); CategoryDocumentTableMap::clearInstancePool(); + CategoryAssociatedContentTableMap::clearInstancePool(); CategoryI18nTableMap::clearInstancePool(); CategoryVersionTableMap::clearInstancePool(); } diff --git a/core/lib/Thelia/Model/Map/ContentTableMap.php b/core/lib/Thelia/Model/Map/ContentTableMap.php index 724c839a1..5b6787a28 100644 --- a/core/lib/Thelia/Model/Map/ContentTableMap.php +++ b/core/lib/Thelia/Model/Map/ContentTableMap.php @@ -184,11 +184,12 @@ class ContentTableMap extends TableMap */ public function buildRelations() { - $this->addRelation('ContentAssoc', '\\Thelia\\Model\\ContentAssoc', RelationMap::ONE_TO_MANY, array('id' => 'content_id', ), 'CASCADE', 'RESTRICT', 'ContentAssocs'); $this->addRelation('Rewriting', '\\Thelia\\Model\\Rewriting', RelationMap::ONE_TO_MANY, array('id' => 'content_id', ), 'CASCADE', 'RESTRICT', 'Rewritings'); $this->addRelation('ContentFolder', '\\Thelia\\Model\\ContentFolder', RelationMap::ONE_TO_MANY, array('id' => 'content_id', ), 'CASCADE', 'RESTRICT', 'ContentFolders'); $this->addRelation('ContentImage', '\\Thelia\\Model\\ContentImage', RelationMap::ONE_TO_MANY, array('id' => 'content_id', ), 'CASCADE', 'RESTRICT', 'ContentImages'); $this->addRelation('ContentDocument', '\\Thelia\\Model\\ContentDocument', RelationMap::ONE_TO_MANY, array('id' => 'content_id', ), 'CASCADE', 'RESTRICT', 'ContentDocuments'); + $this->addRelation('ProductAssociatedContent', '\\Thelia\\Model\\ProductAssociatedContent', RelationMap::ONE_TO_MANY, array('id' => 'content_id', ), 'CASCADE', 'RESTRICT', 'ProductAssociatedContents'); + $this->addRelation('CategoryAssociatedContent', '\\Thelia\\Model\\CategoryAssociatedContent', RelationMap::ONE_TO_MANY, array('id' => 'content_id', ), 'CASCADE', 'RESTRICT', 'CategoryAssociatedContents'); $this->addRelation('ContentI18n', '\\Thelia\\Model\\ContentI18n', RelationMap::ONE_TO_MANY, array('id' => 'id', ), 'CASCADE', null, 'ContentI18ns'); $this->addRelation('ContentVersion', '\\Thelia\\Model\\ContentVersion', RelationMap::ONE_TO_MANY, array('id' => 'id', ), 'CASCADE', null, 'ContentVersions'); $this->addRelation('Folder', '\\Thelia\\Model\\Folder', RelationMap::MANY_TO_MANY, array(), 'CASCADE', 'RESTRICT', 'Folders'); @@ -215,11 +216,12 @@ class ContentTableMap extends TableMap { // Invalidate objects in ".$this->getClassNameFromBuilder($joinedTableTableMapBuilder)." instance pool, // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule. - ContentAssocTableMap::clearInstancePool(); RewritingTableMap::clearInstancePool(); ContentFolderTableMap::clearInstancePool(); ContentImageTableMap::clearInstancePool(); ContentDocumentTableMap::clearInstancePool(); + ProductAssociatedContentTableMap::clearInstancePool(); + CategoryAssociatedContentTableMap::clearInstancePool(); ContentI18nTableMap::clearInstancePool(); ContentVersionTableMap::clearInstancePool(); } diff --git a/core/lib/Thelia/Model/Map/CouponI18nTableMap.php b/core/lib/Thelia/Model/Map/CouponI18nTableMap.php new file mode 100644 index 000000000..99d49216c --- /dev/null +++ b/core/lib/Thelia/Model/Map/CouponI18nTableMap.php @@ -0,0 +1,465 @@ + array('Id', 'Locale', ), + self::TYPE_STUDLYPHPNAME => array('id', 'locale', ), + self::TYPE_COLNAME => array(CouponI18nTableMap::ID, CouponI18nTableMap::LOCALE, ), + self::TYPE_RAW_COLNAME => array('ID', 'LOCALE', ), + self::TYPE_FIELDNAME => array('id', 'locale', ), + self::TYPE_NUM => array(0, 1, ) + ); + + /** + * holds an array of keys for quick access to the fieldnames array + * + * first dimension keys are the type constants + * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 + */ + protected static $fieldKeys = array ( + self::TYPE_PHPNAME => array('Id' => 0, 'Locale' => 1, ), + self::TYPE_STUDLYPHPNAME => array('id' => 0, 'locale' => 1, ), + self::TYPE_COLNAME => array(CouponI18nTableMap::ID => 0, CouponI18nTableMap::LOCALE => 1, ), + self::TYPE_RAW_COLNAME => array('ID' => 0, 'LOCALE' => 1, ), + self::TYPE_FIELDNAME => array('id' => 0, 'locale' => 1, ), + self::TYPE_NUM => array(0, 1, ) + ); + + /** + * Initialize the table attributes and columns + * Relations are not initialized by this method since they are lazy loaded + * + * @return void + * @throws PropelException + */ + public function initialize() + { + // attributes + $this->setName('coupon_i18n'); + $this->setPhpName('CouponI18n'); + $this->setClassName('\\Thelia\\Model\\CouponI18n'); + $this->setPackage('Thelia.Model'); + $this->setUseIdGenerator(false); + // columns + $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'coupon', 'ID', true, null, null); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); + } // initialize() + + /** + * Build the RelationMap objects for this table relationships + */ + public function buildRelations() + { + $this->addRelation('Coupon', '\\Thelia\\Model\\Coupon', RelationMap::MANY_TO_ONE, array('id' => 'id', ), 'CASCADE', null); + } // buildRelations() + + /** + * Adds an object to the instance pool. + * + * Propel keeps cached copies of objects in an instance pool when they are retrieved + * from the database. In some cases you may need to explicitly add objects + * to the cache in order to ensure that the same objects are always returned by find*() + * and findPk*() calls. + * + * @param \Thelia\Model\CouponI18n $obj A \Thelia\Model\CouponI18n object. + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + */ + public static function addInstanceToPool($obj, $key = null) + { + if (Propel::isInstancePoolingEnabled()) { + if (null === $key) { + $key = serialize(array((string) $obj->getId(), (string) $obj->getLocale())); + } // if key === null + self::$instances[$key] = $obj; + } + } + + /** + * Removes an object from the instance pool. + * + * Propel keeps cached copies of objects in an instance pool when they are retrieved + * from the database. In some cases -- especially when you override doDelete + * methods in your stub classes -- you may need to explicitly remove objects + * from the cache in order to prevent returning objects that no longer exist. + * + * @param mixed $value A \Thelia\Model\CouponI18n object or a primary key value. + */ + public static function removeInstanceFromPool($value) + { + if (Propel::isInstancePoolingEnabled() && null !== $value) { + if (is_object($value) && $value instanceof \Thelia\Model\CouponI18n) { + $key = serialize(array((string) $value->getId(), (string) $value->getLocale())); + + } elseif (is_array($value) && count($value) === 2) { + // assume we've been passed a primary key"; + $key = serialize(array((string) $value[0], (string) $value[1])); + } elseif ($value instanceof Criteria) { + self::$instances = []; + + return; + } else { + $e = new PropelException("Invalid value passed to removeInstanceFromPool(). Expected primary key or \Thelia\Model\CouponI18n object; got " . (is_object($value) ? get_class($value) . ' object.' : var_export($value, true))); + throw $e; + } + + unset(self::$instances[$key]); + } + } + + /** + * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table. + * + * For tables with a single-column primary key, that simple pkey value will be returned. For tables with + * a multi-column primary key, a serialize()d version of the primary key will be returned. + * + * @param array $row resultset row. + * @param int $offset The 0-based offset for reading from the resultset row. + * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + */ + public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) + { + // If the PK cannot be derived from the row, return NULL. + if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 1 + $offset : static::translateFieldName('Locale', TableMap::TYPE_PHPNAME, $indexType)] === null) { + return null; + } + + return serialize(array((string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 1 + $offset : static::translateFieldName('Locale', TableMap::TYPE_PHPNAME, $indexType)])); + } + + /** + * Retrieves the primary key from the DB resultset row + * For tables with a single-column primary key, that simple pkey value will be returned. For tables with + * a multi-column primary key, an array of the primary key columns will be returned. + * + * @param array $row resultset row. + * @param int $offset The 0-based offset for reading from the resultset row. + * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * + * @return mixed The primary key of the row + */ + public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) + { + + return $pks; + } + + /** + * The class that the tableMap will make instances of. + * + * If $withPrefix is true, the returned path + * uses a dot-path notation which is translated into a path + * relative to a location on the PHP include_path. + * (e.g. path.to.MyClass -> 'path/to/MyClass.php') + * + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName + */ + public static function getOMClass($withPrefix = true) + { + return $withPrefix ? CouponI18nTableMap::CLASS_DEFAULT : CouponI18nTableMap::OM_CLASS; + } + + /** + * Populates an object of the default type or an object that inherit from the default. + * + * @param array $row row returned by DataFetcher->fetch(). + * @param int $offset The 0-based offset for reading from the resultset row. + * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType(). + One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + * @return array (CouponI18n object, last column rank) + */ + public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) + { + $key = CouponI18nTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType); + if (null !== ($obj = CouponI18nTableMap::getInstanceFromPool($key))) { + // We no longer rehydrate the object, since this can cause data loss. + // See http://www.propelorm.org/ticket/509 + // $obj->hydrate($row, $offset, true); // rehydrate + $col = $offset + CouponI18nTableMap::NUM_HYDRATE_COLUMNS; + } else { + $cls = CouponI18nTableMap::OM_CLASS; + $obj = new $cls(); + $col = $obj->hydrate($row, $offset, false, $indexType); + CouponI18nTableMap::addInstanceToPool($obj, $key); + } + + return array($obj, $col); + } + + /** + * The returned array will contain objects of the default type or + * objects that inherit from the default. + * + * @param DataFetcherInterface $dataFetcher + * @return array + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function populateObjects(DataFetcherInterface $dataFetcher) + { + $results = array(); + + // set the class once to avoid overhead in the loop + $cls = static::getOMClass(false); + // populate the object(s) + while ($row = $dataFetcher->fetch()) { + $key = CouponI18nTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType()); + if (null !== ($obj = CouponI18nTableMap::getInstanceFromPool($key))) { + // We no longer rehydrate the object, since this can cause data loss. + // See http://www.propelorm.org/ticket/509 + // $obj->hydrate($row, 0, true); // rehydrate + $results[] = $obj; + } else { + $obj = new $cls(); + $obj->hydrate($row); + $results[] = $obj; + CouponI18nTableMap::addInstanceToPool($obj, $key); + } // if key exists + } + + return $results; + } + /** + * Add all the columns needed to create a new object. + * + * Note: any columns that were marked with lazyLoad="true" in the + * XML schema will not be added to the select list and only loaded + * on demand. + * + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function addSelectColumns(Criteria $criteria, $alias = null) + { + if (null === $alias) { + $criteria->addSelectColumn(CouponI18nTableMap::ID); + $criteria->addSelectColumn(CouponI18nTableMap::LOCALE); + } else { + $criteria->addSelectColumn($alias . '.ID'); + $criteria->addSelectColumn($alias . '.LOCALE'); + } + } + + /** + * Returns the TableMap related to this object. + * This method is not needed for general use but a specific application could have a need. + * @return TableMap + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function getTableMap() + { + return Propel::getServiceContainer()->getDatabaseMap(CouponI18nTableMap::DATABASE_NAME)->getTable(CouponI18nTableMap::TABLE_NAME); + } + + /** + * Add a TableMap instance to the database for this tableMap class. + */ + public static function buildTableMap() + { + $dbMap = Propel::getServiceContainer()->getDatabaseMap(CouponI18nTableMap::DATABASE_NAME); + if (!$dbMap->hasTable(CouponI18nTableMap::TABLE_NAME)) { + $dbMap->addTableObject(new CouponI18nTableMap()); + } + } + + /** + * Performs a DELETE on the database, given a CouponI18n or Criteria object OR a primary key value. + * + * @param mixed $values Criteria or CouponI18n object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function doDelete($values, ConnectionInterface $con = null) + { + if (null === $con) { + $con = Propel::getServiceContainer()->getWriteConnection(CouponI18nTableMap::DATABASE_NAME); + } + + if ($values instanceof Criteria) { + // rename for clarity + $criteria = $values; + } elseif ($values instanceof \Thelia\Model\CouponI18n) { // it's a model object + // create criteria based on pk values + $criteria = $values->buildPkeyCriteria(); + } else { // it's a primary key, or an array of pks + $criteria = new Criteria(CouponI18nTableMap::DATABASE_NAME); + // primary key is composite; we therefore, expect + // the primary key passed to be an array of pkey values + if (count($values) == count($values, COUNT_RECURSIVE)) { + // array is not multi-dimensional + $values = array($values); + } + foreach ($values as $value) { + $criterion = $criteria->getNewCriterion(CouponI18nTableMap::ID, $value[0]); + $criterion->addAnd($criteria->getNewCriterion(CouponI18nTableMap::LOCALE, $value[1])); + $criteria->addOr($criterion); + } + } + + $query = CouponI18nQuery::create()->mergeWith($criteria); + + if ($values instanceof Criteria) { CouponI18nTableMap::clearInstancePool(); + } elseif (!is_object($values)) { // it's a primary key, or an array of pks + foreach ((array) $values as $singleval) { CouponI18nTableMap::removeInstanceFromPool($singleval); + } + } + + return $query->delete($con); + } + + /** + * Deletes all rows from the coupon_i18n table. + * + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). + */ + public static function doDeleteAll(ConnectionInterface $con = null) + { + return CouponI18nQuery::create()->doDeleteAll($con); + } + + /** + * Performs an INSERT on the database, given a CouponI18n or Criteria object. + * + * @param mixed $criteria Criteria or CouponI18n object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function doInsert($criteria, ConnectionInterface $con = null) + { + if (null === $con) { + $con = Propel::getServiceContainer()->getWriteConnection(CouponI18nTableMap::DATABASE_NAME); + } + + if ($criteria instanceof Criteria) { + $criteria = clone $criteria; // rename for clarity + } else { + $criteria = $criteria->buildCriteria(); // build Criteria from CouponI18n object + } + + + // Set the correct dbName + $query = CouponI18nQuery::create()->mergeWith($criteria); + + try { + // use transaction because $criteria could contain info + // for more than one table (I guess, conceivably) + $con->beginTransaction(); + $pk = $query->doInsert($con); + $con->commit(); + } catch (PropelException $e) { + $con->rollBack(); + throw $e; + } + + return $pk; + } + +} // CouponI18nTableMap +// This is the static code needed to register the TableMap for this table with the main Propel class. +// +CouponI18nTableMap::buildTableMap(); diff --git a/core/lib/Thelia/Model/Map/CouponTableMap.php b/core/lib/Thelia/Model/Map/CouponTableMap.php index 7e576a585..dfc987b21 100644 --- a/core/lib/Thelia/Model/Map/CouponTableMap.php +++ b/core/lib/Thelia/Model/Map/CouponTableMap.php @@ -57,7 +57,7 @@ class CouponTableMap extends TableMap /** * The total number of columns */ - const NUM_COLUMNS = 14; + const NUM_COLUMNS = 17; /** * The number of lazy-loaded columns @@ -67,7 +67,7 @@ class CouponTableMap extends TableMap /** * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS) */ - const NUM_HYDRATE_COLUMNS = 14; + const NUM_HYDRATE_COLUMNS = 17; /** * the column name for the ID field @@ -100,9 +100,9 @@ class CouponTableMap extends TableMap const DESCRIPTION = 'coupon.DESCRIPTION'; /** - * the column name for the VALUE field + * the column name for the AMOUNT field */ - const VALUE = 'coupon.VALUE'; + const AMOUNT = 'coupon.AMOUNT'; /** * the column name for the IS_USED field @@ -120,9 +120,24 @@ class CouponTableMap extends TableMap const EXPIRATION_DATE = 'coupon.EXPIRATION_DATE'; /** - * the column name for the SERIALIZED_RULES field + * the column name for the SERIALIZED_RULES_TYPE field */ - const SERIALIZED_RULES = 'coupon.SERIALIZED_RULES'; + const SERIALIZED_RULES_TYPE = 'coupon.SERIALIZED_RULES_TYPE'; + + /** + * the column name for the SERIALIZED_RULES_CONTENT field + */ + const SERIALIZED_RULES_CONTENT = 'coupon.SERIALIZED_RULES_CONTENT'; + + /** + * the column name for the IS_CUMULATIVE field + */ + const IS_CUMULATIVE = 'coupon.IS_CUMULATIVE'; + + /** + * the column name for the IS_REMOVING_POSTAGE field + */ + const IS_REMOVING_POSTAGE = 'coupon.IS_REMOVING_POSTAGE'; /** * the column name for the CREATED_AT field @@ -160,12 +175,12 @@ class CouponTableMap extends TableMap * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ protected static $fieldNames = array ( - self::TYPE_PHPNAME => array('Id', 'Code', 'Type', 'Title', 'ShortDescription', 'Description', 'Value', 'IsUsed', 'IsEnabled', 'ExpirationDate', 'SerializedRules', 'CreatedAt', 'UpdatedAt', 'Version', ), - self::TYPE_STUDLYPHPNAME => array('id', 'code', 'type', 'title', 'shortDescription', 'description', 'value', 'isUsed', 'isEnabled', 'expirationDate', 'serializedRules', 'createdAt', 'updatedAt', 'version', ), - self::TYPE_COLNAME => array(CouponTableMap::ID, CouponTableMap::CODE, CouponTableMap::TYPE, CouponTableMap::TITLE, CouponTableMap::SHORT_DESCRIPTION, CouponTableMap::DESCRIPTION, CouponTableMap::VALUE, CouponTableMap::IS_USED, CouponTableMap::IS_ENABLED, CouponTableMap::EXPIRATION_DATE, CouponTableMap::SERIALIZED_RULES, CouponTableMap::CREATED_AT, CouponTableMap::UPDATED_AT, CouponTableMap::VERSION, ), - self::TYPE_RAW_COLNAME => array('ID', 'CODE', 'TYPE', 'TITLE', 'SHORT_DESCRIPTION', 'DESCRIPTION', 'VALUE', 'IS_USED', 'IS_ENABLED', 'EXPIRATION_DATE', 'SERIALIZED_RULES', 'CREATED_AT', 'UPDATED_AT', 'VERSION', ), - self::TYPE_FIELDNAME => array('id', 'code', 'type', 'title', 'short_description', 'description', 'value', 'is_used', 'is_enabled', 'expiration_date', 'serialized_rules', 'created_at', 'updated_at', 'version', ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, ) + self::TYPE_PHPNAME => array('Id', 'Code', 'Type', 'Title', 'ShortDescription', 'Description', 'Amount', 'IsUsed', 'IsEnabled', 'ExpirationDate', 'SerializedRulesType', 'SerializedRulesContent', 'IsCumulative', 'IsRemovingPostage', 'CreatedAt', 'UpdatedAt', 'Version', ), + self::TYPE_STUDLYPHPNAME => array('id', 'code', 'type', 'title', 'shortDescription', 'description', 'amount', 'isUsed', 'isEnabled', 'expirationDate', 'serializedRulesType', 'serializedRulesContent', 'isCumulative', 'isRemovingPostage', 'createdAt', 'updatedAt', 'version', ), + self::TYPE_COLNAME => array(CouponTableMap::ID, CouponTableMap::CODE, CouponTableMap::TYPE, CouponTableMap::TITLE, CouponTableMap::SHORT_DESCRIPTION, CouponTableMap::DESCRIPTION, CouponTableMap::AMOUNT, CouponTableMap::IS_USED, CouponTableMap::IS_ENABLED, CouponTableMap::EXPIRATION_DATE, CouponTableMap::SERIALIZED_RULES_TYPE, CouponTableMap::SERIALIZED_RULES_CONTENT, CouponTableMap::IS_CUMULATIVE, CouponTableMap::IS_REMOVING_POSTAGE, CouponTableMap::CREATED_AT, CouponTableMap::UPDATED_AT, CouponTableMap::VERSION, ), + self::TYPE_RAW_COLNAME => array('ID', 'CODE', 'TYPE', 'TITLE', 'SHORT_DESCRIPTION', 'DESCRIPTION', 'AMOUNT', 'IS_USED', 'IS_ENABLED', 'EXPIRATION_DATE', 'SERIALIZED_RULES_TYPE', 'SERIALIZED_RULES_CONTENT', 'IS_CUMULATIVE', 'IS_REMOVING_POSTAGE', 'CREATED_AT', 'UPDATED_AT', 'VERSION', ), + self::TYPE_FIELDNAME => array('id', 'code', 'type', 'title', 'short_description', 'description', 'amount', 'is_used', 'is_enabled', 'expiration_date', 'serialized_rules_type', 'serialized_rules_content', 'is_cumulative', 'is_removing_postage', 'created_at', 'updated_at', 'version', ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, ) ); /** @@ -175,12 +190,12 @@ class CouponTableMap extends TableMap * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 */ protected static $fieldKeys = array ( - self::TYPE_PHPNAME => array('Id' => 0, 'Code' => 1, 'Type' => 2, 'Title' => 3, 'ShortDescription' => 4, 'Description' => 5, 'Value' => 6, 'IsUsed' => 7, 'IsEnabled' => 8, 'ExpirationDate' => 9, 'SerializedRules' => 10, 'CreatedAt' => 11, 'UpdatedAt' => 12, 'Version' => 13, ), - self::TYPE_STUDLYPHPNAME => array('id' => 0, 'code' => 1, 'type' => 2, 'title' => 3, 'shortDescription' => 4, 'description' => 5, 'value' => 6, 'isUsed' => 7, 'isEnabled' => 8, 'expirationDate' => 9, 'serializedRules' => 10, 'createdAt' => 11, 'updatedAt' => 12, 'version' => 13, ), - self::TYPE_COLNAME => array(CouponTableMap::ID => 0, CouponTableMap::CODE => 1, CouponTableMap::TYPE => 2, CouponTableMap::TITLE => 3, CouponTableMap::SHORT_DESCRIPTION => 4, CouponTableMap::DESCRIPTION => 5, CouponTableMap::VALUE => 6, CouponTableMap::IS_USED => 7, CouponTableMap::IS_ENABLED => 8, CouponTableMap::EXPIRATION_DATE => 9, CouponTableMap::SERIALIZED_RULES => 10, CouponTableMap::CREATED_AT => 11, CouponTableMap::UPDATED_AT => 12, CouponTableMap::VERSION => 13, ), - self::TYPE_RAW_COLNAME => array('ID' => 0, 'CODE' => 1, 'TYPE' => 2, 'TITLE' => 3, 'SHORT_DESCRIPTION' => 4, 'DESCRIPTION' => 5, 'VALUE' => 6, 'IS_USED' => 7, 'IS_ENABLED' => 8, 'EXPIRATION_DATE' => 9, 'SERIALIZED_RULES' => 10, 'CREATED_AT' => 11, 'UPDATED_AT' => 12, 'VERSION' => 13, ), - self::TYPE_FIELDNAME => array('id' => 0, 'code' => 1, 'type' => 2, 'title' => 3, 'short_description' => 4, 'description' => 5, 'value' => 6, 'is_used' => 7, 'is_enabled' => 8, 'expiration_date' => 9, 'serialized_rules' => 10, 'created_at' => 11, 'updated_at' => 12, 'version' => 13, ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, ) + self::TYPE_PHPNAME => array('Id' => 0, 'Code' => 1, 'Type' => 2, 'Title' => 3, 'ShortDescription' => 4, 'Description' => 5, 'Amount' => 6, 'IsUsed' => 7, 'IsEnabled' => 8, 'ExpirationDate' => 9, 'SerializedRulesType' => 10, 'SerializedRulesContent' => 11, 'IsCumulative' => 12, 'IsRemovingPostage' => 13, 'CreatedAt' => 14, 'UpdatedAt' => 15, 'Version' => 16, ), + self::TYPE_STUDLYPHPNAME => array('id' => 0, 'code' => 1, 'type' => 2, 'title' => 3, 'shortDescription' => 4, 'description' => 5, 'amount' => 6, 'isUsed' => 7, 'isEnabled' => 8, 'expirationDate' => 9, 'serializedRulesType' => 10, 'serializedRulesContent' => 11, 'isCumulative' => 12, 'isRemovingPostage' => 13, 'createdAt' => 14, 'updatedAt' => 15, 'version' => 16, ), + self::TYPE_COLNAME => array(CouponTableMap::ID => 0, CouponTableMap::CODE => 1, CouponTableMap::TYPE => 2, CouponTableMap::TITLE => 3, CouponTableMap::SHORT_DESCRIPTION => 4, CouponTableMap::DESCRIPTION => 5, CouponTableMap::AMOUNT => 6, CouponTableMap::IS_USED => 7, CouponTableMap::IS_ENABLED => 8, CouponTableMap::EXPIRATION_DATE => 9, CouponTableMap::SERIALIZED_RULES_TYPE => 10, CouponTableMap::SERIALIZED_RULES_CONTENT => 11, CouponTableMap::IS_CUMULATIVE => 12, CouponTableMap::IS_REMOVING_POSTAGE => 13, CouponTableMap::CREATED_AT => 14, CouponTableMap::UPDATED_AT => 15, CouponTableMap::VERSION => 16, ), + self::TYPE_RAW_COLNAME => array('ID' => 0, 'CODE' => 1, 'TYPE' => 2, 'TITLE' => 3, 'SHORT_DESCRIPTION' => 4, 'DESCRIPTION' => 5, 'AMOUNT' => 6, 'IS_USED' => 7, 'IS_ENABLED' => 8, 'EXPIRATION_DATE' => 9, 'SERIALIZED_RULES_TYPE' => 10, 'SERIALIZED_RULES_CONTENT' => 11, 'IS_CUMULATIVE' => 12, 'IS_REMOVING_POSTAGE' => 13, 'CREATED_AT' => 14, 'UPDATED_AT' => 15, 'VERSION' => 16, ), + self::TYPE_FIELDNAME => array('id' => 0, 'code' => 1, 'type' => 2, 'title' => 3, 'short_description' => 4, 'description' => 5, 'amount' => 6, 'is_used' => 7, 'is_enabled' => 8, 'expiration_date' => 9, 'serialized_rules_type' => 10, 'serialized_rules_content' => 11, 'is_cumulative' => 12, 'is_removing_postage' => 13, 'created_at' => 14, 'updated_at' => 15, 'version' => 16, ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, ) ); /** @@ -205,11 +220,14 @@ class CouponTableMap extends TableMap $this->addColumn('TITLE', 'Title', 'VARCHAR', true, 255, null); $this->addColumn('SHORT_DESCRIPTION', 'ShortDescription', 'LONGVARCHAR', true, null, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', true, null, null); - $this->addColumn('VALUE', 'Value', 'FLOAT', true, null, null); + $this->addColumn('AMOUNT', 'Amount', 'FLOAT', true, null, null); $this->addColumn('IS_USED', 'IsUsed', 'TINYINT', true, null, null); $this->addColumn('IS_ENABLED', 'IsEnabled', 'TINYINT', true, null, null); $this->addColumn('EXPIRATION_DATE', 'ExpirationDate', 'TIMESTAMP', true, null, null); - $this->addColumn('SERIALIZED_RULES', 'SerializedRules', 'LONGVARCHAR', true, null, null); + $this->addColumn('SERIALIZED_RULES_TYPE', 'SerializedRulesType', 'LONGVARCHAR', true, null, null); + $this->addColumn('SERIALIZED_RULES_CONTENT', 'SerializedRulesContent', 'LONGVARCHAR', true, null, null); + $this->addColumn('IS_CUMULATIVE', 'IsCumulative', 'TINYINT', true, null, null); + $this->addColumn('IS_REMOVING_POSTAGE', 'IsRemovingPostage', 'TINYINT', true, null, null); $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null); $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null); $this->addColumn('VERSION', 'Version', 'INTEGER', false, null, 0); @@ -394,11 +412,14 @@ class CouponTableMap extends TableMap $criteria->addSelectColumn(CouponTableMap::TITLE); $criteria->addSelectColumn(CouponTableMap::SHORT_DESCRIPTION); $criteria->addSelectColumn(CouponTableMap::DESCRIPTION); - $criteria->addSelectColumn(CouponTableMap::VALUE); + $criteria->addSelectColumn(CouponTableMap::AMOUNT); $criteria->addSelectColumn(CouponTableMap::IS_USED); $criteria->addSelectColumn(CouponTableMap::IS_ENABLED); $criteria->addSelectColumn(CouponTableMap::EXPIRATION_DATE); - $criteria->addSelectColumn(CouponTableMap::SERIALIZED_RULES); + $criteria->addSelectColumn(CouponTableMap::SERIALIZED_RULES_TYPE); + $criteria->addSelectColumn(CouponTableMap::SERIALIZED_RULES_CONTENT); + $criteria->addSelectColumn(CouponTableMap::IS_CUMULATIVE); + $criteria->addSelectColumn(CouponTableMap::IS_REMOVING_POSTAGE); $criteria->addSelectColumn(CouponTableMap::CREATED_AT); $criteria->addSelectColumn(CouponTableMap::UPDATED_AT); $criteria->addSelectColumn(CouponTableMap::VERSION); @@ -409,11 +430,14 @@ class CouponTableMap extends TableMap $criteria->addSelectColumn($alias . '.TITLE'); $criteria->addSelectColumn($alias . '.SHORT_DESCRIPTION'); $criteria->addSelectColumn($alias . '.DESCRIPTION'); - $criteria->addSelectColumn($alias . '.VALUE'); + $criteria->addSelectColumn($alias . '.AMOUNT'); $criteria->addSelectColumn($alias . '.IS_USED'); $criteria->addSelectColumn($alias . '.IS_ENABLED'); $criteria->addSelectColumn($alias . '.EXPIRATION_DATE'); - $criteria->addSelectColumn($alias . '.SERIALIZED_RULES'); + $criteria->addSelectColumn($alias . '.SERIALIZED_RULES_TYPE'); + $criteria->addSelectColumn($alias . '.SERIALIZED_RULES_CONTENT'); + $criteria->addSelectColumn($alias . '.IS_CUMULATIVE'); + $criteria->addSelectColumn($alias . '.IS_REMOVING_POSTAGE'); $criteria->addSelectColumn($alias . '.CREATED_AT'); $criteria->addSelectColumn($alias . '.UPDATED_AT'); $criteria->addSelectColumn($alias . '.VERSION'); diff --git a/core/lib/Thelia/Model/Map/CouponVersionTableMap.php b/core/lib/Thelia/Model/Map/CouponVersionTableMap.php new file mode 100644 index 000000000..68ece7a0f --- /dev/null +++ b/core/lib/Thelia/Model/Map/CouponVersionTableMap.php @@ -0,0 +1,585 @@ + array('Id', 'Code', 'Type', 'Title', 'ShortDescription', 'Description', 'Amount', 'IsUsed', 'IsEnabled', 'ExpirationDate', 'SerializedRulesType', 'SerializedRulesContent', 'IsCumulative', 'IsRemovingPostage', 'CreatedAt', 'UpdatedAt', 'Version', ), + self::TYPE_STUDLYPHPNAME => array('id', 'code', 'type', 'title', 'shortDescription', 'description', 'amount', 'isUsed', 'isEnabled', 'expirationDate', 'serializedRulesType', 'serializedRulesContent', 'isCumulative', 'isRemovingPostage', 'createdAt', 'updatedAt', 'version', ), + self::TYPE_COLNAME => array(CouponVersionTableMap::ID, CouponVersionTableMap::CODE, CouponVersionTableMap::TYPE, CouponVersionTableMap::TITLE, CouponVersionTableMap::SHORT_DESCRIPTION, CouponVersionTableMap::DESCRIPTION, CouponVersionTableMap::AMOUNT, CouponVersionTableMap::IS_USED, CouponVersionTableMap::IS_ENABLED, CouponVersionTableMap::EXPIRATION_DATE, CouponVersionTableMap::SERIALIZED_RULES_TYPE, CouponVersionTableMap::SERIALIZED_RULES_CONTENT, CouponVersionTableMap::IS_CUMULATIVE, CouponVersionTableMap::IS_REMOVING_POSTAGE, CouponVersionTableMap::CREATED_AT, CouponVersionTableMap::UPDATED_AT, CouponVersionTableMap::VERSION, ), + self::TYPE_RAW_COLNAME => array('ID', 'CODE', 'TYPE', 'TITLE', 'SHORT_DESCRIPTION', 'DESCRIPTION', 'AMOUNT', 'IS_USED', 'IS_ENABLED', 'EXPIRATION_DATE', 'SERIALIZED_RULES_TYPE', 'SERIALIZED_RULES_CONTENT', 'IS_CUMULATIVE', 'IS_REMOVING_POSTAGE', 'CREATED_AT', 'UPDATED_AT', 'VERSION', ), + self::TYPE_FIELDNAME => array('id', 'code', 'type', 'title', 'short_description', 'description', 'amount', 'is_used', 'is_enabled', 'expiration_date', 'serialized_rules_type', 'serialized_rules_content', 'is_cumulative', 'is_removing_postage', 'created_at', 'updated_at', 'version', ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, ) + ); + + /** + * holds an array of keys for quick access to the fieldnames array + * + * first dimension keys are the type constants + * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 + */ + protected static $fieldKeys = array ( + self::TYPE_PHPNAME => array('Id' => 0, 'Code' => 1, 'Type' => 2, 'Title' => 3, 'ShortDescription' => 4, 'Description' => 5, 'Amount' => 6, 'IsUsed' => 7, 'IsEnabled' => 8, 'ExpirationDate' => 9, 'SerializedRulesType' => 10, 'SerializedRulesContent' => 11, 'IsCumulative' => 12, 'IsRemovingPostage' => 13, 'CreatedAt' => 14, 'UpdatedAt' => 15, 'Version' => 16, ), + self::TYPE_STUDLYPHPNAME => array('id' => 0, 'code' => 1, 'type' => 2, 'title' => 3, 'shortDescription' => 4, 'description' => 5, 'amount' => 6, 'isUsed' => 7, 'isEnabled' => 8, 'expirationDate' => 9, 'serializedRulesType' => 10, 'serializedRulesContent' => 11, 'isCumulative' => 12, 'isRemovingPostage' => 13, 'createdAt' => 14, 'updatedAt' => 15, 'version' => 16, ), + self::TYPE_COLNAME => array(CouponVersionTableMap::ID => 0, CouponVersionTableMap::CODE => 1, CouponVersionTableMap::TYPE => 2, CouponVersionTableMap::TITLE => 3, CouponVersionTableMap::SHORT_DESCRIPTION => 4, CouponVersionTableMap::DESCRIPTION => 5, CouponVersionTableMap::AMOUNT => 6, CouponVersionTableMap::IS_USED => 7, CouponVersionTableMap::IS_ENABLED => 8, CouponVersionTableMap::EXPIRATION_DATE => 9, CouponVersionTableMap::SERIALIZED_RULES_TYPE => 10, CouponVersionTableMap::SERIALIZED_RULES_CONTENT => 11, CouponVersionTableMap::IS_CUMULATIVE => 12, CouponVersionTableMap::IS_REMOVING_POSTAGE => 13, CouponVersionTableMap::CREATED_AT => 14, CouponVersionTableMap::UPDATED_AT => 15, CouponVersionTableMap::VERSION => 16, ), + self::TYPE_RAW_COLNAME => array('ID' => 0, 'CODE' => 1, 'TYPE' => 2, 'TITLE' => 3, 'SHORT_DESCRIPTION' => 4, 'DESCRIPTION' => 5, 'AMOUNT' => 6, 'IS_USED' => 7, 'IS_ENABLED' => 8, 'EXPIRATION_DATE' => 9, 'SERIALIZED_RULES_TYPE' => 10, 'SERIALIZED_RULES_CONTENT' => 11, 'IS_CUMULATIVE' => 12, 'IS_REMOVING_POSTAGE' => 13, 'CREATED_AT' => 14, 'UPDATED_AT' => 15, 'VERSION' => 16, ), + self::TYPE_FIELDNAME => array('id' => 0, 'code' => 1, 'type' => 2, 'title' => 3, 'short_description' => 4, 'description' => 5, 'amount' => 6, 'is_used' => 7, 'is_enabled' => 8, 'expiration_date' => 9, 'serialized_rules_type' => 10, 'serialized_rules_content' => 11, 'is_cumulative' => 12, 'is_removing_postage' => 13, 'created_at' => 14, 'updated_at' => 15, 'version' => 16, ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, ) + ); + + /** + * Initialize the table attributes and columns + * Relations are not initialized by this method since they are lazy loaded + * + * @return void + * @throws PropelException + */ + public function initialize() + { + // attributes + $this->setName('coupon_version'); + $this->setPhpName('CouponVersion'); + $this->setClassName('\\Thelia\\Model\\CouponVersion'); + $this->setPackage('Thelia.Model'); + $this->setUseIdGenerator(false); + // columns + $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'coupon', 'ID', true, null, null); + $this->addColumn('CODE', 'Code', 'VARCHAR', true, 45, null); + $this->addColumn('TYPE', 'Type', 'VARCHAR', true, 255, null); + $this->addColumn('TITLE', 'Title', 'VARCHAR', true, 255, null); + $this->addColumn('SHORT_DESCRIPTION', 'ShortDescription', 'LONGVARCHAR', true, null, null); + $this->addColumn('DESCRIPTION', 'Description', 'CLOB', true, null, null); + $this->addColumn('AMOUNT', 'Amount', 'FLOAT', true, null, null); + $this->addColumn('IS_USED', 'IsUsed', 'TINYINT', true, null, null); + $this->addColumn('IS_ENABLED', 'IsEnabled', 'TINYINT', true, null, null); + $this->addColumn('EXPIRATION_DATE', 'ExpirationDate', 'TIMESTAMP', true, null, null); + $this->addColumn('SERIALIZED_RULES_TYPE', 'SerializedRulesType', 'LONGVARCHAR', true, null, null); + $this->addColumn('SERIALIZED_RULES_CONTENT', 'SerializedRulesContent', 'LONGVARCHAR', true, null, null); + $this->addColumn('IS_CUMULATIVE', 'IsCumulative', 'TINYINT', true, null, null); + $this->addColumn('IS_REMOVING_POSTAGE', 'IsRemovingPostage', 'TINYINT', true, null, null); + $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null); + $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null); + $this->addPrimaryKey('VERSION', 'Version', 'INTEGER', true, null, 0); + } // initialize() + + /** + * Build the RelationMap objects for this table relationships + */ + public function buildRelations() + { + $this->addRelation('Coupon', '\\Thelia\\Model\\Coupon', RelationMap::MANY_TO_ONE, array('id' => 'id', ), 'CASCADE', null); + } // buildRelations() + + /** + * Adds an object to the instance pool. + * + * Propel keeps cached copies of objects in an instance pool when they are retrieved + * from the database. In some cases you may need to explicitly add objects + * to the cache in order to ensure that the same objects are always returned by find*() + * and findPk*() calls. + * + * @param \Thelia\Model\CouponVersion $obj A \Thelia\Model\CouponVersion object. + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + */ + public static function addInstanceToPool($obj, $key = null) + { + if (Propel::isInstancePoolingEnabled()) { + if (null === $key) { + $key = serialize(array((string) $obj->getId(), (string) $obj->getVersion())); + } // if key === null + self::$instances[$key] = $obj; + } + } + + /** + * Removes an object from the instance pool. + * + * Propel keeps cached copies of objects in an instance pool when they are retrieved + * from the database. In some cases -- especially when you override doDelete + * methods in your stub classes -- you may need to explicitly remove objects + * from the cache in order to prevent returning objects that no longer exist. + * + * @param mixed $value A \Thelia\Model\CouponVersion object or a primary key value. + */ + public static function removeInstanceFromPool($value) + { + if (Propel::isInstancePoolingEnabled() && null !== $value) { + if (is_object($value) && $value instanceof \Thelia\Model\CouponVersion) { + $key = serialize(array((string) $value->getId(), (string) $value->getVersion())); + + } elseif (is_array($value) && count($value) === 2) { + // assume we've been passed a primary key"; + $key = serialize(array((string) $value[0], (string) $value[1])); + } elseif ($value instanceof Criteria) { + self::$instances = []; + + return; + } else { + $e = new PropelException("Invalid value passed to removeInstanceFromPool(). Expected primary key or \Thelia\Model\CouponVersion object; got " . (is_object($value) ? get_class($value) . ' object.' : var_export($value, true))); + throw $e; + } + + unset(self::$instances[$key]); + } + } + + /** + * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table. + * + * For tables with a single-column primary key, that simple pkey value will be returned. For tables with + * a multi-column primary key, a serialize()d version of the primary key will be returned. + * + * @param array $row resultset row. + * @param int $offset The 0-based offset for reading from the resultset row. + * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + */ + public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) + { + // If the PK cannot be derived from the row, return NULL. + if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 16 + $offset : static::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)] === null) { + return null; + } + + return serialize(array((string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 16 + $offset : static::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)])); + } + + /** + * Retrieves the primary key from the DB resultset row + * For tables with a single-column primary key, that simple pkey value will be returned. For tables with + * a multi-column primary key, an array of the primary key columns will be returned. + * + * @param array $row resultset row. + * @param int $offset The 0-based offset for reading from the resultset row. + * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * + * @return mixed The primary key of the row + */ + public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) + { + + return $pks; + } + + /** + * The class that the tableMap will make instances of. + * + * If $withPrefix is true, the returned path + * uses a dot-path notation which is translated into a path + * relative to a location on the PHP include_path. + * (e.g. path.to.MyClass -> 'path/to/MyClass.php') + * + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName + */ + public static function getOMClass($withPrefix = true) + { + return $withPrefix ? CouponVersionTableMap::CLASS_DEFAULT : CouponVersionTableMap::OM_CLASS; + } + + /** + * Populates an object of the default type or an object that inherit from the default. + * + * @param array $row row returned by DataFetcher->fetch(). + * @param int $offset The 0-based offset for reading from the resultset row. + * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType(). + One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + * @return array (CouponVersion object, last column rank) + */ + public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) + { + $key = CouponVersionTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType); + if (null !== ($obj = CouponVersionTableMap::getInstanceFromPool($key))) { + // We no longer rehydrate the object, since this can cause data loss. + // See http://www.propelorm.org/ticket/509 + // $obj->hydrate($row, $offset, true); // rehydrate + $col = $offset + CouponVersionTableMap::NUM_HYDRATE_COLUMNS; + } else { + $cls = CouponVersionTableMap::OM_CLASS; + $obj = new $cls(); + $col = $obj->hydrate($row, $offset, false, $indexType); + CouponVersionTableMap::addInstanceToPool($obj, $key); + } + + return array($obj, $col); + } + + /** + * The returned array will contain objects of the default type or + * objects that inherit from the default. + * + * @param DataFetcherInterface $dataFetcher + * @return array + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function populateObjects(DataFetcherInterface $dataFetcher) + { + $results = array(); + + // set the class once to avoid overhead in the loop + $cls = static::getOMClass(false); + // populate the object(s) + while ($row = $dataFetcher->fetch()) { + $key = CouponVersionTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType()); + if (null !== ($obj = CouponVersionTableMap::getInstanceFromPool($key))) { + // We no longer rehydrate the object, since this can cause data loss. + // See http://www.propelorm.org/ticket/509 + // $obj->hydrate($row, 0, true); // rehydrate + $results[] = $obj; + } else { + $obj = new $cls(); + $obj->hydrate($row); + $results[] = $obj; + CouponVersionTableMap::addInstanceToPool($obj, $key); + } // if key exists + } + + return $results; + } + /** + * Add all the columns needed to create a new object. + * + * Note: any columns that were marked with lazyLoad="true" in the + * XML schema will not be added to the select list and only loaded + * on demand. + * + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function addSelectColumns(Criteria $criteria, $alias = null) + { + if (null === $alias) { + $criteria->addSelectColumn(CouponVersionTableMap::ID); + $criteria->addSelectColumn(CouponVersionTableMap::CODE); + $criteria->addSelectColumn(CouponVersionTableMap::TYPE); + $criteria->addSelectColumn(CouponVersionTableMap::TITLE); + $criteria->addSelectColumn(CouponVersionTableMap::SHORT_DESCRIPTION); + $criteria->addSelectColumn(CouponVersionTableMap::DESCRIPTION); + $criteria->addSelectColumn(CouponVersionTableMap::AMOUNT); + $criteria->addSelectColumn(CouponVersionTableMap::IS_USED); + $criteria->addSelectColumn(CouponVersionTableMap::IS_ENABLED); + $criteria->addSelectColumn(CouponVersionTableMap::EXPIRATION_DATE); + $criteria->addSelectColumn(CouponVersionTableMap::SERIALIZED_RULES_TYPE); + $criteria->addSelectColumn(CouponVersionTableMap::SERIALIZED_RULES_CONTENT); + $criteria->addSelectColumn(CouponVersionTableMap::IS_CUMULATIVE); + $criteria->addSelectColumn(CouponVersionTableMap::IS_REMOVING_POSTAGE); + $criteria->addSelectColumn(CouponVersionTableMap::CREATED_AT); + $criteria->addSelectColumn(CouponVersionTableMap::UPDATED_AT); + $criteria->addSelectColumn(CouponVersionTableMap::VERSION); + } else { + $criteria->addSelectColumn($alias . '.ID'); + $criteria->addSelectColumn($alias . '.CODE'); + $criteria->addSelectColumn($alias . '.TYPE'); + $criteria->addSelectColumn($alias . '.TITLE'); + $criteria->addSelectColumn($alias . '.SHORT_DESCRIPTION'); + $criteria->addSelectColumn($alias . '.DESCRIPTION'); + $criteria->addSelectColumn($alias . '.AMOUNT'); + $criteria->addSelectColumn($alias . '.IS_USED'); + $criteria->addSelectColumn($alias . '.IS_ENABLED'); + $criteria->addSelectColumn($alias . '.EXPIRATION_DATE'); + $criteria->addSelectColumn($alias . '.SERIALIZED_RULES_TYPE'); + $criteria->addSelectColumn($alias . '.SERIALIZED_RULES_CONTENT'); + $criteria->addSelectColumn($alias . '.IS_CUMULATIVE'); + $criteria->addSelectColumn($alias . '.IS_REMOVING_POSTAGE'); + $criteria->addSelectColumn($alias . '.CREATED_AT'); + $criteria->addSelectColumn($alias . '.UPDATED_AT'); + $criteria->addSelectColumn($alias . '.VERSION'); + } + } + + /** + * Returns the TableMap related to this object. + * This method is not needed for general use but a specific application could have a need. + * @return TableMap + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function getTableMap() + { + return Propel::getServiceContainer()->getDatabaseMap(CouponVersionTableMap::DATABASE_NAME)->getTable(CouponVersionTableMap::TABLE_NAME); + } + + /** + * Add a TableMap instance to the database for this tableMap class. + */ + public static function buildTableMap() + { + $dbMap = Propel::getServiceContainer()->getDatabaseMap(CouponVersionTableMap::DATABASE_NAME); + if (!$dbMap->hasTable(CouponVersionTableMap::TABLE_NAME)) { + $dbMap->addTableObject(new CouponVersionTableMap()); + } + } + + /** + * Performs a DELETE on the database, given a CouponVersion or Criteria object OR a primary key value. + * + * @param mixed $values Criteria or CouponVersion object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function doDelete($values, ConnectionInterface $con = null) + { + if (null === $con) { + $con = Propel::getServiceContainer()->getWriteConnection(CouponVersionTableMap::DATABASE_NAME); + } + + if ($values instanceof Criteria) { + // rename for clarity + $criteria = $values; + } elseif ($values instanceof \Thelia\Model\CouponVersion) { // it's a model object + // create criteria based on pk values + $criteria = $values->buildPkeyCriteria(); + } else { // it's a primary key, or an array of pks + $criteria = new Criteria(CouponVersionTableMap::DATABASE_NAME); + // primary key is composite; we therefore, expect + // the primary key passed to be an array of pkey values + if (count($values) == count($values, COUNT_RECURSIVE)) { + // array is not multi-dimensional + $values = array($values); + } + foreach ($values as $value) { + $criterion = $criteria->getNewCriterion(CouponVersionTableMap::ID, $value[0]); + $criterion->addAnd($criteria->getNewCriterion(CouponVersionTableMap::VERSION, $value[1])); + $criteria->addOr($criterion); + } + } + + $query = CouponVersionQuery::create()->mergeWith($criteria); + + if ($values instanceof Criteria) { CouponVersionTableMap::clearInstancePool(); + } elseif (!is_object($values)) { // it's a primary key, or an array of pks + foreach ((array) $values as $singleval) { CouponVersionTableMap::removeInstanceFromPool($singleval); + } + } + + return $query->delete($con); + } + + /** + * Deletes all rows from the coupon_version table. + * + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). + */ + public static function doDeleteAll(ConnectionInterface $con = null) + { + return CouponVersionQuery::create()->doDeleteAll($con); + } + + /** + * Performs an INSERT on the database, given a CouponVersion or Criteria object. + * + * @param mixed $criteria Criteria or CouponVersion object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function doInsert($criteria, ConnectionInterface $con = null) + { + if (null === $con) { + $con = Propel::getServiceContainer()->getWriteConnection(CouponVersionTableMap::DATABASE_NAME); + } + + if ($criteria instanceof Criteria) { + $criteria = clone $criteria; // rename for clarity + } else { + $criteria = $criteria->buildCriteria(); // build Criteria from CouponVersion object + } + + + // Set the correct dbName + $query = CouponVersionQuery::create()->mergeWith($criteria); + + try { + // use transaction because $criteria could contain info + // for more than one table (I guess, conceivably) + $con->beginTransaction(); + $pk = $query->doInsert($con); + $con->commit(); + } catch (PropelException $e) { + $con->rollBack(); + throw $e; + } + + return $pk; + } + +} // CouponVersionTableMap +// This is the static code needed to register the TableMap for this table with the main Propel class. +// +CouponVersionTableMap::buildTableMap(); diff --git a/core/lib/Thelia/Model/Map/ProductAssociatedContentTableMap.php b/core/lib/Thelia/Model/Map/ProductAssociatedContentTableMap.php new file mode 100644 index 000000000..d4d1dadb8 --- /dev/null +++ b/core/lib/Thelia/Model/Map/ProductAssociatedContentTableMap.php @@ -0,0 +1,456 @@ + array('Id', 'ProductId', 'ContentId', 'Position', 'CreatedAt', 'UpdatedAt', ), + self::TYPE_STUDLYPHPNAME => array('id', 'productId', 'contentId', 'position', 'createdAt', 'updatedAt', ), + self::TYPE_COLNAME => array(ProductAssociatedContentTableMap::ID, ProductAssociatedContentTableMap::PRODUCT_ID, ProductAssociatedContentTableMap::CONTENT_ID, ProductAssociatedContentTableMap::POSITION, ProductAssociatedContentTableMap::CREATED_AT, ProductAssociatedContentTableMap::UPDATED_AT, ), + self::TYPE_RAW_COLNAME => array('ID', 'PRODUCT_ID', 'CONTENT_ID', 'POSITION', 'CREATED_AT', 'UPDATED_AT', ), + self::TYPE_FIELDNAME => array('id', 'product_id', 'content_id', 'position', 'created_at', 'updated_at', ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, ) + ); + + /** + * holds an array of keys for quick access to the fieldnames array + * + * first dimension keys are the type constants + * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 + */ + protected static $fieldKeys = array ( + self::TYPE_PHPNAME => array('Id' => 0, 'ProductId' => 1, 'ContentId' => 2, 'Position' => 3, 'CreatedAt' => 4, 'UpdatedAt' => 5, ), + self::TYPE_STUDLYPHPNAME => array('id' => 0, 'productId' => 1, 'contentId' => 2, 'position' => 3, 'createdAt' => 4, 'updatedAt' => 5, ), + self::TYPE_COLNAME => array(ProductAssociatedContentTableMap::ID => 0, ProductAssociatedContentTableMap::PRODUCT_ID => 1, ProductAssociatedContentTableMap::CONTENT_ID => 2, ProductAssociatedContentTableMap::POSITION => 3, ProductAssociatedContentTableMap::CREATED_AT => 4, ProductAssociatedContentTableMap::UPDATED_AT => 5, ), + self::TYPE_RAW_COLNAME => array('ID' => 0, 'PRODUCT_ID' => 1, 'CONTENT_ID' => 2, 'POSITION' => 3, 'CREATED_AT' => 4, 'UPDATED_AT' => 5, ), + self::TYPE_FIELDNAME => array('id' => 0, 'product_id' => 1, 'content_id' => 2, 'position' => 3, 'created_at' => 4, 'updated_at' => 5, ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, ) + ); + + /** + * Initialize the table attributes and columns + * Relations are not initialized by this method since they are lazy loaded + * + * @return void + * @throws PropelException + */ + public function initialize() + { + // attributes + $this->setName('product_associated_content'); + $this->setPhpName('ProductAssociatedContent'); + $this->setClassName('\\Thelia\\Model\\ProductAssociatedContent'); + $this->setPackage('Thelia.Model'); + $this->setUseIdGenerator(true); + // columns + $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null); + $this->addForeignKey('PRODUCT_ID', 'ProductId', 'INTEGER', 'product', 'ID', true, null, null); + $this->addForeignKey('CONTENT_ID', 'ContentId', 'INTEGER', 'content', 'ID', true, null, null); + $this->addColumn('POSITION', 'Position', 'INTEGER', true, null, null); + $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null); + $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null); + } // initialize() + + /** + * Build the RelationMap objects for this table relationships + */ + public function buildRelations() + { + $this->addRelation('Product', '\\Thelia\\Model\\Product', RelationMap::MANY_TO_ONE, array('product_id' => 'id', ), 'CASCADE', 'RESTRICT'); + $this->addRelation('Content', '\\Thelia\\Model\\Content', RelationMap::MANY_TO_ONE, array('content_id' => 'id', ), 'CASCADE', 'RESTRICT'); + } // buildRelations() + + /** + * + * Gets the list of behaviors registered for this table + * + * @return array Associative array (name => parameters) of behaviors + */ + public function getBehaviors() + { + return array( + 'timestampable' => array('create_column' => 'created_at', 'update_column' => 'updated_at', ), + ); + } // getBehaviors() + + /** + * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table. + * + * For tables with a single-column primary key, that simple pkey value will be returned. For tables with + * a multi-column primary key, a serialize()d version of the primary key will be returned. + * + * @param array $row resultset row. + * @param int $offset The 0-based offset for reading from the resultset row. + * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + */ + public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) + { + // If the PK cannot be derived from the row, return NULL. + if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null) { + return null; + } + + return (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; + } + + /** + * Retrieves the primary key from the DB resultset row + * For tables with a single-column primary key, that simple pkey value will be returned. For tables with + * a multi-column primary key, an array of the primary key columns will be returned. + * + * @param array $row resultset row. + * @param int $offset The 0-based offset for reading from the resultset row. + * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM + * + * @return mixed The primary key of the row + */ + public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) + { + + return (int) $row[ + $indexType == TableMap::TYPE_NUM + ? 0 + $offset + : self::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType) + ]; + } + + /** + * The class that the tableMap will make instances of. + * + * If $withPrefix is true, the returned path + * uses a dot-path notation which is translated into a path + * relative to a location on the PHP include_path. + * (e.g. path.to.MyClass -> 'path/to/MyClass.php') + * + * @param boolean $withPrefix Whether or not to return the path with the class name + * @return string path.to.ClassName + */ + public static function getOMClass($withPrefix = true) + { + return $withPrefix ? ProductAssociatedContentTableMap::CLASS_DEFAULT : ProductAssociatedContentTableMap::OM_CLASS; + } + + /** + * Populates an object of the default type or an object that inherit from the default. + * + * @param array $row row returned by DataFetcher->fetch(). + * @param int $offset The 0-based offset for reading from the resultset row. + * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType(). + One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME + * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. + * + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + * @return array (ProductAssociatedContent object, last column rank) + */ + public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) + { + $key = ProductAssociatedContentTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType); + if (null !== ($obj = ProductAssociatedContentTableMap::getInstanceFromPool($key))) { + // We no longer rehydrate the object, since this can cause data loss. + // See http://www.propelorm.org/ticket/509 + // $obj->hydrate($row, $offset, true); // rehydrate + $col = $offset + ProductAssociatedContentTableMap::NUM_HYDRATE_COLUMNS; + } else { + $cls = ProductAssociatedContentTableMap::OM_CLASS; + $obj = new $cls(); + $col = $obj->hydrate($row, $offset, false, $indexType); + ProductAssociatedContentTableMap::addInstanceToPool($obj, $key); + } + + return array($obj, $col); + } + + /** + * The returned array will contain objects of the default type or + * objects that inherit from the default. + * + * @param DataFetcherInterface $dataFetcher + * @return array + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function populateObjects(DataFetcherInterface $dataFetcher) + { + $results = array(); + + // set the class once to avoid overhead in the loop + $cls = static::getOMClass(false); + // populate the object(s) + while ($row = $dataFetcher->fetch()) { + $key = ProductAssociatedContentTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType()); + if (null !== ($obj = ProductAssociatedContentTableMap::getInstanceFromPool($key))) { + // We no longer rehydrate the object, since this can cause data loss. + // See http://www.propelorm.org/ticket/509 + // $obj->hydrate($row, 0, true); // rehydrate + $results[] = $obj; + } else { + $obj = new $cls(); + $obj->hydrate($row); + $results[] = $obj; + ProductAssociatedContentTableMap::addInstanceToPool($obj, $key); + } // if key exists + } + + return $results; + } + /** + * Add all the columns needed to create a new object. + * + * Note: any columns that were marked with lazyLoad="true" in the + * XML schema will not be added to the select list and only loaded + * on demand. + * + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function addSelectColumns(Criteria $criteria, $alias = null) + { + if (null === $alias) { + $criteria->addSelectColumn(ProductAssociatedContentTableMap::ID); + $criteria->addSelectColumn(ProductAssociatedContentTableMap::PRODUCT_ID); + $criteria->addSelectColumn(ProductAssociatedContentTableMap::CONTENT_ID); + $criteria->addSelectColumn(ProductAssociatedContentTableMap::POSITION); + $criteria->addSelectColumn(ProductAssociatedContentTableMap::CREATED_AT); + $criteria->addSelectColumn(ProductAssociatedContentTableMap::UPDATED_AT); + } else { + $criteria->addSelectColumn($alias . '.ID'); + $criteria->addSelectColumn($alias . '.PRODUCT_ID'); + $criteria->addSelectColumn($alias . '.CONTENT_ID'); + $criteria->addSelectColumn($alias . '.POSITION'); + $criteria->addSelectColumn($alias . '.CREATED_AT'); + $criteria->addSelectColumn($alias . '.UPDATED_AT'); + } + } + + /** + * Returns the TableMap related to this object. + * This method is not needed for general use but a specific application could have a need. + * @return TableMap + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function getTableMap() + { + return Propel::getServiceContainer()->getDatabaseMap(ProductAssociatedContentTableMap::DATABASE_NAME)->getTable(ProductAssociatedContentTableMap::TABLE_NAME); + } + + /** + * Add a TableMap instance to the database for this tableMap class. + */ + public static function buildTableMap() + { + $dbMap = Propel::getServiceContainer()->getDatabaseMap(ProductAssociatedContentTableMap::DATABASE_NAME); + if (!$dbMap->hasTable(ProductAssociatedContentTableMap::TABLE_NAME)) { + $dbMap->addTableObject(new ProductAssociatedContentTableMap()); + } + } + + /** + * Performs a DELETE on the database, given a ProductAssociatedContent or Criteria object OR a primary key value. + * + * @param mixed $values Criteria or ProductAssociatedContent object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function doDelete($values, ConnectionInterface $con = null) + { + if (null === $con) { + $con = Propel::getServiceContainer()->getWriteConnection(ProductAssociatedContentTableMap::DATABASE_NAME); + } + + if ($values instanceof Criteria) { + // rename for clarity + $criteria = $values; + } elseif ($values instanceof \Thelia\Model\ProductAssociatedContent) { // it's a model object + // create criteria based on pk values + $criteria = $values->buildPkeyCriteria(); + } else { // it's a primary key, or an array of pks + $criteria = new Criteria(ProductAssociatedContentTableMap::DATABASE_NAME); + $criteria->add(ProductAssociatedContentTableMap::ID, (array) $values, Criteria::IN); + } + + $query = ProductAssociatedContentQuery::create()->mergeWith($criteria); + + if ($values instanceof Criteria) { ProductAssociatedContentTableMap::clearInstancePool(); + } elseif (!is_object($values)) { // it's a primary key, or an array of pks + foreach ((array) $values as $singleval) { ProductAssociatedContentTableMap::removeInstanceFromPool($singleval); + } + } + + return $query->delete($con); + } + + /** + * Deletes all rows from the product_associated_content table. + * + * @param ConnectionInterface $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). + */ + public static function doDeleteAll(ConnectionInterface $con = null) + { + return ProductAssociatedContentQuery::create()->doDeleteAll($con); + } + + /** + * Performs an INSERT on the database, given a ProductAssociatedContent or Criteria object. + * + * @param mixed $criteria Criteria or ProductAssociatedContent object containing data that is used to create the INSERT statement. + * @param ConnectionInterface $con the ConnectionInterface connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function doInsert($criteria, ConnectionInterface $con = null) + { + if (null === $con) { + $con = Propel::getServiceContainer()->getWriteConnection(ProductAssociatedContentTableMap::DATABASE_NAME); + } + + if ($criteria instanceof Criteria) { + $criteria = clone $criteria; // rename for clarity + } else { + $criteria = $criteria->buildCriteria(); // build Criteria from ProductAssociatedContent object + } + + if ($criteria->containsKey(ProductAssociatedContentTableMap::ID) && $criteria->keyContainsValue(ProductAssociatedContentTableMap::ID) ) { + throw new PropelException('Cannot insert a value for auto-increment primary key ('.ProductAssociatedContentTableMap::ID.')'); + } + + + // Set the correct dbName + $query = ProductAssociatedContentQuery::create()->mergeWith($criteria); + + try { + // use transaction because $criteria could contain info + // for more than one table (I guess, conceivably) + $con->beginTransaction(); + $pk = $query->doInsert($con); + $con->commit(); + } catch (PropelException $e) { + $con->rollBack(); + throw $e; + } + + return $pk; + } + +} // ProductAssociatedContentTableMap +// This is the static code needed to register the TableMap for this table with the main Propel class. +// +ProductAssociatedContentTableMap::buildTableMap(); diff --git a/core/lib/Thelia/Model/Map/ProductTableMap.php b/core/lib/Thelia/Model/Map/ProductTableMap.php index ef2cc7ca0..81badfba0 100644 --- a/core/lib/Thelia/Model/Map/ProductTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductTableMap.php @@ -200,13 +200,13 @@ class ProductTableMap extends TableMap $this->addRelation('ProductCategory', '\\Thelia\\Model\\ProductCategory', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), 'CASCADE', 'RESTRICT', 'ProductCategories'); $this->addRelation('FeatureProduct', '\\Thelia\\Model\\FeatureProduct', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), 'CASCADE', 'RESTRICT', 'FeatureProducts'); $this->addRelation('ProductSaleElements', '\\Thelia\\Model\\ProductSaleElements', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), 'CASCADE', 'RESTRICT', 'ProductSaleElementss'); - $this->addRelation('ContentAssoc', '\\Thelia\\Model\\ContentAssoc', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), 'CASCADE', 'RESTRICT', 'ContentAssocs'); $this->addRelation('ProductImage', '\\Thelia\\Model\\ProductImage', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), 'CASCADE', 'RESTRICT', 'ProductImages'); $this->addRelation('ProductDocument', '\\Thelia\\Model\\ProductDocument', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), 'CASCADE', 'RESTRICT', 'ProductDocuments'); $this->addRelation('AccessoryRelatedByProductId', '\\Thelia\\Model\\Accessory', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), 'CASCADE', 'RESTRICT', 'AccessoriesRelatedByProductId'); $this->addRelation('AccessoryRelatedByAccessory', '\\Thelia\\Model\\Accessory', RelationMap::ONE_TO_MANY, array('id' => 'accessory', ), 'CASCADE', 'RESTRICT', 'AccessoriesRelatedByAccessory'); $this->addRelation('Rewriting', '\\Thelia\\Model\\Rewriting', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), 'CASCADE', 'RESTRICT', 'Rewritings'); $this->addRelation('CartItem', '\\Thelia\\Model\\CartItem', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), null, null, 'CartItems'); + $this->addRelation('ProductAssociatedContent', '\\Thelia\\Model\\ProductAssociatedContent', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), 'CASCADE', 'RESTRICT', 'ProductAssociatedContents'); $this->addRelation('ProductI18n', '\\Thelia\\Model\\ProductI18n', RelationMap::ONE_TO_MANY, array('id' => 'id', ), 'CASCADE', null, 'ProductI18ns'); $this->addRelation('ProductVersion', '\\Thelia\\Model\\ProductVersion', RelationMap::ONE_TO_MANY, array('id' => 'id', ), 'CASCADE', null, 'ProductVersions'); $this->addRelation('Category', '\\Thelia\\Model\\Category', RelationMap::MANY_TO_MANY, array(), 'CASCADE', 'RESTRICT', 'Categories'); @@ -238,11 +238,11 @@ class ProductTableMap extends TableMap ProductCategoryTableMap::clearInstancePool(); FeatureProductTableMap::clearInstancePool(); ProductSaleElementsTableMap::clearInstancePool(); - ContentAssocTableMap::clearInstancePool(); ProductImageTableMap::clearInstancePool(); ProductDocumentTableMap::clearInstancePool(); AccessoryTableMap::clearInstancePool(); RewritingTableMap::clearInstancePool(); + ProductAssociatedContentTableMap::clearInstancePool(); ProductI18nTableMap::clearInstancePool(); ProductVersionTableMap::clearInstancePool(); } diff --git a/core/lib/Thelia/Model/ProductAssociatedContent.php b/core/lib/Thelia/Model/ProductAssociatedContent.php new file mode 100644 index 000000000..9b007baf1 --- /dev/null +++ b/core/lib/Thelia/Model/ProductAssociatedContent.php @@ -0,0 +1,9 @@ +generateValidCouponBaseAdapterMock(); $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => array( - AvailableForTotalAmount::OPERATOR => Operators::SUPERIOR, - AvailableForTotalAmount::VALUE => new PriceParam(421.23, 'EUR') + AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( + Operators::SUPERIOR, + new PriceParam( + 421.23, + 'EUR' + ) ) ); $validated = array( @@ -104,9 +108,12 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => array( - AvailableForTotalAmount::OPERATOR => 'X', - AvailableForTotalAmount::VALUE => new PriceParam(421.23, 'EUR') + AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( + 'X', + new PriceParam( + 421.23, + 'EUR' + ) ) ); @@ -123,7 +130,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase /** * * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkBackOfficeInput - * @expectedException \Thelia\Exception\InvalidRuleValueException + * @expectedException ErrorException * */ public function testInValidBackOfficeInputValue() @@ -132,9 +139,9 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => array( - AvailableForTotalAmount::OPERATOR => Operators::SUPERIOR, - AvailableForTotalAmount::VALUE => 421 + AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( + Operators::SUPERIOR, + 421 ) ); @@ -161,9 +168,12 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => array( - AvailableForTotalAmount::OPERATOR => Operators::SUPERIOR, - AvailableForTotalAmount::VALUE => new PriceParam(421.23, 'EUR') + AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( + Operators::SUPERIOR, + new PriceParam( + 421.23, + 'EUR' + ) ) ); @@ -186,9 +196,12 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase public function testInValidCheckoutInputValue() { $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => array( - AvailableForTotalAmount::OPERATOR => Operators::SUPERIOR, - AvailableForTotalAmount::VALUE => new PriceParam(421.23, 'EUR') + AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( + Operators::SUPERIOR, + new PriceParam( + 421.23, + 'EUR' + ) ) ); @@ -211,9 +224,12 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase public function testInValidCheckoutInputType() { $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => array( - AvailableForTotalAmount::OPERATOR => Operators::SUPERIOR, - AvailableForTotalAmount::VALUE => new PriceParam(421.23, 'EUR') + AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( + Operators::SUPERIOR, + new PriceParam( + 421.23, + 'EUR' + ) ) ); @@ -227,6 +243,60 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase $this->assertEquals($expected, $actual); } + /** + * + * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::isMatching + * + */ + public function testMatchingRuleInferior() + { + $validators = array( + AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( + Operators::INFERIOR, + new PriceParam( + 421.23, + 'EUR' + ) + ) + ); + + $validated = array( + AvailableForTotalAmount::PARAM1_PRICE => 421.22 + ); + $rule = new AvailableForTotalAmount($validators, $validated); + + $expected = true; + $actual = $rule->isMatching(); + $this->assertEquals($expected, $actual); + } + + /** + * + * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::isMatching + * + */ + public function testNotMatchingRuleInferior() + { + $validators = array( + AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( + Operators::INFERIOR, + new PriceParam( + 421.23, + 'EUR' + ) + ) + ); + + $validated = array( + AvailableForTotalAmount::PARAM1_PRICE => 421.23 + ); + $rule = new AvailableForTotalAmount($validators, $validated); + + $expected = false; + $actual = $rule->isMatching(); + $this->assertEquals($expected, $actual); + } + /** * * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::isMatching @@ -238,9 +308,12 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => array( - AvailableForTotalAmount::OPERATOR => Operators::EQUAL, - AvailableForTotalAmount::VALUE => new PriceParam(421.23, 'EUR') + AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( + Operators::EQUAL, + new PriceParam( + 421.23, + 'EUR' + ) ) ); @@ -262,9 +335,12 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase public function testNotMatchingRuleEqual() { $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => array( - AvailableForTotalAmount::OPERATOR => Operators::EQUAL, - AvailableForTotalAmount::VALUE => new PriceParam(421.23, 'EUR') + AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( + Operators::EQUAL, + new PriceParam( + 421.23, + 'EUR' + ) ) ); @@ -286,9 +362,12 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase public function testMatchingRuleSuperior() { $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => array( - AvailableForTotalAmount::OPERATOR => Operators::SUPERIOR, - AvailableForTotalAmount::VALUE => new PriceParam(421.23, 'EUR') + AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( + Operators::SUPERIOR, + new PriceParam( + 421.23, + 'EUR' + ) ) ); @@ -310,9 +389,12 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase public function testNotMatchingRuleSuperior() { $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => array( - AvailableForTotalAmount::OPERATOR => Operators::SUPERIOR, - AvailableForTotalAmount::VALUE => new PriceParam(421.23, 'EUR') + AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( + Operators::SUPERIOR, + new PriceParam( + 421.23, + 'EUR' + ) ) ); diff --git a/install/faker.php b/install/faker.php index b262a8460..7f0159a8d 100755 --- a/install/faker.php +++ b/install/faker.php @@ -6,13 +6,19 @@ use Thelia\Model\FolderImage; use Thelia\Model\ContentImage; use Imagine\Image\Color; use Imagine\Image\Point; +use Symfony\Component\Serializer\Serializer; +use Symfony\Component\Serializer\Encoder\XmlEncoder; +use Symfony\Component\Serializer\Encoder\JsonEncoder; +use Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer; require __DIR__ . '/../core/bootstrap.php'; $thelia = new Thelia\Core\Thelia("dev", true); $faker = Faker\Factory::create(); -$con = \Propel\Runtime\Propel::getConnection(Thelia\Model\Map\ProductTableMap::DATABASE_NAME); +$con = \Propel\Runtime\Propel::getConnection( + Thelia\Model\Map\ProductTableMap::DATABASE_NAME +); $con->beginTransaction(); $currency = \Thelia\Model\CurrencyQuery::create()->filterByCode('EUR')->findOne(); @@ -282,6 +288,8 @@ try { } } + generateCouponFixtures(); + $con->commit(); } catch (PropelException $pe) { @@ -294,4 +302,69 @@ catch (Exception $e) { } +/** + * Generate Coupon fixtures + */ +function generateCouponFixtures() +{ + // Coupons + $coupon1 = new Thelia\Model\Coupon(); + $coupon1->setCode('XMAS'); + $coupon1->setType('Thelia\Coupon\Type\RemoveXAmount'); + $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(1); + $coupon1->setIsEnabled(1); + $date = new \DateTime(); + $coupon1->setExpirationDate($date->setTimestamp(strtotime("today + 2 months"))); + + $rule1 = new Thelia\Coupon\Rule\AvailableForTotalAmount( + array( + Thelia\Coupon\Rule\AvailableForTotalAmount::PARAM1_PRICE => new Thelia\Coupon\Parameter\RuleValidator( + Thelia\Coupon\Rule\Operators::SUPERIOR, + new Thelia\Coupon\Parameter\PriceParam( + 40.00, + 'EUR' + ) + ) + ) + ); + $rule2 = new Thelia\Coupon\Rule\AvailableForTotalAmount( + array( + Thelia\Coupon\Rule\AvailableForTotalAmount::PARAM1_PRICE => new Thelia\Coupon\Parameter\RuleValidator( + Thelia\Coupon\Rule\Operators::INFERIOR, + new Thelia\Coupon\Parameter\PriceParam( + 400.00, + 'EUR' + ) + ) + ) + ); + $rules = array($rule1, $rule2); + + $encoders = array(new XmlEncoder(), new JsonEncoder()); + $normalizers = array(new GetSetMethodNormalizer()); + $serializer = new Serializer($normalizers, $encoders); + + $ruleTypes = array(); + /** @var Thelia\Coupon\Rule\CouponRuleInterface $rule */ + foreach ($rules as $rule) { + $ruleTypes[] = get_class($rule); + } + $coupon1->setSerializedRulesType($serializer->serialize($ruleTypes, 'json')); + $coupon1->setSerializedRulesContent($serializer->serialize($rules, 'json')); + + $coupon1->setIsCumulative(1); + $coupon1->setIsRemovingPostage(0); + $coupon1->save(); +} \ No newline at end of file diff --git a/install/thelia.sql b/install/thelia.sql index 502bbd036..83f86248e 100755 --- a/install/thelia.sql +++ b/install/thelia.sql @@ -567,42 +567,6 @@ CREATE TABLE `content` PRIMARY KEY (`id`) ) ENGINE=InnoDB; --- --------------------------------------------------------------------- --- content_assoc --- --------------------------------------------------------------------- - -DROP TABLE IF EXISTS `content_assoc`; - -CREATE TABLE `content_assoc` -( - `id` INTEGER NOT NULL AUTO_INCREMENT, - `category_id` INTEGER, - `product_id` INTEGER, - `content_id` INTEGER, - `position` INTEGER, - `created_at` DATETIME, - `updated_at` DATETIME, - PRIMARY KEY (`id`), - INDEX `idx_content_assoc_category_id` (`category_id`), - INDEX `idx_content_assoc_product_id` (`product_id`), - INDEX `idx_content_assoc_content_id` (`content_id`), - CONSTRAINT `fk_content_assoc_category_id` - FOREIGN KEY (`category_id`) - REFERENCES `category` (`id`) - ON UPDATE RESTRICT - ON DELETE CASCADE, - CONSTRAINT `fk_content_assoc_product_id` - FOREIGN KEY (`product_id`) - REFERENCES `product` (`id`) - ON UPDATE RESTRICT - ON DELETE CASCADE, - CONSTRAINT `fk_content_assoc_content_id` - FOREIGN KEY (`content_id`) - REFERENCES `content` (`id`) - ON UPDATE RESTRICT - ON DELETE CASCADE -) ENGINE=InnoDB; - -- --------------------------------------------------------------------- -- product_image -- --------------------------------------------------------------------- @@ -846,7 +810,7 @@ DROP TABLE IF EXISTS `accessory`; CREATE TABLE `accessory` ( - `id` INTEGER NOT NULL, + `id` INTEGER NOT NULL AUTO_INCREMENT, `product_id` INTEGER NOT NULL, `accessory` INTEGER NOT NULL, `position` INTEGER NOT NULL, @@ -1121,16 +1085,26 @@ CREATE TABLE `coupon` `title` VARCHAR(255) NOT NULL, `short_description` TEXT NOT NULL, `description` LONGTEXT NOT NULL, - `value` FLOAT NOT NULL, + `amount` FLOAT NOT NULL, `is_used` TINYINT NOT NULL, `is_enabled` TINYINT NOT NULL, `expiration_date` DATETIME NOT NULL, - `serialized_rules` TEXT NOT NULL, + `serialized_rules_type` TEXT NOT NULL, + `serialized_rules_content` TEXT NOT NULL, + `is_cumulative` TINYINT NOT NULL, + `is_removing_postage` TINYINT NOT NULL, `created_at` DATETIME, `updated_at` DATETIME, `version` INTEGER DEFAULT 0, PRIMARY KEY (`id`), - UNIQUE INDEX `code_UNIQUE` (`code`) + UNIQUE INDEX `code_UNIQUE` (`code`), + INDEX `idx_is_enabled` (`is_enabled`), + INDEX `idx_is_used` (`is_used`), + INDEX `idx_type` (`type`), + INDEX `idx_amount` (`amount`), + INDEX `idx_expiration_date` (`expiration_date`), + INDEX `idx_is_cumulative` (`is_cumulative`), + INDEX `idx_is_removing_postage` (`is_removing_postage`) ) ENGINE=InnoDB; -- --------------------------------------------------------------------- @@ -1441,6 +1415,64 @@ CREATE TABLE `folder_document` ON DELETE CASCADE ) ENGINE=InnoDB; +-- --------------------------------------------------------------------- +-- product_associated_content +-- --------------------------------------------------------------------- + +DROP TABLE IF EXISTS `product_associated_content`; + +CREATE TABLE `product_associated_content` +( + `id` INTEGER NOT NULL AUTO_INCREMENT, + `product_id` INTEGER NOT NULL, + `content_id` INTEGER NOT NULL, + `position` INTEGER NOT NULL, + `created_at` DATETIME, + `updated_at` DATETIME, + PRIMARY KEY (`id`), + INDEX `idx_product_associated_content_product_id` (`product_id`), + INDEX `idx_product_associated_content_content_id` (`content_id`), + CONSTRAINT `fk_product_associated_content_product_id` + FOREIGN KEY (`product_id`) + REFERENCES `product` (`id`) + ON UPDATE RESTRICT + ON DELETE CASCADE, + CONSTRAINT `fk_product_associated_content_content_id` + FOREIGN KEY (`content_id`) + REFERENCES `content` (`id`) + ON UPDATE RESTRICT + ON DELETE CASCADE +) ENGINE=InnoDB; + +-- --------------------------------------------------------------------- +-- category_associated_content +-- --------------------------------------------------------------------- + +DROP TABLE IF EXISTS `category_associated_content`; + +CREATE TABLE `category_associated_content` +( + `id` INTEGER NOT NULL AUTO_INCREMENT, + `category_id` INTEGER NOT NULL, + `content_id` INTEGER NOT NULL, + `position` INTEGER NOT NULL, + `created_at` DATETIME, + `updated_at` DATETIME, + PRIMARY KEY (`id`), + INDEX `idx_category_associated_content_category_id` (`category_id`), + INDEX `idx_category_associated_content_content_id` (`content_id`), + CONSTRAINT `fk_category_associated_content_category_id` + FOREIGN KEY (`category_id`) + REFERENCES `category` (`id`) + ON UPDATE RESTRICT + ON DELETE CASCADE, + CONSTRAINT `fk_category_associated_content_content_id` + FOREIGN KEY (`content_id`) + REFERENCES `content` (`id`) + ON UPDATE RESTRICT + ON DELETE CASCADE +) ENGINE=InnoDB; + -- --------------------------------------------------------------------- -- category_i18n -- --------------------------------------------------------------------- @@ -2147,11 +2179,14 @@ CREATE TABLE `coupon_version` `title` VARCHAR(255) NOT NULL, `short_description` TEXT NOT NULL, `description` LONGTEXT NOT NULL, - `value` FLOAT NOT NULL, + `amount` FLOAT NOT NULL, `is_used` TINYINT NOT NULL, `is_enabled` TINYINT NOT NULL, `expiration_date` DATETIME NOT NULL, - `serialized_rules` TEXT NOT NULL, + `serialized_rules_type` TEXT NOT NULL, + `serialized_rules_content` TEXT NOT NULL, + `is_cumulative` TINYINT NOT NULL, + `is_removing_postage` TINYINT NOT NULL, `created_at` DATETIME, `updated_at` DATETIME, `version` INTEGER DEFAULT 0 NOT NULL, diff --git a/local/config/schema.xml b/local/config/schema.xml index 062e778ad..71914d771 100755 --- a/local/config/schema.xml +++ b/local/config/schema.xml @@ -425,32 +425,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -631,7 +605,7 @@
- + @@ -821,14 +795,38 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1083,4 +1081,42 @@
+ + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
\ No newline at end of file From eae86cd797dfd1fa8f5054a26a27f0640f50efee Mon Sep 17 00:00:00 2001 From: gmorel Date: Fri, 23 Aug 2013 20:00:32 +0200 Subject: [PATCH 009/125] WIP Coupon Refactor --- .../Thelia/Coupon/CouponAdapterInterface.php | 21 ++ core/lib/Thelia/Coupon/CouponBaseAdapter.php | 48 ++- core/lib/Thelia/Coupon/CouponFactory.php | 65 ++-- core/lib/Thelia/Coupon/CouponManager.php | 33 +- .../Thelia/Coupon/CouponRuleCollection.php | 88 ++++++ .../Thelia/Coupon/Rule/AvailableForDate.php | 29 +- .../Coupon/Rule/AvailableForLocationX.php | 27 +- .../Thelia/Coupon/Rule/AvailableForPeriod.php | 25 +- .../Coupon/Rule/AvailableForRepeatedDate.php | 25 +- .../Rule/AvailableForRepeatedPeriod.php | 35 ++- .../Coupon/Rule/AvailableForTotalAmount.php | 3 +- .../AvailableForTotalAmountForCategoryY.php | 26 -- .../Coupon/Rule/AvailableForXArticles.php | 27 +- .../Coupon/Rule/CouponRuleInterface.php | 2 - .../lib/Thelia/Coupon/Type/CouponAbstract.php | 99 ++++-- .../Thelia/Coupon/Type/CouponInterface.php | 44 ++- core/lib/Thelia/Coupon/Type/RemoveXAmount.php | 26 +- .../Exception/CouponExpiredException.php | 53 ++++ .../Thelia/Exception/InvalidRuleException.php | 4 +- .../InvalidRuleOperatorException.php | 3 +- .../Exception/InvalidRuleValueException.php | 3 +- core/lib/Thelia/Model/Base/Coupon.php | 284 ++++++++++------- core/lib/Thelia/Model/Base/CouponQuery.php | 137 +++++--- core/lib/Thelia/Model/Base/CouponVersion.php | 274 ++++++++++------ .../Thelia/Model/Base/CouponVersionQuery.php | 137 +++++--- core/lib/Thelia/Model/Map/CouponTableMap.php | 62 ++-- .../Model/Map/CouponVersionTableMap.php | 66 ++-- .../Tests/Coupon/CouponBaseAdapterTest.php | 2 +- .../Thelia/Tests/Coupon/CouponFactoryTest.php | 245 ++++++++++++++- .../Thelia/Tests/Coupon/CouponManagerTest.php | 297 ++++++++++++++---- .../Tests/Coupon/CouponRuleCollectionTest.php | 81 +++++ .../Tests/Coupon/Parameter/DateParamTest.php | 2 +- .../Coupon/Parameter/IntegerParamTest.php | 2 +- .../Coupon/Parameter/IntervalParamTest.php | 2 +- .../Tests/Coupon/Parameter/PriceParamTest.php | 2 +- .../Coupon/Parameter/QuantityParamTest.php | 2 +- .../Parameter/RepeatedDateParamTest.php | 2 +- .../Parameter/RepeatedIntervalParamTest.php | 2 +- .../Rule/AvailableForTotalAmountTest.php | 2 +- .../Coupon/Rule/AvailableForXArticlesTest.php | 2 +- .../{OperatorTest.php => OperatorsTest.php} | 4 +- .../Thelia/Tests/Coupon/RuleOrganizerTest.php | 2 +- .../Type/RemoveXAmountForCategoryYTest.php | 2 +- .../Tests/Coupon/Type/RemoveXAmountTest.php | 2 +- .../Type/RemoveXPercentForCategoryYTest.php | 2 +- .../Tests/Coupon/Type/RemoveXPercentTest.php | 2 +- core/lib/Thelia/Tools/PhpUnitUtils.php | 55 ++++ install/faker.php | 14 +- install/thelia.sql | 14 +- local/config/schema.xml | 13 +- 50 files changed, 1723 insertions(+), 676 deletions(-) create mode 100644 core/lib/Thelia/Coupon/CouponRuleCollection.php create mode 100644 core/lib/Thelia/Exception/CouponExpiredException.php create mode 100644 core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php rename core/lib/Thelia/Tests/Coupon/Rule/{OperatorTest.php => OperatorsTest.php} (98%) create mode 100644 core/lib/Thelia/Tools/PhpUnitUtils.php diff --git a/core/lib/Thelia/Coupon/CouponAdapterInterface.php b/core/lib/Thelia/Coupon/CouponAdapterInterface.php index 0a900183e..9db1160f1 100644 --- a/core/lib/Thelia/Coupon/CouponAdapterInterface.php +++ b/core/lib/Thelia/Coupon/CouponAdapterInterface.php @@ -23,6 +23,9 @@ namespace Thelia\Coupon; +use Thelia\Coupon\Type\CouponInterface; +use Thelia\Model\Coupon; + /** * Created by JetBrains PhpStorm. * Date: 8/19/13 @@ -93,4 +96,22 @@ interface CouponAdapterInterface */ public function getCurrentCoupons(); + /** + * Find one Coupon in the database from its code + * + * @param string $code Coupon code + * + * @return Coupon + */ + public function findOneCouponByCode($code); + + /** + * Save a Coupon in the database + * + * @param CouponInterface $coupon Coupon + * + * @return $this + */ + public function saveCoupon(CouponInterface $coupon); + } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/CouponBaseAdapter.php b/core/lib/Thelia/Coupon/CouponBaseAdapter.php index a79ac5407..180ddc3cd 100644 --- a/core/lib/Thelia/Coupon/CouponBaseAdapter.php +++ b/core/lib/Thelia/Coupon/CouponBaseAdapter.php @@ -23,6 +23,10 @@ namespace Thelia\Coupon; +use Thelia\Coupon\Type\CouponInterface; +use Thelia\Model\Coupon; +use Thelia\Model\CouponQuery; + /** * Created by JetBrains PhpStorm. * Date: 8/19/13 @@ -30,6 +34,7 @@ namespace Thelia\Coupon; * * @package Coupon * @author Guillaume MOREL + * @todo implements * */ class CouponBaseAdapter implements CouponAdapterInterface @@ -111,7 +116,7 @@ class CouponBaseAdapter implements CouponAdapterInterface */ public function getCurrentCoupons() { - $couponFactory = new CouponFactory(); + $couponFactory = new CouponFactory($this); // @todo Get from Session $couponCodes = array('XMAS', 'SPRINGBREAK'); @@ -124,5 +129,46 @@ class CouponBaseAdapter implements CouponAdapterInterface return $coupons; } + /** + * Find one Coupon in the database from its code + * + * @param string $code Coupon code + * + * @return Coupon + */ + public function findOneCouponByCode($code) + { + $couponQuery = CouponQuery::create(); + + return $couponQuery->findOneByCode($code); + } + + /** + * Save a Coupon in the database + * + * @param CouponInterface $coupon Coupon + * + * @return $this + */ + public function saveCoupon(CouponInterface $coupon) + { +// $couponModel = new Coupon(); +// $couponModel->setCode($coupon->getCode()); +// $couponModel->setType(get_class($coupon)); +// $couponModel->setTitle($coupon->getTitle()); +// $couponModel->setShortDescription($coupon->getShortDescription()); +// $couponModel->setDescription($coupon->getDescription()); +// $couponModel->setAmount($coupon->getEffect()); +// $couponModel->setIsUsed(0); +// $couponModel->setIsEnabled(1); +// $couponModel->set +// $couponModel->set +// $couponModel->set +// $couponModel->set +// $couponModel->set +// $couponModel->set +// $couponModel->set + } + } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/CouponFactory.php b/core/lib/Thelia/Coupon/CouponFactory.php index f81e95b97..d82bb3430 100644 --- a/core/lib/Thelia/Coupon/CouponFactory.php +++ b/core/lib/Thelia/Coupon/CouponFactory.php @@ -23,13 +23,12 @@ namespace Thelia\Coupon; +use Symfony\Component\Translation\Exception\NotFoundResourceException; use Thelia\Coupon\Type\CouponInterface; use Thelia\Coupon\Type\RemoveXAmount; -use Thelia\Model\Base\CouponQuery; +use Thelia\Exception\CouponExpiredException; use Thelia\Model\Coupon; -use Symfony\Component\Serializer\Serializer; use Symfony\Component\Serializer\Encoder\JsonEncoder; -use Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer; /** * Created by JetBrains PhpStorm. @@ -44,18 +43,41 @@ use Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer; */ class CouponFactory { + /** @var CouponAdapterInterface Provide necessary value from Thelia*/ + protected $adapter; + + /** + * Constructor + * + * @param CouponAdapterInterface $adapter Provide necessary value from Thelia + */ + function __construct(CouponAdapterInterface $adapter) + { + $this->adapter = $adapter; + } + /** * Build a CouponInterface from its database data * * @param string $couponCode Coupon code ex: XMAS * + * @throws \Thelia\Exception\CouponExpiredException + * @throws \Symfony\Component\Translation\Exception\NotFoundResourceException * @return CouponInterface ready to be processed */ public function buildCouponFromCode($couponCode) { + /** @var Coupon $couponModel */ + $couponModel = $this->adapter->findOneCouponByCode($couponCode); + if ($couponModel === null) { + throw new NotFoundResourceException( + 'Coupon ' . $couponCode . ' not found in Database' + ); + } - $couponQuery = CouponQuery::create(); - $couponModel = $couponQuery->findByCode($couponCode); + if ($couponModel->getExpirationDate() < new \DateTime()) { + throw new CouponExpiredException($couponCode); + } return $this->buildCouponInterfacFromModel($couponModel); } @@ -74,40 +96,25 @@ class CouponFactory $couponClass = $model->getType(); /** @var CouponInterface $coupon*/ - $coupon = new $$couponClass( + $coupon = new $couponClass( $model->getCode(), $model->getTitle(), $model->getShortDescription(), $model->getDescription(), $model->getAmount(), $isCumulative, - $isRemovingPostage + $isRemovingPostage, + $model->getIsAvailableOnSpecialOffers(), + $model->getIsEnabled(), + $model->getMaxUsage(), + $model->getExpirationDate() ); - $normalizer = new GetSetMethodNormalizer(); - $encoder = new JsonEncoder(); - - $serializer = new Serializer(array($normalizer), array($encoder)); - - $o = new \ArrayObject(); - $unserializedRuleTypes = $o->unserialize( - $model->getSerializedRulesType() - ); - $unserializedRuleContents = $o->unserialize( - $model->getSerializedRulesContent() - ); - - $rules = array(); - foreach ($unserializedRuleTypes as $key => $unserializedRuleType) { - $rules[] = $serializer->deserialize( - $unserializedRuleContents[$key], - $unserializedRuleType, - 'json' - ); - } + /** @var CouponRuleCollection $rules */ + $rules = unserialize(base64_decode($model->getSerializedRules())); $coupon->setRules($rules); return $coupon; } -} \ No newline at end of file +} diff --git a/core/lib/Thelia/Coupon/CouponManager.php b/core/lib/Thelia/Coupon/CouponManager.php index 765068c96..c36ad7c40 100644 --- a/core/lib/Thelia/Coupon/CouponManager.php +++ b/core/lib/Thelia/Coupon/CouponManager.php @@ -51,7 +51,7 @@ class CouponManager * * @param CouponAdapterInterface $adapter Provide necessary value from Thelia */ - function __construct($adapter) + function __construct(CouponAdapterInterface $adapter) { $this->adapter = $adapter; $this->coupons = $this->adapter->getCurrentCoupons(); @@ -69,7 +69,7 @@ class CouponManager $discount = 0.00; if (count($this->coupons) > 0) { - $couponsKept = $this->sortCoupons(); + $couponsKept = $this->sortCoupons($this->coupons); $isRemovingPostage = $this->isCouponRemovingPostage($couponsKept); if ($isRemovingPostage) { @@ -111,17 +111,36 @@ class CouponManager * Sort Coupon to keep * Coupon not cumulative cancels previous * + * @param array $coupons CouponInterface to process + * * @return array Array of CouponInterface sorted */ - protected function sortCoupons() + protected function sortCoupons(array $coupons) { $couponsKept = array(); /** @var CouponInterface $coupon */ - foreach ($this->coupons as $coupon) { - if (!$coupon->isCumulative()) { - $couponsKept = array(); - $couponsKept[] = $coupon; + foreach ($coupons as $coupon) { + if (!$coupon->isExpired()) { + if ($coupon->isCumulative()) { + if (isset($couponsKept[0])) { + /** @var CouponInterface $previousCoupon */ + $previousCoupon = $couponsKept[0]; + if ($previousCoupon->isCumulative()) { + // Add Coupon + $couponsKept[] = $coupon; + } else { + // Reset Coupons, add last + $couponsKept = array($coupon); + } + } else { + // Reset Coupons, add last + $couponsKept = array($coupon); + } + } else { + // Reset Coupons, add last + $couponsKept = array($coupon); + } } } diff --git a/core/lib/Thelia/Coupon/CouponRuleCollection.php b/core/lib/Thelia/Coupon/CouponRuleCollection.php new file mode 100644 index 000000000..3146cec56 --- /dev/null +++ b/core/lib/Thelia/Coupon/CouponRuleCollection.php @@ -0,0 +1,88 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Coupon; + +use Symfony\Component\Serializer\Encoder\JsonEncoder; +use Thelia\Coupon\Rule\CouponRuleInterface; +use Thelia\Exception\InvalidRuleException; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Manage a set of v + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class CouponRuleCollection +{ + /** @var array Array of CouponRuleInterface */ + protected $rules = array(); + + /** + * Constructor + * + * @param array $rules Array of CouponRuleInterface + * + * @throws \Thelia\Exception\InvalidRuleException + */ + function __construct(array $rules) + { + foreach ($rules as $rule) { + if (!$rule instanceof CouponRuleInterface) { + throw new InvalidRuleException(get_class()); + } + } + $this->rules = $rules; + } + + /** + * Get Rules + * + * @return array Array of CouponRuleInterface + */ + public function getRules() + { + return $this->rules; + } + + /** + * Add a CouponRuleInterface to the Collection + * + * @param CouponRuleInterface $rule Rule + * + * @return $this + */ + public function add(CouponRuleInterface $rule) + { + $this->rules[] = $rule; + + return $this; + } + + +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForDate.php b/core/lib/Thelia/Coupon/Rule/AvailableForDate.php index 800db5066..1b5b27ef5 100644 --- a/core/lib/Thelia/Coupon/Rule/AvailableForDate.php +++ b/core/lib/Thelia/Coupon/Rule/AvailableForDate.php @@ -23,6 +23,8 @@ namespace Thelia\Coupon\Rule; +use Thelia\Coupon\CouponAdapterInterface; + /** * Created by JetBrains PhpStorm. * Date: 8/19/13 @@ -34,31 +36,26 @@ namespace Thelia\Coupon\Rule; */ class AvailableForDate extends AvailableForPeriod { + /** - * Generate current Rule validator from adapter + * Check if backoffice inputs are relevant or not * - * @param CouponAdapterInterface $adapter allowing to gather - * all necessary Thelia variables - * - * @throws \Symfony\Component\Intl\Exception\NotImplementedException - * @return $this + * @return bool */ - protected function setValidators(CouponAdapterInterface $adapter) + public function checkBackOfficeInput() { - parent::setValidators($adapter); // TODO: Change the autogenerated stub + // TODO: Implement checkBackOfficeInput() method. } /** - * Generate current Rule param to be validated from adapter + * Check if Checkout inputs are relevant or not * - * @param CouponAdapterInterface $adapter allowing to gather - * all necessary Thelia variables - * - * @throws \Symfony\Component\Intl\Exception\NotImplementedException - * @return $this + * @return bool */ - protected function setParametersToValidate(CouponAdapterInterface $adapter) + public function checkCheckoutInput() { - parent::setParametersToValidate($adapter); // TODO: Change the autogenerated stub + // TODO: Implement checkCheckoutInput() method. } + + } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForLocationX.php b/core/lib/Thelia/Coupon/Rule/AvailableForLocationX.php index f0ef8926a..7f4d1bb33 100644 --- a/core/lib/Thelia/Coupon/Rule/AvailableForLocationX.php +++ b/core/lib/Thelia/Coupon/Rule/AvailableForLocationX.php @@ -34,31 +34,26 @@ namespace Thelia\Coupon\Rule; */ class AvailableForLocationX extends CouponRuleAbstract { + /** - * Generate current Rule validator from adapter + * Check if backoffice inputs are relevant or not * - * @param CouponAdapterInterface $adapter allowing to gather - * all necessary Thelia variables - * - * @throws \Symfony\Component\Intl\Exception\NotImplementedException - * @return $this + * @return bool */ - protected function setValidators(CouponAdapterInterface $adapter) + public function checkBackOfficeInput() { - parent::setValidators($adapter); // TODO: Change the autogenerated stub + // TODO: Implement checkBackOfficeInput() method. } /** - * Generate current Rule param to be validated from adapter + * Check if Checkout inputs are relevant or not * - * @param CouponAdapterInterface $adapter allowing to gather - * all necessary Thelia variables - * - * @throws \Symfony\Component\Intl\Exception\NotImplementedException - * @return $this + * @return bool */ - protected function setParametersToValidate(CouponAdapterInterface $adapter) + public function checkCheckoutInput() { - parent::setParametersToValidate($adapter); // TODO: Change the autogenerated stub + // TODO: Implement checkCheckoutInput() method. } + + } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForPeriod.php b/core/lib/Thelia/Coupon/Rule/AvailableForPeriod.php index fe7347c46..7097ca52c 100644 --- a/core/lib/Thelia/Coupon/Rule/AvailableForPeriod.php +++ b/core/lib/Thelia/Coupon/Rule/AvailableForPeriod.php @@ -34,31 +34,24 @@ namespace Thelia\Coupon\Rule; */ class AvailableForPeriod extends CouponRuleAbstract { + /** - * Generate current Rule validator from adapter + * Check if backoffice inputs are relevant or not * - * @param CouponAdapterInterface $adapter allowing to gather - * all necessary Thelia variables - * - * @throws \Symfony\Component\Intl\Exception\NotImplementedException - * @return $this + * @return bool */ - protected function setValidators(CouponAdapterInterface $adapter) + public function checkBackOfficeInput() { - parent::setValidators($adapter); // TODO: Change the autogenerated stub + // TODO: Implement checkBackOfficeInput() method. } /** - * Generate current Rule param to be validated from adapter + * Check if Checkout inputs are relevant or not * - * @param CouponAdapterInterface $adapter allowing to gather - * all necessary Thelia variables - * - * @throws \Symfony\Component\Intl\Exception\NotImplementedException - * @return $this + * @return bool */ - protected function setParametersToValidate(CouponAdapterInterface $adapter) + public function checkCheckoutInput() { - parent::setParametersToValidate($adapter); // TODO: Change the autogenerated stub + // TODO: Implement checkCheckoutInput() method. } } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForRepeatedDate.php b/core/lib/Thelia/Coupon/Rule/AvailableForRepeatedDate.php index 21ebd01d3..f4d4be7d3 100644 --- a/core/lib/Thelia/Coupon/Rule/AvailableForRepeatedDate.php +++ b/core/lib/Thelia/Coupon/Rule/AvailableForRepeatedDate.php @@ -34,31 +34,24 @@ namespace Thelia\Coupon\Rule; */ class AvailableForRepeatedDate extends AvailableForDate { + /** - * Generate current Rule validator from adapter + * Check if backoffice inputs are relevant or not * - * @param CouponAdapterInterface $adapter allowing to gather - * all necessary Thelia variables - * - * @throws \Symfony\Component\Intl\Exception\NotImplementedException - * @return $this + * @return bool */ - protected function setValidators(CouponAdapterInterface $adapter) + public function checkBackOfficeInput() { - parent::setValidators($adapter); // TODO: Change the autogenerated stub + // TODO: Implement checkBackOfficeInput() method. } /** - * Generate current Rule param to be validated from adapter + * Check if Checkout inputs are relevant or not * - * @param CouponAdapterInterface $adapter allowing to gather - * all necessary Thelia variables - * - * @throws \Symfony\Component\Intl\Exception\NotImplementedException - * @return $this + * @return bool */ - protected function setParametersToValidate(CouponAdapterInterface $adapter) + public function checkCheckoutInput() { - parent::setParametersToValidate($adapter); // TODO: Change the autogenerated stub + // TODO: Implement checkCheckoutInput() method. } } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForRepeatedPeriod.php b/core/lib/Thelia/Coupon/Rule/AvailableForRepeatedPeriod.php index 2824b584a..8cf30569b 100644 --- a/core/lib/Thelia/Coupon/Rule/AvailableForRepeatedPeriod.php +++ b/core/lib/Thelia/Coupon/Rule/AvailableForRepeatedPeriod.php @@ -23,6 +23,8 @@ namespace Thelia\Coupon\Rule; +use Thelia\Coupon\CouponAdapterInterface; + /** * Created by JetBrains PhpStorm. * Date: 8/19/13 @@ -34,19 +36,6 @@ namespace Thelia\Coupon\Rule; */ class AvailableForRepeatedPeriod extends AvailableForPeriod { - /** - * Generate current Rule validator from adapter - * - * @param CouponAdapterInterface $adapter allowing to gather - * all necessary Thelia variables - * - * @throws \Symfony\Component\Intl\Exception\NotImplementedException - * @return $this - */ - protected function setValidators(CouponAdapterInterface $adapter) - { - parent::setValidators($adapter); // TODO: Change the autogenerated stub - } /** * Generate current Rule param to be validated from adapter @@ -61,4 +50,24 @@ class AvailableForRepeatedPeriod extends AvailableForPeriod { parent::setParametersToValidate($adapter); // TODO: Change the autogenerated stub } + + /** + * Check if backoffice inputs are relevant or not + * + * @return bool + */ + public function checkBackOfficeInput() + { + // TODO: Implement checkBackOfficeInput() method. + } + + /** + * Check if Checkout inputs are relevant or not + * + * @return bool + */ + public function checkCheckoutInput() + { + // TODO: Implement checkCheckoutInput() method. + } } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmount.php b/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmount.php index 2e109f9ec..b01f946a1 100644 --- a/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmount.php +++ b/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmount.php @@ -166,7 +166,8 @@ class AvailableForTotalAmount extends CouponRuleAbstract */ protected function setValidatorsFromAdapter(CouponAdapterInterface $adapter) { - $adapter->getRule($this); +// $adapter->getRule($this); + // @todo implement } /** diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmountForCategoryY.php b/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmountForCategoryY.php index a4153e5a1..6493da92a 100644 --- a/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmountForCategoryY.php +++ b/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmountForCategoryY.php @@ -34,31 +34,5 @@ namespace Thelia\Coupon\Rule; */ class AvailableForTotalAmountForCategoryY extends AvailableForTotalAmount { - /** - * Generate current Rule validator from adapter - * - * @param CouponAdapterInterface $adapter allowing to gather - * all necessary Thelia variables - * - * @throws \Symfony\Component\Intl\Exception\NotImplementedException - * @return $this - */ - protected function setValidators(CouponAdapterInterface $adapter) - { - parent::setValidators($adapter); // TODO: Change the autogenerated stub - } - /** - * Generate current Rule param to be validated from adapter - * - * @param CouponAdapterInterface $adapter allowing to gather - * all necessary Thelia variables - * - * @throws \Symfony\Component\Intl\Exception\NotImplementedException - * @return $this - */ - protected function setParametersToValidate(CouponAdapterInterface $adapter) - { - parent::setParametersToValidate($adapter); // TODO: Change the autogenerated stub - } } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForXArticles.php b/core/lib/Thelia/Coupon/Rule/AvailableForXArticles.php index 7016eda95..7a898205c 100644 --- a/core/lib/Thelia/Coupon/Rule/AvailableForXArticles.php +++ b/core/lib/Thelia/Coupon/Rule/AvailableForXArticles.php @@ -23,8 +23,6 @@ namespace Thelia\Coupon\Rule; -use Thelia\Type\IntType; - /** * Created by JetBrains PhpStorm. * Date: 8/19/13 @@ -38,32 +36,25 @@ use Thelia\Type\IntType; */ class AvailableForXArticles extends CouponRuleAbstract { + /** - * Generate current Rule validator from adapter + * Check if backoffice inputs are relevant or not * - * @param CouponAdapterInterface $adapter allowing to gather - * all necessary Thelia variables - * - * @throws \Symfony\Component\Intl\Exception\NotImplementedException - * @return $this + * @return bool */ - protected function setValidators(CouponAdapterInterface $adapter) + public function checkBackOfficeInput() { - parent::setValidators($adapter); // TODO: Change the autogenerated stub + // TODO: Implement checkBackOfficeInput() method. } /** - * Generate current Rule param to be validated from adapter + * Check if Checkout inputs are relevant or not * - * @param CouponAdapterInterface $adapter allowing to gather - * all necessary Thelia variables - * - * @throws \Symfony\Component\Intl\Exception\NotImplementedException - * @return $this + * @return bool */ - protected function setParametersToValidate(CouponAdapterInterface $adapter) + public function checkCheckoutInput() { - parent::setParametersToValidate($adapter); // TODO: Change the autogenerated stub + // TODO: Implement checkCheckoutInput() method. } } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/CouponRuleInterface.php b/core/lib/Thelia/Coupon/Rule/CouponRuleInterface.php index 8ab6abe34..22ad31841 100644 --- a/core/lib/Thelia/Coupon/Rule/CouponRuleInterface.php +++ b/core/lib/Thelia/Coupon/Rule/CouponRuleInterface.php @@ -23,8 +23,6 @@ namespace Thelia\Coupon\Rule; -use Thelia\Coupon\CouponAdapterInterface; - /** * Created by JetBrains PhpStorm. * Date: 8/19/13 diff --git a/core/lib/Thelia/Coupon/Type/CouponAbstract.php b/core/lib/Thelia/Coupon/Type/CouponAbstract.php index 3ef3166b3..8e2f716ea 100644 --- a/core/lib/Thelia/Coupon/Type/CouponAbstract.php +++ b/core/lib/Thelia/Coupon/Type/CouponAbstract.php @@ -26,6 +26,7 @@ namespace Thelia\Coupon\Type; use Symfony\Component\Intl\Exception\NotImplementedException; use Thelia\Coupon\CouponAdapterInterface; use Thelia\Coupon\Rule\CouponRuleInterface; +use Thelia\Coupon\CouponRuleCollection; use Thelia\Coupon\RuleOrganizerInterface; use Thelia\Exception\InvalidRuleException; @@ -48,7 +49,7 @@ abstract class CouponAbstract implements CouponInterface /** @var RuleOrganizerInterface */ protected $organizer = null; - /** @var array Array of CouponRuleInterface */ + /** @var CouponRuleCollection Array of CouponRuleInterface */ protected $rules = null; /** @var string Coupon code (ex: XMAS) */ @@ -63,6 +64,12 @@ abstract class CouponAbstract implements CouponInterface /** @var string Coupon description */ protected $description = null; + /** @var bool if Coupon is enabled */ + protected $isEnabled = false; + + /** @var \DateTime Coupon expiration date */ + protected $expirationDate = null; + /** @var bool if Coupon is cumulative */ protected $isCumulative = false; @@ -72,6 +79,12 @@ abstract class CouponAbstract implements CouponInterface /** @var float Amount that will be removed from the Checkout (Coupon Effect) */ protected $amount = 0; + /** @var int Max time a Coupon can be used (-1 = unlimited) */ + protected $maxUsage = -1; + + /** @var bool if Coupon is available for Products already on special offers */ + protected $isAvailableOnSpecialOffers = false; + /** * Set Adapter containing all relevant data * @@ -176,13 +189,11 @@ abstract class CouponAbstract implements CouponInterface /** * Return condition to validate the Coupon or not * - * @return array An array of CouponRuleInterface + * @return CouponRuleCollection */ public function getRules() { - $arrayObject = new \ArrayObject($this->rules); - - return $arrayObject->getArrayCopy(); + return clone $this->rules; } /** @@ -195,7 +206,7 @@ abstract class CouponAbstract implements CouponInterface */ public function addRule(CouponRuleInterface $rule) { - $this->rules[] = $rule; + $this->rules->add($rule); return $this; } @@ -204,22 +215,14 @@ abstract class CouponAbstract implements CouponInterface * Replace the existing Rules by those given in parameter * If one Rule is badly implemented, no Rule will be added * - * @param array $rules CouponRuleInterface to add + * @param CouponRuleCollection $rules CouponRuleInterface to add * * @return $this * @throws \Thelia\Exception\InvalidRuleException */ - public function setRules(array $rules) + public function setRules(CouponRuleCollection $rules) { - foreach ($rules as $rule) { - if (!$rule instanceof CouponRuleInterface) { - throw new InvalidRuleException(get_class()); - } - } - $this->rules = array(); - foreach ($rules as $rule) { - $this->addRule($rule); - } + $this->rules = $rules; return $this; } @@ -236,7 +239,7 @@ abstract class CouponAbstract implements CouponInterface $isMatching = true; /** @var CouponRuleInterface $rule */ - foreach ($this->rules as $rule) { + foreach ($this->rules->getRules() as $rule) { if (!$rule->isMatching()) { $isMatching = false; } @@ -245,5 +248,65 @@ abstract class CouponAbstract implements CouponInterface return $isMatching; } + /** + * Return Coupon expiration date + * + * @return \DateTime + */ + public function getExpirationDate() + { + return clone $this->expirationDate; + } + + /** + * Check if the Coupon can be used against a + * product already with a special offer price + * + * @return boolean + */ + public function isAvailableOnSpecialOffers() + { + return $this->isAvailableOnSpecialOffers; + } + + + /** + * Check if Coupon has been disabled by admin + * + * @return boolean + */ + public function isEnabled() + { + return $this->isEnabled; + } + + /** + * Return how many time the Coupon can be used again + * Ex : -1 unlimited + * + * @return int + */ + public function getMaxUsage() + { + return $this->maxUsage; + } + + /** + * Check if the Coupon is already Expired + * + * @return bool + */ + public function isExpired() + { + $ret = true; + + if ($this->expirationDate < new \DateTime()) { + $ret = false; + } + + return $ret; + } + + } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Type/CouponInterface.php b/core/lib/Thelia/Coupon/Type/CouponInterface.php index 8c51126ea..1d470bb69 100644 --- a/core/lib/Thelia/Coupon/Type/CouponInterface.php +++ b/core/lib/Thelia/Coupon/Type/CouponInterface.php @@ -23,6 +23,8 @@ namespace Thelia\Coupon\Type; +use Thelia\Coupon\CouponRuleCollection; + /** * Created by JetBrains PhpStorm. * Date: 8/19/13 @@ -114,10 +116,48 @@ interface CouponInterface * Replace the existing Rules by those given in parameter * If one Rule is badly implemented, no Rule will be added * - * @param array $rules CouponRuleInterface to add + * @param CouponRuleCollection $rules CouponRuleInterface to add * * @return $this * @throws \Thelia\Exception\InvalidRuleException */ - public function setRules(array $rules); + public function setRules(CouponRuleCollection $rules); + + /** + * Return Coupon expiration date + * + * @return \DateTime + */ + public function getExpirationDate(); + + /** + * Check if the Coupon can be used against a + * product already with a special offer price + * + * @return boolean + */ + public function isAvailableOnSpecialOffers(); + + + /** + * Check if Coupon has been disabled by admin + * + * @return boolean + */ + public function isEnabled(); + + /** + * Return how many time the Coupon can be used again + * Ex : -1 unlimited + * + * @return int + */ + public function getMaxUsage(); + + /** + * Check if the Coupon is already Expired + * + * @return bool + */ + public function isExpired(); } diff --git a/core/lib/Thelia/Coupon/Type/RemoveXAmount.php b/core/lib/Thelia/Coupon/Type/RemoveXAmount.php index d7cfeb989..a0d715141 100644 --- a/core/lib/Thelia/Coupon/Type/RemoveXAmount.php +++ b/core/lib/Thelia/Coupon/Type/RemoveXAmount.php @@ -41,15 +41,20 @@ class RemoveXAmount extends CouponAbstract /** * Constructor * - * @param string $code Coupon code (ex: XMAS) - * @param string $title Coupon title (ex: Coupon for XMAS) - * @param string $shortDescription Coupon short description - * @param string $description Coupon description - * @param float $amount Coupon amount to deduce - * @param bool $isCumulative if Coupon is cumulative - * @param bool $isRemovingPostage if Coupon is removing postage + * @param string $code Coupon code (ex: XMAS) + * @param string $title Coupon title (ex: Coupon for XMAS) + * @param string $shortDescription Coupon short description + * @param string $description Coupon description + * @param float $amount Coupon amount to deduce + * @param bool $isCumulative If Coupon is cumulative + * @param bool $isRemovingPostage If Coupon is removing postage + * @param bool $isAvailableOnSpecialOffers If available on Product already + * on special offer price + * @param bool $isEnabled False if Coupon is disabled by admin + * @param int $maxUsage How many usage left + * @param \Datetime $expirationDate When the Code is expiring */ - function __construct($code, $title, $shortDescription, $description, $amount, $isCumulative, $isRemovingPostage) + function __construct($code, $title, $shortDescription, $description, $amount, $isCumulative, $isRemovingPostage, $isAvailableOnSpecialOffers, $isEnabled, $maxUsage, \DateTime $expirationDate) { $this->code = $code; $this->title = $title; @@ -60,6 +65,11 @@ class RemoveXAmount extends CouponAbstract $this->isRemovingPostage = $isRemovingPostage; $this->amount = $amount; + + $this->isAvailableOnSpecialOffers = $isAvailableOnSpecialOffers; + $this->isEnabled = $isEnabled; + $this->maxUsage = $maxUsage; + $this->expirationDate = $expirationDate; } } diff --git a/core/lib/Thelia/Exception/CouponExpiredException.php b/core/lib/Thelia/Exception/CouponExpiredException.php new file mode 100644 index 000000000..c1ccace0a --- /dev/null +++ b/core/lib/Thelia/Exception/CouponExpiredException.php @@ -0,0 +1,53 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Exception; + +use Thelia\Log\Tlog; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Thrown when an Expired Coupon is tried + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class CouponExpiredException extends \Exception +{ + /** + * CouponExpiredException thrown when a Coupon is expired + * + * @param string $couponCode Coupon code + */ + public function __construct($couponCode) + { + $message = 'Expired Coupon ' . $couponCode . 'attempt'; + Tlog::getInstance()->addInfo($message); + + parent::__construct($message); + } +} diff --git a/core/lib/Thelia/Exception/InvalidRuleException.php b/core/lib/Thelia/Exception/InvalidRuleException.php index 834a6e962..a891ded4a 100644 --- a/core/lib/Thelia/Exception/InvalidRuleException.php +++ b/core/lib/Thelia/Exception/InvalidRuleException.php @@ -42,9 +42,9 @@ class InvalidRuleException extends \RuntimeException * InvalidRuleOperatorException thrown when a Rule is badly implemented * * @param string $className Class name - * @param string $parameter array key parameter */ - public function __construct($className) { + public function __construct($className) + { $message = 'Invalid Rule given to ' . $className; Tlog::getInstance()->addError($message); diff --git a/core/lib/Thelia/Exception/InvalidRuleOperatorException.php b/core/lib/Thelia/Exception/InvalidRuleOperatorException.php index 82556b2ef..d40c723c2 100644 --- a/core/lib/Thelia/Exception/InvalidRuleOperatorException.php +++ b/core/lib/Thelia/Exception/InvalidRuleOperatorException.php @@ -44,7 +44,8 @@ class InvalidRuleOperatorException extends \RuntimeException * @param string $className Class name * @param string $parameter array key parameter */ - public function __construct($className, $parameter) { + public function __construct($className, $parameter) + { $message = 'Invalid Operator for Rule ' . $className . ' on parameter ' . $parameter; Tlog::getInstance()->addError($message); diff --git a/core/lib/Thelia/Exception/InvalidRuleValueException.php b/core/lib/Thelia/Exception/InvalidRuleValueException.php index cbb86d16f..2f16f32f1 100644 --- a/core/lib/Thelia/Exception/InvalidRuleValueException.php +++ b/core/lib/Thelia/Exception/InvalidRuleValueException.php @@ -44,7 +44,8 @@ class InvalidRuleValueException extends \RuntimeException * @param string $className Class name * @param string $parameter array key parameter */ - public function __construct($className, $parameter) { + public function __construct($className, $parameter) + { $message = 'Invalid Parameter for Rule ' . $className . ' on parameter ' . $parameter; Tlog::getInstance()->addError($message); diff --git a/core/lib/Thelia/Model/Base/Coupon.php b/core/lib/Thelia/Model/Base/Coupon.php index 643b438b6..1d1bfe1e2 100644 --- a/core/lib/Thelia/Model/Base/Coupon.php +++ b/core/lib/Thelia/Model/Base/Coupon.php @@ -123,16 +123,10 @@ abstract class Coupon implements ActiveRecordInterface protected $expiration_date; /** - * The value for the serialized_rules_type field. + * The value for the serialized_rules field. * @var string */ - protected $serialized_rules_type; - - /** - * The value for the serialized_rules_content field. - * @var string - */ - protected $serialized_rules_content; + protected $serialized_rules; /** * The value for the is_cumulative field. @@ -146,6 +140,18 @@ abstract class Coupon implements ActiveRecordInterface */ protected $is_removing_postage; + /** + * The value for the max_usage field. + * @var int + */ + protected $max_usage; + + /** + * The value for the is_available_on_special_offers field. + * @var boolean + */ + protected $is_available_on_special_offers; + /** * The value for the created_at field. * @var string @@ -618,25 +624,14 @@ abstract class Coupon implements ActiveRecordInterface } /** - * Get the [serialized_rules_type] column value. + * Get the [serialized_rules] column value. * * @return string */ - public function getSerializedRulesType() + public function getSerializedRules() { - return $this->serialized_rules_type; - } - - /** - * Get the [serialized_rules_content] column value. - * - * @return string - */ - public function getSerializedRulesContent() - { - - return $this->serialized_rules_content; + return $this->serialized_rules; } /** @@ -661,6 +656,28 @@ abstract class Coupon implements ActiveRecordInterface return $this->is_removing_postage; } + /** + * Get the [max_usage] column value. + * + * @return int + */ + public function getMaxUsage() + { + + return $this->max_usage; + } + + /** + * Get the [is_available_on_special_offers] column value. + * + * @return boolean + */ + public function getIsAvailableOnSpecialOffers() + { + + return $this->is_available_on_special_offers; + } + /** * Get the [optionally formatted] temporal [created_at] column value. * @@ -923,46 +940,25 @@ abstract class Coupon implements ActiveRecordInterface } // setExpirationDate() /** - * Set the value of [serialized_rules_type] column. + * Set the value of [serialized_rules] column. * * @param string $v new value * @return \Thelia\Model\Coupon The current object (for fluent API support) */ - public function setSerializedRulesType($v) + public function setSerializedRules($v) { if ($v !== null) { $v = (string) $v; } - if ($this->serialized_rules_type !== $v) { - $this->serialized_rules_type = $v; - $this->modifiedColumns[] = CouponTableMap::SERIALIZED_RULES_TYPE; + if ($this->serialized_rules !== $v) { + $this->serialized_rules = $v; + $this->modifiedColumns[] = CouponTableMap::SERIALIZED_RULES; } return $this; - } // setSerializedRulesType() - - /** - * Set the value of [serialized_rules_content] column. - * - * @param string $v new value - * @return \Thelia\Model\Coupon The current object (for fluent API support) - */ - public function setSerializedRulesContent($v) - { - if ($v !== null) { - $v = (string) $v; - } - - if ($this->serialized_rules_content !== $v) { - $this->serialized_rules_content = $v; - $this->modifiedColumns[] = CouponTableMap::SERIALIZED_RULES_CONTENT; - } - - - return $this; - } // setSerializedRulesContent() + } // setSerializedRules() /** * Set the value of [is_cumulative] column. @@ -1006,6 +1002,56 @@ abstract class Coupon implements ActiveRecordInterface return $this; } // setIsRemovingPostage() + /** + * Set the value of [max_usage] column. + * + * @param int $v new value + * @return \Thelia\Model\Coupon The current object (for fluent API support) + */ + public function setMaxUsage($v) + { + if ($v !== null) { + $v = (int) $v; + } + + if ($this->max_usage !== $v) { + $this->max_usage = $v; + $this->modifiedColumns[] = CouponTableMap::MAX_USAGE; + } + + + return $this; + } // setMaxUsage() + + /** + * Sets the value of the [is_available_on_special_offers] column. + * Non-boolean arguments are converted using the following rules: + * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true + * * 0, '0', 'false', 'off', and 'no' are converted to boolean false + * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). + * + * @param boolean|integer|string $v The new value + * @return \Thelia\Model\Coupon The current object (for fluent API support) + */ + public function setIsAvailableOnSpecialOffers($v) + { + if ($v !== null) { + if (is_string($v)) { + $v = in_array(strtolower($v), array('false', 'off', '-', 'no', 'n', '0', '')) ? false : true; + } else { + $v = (boolean) $v; + } + } + + if ($this->is_available_on_special_offers !== $v) { + $this->is_available_on_special_offers = $v; + $this->modifiedColumns[] = CouponTableMap::IS_AVAILABLE_ON_SPECIAL_OFFERS; + } + + + return $this; + } // setIsAvailableOnSpecialOffers() + /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * @@ -1143,31 +1189,34 @@ abstract class Coupon implements ActiveRecordInterface } $this->expiration_date = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 10 + $startcol : CouponTableMap::translateFieldName('SerializedRulesType', TableMap::TYPE_PHPNAME, $indexType)]; - $this->serialized_rules_type = (null !== $col) ? (string) $col : null; + $col = $row[TableMap::TYPE_NUM == $indexType ? 10 + $startcol : CouponTableMap::translateFieldName('SerializedRules', TableMap::TYPE_PHPNAME, $indexType)]; + $this->serialized_rules = (null !== $col) ? (string) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 11 + $startcol : CouponTableMap::translateFieldName('SerializedRulesContent', TableMap::TYPE_PHPNAME, $indexType)]; - $this->serialized_rules_content = (null !== $col) ? (string) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 12 + $startcol : CouponTableMap::translateFieldName('IsCumulative', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 11 + $startcol : CouponTableMap::translateFieldName('IsCumulative', TableMap::TYPE_PHPNAME, $indexType)]; $this->is_cumulative = (null !== $col) ? (int) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 13 + $startcol : CouponTableMap::translateFieldName('IsRemovingPostage', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 12 + $startcol : CouponTableMap::translateFieldName('IsRemovingPostage', TableMap::TYPE_PHPNAME, $indexType)]; $this->is_removing_postage = (null !== $col) ? (int) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 14 + $startcol : CouponTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 13 + $startcol : CouponTableMap::translateFieldName('MaxUsage', TableMap::TYPE_PHPNAME, $indexType)]; + $this->max_usage = (null !== $col) ? (int) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 14 + $startcol : CouponTableMap::translateFieldName('IsAvailableOnSpecialOffers', TableMap::TYPE_PHPNAME, $indexType)]; + $this->is_available_on_special_offers = (null !== $col) ? (boolean) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 15 + $startcol : CouponTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 15 + $startcol : CouponTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 16 + $startcol : CouponTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } $this->updated_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 16 + $startcol : CouponTableMap::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 17 + $startcol : CouponTableMap::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)]; $this->version = (null !== $col) ? (int) $col : null; $this->resetModified(); @@ -1177,7 +1226,7 @@ abstract class Coupon implements ActiveRecordInterface $this->ensureConsistency(); } - return $startcol + 17; // 17 = CouponTableMap::NUM_HYDRATE_COLUMNS. + return $startcol + 18; // 18 = CouponTableMap::NUM_HYDRATE_COLUMNS. } catch (Exception $e) { throw new PropelException("Error populating \Thelia\Model\Coupon object", 0, $e); @@ -1493,11 +1542,8 @@ abstract class Coupon implements ActiveRecordInterface if ($this->isColumnModified(CouponTableMap::EXPIRATION_DATE)) { $modifiedColumns[':p' . $index++] = 'EXPIRATION_DATE'; } - if ($this->isColumnModified(CouponTableMap::SERIALIZED_RULES_TYPE)) { - $modifiedColumns[':p' . $index++] = 'SERIALIZED_RULES_TYPE'; - } - if ($this->isColumnModified(CouponTableMap::SERIALIZED_RULES_CONTENT)) { - $modifiedColumns[':p' . $index++] = 'SERIALIZED_RULES_CONTENT'; + if ($this->isColumnModified(CouponTableMap::SERIALIZED_RULES)) { + $modifiedColumns[':p' . $index++] = 'SERIALIZED_RULES'; } if ($this->isColumnModified(CouponTableMap::IS_CUMULATIVE)) { $modifiedColumns[':p' . $index++] = 'IS_CUMULATIVE'; @@ -1505,6 +1551,12 @@ abstract class Coupon implements ActiveRecordInterface if ($this->isColumnModified(CouponTableMap::IS_REMOVING_POSTAGE)) { $modifiedColumns[':p' . $index++] = 'IS_REMOVING_POSTAGE'; } + if ($this->isColumnModified(CouponTableMap::MAX_USAGE)) { + $modifiedColumns[':p' . $index++] = 'MAX_USAGE'; + } + if ($this->isColumnModified(CouponTableMap::IS_AVAILABLE_ON_SPECIAL_OFFERS)) { + $modifiedColumns[':p' . $index++] = 'IS_AVAILABLE_ON_SPECIAL_OFFERS'; + } if ($this->isColumnModified(CouponTableMap::CREATED_AT)) { $modifiedColumns[':p' . $index++] = 'CREATED_AT'; } @@ -1555,11 +1607,8 @@ abstract class Coupon implements ActiveRecordInterface case 'EXPIRATION_DATE': $stmt->bindValue($identifier, $this->expiration_date ? $this->expiration_date->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); break; - case 'SERIALIZED_RULES_TYPE': - $stmt->bindValue($identifier, $this->serialized_rules_type, PDO::PARAM_STR); - break; - case 'SERIALIZED_RULES_CONTENT': - $stmt->bindValue($identifier, $this->serialized_rules_content, PDO::PARAM_STR); + case 'SERIALIZED_RULES': + $stmt->bindValue($identifier, $this->serialized_rules, PDO::PARAM_STR); break; case 'IS_CUMULATIVE': $stmt->bindValue($identifier, $this->is_cumulative, PDO::PARAM_INT); @@ -1567,6 +1616,12 @@ abstract class Coupon implements ActiveRecordInterface case 'IS_REMOVING_POSTAGE': $stmt->bindValue($identifier, $this->is_removing_postage, PDO::PARAM_INT); break; + case 'MAX_USAGE': + $stmt->bindValue($identifier, $this->max_usage, PDO::PARAM_INT); + break; + case 'IS_AVAILABLE_ON_SPECIAL_OFFERS': + $stmt->bindValue($identifier, (int) $this->is_available_on_special_offers, PDO::PARAM_INT); + break; case 'CREATED_AT': $stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); break; @@ -1669,24 +1724,27 @@ abstract class Coupon implements ActiveRecordInterface return $this->getExpirationDate(); break; case 10: - return $this->getSerializedRulesType(); + return $this->getSerializedRules(); break; case 11: - return $this->getSerializedRulesContent(); - break; - case 12: return $this->getIsCumulative(); break; - case 13: + case 12: return $this->getIsRemovingPostage(); break; + case 13: + return $this->getMaxUsage(); + break; case 14: - return $this->getCreatedAt(); + return $this->getIsAvailableOnSpecialOffers(); break; case 15: - return $this->getUpdatedAt(); + return $this->getCreatedAt(); break; case 16: + return $this->getUpdatedAt(); + break; + case 17: return $this->getVersion(); break; default: @@ -1728,13 +1786,14 @@ abstract class Coupon implements ActiveRecordInterface $keys[7] => $this->getIsUsed(), $keys[8] => $this->getIsEnabled(), $keys[9] => $this->getExpirationDate(), - $keys[10] => $this->getSerializedRulesType(), - $keys[11] => $this->getSerializedRulesContent(), - $keys[12] => $this->getIsCumulative(), - $keys[13] => $this->getIsRemovingPostage(), - $keys[14] => $this->getCreatedAt(), - $keys[15] => $this->getUpdatedAt(), - $keys[16] => $this->getVersion(), + $keys[10] => $this->getSerializedRules(), + $keys[11] => $this->getIsCumulative(), + $keys[12] => $this->getIsRemovingPostage(), + $keys[13] => $this->getMaxUsage(), + $keys[14] => $this->getIsAvailableOnSpecialOffers(), + $keys[15] => $this->getCreatedAt(), + $keys[16] => $this->getUpdatedAt(), + $keys[17] => $this->getVersion(), ); $virtualColumns = $this->virtualColumns; foreach($virtualColumns as $key => $virtualColumn) @@ -1817,24 +1876,27 @@ abstract class Coupon implements ActiveRecordInterface $this->setExpirationDate($value); break; case 10: - $this->setSerializedRulesType($value); + $this->setSerializedRules($value); break; case 11: - $this->setSerializedRulesContent($value); - break; - case 12: $this->setIsCumulative($value); break; - case 13: + case 12: $this->setIsRemovingPostage($value); break; + case 13: + $this->setMaxUsage($value); + break; case 14: - $this->setCreatedAt($value); + $this->setIsAvailableOnSpecialOffers($value); break; case 15: - $this->setUpdatedAt($value); + $this->setCreatedAt($value); break; case 16: + $this->setUpdatedAt($value); + break; + case 17: $this->setVersion($value); break; } // switch() @@ -1871,13 +1933,14 @@ abstract class Coupon implements ActiveRecordInterface if (array_key_exists($keys[7], $arr)) $this->setIsUsed($arr[$keys[7]]); if (array_key_exists($keys[8], $arr)) $this->setIsEnabled($arr[$keys[8]]); if (array_key_exists($keys[9], $arr)) $this->setExpirationDate($arr[$keys[9]]); - if (array_key_exists($keys[10], $arr)) $this->setSerializedRulesType($arr[$keys[10]]); - if (array_key_exists($keys[11], $arr)) $this->setSerializedRulesContent($arr[$keys[11]]); - if (array_key_exists($keys[12], $arr)) $this->setIsCumulative($arr[$keys[12]]); - if (array_key_exists($keys[13], $arr)) $this->setIsRemovingPostage($arr[$keys[13]]); - if (array_key_exists($keys[14], $arr)) $this->setCreatedAt($arr[$keys[14]]); - if (array_key_exists($keys[15], $arr)) $this->setUpdatedAt($arr[$keys[15]]); - if (array_key_exists($keys[16], $arr)) $this->setVersion($arr[$keys[16]]); + if (array_key_exists($keys[10], $arr)) $this->setSerializedRules($arr[$keys[10]]); + if (array_key_exists($keys[11], $arr)) $this->setIsCumulative($arr[$keys[11]]); + if (array_key_exists($keys[12], $arr)) $this->setIsRemovingPostage($arr[$keys[12]]); + if (array_key_exists($keys[13], $arr)) $this->setMaxUsage($arr[$keys[13]]); + if (array_key_exists($keys[14], $arr)) $this->setIsAvailableOnSpecialOffers($arr[$keys[14]]); + if (array_key_exists($keys[15], $arr)) $this->setCreatedAt($arr[$keys[15]]); + if (array_key_exists($keys[16], $arr)) $this->setUpdatedAt($arr[$keys[16]]); + if (array_key_exists($keys[17], $arr)) $this->setVersion($arr[$keys[17]]); } /** @@ -1899,10 +1962,11 @@ abstract class Coupon implements ActiveRecordInterface if ($this->isColumnModified(CouponTableMap::IS_USED)) $criteria->add(CouponTableMap::IS_USED, $this->is_used); if ($this->isColumnModified(CouponTableMap::IS_ENABLED)) $criteria->add(CouponTableMap::IS_ENABLED, $this->is_enabled); if ($this->isColumnModified(CouponTableMap::EXPIRATION_DATE)) $criteria->add(CouponTableMap::EXPIRATION_DATE, $this->expiration_date); - if ($this->isColumnModified(CouponTableMap::SERIALIZED_RULES_TYPE)) $criteria->add(CouponTableMap::SERIALIZED_RULES_TYPE, $this->serialized_rules_type); - if ($this->isColumnModified(CouponTableMap::SERIALIZED_RULES_CONTENT)) $criteria->add(CouponTableMap::SERIALIZED_RULES_CONTENT, $this->serialized_rules_content); + if ($this->isColumnModified(CouponTableMap::SERIALIZED_RULES)) $criteria->add(CouponTableMap::SERIALIZED_RULES, $this->serialized_rules); if ($this->isColumnModified(CouponTableMap::IS_CUMULATIVE)) $criteria->add(CouponTableMap::IS_CUMULATIVE, $this->is_cumulative); if ($this->isColumnModified(CouponTableMap::IS_REMOVING_POSTAGE)) $criteria->add(CouponTableMap::IS_REMOVING_POSTAGE, $this->is_removing_postage); + if ($this->isColumnModified(CouponTableMap::MAX_USAGE)) $criteria->add(CouponTableMap::MAX_USAGE, $this->max_usage); + if ($this->isColumnModified(CouponTableMap::IS_AVAILABLE_ON_SPECIAL_OFFERS)) $criteria->add(CouponTableMap::IS_AVAILABLE_ON_SPECIAL_OFFERS, $this->is_available_on_special_offers); if ($this->isColumnModified(CouponTableMap::CREATED_AT)) $criteria->add(CouponTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(CouponTableMap::UPDATED_AT)) $criteria->add(CouponTableMap::UPDATED_AT, $this->updated_at); if ($this->isColumnModified(CouponTableMap::VERSION)) $criteria->add(CouponTableMap::VERSION, $this->version); @@ -1978,10 +2042,11 @@ abstract class Coupon implements ActiveRecordInterface $copyObj->setIsUsed($this->getIsUsed()); $copyObj->setIsEnabled($this->getIsEnabled()); $copyObj->setExpirationDate($this->getExpirationDate()); - $copyObj->setSerializedRulesType($this->getSerializedRulesType()); - $copyObj->setSerializedRulesContent($this->getSerializedRulesContent()); + $copyObj->setSerializedRules($this->getSerializedRules()); $copyObj->setIsCumulative($this->getIsCumulative()); $copyObj->setIsRemovingPostage($this->getIsRemovingPostage()); + $copyObj->setMaxUsage($this->getMaxUsage()); + $copyObj->setIsAvailableOnSpecialOffers($this->getIsAvailableOnSpecialOffers()); $copyObj->setCreatedAt($this->getCreatedAt()); $copyObj->setUpdatedAt($this->getUpdatedAt()); $copyObj->setVersion($this->getVersion()); @@ -2765,10 +2830,11 @@ abstract class Coupon implements ActiveRecordInterface $this->is_used = null; $this->is_enabled = null; $this->expiration_date = null; - $this->serialized_rules_type = null; - $this->serialized_rules_content = null; + $this->serialized_rules = null; $this->is_cumulative = null; $this->is_removing_postage = null; + $this->max_usage = null; + $this->is_available_on_special_offers = null; $this->created_at = null; $this->updated_at = null; $this->version = null; @@ -3008,10 +3074,11 @@ abstract class Coupon implements ActiveRecordInterface $version->setIsUsed($this->getIsUsed()); $version->setIsEnabled($this->getIsEnabled()); $version->setExpirationDate($this->getExpirationDate()); - $version->setSerializedRulesType($this->getSerializedRulesType()); - $version->setSerializedRulesContent($this->getSerializedRulesContent()); + $version->setSerializedRules($this->getSerializedRules()); $version->setIsCumulative($this->getIsCumulative()); $version->setIsRemovingPostage($this->getIsRemovingPostage()); + $version->setMaxUsage($this->getMaxUsage()); + $version->setIsAvailableOnSpecialOffers($this->getIsAvailableOnSpecialOffers()); $version->setCreatedAt($this->getCreatedAt()); $version->setUpdatedAt($this->getUpdatedAt()); $version->setVersion($this->getVersion()); @@ -3062,10 +3129,11 @@ abstract class Coupon implements ActiveRecordInterface $this->setIsUsed($version->getIsUsed()); $this->setIsEnabled($version->getIsEnabled()); $this->setExpirationDate($version->getExpirationDate()); - $this->setSerializedRulesType($version->getSerializedRulesType()); - $this->setSerializedRulesContent($version->getSerializedRulesContent()); + $this->setSerializedRules($version->getSerializedRules()); $this->setIsCumulative($version->getIsCumulative()); $this->setIsRemovingPostage($version->getIsRemovingPostage()); + $this->setMaxUsage($version->getMaxUsage()); + $this->setIsAvailableOnSpecialOffers($version->getIsAvailableOnSpecialOffers()); $this->setCreatedAt($version->getCreatedAt()); $this->setUpdatedAt($version->getUpdatedAt()); $this->setVersion($version->getVersion()); diff --git a/core/lib/Thelia/Model/Base/CouponQuery.php b/core/lib/Thelia/Model/Base/CouponQuery.php index 196dbbdaa..c7ae0eabd 100644 --- a/core/lib/Thelia/Model/Base/CouponQuery.php +++ b/core/lib/Thelia/Model/Base/CouponQuery.php @@ -32,10 +32,11 @@ use Thelia\Model\Map\CouponTableMap; * @method ChildCouponQuery orderByIsUsed($order = Criteria::ASC) Order by the is_used column * @method ChildCouponQuery orderByIsEnabled($order = Criteria::ASC) Order by the is_enabled column * @method ChildCouponQuery orderByExpirationDate($order = Criteria::ASC) Order by the expiration_date column - * @method ChildCouponQuery orderBySerializedRulesType($order = Criteria::ASC) Order by the serialized_rules_type column - * @method ChildCouponQuery orderBySerializedRulesContent($order = Criteria::ASC) Order by the serialized_rules_content column + * @method ChildCouponQuery orderBySerializedRules($order = Criteria::ASC) Order by the serialized_rules column * @method ChildCouponQuery orderByIsCumulative($order = Criteria::ASC) Order by the is_cumulative column * @method ChildCouponQuery orderByIsRemovingPostage($order = Criteria::ASC) Order by the is_removing_postage column + * @method ChildCouponQuery orderByMaxUsage($order = Criteria::ASC) Order by the max_usage column + * @method ChildCouponQuery orderByIsAvailableOnSpecialOffers($order = Criteria::ASC) Order by the is_available_on_special_offers column * @method ChildCouponQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column * @method ChildCouponQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column * @method ChildCouponQuery orderByVersion($order = Criteria::ASC) Order by the version column @@ -50,10 +51,11 @@ use Thelia\Model\Map\CouponTableMap; * @method ChildCouponQuery groupByIsUsed() Group by the is_used column * @method ChildCouponQuery groupByIsEnabled() Group by the is_enabled column * @method ChildCouponQuery groupByExpirationDate() Group by the expiration_date column - * @method ChildCouponQuery groupBySerializedRulesType() Group by the serialized_rules_type column - * @method ChildCouponQuery groupBySerializedRulesContent() Group by the serialized_rules_content column + * @method ChildCouponQuery groupBySerializedRules() Group by the serialized_rules column * @method ChildCouponQuery groupByIsCumulative() Group by the is_cumulative column * @method ChildCouponQuery groupByIsRemovingPostage() Group by the is_removing_postage column + * @method ChildCouponQuery groupByMaxUsage() Group by the max_usage column + * @method ChildCouponQuery groupByIsAvailableOnSpecialOffers() Group by the is_available_on_special_offers column * @method ChildCouponQuery groupByCreatedAt() Group by the created_at column * @method ChildCouponQuery groupByUpdatedAt() Group by the updated_at column * @method ChildCouponQuery groupByVersion() Group by the version column @@ -87,10 +89,11 @@ use Thelia\Model\Map\CouponTableMap; * @method ChildCoupon findOneByIsUsed(int $is_used) Return the first ChildCoupon filtered by the is_used column * @method ChildCoupon findOneByIsEnabled(int $is_enabled) Return the first ChildCoupon filtered by the is_enabled column * @method ChildCoupon findOneByExpirationDate(string $expiration_date) Return the first ChildCoupon filtered by the expiration_date column - * @method ChildCoupon findOneBySerializedRulesType(string $serialized_rules_type) Return the first ChildCoupon filtered by the serialized_rules_type column - * @method ChildCoupon findOneBySerializedRulesContent(string $serialized_rules_content) Return the first ChildCoupon filtered by the serialized_rules_content column + * @method ChildCoupon findOneBySerializedRules(string $serialized_rules) Return the first ChildCoupon filtered by the serialized_rules column * @method ChildCoupon findOneByIsCumulative(int $is_cumulative) Return the first ChildCoupon filtered by the is_cumulative column * @method ChildCoupon findOneByIsRemovingPostage(int $is_removing_postage) Return the first ChildCoupon filtered by the is_removing_postage column + * @method ChildCoupon findOneByMaxUsage(int $max_usage) Return the first ChildCoupon filtered by the max_usage column + * @method ChildCoupon findOneByIsAvailableOnSpecialOffers(boolean $is_available_on_special_offers) Return the first ChildCoupon filtered by the is_available_on_special_offers column * @method ChildCoupon findOneByCreatedAt(string $created_at) Return the first ChildCoupon filtered by the created_at column * @method ChildCoupon findOneByUpdatedAt(string $updated_at) Return the first ChildCoupon filtered by the updated_at column * @method ChildCoupon findOneByVersion(int $version) Return the first ChildCoupon filtered by the version column @@ -105,10 +108,11 @@ use Thelia\Model\Map\CouponTableMap; * @method array findByIsUsed(int $is_used) Return ChildCoupon objects filtered by the is_used column * @method array findByIsEnabled(int $is_enabled) Return ChildCoupon objects filtered by the is_enabled column * @method array findByExpirationDate(string $expiration_date) Return ChildCoupon objects filtered by the expiration_date column - * @method array findBySerializedRulesType(string $serialized_rules_type) Return ChildCoupon objects filtered by the serialized_rules_type column - * @method array findBySerializedRulesContent(string $serialized_rules_content) Return ChildCoupon objects filtered by the serialized_rules_content column + * @method array findBySerializedRules(string $serialized_rules) Return ChildCoupon objects filtered by the serialized_rules column * @method array findByIsCumulative(int $is_cumulative) Return ChildCoupon objects filtered by the is_cumulative column * @method array findByIsRemovingPostage(int $is_removing_postage) Return ChildCoupon objects filtered by the is_removing_postage column + * @method array findByMaxUsage(int $max_usage) Return ChildCoupon objects filtered by the max_usage column + * @method array findByIsAvailableOnSpecialOffers(boolean $is_available_on_special_offers) Return ChildCoupon objects filtered by the is_available_on_special_offers column * @method array findByCreatedAt(string $created_at) Return ChildCoupon objects filtered by the created_at column * @method array findByUpdatedAt(string $updated_at) Return ChildCoupon objects filtered by the updated_at column * @method array findByVersion(int $version) Return ChildCoupon objects filtered by the version column @@ -207,7 +211,7 @@ abstract class CouponQuery extends ModelCriteria */ protected function findPkSimple($key, $con) { - $sql = 'SELECT ID, CODE, TYPE, TITLE, SHORT_DESCRIPTION, DESCRIPTION, AMOUNT, IS_USED, IS_ENABLED, EXPIRATION_DATE, SERIALIZED_RULES_TYPE, SERIALIZED_RULES_CONTENT, IS_CUMULATIVE, IS_REMOVING_POSTAGE, CREATED_AT, UPDATED_AT, VERSION FROM coupon WHERE ID = :p0'; + $sql = 'SELECT ID, CODE, TYPE, TITLE, SHORT_DESCRIPTION, DESCRIPTION, AMOUNT, IS_USED, IS_ENABLED, EXPIRATION_DATE, SERIALIZED_RULES, IS_CUMULATIVE, IS_REMOVING_POSTAGE, MAX_USAGE, IS_AVAILABLE_ON_SPECIAL_OFFERS, CREATED_AT, UPDATED_AT, VERSION FROM coupon WHERE ID = :p0'; try { $stmt = $con->prepare($sql); $stmt->bindValue(':p0', $key, PDO::PARAM_INT); @@ -649,61 +653,32 @@ abstract class CouponQuery extends ModelCriteria } /** - * Filter the query on the serialized_rules_type column + * Filter the query on the serialized_rules column * * Example usage: * - * $query->filterBySerializedRulesType('fooValue'); // WHERE serialized_rules_type = 'fooValue' - * $query->filterBySerializedRulesType('%fooValue%'); // WHERE serialized_rules_type LIKE '%fooValue%' + * $query->filterBySerializedRules('fooValue'); // WHERE serialized_rules = 'fooValue' + * $query->filterBySerializedRules('%fooValue%'); // WHERE serialized_rules LIKE '%fooValue%' * * - * @param string $serializedRulesType The value to use as filter. + * @param string $serializedRules The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponQuery The current query, for fluid interface */ - public function filterBySerializedRulesType($serializedRulesType = null, $comparison = null) + public function filterBySerializedRules($serializedRules = null, $comparison = null) { if (null === $comparison) { - if (is_array($serializedRulesType)) { + if (is_array($serializedRules)) { $comparison = Criteria::IN; - } elseif (preg_match('/[\%\*]/', $serializedRulesType)) { - $serializedRulesType = str_replace('*', '%', $serializedRulesType); + } elseif (preg_match('/[\%\*]/', $serializedRules)) { + $serializedRules = str_replace('*', '%', $serializedRules); $comparison = Criteria::LIKE; } } - return $this->addUsingAlias(CouponTableMap::SERIALIZED_RULES_TYPE, $serializedRulesType, $comparison); - } - - /** - * Filter the query on the serialized_rules_content column - * - * Example usage: - * - * $query->filterBySerializedRulesContent('fooValue'); // WHERE serialized_rules_content = 'fooValue' - * $query->filterBySerializedRulesContent('%fooValue%'); // WHERE serialized_rules_content LIKE '%fooValue%' - * - * - * @param string $serializedRulesContent The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildCouponQuery The current query, for fluid interface - */ - public function filterBySerializedRulesContent($serializedRulesContent = null, $comparison = null) - { - if (null === $comparison) { - if (is_array($serializedRulesContent)) { - $comparison = Criteria::IN; - } elseif (preg_match('/[\%\*]/', $serializedRulesContent)) { - $serializedRulesContent = str_replace('*', '%', $serializedRulesContent); - $comparison = Criteria::LIKE; - } - } - - return $this->addUsingAlias(CouponTableMap::SERIALIZED_RULES_CONTENT, $serializedRulesContent, $comparison); + return $this->addUsingAlias(CouponTableMap::SERIALIZED_RULES, $serializedRules, $comparison); } /** @@ -788,6 +763,74 @@ abstract class CouponQuery extends ModelCriteria return $this->addUsingAlias(CouponTableMap::IS_REMOVING_POSTAGE, $isRemovingPostage, $comparison); } + /** + * Filter the query on the max_usage column + * + * Example usage: + * + * $query->filterByMaxUsage(1234); // WHERE max_usage = 1234 + * $query->filterByMaxUsage(array(12, 34)); // WHERE max_usage IN (12, 34) + * $query->filterByMaxUsage(array('min' => 12)); // WHERE max_usage > 12 + * + * + * @param mixed $maxUsage The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponQuery The current query, for fluid interface + */ + public function filterByMaxUsage($maxUsage = null, $comparison = null) + { + if (is_array($maxUsage)) { + $useMinMax = false; + if (isset($maxUsage['min'])) { + $this->addUsingAlias(CouponTableMap::MAX_USAGE, $maxUsage['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($maxUsage['max'])) { + $this->addUsingAlias(CouponTableMap::MAX_USAGE, $maxUsage['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(CouponTableMap::MAX_USAGE, $maxUsage, $comparison); + } + + /** + * Filter the query on the is_available_on_special_offers column + * + * Example usage: + * + * $query->filterByIsAvailableOnSpecialOffers(true); // WHERE is_available_on_special_offers = true + * $query->filterByIsAvailableOnSpecialOffers('yes'); // WHERE is_available_on_special_offers = true + * + * + * @param boolean|string $isAvailableOnSpecialOffers The value to use as filter. + * Non-boolean arguments are converted using the following rules: + * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true + * * 0, '0', 'false', 'off', and 'no' are converted to boolean false + * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponQuery The current query, for fluid interface + */ + public function filterByIsAvailableOnSpecialOffers($isAvailableOnSpecialOffers = null, $comparison = null) + { + if (is_string($isAvailableOnSpecialOffers)) { + $is_available_on_special_offers = in_array(strtolower($isAvailableOnSpecialOffers), array('false', 'off', '-', 'no', 'n', '0', '')) ? false : true; + } + + return $this->addUsingAlias(CouponTableMap::IS_AVAILABLE_ON_SPECIAL_OFFERS, $isAvailableOnSpecialOffers, $comparison); + } + /** * Filter the query on the created_at column * diff --git a/core/lib/Thelia/Model/Base/CouponVersion.php b/core/lib/Thelia/Model/Base/CouponVersion.php index 5fcf14d45..9952d80bc 100644 --- a/core/lib/Thelia/Model/Base/CouponVersion.php +++ b/core/lib/Thelia/Model/Base/CouponVersion.php @@ -116,16 +116,10 @@ abstract class CouponVersion implements ActiveRecordInterface protected $expiration_date; /** - * The value for the serialized_rules_type field. + * The value for the serialized_rules field. * @var string */ - protected $serialized_rules_type; - - /** - * The value for the serialized_rules_content field. - * @var string - */ - protected $serialized_rules_content; + protected $serialized_rules; /** * The value for the is_cumulative field. @@ -139,6 +133,18 @@ abstract class CouponVersion implements ActiveRecordInterface */ protected $is_removing_postage; + /** + * The value for the max_usage field. + * @var int + */ + protected $max_usage; + + /** + * The value for the is_available_on_special_offers field. + * @var boolean + */ + protected $is_available_on_special_offers; + /** * The value for the created_at field. * @var string @@ -558,25 +564,14 @@ abstract class CouponVersion implements ActiveRecordInterface } /** - * Get the [serialized_rules_type] column value. + * Get the [serialized_rules] column value. * * @return string */ - public function getSerializedRulesType() + public function getSerializedRules() { - return $this->serialized_rules_type; - } - - /** - * Get the [serialized_rules_content] column value. - * - * @return string - */ - public function getSerializedRulesContent() - { - - return $this->serialized_rules_content; + return $this->serialized_rules; } /** @@ -601,6 +596,28 @@ abstract class CouponVersion implements ActiveRecordInterface return $this->is_removing_postage; } + /** + * Get the [max_usage] column value. + * + * @return int + */ + public function getMaxUsage() + { + + return $this->max_usage; + } + + /** + * Get the [is_available_on_special_offers] column value. + * + * @return boolean + */ + public function getIsAvailableOnSpecialOffers() + { + + return $this->is_available_on_special_offers; + } + /** * Get the [optionally formatted] temporal [created_at] column value. * @@ -867,46 +884,25 @@ abstract class CouponVersion implements ActiveRecordInterface } // setExpirationDate() /** - * Set the value of [serialized_rules_type] column. + * Set the value of [serialized_rules] column. * * @param string $v new value * @return \Thelia\Model\CouponVersion The current object (for fluent API support) */ - public function setSerializedRulesType($v) + public function setSerializedRules($v) { if ($v !== null) { $v = (string) $v; } - if ($this->serialized_rules_type !== $v) { - $this->serialized_rules_type = $v; - $this->modifiedColumns[] = CouponVersionTableMap::SERIALIZED_RULES_TYPE; + if ($this->serialized_rules !== $v) { + $this->serialized_rules = $v; + $this->modifiedColumns[] = CouponVersionTableMap::SERIALIZED_RULES; } return $this; - } // setSerializedRulesType() - - /** - * Set the value of [serialized_rules_content] column. - * - * @param string $v new value - * @return \Thelia\Model\CouponVersion The current object (for fluent API support) - */ - public function setSerializedRulesContent($v) - { - if ($v !== null) { - $v = (string) $v; - } - - if ($this->serialized_rules_content !== $v) { - $this->serialized_rules_content = $v; - $this->modifiedColumns[] = CouponVersionTableMap::SERIALIZED_RULES_CONTENT; - } - - - return $this; - } // setSerializedRulesContent() + } // setSerializedRules() /** * Set the value of [is_cumulative] column. @@ -950,6 +946,56 @@ abstract class CouponVersion implements ActiveRecordInterface return $this; } // setIsRemovingPostage() + /** + * Set the value of [max_usage] column. + * + * @param int $v new value + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + */ + public function setMaxUsage($v) + { + if ($v !== null) { + $v = (int) $v; + } + + if ($this->max_usage !== $v) { + $this->max_usage = $v; + $this->modifiedColumns[] = CouponVersionTableMap::MAX_USAGE; + } + + + return $this; + } // setMaxUsage() + + /** + * Sets the value of the [is_available_on_special_offers] column. + * Non-boolean arguments are converted using the following rules: + * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true + * * 0, '0', 'false', 'off', and 'no' are converted to boolean false + * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). + * + * @param boolean|integer|string $v The new value + * @return \Thelia\Model\CouponVersion The current object (for fluent API support) + */ + public function setIsAvailableOnSpecialOffers($v) + { + if ($v !== null) { + if (is_string($v)) { + $v = in_array(strtolower($v), array('false', 'off', '-', 'no', 'n', '0', '')) ? false : true; + } else { + $v = (boolean) $v; + } + } + + if ($this->is_available_on_special_offers !== $v) { + $this->is_available_on_special_offers = $v; + $this->modifiedColumns[] = CouponVersionTableMap::IS_AVAILABLE_ON_SPECIAL_OFFERS; + } + + + return $this; + } // setIsAvailableOnSpecialOffers() + /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * @@ -1087,31 +1133,34 @@ abstract class CouponVersion implements ActiveRecordInterface } $this->expiration_date = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 10 + $startcol : CouponVersionTableMap::translateFieldName('SerializedRulesType', TableMap::TYPE_PHPNAME, $indexType)]; - $this->serialized_rules_type = (null !== $col) ? (string) $col : null; + $col = $row[TableMap::TYPE_NUM == $indexType ? 10 + $startcol : CouponVersionTableMap::translateFieldName('SerializedRules', TableMap::TYPE_PHPNAME, $indexType)]; + $this->serialized_rules = (null !== $col) ? (string) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 11 + $startcol : CouponVersionTableMap::translateFieldName('SerializedRulesContent', TableMap::TYPE_PHPNAME, $indexType)]; - $this->serialized_rules_content = (null !== $col) ? (string) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 12 + $startcol : CouponVersionTableMap::translateFieldName('IsCumulative', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 11 + $startcol : CouponVersionTableMap::translateFieldName('IsCumulative', TableMap::TYPE_PHPNAME, $indexType)]; $this->is_cumulative = (null !== $col) ? (int) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 13 + $startcol : CouponVersionTableMap::translateFieldName('IsRemovingPostage', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 12 + $startcol : CouponVersionTableMap::translateFieldName('IsRemovingPostage', TableMap::TYPE_PHPNAME, $indexType)]; $this->is_removing_postage = (null !== $col) ? (int) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 14 + $startcol : CouponVersionTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 13 + $startcol : CouponVersionTableMap::translateFieldName('MaxUsage', TableMap::TYPE_PHPNAME, $indexType)]; + $this->max_usage = (null !== $col) ? (int) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 14 + $startcol : CouponVersionTableMap::translateFieldName('IsAvailableOnSpecialOffers', TableMap::TYPE_PHPNAME, $indexType)]; + $this->is_available_on_special_offers = (null !== $col) ? (boolean) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 15 + $startcol : CouponVersionTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 15 + $startcol : CouponVersionTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 16 + $startcol : CouponVersionTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } $this->updated_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 16 + $startcol : CouponVersionTableMap::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 17 + $startcol : CouponVersionTableMap::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)]; $this->version = (null !== $col) ? (int) $col : null; $this->resetModified(); @@ -1121,7 +1170,7 @@ abstract class CouponVersion implements ActiveRecordInterface $this->ensureConsistency(); } - return $startcol + 17; // 17 = CouponVersionTableMap::NUM_HYDRATE_COLUMNS. + return $startcol + 18; // 18 = CouponVersionTableMap::NUM_HYDRATE_COLUMNS. } catch (Exception $e) { throw new PropelException("Error populating \Thelia\Model\CouponVersion object", 0, $e); @@ -1372,11 +1421,8 @@ abstract class CouponVersion implements ActiveRecordInterface if ($this->isColumnModified(CouponVersionTableMap::EXPIRATION_DATE)) { $modifiedColumns[':p' . $index++] = 'EXPIRATION_DATE'; } - if ($this->isColumnModified(CouponVersionTableMap::SERIALIZED_RULES_TYPE)) { - $modifiedColumns[':p' . $index++] = 'SERIALIZED_RULES_TYPE'; - } - if ($this->isColumnModified(CouponVersionTableMap::SERIALIZED_RULES_CONTENT)) { - $modifiedColumns[':p' . $index++] = 'SERIALIZED_RULES_CONTENT'; + if ($this->isColumnModified(CouponVersionTableMap::SERIALIZED_RULES)) { + $modifiedColumns[':p' . $index++] = 'SERIALIZED_RULES'; } if ($this->isColumnModified(CouponVersionTableMap::IS_CUMULATIVE)) { $modifiedColumns[':p' . $index++] = 'IS_CUMULATIVE'; @@ -1384,6 +1430,12 @@ abstract class CouponVersion implements ActiveRecordInterface if ($this->isColumnModified(CouponVersionTableMap::IS_REMOVING_POSTAGE)) { $modifiedColumns[':p' . $index++] = 'IS_REMOVING_POSTAGE'; } + if ($this->isColumnModified(CouponVersionTableMap::MAX_USAGE)) { + $modifiedColumns[':p' . $index++] = 'MAX_USAGE'; + } + if ($this->isColumnModified(CouponVersionTableMap::IS_AVAILABLE_ON_SPECIAL_OFFERS)) { + $modifiedColumns[':p' . $index++] = 'IS_AVAILABLE_ON_SPECIAL_OFFERS'; + } if ($this->isColumnModified(CouponVersionTableMap::CREATED_AT)) { $modifiedColumns[':p' . $index++] = 'CREATED_AT'; } @@ -1434,11 +1486,8 @@ abstract class CouponVersion implements ActiveRecordInterface case 'EXPIRATION_DATE': $stmt->bindValue($identifier, $this->expiration_date ? $this->expiration_date->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); break; - case 'SERIALIZED_RULES_TYPE': - $stmt->bindValue($identifier, $this->serialized_rules_type, PDO::PARAM_STR); - break; - case 'SERIALIZED_RULES_CONTENT': - $stmt->bindValue($identifier, $this->serialized_rules_content, PDO::PARAM_STR); + case 'SERIALIZED_RULES': + $stmt->bindValue($identifier, $this->serialized_rules, PDO::PARAM_STR); break; case 'IS_CUMULATIVE': $stmt->bindValue($identifier, $this->is_cumulative, PDO::PARAM_INT); @@ -1446,6 +1495,12 @@ abstract class CouponVersion implements ActiveRecordInterface case 'IS_REMOVING_POSTAGE': $stmt->bindValue($identifier, $this->is_removing_postage, PDO::PARAM_INT); break; + case 'MAX_USAGE': + $stmt->bindValue($identifier, $this->max_usage, PDO::PARAM_INT); + break; + case 'IS_AVAILABLE_ON_SPECIAL_OFFERS': + $stmt->bindValue($identifier, (int) $this->is_available_on_special_offers, PDO::PARAM_INT); + break; case 'CREATED_AT': $stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); break; @@ -1541,24 +1596,27 @@ abstract class CouponVersion implements ActiveRecordInterface return $this->getExpirationDate(); break; case 10: - return $this->getSerializedRulesType(); + return $this->getSerializedRules(); break; case 11: - return $this->getSerializedRulesContent(); - break; - case 12: return $this->getIsCumulative(); break; - case 13: + case 12: return $this->getIsRemovingPostage(); break; + case 13: + return $this->getMaxUsage(); + break; case 14: - return $this->getCreatedAt(); + return $this->getIsAvailableOnSpecialOffers(); break; case 15: - return $this->getUpdatedAt(); + return $this->getCreatedAt(); break; case 16: + return $this->getUpdatedAt(); + break; + case 17: return $this->getVersion(); break; default: @@ -1600,13 +1658,14 @@ abstract class CouponVersion implements ActiveRecordInterface $keys[7] => $this->getIsUsed(), $keys[8] => $this->getIsEnabled(), $keys[9] => $this->getExpirationDate(), - $keys[10] => $this->getSerializedRulesType(), - $keys[11] => $this->getSerializedRulesContent(), - $keys[12] => $this->getIsCumulative(), - $keys[13] => $this->getIsRemovingPostage(), - $keys[14] => $this->getCreatedAt(), - $keys[15] => $this->getUpdatedAt(), - $keys[16] => $this->getVersion(), + $keys[10] => $this->getSerializedRules(), + $keys[11] => $this->getIsCumulative(), + $keys[12] => $this->getIsRemovingPostage(), + $keys[13] => $this->getMaxUsage(), + $keys[14] => $this->getIsAvailableOnSpecialOffers(), + $keys[15] => $this->getCreatedAt(), + $keys[16] => $this->getUpdatedAt(), + $keys[17] => $this->getVersion(), ); $virtualColumns = $this->virtualColumns; foreach($virtualColumns as $key => $virtualColumn) @@ -1683,24 +1742,27 @@ abstract class CouponVersion implements ActiveRecordInterface $this->setExpirationDate($value); break; case 10: - $this->setSerializedRulesType($value); + $this->setSerializedRules($value); break; case 11: - $this->setSerializedRulesContent($value); - break; - case 12: $this->setIsCumulative($value); break; - case 13: + case 12: $this->setIsRemovingPostage($value); break; + case 13: + $this->setMaxUsage($value); + break; case 14: - $this->setCreatedAt($value); + $this->setIsAvailableOnSpecialOffers($value); break; case 15: - $this->setUpdatedAt($value); + $this->setCreatedAt($value); break; case 16: + $this->setUpdatedAt($value); + break; + case 17: $this->setVersion($value); break; } // switch() @@ -1737,13 +1799,14 @@ abstract class CouponVersion implements ActiveRecordInterface if (array_key_exists($keys[7], $arr)) $this->setIsUsed($arr[$keys[7]]); if (array_key_exists($keys[8], $arr)) $this->setIsEnabled($arr[$keys[8]]); if (array_key_exists($keys[9], $arr)) $this->setExpirationDate($arr[$keys[9]]); - if (array_key_exists($keys[10], $arr)) $this->setSerializedRulesType($arr[$keys[10]]); - if (array_key_exists($keys[11], $arr)) $this->setSerializedRulesContent($arr[$keys[11]]); - if (array_key_exists($keys[12], $arr)) $this->setIsCumulative($arr[$keys[12]]); - if (array_key_exists($keys[13], $arr)) $this->setIsRemovingPostage($arr[$keys[13]]); - if (array_key_exists($keys[14], $arr)) $this->setCreatedAt($arr[$keys[14]]); - if (array_key_exists($keys[15], $arr)) $this->setUpdatedAt($arr[$keys[15]]); - if (array_key_exists($keys[16], $arr)) $this->setVersion($arr[$keys[16]]); + if (array_key_exists($keys[10], $arr)) $this->setSerializedRules($arr[$keys[10]]); + if (array_key_exists($keys[11], $arr)) $this->setIsCumulative($arr[$keys[11]]); + if (array_key_exists($keys[12], $arr)) $this->setIsRemovingPostage($arr[$keys[12]]); + if (array_key_exists($keys[13], $arr)) $this->setMaxUsage($arr[$keys[13]]); + if (array_key_exists($keys[14], $arr)) $this->setIsAvailableOnSpecialOffers($arr[$keys[14]]); + if (array_key_exists($keys[15], $arr)) $this->setCreatedAt($arr[$keys[15]]); + if (array_key_exists($keys[16], $arr)) $this->setUpdatedAt($arr[$keys[16]]); + if (array_key_exists($keys[17], $arr)) $this->setVersion($arr[$keys[17]]); } /** @@ -1765,10 +1828,11 @@ abstract class CouponVersion implements ActiveRecordInterface if ($this->isColumnModified(CouponVersionTableMap::IS_USED)) $criteria->add(CouponVersionTableMap::IS_USED, $this->is_used); if ($this->isColumnModified(CouponVersionTableMap::IS_ENABLED)) $criteria->add(CouponVersionTableMap::IS_ENABLED, $this->is_enabled); if ($this->isColumnModified(CouponVersionTableMap::EXPIRATION_DATE)) $criteria->add(CouponVersionTableMap::EXPIRATION_DATE, $this->expiration_date); - if ($this->isColumnModified(CouponVersionTableMap::SERIALIZED_RULES_TYPE)) $criteria->add(CouponVersionTableMap::SERIALIZED_RULES_TYPE, $this->serialized_rules_type); - if ($this->isColumnModified(CouponVersionTableMap::SERIALIZED_RULES_CONTENT)) $criteria->add(CouponVersionTableMap::SERIALIZED_RULES_CONTENT, $this->serialized_rules_content); + if ($this->isColumnModified(CouponVersionTableMap::SERIALIZED_RULES)) $criteria->add(CouponVersionTableMap::SERIALIZED_RULES, $this->serialized_rules); if ($this->isColumnModified(CouponVersionTableMap::IS_CUMULATIVE)) $criteria->add(CouponVersionTableMap::IS_CUMULATIVE, $this->is_cumulative); if ($this->isColumnModified(CouponVersionTableMap::IS_REMOVING_POSTAGE)) $criteria->add(CouponVersionTableMap::IS_REMOVING_POSTAGE, $this->is_removing_postage); + if ($this->isColumnModified(CouponVersionTableMap::MAX_USAGE)) $criteria->add(CouponVersionTableMap::MAX_USAGE, $this->max_usage); + if ($this->isColumnModified(CouponVersionTableMap::IS_AVAILABLE_ON_SPECIAL_OFFERS)) $criteria->add(CouponVersionTableMap::IS_AVAILABLE_ON_SPECIAL_OFFERS, $this->is_available_on_special_offers); if ($this->isColumnModified(CouponVersionTableMap::CREATED_AT)) $criteria->add(CouponVersionTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(CouponVersionTableMap::UPDATED_AT)) $criteria->add(CouponVersionTableMap::UPDATED_AT, $this->updated_at); if ($this->isColumnModified(CouponVersionTableMap::VERSION)) $criteria->add(CouponVersionTableMap::VERSION, $this->version); @@ -1852,10 +1916,11 @@ abstract class CouponVersion implements ActiveRecordInterface $copyObj->setIsUsed($this->getIsUsed()); $copyObj->setIsEnabled($this->getIsEnabled()); $copyObj->setExpirationDate($this->getExpirationDate()); - $copyObj->setSerializedRulesType($this->getSerializedRulesType()); - $copyObj->setSerializedRulesContent($this->getSerializedRulesContent()); + $copyObj->setSerializedRules($this->getSerializedRules()); $copyObj->setIsCumulative($this->getIsCumulative()); $copyObj->setIsRemovingPostage($this->getIsRemovingPostage()); + $copyObj->setMaxUsage($this->getMaxUsage()); + $copyObj->setIsAvailableOnSpecialOffers($this->getIsAvailableOnSpecialOffers()); $copyObj->setCreatedAt($this->getCreatedAt()); $copyObj->setUpdatedAt($this->getUpdatedAt()); $copyObj->setVersion($this->getVersion()); @@ -1952,10 +2017,11 @@ abstract class CouponVersion implements ActiveRecordInterface $this->is_used = null; $this->is_enabled = null; $this->expiration_date = null; - $this->serialized_rules_type = null; - $this->serialized_rules_content = null; + $this->serialized_rules = null; $this->is_cumulative = null; $this->is_removing_postage = null; + $this->max_usage = null; + $this->is_available_on_special_offers = null; $this->created_at = null; $this->updated_at = null; $this->version = null; diff --git a/core/lib/Thelia/Model/Base/CouponVersionQuery.php b/core/lib/Thelia/Model/Base/CouponVersionQuery.php index 2ea0e23d7..71ce72aee 100644 --- a/core/lib/Thelia/Model/Base/CouponVersionQuery.php +++ b/core/lib/Thelia/Model/Base/CouponVersionQuery.php @@ -31,10 +31,11 @@ use Thelia\Model\Map\CouponVersionTableMap; * @method ChildCouponVersionQuery orderByIsUsed($order = Criteria::ASC) Order by the is_used column * @method ChildCouponVersionQuery orderByIsEnabled($order = Criteria::ASC) Order by the is_enabled column * @method ChildCouponVersionQuery orderByExpirationDate($order = Criteria::ASC) Order by the expiration_date column - * @method ChildCouponVersionQuery orderBySerializedRulesType($order = Criteria::ASC) Order by the serialized_rules_type column - * @method ChildCouponVersionQuery orderBySerializedRulesContent($order = Criteria::ASC) Order by the serialized_rules_content column + * @method ChildCouponVersionQuery orderBySerializedRules($order = Criteria::ASC) Order by the serialized_rules column * @method ChildCouponVersionQuery orderByIsCumulative($order = Criteria::ASC) Order by the is_cumulative column * @method ChildCouponVersionQuery orderByIsRemovingPostage($order = Criteria::ASC) Order by the is_removing_postage column + * @method ChildCouponVersionQuery orderByMaxUsage($order = Criteria::ASC) Order by the max_usage column + * @method ChildCouponVersionQuery orderByIsAvailableOnSpecialOffers($order = Criteria::ASC) Order by the is_available_on_special_offers column * @method ChildCouponVersionQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column * @method ChildCouponVersionQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column * @method ChildCouponVersionQuery orderByVersion($order = Criteria::ASC) Order by the version column @@ -49,10 +50,11 @@ use Thelia\Model\Map\CouponVersionTableMap; * @method ChildCouponVersionQuery groupByIsUsed() Group by the is_used column * @method ChildCouponVersionQuery groupByIsEnabled() Group by the is_enabled column * @method ChildCouponVersionQuery groupByExpirationDate() Group by the expiration_date column - * @method ChildCouponVersionQuery groupBySerializedRulesType() Group by the serialized_rules_type column - * @method ChildCouponVersionQuery groupBySerializedRulesContent() Group by the serialized_rules_content column + * @method ChildCouponVersionQuery groupBySerializedRules() Group by the serialized_rules column * @method ChildCouponVersionQuery groupByIsCumulative() Group by the is_cumulative column * @method ChildCouponVersionQuery groupByIsRemovingPostage() Group by the is_removing_postage column + * @method ChildCouponVersionQuery groupByMaxUsage() Group by the max_usage column + * @method ChildCouponVersionQuery groupByIsAvailableOnSpecialOffers() Group by the is_available_on_special_offers column * @method ChildCouponVersionQuery groupByCreatedAt() Group by the created_at column * @method ChildCouponVersionQuery groupByUpdatedAt() Group by the updated_at column * @method ChildCouponVersionQuery groupByVersion() Group by the version column @@ -78,10 +80,11 @@ use Thelia\Model\Map\CouponVersionTableMap; * @method ChildCouponVersion findOneByIsUsed(int $is_used) Return the first ChildCouponVersion filtered by the is_used column * @method ChildCouponVersion findOneByIsEnabled(int $is_enabled) Return the first ChildCouponVersion filtered by the is_enabled column * @method ChildCouponVersion findOneByExpirationDate(string $expiration_date) Return the first ChildCouponVersion filtered by the expiration_date column - * @method ChildCouponVersion findOneBySerializedRulesType(string $serialized_rules_type) Return the first ChildCouponVersion filtered by the serialized_rules_type column - * @method ChildCouponVersion findOneBySerializedRulesContent(string $serialized_rules_content) Return the first ChildCouponVersion filtered by the serialized_rules_content column + * @method ChildCouponVersion findOneBySerializedRules(string $serialized_rules) Return the first ChildCouponVersion filtered by the serialized_rules column * @method ChildCouponVersion findOneByIsCumulative(int $is_cumulative) Return the first ChildCouponVersion filtered by the is_cumulative column * @method ChildCouponVersion findOneByIsRemovingPostage(int $is_removing_postage) Return the first ChildCouponVersion filtered by the is_removing_postage column + * @method ChildCouponVersion findOneByMaxUsage(int $max_usage) Return the first ChildCouponVersion filtered by the max_usage column + * @method ChildCouponVersion findOneByIsAvailableOnSpecialOffers(boolean $is_available_on_special_offers) Return the first ChildCouponVersion filtered by the is_available_on_special_offers column * @method ChildCouponVersion findOneByCreatedAt(string $created_at) Return the first ChildCouponVersion filtered by the created_at column * @method ChildCouponVersion findOneByUpdatedAt(string $updated_at) Return the first ChildCouponVersion filtered by the updated_at column * @method ChildCouponVersion findOneByVersion(int $version) Return the first ChildCouponVersion filtered by the version column @@ -96,10 +99,11 @@ use Thelia\Model\Map\CouponVersionTableMap; * @method array findByIsUsed(int $is_used) Return ChildCouponVersion objects filtered by the is_used column * @method array findByIsEnabled(int $is_enabled) Return ChildCouponVersion objects filtered by the is_enabled column * @method array findByExpirationDate(string $expiration_date) Return ChildCouponVersion objects filtered by the expiration_date column - * @method array findBySerializedRulesType(string $serialized_rules_type) Return ChildCouponVersion objects filtered by the serialized_rules_type column - * @method array findBySerializedRulesContent(string $serialized_rules_content) Return ChildCouponVersion objects filtered by the serialized_rules_content column + * @method array findBySerializedRules(string $serialized_rules) Return ChildCouponVersion objects filtered by the serialized_rules column * @method array findByIsCumulative(int $is_cumulative) Return ChildCouponVersion objects filtered by the is_cumulative column * @method array findByIsRemovingPostage(int $is_removing_postage) Return ChildCouponVersion objects filtered by the is_removing_postage column + * @method array findByMaxUsage(int $max_usage) Return ChildCouponVersion objects filtered by the max_usage column + * @method array findByIsAvailableOnSpecialOffers(boolean $is_available_on_special_offers) Return ChildCouponVersion objects filtered by the is_available_on_special_offers column * @method array findByCreatedAt(string $created_at) Return ChildCouponVersion objects filtered by the created_at column * @method array findByUpdatedAt(string $updated_at) Return ChildCouponVersion objects filtered by the updated_at column * @method array findByVersion(int $version) Return ChildCouponVersion objects filtered by the version column @@ -191,7 +195,7 @@ abstract class CouponVersionQuery extends ModelCriteria */ protected function findPkSimple($key, $con) { - $sql = 'SELECT ID, CODE, TYPE, TITLE, SHORT_DESCRIPTION, DESCRIPTION, AMOUNT, IS_USED, IS_ENABLED, EXPIRATION_DATE, SERIALIZED_RULES_TYPE, SERIALIZED_RULES_CONTENT, IS_CUMULATIVE, IS_REMOVING_POSTAGE, CREATED_AT, UPDATED_AT, VERSION FROM coupon_version WHERE ID = :p0 AND VERSION = :p1'; + $sql = 'SELECT ID, CODE, TYPE, TITLE, SHORT_DESCRIPTION, DESCRIPTION, AMOUNT, IS_USED, IS_ENABLED, EXPIRATION_DATE, SERIALIZED_RULES, IS_CUMULATIVE, IS_REMOVING_POSTAGE, MAX_USAGE, IS_AVAILABLE_ON_SPECIAL_OFFERS, CREATED_AT, UPDATED_AT, VERSION FROM coupon_version WHERE ID = :p0 AND VERSION = :p1'; try { $stmt = $con->prepare($sql); $stmt->bindValue(':p0', $key[0], PDO::PARAM_INT); @@ -647,61 +651,32 @@ abstract class CouponVersionQuery extends ModelCriteria } /** - * Filter the query on the serialized_rules_type column + * Filter the query on the serialized_rules column * * Example usage: * - * $query->filterBySerializedRulesType('fooValue'); // WHERE serialized_rules_type = 'fooValue' - * $query->filterBySerializedRulesType('%fooValue%'); // WHERE serialized_rules_type LIKE '%fooValue%' + * $query->filterBySerializedRules('fooValue'); // WHERE serialized_rules = 'fooValue' + * $query->filterBySerializedRules('%fooValue%'); // WHERE serialized_rules LIKE '%fooValue%' * * - * @param string $serializedRulesType The value to use as filter. + * @param string $serializedRules The value to use as filter. * Accepts wildcards (* and % trigger a LIKE) * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return ChildCouponVersionQuery The current query, for fluid interface */ - public function filterBySerializedRulesType($serializedRulesType = null, $comparison = null) + public function filterBySerializedRules($serializedRules = null, $comparison = null) { if (null === $comparison) { - if (is_array($serializedRulesType)) { + if (is_array($serializedRules)) { $comparison = Criteria::IN; - } elseif (preg_match('/[\%\*]/', $serializedRulesType)) { - $serializedRulesType = str_replace('*', '%', $serializedRulesType); + } elseif (preg_match('/[\%\*]/', $serializedRules)) { + $serializedRules = str_replace('*', '%', $serializedRules); $comparison = Criteria::LIKE; } } - return $this->addUsingAlias(CouponVersionTableMap::SERIALIZED_RULES_TYPE, $serializedRulesType, $comparison); - } - - /** - * Filter the query on the serialized_rules_content column - * - * Example usage: - * - * $query->filterBySerializedRulesContent('fooValue'); // WHERE serialized_rules_content = 'fooValue' - * $query->filterBySerializedRulesContent('%fooValue%'); // WHERE serialized_rules_content LIKE '%fooValue%' - * - * - * @param string $serializedRulesContent The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildCouponVersionQuery The current query, for fluid interface - */ - public function filterBySerializedRulesContent($serializedRulesContent = null, $comparison = null) - { - if (null === $comparison) { - if (is_array($serializedRulesContent)) { - $comparison = Criteria::IN; - } elseif (preg_match('/[\%\*]/', $serializedRulesContent)) { - $serializedRulesContent = str_replace('*', '%', $serializedRulesContent); - $comparison = Criteria::LIKE; - } - } - - return $this->addUsingAlias(CouponVersionTableMap::SERIALIZED_RULES_CONTENT, $serializedRulesContent, $comparison); + return $this->addUsingAlias(CouponVersionTableMap::SERIALIZED_RULES, $serializedRules, $comparison); } /** @@ -786,6 +761,74 @@ abstract class CouponVersionQuery extends ModelCriteria return $this->addUsingAlias(CouponVersionTableMap::IS_REMOVING_POSTAGE, $isRemovingPostage, $comparison); } + /** + * Filter the query on the max_usage column + * + * Example usage: + * + * $query->filterByMaxUsage(1234); // WHERE max_usage = 1234 + * $query->filterByMaxUsage(array(12, 34)); // WHERE max_usage IN (12, 34) + * $query->filterByMaxUsage(array('min' => 12)); // WHERE max_usage > 12 + * + * + * @param mixed $maxUsage The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponVersionQuery The current query, for fluid interface + */ + public function filterByMaxUsage($maxUsage = null, $comparison = null) + { + if (is_array($maxUsage)) { + $useMinMax = false; + if (isset($maxUsage['min'])) { + $this->addUsingAlias(CouponVersionTableMap::MAX_USAGE, $maxUsage['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($maxUsage['max'])) { + $this->addUsingAlias(CouponVersionTableMap::MAX_USAGE, $maxUsage['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(CouponVersionTableMap::MAX_USAGE, $maxUsage, $comparison); + } + + /** + * Filter the query on the is_available_on_special_offers column + * + * Example usage: + * + * $query->filterByIsAvailableOnSpecialOffers(true); // WHERE is_available_on_special_offers = true + * $query->filterByIsAvailableOnSpecialOffers('yes'); // WHERE is_available_on_special_offers = true + * + * + * @param boolean|string $isAvailableOnSpecialOffers The value to use as filter. + * Non-boolean arguments are converted using the following rules: + * * 1, '1', 'true', 'on', and 'yes' are converted to boolean true + * * 0, '0', 'false', 'off', and 'no' are converted to boolean false + * Check on string values is case insensitive (so 'FaLsE' is seen as 'false'). + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponVersionQuery The current query, for fluid interface + */ + public function filterByIsAvailableOnSpecialOffers($isAvailableOnSpecialOffers = null, $comparison = null) + { + if (is_string($isAvailableOnSpecialOffers)) { + $is_available_on_special_offers = in_array(strtolower($isAvailableOnSpecialOffers), array('false', 'off', '-', 'no', 'n', '0', '')) ? false : true; + } + + return $this->addUsingAlias(CouponVersionTableMap::IS_AVAILABLE_ON_SPECIAL_OFFERS, $isAvailableOnSpecialOffers, $comparison); + } + /** * Filter the query on the created_at column * diff --git a/core/lib/Thelia/Model/Map/CouponTableMap.php b/core/lib/Thelia/Model/Map/CouponTableMap.php index dfc987b21..d3ba620bf 100644 --- a/core/lib/Thelia/Model/Map/CouponTableMap.php +++ b/core/lib/Thelia/Model/Map/CouponTableMap.php @@ -57,7 +57,7 @@ class CouponTableMap extends TableMap /** * The total number of columns */ - const NUM_COLUMNS = 17; + const NUM_COLUMNS = 18; /** * The number of lazy-loaded columns @@ -67,7 +67,7 @@ class CouponTableMap extends TableMap /** * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS) */ - const NUM_HYDRATE_COLUMNS = 17; + const NUM_HYDRATE_COLUMNS = 18; /** * the column name for the ID field @@ -120,14 +120,9 @@ class CouponTableMap extends TableMap const EXPIRATION_DATE = 'coupon.EXPIRATION_DATE'; /** - * the column name for the SERIALIZED_RULES_TYPE field + * the column name for the SERIALIZED_RULES field */ - const SERIALIZED_RULES_TYPE = 'coupon.SERIALIZED_RULES_TYPE'; - - /** - * the column name for the SERIALIZED_RULES_CONTENT field - */ - const SERIALIZED_RULES_CONTENT = 'coupon.SERIALIZED_RULES_CONTENT'; + const SERIALIZED_RULES = 'coupon.SERIALIZED_RULES'; /** * the column name for the IS_CUMULATIVE field @@ -139,6 +134,16 @@ class CouponTableMap extends TableMap */ const IS_REMOVING_POSTAGE = 'coupon.IS_REMOVING_POSTAGE'; + /** + * the column name for the MAX_USAGE field + */ + const MAX_USAGE = 'coupon.MAX_USAGE'; + + /** + * the column name for the IS_AVAILABLE_ON_SPECIAL_OFFERS field + */ + const IS_AVAILABLE_ON_SPECIAL_OFFERS = 'coupon.IS_AVAILABLE_ON_SPECIAL_OFFERS'; + /** * the column name for the CREATED_AT field */ @@ -175,12 +180,12 @@ class CouponTableMap extends TableMap * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ protected static $fieldNames = array ( - self::TYPE_PHPNAME => array('Id', 'Code', 'Type', 'Title', 'ShortDescription', 'Description', 'Amount', 'IsUsed', 'IsEnabled', 'ExpirationDate', 'SerializedRulesType', 'SerializedRulesContent', 'IsCumulative', 'IsRemovingPostage', 'CreatedAt', 'UpdatedAt', 'Version', ), - self::TYPE_STUDLYPHPNAME => array('id', 'code', 'type', 'title', 'shortDescription', 'description', 'amount', 'isUsed', 'isEnabled', 'expirationDate', 'serializedRulesType', 'serializedRulesContent', 'isCumulative', 'isRemovingPostage', 'createdAt', 'updatedAt', 'version', ), - self::TYPE_COLNAME => array(CouponTableMap::ID, CouponTableMap::CODE, CouponTableMap::TYPE, CouponTableMap::TITLE, CouponTableMap::SHORT_DESCRIPTION, CouponTableMap::DESCRIPTION, CouponTableMap::AMOUNT, CouponTableMap::IS_USED, CouponTableMap::IS_ENABLED, CouponTableMap::EXPIRATION_DATE, CouponTableMap::SERIALIZED_RULES_TYPE, CouponTableMap::SERIALIZED_RULES_CONTENT, CouponTableMap::IS_CUMULATIVE, CouponTableMap::IS_REMOVING_POSTAGE, CouponTableMap::CREATED_AT, CouponTableMap::UPDATED_AT, CouponTableMap::VERSION, ), - self::TYPE_RAW_COLNAME => array('ID', 'CODE', 'TYPE', 'TITLE', 'SHORT_DESCRIPTION', 'DESCRIPTION', 'AMOUNT', 'IS_USED', 'IS_ENABLED', 'EXPIRATION_DATE', 'SERIALIZED_RULES_TYPE', 'SERIALIZED_RULES_CONTENT', 'IS_CUMULATIVE', 'IS_REMOVING_POSTAGE', 'CREATED_AT', 'UPDATED_AT', 'VERSION', ), - self::TYPE_FIELDNAME => array('id', 'code', 'type', 'title', 'short_description', 'description', 'amount', 'is_used', 'is_enabled', 'expiration_date', 'serialized_rules_type', 'serialized_rules_content', 'is_cumulative', 'is_removing_postage', 'created_at', 'updated_at', 'version', ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, ) + self::TYPE_PHPNAME => array('Id', 'Code', 'Type', 'Title', 'ShortDescription', 'Description', 'Amount', 'IsUsed', 'IsEnabled', 'ExpirationDate', 'SerializedRules', 'IsCumulative', 'IsRemovingPostage', 'MaxUsage', 'IsAvailableOnSpecialOffers', 'CreatedAt', 'UpdatedAt', 'Version', ), + self::TYPE_STUDLYPHPNAME => array('id', 'code', 'type', 'title', 'shortDescription', 'description', 'amount', 'isUsed', 'isEnabled', 'expirationDate', 'serializedRules', 'isCumulative', 'isRemovingPostage', 'maxUsage', 'isAvailableOnSpecialOffers', 'createdAt', 'updatedAt', 'version', ), + self::TYPE_COLNAME => array(CouponTableMap::ID, CouponTableMap::CODE, CouponTableMap::TYPE, CouponTableMap::TITLE, CouponTableMap::SHORT_DESCRIPTION, CouponTableMap::DESCRIPTION, CouponTableMap::AMOUNT, CouponTableMap::IS_USED, CouponTableMap::IS_ENABLED, CouponTableMap::EXPIRATION_DATE, CouponTableMap::SERIALIZED_RULES, CouponTableMap::IS_CUMULATIVE, CouponTableMap::IS_REMOVING_POSTAGE, CouponTableMap::MAX_USAGE, CouponTableMap::IS_AVAILABLE_ON_SPECIAL_OFFERS, CouponTableMap::CREATED_AT, CouponTableMap::UPDATED_AT, CouponTableMap::VERSION, ), + self::TYPE_RAW_COLNAME => array('ID', 'CODE', 'TYPE', 'TITLE', 'SHORT_DESCRIPTION', 'DESCRIPTION', 'AMOUNT', 'IS_USED', 'IS_ENABLED', 'EXPIRATION_DATE', 'SERIALIZED_RULES', 'IS_CUMULATIVE', 'IS_REMOVING_POSTAGE', 'MAX_USAGE', 'IS_AVAILABLE_ON_SPECIAL_OFFERS', 'CREATED_AT', 'UPDATED_AT', 'VERSION', ), + self::TYPE_FIELDNAME => array('id', 'code', 'type', 'title', 'short_description', 'description', 'amount', 'is_used', 'is_enabled', 'expiration_date', 'serialized_rules', 'is_cumulative', 'is_removing_postage', 'max_usage', 'is_available_on_special_offers', 'created_at', 'updated_at', 'version', ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, ) ); /** @@ -190,12 +195,12 @@ class CouponTableMap extends TableMap * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 */ protected static $fieldKeys = array ( - self::TYPE_PHPNAME => array('Id' => 0, 'Code' => 1, 'Type' => 2, 'Title' => 3, 'ShortDescription' => 4, 'Description' => 5, 'Amount' => 6, 'IsUsed' => 7, 'IsEnabled' => 8, 'ExpirationDate' => 9, 'SerializedRulesType' => 10, 'SerializedRulesContent' => 11, 'IsCumulative' => 12, 'IsRemovingPostage' => 13, 'CreatedAt' => 14, 'UpdatedAt' => 15, 'Version' => 16, ), - self::TYPE_STUDLYPHPNAME => array('id' => 0, 'code' => 1, 'type' => 2, 'title' => 3, 'shortDescription' => 4, 'description' => 5, 'amount' => 6, 'isUsed' => 7, 'isEnabled' => 8, 'expirationDate' => 9, 'serializedRulesType' => 10, 'serializedRulesContent' => 11, 'isCumulative' => 12, 'isRemovingPostage' => 13, 'createdAt' => 14, 'updatedAt' => 15, 'version' => 16, ), - self::TYPE_COLNAME => array(CouponTableMap::ID => 0, CouponTableMap::CODE => 1, CouponTableMap::TYPE => 2, CouponTableMap::TITLE => 3, CouponTableMap::SHORT_DESCRIPTION => 4, CouponTableMap::DESCRIPTION => 5, CouponTableMap::AMOUNT => 6, CouponTableMap::IS_USED => 7, CouponTableMap::IS_ENABLED => 8, CouponTableMap::EXPIRATION_DATE => 9, CouponTableMap::SERIALIZED_RULES_TYPE => 10, CouponTableMap::SERIALIZED_RULES_CONTENT => 11, CouponTableMap::IS_CUMULATIVE => 12, CouponTableMap::IS_REMOVING_POSTAGE => 13, CouponTableMap::CREATED_AT => 14, CouponTableMap::UPDATED_AT => 15, CouponTableMap::VERSION => 16, ), - self::TYPE_RAW_COLNAME => array('ID' => 0, 'CODE' => 1, 'TYPE' => 2, 'TITLE' => 3, 'SHORT_DESCRIPTION' => 4, 'DESCRIPTION' => 5, 'AMOUNT' => 6, 'IS_USED' => 7, 'IS_ENABLED' => 8, 'EXPIRATION_DATE' => 9, 'SERIALIZED_RULES_TYPE' => 10, 'SERIALIZED_RULES_CONTENT' => 11, 'IS_CUMULATIVE' => 12, 'IS_REMOVING_POSTAGE' => 13, 'CREATED_AT' => 14, 'UPDATED_AT' => 15, 'VERSION' => 16, ), - self::TYPE_FIELDNAME => array('id' => 0, 'code' => 1, 'type' => 2, 'title' => 3, 'short_description' => 4, 'description' => 5, 'amount' => 6, 'is_used' => 7, 'is_enabled' => 8, 'expiration_date' => 9, 'serialized_rules_type' => 10, 'serialized_rules_content' => 11, 'is_cumulative' => 12, 'is_removing_postage' => 13, 'created_at' => 14, 'updated_at' => 15, 'version' => 16, ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, ) + self::TYPE_PHPNAME => array('Id' => 0, 'Code' => 1, 'Type' => 2, 'Title' => 3, 'ShortDescription' => 4, 'Description' => 5, 'Amount' => 6, 'IsUsed' => 7, 'IsEnabled' => 8, 'ExpirationDate' => 9, 'SerializedRules' => 10, 'IsCumulative' => 11, 'IsRemovingPostage' => 12, 'MaxUsage' => 13, 'IsAvailableOnSpecialOffers' => 14, 'CreatedAt' => 15, 'UpdatedAt' => 16, 'Version' => 17, ), + self::TYPE_STUDLYPHPNAME => array('id' => 0, 'code' => 1, 'type' => 2, 'title' => 3, 'shortDescription' => 4, 'description' => 5, 'amount' => 6, 'isUsed' => 7, 'isEnabled' => 8, 'expirationDate' => 9, 'serializedRules' => 10, 'isCumulative' => 11, 'isRemovingPostage' => 12, 'maxUsage' => 13, 'isAvailableOnSpecialOffers' => 14, 'createdAt' => 15, 'updatedAt' => 16, 'version' => 17, ), + self::TYPE_COLNAME => array(CouponTableMap::ID => 0, CouponTableMap::CODE => 1, CouponTableMap::TYPE => 2, CouponTableMap::TITLE => 3, CouponTableMap::SHORT_DESCRIPTION => 4, CouponTableMap::DESCRIPTION => 5, CouponTableMap::AMOUNT => 6, CouponTableMap::IS_USED => 7, CouponTableMap::IS_ENABLED => 8, CouponTableMap::EXPIRATION_DATE => 9, CouponTableMap::SERIALIZED_RULES => 10, CouponTableMap::IS_CUMULATIVE => 11, CouponTableMap::IS_REMOVING_POSTAGE => 12, CouponTableMap::MAX_USAGE => 13, CouponTableMap::IS_AVAILABLE_ON_SPECIAL_OFFERS => 14, CouponTableMap::CREATED_AT => 15, CouponTableMap::UPDATED_AT => 16, CouponTableMap::VERSION => 17, ), + self::TYPE_RAW_COLNAME => array('ID' => 0, 'CODE' => 1, 'TYPE' => 2, 'TITLE' => 3, 'SHORT_DESCRIPTION' => 4, 'DESCRIPTION' => 5, 'AMOUNT' => 6, 'IS_USED' => 7, 'IS_ENABLED' => 8, 'EXPIRATION_DATE' => 9, 'SERIALIZED_RULES' => 10, 'IS_CUMULATIVE' => 11, 'IS_REMOVING_POSTAGE' => 12, 'MAX_USAGE' => 13, 'IS_AVAILABLE_ON_SPECIAL_OFFERS' => 14, 'CREATED_AT' => 15, 'UPDATED_AT' => 16, 'VERSION' => 17, ), + self::TYPE_FIELDNAME => array('id' => 0, 'code' => 1, 'type' => 2, 'title' => 3, 'short_description' => 4, 'description' => 5, 'amount' => 6, 'is_used' => 7, 'is_enabled' => 8, 'expiration_date' => 9, 'serialized_rules' => 10, 'is_cumulative' => 11, 'is_removing_postage' => 12, 'max_usage' => 13, 'is_available_on_special_offers' => 14, 'created_at' => 15, 'updated_at' => 16, 'version' => 17, ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, ) ); /** @@ -224,10 +229,11 @@ class CouponTableMap extends TableMap $this->addColumn('IS_USED', 'IsUsed', 'TINYINT', true, null, null); $this->addColumn('IS_ENABLED', 'IsEnabled', 'TINYINT', true, null, null); $this->addColumn('EXPIRATION_DATE', 'ExpirationDate', 'TIMESTAMP', true, null, null); - $this->addColumn('SERIALIZED_RULES_TYPE', 'SerializedRulesType', 'LONGVARCHAR', true, null, null); - $this->addColumn('SERIALIZED_RULES_CONTENT', 'SerializedRulesContent', 'LONGVARCHAR', true, null, null); + $this->addColumn('SERIALIZED_RULES', 'SerializedRules', 'LONGVARCHAR', true, null, null); $this->addColumn('IS_CUMULATIVE', 'IsCumulative', 'TINYINT', true, null, null); $this->addColumn('IS_REMOVING_POSTAGE', 'IsRemovingPostage', 'TINYINT', true, null, null); + $this->addColumn('MAX_USAGE', 'MaxUsage', 'INTEGER', true, null, null); + $this->addColumn('IS_AVAILABLE_ON_SPECIAL_OFFERS', 'IsAvailableOnSpecialOffers', 'BOOLEAN', true, 1, null); $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null); $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null); $this->addColumn('VERSION', 'Version', 'INTEGER', false, null, 0); @@ -416,10 +422,11 @@ class CouponTableMap extends TableMap $criteria->addSelectColumn(CouponTableMap::IS_USED); $criteria->addSelectColumn(CouponTableMap::IS_ENABLED); $criteria->addSelectColumn(CouponTableMap::EXPIRATION_DATE); - $criteria->addSelectColumn(CouponTableMap::SERIALIZED_RULES_TYPE); - $criteria->addSelectColumn(CouponTableMap::SERIALIZED_RULES_CONTENT); + $criteria->addSelectColumn(CouponTableMap::SERIALIZED_RULES); $criteria->addSelectColumn(CouponTableMap::IS_CUMULATIVE); $criteria->addSelectColumn(CouponTableMap::IS_REMOVING_POSTAGE); + $criteria->addSelectColumn(CouponTableMap::MAX_USAGE); + $criteria->addSelectColumn(CouponTableMap::IS_AVAILABLE_ON_SPECIAL_OFFERS); $criteria->addSelectColumn(CouponTableMap::CREATED_AT); $criteria->addSelectColumn(CouponTableMap::UPDATED_AT); $criteria->addSelectColumn(CouponTableMap::VERSION); @@ -434,10 +441,11 @@ class CouponTableMap extends TableMap $criteria->addSelectColumn($alias . '.IS_USED'); $criteria->addSelectColumn($alias . '.IS_ENABLED'); $criteria->addSelectColumn($alias . '.EXPIRATION_DATE'); - $criteria->addSelectColumn($alias . '.SERIALIZED_RULES_TYPE'); - $criteria->addSelectColumn($alias . '.SERIALIZED_RULES_CONTENT'); + $criteria->addSelectColumn($alias . '.SERIALIZED_RULES'); $criteria->addSelectColumn($alias . '.IS_CUMULATIVE'); $criteria->addSelectColumn($alias . '.IS_REMOVING_POSTAGE'); + $criteria->addSelectColumn($alias . '.MAX_USAGE'); + $criteria->addSelectColumn($alias . '.IS_AVAILABLE_ON_SPECIAL_OFFERS'); $criteria->addSelectColumn($alias . '.CREATED_AT'); $criteria->addSelectColumn($alias . '.UPDATED_AT'); $criteria->addSelectColumn($alias . '.VERSION'); diff --git a/core/lib/Thelia/Model/Map/CouponVersionTableMap.php b/core/lib/Thelia/Model/Map/CouponVersionTableMap.php index 68ece7a0f..9db387a86 100644 --- a/core/lib/Thelia/Model/Map/CouponVersionTableMap.php +++ b/core/lib/Thelia/Model/Map/CouponVersionTableMap.php @@ -57,7 +57,7 @@ class CouponVersionTableMap extends TableMap /** * The total number of columns */ - const NUM_COLUMNS = 17; + const NUM_COLUMNS = 18; /** * The number of lazy-loaded columns @@ -67,7 +67,7 @@ class CouponVersionTableMap extends TableMap /** * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS) */ - const NUM_HYDRATE_COLUMNS = 17; + const NUM_HYDRATE_COLUMNS = 18; /** * the column name for the ID field @@ -120,14 +120,9 @@ class CouponVersionTableMap extends TableMap const EXPIRATION_DATE = 'coupon_version.EXPIRATION_DATE'; /** - * the column name for the SERIALIZED_RULES_TYPE field + * the column name for the SERIALIZED_RULES field */ - const SERIALIZED_RULES_TYPE = 'coupon_version.SERIALIZED_RULES_TYPE'; - - /** - * the column name for the SERIALIZED_RULES_CONTENT field - */ - const SERIALIZED_RULES_CONTENT = 'coupon_version.SERIALIZED_RULES_CONTENT'; + const SERIALIZED_RULES = 'coupon_version.SERIALIZED_RULES'; /** * the column name for the IS_CUMULATIVE field @@ -139,6 +134,16 @@ class CouponVersionTableMap extends TableMap */ const IS_REMOVING_POSTAGE = 'coupon_version.IS_REMOVING_POSTAGE'; + /** + * the column name for the MAX_USAGE field + */ + const MAX_USAGE = 'coupon_version.MAX_USAGE'; + + /** + * the column name for the IS_AVAILABLE_ON_SPECIAL_OFFERS field + */ + const IS_AVAILABLE_ON_SPECIAL_OFFERS = 'coupon_version.IS_AVAILABLE_ON_SPECIAL_OFFERS'; + /** * the column name for the CREATED_AT field */ @@ -166,12 +171,12 @@ class CouponVersionTableMap extends TableMap * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ protected static $fieldNames = array ( - self::TYPE_PHPNAME => array('Id', 'Code', 'Type', 'Title', 'ShortDescription', 'Description', 'Amount', 'IsUsed', 'IsEnabled', 'ExpirationDate', 'SerializedRulesType', 'SerializedRulesContent', 'IsCumulative', 'IsRemovingPostage', 'CreatedAt', 'UpdatedAt', 'Version', ), - self::TYPE_STUDLYPHPNAME => array('id', 'code', 'type', 'title', 'shortDescription', 'description', 'amount', 'isUsed', 'isEnabled', 'expirationDate', 'serializedRulesType', 'serializedRulesContent', 'isCumulative', 'isRemovingPostage', 'createdAt', 'updatedAt', 'version', ), - self::TYPE_COLNAME => array(CouponVersionTableMap::ID, CouponVersionTableMap::CODE, CouponVersionTableMap::TYPE, CouponVersionTableMap::TITLE, CouponVersionTableMap::SHORT_DESCRIPTION, CouponVersionTableMap::DESCRIPTION, CouponVersionTableMap::AMOUNT, CouponVersionTableMap::IS_USED, CouponVersionTableMap::IS_ENABLED, CouponVersionTableMap::EXPIRATION_DATE, CouponVersionTableMap::SERIALIZED_RULES_TYPE, CouponVersionTableMap::SERIALIZED_RULES_CONTENT, CouponVersionTableMap::IS_CUMULATIVE, CouponVersionTableMap::IS_REMOVING_POSTAGE, CouponVersionTableMap::CREATED_AT, CouponVersionTableMap::UPDATED_AT, CouponVersionTableMap::VERSION, ), - self::TYPE_RAW_COLNAME => array('ID', 'CODE', 'TYPE', 'TITLE', 'SHORT_DESCRIPTION', 'DESCRIPTION', 'AMOUNT', 'IS_USED', 'IS_ENABLED', 'EXPIRATION_DATE', 'SERIALIZED_RULES_TYPE', 'SERIALIZED_RULES_CONTENT', 'IS_CUMULATIVE', 'IS_REMOVING_POSTAGE', 'CREATED_AT', 'UPDATED_AT', 'VERSION', ), - self::TYPE_FIELDNAME => array('id', 'code', 'type', 'title', 'short_description', 'description', 'amount', 'is_used', 'is_enabled', 'expiration_date', 'serialized_rules_type', 'serialized_rules_content', 'is_cumulative', 'is_removing_postage', 'created_at', 'updated_at', 'version', ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, ) + self::TYPE_PHPNAME => array('Id', 'Code', 'Type', 'Title', 'ShortDescription', 'Description', 'Amount', 'IsUsed', 'IsEnabled', 'ExpirationDate', 'SerializedRules', 'IsCumulative', 'IsRemovingPostage', 'MaxUsage', 'IsAvailableOnSpecialOffers', 'CreatedAt', 'UpdatedAt', 'Version', ), + self::TYPE_STUDLYPHPNAME => array('id', 'code', 'type', 'title', 'shortDescription', 'description', 'amount', 'isUsed', 'isEnabled', 'expirationDate', 'serializedRules', 'isCumulative', 'isRemovingPostage', 'maxUsage', 'isAvailableOnSpecialOffers', 'createdAt', 'updatedAt', 'version', ), + self::TYPE_COLNAME => array(CouponVersionTableMap::ID, CouponVersionTableMap::CODE, CouponVersionTableMap::TYPE, CouponVersionTableMap::TITLE, CouponVersionTableMap::SHORT_DESCRIPTION, CouponVersionTableMap::DESCRIPTION, CouponVersionTableMap::AMOUNT, CouponVersionTableMap::IS_USED, CouponVersionTableMap::IS_ENABLED, CouponVersionTableMap::EXPIRATION_DATE, CouponVersionTableMap::SERIALIZED_RULES, CouponVersionTableMap::IS_CUMULATIVE, CouponVersionTableMap::IS_REMOVING_POSTAGE, CouponVersionTableMap::MAX_USAGE, CouponVersionTableMap::IS_AVAILABLE_ON_SPECIAL_OFFERS, CouponVersionTableMap::CREATED_AT, CouponVersionTableMap::UPDATED_AT, CouponVersionTableMap::VERSION, ), + self::TYPE_RAW_COLNAME => array('ID', 'CODE', 'TYPE', 'TITLE', 'SHORT_DESCRIPTION', 'DESCRIPTION', 'AMOUNT', 'IS_USED', 'IS_ENABLED', 'EXPIRATION_DATE', 'SERIALIZED_RULES', 'IS_CUMULATIVE', 'IS_REMOVING_POSTAGE', 'MAX_USAGE', 'IS_AVAILABLE_ON_SPECIAL_OFFERS', 'CREATED_AT', 'UPDATED_AT', 'VERSION', ), + self::TYPE_FIELDNAME => array('id', 'code', 'type', 'title', 'short_description', 'description', 'amount', 'is_used', 'is_enabled', 'expiration_date', 'serialized_rules', 'is_cumulative', 'is_removing_postage', 'max_usage', 'is_available_on_special_offers', 'created_at', 'updated_at', 'version', ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, ) ); /** @@ -181,12 +186,12 @@ class CouponVersionTableMap extends TableMap * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 */ protected static $fieldKeys = array ( - self::TYPE_PHPNAME => array('Id' => 0, 'Code' => 1, 'Type' => 2, 'Title' => 3, 'ShortDescription' => 4, 'Description' => 5, 'Amount' => 6, 'IsUsed' => 7, 'IsEnabled' => 8, 'ExpirationDate' => 9, 'SerializedRulesType' => 10, 'SerializedRulesContent' => 11, 'IsCumulative' => 12, 'IsRemovingPostage' => 13, 'CreatedAt' => 14, 'UpdatedAt' => 15, 'Version' => 16, ), - self::TYPE_STUDLYPHPNAME => array('id' => 0, 'code' => 1, 'type' => 2, 'title' => 3, 'shortDescription' => 4, 'description' => 5, 'amount' => 6, 'isUsed' => 7, 'isEnabled' => 8, 'expirationDate' => 9, 'serializedRulesType' => 10, 'serializedRulesContent' => 11, 'isCumulative' => 12, 'isRemovingPostage' => 13, 'createdAt' => 14, 'updatedAt' => 15, 'version' => 16, ), - self::TYPE_COLNAME => array(CouponVersionTableMap::ID => 0, CouponVersionTableMap::CODE => 1, CouponVersionTableMap::TYPE => 2, CouponVersionTableMap::TITLE => 3, CouponVersionTableMap::SHORT_DESCRIPTION => 4, CouponVersionTableMap::DESCRIPTION => 5, CouponVersionTableMap::AMOUNT => 6, CouponVersionTableMap::IS_USED => 7, CouponVersionTableMap::IS_ENABLED => 8, CouponVersionTableMap::EXPIRATION_DATE => 9, CouponVersionTableMap::SERIALIZED_RULES_TYPE => 10, CouponVersionTableMap::SERIALIZED_RULES_CONTENT => 11, CouponVersionTableMap::IS_CUMULATIVE => 12, CouponVersionTableMap::IS_REMOVING_POSTAGE => 13, CouponVersionTableMap::CREATED_AT => 14, CouponVersionTableMap::UPDATED_AT => 15, CouponVersionTableMap::VERSION => 16, ), - self::TYPE_RAW_COLNAME => array('ID' => 0, 'CODE' => 1, 'TYPE' => 2, 'TITLE' => 3, 'SHORT_DESCRIPTION' => 4, 'DESCRIPTION' => 5, 'AMOUNT' => 6, 'IS_USED' => 7, 'IS_ENABLED' => 8, 'EXPIRATION_DATE' => 9, 'SERIALIZED_RULES_TYPE' => 10, 'SERIALIZED_RULES_CONTENT' => 11, 'IS_CUMULATIVE' => 12, 'IS_REMOVING_POSTAGE' => 13, 'CREATED_AT' => 14, 'UPDATED_AT' => 15, 'VERSION' => 16, ), - self::TYPE_FIELDNAME => array('id' => 0, 'code' => 1, 'type' => 2, 'title' => 3, 'short_description' => 4, 'description' => 5, 'amount' => 6, 'is_used' => 7, 'is_enabled' => 8, 'expiration_date' => 9, 'serialized_rules_type' => 10, 'serialized_rules_content' => 11, 'is_cumulative' => 12, 'is_removing_postage' => 13, 'created_at' => 14, 'updated_at' => 15, 'version' => 16, ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, ) + self::TYPE_PHPNAME => array('Id' => 0, 'Code' => 1, 'Type' => 2, 'Title' => 3, 'ShortDescription' => 4, 'Description' => 5, 'Amount' => 6, 'IsUsed' => 7, 'IsEnabled' => 8, 'ExpirationDate' => 9, 'SerializedRules' => 10, 'IsCumulative' => 11, 'IsRemovingPostage' => 12, 'MaxUsage' => 13, 'IsAvailableOnSpecialOffers' => 14, 'CreatedAt' => 15, 'UpdatedAt' => 16, 'Version' => 17, ), + self::TYPE_STUDLYPHPNAME => array('id' => 0, 'code' => 1, 'type' => 2, 'title' => 3, 'shortDescription' => 4, 'description' => 5, 'amount' => 6, 'isUsed' => 7, 'isEnabled' => 8, 'expirationDate' => 9, 'serializedRules' => 10, 'isCumulative' => 11, 'isRemovingPostage' => 12, 'maxUsage' => 13, 'isAvailableOnSpecialOffers' => 14, 'createdAt' => 15, 'updatedAt' => 16, 'version' => 17, ), + self::TYPE_COLNAME => array(CouponVersionTableMap::ID => 0, CouponVersionTableMap::CODE => 1, CouponVersionTableMap::TYPE => 2, CouponVersionTableMap::TITLE => 3, CouponVersionTableMap::SHORT_DESCRIPTION => 4, CouponVersionTableMap::DESCRIPTION => 5, CouponVersionTableMap::AMOUNT => 6, CouponVersionTableMap::IS_USED => 7, CouponVersionTableMap::IS_ENABLED => 8, CouponVersionTableMap::EXPIRATION_DATE => 9, CouponVersionTableMap::SERIALIZED_RULES => 10, CouponVersionTableMap::IS_CUMULATIVE => 11, CouponVersionTableMap::IS_REMOVING_POSTAGE => 12, CouponVersionTableMap::MAX_USAGE => 13, CouponVersionTableMap::IS_AVAILABLE_ON_SPECIAL_OFFERS => 14, CouponVersionTableMap::CREATED_AT => 15, CouponVersionTableMap::UPDATED_AT => 16, CouponVersionTableMap::VERSION => 17, ), + self::TYPE_RAW_COLNAME => array('ID' => 0, 'CODE' => 1, 'TYPE' => 2, 'TITLE' => 3, 'SHORT_DESCRIPTION' => 4, 'DESCRIPTION' => 5, 'AMOUNT' => 6, 'IS_USED' => 7, 'IS_ENABLED' => 8, 'EXPIRATION_DATE' => 9, 'SERIALIZED_RULES' => 10, 'IS_CUMULATIVE' => 11, 'IS_REMOVING_POSTAGE' => 12, 'MAX_USAGE' => 13, 'IS_AVAILABLE_ON_SPECIAL_OFFERS' => 14, 'CREATED_AT' => 15, 'UPDATED_AT' => 16, 'VERSION' => 17, ), + self::TYPE_FIELDNAME => array('id' => 0, 'code' => 1, 'type' => 2, 'title' => 3, 'short_description' => 4, 'description' => 5, 'amount' => 6, 'is_used' => 7, 'is_enabled' => 8, 'expiration_date' => 9, 'serialized_rules' => 10, 'is_cumulative' => 11, 'is_removing_postage' => 12, 'max_usage' => 13, 'is_available_on_special_offers' => 14, 'created_at' => 15, 'updated_at' => 16, 'version' => 17, ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, ) ); /** @@ -215,10 +220,11 @@ class CouponVersionTableMap extends TableMap $this->addColumn('IS_USED', 'IsUsed', 'TINYINT', true, null, null); $this->addColumn('IS_ENABLED', 'IsEnabled', 'TINYINT', true, null, null); $this->addColumn('EXPIRATION_DATE', 'ExpirationDate', 'TIMESTAMP', true, null, null); - $this->addColumn('SERIALIZED_RULES_TYPE', 'SerializedRulesType', 'LONGVARCHAR', true, null, null); - $this->addColumn('SERIALIZED_RULES_CONTENT', 'SerializedRulesContent', 'LONGVARCHAR', true, null, null); + $this->addColumn('SERIALIZED_RULES', 'SerializedRules', 'LONGVARCHAR', true, null, null); $this->addColumn('IS_CUMULATIVE', 'IsCumulative', 'TINYINT', true, null, null); $this->addColumn('IS_REMOVING_POSTAGE', 'IsRemovingPostage', 'TINYINT', true, null, null); + $this->addColumn('MAX_USAGE', 'MaxUsage', 'INTEGER', true, null, null); + $this->addColumn('IS_AVAILABLE_ON_SPECIAL_OFFERS', 'IsAvailableOnSpecialOffers', 'BOOLEAN', true, 1, null); $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null); $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null); $this->addPrimaryKey('VERSION', 'Version', 'INTEGER', true, null, 0); @@ -299,11 +305,11 @@ class CouponVersionTableMap extends TableMap public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { // If the PK cannot be derived from the row, return NULL. - if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 16 + $offset : static::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)] === null) { + if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 17 + $offset : static::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)] === null) { return null; } - return serialize(array((string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 16 + $offset : static::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)])); + return serialize(array((string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 17 + $offset : static::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)])); } /** @@ -429,10 +435,11 @@ class CouponVersionTableMap extends TableMap $criteria->addSelectColumn(CouponVersionTableMap::IS_USED); $criteria->addSelectColumn(CouponVersionTableMap::IS_ENABLED); $criteria->addSelectColumn(CouponVersionTableMap::EXPIRATION_DATE); - $criteria->addSelectColumn(CouponVersionTableMap::SERIALIZED_RULES_TYPE); - $criteria->addSelectColumn(CouponVersionTableMap::SERIALIZED_RULES_CONTENT); + $criteria->addSelectColumn(CouponVersionTableMap::SERIALIZED_RULES); $criteria->addSelectColumn(CouponVersionTableMap::IS_CUMULATIVE); $criteria->addSelectColumn(CouponVersionTableMap::IS_REMOVING_POSTAGE); + $criteria->addSelectColumn(CouponVersionTableMap::MAX_USAGE); + $criteria->addSelectColumn(CouponVersionTableMap::IS_AVAILABLE_ON_SPECIAL_OFFERS); $criteria->addSelectColumn(CouponVersionTableMap::CREATED_AT); $criteria->addSelectColumn(CouponVersionTableMap::UPDATED_AT); $criteria->addSelectColumn(CouponVersionTableMap::VERSION); @@ -447,10 +454,11 @@ class CouponVersionTableMap extends TableMap $criteria->addSelectColumn($alias . '.IS_USED'); $criteria->addSelectColumn($alias . '.IS_ENABLED'); $criteria->addSelectColumn($alias . '.EXPIRATION_DATE'); - $criteria->addSelectColumn($alias . '.SERIALIZED_RULES_TYPE'); - $criteria->addSelectColumn($alias . '.SERIALIZED_RULES_CONTENT'); + $criteria->addSelectColumn($alias . '.SERIALIZED_RULES'); $criteria->addSelectColumn($alias . '.IS_CUMULATIVE'); $criteria->addSelectColumn($alias . '.IS_REMOVING_POSTAGE'); + $criteria->addSelectColumn($alias . '.MAX_USAGE'); + $criteria->addSelectColumn($alias . '.IS_AVAILABLE_ON_SPECIAL_OFFERS'); $criteria->addSelectColumn($alias . '.CREATED_AT'); $criteria->addSelectColumn($alias . '.UPDATED_AT'); $criteria->addSelectColumn($alias . '.VERSION'); diff --git a/core/lib/Thelia/Tests/Coupon/CouponBaseAdapterTest.php b/core/lib/Thelia/Tests/Coupon/CouponBaseAdapterTest.php index 932dba9fc..78fd5e74f 100644 --- a/core/lib/Thelia/Tests/Coupon/CouponBaseAdapterTest.php +++ b/core/lib/Thelia/Tests/Coupon/CouponBaseAdapterTest.php @@ -28,7 +28,7 @@ namespace Thelia\Coupon; * Date: 8/19/13 * Time: 3:24 PM * - * Thrown when a Rule receive an invalid Parameter + * Unit Test CouponBaseAdapter Class * * @package Coupon * @author Guillaume MOREL diff --git a/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php b/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php index 465754cd3..ed3331f87 100644 --- a/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php +++ b/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php @@ -23,12 +23,20 @@ namespace Thelia\Coupon; +use Thelia\Coupon\Parameter\PriceParam; +use Thelia\Coupon\Parameter\RuleValidator; +use Thelia\Coupon\Rule\AvailableForTotalAmount; +use Thelia\Coupon\Rule\CouponRuleInterface; +use Thelia\Coupon\Rule\Operators; +use Thelia\Exception\CouponExpiredException; +use Thelia\Model\Coupon; + /** * Created by JetBrains PhpStorm. * Date: 8/19/13 * Time: 3:24 PM * - * Thrown when a Rule receive an invalid Parameter + * Unit Test CouponFactory Class * * @package Coupon * @author Guillaume MOREL @@ -36,10 +44,89 @@ namespace Thelia\Coupon; */ class CouponFactoryTest extends \PHPUnit_Framework_TestCase { + + CONST VALID_SHORT_DESCRIPTION = 'Coupon for Christmas removing 10€ if your total checkout is more than 40€'; + CONST VALID_DESCRIPTION = '

Lorem ipsum dolor sit amet

Consectetur adipiscing elit. Cras at luctus tellus. Integer turpis mauris, aliquet vitae risus tristique, pellentesque vestibulum urna. Vestibulum sodales laoreet lectus dictum suscipit. Praesent vulputate, sem id varius condimentum, quam magna tempor elit, quis venenatis ligula nulla eget libero. Cras egestas euismod tellus, id pharetra leo suscipit quis. Donec lacinia ac lacus et ultricies. Nunc in porttitor neque. Proin at quam congue, consectetur orci sed, congue nulla. Nulla eleifend nunc ligula, nec pharetra elit tempus quis. Vivamus vel mauris sed est dictum blandit. Maecenas blandit dapibus velit ut sollicitudin. In in euismod mauris, consequat viverra magna. Cras velit velit, sollicitudin commodo tortor gravida, tempus varius nulla. + +Donec rhoncus leo mauris, id porttitor ante luctus tempus. + +Curabitur quis augue feugiat, ullamcorper mauris ac, interdum mi. Quisque aliquam lorem vitae felis lobortis, id interdum turpis mattis. Vestibulum diam massa, ornare congue blandit quis, facilisis at nisl. In tortor metus, venenatis non arcu nec, sollicitudin ornare nisl. Nunc erat risus, varius nec urna at, iaculis lacinia elit. Aenean ut felis tempus, tincidunt odio non, sagittis nisl. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec vitae hendrerit elit. Nunc sit amet gravida risus, euismod lobortis massa. Nam a erat mauris. Nam a malesuada lorem. Nulla id accumsan dolor, sed rhoncus tellus. Quisque dictum felis sed leo auctor, at volutpat lectus viverra. Morbi rutrum, est ac aliquam imperdiet, nibh sem sagittis justo, ac mattis magna lacus eu nulla. + +Duis interdum lectus nulla, nec pellentesque sapien condimentum at. Suspendisse potenti. Sed eu purus tellus. Nunc quis rhoncus metus. Fusce vitae tellus enim. Interdum et malesuada fames ac ante ipsum primis in faucibus. Etiam tempor porttitor erat vitae iaculis. Sed est elit, consequat non ornare vitae, vehicula eget lectus. Etiam consequat sapien mauris, eget consectetur magna imperdiet eget. Nunc sollicitudin luctus velit, in commodo nulla adipiscing fermentum. Fusce nisi sapien, posuere vitae metus sit amet, facilisis sollicitudin dui. Fusce ultricies auctor enim sit amet iaculis. Morbi at vestibulum enim, eget adipiscing eros. + +Praesent ligula lorem, faucibus ut metus quis, fermentum iaculis erat. Pellentesque elit erat, lacinia sed semper ac, sagittis vel elit. Nam eu convallis est. Curabitur rhoncus odio vitae consectetur pellentesque. Nam vitae arcu nec ante scelerisque dignissim vel nec neque. Suspendisse augue nulla, mollis eget dui et, tempor facilisis erat. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ac diam ipsum. Donec convallis dui ultricies velit auctor, non lobortis nulla ultrices. Morbi vitae dignissim ante, sit amet lobortis tortor. Nunc dapibus condimentum augue, in molestie neque congue non. + +Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesuada tortor vel erat volutpat tincidunt. In vehicula diam est, a convallis eros scelerisque ut. Donec aliquet venenatis iaculis. Ut a arcu gravida, placerat dui eu, iaculis nisl. Quisque adipiscing orci sit amet dui dignissim lacinia. Sed vulputate lorem non dolor adipiscing ornare. Morbi ornare id nisl id aliquam. Ut fringilla elit ante, nec lacinia enim fermentum sit amet. Aenean rutrum lorem eu convallis pharetra. Cras malesuada varius metus, vitae gravida velit. Nam a varius ipsum, ac commodo dolor. Phasellus nec elementum elit. Etiam vel adipiscing leo.'; + /** - * @var CouponFactory + * Generate valid CouponInterface + * + * @param $code + * @param $type + * @param $title + * @param $shortDescription + * @param $description + * @param $amount + * @param $isUsed + * @param $isEnabled + * @param $expirationDate + * @param $rules + * @param $isCumulative + * @param $isRemovingPostage + * + * @return CouponInterface */ - protected $object; + public function generateValidCoupon( + $code = 'XMAS1', + $type = '\Thelia\Coupon\Type\RemoveXAmount', + $title = 'Christmas coupon', + $shortDescription = self::VALID_SHORT_DESCRIPTION, + $description = self::VALID_DESCRIPTION, + $amount = 10.00, + $isUsed = 1, + $isEnabled = 1, + $expirationDate = null, + $rules = null, + $isCumulative = 1, + $isRemovingPostage = 0 + ) { + $coupon = new Coupon(); + $coupon->setCode($code); + $coupon->setType($type); + $coupon->setTitle($title); + $coupon->setShortDescription($shortDescription); + $coupon->setDescription($description); + $coupon->setAmount($amount); + $coupon->setIsUsed($isUsed); + $coupon->setIsEnabled($isEnabled); + + if ($expirationDate === null) { + $date = new \DateTime(); + $coupon->setExpirationDate( + $date->setTimestamp(strtotime("today + 2 months")) + ); + } + + if ($rules === null) { + $rules = $this->generateValidRules(); + } + + $couponFactory = new CouponFactory(new CouponBaseAdapter()); + $serializedData = $couponFactory->convertRulesInstancesIntoSerialized( + $rules + ); + + $coupon->setSerializedRulesType($serializedData['rulesType']); + $coupon->setSerializedRulesContent($serializedData['rulesContent']); + + $coupon->setIsCumulative($isCumulative); + $coupon->setIsRemovingPostage($isRemovingPostage); + + return $coupon; + } + /** * Sets up the fixture, for example, opens a network connection. @@ -47,7 +134,145 @@ class CouponFactoryTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->object = new CouponFactory; + } + + + + /** + * Fake CouponQuery->findByCode + * + * @param string $code + * @param string $type + * @param string $title + * @param string $shortDescription + * @param string $description + * @param float $amount + * @param int $isUsed + * @param int $isEnabled + * @param null $expirationDate + * @param null $rules + * @param int $isCumulative + * @param int $isRemovingPostage + * @return Coupon + */ + public function generateCouponModelMock( + $code, + $type, + $title, + $shortDescription, + $description, + $amount, + $isUsed, + $isEnabled, + $expirationDate, + $rules, + $isCumulative, + $isRemovingPostage + ) { + $coupon = $this->generateValidCoupon( + $code, + $type, + $title, + $shortDescription, + $description, + $amount, + $isUsed, + $isEnabled, + $expirationDate, + $rules, + $isCumulative, + $isRemovingPostage + ); + + /** @var CouponAdapterInterface $stubCouponBaseAdapter */ + $stubCouponBaseAdapter = $this->getMock( + 'Thelia\Coupon\CouponBaseAdapter', + array('findOneCouponByCode'), + array() + ); + $stubCouponBaseAdapter->expects($this->any()) + ->method('findOneCouponByCode') + ->will($this->returnValue($coupon)); + + return $stubCouponBaseAdapter; + } + + + + /** + * @covers Thelia\Coupon\CouponFactory::buildCouponFromCode + * @expectedException Thelia\Exception\CouponExpiredException + */ + public function testBuildCouponFromCodeExpiredDateBefore() + { + $date = new \DateTime(); + $date->setTimestamp(strtotime("today - 2 months")); + + /** @var CouponAdapterInterface $mockAdapter */ + $mockAdapter = $this->generateCouponModelMock(null, null, null, null, null, null, null, null, $date); + $couponFactory = new CouponFactory($mockAdapter); + $coupon = $couponFactory->buildCouponFromCode('XMAS1'); + } + + /** + * @covers Thelia\Coupon\CouponFactory::buildCouponFromCode + * @expectedException Thelia\Exception\CouponExpiredException + */ + public function testBuildCouponFromCodeExpiredDateEquals() + { + $date = new \DateTime(); + + /** @var CouponAdapterInterface $mockAdapter */ + $mockAdapter = $this->generateCouponModelMock(null, null, null, null, null, null, null, null, $date); + $couponFactory = new CouponFactory($mockAdapter); + $coupon = $couponFactory->buildCouponFromCode('XMAS1'); + } + + /** + * @covers Thelia\Coupon\CouponFactory::buildCouponFromCode + */ + public function testBuildCouponFromCode() + { + /** @var CouponAdapterInterface $mockAdapter */ + $mockAdapter = $this->generateCouponModelMock(); + $couponFactory = new CouponFactory($mockAdapter); + $coupon = $couponFactory->buildCouponFromCode('XMAS1'); + + $CouponManager = new CouponManager($mockAdapter) + } + + /** + * Generate valid CouponRuleInterfaces + * + * @return array Array of CouponRuleInterface + */ + protected function generateValidRules() + { + $rule1 = new AvailableForTotalAmount( + array( + AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( + Operators::SUPERIOR, + new PriceParam( + 40.00, + 'EUR' + ) + ) + ) + ); + $rule2 = new AvailableForTotalAmount( + array( + AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( + Operators::INFERIOR, + new PriceParam( + 400.00, + 'EUR' + ) + ) + ) + ); + $rules = array($rule1, $rule2); + + return $rules; } /** @@ -57,16 +282,4 @@ class CouponFactoryTest extends \PHPUnit_Framework_TestCase protected function tearDown() { } - - /** - * @covers Thelia\Coupon\CouponFactory::buildCouponFromId - * @todo Implement testBuildCouponFromId(). - */ - public function testBuildCouponFromId() - { - // 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/CouponManagerTest.php b/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php index c7d2233f4..9234642c9 100644 --- a/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php +++ b/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php @@ -23,12 +23,20 @@ namespace Thelia\Coupon; +use Thelia\Coupon\Parameter\PriceParam; +use Thelia\Coupon\Parameter\RuleValidator; +use Thelia\Coupon\Rule\AvailableForTotalAmount; +use Thelia\Coupon\Rule\Operators; +use Thelia\Coupon\Type\RemoveXAmount; +use Thelia\Model\Coupon; +use Thelia\Tools\PhpUnitUtils; + /** * Created by JetBrains PhpStorm. * Date: 8/19/13 * Time: 3:24 PM * - * Thrown when a Rule receive an invalid Parameter + * Unit Test CouponManager Class * * @package Coupon * @author Guillaume MOREL @@ -36,10 +44,21 @@ namespace Thelia\Coupon; */ class CouponManagerTest extends \PHPUnit_Framework_TestCase { - /** - * @var CouponManager - */ - protected $object; + + CONST VALID_SHORT_DESCRIPTION = 'Coupon for Christmas removing 10€ if your total checkout is more than 40€'; + CONST VALID_DESCRIPTION = '

Lorem ipsum dolor sit amet

Consectetur adipiscing elit. Cras at luctus tellus. Integer turpis mauris, aliquet vitae risus tristique, pellentesque vestibulum urna. Vestibulum sodales laoreet lectus dictum suscipit. Praesent vulputate, sem id varius condimentum, quam magna tempor elit, quis venenatis ligula nulla eget libero. Cras egestas euismod tellus, id pharetra leo suscipit quis. Donec lacinia ac lacus et ultricies. Nunc in porttitor neque. Proin at quam congue, consectetur orci sed, congue nulla. Nulla eleifend nunc ligula, nec pharetra elit tempus quis. Vivamus vel mauris sed est dictum blandit. Maecenas blandit dapibus velit ut sollicitudin. In in euismod mauris, consequat viverra magna. Cras velit velit, sollicitudin commodo tortor gravida, tempus varius nulla. + +Donec rhoncus leo mauris, id porttitor ante luctus tempus. + +Curabitur quis augue feugiat, ullamcorper mauris ac, interdum mi. Quisque aliquam lorem vitae felis lobortis, id interdum turpis mattis. Vestibulum diam massa, ornare congue blandit quis, facilisis at nisl. In tortor metus, venenatis non arcu nec, sollicitudin ornare nisl. Nunc erat risus, varius nec urna at, iaculis lacinia elit. Aenean ut felis tempus, tincidunt odio non, sagittis nisl. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec vitae hendrerit elit. Nunc sit amet gravida risus, euismod lobortis massa. Nam a erat mauris. Nam a malesuada lorem. Nulla id accumsan dolor, sed rhoncus tellus. Quisque dictum felis sed leo auctor, at volutpat lectus viverra. Morbi rutrum, est ac aliquam imperdiet, nibh sem sagittis justo, ac mattis magna lacus eu nulla. + +Duis interdum lectus nulla, nec pellentesque sapien condimentum at. Suspendisse potenti. Sed eu purus tellus. Nunc quis rhoncus metus. Fusce vitae tellus enim. Interdum et malesuada fames ac ante ipsum primis in faucibus. Etiam tempor porttitor erat vitae iaculis. Sed est elit, consequat non ornare vitae, vehicula eget lectus. Etiam consequat sapien mauris, eget consectetur magna imperdiet eget. Nunc sollicitudin luctus velit, in commodo nulla adipiscing fermentum. Fusce nisi sapien, posuere vitae metus sit amet, facilisis sollicitudin dui. Fusce ultricies auctor enim sit amet iaculis. Morbi at vestibulum enim, eget adipiscing eros. + +Praesent ligula lorem, faucibus ut metus quis, fermentum iaculis erat. Pellentesque elit erat, lacinia sed semper ac, sagittis vel elit. Nam eu convallis est. Curabitur rhoncus odio vitae consectetur pellentesque. Nam vitae arcu nec ante scelerisque dignissim vel nec neque. Suspendisse augue nulla, mollis eget dui et, tempor facilisis erat. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ac diam ipsum. Donec convallis dui ultricies velit auctor, non lobortis nulla ultrices. Morbi vitae dignissim ante, sit amet lobortis tortor. Nunc dapibus condimentum augue, in molestie neque congue non. + +Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesuada tortor vel erat volutpat tincidunt. In vehicula diam est, a convallis eros scelerisque ut. Donec aliquet venenatis iaculis. Ut a arcu gravida, placerat dui eu, iaculis nisl. Quisque adipiscing orci sit amet dui dignissim lacinia. Sed vulputate lorem non dolor adipiscing ornare. Morbi ornare id nisl id aliquam. Ut fringilla elit ante, nec lacinia enim fermentum sit amet. Aenean rutrum lorem eu convallis pharetra. Cras malesuada varius metus, vitae gravida velit. Nam a varius ipsum, ac commodo dolor. Phasellus nec elementum elit. Etiam vel adipiscing leo.'; /** * Sets up the fixture, for example, opens a network connection. @@ -47,7 +66,211 @@ class CouponManagerTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->object = new CouponManager; + } + + + /** + * Generate valid CouponInterface + * + * @param string $code + * @param string $title + * @param string $shortDescription + * @param string $description + * @param float $amount + * @param bool $isEnabled + * @param $expirationDate + * @param $rules + * @param bool $isCumulative + * @param bool $isRemovingPostage + * @param bool $isAvailableOnSpecialOffers + * @param int $maxUsage + * + * @return CouponInterface + */ + public function generateValidCoupon( + $code = 'XMAS1', + $title = 'Christmas coupon', + $shortDescription = self::VALID_SHORT_DESCRIPTION, + $description = self::VALID_DESCRIPTION, + $amount = 10.00, + $isEnabled = true, + $expirationDate = null, + $rules = null, + $isCumulative = true, + $isRemovingPostage = false, + $isAvailableOnSpecialOffers = true, + $maxUsage = 40 + ) { + if ($expirationDate === null) { + $expirationDate = new \DateTime(); + $expirationDate->setTimestamp(strtotime("today + 2 months")); + } + + $coupon = new RemoveXAmount($code, $title, $shortDescription, $description, $amount, $isCumulative, $isRemovingPostage, $isAvailableOnSpecialOffers, $isEnabled, $maxUsage, $expirationDate); + + if ($rules === null) { + $rules = $this->generateValidRules(); + } + + $coupon->setRules($rules); + + return $coupon; + } + +// /** +// * @covers Thelia\Coupon\CouponManager::getDiscount +// * @todo Implement testGetDiscount(). +// */ +// public function testGetDiscountOneCoupon() +// { +// $this->markTestIncomplete( +// 'This test has not been implemented yet.' +// ); +// /** @var CouponInterface $coupon */ +// $coupon = $this->generateValidCoupon(); +// +// +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->getMock( +// 'Thelia\Coupon\CouponBaseAdapter', +// array( +// 'getCurrentCoupons', +// 'getCheckoutTotalPriceWithoutDiscountAndPostagePrice' +// ), +// array() +// ); +// +// // Returns -10euros not removing postage Coupon +// // If 40 < total amount 400 +// $stubCouponBaseAdapter->expects($this->any()) +// ->method('getCurrentCoupons') +// ->will($this->returnValue(array($coupon))); +// +// // Return Checkout product amoun = 100euros +// $stubCouponBaseAdapter->expects($this->any()) +// ->method('getCheckoutTotalPriceWithoutDiscountAndPostagePrice') +// ->will($this->returnValue(100.00)); +// +// $couponManager = new CouponManager($stubCouponBaseAdapter); +// $discount = $couponManager->getDiscount(); +// +// $expected = 10.00; +// $actual = $discount; +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * @covers Thelia\Coupon\CouponManager::getDiscount +// * @todo Implement testGetDiscount(). +// */ +// public function testGetDiscountAlwaysInferiorToPrice() +// { +// // Remove the following lines when you implement this test. +// $this->markTestIncomplete( +// 'This test has not been implemented yet.' +// ); +// } +// +// /** +// * @covers Thelia\Coupon\CouponManager::getDiscount +// * @covers Thelia\Coupon\CouponManager::sortCoupons +// * @todo Implement testGetDiscount(). +// */ +// public function testGetDiscountCouponNotCumulativeCancelOthers() +// { +// // Remove the following lines when you implement this test. +// $this->markTestIncomplete( +// 'This test has not been implemented yet.' +// ); +// } +// +// /** +// * @covers Thelia\Coupon\CouponManager::getDiscount +// * @covers Thelia\Coupon\CouponManager::sortCoupons +// * @todo Implement testGetDiscount(). +// */ +// public function testGetDiscountCouponCumulativeCumulatesWithOthers() +// { +// // Remove the following lines when you implement this test. +// $this->markTestIncomplete( +// 'This test has not been implemented yet.' +// ); +// } +// +// /** +// * @covers Thelia\Coupon\CouponManager::isCouponRemovingPostage +// * @covers Thelia\Coupon\CouponManager::sortCoupons +// * @todo Implement testGetDiscount(). +// */ +// public function testIsCouponRemovingPostage() +// { +// // Remove the following lines when you implement this test. +// $this->markTestIncomplete( +// 'This test has not been implemented yet.' +// ); +// } + + /** + * @covers Thelia\Coupon\CouponManager::sortCoupons + */ + public function testCouponCumulationOneCouponNotCumulative() + { + // Given + /** @var CouponInterface $coupon */ + $couponCumulative1 = $this->generateValidCoupon(null, null, null, null, null, null, null, null, true); + $couponCumulative2 = $this->generateValidCoupon(null, null, null, null, null, null, null, null, true); + $couponNotCumulative1 = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false); + $couponNotCumulative2 = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false); + + $coupons = array($couponCumulative1); + + // When + $sortedCoupons = PhpUnitUtils::callMethod( + new CouponManager(new CouponBaseAdapter()), + 'sortCoupons', + $coupons + ); + + // Then + $expected = $coupons; + $actual = $sortedCoupons; + + $this->assertSame($expected, $actual, 'Array Sorted despite there is only once'); + } + + + /** + * Generate valid CouponRuleInterfaces + * + * @return array Array of CouponRuleInterface + */ + protected function generateValidRules() + { + $rule1 = new AvailableForTotalAmount( + array( + AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( + Operators::SUPERIOR, + new PriceParam( + 40.00, + 'EUR' + ) + ) + ) + ); + $rule2 = new AvailableForTotalAmount( + array( + AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( + Operators::INFERIOR, + new PriceParam( + 400.00, + 'EUR' + ) + ) + ) + ); + $rules = new CouponRuleCollection(array($rule1, $rule2)); + + return $rules; } /** @@ -58,66 +281,4 @@ class CouponManagerTest extends \PHPUnit_Framework_TestCase { } - /** - * @covers Thelia\Coupon\CouponManager::getDiscount - * @todo Implement testGetDiscount(). - */ - public function testGetDiscount() - { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); - } - - /** - * @covers Thelia\Coupon\CouponManager::getDiscount - * @todo Implement testGetDiscount(). - */ - public function testGetDiscountAlwaysInferiorToPrice() - { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); - } - - /** - * @covers Thelia\Coupon\CouponManager::getDiscount - * @covers Thelia\Coupon\CouponManager::sortCoupons - * @todo Implement testGetDiscount(). - */ - public function testGetDiscountCouponNotCumulativeCancelOthers() - { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); - } - - /** - * @covers Thelia\Coupon\CouponManager::getDiscount - * @covers Thelia\Coupon\CouponManager::sortCoupons - * @todo Implement testGetDiscount(). - */ - public function testGetDiscountCouponCumulativeCumulatesWithOthers() - { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); - } - - /** - * @covers Thelia\Coupon\CouponManager::isCouponRemovingPostage - * @covers Thelia\Coupon\CouponManager::sortCoupons - * @todo Implement testGetDiscount(). - */ - public function testIsCouponRemovingPostage() - { - // 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/CouponRuleCollectionTest.php b/core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php new file mode 100644 index 000000000..081aee2dd --- /dev/null +++ b/core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php @@ -0,0 +1,81 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Coupon; + +use Thelia\Coupon\Parameter\PriceParam; +use Thelia\Coupon\Parameter\RuleValidator; +use Thelia\Coupon\Rule\AvailableForTotalAmount; +use Thelia\Coupon\Rule\Operators; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Unit Test CouponRuleCollection Class + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class CouponRuleCollectionTest extends \PHPUnit_Framework_TestCase +{ + /** + * + */ + public function testRuleSerialisation() + { + $rule1 = new AvailableForTotalAmount( + array( + AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( + Operators::SUPERIOR, + new PriceParam( + 40.00, + 'EUR' + ) + ) + ) + ); + $rule2 = new AvailableForTotalAmount( + array( + AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( + Operators::INFERIOR, + new PriceParam( + 400.00, + 'EUR' + ) + ) + ) + ); + $rules = new CouponRuleCollection(array($rule1, $rule2)); + + $serializedRules = base64_encode(serialize($rules)); + $unserializedRules = unserialize(base64_decode($serializedRules)); + + $expected = $rules; + $actual = $unserializedRules; + + $this->assertEquals($expected, $actual); + } +} diff --git a/core/lib/Thelia/Tests/Coupon/Parameter/DateParamTest.php b/core/lib/Thelia/Tests/Coupon/Parameter/DateParamTest.php index 3062568c4..4c26bfa2f 100644 --- a/core/lib/Thelia/Tests/Coupon/Parameter/DateParamTest.php +++ b/core/lib/Thelia/Tests/Coupon/Parameter/DateParamTest.php @@ -31,7 +31,7 @@ use Thelia\Coupon\Parameter\DateParam; * Date: 8/19/13 * Time: 3:24 PM * - * Thrown when a Rule receive an invalid Parameter + * Unit Test DateParam Class * * @package Coupon * @author Guillaume MOREL diff --git a/core/lib/Thelia/Tests/Coupon/Parameter/IntegerParamTest.php b/core/lib/Thelia/Tests/Coupon/Parameter/IntegerParamTest.php index bcc24542e..05f19955d 100644 --- a/core/lib/Thelia/Tests/Coupon/Parameter/IntegerParamTest.php +++ b/core/lib/Thelia/Tests/Coupon/Parameter/IntegerParamTest.php @@ -31,7 +31,7 @@ use Thelia\Coupon\Parameter\IntegerParam; * Date: 8/19/13 * Time: 3:24 PM * - * Thrown when a Rule receive an invalid Parameter + * Unit Test IntegerParam Class * * @package Coupon * @author Guillaume MOREL diff --git a/core/lib/Thelia/Tests/Coupon/Parameter/IntervalParamTest.php b/core/lib/Thelia/Tests/Coupon/Parameter/IntervalParamTest.php index 59583bfe6..73571ba5b 100644 --- a/core/lib/Thelia/Tests/Coupon/Parameter/IntervalParamTest.php +++ b/core/lib/Thelia/Tests/Coupon/Parameter/IntervalParamTest.php @@ -31,7 +31,7 @@ use Thelia\Coupon\Parameter\IntervalParam; * Date: 8/19/13 * Time: 3:24 PM * - * Thrown when a Rule receive an invalid Parameter + * Unit Test IntervalParam Class * * @package Coupon * @author Guillaume MOREL diff --git a/core/lib/Thelia/Tests/Coupon/Parameter/PriceParamTest.php b/core/lib/Thelia/Tests/Coupon/Parameter/PriceParamTest.php index c85b5af1a..62d552e0b 100644 --- a/core/lib/Thelia/Tests/Coupon/Parameter/PriceParamTest.php +++ b/core/lib/Thelia/Tests/Coupon/Parameter/PriceParamTest.php @@ -31,7 +31,7 @@ use Thelia\Coupon\Parameter\PriceParam; * Date: 8/19/13 * Time: 3:24 PM * - * Thrown when a Rule receive an invalid Parameter + * Unit Test PriceParam Class * * @package Coupon * @author Guillaume MOREL diff --git a/core/lib/Thelia/Tests/Coupon/Parameter/QuantityParamTest.php b/core/lib/Thelia/Tests/Coupon/Parameter/QuantityParamTest.php index c7ee0d915..6a9d9d737 100644 --- a/core/lib/Thelia/Tests/Coupon/Parameter/QuantityParamTest.php +++ b/core/lib/Thelia/Tests/Coupon/Parameter/QuantityParamTest.php @@ -31,7 +31,7 @@ use Thelia\Coupon\Parameter\QuantityParam; * Date: 8/19/13 * Time: 3:24 PM * - * Thrown when a Rule receive an invalid Parameter + * Unit Test QuantityParam Class * * @package Coupon * @author Guillaume MOREL diff --git a/core/lib/Thelia/Tests/Coupon/Parameter/RepeatedDateParamTest.php b/core/lib/Thelia/Tests/Coupon/Parameter/RepeatedDateParamTest.php index 5e0bf033d..f9a6f0d18 100644 --- a/core/lib/Thelia/Tests/Coupon/Parameter/RepeatedDateParamTest.php +++ b/core/lib/Thelia/Tests/Coupon/Parameter/RepeatedDateParamTest.php @@ -32,7 +32,7 @@ use Thelia\Coupon\Parameter\RepeatedDateParam; * Date: 8/19/13 * Time: 3:24 PM * - * Thrown when a Rule receive an invalid Parameter + * Unit Test RepeatedDateParam Class * * @package Coupon * @author Guillaume MOREL diff --git a/core/lib/Thelia/Tests/Coupon/Parameter/RepeatedIntervalParamTest.php b/core/lib/Thelia/Tests/Coupon/Parameter/RepeatedIntervalParamTest.php index 6830d5670..fe5866b0f 100644 --- a/core/lib/Thelia/Tests/Coupon/Parameter/RepeatedIntervalParamTest.php +++ b/core/lib/Thelia/Tests/Coupon/Parameter/RepeatedIntervalParamTest.php @@ -31,7 +31,7 @@ use Thelia\Coupon\Parameter\RepeatedIntervalParam; * Date: 8/19/13 * Time: 3:24 PM * - * Thrown when a Rule receive an invalid Parameter + * Unit Test RepeatedIntervalParam Class * * @package Coupon * @author Guillaume MOREL diff --git a/core/lib/Thelia/Tests/Coupon/Rule/AvailableForTotalAmountTest.php b/core/lib/Thelia/Tests/Coupon/Rule/AvailableForTotalAmountTest.php index 73833cd23..15c07ba1a 100644 --- a/core/lib/Thelia/Tests/Coupon/Rule/AvailableForTotalAmountTest.php +++ b/core/lib/Thelia/Tests/Coupon/Rule/AvailableForTotalAmountTest.php @@ -35,7 +35,7 @@ use Thelia\Exception\InvalidRuleValueException; * Date: 8/19/13 * Time: 3:24 PM * - * Thrown when a Rule receive an invalid Parameter + * Unit Test AvailableForTotalAmount Class * * @package Coupon * @author Guillaume MOREL diff --git a/core/lib/Thelia/Tests/Coupon/Rule/AvailableForXArticlesTest.php b/core/lib/Thelia/Tests/Coupon/Rule/AvailableForXArticlesTest.php index 2110f76bb..8bffc05a9 100644 --- a/core/lib/Thelia/Tests/Coupon/Rule/AvailableForXArticlesTest.php +++ b/core/lib/Thelia/Tests/Coupon/Rule/AvailableForXArticlesTest.php @@ -30,7 +30,7 @@ use Thelia\Coupon\Rule\AvailableForXArticles; * Date: 8/19/13 * Time: 3:24 PM * - * Thrown when a Rule receive an invalid Parameter + * Unit Test AvailableForXArticles Class * * @package Coupon * @author Guillaume MOREL diff --git a/core/lib/Thelia/Tests/Coupon/Rule/OperatorTest.php b/core/lib/Thelia/Tests/Coupon/Rule/OperatorsTest.php similarity index 98% rename from core/lib/Thelia/Tests/Coupon/Rule/OperatorTest.php rename to core/lib/Thelia/Tests/Coupon/Rule/OperatorsTest.php index 2fbf6f339..bf4fbc75d 100644 --- a/core/lib/Thelia/Tests/Coupon/Rule/OperatorTest.php +++ b/core/lib/Thelia/Tests/Coupon/Rule/OperatorsTest.php @@ -31,13 +31,13 @@ use Thelia\Coupon\Rule\Operators; * Date: 8/19/13 * Time: 3:24 PM * - * Thrown when a Rule receive an invalid Parameter + * Unit Test Operators Class * * @package Coupon * @author Guillaume MOREL * */ -class OperatorTest extends \PHPUnit_Framework_TestCase +class OperatorsTest extends \PHPUnit_Framework_TestCase { /** diff --git a/core/lib/Thelia/Tests/Coupon/RuleOrganizerTest.php b/core/lib/Thelia/Tests/Coupon/RuleOrganizerTest.php index 5c8dfc983..3300cb19b 100644 --- a/core/lib/Thelia/Tests/Coupon/RuleOrganizerTest.php +++ b/core/lib/Thelia/Tests/Coupon/RuleOrganizerTest.php @@ -28,7 +28,7 @@ namespace Thelia\Coupon; * Date: 8/19/13 * Time: 3:24 PM * - * Thrown when a Rule receive an invalid Parameter + * Unit Test RuleOrganizer Class * * @package Coupon * @author Guillaume MOREL diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountForCategoryYTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountForCategoryYTest.php index 0178bae10..65bf2e344 100644 --- a/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountForCategoryYTest.php +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountForCategoryYTest.php @@ -28,7 +28,7 @@ namespace Thelia\Coupon; * Date: 8/19/13 * Time: 3:24 PM * - * Thrown when a Rule receive an invalid Parameter + * Unit Test RemoveXAmountForCategoryY Class * * @package Coupon * @author Guillaume MOREL diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php index f9e765b35..f7287bb45 100644 --- a/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php @@ -33,7 +33,7 @@ use Thelia\Coupon\Type\RemoveXAmount; * Date: 8/19/13 * Time: 3:24 PM * - * Thrown when a Rule receive an invalid Parameter + * Unit Test RemoveXAmount Class * * @package Coupon * @author Guillaume MOREL diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentForCategoryYTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentForCategoryYTest.php index 39533d62b..caa90f4ae 100644 --- a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentForCategoryYTest.php +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentForCategoryYTest.php @@ -28,7 +28,7 @@ namespace Thelia\Coupon; * Date: 8/19/13 * Time: 3:24 PM * - * Thrown when a Rule receive an invalid Parameter + * Unit Test RemoveXPercenForCategoryY Class * * @package Coupon * @author Guillaume MOREL diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php index a2dd87f62..7dfca8dd2 100644 --- a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php @@ -31,7 +31,7 @@ use Thelia\Coupon\Type\RemoveXPercent; * Date: 8/19/13 * Time: 3:24 PM * - * Thrown when a Rule receive an invalid Parameter + * Unit Test RemoveXPercent Class * * @package Coupon * @author Guillaume MOREL diff --git a/core/lib/Thelia/Tools/PhpUnitUtils.php b/core/lib/Thelia/Tools/PhpUnitUtils.php new file mode 100644 index 000000000..e8a2d41ab --- /dev/null +++ b/core/lib/Thelia/Tools/PhpUnitUtils.php @@ -0,0 +1,55 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Tools; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Helper for Unit Testing + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class PhpUnitUtils +{ + /** + * Allow to call a protected methods + * + * @param string $obj Class name + namespace + * @param string $name Method name + * @param array $args Method arguments + * + * @return protected method result + */ + public static function callMethod($obj, $name, array $args) + { + $class = new \ReflectionClass(get_class($obj)); + $method = $class->getMethod($name); + $method->setAccessible(true); + return $method->invokeArgs($obj, $args); + } +} \ No newline at end of file diff --git a/install/faker.php b/install/faker.php index 7f0159a8d..73731f456 100755 --- a/install/faker.php +++ b/install/faker.php @@ -350,19 +350,9 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua ) ) ); - $rules = array($rule1, $rule2); + $rules = new \Thelia\Coupon\CouponRuleCollection(array($rule1, $rule2)); - $encoders = array(new XmlEncoder(), new JsonEncoder()); - $normalizers = array(new GetSetMethodNormalizer()); - $serializer = new Serializer($normalizers, $encoders); - - $ruleTypes = array(); - /** @var Thelia\Coupon\Rule\CouponRuleInterface $rule */ - foreach ($rules as $rule) { - $ruleTypes[] = get_class($rule); - } - $coupon1->setSerializedRulesType($serializer->serialize($ruleTypes, 'json')); - $coupon1->setSerializedRulesContent($serializer->serialize($rules, 'json')); + $coupon1->setSerializedRules(base64_encode(serialize($rules))); $coupon1->setIsCumulative(1); $coupon1->setIsRemovingPostage(0); diff --git a/install/thelia.sql b/install/thelia.sql index 83f86248e..5c099d02c 100755 --- a/install/thelia.sql +++ b/install/thelia.sql @@ -1089,10 +1089,11 @@ CREATE TABLE `coupon` `is_used` TINYINT NOT NULL, `is_enabled` TINYINT NOT NULL, `expiration_date` DATETIME NOT NULL, - `serialized_rules_type` TEXT NOT NULL, - `serialized_rules_content` TEXT NOT NULL, + `serialized_rules` TEXT NOT NULL, `is_cumulative` TINYINT NOT NULL, `is_removing_postage` TINYINT NOT NULL, + `max_usage` INTEGER NOT NULL, + `is_available_on_special_offers` TINYINT(1) NOT NULL, `created_at` DATETIME, `updated_at` DATETIME, `version` INTEGER DEFAULT 0, @@ -1104,7 +1105,9 @@ CREATE TABLE `coupon` INDEX `idx_amount` (`amount`), INDEX `idx_expiration_date` (`expiration_date`), INDEX `idx_is_cumulative` (`is_cumulative`), - INDEX `idx_is_removing_postage` (`is_removing_postage`) + INDEX `idx_is_removing_postage` (`is_removing_postage`), + INDEX `idx_max_usage` (`max_usage`), + INDEX `idx_is_available_on_special_offers` (`is_available_on_special_offers`) ) ENGINE=InnoDB; -- --------------------------------------------------------------------- @@ -2183,10 +2186,11 @@ CREATE TABLE `coupon_version` `is_used` TINYINT NOT NULL, `is_enabled` TINYINT NOT NULL, `expiration_date` DATETIME NOT NULL, - `serialized_rules_type` TEXT NOT NULL, - `serialized_rules_content` TEXT NOT NULL, + `serialized_rules` TEXT NOT NULL, `is_cumulative` TINYINT NOT NULL, `is_removing_postage` TINYINT NOT NULL, + `max_usage` INTEGER NOT NULL, + `is_available_on_special_offers` TINYINT(1) NOT NULL, `created_at` DATETIME, `updated_at` DATETIME, `version` INTEGER DEFAULT 0 NOT NULL, diff --git a/local/config/schema.xml b/local/config/schema.xml index 71914d771..0a4a76e89 100755 --- a/local/config/schema.xml +++ b/local/config/schema.xml @@ -799,10 +799,11 @@ - - + + + @@ -827,6 +828,12 @@ + + + + + + @@ -1119,4 +1126,4 @@ - \ No newline at end of file + From e971179a60535ea6ac624e3f978c506888cf3183 Mon Sep 17 00:00:00 2001 From: gmorel Date: Tue, 27 Aug 2013 13:28:57 +0200 Subject: [PATCH 010/125] WIP Coupon Default Implementation + Unit test in order to validate the chain - effect - application field - condition --- .../Thelia/Coupon/CouponAdapterInterface.php | 21 +- core/lib/Thelia/Coupon/CouponBaseAdapter.php | 32 +- core/lib/Thelia/Coupon/CouponFactory.php | 12 +- core/lib/Thelia/Coupon/CouponManager.php | 38 +- .../Thelia/Coupon/CouponRuleCollection.php | 12 +- .../Thelia/Coupon/Rule/AvailableForDate.php | 2 - .../Rule/AvailableForRepeatedPeriod.php | 4 +- .../Coupon/Rule/AvailableForTotalAmount.php | 28 +- .../Thelia/Coupon/Rule/CouponRuleAbstract.php | 41 +- .../Coupon/Rule/CouponRuleInterface.php | 31 +- core/lib/Thelia/Coupon/Rule/Operators.php | 4 +- .../lib/Thelia/Coupon/Type/CouponAbstract.php | 57 +- .../Thelia/Coupon/Type/CouponInterface.php | 19 +- .../lib/Thelia/Coupon/Type/RemoveXPercent.php | 17 +- .../ComparableInterface.php | 2 +- .../{Parameter => Validator}/DateParam.php | 6 +- .../{Parameter => Validator}/IntegerParam.php | 6 +- .../IntervalParam.php | 4 +- .../{Parameter => Validator}/PriceParam.php | 6 +- .../QuantityParam.php | 2 +- .../RepeatedDateParam.php | 2 +- .../RepeatedIntervalParam.php | 2 +- .../RepeatedParam.php | 4 +- .../RuleParameterAbstract.php} | 11 +- .../RuleValidator.php | 2 +- .../Exception/NotImplementedException.php | 43 + .../Thelia/Tests/Coupon/CouponFactoryTest.php | 289 ++++--- .../Thelia/Tests/Coupon/CouponManagerTest.php | 806 ++++++++++++++---- .../Tests/Coupon/CouponRuleCollectionTest.php | 4 +- .../Tests/Coupon/Parameter/DateParamTest.php | 2 +- .../Coupon/Parameter/IntegerParamTest.php | 2 +- .../Coupon/Parameter/IntervalParamTest.php | 2 +- .../Tests/Coupon/Parameter/PriceParamTest.php | 2 +- .../Coupon/Parameter/QuantityParamTest.php | 2 +- .../Parameter/RepeatedDateParamTest.php | 2 +- .../Parameter/RepeatedIntervalParamTest.php | 10 +- .../Rule/AvailableForTotalAmountTest.php | 11 +- .../Coupon/Rule/AvailableForXArticlesTest.php | 26 +- .../Tests/Coupon/Rule/OperatorsTest.php | 38 +- .../Tests/Coupon/Type/RemoveXAmountTest.php | 185 ++-- .../Type/RemoveXPercentForCategoryYTest.php | 4 +- .../Tests/Coupon/Type/RemoveXPercentTest.php | 4 +- core/lib/Thelia/Tools/PhpUnitUtils.php | 4 +- 43 files changed, 1184 insertions(+), 617 deletions(-) rename core/lib/Thelia/Coupon/{Parameter => Validator}/ComparableInterface.php (98%) rename core/lib/Thelia/Coupon/{Parameter => Validator}/DateParam.php (95%) rename core/lib/Thelia/Coupon/{Parameter => Validator}/IntegerParam.php (95%) rename core/lib/Thelia/Coupon/{Parameter => Validator}/IntervalParam.php (97%) rename core/lib/Thelia/Coupon/{Parameter => Validator}/PriceParam.php (96%) rename core/lib/Thelia/Coupon/{Parameter => Validator}/QuantityParam.php (98%) rename core/lib/Thelia/Coupon/{Parameter => Validator}/RepeatedDateParam.php (99%) rename core/lib/Thelia/Coupon/{Parameter => Validator}/RepeatedIntervalParam.php (99%) rename core/lib/Thelia/Coupon/{Parameter => Validator}/RepeatedParam.php (98%) rename core/lib/Thelia/Coupon/{Parameter/RuleParameterInterface.php => Validator/RuleParameterAbstract.php} (89%) rename core/lib/Thelia/Coupon/{Parameter => Validator}/RuleValidator.php (98%) create mode 100644 core/lib/Thelia/Exception/NotImplementedException.php diff --git a/core/lib/Thelia/Coupon/CouponAdapterInterface.php b/core/lib/Thelia/Coupon/CouponAdapterInterface.php index 9db1160f1..21ff870f6 100644 --- a/core/lib/Thelia/Coupon/CouponAdapterInterface.php +++ b/core/lib/Thelia/Coupon/CouponAdapterInterface.php @@ -23,6 +23,8 @@ namespace Thelia\Coupon; +use Symfony\Component\DependencyInjection\Container; +use Symfony\Component\Translation\TranslatorInterface; use Thelia\Coupon\Type\CouponInterface; use Thelia\Model\Coupon; @@ -70,10 +72,11 @@ interface CouponAdapterInterface /** * Return Products total price + * CartTotalPrice = Checkout total - discount - postage * * @return float */ - public function getCheckoutTotalPriceWithoutDiscountAndPostagePrice(); + public function getCartTotalPrice(); /** * Return Checkout total postage (only) price @@ -87,7 +90,7 @@ interface CouponAdapterInterface * * @return int */ - public function getNbArticlesInTheCart(); + public function getNbArticlesInCart(); /** * Return all Coupon given during the Checkout @@ -114,4 +117,18 @@ interface CouponAdapterInterface */ public function saveCoupon(CouponInterface $coupon); + /** + * Return platform Container + * + * @return Container + */ + public function getContainer(); + + /** + * Return platform TranslatorInterface + * + * @return TranslatorInterface + */ + public function getTranslator(); + } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/CouponBaseAdapter.php b/core/lib/Thelia/Coupon/CouponBaseAdapter.php index 180ddc3cd..3809612a7 100644 --- a/core/lib/Thelia/Coupon/CouponBaseAdapter.php +++ b/core/lib/Thelia/Coupon/CouponBaseAdapter.php @@ -23,6 +23,8 @@ namespace Thelia\Coupon; +use Symfony\Component\DependencyInjection\Container; +use Symfony\Component\Translation\TranslatorInterface; use Thelia\Coupon\Type\CouponInterface; use Thelia\Model\Coupon; use Thelia\Model\CouponQuery; @@ -94,9 +96,9 @@ class CouponBaseAdapter implements CouponAdapterInterface * * @return float */ - public function getCheckoutTotalPriceWithoutDiscountAndPostagePrice() + public function getCartTotalPrice() { - // TODO: Implement getCheckoutTotalPriceWithoutDiscountAndPostagePrice() method. + // TODO: Implement getCartTotalPrice() method. } /** @@ -104,9 +106,9 @@ class CouponBaseAdapter implements CouponAdapterInterface * * @return int */ - public function getNbArticlesInTheCart() + public function getNbArticlesInCart() { - // TODO: Implement getNbArticlesInTheCart() method. + // TODO: Implement getNbArticlesInCart() method. } /** @@ -158,7 +160,7 @@ class CouponBaseAdapter implements CouponAdapterInterface // $couponModel->setTitle($coupon->getTitle()); // $couponModel->setShortDescription($coupon->getShortDescription()); // $couponModel->setDescription($coupon->getDescription()); -// $couponModel->setAmount($coupon->getEffect()); +// $couponModel->setAmount($coupon->getDiscount()); // $couponModel->setIsUsed(0); // $couponModel->setIsEnabled(1); // $couponModel->set @@ -170,5 +172,23 @@ class CouponBaseAdapter implements CouponAdapterInterface // $couponModel->set } + /** + * Return plateform Container + * + * @return Container + */ + public function getContainer() + { + // TODO: Implement getCheckoutPostagePrice() method. + } -} \ No newline at end of file + /** + * Return platform TranslatorInterface + * + * @return TranslatorInterface + */ + public function getTranslator() + { + return $this->getContainer()->get('thelia.translator'); + } +} diff --git a/core/lib/Thelia/Coupon/CouponFactory.php b/core/lib/Thelia/Coupon/CouponFactory.php index d82bb3430..a77871ffd 100644 --- a/core/lib/Thelia/Coupon/CouponFactory.php +++ b/core/lib/Thelia/Coupon/CouponFactory.php @@ -25,8 +25,8 @@ namespace Thelia\Coupon; use Symfony\Component\Translation\Exception\NotFoundResourceException; use Thelia\Coupon\Type\CouponInterface; -use Thelia\Coupon\Type\RemoveXAmount; use Thelia\Exception\CouponExpiredException; +use Thelia\Exception\InvalidRuleException; use Thelia\Model\Coupon; use Symfony\Component\Serializer\Encoder\JsonEncoder; @@ -79,7 +79,15 @@ class CouponFactory throw new CouponExpiredException($couponCode); } - return $this->buildCouponInterfacFromModel($couponModel); + /** @var CouponInterface $couponInterface */ + $couponInterface = $this->buildCouponInterfacFromModel($couponModel); + if ($couponInterface->getRules()->isEmpty()) { + throw new InvalidRuleException( + get_class($couponInterface) + ); + } + + return $couponInterface; } /** diff --git a/core/lib/Thelia/Coupon/CouponManager.php b/core/lib/Thelia/Coupon/CouponManager.php index c36ad7c40..b913de66d 100644 --- a/core/lib/Thelia/Coupon/CouponManager.php +++ b/core/lib/Thelia/Coupon/CouponManager.php @@ -70,16 +70,20 @@ class CouponManager if (count($this->coupons) > 0) { $couponsKept = $this->sortCoupons($this->coupons); + $isRemovingPostage = $this->isCouponRemovingPostage($couponsKept); + $discount = $this->getEffect($couponsKept); + if ($isRemovingPostage) { $postage = $this->adapter->getCheckoutPostagePrice(); - $discount -= $postage; + $discount += $postage; } // Just In Case test - if ($discount >= $this->adapter->getCheckoutTotalPrice()) { - $discount = 0.00; + $checkoutTotalPrice = $this->adapter->getCartTotalPrice(); + if ($discount >= $checkoutTotalPrice) { + $discount = $checkoutTotalPrice; } } @@ -144,6 +148,34 @@ class CouponManager } } + $coupons = $couponsKept; + $couponsKept = array(); + + /** @var CouponInterface $coupon */ + foreach ($coupons as $coupon) { + if ($coupon->isMatching($this->adapter)) { + $couponsKept[] = $coupon; + } + } + return $couponsKept; } + + /** + * Process given Coupon in order to get their cumulative effects + * + * @param array $coupons CouponInterface to process + * + * @return float discount + */ + protected function getEffect(array $coupons) + { + $discount = 0.00; + /** @var CouponInterface $coupon */ + foreach ($coupons as $coupon) { + $discount += $coupon->getDiscount($this->adapter); + } + + return $discount; + } } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/CouponRuleCollection.php b/core/lib/Thelia/Coupon/CouponRuleCollection.php index 3146cec56..06f0b15af 100644 --- a/core/lib/Thelia/Coupon/CouponRuleCollection.php +++ b/core/lib/Thelia/Coupon/CouponRuleCollection.php @@ -32,7 +32,7 @@ use Thelia\Exception\InvalidRuleException; * Date: 8/19/13 * Time: 3:24 PM * - * Manage a set of v + * Manage a set of CouponRuleInterface * * @package Coupon * @author Guillaume MOREL @@ -84,5 +84,15 @@ class CouponRuleCollection return $this; } + /** + * Check if there is at least one rule in the collection + * + * @return bool + */ + public function isEmpty() + { + return isEmpty($this->rules); + } + } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForDate.php b/core/lib/Thelia/Coupon/Rule/AvailableForDate.php index 1b5b27ef5..81cb54a91 100644 --- a/core/lib/Thelia/Coupon/Rule/AvailableForDate.php +++ b/core/lib/Thelia/Coupon/Rule/AvailableForDate.php @@ -23,8 +23,6 @@ namespace Thelia\Coupon\Rule; -use Thelia\Coupon\CouponAdapterInterface; - /** * Created by JetBrains PhpStorm. * Date: 8/19/13 diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForRepeatedPeriod.php b/core/lib/Thelia/Coupon/Rule/AvailableForRepeatedPeriod.php index 8cf30569b..4f67889c2 100644 --- a/core/lib/Thelia/Coupon/Rule/AvailableForRepeatedPeriod.php +++ b/core/lib/Thelia/Coupon/Rule/AvailableForRepeatedPeriod.php @@ -46,9 +46,9 @@ class AvailableForRepeatedPeriod extends AvailableForPeriod * @throws \Symfony\Component\Intl\Exception\NotImplementedException * @return $this */ - protected function setParametersToValidate(CouponAdapterInterface $adapter) + public function setParametersToValidate(CouponAdapterInterface $adapter) { - parent::setParametersToValidate($adapter); // TODO: Change the autogenerated stub + // @todo implement } /** diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmount.php b/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmount.php index b01f946a1..aa1e40339 100644 --- a/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmount.php +++ b/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmount.php @@ -25,8 +25,8 @@ namespace Thelia\Coupon\Rule; use Symfony\Component\Intl\Exception\NotImplementedException; use Thelia\Coupon\CouponAdapterInterface; -use Thelia\Coupon\Parameter\PriceParam; -use Thelia\Coupon\Parameter\RuleValidator; +use Thelia\Coupon\Validator\PriceParam; +use Thelia\Coupon\Validator\RuleValidator; use Thelia\Exception\InvalidRuleException; use Thelia\Exception\InvalidRuleOperatorException; use Thelia\Exception\InvalidRuleValueException; @@ -63,13 +63,12 @@ class AvailableForTotalAmount extends CouponRuleAbstract * * @param array $validators Array of RuleValidator * validating $paramsToValidate against - * @param array $validated Parameters to be paramsToValidate * * @throws \Thelia\Exception\InvalidRuleException */ - public function __construct(array $validators, array $validated = null) + public function __construct(array $validators) { - parent::__construct($validators, $validated); + parent::__construct($validators); if (isset($validators[self::PARAM1_PRICE]) && $validators[self::PARAM1_PRICE] instanceof RuleValidator @@ -138,7 +137,7 @@ class AvailableForTotalAmount extends CouponRuleAbstract /** * Check if a price is valid * - * @param int $price Price to check + * @param float $price Price to check * * @throws InvalidRuleValueException if Value is not allowed * @return bool @@ -155,21 +154,6 @@ class AvailableForTotalAmount extends CouponRuleAbstract return true; } - /** - * Generate current Rule validator from adapter - * - * @param CouponAdapterInterface $adapter allowing to gather - * all necessary Thelia variables - * - * @throws \Symfony\Component\Intl\Exception\NotImplementedException - * @return $this - */ - protected function setValidatorsFromAdapter(CouponAdapterInterface $adapter) - { -// $adapter->getRule($this); - // @todo implement - } - /** * Generate current Rule param to be validated from adapter * @@ -181,7 +165,7 @@ class AvailableForTotalAmount extends CouponRuleAbstract protected function setParametersToValidate(CouponAdapterInterface $adapter) { $this->paramsToValidate = array( - self::PARAM1_PRICE => $adapter->getCheckoutTotalPrice() + self::PARAM1_PRICE => $adapter->getCartTotalPrice() ); return $this; diff --git a/core/lib/Thelia/Coupon/Rule/CouponRuleAbstract.php b/core/lib/Thelia/Coupon/Rule/CouponRuleAbstract.php index 4bdd0d57d..7d0b741bb 100644 --- a/core/lib/Thelia/Coupon/Rule/CouponRuleAbstract.php +++ b/core/lib/Thelia/Coupon/Rule/CouponRuleAbstract.php @@ -25,8 +25,8 @@ namespace Thelia\Coupon\Rule; use Symfony\Component\Intl\Exception\NotImplementedException; use Thelia\Coupon\CouponAdapterInterface; -use Thelia\Coupon\Parameter\ComparableInterface; -use Thelia\Coupon\Parameter\RuleValidator; +use Thelia\Coupon\Validator\ComparableInterface; +use Thelia\Coupon\Validator\RuleValidator; use Thelia\Exception\InvalidRuleException; use Thelia\Exception\InvalidRuleOperatorException; @@ -72,14 +72,12 @@ abstract class CouponRuleAbstract implements CouponRuleInterface * * @param array $validators Array of RuleValidator * validating $paramsToValidate against - * @param array $validated Parameters to be paramsToValidate * * @throws InvalidRuleException */ - public function __construct(array $validators, array $validated = null) + public function __construct(array $validators) { $this->setValidators($validators); - $this->paramsToValidate = $validated; } /** @@ -106,10 +104,14 @@ abstract class CouponRuleAbstract implements CouponRuleInterface /** * Check if the current Checkout matches this condition * + * @param CouponAdapterInterface $adapter allowing to gather + * all necessary Thelia variables + * * @return bool */ - public function isMatching() + public function isMatching(CouponAdapterInterface $adapter) { + $this->setParametersToValidate($adapter); $this->checkBackOfficeInput(); $this->checkCheckoutInput(); @@ -118,10 +120,10 @@ abstract class CouponRuleAbstract implements CouponRuleInterface foreach ($this->validators as $param => $validator) { $a = $this->paramsToValidate[$param]; $operator = $validator->getOperator(); - /** @var ComparableInterface, RuleParameterInterface $b */ + /** @var ComparableInterface, RuleParameterAbstract $b */ $b = $validator->getParam(); - if (!Operators::isValidAccordingToOperator($a, $operator, $b)) { + if (!Operators::isValid($a, $operator, $b)) { $isMatching = false; } } @@ -160,35 +162,18 @@ abstract class CouponRuleAbstract implements CouponRuleInterface return true; } - /** - * Generate current Rule validator from adapter - * - * @param CouponAdapterInterface $adapter allowing to gather - * all necessary Thelia variables - * - * @throws \Symfony\Component\Intl\Exception\NotImplementedException - * @return $this - */ - protected function setValidatorsFromAdapter(CouponAdapterInterface $adapter) - { - throw new NotImplementedException( - 'CouponRuleInterface::setValidators needs to be implemented' - ); - } - /** * Generate current Rule param to be validated from adapter * * @param CouponAdapterInterface $adapter allowing to gather * all necessary Thelia variables * - * @throws \Symfony\Component\Intl\Exception\NotImplementedException + * @throws \Thelia\Exception\NotImplementedException * @return $this */ protected function setParametersToValidate(CouponAdapterInterface $adapter) { - throw new NotImplementedException( - 'CouponRuleInterface::setValidators needs to be implemented' - ); + throw new \Thelia\Exception\NotImplementedException(); } + } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/CouponRuleInterface.php b/core/lib/Thelia/Coupon/Rule/CouponRuleInterface.php index 22ad31841..6aaca802c 100644 --- a/core/lib/Thelia/Coupon/Rule/CouponRuleInterface.php +++ b/core/lib/Thelia/Coupon/Rule/CouponRuleInterface.php @@ -23,6 +23,8 @@ namespace Thelia\Coupon\Rule; +use Thelia\Coupon\CouponAdapterInterface; + /** * Created by JetBrains PhpStorm. * Date: 8/19/13 @@ -53,9 +55,12 @@ interface CouponRuleInterface /** * Check if the current Checkout matches this condition * + * @param CouponAdapterInterface $adapter allowing to gather + * all necessary Thelia variables + * * @return bool */ - public function isMatching(); + public function isMatching(CouponAdapterInterface $adapter); /** * Return all available Operators for this Rule @@ -64,26 +69,4 @@ interface CouponRuleInterface */ public function getAvailableOperators(); -// /** -// * Generate current Rule validator from adapter -// * Ex : -// * $validator = array( -// * -// * @param CouponAdapterInterface $adapter allowing to gather -// * all necessary Thelia variables -// * -// * @return array Validators : array of ComparableInterface -// */ -// public function getValidators(CouponAdapterInterface $adapter); -// -// /** -// * Retrieve all param to validate from adapter -// * -// * @param CouponAdapterInterface $adapter allowing to gather -// * all necessary Thelia variables -// * -// * @return array Validators : array of ComparableInterface -// */ -// public function getParamToValidate(CouponAdapterInterface $adapter); - -} \ No newline at end of file +} diff --git a/core/lib/Thelia/Coupon/Rule/Operators.php b/core/lib/Thelia/Coupon/Rule/Operators.php index c11198caf..fb188c3cd 100644 --- a/core/lib/Thelia/Coupon/Rule/Operators.php +++ b/core/lib/Thelia/Coupon/Rule/Operators.php @@ -23,7 +23,7 @@ namespace Thelia\Coupon\Rule; -use Thelia\Coupon\Parameter\ComparableInterface; +use Thelia\Coupon\Validator\ComparableInterface; /** * Created by JetBrains PhpStorm. @@ -60,7 +60,7 @@ abstract class Operators * * @return bool */ - public static function isValidAccordingToOperator($a, $operator, ComparableInterface $b) + public static function isValid($a, $operator, ComparableInterface $b) { $ret = false; diff --git a/core/lib/Thelia/Coupon/Type/CouponAbstract.php b/core/lib/Thelia/Coupon/Type/CouponAbstract.php index 8e2f716ea..750c62e5c 100644 --- a/core/lib/Thelia/Coupon/Type/CouponAbstract.php +++ b/core/lib/Thelia/Coupon/Type/CouponAbstract.php @@ -43,9 +43,6 @@ use Thelia\Exception\InvalidRuleException; */ abstract class CouponAbstract implements CouponInterface { - /** @var CouponAdapterInterface Provide necessary value from Thelia*/ - protected $adapter; - /** @var RuleOrganizerInterface */ protected $organizer = null; @@ -85,20 +82,6 @@ abstract class CouponAbstract implements CouponInterface /** @var bool if Coupon is available for Products already on special offers */ protected $isAvailableOnSpecialOffers = false; - /** - * Set Adapter containing all relevant data - * - * @param CouponAdapterInterface $adapter Adapter - * - * @return $this - */ - public function setAdapter($adapter) - { - $this->adapter = $adapter; - - return $this; - } - /** * Set Rule Organizer * @@ -178,12 +161,15 @@ abstract class CouponAbstract implements CouponInterface /** * Return effects generated by the coupon * A negative value - * @ + * + * @param CouponAdapterInterface $adapter allowing to gather + * all necessary Thelia variables + * * @return float Amount removed from the Total Checkout */ - public function getEffect() + public function getDiscount(CouponAdapterInterface $adapter) { - return -$this->amount; + return $this->amount; } /** @@ -196,21 +182,6 @@ abstract class CouponAbstract implements CouponInterface return clone $this->rules; } - /** - * Add a Rule to the Coupon - * - * @param CouponRuleInterface $rule Condition needed to match - * in order to get the Coupon effect - * - * @return $this - */ - public function addRule(CouponRuleInterface $rule) - { - $this->rules->add($rule); - - return $this; - } - /** * Replace the existing Rules by those given in parameter * If one Rule is badly implemented, no Rule will be added @@ -230,17 +201,19 @@ abstract class CouponAbstract implements CouponInterface /** * Check if the current Coupon is matching its conditions (Rules) * Thelia variables are given by the CouponAdapterInterface - * In $this->adapter + * + * @param CouponAdapterInterface $adapter allowing to gather + * all necessary Thelia variables * * @return bool */ - public function isMatching() + public function isMatching(CouponAdapterInterface $adapter) { $isMatching = true; /** @var CouponRuleInterface $rule */ foreach ($this->rules->getRules() as $rule) { - if (!$rule->isMatching()) { + if (!$rule->isMatching($adapter)) { $isMatching = false; } } @@ -300,13 +273,11 @@ abstract class CouponAbstract implements CouponInterface { $ret = true; - if ($this->expirationDate < new \DateTime()) { + $now = new \DateTime(); + if ($this->expirationDate > $now) { $ret = false; } return $ret; } - - - -} \ No newline at end of file +} diff --git a/core/lib/Thelia/Coupon/Type/CouponInterface.php b/core/lib/Thelia/Coupon/Type/CouponInterface.php index 1d470bb69..df1a82f40 100644 --- a/core/lib/Thelia/Coupon/Type/CouponInterface.php +++ b/core/lib/Thelia/Coupon/Type/CouponInterface.php @@ -23,6 +23,7 @@ namespace Thelia\Coupon\Type; +use Thelia\Coupon\CouponAdapterInterface; use Thelia\Coupon\CouponRuleCollection; /** @@ -71,7 +72,7 @@ interface CouponInterface * If is cumulative you can sum Coupon effects * If not cancel all other Coupon and take the last given * - * @return string + * @return bool */ public function isCumulative(); @@ -84,33 +85,37 @@ interface CouponInterface /** * Return effects generated by the coupon - * A negative value + * A positive value * * Effects could also affect something else than the final Checkout price * CouponAdapter could be use to directly pass a Session value * some would wish to modify * Hence affecting a wide variety of Thelia elements - * Ex : $this->adapter->getTheliaInternalValue + * + * @param CouponAdapterInterface $adapter allowing to gather + * all necessary Thelia variables * * @return float Amount removed from the Total Checkout */ - public function getEffect(); + public function getDiscount(CouponAdapterInterface $adapter); /** * Return condition to validate the Coupon or not * - * @return array An array of CouponRuleInterface + * @return CouponRuleCollection A set of CouponRuleInterface */ public function getRules(); /** * Check if the current Coupon is matching its conditions (Rules) * Thelia variables are given by the CouponAdapterInterface - * In $this->adapter + * + * @param CouponAdapterInterface $adapter allowing to gather + * all necessary Thelia variables * * @return bool */ - public function isMatching(); + public function isMatching(CouponAdapterInterface $adapter); /** * Replace the existing Rules by those given in parameter diff --git a/core/lib/Thelia/Coupon/Type/RemoveXPercent.php b/core/lib/Thelia/Coupon/Type/RemoveXPercent.php index 5fd25ae8f..da63a4281 100644 --- a/core/lib/Thelia/Coupon/Type/RemoveXPercent.php +++ b/core/lib/Thelia/Coupon/Type/RemoveXPercent.php @@ -23,6 +23,7 @@ namespace Thelia\Coupon\Type; +use Thelia\Coupon\CouponAdapterInterface; use Thelia\Coupon\Type\CouponAbstract; use Thelia\Exception\MissingAdapterException; @@ -67,26 +68,24 @@ class RemoveXPercent extends CouponAbstract * Return effects generated by the coupon * A negative value * + * @param CouponAdapterInterface $adapter allowing to gather + * all necessary Thelia variables + * * @throws \Thelia\Exception\MissingAdapterException * @throws \InvalidArgumentException * @return float */ - public function getEffect() + public function getDiscount(CouponAdapterInterface $adapter) { - if ($this->adapter === null) { - throw new MissingAdapterException( - 'Cant calculate effect : CouponAdapterInterface is missing.' - ); - } - if ($this->percent >= 100) { throw new \InvalidArgumentException( 'Percentage must be inferior to 100' ); } - $basePrice = $this->adapter - ->getCheckoutTotalPriceWithoutDiscountAndPostagePrice(); + $basePrice =$adapter + ->getCartTotalPrice(); + return $basePrice * (( 100 - $this->percent ) / 100); } diff --git a/core/lib/Thelia/Coupon/Parameter/ComparableInterface.php b/core/lib/Thelia/Coupon/Validator/ComparableInterface.php similarity index 98% rename from core/lib/Thelia/Coupon/Parameter/ComparableInterface.php rename to core/lib/Thelia/Coupon/Validator/ComparableInterface.php index 26bb3ca30..3b70c5e37 100644 --- a/core/lib/Thelia/Coupon/Parameter/ComparableInterface.php +++ b/core/lib/Thelia/Coupon/Validator/ComparableInterface.php @@ -21,7 +21,7 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Parameter; +namespace Thelia\Coupon\Validator; /** * Comparable interface diff --git a/core/lib/Thelia/Coupon/Parameter/DateParam.php b/core/lib/Thelia/Coupon/Validator/DateParam.php similarity index 95% rename from core/lib/Thelia/Coupon/Parameter/DateParam.php rename to core/lib/Thelia/Coupon/Validator/DateParam.php index 989477210..062c750e5 100644 --- a/core/lib/Thelia/Coupon/Parameter/DateParam.php +++ b/core/lib/Thelia/Coupon/Validator/DateParam.php @@ -21,9 +21,7 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Parameter; - -use Thelia\Coupon\Parameter\ComparableInterface; +namespace Thelia\Coupon\Validator; /** * Created by JetBrains PhpStorm. @@ -36,7 +34,7 @@ use Thelia\Coupon\Parameter\ComparableInterface; * @author Guillaume MOREL * */ -class DateParam implements ComparableInterface, RuleParameterInterface +class DateParam extends RuleParameterAbstract { /** @var \DateTime Date */ protected $dateTime = null; diff --git a/core/lib/Thelia/Coupon/Parameter/IntegerParam.php b/core/lib/Thelia/Coupon/Validator/IntegerParam.php similarity index 95% rename from core/lib/Thelia/Coupon/Parameter/IntegerParam.php rename to core/lib/Thelia/Coupon/Validator/IntegerParam.php index 14d63417b..7c8303809 100644 --- a/core/lib/Thelia/Coupon/Parameter/IntegerParam.php +++ b/core/lib/Thelia/Coupon/Validator/IntegerParam.php @@ -21,9 +21,7 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Parameter; - -use Thelia\Coupon\Parameter\ComparableInterface; +namespace Thelia\Coupon\Validator; /** * Created by JetBrains PhpStorm. @@ -36,7 +34,7 @@ use Thelia\Coupon\Parameter\ComparableInterface; * @author Guillaume MOREL * */ -class IntegerParam implements ComparableInterface, RuleParameterInterface +class IntegerParam extends RuleParameterAbstract { /** @var int Integer to compare with */ protected $integer = 0; diff --git a/core/lib/Thelia/Coupon/Parameter/IntervalParam.php b/core/lib/Thelia/Coupon/Validator/IntervalParam.php similarity index 97% rename from core/lib/Thelia/Coupon/Parameter/IntervalParam.php rename to core/lib/Thelia/Coupon/Validator/IntervalParam.php index 3e29d24be..1b310c9d1 100644 --- a/core/lib/Thelia/Coupon/Parameter/IntervalParam.php +++ b/core/lib/Thelia/Coupon/Validator/IntervalParam.php @@ -21,7 +21,7 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Parameter; +namespace Thelia\Coupon\Validator; /** * Created by JetBrains PhpStorm. @@ -34,7 +34,7 @@ namespace Thelia\Coupon\Parameter; * @author Guillaume MOREL * */ -class IntervalParam implements ComparableInterface, RuleParameterInterface +class IntervalParam extends RuleParameterAbstract { /** @var \DatePeriod Date period */ protected $datePeriod = null; diff --git a/core/lib/Thelia/Coupon/Parameter/PriceParam.php b/core/lib/Thelia/Coupon/Validator/PriceParam.php similarity index 96% rename from core/lib/Thelia/Coupon/Parameter/PriceParam.php rename to core/lib/Thelia/Coupon/Validator/PriceParam.php index 2f3834777..44eae3234 100644 --- a/core/lib/Thelia/Coupon/Parameter/PriceParam.php +++ b/core/lib/Thelia/Coupon/Validator/PriceParam.php @@ -21,9 +21,7 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Parameter; - -use Thelia\Coupon\Parameter\ComparableInterface; +namespace Thelia\Coupon\Validator; /** * Created by JetBrains PhpStorm. @@ -37,7 +35,7 @@ use Thelia\Coupon\Parameter\ComparableInterface; * @author Guillaume MOREL * */ -class PriceParam implements ComparableInterface, RuleParameterInterface +class PriceParam extends RuleParameterAbstract { /** @var float Positive Float to compare with */ protected $price = null; diff --git a/core/lib/Thelia/Coupon/Parameter/QuantityParam.php b/core/lib/Thelia/Coupon/Validator/QuantityParam.php similarity index 98% rename from core/lib/Thelia/Coupon/Parameter/QuantityParam.php rename to core/lib/Thelia/Coupon/Validator/QuantityParam.php index 526aa4152..dc842605f 100644 --- a/core/lib/Thelia/Coupon/Parameter/QuantityParam.php +++ b/core/lib/Thelia/Coupon/Validator/QuantityParam.php @@ -21,7 +21,7 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Parameter; +namespace Thelia\Coupon\Validator; /** * Created by JetBrains PhpStorm. diff --git a/core/lib/Thelia/Coupon/Parameter/RepeatedDateParam.php b/core/lib/Thelia/Coupon/Validator/RepeatedDateParam.php similarity index 99% rename from core/lib/Thelia/Coupon/Parameter/RepeatedDateParam.php rename to core/lib/Thelia/Coupon/Validator/RepeatedDateParam.php index 2e99391e6..f0524edc7 100644 --- a/core/lib/Thelia/Coupon/Parameter/RepeatedDateParam.php +++ b/core/lib/Thelia/Coupon/Validator/RepeatedDateParam.php @@ -21,7 +21,7 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Parameter; +namespace Thelia\Coupon\Validator; /** * Created by JetBrains PhpStorm. diff --git a/core/lib/Thelia/Coupon/Parameter/RepeatedIntervalParam.php b/core/lib/Thelia/Coupon/Validator/RepeatedIntervalParam.php similarity index 99% rename from core/lib/Thelia/Coupon/Parameter/RepeatedIntervalParam.php rename to core/lib/Thelia/Coupon/Validator/RepeatedIntervalParam.php index 3c4de7348..9f61f4db1 100644 --- a/core/lib/Thelia/Coupon/Parameter/RepeatedIntervalParam.php +++ b/core/lib/Thelia/Coupon/Validator/RepeatedIntervalParam.php @@ -21,7 +21,7 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Parameter; +namespace Thelia\Coupon\Validator; /** * Created by JetBrains PhpStorm. diff --git a/core/lib/Thelia/Coupon/Parameter/RepeatedParam.php b/core/lib/Thelia/Coupon/Validator/RepeatedParam.php similarity index 98% rename from core/lib/Thelia/Coupon/Parameter/RepeatedParam.php rename to core/lib/Thelia/Coupon/Validator/RepeatedParam.php index dba3de0af..675228456 100644 --- a/core/lib/Thelia/Coupon/Parameter/RepeatedParam.php +++ b/core/lib/Thelia/Coupon/Validator/RepeatedParam.php @@ -21,7 +21,7 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Parameter; +namespace Thelia\Coupon\Validator; use DateInterval; use DatePeriod; @@ -38,7 +38,7 @@ use DateTime; * @author Guillaume MOREL * */ -abstract class RepeatedParam implements ComparableInterface, RuleParameterInterface +abstract class RepeatedParam extends RuleParameterAbstract { /** @var DateTime The start date of the period. */ protected $from = null; diff --git a/core/lib/Thelia/Coupon/Parameter/RuleParameterInterface.php b/core/lib/Thelia/Coupon/Validator/RuleParameterAbstract.php similarity index 89% rename from core/lib/Thelia/Coupon/Parameter/RuleParameterInterface.php rename to core/lib/Thelia/Coupon/Validator/RuleParameterAbstract.php index 4583bd799..3e96682cd 100644 --- a/core/lib/Thelia/Coupon/Parameter/RuleParameterInterface.php +++ b/core/lib/Thelia/Coupon/Validator/RuleParameterAbstract.php @@ -21,7 +21,9 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Parameter; +namespace Thelia\Coupon\Validator; + +use Thelia\Exception\NotImplementedException; /** * Created by JetBrains PhpStorm. @@ -34,12 +36,15 @@ namespace Thelia\Coupon\Parameter; * @author Guillaume MOREL * */ -interface RuleParameterInterface +abstract class RuleParameterAbstract implements ComparableInterface { /** * Get Parameter value to test against * * @return mixed */ - public function getValue(); + public function getValue() + { + return new NotImplementedException(); + } } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Parameter/RuleValidator.php b/core/lib/Thelia/Coupon/Validator/RuleValidator.php similarity index 98% rename from core/lib/Thelia/Coupon/Parameter/RuleValidator.php rename to core/lib/Thelia/Coupon/Validator/RuleValidator.php index f6ffc3b13..064677751 100644 --- a/core/lib/Thelia/Coupon/Parameter/RuleValidator.php +++ b/core/lib/Thelia/Coupon/Validator/RuleValidator.php @@ -21,7 +21,7 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Parameter; +namespace Thelia\Coupon\Validator; /** * Created by JetBrains PhpStorm. diff --git a/core/lib/Thelia/Exception/NotImplementedException.php b/core/lib/Thelia/Exception/NotImplementedException.php new file mode 100644 index 000000000..991f4d325 --- /dev/null +++ b/core/lib/Thelia/Exception/NotImplementedException.php @@ -0,0 +1,43 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Exception; + +use Symfony\Component\DependencyInjection\Exception\BadMethodCallException; +use Thelia\Log\Tlog; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Thrown when an Abstract method has not been implemented + * + * @package Exception + * @author Guillaume MOREL + * + */ +class NotImplementedException extends BadMethodCallException +{ + +} diff --git a/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php b/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php index ed3331f87..c33b2327a 100644 --- a/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php +++ b/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php @@ -23,14 +23,16 @@ namespace Thelia\Coupon; -use Thelia\Coupon\Parameter\PriceParam; -use Thelia\Coupon\Parameter\RuleValidator; +use Thelia\Coupon\Validator\PriceParam; +use Thelia\Coupon\Validator\RuleValidator; use Thelia\Coupon\Rule\AvailableForTotalAmount; -use Thelia\Coupon\Rule\CouponRuleInterface; use Thelia\Coupon\Rule\Operators; +use Thelia\Coupon\Type\CouponInterface; use Thelia\Exception\CouponExpiredException; use Thelia\Model\Coupon; +require_once 'CouponManagerTest.php'; + /** * Created by JetBrains PhpStorm. * Date: 8/19/13 @@ -45,89 +47,6 @@ use Thelia\Model\Coupon; class CouponFactoryTest extends \PHPUnit_Framework_TestCase { - CONST VALID_SHORT_DESCRIPTION = 'Coupon for Christmas removing 10€ if your total checkout is more than 40€'; - CONST VALID_DESCRIPTION = '

Lorem ipsum dolor sit amet

Consectetur adipiscing elit. Cras at luctus tellus. Integer turpis mauris, aliquet vitae risus tristique, pellentesque vestibulum urna. Vestibulum sodales laoreet lectus dictum suscipit. Praesent vulputate, sem id varius condimentum, quam magna tempor elit, quis venenatis ligula nulla eget libero. Cras egestas euismod tellus, id pharetra leo suscipit quis. Donec lacinia ac lacus et ultricies. Nunc in porttitor neque. Proin at quam congue, consectetur orci sed, congue nulla. Nulla eleifend nunc ligula, nec pharetra elit tempus quis. Vivamus vel mauris sed est dictum blandit. Maecenas blandit dapibus velit ut sollicitudin. In in euismod mauris, consequat viverra magna. Cras velit velit, sollicitudin commodo tortor gravida, tempus varius nulla. - -Donec rhoncus leo mauris, id porttitor ante luctus tempus. - -Curabitur quis augue feugiat, ullamcorper mauris ac, interdum mi. Quisque aliquam lorem vitae felis lobortis, id interdum turpis mattis. Vestibulum diam massa, ornare congue blandit quis, facilisis at nisl. In tortor metus, venenatis non arcu nec, sollicitudin ornare nisl. Nunc erat risus, varius nec urna at, iaculis lacinia elit. Aenean ut felis tempus, tincidunt odio non, sagittis nisl. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec vitae hendrerit elit. Nunc sit amet gravida risus, euismod lobortis massa. Nam a erat mauris. Nam a malesuada lorem. Nulla id accumsan dolor, sed rhoncus tellus. Quisque dictum felis sed leo auctor, at volutpat lectus viverra. Morbi rutrum, est ac aliquam imperdiet, nibh sem sagittis justo, ac mattis magna lacus eu nulla. - -Duis interdum lectus nulla, nec pellentesque sapien condimentum at. Suspendisse potenti. Sed eu purus tellus. Nunc quis rhoncus metus. Fusce vitae tellus enim. Interdum et malesuada fames ac ante ipsum primis in faucibus. Etiam tempor porttitor erat vitae iaculis. Sed est elit, consequat non ornare vitae, vehicula eget lectus. Etiam consequat sapien mauris, eget consectetur magna imperdiet eget. Nunc sollicitudin luctus velit, in commodo nulla adipiscing fermentum. Fusce nisi sapien, posuere vitae metus sit amet, facilisis sollicitudin dui. Fusce ultricies auctor enim sit amet iaculis. Morbi at vestibulum enim, eget adipiscing eros. - -Praesent ligula lorem, faucibus ut metus quis, fermentum iaculis erat. Pellentesque elit erat, lacinia sed semper ac, sagittis vel elit. Nam eu convallis est. Curabitur rhoncus odio vitae consectetur pellentesque. Nam vitae arcu nec ante scelerisque dignissim vel nec neque. Suspendisse augue nulla, mollis eget dui et, tempor facilisis erat. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ac diam ipsum. Donec convallis dui ultricies velit auctor, non lobortis nulla ultrices. Morbi vitae dignissim ante, sit amet lobortis tortor. Nunc dapibus condimentum augue, in molestie neque congue non. - -Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesuada tortor vel erat volutpat tincidunt. In vehicula diam est, a convallis eros scelerisque ut. Donec aliquet venenatis iaculis. Ut a arcu gravida, placerat dui eu, iaculis nisl. Quisque adipiscing orci sit amet dui dignissim lacinia. Sed vulputate lorem non dolor adipiscing ornare. Morbi ornare id nisl id aliquam. Ut fringilla elit ante, nec lacinia enim fermentum sit amet. Aenean rutrum lorem eu convallis pharetra. Cras malesuada varius metus, vitae gravida velit. Nam a varius ipsum, ac commodo dolor. Phasellus nec elementum elit. Etiam vel adipiscing leo.'; - - /** - * Generate valid CouponInterface - * - * @param $code - * @param $type - * @param $title - * @param $shortDescription - * @param $description - * @param $amount - * @param $isUsed - * @param $isEnabled - * @param $expirationDate - * @param $rules - * @param $isCumulative - * @param $isRemovingPostage - * - * @return CouponInterface - */ - public function generateValidCoupon( - $code = 'XMAS1', - $type = '\Thelia\Coupon\Type\RemoveXAmount', - $title = 'Christmas coupon', - $shortDescription = self::VALID_SHORT_DESCRIPTION, - $description = self::VALID_DESCRIPTION, - $amount = 10.00, - $isUsed = 1, - $isEnabled = 1, - $expirationDate = null, - $rules = null, - $isCumulative = 1, - $isRemovingPostage = 0 - ) { - $coupon = new Coupon(); - $coupon->setCode($code); - $coupon->setType($type); - $coupon->setTitle($title); - $coupon->setShortDescription($shortDescription); - $coupon->setDescription($description); - $coupon->setAmount($amount); - $coupon->setIsUsed($isUsed); - $coupon->setIsEnabled($isEnabled); - - if ($expirationDate === null) { - $date = new \DateTime(); - $coupon->setExpirationDate( - $date->setTimestamp(strtotime("today + 2 months")) - ); - } - - if ($rules === null) { - $rules = $this->generateValidRules(); - } - - $couponFactory = new CouponFactory(new CouponBaseAdapter()); - $serializedData = $couponFactory->convertRulesInstancesIntoSerialized( - $rules - ); - - $coupon->setSerializedRulesType($serializedData['rulesType']); - $coupon->setSerializedRulesContent($serializedData['rulesContent']); - - $coupon->setIsCumulative($isCumulative); - $coupon->setIsRemovingPostage($isRemovingPostage); - - return $coupon; - } - - /** * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. @@ -136,38 +55,37 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua { } - - /** * Fake CouponQuery->findByCode * - * @param string $code - * @param string $type - * @param string $title - * @param string $shortDescription - * @param string $description - * @param float $amount - * @param int $isUsed - * @param int $isEnabled - * @param null $expirationDate - * @param null $rules - * @param int $isCumulative - * @param int $isRemovingPostage + * @param string $code Coupon code + * @param string $type Coupon type (object) + * @param string $title Coupon title + * @param string $shortDescription Coupon short description + * @param string $description Coupon description + * @param float $amount Coupon amount + * @param bool $isUsed If Coupon has been used yet + * @param bool $isEnabled If Coupon is enabled + * @param \DateTime $expirationDate When Coupon expires + * @param CouponRuleCollection $rules Coupon rules + * @param bool $isCumulative If Coupon is cumulative + * @param bool $isRemovingPostage If Coupon is removing postage + * * @return Coupon */ public function generateCouponModelMock( - $code, - $type, - $title, - $shortDescription, - $description, - $amount, - $isUsed, - $isEnabled, - $expirationDate, - $rules, - $isCumulative, - $isRemovingPostage + $code = null, + $type = null, + $title = null, + $shortDescription = null, + $description = null, + $amount = null, + $isUsed = null, + $isEnabled = null, + $expirationDate = null, + $rules = null, + $isCumulative = null, + $isRemovingPostage = null ) { $coupon = $this->generateValidCoupon( $code, @@ -200,8 +118,10 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua /** + * Test if an expired Coupon is build or not (superior) + * * @covers Thelia\Coupon\CouponFactory::buildCouponFromCode - * @expectedException Thelia\Exception\CouponExpiredException + * @expectedException \Thelia\Exception\CouponExpiredException */ public function testBuildCouponFromCodeExpiredDateBefore() { @@ -215,8 +135,10 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua } /** + * Test if an expired Coupon is build or not (equal) + * * @covers Thelia\Coupon\CouponFactory::buildCouponFromCode - * @expectedException Thelia\Exception\CouponExpiredException + * @expectedException \Thelia\Exception\CouponExpiredException */ public function testBuildCouponFromCodeExpiredDateEquals() { @@ -229,6 +151,22 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua } /** + * Test if an expired Coupon is build or not (equal) + * + * @covers Thelia\Coupon\CouponFactory::buildCouponFromCode + * @expectedException \Thelia\Exception\InvalidRuleException + */ + public function testBuildCouponFromCodeWithoutRule() + { + /** @var CouponAdapterInterface $mockAdapter */ + $mockAdapter = $this->generateCouponModelMock(null, null, null, null, null, null, null, null, null, new CouponRuleCollection(array())); + $couponFactory = new CouponFactory($mockAdapter); + $coupon = $couponFactory->buildCouponFromCode('XMAS1'); + } + + /** + * Test if a CouponInterface can be built from database + * * @covers Thelia\Coupon\CouponFactory::buildCouponFromCode */ public function testBuildCouponFromCode() @@ -236,15 +174,32 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua /** @var CouponAdapterInterface $mockAdapter */ $mockAdapter = $this->generateCouponModelMock(); $couponFactory = new CouponFactory($mockAdapter); + /** @var CouponInterface $coupon */ $coupon = $couponFactory->buildCouponFromCode('XMAS1'); - $CouponManager = new CouponManager($mockAdapter) + $this->assertEquals('XMAS1', $coupon->getCode()); + $this->assertEquals('Thelia\Coupon\Type\RemoveXAmount', get_class($coupon)); + $this->assertEquals(CouponManagerTest::VALID_TITLE, $coupon->getTitle()); + $this->assertEquals(CouponManagerTest::VALID_SHORT_DESCRIPTION, $coupon->getShortDescription()); + $this->assertEquals(CouponManagerTest::VALID_DESCRIPTION, $coupon->getDescription()); + $this->assertEquals(10.00, $coupon->getDiscount()); + $this->assertEquals(1, $coupon->isEnabled()); + + $date = new \DateTime(); + $date->setTimestamp(strtotime("today + 2 months")); + $this->assertEquals($date, $coupon->getExpirationDate()); + + $rules = $this->generateValidRules(); + $this->assertEquals($rules, $coupon->getRules()); + + $this->assertEquals(1, $coupon->isCumulative()); + $this->assertEquals(0, $coupon->isRemovingPostage()); } /** * Generate valid CouponRuleInterfaces * - * @return array Array of CouponRuleInterface + * @return CouponRuleCollection Set of CouponRuleInterface */ protected function generateValidRules() { @@ -270,11 +225,111 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua ) ) ); - $rules = array($rule1, $rule2); + $rules = new CouponRuleCollection(array($rule1, $rule2)); return $rules; } + /** + * Generate valid CouponInterface + * + * @param string $code Coupon code + * @param string $type Coupon type (object) + * @param string $title Coupon title + * @param string $shortDescription Coupon short description + * @param string $description Coupon description + * @param float $amount Coupon amount + * @param bool $isUsed If Coupon has been used yet + * @param bool $isEnabled If Coupon is enabled + * @param \DateTime $expirationDate When Coupon expires + * @param CouponRuleCollection $rules Coupon rules + * @param bool $isCumulative If Coupon is cumulative + * @param bool $isRemovingPostage If Coupon is removing postage + * + * @return Coupon + */ + public function generateValidCoupon( + $code = null, + $type = null, + $title = null, + $shortDescription = null, + $description = null, + $amount = null, + $isUsed = null, + $isEnabled = null, + $expirationDate = null, + $rules = null, + $isCumulative = null, + $isRemovingPostage = null + ) { + $coupon = new Coupon(); + + if ($code === null) { + $code = 'XMAS1'; + } + $coupon->setCode($code); + + if ($type === null) { + $type = 'Thelia\Coupon\Type\RemoveXAmount'; + } + $coupon->setType($type); + + if ($title === null) { + $title = CouponManagerTest::VALID_TITLE; + } + $coupon->setTitle($title); + + if ($shortDescription === null) { + $shortDescription = CouponManagerTest::VALID_SHORT_DESCRIPTION; + } + $coupon->setShortDescription($shortDescription); + + if ($description === null) { + $description = CouponManagerTest::VALID_DESCRIPTION; + } + $coupon->setDescription($description); + + if ($amount === null) { + $amount = 10.00; + } + $coupon->setAmount($amount); + + if ($isUsed === null) { + $isUsed = 1; + } + $coupon->setIsUsed($isUsed); + + if ($isEnabled === null) { + $isEnabled = 1; + } + $coupon->setIsEnabled($isEnabled); + + if ($isCumulative === null) { + $isCumulative = 1; + } + if ($isRemovingPostage === null) { + $isRemovingPostage = 0; + } + + if ($expirationDate === null) { + $date = new \DateTime(); + $coupon->setExpirationDate( + $date->setTimestamp(strtotime("today + 2 months")) + ); + } + + if ($rules === null) { + $rules = $this->generateValidRules(); + } + + $coupon->setSerializedRules(base64_encode(serialize($rules))); + + $coupon->setIsCumulative($isCumulative); + $coupon->setIsRemovingPostage($isRemovingPostage); + + return $coupon; + } + /** * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. diff --git a/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php b/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php index 9234642c9..b5b9cefbe 100644 --- a/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php +++ b/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php @@ -23,12 +23,12 @@ namespace Thelia\Coupon; -use Thelia\Coupon\Parameter\PriceParam; -use Thelia\Coupon\Parameter\RuleValidator; +use Thelia\Coupon\Validator\PriceParam; +use Thelia\Coupon\Validator\RuleValidator; use Thelia\Coupon\Rule\AvailableForTotalAmount; use Thelia\Coupon\Rule\Operators; +use Thelia\Coupon\Type\CouponInterface; use Thelia\Coupon\Type\RemoveXAmount; -use Thelia\Model\Coupon; use Thelia\Tools\PhpUnitUtils; /** @@ -44,7 +44,8 @@ use Thelia\Tools\PhpUnitUtils; */ class CouponManagerTest extends \PHPUnit_Framework_TestCase { - + CONST VALID_CODE = 'XMAS'; + CONST VALID_TITLE = 'XMAS coupon'; CONST VALID_SHORT_DESCRIPTION = 'Coupon for Christmas removing 10€ if your total checkout is more than 40€'; CONST VALID_DESCRIPTION = '

Lorem ipsum dolor sit amet

Consectetur adipiscing elit. Cras at luctus tellus. Integer turpis mauris, aliquet vitae risus tristique, pellentesque vestibulum urna. Vestibulum sodales laoreet lectus dictum suscipit. Praesent vulputate, sem id varius condimentum, quam magna tempor elit, quis venenatis ligula nulla eget libero. Cras egestas euismod tellus, id pharetra leo suscipit quis. Donec lacinia ac lacus et ultricies. Nunc in porttitor neque. Proin at quam congue, consectetur orci sed, congue nulla. Nulla eleifend nunc ligula, nec pharetra elit tempus quis. Vivamus vel mauris sed est dictum blandit. Maecenas blandit dapibus velit ut sollicitudin. In in euismod mauris, consequat viverra magna. Cras velit velit, sollicitudin commodo tortor gravida, tempus varius nulla. @@ -68,167 +69,171 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua { } - /** - * Generate valid CouponInterface + * Test getDiscount() behaviour + * Entering : 1 valid Coupon (If 40 < total amount 400) - 10euros * - * @param string $code - * @param string $title - * @param string $shortDescription - * @param string $description - * @param float $amount - * @param bool $isEnabled - * @param $expirationDate - * @param $rules - * @param bool $isCumulative - * @param bool $isRemovingPostage - * @param bool $isAvailableOnSpecialOffers - * @param int $maxUsage - * - * @return CouponInterface + * @covers Thelia\Coupon\CouponManager::getDiscount */ - public function generateValidCoupon( - $code = 'XMAS1', - $title = 'Christmas coupon', - $shortDescription = self::VALID_SHORT_DESCRIPTION, - $description = self::VALID_DESCRIPTION, - $amount = 10.00, - $isEnabled = true, - $expirationDate = null, - $rules = null, - $isCumulative = true, - $isRemovingPostage = false, - $isAvailableOnSpecialOffers = true, - $maxUsage = 40 - ) { - if ($expirationDate === null) { - $expirationDate = new \DateTime(); - $expirationDate->setTimestamp(strtotime("today + 2 months")); - } + public function testGetDiscountOneCoupon() + { + $cartTotalPrice = 100.00; + $checkoutTotalPrice = 120.00; - $coupon = new RemoveXAmount($code, $title, $shortDescription, $description, $amount, $isCumulative, $isRemovingPostage, $isAvailableOnSpecialOffers, $isEnabled, $maxUsage, $expirationDate); + /** @var CouponInterface $coupon */ + $coupon = self::generateValidCoupon(); - if ($rules === null) { - $rules = $this->generateValidRules(); - } + /** @var CouponAdapterInterface $stubCouponBaseAdapter */ + $stubCouponBaseAdapter = $this->generateFakeAdapter(array($coupon), $cartTotalPrice, $checkoutTotalPrice); - $coupon->setRules($rules); + $couponManager = new CouponManager($stubCouponBaseAdapter); + $discount = $couponManager->getDiscount(); - return $coupon; + $expected = 10.00; + $actual = $discount; + $this->assertEquals($expected, $actual); } -// /** -// * @covers Thelia\Coupon\CouponManager::getDiscount -// * @todo Implement testGetDiscount(). -// */ -// public function testGetDiscountOneCoupon() -// { -// $this->markTestIncomplete( -// 'This test has not been implemented yet.' -// ); -// /** @var CouponInterface $coupon */ -// $coupon = $this->generateValidCoupon(); -// -// -// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ -// $stubCouponBaseAdapter = $this->getMock( -// 'Thelia\Coupon\CouponBaseAdapter', -// array( -// 'getCurrentCoupons', -// 'getCheckoutTotalPriceWithoutDiscountAndPostagePrice' -// ), -// array() -// ); -// -// // Returns -10euros not removing postage Coupon -// // If 40 < total amount 400 -// $stubCouponBaseAdapter->expects($this->any()) -// ->method('getCurrentCoupons') -// ->will($this->returnValue(array($coupon))); -// -// // Return Checkout product amoun = 100euros -// $stubCouponBaseAdapter->expects($this->any()) -// ->method('getCheckoutTotalPriceWithoutDiscountAndPostagePrice') -// ->will($this->returnValue(100.00)); -// -// $couponManager = new CouponManager($stubCouponBaseAdapter); -// $discount = $couponManager->getDiscount(); -// -// $expected = 10.00; -// $actual = $discount; -// $this->assertEquals($expected, $actual); -// } -// -// /** -// * @covers Thelia\Coupon\CouponManager::getDiscount -// * @todo Implement testGetDiscount(). -// */ -// public function testGetDiscountAlwaysInferiorToPrice() -// { -// // Remove the following lines when you implement this test. -// $this->markTestIncomplete( -// 'This test has not been implemented yet.' -// ); -// } -// -// /** -// * @covers Thelia\Coupon\CouponManager::getDiscount -// * @covers Thelia\Coupon\CouponManager::sortCoupons -// * @todo Implement testGetDiscount(). -// */ -// public function testGetDiscountCouponNotCumulativeCancelOthers() -// { -// // Remove the following lines when you implement this test. -// $this->markTestIncomplete( -// 'This test has not been implemented yet.' -// ); -// } -// -// /** -// * @covers Thelia\Coupon\CouponManager::getDiscount -// * @covers Thelia\Coupon\CouponManager::sortCoupons -// * @todo Implement testGetDiscount(). -// */ -// public function testGetDiscountCouponCumulativeCumulatesWithOthers() -// { -// // Remove the following lines when you implement this test. -// $this->markTestIncomplete( -// 'This test has not been implemented yet.' -// ); -// } -// -// /** -// * @covers Thelia\Coupon\CouponManager::isCouponRemovingPostage -// * @covers Thelia\Coupon\CouponManager::sortCoupons -// * @todo Implement testGetDiscount(). -// */ -// public function testIsCouponRemovingPostage() -// { -// // Remove the following lines when you implement this test. -// $this->markTestIncomplete( -// 'This test has not been implemented yet.' -// ); -// } + /** + * Test getDiscount() behaviour + * Entering : 1 valid Coupon (If 40 < total amount 400) - 10euros + * 1 valid Coupon (If total amount > 20) - 15euros + * + * @covers Thelia\Coupon\CouponManager::getDiscount + */ + public function testGetDiscountTwoCoupon() + { + $cartTotalPrice = 100.00; + $checkoutTotalPrice = 120.00; + + /** @var CouponInterface $coupon1 */ + $coupon1 = self::generateValidCoupon(); + $rule1 = new AvailableForTotalAmount( + array( + AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( + Operators::SUPERIOR, + new PriceParam( + 40.00, + 'EUR' + ) + ) + ) + ); + $rules = new CouponRuleCollection(array($rule1)); + /** @var CouponInterface $coupon2 */ + $coupon2 = $this->generateValidCoupon('XMAS2', null, null, null, 15.00, null, null, $rules); + + /** @var CouponAdapterInterface $stubCouponBaseAdapter */ + $stubCouponBaseAdapter = $this->generateFakeAdapter(array($coupon1, $coupon2), $cartTotalPrice, $checkoutTotalPrice); + + $couponManager = new CouponManager($stubCouponBaseAdapter); + $discount = $couponManager->getDiscount(); + + $expected = 25.00; + $actual = $discount; + $this->assertEquals($expected, $actual); + } /** + * Test getDiscount() behaviour + * For a Cart of 21euros + * Entering : 1 valid Coupon (If total amount > 20) - 30euros + * + * @covers Thelia\Coupon\CouponManager::getDiscount + */ + public function testGetDiscountAlwaysInferiorToPrice() + { + $cartTotalPrice = 21.00; + $checkoutTotalPrice = 26.00; + + $rule1 = new AvailableForTotalAmount( + array( + AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( + Operators::SUPERIOR, + new PriceParam( + 20.00, + 'EUR' + ) + ) + ) + ); + $rules = new CouponRuleCollection(array($rule1)); + /** @var CouponInterface $coupon */ + $coupon = $this->generateValidCoupon('XMAS2', null, null, null, 30.00, null, null, $rules); + + /** @var CouponAdapterInterface $stubCouponBaseAdapter */ + $stubCouponBaseAdapter = $this->generateFakeAdapter(array($coupon), $cartTotalPrice, $checkoutTotalPrice); + + $couponManager = new CouponManager($stubCouponBaseAdapter); + $discount = $couponManager->getDiscount(); + + $expected = 21.00; + $actual = $discount; + $this->assertEquals($expected, $actual); + } + + + /** + * Check if removing postage on discout is working + * @covers Thelia\Coupon\CouponManager::isCouponRemovingPostage + * @covers Thelia\Coupon\CouponManager::sortCoupons + */ + public function testIsCouponRemovingPostage() + { + $cartTotalPrice = 21.00; + $checkoutTotalPrice = 27.00; + + $rule1 = new AvailableForTotalAmount( + array( + AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( + Operators::SUPERIOR, + new PriceParam( + 20.00, + 'EUR' + ) + ) + ) + ); + $rules = new CouponRuleCollection(array($rule1)); + /** @var CouponInterface $coupon */ + $coupon = $this->generateValidCoupon('XMAS2', null, null, null, 30.00, null, null, $rules, null, true); + + /** @var CouponAdapterInterface $stubCouponBaseAdapter */ + $stubCouponBaseAdapter = $this->generateFakeAdapter(array($coupon), $cartTotalPrice, $checkoutTotalPrice); + + $couponManager = new CouponManager($stubCouponBaseAdapter); + $discount = $couponManager->getDiscount(); + + $expected = 21.00; + $actual = $discount; + $this->assertEquals($expected, $actual); + } + + /** + * Testing how multiple Coupon behaviour + * Entering 1 Coupon not cumulative + * * @covers Thelia\Coupon\CouponManager::sortCoupons */ public function testCouponCumulationOneCouponNotCumulative() { + $cartTotalPrice = 100.00; + $checkoutTotalPrice = 120.00; + // Given /** @var CouponInterface $coupon */ - $couponCumulative1 = $this->generateValidCoupon(null, null, null, null, null, null, null, null, true); - $couponCumulative2 = $this->generateValidCoupon(null, null, null, null, null, null, null, null, true); - $couponNotCumulative1 = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false); - $couponNotCumulative2 = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false); + $couponCumulative1 = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false); $coupons = array($couponCumulative1); + /** @var CouponAdapterInterface $stubCouponBaseAdapter */ + $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); + // When $sortedCoupons = PhpUnitUtils::callMethod( - new CouponManager(new CouponBaseAdapter()), + new CouponManager($stubCouponBaseAdapter), 'sortCoupons', - $coupons + array($coupons) ); // Then @@ -238,13 +243,402 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua $this->assertSame($expected, $actual, 'Array Sorted despite there is only once'); } + /** + * Testing how multiple Coupon behaviour + * Entering 1 Coupon cumulative + * + * @covers Thelia\Coupon\CouponManager::sortCoupons + */ + public function testCouponCumulationOneCouponCumulative() + { + $cartTotalPrice = 100.00; + $checkoutTotalPrice = 120.00; + + // Given + /** @var CouponInterface $coupon */ + $couponCumulative1 = $this->generateValidCoupon(null, null, null, null, null, null, null, null, true); + + $coupons = array($couponCumulative1); + /** @var CouponAdapterInterface $stubCouponBaseAdapter */ + $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); + + // When + $sortedCoupons = PhpUnitUtils::callMethod( + new CouponManager($stubCouponBaseAdapter), + 'sortCoupons', + array($coupons) + ); + + // Then + $expected = $coupons; + $actual = $sortedCoupons; + + $this->assertSame($expected, $actual, 'Array Sorted despite there is only once'); + } + + /** + * Testing how multiple Coupon behaviour + * Entering 1 Coupon cumulative + * 1 Coupon cumulative + * + * @covers Thelia\Coupon\CouponManager::sortCoupons + */ + public function testCouponCumulationTwoCouponCumulative() + { + $cartTotalPrice = 100.00; + $checkoutTotalPrice = 120.00; + + // Given + /** @var CouponInterface $coupon */ + $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, true); + $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, true); + + $coupons = array($couponCumulative1, $couponCumulative2); + /** @var CouponAdapterInterface $stubCouponBaseAdapter */ + $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); + + // When + $sortedCoupons = PhpUnitUtils::callMethod( + new CouponManager($stubCouponBaseAdapter), + 'sortCoupons', + array($coupons) + ); + + // Then + $expected = $coupons; + $actual = $sortedCoupons; + + $this->assertSame($expected, $actual, 'Array Sorted despite both Coupon can be accumulated'); + } + + /** + * Testing how multiple Coupon behaviour + * Entering 1 Coupon cumulative + * 1 Coupon non cumulative + * + * @covers Thelia\Coupon\CouponManager::sortCoupons + */ + public function testCouponCumulationOneCouponCumulativeOneNonCumulative() + { + $cartTotalPrice = 100.00; + $checkoutTotalPrice = 120.00; + + // Given + /** @var CouponInterface $coupon */ + $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, true); + $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, false); + + $coupons = array($couponCumulative1, $couponCumulative2); + /** @var CouponAdapterInterface $stubCouponBaseAdapter */ + $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); + + // When + $sortedCoupons = PhpUnitUtils::callMethod( + new CouponManager($stubCouponBaseAdapter), + 'sortCoupons', + array($coupons) + ); + + // Then + $expected = array($couponCumulative2); + $actual = $sortedCoupons; + + $this->assertSame($expected, $actual, 'Array Sorted despite both Coupon can be accumulated'); + } + + /** + * Testing how multiple Coupon behaviour + * Entering 1 Coupon non cumulative + * 1 Coupon cumulative + * + * @covers Thelia\Coupon\CouponManager::sortCoupons + */ + public function testCouponCumulationOneCouponNonCumulativeOneCumulative() + { + $cartTotalPrice = 100.00; + $checkoutTotalPrice = 120.00; + + // Given + /** @var CouponInterface $coupon */ + $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, false); + $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, true); + + $coupons = array($couponCumulative1, $couponCumulative2); + /** @var CouponAdapterInterface $stubCouponBaseAdapter */ + $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); + + // When + $sortedCoupons = PhpUnitUtils::callMethod( + new CouponManager($stubCouponBaseAdapter), + 'sortCoupons', + array($coupons) + ); + + // Then + $expected = array($couponCumulative2); + $actual = $sortedCoupons; + + $this->assertSame($expected, $actual, 'Array Sorted despite both Coupon can be accumulated'); + } + + /** + * Testing how multiple Coupon behaviour + * Entering 1 Coupon non cumulative + * 1 Coupon non cumulative + * + * @covers Thelia\Coupon\CouponManager::sortCoupons + */ + public function testCouponCumulationTwoCouponNonCumulative() + { + $cartTotalPrice = 100.00; + $checkoutTotalPrice = 120.00; + + // Given + /** @var CouponInterface $coupon */ + $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, false); + $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, false); + + $coupons = array($couponCumulative1, $couponCumulative2); + /** @var CouponAdapterInterface $stubCouponBaseAdapter */ + $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); + + // When + $sortedCoupons = PhpUnitUtils::callMethod( + new CouponManager($stubCouponBaseAdapter), + 'sortCoupons', + array($coupons) + ); + + // Then + $expected = array($couponCumulative2); + $actual = $sortedCoupons; + + $this->assertSame($expected, $actual, 'Array Sorted despite both Coupon can be accumulated'); + } + + /** + * Testing how multiple Coupon behaviour + * Entering 1 Coupon cumulative expired + * + * @covers Thelia\Coupon\CouponManager::sortCoupons + */ + public function testCouponCumulationOneCouponCumulativeExpired() + { + $cartTotalPrice = 100.00; + $checkoutTotalPrice = 120.00; + + // Given + /** @var CouponInterface $coupon */ + $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, new \DateTime(), null, true); + + $coupons = array($couponCumulative1); + /** @var CouponAdapterInterface $stubCouponBaseAdapter */ + $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); + + // When + $sortedCoupons = PhpUnitUtils::callMethod( + new CouponManager($stubCouponBaseAdapter), + 'sortCoupons', + array($coupons) + ); + + // Then + $expected = array(); + $actual = $sortedCoupons; + + $this->assertSame($expected, $actual, 'Coupon expired ignored'); + } + + /** + * Testing how multiple Coupon behaviour + * Entering 1 Coupon cumulative expired + * 1 Coupon cumulative expired + * + * @covers Thelia\Coupon\CouponManager::sortCoupons + */ + public function testCouponCumulationTwoCouponCumulativeExpired() + { + $cartTotalPrice = 100.00; + $checkoutTotalPrice = 120.00; + + // Given + /** @var CouponInterface $coupon */ + $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, new \DateTime(), null, true); + $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, new \DateTime(), null, true); + + $coupons = array($couponCumulative1, $couponCumulative2); + /** @var CouponAdapterInterface $stubCouponBaseAdapter */ + $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); + + // When + $sortedCoupons = PhpUnitUtils::callMethod( + new CouponManager($stubCouponBaseAdapter), + 'sortCoupons', + array($coupons) + ); + + // Then + $expected = array(); + $actual = $sortedCoupons; + + $this->assertSame($expected, $actual, 'Coupon expired ignored'); + } + + /** + * Testing how multiple Coupon behaviour + * Entering 1 Coupon cumulative expired + * 1 Coupon cumulative valid + * + * @covers Thelia\Coupon\CouponManager::sortCoupons + */ + public function testCouponCumulationOneCouponCumulativeExpiredOneNonExpired() + { + $cartTotalPrice = 100.00; + $checkoutTotalPrice = 120.00; + + // Given + /** @var CouponInterface $coupon */ + $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, new \DateTime(), null, true); + $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, true); + + $coupons = array($couponCumulative1, $couponCumulative2); + /** @var CouponAdapterInterface $stubCouponBaseAdapter */ + $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); + + // When + $sortedCoupons = PhpUnitUtils::callMethod( + new CouponManager($stubCouponBaseAdapter), + 'sortCoupons', + array($coupons) + ); + + // Then + $expected = array($couponCumulative2); + $actual = $sortedCoupons; + + $this->assertSame($expected, $actual, 'Coupon expired ignored'); + } + + /** + * Testing how multiple Coupon behaviour + * Entering 1 Coupon cumulative valid + * 1 Coupon cumulative expired + * + * @covers Thelia\Coupon\CouponManager::sortCoupons + */ + public function testCouponCumulationOneCouponCumulativeNonExpiredOneExpired() + { + $cartTotalPrice = 100.00; + $checkoutTotalPrice = 120.00; + + // Given + /** @var CouponInterface $coupon */ + $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, true); + $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, new \DateTime(), null, true); + + $coupons = array($couponCumulative1, $couponCumulative2); + /** @var CouponAdapterInterface $stubCouponBaseAdapter */ + $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); + + // When + $sortedCoupons = PhpUnitUtils::callMethod( + new CouponManager($stubCouponBaseAdapter), + 'sortCoupons', + array($coupons) + ); + + // Then + $expected = array($couponCumulative1); + $actual = $sortedCoupons; + + $this->assertSame($expected, $actual, 'Coupon expired ignored'); + } + + /** + * Testing how multiple Coupon behaviour + * Entering 1 Coupon cumulative valid + * 1 Coupon cumulative valid + * 1 Coupon cumulative valid + * 1 Coupon cumulative valid + * + * @covers Thelia\Coupon\CouponManager::sortCoupons + */ + public function testCouponCumulationFourCouponCumulative() + { + $cartTotalPrice = 100.00; + $checkoutTotalPrice = 120.00; + + // Given + /** @var CouponInterface $coupon */ + $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, true); + $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, true); + $couponCumulative3 = $this->generateValidCoupon('XMAS3', null, null, null, null, null, null, null, true); + $couponCumulative4 = $this->generateValidCoupon('XMAS4', null, null, null, null, null, null, null, true); + + $coupons = array($couponCumulative1, $couponCumulative2, $couponCumulative3, $couponCumulative4); + /** @var CouponAdapterInterface $stubCouponBaseAdapter */ + $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); + + // When + $sortedCoupons = PhpUnitUtils::callMethod( + new CouponManager($stubCouponBaseAdapter), + 'sortCoupons', + array($coupons) + ); + + // Then + $expected = $coupons; + $actual = $sortedCoupons; + + $this->assertSame($expected, $actual, 'Coupon cumulative ignored'); + } + + /** + * Testing how multiple Coupon behaviour + * Entering 1 Coupon cumulative valid + * 1 Coupon cumulative valid + * 1 Coupon cumulative valid + * 1 Coupon non cumulative valid + * + * @covers Thelia\Coupon\CouponManager::sortCoupons + */ + public function testCouponCumulationThreeCouponCumulativeOneNonCumulative() + { + $cartTotalPrice = 100.00; + $checkoutTotalPrice = 120.00; + + // Given + /** @var CouponInterface $coupon */ + $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, true); + $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, true); + $couponCumulative3 = $this->generateValidCoupon('XMAS3', null, null, null, null, null, null, null, true); + $couponCumulative4 = $this->generateValidCoupon('XMAS4', null, null, null, null, null, null, null, false); + + $coupons = array($couponCumulative1, $couponCumulative2, $couponCumulative3, $couponCumulative4); + /** @var CouponAdapterInterface $stubCouponBaseAdapter */ + $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); + + // When + $sortedCoupons = PhpUnitUtils::callMethod( + new CouponManager($stubCouponBaseAdapter), + 'sortCoupons', + array($coupons) + ); + + // Then + $expected = array($couponCumulative4); + $actual = $sortedCoupons; + + $this->assertSame($expected, $actual, 'Coupon cumulative ignored'); + } + /** * Generate valid CouponRuleInterfaces * * @return array Array of CouponRuleInterface */ - protected function generateValidRules() + public static function generateValidRules() { $rule1 = new AvailableForTotalAmount( array( @@ -281,4 +675,130 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua { } + /** + * Generate a fake Adapter + * + * @param array $coupons Coupons + * @param float $cartTotalPrice Cart total price + * @param float $checkoutTotalPrice Checkout total price + * @param float $postagePrice Checkout postage price + * + * @return \PHPUnit_Framework_MockObject_MockObject + */ + public function generateFakeAdapter(array $coupons, $cartTotalPrice, $checkoutTotalPrice, $postagePrice = 6.00) + { + $stubCouponBaseAdapter = $this->getMock( + 'Thelia\Coupon\CouponBaseAdapter', + array( + 'getCurrentCoupons', + 'getCartTotalPrice', + 'getCheckoutTotalPrice', + 'getCheckoutPostagePrice' + ), + array() + ); + + $stubCouponBaseAdapter->expects($this->any()) + ->method('getCurrentCoupons') + ->will($this->returnValue(($coupons))); + + // Return Cart product amount = $cartTotalPrice euros + $stubCouponBaseAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue($cartTotalPrice)); + + // Return Checkout amount = $checkoutTotalPrice euros + $stubCouponBaseAdapter->expects($this->any()) + ->method('getCheckoutTotalPrice') + ->will($this->returnValue($checkoutTotalPrice)); + + $stubCouponBaseAdapter->expects($this->any()) + ->method('getCheckoutPostagePrice') + ->will($this->returnValue($postagePrice)); + + return $stubCouponBaseAdapter; + } + + /** + * Generate valid CouponInterface + * + * @param string $code Coupon Code + * @param string $title Coupon Title + * @param string $shortDescription Coupon short + * description + * @param string $description Coupon description + * @param float $amount Coupon discount + * @param bool $isEnabled Is Coupon enabled + * @param \DateTime $expirationDate Coupon expiration date + * @param CouponRuleCollection $rules Coupon rules + * @param bool $isCumulative If is cumulative + * @param bool $isRemovingPostage If is removing postage + * @param bool $isAvailableOnSpecialOffers If is available on + * special offers or not + * @param int $maxUsage How many time a Coupon + * can be used + * + * @return CouponInterface + */ + public static function generateValidCoupon( + $code = null, + $title = null, + $shortDescription = null, + $description = null, + $amount = null, + $isEnabled = null, + $expirationDate = null, + $rules = null, + $isCumulative = null, + $isRemovingPostage = null, + $isAvailableOnSpecialOffers = null, + $maxUsage = null + ) { + if ($code === null) { + $code = self::VALID_CODE; + } + if ($title === null) { + $title = self::VALID_TITLE; + } + if ($shortDescription === null) { + $shortDescription = self::VALID_SHORT_DESCRIPTION; + } + if ($description === null) { + $description = self::VALID_DESCRIPTION; + } + if ($amount === null) { + $amount = 10.00; + } + if ($isEnabled === null) { + $isEnabled = true; + } + if ($isCumulative === null) { + $isCumulative = true; + } + if ($isRemovingPostage === null) { + $isRemovingPostage = false; + } + if ($isAvailableOnSpecialOffers === null) { + $isAvailableOnSpecialOffers = true; + } + if ($maxUsage === null) { + $maxUsage = 40; + } + + if ($expirationDate === null) { + $expirationDate = new \DateTime(); + $expirationDate->setTimestamp(strtotime("today + 2 months")); + } + + $coupon = new RemoveXAmount($code, $title, $shortDescription, $description, $amount, $isCumulative, $isRemovingPostage, $isAvailableOnSpecialOffers, $isEnabled, $maxUsage, $expirationDate); + + if ($rules === null) { + $rules = self::generateValidRules(); + } + + $coupon->setRules($rules); + + return $coupon; + } + } diff --git a/core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php b/core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php index 081aee2dd..e399b6f37 100644 --- a/core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php +++ b/core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php @@ -23,8 +23,8 @@ namespace Thelia\Coupon; -use Thelia\Coupon\Parameter\PriceParam; -use Thelia\Coupon\Parameter\RuleValidator; +use Thelia\Coupon\Validator\PriceParam; +use Thelia\Coupon\Validator\RuleValidator; use Thelia\Coupon\Rule\AvailableForTotalAmount; use Thelia\Coupon\Rule\Operators; diff --git a/core/lib/Thelia/Tests/Coupon/Parameter/DateParamTest.php b/core/lib/Thelia/Tests/Coupon/Parameter/DateParamTest.php index 4c26bfa2f..bbfe4015a 100644 --- a/core/lib/Thelia/Tests/Coupon/Parameter/DateParamTest.php +++ b/core/lib/Thelia/Tests/Coupon/Parameter/DateParamTest.php @@ -24,7 +24,7 @@ namespace Thelia\Coupon; use InvalidArgumentException; -use Thelia\Coupon\Parameter\DateParam; +use Thelia\Coupon\Validator\DateParam; /** * Created by JetBrains PhpStorm. diff --git a/core/lib/Thelia/Tests/Coupon/Parameter/IntegerParamTest.php b/core/lib/Thelia/Tests/Coupon/Parameter/IntegerParamTest.php index 05f19955d..b8938d102 100644 --- a/core/lib/Thelia/Tests/Coupon/Parameter/IntegerParamTest.php +++ b/core/lib/Thelia/Tests/Coupon/Parameter/IntegerParamTest.php @@ -24,7 +24,7 @@ namespace Thelia\Coupon; use InvalidArgumentException; -use Thelia\Coupon\Parameter\IntegerParam; +use Thelia\Coupon\Validator\IntegerParam; /** * Created by JetBrains PhpStorm. diff --git a/core/lib/Thelia/Tests/Coupon/Parameter/IntervalParamTest.php b/core/lib/Thelia/Tests/Coupon/Parameter/IntervalParamTest.php index 73571ba5b..c068dfc01 100644 --- a/core/lib/Thelia/Tests/Coupon/Parameter/IntervalParamTest.php +++ b/core/lib/Thelia/Tests/Coupon/Parameter/IntervalParamTest.php @@ -24,7 +24,7 @@ namespace Thelia\Coupon; use InvalidArgumentException; -use Thelia\Coupon\Parameter\IntervalParam; +use Thelia\Coupon\Validator\IntervalParam; /** * Created by JetBrains PhpStorm. diff --git a/core/lib/Thelia/Tests/Coupon/Parameter/PriceParamTest.php b/core/lib/Thelia/Tests/Coupon/Parameter/PriceParamTest.php index 62d552e0b..19f19fd4e 100644 --- a/core/lib/Thelia/Tests/Coupon/Parameter/PriceParamTest.php +++ b/core/lib/Thelia/Tests/Coupon/Parameter/PriceParamTest.php @@ -24,7 +24,7 @@ namespace Thelia\Coupon; use InvalidArgumentException; -use Thelia\Coupon\Parameter\PriceParam; +use Thelia\Coupon\Validator\PriceParam; /** * Created by JetBrains PhpStorm. diff --git a/core/lib/Thelia/Tests/Coupon/Parameter/QuantityParamTest.php b/core/lib/Thelia/Tests/Coupon/Parameter/QuantityParamTest.php index 6a9d9d737..17343121c 100644 --- a/core/lib/Thelia/Tests/Coupon/Parameter/QuantityParamTest.php +++ b/core/lib/Thelia/Tests/Coupon/Parameter/QuantityParamTest.php @@ -24,7 +24,7 @@ namespace Thelia\Coupon; use InvalidArgumentException; -use Thelia\Coupon\Parameter\QuantityParam; +use Thelia\Coupon\Validator\QuantityParam; /** * Created by JetBrains PhpStorm. diff --git a/core/lib/Thelia/Tests/Coupon/Parameter/RepeatedDateParamTest.php b/core/lib/Thelia/Tests/Coupon/Parameter/RepeatedDateParamTest.php index f9a6f0d18..66c970a4f 100644 --- a/core/lib/Thelia/Tests/Coupon/Parameter/RepeatedDateParamTest.php +++ b/core/lib/Thelia/Tests/Coupon/Parameter/RepeatedDateParamTest.php @@ -25,7 +25,7 @@ namespace Thelia\Coupon; use InvalidArgumentException; use Symfony\Component\Intl\Exception\NotImplementedException; -use Thelia\Coupon\Parameter\RepeatedDateParam; +use Thelia\Coupon\Validator\RepeatedDateParam; /** * Created by JetBrains PhpStorm. diff --git a/core/lib/Thelia/Tests/Coupon/Parameter/RepeatedIntervalParamTest.php b/core/lib/Thelia/Tests/Coupon/Parameter/RepeatedIntervalParamTest.php index fe5866b0f..dc7a1335d 100644 --- a/core/lib/Thelia/Tests/Coupon/Parameter/RepeatedIntervalParamTest.php +++ b/core/lib/Thelia/Tests/Coupon/Parameter/RepeatedIntervalParamTest.php @@ -24,7 +24,7 @@ namespace Thelia\Coupon; use Symfony\Component\Intl\Exception\NotImplementedException; -use Thelia\Coupon\Parameter\RepeatedIntervalParam; +use Thelia\Coupon\Validator\RepeatedIntervalParam; /** * Created by JetBrains PhpStorm. @@ -75,7 +75,7 @@ class RepeatedIntervalParamTest extends \PHPUnit_Framework_TestCase * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo * */ - public function testEqualsDateRepeatEveryMonthOneTimeFirstPeriodBegining() + public function testEqualsDateRepeatEveryMonthOneTimeFirstPeriodBeginning() { $startDateValidator = new \DateTime("2012-07-08"); $dateToValidate = new \DateTime("2012-07-08"); @@ -138,7 +138,7 @@ class RepeatedIntervalParamTest extends \PHPUnit_Framework_TestCase * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo * */ - public function testEqualsDateRepeatEveryMonthOneTimeSecondPeriodBegining() + public function testEqualsDateRepeatEveryMonthOneTimeSecondPeriodBeginning() { $startDateValidator = new \DateTime("2012-08-08"); $dateToValidate = new \DateTime("2012-08-08"); @@ -264,7 +264,7 @@ class RepeatedIntervalParamTest extends \PHPUnit_Framework_TestCase * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo * */ - public function testNotEqualsDateRepeatEveryMonthFourTimeInTheBegining() + public function testNotEqualsDateRepeatEveryMonthFourTimeInTheBeginning() { $startDateValidator = new \DateTime("2012-10-08"); $dateToValidate = new \DateTime("2012-07-19"); @@ -348,7 +348,7 @@ class RepeatedIntervalParamTest extends \PHPUnit_Framework_TestCase /** * @covers Thelia\Coupon\Parameter\DateParam::compareTo - * @expectedException InvalidArgumentException + * @expectedException \InvalidArgumentException */ public function testInvalidArgumentException() { diff --git a/core/lib/Thelia/Tests/Coupon/Rule/AvailableForTotalAmountTest.php b/core/lib/Thelia/Tests/Coupon/Rule/AvailableForTotalAmountTest.php index 15c07ba1a..63d78615f 100644 --- a/core/lib/Thelia/Tests/Coupon/Rule/AvailableForTotalAmountTest.php +++ b/core/lib/Thelia/Tests/Coupon/Rule/AvailableForTotalAmountTest.php @@ -23,8 +23,8 @@ namespace Thelia\Coupon; -use Thelia\Coupon\Parameter\PriceParam; -use Thelia\Coupon\Parameter\RuleValidator; +use Thelia\Coupon\Validator\PriceParam; +use Thelia\Coupon\Validator\RuleValidator; use Thelia\Coupon\Rule\AvailableForTotalAmount; use Thelia\Coupon\Rule\Operators; use Thelia\Exception\InvalidRuleOperatorException; @@ -52,6 +52,11 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase { } + /** + * Generate valid CouponBaseAdapter + * + * @return CouponAdapterInterface + */ protected function generateValidCouponBaseAdapterMock() { /** @var CouponAdapterInterface $stubTheliaAdapter */ @@ -130,7 +135,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase /** * * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkBackOfficeInput - * @expectedException ErrorException + * @expectedException \ErrorException * */ public function testInValidBackOfficeInputValue() diff --git a/core/lib/Thelia/Tests/Coupon/Rule/AvailableForXArticlesTest.php b/core/lib/Thelia/Tests/Coupon/Rule/AvailableForXArticlesTest.php index 8bffc05a9..3579eacf3 100644 --- a/core/lib/Thelia/Tests/Coupon/Rule/AvailableForXArticlesTest.php +++ b/core/lib/Thelia/Tests/Coupon/Rule/AvailableForXArticlesTest.php @@ -52,11 +52,11 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase /** @var CouponAdapterInterface $stubTheliaAdapter */ $stubTheliaAdapter = $this->getMock( 'CouponBaseAdapter', - array('getNbArticlesInTheCart'), + array('getNbArticlesInCart'), array() ); $stubTheliaAdapter->expects($this->any()) - ->method('getNbArticlesInTheCart') + ->method('getNbArticlesInCart') ->will($this->returnValue(4)); return $stubTheliaAdapter; @@ -73,7 +73,7 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); $validators = array(4); - $validated = array($stubTheliaAdapter->getNbArticlesInTheCart()); + $validated = array($stubTheliaAdapter->getNbArticlesInCart()); $rule = new AvailableForXArticles($validators, $validated); $expected = true; @@ -92,7 +92,7 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); $validators = array(4.5); - $validated = array($stubTheliaAdapter->getNbArticlesInTheCart()); + $validated = array($stubTheliaAdapter->getNbArticlesInCart()); $rule = new AvailableForXArticles($validators, $validated); $expected = false; @@ -100,7 +100,7 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase $this->assertEquals($expected, $actual); $validators = array(-1); - $validated = array($stubTheliaAdapter->getNbArticlesInTheCart()); + $validated = array($stubTheliaAdapter->getNbArticlesInCart()); $rule = new AvailableForXArticles($validators, $validated); $expected = false; @@ -108,7 +108,7 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase $this->assertEquals($expected, $actual); $validators = array('bad'); - $validated = array($stubTheliaAdapter->getNbArticlesInTheCart()); + $validated = array($stubTheliaAdapter->getNbArticlesInCart()); $rule = new AvailableForXArticles($validators, $validated); $expected = false; @@ -129,7 +129,7 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); $validators = array(4); - $validated = array($stubTheliaAdapter->getNbArticlesInTheCart()); + $validated = array($stubTheliaAdapter->getNbArticlesInCart()); $rule = new AvailableForXArticles($validators, $validated); $expected = true; @@ -148,7 +148,7 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); $validators = array(4.5); - $validated = array($stubTheliaAdapter->getNbArticlesInTheCart()); + $validated = array($stubTheliaAdapter->getNbArticlesInCart()); $rule = new AvailableForXArticles($validators, $validated); $expected = false; @@ -156,7 +156,7 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase $this->assertEquals($expected, $actual); $validators = array(-1); - $validated = array($stubTheliaAdapter->getNbArticlesInTheCart()); + $validated = array($stubTheliaAdapter->getNbArticlesInCart()); $rule = new AvailableForXArticles($validators, $validated); $expected = false; @@ -164,7 +164,7 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase $this->assertEquals($expected, $actual); $validators = array('bad'); - $validated = array($stubTheliaAdapter->getNbArticlesInTheCart()); + $validated = array($stubTheliaAdapter->getNbArticlesInCart()); $rule = new AvailableForXArticles($validators, $validated); $expected = false; @@ -183,7 +183,7 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); $validators = array(4); - $validated = array($stubTheliaAdapter->getNbArticlesInTheCart()); + $validated = array($stubTheliaAdapter->getNbArticlesInCart()); $rule = new AvailableForXArticles($validators, $validated); $expected = true; @@ -202,7 +202,7 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); $validators = array(5); - $validated = array($stubTheliaAdapter->getNbArticlesInTheCart()); + $validated = array($stubTheliaAdapter->getNbArticlesInCart()); $rule = new AvailableForXArticles($validators, $validated); $expected = true; @@ -221,7 +221,7 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); $validators = array(3); - $validated = array($stubTheliaAdapter->getNbArticlesInTheCart()); + $validated = array($stubTheliaAdapter->getNbArticlesInCart()); $rule = new AvailableForXArticles($validators, $validated); $expected = false; diff --git a/core/lib/Thelia/Tests/Coupon/Rule/OperatorsTest.php b/core/lib/Thelia/Tests/Coupon/Rule/OperatorsTest.php index bf4fbc75d..22a83dc8b 100644 --- a/core/lib/Thelia/Tests/Coupon/Rule/OperatorsTest.php +++ b/core/lib/Thelia/Tests/Coupon/Rule/OperatorsTest.php @@ -23,7 +23,7 @@ namespace Thelia\Coupon; -use Thelia\Coupon\Parameter\QuantityParam; +use Thelia\Coupon\Validator\QuantityParam; use Thelia\Coupon\Rule\Operators; /** @@ -61,7 +61,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase $b = new QuantityParam(12); // When - $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + $actual = Operators::isValid($a, $operator, $b); // Then $this->assertTrue($actual); @@ -80,7 +80,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase $b = new QuantityParam(12); // When - $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + $actual = Operators::isValid($a, $operator, $b); // Then $this->assertFalse($actual); @@ -99,7 +99,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase $b = new QuantityParam(12); // When - $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + $actual = Operators::isValid($a, $operator, $b); // Then $this->assertFalse($actual); @@ -118,7 +118,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase $b = new QuantityParam(11); // When - $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + $actual = Operators::isValid($a, $operator, $b); // Then $this->assertTrue($actual); @@ -137,7 +137,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase $b = new QuantityParam(11); // When - $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + $actual = Operators::isValid($a, $operator, $b); // Then $this->assertTrue($actual); @@ -156,7 +156,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase $b = new QuantityParam(11); // When - $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + $actual = Operators::isValid($a, $operator, $b); // Then $this->assertFalse($actual); @@ -175,7 +175,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase $b = new QuantityParam(12); // When - $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + $actual = Operators::isValid($a, $operator, $b); // Then $this->assertTrue($actual); @@ -194,7 +194,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase $b = new QuantityParam(12); // When - $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + $actual = Operators::isValid($a, $operator, $b); // Then $this->assertFalse($actual); @@ -213,7 +213,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase $b = new QuantityParam(12); // When - $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + $actual = Operators::isValid($a, $operator, $b); // Then $this->assertFalse($actual); @@ -232,7 +232,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase $b = new QuantityParam(13); // When - $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + $actual = Operators::isValid($a, $operator, $b); // Then $this->assertTrue($actual); @@ -251,7 +251,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase $b = new QuantityParam(13); // When - $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + $actual = Operators::isValid($a, $operator, $b); // Then $this->assertTrue($actual); @@ -270,7 +270,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase $b = new QuantityParam(13); // When - $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + $actual = Operators::isValid($a, $operator, $b); // Then $this->assertFalse($actual); @@ -289,7 +289,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase $b = new QuantityParam(12); // When - $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + $actual = Operators::isValid($a, $operator, $b); // Then $this->assertTrue($actual); @@ -308,7 +308,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase $b = new QuantityParam(12); // When - $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + $actual = Operators::isValid($a, $operator, $b); // Then $this->assertFalse($actual); @@ -327,7 +327,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase $b = new QuantityParam(12); // When - $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + $actual = Operators::isValid($a, $operator, $b); // Then $this->assertFalse($actual); @@ -346,7 +346,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase $b = new QuantityParam(11); // When - $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + $actual = Operators::isValid($a, $operator, $b); // Then $this->assertTrue($actual); @@ -365,7 +365,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase $b = new QuantityParam(11); // When - $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + $actual = Operators::isValid($a, $operator, $b); // Then $this->assertFalse($actual); @@ -384,7 +384,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase $b = new QuantityParam(11); // When - $actual = Operators::isValidAccordingToOperator($a, $operator, $b); + $actual = Operators::isValid($a, $operator, $b); // Then $this->assertFalse($actual); diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php index f7287bb45..72313f9ec 100644 --- a/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php @@ -23,11 +23,14 @@ namespace Thelia\Coupon; -use Thelia\Coupon\Parameter\PriceParam; +use Thelia\Coupon\Validator\PriceParam; +use Thelia\Coupon\Validator\RuleValidator; use Thelia\Coupon\Rule\AvailableForTotalAmount; use Thelia\Coupon\Rule\Operators; use Thelia\Coupon\Type\RemoveXAmount; +require_once '../CouponManagerTest.php'; + /** * Created by JetBrains PhpStorm. * Date: 8/19/13 @@ -41,11 +44,6 @@ use Thelia\Coupon\Type\RemoveXAmount; */ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase { - - CONST VALID_COUPON_CODE = 'XMAS'; - CONST VALID_COUPON_TITLE = 'XMAS Coupon'; - CONST VALID_COUPON_SHORT_DESCRIPTION = 'Coupon for christmas'; - CONST VALID_COUPON_DESCRIPTION = '

Lorem

ipsum'; /** * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. @@ -55,37 +53,6 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase } - - protected function generateValidCumulativeRemovingPostageCoupon() - { - $coupon = new RemoveXAmount( - self::VALID_COUPON_CODE, - self::VALID_COUPON_TITLE, - self::VALID_COUPON_SHORT_DESCRIPTION, - self::VALID_COUPON_DESCRIPTION, - 30.00, - true, - true - ); - - return $coupon; - } - - protected function generateValidNonCumulativeNonRemovingPostageCoupon() - { - $coupon = new RemoveXAmount( - self::VALID_COUPON_CODE, - self::VALID_COUPON_TITLE, - self::VALID_COUPON_SHORT_DESCRIPTION, - self::VALID_COUPON_DESCRIPTION, - 30.00, - false, - false - ); - - return $coupon; - } - /** * * @covers Thelia\Coupon\type\RemoveXAmount::getCode @@ -96,28 +63,25 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase */ public function testDisplay() { + $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, true, true); - $coupon = $this->generateValidCumulativeRemovingPostageCoupon(); - - $expected = self::VALID_COUPON_CODE; + $expected = CouponManagerTest::VALID_CODE; $actual = $coupon->getCode(); $this->assertEquals($expected, $actual); - $expected = self::VALID_COUPON_TITLE; + $expected = CouponManagerTest::VALID_TITLE; $actual = $coupon->getTitle(); $this->assertEquals($expected, $actual); - $expected = self::VALID_COUPON_SHORT_DESCRIPTION; + $expected = CouponManagerTest::VALID_SHORT_DESCRIPTION; $actual = $coupon->getShortDescription(); $this->assertEquals($expected, $actual); - $expected = self::VALID_COUPON_DESCRIPTION; + $expected = CouponManagerTest::VALID_DESCRIPTION; $actual = $coupon->getDescription(); $this->assertEquals($expected, $actual); - } - /** * * @covers Thelia\Coupon\type\RemoveXAmount::isCumulative @@ -126,7 +90,7 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase public function testIsCumulative() { - $coupon = $this->generateValidCumulativeRemovingPostageCoupon(); + $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, true, true); $actual = $coupon->isCumulative(); $this->assertTrue($actual); @@ -140,7 +104,7 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase public function testIsNotCumulative() { - $coupon = $this->generateValidNonCumulativeNonRemovingPostageCoupon(); + $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); $actual = $coupon->isCumulative(); $this->assertFalse($actual); @@ -154,8 +118,7 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase */ public function testIsRemovingPostage() { - - $coupon = $this->generateValidCumulativeRemovingPostageCoupon(); + $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, true, true); $actual = $coupon->isRemovingPostage(); $this->assertTrue($actual); @@ -169,7 +132,7 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase public function testIsNotRemovingPostage() { - $coupon = $this->generateValidNonCumulativeNonRemovingPostageCoupon(); + $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); $actual = $coupon->isRemovingPostage(); $this->assertFalse($actual); @@ -184,43 +147,13 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase public function testGetEffect() { - $coupon = $this->generateValidNonCumulativeNonRemovingPostageCoupon(); + $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); - $expected = -30.00; - $actual = $coupon->getEffect(); + $expected = 10; + $actual = $coupon->getDiscount(); $this->assertEquals($expected, $actual); } - /** - * - * @covers Thelia\Coupon\type\RemoveXAmount::addRule - * @covers Thelia\Coupon\type\RemoveXAmount::getRules - * - */ - public function testAddRuleValid() - { - // Given - $rule1 = $this->generateValideRuleAvailableForTotalAmountOperatorTo( - Operators::INFERIOR, - 100.23 - ); - $rule2 = $this->generateValideRuleAvailableForTotalAmountOperatorTo( - Operators::SUPERIOR, - 421.23 - ); - - $coupon = $this->generateValidNonCumulativeNonRemovingPostageCoupon(); - - // When - $coupon->addRule($rule1) - ->addRule($rule2); - - // Then - $expected = 2; - $this->assertCount($expected, $coupon->getRules()); - } - - /** * * @covers Thelia\Coupon\type\RemoveXAmount::setRules @@ -230,29 +163,27 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase public function testSetRulesValid() { // Given - $rule0 = $this->generateValideRuleAvailableForTotalAmountOperatorTo( + $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( Operators::EQUAL, 20.00 ); - $rule1 = $this->generateValideRuleAvailableForTotalAmountOperatorTo( + $rule1 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( Operators::INFERIOR, 100.23 ); - $rule2 = $this->generateValideRuleAvailableForTotalAmountOperatorTo( + $rule2 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( Operators::SUPERIOR, 421.23 ); - $coupon = $this->generateValidNonCumulativeNonRemovingPostageCoupon(); + $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); // When - $coupon->addRule($rule0) - ->setRules(array($rule1, $rule2)); - + $coupon->setRules(new CouponRuleCollection(array($rule0, $rule1, $rule2))); // Then - $expected = 2; - $this->assertCount($expected, $coupon->getRules()); + $expected = 3; + $this->assertCount($expected, $coupon->getRules()->getRules()); } /** @@ -264,21 +195,20 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase public function testSetRulesInvalid() { // Given - $rule0 = $this->generateValideRuleAvailableForTotalAmountOperatorTo( + $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( Operators::EQUAL, 20.00 ); - $rule1 = $this->generateValideRuleAvailableForTotalAmountOperatorTo( + $rule1 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( Operators::INFERIOR, 100.23 ); $rule2 = $this; - $coupon = $this->generateValidNonCumulativeNonRemovingPostageCoupon(); + $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); // When - $coupon->addRule($rule0) - ->setRules(array($rule1, $rule2)); + $coupon->setRules(new CouponRuleCollection(array($rule0, $rule1, $rule2))); } /** @@ -289,18 +219,18 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase public function testGetEffectIfTotalAmountInferiorTo400Valid() { // Given - $rule0 = $this->generateValideRuleAvailableForTotalAmountOperatorTo( + $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( Operators::INFERIOR, 400.00 ); - $coupon = $this->generateValidNonCumulativeNonRemovingPostageCoupon(); + $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); // When - $coupon->addRule($rule0); + $coupon->setRules(new CouponRuleCollection(array($rule0))); // Then - $expected = -30.00; - $actual = $coupon->getEffect(); + $expected = 10.00; + $actual = $coupon->getDiscount(); $this->assertEquals($expected, $actual); } @@ -312,18 +242,18 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase public function testGetEffectIfTotalAmountInferiorOrEqualTo400Valid() { // Given - $rule0 = $this->generateValideRuleAvailableForTotalAmountOperatorTo( + $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( Operators::INFERIOR_OR_EQUAL, 400.00 ); - $coupon = $this->generateValidNonCumulativeNonRemovingPostageCoupon(); + $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); // When - $coupon->addRule($rule0); + $coupon->setRules(new CouponRuleCollection(array($rule0))); // Then - $expected = -30.00; - $actual = $coupon->getEffect(); + $expected = 10.00; + $actual = $coupon->getDiscount(); $this->assertEquals($expected, $actual); } @@ -335,18 +265,18 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase public function testGetEffectIfTotalAmountEqualTo400Valid() { // Given - $rule0 = $this->generateValideRuleAvailableForTotalAmountOperatorTo( + $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( Operators::EQUAL, 400.00 ); - $coupon = $this->generateValidNonCumulativeNonRemovingPostageCoupon(); + $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); // When - $coupon->addRule($rule0); + $coupon->setRules(new CouponRuleCollection(array($rule0))); // Then - $expected = -30.00; - $actual = $coupon->getEffect(); + $expected = 10.00; + $actual = $coupon->getDiscount(); $this->assertEquals($expected, $actual); } @@ -358,18 +288,18 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase public function testGetEffectIfTotalAmountSuperiorOrEqualTo400Valid() { // Given - $rule0 = $this->generateValideRuleAvailableForTotalAmountOperatorTo( + $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( Operators::SUPERIOR_OR_EQUAL, 400.00 ); - $coupon = $this->generateValidNonCumulativeNonRemovingPostageCoupon(); + $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); // When - $coupon->addRule($rule0); + $coupon->setRules(new CouponRuleCollection(array($rule0))); // Then - $expected = -30.00; - $actual = $coupon->getEffect(); + $expected = 10.00; + $actual = $coupon->getDiscount(); $this->assertEquals($expected, $actual); } @@ -381,18 +311,18 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase public function testGetEffectIfTotalAmountSuperiorTo400Valid() { // Given - $rule0 = $this->generateValideRuleAvailableForTotalAmountOperatorTo( + $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( Operators::SUPERIOR, 400.00 ); - $coupon = $this->generateValidNonCumulativeNonRemovingPostageCoupon(); + $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); // When - $coupon->addRule($rule0); + $coupon->setRules(new CouponRuleCollection(array($rule0))); // Then - $expected = -30.00; - $actual = $coupon->getEffect(); + $expected = 10.00; + $actual = $coupon->getDiscount(); $this->assertEquals($expected, $actual); } @@ -415,12 +345,15 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase * * @return AvailableForTotalAmount */ - protected function generateValideRuleAvailableForTotalAmountOperatorTo($operator, $amount) + protected function generateValidRuleAvailableForTotalAmountOperatorTo($operator, $amount) { $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => array( - AvailableForTotalAmount::OPERATOR => $operator, - AvailableForTotalAmount::VALUE => new PriceParam($amount, 'EUR') + AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( + $operator, + new PriceParam( + $amount, + 'EUR' + ) ) ); diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentForCategoryYTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentForCategoryYTest.php index caa90f4ae..24388104d 100644 --- a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentForCategoryYTest.php +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentForCategoryYTest.php @@ -28,13 +28,13 @@ namespace Thelia\Coupon; * Date: 8/19/13 * Time: 3:24 PM * - * Unit Test RemoveXPercenForCategoryY Class + * Unit Test RemoveXPercentForCategoryY Class * * @package Coupon * @author Guillaume MOREL * */ -class RemoveXPercenForCategoryYTest extends \PHPUnit_Framework_TestCase +class RemoveXPercentForCategoryYTest extends \PHPUnit_Framework_TestCase { /** diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php index 7dfca8dd2..5d110d3df 100644 --- a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php @@ -171,7 +171,7 @@ class RemoveXPercentTest extends \PHPUnit_Framework_TestCase /** * - * @covers Thelia\Coupon\Type\RemoveXPercent::getEffect + * @covers Thelia\Coupon\Type\RemoveXPercent::getDiscount * */ public function testGetEffect() @@ -180,7 +180,7 @@ class RemoveXPercentTest extends \PHPUnit_Framework_TestCase $coupon = $this->generateValidNonCumulativeNonRemovingPostageCoupon(); $expected = -30.00; - $actual = $coupon->getEffect(); + $actual = $coupon->getDiscount(); $this->assertEquals($expected, $actual); } diff --git a/core/lib/Thelia/Tools/PhpUnitUtils.php b/core/lib/Thelia/Tools/PhpUnitUtils.php index e8a2d41ab..89bd3b148 100644 --- a/core/lib/Thelia/Tools/PhpUnitUtils.php +++ b/core/lib/Thelia/Tools/PhpUnitUtils.php @@ -39,11 +39,11 @@ class PhpUnitUtils /** * Allow to call a protected methods * - * @param string $obj Class name + namespace + * @param Object $obj Class name + namespace * @param string $name Method name * @param array $args Method arguments * - * @return protected method result + * @return mixed protected method result */ public static function callMethod($obj, $name, array $args) { From c24e82758f494d045ba79321e69b955e604210d7 Mon Sep 17 00:00:00 2001 From: gmorel Date: Tue, 27 Aug 2013 18:53:18 +0200 Subject: [PATCH 011/125] WIP Coupon Refactor : creating dedicated reusable module for Constraints Adding ConstraintManager Secured : - Effects : RemoveXPercent + RemoveXAmount - Validators : all except ModelParam (need CustomerModelParam, AreaModelParam, CountryModelParam ?) - Conditions : AvailableForTotalAmount --- .../Thelia/Constraint/ConstraintManager.php | 82 ++++ .../Rule/AvailableForDate.php | 4 +- .../Rule/AvailableForLocationX.php | 4 +- .../Rule/AvailableForPeriod.php | 4 +- .../Rule/AvailableForRepeatedDate.php | 4 +- .../Rule/AvailableForRepeatedPeriod.php | 4 +- .../Rule/AvailableForTotalAmount.php | 45 +- .../AvailableForTotalAmountForCategoryY.php | 4 +- .../Rule/AvailableForXArticles.php | 4 +- .../Rule/CouponRuleAbstract.php | 8 +- .../Rule/CouponRuleInterface.php | 19 +- .../{Coupon => Constraint}/Rule/Operators.php | 68 ++- .../Validator/ComparableInterface.php | 2 +- .../Validator/DateParam.php | 25 +- .../Validator/IntegerParam.php | 24 +- .../Validator/IntervalParam.php | 57 ++- .../Constraint/Validator/ModelParam.php | 115 +++++ .../Validator/PriceParam.php | 32 +- .../Validator/QuantityParam.php | 29 +- .../Validator/RepeatedDateParam.php | 23 +- .../Validator/RepeatedIntervalParam.php | 23 +- .../Validator/RepeatedParam.php | 50 ++- .../Validator/RuleParameterAbstract.php | 20 +- .../Validator/RuleValidator.php | 4 +- .../Thelia/Coupon/CouponAdapterInterface.php | 8 + core/lib/Thelia/Coupon/CouponBaseAdapter.php | 14 +- core/lib/Thelia/Coupon/CouponManager.php | 2 +- .../Thelia/Coupon/CouponRuleCollection.php | 2 +- .../lib/Thelia/Coupon/Type/CouponAbstract.php | 23 +- .../Thelia/Coupon/Type/CouponInterface.php | 14 + core/lib/Thelia/Coupon/Type/RemoveXAmount.php | 71 ++- .../lib/Thelia/Coupon/Type/RemoveXPercent.php | 76 +++- .../Constraint/ConstraintManagerTest.php | 142 ++++++ .../Rule/AvailableForTotalAmountTest.php | 43 +- .../Rule/AvailableForXArticlesTest.php | 4 +- .../Rule/OperatorsTest.php | 42 +- .../Validator}/DateParamTest.php | 37 +- .../Validator}/IntegerParamTest.php | 36 +- .../Validator}/IntervalParamTest.php | 40 +- .../Validator}/PriceParamTest.php | 57 ++- .../Validator}/QuantityParamTest.php | 43 +- .../Validator}/RepeatedDateParamTest.php | 63 ++- .../Validator}/RepeatedIntervalParamTest.php | 81 +++- .../Thelia/Tests/Coupon/CouponFactoryTest.php | 14 +- .../Thelia/Tests/Coupon/CouponManagerTest.php | 30 +- .../Tests/Coupon/CouponRuleCollectionTest.php | 14 +- .../Tests/Coupon/Type/RemoveXAmountTest.php | 48 +- .../Tests/Coupon/Type/RemoveXPercentTest.php | 424 ++++++++++++++---- 48 files changed, 1632 insertions(+), 350 deletions(-) create mode 100644 core/lib/Thelia/Constraint/ConstraintManager.php rename core/lib/Thelia/{Coupon => Constraint}/Rule/AvailableForDate.php (97%) rename core/lib/Thelia/{Coupon => Constraint}/Rule/AvailableForLocationX.php (97%) rename core/lib/Thelia/{Coupon => Constraint}/Rule/AvailableForPeriod.php (97%) rename core/lib/Thelia/{Coupon => Constraint}/Rule/AvailableForRepeatedDate.php (97%) rename core/lib/Thelia/{Coupon => Constraint}/Rule/AvailableForRepeatedPeriod.php (98%) rename core/lib/Thelia/{Coupon => Constraint}/Rule/AvailableForTotalAmount.php (84%) rename core/lib/Thelia/{Coupon => Constraint}/Rule/AvailableForTotalAmountForCategoryY.php (97%) rename core/lib/Thelia/{Coupon => Constraint}/Rule/AvailableForXArticles.php (97%) rename core/lib/Thelia/{Coupon => Constraint}/Rule/CouponRuleAbstract.php (97%) rename core/lib/Thelia/{Coupon => Constraint}/Rule/CouponRuleInterface.php (91%) rename core/lib/Thelia/{Coupon => Constraint}/Rule/Operators.php (69%) rename core/lib/Thelia/{Coupon => Constraint}/Validator/ComparableInterface.php (98%) rename core/lib/Thelia/{Coupon => Constraint}/Validator/DateParam.php (84%) rename core/lib/Thelia/{Coupon => Constraint}/Validator/IntegerParam.php (85%) rename core/lib/Thelia/{Coupon => Constraint}/Validator/IntervalParam.php (76%) create mode 100644 core/lib/Thelia/Constraint/Validator/ModelParam.php rename core/lib/Thelia/{Coupon => Constraint}/Validator/PriceParam.php (81%) rename core/lib/Thelia/{Coupon => Constraint}/Validator/QuantityParam.php (81%) rename core/lib/Thelia/{Coupon => Constraint}/Validator/RepeatedDateParam.php (87%) rename core/lib/Thelia/{Coupon => Constraint}/Validator/RepeatedIntervalParam.php (89%) rename core/lib/Thelia/{Coupon => Constraint}/Validator/RepeatedParam.php (89%) rename core/lib/Thelia/{Coupon => Constraint}/Validator/RuleParameterAbstract.php (85%) rename core/lib/Thelia/{Coupon => Constraint}/Validator/RuleValidator.php (97%) create mode 100644 core/lib/Thelia/Tests/Constraint/ConstraintManagerTest.php rename core/lib/Thelia/Tests/{Coupon => Constraint}/Rule/AvailableForTotalAmountTest.php (94%) rename core/lib/Thelia/Tests/{Coupon => Constraint}/Rule/AvailableForXArticlesTest.php (99%) rename core/lib/Thelia/Tests/{Coupon => Constraint}/Rule/OperatorsTest.php (92%) rename core/lib/Thelia/Tests/{Coupon/Parameter => Constraint/Validator}/DateParamTest.php (75%) rename core/lib/Thelia/Tests/{Coupon/Parameter => Constraint/Validator}/IntegerParamTest.php (75%) rename core/lib/Thelia/Tests/{Coupon/Parameter => Constraint/Validator}/IntervalParamTest.php (74%) rename core/lib/Thelia/Tests/{Coupon/Parameter => Constraint/Validator}/PriceParamTest.php (73%) rename core/lib/Thelia/Tests/{Coupon/Parameter => Constraint/Validator}/QuantityParamTest.php (75%) rename core/lib/Thelia/Tests/{Coupon/Parameter => Constraint/Validator}/RepeatedDateParamTest.php (78%) rename core/lib/Thelia/Tests/{Coupon/Parameter => Constraint/Validator}/RepeatedIntervalParamTest.php (80%) diff --git a/core/lib/Thelia/Constraint/ConstraintManager.php b/core/lib/Thelia/Constraint/ConstraintManager.php new file mode 100644 index 000000000..6cbcbb1be --- /dev/null +++ b/core/lib/Thelia/Constraint/ConstraintManager.php @@ -0,0 +1,82 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Constraint; + +use Thelia\Coupon\CouponAdapterInterface; +use Thelia\Coupon\CouponRuleCollection; + + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Manage how Constraint could interact + * + * @package Constraint + * @author Guillaume MOREL + * + */ +class ConstraintManager +{ + /** @var CouponAdapterInterface Provide necessary value from Thelia*/ + protected $adapter; + + /** @var array CouponRuleCollection to process*/ + protected $rules = null; + + /** + * Constructor + * + * @param CouponAdapterInterface $adapter Provide necessary value from Thelia + * @param CouponRuleCollection $rules Rules associated with the Constraint + */ + function __construct(CouponAdapterInterface $adapter, CouponRuleCollection $rules) + { + $this->adapter = $adapter; + $this->rule = $rules; + } + + /** + * Check if the current Coupon is matching its conditions (Rules) + * Thelia variables are given by the CouponAdapterInterface + * + * @return bool + */ + public function isMatching() + { + $isMatching = true; + + /** @var CouponRuleInterface $rule */ + foreach ($this->rules->getRules() as $rule) { + if (!$rule->isMatching($this->adapter)) { + $isMatching = false; + } + } + + return $isMatching; + } + + +} \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForDate.php b/core/lib/Thelia/Constraint/Rule/AvailableForDate.php similarity index 97% rename from core/lib/Thelia/Coupon/Rule/AvailableForDate.php rename to core/lib/Thelia/Constraint/Rule/AvailableForDate.php index 81cb54a91..1ddfd0350 100644 --- a/core/lib/Thelia/Coupon/Rule/AvailableForDate.php +++ b/core/lib/Thelia/Constraint/Rule/AvailableForDate.php @@ -21,14 +21,14 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Rule; +namespace Thelia\Constraint\Rule; /** * Created by JetBrains PhpStorm. * Date: 8/19/13 * Time: 3:24 PM * - * @package Coupon + * @package Constraint * @author Guillaume MOREL * */ diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForLocationX.php b/core/lib/Thelia/Constraint/Rule/AvailableForLocationX.php similarity index 97% rename from core/lib/Thelia/Coupon/Rule/AvailableForLocationX.php rename to core/lib/Thelia/Constraint/Rule/AvailableForLocationX.php index 7f4d1bb33..5c3ec494c 100644 --- a/core/lib/Thelia/Coupon/Rule/AvailableForLocationX.php +++ b/core/lib/Thelia/Constraint/Rule/AvailableForLocationX.php @@ -21,14 +21,14 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Rule; +namespace Thelia\Constraint\Rule; /** * Created by JetBrains PhpStorm. * Date: 8/19/13 * Time: 3:24 PM * - * @package Coupon + * @package Constraint * @author Guillaume MOREL * */ diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForPeriod.php b/core/lib/Thelia/Constraint/Rule/AvailableForPeriod.php similarity index 97% rename from core/lib/Thelia/Coupon/Rule/AvailableForPeriod.php rename to core/lib/Thelia/Constraint/Rule/AvailableForPeriod.php index 7097ca52c..30679a973 100644 --- a/core/lib/Thelia/Coupon/Rule/AvailableForPeriod.php +++ b/core/lib/Thelia/Constraint/Rule/AvailableForPeriod.php @@ -21,14 +21,14 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Rule; +namespace Thelia\Constraint\Rule; /** * Created by JetBrains PhpStorm. * Date: 8/19/13 * Time: 3:24 PM * - * @package Coupon + * @package Constraint * @author Guillaume MOREL * */ diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForRepeatedDate.php b/core/lib/Thelia/Constraint/Rule/AvailableForRepeatedDate.php similarity index 97% rename from core/lib/Thelia/Coupon/Rule/AvailableForRepeatedDate.php rename to core/lib/Thelia/Constraint/Rule/AvailableForRepeatedDate.php index f4d4be7d3..3449a7f5b 100644 --- a/core/lib/Thelia/Coupon/Rule/AvailableForRepeatedDate.php +++ b/core/lib/Thelia/Constraint/Rule/AvailableForRepeatedDate.php @@ -21,14 +21,14 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Rule; +namespace Thelia\Constraint\Rule; /** * Created by JetBrains PhpStorm. * Date: 8/19/13 * Time: 3:24 PM * - * @package Coupon + * @package Constraint * @author Guillaume MOREL * */ diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForRepeatedPeriod.php b/core/lib/Thelia/Constraint/Rule/AvailableForRepeatedPeriod.php similarity index 98% rename from core/lib/Thelia/Coupon/Rule/AvailableForRepeatedPeriod.php rename to core/lib/Thelia/Constraint/Rule/AvailableForRepeatedPeriod.php index 4f67889c2..f5bf9bafc 100644 --- a/core/lib/Thelia/Coupon/Rule/AvailableForRepeatedPeriod.php +++ b/core/lib/Thelia/Constraint/Rule/AvailableForRepeatedPeriod.php @@ -21,7 +21,7 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Rule; +namespace Thelia\Constraint\Rule; use Thelia\Coupon\CouponAdapterInterface; @@ -30,7 +30,7 @@ use Thelia\Coupon\CouponAdapterInterface; * Date: 8/19/13 * Time: 3:24 PM * - * @package Coupon + * @package Constraint * @author Guillaume MOREL * */ diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmount.php b/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmount.php similarity index 84% rename from core/lib/Thelia/Coupon/Rule/AvailableForTotalAmount.php rename to core/lib/Thelia/Constraint/Rule/AvailableForTotalAmount.php index aa1e40339..704df073e 100644 --- a/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmount.php +++ b/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmount.php @@ -21,12 +21,12 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Rule; +namespace Thelia\Constraint\Rule; use Symfony\Component\Intl\Exception\NotImplementedException; use Thelia\Coupon\CouponAdapterInterface; -use Thelia\Coupon\Validator\PriceParam; -use Thelia\Coupon\Validator\RuleValidator; +use Thelia\Constraint\Validator\PriceParam; +use Thelia\Constraint\Validator\RuleValidator; use Thelia\Exception\InvalidRuleException; use Thelia\Exception\InvalidRuleOperatorException; use Thelia\Exception\InvalidRuleValueException; @@ -39,7 +39,7 @@ use Thelia\Exception\InvalidRuleValueException; * Rule AvailableForTotalAmount * Check if a Checkout total amount match criteria * - * @package Coupon + * @package Constraint * @author Guillaume MOREL * */ @@ -182,5 +182,42 @@ class AvailableForTotalAmount extends CouponRuleAbstract return $this->validators; } + /** + * Get I18n name + * + * @return string + */ + public function getName() + { + return $this->adapter + ->getTranslator() + ->trans('Cart total amount', null, 'constraint'); + } + + /** + * Get I18n tooltip + * + * @return string + */ + public function getToolTip() + { + $i18nOperator = Operators::getI18n( + $this->adapter, $this->priceValidator->getOperator() + ); + + $toolTip = $this->adapter + ->getTranslator() + ->trans( + 'If cart total amount is %operator% %amount% %currency%', + array( + '%operator%' => $i18nOperator, + '%amount%' => $this->priceValidator->getParam()->getPrice(), + '%currency%' => $this->priceValidator->getParam()->getCurrency() + ), + 'constraint' + ); + + return $toolTip; + } } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmountForCategoryY.php b/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmountForCategoryY.php similarity index 97% rename from core/lib/Thelia/Coupon/Rule/AvailableForTotalAmountForCategoryY.php rename to core/lib/Thelia/Constraint/Rule/AvailableForTotalAmountForCategoryY.php index 6493da92a..0f9f7f10b 100644 --- a/core/lib/Thelia/Coupon/Rule/AvailableForTotalAmountForCategoryY.php +++ b/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmountForCategoryY.php @@ -21,14 +21,14 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Rule; +namespace Thelia\Constraint\Rule; /** * Created by JetBrains PhpStorm. * Date: 8/19/13 * Time: 3:24 PM * - * @package Coupon + * @package Constraint * @author Guillaume MOREL * */ diff --git a/core/lib/Thelia/Coupon/Rule/AvailableForXArticles.php b/core/lib/Thelia/Constraint/Rule/AvailableForXArticles.php similarity index 97% rename from core/lib/Thelia/Coupon/Rule/AvailableForXArticles.php rename to core/lib/Thelia/Constraint/Rule/AvailableForXArticles.php index 7a898205c..b38a53ce4 100644 --- a/core/lib/Thelia/Coupon/Rule/AvailableForXArticles.php +++ b/core/lib/Thelia/Constraint/Rule/AvailableForXArticles.php @@ -21,7 +21,7 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Rule; +namespace Thelia\Constraint\Rule; /** * Created by JetBrains PhpStorm. @@ -30,7 +30,7 @@ namespace Thelia\Coupon\Rule; * * Check a Checkout against its Product number * - * @package Coupon + * @package Constraint * @author Guillaume MOREL * */ diff --git a/core/lib/Thelia/Coupon/Rule/CouponRuleAbstract.php b/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php similarity index 97% rename from core/lib/Thelia/Coupon/Rule/CouponRuleAbstract.php rename to core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php index 7d0b741bb..9fbcc21fc 100644 --- a/core/lib/Thelia/Coupon/Rule/CouponRuleAbstract.php +++ b/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php @@ -21,12 +21,12 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Rule; +namespace Thelia\Constraint\Rule; use Symfony\Component\Intl\Exception\NotImplementedException; use Thelia\Coupon\CouponAdapterInterface; -use Thelia\Coupon\Validator\ComparableInterface; -use Thelia\Coupon\Validator\RuleValidator; +use Thelia\Constraint\Validator\ComparableInterface; +use Thelia\Constraint\Validator\RuleValidator; use Thelia\Exception\InvalidRuleException; use Thelia\Exception\InvalidRuleOperatorException; @@ -37,7 +37,7 @@ use Thelia\Exception\InvalidRuleOperatorException; * * Assist in writing a condition of whether the Rule is applied or not * - * @package Coupon + * @package Constraint * @author Guillaume MOREL * */ diff --git a/core/lib/Thelia/Coupon/Rule/CouponRuleInterface.php b/core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php similarity index 91% rename from core/lib/Thelia/Coupon/Rule/CouponRuleInterface.php rename to core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php index 6aaca802c..9e75c7fe1 100644 --- a/core/lib/Thelia/Coupon/Rule/CouponRuleInterface.php +++ b/core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php @@ -21,7 +21,7 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Rule; +namespace Thelia\Constraint\Rule; use Thelia\Coupon\CouponAdapterInterface; @@ -32,7 +32,7 @@ use Thelia\Coupon\CouponAdapterInterface; * * Represents a condition of whether the Rule is applied or not * - * @package Coupon + * @package Constraint * @author Guillaume MOREL * */ @@ -69,4 +69,19 @@ interface CouponRuleInterface */ public function getAvailableOperators(); + + /** + * Get I18n name + * + * @return string + */ + public function getName(); + + /** + * Get I18n tooltip + * + * @return string + */ + public function getToolTip(); + } diff --git a/core/lib/Thelia/Coupon/Rule/Operators.php b/core/lib/Thelia/Constraint/Rule/Operators.php similarity index 69% rename from core/lib/Thelia/Coupon/Rule/Operators.php rename to core/lib/Thelia/Constraint/Rule/Operators.php index fb188c3cd..41ed7428c 100644 --- a/core/lib/Thelia/Coupon/Rule/Operators.php +++ b/core/lib/Thelia/Constraint/Rule/Operators.php @@ -21,9 +21,9 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Rule; +namespace Thelia\Constraint\Rule; -use Thelia\Coupon\Validator\ComparableInterface; +use Thelia\Constraint\Validator\ComparableInterface; /** * Created by JetBrains PhpStorm. @@ -32,7 +32,7 @@ use Thelia\Coupon\Validator\ComparableInterface; * * Represent available Operations in rule checking * - * @package Coupon + * @package Constraint * @author Guillaume MOREL * */ @@ -106,4 +106,66 @@ abstract class Operators return $ret; } + + /** + * Get operator translation + * + * @param CouponAdapterInterface $adapter Provide necessary value from Thelia + * @param string $operator Operator const + * + * @return string + */ + public static function getI18n(CouponAdapterInterface $adapter, $operator) + { + $translator = $adapter->getTranslator(); + + $ret = $operator; + switch ($operator) { + case self::INFERIOR: + $ret = $translator->trans( + 'inferior to', + null, + 'constraint' + ); + break; + case self::INFERIOR_OR_EQUAL: + $ret = $translator->trans( + 'inferior or equals to', + null, + 'constraint' + ); + break; + case self::EQUAL: + $ret = $translator->trans( + 'equals to', + null, + 'constraint' + ); + break; + case self::SUPERIOR_OR_EQUAL: + $ret = $translator->trans( + 'superior or equals to', + null, + 'constraint' + ); + break; + case self::SUPERIOR: + $ret = $translator->trans( + 'superior to', + null, + 'constraint' + ); + break; + case self::DIFFERENT: + $ret = $translator->trans( + 'different from', + null, + 'constraint' + ); + break; + default: + } + + return $ret; + } } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Validator/ComparableInterface.php b/core/lib/Thelia/Constraint/Validator/ComparableInterface.php similarity index 98% rename from core/lib/Thelia/Coupon/Validator/ComparableInterface.php rename to core/lib/Thelia/Constraint/Validator/ComparableInterface.php index 3b70c5e37..d06187fb0 100644 --- a/core/lib/Thelia/Coupon/Validator/ComparableInterface.php +++ b/core/lib/Thelia/Constraint/Validator/ComparableInterface.php @@ -21,7 +21,7 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Validator; +namespace Thelia\Constraint\Validator; /** * Comparable interface diff --git a/core/lib/Thelia/Coupon/Validator/DateParam.php b/core/lib/Thelia/Constraint/Validator/DateParam.php similarity index 84% rename from core/lib/Thelia/Coupon/Validator/DateParam.php rename to core/lib/Thelia/Constraint/Validator/DateParam.php index 062c750e5..ae7eff858 100644 --- a/core/lib/Thelia/Coupon/Validator/DateParam.php +++ b/core/lib/Thelia/Constraint/Validator/DateParam.php @@ -21,7 +21,9 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Validator; +namespace Thelia\Constraint\Validator; + +use Thelia\Coupon\CouponAdapterInterface; /** * Created by JetBrains PhpStorm. @@ -30,7 +32,7 @@ namespace Thelia\Coupon\Validator; * * Represent a DateTime * - * @package Coupon + * @package Constraint * @author Guillaume MOREL * */ @@ -42,11 +44,13 @@ class DateParam extends RuleParameterAbstract /** * Constructor * - * @param \DateTime $dateTime DateTime + * @param CouponAdapterInterface $adapter Provide necessary value from Thelia + * @param \DateTime $dateTime DateTime */ - public function __construct(\DateTime $dateTime) + public function __construct(CouponAdapterInterface $adapter, \DateTime $dateTime) { $this->dateTime = $dateTime; + $this->adapter = $adapter; } /** @@ -101,5 +105,16 @@ class DateParam extends RuleParameterAbstract return clone $this->dateTime; } + /** + * Get I18n tooltip + * + * @return string + */ + public function getToolTip() + { + return $this->adapter + ->getTranslator() + ->trans('A date (ex: YYYY-MM-DD HH:MM:SS)', null, 'constraint'); + } -} \ No newline at end of file +} diff --git a/core/lib/Thelia/Coupon/Validator/IntegerParam.php b/core/lib/Thelia/Constraint/Validator/IntegerParam.php similarity index 85% rename from core/lib/Thelia/Coupon/Validator/IntegerParam.php rename to core/lib/Thelia/Constraint/Validator/IntegerParam.php index 7c8303809..c783655c8 100644 --- a/core/lib/Thelia/Coupon/Validator/IntegerParam.php +++ b/core/lib/Thelia/Constraint/Validator/IntegerParam.php @@ -21,7 +21,9 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Validator; +namespace Thelia\Constraint\Validator; + +use Thelia\Coupon\CouponAdapterInterface; /** * Created by JetBrains PhpStorm. @@ -30,7 +32,7 @@ namespace Thelia\Coupon\Validator; * * Represent an Integer * - * @package Coupon + * @package Constraint * @author Guillaume MOREL * */ @@ -42,11 +44,13 @@ class IntegerParam extends RuleParameterAbstract /** * Constructor * - * @param int $integer Integer + * @param CouponAdapterInterface $adapter Provide necessary value from Thelia + * @param int $integer Integer */ - public function __construct($integer) + public function __construct(CouponAdapterInterface $adapter, $integer) { $this->integer = $integer; + $this->adapter = $adapter; } /** @@ -102,4 +106,16 @@ class IntegerParam extends RuleParameterAbstract return $this->integer; } + /** + * Get I18n tooltip + * + * @return string + */ + public function getToolTip() + { + return $this->adapter + ->getTranslator() + ->trans('A number (ex: 42)', null, 'constraint'); + } + } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Validator/IntervalParam.php b/core/lib/Thelia/Constraint/Validator/IntervalParam.php similarity index 76% rename from core/lib/Thelia/Coupon/Validator/IntervalParam.php rename to core/lib/Thelia/Constraint/Validator/IntervalParam.php index 1b310c9d1..a4554760a 100644 --- a/core/lib/Thelia/Coupon/Validator/IntervalParam.php +++ b/core/lib/Thelia/Constraint/Validator/IntervalParam.php @@ -21,7 +21,9 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Validator; +namespace Thelia\Constraint\Validator; + +use Thelia\Coupon\CouponAdapterInterface; /** * Created by JetBrains PhpStorm. @@ -30,7 +32,7 @@ namespace Thelia\Coupon\Validator; * * Represent an DateTime period * - * @package Coupon + * @package Constraint * @author Guillaume MOREL * */ @@ -39,17 +41,50 @@ class IntervalParam extends RuleParameterAbstract /** @var \DatePeriod Date period */ protected $datePeriod = null; + /** @var \DateTime Start date */ + protected $start = null; + + /** @var \DateInterval Interval date */ + protected $interval = null; + /** * Constructor * - * @param \DateTime $start Start interval - * @param \DateInterval $interval Period + * @param CouponAdapterInterface $adapter Provide necessary value from Thelia + * @param \DateTime $start Start interval + * @param \DateInterval $interval Period */ - public function __construct(\DateTime $start, \DateInterval $interval) + public function __construct(CouponAdapterInterface $adapter, \DateTime $start, \DateInterval $interval) { $this->datePeriod = new \DatePeriod($start, $interval, 1); + $this->adapter = $adapter; + + $this->start = $start; + $this->interval = $interval; } + /** + * Get Interval + * + * @return \DateInterval + */ + public function getInterval() + { + return $this->interval; + } + + /** + * Get start date + * + * @return \DateTime + */ + public function getStart() + { + return $this->start; + } + + + /** * Get DatePeriod * @@ -115,4 +150,16 @@ class IntervalParam extends RuleParameterAbstract { return clone $this->datePeriod; } + + /** + * Get I18n tooltip + * + * @return string + */ + public function getToolTip() + { + return $this->adapter + ->getTranslator() + ->trans('An interval between two dates', null, 'constraint'); + } } \ No newline at end of file diff --git a/core/lib/Thelia/Constraint/Validator/ModelParam.php b/core/lib/Thelia/Constraint/Validator/ModelParam.php new file mode 100644 index 000000000..7ff4567b8 --- /dev/null +++ b/core/lib/Thelia/Constraint/Validator/ModelParam.php @@ -0,0 +1,115 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Constraint\Validator; + +use InvalidArgumentException; +use Thelia\Coupon\CouponAdapterInterface; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Represent a Model + * + * @package Constraint + * @author Guillaume MOREL + * + */ +class ModelParam extends IntegerParam +{ + /** @var string Model Class name */ + protected $modelClass = null; + + /** @var ModelCriteria */ + protected $queryBuilder = null; + + /** + * Constructor + * + * @param CouponAdapterInterface $adapter Provide necessary value from Thelia + * @param int $integer Integer + * @param string $modelClass Model class name + * + * @throws InvalidArgumentException + */ + public function __construct(CouponAdapterInterface $adapter, $integer, $modelClass) + { + if ($integer < 0) { + $integer = 0; + } + $this->integer = $integer; + $this->adapter = $adapter; + + $this->modelClass = $modelClass; + $queryClassName = $modelClass . 'Query'; + try { + $this->queryBuilder = $queryClassName::create(); + } catch (\Exception $e) { + throw new InvalidArgumentException('ModelParam can only compare Models'); + } + } + + /** + * Compare the current object to the passed $other. + * + * Returns 0 if they are semantically equal, 1 if the other object + * is less than the current one, or -1 if its more than the current one. + * + * This method should not check for identity using ===, only for semantically equality for example + * when two different DateTime instances point to the exact same Date + TZ. + * + * @param mixed $other Object + * + * @throws InvalidArgumentException + * @return int + */ + public function compareTo($other) + { + if (!is_integer($other) || $other < 0) { + throw new InvalidArgumentException( + 'IntegerParam can compare only positive int' + ); + } + + return parent::compareTo($other); + } + + /** + * Get I18n tooltip + * + * @return string + */ + public function getToolTip() + { + return $this->adapter + ->getTranslator() + ->trans( + 'A Model', + null, + 'constraint' + ); + } + +} diff --git a/core/lib/Thelia/Coupon/Validator/PriceParam.php b/core/lib/Thelia/Constraint/Validator/PriceParam.php similarity index 81% rename from core/lib/Thelia/Coupon/Validator/PriceParam.php rename to core/lib/Thelia/Constraint/Validator/PriceParam.php index 44eae3234..90538a73e 100644 --- a/core/lib/Thelia/Coupon/Validator/PriceParam.php +++ b/core/lib/Thelia/Constraint/Validator/PriceParam.php @@ -21,7 +21,9 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Validator; +namespace Thelia\Constraint\Validator; + +use Thelia\Coupon\CouponAdapterInterface; /** * Created by JetBrains PhpStorm. @@ -31,7 +33,7 @@ namespace Thelia\Coupon\Validator; * Represent a Price * Positive value with currency * - * @package Coupon + * @package Constraint * @author Guillaume MOREL * */ @@ -46,13 +48,15 @@ class PriceParam extends RuleParameterAbstract /** * Constructor * - * @param float $price Positive float - * @param string $currency Currency Code ISO 4217 EUR|USD|GBP + * @param CouponAdapterInterface $adapter Provide necessary value from Thelia + * @param float $price Positive float + * @param string $currency Currency Code ISO 4217 EUR|USD|GBP */ - public function __construct($price, $currency) + public function __construct(CouponAdapterInterface $adapter, $price, $currency) { $this->price = $price; $this->currency = $currency; + $this->adapter = $adapter; } /** @@ -120,4 +124,22 @@ class PriceParam extends RuleParameterAbstract { return $this->price; } + + /** + * Get I18n tooltip + * + * @return string + */ + public function getToolTip() + { + return $this->adapter + ->getTranslator() + ->trans( + 'A price in %currency% (ex: 14.50)', + array( + '%currency%' => $this->currency + ), + 'constraint' + ); + } } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Validator/QuantityParam.php b/core/lib/Thelia/Constraint/Validator/QuantityParam.php similarity index 81% rename from core/lib/Thelia/Coupon/Validator/QuantityParam.php rename to core/lib/Thelia/Constraint/Validator/QuantityParam.php index dc842605f..5d5132e5b 100644 --- a/core/lib/Thelia/Coupon/Validator/QuantityParam.php +++ b/core/lib/Thelia/Constraint/Validator/QuantityParam.php @@ -21,7 +21,9 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Validator; +namespace Thelia\Constraint\Validator; + +use Thelia\Coupon\CouponAdapterInterface; /** * Created by JetBrains PhpStorm. @@ -30,7 +32,7 @@ namespace Thelia\Coupon\Validator; * * Represent a Quantity * - * @package Coupon + * @package Constraint * @author Guillaume MOREL * */ @@ -40,14 +42,16 @@ class QuantityParam extends IntegerParam /** * Constructor * - * @param int $integer Integer + * @param CouponAdapterInterface $adapter Provide necessary value from Thelia + * @param int $integer Integer */ - public function __construct($integer) + public function __construct(CouponAdapterInterface $adapter, $integer) { if ($integer < 0) { $integer = 0; } $this->integer = $integer; + $this->adapter = $adapter; } /** @@ -75,4 +79,21 @@ class QuantityParam extends IntegerParam return parent::compareTo($other); } + + /** + * Get I18n tooltip + * + * @return string + */ + public function getToolTip() + { + return $this->adapter + ->getTranslator() + ->trans( + 'A positive quantity (ex: 42)', + null, + 'constraint' + ); + } + } diff --git a/core/lib/Thelia/Coupon/Validator/RepeatedDateParam.php b/core/lib/Thelia/Constraint/Validator/RepeatedDateParam.php similarity index 87% rename from core/lib/Thelia/Coupon/Validator/RepeatedDateParam.php rename to core/lib/Thelia/Constraint/Validator/RepeatedDateParam.php index f0524edc7..0e8a558cf 100644 --- a/core/lib/Thelia/Coupon/Validator/RepeatedDateParam.php +++ b/core/lib/Thelia/Constraint/Validator/RepeatedDateParam.php @@ -21,7 +21,9 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Validator; +namespace Thelia\Constraint\Validator; + +use Thelia\Coupon\CouponAdapterInterface; /** * Created by JetBrains PhpStorm. @@ -38,7 +40,7 @@ namespace Thelia\Coupon\Validator; * x5 : $this->recurrences How many repeated cycle, 1st excluded * x6 : How many occurrence * - * @package Coupon + * @package Constraint * @author Guillaume MOREL * */ @@ -46,10 +48,13 @@ class RepeatedDateParam extends RepeatedParam { /** * Constructor + * + * @param CouponAdapterInterface $adapter Provide necessary value from Thelia */ - public function __construct() + public function __construct(CouponAdapterInterface $adapter) { $this->defaultConstructor(); + $this->adapter = $adapter; } /** @@ -97,4 +102,16 @@ class RepeatedDateParam extends RepeatedParam { return clone $this->datePeriod; } + + /** + * Get I18n tooltip + * + * @return string + */ + public function getToolTip() + { + return $this->adapter + ->getTranslator() + ->trans('A date (ex: YYYY-MM-DD HH:MM:SS)', null, 'constraint'); + } } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Validator/RepeatedIntervalParam.php b/core/lib/Thelia/Constraint/Validator/RepeatedIntervalParam.php similarity index 89% rename from core/lib/Thelia/Coupon/Validator/RepeatedIntervalParam.php rename to core/lib/Thelia/Constraint/Validator/RepeatedIntervalParam.php index 9f61f4db1..e37cd3b45 100644 --- a/core/lib/Thelia/Coupon/Validator/RepeatedIntervalParam.php +++ b/core/lib/Thelia/Constraint/Validator/RepeatedIntervalParam.php @@ -21,7 +21,9 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Validator; +namespace Thelia\Constraint\Validator; + +use Thelia\Coupon\CouponAdapterInterface; /** * Created by JetBrains PhpStorm. @@ -39,7 +41,7 @@ namespace Thelia\Coupon\Validator; * x6 : How many occurrence * **** : $this->durationInDays Duration of a period * - * @package Coupon + * @package Constraint * @author Guillaume MOREL * */ @@ -75,10 +77,13 @@ class RepeatedIntervalParam extends RepeatedParam /** * Constructor + * + * @param CouponAdapterInterface $adapter Provide necessary value from Thelia */ - public function __construct() + public function __construct(CouponAdapterInterface $adapter) { $this->defaultConstructor(); + $this->adapter = $adapter; } /** @@ -131,4 +136,16 @@ class RepeatedIntervalParam extends RepeatedParam { return clone $this->datePeriod; } + + /** + * Get I18n tooltip + * + * @return string + */ + public function getToolTip() + { + return $this->adapter + ->getTranslator() + ->trans('A date (ex: YYYY-MM-DD HH:MM:SS)', null, 'constraint'); + } } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Validator/RepeatedParam.php b/core/lib/Thelia/Constraint/Validator/RepeatedParam.php similarity index 89% rename from core/lib/Thelia/Coupon/Validator/RepeatedParam.php rename to core/lib/Thelia/Constraint/Validator/RepeatedParam.php index 675228456..1188e4fbb 100644 --- a/core/lib/Thelia/Coupon/Validator/RepeatedParam.php +++ b/core/lib/Thelia/Constraint/Validator/RepeatedParam.php @@ -21,7 +21,7 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Validator; +namespace Thelia\Constraint\Validator; use DateInterval; use DatePeriod; @@ -34,7 +34,7 @@ use DateTime; * * Allow to set the way a parameter can be repeated across the time * - * @package Coupon + * @package Constraint * @author Guillaume MOREL * */ @@ -52,6 +52,52 @@ abstract class RepeatedParam extends RuleParameterAbstract /** @var DatePeriod dates recurring at regular intervals, over a given period */ protected $datePeriod = null; + /** @var int Frequency the object will be repeated */ + protected $frequency = null; + + /** @var int $nbRepetition Time the object will be repeated */ + protected $nbRepetition = null; + + /** + * Get frequency + * + * @return int + */ + public function getFrequency() + { + return $this->frequency; + } + + /** + * Get Interval + * + * @return \DateInterval + */ + public function getInterval() + { + return $this->interval; + } + + /** + * Get number of time it will be repeated + * + * @return int + */ + public function getNbRepetition() + { + return $this->nbRepetition; + } + + /** + * Get number of recurrences + * + * @return int + */ + public function getRecurrences() + { + return $this->recurrences; + } + /** * Generate default repetition * Every 1 week 100 times from now diff --git a/core/lib/Thelia/Coupon/Validator/RuleParameterAbstract.php b/core/lib/Thelia/Constraint/Validator/RuleParameterAbstract.php similarity index 85% rename from core/lib/Thelia/Coupon/Validator/RuleParameterAbstract.php rename to core/lib/Thelia/Constraint/Validator/RuleParameterAbstract.php index 3e96682cd..d8326d66f 100644 --- a/core/lib/Thelia/Coupon/Validator/RuleParameterAbstract.php +++ b/core/lib/Thelia/Constraint/Validator/RuleParameterAbstract.php @@ -21,8 +21,9 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Validator; +namespace Thelia\Constraint\Validator; +use Thelia\Coupon\CouponAdapterInterface; use Thelia\Exception\NotImplementedException; /** @@ -32,12 +33,15 @@ use Thelia\Exception\NotImplementedException; * * Get a Param value * - * @package Coupon + * @package Constraint * @author Guillaume MOREL * */ abstract class RuleParameterAbstract implements ComparableInterface { + /** @var CouponAdapterInterface Provide necessary value from Thelia*/ + protected $adapter; + /** * Get Parameter value to test against * @@ -47,4 +51,16 @@ abstract class RuleParameterAbstract implements ComparableInterface { return new NotImplementedException(); } + + /** + * Get I18n tooltip + * + * @return string + */ + public function getToolTip() + { + return new NotImplementedException(); + } + + } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/Validator/RuleValidator.php b/core/lib/Thelia/Constraint/Validator/RuleValidator.php similarity index 97% rename from core/lib/Thelia/Coupon/Validator/RuleValidator.php rename to core/lib/Thelia/Constraint/Validator/RuleValidator.php index 064677751..9b0093bc9 100644 --- a/core/lib/Thelia/Coupon/Validator/RuleValidator.php +++ b/core/lib/Thelia/Constraint/Validator/RuleValidator.php @@ -21,7 +21,7 @@ /* */ /**********************************************************************************/ -namespace Thelia\Coupon\Validator; +namespace Thelia\Constraint\Validator; /** * Created by JetBrains PhpStorm. @@ -30,7 +30,7 @@ namespace Thelia\Coupon\Validator; * * Allow to validate parameters * - * @package Coupon + * @package Constraint * @author Guillaume MOREL * */ diff --git a/core/lib/Thelia/Coupon/CouponAdapterInterface.php b/core/lib/Thelia/Coupon/CouponAdapterInterface.php index 21ff870f6..4325da3ae 100644 --- a/core/lib/Thelia/Coupon/CouponAdapterInterface.php +++ b/core/lib/Thelia/Coupon/CouponAdapterInterface.php @@ -131,4 +131,12 @@ interface CouponAdapterInterface */ public function getTranslator(); + /** + * Return the main currency + * THe one used to set prices in BackOffice + * + * @return string + */ + public function getMainCurrency(); + } \ No newline at end of file diff --git a/core/lib/Thelia/Coupon/CouponBaseAdapter.php b/core/lib/Thelia/Coupon/CouponBaseAdapter.php index 3809612a7..70c9ebf94 100644 --- a/core/lib/Thelia/Coupon/CouponBaseAdapter.php +++ b/core/lib/Thelia/Coupon/CouponBaseAdapter.php @@ -179,7 +179,7 @@ class CouponBaseAdapter implements CouponAdapterInterface */ public function getContainer() { - // TODO: Implement getCheckoutPostagePrice() method. + // TODO: Implement getContainer() method. } /** @@ -191,4 +191,16 @@ class CouponBaseAdapter implements CouponAdapterInterface { return $this->getContainer()->get('thelia.translator'); } + + + /** + * Return the main currency + * THe one used to set prices in BackOffice + * + * @return string + */ + public function getMainCurrency() + { + // TODO: Implement getMainCurrency() method. + } } diff --git a/core/lib/Thelia/Coupon/CouponManager.php b/core/lib/Thelia/Coupon/CouponManager.php index b913de66d..272cb7ed7 100644 --- a/core/lib/Thelia/Coupon/CouponManager.php +++ b/core/lib/Thelia/Coupon/CouponManager.php @@ -38,7 +38,7 @@ use Thelia\Coupon\Type\CouponInterface; */ class CouponManager { - /** @var CouponAdapterInterface Provide necessary value from Thelia*/ + /** @var CouponAdapterInterface Provides necessary value from Thelia */ protected $adapter; /** @var array CouponInterface to process*/ diff --git a/core/lib/Thelia/Coupon/CouponRuleCollection.php b/core/lib/Thelia/Coupon/CouponRuleCollection.php index 06f0b15af..2f1a51dc0 100644 --- a/core/lib/Thelia/Coupon/CouponRuleCollection.php +++ b/core/lib/Thelia/Coupon/CouponRuleCollection.php @@ -24,7 +24,7 @@ namespace Thelia\Coupon; use Symfony\Component\Serializer\Encoder\JsonEncoder; -use Thelia\Coupon\Rule\CouponRuleInterface; +use Thelia\Constraint\Rule\CouponRuleInterface; use Thelia\Exception\InvalidRuleException; /** diff --git a/core/lib/Thelia/Coupon/Type/CouponAbstract.php b/core/lib/Thelia/Coupon/Type/CouponAbstract.php index 750c62e5c..a5e82c83e 100644 --- a/core/lib/Thelia/Coupon/Type/CouponAbstract.php +++ b/core/lib/Thelia/Coupon/Type/CouponAbstract.php @@ -24,8 +24,8 @@ namespace Thelia\Coupon\Type; use Symfony\Component\Intl\Exception\NotImplementedException; +use Thelia\Constraint\ConstraintManager; use Thelia\Coupon\CouponAdapterInterface; -use Thelia\Coupon\Rule\CouponRuleInterface; use Thelia\Coupon\CouponRuleCollection; use Thelia\Coupon\RuleOrganizerInterface; use Thelia\Exception\InvalidRuleException; @@ -43,12 +43,18 @@ use Thelia\Exception\InvalidRuleException; */ abstract class CouponAbstract implements CouponInterface { + /** @var CouponAdapterInterface Provides necessary value from Thelia */ + protected $adapter = null; + /** @var RuleOrganizerInterface */ protected $organizer = null; /** @var CouponRuleCollection Array of CouponRuleInterface */ protected $rules = null; + /** @var ConstraintManager CouponRuleInterface Manager*/ + protected $constraintManager = null; + /** @var string Coupon code (ex: XMAS) */ protected $code = null; @@ -194,6 +200,10 @@ abstract class CouponAbstract implements CouponInterface public function setRules(CouponRuleCollection $rules) { $this->rules = $rules; + $this->constraintManager = new ConstraintManager( + $this->adapter, + $this->rules + ); return $this; } @@ -209,16 +219,7 @@ abstract class CouponAbstract implements CouponInterface */ public function isMatching(CouponAdapterInterface $adapter) { - $isMatching = true; - - /** @var CouponRuleInterface $rule */ - foreach ($this->rules->getRules() as $rule) { - if (!$rule->isMatching($adapter)) { - $isMatching = false; - } - } - - return $isMatching; + return $this->constraintManager->isMatching(); } /** diff --git a/core/lib/Thelia/Coupon/Type/CouponInterface.php b/core/lib/Thelia/Coupon/Type/CouponInterface.php index df1a82f40..334520104 100644 --- a/core/lib/Thelia/Coupon/Type/CouponInterface.php +++ b/core/lib/Thelia/Coupon/Type/CouponInterface.php @@ -165,4 +165,18 @@ interface CouponInterface * @return bool */ public function isExpired(); + + /** + * Get I18n name + * + * @return string + */ + public function getName(); + + /** + * Get I18n tooltip + * + * @return string + */ + public function getToolTip(); } diff --git a/core/lib/Thelia/Coupon/Type/RemoveXAmount.php b/core/lib/Thelia/Coupon/Type/RemoveXAmount.php index a0d715141..672c8a856 100644 --- a/core/lib/Thelia/Coupon/Type/RemoveXAmount.php +++ b/core/lib/Thelia/Coupon/Type/RemoveXAmount.php @@ -23,6 +23,7 @@ namespace Thelia\Coupon\Type; +use Thelia\Constraint\ConstraintManager; use Thelia\Coupon\Type\CouponAbstract; /** @@ -41,20 +42,34 @@ class RemoveXAmount extends CouponAbstract /** * Constructor * - * @param string $code Coupon code (ex: XMAS) - * @param string $title Coupon title (ex: Coupon for XMAS) - * @param string $shortDescription Coupon short description - * @param string $description Coupon description - * @param float $amount Coupon amount to deduce - * @param bool $isCumulative If Coupon is cumulative - * @param bool $isRemovingPostage If Coupon is removing postage - * @param bool $isAvailableOnSpecialOffers If available on Product already - * on special offer price - * @param bool $isEnabled False if Coupon is disabled by admin - * @param int $maxUsage How many usage left - * @param \Datetime $expirationDate When the Code is expiring + * @param CouponInterface $adapter Provides necessary value from Thelia + * @param string $code Coupon code (ex: XMAS) + * @param string $title Coupon title (ex: Coupon for XMAS) + * @param string $shortDescription Coupon short description + * @param string $description Coupon description + * @param float $amount Coupon amount to deduce + * @param bool $isCumulative If Coupon is cumulative + * @param bool $isRemovingPostage If Coupon is removing postage + * @param bool $isAvailableOnSpecialOffers If available on Product already + * on special offer price + * @param bool $isEnabled False if Coupon is disabled by admin + * @param int $maxUsage How many usage left + * @param \Datetime $expirationDate When the Code is expiring */ - function __construct($code, $title, $shortDescription, $description, $amount, $isCumulative, $isRemovingPostage, $isAvailableOnSpecialOffers, $isEnabled, $maxUsage, \DateTime $expirationDate) + function __construct( + $adapter, + $code, + $title, + $shortDescription, + $description, + $amount, + $isCumulative, + $isRemovingPostage, + $isAvailableOnSpecialOffers, + $isEnabled, + $maxUsage, + \DateTime $expirationDate + ) { $this->code = $code; $this->title = $title; @@ -70,6 +85,36 @@ class RemoveXAmount extends CouponAbstract $this->isEnabled = $isEnabled; $this->maxUsage = $maxUsage; $this->expirationDate = $expirationDate; + $this->adapter = $adapter; } + /** + * Get I18n name + * + * @return string + */ + public function getName() + { + return $this->adapter + ->getTranslator() + ->trans('Remove X amount to total cart', null, 'constraint'); + } + + /** + * Get I18n tooltip + * + * @return string + */ + public function getToolTip() + { + $toolTip = $this->adapter + ->getTranslator() + ->trans( + 'This coupon will remove the entered amount to the customer total checkout. If the discount is superior to the total checkout price the customer will only pay the postage. Unless if the coupon is set to remove postage too.', + null, + 'constraint' + ); + + return $toolTip; + } } diff --git a/core/lib/Thelia/Coupon/Type/RemoveXPercent.php b/core/lib/Thelia/Coupon/Type/RemoveXPercent.php index da63a4281..5d1d14b63 100644 --- a/core/lib/Thelia/Coupon/Type/RemoveXPercent.php +++ b/core/lib/Thelia/Coupon/Type/RemoveXPercent.php @@ -43,15 +43,33 @@ class RemoveXPercent extends CouponAbstract /** * Constructor * - * @param string $code Coupon code (ex: XMAS) - * @param string $title Coupon title (ex: Coupon for XMAS) - * @param string $shortDescription Coupon short description - * @param string $description Coupon description - * @param float $percent Coupon % to deduce (ex:3.14 for 3.14%) - * @param bool $isCumulative if Coupon is cumulative - * @param bool $isRemovingPostage if Coupon is removing postage + * @param CouponInterface $adapter Provides necessary value from Thelia + * @param string $code Coupon code (ex: XMAS) + * @param string $title Coupon title (ex: Coupon for XMAS) + * @param string $shortDescription Coupon short description + * @param string $description Coupon description + * @param float $percent Coupon percentage to deduce + * @param bool $isCumulative If Coupon is cumulative + * @param bool $isRemovingPostage If Coupon is removing postage + * @param bool $isAvailableOnSpecialOffers If available on Product already + * on special offer price + * @param bool $isEnabled False if Coupon is disabled by admin + * @param int $maxUsage How many usage left + * @param \Datetime $expirationDate When the Code is expiring */ - function __construct($code, $title, $shortDescription, $description, $percent, $isCumulative, $isRemovingPostage) + function __construct( + $adapter, + $code, + $title, + $shortDescription, + $description, + $percent, + $isCumulative, + $isRemovingPostage, + $isAvailableOnSpecialOffers, + $isEnabled, + $maxUsage, + \DateTime $expirationDate) { $this->code = $code; $this->title = $title; @@ -62,6 +80,12 @@ class RemoveXPercent extends CouponAbstract $this->isRemovingPostage = $isRemovingPostage; $this->percent = $percent; + + $this->isAvailableOnSpecialOffers = $isAvailableOnSpecialOffers; + $this->isEnabled = $isEnabled; + $this->maxUsage = $maxUsage; + $this->expirationDate = $expirationDate; + $this->adapter = $adapter; } /** @@ -83,10 +107,40 @@ class RemoveXPercent extends CouponAbstract ); } - $basePrice =$adapter - ->getCartTotalPrice(); + $basePrice = $adapter->getCartTotalPrice(); - return $basePrice * (( 100 - $this->percent ) / 100); + return $basePrice * (( $this->percent ) / 100); + } + + + /** + * Get I18n name + * + * @return string + */ + public function getName() + { + return $this->adapter + ->getTranslator() + ->trans('Remove X percent to total cart', null, 'constraint'); + } + + /** + * Get I18n tooltip + * + * @return string + */ + public function getToolTip() + { + $toolTip = $this->adapter + ->getTranslator() + ->trans( + 'This coupon will remove the entered percentage to the customer total checkout. If the discount is superior to the total checkout price the customer will only pay the postage. Unless if the coupon is set to remove postage too.', + null, + 'constraint' + ); + + return $toolTip; } } \ No newline at end of file diff --git a/core/lib/Thelia/Tests/Constraint/ConstraintManagerTest.php b/core/lib/Thelia/Tests/Constraint/ConstraintManagerTest.php new file mode 100644 index 000000000..770746ba1 --- /dev/null +++ b/core/lib/Thelia/Tests/Constraint/ConstraintManagerTest.php @@ -0,0 +1,142 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Constraint; + +use Thelia\Constraint\Validator\PriceParam; +use Thelia\Constraint\Validator\RuleValidator; +use Thelia\Constraint\Rule\AvailableForTotalAmount; +use Thelia\Constraint\Rule\Operators; +use Thelia\Coupon\CouponRuleCollection; +use Thelia\Coupon\Type\CouponInterface; +use Thelia\Coupon\Type\RemoveXAmount; +use Thelia\Tools\PhpUnitUtils; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Unit Test ConstraintManager Class + * + * @package Constraint + * @author Guillaume MOREL + * + */ +class ConstraintManagerTest 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 valid CouponRuleInterfaces + * + * @return array Array of CouponRuleInterface + */ + public static function generateValidRules() + { + $rule1 = new AvailableForTotalAmount( + array( + AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( + Operators::SUPERIOR, + new PriceParam( + , 40.00, 'EUR' + ) + ) + ) + ); + $rule2 = new AvailableForTotalAmount( + array( + AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( + Operators::INFERIOR, + new PriceParam( + , 400.00, 'EUR' + ) + ) + ) + ); + $rules = new CouponRuleCollection(array($rule1, $rule2)); + + return $rules; + } + + /** + * Tears down the fixture, for example, closes a network connection. + * This method is called after a test is executed. + */ + protected function tearDown() + { + } + + /** + * Generate a fake Adapter + * + * @param array $coupons Coupons + * @param float $cartTotalPrice Cart total price + * @param float $checkoutTotalPrice Checkout total price + * @param float $postagePrice Checkout postage price + * + * @return \PHPUnit_Framework_MockObject_MockObject + */ + public function generateFakeAdapter(array $coupons, $cartTotalPrice, $checkoutTotalPrice, $postagePrice = 6.00) + { + $stubCouponBaseAdapter = $this->getMock( + 'Thelia\Coupon\CouponBaseAdapter', + array( + 'getCurrentCoupons', + 'getCartTotalPrice', + 'getCheckoutTotalPrice', + 'getCheckoutPostagePrice' + ), + array() + ); + + $stubCouponBaseAdapter->expects($this->any()) + ->method('getCurrentCoupons') + ->will($this->returnValue(($coupons))); + + // Return Cart product amount = $cartTotalPrice euros + $stubCouponBaseAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue($cartTotalPrice)); + + // Return Checkout amount = $checkoutTotalPrice euros + $stubCouponBaseAdapter->expects($this->any()) + ->method('getCheckoutTotalPrice') + ->will($this->returnValue($checkoutTotalPrice)); + + $stubCouponBaseAdapter->expects($this->any()) + ->method('getCheckoutPostagePrice') + ->will($this->returnValue($postagePrice)); + + return $stubCouponBaseAdapter; + } +} diff --git a/core/lib/Thelia/Tests/Coupon/Rule/AvailableForTotalAmountTest.php b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForTotalAmountTest.php similarity index 94% rename from core/lib/Thelia/Tests/Coupon/Rule/AvailableForTotalAmountTest.php rename to core/lib/Thelia/Tests/Constraint/Rule/AvailableForTotalAmountTest.php index 63d78615f..05e507863 100644 --- a/core/lib/Thelia/Tests/Coupon/Rule/AvailableForTotalAmountTest.php +++ b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForTotalAmountTest.php @@ -23,10 +23,10 @@ namespace Thelia\Coupon; -use Thelia\Coupon\Validator\PriceParam; -use Thelia\Coupon\Validator\RuleValidator; -use Thelia\Coupon\Rule\AvailableForTotalAmount; -use Thelia\Coupon\Rule\Operators; +use Thelia\Constraint\Validator\PriceParam; +use Thelia\Constraint\Validator\RuleValidator; +use Thelia\Constraint\Rule\AvailableForTotalAmount; +use Thelia\Constraint\Rule\Operators; use Thelia\Exception\InvalidRuleOperatorException; use Thelia\Exception\InvalidRuleValueException; @@ -37,7 +37,7 @@ use Thelia\Exception\InvalidRuleValueException; * * Unit Test AvailableForTotalAmount Class * - * @package Coupon + * @package Constraint * @author Guillaume MOREL * */ @@ -86,8 +86,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::SUPERIOR, new PriceParam( - 421.23, - 'EUR' + , 421.23, 'EUR' ) ) ); @@ -116,8 +115,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( 'X', new PriceParam( - 421.23, - 'EUR' + , 421.23, 'EUR' ) ) ); @@ -176,8 +174,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::SUPERIOR, new PriceParam( - 421.23, - 'EUR' + , 421.23, 'EUR' ) ) ); @@ -204,8 +201,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::SUPERIOR, new PriceParam( - 421.23, - 'EUR' + , 421.23, 'EUR' ) ) ); @@ -232,8 +228,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::SUPERIOR, new PriceParam( - 421.23, - 'EUR' + , 421.23, 'EUR' ) ) ); @@ -259,8 +254,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::INFERIOR, new PriceParam( - 421.23, - 'EUR' + , 421.23, 'EUR' ) ) ); @@ -286,8 +280,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::INFERIOR, new PriceParam( - 421.23, - 'EUR' + , 421.23, 'EUR' ) ) ); @@ -316,8 +309,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::EQUAL, new PriceParam( - 421.23, - 'EUR' + , 421.23, 'EUR' ) ) ); @@ -343,8 +335,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::EQUAL, new PriceParam( - 421.23, - 'EUR' + , 421.23, 'EUR' ) ) ); @@ -370,8 +361,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::SUPERIOR, new PriceParam( - 421.23, - 'EUR' + , 421.23, 'EUR' ) ) ); @@ -397,8 +387,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::SUPERIOR, new PriceParam( - 421.23, - 'EUR' + , 421.23, 'EUR' ) ) ); diff --git a/core/lib/Thelia/Tests/Coupon/Rule/AvailableForXArticlesTest.php b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php similarity index 99% rename from core/lib/Thelia/Tests/Coupon/Rule/AvailableForXArticlesTest.php rename to core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php index 3579eacf3..69bfd13a6 100644 --- a/core/lib/Thelia/Tests/Coupon/Rule/AvailableForXArticlesTest.php +++ b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php @@ -23,7 +23,7 @@ namespace Thelia\Coupon; -use Thelia\Coupon\Rule\AvailableForXArticles; +use Thelia\Constraint\Rule\AvailableForXArticles; /** * Created by JetBrains PhpStorm. @@ -32,7 +32,7 @@ use Thelia\Coupon\Rule\AvailableForXArticles; * * Unit Test AvailableForXArticles Class * - * @package Coupon + * @package Constraint * @author Guillaume MOREL * */ diff --git a/core/lib/Thelia/Tests/Coupon/Rule/OperatorsTest.php b/core/lib/Thelia/Tests/Constraint/Rule/OperatorsTest.php similarity index 92% rename from core/lib/Thelia/Tests/Coupon/Rule/OperatorsTest.php rename to core/lib/Thelia/Tests/Constraint/Rule/OperatorsTest.php index 22a83dc8b..51d5d06f1 100644 --- a/core/lib/Thelia/Tests/Coupon/Rule/OperatorsTest.php +++ b/core/lib/Thelia/Tests/Constraint/Rule/OperatorsTest.php @@ -23,8 +23,8 @@ namespace Thelia\Coupon; -use Thelia\Coupon\Validator\QuantityParam; -use Thelia\Coupon\Rule\Operators; +use Thelia\Constraint\Validator\QuantityParam; +use Thelia\Constraint\Rule\Operators; /** * Created by JetBrains PhpStorm. @@ -33,7 +33,7 @@ use Thelia\Coupon\Rule\Operators; * * Unit Test Operators Class * - * @package Coupon + * @package Constraint * @author Guillaume MOREL * */ @@ -58,7 +58,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase // Given $a = 11; $operator = Operators::INFERIOR; - $b = new QuantityParam(12); + $b = new QuantityParam(, 12); // When $actual = Operators::isValid($a, $operator, $b); @@ -77,7 +77,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase // Given $a = 12; $operator = Operators::INFERIOR; - $b = new QuantityParam(12); + $b = new QuantityParam(, 12); // When $actual = Operators::isValid($a, $operator, $b); @@ -96,7 +96,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase // Given $a = 13; $operator = Operators::INFERIOR; - $b = new QuantityParam(12); + $b = new QuantityParam(, 12); // When $actual = Operators::isValid($a, $operator, $b); @@ -115,7 +115,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase // Given $a = 11; $operator = Operators::INFERIOR_OR_EQUAL; - $b = new QuantityParam(11); + $b = new QuantityParam(, 11); // When $actual = Operators::isValid($a, $operator, $b); @@ -134,7 +134,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase // Given $a = 10; $operator = Operators::INFERIOR_OR_EQUAL; - $b = new QuantityParam(11); + $b = new QuantityParam(, 11); // When $actual = Operators::isValid($a, $operator, $b); @@ -153,7 +153,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase // Given $a = 12; $operator = Operators::INFERIOR_OR_EQUAL; - $b = new QuantityParam(11); + $b = new QuantityParam(, 11); // When $actual = Operators::isValid($a, $operator, $b); @@ -172,7 +172,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase // Given $a = 12; $operator = Operators::EQUAL; - $b = new QuantityParam(12); + $b = new QuantityParam(, 12); // When $actual = Operators::isValid($a, $operator, $b); @@ -191,7 +191,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase // Given $a = 11; $operator = Operators::EQUAL; - $b = new QuantityParam(12); + $b = new QuantityParam(, 12); // When $actual = Operators::isValid($a, $operator, $b); @@ -210,7 +210,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase // Given $a = 13; $operator = Operators::EQUAL; - $b = new QuantityParam(12); + $b = new QuantityParam(, 12); // When $actual = Operators::isValid($a, $operator, $b); @@ -229,7 +229,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase // Given $a = 13; $operator = Operators::SUPERIOR_OR_EQUAL; - $b = new QuantityParam(13); + $b = new QuantityParam(, 13); // When $actual = Operators::isValid($a, $operator, $b); @@ -248,7 +248,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase // Given $a = 14; $operator = Operators::SUPERIOR_OR_EQUAL; - $b = new QuantityParam(13); + $b = new QuantityParam(, 13); // When $actual = Operators::isValid($a, $operator, $b); @@ -267,7 +267,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase // Given $a = 12; $operator = Operators::SUPERIOR_OR_EQUAL; - $b = new QuantityParam(13); + $b = new QuantityParam(, 13); // When $actual = Operators::isValid($a, $operator, $b); @@ -286,7 +286,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase // Given $a = 13; $operator = Operators::SUPERIOR; - $b = new QuantityParam(12); + $b = new QuantityParam(, 12); // When $actual = Operators::isValid($a, $operator, $b); @@ -305,7 +305,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase // Given $a = 12; $operator = Operators::SUPERIOR; - $b = new QuantityParam(12); + $b = new QuantityParam(, 12); // When $actual = Operators::isValid($a, $operator, $b); @@ -324,7 +324,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase // Given $a = 11; $operator = Operators::SUPERIOR; - $b = new QuantityParam(12); + $b = new QuantityParam(, 12); // When $actual = Operators::isValid($a, $operator, $b); @@ -343,7 +343,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase // Given $a = 12; $operator = Operators::DIFFERENT; - $b = new QuantityParam(11); + $b = new QuantityParam(, 11); // When $actual = Operators::isValid($a, $operator, $b); @@ -362,7 +362,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase // Given $a = 11; $operator = Operators::DIFFERENT; - $b = new QuantityParam(11); + $b = new QuantityParam(, 11); // When $actual = Operators::isValid($a, $operator, $b); @@ -381,7 +381,7 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase // Given $a = 12; $operator = 'X'; - $b = new QuantityParam(11); + $b = new QuantityParam(, 11); // When $actual = Operators::isValid($a, $operator, $b); diff --git a/core/lib/Thelia/Tests/Coupon/Parameter/DateParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/DateParamTest.php similarity index 75% rename from core/lib/Thelia/Tests/Coupon/Parameter/DateParamTest.php rename to core/lib/Thelia/Tests/Constraint/Validator/DateParamTest.php index bbfe4015a..1b3739c5c 100644 --- a/core/lib/Thelia/Tests/Coupon/Parameter/DateParamTest.php +++ b/core/lib/Thelia/Tests/Constraint/Validator/DateParamTest.php @@ -24,7 +24,7 @@ namespace Thelia\Coupon; use InvalidArgumentException; -use Thelia\Coupon\Validator\DateParam; +use Thelia\Constraint\Validator\DateParam; /** * Created by JetBrains PhpStorm. @@ -33,7 +33,7 @@ use Thelia\Coupon\Validator\DateParam; * * Unit Test DateParam Class * - * @package Coupon + * @package Constraint * @author Guillaume MOREL * */ @@ -55,10 +55,11 @@ class DateParamTest extends \PHPUnit_Framework_TestCase */ public function testInferiorDate() { + $adapter = new CouponBaseAdapter(); $dateValidator = new \DateTime("2012-07-08"); $dateToValidate = new \DateTime("2012-07-07"); - $dateParam = new DateParam($dateValidator); + $dateParam = new DateParam($adapter, $dateValidator); $expected = 1; $actual = $dateParam->compareTo($dateToValidate); @@ -72,10 +73,11 @@ class DateParamTest extends \PHPUnit_Framework_TestCase */ public function testEqualsDate() { + $adapter = new CouponBaseAdapter(); $dateValidator = new \DateTime("2012-07-08"); $dateToValidate = new \DateTime("2012-07-08"); - $dateParam = new DateParam($dateValidator); + $dateParam = new DateParam($adapter, $dateValidator); $expected = 0; $actual = $dateParam->compareTo($dateToValidate); @@ -89,10 +91,11 @@ class DateParamTest extends \PHPUnit_Framework_TestCase */ public function testSuperiorDate() { + $adapter = new CouponBaseAdapter(); $dateValidator = new \DateTime("2012-07-08"); $dateToValidate = new \DateTime("2012-07-09"); - $dateParam = new DateParam($dateValidator); + $dateParam = new DateParam($adapter, $dateValidator); $expected = -1; $actual = $dateParam->compareTo($dateToValidate); @@ -105,14 +108,36 @@ class DateParamTest extends \PHPUnit_Framework_TestCase */ public function testInvalidArgumentException() { + $adapter = new CouponBaseAdapter(); $dateValidator = new \DateTime("2012-07-08"); $dateToValidate = 1377012588; - $dateParam = new DateParam($dateValidator); + $dateParam = new DateParam($adapter, $dateValidator); $dateParam->compareTo($dateToValidate); } + /** + * Test is the object is serializable + * If no data is lost during the process + */ + protected function isSerializableTest() + { + $adapter = new CouponBaseAdapter(); + $dateValidator = new \DateTime("2012-07-08"); + + $param = new DateParam($adapter, $dateValidator); + + $serialized = base64_encode(serialize($param)); + /** @var DateParam $unserialized */ + $unserialized = base64_decode(serialize($serialized)); + + $this->assertEquals($param->getValue(), $unserialized->getValue()); + $this->assertEquals($param->getDateTime(), $unserialized->getDateTime()); + + $new = new DateParam($adapter, $unserialized->getDateTime()); + $this->assertEquals($param->getDateTime(), $new->getDateTime()); + } /** diff --git a/core/lib/Thelia/Tests/Coupon/Parameter/IntegerParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/IntegerParamTest.php similarity index 75% rename from core/lib/Thelia/Tests/Coupon/Parameter/IntegerParamTest.php rename to core/lib/Thelia/Tests/Constraint/Validator/IntegerParamTest.php index b8938d102..c7b5b2ac0 100644 --- a/core/lib/Thelia/Tests/Coupon/Parameter/IntegerParamTest.php +++ b/core/lib/Thelia/Tests/Constraint/Validator/IntegerParamTest.php @@ -24,7 +24,7 @@ namespace Thelia\Coupon; use InvalidArgumentException; -use Thelia\Coupon\Validator\IntegerParam; +use Thelia\Constraint\Validator\IntegerParam; /** * Created by JetBrains PhpStorm. @@ -33,7 +33,7 @@ use Thelia\Coupon\Validator\IntegerParam; * * Unit Test IntegerParam Class * - * @package Coupon + * @package Constraint * @author Guillaume MOREL * */ @@ -55,10 +55,11 @@ class IntegerParamTest extends \PHPUnit_Framework_TestCase */ public function testInferiorInteger() { + $adapter = new CouponBaseAdapter(); $intValidator = 42; $intToValidate = 41; - $integerParam = new IntegerParam($intValidator); + $integerParam = new IntegerParam($adapter, $intValidator); $expected = 1; $actual = $integerParam->compareTo($intToValidate); @@ -72,10 +73,11 @@ class IntegerParamTest extends \PHPUnit_Framework_TestCase */ public function testEqualsInteger() { + $adapter = new CouponBaseAdapter(); $intValidator = 42; $intToValidate = 42; - $integerParam = new IntegerParam($intValidator); + $integerParam = new IntegerParam($adapter, $intValidator); $expected = 0; $actual = $integerParam->compareTo($intToValidate); @@ -89,10 +91,11 @@ class IntegerParamTest extends \PHPUnit_Framework_TestCase */ public function testSuperiorInteger() { + $adapter = new CouponBaseAdapter(); $intValidator = 42; $intToValidate = 43; - $integerParam = new IntegerParam($intValidator); + $integerParam = new IntegerParam($adapter, $intValidator); $expected = -1; $actual = $integerParam->compareTo($intToValidate); @@ -105,17 +108,38 @@ class IntegerParamTest extends \PHPUnit_Framework_TestCase */ public function testInvalidArgumentException() { + $adapter = new CouponBaseAdapter(); $intValidator = 42; $intToValidate = '42'; - $integerParam = new IntegerParam($intValidator); + $integerParam = new IntegerParam($adapter, $intValidator); $expected = 0; $actual = $integerParam->compareTo($intToValidate); $this->assertEquals($expected, $actual); } + /** + * Test is the object is serializable + * If no data is lost during the process + */ + protected function isSerializableTest() + { + $adapter = new CouponBaseAdapter(); + $intValidator = 42; + $param = new IntegerParam($adapter, $intValidator); + + $serialized = base64_encode(serialize($param)); + /** @var IntegerParam $unserialized */ + $unserialized = base64_decode(serialize($serialized)); + + $this->assertEquals($param->getValue(), $unserialized->getValue()); + $this->assertEquals($param->getInteger(), $unserialized->getInteger()); + + $new = new IntegerParam($adapter, $unserialized->getInteger()); + $this->assertEquals($param->getInteger(), $new->getInteger()); + } /** * Tears down the fixture, for example, closes a network connection. diff --git a/core/lib/Thelia/Tests/Coupon/Parameter/IntervalParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/IntervalParamTest.php similarity index 74% rename from core/lib/Thelia/Tests/Coupon/Parameter/IntervalParamTest.php rename to core/lib/Thelia/Tests/Constraint/Validator/IntervalParamTest.php index c068dfc01..05dad2f0c 100644 --- a/core/lib/Thelia/Tests/Coupon/Parameter/IntervalParamTest.php +++ b/core/lib/Thelia/Tests/Constraint/Validator/IntervalParamTest.php @@ -24,7 +24,7 @@ namespace Thelia\Coupon; use InvalidArgumentException; -use Thelia\Coupon\Validator\IntervalParam; +use Thelia\Constraint\Validator\IntervalParam; /** * Created by JetBrains PhpStorm. @@ -33,7 +33,7 @@ use Thelia\Coupon\Validator\IntervalParam; * * Unit Test IntervalParam Class * - * @package Coupon + * @package Constraint * @author Guillaume MOREL * */ @@ -55,11 +55,12 @@ class IntervalParamTest extends \PHPUnit_Framework_TestCase */ public function testInferiorDate() { + $adapter = new CouponBaseAdapter(); $dateValidatorStart = new \DateTime("2012-07-08"); $dateValidatorInterval = new \DateInterval("P1M"); //1month $dateToValidate = new \DateTime("2012-07-07"); - $dateParam = new IntervalParam($dateValidatorStart, $dateValidatorInterval); + $dateParam = new IntervalParam($adapter, $dateValidatorStart, $dateValidatorInterval); $expected = 1; $actual = $dateParam->compareTo($dateToValidate); @@ -73,6 +74,7 @@ class IntervalParamTest extends \PHPUnit_Framework_TestCase */ public function testEqualsDate() { + $adapter = new CouponBaseAdapter(); $dateValidatorStart = new \DateTime("2012-07-08"); $dateValidatorInterval = new \DateInterval("P1M"); //1month $dateToValidate = new \DateTime("2012-07-08"); @@ -80,7 +82,7 @@ class IntervalParamTest extends \PHPUnit_Framework_TestCase echo '1 ' . date_format($dateValidatorStart, 'g:ia \o\n l jS F Y') . "\n"; echo '2 ' . date_format($dateToValidate, 'g:ia \o\n l jS F Y') . "\n"; - $dateParam = new IntervalParam($dateValidatorStart, $dateValidatorInterval); + $dateParam = new IntervalParam($adapter, $dateValidatorStart, $dateValidatorInterval); $expected = 0; $actual = $dateParam->compareTo($dateToValidate); @@ -94,11 +96,12 @@ class IntervalParamTest extends \PHPUnit_Framework_TestCase */ public function testEqualsDate2() { + $adapter = new CouponBaseAdapter(); $dateValidatorStart = new \DateTime("2012-07-08"); $dateValidatorInterval = new \DateInterval("P1M"); //1month $dateToValidate = new \DateTime("2012-08-08"); - $dateParam = new IntervalParam($dateValidatorStart, $dateValidatorInterval); + $dateParam = new IntervalParam($adapter, $dateValidatorStart, $dateValidatorInterval); $expected = 0; $actual = $dateParam->compareTo($dateToValidate); @@ -112,11 +115,12 @@ class IntervalParamTest extends \PHPUnit_Framework_TestCase */ public function testSuperiorDate() { + $adapter = new CouponBaseAdapter(); $dateValidatorStart = new \DateTime("2012-07-08"); $dateValidatorInterval = new \DateInterval("P1M"); //1month $dateToValidate = new \DateTime("2012-08-09"); - $dateParam = new IntervalParam($dateValidatorStart, $dateValidatorInterval); + $dateParam = new IntervalParam($adapter, $dateValidatorStart, $dateValidatorInterval); $expected = -1; $actual = $dateParam->compareTo($dateToValidate); @@ -129,16 +133,38 @@ class IntervalParamTest extends \PHPUnit_Framework_TestCase */ public function testInvalidArgumentException() { + $adapter = new CouponBaseAdapter(); $dateValidatorStart = new \DateTime("2012-07-08"); $dateValidatorInterval = new \DateInterval("P1M"); //1month $dateToValidate = 1377012588; - $dateParam = new IntervalParam($dateValidatorStart, $dateValidatorInterval); + $dateParam = new IntervalParam($adapter, $dateValidatorStart, $dateValidatorInterval); $dateParam->compareTo($dateToValidate); } + /** + * Test is the object is serializable + * If no data is lost during the process + */ + protected function isSerializableTest() + { + $adapter = new CouponBaseAdapter(); + $dateValidatorStart = new \DateTime("2012-07-08"); + $dateValidatorInterval = new \DateInterval("P1M"); //1month + $param = new IntervalParam($adapter, $dateValidatorStart, $dateValidatorInterval); + + $serialized = base64_encode(serialize($param)); + /** @var IntervalParam $unserialized */ + $unserialized = base64_decode(serialize($serialized)); + + $this->assertEquals($param->getValue(), $unserialized->getValue()); + $this->assertEquals($param->getDatePeriod(), $unserialized->getDatePeriod()); + + $new = new IntervalParam($adapter, $unserialized->getStart(), $unserialized->getInterval()); + $this->assertEquals($param->getDatePeriod(), $new->getDatePeriod()); + } /** * Tears down the fixture, for example, closes a network connection. diff --git a/core/lib/Thelia/Tests/Coupon/Parameter/PriceParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/PriceParamTest.php similarity index 73% rename from core/lib/Thelia/Tests/Coupon/Parameter/PriceParamTest.php rename to core/lib/Thelia/Tests/Constraint/Validator/PriceParamTest.php index 19f19fd4e..7ccc508aa 100644 --- a/core/lib/Thelia/Tests/Coupon/Parameter/PriceParamTest.php +++ b/core/lib/Thelia/Tests/Constraint/Validator/PriceParamTest.php @@ -24,7 +24,7 @@ namespace Thelia\Coupon; use InvalidArgumentException; -use Thelia\Coupon\Validator\PriceParam; +use Thelia\Constraint\Validator\PriceParam; /** * Created by JetBrains PhpStorm. @@ -33,7 +33,7 @@ use Thelia\Coupon\Validator\PriceParam; * * Unit Test PriceParam Class * - * @package Coupon + * @package Constraint * @author Guillaume MOREL * */ @@ -55,10 +55,12 @@ class PriceParamTest extends \PHPUnit_Framework_TestCase */ public function testInferiorPrice() { + $adapter = new CouponBaseAdapter(); + $priceValidator = 42.50; $priceToValidate = 1.00; - $integerParam = new PriceParam($priceValidator, 'EUR'); + $integerParam = new PriceParam($adapter, $priceValidator, 'EUR'); $expected = 1; $actual = $integerParam->compareTo($priceToValidate); @@ -72,10 +74,12 @@ class PriceParamTest extends \PHPUnit_Framework_TestCase */ public function testInferiorPrice2() { + $adapter = new CouponBaseAdapter(); + $priceValidator = 42.50; $priceToValidate = 42.49; - $integerParam = new PriceParam($priceValidator, 'EUR'); + $integerParam = new PriceParam($adapter, $priceValidator, 'EUR'); $expected = 1; $actual = $integerParam->compareTo($priceToValidate); @@ -89,10 +93,12 @@ class PriceParamTest extends \PHPUnit_Framework_TestCase */ public function testEqualsPrice() { + $adapter = new CouponBaseAdapter(); + $priceValidator = 42.50; $priceToValidate = 42.50; - $integerParam = new PriceParam($priceValidator, 'EUR'); + $integerParam = new PriceParam($adapter, $priceValidator, 'EUR'); $expected = 0; $actual = $integerParam->compareTo($priceToValidate); @@ -106,10 +112,12 @@ class PriceParamTest extends \PHPUnit_Framework_TestCase */ public function testSuperiorPrice() { + $adapter = new CouponBaseAdapter(); + $priceValidator = 42.50; $priceToValidate = 42.51; - $integerParam = new PriceParam($priceValidator, 'EUR'); + $integerParam = new PriceParam($adapter, $priceValidator, 'EUR'); $expected = -1; $actual = $integerParam->compareTo($priceToValidate); @@ -122,10 +130,12 @@ class PriceParamTest extends \PHPUnit_Framework_TestCase */ public function testInvalidArgumentException() { + $adapter = new CouponBaseAdapter(); + $priceValidator = 42.50; $priceToValidate = '42.50'; - $integerParam = new PriceParam($priceValidator, 'EUR'); + $integerParam = new PriceParam($adapter, $priceValidator, 'EUR'); $expected = 0; $actual = $integerParam->compareTo($priceToValidate); @@ -138,10 +148,12 @@ class PriceParamTest extends \PHPUnit_Framework_TestCase */ public function testInvalidArgumentException2() { + $adapter = new CouponBaseAdapter(); + $priceValidator = 42.50; $priceToValidate = -1; - $integerParam = new PriceParam($priceValidator, 'EUR'); + $integerParam = new PriceParam($adapter, $priceValidator, 'EUR'); $expected = 0; $actual = $integerParam->compareTo($priceToValidate); @@ -154,10 +166,12 @@ class PriceParamTest extends \PHPUnit_Framework_TestCase */ public function testInvalidArgumentException3() { + $adapter = new CouponBaseAdapter(); + $priceValidator = 42.50; $priceToValidate = 0; - $integerParam = new PriceParam($priceValidator, 'EUR'); + $integerParam = new PriceParam($adapter, $priceValidator, 'EUR'); $expected = 0; $actual = $integerParam->compareTo($priceToValidate); @@ -170,17 +184,40 @@ class PriceParamTest extends \PHPUnit_Framework_TestCase */ public function testInvalidArgumentException4() { + $adapter = new CouponBaseAdapter(); $priceValidator = 42.50; $priceToValidate = 1; - $integerParam = new PriceParam($priceValidator, 'EUR'); + $integerParam = new PriceParam($adapter, $priceValidator, 'GBP'); $expected = 0; $actual = $integerParam->compareTo($priceToValidate); $this->assertEquals($expected, $actual); } + /** + * Test is the object is serializable + * If no data is lost during the process + */ + protected function isSerializableTest() + { + $adapter = new CouponBaseAdapter(); + $priceValidator = 42.50; + $param = new PriceParam($adapter, $priceValidator, 'GBP'); + + $serialized = base64_encode(serialize($param)); + /** @var PriceParam $unserialized */ + $unserialized = base64_decode(serialize($serialized)); + + $this->assertEquals($param->getValue(), $unserialized->getValue()); + $this->assertEquals($param->getPrice(), $unserialized->getPrice()); + $this->assertEquals($param->getCurrency(), $unserialized->getCurrency()); + + $new = new PriceParam($adapter, $unserialized->getPrice(), $unserialized->getCurrency()); + $this->assertEquals($param->getPrice(), $new->getPrice()); + $this->assertEquals($param->getCurrency(), $new->getCurrency()); + } /** * Tears down the fixture, for example, closes a network connection. diff --git a/core/lib/Thelia/Tests/Coupon/Parameter/QuantityParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/QuantityParamTest.php similarity index 75% rename from core/lib/Thelia/Tests/Coupon/Parameter/QuantityParamTest.php rename to core/lib/Thelia/Tests/Constraint/Validator/QuantityParamTest.php index 17343121c..9543388f6 100644 --- a/core/lib/Thelia/Tests/Coupon/Parameter/QuantityParamTest.php +++ b/core/lib/Thelia/Tests/Constraint/Validator/QuantityParamTest.php @@ -24,7 +24,7 @@ namespace Thelia\Coupon; use InvalidArgumentException; -use Thelia\Coupon\Validator\QuantityParam; +use Thelia\Constraint\Validator\QuantityParam; /** * Created by JetBrains PhpStorm. @@ -33,7 +33,7 @@ use Thelia\Coupon\Validator\QuantityParam; * * Unit Test QuantityParam Class * - * @package Coupon + * @package Constraint * @author Guillaume MOREL * */ @@ -55,10 +55,11 @@ class QuantityParamTest extends \PHPUnit_Framework_TestCase */ public function testInferiorQuantity() { + $adapter = new CouponBaseAdapter(); $intValidator = 42; $intToValidate = 0; - $integerParam = new QuantityParam($intValidator); + $integerParam = new QuantityParam($adapter, $intValidator); $expected = 1; $actual = $integerParam->compareTo($intToValidate); @@ -72,10 +73,11 @@ class QuantityParamTest extends \PHPUnit_Framework_TestCase */ public function testInferiorQuantity2() { + $adapter = new CouponBaseAdapter(); $intValidator = 42; $intToValidate = 41; - $integerParam = new QuantityParam($intValidator); + $integerParam = new QuantityParam($adapter, $intValidator); $expected = 1; $actual = $integerParam->compareTo($intToValidate); @@ -89,10 +91,11 @@ class QuantityParamTest extends \PHPUnit_Framework_TestCase */ public function testEqualsQuantity() { + $adapter = new CouponBaseAdapter(); $intValidator = 42; $intToValidate = 42; - $integerParam = new QuantityParam($intValidator); + $integerParam = new QuantityParam($adapter, $intValidator); $expected = 0; $actual = $integerParam->compareTo($intToValidate); @@ -106,10 +109,11 @@ class QuantityParamTest extends \PHPUnit_Framework_TestCase */ public function testSuperiorQuantity() { + $adapter = new CouponBaseAdapter(); $intValidator = 42; $intToValidate = 43; - $integerParam = new QuantityParam($intValidator); + $integerParam = new QuantityParam($adapter, $intValidator); $expected = -1; $actual = $integerParam->compareTo($intToValidate); @@ -122,10 +126,11 @@ class QuantityParamTest extends \PHPUnit_Framework_TestCase */ public function testInvalidArgumentException() { + $adapter = new CouponBaseAdapter(); $intValidator = 42; $intToValidate = '42'; - $integerParam = new QuantityParam($intValidator); + $integerParam = new QuantityParam($adapter, $intValidator); $expected = 0; $actual = $integerParam->compareTo($intToValidate); @@ -138,17 +143,39 @@ class QuantityParamTest extends \PHPUnit_Framework_TestCase */ public function testInvalidArgumentException2() { + $adapter = new CouponBaseAdapter(); $intValidator = 42; $intToValidate = -1; - $integerParam = new QuantityParam($intValidator); + $integerParam = new QuantityParam($adapter, $intValidator); $expected = 0; $actual = $integerParam->compareTo($intToValidate); $this->assertEquals($expected, $actual); } + /** + * Test is the object is serializable + * If no data is lost during the process + */ + protected function isSerializableTest() + { + $adapter = new CouponBaseAdapter(); + $intValidator = 42; + $intToValidate = -1; + $param = new QuantityParam($adapter, $intValidator); + + $serialized = base64_encode(serialize($param)); + /** @var QuantityParam $unserialized */ + $unserialized = base64_decode(serialize($serialized)); + + $this->assertEquals($param->getValue(), $unserialized->getValue()); + $this->assertEquals($param->getInteger(), $unserialized->getInteger()); + + $new = new PriceParam($adapter, $unserialized->getInteger()); + $this->assertEquals($param->getInteger(), $new->getInteger()); + } /** * Tears down the fixture, for example, closes a network connection. diff --git a/core/lib/Thelia/Tests/Coupon/Parameter/RepeatedDateParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/RepeatedDateParamTest.php similarity index 78% rename from core/lib/Thelia/Tests/Coupon/Parameter/RepeatedDateParamTest.php rename to core/lib/Thelia/Tests/Constraint/Validator/RepeatedDateParamTest.php index 66c970a4f..5766cb6b1 100644 --- a/core/lib/Thelia/Tests/Coupon/Parameter/RepeatedDateParamTest.php +++ b/core/lib/Thelia/Tests/Constraint/Validator/RepeatedDateParamTest.php @@ -25,7 +25,7 @@ namespace Thelia\Coupon; use InvalidArgumentException; use Symfony\Component\Intl\Exception\NotImplementedException; -use Thelia\Coupon\Validator\RepeatedDateParam; +use Thelia\Constraint\Validator\RepeatedDateParam; /** * Created by JetBrains PhpStorm. @@ -34,7 +34,7 @@ use Thelia\Coupon\Validator\RepeatedDateParam; * * Unit Test RepeatedDateParam Class * - * @package Coupon + * @package Constraint * @author Guillaume MOREL * */ @@ -56,10 +56,11 @@ class RepeatedDateParamTest extends \PHPUnit_Framework_TestCase */ public function testInferiorDate() { + $adapter = new CouponBaseAdapter(); $startDateValidator = new \DateTime("2012-07-08"); $dateToValidate = new \DateTime("2012-07-07"); - $repeatedDateParam = new RepeatedDateParam(); + $repeatedDateParam = new RepeatedDateParam($adapter); $repeatedDateParam->setFrom($startDateValidator); $repeatedDateParam->repeatEveryMonth(); @@ -75,10 +76,11 @@ class RepeatedDateParamTest extends \PHPUnit_Framework_TestCase */ public function testEqualsDateRepeatEveryMonthOneTimeFirstPeriod() { + $adapter = new CouponBaseAdapter(); $startDateValidator = new \DateTime("2012-07-08"); $dateToValidate = new \DateTime("2012-07-08"); - $repeatedDateParam = new RepeatedDateParam(); + $repeatedDateParam = new RepeatedDateParam($adapter); $repeatedDateParam->setFrom($startDateValidator); $repeatedDateParam->repeatEveryMonth(); @@ -94,12 +96,13 @@ class RepeatedDateParamTest extends \PHPUnit_Framework_TestCase */ public function testEqualsDateRepeatEveryMonthOneTimeSecondPeriod() { + $adapter = new CouponBaseAdapter(); $startDateValidator = new \DateTime("2012-07-08"); $dateToValidate = new \DateTime("2012-08-08"); - $repeatedDateParam = new RepeatedDateParam(); + $repeatedDateParam = new RepeatedDateParam($adapter); $repeatedDateParam->setFrom($startDateValidator); - $repeatedDateParam->repeatEveryMonth(); + $repeatedDateParam->repeatEveryMonth(1, 1); $expected = 0; $actual = $repeatedDateParam->compareTo($dateToValidate); @@ -113,10 +116,11 @@ class RepeatedDateParamTest extends \PHPUnit_Framework_TestCase */ public function testEqualsDateRepeatEveryMonthTenTimesThirdPeriod() { + $adapter = new CouponBaseAdapter(); $startDateValidator = new \DateTime("2012-07-08"); $dateToValidate = new \DateTime("2012-09-08"); - $repeatedDateParam = new RepeatedDateParam(); + $repeatedDateParam = new RepeatedDateParam($adapter); $repeatedDateParam->setFrom($startDateValidator); $repeatedDateParam->repeatEveryMonth(1, 10); @@ -132,10 +136,11 @@ class RepeatedDateParamTest extends \PHPUnit_Framework_TestCase */ public function testEqualsDateRepeatEveryMonthTenTimesTensPeriod() { + $adapter = new CouponBaseAdapter(); $startDateValidator = new \DateTime("2012-07-08"); $dateToValidate = new \DateTime("2013-05-08"); - $repeatedDateParam = new RepeatedDateParam(); + $repeatedDateParam = new RepeatedDateParam($adapter); $repeatedDateParam->setFrom($startDateValidator); $repeatedDateParam->repeatEveryMonth(1, 10); @@ -151,10 +156,11 @@ class RepeatedDateParamTest extends \PHPUnit_Framework_TestCase */ public function testEqualsDateRepeatEveryFourMonthTwoTimesSecondPeriod() { + $adapter = new CouponBaseAdapter(); $startDateValidator = new \DateTime("2012-07-08"); $dateToValidate = new \DateTime("2012-11-08"); - $repeatedDateParam = new RepeatedDateParam(); + $repeatedDateParam = new RepeatedDateParam($adapter); $repeatedDateParam->setFrom($startDateValidator); $repeatedDateParam->repeatEveryMonth(4, 2); @@ -170,10 +176,11 @@ class RepeatedDateParamTest extends \PHPUnit_Framework_TestCase */ public function testEqualsDateRepeatEveryFourMonthTwoTimesLastPeriod() { + $adapter = new CouponBaseAdapter(); $startDateValidator = new \DateTime("2012-07-08"); $dateToValidate = new \DateTime("2013-03-08"); - $repeatedDateParam = new RepeatedDateParam(); + $repeatedDateParam = new RepeatedDateParam($adapter); $repeatedDateParam->setFrom($startDateValidator); $repeatedDateParam->repeatEveryMonth(4, 2); @@ -189,10 +196,11 @@ class RepeatedDateParamTest extends \PHPUnit_Framework_TestCase */ public function testNotEqualsDateRepeatEveryFourMonthTwoTimes1() { + $adapter = new CouponBaseAdapter(); $startDateValidator = new \DateTime("2012-07-08"); $dateToValidate = new \DateTime("2012-08-08"); - $repeatedDateParam = new RepeatedDateParam(); + $repeatedDateParam = new RepeatedDateParam($adapter); $repeatedDateParam->setFrom($startDateValidator); $repeatedDateParam->repeatEveryMonth(4, 2); @@ -208,10 +216,11 @@ class RepeatedDateParamTest extends \PHPUnit_Framework_TestCase */ public function testNotEqualsDateRepeatEveryFourMonthTwoTimes2() { + $adapter = new CouponBaseAdapter(); $startDateValidator = new \DateTime("2012-07-08"); $dateToValidate = new \DateTime("2012-12-08"); - $repeatedDateParam = new RepeatedDateParam(); + $repeatedDateParam = new RepeatedDateParam($adapter); $repeatedDateParam->setFrom($startDateValidator); $repeatedDateParam->repeatEveryMonth(4, 2); @@ -227,10 +236,11 @@ class RepeatedDateParamTest extends \PHPUnit_Framework_TestCase */ public function testSuperiorDateRepeatEveryFourMonthTwoTimes() { + $adapter = new CouponBaseAdapter(); $startDateValidator = new \DateTime("2012-07-08"); $dateToValidate = new \DateTime("2013-03-09"); - $repeatedDateParam = new RepeatedDateParam(); + $repeatedDateParam = new RepeatedDateParam($adapter); $repeatedDateParam->setFrom($startDateValidator); $repeatedDateParam->repeatEveryMonth(4, 2); @@ -245,17 +255,42 @@ class RepeatedDateParamTest extends \PHPUnit_Framework_TestCase */ public function testInvalidArgumentException() { + $adapter = new CouponBaseAdapter(); $startDateValidator = new \DateTime("2012-07-08"); $dateToValidate = 1377012588; - $repeatedDateParam = new RepeatedDateParam(); + $repeatedDateParam = new RepeatedDateParam($adapter); $repeatedDateParam->setFrom($startDateValidator); $repeatedDateParam->repeatEveryMonth(4, 2); $repeatedDateParam->compareTo($dateToValidate); } + /** + * Test is the object is serializable + * If no data is lost during the process + */ + protected function isSerializableTest() + { + $adapter = new CouponBaseAdapter(); + $startDateValidator = new \DateTime("2012-07-08"); + $param = new RepeatedDateParam($adapter); + $param->setFrom($startDateValidator); + $param->repeatEveryMonth(4, 2); + + $serialized = base64_encode(serialize($param)); + /** @var RepeatedDateParam $unserialized */ + $unserialized = base64_decode(serialize($serialized)); + + $this->assertEquals($param->getValue(), $unserialized->getValue()); + $this->assertEquals($param->getDatePeriod(), $unserialized->getDatePeriod()); + + $new = new RepeatedDateParam($adapter); + $new->setFrom($unserialized->getFrom()); + $new->repeatEveryMonth($unserialized->getFrequency(), $unserialized->getNbRepetition()); + $this->assertEquals($param->getDatePeriod(), $new->getDatePeriod()); + } /** * Tears down the fixture, for example, closes a network connection. diff --git a/core/lib/Thelia/Tests/Coupon/Parameter/RepeatedIntervalParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/RepeatedIntervalParamTest.php similarity index 80% rename from core/lib/Thelia/Tests/Coupon/Parameter/RepeatedIntervalParamTest.php rename to core/lib/Thelia/Tests/Constraint/Validator/RepeatedIntervalParamTest.php index dc7a1335d..22a105ffb 100644 --- a/core/lib/Thelia/Tests/Coupon/Parameter/RepeatedIntervalParamTest.php +++ b/core/lib/Thelia/Tests/Constraint/Validator/RepeatedIntervalParamTest.php @@ -24,7 +24,7 @@ namespace Thelia\Coupon; use Symfony\Component\Intl\Exception\NotImplementedException; -use Thelia\Coupon\Validator\RepeatedIntervalParam; +use Thelia\Constraint\Validator\RepeatedIntervalParam; /** * Created by JetBrains PhpStorm. @@ -33,7 +33,7 @@ use Thelia\Coupon\Validator\RepeatedIntervalParam; * * Unit Test RepeatedIntervalParam Class * - * @package Coupon + * @package Constraint * @author Guillaume MOREL * */ @@ -55,11 +55,12 @@ class RepeatedIntervalParamTest extends \PHPUnit_Framework_TestCase */ public function testInferiorDate() { + $adapter = new CouponBaseAdapter(); $startDateValidator = new \DateTime("2012-07-08"); $dateToValidate = new \DateTime("2012-07-07"); $duration = 10; - $RepeatedIntervalParam = new RepeatedIntervalParam(); + $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); $RepeatedIntervalParam->setFrom($startDateValidator); $RepeatedIntervalParam->setDurationInDays($duration); @@ -77,11 +78,12 @@ class RepeatedIntervalParamTest extends \PHPUnit_Framework_TestCase */ public function testEqualsDateRepeatEveryMonthOneTimeFirstPeriodBeginning() { + $adapter = new CouponBaseAdapter(); $startDateValidator = new \DateTime("2012-07-08"); $dateToValidate = new \DateTime("2012-07-08"); $duration = 10; - $RepeatedIntervalParam = new RepeatedIntervalParam(); + $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); $RepeatedIntervalParam->setFrom($startDateValidator); $RepeatedIntervalParam->setDurationInDays($duration); $RepeatedIntervalParam->repeatEveryMonth(); @@ -98,11 +100,12 @@ class RepeatedIntervalParamTest extends \PHPUnit_Framework_TestCase */ public function testEqualsDateRepeatEveryMonthOneTimeFirstPeriodMiddle() { + $adapter = new CouponBaseAdapter(); $startDateValidator = new \DateTime("2012-07-08"); $dateToValidate = new \DateTime("2012-07-13"); $duration = 10; - $RepeatedIntervalParam = new RepeatedIntervalParam(); + $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); $RepeatedIntervalParam->setFrom($startDateValidator); $RepeatedIntervalParam->setDurationInDays($duration); $RepeatedIntervalParam->repeatEveryMonth(); @@ -119,11 +122,12 @@ class RepeatedIntervalParamTest extends \PHPUnit_Framework_TestCase */ public function testEqualsDateRepeatEveryMonthOneTimeFirstPeriodEnding() { + $adapter = new CouponBaseAdapter(); $startDateValidator = new \DateTime("2012-07-08"); $dateToValidate = new \DateTime("2012-07-18"); $duration = 10; - $RepeatedIntervalParam = new RepeatedIntervalParam(); + $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); $RepeatedIntervalParam->setFrom($startDateValidator); $RepeatedIntervalParam->setDurationInDays($duration); $RepeatedIntervalParam->repeatEveryMonth(); @@ -140,11 +144,12 @@ class RepeatedIntervalParamTest extends \PHPUnit_Framework_TestCase */ public function testEqualsDateRepeatEveryMonthOneTimeSecondPeriodBeginning() { + $adapter = new CouponBaseAdapter(); $startDateValidator = new \DateTime("2012-08-08"); $dateToValidate = new \DateTime("2012-08-08"); $duration = 10; - $RepeatedIntervalParam = new RepeatedIntervalParam(); + $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); $RepeatedIntervalParam->setFrom($startDateValidator); $RepeatedIntervalParam->setDurationInDays($duration); $RepeatedIntervalParam->repeatEveryMonth(); @@ -161,11 +166,12 @@ class RepeatedIntervalParamTest extends \PHPUnit_Framework_TestCase */ public function testEqualsDateRepeatEveryMonthOneTimeSecondPeriodMiddle() { + $adapter = new CouponBaseAdapter(); $startDateValidator = new \DateTime("2012-08-08"); $dateToValidate = new \DateTime("2012-08-13"); $duration = 10; - $RepeatedIntervalParam = new RepeatedIntervalParam(); + $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); $RepeatedIntervalParam->setFrom($startDateValidator); $RepeatedIntervalParam->setDurationInDays($duration); $RepeatedIntervalParam->repeatEveryMonth(); @@ -182,11 +188,12 @@ class RepeatedIntervalParamTest extends \PHPUnit_Framework_TestCase */ public function testEqualsDateRepeatEveryMonthOneTimeSecondPeriodEnding() { + $adapter = new CouponBaseAdapter(); $startDateValidator = new \DateTime("2012-08-08"); $dateToValidate = new \DateTime("2012-08-18"); $duration = 10; - $RepeatedIntervalParam = new RepeatedIntervalParam(); + $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); $RepeatedIntervalParam->setFrom($startDateValidator); $RepeatedIntervalParam->setDurationInDays($duration); $RepeatedIntervalParam->repeatEveryMonth(); @@ -201,13 +208,14 @@ class RepeatedIntervalParamTest extends \PHPUnit_Framework_TestCase * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo * */ - public function testEqualsDateRepeatEveryMonthFourTimeLastPeriodBegining() + public function testEqualsDateRepeatEveryMonthFourTimeLastPeriodBeginning() { + $adapter = new CouponBaseAdapter(); $startDateValidator = new \DateTime("2012-10-08"); $dateToValidate = new \DateTime("2012-10-08"); $duration = 10; - $RepeatedIntervalParam = new RepeatedIntervalParam(); + $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); $RepeatedIntervalParam->setFrom($startDateValidator); $RepeatedIntervalParam->setDurationInDays($duration); $RepeatedIntervalParam->repeatEveryMonth(1, 4); @@ -224,11 +232,12 @@ class RepeatedIntervalParamTest extends \PHPUnit_Framework_TestCase */ public function testEqualsDateRepeatEveryMonthFourTimeLastPeriodMiddle() { + $adapter = new CouponBaseAdapter(); $startDateValidator = new \DateTime("2012-10-08"); $dateToValidate = new \DateTime("2012-10-13"); $duration = 10; - $RepeatedIntervalParam = new RepeatedIntervalParam(); + $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); $RepeatedIntervalParam->setFrom($startDateValidator); $RepeatedIntervalParam->setDurationInDays($duration); $RepeatedIntervalParam->repeatEveryMonth(1, 4); @@ -245,11 +254,12 @@ class RepeatedIntervalParamTest extends \PHPUnit_Framework_TestCase */ public function testEqualsDateRepeatEveryMonthFourTimeLastPeriodEnding() { + $adapter = new CouponBaseAdapter(); $startDateValidator = new \DateTime("2012-10-08"); $dateToValidate = new \DateTime("2012-10-18"); $duration = 10; - $RepeatedIntervalParam = new RepeatedIntervalParam(); + $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); $RepeatedIntervalParam->setFrom($startDateValidator); $RepeatedIntervalParam->setDurationInDays($duration); $RepeatedIntervalParam->repeatEveryMonth(1, 4); @@ -266,11 +276,12 @@ class RepeatedIntervalParamTest extends \PHPUnit_Framework_TestCase */ public function testNotEqualsDateRepeatEveryMonthFourTimeInTheBeginning() { + $adapter = new CouponBaseAdapter(); $startDateValidator = new \DateTime("2012-10-08"); $dateToValidate = new \DateTime("2012-07-19"); $duration = 10; - $RepeatedIntervalParam = new RepeatedIntervalParam(); + $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); $RepeatedIntervalParam->setFrom($startDateValidator); $RepeatedIntervalParam->setDurationInDays($duration); $RepeatedIntervalParam->repeatEveryMonth(1, 4); @@ -287,11 +298,12 @@ class RepeatedIntervalParamTest extends \PHPUnit_Framework_TestCase */ public function testNotEqualsDateRepeatEveryMonthFourTimeInTheMiddle() { + $adapter = new CouponBaseAdapter(); $startDateValidator = new \DateTime("2012-10-08"); $dateToValidate = new \DateTime("2012-08-01"); $duration = 10; - $RepeatedIntervalParam = new RepeatedIntervalParam(); + $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); $RepeatedIntervalParam->setFrom($startDateValidator); $RepeatedIntervalParam->setDurationInDays($duration); $RepeatedIntervalParam->repeatEveryMonth(1, 4); @@ -309,11 +321,12 @@ class RepeatedIntervalParamTest extends \PHPUnit_Framework_TestCase */ public function testNotEqualsDateRepeatEveryMonthFourTimeInTheEnd() { + $adapter = new CouponBaseAdapter(); $startDateValidator = new \DateTime("2012-10-08"); $dateToValidate = new \DateTime("2012-08-07"); $duration = 10; - $RepeatedIntervalParam = new RepeatedIntervalParam(); + $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); $RepeatedIntervalParam->setFrom($startDateValidator); $RepeatedIntervalParam->setDurationInDays($duration); $RepeatedIntervalParam->repeatEveryMonth(1, 4); @@ -332,11 +345,12 @@ class RepeatedIntervalParamTest extends \PHPUnit_Framework_TestCase */ public function testSuperiorDateRepeatEveryMonthFourTime() { + $adapter = new CouponBaseAdapter(); $startDateValidator = new \DateTime("2012-07-08"); $dateToValidate = new \DateTime("2012-10-19"); $duration = 10; - $RepeatedIntervalParam = new RepeatedIntervalParam(); + $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); $RepeatedIntervalParam->setFrom($startDateValidator); $RepeatedIntervalParam->setDurationInDays($duration); $RepeatedIntervalParam->repeatEveryMonth(1, 0); @@ -352,11 +366,12 @@ class RepeatedIntervalParamTest extends \PHPUnit_Framework_TestCase */ public function testInvalidArgumentException() { + $adapter = new CouponBaseAdapter(); $startDateValidator = new \DateTime("2012-07-08"); $dateToValidate = 1377012588; $duration = 10; - $RepeatedIntervalParam = new RepeatedIntervalParam(); + $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); $RepeatedIntervalParam->setFrom($startDateValidator); $RepeatedIntervalParam->setDurationInDays($duration); $RepeatedIntervalParam->repeatEveryMonth(1, 4); @@ -364,6 +379,36 @@ class RepeatedIntervalParamTest extends \PHPUnit_Framework_TestCase $RepeatedIntervalParam->compareTo($dateToValidate); } + /** + * Test is the object is serializable + * If no data is lost during the process + */ + protected function isSerializableTest() + { + $adapter = new CouponBaseAdapter(); + $startDateValidator = new \DateTime("2012-07-08"); + $dateToValidate = 1377012588; + $duration = 10; + + $param = new RepeatedIntervalParam($adapter); + $param->setFrom($startDateValidator); + $param->setDurationInDays($duration); + $param->repeatEveryMonth(1, 4); + + $serialized = base64_encode(serialize($param)); + /** @var RepeatedIntervalParam $unserialized */ + $unserialized = base64_decode(serialize($serialized)); + + $this->assertEquals($param->getValue(), $unserialized->getValue()); + $this->assertEquals($param->getDatePeriod(), $unserialized->getDatePeriod()); + + $new = new RepeatedIntervalParam($adapter); + $new->setFrom($unserialized->getFrom()); + $new->repeatEveryMonth($unserialized->getFrequency(), $unserialized->getNbRepetition()); + $new->setDurationInDays($unserialized->getDurationInDays()); + $this->assertEquals($param->getDatePeriod(), $new->getDatePeriod()); + } + /** * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. diff --git a/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php b/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php index c33b2327a..f3cf99054 100644 --- a/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php +++ b/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php @@ -23,10 +23,10 @@ namespace Thelia\Coupon; -use Thelia\Coupon\Validator\PriceParam; -use Thelia\Coupon\Validator\RuleValidator; -use Thelia\Coupon\Rule\AvailableForTotalAmount; -use Thelia\Coupon\Rule\Operators; +use Thelia\Constraint\Validator\PriceParam; +use Thelia\Constraint\Validator\RuleValidator; +use Thelia\Constraint\Rule\AvailableForTotalAmount; +use Thelia\Constraint\Rule\Operators; use Thelia\Coupon\Type\CouponInterface; use Thelia\Exception\CouponExpiredException; use Thelia\Model\Coupon; @@ -208,8 +208,7 @@ class CouponFactoryTest extends \PHPUnit_Framework_TestCase AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::SUPERIOR, new PriceParam( - 40.00, - 'EUR' + , 40.00, 'EUR' ) ) ) @@ -219,8 +218,7 @@ class CouponFactoryTest extends \PHPUnit_Framework_TestCase AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::INFERIOR, new PriceParam( - 400.00, - 'EUR' + , 400.00, 'EUR' ) ) ) diff --git a/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php b/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php index b5b9cefbe..08673746e 100644 --- a/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php +++ b/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php @@ -23,10 +23,10 @@ namespace Thelia\Coupon; -use Thelia\Coupon\Validator\PriceParam; -use Thelia\Coupon\Validator\RuleValidator; -use Thelia\Coupon\Rule\AvailableForTotalAmount; -use Thelia\Coupon\Rule\Operators; +use Thelia\Constraint\Validator\PriceParam; +use Thelia\Constraint\Validator\RuleValidator; +use Thelia\Constraint\Rule\AvailableForTotalAmount; +use Thelia\Constraint\Rule\Operators; use Thelia\Coupon\Type\CouponInterface; use Thelia\Coupon\Type\RemoveXAmount; use Thelia\Tools\PhpUnitUtils; @@ -103,6 +103,7 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua */ public function testGetDiscountTwoCoupon() { + $adapter = new CouponBaseAdapter(); $cartTotalPrice = 100.00; $checkoutTotalPrice = 120.00; @@ -113,8 +114,7 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::SUPERIOR, new PriceParam( - 40.00, - 'EUR' + $adapter, 40.00, 'EUR' ) ) ) @@ -143,6 +143,7 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua */ public function testGetDiscountAlwaysInferiorToPrice() { + $adapter = new CouponBaseAdapter(); $cartTotalPrice = 21.00; $checkoutTotalPrice = 26.00; @@ -151,8 +152,7 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::SUPERIOR, new PriceParam( - 20.00, - 'EUR' + $adapter, 20.00, 'EUR' ) ) ) @@ -180,6 +180,7 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua */ public function testIsCouponRemovingPostage() { + $adapter = new CouponBaseAdapter(); $cartTotalPrice = 21.00; $checkoutTotalPrice = 27.00; @@ -188,8 +189,7 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::SUPERIOR, new PriceParam( - 20.00, - 'EUR' + $adapter, 20.00, 'EUR' ) ) ) @@ -640,13 +640,13 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua */ public static function generateValidRules() { + $adapter = new CouponBaseAdapter(); $rule1 = new AvailableForTotalAmount( array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::SUPERIOR, new PriceParam( - 40.00, - 'EUR' + $adapter, 40.00, 'EUR' ) ) ) @@ -656,8 +656,7 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::INFERIOR, new PriceParam( - 400.00, - 'EUR' + $adapter, 400.00, 'EUR' ) ) ) @@ -754,6 +753,7 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua $isAvailableOnSpecialOffers = null, $maxUsage = null ) { + $adapter = new CouponBaseAdapter(); if ($code === null) { $code = self::VALID_CODE; } @@ -790,7 +790,7 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua $expirationDate->setTimestamp(strtotime("today + 2 months")); } - $coupon = new RemoveXAmount($code, $title, $shortDescription, $description, $amount, $isCumulative, $isRemovingPostage, $isAvailableOnSpecialOffers, $isEnabled, $maxUsage, $expirationDate); + $coupon = new RemoveXAmount($adapter, $code, $title, $shortDescription, $description, $amount, $isCumulative, $isRemovingPostage, $isAvailableOnSpecialOffers, $isEnabled, $maxUsage, $expirationDate); if ($rules === null) { $rules = self::generateValidRules(); diff --git a/core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php b/core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php index e399b6f37..eab22758b 100644 --- a/core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php +++ b/core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php @@ -23,10 +23,10 @@ namespace Thelia\Coupon; -use Thelia\Coupon\Validator\PriceParam; -use Thelia\Coupon\Validator\RuleValidator; -use Thelia\Coupon\Rule\AvailableForTotalAmount; -use Thelia\Coupon\Rule\Operators; +use Thelia\Constraint\Validator\PriceParam; +use Thelia\Constraint\Validator\RuleValidator; +use Thelia\Constraint\Rule\AvailableForTotalAmount; +use Thelia\Constraint\Rule\Operators; /** * Created by JetBrains PhpStorm. @@ -51,8 +51,7 @@ class CouponRuleCollectionTest extends \PHPUnit_Framework_TestCase AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::SUPERIOR, new PriceParam( - 40.00, - 'EUR' + , 40.00, 'EUR' ) ) ) @@ -62,8 +61,7 @@ class CouponRuleCollectionTest extends \PHPUnit_Framework_TestCase AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::INFERIOR, new PriceParam( - 400.00, - 'EUR' + , 400.00, 'EUR' ) ) ) diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php index 72313f9ec..69e01549f 100644 --- a/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php @@ -23,10 +23,10 @@ namespace Thelia\Coupon; -use Thelia\Coupon\Validator\PriceParam; -use Thelia\Coupon\Validator\RuleValidator; -use Thelia\Coupon\Rule\AvailableForTotalAmount; -use Thelia\Coupon\Rule\Operators; +use Thelia\Constraint\Validator\PriceParam; +use Thelia\Constraint\Validator\RuleValidator; +use Thelia\Constraint\Rule\AvailableForTotalAmount; +use Thelia\Constraint\Rule\Operators; use Thelia\Coupon\Type\RemoveXAmount; require_once '../CouponManagerTest.php'; @@ -54,6 +54,7 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase } /** + * Test if a Coupon is well displayed * * @covers Thelia\Coupon\type\RemoveXAmount::getCode * @covers Thelia\Coupon\type\RemoveXAmount::getTitle @@ -83,13 +84,13 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase } /** + * Test if a Coupon can be Cumulative * * @covers Thelia\Coupon\type\RemoveXAmount::isCumulative * */ public function testIsCumulative() { - $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, true, true); $actual = $coupon->isCumulative(); @@ -97,13 +98,13 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase } /** + * Test if a Coupon can be non cumulative * * @covers Thelia\Coupon\type\RemoveXAmount::isCumulative * */ public function testIsNotCumulative() { - $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); $actual = $coupon->isCumulative(); @@ -112,6 +113,7 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase /** + * Test if a Coupon can remove postage * * @covers Thelia\Coupon\type\RemoveXAmount::isRemovingPostage * @@ -125,13 +127,12 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase } /** + * Test if a Coupon won't remove postage if not set to * * @covers Thelia\Coupon\type\RemoveXAmount::isRemovingPostage - * */ public function testIsNotRemovingPostage() { - $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); $actual = $coupon->isRemovingPostage(); @@ -140,25 +141,25 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase /** + * Test if a Coupon has the effect expected (discount 10euros) * * @covers Thelia\Coupon\type\RemoveXAmount::getEffect - * */ public function testGetEffect() { - + $adapter = new CouponBaseAdapter(); $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); $expected = 10; - $actual = $coupon->getDiscount(); + $actual = $coupon->getDiscount($adapter); $this->assertEquals($expected, $actual); } /** + * Test Coupon rule setter * * @covers Thelia\Coupon\type\RemoveXAmount::setRules * @covers Thelia\Coupon\type\RemoveXAmount::getRules - * */ public function testSetRulesValid() { @@ -187,6 +188,7 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase } /** + * Test Coupon rule setter * * @covers Thelia\Coupon\type\RemoveXAmount::setRules * @expectedException \Thelia\Exception\InvalidRuleException @@ -212,6 +214,7 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase } /** + * Test Coupon effect for rule Total Amount < 400 * * @covers Thelia\Coupon\type\RemoveXAmount::getEffect * @@ -219,6 +222,7 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase public function testGetEffectIfTotalAmountInferiorTo400Valid() { // Given + $adapter = new CouponBaseAdapter(); $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( Operators::INFERIOR, 400.00 @@ -230,11 +234,12 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase // Then $expected = 10.00; - $actual = $coupon->getDiscount(); + $actual = $coupon->getDiscount($adapter); $this->assertEquals($expected, $actual); } /** + * Test Coupon effect for rule Total Amount <= 400 * * @covers Thelia\Coupon\type\RemoveXAmount::getEffect * @@ -242,6 +247,7 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase public function testGetEffectIfTotalAmountInferiorOrEqualTo400Valid() { // Given + $adapter = new CouponBaseAdapter(); $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( Operators::INFERIOR_OR_EQUAL, 400.00 @@ -253,11 +259,12 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase // Then $expected = 10.00; - $actual = $coupon->getDiscount(); + $actual = $coupon->getDiscount($adapter); $this->assertEquals($expected, $actual); } /** + * Test Coupon effect for rule Total Amount == 400 * * @covers Thelia\Coupon\type\RemoveXAmount::getEffect * @@ -265,6 +272,7 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase public function testGetEffectIfTotalAmountEqualTo400Valid() { // Given + $adapter = new CouponBaseAdapter(); $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( Operators::EQUAL, 400.00 @@ -276,11 +284,12 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase // Then $expected = 10.00; - $actual = $coupon->getDiscount(); + $actual = $coupon->getDiscount($adapter); $this->assertEquals($expected, $actual); } /** + * Test Coupon effect for rule Total Amount >= 400 * * @covers Thelia\Coupon\type\RemoveXAmount::getEffect * @@ -288,6 +297,7 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase public function testGetEffectIfTotalAmountSuperiorOrEqualTo400Valid() { // Given + $adapter = new CouponBaseAdapter(); $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( Operators::SUPERIOR_OR_EQUAL, 400.00 @@ -299,11 +309,12 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase // Then $expected = 10.00; - $actual = $coupon->getDiscount(); + $actual = $coupon->getDiscount($adapter); $this->assertEquals($expected, $actual); } /** + * Test Coupon effect for rule Total Amount > 400 * * @covers Thelia\Coupon\type\RemoveXAmount::getEffect * @@ -311,6 +322,7 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase public function testGetEffectIfTotalAmountSuperiorTo400Valid() { // Given + $adapter = new CouponBaseAdapter(); $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( Operators::SUPERIOR, 400.00 @@ -322,7 +334,7 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase // Then $expected = 10.00; - $actual = $coupon->getDiscount(); + $actual = $coupon->getDiscount($adapter); $this->assertEquals($expected, $actual); } @@ -347,10 +359,12 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase */ protected function generateValidRuleAvailableForTotalAmountOperatorTo($operator, $amount) { + $adapter = new CouponBaseAdapter(); $validators = array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( $operator, new PriceParam( + $adapter, $amount, 'EUR' ) diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php index 5d110d3df..5b80ac1a3 100644 --- a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php @@ -24,8 +24,15 @@ namespace Thelia\Coupon; use PHPUnit_Framework_TestCase; +use Thelia\Constraint\Rule\AvailableForTotalAmount; +use Thelia\Constraint\Rule\Operators; +use Thelia\Constraint\Validator\PriceParam; +use Thelia\Constraint\Validator\RuleValidator; +use Thelia\Coupon\Type\CouponInterface; use Thelia\Coupon\Type\RemoveXPercent; +require_once '../CouponManagerTest.php'; + /** * Created by JetBrains PhpStorm. * Date: 8/19/13 @@ -48,92 +55,29 @@ class RemoveXPercentTest extends \PHPUnit_Framework_TestCase { } - - protected function generateValidCumulativeRemovingPostageCoupon() - { - $coupon = new RemoveXPercent( - self::VALID_COUPON_CODE, - self::VALID_COUPON_TITLE, - self::VALID_COUPON_SHORT_DESCRIPTION, - self::VALID_COUPON_DESCRIPTION, - 30.00, - true, - true - ); - - return $coupon; - } - - protected function generateValidNonCumulativeNonRemovingPostageCoupon() - { - $coupon = new RemoveXPercent( - self::VALID_COUPON_CODE, - self::VALID_COUPON_TITLE, - self::VALID_COUPON_SHORT_DESCRIPTION, - self::VALID_COUPON_DESCRIPTION, - 30.00, - false, - false - ); - - return $coupon; - } - /** + * Test if a Coupon can be Cumulative * - * @covers Thelia\Coupon\Type\RemoveXPercent::getCode - * @covers Thelia\Coupon\Type\RemoveXPercent::getTitle - * @covers Thelia\Coupon\Type\RemoveXPercent::getShortDescription - * @covers Thelia\Coupon\Type\RemoveXPercent::getDescription - * - */ - public function testDisplay() - { - - $coupon = $this->generateValidCumulativeRemovingPostageCoupon(); - - $expected = self::VALID_COUPON_CODE; - $actual = $coupon->getCode(); - $this->assertEquals($expected, $actual); - - $expected = self::VALID_COUPON_TITLE; - $actual = $coupon->getTitle(); - $this->assertEquals($expected, $actual); - - $expected = self::VALID_COUPON_SHORT_DESCRIPTION; - $actual = $coupon->getShortDescription(); - $this->assertEquals($expected, $actual); - - $expected = self::VALID_COUPON_DESCRIPTION; - $actual = $coupon->getDescription(); - $this->assertEquals($expected, $actual); - - } - - - /** - * - * @covers Thelia\Coupon\Type\RemoveXPercent::isCumulative + * @covers Thelia\Coupon\type\RemoveXAmount::isCumulative * */ public function testIsCumulative() { - - $coupon = $this->generateValidCumulativeRemovingPostageCoupon(); + $coupon = self::generateValidCoupon(null, null, null, null, null, null, null, null, true, true); $actual = $coupon->isCumulative(); $this->assertTrue($actual); } /** + * Test if a Coupon can be non cumulative * - * @covers Thelia\Coupon\Type\RemoveXPercent::isCumulative + * @covers Thelia\Coupon\type\RemoveXAmount::isCumulative * */ public function testIsNotCumulative() { - - $coupon = $this->generateValidNonCumulativeNonRemovingPostageCoupon(); + $coupon = self::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); $actual = $coupon->isCumulative(); $this->assertFalse($actual); @@ -141,28 +85,27 @@ class RemoveXPercentTest extends \PHPUnit_Framework_TestCase /** + * Test if a Coupon can remove postage * - * @covers Thelia\Coupon\Type\RemoveXPercent::isRemovingPostage + * @covers Thelia\Coupon\type\RemoveXAmount::isRemovingPostage * */ public function testIsRemovingPostage() { - - $coupon = $this->generateValidCumulativeRemovingPostageCoupon(); + $coupon = self::generateValidCoupon(null, null, null, null, null, null, null, null, true, true); $actual = $coupon->isRemovingPostage(); $this->assertTrue($actual); } /** + * Test if a Coupon won't remove postage if not set to * - * @covers Thelia\Coupon\Type\RemoveXPercent::isRemovingPostage - * + * @covers Thelia\Coupon\type\RemoveXAmount::isRemovingPostage */ public function testIsNotRemovingPostage() { - - $coupon = $this->generateValidNonCumulativeNonRemovingPostageCoupon(); + $coupon = self::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); $actual = $coupon->isRemovingPostage(); $this->assertFalse($actual); @@ -170,20 +113,337 @@ class RemoveXPercentTest extends \PHPUnit_Framework_TestCase /** + * Test if a Coupon has the effect expected (discount 10euros) * - * @covers Thelia\Coupon\Type\RemoveXPercent::getDiscount - * + * @covers Thelia\Coupon\type\RemoveXAmount::getEffect */ public function testGetEffect() { + $adapter = $this->generateFakeAdapter(245); + $coupon = self::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); - $coupon = $this->generateValidNonCumulativeNonRemovingPostageCoupon(); - - $expected = -30.00; - $actual = $coupon->getDiscount(); + $expected = 24.50; + $actual = $coupon->getDiscount($adapter); $this->assertEquals($expected, $actual); } + /** + * Test Coupon rule setter + * + * @covers Thelia\Coupon\type\RemoveXAmount::setRules + * @covers Thelia\Coupon\type\RemoveXAmount::getRules + */ + public function testSetRulesValid() + { + // Given + $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( + Operators::EQUAL, + 20.00 + ); + $rule1 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( + Operators::INFERIOR, + 100.23 + ); + $rule2 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( + Operators::SUPERIOR, + 421.23 + ); + + $coupon = self::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); + + // When + $coupon->setRules(new CouponRuleCollection(array($rule0, $rule1, $rule2))); + + // Then + $expected = 3; + $this->assertCount($expected, $coupon->getRules()->getRules()); + } + + /** + * Test Coupon rule setter + * + * @covers Thelia\Coupon\type\RemoveXAmount::setRules + * @expectedException \Thelia\Exception\InvalidRuleException + * + */ + public function testSetRulesInvalid() + { + // Given + $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( + Operators::EQUAL, + 20.00 + ); + $rule1 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( + Operators::INFERIOR, + 100.23 + ); + $rule2 = $this; + + $coupon = self::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); + + // When + $coupon->setRules(new CouponRuleCollection(array($rule0, $rule1, $rule2))); + } + + /** + * Test Coupon effect for rule Total Amount < 400 + * + * @covers Thelia\Coupon\type\RemoveXAmount::getEffect + * + */ + public function testGetEffectIfTotalAmountInferiorTo400Valid() + { + // Given + $adapter = $this->generateFakeAdapter(245); + $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( + Operators::INFERIOR, + 400.00 + ); + $coupon = self::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); + + // When + $coupon->setRules(new CouponRuleCollection(array($rule0))); + + // Then + $expected = 24.50; + $actual = $coupon->getDiscount($adapter); + $this->assertEquals($expected, $actual); + } + + /** + * Test Coupon effect for rule Total Amount <= 400 + * + * @covers Thelia\Coupon\type\RemoveXAmount::getEffect + * + */ + public function testGetEffectIfTotalAmountInferiorOrEqualTo400Valid() + { + // Given + $adapter = $this->generateFakeAdapter(245); + $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( + Operators::INFERIOR_OR_EQUAL, + 400.00 + ); + $coupon = self::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); + + // When + $coupon->setRules(new CouponRuleCollection(array($rule0))); + + // Then + $expected = 24.50; + $actual = $coupon->getDiscount($adapter); + $this->assertEquals($expected, $actual); + } + + /** + * Test Coupon effect for rule Total Amount == 400 + * + * @covers Thelia\Coupon\type\RemoveXAmount::getEffect + * + */ + public function testGetEffectIfTotalAmountEqualTo400Valid() + { + // Given + $adapter = $this->generateFakeAdapter(245); + $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( + Operators::EQUAL, + 400.00 + ); + $coupon = self::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); + + // When + $coupon->setRules(new CouponRuleCollection(array($rule0))); + + // Then + $expected = 24.50; + $actual = $coupon->getDiscount($adapter); + $this->assertEquals($expected, $actual); + } + + /** + * Test Coupon effect for rule Total Amount >= 400 + * + * @covers Thelia\Coupon\type\RemoveXAmount::getEffect + * + */ + public function testGetEffectIfTotalAmountSuperiorOrEqualTo400Valid() + { + // Given + $adapter = $this->generateFakeAdapter(245); + $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( + Operators::SUPERIOR_OR_EQUAL, + 400.00 + ); + $coupon = self::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); + + // When + $coupon->setRules(new CouponRuleCollection(array($rule0))); + + // Then + $expected = 24.50; + $actual = $coupon->getDiscount($adapter); + $this->assertEquals($expected, $actual); + } + + /** + * Test Coupon effect for rule Total Amount > 400 + * + * @covers Thelia\Coupon\type\RemoveXAmount::getEffect + * + */ + public function testGetEffectIfTotalAmountSuperiorTo400Valid() + { + // Given + $adapter = $this->generateFakeAdapter(245); + $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( + Operators::SUPERIOR, + 400.00 + ); + $coupon = self::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); + + // When + $coupon->setRules(new CouponRuleCollection(array($rule0))); + + // Then + $expected = 24.50; + $actual = $coupon->getDiscount($adapter); + $this->assertEquals($expected, $actual); + } + + /** + * Generate valid CouponInterface + * + * @param string $code Coupon Code + * @param string $title Coupon Title + * @param string $shortDescription Coupon short + * description + * @param string $description Coupon description + * @param float $amount Coupon discount + * @param bool $isEnabled Is Coupon enabled + * @param \DateTime $expirationDate Coupon expiration date + * @param CouponRuleCollection $rules Coupon rules + * @param bool $isCumulative If is cumulative + * @param bool $isRemovingPostage If is removing postage + * @param bool $isAvailableOnSpecialOffers If is available on + * special offers or not + * @param int $maxUsage How many time a Coupon + * can be used + * + * @return CouponInterface + */ + public static function generateValidCoupon( + $code = null, + $title = null, + $shortDescription = null, + $description = null, + $percent = null, + $isEnabled = null, + $expirationDate = null, + $rules = null, + $isCumulative = null, + $isRemovingPostage = null, + $isAvailableOnSpecialOffers = null, + $maxUsage = null + ) { + $adapter = new CouponBaseAdapter(); + if ($code === null) { + $code = CouponManagerTest::VALID_CODE; + } + if ($title === null) { + $title = CouponManagerTest::VALID_TITLE; + } + if ($shortDescription === null) { + $shortDescription = CouponManagerTest::VALID_SHORT_DESCRIPTION; + } + if ($description === null) { + $description = CouponManagerTest::VALID_DESCRIPTION; + } + if ($percent === null) { + $percent = 10.00; + } + if ($isEnabled === null) { + $isEnabled = true; + } + if ($isCumulative === null) { + $isCumulative = true; + } + if ($isRemovingPostage === null) { + $isRemovingPostage = false; + } + if ($isAvailableOnSpecialOffers === null) { + $isAvailableOnSpecialOffers = true; + } + if ($maxUsage === null) { + $maxUsage = 40; + } + + if ($expirationDate === null) { + $expirationDate = new \DateTime(); + $expirationDate->setTimestamp(strtotime("today + 2 months")); + } + + $coupon = new RemoveXPercent($adapter, $code, $title, $shortDescription, $description, $percent, $isCumulative, $isRemovingPostage, $isAvailableOnSpecialOffers, $isEnabled, $maxUsage, $expirationDate); + + if ($rules === null) { + $rules = CouponManagerTest::generateValidRules(); + } + + $coupon->setRules($rules); + + return $coupon; + } + + + /** + * Generate valid rule AvailableForTotalAmount + * according to given operator and amount + * + * @param string $operator Operators::CONST + * @param float $amount Amount with 2 decimals + * + * @return AvailableForTotalAmount + */ + protected function generateValidRuleAvailableForTotalAmountOperatorTo($operator, $amount) + { + $adapter = new CouponBaseAdapter(); + $validators = array( + AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( + $operator, + new PriceParam( + $adapter, + $amount, + 'EUR' + ) + ) + ); + + return new AvailableForTotalAmount($validators); + } + + /** + * Generate a fake Adapter + * + * @param float $cartTotalPrice Cart total price + * + * @return \PHPUnit_Framework_MockObject_MockObject + */ + public function generateFakeAdapter($cartTotalPrice) + { + $stubCouponBaseAdapter = $this->getMock( + 'Thelia\Coupon\CouponBaseAdapter', + array( + 'getCartTotalPrice' + ), + array() + ); + + $stubCouponBaseAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(($cartTotalPrice))); + + return $stubCouponBaseAdapter; + } + /** * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. From 50d50d3b91ac7b7799192b63fe82b46ff65c150d Mon Sep 17 00:00:00 2001 From: gmorel Date: Wed, 28 Aug 2013 09:33:33 +0200 Subject: [PATCH 012/125] WIP Coupon Refactor : creating dedicated reusable module for Constraints Adding ConstraintManager Secured : - Effects : RemoveXPercent + RemoveXAmount - Validators : all except ModelParam (need CustomerModelParam, AreaModelParam, CountryModelParam ?) - Conditions : AvailableForTotalAmount --- .../Rule/AvailableForTotalAmount.php | 24 ++- .../Constraint/Rule/AvailableForXArticles.php | 139 +++++++++++++++++- .../Constraint/Rule/CouponRuleAbstract.php | 26 ++-- .../Constraint/Rule/CouponRuleInterface.php | 5 +- .../lib/Thelia/Coupon/Type/CouponAbstract.php | 5 +- .../Thelia/Coupon/Type/CouponInterface.php | 7 +- .../lib/Thelia/Coupon/Type/RemoveXPercent.php | 7 +- .../Constraint/ConstraintManagerTest.php | 75 +--------- .../Rule/AvailableForTotalAmountTest.php | 91 +++++++----- .../Rule/AvailableForXArticlesTest.php | 87 ++++++----- .../Tests/Constraint/Rule/OperatorsTest.php | 54 ++++--- .../Validator/QuantityParamTest.php | 3 +- .../Thelia/Tests/Coupon/CouponFactoryTest.php | 4 +- .../Thelia/Tests/Coupon/CouponManagerTest.php | 10 +- .../Tests/Coupon/CouponRuleCollectionTest.php | 4 +- .../Type/RemoveXAmountForCategoryYTest.php | 7 + .../Tests/Coupon/Type/RemoveXAmountTest.php | 14 +- .../Type/RemoveXPercentForCategoryYTest.php | 7 + .../Tests/Coupon/Type/RemoveXPercentTest.php | 46 +++--- 19 files changed, 350 insertions(+), 265 deletions(-) diff --git a/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmount.php b/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmount.php index 704df073e..a6e5d60ee 100644 --- a/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmount.php +++ b/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmount.php @@ -61,14 +61,16 @@ class AvailableForTotalAmount extends CouponRuleAbstract /** * Constructor * - * @param array $validators Array of RuleValidator - * validating $paramsToValidate against + * @param CouponAdapterInterface $adapter allowing to gather + * all necessary Thelia variables + * @param array $validators Array of RuleValidator + * validating $paramsToValidate against * * @throws \Thelia\Exception\InvalidRuleException */ - public function __construct(array $validators) + public function __construct(CouponAdapterInterface $adapter, array $validators) { - parent::__construct($validators); + parent::__construct($adapter, $validators); if (isset($validators[self::PARAM1_PRICE]) && $validators[self::PARAM1_PRICE] instanceof RuleValidator @@ -77,7 +79,6 @@ class AvailableForTotalAmount extends CouponRuleAbstract } else { throw new InvalidRuleException(get_class()); } - } @@ -109,8 +110,6 @@ class AvailableForTotalAmount extends CouponRuleAbstract $this->checkBackOfficeInputsOperators(); - - return $this->isPriceValid($price->getPrice()); } @@ -129,9 +128,9 @@ class AvailableForTotalAmount extends CouponRuleAbstract throw new InvalidRuleValueException(get_class(), self::PARAM1_PRICE); } - $quantity = $this->paramsToValidate[self::PARAM1_PRICE]; + $price = $this->paramsToValidate[self::PARAM1_PRICE]; - return $this->isPriceValid($quantity); + return $this->isPriceValid($price); } /** @@ -157,15 +156,12 @@ class AvailableForTotalAmount extends CouponRuleAbstract /** * Generate current Rule param to be validated from adapter * - * @param CouponAdapterInterface $adapter allowing to gather - * all necessary Thelia variables - * * @return $this */ - protected function setParametersToValidate(CouponAdapterInterface $adapter) + protected function setParametersToValidate() { $this->paramsToValidate = array( - self::PARAM1_PRICE => $adapter->getCartTotalPrice() + self::PARAM1_PRICE => $this->adapter->getCartTotalPrice() ); return $this; diff --git a/core/lib/Thelia/Constraint/Rule/AvailableForXArticles.php b/core/lib/Thelia/Constraint/Rule/AvailableForXArticles.php index b38a53ce4..1a8e17da2 100644 --- a/core/lib/Thelia/Constraint/Rule/AvailableForXArticles.php +++ b/core/lib/Thelia/Constraint/Rule/AvailableForXArticles.php @@ -23,6 +23,11 @@ namespace Thelia\Constraint\Rule; +use Thelia\Constraint\Validator\QuantityParam; +use Thelia\Constraint\Validator\RuleValidator; +use Thelia\Coupon\CouponAdapterInterface; +use Thelia\Exception\InvalidRuleValueException; + /** * Created by JetBrains PhpStorm. * Date: 8/19/13 @@ -36,15 +41,90 @@ namespace Thelia\Constraint\Rule; */ class AvailableForXArticles extends CouponRuleAbstract { + /** Rule 1st parameter : price */ + CONST PARAM1_QUANTITY = 'quantity'; + + /** @var array Available Operators (Operators::CONST) */ + protected $availableOperators = array( + Operators::INFERIOR, + Operators::EQUAL, + Operators::SUPERIOR, + ); + + /** @var RuleValidator Quantity Validator */ + protected $quantityValidator = null; + + /** + * Constructor + * + * @param CouponAdapterInterface $adapter allowing to gather + * all necessary Thelia variables + * @param array $validators Array of RuleValidator + * validating $paramsToValidate against + * + * @throws InvalidRuleException + */ + public function __construct(CouponAdapterInterface $adapter, array $validators) + { + parent::__construct($adapter, $validators); + + if (isset($validators[self::PARAM1_QUANTITY]) + && $validators[self::PARAM1_QUANTITY] instanceof RuleValidator + ) { + $this->quantityValidator = $validators[self::PARAM1_QUANTITY]; + } else { + throw new InvalidRuleException(get_class()); + } + + $this->adapter = $adapter; + } /** * Check if backoffice inputs are relevant or not * + * @throws InvalidRuleOperatorException if Operator is not allowed + * @throws InvalidRuleValueException if Value is not allowed * @return bool */ public function checkBackOfficeInput() { - // TODO: Implement checkBackOfficeInput() method. + if (!isset($this->validators) + || empty($this->validators) + ||!isset($this->validators[self::PARAM1_QUANTITY]) + ||!isset($this->validators[self::PARAM1_QUANTITY]) + ) { + throw new InvalidRuleValueException(get_class(), self::PARAM1_QUANTITY); + } + + /** @var RuleValidator $ruleValidator */ + $ruleValidator = $this->validators[self::PARAM1_QUANTITY]; + /** @var QuantityParam $quantity */ + $quantity = $ruleValidator->getParam(); + + if (!$quantity instanceof QuantityParam) { + throw new InvalidRuleValueException(get_class(), self::PARAM1_QUANTITY); + } + + $this->checkBackOfficeInputsOperators(); + + return $this->isQuantityValid($quantity->getInteger()); + } + + /** + * Generate current Rule param to be validated from adapter + * + * @param CouponAdapterInterface $adapter allowing to gather + * all necessary Thelia variables + * + * @return $this + */ + protected function setParametersToValidate() + { + $this->paramsToValidate = array( + self::PARAM1_QUANTITY => $this->adapter->getCartTotalPrice() + ); + + return $this; } /** @@ -57,4 +137,61 @@ class AvailableForXArticles extends CouponRuleAbstract // TODO: Implement checkCheckoutInput() method. } + /** + * Check if a quantity is valid + * + * @param float $quantity Quantity to check + * + * @throws InvalidRuleValueException if Value is not allowed + * @return bool + */ + protected function isQuantityValid($quantity) + { + $quantityValidator = $this->quantityValidator; + try { + $quantityValidator->getParam()->compareTo($quantity); + } catch(\InvalidArgumentException $e) { + throw new InvalidRuleValueException(get_class(), self::PARAM1_QUANTITY); + } + + return true; + } + + /** + * Get I18n name + * + * @return string + */ + public function getName() + { + return $this->adapter + ->getTranslator() + ->trans('Number of articles in cart', null, 'constraint'); + } + + /** + * Get I18n tooltip + * + * @return string + */ + public function getToolTip() + { + $i18nOperator = Operators::getI18n( + $this->adapter, $this->priceValidator->getOperator() + ); + + $toolTip = $this->adapter + ->getTranslator() + ->trans( + 'If cart products quantity is %operator% %quantity%', + array( + '%operator%' => $i18nOperator, + '%quantity%' => $this->quantityValidator->getParam()->getInteger(), + ), + 'constraint' + ); + + return $toolTip; + } + } \ No newline at end of file diff --git a/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php b/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php index 9fbcc21fc..d7a966a13 100644 --- a/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php +++ b/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php @@ -57,6 +57,9 @@ abstract class CouponRuleAbstract implements CouponRuleInterface /** @var array Parameters to be validated */ protected $paramsToValidate = array(); + /** @var CouponAdapterInterface Provide necessary value from Thelia */ + protected $adapter = null; + /** * Constructor * Ex: @@ -70,14 +73,16 @@ abstract class CouponRuleAbstract implements CouponRuleInterface * Param 2 : * $paramsToValidate[AvailableForTotalAmount::PARAM1_PRICE] = 9 * - * @param array $validators Array of RuleValidator - * validating $paramsToValidate against - * - * @throws InvalidRuleException + * @param CouponAdapterInterface $adapter allowing to gather + * all necessary Thelia variables + * @param array $validators Array of RuleValidator + * validating $paramsToValidate against */ - public function __construct(array $validators) + public function __construct(CouponAdapterInterface $adapter, array $validators) { $this->setValidators($validators); + $this->adapter = $adapter; + $this->setParametersToValidate($this->adapter); } /** @@ -104,14 +109,10 @@ abstract class CouponRuleAbstract implements CouponRuleInterface /** * Check if the current Checkout matches this condition * - * @param CouponAdapterInterface $adapter allowing to gather - * all necessary Thelia variables - * * @return bool */ - public function isMatching(CouponAdapterInterface $adapter) + public function isMatching() { - $this->setParametersToValidate($adapter); $this->checkBackOfficeInput(); $this->checkCheckoutInput(); @@ -165,13 +166,10 @@ abstract class CouponRuleAbstract implements CouponRuleInterface /** * Generate current Rule param to be validated from adapter * - * @param CouponAdapterInterface $adapter allowing to gather - * all necessary Thelia variables - * * @throws \Thelia\Exception\NotImplementedException * @return $this */ - protected function setParametersToValidate(CouponAdapterInterface $adapter) + protected function setParametersToValidate() { throw new \Thelia\Exception\NotImplementedException(); } diff --git a/core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php b/core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php index 9e75c7fe1..ea0ba42d9 100644 --- a/core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php +++ b/core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php @@ -55,12 +55,9 @@ interface CouponRuleInterface /** * Check if the current Checkout matches this condition * - * @param CouponAdapterInterface $adapter allowing to gather - * all necessary Thelia variables - * * @return bool */ - public function isMatching(CouponAdapterInterface $adapter); + public function isMatching(); /** * Return all available Operators for this Rule diff --git a/core/lib/Thelia/Coupon/Type/CouponAbstract.php b/core/lib/Thelia/Coupon/Type/CouponAbstract.php index a5e82c83e..79e0b760c 100644 --- a/core/lib/Thelia/Coupon/Type/CouponAbstract.php +++ b/core/lib/Thelia/Coupon/Type/CouponAbstract.php @@ -168,12 +168,9 @@ abstract class CouponAbstract implements CouponInterface * Return effects generated by the coupon * A negative value * - * @param CouponAdapterInterface $adapter allowing to gather - * all necessary Thelia variables - * * @return float Amount removed from the Total Checkout */ - public function getDiscount(CouponAdapterInterface $adapter) + public function getDiscount() { return $this->amount; } diff --git a/core/lib/Thelia/Coupon/Type/CouponInterface.php b/core/lib/Thelia/Coupon/Type/CouponInterface.php index 334520104..116995496 100644 --- a/core/lib/Thelia/Coupon/Type/CouponInterface.php +++ b/core/lib/Thelia/Coupon/Type/CouponInterface.php @@ -88,16 +88,13 @@ interface CouponInterface * A positive value * * Effects could also affect something else than the final Checkout price - * CouponAdapter could be use to directly pass a Session value + * CouponAdapter $adapter could be use to directly pass a Session value * some would wish to modify * Hence affecting a wide variety of Thelia elements * - * @param CouponAdapterInterface $adapter allowing to gather - * all necessary Thelia variables - * * @return float Amount removed from the Total Checkout */ - public function getDiscount(CouponAdapterInterface $adapter); + public function getDiscount(); /** * Return condition to validate the Coupon or not diff --git a/core/lib/Thelia/Coupon/Type/RemoveXPercent.php b/core/lib/Thelia/Coupon/Type/RemoveXPercent.php index 5d1d14b63..6279c3536 100644 --- a/core/lib/Thelia/Coupon/Type/RemoveXPercent.php +++ b/core/lib/Thelia/Coupon/Type/RemoveXPercent.php @@ -92,14 +92,11 @@ class RemoveXPercent extends CouponAbstract * Return effects generated by the coupon * A negative value * - * @param CouponAdapterInterface $adapter allowing to gather - * all necessary Thelia variables - * * @throws \Thelia\Exception\MissingAdapterException * @throws \InvalidArgumentException * @return float */ - public function getDiscount(CouponAdapterInterface $adapter) + public function getDiscount() { if ($this->percent >= 100) { throw new \InvalidArgumentException( @@ -107,7 +104,7 @@ class RemoveXPercent extends CouponAbstract ); } - $basePrice = $adapter->getCartTotalPrice(); + $basePrice = $this->adapter->getCartTotalPrice(); return $basePrice * (( $this->percent ) / 100); } diff --git a/core/lib/Thelia/Tests/Constraint/ConstraintManagerTest.php b/core/lib/Thelia/Tests/Constraint/ConstraintManagerTest.php index 770746ba1..08389ef9e 100644 --- a/core/lib/Thelia/Tests/Constraint/ConstraintManagerTest.php +++ b/core/lib/Thelia/Tests/Constraint/ConstraintManagerTest.php @@ -56,36 +56,11 @@ class ConstraintManagerTest extends \PHPUnit_Framework_TestCase - /** - * Generate valid CouponRuleInterfaces - * - * @return array Array of CouponRuleInterface - */ - public static function generateValidRules() + public function incompleteTest() { - $rule1 = new AvailableForTotalAmount( - array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::SUPERIOR, - new PriceParam( - , 40.00, 'EUR' - ) - ) - ) + $this->markTestIncomplete( + 'This test has not been implemented yet.' ); - $rule2 = new AvailableForTotalAmount( - array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::INFERIOR, - new PriceParam( - , 400.00, 'EUR' - ) - ) - ) - ); - $rules = new CouponRuleCollection(array($rule1, $rule2)); - - return $rules; } /** @@ -95,48 +70,4 @@ class ConstraintManagerTest extends \PHPUnit_Framework_TestCase protected function tearDown() { } - - /** - * Generate a fake Adapter - * - * @param array $coupons Coupons - * @param float $cartTotalPrice Cart total price - * @param float $checkoutTotalPrice Checkout total price - * @param float $postagePrice Checkout postage price - * - * @return \PHPUnit_Framework_MockObject_MockObject - */ - public function generateFakeAdapter(array $coupons, $cartTotalPrice, $checkoutTotalPrice, $postagePrice = 6.00) - { - $stubCouponBaseAdapter = $this->getMock( - 'Thelia\Coupon\CouponBaseAdapter', - array( - 'getCurrentCoupons', - 'getCartTotalPrice', - 'getCheckoutTotalPrice', - 'getCheckoutPostagePrice' - ), - array() - ); - - $stubCouponBaseAdapter->expects($this->any()) - ->method('getCurrentCoupons') - ->will($this->returnValue(($coupons))); - - // Return Cart product amount = $cartTotalPrice euros - $stubCouponBaseAdapter->expects($this->any()) - ->method('getCartTotalPrice') - ->will($this->returnValue($cartTotalPrice)); - - // Return Checkout amount = $checkoutTotalPrice euros - $stubCouponBaseAdapter->expects($this->any()) - ->method('getCheckoutTotalPrice') - ->will($this->returnValue($checkoutTotalPrice)); - - $stubCouponBaseAdapter->expects($this->any()) - ->method('getCheckoutPostagePrice') - ->will($this->returnValue($postagePrice)); - - return $stubCouponBaseAdapter; - } } diff --git a/core/lib/Thelia/Tests/Constraint/Rule/AvailableForTotalAmountTest.php b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForTotalAmountTest.php index 05e507863..303970e90 100644 --- a/core/lib/Thelia/Tests/Constraint/Rule/AvailableForTotalAmountTest.php +++ b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForTotalAmountTest.php @@ -50,6 +50,8 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { + /** @var CouponAdapterInterface $stubTheliaAdapter */ + $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); } /** @@ -62,11 +64,11 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase /** @var CouponAdapterInterface $stubTheliaAdapter */ $stubTheliaAdapter = $this->getMock( 'CouponBaseAdapter', - array('getCheckoutTotalPrice'), + array('getCartTotalPrice'), array() ); $stubTheliaAdapter->expects($this->any()) - ->method('getCheckoutTotalPrice') + ->method('getCartTotalPrice') ->will($this->returnValue(421.23)); return $stubTheliaAdapter; @@ -79,21 +81,20 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase */ public function testValidBackOfficeInput() { - /** @var CouponAdapterInterface $stubTheliaAdapter */ - $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); + $adapter = new CouponBaseAdapter(); $validators = array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::SUPERIOR, new PriceParam( - , 421.23, 'EUR' + $adapter, 421.23, 'EUR' ) ) ); $validated = array( - AvailableForTotalAmount::PARAM1_PRICE => $stubTheliaAdapter->getCheckoutTotalPrice() + AvailableForTotalAmount::PARAM1_PRICE => $adapter->getCartTotalPrice() ); - $rule = new AvailableForTotalAmount($validators, $validated); + $rule = new AvailableForTotalAmount($adapter, $validators, $validated); $expected = true; $actual = $rule->checkBackOfficeInput(); @@ -108,22 +109,21 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase */ public function testInValidBackOfficeInputOperator() { - /** @var CouponAdapterInterface $stubTheliaAdapter */ - $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); + $adapter = new CouponBaseAdapter(); $validators = array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( 'X', new PriceParam( - , 421.23, 'EUR' + $adapter, 421.23, 'EUR' ) ) ); $validated = array( - AvailableForTotalAmount::PARAM1_PRICE => $stubTheliaAdapter->getCheckoutTotalPrice() + AvailableForTotalAmount::PARAM1_PRICE => $adapter->getCartTotalPrice() ); - $rule = new AvailableForTotalAmount($validators, $validated); + $rule = new AvailableForTotalAmount($adapter, $validators, $validated); $expected = false; $actual = $rule->checkBackOfficeInput(); @@ -138,8 +138,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase */ public function testInValidBackOfficeInputValue() { - /** @var CouponAdapterInterface $stubTheliaAdapter */ - $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); + $adapter = new CouponBaseAdapter(); $validators = array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( @@ -149,9 +148,9 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase ); $validated = array( - AvailableForTotalAmount::PARAM1_PRICE => $stubTheliaAdapter->getCheckoutTotalPrice() + AvailableForTotalAmount::PARAM1_PRICE => $adapter->getCartTotalPrice() ); - $rule = new AvailableForTotalAmount($validators, $validated); + $rule = new AvailableForTotalAmount($adapter, $validators, $validated); $expected = false; $actual = $rule->checkBackOfficeInput(); @@ -167,22 +166,21 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase */ public function testValidCheckoutInput() { - /** @var CouponAdapterInterface $stubTheliaAdapter */ - $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); + $adapter = new CouponBaseAdapter(); $validators = array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::SUPERIOR, new PriceParam( - , 421.23, 'EUR' + $adapter, 421.23, 'EUR' ) ) ); $validated = array( - AvailableForTotalAmount::PARAM1_PRICE => $stubTheliaAdapter->getCheckoutTotalPrice() + AvailableForTotalAmount::PARAM1_PRICE => $adapter->getCartTotalPrice() ); - $rule = new AvailableForTotalAmount($validators, $validated); + $rule = new AvailableForTotalAmount($adapter, $validators, $validated); $expected = true; $actual = $rule->checkCheckoutInput(); @@ -197,11 +195,13 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase */ public function testInValidCheckoutInputValue() { + $adapter = new CouponBaseAdapter(); + $validators = array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::SUPERIOR, new PriceParam( - , 421.23, 'EUR' + $adapter, 421.23, 'EUR' ) ) ); @@ -209,7 +209,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase $validated = array( AvailableForTotalAmount::PARAM1_PRICE => 421 ); - $rule = new AvailableForTotalAmount($validators, $validated); + $rule = new AvailableForTotalAmount($adapter, $validators, $validated); $expected = false; $actual = $rule->checkCheckoutInput(); @@ -224,11 +224,13 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase */ public function testInValidCheckoutInputType() { + $adapter = new CouponBaseAdapter(); + $validators = array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::SUPERIOR, new PriceParam( - , 421.23, 'EUR' + $adapter, 421.23, 'EUR' ) ) ); @@ -236,7 +238,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase $validated = array( AvailableForTotalAmount::PARAM1_PRICE => 421 ); - $rule = new AvailableForTotalAmount($validators, $validated); + $rule = new AvailableForTotalAmount($adapter, $validators, $validated); $expected = false; $actual = $rule->checkCheckoutInput(); @@ -250,11 +252,13 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase */ public function testMatchingRuleInferior() { + $adapter = new CouponBaseAdapter(); + $validators = array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::INFERIOR, new PriceParam( - , 421.23, 'EUR' + $adapter, 421.23, 'EUR' ) ) ); @@ -262,7 +266,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase $validated = array( AvailableForTotalAmount::PARAM1_PRICE => 421.22 ); - $rule = new AvailableForTotalAmount($validators, $validated); + $rule = new AvailableForTotalAmount($adapter, $validators, $validated); $expected = true; $actual = $rule->isMatching(); @@ -276,11 +280,13 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase */ public function testNotMatchingRuleInferior() { + $adapter = new CouponBaseAdapter(); + $validators = array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::INFERIOR, new PriceParam( - , 421.23, 'EUR' + $adapter, 421.23, 'EUR' ) ) ); @@ -288,7 +294,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase $validated = array( AvailableForTotalAmount::PARAM1_PRICE => 421.23 ); - $rule = new AvailableForTotalAmount($validators, $validated); + $rule = new AvailableForTotalAmount($adapter, $validators, $validated); $expected = false; $actual = $rule->isMatching(); @@ -302,22 +308,21 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase */ public function testMatchingRuleEqual() { - /** @var CouponAdapterInterface $stubTheliaAdapter */ - $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); + $adapter = new CouponBaseAdapter(); $validators = array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::EQUAL, new PriceParam( - , 421.23, 'EUR' + $adapter, 421.23, 'EUR' ) ) ); $validated = array( - AvailableForTotalAmount::PARAM1_PRICE => $stubTheliaAdapter->getCheckoutTotalPrice() + AvailableForTotalAmount::PARAM1_PRICE => $adapter->getCartTotalPrice() ); - $rule = new AvailableForTotalAmount($validators, $validated); + $rule = new AvailableForTotalAmount($adapter, $validators, $validated); $expected = true; $actual = $rule->isMatching(); @@ -331,11 +336,13 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase */ public function testNotMatchingRuleEqual() { + $adapter = new CouponBaseAdapter(); + $validators = array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::EQUAL, new PriceParam( - , 421.23, 'EUR' + $adapter, 421.23, 'EUR' ) ) ); @@ -343,7 +350,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase $validated = array( AvailableForTotalAmount::PARAM1_PRICE => 421.22 ); - $rule = new AvailableForTotalAmount($validators, $validated); + $rule = new AvailableForTotalAmount($adapter, $validators, $validated); $expected = false; $actual = $rule->isMatching(); @@ -357,11 +364,13 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase */ public function testMatchingRuleSuperior() { + $adapter = new CouponBaseAdapter(); + $validators = array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::SUPERIOR, new PriceParam( - , 421.23, 'EUR' + $adapter, 421.23, 'EUR' ) ) ); @@ -369,7 +378,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase $validated = array( AvailableForTotalAmount::PARAM1_PRICE => 421.24 ); - $rule = new AvailableForTotalAmount($validators, $validated); + $rule = new AvailableForTotalAmount($adapter, $validators, $validated); $expected = true; $actual = $rule->isMatching(); @@ -383,11 +392,13 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase */ public function testNotMatchingRuleSuperior() { + $adapter = new CouponBaseAdapter(); + $validators = array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::SUPERIOR, new PriceParam( - , 421.23, 'EUR' + $adapter, 421.23, 'EUR' ) ) ); @@ -395,7 +406,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase $validated = array( AvailableForTotalAmount::PARAM1_PRICE => 421.23 ); - $rule = new AvailableForTotalAmount($validators, $validated); + $rule = new AvailableForTotalAmount($adapter, $validators, $validated); $expected = false; $actual = $rule->isMatching(); diff --git a/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php index 69bfd13a6..9c5808010 100644 --- a/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php +++ b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php @@ -45,16 +45,23 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { + /** @var CouponAdapterInterface $stubTheliaAdapter */ + $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); } + /** + * Return an Adapter Mock wick 4 products int the Cart + * + * @return CouponAdapterInterface + */ protected function generateValidCouponBaseAdapterMock() { /** @var CouponAdapterInterface $stubTheliaAdapter */ - $stubTheliaAdapter = $this->getMock( - 'CouponBaseAdapter', - array('getNbArticlesInCart'), - array() - ); + $stubTheliaAdapter = $this->getMock( + 'CouponBaseAdapter', + array('getNbArticlesInCart'), + array() + ); $stubTheliaAdapter->expects($this->any()) ->method('getNbArticlesInCart') ->will($this->returnValue(4)); @@ -69,12 +76,11 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase */ public function testValidBackOfficeInput() { - /** @var CouponAdapterInterface $stubTheliaAdapter */ - $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); + $adapter = new CouponBaseAdapter(); $validators = array(4); - $validated = array($stubTheliaAdapter->getNbArticlesInCart()); - $rule = new AvailableForXArticles($validators, $validated); + $validated = array($adapter->getNbArticlesInCart()); + $rule = new AvailableForXArticles($adapter, $validators, $validated); $expected = true; $actual = $rule->checkBackOfficeInput(); @@ -88,28 +94,27 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase */ public function testInValidBackOfficeInput() { - /** @var CouponAdapterInterface $stubTheliaAdapter */ - $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); + $adapter = new CouponBaseAdapter(); $validators = array(4.5); - $validated = array($stubTheliaAdapter->getNbArticlesInCart()); - $rule = new AvailableForXArticles($validators, $validated); + $validated = array($adapter->getNbArticlesInCart()); + $rule = new AvailableForXArticles($adapter, $validators, $validated); $expected = false; $actual = $rule->checkBackOfficeInput(); $this->assertEquals($expected, $actual); $validators = array(-1); - $validated = array($stubTheliaAdapter->getNbArticlesInCart()); - $rule = new AvailableForXArticles($validators, $validated); + $validated = array($adapter->getNbArticlesInCart()); + $rule = new AvailableForXArticles($adapter, $validators, $validated); $expected = false; $actual = $rule->checkBackOfficeInput(); $this->assertEquals($expected, $actual); $validators = array('bad'); - $validated = array($stubTheliaAdapter->getNbArticlesInCart()); - $rule = new AvailableForXArticles($validators, $validated); + $validated = array($adapter->getNbArticlesInCart()); + $rule = new AvailableForXArticles($adapter, $validators, $validated); $expected = false; $actual = $rule->checkBackOfficeInput(); @@ -125,12 +130,10 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase */ public function testValidCheckoutInput() { - /** @var CouponAdapterInterface $stubTheliaAdapter */ - $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); - + $adapter = new CouponBaseAdapter(); $validators = array(4); - $validated = array($stubTheliaAdapter->getNbArticlesInCart()); - $rule = new AvailableForXArticles($validators, $validated); + $validated = array($adapter->getNbArticlesInCart()); + $rule = new AvailableForXArticles($adapter, $validators, $validated); $expected = true; $actual = $rule->checkCheckoutInput(); @@ -144,28 +147,26 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase */ public function testInValidCheckoutInput() { - /** @var CouponAdapterInterface $stubTheliaAdapter */ - $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); - + $adapter = new CouponBaseAdapter(); $validators = array(4.5); - $validated = array($stubTheliaAdapter->getNbArticlesInCart()); - $rule = new AvailableForXArticles($validators, $validated); + $validated = array($adapter->getNbArticlesInCart()); + $rule = new AvailableForXArticles($adapter, $validators, $validated); $expected = false; $actual = $rule->checkCheckoutInput(); $this->assertEquals($expected, $actual); $validators = array(-1); - $validated = array($stubTheliaAdapter->getNbArticlesInCart()); - $rule = new AvailableForXArticles($validators, $validated); + $validated = array($adapter->getNbArticlesInCart()); + $rule = new AvailableForXArticles($adapter, $validators, $validated); $expected = false; $actual = $rule->checkCheckoutInput(); $this->assertEquals($expected, $actual); $validators = array('bad'); - $validated = array($stubTheliaAdapter->getNbArticlesInCart()); - $rule = new AvailableForXArticles($validators, $validated); + $validated = array($adapter->getNbArticlesInCart()); + $rule = new AvailableForXArticles($adapter, $validators, $validated); $expected = false; $actual = $rule->checkCheckoutInput(); @@ -179,12 +180,10 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase */ public function testMatchingRuleEqual() { - /** @var CouponAdapterInterface $stubTheliaAdapter */ - $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); - + $adapter = new CouponBaseAdapter(); $validators = array(4); - $validated = array($stubTheliaAdapter->getNbArticlesInCart()); - $rule = new AvailableForXArticles($validators, $validated); + $validated = array($adapter->getNbArticlesInCart()); + $rule = new AvailableForXArticles($adapter, $validators, $validated); $expected = true; $actual = $rule->isMatching(); @@ -198,12 +197,10 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase */ public function testMatchingRuleSuperior() { - /** @var CouponAdapterInterface $stubTheliaAdapter */ - $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); - + $adapter = new CouponBaseAdapter(); $validators = array(5); - $validated = array($stubTheliaAdapter->getNbArticlesInCart()); - $rule = new AvailableForXArticles($validators, $validated); + $validated = array($adapter->getNbArticlesInCart()); + $rule = new AvailableForXArticles($adapter, $validators, $validated); $expected = true; $actual = $rule->isMatching(); @@ -217,12 +214,10 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase */ public function testNotMatchingRule() { - /** @var CouponAdapterInterface $stubTheliaAdapter */ - $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); - + $adapter = new CouponBaseAdapter(); $validators = array(3); - $validated = array($stubTheliaAdapter->getNbArticlesInCart()); - $rule = new AvailableForXArticles($validators, $validated); + $validated = array($adapter->getNbArticlesInCart()); + $rule = new AvailableForXArticles($adapter, $validators, $validated); $expected = false; $actual = $rule->isMatching(); diff --git a/core/lib/Thelia/Tests/Constraint/Rule/OperatorsTest.php b/core/lib/Thelia/Tests/Constraint/Rule/OperatorsTest.php index 51d5d06f1..aecd303b2 100644 --- a/core/lib/Thelia/Tests/Constraint/Rule/OperatorsTest.php +++ b/core/lib/Thelia/Tests/Constraint/Rule/OperatorsTest.php @@ -55,10 +55,11 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase */ public function testOperatorInferiorValidBefore() { + $adapter = new CouponBaseAdapter(); // Given $a = 11; $operator = Operators::INFERIOR; - $b = new QuantityParam(, 12); + $b = new QuantityParam($adapter, 12); // When $actual = Operators::isValid($a, $operator, $b); @@ -75,9 +76,10 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase public function testOperatorInferiorInvalidEquals() { // Given + $adapter = new CouponBaseAdapter(); $a = 12; $operator = Operators::INFERIOR; - $b = new QuantityParam(, 12); + $b = new QuantityParam($adapter, 12); // When $actual = Operators::isValid($a, $operator, $b); @@ -94,9 +96,10 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase public function testOperatorInferiorInvalidAfter() { // Given + $adapter = new CouponBaseAdapter(); $a = 13; $operator = Operators::INFERIOR; - $b = new QuantityParam(, 12); + $b = new QuantityParam($adapter, 12); // When $actual = Operators::isValid($a, $operator, $b); @@ -113,9 +116,10 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase public function testOperatorInferiorOrEqualValidEqual() { // Given + $adapter = new CouponBaseAdapter(); $a = 11; $operator = Operators::INFERIOR_OR_EQUAL; - $b = new QuantityParam(, 11); + $b = new QuantityParam($adapter, 11); // When $actual = Operators::isValid($a, $operator, $b); @@ -132,9 +136,10 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase public function testOperatorInferiorOrEqualValidBefore() { // Given + $adapter = new CouponBaseAdapter(); $a = 10; $operator = Operators::INFERIOR_OR_EQUAL; - $b = new QuantityParam(, 11); + $b = new QuantityParam($adapter, 11); // When $actual = Operators::isValid($a, $operator, $b); @@ -151,9 +156,10 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase public function testOperatorInferiorOrEqualInValidAfter() { // Given + $adapter = new CouponBaseAdapter(); $a = 12; $operator = Operators::INFERIOR_OR_EQUAL; - $b = new QuantityParam(, 11); + $b = new QuantityParam($adapter, 11); // When $actual = Operators::isValid($a, $operator, $b); @@ -170,9 +176,10 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase public function testOperatorEqualValidEqual() { // Given + $adapter = new CouponBaseAdapter(); $a = 12; $operator = Operators::EQUAL; - $b = new QuantityParam(, 12); + $b = new QuantityParam($adapter, 12); // When $actual = Operators::isValid($a, $operator, $b); @@ -189,9 +196,10 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase public function testOperatorEqualInValidBefore() { // Given + $adapter = new CouponBaseAdapter(); $a = 11; $operator = Operators::EQUAL; - $b = new QuantityParam(, 12); + $b = new QuantityParam($adapter, 12); // When $actual = Operators::isValid($a, $operator, $b); @@ -208,9 +216,10 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase public function testOperatorEqualInValidAfter() { // Given + $adapter = new CouponBaseAdapter(); $a = 13; $operator = Operators::EQUAL; - $b = new QuantityParam(, 12); + $b = new QuantityParam($adapter, 12); // When $actual = Operators::isValid($a, $operator, $b); @@ -227,9 +236,10 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase public function testOperatorSuperiorOrEqualValidEqual() { // Given + $adapter = new CouponBaseAdapter(); $a = 13; $operator = Operators::SUPERIOR_OR_EQUAL; - $b = new QuantityParam(, 13); + $b = new QuantityParam($adapter, 13); // When $actual = Operators::isValid($a, $operator, $b); @@ -246,9 +256,10 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase public function testOperatorSuperiorOrEqualAfter() { // Given + $adapter = new CouponBaseAdapter(); $a = 14; $operator = Operators::SUPERIOR_OR_EQUAL; - $b = new QuantityParam(, 13); + $b = new QuantityParam($adapter, 13); // When $actual = Operators::isValid($a, $operator, $b); @@ -265,9 +276,10 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase public function testOperatorSuperiorOrEqualInvalidBefore() { // Given + $adapter = new CouponBaseAdapter(); $a = 12; $operator = Operators::SUPERIOR_OR_EQUAL; - $b = new QuantityParam(, 13); + $b = new QuantityParam($adapter, 13); // When $actual = Operators::isValid($a, $operator, $b); @@ -284,9 +296,10 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase public function testOperatorSuperiorValidAfter() { // Given + $adapter = new CouponBaseAdapter(); $a = 13; $operator = Operators::SUPERIOR; - $b = new QuantityParam(, 12); + $b = new QuantityParam($adapter, 12); // When $actual = Operators::isValid($a, $operator, $b); @@ -303,9 +316,10 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase public function testOperatorSuperiorInvalidEqual() { // Given + $adapter = new CouponBaseAdapter(); $a = 12; $operator = Operators::SUPERIOR; - $b = new QuantityParam(, 12); + $b = new QuantityParam($adapter, 12); // When $actual = Operators::isValid($a, $operator, $b); @@ -322,9 +336,10 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase public function testOperatorSuperiorInvalidBefore() { // Given + $adapter = new CouponBaseAdapter(); $a = 11; $operator = Operators::SUPERIOR; - $b = new QuantityParam(, 12); + $b = new QuantityParam($adapter, 12); // When $actual = Operators::isValid($a, $operator, $b); @@ -341,9 +356,10 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase public function testOperatorDifferentValid() { // Given + $adapter = new CouponBaseAdapter(); $a = 12; $operator = Operators::DIFFERENT; - $b = new QuantityParam(, 11); + $b = new QuantityParam($adapter, 11); // When $actual = Operators::isValid($a, $operator, $b); @@ -360,9 +376,10 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase public function testOperatorDifferentInvalidEquals() { // Given + $adapter = new CouponBaseAdapter(); $a = 11; $operator = Operators::DIFFERENT; - $b = new QuantityParam(, 11); + $b = new QuantityParam($adapter, 11); // When $actual = Operators::isValid($a, $operator, $b); @@ -379,9 +396,10 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase public function testOperatorInValid() { // Given + $adapter = new CouponBaseAdapter(); $a = 12; $operator = 'X'; - $b = new QuantityParam(, 11); + $b = new QuantityParam($adapter, 11); // When $actual = Operators::isValid($a, $operator, $b); diff --git a/core/lib/Thelia/Tests/Constraint/Validator/QuantityParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/QuantityParamTest.php index 9543388f6..bd83d45db 100644 --- a/core/lib/Thelia/Tests/Constraint/Validator/QuantityParamTest.php +++ b/core/lib/Thelia/Tests/Constraint/Validator/QuantityParamTest.php @@ -24,6 +24,7 @@ namespace Thelia\Coupon; use InvalidArgumentException; +use Thelia\Constraint\Validator\PriceParam; use Thelia\Constraint\Validator\QuantityParam; /** @@ -173,7 +174,7 @@ class QuantityParamTest extends \PHPUnit_Framework_TestCase $this->assertEquals($param->getValue(), $unserialized->getValue()); $this->assertEquals($param->getInteger(), $unserialized->getInteger()); - $new = new PriceParam($adapter, $unserialized->getInteger()); + $new = new QuantityParam($adapter, $unserialized->getInteger()); $this->assertEquals($param->getInteger(), $new->getInteger()); } diff --git a/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php b/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php index f3cf99054..c4006be0d 100644 --- a/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php +++ b/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php @@ -204,7 +204,7 @@ class CouponFactoryTest extends \PHPUnit_Framework_TestCase protected function generateValidRules() { $rule1 = new AvailableForTotalAmount( - array( + , array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::SUPERIOR, new PriceParam( @@ -214,7 +214,7 @@ class CouponFactoryTest extends \PHPUnit_Framework_TestCase ) ); $rule2 = new AvailableForTotalAmount( - array( + , array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::INFERIOR, new PriceParam( diff --git a/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php b/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php index 08673746e..9d171a021 100644 --- a/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php +++ b/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php @@ -110,7 +110,7 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua /** @var CouponInterface $coupon1 */ $coupon1 = self::generateValidCoupon(); $rule1 = new AvailableForTotalAmount( - array( + $adapter, array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::SUPERIOR, new PriceParam( @@ -148,7 +148,7 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua $checkoutTotalPrice = 26.00; $rule1 = new AvailableForTotalAmount( - array( + $adapter, array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::SUPERIOR, new PriceParam( @@ -185,7 +185,7 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua $checkoutTotalPrice = 27.00; $rule1 = new AvailableForTotalAmount( - array( + $adapter, array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::SUPERIOR, new PriceParam( @@ -642,7 +642,7 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua { $adapter = new CouponBaseAdapter(); $rule1 = new AvailableForTotalAmount( - array( + $adapter, array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::SUPERIOR, new PriceParam( @@ -652,7 +652,7 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua ) ); $rule2 = new AvailableForTotalAmount( - array( + $adapter, array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::INFERIOR, new PriceParam( diff --git a/core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php b/core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php index eab22758b..e1ad4ecdd 100644 --- a/core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php +++ b/core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php @@ -47,7 +47,7 @@ class CouponRuleCollectionTest extends \PHPUnit_Framework_TestCase public function testRuleSerialisation() { $rule1 = new AvailableForTotalAmount( - array( + , array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::SUPERIOR, new PriceParam( @@ -57,7 +57,7 @@ class CouponRuleCollectionTest extends \PHPUnit_Framework_TestCase ) ); $rule2 = new AvailableForTotalAmount( - array( + , array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( Operators::INFERIOR, new PriceParam( diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountForCategoryYTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountForCategoryYTest.php index 65bf2e344..896cc5feb 100644 --- a/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountForCategoryYTest.php +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountForCategoryYTest.php @@ -45,6 +45,13 @@ class RemoveXAmountForCategoryYTest extends \PHPUnit_Framework_TestCase { } + public function incompleteTest() + { + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); + } + /** * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php index 69e01549f..182594666 100644 --- a/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php @@ -151,7 +151,7 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); $expected = 10; - $actual = $coupon->getDiscount($adapter); + $actual = $coupon->getDiscount(); $this->assertEquals($expected, $actual); } @@ -234,7 +234,7 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase // Then $expected = 10.00; - $actual = $coupon->getDiscount($adapter); + $actual = $coupon->getDiscount(); $this->assertEquals($expected, $actual); } @@ -259,7 +259,7 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase // Then $expected = 10.00; - $actual = $coupon->getDiscount($adapter); + $actual = $coupon->getDiscount(); $this->assertEquals($expected, $actual); } @@ -284,7 +284,7 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase // Then $expected = 10.00; - $actual = $coupon->getDiscount($adapter); + $actual = $coupon->getDiscount(); $this->assertEquals($expected, $actual); } @@ -309,7 +309,7 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase // Then $expected = 10.00; - $actual = $coupon->getDiscount($adapter); + $actual = $coupon->getDiscount(); $this->assertEquals($expected, $actual); } @@ -334,7 +334,7 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase // Then $expected = 10.00; - $actual = $coupon->getDiscount($adapter); + $actual = $coupon->getDiscount(); $this->assertEquals($expected, $actual); } @@ -371,7 +371,7 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase ) ); - return new AvailableForTotalAmount($validators); + return new AvailableForTotalAmount($adapter, $validators); } } diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentForCategoryYTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentForCategoryYTest.php index 24388104d..1ea0c67bb 100644 --- a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentForCategoryYTest.php +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentForCategoryYTest.php @@ -45,6 +45,13 @@ class RemoveXPercentForCategoryYTest extends \PHPUnit_Framework_TestCase { } + public function incompleteTest() + { + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); + } + /** * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php index 5b80ac1a3..67d09341c 100644 --- a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php @@ -63,7 +63,7 @@ class RemoveXPercentTest extends \PHPUnit_Framework_TestCase */ public function testIsCumulative() { - $coupon = self::generateValidCoupon(null, null, null, null, null, null, null, null, true, true); + $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, true, true); $actual = $coupon->isCumulative(); $this->assertTrue($actual); @@ -77,7 +77,7 @@ class RemoveXPercentTest extends \PHPUnit_Framework_TestCase */ public function testIsNotCumulative() { - $coupon = self::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); + $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false); $actual = $coupon->isCumulative(); $this->assertFalse($actual); @@ -92,7 +92,7 @@ class RemoveXPercentTest extends \PHPUnit_Framework_TestCase */ public function testIsRemovingPostage() { - $coupon = self::generateValidCoupon(null, null, null, null, null, null, null, null, true, true); + $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, true, true); $actual = $coupon->isRemovingPostage(); $this->assertTrue($actual); @@ -105,7 +105,7 @@ class RemoveXPercentTest extends \PHPUnit_Framework_TestCase */ public function testIsNotRemovingPostage() { - $coupon = self::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); + $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false); $actual = $coupon->isRemovingPostage(); $this->assertFalse($actual); @@ -120,7 +120,7 @@ class RemoveXPercentTest extends \PHPUnit_Framework_TestCase public function testGetEffect() { $adapter = $this->generateFakeAdapter(245); - $coupon = self::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); + $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false); $expected = 24.50; $actual = $coupon->getDiscount($adapter); @@ -149,7 +149,7 @@ class RemoveXPercentTest extends \PHPUnit_Framework_TestCase 421.23 ); - $coupon = self::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); + $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false); // When $coupon->setRules(new CouponRuleCollection(array($rule0, $rule1, $rule2))); @@ -179,7 +179,7 @@ class RemoveXPercentTest extends \PHPUnit_Framework_TestCase ); $rule2 = $this; - $coupon = self::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); + $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false); // When $coupon->setRules(new CouponRuleCollection(array($rule0, $rule1, $rule2))); @@ -194,19 +194,18 @@ class RemoveXPercentTest extends \PHPUnit_Framework_TestCase public function testGetEffectIfTotalAmountInferiorTo400Valid() { // Given - $adapter = $this->generateFakeAdapter(245); $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( Operators::INFERIOR, 400.00 ); - $coupon = self::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); + $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false); // When $coupon->setRules(new CouponRuleCollection(array($rule0))); // Then $expected = 24.50; - $actual = $coupon->getDiscount($adapter); + $actual = $coupon->getDiscount(); $this->assertEquals($expected, $actual); } @@ -219,19 +218,18 @@ class RemoveXPercentTest extends \PHPUnit_Framework_TestCase public function testGetEffectIfTotalAmountInferiorOrEqualTo400Valid() { // Given - $adapter = $this->generateFakeAdapter(245); $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( Operators::INFERIOR_OR_EQUAL, 400.00 ); - $coupon = self::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); + $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false); // When $coupon->setRules(new CouponRuleCollection(array($rule0))); // Then $expected = 24.50; - $actual = $coupon->getDiscount($adapter); + $actual = $coupon->getDiscount(); $this->assertEquals($expected, $actual); } @@ -244,19 +242,18 @@ class RemoveXPercentTest extends \PHPUnit_Framework_TestCase public function testGetEffectIfTotalAmountEqualTo400Valid() { // Given - $adapter = $this->generateFakeAdapter(245); $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( Operators::EQUAL, 400.00 ); - $coupon = self::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); + $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false); // When $coupon->setRules(new CouponRuleCollection(array($rule0))); // Then $expected = 24.50; - $actual = $coupon->getDiscount($adapter); + $actual = $coupon->getDiscount(); $this->assertEquals($expected, $actual); } @@ -269,19 +266,18 @@ class RemoveXPercentTest extends \PHPUnit_Framework_TestCase public function testGetEffectIfTotalAmountSuperiorOrEqualTo400Valid() { // Given - $adapter = $this->generateFakeAdapter(245); $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( Operators::SUPERIOR_OR_EQUAL, 400.00 ); - $coupon = self::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); + $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false); // When $coupon->setRules(new CouponRuleCollection(array($rule0))); // Then $expected = 24.50; - $actual = $coupon->getDiscount($adapter); + $actual = $coupon->getDiscount(); $this->assertEquals($expected, $actual); } @@ -294,19 +290,18 @@ class RemoveXPercentTest extends \PHPUnit_Framework_TestCase public function testGetEffectIfTotalAmountSuperiorTo400Valid() { // Given - $adapter = $this->generateFakeAdapter(245); $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( Operators::SUPERIOR, 400.00 ); - $coupon = self::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); + $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false); // When $coupon->setRules(new CouponRuleCollection(array($rule0))); // Then $expected = 24.50; - $actual = $coupon->getDiscount($adapter); + $actual = $coupon->getDiscount(); $this->assertEquals($expected, $actual); } @@ -331,7 +326,7 @@ class RemoveXPercentTest extends \PHPUnit_Framework_TestCase * * @return CouponInterface */ - public static function generateValidCoupon( + public function generateValidCoupon( $code = null, $title = null, $shortDescription = null, @@ -345,7 +340,8 @@ class RemoveXPercentTest extends \PHPUnit_Framework_TestCase $isAvailableOnSpecialOffers = null, $maxUsage = null ) { - $adapter = new CouponBaseAdapter(); + $adapter = $this->generateFakeAdapter(245); + if ($code === null) { $code = CouponManagerTest::VALID_CODE; } @@ -417,7 +413,7 @@ class RemoveXPercentTest extends \PHPUnit_Framework_TestCase ) ); - return new AvailableForTotalAmount($validators); + return new AvailableForTotalAmount($adapter, $validators); } /** From f1ed03a96a81d5a051f0da9d44a204933ada8c26 Mon Sep 17 00:00:00 2001 From: gmorel Date: Wed, 28 Aug 2013 09:35:56 +0200 Subject: [PATCH 013/125] WIP Coupon Refactor : creating dedicated reusable module for Constraints Adding ConstraintManager Secured : - Effects : RemoveXPercent + RemoveXAmount - Validators : all except ModelParam (need CustomerModelParam, AreaModelParam, CountryModelParam ?) - Conditions : AvailableForTotalAmount --- .gitignore | 2 ++ composer.lock | 91 ++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 71 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index cad92f7a8..d0a538143 100755 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,5 @@ web/cache/* web/.htaccess phpdoc*.log php-cs +xhprof +phpunit.phar diff --git a/composer.lock b/composer.lock index d84eeb977..c10b85655 100755 --- a/composer.lock +++ b/composer.lock @@ -3,7 +3,7 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "458aeccc06b7394d7653a9063b6fd981", + "hash": "6f8ad7a37d85013a8c8f99611c0f1b84", "packages": [ { "name": "ezyang/htmlpurifier", @@ -11,12 +11,12 @@ "source": { "type": "git", "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "19eee1489965d9bc6eded80f847ced2382127261" + "reference": "fac747bdbdba6aeaba4bed91ef49b2378c1798e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/19eee1489965d9bc6eded80f847ced2382127261", - "reference": "19eee1489965d9bc6eded80f847ced2382127261", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/fac747bdbdba6aeaba4bed91ef49b2378c1798e4", + "reference": "fac747bdbdba6aeaba4bed91ef49b2378c1798e4", "shasum": "" }, "require": { @@ -47,7 +47,7 @@ "keywords": [ "html" ], - "time": "2013-07-27 04:54:53" + "time": "2013-08-18 02:27:26" }, { "name": "imagine/imagine", @@ -55,12 +55,12 @@ "source": { "type": "git", "url": "https://github.com/avalanche123/Imagine.git", - "reference": "v0.5.0" + "reference": "f64ec666baaa800edcbf237db41121a569230709" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/avalanche123/Imagine/zipball/v0.5.0", - "reference": "v0.5.0", + "url": "https://api.github.com/repos/avalanche123/Imagine/zipball/f64ec666baaa800edcbf237db41121a569230709", + "reference": "f64ec666baaa800edcbf237db41121a569230709", "shasum": "" }, "require": { @@ -128,7 +128,7 @@ "authors": [ { "name": "Anthony Ferrara", - "email": "ircmaxell@php.net", + "email": "ircmaxell@ircmaxell.com", "homepage": "http://blog.ircmaxell.com" } ], @@ -356,12 +356,12 @@ "source": { "type": "git", "url": "https://github.com/krichprollsch/phpCssEmbed.git", - "reference": "v1.0.2" + "reference": "406c6d5b846cafa9186f9944a6210d0e6fed154b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/krichprollsch/phpCssEmbed/zipball/v1.0.2", - "reference": "v1.0.2", + "url": "https://api.github.com/repos/krichprollsch/phpCssEmbed/zipball/406c6d5b846cafa9186f9944a6210d0e6fed154b", + "reference": "406c6d5b846cafa9186f9944a6210d0e6fed154b", "shasum": "" }, "require": { @@ -798,12 +798,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Filesystem.git", - "reference": "v2.2.5" + "reference": "fa16b9ab446b84371a63ab391133ff58134edff1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Filesystem/zipball/v2.2.5", - "reference": "v2.2.5", + "url": "https://api.github.com/repos/symfony/Filesystem/zipball/fa16b9ab446b84371a63ab391133ff58134edff1", + "reference": "fa16b9ab446b84371a63ab391133ff58134edff1", "shasum": "" }, "require": { @@ -1071,18 +1071,18 @@ "source": { "type": "git", "url": "https://github.com/symfony/Icu.git", - "reference": "v1.2.0" + "reference": "7299cd3d8d6602103d1ebff5d0a9917b7bc6de72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Icu/zipball/v1.2.0", - "reference": "v1.2.0", + "url": "https://api.github.com/repos/symfony/Icu/zipball/7299cd3d8d6602103d1ebff5d0a9917b7bc6de72", + "reference": "7299cd3d8d6602103d1ebff5d0a9917b7bc6de72", "shasum": "" }, "require": { "lib-icu": ">=4.4", "php": ">=5.3.3", - "symfony/intl": ">=2.3,<3.0" + "symfony/intl": "~2.3" }, "type": "library", "autoload": { @@ -1452,6 +1452,53 @@ "homepage": "http://symfony.com", "time": "2013-07-30 11:22:46" }, + { + "name": "symfony/serializer", + "version": "v2.2.5", + "target-dir": "Symfony/Component/Serializer", + "source": { + "type": "git", + "url": "https://github.com/symfony/Serializer.git", + "reference": "v2.2.5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Serializer/zipball/v2.2.5", + "reference": "v2.2.5", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Serializer\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Serializer Component", + "homepage": "http://symfony.com", + "time": "2013-05-08 08:39:40" + }, { "name": "symfony/translation", "version": "v2.2.5", @@ -1459,12 +1506,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Translation.git", - "reference": "v2.2.5" + "reference": "32a1531e6298c037041ec82be95600e258938218" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Translation/zipball/v2.2.5", - "reference": "v2.2.5", + "url": "https://api.github.com/repos/symfony/Translation/zipball/32a1531e6298c037041ec82be95600e258938218", + "reference": "32a1531e6298c037041ec82be95600e258938218", "shasum": "" }, "require": { From 3696ce4a4b7546819eb0f3bc9696d73efce6f790 Mon Sep 17 00:00:00 2001 From: gmorel Date: Wed, 28 Aug 2013 11:22:49 +0200 Subject: [PATCH 014/125] WIP All Unit Test are green --- .../Constraint/Rule/AvailableForXArticles.php | 16 +- .../Constraint/Rule/CouponRuleAbstract.php | 6 + .../Constraint/Validator/QuantityParam.php | 3 - .../Rule/AvailableForTotalAmountTest.php | 112 +++---- .../Rule/AvailableForXArticlesTest.php | 284 ++++++++++++++---- 5 files changed, 289 insertions(+), 132 deletions(-) diff --git a/core/lib/Thelia/Constraint/Rule/AvailableForXArticles.php b/core/lib/Thelia/Constraint/Rule/AvailableForXArticles.php index 1a8e17da2..9de10b2bb 100644 --- a/core/lib/Thelia/Constraint/Rule/AvailableForXArticles.php +++ b/core/lib/Thelia/Constraint/Rule/AvailableForXArticles.php @@ -41,7 +41,7 @@ use Thelia\Exception\InvalidRuleValueException; */ class AvailableForXArticles extends CouponRuleAbstract { - /** Rule 1st parameter : price */ + /** Rule 1st parameter : quantity */ CONST PARAM1_QUANTITY = 'quantity'; /** @var array Available Operators (Operators::CONST) */ @@ -121,7 +121,7 @@ class AvailableForXArticles extends CouponRuleAbstract protected function setParametersToValidate() { $this->paramsToValidate = array( - self::PARAM1_QUANTITY => $this->adapter->getCartTotalPrice() + self::PARAM1_QUANTITY => $this->adapter->getNbArticlesInCart() ); return $this; @@ -130,11 +130,21 @@ class AvailableForXArticles extends CouponRuleAbstract /** * Check if Checkout inputs are relevant or not * + * @throws \Thelia\Exception\InvalidRuleValueException * @return bool */ public function checkCheckoutInput() { - // TODO: Implement checkCheckoutInput() method. + if (!isset($this->paramsToValidate) + || empty($this->paramsToValidate) + ||!isset($this->paramsToValidate[self::PARAM1_QUANTITY]) + ) { + throw new InvalidRuleValueException(get_class(), self::PARAM1_QUANTITY); + } + + $price = $this->paramsToValidate[self::PARAM1_QUANTITY]; + + return $this->isQuantityValid($price); } /** diff --git a/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php b/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php index d7a966a13..ff97ee3a0 100644 --- a/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php +++ b/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php @@ -100,6 +100,12 @@ abstract class CouponRuleAbstract implements CouponRuleInterface if (!$validator instanceof RuleValidator) { throw new InvalidRuleException(get_class()); } + if (!in_array($validator->getOperator(), $this->availableOperators)) { + throw new InvalidRuleOperatorException( + get_class(), + $validator->getOperator() + ); + } } $this->validators = $validators; diff --git a/core/lib/Thelia/Constraint/Validator/QuantityParam.php b/core/lib/Thelia/Constraint/Validator/QuantityParam.php index 5d5132e5b..ac6fcf851 100644 --- a/core/lib/Thelia/Constraint/Validator/QuantityParam.php +++ b/core/lib/Thelia/Constraint/Validator/QuantityParam.php @@ -47,9 +47,6 @@ class QuantityParam extends IntegerParam */ public function __construct(CouponAdapterInterface $adapter, $integer) { - if ($integer < 0) { - $integer = 0; - } $this->integer = $integer; $this->adapter = $adapter; } diff --git a/core/lib/Thelia/Tests/Constraint/Rule/AvailableForTotalAmountTest.php b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForTotalAmountTest.php index 303970e90..f13e59238 100644 --- a/core/lib/Thelia/Tests/Constraint/Rule/AvailableForTotalAmountTest.php +++ b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForTotalAmountTest.php @@ -43,6 +43,8 @@ use Thelia\Exception\InvalidRuleValueException; */ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase { + /** @var CouponAdapterInterface $stubTheliaAdapter */ + protected $stubTheliaAdapter = null; /** * Sets up the fixture, for example, opens a network connection. @@ -51,30 +53,33 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase protected function setUp() { /** @var CouponAdapterInterface $stubTheliaAdapter */ - $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); + $this->stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); } /** * Generate valid CouponBaseAdapter * + * @param float $cartTotalPrice Total amount of the current Cart + * * @return CouponAdapterInterface */ - protected function generateValidCouponBaseAdapterMock() + protected function generateValidCouponBaseAdapterMock($cartTotalPrice = 421.23) { /** @var CouponAdapterInterface $stubTheliaAdapter */ - $stubTheliaAdapter = $this->getMock( - 'CouponBaseAdapter', - array('getCartTotalPrice'), - array() - ); + $stubTheliaAdapter = $this->getMock( + 'Thelia\Coupon\CouponBaseAdapter', + array('getCartTotalPrice'), + array() + ); $stubTheliaAdapter->expects($this->any()) ->method('getCartTotalPrice') - ->will($this->returnValue(421.23)); + ->will($this->returnValue($cartTotalPrice)); return $stubTheliaAdapter; } /** + * Check if validity test on BackOffice inputs are working * * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkBackOfficeInput * @@ -91,10 +96,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase ) ) ); - $validated = array( - AvailableForTotalAmount::PARAM1_PRICE => $adapter->getCartTotalPrice() - ); - $rule = new AvailableForTotalAmount($adapter, $validators, $validated); + $rule = new AvailableForTotalAmount($adapter, $validators); $expected = true; $actual = $rule->checkBackOfficeInput(); @@ -102,6 +104,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase } /** + * Check if validity test on BackOffice inputs are working * * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkBackOfficeInput * @expectedException \Thelia\Exception\InvalidRuleOperatorException @@ -120,10 +123,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase ) ); - $validated = array( - AvailableForTotalAmount::PARAM1_PRICE => $adapter->getCartTotalPrice() - ); - $rule = new AvailableForTotalAmount($adapter, $validators, $validated); + $rule = new AvailableForTotalAmount($adapter, $validators); $expected = false; $actual = $rule->checkBackOfficeInput(); @@ -131,6 +131,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase } /** + * Check if validity test on BackOffice inputs are working * * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkBackOfficeInput * @expectedException \ErrorException @@ -138,7 +139,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase */ public function testInValidBackOfficeInputValue() { - $adapter = new CouponBaseAdapter(); + $adapter = $this->generateValidCouponBaseAdapterMock(); $validators = array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( @@ -147,10 +148,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase ) ); - $validated = array( - AvailableForTotalAmount::PARAM1_PRICE => $adapter->getCartTotalPrice() - ); - $rule = new AvailableForTotalAmount($adapter, $validators, $validated); + $rule = new AvailableForTotalAmount($adapter, $validators); $expected = false; $actual = $rule->checkBackOfficeInput(); @@ -160,13 +158,14 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase /** + * Check if validity test on FrontOffice inputs are working * * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkCheckoutInput * */ public function testValidCheckoutInput() { - $adapter = new CouponBaseAdapter(); + $adapter = $this->stubTheliaAdapter; $validators = array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( @@ -177,10 +176,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase ) ); - $validated = array( - AvailableForTotalAmount::PARAM1_PRICE => $adapter->getCartTotalPrice() - ); - $rule = new AvailableForTotalAmount($adapter, $validators, $validated); + $rule = new AvailableForTotalAmount($adapter, $validators); $expected = true; $actual = $rule->checkCheckoutInput(); @@ -188,6 +184,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase } /** + * Check if validity test on FrontOffice inputs are working * * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkCheckoutInput * @expectedException \Thelia\Exception\InvalidRuleValueException @@ -195,7 +192,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase */ public function testInValidCheckoutInputValue() { - $adapter = new CouponBaseAdapter(); + $adapter = $this->generateValidCouponBaseAdapterMock(421); $validators = array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( @@ -206,10 +203,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase ) ); - $validated = array( - AvailableForTotalAmount::PARAM1_PRICE => 421 - ); - $rule = new AvailableForTotalAmount($adapter, $validators, $validated); + $rule = new AvailableForTotalAmount($adapter, $validators); $expected = false; $actual = $rule->checkCheckoutInput(); @@ -217,6 +211,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase } /** + * Check if validity test on FrontOffice inputs are working * * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkCheckoutInput * @expectedException \Thelia\Exception\InvalidRuleValueException @@ -224,7 +219,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase */ public function testInValidCheckoutInputType() { - $adapter = new CouponBaseAdapter(); + $adapter = $this->generateValidCouponBaseAdapterMock(421); $validators = array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( @@ -235,10 +230,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase ) ); - $validated = array( - AvailableForTotalAmount::PARAM1_PRICE => 421 - ); - $rule = new AvailableForTotalAmount($adapter, $validators, $validated); + $rule = new AvailableForTotalAmount($adapter, $validators); $expected = false; $actual = $rule->checkCheckoutInput(); @@ -246,13 +238,14 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase } /** + * Check if test inferior operator is working * * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::isMatching * */ public function testMatchingRuleInferior() { - $adapter = new CouponBaseAdapter(); + $adapter = $this->generateValidCouponBaseAdapterMock(421.22); $validators = array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( @@ -263,10 +256,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase ) ); - $validated = array( - AvailableForTotalAmount::PARAM1_PRICE => 421.22 - ); - $rule = new AvailableForTotalAmount($adapter, $validators, $validated); + $rule = new AvailableForTotalAmount($adapter, $validators); $expected = true; $actual = $rule->isMatching(); @@ -274,13 +264,14 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase } /** + * Check if test inferior operator is working * * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::isMatching * */ public function testNotMatchingRuleInferior() { - $adapter = new CouponBaseAdapter(); + $adapter = $this->generateValidCouponBaseAdapterMock(421.23); $validators = array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( @@ -291,10 +282,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase ) ); - $validated = array( - AvailableForTotalAmount::PARAM1_PRICE => 421.23 - ); - $rule = new AvailableForTotalAmount($adapter, $validators, $validated); + $rule = new AvailableForTotalAmount($adapter, $validators); $expected = false; $actual = $rule->isMatching(); @@ -302,13 +290,14 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase } /** + * Check if test equals operator is working * * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::isMatching * */ public function testMatchingRuleEqual() { - $adapter = new CouponBaseAdapter(); + $adapter = $this->stubTheliaAdapter; $validators = array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( @@ -319,10 +308,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase ) ); - $validated = array( - AvailableForTotalAmount::PARAM1_PRICE => $adapter->getCartTotalPrice() - ); - $rule = new AvailableForTotalAmount($adapter, $validators, $validated); + $rule = new AvailableForTotalAmount($adapter, $validators); $expected = true; $actual = $rule->isMatching(); @@ -330,13 +316,14 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase } /** + * Check if test equals operator is working * * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::isMatching * */ public function testNotMatchingRuleEqual() { - $adapter = new CouponBaseAdapter(); + $adapter = $this->generateValidCouponBaseAdapterMock(421.22); $validators = array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( @@ -347,10 +334,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase ) ); - $validated = array( - AvailableForTotalAmount::PARAM1_PRICE => 421.22 - ); - $rule = new AvailableForTotalAmount($adapter, $validators, $validated); + $rule = new AvailableForTotalAmount($adapter, $validators); $expected = false; $actual = $rule->isMatching(); @@ -358,13 +342,14 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase } /** + * Check if test superior operator is working * * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::isMatching * */ public function testMatchingRuleSuperior() { - $adapter = new CouponBaseAdapter(); + $adapter = $this->generateValidCouponBaseAdapterMock(421.24); $validators = array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( @@ -375,10 +360,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase ) ); - $validated = array( - AvailableForTotalAmount::PARAM1_PRICE => 421.24 - ); - $rule = new AvailableForTotalAmount($adapter, $validators, $validated); + $rule = new AvailableForTotalAmount($adapter, $validators); $expected = true; $actual = $rule->isMatching(); @@ -386,13 +368,14 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase } /** + * Check if test superior operator is working * * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::isMatching * */ public function testNotMatchingRuleSuperior() { - $adapter = new CouponBaseAdapter(); + $adapter = $this->generateValidCouponBaseAdapterMock(421.23); $validators = array( AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( @@ -403,10 +386,7 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase ) ); - $validated = array( - AvailableForTotalAmount::PARAM1_PRICE => 421.23 - ); - $rule = new AvailableForTotalAmount($adapter, $validators, $validated); + $rule = new AvailableForTotalAmount($adapter, $validators); $expected = false; $actual = $rule->isMatching(); diff --git a/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php index 9c5808010..6b024ed9e 100644 --- a/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php +++ b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php @@ -24,6 +24,10 @@ namespace Thelia\Coupon; use Thelia\Constraint\Rule\AvailableForXArticles; +use Thelia\Constraint\Rule\Operators; +use Thelia\Constraint\Validator\QuantityParam; +use Thelia\Constraint\Validator\RuleValidator; +use Thelia\Exception\InvalidRuleOperatorException; /** * Created by JetBrains PhpStorm. @@ -39,6 +43,9 @@ use Thelia\Constraint\Rule\AvailableForXArticles; class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase { + /** @var CouponAdapterInterface $stubTheliaAdapter */ + protected $stubTheliaAdapter = null; + /** * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. @@ -46,41 +53,51 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase protected function setUp() { /** @var CouponAdapterInterface $stubTheliaAdapter */ - $stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); + $this->stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); } /** - * Return an Adapter Mock wick 4 products int the Cart + * Generate valid CouponBaseAdapter + * + * @param int $nbArticlesInCart Total articles in the current Cart * * @return CouponAdapterInterface */ - protected function generateValidCouponBaseAdapterMock() + protected function generateValidCouponBaseAdapterMock($nbArticlesInCart = 4) { /** @var CouponAdapterInterface $stubTheliaAdapter */ $stubTheliaAdapter = $this->getMock( - 'CouponBaseAdapter', + 'Thelia\Coupon\CouponBaseAdapter', array('getNbArticlesInCart'), array() ); $stubTheliaAdapter->expects($this->any()) ->method('getNbArticlesInCart') - ->will($this->returnValue(4)); + ->will($this->returnValue($nbArticlesInCart)); return $stubTheliaAdapter; } /** + * Check if validity test on BackOffice inputs are working * * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkBackOfficeInput * */ public function testValidBackOfficeInput() { - $adapter = new CouponBaseAdapter(); + $adapter = $this->stubTheliaAdapter; - $validators = array(4); - $validated = array($adapter->getNbArticlesInCart()); - $rule = new AvailableForXArticles($adapter, $validators, $validated); + $validators = array( + AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( + Operators::SUPERIOR, + new QuantityParam( + $adapter, + 4 + ) + ) + ); + $rule = new AvailableForXArticles($adapter, $validators); $expected = true; $actual = $rule->checkBackOfficeInput(); @@ -88,33 +105,77 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase } /** + * Check if validity test on BackOffice inputs are working * * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkBackOfficeInput - * + * @expectedException \Thelia\Exception\InvalidRuleValueException */ - public function testInValidBackOfficeInput() + public function testInValidBackOfficeInputFloat() { - $adapter = new CouponBaseAdapter(); + $adapter = $this->stubTheliaAdapter; - $validators = array(4.5); - $validated = array($adapter->getNbArticlesInCart()); - $rule = new AvailableForXArticles($adapter, $validators, $validated); + $validators = array( + AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( + Operators::SUPERIOR, + new QuantityParam( + $adapter, + 4.5 + ) + ) + ); + $rule = new AvailableForXArticles($adapter, $validators); $expected = false; $actual = $rule->checkBackOfficeInput(); $this->assertEquals($expected, $actual); + } - $validators = array(-1); - $validated = array($adapter->getNbArticlesInCart()); - $rule = new AvailableForXArticles($adapter, $validators, $validated); + /** + * Check if validity test on BackOffice inputs are working + * + * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkBackOfficeInput + * @expectedException \Thelia\Exception\InvalidRuleValueException + */ + public function testInValidBackOfficeInputNegative() + { + $adapter = $this->stubTheliaAdapter; + + $validators = array( + AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( + Operators::SUPERIOR, + new QuantityParam( + $adapter, + -1 + ) + ) + ); + $rule = new AvailableForXArticles($adapter, $validators); $expected = false; $actual = $rule->checkBackOfficeInput(); $this->assertEquals($expected, $actual); + } - $validators = array('bad'); - $validated = array($adapter->getNbArticlesInCart()); - $rule = new AvailableForXArticles($adapter, $validators, $validated); + /** + * Check if validity test on BackOffice inputs are working + * + * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkBackOfficeInput + * @expectedException \Thelia\Exception\InvalidRuleValueException + */ + public function testInValidBackOfficeInputString() + { + $adapter = $this->stubTheliaAdapter; + + $validators = array( + AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( + Operators::SUPERIOR, + new QuantityParam( + $adapter, + 'bad' + ) + ) + ); + $rule = new AvailableForXArticles($adapter, $validators); $expected = false; $actual = $rule->checkBackOfficeInput(); @@ -123,17 +184,26 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase + + /** + * Check if validity test on FrontOffice inputs are working * * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkCheckoutInput - * */ public function testValidCheckoutInput() { - $adapter = new CouponBaseAdapter(); - $validators = array(4); - $validated = array($adapter->getNbArticlesInCart()); - $rule = new AvailableForXArticles($adapter, $validators, $validated); + $adapter = $this->stubTheliaAdapter; + $validators = array( + AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( + Operators::SUPERIOR, + new QuantityParam( + $adapter, + 4 + ) + ) + ); + $rule = new AvailableForXArticles($adapter, $validators); $expected = true; $actual = $rule->checkCheckoutInput(); @@ -141,32 +211,24 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase } /** + * Check if validity test on FrontOffice inputs are working * * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkCheckoutInput - * + * @expectedException \Thelia\Exception\InvalidRuleValueException */ - public function testInValidCheckoutInput() + public function testInValidCheckoutInputFloat() { - $adapter = new CouponBaseAdapter(); - $validators = array(4.5); - $validated = array($adapter->getNbArticlesInCart()); - $rule = new AvailableForXArticles($adapter, $validators, $validated); - - $expected = false; - $actual = $rule->checkCheckoutInput(); - $this->assertEquals($expected, $actual); - - $validators = array(-1); - $validated = array($adapter->getNbArticlesInCart()); - $rule = new AvailableForXArticles($adapter, $validators, $validated); - - $expected = false; - $actual = $rule->checkCheckoutInput(); - $this->assertEquals($expected, $actual); - - $validators = array('bad'); - $validated = array($adapter->getNbArticlesInCart()); - $rule = new AvailableForXArticles($adapter, $validators, $validated); + $adapter = $this->generateValidCouponBaseAdapterMock(4.5); + $validators = array( + AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( + Operators::SUPERIOR, + new QuantityParam( + $adapter, + 4 + ) + ) + ); + $rule = new AvailableForXArticles($adapter, $validators); $expected = false; $actual = $rule->checkCheckoutInput(); @@ -174,16 +236,101 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase } /** + * Check if validity test on FrontOffice inputs are working + * + * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkCheckoutInput + * @expectedException \Thelia\Exception\InvalidRuleValueException + */ + public function testInValidCheckoutInputNegative() + { + $adapter = $this->generateValidCouponBaseAdapterMock(-1); + + $validators = array( + AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( + Operators::SUPERIOR, + new QuantityParam( + $adapter, + 4 + ) + ) + ); + $rule = new AvailableForXArticles($adapter, $validators); + + $expected = false; + $actual = $rule->checkCheckoutInput(); + $this->assertEquals($expected, $actual); + } + + /** + * Check if validity test on FrontOffice inputs are working + * + * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkCheckoutInput + * @expectedException \Thelia\Exception\InvalidRuleValueException + */ + public function testInValidCheckoutInputString() + { + $adapter = $this->generateValidCouponBaseAdapterMock('bad'); + + $validators = array( + AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( + Operators::SUPERIOR, + new QuantityParam( + $adapter, + 4 + ) + ) + ); + $rule = new AvailableForXArticles($adapter, $validators); + + $expected = false; + $actual = $rule->checkCheckoutInput(); + $this->assertEquals($expected, $actual); + } + + /** + * Check if test inferior operator is working + * + * @covers Thelia\Coupon\Rule\AvailableForXArticles::isMatching + * + */ + public function testMatchingRuleInferior() + { + $adapter = $this->stubTheliaAdapter; + $validators = array( + AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( + Operators::INFERIOR, + new QuantityParam( + $adapter, + 5 + ) + ) + ); + $rule = new AvailableForXArticles($adapter, $validators); + + $expected = true; + $actual = $rule->isMatching(); + $this->assertEquals($expected, $actual); + } + + /** + * Check if test equals operator is working * * @covers Thelia\Coupon\Rule\AvailableForXArticles::isMatching * */ public function testMatchingRuleEqual() { - $adapter = new CouponBaseAdapter(); - $validators = array(4); - $validated = array($adapter->getNbArticlesInCart()); - $rule = new AvailableForXArticles($adapter, $validators, $validated); + $adapter = $this->stubTheliaAdapter; + $validators = array( + AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( + Operators::EQUAL, + new QuantityParam( + $adapter, + 4 + ) + ) + ); + $rule = new AvailableForXArticles($adapter, $validators); $expected = true; $actual = $rule->isMatching(); @@ -191,16 +338,24 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase } /** + * Check if test superior operator is working * * @covers Thelia\Coupon\Rule\AvailableForXArticles::isMatching * */ public function testMatchingRuleSuperior() { - $adapter = new CouponBaseAdapter(); - $validators = array(5); - $validated = array($adapter->getNbArticlesInCart()); - $rule = new AvailableForXArticles($adapter, $validators, $validated); + $adapter = $this->stubTheliaAdapter; + $validators = array( + AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( + Operators::SUPERIOR, + new QuantityParam( + $adapter, + 3 + ) + ) + ); + $rule = new AvailableForXArticles($adapter, $validators); $expected = true; $actual = $rule->isMatching(); @@ -208,16 +363,25 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase } /** + * Check if test unavailable operator is working * * @covers Thelia\Coupon\Rule\AvailableForXArticles::isMatching + * @expectedException \Thelia\Exception\InvalidRuleOperatorException * */ public function testNotMatchingRule() { - $adapter = new CouponBaseAdapter(); - $validators = array(3); - $validated = array($adapter->getNbArticlesInCart()); - $rule = new AvailableForXArticles($adapter, $validators, $validated); + $adapter = $this->stubTheliaAdapter; + $validators = array( + AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( + Operators::DIFFERENT, + new QuantityParam( + $adapter, + 3 + ) + ) + ); + $rule = new AvailableForXArticles($adapter, $validators); $expected = false; $actual = $rule->isMatching(); From 8b6cbb06214139500e4ce0492af094460eaf820f Mon Sep 17 00:00:00 2001 From: gmorel Date: Wed, 28 Aug 2013 14:37:29 +0200 Subject: [PATCH 015/125] WIP - Beginning BackOffice Coupon implementation --- core/lib/Thelia/Action/Coupon.php | 79 +++++++ .../Thelia/Config/Resources/routing/admin.xml | 5 + .../Constraint/Rule/AvailableForCustomer.php | 203 ++++++++++++++++++ .../Constraint/Rule/AvailableForXArticles.php | 2 +- .../Constraint/Validator/CustomerParam.php | 158 ++++++++++++++ .../Controller/Admin/CouponController.php | 100 +++++++++ templates/default/coupon.html | 5 + 7 files changed, 551 insertions(+), 1 deletion(-) create mode 100755 core/lib/Thelia/Action/Coupon.php create mode 100644 core/lib/Thelia/Constraint/Rule/AvailableForCustomer.php create mode 100644 core/lib/Thelia/Constraint/Validator/CustomerParam.php create mode 100755 core/lib/Thelia/Controller/Admin/CouponController.php create mode 100755 templates/default/coupon.html diff --git a/core/lib/Thelia/Action/Coupon.php b/core/lib/Thelia/Action/Coupon.php new file mode 100755 index 000000000..7b95d80fa --- /dev/null +++ b/core/lib/Thelia/Action/Coupon.php @@ -0,0 +1,79 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Action; + +use Symfony\Component\EventDispatcher\EventSubscriberInterface; +use Thelia\Core\Event\ActionEvent; +use Thelia\Core\Event\TheliaEvents; +use Thelia\Model\Category as CategoryModel; +use Thelia\Form\CategoryCreationForm; +use Thelia\Core\Event\CategoryEvent; +use Thelia\Tools\Redirect; +use Thelia\Model\CategoryQuery; +use Thelia\Model\AdminLog; +use Thelia\Form\CategoryDeletionForm; +use Thelia\Action\Exception\FormValidationException; + +use Propel\Runtime\ActiveQuery\Criteria; +use Propel\Runtime\Propel; +use Thelia\Model\Map\CategoryTableMap; +use Propel\Runtime\Exception\PropelException; + +class Coupon extends BaseAction implements EventSubscriberInterface +{ + + /** + * Returns an array of event names this subscriber listens to. + * + * The array keys are event names and the value can be: + * + * * The method name to call (priority defaults to 0) + * * An array composed of the method name to call and the priority + * * An array of arrays composed of the method names to call and respective + * priorities, or 0 if unset + * + * For instance: + * + * * array('eventName' => 'methodName') + * * array('eventName' => array('methodName', $priority)) + * * array('eventName' => array(array('methodName1', $priority), array('methodName2')) + * + * @return array The event names to listen to + * + * @api + */ + public static function getSubscribedEvents() + { + return array( +// "action.createCategory" => array("create", 128), +// "action.modifyCategory" => array("modify", 128), +// "action.deleteCategory" => array("delete", 128), +// +// "action.toggleCategoryVisibility" => array("toggleVisibility", 128), +// "action.changeCategoryPositionUp" => array("changePositionUp", 128), +// "action.changeCategoryPositionDown" => array("changePositionDown", 128), +// "action.changeCategoryPosition" => array("changePosition", 128), + ); + } +} diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml index ece222c22..df1495953 100755 --- a/core/lib/Thelia/Config/Resources/routing/admin.xml +++ b/core/lib/Thelia/Config/Resources/routing/admin.xml @@ -35,6 +35,11 @@ Thelia\Controller\Admin\CategoryController::processAction + + + Thelia\Controller\Admin\CouponController::indexAction + + diff --git a/core/lib/Thelia/Constraint/Rule/AvailableForCustomer.php b/core/lib/Thelia/Constraint/Rule/AvailableForCustomer.php new file mode 100644 index 000000000..299736d89 --- /dev/null +++ b/core/lib/Thelia/Constraint/Rule/AvailableForCustomer.php @@ -0,0 +1,203 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Constraint\Rule; + +use Thelia\Constraint\Validator\CustomerParam; +use Thelia\Constraint\Validator\RuleValidator; +use Thelia\Coupon\CouponAdapterInterface; +use Thelia\Exception\InvalidRuleException; +use Thelia\Exception\InvalidRuleOperatorException; +use Thelia\Exception\InvalidRuleValueException; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * @package Constraint + * @author Guillaume MOREL + * + */ +class AvailableForCustomer extends CouponRuleAbstract +{ + + /** Rule 1st parameter : customer id */ + CONST PARAM1 = 'customerId'; + + /** @var array Available Operators (Operators::CONST) */ + protected $availableOperators = array( + Operators::EQUAL, + ); + + /** @var RuleValidator Customer Validator */ + protected $customerValidator = null; + + /** + * Constructor + * + * @param CouponAdapterInterface $adapter allowing to gather + * all necessary Thelia variables + * @param array $validators Array of RuleValidator + * validating $paramsToValidate against + * + * @throws InvalidRuleException + */ + public function __construct(CouponAdapterInterface $adapter, array $validators) + { + parent::__construct($adapter, $validators); + + if (isset($validators[self::PARAM1]) + && $validators[self::PARAM1] instanceof RuleValidator + ) { + $this->customerValidator = $validators[self::PARAM1]; + } else { + throw new InvalidRuleException(get_class()); + } + + $this->adapter = $adapter; + } + + /** + * Check if backoffice inputs are relevant or not + * + * @throws InvalidRuleOperatorException if Operator is not allowed + * @throws InvalidRuleValueException if Value is not allowed + * @return bool + */ + public function checkBackOfficeInput() + { + if (!isset($this->validators) + || empty($this->validators) + ||!isset($this->validators[self::PARAM1]) + ||!isset($this->validators[self::PARAM1]) + ) { + throw new InvalidRuleValueException(get_class(), self::PARAM1); + } + + /** @var RuleValidator $ruleValidator */ + $ruleValidator = $this->validators[self::PARAM1]; + /** @var CustomerParam $customer */ + $customer = $ruleValidator->getParam(); + + if (!$customer instanceof CustomerParam) { + throw new InvalidRuleValueException(get_class(), self::PARAM1); + } + + $this->checkBackOfficeInputsOperators(); + + return $this->isCustomerValid($customer->getInteger()); + } + + /** + * Generate current Rule param to be validated from adapter + * + * @return $this + */ + protected function setParametersToValidate() + { + $this->paramsToValidate = array( + self::PARAM1 => $this->adapter->getCustomer()->getId() + ); + + return $this; + } + + /** + * Check if Checkout inputs are relevant or not + * + * @throws \Thelia\Exception\InvalidRuleValueException + * @return bool + */ + public function checkCheckoutInput() + { + if (!isset($this->paramsToValidate) + || empty($this->paramsToValidate) + ||!isset($this->paramsToValidate[self::PARAM1]) + ) { + throw new InvalidRuleValueException(get_class(), self::PARAM1); + } + + $customerId = $this->paramsToValidate[self::PARAM1]; + + return $this->isCustomerValid($customerId); + } + + /** + * Check if a Customer is valid + * + * @param int $customerId Customer to check + * + * @throws InvalidRuleValueException if Value is not allowed + * @return bool + */ + protected function isCustomerValid($customerId) + { + $customerValidator = $this->customerValidator; + try { + $customerValidator->getParam()->compareTo($customerId); + } catch(\InvalidArgumentException $e) { + throw new InvalidRuleValueException(get_class(), self::PARAM1); + } + + return true; + } + + /** + * Get I18n name + * + * @return string + */ + public function getName() + { + return $this->adapter + ->getTranslator() + ->trans('Customer', null, 'constraint'); + } + + /** + * Get I18n tooltip + * + * @return string + */ + public function getToolTip() + { + /** @var CustomerParam $param */ + $param = $this->customerValidator->getParam(); + $toolTip = $this->adapter + ->getTranslator() + ->trans( + 'If customer is %fistname% %lastname% (%email%)', + array( + '%fistname%' => $param->getFirstName(), + '%lastname%' => $param->getLastName(), + '%email%' => $param->getEmail(), + ), + 'constraint' + ); + + return $toolTip; + } + + +} \ No newline at end of file diff --git a/core/lib/Thelia/Constraint/Rule/AvailableForXArticles.php b/core/lib/Thelia/Constraint/Rule/AvailableForXArticles.php index 9de10b2bb..d103f4f23 100644 --- a/core/lib/Thelia/Constraint/Rule/AvailableForXArticles.php +++ b/core/lib/Thelia/Constraint/Rule/AvailableForXArticles.php @@ -150,7 +150,7 @@ class AvailableForXArticles extends CouponRuleAbstract /** * Check if a quantity is valid * - * @param float $quantity Quantity to check + * @param int $quantity Quantity to check * * @throws InvalidRuleValueException if Value is not allowed * @return bool diff --git a/core/lib/Thelia/Constraint/Validator/CustomerParam.php b/core/lib/Thelia/Constraint/Validator/CustomerParam.php new file mode 100644 index 000000000..5b4390ddc --- /dev/null +++ b/core/lib/Thelia/Constraint/Validator/CustomerParam.php @@ -0,0 +1,158 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Constraint\Validator; + +use InvalidArgumentException; +use Propel\Runtime\ActiveQuery\ModelCriteria; +use Thelia\Coupon\CouponAdapterInterface; +use Thelia\Model\Customer; +use Thelia\Model\CustomerQuery; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Represent a Customer + * + * @package Constraint + * @author Guillaume MOREL + * + */ +class CustomerParam extends IntegerParam +{ + /** @var string Model Class name */ + protected $modelClass = '\Thelia\Model\Customer'; + + /** @var ModelCriteria */ + protected $queryBuilder = null; + + /** @var string Customer firstname */ + protected $firstName = null; + + /** @var string Customer lastname */ + protected $lastName = null; + + /** @var string Customer email */ + protected $email = null; + + /** + * Constructor + * + * @param CouponAdapterInterface $adapter Provide necessary value from Thelia + * @param int $integer Integer + * + * @throws InvalidArgumentException + */ + public function __construct(CouponAdapterInterface $adapter, $integer) + { + $this->integer = $integer; + $this->adapter = $adapter; + + $this->queryBuilder = CustomerQuery::create(); + /** @var Customer $customer */ + $customer = $this->queryBuilder->findById($integer); + if ($customer !== null) { + $this->firstName = $customer->getFirstname(); + $this->lastName = $customer->getLastname(); + $this->email = $customer->getEmail(); + } else { + throw new \InvalidArgumentException( + 'CustomerParam can compare only existing Customers' + ); + } + } + + /** + * Compare the current object to the passed $other. + * + * Returns 0 if they are semantically equal, 1 if the other object + * is less than the current one, or -1 if its more than the current one. + * + * This method should not check for identity using ===, only for semantically equality for example + * when two different DateTime instances point to the exact same Date + TZ. + * + * @param mixed $other Object + * + * @throws InvalidArgumentException + * @return int + */ + public function compareTo($other) + { + if (!is_integer($other) || $other < 0) { + throw new InvalidArgumentException( + 'IntegerParam can compare only positive int' + ); + } + + return parent::compareTo($other); + } + + /** + * Customer email + * + * @return string + */ + public function getEmail() + { + return $this->email; + } + + /** + * Customer first name + * + * @return string + */ + public function getFirstName() + { + return $this->firstName; + } + + /** + * Customer last name + * + * @return string + */ + public function getLastName() + { + return $this->lastName; + } + + /** + * Get I18n tooltip + * + * @return string + */ + public function getToolTip() + { + return $this->adapter + ->getTranslator() + ->trans( + 'A Customer', + null, + 'constraint' + ); + } + +} diff --git a/core/lib/Thelia/Controller/Admin/CouponController.php b/core/lib/Thelia/Controller/Admin/CouponController.php new file mode 100755 index 000000000..67d1e451e --- /dev/null +++ b/core/lib/Thelia/Controller/Admin/CouponController.php @@ -0,0 +1,100 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Controller\Admin; + +use Thelia\Core\Security\Exception\AuthenticationException; +use Thelia\Core\Security\Exception\AuthorizationException; + +class CouponController extends BaseAdminController +{ + + protected function browseCoupon($args) + { + $this->checkAuth("ADMIN", "admin.coupon.view"); + + return $this->render('coupons', $args); + } + + public function indexAction() + { + return $this->processAction(); + } + + public function processAction() + { + // Get the current action + $action = $this->getRequest()->get('action', 'browse'); + + // Get the category ID + $id = $this->getRequest()->get('id', 0); + + $args = array( + 'action' => $action, + 'current_coupon_id' => $id + ); + + try { + switch ($action) { + case 'browse' : // Browse coupon + + return $this->browseCoupons($args); + + case 'create' : // Create a new category + +// return $this->createNewCategory($args); + + case 'edit' : // Edit an existing category + +// return $this->editCategory($args); + + case 'delete' : // Delete an existing category + +// return $this->deleteCategory($args); + + case 'visibilityToggle' : // Toggle visibility + +// return $this->visibilityToggle($id); + + case 'changePosition' : // Change position + +// return $this->changePosition($args); + + case 'positionUp' : // Move up category + +// return $this->positionUp($args); + + case 'positionDown' : // Move down category + +// return $this->positionDown($args); + } + } catch (AuthorizationException $ex) { + return $this->errorPage($ex->getMessage()); + } catch (AuthenticationException $ex) { + return $this->errorPage($ex->getMessage()); + } + + // We did not recognized the action -> return a 404 page + return $this->pageNotFound(); + } +} diff --git a/templates/default/coupon.html b/templates/default/coupon.html new file mode 100755 index 000000000..3fd478575 --- /dev/null +++ b/templates/default/coupon.html @@ -0,0 +1,5 @@ +

Coupon page

+ +
+ +

COUPON

From 8b07b963661ca3785bd3a6ec046cdc0825fbe65c Mon Sep 17 00:00:00 2001 From: gmorel Date: Wed, 28 Aug 2013 15:31:27 +0200 Subject: [PATCH 016/125] Working - Add error message when not in trusted IP list --- web/index_dev.php | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/web/index_dev.php b/web/index_dev.php index cb9a3d6f0..f02a625da 100755 --- a/web/index_dev.php +++ b/web/index_dev.php @@ -1,4 +1,28 @@ . */ +/* */ +/**********************************************************************************/ + + +use Symfony\Component\HttpFoundation\Response; use Thelia\Core\Thelia; use Thelia\Core\HttpFoundation\Request; @@ -7,20 +31,21 @@ use Thelia\Core\HttpFoundation\Request; $env = 'dev'; require __DIR__ . '/../core/bootstrap.php'; -$trustIp = array( +// List of allowed IP +$trustedIp = array( '::1', '127.0.0.1' ); $request = Request::createFromGlobals(); - -if ( false === in_array($request->getClientIp(), $trustIp)) { - //change request to send to a 404 error page - exit; -} - $thelia = new Thelia("dev", true); +if ( false === in_array($request->getClientIp(), $trustedIp)) { + // Redirect 403 Forbidden + $response = new Response('Forbidden', 404); + $thelia->terminate($request, $response); +} + $response = $thelia->handle($request)->prepare($request)->send(); $thelia->terminate($request, $response); From 844e142abbc25b81e0272359bb0ac241b1788fa2 Mon Sep 17 00:00:00 2001 From: gmorel Date: Wed, 28 Aug 2013 15:49:55 +0200 Subject: [PATCH 017/125] Working - Add error message when not in trusted IP list --- web/index_dev.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/index_dev.php b/web/index_dev.php index dae84059f..4d0063268 100755 --- a/web/index_dev.php +++ b/web/index_dev.php @@ -41,8 +41,8 @@ $request = Request::createFromGlobals(); $thelia = new Thelia("dev", true); if ( false === in_array($request->getClientIp(), $trustedIp)) { - // Redirect 403 Forbidden - $response = new Response('Forbidden', 404); + // Redirect 401 Unauthorized + $response = new Response('Unauthorized', 401); $thelia->terminate($request, $response); } From 059317c26667177ecc7f524fea2e249faf4f460e Mon Sep 17 00:00:00 2001 From: gmorel Date: Wed, 28 Aug 2013 16:35:14 +0200 Subject: [PATCH 018/125] Working - Add reset_instal.sh reseting Model/SQL/DB creation/Insert/Admin creation Usage : chmod +x reset_install.sh ./ reset_install.sh --- reset_install.sh | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100755 reset_install.sh diff --git a/reset_install.sh b/reset_install.sh new file mode 100755 index 000000000..f3a635a9b --- /dev/null +++ b/reset_install.sh @@ -0,0 +1,38 @@ +#!/bin/bash +# @author Guillaume MOREL +# v0.1 + +echo -e "\033[47m\033[1;31m\n[WARN] This script will reset this Thelia2 install\n\033[0m" + +if [ ! -f local/config/database.yml ]; then + cp local/config/database.yml.sample local/config/database.yml + echo "[FAILED] Please add your database informations in local/config/database.yml and start this script again." +else + echo -e "\n\e[01;34m[INFO] Downloading vendors\e[00m\n" + php composer install --prefer-dist --no-dev + + cd local/config/ + + echo -e "\n\e[01;34m[INFO] Building Models file\e[00m\n" + ../../bin/propel build -v --output-dir=../../core/lib/ + + echo -e "\n\e[01;34m[INFO] Building SQL CREATE file\e[00m\n" + ../../bin/propel sql:build -v --output-dir=../../install/ + + # Not working : insert manually + # echo -e "\n\e[01;34m[INFO] Inserting SQL\e[00m\n" + # ../../bin/propel insert-sql -v --output-dir=../../install/ + # install/thelia.sql + # install/insert.sql + echo -e "\n\e[01;34m[INFO] Reinstalling Thelia2\e[00m\n" + cd ../.. + php Thelia thelia:install + + echo -e "\n\e[01;34m[INFO] Installing fixtures\e[00m\n" + php install/faker.php + + echo -e "\n\e[01;34m[INFO] Adding admin\e[00m\n" + php Thelia thelia:create-admin + + echo -e "\n\e[00;32m[SUCCESS] Reset done\e[00m\n" +fi From 84a23141087eefcf8ad5985a5c3d2f119370053a Mon Sep 17 00:00:00 2001 From: gmorel Date: Wed, 28 Aug 2013 18:06:22 +0200 Subject: [PATCH 019/125] WIP - Add Coupon BackOffice controller - Add Coupon BackOffice template skeleton - Add Coupon BackOffice routes --- .../Thelia/Config/Resources/routing/admin.xml | 11 +- .../Controller/Admin/CouponController.php | 202 ++++++++++++------ templates/admin/default/coupon/edit.html | 30 +++ templates/admin/default/coupon/list.html | 29 +++ templates/admin/default/coupon/read.html | 29 +++ .../default/includes/coupon_breadcrumb.html | 8 + templates/default/coupon.html | 5 - 7 files changed, 246 insertions(+), 68 deletions(-) create mode 100755 templates/admin/default/coupon/edit.html create mode 100755 templates/admin/default/coupon/list.html create mode 100755 templates/admin/default/coupon/read.html create mode 100755 templates/admin/default/includes/coupon_breadcrumb.html delete mode 100755 templates/default/coupon.html diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml index df1495953..2561dcc99 100755 --- a/core/lib/Thelia/Config/Resources/routing/admin.xml +++ b/core/lib/Thelia/Config/Resources/routing/admin.xml @@ -36,9 +36,18 @@ - + Thelia\Controller\Admin\CouponController::indexAction + + Thelia\Controller\Admin\CouponController::createAction + + + Thelia\Controller\Admin\CouponController::editAction + + + Thelia\Controller\Admin\CouponController::readAction + diff --git a/core/lib/Thelia/Controller/Admin/CouponController.php b/core/lib/Thelia/Controller/Admin/CouponController.php index 67d1e451e..e6159c9ac 100755 --- a/core/lib/Thelia/Controller/Admin/CouponController.php +++ b/core/lib/Thelia/Controller/Admin/CouponController.php @@ -1,92 +1,170 @@ . */ -/* */ -/*************************************************************************************/ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ namespace Thelia\Controller\Admin; use Thelia\Core\Security\Exception\AuthenticationException; use Thelia\Core\Security\Exception\AuthorizationException; +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Control View and Action (Model) via Events + * + * @package Coupon + * @author Guillaume MOREL + * + */ class CouponController extends BaseAdminController { - - protected function browseCoupon($args) - { - $this->checkAuth("ADMIN", "admin.coupon.view"); - - return $this->render('coupons', $args); - } - + /** + * List all Coupons Action + * + * @return \Symfony\Component\HttpFoundation\Response + */ public function indexAction() { return $this->processAction(); } - public function processAction() + /** + * Create a Coupon Action + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function createAction() + { + return $this->processAction('create'); + } + + /** + * Edit a Coupon Action + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function editAction() + { + return $this->processAction('edit'); + } + + /** + * Read a Coupon Action + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function readAction() + { + return $this->processAction('read'); + } + + /** + * Manage Coupons list display + * + * @param array $args GET arguments + * + * @return \Symfony\Component\HttpFoundation\Response + */ + protected function browseCoupons($args) + { + $this->checkAuth("ADMIN", "admin.coupon.view"); + + return $this->render('coupon/list', $args); + } + + /** + * Manage Coupons creation display + * + * @param array $args GET arguments + * + * @return \Symfony\Component\HttpFoundation\Response + */ + protected function createCoupon($args) + { + $this->checkAuth("ADMIN", "admin.coupon.view"); + + return $this->render('coupon/edit', $args); + } + + /** + * Manage Coupons edition display + * + * @param array $args GET arguments + * + * @return \Symfony\Component\HttpFoundation\Response + */ + protected function editCoupon($args) + { + $this->checkAuth("ADMIN", "admin.coupon.view"); + + return $this->render('coupon/edit', $args); + } + + /** + * Manage Coupons read display + * + * @param array $args GET arguments + * + * @return \Symfony\Component\HttpFoundation\Response + */ + protected function readCoupon($args) + { + $this->checkAuth("ADMIN", "admin.coupon.view"); + + return $this->render('coupon/read', $args); + } + + /** + * Process all Actions + * + * @param string $action Action to process + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function processAction($action = 'browse') { // Get the current action - $action = $this->getRequest()->get('action', 'browse'); +// $action = $this->getRequest()->get('action', 'browse'); // Get the category ID - $id = $this->getRequest()->get('id', 0); +// $id = $this->getRequest()->get('id', 0); $args = array( 'action' => $action, - 'current_coupon_id' => $id +// 'current_coupon_id' => $id ); try { switch ($action) { case 'browse' : // Browse coupon - return $this->browseCoupons($args); - - case 'create' : // Create a new category - -// return $this->createNewCategory($args); - - case 'edit' : // Edit an existing category - -// return $this->editCategory($args); - - case 'delete' : // Delete an existing category - -// return $this->deleteCategory($args); - - case 'visibilityToggle' : // Toggle visibility - -// return $this->visibilityToggle($id); - - case 'changePosition' : // Change position - -// return $this->changePosition($args); - - case 'positionUp' : // Move up category - -// return $this->positionUp($args); - - case 'positionDown' : // Move down category - -// return $this->positionDown($args); + case 'create' : // Create a new coupon + return $this->createCoupon($args); + case 'edit' : // Edit an existing coupon + return $this->editCoupon($args); + case 'read' : // Read an existing coupon + return $this->readCoupon($args); } } catch (AuthorizationException $ex) { return $this->errorPage($ex->getMessage()); diff --git a/templates/admin/default/coupon/edit.html b/templates/admin/default/coupon/edit.html new file mode 100755 index 000000000..017414ec4 --- /dev/null +++ b/templates/admin/default/coupon/edit.html @@ -0,0 +1,30 @@ +{check_auth context="admin" roles="ADMIN" permissions="admin.coupon.view" login_tpl="/admin/login"} + +{$page_title={intl l='Coupon'}} + +{$thelia_page_css_file = "assets/bootstrap-editable/css/bootstrap-editable.css"} + +{include file='includes/header.inc.html'} + +
+
+ +
    + {include file="includes/coupon_breadcrumb.html"} +
+ +

EDIT

+
+
+ + +{include file='includes/js.inc.html'} + +{javascripts file='../assets/bootstrap-editable/js/bootstrap-editable.js'} + +{/javascripts} + + + +{include file='includes/footer.inc.html'} diff --git a/templates/admin/default/coupon/list.html b/templates/admin/default/coupon/list.html new file mode 100755 index 000000000..95b2da098 --- /dev/null +++ b/templates/admin/default/coupon/list.html @@ -0,0 +1,29 @@ +{check_auth context="admin" roles="ADMIN" permissions="admin.coupon.view" login_tpl="/admin/login"} + +{$page_title={intl l='Coupon'}} + +{$thelia_page_css_file = "assets/bootstrap-editable/css/bootstrap-editable.css"} + +{include file='includes/header.inc.html'} + +
+
+ +
    + {include file="includes/coupon_breadcrumb.html"} +
+

List

+
+
+ + +{include file='includes/js.inc.html'} + +{javascripts file='../assets/bootstrap-editable/js/bootstrap-editable.js'} + +{/javascripts} + + + +{include file='includes/footer.inc.html'} diff --git a/templates/admin/default/coupon/read.html b/templates/admin/default/coupon/read.html new file mode 100755 index 000000000..d29c7d927 --- /dev/null +++ b/templates/admin/default/coupon/read.html @@ -0,0 +1,29 @@ +{check_auth context="admin" roles="ADMIN" permissions="admin.coupon.view" login_tpl="/admin/login"} + +{$page_title={intl l='Coupon'}} + +{$thelia_page_css_file = "assets/bootstrap-editable/css/bootstrap-editable.css"} + +{include file='includes/header.inc.html'} + +
+
+ +
    + {include file="includes/coupon_breadcrumb.html"} +
+

Read

+
+
+ + +{include file='includes/js.inc.html'} + +{javascripts file='../assets/bootstrap-editable/js/bootstrap-editable.js'} + +{/javascripts} + + + +{include file='includes/footer.inc.html'} diff --git a/templates/admin/default/includes/coupon_breadcrumb.html b/templates/admin/default/includes/coupon_breadcrumb.html new file mode 100755 index 000000000..bcec6d0d3 --- /dev/null +++ b/templates/admin/default/includes/coupon_breadcrumb.html @@ -0,0 +1,8 @@ +{* Breadcrumb for coupon browsing and editing *} + +
  • Home /
    • +
  • Coupon
    • + +
  • /
    • +
  • Browse /
    • + diff --git a/templates/default/coupon.html b/templates/default/coupon.html deleted file mode 100755 index 3fd478575..000000000 --- a/templates/default/coupon.html +++ /dev/null @@ -1,5 +0,0 @@ -

    Coupon page

    - -
    - -

    COUPON

    From 6c2dbb0152cb8e9e8abfd8b2203c10a1d60c706a Mon Sep 17 00:00:00 2001 From: gmorel Date: Wed, 28 Aug 2013 18:09:17 +0200 Subject: [PATCH 020/125] Working - Add regenerated Model classes --- core/lib/Thelia/Model/Base/Accessory.php | 2 +- core/lib/Thelia/Model/Base/Address.php | 2 +- core/lib/Thelia/Model/Base/Admin.php | 2 +- core/lib/Thelia/Model/Base/AdminGroup.php | 2 +- core/lib/Thelia/Model/Base/AdminLog.php | 2 +- core/lib/Thelia/Model/Base/Area.php | 2 +- core/lib/Thelia/Model/Base/Attribute.php | 2 +- core/lib/Thelia/Model/Base/AttributeAv.php | 2 +- core/lib/Thelia/Model/Base/AttributeAvI18n.php | 2 +- core/lib/Thelia/Model/Base/AttributeCategory.php | 2 +- core/lib/Thelia/Model/Base/AttributeCombination.php | 2 +- core/lib/Thelia/Model/Base/AttributeI18n.php | 2 +- core/lib/Thelia/Model/Base/Cart.php | 2 +- core/lib/Thelia/Model/Base/CartItem.php | 2 +- core/lib/Thelia/Model/Base/Category.php | 2 +- core/lib/Thelia/Model/Base/CategoryAssociatedContent.php | 2 +- core/lib/Thelia/Model/Base/CategoryDocument.php | 2 +- core/lib/Thelia/Model/Base/CategoryDocumentI18n.php | 2 +- core/lib/Thelia/Model/Base/CategoryI18n.php | 2 +- core/lib/Thelia/Model/Base/CategoryImage.php | 2 +- core/lib/Thelia/Model/Base/CategoryImageI18n.php | 2 +- core/lib/Thelia/Model/Base/CategoryVersion.php | 2 +- core/lib/Thelia/Model/Base/Config.php | 2 +- core/lib/Thelia/Model/Base/ConfigI18n.php | 2 +- core/lib/Thelia/Model/Base/Content.php | 2 +- core/lib/Thelia/Model/Base/ContentDocument.php | 2 +- core/lib/Thelia/Model/Base/ContentDocumentI18n.php | 2 +- core/lib/Thelia/Model/Base/ContentFolder.php | 2 +- core/lib/Thelia/Model/Base/ContentI18n.php | 2 +- core/lib/Thelia/Model/Base/ContentImage.php | 2 +- core/lib/Thelia/Model/Base/ContentImageI18n.php | 2 +- core/lib/Thelia/Model/Base/ContentVersion.php | 2 +- core/lib/Thelia/Model/Base/Country.php | 2 +- core/lib/Thelia/Model/Base/CountryI18n.php | 2 +- core/lib/Thelia/Model/Base/CouponOrder.php | 2 +- core/lib/Thelia/Model/Base/Currency.php | 2 +- core/lib/Thelia/Model/Base/CurrencyI18n.php | 2 +- core/lib/Thelia/Model/Base/Customer.php | 2 +- core/lib/Thelia/Model/Base/CustomerTitle.php | 2 +- core/lib/Thelia/Model/Base/CustomerTitleI18n.php | 2 +- core/lib/Thelia/Model/Base/Delivzone.php | 2 +- core/lib/Thelia/Model/Base/Feature.php | 2 +- core/lib/Thelia/Model/Base/FeatureAv.php | 2 +- core/lib/Thelia/Model/Base/FeatureAvI18n.php | 2 +- core/lib/Thelia/Model/Base/FeatureCategory.php | 2 +- core/lib/Thelia/Model/Base/FeatureI18n.php | 2 +- core/lib/Thelia/Model/Base/FeatureProduct.php | 2 +- core/lib/Thelia/Model/Base/Folder.php | 2 +- core/lib/Thelia/Model/Base/FolderDocument.php | 2 +- core/lib/Thelia/Model/Base/FolderDocumentI18n.php | 2 +- core/lib/Thelia/Model/Base/FolderI18n.php | 2 +- core/lib/Thelia/Model/Base/FolderImage.php | 2 +- core/lib/Thelia/Model/Base/FolderImageI18n.php | 2 +- core/lib/Thelia/Model/Base/FolderVersion.php | 2 +- core/lib/Thelia/Model/Base/Group.php | 2 +- core/lib/Thelia/Model/Base/GroupI18n.php | 2 +- core/lib/Thelia/Model/Base/GroupModule.php | 2 +- core/lib/Thelia/Model/Base/GroupResource.php | 2 +- core/lib/Thelia/Model/Base/Lang.php | 2 +- core/lib/Thelia/Model/Base/Message.php | 2 +- core/lib/Thelia/Model/Base/MessageI18n.php | 2 +- core/lib/Thelia/Model/Base/MessageVersion.php | 2 +- core/lib/Thelia/Model/Base/Module.php | 2 +- core/lib/Thelia/Model/Base/ModuleI18n.php | 2 +- core/lib/Thelia/Model/Base/Order.php | 2 +- core/lib/Thelia/Model/Base/OrderAddress.php | 2 +- core/lib/Thelia/Model/Base/OrderFeature.php | 2 +- core/lib/Thelia/Model/Base/OrderProduct.php | 2 +- core/lib/Thelia/Model/Base/OrderStatus.php | 2 +- core/lib/Thelia/Model/Base/OrderStatusI18n.php | 2 +- core/lib/Thelia/Model/Base/Product.php | 2 +- core/lib/Thelia/Model/Base/ProductCategory.php | 2 +- core/lib/Thelia/Model/Base/ProductDocument.php | 2 +- core/lib/Thelia/Model/Base/ProductDocumentI18n.php | 2 +- core/lib/Thelia/Model/Base/ProductI18n.php | 2 +- core/lib/Thelia/Model/Base/ProductImage.php | 2 +- core/lib/Thelia/Model/Base/ProductImageI18n.php | 2 +- core/lib/Thelia/Model/Base/ProductPrice.php | 2 +- core/lib/Thelia/Model/Base/ProductSaleElements.php | 2 +- core/lib/Thelia/Model/Base/ProductVersion.php | 2 +- core/lib/Thelia/Model/Base/Resource.php | 2 +- core/lib/Thelia/Model/Base/ResourceI18n.php | 2 +- core/lib/Thelia/Model/Base/Rewriting.php | 2 +- core/lib/Thelia/Model/Base/Tax.php | 2 +- core/lib/Thelia/Model/Base/TaxI18n.php | 2 +- core/lib/Thelia/Model/Base/TaxRule.php | 2 +- core/lib/Thelia/Model/Base/TaxRuleCountry.php | 2 +- core/lib/Thelia/Model/Base/TaxRuleI18n.php | 2 +- 88 files changed, 88 insertions(+), 88 deletions(-) diff --git a/core/lib/Thelia/Model/Base/Accessory.php b/core/lib/Thelia/Model/Base/Accessory.php index 183f59947..f4110b19e 100755 --- a/core/lib/Thelia/Model/Base/Accessory.php +++ b/core/lib/Thelia/Model/Base/Accessory.php @@ -266,7 +266,7 @@ abstract class Accessory implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/Address.php b/core/lib/Thelia/Model/Base/Address.php index a6ab068d1..45cad61aa 100755 --- a/core/lib/Thelia/Model/Base/Address.php +++ b/core/lib/Thelia/Model/Base/Address.php @@ -388,7 +388,7 @@ abstract class Address implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/Admin.php b/core/lib/Thelia/Model/Base/Admin.php index 6110aee7a..b1241473e 100755 --- a/core/lib/Thelia/Model/Base/Admin.php +++ b/core/lib/Thelia/Model/Base/Admin.php @@ -300,7 +300,7 @@ abstract class Admin implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/AdminGroup.php b/core/lib/Thelia/Model/Base/AdminGroup.php index 9eadbb107..60141e3f8 100755 --- a/core/lib/Thelia/Model/Base/AdminGroup.php +++ b/core/lib/Thelia/Model/Base/AdminGroup.php @@ -262,7 +262,7 @@ abstract class AdminGroup implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/AdminLog.php b/core/lib/Thelia/Model/Base/AdminLog.php index ae828e4bb..c83be20ee 100755 --- a/core/lib/Thelia/Model/Base/AdminLog.php +++ b/core/lib/Thelia/Model/Base/AdminLog.php @@ -266,7 +266,7 @@ abstract class AdminLog implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/Area.php b/core/lib/Thelia/Model/Base/Area.php index 08fc8be42..fbd3199f4 100755 --- a/core/lib/Thelia/Model/Base/Area.php +++ b/core/lib/Thelia/Model/Base/Area.php @@ -277,7 +277,7 @@ abstract class Area implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/Attribute.php b/core/lib/Thelia/Model/Base/Attribute.php index 21fb3389a..2f04404d4 100755 --- a/core/lib/Thelia/Model/Base/Attribute.php +++ b/core/lib/Thelia/Model/Base/Attribute.php @@ -326,7 +326,7 @@ abstract class Attribute implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/AttributeAv.php b/core/lib/Thelia/Model/Base/AttributeAv.php index 817c9738d..ab39577bd 100755 --- a/core/lib/Thelia/Model/Base/AttributeAv.php +++ b/core/lib/Thelia/Model/Base/AttributeAv.php @@ -298,7 +298,7 @@ abstract class AttributeAv implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/AttributeAvI18n.php b/core/lib/Thelia/Model/Base/AttributeAvI18n.php index 8b2b14a32..bcd1c7453 100755 --- a/core/lib/Thelia/Model/Base/AttributeAvI18n.php +++ b/core/lib/Thelia/Model/Base/AttributeAvI18n.php @@ -272,7 +272,7 @@ abstract class AttributeAvI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/AttributeCategory.php b/core/lib/Thelia/Model/Base/AttributeCategory.php index da702559a..691fa43ad 100755 --- a/core/lib/Thelia/Model/Base/AttributeCategory.php +++ b/core/lib/Thelia/Model/Base/AttributeCategory.php @@ -262,7 +262,7 @@ abstract class AttributeCategory implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/AttributeCombination.php b/core/lib/Thelia/Model/Base/AttributeCombination.php index ef840a5a1..ea2ade03c 100755 --- a/core/lib/Thelia/Model/Base/AttributeCombination.php +++ b/core/lib/Thelia/Model/Base/AttributeCombination.php @@ -269,7 +269,7 @@ abstract class AttributeCombination implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/AttributeI18n.php b/core/lib/Thelia/Model/Base/AttributeI18n.php index 8a0456192..b8865769c 100755 --- a/core/lib/Thelia/Model/Base/AttributeI18n.php +++ b/core/lib/Thelia/Model/Base/AttributeI18n.php @@ -272,7 +272,7 @@ abstract class AttributeI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/Cart.php b/core/lib/Thelia/Model/Base/Cart.php index 20a2d9a5c..910bdf0e0 100755 --- a/core/lib/Thelia/Model/Base/Cart.php +++ b/core/lib/Thelia/Model/Base/Cart.php @@ -307,7 +307,7 @@ abstract class Cart implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/CartItem.php b/core/lib/Thelia/Model/Base/CartItem.php index 827a4c5ec..3c5711022 100755 --- a/core/lib/Thelia/Model/Base/CartItem.php +++ b/core/lib/Thelia/Model/Base/CartItem.php @@ -313,7 +313,7 @@ abstract class CartItem implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/Category.php b/core/lib/Thelia/Model/Base/Category.php index 1bafdae8c..810283e44 100755 --- a/core/lib/Thelia/Model/Base/Category.php +++ b/core/lib/Thelia/Model/Base/Category.php @@ -475,7 +475,7 @@ abstract class Category implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/CategoryAssociatedContent.php b/core/lib/Thelia/Model/Base/CategoryAssociatedContent.php index 142ab543f..a731ec971 100644 --- a/core/lib/Thelia/Model/Base/CategoryAssociatedContent.php +++ b/core/lib/Thelia/Model/Base/CategoryAssociatedContent.php @@ -268,7 +268,7 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/CategoryDocument.php b/core/lib/Thelia/Model/Base/CategoryDocument.php index a5493815d..7225ac46f 100755 --- a/core/lib/Thelia/Model/Base/CategoryDocument.php +++ b/core/lib/Thelia/Model/Base/CategoryDocument.php @@ -290,7 +290,7 @@ abstract class CategoryDocument implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/CategoryDocumentI18n.php b/core/lib/Thelia/Model/Base/CategoryDocumentI18n.php index 2d5f76fcf..f361b3184 100755 --- a/core/lib/Thelia/Model/Base/CategoryDocumentI18n.php +++ b/core/lib/Thelia/Model/Base/CategoryDocumentI18n.php @@ -272,7 +272,7 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/CategoryI18n.php b/core/lib/Thelia/Model/Base/CategoryI18n.php index 3e3d36521..65fa17063 100755 --- a/core/lib/Thelia/Model/Base/CategoryI18n.php +++ b/core/lib/Thelia/Model/Base/CategoryI18n.php @@ -272,7 +272,7 @@ abstract class CategoryI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/CategoryImage.php b/core/lib/Thelia/Model/Base/CategoryImage.php index 6fd905453..17c2007f9 100755 --- a/core/lib/Thelia/Model/Base/CategoryImage.php +++ b/core/lib/Thelia/Model/Base/CategoryImage.php @@ -290,7 +290,7 @@ abstract class CategoryImage implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/CategoryImageI18n.php b/core/lib/Thelia/Model/Base/CategoryImageI18n.php index 0c65b8036..e59c4caca 100755 --- a/core/lib/Thelia/Model/Base/CategoryImageI18n.php +++ b/core/lib/Thelia/Model/Base/CategoryImageI18n.php @@ -272,7 +272,7 @@ abstract class CategoryImageI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/CategoryVersion.php b/core/lib/Thelia/Model/Base/CategoryVersion.php index 416ad95d5..d8dfe76e0 100755 --- a/core/lib/Thelia/Model/Base/CategoryVersion.php +++ b/core/lib/Thelia/Model/Base/CategoryVersion.php @@ -292,7 +292,7 @@ abstract class CategoryVersion implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/Config.php b/core/lib/Thelia/Model/Base/Config.php index b4d909de4..140cdb82d 100755 --- a/core/lib/Thelia/Model/Base/Config.php +++ b/core/lib/Thelia/Model/Base/Config.php @@ -305,7 +305,7 @@ abstract class Config implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/ConfigI18n.php b/core/lib/Thelia/Model/Base/ConfigI18n.php index 57c72ace8..e73e27514 100755 --- a/core/lib/Thelia/Model/Base/ConfigI18n.php +++ b/core/lib/Thelia/Model/Base/ConfigI18n.php @@ -272,7 +272,7 @@ abstract class ConfigI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/Content.php b/core/lib/Thelia/Model/Base/Content.php index bd4d29046..e46d82ac4 100755 --- a/core/lib/Thelia/Model/Base/Content.php +++ b/core/lib/Thelia/Model/Base/Content.php @@ -429,7 +429,7 @@ abstract class Content implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/ContentDocument.php b/core/lib/Thelia/Model/Base/ContentDocument.php index 01f631208..7c974c839 100755 --- a/core/lib/Thelia/Model/Base/ContentDocument.php +++ b/core/lib/Thelia/Model/Base/ContentDocument.php @@ -290,7 +290,7 @@ abstract class ContentDocument implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/ContentDocumentI18n.php b/core/lib/Thelia/Model/Base/ContentDocumentI18n.php index f11cd8a08..e275926c5 100755 --- a/core/lib/Thelia/Model/Base/ContentDocumentI18n.php +++ b/core/lib/Thelia/Model/Base/ContentDocumentI18n.php @@ -272,7 +272,7 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/ContentFolder.php b/core/lib/Thelia/Model/Base/ContentFolder.php index 51d72b974..52f5fa88a 100755 --- a/core/lib/Thelia/Model/Base/ContentFolder.php +++ b/core/lib/Thelia/Model/Base/ContentFolder.php @@ -256,7 +256,7 @@ abstract class ContentFolder implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/ContentI18n.php b/core/lib/Thelia/Model/Base/ContentI18n.php index 244862800..14ff02b39 100755 --- a/core/lib/Thelia/Model/Base/ContentI18n.php +++ b/core/lib/Thelia/Model/Base/ContentI18n.php @@ -272,7 +272,7 @@ abstract class ContentI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/ContentImage.php b/core/lib/Thelia/Model/Base/ContentImage.php index 33e1eca09..884c20c1e 100755 --- a/core/lib/Thelia/Model/Base/ContentImage.php +++ b/core/lib/Thelia/Model/Base/ContentImage.php @@ -290,7 +290,7 @@ abstract class ContentImage implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/ContentImageI18n.php b/core/lib/Thelia/Model/Base/ContentImageI18n.php index cba4fba17..9fe9b4147 100755 --- a/core/lib/Thelia/Model/Base/ContentImageI18n.php +++ b/core/lib/Thelia/Model/Base/ContentImageI18n.php @@ -272,7 +272,7 @@ abstract class ContentImageI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/ContentVersion.php b/core/lib/Thelia/Model/Base/ContentVersion.php index ef2897030..ca9189608 100755 --- a/core/lib/Thelia/Model/Base/ContentVersion.php +++ b/core/lib/Thelia/Model/Base/ContentVersion.php @@ -286,7 +286,7 @@ abstract class ContentVersion implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/Country.php b/core/lib/Thelia/Model/Base/Country.php index 3794bff3c..3c4247896 100755 --- a/core/lib/Thelia/Model/Base/Country.php +++ b/core/lib/Thelia/Model/Base/Country.php @@ -324,7 +324,7 @@ abstract class Country implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/CountryI18n.php b/core/lib/Thelia/Model/Base/CountryI18n.php index fbba979a1..270a9d3f7 100755 --- a/core/lib/Thelia/Model/Base/CountryI18n.php +++ b/core/lib/Thelia/Model/Base/CountryI18n.php @@ -272,7 +272,7 @@ abstract class CountryI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/CouponOrder.php b/core/lib/Thelia/Model/Base/CouponOrder.php index a183f262e..7d3c413b6 100755 --- a/core/lib/Thelia/Model/Base/CouponOrder.php +++ b/core/lib/Thelia/Model/Base/CouponOrder.php @@ -268,7 +268,7 @@ abstract class CouponOrder implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/Currency.php b/core/lib/Thelia/Model/Base/Currency.php index f99288679..a5ada0790 100755 --- a/core/lib/Thelia/Model/Base/Currency.php +++ b/core/lib/Thelia/Model/Base/Currency.php @@ -337,7 +337,7 @@ abstract class Currency implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/CurrencyI18n.php b/core/lib/Thelia/Model/Base/CurrencyI18n.php index 931c3acbf..52cd7fc5b 100755 --- a/core/lib/Thelia/Model/Base/CurrencyI18n.php +++ b/core/lib/Thelia/Model/Base/CurrencyI18n.php @@ -254,7 +254,7 @@ abstract class CurrencyI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/Customer.php b/core/lib/Thelia/Model/Base/Customer.php index 3d87f3e28..c3315ac6f 100755 --- a/core/lib/Thelia/Model/Base/Customer.php +++ b/core/lib/Thelia/Model/Base/Customer.php @@ -352,7 +352,7 @@ abstract class Customer implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/CustomerTitle.php b/core/lib/Thelia/Model/Base/CustomerTitle.php index dcf271206..7f4c30d09 100755 --- a/core/lib/Thelia/Model/Base/CustomerTitle.php +++ b/core/lib/Thelia/Model/Base/CustomerTitle.php @@ -319,7 +319,7 @@ abstract class CustomerTitle implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/CustomerTitleI18n.php b/core/lib/Thelia/Model/Base/CustomerTitleI18n.php index 4ea186061..38e47ecda 100755 --- a/core/lib/Thelia/Model/Base/CustomerTitleI18n.php +++ b/core/lib/Thelia/Model/Base/CustomerTitleI18n.php @@ -260,7 +260,7 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/Delivzone.php b/core/lib/Thelia/Model/Base/Delivzone.php index deb21997e..08125044e 100755 --- a/core/lib/Thelia/Model/Base/Delivzone.php +++ b/core/lib/Thelia/Model/Base/Delivzone.php @@ -255,7 +255,7 @@ abstract class Delivzone implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/Feature.php b/core/lib/Thelia/Model/Base/Feature.php index 070bac50b..826de003f 100755 --- a/core/lib/Thelia/Model/Base/Feature.php +++ b/core/lib/Thelia/Model/Base/Feature.php @@ -346,7 +346,7 @@ abstract class Feature implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/FeatureAv.php b/core/lib/Thelia/Model/Base/FeatureAv.php index 14e6cd35c..818f352a0 100755 --- a/core/lib/Thelia/Model/Base/FeatureAv.php +++ b/core/lib/Thelia/Model/Base/FeatureAv.php @@ -298,7 +298,7 @@ abstract class FeatureAv implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/FeatureAvI18n.php b/core/lib/Thelia/Model/Base/FeatureAvI18n.php index a508d6075..aa524c430 100755 --- a/core/lib/Thelia/Model/Base/FeatureAvI18n.php +++ b/core/lib/Thelia/Model/Base/FeatureAvI18n.php @@ -272,7 +272,7 @@ abstract class FeatureAvI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/FeatureCategory.php b/core/lib/Thelia/Model/Base/FeatureCategory.php index 035e077d2..f3ce14349 100755 --- a/core/lib/Thelia/Model/Base/FeatureCategory.php +++ b/core/lib/Thelia/Model/Base/FeatureCategory.php @@ -262,7 +262,7 @@ abstract class FeatureCategory implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/FeatureI18n.php b/core/lib/Thelia/Model/Base/FeatureI18n.php index 06964ee19..b6070932e 100755 --- a/core/lib/Thelia/Model/Base/FeatureI18n.php +++ b/core/lib/Thelia/Model/Base/FeatureI18n.php @@ -272,7 +272,7 @@ abstract class FeatureI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/FeatureProduct.php b/core/lib/Thelia/Model/Base/FeatureProduct.php index 4af200d51..b68f4acd2 100755 --- a/core/lib/Thelia/Model/Base/FeatureProduct.php +++ b/core/lib/Thelia/Model/Base/FeatureProduct.php @@ -287,7 +287,7 @@ abstract class FeatureProduct implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/Folder.php b/core/lib/Thelia/Model/Base/Folder.php index 8899ae6be..1b0c80d94 100755 --- a/core/lib/Thelia/Model/Base/Folder.php +++ b/core/lib/Thelia/Model/Base/Folder.php @@ -407,7 +407,7 @@ abstract class Folder implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/FolderDocument.php b/core/lib/Thelia/Model/Base/FolderDocument.php index fbe0c91b1..25b68a842 100755 --- a/core/lib/Thelia/Model/Base/FolderDocument.php +++ b/core/lib/Thelia/Model/Base/FolderDocument.php @@ -290,7 +290,7 @@ abstract class FolderDocument implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/FolderDocumentI18n.php b/core/lib/Thelia/Model/Base/FolderDocumentI18n.php index 57a38034f..520160758 100755 --- a/core/lib/Thelia/Model/Base/FolderDocumentI18n.php +++ b/core/lib/Thelia/Model/Base/FolderDocumentI18n.php @@ -272,7 +272,7 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/FolderI18n.php b/core/lib/Thelia/Model/Base/FolderI18n.php index 12d627cac..35e69d6a6 100755 --- a/core/lib/Thelia/Model/Base/FolderI18n.php +++ b/core/lib/Thelia/Model/Base/FolderI18n.php @@ -272,7 +272,7 @@ abstract class FolderI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/FolderImage.php b/core/lib/Thelia/Model/Base/FolderImage.php index f1eb8a5ab..73bfd11b8 100755 --- a/core/lib/Thelia/Model/Base/FolderImage.php +++ b/core/lib/Thelia/Model/Base/FolderImage.php @@ -290,7 +290,7 @@ abstract class FolderImage implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/FolderImageI18n.php b/core/lib/Thelia/Model/Base/FolderImageI18n.php index 894b6ec0f..9096c8542 100755 --- a/core/lib/Thelia/Model/Base/FolderImageI18n.php +++ b/core/lib/Thelia/Model/Base/FolderImageI18n.php @@ -272,7 +272,7 @@ abstract class FolderImageI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/FolderVersion.php b/core/lib/Thelia/Model/Base/FolderVersion.php index ec588dcbd..4f6305b7e 100755 --- a/core/lib/Thelia/Model/Base/FolderVersion.php +++ b/core/lib/Thelia/Model/Base/FolderVersion.php @@ -292,7 +292,7 @@ abstract class FolderVersion implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/Group.php b/core/lib/Thelia/Model/Base/Group.php index eed65d778..6b66d5f39 100755 --- a/core/lib/Thelia/Model/Base/Group.php +++ b/core/lib/Thelia/Model/Base/Group.php @@ -339,7 +339,7 @@ abstract class Group implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/GroupI18n.php b/core/lib/Thelia/Model/Base/GroupI18n.php index 4ba0aac29..de90d8863 100755 --- a/core/lib/Thelia/Model/Base/GroupI18n.php +++ b/core/lib/Thelia/Model/Base/GroupI18n.php @@ -272,7 +272,7 @@ abstract class GroupI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/GroupModule.php b/core/lib/Thelia/Model/Base/GroupModule.php index 82d6056f2..620ca9c91 100755 --- a/core/lib/Thelia/Model/Base/GroupModule.php +++ b/core/lib/Thelia/Model/Base/GroupModule.php @@ -282,7 +282,7 @@ abstract class GroupModule implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/GroupResource.php b/core/lib/Thelia/Model/Base/GroupResource.php index ea6c0ff47..84d6006b0 100755 --- a/core/lib/Thelia/Model/Base/GroupResource.php +++ b/core/lib/Thelia/Model/Base/GroupResource.php @@ -290,7 +290,7 @@ abstract class GroupResource implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/Lang.php b/core/lib/Thelia/Model/Base/Lang.php index 293b0f3a7..3379594ef 100755 --- a/core/lib/Thelia/Model/Base/Lang.php +++ b/core/lib/Thelia/Model/Base/Lang.php @@ -272,7 +272,7 @@ abstract class Lang implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/Message.php b/core/lib/Thelia/Model/Base/Message.php index 5245c3765..f39e4ecbe 100755 --- a/core/lib/Thelia/Model/Base/Message.php +++ b/core/lib/Thelia/Model/Base/Message.php @@ -338,7 +338,7 @@ abstract class Message implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/MessageI18n.php b/core/lib/Thelia/Model/Base/MessageI18n.php index 575e22907..545e75244 100755 --- a/core/lib/Thelia/Model/Base/MessageI18n.php +++ b/core/lib/Thelia/Model/Base/MessageI18n.php @@ -266,7 +266,7 @@ abstract class MessageI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/MessageVersion.php b/core/lib/Thelia/Model/Base/MessageVersion.php index e425b5c50..0781a503a 100755 --- a/core/lib/Thelia/Model/Base/MessageVersion.php +++ b/core/lib/Thelia/Model/Base/MessageVersion.php @@ -292,7 +292,7 @@ abstract class MessageVersion implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/Module.php b/core/lib/Thelia/Model/Base/Module.php index 76c391207..ebe4b4c18 100755 --- a/core/lib/Thelia/Model/Base/Module.php +++ b/core/lib/Thelia/Model/Base/Module.php @@ -303,7 +303,7 @@ abstract class Module implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/ModuleI18n.php b/core/lib/Thelia/Model/Base/ModuleI18n.php index d31dda0ba..54cf305e4 100755 --- a/core/lib/Thelia/Model/Base/ModuleI18n.php +++ b/core/lib/Thelia/Model/Base/ModuleI18n.php @@ -272,7 +272,7 @@ abstract class ModuleI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/Order.php b/core/lib/Thelia/Model/Base/Order.php index 3c47ce415..ccf7922f3 100755 --- a/core/lib/Thelia/Model/Base/Order.php +++ b/core/lib/Thelia/Model/Base/Order.php @@ -388,7 +388,7 @@ abstract class Order implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/OrderAddress.php b/core/lib/Thelia/Model/Base/OrderAddress.php index d0220d4e0..b5ff32951 100755 --- a/core/lib/Thelia/Model/Base/OrderAddress.php +++ b/core/lib/Thelia/Model/Base/OrderAddress.php @@ -329,7 +329,7 @@ abstract class OrderAddress implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/OrderFeature.php b/core/lib/Thelia/Model/Base/OrderFeature.php index e2b52e6b1..49c1a0911 100755 --- a/core/lib/Thelia/Model/Base/OrderFeature.php +++ b/core/lib/Thelia/Model/Base/OrderFeature.php @@ -261,7 +261,7 @@ abstract class OrderFeature implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/OrderProduct.php b/core/lib/Thelia/Model/Base/OrderProduct.php index 2bf9c7ace..b448e4e0c 100755 --- a/core/lib/Thelia/Model/Base/OrderProduct.php +++ b/core/lib/Thelia/Model/Base/OrderProduct.php @@ -312,7 +312,7 @@ abstract class OrderProduct implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/OrderStatus.php b/core/lib/Thelia/Model/Base/OrderStatus.php index 99bb87879..15ce7fbf7 100755 --- a/core/lib/Thelia/Model/Base/OrderStatus.php +++ b/core/lib/Thelia/Model/Base/OrderStatus.php @@ -285,7 +285,7 @@ abstract class OrderStatus implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/OrderStatusI18n.php b/core/lib/Thelia/Model/Base/OrderStatusI18n.php index 249944854..1f98739f0 100755 --- a/core/lib/Thelia/Model/Base/OrderStatusI18n.php +++ b/core/lib/Thelia/Model/Base/OrderStatusI18n.php @@ -272,7 +272,7 @@ abstract class OrderStatusI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/Product.php b/core/lib/Thelia/Model/Base/Product.php index e66c2fe17..707bd0904 100755 --- a/core/lib/Thelia/Model/Base/Product.php +++ b/core/lib/Thelia/Model/Base/Product.php @@ -526,7 +526,7 @@ abstract class Product implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/ProductCategory.php b/core/lib/Thelia/Model/Base/ProductCategory.php index 62a6ea425..74affb0c0 100755 --- a/core/lib/Thelia/Model/Base/ProductCategory.php +++ b/core/lib/Thelia/Model/Base/ProductCategory.php @@ -256,7 +256,7 @@ abstract class ProductCategory implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/ProductDocument.php b/core/lib/Thelia/Model/Base/ProductDocument.php index 96a584dab..16503b9fb 100755 --- a/core/lib/Thelia/Model/Base/ProductDocument.php +++ b/core/lib/Thelia/Model/Base/ProductDocument.php @@ -290,7 +290,7 @@ abstract class ProductDocument implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/ProductDocumentI18n.php b/core/lib/Thelia/Model/Base/ProductDocumentI18n.php index ba04b5ccc..f6c8436f8 100755 --- a/core/lib/Thelia/Model/Base/ProductDocumentI18n.php +++ b/core/lib/Thelia/Model/Base/ProductDocumentI18n.php @@ -272,7 +272,7 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/ProductI18n.php b/core/lib/Thelia/Model/Base/ProductI18n.php index ee7514fd4..7b6e65976 100755 --- a/core/lib/Thelia/Model/Base/ProductI18n.php +++ b/core/lib/Thelia/Model/Base/ProductI18n.php @@ -272,7 +272,7 @@ abstract class ProductI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/ProductImage.php b/core/lib/Thelia/Model/Base/ProductImage.php index 152a298a5..364e6f00b 100755 --- a/core/lib/Thelia/Model/Base/ProductImage.php +++ b/core/lib/Thelia/Model/Base/ProductImage.php @@ -290,7 +290,7 @@ abstract class ProductImage implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/ProductImageI18n.php b/core/lib/Thelia/Model/Base/ProductImageI18n.php index c84f99af2..064f09986 100755 --- a/core/lib/Thelia/Model/Base/ProductImageI18n.php +++ b/core/lib/Thelia/Model/Base/ProductImageI18n.php @@ -272,7 +272,7 @@ abstract class ProductImageI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/ProductPrice.php b/core/lib/Thelia/Model/Base/ProductPrice.php index 15502a385..dab6e47a4 100755 --- a/core/lib/Thelia/Model/Base/ProductPrice.php +++ b/core/lib/Thelia/Model/Base/ProductPrice.php @@ -274,7 +274,7 @@ abstract class ProductPrice implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/ProductSaleElements.php b/core/lib/Thelia/Model/Base/ProductSaleElements.php index f79d9a246..22a8c9752 100755 --- a/core/lib/Thelia/Model/Base/ProductSaleElements.php +++ b/core/lib/Thelia/Model/Base/ProductSaleElements.php @@ -332,7 +332,7 @@ abstract class ProductSaleElements implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/ProductVersion.php b/core/lib/Thelia/Model/Base/ProductVersion.php index 071dfc742..1779cee20 100755 --- a/core/lib/Thelia/Model/Base/ProductVersion.php +++ b/core/lib/Thelia/Model/Base/ProductVersion.php @@ -300,7 +300,7 @@ abstract class ProductVersion implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/Resource.php b/core/lib/Thelia/Model/Base/Resource.php index b513ea326..827de2643 100755 --- a/core/lib/Thelia/Model/Base/Resource.php +++ b/core/lib/Thelia/Model/Base/Resource.php @@ -298,7 +298,7 @@ abstract class Resource implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/ResourceI18n.php b/core/lib/Thelia/Model/Base/ResourceI18n.php index 4419f7fc8..b740bd858 100755 --- a/core/lib/Thelia/Model/Base/ResourceI18n.php +++ b/core/lib/Thelia/Model/Base/ResourceI18n.php @@ -272,7 +272,7 @@ abstract class ResourceI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/Rewriting.php b/core/lib/Thelia/Model/Base/Rewriting.php index c8109458d..12229c438 100755 --- a/core/lib/Thelia/Model/Base/Rewriting.php +++ b/core/lib/Thelia/Model/Base/Rewriting.php @@ -294,7 +294,7 @@ abstract class Rewriting implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/Tax.php b/core/lib/Thelia/Model/Base/Tax.php index c1ddbf23a..f3717366f 100755 --- a/core/lib/Thelia/Model/Base/Tax.php +++ b/core/lib/Thelia/Model/Base/Tax.php @@ -285,7 +285,7 @@ abstract class Tax implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/TaxI18n.php b/core/lib/Thelia/Model/Base/TaxI18n.php index a066fe4a8..8fdec086d 100755 --- a/core/lib/Thelia/Model/Base/TaxI18n.php +++ b/core/lib/Thelia/Model/Base/TaxI18n.php @@ -260,7 +260,7 @@ abstract class TaxI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/TaxRule.php b/core/lib/Thelia/Model/Base/TaxRule.php index e363541d7..101471313 100755 --- a/core/lib/Thelia/Model/Base/TaxRule.php +++ b/core/lib/Thelia/Model/Base/TaxRule.php @@ -311,7 +311,7 @@ abstract class TaxRule implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/TaxRuleCountry.php b/core/lib/Thelia/Model/Base/TaxRuleCountry.php index 66f6f585b..b5ae7941b 100755 --- a/core/lib/Thelia/Model/Base/TaxRuleCountry.php +++ b/core/lib/Thelia/Model/Base/TaxRuleCountry.php @@ -281,7 +281,7 @@ abstract class TaxRuleCountry implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Model/Base/TaxRuleI18n.php b/core/lib/Thelia/Model/Base/TaxRuleI18n.php index f685dd3cc..86215b335 100755 --- a/core/lib/Thelia/Model/Base/TaxRuleI18n.php +++ b/core/lib/Thelia/Model/Base/TaxRuleI18n.php @@ -248,7 +248,7 @@ abstract class TaxRuleI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** From 1d87708d3be85cd6816b7f661c199e5212ae51d9 Mon Sep 17 00:00:00 2001 From: gmorel Date: Wed, 28 Aug 2013 19:21:48 +0200 Subject: [PATCH 021/125] Working - Update Coupon BackOffice routing --- .../Thelia/Config/Resources/routing/admin.xml | 16 +++++--- .../Controller/Admin/CouponController.php | 37 ++----------------- 2 files changed, 14 insertions(+), 39 deletions(-) diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml index 2561dcc99..cd7af7aef 100755 --- a/core/lib/Thelia/Config/Resources/routing/admin.xml +++ b/core/lib/Thelia/Config/Resources/routing/admin.xml @@ -37,16 +37,20 @@ - Thelia\Controller\Admin\CouponController::indexAction + Thelia\Controller\Admin\CouponController::processAction + browse - Thelia\Controller\Admin\CouponController::createAction + Thelia\Controller\Admin\CouponController::processAction + create - - Thelia\Controller\Admin\CouponController::editAction + + Thelia\Controller\Admin\CouponController::processAction + edit - - Thelia\Controller\Admin\CouponController::readAction + + Thelia\Controller\Admin\CouponController::processAction + read diff --git a/core/lib/Thelia/Controller/Admin/CouponController.php b/core/lib/Thelia/Controller/Admin/CouponController.php index e6159c9ac..b1cf197c8 100755 --- a/core/lib/Thelia/Controller/Admin/CouponController.php +++ b/core/lib/Thelia/Controller/Admin/CouponController.php @@ -46,37 +46,7 @@ class CouponController extends BaseAdminController */ public function indexAction() { - return $this->processAction(); - } - - /** - * Create a Coupon Action - * - * @return \Symfony\Component\HttpFoundation\Response - */ - public function createAction() - { - return $this->processAction('create'); - } - - /** - * Edit a Coupon Action - * - * @return \Symfony\Component\HttpFoundation\Response - */ - public function editAction() - { - return $this->processAction('edit'); - } - - /** - * Read a Coupon Action - * - * @return \Symfony\Component\HttpFoundation\Response - */ - public function readAction() - { - return $this->processAction('read'); + return $this->process(); } /** @@ -142,10 +112,11 @@ class CouponController extends BaseAdminController * * @return \Symfony\Component\HttpFoundation\Response */ - public function processAction($action = 'browse') + public function processAction() { + var_dump($this->getRequest()->attributes); // Get the current action -// $action = $this->getRequest()->get('action', 'browse'); + $action = $this->getRequest()->get('action', 'browse'); // Get the category ID // $id = $this->getRequest()->get('id', 0); From 6f31460be6288c5b414964d838fbf91130f3caee Mon Sep 17 00:00:00 2001 From: gmorel Date: Wed, 28 Aug 2013 19:45:21 +0200 Subject: [PATCH 022/125] Working - Fix serialization not tested --- core/lib/Thelia/Tests/Constraint/Validator/DateParamTest.php | 2 +- core/lib/Thelia/Tests/Constraint/Validator/IntegerParamTest.php | 2 +- .../lib/Thelia/Tests/Constraint/Validator/IntervalParamTest.php | 2 +- core/lib/Thelia/Tests/Constraint/Validator/PriceParamTest.php | 2 +- .../lib/Thelia/Tests/Constraint/Validator/QuantityParamTest.php | 2 +- .../Thelia/Tests/Constraint/Validator/RepeatedDateParamTest.php | 2 +- .../Tests/Constraint/Validator/RepeatedIntervalParamTest.php | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/lib/Thelia/Tests/Constraint/Validator/DateParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/DateParamTest.php index 1b3739c5c..45b7f00ae 100644 --- a/core/lib/Thelia/Tests/Constraint/Validator/DateParamTest.php +++ b/core/lib/Thelia/Tests/Constraint/Validator/DateParamTest.php @@ -121,7 +121,7 @@ class DateParamTest extends \PHPUnit_Framework_TestCase * Test is the object is serializable * If no data is lost during the process */ - protected function isSerializableTest() + public function isSerializableTest() { $adapter = new CouponBaseAdapter(); $dateValidator = new \DateTime("2012-07-08"); diff --git a/core/lib/Thelia/Tests/Constraint/Validator/IntegerParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/IntegerParamTest.php index c7b5b2ac0..0c7184dde 100644 --- a/core/lib/Thelia/Tests/Constraint/Validator/IntegerParamTest.php +++ b/core/lib/Thelia/Tests/Constraint/Validator/IntegerParamTest.php @@ -123,7 +123,7 @@ class IntegerParamTest extends \PHPUnit_Framework_TestCase * Test is the object is serializable * If no data is lost during the process */ - protected function isSerializableTest() + public function isSerializableTest() { $adapter = new CouponBaseAdapter(); $intValidator = 42; diff --git a/core/lib/Thelia/Tests/Constraint/Validator/IntervalParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/IntervalParamTest.php index 05dad2f0c..77abdbe24 100644 --- a/core/lib/Thelia/Tests/Constraint/Validator/IntervalParamTest.php +++ b/core/lib/Thelia/Tests/Constraint/Validator/IntervalParamTest.php @@ -147,7 +147,7 @@ class IntervalParamTest extends \PHPUnit_Framework_TestCase * Test is the object is serializable * If no data is lost during the process */ - protected function isSerializableTest() + public function isSerializableTest() { $adapter = new CouponBaseAdapter(); $dateValidatorStart = new \DateTime("2012-07-08"); diff --git a/core/lib/Thelia/Tests/Constraint/Validator/PriceParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/PriceParamTest.php index 7ccc508aa..1cdee6bd2 100644 --- a/core/lib/Thelia/Tests/Constraint/Validator/PriceParamTest.php +++ b/core/lib/Thelia/Tests/Constraint/Validator/PriceParamTest.php @@ -199,7 +199,7 @@ class PriceParamTest extends \PHPUnit_Framework_TestCase * Test is the object is serializable * If no data is lost during the process */ - protected function isSerializableTest() + public function isSerializableTest() { $adapter = new CouponBaseAdapter(); $priceValidator = 42.50; diff --git a/core/lib/Thelia/Tests/Constraint/Validator/QuantityParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/QuantityParamTest.php index bd83d45db..198e6e611 100644 --- a/core/lib/Thelia/Tests/Constraint/Validator/QuantityParamTest.php +++ b/core/lib/Thelia/Tests/Constraint/Validator/QuantityParamTest.php @@ -159,7 +159,7 @@ class QuantityParamTest extends \PHPUnit_Framework_TestCase * Test is the object is serializable * If no data is lost during the process */ - protected function isSerializableTest() + public function isSerializableTest() { $adapter = new CouponBaseAdapter(); $intValidator = 42; diff --git a/core/lib/Thelia/Tests/Constraint/Validator/RepeatedDateParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/RepeatedDateParamTest.php index 5766cb6b1..875453666 100644 --- a/core/lib/Thelia/Tests/Constraint/Validator/RepeatedDateParamTest.php +++ b/core/lib/Thelia/Tests/Constraint/Validator/RepeatedDateParamTest.php @@ -270,7 +270,7 @@ class RepeatedDateParamTest extends \PHPUnit_Framework_TestCase * Test is the object is serializable * If no data is lost during the process */ - protected function isSerializableTest() + public function isSerializableTest() { $adapter = new CouponBaseAdapter(); $startDateValidator = new \DateTime("2012-07-08"); diff --git a/core/lib/Thelia/Tests/Constraint/Validator/RepeatedIntervalParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/RepeatedIntervalParamTest.php index 22a105ffb..2b3bd00c8 100644 --- a/core/lib/Thelia/Tests/Constraint/Validator/RepeatedIntervalParamTest.php +++ b/core/lib/Thelia/Tests/Constraint/Validator/RepeatedIntervalParamTest.php @@ -383,7 +383,7 @@ class RepeatedIntervalParamTest extends \PHPUnit_Framework_TestCase * Test is the object is serializable * If no data is lost during the process */ - protected function isSerializableTest() + public function isSerializableTest() { $adapter = new CouponBaseAdapter(); $startDateValidator = new \DateTime("2012-07-08"); From 4b9a54fa68a1b6121e5b4fd06c6870ec1f03f567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20ESPECHE?= Date: Thu, 29 Aug 2013 16:16:21 +0200 Subject: [PATCH 023/125] WIP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Implémentation coupon/list en cours - Implémentation coupon/read OK - Implémentation coupon/edit en cours --- .../assets/js/tablesorter/jquery-latest.js | 154 ++++++++++++++ .../js/tablesorter/jquery.tablesorter.min.js | 4 + templates/admin/default/coupon/edit.html | 55 ++++- templates/admin/default/coupon/list.html | 188 +++++++++++++++++- templates/admin/default/coupon/read.html | 102 +++++++++- 5 files changed, 490 insertions(+), 13 deletions(-) create mode 100644 templates/admin/default/assets/js/tablesorter/jquery-latest.js create mode 100644 templates/admin/default/assets/js/tablesorter/jquery.tablesorter.min.js diff --git a/templates/admin/default/assets/js/tablesorter/jquery-latest.js b/templates/admin/default/assets/js/tablesorter/jquery-latest.js new file mode 100644 index 000000000..ac7e7009d --- /dev/null +++ b/templates/admin/default/assets/js/tablesorter/jquery-latest.js @@ -0,0 +1,154 @@ +/*! + * jQuery JavaScript Library v1.4.2 + * http://jquery.com/ + * + * Copyright 2010, John Resig + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * Includes Sizzle.js + * http://sizzlejs.com/ + * Copyright 2010, The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + * + * Date: Sat Feb 13 22:33:48 2010 -0500 + */ +(function(A,w){function ma(){if(!c.isReady){try{s.documentElement.doScroll("left")}catch(a){setTimeout(ma,1);return}c.ready()}}function Qa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,j){var i=a.length;if(typeof b==="object"){for(var o in b)X(a,o,b[o],f,e,d);return a}if(d!==w){f=!j&&f&&c.isFunction(d);for(o=0;o)[^>]*$|^#([\w-]+)$/,Ua=/^.[^:#\[\.,]*$/,Va=/\S/, +Wa=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,Xa=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,P=navigator.userAgent,xa=false,Q=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,R=Array.prototype.slice,ya=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if(!a)return this;if(a.nodeType){this.context=this[0]=a;this.length=1;return this}if(a==="body"&&!b){this.context=s;this[0]=s.body;this.selector="body";this.length=1;return this}if(typeof a==="string")if((d=Ta.exec(a))&& +(d[1]||!b))if(d[1]){f=b?b.ownerDocument||b:s;if(a=Xa.exec(a))if(c.isPlainObject(b)){a=[s.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=sa([d[1]],[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}return c.merge(this,a)}else{if(b=s.getElementById(d[2])){if(b.id!==d[2])return T.find(a);this.length=1;this[0]=b}this.context=s;this.selector=a;return this}else if(!b&&/^\w+$/.test(a)){this.selector=a;this.context=s;a=s.getElementsByTagName(a);return c.merge(this, +a)}else return!b||b.jquery?(b||T).find(a):c(b).find(a);else if(c.isFunction(a))return T.ready(a);if(a.selector!==w){this.selector=a.selector;this.context=a.context}return c.makeArray(a,this)},selector:"",jquery:"1.4.2",length:0,size:function(){return this.length},toArray:function(){return R.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){var f=c();c.isArray(a)?ba.apply(f,a):c.merge(f,a);f.prevObject=this;f.context=this.context;if(b=== +"find")f.selector=this.selector+(this.selector?" ":"")+d;else if(b)f.selector=this.selector+"."+b+"("+d+")";return f},each:function(a,b){return c.each(this,a,b)},ready:function(a){c.bindReady();if(c.isReady)a.call(s,c);else Q&&Q.push(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(R.apply(this,arguments),"slice",R.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this, +function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject||c(null)},push:ba,sort:[].sort,splice:[].splice};c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]||{},b=1,d=arguments.length,f=false,e,j,i,o;if(typeof a==="boolean"){f=a;a=arguments[1]||{};b=2}if(typeof a!=="object"&&!c.isFunction(a))a={};if(d===b){a=this;--b}for(;b
    a"; +var e=d.getElementsByTagName("*"),j=d.getElementsByTagName("a")[0];if(!(!e||!e.length||!j)){c.support={leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(j.getAttribute("style")),hrefNormalized:j.getAttribute("href")==="/a",opacity:/^0.55$/.test(j.style.opacity),cssFloat:!!j.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:s.createElement("select").appendChild(s.createElement("option")).selected, +parentNode:d.removeChild(d.appendChild(s.createElement("div"))).parentNode===null,deleteExpando:true,checkClone:false,scriptEval:false,noCloneEvent:true,boxModel:null};b.type="text/javascript";try{b.appendChild(s.createTextNode("window."+f+"=1;"))}catch(i){}a.insertBefore(b,a.firstChild);if(A[f]){c.support.scriptEval=true;delete A[f]}try{delete b.test}catch(o){c.support.deleteExpando=false}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function k(){c.support.noCloneEvent= +false;d.detachEvent("onclick",k)});d.cloneNode(true).fireEvent("onclick")}d=s.createElement("div");d.innerHTML="";a=s.createDocumentFragment();a.appendChild(d.firstChild);c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var k=s.createElement("div");k.style.width=k.style.paddingLeft="1px";s.body.appendChild(k);c.boxModel=c.support.boxModel=k.offsetWidth===2;s.body.removeChild(k).style.display="none"});a=function(k){var n= +s.createElement("div");k="on"+k;var r=k in n;if(!r){n.setAttribute(k,"return;");r=typeof n[k]==="function"}return r};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=e=j=null}})();c.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};var G="jQuery"+J(),Ya=0,za={};c.extend({cache:{},expando:G,noData:{embed:true,object:true, +applet:true},data:function(a,b,d){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var f=a[G],e=c.cache;if(!f&&typeof b==="string"&&d===w)return null;f||(f=++Ya);if(typeof b==="object"){a[G]=f;e[f]=c.extend(true,{},b)}else if(!e[f]){a[G]=f;e[f]={}}a=e[f];if(d!==w)a[b]=d;return typeof b==="string"?a[b]:a}},removeData:function(a,b){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var d=a[G],f=c.cache,e=f[d];if(b){if(e){delete e[b];c.isEmptyObject(e)&&c.removeData(a)}}else{if(c.support.deleteExpando)delete a[c.expando]; +else a.removeAttribute&&a.removeAttribute(c.expando);delete f[d]}}}});c.fn.extend({data:function(a,b){if(typeof a==="undefined"&&this.length)return c.data(this[0]);else if(typeof a==="object")return this.each(function(){c.data(this,a)});var d=a.split(".");d[1]=d[1]?"."+d[1]:"";if(b===w){var f=this.triggerHandler("getData"+d[1]+"!",[d[0]]);if(f===w&&this.length)f=c.data(this[0],a);return f===w&&d[1]?this.data(d[0]):f}else return this.trigger("setData"+d[1]+"!",[d[0],b]).each(function(){c.data(this, +a,b)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var f=c.data(a,b);if(!d)return f||[];if(!f||c.isArray(d))f=c.data(a,b,c.makeArray(d));else f.push(d);return f}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),f=d.shift();if(f==="inprogress")f=d.shift();if(f){b==="fx"&&d.unshift("inprogress");f.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b=== +w)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var Aa=/[\n\t]/g,ca=/\s+/,Za=/\r/g,$a=/href|src|style/,ab=/(button|input)/i,bb=/(button|input|object|select|textarea)/i, +cb=/^(a|area)$/i,Ba=/radio|checkbox/;c.fn.extend({attr:function(a,b){return X(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(n){var r=c(this);r.addClass(a.call(this,n,r.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ca),d=0,f=this.length;d-1)return true;return false},val:function(a){if(a===w){var b=this[0];if(b){if(c.nodeName(b,"option"))return(b.attributes.value||{}).specified?b.value:b.text;if(c.nodeName(b,"select")){var d=b.selectedIndex,f=[],e=b.options;b=b.type==="select-one";if(d<0)return null;var j=b?d:0;for(d=b?d+1:e.length;j=0;else if(c.nodeName(this,"select")){var u=c.makeArray(r);c("option",this).each(function(){this.selected= +c.inArray(c(this).val(),u)>=0});if(!u.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(a,b,d,f){if(!a||a.nodeType===3||a.nodeType===8)return w;if(f&&b in c.attrFn)return c(a)[b](d);f=a.nodeType!==1||!c.isXMLDoc(a);var e=d!==w;b=f&&c.props[b]||b;if(a.nodeType===1){var j=$a.test(b);if(b in a&&f&&!j){if(e){b==="type"&&ab.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed"); +a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&b.specified?b.value:bb.test(a.nodeName)||cb.test(a.nodeName)&&a.href?0:w;return a[b]}if(!c.support.style&&f&&b==="style"){if(e)a.style.cssText=""+d;return a.style.cssText}e&&a.setAttribute(b,""+d);a=!c.support.hrefNormalized&&f&&j?a.getAttribute(b,2):a.getAttribute(b);return a===null?w:a}return c.style(a,b,d)}});var O=/\.(.*)$/,db=function(a){return a.replace(/[^\w\s\.\|`]/g, +function(b){return"\\"+b})};c.event={add:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){if(a.setInterval&&a!==A&&!a.frameElement)a=A;var e,j;if(d.handler){e=d;d=e.handler}if(!d.guid)d.guid=c.guid++;if(j=c.data(a)){var i=j.events=j.events||{},o=j.handle;if(!o)j.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem,arguments):w};o.elem=a;b=b.split(" ");for(var k,n=0,r;k=b[n++];){j=e?c.extend({},e):{handler:d,data:f};if(k.indexOf(".")>-1){r=k.split("."); +k=r.shift();j.namespace=r.slice(0).sort().join(".")}else{r=[];j.namespace=""}j.type=k;j.guid=d.guid;var u=i[k],z=c.event.special[k]||{};if(!u){u=i[k]=[];if(!z.setup||z.setup.call(a,f,r,o)===false)if(a.addEventListener)a.addEventListener(k,o,false);else a.attachEvent&&a.attachEvent("on"+k,o)}if(z.add){z.add.call(a,j);if(!j.handler.guid)j.handler.guid=d.guid}u.push(j);c.event.global[k]=true}a=null}}},global:{},remove:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){var e,j=0,i,o,k,n,r,u,z=c.data(a), +C=z&&z.events;if(z&&C){if(b&&b.type){d=b.handler;b=b.type}if(!b||typeof b==="string"&&b.charAt(0)==="."){b=b||"";for(e in C)c.event.remove(a,e+b)}else{for(b=b.split(" ");e=b[j++];){n=e;i=e.indexOf(".")<0;o=[];if(!i){o=e.split(".");e=o.shift();k=new RegExp("(^|\\.)"+c.map(o.slice(0).sort(),db).join("\\.(?:.*\\.)?")+"(\\.|$)")}if(r=C[e])if(d){n=c.event.special[e]||{};for(B=f||0;B=0){a.type= +e=e.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[e]&&c.each(c.cache,function(){this.events&&this.events[e]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===8)return w;a.result=w;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(f=c.data(d,"handle"))&&f.apply(d,b);f=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+e]&&d["on"+e].apply(d,b)===false)a.result=false}catch(j){}if(!a.isPropagationStopped()&& +f)c.event.trigger(a,b,f,true);else if(!a.isDefaultPrevented()){f=a.target;var i,o=c.nodeName(f,"a")&&e==="click",k=c.event.special[e]||{};if((!k._default||k._default.call(d,a)===false)&&!o&&!(f&&f.nodeName&&c.noData[f.nodeName.toLowerCase()])){try{if(f[e]){if(i=f["on"+e])f["on"+e]=null;c.event.triggered=true;f[e]()}}catch(n){}if(i)f["on"+e]=i;c.event.triggered=false}}},handle:function(a){var b,d,f,e;a=arguments[0]=c.event.fix(a||A.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive; +if(!b){d=a.type.split(".");a.type=d.shift();f=new RegExp("(^|\\.)"+d.slice(0).sort().join("\\.(?:.*\\.)?")+"(\\.|$)")}e=c.data(this,"events");d=e[a.type];if(e&&d){d=d.slice(0);e=0;for(var j=d.length;e-1?c.map(a.options,function(f){return f.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},fa=function(a,b){var d=a.target,f,e;if(!(!da.test(d.nodeName)||d.readOnly)){f=c.data(d,"_change_data");e=Fa(d);if(a.type!=="focusout"||d.type!=="radio")c.data(d,"_change_data", +e);if(!(f===w||e===f))if(f!=null||e){a.type="change";return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:fa,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return fa.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return fa.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a, +"_change_data",Fa(a))}},setup:function(){if(this.type==="file")return false;for(var a in ea)c.event.add(this,a+".specialChange",ea[a]);return da.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return da.test(this.nodeName)}};ea=c.event.special.change.filters}s.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(f){f=c.event.fix(f);f.type=b;return c.event.handle.call(this,f)}c.event.special[b]={setup:function(){this.addEventListener(a, +d,true)},teardown:function(){this.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,f,e){if(typeof d==="object"){for(var j in d)this[b](j,f,d[j],e);return this}if(c.isFunction(f)){e=f;f=w}var i=b==="one"?c.proxy(e,function(k){c(this).unbind(k,i);return e.apply(this,arguments)}):e;if(d==="unload"&&b!=="one")this.one(d,f,e);else{j=0;for(var o=this.length;j0){y=t;break}}t=t[g]}m[q]=y}}}var f=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g, +e=0,j=Object.prototype.toString,i=false,o=true;[0,0].sort(function(){o=false;return 0});var k=function(g,h,l,m){l=l||[];var q=h=h||s;if(h.nodeType!==1&&h.nodeType!==9)return[];if(!g||typeof g!=="string")return l;for(var p=[],v,t,y,S,H=true,M=x(h),I=g;(f.exec(""),v=f.exec(I))!==null;){I=v[3];p.push(v[1]);if(v[2]){S=v[3];break}}if(p.length>1&&r.exec(g))if(p.length===2&&n.relative[p[0]])t=ga(p[0]+p[1],h);else for(t=n.relative[p[0]]?[h]:k(p.shift(),h);p.length;){g=p.shift();if(n.relative[g])g+=p.shift(); +t=ga(g,t)}else{if(!m&&p.length>1&&h.nodeType===9&&!M&&n.match.ID.test(p[0])&&!n.match.ID.test(p[p.length-1])){v=k.find(p.shift(),h,M);h=v.expr?k.filter(v.expr,v.set)[0]:v.set[0]}if(h){v=m?{expr:p.pop(),set:z(m)}:k.find(p.pop(),p.length===1&&(p[0]==="~"||p[0]==="+")&&h.parentNode?h.parentNode:h,M);t=v.expr?k.filter(v.expr,v.set):v.set;if(p.length>0)y=z(t);else H=false;for(;p.length;){var D=p.pop();v=D;if(n.relative[D])v=p.pop();else D="";if(v==null)v=h;n.relative[D](y,v,M)}}else y=[]}y||(y=t);y||k.error(D|| +g);if(j.call(y)==="[object Array]")if(H)if(h&&h.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&E(h,y[g])))l.push(t[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&l.push(t[g]);else l.push.apply(l,y);else z(y,l);if(S){k(S,q,l,m);k.uniqueSort(l)}return l};k.uniqueSort=function(g){if(B){i=o;g.sort(B);if(i)for(var h=1;h":function(g,h){var l=typeof h==="string";if(l&&!/\W/.test(h)){h=h.toLowerCase();for(var m=0,q=g.length;m=0))l||m.push(v);else if(l)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()}, +CHILD:function(g){if(g[1]==="nth"){var h=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=h[1]+(h[2]||1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,l,m,q,p){h=g[1].replace(/\\/g,"");if(!p&&n.attrMap[h])g[1]=n.attrMap[h];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,l,m,q){if(g[1]==="not")if((f.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,h);else{g=k.filter(g[3],h,l,true^q);l||m.push.apply(m, +g);return false}else if(n.match.POS.test(g[0])||n.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,l){return!!k(l[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)}, +text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}}, +setFilters:{first:function(g,h){return h===0},last:function(g,h,l,m){return h===m.length-1},even:function(g,h){return h%2===0},odd:function(g,h){return h%2===1},lt:function(g,h,l){return hl[3]-0},nth:function(g,h,l){return l[3]-0===h},eq:function(g,h,l){return l[3]-0===h}},filter:{PSEUDO:function(g,h,l,m){var q=h[1],p=n.filters[q];if(p)return p(g,l,h,m);else if(q==="contains")return(g.textContent||g.innerText||a([g])||"").indexOf(h[3])>=0;else if(q==="not"){h= +h[3];l=0;for(m=h.length;l=0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var l=h[1];g=n.attrHandle[l]?n.attrHandle[l](g):g[l]!=null?g[l]:g.getAttribute(l);l=g+"";var m=h[2];h=h[4];return g==null?m==="!=":m=== +"="?l===h:m==="*="?l.indexOf(h)>=0:m==="~="?(" "+l+" ").indexOf(h)>=0:!h?l&&g!==false:m==="!="?l!==h:m==="^="?l.indexOf(h)===0:m==="$="?l.substr(l.length-h.length)===h:m==="|="?l===h||l.substr(0,h.length+1)===h+"-":false},POS:function(g,h,l,m){var q=n.setFilters[h[2]];if(q)return q(g,l,h,m)}}},r=n.match.POS;for(var u in n.match){n.match[u]=new RegExp(n.match[u].source+/(?![^\[]*\])(?![^\(]*\))/.source);n.leftMatch[u]=new RegExp(/(^(?:.|\r|\n)*?)/.source+n.match[u].source.replace(/\\(\d+)/g,function(g, +h){return"\\"+(h-0+1)}))}var z=function(g,h){g=Array.prototype.slice.call(g,0);if(h){h.push.apply(h,g);return h}return g};try{Array.prototype.slice.call(s.documentElement.childNodes,0)}catch(C){z=function(g,h){h=h||[];if(j.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if(typeof g.length==="number")for(var l=0,m=g.length;l";var l=s.documentElement;l.insertBefore(g,l.firstChild);if(s.getElementById(h)){n.find.ID=function(m,q,p){if(typeof q.getElementById!=="undefined"&&!p)return(q=q.getElementById(m[1]))?q.id===m[1]||typeof q.getAttributeNode!=="undefined"&& +q.getAttributeNode("id").nodeValue===m[1]?[q]:w:[]};n.filter.ID=function(m,q){var p=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&p&&p.nodeValue===q}}l.removeChild(g);l=g=null})();(function(){var g=s.createElement("div");g.appendChild(s.createComment(""));if(g.getElementsByTagName("*").length>0)n.find.TAG=function(h,l){l=l.getElementsByTagName(h[1]);if(h[1]==="*"){h=[];for(var m=0;l[m];m++)l[m].nodeType===1&&h.push(l[m]);l=h}return l};g.innerHTML=""; +if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")n.attrHandle.href=function(h){return h.getAttribute("href",2)};g=null})();s.querySelectorAll&&function(){var g=k,h=s.createElement("div");h.innerHTML="

    ";if(!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){k=function(m,q,p,v){q=q||s;if(!v&&q.nodeType===9&&!x(q))try{return z(q.querySelectorAll(m),p)}catch(t){}return g(m,q,p,v)};for(var l in g)k[l]=g[l];h=null}}(); +(function(){var g=s.createElement("div");g.innerHTML="
    ";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){n.order.splice(1,0,"CLASS");n.find.CLASS=function(h,l,m){if(typeof l.getElementsByClassName!=="undefined"&&!m)return l.getElementsByClassName(h[1])};g=null}}})();var E=s.compareDocumentPosition?function(g,h){return!!(g.compareDocumentPosition(h)&16)}: +function(g,h){return g!==h&&(g.contains?g.contains(h):true)},x=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false},ga=function(g,h){var l=[],m="",q;for(h=h.nodeType?[h]:h;q=n.match.PSEUDO.exec(g);){m+=q[0];g=g.replace(n.match.PSEUDO,"")}g=n.relative[g]?g+"*":g;q=0;for(var p=h.length;q=0===d})};c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f0)for(var j=d;j0},closest:function(a,b){if(c.isArray(a)){var d=[],f=this[0],e,j= +{},i;if(f&&a.length){e=0;for(var o=a.length;e-1:c(f).is(e)){d.push({selector:i,elem:f});delete j[i]}}f=f.parentNode}}return d}var k=c.expr.match.POS.test(a)?c(a,b||this.context):null;return this.map(function(n,r){for(;r&&r.ownerDocument&&r!==b;){if(k?k.index(r)>-1:c(r).is(a))return r;r=r.parentNode}return null})},index:function(a){if(!a||typeof a=== +"string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b||this.context):c.makeArray(a);b=c.merge(this.get(),a);return this.pushStack(qa(a[0])||qa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode", +d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")? +a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);eb.test(a)||(f=d);if(f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e):e;if((this.length>1||gb.test(f))&&fb.test(a))e=e.reverse();return this.pushStack(e,a,R.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for(a=a[b];a&&a.nodeType!==9&&(d===w||a.nodeType!==1||!c(a).is(d));){a.nodeType=== +1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b||1;for(var f=0;a;a=a[d])if(a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var Ja=/ jQuery\d+="(?:\d+|null)"/g,V=/^\s+/,Ka=/(<([\w:]+)[^>]*?)\/>/g,hb=/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,La=/<([\w:]+)/,ib=/"},F={option:[1,""],legend:[1,"
    ","
    "],thead:[1,"","
    "],tr:[2,"","
    "],td:[3,"","
    "],col:[2,"","
    "],area:[1,"",""],_default:[0,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if(!c.support.htmlSerialize)F._default=[1,"div
    ","
    "];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d= +c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==w)return this.empty().append((this[0]&&this[0].ownerDocument||s).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this}, +wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})}, +prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b, +this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,f;(f=this[d])!=null;d++)if(!a||c.filter(a,[f]).length){if(!b&&f.nodeType===1){c.cleanData(f.getElementsByTagName("*"));c.cleanData([f])}f.parentNode&&f.parentNode.removeChild(f)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild); +return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if(!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Ja,"").replace(/=([^="'>\s]+\/)>/g,'="$1">').replace(V,"")],f)[0]}else return this.cloneNode(true)});if(a===true){ra(this,b);ra(this.find("*"),b.find("*"))}return b},html:function(a){if(a===w)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Ja, +""):null;else if(typeof a==="string"&&!ta.test(a)&&(c.support.leadingWhitespace||!V.test(a))&&!F[(La.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Ka,Ma);try{for(var b=0,d=this.length;b0||e.cacheable||this.length>1?k.cloneNode(true):k)}o.length&&c.each(o,Qa)}return this}});c.fragments={};c.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var f=[];d=c(d);var e=this.length===1&&this[0].parentNode;if(e&&e.nodeType===11&&e.childNodes.length===1&&d.length===1){d[b](this[0]); +return this}else{e=0;for(var j=d.length;e0?this.clone(true):this).get();c.fn[b].apply(c(d[e]),i);f=f.concat(i)}return this.pushStack(f,a,d.selector)}}});c.extend({clean:function(a,b,d,f){b=b||s;if(typeof b.createElement==="undefined")b=b.ownerDocument||b[0]&&b[0].ownerDocument||s;for(var e=[],j=0,i;(i=a[j])!=null;j++){if(typeof i==="number")i+="";if(i){if(typeof i==="string"&&!jb.test(i))i=b.createTextNode(i);else if(typeof i==="string"){i=i.replace(Ka,Ma);var o=(La.exec(i)||["", +""])[1].toLowerCase(),k=F[o]||F._default,n=k[0],r=b.createElement("div");for(r.innerHTML=k[1]+i+k[2];n--;)r=r.lastChild;if(!c.support.tbody){n=ib.test(i);o=o==="table"&&!n?r.firstChild&&r.firstChild.childNodes:k[1]===""&&!n?r.childNodes:[];for(k=o.length-1;k>=0;--k)c.nodeName(o[k],"tbody")&&!o[k].childNodes.length&&o[k].parentNode.removeChild(o[k])}!c.support.leadingWhitespace&&V.test(i)&&r.insertBefore(b.createTextNode(V.exec(i)[0]),r.firstChild);i=r.childNodes}if(i.nodeType)e.push(i);else e= +c.merge(e,i)}}if(d)for(j=0;e[j];j++)if(f&&c.nodeName(e[j],"script")&&(!e[j].type||e[j].type.toLowerCase()==="text/javascript"))f.push(e[j].parentNode?e[j].parentNode.removeChild(e[j]):e[j]);else{e[j].nodeType===1&&e.splice.apply(e,[j+1,0].concat(c.makeArray(e[j].getElementsByTagName("script"))));d.appendChild(e[j])}return e},cleanData:function(a){for(var b,d,f=c.cache,e=c.event.special,j=c.support.deleteExpando,i=0,o;(o=a[i])!=null;i++)if(d=o[c.expando]){b=f[d];if(b.events)for(var k in b.events)e[k]? +c.event.remove(o,k):Ca(o,k,b.handle);if(j)delete o[c.expando];else o.removeAttribute&&o.removeAttribute(c.expando);delete f[d]}}});var kb=/z-?index|font-?weight|opacity|zoom|line-?height/i,Na=/alpha\([^)]*\)/,Oa=/opacity=([^)]*)/,ha=/float/i,ia=/-([a-z])/ig,lb=/([A-Z])/g,mb=/^-?\d+(?:px)?$/i,nb=/^-?\d/,ob={position:"absolute",visibility:"hidden",display:"block"},pb=["Left","Right"],qb=["Top","Bottom"],rb=s.defaultView&&s.defaultView.getComputedStyle,Pa=c.support.cssFloat?"cssFloat":"styleFloat",ja= +function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){return X(this,a,b,true,function(d,f,e){if(e===w)return c.curCSS(d,f);if(typeof e==="number"&&!kb.test(f))e+="px";c.style(d,f,e)})};c.extend({style:function(a,b,d){if(!a||a.nodeType===3||a.nodeType===8)return w;if((b==="width"||b==="height")&&parseFloat(d)<0)d=w;var f=a.style||a,e=d!==w;if(!c.support.opacity&&b==="opacity"){if(e){f.zoom=1;b=parseInt(d,10)+""==="NaN"?"":"alpha(opacity="+d*100+")";a=f.filter||c.curCSS(a,"filter")||"";f.filter= +Na.test(a)?a.replace(Na,b):b}return f.filter&&f.filter.indexOf("opacity=")>=0?parseFloat(Oa.exec(f.filter)[1])/100+"":""}if(ha.test(b))b=Pa;b=b.replace(ia,ja);if(e)f[b]=d;return f[b]},css:function(a,b,d,f){if(b==="width"||b==="height"){var e,j=b==="width"?pb:qb;function i(){e=b==="width"?a.offsetWidth:a.offsetHeight;f!=="border"&&c.each(j,function(){f||(e-=parseFloat(c.curCSS(a,"padding"+this,true))||0);if(f==="margin")e+=parseFloat(c.curCSS(a,"margin"+this,true))||0;else e-=parseFloat(c.curCSS(a, +"border"+this+"Width",true))||0})}a.offsetWidth!==0?i():c.swap(a,ob,i);return Math.max(0,Math.round(e))}return c.curCSS(a,b,d)},curCSS:function(a,b,d){var f,e=a.style;if(!c.support.opacity&&b==="opacity"&&a.currentStyle){f=Oa.test(a.currentStyle.filter||"")?parseFloat(RegExp.$1)/100+"":"";return f===""?"1":f}if(ha.test(b))b=Pa;if(!d&&e&&e[b])f=e[b];else if(rb){if(ha.test(b))b="float";b=b.replace(lb,"-$1").toLowerCase();e=a.ownerDocument.defaultView;if(!e)return null;if(a=e.getComputedStyle(a,null))f= +a.getPropertyValue(b);if(b==="opacity"&&f==="")f="1"}else if(a.currentStyle){d=b.replace(ia,ja);f=a.currentStyle[b]||a.currentStyle[d];if(!mb.test(f)&&nb.test(f)){b=e.left;var j=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;e.left=d==="fontSize"?"1em":f||0;f=e.pixelLeft+"px";e.left=b;a.runtimeStyle.left=j}}return f},swap:function(a,b,d){var f={};for(var e in b){f[e]=a.style[e];a.style[e]=b[e]}d.call(a);for(e in b)a.style[e]=f[e]}});if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b= +a.offsetWidth,d=a.offsetHeight,f=a.nodeName.toLowerCase()==="tr";return b===0&&d===0&&!f?true:b>0&&d>0&&!f?false:c.curCSS(a,"display")==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var sb=J(),tb=//gi,ub=/select|textarea/i,vb=/color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,N=/=\?(&|$)/,ka=/\?/,wb=/(\?|&)_=.*?(&|$)/,xb=/^(\w+:)?\/\/([^\/?#]+)/,yb=/%20/g,zb=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!== +"string")return zb.call(this,a);else if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var e=a.slice(f,a.length);a=a.slice(0,f)}f="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b==="object"){b=c.param(b,c.ajaxSettings.traditional);f="POST"}var j=this;c.ajax({url:a,type:f,dataType:"html",data:b,complete:function(i,o){if(o==="success"||o==="notmodified")j.html(e?c("
    ").append(i.responseText.replace(tb,"")).find(e):i.responseText);d&&j.each(d,[i.responseText,o,i])}});return this}, +serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ub.test(this.nodeName)||vb.test(this.type))}).map(function(a,b){a=c(this).val();return a==null?null:c.isArray(a)?c.map(a,function(d){return{name:b.name,value:d}}):{name:b.name,value:a}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "), +function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:f})},getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:f})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href, +global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:A.XMLHttpRequest&&(A.location.protocol!=="file:"||!A.ActiveXObject)?function(){return new A.XMLHttpRequest}:function(){try{return new A.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},etag:{},ajax:function(a){function b(){e.success&& +e.success.call(k,o,i,x);e.global&&f("ajaxSuccess",[x,e])}function d(){e.complete&&e.complete.call(k,x,i);e.global&&f("ajaxComplete",[x,e]);e.global&&!--c.active&&c.event.trigger("ajaxStop")}function f(q,p){(e.context?c(e.context):c.event).trigger(q,p)}var e=c.extend(true,{},c.ajaxSettings,a),j,i,o,k=a&&a.context||e,n=e.type.toUpperCase();if(e.data&&e.processData&&typeof e.data!=="string")e.data=c.param(e.data,e.traditional);if(e.dataType==="jsonp"){if(n==="GET")N.test(e.url)||(e.url+=(ka.test(e.url)? +"&":"?")+(e.jsonp||"callback")+"=?");else if(!e.data||!N.test(e.data))e.data=(e.data?e.data+"&":"")+(e.jsonp||"callback")+"=?";e.dataType="json"}if(e.dataType==="json"&&(e.data&&N.test(e.data)||N.test(e.url))){j=e.jsonpCallback||"jsonp"+sb++;if(e.data)e.data=(e.data+"").replace(N,"="+j+"$1");e.url=e.url.replace(N,"="+j+"$1");e.dataType="script";A[j]=A[j]||function(q){o=q;b();d();A[j]=w;try{delete A[j]}catch(p){}z&&z.removeChild(C)}}if(e.dataType==="script"&&e.cache===null)e.cache=false;if(e.cache=== +false&&n==="GET"){var r=J(),u=e.url.replace(wb,"$1_="+r+"$2");e.url=u+(u===e.url?(ka.test(e.url)?"&":"?")+"_="+r:"")}if(e.data&&n==="GET")e.url+=(ka.test(e.url)?"&":"?")+e.data;e.global&&!c.active++&&c.event.trigger("ajaxStart");r=(r=xb.exec(e.url))&&(r[1]&&r[1]!==location.protocol||r[2]!==location.host);if(e.dataType==="script"&&n==="GET"&&r){var z=s.getElementsByTagName("head")[0]||s.documentElement,C=s.createElement("script");C.src=e.url;if(e.scriptCharset)C.charset=e.scriptCharset;if(!j){var B= +false;C.onload=C.onreadystatechange=function(){if(!B&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){B=true;b();d();C.onload=C.onreadystatechange=null;z&&C.parentNode&&z.removeChild(C)}}}z.insertBefore(C,z.firstChild);return w}var E=false,x=e.xhr();if(x){e.username?x.open(n,e.url,e.async,e.username,e.password):x.open(n,e.url,e.async);try{if(e.data||a&&a.contentType)x.setRequestHeader("Content-Type",e.contentType);if(e.ifModified){c.lastModified[e.url]&&x.setRequestHeader("If-Modified-Since", +c.lastModified[e.url]);c.etag[e.url]&&x.setRequestHeader("If-None-Match",c.etag[e.url])}r||x.setRequestHeader("X-Requested-With","XMLHttpRequest");x.setRequestHeader("Accept",e.dataType&&e.accepts[e.dataType]?e.accepts[e.dataType]+", */*":e.accepts._default)}catch(ga){}if(e.beforeSend&&e.beforeSend.call(k,x,e)===false){e.global&&!--c.active&&c.event.trigger("ajaxStop");x.abort();return false}e.global&&f("ajaxSend",[x,e]);var g=x.onreadystatechange=function(q){if(!x||x.readyState===0||q==="abort"){E|| +d();E=true;if(x)x.onreadystatechange=c.noop}else if(!E&&x&&(x.readyState===4||q==="timeout")){E=true;x.onreadystatechange=c.noop;i=q==="timeout"?"timeout":!c.httpSuccess(x)?"error":e.ifModified&&c.httpNotModified(x,e.url)?"notmodified":"success";var p;if(i==="success")try{o=c.httpData(x,e.dataType,e)}catch(v){i="parsererror";p=v}if(i==="success"||i==="notmodified")j||b();else c.handleError(e,x,i,p);d();q==="timeout"&&x.abort();if(e.async)x=null}};try{var h=x.abort;x.abort=function(){x&&h.call(x); +g("abort")}}catch(l){}e.async&&e.timeout>0&&setTimeout(function(){x&&!E&&g("timeout")},e.timeout);try{x.send(n==="POST"||n==="PUT"||n==="DELETE"?e.data:null)}catch(m){c.handleError(e,x,null,m);d()}e.async||g();return x}},handleError:function(a,b,d,f){if(a.error)a.error.call(a.context||a,b,d,f);if(a.global)(a.context?c(a.context):c.event).trigger("ajaxError",[b,a,f])},active:0,httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status=== +1223||a.status===0}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),f=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(f)c.etag[b]=f;return a.status===304||a.status===0},httpData:function(a,b,d){var f=a.getResponseHeader("content-type")||"",e=b==="xml"||!b&&f.indexOf("xml")>=0;a=e?a.responseXML:a.responseText;e&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b=== +"json"||!b&&f.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&f.indexOf("javascript")>=0)c.globalEval(a);return a},param:function(a,b){function d(i,o){if(c.isArray(o))c.each(o,function(k,n){b||/\[\]$/.test(i)?f(i,n):d(i+"["+(typeof n==="object"||c.isArray(n)?k:"")+"]",n)});else!b&&o!=null&&typeof o==="object"?c.each(o,function(k,n){d(i+"["+k+"]",n)}):f(i,o)}function f(i,o){o=c.isFunction(o)?o():o;e[e.length]=encodeURIComponent(i)+"="+encodeURIComponent(o)}var e=[];if(b===w)b=c.ajaxSettings.traditional; +if(c.isArray(a)||a.jquery)c.each(a,function(){f(this.name,this.value)});else for(var j in a)d(j,a[j]);return e.join("&").replace(yb,"+")}});var la={},Ab=/toggle|show|hide/,Bb=/^([+-]=)?([\d+-.]+)(.*)$/,W,va=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b){if(a||a===0)return this.animate(K("show",3),a,b);else{a=0;for(b=this.length;a").appendTo("body");f=e.css("display");if(f==="none")f="block";e.remove();la[d]=f}c.data(this[a],"olddisplay",f)}}a=0;for(b=this.length;a=0;f--)if(d[f].elem===this){b&&d[f](true);d.splice(f,1)}});b||this.dequeue();return this}});c.each({slideDown:K("show",1),slideUp:K("hide",1),slideToggle:K("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(a,b){c.fn[a]=function(d,f){return this.animate(b,d,f)}});c.extend({speed:function(a,b,d){var f=a&&typeof a==="object"?a:{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};f.duration=c.fx.off?0:typeof f.duration=== +"number"?f.duration:c.fx.speeds[f.duration]||c.fx.speeds._default;f.old=f.complete;f.complete=function(){f.queue!==false&&c(this).dequeue();c.isFunction(f.old)&&f.old.call(this)};return f},easing:{linear:function(a,b,d,f){return d+f*a},swing:function(a,b,d,f){return(-Math.cos(a*Math.PI)/2+0.5)*f+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]|| +c.fx.step._default)(this);if((this.prop==="height"||this.prop==="width")&&this.elem.style)this.elem.style.display="block"},cur:function(a){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];return(a=parseFloat(c.css(this.elem,this.prop,a)))&&a>-10000?a:parseFloat(c.curCSS(this.elem,this.prop))||0},custom:function(a,b,d){function f(j){return e.step(j)}this.startTime=J();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start; +this.pos=this.state=0;var e=this;f.elem=this.elem;if(f()&&c.timers.push(f)&&!W)W=setInterval(c.fx.tick,13)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(a){var b=J(),d=true;if(a||b>=this.options.duration+this.startTime){this.now= +this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var f in this.options.curAnim)if(this.options.curAnim[f]!==true)d=false;if(d){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;a=c.data(this.elem,"olddisplay");this.elem.style.display=a?a:this.options.display;if(c.css(this.elem,"display")==="none")this.elem.style.display="block"}this.options.hide&&c(this.elem).hide();if(this.options.hide||this.options.show)for(var e in this.options.curAnim)c.style(this.elem, +e,this.options.orig[e]);this.options.complete.call(this.elem)}return false}else{e=b-this.startTime;this.state=e/this.options.duration;a=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||a](this.state,e,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=c.timers,b=0;b
    "; +a.insertBefore(b,a.firstChild);d=b.firstChild;f=d.firstChild;e=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=f.offsetTop!==5;this.doesAddBorderForTableAndCells=e.offsetTop===5;f.style.position="fixed";f.style.top="20px";this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15;f.style.position=f.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==j;a.removeChild(b); +c.offset.initialize=c.noop},bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.curCSS(a,"marginTop",true))||0;d+=parseFloat(c.curCSS(a,"marginLeft",true))||0}return{top:b,left:d}},setOffset:function(a,b,d){if(/static/.test(c.curCSS(a,"position")))a.style.position="relative";var f=c(a),e=f.offset(),j=parseInt(c.curCSS(a,"top",true),10)||0,i=parseInt(c.curCSS(a,"left",true),10)||0;if(c.isFunction(b))b=b.call(a, +d,e);d={top:b.top-e.top+j,left:b.left-e.left+i};"using"in b?b.using.call(a,d):f.css(d)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),f=/^body|html$/i.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.curCSS(a,"marginTop",true))||0;d.left-=parseFloat(c.curCSS(a,"marginLeft",true))||0;f.top+=parseFloat(c.curCSS(b[0],"borderTopWidth",true))||0;f.left+=parseFloat(c.curCSS(b[0],"borderLeftWidth",true))||0;return{top:d.top- +f.top,left:d.left-f.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||s.body;a&&!/^body|html$/i.test(a.nodeName)&&c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(f){var e=this[0],j;if(!e)return null;if(f!==w)return this.each(function(){if(j=wa(this))j.scrollTo(!a?f:c(j).scrollLeft(),a?f:c(j).scrollTop());else this[d]=f});else return(j=wa(e))?"pageXOffset"in j?j[a?"pageYOffset": +"pageXOffset"]:c.support.boxModel&&j.document.documentElement[d]||j.document.body[d]:e[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();c.fn["inner"+b]=function(){return this[0]?c.css(this[0],d,false,"padding"):null};c.fn["outer"+b]=function(f){return this[0]?c.css(this[0],d,false,f?"margin":"border"):null};c.fn[d]=function(f){var e=this[0];if(!e)return f==null?null:this;if(c.isFunction(f))return this.each(function(j){var i=c(this);i[d](f.call(this,j,i[d]()))});return"scrollTo"in +e&&e.document?e.document.compatMode==="CSS1Compat"&&e.document.documentElement["client"+b]||e.document.body["client"+b]:e.nodeType===9?Math.max(e.documentElement["client"+b],e.body["scroll"+b],e.documentElement["scroll"+b],e.body["offset"+b],e.documentElement["offset"+b]):f===w?c.css(e,d):this.css(d,typeof f==="string"?f:f+"px")}});A.jQuery=A.$=c})(window); diff --git a/templates/admin/default/assets/js/tablesorter/jquery.tablesorter.min.js b/templates/admin/default/assets/js/tablesorter/jquery.tablesorter.min.js new file mode 100644 index 000000000..b8605df1e --- /dev/null +++ b/templates/admin/default/assets/js/tablesorter/jquery.tablesorter.min.js @@ -0,0 +1,4 @@ + +(function($){$.extend({tablesorter:new +function(){var parsers=[],widgets=[];this.defaults={cssHeader:"header",cssAsc:"headerSortUp",cssDesc:"headerSortDown",cssChildRow:"expand-child",sortInitialOrder:"asc",sortMultiSortKey:"shiftKey",sortForce:null,sortAppend:null,sortLocaleCompare:true,textExtraction:"simple",parsers:{},widgets:[],widgetZebra:{css:["even","odd"]},headers:{},widthFixed:false,cancelSelection:true,sortList:[],headerList:[],dateFormat:"us",decimal:'/\.|\,/g',onRenderHeader:null,selectorHeaders:'thead th',debug:false};function benchmark(s,d){log(s+","+(new Date().getTime()-d.getTime())+"ms");}this.benchmark=benchmark;function log(s){if(typeof console!="undefined"&&typeof console.debug!="undefined"){console.log(s);}else{alert(s);}}function buildParserCache(table,$headers){if(table.config.debug){var parsersDebug="";}if(table.tBodies.length==0)return;var rows=table.tBodies[0].rows;if(rows[0]){var list=[],cells=rows[0].cells,l=cells.length;for(var i=0;i1){arr=arr.concat(checkCellColSpan(table,headerArr,row++));}else{if(table.tHead.length==1||(cell.rowSpan>1||!r[row+1])){arr.push(cell);}}}return arr;};function checkHeaderMetadata(cell){if(($.metadata)&&($(cell).metadata().sorter===false)){return true;};return false;}function checkHeaderOptions(table,i){if((table.config.headers[i])&&(table.config.headers[i].sorter===false)){return true;};return false;}function checkHeaderOptionsSortingLocked(table,i){if((table.config.headers[i])&&(table.config.headers[i].lockedOrder))return table.config.headers[i].lockedOrder;return false;}function applyWidget(table){var c=table.config.widgets;var l=c.length;for(var i=0;i');$("tr:first td",table.tBodies[0]).each(function(){colgroup.append($('').css('width',$(this).width()));});$(table).prepend(colgroup);};}function updateHeaderSortCount(table,sortList){var c=table.config,l=sortList.length;for(var i=0;i b["+i+"]) ? 1 : 0));";};function makeSortTextDesc(i){return"((b["+i+"] < a["+i+"]) ? -1 : ((b["+i+"] > a["+i+"]) ? 1 : 0));";};function makeSortNumeric(i){return"a["+i+"]-b["+i+"];";};function makeSortNumericDesc(i){return"b["+i+"]-a["+i+"];";};function sortText(a,b){if(table.config.sortLocaleCompare)return a.localeCompare(b);return((ab)?1:0));};function sortTextDesc(a,b){if(table.config.sortLocaleCompare)return b.localeCompare(a);return((ba)?1:0));};function sortNumeric(a,b){return a-b;};function sortNumericDesc(a,b){return b-a;};function getCachedSortType(parsers,i){return parsers[i].type;};this.construct=function(settings){return this.each(function(){if(!this.tHead||!this.tBodies)return;var $this,$document,$headers,cache,config,shiftDown=0,sortOrder;this.config={};config=$.extend(this.config,$.tablesorter.defaults,settings);$this=$(this);$.data(this,"tablesorter",config);$headers=buildHeaders(this);this.config.parsers=buildParserCache(this,$headers);cache=buildCache(this);var sortCSS=[config.cssDesc,config.cssAsc];fixColumnWidth(this);$headers.click(function(e){var totalRows=($this[0].tBodies[0]&&$this[0].tBodies[0].rows.length)||0;if(!this.sortDisabled&&totalRows>0){$this.trigger("sortStart");var $cell=$(this);var i=this.column;this.order=this.count++%2;if(this.lockedOrder)this.order=this.lockedOrder;if(!e[config.sortMultiSortKey]){config.sortList=[];if(config.sortForce!=null){var a=config.sortForce;for(var j=0;j0){$this.trigger("sorton",[config.sortList]);}applyWidget(this);});};this.addParser=function(parser){var l=parsers.length,a=true;for(var i=0;i -
    +
    + + +
    +

    Coupons : Add a coupon

    -
    +
    +
    + +
    + +
    + +
    + + +
    + +
    + + +
    + +
    + +
    + +
    + +
    + +
    + + +
    + +
    + +
    + +
    +
    + + {include file='includes/js.inc.html'} diff --git a/templates/admin/default/coupon/list.html b/templates/admin/default/coupon/list.html index 95b2da098..f5c7b1508 100755 --- a/templates/admin/default/coupon/list.html +++ b/templates/admin/default/coupon/list.html @@ -6,15 +6,168 @@ {include file='includes/header.inc.html'} -
    -
    +
    + + + +
    +

    Coupons : List of coupons

    -
    + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + List of enabled coupons +
    CodeTitleExpiration dateUsage leftActions
    XMAS13Coupon for XMAS -30 €25/12/201349 times + Edit + Disable +
    XMAS14Coupon for XMAS -30 €25/12/201349 times + Edit + Disable +
    XMAS15Coupon for XMAS -30 €25/12/201349 times + Edit + Disable +
    XMAS16Coupon for XMAS -30 €25/12/201349 times + Edit + Disable +
    +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + List of disabled coupons +
    CodeTitleExpiration dateUsage leftActions
    XMAS13Coupon for XMAS -30 €18/10/201349 times + Edit + Enabled +
    XMAS13Coupon for XMAS -20 €05/09/201349 times + Edit + Enabled +
    XMAS13Coupon for XMAS -50 €03/12/201349 times + Edit + Enabled +
    XMAS13Coupon for XMAS -5 €25/01/201349 times + Edit + Enabled +
    +
    +
    + + + + + + {include file='includes/js.inc.html'} @@ -24,6 +177,33 @@ {/javascripts} + +{javascripts file='../assets/js/tablesorter/jquery.tablesorter.min.js'} + +{/javascripts} + + {include file='includes/footer.inc.html'} diff --git a/templates/admin/default/coupon/read.html b/templates/admin/default/coupon/read.html index d29c7d927..9161f0d72 100755 --- a/templates/admin/default/coupon/read.html +++ b/templates/admin/default/coupon/read.html @@ -6,15 +6,91 @@ {include file='includes/header.inc.html'} -
    -
    +
    + + +
    +

    Coupons : Read coupon n°1

    -
    + +
    +
    + +
    + This coupon is disabled, you can enable to the bottom of this form. +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    CodeXMAS13
    TitleCoupon for XMAS -30 €
    Expiration date25/12/2013
    Usage left49 times
    May be combinedYes
    Cancel shippingNo
    EffectRemove 30 € to the cart price
    Conditions of application +
      +
    • Total cart supperior to 400 €
      • +
    • OR
      • +
    • At least 4 products
      • +
    +
    Actions + Edit + Enabled +
    + +
    +
    + + + {include file='includes/js.inc.html'} @@ -23,7 +99,25 @@ {/javascripts} + {include file='includes/footer.inc.html'} From 2396b78ce9557923b3c6b57645113140459dd148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20ESPECHE?= Date: Thu, 29 Aug 2013 16:17:28 +0200 Subject: [PATCH 024/125] Working Ajout du .DS_Store --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d0a538143..8de5039ed 100755 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ phpdoc*.log php-cs xhprof phpunit.phar +.DS_Store \ No newline at end of file From 6a7d5ec98e929e8ad7e175c05d72284a3d5770c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20ESPECHE?= Date: Thu, 29 Aug 2013 16:17:49 +0200 Subject: [PATCH 025/125] WIP Merge master --- core/lib/Thelia/Model/Base/RewritingUrl.php | 2 +- install/sqldb.map | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 install/sqldb.map diff --git a/core/lib/Thelia/Model/Base/RewritingUrl.php b/core/lib/Thelia/Model/Base/RewritingUrl.php index 75ee97e79..a6bcd3a26 100644 --- a/core/lib/Thelia/Model/Base/RewritingUrl.php +++ b/core/lib/Thelia/Model/Base/RewritingUrl.php @@ -298,7 +298,7 @@ abstract class RewritingUrl implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/install/sqldb.map b/install/sqldb.map new file mode 100644 index 000000000..63a93baa8 --- /dev/null +++ b/install/sqldb.map @@ -0,0 +1,2 @@ +# Sqlfile -> Database map +thelia.sql=thelia From 37659415ad3d9ac22b677334519a5765bb43684e Mon Sep 17 00:00:00 2001 From: gmorel Date: Thu, 29 Aug 2013 16:20:41 +0200 Subject: [PATCH 026/125] WIP - Add Coupon Event - Customer Parameter --- core/lib/Thelia/Action/Coupon.php | 23 +++ .../Core/Event/Coupon/CouponCreateEvent.php | 82 +++++++++ .../Core/Event/Coupon/CouponDisableEvent.php | 103 +++++++++++ .../Core/Event/Coupon/CouponEnableEvent.php | 103 +++++++++++ core/lib/Thelia/Model/Base/RewritingUrl.php | 2 +- .../Validator/CustomerParamTest.php | 161 ++++++++++++++++++ 6 files changed, 473 insertions(+), 1 deletion(-) create mode 100644 core/lib/Thelia/Core/Event/Coupon/CouponCreateEvent.php create mode 100644 core/lib/Thelia/Core/Event/Coupon/CouponDisableEvent.php create mode 100644 core/lib/Thelia/Core/Event/Coupon/CouponEnableEvent.php create mode 100644 core/lib/Thelia/Tests/Constraint/Validator/CustomerParamTest.php diff --git a/core/lib/Thelia/Action/Coupon.php b/core/lib/Thelia/Action/Coupon.php index 7b95d80fa..331265b73 100755 --- a/core/lib/Thelia/Action/Coupon.php +++ b/core/lib/Thelia/Action/Coupon.php @@ -43,6 +43,29 @@ use Propel\Runtime\Exception\PropelException; class Coupon extends BaseAction implements EventSubscriberInterface { + /** + * Disable a Coupon + * + * @param ActionEvent $event + */ + public function delete(CategoryDeleteEvent $event) + { + $this->checkAuth("ADMIN", "admin.category.delete"); + + $category = CategoryQuery::create()->findPk($event->getId()); + + if ($category !== null) { + + $event->setDeletedCategory($category); + + $event->getDispatcher()->dispatch(TheliaEvents::BEFORE_DELETECATEGORY, $event); + + $category->delete(); + + $event->getDispatcher()->dispatch(TheliaEvents::AFTER_DELETECATEGORY, $event); + } + } + /** * Returns an array of event names this subscriber listens to. * diff --git a/core/lib/Thelia/Core/Event/Coupon/CouponCreateEvent.php b/core/lib/Thelia/Core/Event/Coupon/CouponCreateEvent.php new file mode 100644 index 000000000..c03e21f17 --- /dev/null +++ b/core/lib/Thelia/Core/Event/Coupon/CouponCreateEvent.php @@ -0,0 +1,82 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Core\Event\Coupon; + +use Thelia\Model\Coupon; + +class CouponCreateEvent extends ActionEvent +{ + protected $title; + protected $parent; + protected $locale; + protected $created_category; + + public function __construct($title, $parent, $locale) + { + $this->title = $title; + $this->parent = $parent; + $this->locale = $locale; + } + + public function getTitle() + { + return $this->title; + } + + public function setTitle($title) + { + $this->title = $title; + } + + public function getParent() + { + return $this->parent; + } + + public function setParent($parent) + { + $this->parent = $parent; + } + + public function getLocale() + { + return $this->locale; + } + + public function setLocale($locale) + { + $this->locale = $locale; + } + + public function getCreatedCategory() + { + return $this->created_category; + } + + public function setCreatedCategory(Category $created_category) + { + $this->created_category = $created_category; +var_dump($this->created_category); + } +} diff --git a/core/lib/Thelia/Core/Event/Coupon/CouponDisableEvent.php b/core/lib/Thelia/Core/Event/Coupon/CouponDisableEvent.php new file mode 100644 index 000000000..db8e14243 --- /dev/null +++ b/core/lib/Thelia/Core/Event/Coupon/CouponDisableEvent.php @@ -0,0 +1,103 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Core\Event\Coupon; +use Thelia\Model\Coupon; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/29/13 + * Time: 3:45 PM + * + * Occurring when a Coupon is disabled + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class CouponDisableEvent extends ActionEvent +{ + /** @var int Coupon id */ + protected $couponId; + + /** @var Coupon Coupon being disabled */ + protected $disabledCoupon; + + /** + * Constructor + * + * @param int $id Coupon Id + */ + public function __construct($id) + { + $this->id = $id; + } + + /** + * Get Coupon id + * + * @return int + */ + public function getId() + { + return $this->id; + } + + /** + * Set Coupon id + * + * @param int $id Coupon id + * + * @return $this + */ + public function setId($id) + { + $this->id = $id; + + return $this; + } + + /** + * Get Coupon being disabled + * + * @return Coupon + */ + public function getDisabledCoupon() + { + return $this->disabledCoupon; + } + + /** + * Set Coupon to be disabled + * + * @param Coupon $disabledCoupon Coupon to disable + * + * @return $this + */ + public function setDisabledCoupon(Coupon $disabledCoupon) + { + $this->disabledCoupon = $disabledCoupon; + + return $this; + } +} diff --git a/core/lib/Thelia/Core/Event/Coupon/CouponEnableEvent.php b/core/lib/Thelia/Core/Event/Coupon/CouponEnableEvent.php new file mode 100644 index 000000000..ab06953e5 --- /dev/null +++ b/core/lib/Thelia/Core/Event/Coupon/CouponEnableEvent.php @@ -0,0 +1,103 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Core\Event\Coupon; +use Thelia\Model\Coupon; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/29/13 + * Time: 3:45 PM + * + * Occurring when a Coupon is enabled + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class CouponEnableEvent extends ActionEvent +{ + /** @var int Coupon id */ + protected $couponId; + + /** @var Coupon Coupon being enabled */ + protected $enabledCoupon; + + /** + * Constructor + * + * @param int $id Coupon Id + */ + public function __construct($id) + { + $this->id = $id; + } + + /** + * Get Coupon id + * + * @return int + */ + public function getId() + { + return $this->id; + } + + /** + * Set Coupon id + * + * @param int $id Coupon id + * + * @return $this + */ + public function setId($id) + { + $this->id = $id; + + return $this; + } + + /** + * Get Coupon being enabled + * + * @return Coupon + */ + public function getEnabledCoupon() + { + return $this->enabledCoupon; + } + + /** + * Set Coupon to be enabled + * + * @param Coupon $enabledCoupon Coupon to enabled + * + * @return $this + */ + public function setEnabledCoupon(Coupon $enabledCoupon) + { + $this->enabledCoupon = $enabledCoupon; + + return $this; + } +} diff --git a/core/lib/Thelia/Model/Base/RewritingUrl.php b/core/lib/Thelia/Model/Base/RewritingUrl.php index 75ee97e79..a6bcd3a26 100644 --- a/core/lib/Thelia/Model/Base/RewritingUrl.php +++ b/core/lib/Thelia/Model/Base/RewritingUrl.php @@ -298,7 +298,7 @@ abstract class RewritingUrl implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return array_key_exists($name, $this->virtualColumns); + return isset($this->virtualColumns[$name]); } /** diff --git a/core/lib/Thelia/Tests/Constraint/Validator/CustomerParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/CustomerParamTest.php new file mode 100644 index 000000000..2cdec7846 --- /dev/null +++ b/core/lib/Thelia/Tests/Constraint/Validator/CustomerParamTest.php @@ -0,0 +1,161 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Coupon; + +use InvalidArgumentException; +use Thelia\Constraint\Validator\CustomerParam; +use Thelia\Constraint\Validator\PriceParam; +use Thelia\Constraint\Validator\QuantityParam; +use Thelia\Model\Customer; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Unit Test CustomerParam Class + * + * @package Constraint + * @author Guillaume MOREL + * + */ +class CustomerParamTest extends \PHPUnit_Framework_TestCase +{ + + /** @var CouponAdapterInterface $stubTheliaAdapter */ + protected $stubTheliaAdapter = null; + + /** + * Sets up the fixture, for example, opens a network connection. + * This method is called before a test is executed. + */ + protected function setUp() + { + /** @var CouponAdapterInterface $stubTheliaAdapter */ + $this->stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); + } + + /** + * Generate valid CouponBaseAdapter + * + * @param int $customerId Customer id + * + * @return CouponAdapterInterface + */ + protected function generateValidCouponBaseAdapterMock($customerId = 4521) + { + $customer = new Customer(); + $customer->setId($customerId); + $customer->setFirstname('Firstname'); + $customer->setLastname('Lastname'); + $customer->setEmail('em@il.com'); + + /** @var CouponAdapterInterface $stubTheliaAdapter */ + $stubTheliaAdapter = $this->getMock( + 'Thelia\Coupon\CouponBaseAdapter', + array('getCustomer'), + array() + ); + $stubTheliaAdapter->expects($this->any()) + ->method('getCustomer') + ->will($this->returnValue($customer)); + + return $stubTheliaAdapter; + } + + /** + * + * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo + * + */ + public function testCanUseCoupon() + { + $customerId = 4521; + $couponValidForCustomerId = 4521; + + $adapter = $this->generateValidCouponBaseAdapterMock($customerId); + + $customerParam = new CustomerParam($adapter, $couponValidForCustomerId); + + $expected = 0; + $actual = $customerParam->compareTo($customerId); + $this->assertEquals($expected, $actual); + } + +// /** +// * +// * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo +// * +// */ +// public function testCanNotUseCouponTest() +// { +// +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo +// * @expectedException InvalidArgumentException +// * +// */ +// public function testCanNotUseCouponCustomerNotFoundTest() +// { +// +// } + + + + +// /** +// * Test is the object is serializable +// * If no data is lost during the process +// */ +// public function isSerializableTest() +// { +// $adapter = new CouponBaseAdapter(); +// $intValidator = 42; +// $intToValidate = -1; +// +// $param = new QuantityParam($adapter, $intValidator); +// +// $serialized = base64_encode(serialize($param)); +// /** @var QuantityParam $unserialized */ +// $unserialized = base64_decode(serialize($serialized)); +// +// $this->assertEquals($param->getValue(), $unserialized->getValue()); +// $this->assertEquals($param->getInteger(), $unserialized->getInteger()); +// +// $new = new QuantityParam($adapter, $unserialized->getInteger()); +// $this->assertEquals($param->getInteger(), $new->getInteger()); +// } + + /** + * Tears down the fixture, for example, closes a network connection. + * This method is called after a test is executed. + */ + protected function tearDown() + { + } + +} From ed763344eca31d14283af3b6a6cff8c83d07f5cb Mon Sep 17 00:00:00 2001 From: mespeche Date: Thu, 29 Aug 2013 17:51:50 +0200 Subject: [PATCH 027/125] WIP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Début de mise en place de coupon/add (coupon/edit) --- .../js/bootstrap-datepicker.js | 474 ++++++++++++++++++ .../css/bootstrap-editable.css | 467 +---------------- templates/admin/default/assets/css/admin.less | 246 +++++++-- templates/admin/default/coupon/edit.html | 44 +- 4 files changed, 721 insertions(+), 510 deletions(-) create mode 100755 templates/admin/default/assets/bootstrap-datepicker/js/bootstrap-datepicker.js diff --git a/templates/admin/default/assets/bootstrap-datepicker/js/bootstrap-datepicker.js b/templates/admin/default/assets/bootstrap-datepicker/js/bootstrap-datepicker.js new file mode 100755 index 000000000..bf3a56df0 --- /dev/null +++ b/templates/admin/default/assets/bootstrap-datepicker/js/bootstrap-datepicker.js @@ -0,0 +1,474 @@ +/* ========================================================= + * bootstrap-datepicker.js + * http://www.eyecon.ro/bootstrap-datepicker + * ========================================================= + * Copyright 2012 Stefan Petre + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================= */ + +!function( $ ) { + + // Picker object + + var Datepicker = function(element, options){ + this.element = $(element); + this.format = DPGlobal.parseFormat(options.format||this.element.data('date-format')||'mm/dd/yyyy'); + this.picker = $(DPGlobal.template) + .appendTo('body') + .on({ + click: $.proxy(this.click, this)//, + //mousedown: $.proxy(this.mousedown, this) + }); + this.isInput = this.element.is('input'); + this.component = this.element.is('.date') ? this.element.find('.add-on') : false; + + if (this.isInput) { + this.element.on({ + focus: $.proxy(this.show, this), + //blur: $.proxy(this.hide, this), + keyup: $.proxy(this.update, this) + }); + } else { + if (this.component){ + this.component.on('click', $.proxy(this.show, this)); + } else { + this.element.on('click', $.proxy(this.show, this)); + } + } + + this.minViewMode = options.minViewMode||this.element.data('date-minviewmode')||0; + if (typeof this.minViewMode === 'string') { + switch (this.minViewMode) { + case 'months': + this.minViewMode = 1; + break; + case 'years': + this.minViewMode = 2; + break; + default: + this.minViewMode = 0; + break; + } + } + this.viewMode = options.viewMode||this.element.data('date-viewmode')||0; + if (typeof this.viewMode === 'string') { + switch (this.viewMode) { + case 'months': + this.viewMode = 1; + break; + case 'years': + this.viewMode = 2; + break; + default: + this.viewMode = 0; + break; + } + } + this.startViewMode = this.viewMode; + this.weekStart = options.weekStart||this.element.data('date-weekstart')||0; + this.weekEnd = this.weekStart === 0 ? 6 : this.weekStart - 1; + this.onRender = options.onRender; + this.fillDow(); + this.fillMonths(); + this.update(); + this.showMode(); + }; + + Datepicker.prototype = { + constructor: Datepicker, + + show: function(e) { + this.picker.show(); + this.height = this.component ? this.component.outerHeight() : this.element.outerHeight(); + this.place(); + $(window).on('resize', $.proxy(this.place, this)); + if (e ) { + e.stopPropagation(); + e.preventDefault(); + } + if (!this.isInput) { + } + var that = this; + $(document).on('mousedown', function(ev){ + if ($(ev.target).closest('.datepicker').length == 0) { + that.hide(); + } + }); + this.element.trigger({ + type: 'show', + date: this.date + }); + }, + + hide: function(){ + this.picker.hide(); + $(window).off('resize', this.place); + this.viewMode = this.startViewMode; + this.showMode(); + if (!this.isInput) { + $(document).off('mousedown', this.hide); + } + //this.set(); + this.element.trigger({ + type: 'hide', + date: this.date + }); + }, + + set: function() { + var formated = DPGlobal.formatDate(this.date, this.format); + if (!this.isInput) { + if (this.component){ + this.element.find('input').prop('value', formated); + } + this.element.data('date', formated); + } else { + this.element.prop('value', formated); + } + }, + + setValue: function(newDate) { + if (typeof newDate === 'string') { + this.date = DPGlobal.parseDate(newDate, this.format); + } else { + this.date = new Date(newDate); + } + this.set(); + this.viewDate = new Date(this.date.getFullYear(), this.date.getMonth(), 1, 0, 0, 0, 0); + this.fill(); + }, + + place: function(){ + var offset = this.component ? this.component.offset() : this.element.offset(); + this.picker.css({ + top: offset.top + this.height, + left: offset.left + }); + }, + + update: function(newDate){ + this.date = DPGlobal.parseDate( + typeof newDate === 'string' ? newDate : (this.isInput ? this.element.prop('value') : this.element.data('date')), + this.format + ); + this.viewDate = new Date(this.date.getFullYear(), this.date.getMonth(), 1, 0, 0, 0, 0); + this.fill(); + }, + + fillDow: function(){ + var dowCnt = this.weekStart; + var html = ''; + while (dowCnt < this.weekStart + 7) { + html += ''+DPGlobal.dates.daysMin[(dowCnt++)%7]+''; + } + html += ''; + this.picker.find('.datepicker-days thead').append(html); + }, + + fillMonths: function(){ + var html = ''; + var i = 0 + while (i < 12) { + html += ''+DPGlobal.dates.monthsShort[i++]+''; + } + this.picker.find('.datepicker-months td').append(html); + }, + + fill: function() { + var d = new Date(this.viewDate), + year = d.getFullYear(), + month = d.getMonth(), + currentDate = this.date.valueOf(); + this.picker.find('.datepicker-days th:eq(1)') + .text(DPGlobal.dates.months[month]+' '+year); + var prevMonth = new Date(year, month-1, 28,0,0,0,0), + day = DPGlobal.getDaysInMonth(prevMonth.getFullYear(), prevMonth.getMonth()); + prevMonth.setDate(day); + prevMonth.setDate(day - (prevMonth.getDay() - this.weekStart + 7)%7); + var nextMonth = new Date(prevMonth); + nextMonth.setDate(nextMonth.getDate() + 42); + nextMonth = nextMonth.valueOf(); + var html = []; + var clsName, + prevY, + prevM; + while(prevMonth.valueOf() < nextMonth) { + if (prevMonth.getDay() === this.weekStart) { + html.push(''); + } + clsName = this.onRender(prevMonth); + prevY = prevMonth.getFullYear(); + prevM = prevMonth.getMonth(); + if ((prevM < month && prevY === year) || prevY < year) { + clsName += ' old'; + } else if ((prevM > month && prevY === year) || prevY > year) { + clsName += ' new'; + } + if (prevMonth.valueOf() === currentDate) { + clsName += ' active'; + } + html.push(''+prevMonth.getDate() + ''); + if (prevMonth.getDay() === this.weekEnd) { + html.push(''); + } + prevMonth.setDate(prevMonth.getDate()+1); + } + this.picker.find('.datepicker-days tbody').empty().append(html.join('')); + var currentYear = this.date.getFullYear(); + + var months = this.picker.find('.datepicker-months') + .find('th:eq(1)') + .text(year) + .end() + .find('span').removeClass('active'); + if (currentYear === year) { + months.eq(this.date.getMonth()).addClass('active'); + } + + html = ''; + year = parseInt(year/10, 10) * 10; + var yearCont = this.picker.find('.datepicker-years') + .find('th:eq(1)') + .text(year + '-' + (year + 9)) + .end() + .find('td'); + year -= 1; + for (var i = -1; i < 11; i++) { + html += ''+year+''; + year += 1; + } + yearCont.html(html); + }, + + click: function(e) { + e.stopPropagation(); + e.preventDefault(); + var target = $(e.target).closest('span, td, th'); + if (target.length === 1) { + switch(target[0].nodeName.toLowerCase()) { + case 'th': + switch(target[0].className) { + case 'switch': + this.showMode(1); + break; + case 'prev': + case 'next': + this.viewDate['set'+DPGlobal.modes[this.viewMode].navFnc].call( + this.viewDate, + this.viewDate['get'+DPGlobal.modes[this.viewMode].navFnc].call(this.viewDate) + + DPGlobal.modes[this.viewMode].navStep * (target[0].className === 'prev' ? -1 : 1) + ); + this.fill(); + this.set(); + break; + } + break; + case 'span': + if (target.is('.month')) { + var month = target.parent().find('span').index(target); + this.viewDate.setMonth(month); + } else { + var year = parseInt(target.text(), 10)||0; + this.viewDate.setFullYear(year); + } + if (this.viewMode !== 0) { + this.date = new Date(this.viewDate); + this.element.trigger({ + type: 'changeDate', + date: this.date, + viewMode: DPGlobal.modes[this.viewMode].clsName + }); + } + this.showMode(-1); + this.fill(); + this.set(); + break; + case 'td': + if (target.is('.day') && !target.is('.disabled')){ + var day = parseInt(target.text(), 10)||1; + var month = this.viewDate.getMonth(); + if (target.is('.old')) { + month -= 1; + } else if (target.is('.new')) { + month += 1; + } + var year = this.viewDate.getFullYear(); + this.date = new Date(year, month, day,0,0,0,0); + this.viewDate = new Date(year, month, Math.min(28, day),0,0,0,0); + this.fill(); + this.set(); + this.element.trigger({ + type: 'changeDate', + date: this.date, + viewMode: DPGlobal.modes[this.viewMode].clsName + }); + } + break; + } + } + }, + + mousedown: function(e){ + e.stopPropagation(); + e.preventDefault(); + }, + + showMode: function(dir) { + if (dir) { + this.viewMode = Math.max(this.minViewMode, Math.min(2, this.viewMode + dir)); + } + this.picker.find('>div').hide().filter('.datepicker-'+DPGlobal.modes[this.viewMode].clsName).show(); + } + }; + + $.fn.datepicker = function ( option, val ) { + return this.each(function () { + var $this = $(this), + data = $this.data('datepicker'), + options = typeof option === 'object' && option; + if (!data) { + $this.data('datepicker', (data = new Datepicker(this, $.extend({}, $.fn.datepicker.defaults,options)))); + } + if (typeof option === 'string') data[option](val); + }); + }; + + $.fn.datepicker.defaults = { + onRender: function(date) { + return ''; + } + }; + $.fn.datepicker.Constructor = Datepicker; + + var DPGlobal = { + modes: [ + { + clsName: 'days', + navFnc: 'Month', + navStep: 1 + }, + { + clsName: 'months', + navFnc: 'FullYear', + navStep: 1 + }, + { + clsName: 'years', + navFnc: 'FullYear', + navStep: 10 + }], + dates:{ + days: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"], + daysShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"], + daysMin: ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"], + months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"], + monthsShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"] + }, + isLeapYear: function (year) { + return (((year % 4 === 0) && (year % 100 !== 0)) || (year % 400 === 0)) + }, + getDaysInMonth: function (year, month) { + return [31, (DPGlobal.isLeapYear(year) ? 29 : 28), 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month] + }, + parseFormat: function(format){ + var separator = format.match(/[.\/\-\s].*?/), + parts = format.split(/\W+/); + if (!separator || !parts || parts.length === 0){ + throw new Error("Invalid date format."); + } + return {separator: separator, parts: parts}; + }, + parseDate: function(date, format) { + var parts = date.split(format.separator), + date = new Date(), + val; + date.setHours(0); + date.setMinutes(0); + date.setSeconds(0); + date.setMilliseconds(0); + if (parts.length === format.parts.length) { + var year = date.getFullYear(), day = date.getDate(), month = date.getMonth(); + for (var i=0, cnt = format.parts.length; i < cnt; i++) { + val = parseInt(parts[i], 10)||1; + switch(format.parts[i]) { + case 'dd': + case 'd': + day = val; + date.setDate(val); + break; + case 'mm': + case 'm': + month = val - 1; + date.setMonth(val - 1); + break; + case 'yy': + year = 2000 + val; + date.setFullYear(2000 + val); + break; + case 'yyyy': + year = val; + date.setFullYear(val); + break; + } + } + date = new Date(year, month, day, 0 ,0 ,0); + } + return date; + }, + formatDate: function(date, format){ + var val = { + d: date.getDate(), + m: date.getMonth() + 1, + yy: date.getFullYear().toString().substring(2), + yyyy: date.getFullYear() + }; + val.dd = (val.d < 10 ? '0' : '') + val.d; + val.mm = (val.m < 10 ? '0' : '') + val.m; + var date = []; + for (var i=0, cnt = format.parts.length; i < cnt; i++) { + date.push(val[format.parts[i]]); + } + return date.join(format.separator); + }, + headTemplate: ''+ + ''+ + '‹'+ + ''+ + '›'+ + ''+ + '', + contTemplate: '' + }; + DPGlobal.template = '
    '+ + '
    '+ + ''+ + DPGlobal.headTemplate+ + ''+ + '
    '+ + '
    '+ + '
    '+ + ''+ + DPGlobal.headTemplate+ + DPGlobal.contTemplate+ + '
    '+ + '
    '+ + '
    '+ + ''+ + DPGlobal.headTemplate+ + DPGlobal.contTemplate+ + '
    '+ + '
    '+ + '
    '; + +}( window.jQuery ); \ No newline at end of file diff --git a/templates/admin/default/assets/bootstrap-editable/css/bootstrap-editable.css b/templates/admin/default/assets/bootstrap-editable/css/bootstrap-editable.css index 2d9cc4eae..faebd0543 100755 --- a/templates/admin/default/assets/bootstrap-editable/css/bootstrap-editable.css +++ b/templates/admin/default/assets/bootstrap-editable/css/bootstrap-editable.css @@ -1,8 +1,8 @@ -/*! X-editable - v1.4.6 -* In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery -* http://github.com/vitalets/x-editable -* Copyright (c) 2013 Vitaliy Potapov; Licensed MIT */ - +/*! X-editable - v1.4.6 +* In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery +* http://github.com/vitalets/x-editable +* Copyright (c) 2013 Vitaliy Potapov; Licensed MIT */ + .editableform { margin-bottom: 0; /* overwrites bootstrap margin */ } @@ -137,7 +137,7 @@ .editable-pre-wrapped { white-space: pre-wrap; -} +} .editable-container.editable-popup { max-width: none !important; /* without this rule poshytip/tooltip does not stretch */ } @@ -158,7 +158,7 @@ .editable-container.ui-widget { font-size: inherit; /* jqueryui widget font 1.1em too big, overwrite it */ z-index: 9990; /* should be less than select2 dropdown z-index to close dropdown first when click */ -} +} .editable-click, a.editable-click, a.editable-click:hover { @@ -202,455 +202,4 @@ a.editable-click.editable-disabled:hover { { padding-top: 5px; display:inline-block; -} - - -/*! - * Datepicker for Bootstrap - * - * Copyright 2012 Stefan Petre - * Improvements by Andrew Rowls - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - */ -.datepicker { - padding: 4px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - direction: ltr; - /*.dow { - border-top: 1px solid #ddd !important; - }*/ - -} -.datepicker-inline { - width: 220px; -} -.datepicker.datepicker-rtl { - direction: rtl; -} -.datepicker.datepicker-rtl table tr td span { - float: right; -} -.datepicker-dropdown { - top: 0; - left: 0; -} -.datepicker-dropdown:before { - content: ''; - display: inline-block; - border-left: 7px solid transparent; - border-right: 7px solid transparent; - border-bottom: 7px solid #ccc; - border-bottom-color: rgba(0, 0, 0, 0.2); - position: absolute; - top: -7px; - left: 6px; -} -.datepicker-dropdown:after { - content: ''; - display: inline-block; - border-left: 6px solid transparent; - border-right: 6px solid transparent; - border-bottom: 6px solid #ffffff; - position: absolute; - top: -6px; - left: 7px; -} -.datepicker > div { - display: none; -} -.datepicker.days div.datepicker-days { - display: block; -} -.datepicker.months div.datepicker-months { - display: block; -} -.datepicker.years div.datepicker-years { - display: block; -} -.datepicker table { - margin: 0; -} -.datepicker td, -.datepicker th { - text-align: center; - width: 20px; - height: 20px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - border: none; -} -.table-striped .datepicker table tr td, -.table-striped .datepicker table tr th { - background-color: transparent; -} -.datepicker table tr td.day:hover { - background: #eeeeee; - cursor: pointer; -} -.datepicker table tr td.old, -.datepicker table tr td.new { - color: #999999; -} -.datepicker table tr td.disabled, -.datepicker table tr td.disabled:hover { - background: none; - color: #999999; - cursor: default; -} -.datepicker table tr td.today, -.datepicker table tr td.today:hover, -.datepicker table tr td.today.disabled, -.datepicker table tr td.today.disabled:hover { - background-color: #fde19a; - background-image: -moz-linear-gradient(top, #fdd49a, #fdf59a); - background-image: -ms-linear-gradient(top, #fdd49a, #fdf59a); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fdd49a), to(#fdf59a)); - background-image: -webkit-linear-gradient(top, #fdd49a, #fdf59a); - background-image: -o-linear-gradient(top, #fdd49a, #fdf59a); - background-image: linear-gradient(top, #fdd49a, #fdf59a); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fdd49a', endColorstr='#fdf59a', GradientType=0); - border-color: #fdf59a #fdf59a #fbed50; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); - color: #000; -} -.datepicker table tr td.today:hover, -.datepicker table tr td.today:hover:hover, -.datepicker table tr td.today.disabled:hover, -.datepicker table tr td.today.disabled:hover:hover, -.datepicker table tr td.today:active, -.datepicker table tr td.today:hover:active, -.datepicker table tr td.today.disabled:active, -.datepicker table tr td.today.disabled:hover:active, -.datepicker table tr td.today.active, -.datepicker table tr td.today:hover.active, -.datepicker table tr td.today.disabled.active, -.datepicker table tr td.today.disabled:hover.active, -.datepicker table tr td.today.disabled, -.datepicker table tr td.today:hover.disabled, -.datepicker table tr td.today.disabled.disabled, -.datepicker table tr td.today.disabled:hover.disabled, -.datepicker table tr td.today[disabled], -.datepicker table tr td.today:hover[disabled], -.datepicker table tr td.today.disabled[disabled], -.datepicker table tr td.today.disabled:hover[disabled] { - background-color: #fdf59a; -} -.datepicker table tr td.today:active, -.datepicker table tr td.today:hover:active, -.datepicker table tr td.today.disabled:active, -.datepicker table tr td.today.disabled:hover:active, -.datepicker table tr td.today.active, -.datepicker table tr td.today:hover.active, -.datepicker table tr td.today.disabled.active, -.datepicker table tr td.today.disabled:hover.active { - background-color: #fbf069 \9; -} -.datepicker table tr td.today:hover:hover { - color: #000; -} -.datepicker table tr td.today.active:hover { - color: #fff; -} -.datepicker table tr td.range, -.datepicker table tr td.range:hover, -.datepicker table tr td.range.disabled, -.datepicker table tr td.range.disabled:hover { - background: #eeeeee; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -.datepicker table tr td.range.today, -.datepicker table tr td.range.today:hover, -.datepicker table tr td.range.today.disabled, -.datepicker table tr td.range.today.disabled:hover { - background-color: #f3d17a; - background-image: -moz-linear-gradient(top, #f3c17a, #f3e97a); - background-image: -ms-linear-gradient(top, #f3c17a, #f3e97a); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f3c17a), to(#f3e97a)); - background-image: -webkit-linear-gradient(top, #f3c17a, #f3e97a); - background-image: -o-linear-gradient(top, #f3c17a, #f3e97a); - background-image: linear-gradient(top, #f3c17a, #f3e97a); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f3c17a', endColorstr='#f3e97a', GradientType=0); - border-color: #f3e97a #f3e97a #edde34; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -.datepicker table tr td.range.today:hover, -.datepicker table tr td.range.today:hover:hover, -.datepicker table tr td.range.today.disabled:hover, -.datepicker table tr td.range.today.disabled:hover:hover, -.datepicker table tr td.range.today:active, -.datepicker table tr td.range.today:hover:active, -.datepicker table tr td.range.today.disabled:active, -.datepicker table tr td.range.today.disabled:hover:active, -.datepicker table tr td.range.today.active, -.datepicker table tr td.range.today:hover.active, -.datepicker table tr td.range.today.disabled.active, -.datepicker table tr td.range.today.disabled:hover.active, -.datepicker table tr td.range.today.disabled, -.datepicker table tr td.range.today:hover.disabled, -.datepicker table tr td.range.today.disabled.disabled, -.datepicker table tr td.range.today.disabled:hover.disabled, -.datepicker table tr td.range.today[disabled], -.datepicker table tr td.range.today:hover[disabled], -.datepicker table tr td.range.today.disabled[disabled], -.datepicker table tr td.range.today.disabled:hover[disabled] { - background-color: #f3e97a; -} -.datepicker table tr td.range.today:active, -.datepicker table tr td.range.today:hover:active, -.datepicker table tr td.range.today.disabled:active, -.datepicker table tr td.range.today.disabled:hover:active, -.datepicker table tr td.range.today.active, -.datepicker table tr td.range.today:hover.active, -.datepicker table tr td.range.today.disabled.active, -.datepicker table tr td.range.today.disabled:hover.active { - background-color: #efe24b \9; -} -.datepicker table tr td.selected, -.datepicker table tr td.selected:hover, -.datepicker table tr td.selected.disabled, -.datepicker table tr td.selected.disabled:hover { - background-color: #9e9e9e; - background-image: -moz-linear-gradient(top, #b3b3b3, #808080); - background-image: -ms-linear-gradient(top, #b3b3b3, #808080); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b3b3b3), to(#808080)); - background-image: -webkit-linear-gradient(top, #b3b3b3, #808080); - background-image: -o-linear-gradient(top, #b3b3b3, #808080); - background-image: linear-gradient(top, #b3b3b3, #808080); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#b3b3b3', endColorstr='#808080', GradientType=0); - border-color: #808080 #808080 #595959; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); - color: #fff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} -.datepicker table tr td.selected:hover, -.datepicker table tr td.selected:hover:hover, -.datepicker table tr td.selected.disabled:hover, -.datepicker table tr td.selected.disabled:hover:hover, -.datepicker table tr td.selected:active, -.datepicker table tr td.selected:hover:active, -.datepicker table tr td.selected.disabled:active, -.datepicker table tr td.selected.disabled:hover:active, -.datepicker table tr td.selected.active, -.datepicker table tr td.selected:hover.active, -.datepicker table tr td.selected.disabled.active, -.datepicker table tr td.selected.disabled:hover.active, -.datepicker table tr td.selected.disabled, -.datepicker table tr td.selected:hover.disabled, -.datepicker table tr td.selected.disabled.disabled, -.datepicker table tr td.selected.disabled:hover.disabled, -.datepicker table tr td.selected[disabled], -.datepicker table tr td.selected:hover[disabled], -.datepicker table tr td.selected.disabled[disabled], -.datepicker table tr td.selected.disabled:hover[disabled] { - background-color: #808080; -} -.datepicker table tr td.selected:active, -.datepicker table tr td.selected:hover:active, -.datepicker table tr td.selected.disabled:active, -.datepicker table tr td.selected.disabled:hover:active, -.datepicker table tr td.selected.active, -.datepicker table tr td.selected:hover.active, -.datepicker table tr td.selected.disabled.active, -.datepicker table tr td.selected.disabled:hover.active { - background-color: #666666 \9; -} -.datepicker table tr td.active, -.datepicker table tr td.active:hover, -.datepicker table tr td.active.disabled, -.datepicker table tr td.active.disabled:hover { - background-color: #006dcc; - background-image: -moz-linear-gradient(top, #0088cc, #0044cc); - background-image: -ms-linear-gradient(top, #0088cc, #0044cc); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); - background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); - background-image: -o-linear-gradient(top, #0088cc, #0044cc); - background-image: linear-gradient(top, #0088cc, #0044cc); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0); - border-color: #0044cc #0044cc #002a80; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); - color: #fff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} -.datepicker table tr td.active:hover, -.datepicker table tr td.active:hover:hover, -.datepicker table tr td.active.disabled:hover, -.datepicker table tr td.active.disabled:hover:hover, -.datepicker table tr td.active:active, -.datepicker table tr td.active:hover:active, -.datepicker table tr td.active.disabled:active, -.datepicker table tr td.active.disabled:hover:active, -.datepicker table tr td.active.active, -.datepicker table tr td.active:hover.active, -.datepicker table tr td.active.disabled.active, -.datepicker table tr td.active.disabled:hover.active, -.datepicker table tr td.active.disabled, -.datepicker table tr td.active:hover.disabled, -.datepicker table tr td.active.disabled.disabled, -.datepicker table tr td.active.disabled:hover.disabled, -.datepicker table tr td.active[disabled], -.datepicker table tr td.active:hover[disabled], -.datepicker table tr td.active.disabled[disabled], -.datepicker table tr td.active.disabled:hover[disabled] { - background-color: #0044cc; -} -.datepicker table tr td.active:active, -.datepicker table tr td.active:hover:active, -.datepicker table tr td.active.disabled:active, -.datepicker table tr td.active.disabled:hover:active, -.datepicker table tr td.active.active, -.datepicker table tr td.active:hover.active, -.datepicker table tr td.active.disabled.active, -.datepicker table tr td.active.disabled:hover.active { - background-color: #003399 \9; -} -.datepicker table tr td span { - display: block; - width: 23%; - height: 54px; - line-height: 54px; - float: left; - margin: 1%; - cursor: pointer; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.datepicker table tr td span:hover { - background: #eeeeee; -} -.datepicker table tr td span.disabled, -.datepicker table tr td span.disabled:hover { - background: none; - color: #999999; - cursor: default; -} -.datepicker table tr td span.active, -.datepicker table tr td span.active:hover, -.datepicker table tr td span.active.disabled, -.datepicker table tr td span.active.disabled:hover { - background-color: #006dcc; - background-image: -moz-linear-gradient(top, #0088cc, #0044cc); - background-image: -ms-linear-gradient(top, #0088cc, #0044cc); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); - background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); - background-image: -o-linear-gradient(top, #0088cc, #0044cc); - background-image: linear-gradient(top, #0088cc, #0044cc); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0); - border-color: #0044cc #0044cc #002a80; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); - color: #fff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} -.datepicker table tr td span.active:hover, -.datepicker table tr td span.active:hover:hover, -.datepicker table tr td span.active.disabled:hover, -.datepicker table tr td span.active.disabled:hover:hover, -.datepicker table tr td span.active:active, -.datepicker table tr td span.active:hover:active, -.datepicker table tr td span.active.disabled:active, -.datepicker table tr td span.active.disabled:hover:active, -.datepicker table tr td span.active.active, -.datepicker table tr td span.active:hover.active, -.datepicker table tr td span.active.disabled.active, -.datepicker table tr td span.active.disabled:hover.active, -.datepicker table tr td span.active.disabled, -.datepicker table tr td span.active:hover.disabled, -.datepicker table tr td span.active.disabled.disabled, -.datepicker table tr td span.active.disabled:hover.disabled, -.datepicker table tr td span.active[disabled], -.datepicker table tr td span.active:hover[disabled], -.datepicker table tr td span.active.disabled[disabled], -.datepicker table tr td span.active.disabled:hover[disabled] { - background-color: #0044cc; -} -.datepicker table tr td span.active:active, -.datepicker table tr td span.active:hover:active, -.datepicker table tr td span.active.disabled:active, -.datepicker table tr td span.active.disabled:hover:active, -.datepicker table tr td span.active.active, -.datepicker table tr td span.active:hover.active, -.datepicker table tr td span.active.disabled.active, -.datepicker table tr td span.active.disabled:hover.active { - background-color: #003399 \9; -} -.datepicker table tr td span.old, -.datepicker table tr td span.new { - color: #999999; -} -.datepicker th.datepicker-switch { - width: 145px; -} -.datepicker thead tr:first-child th, -.datepicker tfoot tr th { - cursor: pointer; -} -.datepicker thead tr:first-child th:hover, -.datepicker tfoot tr th:hover { - background: #eeeeee; -} -.datepicker .cw { - font-size: 10px; - width: 12px; - padding: 0 2px 0 5px; - vertical-align: middle; -} -.datepicker thead tr:first-child th.cw { - cursor: default; - background-color: transparent; -} -.input-append.date .add-on i, -.input-prepend.date .add-on i { - display: block; - cursor: pointer; - width: 16px; - height: 16px; -} -.input-daterange input { - text-align: center; -} -.input-daterange input:first-child { - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; -} -.input-daterange input:last-child { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; -} -.input-daterange .add-on { - display: inline-block; - width: auto; - min-width: 16px; - height: 18px; - padding: 4px 5px; - font-weight: normal; - line-height: 18px; - text-align: center; - text-shadow: 0 1px 0 #ffffff; - vertical-align: middle; - background-color: #eeeeee; - border: 1px solid #ccc; - margin-left: -5px; - margin-right: -5px; -} +} \ No newline at end of file diff --git a/templates/admin/default/assets/css/admin.less b/templates/admin/default/assets/css/admin.less index 0f1d499ce..a9ca23bf1 100755 --- a/templates/admin/default/assets/css/admin.less +++ b/templates/admin/default/assets/css/admin.less @@ -1,31 +1,31 @@ // -- Tools -------------------------------------------------------------------- .rounded(@radius: 2px) { - -webkit-border-radius: @radius; - -moz-border-radius: @radius; - border-radius: @radius; + -webkit-border-radius: @radius; + -moz-border-radius: @radius; + border-radius: @radius; } .border-radius(@topright: 0, @bottomright: 0, @bottomleft: 0, @topleft: 0) { - -webkit-border-top-right-radius: @topright; - -webkit-border-bottom-right-radius: @bottomright; - -webkit-border-bottom-left-radius: @bottomleft; - -webkit-border-top-left-radius: @topleft; - -moz-border-radius-topright: @topright; - -moz-border-radius-bottomright: @bottomright; - -moz-border-radius-bottomleft: @bottomleft; - -moz-border-radius-topleft: @topleft; - border-top-right-radius: @topright; - border-bottom-right-radius: @bottomright; - border-bottom-left-radius: @bottomleft; - border-top-left-radius: @topleft; - .background-clip(padding-box); + -webkit-border-top-right-radius: @topright; + -webkit-border-bottom-right-radius: @bottomright; + -webkit-border-bottom-left-radius: @bottomleft; + -webkit-border-top-left-radius: @topleft; + -moz-border-radius-topright: @topright; + -moz-border-radius-bottomright: @bottomright; + -moz-border-radius-bottomleft: @bottomleft; + -moz-border-radius-topleft: @topleft; + border-top-right-radius: @topright; + border-bottom-right-radius: @bottomright; + border-bottom-left-radius: @bottomleft; + border-top-left-radius: @topleft; + .background-clip(padding-box); } .background-clip(@argument: padding-box) { - -moz-background-clip: @argument; - -webkit-background-clip: @argument; - background-clip: @argument; + -moz-background-clip: @argument; + -webkit-background-clip: @argument; + background-clip: @argument; } .box-shadow(@shadow: 0 1px 2px rgba(0,0,0,.05)) { @@ -34,6 +34,75 @@ box-shadow: @shadow; } +// Gradients +#gradient { + .horizontal(@startColor: #555, @endColor: #333) { + background-color: @endColor; + background-image: -moz-linear-gradient(left, @startColor, @endColor); // FF 3.6+ + background-image: -webkit-gradient(linear, 0 0, 100% 0, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+ + background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+ + background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10 + background-image: linear-gradient(to right, @startColor, @endColor); // Standard, IE10 + background-repeat: repeat-x; + filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@startColor),argb(@endColor))); // IE9 and down + } + .vertical(@startColor: #555, @endColor: #333) { + background-color: mix(@startColor, @endColor, 60%); + background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+ + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+ + background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+ + background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10 + background-image: linear-gradient(to bottom, @startColor, @endColor); // Standard, IE10 + background-repeat: repeat-x; + filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down + } + .directional(@startColor: #555, @endColor: #333, @deg: 45deg) { + background-color: @endColor; + background-repeat: repeat-x; + background-image: -moz-linear-gradient(@deg, @startColor, @endColor); // FF 3.6+ + background-image: -webkit-linear-gradient(@deg, @startColor, @endColor); // Safari 5.1+, Chrome 10+ + background-image: -o-linear-gradient(@deg, @startColor, @endColor); // Opera 11.10 + background-image: linear-gradient(@deg, @startColor, @endColor); // Standard, IE10 + } + .horizontal-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) { + background-color: mix(@midColor, @endColor, 80%); + background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor)); + background-image: -webkit-linear-gradient(left, @startColor, @midColor @colorStop, @endColor); + background-image: -moz-linear-gradient(left, @startColor, @midColor @colorStop, @endColor); + background-image: -o-linear-gradient(left, @startColor, @midColor @colorStop, @endColor); + background-image: linear-gradient(to right, @startColor, @midColor @colorStop, @endColor); + background-repeat: no-repeat; + filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down, gets no color-stop at all for proper fallback + } + + .vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) { + background-color: mix(@midColor, @endColor, 80%); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor)); + background-image: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor); + background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop, @endColor); + background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor); + background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor); + background-repeat: no-repeat; + filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down, gets no color-stop at all for proper fallback + } + .radial(@innerColor: #555, @outerColor: #333) { + background-color: @outerColor; + background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@innerColor), to(@outerColor)); + background-image: -webkit-radial-gradient(circle, @innerColor, @outerColor); + background-image: -moz-radial-gradient(circle, @innerColor, @outerColor); + background-image: -o-radial-gradient(circle, @innerColor, @outerColor); + background-repeat: no-repeat; + } + .striped(@color: #555, @angle: 45deg) { + background-color: @color; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); + } +} + // -- Base styling ------------------------------------------------------------ html, body { @@ -89,37 +158,13 @@ hr { } .btn-primary, .btn-large { - background: #e9730f; - background-image: linear-gradient(bottom, rgb(227,83,11) 0%, rgb(243,153,34) 100%); - background-image: -o-linear-gradient(bottom, rgb(227,83,11) 0%, rgb(243,153,34) 100%); - background-image: -moz-linear-gradient(bottom, rgb(227,83,11) 0%, rgb(243,153,34) 100%); - background-image: -webkit-linear-gradient(bottom, rgb(227,83,11) 0%, rgb(243,153,34) 100%); - background-image: -ms-linear-gradient(bottom, rgb(227,83,11) 0%, rgb(243,153,34) 100%); - background-image: -webkit-gradient( - linear, - left bottom, - left top, - color-stop(0, rgb(227,83,11)), - color-stop(1, rgb(243,153,34)) - ); + #gradient > .vertical(rgb(243,153,34), rgb(227,83,11)); box-shadow: inset 0px 0px 2px rgba(250,250,250,0.5), 0px 1px 3px rgba(0,0,0,0.2); color: white; } .btn-large:hover, .btn-primary:hover { - background: #e9730f; - background-image: linear-gradient(bottom, rgb(227,83,11) 0%, rgb(243,153,34) 100%); - background-image: -o-linear-gradient(bottom, rgb(227,83,11) 0%, rgb(243,153,34) 100%); - background-image: -moz-linear-gradient(bottom, rgb(227,83,11) 0%, rgb(243,153,34) 100%); - background-image: -webkit-linear-gradient(bottom, rgb(227,83,11) 0%, rgb(243,153,34) 100%); - background-image: -ms-linear-gradient(bottom, rgb(227,83,11) 0%, rgb(243,153,34) 100%); - background-image: -webkit-gradient( - linear, - left bottom, - left top, - color-stop(0, rgb(227,83,11)), - color-stop(1, rgb(243,153,34)) - ); + #gradient > .vertical(rgb(243,153,34), rgb(227,83,11)); box-shadow: inset 0px 0px 2px rgba(250,250,250,0.8), 0px 1px 3px rgba(0,0,0,0.2); color: white; } @@ -723,4 +768,115 @@ label { .editable-click, a.editable-click, a.editable-click:hover { border-bottom: 1px dotted #0088CC; +} + +// -- Boostrap datepicker ----------------------------------------------------- +.datepicker { + top: 0; + left: 0; + padding: 4px; + margin-top: 1px; + .rounded(4px); + &:before { + content: ''; + display: inline-block; + border-left: 7px solid transparent; + border-right: 7px solid transparent; + border-bottom: 7px solid #ccc; + border-bottom-color: rgba(0,0,0,.2); + position: absolute; + top: -7px; + left: 6px; + } + &:after { + content: ''; + display: inline-block; + border-left: 6px solid transparent; + border-right: 6px solid transparent; + border-bottom: 6px solid @white; + position: absolute; + top: -6px; + left: 7px; + } + >div { + display: none; + } + table{ + width: 100%; + margin: 0; + } + td, + th{ + text-align: center; + width: 20px; + height: 20px; + .rounded(4px); + } + td { + &.day:hover { + background: @grayLighter; + cursor: pointer; + } + &.day.disabled { + color: @grayLighter; + } + &.old, + &.new { + color: @grayLight; + } + &.active, + &.active:hover { + #gradient > .vertical(rgb(243,153,34), rgb(227,83,11)); + color: #fff; + text-shadow: 0 -1px 0 rgba(0,0,0,.25); + } + span { + display: block; + width: 47px; + height: 54px; + line-height: 54px; + float: left; + margin: 2px; + cursor: pointer; + .rounded(4px); + &:hover { + background: @grayLighter; + } + &.active { + #gradient > .vertical(rgb(243,153,34), rgb(227,83,11)); + color: #fff; + text-shadow: 0 -1px 0 rgba(0,0,0,.25); + } + &.old { + color: @grayLight; + } + } + } + + th { + &.switch { + width: 145px; + } + &.next, + &.prev { + font-size: @baseFontSize * 1.5; + } + } + + thead tr:first-child th { + cursor: pointer; + &:hover{ + background: @grayLighter; + } + } + +} +.input-append, +.input-prepend { + &.date { + .add-on span { + display: block; + cursor: pointer; + } + } } \ No newline at end of file diff --git a/templates/admin/default/coupon/edit.html b/templates/admin/default/coupon/edit.html index 74423013f..56c2b6229 100755 --- a/templates/admin/default/coupon/edit.html +++ b/templates/admin/default/coupon/edit.html @@ -23,8 +23,7 @@
    -
    - +
    @@ -51,9 +50,28 @@
    - +
    + + +
    +
    + + +
    +
    + +
    +
    + + + More description n°1 about item +
    @@ -65,11 +83,25 @@ {include file='includes/js.inc.html'} -{javascripts file='../assets/bootstrap-editable/js/bootstrap-editable.js'} - +{javascripts file='../assets/bootstrap-datepicker/js/bootstrap-datepicker.js'} + {/javascripts} -{include file='includes/footer.inc.html'} +{include file='includes/footer.inc.html'} \ No newline at end of file From db102a53290cc0139e459e1c2f9593ecc2dc7b24 Mon Sep 17 00:00:00 2001 From: mespeche Date: Fri, 30 Aug 2013 08:52:37 +0200 Subject: [PATCH 028/125] Working MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Supprésion de cette version de jQuery --- .../assets/js/tablesorter/jquery-latest.js | 154 ------------------ 1 file changed, 154 deletions(-) delete mode 100644 templates/admin/default/assets/js/tablesorter/jquery-latest.js diff --git a/templates/admin/default/assets/js/tablesorter/jquery-latest.js b/templates/admin/default/assets/js/tablesorter/jquery-latest.js deleted file mode 100644 index ac7e7009d..000000000 --- a/templates/admin/default/assets/js/tablesorter/jquery-latest.js +++ /dev/null @@ -1,154 +0,0 @@ -/*! - * jQuery JavaScript Library v1.4.2 - * http://jquery.com/ - * - * Copyright 2010, John Resig - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * Includes Sizzle.js - * http://sizzlejs.com/ - * Copyright 2010, The Dojo Foundation - * Released under the MIT, BSD, and GPL Licenses. - * - * Date: Sat Feb 13 22:33:48 2010 -0500 - */ -(function(A,w){function ma(){if(!c.isReady){try{s.documentElement.doScroll("left")}catch(a){setTimeout(ma,1);return}c.ready()}}function Qa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,j){var i=a.length;if(typeof b==="object"){for(var o in b)X(a,o,b[o],f,e,d);return a}if(d!==w){f=!j&&f&&c.isFunction(d);for(o=0;o)[^>]*$|^#([\w-]+)$/,Ua=/^.[^:#\[\.,]*$/,Va=/\S/, -Wa=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,Xa=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,P=navigator.userAgent,xa=false,Q=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,R=Array.prototype.slice,ya=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if(!a)return this;if(a.nodeType){this.context=this[0]=a;this.length=1;return this}if(a==="body"&&!b){this.context=s;this[0]=s.body;this.selector="body";this.length=1;return this}if(typeof a==="string")if((d=Ta.exec(a))&& -(d[1]||!b))if(d[1]){f=b?b.ownerDocument||b:s;if(a=Xa.exec(a))if(c.isPlainObject(b)){a=[s.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=sa([d[1]],[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}return c.merge(this,a)}else{if(b=s.getElementById(d[2])){if(b.id!==d[2])return T.find(a);this.length=1;this[0]=b}this.context=s;this.selector=a;return this}else if(!b&&/^\w+$/.test(a)){this.selector=a;this.context=s;a=s.getElementsByTagName(a);return c.merge(this, -a)}else return!b||b.jquery?(b||T).find(a):c(b).find(a);else if(c.isFunction(a))return T.ready(a);if(a.selector!==w){this.selector=a.selector;this.context=a.context}return c.makeArray(a,this)},selector:"",jquery:"1.4.2",length:0,size:function(){return this.length},toArray:function(){return R.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){var f=c();c.isArray(a)?ba.apply(f,a):c.merge(f,a);f.prevObject=this;f.context=this.context;if(b=== -"find")f.selector=this.selector+(this.selector?" ":"")+d;else if(b)f.selector=this.selector+"."+b+"("+d+")";return f},each:function(a,b){return c.each(this,a,b)},ready:function(a){c.bindReady();if(c.isReady)a.call(s,c);else Q&&Q.push(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(R.apply(this,arguments),"slice",R.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this, -function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject||c(null)},push:ba,sort:[].sort,splice:[].splice};c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]||{},b=1,d=arguments.length,f=false,e,j,i,o;if(typeof a==="boolean"){f=a;a=arguments[1]||{};b=2}if(typeof a!=="object"&&!c.isFunction(a))a={};if(d===b){a=this;--b}for(;b
    a"; -var e=d.getElementsByTagName("*"),j=d.getElementsByTagName("a")[0];if(!(!e||!e.length||!j)){c.support={leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(j.getAttribute("style")),hrefNormalized:j.getAttribute("href")==="/a",opacity:/^0.55$/.test(j.style.opacity),cssFloat:!!j.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:s.createElement("select").appendChild(s.createElement("option")).selected, -parentNode:d.removeChild(d.appendChild(s.createElement("div"))).parentNode===null,deleteExpando:true,checkClone:false,scriptEval:false,noCloneEvent:true,boxModel:null};b.type="text/javascript";try{b.appendChild(s.createTextNode("window."+f+"=1;"))}catch(i){}a.insertBefore(b,a.firstChild);if(A[f]){c.support.scriptEval=true;delete A[f]}try{delete b.test}catch(o){c.support.deleteExpando=false}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function k(){c.support.noCloneEvent= -false;d.detachEvent("onclick",k)});d.cloneNode(true).fireEvent("onclick")}d=s.createElement("div");d.innerHTML="";a=s.createDocumentFragment();a.appendChild(d.firstChild);c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var k=s.createElement("div");k.style.width=k.style.paddingLeft="1px";s.body.appendChild(k);c.boxModel=c.support.boxModel=k.offsetWidth===2;s.body.removeChild(k).style.display="none"});a=function(k){var n= -s.createElement("div");k="on"+k;var r=k in n;if(!r){n.setAttribute(k,"return;");r=typeof n[k]==="function"}return r};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=e=j=null}})();c.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};var G="jQuery"+J(),Ya=0,za={};c.extend({cache:{},expando:G,noData:{embed:true,object:true, -applet:true},data:function(a,b,d){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var f=a[G],e=c.cache;if(!f&&typeof b==="string"&&d===w)return null;f||(f=++Ya);if(typeof b==="object"){a[G]=f;e[f]=c.extend(true,{},b)}else if(!e[f]){a[G]=f;e[f]={}}a=e[f];if(d!==w)a[b]=d;return typeof b==="string"?a[b]:a}},removeData:function(a,b){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var d=a[G],f=c.cache,e=f[d];if(b){if(e){delete e[b];c.isEmptyObject(e)&&c.removeData(a)}}else{if(c.support.deleteExpando)delete a[c.expando]; -else a.removeAttribute&&a.removeAttribute(c.expando);delete f[d]}}}});c.fn.extend({data:function(a,b){if(typeof a==="undefined"&&this.length)return c.data(this[0]);else if(typeof a==="object")return this.each(function(){c.data(this,a)});var d=a.split(".");d[1]=d[1]?"."+d[1]:"";if(b===w){var f=this.triggerHandler("getData"+d[1]+"!",[d[0]]);if(f===w&&this.length)f=c.data(this[0],a);return f===w&&d[1]?this.data(d[0]):f}else return this.trigger("setData"+d[1]+"!",[d[0],b]).each(function(){c.data(this, -a,b)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var f=c.data(a,b);if(!d)return f||[];if(!f||c.isArray(d))f=c.data(a,b,c.makeArray(d));else f.push(d);return f}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),f=d.shift();if(f==="inprogress")f=d.shift();if(f){b==="fx"&&d.unshift("inprogress");f.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b=== -w)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var Aa=/[\n\t]/g,ca=/\s+/,Za=/\r/g,$a=/href|src|style/,ab=/(button|input)/i,bb=/(button|input|object|select|textarea)/i, -cb=/^(a|area)$/i,Ba=/radio|checkbox/;c.fn.extend({attr:function(a,b){return X(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(n){var r=c(this);r.addClass(a.call(this,n,r.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ca),d=0,f=this.length;d-1)return true;return false},val:function(a){if(a===w){var b=this[0];if(b){if(c.nodeName(b,"option"))return(b.attributes.value||{}).specified?b.value:b.text;if(c.nodeName(b,"select")){var d=b.selectedIndex,f=[],e=b.options;b=b.type==="select-one";if(d<0)return null;var j=b?d:0;for(d=b?d+1:e.length;j=0;else if(c.nodeName(this,"select")){var u=c.makeArray(r);c("option",this).each(function(){this.selected= -c.inArray(c(this).val(),u)>=0});if(!u.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(a,b,d,f){if(!a||a.nodeType===3||a.nodeType===8)return w;if(f&&b in c.attrFn)return c(a)[b](d);f=a.nodeType!==1||!c.isXMLDoc(a);var e=d!==w;b=f&&c.props[b]||b;if(a.nodeType===1){var j=$a.test(b);if(b in a&&f&&!j){if(e){b==="type"&&ab.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed"); -a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&b.specified?b.value:bb.test(a.nodeName)||cb.test(a.nodeName)&&a.href?0:w;return a[b]}if(!c.support.style&&f&&b==="style"){if(e)a.style.cssText=""+d;return a.style.cssText}e&&a.setAttribute(b,""+d);a=!c.support.hrefNormalized&&f&&j?a.getAttribute(b,2):a.getAttribute(b);return a===null?w:a}return c.style(a,b,d)}});var O=/\.(.*)$/,db=function(a){return a.replace(/[^\w\s\.\|`]/g, -function(b){return"\\"+b})};c.event={add:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){if(a.setInterval&&a!==A&&!a.frameElement)a=A;var e,j;if(d.handler){e=d;d=e.handler}if(!d.guid)d.guid=c.guid++;if(j=c.data(a)){var i=j.events=j.events||{},o=j.handle;if(!o)j.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem,arguments):w};o.elem=a;b=b.split(" ");for(var k,n=0,r;k=b[n++];){j=e?c.extend({},e):{handler:d,data:f};if(k.indexOf(".")>-1){r=k.split("."); -k=r.shift();j.namespace=r.slice(0).sort().join(".")}else{r=[];j.namespace=""}j.type=k;j.guid=d.guid;var u=i[k],z=c.event.special[k]||{};if(!u){u=i[k]=[];if(!z.setup||z.setup.call(a,f,r,o)===false)if(a.addEventListener)a.addEventListener(k,o,false);else a.attachEvent&&a.attachEvent("on"+k,o)}if(z.add){z.add.call(a,j);if(!j.handler.guid)j.handler.guid=d.guid}u.push(j);c.event.global[k]=true}a=null}}},global:{},remove:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){var e,j=0,i,o,k,n,r,u,z=c.data(a), -C=z&&z.events;if(z&&C){if(b&&b.type){d=b.handler;b=b.type}if(!b||typeof b==="string"&&b.charAt(0)==="."){b=b||"";for(e in C)c.event.remove(a,e+b)}else{for(b=b.split(" ");e=b[j++];){n=e;i=e.indexOf(".")<0;o=[];if(!i){o=e.split(".");e=o.shift();k=new RegExp("(^|\\.)"+c.map(o.slice(0).sort(),db).join("\\.(?:.*\\.)?")+"(\\.|$)")}if(r=C[e])if(d){n=c.event.special[e]||{};for(B=f||0;B=0){a.type= -e=e.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[e]&&c.each(c.cache,function(){this.events&&this.events[e]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===8)return w;a.result=w;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(f=c.data(d,"handle"))&&f.apply(d,b);f=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+e]&&d["on"+e].apply(d,b)===false)a.result=false}catch(j){}if(!a.isPropagationStopped()&& -f)c.event.trigger(a,b,f,true);else if(!a.isDefaultPrevented()){f=a.target;var i,o=c.nodeName(f,"a")&&e==="click",k=c.event.special[e]||{};if((!k._default||k._default.call(d,a)===false)&&!o&&!(f&&f.nodeName&&c.noData[f.nodeName.toLowerCase()])){try{if(f[e]){if(i=f["on"+e])f["on"+e]=null;c.event.triggered=true;f[e]()}}catch(n){}if(i)f["on"+e]=i;c.event.triggered=false}}},handle:function(a){var b,d,f,e;a=arguments[0]=c.event.fix(a||A.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive; -if(!b){d=a.type.split(".");a.type=d.shift();f=new RegExp("(^|\\.)"+d.slice(0).sort().join("\\.(?:.*\\.)?")+"(\\.|$)")}e=c.data(this,"events");d=e[a.type];if(e&&d){d=d.slice(0);e=0;for(var j=d.length;e-1?c.map(a.options,function(f){return f.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},fa=function(a,b){var d=a.target,f,e;if(!(!da.test(d.nodeName)||d.readOnly)){f=c.data(d,"_change_data");e=Fa(d);if(a.type!=="focusout"||d.type!=="radio")c.data(d,"_change_data", -e);if(!(f===w||e===f))if(f!=null||e){a.type="change";return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:fa,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return fa.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return fa.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a, -"_change_data",Fa(a))}},setup:function(){if(this.type==="file")return false;for(var a in ea)c.event.add(this,a+".specialChange",ea[a]);return da.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return da.test(this.nodeName)}};ea=c.event.special.change.filters}s.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(f){f=c.event.fix(f);f.type=b;return c.event.handle.call(this,f)}c.event.special[b]={setup:function(){this.addEventListener(a, -d,true)},teardown:function(){this.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,f,e){if(typeof d==="object"){for(var j in d)this[b](j,f,d[j],e);return this}if(c.isFunction(f)){e=f;f=w}var i=b==="one"?c.proxy(e,function(k){c(this).unbind(k,i);return e.apply(this,arguments)}):e;if(d==="unload"&&b!=="one")this.one(d,f,e);else{j=0;for(var o=this.length;j0){y=t;break}}t=t[g]}m[q]=y}}}var f=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g, -e=0,j=Object.prototype.toString,i=false,o=true;[0,0].sort(function(){o=false;return 0});var k=function(g,h,l,m){l=l||[];var q=h=h||s;if(h.nodeType!==1&&h.nodeType!==9)return[];if(!g||typeof g!=="string")return l;for(var p=[],v,t,y,S,H=true,M=x(h),I=g;(f.exec(""),v=f.exec(I))!==null;){I=v[3];p.push(v[1]);if(v[2]){S=v[3];break}}if(p.length>1&&r.exec(g))if(p.length===2&&n.relative[p[0]])t=ga(p[0]+p[1],h);else for(t=n.relative[p[0]]?[h]:k(p.shift(),h);p.length;){g=p.shift();if(n.relative[g])g+=p.shift(); -t=ga(g,t)}else{if(!m&&p.length>1&&h.nodeType===9&&!M&&n.match.ID.test(p[0])&&!n.match.ID.test(p[p.length-1])){v=k.find(p.shift(),h,M);h=v.expr?k.filter(v.expr,v.set)[0]:v.set[0]}if(h){v=m?{expr:p.pop(),set:z(m)}:k.find(p.pop(),p.length===1&&(p[0]==="~"||p[0]==="+")&&h.parentNode?h.parentNode:h,M);t=v.expr?k.filter(v.expr,v.set):v.set;if(p.length>0)y=z(t);else H=false;for(;p.length;){var D=p.pop();v=D;if(n.relative[D])v=p.pop();else D="";if(v==null)v=h;n.relative[D](y,v,M)}}else y=[]}y||(y=t);y||k.error(D|| -g);if(j.call(y)==="[object Array]")if(H)if(h&&h.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&E(h,y[g])))l.push(t[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&l.push(t[g]);else l.push.apply(l,y);else z(y,l);if(S){k(S,q,l,m);k.uniqueSort(l)}return l};k.uniqueSort=function(g){if(B){i=o;g.sort(B);if(i)for(var h=1;h":function(g,h){var l=typeof h==="string";if(l&&!/\W/.test(h)){h=h.toLowerCase();for(var m=0,q=g.length;m=0))l||m.push(v);else if(l)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()}, -CHILD:function(g){if(g[1]==="nth"){var h=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=h[1]+(h[2]||1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,l,m,q,p){h=g[1].replace(/\\/g,"");if(!p&&n.attrMap[h])g[1]=n.attrMap[h];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,l,m,q){if(g[1]==="not")if((f.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,h);else{g=k.filter(g[3],h,l,true^q);l||m.push.apply(m, -g);return false}else if(n.match.POS.test(g[0])||n.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,l){return!!k(l[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)}, -text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}}, -setFilters:{first:function(g,h){return h===0},last:function(g,h,l,m){return h===m.length-1},even:function(g,h){return h%2===0},odd:function(g,h){return h%2===1},lt:function(g,h,l){return hl[3]-0},nth:function(g,h,l){return l[3]-0===h},eq:function(g,h,l){return l[3]-0===h}},filter:{PSEUDO:function(g,h,l,m){var q=h[1],p=n.filters[q];if(p)return p(g,l,h,m);else if(q==="contains")return(g.textContent||g.innerText||a([g])||"").indexOf(h[3])>=0;else if(q==="not"){h= -h[3];l=0;for(m=h.length;l=0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var l=h[1];g=n.attrHandle[l]?n.attrHandle[l](g):g[l]!=null?g[l]:g.getAttribute(l);l=g+"";var m=h[2];h=h[4];return g==null?m==="!=":m=== -"="?l===h:m==="*="?l.indexOf(h)>=0:m==="~="?(" "+l+" ").indexOf(h)>=0:!h?l&&g!==false:m==="!="?l!==h:m==="^="?l.indexOf(h)===0:m==="$="?l.substr(l.length-h.length)===h:m==="|="?l===h||l.substr(0,h.length+1)===h+"-":false},POS:function(g,h,l,m){var q=n.setFilters[h[2]];if(q)return q(g,l,h,m)}}},r=n.match.POS;for(var u in n.match){n.match[u]=new RegExp(n.match[u].source+/(?![^\[]*\])(?![^\(]*\))/.source);n.leftMatch[u]=new RegExp(/(^(?:.|\r|\n)*?)/.source+n.match[u].source.replace(/\\(\d+)/g,function(g, -h){return"\\"+(h-0+1)}))}var z=function(g,h){g=Array.prototype.slice.call(g,0);if(h){h.push.apply(h,g);return h}return g};try{Array.prototype.slice.call(s.documentElement.childNodes,0)}catch(C){z=function(g,h){h=h||[];if(j.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if(typeof g.length==="number")for(var l=0,m=g.length;l";var l=s.documentElement;l.insertBefore(g,l.firstChild);if(s.getElementById(h)){n.find.ID=function(m,q,p){if(typeof q.getElementById!=="undefined"&&!p)return(q=q.getElementById(m[1]))?q.id===m[1]||typeof q.getAttributeNode!=="undefined"&& -q.getAttributeNode("id").nodeValue===m[1]?[q]:w:[]};n.filter.ID=function(m,q){var p=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&p&&p.nodeValue===q}}l.removeChild(g);l=g=null})();(function(){var g=s.createElement("div");g.appendChild(s.createComment(""));if(g.getElementsByTagName("*").length>0)n.find.TAG=function(h,l){l=l.getElementsByTagName(h[1]);if(h[1]==="*"){h=[];for(var m=0;l[m];m++)l[m].nodeType===1&&h.push(l[m]);l=h}return l};g.innerHTML=""; -if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")n.attrHandle.href=function(h){return h.getAttribute("href",2)};g=null})();s.querySelectorAll&&function(){var g=k,h=s.createElement("div");h.innerHTML="

    ";if(!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){k=function(m,q,p,v){q=q||s;if(!v&&q.nodeType===9&&!x(q))try{return z(q.querySelectorAll(m),p)}catch(t){}return g(m,q,p,v)};for(var l in g)k[l]=g[l];h=null}}(); -(function(){var g=s.createElement("div");g.innerHTML="
    ";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){n.order.splice(1,0,"CLASS");n.find.CLASS=function(h,l,m){if(typeof l.getElementsByClassName!=="undefined"&&!m)return l.getElementsByClassName(h[1])};g=null}}})();var E=s.compareDocumentPosition?function(g,h){return!!(g.compareDocumentPosition(h)&16)}: -function(g,h){return g!==h&&(g.contains?g.contains(h):true)},x=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false},ga=function(g,h){var l=[],m="",q;for(h=h.nodeType?[h]:h;q=n.match.PSEUDO.exec(g);){m+=q[0];g=g.replace(n.match.PSEUDO,"")}g=n.relative[g]?g+"*":g;q=0;for(var p=h.length;q=0===d})};c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f0)for(var j=d;j0},closest:function(a,b){if(c.isArray(a)){var d=[],f=this[0],e,j= -{},i;if(f&&a.length){e=0;for(var o=a.length;e-1:c(f).is(e)){d.push({selector:i,elem:f});delete j[i]}}f=f.parentNode}}return d}var k=c.expr.match.POS.test(a)?c(a,b||this.context):null;return this.map(function(n,r){for(;r&&r.ownerDocument&&r!==b;){if(k?k.index(r)>-1:c(r).is(a))return r;r=r.parentNode}return null})},index:function(a){if(!a||typeof a=== -"string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b||this.context):c.makeArray(a);b=c.merge(this.get(),a);return this.pushStack(qa(a[0])||qa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode", -d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")? -a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);eb.test(a)||(f=d);if(f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e):e;if((this.length>1||gb.test(f))&&fb.test(a))e=e.reverse();return this.pushStack(e,a,R.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for(a=a[b];a&&a.nodeType!==9&&(d===w||a.nodeType!==1||!c(a).is(d));){a.nodeType=== -1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b||1;for(var f=0;a;a=a[d])if(a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var Ja=/ jQuery\d+="(?:\d+|null)"/g,V=/^\s+/,Ka=/(<([\w:]+)[^>]*?)\/>/g,hb=/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,La=/<([\w:]+)/,ib=/"},F={option:[1,""],legend:[1,"
    ","
    "],thead:[1,"","
    "],tr:[2,"","
    "],td:[3,"","
    "],col:[2,"","
    "],area:[1,"",""],_default:[0,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if(!c.support.htmlSerialize)F._default=[1,"div
    ","
    "];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d= -c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==w)return this.empty().append((this[0]&&this[0].ownerDocument||s).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this}, -wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})}, -prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b, -this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,f;(f=this[d])!=null;d++)if(!a||c.filter(a,[f]).length){if(!b&&f.nodeType===1){c.cleanData(f.getElementsByTagName("*"));c.cleanData([f])}f.parentNode&&f.parentNode.removeChild(f)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild); -return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if(!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Ja,"").replace(/=([^="'>\s]+\/)>/g,'="$1">').replace(V,"")],f)[0]}else return this.cloneNode(true)});if(a===true){ra(this,b);ra(this.find("*"),b.find("*"))}return b},html:function(a){if(a===w)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Ja, -""):null;else if(typeof a==="string"&&!ta.test(a)&&(c.support.leadingWhitespace||!V.test(a))&&!F[(La.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Ka,Ma);try{for(var b=0,d=this.length;b0||e.cacheable||this.length>1?k.cloneNode(true):k)}o.length&&c.each(o,Qa)}return this}});c.fragments={};c.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var f=[];d=c(d);var e=this.length===1&&this[0].parentNode;if(e&&e.nodeType===11&&e.childNodes.length===1&&d.length===1){d[b](this[0]); -return this}else{e=0;for(var j=d.length;e0?this.clone(true):this).get();c.fn[b].apply(c(d[e]),i);f=f.concat(i)}return this.pushStack(f,a,d.selector)}}});c.extend({clean:function(a,b,d,f){b=b||s;if(typeof b.createElement==="undefined")b=b.ownerDocument||b[0]&&b[0].ownerDocument||s;for(var e=[],j=0,i;(i=a[j])!=null;j++){if(typeof i==="number")i+="";if(i){if(typeof i==="string"&&!jb.test(i))i=b.createTextNode(i);else if(typeof i==="string"){i=i.replace(Ka,Ma);var o=(La.exec(i)||["", -""])[1].toLowerCase(),k=F[o]||F._default,n=k[0],r=b.createElement("div");for(r.innerHTML=k[1]+i+k[2];n--;)r=r.lastChild;if(!c.support.tbody){n=ib.test(i);o=o==="table"&&!n?r.firstChild&&r.firstChild.childNodes:k[1]===""&&!n?r.childNodes:[];for(k=o.length-1;k>=0;--k)c.nodeName(o[k],"tbody")&&!o[k].childNodes.length&&o[k].parentNode.removeChild(o[k])}!c.support.leadingWhitespace&&V.test(i)&&r.insertBefore(b.createTextNode(V.exec(i)[0]),r.firstChild);i=r.childNodes}if(i.nodeType)e.push(i);else e= -c.merge(e,i)}}if(d)for(j=0;e[j];j++)if(f&&c.nodeName(e[j],"script")&&(!e[j].type||e[j].type.toLowerCase()==="text/javascript"))f.push(e[j].parentNode?e[j].parentNode.removeChild(e[j]):e[j]);else{e[j].nodeType===1&&e.splice.apply(e,[j+1,0].concat(c.makeArray(e[j].getElementsByTagName("script"))));d.appendChild(e[j])}return e},cleanData:function(a){for(var b,d,f=c.cache,e=c.event.special,j=c.support.deleteExpando,i=0,o;(o=a[i])!=null;i++)if(d=o[c.expando]){b=f[d];if(b.events)for(var k in b.events)e[k]? -c.event.remove(o,k):Ca(o,k,b.handle);if(j)delete o[c.expando];else o.removeAttribute&&o.removeAttribute(c.expando);delete f[d]}}});var kb=/z-?index|font-?weight|opacity|zoom|line-?height/i,Na=/alpha\([^)]*\)/,Oa=/opacity=([^)]*)/,ha=/float/i,ia=/-([a-z])/ig,lb=/([A-Z])/g,mb=/^-?\d+(?:px)?$/i,nb=/^-?\d/,ob={position:"absolute",visibility:"hidden",display:"block"},pb=["Left","Right"],qb=["Top","Bottom"],rb=s.defaultView&&s.defaultView.getComputedStyle,Pa=c.support.cssFloat?"cssFloat":"styleFloat",ja= -function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){return X(this,a,b,true,function(d,f,e){if(e===w)return c.curCSS(d,f);if(typeof e==="number"&&!kb.test(f))e+="px";c.style(d,f,e)})};c.extend({style:function(a,b,d){if(!a||a.nodeType===3||a.nodeType===8)return w;if((b==="width"||b==="height")&&parseFloat(d)<0)d=w;var f=a.style||a,e=d!==w;if(!c.support.opacity&&b==="opacity"){if(e){f.zoom=1;b=parseInt(d,10)+""==="NaN"?"":"alpha(opacity="+d*100+")";a=f.filter||c.curCSS(a,"filter")||"";f.filter= -Na.test(a)?a.replace(Na,b):b}return f.filter&&f.filter.indexOf("opacity=")>=0?parseFloat(Oa.exec(f.filter)[1])/100+"":""}if(ha.test(b))b=Pa;b=b.replace(ia,ja);if(e)f[b]=d;return f[b]},css:function(a,b,d,f){if(b==="width"||b==="height"){var e,j=b==="width"?pb:qb;function i(){e=b==="width"?a.offsetWidth:a.offsetHeight;f!=="border"&&c.each(j,function(){f||(e-=parseFloat(c.curCSS(a,"padding"+this,true))||0);if(f==="margin")e+=parseFloat(c.curCSS(a,"margin"+this,true))||0;else e-=parseFloat(c.curCSS(a, -"border"+this+"Width",true))||0})}a.offsetWidth!==0?i():c.swap(a,ob,i);return Math.max(0,Math.round(e))}return c.curCSS(a,b,d)},curCSS:function(a,b,d){var f,e=a.style;if(!c.support.opacity&&b==="opacity"&&a.currentStyle){f=Oa.test(a.currentStyle.filter||"")?parseFloat(RegExp.$1)/100+"":"";return f===""?"1":f}if(ha.test(b))b=Pa;if(!d&&e&&e[b])f=e[b];else if(rb){if(ha.test(b))b="float";b=b.replace(lb,"-$1").toLowerCase();e=a.ownerDocument.defaultView;if(!e)return null;if(a=e.getComputedStyle(a,null))f= -a.getPropertyValue(b);if(b==="opacity"&&f==="")f="1"}else if(a.currentStyle){d=b.replace(ia,ja);f=a.currentStyle[b]||a.currentStyle[d];if(!mb.test(f)&&nb.test(f)){b=e.left;var j=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;e.left=d==="fontSize"?"1em":f||0;f=e.pixelLeft+"px";e.left=b;a.runtimeStyle.left=j}}return f},swap:function(a,b,d){var f={};for(var e in b){f[e]=a.style[e];a.style[e]=b[e]}d.call(a);for(e in b)a.style[e]=f[e]}});if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b= -a.offsetWidth,d=a.offsetHeight,f=a.nodeName.toLowerCase()==="tr";return b===0&&d===0&&!f?true:b>0&&d>0&&!f?false:c.curCSS(a,"display")==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var sb=J(),tb=//gi,ub=/select|textarea/i,vb=/color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,N=/=\?(&|$)/,ka=/\?/,wb=/(\?|&)_=.*?(&|$)/,xb=/^(\w+:)?\/\/([^\/?#]+)/,yb=/%20/g,zb=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!== -"string")return zb.call(this,a);else if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var e=a.slice(f,a.length);a=a.slice(0,f)}f="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b==="object"){b=c.param(b,c.ajaxSettings.traditional);f="POST"}var j=this;c.ajax({url:a,type:f,dataType:"html",data:b,complete:function(i,o){if(o==="success"||o==="notmodified")j.html(e?c("
    ").append(i.responseText.replace(tb,"")).find(e):i.responseText);d&&j.each(d,[i.responseText,o,i])}});return this}, -serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ub.test(this.nodeName)||vb.test(this.type))}).map(function(a,b){a=c(this).val();return a==null?null:c.isArray(a)?c.map(a,function(d){return{name:b.name,value:d}}):{name:b.name,value:a}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "), -function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:f})},getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:f})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href, -global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:A.XMLHttpRequest&&(A.location.protocol!=="file:"||!A.ActiveXObject)?function(){return new A.XMLHttpRequest}:function(){try{return new A.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},etag:{},ajax:function(a){function b(){e.success&& -e.success.call(k,o,i,x);e.global&&f("ajaxSuccess",[x,e])}function d(){e.complete&&e.complete.call(k,x,i);e.global&&f("ajaxComplete",[x,e]);e.global&&!--c.active&&c.event.trigger("ajaxStop")}function f(q,p){(e.context?c(e.context):c.event).trigger(q,p)}var e=c.extend(true,{},c.ajaxSettings,a),j,i,o,k=a&&a.context||e,n=e.type.toUpperCase();if(e.data&&e.processData&&typeof e.data!=="string")e.data=c.param(e.data,e.traditional);if(e.dataType==="jsonp"){if(n==="GET")N.test(e.url)||(e.url+=(ka.test(e.url)? -"&":"?")+(e.jsonp||"callback")+"=?");else if(!e.data||!N.test(e.data))e.data=(e.data?e.data+"&":"")+(e.jsonp||"callback")+"=?";e.dataType="json"}if(e.dataType==="json"&&(e.data&&N.test(e.data)||N.test(e.url))){j=e.jsonpCallback||"jsonp"+sb++;if(e.data)e.data=(e.data+"").replace(N,"="+j+"$1");e.url=e.url.replace(N,"="+j+"$1");e.dataType="script";A[j]=A[j]||function(q){o=q;b();d();A[j]=w;try{delete A[j]}catch(p){}z&&z.removeChild(C)}}if(e.dataType==="script"&&e.cache===null)e.cache=false;if(e.cache=== -false&&n==="GET"){var r=J(),u=e.url.replace(wb,"$1_="+r+"$2");e.url=u+(u===e.url?(ka.test(e.url)?"&":"?")+"_="+r:"")}if(e.data&&n==="GET")e.url+=(ka.test(e.url)?"&":"?")+e.data;e.global&&!c.active++&&c.event.trigger("ajaxStart");r=(r=xb.exec(e.url))&&(r[1]&&r[1]!==location.protocol||r[2]!==location.host);if(e.dataType==="script"&&n==="GET"&&r){var z=s.getElementsByTagName("head")[0]||s.documentElement,C=s.createElement("script");C.src=e.url;if(e.scriptCharset)C.charset=e.scriptCharset;if(!j){var B= -false;C.onload=C.onreadystatechange=function(){if(!B&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){B=true;b();d();C.onload=C.onreadystatechange=null;z&&C.parentNode&&z.removeChild(C)}}}z.insertBefore(C,z.firstChild);return w}var E=false,x=e.xhr();if(x){e.username?x.open(n,e.url,e.async,e.username,e.password):x.open(n,e.url,e.async);try{if(e.data||a&&a.contentType)x.setRequestHeader("Content-Type",e.contentType);if(e.ifModified){c.lastModified[e.url]&&x.setRequestHeader("If-Modified-Since", -c.lastModified[e.url]);c.etag[e.url]&&x.setRequestHeader("If-None-Match",c.etag[e.url])}r||x.setRequestHeader("X-Requested-With","XMLHttpRequest");x.setRequestHeader("Accept",e.dataType&&e.accepts[e.dataType]?e.accepts[e.dataType]+", */*":e.accepts._default)}catch(ga){}if(e.beforeSend&&e.beforeSend.call(k,x,e)===false){e.global&&!--c.active&&c.event.trigger("ajaxStop");x.abort();return false}e.global&&f("ajaxSend",[x,e]);var g=x.onreadystatechange=function(q){if(!x||x.readyState===0||q==="abort"){E|| -d();E=true;if(x)x.onreadystatechange=c.noop}else if(!E&&x&&(x.readyState===4||q==="timeout")){E=true;x.onreadystatechange=c.noop;i=q==="timeout"?"timeout":!c.httpSuccess(x)?"error":e.ifModified&&c.httpNotModified(x,e.url)?"notmodified":"success";var p;if(i==="success")try{o=c.httpData(x,e.dataType,e)}catch(v){i="parsererror";p=v}if(i==="success"||i==="notmodified")j||b();else c.handleError(e,x,i,p);d();q==="timeout"&&x.abort();if(e.async)x=null}};try{var h=x.abort;x.abort=function(){x&&h.call(x); -g("abort")}}catch(l){}e.async&&e.timeout>0&&setTimeout(function(){x&&!E&&g("timeout")},e.timeout);try{x.send(n==="POST"||n==="PUT"||n==="DELETE"?e.data:null)}catch(m){c.handleError(e,x,null,m);d()}e.async||g();return x}},handleError:function(a,b,d,f){if(a.error)a.error.call(a.context||a,b,d,f);if(a.global)(a.context?c(a.context):c.event).trigger("ajaxError",[b,a,f])},active:0,httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status=== -1223||a.status===0}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),f=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(f)c.etag[b]=f;return a.status===304||a.status===0},httpData:function(a,b,d){var f=a.getResponseHeader("content-type")||"",e=b==="xml"||!b&&f.indexOf("xml")>=0;a=e?a.responseXML:a.responseText;e&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b=== -"json"||!b&&f.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&f.indexOf("javascript")>=0)c.globalEval(a);return a},param:function(a,b){function d(i,o){if(c.isArray(o))c.each(o,function(k,n){b||/\[\]$/.test(i)?f(i,n):d(i+"["+(typeof n==="object"||c.isArray(n)?k:"")+"]",n)});else!b&&o!=null&&typeof o==="object"?c.each(o,function(k,n){d(i+"["+k+"]",n)}):f(i,o)}function f(i,o){o=c.isFunction(o)?o():o;e[e.length]=encodeURIComponent(i)+"="+encodeURIComponent(o)}var e=[];if(b===w)b=c.ajaxSettings.traditional; -if(c.isArray(a)||a.jquery)c.each(a,function(){f(this.name,this.value)});else for(var j in a)d(j,a[j]);return e.join("&").replace(yb,"+")}});var la={},Ab=/toggle|show|hide/,Bb=/^([+-]=)?([\d+-.]+)(.*)$/,W,va=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b){if(a||a===0)return this.animate(K("show",3),a,b);else{a=0;for(b=this.length;a").appendTo("body");f=e.css("display");if(f==="none")f="block";e.remove();la[d]=f}c.data(this[a],"olddisplay",f)}}a=0;for(b=this.length;a=0;f--)if(d[f].elem===this){b&&d[f](true);d.splice(f,1)}});b||this.dequeue();return this}});c.each({slideDown:K("show",1),slideUp:K("hide",1),slideToggle:K("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(a,b){c.fn[a]=function(d,f){return this.animate(b,d,f)}});c.extend({speed:function(a,b,d){var f=a&&typeof a==="object"?a:{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};f.duration=c.fx.off?0:typeof f.duration=== -"number"?f.duration:c.fx.speeds[f.duration]||c.fx.speeds._default;f.old=f.complete;f.complete=function(){f.queue!==false&&c(this).dequeue();c.isFunction(f.old)&&f.old.call(this)};return f},easing:{linear:function(a,b,d,f){return d+f*a},swing:function(a,b,d,f){return(-Math.cos(a*Math.PI)/2+0.5)*f+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]|| -c.fx.step._default)(this);if((this.prop==="height"||this.prop==="width")&&this.elem.style)this.elem.style.display="block"},cur:function(a){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];return(a=parseFloat(c.css(this.elem,this.prop,a)))&&a>-10000?a:parseFloat(c.curCSS(this.elem,this.prop))||0},custom:function(a,b,d){function f(j){return e.step(j)}this.startTime=J();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start; -this.pos=this.state=0;var e=this;f.elem=this.elem;if(f()&&c.timers.push(f)&&!W)W=setInterval(c.fx.tick,13)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(a){var b=J(),d=true;if(a||b>=this.options.duration+this.startTime){this.now= -this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var f in this.options.curAnim)if(this.options.curAnim[f]!==true)d=false;if(d){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;a=c.data(this.elem,"olddisplay");this.elem.style.display=a?a:this.options.display;if(c.css(this.elem,"display")==="none")this.elem.style.display="block"}this.options.hide&&c(this.elem).hide();if(this.options.hide||this.options.show)for(var e in this.options.curAnim)c.style(this.elem, -e,this.options.orig[e]);this.options.complete.call(this.elem)}return false}else{e=b-this.startTime;this.state=e/this.options.duration;a=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||a](this.state,e,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=c.timers,b=0;b
    "; -a.insertBefore(b,a.firstChild);d=b.firstChild;f=d.firstChild;e=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=f.offsetTop!==5;this.doesAddBorderForTableAndCells=e.offsetTop===5;f.style.position="fixed";f.style.top="20px";this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15;f.style.position=f.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==j;a.removeChild(b); -c.offset.initialize=c.noop},bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.curCSS(a,"marginTop",true))||0;d+=parseFloat(c.curCSS(a,"marginLeft",true))||0}return{top:b,left:d}},setOffset:function(a,b,d){if(/static/.test(c.curCSS(a,"position")))a.style.position="relative";var f=c(a),e=f.offset(),j=parseInt(c.curCSS(a,"top",true),10)||0,i=parseInt(c.curCSS(a,"left",true),10)||0;if(c.isFunction(b))b=b.call(a, -d,e);d={top:b.top-e.top+j,left:b.left-e.left+i};"using"in b?b.using.call(a,d):f.css(d)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),f=/^body|html$/i.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.curCSS(a,"marginTop",true))||0;d.left-=parseFloat(c.curCSS(a,"marginLeft",true))||0;f.top+=parseFloat(c.curCSS(b[0],"borderTopWidth",true))||0;f.left+=parseFloat(c.curCSS(b[0],"borderLeftWidth",true))||0;return{top:d.top- -f.top,left:d.left-f.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||s.body;a&&!/^body|html$/i.test(a.nodeName)&&c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(f){var e=this[0],j;if(!e)return null;if(f!==w)return this.each(function(){if(j=wa(this))j.scrollTo(!a?f:c(j).scrollLeft(),a?f:c(j).scrollTop());else this[d]=f});else return(j=wa(e))?"pageXOffset"in j?j[a?"pageYOffset": -"pageXOffset"]:c.support.boxModel&&j.document.documentElement[d]||j.document.body[d]:e[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();c.fn["inner"+b]=function(){return this[0]?c.css(this[0],d,false,"padding"):null};c.fn["outer"+b]=function(f){return this[0]?c.css(this[0],d,false,f?"margin":"border"):null};c.fn[d]=function(f){var e=this[0];if(!e)return f==null?null:this;if(c.isFunction(f))return this.each(function(j){var i=c(this);i[d](f.call(this,j,i[d]()))});return"scrollTo"in -e&&e.document?e.document.compatMode==="CSS1Compat"&&e.document.documentElement["client"+b]||e.document.body["client"+b]:e.nodeType===9?Math.max(e.documentElement["client"+b],e.body["scroll"+b],e.documentElement["scroll"+b],e.body["offset"+b],e.documentElement["offset"+b]):f===w?c.css(e,d):this.css(d,typeof f==="string"?f:f+"px")}});A.jQuery=A.$=c})(window); From 0d4b992bc66c6c6885c52d6e1d758b8fa078c486 Mon Sep 17 00:00:00 2001 From: mespeche Date: Fri, 30 Aug 2013 08:54:03 +0200 Subject: [PATCH 029/125] WIP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Réorganisation des scripts --- templates/admin/default/coupon/list.html | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/templates/admin/default/coupon/list.html b/templates/admin/default/coupon/list.html index f5c7b1508..3b13d6eac 100755 --- a/templates/admin/default/coupon/list.html +++ b/templates/admin/default/coupon/list.html @@ -176,6 +176,10 @@ {/javascripts} +{javascripts file='../assets/js/tablesorter/jquery.tablesorter.min.js'} + +{/javascripts} + -{javascripts file='../assets/js/tablesorter/jquery.tablesorter.min.js'} - -{/javascripts} - - -{include file='includes/footer.inc.html'} +{include file='includes/footer.inc.html'} \ No newline at end of file From 71fa04a1936d180a76a3e4a8edc026ad64f1b03e Mon Sep 17 00:00:00 2001 From: gmorel Date: Fri, 30 Aug 2013 11:06:33 +0200 Subject: [PATCH 030/125] WIP - Update Coupon Controller/Form/Event - create() - Rule serialization/unserialization managed in Model/Coupon now --- .../Controller/Admin/CouponController.php | 52 +++++- .../Core/Event/Coupon/CouponCreateEvent.php | 83 +++++---- .../Core/Event/Coupon/CouponEditEvent.php | 82 +++++++++ core/lib/Thelia/Core/Event/TheliaEvents.php | 52 ++++++ core/lib/Thelia/Form/CouponCreationForm.php | 168 ++++++++++++++++++ core/lib/Thelia/Model/Coupon.php | 70 +++++++- install/sqldb.map | 2 - 7 files changed, 463 insertions(+), 46 deletions(-) create mode 100644 core/lib/Thelia/Core/Event/Coupon/CouponEditEvent.php create mode 100755 core/lib/Thelia/Form/CouponCreationForm.php delete mode 100644 install/sqldb.map diff --git a/core/lib/Thelia/Controller/Admin/CouponController.php b/core/lib/Thelia/Controller/Admin/CouponController.php index b1cf197c8..a4555bfd2 100755 --- a/core/lib/Thelia/Controller/Admin/CouponController.php +++ b/core/lib/Thelia/Controller/Admin/CouponController.php @@ -23,8 +23,13 @@ namespace Thelia\Controller\Admin; +use Thelia\Core\Event\Coupon\CouponCreateEvent; +use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Security\Exception\AuthenticationException; use Thelia\Core\Security\Exception\AuthorizationException; +use Thelia\Coupon\CouponRuleCollection; +use Thelia\Form\CouponCreationForm; +use Thelia\Model\Coupon; /** * Created by JetBrains PhpStorm. @@ -74,6 +79,52 @@ class CouponController extends BaseAdminController { $this->checkAuth("ADMIN", "admin.coupon.view"); + + if ($this->getRequest()->isMethod('POST')) { + + $couponCreationForm = new CouponCreationForm($this->getRequest()); + + $form = $this->validateForm($couponCreationForm, "POST"); + + $data = $form->getData(); + + $couponBeingCreated = new Coupon(); + $couponBeingCreated->setCode($data["code"]); + $couponBeingCreated->setType($data["type"]); + $couponBeingCreated->setTitle($data["title"]); + $couponBeingCreated->setShortDescription($data["shortDescription"]); + $couponBeingCreated->setDescription($data["description"]); + $couponBeingCreated->setAmount($data["amount"]); + $couponBeingCreated->setIsEnabled($data["isEnabled"]); + $couponBeingCreated->setExpirationDate($data["expirationDate"]); + $couponBeingCreated->setSerializedRules( + new CouponRuleCollection( + array() + ) + ); + $couponBeingCreated->setIsCumulative($data["isCumulative"]); + $couponBeingCreated->setIsRemovingPostage($data["isRemovingPostage"]); + $couponBeingCreated->setMaxUsage($data["maxUsage"]); + $couponBeingCreated->setIsAvailableOnSpecialOffers($data["isAvailableOnSpecialOffers"]); + + $couponCreateEvent = new CouponCreateEvent( + $couponBeingCreated + ); + + $this->dispatch(TheliaEvents::BEFORE_CREATE_COUPON, $couponCreateEvent); + // @todo Save + $this->adminLogAppend( + sprintf( + 'Coupon %s (ID %s) created', + $couponBeingCreated->getTitle(), + $couponBeingCreated->getId() + ) + ); + $this->dispatch(TheliaEvents::AFTER_CREATE_COUPON, $couponCreateEvent); + } else { + + } + return $this->render('coupon/edit', $args); } @@ -114,7 +165,6 @@ class CouponController extends BaseAdminController */ public function processAction() { - var_dump($this->getRequest()->attributes); // Get the current action $action = $this->getRequest()->get('action', 'browse'); diff --git a/core/lib/Thelia/Core/Event/Coupon/CouponCreateEvent.php b/core/lib/Thelia/Core/Event/Coupon/CouponCreateEvent.php index c03e21f17..9f0db34df 100644 --- a/core/lib/Thelia/Core/Event/Coupon/CouponCreateEvent.php +++ b/core/lib/Thelia/Core/Event/Coupon/CouponCreateEvent.php @@ -22,61 +22,60 @@ /**********************************************************************************/ namespace Thelia\Core\Event\Coupon; - +use Thelia\Core\Event\ActionEvent; use Thelia\Model\Coupon; +/** + * Created by JetBrains PhpStorm. + * Date: 8/29/13 + * Time: 3:45 PM + * + * Occurring when a Coupon is created + * + * @package Coupon + * @author Guillaume MOREL + * + */ class CouponCreateEvent extends ActionEvent { - protected $title; - protected $parent; - protected $locale; - protected $created_category; + /** + * @var Coupon Coupon being created + */ + protected $createdCoupon; - public function __construct($title, $parent, $locale) + /** + * Constructor + * + * @param Coupon $coupon Coupon being created + */ + public function __construct(Coupon $coupon) { - $this->title = $title; - $this->parent = $parent; - $this->locale = $locale; + $this->createdCoupon = $coupon; } - public function getTitle() + /** + * Modify Coupon being created + * + * @param Coupon $createdCoupon Coupon being created + * + * @return $this + */ + public function setCreatedCoupon(Coupon $createdCoupon) { - return $this->title; + $this->createdCoupon = $createdCoupon; + + return $this; } - public function setTitle($title) + /** + * Get Coupon being created + * + * @return Coupon + */ + public function getCreatedCoupon() { - $this->title = $title; + return clone $this->createdCoupon; } - public function getParent() - { - return $this->parent; - } - public function setParent($parent) - { - $this->parent = $parent; - } - - public function getLocale() - { - return $this->locale; - } - - public function setLocale($locale) - { - $this->locale = $locale; - } - - public function getCreatedCategory() - { - return $this->created_category; - } - - public function setCreatedCategory(Category $created_category) - { - $this->created_category = $created_category; -var_dump($this->created_category); - } } diff --git a/core/lib/Thelia/Core/Event/Coupon/CouponEditEvent.php b/core/lib/Thelia/Core/Event/Coupon/CouponEditEvent.php new file mode 100644 index 000000000..bdde56c40 --- /dev/null +++ b/core/lib/Thelia/Core/Event/Coupon/CouponEditEvent.php @@ -0,0 +1,82 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Core\Event\Coupon; +use Thelia\Core\Event\ActionEvent; +use Thelia\Model\Coupon; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/29/13 + * Time: 3:45 PM + * + * Occurring when a Coupon is edited + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class CouponEditEvent extends ActionEvent +{ + /** @var int Coupon being edited id */ + protected $couponId; + + /** @var Coupon Coupon being created */ + protected $editedCoupon; + + /** + * Constructor + * + * @param Coupon $coupon Coupon being edited + */ + public function __construct(Coupon $coupon) + { + $this->created_coupon = $coupon; + } + + /** + * Modify Coupon being created + * + * @param Coupon $editedCoupon Coupon being created + * + * @return $this + */ + public function setCreatedCoupon(Coupon $editedCoupon) + { + $this->editedCoupon = $editedCoupon; + + return $this; + } + + /** + * Get Coupon being created + * + * @return Coupon + */ + public function getCreatedCoupon() + { + return clone $this->editedCoupon; + } + + +} diff --git a/core/lib/Thelia/Core/Event/TheliaEvents.php b/core/lib/Thelia/Core/Event/TheliaEvents.php index 2dd85905d..ba0d97d2f 100755 --- a/core/lib/Thelia/Core/Event/TheliaEvents.php +++ b/core/lib/Thelia/Core/Event/TheliaEvents.php @@ -177,4 +177,56 @@ final class TheliaEvents * Sent on cimage cache clear request */ const IMAGE_CLEAR_CACHE = "action.clearImageCache"; + + + /** + * Sent just before a successful insert of a new Coupon in the database. + */ + + const BEFORE_CREATE_COUPON = "action.before_create_coupon"; + + /** + * Sent just after a successful insert of a new Coupon in the database. + */ + const AFTER_CREATE_COUPON = "action.after_create_coupon"; + + /** + * Sent just before a successful update of a new Coupon in the database. + */ + const BEFORE_EDIT_COUPON = "action.before_edit_coupon"; + + /** + * Sent just after a successful update of a new Coupon in the database. + */ + const AFTER_EDIT_COUPON = "action.after_edit_coupon"; + + /** + * Sent just before a successful disable of a new Coupon in the database. + */ + const BEFORE_DISABLE_COUPON = "action.before_disable_coupon"; + + /** + * Sent just after a successful disable of a new Coupon in the database. + */ + const AFTER_DISABLE_COUPON = "action.after_disable_coupon"; + + /** + * Sent just before a successful enable of a new Coupon in the database. + */ + const BEFORE_ENABLE_COUPON = "action.before_enable_coupon"; + + /** + * Sent just after a successful enable of a new Coupon in the database. + */ + const AFTER_ENABLE_COUPON = "action.after_enable_coupon"; + + /** + * Sent just before an attempt to use a Coupon + */ + const BEFORE_USE_COUPON = "action.before_use_coupon"; + + /** + * Sent just after an attempt to use a Coupon + */ + const AFTER_USE_COUPON = "action.after_use_coupon"; } diff --git a/core/lib/Thelia/Form/CouponCreationForm.php b/core/lib/Thelia/Form/CouponCreationForm.php new file mode 100755 index 000000000..39667cfdb --- /dev/null +++ b/core/lib/Thelia/Form/CouponCreationForm.php @@ -0,0 +1,168 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Form; + +use Symfony\Component\Validator\Constraints\NotBlank; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/29/13 + * Time: 3:45 PM + * + * Allow to build a form Coupon + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class CouponCreationForm extends BaseForm +{ + /** + * Build Coupon form + * + * @return void + */ + protected function buildForm() + { + $this->formBuilder + ->add( + "code", + "text", + array( + "constraints" => array( + new NotBlank() + ) + ) + ) + ->add( + "type", + "text", + array( + "constraints" => array( + new NotBlank() + ) + ) + ) + ->add( + "title", + "text", + array( + "constraints" => array( + new NotBlank() + ) + ) + ) + ->add( + "shortDescription", + "text", + array( + "constraints" => array( + new NotBlank() + ) + ) + ) + ->add( + "description", + "text", + array( + "constraints" => array( + new NotBlank() + ) + ) + ) + ->add( + "amount", + "text", + array( + "constraints" => array( + new NotBlank() + ) + ) + ) + ->add( + "isEnabled", + "text", + array( + "constraints" => array( + new NotBlank() + ) + ) + ) + ->add( + "expirationDate", + "text", + array( + "constraints" => array( + new NotBlank() + ) + ) + ) + ->add( + "isCumulative", + "text", + array( + "constraints" => array( + new NotBlank() + ) + ) + ) + ->add( + "isRemovingPostage", + "text", + array( + "constraints" => array( + new NotBlank() + ) + ) + ) + ->add( + "maxUsage", + "text", + array( + "constraints" => array( + new NotBlank() + ) + ) + ) + ->add( + "isAvailableOnSpecialOffers", + "text", + array( + "constraints" => array( + new NotBlank() + ) + ) + ); + } + + /** + * Get form name + * + * @return string + */ + public function getName() + { + return "thelia_coupon_creation"; + } +} diff --git a/core/lib/Thelia/Model/Coupon.php b/core/lib/Thelia/Model/Coupon.php index d135ccbb0..9718b5e36 100755 --- a/core/lib/Thelia/Model/Coupon.php +++ b/core/lib/Thelia/Model/Coupon.php @@ -1,9 +1,77 @@ . */ +/* */ +/**********************************************************************************/ namespace Thelia\Model; +use Thelia\Coupon\CouponRuleCollection; use Thelia\Model\Base\Coupon as BaseCoupon; -class Coupon extends BaseCoupon { +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Used to provide an effect (mostly a discount) + * at the end of the Customer checkout tunnel + * It will be usable for a Customer only if it matches the Coupon criteria (Rules) + * + * @package Coupon + * @author Guillaume MOREL + * + */ +class Coupon extends BaseCoupon +{ + /** + * Set the value of [serialized_rules] column. + * + * @param CouponRuleCollection $rules A set of Rules + * + * @return \Thelia\Model\Coupon The current object (for fluent API support) + */ + public function setSerializedRules(CouponRuleCollection $rules) + { + if ($rules !== null) { + $v = (string) base64_encode(serialize($rules)); + } + + if ($this->serialized_rules !== $v) { + $this->serialized_rules = $v; + $this->modifiedColumns[] = CouponTableMap::SERIALIZED_RULES; + } + + + return $this; + } // setSerializedRules() + + + /** + * Get the [serialized_rules] column value. + * + * @return CouponRuleCollection Rules ready to be processed + */ + public function getSerializedRules() + { + return unserialize(base64_decode($this->serialized_rules)); + } } diff --git a/install/sqldb.map b/install/sqldb.map deleted file mode 100644 index 63a93baa8..000000000 --- a/install/sqldb.map +++ /dev/null @@ -1,2 +0,0 @@ -# Sqlfile -> Database map -thelia.sql=thelia From fd63115c970555cd01d58a55d34ad446187fe311 Mon Sep 17 00:00:00 2001 From: gmorel Date: Fri, 30 Aug 2013 12:23:49 +0200 Subject: [PATCH 031/125] WIP - Update Coupon Controller/Form/Event - create() --- core/lib/Thelia/Action/Coupon.php | 109 ++++++++++++++++-- .../Controller/Admin/CouponController.php | 109 +++++++++++------- core/lib/Thelia/Core/Event/TheliaEvents.php | 22 +++- 3 files changed, 189 insertions(+), 51 deletions(-) diff --git a/core/lib/Thelia/Action/Coupon.php b/core/lib/Thelia/Action/Coupon.php index 331265b73..1958d556b 100755 --- a/core/lib/Thelia/Action/Coupon.php +++ b/core/lib/Thelia/Action/Coupon.php @@ -25,10 +25,14 @@ namespace Thelia\Action; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Thelia\Core\Event\ActionEvent; +use Thelia\Core\Event\Coupon\CouponCreateEvent; +use Thelia\Core\Event\Coupon\CouponDisableEvent; +use Thelia\Core\Event\Coupon\CouponEnableEvent; use Thelia\Core\Event\TheliaEvents; use Thelia\Model\Category as CategoryModel; use Thelia\Form\CategoryCreationForm; use Thelia\Core\Event\CategoryEvent; +use Thelia\Model\CouponQuery; use Thelia\Tools\Redirect; use Thelia\Model\CategoryQuery; use Thelia\Model\AdminLog; @@ -40,29 +44,114 @@ use Propel\Runtime\Propel; use Thelia\Model\Map\CategoryTableMap; use Propel\Runtime\Exception\PropelException; +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Process Coupon Events + * + * @package Coupon + * @author Guillaume MOREL + * + */ class Coupon extends BaseAction implements EventSubscriberInterface { + /** + * Create a Coupon if a Coupon creation attempt is found + * + * @param CouponCreateEvent $event Coupon creation Event + */ + public function create(CouponCreateEvent $event) + { + $this->checkAuth("ADMIN", "admin.coupon.create"); + + $this->dispatch( + TheliaEvents::BEFORE_CREATE_COUPON, + $event + ); + + $event->getCreatedCoupon()->save(); + + $this->dispatch( + TheliaEvents::AFTER_CREATE_COUPON, + $event + ); + } /** - * Disable a Coupon + * Edit a Coupon if a Coupon edition attempt is found * - * @param ActionEvent $event + * @param CouponEditEvent $event Coupon edition Event */ - public function delete(CategoryDeleteEvent $event) + public function edit(CouponEditEvent $event) { - $this->checkAuth("ADMIN", "admin.category.delete"); + $this->checkAuth("ADMIN", "admin.coupon.edit"); - $category = CategoryQuery::create()->findPk($event->getId()); + $this->dispatch( + TheliaEvents::BEFORE_EDIT_COUPON, + $event + ); - if ($category !== null) { + $couponToUpdate = CouponQuery::create()->findPk($event->getId()); - $event->setDeletedCategory($category); + if ($couponToUpdate !== null) { + $event->getCreatedCoupon()->save(); + } - $event->getDispatcher()->dispatch(TheliaEvents::BEFORE_DELETECATEGORY, $event); + $this->dispatch( + TheliaEvents::AFTER_EDIT_COUPON, + $event + ); + } - $category->delete(); + /** + * Disable a Coupon if a Coupon disable attempt is found + * + * @param CouponDisableEvent $event Coupon disable Event + */ + public function disable(CouponDisableEvent $event) + { + $this->checkAuth("ADMIN", "admin.coupon.disable"); - $event->getDispatcher()->dispatch(TheliaEvents::AFTER_DELETECATEGORY, $event); + $couponToUpdate = CouponQuery::create()->findPk($event->getId()); + + if ($couponToUpdate !== null) { + $couponToUpdate->setIsEnabled(0); + $event->getDispatcher()->dispatch( + TheliaEvents::BEFORE_DISABLE_COUPON, $event + ); + + $couponToUpdate->save(); + + $event->getDispatcher()->dispatch( + TheliaEvents::AFTER_DISABLE_COUPON, $event + ); + } + } + + /** + * Enable a Coupon if a Coupon enable attempt is found + * + * @param CouponEnableEvent $event Coupon enable Event + */ + public function enable(CouponEnableEvent $event) + { + $this->checkAuth("ADMIN", "admin.coupon.enable"); + + $couponToUpdate = CouponQuery::create()->findPk($event->getId()); + + if ($couponToUpdate !== null) { + $couponToUpdate->setIsEnabled(1); + $event->getDispatcher()->dispatch( + TheliaEvents::BEFORE_ENABLE_COUPON, $event + ); + + $couponToUpdate->save(); + + $event->getDispatcher()->dispatch( + TheliaEvents::AFTER_ENABLE_COUPON, $event + ); } } diff --git a/core/lib/Thelia/Controller/Admin/CouponController.php b/core/lib/Thelia/Controller/Admin/CouponController.php index a4555bfd2..ab018e245 100755 --- a/core/lib/Thelia/Controller/Admin/CouponController.php +++ b/core/lib/Thelia/Controller/Admin/CouponController.php @@ -29,6 +29,7 @@ use Thelia\Core\Security\Exception\AuthenticationException; use Thelia\Core\Security\Exception\AuthorizationException; use Thelia\Coupon\CouponRuleCollection; use Thelia\Form\CouponCreationForm; +use Thelia\Form\Exception\FormValidationException; use Thelia\Model\Coupon; /** @@ -79,53 +80,46 @@ class CouponController extends BaseAdminController { $this->checkAuth("ADMIN", "admin.coupon.view"); - if ($this->getRequest()->isMethod('POST')) { + try { + $couponCreationForm = new CouponCreationForm($this->getRequest()); + $couponBeingCreated = $this->buildCouponFromForm( + $this->validateForm($couponCreationForm, "POST")->getData() + ); - $couponCreationForm = new CouponCreationForm($this->getRequest()); + $couponCreateEvent = new CouponCreateEvent( + $couponBeingCreated + ); - $form = $this->validateForm($couponCreationForm, "POST"); - - $data = $form->getData(); - - $couponBeingCreated = new Coupon(); - $couponBeingCreated->setCode($data["code"]); - $couponBeingCreated->setType($data["type"]); - $couponBeingCreated->setTitle($data["title"]); - $couponBeingCreated->setShortDescription($data["shortDescription"]); - $couponBeingCreated->setDescription($data["description"]); - $couponBeingCreated->setAmount($data["amount"]); - $couponBeingCreated->setIsEnabled($data["isEnabled"]); - $couponBeingCreated->setExpirationDate($data["expirationDate"]); - $couponBeingCreated->setSerializedRules( - new CouponRuleCollection( - array() - ) - ); - $couponBeingCreated->setIsCumulative($data["isCumulative"]); - $couponBeingCreated->setIsRemovingPostage($data["isRemovingPostage"]); - $couponBeingCreated->setMaxUsage($data["maxUsage"]); - $couponBeingCreated->setIsAvailableOnSpecialOffers($data["isAvailableOnSpecialOffers"]); - - $couponCreateEvent = new CouponCreateEvent( - $couponBeingCreated - ); - - $this->dispatch(TheliaEvents::BEFORE_CREATE_COUPON, $couponCreateEvent); - // @todo Save - $this->adminLogAppend( - sprintf( - 'Coupon %s (ID %s) created', - $couponBeingCreated->getTitle(), - $couponBeingCreated->getId() - ) - ); - $this->dispatch(TheliaEvents::AFTER_CREATE_COUPON, $couponCreateEvent); + $this->dispatch( + TheliaEvents::CREATE_COUPON, + $couponCreateEvent + ); + $this->adminLogAppend( + sprintf( + 'Coupon %s (ID %s) created', + $couponBeingCreated->getTitle(), + $couponBeingCreated->getId() + ) + ); + // @todo redirect if successful + } catch (FormValidationException $e) { + $couponCreationForm->setErrorMessage($e->getMessage()); + $this->getParserContext()->setErrorForm($couponCreationForm); + } catch (\Exception $e) { + Tlog::getInstance()->error( + sprintf( + "Failed to create coupon: %s", + $e->getMessage() + ) + ); + $this->getParserContext()->setGeneralError($e->getMessage()); + } } else { } - return $this->render('coupon/edit', $args); + return $this->render('coupon/edit', array()); } /** @@ -196,4 +190,39 @@ class CouponController extends BaseAdminController // We did not recognized the action -> return a 404 page return $this->pageNotFound(); } + + /** + * Build a Coupon from its form + * + * @param array $data Form data + * + * @return Coupon + */ + protected function buildCouponFromForm(array $data) + { + $couponBeingCreated = new Coupon(); + $couponBeingCreated->setCode($data["code"]); + $couponBeingCreated->setType($data["type"]); + $couponBeingCreated->setTitle($data["title"]); + $couponBeingCreated->setShortDescription($data["shortDescription"]); + $couponBeingCreated->setDescription($data["description"]); + $couponBeingCreated->setAmount($data["amount"]); + $couponBeingCreated->setIsEnabled($data["isEnabled"]); + $couponBeingCreated->setExpirationDate($data["expirationDate"]); + $couponBeingCreated->setSerializedRules( + new CouponRuleCollection( + array() + ) + ); + $couponBeingCreated->setIsCumulative($data["isCumulative"]); + $couponBeingCreated->setIsRemovingPostage( + $data["isRemovingPostage"] + ); + $couponBeingCreated->setMaxUsage($data["maxUsage"]); + $couponBeingCreated->setIsAvailableOnSpecialOffers( + $data["isAvailableOnSpecialOffers"] + ); + + return $couponBeingCreated; + } } diff --git a/core/lib/Thelia/Core/Event/TheliaEvents.php b/core/lib/Thelia/Core/Event/TheliaEvents.php index ba0d97d2f..8460efda9 100755 --- a/core/lib/Thelia/Core/Event/TheliaEvents.php +++ b/core/lib/Thelia/Core/Event/TheliaEvents.php @@ -179,10 +179,15 @@ final class TheliaEvents const IMAGE_CLEAR_CACHE = "action.clearImageCache"; + + /** + * Sent when creating a Coupon + */ + const COUPON_CREATE = "action.create_coupon"; + /** * Sent just before a successful insert of a new Coupon in the database. */ - const BEFORE_CREATE_COUPON = "action.before_create_coupon"; /** @@ -190,6 +195,11 @@ final class TheliaEvents */ const AFTER_CREATE_COUPON = "action.after_create_coupon"; + /** + * Sent when editing a Coupon + */ + const COUPON_EDIT = "action.edit_coupon"; + /** * Sent just before a successful update of a new Coupon in the database. */ @@ -200,6 +210,11 @@ final class TheliaEvents */ const AFTER_EDIT_COUPON = "action.after_edit_coupon"; + /** + * Sent when disabling a Coupon + */ + const COUPON_DISABLE = "action.disable_coupon"; + /** * Sent just before a successful disable of a new Coupon in the database. */ @@ -210,6 +225,11 @@ final class TheliaEvents */ const AFTER_DISABLE_COUPON = "action.after_disable_coupon"; + /** + * Sent when enabling a Coupon + */ + const COUPON_ENABLE = "action.enable_coupon"; + /** * Sent just before a successful enable of a new Coupon in the database. */ From e5f8f65f77bbc2e870051c45589b9665ff575430 Mon Sep 17 00:00:00 2001 From: mespeche Date: Fri, 30 Aug 2013 15:47:13 +0200 Subject: [PATCH 032/125] WIP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Suite de mise en place de la page d'édition des coupons avec miniBrowser --- templates/admin/default/assets/css/admin.less | 17 +- templates/admin/default/assets/js/main.js | 116 ++++++++ templates/admin/default/coupon/edit.html | 270 +++++++++++++++--- templates/admin/default/coupon/list.html | 25 +- templates/admin/default/coupon/read.html | 23 +- web/test_to_remove/datas_coupon_edit.json | 85 ++++++ 6 files changed, 454 insertions(+), 82 deletions(-) create mode 100644 templates/admin/default/assets/js/main.js create mode 100644 web/test_to_remove/datas_coupon_edit.json diff --git a/templates/admin/default/assets/css/admin.less b/templates/admin/default/assets/css/admin.less index a9ca23bf1..e2ef57293 100755 --- a/templates/admin/default/assets/css/admin.less +++ b/templates/admin/default/assets/css/admin.less @@ -47,7 +47,7 @@ filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@startColor),argb(@endColor))); // IE9 and down } .vertical(@startColor: #555, @endColor: #333) { - background-color: mix(@startColor, @endColor, 60%); + background-color: @endColor; background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+ background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+ @@ -158,7 +158,7 @@ hr { } .btn-primary, .btn-large { - #gradient > .vertical(rgb(243,153,34), rgb(227,83,11)); + #gradient > .vertical(rgb(243,153,34), rgb(227,83,11)); box-shadow: inset 0px 0px 2px rgba(250,250,250,0.5), 0px 1px 3px rgba(0,0,0,0.2); color: white; } @@ -874,9 +874,18 @@ label { .input-append, .input-prepend { &.date { - .add-on span { + span.add-on span { display: block; cursor: pointer; } } -} \ No newline at end of file +} + +// -- Rules form ----------------------------------------------------- +.input-append{ + button.add-on{ + height: auto; + } +} + + diff --git a/templates/admin/default/assets/js/main.js b/templates/admin/default/assets/js/main.js new file mode 100644 index 000000000..7b5cc812f --- /dev/null +++ b/templates/admin/default/assets/js/main.js @@ -0,0 +1,116 @@ +(function($, window, document){ + + $(function($){ + + // -- Init datepicker -- + if($('.date').length){ + $('.date').datepicker(); + } + + // -- Init tablesorter -- + if($('.tablesorter').length){ + $('.tablesorter').tablesorter(); + } + + // -- Effect description + if($('[name=effect]').length){ + var $effectSelect = $('[name=effect]'), + $helpBlock = $effectSelect.next('.help-block'); + + $effectSelect.change(function(){ + var description = $(this).find(":selected").data('description'); + $helpBlock.text(description); + }); + } + + // -- Confirm Box -- + if($('[data-toggle="confirm"]').length){ + $('[data-toggle="confirm"]').click(function(e){ + + var $link = $(this); + var modal = $(this).data('target'); + + $(modal).modal('show'); + + $(modal).on('shown', function () { + $('[data-confirm]').attr('href', $link.attr('href')); + }); + + if($(modal).is(':hidden')){ + e.preventDefault(); + } + + }); + } + + }); + + + +}(window.jQuery, window, document)); + +// -- Mini browser -- +function miniBrowser(root, url){ + + $.getJSON(url, { + root: root + }) + .done(function(data) { + var resultat = data; + + var breadcrumb = $('
    '); + $(resultat.breadcrumb).each(function(k, v){ + breadcrumb.append( + $('').html(' > '), + $('').attr('href', '#').html(v.display).click(function(e){ + e.preventDefault(); + + miniBrowser(v.url) + }) + ); + }); + + var categories = $('
    '); + $(resultat.categories).each(function(k, v){ + categories.append( + $('

    ').append( + $('').attr('href', '#').html(v.titre).click(function(e){ + e.preventDefault(); + + miniBrowser(v.id) + }) + ) + ); + }); + + var products = $('

    '); + $(resultat.products).each(function(k, v){ + products.append( + $('

    ').append( + $('').attr('href', '#').html(v.titre).click(function(e){ + e.preventDefault(); + + $('#productToAdd_ref').val(v.ref); + $('#productToAdd_titre').val(v.titre); + $('#productToAdd_quantite').val(1); + + manageStock(v.variants, v.promo?v.prix2:v.prix); + + $('#productToAdd_tva').val(v.tva); + + $('.productToAddInformation').show(); + $('#btn_ajout_produit').show(); + }) + ) + ); + }); + + $('#fastBrowser_breadcrumb').unbind().empty().append(breadcrumb); + $('#fastBrowser_categories').unbind().empty().append(categories); + $('#fastBrowser_products').unbind().empty().append(products); + }) + .fail(function() { + console.log('The JSON file cant be read'); + }); + +} \ No newline at end of file diff --git a/templates/admin/default/coupon/edit.html b/templates/admin/default/coupon/edit.html index 56c2b6229..4ad8f28c0 100755 --- a/templates/admin/default/coupon/edit.html +++ b/templates/admin/default/coupon/edit.html @@ -17,12 +17,12 @@

    Coupons : Add a coupon

    + +
    -
    -
    - - - +
    +
    +
    @@ -35,72 +35,270 @@
    + +
    + +
    -
    - +
    - - + +
    -
    - - - More description n°1 about item -
    +
    +
    + + + More description n°1 about item +
    +
    + +
    +
    + + +
    +
    + + +
    +
    +
    + +
    + +
    + + +
    + +
    + + +
    + + + +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + Rules + + + +
    ConditionsOperatorValueActions
    Total Amount>=300 + Edit + Delete +
    AND NbArticleFromCategory=12 - Chaussettes rouges + Edit + Delete +
    OR Date<=12/02/2014 + Edit + Delete +
    +
    +
    + +
    +
    + +
    + + +
    - +
    + + -
    -
    + + + + + +
    + +
    + +
    + +
    + + +
    +
    + + +
    + +
    + + + +
    +
    + + +
    + + + + + + + + + + + + + + + +
    + + + +
    + +
    + +
    + +
    + + + + + {include file='includes/js.inc.html'} {javascripts file='../assets/bootstrap-datepicker/js/bootstrap-datepicker.js'} {/javascripts} +{javascripts file='../assets/js/main.js'} + +{/javascripts} + diff --git a/templates/admin/default/coupon/list.html b/templates/admin/default/coupon/list.html index 3b13d6eac..882b27005 100755 --- a/templates/admin/default/coupon/list.html +++ b/templates/admin/default/coupon/list.html @@ -180,27 +180,8 @@ {/javascripts} - +{javascripts file='../assets/js/main.js'} + +{/javascripts} {include file='includes/footer.inc.html'} \ No newline at end of file diff --git a/templates/admin/default/coupon/read.html b/templates/admin/default/coupon/read.html index 9161f0d72..c4f61a022 100755 --- a/templates/admin/default/coupon/read.html +++ b/templates/admin/default/coupon/read.html @@ -99,25 +99,8 @@ {/javascripts} - - +{javascripts file='../assets/js/main.js'} + +{/javascripts} {include file='includes/footer.inc.html'} diff --git a/web/test_to_remove/datas_coupon_edit.json b/web/test_to_remove/datas_coupon_edit.json new file mode 100644 index 000000000..d64345682 --- /dev/null +++ b/web/test_to_remove/datas_coupon_edit.json @@ -0,0 +1,85 @@ +{ + "breadcrumb" : [ + { + "url" : "0", + "display" : "Racine", + "edit" : "", + "browse" : "" + } + ], + "categories" : [ + { + "id" : "1", + "ligne" : "1", + "classement" : "1", + "titre" : "Boyaux", + "langue_courante" : true, + "parent" : 0 + }, + { + "id" : "18", + "ligne" : "1", + "classement" : "2", + "titre" : "Epices \/ condiments", + "langue_courante" : true, + "parent" : 0 + }, + { + "id" : "100", + "ligne" : "1", + "classement" : "3", + "titre" : "Emballage", + "langue_courante" : true, + "parent" : 0 + }, + { + "id" : "194", + "ligne" : "1", + "classement" : "4", + "titre" : "Petits mat\u00e9riels", + "langue_courante" : true, + "parent" : 0 + }, + { + "id" : "355", + "ligne" : "1", + "classement" : "5", + "titre" : "Materiel de cuisine", + "langue_courante" : true, + "parent" : 0 + }, + { + "id" : "426", + "ligne" : "0", + "classement" : "6", + "titre" : "Bacs", + "langue_courante" : true, + "parent" : 0 + }, + { + "id" : "458", + "ligne" : "1", + "classement" : "7", + "titre" : "Hygi\u00e8ne & entretien", + "langue_courante" : true, + "parent" : 0 + }, + { + "id" : "592", + "ligne" : "1", + "classement" : "8", + "titre" : "Art de la table", + "langue_courante" : true, + "parent" : 0 + }, + { + "id" : "601", + "ligne" : "1", + "classement" : "9", + "titre" : "Mat\u00e9riels", + "langue_courante" : true, + "parent" : 0 + } + ], + "products":[] +} \ No newline at end of file From 64698b1d3dd30adb71d4a586171f4ed7d92034f1 Mon Sep 17 00:00:00 2001 From: mespeche Date: Fri, 30 Aug 2013 16:01:40 +0200 Subject: [PATCH 033/125] Working Remise en place du chartage CSS du composant datepicker et ajout de la mixin gradient --- .../css/bootstrap-editable.css | 453 +----------------- templates/admin/default/assets/css/admin.less | 43 +- 2 files changed, 6 insertions(+), 490 deletions(-) diff --git a/templates/admin/default/assets/bootstrap-editable/css/bootstrap-editable.css b/templates/admin/default/assets/bootstrap-editable/css/bootstrap-editable.css index 92063da35..ed3d651ae 100755 --- a/templates/admin/default/assets/bootstrap-editable/css/bootstrap-editable.css +++ b/templates/admin/default/assets/bootstrap-editable/css/bootstrap-editable.css @@ -202,455 +202,4 @@ a.editable-click.editable-disabled:hover { { padding-top: 5px; display:inline-block; -} - - -/*! - * Datepicker for Bootstrap - * - * Copyright 2012 Stefan Petre - * Improvements by Andrew Rowls - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - */ -.datepicker { - padding: 4px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - direction: ltr; - /*.dow { - border-top: 1px solid #ddd !important; - }*/ - -} -.datepicker-inline { - width: 220px; -} -.datepicker.datepicker-rtl { - direction: rtl; -} -.datepicker.datepicker-rtl table tr td span { - float: right; -} -.datepicker-dropdown { - top: 0; - left: 0; -} -.datepicker-dropdown:before { - content: ''; - display: inline-block; - border-left: 7px solid transparent; - border-right: 7px solid transparent; - border-bottom: 7px solid #ccc; - border-bottom-color: rgba(0, 0, 0, 0.2); - position: absolute; - top: -7px; - left: 6px; -} -.datepicker-dropdown:after { - content: ''; - display: inline-block; - border-left: 6px solid transparent; - border-right: 6px solid transparent; - border-bottom: 6px solid #ffffff; - position: absolute; - top: -6px; - left: 7px; -} -.datepicker > div { - display: none; -} -.datepicker.days div.datepicker-days { - display: block; -} -.datepicker.months div.datepicker-months { - display: block; -} -.datepicker.years div.datepicker-years { - display: block; -} -.datepicker table { - margin: 0; -} -.datepicker td, -.datepicker th { - text-align: center; - width: 20px; - height: 20px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - border: none; -} -.table-striped .datepicker table tr td, -.table-striped .datepicker table tr th { - background-color: transparent; -} -.datepicker table tr td.day:hover { - background: #eeeeee; - cursor: pointer; -} -.datepicker table tr td.old, -.datepicker table tr td.new { - color: #999999; -} -.datepicker table tr td.disabled, -.datepicker table tr td.disabled:hover { - background: none; - color: #999999; - cursor: default; -} -.datepicker table tr td.today, -.datepicker table tr td.today:hover, -.datepicker table tr td.today.disabled, -.datepicker table tr td.today.disabled:hover { - background-color: #fde19a; - background-image: -moz-linear-gradient(top, #fdd49a, #fdf59a); - background-image: -ms-linear-gradient(top, #fdd49a, #fdf59a); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fdd49a), to(#fdf59a)); - background-image: -webkit-linear-gradient(top, #fdd49a, #fdf59a); - background-image: -o-linear-gradient(top, #fdd49a, #fdf59a); - background-image: linear-gradient(top, #fdd49a, #fdf59a); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fdd49a', endColorstr='#fdf59a', GradientType=0); - border-color: #fdf59a #fdf59a #fbed50; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); - color: #000; -} -.datepicker table tr td.today:hover, -.datepicker table tr td.today:hover:hover, -.datepicker table tr td.today.disabled:hover, -.datepicker table tr td.today.disabled:hover:hover, -.datepicker table tr td.today:active, -.datepicker table tr td.today:hover:active, -.datepicker table tr td.today.disabled:active, -.datepicker table tr td.today.disabled:hover:active, -.datepicker table tr td.today.active, -.datepicker table tr td.today:hover.active, -.datepicker table tr td.today.disabled.active, -.datepicker table tr td.today.disabled:hover.active, -.datepicker table tr td.today.disabled, -.datepicker table tr td.today:hover.disabled, -.datepicker table tr td.today.disabled.disabled, -.datepicker table tr td.today.disabled:hover.disabled, -.datepicker table tr td.today[disabled], -.datepicker table tr td.today:hover[disabled], -.datepicker table tr td.today.disabled[disabled], -.datepicker table tr td.today.disabled:hover[disabled] { - background-color: #fdf59a; -} -.datepicker table tr td.today:active, -.datepicker table tr td.today:hover:active, -.datepicker table tr td.today.disabled:active, -.datepicker table tr td.today.disabled:hover:active, -.datepicker table tr td.today.active, -.datepicker table tr td.today:hover.active, -.datepicker table tr td.today.disabled.active, -.datepicker table tr td.today.disabled:hover.active { - background-color: #fbf069 \9; -} -.datepicker table tr td.today:hover:hover { - color: #000; -} -.datepicker table tr td.today.active:hover { - color: #fff; -} -.datepicker table tr td.range, -.datepicker table tr td.range:hover, -.datepicker table tr td.range.disabled, -.datepicker table tr td.range.disabled:hover { - background: #eeeeee; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -.datepicker table tr td.range.today, -.datepicker table tr td.range.today:hover, -.datepicker table tr td.range.today.disabled, -.datepicker table tr td.range.today.disabled:hover { - background-color: #f3d17a; - background-image: -moz-linear-gradient(top, #f3c17a, #f3e97a); - background-image: -ms-linear-gradient(top, #f3c17a, #f3e97a); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f3c17a), to(#f3e97a)); - background-image: -webkit-linear-gradient(top, #f3c17a, #f3e97a); - background-image: -o-linear-gradient(top, #f3c17a, #f3e97a); - background-image: linear-gradient(top, #f3c17a, #f3e97a); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f3c17a', endColorstr='#f3e97a', GradientType=0); - border-color: #f3e97a #f3e97a #edde34; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -.datepicker table tr td.range.today:hover, -.datepicker table tr td.range.today:hover:hover, -.datepicker table tr td.range.today.disabled:hover, -.datepicker table tr td.range.today.disabled:hover:hover, -.datepicker table tr td.range.today:active, -.datepicker table tr td.range.today:hover:active, -.datepicker table tr td.range.today.disabled:active, -.datepicker table tr td.range.today.disabled:hover:active, -.datepicker table tr td.range.today.active, -.datepicker table tr td.range.today:hover.active, -.datepicker table tr td.range.today.disabled.active, -.datepicker table tr td.range.today.disabled:hover.active, -.datepicker table tr td.range.today.disabled, -.datepicker table tr td.range.today:hover.disabled, -.datepicker table tr td.range.today.disabled.disabled, -.datepicker table tr td.range.today.disabled:hover.disabled, -.datepicker table tr td.range.today[disabled], -.datepicker table tr td.range.today:hover[disabled], -.datepicker table tr td.range.today.disabled[disabled], -.datepicker table tr td.range.today.disabled:hover[disabled] { - background-color: #f3e97a; -} -.datepicker table tr td.range.today:active, -.datepicker table tr td.range.today:hover:active, -.datepicker table tr td.range.today.disabled:active, -.datepicker table tr td.range.today.disabled:hover:active, -.datepicker table tr td.range.today.active, -.datepicker table tr td.range.today:hover.active, -.datepicker table tr td.range.today.disabled.active, -.datepicker table tr td.range.today.disabled:hover.active { - background-color: #efe24b \9; -} -.datepicker table tr td.selected, -.datepicker table tr td.selected:hover, -.datepicker table tr td.selected.disabled, -.datepicker table tr td.selected.disabled:hover { - background-color: #9e9e9e; - background-image: -moz-linear-gradient(top, #b3b3b3, #808080); - background-image: -ms-linear-gradient(top, #b3b3b3, #808080); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b3b3b3), to(#808080)); - background-image: -webkit-linear-gradient(top, #b3b3b3, #808080); - background-image: -o-linear-gradient(top, #b3b3b3, #808080); - background-image: linear-gradient(top, #b3b3b3, #808080); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#b3b3b3', endColorstr='#808080', GradientType=0); - border-color: #808080 #808080 #595959; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); - color: #fff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} -.datepicker table tr td.selected:hover, -.datepicker table tr td.selected:hover:hover, -.datepicker table tr td.selected.disabled:hover, -.datepicker table tr td.selected.disabled:hover:hover, -.datepicker table tr td.selected:active, -.datepicker table tr td.selected:hover:active, -.datepicker table tr td.selected.disabled:active, -.datepicker table tr td.selected.disabled:hover:active, -.datepicker table tr td.selected.active, -.datepicker table tr td.selected:hover.active, -.datepicker table tr td.selected.disabled.active, -.datepicker table tr td.selected.disabled:hover.active, -.datepicker table tr td.selected.disabled, -.datepicker table tr td.selected:hover.disabled, -.datepicker table tr td.selected.disabled.disabled, -.datepicker table tr td.selected.disabled:hover.disabled, -.datepicker table tr td.selected[disabled], -.datepicker table tr td.selected:hover[disabled], -.datepicker table tr td.selected.disabled[disabled], -.datepicker table tr td.selected.disabled:hover[disabled] { - background-color: #808080; -} -.datepicker table tr td.selected:active, -.datepicker table tr td.selected:hover:active, -.datepicker table tr td.selected.disabled:active, -.datepicker table tr td.selected.disabled:hover:active, -.datepicker table tr td.selected.active, -.datepicker table tr td.selected:hover.active, -.datepicker table tr td.selected.disabled.active, -.datepicker table tr td.selected.disabled:hover.active { - background-color: #666666 \9; -} -.datepicker table tr td.active, -.datepicker table tr td.active:hover, -.datepicker table tr td.active.disabled, -.datepicker table tr td.active.disabled:hover { - background-color: #006dcc; - background-image: -moz-linear-gradient(top, #0088cc, #0044cc); - background-image: -ms-linear-gradient(top, #0088cc, #0044cc); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); - background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); - background-image: -o-linear-gradient(top, #0088cc, #0044cc); - background-image: linear-gradient(top, #0088cc, #0044cc); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0); - border-color: #0044cc #0044cc #002a80; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); - color: #fff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} -.datepicker table tr td.active:hover, -.datepicker table tr td.active:hover:hover, -.datepicker table tr td.active.disabled:hover, -.datepicker table tr td.active.disabled:hover:hover, -.datepicker table tr td.active:active, -.datepicker table tr td.active:hover:active, -.datepicker table tr td.active.disabled:active, -.datepicker table tr td.active.disabled:hover:active, -.datepicker table tr td.active.active, -.datepicker table tr td.active:hover.active, -.datepicker table tr td.active.disabled.active, -.datepicker table tr td.active.disabled:hover.active, -.datepicker table tr td.active.disabled, -.datepicker table tr td.active:hover.disabled, -.datepicker table tr td.active.disabled.disabled, -.datepicker table tr td.active.disabled:hover.disabled, -.datepicker table tr td.active[disabled], -.datepicker table tr td.active:hover[disabled], -.datepicker table tr td.active.disabled[disabled], -.datepicker table tr td.active.disabled:hover[disabled] { - background-color: #0044cc; -} -.datepicker table tr td.active:active, -.datepicker table tr td.active:hover:active, -.datepicker table tr td.active.disabled:active, -.datepicker table tr td.active.disabled:hover:active, -.datepicker table tr td.active.active, -.datepicker table tr td.active:hover.active, -.datepicker table tr td.active.disabled.active, -.datepicker table tr td.active.disabled:hover.active { - background-color: #003399 \9; -} -.datepicker table tr td span { - display: block; - width: 23%; - height: 54px; - line-height: 54px; - float: left; - margin: 1%; - cursor: pointer; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.datepicker table tr td span:hover { - background: #eeeeee; -} -.datepicker table tr td span.disabled, -.datepicker table tr td span.disabled:hover { - background: none; - color: #999999; - cursor: default; -} -.datepicker table tr td span.active, -.datepicker table tr td span.active:hover, -.datepicker table tr td span.active.disabled, -.datepicker table tr td span.active.disabled:hover { - background-color: #006dcc; - background-image: -moz-linear-gradient(top, #0088cc, #0044cc); - background-image: -ms-linear-gradient(top, #0088cc, #0044cc); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); - background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); - background-image: -o-linear-gradient(top, #0088cc, #0044cc); - background-image: linear-gradient(top, #0088cc, #0044cc); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0); - border-color: #0044cc #0044cc #002a80; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); - color: #fff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} -.datepicker table tr td span.active:hover, -.datepicker table tr td span.active:hover:hover, -.datepicker table tr td span.active.disabled:hover, -.datepicker table tr td span.active.disabled:hover:hover, -.datepicker table tr td span.active:active, -.datepicker table tr td span.active:hover:active, -.datepicker table tr td span.active.disabled:active, -.datepicker table tr td span.active.disabled:hover:active, -.datepicker table tr td span.active.active, -.datepicker table tr td span.active:hover.active, -.datepicker table tr td span.active.disabled.active, -.datepicker table tr td span.active.disabled:hover.active, -.datepicker table tr td span.active.disabled, -.datepicker table tr td span.active:hover.disabled, -.datepicker table tr td span.active.disabled.disabled, -.datepicker table tr td span.active.disabled:hover.disabled, -.datepicker table tr td span.active[disabled], -.datepicker table tr td span.active:hover[disabled], -.datepicker table tr td span.active.disabled[disabled], -.datepicker table tr td span.active.disabled:hover[disabled] { - background-color: #0044cc; -} -.datepicker table tr td span.active:active, -.datepicker table tr td span.active:hover:active, -.datepicker table tr td span.active.disabled:active, -.datepicker table tr td span.active.disabled:hover:active, -.datepicker table tr td span.active.active, -.datepicker table tr td span.active:hover.active, -.datepicker table tr td span.active.disabled.active, -.datepicker table tr td span.active.disabled:hover.active { - background-color: #003399 \9; -} -.datepicker table tr td span.old, -.datepicker table tr td span.new { - color: #999999; -} -.datepicker th.datepicker-switch { - width: 145px; -} -.datepicker thead tr:first-child th, -.datepicker tfoot tr th { - cursor: pointer; -} -.datepicker thead tr:first-child th:hover, -.datepicker tfoot tr th:hover { - background: #eeeeee; -} -.datepicker .cw { - font-size: 10px; - width: 12px; - padding: 0 2px 0 5px; - vertical-align: middle; -} -.datepicker thead tr:first-child th.cw { - cursor: default; - background-color: transparent; -} -.input-append.date .add-on i, -.input-prepend.date .add-on i { - display: block; - cursor: pointer; - width: 16px; - height: 16px; -} -.input-daterange input { - text-align: center; -} -.input-daterange input:first-child { - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; -} -.input-daterange input:last-child { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; -} -.input-daterange .add-on { - display: inline-block; - width: auto; - min-width: 16px; - height: 18px; - padding: 4px 5px; - font-weight: normal; - line-height: 18px; - text-align: center; - text-shadow: 0 1px 0 #ffffff; - vertical-align: middle; - background-color: #eeeeee; - border: 1px solid #ccc; - margin-left: -5px; - margin-right: -5px; -} +} \ No newline at end of file diff --git a/templates/admin/default/assets/css/admin.less b/templates/admin/default/assets/css/admin.less index ef52b73e7..2bad0952c 100755 --- a/templates/admin/default/assets/css/admin.less +++ b/templates/admin/default/assets/css/admin.less @@ -158,41 +158,13 @@ hr { } .btn-primary, .btn-large { -<<<<<<< HEAD #gradient > .vertical(rgb(243,153,34), rgb(227,83,11)); -======= - background: #e9730f; - background-image: linear-gradient(bottom, rgb(227,83,11) 0%, rgb(243,153,34) 100%); - background-image: -o-linear-gradient(bottom, rgb(227,83,11) 0%, rgb(243,153,34) 100%); - background-image: -moz-linear-gradient(bottom, rgb(227,83,11) 0%, rgb(243,153,34) 100%); - background-image: -webkit-linear-gradient(bottom, rgb(227,83,11) 0%, rgb(243,153,34) 100%); - background-image: -ms-linear-gradient(bottom, rgb(227,83,11) 0%, rgb(243,153,34) 100%); - background-image: -webkit-gradient( - linear, - left bottom, - left top, - color-stop(0, rgb(227,83,11)), - color-stop(1, rgb(243,153,34)) - ); ->>>>>>> 180302e7cce643db7cda695b5cfaec3586ebb72c box-shadow: inset 0px 0px 2px rgba(250,250,250,0.5), 0px 1px 3px rgba(0,0,0,0.2); color: white; } .btn-large:hover, .btn-primary:hover { - background: #e9730f; - background-image: linear-gradient(bottom, rgb(227,83,11) 0%, rgb(243,153,34) 100%); - background-image: -o-linear-gradient(bottom, rgb(227,83,11) 0%, rgb(243,153,34) 100%); - background-image: -moz-linear-gradient(bottom, rgb(227,83,11) 0%, rgb(243,153,34) 100%); - background-image: -webkit-linear-gradient(bottom, rgb(227,83,11) 0%, rgb(243,153,34) 100%); - background-image: -ms-linear-gradient(bottom, rgb(227,83,11) 0%, rgb(243,153,34) 100%); - background-image: -webkit-gradient( - linear, - left bottom, - left top, - color-stop(0, rgb(227,83,11)), - color-stop(1, rgb(243,153,34)) - ); + #gradient > .vertical(rgb(243,153,34), rgb(227,83,11)); box-shadow: inset 0px 0px 2px rgba(250,250,250,0.8), 0px 1px 3px rgba(0,0,0,0.2); color: white; } @@ -790,7 +762,7 @@ label { // Center the alert box (20px bottom margin) in the table cell padding: 20px 20px 0 20px; } -<<<<<<< HEAD + } // -- Editable tweaks --------------------------------------------------------- @@ -855,7 +827,7 @@ label { } &.active, &.active:hover { - #gradient > .vertical(rgb(243,153,34), rgb(227,83,11)); + #gradient > .vertical(rgb(243,153,34),rgb(227,83,11)); color: #fff; text-shadow: 0 -1px 0 rgba(0,0,0,.25); } @@ -872,7 +844,7 @@ label { background: @grayLighter; } &.active { - #gradient > .vertical(rgb(243,153,34), rgb(227,83,11)); + #gradient > .vertical(rgb(243,153,34),rgb(227,83,11)); color: #fff; text-shadow: 0 -1px 0 rgba(0,0,0,.25); } @@ -915,9 +887,4 @@ label { button.add-on{ height: auto; } -} - - -======= -} ->>>>>>> 180302e7cce643db7cda695b5cfaec3586ebb72c +} \ No newline at end of file From fe859591f437b5677747297945bdec69baaad391 Mon Sep 17 00:00:00 2001 From: mespeche Date: Fri, 30 Aug 2013 16:32:01 +0200 Subject: [PATCH 034/125] WIP Refonte et mise en place du minibrowser --- templates/admin/default/assets/js/main.js | 131 +++++++++++----------- templates/admin/default/coupon/edit.html | 16 +-- 2 files changed, 68 insertions(+), 79 deletions(-) diff --git a/templates/admin/default/assets/js/main.js b/templates/admin/default/assets/js/main.js index 7b5cc812f..e8f4a0aa7 100644 --- a/templates/admin/default/assets/js/main.js +++ b/templates/admin/default/assets/js/main.js @@ -1,6 +1,6 @@ (function($, window, document){ - $(function($){ + $(function(){ // -- Init datepicker -- if($('.date').length){ @@ -41,76 +41,71 @@ } }); - } + } - }); - - - -}(window.jQuery, window, document)); - -// -- Mini browser -- -function miniBrowser(root, url){ - - $.getJSON(url, { - root: root - }) - .done(function(data) { - var resultat = data; + // -- Mini browser -- + miniBrowser = function (root, url){ - var breadcrumb = $('
    '); - $(resultat.breadcrumb).each(function(k, v){ - breadcrumb.append( - $('').html(' > '), - $('').attr('href', '#').html(v.display).click(function(e){ - e.preventDefault(); + $.getJSON(url, { + root: root + }) + .done(function(data) { + var resultat = data; - miniBrowser(v.url) - }) - ); - }); - - var categories = $('
    '); - $(resultat.categories).each(function(k, v){ - categories.append( - $('

    ').append( - $('').attr('href', '#').html(v.titre).click(function(e){ - e.preventDefault(); + var breadcrumb = $('

    '); + $(resultat.breadcrumb).each(function(k, v){ + breadcrumb.append( + $('').html(' > '), + $('').attr('href', '#').html(v.display).click(function(e){ + e.preventDefault(); + miniBrowser(v.url); + }) + ); + }); + + var categories = $('
    '); + $(resultat.categories).each(function(k, v){ + categories.append( + $('

    ').append( + $('').attr('href', '#').html(v.titre).click(function(e){ + e.preventDefault(); + miniBrowser(v.id); + }) + ) + ); + }); + + var products = $('

    '); + $(resultat.products).each(function(k, v){ + products.append( + $('

    ').append( + $('').attr('href', '#').html(v.titre).click(function(e){ + e.preventDefault(); - miniBrowser(v.id) - }) - ) - ); - }); - - var products = $('

    '); - $(resultat.products).each(function(k, v){ - products.append( - $('

    ').append( - $('').attr('href', '#').html(v.titre).click(function(e){ - e.preventDefault(); + $('#productToAdd_ref').val(v.ref); + $('#productToAdd_titre').val(v.titre); + $('#productToAdd_quantite').val(1); + + manageStock(v.variants, v.promo?v.prix2:v.prix); + + $('#productToAdd_tva').val(v.tva); + + $('.productToAddInformation').show(); + $('#btn_ajout_produit').show(); + }) + ) + ); + }); + + $('#minibrowser-breadcrumb').unbind().empty().append(breadcrumb); + $('#minibrowser-categories').unbind().empty().append(categories); + }) + .fail(function() { + console.log('The JSON file cant be read'); + }); + + } - $('#productToAdd_ref').val(v.ref); - $('#productToAdd_titre').val(v.titre); - $('#productToAdd_quantite').val(1); - - manageStock(v.variants, v.promo?v.prix2:v.prix); - - $('#productToAdd_tva').val(v.tva); - - $('.productToAddInformation').show(); - $('#btn_ajout_produit').show(); - }) - ) - ); - }); - - $('#fastBrowser_breadcrumb').unbind().empty().append(breadcrumb); - $('#fastBrowser_categories').unbind().empty().append(categories); - $('#fastBrowser_products').unbind().empty().append(products); - }) - .fail(function() { - console.log('The JSON file cant be read'); }); - -} \ No newline at end of file + +}(window.jQuery, window, document)); \ No newline at end of file diff --git a/templates/admin/default/coupon/edit.html b/templates/admin/default/coupon/edit.html index 4ad8f28c0..6e2692480 100755 --- a/templates/admin/default/coupon/edit.html +++ b/templates/admin/default/coupon/edit.html @@ -201,7 +201,7 @@

    -
    +
    - +
    - + - - + - - +
    - - - - Categories list
    From eef57ba30a5119054724c6ad875a2c44816913af Mon Sep 17 00:00:00 2001 From: gmorel Date: Mon, 2 Sep 2013 09:17:47 +0200 Subject: [PATCH 035/125] WIP - Coupon controller --- core/lib/Thelia/Controller/Admin/CouponController.php | 1 + core/lib/Thelia/Model/Coupon.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/lib/Thelia/Controller/Admin/CouponController.php b/core/lib/Thelia/Controller/Admin/CouponController.php index ab018e245..c372ffca3 100755 --- a/core/lib/Thelia/Controller/Admin/CouponController.php +++ b/core/lib/Thelia/Controller/Admin/CouponController.php @@ -31,6 +31,7 @@ use Thelia\Coupon\CouponRuleCollection; use Thelia\Form\CouponCreationForm; use Thelia\Form\Exception\FormValidationException; use Thelia\Model\Coupon; +use Thelia\Model\CouponQuery; /** * Created by JetBrains PhpStorm. diff --git a/core/lib/Thelia/Model/Coupon.php b/core/lib/Thelia/Model/Coupon.php index 9718b5e36..6de6049ef 100755 --- a/core/lib/Thelia/Model/Coupon.php +++ b/core/lib/Thelia/Model/Coupon.php @@ -48,7 +48,7 @@ class Coupon extends BaseCoupon * * @return \Thelia\Model\Coupon The current object (for fluent API support) */ - public function setSerializedRules(CouponRuleCollection $rules) + public function setRules(CouponRuleCollection $rules) { if ($rules !== null) { @@ -70,7 +70,7 @@ class Coupon extends BaseCoupon * * @return CouponRuleCollection Rules ready to be processed */ - public function getSerializedRules() + public function getRules() { return unserialize(base64_decode($this->serialized_rules)); } From fb459eea8fccac1015714707451fbed8892bdfd7 Mon Sep 17 00:00:00 2001 From: mespeche Date: Mon, 2 Sep 2013 09:35:17 +0200 Subject: [PATCH 036/125] WIP Modification message d'erreur miniBrowser --- templates/admin/default/assets/js/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/admin/default/assets/js/main.js b/templates/admin/default/assets/js/main.js index e8f4a0aa7..6b8a4501f 100644 --- a/templates/admin/default/assets/js/main.js +++ b/templates/admin/default/assets/js/main.js @@ -101,7 +101,7 @@ $('#minibrowser-categories').unbind().empty().append(categories); }) .fail(function() { - console.log('The JSON file cant be read'); + console.log('An error occurred while reading from JSON file'); }); } From 1a5c667c832696dca9fddfd5fbc67897cb952347 Mon Sep 17 00:00:00 2001 From: mespeche Date: Mon, 2 Sep 2013 09:51:31 +0200 Subject: [PATCH 037/125] Working Merge of Frank's updates --- templates/admin/default/assets/css/admin.less | 81 +++++++++++++++++-- 1 file changed, 75 insertions(+), 6 deletions(-) diff --git a/templates/admin/default/assets/css/admin.less b/templates/admin/default/assets/css/admin.less index 2bad0952c..86955cd52 100755 --- a/templates/admin/default/assets/css/admin.less +++ b/templates/admin/default/assets/css/admin.less @@ -261,6 +261,10 @@ hr { width: 23px; height: @top-bar-height; } + + a.profile { + color: #fff; + } } .view-shop { @@ -278,10 +282,6 @@ hr { .loginpage { - .brandbar { - width: 100%; - } - .hero-unit { background-color: transparent !important; @@ -361,6 +361,10 @@ hr { } } +.brandbar-wide { + width: 100%; +} + // -- Navigation bar ---------------------------------------------------------- .navbar { @@ -616,6 +620,11 @@ form .info .input-append .add-on { line-height: 30px; } + .title-without-tabs { + border-bottom: 2px solid #A5CED8; + margin-bottom: 0.5em; + } + // The action bar on the right .actions { text-align: right; @@ -635,6 +644,8 @@ form .info .input-append .add-on { line-height: 30px; margin-bottom: 1em; + border-bottom: 1px dotted #A5CED8; + padding-bottom: 0.5em; .inner-actions { text-align: right; @@ -674,7 +685,7 @@ label { } .input-append.input-block-level .add-on img { - max-height: 18px; + max-height: 16px; } // Information in field label @@ -744,9 +755,12 @@ label { line-height: 30px; - .btn-add-item { + .action-btn { display: block; float: right; + margin-left: 10px; + + text-transform: none; } } @@ -887,4 +901,59 @@ label { button.add-on{ height: auto; } + + th { + a { + color: inherit; + } + } + + td { + vertical-align: middle; + + img { + border: 2px solid white; + border-radius: 4px 4px 4px 4px; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1); + } + + &.actions { + text-align: right; + } + } +} + +.menu-list-table .table-striped { + td, th { + text-align: left; + } + + td:nth-child(2) { + text-align: right; + } + + caption { + background-color: #FFFFFF; + border-bottom: 2px solid #A5CED8; + color: #5A6876; + font-weight: bold; + line-height: 30px; + text-align: left; + text-transform: uppercase; + } +} + +.table-left-aligned { + th, td { + text-align: left; + } + + select, textarea, input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"], input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"], input[type="email"], input[type="url"], input[type="search"], input[type="tel"], input[type="color"], .uneditable-input { + margin-bottom: 0; + } +} + +// Modal is no longer limited +.modal-body { + max-height: none; } \ No newline at end of file From 34c201d5d9b1a0ab094d0fc60823c289074a8cbd Mon Sep 17 00:00:00 2001 From: mespeche Date: Mon, 2 Sep 2013 10:12:17 +0200 Subject: [PATCH 038/125] Working Tablesorter styles --- templates/admin/default/assets/css/admin.less | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/templates/admin/default/assets/css/admin.less b/templates/admin/default/assets/css/admin.less index 86955cd52..03104b881 100755 --- a/templates/admin/default/assets/css/admin.less +++ b/templates/admin/default/assets/css/admin.less @@ -956,4 +956,22 @@ label { // Modal is no longer limited .modal-body { max-height: none; +} + +// -- Table sorter -- +th.header { + background: url("data:image/gif;base64,R0lGODlhFQAJAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAkAAAIXjI+AywnaYnhUMoqt3gZXPmVg94yJVQAAOw==") no-repeat center right; + cursor: pointer; + font-weight: bold; + padding-left: 20px; + border-right: 1px solid #dad9c7; + margin-left: -1px; +} + +th.headerSortUp { + background: #3399FF url("data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjB+gC+jP2ptn0WskLQA7") no-repeat center right; +} + +th.headerSortDown { + background: #3399FF url("data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7") no-repeat center right; } \ No newline at end of file From 7f3e90555aaa23cb780743b101c0d3ce7f16e263 Mon Sep 17 00:00:00 2001 From: mespeche Date: Mon, 2 Sep 2013 12:38:52 +0200 Subject: [PATCH 039/125] Working Implementation of metadata for the exclusion of certain columns --- templates/admin/default/assets/css/admin.less | 5 +- templates/admin/default/assets/js/main.js | 2 +- .../assets/js/tablesorter/jquery.metadata.js | 116 ++++++++++++++++++ templates/admin/default/coupon/edit.html | 4 +- templates/admin/default/coupon/list.html | 8 +- 5 files changed, 128 insertions(+), 7 deletions(-) create mode 100644 templates/admin/default/assets/js/tablesorter/jquery.metadata.js diff --git a/templates/admin/default/assets/css/admin.less b/templates/admin/default/assets/css/admin.less index 03104b881..688dd282e 100755 --- a/templates/admin/default/assets/css/admin.less +++ b/templates/admin/default/assets/css/admin.less @@ -965,13 +965,14 @@ th.header { font-weight: bold; padding-left: 20px; border-right: 1px solid #dad9c7; + border-left: 1px solid #dad9c7; margin-left: -1px; } th.headerSortUp { - background: #3399FF url("data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjB+gC+jP2ptn0WskLQA7") no-repeat center right; + background: #F9F9F9 url("data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjB+gC+jP2ptn0WskLQA7") no-repeat center right; } th.headerSortDown { - background: #3399FF url("data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7") no-repeat center right; + background: #F9F9F9 url("data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7") no-repeat center right; } \ No newline at end of file diff --git a/templates/admin/default/assets/js/main.js b/templates/admin/default/assets/js/main.js index 6b8a4501f..04f155535 100644 --- a/templates/admin/default/assets/js/main.js +++ b/templates/admin/default/assets/js/main.js @@ -41,7 +41,7 @@ } }); - } + } // -- Mini browser -- miniBrowser = function (root, url){ diff --git a/templates/admin/default/assets/js/tablesorter/jquery.metadata.js b/templates/admin/default/assets/js/tablesorter/jquery.metadata.js new file mode 100644 index 000000000..07b10bae8 --- /dev/null +++ b/templates/admin/default/assets/js/tablesorter/jquery.metadata.js @@ -0,0 +1,116 @@ +/* + * Metadata - jQuery plugin for parsing metadata from elements + * + * Copyright (c) 2006 John Resig, Yehuda Katz, Jörn Zaefferer, Paul McLanahan + * + * Dual licensed under the MIT and GPL licenses: + * http://www.opensource.org/licenses/mit-license.php + * http://www.gnu.org/licenses/gpl.html + * + */ + +/** + * Sets the type of metadata to use. Metadata is encoded in JSON, and each property + * in the JSON will become a property of the element itself. + * + * There are three supported types of metadata storage: + * + * attr: Inside an attribute. The name parameter indicates *which* attribute. + * + * class: Inside the class attribute, wrapped in curly braces: { } + * + * elem: Inside a child element (e.g. a script tag). The + * name parameter indicates *which* element. + * + * The metadata for an element is loaded the first time the element is accessed via jQuery. + * + * As a result, you can define the metadata type, use $(expr) to load the metadata into the elements + * matched by expr, then redefine the metadata type and run another $(expr) for other elements. + * + * @name $.metadata.setType + * + * @example

    This is a p

    + * @before $.metadata.setType("class") + * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label" + * @desc Reads metadata from the class attribute + * + * @example

    This is a p

    + * @before $.metadata.setType("attr", "data") + * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label" + * @desc Reads metadata from a "data" attribute + * + * @example

    This is a p

    + * @before $.metadata.setType("elem", "script") + * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label" + * @desc Reads metadata from a nested script element + * + * @param String type The encoding type + * @param String name The name of the attribute to be used to get metadata (optional) + * @cat Plugins/Metadata + * @descr Sets the type of encoding to be used when loading metadata for the first time + * @type undefined + * @see metadata() + */ + +(function($) { + +$.extend({ + metadata : { + defaults : { + type: 'class', + name: 'metadata', + cre: /(\{.*\})/, + single: 'metadata' + }, + setType: function( type, name ){ + this.defaults.type = type; + this.defaults.name = name; + }, + get: function( elem, opts ){ + var data, m, e, attr, + settings = $.extend({},this.defaults,opts); + // check for empty string in single property + if ( !settings.single.length ) { settings.single = 'metadata'; } + + data = $.data(elem, settings.single); + // returned cached data if it already exists + if ( data ) { return data; } + + data = "{}"; + + if ( settings.type === "class" ) { + m = settings.cre.exec( elem.className ); + if ( m ) { data = m[1]; } + } else if ( settings.type === "elem" ) { + if( !elem.getElementsByTagName ) { return undefined; } + e = elem.getElementsByTagName(settings.name); + if ( e.length ) { data = $.trim(e[0].innerHTML); } + } else if ( elem.getAttribute !== undefined ) { + attr = elem.getAttribute( settings.name ); + if ( attr ) { data = attr; } + } + + if ( data.indexOf( '{' ) <0 ) { data = "{" + data + "}"; } + + data = eval("(" + data + ")"); + + $.data( elem, settings.single, data ); + return data; + } + } +}); + +/** + * Returns the metadata object for the first member of the jQuery object. + * + * @name metadata + * @descr Returns element's metadata object + * @param Object opts An object contianing settings to override the defaults + * @type jQuery + * @cat Plugins/Metadata + */ +$.fn.metadata = function( opts ){ + return $.metadata.get( this[0], opts ); +}; + +})(jQuery); \ No newline at end of file diff --git a/templates/admin/default/coupon/edit.html b/templates/admin/default/coupon/edit.html index 6e2692480..1a0b5557c 100755 --- a/templates/admin/default/coupon/edit.html +++ b/templates/admin/default/coupon/edit.html @@ -118,9 +118,9 @@
    - diff --git a/templates/admin/default/coupon/list.html b/templates/admin/default/coupon/list.html index 882b27005..4d42c91b2 100755 --- a/templates/admin/default/coupon/list.html +++ b/templates/admin/default/coupon/list.html @@ -31,7 +31,7 @@ - + @@ -92,7 +92,7 @@ - + @@ -180,6 +180,10 @@ {/javascripts} +{javascripts file='../assets/js/tablesorter/jquery.metadata.js'} + +{/javascripts} + {javascripts file='../assets/js/main.js'} {/javascripts} From f48de82e96d51067d5b3b3524143c9e416885bfe Mon Sep 17 00:00:00 2001 From: mespeche Date: Mon, 2 Sep 2013 15:10:07 +0200 Subject: [PATCH 040/125] WIP Filters input on tablesorter tables --- templates/admin/default/assets/css/admin.less | 16 +- templates/admin/default/assets/js/main.js | 7 +- .../js/tablesorter/jquery.tablesorter.min.js | 1479 ++++++++++++++++- .../tablesorter/jquery.tablesorter.widgets.js | 1208 ++++++++++++++ templates/admin/default/coupon/list.html | 10 +- 5 files changed, 2708 insertions(+), 12 deletions(-) create mode 100644 templates/admin/default/assets/js/tablesorter/jquery.tablesorter.widgets.js diff --git a/templates/admin/default/assets/css/admin.less b/templates/admin/default/assets/css/admin.less index 688dd282e..b2d4329ed 100755 --- a/templates/admin/default/assets/css/admin.less +++ b/templates/admin/default/assets/css/admin.less @@ -959,20 +959,26 @@ label { } // -- Table sorter -- -th.header { +th.tablesorter-header { background: url("data:image/gif;base64,R0lGODlhFQAJAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAkAAAIXjI+AywnaYnhUMoqt3gZXPmVg94yJVQAAOw==") no-repeat center right; cursor: pointer; - font-weight: bold; padding-left: 20px; border-right: 1px solid #dad9c7; border-left: 1px solid #dad9c7; margin-left: -1px; -} +} +th.sorter-false { + background: none; + cursor: auto; + padding-left: 0; + border: none; + margin-left: 0; +} -th.headerSortUp { +th.tablesorter-headerAsc { background: #F9F9F9 url("data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjB+gC+jP2ptn0WskLQA7") no-repeat center right; } -th.headerSortDown { +th.tablesorter-headerDesc { background: #F9F9F9 url("data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7") no-repeat center right; } \ No newline at end of file diff --git a/templates/admin/default/assets/js/main.js b/templates/admin/default/assets/js/main.js index 04f155535..515f529f3 100644 --- a/templates/admin/default/assets/js/main.js +++ b/templates/admin/default/assets/js/main.js @@ -9,7 +9,12 @@ // -- Init tablesorter -- if($('.tablesorter').length){ - $('.tablesorter').tablesorter(); + $('.tablesorter').tablesorter({ + widgets: ["filter"], + widgetOptions : { + filter_cssFilter : 'input-medium', + } + }); } // -- Effect description diff --git a/templates/admin/default/assets/js/tablesorter/jquery.tablesorter.min.js b/templates/admin/default/assets/js/tablesorter/jquery.tablesorter.min.js index b8605df1e..a955fb2c7 100644 --- a/templates/admin/default/assets/js/tablesorter/jquery.tablesorter.min.js +++ b/templates/admin/default/assets/js/tablesorter/jquery.tablesorter.min.js @@ -1,4 +1,1477 @@ +/*! +* TableSorter 2.10.8 - Client-side table sorting with ease! +* @requires jQuery v1.2.6+ +* +* Copyright (c) 2007 Christian Bach +* Examples and docs at: http://tablesorter.com +* Dual licensed under the MIT and GPL licenses: +* http://www.opensource.org/licenses/mit-license.php +* http://www.gnu.org/licenses/gpl.html +* +* @type jQuery +* @name tablesorter +* @cat Plugins/Tablesorter +* @author Christian Bach/christian.bach@polyester.se +* @contributor Rob Garrison/https://github.com/Mottie/tablesorter +*/ +/*jshint browser:true, jquery:true, unused:false, expr: true */ +/*global console:false, alert:false */ +!(function($) { + "use strict"; + $.extend({ + /*jshint supernew:true */ + tablesorter: new function() { -(function($){$.extend({tablesorter:new -function(){var parsers=[],widgets=[];this.defaults={cssHeader:"header",cssAsc:"headerSortUp",cssDesc:"headerSortDown",cssChildRow:"expand-child",sortInitialOrder:"asc",sortMultiSortKey:"shiftKey",sortForce:null,sortAppend:null,sortLocaleCompare:true,textExtraction:"simple",parsers:{},widgets:[],widgetZebra:{css:["even","odd"]},headers:{},widthFixed:false,cancelSelection:true,sortList:[],headerList:[],dateFormat:"us",decimal:'/\.|\,/g',onRenderHeader:null,selectorHeaders:'thead th',debug:false};function benchmark(s,d){log(s+","+(new Date().getTime()-d.getTime())+"ms");}this.benchmark=benchmark;function log(s){if(typeof console!="undefined"&&typeof console.debug!="undefined"){console.log(s);}else{alert(s);}}function buildParserCache(table,$headers){if(table.config.debug){var parsersDebug="";}if(table.tBodies.length==0)return;var rows=table.tBodies[0].rows;if(rows[0]){var list=[],cells=rows[0].cells,l=cells.length;for(var i=0;i1){arr=arr.concat(checkCellColSpan(table,headerArr,row++));}else{if(table.tHead.length==1||(cell.rowSpan>1||!r[row+1])){arr.push(cell);}}}return arr;};function checkHeaderMetadata(cell){if(($.metadata)&&($(cell).metadata().sorter===false)){return true;};return false;}function checkHeaderOptions(table,i){if((table.config.headers[i])&&(table.config.headers[i].sorter===false)){return true;};return false;}function checkHeaderOptionsSortingLocked(table,i){if((table.config.headers[i])&&(table.config.headers[i].lockedOrder))return table.config.headers[i].lockedOrder;return false;}function applyWidget(table){var c=table.config.widgets;var l=c.length;for(var i=0;i');$("tr:first td",table.tBodies[0]).each(function(){colgroup.append($('').css('width',$(this).width()));});$(table).prepend(colgroup);};}function updateHeaderSortCount(table,sortList){var c=table.config,l=sortList.length;for(var i=0;i b["+i+"]) ? 1 : 0));";};function makeSortTextDesc(i){return"((b["+i+"] < a["+i+"]) ? -1 : ((b["+i+"] > a["+i+"]) ? 1 : 0));";};function makeSortNumeric(i){return"a["+i+"]-b["+i+"];";};function makeSortNumericDesc(i){return"b["+i+"]-a["+i+"];";};function sortText(a,b){if(table.config.sortLocaleCompare)return a.localeCompare(b);return((ab)?1:0));};function sortTextDesc(a,b){if(table.config.sortLocaleCompare)return b.localeCompare(a);return((ba)?1:0));};function sortNumeric(a,b){return a-b;};function sortNumericDesc(a,b){return b-a;};function getCachedSortType(parsers,i){return parsers[i].type;};this.construct=function(settings){return this.each(function(){if(!this.tHead||!this.tBodies)return;var $this,$document,$headers,cache,config,shiftDown=0,sortOrder;this.config={};config=$.extend(this.config,$.tablesorter.defaults,settings);$this=$(this);$.data(this,"tablesorter",config);$headers=buildHeaders(this);this.config.parsers=buildParserCache(this,$headers);cache=buildCache(this);var sortCSS=[config.cssDesc,config.cssAsc];fixColumnWidth(this);$headers.click(function(e){var totalRows=($this[0].tBodies[0]&&$this[0].tBodies[0].rows.length)||0;if(!this.sortDisabled&&totalRows>0){$this.trigger("sortStart");var $cell=$(this);var i=this.column;this.order=this.count++%2;if(this.lockedOrder)this.order=this.lockedOrder;if(!e[config.sortMultiSortKey]){config.sortList=[];if(config.sortForce!=null){var a=config.sortForce;for(var j=0;j0){$this.trigger("sorton",[config.sortList]);}applyWidget(this);});};this.addParser=function(parser){var l=parsers.length,a=true;for(var i=0;i (class from cssIcon) + onRenderTemplate : null, // function(index, template){ return template; }, (template is a string) + onRenderHeader : null, // function(index){}, (nothing to return) + + // *** functionality + cancelSelection : true, // prevent text selection in the header + dateFormat : 'mmddyyyy', // other options: "ddmmyyy" or "yyyymmdd" + sortMultiSortKey : 'shiftKey', // key used to select additional columns + sortResetKey : 'ctrlKey', // key used to remove sorting on a column + usNumberFormat : true, // false for German "1.234.567,89" or French "1 234 567,89" + delayInit : false, // if false, the parsed table contents will not update until the first sort + serverSideSorting: false, // if true, server-side sorting should be performed because client-side sorting will be disabled, but the ui and events will still be used. + + // *** sort options + headers : {}, // set sorter, string, empty, locked order, sortInitialOrder, filter, etc. + ignoreCase : true, // ignore case while sorting + sortForce : null, // column(s) first sorted; always applied + sortList : [], // Initial sort order; applied initially; updated when manually sorted + sortAppend : null, // column(s) sorted last; always applied + + sortInitialOrder : 'asc', // sort direction on first click + sortLocaleCompare: false, // replace equivalent character (accented characters) + sortReset : false, // third click on the header will reset column to default - unsorted + sortRestart : false, // restart sort to "sortInitialOrder" when clicking on previously unsorted columns + + emptyTo : 'bottom', // sort empty cell to bottom, top, none, zero + stringTo : 'max', // sort strings in numerical column as max, min, top, bottom, zero + textExtraction : 'simple', // text extraction method/function - function(node, table, cellIndex){} + textSorter : null, // use custom text sorter - function(a,b){ return a.sort(b); } // basic sort + + // *** widget options + widgets: [], // method to add widgets, e.g. widgets: ['zebra'] + widgetOptions : { + zebra : [ 'even', 'odd' ] // zebra widget alternating row class names + }, + initWidgets : true, // apply widgets on tablesorter initialization + + // *** callbacks + initialized : null, // function(table){}, + + // *** css class names + tableClass : 'tablesorter', + cssAsc : 'tablesorter-headerAsc', + cssChildRow : 'tablesorter-childRow', // previously "expand-child" + cssDesc : 'tablesorter-headerDesc', + cssHeader : 'tablesorter-header', + cssHeaderRow : 'tablesorter-headerRow', + cssIcon : 'tablesorter-icon', // if this class exists, a will be added to the header automatically + cssInfoBlock : 'tablesorter-infoOnly', // don't sort tbody with this class name + cssProcessing : 'tablesorter-processing', // processing icon applied to header during sort/filter + + // *** selectors + selectorHeaders : '> thead th, > thead td', + selectorSort : 'th, td', // jQuery selector of content within selectorHeaders that is clickable to trigger a sort + selectorRemove : '.remove-me', + + // *** advanced + debug : false, + + // *** Internal variables + headerList: [], + empties: {}, + strings: {}, + parsers: [] + + // deprecated; but retained for backwards compatibility + // widgetZebra: { css: ["even", "odd"] } + + }; + + /* debuging utils */ + function log(s) { + if (typeof console !== "undefined" && typeof console.log !== "undefined") { + console.log(s); + } else { + alert(s); + } + } + + function benchmark(s, d) { + log(s + " (" + (new Date().getTime() - d.getTime()) + "ms)"); + } + + ts.log = log; + ts.benchmark = benchmark; + + function getElementText(table, node, cellIndex) { + if (!node) { return ""; } + var c = table.config, + t = c.textExtraction, text = ""; + if (t === "simple") { + if (c.supportsTextContent) { + text = node.textContent; // newer browsers support this + } else { + text = $(node).text(); + } + } else { + if (typeof t === "function") { + text = t(node, table, cellIndex); + } else if (typeof t === "object" && t.hasOwnProperty(cellIndex)) { + text = t[cellIndex](node, table, cellIndex); + } else { + text = c.supportsTextContent ? node.textContent : $(node).text(); + } + } + return $.trim(text); + } + + function detectParserForColumn(table, rows, rowIndex, cellIndex) { + var cur, + i = ts.parsers.length, + node = false, + nodeValue = '', + keepLooking = true; + while (nodeValue === '' && keepLooking) { + rowIndex++; + if (rows[rowIndex]) { + node = rows[rowIndex].cells[cellIndex]; + nodeValue = getElementText(table, node, cellIndex); + if (table.config.debug) { + log('Checking if value was empty on row ' + rowIndex + ', column: ' + cellIndex + ': "' + nodeValue + '"'); + } + } else { + keepLooking = false; + } + } + while (--i >= 0) { + cur = ts.parsers[i]; + // ignore the default text parser because it will always be true + if (cur && cur.id !== 'text' && cur.is && cur.is(nodeValue, table, node)) { + return cur; + } + } + // nothing found, return the generic parser (text) + return ts.getParserById('text'); + } + + function buildParserCache(table) { + var c = table.config, + // update table bodies in case we start with an empty table + tb = c.$tbodies = c.$table.children('tbody:not(.' + c.cssInfoBlock + ')'), + rows, list, l, i, h, ch, p, parsersDebug = ""; + if ( tb.length === 0) { + return c.debug ? log('*Empty table!* Not building a parser cache') : ''; + } + rows = tb[0].rows; + if (rows[0]) { + list = []; + l = rows[0].cells.length; + for (i = 0; i < l; i++) { + // tons of thanks to AnthonyM1229 for working out the following selector (issue #74) to make this work in IE8! + // More fixes to this selector to work properly in iOS and jQuery 1.8+ (issue #132 & #174) + h = c.$headers.filter(':not([colspan])'); + h = h.add( c.$headers.filter('[colspan="1"]') ) // ie8 fix + .filter('[data-column="' + i + '"]:last'); + ch = c.headers[i]; + // get column parser + p = ts.getParserById( ts.getData(h, ch, 'sorter') ); + // empty cells behaviour - keeping emptyToBottom for backwards compatibility + c.empties[i] = ts.getData(h, ch, 'empty') || c.emptyTo || (c.emptyToBottom ? 'bottom' : 'top' ); + // text strings behaviour in numerical sorts + c.strings[i] = ts.getData(h, ch, 'string') || c.stringTo || 'max'; + if (!p) { + p = detectParserForColumn(table, rows, -1, i); + } + if (c.debug) { + parsersDebug += "column:" + i + "; parser:" + p.id + "; string:" + c.strings[i] + '; empty: ' + c.empties[i] + "\n"; + } + list.push(p); + } + } + if (c.debug) { + log(parsersDebug); + } + c.parsers = list; + } + + /* utils */ + function buildCache(table) { + var b = table.tBodies, + tc = table.config, + totalRows, + totalCells, + parsers = tc.parsers, + t, v, i, j, k, c, cols, cacheTime, colMax = []; + tc.cache = {}; + // if no parsers found, return - it's an empty table. + if (!parsers) { + return tc.debug ? log('*Empty table!* Not building a cache') : ''; + } + if (tc.debug) { + cacheTime = new Date(); + } + // processing icon + if (tc.showProcessing) { + ts.isProcessing(table, true); + } + for (k = 0; k < b.length; k++) { + tc.cache[k] = { row: [], normalized: [] }; + // ignore tbodies with class name from css.cssInfoBlock + if (!$(b[k]).hasClass(tc.cssInfoBlock)) { + totalRows = (b[k] && b[k].rows.length) || 0; + totalCells = (b[k].rows[0] && b[k].rows[0].cells.length) || 0; + for (i = 0; i < totalRows; ++i) { + /** Add the table data to main data array */ + c = $(b[k].rows[i]); + cols = []; + // if this is a child row, add it to the last row's children and continue to the next row + if (c.hasClass(tc.cssChildRow)) { + tc.cache[k].row[tc.cache[k].row.length - 1] = tc.cache[k].row[tc.cache[k].row.length - 1].add(c); + // go to the next for loop + continue; + } + tc.cache[k].row.push(c); + for (j = 0; j < totalCells; ++j) { + t = getElementText(table, c[0].cells[j], j); + // allow parsing if the string is empty, previously parsing would change it to zero, + // in case the parser needs to extract data from the table cell attributes + v = parsers[j].format(t, table, c[0].cells[j], j); + cols.push(v); + if ((parsers[j].type || '').toLowerCase() === "numeric") { + colMax[j] = Math.max(Math.abs(v) || 0, colMax[j] || 0); // determine column max value (ignore sign) + } + } + cols.push(tc.cache[k].normalized.length); // add position for rowCache + tc.cache[k].normalized.push(cols); + } + tc.cache[k].colMax = colMax; + } + } + if (tc.showProcessing) { + ts.isProcessing(table); // remove processing icon + } + if (tc.debug) { + benchmark("Building cache for " + totalRows + " rows", cacheTime); + } + } + + // init flag (true) used by pager plugin to prevent widget application + function appendToTable(table, init) { + var c = table.config, + b = table.tBodies, + rows = [], + c2 = c.cache, + r, n, totalRows, checkCell, $bk, $tb, + i, j, k, l, pos, appendTime; + if (!c2[0]) { return; } // empty table - fixes #206 + if (c.debug) { + appendTime = new Date(); + } + for (k = 0; k < b.length; k++) { + $bk = $(b[k]); + if ($bk.length && !$bk.hasClass(c.cssInfoBlock)) { + // get tbody + $tb = ts.processTbody(table, $bk, true); + r = c2[k].row; + n = c2[k].normalized; + totalRows = n.length; + checkCell = totalRows ? (n[0].length - 1) : 0; + for (i = 0; i < totalRows; i++) { + pos = n[i][checkCell]; + rows.push(r[pos]); + // removeRows used by the pager plugin + if (!c.appender || !c.removeRows) { + l = r[pos].length; + for (j = 0; j < l; j++) { + $tb.append(r[pos][j]); + } + } + } + // restore tbody + ts.processTbody(table, $tb, false); + } + } + if (c.appender) { + c.appender(table, rows); + } + if (c.debug) { + benchmark("Rebuilt table", appendTime); + } + // apply table widgets + if (!init) { ts.applyWidget(table); } + // trigger sortend + $(table).trigger("sortEnd", table); + } + + // computeTableHeaderCellIndexes from: + // http://www.javascripttoolbox.com/lib/table/examples.php + // http://www.javascripttoolbox.com/temp/table_cellindex.html + function computeThIndexes(t) { + var matrix = [], + lookup = {}, + cols = 0, // determine the number of columns + trs = $(t).find('thead:eq(0), tfoot').children('tr'), // children tr in tfoot - see issue #196 + i, j, k, l, c, cells, rowIndex, cellId, rowSpan, colSpan, firstAvailCol, matrixrow; + for (i = 0; i < trs.length; i++) { + cells = trs[i].cells; + for (j = 0; j < cells.length; j++) { + c = cells[j]; + rowIndex = c.parentNode.rowIndex; + cellId = rowIndex + "-" + c.cellIndex; + rowSpan = c.rowSpan || 1; + colSpan = c.colSpan || 1; + if (typeof(matrix[rowIndex]) === "undefined") { + matrix[rowIndex] = []; + } + // Find first available column in the first row + for (k = 0; k < matrix[rowIndex].length + 1; k++) { + if (typeof(matrix[rowIndex][k]) === "undefined") { + firstAvailCol = k; + break; + } + } + lookup[cellId] = firstAvailCol; + cols = Math.max(firstAvailCol, cols); + // add data-column + $(c).attr({ 'data-column' : firstAvailCol }); // 'data-row' : rowIndex + for (k = rowIndex; k < rowIndex + rowSpan; k++) { + if (typeof(matrix[k]) === "undefined") { + matrix[k] = []; + } + matrixrow = matrix[k]; + for (l = firstAvailCol; l < firstAvailCol + colSpan; l++) { + matrixrow[l] = "x"; + } + } + } + } + t.config.columns = cols; // may not be accurate if # header columns !== # tbody columns + return lookup; + } + + function formatSortingOrder(v) { + // look for "d" in "desc" order; return true + return (/^d/i.test(v) || v === 1); + } + + function buildHeaders(table) { + var header_index = computeThIndexes(table), ch, $t, + h, i, t, lock, time, c = table.config; + c.headerList = []; + c.headerContent = []; + if (c.debug) { + time = new Date(); + } + i = c.cssIcon ? '' : ''; // add icon if cssIcon option exists + c.$headers = $(table).find(c.selectorHeaders).each(function(index) { + $t = $(this); + ch = c.headers[index]; + c.headerContent[index] = this.innerHTML; // save original header content + // set up header template + t = c.headerTemplate.replace(/\{content\}/g, this.innerHTML).replace(/\{icon\}/g, i); + if (c.onRenderTemplate) { + h = c.onRenderTemplate.apply($t, [index, t]); + if (h && typeof h === 'string') { t = h; } // only change t if something is returned + } + this.innerHTML = '
    ' + t + '
    '; // faster than wrapInner + + if (c.onRenderHeader) { c.onRenderHeader.apply($t, [index]); } + + this.column = header_index[this.parentNode.rowIndex + "-" + this.cellIndex]; + this.order = formatSortingOrder( ts.getData($t, ch, 'sortInitialOrder') || c.sortInitialOrder ) ? [1,0,2] : [0,1,2]; + this.count = -1; // set to -1 because clicking on the header automatically adds one + this.lockedOrder = false; + lock = ts.getData($t, ch, 'lockedOrder') || false; + if (typeof lock !== 'undefined' && lock !== false) { + this.order = this.lockedOrder = formatSortingOrder(lock) ? [1,1,1] : [0,0,0]; + } + $t.addClass(c.cssHeader); + // add cell to headerList + c.headerList[index] = this; + // add to parent in case there are multiple rows + $t.parent().addClass(c.cssHeaderRow); + // allow keyboard cursor to focus on element + $t.attr("tabindex", 0); + }); + // enable/disable sorting + updateHeader(table); + if (c.debug) { + benchmark("Built headers:", time); + log(c.$headers); + } + } + + function commonUpdate(table, resort, callback) { + var c = table.config; + // remove rows/elements before update + c.$table.find(c.selectorRemove).remove(); + // rebuild parsers + buildParserCache(table); + // rebuild the cache map + buildCache(table); + checkResort(c.$table, resort, callback); + } + + function updateHeader(table) { + var s, c = table.config; + c.$headers.each(function(index, th){ + s = ts.getData( th, c.headers[index], 'sorter' ) === 'false'; + th.sortDisabled = s; + $(th)[ s ? 'addClass' : 'removeClass' ]('sorter-false'); + }); + } + + function setHeadersCss(table) { + var f, i, j, l, + c = table.config, + list = c.sortList, + css = [c.cssAsc, c.cssDesc], + // find the footer + $t = $(table).find('tfoot tr').children().removeClass(css.join(' ')); + // remove all header information + c.$headers.removeClass(css.join(' ')); + l = list.length; + for (i = 0; i < l; i++) { + // direction = 2 means reset! + if (list[i][1] !== 2) { + // multicolumn sorting updating - choose the :last in case there are nested columns + f = c.$headers.not('.sorter-false').filter('[data-column="' + list[i][0] + '"]' + (l === 1 ? ':last' : '') ); + if (f.length) { + for (j = 0; j < f.length; j++) { + if (!f[j].sortDisabled) { + f.eq(j).addClass(css[list[i][1]]); + // add sorted class to footer, if it exists + if ($t.length) { + $t.filter('[data-column="' + list[i][0] + '"]').eq(j).addClass(css[list[i][1]]); + } + } + } + } + } + } + } + + // automatically add col group, and column sizes if set + function fixColumnWidth(table) { + if (table.config.widthFixed && $(table).find('colgroup').length === 0) { + var colgroup = $('    '), + overallWidth = $(table).width(); + $(table.tBodies[0]).find("tr:first").children("td").each(function() { + colgroup.append($('').css('width', parseInt(($(this).width()/overallWidth)*1000, 10)/10 + '%')); + }); + $(table).prepend(colgroup); + } + } + + function updateHeaderSortCount(table, list) { + var s, t, o, c = table.config, + sl = list || c.sortList; + c.sortList = []; + $.each(sl, function(i,v){ + // ensure all sortList values are numeric - fixes #127 + s = [ parseInt(v[0], 10), parseInt(v[1], 10) ]; + // make sure header exists + o = c.headerList[s[0]]; + if (o) { // prevents error if sorton array is wrong + c.sortList.push(s); + t = $.inArray(s[1], o.order); // fixes issue #167 + o.count = t >= 0 ? t : s[1] % (c.sortReset ? 3 : 2); + } + }); + } + + function getCachedSortType(parsers, i) { + return (parsers && parsers[i]) ? parsers[i].type || '' : ''; + } + + function initSort(table, cell, e){ + var a, i, j, o, s, + c = table.config, + k = !e[c.sortMultiSortKey], + $this = $(table); + // Only call sortStart if sorting is enabled + $this.trigger("sortStart", table); + // get current column sort order + cell.count = e[c.sortResetKey] ? 2 : (cell.count + 1) % (c.sortReset ? 3 : 2); + // reset all sorts on non-current column - issue #30 + if (c.sortRestart) { + i = cell; + c.$headers.each(function() { + // only reset counts on columns that weren't just clicked on and if not included in a multisort + if (this !== i && (k || !$(this).is('.' + c.cssDesc + ',.' + c.cssAsc))) { + this.count = -1; + } + }); + } + // get current column index + i = cell.column; + // user only wants to sort on one column + if (k) { + // flush the sort list + c.sortList = []; + if (c.sortForce !== null) { + a = c.sortForce; + for (j = 0; j < a.length; j++) { + if (a[j][0] !== i) { + c.sortList.push(a[j]); + } + } + } + // add column to sort list + o = cell.order[cell.count]; + if (o < 2) { + c.sortList.push([i, o]); + // add other columns if header spans across multiple + if (cell.colSpan > 1) { + for (j = 1; j < cell.colSpan; j++) { + c.sortList.push([i + j, o]); + } + } + } + // multi column sorting + } else { + // get rid of the sortAppend before adding more - fixes issue #115 + if (c.sortAppend && c.sortList.length > 1) { + if (ts.isValueInArray(c.sortAppend[0][0], c.sortList)) { + c.sortList.pop(); + } + } + // the user has clicked on an already sorted column + if (ts.isValueInArray(i, c.sortList)) { + // reverse the sorting direction for all tables + for (j = 0; j < c.sortList.length; j++) { + s = c.sortList[j]; + o = c.headerList[s[0]]; + if (s[0] === i) { + s[1] = o.order[o.count]; + if (s[1] === 2) { + c.sortList.splice(j,1); + o.count = -1; + } + } + } + } else { + // add column to sort list array + o = cell.order[cell.count]; + if (o < 2) { + c.sortList.push([i, o]); + // add other columns if header spans across multiple + if (cell.colSpan > 1) { + for (j = 1; j < cell.colSpan; j++) { + c.sortList.push([i + j, o]); + } + } + } + } + } + if (c.sortAppend !== null) { + a = c.sortAppend; + for (j = 0; j < a.length; j++) { + if (a[j][0] !== i) { + c.sortList.push(a[j]); + } + } + } + // sortBegin event triggered immediately before the sort + $this.trigger("sortBegin", table); + // setTimeout needed so the processing icon shows up + setTimeout(function(){ + // set css for headers + setHeadersCss(table); + multisort(table); + appendToTable(table); + }, 1); + } + + // sort multiple columns + function multisort(table) { /*jshint loopfunc:true */ + var dir = 0, tc = table.config, + sortList = tc.sortList, l = sortList.length, bl = table.tBodies.length, + sortTime, i, k, c, colMax, cache, lc, s, order, orgOrderCol; + if (tc.serverSideSorting || !tc.cache[0]) { // empty table - fixes #206 + return; + } + if (tc.debug) { sortTime = new Date(); } + for (k = 0; k < bl; k++) { + colMax = tc.cache[k].colMax; + cache = tc.cache[k].normalized; + lc = cache.length; + orgOrderCol = (cache && cache[0]) ? cache[0].length - 1 : 0; + cache.sort(function(a, b) { + // cache is undefined here in IE, so don't use it! + for (i = 0; i < l; i++) { + c = sortList[i][0]; + order = sortList[i][1]; + // fallback to natural sort since it is more robust + s = /n/i.test(getCachedSortType(tc.parsers, c)) ? "Numeric" : "Text"; + s += order === 0 ? "" : "Desc"; + if (/Numeric/.test(s) && tc.strings[c]) { + // sort strings in numerical columns + if (typeof (tc.string[tc.strings[c]]) === 'boolean') { + dir = (order === 0 ? 1 : -1) * (tc.string[tc.strings[c]] ? -1 : 1); + } else { + dir = (tc.strings[c]) ? tc.string[tc.strings[c]] || 0 : 0; + } + } + var sort = $.tablesorter["sort" + s](table, a[c], b[c], c, colMax[c], dir); + if (sort) { return sort; } + } + return a[orgOrderCol] - b[orgOrderCol]; + }); + } + if (tc.debug) { benchmark("Sorting on " + sortList.toString() + " and dir " + order + " time", sortTime); } + } + + function resortComplete($table, callback){ + $table.trigger('updateComplete'); + if (typeof callback === "function") { + callback($table[0]); + } + } + + function checkResort($table, flag, callback) { + // don't try to resort if the table is still processing + // this will catch spamming of the updateCell method + if (flag !== false && !$table[0].isProcessing) { + $table.trigger("sorton", [$table[0].config.sortList, function(){ + resortComplete($table, callback); + }]); + } else { + resortComplete($table, callback); + } + } + + function bindEvents(table){ + var c = table.config, + $this = c.$table, + j, downTime; + // apply event handling to headers + c.$headers + // http://stackoverflow.com/questions/5312849/jquery-find-self; + .find(c.selectorSort).add( c.$headers.filter(c.selectorSort) ) + .unbind('mousedown.tablesorter mouseup.tablesorter sort.tablesorter keypress.tablesorter') + .bind('mousedown.tablesorter mouseup.tablesorter sort.tablesorter keypress.tablesorter', function(e, external) { + // only recognize left clicks or enter + if ( ((e.which || e.button) !== 1 && !/sort|keypress/.test(e.type)) || (e.type === 'keypress' && e.which !== 13) ) { + return false; + } + // ignore long clicks (prevents resizable widget from initializing a sort) + if (e.type === 'mouseup' && external !== true && (new Date().getTime() - downTime > 250)) { return false; } + // set timer on mousedown + if (e.type === 'mousedown') { + downTime = new Date().getTime(); + return e.target.tagName === "INPUT" ? '' : !c.cancelSelection; + } + if (c.delayInit && !c.cache) { buildCache(table); } + // jQuery v1.2.6 doesn't have closest() + var $cell = /TH|TD/.test(this.tagName) ? $(this) : $(this).parents('th, td').filter(':first'), cell = $cell[0]; + if (!cell.sortDisabled) { + initSort(table, cell, e); + } + }); + if (c.cancelSelection) { + // cancel selection + c.$headers + .attr('unselectable', 'on') + .bind('selectstart', false) + .css({ + 'user-select': 'none', + 'MozUserSelect': 'none' // not needed for jQuery 1.8+ + }); + } + // apply easy methods that trigger bound events + $this + .unbind('sortReset update updateRows updateCell updateAll addRows sorton appendCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave '.split(' ').join('.tablesorter ')) + .bind("sortReset.tablesorter", function(e){ + e.stopPropagation(); + c.sortList = []; + setHeadersCss(table); + multisort(table); + appendToTable(table); + }) + .bind("updateAll.tablesorter", function(e, resort, callback){ + e.stopPropagation(); + ts.refreshWidgets(table, true, true); + ts.restoreHeaders(table); + buildHeaders(table); + bindEvents(table); + commonUpdate(table, resort, callback); + }) + .bind("update.tablesorter updateRows.tablesorter", function(e, resort, callback) { + e.stopPropagation(); + // update sorting (if enabled/disabled) + updateHeader(table); + commonUpdate(table, resort, callback); + }) + .bind("updateCell.tablesorter", function(e, cell, resort, callback) { + e.stopPropagation(); + $this.find(c.selectorRemove).remove(); + // get position from the dom + var l, row, icell, + $tb = $this.find('tbody'), + // update cache - format: function(s, table, cell, cellIndex) + // no closest in jQuery v1.2.6 - tbdy = $tb.index( $(cell).closest('tbody') ),$row = $(cell).closest('tr'); + tbdy = $tb.index( $(cell).parents('tbody').filter(':first') ), + $row = $(cell).parents('tr').filter(':first'); + cell = $(cell)[0]; // in case cell is a jQuery object + // tbody may not exist if update is initialized while tbody is removed for processing + if ($tb.length && tbdy >= 0) { + row = $tb.eq(tbdy).find('tr').index( $row ); + icell = cell.cellIndex; + l = c.cache[tbdy].normalized[row].length - 1; + c.cache[tbdy].row[table.config.cache[tbdy].normalized[row][l]] = $row; + c.cache[tbdy].normalized[row][icell] = c.parsers[icell].format( getElementText(table, cell, icell), table, cell, icell ); + checkResort($this, resort, callback); + } + }) + .bind("addRows.tablesorter", function(e, $row, resort, callback) { + e.stopPropagation(); + var i, rows = $row.filter('tr').length, + dat = [], l = $row[0].cells.length, + tbdy = $this.find('tbody').index( $row.parents('tbody').filter(':first') ); + // fixes adding rows to an empty table - see issue #179 + if (!c.parsers) { + buildParserCache(table); + } + // add each row + for (i = 0; i < rows; i++) { + // add each cell + for (j = 0; j < l; j++) { + dat[j] = c.parsers[j].format( getElementText(table, $row[i].cells[j], j), table, $row[i].cells[j], j ); + } + // add the row index to the end + dat.push(c.cache[tbdy].row.length); + // update cache + c.cache[tbdy].row.push([$row[i]]); + c.cache[tbdy].normalized.push(dat); + dat = []; + } + // resort using current settings + checkResort($this, resort, callback); + }) + .bind("sorton.tablesorter", function(e, list, callback, init) { + e.stopPropagation(); + $this.trigger("sortStart", this); + // update header count index + updateHeaderSortCount(table, list); + // set css for headers + setHeadersCss(table); + $this.trigger("sortBegin", this); + // sort the table and append it to the dom + multisort(table); + appendToTable(table, init); + if (typeof callback === "function") { + callback(table); + } + }) + .bind("appendCache.tablesorter", function(e, callback, init) { + e.stopPropagation(); + appendToTable(table, init); + if (typeof callback === "function") { + callback(table); + } + }) + .bind("applyWidgetId.tablesorter", function(e, id) { + e.stopPropagation(); + ts.getWidgetById(id).format(table, c, c.widgetOptions); + }) + .bind("applyWidgets.tablesorter", function(e, init) { + e.stopPropagation(); + // apply widgets + ts.applyWidget(table, init); + }) + .bind("refreshWidgets.tablesorter", function(e, all, dontapply){ + e.stopPropagation(); + ts.refreshWidgets(table, all, dontapply); + }) + .bind("destroy.tablesorter", function(e, c, cb){ + e.stopPropagation(); + ts.destroy(table, c, cb); + }); + } + + /* public methods */ + ts.construct = function(settings) { + return this.each(function() { + // if no thead or tbody, or tablesorter is already present, quit + if (!this.tHead || this.tBodies.length === 0 || this.hasInitialized === true) { + return (this.config && this.config.debug) ? log('stopping initialization! No thead, tbody or tablesorter has already been initialized') : ''; + } + // declare + var $this = $(this), table = this, + c, k = '', + m = $.metadata; + // initialization flag + table.hasInitialized = false; + // table is being processed flag + table.isProcessing = true; + // new blank config object + table.config = {}; + // merge and extend + c = $.extend(true, table.config, ts.defaults, settings); + // save the settings where they read + $.data(table, "tablesorter", c); + if (c.debug) { $.data( table, 'startoveralltimer', new Date()); } + // constants + c.supportsTextContent = $('x')[0].textContent === 'x'; + c.supportsDataObject = parseFloat($.fn.jquery) >= 1.4; + // digit sort text location; keeping max+/- for backwards compatibility + c.string = { 'max': 1, 'min': -1, 'max+': 1, 'max-': -1, 'zero': 0, 'none': 0, 'null': 0, 'top': true, 'bottom': false }; + // add table theme class only if there isn't already one there + if (!/tablesorter\-/.test($this.attr('class'))) { + k = (c.theme !== '' ? ' tablesorter-' + c.theme : ''); + } + c.$table = $this.addClass(c.tableClass + k); + c.$tbodies = $this.children('tbody:not(.' + c.cssInfoBlock + ')'); + // build headers + buildHeaders(table); + // fixate columns if the users supplies the fixedWidth option + // do this after theme has been applied + fixColumnWidth(table); + // try to auto detect column type, and store in tables config + buildParserCache(table); + // build the cache for the tbody cells + // delayInit will delay building the cache until the user starts a sort + if (!c.delayInit) { buildCache(table); } + // bind all header events and methods + bindEvents(table); + // get sort list from jQuery data or metadata + // in jQuery < 1.4, an error occurs when calling $this.data() + if (c.supportsDataObject && typeof $this.data().sortlist !== 'undefined') { + c.sortList = $this.data().sortlist; + } else if (m && ($this.metadata() && $this.metadata().sortlist)) { + c.sortList = $this.metadata().sortlist; + } + // apply widget init code + ts.applyWidget(table, true); + // if user has supplied a sort list to constructor + if (c.sortList.length > 0) { + $this.trigger("sorton", [c.sortList, {}, !c.initWidgets]); + } else if (c.initWidgets) { + // apply widget format + ts.applyWidget(table); + } + + // show processesing icon + if (c.showProcessing) { + $this + .unbind('sortBegin.tablesorter sortEnd.tablesorter') + .bind('sortBegin.tablesorter sortEnd.tablesorter', function(e) { + ts.isProcessing(table, e.type === 'sortBegin'); + }); + } + + // initialized + table.hasInitialized = true; + table.isProcessing = false; + if (c.debug) { + ts.benchmark("Overall initialization time", $.data( table, 'startoveralltimer')); + } + $this.trigger('tablesorter-initialized', table); + if (typeof c.initialized === 'function') { c.initialized(table); } + }); + }; + + // *** Process table *** + // add processing indicator + ts.isProcessing = function(table, toggle, $ths) { + table = $(table); + var c = table[0].config, + // default to all headers + $h = $ths || table.find('.' + c.cssHeader); + if (toggle) { + if (c.sortList.length > 0) { + // get headers from the sortList + $h = $h.filter(function(){ + // get data-column from attr to keep compatibility with jQuery 1.2.6 + return this.sortDisabled ? false : ts.isValueInArray( parseFloat($(this).attr('data-column')), c.sortList); + }); + } + $h.addClass(c.cssProcessing); + } else { + $h.removeClass(c.cssProcessing); + } + }; + + // detach tbody but save the position + // don't use tbody because there are portions that look for a tbody index (updateCell) + ts.processTbody = function(table, $tb, getIt){ + var holdr; + if (getIt) { + table.isProcessing = true; + $tb.before(''); + holdr = ($.fn.detach) ? $tb.detach() : $tb.remove(); + return holdr; + } + holdr = $(table).find('span.tablesorter-savemyplace'); + $tb.insertAfter( holdr ); + holdr.remove(); + table.isProcessing = false; + }; + + ts.clearTableBody = function(table) { + $(table)[0].config.$tbodies.empty(); + }; + + // restore headers + ts.restoreHeaders = function(table){ + var c = table.config; + // don't use c.$headers here in case header cells were swapped + c.$table.find(c.selectorHeaders).each(function(i){ + // only restore header cells if it is wrapped + // because this is also used by the updateAll method + if ($(this).find('.tablesorter-header-inner').length){ + $(this).html( c.headerContent[i] ); + } + }); + }; + + ts.destroy = function(table, removeClasses, callback){ + table = $(table)[0]; + if (!table.hasInitialized) { return; } + // remove all widgets + ts.refreshWidgets(table, true, true); + var $t = $(table), c = table.config, + $h = $t.find('thead:first'), + $r = $h.find('tr.' + c.cssHeaderRow).removeClass(c.cssHeaderRow), + $f = $t.find('tfoot:first > tr').children('th, td'); + // remove widget added rows, just in case + $h.find('tr').not($r).remove(); + // disable tablesorter + $t + .removeData('tablesorter') + .unbind('sortReset update updateAll updateRows updateCell addRows sorton appendCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave keypress sortBegin sortEnd '.split(' ').join('.tablesorter ')); + c.$headers.add($f) + .removeClass(c.cssHeader + ' ' + c.cssAsc + ' ' + c.cssDesc) + .removeAttr('data-column'); + $r.find(c.selectorSort).unbind('mousedown.tablesorter mouseup.tablesorter keypress.tablesorter'); + ts.restoreHeaders(table); + if (removeClasses !== false) { + $t.removeClass(c.tableClass + ' tablesorter-' + c.theme); + } + // clear flag in case the plugin is initialized again + table.hasInitialized = false; + if (typeof callback === 'function') { + callback(table); + } + }; + + // *** sort functions *** + // regex used in natural sort + ts.regex = [ + /(^([+\-]?(?:0|[1-9]\d*)(?:\.\d*)?(?:[eE][+\-]?\d+)?)?$|^0x[0-9a-f]+$|\d+)/gi, // chunk/tokenize numbers & letters + /(^([\w ]+,?[\w ]+)?[\w ]+,?[\w ]+\d+:\d+(:\d+)?[\w ]?|^\d{1,4}[\/\-]\d{1,4}[\/\-]\d{1,4}|^\w+, \w+ \d+, \d{4})/, //date + /^0x[0-9a-f]+$/i // hex + ]; + + // Natural sort - https://github.com/overset/javascript-natural-sort + ts.sortText = function(table, a, b, col) { + if (a === b) { return 0; } + var c = table.config, e = c.string[ (c.empties[col] || c.emptyTo ) ], + r = ts.regex, xN, xD, yN, yD, xF, yF, i, mx; + if (a === '' && e !== 0) { return typeof e === 'boolean' ? (e ? -1 : 1) : -e || -1; } + if (b === '' && e !== 0) { return typeof e === 'boolean' ? (e ? 1 : -1) : e || 1; } + if (typeof c.textSorter === 'function') { return c.textSorter(a, b, table, col); } + // chunk/tokenize + xN = a.replace(r[0], '\\0$1\\0').replace(/\\0$/, '').replace(/^\\0/, '').split('\\0'); + yN = b.replace(r[0], '\\0$1\\0').replace(/\\0$/, '').replace(/^\\0/, '').split('\\0'); + // numeric, hex or date detection + xD = parseInt(a.match(r[2]),16) || (xN.length !== 1 && a.match(r[1]) && Date.parse(a)); + yD = parseInt(b.match(r[2]),16) || (xD && b.match(r[1]) && Date.parse(b)) || null; + // first try and sort Hex codes or Dates + if (yD) { + if ( xD < yD ) { return -1; } + if ( xD > yD ) { return 1; } + } + mx = Math.max(xN.length, yN.length); + // natural sorting through split numeric strings and default strings + for (i = 0; i < mx; i++) { + // find floats not starting with '0', string or 0 if not defined + xF = isNaN(xN[i]) ? xN[i] || 0 : parseFloat(xN[i]) || 0; + yF = isNaN(yN[i]) ? yN[i] || 0 : parseFloat(yN[i]) || 0; + // handle numeric vs string comparison - number < string - (Kyle Adams) + if (isNaN(xF) !== isNaN(yF)) { return (isNaN(xF)) ? 1 : -1; } + // rely on string comparison if different types - i.e. '02' < 2 != '02' < '2' + if (typeof xF !== typeof yF) { + xF += ''; + yF += ''; + } + if (xF < yF) { return -1; } + if (xF > yF) { return 1; } + } + return 0; + }; + + ts.sortTextDesc = function(table, a, b, col) { + if (a === b) { return 0; } + var c = table.config, e = c.string[ (c.empties[col] || c.emptyTo ) ]; + if (a === '' && e !== 0) { return typeof e === 'boolean' ? (e ? -1 : 1) : e || 1; } + if (b === '' && e !== 0) { return typeof e === 'boolean' ? (e ? 1 : -1) : -e || -1; } + if (typeof c.textSorter === 'function') { return c.textSorter(b, a, table, col); } + return ts.sortText(table, b, a); + }; + + // return text string value by adding up ascii value + // so the text is somewhat sorted when using a digital sort + // this is NOT an alphanumeric sort + ts.getTextValue = function(a, mx, d) { + if (mx) { + // make sure the text value is greater than the max numerical value (mx) + var i, l = a ? a.length : 0, n = mx + d; + for (i = 0; i < l; i++) { + n += a.charCodeAt(i); + } + return d * n; + } + return 0; + }; + + ts.sortNumeric = function(table, a, b, col, mx, d) { + if (a === b) { return 0; } + var c = table.config, e = c.string[ (c.empties[col] || c.emptyTo ) ]; + if (a === '' && e !== 0) { return typeof e === 'boolean' ? (e ? -1 : 1) : -e || -1; } + if (b === '' && e !== 0) { return typeof e === 'boolean' ? (e ? 1 : -1) : e || 1; } + if (isNaN(a)) { a = ts.getTextValue(a, mx, d); } + if (isNaN(b)) { b = ts.getTextValue(b, mx, d); } + return a - b; + }; + + ts.sortNumericDesc = function(table, a, b, col, mx, d) { + if (a === b) { return 0; } + var c = table.config, e = c.string[ (c.empties[col] || c.emptyTo ) ]; + if (a === '' && e !== 0) { return typeof e === 'boolean' ? (e ? -1 : 1) : e || 1; } + if (b === '' && e !== 0) { return typeof e === 'boolean' ? (e ? 1 : -1) : -e || -1; } + if (isNaN(a)) { a = ts.getTextValue(a, mx, d); } + if (isNaN(b)) { b = ts.getTextValue(b, mx, d); } + return b - a; + }; + + // used when replacing accented characters during sorting + ts.characterEquivalents = { + "a" : "\u00e1\u00e0\u00e2\u00e3\u00e4\u0105\u00e5", // áàâãäąå + "A" : "\u00c1\u00c0\u00c2\u00c3\u00c4\u0104\u00c5", // ÁÀÂÃÄĄÅ + "c" : "\u00e7\u0107\u010d", // çćč + "C" : "\u00c7\u0106\u010c", // ÇĆČ + "e" : "\u00e9\u00e8\u00ea\u00eb\u011b\u0119", // éèêëěę + "E" : "\u00c9\u00c8\u00ca\u00cb\u011a\u0118", // ÉÈÊËĚĘ + "i" : "\u00ed\u00ec\u0130\u00ee\u00ef\u0131", // íìİîïı + "I" : "\u00cd\u00cc\u0130\u00ce\u00cf", // ÍÌİÎÏ + "o" : "\u00f3\u00f2\u00f4\u00f5\u00f6", // óòôõö + "O" : "\u00d3\u00d2\u00d4\u00d5\u00d6", // ÓÒÔÕÖ + "ss": "\u00df", // ß (s sharp) + "SS": "\u1e9e", // ẞ (Capital sharp s) + "u" : "\u00fa\u00f9\u00fb\u00fc\u016f", // úùûüů + "U" : "\u00da\u00d9\u00db\u00dc\u016e" // ÚÙÛÜŮ + }; + ts.replaceAccents = function(s) { + var a, acc = '[', eq = ts.characterEquivalents; + if (!ts.characterRegex) { + ts.characterRegexArray = {}; + for (a in eq) { + if (typeof a === 'string') { + acc += eq[a]; + ts.characterRegexArray[a] = new RegExp('[' + eq[a] + ']', 'g'); + } + } + ts.characterRegex = new RegExp(acc + ']'); + } + if (ts.characterRegex.test(s)) { + for (a in eq) { + if (typeof a === 'string') { + s = s.replace( ts.characterRegexArray[a], a ); + } + } + } + return s; + }; + + // *** utilities *** + ts.isValueInArray = function(v, a) { + var i, l = a.length; + for (i = 0; i < l; i++) { + if (a[i][0] === v) { + return true; + } + } + return false; + }; + + ts.addParser = function(parser) { + var i, l = ts.parsers.length, a = true; + for (i = 0; i < l; i++) { + if (ts.parsers[i].id.toLowerCase() === parser.id.toLowerCase()) { + a = false; + } + } + if (a) { + ts.parsers.push(parser); + } + }; + + ts.getParserById = function(name) { + var i, l = ts.parsers.length; + for (i = 0; i < l; i++) { + if (ts.parsers[i].id.toLowerCase() === (name.toString()).toLowerCase()) { + return ts.parsers[i]; + } + } + return false; + }; + + ts.addWidget = function(widget) { + ts.widgets.push(widget); + }; + + ts.getWidgetById = function(name) { + var i, w, l = ts.widgets.length; + for (i = 0; i < l; i++) { + w = ts.widgets[i]; + if (w && w.hasOwnProperty('id') && w.id.toLowerCase() === name.toLowerCase()) { + return w; + } + } + }; + + ts.applyWidget = function(table, init) { + table = $(table)[0]; // in case this is called externally + var c = table.config, + wo = c.widgetOptions, + widgets = [], + time, i, w, wd; + if (c.debug) { time = new Date(); } + if (c.widgets.length) { + // ensure unique widget ids + c.widgets = $.grep(c.widgets, function(v, k){ + return $.inArray(v, c.widgets) === k; + }); + // build widget array & add priority as needed + $.each(c.widgets || [], function(i,n){ + wd = ts.getWidgetById(n); + if (wd && wd.id) { + // set priority to 10 if not defined + if (!wd.priority) { wd.priority = 10; } + widgets[i] = wd; + } + }); + // sort widgets by priority + widgets.sort(function(a, b){ + return a.priority < b.priority ? -1 : a.priority === b.priority ? 0 : 1; + }); + + // add/update selected widgets + $.each(widgets, function(i,w){ + if (w) { + if (init) { + if (w.hasOwnProperty('options')) { + wo = table.config.widgetOptions = $.extend( true, {}, w.options, wo ); + } + if (w.hasOwnProperty('init')) { + w.init(table, w, c, wo); + } + } else if (!init && w.hasOwnProperty('format')) { + w.format(table, c, wo, false); + } + } + }); + } + if (c.debug) { + w = c.widgets.length; + benchmark("Completed " + (init === true ? "initializing " : "applying ") + w + " widget" + (w !== 1 ? "s" : ""), time); + } + }; + + ts.refreshWidgets = function(table, doAll, dontapply) { + table = $(table)[0]; // see issue #243 + var i, c = table.config, + cw = c.widgets, + w = ts.widgets, l = w.length; + // remove previous widgets + for (i = 0; i < l; i++){ + if ( w[i] && w[i].id && (doAll || $.inArray( w[i].id, cw ) < 0) ) { + if (c.debug) { log( 'Refeshing widgets: Removing ' + w[i].id ); } + if (w[i].hasOwnProperty('remove')) { w[i].remove(table, c, c.widgetOptions); } + } + } + if (dontapply !== true) { + ts.applyWidget(table, doAll); + } + }; + + // get sorter, string, empty, etc options for each column from + // jQuery data, metadata, header option or header class name ("sorter-false") + // priority = jQuery data > meta > headers option > header class name + ts.getData = function(h, ch, key) { + var val = '', $h = $(h), m, cl; + if (!$h.length) { return ''; } + m = $.metadata ? $h.metadata() : false; + cl = ' ' + ($h.attr('class') || ''); + if (typeof $h.data(key) !== 'undefined' || typeof $h.data(key.toLowerCase()) !== 'undefined'){ + // "data-lockedOrder" is assigned to "lockedorder"; but "data-locked-order" is assigned to "lockedOrder" + // "data-sort-initial-order" is assigned to "sortInitialOrder" + val += $h.data(key) || $h.data(key.toLowerCase()); + } else if (m && typeof m[key] !== 'undefined') { + val += m[key]; + } else if (ch && typeof ch[key] !== 'undefined') { + val += ch[key]; + } else if (cl !== ' ' && cl.match(' ' + key + '-')) { + // include sorter class name "sorter-text", etc; now works with "sorter-my-custom-parser" + val = cl.match( new RegExp('\\s' + key + '-([\\w-]+)') )[1] || ''; + } + return $.trim(val); + }; + + ts.formatFloat = function(s, table) { + if (typeof s !== 'string' || s === '') { return s; } + // allow using formatFloat without a table; defaults to US number format + var i, + t = table && table.config ? table.config.usNumberFormat !== false : + typeof table !== "undefined" ? table : true; + if (t) { + // US Format - 1,234,567.89 -> 1234567.89 + s = s.replace(/,/g,''); + } else { + // German Format = 1.234.567,89 -> 1234567.89 + // French Format = 1 234 567,89 -> 1234567.89 + s = s.replace(/[\s|\.]/g,'').replace(/,/g,'.'); + } + if(/^\s*\([.\d]+\)/.test(s)) { + // make (#) into a negative number -> (10) = -10 + s = s.replace(/^\s*\(/,'-').replace(/\)/,''); + } + i = parseFloat(s); + // return the text instead of zero + return isNaN(i) ? $.trim(s) : i; + }; + + ts.isDigit = function(s) { + // replace all unwanted chars and match + return isNaN(s) ? (/^[\-+(]?\d+[)]?$/).test(s.toString().replace(/[,.'"\s]/g, '')) : true; + }; + + }() + }); + + // make shortcut + var ts = $.tablesorter; + + // extend plugin scope + $.fn.extend({ + tablesorter: ts.construct + }); + + // add default parsers + ts.addParser({ + id: "text", + is: function() { + return true; + }, + format: function(s, table) { + var c = table.config; + if (s) { + s = $.trim( c.ignoreCase ? s.toLocaleLowerCase() : s ); + s = c.sortLocaleCompare ? ts.replaceAccents(s) : s; + } + return s; + }, + type: "text" + }); + + ts.addParser({ + id: "digit", + is: function(s) { + return ts.isDigit(s); + }, + format: function(s, table) { + var n = ts.formatFloat((s || '').replace(/[^\w,. \-()]/g, ""), table); + return s && typeof n === 'number' ? n : s ? $.trim( s && table.config.ignoreCase ? s.toLocaleLowerCase() : s ) : s; + }, + type: "numeric" + }); + + ts.addParser({ + id: "currency", + is: function(s) { + return (/^\(?\d+[\u00a3$\u20ac\u00a4\u00a5\u00a2?.]|[\u00a3$\u20ac\u00a4\u00a5\u00a2?.]\d+\)?$/).test((s || '').replace(/[,. ]/g,'')); // £$€¤¥¢ + }, + format: function(s, table) { + var n = ts.formatFloat((s || '').replace(/[^\w,. \-()]/g, ""), table); + return s && typeof n === 'number' ? n : s ? $.trim( s && table.config.ignoreCase ? s.toLocaleLowerCase() : s ) : s; + }, + type: "numeric" + }); + + ts.addParser({ + id: "ipAddress", + is: function(s) { + return (/^\d{1,3}[\.]\d{1,3}[\.]\d{1,3}[\.]\d{1,3}$/).test(s); + }, + format: function(s, table) { + var i, a = s ? s.split(".") : '', + r = "", + l = a.length; + for (i = 0; i < l; i++) { + r += ("00" + a[i]).slice(-3); + } + return s ? ts.formatFloat(r, table) : s; + }, + type: "numeric" + }); + + ts.addParser({ + id: "url", + is: function(s) { + return (/^(https?|ftp|file):\/\//).test(s); + }, + format: function(s) { + return s ? $.trim(s.replace(/(https?|ftp|file):\/\//, '')) : s; + }, + type: "text" + }); + + ts.addParser({ + id: "isoDate", + is: function(s) { + return (/^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}/).test(s); + }, + format: function(s, table) { + return s ? ts.formatFloat((s !== "") ? (new Date(s.replace(/-/g, "/")).getTime() || "") : "", table) : s; + }, + type: "numeric" + }); + + ts.addParser({ + id: "percent", + is: function(s) { + return (/(\d\s*?%|%\s*?\d)/).test(s) && s.length < 15; + }, + format: function(s, table) { + return s ? ts.formatFloat(s.replace(/%/g, ""), table) : s; + }, + type: "numeric" + }); + + ts.addParser({ + id: "usLongDate", + is: function(s) { + // two digit years are not allowed cross-browser + // Jan 01, 2013 12:34:56 PM or 01 Jan 2013 + return (/^[A-Z]{3,10}\.?\s+\d{1,2},?\s+(\d{4})(\s+\d{1,2}:\d{2}(:\d{2})?(\s+[AP]M)?)?$/i).test(s) || (/^\d{1,2}\s+[A-Z]{3,10}\s+\d{4}/i).test(s); + }, + format: function(s, table) { + return s ? ts.formatFloat( (new Date(s.replace(/(\S)([AP]M)$/i, "$1 $2")).getTime() || ''), table) : s; + }, + type: "numeric" + }); + + ts.addParser({ + id: "shortDate", // "mmddyyyy", "ddmmyyyy" or "yyyymmdd" + is: function(s) { + // testing for ##-##-#### or ####-##-##, so it's not perfect; time can be included + return (/(^\d{1,2}[\/\s]\d{1,2}[\/\s]\d{4})|(^\d{4}[\/\s]\d{1,2}[\/\s]\d{1,2})/).test((s || '').replace(/\s+/g," ").replace(/[\-.,]/g, "/")); + }, + format: function(s, table, cell, cellIndex) { + if (s) { + var c = table.config, ci = c.headerList[cellIndex], + format = ci.dateFormat || ts.getData( ci, c.headers[cellIndex], 'dateFormat') || c.dateFormat; + s = s.replace(/\s+/g," ").replace(/[\-.,]/g, "/"); // escaped - because JSHint in Firefox was showing it as an error + if (format === "mmddyyyy") { + s = s.replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/, "$3/$1/$2"); + } else if (format === "ddmmyyyy") { + s = s.replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/, "$3/$2/$1"); + } else if (format === "yyyymmdd") { + s = s.replace(/(\d{4})[\/\s](\d{1,2})[\/\s](\d{1,2})/, "$1/$2/$3"); + } + } + return s ? ts.formatFloat( (new Date(s).getTime() || ''), table) : s; + }, + type: "numeric" + }); + + ts.addParser({ + id: "time", + is: function(s) { + return (/^(([0-2]?\d:[0-5]\d)|([0-1]?\d:[0-5]\d\s?([AP]M)))$/i).test(s); + }, + format: function(s, table) { + return s ? ts.formatFloat( (new Date("2000/01/01 " + s.replace(/(\S)([AP]M)$/i, "$1 $2")).getTime() || ""), table) : s; + }, + type: "numeric" + }); + + ts.addParser({ + id: "metadata", + is: function() { + return false; + }, + format: function(s, table, cell) { + var c = table.config, + p = (!c.parserMetadataName) ? 'sortValue' : c.parserMetadataName; + return $(cell).metadata()[p]; + }, + type: "numeric" + }); + + // add default widgets + ts.addWidget({ + id: "zebra", + priority: 90, + format: function(table, c, wo) { + var $tb, $tv, $tr, row, even, time, k, l, + child = new RegExp(c.cssChildRow, 'i'), + b = c.$tbodies; + if (c.debug) { + time = new Date(); + } + for (k = 0; k < b.length; k++ ) { + // loop through the visible rows + $tb = b.eq(k); + l = $tb.children('tr').length; + if (l > 1) { + row = 0; + $tv = $tb.children('tr:visible'); + // revered back to using jQuery each - strangely it's the fastest method + /*jshint loopfunc:true */ + $tv.each(function(){ + $tr = $(this); + // style children rows the same way the parent row was styled + if (!child.test(this.className)) { row++; } + even = (row % 2 === 0); + $tr.removeClass(wo.zebra[even ? 1 : 0]).addClass(wo.zebra[even ? 0 : 1]); + }); + } + } + if (c.debug) { + ts.benchmark("Applying Zebra widget", time); + } + }, + remove: function(table, c, wo){ + var k, $tb, + b = c.$tbodies, + rmv = (wo.zebra || [ "even", "odd" ]).join(' '); + for (k = 0; k < b.length; k++ ){ + $tb = $.tablesorter.processTbody(table, b.eq(k), true); // remove tbody + $tb.children().removeClass(rmv); + $.tablesorter.processTbody(table, $tb, false); // restore tbody + } + } + }); + +})(jQuery); diff --git a/templates/admin/default/assets/js/tablesorter/jquery.tablesorter.widgets.js b/templates/admin/default/assets/js/tablesorter/jquery.tablesorter.widgets.js new file mode 100644 index 000000000..69c82b62f --- /dev/null +++ b/templates/admin/default/assets/js/tablesorter/jquery.tablesorter.widgets.js @@ -0,0 +1,1208 @@ +/*! tableSorter 2.8+ widgets - updated 6/4/2013 + * + * Column Styles + * Column Filters + * Column Resizing + * Sticky Header + * UI Theme (generalized) + * Save Sort + * [ "columns", "filter", "resizable", "stickyHeaders", "uitheme", "saveSort" ] + */ +/*jshint browser:true, jquery:true, unused:false, loopfunc:true */ +/*global jQuery: false, localStorage: false, navigator: false */ +;(function($){ +"use strict"; +var ts = $.tablesorter = $.tablesorter || {}; + +ts.themes = { + "bootstrap" : { + table : 'table table-bordered table-striped', + header : 'bootstrap-header', // give the header a gradient background + footerRow : '', + footerCells: '', + icons : '', // add "icon-white" to make them white; this icon class is added to the in the header + sortNone : 'bootstrap-icon-unsorted', + sortAsc : 'icon-chevron-up', + sortDesc : 'icon-chevron-down', + active : '', // applied when column is sorted + hover : '', // use custom css here - bootstrap class may not override it + filterRow : '', // filter row class + even : '', // even row zebra striping + odd : '' // odd row zebra striping + }, + "jui" : { + table : 'ui-widget ui-widget-content ui-corner-all', // table classes + header : 'ui-widget-header ui-corner-all ui-state-default', // header classes + footerRow : '', + footerCells: '', + icons : 'ui-icon', // icon class added to the in the header + sortNone : 'ui-icon-carat-2-n-s', + sortAsc : 'ui-icon-carat-1-n', + sortDesc : 'ui-icon-carat-1-s', + active : 'ui-state-active', // applied when column is sorted + hover : 'ui-state-hover', // hover class + filterRow : '', + even : 'ui-widget-content', // even row zebra striping + odd : 'ui-state-default' // odd row zebra striping + } +}; + +// *** Store data in local storage, with a cookie fallback *** +/* IE7 needs JSON library for JSON.stringify - (http://caniuse.com/#search=json) + if you need it, then include https://github.com/douglascrockford/JSON-js + + $.parseJSON is not available is jQuery versions older than 1.4.1, using older + versions will only allow storing information for one page at a time + + // *** Save data (JSON format only) *** + // val must be valid JSON... use http://jsonlint.com/ to ensure it is valid + var val = { "mywidget" : "data1" }; // valid JSON uses double quotes + // $.tablesorter.storage(table, key, val); + $.tablesorter.storage(table, 'tablesorter-mywidget', val); + + // *** Get data: $.tablesorter.storage(table, key); *** + v = $.tablesorter.storage(table, 'tablesorter-mywidget'); + // val may be empty, so also check for your data + val = (v && v.hasOwnProperty('mywidget')) ? v.mywidget : ''; + alert(val); // "data1" if saved, or "" if not +*/ +ts.storage = function(table, key, val){ + var d, k, ls = false, v = {}, + id = table.id || $('.tablesorter').index( $(table) ), + url = window.location.pathname; + // https://gist.github.com/paulirish/5558557 + if ("localStorage" in window) { + try { + window.localStorage.setItem('_tmptest', 'temp'); + ls = true; + window.localStorage.removeItem('_tmptest'); + } catch(e) {} + } + // *** get val *** + if ($.parseJSON){ + if (ls){ + v = $.parseJSON(localStorage[key] || '{}'); + } else { + k = document.cookie.split(/[;\s|=]/); // cookie + d = $.inArray(key, k) + 1; // add one to get from the key to the value + v = (d !== 0) ? $.parseJSON(k[d] || '{}') : {}; + } + } + // allow val to be an empty string to + if ((val || val === '') && window.JSON && JSON.hasOwnProperty('stringify')){ + // add unique identifiers = url pathname > table ID/index on page > data + if (!v[url]) { + v[url] = {}; + } + v[url][id] = val; + // *** set val *** + if (ls){ + localStorage[key] = JSON.stringify(v); + } else { + d = new Date(); + d.setTime(d.getTime() + (31536e+6)); // 365 days + document.cookie = key + '=' + (JSON.stringify(v)).replace(/\"/g,'\"') + '; expires=' + d.toGMTString() + '; path=/'; + } + } else { + return v && v[url] ? v[url][id] : {}; + } +}; + +// Add a resize event to table headers +// ************************** +ts.addHeaderResizeEvent = function(table, disable, options){ + var defaults = { + timer : 250 + }, + o = $.extend({}, defaults, options), + c = table.config, + wo = c.widgetOptions, + headers, + checkSizes = function(){ + wo.resize_flag = true; + headers = []; + c.$headers.each(function(){ + var d = $.data(this, 'savedSizes'), + w = this.offsetWidth, + h = this.offsetHeight; + if (w !== d[0] || h !== d[1]) { + $.data(this, 'savedSizes', [ w, h ]); + headers.push(this); + } + }); + if (headers.length) { c.$table.trigger('resize', [ headers ]); } + wo.resize_flag = false; + }; + clearInterval(wo.resize_timer); + if (disable) { + wo.resize_flag = false; + return false; + } + c.$headers.each(function(){ + $.data(this, 'savedSizes', [ this.offsetWidth, this.offsetHeight ]); + }); + wo.resize_timer = setInterval(function(){ + if (wo.resize_flag) { return; } + checkSizes(); + }, o.timer); +}; + +// Widget: General UI theme +// "uitheme" option in "widgetOptions" +// ************************** +ts.addWidget({ + id: "uitheme", + priority: 10, + options: { + uitheme : 'jui' + }, + format: function(table, c, wo){ + var time, klass, $el, $tar, + t = ts.themes, + $t = c.$table, + theme = c.theme !== 'default' ? c.theme : wo.uitheme || 'jui', + o = t[ t[theme] ? theme : t[wo.uitheme] ? wo.uitheme : 'jui'], + $h = c.$headers, + sh = 'tr.' + (wo.stickyHeaders || 'tablesorter-stickyHeader'), + rmv = o.sortNone + ' ' + o.sortDesc + ' ' + o.sortAsc; + if (c.debug) { time = new Date(); } + if (!$t.hasClass('tablesorter-' + theme) || c.theme === theme || !table.hasInitialized){ + // update zebra stripes + if (o.even !== '') { wo.zebra[0] += ' ' + o.even; } + if (o.odd !== '') { wo.zebra[1] += ' ' + o.odd; } + // add table/footer class names + t = $t + // remove other selected themes; use widgetOptions.theme_remove + .removeClass( c.theme === '' ? '' : 'tablesorter-' + c.theme ) + .addClass('tablesorter-' + theme + ' ' + o.table) // add theme widget class name + .find('tfoot'); + if (t.length) { + t + .find('tr').addClass(o.footerRow) + .children('th, td').addClass(o.footerCells); + } + // update header classes + $h + .addClass(o.header) + .filter(':not(.sorter-false)') + .bind('mouseenter.tsuitheme mouseleave.tsuitheme', function(e){ + // toggleClass with switch added in jQuery 1.3 + $(this)[ e.type === 'mouseenter' ? 'addClass' : 'removeClass' ](o.hover); + }); + if (!$h.find('.tablesorter-wrapper').length) { + // Firefox needs this inner div to position the resizer correctly + $h.wrapInner('
    '); + } + if (c.cssIcon){ + // if c.cssIcon is '', then no is added to the header + $h.find('.' + c.cssIcon).addClass(o.icons); + } + if ($t.hasClass('hasFilters')){ + $h.find('.tablesorter-filter-row').addClass(o.filterRow); + } + } + $.each($h, function(i){ + $el = $(this); + $tar = (c.cssIcon) ? $el.find('.' + c.cssIcon) : $el; + if (this.sortDisabled){ + // no sort arrows for disabled columns! + $el.removeClass(rmv); + $tar.removeClass(rmv + ' tablesorter-icon ' + o.icons); + } else { + t = ($t.hasClass('hasStickyHeaders')) ? $t.find(sh).find('th').eq(i).add($el) : $el; + klass = ($el.hasClass(c.cssAsc)) ? o.sortAsc : ($el.hasClass(c.cssDesc)) ? o.sortDesc : $el.hasClass(c.cssHeader) ? o.sortNone : ''; + $el[klass === o.sortNone ? 'removeClass' : 'addClass'](o.active); + $tar.removeClass(rmv).addClass(klass); + } + }); + if (c.debug){ + ts.benchmark("Applying " + theme + " theme", time); + } + }, + remove: function(table, c, wo){ + var $t = c.$table, + theme = typeof wo.uitheme === 'object' ? 'jui' : wo.uitheme || 'jui', + o = typeof wo.uitheme === 'object' ? wo.uitheme : ts.themes[ ts.themes.hasOwnProperty(theme) ? theme : 'jui'], + $h = $t.children('thead').children(), + rmv = o.sortNone + ' ' + o.sortDesc + ' ' + o.sortAsc; + $t + .removeClass('tablesorter-' + theme + ' ' + o.table) + .find(c.cssHeader).removeClass(o.header); + $h + .unbind('mouseenter.tsuitheme mouseleave.tsuitheme') // remove hover + .removeClass(o.hover + ' ' + rmv + ' ' + o.active) + .find('.tablesorter-filter-row').removeClass(o.filterRow); + $h.find('.tablesorter-icon').removeClass(o.icons); + } +}); + +// Widget: Column styles +// "columns", "columns_thead" (true) and +// "columns_tfoot" (true) options in "widgetOptions" +// ************************** +ts.addWidget({ + id: "columns", + priority: 30, + options : { + columns : [ "primary", "secondary", "tertiary" ] + }, + format: function(table, c, wo){ + var $tb, $tr, $td, $t, time, last, rmv, i, k, l, + $tbl = c.$table, + b = c.$tbodies, + list = c.sortList, + len = list.length, + // keep backwards compatibility, for now + css = (c.widgetColumns && c.widgetColumns.hasOwnProperty('css')) ? c.widgetColumns.css || css : + (wo && wo.hasOwnProperty('columns')) ? wo.columns || css : css; + last = css.length-1; + rmv = css.join(' '); + if (c.debug){ + time = new Date(); + } + // check if there is a sort (on initialization there may not be one) + for (k = 0; k < b.length; k++ ){ + $tb = ts.processTbody(table, b.eq(k), true); // detach tbody + $tr = $tb.children('tr'); + l = $tr.length; + // loop through the visible rows + $tr.each(function(){ + $t = $(this); + if (this.style.display !== 'none'){ + // remove all columns class names + $td = $t.children().removeClass(rmv); + // add appropriate column class names + if (list && list[0]){ + // primary sort column class + $td.eq(list[0][0]).addClass(css[0]); + if (len > 1){ + for (i = 1; i < len; i++){ + // secondary, tertiary, etc sort column classes + $td.eq(list[i][0]).addClass( css[i] || css[last] ); + } + } + } + } + }); + ts.processTbody(table, $tb, false); + } + // add classes to thead and tfoot + $tr = wo.columns_thead !== false ? 'thead tr' : ''; + if (wo.columns_tfoot !== false) { + $tr += ($tr === '' ? '' : ',') + 'tfoot tr'; + } + if ($tr.length) { + $t = $tbl.find($tr).children().removeClass(rmv); + if (list && list[0]){ + // primary sort column class + $t.filter('[data-column="' + list[0][0] + '"]').addClass(css[0]); + if (len > 1){ + for (i = 1; i < len; i++){ + // secondary, tertiary, etc sort column classes + $t.filter('[data-column="' + list[i][0] + '"]').addClass(css[i] || css[last]); + } + } + } + } + if (c.debug){ + ts.benchmark("Applying Columns widget", time); + } + }, + remove: function(table, c, wo){ + var k, $tb, + b = c.$tbodies, + rmv = (wo.columns || [ "primary", "secondary", "tertiary" ]).join(' '); + c.$headers.removeClass(rmv); + c.$table.children('tfoot').children('tr').children('th, td').removeClass(rmv); + for (k = 0; k < b.length; k++ ){ + $tb = ts.processTbody(table, b.eq(k), true); // remove tbody + $tb.children('tr').each(function(){ + $(this).children().removeClass(rmv); + }); + ts.processTbody(table, $tb, false); // restore tbody + } + } +}); + +// Widget: filter +// ************************** +ts.addWidget({ + id: "filter", + priority: 50, + options : { + filter_childRows : false, // if true, filter includes child row content in the search + filter_columnFilters : true, // if true, a filter will be added to the top of each table column + filter_cssFilter : 'tablesorter-filter', // css class name added to the filter row & each input in the row + filter_filteredRow : 'filtered', // class added to filtered rows; needed by pager plugin + filter_formatter : null, // add custom filter elements to the filter row + filter_functions : null, // add custom filter functions using this option + filter_hideFilters : false, // collapse filter row when mouse leaves the area + filter_ignoreCase : true, // if true, make all searches case-insensitive + filter_liveSearch : true, // if true, search column content while the user types (with a delay) + filter_onlyAvail : 'filter-onlyAvail', // a header with a select dropdown & this class name will only show available (visible) options within the drop down + filter_reset : null, // jQuery selector string of an element used to reset the filters + filter_searchDelay : 300, // typing delay in milliseconds before starting a search + filter_startsWith : false, // if true, filter start from the beginning of the cell contents + filter_useParsedData : false, // filter all data using parsed content + filter_serversideFiltering : false, // if true, server-side filtering should be performed because client-side filtering will be disabled, but the ui and events will still be used. + filter_defaultAttrib : 'data-value', // data attribute in the header cell that contains the default filter value + + // regex used in filter "check" functions - not for general use and not documented + filter_regex : { + "regex" : /^\/((?:\\\/|[^\/])+)\/([mig]{0,3})?$/, // regex to test for regex + "child" : /tablesorter-childRow/, // child row class name; this gets updated in the script + "filtered" : /filtered/, // filtered (hidden) row class name; updated in the script + "type" : /undefined|number/, // check type + "exact" : /(^[\"|\'|=])|([\"|\'|=]$)/g, // exact match + "nondigit" : /[^\w,. \-()]/g, // replace non-digits (from digit & currency parser) + "operators" : /[<>=]/g // replace operators + } + }, + format: function(table, c, wo){ + if (c.parsers && !c.$table.hasClass('hasFilters')){ + var i, j, k, l, val, ff, x, xi, st, sel, str, + ft, ft2, $th, rg, s, t, dis, col, + fmt = ts.formatFloat, + last = '', // save last filter search + $ths = c.$headers, + css = wo.filter_cssFilter, + $t = c.$table.addClass('hasFilters'), + b = $t.find('tbody'), + cols = c.parsers.length, + parsed, time, timer, + + // dig fer gold + checkFilters = function(filter){ + var arry = $.isArray(filter), + v = (arry) ? filter : ts.getFilters(table), + cv = (v || []).join(''); // combined filter values + // add filter array back into inputs + if (arry) { + ts.setFilters( $t, v ); + } + if (wo.filter_hideFilters){ + // show/hide filter row as needed + $t.find('.tablesorter-filter-row').trigger( cv === '' ? 'mouseleave' : 'mouseenter' ); + } + // return if the last search is the same; but filter === false when updating the search + // see example-widget-filter.html filter toggle buttons + if (last === cv && filter !== false) { return; } + $t.trigger('filterStart', [v]); + if (c.showProcessing) { + // give it time for the processing icon to kick in + setTimeout(function(){ + findRows(filter, v, cv); + return false; + }, 30); + } else { + findRows(filter, v, cv); + return false; + } + }, + findRows = function(filter, v, cv){ + var $tb, $tr, $td, cr, r, l, ff, time, r1, r2, searchFiltered; + if (c.debug) { time = new Date(); } + for (k = 0; k < b.length; k++ ){ + if (b.eq(k).hasClass(c.cssInfoBlock)) { continue; } // ignore info blocks, issue #264 + $tb = ts.processTbody(table, b.eq(k), true); + $tr = $tb.children('tr:not(.' + c.cssChildRow + ')'); + l = $tr.length; + if (cv === '' || wo.filter_serversideFiltering){ + $tb.children().show().removeClass(wo.filter_filteredRow); + } else { + // optimize searching only through already filtered rows - see #313 + searchFiltered = true; + r = $t.data('lastSearch') || []; + $.each(v, function(i,val){ + // check for changes from beginning of filter; but ignore if there is a logical "or" in the string + searchFiltered = (val || '').indexOf(r[i] || '') === 0 && searchFiltered && !/(\s+or\s+|\|)/g.test(val || ''); + }); + // can't search when all rows are hidden - this happens when looking for exact matches + if (searchFiltered && $tr.filter(':visible').length === 0) { searchFiltered = false; } + // loop through the rows + for (j = 0; j < l; j++){ + r = $tr[j].className; + // skip child rows & already filtered rows + if ( wo.filter_regex.child.test(r) || (searchFiltered && wo.filter_regex.filtered.test(r)) ) { continue; } + r = true; + cr = $tr.eq(j).nextUntil('tr:not(.' + c.cssChildRow + ')'); + // so, if "table.config.widgetOptions.filter_childRows" is true and there is + // a match anywhere in the child row, then it will make the row visible + // checked here so the option can be changed dynamically + t = (cr.length && wo.filter_childRows) ? cr.text() : ''; + t = wo.filter_ignoreCase ? t.toLocaleLowerCase() : t; + $td = $tr.eq(j).children('td'); + for (i = 0; i < cols; i++){ + // ignore if filter is empty or disabled + if (v[i]){ + // check if column data should be from the cell or from parsed data + if (wo.filter_useParsedData || parsed[i]){ + x = c.cache[k].normalized[j][i]; + } else { + // using older or original tablesorter + x = $.trim($td.eq(i).text()); + } + xi = !wo.filter_regex.type.test(typeof x) && wo.filter_ignoreCase ? x.toLocaleLowerCase() : x; + ff = r; // if r is true, show that row + // val = case insensitive, v[i] = case sensitive + val = wo.filter_ignoreCase ? v[i].toLocaleLowerCase() : v[i]; + if (wo.filter_functions && wo.filter_functions[i]){ + if (wo.filter_functions[i] === true){ + // default selector; no "filter-select" class + ff = ($ths.filter('[data-column="' + i + '"]:last').hasClass('filter-match')) ? xi.search(val) >= 0 : v[i] === x; + } else if (typeof wo.filter_functions[i] === 'function'){ + // filter callback( exact cell content, parser normalized content, filter input value, column index ) + ff = wo.filter_functions[i](x, c.cache[k].normalized[j][i], v[i], i); + } else if (typeof wo.filter_functions[i][v[i]] === 'function'){ + // selector option function + ff = wo.filter_functions[i][v[i]](x, c.cache[k].normalized[j][i], v[i], i); + } + // Look for regex + } else if (wo.filter_regex.regex.test(val)){ + rg = wo.filter_regex.regex.exec(val); + try { + ff = new RegExp(rg[1], rg[2]).test(xi); + } catch (err){ + ff = false; + } + // Look for quotes or equals to get an exact match; ignore type since xi could be numeric + /*jshint eqeqeq:false */ + } else if (val.replace(wo.filter_regex.exact, '') == xi){ + ff = true; + // Look for a not match + } else if (/^\!/.test(val)){ + val = val.replace('!',''); + s = xi.search($.trim(val)); + ff = val === '' ? true : !(wo.filter_startsWith ? s === 0 : s >= 0); + // Look for operators >, >=, < or <= + } else if (/^[<>]=?/.test(val)){ + s = fmt(val.replace(wo.filter_regex.nondigit, '').replace(wo.filter_regex.operators,''), table); + // parse filter value in case we're comparing numbers (dates) + if (parsed[i] || c.parsers[i].type === 'numeric') { + rg = c.parsers[i].format('' + val.replace(wo.filter_regex.operators,''), table, $ths.eq(i), i); + s = (rg !== '' && !isNaN(rg)) ? rg : s; + } + // xi may be numeric - see issue #149; + // check if c.cache[k].normalized[j] is defined, because sometimes j goes out of range? (numeric columns) + rg = ( parsed[i] || c.parsers[i].type === 'numeric' ) && !isNaN(s) && c.cache[k].normalized[j] ? c.cache[k].normalized[j][i] : + isNaN(xi) ? fmt(xi.replace(wo.filter_regex.nondigit, ''), table) : fmt(xi, table); + if (/>/.test(val)) { ff = />=/.test(val) ? rg >= s : rg > s; } + if (/= 0; + r1 = s.length - 1; + while (ff && r1) { + ff = ff && xi.search($.trim(s[r1])) >= 0; + r1--; + } + // Look for a range (using " to " or " - ") - see issue #166; thanks matzhu! + } else if (/\s+(-|to)\s+/.test(val)){ + s = val.split(/(?: - | to )/); // make sure the dash is for a range and not indicating a negative number + r1 = fmt(s[0].replace(wo.filter_regex.nondigit, ''), table); + r2 = fmt(s[1].replace(wo.filter_regex.nondigit, ''), table); + // parse filter value in case we're comparing numbers (dates) + if (parsed[i] || c.parsers[i].type === 'numeric') { + rg = c.parsers[i].format('' + s[0], table, $ths.eq(i), i); + r1 = (rg !== '' && !isNaN(rg)) ? rg : r1; + rg = c.parsers[i].format('' + s[1], table, $ths.eq(i), i); + r2 = (rg !== '' && !isNaN(rg)) ? rg : r2; + } + rg = ( parsed[i] || c.parsers[i].type === 'numeric' ) && !isNaN(r1) && !isNaN(r2) ? c.cache[k].normalized[j][i] : + isNaN(xi) ? fmt(xi.replace(wo.filter_regex.nondigit, ''), table) : fmt(xi, table); + if (r1 > r2) { ff = r1; r1 = r2; r2 = ff; } // swap + ff = (rg >= r1 && rg <= r2) || (r1 === '' || r2 === '') ? true : false; + // Look for wild card: ? = single, * = multiple, or | = logical OR + } else if ( /[\?|\*]/.test(val) || /\s+OR\s+/.test(v[i]) ){ + s = val.replace(/\s+OR\s+/gi,"|"); + // look for an exact match with the "or" unless the "filter-match" class is found + if (!$ths.filter('[data-column="' + i + '"]:last').hasClass('filter-match') && /\|/.test(s)) { + s = '^(' + s + ')$'; + } + ff = new RegExp( s.replace(/\?/g, '\\S{1}').replace(/\*/g, '\\S*') ).test(xi); + // Look for match, and add child row data for matching + } else { + x = (xi + t).indexOf(val); + ff = ( (!wo.filter_startsWith && x >= 0) || (wo.filter_startsWith && x === 0) ); + } + r = (ff) ? (r ? true : false) : false; + } + } + $tr[j].style.display = (r ? '' : 'none'); + $tr.eq(j)[r ? 'removeClass' : 'addClass'](wo.filter_filteredRow); + if (cr.length) { cr[r ? 'show' : 'hide'](); } + } + } + ts.processTbody(table, $tb, false); + } + last = cv; // save last search + $t.data('lastSearch', v); + if (c.debug){ + ts.benchmark("Completed filter widget search", time); + } + $t.trigger('applyWidgets'); // make sure zebra widget is applied + $t.trigger('filterEnd'); + }, + buildSelect = function(i, updating, onlyavail){ + var o, t, arry = [], currentVal; + i = parseInt(i, 10); + t = $ths.filter('[data-column="' + i + '"]:last'); + // t.data('placeholder') won't work in jQuery older than 1.4.3 + o = ''; + for (k = 0; k < b.length; k++ ){ + l = c.cache[k].row.length; + // loop through the rows + for (j = 0; j < l; j++){ + // check if has class filtered + if (onlyavail && c.cache[k].row[j][0].className.match(wo.filter_filteredRow)) { continue; } + // get non-normalized cell content + if (wo.filter_useParsedData){ + arry.push( '' + c.cache[k].normalized[j][i] ); + } else { + t = c.cache[k].row[j][0].cells[i]; + if (t){ + arry.push( $.trim(c.supportsTextContent ? t.textContent : $(t).text()) ); + } + } + } + } + + // get unique elements and sort the list + // if $.tablesorter.sortText exists (not in the original tablesorter), + // then natural sort the list otherwise use a basic sort + arry = $.grep(arry, function(v, k){ + return $.inArray(v, arry) === k; + }); + arry = (ts.sortText) ? arry.sort(function(a, b){ return ts.sortText(table, a, b, i); }) : arry.sort(true); + + // Get curent filter value + currentVal = $t.find('thead').find('select.' + css + '[data-column="' + i + '"]').val(); + + // build option list + for (k = 0; k < arry.length; k++){ + t = arry[k].replace(/\"/g, """); + // replace quotes - fixes #242 & ignore empty strings - see http://stackoverflow.com/q/14990971/145346 + o += arry[k] !== '' ? '' : ''; + } + $t.find('thead').find('select.' + css + '[data-column="' + i + '"]')[ updating ? 'html' : 'append' ](o); + }, + buildDefault = function(updating){ + // build default select dropdown + for (i = 0; i < cols; i++){ + t = $ths.filter('[data-column="' + i + '"]:last'); + // look for the filter-select class; build/update it if found + if ((t.hasClass('filter-select') || wo.filter_functions && wo.filter_functions[i] === true) && !t.hasClass('filter-false')){ + if (!wo.filter_functions) { wo.filter_functions = {}; } + wo.filter_functions[i] = true; // make sure this select gets processed by filter_functions + buildSelect(i, updating, t.hasClass(wo.filter_onlyAvail)); + } + } + }, + searching = function(filter){ + if (typeof filter === 'undefined' || filter === true){ + // delay filtering + clearTimeout(timer); + timer = setTimeout(function(){ + checkFilters(filter); + }, wo.filter_liveSearch ? wo.filter_searchDelay : 10); + } else { + // skip delay + checkFilters(filter); + } + }; + if (c.debug){ + time = new Date(); + } + wo.filter_regex.child = new RegExp(c.cssChildRow); + wo.filter_regex.filtered = new RegExp(wo.filter_filteredRow); + // don't build filter row if columnFilters is false or all columns are set to "filter-false" - issue #156 + if (wo.filter_columnFilters !== false && $ths.filter('.filter-false').length !== $ths.length){ + // build filter row + t = '    '; + for (i = 0; i < cols; i++){ + t += ''; + } + c.$filters = $(t += '').appendTo( $t.find('thead').eq(0) ).find('td'); + // build each filter input + for (i = 0; i < cols; i++){ + dis = false; + $th = $ths.filter('[data-column="' + i + '"]:last'); // assuming last cell of a column is the main column + sel = (wo.filter_functions && wo.filter_functions[i] && typeof wo.filter_functions[i] !== 'function') || $th.hasClass('filter-select'); + // use header option - headers: { 1: { filter: false } } OR add class="filter-false" + if (ts.getData){ + // get data from jQuery data, metadata, headers option or header class name + dis = ts.getData($th[0], c.headers[i], 'filter') === 'false'; + } else { + // only class names and header options - keep this for compatibility with tablesorter v2.0.5 + dis = (c.headers[i] && c.headers[i].hasOwnProperty('filter') && c.headers[i].filter === false) || $th.hasClass('filter-false'); + } + + if (sel){ + t = $('').appendTo( c.$filters.eq(i) ); + } + if (t) { + t.attr('placeholder', $th.data('placeholder') || $th.attr('data-placeholder') || ''); + } + } + if (t) { + t.addClass(css).attr('data-column', i); + if (dis) { + t.addClass('disabled')[0].disabled = true; // disabled! + } + } + } + } + $t + .bind('addRows updateCell update updateRows updateComplete appendCache filterReset filterEnd search '.split(' ').join('.tsfilter '), function(e, filter){ + if (!/(search|filterReset|filterEnd)/.test(e.type)){ + e.stopPropagation(); + buildDefault(true); + } + if (e.type === 'filterReset') { + $t.find('.' + css).val(''); + } + if (e.type === 'filterEnd') { + buildDefault(true); + } else { + // send false argument to force a new search; otherwise if the filter hasn't changed, it will return + filter = e.type === 'search' ? filter : e.type === 'updateComplete' ? $t.data('lastSearch') : ''; + searching(filter); + } + return false; + }) + .find('input.' + css).bind('keyup search', function(e, filter){ + // emulate what webkit does.... escape clears the filter + if (e.which === 27) { + this.value = ''; + // liveSearch can contain a min value length; ignore arrow and meta keys, but allow backspace + } else if ( (typeof wo.filter_liveSearch === 'number' && this.value.length < wo.filter_liveSearch && this.value !== '') || ( e.type === 'keyup' && + ( (e.which < 32 && e.which !== 8 && wo.filter_liveSearch === true && e.which !== 13) || (e.which >= 37 && e.which <=40) || (e.which !== 13 && wo.filter_liveSearch === false) ) ) ) { + return; + } + searching(filter); + }); + + // parse columns after formatter, in case the class is added at that point + parsed = $ths.map(function(i){ + return (ts.getData) ? ts.getData($ths.filter('[data-column="' + i + '"]:last'), c.headers[i], 'filter') === 'parsed' : $(this).hasClass('filter-parsed'); + }).get(); + + // reset button/link + if (wo.filter_reset && $(wo.filter_reset).length){ + $(wo.filter_reset).bind('click.tsfilter', function(){ + $t.trigger('filterReset'); + }); + } + if (wo.filter_functions){ + // i = column # (string) + for (col in wo.filter_functions){ + if (wo.filter_functions.hasOwnProperty(col) && typeof col === 'string'){ + t = $ths.filter('[data-column="' + col + '"]:last'); + ff = ''; + if (wo.filter_functions[col] === true && !t.hasClass('filter-false')){ + buildSelect(col); + } else if (typeof col === 'string' && !t.hasClass('filter-false')){ + // add custom drop down list + for (str in wo.filter_functions[col]){ + if (typeof str === 'string'){ + ff += ff === '' ? '' : ''; + ff += ''; + } + } + $t.find('thead').find('select.' + css + '[data-column="' + col + '"]').append(ff); + } + } + } + } + // not really updating, but if the column has both the "filter-select" class & filter_functions set to true, + // it would append the same options twice. + buildDefault(true); + + $t.find('select.' + css).bind('change search', function(e, filter){ + checkFilters(filter); + }); + + if (wo.filter_hideFilters){ + $t + .find('.tablesorter-filter-row') + .addClass('hideme') + .bind('mouseenter mouseleave', function(e){ + // save event object - http://bugs.jquery.com/ticket/12140 + var all, evt = e; + ft = $(this); + clearTimeout(st); + st = setTimeout(function(){ + if (/enter|over/.test(evt.type)){ + ft.removeClass('hideme'); + } else { + // don't hide if input has focus + // $(':focus') needs jQuery 1.6+ + if ($(document.activeElement).closest('tr')[0] !== ft[0]){ + // get all filter values + all = $t.find('.' + wo.filter_cssFilter).map(function(){ + return $(this).val() || ''; + }).get().join(''); + // don't hide row if any filter has a value + if (all === ''){ + ft.addClass('hideme'); + } + } + } + }, 200); + }) + .find('input, select').bind('focus blur', function(e){ + ft2 = $(this).closest('tr'); + clearTimeout(st); + st = setTimeout(function(){ + // don't hide row if any filter has a value + if ($t.find('.' + wo.filter_cssFilter).map(function(){ return $(this).val() || ''; }).get().join('') === ''){ + ft2[ e.type === 'focus' ? 'removeClass' : 'addClass']('hideme'); + } + }, 200); + }); + } + + // show processing icon + if (c.showProcessing) { + $t.bind('filterStart.tsfilter filterEnd.tsfilter', function(e, v) { + var fc = (v) ? $t.find('.' + c.cssHeader).filter('[data-column]').filter(function(){ + return v[$(this).data('column')] !== ''; + }) : ''; + ts.isProcessing($t[0], e.type === 'filterStart', v ? fc : ''); + }); + } + + if (c.debug){ + ts.benchmark("Applying Filter widget", time); + } + // add default values + $t.bind('tablesorter-initialized', function(){ + ff = ts.getFilters(table); + for (i = 0; i < ff.length; i++) { + ff[i] = $ths.filter('[data-column="' + i + '"]:last').attr(wo.filter_defaultAttrib) || ff[i]; + } + ts.setFilters(table, ff, true); + }); + // filter widget initialized + $t.trigger('filterInit'); + checkFilters(); + } + }, + remove: function(table, c, wo){ + var k, $tb, + $t = c.$table, + b = c.$tbodies; + $t + .removeClass('hasFilters') + // add .tsfilter namespace to all BUT search + .unbind('addRows updateCell update updateComplete appendCache search filterStart filterEnd '.split(' ').join('.tsfilter ')) + .find('.tablesorter-filter-row').remove(); + for (k = 0; k < b.length; k++ ){ + $tb = ts.processTbody(table, b.eq(k), true); // remove tbody + $tb.children().removeClass(wo.filter_filteredRow).show(); + ts.processTbody(table, $tb, false); // restore tbody + } + if (wo.filterreset) { $(wo.filter_reset).unbind('click.tsfilter'); } + } +}); +ts.getFilters = function(table) { + var c = table ? $(table)[0].config : {}; + if (c && c.widgetOptions && !c.widgetOptions.filter_columnFilters) { return $(table).data('lastSearch'); } + return c && c.$filters ? c.$filters.find('.' + c.widgetOptions.filter_cssFilter).map(function(i, el) { + return $(el).val(); + }).get() || [] : false; +}; +ts.setFilters = function(table, filter, apply) { + var $t = $(table), + c = $t.length ? $t[0].config : {}, + valid = c && c.$filters ? c.$filters.find('.' + c.widgetOptions.filter_cssFilter).each(function(i, el) { + $(el).val(filter[i] || ''); + }).trigger('change.tsfilter') || false : false; + if (apply) { $t.trigger('search', [filter, false]); } + return !!valid; +}; + +// Widget: Sticky headers +// based on this awesome article: +// http://css-tricks.com/13465-persistent-headers/ +// and https://github.com/jmosbech/StickyTableHeaders by Jonas Mosbech +// ************************** +ts.addWidget({ + id: "stickyHeaders", + priority: 60, + options: { + stickyHeaders : 'tablesorter-stickyHeader', + stickyHeaders_offset : 0, // number or jquery selector targeting the position:fixed element + stickyHeaders_cloneId : '-sticky', // added to table ID, if it exists + stickyHeaders_addResizeEvent : true, // trigger "resize" event on headers + stickyHeaders_includeCaption : true // if false and a caption exist, it won't be included in the sticky header + }, + format: function(table, c, wo){ + if (c.$table.hasClass('hasStickyHeaders')) { return; } + var $t = c.$table, + $win = $(window), + header = $t.children('thead:first'), + hdrCells = header.children('tr:not(.sticky-false)').children(), + innr = '.tablesorter-header-inner', + tfoot = $t.find('tfoot'), + filterInputs = '.' + (wo.filter_cssFilter || 'tablesorter-filter'), + $stickyOffset = isNaN(wo.stickyHeaders_offset) ? $(wo.stickyHeaders_offset) : '', + stickyOffset = $stickyOffset.length ? $stickyOffset.height() || 0 : parseInt(wo.stickyHeaders_offset, 10) || 0, + $stickyTable = wo.$sticky = $t.clone() + .addClass('containsStickyHeaders') + .css({ + position : 'fixed', + margin : 0, + top : stickyOffset, + visibility : 'hidden', + zIndex : 2 + }), + stkyHdr = $stickyTable.children('thead:first').addClass(wo.stickyHeaders), + stkyCells, + laststate = '', + spacing = 0, + flag = false, + resizeHdr = function(){ + stickyOffset = $stickyOffset.length ? $stickyOffset.height() || 0 : parseInt(wo.stickyHeaders_offset, 10) || 0; + var bwsr = navigator.userAgent; + spacing = 0; + // yes, I dislike browser sniffing, but it really is needed here :( + // webkit automatically compensates for border spacing + if ($t.css('border-collapse') !== 'collapse' && !/(webkit|msie)/i.test(bwsr)) { + // Firefox & Opera use the border-spacing + // update border-spacing here because of demos that switch themes + spacing = parseInt(hdrCells.eq(0).css('border-left-width'), 10) * 2; + } + $stickyTable.css({ + left : header.offset().left - $win.scrollLeft() - spacing, + width: $t.width() + }); + stkyCells.filter(':visible').each(function(i){ + var $h = hdrCells.filter(':visible').eq(i); + $(this) + .css({ + width: $h.width() - spacing, + height: $h.height() + }) + .find(innr).width( $h.find(innr).width() ); + }); + }; + // fix clone ID, if it exists - fixes #271 + if ($stickyTable.attr('id')) { $stickyTable[0].id += wo.stickyHeaders_cloneId; } + // clear out cloned table, except for sticky header + // include caption & filter row (fixes #126 & #249) + $stickyTable.find('thead:gt(0), tr.sticky-false, tbody, tfoot').remove(); + if (!wo.stickyHeaders_includeCaption) { + $stickyTable.find('caption').remove(); + } + // issue #172 - find td/th in sticky header + stkyCells = stkyHdr.children().children(); + $stickyTable.css({ height:0, width:0, padding:0, margin:0, border:0 }); + // remove resizable block + stkyCells.find('.tablesorter-resizer').remove(); + // update sticky header class names to match real header after sorting + $t + .addClass('hasStickyHeaders') + .bind('sortEnd.tsSticky', function(){ + hdrCells.filter(':visible').each(function(i){ + var t = stkyCells.filter(':visible').eq(i); + t + .attr('class', $(this).attr('class')) + // remove processing icon + .removeClass(c.cssProcessing); + if (c.cssIcon){ + t + .find('.' + c.cssIcon) + .attr('class', $(this).find('.' + c.cssIcon).attr('class')); + } + }); + }) + .bind('pagerComplete.tsSticky', function(){ + resizeHdr(); + }); + // http://stackoverflow.com/questions/5312849/jquery-find-self; + hdrCells.find(c.selectorSort).add( c.$headers.filter(c.selectorSort) ).each(function(i){ + var t = $(this), + // clicking on sticky will trigger sort + $cell = stkyHdr.children('tr.tablesorter-headerRow').children().eq(i).bind('mouseup', function(e){ + t.trigger(e, true); // external mouseup flag (click timer is ignored) + }); + // prevent sticky header text selection + if (c.cancelSelection) { + $cell + .attr('unselectable', 'on') + .bind('selectstart', false) + .css({ + 'user-select': 'none', + 'MozUserSelect': 'none' + }); + } + }); + // add stickyheaders AFTER the table. If the table is selected by ID, the original one (first) will be returned. + $t.after( $stickyTable ); + // make it sticky! + $win.bind('scroll.tsSticky resize.tsSticky', function(e){ + if (!$t.is(':visible')) { return; } // fixes #278 + var pre = 'tablesorter-sticky-', + offset = $t.offset(), + cap = -(wo.stickyHeaders_includeCaption ? 0 : $t.find('caption').height()), + sTop = $win.scrollTop() + stickyOffset, + tableHt = $t.height() - ($stickyTable.height() + (tfoot.height() || 0)), + vis = (sTop > offset.top - cap) && (sTop < offset.top - cap + tableHt) ? 'visible' : 'hidden'; + $stickyTable + .removeClass(pre + 'visible ' + pre + 'hidden') + .addClass(pre + vis) + .css({ + // adjust when scrolling horizontally - fixes issue #143 + left : header.offset().left - $win.scrollLeft() - spacing, + visibility : vis + }); + if (vis !== laststate || e.type === 'resize'){ + // make sure the column widths match + resizeHdr(); + laststate = vis; + } + }); + if (wo.stickyHeaders_addResizeEvent) { + ts.addHeaderResizeEvent(table); + } + + // look for filter widget + $t.bind('filterEnd', function(){ + if (flag) { return; } + stkyHdr.find('.tablesorter-filter-row').children().each(function(i){ + $(this).find(filterInputs).val( c.$filters.find(filterInputs).eq(i).val() ); + }); + }); + stkyCells.find(filterInputs).bind('keyup search change', function(e){ + // ignore arrow and meta keys; allow backspace + if ((e.which < 32 && e.which !== 8) || (e.which >= 37 && e.which <=40)) { return; } + flag = true; + var $f = $(this), col = $f.attr('data-column'); + c.$filters.find(filterInputs).eq(col) + .val( $f.val() ) + .trigger('search'); + setTimeout(function(){ + flag = false; + }, wo.filter_searchDelay); + }); + $t.trigger('stickyHeadersInit'); + + }, + remove: function(table, c, wo){ + c.$table + .removeClass('hasStickyHeaders') + .unbind('sortEnd.tsSticky pagerComplete.tsSticky') + .find('.' + wo.stickyHeaders).remove(); + if (wo.$sticky && wo.$sticky.length) { wo.$sticky.remove(); } // remove cloned table + // don't unbind if any table on the page still has stickyheaders applied + if (!$('.hasStickyHeaders').length) { + $(window).unbind('scroll.tsSticky resize.tsSticky'); + } + ts.addHeaderResizeEvent(table, false); + } +}); + +// Add Column resizing widget +// this widget saves the column widths if +// $.tablesorter.storage function is included +// ************************** +ts.addWidget({ + id: "resizable", + priority: 40, + options: { + resizable : true, + resizable_addLastColumn : false + }, + format: function(table, c, wo){ + if (c.$table.hasClass('hasResizable')) { return; } + c.$table.addClass('hasResizable'); + var $t, t, i, j, s = {}, $c, $cols, w, tw, + $tbl = c.$table, + position = 0, + $target = null, + $next = null, + fullWidth = Math.abs($tbl.parent().width() - $tbl.width()) < 20, + stopResize = function(){ + if (ts.storage && $target){ + s[$target.index()] = $target.width(); + s[$next.index()] = $next.width(); + $target.width( s[$target.index()] ); + $next.width( s[$next.index()] ); + if (wo.resizable !== false){ + ts.storage(table, 'tablesorter-resizable', s); + } + } + position = 0; + $target = $next = null; + $(window).trigger('resize'); // will update stickyHeaders, just in case + }; + s = (ts.storage && wo.resizable !== false) ? ts.storage(table, 'tablesorter-resizable') : {}; + // process only if table ID or url match + if (s){ + for (j in s){ + if (!isNaN(j) && j < c.$headers.length){ + c.$headers.eq(j).width(s[j]); // set saved resizable widths + } + } + } + $t = $tbl.children('thead:first').children('tr'); + // add resizable-false class name to headers (across rows as needed) + $t.children().each(function(){ + t = $(this); + i = t.attr('data-column'); + j = ts.getData( t, c.headers[i], 'resizable') === "false"; + $t.children().filter('[data-column="' + i + '"]').toggleClass('resizable-false', j); + }); + // add wrapper inside each cell to allow for positioning of the resizable target block + $t.each(function(){ + $c = $(this).children(':not(.resizable-false)'); + if (!$(this).find('.tablesorter-wrapper').length) { + // Firefox needs this inner div to position the resizer correctly + $c.wrapInner('
    '); + } + // don't include the last column of the row + if (!wo.resizable_addLastColumn) { $c = $c.slice(0,-1); } + $cols = $cols ? $cols.add($c) : $c; + }); + $cols + .each(function(){ + $t = $(this); + j = parseInt($t.css('padding-right'), 10) + 10; // 8 is 1/2 of the 16px wide resizer grip + t = '
    '; + $t + .find('.tablesorter-wrapper') + .append(t); + }) + .bind('mousemove.tsresize', function(e){ + // ignore mousemove if no mousedown + if (position === 0 || !$target) { return; } + // resize columns + w = e.pageX - position; + tw = $target.width(); + $target.width( tw + w ); + if ($target.width() !== tw && fullWidth){ + $next.width( $next.width() - w ); + } + position = e.pageX; + }) + .bind('mouseup.tsresize', function(){ + stopResize(); + }) + .find('.tablesorter-resizer,.tablesorter-resizer-grip') + .bind('mousedown', function(e){ + // save header cell and mouse position; closest() not supported by jQuery v1.2.6 + $target = $(e.target).closest('th'); + t = c.$headers.filter('[data-column="' + $target.attr('data-column') + '"]'); + if (t.length > 1) { $target = $target.add(t); } + // if table is not as wide as it's parent, then resize the table + $next = e.shiftKey ? $target.parent().find('th:not(.resizable-false)').filter(':last') : $target.nextAll(':not(.resizable-false)').eq(0); + position = e.pageX; + }); + $tbl.find('thead:first') + .bind('mouseup.tsresize mouseleave.tsresize', function(){ + stopResize(); + }) + // right click to reset columns to default widths + .bind('contextmenu.tsresize', function(){ + ts.resizableReset(table); + // $.isEmptyObject() needs jQuery 1.4+ + var rtn = $.isEmptyObject ? $.isEmptyObject(s) : s === {}; // allow right click if already reset + s = {}; + return rtn; + }); + }, + remove: function(table, c, wo){ + c.$table + .removeClass('hasResizable') + .find('thead') + .unbind('mouseup.tsresize mouseleave.tsresize contextmenu.tsresize') + .find('tr').children() + .unbind('mousemove.tsresize mouseup.tsresize') + // don't remove "tablesorter-wrapper" as uitheme uses it too + .find('.tablesorter-resizer,.tablesorter-resizer-grip').remove(); + ts.resizableReset(table); + } +}); +ts.resizableReset = function(table){ + table.config.$headers.filter(':not(.resizable-false)').css('width',''); + if (ts.storage) { ts.storage(table, 'tablesorter-resizable', {}); } +}; + +// Save table sort widget +// this widget saves the last sort only if the +// saveSort widget option is true AND the +// $.tablesorter.storage function is included +// ************************** +ts.addWidget({ + id: 'saveSort', + priority: 20, + options: { + saveSort : true + }, + init: function(table, thisWidget, c, wo){ + // run widget format before all other widgets are applied to the table + thisWidget.format(table, c, wo, true); + }, + format: function(table, c, wo, init){ + var sl, time, + $t = c.$table, + ss = wo.saveSort !== false, // make saveSort active/inactive; default to true + sortList = { "sortList" : c.sortList }; + if (c.debug){ + time = new Date(); + } + if ($t.hasClass('hasSaveSort')){ + if (ss && table.hasInitialized && ts.storage){ + ts.storage( table, 'tablesorter-savesort', sortList ); + if (c.debug){ + ts.benchmark('saveSort widget: Saving last sort: ' + c.sortList, time); + } + } + } else { + // set table sort on initial run of the widget + $t.addClass('hasSaveSort'); + sortList = ''; + // get data + if (ts.storage){ + sl = ts.storage( table, 'tablesorter-savesort' ); + sortList = (sl && sl.hasOwnProperty('sortList') && $.isArray(sl.sortList)) ? sl.sortList : ''; + if (c.debug){ + ts.benchmark('saveSort: Last sort loaded: "' + sortList + '"', time); + } + $t.bind('saveSortReset', function(e){ + e.stopPropagation(); + ts.storage( table, 'tablesorter-savesort', '' ); + }); + } + // init is true when widget init is run, this will run this widget before all other widgets have initialized + // this method allows using this widget in the original tablesorter plugin; but then it will run all widgets twice. + if (init && sortList && sortList.length > 0){ + c.sortList = sortList; + } else if (table.hasInitialized && sortList && sortList.length > 0){ + // update sort change + $t.trigger('sorton', [sortList]); + } + } + }, + remove: function(table){ + // clear storage + if (ts.storage) { ts.storage( table, 'tablesorter-savesort', '' ); } + } +}); + +})(jQuery); diff --git a/templates/admin/default/coupon/list.html b/templates/admin/default/coupon/list.html index 4d42c91b2..a387da05f 100755 --- a/templates/admin/default/coupon/list.html +++ b/templates/admin/default/coupon/list.html @@ -31,8 +31,8 @@     - - + + @@ -92,7 +92,7 @@ - + @@ -184,6 +184,10 @@ {/javascripts} +{javascripts file='../assets/js/tablesorter/jquery.tablesorter.widgets.js'} + +{/javascripts} + {javascripts file='../assets/js/main.js'} {/javascripts} From 71d557020fe200b5b9e700fbf31ba8f1ceeaf5c1 Mon Sep 17 00:00:00 2001 From: mespeche Date: Mon, 2 Sep 2013 16:39:57 +0200 Subject: [PATCH 041/125] WIP Add slider and others filter on tablesorter --- templates/admin/default/assets/js/main.js | 20 +- ...ry.tablesorter.widgets-filter-formatter.js | 826 ++++++++++++++++++ templates/admin/default/coupon/list.html | 30 +- 3 files changed, 862 insertions(+), 14 deletions(-) create mode 100644 templates/admin/default/assets/js/tablesorter/jquery.tablesorter.widgets-filter-formatter.js diff --git a/templates/admin/default/assets/js/main.js b/templates/admin/default/assets/js/main.js index 515f529f3..90e67d721 100644 --- a/templates/admin/default/assets/js/main.js +++ b/templates/admin/default/assets/js/main.js @@ -9,10 +9,26 @@ // -- Init tablesorter -- if($('.tablesorter').length){ - $('.tablesorter').tablesorter({ - widgets: ["filter"], + $('.tablesorter').tablesorter({ + widgets: ["filter", "stickyHeaders"], + widthFixed : false, widgetOptions : { filter_cssFilter : 'input-medium', + filter_formatter : { + 3 : function($cell, indx){ + return $.tablesorter.filterFormatter.uiSlider( $cell, indx, { + animate : true, + value: 1, + min: 1, + max: 50, + delayed: true, + valueToHeader: true, + exactMatch: false, + allText: 'all', + compare: '>=' + }); + } + } } }); } diff --git a/templates/admin/default/assets/js/tablesorter/jquery.tablesorter.widgets-filter-formatter.js b/templates/admin/default/assets/js/tablesorter/jquery.tablesorter.widgets-filter-formatter.js new file mode 100644 index 000000000..83bb8b793 --- /dev/null +++ b/templates/admin/default/assets/js/tablesorter/jquery.tablesorter.widgets-filter-formatter.js @@ -0,0 +1,826 @@ +/*! Filter widget formatter functions - updated 6/4/2013 + * requires: tableSorter 2.7.7+ and jQuery 1.4.3+ + * + * uiSpinner (jQuery UI spinner) + * uiSlider (jQuery UI slider) + * uiRange (jQuery UI range slider) + * uiDateCompare (jQuery UI datepicker; 1 input) + * uiDatepicker (jQuery UI datepicker; 2 inputs, filter range) + * html5Number (spinner) + * html5Range (slider) + * html5Color (color) + */ +/*jshint browser:true, jquery:true, unused:false */ +/*global jQuery: false */ +;(function($){ +"use strict"; +$.tablesorter = $.tablesorter || {}; + +$.tablesorter.filterFormatter = { + + /**********************\ + jQuery UI Spinner + \**********************/ + uiSpinner: function($cell, indx, spinnerDef) { + var o = $.extend({ + min : 0, + max : 100, + step : 1, + value : 1, + delayed : true, + addToggle : true, + disabled : false, + exactMatch : true, + compare : '' + }, spinnerDef ), + // Add a hidden input to hold the range values + $input = $('') + .appendTo($cell) + // hidden filter update (.tsfilter) namespace trigger by filter widget + .bind('change.tsfilter', function(){ + updateSpinner({ value: this.value, delayed: false }); + }), + $shcell = [], + c = $cell.closest('table')[0].config, + + // this function updates the hidden input and adds the current values to the header cell text + updateSpinner = function(ui) { + var chkd = true, state, + // ui is not undefined on create + v = ui && ui.value && $.tablesorter.formatFloat((ui.value + '').replace(/[><=]/g,'')) || $cell.find('.spinner').val() || o.value; + if (o.addToggle) { + chkd = $cell.find('.toggle').is(':checked'); + } + state = o.disabled || !chkd ? 'disable' : 'enable'; + $cell.find('.filter') + // add equal to the beginning, so we filter exact numbers + .val( chkd ? (o.compare ? o.compare : o.exactMatch ? '=' : '') + v : '' ) + .trigger('search', ui && typeof ui.delayed === 'boolean' ? ui.delayed : o.delayed).end() + .find('.spinner').spinner(state).val(v); + // update sticky header cell + if ($shcell.length) { + $shcell.find('.spinner').spinner(state).val(v); + if (o.addToggle) { + $shcell.find('.toggle')[0].checked = chkd; + } + } + }; + + // add callbacks; preserve added callbacks + o.oldcreate = o.create; + o.oldspin = o.spin; + o.create = function(event, ui) { + updateSpinner(); // ui is an empty object on create + if (typeof o.oldcreate === 'function') { o.oldcreate(event, ui); } + }; + o.spin = function(event, ui) { + updateSpinner(ui); + if (typeof o.oldspin === 'function') { o.oldspin(event, ui); } + }; + if (o.addToggle) { + $('
    ') + .appendTo($cell) + .find('.toggle') + .bind('change', function(){ + updateSpinner(); + }); + } + // make sure we use parsed data + $cell.closest('thead').find('th[data-column=' + indx + ']').addClass('filter-parsed'); + // add a jQuery UI spinner! + $('') + .val(o.value) + .appendTo($cell) + .spinner(o) + .bind('change keyup', function(e){ + updateSpinner(); + }); + + // has sticky headers? + c.$table.bind('stickyHeadersInit', function(){ + $shcell = c.widgetOptions.$sticky.find('.tablesorter-filter-row').children().eq(indx).empty(); + if (o.addToggle) { + $('
    ') + .appendTo($shcell) + .find('.toggle') + .bind('change', function(){ + $cell.find('.toggle')[0].checked = this.checked; + updateSpinner(); + }); + } + // add a jQuery UI spinner! + $('') + .val(o.value) + .appendTo($shcell) + .spinner(o) + .bind('change keyup', function(e){ + $cell.find('.spinner').val( this.value ); + updateSpinner(); + }); + }); + + // on reset + c.$table.bind('filterReset', function(){ + // turn off the toggle checkbox + if (o.addToggle) { + $cell.find('.toggle')[0].checked = false; + } + updateSpinner(); + }); + + updateSpinner(); + return $input; + }, + + /**********************\ + jQuery UI Slider + \**********************/ + uiSlider: function($cell, indx, sliderDef) { + var o = $.extend({ + value : 0, + min : 0, + max : 100, + step : 1, + range : "min", + delayed : true, + valueToHeader : false, + exactMatch : true, + compare : '', + allText : 'all' + }, sliderDef ), + // Add a hidden input to hold the range values + $input = $('') + .appendTo($cell) + // hidden filter update (.tsfilter) namespace trigger by filter widget + .bind('change.tsfilter', function(){ + updateSlider({ value: this.value }); + }), + $shcell = [], + c = $cell.closest('table')[0].config, + + // this function updates the hidden input and adds the current values to the header cell text + updateSlider = function(ui) { + // ui is not undefined on create + var v = typeof ui !== "undefined" ? $.tablesorter.formatFloat((ui.value + '').replace(/[><=]/g,'')) || o.min : o.value, + val = o.compare ? v : v === o.min ? o.allText : v, + result = o.compare + val; + if (o.valueToHeader) { + // add range indication to the header cell above! + $cell.closest('thead').find('th[data-column=' + indx + ']').find('.curvalue').html(' (' + result + ')'); + } else { + // add values to the handle data-value attribute so the css tooltip will work properly + $cell.find('.ui-slider-handle').addClass('value-popup').attr('data-value', result); + } + // update the hidden input; + // ****** ADD AN EQUAL SIGN TO THE BEGINNING! <- this makes the slide exactly match the number ****** + // when the value is at the minimum, clear the hidden input so all rows will be seen + $cell.find('.filter') + .val( ( o.compare ? o.compare + v : v === o.min ? '' : (o.exactMatch ? '=' : '') + v ) ) + .trigger('search', ui && typeof ui.delayed === 'boolean' ? ui.delayed : o.delayed).end() + .find('.slider').slider('value', v); + + // update sticky header cell + if ($shcell.length) { + $shcell.find('.slider').slider('value', v); + if (o.valueToHeader) { + $shcell.closest('thead').find('th[data-column=' + indx + ']').find('.curvalue').html(' (' + result + ')'); + } else { + $shcell.find('.ui-slider-handle').addClass('value-popup').attr('data-value', result); + } + } + + }; + $cell.closest('thead').find('th[data-column=' + indx + ']').addClass('filter-parsed'); + + // add span to header for value - only works if the line in the updateSlider() function is also un-commented out + if (o.valueToHeader) { + $cell.closest('thead').find('th[data-column=' + indx + ']').find('.tablesorter-header-inner').append(''); + } + + // add callbacks; preserve added callbacks + o.oldcreate = o.create; + o.oldslide = o.slide; + o.create = function(event, ui) { + updateSlider(); // ui is an empty object on create + if (typeof o.oldcreate === 'function') { o.oldcreate(event, ui); } + }; + o.slide = function(event, ui) { + updateSlider(ui); + if (typeof o.oldslide === 'function') { o.oldslide(event, ui); } + }; + // add a jQuery UI slider! + $('
    ') + .appendTo($cell) + .slider(o); + + // on reset + c.$table.bind('filterReset', function(){ + $cell.find('.slider').slider('value', o.value); + updateSlider(); + }); + + // has sticky headers? + c.$table.bind('stickyHeadersInit', function(){ + $shcell = c.widgetOptions.$sticky.find('.tablesorter-filter-row').children().eq(indx).empty(); + + // add a jQuery UI slider! + $('
    ') + .val(o.value) + .appendTo($shcell) + .slider(o) + .bind('change keyup', function(e){ + $cell.find('.slider').val( this.value ); + updateSlider(); + }); + + }); + + return $input; + }, + + /*************************\ + jQuery UI Range Slider (2 handles) + \*************************/ + uiRange: function($cell, indx, rangeDef) { + var o = $.extend({ + values : [0, 100], + min : 0, + max : 100, + range : true, + delayed : true, + valueToHeader : false + }, rangeDef ), + // Add a hidden input to hold the range values + $input = $('') + .appendTo($cell) + // hidden filter update (.tsfilter) namespace trigger by filter widget + .bind('change.tsfilter', function(){ + var v = this.value.split(' - '); + if (this.value === '') { v = [ o.min, o.max ]; } + if (v && v[1]) { + updateUiRange({ values: v, delay: false }); + } + }), + $shcell = [], + c = $cell.closest('table')[0].config, + + // this function updates the hidden input and adds the current values to the header cell text + updateUiRange = function(ui) { + // ui.values are undefined for some reason on create + var val = ui && ui.values || o.values, + result = val[0] + ' - ' + val[1], + // make range an empty string if entire range is covered so the filter row will hide (if set) + range = val[0] === o.min && val[1] === o.max ? '' : result; + if (o.valueToHeader) { + // add range indication to the header cell above (if not using the css method)! + $cell.closest('thead').find('th[data-column=' + indx + ']').find('.currange').html(' (' + result + ')'); + } else { + // add values to the handle data-value attribute so the css tooltip will work properly + $cell.find('.ui-slider-handle') + .addClass('value-popup') + .eq(0).attr('data-value', val[0]).end() // adding value to data attribute + .eq(1).attr('data-value', val[1]); // value popup shown via css + } + // update the hidden input + $cell.find('.filter').val(range) + .trigger('search', ui && typeof ui.delayed === 'boolean' ? ui.delayed : o.delayed).end() + .find('.range').slider('values', val); + // update sticky header cell + if ($shcell.length) { + $shcell.find('.range').slider('values', val); + if (o.valueToHeader) { + $shcell.closest('thead').find('th[data-column=' + indx + ']').find('.currange').html(' (' + result + ')'); + } else { + $shcell.find('.ui-slider-handle') + .addClass('value-popup') + .eq(0).attr('data-value', val[0]).end() // adding value to data attribute + .eq(1).attr('data-value', val[1]); // value popup shown via css + } + } + + }; + $cell.closest('thead').find('th[data-column=' + indx + ']').addClass('filter-parsed'); + + // add span to header for value - only works if the line in the updateUiRange() function is also un-commented out + if (o.valueToHeader) { + $cell.closest('thead').find('th[data-column=' + indx + ']').find('.tablesorter-header-inner').append(''); + } + + // add callbacks; preserve added callbacks + o.oldcreate = o.create; + o.oldslide = o.slide; + // add a jQuery UI range slider! + o.create = function(event, ui) { + updateUiRange(); // ui is an empty object on create + if (typeof o.oldcreate === 'function') { o.oldcreate(event, ui); } + }; + o.slide = function(event, ui) { + updateUiRange(ui); + if (typeof o.oldslide === 'function') { o.oldslide(event, ui); } + }; + $('
    ') + .appendTo($cell) + .slider(o); + + // on reset + c.$table.bind('filterReset', function(){ + $cell.find('.range').slider('values', o.values); + updateUiRange(); + }); + + // has sticky headers? + c.$table.bind('stickyHeadersInit', function(){ + $shcell = c.widgetOptions.$sticky.find('.tablesorter-filter-row').children().eq(indx).empty(); + + // add a jQuery UI slider! + $('
    ') + .val(o.value) + .appendTo($shcell) + .slider(o) + .bind('change keyup', function(e){ + $cell.find('.range').val( this.value ); + updateUiRange(); + }); + + }); + + // return the hidden input so the filter widget has a reference to it + return $input; + }, + + /*************************\ + jQuery UI Datepicker compare (1 input) + \*************************/ + uiDateCompare: function($cell, indx, defDate) { + var o = $.extend({ + defaultDate : '', + cellText : '', + changeMonth : true, + changeYear : true, + numberOfMonths : 1, + compare : '' + }, defDate), + $hdr = $cell.closest('thead').find('th[data-column=' + indx + ']'), + // Add a hidden input to hold the range values + $input = $('') + .appendTo($cell) + // hidden filter update (.tsfilter) namespace trigger by filter widget + .bind('change.tsfilter', function(){ + var v = this.value; + if (v) { + o.onClose(v); + } + }), + t, $shcell = [], + c = $cell.closest('table')[0].config; + + // make sure we're using parsed dates in the search + $hdr.addClass('filter-parsed'); + // Add date range picker + t = ''; + $(t).appendTo($cell); + + // add callbacks; preserve added callbacks + o.oldonClose = o.onClose; + + o.onClose = function( selectedDate, ui ) { + var date = new Date(selectedDate + ( o.compare.match('<') ? ' 23:59:59' : '' )).getTime() || ''; + $cell + // update hidden input + .find('.dateCompare').val( o.compare + date ) + .trigger('search').end() + .find('.date') + .datepicker('setDate', selectedDate); + + // update sticky header cell + if ($shcell.length) { + $shcell.find('.date').datepicker('setDate', selectedDate); + } + + if (typeof o.oldonClose === 'function') { o.oldonClose(selectedDate, ui); } + }; + $cell.find('.date').datepicker(o); + + if (o.filterDate) { + $cell.find('.date').datepicker('setDate', o.filterDate); + } + + // on reset + c.$table.bind('filterReset', function(){ + $cell.find('.date').val('').datepicker('option', 'currentText', '' ); + if ($shcell.length) { + $shcell.find('.date').val('').datepicker('option', 'currentText', '' ); + } + }); + + // has sticky headers? + c.$table.bind('stickyHeadersInit', function(){ + $shcell = c.widgetOptions.$sticky.find('.tablesorter-filter-row').children().eq(indx).empty(); + // add a jQuery datepicker! + $shcell + .append(t) + .find('.date') + .datepicker(o); + }); + + // return the hidden input so the filter widget has a reference to it + return $input.val( o.defaultDate ? o.defaultDate : '' ); + }, + + /*************************\ + jQuery UI Datepicker (2 inputs) + \*************************/ + uiDatepicker: function($cell, indx, defDate) { + var o = $.extend({ + from : '', + to : '', + textFrom : 'from', + textTo : 'to', + changeMonth : true, + changeYear : true, + numberOfMonths : 1 + }, defDate), + t, closeFrom, $shcell = [], + // Add a hidden input to hold the range values + $input = $('') + .appendTo($cell) + // hidden filter update (.tsfilter) namespace trigger by filter widget + .bind('change.tsfilter', function(){ + var v = this.value; + if (v.match(' - ')) { + v = v.split(' - '); + $cell.find('.dateTo').val(v[1]); + closeFrom(v[0]); + } else if (v.match('>=')) { + closeFrom( v.replace('>=', '') ); + } else if (v.match('<=')) { + o.onClose( v.replace('<=', '') ); + } + }), + c = $cell.closest('table')[0].config; + + // make sure we're using parsed dates in the search + $cell.closest('thead').find('th[data-column=' + indx + ']').addClass('filter-parsed'); + // Add date range picker + t = ''; + $(t).appendTo($cell); + + // add callbacks; preserve added callbacks + o.oldonClose = o.onClose; + + o.defaultDate = o.from || o.defaultDate; + + closeFrom = o.onClose = function( selectedDate, ui ) { + var from = ( (new Date(selectedDate)).getTime() || ''), + to = (new Date($cell.find('.dateTo').val() + ' 23:59:59').getTime() || ''), + range = from ? ( to ? from + ' - ' + to : '>=' + from ) : (to ? '<=' + to : ''); + $cell + .find('.dateTo').datepicker('option', 'minDate', selectedDate ).end() + .find('.dateFrom').val(selectedDate).end() + // update hidden input + .find('.dateRange').val(range) + .trigger('search'); + // update sticky header cell + if ($shcell.length) { + $shcell + .find('.dateTo').datepicker('option', 'minDate', selectedDate ).end() + .find('.dateFrom').val(selectedDate); + } + if (typeof o.oldonClose === 'function') { o.oldonClose(selectedDate, ui); } + }; + + $cell.find('.dateFrom').datepicker(o); + o.defaultDate = o.to || '+7d'; // set to date +7 days from today (if not defined) + o.onClose = function( selectedDate, ui ) { + var from = new Date( $cell.find('.dateFrom').val() ).getTime() || '', + to = new Date( selectedDate + ' 23:59:59' ).getTime() || '', + range = from ? ( to ? from + ' - ' + to : '>=' + from ) : (to ? '<=' + to : ''); + $cell + .find('.dateFrom').datepicker('option', 'maxDate', selectedDate ).end() + .find('.dateTo').val(selectedDate).end() + .find('.dateRange').val(range) + .trigger('search'); + // update sticky header cell + if ($shcell.length) { + $shcell + .find('.dateFrom').datepicker('option', 'maxDate', selectedDate ).end() + .find('.dateTo').val(selectedDate); + } + if (typeof o.oldonClose === 'function') { o.oldonClose(selectedDate, ui); } + }; + $cell.find('.dateTo').datepicker(o); + + // has sticky headers? + c.$table.bind('stickyHeadersInit', function(){ + $shcell = c.widgetOptions.$sticky.find('.tablesorter-filter-row').children().eq(indx).empty(); + // add a jQuery datepicker! + $shcell.append(t).find('.dateTo').datepicker(o); + o.defaultDate = o.from || o.defaultDate || new Date(); + o.onClose = closeFrom; + $shcell.find('.dateFrom').datepicker(o); + }); + + // on reset + $cell.closest('table').bind('filterReset', function(){ + $cell.find('.dateFrom, .dateTo').val(''); + if ($shcell.length) { + $shcell.find('.dateFrom, .dateTo').val(''); + } + }); + + // return the hidden input so the filter widget has a reference to it + t = o.from ? ( o.to ? o.from + ' - ' + o.to : '>=' + o.from ) : (o.to ? '<=' + o.to : ''); + return $input.val( t ); + }, + + /**********************\ + HTML5 Number (spinner) + \**********************/ + html5Number : function($cell, indx, def5Num) { + var t, o = $.extend({ + value : 0, + min : 0, + max : 100, + step : 1, + delayed : true, + disabled : false, + addToggle : true, + exactMatch : true, + compare : '', + skipTest: false + }, def5Num), + + // test browser for HTML5 range support + $number = $('').appendTo($cell), + // test if HTML5 number is supported - from Modernizr + numberSupported = o.skipTest || $number.attr('type') === 'number' && $number.val() !== 'test', + $shcell = [], + c = $cell.closest('table')[0].config, + + updateNumber = function(v, delayed){ + var chkd = o.addToggle ? $cell.find('.toggle').is(':checked') : true; + $cell.find('input[type=hidden]') + // add equal to the beginning, so we filter exact numbers + .val( !o.addToggle || chkd ? (o.compare ? o.compare : o.exactMatch ? '=' : '') + v : '' ) + .trigger('search', delayed ? delayed : o.delayed).end() + .find('.number').val(v); + if ($cell.find('.number').length) { + $cell.find('.number')[0].disabled = (o.disabled || !chkd); + } + // update sticky header cell + if ($shcell.length) { + $shcell.find('.number').val(v)[0].disabled = (o.disabled || !chkd); + if (o.addToggle) { + $shcell.find('.toggle')[0].checked = chkd; + } + } + }; + $number.remove(); + + if (numberSupported) { + t = o.addToggle ? '
    ' : ''; + t += ''; + // add HTML5 number (spinner) + $cell + .html(t + '') + .find('.toggle, .number').bind('change', function(){ + updateNumber( $cell.find('.number').val() ); + }) + .closest('thead').find('th[data-column=' + indx + ']') + .addClass('filter-parsed') // get exact numbers from column + // on reset + .closest('table').bind('filterReset', function(){ + // turn off the toggle checkbox + if (o.addToggle) { + $cell.find('.toggle')[0].checked = false; + if ($shcell.length) { + $shcell.find('.toggle')[0].checked = false; + } + } + updateNumber( $cell.find('.number').val() ); + }); + + // hidden filter update (.tsfilter) namespace trigger by filter widget + $cell.find('input[type=hidden]').bind('change.tsfilter', function(){ + updateNumber( this.value ); + }); + + // has sticky headers? + c.$table.bind('stickyHeadersInit', function(){ + $shcell = c.widgetOptions.$sticky.find('.tablesorter-filter-row').children().eq(indx).empty(); + $shcell + .html(t) + .find('.toggle, .number').bind('change', function(){ + updateNumber( $shcell.find('.number').val() ); + }); + updateNumber( $cell.find('.number').val() ); + }); + + updateNumber( $cell.find('.number').val() ); + + } + + return numberSupported ? $cell.find('input[type="hidden"]') : $(''); + }, + + /**********************\ + HTML5 range slider + \**********************/ + html5Range : function($cell, indx, def5Range) { + var t, o = $.extend({ + value : 0, + min : 0, + max : 100, + step : 1, + delayed : true, + valueToHeader : true, + exactMatch : true, + compare : '', + allText : 'all', + skipTest : false + }, def5Range), + + // test browser for HTML5 range support + $range = $('').appendTo($cell), + // test if HTML5 range is supported - from Modernizr (but I left out the method to detect in Safari 2-4) + // see https://github.com/Modernizr/Modernizr/blob/master/feature-detects/inputtypes.js + rangeSupported = o.skipTest || $range.attr('type') === 'range' && $range.val() !== 'test', + $shcell = [], + c = $cell.closest('table')[0].config, + + updateRange = function(v, delayed){ + /*jshint eqeqeq:false */ + v = (v + '').replace(/[<>=]/g,'') || o.min; // hidden input changes may include compare symbols + var t = ' (' + (o.compare ? o.compare + v : v == o.min ? o.allText : v) + ')'; + $cell.find('input[type=hidden]') + // add equal to the beginning, so we filter exact numbers + .val( ( o.compare ? o.compare + v : ( v == o.min ? '' : ( o.exactMatch ? '=' : '' ) + v ) ) ) + //( val == o.min ? '' : val + (o.exactMatch ? '=' : '')) + .trigger('search', delayed ? delayed : o.delayed).end() + .find('.range').val(v); + // or add current value to the header cell, if desired + $cell.closest('thead').find('th[data-column=' + indx + ']').find('.curvalue').html(t); + // update sticky header cell + if ($shcell.length) { + $shcell.find('.range').val(v); + $shcell.closest('thead').find('th[data-column=' + indx + ']').find('.curvalue').html(t); + } + }; + $range.remove(); + + if (rangeSupported) { + // add HTML5 range + $cell + .html('') + .closest('thead').find('th[data-column=' + indx + ']') + .addClass('filter-parsed') // get exact numbers from column + // add span to header for the current slider value + .find('.tablesorter-header-inner').append(''); + + $cell.find('.range').bind('change', function(){ + updateRange( this.value ); + }); + + // hidden filter update (.tsfilter) namespace trigger by filter widget + $cell.find('input[type=hidden]').bind('change.tsfilter', function(){ + /*jshint eqeqeq:false */ + var v = this.value; + if (v !== this.lastValue) { + this.lastValue = ( o.compare ? o.compare + v : ( v == o.min ? '' : ( o.exactMatch ? '=' : '' ) + v ) ); + this.value = this.lastValue; + updateRange( v ); + } + }); + + // has sticky headers? + c.$table.bind('stickyHeadersInit', function(){ + $shcell = c.widgetOptions.$sticky.find('.tablesorter-filter-row').children().eq(indx).empty(); + $shcell + .html('') + .find('.range').bind('change', function(){ + updateRange( $shcell.find('.range').val() ); + }); + updateRange( $cell.find('.range').val() ); + }); + + // on reset + $cell.closest('table').bind('filterReset', function(){ + // just turn off the colorpicker + updateRange(o.value); + }); + + updateRange( $cell.find('.range').val() ); + + } + + return rangeSupported ? $cell.find('input[type="hidden"]') : $(''); + }, + + /**********************\ + HTML5 Color picker + \**********************/ + html5Color: function($cell, indx, defColor) { + var t, o = $.extend({ + value : '#000000', + disabled : false, + addToggle : true, + exactMatch : true, + valueToHeader : false, + skipTest : false + }, defColor), + // Add a hidden input to hold the range values + $color = $('').appendTo($cell), + // test if HTML5 color is supported - from Modernizr + colorSupported = o.skipTest || $color.attr('type') === 'color' && $color.val() !== 'test', + $shcell = [], + c = $cell.closest('table')[0].config, + + updateColor = function(v){ + v = v || o.value; + var chkd = true, + t = ' (' + v + ')'; + if (o.addToggle) { + chkd = $cell.find('.toggle').is(':checked'); + } + if ($cell.find('.colorpicker').length) { + $cell.find('.colorpicker').val(v)[0].disabled = (o.disabled || !chkd); + } + + $cell.find('input[type=hidden]') + .val( chkd ? v + (o.exactMatch ? '=' : '') : '' ) + .trigger('search'); + if (o.valueToHeader) { + // add current color to the header cell + $cell.closest('thead').find('th[data-column=' + indx + ']').find('.curcolor').html(t); + } else { + // current color to span in cell + $cell.find('.currentColor').html(t); + } + + // update sticky header cell + if ($shcell.length) { + $shcell.find('.colorpicker').val(v)[0].disabled = (o.disabled || !chkd); + if (o.addToggle) { + $shcell.find('.toggle')[0].checked = chkd; + } + if (o.valueToHeader) { + // add current color to the header cell + $shcell.closest('thead').find('th[data-column=' + indx + ']').find('.curcolor').html(t); + } else { + // current color to span in cell + $shcell.find('.currentColor').html(t); + } + } + }; + $color.remove(); + + if (colorSupported) { + // add HTML5 color picker + t = '
    '; + t += o.addToggle ? '
    ' : ''; + t += ''; + t += (o.valueToHeader ? '' : '(#000000)') + '
    '; + $cell.html(t); + + // add span to header for the current color value - only works if the line in the updateColor() function is also un-commented out + if (o.valueToHeader) { + $cell.closest('thead').find('th[data-column=' + indx + ']').find('.tablesorter-header-inner').append(''); + } + + $cell.find('.toggle, .colorpicker').bind('change', function(){ + updateColor( $cell.find('.colorpicker').val() ); + }); + + // hidden filter update (.tsfilter) namespace trigger by filter widget + $cell.find('input[type=hidden]').bind('change.tsfilter', function(){ + updateColor( this.value ); + }); + + // on reset + $cell.closest('table').bind('filterReset', function(){ + // just turn off the colorpicker + $cell.find('.toggle')[0].checked = false; + updateColor( $cell.find('.colorpicker').val() ); + }); + + // has sticky headers? + c.$table.bind('stickyHeadersInit', function(){ + $shcell = c.widgetOptions.$sticky.find('.tablesorter-filter-row').children().eq(indx); + $shcell + .html(t) + .find('.toggle, .colorpicker').bind('change', function(){ + updateColor( $shcell.find('.colorpicker').val() ); + }); + updateColor( $shcell.find('.colorpicker').val() ); + }); + + updateColor( o.value ); + } + return colorSupported ? $cell.find('input[type="hidden"]') : $(''); + } + +}; + +})(jQuery); \ No newline at end of file diff --git a/templates/admin/default/coupon/list.html b/templates/admin/default/coupon/list.html index a387da05f..81f9ee97e 100755 --- a/templates/admin/default/coupon/list.html +++ b/templates/admin/default/coupon/list.html @@ -38,8 +38,8 @@
    - - + + - - + + - - + + - - + + - + - + - + - + - - + + - - - + + + - + - + @@ -46,7 +46,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -172,8 +172,12 @@ {include file='includes/js.inc.html'} - +{stylesheets file='../assets/css/jqueryui/custom-theme/*' filters='less,cssembed'} + +{/stylesheets} + + {javascripts file='../assets/bootstrap-editable/js/bootstrap-editable.js'} {/javascripts} From 6ee99b6cade47a572d35b5dcf855f6c5d433700f Mon Sep 17 00:00:00 2001 From: gmorel Date: Tue, 3 Sep 2013 11:02:02 +0200 Subject: [PATCH 049/125] Working - implementation Coupon Read page --- .../Thelia/Config/Resources/routing/admin.xml | 3 +- .../Controller/Admin/CouponController.php | 15 +++- core/lib/Thelia/Core/Template/Loop/Coupon.php | 14 +++- templates/admin/default/coupon/read.html | 80 +++++++++++++------ 4 files changed, 79 insertions(+), 33 deletions(-) diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml index 0bc05462d..bb43c0d0c 100755 --- a/core/lib/Thelia/Config/Resources/routing/admin.xml +++ b/core/lib/Thelia/Config/Resources/routing/admin.xml @@ -59,8 +59,7 @@ edit - Thelia\Controller\Admin\CouponController::processAction - read + Thelia\Controller\Admin\CouponController::readAction diff --git a/core/lib/Thelia/Controller/Admin/CouponController.php b/core/lib/Thelia/Controller/Admin/CouponController.php index 0895c52bf..23c231801 100755 --- a/core/lib/Thelia/Controller/Admin/CouponController.php +++ b/core/lib/Thelia/Controller/Admin/CouponController.php @@ -23,6 +23,7 @@ namespace Thelia\Controller\Admin; +use Symfony\Component\HttpFoundation\Request; use Thelia\Core\Event\Coupon\CouponCreateEvent; use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Security\Exception\AuthenticationException; @@ -143,15 +144,23 @@ class CouponController extends BaseAdminController /** * Manage Coupons read display * - * @param array $args GET arguments + * @param int $id Coupon Id * * @return \Symfony\Component\HttpFoundation\Response */ - protected function readCoupon($args) + public function readAction($id) { $this->checkAuth("ADMIN", "admin.coupon.view"); - return $this->render('coupon/read', $args); + // Database request repeated in the loop but cached + $search = CouponQuery::create(); + $coupon = $search->findOneById($id); + + if ($coupon === null) { + return $this->pageNotFound(); + } + + return $this->render('coupon/read', array('couponId' => $id)); } /** diff --git a/core/lib/Thelia/Core/Template/Loop/Coupon.php b/core/lib/Thelia/Core/Template/Loop/Coupon.php index 75fda3d72..ee3cc0a5a 100755 --- a/core/lib/Thelia/Core/Template/Loop/Coupon.php +++ b/core/lib/Thelia/Core/Template/Loop/Coupon.php @@ -72,7 +72,7 @@ class Coupon extends BaseI18nLoop $search = CouponQuery::create(); /* manage translations */ - $locale = $this->configureI18nProcessing($search, array()); + $locale = $this->configureI18nProcessing($search, array('TITLE', 'DESCRIPTION', 'SHORT_DESCRIPTION')); $id = $this->getId(); @@ -91,9 +91,17 @@ class Coupon extends BaseI18nLoop $loopResultRow->set("ID", $coupon->getId()) ->set("IS_TRANSLATED", $coupon->getVirtualColumn('IS_TRANSLATED')) ->set("LOCALE", $locale) + ->set("CODE", $coupon->getCode()) ->set("TITLE", $coupon->getVirtualColumn('i18n_TITLE')) - ->set("CODE", $coupon->getVirtualColumn('i18n_CODE')); - + ->set("SHORT_DESCRIPTION", $coupon->getVirtualColumn('i18n_SHORT_DESCRIPTION')) + ->set("DESCRIPTION", $coupon->getVirtualColumn('i18n_DESCRIPTION')) + ->set("EXPIRATION_DATE", $coupon->getExpirationDate()) + ->set("USAGE_LEFT", $coupon->getMaxUsage()) + ->set("IS_CUMULATIVE", $coupon->getIsCumulative()) + ->set("IS_REMOVING_POSTAGE", $coupon->getIsRemovingPostage()) + ->set("IS_ENABLED", $coupon->getIsEnabled()) + ->set("AMOUNT", $coupon->getAmount()) + ->set("APPLICATION_CONDITIONS", $coupon->getRules()); $loopResult->addRow($loopResultRow); } diff --git a/templates/admin/default/coupon/read.html b/templates/admin/default/coupon/read.html index 81557ef36..05cf19795 100755 --- a/templates/admin/default/coupon/read.html +++ b/templates/admin/default/coupon/read.html @@ -18,42 +18,78 @@

    Coupons : Read coupon n°1

    +
    - + {loop type="coupon" name="read_coupon" id=1 backend_context="true"}
    - This coupon is disabled, you can enable to the bottom of this form. + + {if #IS_ENABLED}{else}This coupon is disabled, you can enable to the bottom of this form.{/if}
    -
    + Rules - +
    Title Expiration date Usage leftActionsActions
    Title Expiration date Usage leftActionsActions
    Title Expiration date Usage leftActions
    Actions
    Title Expiration date Usage leftActionsActions
    XMAS13 Coupon for XMAS -30 €25/12/201349 times18/10/201349 Edit Disable @@ -48,8 +48,8 @@
    XMAS14 Coupon for XMAS -30 €25/12/201349 times05/09/201320 Edit Disable @@ -58,8 +58,8 @@
    XMAS15 Coupon for XMAS -30 €25/12/201349 times03/12/20139 Edit Disable @@ -68,8 +68,8 @@
    XMAS16 Coupon for XMAS -30 €25/12/201349 times25/01/20134 Edit Disable @@ -100,7 +100,7 @@ XMAS13 Coupon for XMAS -30 € 18/10/201349 times49 Edit Enabled @@ -110,7 +110,7 @@ XMAS13 Coupon for XMAS -20 € 05/09/201349 times49 Edit Enabled @@ -120,7 +120,7 @@ XMAS13 Coupon for XMAS -50 € 03/12/201349 times49 Edit Enabled @@ -130,7 +130,7 @@ XMAS13 Coupon for XMAS -5 € 25/01/201349 times49 Edit Enabled @@ -172,6 +172,8 @@ {include file='includes/js.inc.html'} + + {javascripts file='../assets/bootstrap-editable/js/bootstrap-editable.js'} {/javascripts} @@ -188,6 +190,10 @@ {/javascripts} +{javascripts file='../assets/js/tablesorter/jquery.tablesorter.widgets-filter-formatter.js'} + +{/javascripts} + {javascripts file='../assets/js/main.js'} {/javascripts} From 273e6144aa5ebd5c0da866a33221306d3ae2ceaa Mon Sep 17 00:00:00 2001 From: gmorel Date: Mon, 2 Sep 2013 16:57:34 +0200 Subject: [PATCH 042/125] Working - Add parameters to command --- core/lib/Thelia/Command/CreateAdminUser.php | 68 +++++++++++++++------ 1 file changed, 48 insertions(+), 20 deletions(-) diff --git a/core/lib/Thelia/Command/CreateAdminUser.php b/core/lib/Thelia/Command/CreateAdminUser.php index dc7118399..868ca1496 100644 --- a/core/lib/Thelia/Command/CreateAdminUser.php +++ b/core/lib/Thelia/Command/CreateAdminUser.php @@ -41,6 +41,34 @@ class CreateAdminUser extends ContainerAwareCommand ->setName("thelia:create-admin") ->setDescription("Create a new adminsitration user") ->setHelp("The thelia:create-admin command create a new administration user.") + ->addOption( + 'login_name', + null, + InputOption::VALUE_OPTIONAL, + 'Admin login name', + null + ) + ->addOption( + 'first_name', + null, + InputOption::VALUE_OPTIONAL, + 'User first name', + null + ) + ->addOption( + "last_name", + null, + InputOption::VALUE_OPTIONAL, + 'User last name', + null + ) + ->addOption( + 'password', + null, + InputOption::VALUE_OPTIONAL, + 'Password', + null + ) ; } @@ -54,25 +82,25 @@ class CreateAdminUser extends ContainerAwareCommand $admin->save(); $output->writeln(array( - "", - "User ".$admin->getLogin()." successfully created.", - "" - )); + "", + "User ".$admin->getLogin()." successfully created.", + "" + )); } protected function enterData($dialog, $output, $label, $error_message) { return $dialog->askAndValidate( - $output, - $this->decorateInfo($label), - function ($answer) { - $answer = trim($answer); - if (empty($answer)) { - throw new \RuntimeException("This information is mandatory."); - } - - return $answer; + $output, + $this->decorateInfo($label), + function ($answer) { + $answer = trim($answer); + if (empty($answer)) { + throw new \RuntimeException("This information is mandatory."); } + + return $answer; + } ); } @@ -89,13 +117,13 @@ class CreateAdminUser extends ContainerAwareCommand $admin = new Admin(); - $admin->setLogin($this->enterData($dialog, $output, "Admin login name : ", "Please enter a login name.")); - $admin->setFirstname($this->enterData($dialog, $output, "User first name : ", "Please enter user first name.")); - $admin->setLastname($this->enterData($dialog, $output, "User last name : ", "Please enter user last name.")); + $admin->setLogin($input->getOption("login_name") ?: $this->enterData($dialog, $output, "Admin login name : ", "Please enter a login name.")); + $admin->setFirstname($input->getOption("first_name") ?: $this->enterData($dialog, $output, "User first name : ", "Please enter user first name.")); + $admin->setLastname($input->getOption("last_name") ?: $this->enterData($dialog, $output, "User last name : ", "Please enter user last name.")); do { - $password = $this->enterData($dialog, $output, "Password : ", "Please enter a password."); - $password_again = $this->enterData($dialog, $output, "Password (again): ", "Please enter the password again."); + $password = $input->getOption("password") ?: $this->enterData($dialog, $output, "Password : ", "Please enter a password."); + $password_again = $input->getOption("password") ?: $this->enterData($dialog, $output, "Password (again): ", "Please enter the password again."); if (! empty($password) && $password == $password_again) { @@ -109,11 +137,11 @@ class CreateAdminUser extends ContainerAwareCommand while (true); return $admin; - } + } protected function decorateInfo($text) { return sprintf("%s", $text); } -} +} \ No newline at end of file From c3650b4482a1d33a6df04e3f55a21610896763f2 Mon Sep 17 00:00:00 2001 From: gmorel Date: Mon, 2 Sep 2013 17:07:25 +0200 Subject: [PATCH 043/125] WIP Coupon Loop --- core/lib/Thelia/Config/Resources/config.xml | 1 + core/lib/Thelia/Core/Template/Loop/Coupon.php | 102 ++++++++++++++++++ 2 files changed, 103 insertions(+) create mode 100755 core/lib/Thelia/Core/Template/Loop/Coupon.php diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml index 2da8a3eea..3ef9b0778 100755 --- a/core/lib/Thelia/Config/Resources/config.xml +++ b/core/lib/Thelia/Config/Resources/config.xml @@ -33,6 +33,7 @@ + diff --git a/core/lib/Thelia/Core/Template/Loop/Coupon.php b/core/lib/Thelia/Core/Template/Loop/Coupon.php new file mode 100755 index 000000000..75fda3d72 --- /dev/null +++ b/core/lib/Thelia/Core/Template/Loop/Coupon.php @@ -0,0 +1,102 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Core\Template\Loop; + +use Propel\Runtime\ActiveQuery\Criteria; +use Thelia\Core\Template\Element\BaseI18nLoop; +use Thelia\Core\Template\Element\LoopResult; +use Thelia\Core\Template\Element\LoopResultRow; + +use Thelia\Core\Template\Loop\Argument\ArgumentCollection; +use Thelia\Core\Template\Loop\Argument\Argument; + +use Thelia\Model\Base\CategoryQuery; +use Thelia\Model\ConfigQuery; +use Thelia\Model\CouponQuery; +use Thelia\Model\Coupon as MCoupon; +use Thelia\Model\Map\ProductCategoryTableMap; +use Thelia\Type; +use Thelia\Type\BooleanOrBothType; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Coupon Loop + * + * @package Thelia\Core\Template\Loop + * @author Guillaume MOREL + * + */ +class Coupon extends BaseI18nLoop +{ + /** + * @return ArgumentCollection + */ + protected function getArgDefinitions() + { + return new ArgumentCollection( + Argument::createIntListTypeArgument('id') + ); + } + + /** + * @param $pagination + * + * @return \Thelia\Core\Template\Element\LoopResult + */ + public function exec(&$pagination) + { + $search = CouponQuery::create(); + + /* manage translations */ + $locale = $this->configureI18nProcessing($search, array()); + + $id = $this->getId(); + + if (null !== $id) { + $search->filterById($id, Criteria::IN); + } + + // Perform search + $coupons = $this->search($search, $pagination); + + $loopResult = new LoopResult(); + + /** @var MCoupon $coupon */ + foreach ($coupons as $coupon) { + $loopResultRow = new LoopResultRow(); + $loopResultRow->set("ID", $coupon->getId()) + ->set("IS_TRANSLATED", $coupon->getVirtualColumn('IS_TRANSLATED')) + ->set("LOCALE", $locale) + ->set("TITLE", $coupon->getVirtualColumn('i18n_TITLE')) + ->set("CODE", $coupon->getVirtualColumn('i18n_CODE')); + + $loopResult->addRow($loopResultRow); + } + + return $loopResult; + } +} From ae0f2e766b2732c5409df4f84756ce8a5230351b Mon Sep 17 00:00:00 2001 From: gmorel Date: Mon, 2 Sep 2013 17:08:01 +0200 Subject: [PATCH 044/125] Working - merge schema --- core/lib/Thelia/Model/Base/Category.php | 348 +++++++++ core/lib/Thelia/Model/Base/CategoryQuery.php | 77 ++ core/lib/Thelia/Model/Base/Content.php | 347 +++++++++ core/lib/Thelia/Model/Base/ContentQuery.php | 77 ++ core/lib/Thelia/Model/Base/Coupon.php | 667 ++++-------------- core/lib/Thelia/Model/Base/CouponI18n.php | 176 ++++- .../lib/Thelia/Model/Base/CouponI18nQuery.php | 101 ++- core/lib/Thelia/Model/Base/CouponOrder.php | 165 +---- .../Thelia/Model/Base/CouponOrderQuery.php | 114 +-- core/lib/Thelia/Model/Base/CouponQuery.php | 178 +---- core/lib/Thelia/Model/Base/CouponVersion.php | 292 ++------ .../Thelia/Model/Base/CouponVersionQuery.php | 101 +-- core/lib/Thelia/Model/Base/Folder.php | 347 +++++++++ core/lib/Thelia/Model/Base/FolderQuery.php | 77 ++ core/lib/Thelia/Model/Base/Order.php | 25 - core/lib/Thelia/Model/Base/Product.php | 347 +++++++++ core/lib/Thelia/Model/Base/ProductQuery.php | 77 ++ .../lib/Thelia/Model/Map/CategoryTableMap.php | 2 + core/lib/Thelia/Model/Map/ContentTableMap.php | 2 + .../Thelia/Model/Map/CouponI18nTableMap.php | 52 +- .../Thelia/Model/Map/CouponOrderTableMap.php | 37 +- core/lib/Thelia/Model/Map/CouponTableMap.php | 55 +- .../Model/Map/CouponVersionTableMap.php | 56 +- core/lib/Thelia/Model/Map/FolderTableMap.php | 2 + core/lib/Thelia/Model/Map/ProductTableMap.php | 2 + 25 files changed, 2270 insertions(+), 1454 deletions(-) diff --git a/core/lib/Thelia/Model/Base/Category.php b/core/lib/Thelia/Model/Base/Category.php index 6c7ac3c3e..810283e44 100755 --- a/core/lib/Thelia/Model/Base/Category.php +++ b/core/lib/Thelia/Model/Base/Category.php @@ -41,6 +41,8 @@ use Thelia\Model\Product as ChildProduct; use Thelia\Model\ProductCategory as ChildProductCategory; use Thelia\Model\ProductCategoryQuery as ChildProductCategoryQuery; use Thelia\Model\ProductQuery as ChildProductQuery; +use Thelia\Model\Rewriting as ChildRewriting; +use Thelia\Model\RewritingQuery as ChildRewritingQuery; use Thelia\Model\Map\CategoryTableMap; use Thelia\Model\Map\CategoryVersionTableMap; @@ -151,6 +153,12 @@ abstract class Category implements ActiveRecordInterface protected $collAttributeCategories; protected $collAttributeCategoriesPartial; + /** + * @var ObjectCollection|ChildRewriting[] Collection to store aggregation of ChildRewriting objects. + */ + protected $collRewritings; + protected $collRewritingsPartial; + /** * @var ObjectCollection|ChildCategoryImage[] Collection to store aggregation of ChildCategoryImage objects. */ @@ -262,6 +270,12 @@ abstract class Category implements ActiveRecordInterface */ protected $attributeCategoriesScheduledForDeletion = null; + /** + * An array of objects scheduled for deletion. + * @var ObjectCollection + */ + protected $rewritingsScheduledForDeletion = null; + /** * An array of objects scheduled for deletion. * @var ObjectCollection @@ -474,6 +488,7 @@ abstract class Category implements ActiveRecordInterface if (!$this->hasVirtualColumn($name)) { throw new PropelException(sprintf('Cannot get value of inexistent virtual column %s.', $name)); } + return $this->virtualColumns[$name]; } @@ -1024,6 +1039,8 @@ abstract class Category implements ActiveRecordInterface $this->collAttributeCategories = null; + $this->collRewritings = null; + $this->collCategoryImages = null; $this->collCategoryDocuments = null; @@ -1314,6 +1331,23 @@ abstract class Category implements ActiveRecordInterface } } + if ($this->rewritingsScheduledForDeletion !== null) { + if (!$this->rewritingsScheduledForDeletion->isEmpty()) { + \Thelia\Model\RewritingQuery::create() + ->filterByPrimaryKeys($this->rewritingsScheduledForDeletion->getPrimaryKeys(false)) + ->delete($con); + $this->rewritingsScheduledForDeletion = null; + } + } + + if ($this->collRewritings !== null) { + foreach ($this->collRewritings as $referrerFK) { + if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) { + $affectedRows += $referrerFK->save($con); + } + } + } + if ($this->categoryImagesScheduledForDeletion !== null) { if (!$this->categoryImagesScheduledForDeletion->isEmpty()) { \Thelia\Model\CategoryImageQuery::create() @@ -1634,6 +1668,9 @@ abstract class Category implements ActiveRecordInterface if (null !== $this->collAttributeCategories) { $result['AttributeCategories'] = $this->collAttributeCategories->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } + if (null !== $this->collRewritings) { + $result['Rewritings'] = $this->collRewritings->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); + } if (null !== $this->collCategoryImages) { $result['CategoryImages'] = $this->collCategoryImages->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } @@ -1858,6 +1895,12 @@ abstract class Category implements ActiveRecordInterface } } + foreach ($this->getRewritings() as $relObj) { + if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves + $copyObj->addRewriting($relObj->copy($deepCopy)); + } + } + foreach ($this->getCategoryImages() as $relObj) { if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves $copyObj->addCategoryImage($relObj->copy($deepCopy)); @@ -1938,6 +1981,9 @@ abstract class Category implements ActiveRecordInterface if ('AttributeCategory' == $relationName) { return $this->initAttributeCategories(); } + if ('Rewriting' == $relationName) { + return $this->initRewritings(); + } if ('CategoryImage' == $relationName) { return $this->initCategoryImages(); } @@ -2687,6 +2733,299 @@ abstract class Category implements ActiveRecordInterface return $this->getAttributeCategories($query, $con); } + /** + * Clears out the collRewritings collection + * + * This does not modify the database; however, it will remove any associated objects, causing + * them to be refetched by subsequent calls to accessor method. + * + * @return void + * @see addRewritings() + */ + public function clearRewritings() + { + $this->collRewritings = null; // important to set this to NULL since that means it is uninitialized + } + + /** + * Reset is the collRewritings collection loaded partially. + */ + public function resetPartialRewritings($v = true) + { + $this->collRewritingsPartial = $v; + } + + /** + * Initializes the collRewritings collection. + * + * By default this just sets the collRewritings collection to an empty array (like clearcollRewritings()); + * however, you may wish to override this method in your stub class to provide setting appropriate + * to your application -- for example, setting the initial array to the values stored in database. + * + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty + * + * @return void + */ + public function initRewritings($overrideExisting = true) + { + if (null !== $this->collRewritings && !$overrideExisting) { + return; + } + $this->collRewritings = new ObjectCollection(); + $this->collRewritings->setModel('\Thelia\Model\Rewriting'); + } + + /** + * Gets an array of ChildRewriting objects which contain a foreign key that references this object. + * + * If the $criteria is not null, it is used to always fetch the results from the database. + * Otherwise the results are fetched from the database the first time, then cached. + * Next time the same method is called without $criteria, the cached collection is returned. + * If this ChildCategory is new, it will return + * an empty collection or the current collection; the criteria is ignored on a new object. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @return Collection|ChildRewriting[] List of ChildRewriting objects + * @throws PropelException + */ + public function getRewritings($criteria = null, ConnectionInterface $con = null) + { + $partial = $this->collRewritingsPartial && !$this->isNew(); + if (null === $this->collRewritings || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collRewritings) { + // return empty collection + $this->initRewritings(); + } else { + $collRewritings = ChildRewritingQuery::create(null, $criteria) + ->filterByCategory($this) + ->find($con); + + if (null !== $criteria) { + if (false !== $this->collRewritingsPartial && count($collRewritings)) { + $this->initRewritings(false); + + foreach ($collRewritings as $obj) { + if (false == $this->collRewritings->contains($obj)) { + $this->collRewritings->append($obj); + } + } + + $this->collRewritingsPartial = true; + } + + $collRewritings->getInternalIterator()->rewind(); + + return $collRewritings; + } + + if ($partial && $this->collRewritings) { + foreach ($this->collRewritings as $obj) { + if ($obj->isNew()) { + $collRewritings[] = $obj; + } + } + } + + $this->collRewritings = $collRewritings; + $this->collRewritingsPartial = false; + } + } + + return $this->collRewritings; + } + + /** + * Sets a collection of Rewriting objects related by a one-to-many relationship + * to the current object. + * It will also schedule objects for deletion based on a diff between old objects (aka persisted) + * and new objects from the given Propel collection. + * + * @param Collection $rewritings A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildCategory The current object (for fluent API support) + */ + public function setRewritings(Collection $rewritings, ConnectionInterface $con = null) + { + $rewritingsToDelete = $this->getRewritings(new Criteria(), $con)->diff($rewritings); + + + $this->rewritingsScheduledForDeletion = $rewritingsToDelete; + + foreach ($rewritingsToDelete as $rewritingRemoved) { + $rewritingRemoved->setCategory(null); + } + + $this->collRewritings = null; + foreach ($rewritings as $rewriting) { + $this->addRewriting($rewriting); + } + + $this->collRewritings = $rewritings; + $this->collRewritingsPartial = false; + + return $this; + } + + /** + * Returns the number of related Rewriting objects. + * + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related Rewriting objects. + * @throws PropelException + */ + public function countRewritings(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) + { + $partial = $this->collRewritingsPartial && !$this->isNew(); + if (null === $this->collRewritings || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collRewritings) { + return 0; + } + + if ($partial && !$criteria) { + return count($this->getRewritings()); + } + + $query = ChildRewritingQuery::create(null, $criteria); + if ($distinct) { + $query->distinct(); + } + + return $query + ->filterByCategory($this) + ->count($con); + } + + return count($this->collRewritings); + } + + /** + * Method called to associate a ChildRewriting object to this object + * through the ChildRewriting foreign key attribute. + * + * @param ChildRewriting $l ChildRewriting + * @return \Thelia\Model\Category The current object (for fluent API support) + */ + public function addRewriting(ChildRewriting $l) + { + if ($this->collRewritings === null) { + $this->initRewritings(); + $this->collRewritingsPartial = true; + } + + if (!in_array($l, $this->collRewritings->getArrayCopy(), true)) { // only add it if the **same** object is not already associated + $this->doAddRewriting($l); + } + + return $this; + } + + /** + * @param Rewriting $rewriting The rewriting object to add. + */ + protected function doAddRewriting($rewriting) + { + $this->collRewritings[]= $rewriting; + $rewriting->setCategory($this); + } + + /** + * @param Rewriting $rewriting The rewriting object to remove. + * @return ChildCategory The current object (for fluent API support) + */ + public function removeRewriting($rewriting) + { + if ($this->getRewritings()->contains($rewriting)) { + $this->collRewritings->remove($this->collRewritings->search($rewriting)); + if (null === $this->rewritingsScheduledForDeletion) { + $this->rewritingsScheduledForDeletion = clone $this->collRewritings; + $this->rewritingsScheduledForDeletion->clear(); + } + $this->rewritingsScheduledForDeletion[]= $rewriting; + $rewriting->setCategory(null); + } + + return $this; + } + + + /** + * If this collection has already been initialized with + * an identical criteria, it returns the collection. + * Otherwise if this Category is new, it will return + * an empty collection; or if this Category has previously + * been saved, it will retrieve related Rewritings from storage. + * + * This method is protected by default in order to keep the public + * api reasonable. You can provide public methods for those you + * actually need in Category. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @return Collection|ChildRewriting[] List of ChildRewriting objects + */ + public function getRewritingsJoinProduct($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) + { + $query = ChildRewritingQuery::create(null, $criteria); + $query->joinWith('Product', $joinBehavior); + + return $this->getRewritings($query, $con); + } + + + /** + * If this collection has already been initialized with + * an identical criteria, it returns the collection. + * Otherwise if this Category is new, it will return + * an empty collection; or if this Category has previously + * been saved, it will retrieve related Rewritings from storage. + * + * This method is protected by default in order to keep the public + * api reasonable. You can provide public methods for those you + * actually need in Category. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @return Collection|ChildRewriting[] List of ChildRewriting objects + */ + public function getRewritingsJoinFolder($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) + { + $query = ChildRewritingQuery::create(null, $criteria); + $query->joinWith('Folder', $joinBehavior); + + return $this->getRewritings($query, $con); + } + + + /** + * If this collection has already been initialized with + * an identical criteria, it returns the collection. + * Otherwise if this Category is new, it will return + * an empty collection; or if this Category has previously + * been saved, it will retrieve related Rewritings from storage. + * + * This method is protected by default in order to keep the public + * api reasonable. You can provide public methods for those you + * actually need in Category. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @return Collection|ChildRewriting[] List of ChildRewriting objects + */ + public function getRewritingsJoinContent($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) + { + $query = ChildRewritingQuery::create(null, $criteria); + $query->joinWith('Content', $joinBehavior); + + return $this->getRewritings($query, $con); + } + /** * Clears out the collCategoryImages collection * @@ -4410,6 +4749,11 @@ abstract class Category implements ActiveRecordInterface $o->clearAllReferences($deep); } } + if ($this->collRewritings) { + foreach ($this->collRewritings as $o) { + $o->clearAllReferences($deep); + } + } if ($this->collCategoryImages) { foreach ($this->collCategoryImages as $o) { $o->clearAllReferences($deep); @@ -4468,6 +4812,10 @@ abstract class Category implements ActiveRecordInterface $this->collAttributeCategories->clearIterator(); } $this->collAttributeCategories = null; + if ($this->collRewritings instanceof Collection) { + $this->collRewritings->clearIterator(); + } + $this->collRewritings = null; if ($this->collCategoryImages instanceof Collection) { $this->collCategoryImages->clearIterator(); } diff --git a/core/lib/Thelia/Model/Base/CategoryQuery.php b/core/lib/Thelia/Model/Base/CategoryQuery.php index 1fe81871b..4c823a223 100755 --- a/core/lib/Thelia/Model/Base/CategoryQuery.php +++ b/core/lib/Thelia/Model/Base/CategoryQuery.php @@ -58,6 +58,10 @@ use Thelia\Model\Map\CategoryTableMap; * @method ChildCategoryQuery rightJoinAttributeCategory($relationAlias = null) Adds a RIGHT JOIN clause to the query using the AttributeCategory relation * @method ChildCategoryQuery innerJoinAttributeCategory($relationAlias = null) Adds a INNER JOIN clause to the query using the AttributeCategory relation * + * @method ChildCategoryQuery leftJoinRewriting($relationAlias = null) Adds a LEFT JOIN clause to the query using the Rewriting relation + * @method ChildCategoryQuery rightJoinRewriting($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Rewriting relation + * @method ChildCategoryQuery innerJoinRewriting($relationAlias = null) Adds a INNER JOIN clause to the query using the Rewriting relation + * * @method ChildCategoryQuery leftJoinCategoryImage($relationAlias = null) Adds a LEFT JOIN clause to the query using the CategoryImage relation * @method ChildCategoryQuery rightJoinCategoryImage($relationAlias = null) Adds a RIGHT JOIN clause to the query using the CategoryImage relation * @method ChildCategoryQuery innerJoinCategoryImage($relationAlias = null) Adds a INNER JOIN clause to the query using the CategoryImage relation @@ -866,6 +870,79 @@ abstract class CategoryQuery extends ModelCriteria ->useQuery($relationAlias ? $relationAlias : 'AttributeCategory', '\Thelia\Model\AttributeCategoryQuery'); } + /** + * Filter the query by a related \Thelia\Model\Rewriting object + * + * @param \Thelia\Model\Rewriting|ObjectCollection $rewriting the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCategoryQuery The current query, for fluid interface + */ + public function filterByRewriting($rewriting, $comparison = null) + { + if ($rewriting instanceof \Thelia\Model\Rewriting) { + return $this + ->addUsingAlias(CategoryTableMap::ID, $rewriting->getCategoryId(), $comparison); + } elseif ($rewriting instanceof ObjectCollection) { + return $this + ->useRewritingQuery() + ->filterByPrimaryKeys($rewriting->getPrimaryKeys()) + ->endUse(); + } else { + throw new PropelException('filterByRewriting() only accepts arguments of type \Thelia\Model\Rewriting or Collection'); + } + } + + /** + * Adds a JOIN clause to the query using the Rewriting relation + * + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return ChildCategoryQuery The current query, for fluid interface + */ + public function joinRewriting($relationAlias = null, $joinType = Criteria::LEFT_JOIN) + { + $tableMap = $this->getTableMap(); + $relationMap = $tableMap->getRelation('Rewriting'); + + // create a ModelJoin object for this join + $join = new ModelJoin(); + $join->setJoinType($joinType); + $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); + if ($previousJoin = $this->getPreviousJoin()) { + $join->setPreviousJoin($previousJoin); + } + + // add the ModelJoin to the current object + if ($relationAlias) { + $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); + $this->addJoinObject($join, $relationAlias); + } else { + $this->addJoinObject($join, 'Rewriting'); + } + + return $this; + } + + /** + * Use the Rewriting relation Rewriting object + * + * @see useQuery() + * + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return \Thelia\Model\RewritingQuery A secondary query class using the current class as primary query + */ + public function useRewritingQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) + { + return $this + ->joinRewriting($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'Rewriting', '\Thelia\Model\RewritingQuery'); + } + /** * Filter the query by a related \Thelia\Model\CategoryImage object * diff --git a/core/lib/Thelia/Model/Base/Content.php b/core/lib/Thelia/Model/Base/Content.php index 0078502f6..e46d82ac4 100755 --- a/core/lib/Thelia/Model/Base/Content.php +++ b/core/lib/Thelia/Model/Base/Content.php @@ -35,6 +35,8 @@ use Thelia\Model\Folder as ChildFolder; use Thelia\Model\FolderQuery as ChildFolderQuery; use Thelia\Model\ProductAssociatedContent as ChildProductAssociatedContent; use Thelia\Model\ProductAssociatedContentQuery as ChildProductAssociatedContentQuery; +use Thelia\Model\Rewriting as ChildRewriting; +use Thelia\Model\RewritingQuery as ChildRewritingQuery; use Thelia\Model\Map\ContentTableMap; use Thelia\Model\Map\ContentVersionTableMap; @@ -121,6 +123,12 @@ abstract class Content implements ActiveRecordInterface */ protected $version_created_by; + /** + * @var ObjectCollection|ChildRewriting[] Collection to store aggregation of ChildRewriting objects. + */ + protected $collRewritings; + protected $collRewritingsPartial; + /** * @var ObjectCollection|ChildContentFolder[] Collection to store aggregation of ChildContentFolder objects. */ @@ -204,6 +212,12 @@ abstract class Content implements ActiveRecordInterface */ protected $foldersScheduledForDeletion = null; + /** + * An array of objects scheduled for deletion. + * @var ObjectCollection + */ + protected $rewritingsScheduledForDeletion = null; + /** * An array of objects scheduled for deletion. * @var ObjectCollection @@ -938,6 +952,8 @@ abstract class Content implements ActiveRecordInterface if ($deep) { // also de-associate any related objects? + $this->collRewritings = null; + $this->collContentFolders = null; $this->collContentImages = null; @@ -1125,6 +1141,23 @@ abstract class Content implements ActiveRecordInterface } } + if ($this->rewritingsScheduledForDeletion !== null) { + if (!$this->rewritingsScheduledForDeletion->isEmpty()) { + \Thelia\Model\RewritingQuery::create() + ->filterByPrimaryKeys($this->rewritingsScheduledForDeletion->getPrimaryKeys(false)) + ->delete($con); + $this->rewritingsScheduledForDeletion = null; + } + } + + if ($this->collRewritings !== null) { + foreach ($this->collRewritings as $referrerFK) { + if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) { + $affectedRows += $referrerFK->save($con); + } + } + } + if ($this->contentFoldersScheduledForDeletion !== null) { if (!$this->contentFoldersScheduledForDeletion->isEmpty()) { \Thelia\Model\ContentFolderQuery::create() @@ -1460,6 +1493,9 @@ abstract class Content implements ActiveRecordInterface } if ($includeForeignObjects) { + if (null !== $this->collRewritings) { + $result['Rewritings'] = $this->collRewritings->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); + } if (null !== $this->collContentFolders) { $result['ContentFolders'] = $this->collContentFolders->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } @@ -1666,6 +1702,12 @@ abstract class Content implements ActiveRecordInterface // the getter/setter methods for fkey referrer objects. $copyObj->setNew(false); + foreach ($this->getRewritings() as $relObj) { + if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves + $copyObj->addRewriting($relObj->copy($deepCopy)); + } + } + foreach ($this->getContentFolders() as $relObj) { if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves $copyObj->addContentFolder($relObj->copy($deepCopy)); @@ -1749,6 +1791,9 @@ abstract class Content implements ActiveRecordInterface */ public function initRelation($relationName) { + if ('Rewriting' == $relationName) { + return $this->initRewritings(); + } if ('ContentFolder' == $relationName) { return $this->initContentFolders(); } @@ -1772,6 +1817,299 @@ abstract class Content implements ActiveRecordInterface } } + /** + * Clears out the collRewritings collection + * + * This does not modify the database; however, it will remove any associated objects, causing + * them to be refetched by subsequent calls to accessor method. + * + * @return void + * @see addRewritings() + */ + public function clearRewritings() + { + $this->collRewritings = null; // important to set this to NULL since that means it is uninitialized + } + + /** + * Reset is the collRewritings collection loaded partially. + */ + public function resetPartialRewritings($v = true) + { + $this->collRewritingsPartial = $v; + } + + /** + * Initializes the collRewritings collection. + * + * By default this just sets the collRewritings collection to an empty array (like clearcollRewritings()); + * however, you may wish to override this method in your stub class to provide setting appropriate + * to your application -- for example, setting the initial array to the values stored in database. + * + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty + * + * @return void + */ + public function initRewritings($overrideExisting = true) + { + if (null !== $this->collRewritings && !$overrideExisting) { + return; + } + $this->collRewritings = new ObjectCollection(); + $this->collRewritings->setModel('\Thelia\Model\Rewriting'); + } + + /** + * Gets an array of ChildRewriting objects which contain a foreign key that references this object. + * + * If the $criteria is not null, it is used to always fetch the results from the database. + * Otherwise the results are fetched from the database the first time, then cached. + * Next time the same method is called without $criteria, the cached collection is returned. + * If this ChildContent is new, it will return + * an empty collection or the current collection; the criteria is ignored on a new object. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @return Collection|ChildRewriting[] List of ChildRewriting objects + * @throws PropelException + */ + public function getRewritings($criteria = null, ConnectionInterface $con = null) + { + $partial = $this->collRewritingsPartial && !$this->isNew(); + if (null === $this->collRewritings || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collRewritings) { + // return empty collection + $this->initRewritings(); + } else { + $collRewritings = ChildRewritingQuery::create(null, $criteria) + ->filterByContent($this) + ->find($con); + + if (null !== $criteria) { + if (false !== $this->collRewritingsPartial && count($collRewritings)) { + $this->initRewritings(false); + + foreach ($collRewritings as $obj) { + if (false == $this->collRewritings->contains($obj)) { + $this->collRewritings->append($obj); + } + } + + $this->collRewritingsPartial = true; + } + + $collRewritings->getInternalIterator()->rewind(); + + return $collRewritings; + } + + if ($partial && $this->collRewritings) { + foreach ($this->collRewritings as $obj) { + if ($obj->isNew()) { + $collRewritings[] = $obj; + } + } + } + + $this->collRewritings = $collRewritings; + $this->collRewritingsPartial = false; + } + } + + return $this->collRewritings; + } + + /** + * Sets a collection of Rewriting objects related by a one-to-many relationship + * to the current object. + * It will also schedule objects for deletion based on a diff between old objects (aka persisted) + * and new objects from the given Propel collection. + * + * @param Collection $rewritings A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildContent The current object (for fluent API support) + */ + public function setRewritings(Collection $rewritings, ConnectionInterface $con = null) + { + $rewritingsToDelete = $this->getRewritings(new Criteria(), $con)->diff($rewritings); + + + $this->rewritingsScheduledForDeletion = $rewritingsToDelete; + + foreach ($rewritingsToDelete as $rewritingRemoved) { + $rewritingRemoved->setContent(null); + } + + $this->collRewritings = null; + foreach ($rewritings as $rewriting) { + $this->addRewriting($rewriting); + } + + $this->collRewritings = $rewritings; + $this->collRewritingsPartial = false; + + return $this; + } + + /** + * Returns the number of related Rewriting objects. + * + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related Rewriting objects. + * @throws PropelException + */ + public function countRewritings(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) + { + $partial = $this->collRewritingsPartial && !$this->isNew(); + if (null === $this->collRewritings || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collRewritings) { + return 0; + } + + if ($partial && !$criteria) { + return count($this->getRewritings()); + } + + $query = ChildRewritingQuery::create(null, $criteria); + if ($distinct) { + $query->distinct(); + } + + return $query + ->filterByContent($this) + ->count($con); + } + + return count($this->collRewritings); + } + + /** + * Method called to associate a ChildRewriting object to this object + * through the ChildRewriting foreign key attribute. + * + * @param ChildRewriting $l ChildRewriting + * @return \Thelia\Model\Content The current object (for fluent API support) + */ + public function addRewriting(ChildRewriting $l) + { + if ($this->collRewritings === null) { + $this->initRewritings(); + $this->collRewritingsPartial = true; + } + + if (!in_array($l, $this->collRewritings->getArrayCopy(), true)) { // only add it if the **same** object is not already associated + $this->doAddRewriting($l); + } + + return $this; + } + + /** + * @param Rewriting $rewriting The rewriting object to add. + */ + protected function doAddRewriting($rewriting) + { + $this->collRewritings[]= $rewriting; + $rewriting->setContent($this); + } + + /** + * @param Rewriting $rewriting The rewriting object to remove. + * @return ChildContent The current object (for fluent API support) + */ + public function removeRewriting($rewriting) + { + if ($this->getRewritings()->contains($rewriting)) { + $this->collRewritings->remove($this->collRewritings->search($rewriting)); + if (null === $this->rewritingsScheduledForDeletion) { + $this->rewritingsScheduledForDeletion = clone $this->collRewritings; + $this->rewritingsScheduledForDeletion->clear(); + } + $this->rewritingsScheduledForDeletion[]= $rewriting; + $rewriting->setContent(null); + } + + return $this; + } + + + /** + * If this collection has already been initialized with + * an identical criteria, it returns the collection. + * Otherwise if this Content is new, it will return + * an empty collection; or if this Content has previously + * been saved, it will retrieve related Rewritings from storage. + * + * This method is protected by default in order to keep the public + * api reasonable. You can provide public methods for those you + * actually need in Content. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @return Collection|ChildRewriting[] List of ChildRewriting objects + */ + public function getRewritingsJoinProduct($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) + { + $query = ChildRewritingQuery::create(null, $criteria); + $query->joinWith('Product', $joinBehavior); + + return $this->getRewritings($query, $con); + } + + + /** + * If this collection has already been initialized with + * an identical criteria, it returns the collection. + * Otherwise if this Content is new, it will return + * an empty collection; or if this Content has previously + * been saved, it will retrieve related Rewritings from storage. + * + * This method is protected by default in order to keep the public + * api reasonable. You can provide public methods for those you + * actually need in Content. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @return Collection|ChildRewriting[] List of ChildRewriting objects + */ + public function getRewritingsJoinCategory($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) + { + $query = ChildRewritingQuery::create(null, $criteria); + $query->joinWith('Category', $joinBehavior); + + return $this->getRewritings($query, $con); + } + + + /** + * If this collection has already been initialized with + * an identical criteria, it returns the collection. + * Otherwise if this Content is new, it will return + * an empty collection; or if this Content has previously + * been saved, it will retrieve related Rewritings from storage. + * + * This method is protected by default in order to keep the public + * api reasonable. You can provide public methods for those you + * actually need in Content. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @return Collection|ChildRewriting[] List of ChildRewriting objects + */ + public function getRewritingsJoinFolder($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) + { + $query = ChildRewritingQuery::create(null, $criteria); + $query->joinWith('Folder', $joinBehavior); + + return $this->getRewritings($query, $con); + } + /** * Clears out the collContentFolders collection * @@ -3602,6 +3940,11 @@ abstract class Content implements ActiveRecordInterface public function clearAllReferences($deep = false) { if ($deep) { + if ($this->collRewritings) { + foreach ($this->collRewritings as $o) { + $o->clearAllReferences($deep); + } + } if ($this->collContentFolders) { foreach ($this->collContentFolders as $o) { $o->clearAllReferences($deep); @@ -3648,6 +3991,10 @@ abstract class Content implements ActiveRecordInterface $this->currentLocale = 'en_EN'; $this->currentTranslations = null; + if ($this->collRewritings instanceof Collection) { + $this->collRewritings->clearIterator(); + } + $this->collRewritings = null; if ($this->collContentFolders instanceof Collection) { $this->collContentFolders->clearIterator(); } diff --git a/core/lib/Thelia/Model/Base/ContentQuery.php b/core/lib/Thelia/Model/Base/ContentQuery.php index 11275cdc6..d4749ce46 100755 --- a/core/lib/Thelia/Model/Base/ContentQuery.php +++ b/core/lib/Thelia/Model/Base/ContentQuery.php @@ -44,6 +44,10 @@ use Thelia\Model\Map\ContentTableMap; * @method ChildContentQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query * @method ChildContentQuery innerJoin($relation) Adds a INNER JOIN clause to the query * + * @method ChildContentQuery leftJoinRewriting($relationAlias = null) Adds a LEFT JOIN clause to the query using the Rewriting relation + * @method ChildContentQuery rightJoinRewriting($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Rewriting relation + * @method ChildContentQuery innerJoinRewriting($relationAlias = null) Adds a INNER JOIN clause to the query using the Rewriting relation + * * @method ChildContentQuery leftJoinContentFolder($relationAlias = null) Adds a LEFT JOIN clause to the query using the ContentFolder relation * @method ChildContentQuery rightJoinContentFolder($relationAlias = null) Adds a RIGHT JOIN clause to the query using the ContentFolder relation * @method ChildContentQuery innerJoinContentFolder($relationAlias = null) Adds a INNER JOIN clause to the query using the ContentFolder relation @@ -598,6 +602,79 @@ abstract class ContentQuery extends ModelCriteria return $this->addUsingAlias(ContentTableMap::VERSION_CREATED_BY, $versionCreatedBy, $comparison); } + /** + * Filter the query by a related \Thelia\Model\Rewriting object + * + * @param \Thelia\Model\Rewriting|ObjectCollection $rewriting the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildContentQuery The current query, for fluid interface + */ + public function filterByRewriting($rewriting, $comparison = null) + { + if ($rewriting instanceof \Thelia\Model\Rewriting) { + return $this + ->addUsingAlias(ContentTableMap::ID, $rewriting->getContentId(), $comparison); + } elseif ($rewriting instanceof ObjectCollection) { + return $this + ->useRewritingQuery() + ->filterByPrimaryKeys($rewriting->getPrimaryKeys()) + ->endUse(); + } else { + throw new PropelException('filterByRewriting() only accepts arguments of type \Thelia\Model\Rewriting or Collection'); + } + } + + /** + * Adds a JOIN clause to the query using the Rewriting relation + * + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return ChildContentQuery The current query, for fluid interface + */ + public function joinRewriting($relationAlias = null, $joinType = Criteria::LEFT_JOIN) + { + $tableMap = $this->getTableMap(); + $relationMap = $tableMap->getRelation('Rewriting'); + + // create a ModelJoin object for this join + $join = new ModelJoin(); + $join->setJoinType($joinType); + $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); + if ($previousJoin = $this->getPreviousJoin()) { + $join->setPreviousJoin($previousJoin); + } + + // add the ModelJoin to the current object + if ($relationAlias) { + $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); + $this->addJoinObject($join, $relationAlias); + } else { + $this->addJoinObject($join, 'Rewriting'); + } + + return $this; + } + + /** + * Use the Rewriting relation Rewriting object + * + * @see useQuery() + * + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return \Thelia\Model\RewritingQuery A secondary query class using the current class as primary query + */ + public function useRewritingQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) + { + return $this + ->joinRewriting($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'Rewriting', '\Thelia\Model\RewritingQuery'); + } + /** * Filter the query by a related \Thelia\Model\ContentFolder object * diff --git a/core/lib/Thelia/Model/Base/Coupon.php b/core/lib/Thelia/Model/Base/Coupon.php index 1d1bfe1e2..484215534 100755 --- a/core/lib/Thelia/Model/Base/Coupon.php +++ b/core/lib/Thelia/Model/Base/Coupon.php @@ -20,8 +20,6 @@ use Propel\Runtime\Util\PropelDateTime; use Thelia\Model\Coupon as ChildCoupon; use Thelia\Model\CouponI18n as ChildCouponI18n; use Thelia\Model\CouponI18nQuery as ChildCouponI18nQuery; -use Thelia\Model\CouponOrder as ChildCouponOrder; -use Thelia\Model\CouponOrderQuery as ChildCouponOrderQuery; use Thelia\Model\CouponQuery as ChildCouponQuery; use Thelia\Model\CouponVersion as ChildCouponVersion; use Thelia\Model\CouponVersionQuery as ChildCouponVersionQuery; @@ -80,24 +78,6 @@ abstract class Coupon implements ActiveRecordInterface */ protected $type; - /** - * The value for the title field. - * @var string - */ - protected $title; - - /** - * The value for the short_description field. - * @var string - */ - protected $short_description; - - /** - * The value for the description field. - * @var string - */ - protected $description; - /** * The value for the amount field. * @var double @@ -171,12 +151,6 @@ abstract class Coupon implements ActiveRecordInterface */ protected $version; - /** - * @var ObjectCollection|ChildCouponOrder[] Collection to store aggregation of ChildCouponOrder objects. - */ - protected $collCouponOrders; - protected $collCouponOrdersPartial; - /** * @var ObjectCollection|ChildCouponI18n[] Collection to store aggregation of ChildCouponI18n objects. */ @@ -219,12 +193,6 @@ abstract class Coupon implements ActiveRecordInterface */ protected $enforceVersion = false; - /** - * An array of objects scheduled for deletion. - * @var ObjectCollection - */ - protected $couponOrdersScheduledForDeletion = null; - /** * An array of objects scheduled for deletion. * @var ObjectCollection @@ -537,39 +505,6 @@ abstract class Coupon implements ActiveRecordInterface return $this->type; } - /** - * Get the [title] column value. - * - * @return string - */ - public function getTitle() - { - - return $this->title; - } - - /** - * Get the [short_description] column value. - * - * @return string - */ - public function getShortDescription() - { - - return $this->short_description; - } - - /** - * Get the [description] column value. - * - * @return string - */ - public function getDescription() - { - - return $this->description; - } - /** * Get the [amount] column value. * @@ -792,69 +727,6 @@ abstract class Coupon implements ActiveRecordInterface return $this; } // setType() - /** - * Set the value of [title] column. - * - * @param string $v new value - * @return \Thelia\Model\Coupon The current object (for fluent API support) - */ - public function setTitle($v) - { - if ($v !== null) { - $v = (string) $v; - } - - if ($this->title !== $v) { - $this->title = $v; - $this->modifiedColumns[] = CouponTableMap::TITLE; - } - - - return $this; - } // setTitle() - - /** - * Set the value of [short_description] column. - * - * @param string $v new value - * @return \Thelia\Model\Coupon The current object (for fluent API support) - */ - public function setShortDescription($v) - { - if ($v !== null) { - $v = (string) $v; - } - - if ($this->short_description !== $v) { - $this->short_description = $v; - $this->modifiedColumns[] = CouponTableMap::SHORT_DESCRIPTION; - } - - - return $this; - } // setShortDescription() - - /** - * Set the value of [description] column. - * - * @param string $v new value - * @return \Thelia\Model\Coupon The current object (for fluent API support) - */ - public function setDescription($v) - { - if ($v !== null) { - $v = (string) $v; - } - - if ($this->description !== $v) { - $this->description = $v; - $this->modifiedColumns[] = CouponTableMap::DESCRIPTION; - } - - - return $this; - } // setDescription() - /** * Set the value of [amount] column. * @@ -1165,58 +1037,49 @@ abstract class Coupon implements ActiveRecordInterface $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : CouponTableMap::translateFieldName('Type', TableMap::TYPE_PHPNAME, $indexType)]; $this->type = (null !== $col) ? (string) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : CouponTableMap::translateFieldName('Title', TableMap::TYPE_PHPNAME, $indexType)]; - $this->title = (null !== $col) ? (string) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : CouponTableMap::translateFieldName('ShortDescription', TableMap::TYPE_PHPNAME, $indexType)]; - $this->short_description = (null !== $col) ? (string) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : CouponTableMap::translateFieldName('Description', TableMap::TYPE_PHPNAME, $indexType)]; - $this->description = (null !== $col) ? (string) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : CouponTableMap::translateFieldName('Amount', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : CouponTableMap::translateFieldName('Amount', TableMap::TYPE_PHPNAME, $indexType)]; $this->amount = (null !== $col) ? (double) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : CouponTableMap::translateFieldName('IsUsed', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : CouponTableMap::translateFieldName('IsUsed', TableMap::TYPE_PHPNAME, $indexType)]; $this->is_used = (null !== $col) ? (int) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 8 + $startcol : CouponTableMap::translateFieldName('IsEnabled', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : CouponTableMap::translateFieldName('IsEnabled', TableMap::TYPE_PHPNAME, $indexType)]; $this->is_enabled = (null !== $col) ? (int) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 9 + $startcol : CouponTableMap::translateFieldName('ExpirationDate', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : CouponTableMap::translateFieldName('ExpirationDate', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } $this->expiration_date = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 10 + $startcol : CouponTableMap::translateFieldName('SerializedRules', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : CouponTableMap::translateFieldName('SerializedRules', TableMap::TYPE_PHPNAME, $indexType)]; $this->serialized_rules = (null !== $col) ? (string) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 11 + $startcol : CouponTableMap::translateFieldName('IsCumulative', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 8 + $startcol : CouponTableMap::translateFieldName('IsCumulative', TableMap::TYPE_PHPNAME, $indexType)]; $this->is_cumulative = (null !== $col) ? (int) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 12 + $startcol : CouponTableMap::translateFieldName('IsRemovingPostage', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 9 + $startcol : CouponTableMap::translateFieldName('IsRemovingPostage', TableMap::TYPE_PHPNAME, $indexType)]; $this->is_removing_postage = (null !== $col) ? (int) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 13 + $startcol : CouponTableMap::translateFieldName('MaxUsage', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 10 + $startcol : CouponTableMap::translateFieldName('MaxUsage', TableMap::TYPE_PHPNAME, $indexType)]; $this->max_usage = (null !== $col) ? (int) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 14 + $startcol : CouponTableMap::translateFieldName('IsAvailableOnSpecialOffers', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 11 + $startcol : CouponTableMap::translateFieldName('IsAvailableOnSpecialOffers', TableMap::TYPE_PHPNAME, $indexType)]; $this->is_available_on_special_offers = (null !== $col) ? (boolean) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 15 + $startcol : CouponTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 12 + $startcol : CouponTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 16 + $startcol : CouponTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 13 + $startcol : CouponTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } $this->updated_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 17 + $startcol : CouponTableMap::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 14 + $startcol : CouponTableMap::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)]; $this->version = (null !== $col) ? (int) $col : null; $this->resetModified(); @@ -1226,7 +1089,7 @@ abstract class Coupon implements ActiveRecordInterface $this->ensureConsistency(); } - return $startcol + 18; // 18 = CouponTableMap::NUM_HYDRATE_COLUMNS. + return $startcol + 15; // 15 = CouponTableMap::NUM_HYDRATE_COLUMNS. } catch (Exception $e) { throw new PropelException("Error populating \Thelia\Model\Coupon object", 0, $e); @@ -1287,8 +1150,6 @@ abstract class Coupon implements ActiveRecordInterface if ($deep) { // also de-associate any related objects? - $this->collCouponOrders = null; - $this->collCouponI18ns = null; $this->collCouponVersions = null; @@ -1435,23 +1296,6 @@ abstract class Coupon implements ActiveRecordInterface $this->resetModified(); } - if ($this->couponOrdersScheduledForDeletion !== null) { - if (!$this->couponOrdersScheduledForDeletion->isEmpty()) { - \Thelia\Model\CouponOrderQuery::create() - ->filterByPrimaryKeys($this->couponOrdersScheduledForDeletion->getPrimaryKeys(false)) - ->delete($con); - $this->couponOrdersScheduledForDeletion = null; - } - } - - if ($this->collCouponOrders !== null) { - foreach ($this->collCouponOrders as $referrerFK) { - if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) { - $affectedRows += $referrerFK->save($con); - } - } - } - if ($this->couponI18nsScheduledForDeletion !== null) { if (!$this->couponI18nsScheduledForDeletion->isEmpty()) { \Thelia\Model\CouponI18nQuery::create() @@ -1521,15 +1365,6 @@ abstract class Coupon implements ActiveRecordInterface if ($this->isColumnModified(CouponTableMap::TYPE)) { $modifiedColumns[':p' . $index++] = 'TYPE'; } - if ($this->isColumnModified(CouponTableMap::TITLE)) { - $modifiedColumns[':p' . $index++] = 'TITLE'; - } - if ($this->isColumnModified(CouponTableMap::SHORT_DESCRIPTION)) { - $modifiedColumns[':p' . $index++] = 'SHORT_DESCRIPTION'; - } - if ($this->isColumnModified(CouponTableMap::DESCRIPTION)) { - $modifiedColumns[':p' . $index++] = 'DESCRIPTION'; - } if ($this->isColumnModified(CouponTableMap::AMOUNT)) { $modifiedColumns[':p' . $index++] = 'AMOUNT'; } @@ -1586,15 +1421,6 @@ abstract class Coupon implements ActiveRecordInterface case 'TYPE': $stmt->bindValue($identifier, $this->type, PDO::PARAM_STR); break; - case 'TITLE': - $stmt->bindValue($identifier, $this->title, PDO::PARAM_STR); - break; - case 'SHORT_DESCRIPTION': - $stmt->bindValue($identifier, $this->short_description, PDO::PARAM_STR); - break; - case 'DESCRIPTION': - $stmt->bindValue($identifier, $this->description, PDO::PARAM_STR); - break; case 'AMOUNT': $stmt->bindValue($identifier, $this->amount, PDO::PARAM_STR); break; @@ -1703,48 +1529,39 @@ abstract class Coupon implements ActiveRecordInterface return $this->getType(); break; case 3: - return $this->getTitle(); - break; - case 4: - return $this->getShortDescription(); - break; - case 5: - return $this->getDescription(); - break; - case 6: return $this->getAmount(); break; - case 7: + case 4: return $this->getIsUsed(); break; - case 8: + case 5: return $this->getIsEnabled(); break; - case 9: + case 6: return $this->getExpirationDate(); break; - case 10: + case 7: return $this->getSerializedRules(); break; - case 11: + case 8: return $this->getIsCumulative(); break; - case 12: + case 9: return $this->getIsRemovingPostage(); break; - case 13: + case 10: return $this->getMaxUsage(); break; - case 14: + case 11: return $this->getIsAvailableOnSpecialOffers(); break; - case 15: + case 12: return $this->getCreatedAt(); break; - case 16: + case 13: return $this->getUpdatedAt(); break; - case 17: + case 14: return $this->getVersion(); break; default: @@ -1779,21 +1596,18 @@ abstract class Coupon implements ActiveRecordInterface $keys[0] => $this->getId(), $keys[1] => $this->getCode(), $keys[2] => $this->getType(), - $keys[3] => $this->getTitle(), - $keys[4] => $this->getShortDescription(), - $keys[5] => $this->getDescription(), - $keys[6] => $this->getAmount(), - $keys[7] => $this->getIsUsed(), - $keys[8] => $this->getIsEnabled(), - $keys[9] => $this->getExpirationDate(), - $keys[10] => $this->getSerializedRules(), - $keys[11] => $this->getIsCumulative(), - $keys[12] => $this->getIsRemovingPostage(), - $keys[13] => $this->getMaxUsage(), - $keys[14] => $this->getIsAvailableOnSpecialOffers(), - $keys[15] => $this->getCreatedAt(), - $keys[16] => $this->getUpdatedAt(), - $keys[17] => $this->getVersion(), + $keys[3] => $this->getAmount(), + $keys[4] => $this->getIsUsed(), + $keys[5] => $this->getIsEnabled(), + $keys[6] => $this->getExpirationDate(), + $keys[7] => $this->getSerializedRules(), + $keys[8] => $this->getIsCumulative(), + $keys[9] => $this->getIsRemovingPostage(), + $keys[10] => $this->getMaxUsage(), + $keys[11] => $this->getIsAvailableOnSpecialOffers(), + $keys[12] => $this->getCreatedAt(), + $keys[13] => $this->getUpdatedAt(), + $keys[14] => $this->getVersion(), ); $virtualColumns = $this->virtualColumns; foreach($virtualColumns as $key => $virtualColumn) @@ -1802,9 +1616,6 @@ abstract class Coupon implements ActiveRecordInterface } if ($includeForeignObjects) { - if (null !== $this->collCouponOrders) { - $result['CouponOrders'] = $this->collCouponOrders->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); - } if (null !== $this->collCouponI18ns) { $result['CouponI18ns'] = $this->collCouponI18ns->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } @@ -1855,48 +1666,39 @@ abstract class Coupon implements ActiveRecordInterface $this->setType($value); break; case 3: - $this->setTitle($value); - break; - case 4: - $this->setShortDescription($value); - break; - case 5: - $this->setDescription($value); - break; - case 6: $this->setAmount($value); break; - case 7: + case 4: $this->setIsUsed($value); break; - case 8: + case 5: $this->setIsEnabled($value); break; - case 9: + case 6: $this->setExpirationDate($value); break; - case 10: + case 7: $this->setSerializedRules($value); break; - case 11: + case 8: $this->setIsCumulative($value); break; - case 12: + case 9: $this->setIsRemovingPostage($value); break; - case 13: + case 10: $this->setMaxUsage($value); break; - case 14: + case 11: $this->setIsAvailableOnSpecialOffers($value); break; - case 15: + case 12: $this->setCreatedAt($value); break; - case 16: + case 13: $this->setUpdatedAt($value); break; - case 17: + case 14: $this->setVersion($value); break; } // switch() @@ -1926,21 +1728,18 @@ abstract class Coupon implements ActiveRecordInterface if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]); if (array_key_exists($keys[1], $arr)) $this->setCode($arr[$keys[1]]); if (array_key_exists($keys[2], $arr)) $this->setType($arr[$keys[2]]); - if (array_key_exists($keys[3], $arr)) $this->setTitle($arr[$keys[3]]); - if (array_key_exists($keys[4], $arr)) $this->setShortDescription($arr[$keys[4]]); - if (array_key_exists($keys[5], $arr)) $this->setDescription($arr[$keys[5]]); - if (array_key_exists($keys[6], $arr)) $this->setAmount($arr[$keys[6]]); - if (array_key_exists($keys[7], $arr)) $this->setIsUsed($arr[$keys[7]]); - if (array_key_exists($keys[8], $arr)) $this->setIsEnabled($arr[$keys[8]]); - if (array_key_exists($keys[9], $arr)) $this->setExpirationDate($arr[$keys[9]]); - if (array_key_exists($keys[10], $arr)) $this->setSerializedRules($arr[$keys[10]]); - if (array_key_exists($keys[11], $arr)) $this->setIsCumulative($arr[$keys[11]]); - if (array_key_exists($keys[12], $arr)) $this->setIsRemovingPostage($arr[$keys[12]]); - if (array_key_exists($keys[13], $arr)) $this->setMaxUsage($arr[$keys[13]]); - if (array_key_exists($keys[14], $arr)) $this->setIsAvailableOnSpecialOffers($arr[$keys[14]]); - if (array_key_exists($keys[15], $arr)) $this->setCreatedAt($arr[$keys[15]]); - if (array_key_exists($keys[16], $arr)) $this->setUpdatedAt($arr[$keys[16]]); - if (array_key_exists($keys[17], $arr)) $this->setVersion($arr[$keys[17]]); + if (array_key_exists($keys[3], $arr)) $this->setAmount($arr[$keys[3]]); + if (array_key_exists($keys[4], $arr)) $this->setIsUsed($arr[$keys[4]]); + if (array_key_exists($keys[5], $arr)) $this->setIsEnabled($arr[$keys[5]]); + if (array_key_exists($keys[6], $arr)) $this->setExpirationDate($arr[$keys[6]]); + if (array_key_exists($keys[7], $arr)) $this->setSerializedRules($arr[$keys[7]]); + if (array_key_exists($keys[8], $arr)) $this->setIsCumulative($arr[$keys[8]]); + if (array_key_exists($keys[9], $arr)) $this->setIsRemovingPostage($arr[$keys[9]]); + if (array_key_exists($keys[10], $arr)) $this->setMaxUsage($arr[$keys[10]]); + if (array_key_exists($keys[11], $arr)) $this->setIsAvailableOnSpecialOffers($arr[$keys[11]]); + if (array_key_exists($keys[12], $arr)) $this->setCreatedAt($arr[$keys[12]]); + if (array_key_exists($keys[13], $arr)) $this->setUpdatedAt($arr[$keys[13]]); + if (array_key_exists($keys[14], $arr)) $this->setVersion($arr[$keys[14]]); } /** @@ -1955,9 +1754,6 @@ abstract class Coupon implements ActiveRecordInterface if ($this->isColumnModified(CouponTableMap::ID)) $criteria->add(CouponTableMap::ID, $this->id); if ($this->isColumnModified(CouponTableMap::CODE)) $criteria->add(CouponTableMap::CODE, $this->code); if ($this->isColumnModified(CouponTableMap::TYPE)) $criteria->add(CouponTableMap::TYPE, $this->type); - if ($this->isColumnModified(CouponTableMap::TITLE)) $criteria->add(CouponTableMap::TITLE, $this->title); - if ($this->isColumnModified(CouponTableMap::SHORT_DESCRIPTION)) $criteria->add(CouponTableMap::SHORT_DESCRIPTION, $this->short_description); - if ($this->isColumnModified(CouponTableMap::DESCRIPTION)) $criteria->add(CouponTableMap::DESCRIPTION, $this->description); if ($this->isColumnModified(CouponTableMap::AMOUNT)) $criteria->add(CouponTableMap::AMOUNT, $this->amount); if ($this->isColumnModified(CouponTableMap::IS_USED)) $criteria->add(CouponTableMap::IS_USED, $this->is_used); if ($this->isColumnModified(CouponTableMap::IS_ENABLED)) $criteria->add(CouponTableMap::IS_ENABLED, $this->is_enabled); @@ -2035,9 +1831,6 @@ abstract class Coupon implements ActiveRecordInterface { $copyObj->setCode($this->getCode()); $copyObj->setType($this->getType()); - $copyObj->setTitle($this->getTitle()); - $copyObj->setShortDescription($this->getShortDescription()); - $copyObj->setDescription($this->getDescription()); $copyObj->setAmount($this->getAmount()); $copyObj->setIsUsed($this->getIsUsed()); $copyObj->setIsEnabled($this->getIsEnabled()); @@ -2056,12 +1849,6 @@ abstract class Coupon implements ActiveRecordInterface // the getter/setter methods for fkey referrer objects. $copyObj->setNew(false); - foreach ($this->getCouponOrders() as $relObj) { - if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves - $copyObj->addCouponOrder($relObj->copy($deepCopy)); - } - } - foreach ($this->getCouponI18ns() as $relObj) { if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves $copyObj->addCouponI18n($relObj->copy($deepCopy)); @@ -2115,9 +1902,6 @@ abstract class Coupon implements ActiveRecordInterface */ public function initRelation($relationName) { - if ('CouponOrder' == $relationName) { - return $this->initCouponOrders(); - } if ('CouponI18n' == $relationName) { return $this->initCouponI18ns(); } @@ -2126,249 +1910,6 @@ abstract class Coupon implements ActiveRecordInterface } } - /** - * Clears out the collCouponOrders collection - * - * This does not modify the database; however, it will remove any associated objects, causing - * them to be refetched by subsequent calls to accessor method. - * - * @return void - * @see addCouponOrders() - */ - public function clearCouponOrders() - { - $this->collCouponOrders = null; // important to set this to NULL since that means it is uninitialized - } - - /** - * Reset is the collCouponOrders collection loaded partially. - */ - public function resetPartialCouponOrders($v = true) - { - $this->collCouponOrdersPartial = $v; - } - - /** - * Initializes the collCouponOrders collection. - * - * By default this just sets the collCouponOrders collection to an empty array (like clearcollCouponOrders()); - * however, you may wish to override this method in your stub class to provide setting appropriate - * to your application -- for example, setting the initial array to the values stored in database. - * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty - * - * @return void - */ - public function initCouponOrders($overrideExisting = true) - { - if (null !== $this->collCouponOrders && !$overrideExisting) { - return; - } - $this->collCouponOrders = new ObjectCollection(); - $this->collCouponOrders->setModel('\Thelia\Model\CouponOrder'); - } - - /** - * Gets an array of ChildCouponOrder objects which contain a foreign key that references this object. - * - * If the $criteria is not null, it is used to always fetch the results from the database. - * Otherwise the results are fetched from the database the first time, then cached. - * Next time the same method is called without $criteria, the cached collection is returned. - * If this ChildCoupon is new, it will return - * an empty collection or the current collection; the criteria is ignored on a new object. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @return Collection|ChildCouponOrder[] List of ChildCouponOrder objects - * @throws PropelException - */ - public function getCouponOrders($criteria = null, ConnectionInterface $con = null) - { - $partial = $this->collCouponOrdersPartial && !$this->isNew(); - if (null === $this->collCouponOrders || null !== $criteria || $partial) { - if ($this->isNew() && null === $this->collCouponOrders) { - // return empty collection - $this->initCouponOrders(); - } else { - $collCouponOrders = ChildCouponOrderQuery::create(null, $criteria) - ->filterByCoupon($this) - ->find($con); - - if (null !== $criteria) { - if (false !== $this->collCouponOrdersPartial && count($collCouponOrders)) { - $this->initCouponOrders(false); - - foreach ($collCouponOrders as $obj) { - if (false == $this->collCouponOrders->contains($obj)) { - $this->collCouponOrders->append($obj); - } - } - - $this->collCouponOrdersPartial = true; - } - - $collCouponOrders->getInternalIterator()->rewind(); - - return $collCouponOrders; - } - - if ($partial && $this->collCouponOrders) { - foreach ($this->collCouponOrders as $obj) { - if ($obj->isNew()) { - $collCouponOrders[] = $obj; - } - } - } - - $this->collCouponOrders = $collCouponOrders; - $this->collCouponOrdersPartial = false; - } - } - - return $this->collCouponOrders; - } - - /** - * Sets a collection of CouponOrder objects related by a one-to-many relationship - * to the current object. - * It will also schedule objects for deletion based on a diff between old objects (aka persisted) - * and new objects from the given Propel collection. - * - * @param Collection $couponOrders A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildCoupon The current object (for fluent API support) - */ - public function setCouponOrders(Collection $couponOrders, ConnectionInterface $con = null) - { - $couponOrdersToDelete = $this->getCouponOrders(new Criteria(), $con)->diff($couponOrders); - - - $this->couponOrdersScheduledForDeletion = $couponOrdersToDelete; - - foreach ($couponOrdersToDelete as $couponOrderRemoved) { - $couponOrderRemoved->setCoupon(null); - } - - $this->collCouponOrders = null; - foreach ($couponOrders as $couponOrder) { - $this->addCouponOrder($couponOrder); - } - - $this->collCouponOrders = $couponOrders; - $this->collCouponOrdersPartial = false; - - return $this; - } - - /** - * Returns the number of related CouponOrder objects. - * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related CouponOrder objects. - * @throws PropelException - */ - public function countCouponOrders(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) - { - $partial = $this->collCouponOrdersPartial && !$this->isNew(); - if (null === $this->collCouponOrders || null !== $criteria || $partial) { - if ($this->isNew() && null === $this->collCouponOrders) { - return 0; - } - - if ($partial && !$criteria) { - return count($this->getCouponOrders()); - } - - $query = ChildCouponOrderQuery::create(null, $criteria); - if ($distinct) { - $query->distinct(); - } - - return $query - ->filterByCoupon($this) - ->count($con); - } - - return count($this->collCouponOrders); - } - - /** - * Method called to associate a ChildCouponOrder object to this object - * through the ChildCouponOrder foreign key attribute. - * - * @param ChildCouponOrder $l ChildCouponOrder - * @return \Thelia\Model\Coupon The current object (for fluent API support) - */ - public function addCouponOrder(ChildCouponOrder $l) - { - if ($this->collCouponOrders === null) { - $this->initCouponOrders(); - $this->collCouponOrdersPartial = true; - } - - if (!in_array($l, $this->collCouponOrders->getArrayCopy(), true)) { // only add it if the **same** object is not already associated - $this->doAddCouponOrder($l); - } - - return $this; - } - - /** - * @param CouponOrder $couponOrder The couponOrder object to add. - */ - protected function doAddCouponOrder($couponOrder) - { - $this->collCouponOrders[]= $couponOrder; - $couponOrder->setCoupon($this); - } - - /** - * @param CouponOrder $couponOrder The couponOrder object to remove. - * @return ChildCoupon The current object (for fluent API support) - */ - public function removeCouponOrder($couponOrder) - { - if ($this->getCouponOrders()->contains($couponOrder)) { - $this->collCouponOrders->remove($this->collCouponOrders->search($couponOrder)); - if (null === $this->couponOrdersScheduledForDeletion) { - $this->couponOrdersScheduledForDeletion = clone $this->collCouponOrders; - $this->couponOrdersScheduledForDeletion->clear(); - } - $this->couponOrdersScheduledForDeletion[]= clone $couponOrder; - $couponOrder->setCoupon(null); - } - - return $this; - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Coupon is new, it will return - * an empty collection; or if this Coupon has previously - * been saved, it will retrieve related CouponOrders from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Coupon. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildCouponOrder[] List of ChildCouponOrder objects - */ - public function getCouponOrdersJoinOrder($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildCouponOrderQuery::create(null, $criteria); - $query->joinWith('Order', $joinBehavior); - - return $this->getCouponOrders($query, $con); - } - /** * Clears out the collCouponI18ns collection * @@ -2823,9 +2364,6 @@ abstract class Coupon implements ActiveRecordInterface $this->id = null; $this->code = null; $this->type = null; - $this->title = null; - $this->short_description = null; - $this->description = null; $this->amount = null; $this->is_used = null; $this->is_enabled = null; @@ -2858,11 +2396,6 @@ abstract class Coupon implements ActiveRecordInterface public function clearAllReferences($deep = false) { if ($deep) { - if ($this->collCouponOrders) { - foreach ($this->collCouponOrders as $o) { - $o->clearAllReferences($deep); - } - } if ($this->collCouponI18ns) { foreach ($this->collCouponI18ns as $o) { $o->clearAllReferences($deep); @@ -2879,10 +2412,6 @@ abstract class Coupon implements ActiveRecordInterface $this->currentLocale = 'en_EN'; $this->currentTranslations = null; - if ($this->collCouponOrders instanceof Collection) { - $this->collCouponOrders->clearIterator(); - } - $this->collCouponOrders = null; if ($this->collCouponI18ns instanceof Collection) { $this->collCouponI18ns->clearIterator(); } @@ -3016,6 +2545,78 @@ abstract class Coupon implements ActiveRecordInterface return $this->getTranslation($this->getLocale(), $con); } + + /** + * Get the [title] column value. + * + * @return string + */ + public function getTitle() + { + return $this->getCurrentTranslation()->getTitle(); + } + + + /** + * Set the value of [title] column. + * + * @param string $v new value + * @return \Thelia\Model\CouponI18n The current object (for fluent API support) + */ + public function setTitle($v) + { $this->getCurrentTranslation()->setTitle($v); + + return $this; + } + + + /** + * Get the [short_description] column value. + * + * @return string + */ + public function getShortDescription() + { + return $this->getCurrentTranslation()->getShortDescription(); + } + + + /** + * Set the value of [short_description] column. + * + * @param string $v new value + * @return \Thelia\Model\CouponI18n The current object (for fluent API support) + */ + public function setShortDescription($v) + { $this->getCurrentTranslation()->setShortDescription($v); + + return $this; + } + + + /** + * Get the [description] column value. + * + * @return string + */ + public function getDescription() + { + return $this->getCurrentTranslation()->getDescription(); + } + + + /** + * Set the value of [description] column. + * + * @param string $v new value + * @return \Thelia\Model\CouponI18n The current object (for fluent API support) + */ + public function setDescription($v) + { $this->getCurrentTranslation()->setDescription($v); + + return $this; + } + // versionable behavior /** @@ -3067,9 +2668,6 @@ abstract class Coupon implements ActiveRecordInterface $version->setId($this->getId()); $version->setCode($this->getCode()); $version->setType($this->getType()); - $version->setTitle($this->getTitle()); - $version->setShortDescription($this->getShortDescription()); - $version->setDescription($this->getDescription()); $version->setAmount($this->getAmount()); $version->setIsUsed($this->getIsUsed()); $version->setIsEnabled($this->getIsEnabled()); @@ -3122,9 +2720,6 @@ abstract class Coupon implements ActiveRecordInterface $this->setId($version->getId()); $this->setCode($version->getCode()); $this->setType($version->getType()); - $this->setTitle($version->getTitle()); - $this->setShortDescription($version->getShortDescription()); - $this->setDescription($version->getDescription()); $this->setAmount($version->getAmount()); $this->setIsUsed($version->getIsUsed()); $this->setIsEnabled($version->getIsEnabled()); diff --git a/core/lib/Thelia/Model/Base/CouponI18n.php b/core/lib/Thelia/Model/Base/CouponI18n.php index bc7cc8cdc..328d04af8 100644 --- a/core/lib/Thelia/Model/Base/CouponI18n.php +++ b/core/lib/Thelia/Model/Base/CouponI18n.php @@ -66,6 +66,24 @@ abstract class CouponI18n implements ActiveRecordInterface */ protected $locale; + /** + * The value for the title field. + * @var string + */ + protected $title; + + /** + * The value for the short_description field. + * @var string + */ + protected $short_description; + + /** + * The value for the description field. + * @var string + */ + protected $description; + /** * @var Coupon */ @@ -368,6 +386,39 @@ abstract class CouponI18n implements ActiveRecordInterface return $this->locale; } + /** + * Get the [title] column value. + * + * @return string + */ + public function getTitle() + { + + return $this->title; + } + + /** + * Get the [short_description] column value. + * + * @return string + */ + public function getShortDescription() + { + + return $this->short_description; + } + + /** + * Get the [description] column value. + * + * @return string + */ + public function getDescription() + { + + return $this->description; + } + /** * Set the value of [id] column. * @@ -414,6 +465,69 @@ abstract class CouponI18n implements ActiveRecordInterface return $this; } // setLocale() + /** + * Set the value of [title] column. + * + * @param string $v new value + * @return \Thelia\Model\CouponI18n The current object (for fluent API support) + */ + public function setTitle($v) + { + if ($v !== null) { + $v = (string) $v; + } + + if ($this->title !== $v) { + $this->title = $v; + $this->modifiedColumns[] = CouponI18nTableMap::TITLE; + } + + + return $this; + } // setTitle() + + /** + * Set the value of [short_description] column. + * + * @param string $v new value + * @return \Thelia\Model\CouponI18n The current object (for fluent API support) + */ + public function setShortDescription($v) + { + if ($v !== null) { + $v = (string) $v; + } + + if ($this->short_description !== $v) { + $this->short_description = $v; + $this->modifiedColumns[] = CouponI18nTableMap::SHORT_DESCRIPTION; + } + + + return $this; + } // setShortDescription() + + /** + * Set the value of [description] column. + * + * @param string $v new value + * @return \Thelia\Model\CouponI18n The current object (for fluent API support) + */ + public function setDescription($v) + { + if ($v !== null) { + $v = (string) $v; + } + + if ($this->description !== $v) { + $this->description = $v; + $this->modifiedColumns[] = CouponI18nTableMap::DESCRIPTION; + } + + + return $this; + } // setDescription() + /** * Indicates whether the columns in this object are only set to default values. * @@ -460,6 +574,15 @@ abstract class CouponI18n implements ActiveRecordInterface $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : CouponI18nTableMap::translateFieldName('Locale', TableMap::TYPE_PHPNAME, $indexType)]; $this->locale = (null !== $col) ? (string) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : CouponI18nTableMap::translateFieldName('Title', TableMap::TYPE_PHPNAME, $indexType)]; + $this->title = (null !== $col) ? (string) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : CouponI18nTableMap::translateFieldName('ShortDescription', TableMap::TYPE_PHPNAME, $indexType)]; + $this->short_description = (null !== $col) ? (string) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : CouponI18nTableMap::translateFieldName('Description', TableMap::TYPE_PHPNAME, $indexType)]; + $this->description = (null !== $col) ? (string) $col : null; $this->resetModified(); $this->setNew(false); @@ -468,7 +591,7 @@ abstract class CouponI18n implements ActiveRecordInterface $this->ensureConsistency(); } - return $startcol + 2; // 2 = CouponI18nTableMap::NUM_HYDRATE_COLUMNS. + return $startcol + 5; // 5 = CouponI18nTableMap::NUM_HYDRATE_COLUMNS. } catch (Exception $e) { throw new PropelException("Error populating \Thelia\Model\CouponI18n object", 0, $e); @@ -695,6 +818,15 @@ abstract class CouponI18n implements ActiveRecordInterface if ($this->isColumnModified(CouponI18nTableMap::LOCALE)) { $modifiedColumns[':p' . $index++] = 'LOCALE'; } + if ($this->isColumnModified(CouponI18nTableMap::TITLE)) { + $modifiedColumns[':p' . $index++] = 'TITLE'; + } + if ($this->isColumnModified(CouponI18nTableMap::SHORT_DESCRIPTION)) { + $modifiedColumns[':p' . $index++] = 'SHORT_DESCRIPTION'; + } + if ($this->isColumnModified(CouponI18nTableMap::DESCRIPTION)) { + $modifiedColumns[':p' . $index++] = 'DESCRIPTION'; + } $sql = sprintf( 'INSERT INTO coupon_i18n (%s) VALUES (%s)', @@ -712,6 +844,15 @@ abstract class CouponI18n implements ActiveRecordInterface case 'LOCALE': $stmt->bindValue($identifier, $this->locale, PDO::PARAM_STR); break; + case 'TITLE': + $stmt->bindValue($identifier, $this->title, PDO::PARAM_STR); + break; + case 'SHORT_DESCRIPTION': + $stmt->bindValue($identifier, $this->short_description, PDO::PARAM_STR); + break; + case 'DESCRIPTION': + $stmt->bindValue($identifier, $this->description, PDO::PARAM_STR); + break; } } $stmt->execute(); @@ -773,6 +914,15 @@ abstract class CouponI18n implements ActiveRecordInterface case 1: return $this->getLocale(); break; + case 2: + return $this->getTitle(); + break; + case 3: + return $this->getShortDescription(); + break; + case 4: + return $this->getDescription(); + break; default: return null; break; @@ -804,6 +954,9 @@ abstract class CouponI18n implements ActiveRecordInterface $result = array( $keys[0] => $this->getId(), $keys[1] => $this->getLocale(), + $keys[2] => $this->getTitle(), + $keys[3] => $this->getShortDescription(), + $keys[4] => $this->getDescription(), ); $virtualColumns = $this->virtualColumns; foreach($virtualColumns as $key => $virtualColumn) @@ -855,6 +1008,15 @@ abstract class CouponI18n implements ActiveRecordInterface case 1: $this->setLocale($value); break; + case 2: + $this->setTitle($value); + break; + case 3: + $this->setShortDescription($value); + break; + case 4: + $this->setDescription($value); + break; } // switch() } @@ -881,6 +1043,9 @@ abstract class CouponI18n implements ActiveRecordInterface if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]); if (array_key_exists($keys[1], $arr)) $this->setLocale($arr[$keys[1]]); + if (array_key_exists($keys[2], $arr)) $this->setTitle($arr[$keys[2]]); + if (array_key_exists($keys[3], $arr)) $this->setShortDescription($arr[$keys[3]]); + if (array_key_exists($keys[4], $arr)) $this->setDescription($arr[$keys[4]]); } /** @@ -894,6 +1059,9 @@ abstract class CouponI18n implements ActiveRecordInterface if ($this->isColumnModified(CouponI18nTableMap::ID)) $criteria->add(CouponI18nTableMap::ID, $this->id); if ($this->isColumnModified(CouponI18nTableMap::LOCALE)) $criteria->add(CouponI18nTableMap::LOCALE, $this->locale); + if ($this->isColumnModified(CouponI18nTableMap::TITLE)) $criteria->add(CouponI18nTableMap::TITLE, $this->title); + if ($this->isColumnModified(CouponI18nTableMap::SHORT_DESCRIPTION)) $criteria->add(CouponI18nTableMap::SHORT_DESCRIPTION, $this->short_description); + if ($this->isColumnModified(CouponI18nTableMap::DESCRIPTION)) $criteria->add(CouponI18nTableMap::DESCRIPTION, $this->description); return $criteria; } @@ -966,6 +1134,9 @@ abstract class CouponI18n implements ActiveRecordInterface { $copyObj->setId($this->getId()); $copyObj->setLocale($this->getLocale()); + $copyObj->setTitle($this->getTitle()); + $copyObj->setShortDescription($this->getShortDescription()); + $copyObj->setDescription($this->getDescription()); if ($makeNew) { $copyObj->setNew(true); } @@ -1051,6 +1222,9 @@ abstract class CouponI18n implements ActiveRecordInterface { $this->id = null; $this->locale = null; + $this->title = null; + $this->short_description = null; + $this->description = null; $this->alreadyInSave = false; $this->clearAllReferences(); $this->applyDefaultValues(); diff --git a/core/lib/Thelia/Model/Base/CouponI18nQuery.php b/core/lib/Thelia/Model/Base/CouponI18nQuery.php index 9468f787f..5dfbdbcdc 100644 --- a/core/lib/Thelia/Model/Base/CouponI18nQuery.php +++ b/core/lib/Thelia/Model/Base/CouponI18nQuery.php @@ -23,9 +23,15 @@ use Thelia\Model\Map\CouponI18nTableMap; * * @method ChildCouponI18nQuery orderById($order = Criteria::ASC) Order by the id column * @method ChildCouponI18nQuery orderByLocale($order = Criteria::ASC) Order by the locale column + * @method ChildCouponI18nQuery orderByTitle($order = Criteria::ASC) Order by the title column + * @method ChildCouponI18nQuery orderByShortDescription($order = Criteria::ASC) Order by the short_description column + * @method ChildCouponI18nQuery orderByDescription($order = Criteria::ASC) Order by the description column * * @method ChildCouponI18nQuery groupById() Group by the id column * @method ChildCouponI18nQuery groupByLocale() Group by the locale column + * @method ChildCouponI18nQuery groupByTitle() Group by the title column + * @method ChildCouponI18nQuery groupByShortDescription() Group by the short_description column + * @method ChildCouponI18nQuery groupByDescription() Group by the description column * * @method ChildCouponI18nQuery leftJoin($relation) Adds a LEFT JOIN clause to the query * @method ChildCouponI18nQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query @@ -40,9 +46,15 @@ use Thelia\Model\Map\CouponI18nTableMap; * * @method ChildCouponI18n findOneById(int $id) Return the first ChildCouponI18n filtered by the id column * @method ChildCouponI18n findOneByLocale(string $locale) Return the first ChildCouponI18n filtered by the locale column + * @method ChildCouponI18n findOneByTitle(string $title) Return the first ChildCouponI18n filtered by the title column + * @method ChildCouponI18n findOneByShortDescription(string $short_description) Return the first ChildCouponI18n filtered by the short_description column + * @method ChildCouponI18n findOneByDescription(string $description) Return the first ChildCouponI18n filtered by the description column * * @method array findById(int $id) Return ChildCouponI18n objects filtered by the id column * @method array findByLocale(string $locale) Return ChildCouponI18n objects filtered by the locale column + * @method array findByTitle(string $title) Return ChildCouponI18n objects filtered by the title column + * @method array findByShortDescription(string $short_description) Return ChildCouponI18n objects filtered by the short_description column + * @method array findByDescription(string $description) Return ChildCouponI18n objects filtered by the description column * */ abstract class CouponI18nQuery extends ModelCriteria @@ -131,7 +143,7 @@ abstract class CouponI18nQuery extends ModelCriteria */ protected function findPkSimple($key, $con) { - $sql = 'SELECT ID, LOCALE FROM coupon_i18n WHERE ID = :p0 AND LOCALE = :p1'; + $sql = 'SELECT ID, LOCALE, TITLE, SHORT_DESCRIPTION, DESCRIPTION FROM coupon_i18n WHERE ID = :p0 AND LOCALE = :p1'; try { $stmt = $con->prepare($sql); $stmt->bindValue(':p0', $key[0], PDO::PARAM_INT); @@ -304,6 +316,93 @@ abstract class CouponI18nQuery extends ModelCriteria return $this->addUsingAlias(CouponI18nTableMap::LOCALE, $locale, $comparison); } + /** + * Filter the query on the title column + * + * Example usage: + * + * $query->filterByTitle('fooValue'); // WHERE title = 'fooValue' + * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' + * + * + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponI18nQuery The current query, for fluid interface + */ + public function filterByTitle($title = null, $comparison = null) + { + if (null === $comparison) { + if (is_array($title)) { + $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $title)) { + $title = str_replace('*', '%', $title); + $comparison = Criteria::LIKE; + } + } + + return $this->addUsingAlias(CouponI18nTableMap::TITLE, $title, $comparison); + } + + /** + * Filter the query on the short_description column + * + * Example usage: + * + * $query->filterByShortDescription('fooValue'); // WHERE short_description = 'fooValue' + * $query->filterByShortDescription('%fooValue%'); // WHERE short_description LIKE '%fooValue%' + * + * + * @param string $shortDescription The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponI18nQuery The current query, for fluid interface + */ + public function filterByShortDescription($shortDescription = null, $comparison = null) + { + if (null === $comparison) { + if (is_array($shortDescription)) { + $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $shortDescription)) { + $shortDescription = str_replace('*', '%', $shortDescription); + $comparison = Criteria::LIKE; + } + } + + return $this->addUsingAlias(CouponI18nTableMap::SHORT_DESCRIPTION, $shortDescription, $comparison); + } + + /** + * Filter the query on the description column + * + * Example usage: + * + * $query->filterByDescription('fooValue'); // WHERE description = 'fooValue' + * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' + * + * + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildCouponI18nQuery The current query, for fluid interface + */ + public function filterByDescription($description = null, $comparison = null) + { + if (null === $comparison) { + if (is_array($description)) { + $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $description)) { + $description = str_replace('*', '%', $description); + $comparison = Criteria::LIKE; + } + } + + return $this->addUsingAlias(CouponI18nTableMap::DESCRIPTION, $description, $comparison); + } + /** * Filter the query by a related \Thelia\Model\Coupon object * diff --git a/core/lib/Thelia/Model/Base/CouponOrder.php b/core/lib/Thelia/Model/Base/CouponOrder.php index 7d3c413b6..0b1300855 100755 --- a/core/lib/Thelia/Model/Base/CouponOrder.php +++ b/core/lib/Thelia/Model/Base/CouponOrder.php @@ -16,10 +16,8 @@ use Propel\Runtime\Exception\PropelException; use Propel\Runtime\Map\TableMap; use Propel\Runtime\Parser\AbstractParser; use Propel\Runtime\Util\PropelDateTime; -use Thelia\Model\Coupon as ChildCoupon; use Thelia\Model\CouponOrder as ChildCouponOrder; use Thelia\Model\CouponOrderQuery as ChildCouponOrderQuery; -use Thelia\Model\CouponQuery as ChildCouponQuery; use Thelia\Model\Order as ChildOrder; use Thelia\Model\OrderQuery as ChildOrderQuery; use Thelia\Model\Map\CouponOrderTableMap; @@ -70,12 +68,6 @@ abstract class CouponOrder implements ActiveRecordInterface */ protected $order_id; - /** - * The value for the code field. - * @var string - */ - protected $code; - /** * The value for the value field. * @var double @@ -99,11 +91,6 @@ abstract class CouponOrder implements ActiveRecordInterface */ protected $aOrder; - /** - * @var Coupon - */ - protected $aCoupon; - /** * Flag to prevent endless save loop, if this object is referenced * by another object which falls in this transaction. @@ -388,17 +375,6 @@ abstract class CouponOrder implements ActiveRecordInterface return $this->order_id; } - /** - * Get the [code] column value. - * - * @return string - */ - public function getCode() - { - - return $this->code; - } - /** * Get the [value] column value. * @@ -496,31 +472,6 @@ abstract class CouponOrder implements ActiveRecordInterface return $this; } // setOrderId() - /** - * Set the value of [code] column. - * - * @param string $v new value - * @return \Thelia\Model\CouponOrder The current object (for fluent API support) - */ - public function setCode($v) - { - if ($v !== null) { - $v = (string) $v; - } - - if ($this->code !== $v) { - $this->code = $v; - $this->modifiedColumns[] = CouponOrderTableMap::CODE; - } - - if ($this->aCoupon !== null && $this->aCoupon->getCode() !== $v) { - $this->aCoupon = null; - } - - - return $this; - } // setCode() - /** * Set the value of [value] column. * @@ -627,19 +578,16 @@ abstract class CouponOrder implements ActiveRecordInterface $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : CouponOrderTableMap::translateFieldName('OrderId', TableMap::TYPE_PHPNAME, $indexType)]; $this->order_id = (null !== $col) ? (int) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : CouponOrderTableMap::translateFieldName('Code', TableMap::TYPE_PHPNAME, $indexType)]; - $this->code = (null !== $col) ? (string) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : CouponOrderTableMap::translateFieldName('Value', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : CouponOrderTableMap::translateFieldName('Value', TableMap::TYPE_PHPNAME, $indexType)]; $this->value = (null !== $col) ? (double) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : CouponOrderTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : CouponOrderTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : CouponOrderTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : CouponOrderTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } @@ -652,7 +600,7 @@ abstract class CouponOrder implements ActiveRecordInterface $this->ensureConsistency(); } - return $startcol + 6; // 6 = CouponOrderTableMap::NUM_HYDRATE_COLUMNS. + return $startcol + 5; // 5 = CouponOrderTableMap::NUM_HYDRATE_COLUMNS. } catch (Exception $e) { throw new PropelException("Error populating \Thelia\Model\CouponOrder object", 0, $e); @@ -677,9 +625,6 @@ abstract class CouponOrder implements ActiveRecordInterface if ($this->aOrder !== null && $this->order_id !== $this->aOrder->getId()) { $this->aOrder = null; } - if ($this->aCoupon !== null && $this->code !== $this->aCoupon->getCode()) { - $this->aCoupon = null; - } } // ensureConsistency /** @@ -720,7 +665,6 @@ abstract class CouponOrder implements ActiveRecordInterface if ($deep) { // also de-associate any related objects? $this->aOrder = null; - $this->aCoupon = null; } // if (deep) } @@ -855,13 +799,6 @@ abstract class CouponOrder implements ActiveRecordInterface $this->setOrder($this->aOrder); } - if ($this->aCoupon !== null) { - if ($this->aCoupon->isModified() || $this->aCoupon->isNew()) { - $affectedRows += $this->aCoupon->save($con); - } - $this->setCoupon($this->aCoupon); - } - if ($this->isNew() || $this->isModified()) { // persist changes if ($this->isNew()) { @@ -905,9 +842,6 @@ abstract class CouponOrder implements ActiveRecordInterface if ($this->isColumnModified(CouponOrderTableMap::ORDER_ID)) { $modifiedColumns[':p' . $index++] = 'ORDER_ID'; } - if ($this->isColumnModified(CouponOrderTableMap::CODE)) { - $modifiedColumns[':p' . $index++] = 'CODE'; - } if ($this->isColumnModified(CouponOrderTableMap::VALUE)) { $modifiedColumns[':p' . $index++] = 'VALUE'; } @@ -934,9 +868,6 @@ abstract class CouponOrder implements ActiveRecordInterface case 'ORDER_ID': $stmt->bindValue($identifier, $this->order_id, PDO::PARAM_INT); break; - case 'CODE': - $stmt->bindValue($identifier, $this->code, PDO::PARAM_STR); - break; case 'VALUE': $stmt->bindValue($identifier, $this->value, PDO::PARAM_STR); break; @@ -1015,15 +946,12 @@ abstract class CouponOrder implements ActiveRecordInterface return $this->getOrderId(); break; case 2: - return $this->getCode(); - break; - case 3: return $this->getValue(); break; - case 4: + case 3: return $this->getCreatedAt(); break; - case 5: + case 4: return $this->getUpdatedAt(); break; default: @@ -1057,10 +985,9 @@ abstract class CouponOrder implements ActiveRecordInterface $result = array( $keys[0] => $this->getId(), $keys[1] => $this->getOrderId(), - $keys[2] => $this->getCode(), - $keys[3] => $this->getValue(), - $keys[4] => $this->getCreatedAt(), - $keys[5] => $this->getUpdatedAt(), + $keys[2] => $this->getValue(), + $keys[3] => $this->getCreatedAt(), + $keys[4] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; foreach($virtualColumns as $key => $virtualColumn) @@ -1072,9 +999,6 @@ abstract class CouponOrder implements ActiveRecordInterface if (null !== $this->aOrder) { $result['Order'] = $this->aOrder->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); } - if (null !== $this->aCoupon) { - $result['Coupon'] = $this->aCoupon->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); - } } return $result; @@ -1116,15 +1040,12 @@ abstract class CouponOrder implements ActiveRecordInterface $this->setOrderId($value); break; case 2: - $this->setCode($value); - break; - case 3: $this->setValue($value); break; - case 4: + case 3: $this->setCreatedAt($value); break; - case 5: + case 4: $this->setUpdatedAt($value); break; } // switch() @@ -1153,10 +1074,9 @@ abstract class CouponOrder implements ActiveRecordInterface if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]); if (array_key_exists($keys[1], $arr)) $this->setOrderId($arr[$keys[1]]); - if (array_key_exists($keys[2], $arr)) $this->setCode($arr[$keys[2]]); - if (array_key_exists($keys[3], $arr)) $this->setValue($arr[$keys[3]]); - if (array_key_exists($keys[4], $arr)) $this->setCreatedAt($arr[$keys[4]]); - if (array_key_exists($keys[5], $arr)) $this->setUpdatedAt($arr[$keys[5]]); + if (array_key_exists($keys[2], $arr)) $this->setValue($arr[$keys[2]]); + if (array_key_exists($keys[3], $arr)) $this->setCreatedAt($arr[$keys[3]]); + if (array_key_exists($keys[4], $arr)) $this->setUpdatedAt($arr[$keys[4]]); } /** @@ -1170,7 +1090,6 @@ abstract class CouponOrder implements ActiveRecordInterface if ($this->isColumnModified(CouponOrderTableMap::ID)) $criteria->add(CouponOrderTableMap::ID, $this->id); if ($this->isColumnModified(CouponOrderTableMap::ORDER_ID)) $criteria->add(CouponOrderTableMap::ORDER_ID, $this->order_id); - if ($this->isColumnModified(CouponOrderTableMap::CODE)) $criteria->add(CouponOrderTableMap::CODE, $this->code); if ($this->isColumnModified(CouponOrderTableMap::VALUE)) $criteria->add(CouponOrderTableMap::VALUE, $this->value); if ($this->isColumnModified(CouponOrderTableMap::CREATED_AT)) $criteria->add(CouponOrderTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(CouponOrderTableMap::UPDATED_AT)) $criteria->add(CouponOrderTableMap::UPDATED_AT, $this->updated_at); @@ -1238,7 +1157,6 @@ abstract class CouponOrder implements ActiveRecordInterface public function copyInto($copyObj, $deepCopy = false, $makeNew = true) { $copyObj->setOrderId($this->getOrderId()); - $copyObj->setCode($this->getCode()); $copyObj->setValue($this->getValue()); $copyObj->setCreatedAt($this->getCreatedAt()); $copyObj->setUpdatedAt($this->getUpdatedAt()); @@ -1321,59 +1239,6 @@ abstract class CouponOrder implements ActiveRecordInterface return $this->aOrder; } - /** - * Declares an association between this object and a ChildCoupon object. - * - * @param ChildCoupon $v - * @return \Thelia\Model\CouponOrder The current object (for fluent API support) - * @throws PropelException - */ - public function setCoupon(ChildCoupon $v = null) - { - if ($v === null) { - $this->setCode(NULL); - } else { - $this->setCode($v->getCode()); - } - - $this->aCoupon = $v; - - // Add binding for other direction of this n:n relationship. - // If this object has already been added to the ChildCoupon object, it will not be re-added. - if ($v !== null) { - $v->addCouponOrder($this); - } - - - return $this; - } - - - /** - * Get the associated ChildCoupon object - * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildCoupon The associated ChildCoupon object. - * @throws PropelException - */ - public function getCoupon(ConnectionInterface $con = null) - { - if ($this->aCoupon === null && (($this->code !== "" && $this->code !== null))) { - $this->aCoupon = ChildCouponQuery::create() - ->filterByCouponOrder($this) // here - ->findOne($con); - /* The following can be used additionally to - guarantee the related object contains a reference - to this object. This level of coupling may, however, be - undesirable since it could result in an only partially populated collection - in the referenced object. - $this->aCoupon->addCouponOrders($this); - */ - } - - return $this->aCoupon; - } - /** * Clears the current object and sets all attributes to their default values */ @@ -1381,7 +1246,6 @@ abstract class CouponOrder implements ActiveRecordInterface { $this->id = null; $this->order_id = null; - $this->code = null; $this->value = null; $this->created_at = null; $this->updated_at = null; @@ -1407,7 +1271,6 @@ abstract class CouponOrder implements ActiveRecordInterface } // if ($deep) $this->aOrder = null; - $this->aCoupon = null; } /** diff --git a/core/lib/Thelia/Model/Base/CouponOrderQuery.php b/core/lib/Thelia/Model/Base/CouponOrderQuery.php index e3a95ea1a..255d69504 100755 --- a/core/lib/Thelia/Model/Base/CouponOrderQuery.php +++ b/core/lib/Thelia/Model/Base/CouponOrderQuery.php @@ -23,14 +23,12 @@ use Thelia\Model\Map\CouponOrderTableMap; * * @method ChildCouponOrderQuery orderById($order = Criteria::ASC) Order by the id column * @method ChildCouponOrderQuery orderByOrderId($order = Criteria::ASC) Order by the order_id column - * @method ChildCouponOrderQuery orderByCode($order = Criteria::ASC) Order by the code column * @method ChildCouponOrderQuery orderByValue($order = Criteria::ASC) Order by the value column * @method ChildCouponOrderQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column * @method ChildCouponOrderQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column * * @method ChildCouponOrderQuery groupById() Group by the id column * @method ChildCouponOrderQuery groupByOrderId() Group by the order_id column - * @method ChildCouponOrderQuery groupByCode() Group by the code column * @method ChildCouponOrderQuery groupByValue() Group by the value column * @method ChildCouponOrderQuery groupByCreatedAt() Group by the created_at column * @method ChildCouponOrderQuery groupByUpdatedAt() Group by the updated_at column @@ -43,23 +41,17 @@ use Thelia\Model\Map\CouponOrderTableMap; * @method ChildCouponOrderQuery rightJoinOrder($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Order relation * @method ChildCouponOrderQuery innerJoinOrder($relationAlias = null) Adds a INNER JOIN clause to the query using the Order relation * - * @method ChildCouponOrderQuery leftJoinCoupon($relationAlias = null) Adds a LEFT JOIN clause to the query using the Coupon relation - * @method ChildCouponOrderQuery rightJoinCoupon($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Coupon relation - * @method ChildCouponOrderQuery innerJoinCoupon($relationAlias = null) Adds a INNER JOIN clause to the query using the Coupon relation - * * @method ChildCouponOrder findOne(ConnectionInterface $con = null) Return the first ChildCouponOrder matching the query * @method ChildCouponOrder findOneOrCreate(ConnectionInterface $con = null) Return the first ChildCouponOrder matching the query, or a new ChildCouponOrder object populated from the query conditions when no match is found * * @method ChildCouponOrder findOneById(int $id) Return the first ChildCouponOrder filtered by the id column * @method ChildCouponOrder findOneByOrderId(int $order_id) Return the first ChildCouponOrder filtered by the order_id column - * @method ChildCouponOrder findOneByCode(string $code) Return the first ChildCouponOrder filtered by the code column * @method ChildCouponOrder findOneByValue(double $value) Return the first ChildCouponOrder filtered by the value column * @method ChildCouponOrder findOneByCreatedAt(string $created_at) Return the first ChildCouponOrder filtered by the created_at column * @method ChildCouponOrder findOneByUpdatedAt(string $updated_at) Return the first ChildCouponOrder filtered by the updated_at column * * @method array findById(int $id) Return ChildCouponOrder objects filtered by the id column * @method array findByOrderId(int $order_id) Return ChildCouponOrder objects filtered by the order_id column - * @method array findByCode(string $code) Return ChildCouponOrder objects filtered by the code column * @method array findByValue(double $value) Return ChildCouponOrder objects filtered by the value column * @method array findByCreatedAt(string $created_at) Return ChildCouponOrder objects filtered by the created_at column * @method array findByUpdatedAt(string $updated_at) Return ChildCouponOrder objects filtered by the updated_at column @@ -151,7 +143,7 @@ abstract class CouponOrderQuery extends ModelCriteria */ protected function findPkSimple($key, $con) { - $sql = 'SELECT ID, ORDER_ID, CODE, VALUE, CREATED_AT, UPDATED_AT FROM coupon_order WHERE ID = :p0'; + $sql = 'SELECT ID, ORDER_ID, VALUE, CREATED_AT, UPDATED_AT FROM coupon_order WHERE ID = :p0'; try { $stmt = $con->prepare($sql); $stmt->bindValue(':p0', $key, PDO::PARAM_INT); @@ -324,35 +316,6 @@ abstract class CouponOrderQuery extends ModelCriteria return $this->addUsingAlias(CouponOrderTableMap::ORDER_ID, $orderId, $comparison); } - /** - * Filter the query on the code column - * - * Example usage: - * - * $query->filterByCode('fooValue'); // WHERE code = 'fooValue' - * $query->filterByCode('%fooValue%'); // WHERE code LIKE '%fooValue%' - * - * - * @param string $code The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildCouponOrderQuery The current query, for fluid interface - */ - public function filterByCode($code = null, $comparison = null) - { - if (null === $comparison) { - if (is_array($code)) { - $comparison = Criteria::IN; - } elseif (preg_match('/[\%\*]/', $code)) { - $code = str_replace('*', '%', $code); - $comparison = Criteria::LIKE; - } - } - - return $this->addUsingAlias(CouponOrderTableMap::CODE, $code, $comparison); - } - /** * Filter the query on the value column * @@ -555,81 +518,6 @@ abstract class CouponOrderQuery extends ModelCriteria ->useQuery($relationAlias ? $relationAlias : 'Order', '\Thelia\Model\OrderQuery'); } - /** - * Filter the query by a related \Thelia\Model\Coupon object - * - * @param \Thelia\Model\Coupon|ObjectCollection $coupon The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildCouponOrderQuery The current query, for fluid interface - */ - public function filterByCoupon($coupon, $comparison = null) - { - if ($coupon instanceof \Thelia\Model\Coupon) { - return $this - ->addUsingAlias(CouponOrderTableMap::CODE, $coupon->getCode(), $comparison); - } elseif ($coupon instanceof ObjectCollection) { - if (null === $comparison) { - $comparison = Criteria::IN; - } - - return $this - ->addUsingAlias(CouponOrderTableMap::CODE, $coupon->toKeyValue('PrimaryKey', 'Code'), $comparison); - } else { - throw new PropelException('filterByCoupon() only accepts arguments of type \Thelia\Model\Coupon or Collection'); - } - } - - /** - * Adds a JOIN clause to the query using the Coupon relation - * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return ChildCouponOrderQuery The current query, for fluid interface - */ - public function joinCoupon($relationAlias = null, $joinType = Criteria::INNER_JOIN) - { - $tableMap = $this->getTableMap(); - $relationMap = $tableMap->getRelation('Coupon'); - - // create a ModelJoin object for this join - $join = new ModelJoin(); - $join->setJoinType($joinType); - $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); - if ($previousJoin = $this->getPreviousJoin()) { - $join->setPreviousJoin($previousJoin); - } - - // add the ModelJoin to the current object - if ($relationAlias) { - $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); - $this->addJoinObject($join, $relationAlias); - } else { - $this->addJoinObject($join, 'Coupon'); - } - - return $this; - } - - /** - * Use the Coupon relation Coupon object - * - * @see useQuery() - * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return \Thelia\Model\CouponQuery A secondary query class using the current class as primary query - */ - public function useCouponQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) - { - return $this - ->joinCoupon($relationAlias, $joinType) - ->useQuery($relationAlias ? $relationAlias : 'Coupon', '\Thelia\Model\CouponQuery'); - } - /** * Exclude object from result * diff --git a/core/lib/Thelia/Model/Base/CouponQuery.php b/core/lib/Thelia/Model/Base/CouponQuery.php index c7ae0eabd..f4062e158 100755 --- a/core/lib/Thelia/Model/Base/CouponQuery.php +++ b/core/lib/Thelia/Model/Base/CouponQuery.php @@ -25,9 +25,6 @@ use Thelia\Model\Map\CouponTableMap; * @method ChildCouponQuery orderById($order = Criteria::ASC) Order by the id column * @method ChildCouponQuery orderByCode($order = Criteria::ASC) Order by the code column * @method ChildCouponQuery orderByType($order = Criteria::ASC) Order by the type column - * @method ChildCouponQuery orderByTitle($order = Criteria::ASC) Order by the title column - * @method ChildCouponQuery orderByShortDescription($order = Criteria::ASC) Order by the short_description column - * @method ChildCouponQuery orderByDescription($order = Criteria::ASC) Order by the description column * @method ChildCouponQuery orderByAmount($order = Criteria::ASC) Order by the amount column * @method ChildCouponQuery orderByIsUsed($order = Criteria::ASC) Order by the is_used column * @method ChildCouponQuery orderByIsEnabled($order = Criteria::ASC) Order by the is_enabled column @@ -44,9 +41,6 @@ use Thelia\Model\Map\CouponTableMap; * @method ChildCouponQuery groupById() Group by the id column * @method ChildCouponQuery groupByCode() Group by the code column * @method ChildCouponQuery groupByType() Group by the type column - * @method ChildCouponQuery groupByTitle() Group by the title column - * @method ChildCouponQuery groupByShortDescription() Group by the short_description column - * @method ChildCouponQuery groupByDescription() Group by the description column * @method ChildCouponQuery groupByAmount() Group by the amount column * @method ChildCouponQuery groupByIsUsed() Group by the is_used column * @method ChildCouponQuery groupByIsEnabled() Group by the is_enabled column @@ -64,10 +58,6 @@ use Thelia\Model\Map\CouponTableMap; * @method ChildCouponQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query * @method ChildCouponQuery innerJoin($relation) Adds a INNER JOIN clause to the query * - * @method ChildCouponQuery leftJoinCouponOrder($relationAlias = null) Adds a LEFT JOIN clause to the query using the CouponOrder relation - * @method ChildCouponQuery rightJoinCouponOrder($relationAlias = null) Adds a RIGHT JOIN clause to the query using the CouponOrder relation - * @method ChildCouponQuery innerJoinCouponOrder($relationAlias = null) Adds a INNER JOIN clause to the query using the CouponOrder relation - * * @method ChildCouponQuery leftJoinCouponI18n($relationAlias = null) Adds a LEFT JOIN clause to the query using the CouponI18n relation * @method ChildCouponQuery rightJoinCouponI18n($relationAlias = null) Adds a RIGHT JOIN clause to the query using the CouponI18n relation * @method ChildCouponQuery innerJoinCouponI18n($relationAlias = null) Adds a INNER JOIN clause to the query using the CouponI18n relation @@ -82,9 +72,6 @@ use Thelia\Model\Map\CouponTableMap; * @method ChildCoupon findOneById(int $id) Return the first ChildCoupon filtered by the id column * @method ChildCoupon findOneByCode(string $code) Return the first ChildCoupon filtered by the code column * @method ChildCoupon findOneByType(string $type) Return the first ChildCoupon filtered by the type column - * @method ChildCoupon findOneByTitle(string $title) Return the first ChildCoupon filtered by the title column - * @method ChildCoupon findOneByShortDescription(string $short_description) Return the first ChildCoupon filtered by the short_description column - * @method ChildCoupon findOneByDescription(string $description) Return the first ChildCoupon filtered by the description column * @method ChildCoupon findOneByAmount(double $amount) Return the first ChildCoupon filtered by the amount column * @method ChildCoupon findOneByIsUsed(int $is_used) Return the first ChildCoupon filtered by the is_used column * @method ChildCoupon findOneByIsEnabled(int $is_enabled) Return the first ChildCoupon filtered by the is_enabled column @@ -101,9 +88,6 @@ use Thelia\Model\Map\CouponTableMap; * @method array findById(int $id) Return ChildCoupon objects filtered by the id column * @method array findByCode(string $code) Return ChildCoupon objects filtered by the code column * @method array findByType(string $type) Return ChildCoupon objects filtered by the type column - * @method array findByTitle(string $title) Return ChildCoupon objects filtered by the title column - * @method array findByShortDescription(string $short_description) Return ChildCoupon objects filtered by the short_description column - * @method array findByDescription(string $description) Return ChildCoupon objects filtered by the description column * @method array findByAmount(double $amount) Return ChildCoupon objects filtered by the amount column * @method array findByIsUsed(int $is_used) Return ChildCoupon objects filtered by the is_used column * @method array findByIsEnabled(int $is_enabled) Return ChildCoupon objects filtered by the is_enabled column @@ -211,7 +195,7 @@ abstract class CouponQuery extends ModelCriteria */ protected function findPkSimple($key, $con) { - $sql = 'SELECT ID, CODE, TYPE, TITLE, SHORT_DESCRIPTION, DESCRIPTION, AMOUNT, IS_USED, IS_ENABLED, EXPIRATION_DATE, SERIALIZED_RULES, IS_CUMULATIVE, IS_REMOVING_POSTAGE, MAX_USAGE, IS_AVAILABLE_ON_SPECIAL_OFFERS, CREATED_AT, UPDATED_AT, VERSION FROM coupon WHERE ID = :p0'; + $sql = 'SELECT ID, CODE, TYPE, AMOUNT, IS_USED, IS_ENABLED, EXPIRATION_DATE, SERIALIZED_RULES, IS_CUMULATIVE, IS_REMOVING_POSTAGE, MAX_USAGE, IS_AVAILABLE_ON_SPECIAL_OFFERS, CREATED_AT, UPDATED_AT, VERSION FROM coupon WHERE ID = :p0'; try { $stmt = $con->prepare($sql); $stmt->bindValue(':p0', $key, PDO::PARAM_INT); @@ -399,93 +383,6 @@ abstract class CouponQuery extends ModelCriteria return $this->addUsingAlias(CouponTableMap::TYPE, $type, $comparison); } - /** - * Filter the query on the title column - * - * Example usage: - * - * $query->filterByTitle('fooValue'); // WHERE title = 'fooValue' - * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' - * - * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildCouponQuery The current query, for fluid interface - */ - public function filterByTitle($title = null, $comparison = null) - { - if (null === $comparison) { - if (is_array($title)) { - $comparison = Criteria::IN; - } elseif (preg_match('/[\%\*]/', $title)) { - $title = str_replace('*', '%', $title); - $comparison = Criteria::LIKE; - } - } - - return $this->addUsingAlias(CouponTableMap::TITLE, $title, $comparison); - } - - /** - * Filter the query on the short_description column - * - * Example usage: - * - * $query->filterByShortDescription('fooValue'); // WHERE short_description = 'fooValue' - * $query->filterByShortDescription('%fooValue%'); // WHERE short_description LIKE '%fooValue%' - * - * - * @param string $shortDescription The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildCouponQuery The current query, for fluid interface - */ - public function filterByShortDescription($shortDescription = null, $comparison = null) - { - if (null === $comparison) { - if (is_array($shortDescription)) { - $comparison = Criteria::IN; - } elseif (preg_match('/[\%\*]/', $shortDescription)) { - $shortDescription = str_replace('*', '%', $shortDescription); - $comparison = Criteria::LIKE; - } - } - - return $this->addUsingAlias(CouponTableMap::SHORT_DESCRIPTION, $shortDescription, $comparison); - } - - /** - * Filter the query on the description column - * - * Example usage: - * - * $query->filterByDescription('fooValue'); // WHERE description = 'fooValue' - * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' - * - * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildCouponQuery The current query, for fluid interface - */ - public function filterByDescription($description = null, $comparison = null) - { - if (null === $comparison) { - if (is_array($description)) { - $comparison = Criteria::IN; - } elseif (preg_match('/[\%\*]/', $description)) { - $description = str_replace('*', '%', $description); - $comparison = Criteria::LIKE; - } - } - - return $this->addUsingAlias(CouponTableMap::DESCRIPTION, $description, $comparison); - } - /** * Filter the query on the amount column * @@ -958,79 +855,6 @@ abstract class CouponQuery extends ModelCriteria return $this->addUsingAlias(CouponTableMap::VERSION, $version, $comparison); } - /** - * Filter the query by a related \Thelia\Model\CouponOrder object - * - * @param \Thelia\Model\CouponOrder|ObjectCollection $couponOrder the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildCouponQuery The current query, for fluid interface - */ - public function filterByCouponOrder($couponOrder, $comparison = null) - { - if ($couponOrder instanceof \Thelia\Model\CouponOrder) { - return $this - ->addUsingAlias(CouponTableMap::CODE, $couponOrder->getCode(), $comparison); - } elseif ($couponOrder instanceof ObjectCollection) { - return $this - ->useCouponOrderQuery() - ->filterByPrimaryKeys($couponOrder->getPrimaryKeys()) - ->endUse(); - } else { - throw new PropelException('filterByCouponOrder() only accepts arguments of type \Thelia\Model\CouponOrder or Collection'); - } - } - - /** - * Adds a JOIN clause to the query using the CouponOrder relation - * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return ChildCouponQuery The current query, for fluid interface - */ - public function joinCouponOrder($relationAlias = null, $joinType = Criteria::INNER_JOIN) - { - $tableMap = $this->getTableMap(); - $relationMap = $tableMap->getRelation('CouponOrder'); - - // create a ModelJoin object for this join - $join = new ModelJoin(); - $join->setJoinType($joinType); - $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); - if ($previousJoin = $this->getPreviousJoin()) { - $join->setPreviousJoin($previousJoin); - } - - // add the ModelJoin to the current object - if ($relationAlias) { - $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); - $this->addJoinObject($join, $relationAlias); - } else { - $this->addJoinObject($join, 'CouponOrder'); - } - - return $this; - } - - /** - * Use the CouponOrder relation CouponOrder object - * - * @see useQuery() - * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return \Thelia\Model\CouponOrderQuery A secondary query class using the current class as primary query - */ - public function useCouponOrderQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) - { - return $this - ->joinCouponOrder($relationAlias, $joinType) - ->useQuery($relationAlias ? $relationAlias : 'CouponOrder', '\Thelia\Model\CouponOrderQuery'); - } - /** * Filter the query by a related \Thelia\Model\CouponI18n object * diff --git a/core/lib/Thelia/Model/Base/CouponVersion.php b/core/lib/Thelia/Model/Base/CouponVersion.php index 9952d80bc..f2e0c58aa 100644 --- a/core/lib/Thelia/Model/Base/CouponVersion.php +++ b/core/lib/Thelia/Model/Base/CouponVersion.php @@ -73,24 +73,6 @@ abstract class CouponVersion implements ActiveRecordInterface */ protected $type; - /** - * The value for the title field. - * @var string - */ - protected $title; - - /** - * The value for the short_description field. - * @var string - */ - protected $short_description; - - /** - * The value for the description field. - * @var string - */ - protected $description; - /** * The value for the amount field. * @var double @@ -477,39 +459,6 @@ abstract class CouponVersion implements ActiveRecordInterface return $this->type; } - /** - * Get the [title] column value. - * - * @return string - */ - public function getTitle() - { - - return $this->title; - } - - /** - * Get the [short_description] column value. - * - * @return string - */ - public function getShortDescription() - { - - return $this->short_description; - } - - /** - * Get the [description] column value. - * - * @return string - */ - public function getDescription() - { - - return $this->description; - } - /** * Get the [amount] column value. * @@ -736,69 +685,6 @@ abstract class CouponVersion implements ActiveRecordInterface return $this; } // setType() - /** - * Set the value of [title] column. - * - * @param string $v new value - * @return \Thelia\Model\CouponVersion The current object (for fluent API support) - */ - public function setTitle($v) - { - if ($v !== null) { - $v = (string) $v; - } - - if ($this->title !== $v) { - $this->title = $v; - $this->modifiedColumns[] = CouponVersionTableMap::TITLE; - } - - - return $this; - } // setTitle() - - /** - * Set the value of [short_description] column. - * - * @param string $v new value - * @return \Thelia\Model\CouponVersion The current object (for fluent API support) - */ - public function setShortDescription($v) - { - if ($v !== null) { - $v = (string) $v; - } - - if ($this->short_description !== $v) { - $this->short_description = $v; - $this->modifiedColumns[] = CouponVersionTableMap::SHORT_DESCRIPTION; - } - - - return $this; - } // setShortDescription() - - /** - * Set the value of [description] column. - * - * @param string $v new value - * @return \Thelia\Model\CouponVersion The current object (for fluent API support) - */ - public function setDescription($v) - { - if ($v !== null) { - $v = (string) $v; - } - - if ($this->description !== $v) { - $this->description = $v; - $this->modifiedColumns[] = CouponVersionTableMap::DESCRIPTION; - } - - - return $this; - } // setDescription() - /** * Set the value of [amount] column. * @@ -1109,58 +995,49 @@ abstract class CouponVersion implements ActiveRecordInterface $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : CouponVersionTableMap::translateFieldName('Type', TableMap::TYPE_PHPNAME, $indexType)]; $this->type = (null !== $col) ? (string) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : CouponVersionTableMap::translateFieldName('Title', TableMap::TYPE_PHPNAME, $indexType)]; - $this->title = (null !== $col) ? (string) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : CouponVersionTableMap::translateFieldName('ShortDescription', TableMap::TYPE_PHPNAME, $indexType)]; - $this->short_description = (null !== $col) ? (string) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : CouponVersionTableMap::translateFieldName('Description', TableMap::TYPE_PHPNAME, $indexType)]; - $this->description = (null !== $col) ? (string) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : CouponVersionTableMap::translateFieldName('Amount', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : CouponVersionTableMap::translateFieldName('Amount', TableMap::TYPE_PHPNAME, $indexType)]; $this->amount = (null !== $col) ? (double) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : CouponVersionTableMap::translateFieldName('IsUsed', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : CouponVersionTableMap::translateFieldName('IsUsed', TableMap::TYPE_PHPNAME, $indexType)]; $this->is_used = (null !== $col) ? (int) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 8 + $startcol : CouponVersionTableMap::translateFieldName('IsEnabled', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : CouponVersionTableMap::translateFieldName('IsEnabled', TableMap::TYPE_PHPNAME, $indexType)]; $this->is_enabled = (null !== $col) ? (int) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 9 + $startcol : CouponVersionTableMap::translateFieldName('ExpirationDate', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : CouponVersionTableMap::translateFieldName('ExpirationDate', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } $this->expiration_date = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 10 + $startcol : CouponVersionTableMap::translateFieldName('SerializedRules', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : CouponVersionTableMap::translateFieldName('SerializedRules', TableMap::TYPE_PHPNAME, $indexType)]; $this->serialized_rules = (null !== $col) ? (string) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 11 + $startcol : CouponVersionTableMap::translateFieldName('IsCumulative', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 8 + $startcol : CouponVersionTableMap::translateFieldName('IsCumulative', TableMap::TYPE_PHPNAME, $indexType)]; $this->is_cumulative = (null !== $col) ? (int) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 12 + $startcol : CouponVersionTableMap::translateFieldName('IsRemovingPostage', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 9 + $startcol : CouponVersionTableMap::translateFieldName('IsRemovingPostage', TableMap::TYPE_PHPNAME, $indexType)]; $this->is_removing_postage = (null !== $col) ? (int) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 13 + $startcol : CouponVersionTableMap::translateFieldName('MaxUsage', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 10 + $startcol : CouponVersionTableMap::translateFieldName('MaxUsage', TableMap::TYPE_PHPNAME, $indexType)]; $this->max_usage = (null !== $col) ? (int) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 14 + $startcol : CouponVersionTableMap::translateFieldName('IsAvailableOnSpecialOffers', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 11 + $startcol : CouponVersionTableMap::translateFieldName('IsAvailableOnSpecialOffers', TableMap::TYPE_PHPNAME, $indexType)]; $this->is_available_on_special_offers = (null !== $col) ? (boolean) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 15 + $startcol : CouponVersionTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 12 + $startcol : CouponVersionTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 16 + $startcol : CouponVersionTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 13 + $startcol : CouponVersionTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } $this->updated_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 17 + $startcol : CouponVersionTableMap::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 14 + $startcol : CouponVersionTableMap::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)]; $this->version = (null !== $col) ? (int) $col : null; $this->resetModified(); @@ -1170,7 +1047,7 @@ abstract class CouponVersion implements ActiveRecordInterface $this->ensureConsistency(); } - return $startcol + 18; // 18 = CouponVersionTableMap::NUM_HYDRATE_COLUMNS. + return $startcol + 15; // 15 = CouponVersionTableMap::NUM_HYDRATE_COLUMNS. } catch (Exception $e) { throw new PropelException("Error populating \Thelia\Model\CouponVersion object", 0, $e); @@ -1400,15 +1277,6 @@ abstract class CouponVersion implements ActiveRecordInterface if ($this->isColumnModified(CouponVersionTableMap::TYPE)) { $modifiedColumns[':p' . $index++] = 'TYPE'; } - if ($this->isColumnModified(CouponVersionTableMap::TITLE)) { - $modifiedColumns[':p' . $index++] = 'TITLE'; - } - if ($this->isColumnModified(CouponVersionTableMap::SHORT_DESCRIPTION)) { - $modifiedColumns[':p' . $index++] = 'SHORT_DESCRIPTION'; - } - if ($this->isColumnModified(CouponVersionTableMap::DESCRIPTION)) { - $modifiedColumns[':p' . $index++] = 'DESCRIPTION'; - } if ($this->isColumnModified(CouponVersionTableMap::AMOUNT)) { $modifiedColumns[':p' . $index++] = 'AMOUNT'; } @@ -1465,15 +1333,6 @@ abstract class CouponVersion implements ActiveRecordInterface case 'TYPE': $stmt->bindValue($identifier, $this->type, PDO::PARAM_STR); break; - case 'TITLE': - $stmt->bindValue($identifier, $this->title, PDO::PARAM_STR); - break; - case 'SHORT_DESCRIPTION': - $stmt->bindValue($identifier, $this->short_description, PDO::PARAM_STR); - break; - case 'DESCRIPTION': - $stmt->bindValue($identifier, $this->description, PDO::PARAM_STR); - break; case 'AMOUNT': $stmt->bindValue($identifier, $this->amount, PDO::PARAM_STR); break; @@ -1575,48 +1434,39 @@ abstract class CouponVersion implements ActiveRecordInterface return $this->getType(); break; case 3: - return $this->getTitle(); - break; - case 4: - return $this->getShortDescription(); - break; - case 5: - return $this->getDescription(); - break; - case 6: return $this->getAmount(); break; - case 7: + case 4: return $this->getIsUsed(); break; - case 8: + case 5: return $this->getIsEnabled(); break; - case 9: + case 6: return $this->getExpirationDate(); break; - case 10: + case 7: return $this->getSerializedRules(); break; - case 11: + case 8: return $this->getIsCumulative(); break; - case 12: + case 9: return $this->getIsRemovingPostage(); break; - case 13: + case 10: return $this->getMaxUsage(); break; - case 14: + case 11: return $this->getIsAvailableOnSpecialOffers(); break; - case 15: + case 12: return $this->getCreatedAt(); break; - case 16: + case 13: return $this->getUpdatedAt(); break; - case 17: + case 14: return $this->getVersion(); break; default: @@ -1651,21 +1501,18 @@ abstract class CouponVersion implements ActiveRecordInterface $keys[0] => $this->getId(), $keys[1] => $this->getCode(), $keys[2] => $this->getType(), - $keys[3] => $this->getTitle(), - $keys[4] => $this->getShortDescription(), - $keys[5] => $this->getDescription(), - $keys[6] => $this->getAmount(), - $keys[7] => $this->getIsUsed(), - $keys[8] => $this->getIsEnabled(), - $keys[9] => $this->getExpirationDate(), - $keys[10] => $this->getSerializedRules(), - $keys[11] => $this->getIsCumulative(), - $keys[12] => $this->getIsRemovingPostage(), - $keys[13] => $this->getMaxUsage(), - $keys[14] => $this->getIsAvailableOnSpecialOffers(), - $keys[15] => $this->getCreatedAt(), - $keys[16] => $this->getUpdatedAt(), - $keys[17] => $this->getVersion(), + $keys[3] => $this->getAmount(), + $keys[4] => $this->getIsUsed(), + $keys[5] => $this->getIsEnabled(), + $keys[6] => $this->getExpirationDate(), + $keys[7] => $this->getSerializedRules(), + $keys[8] => $this->getIsCumulative(), + $keys[9] => $this->getIsRemovingPostage(), + $keys[10] => $this->getMaxUsage(), + $keys[11] => $this->getIsAvailableOnSpecialOffers(), + $keys[12] => $this->getCreatedAt(), + $keys[13] => $this->getUpdatedAt(), + $keys[14] => $this->getVersion(), ); $virtualColumns = $this->virtualColumns; foreach($virtualColumns as $key => $virtualColumn) @@ -1721,48 +1568,39 @@ abstract class CouponVersion implements ActiveRecordInterface $this->setType($value); break; case 3: - $this->setTitle($value); - break; - case 4: - $this->setShortDescription($value); - break; - case 5: - $this->setDescription($value); - break; - case 6: $this->setAmount($value); break; - case 7: + case 4: $this->setIsUsed($value); break; - case 8: + case 5: $this->setIsEnabled($value); break; - case 9: + case 6: $this->setExpirationDate($value); break; - case 10: + case 7: $this->setSerializedRules($value); break; - case 11: + case 8: $this->setIsCumulative($value); break; - case 12: + case 9: $this->setIsRemovingPostage($value); break; - case 13: + case 10: $this->setMaxUsage($value); break; - case 14: + case 11: $this->setIsAvailableOnSpecialOffers($value); break; - case 15: + case 12: $this->setCreatedAt($value); break; - case 16: + case 13: $this->setUpdatedAt($value); break; - case 17: + case 14: $this->setVersion($value); break; } // switch() @@ -1792,21 +1630,18 @@ abstract class CouponVersion implements ActiveRecordInterface if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]); if (array_key_exists($keys[1], $arr)) $this->setCode($arr[$keys[1]]); if (array_key_exists($keys[2], $arr)) $this->setType($arr[$keys[2]]); - if (array_key_exists($keys[3], $arr)) $this->setTitle($arr[$keys[3]]); - if (array_key_exists($keys[4], $arr)) $this->setShortDescription($arr[$keys[4]]); - if (array_key_exists($keys[5], $arr)) $this->setDescription($arr[$keys[5]]); - if (array_key_exists($keys[6], $arr)) $this->setAmount($arr[$keys[6]]); - if (array_key_exists($keys[7], $arr)) $this->setIsUsed($arr[$keys[7]]); - if (array_key_exists($keys[8], $arr)) $this->setIsEnabled($arr[$keys[8]]); - if (array_key_exists($keys[9], $arr)) $this->setExpirationDate($arr[$keys[9]]); - if (array_key_exists($keys[10], $arr)) $this->setSerializedRules($arr[$keys[10]]); - if (array_key_exists($keys[11], $arr)) $this->setIsCumulative($arr[$keys[11]]); - if (array_key_exists($keys[12], $arr)) $this->setIsRemovingPostage($arr[$keys[12]]); - if (array_key_exists($keys[13], $arr)) $this->setMaxUsage($arr[$keys[13]]); - if (array_key_exists($keys[14], $arr)) $this->setIsAvailableOnSpecialOffers($arr[$keys[14]]); - if (array_key_exists($keys[15], $arr)) $this->setCreatedAt($arr[$keys[15]]); - if (array_key_exists($keys[16], $arr)) $this->setUpdatedAt($arr[$keys[16]]); - if (array_key_exists($keys[17], $arr)) $this->setVersion($arr[$keys[17]]); + if (array_key_exists($keys[3], $arr)) $this->setAmount($arr[$keys[3]]); + if (array_key_exists($keys[4], $arr)) $this->setIsUsed($arr[$keys[4]]); + if (array_key_exists($keys[5], $arr)) $this->setIsEnabled($arr[$keys[5]]); + if (array_key_exists($keys[6], $arr)) $this->setExpirationDate($arr[$keys[6]]); + if (array_key_exists($keys[7], $arr)) $this->setSerializedRules($arr[$keys[7]]); + if (array_key_exists($keys[8], $arr)) $this->setIsCumulative($arr[$keys[8]]); + if (array_key_exists($keys[9], $arr)) $this->setIsRemovingPostage($arr[$keys[9]]); + if (array_key_exists($keys[10], $arr)) $this->setMaxUsage($arr[$keys[10]]); + if (array_key_exists($keys[11], $arr)) $this->setIsAvailableOnSpecialOffers($arr[$keys[11]]); + if (array_key_exists($keys[12], $arr)) $this->setCreatedAt($arr[$keys[12]]); + if (array_key_exists($keys[13], $arr)) $this->setUpdatedAt($arr[$keys[13]]); + if (array_key_exists($keys[14], $arr)) $this->setVersion($arr[$keys[14]]); } /** @@ -1821,9 +1656,6 @@ abstract class CouponVersion implements ActiveRecordInterface if ($this->isColumnModified(CouponVersionTableMap::ID)) $criteria->add(CouponVersionTableMap::ID, $this->id); if ($this->isColumnModified(CouponVersionTableMap::CODE)) $criteria->add(CouponVersionTableMap::CODE, $this->code); if ($this->isColumnModified(CouponVersionTableMap::TYPE)) $criteria->add(CouponVersionTableMap::TYPE, $this->type); - if ($this->isColumnModified(CouponVersionTableMap::TITLE)) $criteria->add(CouponVersionTableMap::TITLE, $this->title); - if ($this->isColumnModified(CouponVersionTableMap::SHORT_DESCRIPTION)) $criteria->add(CouponVersionTableMap::SHORT_DESCRIPTION, $this->short_description); - if ($this->isColumnModified(CouponVersionTableMap::DESCRIPTION)) $criteria->add(CouponVersionTableMap::DESCRIPTION, $this->description); if ($this->isColumnModified(CouponVersionTableMap::AMOUNT)) $criteria->add(CouponVersionTableMap::AMOUNT, $this->amount); if ($this->isColumnModified(CouponVersionTableMap::IS_USED)) $criteria->add(CouponVersionTableMap::IS_USED, $this->is_used); if ($this->isColumnModified(CouponVersionTableMap::IS_ENABLED)) $criteria->add(CouponVersionTableMap::IS_ENABLED, $this->is_enabled); @@ -1909,9 +1741,6 @@ abstract class CouponVersion implements ActiveRecordInterface $copyObj->setId($this->getId()); $copyObj->setCode($this->getCode()); $copyObj->setType($this->getType()); - $copyObj->setTitle($this->getTitle()); - $copyObj->setShortDescription($this->getShortDescription()); - $copyObj->setDescription($this->getDescription()); $copyObj->setAmount($this->getAmount()); $copyObj->setIsUsed($this->getIsUsed()); $copyObj->setIsEnabled($this->getIsEnabled()); @@ -2010,9 +1839,6 @@ abstract class CouponVersion implements ActiveRecordInterface $this->id = null; $this->code = null; $this->type = null; - $this->title = null; - $this->short_description = null; - $this->description = null; $this->amount = null; $this->is_used = null; $this->is_enabled = null; diff --git a/core/lib/Thelia/Model/Base/CouponVersionQuery.php b/core/lib/Thelia/Model/Base/CouponVersionQuery.php index 71ce72aee..ed7e587e7 100644 --- a/core/lib/Thelia/Model/Base/CouponVersionQuery.php +++ b/core/lib/Thelia/Model/Base/CouponVersionQuery.php @@ -24,9 +24,6 @@ use Thelia\Model\Map\CouponVersionTableMap; * @method ChildCouponVersionQuery orderById($order = Criteria::ASC) Order by the id column * @method ChildCouponVersionQuery orderByCode($order = Criteria::ASC) Order by the code column * @method ChildCouponVersionQuery orderByType($order = Criteria::ASC) Order by the type column - * @method ChildCouponVersionQuery orderByTitle($order = Criteria::ASC) Order by the title column - * @method ChildCouponVersionQuery orderByShortDescription($order = Criteria::ASC) Order by the short_description column - * @method ChildCouponVersionQuery orderByDescription($order = Criteria::ASC) Order by the description column * @method ChildCouponVersionQuery orderByAmount($order = Criteria::ASC) Order by the amount column * @method ChildCouponVersionQuery orderByIsUsed($order = Criteria::ASC) Order by the is_used column * @method ChildCouponVersionQuery orderByIsEnabled($order = Criteria::ASC) Order by the is_enabled column @@ -43,9 +40,6 @@ use Thelia\Model\Map\CouponVersionTableMap; * @method ChildCouponVersionQuery groupById() Group by the id column * @method ChildCouponVersionQuery groupByCode() Group by the code column * @method ChildCouponVersionQuery groupByType() Group by the type column - * @method ChildCouponVersionQuery groupByTitle() Group by the title column - * @method ChildCouponVersionQuery groupByShortDescription() Group by the short_description column - * @method ChildCouponVersionQuery groupByDescription() Group by the description column * @method ChildCouponVersionQuery groupByAmount() Group by the amount column * @method ChildCouponVersionQuery groupByIsUsed() Group by the is_used column * @method ChildCouponVersionQuery groupByIsEnabled() Group by the is_enabled column @@ -73,9 +67,6 @@ use Thelia\Model\Map\CouponVersionTableMap; * @method ChildCouponVersion findOneById(int $id) Return the first ChildCouponVersion filtered by the id column * @method ChildCouponVersion findOneByCode(string $code) Return the first ChildCouponVersion filtered by the code column * @method ChildCouponVersion findOneByType(string $type) Return the first ChildCouponVersion filtered by the type column - * @method ChildCouponVersion findOneByTitle(string $title) Return the first ChildCouponVersion filtered by the title column - * @method ChildCouponVersion findOneByShortDescription(string $short_description) Return the first ChildCouponVersion filtered by the short_description column - * @method ChildCouponVersion findOneByDescription(string $description) Return the first ChildCouponVersion filtered by the description column * @method ChildCouponVersion findOneByAmount(double $amount) Return the first ChildCouponVersion filtered by the amount column * @method ChildCouponVersion findOneByIsUsed(int $is_used) Return the first ChildCouponVersion filtered by the is_used column * @method ChildCouponVersion findOneByIsEnabled(int $is_enabled) Return the first ChildCouponVersion filtered by the is_enabled column @@ -92,9 +83,6 @@ use Thelia\Model\Map\CouponVersionTableMap; * @method array findById(int $id) Return ChildCouponVersion objects filtered by the id column * @method array findByCode(string $code) Return ChildCouponVersion objects filtered by the code column * @method array findByType(string $type) Return ChildCouponVersion objects filtered by the type column - * @method array findByTitle(string $title) Return ChildCouponVersion objects filtered by the title column - * @method array findByShortDescription(string $short_description) Return ChildCouponVersion objects filtered by the short_description column - * @method array findByDescription(string $description) Return ChildCouponVersion objects filtered by the description column * @method array findByAmount(double $amount) Return ChildCouponVersion objects filtered by the amount column * @method array findByIsUsed(int $is_used) Return ChildCouponVersion objects filtered by the is_used column * @method array findByIsEnabled(int $is_enabled) Return ChildCouponVersion objects filtered by the is_enabled column @@ -195,7 +183,7 @@ abstract class CouponVersionQuery extends ModelCriteria */ protected function findPkSimple($key, $con) { - $sql = 'SELECT ID, CODE, TYPE, TITLE, SHORT_DESCRIPTION, DESCRIPTION, AMOUNT, IS_USED, IS_ENABLED, EXPIRATION_DATE, SERIALIZED_RULES, IS_CUMULATIVE, IS_REMOVING_POSTAGE, MAX_USAGE, IS_AVAILABLE_ON_SPECIAL_OFFERS, CREATED_AT, UPDATED_AT, VERSION FROM coupon_version WHERE ID = :p0 AND VERSION = :p1'; + $sql = 'SELECT ID, CODE, TYPE, AMOUNT, IS_USED, IS_ENABLED, EXPIRATION_DATE, SERIALIZED_RULES, IS_CUMULATIVE, IS_REMOVING_POSTAGE, MAX_USAGE, IS_AVAILABLE_ON_SPECIAL_OFFERS, CREATED_AT, UPDATED_AT, VERSION FROM coupon_version WHERE ID = :p0 AND VERSION = :p1'; try { $stmt = $con->prepare($sql); $stmt->bindValue(':p0', $key[0], PDO::PARAM_INT); @@ -397,93 +385,6 @@ abstract class CouponVersionQuery extends ModelCriteria return $this->addUsingAlias(CouponVersionTableMap::TYPE, $type, $comparison); } - /** - * Filter the query on the title column - * - * Example usage: - * - * $query->filterByTitle('fooValue'); // WHERE title = 'fooValue' - * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' - * - * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildCouponVersionQuery The current query, for fluid interface - */ - public function filterByTitle($title = null, $comparison = null) - { - if (null === $comparison) { - if (is_array($title)) { - $comparison = Criteria::IN; - } elseif (preg_match('/[\%\*]/', $title)) { - $title = str_replace('*', '%', $title); - $comparison = Criteria::LIKE; - } - } - - return $this->addUsingAlias(CouponVersionTableMap::TITLE, $title, $comparison); - } - - /** - * Filter the query on the short_description column - * - * Example usage: - * - * $query->filterByShortDescription('fooValue'); // WHERE short_description = 'fooValue' - * $query->filterByShortDescription('%fooValue%'); // WHERE short_description LIKE '%fooValue%' - * - * - * @param string $shortDescription The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildCouponVersionQuery The current query, for fluid interface - */ - public function filterByShortDescription($shortDescription = null, $comparison = null) - { - if (null === $comparison) { - if (is_array($shortDescription)) { - $comparison = Criteria::IN; - } elseif (preg_match('/[\%\*]/', $shortDescription)) { - $shortDescription = str_replace('*', '%', $shortDescription); - $comparison = Criteria::LIKE; - } - } - - return $this->addUsingAlias(CouponVersionTableMap::SHORT_DESCRIPTION, $shortDescription, $comparison); - } - - /** - * Filter the query on the description column - * - * Example usage: - * - * $query->filterByDescription('fooValue'); // WHERE description = 'fooValue' - * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' - * - * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildCouponVersionQuery The current query, for fluid interface - */ - public function filterByDescription($description = null, $comparison = null) - { - if (null === $comparison) { - if (is_array($description)) { - $comparison = Criteria::IN; - } elseif (preg_match('/[\%\*]/', $description)) { - $description = str_replace('*', '%', $description); - $comparison = Criteria::LIKE; - } - } - - return $this->addUsingAlias(CouponVersionTableMap::DESCRIPTION, $description, $comparison); - } - /** * Filter the query on the amount column * diff --git a/core/lib/Thelia/Model/Base/Folder.php b/core/lib/Thelia/Model/Base/Folder.php index 5c3e7aaa3..1b0c80d94 100755 --- a/core/lib/Thelia/Model/Base/Folder.php +++ b/core/lib/Thelia/Model/Base/Folder.php @@ -31,6 +31,8 @@ use Thelia\Model\FolderImageQuery as ChildFolderImageQuery; use Thelia\Model\FolderQuery as ChildFolderQuery; use Thelia\Model\FolderVersion as ChildFolderVersion; use Thelia\Model\FolderVersionQuery as ChildFolderVersionQuery; +use Thelia\Model\Rewriting as ChildRewriting; +use Thelia\Model\RewritingQuery as ChildRewritingQuery; use Thelia\Model\Map\FolderTableMap; use Thelia\Model\Map\FolderVersionTableMap; @@ -123,6 +125,12 @@ abstract class Folder implements ActiveRecordInterface */ protected $version_created_by; + /** + * @var ObjectCollection|ChildRewriting[] Collection to store aggregation of ChildRewriting objects. + */ + protected $collRewritings; + protected $collRewritingsPartial; + /** * @var ObjectCollection|ChildContentFolder[] Collection to store aggregation of ChildContentFolder objects. */ @@ -194,6 +202,12 @@ abstract class Folder implements ActiveRecordInterface */ protected $contentsScheduledForDeletion = null; + /** + * An array of objects scheduled for deletion. + * @var ObjectCollection + */ + protected $rewritingsScheduledForDeletion = null; + /** * An array of objects scheduled for deletion. * @var ObjectCollection @@ -951,6 +965,8 @@ abstract class Folder implements ActiveRecordInterface if ($deep) { // also de-associate any related objects? + $this->collRewritings = null; + $this->collContentFolders = null; $this->collFolderImages = null; @@ -1134,6 +1150,23 @@ abstract class Folder implements ActiveRecordInterface } } + if ($this->rewritingsScheduledForDeletion !== null) { + if (!$this->rewritingsScheduledForDeletion->isEmpty()) { + \Thelia\Model\RewritingQuery::create() + ->filterByPrimaryKeys($this->rewritingsScheduledForDeletion->getPrimaryKeys(false)) + ->delete($con); + $this->rewritingsScheduledForDeletion = null; + } + } + + if ($this->collRewritings !== null) { + foreach ($this->collRewritings as $referrerFK) { + if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) { + $affectedRows += $referrerFK->save($con); + } + } + } + if ($this->contentFoldersScheduledForDeletion !== null) { if (!$this->contentFoldersScheduledForDeletion->isEmpty()) { \Thelia\Model\ContentFolderQuery::create() @@ -1445,6 +1478,9 @@ abstract class Folder implements ActiveRecordInterface } if ($includeForeignObjects) { + if (null !== $this->collRewritings) { + $result['Rewritings'] = $this->collRewritings->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); + } if (null !== $this->collContentFolders) { $result['ContentFolders'] = $this->collContentFolders->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } @@ -1651,6 +1687,12 @@ abstract class Folder implements ActiveRecordInterface // the getter/setter methods for fkey referrer objects. $copyObj->setNew(false); + foreach ($this->getRewritings() as $relObj) { + if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves + $copyObj->addRewriting($relObj->copy($deepCopy)); + } + } + foreach ($this->getContentFolders() as $relObj) { if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves $copyObj->addContentFolder($relObj->copy($deepCopy)); @@ -1722,6 +1764,9 @@ abstract class Folder implements ActiveRecordInterface */ public function initRelation($relationName) { + if ('Rewriting' == $relationName) { + return $this->initRewritings(); + } if ('ContentFolder' == $relationName) { return $this->initContentFolders(); } @@ -1739,6 +1784,299 @@ abstract class Folder implements ActiveRecordInterface } } + /** + * Clears out the collRewritings collection + * + * This does not modify the database; however, it will remove any associated objects, causing + * them to be refetched by subsequent calls to accessor method. + * + * @return void + * @see addRewritings() + */ + public function clearRewritings() + { + $this->collRewritings = null; // important to set this to NULL since that means it is uninitialized + } + + /** + * Reset is the collRewritings collection loaded partially. + */ + public function resetPartialRewritings($v = true) + { + $this->collRewritingsPartial = $v; + } + + /** + * Initializes the collRewritings collection. + * + * By default this just sets the collRewritings collection to an empty array (like clearcollRewritings()); + * however, you may wish to override this method in your stub class to provide setting appropriate + * to your application -- for example, setting the initial array to the values stored in database. + * + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty + * + * @return void + */ + public function initRewritings($overrideExisting = true) + { + if (null !== $this->collRewritings && !$overrideExisting) { + return; + } + $this->collRewritings = new ObjectCollection(); + $this->collRewritings->setModel('\Thelia\Model\Rewriting'); + } + + /** + * Gets an array of ChildRewriting objects which contain a foreign key that references this object. + * + * If the $criteria is not null, it is used to always fetch the results from the database. + * Otherwise the results are fetched from the database the first time, then cached. + * Next time the same method is called without $criteria, the cached collection is returned. + * If this ChildFolder is new, it will return + * an empty collection or the current collection; the criteria is ignored on a new object. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @return Collection|ChildRewriting[] List of ChildRewriting objects + * @throws PropelException + */ + public function getRewritings($criteria = null, ConnectionInterface $con = null) + { + $partial = $this->collRewritingsPartial && !$this->isNew(); + if (null === $this->collRewritings || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collRewritings) { + // return empty collection + $this->initRewritings(); + } else { + $collRewritings = ChildRewritingQuery::create(null, $criteria) + ->filterByFolder($this) + ->find($con); + + if (null !== $criteria) { + if (false !== $this->collRewritingsPartial && count($collRewritings)) { + $this->initRewritings(false); + + foreach ($collRewritings as $obj) { + if (false == $this->collRewritings->contains($obj)) { + $this->collRewritings->append($obj); + } + } + + $this->collRewritingsPartial = true; + } + + $collRewritings->getInternalIterator()->rewind(); + + return $collRewritings; + } + + if ($partial && $this->collRewritings) { + foreach ($this->collRewritings as $obj) { + if ($obj->isNew()) { + $collRewritings[] = $obj; + } + } + } + + $this->collRewritings = $collRewritings; + $this->collRewritingsPartial = false; + } + } + + return $this->collRewritings; + } + + /** + * Sets a collection of Rewriting objects related by a one-to-many relationship + * to the current object. + * It will also schedule objects for deletion based on a diff between old objects (aka persisted) + * and new objects from the given Propel collection. + * + * @param Collection $rewritings A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildFolder The current object (for fluent API support) + */ + public function setRewritings(Collection $rewritings, ConnectionInterface $con = null) + { + $rewritingsToDelete = $this->getRewritings(new Criteria(), $con)->diff($rewritings); + + + $this->rewritingsScheduledForDeletion = $rewritingsToDelete; + + foreach ($rewritingsToDelete as $rewritingRemoved) { + $rewritingRemoved->setFolder(null); + } + + $this->collRewritings = null; + foreach ($rewritings as $rewriting) { + $this->addRewriting($rewriting); + } + + $this->collRewritings = $rewritings; + $this->collRewritingsPartial = false; + + return $this; + } + + /** + * Returns the number of related Rewriting objects. + * + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related Rewriting objects. + * @throws PropelException + */ + public function countRewritings(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) + { + $partial = $this->collRewritingsPartial && !$this->isNew(); + if (null === $this->collRewritings || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collRewritings) { + return 0; + } + + if ($partial && !$criteria) { + return count($this->getRewritings()); + } + + $query = ChildRewritingQuery::create(null, $criteria); + if ($distinct) { + $query->distinct(); + } + + return $query + ->filterByFolder($this) + ->count($con); + } + + return count($this->collRewritings); + } + + /** + * Method called to associate a ChildRewriting object to this object + * through the ChildRewriting foreign key attribute. + * + * @param ChildRewriting $l ChildRewriting + * @return \Thelia\Model\Folder The current object (for fluent API support) + */ + public function addRewriting(ChildRewriting $l) + { + if ($this->collRewritings === null) { + $this->initRewritings(); + $this->collRewritingsPartial = true; + } + + if (!in_array($l, $this->collRewritings->getArrayCopy(), true)) { // only add it if the **same** object is not already associated + $this->doAddRewriting($l); + } + + return $this; + } + + /** + * @param Rewriting $rewriting The rewriting object to add. + */ + protected function doAddRewriting($rewriting) + { + $this->collRewritings[]= $rewriting; + $rewriting->setFolder($this); + } + + /** + * @param Rewriting $rewriting The rewriting object to remove. + * @return ChildFolder The current object (for fluent API support) + */ + public function removeRewriting($rewriting) + { + if ($this->getRewritings()->contains($rewriting)) { + $this->collRewritings->remove($this->collRewritings->search($rewriting)); + if (null === $this->rewritingsScheduledForDeletion) { + $this->rewritingsScheduledForDeletion = clone $this->collRewritings; + $this->rewritingsScheduledForDeletion->clear(); + } + $this->rewritingsScheduledForDeletion[]= $rewriting; + $rewriting->setFolder(null); + } + + return $this; + } + + + /** + * If this collection has already been initialized with + * an identical criteria, it returns the collection. + * Otherwise if this Folder is new, it will return + * an empty collection; or if this Folder has previously + * been saved, it will retrieve related Rewritings from storage. + * + * This method is protected by default in order to keep the public + * api reasonable. You can provide public methods for those you + * actually need in Folder. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @return Collection|ChildRewriting[] List of ChildRewriting objects + */ + public function getRewritingsJoinProduct($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) + { + $query = ChildRewritingQuery::create(null, $criteria); + $query->joinWith('Product', $joinBehavior); + + return $this->getRewritings($query, $con); + } + + + /** + * If this collection has already been initialized with + * an identical criteria, it returns the collection. + * Otherwise if this Folder is new, it will return + * an empty collection; or if this Folder has previously + * been saved, it will retrieve related Rewritings from storage. + * + * This method is protected by default in order to keep the public + * api reasonable. You can provide public methods for those you + * actually need in Folder. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @return Collection|ChildRewriting[] List of ChildRewriting objects + */ + public function getRewritingsJoinCategory($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) + { + $query = ChildRewritingQuery::create(null, $criteria); + $query->joinWith('Category', $joinBehavior); + + return $this->getRewritings($query, $con); + } + + + /** + * If this collection has already been initialized with + * an identical criteria, it returns the collection. + * Otherwise if this Folder is new, it will return + * an empty collection; or if this Folder has previously + * been saved, it will retrieve related Rewritings from storage. + * + * This method is protected by default in order to keep the public + * api reasonable. You can provide public methods for those you + * actually need in Folder. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @return Collection|ChildRewriting[] List of ChildRewriting objects + */ + public function getRewritingsJoinContent($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) + { + $query = ChildRewritingQuery::create(null, $criteria); + $query->joinWith('Content', $joinBehavior); + + return $this->getRewritings($query, $con); + } + /** * Clears out the collContentFolders collection * @@ -3084,6 +3422,11 @@ abstract class Folder implements ActiveRecordInterface public function clearAllReferences($deep = false) { if ($deep) { + if ($this->collRewritings) { + foreach ($this->collRewritings as $o) { + $o->clearAllReferences($deep); + } + } if ($this->collContentFolders) { foreach ($this->collContentFolders as $o) { $o->clearAllReferences($deep); @@ -3120,6 +3463,10 @@ abstract class Folder implements ActiveRecordInterface $this->currentLocale = 'en_EN'; $this->currentTranslations = null; + if ($this->collRewritings instanceof Collection) { + $this->collRewritings->clearIterator(); + } + $this->collRewritings = null; if ($this->collContentFolders instanceof Collection) { $this->collContentFolders->clearIterator(); } diff --git a/core/lib/Thelia/Model/Base/FolderQuery.php b/core/lib/Thelia/Model/Base/FolderQuery.php index 28f9bc8a3..22d2f3735 100755 --- a/core/lib/Thelia/Model/Base/FolderQuery.php +++ b/core/lib/Thelia/Model/Base/FolderQuery.php @@ -46,6 +46,10 @@ use Thelia\Model\Map\FolderTableMap; * @method ChildFolderQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query * @method ChildFolderQuery innerJoin($relation) Adds a INNER JOIN clause to the query * + * @method ChildFolderQuery leftJoinRewriting($relationAlias = null) Adds a LEFT JOIN clause to the query using the Rewriting relation + * @method ChildFolderQuery rightJoinRewriting($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Rewriting relation + * @method ChildFolderQuery innerJoinRewriting($relationAlias = null) Adds a INNER JOIN clause to the query using the Rewriting relation + * * @method ChildFolderQuery leftJoinContentFolder($relationAlias = null) Adds a LEFT JOIN clause to the query using the ContentFolder relation * @method ChildFolderQuery rightJoinContentFolder($relationAlias = null) Adds a RIGHT JOIN clause to the query using the ContentFolder relation * @method ChildFolderQuery innerJoinContentFolder($relationAlias = null) Adds a INNER JOIN clause to the query using the ContentFolder relation @@ -635,6 +639,79 @@ abstract class FolderQuery extends ModelCriteria return $this->addUsingAlias(FolderTableMap::VERSION_CREATED_BY, $versionCreatedBy, $comparison); } + /** + * Filter the query by a related \Thelia\Model\Rewriting object + * + * @param \Thelia\Model\Rewriting|ObjectCollection $rewriting the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildFolderQuery The current query, for fluid interface + */ + public function filterByRewriting($rewriting, $comparison = null) + { + if ($rewriting instanceof \Thelia\Model\Rewriting) { + return $this + ->addUsingAlias(FolderTableMap::ID, $rewriting->getFolderId(), $comparison); + } elseif ($rewriting instanceof ObjectCollection) { + return $this + ->useRewritingQuery() + ->filterByPrimaryKeys($rewriting->getPrimaryKeys()) + ->endUse(); + } else { + throw new PropelException('filterByRewriting() only accepts arguments of type \Thelia\Model\Rewriting or Collection'); + } + } + + /** + * Adds a JOIN clause to the query using the Rewriting relation + * + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return ChildFolderQuery The current query, for fluid interface + */ + public function joinRewriting($relationAlias = null, $joinType = Criteria::LEFT_JOIN) + { + $tableMap = $this->getTableMap(); + $relationMap = $tableMap->getRelation('Rewriting'); + + // create a ModelJoin object for this join + $join = new ModelJoin(); + $join->setJoinType($joinType); + $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); + if ($previousJoin = $this->getPreviousJoin()) { + $join->setPreviousJoin($previousJoin); + } + + // add the ModelJoin to the current object + if ($relationAlias) { + $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); + $this->addJoinObject($join, $relationAlias); + } else { + $this->addJoinObject($join, 'Rewriting'); + } + + return $this; + } + + /** + * Use the Rewriting relation Rewriting object + * + * @see useQuery() + * + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return \Thelia\Model\RewritingQuery A secondary query class using the current class as primary query + */ + public function useRewritingQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) + { + return $this + ->joinRewriting($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'Rewriting', '\Thelia\Model\RewritingQuery'); + } + /** * Filter the query by a related \Thelia\Model\ContentFolder object * diff --git a/core/lib/Thelia/Model/Base/Order.php b/core/lib/Thelia/Model/Base/Order.php index ccf7922f3..b815aff34 100755 --- a/core/lib/Thelia/Model/Base/Order.php +++ b/core/lib/Thelia/Model/Base/Order.php @@ -2842,31 +2842,6 @@ abstract class Order implements ActiveRecordInterface return $this; } - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Order is new, it will return - * an empty collection; or if this Order has previously - * been saved, it will retrieve related CouponOrders from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Order. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildCouponOrder[] List of ChildCouponOrder objects - */ - public function getCouponOrdersJoinCoupon($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildCouponOrderQuery::create(null, $criteria); - $query->joinWith('Coupon', $joinBehavior); - - return $this->getCouponOrders($query, $con); - } - /** * Clears the current object and sets all attributes to their default values */ diff --git a/core/lib/Thelia/Model/Base/Product.php b/core/lib/Thelia/Model/Base/Product.php index ce2e2a645..707bd0904 100755 --- a/core/lib/Thelia/Model/Base/Product.php +++ b/core/lib/Thelia/Model/Base/Product.php @@ -41,6 +41,8 @@ use Thelia\Model\ProductSaleElements as ChildProductSaleElements; use Thelia\Model\ProductSaleElementsQuery as ChildProductSaleElementsQuery; use Thelia\Model\ProductVersion as ChildProductVersion; use Thelia\Model\ProductVersionQuery as ChildProductVersionQuery; +use Thelia\Model\Rewriting as ChildRewriting; +use Thelia\Model\RewritingQuery as ChildRewritingQuery; use Thelia\Model\TaxRule as ChildTaxRule; use Thelia\Model\TaxRuleQuery as ChildTaxRuleQuery; use Thelia\Model\Map\ProductTableMap; @@ -189,6 +191,12 @@ abstract class Product implements ActiveRecordInterface protected $collAccessoriesRelatedByAccessory; protected $collAccessoriesRelatedByAccessoryPartial; + /** + * @var ObjectCollection|ChildRewriting[] Collection to store aggregation of ChildRewriting objects. + */ + protected $collRewritings; + protected $collRewritingsPartial; + /** * @var ObjectCollection|ChildCartItem[] Collection to store aggregation of ChildCartItem objects. */ @@ -318,6 +326,12 @@ abstract class Product implements ActiveRecordInterface */ protected $accessoriesRelatedByAccessoryScheduledForDeletion = null; + /** + * An array of objects scheduled for deletion. + * @var ObjectCollection + */ + protected $rewritingsScheduledForDeletion = null; + /** * An array of objects scheduled for deletion. * @var ObjectCollection @@ -1131,6 +1145,8 @@ abstract class Product implements ActiveRecordInterface $this->collAccessoriesRelatedByAccessory = null; + $this->collRewritings = null; + $this->collCartItems = null; $this->collProductAssociatedContents = null; @@ -1499,6 +1515,23 @@ abstract class Product implements ActiveRecordInterface } } + if ($this->rewritingsScheduledForDeletion !== null) { + if (!$this->rewritingsScheduledForDeletion->isEmpty()) { + \Thelia\Model\RewritingQuery::create() + ->filterByPrimaryKeys($this->rewritingsScheduledForDeletion->getPrimaryKeys(false)) + ->delete($con); + $this->rewritingsScheduledForDeletion = null; + } + } + + if ($this->collRewritings !== null) { + foreach ($this->collRewritings as $referrerFK) { + if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) { + $affectedRows += $referrerFK->save($con); + } + } + } + if ($this->cartItemsScheduledForDeletion !== null) { if (!$this->cartItemsScheduledForDeletion->isEmpty()) { \Thelia\Model\CartItemQuery::create() @@ -1827,6 +1860,9 @@ abstract class Product implements ActiveRecordInterface if (null !== $this->collAccessoriesRelatedByAccessory) { $result['AccessoriesRelatedByAccessory'] = $this->collAccessoriesRelatedByAccessory->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } + if (null !== $this->collRewritings) { + $result['Rewritings'] = $this->collRewritings->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); + } if (null !== $this->collCartItems) { $result['CartItems'] = $this->collCartItems->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } @@ -2078,6 +2114,12 @@ abstract class Product implements ActiveRecordInterface } } + foreach ($this->getRewritings() as $relObj) { + if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves + $copyObj->addRewriting($relObj->copy($deepCopy)); + } + } + foreach ($this->getCartItems() as $relObj) { if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves $copyObj->addCartItem($relObj->copy($deepCopy)); @@ -2215,6 +2257,9 @@ abstract class Product implements ActiveRecordInterface if ('AccessoryRelatedByAccessory' == $relationName) { return $this->initAccessoriesRelatedByAccessory(); } + if ('Rewriting' == $relationName) { + return $this->initRewritings(); + } if ('CartItem' == $relationName) { return $this->initCartItems(); } @@ -3833,6 +3878,299 @@ abstract class Product implements ActiveRecordInterface return $this; } + /** + * Clears out the collRewritings collection + * + * This does not modify the database; however, it will remove any associated objects, causing + * them to be refetched by subsequent calls to accessor method. + * + * @return void + * @see addRewritings() + */ + public function clearRewritings() + { + $this->collRewritings = null; // important to set this to NULL since that means it is uninitialized + } + + /** + * Reset is the collRewritings collection loaded partially. + */ + public function resetPartialRewritings($v = true) + { + $this->collRewritingsPartial = $v; + } + + /** + * Initializes the collRewritings collection. + * + * By default this just sets the collRewritings collection to an empty array (like clearcollRewritings()); + * however, you may wish to override this method in your stub class to provide setting appropriate + * to your application -- for example, setting the initial array to the values stored in database. + * + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty + * + * @return void + */ + public function initRewritings($overrideExisting = true) + { + if (null !== $this->collRewritings && !$overrideExisting) { + return; + } + $this->collRewritings = new ObjectCollection(); + $this->collRewritings->setModel('\Thelia\Model\Rewriting'); + } + + /** + * Gets an array of ChildRewriting objects which contain a foreign key that references this object. + * + * If the $criteria is not null, it is used to always fetch the results from the database. + * Otherwise the results are fetched from the database the first time, then cached. + * Next time the same method is called without $criteria, the cached collection is returned. + * If this ChildProduct is new, it will return + * an empty collection or the current collection; the criteria is ignored on a new object. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @return Collection|ChildRewriting[] List of ChildRewriting objects + * @throws PropelException + */ + public function getRewritings($criteria = null, ConnectionInterface $con = null) + { + $partial = $this->collRewritingsPartial && !$this->isNew(); + if (null === $this->collRewritings || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collRewritings) { + // return empty collection + $this->initRewritings(); + } else { + $collRewritings = ChildRewritingQuery::create(null, $criteria) + ->filterByProduct($this) + ->find($con); + + if (null !== $criteria) { + if (false !== $this->collRewritingsPartial && count($collRewritings)) { + $this->initRewritings(false); + + foreach ($collRewritings as $obj) { + if (false == $this->collRewritings->contains($obj)) { + $this->collRewritings->append($obj); + } + } + + $this->collRewritingsPartial = true; + } + + $collRewritings->getInternalIterator()->rewind(); + + return $collRewritings; + } + + if ($partial && $this->collRewritings) { + foreach ($this->collRewritings as $obj) { + if ($obj->isNew()) { + $collRewritings[] = $obj; + } + } + } + + $this->collRewritings = $collRewritings; + $this->collRewritingsPartial = false; + } + } + + return $this->collRewritings; + } + + /** + * Sets a collection of Rewriting objects related by a one-to-many relationship + * to the current object. + * It will also schedule objects for deletion based on a diff between old objects (aka persisted) + * and new objects from the given Propel collection. + * + * @param Collection $rewritings A Propel collection. + * @param ConnectionInterface $con Optional connection object + * @return ChildProduct The current object (for fluent API support) + */ + public function setRewritings(Collection $rewritings, ConnectionInterface $con = null) + { + $rewritingsToDelete = $this->getRewritings(new Criteria(), $con)->diff($rewritings); + + + $this->rewritingsScheduledForDeletion = $rewritingsToDelete; + + foreach ($rewritingsToDelete as $rewritingRemoved) { + $rewritingRemoved->setProduct(null); + } + + $this->collRewritings = null; + foreach ($rewritings as $rewriting) { + $this->addRewriting($rewriting); + } + + $this->collRewritings = $rewritings; + $this->collRewritingsPartial = false; + + return $this; + } + + /** + * Returns the number of related Rewriting objects. + * + * @param Criteria $criteria + * @param boolean $distinct + * @param ConnectionInterface $con + * @return int Count of related Rewriting objects. + * @throws PropelException + */ + public function countRewritings(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) + { + $partial = $this->collRewritingsPartial && !$this->isNew(); + if (null === $this->collRewritings || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collRewritings) { + return 0; + } + + if ($partial && !$criteria) { + return count($this->getRewritings()); + } + + $query = ChildRewritingQuery::create(null, $criteria); + if ($distinct) { + $query->distinct(); + } + + return $query + ->filterByProduct($this) + ->count($con); + } + + return count($this->collRewritings); + } + + /** + * Method called to associate a ChildRewriting object to this object + * through the ChildRewriting foreign key attribute. + * + * @param ChildRewriting $l ChildRewriting + * @return \Thelia\Model\Product The current object (for fluent API support) + */ + public function addRewriting(ChildRewriting $l) + { + if ($this->collRewritings === null) { + $this->initRewritings(); + $this->collRewritingsPartial = true; + } + + if (!in_array($l, $this->collRewritings->getArrayCopy(), true)) { // only add it if the **same** object is not already associated + $this->doAddRewriting($l); + } + + return $this; + } + + /** + * @param Rewriting $rewriting The rewriting object to add. + */ + protected function doAddRewriting($rewriting) + { + $this->collRewritings[]= $rewriting; + $rewriting->setProduct($this); + } + + /** + * @param Rewriting $rewriting The rewriting object to remove. + * @return ChildProduct The current object (for fluent API support) + */ + public function removeRewriting($rewriting) + { + if ($this->getRewritings()->contains($rewriting)) { + $this->collRewritings->remove($this->collRewritings->search($rewriting)); + if (null === $this->rewritingsScheduledForDeletion) { + $this->rewritingsScheduledForDeletion = clone $this->collRewritings; + $this->rewritingsScheduledForDeletion->clear(); + } + $this->rewritingsScheduledForDeletion[]= $rewriting; + $rewriting->setProduct(null); + } + + return $this; + } + + + /** + * If this collection has already been initialized with + * an identical criteria, it returns the collection. + * Otherwise if this Product is new, it will return + * an empty collection; or if this Product has previously + * been saved, it will retrieve related Rewritings from storage. + * + * This method is protected by default in order to keep the public + * api reasonable. You can provide public methods for those you + * actually need in Product. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @return Collection|ChildRewriting[] List of ChildRewriting objects + */ + public function getRewritingsJoinCategory($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) + { + $query = ChildRewritingQuery::create(null, $criteria); + $query->joinWith('Category', $joinBehavior); + + return $this->getRewritings($query, $con); + } + + + /** + * If this collection has already been initialized with + * an identical criteria, it returns the collection. + * Otherwise if this Product is new, it will return + * an empty collection; or if this Product has previously + * been saved, it will retrieve related Rewritings from storage. + * + * This method is protected by default in order to keep the public + * api reasonable. You can provide public methods for those you + * actually need in Product. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @return Collection|ChildRewriting[] List of ChildRewriting objects + */ + public function getRewritingsJoinFolder($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) + { + $query = ChildRewritingQuery::create(null, $criteria); + $query->joinWith('Folder', $joinBehavior); + + return $this->getRewritings($query, $con); + } + + + /** + * If this collection has already been initialized with + * an identical criteria, it returns the collection. + * Otherwise if this Product is new, it will return + * an empty collection; or if this Product has previously + * been saved, it will retrieve related Rewritings from storage. + * + * This method is protected by default in order to keep the public + * api reasonable. You can provide public methods for those you + * actually need in Product. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param ConnectionInterface $con optional connection object + * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) + * @return Collection|ChildRewriting[] List of ChildRewriting objects + */ + public function getRewritingsJoinContent($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) + { + $query = ChildRewritingQuery::create(null, $criteria); + $query->joinWith('Content', $joinBehavior); + + return $this->getRewritings($query, $con); + } + /** * Clears out the collCartItems collection * @@ -5409,6 +5747,11 @@ abstract class Product implements ActiveRecordInterface $o->clearAllReferences($deep); } } + if ($this->collRewritings) { + foreach ($this->collRewritings as $o) { + $o->clearAllReferences($deep); + } + } if ($this->collCartItems) { foreach ($this->collCartItems as $o) { $o->clearAllReferences($deep); @@ -5478,6 +5821,10 @@ abstract class Product implements ActiveRecordInterface $this->collAccessoriesRelatedByAccessory->clearIterator(); } $this->collAccessoriesRelatedByAccessory = null; + if ($this->collRewritings instanceof Collection) { + $this->collRewritings->clearIterator(); + } + $this->collRewritings = null; if ($this->collCartItems instanceof Collection) { $this->collCartItems->clearIterator(); } diff --git a/core/lib/Thelia/Model/Base/ProductQuery.php b/core/lib/Thelia/Model/Base/ProductQuery.php index 3254bb08b..8a4d4ed18 100755 --- a/core/lib/Thelia/Model/Base/ProductQuery.php +++ b/core/lib/Thelia/Model/Base/ProductQuery.php @@ -80,6 +80,10 @@ use Thelia\Model\Map\ProductTableMap; * @method ChildProductQuery rightJoinAccessoryRelatedByAccessory($relationAlias = null) Adds a RIGHT JOIN clause to the query using the AccessoryRelatedByAccessory relation * @method ChildProductQuery innerJoinAccessoryRelatedByAccessory($relationAlias = null) Adds a INNER JOIN clause to the query using the AccessoryRelatedByAccessory relation * + * @method ChildProductQuery leftJoinRewriting($relationAlias = null) Adds a LEFT JOIN clause to the query using the Rewriting relation + * @method ChildProductQuery rightJoinRewriting($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Rewriting relation + * @method ChildProductQuery innerJoinRewriting($relationAlias = null) Adds a INNER JOIN clause to the query using the Rewriting relation + * * @method ChildProductQuery leftJoinCartItem($relationAlias = null) Adds a LEFT JOIN clause to the query using the CartItem relation * @method ChildProductQuery rightJoinCartItem($relationAlias = null) Adds a RIGHT JOIN clause to the query using the CartItem relation * @method ChildProductQuery innerJoinCartItem($relationAlias = null) Adds a INNER JOIN clause to the query using the CartItem relation @@ -1284,6 +1288,79 @@ abstract class ProductQuery extends ModelCriteria ->useQuery($relationAlias ? $relationAlias : 'AccessoryRelatedByAccessory', '\Thelia\Model\AccessoryQuery'); } + /** + * Filter the query by a related \Thelia\Model\Rewriting object + * + * @param \Thelia\Model\Rewriting|ObjectCollection $rewriting the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildProductQuery The current query, for fluid interface + */ + public function filterByRewriting($rewriting, $comparison = null) + { + if ($rewriting instanceof \Thelia\Model\Rewriting) { + return $this + ->addUsingAlias(ProductTableMap::ID, $rewriting->getProductId(), $comparison); + } elseif ($rewriting instanceof ObjectCollection) { + return $this + ->useRewritingQuery() + ->filterByPrimaryKeys($rewriting->getPrimaryKeys()) + ->endUse(); + } else { + throw new PropelException('filterByRewriting() only accepts arguments of type \Thelia\Model\Rewriting or Collection'); + } + } + + /** + * Adds a JOIN clause to the query using the Rewriting relation + * + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return ChildProductQuery The current query, for fluid interface + */ + public function joinRewriting($relationAlias = null, $joinType = Criteria::LEFT_JOIN) + { + $tableMap = $this->getTableMap(); + $relationMap = $tableMap->getRelation('Rewriting'); + + // create a ModelJoin object for this join + $join = new ModelJoin(); + $join->setJoinType($joinType); + $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); + if ($previousJoin = $this->getPreviousJoin()) { + $join->setPreviousJoin($previousJoin); + } + + // add the ModelJoin to the current object + if ($relationAlias) { + $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); + $this->addJoinObject($join, $relationAlias); + } else { + $this->addJoinObject($join, 'Rewriting'); + } + + return $this; + } + + /** + * Use the Rewriting relation Rewriting object + * + * @see useQuery() + * + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return \Thelia\Model\RewritingQuery A secondary query class using the current class as primary query + */ + public function useRewritingQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) + { + return $this + ->joinRewriting($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'Rewriting', '\Thelia\Model\RewritingQuery'); + } + /** * Filter the query by a related \Thelia\Model\CartItem object * diff --git a/core/lib/Thelia/Model/Map/CategoryTableMap.php b/core/lib/Thelia/Model/Map/CategoryTableMap.php index 5e692c00f..f94b14e5f 100755 --- a/core/lib/Thelia/Model/Map/CategoryTableMap.php +++ b/core/lib/Thelia/Model/Map/CategoryTableMap.php @@ -193,6 +193,7 @@ class CategoryTableMap extends TableMap $this->addRelation('ProductCategory', '\\Thelia\\Model\\ProductCategory', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'ProductCategories'); $this->addRelation('FeatureCategory', '\\Thelia\\Model\\FeatureCategory', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'FeatureCategories'); $this->addRelation('AttributeCategory', '\\Thelia\\Model\\AttributeCategory', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'AttributeCategories'); + $this->addRelation('Rewriting', '\\Thelia\\Model\\Rewriting', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'Rewritings'); $this->addRelation('CategoryImage', '\\Thelia\\Model\\CategoryImage', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'CategoryImages'); $this->addRelation('CategoryDocument', '\\Thelia\\Model\\CategoryDocument', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'CategoryDocuments'); $this->addRelation('CategoryAssociatedContent', '\\Thelia\\Model\\CategoryAssociatedContent', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'CategoryAssociatedContents'); @@ -227,6 +228,7 @@ class CategoryTableMap extends TableMap ProductCategoryTableMap::clearInstancePool(); FeatureCategoryTableMap::clearInstancePool(); AttributeCategoryTableMap::clearInstancePool(); + RewritingTableMap::clearInstancePool(); CategoryImageTableMap::clearInstancePool(); CategoryDocumentTableMap::clearInstancePool(); CategoryAssociatedContentTableMap::clearInstancePool(); diff --git a/core/lib/Thelia/Model/Map/ContentTableMap.php b/core/lib/Thelia/Model/Map/ContentTableMap.php index f89e7fd20..5b6787a28 100755 --- a/core/lib/Thelia/Model/Map/ContentTableMap.php +++ b/core/lib/Thelia/Model/Map/ContentTableMap.php @@ -184,6 +184,7 @@ class ContentTableMap extends TableMap */ public function buildRelations() { + $this->addRelation('Rewriting', '\\Thelia\\Model\\Rewriting', RelationMap::ONE_TO_MANY, array('id' => 'content_id', ), 'CASCADE', 'RESTRICT', 'Rewritings'); $this->addRelation('ContentFolder', '\\Thelia\\Model\\ContentFolder', RelationMap::ONE_TO_MANY, array('id' => 'content_id', ), 'CASCADE', 'RESTRICT', 'ContentFolders'); $this->addRelation('ContentImage', '\\Thelia\\Model\\ContentImage', RelationMap::ONE_TO_MANY, array('id' => 'content_id', ), 'CASCADE', 'RESTRICT', 'ContentImages'); $this->addRelation('ContentDocument', '\\Thelia\\Model\\ContentDocument', RelationMap::ONE_TO_MANY, array('id' => 'content_id', ), 'CASCADE', 'RESTRICT', 'ContentDocuments'); @@ -215,6 +216,7 @@ class ContentTableMap extends TableMap { // Invalidate objects in ".$this->getClassNameFromBuilder($joinedTableTableMapBuilder)." instance pool, // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule. + RewritingTableMap::clearInstancePool(); ContentFolderTableMap::clearInstancePool(); ContentImageTableMap::clearInstancePool(); ContentDocumentTableMap::clearInstancePool(); diff --git a/core/lib/Thelia/Model/Map/CouponI18nTableMap.php b/core/lib/Thelia/Model/Map/CouponI18nTableMap.php index 99d49216c..4511a553b 100644 --- a/core/lib/Thelia/Model/Map/CouponI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/CouponI18nTableMap.php @@ -57,7 +57,7 @@ class CouponI18nTableMap extends TableMap /** * The total number of columns */ - const NUM_COLUMNS = 2; + const NUM_COLUMNS = 5; /** * The number of lazy-loaded columns @@ -67,7 +67,7 @@ class CouponI18nTableMap extends TableMap /** * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS) */ - const NUM_HYDRATE_COLUMNS = 2; + const NUM_HYDRATE_COLUMNS = 5; /** * the column name for the ID field @@ -79,6 +79,21 @@ class CouponI18nTableMap extends TableMap */ const LOCALE = 'coupon_i18n.LOCALE'; + /** + * the column name for the TITLE field + */ + const TITLE = 'coupon_i18n.TITLE'; + + /** + * the column name for the SHORT_DESCRIPTION field + */ + const SHORT_DESCRIPTION = 'coupon_i18n.SHORT_DESCRIPTION'; + + /** + * the column name for the DESCRIPTION field + */ + const DESCRIPTION = 'coupon_i18n.DESCRIPTION'; + /** * The default string format for model objects of the related table */ @@ -91,12 +106,12 @@ class CouponI18nTableMap extends TableMap * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ protected static $fieldNames = array ( - self::TYPE_PHPNAME => array('Id', 'Locale', ), - self::TYPE_STUDLYPHPNAME => array('id', 'locale', ), - self::TYPE_COLNAME => array(CouponI18nTableMap::ID, CouponI18nTableMap::LOCALE, ), - self::TYPE_RAW_COLNAME => array('ID', 'LOCALE', ), - self::TYPE_FIELDNAME => array('id', 'locale', ), - self::TYPE_NUM => array(0, 1, ) + self::TYPE_PHPNAME => array('Id', 'Locale', 'Title', 'ShortDescription', 'Description', ), + self::TYPE_STUDLYPHPNAME => array('id', 'locale', 'title', 'shortDescription', 'description', ), + self::TYPE_COLNAME => array(CouponI18nTableMap::ID, CouponI18nTableMap::LOCALE, CouponI18nTableMap::TITLE, CouponI18nTableMap::SHORT_DESCRIPTION, CouponI18nTableMap::DESCRIPTION, ), + self::TYPE_RAW_COLNAME => array('ID', 'LOCALE', 'TITLE', 'SHORT_DESCRIPTION', 'DESCRIPTION', ), + self::TYPE_FIELDNAME => array('id', 'locale', 'title', 'short_description', 'description', ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, ) ); /** @@ -106,12 +121,12 @@ class CouponI18nTableMap extends TableMap * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 */ protected static $fieldKeys = array ( - self::TYPE_PHPNAME => array('Id' => 0, 'Locale' => 1, ), - self::TYPE_STUDLYPHPNAME => array('id' => 0, 'locale' => 1, ), - self::TYPE_COLNAME => array(CouponI18nTableMap::ID => 0, CouponI18nTableMap::LOCALE => 1, ), - self::TYPE_RAW_COLNAME => array('ID' => 0, 'LOCALE' => 1, ), - self::TYPE_FIELDNAME => array('id' => 0, 'locale' => 1, ), - self::TYPE_NUM => array(0, 1, ) + self::TYPE_PHPNAME => array('Id' => 0, 'Locale' => 1, 'Title' => 2, 'ShortDescription' => 3, 'Description' => 4, ), + self::TYPE_STUDLYPHPNAME => array('id' => 0, 'locale' => 1, 'title' => 2, 'shortDescription' => 3, 'description' => 4, ), + self::TYPE_COLNAME => array(CouponI18nTableMap::ID => 0, CouponI18nTableMap::LOCALE => 1, CouponI18nTableMap::TITLE => 2, CouponI18nTableMap::SHORT_DESCRIPTION => 3, CouponI18nTableMap::DESCRIPTION => 4, ), + self::TYPE_RAW_COLNAME => array('ID' => 0, 'LOCALE' => 1, 'TITLE' => 2, 'SHORT_DESCRIPTION' => 3, 'DESCRIPTION' => 4, ), + self::TYPE_FIELDNAME => array('id' => 0, 'locale' => 1, 'title' => 2, 'short_description' => 3, 'description' => 4, ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, ) ); /** @@ -132,6 +147,9 @@ class CouponI18nTableMap extends TableMap // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'coupon', 'ID', true, null, null); $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); + $this->addColumn('TITLE', 'Title', 'VARCHAR', true, 255, null); + $this->addColumn('SHORT_DESCRIPTION', 'ShortDescription', 'LONGVARCHAR', true, null, null); + $this->addColumn('DESCRIPTION', 'Description', 'CLOB', true, null, null); } // initialize() /** @@ -331,9 +349,15 @@ class CouponI18nTableMap extends TableMap if (null === $alias) { $criteria->addSelectColumn(CouponI18nTableMap::ID); $criteria->addSelectColumn(CouponI18nTableMap::LOCALE); + $criteria->addSelectColumn(CouponI18nTableMap::TITLE); + $criteria->addSelectColumn(CouponI18nTableMap::SHORT_DESCRIPTION); + $criteria->addSelectColumn(CouponI18nTableMap::DESCRIPTION); } else { $criteria->addSelectColumn($alias . '.ID'); $criteria->addSelectColumn($alias . '.LOCALE'); + $criteria->addSelectColumn($alias . '.TITLE'); + $criteria->addSelectColumn($alias . '.SHORT_DESCRIPTION'); + $criteria->addSelectColumn($alias . '.DESCRIPTION'); } } diff --git a/core/lib/Thelia/Model/Map/CouponOrderTableMap.php b/core/lib/Thelia/Model/Map/CouponOrderTableMap.php index 1826bcb70..d96183505 100755 --- a/core/lib/Thelia/Model/Map/CouponOrderTableMap.php +++ b/core/lib/Thelia/Model/Map/CouponOrderTableMap.php @@ -57,7 +57,7 @@ class CouponOrderTableMap extends TableMap /** * The total number of columns */ - const NUM_COLUMNS = 6; + const NUM_COLUMNS = 5; /** * The number of lazy-loaded columns @@ -67,7 +67,7 @@ class CouponOrderTableMap extends TableMap /** * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS) */ - const NUM_HYDRATE_COLUMNS = 6; + const NUM_HYDRATE_COLUMNS = 5; /** * the column name for the ID field @@ -79,11 +79,6 @@ class CouponOrderTableMap extends TableMap */ const ORDER_ID = 'coupon_order.ORDER_ID'; - /** - * the column name for the CODE field - */ - const CODE = 'coupon_order.CODE'; - /** * the column name for the VALUE field */ @@ -111,12 +106,12 @@ class CouponOrderTableMap extends TableMap * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ protected static $fieldNames = array ( - self::TYPE_PHPNAME => array('Id', 'OrderId', 'Code', 'Value', 'CreatedAt', 'UpdatedAt', ), - self::TYPE_STUDLYPHPNAME => array('id', 'orderId', 'code', 'value', 'createdAt', 'updatedAt', ), - self::TYPE_COLNAME => array(CouponOrderTableMap::ID, CouponOrderTableMap::ORDER_ID, CouponOrderTableMap::CODE, CouponOrderTableMap::VALUE, CouponOrderTableMap::CREATED_AT, CouponOrderTableMap::UPDATED_AT, ), - self::TYPE_RAW_COLNAME => array('ID', 'ORDER_ID', 'CODE', 'VALUE', 'CREATED_AT', 'UPDATED_AT', ), - self::TYPE_FIELDNAME => array('id', 'order_id', 'code', 'value', 'created_at', 'updated_at', ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, ) + self::TYPE_PHPNAME => array('Id', 'OrderId', 'Value', 'CreatedAt', 'UpdatedAt', ), + self::TYPE_STUDLYPHPNAME => array('id', 'orderId', 'value', 'createdAt', 'updatedAt', ), + self::TYPE_COLNAME => array(CouponOrderTableMap::ID, CouponOrderTableMap::ORDER_ID, CouponOrderTableMap::VALUE, CouponOrderTableMap::CREATED_AT, CouponOrderTableMap::UPDATED_AT, ), + self::TYPE_RAW_COLNAME => array('ID', 'ORDER_ID', 'VALUE', 'CREATED_AT', 'UPDATED_AT', ), + self::TYPE_FIELDNAME => array('id', 'order_id', 'value', 'created_at', 'updated_at', ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, ) ); /** @@ -126,12 +121,12 @@ class CouponOrderTableMap extends TableMap * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 */ protected static $fieldKeys = array ( - self::TYPE_PHPNAME => array('Id' => 0, 'OrderId' => 1, 'Code' => 2, 'Value' => 3, 'CreatedAt' => 4, 'UpdatedAt' => 5, ), - self::TYPE_STUDLYPHPNAME => array('id' => 0, 'orderId' => 1, 'code' => 2, 'value' => 3, 'createdAt' => 4, 'updatedAt' => 5, ), - self::TYPE_COLNAME => array(CouponOrderTableMap::ID => 0, CouponOrderTableMap::ORDER_ID => 1, CouponOrderTableMap::CODE => 2, CouponOrderTableMap::VALUE => 3, CouponOrderTableMap::CREATED_AT => 4, CouponOrderTableMap::UPDATED_AT => 5, ), - self::TYPE_RAW_COLNAME => array('ID' => 0, 'ORDER_ID' => 1, 'CODE' => 2, 'VALUE' => 3, 'CREATED_AT' => 4, 'UPDATED_AT' => 5, ), - self::TYPE_FIELDNAME => array('id' => 0, 'order_id' => 1, 'code' => 2, 'value' => 3, 'created_at' => 4, 'updated_at' => 5, ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, ) + self::TYPE_PHPNAME => array('Id' => 0, 'OrderId' => 1, 'Value' => 2, 'CreatedAt' => 3, 'UpdatedAt' => 4, ), + self::TYPE_STUDLYPHPNAME => array('id' => 0, 'orderId' => 1, 'value' => 2, 'createdAt' => 3, 'updatedAt' => 4, ), + self::TYPE_COLNAME => array(CouponOrderTableMap::ID => 0, CouponOrderTableMap::ORDER_ID => 1, CouponOrderTableMap::VALUE => 2, CouponOrderTableMap::CREATED_AT => 3, CouponOrderTableMap::UPDATED_AT => 4, ), + self::TYPE_RAW_COLNAME => array('ID' => 0, 'ORDER_ID' => 1, 'VALUE' => 2, 'CREATED_AT' => 3, 'UPDATED_AT' => 4, ), + self::TYPE_FIELDNAME => array('id' => 0, 'order_id' => 1, 'value' => 2, 'created_at' => 3, 'updated_at' => 4, ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, ) ); /** @@ -152,7 +147,6 @@ class CouponOrderTableMap extends TableMap // columns $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null); $this->addForeignKey('ORDER_ID', 'OrderId', 'INTEGER', 'order', 'ID', true, null, null); - $this->addForeignKey('CODE', 'Code', 'VARCHAR', 'coupon', 'CODE', true, 45, null); $this->addColumn('VALUE', 'Value', 'FLOAT', true, null, null); $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null); $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null); @@ -164,7 +158,6 @@ class CouponOrderTableMap extends TableMap public function buildRelations() { $this->addRelation('Order', '\\Thelia\\Model\\Order', RelationMap::MANY_TO_ONE, array('order_id' => 'id', ), 'CASCADE', 'RESTRICT'); - $this->addRelation('Coupon', '\\Thelia\\Model\\Coupon', RelationMap::MANY_TO_ONE, array('code' => 'code', ), null, null); } // buildRelations() /** @@ -320,14 +313,12 @@ class CouponOrderTableMap extends TableMap if (null === $alias) { $criteria->addSelectColumn(CouponOrderTableMap::ID); $criteria->addSelectColumn(CouponOrderTableMap::ORDER_ID); - $criteria->addSelectColumn(CouponOrderTableMap::CODE); $criteria->addSelectColumn(CouponOrderTableMap::VALUE); $criteria->addSelectColumn(CouponOrderTableMap::CREATED_AT); $criteria->addSelectColumn(CouponOrderTableMap::UPDATED_AT); } else { $criteria->addSelectColumn($alias . '.ID'); $criteria->addSelectColumn($alias . '.ORDER_ID'); - $criteria->addSelectColumn($alias . '.CODE'); $criteria->addSelectColumn($alias . '.VALUE'); $criteria->addSelectColumn($alias . '.CREATED_AT'); $criteria->addSelectColumn($alias . '.UPDATED_AT'); diff --git a/core/lib/Thelia/Model/Map/CouponTableMap.php b/core/lib/Thelia/Model/Map/CouponTableMap.php index d3ba620bf..36daa1204 100755 --- a/core/lib/Thelia/Model/Map/CouponTableMap.php +++ b/core/lib/Thelia/Model/Map/CouponTableMap.php @@ -57,7 +57,7 @@ class CouponTableMap extends TableMap /** * The total number of columns */ - const NUM_COLUMNS = 18; + const NUM_COLUMNS = 15; /** * The number of lazy-loaded columns @@ -67,7 +67,7 @@ class CouponTableMap extends TableMap /** * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS) */ - const NUM_HYDRATE_COLUMNS = 18; + const NUM_HYDRATE_COLUMNS = 15; /** * the column name for the ID field @@ -84,21 +84,6 @@ class CouponTableMap extends TableMap */ const TYPE = 'coupon.TYPE'; - /** - * the column name for the TITLE field - */ - const TITLE = 'coupon.TITLE'; - - /** - * the column name for the SHORT_DESCRIPTION field - */ - const SHORT_DESCRIPTION = 'coupon.SHORT_DESCRIPTION'; - - /** - * the column name for the DESCRIPTION field - */ - const DESCRIPTION = 'coupon.DESCRIPTION'; - /** * the column name for the AMOUNT field */ @@ -180,12 +165,12 @@ class CouponTableMap extends TableMap * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ protected static $fieldNames = array ( - self::TYPE_PHPNAME => array('Id', 'Code', 'Type', 'Title', 'ShortDescription', 'Description', 'Amount', 'IsUsed', 'IsEnabled', 'ExpirationDate', 'SerializedRules', 'IsCumulative', 'IsRemovingPostage', 'MaxUsage', 'IsAvailableOnSpecialOffers', 'CreatedAt', 'UpdatedAt', 'Version', ), - self::TYPE_STUDLYPHPNAME => array('id', 'code', 'type', 'title', 'shortDescription', 'description', 'amount', 'isUsed', 'isEnabled', 'expirationDate', 'serializedRules', 'isCumulative', 'isRemovingPostage', 'maxUsage', 'isAvailableOnSpecialOffers', 'createdAt', 'updatedAt', 'version', ), - self::TYPE_COLNAME => array(CouponTableMap::ID, CouponTableMap::CODE, CouponTableMap::TYPE, CouponTableMap::TITLE, CouponTableMap::SHORT_DESCRIPTION, CouponTableMap::DESCRIPTION, CouponTableMap::AMOUNT, CouponTableMap::IS_USED, CouponTableMap::IS_ENABLED, CouponTableMap::EXPIRATION_DATE, CouponTableMap::SERIALIZED_RULES, CouponTableMap::IS_CUMULATIVE, CouponTableMap::IS_REMOVING_POSTAGE, CouponTableMap::MAX_USAGE, CouponTableMap::IS_AVAILABLE_ON_SPECIAL_OFFERS, CouponTableMap::CREATED_AT, CouponTableMap::UPDATED_AT, CouponTableMap::VERSION, ), - self::TYPE_RAW_COLNAME => array('ID', 'CODE', 'TYPE', 'TITLE', 'SHORT_DESCRIPTION', 'DESCRIPTION', 'AMOUNT', 'IS_USED', 'IS_ENABLED', 'EXPIRATION_DATE', 'SERIALIZED_RULES', 'IS_CUMULATIVE', 'IS_REMOVING_POSTAGE', 'MAX_USAGE', 'IS_AVAILABLE_ON_SPECIAL_OFFERS', 'CREATED_AT', 'UPDATED_AT', 'VERSION', ), - self::TYPE_FIELDNAME => array('id', 'code', 'type', 'title', 'short_description', 'description', 'amount', 'is_used', 'is_enabled', 'expiration_date', 'serialized_rules', 'is_cumulative', 'is_removing_postage', 'max_usage', 'is_available_on_special_offers', 'created_at', 'updated_at', 'version', ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, ) + self::TYPE_PHPNAME => array('Id', 'Code', 'Type', 'Amount', 'IsUsed', 'IsEnabled', 'ExpirationDate', 'SerializedRules', 'IsCumulative', 'IsRemovingPostage', 'MaxUsage', 'IsAvailableOnSpecialOffers', 'CreatedAt', 'UpdatedAt', 'Version', ), + self::TYPE_STUDLYPHPNAME => array('id', 'code', 'type', 'amount', 'isUsed', 'isEnabled', 'expirationDate', 'serializedRules', 'isCumulative', 'isRemovingPostage', 'maxUsage', 'isAvailableOnSpecialOffers', 'createdAt', 'updatedAt', 'version', ), + self::TYPE_COLNAME => array(CouponTableMap::ID, CouponTableMap::CODE, CouponTableMap::TYPE, CouponTableMap::AMOUNT, CouponTableMap::IS_USED, CouponTableMap::IS_ENABLED, CouponTableMap::EXPIRATION_DATE, CouponTableMap::SERIALIZED_RULES, CouponTableMap::IS_CUMULATIVE, CouponTableMap::IS_REMOVING_POSTAGE, CouponTableMap::MAX_USAGE, CouponTableMap::IS_AVAILABLE_ON_SPECIAL_OFFERS, CouponTableMap::CREATED_AT, CouponTableMap::UPDATED_AT, CouponTableMap::VERSION, ), + self::TYPE_RAW_COLNAME => array('ID', 'CODE', 'TYPE', 'AMOUNT', 'IS_USED', 'IS_ENABLED', 'EXPIRATION_DATE', 'SERIALIZED_RULES', 'IS_CUMULATIVE', 'IS_REMOVING_POSTAGE', 'MAX_USAGE', 'IS_AVAILABLE_ON_SPECIAL_OFFERS', 'CREATED_AT', 'UPDATED_AT', 'VERSION', ), + self::TYPE_FIELDNAME => array('id', 'code', 'type', 'amount', 'is_used', 'is_enabled', 'expiration_date', 'serialized_rules', 'is_cumulative', 'is_removing_postage', 'max_usage', 'is_available_on_special_offers', 'created_at', 'updated_at', 'version', ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, ) ); /** @@ -195,12 +180,12 @@ class CouponTableMap extends TableMap * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 */ protected static $fieldKeys = array ( - self::TYPE_PHPNAME => array('Id' => 0, 'Code' => 1, 'Type' => 2, 'Title' => 3, 'ShortDescription' => 4, 'Description' => 5, 'Amount' => 6, 'IsUsed' => 7, 'IsEnabled' => 8, 'ExpirationDate' => 9, 'SerializedRules' => 10, 'IsCumulative' => 11, 'IsRemovingPostage' => 12, 'MaxUsage' => 13, 'IsAvailableOnSpecialOffers' => 14, 'CreatedAt' => 15, 'UpdatedAt' => 16, 'Version' => 17, ), - self::TYPE_STUDLYPHPNAME => array('id' => 0, 'code' => 1, 'type' => 2, 'title' => 3, 'shortDescription' => 4, 'description' => 5, 'amount' => 6, 'isUsed' => 7, 'isEnabled' => 8, 'expirationDate' => 9, 'serializedRules' => 10, 'isCumulative' => 11, 'isRemovingPostage' => 12, 'maxUsage' => 13, 'isAvailableOnSpecialOffers' => 14, 'createdAt' => 15, 'updatedAt' => 16, 'version' => 17, ), - self::TYPE_COLNAME => array(CouponTableMap::ID => 0, CouponTableMap::CODE => 1, CouponTableMap::TYPE => 2, CouponTableMap::TITLE => 3, CouponTableMap::SHORT_DESCRIPTION => 4, CouponTableMap::DESCRIPTION => 5, CouponTableMap::AMOUNT => 6, CouponTableMap::IS_USED => 7, CouponTableMap::IS_ENABLED => 8, CouponTableMap::EXPIRATION_DATE => 9, CouponTableMap::SERIALIZED_RULES => 10, CouponTableMap::IS_CUMULATIVE => 11, CouponTableMap::IS_REMOVING_POSTAGE => 12, CouponTableMap::MAX_USAGE => 13, CouponTableMap::IS_AVAILABLE_ON_SPECIAL_OFFERS => 14, CouponTableMap::CREATED_AT => 15, CouponTableMap::UPDATED_AT => 16, CouponTableMap::VERSION => 17, ), - self::TYPE_RAW_COLNAME => array('ID' => 0, 'CODE' => 1, 'TYPE' => 2, 'TITLE' => 3, 'SHORT_DESCRIPTION' => 4, 'DESCRIPTION' => 5, 'AMOUNT' => 6, 'IS_USED' => 7, 'IS_ENABLED' => 8, 'EXPIRATION_DATE' => 9, 'SERIALIZED_RULES' => 10, 'IS_CUMULATIVE' => 11, 'IS_REMOVING_POSTAGE' => 12, 'MAX_USAGE' => 13, 'IS_AVAILABLE_ON_SPECIAL_OFFERS' => 14, 'CREATED_AT' => 15, 'UPDATED_AT' => 16, 'VERSION' => 17, ), - self::TYPE_FIELDNAME => array('id' => 0, 'code' => 1, 'type' => 2, 'title' => 3, 'short_description' => 4, 'description' => 5, 'amount' => 6, 'is_used' => 7, 'is_enabled' => 8, 'expiration_date' => 9, 'serialized_rules' => 10, 'is_cumulative' => 11, 'is_removing_postage' => 12, 'max_usage' => 13, 'is_available_on_special_offers' => 14, 'created_at' => 15, 'updated_at' => 16, 'version' => 17, ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, ) + self::TYPE_PHPNAME => array('Id' => 0, 'Code' => 1, 'Type' => 2, 'Amount' => 3, 'IsUsed' => 4, 'IsEnabled' => 5, 'ExpirationDate' => 6, 'SerializedRules' => 7, 'IsCumulative' => 8, 'IsRemovingPostage' => 9, 'MaxUsage' => 10, 'IsAvailableOnSpecialOffers' => 11, 'CreatedAt' => 12, 'UpdatedAt' => 13, 'Version' => 14, ), + self::TYPE_STUDLYPHPNAME => array('id' => 0, 'code' => 1, 'type' => 2, 'amount' => 3, 'isUsed' => 4, 'isEnabled' => 5, 'expirationDate' => 6, 'serializedRules' => 7, 'isCumulative' => 8, 'isRemovingPostage' => 9, 'maxUsage' => 10, 'isAvailableOnSpecialOffers' => 11, 'createdAt' => 12, 'updatedAt' => 13, 'version' => 14, ), + self::TYPE_COLNAME => array(CouponTableMap::ID => 0, CouponTableMap::CODE => 1, CouponTableMap::TYPE => 2, CouponTableMap::AMOUNT => 3, CouponTableMap::IS_USED => 4, CouponTableMap::IS_ENABLED => 5, CouponTableMap::EXPIRATION_DATE => 6, CouponTableMap::SERIALIZED_RULES => 7, CouponTableMap::IS_CUMULATIVE => 8, CouponTableMap::IS_REMOVING_POSTAGE => 9, CouponTableMap::MAX_USAGE => 10, CouponTableMap::IS_AVAILABLE_ON_SPECIAL_OFFERS => 11, CouponTableMap::CREATED_AT => 12, CouponTableMap::UPDATED_AT => 13, CouponTableMap::VERSION => 14, ), + self::TYPE_RAW_COLNAME => array('ID' => 0, 'CODE' => 1, 'TYPE' => 2, 'AMOUNT' => 3, 'IS_USED' => 4, 'IS_ENABLED' => 5, 'EXPIRATION_DATE' => 6, 'SERIALIZED_RULES' => 7, 'IS_CUMULATIVE' => 8, 'IS_REMOVING_POSTAGE' => 9, 'MAX_USAGE' => 10, 'IS_AVAILABLE_ON_SPECIAL_OFFERS' => 11, 'CREATED_AT' => 12, 'UPDATED_AT' => 13, 'VERSION' => 14, ), + self::TYPE_FIELDNAME => array('id' => 0, 'code' => 1, 'type' => 2, 'amount' => 3, 'is_used' => 4, 'is_enabled' => 5, 'expiration_date' => 6, 'serialized_rules' => 7, 'is_cumulative' => 8, 'is_removing_postage' => 9, 'max_usage' => 10, 'is_available_on_special_offers' => 11, 'created_at' => 12, 'updated_at' => 13, 'version' => 14, ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, ) ); /** @@ -222,9 +207,6 @@ class CouponTableMap extends TableMap $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null); $this->addColumn('CODE', 'Code', 'VARCHAR', true, 45, null); $this->addColumn('TYPE', 'Type', 'VARCHAR', true, 255, null); - $this->addColumn('TITLE', 'Title', 'VARCHAR', true, 255, null); - $this->addColumn('SHORT_DESCRIPTION', 'ShortDescription', 'LONGVARCHAR', true, null, null); - $this->addColumn('DESCRIPTION', 'Description', 'CLOB', true, null, null); $this->addColumn('AMOUNT', 'Amount', 'FLOAT', true, null, null); $this->addColumn('IS_USED', 'IsUsed', 'TINYINT', true, null, null); $this->addColumn('IS_ENABLED', 'IsEnabled', 'TINYINT', true, null, null); @@ -244,7 +226,6 @@ class CouponTableMap extends TableMap */ public function buildRelations() { - $this->addRelation('CouponOrder', '\\Thelia\\Model\\CouponOrder', RelationMap::ONE_TO_MANY, array('code' => 'code', ), null, null, 'CouponOrders'); $this->addRelation('CouponI18n', '\\Thelia\\Model\\CouponI18n', RelationMap::ONE_TO_MANY, array('id' => 'id', ), 'CASCADE', null, 'CouponI18ns'); $this->addRelation('CouponVersion', '\\Thelia\\Model\\CouponVersion', RelationMap::ONE_TO_MANY, array('id' => 'id', ), 'CASCADE', null, 'CouponVersions'); } // buildRelations() @@ -259,7 +240,7 @@ class CouponTableMap extends TableMap { return array( 'timestampable' => array('create_column' => 'created_at', 'update_column' => 'updated_at', ), - 'i18n' => array('i18n_table' => '%TABLE%_i18n', 'i18n_phpname' => '%PHPNAME%I18n', 'i18n_columns' => '', 'locale_column' => 'locale', 'locale_length' => '5', 'default_locale' => '', 'locale_alias' => '', ), + 'i18n' => array('i18n_table' => '%TABLE%_i18n', 'i18n_phpname' => '%PHPNAME%I18n', 'i18n_columns' => 'title, short_description, description', 'locale_column' => 'locale', 'locale_length' => '5', 'default_locale' => '', 'locale_alias' => '', ), 'versionable' => array('version_column' => 'version', 'version_table' => '', 'log_created_at' => 'false', 'log_created_by' => 'false', 'log_comment' => 'false', 'version_created_at_column' => 'version_created_at', 'version_created_by_column' => 'version_created_by', 'version_comment_column' => 'version_comment', ), ); } // getBehaviors() @@ -415,9 +396,6 @@ class CouponTableMap extends TableMap $criteria->addSelectColumn(CouponTableMap::ID); $criteria->addSelectColumn(CouponTableMap::CODE); $criteria->addSelectColumn(CouponTableMap::TYPE); - $criteria->addSelectColumn(CouponTableMap::TITLE); - $criteria->addSelectColumn(CouponTableMap::SHORT_DESCRIPTION); - $criteria->addSelectColumn(CouponTableMap::DESCRIPTION); $criteria->addSelectColumn(CouponTableMap::AMOUNT); $criteria->addSelectColumn(CouponTableMap::IS_USED); $criteria->addSelectColumn(CouponTableMap::IS_ENABLED); @@ -434,9 +412,6 @@ class CouponTableMap extends TableMap $criteria->addSelectColumn($alias . '.ID'); $criteria->addSelectColumn($alias . '.CODE'); $criteria->addSelectColumn($alias . '.TYPE'); - $criteria->addSelectColumn($alias . '.TITLE'); - $criteria->addSelectColumn($alias . '.SHORT_DESCRIPTION'); - $criteria->addSelectColumn($alias . '.DESCRIPTION'); $criteria->addSelectColumn($alias . '.AMOUNT'); $criteria->addSelectColumn($alias . '.IS_USED'); $criteria->addSelectColumn($alias . '.IS_ENABLED'); diff --git a/core/lib/Thelia/Model/Map/CouponVersionTableMap.php b/core/lib/Thelia/Model/Map/CouponVersionTableMap.php index 9db387a86..30ce279b8 100644 --- a/core/lib/Thelia/Model/Map/CouponVersionTableMap.php +++ b/core/lib/Thelia/Model/Map/CouponVersionTableMap.php @@ -57,7 +57,7 @@ class CouponVersionTableMap extends TableMap /** * The total number of columns */ - const NUM_COLUMNS = 18; + const NUM_COLUMNS = 15; /** * The number of lazy-loaded columns @@ -67,7 +67,7 @@ class CouponVersionTableMap extends TableMap /** * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS) */ - const NUM_HYDRATE_COLUMNS = 18; + const NUM_HYDRATE_COLUMNS = 15; /** * the column name for the ID field @@ -84,21 +84,6 @@ class CouponVersionTableMap extends TableMap */ const TYPE = 'coupon_version.TYPE'; - /** - * the column name for the TITLE field - */ - const TITLE = 'coupon_version.TITLE'; - - /** - * the column name for the SHORT_DESCRIPTION field - */ - const SHORT_DESCRIPTION = 'coupon_version.SHORT_DESCRIPTION'; - - /** - * the column name for the DESCRIPTION field - */ - const DESCRIPTION = 'coupon_version.DESCRIPTION'; - /** * the column name for the AMOUNT field */ @@ -171,12 +156,12 @@ class CouponVersionTableMap extends TableMap * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ protected static $fieldNames = array ( - self::TYPE_PHPNAME => array('Id', 'Code', 'Type', 'Title', 'ShortDescription', 'Description', 'Amount', 'IsUsed', 'IsEnabled', 'ExpirationDate', 'SerializedRules', 'IsCumulative', 'IsRemovingPostage', 'MaxUsage', 'IsAvailableOnSpecialOffers', 'CreatedAt', 'UpdatedAt', 'Version', ), - self::TYPE_STUDLYPHPNAME => array('id', 'code', 'type', 'title', 'shortDescription', 'description', 'amount', 'isUsed', 'isEnabled', 'expirationDate', 'serializedRules', 'isCumulative', 'isRemovingPostage', 'maxUsage', 'isAvailableOnSpecialOffers', 'createdAt', 'updatedAt', 'version', ), - self::TYPE_COLNAME => array(CouponVersionTableMap::ID, CouponVersionTableMap::CODE, CouponVersionTableMap::TYPE, CouponVersionTableMap::TITLE, CouponVersionTableMap::SHORT_DESCRIPTION, CouponVersionTableMap::DESCRIPTION, CouponVersionTableMap::AMOUNT, CouponVersionTableMap::IS_USED, CouponVersionTableMap::IS_ENABLED, CouponVersionTableMap::EXPIRATION_DATE, CouponVersionTableMap::SERIALIZED_RULES, CouponVersionTableMap::IS_CUMULATIVE, CouponVersionTableMap::IS_REMOVING_POSTAGE, CouponVersionTableMap::MAX_USAGE, CouponVersionTableMap::IS_AVAILABLE_ON_SPECIAL_OFFERS, CouponVersionTableMap::CREATED_AT, CouponVersionTableMap::UPDATED_AT, CouponVersionTableMap::VERSION, ), - self::TYPE_RAW_COLNAME => array('ID', 'CODE', 'TYPE', 'TITLE', 'SHORT_DESCRIPTION', 'DESCRIPTION', 'AMOUNT', 'IS_USED', 'IS_ENABLED', 'EXPIRATION_DATE', 'SERIALIZED_RULES', 'IS_CUMULATIVE', 'IS_REMOVING_POSTAGE', 'MAX_USAGE', 'IS_AVAILABLE_ON_SPECIAL_OFFERS', 'CREATED_AT', 'UPDATED_AT', 'VERSION', ), - self::TYPE_FIELDNAME => array('id', 'code', 'type', 'title', 'short_description', 'description', 'amount', 'is_used', 'is_enabled', 'expiration_date', 'serialized_rules', 'is_cumulative', 'is_removing_postage', 'max_usage', 'is_available_on_special_offers', 'created_at', 'updated_at', 'version', ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, ) + self::TYPE_PHPNAME => array('Id', 'Code', 'Type', 'Amount', 'IsUsed', 'IsEnabled', 'ExpirationDate', 'SerializedRules', 'IsCumulative', 'IsRemovingPostage', 'MaxUsage', 'IsAvailableOnSpecialOffers', 'CreatedAt', 'UpdatedAt', 'Version', ), + self::TYPE_STUDLYPHPNAME => array('id', 'code', 'type', 'amount', 'isUsed', 'isEnabled', 'expirationDate', 'serializedRules', 'isCumulative', 'isRemovingPostage', 'maxUsage', 'isAvailableOnSpecialOffers', 'createdAt', 'updatedAt', 'version', ), + self::TYPE_COLNAME => array(CouponVersionTableMap::ID, CouponVersionTableMap::CODE, CouponVersionTableMap::TYPE, CouponVersionTableMap::AMOUNT, CouponVersionTableMap::IS_USED, CouponVersionTableMap::IS_ENABLED, CouponVersionTableMap::EXPIRATION_DATE, CouponVersionTableMap::SERIALIZED_RULES, CouponVersionTableMap::IS_CUMULATIVE, CouponVersionTableMap::IS_REMOVING_POSTAGE, CouponVersionTableMap::MAX_USAGE, CouponVersionTableMap::IS_AVAILABLE_ON_SPECIAL_OFFERS, CouponVersionTableMap::CREATED_AT, CouponVersionTableMap::UPDATED_AT, CouponVersionTableMap::VERSION, ), + self::TYPE_RAW_COLNAME => array('ID', 'CODE', 'TYPE', 'AMOUNT', 'IS_USED', 'IS_ENABLED', 'EXPIRATION_DATE', 'SERIALIZED_RULES', 'IS_CUMULATIVE', 'IS_REMOVING_POSTAGE', 'MAX_USAGE', 'IS_AVAILABLE_ON_SPECIAL_OFFERS', 'CREATED_AT', 'UPDATED_AT', 'VERSION', ), + self::TYPE_FIELDNAME => array('id', 'code', 'type', 'amount', 'is_used', 'is_enabled', 'expiration_date', 'serialized_rules', 'is_cumulative', 'is_removing_postage', 'max_usage', 'is_available_on_special_offers', 'created_at', 'updated_at', 'version', ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, ) ); /** @@ -186,12 +171,12 @@ class CouponVersionTableMap extends TableMap * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 */ protected static $fieldKeys = array ( - self::TYPE_PHPNAME => array('Id' => 0, 'Code' => 1, 'Type' => 2, 'Title' => 3, 'ShortDescription' => 4, 'Description' => 5, 'Amount' => 6, 'IsUsed' => 7, 'IsEnabled' => 8, 'ExpirationDate' => 9, 'SerializedRules' => 10, 'IsCumulative' => 11, 'IsRemovingPostage' => 12, 'MaxUsage' => 13, 'IsAvailableOnSpecialOffers' => 14, 'CreatedAt' => 15, 'UpdatedAt' => 16, 'Version' => 17, ), - self::TYPE_STUDLYPHPNAME => array('id' => 0, 'code' => 1, 'type' => 2, 'title' => 3, 'shortDescription' => 4, 'description' => 5, 'amount' => 6, 'isUsed' => 7, 'isEnabled' => 8, 'expirationDate' => 9, 'serializedRules' => 10, 'isCumulative' => 11, 'isRemovingPostage' => 12, 'maxUsage' => 13, 'isAvailableOnSpecialOffers' => 14, 'createdAt' => 15, 'updatedAt' => 16, 'version' => 17, ), - self::TYPE_COLNAME => array(CouponVersionTableMap::ID => 0, CouponVersionTableMap::CODE => 1, CouponVersionTableMap::TYPE => 2, CouponVersionTableMap::TITLE => 3, CouponVersionTableMap::SHORT_DESCRIPTION => 4, CouponVersionTableMap::DESCRIPTION => 5, CouponVersionTableMap::AMOUNT => 6, CouponVersionTableMap::IS_USED => 7, CouponVersionTableMap::IS_ENABLED => 8, CouponVersionTableMap::EXPIRATION_DATE => 9, CouponVersionTableMap::SERIALIZED_RULES => 10, CouponVersionTableMap::IS_CUMULATIVE => 11, CouponVersionTableMap::IS_REMOVING_POSTAGE => 12, CouponVersionTableMap::MAX_USAGE => 13, CouponVersionTableMap::IS_AVAILABLE_ON_SPECIAL_OFFERS => 14, CouponVersionTableMap::CREATED_AT => 15, CouponVersionTableMap::UPDATED_AT => 16, CouponVersionTableMap::VERSION => 17, ), - self::TYPE_RAW_COLNAME => array('ID' => 0, 'CODE' => 1, 'TYPE' => 2, 'TITLE' => 3, 'SHORT_DESCRIPTION' => 4, 'DESCRIPTION' => 5, 'AMOUNT' => 6, 'IS_USED' => 7, 'IS_ENABLED' => 8, 'EXPIRATION_DATE' => 9, 'SERIALIZED_RULES' => 10, 'IS_CUMULATIVE' => 11, 'IS_REMOVING_POSTAGE' => 12, 'MAX_USAGE' => 13, 'IS_AVAILABLE_ON_SPECIAL_OFFERS' => 14, 'CREATED_AT' => 15, 'UPDATED_AT' => 16, 'VERSION' => 17, ), - self::TYPE_FIELDNAME => array('id' => 0, 'code' => 1, 'type' => 2, 'title' => 3, 'short_description' => 4, 'description' => 5, 'amount' => 6, 'is_used' => 7, 'is_enabled' => 8, 'expiration_date' => 9, 'serialized_rules' => 10, 'is_cumulative' => 11, 'is_removing_postage' => 12, 'max_usage' => 13, 'is_available_on_special_offers' => 14, 'created_at' => 15, 'updated_at' => 16, 'version' => 17, ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, ) + self::TYPE_PHPNAME => array('Id' => 0, 'Code' => 1, 'Type' => 2, 'Amount' => 3, 'IsUsed' => 4, 'IsEnabled' => 5, 'ExpirationDate' => 6, 'SerializedRules' => 7, 'IsCumulative' => 8, 'IsRemovingPostage' => 9, 'MaxUsage' => 10, 'IsAvailableOnSpecialOffers' => 11, 'CreatedAt' => 12, 'UpdatedAt' => 13, 'Version' => 14, ), + self::TYPE_STUDLYPHPNAME => array('id' => 0, 'code' => 1, 'type' => 2, 'amount' => 3, 'isUsed' => 4, 'isEnabled' => 5, 'expirationDate' => 6, 'serializedRules' => 7, 'isCumulative' => 8, 'isRemovingPostage' => 9, 'maxUsage' => 10, 'isAvailableOnSpecialOffers' => 11, 'createdAt' => 12, 'updatedAt' => 13, 'version' => 14, ), + self::TYPE_COLNAME => array(CouponVersionTableMap::ID => 0, CouponVersionTableMap::CODE => 1, CouponVersionTableMap::TYPE => 2, CouponVersionTableMap::AMOUNT => 3, CouponVersionTableMap::IS_USED => 4, CouponVersionTableMap::IS_ENABLED => 5, CouponVersionTableMap::EXPIRATION_DATE => 6, CouponVersionTableMap::SERIALIZED_RULES => 7, CouponVersionTableMap::IS_CUMULATIVE => 8, CouponVersionTableMap::IS_REMOVING_POSTAGE => 9, CouponVersionTableMap::MAX_USAGE => 10, CouponVersionTableMap::IS_AVAILABLE_ON_SPECIAL_OFFERS => 11, CouponVersionTableMap::CREATED_AT => 12, CouponVersionTableMap::UPDATED_AT => 13, CouponVersionTableMap::VERSION => 14, ), + self::TYPE_RAW_COLNAME => array('ID' => 0, 'CODE' => 1, 'TYPE' => 2, 'AMOUNT' => 3, 'IS_USED' => 4, 'IS_ENABLED' => 5, 'EXPIRATION_DATE' => 6, 'SERIALIZED_RULES' => 7, 'IS_CUMULATIVE' => 8, 'IS_REMOVING_POSTAGE' => 9, 'MAX_USAGE' => 10, 'IS_AVAILABLE_ON_SPECIAL_OFFERS' => 11, 'CREATED_AT' => 12, 'UPDATED_AT' => 13, 'VERSION' => 14, ), + self::TYPE_FIELDNAME => array('id' => 0, 'code' => 1, 'type' => 2, 'amount' => 3, 'is_used' => 4, 'is_enabled' => 5, 'expiration_date' => 6, 'serialized_rules' => 7, 'is_cumulative' => 8, 'is_removing_postage' => 9, 'max_usage' => 10, 'is_available_on_special_offers' => 11, 'created_at' => 12, 'updated_at' => 13, 'version' => 14, ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, ) ); /** @@ -213,9 +198,6 @@ class CouponVersionTableMap extends TableMap $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'coupon', 'ID', true, null, null); $this->addColumn('CODE', 'Code', 'VARCHAR', true, 45, null); $this->addColumn('TYPE', 'Type', 'VARCHAR', true, 255, null); - $this->addColumn('TITLE', 'Title', 'VARCHAR', true, 255, null); - $this->addColumn('SHORT_DESCRIPTION', 'ShortDescription', 'LONGVARCHAR', true, null, null); - $this->addColumn('DESCRIPTION', 'Description', 'CLOB', true, null, null); $this->addColumn('AMOUNT', 'Amount', 'FLOAT', true, null, null); $this->addColumn('IS_USED', 'IsUsed', 'TINYINT', true, null, null); $this->addColumn('IS_ENABLED', 'IsEnabled', 'TINYINT', true, null, null); @@ -305,11 +287,11 @@ class CouponVersionTableMap extends TableMap public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { // If the PK cannot be derived from the row, return NULL. - if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 17 + $offset : static::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)] === null) { + if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 14 + $offset : static::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)] === null) { return null; } - return serialize(array((string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 17 + $offset : static::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)])); + return serialize(array((string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 14 + $offset : static::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)])); } /** @@ -428,9 +410,6 @@ class CouponVersionTableMap extends TableMap $criteria->addSelectColumn(CouponVersionTableMap::ID); $criteria->addSelectColumn(CouponVersionTableMap::CODE); $criteria->addSelectColumn(CouponVersionTableMap::TYPE); - $criteria->addSelectColumn(CouponVersionTableMap::TITLE); - $criteria->addSelectColumn(CouponVersionTableMap::SHORT_DESCRIPTION); - $criteria->addSelectColumn(CouponVersionTableMap::DESCRIPTION); $criteria->addSelectColumn(CouponVersionTableMap::AMOUNT); $criteria->addSelectColumn(CouponVersionTableMap::IS_USED); $criteria->addSelectColumn(CouponVersionTableMap::IS_ENABLED); @@ -447,9 +426,6 @@ class CouponVersionTableMap extends TableMap $criteria->addSelectColumn($alias . '.ID'); $criteria->addSelectColumn($alias . '.CODE'); $criteria->addSelectColumn($alias . '.TYPE'); - $criteria->addSelectColumn($alias . '.TITLE'); - $criteria->addSelectColumn($alias . '.SHORT_DESCRIPTION'); - $criteria->addSelectColumn($alias . '.DESCRIPTION'); $criteria->addSelectColumn($alias . '.AMOUNT'); $criteria->addSelectColumn($alias . '.IS_USED'); $criteria->addSelectColumn($alias . '.IS_ENABLED'); diff --git a/core/lib/Thelia/Model/Map/FolderTableMap.php b/core/lib/Thelia/Model/Map/FolderTableMap.php index 7f4dde6d0..08871715b 100755 --- a/core/lib/Thelia/Model/Map/FolderTableMap.php +++ b/core/lib/Thelia/Model/Map/FolderTableMap.php @@ -190,6 +190,7 @@ class FolderTableMap extends TableMap */ public function buildRelations() { + $this->addRelation('Rewriting', '\\Thelia\\Model\\Rewriting', RelationMap::ONE_TO_MANY, array('id' => 'folder_id', ), 'CASCADE', 'RESTRICT', 'Rewritings'); $this->addRelation('ContentFolder', '\\Thelia\\Model\\ContentFolder', RelationMap::ONE_TO_MANY, array('id' => 'folder_id', ), 'CASCADE', 'RESTRICT', 'ContentFolders'); $this->addRelation('FolderImage', '\\Thelia\\Model\\FolderImage', RelationMap::ONE_TO_MANY, array('id' => 'folder_id', ), 'CASCADE', 'RESTRICT', 'FolderImages'); $this->addRelation('FolderDocument', '\\Thelia\\Model\\FolderDocument', RelationMap::ONE_TO_MANY, array('id' => 'folder_id', ), 'CASCADE', 'RESTRICT', 'FolderDocuments'); @@ -219,6 +220,7 @@ class FolderTableMap extends TableMap { // Invalidate objects in ".$this->getClassNameFromBuilder($joinedTableTableMapBuilder)." instance pool, // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule. + RewritingTableMap::clearInstancePool(); ContentFolderTableMap::clearInstancePool(); FolderImageTableMap::clearInstancePool(); FolderDocumentTableMap::clearInstancePool(); diff --git a/core/lib/Thelia/Model/Map/ProductTableMap.php b/core/lib/Thelia/Model/Map/ProductTableMap.php index 1d46d483e..81badfba0 100755 --- a/core/lib/Thelia/Model/Map/ProductTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductTableMap.php @@ -204,6 +204,7 @@ class ProductTableMap extends TableMap $this->addRelation('ProductDocument', '\\Thelia\\Model\\ProductDocument', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), 'CASCADE', 'RESTRICT', 'ProductDocuments'); $this->addRelation('AccessoryRelatedByProductId', '\\Thelia\\Model\\Accessory', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), 'CASCADE', 'RESTRICT', 'AccessoriesRelatedByProductId'); $this->addRelation('AccessoryRelatedByAccessory', '\\Thelia\\Model\\Accessory', RelationMap::ONE_TO_MANY, array('id' => 'accessory', ), 'CASCADE', 'RESTRICT', 'AccessoriesRelatedByAccessory'); + $this->addRelation('Rewriting', '\\Thelia\\Model\\Rewriting', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), 'CASCADE', 'RESTRICT', 'Rewritings'); $this->addRelation('CartItem', '\\Thelia\\Model\\CartItem', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), null, null, 'CartItems'); $this->addRelation('ProductAssociatedContent', '\\Thelia\\Model\\ProductAssociatedContent', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), 'CASCADE', 'RESTRICT', 'ProductAssociatedContents'); $this->addRelation('ProductI18n', '\\Thelia\\Model\\ProductI18n', RelationMap::ONE_TO_MANY, array('id' => 'id', ), 'CASCADE', null, 'ProductI18ns'); @@ -240,6 +241,7 @@ class ProductTableMap extends TableMap ProductImageTableMap::clearInstancePool(); ProductDocumentTableMap::clearInstancePool(); AccessoryTableMap::clearInstancePool(); + RewritingTableMap::clearInstancePool(); ProductAssociatedContentTableMap::clearInstancePool(); ProductI18nTableMap::clearInstancePool(); ProductVersionTableMap::clearInstancePool(); From 4b1de5fe93906712265a906ea7755d21df4dc43d Mon Sep 17 00:00:00 2001 From: gmorel Date: Mon, 2 Sep 2013 17:08:47 +0200 Subject: [PATCH 045/125] WIP - Coupon Controller --- .../Thelia/Config/Resources/routing/admin.xml | 15 + .../Controller/Admin/CategoryController.php | 12 + .../Controller/Admin/CouponController.php | 7 +- core/lib/Thelia/Tools/Rest/ResponseRest.php | 83 + install/faker.php | 48 +- install/thelia.sql | 108 +- local/config/schema.xml | 2249 ++++++++--------- templates/admin/default/coupon/read.html | 7 + 8 files changed, 1315 insertions(+), 1214 deletions(-) create mode 100644 core/lib/Thelia/Tools/Rest/ResponseRest.php diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml index 607514fa1..f3d70ac89 100755 --- a/core/lib/Thelia/Config/Resources/routing/admin.xml +++ b/core/lib/Thelia/Config/Resources/routing/admin.xml @@ -34,6 +34,16 @@ Thelia\Controller\Admin\CategoryController::processAction + + Thelia\Controller\Admin\CategoryController::getByParentIdAction + xml|json + + + + + + + @@ -53,6 +63,11 @@ read + + + + + diff --git a/core/lib/Thelia/Controller/Admin/CategoryController.php b/core/lib/Thelia/Controller/Admin/CategoryController.php index 9966034f8..582358812 100755 --- a/core/lib/Thelia/Controller/Admin/CategoryController.php +++ b/core/lib/Thelia/Controller/Admin/CategoryController.php @@ -256,4 +256,16 @@ class CategoryController extends BaseAdminController // We did not recognized the action -> return a 404 page return $this->pageNotFound(); } + + /** + * Get a Category from its parent id + * + * @return mixed|\Symfony\Component\HttpFoundation\Response + */ + public function getByParentIdAction($parentId, $_format = 'json') + { + if (null !== $response = $this->checkAuth("admin.catalog.view")) return $response; + + return $this->render('categories', $args); + } } diff --git a/core/lib/Thelia/Controller/Admin/CouponController.php b/core/lib/Thelia/Controller/Admin/CouponController.php index c372ffca3..0895c52bf 100755 --- a/core/lib/Thelia/Controller/Admin/CouponController.php +++ b/core/lib/Thelia/Controller/Admin/CouponController.php @@ -77,9 +77,12 @@ class CouponController extends BaseAdminController * * @return \Symfony\Component\HttpFoundation\Response */ - protected function createCoupon($args) + protected function createAction($args) { - $this->checkAuth("ADMIN", "admin.coupon.view"); + // Check current user authorization + if (null !== $response = $this->checkAuth("admin.coupon.create")) return $response; + + $message = false; if ($this->getRequest()->isMethod('POST')) { try { diff --git a/core/lib/Thelia/Tools/Rest/ResponseRest.php b/core/lib/Thelia/Tools/Rest/ResponseRest.php new file mode 100644 index 000000000..8618d460f --- /dev/null +++ b/core/lib/Thelia/Tools/Rest/ResponseRest.php @@ -0,0 +1,83 @@ +format = $format; + $serializer = $this->getSerializer(); + + if (isset($data)) { + $this->setContent($serializer->serialize($data, $this->format)); + } + + $this->headers->set('Content-Type', 'application/' . $this->format); + } + + /** + * Set Content to be serialized in the response, array or object + * + * @param array $data array or object to be serialized + * + * @return $this + */ + public function setRestContent($data) + { + $serializer = $this->getSerializer(); + + if (isset($data)) { + $this->setContent($serializer->serialize($data, $this->format)); + } + + return $this; + } + + /** + * Get Serializer + * + * @return Serializer + */ + protected function getSerializer() + { + $encoders = array(new XmlEncoder(), new JsonEncoder()); + $normalizers = array(new GetSetMethodNormalizer()); + + return new Serializer($normalizers, $encoders); + } + +} diff --git a/install/faker.php b/install/faker.php index 8ba653bec..50317386d 100755 --- a/install/faker.php +++ b/install/faker.php @@ -516,31 +516,31 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua $date = new \DateTime(); $coupon1->setExpirationDate($date->setTimestamp(strtotime("today + 2 months"))); - $rule1 = new Thelia\Coupon\Rule\AvailableForTotalAmount( - array( - Thelia\Coupon\Rule\AvailableForTotalAmount::PARAM1_PRICE => new Thelia\Coupon\Parameter\RuleValidator( - Thelia\Coupon\Rule\Operators::SUPERIOR, - new Thelia\Coupon\Parameter\PriceParam( - 40.00, - 'EUR' - ) - ) - ) - ); - $rule2 = new Thelia\Coupon\Rule\AvailableForTotalAmount( - array( - Thelia\Coupon\Rule\AvailableForTotalAmount::PARAM1_PRICE => new Thelia\Coupon\Parameter\RuleValidator( - Thelia\Coupon\Rule\Operators::INFERIOR, - new Thelia\Coupon\Parameter\PriceParam( - 400.00, - 'EUR' - ) - ) - ) - ); - $rules = new \Thelia\Coupon\CouponRuleCollection(array($rule1, $rule2)); +// $rule1 = new Thelia\Constraint\Rule\AvailableForTotalAmount( +// array( +// Thelia\Constraint\Rule\AvailableForTotalAmount::PARAM1_PRICE => new Thelia\Constraint\Validator\RuleValidator( +// Thelia\Constraint\Rule\Operators::SUPERIOR, +// new Thelia\Constraint\Validator\PriceParam( +// 40.00, +// 'EUR' +// ) +// ) +// ) +// ); +// $rule2 = new Thelia\Constraint\Rule\AvailableForTotalAmount( +// array( +// Thelia\Constraint\Rule\AvailableForTotalAmount::PARAM1_PRICE => new Thelia\Coupon\Parameter\RuleValidator( +// Thelia\Constraint\Rule\Operators::INFERIOR, +// new Thelia\Constraint\Parameter\PriceParam( +// 400.00, +// 'EUR' +// ) +// ) +// ) +// ); +// $rules = new \Thelia\Coupon\CouponRuleCollection(array($rule1, $rule2)); - $coupon1->setSerializedRules(base64_encode(serialize($rules))); +// $coupon1->setSerializedRules(base64_encode(serialize($rules))); $coupon1->setIsCumulative(1); $coupon1->setIsRemovingPostage(0); diff --git a/install/thelia.sql b/install/thelia.sql index 99b18513e..c27c5cd4a 100755 --- a/install/thelia.sql +++ b/install/thelia.sql @@ -1028,6 +1028,49 @@ CREATE TABLE `message` PRIMARY KEY (`id`) ) ENGINE=InnoDB; +-- --------------------------------------------------------------------- +-- rewriting +-- --------------------------------------------------------------------- + +DROP TABLE IF EXISTS `rewriting`; + +CREATE TABLE `rewriting` +( + `id` INTEGER NOT NULL, + `url` VARCHAR(255) NOT NULL, + `product_id` INTEGER, + `category_id` INTEGER, + `folder_id` INTEGER, + `content_id` INTEGER, + `created_at` DATETIME, + `updated_at` DATETIME, + PRIMARY KEY (`id`), + INDEX `idx_rewriting_product_id` (`product_id`), + INDEX `idx_rewriting_category_id` (`category_id`), + INDEX `idx_rewriting_folder_id` (`folder_id`), + INDEX `idx_rewriting_content_id` (`content_id`), + CONSTRAINT `fk_rewriting_product_id` + FOREIGN KEY (`product_id`) + REFERENCES `product` (`id`) + ON UPDATE RESTRICT + ON DELETE CASCADE, + CONSTRAINT `fk_rewriting_category_id` + FOREIGN KEY (`category_id`) + REFERENCES `category` (`id`) + ON UPDATE RESTRICT + ON DELETE CASCADE, + CONSTRAINT `fk_rewriting_folder_id` + FOREIGN KEY (`folder_id`) + REFERENCES `folder` (`id`) + ON UPDATE RESTRICT + ON DELETE CASCADE, + CONSTRAINT `fk_rewriting_content_id` + FOREIGN KEY (`content_id`) + REFERENCES `content` (`id`) + ON UPDATE RESTRICT + ON DELETE CASCADE +) ENGINE=InnoDB; + -- --------------------------------------------------------------------- -- coupon -- --------------------------------------------------------------------- @@ -1039,9 +1082,6 @@ CREATE TABLE `coupon` `id` INTEGER NOT NULL AUTO_INCREMENT, `code` VARCHAR(45) NOT NULL, `type` VARCHAR(255) NOT NULL, - `title` VARCHAR(255) NOT NULL, - `short_description` TEXT NOT NULL, - `description` LONGTEXT NOT NULL, `amount` FLOAT NOT NULL, `is_used` TINYINT NOT NULL, `is_enabled` TINYINT NOT NULL, @@ -1077,21 +1117,16 @@ CREATE TABLE `coupon_order` ( `id` INTEGER NOT NULL AUTO_INCREMENT, `order_id` INTEGER NOT NULL, - `code` VARCHAR(45) NOT NULL, `value` FLOAT NOT NULL, `created_at` DATETIME, `updated_at` DATETIME, PRIMARY KEY (`id`), INDEX `idx_coupon_order_order_id` (`order_id`), - INDEX `fk_coupon_order_coupon_idx` (`code`), CONSTRAINT `fk_coupon_order_order_id` FOREIGN KEY (`order_id`) REFERENCES `order` (`id`) ON UPDATE RESTRICT - ON DELETE CASCADE, - CONSTRAINT `fk_coupon_order_coupon` - FOREIGN KEY (`code`) - REFERENCES `coupon` (`code`) + ON DELETE CASCADE ) ENGINE=InnoDB; -- --------------------------------------------------------------------- @@ -1433,55 +1468,6 @@ CREATE TABLE `category_associated_content` ON DELETE CASCADE ) ENGINE=InnoDB; --- --------------------------------------------------------------------- --- rewriting_url --- --------------------------------------------------------------------- - -DROP TABLE IF EXISTS `rewriting_url`; - -CREATE TABLE `rewriting_url` -( - `id` INTEGER NOT NULL AUTO_INCREMENT, - `url` VARCHAR(255) NOT NULL, - `view` VARCHAR(255) NOT NULL, - `view_id` VARCHAR(255), - `view_locale` VARCHAR(255) NOT NULL, - `redirected` INTEGER, - `created_at` DATETIME, - `updated_at` DATETIME, - PRIMARY KEY (`id`), - UNIQUE INDEX `url_UNIQUE` (`url`), - INDEX `idx_view_id` (`view_id`), - INDEX `idx_rewriting_url_redirected` (`redirected`), - CONSTRAINT `fk_rewriting_url_redirected` - FOREIGN KEY (`redirected`) - REFERENCES `rewriting_url` (`id`) - ON UPDATE RESTRICT - ON DELETE RESTRICT -) ENGINE=InnoDB; - --- --------------------------------------------------------------------- --- rewriting_argument --- --------------------------------------------------------------------- - -DROP TABLE IF EXISTS `rewriting_argument`; - -CREATE TABLE `rewriting_argument` -( - `rewriting_url_id` INTEGER NOT NULL, - `parameter` VARCHAR(255) NOT NULL, - `value` VARCHAR(255) NOT NULL, - `created_at` DATETIME, - `updated_at` DATETIME, - PRIMARY KEY (`rewriting_url_id`,`parameter`,`value`), - INDEX `fk_rewriting_argument_rewirting_url_id` (`rewriting_url_id`), - CONSTRAINT `fk_rewriting_argument_rewirting_url_id` - FOREIGN KEY (`rewriting_url_id`) - REFERENCES `rewriting_url` (`id`) - ON UPDATE RESTRICT - ON DELETE CASCADE -) ENGINE=InnoDB; - -- --------------------------------------------------------------------- -- category_i18n -- --------------------------------------------------------------------- @@ -1921,6 +1907,9 @@ CREATE TABLE `coupon_i18n` ( `id` INTEGER NOT NULL, `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL, + `title` VARCHAR(255) NOT NULL, + `short_description` TEXT NOT NULL, + `description` LONGTEXT NOT NULL, PRIMARY KEY (`id`,`locale`), CONSTRAINT `coupon_i18n_FK_1` FOREIGN KEY (`id`) @@ -2185,9 +2174,6 @@ CREATE TABLE `coupon_version` `id` INTEGER NOT NULL, `code` VARCHAR(45) NOT NULL, `type` VARCHAR(255) NOT NULL, - `title` VARCHAR(255) NOT NULL, - `short_description` TEXT NOT NULL, - `description` LONGTEXT NOT NULL, `amount` FLOAT NOT NULL, `is_used` TINYINT NOT NULL, `is_enabled` TINYINT NOT NULL, diff --git a/local/config/schema.xml b/local/config/schema.xml index 159b21831..4427e49c6 100755 --- a/local/config/schema.xml +++ b/local/config/schema.xml @@ -1,1129 +1,1124 @@ - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - -
    - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - -
    - - - - - - - - - -
    - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - -
    - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - -
    - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - -
    - - - - - - - - - - - -
    - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - -
    - - - - - - - - - -
    - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - - - -
    - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - -
    -     + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + +
    + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + +
    + + + + + + + + + +
    + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + +
    + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + +
    + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + +
    + + + + + +
    + + + + + + + + + + + +
    + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + +
    + + + + + + + + + +
    + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + +
    + + + + + + + + +
    + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + +
    + \ No newline at end of file diff --git a/templates/admin/default/coupon/read.html b/templates/admin/default/coupon/read.html index 9161f0d72..81557ef36 100755 --- a/templates/admin/default/coupon/read.html +++ b/templates/admin/default/coupon/read.html @@ -92,6 +92,13 @@ +boucle coupon +{loop type="coupon" name="read_coupon" backend_context="true"} + inside + #ID + #CODE + #TITLE +{/loop} {include file='includes/js.inc.html'} From 451dc93eb31810e3731b87a3353c5b3c40f15b85 Mon Sep 17 00:00:00 2001 From: gmorel Date: Mon, 2 Sep 2013 17:09:14 +0200 Subject: [PATCH 046/125] Working - Fully automatic reset script --- reset_install.sh | 46 +++++++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/reset_install.sh b/reset_install.sh index f3a635a9b..2b818360a 100755 --- a/reset_install.sh +++ b/reset_install.sh @@ -4,35 +4,31 @@ echo -e "\033[47m\033[1;31m\n[WARN] This script will reset this Thelia2 install\n\033[0m" -if [ ! -f local/config/database.yml ]; then - cp local/config/database.yml.sample local/config/database.yml - echo "[FAILED] Please add your database informations in local/config/database.yml and start this script again." -else - echo -e "\n\e[01;34m[INFO] Downloading vendors\e[00m\n" - php composer install --prefer-dist --no-dev +echo -e "\n\e[01;34m[INFO] Downloading vendors\e[00m\n" +php composer install --prefer-dist --no-dev - cd local/config/ +cd local/config/ - echo -e "\n\e[01;34m[INFO] Building Models file\e[00m\n" - ../../bin/propel build -v --output-dir=../../core/lib/ +echo -e "\n\e[01;34m[INFO] Building Models file\e[00m\n" +../../bin/propel build -v --output-dir=../../core/lib/ - echo -e "\n\e[01;34m[INFO] Building SQL CREATE file\e[00m\n" - ../../bin/propel sql:build -v --output-dir=../../install/ +echo -e "\n\e[01;34m[INFO] Building SQL CREATE file\e[00m\n" +../../bin/propel sql:build -v --output-dir=../../install/ - # Not working : insert manually - # echo -e "\n\e[01;34m[INFO] Inserting SQL\e[00m\n" - # ../../bin/propel insert-sql -v --output-dir=../../install/ - # install/thelia.sql - # install/insert.sql - echo -e "\n\e[01;34m[INFO] Reinstalling Thelia2\e[00m\n" - cd ../.. - php Thelia thelia:install +# Not working : insert manually +# echo -e "\n\e[01;34m[INFO] Inserting SQL\e[00m\n" +# ../../bin/propel insert-sql -v --output-dir=../../install/ +# install/thelia.sql +# install/insert.sql +echo -e "\n\e[01;34m[INFO] Reinstalling Thelia2\e[00m\n" +cd ../.. +php Thelia thelia:install --db_host localhost --db_username thelia2 --db_password thelia2 --db_name thelia2 - echo -e "\n\e[01;34m[INFO] Installing fixtures\e[00m\n" - php install/faker.php +echo -e "\n\e[01;34m[INFO] Installing fixtures\e[00m\n" +php install/faker.php - echo -e "\n\e[01;34m[INFO] Adding admin\e[00m\n" - php Thelia thelia:create-admin +echo -e "\n\e[01;34m[INFO] Adding admin\e[00m\n" +php Thelia thelia:create-admin --login_name thelia2 --password thelia2 --last_name thelia2 --first_name thelia2 + +echo -e "\n\e[00;32m[SUCCESS] Reset done\e[00m\n" - echo -e "\n\e[00;32m[SUCCESS] Reset done\e[00m\n" -fi From 4a62419bf66ad6e230f85d78bf855dd87e792cda Mon Sep 17 00:00:00 2001 From: gmorel Date: Mon, 2 Sep 2013 17:30:48 +0200 Subject: [PATCH 047/125] Working - fix composer.json --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index d397492fb..cfacb934c 100755 --- a/composer.json +++ b/composer.json @@ -37,8 +37,7 @@ "simplepie/simplepie": "dev-master", "imagine/imagine": "dev-master", - "symfony/serializer": "2.2.*" - "imagine/imagine": "dev-master", + "symfony/serializer": "2.2.*", "symfony/icu": "1.0" }, "require-dev" : { From 42175ca4ebb3f93a981a7ac950ee2a17180ecdbd Mon Sep 17 00:00:00 2001 From: mespeche Date: Tue, 3 Sep 2013 10:45:06 +0200 Subject: [PATCH 048/125] Working - Add Jqueryui theme - Change values in edit page - Add filter on list page --- templates/admin/default/assets/css/admin.less | 38 + .../custom-theme/images/animated-overlay.gif | Bin 0 -> 1738 bytes .../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 0 -> 212 bytes .../images/ui-bg_flat_75_F9F9F9_40x100.png | Bin 0 -> 230 bytes .../images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 0 -> 335 bytes .../images/ui-bg_glass_95_fef1ec_1x400.png | Bin 0 -> 332 bytes .../ui-bg_highlight-hard_75_FFF_1x100.png | Bin 0 -> 203 bytes .../ui-bg_highlight-soft_100_f39922_1x100.png | Bin 0 -> 364 bytes .../ui-bg_highlight-soft_65_f39922_1x100.png | Bin 0 -> 349 bytes .../ui-bg_highlight-soft_75_f39922_1x100.png | Bin 0 -> 366 bytes .../images/ui-icons_2e83ff_256x240.png | Bin 0 -> 4549 bytes .../images/ui-icons_333333_256x240.png | Bin 0 -> 6975 bytes .../images/ui-icons_454545_256x240.png | Bin 0 -> 6992 bytes .../images/ui-icons_888888_256x240.png | Bin 0 -> 6999 bytes .../images/ui-icons_FFF_256x240.png | Bin 0 -> 6299 bytes .../images/ui-icons_cd0a0a_256x240.png | Bin 0 -> 4549 bytes .../custom-theme/jquery-ui-1.10.3.custom.css | 1177 +++++++++++++++++ templates/admin/default/assets/js/main.js | 21 +- templates/admin/default/coupon/edit.html | 51 +- templates/admin/default/coupon/list.html | 14 +- 20 files changed, 1264 insertions(+), 37 deletions(-) create mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/images/animated-overlay.gif create mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_flat_0_aaaaaa_40x100.png create mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_flat_75_F9F9F9_40x100.png create mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_glass_55_fbf9ee_1x400.png create mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_glass_95_fef1ec_1x400.png create mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-hard_75_FFF_1x100.png create mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_100_f39922_1x100.png create mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_65_f39922_1x100.png create mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_75_f39922_1x100.png create mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_2e83ff_256x240.png create mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_333333_256x240.png create mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_454545_256x240.png create mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_888888_256x240.png create mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_FFF_256x240.png create mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_cd0a0a_256x240.png create mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/jquery-ui-1.10.3.custom.css diff --git a/templates/admin/default/assets/css/admin.less b/templates/admin/default/assets/css/admin.less index b2d4329ed..b28f235c8 100755 --- a/templates/admin/default/assets/css/admin.less +++ b/templates/admin/default/assets/css/admin.less @@ -981,4 +981,42 @@ th.tablesorter-headerAsc { th.tablesorter-headerDesc { background: #F9F9F9 url("data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7") no-repeat center right; +} + +.tablesorter{ + .disabled{ + display: none; + } +} + +.tablesorter .value-popup:after { + content : attr(data-value); + position: absolute; + bottom: 14px; + left: -7px; + min-width: 18px; + .rounded(4px); + #gradient > .vertical(rgb(243,153,34), rgb(227,83,11)); + box-shadow: inset 0px 0px 2px rgba(250,250,250,0.5), 0px 1px 3px rgba(0,0,0,0.2); + color: white; + font-size: 11px; + padding: 2px 5px; + text-align: center; +} +.tablesorter .value-popup:before { + content: ""; + position: absolute; + width: 0; + height: 0; + border-top: 8px solid #777; + border-left: 8px solid transparent; + border-right: 8px solid transparent; + top: -8px; + left: 50%; + margin-left: -8px; + margin-top: -1px; +} + +.ui-slider{ + margin-top: 23px; } \ No newline at end of file diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/animated-overlay.gif b/templates/admin/default/assets/css/jqueryui/custom-theme/images/animated-overlay.gif new file mode 100755 index 0000000000000000000000000000000000000000..d441f75ebfbdf26a265dfccd670120d25c0a341c GIT binary patch literal 1738 zcmZ|OX;ji_6b5ixNYt8>l?gOuO)6lU%W(mxn(`>1S(XO;u`D+P%xqBvMr|w-Vyr1s z7R|Cn0b8|Hu<=Zmv1mFqh9Fj!NuZfKB2MP$e75`XJ@>=!y!Ux9xR3x;EW!q1^V>X| znVFuRUN`NqJ2)ybXh%e__h!!pv(M|S3+?9F%(K}zyE40MGyhWF5-IDgL&=%2-9`Nk z!1@8uk4t%_{(K~>N;sK&dzJbwJ=$kYTlL=$%#0Pfh>U{%i@~wWbvYsD_K-D`&+u1( z#Ma`>%q<^UhzGvi(hyE`zCD{-=2|zL5>wnB=DE!U?(CZG%q4@lDnCq_%&3DCla#(X zmBhDD+RN$aMWWHm?ig*>1Onn6~r?Ma~N2JKAxN>H%UtRyRqS)6Um!-Tz%-r=& zQmTb^JFIe3W^-kAm`}`2P|niMh>RYyd)S^f(dbrx965?rzbhP|XeP}o&&DSZ4|oYQ z)I{f!SfycYw?3=9W;o-B%U5xs(pP267X~9-7L|4WzaYexC0GtG8wWygm63rF{llCEraxzkc=IxvFQ-y37=_;e5 zJLq^gsSO0Ayz?a>E_?{dmUc+t#qv$)XN8$<<}rQ#)lsiw+pmL&J>~+hgpo>i$m+;l zZIa_ZRIfSeT$~v5d`EBV&*k`apPgjv&B|+d`Q!nyu{L4rs%ZfoF0*Kq8I%ByOcFpL zK=>wzofZo<+0GZLCnWM3oQ^pb(gRSf02;~cEn@LJ>~XB9IkEX{$N#Z`m%>S!U{uPx zloI%bLdo$Adxlh(Uv^yX7s5G&C zLwNRG>~T?G{kzupp8EcyLGPoPf)@&9Wqfw_l&uU-6cexk%5;uQg%wb=0k_733{i#& z1a2p)gV3S2+QG1-K9tZ}E~I<(P0r2aFFY-c{o?TUOz3Xjod#TLE2A_c?*T7t z=1>~%YW450{Qqno4t`}gvLnuMrcu8+#xEBoY%2_+Mb#Z6S38+r*M4O`-+!zl(@m`D zQsi|GA2l3gEy}LFe<#Hv8?$_L#u8E|3-bP$*La*E>B{X!Sy4i6?TKam!49aXCAW4S*P_O^H4^*DpiA40o}Uqw~Eo&veh1`|8i zD2$x+>_b^bXE4N;AW=5>iYak2%!JAh0j1*k1{p#iRCjbB7!cSws~U{1IA@acLII$t z$>X#A+^s6iJ5~DFG!xa?>z{=lxtdi1rzbM-(nqAu3D8h-&64xo6|E!p?pK0xT;qoK z`6%+SpBk+~M?nO}>2mTw!A{yZ6O>Z@kwSd4;8aWU5z!P~tQl?u==^+R`{OmOS}oZh zOXQ3{6kuz?Is^n^L7;9ieB9C+8B{>t+pDrlq4xGDDn#T#3T5$l1g`FTQkU;b-981j zNm{zC`$wn7etklM#qHI4=3m5gwa6DNS{?Z!vSObi_od{4eUo=_S2BKNpkSdiqe(k9WtkeM79;2-%CFbb)aB=&H1?i1}uwFzoZQ(38Kn1zBP ORn*B%u*Wk|4g3!*Rv{Mv literal 0 HcmV?d00001 diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_flat_0_aaaaaa_40x100.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_flat_0_aaaaaa_40x100.png new file mode 100755 index 0000000000000000000000000000000000000000..2399a7bb2c2ff02a8647cd29738873748a84d91c GIT binary patch literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^8bF-F1SA+{?>A)!QcOwS?k)_>#w|r1Kptm-M`SUO z_5fqIli7AahM1>|V~EA+ zRdP`(kYX@0Ff`URu+%j$3^BB{GBvd_1hUPo3=Gy3z1f7KAvZrIGp!Q0hP(P9d_WBh Mp00i_>zopr0J-8b&;S4c literal 0 HcmV?d00001 diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_flat_75_F9F9F9_40x100.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_flat_75_F9F9F9_40x100.png new file mode 100755 index 0000000000000000000000000000000000000000..3684702ed87fffa3529abda8f7c28a956487226e GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^8bF-F0VEhM^6M@GQcOwS?k)`f+xyS#2l6-zJR*yM zv86AiR0Xxy`%1a(O9I>1w(ax%+s}un;7=< z9tY}CEpd$~Nl7e8wMs5Z1yT$~28PDE29~-8#vujnc6a#?2AmP!?*K(O3p^r= zfwTu0yPeFo12TF&T^vI^j=w#x$i?I+((tf;UXnmgbH|3oY>pC!)f}(GR!16S-u+#{ ze6YEqRkW=8vGl=5qArKM<9}TC-}iEvB{zdaTcX5$wyRTK&AL_WUqC2h_me>FVdQ&MBb@0BwPGp#T5? literal 0 HcmV?d00001 diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_glass_95_fef1ec_1x400.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_glass_95_fef1ec_1x400.png new file mode 100755 index 0000000000000000000000000000000000000000..4070c9712950cc6c68458b0483094a81df5548b6 GIT binary patch literal 332 zcmeAS@N?(olHy`uVBq!ia0vp^j6gI&fCnc6a#?2AmP!?*K(O3p^r= zfwTu0yPeFo12VciT^vI^j=w#>k(V)1qW$CZ|6)SVV-&*#dav<$DMuV&n0Dbpw@aKYh^7+PAHnpznG+2&RT25XAm fY(mkHo1c=IR*74~UHuR~paup{S3j3^P6nC}Q!>*kaceLYcj*9XVDNPHb6Mw<&;$S_ C`YwS0 literal 0 HcmV?d00001 diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_100_f39922_1x100.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_100_f39922_1x100.png new file mode 100755 index 0000000000000000000000000000000000000000..359678014cf083c43a3f2fe29068e8bb0ae74657 GIT binary patch literal 364 zcmeAS@N?(olHy`uVBq!ia0vp^j6j?szyu^`+!HJTQfx`y?k@kqfHUIz9iRwjfk$L9 zkoEv$x0Bg+K*lOh7sn8d^G_#iuXWFyuKu4dSis78XYbKXuyHi)9Ih`;_1Cd8UvjwA=RU!tl=he=qev=KbEC^p5@e15coUO_ zQmvAUQh^kMk%6JHu7RblfpLg|ft7)=m655gfw`4|0gK+`yC@oR^HVa@DsgKlE!Iv1 PYGCkm^>bP0l+XkK;vIsQ literal 0 HcmV?d00001 diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_65_f39922_1x100.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_65_f39922_1x100.png new file mode 100755 index 0000000000000000000000000000000000000000..4718fe2f0829745aa57b0a06e9dcef5b5ebae74c GIT binary patch literal 349 zcmeAS@N?(olHy`uVBq!ia0vp^j6j?szyu^`+!HJTQfx`y?k@kqfHUIz9iRwjfk$L9 zkoEv$x0Bg+K*nrO7sn8d^G_!javgFIacS3_yn4;v=BBG3Br15CcXBO1+{(c4$M;Od0)?uzM+N7`9u?es^-;!Ju_868 zyGMF5&K#YSaphdwc#*eq zl=c#pd1fc)e%rM6?Y_U4`j1P$5KdG!n#z0x=uFiT*NBpo#FA92yVqjopU}>X literal 0 HcmV?d00001 diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_75_f39922_1x100.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_75_f39922_1x100.png new file mode 100755 index 0000000000000000000000000000000000000000..87578c6c46df339d20be7a1abd490084be5e33b5 GIT binary patch literal 366 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 F{{S81aohj^ literal 0 HcmV?d00001 diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_333333_256x240.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_333333_256x240.png new file mode 100755 index 0000000000000000000000000000000000000000..fab88f726457d2e017d89c03efb2f56f5307e4ef GIT binary patch literal 6975 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 GkN7VYe;Pml literal 0 HcmV?d00001 diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_454545_256x240.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_454545_256x240.png new file mode 100755 index 0000000000000000000000000000000000000000..b6db1acdd433be80a472b045018f25c7f2cf7e08 GIT binary patch literal 6992 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 literal 0 HcmV?d00001 diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_FFF_256x240.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_FFF_256x240.png new file mode 100755 index 0000000000000000000000000000000000000000..4f624bb2b193750f1a5b36c8c307168c6681a861 GIT binary patch literal 6299 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 DTfr$v literal 0 HcmV?d00001 diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/jquery-ui-1.10.3.custom.css b/templates/admin/default/assets/css/jqueryui/custom-theme/jquery-ui-1.10.3.custom.css new file mode 100755 index 000000000..ab828f01b --- /dev/null +++ b/templates/admin/default/assets/css/jqueryui/custom-theme/jquery-ui-1.10.3.custom.css @@ -0,0 +1,1177 @@ +/*! jQuery UI - v1.10.3 - 2013-09-03 +* http://jqueryui.com +* Includes: jquery.ui.core.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css +* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=%22Helvetica%20Neue%22%2C%20Helvetica%2C%20Arial%2C%20sans-serif&fwDefault=normal&fsDefault=12px&cornerRadius=4px&bgColorHeader=%23f39922&bgTextureHeader=highlight_soft&bgImgOpacityHeader=100&borderColorHeader=%23eab791&fcHeader=%23FFF&iconColorHeader=%23FFF&bgColorContent=%23F9F9F9&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=%23aaaaaa&fcContent=%23333333&iconColorContent=%23333333&bgColorDefault=%23FFF&bgTextureDefault=highlight_hard&bgImgOpacityDefault=75&borderColorDefault=%23d3d3d3&fcDefault=%23555555&iconColorDefault=%23888888&bgColorHover=%23f39922&bgTextureHover=highlight_soft&bgImgOpacityHover=75&borderColorHover=%23999999&fcHover=%23fff&iconColorHover=%23454545&bgColorActive=%23f39922&bgTextureActive=highlight_soft&bgImgOpacityActive=65&borderColorActive=%23aaaaaa&fcActive=%23fff&iconColorActive=%23fff&bgColorHighlight=%23fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=%23fcefa1&fcHighlight=%23363636&iconColorHighlight=%232e83ff&bgColorError=%23fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=%23cd0a0a&fcError=%23cd0a0a&iconColorError=%23cd0a0a&bgColorOverlay=%23aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=%23aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px +* Copyright 2013 jQuery Foundation and other contributors Licensed MIT */ + +/* Layout helpers +----------------------------------*/ +.ui-helper-hidden { + display: none; +} +.ui-helper-hidden-accessible { + border: 0; + clip: rect(0 0 0 0); + height: 1px; + margin: -1px; + overflow: hidden; + padding: 0; + position: absolute; + width: 1px; +} +.ui-helper-reset { + margin: 0; + padding: 0; + border: 0; + outline: 0; + line-height: 1.3; + text-decoration: none; + font-size: 100%; + list-style: none; +} +.ui-helper-clearfix:before, +.ui-helper-clearfix:after { + content: ""; + display: table; + border-collapse: collapse; +} +.ui-helper-clearfix:after { + clear: both; +} +.ui-helper-clearfix { + min-height: 0; /* support: IE7 */ +} +.ui-helper-zfix { + width: 100%; + height: 100%; + top: 0; + left: 0; + position: absolute; + opacity: 0; + filter:Alpha(Opacity=0); +} + +.ui-front { + z-index: 100; +} + + +/* Interaction Cues +----------------------------------*/ +.ui-state-disabled { + cursor: default !important; +} + + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { + display: block; + text-indent: -99999px; + overflow: hidden; + background-repeat: no-repeat; +} + + +/* Misc visuals +----------------------------------*/ + +/* Overlays */ +.ui-widget-overlay { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; +} +.ui-resizable { + position: relative; +} +.ui-resizable-handle { + position: absolute; + font-size: 0.1px; + display: block; +} +.ui-resizable-disabled .ui-resizable-handle, +.ui-resizable-autohide .ui-resizable-handle { + display: none; +} +.ui-resizable-n { + cursor: n-resize; + height: 7px; + width: 100%; + top: -5px; + left: 0; +} +.ui-resizable-s { + cursor: s-resize; + height: 7px; + width: 100%; + bottom: -5px; + left: 0; +} +.ui-resizable-e { + cursor: e-resize; + width: 7px; + right: -5px; + top: 0; + height: 100%; +} +.ui-resizable-w { + cursor: w-resize; + width: 7px; + left: -5px; + top: 0; + height: 100%; +} +.ui-resizable-se { + cursor: se-resize; + width: 12px; + height: 12px; + right: 1px; + bottom: 1px; +} +.ui-resizable-sw { + cursor: sw-resize; + width: 9px; + height: 9px; + left: -5px; + bottom: -5px; +} +.ui-resizable-nw { + cursor: nw-resize; + width: 9px; + height: 9px; + left: -5px; + top: -5px; +} +.ui-resizable-ne { + cursor: ne-resize; + width: 9px; + height: 9px; + right: -5px; + top: -5px; +} +.ui-selectable-helper { + position: absolute; + z-index: 100; + border: 1px dotted black; +} +.ui-accordion .ui-accordion-header { + display: block; + cursor: pointer; + position: relative; + margin-top: 2px; + padding: .5em .5em .5em .7em; + min-height: 0; /* support: IE7 */ +} +.ui-accordion .ui-accordion-icons { + padding-left: 2.2em; +} +.ui-accordion .ui-accordion-noicons { + padding-left: .7em; +} +.ui-accordion .ui-accordion-icons .ui-accordion-icons { + padding-left: 2.2em; +} +.ui-accordion .ui-accordion-header .ui-accordion-header-icon { + position: absolute; + left: .5em; + top: 50%; + margin-top: -8px; +} +.ui-accordion .ui-accordion-content { + padding: 1em 2.2em; + border-top: 0; + overflow: auto; +} +.ui-autocomplete { + position: absolute; + top: 0; + left: 0; + cursor: default; +} +.ui-button { + display: inline-block; + position: relative; + padding: 0; + line-height: normal; + margin-right: .1em; + cursor: pointer; + vertical-align: middle; + text-align: center; + overflow: visible; /* removes extra width in IE */ +} +.ui-button, +.ui-button:link, +.ui-button:visited, +.ui-button:hover, +.ui-button:active { + text-decoration: none; +} +/* to make room for the icon, a width needs to be set here */ +.ui-button-icon-only { + width: 2.2em; +} +/* button elements seem to need a little more width */ +button.ui-button-icon-only { + width: 2.4em; +} +.ui-button-icons-only { + width: 3.4em; +} +button.ui-button-icons-only { + width: 3.7em; +} + +/* button text element */ +.ui-button .ui-button-text { + display: block; + line-height: normal; +} +.ui-button-text-only .ui-button-text { + padding: .4em 1em; +} +.ui-button-icon-only .ui-button-text, +.ui-button-icons-only .ui-button-text { + padding: .4em; + text-indent: -9999999px; +} +.ui-button-text-icon-primary .ui-button-text, +.ui-button-text-icons .ui-button-text { + padding: .4em 1em .4em 2.1em; +} +.ui-button-text-icon-secondary .ui-button-text, +.ui-button-text-icons .ui-button-text { + padding: .4em 2.1em .4em 1em; +} +.ui-button-text-icons .ui-button-text { + padding-left: 2.1em; + padding-right: 2.1em; +} +/* no icon support for input elements, provide padding by default */ +input.ui-button { + padding: .4em 1em; +} + +/* button icon element(s) */ +.ui-button-icon-only .ui-icon, +.ui-button-text-icon-primary .ui-icon, +.ui-button-text-icon-secondary .ui-icon, +.ui-button-text-icons .ui-icon, +.ui-button-icons-only .ui-icon { + position: absolute; + top: 50%; + margin-top: -8px; +} +.ui-button-icon-only .ui-icon { + left: 50%; + margin-left: -8px; +} +.ui-button-text-icon-primary .ui-button-icon-primary, +.ui-button-text-icons .ui-button-icon-primary, +.ui-button-icons-only .ui-button-icon-primary { + left: .5em; +} +.ui-button-text-icon-secondary .ui-button-icon-secondary, +.ui-button-text-icons .ui-button-icon-secondary, +.ui-button-icons-only .ui-button-icon-secondary { + right: .5em; +} + +/* button sets */ +.ui-buttonset { + margin-right: 7px; +} +.ui-buttonset .ui-button { + margin-left: 0; + margin-right: -.3em; +} + +/* workarounds */ +/* reset extra padding in Firefox, see h5bp.com/l */ +input.ui-button::-moz-focus-inner, +button.ui-button::-moz-focus-inner { + border: 0; + padding: 0; +} +.ui-datepicker { + width: 17em; + padding: .2em .2em 0; + display: none; +} +.ui-datepicker .ui-datepicker-header { + position: relative; + padding: .2em 0; +} +.ui-datepicker .ui-datepicker-prev, +.ui-datepicker .ui-datepicker-next { + position: absolute; + top: 2px; + width: 1.8em; + height: 1.8em; +} +.ui-datepicker .ui-datepicker-prev-hover, +.ui-datepicker .ui-datepicker-next-hover { + top: 1px; +} +.ui-datepicker .ui-datepicker-prev { + left: 2px; +} +.ui-datepicker .ui-datepicker-next { + right: 2px; +} +.ui-datepicker .ui-datepicker-prev-hover { + left: 1px; +} +.ui-datepicker .ui-datepicker-next-hover { + right: 1px; +} +.ui-datepicker .ui-datepicker-prev span, +.ui-datepicker .ui-datepicker-next span { + display: block; + position: absolute; + left: 50%; + margin-left: -8px; + top: 50%; + margin-top: -8px; +} +.ui-datepicker .ui-datepicker-title { + margin: 0 2.3em; + line-height: 1.8em; + text-align: center; +} +.ui-datepicker .ui-datepicker-title select { + font-size: 1em; + margin: 1px 0; +} +.ui-datepicker select.ui-datepicker-month-year { + width: 100%; +} +.ui-datepicker select.ui-datepicker-month, +.ui-datepicker select.ui-datepicker-year { + width: 49%; +} +.ui-datepicker table { + width: 100%; + font-size: .9em; + border-collapse: collapse; + margin: 0 0 .4em; +} +.ui-datepicker th { + padding: .7em .3em; + text-align: center; + font-weight: bold; + border: 0; +} +.ui-datepicker td { + border: 0; + padding: 1px; +} +.ui-datepicker td span, +.ui-datepicker td a { + display: block; + padding: .2em; + text-align: right; + text-decoration: none; +} +.ui-datepicker .ui-datepicker-buttonpane { + background-image: none; + margin: .7em 0 0 0; + padding: 0 .2em; + border-left: 0; + border-right: 0; + border-bottom: 0; +} +.ui-datepicker .ui-datepicker-buttonpane button { + float: right; + margin: .5em .2em .4em; + cursor: pointer; + padding: .2em .6em .3em .6em; + width: auto; + overflow: visible; +} +.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { + float: left; +} + +/* with multiple calendars */ +.ui-datepicker.ui-datepicker-multi { + width: auto; +} +.ui-datepicker-multi .ui-datepicker-group { + float: left; +} +.ui-datepicker-multi .ui-datepicker-group table { + width: 95%; + margin: 0 auto .4em; +} +.ui-datepicker-multi-2 .ui-datepicker-group { + width: 50%; +} +.ui-datepicker-multi-3 .ui-datepicker-group { + width: 33.3%; +} +.ui-datepicker-multi-4 .ui-datepicker-group { + width: 25%; +} +.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header, +.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { + border-left-width: 0; +} +.ui-datepicker-multi .ui-datepicker-buttonpane { + clear: left; +} +.ui-datepicker-row-break { + clear: both; + width: 100%; + font-size: 0; +} + +/* RTL support */ +.ui-datepicker-rtl { + direction: rtl; +} +.ui-datepicker-rtl .ui-datepicker-prev { + right: 2px; + left: auto; +} +.ui-datepicker-rtl .ui-datepicker-next { + left: 2px; + right: auto; +} +.ui-datepicker-rtl .ui-datepicker-prev:hover { + right: 1px; + left: auto; +} +.ui-datepicker-rtl .ui-datepicker-next:hover { + left: 1px; + right: auto; +} +.ui-datepicker-rtl .ui-datepicker-buttonpane { + clear: right; +} +.ui-datepicker-rtl .ui-datepicker-buttonpane button { + float: left; +} +.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current, +.ui-datepicker-rtl .ui-datepicker-group { + float: right; +} +.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header, +.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { + border-right-width: 0; + border-left-width: 1px; +} +.ui-dialog { + position: absolute; + top: 0; + left: 0; + padding: .2em; + outline: 0; +} +.ui-dialog .ui-dialog-titlebar { + padding: .4em 1em; + position: relative; +} +.ui-dialog .ui-dialog-title { + float: left; + margin: .1em 0; + white-space: nowrap; + width: 90%; + overflow: hidden; + text-overflow: ellipsis; +} +.ui-dialog .ui-dialog-titlebar-close { + position: absolute; + right: .3em; + top: 50%; + width: 21px; + margin: -10px 0 0 0; + padding: 1px; + height: 20px; +} +.ui-dialog .ui-dialog-content { + position: relative; + border: 0; + padding: .5em 1em; + background: none; + overflow: auto; +} +.ui-dialog .ui-dialog-buttonpane { + text-align: left; + border-width: 1px 0 0 0; + background-image: none; + margin-top: .5em; + padding: .3em 1em .5em .4em; +} +.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { + float: right; +} +.ui-dialog .ui-dialog-buttonpane button { + margin: .5em .4em .5em 0; + cursor: pointer; +} +.ui-dialog .ui-resizable-se { + width: 12px; + height: 12px; + right: -5px; + bottom: -5px; + background-position: 16px 16px; +} +.ui-draggable .ui-dialog-titlebar { + cursor: move; +} +.ui-menu { + list-style: none; + padding: 2px; + margin: 0; + display: block; + outline: none; +} +.ui-menu .ui-menu { + margin-top: -3px; + position: absolute; +} +.ui-menu .ui-menu-item { + margin: 0; + padding: 0; + width: 100%; + /* support: IE10, see #8844 */ + list-style-image: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7); +} +.ui-menu .ui-menu-divider { + margin: 5px -2px 5px -2px; + height: 0; + font-size: 0; + line-height: 0; + border-width: 1px 0 0 0; +} +.ui-menu .ui-menu-item a { + text-decoration: none; + display: block; + padding: 2px .4em; + line-height: 1.5; + min-height: 0; /* support: IE7 */ + font-weight: normal; +} +.ui-menu .ui-menu-item a.ui-state-focus, +.ui-menu .ui-menu-item a.ui-state-active { + font-weight: normal; + margin: -1px; +} + +.ui-menu .ui-state-disabled { + font-weight: normal; + margin: .4em 0 .2em; + line-height: 1.5; +} +.ui-menu .ui-state-disabled a { + cursor: default; +} + +/* icon support */ +.ui-menu-icons { + position: relative; +} +.ui-menu-icons .ui-menu-item a { + position: relative; + padding-left: 2em; +} + +/* left-aligned */ +.ui-menu .ui-icon { + position: absolute; + top: .2em; + left: .2em; +} + +/* right-aligned */ +.ui-menu .ui-menu-icon { + position: static; + float: right; +} +.ui-progressbar { + height: 2em; + text-align: left; + overflow: hidden; +} +.ui-progressbar .ui-progressbar-value { + margin: -1px; + height: 100%; +} +.ui-progressbar .ui-progressbar-overlay { + background: url("images/animated-overlay.gif"); + height: 100%; + filter: alpha(opacity=25); + opacity: 0.25; +} +.ui-progressbar-indeterminate .ui-progressbar-value { + background-image: none; +} +.ui-slider { + position: relative; + text-align: left; +} +.ui-slider .ui-slider-handle { + position: absolute; + z-index: 2; + width: 1.2em; + height: 1.2em; + cursor: default; +} +.ui-slider .ui-slider-range { + position: absolute; + z-index: 1; + font-size: .7em; + display: block; + border: 0; + background-position: 0 0; +} + +/* For IE8 - See #6727 */ +.ui-slider.ui-state-disabled .ui-slider-handle, +.ui-slider.ui-state-disabled .ui-slider-range { + filter: inherit; +} + +.ui-slider-horizontal { + height: .8em; +} +.ui-slider-horizontal .ui-slider-handle { + top: -.3em; + margin-left: -.6em; +} +.ui-slider-horizontal .ui-slider-range { + top: 0; + height: 100%; +} +.ui-slider-horizontal .ui-slider-range-min { + left: 0; +} +.ui-slider-horizontal .ui-slider-range-max { + right: 0; +} + +.ui-slider-vertical { + width: .8em; + height: 100px; +} +.ui-slider-vertical .ui-slider-handle { + left: -.3em; + margin-left: 0; + margin-bottom: -.6em; +} +.ui-slider-vertical .ui-slider-range { + left: 0; + width: 100%; +} +.ui-slider-vertical .ui-slider-range-min { + bottom: 0; +} +.ui-slider-vertical .ui-slider-range-max { + top: 0; +} +.ui-spinner { + position: relative; + display: inline-block; + overflow: hidden; + padding: 0; + vertical-align: middle; +} +.ui-spinner-input { + border: none; + background: none; + color: inherit; + padding: 0; + margin: .2em 0; + vertical-align: middle; + margin-left: .4em; + margin-right: 22px; +} +.ui-spinner-button { + width: 16px; + height: 50%; + font-size: .5em; + padding: 0; + margin: 0; + text-align: center; + position: absolute; + cursor: default; + display: block; + overflow: hidden; + right: 0; +} +/* more specificity required here to overide default borders */ +.ui-spinner a.ui-spinner-button { + border-top: none; + border-bottom: none; + border-right: none; +} +/* vertical centre icon */ +.ui-spinner .ui-icon { + position: absolute; + margin-top: -8px; + top: 50%; + left: 0; +} +.ui-spinner-up { + top: 0; +} +.ui-spinner-down { + bottom: 0; +} + +/* TR overrides */ +.ui-spinner .ui-icon-triangle-1-s { + /* need to fix icons sprite */ + background-position: -65px -16px; +} +.ui-tabs { + position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */ + padding: .2em; +} +.ui-tabs .ui-tabs-nav { + margin: 0; + padding: .2em .2em 0; +} +.ui-tabs .ui-tabs-nav li { + list-style: none; + float: left; + position: relative; + top: 0; + margin: 1px .2em 0 0; + border-bottom-width: 0; + padding: 0; + white-space: nowrap; +} +.ui-tabs .ui-tabs-nav li a { + float: left; + padding: .5em 1em; + text-decoration: none; +} +.ui-tabs .ui-tabs-nav li.ui-tabs-active { + margin-bottom: -1px; + padding-bottom: 1px; +} +.ui-tabs .ui-tabs-nav li.ui-tabs-active a, +.ui-tabs .ui-tabs-nav li.ui-state-disabled a, +.ui-tabs .ui-tabs-nav li.ui-tabs-loading a { + cursor: text; +} +.ui-tabs .ui-tabs-nav li a, /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */ +.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a { + cursor: pointer; +} +.ui-tabs .ui-tabs-panel { + display: block; + border-width: 0; + padding: 1em 1.4em; + background: none; +} +.ui-tooltip { + padding: 8px; + position: absolute; + z-index: 9999; + max-width: 300px; + -webkit-box-shadow: 0 0 5px #aaa; + box-shadow: 0 0 5px #aaa; +} +body .ui-tooltip { + border-width: 2px; +} + +/* Component containers +----------------------------------*/ +.ui-widget { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 12px; +} +.ui-widget .ui-widget { + font-size: 1em; +} +.ui-widget input, +.ui-widget select, +.ui-widget textarea, +.ui-widget button { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 1em; +} +.ui-widget-content { + border: 1px solid #aaaaaa; + background: #F9F9F9 url(images/ui-bg_flat_75_F9F9F9_40x100.png) 50% 50% repeat-x; + color: #333333; +} +.ui-widget-content a { + color: #333333; +} +.ui-widget-header { + border: 1px solid #eab791; + background: #f39922 url(images/ui-bg_highlight-soft_100_f39922_1x100.png) 50% 50% repeat-x; + color: #FFF; + font-weight: bold; +} +.ui-widget-header a { + color: #FFF; +} + +/* Interaction states +----------------------------------*/ +.ui-state-default, +.ui-widget-content .ui-state-default, +.ui-widget-header .ui-state-default { + border: 1px solid #d3d3d3; + background: #FFF url(images/ui-bg_highlight-hard_75_FFF_1x100.png) 50% 50% repeat-x; + font-weight: normal; + color: #555555; +} +.ui-state-default a, +.ui-state-default a:link, +.ui-state-default a:visited { + color: #555555; + text-decoration: none; +} +.ui-state-hover, +.ui-widget-content .ui-state-hover, +.ui-widget-header .ui-state-hover, +.ui-state-focus, +.ui-widget-content .ui-state-focus, +.ui-widget-header .ui-state-focus { + border: 1px solid #999999; + background: #f39922 url(images/ui-bg_highlight-soft_75_f39922_1x100.png) 50% 50% repeat-x; + font-weight: normal; + color: #fff; +} +.ui-state-hover a, +.ui-state-hover a:hover, +.ui-state-hover a:link, +.ui-state-hover a:visited { + color: #fff; + text-decoration: none; +} +.ui-state-active, +.ui-widget-content .ui-state-active, +.ui-widget-header .ui-state-active { + border: 1px solid #aaaaaa; + background: #f39922 url(images/ui-bg_highlight-soft_65_f39922_1x100.png) 50% 50% repeat-x; + font-weight: normal; + color: #fff; +} +.ui-state-active a, +.ui-state-active a:link, +.ui-state-active a:visited { + color: #fff; + text-decoration: none; +} + +/* Interaction Cues +----------------------------------*/ +.ui-state-highlight, +.ui-widget-content .ui-state-highlight, +.ui-widget-header .ui-state-highlight { + border: 1px solid #fcefa1; + background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; + color: #363636; +} +.ui-state-highlight a, +.ui-widget-content .ui-state-highlight a, +.ui-widget-header .ui-state-highlight a { + color: #363636; +} +.ui-state-error, +.ui-widget-content .ui-state-error, +.ui-widget-header .ui-state-error { + border: 1px solid #cd0a0a; + background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; + color: #cd0a0a; +} +.ui-state-error a, +.ui-widget-content .ui-state-error a, +.ui-widget-header .ui-state-error a { + color: #cd0a0a; +} +.ui-state-error-text, +.ui-widget-content .ui-state-error-text, +.ui-widget-header .ui-state-error-text { + color: #cd0a0a; +} +.ui-priority-primary, +.ui-widget-content .ui-priority-primary, +.ui-widget-header .ui-priority-primary { + font-weight: bold; +} +.ui-priority-secondary, +.ui-widget-content .ui-priority-secondary, +.ui-widget-header .ui-priority-secondary { + opacity: .7; + filter:Alpha(Opacity=70); + font-weight: normal; +} +.ui-state-disabled, +.ui-widget-content .ui-state-disabled, +.ui-widget-header .ui-state-disabled { + opacity: .35; + filter:Alpha(Opacity=35); + background-image: none; +} +.ui-state-disabled .ui-icon { + filter:Alpha(Opacity=35); /* For IE8 - See #6059 */ +} + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { + width: 16px; + height: 16px; +} +.ui-icon, +.ui-widget-content .ui-icon { + background-image: url(images/ui-icons_333333_256x240.png); +} +.ui-widget-header .ui-icon { + background-image: url(images/ui-icons_FFF_256x240.png); +} +.ui-state-default .ui-icon { + background-image: url(images/ui-icons_888888_256x240.png); +} +.ui-state-hover .ui-icon, +.ui-state-focus .ui-icon { + background-image: url(images/ui-icons_454545_256x240.png); +} +.ui-state-active .ui-icon { + background-image: url(images/ui-icons_fff_256x240.png); +} +.ui-state-highlight .ui-icon { + background-image: url(images/ui-icons_2e83ff_256x240.png); +} +.ui-state-error .ui-icon, +.ui-state-error-text .ui-icon { + background-image: url(images/ui-icons_cd0a0a_256x240.png); +} + +/* positioning */ +.ui-icon-blank { background-position: 16px 16px; } +.ui-icon-carat-1-n { background-position: 0 0; } +.ui-icon-carat-1-ne { background-position: -16px 0; } +.ui-icon-carat-1-e { background-position: -32px 0; } +.ui-icon-carat-1-se { background-position: -48px 0; } +.ui-icon-carat-1-s { background-position: -64px 0; } +.ui-icon-carat-1-sw { background-position: -80px 0; } +.ui-icon-carat-1-w { background-position: -96px 0; } +.ui-icon-carat-1-nw { background-position: -112px 0; } +.ui-icon-carat-2-n-s { background-position: -128px 0; } +.ui-icon-carat-2-e-w { background-position: -144px 0; } +.ui-icon-triangle-1-n { background-position: 0 -16px; } +.ui-icon-triangle-1-ne { background-position: -16px -16px; } +.ui-icon-triangle-1-e { background-position: -32px -16px; } +.ui-icon-triangle-1-se { background-position: -48px -16px; } +.ui-icon-triangle-1-s { background-position: -64px -16px; } +.ui-icon-triangle-1-sw { background-position: -80px -16px; } +.ui-icon-triangle-1-w { background-position: -96px -16px; } +.ui-icon-triangle-1-nw { background-position: -112px -16px; } +.ui-icon-triangle-2-n-s { background-position: -128px -16px; } +.ui-icon-triangle-2-e-w { background-position: -144px -16px; } +.ui-icon-arrow-1-n { background-position: 0 -32px; } +.ui-icon-arrow-1-ne { background-position: -16px -32px; } +.ui-icon-arrow-1-e { background-position: -32px -32px; } +.ui-icon-arrow-1-se { background-position: -48px -32px; } +.ui-icon-arrow-1-s { background-position: -64px -32px; } +.ui-icon-arrow-1-sw { background-position: -80px -32px; } +.ui-icon-arrow-1-w { background-position: -96px -32px; } +.ui-icon-arrow-1-nw { background-position: -112px -32px; } +.ui-icon-arrow-2-n-s { background-position: -128px -32px; } +.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; } +.ui-icon-arrow-2-e-w { background-position: -160px -32px; } +.ui-icon-arrow-2-se-nw { background-position: -176px -32px; } +.ui-icon-arrowstop-1-n { background-position: -192px -32px; } +.ui-icon-arrowstop-1-e { background-position: -208px -32px; } +.ui-icon-arrowstop-1-s { background-position: -224px -32px; } +.ui-icon-arrowstop-1-w { background-position: -240px -32px; } +.ui-icon-arrowthick-1-n { background-position: 0 -48px; } +.ui-icon-arrowthick-1-ne { background-position: -16px -48px; } +.ui-icon-arrowthick-1-e { background-position: -32px -48px; } +.ui-icon-arrowthick-1-se { background-position: -48px -48px; } +.ui-icon-arrowthick-1-s { background-position: -64px -48px; } +.ui-icon-arrowthick-1-sw { background-position: -80px -48px; } +.ui-icon-arrowthick-1-w { background-position: -96px -48px; } +.ui-icon-arrowthick-1-nw { background-position: -112px -48px; } +.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; } +.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; } +.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; } +.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; } +.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; } +.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; } +.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; } +.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; } +.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; } +.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; } +.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; } +.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; } +.ui-icon-arrowreturn-1-w { background-position: -64px -64px; } +.ui-icon-arrowreturn-1-n { background-position: -80px -64px; } +.ui-icon-arrowreturn-1-e { background-position: -96px -64px; } +.ui-icon-arrowreturn-1-s { background-position: -112px -64px; } +.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; } +.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; } +.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; } +.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; } +.ui-icon-arrow-4 { background-position: 0 -80px; } +.ui-icon-arrow-4-diag { background-position: -16px -80px; } +.ui-icon-extlink { background-position: -32px -80px; } +.ui-icon-newwin { background-position: -48px -80px; } +.ui-icon-refresh { background-position: -64px -80px; } +.ui-icon-shuffle { background-position: -80px -80px; } +.ui-icon-transfer-e-w { background-position: -96px -80px; } +.ui-icon-transferthick-e-w { background-position: -112px -80px; } +.ui-icon-folder-collapsed { background-position: 0 -96px; } +.ui-icon-folder-open { background-position: -16px -96px; } +.ui-icon-document { background-position: -32px -96px; } +.ui-icon-document-b { background-position: -48px -96px; } +.ui-icon-note { background-position: -64px -96px; } +.ui-icon-mail-closed { background-position: -80px -96px; } +.ui-icon-mail-open { background-position: -96px -96px; } +.ui-icon-suitcase { background-position: -112px -96px; } +.ui-icon-comment { background-position: -128px -96px; } +.ui-icon-person { background-position: -144px -96px; } +.ui-icon-print { background-position: -160px -96px; } +.ui-icon-trash { background-position: -176px -96px; } +.ui-icon-locked { background-position: -192px -96px; } +.ui-icon-unlocked { background-position: -208px -96px; } +.ui-icon-bookmark { background-position: -224px -96px; } +.ui-icon-tag { background-position: -240px -96px; } +.ui-icon-home { background-position: 0 -112px; } +.ui-icon-flag { background-position: -16px -112px; } +.ui-icon-calendar { background-position: -32px -112px; } +.ui-icon-cart { background-position: -48px -112px; } +.ui-icon-pencil { background-position: -64px -112px; } +.ui-icon-clock { background-position: -80px -112px; } +.ui-icon-disk { background-position: -96px -112px; } +.ui-icon-calculator { background-position: -112px -112px; } +.ui-icon-zoomin { background-position: -128px -112px; } +.ui-icon-zoomout { background-position: -144px -112px; } +.ui-icon-search { background-position: -160px -112px; } +.ui-icon-wrench { background-position: -176px -112px; } +.ui-icon-gear { background-position: -192px -112px; } +.ui-icon-heart { background-position: -208px -112px; } +.ui-icon-star { background-position: -224px -112px; } +.ui-icon-link { background-position: -240px -112px; } +.ui-icon-cancel { background-position: 0 -128px; } +.ui-icon-plus { background-position: -16px -128px; } +.ui-icon-plusthick { background-position: -32px -128px; } +.ui-icon-minus { background-position: -48px -128px; } +.ui-icon-minusthick { background-position: -64px -128px; } +.ui-icon-close { background-position: -80px -128px; } +.ui-icon-closethick { background-position: -96px -128px; } +.ui-icon-key { background-position: -112px -128px; } +.ui-icon-lightbulb { background-position: -128px -128px; } +.ui-icon-scissors { background-position: -144px -128px; } +.ui-icon-clipboard { background-position: -160px -128px; } +.ui-icon-copy { background-position: -176px -128px; } +.ui-icon-contact { background-position: -192px -128px; } +.ui-icon-image { background-position: -208px -128px; } +.ui-icon-video { background-position: -224px -128px; } +.ui-icon-script { background-position: -240px -128px; } +.ui-icon-alert { background-position: 0 -144px; } +.ui-icon-info { background-position: -16px -144px; } +.ui-icon-notice { background-position: -32px -144px; } +.ui-icon-help { background-position: -48px -144px; } +.ui-icon-check { background-position: -64px -144px; } +.ui-icon-bullet { background-position: -80px -144px; } +.ui-icon-radio-on { background-position: -96px -144px; } +.ui-icon-radio-off { background-position: -112px -144px; } +.ui-icon-pin-w { background-position: -128px -144px; } +.ui-icon-pin-s { background-position: -144px -144px; } +.ui-icon-play { background-position: 0 -160px; } +.ui-icon-pause { background-position: -16px -160px; } +.ui-icon-seek-next { background-position: -32px -160px; } +.ui-icon-seek-prev { background-position: -48px -160px; } +.ui-icon-seek-end { background-position: -64px -160px; } +.ui-icon-seek-start { background-position: -80px -160px; } +/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */ +.ui-icon-seek-first { background-position: -80px -160px; } +.ui-icon-stop { background-position: -96px -160px; } +.ui-icon-eject { background-position: -112px -160px; } +.ui-icon-volume-off { background-position: -128px -160px; } +.ui-icon-volume-on { background-position: -144px -160px; } +.ui-icon-power { background-position: 0 -176px; } +.ui-icon-signal-diag { background-position: -16px -176px; } +.ui-icon-signal { background-position: -32px -176px; } +.ui-icon-battery-0 { background-position: -48px -176px; } +.ui-icon-battery-1 { background-position: -64px -176px; } +.ui-icon-battery-2 { background-position: -80px -176px; } +.ui-icon-battery-3 { background-position: -96px -176px; } +.ui-icon-circle-plus { background-position: 0 -192px; } +.ui-icon-circle-minus { background-position: -16px -192px; } +.ui-icon-circle-close { background-position: -32px -192px; } +.ui-icon-circle-triangle-e { background-position: -48px -192px; } +.ui-icon-circle-triangle-s { background-position: -64px -192px; } +.ui-icon-circle-triangle-w { background-position: -80px -192px; } +.ui-icon-circle-triangle-n { background-position: -96px -192px; } +.ui-icon-circle-arrow-e { background-position: -112px -192px; } +.ui-icon-circle-arrow-s { background-position: -128px -192px; } +.ui-icon-circle-arrow-w { background-position: -144px -192px; } +.ui-icon-circle-arrow-n { background-position: -160px -192px; } +.ui-icon-circle-zoomin { background-position: -176px -192px; } +.ui-icon-circle-zoomout { background-position: -192px -192px; } +.ui-icon-circle-check { background-position: -208px -192px; } +.ui-icon-circlesmall-plus { background-position: 0 -208px; } +.ui-icon-circlesmall-minus { background-position: -16px -208px; } +.ui-icon-circlesmall-close { background-position: -32px -208px; } +.ui-icon-squaresmall-plus { background-position: -48px -208px; } +.ui-icon-squaresmall-minus { background-position: -64px -208px; } +.ui-icon-squaresmall-close { background-position: -80px -208px; } +.ui-icon-grip-dotted-vertical { background-position: 0 -224px; } +.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; } +.ui-icon-grip-solid-vertical { background-position: -32px -224px; } +.ui-icon-grip-solid-horizontal { background-position: -48px -224px; } +.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; } +.ui-icon-grip-diagonal-se { background-position: -80px -224px; } + + +/* Misc visuals +----------------------------------*/ + +/* Corner radius */ +.ui-corner-all, +.ui-corner-top, +.ui-corner-left, +.ui-corner-tl { + border-top-left-radius: 4px; +} +.ui-corner-all, +.ui-corner-top, +.ui-corner-right, +.ui-corner-tr { + border-top-right-radius: 4px; +} +.ui-corner-all, +.ui-corner-bottom, +.ui-corner-left, +.ui-corner-bl { + border-bottom-left-radius: 4px; +} +.ui-corner-all, +.ui-corner-bottom, +.ui-corner-right, +.ui-corner-br { + border-bottom-right-radius: 4px; +} + +/* Overlays */ +.ui-widget-overlay { + background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; + opacity: .3; + filter: Alpha(Opacity=30); +} +.ui-widget-shadow { + margin: -8px 0 0 -8px; + padding: 8px; + background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; + opacity: .3; + filter: Alpha(Opacity=30); + border-radius: 8px; +} diff --git a/templates/admin/default/assets/js/main.js b/templates/admin/default/assets/js/main.js index 90e67d721..1649449d8 100644 --- a/templates/admin/default/assets/js/main.js +++ b/templates/admin/default/assets/js/main.js @@ -15,18 +15,25 @@ widgetOptions : { filter_cssFilter : 'input-medium', filter_formatter : { + + 2 : function($cell, indx){ + return $.tablesorter.filterFormatter.uiDateCompare( $cell, indx, { + dateFormat: "dd/mm/yy", + changeMonth : true, + changeYear : true, + compare : '=' + }); + }, + 3 : function($cell, indx){ - return $.tablesorter.filterFormatter.uiSlider( $cell, indx, { - animate : true, + return $.tablesorter.filterFormatter.uiRange( $cell, indx, { value: 1, min: 1, max: 50, delayed: true, - valueToHeader: true, - exactMatch: false, - allText: 'all', - compare: '>=' - }); + valueToHeader: false, + exactMatch: false + }); } } } diff --git a/templates/admin/default/coupon/edit.html b/templates/admin/default/coupon/edit.html index 1a0b5557c..e7c23df73 100755 --- a/templates/admin/default/coupon/edit.html +++ b/templates/admin/default/coupon/edit.html @@ -69,7 +69,7 @@ -
    +
    @@ -107,7 +107,7 @@
    - +
    @@ -135,17 +135,17 @@
    Total Amount>=300is superior or equals to300 € Edit Delete
    AND NbArticleFromCategory=12 - Chaussettes rougesAND NbArticleFromCategoryis equals to12 - Chaussettes rouges Edit Delete @@ -153,7 +153,7 @@
    OR Date<=is inferior or equals to 12/02/2014 Edit @@ -167,7 +167,7 @@
    - +
    XMAS13XMAS13 Coupon for XMAS -30 € 18/10/2013 49
    XMAS14XMAS13 Coupon for XMAS -30 € 05/09/2013 20
    XMAS15XMAS13 Coupon for XMAS -30 € 03/12/2013 9
    XMAS16XMAS13 Coupon for XMAS -30 € 25/01/2013 4
    +
    - + - + - + - + + + + + + + + + + - - + - - - - - - + + @@ -73,10 +109,12 @@ -
    CodeXMAS13#CODE
    TitleCoupon for XMAS -30 €#TITLE
    Expiration date25/12/2013EXPIRATION_DATE
    Usage left49 times + {if #USAGE_LEFT} + + #USAGE_LEFT + + {else} + + 0 + + {/if} +
    #SHORT_DESCRIPTION
    #DESCRIPTION
    + {if #IS_CUMULATIVE} + + {intl l="May be cumulative"} + + {else} + + {intl l="Can't be cumulative"} + + {/if} +
    May be combinedYes + {if #IS_REMOVING_POSTAGE} + + {intl l="Will remove postage"} + + {else} + + {intl l="Won't remove postage"} + + {/if} +
    Cancel shippingNo
    EffectRemove 30 € to the cart priceAmount#AMOUNT
    Conditions of application
    - + + {/loop}
    + +
    -boucle coupon -{loop type="coupon" name="read_coupon" backend_context="true"} - inside - #ID - #CODE - #TITLE -{/loop} - {include file='includes/js.inc.html'} {javascripts file='../assets/bootstrap-editable/js/bootstrap-editable.js'} From 19ea6d25df2deef4a15a1c7d77d849fa83d3c5e9 Mon Sep 17 00:00:00 2001 From: gmorel Date: Tue, 3 Sep 2013 11:02:36 +0200 Subject: [PATCH 050/125] WIP Merge on master --- core/lib/Thelia/Model/Base/Accessory.php | 2 +- core/lib/Thelia/Model/Base/AccessoryQuery.php | 0 core/lib/Thelia/Model/Base/Address.php | 2 +- core/lib/Thelia/Model/Base/AddressQuery.php | 0 core/lib/Thelia/Model/Base/Admin.php | 2 +- core/lib/Thelia/Model/Base/AdminGroup.php | 2 +- .../lib/Thelia/Model/Base/AdminGroupQuery.php | 0 core/lib/Thelia/Model/Base/AdminLog.php | 2 +- core/lib/Thelia/Model/Base/AdminLogQuery.php | 0 core/lib/Thelia/Model/Base/AdminQuery.php | 0 core/lib/Thelia/Model/Base/Area.php | 2 +- core/lib/Thelia/Model/Base/AreaQuery.php | 0 core/lib/Thelia/Model/Base/Attribute.php | 2 +- core/lib/Thelia/Model/Base/AttributeAv.php | 2 +- .../lib/Thelia/Model/Base/AttributeAvI18n.php | 2 +- .../Model/Base/AttributeAvI18nQuery.php | 0 .../Thelia/Model/Base/AttributeAvQuery.php | 0 .../Thelia/Model/Base/AttributeCategory.php | 2 +- .../Model/Base/AttributeCategoryQuery.php | 0 .../Model/Base/AttributeCombination.php | 2 +- .../Model/Base/AttributeCombinationQuery.php | 0 core/lib/Thelia/Model/Base/AttributeI18n.php | 2 +- .../Thelia/Model/Base/AttributeI18nQuery.php | 0 core/lib/Thelia/Model/Base/AttributeQuery.php | 0 core/lib/Thelia/Model/Base/Cart.php | 2 +- core/lib/Thelia/Model/Base/CartItem.php | 2 +- core/lib/Thelia/Model/Base/CartItemQuery.php | 0 core/lib/Thelia/Model/Base/CartQuery.php | 0 core/lib/Thelia/Model/Base/Category.php | 349 +--- .../Model/Base/CategoryAssociatedContent.php | 2 +- .../Thelia/Model/Base/CategoryDocument.php | 2 +- .../Model/Base/CategoryDocumentI18n.php | 2 +- .../Model/Base/CategoryDocumentI18nQuery.php | 0 .../Model/Base/CategoryDocumentQuery.php | 0 core/lib/Thelia/Model/Base/CategoryI18n.php | 2 +- .../Thelia/Model/Base/CategoryI18nQuery.php | 0 core/lib/Thelia/Model/Base/CategoryImage.php | 2 +- .../Thelia/Model/Base/CategoryImageI18n.php | 2 +- .../Model/Base/CategoryImageI18nQuery.php | 0 .../Thelia/Model/Base/CategoryImageQuery.php | 0 core/lib/Thelia/Model/Base/CategoryQuery.php | 77 - .../lib/Thelia/Model/Base/CategoryVersion.php | 2 +- .../Model/Base/CategoryVersionQuery.php | 0 core/lib/Thelia/Model/Base/Config.php | 2 +- core/lib/Thelia/Model/Base/ConfigI18n.php | 2 +- .../lib/Thelia/Model/Base/ConfigI18nQuery.php | 0 core/lib/Thelia/Model/Base/ConfigQuery.php | 0 core/lib/Thelia/Model/Base/Content.php | 349 +--- .../lib/Thelia/Model/Base/ContentDocument.php | 2 +- .../Thelia/Model/Base/ContentDocumentI18n.php | 2 +- .../Model/Base/ContentDocumentI18nQuery.php | 0 .../Model/Base/ContentDocumentQuery.php | 0 core/lib/Thelia/Model/Base/ContentFolder.php | 2 +- .../Thelia/Model/Base/ContentFolderQuery.php | 0 core/lib/Thelia/Model/Base/ContentI18n.php | 2 +- .../Thelia/Model/Base/ContentI18nQuery.php | 0 core/lib/Thelia/Model/Base/ContentImage.php | 2 +- .../Thelia/Model/Base/ContentImageI18n.php | 2 +- .../Model/Base/ContentImageI18nQuery.php | 0 .../Thelia/Model/Base/ContentImageQuery.php | 0 core/lib/Thelia/Model/Base/ContentQuery.php | 77 - core/lib/Thelia/Model/Base/ContentVersion.php | 2 +- .../Thelia/Model/Base/ContentVersionQuery.php | 0 core/lib/Thelia/Model/Base/Country.php | 2 +- core/lib/Thelia/Model/Base/CountryI18n.php | 2 +- .../Thelia/Model/Base/CountryI18nQuery.php | 0 core/lib/Thelia/Model/Base/CountryQuery.php | 0 core/lib/Thelia/Model/Base/Coupon.php | 2 +- core/lib/Thelia/Model/Base/CouponI18n.php | 2 +- core/lib/Thelia/Model/Base/CouponOrder.php | 2 +- .../Thelia/Model/Base/CouponOrderQuery.php | 0 core/lib/Thelia/Model/Base/CouponQuery.php | 0 core/lib/Thelia/Model/Base/CouponRule.php | 1534 ----------------- .../lib/Thelia/Model/Base/CouponRuleQuery.php | 744 -------- core/lib/Thelia/Model/Base/CouponVersion.php | 2 +- core/lib/Thelia/Model/Base/Currency.php | 2 +- core/lib/Thelia/Model/Base/CurrencyI18n.php | 2 +- .../Thelia/Model/Base/CurrencyI18nQuery.php | 0 core/lib/Thelia/Model/Base/CurrencyQuery.php | 0 core/lib/Thelia/Model/Base/Customer.php | 2 +- core/lib/Thelia/Model/Base/CustomerQuery.php | 0 core/lib/Thelia/Model/Base/CustomerTitle.php | 2 +- .../Thelia/Model/Base/CustomerTitleI18n.php | 2 +- .../Model/Base/CustomerTitleI18nQuery.php | 0 .../Thelia/Model/Base/CustomerTitleQuery.php | 0 core/lib/Thelia/Model/Base/Delivzone.php | 2 +- core/lib/Thelia/Model/Base/DelivzoneQuery.php | 0 core/lib/Thelia/Model/Base/Feature.php | 2 +- core/lib/Thelia/Model/Base/FeatureAv.php | 2 +- core/lib/Thelia/Model/Base/FeatureAvI18n.php | 2 +- .../Thelia/Model/Base/FeatureAvI18nQuery.php | 0 core/lib/Thelia/Model/Base/FeatureAvQuery.php | 0 .../lib/Thelia/Model/Base/FeatureCategory.php | 2 +- .../Model/Base/FeatureCategoryQuery.php | 0 core/lib/Thelia/Model/Base/FeatureI18n.php | 2 +- .../Thelia/Model/Base/FeatureI18nQuery.php | 0 core/lib/Thelia/Model/Base/FeatureProduct.php | 2 +- .../Thelia/Model/Base/FeatureProductQuery.php | 0 core/lib/Thelia/Model/Base/FeatureQuery.php | 0 core/lib/Thelia/Model/Base/Folder.php | 349 +--- core/lib/Thelia/Model/Base/FolderDocument.php | 2 +- .../Thelia/Model/Base/FolderDocumentI18n.php | 2 +- .../Model/Base/FolderDocumentI18nQuery.php | 0 .../Thelia/Model/Base/FolderDocumentQuery.php | 0 core/lib/Thelia/Model/Base/FolderI18n.php | 2 +- .../lib/Thelia/Model/Base/FolderI18nQuery.php | 0 core/lib/Thelia/Model/Base/FolderImage.php | 2 +- .../lib/Thelia/Model/Base/FolderImageI18n.php | 2 +- .../Model/Base/FolderImageI18nQuery.php | 0 .../Thelia/Model/Base/FolderImageQuery.php | 0 core/lib/Thelia/Model/Base/FolderQuery.php | 77 - core/lib/Thelia/Model/Base/FolderVersion.php | 2 +- .../Thelia/Model/Base/FolderVersionQuery.php | 0 core/lib/Thelia/Model/Base/Group.php | 2 +- core/lib/Thelia/Model/Base/GroupI18n.php | 2 +- core/lib/Thelia/Model/Base/GroupI18nQuery.php | 0 core/lib/Thelia/Model/Base/GroupModule.php | 2 +- .../Thelia/Model/Base/GroupModuleQuery.php | 0 core/lib/Thelia/Model/Base/GroupQuery.php | 0 core/lib/Thelia/Model/Base/GroupResource.php | 2 +- .../Thelia/Model/Base/GroupResourceQuery.php | 0 core/lib/Thelia/Model/Base/Lang.php | 2 +- core/lib/Thelia/Model/Base/LangQuery.php | 0 core/lib/Thelia/Model/Base/Message.php | 2 +- core/lib/Thelia/Model/Base/MessageI18n.php | 2 +- .../Thelia/Model/Base/MessageI18nQuery.php | 0 core/lib/Thelia/Model/Base/MessageQuery.php | 0 core/lib/Thelia/Model/Base/MessageVersion.php | 2 +- .../Thelia/Model/Base/MessageVersionQuery.php | 0 core/lib/Thelia/Model/Base/Module.php | 2 +- core/lib/Thelia/Model/Base/ModuleI18n.php | 2 +- .../lib/Thelia/Model/Base/ModuleI18nQuery.php | 0 core/lib/Thelia/Model/Base/ModuleQuery.php | 0 core/lib/Thelia/Model/Base/Order.php | 2 +- core/lib/Thelia/Model/Base/OrderAddress.php | 2 +- .../Thelia/Model/Base/OrderAddressQuery.php | 0 core/lib/Thelia/Model/Base/OrderFeature.php | 2 +- .../Thelia/Model/Base/OrderFeatureQuery.php | 0 core/lib/Thelia/Model/Base/OrderProduct.php | 2 +- .../Thelia/Model/Base/OrderProductQuery.php | 0 core/lib/Thelia/Model/Base/OrderQuery.php | 0 core/lib/Thelia/Model/Base/OrderStatus.php | 2 +- .../lib/Thelia/Model/Base/OrderStatusI18n.php | 2 +- .../Model/Base/OrderStatusI18nQuery.php | 0 .../Thelia/Model/Base/OrderStatusQuery.php | 0 core/lib/Thelia/Model/Base/Product.php | 349 +--- .../Model/Base/ProductAssociatedContent.php | 2 +- .../lib/Thelia/Model/Base/ProductCategory.php | 2 +- .../Model/Base/ProductCategoryQuery.php | 0 .../lib/Thelia/Model/Base/ProductDocument.php | 2 +- .../Thelia/Model/Base/ProductDocumentI18n.php | 2 +- .../Model/Base/ProductDocumentI18nQuery.php | 0 .../Model/Base/ProductDocumentQuery.php | 0 core/lib/Thelia/Model/Base/ProductI18n.php | 2 +- .../Thelia/Model/Base/ProductI18nQuery.php | 0 core/lib/Thelia/Model/Base/ProductImage.php | 2 +- .../Thelia/Model/Base/ProductImageI18n.php | 2 +- .../Model/Base/ProductImageI18nQuery.php | 0 .../Thelia/Model/Base/ProductImageQuery.php | 0 core/lib/Thelia/Model/Base/ProductPrice.php | 2 +- .../Thelia/Model/Base/ProductPriceQuery.php | 0 core/lib/Thelia/Model/Base/ProductQuery.php | 77 - .../Thelia/Model/Base/ProductSaleElements.php | 2 +- .../Model/Base/ProductSaleElementsQuery.php | 0 core/lib/Thelia/Model/Base/ProductVersion.php | 2 +- .../Thelia/Model/Base/ProductVersionQuery.php | 0 core/lib/Thelia/Model/Base/Resource.php | 2 +- core/lib/Thelia/Model/Base/ResourceI18n.php | 2 +- .../Thelia/Model/Base/ResourceI18nQuery.php | 0 core/lib/Thelia/Model/Base/ResourceQuery.php | 0 .../Thelia/Model/Base/RewritingArgument.php | 2 +- core/lib/Thelia/Model/Base/RewritingUrl.php | 2 +- core/lib/Thelia/Model/Base/Tax.php | 2 +- core/lib/Thelia/Model/Base/TaxI18n.php | 2 +- core/lib/Thelia/Model/Base/TaxI18nQuery.php | 0 core/lib/Thelia/Model/Base/TaxQuery.php | 0 core/lib/Thelia/Model/Base/TaxRule.php | 2 +- core/lib/Thelia/Model/Base/TaxRuleCountry.php | 2 +- .../Thelia/Model/Base/TaxRuleCountryQuery.php | 0 core/lib/Thelia/Model/Base/TaxRuleI18n.php | 2 +- .../Thelia/Model/Base/TaxRuleI18nQuery.php | 0 core/lib/Thelia/Model/Base/TaxRuleQuery.php | 0 core/lib/Thelia/Model/Category.php | 1 + .../Thelia/Model/Map/AccessoryTableMap.php | 0 core/lib/Thelia/Model/Map/AddressTableMap.php | 0 .../Thelia/Model/Map/AdminGroupTableMap.php | 0 .../lib/Thelia/Model/Map/AdminLogTableMap.php | 0 core/lib/Thelia/Model/Map/AdminTableMap.php | 0 core/lib/Thelia/Model/Map/AreaTableMap.php | 0 .../Model/Map/AttributeAvI18nTableMap.php | 0 .../Thelia/Model/Map/AttributeAvTableMap.php | 0 .../Model/Map/AttributeCategoryTableMap.php | 0 .../Map/AttributeCombinationTableMap.php | 0 .../Model/Map/AttributeI18nTableMap.php | 0 .../Thelia/Model/Map/AttributeTableMap.php | 0 .../lib/Thelia/Model/Map/CartItemTableMap.php | 0 core/lib/Thelia/Model/Map/CartTableMap.php | 0 .../Map/CategoryDocumentI18nTableMap.php | 0 .../Model/Map/CategoryDocumentTableMap.php | 0 .../Thelia/Model/Map/CategoryI18nTableMap.php | 0 .../Model/Map/CategoryImageI18nTableMap.php | 0 .../Model/Map/CategoryImageTableMap.php | 0 .../lib/Thelia/Model/Map/CategoryTableMap.php | 2 - .../Model/Map/CategoryVersionTableMap.php | 0 .../Thelia/Model/Map/ConfigI18nTableMap.php | 0 core/lib/Thelia/Model/Map/ConfigTableMap.php | 0 .../Model/Map/ContentDocumentI18nTableMap.php | 0 .../Model/Map/ContentDocumentTableMap.php | 0 .../Model/Map/ContentFolderTableMap.php | 0 .../Thelia/Model/Map/ContentI18nTableMap.php | 0 .../Model/Map/ContentImageI18nTableMap.php | 0 .../Thelia/Model/Map/ContentImageTableMap.php | 0 core/lib/Thelia/Model/Map/ContentTableMap.php | 2 - .../Model/Map/ContentVersionTableMap.php | 0 .../Thelia/Model/Map/CountryI18nTableMap.php | 0 core/lib/Thelia/Model/Map/CountryTableMap.php | 0 .../Thelia/Model/Map/CouponI18nTableMap.php | 9 +- .../Thelia/Model/Map/CouponOrderTableMap.php | 0 .../Thelia/Model/Map/CouponRuleTableMap.php | 463 ----- core/lib/Thelia/Model/Map/CouponTableMap.php | 0 .../Thelia/Model/Map/CurrencyI18nTableMap.php | 0 .../lib/Thelia/Model/Map/CurrencyTableMap.php | 0 .../lib/Thelia/Model/Map/CustomerTableMap.php | 0 .../Model/Map/CustomerTitleI18nTableMap.php | 0 .../Model/Map/CustomerTitleTableMap.php | 0 .../Thelia/Model/Map/DelivzoneTableMap.php | 0 .../Model/Map/FeatureAvI18nTableMap.php | 0 .../Thelia/Model/Map/FeatureAvTableMap.php | 0 .../Model/Map/FeatureCategoryTableMap.php | 0 .../Thelia/Model/Map/FeatureI18nTableMap.php | 0 .../Model/Map/FeatureProductTableMap.php | 0 core/lib/Thelia/Model/Map/FeatureTableMap.php | 0 .../Model/Map/FolderDocumentI18nTableMap.php | 0 .../Model/Map/FolderDocumentTableMap.php | 0 .../Thelia/Model/Map/FolderI18nTableMap.php | 0 .../Model/Map/FolderImageI18nTableMap.php | 0 .../Thelia/Model/Map/FolderImageTableMap.php | 0 core/lib/Thelia/Model/Map/FolderTableMap.php | 2 - .../Model/Map/FolderVersionTableMap.php | 0 .../Thelia/Model/Map/GroupI18nTableMap.php | 0 .../Thelia/Model/Map/GroupModuleTableMap.php | 0 .../Model/Map/GroupResourceTableMap.php | 0 core/lib/Thelia/Model/Map/GroupTableMap.php | 0 core/lib/Thelia/Model/Map/LangTableMap.php | 0 .../Thelia/Model/Map/MessageI18nTableMap.php | 0 core/lib/Thelia/Model/Map/MessageTableMap.php | 0 .../Model/Map/MessageVersionTableMap.php | 0 .../Thelia/Model/Map/ModuleI18nTableMap.php | 0 core/lib/Thelia/Model/Map/ModuleTableMap.php | 0 .../Thelia/Model/Map/OrderAddressTableMap.php | 0 .../Thelia/Model/Map/OrderFeatureTableMap.php | 0 .../Thelia/Model/Map/OrderProductTableMap.php | 0 .../Model/Map/OrderStatusI18nTableMap.php | 0 .../Thelia/Model/Map/OrderStatusTableMap.php | 0 core/lib/Thelia/Model/Map/OrderTableMap.php | 0 .../Model/Map/ProductCategoryTableMap.php | 0 .../Model/Map/ProductDocumentI18nTableMap.php | 0 .../Model/Map/ProductDocumentTableMap.php | 0 .../Thelia/Model/Map/ProductI18nTableMap.php | 0 .../Model/Map/ProductImageI18nTableMap.php | 0 .../Thelia/Model/Map/ProductImageTableMap.php | 0 .../Thelia/Model/Map/ProductPriceTableMap.php | 0 .../Model/Map/ProductSaleElementsTableMap.php | 0 core/lib/Thelia/Model/Map/ProductTableMap.php | 2 - .../Model/Map/ProductVersionTableMap.php | 0 .../Thelia/Model/Map/ResourceI18nTableMap.php | 0 .../lib/Thelia/Model/Map/ResourceTableMap.php | 0 core/lib/Thelia/Model/Map/TaxI18nTableMap.php | 0 .../Model/Map/TaxRuleCountryTableMap.php | 0 .../Thelia/Model/Map/TaxRuleI18nTableMap.php | 0 core/lib/Thelia/Model/Map/TaxRuleTableMap.php | 0 core/lib/Thelia/Model/Map/TaxTableMap.php | 0 core/lib/Thelia/Model/Rewriting.php | 9 + core/lib/Thelia/Model/RewritingQuery.php | 20 + install/faker.php | 2 +- install/thelia.sql | 163 +- local/config/schema.xml | 82 +- reset_install.sh | 2 +- 278 files changed, 261 insertions(+), 4658 deletions(-) mode change 100755 => 100644 core/lib/Thelia/Model/Base/Accessory.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/AccessoryQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/Address.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/AddressQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/Admin.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/AdminGroup.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/AdminGroupQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/AdminLog.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/AdminLogQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/AdminQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/Area.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/AreaQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/Attribute.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/AttributeAv.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/AttributeAvI18n.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/AttributeAvI18nQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/AttributeAvQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/AttributeCategory.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/AttributeCategoryQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/AttributeCombination.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/AttributeCombinationQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/AttributeI18n.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/AttributeI18nQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/AttributeQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/Cart.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/CartItem.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/CartItemQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/CartQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/Category.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/CategoryDocument.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/CategoryDocumentI18n.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/CategoryDocumentI18nQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/CategoryDocumentQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/CategoryI18n.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/CategoryI18nQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/CategoryImage.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/CategoryImageI18n.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/CategoryImageI18nQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/CategoryImageQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/CategoryQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/CategoryVersion.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/CategoryVersionQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/Config.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ConfigI18n.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ConfigI18nQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ConfigQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/Content.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ContentDocument.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ContentDocumentI18n.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ContentDocumentI18nQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ContentDocumentQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ContentFolder.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ContentFolderQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ContentI18n.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ContentI18nQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ContentImage.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ContentImageI18n.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ContentImageI18nQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ContentImageQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ContentQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ContentVersion.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ContentVersionQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/Country.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/CountryI18n.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/CountryI18nQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/CountryQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/Coupon.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/CouponOrder.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/CouponOrderQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/CouponQuery.php delete mode 100755 core/lib/Thelia/Model/Base/CouponRule.php delete mode 100755 core/lib/Thelia/Model/Base/CouponRuleQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/Currency.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/CurrencyI18n.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/CurrencyI18nQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/CurrencyQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/Customer.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/CustomerQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/CustomerTitle.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/CustomerTitleI18n.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/CustomerTitleI18nQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/CustomerTitleQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/Delivzone.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/DelivzoneQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/Feature.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/FeatureAv.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/FeatureAvI18n.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/FeatureAvI18nQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/FeatureAvQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/FeatureCategory.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/FeatureCategoryQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/FeatureI18n.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/FeatureI18nQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/FeatureProduct.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/FeatureProductQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/FeatureQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/Folder.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/FolderDocument.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/FolderDocumentI18n.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/FolderDocumentI18nQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/FolderDocumentQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/FolderI18n.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/FolderI18nQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/FolderImage.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/FolderImageI18n.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/FolderImageI18nQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/FolderImageQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/FolderQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/FolderVersion.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/FolderVersionQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/Group.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/GroupI18n.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/GroupI18nQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/GroupModule.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/GroupModuleQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/GroupQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/GroupResource.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/GroupResourceQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/Lang.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/LangQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/Message.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/MessageI18n.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/MessageI18nQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/MessageQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/MessageVersion.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/MessageVersionQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/Module.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ModuleI18n.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ModuleI18nQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ModuleQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/Order.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/OrderAddress.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/OrderAddressQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/OrderFeature.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/OrderFeatureQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/OrderProduct.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/OrderProductQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/OrderQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/OrderStatus.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/OrderStatusI18n.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/OrderStatusI18nQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/OrderStatusQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/Product.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ProductCategory.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ProductCategoryQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ProductDocument.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ProductDocumentI18n.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ProductDocumentI18nQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ProductDocumentQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ProductI18n.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ProductI18nQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ProductImage.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ProductImageI18n.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ProductImageI18nQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ProductImageQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ProductPrice.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ProductPriceQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ProductQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ProductSaleElements.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ProductSaleElementsQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ProductVersion.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ProductVersionQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/Resource.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ResourceI18n.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ResourceI18nQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/ResourceQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/Tax.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/TaxI18n.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/TaxI18nQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/TaxQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/TaxRule.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/TaxRuleCountry.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/TaxRuleCountryQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/TaxRuleI18n.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/TaxRuleI18nQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Base/TaxRuleQuery.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/AccessoryTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/AddressTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/AdminGroupTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/AdminLogTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/AdminTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/AreaTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/AttributeAvI18nTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/AttributeAvTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/AttributeCategoryTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/AttributeCombinationTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/AttributeI18nTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/AttributeTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/CartItemTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/CartTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/CategoryDocumentI18nTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/CategoryDocumentTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/CategoryI18nTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/CategoryImageI18nTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/CategoryImageTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/CategoryTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/CategoryVersionTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/ConfigI18nTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/ConfigTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/ContentDocumentI18nTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/ContentDocumentTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/ContentFolderTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/ContentI18nTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/ContentImageI18nTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/ContentImageTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/ContentTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/ContentVersionTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/CountryI18nTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/CountryTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/CouponOrderTableMap.php delete mode 100755 core/lib/Thelia/Model/Map/CouponRuleTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/CouponTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/CurrencyI18nTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/CurrencyTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/CustomerTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/CustomerTitleI18nTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/CustomerTitleTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/DelivzoneTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/FeatureAvI18nTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/FeatureAvTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/FeatureCategoryTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/FeatureI18nTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/FeatureProductTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/FeatureTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/FolderDocumentI18nTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/FolderDocumentTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/FolderI18nTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/FolderImageI18nTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/FolderImageTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/FolderTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/FolderVersionTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/GroupI18nTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/GroupModuleTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/GroupResourceTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/GroupTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/LangTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/MessageI18nTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/MessageTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/MessageVersionTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/ModuleI18nTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/ModuleTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/OrderAddressTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/OrderFeatureTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/OrderProductTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/OrderStatusI18nTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/OrderStatusTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/OrderTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/ProductCategoryTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/ProductDocumentI18nTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/ProductDocumentTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/ProductI18nTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/ProductImageI18nTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/ProductImageTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/ProductPriceTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/ProductSaleElementsTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/ProductTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/ProductVersionTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/ResourceI18nTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/ResourceTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/TaxI18nTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/TaxRuleCountryTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/TaxRuleTableMap.php mode change 100755 => 100644 core/lib/Thelia/Model/Map/TaxTableMap.php create mode 100644 core/lib/Thelia/Model/Rewriting.php create mode 100644 core/lib/Thelia/Model/RewritingQuery.php diff --git a/core/lib/Thelia/Model/Base/Accessory.php b/core/lib/Thelia/Model/Base/Accessory.php old mode 100755 new mode 100644 index f4110b19e..183f59947 --- a/core/lib/Thelia/Model/Base/Accessory.php +++ b/core/lib/Thelia/Model/Base/Accessory.php @@ -266,7 +266,7 @@ abstract class Accessory implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/AccessoryQuery.php b/core/lib/Thelia/Model/Base/AccessoryQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Address.php b/core/lib/Thelia/Model/Base/Address.php old mode 100755 new mode 100644 index 45cad61aa..a6ab068d1 --- a/core/lib/Thelia/Model/Base/Address.php +++ b/core/lib/Thelia/Model/Base/Address.php @@ -388,7 +388,7 @@ abstract class Address implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/AddressQuery.php b/core/lib/Thelia/Model/Base/AddressQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Admin.php b/core/lib/Thelia/Model/Base/Admin.php old mode 100755 new mode 100644 index b1241473e..6110aee7a --- a/core/lib/Thelia/Model/Base/Admin.php +++ b/core/lib/Thelia/Model/Base/Admin.php @@ -300,7 +300,7 @@ abstract class Admin implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/AdminGroup.php b/core/lib/Thelia/Model/Base/AdminGroup.php old mode 100755 new mode 100644 index 60141e3f8..9eadbb107 --- a/core/lib/Thelia/Model/Base/AdminGroup.php +++ b/core/lib/Thelia/Model/Base/AdminGroup.php @@ -262,7 +262,7 @@ abstract class AdminGroup implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/AdminGroupQuery.php b/core/lib/Thelia/Model/Base/AdminGroupQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/AdminLog.php b/core/lib/Thelia/Model/Base/AdminLog.php old mode 100755 new mode 100644 index c83be20ee..ae828e4bb --- a/core/lib/Thelia/Model/Base/AdminLog.php +++ b/core/lib/Thelia/Model/Base/AdminLog.php @@ -266,7 +266,7 @@ abstract class AdminLog implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/AdminLogQuery.php b/core/lib/Thelia/Model/Base/AdminLogQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/AdminQuery.php b/core/lib/Thelia/Model/Base/AdminQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Area.php b/core/lib/Thelia/Model/Base/Area.php old mode 100755 new mode 100644 index fbd3199f4..08fc8be42 --- a/core/lib/Thelia/Model/Base/Area.php +++ b/core/lib/Thelia/Model/Base/Area.php @@ -277,7 +277,7 @@ abstract class Area implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/AreaQuery.php b/core/lib/Thelia/Model/Base/AreaQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Attribute.php b/core/lib/Thelia/Model/Base/Attribute.php old mode 100755 new mode 100644 index efe4a631d..3c754c3b5 --- a/core/lib/Thelia/Model/Base/Attribute.php +++ b/core/lib/Thelia/Model/Base/Attribute.php @@ -326,7 +326,7 @@ abstract class Attribute implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/AttributeAv.php b/core/lib/Thelia/Model/Base/AttributeAv.php old mode 100755 new mode 100644 index 43a1be294..b94288753 --- a/core/lib/Thelia/Model/Base/AttributeAv.php +++ b/core/lib/Thelia/Model/Base/AttributeAv.php @@ -298,7 +298,7 @@ abstract class AttributeAv implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/AttributeAvI18n.php b/core/lib/Thelia/Model/Base/AttributeAvI18n.php old mode 100755 new mode 100644 index 3e7b9afcd..ec6f8811f --- a/core/lib/Thelia/Model/Base/AttributeAvI18n.php +++ b/core/lib/Thelia/Model/Base/AttributeAvI18n.php @@ -272,7 +272,7 @@ abstract class AttributeAvI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/AttributeAvI18nQuery.php b/core/lib/Thelia/Model/Base/AttributeAvI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/AttributeAvQuery.php b/core/lib/Thelia/Model/Base/AttributeAvQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/AttributeCategory.php b/core/lib/Thelia/Model/Base/AttributeCategory.php old mode 100755 new mode 100644 index 691fa43ad..da702559a --- a/core/lib/Thelia/Model/Base/AttributeCategory.php +++ b/core/lib/Thelia/Model/Base/AttributeCategory.php @@ -262,7 +262,7 @@ abstract class AttributeCategory implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/AttributeCategoryQuery.php b/core/lib/Thelia/Model/Base/AttributeCategoryQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/AttributeCombination.php b/core/lib/Thelia/Model/Base/AttributeCombination.php old mode 100755 new mode 100644 index ea2ade03c..ef840a5a1 --- a/core/lib/Thelia/Model/Base/AttributeCombination.php +++ b/core/lib/Thelia/Model/Base/AttributeCombination.php @@ -269,7 +269,7 @@ abstract class AttributeCombination implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/AttributeCombinationQuery.php b/core/lib/Thelia/Model/Base/AttributeCombinationQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/AttributeI18n.php b/core/lib/Thelia/Model/Base/AttributeI18n.php old mode 100755 new mode 100644 index 0e4a1db8f..d75c24412 --- a/core/lib/Thelia/Model/Base/AttributeI18n.php +++ b/core/lib/Thelia/Model/Base/AttributeI18n.php @@ -272,7 +272,7 @@ abstract class AttributeI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/AttributeI18nQuery.php b/core/lib/Thelia/Model/Base/AttributeI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/AttributeQuery.php b/core/lib/Thelia/Model/Base/AttributeQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Cart.php b/core/lib/Thelia/Model/Base/Cart.php old mode 100755 new mode 100644 index 910bdf0e0..20a2d9a5c --- a/core/lib/Thelia/Model/Base/Cart.php +++ b/core/lib/Thelia/Model/Base/Cart.php @@ -307,7 +307,7 @@ abstract class Cart implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CartItem.php b/core/lib/Thelia/Model/Base/CartItem.php old mode 100755 new mode 100644 index 3c5711022..827a4c5ec --- a/core/lib/Thelia/Model/Base/CartItem.php +++ b/core/lib/Thelia/Model/Base/CartItem.php @@ -313,7 +313,7 @@ abstract class CartItem implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CartItemQuery.php b/core/lib/Thelia/Model/Base/CartItemQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/CartQuery.php b/core/lib/Thelia/Model/Base/CartQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Category.php b/core/lib/Thelia/Model/Base/Category.php old mode 100755 new mode 100644 index 185583889..ee56670a1 --- a/core/lib/Thelia/Model/Base/Category.php +++ b/core/lib/Thelia/Model/Base/Category.php @@ -41,8 +41,6 @@ use Thelia\Model\Product as ChildProduct; use Thelia\Model\ProductCategory as ChildProductCategory; use Thelia\Model\ProductCategoryQuery as ChildProductCategoryQuery; use Thelia\Model\ProductQuery as ChildProductQuery; -use Thelia\Model\Rewriting as ChildRewriting; -use Thelia\Model\RewritingQuery as ChildRewritingQuery; use Thelia\Model\Map\CategoryTableMap; use Thelia\Model\Map\CategoryVersionTableMap; @@ -153,12 +151,6 @@ abstract class Category implements ActiveRecordInterface protected $collAttributeCategories; protected $collAttributeCategoriesPartial; - /** - * @var ObjectCollection|ChildRewriting[] Collection to store aggregation of ChildRewriting objects. - */ - protected $collRewritings; - protected $collRewritingsPartial; - /** * @var ObjectCollection|ChildCategoryImage[] Collection to store aggregation of ChildCategoryImage objects. */ @@ -270,12 +262,6 @@ abstract class Category implements ActiveRecordInterface */ protected $attributeCategoriesScheduledForDeletion = null; - /** - * An array of objects scheduled for deletion. - * @var ObjectCollection - */ - protected $rewritingsScheduledForDeletion = null; - /** * An array of objects scheduled for deletion. * @var ObjectCollection @@ -475,7 +461,7 @@ abstract class Category implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** @@ -1039,8 +1025,6 @@ abstract class Category implements ActiveRecordInterface $this->collAttributeCategories = null; - $this->collRewritings = null; - $this->collCategoryImages = null; $this->collCategoryDocuments = null; @@ -1331,23 +1315,6 @@ abstract class Category implements ActiveRecordInterface } } - if ($this->rewritingsScheduledForDeletion !== null) { - if (!$this->rewritingsScheduledForDeletion->isEmpty()) { - \Thelia\Model\RewritingQuery::create() - ->filterByPrimaryKeys($this->rewritingsScheduledForDeletion->getPrimaryKeys(false)) - ->delete($con); - $this->rewritingsScheduledForDeletion = null; - } - } - - if ($this->collRewritings !== null) { - foreach ($this->collRewritings as $referrerFK) { - if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) { - $affectedRows += $referrerFK->save($con); - } - } - } - if ($this->categoryImagesScheduledForDeletion !== null) { if (!$this->categoryImagesScheduledForDeletion->isEmpty()) { \Thelia\Model\CategoryImageQuery::create() @@ -1668,9 +1635,6 @@ abstract class Category implements ActiveRecordInterface if (null !== $this->collAttributeCategories) { $result['AttributeCategories'] = $this->collAttributeCategories->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } - if (null !== $this->collRewritings) { - $result['Rewritings'] = $this->collRewritings->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); - } if (null !== $this->collCategoryImages) { $result['CategoryImages'] = $this->collCategoryImages->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } @@ -1895,12 +1859,6 @@ abstract class Category implements ActiveRecordInterface } } - foreach ($this->getRewritings() as $relObj) { - if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves - $copyObj->addRewriting($relObj->copy($deepCopy)); - } - } - foreach ($this->getCategoryImages() as $relObj) { if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves $copyObj->addCategoryImage($relObj->copy($deepCopy)); @@ -1981,9 +1939,6 @@ abstract class Category implements ActiveRecordInterface if ('AttributeCategory' == $relationName) { return $this->initAttributeCategories(); } - if ('Rewriting' == $relationName) { - return $this->initRewritings(); - } if ('CategoryImage' == $relationName) { return $this->initCategoryImages(); } @@ -2733,299 +2688,6 @@ abstract class Category implements ActiveRecordInterface return $this->getAttributeCategories($query, $con); } - /** - * Clears out the collRewritings collection - * - * This does not modify the database; however, it will remove any associated objects, causing - * them to be refetched by subsequent calls to accessor method. - * - * @return void - * @see addRewritings() - */ - public function clearRewritings() - { - $this->collRewritings = null; // important to set this to NULL since that means it is uninitialized - } - - /** - * Reset is the collRewritings collection loaded partially. - */ - public function resetPartialRewritings($v = true) - { - $this->collRewritingsPartial = $v; - } - - /** - * Initializes the collRewritings collection. - * - * By default this just sets the collRewritings collection to an empty array (like clearcollRewritings()); - * however, you may wish to override this method in your stub class to provide setting appropriate - * to your application -- for example, setting the initial array to the values stored in database. - * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty - * - * @return void - */ - public function initRewritings($overrideExisting = true) - { - if (null !== $this->collRewritings && !$overrideExisting) { - return; - } - $this->collRewritings = new ObjectCollection(); - $this->collRewritings->setModel('\Thelia\Model\Rewriting'); - } - - /** - * Gets an array of ChildRewriting objects which contain a foreign key that references this object. - * - * If the $criteria is not null, it is used to always fetch the results from the database. - * Otherwise the results are fetched from the database the first time, then cached. - * Next time the same method is called without $criteria, the cached collection is returned. - * If this ChildCategory is new, it will return - * an empty collection or the current collection; the criteria is ignored on a new object. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @return Collection|ChildRewriting[] List of ChildRewriting objects - * @throws PropelException - */ - public function getRewritings($criteria = null, ConnectionInterface $con = null) - { - $partial = $this->collRewritingsPartial && !$this->isNew(); - if (null === $this->collRewritings || null !== $criteria || $partial) { - if ($this->isNew() && null === $this->collRewritings) { - // return empty collection - $this->initRewritings(); - } else { - $collRewritings = ChildRewritingQuery::create(null, $criteria) - ->filterByCategory($this) - ->find($con); - - if (null !== $criteria) { - if (false !== $this->collRewritingsPartial && count($collRewritings)) { - $this->initRewritings(false); - - foreach ($collRewritings as $obj) { - if (false == $this->collRewritings->contains($obj)) { - $this->collRewritings->append($obj); - } - } - - $this->collRewritingsPartial = true; - } - - $collRewritings->getInternalIterator()->rewind(); - - return $collRewritings; - } - - if ($partial && $this->collRewritings) { - foreach ($this->collRewritings as $obj) { - if ($obj->isNew()) { - $collRewritings[] = $obj; - } - } - } - - $this->collRewritings = $collRewritings; - $this->collRewritingsPartial = false; - } - } - - return $this->collRewritings; - } - - /** - * Sets a collection of Rewriting objects related by a one-to-many relationship - * to the current object. - * It will also schedule objects for deletion based on a diff between old objects (aka persisted) - * and new objects from the given Propel collection. - * - * @param Collection $rewritings A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildCategory The current object (for fluent API support) - */ - public function setRewritings(Collection $rewritings, ConnectionInterface $con = null) - { - $rewritingsToDelete = $this->getRewritings(new Criteria(), $con)->diff($rewritings); - - - $this->rewritingsScheduledForDeletion = $rewritingsToDelete; - - foreach ($rewritingsToDelete as $rewritingRemoved) { - $rewritingRemoved->setCategory(null); - } - - $this->collRewritings = null; - foreach ($rewritings as $rewriting) { - $this->addRewriting($rewriting); - } - - $this->collRewritings = $rewritings; - $this->collRewritingsPartial = false; - - return $this; - } - - /** - * Returns the number of related Rewriting objects. - * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related Rewriting objects. - * @throws PropelException - */ - public function countRewritings(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) - { - $partial = $this->collRewritingsPartial && !$this->isNew(); - if (null === $this->collRewritings || null !== $criteria || $partial) { - if ($this->isNew() && null === $this->collRewritings) { - return 0; - } - - if ($partial && !$criteria) { - return count($this->getRewritings()); - } - - $query = ChildRewritingQuery::create(null, $criteria); - if ($distinct) { - $query->distinct(); - } - - return $query - ->filterByCategory($this) - ->count($con); - } - - return count($this->collRewritings); - } - - /** - * Method called to associate a ChildRewriting object to this object - * through the ChildRewriting foreign key attribute. - * - * @param ChildRewriting $l ChildRewriting - * @return \Thelia\Model\Category The current object (for fluent API support) - */ - public function addRewriting(ChildRewriting $l) - { - if ($this->collRewritings === null) { - $this->initRewritings(); - $this->collRewritingsPartial = true; - } - - if (!in_array($l, $this->collRewritings->getArrayCopy(), true)) { // only add it if the **same** object is not already associated - $this->doAddRewriting($l); - } - - return $this; - } - - /** - * @param Rewriting $rewriting The rewriting object to add. - */ - protected function doAddRewriting($rewriting) - { - $this->collRewritings[]= $rewriting; - $rewriting->setCategory($this); - } - - /** - * @param Rewriting $rewriting The rewriting object to remove. - * @return ChildCategory The current object (for fluent API support) - */ - public function removeRewriting($rewriting) - { - if ($this->getRewritings()->contains($rewriting)) { - $this->collRewritings->remove($this->collRewritings->search($rewriting)); - if (null === $this->rewritingsScheduledForDeletion) { - $this->rewritingsScheduledForDeletion = clone $this->collRewritings; - $this->rewritingsScheduledForDeletion->clear(); - } - $this->rewritingsScheduledForDeletion[]= $rewriting; - $rewriting->setCategory(null); - } - - return $this; - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Category is new, it will return - * an empty collection; or if this Category has previously - * been saved, it will retrieve related Rewritings from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Category. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildRewriting[] List of ChildRewriting objects - */ - public function getRewritingsJoinProduct($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildRewritingQuery::create(null, $criteria); - $query->joinWith('Product', $joinBehavior); - - return $this->getRewritings($query, $con); - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Category is new, it will return - * an empty collection; or if this Category has previously - * been saved, it will retrieve related Rewritings from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Category. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildRewriting[] List of ChildRewriting objects - */ - public function getRewritingsJoinFolder($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildRewritingQuery::create(null, $criteria); - $query->joinWith('Folder', $joinBehavior); - - return $this->getRewritings($query, $con); - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Category is new, it will return - * an empty collection; or if this Category has previously - * been saved, it will retrieve related Rewritings from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Category. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildRewriting[] List of ChildRewriting objects - */ - public function getRewritingsJoinContent($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildRewritingQuery::create(null, $criteria); - $query->joinWith('Content', $joinBehavior); - - return $this->getRewritings($query, $con); - } - /** * Clears out the collCategoryImages collection * @@ -4749,11 +4411,6 @@ abstract class Category implements ActiveRecordInterface $o->clearAllReferences($deep); } } - if ($this->collRewritings) { - foreach ($this->collRewritings as $o) { - $o->clearAllReferences($deep); - } - } if ($this->collCategoryImages) { foreach ($this->collCategoryImages as $o) { $o->clearAllReferences($deep); @@ -4812,10 +4469,6 @@ abstract class Category implements ActiveRecordInterface $this->collAttributeCategories->clearIterator(); } $this->collAttributeCategories = null; - if ($this->collRewritings instanceof Collection) { - $this->collRewritings->clearIterator(); - } - $this->collRewritings = null; if ($this->collCategoryImages instanceof Collection) { $this->collCategoryImages->clearIterator(); } diff --git a/core/lib/Thelia/Model/Base/CategoryAssociatedContent.php b/core/lib/Thelia/Model/Base/CategoryAssociatedContent.php index a731ec971..142ab543f 100644 --- a/core/lib/Thelia/Model/Base/CategoryAssociatedContent.php +++ b/core/lib/Thelia/Model/Base/CategoryAssociatedContent.php @@ -268,7 +268,7 @@ abstract class CategoryAssociatedContent implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CategoryDocument.php b/core/lib/Thelia/Model/Base/CategoryDocument.php old mode 100755 new mode 100644 index 165bfa492..7539312cc --- a/core/lib/Thelia/Model/Base/CategoryDocument.php +++ b/core/lib/Thelia/Model/Base/CategoryDocument.php @@ -290,7 +290,7 @@ abstract class CategoryDocument implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CategoryDocumentI18n.php b/core/lib/Thelia/Model/Base/CategoryDocumentI18n.php old mode 100755 new mode 100644 index db3189cc3..4d284b57e --- a/core/lib/Thelia/Model/Base/CategoryDocumentI18n.php +++ b/core/lib/Thelia/Model/Base/CategoryDocumentI18n.php @@ -272,7 +272,7 @@ abstract class CategoryDocumentI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CategoryDocumentI18nQuery.php b/core/lib/Thelia/Model/Base/CategoryDocumentI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/CategoryDocumentQuery.php b/core/lib/Thelia/Model/Base/CategoryDocumentQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/CategoryI18n.php b/core/lib/Thelia/Model/Base/CategoryI18n.php old mode 100755 new mode 100644 index 83d62572d..9ae8c8cf3 --- a/core/lib/Thelia/Model/Base/CategoryI18n.php +++ b/core/lib/Thelia/Model/Base/CategoryI18n.php @@ -272,7 +272,7 @@ abstract class CategoryI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CategoryI18nQuery.php b/core/lib/Thelia/Model/Base/CategoryI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/CategoryImage.php b/core/lib/Thelia/Model/Base/CategoryImage.php old mode 100755 new mode 100644 index efde7b64a..353c79c4f --- a/core/lib/Thelia/Model/Base/CategoryImage.php +++ b/core/lib/Thelia/Model/Base/CategoryImage.php @@ -290,7 +290,7 @@ abstract class CategoryImage implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CategoryImageI18n.php b/core/lib/Thelia/Model/Base/CategoryImageI18n.php old mode 100755 new mode 100644 index ce61e9836..61b4fc413 --- a/core/lib/Thelia/Model/Base/CategoryImageI18n.php +++ b/core/lib/Thelia/Model/Base/CategoryImageI18n.php @@ -272,7 +272,7 @@ abstract class CategoryImageI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CategoryImageI18nQuery.php b/core/lib/Thelia/Model/Base/CategoryImageI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/CategoryImageQuery.php b/core/lib/Thelia/Model/Base/CategoryImageQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/CategoryQuery.php b/core/lib/Thelia/Model/Base/CategoryQuery.php old mode 100755 new mode 100644 index c905abf5a..7f0fb8f1c --- a/core/lib/Thelia/Model/Base/CategoryQuery.php +++ b/core/lib/Thelia/Model/Base/CategoryQuery.php @@ -58,10 +58,6 @@ use Thelia\Model\Map\CategoryTableMap; * @method ChildCategoryQuery rightJoinAttributeCategory($relationAlias = null) Adds a RIGHT JOIN clause to the query using the AttributeCategory relation * @method ChildCategoryQuery innerJoinAttributeCategory($relationAlias = null) Adds a INNER JOIN clause to the query using the AttributeCategory relation * - * @method ChildCategoryQuery leftJoinRewriting($relationAlias = null) Adds a LEFT JOIN clause to the query using the Rewriting relation - * @method ChildCategoryQuery rightJoinRewriting($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Rewriting relation - * @method ChildCategoryQuery innerJoinRewriting($relationAlias = null) Adds a INNER JOIN clause to the query using the Rewriting relation - * * @method ChildCategoryQuery leftJoinCategoryImage($relationAlias = null) Adds a LEFT JOIN clause to the query using the CategoryImage relation * @method ChildCategoryQuery rightJoinCategoryImage($relationAlias = null) Adds a RIGHT JOIN clause to the query using the CategoryImage relation * @method ChildCategoryQuery innerJoinCategoryImage($relationAlias = null) Adds a INNER JOIN clause to the query using the CategoryImage relation @@ -870,79 +866,6 @@ abstract class CategoryQuery extends ModelCriteria ->useQuery($relationAlias ? $relationAlias : 'AttributeCategory', '\Thelia\Model\AttributeCategoryQuery'); } - /** - * Filter the query by a related \Thelia\Model\Rewriting object - * - * @param \Thelia\Model\Rewriting|ObjectCollection $rewriting the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildCategoryQuery The current query, for fluid interface - */ - public function filterByRewriting($rewriting, $comparison = null) - { - if ($rewriting instanceof \Thelia\Model\Rewriting) { - return $this - ->addUsingAlias(CategoryTableMap::ID, $rewriting->getCategoryId(), $comparison); - } elseif ($rewriting instanceof ObjectCollection) { - return $this - ->useRewritingQuery() - ->filterByPrimaryKeys($rewriting->getPrimaryKeys()) - ->endUse(); - } else { - throw new PropelException('filterByRewriting() only accepts arguments of type \Thelia\Model\Rewriting or Collection'); - } - } - - /** - * Adds a JOIN clause to the query using the Rewriting relation - * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return ChildCategoryQuery The current query, for fluid interface - */ - public function joinRewriting($relationAlias = null, $joinType = Criteria::LEFT_JOIN) - { - $tableMap = $this->getTableMap(); - $relationMap = $tableMap->getRelation('Rewriting'); - - // create a ModelJoin object for this join - $join = new ModelJoin(); - $join->setJoinType($joinType); - $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); - if ($previousJoin = $this->getPreviousJoin()) { - $join->setPreviousJoin($previousJoin); - } - - // add the ModelJoin to the current object - if ($relationAlias) { - $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); - $this->addJoinObject($join, $relationAlias); - } else { - $this->addJoinObject($join, 'Rewriting'); - } - - return $this; - } - - /** - * Use the Rewriting relation Rewriting object - * - * @see useQuery() - * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return \Thelia\Model\RewritingQuery A secondary query class using the current class as primary query - */ - public function useRewritingQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) - { - return $this - ->joinRewriting($relationAlias, $joinType) - ->useQuery($relationAlias ? $relationAlias : 'Rewriting', '\Thelia\Model\RewritingQuery'); - } - /** * Filter the query by a related \Thelia\Model\CategoryImage object * diff --git a/core/lib/Thelia/Model/Base/CategoryVersion.php b/core/lib/Thelia/Model/Base/CategoryVersion.php old mode 100755 new mode 100644 index d8dfe76e0..416ad95d5 --- a/core/lib/Thelia/Model/Base/CategoryVersion.php +++ b/core/lib/Thelia/Model/Base/CategoryVersion.php @@ -292,7 +292,7 @@ abstract class CategoryVersion implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CategoryVersionQuery.php b/core/lib/Thelia/Model/Base/CategoryVersionQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Config.php b/core/lib/Thelia/Model/Base/Config.php old mode 100755 new mode 100644 index d687ffefe..9f2080d1f --- a/core/lib/Thelia/Model/Base/Config.php +++ b/core/lib/Thelia/Model/Base/Config.php @@ -305,7 +305,7 @@ abstract class Config implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ConfigI18n.php b/core/lib/Thelia/Model/Base/ConfigI18n.php old mode 100755 new mode 100644 index 6247e15d1..71f1d5287 --- a/core/lib/Thelia/Model/Base/ConfigI18n.php +++ b/core/lib/Thelia/Model/Base/ConfigI18n.php @@ -272,7 +272,7 @@ abstract class ConfigI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ConfigI18nQuery.php b/core/lib/Thelia/Model/Base/ConfigI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ConfigQuery.php b/core/lib/Thelia/Model/Base/ConfigQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Content.php b/core/lib/Thelia/Model/Base/Content.php old mode 100755 new mode 100644 index a2bb2b8c2..aa53fb9b5 --- a/core/lib/Thelia/Model/Base/Content.php +++ b/core/lib/Thelia/Model/Base/Content.php @@ -35,8 +35,6 @@ use Thelia\Model\Folder as ChildFolder; use Thelia\Model\FolderQuery as ChildFolderQuery; use Thelia\Model\ProductAssociatedContent as ChildProductAssociatedContent; use Thelia\Model\ProductAssociatedContentQuery as ChildProductAssociatedContentQuery; -use Thelia\Model\Rewriting as ChildRewriting; -use Thelia\Model\RewritingQuery as ChildRewritingQuery; use Thelia\Model\Map\ContentTableMap; use Thelia\Model\Map\ContentVersionTableMap; @@ -123,12 +121,6 @@ abstract class Content implements ActiveRecordInterface */ protected $version_created_by; - /** - * @var ObjectCollection|ChildRewriting[] Collection to store aggregation of ChildRewriting objects. - */ - protected $collRewritings; - protected $collRewritingsPartial; - /** * @var ObjectCollection|ChildContentFolder[] Collection to store aggregation of ChildContentFolder objects. */ @@ -212,12 +204,6 @@ abstract class Content implements ActiveRecordInterface */ protected $foldersScheduledForDeletion = null; - /** - * An array of objects scheduled for deletion. - * @var ObjectCollection - */ - protected $rewritingsScheduledForDeletion = null; - /** * An array of objects scheduled for deletion. * @var ObjectCollection @@ -429,7 +415,7 @@ abstract class Content implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** @@ -952,8 +938,6 @@ abstract class Content implements ActiveRecordInterface if ($deep) { // also de-associate any related objects? - $this->collRewritings = null; - $this->collContentFolders = null; $this->collContentImages = null; @@ -1141,23 +1125,6 @@ abstract class Content implements ActiveRecordInterface } } - if ($this->rewritingsScheduledForDeletion !== null) { - if (!$this->rewritingsScheduledForDeletion->isEmpty()) { - \Thelia\Model\RewritingQuery::create() - ->filterByPrimaryKeys($this->rewritingsScheduledForDeletion->getPrimaryKeys(false)) - ->delete($con); - $this->rewritingsScheduledForDeletion = null; - } - } - - if ($this->collRewritings !== null) { - foreach ($this->collRewritings as $referrerFK) { - if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) { - $affectedRows += $referrerFK->save($con); - } - } - } - if ($this->contentFoldersScheduledForDeletion !== null) { if (!$this->contentFoldersScheduledForDeletion->isEmpty()) { \Thelia\Model\ContentFolderQuery::create() @@ -1493,9 +1460,6 @@ abstract class Content implements ActiveRecordInterface } if ($includeForeignObjects) { - if (null !== $this->collRewritings) { - $result['Rewritings'] = $this->collRewritings->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); - } if (null !== $this->collContentFolders) { $result['ContentFolders'] = $this->collContentFolders->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } @@ -1702,12 +1666,6 @@ abstract class Content implements ActiveRecordInterface // the getter/setter methods for fkey referrer objects. $copyObj->setNew(false); - foreach ($this->getRewritings() as $relObj) { - if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves - $copyObj->addRewriting($relObj->copy($deepCopy)); - } - } - foreach ($this->getContentFolders() as $relObj) { if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves $copyObj->addContentFolder($relObj->copy($deepCopy)); @@ -1791,9 +1749,6 @@ abstract class Content implements ActiveRecordInterface */ public function initRelation($relationName) { - if ('Rewriting' == $relationName) { - return $this->initRewritings(); - } if ('ContentFolder' == $relationName) { return $this->initContentFolders(); } @@ -1817,299 +1772,6 @@ abstract class Content implements ActiveRecordInterface } } - /** - * Clears out the collRewritings collection - * - * This does not modify the database; however, it will remove any associated objects, causing - * them to be refetched by subsequent calls to accessor method. - * - * @return void - * @see addRewritings() - */ - public function clearRewritings() - { - $this->collRewritings = null; // important to set this to NULL since that means it is uninitialized - } - - /** - * Reset is the collRewritings collection loaded partially. - */ - public function resetPartialRewritings($v = true) - { - $this->collRewritingsPartial = $v; - } - - /** - * Initializes the collRewritings collection. - * - * By default this just sets the collRewritings collection to an empty array (like clearcollRewritings()); - * however, you may wish to override this method in your stub class to provide setting appropriate - * to your application -- for example, setting the initial array to the values stored in database. - * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty - * - * @return void - */ - public function initRewritings($overrideExisting = true) - { - if (null !== $this->collRewritings && !$overrideExisting) { - return; - } - $this->collRewritings = new ObjectCollection(); - $this->collRewritings->setModel('\Thelia\Model\Rewriting'); - } - - /** - * Gets an array of ChildRewriting objects which contain a foreign key that references this object. - * - * If the $criteria is not null, it is used to always fetch the results from the database. - * Otherwise the results are fetched from the database the first time, then cached. - * Next time the same method is called without $criteria, the cached collection is returned. - * If this ChildContent is new, it will return - * an empty collection or the current collection; the criteria is ignored on a new object. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @return Collection|ChildRewriting[] List of ChildRewriting objects - * @throws PropelException - */ - public function getRewritings($criteria = null, ConnectionInterface $con = null) - { - $partial = $this->collRewritingsPartial && !$this->isNew(); - if (null === $this->collRewritings || null !== $criteria || $partial) { - if ($this->isNew() && null === $this->collRewritings) { - // return empty collection - $this->initRewritings(); - } else { - $collRewritings = ChildRewritingQuery::create(null, $criteria) - ->filterByContent($this) - ->find($con); - - if (null !== $criteria) { - if (false !== $this->collRewritingsPartial && count($collRewritings)) { - $this->initRewritings(false); - - foreach ($collRewritings as $obj) { - if (false == $this->collRewritings->contains($obj)) { - $this->collRewritings->append($obj); - } - } - - $this->collRewritingsPartial = true; - } - - $collRewritings->getInternalIterator()->rewind(); - - return $collRewritings; - } - - if ($partial && $this->collRewritings) { - foreach ($this->collRewritings as $obj) { - if ($obj->isNew()) { - $collRewritings[] = $obj; - } - } - } - - $this->collRewritings = $collRewritings; - $this->collRewritingsPartial = false; - } - } - - return $this->collRewritings; - } - - /** - * Sets a collection of Rewriting objects related by a one-to-many relationship - * to the current object. - * It will also schedule objects for deletion based on a diff between old objects (aka persisted) - * and new objects from the given Propel collection. - * - * @param Collection $rewritings A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildContent The current object (for fluent API support) - */ - public function setRewritings(Collection $rewritings, ConnectionInterface $con = null) - { - $rewritingsToDelete = $this->getRewritings(new Criteria(), $con)->diff($rewritings); - - - $this->rewritingsScheduledForDeletion = $rewritingsToDelete; - - foreach ($rewritingsToDelete as $rewritingRemoved) { - $rewritingRemoved->setContent(null); - } - - $this->collRewritings = null; - foreach ($rewritings as $rewriting) { - $this->addRewriting($rewriting); - } - - $this->collRewritings = $rewritings; - $this->collRewritingsPartial = false; - - return $this; - } - - /** - * Returns the number of related Rewriting objects. - * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related Rewriting objects. - * @throws PropelException - */ - public function countRewritings(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) - { - $partial = $this->collRewritingsPartial && !$this->isNew(); - if (null === $this->collRewritings || null !== $criteria || $partial) { - if ($this->isNew() && null === $this->collRewritings) { - return 0; - } - - if ($partial && !$criteria) { - return count($this->getRewritings()); - } - - $query = ChildRewritingQuery::create(null, $criteria); - if ($distinct) { - $query->distinct(); - } - - return $query - ->filterByContent($this) - ->count($con); - } - - return count($this->collRewritings); - } - - /** - * Method called to associate a ChildRewriting object to this object - * through the ChildRewriting foreign key attribute. - * - * @param ChildRewriting $l ChildRewriting - * @return \Thelia\Model\Content The current object (for fluent API support) - */ - public function addRewriting(ChildRewriting $l) - { - if ($this->collRewritings === null) { - $this->initRewritings(); - $this->collRewritingsPartial = true; - } - - if (!in_array($l, $this->collRewritings->getArrayCopy(), true)) { // only add it if the **same** object is not already associated - $this->doAddRewriting($l); - } - - return $this; - } - - /** - * @param Rewriting $rewriting The rewriting object to add. - */ - protected function doAddRewriting($rewriting) - { - $this->collRewritings[]= $rewriting; - $rewriting->setContent($this); - } - - /** - * @param Rewriting $rewriting The rewriting object to remove. - * @return ChildContent The current object (for fluent API support) - */ - public function removeRewriting($rewriting) - { - if ($this->getRewritings()->contains($rewriting)) { - $this->collRewritings->remove($this->collRewritings->search($rewriting)); - if (null === $this->rewritingsScheduledForDeletion) { - $this->rewritingsScheduledForDeletion = clone $this->collRewritings; - $this->rewritingsScheduledForDeletion->clear(); - } - $this->rewritingsScheduledForDeletion[]= $rewriting; - $rewriting->setContent(null); - } - - return $this; - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Content is new, it will return - * an empty collection; or if this Content has previously - * been saved, it will retrieve related Rewritings from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Content. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildRewriting[] List of ChildRewriting objects - */ - public function getRewritingsJoinProduct($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildRewritingQuery::create(null, $criteria); - $query->joinWith('Product', $joinBehavior); - - return $this->getRewritings($query, $con); - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Content is new, it will return - * an empty collection; or if this Content has previously - * been saved, it will retrieve related Rewritings from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Content. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildRewriting[] List of ChildRewriting objects - */ - public function getRewritingsJoinCategory($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildRewritingQuery::create(null, $criteria); - $query->joinWith('Category', $joinBehavior); - - return $this->getRewritings($query, $con); - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Content is new, it will return - * an empty collection; or if this Content has previously - * been saved, it will retrieve related Rewritings from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Content. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildRewriting[] List of ChildRewriting objects - */ - public function getRewritingsJoinFolder($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildRewritingQuery::create(null, $criteria); - $query->joinWith('Folder', $joinBehavior); - - return $this->getRewritings($query, $con); - } - /** * Clears out the collContentFolders collection * @@ -3940,11 +3602,6 @@ abstract class Content implements ActiveRecordInterface public function clearAllReferences($deep = false) { if ($deep) { - if ($this->collRewritings) { - foreach ($this->collRewritings as $o) { - $o->clearAllReferences($deep); - } - } if ($this->collContentFolders) { foreach ($this->collContentFolders as $o) { $o->clearAllReferences($deep); @@ -3991,10 +3648,6 @@ abstract class Content implements ActiveRecordInterface $this->currentLocale = 'en_US'; $this->currentTranslations = null; - if ($this->collRewritings instanceof Collection) { - $this->collRewritings->clearIterator(); - } - $this->collRewritings = null; if ($this->collContentFolders instanceof Collection) { $this->collContentFolders->clearIterator(); } diff --git a/core/lib/Thelia/Model/Base/ContentDocument.php b/core/lib/Thelia/Model/Base/ContentDocument.php old mode 100755 new mode 100644 index 990fc4a9f..a8207bb14 --- a/core/lib/Thelia/Model/Base/ContentDocument.php +++ b/core/lib/Thelia/Model/Base/ContentDocument.php @@ -290,7 +290,7 @@ abstract class ContentDocument implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ContentDocumentI18n.php b/core/lib/Thelia/Model/Base/ContentDocumentI18n.php old mode 100755 new mode 100644 index 2cfc367b0..1e1f1bd52 --- a/core/lib/Thelia/Model/Base/ContentDocumentI18n.php +++ b/core/lib/Thelia/Model/Base/ContentDocumentI18n.php @@ -272,7 +272,7 @@ abstract class ContentDocumentI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ContentDocumentI18nQuery.php b/core/lib/Thelia/Model/Base/ContentDocumentI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ContentDocumentQuery.php b/core/lib/Thelia/Model/Base/ContentDocumentQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ContentFolder.php b/core/lib/Thelia/Model/Base/ContentFolder.php old mode 100755 new mode 100644 index 52f5fa88a..51d72b974 --- a/core/lib/Thelia/Model/Base/ContentFolder.php +++ b/core/lib/Thelia/Model/Base/ContentFolder.php @@ -256,7 +256,7 @@ abstract class ContentFolder implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ContentFolderQuery.php b/core/lib/Thelia/Model/Base/ContentFolderQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ContentI18n.php b/core/lib/Thelia/Model/Base/ContentI18n.php old mode 100755 new mode 100644 index d3974522b..6ffc1d4bf --- a/core/lib/Thelia/Model/Base/ContentI18n.php +++ b/core/lib/Thelia/Model/Base/ContentI18n.php @@ -272,7 +272,7 @@ abstract class ContentI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ContentI18nQuery.php b/core/lib/Thelia/Model/Base/ContentI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ContentImage.php b/core/lib/Thelia/Model/Base/ContentImage.php old mode 100755 new mode 100644 index 22c4bed10..8a0a5a77c --- a/core/lib/Thelia/Model/Base/ContentImage.php +++ b/core/lib/Thelia/Model/Base/ContentImage.php @@ -290,7 +290,7 @@ abstract class ContentImage implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ContentImageI18n.php b/core/lib/Thelia/Model/Base/ContentImageI18n.php old mode 100755 new mode 100644 index d655dec53..54016f0df --- a/core/lib/Thelia/Model/Base/ContentImageI18n.php +++ b/core/lib/Thelia/Model/Base/ContentImageI18n.php @@ -272,7 +272,7 @@ abstract class ContentImageI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ContentImageI18nQuery.php b/core/lib/Thelia/Model/Base/ContentImageI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ContentImageQuery.php b/core/lib/Thelia/Model/Base/ContentImageQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ContentQuery.php b/core/lib/Thelia/Model/Base/ContentQuery.php old mode 100755 new mode 100644 index 5341e1a5e..0dc2f57a4 --- a/core/lib/Thelia/Model/Base/ContentQuery.php +++ b/core/lib/Thelia/Model/Base/ContentQuery.php @@ -44,10 +44,6 @@ use Thelia\Model\Map\ContentTableMap; * @method ChildContentQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query * @method ChildContentQuery innerJoin($relation) Adds a INNER JOIN clause to the query * - * @method ChildContentQuery leftJoinRewriting($relationAlias = null) Adds a LEFT JOIN clause to the query using the Rewriting relation - * @method ChildContentQuery rightJoinRewriting($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Rewriting relation - * @method ChildContentQuery innerJoinRewriting($relationAlias = null) Adds a INNER JOIN clause to the query using the Rewriting relation - * * @method ChildContentQuery leftJoinContentFolder($relationAlias = null) Adds a LEFT JOIN clause to the query using the ContentFolder relation * @method ChildContentQuery rightJoinContentFolder($relationAlias = null) Adds a RIGHT JOIN clause to the query using the ContentFolder relation * @method ChildContentQuery innerJoinContentFolder($relationAlias = null) Adds a INNER JOIN clause to the query using the ContentFolder relation @@ -602,79 +598,6 @@ abstract class ContentQuery extends ModelCriteria return $this->addUsingAlias(ContentTableMap::VERSION_CREATED_BY, $versionCreatedBy, $comparison); } - /** - * Filter the query by a related \Thelia\Model\Rewriting object - * - * @param \Thelia\Model\Rewriting|ObjectCollection $rewriting the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildContentQuery The current query, for fluid interface - */ - public function filterByRewriting($rewriting, $comparison = null) - { - if ($rewriting instanceof \Thelia\Model\Rewriting) { - return $this - ->addUsingAlias(ContentTableMap::ID, $rewriting->getContentId(), $comparison); - } elseif ($rewriting instanceof ObjectCollection) { - return $this - ->useRewritingQuery() - ->filterByPrimaryKeys($rewriting->getPrimaryKeys()) - ->endUse(); - } else { - throw new PropelException('filterByRewriting() only accepts arguments of type \Thelia\Model\Rewriting or Collection'); - } - } - - /** - * Adds a JOIN clause to the query using the Rewriting relation - * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return ChildContentQuery The current query, for fluid interface - */ - public function joinRewriting($relationAlias = null, $joinType = Criteria::LEFT_JOIN) - { - $tableMap = $this->getTableMap(); - $relationMap = $tableMap->getRelation('Rewriting'); - - // create a ModelJoin object for this join - $join = new ModelJoin(); - $join->setJoinType($joinType); - $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); - if ($previousJoin = $this->getPreviousJoin()) { - $join->setPreviousJoin($previousJoin); - } - - // add the ModelJoin to the current object - if ($relationAlias) { - $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); - $this->addJoinObject($join, $relationAlias); - } else { - $this->addJoinObject($join, 'Rewriting'); - } - - return $this; - } - - /** - * Use the Rewriting relation Rewriting object - * - * @see useQuery() - * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return \Thelia\Model\RewritingQuery A secondary query class using the current class as primary query - */ - public function useRewritingQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) - { - return $this - ->joinRewriting($relationAlias, $joinType) - ->useQuery($relationAlias ? $relationAlias : 'Rewriting', '\Thelia\Model\RewritingQuery'); - } - /** * Filter the query by a related \Thelia\Model\ContentFolder object * diff --git a/core/lib/Thelia/Model/Base/ContentVersion.php b/core/lib/Thelia/Model/Base/ContentVersion.php old mode 100755 new mode 100644 index ca9189608..ef2897030 --- a/core/lib/Thelia/Model/Base/ContentVersion.php +++ b/core/lib/Thelia/Model/Base/ContentVersion.php @@ -286,7 +286,7 @@ abstract class ContentVersion implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ContentVersionQuery.php b/core/lib/Thelia/Model/Base/ContentVersionQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Country.php b/core/lib/Thelia/Model/Base/Country.php old mode 100755 new mode 100644 index 704375de2..e0541a151 --- a/core/lib/Thelia/Model/Base/Country.php +++ b/core/lib/Thelia/Model/Base/Country.php @@ -324,7 +324,7 @@ abstract class Country implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CountryI18n.php b/core/lib/Thelia/Model/Base/CountryI18n.php old mode 100755 new mode 100644 index be63955ca..3e3e314cb --- a/core/lib/Thelia/Model/Base/CountryI18n.php +++ b/core/lib/Thelia/Model/Base/CountryI18n.php @@ -272,7 +272,7 @@ abstract class CountryI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CountryI18nQuery.php b/core/lib/Thelia/Model/Base/CountryI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/CountryQuery.php b/core/lib/Thelia/Model/Base/CountryQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Coupon.php b/core/lib/Thelia/Model/Base/Coupon.php old mode 100755 new mode 100644 index 154b9c11c..4c5dcd917 --- a/core/lib/Thelia/Model/Base/Coupon.php +++ b/core/lib/Thelia/Model/Base/Coupon.php @@ -374,7 +374,7 @@ abstract class Coupon implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CouponI18n.php b/core/lib/Thelia/Model/Base/CouponI18n.php index 1ccf54e1a..0ea9027b6 100644 --- a/core/lib/Thelia/Model/Base/CouponI18n.php +++ b/core/lib/Thelia/Model/Base/CouponI18n.php @@ -266,7 +266,7 @@ abstract class CouponI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CouponOrder.php b/core/lib/Thelia/Model/Base/CouponOrder.php old mode 100755 new mode 100644 index 0b1300855..b2685ea74 --- a/core/lib/Thelia/Model/Base/CouponOrder.php +++ b/core/lib/Thelia/Model/Base/CouponOrder.php @@ -255,7 +255,7 @@ abstract class CouponOrder implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CouponOrderQuery.php b/core/lib/Thelia/Model/Base/CouponOrderQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/CouponQuery.php b/core/lib/Thelia/Model/Base/CouponQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/CouponRule.php b/core/lib/Thelia/Model/Base/CouponRule.php deleted file mode 100755 index 8a34f5d0b..000000000 --- a/core/lib/Thelia/Model/Base/CouponRule.php +++ /dev/null @@ -1,1534 +0,0 @@ -modifiedColumns); - } - - /** - * Has specified column been modified? - * - * @param string $col column fully qualified name (TableMap::TYPE_COLNAME), e.g. Book::AUTHOR_ID - * @return boolean True if $col has been modified. - */ - public function isColumnModified($col) - { - return in_array($col, $this->modifiedColumns); - } - - /** - * Get the columns that have been modified in this object. - * @return array A unique list of the modified column names for this object. - */ - public function getModifiedColumns() - { - return array_unique($this->modifiedColumns); - } - - /** - * Returns whether the object has ever been saved. This will - * be false, if the object was retrieved from storage or was created - * and then saved. - * - * @return true, if the object has never been persisted. - */ - public function isNew() - { - return $this->new; - } - - /** - * Setter for the isNew attribute. This method will be called - * by Propel-generated children and objects. - * - * @param boolean $b the state of the object. - */ - public function setNew($b) - { - $this->new = (Boolean) $b; - } - - /** - * Whether this object has been deleted. - * @return boolean The deleted state of this object. - */ - public function isDeleted() - { - return $this->deleted; - } - - /** - * Specify whether this object has been deleted. - * @param boolean $b The deleted state of this object. - * @return void - */ - public function setDeleted($b) - { - $this->deleted = (Boolean) $b; - } - - /** - * Sets the modified state for the object to be false. - * @param string $col If supplied, only the specified column is reset. - * @return void - */ - public function resetModified($col = null) - { - if (null !== $col) { - while (false !== ($offset = array_search($col, $this->modifiedColumns))) { - array_splice($this->modifiedColumns, $offset, 1); - } - } else { - $this->modifiedColumns = array(); - } - } - - /** - * Compares this with another CouponRule instance. If - * obj is an instance of CouponRule, delegates to - * equals(CouponRule). Otherwise, returns false. - * - * @param obj The object to compare to. - * @return Whether equal to the object specified. - */ - public function equals($obj) - { - $thisclazz = get_class($this); - if (!is_object($obj) || !($obj instanceof $thisclazz)) { - return false; - } - - if ($this === $obj) { - return true; - } - - if (null === $this->getPrimaryKey() - || null === $obj->getPrimaryKey()) { - return false; - } - - return $this->getPrimaryKey() === $obj->getPrimaryKey(); - } - - /** - * If the primary key is not null, return the hashcode of the - * primary key. Otherwise, return the hash code of the object. - * - * @return int Hashcode - */ - public function hashCode() - { - if (null !== $this->getPrimaryKey()) { - return crc32(serialize($this->getPrimaryKey())); - } - - return crc32(serialize(clone $this)); - } - - /** - * Get the associative array of the virtual columns in this object - * - * @param string $name The virtual column name - * - * @return array - */ - public function getVirtualColumns() - { - return $this->virtualColumns; - } - - /** - * Checks the existence of a virtual column in this object - * - * @return boolean - */ - public function hasVirtualColumn($name) - { - return array_key_exists($name, $this->virtualColumns); - } - - /** - * Get the value of a virtual column in this object - * - * @return mixed - */ - public function getVirtualColumn($name) - { - if (!$this->hasVirtualColumn($name)) { - throw new PropelException(sprintf('Cannot get value of inexistent virtual column %s.', $name)); - } - - return $this->virtualColumns[$name]; - } - - /** - * Set the value of a virtual column in this object - * - * @param string $name The virtual column name - * @param mixed $value The value to give to the virtual column - * - * @return CouponRule The current object, for fluid interface - */ - public function setVirtualColumn($name, $value) - { - $this->virtualColumns[$name] = $value; - - return $this; - } - - /** - * Logs a message using Propel::log(). - * - * @param string $msg - * @param int $priority One of the Propel::LOG_* logging levels - * @return boolean - */ - protected function log($msg, $priority = Propel::LOG_INFO) - { - return Propel::log(get_class($this) . ': ' . $msg, $priority); - } - - /** - * Populate the current object from a string, using a given parser format - * - * $book = new Book(); - * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); - * - * - * @param mixed $parser A AbstractParser instance, - * or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param string $data The source data to import from - * - * @return CouponRule The current object, for fluid interface - */ - public function importFrom($parser, $data) - { - if (!$parser instanceof AbstractParser) { - $parser = AbstractParser::getParser($parser); - } - - return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME); - } - - /** - * Export the current object properties to a string, using a given parser format - * - * $book = BookQuery::create()->findPk(9012); - * echo $book->exportTo('JSON'); - * => {"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}'); - * - * - * @param mixed $parser A AbstractParser instance, or a format name ('XML', 'YAML', 'JSON', 'CSV') - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy load(ed) columns. Defaults to TRUE. - * @return string The exported data - */ - public function exportTo($parser, $includeLazyLoadColumns = true) - { - if (!$parser instanceof AbstractParser) { - $parser = AbstractParser::getParser($parser); - } - - return $parser->fromArray($this->toArray(TableMap::TYPE_PHPNAME, $includeLazyLoadColumns, array(), true)); - } - - /** - * Clean up internal collections prior to serializing - * Avoids recursive loops that turn into segmentation faults when serializing - */ - public function __sleep() - { - $this->clearAllReferences(); - - return array_keys(get_object_vars($this)); - } - - /** - * Get the [id] column value. - * - * @return int - */ - public function getId() - { - - return $this->id; - } - - /** - * Get the [coupon_id] column value. - * - * @return int - */ - public function getCouponId() - { - - return $this->coupon_id; - } - - /** - * Get the [controller] column value. - * - * @return string - */ - public function getController() - { - - return $this->controller; - } - - /** - * Get the [operation] column value. - * - * @return string - */ - public function getOperation() - { - - return $this->operation; - } - - /** - * Get the [value] column value. - * - * @return double - */ - public function getValue() - { - - return $this->value; - } - - /** - * Get the [optionally formatted] temporal [created_at] column value. - * - * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. - * - * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 - * - * @throws PropelException - if unable to parse/validate the date/time value. - */ - public function getCreatedAt($format = NULL) - { - if ($format === null) { - return $this->created_at; - } else { - return $this->created_at !== null ? $this->created_at->format($format) : null; - } - } - - /** - * Get the [optionally formatted] temporal [updated_at] column value. - * - * - * @param string $format The date/time format string (either date()-style or strftime()-style). - * If format is NULL, then the raw \DateTime object will be returned. - * - * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00 - * - * @throws PropelException - if unable to parse/validate the date/time value. - */ - public function getUpdatedAt($format = NULL) - { - if ($format === null) { - return $this->updated_at; - } else { - return $this->updated_at !== null ? $this->updated_at->format($format) : null; - } - } - - /** - * Set the value of [id] column. - * - * @param int $v new value - * @return \Thelia\Model\CouponRule The current object (for fluent API support) - */ - public function setId($v) - { - if ($v !== null) { - $v = (int) $v; - } - - if ($this->id !== $v) { - $this->id = $v; - $this->modifiedColumns[] = CouponRuleTableMap::ID; - } - - - return $this; - } // setId() - - /** - * Set the value of [coupon_id] column. - * - * @param int $v new value - * @return \Thelia\Model\CouponRule The current object (for fluent API support) - */ - public function setCouponId($v) - { - if ($v !== null) { - $v = (int) $v; - } - - if ($this->coupon_id !== $v) { - $this->coupon_id = $v; - $this->modifiedColumns[] = CouponRuleTableMap::COUPON_ID; - } - - if ($this->aCoupon !== null && $this->aCoupon->getId() !== $v) { - $this->aCoupon = null; - } - - - return $this; - } // setCouponId() - - /** - * Set the value of [controller] column. - * - * @param string $v new value - * @return \Thelia\Model\CouponRule The current object (for fluent API support) - */ - public function setController($v) - { - if ($v !== null) { - $v = (string) $v; - } - - if ($this->controller !== $v) { - $this->controller = $v; - $this->modifiedColumns[] = CouponRuleTableMap::CONTROLLER; - } - - - return $this; - } // setController() - - /** - * Set the value of [operation] column. - * - * @param string $v new value - * @return \Thelia\Model\CouponRule The current object (for fluent API support) - */ - public function setOperation($v) - { - if ($v !== null) { - $v = (string) $v; - } - - if ($this->operation !== $v) { - $this->operation = $v; - $this->modifiedColumns[] = CouponRuleTableMap::OPERATION; - } - - - return $this; - } // setOperation() - - /** - * Set the value of [value] column. - * - * @param double $v new value - * @return \Thelia\Model\CouponRule The current object (for fluent API support) - */ - public function setValue($v) - { - if ($v !== null) { - $v = (double) $v; - } - - if ($this->value !== $v) { - $this->value = $v; - $this->modifiedColumns[] = CouponRuleTableMap::VALUE; - } - - - return $this; - } // setValue() - - /** - * Sets the value of [created_at] column to a normalized version of the date/time value specified. - * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\CouponRule The current object (for fluent API support) - */ - public function setCreatedAt($v) - { - $dt = PropelDateTime::newInstance($v, null, '\DateTime'); - if ($this->created_at !== null || $dt !== null) { - if ($dt !== $this->created_at) { - $this->created_at = $dt; - $this->modifiedColumns[] = CouponRuleTableMap::CREATED_AT; - } - } // if either are not null - - - return $this; - } // setCreatedAt() - - /** - * Sets the value of [updated_at] column to a normalized version of the date/time value specified. - * - * @param mixed $v string, integer (timestamp), or \DateTime value. - * Empty strings are treated as NULL. - * @return \Thelia\Model\CouponRule The current object (for fluent API support) - */ - public function setUpdatedAt($v) - { - $dt = PropelDateTime::newInstance($v, null, '\DateTime'); - if ($this->updated_at !== null || $dt !== null) { - if ($dt !== $this->updated_at) { - $this->updated_at = $dt; - $this->modifiedColumns[] = CouponRuleTableMap::UPDATED_AT; - } - } // if either are not null - - - return $this; - } // setUpdatedAt() - - /** - * Indicates whether the columns in this object are only set to default values. - * - * This method can be used in conjunction with isModified() to indicate whether an object is both - * modified _and_ has some values set which are non-default. - * - * @return boolean Whether the columns in this object are only been set with default values. - */ - public function hasOnlyDefaultValues() - { - // otherwise, everything was equal, so return TRUE - return true; - } // hasOnlyDefaultValues() - - /** - * Hydrates (populates) the object variables with values from the database resultset. - * - * An offset (0-based "start column") is specified so that objects can be hydrated - * with a subset of the columns in the resultset rows. This is needed, for example, - * for results of JOIN queries where the resultset row includes columns from two or - * more tables. - * - * @param array $row The row returned by DataFetcher->fetch(). - * @param int $startcol 0-based offset column which indicates which restultset column to start with. - * @param boolean $rehydrate Whether this object is being re-hydrated from the database. - * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType(). - One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * - * @return int next starting column - * @throws PropelException - Any caught Exception will be rewrapped as a PropelException. - */ - public function hydrate($row, $startcol = 0, $rehydrate = false, $indexType = TableMap::TYPE_NUM) - { - try { - - - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : CouponRuleTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; - $this->id = (null !== $col) ? (int) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : CouponRuleTableMap::translateFieldName('CouponId', TableMap::TYPE_PHPNAME, $indexType)]; - $this->coupon_id = (null !== $col) ? (int) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : CouponRuleTableMap::translateFieldName('Controller', TableMap::TYPE_PHPNAME, $indexType)]; - $this->controller = (null !== $col) ? (string) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : CouponRuleTableMap::translateFieldName('Operation', TableMap::TYPE_PHPNAME, $indexType)]; - $this->operation = (null !== $col) ? (string) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : CouponRuleTableMap::translateFieldName('Value', TableMap::TYPE_PHPNAME, $indexType)]; - $this->value = (null !== $col) ? (double) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : CouponRuleTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; - if ($col === '0000-00-00 00:00:00') { - $col = null; - } - $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : CouponRuleTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; - if ($col === '0000-00-00 00:00:00') { - $col = null; - } - $this->updated_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; - $this->resetModified(); - - $this->setNew(false); - - if ($rehydrate) { - $this->ensureConsistency(); - } - - return $startcol + 7; // 7 = CouponRuleTableMap::NUM_HYDRATE_COLUMNS. - - } catch (Exception $e) { - throw new PropelException("Error populating \Thelia\Model\CouponRule object", 0, $e); - } - } - - /** - * Checks and repairs the internal consistency of the object. - * - * This method is executed after an already-instantiated object is re-hydrated - * from the database. It exists to check any foreign keys to make sure that - * the objects related to the current object are correct based on foreign key. - * - * You can override this method in the stub class, but you should always invoke - * the base method from the overridden method (i.e. parent::ensureConsistency()), - * in case your model changes. - * - * @throws PropelException - */ - public function ensureConsistency() - { - if ($this->aCoupon !== null && $this->coupon_id !== $this->aCoupon->getId()) { - $this->aCoupon = null; - } - } // ensureConsistency - - /** - * Reloads this object from datastore based on primary key and (optionally) resets all associated objects. - * - * This will only work if the object has been saved and has a valid primary key set. - * - * @param boolean $deep (optional) Whether to also de-associated any related objects. - * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use. - * @return void - * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db - */ - public function reload($deep = false, ConnectionInterface $con = null) - { - if ($this->isDeleted()) { - throw new PropelException("Cannot reload a deleted object."); - } - - if ($this->isNew()) { - throw new PropelException("Cannot reload an unsaved object."); - } - - if ($con === null) { - $con = Propel::getServiceContainer()->getReadConnection(CouponRuleTableMap::DATABASE_NAME); - } - - // We don't need to alter the object instance pool; we're just modifying this instance - // already in the pool. - - $dataFetcher = ChildCouponRuleQuery::create(null, $this->buildPkeyCriteria())->setFormatter(ModelCriteria::FORMAT_STATEMENT)->find($con); - $row = $dataFetcher->fetch(); - $dataFetcher->close(); - if (!$row) { - throw new PropelException('Cannot find matching row in the database to reload object values.'); - } - $this->hydrate($row, 0, true, $dataFetcher->getIndexType()); // rehydrate - - if ($deep) { // also de-associate any related objects? - - $this->aCoupon = null; - } // if (deep) - } - - /** - * Removes this object from datastore and sets delete attribute. - * - * @param ConnectionInterface $con - * @return void - * @throws PropelException - * @see CouponRule::setDeleted() - * @see CouponRule::isDeleted() - */ - public function delete(ConnectionInterface $con = null) - { - if ($this->isDeleted()) { - throw new PropelException("This object has already been deleted."); - } - - if ($con === null) { - $con = Propel::getServiceContainer()->getWriteConnection(CouponRuleTableMap::DATABASE_NAME); - } - - $con->beginTransaction(); - try { - $deleteQuery = ChildCouponRuleQuery::create() - ->filterByPrimaryKey($this->getPrimaryKey()); - $ret = $this->preDelete($con); - if ($ret) { - $deleteQuery->delete($con); - $this->postDelete($con); - $con->commit(); - $this->setDeleted(true); - } else { - $con->commit(); - } - } catch (Exception $e) { - $con->rollBack(); - throw $e; - } - } - - /** - * Persists this object to the database. - * - * If the object is new, it inserts it; otherwise an update is performed. - * All modified related objects will also be persisted in the doSave() - * method. This method wraps all precipitate database operations in a - * single transaction. - * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. - * @throws PropelException - * @see doSave() - */ - public function save(ConnectionInterface $con = null) - { - if ($this->isDeleted()) { - throw new PropelException("You cannot save an object that has been deleted."); - } - - if ($con === null) { - $con = Propel::getServiceContainer()->getWriteConnection(CouponRuleTableMap::DATABASE_NAME); - } - - $con->beginTransaction(); - $isInsert = $this->isNew(); - try { - $ret = $this->preSave($con); - if ($isInsert) { - $ret = $ret && $this->preInsert($con); - // timestampable behavior - if (!$this->isColumnModified(CouponRuleTableMap::CREATED_AT)) { - $this->setCreatedAt(time()); - } - if (!$this->isColumnModified(CouponRuleTableMap::UPDATED_AT)) { - $this->setUpdatedAt(time()); - } - } else { - $ret = $ret && $this->preUpdate($con); - // timestampable behavior - if ($this->isModified() && !$this->isColumnModified(CouponRuleTableMap::UPDATED_AT)) { - $this->setUpdatedAt(time()); - } - } - if ($ret) { - $affectedRows = $this->doSave($con); - if ($isInsert) { - $this->postInsert($con); - } else { - $this->postUpdate($con); - } - $this->postSave($con); - CouponRuleTableMap::addInstanceToPool($this); - } else { - $affectedRows = 0; - } - $con->commit(); - - return $affectedRows; - } catch (Exception $e) { - $con->rollBack(); - throw $e; - } - } - - /** - * Performs the work of inserting or updating the row in the database. - * - * If the object is new, it inserts it; otherwise an update is performed. - * All related objects are also updated in this method. - * - * @param ConnectionInterface $con - * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. - * @throws PropelException - * @see save() - */ - protected function doSave(ConnectionInterface $con) - { - $affectedRows = 0; // initialize var to track total num of affected rows - if (!$this->alreadyInSave) { - $this->alreadyInSave = true; - - // We call the save method on the following object(s) if they - // were passed to this object by their corresponding set - // method. This object relates to these object(s) by a - // foreign key reference. - - if ($this->aCoupon !== null) { - if ($this->aCoupon->isModified() || $this->aCoupon->isNew()) { - $affectedRows += $this->aCoupon->save($con); - } - $this->setCoupon($this->aCoupon); - } - - if ($this->isNew() || $this->isModified()) { - // persist changes - if ($this->isNew()) { - $this->doInsert($con); - } else { - $this->doUpdate($con); - } - $affectedRows += 1; - $this->resetModified(); - } - - $this->alreadyInSave = false; - - } - - return $affectedRows; - } // doSave() - - /** - * Insert the row in the database. - * - * @param ConnectionInterface $con - * - * @throws PropelException - * @see doSave() - */ - protected function doInsert(ConnectionInterface $con) - { - $modifiedColumns = array(); - $index = 0; - - $this->modifiedColumns[] = CouponRuleTableMap::ID; - if (null !== $this->id) { - throw new PropelException('Cannot insert a value for auto-increment primary key (' . CouponRuleTableMap::ID . ')'); - } - - // check the columns in natural order for more readable SQL queries - if ($this->isColumnModified(CouponRuleTableMap::ID)) { - $modifiedColumns[':p' . $index++] = 'ID'; - } - if ($this->isColumnModified(CouponRuleTableMap::COUPON_ID)) { - $modifiedColumns[':p' . $index++] = 'COUPON_ID'; - } - if ($this->isColumnModified(CouponRuleTableMap::CONTROLLER)) { - $modifiedColumns[':p' . $index++] = 'CONTROLLER'; - } - if ($this->isColumnModified(CouponRuleTableMap::OPERATION)) { - $modifiedColumns[':p' . $index++] = 'OPERATION'; - } - if ($this->isColumnModified(CouponRuleTableMap::VALUE)) { - $modifiedColumns[':p' . $index++] = 'VALUE'; - } - if ($this->isColumnModified(CouponRuleTableMap::CREATED_AT)) { - $modifiedColumns[':p' . $index++] = 'CREATED_AT'; - } - if ($this->isColumnModified(CouponRuleTableMap::UPDATED_AT)) { - $modifiedColumns[':p' . $index++] = 'UPDATED_AT'; - } - - $sql = sprintf( - 'INSERT INTO coupon_rule (%s) VALUES (%s)', - implode(', ', $modifiedColumns), - implode(', ', array_keys($modifiedColumns)) - ); - - try { - $stmt = $con->prepare($sql); - foreach ($modifiedColumns as $identifier => $columnName) { - switch ($columnName) { - case 'ID': - $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT); - break; - case 'COUPON_ID': - $stmt->bindValue($identifier, $this->coupon_id, PDO::PARAM_INT); - break; - case 'CONTROLLER': - $stmt->bindValue($identifier, $this->controller, PDO::PARAM_STR); - break; - case 'OPERATION': - $stmt->bindValue($identifier, $this->operation, PDO::PARAM_STR); - break; - case 'VALUE': - $stmt->bindValue($identifier, $this->value, PDO::PARAM_STR); - break; - case 'CREATED_AT': - $stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); - break; - case 'UPDATED_AT': - $stmt->bindValue($identifier, $this->updated_at ? $this->updated_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); - break; - } - } - $stmt->execute(); - } catch (Exception $e) { - Propel::log($e->getMessage(), Propel::LOG_ERR); - throw new PropelException(sprintf('Unable to execute INSERT statement [%s]', $sql), 0, $e); - } - - try { - $pk = $con->lastInsertId(); - } catch (Exception $e) { - throw new PropelException('Unable to get autoincrement id.', 0, $e); - } - $this->setId($pk); - - $this->setNew(false); - } - - /** - * Update the row in the database. - * - * @param ConnectionInterface $con - * - * @return Integer Number of updated rows - * @see doSave() - */ - protected function doUpdate(ConnectionInterface $con) - { - $selectCriteria = $this->buildPkeyCriteria(); - $valuesCriteria = $this->buildCriteria(); - - return $selectCriteria->doUpdate($valuesCriteria, $con); - } - - /** - * Retrieves a field from the object by name passed in as a string. - * - * @param string $name name - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return mixed Value of field. - */ - public function getByName($name, $type = TableMap::TYPE_PHPNAME) - { - $pos = CouponRuleTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM); - $field = $this->getByPosition($pos); - - return $field; - } - - /** - * Retrieves a field from the object by Position as specified in the xml schema. - * Zero-based. - * - * @param int $pos position in xml schema - * @return mixed Value of field at $pos - */ - public function getByPosition($pos) - { - switch ($pos) { - case 0: - return $this->getId(); - break; - case 1: - return $this->getCouponId(); - break; - case 2: - return $this->getController(); - break; - case 3: - return $this->getOperation(); - break; - case 4: - return $this->getValue(); - break; - case 5: - return $this->getCreatedAt(); - break; - case 6: - return $this->getUpdatedAt(); - break; - default: - return null; - break; - } // switch() - } - - /** - * Exports the object as an array. - * - * You can specify the key type of the array by passing one of the class - * type constants. - * - * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE. - * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion - * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. - * - * @return array an associative array containing the field names (as keys) and field values - */ - public function toArray($keyType = TableMap::TYPE_PHPNAME, $includeLazyLoadColumns = true, $alreadyDumpedObjects = array(), $includeForeignObjects = false) - { - if (isset($alreadyDumpedObjects['CouponRule'][$this->getPrimaryKey()])) { - return '*RECURSION*'; - } - $alreadyDumpedObjects['CouponRule'][$this->getPrimaryKey()] = true; - $keys = CouponRuleTableMap::getFieldNames($keyType); - $result = array( - $keys[0] => $this->getId(), - $keys[1] => $this->getCouponId(), - $keys[2] => $this->getController(), - $keys[3] => $this->getOperation(), - $keys[4] => $this->getValue(), - $keys[5] => $this->getCreatedAt(), - $keys[6] => $this->getUpdatedAt(), - ); - $virtualColumns = $this->virtualColumns; - foreach($virtualColumns as $key => $virtualColumn) - { - $result[$key] = $virtualColumn; - } - - if ($includeForeignObjects) { - if (null !== $this->aCoupon) { - $result['Coupon'] = $this->aCoupon->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); - } - } - - return $result; - } - - /** - * Sets a field from the object by name passed in as a string. - * - * @param string $name - * @param mixed $value field value - * @param string $type The type of fieldname the $name is of: - * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * Defaults to TableMap::TYPE_PHPNAME. - * @return void - */ - public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME) - { - $pos = CouponRuleTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM); - - return $this->setByPosition($pos, $value); - } - - /** - * Sets a field from the object by Position as specified in the xml schema. - * Zero-based. - * - * @param int $pos position in xml schema - * @param mixed $value field value - * @return void - */ - public function setByPosition($pos, $value) - { - switch ($pos) { - case 0: - $this->setId($value); - break; - case 1: - $this->setCouponId($value); - break; - case 2: - $this->setController($value); - break; - case 3: - $this->setOperation($value); - break; - case 4: - $this->setValue($value); - break; - case 5: - $this->setCreatedAt($value); - break; - case 6: - $this->setUpdatedAt($value); - break; - } // switch() - } - - /** - * Populates the object using an array. - * - * This is particularly useful when populating an object from one of the - * request arrays (e.g. $_POST). This method goes through the column - * names, checking to see whether a matching key exists in populated - * array. If so the setByName() method is called for that column. - * - * You can specify the key type of the array by additionally passing one - * of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME, - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * The default key type is the column's TableMap::TYPE_PHPNAME. - * - * @param array $arr An array to populate the object from. - * @param string $keyType The type of keys the array uses. - * @return void - */ - public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME) - { - $keys = CouponRuleTableMap::getFieldNames($keyType); - - if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]); - if (array_key_exists($keys[1], $arr)) $this->setCouponId($arr[$keys[1]]); - if (array_key_exists($keys[2], $arr)) $this->setController($arr[$keys[2]]); - if (array_key_exists($keys[3], $arr)) $this->setOperation($arr[$keys[3]]); - if (array_key_exists($keys[4], $arr)) $this->setValue($arr[$keys[4]]); - if (array_key_exists($keys[5], $arr)) $this->setCreatedAt($arr[$keys[5]]); - if (array_key_exists($keys[6], $arr)) $this->setUpdatedAt($arr[$keys[6]]); - } - - /** - * Build a Criteria object containing the values of all modified columns in this object. - * - * @return Criteria The Criteria object containing all modified values. - */ - public function buildCriteria() - { - $criteria = new Criteria(CouponRuleTableMap::DATABASE_NAME); - - if ($this->isColumnModified(CouponRuleTableMap::ID)) $criteria->add(CouponRuleTableMap::ID, $this->id); - if ($this->isColumnModified(CouponRuleTableMap::COUPON_ID)) $criteria->add(CouponRuleTableMap::COUPON_ID, $this->coupon_id); - if ($this->isColumnModified(CouponRuleTableMap::CONTROLLER)) $criteria->add(CouponRuleTableMap::CONTROLLER, $this->controller); - if ($this->isColumnModified(CouponRuleTableMap::OPERATION)) $criteria->add(CouponRuleTableMap::OPERATION, $this->operation); - if ($this->isColumnModified(CouponRuleTableMap::VALUE)) $criteria->add(CouponRuleTableMap::VALUE, $this->value); - if ($this->isColumnModified(CouponRuleTableMap::CREATED_AT)) $criteria->add(CouponRuleTableMap::CREATED_AT, $this->created_at); - if ($this->isColumnModified(CouponRuleTableMap::UPDATED_AT)) $criteria->add(CouponRuleTableMap::UPDATED_AT, $this->updated_at); - - return $criteria; - } - - /** - * Builds a Criteria object containing the primary key for this object. - * - * Unlike buildCriteria() this method includes the primary key values regardless - * of whether or not they have been modified. - * - * @return Criteria The Criteria object containing value(s) for primary key(s). - */ - public function buildPkeyCriteria() - { - $criteria = new Criteria(CouponRuleTableMap::DATABASE_NAME); - $criteria->add(CouponRuleTableMap::ID, $this->id); - - return $criteria; - } - - /** - * Returns the primary key for this object (row). - * @return int - */ - public function getPrimaryKey() - { - return $this->getId(); - } - - /** - * Generic method to set the primary key (id column). - * - * @param int $key Primary key. - * @return void - */ - public function setPrimaryKey($key) - { - $this->setId($key); - } - - /** - * Returns true if the primary key for this object is null. - * @return boolean - */ - public function isPrimaryKeyNull() - { - - return null === $this->getId(); - } - - /** - * Sets contents of passed object to values from current object. - * - * If desired, this method can also make copies of all associated (fkey referrers) - * objects. - * - * @param object $copyObj An object of \Thelia\Model\CouponRule (or compatible) type. - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. - * @throws PropelException - */ - public function copyInto($copyObj, $deepCopy = false, $makeNew = true) - { - $copyObj->setCouponId($this->getCouponId()); - $copyObj->setController($this->getController()); - $copyObj->setOperation($this->getOperation()); - $copyObj->setValue($this->getValue()); - $copyObj->setCreatedAt($this->getCreatedAt()); - $copyObj->setUpdatedAt($this->getUpdatedAt()); - if ($makeNew) { - $copyObj->setNew(true); - $copyObj->setId(NULL); // this is a auto-increment column, so set to default value - } - } - - /** - * Makes a copy of this object that will be inserted as a new row in table when saved. - * It creates a new object filling in the simple attributes, but skipping any primary - * keys that are defined for the table. - * - * If desired, this method can also make copies of all associated (fkey referrers) - * objects. - * - * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. - * @return \Thelia\Model\CouponRule Clone of current object. - * @throws PropelException - */ - public function copy($deepCopy = false) - { - // we use get_class(), because this might be a subclass - $clazz = get_class($this); - $copyObj = new $clazz(); - $this->copyInto($copyObj, $deepCopy); - - return $copyObj; - } - - /** - * Declares an association between this object and a ChildCoupon object. - * - * @param ChildCoupon $v - * @return \Thelia\Model\CouponRule The current object (for fluent API support) - * @throws PropelException - */ - public function setCoupon(ChildCoupon $v = null) - { - if ($v === null) { - $this->setCouponId(NULL); - } else { - $this->setCouponId($v->getId()); - } - - $this->aCoupon = $v; - - // Add binding for other direction of this n:n relationship. - // If this object has already been added to the ChildCoupon object, it will not be re-added. - if ($v !== null) { - $v->addCouponRule($this); - } - - - return $this; - } - - - /** - * Get the associated ChildCoupon object - * - * @param ConnectionInterface $con Optional Connection object. - * @return ChildCoupon The associated ChildCoupon object. - * @throws PropelException - */ - public function getCoupon(ConnectionInterface $con = null) - { - if ($this->aCoupon === null && ($this->coupon_id !== null)) { - $this->aCoupon = ChildCouponQuery::create()->findPk($this->coupon_id, $con); - /* The following can be used additionally to - guarantee the related object contains a reference - to this object. This level of coupling may, however, be - undesirable since it could result in an only partially populated collection - in the referenced object. - $this->aCoupon->addCouponRules($this); - */ - } - - return $this->aCoupon; - } - - /** - * Clears the current object and sets all attributes to their default values - */ - public function clear() - { - $this->id = null; - $this->coupon_id = null; - $this->controller = null; - $this->operation = null; - $this->value = null; - $this->created_at = null; - $this->updated_at = null; - $this->alreadyInSave = false; - $this->clearAllReferences(); - $this->resetModified(); - $this->setNew(true); - $this->setDeleted(false); - } - - /** - * Resets all references to other model objects or collections of model objects. - * - * This method is a user-space workaround for PHP's inability to garbage collect - * objects with circular references (even in PHP 5.3). This is currently necessary - * when using Propel in certain daemon or large-volume/high-memory operations. - * - * @param boolean $deep Whether to also clear the references on all referrer objects. - */ - public function clearAllReferences($deep = false) - { - if ($deep) { - } // if ($deep) - - $this->aCoupon = null; - } - - /** - * Return the string representation of this object - * - * @return string - */ - public function __toString() - { - return (string) $this->exportTo(CouponRuleTableMap::DEFAULT_STRING_FORMAT); - } - - // timestampable behavior - - /** - * Mark the current object so that the update date doesn't get updated during next save - * - * @return ChildCouponRule The current object (for fluent API support) - */ - public function keepUpdateDateUnchanged() - { - $this->modifiedColumns[] = CouponRuleTableMap::UPDATED_AT; - - return $this; - } - - /** - * Code to be run before persisting the object - * @param ConnectionInterface $con - * @return boolean - */ - public function preSave(ConnectionInterface $con = null) - { - return true; - } - - /** - * Code to be run after persisting the object - * @param ConnectionInterface $con - */ - public function postSave(ConnectionInterface $con = null) - { - - } - - /** - * Code to be run before inserting to database - * @param ConnectionInterface $con - * @return boolean - */ - public function preInsert(ConnectionInterface $con = null) - { - return true; - } - - /** - * Code to be run after inserting to database - * @param ConnectionInterface $con - */ - public function postInsert(ConnectionInterface $con = null) - { - - } - - /** - * Code to be run before updating the object in database - * @param ConnectionInterface $con - * @return boolean - */ - public function preUpdate(ConnectionInterface $con = null) - { - return true; - } - - /** - * Code to be run after updating the object in database - * @param ConnectionInterface $con - */ - public function postUpdate(ConnectionInterface $con = null) - { - - } - - /** - * Code to be run before deleting the object in database - * @param ConnectionInterface $con - * @return boolean - */ - public function preDelete(ConnectionInterface $con = null) - { - return true; - } - - /** - * Code to be run after deleting the object in database - * @param ConnectionInterface $con - */ - public function postDelete(ConnectionInterface $con = null) - { - - } - - - /** - * Derived method to catches calls to undefined methods. - * - * Provides magic import/export method support (fromXML()/toXML(), fromYAML()/toYAML(), etc.). - * Allows to define default __call() behavior if you overwrite __call() - * - * @param string $name - * @param mixed $params - * - * @return array|string - */ - public function __call($name, $params) - { - if (0 === strpos($name, 'get')) { - $virtualColumn = substr($name, 3); - if ($this->hasVirtualColumn($virtualColumn)) { - return $this->getVirtualColumn($virtualColumn); - } - - $virtualColumn = lcfirst($virtualColumn); - if ($this->hasVirtualColumn($virtualColumn)) { - return $this->getVirtualColumn($virtualColumn); - } - } - - if (0 === strpos($name, 'from')) { - $format = substr($name, 4); - - return $this->importFrom($format, reset($params)); - } - - if (0 === strpos($name, 'to')) { - $format = substr($name, 2); - $includeLazyLoadColumns = isset($params[0]) ? $params[0] : true; - - return $this->exportTo($format, $includeLazyLoadColumns); - } - - throw new BadMethodCallException(sprintf('Call to undefined method: %s.', $name)); - } - -} diff --git a/core/lib/Thelia/Model/Base/CouponRuleQuery.php b/core/lib/Thelia/Model/Base/CouponRuleQuery.php deleted file mode 100755 index 0789f84d6..000000000 --- a/core/lib/Thelia/Model/Base/CouponRuleQuery.php +++ /dev/null @@ -1,744 +0,0 @@ -setModelAlias($modelAlias); - } - if ($criteria instanceof Criteria) { - $query->mergeWith($criteria); - } - - return $query; - } - - /** - * Find object by primary key. - * Propel uses the instance pool to skip the database if the object exists. - * Go fast if the query is untouched. - * - * - * $obj = $c->findPk(12, $con); - * - * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con an optional connection object - * - * @return ChildCouponRule|array|mixed the result, formatted by the current formatter - */ - public function findPk($key, $con = null) - { - if ($key === null) { - return null; - } - if ((null !== ($obj = CouponRuleTableMap::getInstanceFromPool((string) $key))) && !$this->formatter) { - // the object is already in the instance pool - return $obj; - } - if ($con === null) { - $con = Propel::getServiceContainer()->getReadConnection(CouponRuleTableMap::DATABASE_NAME); - } - $this->basePreSelect($con); - if ($this->formatter || $this->modelAlias || $this->with || $this->select - || $this->selectColumns || $this->asColumns || $this->selectModifiers - || $this->map || $this->having || $this->joins) { - return $this->findPkComplex($key, $con); - } else { - return $this->findPkSimple($key, $con); - } - } - - /** - * Find object by primary key using raw SQL to go fast. - * Bypass doSelect() and the object formatter by using generated code. - * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object - * - * @return ChildCouponRule A model object, or null if the key is not found - */ - protected function findPkSimple($key, $con) - { - $sql = 'SELECT ID, COUPON_ID, CONTROLLER, OPERATION, VALUE, CREATED_AT, UPDATED_AT FROM coupon_rule WHERE ID = :p0'; - try { - $stmt = $con->prepare($sql); - $stmt->bindValue(':p0', $key, PDO::PARAM_INT); - $stmt->execute(); - } catch (Exception $e) { - Propel::log($e->getMessage(), Propel::LOG_ERR); - throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), 0, $e); - } - $obj = null; - if ($row = $stmt->fetch(\PDO::FETCH_NUM)) { - $obj = new ChildCouponRule(); - $obj->hydrate($row); - CouponRuleTableMap::addInstanceToPool($obj, (string) $key); - } - $stmt->closeCursor(); - - return $obj; - } - - /** - * Find object by primary key. - * - * @param mixed $key Primary key to use for the query - * @param ConnectionInterface $con A connection object - * - * @return ChildCouponRule|array|mixed the result, formatted by the current formatter - */ - protected function findPkComplex($key, $con) - { - // As the query uses a PK condition, no limit(1) is necessary. - $criteria = $this->isKeepQuery() ? clone $this : $this; - $dataFetcher = $criteria - ->filterByPrimaryKey($key) - ->doSelect($con); - - return $criteria->getFormatter()->init($criteria)->formatOne($dataFetcher); - } - - /** - * Find objects by primary key - * - * $objs = $c->findPks(array(12, 56, 832), $con); - * - * @param array $keys Primary keys to use for the query - * @param ConnectionInterface $con an optional connection object - * - * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter - */ - public function findPks($keys, $con = null) - { - if (null === $con) { - $con = Propel::getServiceContainer()->getReadConnection($this->getDbName()); - } - $this->basePreSelect($con); - $criteria = $this->isKeepQuery() ? clone $this : $this; - $dataFetcher = $criteria - ->filterByPrimaryKeys($keys) - ->doSelect($con); - - return $criteria->getFormatter()->init($criteria)->format($dataFetcher); - } - - /** - * Filter the query by primary key - * - * @param mixed $key Primary key to use for the query - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function filterByPrimaryKey($key) - { - - return $this->addUsingAlias(CouponRuleTableMap::ID, $key, Criteria::EQUAL); - } - - /** - * Filter the query by a list of primary keys - * - * @param array $keys The list of primary key to use for the query - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function filterByPrimaryKeys($keys) - { - - return $this->addUsingAlias(CouponRuleTableMap::ID, $keys, Criteria::IN); - } - - /** - * Filter the query on the id column - * - * Example usage: - * - * $query->filterById(1234); // WHERE id = 1234 - * $query->filterById(array(12, 34)); // WHERE id IN (12, 34) - * $query->filterById(array('min' => 12)); // WHERE id > 12 - * - * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function filterById($id = null, $comparison = null) - { - if (is_array($id)) { - $useMinMax = false; - if (isset($id['min'])) { - $this->addUsingAlias(CouponRuleTableMap::ID, $id['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($id['max'])) { - $this->addUsingAlias(CouponRuleTableMap::ID, $id['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { - $comparison = Criteria::IN; - } - } - - return $this->addUsingAlias(CouponRuleTableMap::ID, $id, $comparison); - } - - /** - * Filter the query on the coupon_id column - * - * Example usage: - * - * $query->filterByCouponId(1234); // WHERE coupon_id = 1234 - * $query->filterByCouponId(array(12, 34)); // WHERE coupon_id IN (12, 34) - * $query->filterByCouponId(array('min' => 12)); // WHERE coupon_id > 12 - * - * - * @see filterByCoupon() - * - * @param mixed $couponId The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function filterByCouponId($couponId = null, $comparison = null) - { - if (is_array($couponId)) { - $useMinMax = false; - if (isset($couponId['min'])) { - $this->addUsingAlias(CouponRuleTableMap::COUPON_ID, $couponId['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($couponId['max'])) { - $this->addUsingAlias(CouponRuleTableMap::COUPON_ID, $couponId['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { - $comparison = Criteria::IN; - } - } - - return $this->addUsingAlias(CouponRuleTableMap::COUPON_ID, $couponId, $comparison); - } - - /** - * Filter the query on the controller column - * - * Example usage: - * - * $query->filterByController('fooValue'); // WHERE controller = 'fooValue' - * $query->filterByController('%fooValue%'); // WHERE controller LIKE '%fooValue%' - * - * - * @param string $controller The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function filterByController($controller = null, $comparison = null) - { - if (null === $comparison) { - if (is_array($controller)) { - $comparison = Criteria::IN; - } elseif (preg_match('/[\%\*]/', $controller)) { - $controller = str_replace('*', '%', $controller); - $comparison = Criteria::LIKE; - } - } - - return $this->addUsingAlias(CouponRuleTableMap::CONTROLLER, $controller, $comparison); - } - - /** - * Filter the query on the operation column - * - * Example usage: - * - * $query->filterByOperation('fooValue'); // WHERE operation = 'fooValue' - * $query->filterByOperation('%fooValue%'); // WHERE operation LIKE '%fooValue%' - * - * - * @param string $operation The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function filterByOperation($operation = null, $comparison = null) - { - if (null === $comparison) { - if (is_array($operation)) { - $comparison = Criteria::IN; - } elseif (preg_match('/[\%\*]/', $operation)) { - $operation = str_replace('*', '%', $operation); - $comparison = Criteria::LIKE; - } - } - - return $this->addUsingAlias(CouponRuleTableMap::OPERATION, $operation, $comparison); - } - - /** - * Filter the query on the value column - * - * Example usage: - * - * $query->filterByValue(1234); // WHERE value = 1234 - * $query->filterByValue(array(12, 34)); // WHERE value IN (12, 34) - * $query->filterByValue(array('min' => 12)); // WHERE value > 12 - * - * - * @param mixed $value The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function filterByValue($value = null, $comparison = null) - { - if (is_array($value)) { - $useMinMax = false; - if (isset($value['min'])) { - $this->addUsingAlias(CouponRuleTableMap::VALUE, $value['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($value['max'])) { - $this->addUsingAlias(CouponRuleTableMap::VALUE, $value['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { - $comparison = Criteria::IN; - } - } - - return $this->addUsingAlias(CouponRuleTableMap::VALUE, $value, $comparison); - } - - /** - * Filter the query on the created_at column - * - * Example usage: - * - * $query->filterByCreatedAt('2011-03-14'); // WHERE created_at = '2011-03-14' - * $query->filterByCreatedAt('now'); // WHERE created_at = '2011-03-14' - * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13' - * - * - * @param mixed $createdAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function filterByCreatedAt($createdAt = null, $comparison = null) - { - if (is_array($createdAt)) { - $useMinMax = false; - if (isset($createdAt['min'])) { - $this->addUsingAlias(CouponRuleTableMap::CREATED_AT, $createdAt['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($createdAt['max'])) { - $this->addUsingAlias(CouponRuleTableMap::CREATED_AT, $createdAt['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { - $comparison = Criteria::IN; - } - } - - return $this->addUsingAlias(CouponRuleTableMap::CREATED_AT, $createdAt, $comparison); - } - - /** - * Filter the query on the updated_at column - * - * Example usage: - * - * $query->filterByUpdatedAt('2011-03-14'); // WHERE updated_at = '2011-03-14' - * $query->filterByUpdatedAt('now'); // WHERE updated_at = '2011-03-14' - * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13' - * - * - * @param mixed $updatedAt The value to use as filter. - * Values can be integers (unix timestamps), DateTime objects, or strings. - * Empty strings are treated as NULL. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function filterByUpdatedAt($updatedAt = null, $comparison = null) - { - if (is_array($updatedAt)) { - $useMinMax = false; - if (isset($updatedAt['min'])) { - $this->addUsingAlias(CouponRuleTableMap::UPDATED_AT, $updatedAt['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($updatedAt['max'])) { - $this->addUsingAlias(CouponRuleTableMap::UPDATED_AT, $updatedAt['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { - $comparison = Criteria::IN; - } - } - - return $this->addUsingAlias(CouponRuleTableMap::UPDATED_AT, $updatedAt, $comparison); - } - - /** - * Filter the query by a related \Thelia\Model\Coupon object - * - * @param \Thelia\Model\Coupon|ObjectCollection $coupon The related object(s) to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function filterByCoupon($coupon, $comparison = null) - { - if ($coupon instanceof \Thelia\Model\Coupon) { - return $this - ->addUsingAlias(CouponRuleTableMap::COUPON_ID, $coupon->getId(), $comparison); - } elseif ($coupon instanceof ObjectCollection) { - if (null === $comparison) { - $comparison = Criteria::IN; - } - - return $this - ->addUsingAlias(CouponRuleTableMap::COUPON_ID, $coupon->toKeyValue('PrimaryKey', 'Id'), $comparison); - } else { - throw new PropelException('filterByCoupon() only accepts arguments of type \Thelia\Model\Coupon or Collection'); - } - } - - /** - * Adds a JOIN clause to the query using the Coupon relation - * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function joinCoupon($relationAlias = null, $joinType = Criteria::INNER_JOIN) - { - $tableMap = $this->getTableMap(); - $relationMap = $tableMap->getRelation('Coupon'); - - // create a ModelJoin object for this join - $join = new ModelJoin(); - $join->setJoinType($joinType); - $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); - if ($previousJoin = $this->getPreviousJoin()) { - $join->setPreviousJoin($previousJoin); - } - - // add the ModelJoin to the current object - if ($relationAlias) { - $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); - $this->addJoinObject($join, $relationAlias); - } else { - $this->addJoinObject($join, 'Coupon'); - } - - return $this; - } - - /** - * Use the Coupon relation Coupon object - * - * @see useQuery() - * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return \Thelia\Model\CouponQuery A secondary query class using the current class as primary query - */ - public function useCouponQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) - { - return $this - ->joinCoupon($relationAlias, $joinType) - ->useQuery($relationAlias ? $relationAlias : 'Coupon', '\Thelia\Model\CouponQuery'); - } - - /** - * Exclude object from result - * - * @param ChildCouponRule $couponRule Object to remove from the list of results - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function prune($couponRule = null) - { - if ($couponRule) { - $this->addUsingAlias(CouponRuleTableMap::ID, $couponRule->getId(), Criteria::NOT_EQUAL); - } - - return $this; - } - - /** - * Deletes all rows from the coupon_rule table. - * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). - */ - public function doDeleteAll(ConnectionInterface $con = null) - { - if (null === $con) { - $con = Propel::getServiceContainer()->getWriteConnection(CouponRuleTableMap::DATABASE_NAME); - } - $affectedRows = 0; // initialize var to track total num of affected rows - try { - // use transaction because $criteria could contain info - // for more than one table or we could emulating ON DELETE CASCADE, etc. - $con->beginTransaction(); - $affectedRows += parent::doDeleteAll($con); - // Because this db requires some delete cascade/set null emulation, we have to - // clear the cached instance *after* the emulation has happened (since - // instances get re-added by the select statement contained therein). - CouponRuleTableMap::clearInstancePool(); - CouponRuleTableMap::clearRelatedInstancePool(); - - $con->commit(); - } catch (PropelException $e) { - $con->rollBack(); - throw $e; - } - - return $affectedRows; - } - - /** - * Performs a DELETE on the database, given a ChildCouponRule or Criteria object OR a primary key value. - * - * @param mixed $values Criteria or ChildCouponRule object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - */ - public function delete(ConnectionInterface $con = null) - { - if (null === $con) { - $con = Propel::getServiceContainer()->getWriteConnection(CouponRuleTableMap::DATABASE_NAME); - } - - $criteria = $this; - - // Set the correct dbName - $criteria->setDbName(CouponRuleTableMap::DATABASE_NAME); - - $affectedRows = 0; // initialize var to track total num of affected rows - - try { - // use transaction because $criteria could contain info - // for more than one table or we could emulating ON DELETE CASCADE, etc. - $con->beginTransaction(); - - - CouponRuleTableMap::removeInstanceFromPool($criteria); - - $affectedRows += ModelCriteria::delete($con); - CouponRuleTableMap::clearRelatedInstancePool(); - $con->commit(); - - return $affectedRows; - } catch (PropelException $e) { - $con->rollBack(); - throw $e; - } - } - - // timestampable behavior - - /** - * Filter by the latest updated - * - * @param int $nbDays Maximum age of the latest update in days - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function recentlyUpdated($nbDays = 7) - { - return $this->addUsingAlias(CouponRuleTableMap::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL); - } - - /** - * Filter by the latest created - * - * @param int $nbDays Maximum age of in days - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function recentlyCreated($nbDays = 7) - { - return $this->addUsingAlias(CouponRuleTableMap::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL); - } - - /** - * Order by update date desc - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function lastUpdatedFirst() - { - return $this->addDescendingOrderByColumn(CouponRuleTableMap::UPDATED_AT); - } - - /** - * Order by update date asc - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function firstUpdatedFirst() - { - return $this->addAscendingOrderByColumn(CouponRuleTableMap::UPDATED_AT); - } - - /** - * Order by create date desc - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function lastCreatedFirst() - { - return $this->addDescendingOrderByColumn(CouponRuleTableMap::CREATED_AT); - } - - /** - * Order by create date asc - * - * @return ChildCouponRuleQuery The current query, for fluid interface - */ - public function firstCreatedFirst() - { - return $this->addAscendingOrderByColumn(CouponRuleTableMap::CREATED_AT); - } - -} // CouponRuleQuery diff --git a/core/lib/Thelia/Model/Base/CouponVersion.php b/core/lib/Thelia/Model/Base/CouponVersion.php index f2e0c58aa..efa4898f4 100644 --- a/core/lib/Thelia/Model/Base/CouponVersion.php +++ b/core/lib/Thelia/Model/Base/CouponVersion.php @@ -328,7 +328,7 @@ abstract class CouponVersion implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/Currency.php b/core/lib/Thelia/Model/Base/Currency.php old mode 100755 new mode 100644 index 77718992f..767e2dc37 --- a/core/lib/Thelia/Model/Base/Currency.php +++ b/core/lib/Thelia/Model/Base/Currency.php @@ -337,7 +337,7 @@ abstract class Currency implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CurrencyI18n.php b/core/lib/Thelia/Model/Base/CurrencyI18n.php old mode 100755 new mode 100644 index eb86a87c4..df5ff7240 --- a/core/lib/Thelia/Model/Base/CurrencyI18n.php +++ b/core/lib/Thelia/Model/Base/CurrencyI18n.php @@ -254,7 +254,7 @@ abstract class CurrencyI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CurrencyI18nQuery.php b/core/lib/Thelia/Model/Base/CurrencyI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/CurrencyQuery.php b/core/lib/Thelia/Model/Base/CurrencyQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Customer.php b/core/lib/Thelia/Model/Base/Customer.php old mode 100755 new mode 100644 index c3315ac6f..3d87f3e28 --- a/core/lib/Thelia/Model/Base/Customer.php +++ b/core/lib/Thelia/Model/Base/Customer.php @@ -352,7 +352,7 @@ abstract class Customer implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CustomerQuery.php b/core/lib/Thelia/Model/Base/CustomerQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/CustomerTitle.php b/core/lib/Thelia/Model/Base/CustomerTitle.php old mode 100755 new mode 100644 index 5f8b11dd9..6b1295d2b --- a/core/lib/Thelia/Model/Base/CustomerTitle.php +++ b/core/lib/Thelia/Model/Base/CustomerTitle.php @@ -319,7 +319,7 @@ abstract class CustomerTitle implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CustomerTitleI18n.php b/core/lib/Thelia/Model/Base/CustomerTitleI18n.php old mode 100755 new mode 100644 index c68b87123..b384210b1 --- a/core/lib/Thelia/Model/Base/CustomerTitleI18n.php +++ b/core/lib/Thelia/Model/Base/CustomerTitleI18n.php @@ -260,7 +260,7 @@ abstract class CustomerTitleI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/CustomerTitleI18nQuery.php b/core/lib/Thelia/Model/Base/CustomerTitleI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/CustomerTitleQuery.php b/core/lib/Thelia/Model/Base/CustomerTitleQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Delivzone.php b/core/lib/Thelia/Model/Base/Delivzone.php old mode 100755 new mode 100644 index 08125044e..deb21997e --- a/core/lib/Thelia/Model/Base/Delivzone.php +++ b/core/lib/Thelia/Model/Base/Delivzone.php @@ -255,7 +255,7 @@ abstract class Delivzone implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/DelivzoneQuery.php b/core/lib/Thelia/Model/Base/DelivzoneQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Feature.php b/core/lib/Thelia/Model/Base/Feature.php old mode 100755 new mode 100644 index 0dddd14e0..2860a4155 --- a/core/lib/Thelia/Model/Base/Feature.php +++ b/core/lib/Thelia/Model/Base/Feature.php @@ -346,7 +346,7 @@ abstract class Feature implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/FeatureAv.php b/core/lib/Thelia/Model/Base/FeatureAv.php old mode 100755 new mode 100644 index b09a27cec..bf1bfc41e --- a/core/lib/Thelia/Model/Base/FeatureAv.php +++ b/core/lib/Thelia/Model/Base/FeatureAv.php @@ -298,7 +298,7 @@ abstract class FeatureAv implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/FeatureAvI18n.php b/core/lib/Thelia/Model/Base/FeatureAvI18n.php old mode 100755 new mode 100644 index 7cbca8129..44e7893a2 --- a/core/lib/Thelia/Model/Base/FeatureAvI18n.php +++ b/core/lib/Thelia/Model/Base/FeatureAvI18n.php @@ -272,7 +272,7 @@ abstract class FeatureAvI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/FeatureAvI18nQuery.php b/core/lib/Thelia/Model/Base/FeatureAvI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/FeatureAvQuery.php b/core/lib/Thelia/Model/Base/FeatureAvQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/FeatureCategory.php b/core/lib/Thelia/Model/Base/FeatureCategory.php old mode 100755 new mode 100644 index f3ce14349..035e077d2 --- a/core/lib/Thelia/Model/Base/FeatureCategory.php +++ b/core/lib/Thelia/Model/Base/FeatureCategory.php @@ -262,7 +262,7 @@ abstract class FeatureCategory implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/FeatureCategoryQuery.php b/core/lib/Thelia/Model/Base/FeatureCategoryQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/FeatureI18n.php b/core/lib/Thelia/Model/Base/FeatureI18n.php old mode 100755 new mode 100644 index 0ede8eddb..57c7a0b30 --- a/core/lib/Thelia/Model/Base/FeatureI18n.php +++ b/core/lib/Thelia/Model/Base/FeatureI18n.php @@ -272,7 +272,7 @@ abstract class FeatureI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/FeatureI18nQuery.php b/core/lib/Thelia/Model/Base/FeatureI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/FeatureProduct.php b/core/lib/Thelia/Model/Base/FeatureProduct.php old mode 100755 new mode 100644 index b68f4acd2..4af200d51 --- a/core/lib/Thelia/Model/Base/FeatureProduct.php +++ b/core/lib/Thelia/Model/Base/FeatureProduct.php @@ -287,7 +287,7 @@ abstract class FeatureProduct implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/FeatureProductQuery.php b/core/lib/Thelia/Model/Base/FeatureProductQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/FeatureQuery.php b/core/lib/Thelia/Model/Base/FeatureQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Folder.php b/core/lib/Thelia/Model/Base/Folder.php old mode 100755 new mode 100644 index 6ee28e7ff..4457c5042 --- a/core/lib/Thelia/Model/Base/Folder.php +++ b/core/lib/Thelia/Model/Base/Folder.php @@ -31,8 +31,6 @@ use Thelia\Model\FolderImageQuery as ChildFolderImageQuery; use Thelia\Model\FolderQuery as ChildFolderQuery; use Thelia\Model\FolderVersion as ChildFolderVersion; use Thelia\Model\FolderVersionQuery as ChildFolderVersionQuery; -use Thelia\Model\Rewriting as ChildRewriting; -use Thelia\Model\RewritingQuery as ChildRewritingQuery; use Thelia\Model\Map\FolderTableMap; use Thelia\Model\Map\FolderVersionTableMap; @@ -125,12 +123,6 @@ abstract class Folder implements ActiveRecordInterface */ protected $version_created_by; - /** - * @var ObjectCollection|ChildRewriting[] Collection to store aggregation of ChildRewriting objects. - */ - protected $collRewritings; - protected $collRewritingsPartial; - /** * @var ObjectCollection|ChildContentFolder[] Collection to store aggregation of ChildContentFolder objects. */ @@ -202,12 +194,6 @@ abstract class Folder implements ActiveRecordInterface */ protected $contentsScheduledForDeletion = null; - /** - * An array of objects scheduled for deletion. - * @var ObjectCollection - */ - protected $rewritingsScheduledForDeletion = null; - /** * An array of objects scheduled for deletion. * @var ObjectCollection @@ -407,7 +393,7 @@ abstract class Folder implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** @@ -965,8 +951,6 @@ abstract class Folder implements ActiveRecordInterface if ($deep) { // also de-associate any related objects? - $this->collRewritings = null; - $this->collContentFolders = null; $this->collFolderImages = null; @@ -1150,23 +1134,6 @@ abstract class Folder implements ActiveRecordInterface } } - if ($this->rewritingsScheduledForDeletion !== null) { - if (!$this->rewritingsScheduledForDeletion->isEmpty()) { - \Thelia\Model\RewritingQuery::create() - ->filterByPrimaryKeys($this->rewritingsScheduledForDeletion->getPrimaryKeys(false)) - ->delete($con); - $this->rewritingsScheduledForDeletion = null; - } - } - - if ($this->collRewritings !== null) { - foreach ($this->collRewritings as $referrerFK) { - if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) { - $affectedRows += $referrerFK->save($con); - } - } - } - if ($this->contentFoldersScheduledForDeletion !== null) { if (!$this->contentFoldersScheduledForDeletion->isEmpty()) { \Thelia\Model\ContentFolderQuery::create() @@ -1478,9 +1445,6 @@ abstract class Folder implements ActiveRecordInterface } if ($includeForeignObjects) { - if (null !== $this->collRewritings) { - $result['Rewritings'] = $this->collRewritings->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); - } if (null !== $this->collContentFolders) { $result['ContentFolders'] = $this->collContentFolders->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } @@ -1687,12 +1651,6 @@ abstract class Folder implements ActiveRecordInterface // the getter/setter methods for fkey referrer objects. $copyObj->setNew(false); - foreach ($this->getRewritings() as $relObj) { - if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves - $copyObj->addRewriting($relObj->copy($deepCopy)); - } - } - foreach ($this->getContentFolders() as $relObj) { if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves $copyObj->addContentFolder($relObj->copy($deepCopy)); @@ -1764,9 +1722,6 @@ abstract class Folder implements ActiveRecordInterface */ public function initRelation($relationName) { - if ('Rewriting' == $relationName) { - return $this->initRewritings(); - } if ('ContentFolder' == $relationName) { return $this->initContentFolders(); } @@ -1784,299 +1739,6 @@ abstract class Folder implements ActiveRecordInterface } } - /** - * Clears out the collRewritings collection - * - * This does not modify the database; however, it will remove any associated objects, causing - * them to be refetched by subsequent calls to accessor method. - * - * @return void - * @see addRewritings() - */ - public function clearRewritings() - { - $this->collRewritings = null; // important to set this to NULL since that means it is uninitialized - } - - /** - * Reset is the collRewritings collection loaded partially. - */ - public function resetPartialRewritings($v = true) - { - $this->collRewritingsPartial = $v; - } - - /** - * Initializes the collRewritings collection. - * - * By default this just sets the collRewritings collection to an empty array (like clearcollRewritings()); - * however, you may wish to override this method in your stub class to provide setting appropriate - * to your application -- for example, setting the initial array to the values stored in database. - * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty - * - * @return void - */ - public function initRewritings($overrideExisting = true) - { - if (null !== $this->collRewritings && !$overrideExisting) { - return; - } - $this->collRewritings = new ObjectCollection(); - $this->collRewritings->setModel('\Thelia\Model\Rewriting'); - } - - /** - * Gets an array of ChildRewriting objects which contain a foreign key that references this object. - * - * If the $criteria is not null, it is used to always fetch the results from the database. - * Otherwise the results are fetched from the database the first time, then cached. - * Next time the same method is called without $criteria, the cached collection is returned. - * If this ChildFolder is new, it will return - * an empty collection or the current collection; the criteria is ignored on a new object. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @return Collection|ChildRewriting[] List of ChildRewriting objects - * @throws PropelException - */ - public function getRewritings($criteria = null, ConnectionInterface $con = null) - { - $partial = $this->collRewritingsPartial && !$this->isNew(); - if (null === $this->collRewritings || null !== $criteria || $partial) { - if ($this->isNew() && null === $this->collRewritings) { - // return empty collection - $this->initRewritings(); - } else { - $collRewritings = ChildRewritingQuery::create(null, $criteria) - ->filterByFolder($this) - ->find($con); - - if (null !== $criteria) { - if (false !== $this->collRewritingsPartial && count($collRewritings)) { - $this->initRewritings(false); - - foreach ($collRewritings as $obj) { - if (false == $this->collRewritings->contains($obj)) { - $this->collRewritings->append($obj); - } - } - - $this->collRewritingsPartial = true; - } - - $collRewritings->getInternalIterator()->rewind(); - - return $collRewritings; - } - - if ($partial && $this->collRewritings) { - foreach ($this->collRewritings as $obj) { - if ($obj->isNew()) { - $collRewritings[] = $obj; - } - } - } - - $this->collRewritings = $collRewritings; - $this->collRewritingsPartial = false; - } - } - - return $this->collRewritings; - } - - /** - * Sets a collection of Rewriting objects related by a one-to-many relationship - * to the current object. - * It will also schedule objects for deletion based on a diff between old objects (aka persisted) - * and new objects from the given Propel collection. - * - * @param Collection $rewritings A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildFolder The current object (for fluent API support) - */ - public function setRewritings(Collection $rewritings, ConnectionInterface $con = null) - { - $rewritingsToDelete = $this->getRewritings(new Criteria(), $con)->diff($rewritings); - - - $this->rewritingsScheduledForDeletion = $rewritingsToDelete; - - foreach ($rewritingsToDelete as $rewritingRemoved) { - $rewritingRemoved->setFolder(null); - } - - $this->collRewritings = null; - foreach ($rewritings as $rewriting) { - $this->addRewriting($rewriting); - } - - $this->collRewritings = $rewritings; - $this->collRewritingsPartial = false; - - return $this; - } - - /** - * Returns the number of related Rewriting objects. - * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related Rewriting objects. - * @throws PropelException - */ - public function countRewritings(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) - { - $partial = $this->collRewritingsPartial && !$this->isNew(); - if (null === $this->collRewritings || null !== $criteria || $partial) { - if ($this->isNew() && null === $this->collRewritings) { - return 0; - } - - if ($partial && !$criteria) { - return count($this->getRewritings()); - } - - $query = ChildRewritingQuery::create(null, $criteria); - if ($distinct) { - $query->distinct(); - } - - return $query - ->filterByFolder($this) - ->count($con); - } - - return count($this->collRewritings); - } - - /** - * Method called to associate a ChildRewriting object to this object - * through the ChildRewriting foreign key attribute. - * - * @param ChildRewriting $l ChildRewriting - * @return \Thelia\Model\Folder The current object (for fluent API support) - */ - public function addRewriting(ChildRewriting $l) - { - if ($this->collRewritings === null) { - $this->initRewritings(); - $this->collRewritingsPartial = true; - } - - if (!in_array($l, $this->collRewritings->getArrayCopy(), true)) { // only add it if the **same** object is not already associated - $this->doAddRewriting($l); - } - - return $this; - } - - /** - * @param Rewriting $rewriting The rewriting object to add. - */ - protected function doAddRewriting($rewriting) - { - $this->collRewritings[]= $rewriting; - $rewriting->setFolder($this); - } - - /** - * @param Rewriting $rewriting The rewriting object to remove. - * @return ChildFolder The current object (for fluent API support) - */ - public function removeRewriting($rewriting) - { - if ($this->getRewritings()->contains($rewriting)) { - $this->collRewritings->remove($this->collRewritings->search($rewriting)); - if (null === $this->rewritingsScheduledForDeletion) { - $this->rewritingsScheduledForDeletion = clone $this->collRewritings; - $this->rewritingsScheduledForDeletion->clear(); - } - $this->rewritingsScheduledForDeletion[]= $rewriting; - $rewriting->setFolder(null); - } - - return $this; - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Folder is new, it will return - * an empty collection; or if this Folder has previously - * been saved, it will retrieve related Rewritings from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Folder. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildRewriting[] List of ChildRewriting objects - */ - public function getRewritingsJoinProduct($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildRewritingQuery::create(null, $criteria); - $query->joinWith('Product', $joinBehavior); - - return $this->getRewritings($query, $con); - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Folder is new, it will return - * an empty collection; or if this Folder has previously - * been saved, it will retrieve related Rewritings from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Folder. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildRewriting[] List of ChildRewriting objects - */ - public function getRewritingsJoinCategory($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildRewritingQuery::create(null, $criteria); - $query->joinWith('Category', $joinBehavior); - - return $this->getRewritings($query, $con); - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Folder is new, it will return - * an empty collection; or if this Folder has previously - * been saved, it will retrieve related Rewritings from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Folder. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildRewriting[] List of ChildRewriting objects - */ - public function getRewritingsJoinContent($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildRewritingQuery::create(null, $criteria); - $query->joinWith('Content', $joinBehavior); - - return $this->getRewritings($query, $con); - } - /** * Clears out the collContentFolders collection * @@ -3422,11 +3084,6 @@ abstract class Folder implements ActiveRecordInterface public function clearAllReferences($deep = false) { if ($deep) { - if ($this->collRewritings) { - foreach ($this->collRewritings as $o) { - $o->clearAllReferences($deep); - } - } if ($this->collContentFolders) { foreach ($this->collContentFolders as $o) { $o->clearAllReferences($deep); @@ -3463,10 +3120,6 @@ abstract class Folder implements ActiveRecordInterface $this->currentLocale = 'en_US'; $this->currentTranslations = null; - if ($this->collRewritings instanceof Collection) { - $this->collRewritings->clearIterator(); - } - $this->collRewritings = null; if ($this->collContentFolders instanceof Collection) { $this->collContentFolders->clearIterator(); } diff --git a/core/lib/Thelia/Model/Base/FolderDocument.php b/core/lib/Thelia/Model/Base/FolderDocument.php old mode 100755 new mode 100644 index 31e7c57a6..8e24ee9d4 --- a/core/lib/Thelia/Model/Base/FolderDocument.php +++ b/core/lib/Thelia/Model/Base/FolderDocument.php @@ -290,7 +290,7 @@ abstract class FolderDocument implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/FolderDocumentI18n.php b/core/lib/Thelia/Model/Base/FolderDocumentI18n.php old mode 100755 new mode 100644 index d39a49af7..b68c8ce9d --- a/core/lib/Thelia/Model/Base/FolderDocumentI18n.php +++ b/core/lib/Thelia/Model/Base/FolderDocumentI18n.php @@ -272,7 +272,7 @@ abstract class FolderDocumentI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/FolderDocumentI18nQuery.php b/core/lib/Thelia/Model/Base/FolderDocumentI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/FolderDocumentQuery.php b/core/lib/Thelia/Model/Base/FolderDocumentQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/FolderI18n.php b/core/lib/Thelia/Model/Base/FolderI18n.php old mode 100755 new mode 100644 index fcdc66705..976c6b041 --- a/core/lib/Thelia/Model/Base/FolderI18n.php +++ b/core/lib/Thelia/Model/Base/FolderI18n.php @@ -272,7 +272,7 @@ abstract class FolderI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/FolderI18nQuery.php b/core/lib/Thelia/Model/Base/FolderI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/FolderImage.php b/core/lib/Thelia/Model/Base/FolderImage.php old mode 100755 new mode 100644 index 46c39060d..525dc9d48 --- a/core/lib/Thelia/Model/Base/FolderImage.php +++ b/core/lib/Thelia/Model/Base/FolderImage.php @@ -290,7 +290,7 @@ abstract class FolderImage implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/FolderImageI18n.php b/core/lib/Thelia/Model/Base/FolderImageI18n.php old mode 100755 new mode 100644 index d5cc004d1..6ac9575e1 --- a/core/lib/Thelia/Model/Base/FolderImageI18n.php +++ b/core/lib/Thelia/Model/Base/FolderImageI18n.php @@ -272,7 +272,7 @@ abstract class FolderImageI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/FolderImageI18nQuery.php b/core/lib/Thelia/Model/Base/FolderImageI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/FolderImageQuery.php b/core/lib/Thelia/Model/Base/FolderImageQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/FolderQuery.php b/core/lib/Thelia/Model/Base/FolderQuery.php old mode 100755 new mode 100644 index 893bb9819..d7d6794c5 --- a/core/lib/Thelia/Model/Base/FolderQuery.php +++ b/core/lib/Thelia/Model/Base/FolderQuery.php @@ -46,10 +46,6 @@ use Thelia\Model\Map\FolderTableMap; * @method ChildFolderQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query * @method ChildFolderQuery innerJoin($relation) Adds a INNER JOIN clause to the query * - * @method ChildFolderQuery leftJoinRewriting($relationAlias = null) Adds a LEFT JOIN clause to the query using the Rewriting relation - * @method ChildFolderQuery rightJoinRewriting($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Rewriting relation - * @method ChildFolderQuery innerJoinRewriting($relationAlias = null) Adds a INNER JOIN clause to the query using the Rewriting relation - * * @method ChildFolderQuery leftJoinContentFolder($relationAlias = null) Adds a LEFT JOIN clause to the query using the ContentFolder relation * @method ChildFolderQuery rightJoinContentFolder($relationAlias = null) Adds a RIGHT JOIN clause to the query using the ContentFolder relation * @method ChildFolderQuery innerJoinContentFolder($relationAlias = null) Adds a INNER JOIN clause to the query using the ContentFolder relation @@ -639,79 +635,6 @@ abstract class FolderQuery extends ModelCriteria return $this->addUsingAlias(FolderTableMap::VERSION_CREATED_BY, $versionCreatedBy, $comparison); } - /** - * Filter the query by a related \Thelia\Model\Rewriting object - * - * @param \Thelia\Model\Rewriting|ObjectCollection $rewriting the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildFolderQuery The current query, for fluid interface - */ - public function filterByRewriting($rewriting, $comparison = null) - { - if ($rewriting instanceof \Thelia\Model\Rewriting) { - return $this - ->addUsingAlias(FolderTableMap::ID, $rewriting->getFolderId(), $comparison); - } elseif ($rewriting instanceof ObjectCollection) { - return $this - ->useRewritingQuery() - ->filterByPrimaryKeys($rewriting->getPrimaryKeys()) - ->endUse(); - } else { - throw new PropelException('filterByRewriting() only accepts arguments of type \Thelia\Model\Rewriting or Collection'); - } - } - - /** - * Adds a JOIN clause to the query using the Rewriting relation - * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return ChildFolderQuery The current query, for fluid interface - */ - public function joinRewriting($relationAlias = null, $joinType = Criteria::LEFT_JOIN) - { - $tableMap = $this->getTableMap(); - $relationMap = $tableMap->getRelation('Rewriting'); - - // create a ModelJoin object for this join - $join = new ModelJoin(); - $join->setJoinType($joinType); - $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); - if ($previousJoin = $this->getPreviousJoin()) { - $join->setPreviousJoin($previousJoin); - } - - // add the ModelJoin to the current object - if ($relationAlias) { - $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); - $this->addJoinObject($join, $relationAlias); - } else { - $this->addJoinObject($join, 'Rewriting'); - } - - return $this; - } - - /** - * Use the Rewriting relation Rewriting object - * - * @see useQuery() - * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return \Thelia\Model\RewritingQuery A secondary query class using the current class as primary query - */ - public function useRewritingQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) - { - return $this - ->joinRewriting($relationAlias, $joinType) - ->useQuery($relationAlias ? $relationAlias : 'Rewriting', '\Thelia\Model\RewritingQuery'); - } - /** * Filter the query by a related \Thelia\Model\ContentFolder object * diff --git a/core/lib/Thelia/Model/Base/FolderVersion.php b/core/lib/Thelia/Model/Base/FolderVersion.php old mode 100755 new mode 100644 index 4f6305b7e..ec588dcbd --- a/core/lib/Thelia/Model/Base/FolderVersion.php +++ b/core/lib/Thelia/Model/Base/FolderVersion.php @@ -292,7 +292,7 @@ abstract class FolderVersion implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/FolderVersionQuery.php b/core/lib/Thelia/Model/Base/FolderVersionQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Group.php b/core/lib/Thelia/Model/Base/Group.php old mode 100755 new mode 100644 index 9cfde2bdc..19d41e38c --- a/core/lib/Thelia/Model/Base/Group.php +++ b/core/lib/Thelia/Model/Base/Group.php @@ -339,7 +339,7 @@ abstract class Group implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/GroupI18n.php b/core/lib/Thelia/Model/Base/GroupI18n.php old mode 100755 new mode 100644 index 4de63ea63..df8f3f81a --- a/core/lib/Thelia/Model/Base/GroupI18n.php +++ b/core/lib/Thelia/Model/Base/GroupI18n.php @@ -272,7 +272,7 @@ abstract class GroupI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/GroupI18nQuery.php b/core/lib/Thelia/Model/Base/GroupI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/GroupModule.php b/core/lib/Thelia/Model/Base/GroupModule.php old mode 100755 new mode 100644 index 620ca9c91..82d6056f2 --- a/core/lib/Thelia/Model/Base/GroupModule.php +++ b/core/lib/Thelia/Model/Base/GroupModule.php @@ -282,7 +282,7 @@ abstract class GroupModule implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/GroupModuleQuery.php b/core/lib/Thelia/Model/Base/GroupModuleQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/GroupQuery.php b/core/lib/Thelia/Model/Base/GroupQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/GroupResource.php b/core/lib/Thelia/Model/Base/GroupResource.php old mode 100755 new mode 100644 index 84d6006b0..ea6c0ff47 --- a/core/lib/Thelia/Model/Base/GroupResource.php +++ b/core/lib/Thelia/Model/Base/GroupResource.php @@ -290,7 +290,7 @@ abstract class GroupResource implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/GroupResourceQuery.php b/core/lib/Thelia/Model/Base/GroupResourceQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Lang.php b/core/lib/Thelia/Model/Base/Lang.php old mode 100755 new mode 100644 index 3379594ef..293b0f3a7 --- a/core/lib/Thelia/Model/Base/Lang.php +++ b/core/lib/Thelia/Model/Base/Lang.php @@ -272,7 +272,7 @@ abstract class Lang implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/LangQuery.php b/core/lib/Thelia/Model/Base/LangQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Message.php b/core/lib/Thelia/Model/Base/Message.php old mode 100755 new mode 100644 index 7ff0fbd72..4ee6b4cab --- a/core/lib/Thelia/Model/Base/Message.php +++ b/core/lib/Thelia/Model/Base/Message.php @@ -332,7 +332,7 @@ abstract class Message implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/MessageI18n.php b/core/lib/Thelia/Model/Base/MessageI18n.php old mode 100755 new mode 100644 index 045a08c6e..d37682f97 --- a/core/lib/Thelia/Model/Base/MessageI18n.php +++ b/core/lib/Thelia/Model/Base/MessageI18n.php @@ -272,7 +272,7 @@ abstract class MessageI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/MessageI18nQuery.php b/core/lib/Thelia/Model/Base/MessageI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/MessageQuery.php b/core/lib/Thelia/Model/Base/MessageQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/MessageVersion.php b/core/lib/Thelia/Model/Base/MessageVersion.php old mode 100755 new mode 100644 index d86cf05ec..60e12da8d --- a/core/lib/Thelia/Model/Base/MessageVersion.php +++ b/core/lib/Thelia/Model/Base/MessageVersion.php @@ -286,7 +286,7 @@ abstract class MessageVersion implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/MessageVersionQuery.php b/core/lib/Thelia/Model/Base/MessageVersionQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Module.php b/core/lib/Thelia/Model/Base/Module.php old mode 100755 new mode 100644 index c1ee2ed8d..556ef9ff6 --- a/core/lib/Thelia/Model/Base/Module.php +++ b/core/lib/Thelia/Model/Base/Module.php @@ -303,7 +303,7 @@ abstract class Module implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ModuleI18n.php b/core/lib/Thelia/Model/Base/ModuleI18n.php old mode 100755 new mode 100644 index fbb4293ba..9c7d603d1 --- a/core/lib/Thelia/Model/Base/ModuleI18n.php +++ b/core/lib/Thelia/Model/Base/ModuleI18n.php @@ -272,7 +272,7 @@ abstract class ModuleI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ModuleI18nQuery.php b/core/lib/Thelia/Model/Base/ModuleI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ModuleQuery.php b/core/lib/Thelia/Model/Base/ModuleQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Order.php b/core/lib/Thelia/Model/Base/Order.php old mode 100755 new mode 100644 index b815aff34..6932ec6c4 --- a/core/lib/Thelia/Model/Base/Order.php +++ b/core/lib/Thelia/Model/Base/Order.php @@ -388,7 +388,7 @@ abstract class Order implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/OrderAddress.php b/core/lib/Thelia/Model/Base/OrderAddress.php old mode 100755 new mode 100644 index b5ff32951..d0220d4e0 --- a/core/lib/Thelia/Model/Base/OrderAddress.php +++ b/core/lib/Thelia/Model/Base/OrderAddress.php @@ -329,7 +329,7 @@ abstract class OrderAddress implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/OrderAddressQuery.php b/core/lib/Thelia/Model/Base/OrderAddressQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/OrderFeature.php b/core/lib/Thelia/Model/Base/OrderFeature.php old mode 100755 new mode 100644 index 49c1a0911..e2b52e6b1 --- a/core/lib/Thelia/Model/Base/OrderFeature.php +++ b/core/lib/Thelia/Model/Base/OrderFeature.php @@ -261,7 +261,7 @@ abstract class OrderFeature implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/OrderFeatureQuery.php b/core/lib/Thelia/Model/Base/OrderFeatureQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/OrderProduct.php b/core/lib/Thelia/Model/Base/OrderProduct.php old mode 100755 new mode 100644 index b448e4e0c..2bf9c7ace --- a/core/lib/Thelia/Model/Base/OrderProduct.php +++ b/core/lib/Thelia/Model/Base/OrderProduct.php @@ -312,7 +312,7 @@ abstract class OrderProduct implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/OrderProductQuery.php b/core/lib/Thelia/Model/Base/OrderProductQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/OrderQuery.php b/core/lib/Thelia/Model/Base/OrderQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/OrderStatus.php b/core/lib/Thelia/Model/Base/OrderStatus.php old mode 100755 new mode 100644 index fc4a224d1..d249b4865 --- a/core/lib/Thelia/Model/Base/OrderStatus.php +++ b/core/lib/Thelia/Model/Base/OrderStatus.php @@ -285,7 +285,7 @@ abstract class OrderStatus implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/OrderStatusI18n.php b/core/lib/Thelia/Model/Base/OrderStatusI18n.php old mode 100755 new mode 100644 index 76ec4a28a..2946cc55b --- a/core/lib/Thelia/Model/Base/OrderStatusI18n.php +++ b/core/lib/Thelia/Model/Base/OrderStatusI18n.php @@ -272,7 +272,7 @@ abstract class OrderStatusI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/OrderStatusI18nQuery.php b/core/lib/Thelia/Model/Base/OrderStatusI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/OrderStatusQuery.php b/core/lib/Thelia/Model/Base/OrderStatusQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Product.php b/core/lib/Thelia/Model/Base/Product.php old mode 100755 new mode 100644 index 2fffe9af4..f7457d47b --- a/core/lib/Thelia/Model/Base/Product.php +++ b/core/lib/Thelia/Model/Base/Product.php @@ -41,8 +41,6 @@ use Thelia\Model\ProductSaleElements as ChildProductSaleElements; use Thelia\Model\ProductSaleElementsQuery as ChildProductSaleElementsQuery; use Thelia\Model\ProductVersion as ChildProductVersion; use Thelia\Model\ProductVersionQuery as ChildProductVersionQuery; -use Thelia\Model\Rewriting as ChildRewriting; -use Thelia\Model\RewritingQuery as ChildRewritingQuery; use Thelia\Model\TaxRule as ChildTaxRule; use Thelia\Model\TaxRuleQuery as ChildTaxRuleQuery; use Thelia\Model\Map\ProductTableMap; @@ -191,12 +189,6 @@ abstract class Product implements ActiveRecordInterface protected $collAccessoriesRelatedByAccessory; protected $collAccessoriesRelatedByAccessoryPartial; - /** - * @var ObjectCollection|ChildRewriting[] Collection to store aggregation of ChildRewriting objects. - */ - protected $collRewritings; - protected $collRewritingsPartial; - /** * @var ObjectCollection|ChildCartItem[] Collection to store aggregation of ChildCartItem objects. */ @@ -326,12 +318,6 @@ abstract class Product implements ActiveRecordInterface */ protected $accessoriesRelatedByAccessoryScheduledForDeletion = null; - /** - * An array of objects scheduled for deletion. - * @var ObjectCollection - */ - protected $rewritingsScheduledForDeletion = null; - /** * An array of objects scheduled for deletion. * @var ObjectCollection @@ -526,7 +512,7 @@ abstract class Product implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** @@ -1145,8 +1131,6 @@ abstract class Product implements ActiveRecordInterface $this->collAccessoriesRelatedByAccessory = null; - $this->collRewritings = null; - $this->collCartItems = null; $this->collProductAssociatedContents = null; @@ -1515,23 +1499,6 @@ abstract class Product implements ActiveRecordInterface } } - if ($this->rewritingsScheduledForDeletion !== null) { - if (!$this->rewritingsScheduledForDeletion->isEmpty()) { - \Thelia\Model\RewritingQuery::create() - ->filterByPrimaryKeys($this->rewritingsScheduledForDeletion->getPrimaryKeys(false)) - ->delete($con); - $this->rewritingsScheduledForDeletion = null; - } - } - - if ($this->collRewritings !== null) { - foreach ($this->collRewritings as $referrerFK) { - if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) { - $affectedRows += $referrerFK->save($con); - } - } - } - if ($this->cartItemsScheduledForDeletion !== null) { if (!$this->cartItemsScheduledForDeletion->isEmpty()) { \Thelia\Model\CartItemQuery::create() @@ -1860,9 +1827,6 @@ abstract class Product implements ActiveRecordInterface if (null !== $this->collAccessoriesRelatedByAccessory) { $result['AccessoriesRelatedByAccessory'] = $this->collAccessoriesRelatedByAccessory->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } - if (null !== $this->collRewritings) { - $result['Rewritings'] = $this->collRewritings->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); - } if (null !== $this->collCartItems) { $result['CartItems'] = $this->collCartItems->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } @@ -2114,12 +2078,6 @@ abstract class Product implements ActiveRecordInterface } } - foreach ($this->getRewritings() as $relObj) { - if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves - $copyObj->addRewriting($relObj->copy($deepCopy)); - } - } - foreach ($this->getCartItems() as $relObj) { if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves $copyObj->addCartItem($relObj->copy($deepCopy)); @@ -2257,9 +2215,6 @@ abstract class Product implements ActiveRecordInterface if ('AccessoryRelatedByAccessory' == $relationName) { return $this->initAccessoriesRelatedByAccessory(); } - if ('Rewriting' == $relationName) { - return $this->initRewritings(); - } if ('CartItem' == $relationName) { return $this->initCartItems(); } @@ -3878,299 +3833,6 @@ abstract class Product implements ActiveRecordInterface return $this; } - /** - * Clears out the collRewritings collection - * - * This does not modify the database; however, it will remove any associated objects, causing - * them to be refetched by subsequent calls to accessor method. - * - * @return void - * @see addRewritings() - */ - public function clearRewritings() - { - $this->collRewritings = null; // important to set this to NULL since that means it is uninitialized - } - - /** - * Reset is the collRewritings collection loaded partially. - */ - public function resetPartialRewritings($v = true) - { - $this->collRewritingsPartial = $v; - } - - /** - * Initializes the collRewritings collection. - * - * By default this just sets the collRewritings collection to an empty array (like clearcollRewritings()); - * however, you may wish to override this method in your stub class to provide setting appropriate - * to your application -- for example, setting the initial array to the values stored in database. - * - * @param boolean $overrideExisting If set to true, the method call initializes - * the collection even if it is not empty - * - * @return void - */ - public function initRewritings($overrideExisting = true) - { - if (null !== $this->collRewritings && !$overrideExisting) { - return; - } - $this->collRewritings = new ObjectCollection(); - $this->collRewritings->setModel('\Thelia\Model\Rewriting'); - } - - /** - * Gets an array of ChildRewriting objects which contain a foreign key that references this object. - * - * If the $criteria is not null, it is used to always fetch the results from the database. - * Otherwise the results are fetched from the database the first time, then cached. - * Next time the same method is called without $criteria, the cached collection is returned. - * If this ChildProduct is new, it will return - * an empty collection or the current collection; the criteria is ignored on a new object. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @return Collection|ChildRewriting[] List of ChildRewriting objects - * @throws PropelException - */ - public function getRewritings($criteria = null, ConnectionInterface $con = null) - { - $partial = $this->collRewritingsPartial && !$this->isNew(); - if (null === $this->collRewritings || null !== $criteria || $partial) { - if ($this->isNew() && null === $this->collRewritings) { - // return empty collection - $this->initRewritings(); - } else { - $collRewritings = ChildRewritingQuery::create(null, $criteria) - ->filterByProduct($this) - ->find($con); - - if (null !== $criteria) { - if (false !== $this->collRewritingsPartial && count($collRewritings)) { - $this->initRewritings(false); - - foreach ($collRewritings as $obj) { - if (false == $this->collRewritings->contains($obj)) { - $this->collRewritings->append($obj); - } - } - - $this->collRewritingsPartial = true; - } - - $collRewritings->getInternalIterator()->rewind(); - - return $collRewritings; - } - - if ($partial && $this->collRewritings) { - foreach ($this->collRewritings as $obj) { - if ($obj->isNew()) { - $collRewritings[] = $obj; - } - } - } - - $this->collRewritings = $collRewritings; - $this->collRewritingsPartial = false; - } - } - - return $this->collRewritings; - } - - /** - * Sets a collection of Rewriting objects related by a one-to-many relationship - * to the current object. - * It will also schedule objects for deletion based on a diff between old objects (aka persisted) - * and new objects from the given Propel collection. - * - * @param Collection $rewritings A Propel collection. - * @param ConnectionInterface $con Optional connection object - * @return ChildProduct The current object (for fluent API support) - */ - public function setRewritings(Collection $rewritings, ConnectionInterface $con = null) - { - $rewritingsToDelete = $this->getRewritings(new Criteria(), $con)->diff($rewritings); - - - $this->rewritingsScheduledForDeletion = $rewritingsToDelete; - - foreach ($rewritingsToDelete as $rewritingRemoved) { - $rewritingRemoved->setProduct(null); - } - - $this->collRewritings = null; - foreach ($rewritings as $rewriting) { - $this->addRewriting($rewriting); - } - - $this->collRewritings = $rewritings; - $this->collRewritingsPartial = false; - - return $this; - } - - /** - * Returns the number of related Rewriting objects. - * - * @param Criteria $criteria - * @param boolean $distinct - * @param ConnectionInterface $con - * @return int Count of related Rewriting objects. - * @throws PropelException - */ - public function countRewritings(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null) - { - $partial = $this->collRewritingsPartial && !$this->isNew(); - if (null === $this->collRewritings || null !== $criteria || $partial) { - if ($this->isNew() && null === $this->collRewritings) { - return 0; - } - - if ($partial && !$criteria) { - return count($this->getRewritings()); - } - - $query = ChildRewritingQuery::create(null, $criteria); - if ($distinct) { - $query->distinct(); - } - - return $query - ->filterByProduct($this) - ->count($con); - } - - return count($this->collRewritings); - } - - /** - * Method called to associate a ChildRewriting object to this object - * through the ChildRewriting foreign key attribute. - * - * @param ChildRewriting $l ChildRewriting - * @return \Thelia\Model\Product The current object (for fluent API support) - */ - public function addRewriting(ChildRewriting $l) - { - if ($this->collRewritings === null) { - $this->initRewritings(); - $this->collRewritingsPartial = true; - } - - if (!in_array($l, $this->collRewritings->getArrayCopy(), true)) { // only add it if the **same** object is not already associated - $this->doAddRewriting($l); - } - - return $this; - } - - /** - * @param Rewriting $rewriting The rewriting object to add. - */ - protected function doAddRewriting($rewriting) - { - $this->collRewritings[]= $rewriting; - $rewriting->setProduct($this); - } - - /** - * @param Rewriting $rewriting The rewriting object to remove. - * @return ChildProduct The current object (for fluent API support) - */ - public function removeRewriting($rewriting) - { - if ($this->getRewritings()->contains($rewriting)) { - $this->collRewritings->remove($this->collRewritings->search($rewriting)); - if (null === $this->rewritingsScheduledForDeletion) { - $this->rewritingsScheduledForDeletion = clone $this->collRewritings; - $this->rewritingsScheduledForDeletion->clear(); - } - $this->rewritingsScheduledForDeletion[]= $rewriting; - $rewriting->setProduct(null); - } - - return $this; - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Product is new, it will return - * an empty collection; or if this Product has previously - * been saved, it will retrieve related Rewritings from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Product. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildRewriting[] List of ChildRewriting objects - */ - public function getRewritingsJoinCategory($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildRewritingQuery::create(null, $criteria); - $query->joinWith('Category', $joinBehavior); - - return $this->getRewritings($query, $con); - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Product is new, it will return - * an empty collection; or if this Product has previously - * been saved, it will retrieve related Rewritings from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Product. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildRewriting[] List of ChildRewriting objects - */ - public function getRewritingsJoinFolder($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildRewritingQuery::create(null, $criteria); - $query->joinWith('Folder', $joinBehavior); - - return $this->getRewritings($query, $con); - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this Product is new, it will return - * an empty collection; or if this Product has previously - * been saved, it will retrieve related Rewritings from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in Product. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param ConnectionInterface $con optional connection object - * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return Collection|ChildRewriting[] List of ChildRewriting objects - */ - public function getRewritingsJoinContent($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN) - { - $query = ChildRewritingQuery::create(null, $criteria); - $query->joinWith('Content', $joinBehavior); - - return $this->getRewritings($query, $con); - } - /** * Clears out the collCartItems collection * @@ -5747,11 +5409,6 @@ abstract class Product implements ActiveRecordInterface $o->clearAllReferences($deep); } } - if ($this->collRewritings) { - foreach ($this->collRewritings as $o) { - $o->clearAllReferences($deep); - } - } if ($this->collCartItems) { foreach ($this->collCartItems as $o) { $o->clearAllReferences($deep); @@ -5821,10 +5478,6 @@ abstract class Product implements ActiveRecordInterface $this->collAccessoriesRelatedByAccessory->clearIterator(); } $this->collAccessoriesRelatedByAccessory = null; - if ($this->collRewritings instanceof Collection) { - $this->collRewritings->clearIterator(); - } - $this->collRewritings = null; if ($this->collCartItems instanceof Collection) { $this->collCartItems->clearIterator(); } diff --git a/core/lib/Thelia/Model/Base/ProductAssociatedContent.php b/core/lib/Thelia/Model/Base/ProductAssociatedContent.php index 6dce2b2c3..bbc97d5d1 100644 --- a/core/lib/Thelia/Model/Base/ProductAssociatedContent.php +++ b/core/lib/Thelia/Model/Base/ProductAssociatedContent.php @@ -268,7 +268,7 @@ abstract class ProductAssociatedContent implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ProductCategory.php b/core/lib/Thelia/Model/Base/ProductCategory.php old mode 100755 new mode 100644 index 74affb0c0..62a6ea425 --- a/core/lib/Thelia/Model/Base/ProductCategory.php +++ b/core/lib/Thelia/Model/Base/ProductCategory.php @@ -256,7 +256,7 @@ abstract class ProductCategory implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ProductCategoryQuery.php b/core/lib/Thelia/Model/Base/ProductCategoryQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ProductDocument.php b/core/lib/Thelia/Model/Base/ProductDocument.php old mode 100755 new mode 100644 index 58c9999ed..4223679c1 --- a/core/lib/Thelia/Model/Base/ProductDocument.php +++ b/core/lib/Thelia/Model/Base/ProductDocument.php @@ -290,7 +290,7 @@ abstract class ProductDocument implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ProductDocumentI18n.php b/core/lib/Thelia/Model/Base/ProductDocumentI18n.php old mode 100755 new mode 100644 index 2c5ca4d0c..1a6017966 --- a/core/lib/Thelia/Model/Base/ProductDocumentI18n.php +++ b/core/lib/Thelia/Model/Base/ProductDocumentI18n.php @@ -272,7 +272,7 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ProductDocumentI18nQuery.php b/core/lib/Thelia/Model/Base/ProductDocumentI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ProductDocumentQuery.php b/core/lib/Thelia/Model/Base/ProductDocumentQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ProductI18n.php b/core/lib/Thelia/Model/Base/ProductI18n.php old mode 100755 new mode 100644 index b0c74bb54..3ef14e787 --- a/core/lib/Thelia/Model/Base/ProductI18n.php +++ b/core/lib/Thelia/Model/Base/ProductI18n.php @@ -272,7 +272,7 @@ abstract class ProductI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ProductI18nQuery.php b/core/lib/Thelia/Model/Base/ProductI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ProductImage.php b/core/lib/Thelia/Model/Base/ProductImage.php old mode 100755 new mode 100644 index 0b4030ccb..a54d22cd0 --- a/core/lib/Thelia/Model/Base/ProductImage.php +++ b/core/lib/Thelia/Model/Base/ProductImage.php @@ -290,7 +290,7 @@ abstract class ProductImage implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ProductImageI18n.php b/core/lib/Thelia/Model/Base/ProductImageI18n.php old mode 100755 new mode 100644 index 634f726a3..679ded79c --- a/core/lib/Thelia/Model/Base/ProductImageI18n.php +++ b/core/lib/Thelia/Model/Base/ProductImageI18n.php @@ -272,7 +272,7 @@ abstract class ProductImageI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ProductImageI18nQuery.php b/core/lib/Thelia/Model/Base/ProductImageI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ProductImageQuery.php b/core/lib/Thelia/Model/Base/ProductImageQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ProductPrice.php b/core/lib/Thelia/Model/Base/ProductPrice.php old mode 100755 new mode 100644 index dab6e47a4..15502a385 --- a/core/lib/Thelia/Model/Base/ProductPrice.php +++ b/core/lib/Thelia/Model/Base/ProductPrice.php @@ -274,7 +274,7 @@ abstract class ProductPrice implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ProductPriceQuery.php b/core/lib/Thelia/Model/Base/ProductPriceQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ProductQuery.php b/core/lib/Thelia/Model/Base/ProductQuery.php old mode 100755 new mode 100644 index f3ed6a93c..75f05dfcf --- a/core/lib/Thelia/Model/Base/ProductQuery.php +++ b/core/lib/Thelia/Model/Base/ProductQuery.php @@ -80,10 +80,6 @@ use Thelia\Model\Map\ProductTableMap; * @method ChildProductQuery rightJoinAccessoryRelatedByAccessory($relationAlias = null) Adds a RIGHT JOIN clause to the query using the AccessoryRelatedByAccessory relation * @method ChildProductQuery innerJoinAccessoryRelatedByAccessory($relationAlias = null) Adds a INNER JOIN clause to the query using the AccessoryRelatedByAccessory relation * - * @method ChildProductQuery leftJoinRewriting($relationAlias = null) Adds a LEFT JOIN clause to the query using the Rewriting relation - * @method ChildProductQuery rightJoinRewriting($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Rewriting relation - * @method ChildProductQuery innerJoinRewriting($relationAlias = null) Adds a INNER JOIN clause to the query using the Rewriting relation - * * @method ChildProductQuery leftJoinCartItem($relationAlias = null) Adds a LEFT JOIN clause to the query using the CartItem relation * @method ChildProductQuery rightJoinCartItem($relationAlias = null) Adds a RIGHT JOIN clause to the query using the CartItem relation * @method ChildProductQuery innerJoinCartItem($relationAlias = null) Adds a INNER JOIN clause to the query using the CartItem relation @@ -1288,79 +1284,6 @@ abstract class ProductQuery extends ModelCriteria ->useQuery($relationAlias ? $relationAlias : 'AccessoryRelatedByAccessory', '\Thelia\Model\AccessoryQuery'); } - /** - * Filter the query by a related \Thelia\Model\Rewriting object - * - * @param \Thelia\Model\Rewriting|ObjectCollection $rewriting the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildProductQuery The current query, for fluid interface - */ - public function filterByRewriting($rewriting, $comparison = null) - { - if ($rewriting instanceof \Thelia\Model\Rewriting) { - return $this - ->addUsingAlias(ProductTableMap::ID, $rewriting->getProductId(), $comparison); - } elseif ($rewriting instanceof ObjectCollection) { - return $this - ->useRewritingQuery() - ->filterByPrimaryKeys($rewriting->getPrimaryKeys()) - ->endUse(); - } else { - throw new PropelException('filterByRewriting() only accepts arguments of type \Thelia\Model\Rewriting or Collection'); - } - } - - /** - * Adds a JOIN clause to the query using the Rewriting relation - * - * @param string $relationAlias optional alias for the relation - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return ChildProductQuery The current query, for fluid interface - */ - public function joinRewriting($relationAlias = null, $joinType = Criteria::LEFT_JOIN) - { - $tableMap = $this->getTableMap(); - $relationMap = $tableMap->getRelation('Rewriting'); - - // create a ModelJoin object for this join - $join = new ModelJoin(); - $join->setJoinType($joinType); - $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); - if ($previousJoin = $this->getPreviousJoin()) { - $join->setPreviousJoin($previousJoin); - } - - // add the ModelJoin to the current object - if ($relationAlias) { - $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); - $this->addJoinObject($join, $relationAlias); - } else { - $this->addJoinObject($join, 'Rewriting'); - } - - return $this; - } - - /** - * Use the Rewriting relation Rewriting object - * - * @see useQuery() - * - * @param string $relationAlias optional alias for the relation, - * to be used as main alias in the secondary query - * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' - * - * @return \Thelia\Model\RewritingQuery A secondary query class using the current class as primary query - */ - public function useRewritingQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) - { - return $this - ->joinRewriting($relationAlias, $joinType) - ->useQuery($relationAlias ? $relationAlias : 'Rewriting', '\Thelia\Model\RewritingQuery'); - } - /** * Filter the query by a related \Thelia\Model\CartItem object * diff --git a/core/lib/Thelia/Model/Base/ProductSaleElements.php b/core/lib/Thelia/Model/Base/ProductSaleElements.php old mode 100755 new mode 100644 index 22a8c9752..f79d9a246 --- a/core/lib/Thelia/Model/Base/ProductSaleElements.php +++ b/core/lib/Thelia/Model/Base/ProductSaleElements.php @@ -332,7 +332,7 @@ abstract class ProductSaleElements implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ProductSaleElementsQuery.php b/core/lib/Thelia/Model/Base/ProductSaleElementsQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ProductVersion.php b/core/lib/Thelia/Model/Base/ProductVersion.php old mode 100755 new mode 100644 index 1779cee20..071dfc742 --- a/core/lib/Thelia/Model/Base/ProductVersion.php +++ b/core/lib/Thelia/Model/Base/ProductVersion.php @@ -300,7 +300,7 @@ abstract class ProductVersion implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ProductVersionQuery.php b/core/lib/Thelia/Model/Base/ProductVersionQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/Resource.php b/core/lib/Thelia/Model/Base/Resource.php old mode 100755 new mode 100644 index c6c527134..5a51bdc29 --- a/core/lib/Thelia/Model/Base/Resource.php +++ b/core/lib/Thelia/Model/Base/Resource.php @@ -298,7 +298,7 @@ abstract class Resource implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ResourceI18n.php b/core/lib/Thelia/Model/Base/ResourceI18n.php old mode 100755 new mode 100644 index c060e8776..ac9ca106f --- a/core/lib/Thelia/Model/Base/ResourceI18n.php +++ b/core/lib/Thelia/Model/Base/ResourceI18n.php @@ -272,7 +272,7 @@ abstract class ResourceI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/ResourceI18nQuery.php b/core/lib/Thelia/Model/Base/ResourceI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/ResourceQuery.php b/core/lib/Thelia/Model/Base/ResourceQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/RewritingArgument.php b/core/lib/Thelia/Model/Base/RewritingArgument.php index e8a3a9a16..45f26c24f 100644 --- a/core/lib/Thelia/Model/Base/RewritingArgument.php +++ b/core/lib/Thelia/Model/Base/RewritingArgument.php @@ -255,7 +255,7 @@ abstract class RewritingArgument implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/RewritingUrl.php b/core/lib/Thelia/Model/Base/RewritingUrl.php index a6bcd3a26..75ee97e79 100644 --- a/core/lib/Thelia/Model/Base/RewritingUrl.php +++ b/core/lib/Thelia/Model/Base/RewritingUrl.php @@ -298,7 +298,7 @@ abstract class RewritingUrl implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/Tax.php b/core/lib/Thelia/Model/Base/Tax.php old mode 100755 new mode 100644 index 3e405414c..02e6bc3b0 --- a/core/lib/Thelia/Model/Base/Tax.php +++ b/core/lib/Thelia/Model/Base/Tax.php @@ -285,7 +285,7 @@ abstract class Tax implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/TaxI18n.php b/core/lib/Thelia/Model/Base/TaxI18n.php old mode 100755 new mode 100644 index f8577e860..abb659135 --- a/core/lib/Thelia/Model/Base/TaxI18n.php +++ b/core/lib/Thelia/Model/Base/TaxI18n.php @@ -260,7 +260,7 @@ abstract class TaxI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/TaxI18nQuery.php b/core/lib/Thelia/Model/Base/TaxI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/TaxQuery.php b/core/lib/Thelia/Model/Base/TaxQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/TaxRule.php b/core/lib/Thelia/Model/Base/TaxRule.php old mode 100755 new mode 100644 index bf318498c..d33d47e2b --- a/core/lib/Thelia/Model/Base/TaxRule.php +++ b/core/lib/Thelia/Model/Base/TaxRule.php @@ -311,7 +311,7 @@ abstract class TaxRule implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/TaxRuleCountry.php b/core/lib/Thelia/Model/Base/TaxRuleCountry.php old mode 100755 new mode 100644 index b5ae7941b..66f6f585b --- a/core/lib/Thelia/Model/Base/TaxRuleCountry.php +++ b/core/lib/Thelia/Model/Base/TaxRuleCountry.php @@ -281,7 +281,7 @@ abstract class TaxRuleCountry implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/TaxRuleCountryQuery.php b/core/lib/Thelia/Model/Base/TaxRuleCountryQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/TaxRuleI18n.php b/core/lib/Thelia/Model/Base/TaxRuleI18n.php old mode 100755 new mode 100644 index 51bab6a77..b1efadd6a --- a/core/lib/Thelia/Model/Base/TaxRuleI18n.php +++ b/core/lib/Thelia/Model/Base/TaxRuleI18n.php @@ -248,7 +248,7 @@ abstract class TaxRuleI18n implements ActiveRecordInterface */ public function hasVirtualColumn($name) { - return isset($this->virtualColumns[$name]); + return array_key_exists($name, $this->virtualColumns); } /** diff --git a/core/lib/Thelia/Model/Base/TaxRuleI18nQuery.php b/core/lib/Thelia/Model/Base/TaxRuleI18nQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Base/TaxRuleQuery.php b/core/lib/Thelia/Model/Base/TaxRuleQuery.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Category.php b/core/lib/Thelia/Model/Category.php index ac3b2fff6..ae999ccc8 100755 --- a/core/lib/Thelia/Model/Category.php +++ b/core/lib/Thelia/Model/Category.php @@ -2,6 +2,7 @@ namespace Thelia\Model; +use Thelia\Core\Event\CategoryEvent; use Thelia\Model\Base\Category as BaseCategory; use Propel\Runtime\ActiveQuery\Criteria; use Thelia\Tools\URL; diff --git a/core/lib/Thelia/Model/Map/AccessoryTableMap.php b/core/lib/Thelia/Model/Map/AccessoryTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/AddressTableMap.php b/core/lib/Thelia/Model/Map/AddressTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/AdminGroupTableMap.php b/core/lib/Thelia/Model/Map/AdminGroupTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/AdminLogTableMap.php b/core/lib/Thelia/Model/Map/AdminLogTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/AdminTableMap.php b/core/lib/Thelia/Model/Map/AdminTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/AreaTableMap.php b/core/lib/Thelia/Model/Map/AreaTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/AttributeAvI18nTableMap.php b/core/lib/Thelia/Model/Map/AttributeAvI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/AttributeAvTableMap.php b/core/lib/Thelia/Model/Map/AttributeAvTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/AttributeCategoryTableMap.php b/core/lib/Thelia/Model/Map/AttributeCategoryTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/AttributeCombinationTableMap.php b/core/lib/Thelia/Model/Map/AttributeCombinationTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/AttributeI18nTableMap.php b/core/lib/Thelia/Model/Map/AttributeI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/AttributeTableMap.php b/core/lib/Thelia/Model/Map/AttributeTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CartItemTableMap.php b/core/lib/Thelia/Model/Map/CartItemTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CartTableMap.php b/core/lib/Thelia/Model/Map/CartTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CategoryDocumentI18nTableMap.php b/core/lib/Thelia/Model/Map/CategoryDocumentI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CategoryDocumentTableMap.php b/core/lib/Thelia/Model/Map/CategoryDocumentTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CategoryI18nTableMap.php b/core/lib/Thelia/Model/Map/CategoryI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CategoryImageI18nTableMap.php b/core/lib/Thelia/Model/Map/CategoryImageI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CategoryImageTableMap.php b/core/lib/Thelia/Model/Map/CategoryImageTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CategoryTableMap.php b/core/lib/Thelia/Model/Map/CategoryTableMap.php old mode 100755 new mode 100644 index e6f38e11e..6a2d052a1 --- a/core/lib/Thelia/Model/Map/CategoryTableMap.php +++ b/core/lib/Thelia/Model/Map/CategoryTableMap.php @@ -193,7 +193,6 @@ class CategoryTableMap extends TableMap $this->addRelation('ProductCategory', '\\Thelia\\Model\\ProductCategory', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'ProductCategories'); $this->addRelation('FeatureCategory', '\\Thelia\\Model\\FeatureCategory', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'FeatureCategories'); $this->addRelation('AttributeCategory', '\\Thelia\\Model\\AttributeCategory', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'AttributeCategories'); - $this->addRelation('Rewriting', '\\Thelia\\Model\\Rewriting', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'Rewritings'); $this->addRelation('CategoryImage', '\\Thelia\\Model\\CategoryImage', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'CategoryImages'); $this->addRelation('CategoryDocument', '\\Thelia\\Model\\CategoryDocument', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'CategoryDocuments'); $this->addRelation('CategoryAssociatedContent', '\\Thelia\\Model\\CategoryAssociatedContent', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'CategoryAssociatedContents'); @@ -228,7 +227,6 @@ class CategoryTableMap extends TableMap ProductCategoryTableMap::clearInstancePool(); FeatureCategoryTableMap::clearInstancePool(); AttributeCategoryTableMap::clearInstancePool(); - RewritingTableMap::clearInstancePool(); CategoryImageTableMap::clearInstancePool(); CategoryDocumentTableMap::clearInstancePool(); CategoryAssociatedContentTableMap::clearInstancePool(); diff --git a/core/lib/Thelia/Model/Map/CategoryVersionTableMap.php b/core/lib/Thelia/Model/Map/CategoryVersionTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ConfigI18nTableMap.php b/core/lib/Thelia/Model/Map/ConfigI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ConfigTableMap.php b/core/lib/Thelia/Model/Map/ConfigTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ContentDocumentI18nTableMap.php b/core/lib/Thelia/Model/Map/ContentDocumentI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ContentDocumentTableMap.php b/core/lib/Thelia/Model/Map/ContentDocumentTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ContentFolderTableMap.php b/core/lib/Thelia/Model/Map/ContentFolderTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ContentI18nTableMap.php b/core/lib/Thelia/Model/Map/ContentI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ContentImageI18nTableMap.php b/core/lib/Thelia/Model/Map/ContentImageI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ContentImageTableMap.php b/core/lib/Thelia/Model/Map/ContentImageTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ContentTableMap.php b/core/lib/Thelia/Model/Map/ContentTableMap.php old mode 100755 new mode 100644 index 04dcb5e91..ae9b908c0 --- a/core/lib/Thelia/Model/Map/ContentTableMap.php +++ b/core/lib/Thelia/Model/Map/ContentTableMap.php @@ -184,7 +184,6 @@ class ContentTableMap extends TableMap */ public function buildRelations() { - $this->addRelation('Rewriting', '\\Thelia\\Model\\Rewriting', RelationMap::ONE_TO_MANY, array('id' => 'content_id', ), 'CASCADE', 'RESTRICT', 'Rewritings'); $this->addRelation('ContentFolder', '\\Thelia\\Model\\ContentFolder', RelationMap::ONE_TO_MANY, array('id' => 'content_id', ), 'CASCADE', 'RESTRICT', 'ContentFolders'); $this->addRelation('ContentImage', '\\Thelia\\Model\\ContentImage', RelationMap::ONE_TO_MANY, array('id' => 'content_id', ), 'CASCADE', 'RESTRICT', 'ContentImages'); $this->addRelation('ContentDocument', '\\Thelia\\Model\\ContentDocument', RelationMap::ONE_TO_MANY, array('id' => 'content_id', ), 'CASCADE', 'RESTRICT', 'ContentDocuments'); @@ -216,7 +215,6 @@ class ContentTableMap extends TableMap { // Invalidate objects in ".$this->getClassNameFromBuilder($joinedTableTableMapBuilder)." instance pool, // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule. - RewritingTableMap::clearInstancePool(); ContentFolderTableMap::clearInstancePool(); ContentImageTableMap::clearInstancePool(); ContentDocumentTableMap::clearInstancePool(); diff --git a/core/lib/Thelia/Model/Map/ContentVersionTableMap.php b/core/lib/Thelia/Model/Map/ContentVersionTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CountryI18nTableMap.php b/core/lib/Thelia/Model/Map/CountryI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CountryTableMap.php b/core/lib/Thelia/Model/Map/CountryTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CouponI18nTableMap.php b/core/lib/Thelia/Model/Map/CouponI18nTableMap.php index 05f4b46ec..46ecdce3b 100644 --- a/core/lib/Thelia/Model/Map/CouponI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/CouponI18nTableMap.php @@ -146,11 +146,10 @@ class CouponI18nTableMap extends TableMap $this->setUseIdGenerator(false); // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'coupon', 'ID', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN'); + $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); $this->addColumn('TITLE', 'Title', 'VARCHAR', true, 255, null); $this->addColumn('SHORT_DESCRIPTION', 'ShortDescription', 'LONGVARCHAR', true, null, null); $this->addColumn('DESCRIPTION', 'Description', 'CLOB', true, null, null); - $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); } // initialize() /** @@ -350,9 +349,15 @@ class CouponI18nTableMap extends TableMap if (null === $alias) { $criteria->addSelectColumn(CouponI18nTableMap::ID); $criteria->addSelectColumn(CouponI18nTableMap::LOCALE); + $criteria->addSelectColumn(CouponI18nTableMap::TITLE); + $criteria->addSelectColumn(CouponI18nTableMap::SHORT_DESCRIPTION); + $criteria->addSelectColumn(CouponI18nTableMap::DESCRIPTION); } else { $criteria->addSelectColumn($alias . '.ID'); $criteria->addSelectColumn($alias . '.LOCALE'); + $criteria->addSelectColumn($alias . '.TITLE'); + $criteria->addSelectColumn($alias . '.SHORT_DESCRIPTION'); + $criteria->addSelectColumn($alias . '.DESCRIPTION'); } } diff --git a/core/lib/Thelia/Model/Map/CouponOrderTableMap.php b/core/lib/Thelia/Model/Map/CouponOrderTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CouponRuleTableMap.php b/core/lib/Thelia/Model/Map/CouponRuleTableMap.php deleted file mode 100755 index 99faeac59..000000000 --- a/core/lib/Thelia/Model/Map/CouponRuleTableMap.php +++ /dev/null @@ -1,463 +0,0 @@ - array('Id', 'CouponId', 'Controller', 'Operation', 'Value', 'CreatedAt', 'UpdatedAt', ), - self::TYPE_STUDLYPHPNAME => array('id', 'couponId', 'controller', 'operation', 'value', 'createdAt', 'updatedAt', ), - self::TYPE_COLNAME => array(CouponRuleTableMap::ID, CouponRuleTableMap::COUPON_ID, CouponRuleTableMap::CONTROLLER, CouponRuleTableMap::OPERATION, CouponRuleTableMap::VALUE, CouponRuleTableMap::CREATED_AT, CouponRuleTableMap::UPDATED_AT, ), - self::TYPE_RAW_COLNAME => array('ID', 'COUPON_ID', 'CONTROLLER', 'OPERATION', 'VALUE', 'CREATED_AT', 'UPDATED_AT', ), - self::TYPE_FIELDNAME => array('id', 'coupon_id', 'controller', 'operation', 'value', 'created_at', 'updated_at', ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, ) - ); - - /** - * holds an array of keys for quick access to the fieldnames array - * - * first dimension keys are the type constants - * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 - */ - protected static $fieldKeys = array ( - self::TYPE_PHPNAME => array('Id' => 0, 'CouponId' => 1, 'Controller' => 2, 'Operation' => 3, 'Value' => 4, 'CreatedAt' => 5, 'UpdatedAt' => 6, ), - self::TYPE_STUDLYPHPNAME => array('id' => 0, 'couponId' => 1, 'controller' => 2, 'operation' => 3, 'value' => 4, 'createdAt' => 5, 'updatedAt' => 6, ), - self::TYPE_COLNAME => array(CouponRuleTableMap::ID => 0, CouponRuleTableMap::COUPON_ID => 1, CouponRuleTableMap::CONTROLLER => 2, CouponRuleTableMap::OPERATION => 3, CouponRuleTableMap::VALUE => 4, CouponRuleTableMap::CREATED_AT => 5, CouponRuleTableMap::UPDATED_AT => 6, ), - self::TYPE_RAW_COLNAME => array('ID' => 0, 'COUPON_ID' => 1, 'CONTROLLER' => 2, 'OPERATION' => 3, 'VALUE' => 4, 'CREATED_AT' => 5, 'UPDATED_AT' => 6, ), - self::TYPE_FIELDNAME => array('id' => 0, 'coupon_id' => 1, 'controller' => 2, 'operation' => 3, 'value' => 4, 'created_at' => 5, 'updated_at' => 6, ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, ) - ); - - /** - * Initialize the table attributes and columns - * Relations are not initialized by this method since they are lazy loaded - * - * @return void - * @throws PropelException - */ - public function initialize() - { - // attributes - $this->setName('coupon_rule'); - $this->setPhpName('CouponRule'); - $this->setClassName('\\Thelia\\Model\\CouponRule'); - $this->setPackage('Thelia.Model'); - $this->setUseIdGenerator(true); - // columns - $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null); - $this->addForeignKey('COUPON_ID', 'CouponId', 'INTEGER', 'coupon', 'ID', true, null, null); - $this->addColumn('CONTROLLER', 'Controller', 'VARCHAR', false, 255, null); - $this->addColumn('OPERATION', 'Operation', 'VARCHAR', false, 255, null); - $this->addColumn('VALUE', 'Value', 'FLOAT', false, null, null); - $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null); - $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null); - } // initialize() - - /** - * Build the RelationMap objects for this table relationships - */ - public function buildRelations() - { - $this->addRelation('Coupon', '\\Thelia\\Model\\Coupon', RelationMap::MANY_TO_ONE, array('coupon_id' => 'id', ), 'CASCADE', 'RESTRICT'); - } // buildRelations() - - /** - * - * Gets the list of behaviors registered for this table - * - * @return array Associative array (name => parameters) of behaviors - */ - public function getBehaviors() - { - return array( - 'timestampable' => array('create_column' => 'created_at', 'update_column' => 'updated_at', ), - ); - } // getBehaviors() - - /** - * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table. - * - * For tables with a single-column primary key, that simple pkey value will be returned. For tables with - * a multi-column primary key, a serialize()d version of the primary key will be returned. - * - * @param array $row resultset row. - * @param int $offset The 0-based offset for reading from the resultset row. - * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM - */ - public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) - { - // If the PK cannot be derived from the row, return NULL. - if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null) { - return null; - } - - return (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; - } - - /** - * Retrieves the primary key from the DB resultset row - * For tables with a single-column primary key, that simple pkey value will be returned. For tables with - * a multi-column primary key, an array of the primary key columns will be returned. - * - * @param array $row resultset row. - * @param int $offset The 0-based offset for reading from the resultset row. - * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM - * - * @return mixed The primary key of the row - */ - public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) - { - - return (int) $row[ - $indexType == TableMap::TYPE_NUM - ? 0 + $offset - : self::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType) - ]; - } - - /** - * The class that the tableMap will make instances of. - * - * If $withPrefix is true, the returned path - * uses a dot-path notation which is translated into a path - * relative to a location on the PHP include_path. - * (e.g. path.to.MyClass -> 'path/to/MyClass.php') - * - * @param boolean $withPrefix Whether or not to return the path with the class name - * @return string path.to.ClassName - */ - public static function getOMClass($withPrefix = true) - { - return $withPrefix ? CouponRuleTableMap::CLASS_DEFAULT : CouponRuleTableMap::OM_CLASS; - } - - /** - * Populates an object of the default type or an object that inherit from the default. - * - * @param array $row row returned by DataFetcher->fetch(). - * @param int $offset The 0-based offset for reading from the resultset row. - * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType(). - One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME - * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM. - * - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - * @return array (CouponRule object, last column rank) - */ - public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM) - { - $key = CouponRuleTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType); - if (null !== ($obj = CouponRuleTableMap::getInstanceFromPool($key))) { - // We no longer rehydrate the object, since this can cause data loss. - // See http://www.propelorm.org/ticket/509 - // $obj->hydrate($row, $offset, true); // rehydrate - $col = $offset + CouponRuleTableMap::NUM_HYDRATE_COLUMNS; - } else { - $cls = CouponRuleTableMap::OM_CLASS; - $obj = new $cls(); - $col = $obj->hydrate($row, $offset, false, $indexType); - CouponRuleTableMap::addInstanceToPool($obj, $key); - } - - return array($obj, $col); - } - - /** - * The returned array will contain objects of the default type or - * objects that inherit from the default. - * - * @param DataFetcherInterface $dataFetcher - * @return array - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - */ - public static function populateObjects(DataFetcherInterface $dataFetcher) - { - $results = array(); - - // set the class once to avoid overhead in the loop - $cls = static::getOMClass(false); - // populate the object(s) - while ($row = $dataFetcher->fetch()) { - $key = CouponRuleTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType()); - if (null !== ($obj = CouponRuleTableMap::getInstanceFromPool($key))) { - // We no longer rehydrate the object, since this can cause data loss. - // See http://www.propelorm.org/ticket/509 - // $obj->hydrate($row, 0, true); // rehydrate - $results[] = $obj; - } else { - $obj = new $cls(); - $obj->hydrate($row); - $results[] = $obj; - CouponRuleTableMap::addInstanceToPool($obj, $key); - } // if key exists - } - - return $results; - } - /** - * Add all the columns needed to create a new object. - * - * Note: any columns that were marked with lazyLoad="true" in the - * XML schema will not be added to the select list and only loaded - * on demand. - * - * @param Criteria $criteria object containing the columns to add. - * @param string $alias optional table alias - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - */ - public static function addSelectColumns(Criteria $criteria, $alias = null) - { - if (null === $alias) { - $criteria->addSelectColumn(CouponRuleTableMap::ID); - $criteria->addSelectColumn(CouponRuleTableMap::COUPON_ID); - $criteria->addSelectColumn(CouponRuleTableMap::CONTROLLER); - $criteria->addSelectColumn(CouponRuleTableMap::OPERATION); - $criteria->addSelectColumn(CouponRuleTableMap::VALUE); - $criteria->addSelectColumn(CouponRuleTableMap::CREATED_AT); - $criteria->addSelectColumn(CouponRuleTableMap::UPDATED_AT); - } else { - $criteria->addSelectColumn($alias . '.ID'); - $criteria->addSelectColumn($alias . '.COUPON_ID'); - $criteria->addSelectColumn($alias . '.CONTROLLER'); - $criteria->addSelectColumn($alias . '.OPERATION'); - $criteria->addSelectColumn($alias . '.VALUE'); - $criteria->addSelectColumn($alias . '.CREATED_AT'); - $criteria->addSelectColumn($alias . '.UPDATED_AT'); - } - } - - /** - * Returns the TableMap related to this object. - * This method is not needed for general use but a specific application could have a need. - * @return TableMap - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - */ - public static function getTableMap() - { - return Propel::getServiceContainer()->getDatabaseMap(CouponRuleTableMap::DATABASE_NAME)->getTable(CouponRuleTableMap::TABLE_NAME); - } - - /** - * Add a TableMap instance to the database for this tableMap class. - */ - public static function buildTableMap() - { - $dbMap = Propel::getServiceContainer()->getDatabaseMap(CouponRuleTableMap::DATABASE_NAME); - if (!$dbMap->hasTable(CouponRuleTableMap::TABLE_NAME)) { - $dbMap->addTableObject(new CouponRuleTableMap()); - } - } - - /** - * Performs a DELETE on the database, given a CouponRule or Criteria object OR a primary key value. - * - * @param mixed $values Criteria or CouponRule object or primary key or array of primary keys - * which is used to create the DELETE statement - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows - * if supported by native driver or if emulated using Propel. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - */ - public static function doDelete($values, ConnectionInterface $con = null) - { - if (null === $con) { - $con = Propel::getServiceContainer()->getWriteConnection(CouponRuleTableMap::DATABASE_NAME); - } - - if ($values instanceof Criteria) { - // rename for clarity - $criteria = $values; - } elseif ($values instanceof \Thelia\Model\CouponRule) { // it's a model object - // create criteria based on pk values - $criteria = $values->buildPkeyCriteria(); - } else { // it's a primary key, or an array of pks - $criteria = new Criteria(CouponRuleTableMap::DATABASE_NAME); - $criteria->add(CouponRuleTableMap::ID, (array) $values, Criteria::IN); - } - - $query = CouponRuleQuery::create()->mergeWith($criteria); - - if ($values instanceof Criteria) { CouponRuleTableMap::clearInstancePool(); - } elseif (!is_object($values)) { // it's a primary key, or an array of pks - foreach ((array) $values as $singleval) { CouponRuleTableMap::removeInstanceFromPool($singleval); - } - } - - return $query->delete($con); - } - - /** - * Deletes all rows from the coupon_rule table. - * - * @param ConnectionInterface $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). - */ - public static function doDeleteAll(ConnectionInterface $con = null) - { - return CouponRuleQuery::create()->doDeleteAll($con); - } - - /** - * Performs an INSERT on the database, given a CouponRule or Criteria object. - * - * @param mixed $criteria Criteria or CouponRule object containing data that is used to create the INSERT statement. - * @param ConnectionInterface $con the ConnectionInterface connection to use - * @return mixed The new primary key. - * @throws PropelException Any exceptions caught during processing will be - * rethrown wrapped into a PropelException. - */ - public static function doInsert($criteria, ConnectionInterface $con = null) - { - if (null === $con) { - $con = Propel::getServiceContainer()->getWriteConnection(CouponRuleTableMap::DATABASE_NAME); - } - - if ($criteria instanceof Criteria) { - $criteria = clone $criteria; // rename for clarity - } else { - $criteria = $criteria->buildCriteria(); // build Criteria from CouponRule object - } - - if ($criteria->containsKey(CouponRuleTableMap::ID) && $criteria->keyContainsValue(CouponRuleTableMap::ID) ) { - throw new PropelException('Cannot insert a value for auto-increment primary key ('.CouponRuleTableMap::ID.')'); - } - - - // Set the correct dbName - $query = CouponRuleQuery::create()->mergeWith($criteria); - - try { - // use transaction because $criteria could contain info - // for more than one table (I guess, conceivably) - $con->beginTransaction(); - $pk = $query->doInsert($con); - $con->commit(); - } catch (PropelException $e) { - $con->rollBack(); - throw $e; - } - - return $pk; - } - -} // CouponRuleTableMap -// This is the static code needed to register the TableMap for this table with the main Propel class. -// -CouponRuleTableMap::buildTableMap(); diff --git a/core/lib/Thelia/Model/Map/CouponTableMap.php b/core/lib/Thelia/Model/Map/CouponTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CurrencyI18nTableMap.php b/core/lib/Thelia/Model/Map/CurrencyI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CurrencyTableMap.php b/core/lib/Thelia/Model/Map/CurrencyTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CustomerTableMap.php b/core/lib/Thelia/Model/Map/CustomerTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CustomerTitleI18nTableMap.php b/core/lib/Thelia/Model/Map/CustomerTitleI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/CustomerTitleTableMap.php b/core/lib/Thelia/Model/Map/CustomerTitleTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/DelivzoneTableMap.php b/core/lib/Thelia/Model/Map/DelivzoneTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/FeatureAvI18nTableMap.php b/core/lib/Thelia/Model/Map/FeatureAvI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/FeatureAvTableMap.php b/core/lib/Thelia/Model/Map/FeatureAvTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/FeatureCategoryTableMap.php b/core/lib/Thelia/Model/Map/FeatureCategoryTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/FeatureI18nTableMap.php b/core/lib/Thelia/Model/Map/FeatureI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/FeatureProductTableMap.php b/core/lib/Thelia/Model/Map/FeatureProductTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/FeatureTableMap.php b/core/lib/Thelia/Model/Map/FeatureTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/FolderDocumentI18nTableMap.php b/core/lib/Thelia/Model/Map/FolderDocumentI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/FolderDocumentTableMap.php b/core/lib/Thelia/Model/Map/FolderDocumentTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/FolderI18nTableMap.php b/core/lib/Thelia/Model/Map/FolderI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/FolderImageI18nTableMap.php b/core/lib/Thelia/Model/Map/FolderImageI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/FolderImageTableMap.php b/core/lib/Thelia/Model/Map/FolderImageTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/FolderTableMap.php b/core/lib/Thelia/Model/Map/FolderTableMap.php old mode 100755 new mode 100644 index 1bfe2cd6e..b35f63ae3 --- a/core/lib/Thelia/Model/Map/FolderTableMap.php +++ b/core/lib/Thelia/Model/Map/FolderTableMap.php @@ -190,7 +190,6 @@ class FolderTableMap extends TableMap */ public function buildRelations() { - $this->addRelation('Rewriting', '\\Thelia\\Model\\Rewriting', RelationMap::ONE_TO_MANY, array('id' => 'folder_id', ), 'CASCADE', 'RESTRICT', 'Rewritings'); $this->addRelation('ContentFolder', '\\Thelia\\Model\\ContentFolder', RelationMap::ONE_TO_MANY, array('id' => 'folder_id', ), 'CASCADE', 'RESTRICT', 'ContentFolders'); $this->addRelation('FolderImage', '\\Thelia\\Model\\FolderImage', RelationMap::ONE_TO_MANY, array('id' => 'folder_id', ), 'CASCADE', 'RESTRICT', 'FolderImages'); $this->addRelation('FolderDocument', '\\Thelia\\Model\\FolderDocument', RelationMap::ONE_TO_MANY, array('id' => 'folder_id', ), 'CASCADE', 'RESTRICT', 'FolderDocuments'); @@ -220,7 +219,6 @@ class FolderTableMap extends TableMap { // Invalidate objects in ".$this->getClassNameFromBuilder($joinedTableTableMapBuilder)." instance pool, // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule. - RewritingTableMap::clearInstancePool(); ContentFolderTableMap::clearInstancePool(); FolderImageTableMap::clearInstancePool(); FolderDocumentTableMap::clearInstancePool(); diff --git a/core/lib/Thelia/Model/Map/FolderVersionTableMap.php b/core/lib/Thelia/Model/Map/FolderVersionTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/GroupI18nTableMap.php b/core/lib/Thelia/Model/Map/GroupI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/GroupModuleTableMap.php b/core/lib/Thelia/Model/Map/GroupModuleTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/GroupResourceTableMap.php b/core/lib/Thelia/Model/Map/GroupResourceTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/GroupTableMap.php b/core/lib/Thelia/Model/Map/GroupTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/LangTableMap.php b/core/lib/Thelia/Model/Map/LangTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/MessageI18nTableMap.php b/core/lib/Thelia/Model/Map/MessageI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/MessageTableMap.php b/core/lib/Thelia/Model/Map/MessageTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/MessageVersionTableMap.php b/core/lib/Thelia/Model/Map/MessageVersionTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ModuleI18nTableMap.php b/core/lib/Thelia/Model/Map/ModuleI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ModuleTableMap.php b/core/lib/Thelia/Model/Map/ModuleTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/OrderAddressTableMap.php b/core/lib/Thelia/Model/Map/OrderAddressTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/OrderFeatureTableMap.php b/core/lib/Thelia/Model/Map/OrderFeatureTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/OrderProductTableMap.php b/core/lib/Thelia/Model/Map/OrderProductTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/OrderStatusI18nTableMap.php b/core/lib/Thelia/Model/Map/OrderStatusI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/OrderStatusTableMap.php b/core/lib/Thelia/Model/Map/OrderStatusTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/OrderTableMap.php b/core/lib/Thelia/Model/Map/OrderTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ProductCategoryTableMap.php b/core/lib/Thelia/Model/Map/ProductCategoryTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ProductDocumentI18nTableMap.php b/core/lib/Thelia/Model/Map/ProductDocumentI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ProductDocumentTableMap.php b/core/lib/Thelia/Model/Map/ProductDocumentTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ProductI18nTableMap.php b/core/lib/Thelia/Model/Map/ProductI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ProductImageI18nTableMap.php b/core/lib/Thelia/Model/Map/ProductImageI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ProductImageTableMap.php b/core/lib/Thelia/Model/Map/ProductImageTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ProductPriceTableMap.php b/core/lib/Thelia/Model/Map/ProductPriceTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ProductSaleElementsTableMap.php b/core/lib/Thelia/Model/Map/ProductSaleElementsTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ProductTableMap.php b/core/lib/Thelia/Model/Map/ProductTableMap.php old mode 100755 new mode 100644 index e1e2eab5f..f69f6f702 --- a/core/lib/Thelia/Model/Map/ProductTableMap.php +++ b/core/lib/Thelia/Model/Map/ProductTableMap.php @@ -204,7 +204,6 @@ class ProductTableMap extends TableMap $this->addRelation('ProductDocument', '\\Thelia\\Model\\ProductDocument', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), 'CASCADE', 'RESTRICT', 'ProductDocuments'); $this->addRelation('AccessoryRelatedByProductId', '\\Thelia\\Model\\Accessory', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), 'CASCADE', 'RESTRICT', 'AccessoriesRelatedByProductId'); $this->addRelation('AccessoryRelatedByAccessory', '\\Thelia\\Model\\Accessory', RelationMap::ONE_TO_MANY, array('id' => 'accessory', ), 'CASCADE', 'RESTRICT', 'AccessoriesRelatedByAccessory'); - $this->addRelation('Rewriting', '\\Thelia\\Model\\Rewriting', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), 'CASCADE', 'RESTRICT', 'Rewritings'); $this->addRelation('CartItem', '\\Thelia\\Model\\CartItem', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), null, null, 'CartItems'); $this->addRelation('ProductAssociatedContent', '\\Thelia\\Model\\ProductAssociatedContent', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), 'CASCADE', 'RESTRICT', 'ProductAssociatedContents'); $this->addRelation('ProductI18n', '\\Thelia\\Model\\ProductI18n', RelationMap::ONE_TO_MANY, array('id' => 'id', ), 'CASCADE', null, 'ProductI18ns'); @@ -241,7 +240,6 @@ class ProductTableMap extends TableMap ProductImageTableMap::clearInstancePool(); ProductDocumentTableMap::clearInstancePool(); AccessoryTableMap::clearInstancePool(); - RewritingTableMap::clearInstancePool(); ProductAssociatedContentTableMap::clearInstancePool(); ProductI18nTableMap::clearInstancePool(); ProductVersionTableMap::clearInstancePool(); diff --git a/core/lib/Thelia/Model/Map/ProductVersionTableMap.php b/core/lib/Thelia/Model/Map/ProductVersionTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ResourceI18nTableMap.php b/core/lib/Thelia/Model/Map/ResourceI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/ResourceTableMap.php b/core/lib/Thelia/Model/Map/ResourceTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/TaxI18nTableMap.php b/core/lib/Thelia/Model/Map/TaxI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/TaxRuleCountryTableMap.php b/core/lib/Thelia/Model/Map/TaxRuleCountryTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php b/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/TaxRuleTableMap.php b/core/lib/Thelia/Model/Map/TaxRuleTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Map/TaxTableMap.php b/core/lib/Thelia/Model/Map/TaxTableMap.php old mode 100755 new mode 100644 diff --git a/core/lib/Thelia/Model/Rewriting.php b/core/lib/Thelia/Model/Rewriting.php new file mode 100644 index 000000000..8d6f75fab --- /dev/null +++ b/core/lib/Thelia/Model/Rewriting.php @@ -0,0 +1,9 @@ + + + + @@ -740,54 +743,24 @@ - + - - - + + + + + + - +
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    @@ -1121,4 +1094,37 @@
    + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + +
    \ No newline at end of file diff --git a/reset_install.sh b/reset_install.sh index 2b818360a..8a3fe0c75 100755 --- a/reset_install.sh +++ b/reset_install.sh @@ -5,7 +5,7 @@ echo -e "\033[47m\033[1;31m\n[WARN] This script will reset this Thelia2 install\n\033[0m" echo -e "\n\e[01;34m[INFO] Downloading vendors\e[00m\n" -php composer install --prefer-dist --no-dev +composer install --prefer-dist cd local/config/ From 9dc851820254e4d6b8541474307300e4498b4ec8 Mon Sep 17 00:00:00 2001 From: mespeche Date: Tue, 3 Sep 2013 11:04:55 +0200 Subject: [PATCH 051/125] Working Update of edit view - Add Is unlimited field --- templates/admin/default/assets/js/main.js | 18 ++++++ templates/admin/default/coupon/edit.html | 68 ++++++++++++----------- 2 files changed, 55 insertions(+), 31 deletions(-) diff --git a/templates/admin/default/assets/js/main.js b/templates/admin/default/assets/js/main.js index 1649449d8..f7ca302ea 100644 --- a/templates/admin/default/assets/js/main.js +++ b/templates/admin/default/assets/js/main.js @@ -51,6 +51,24 @@ }); } + // -- Max usage -- + if($('#is-unlimited').length){ + + if($('#is-unlimited').is(':checked')){ + $('#max-usage').hide().val(''); + } + + $('#is-unlimited').change(function(){ + if($('#is-unlimited').is(':checked')){ + $('#max-usage').hide().val(''); + } + else{ + $('#max-usage').show(); + } + }); + + } + // -- Confirm Box -- if($('[data-toggle="confirm"]').length){ $('[data-toggle="confirm"]').click(function(e){ diff --git a/templates/admin/default/coupon/edit.html b/templates/admin/default/coupon/edit.html index e7c23df73..f52bd88ea 100755 --- a/templates/admin/default/coupon/edit.html +++ b/templates/admin/default/coupon/edit.html @@ -65,45 +65,51 @@
    +
    -
    -
    -
    - - - More description n°1 about item -
    +
    +
    +
    +
    + + + More description n°1 about item +
    +
    + +
    +
    + + +
    +
    + + +
    +
    -
    -
    - - -
    -
    - - -
    -
    +
    + + +
    -
    - -
    - - -
    +
    From 4088b2ef034f71fc730b00b842b3c18c9d6dd13a Mon Sep 17 00:00:00 2001 From: gmorel Date: Tue, 3 Sep 2013 11:20:20 +0200 Subject: [PATCH 052/125] WIP - Coupon create --- .../Controller/Admin/CouponController.php | 6 +- .../Core/Event/Coupon/CouponCreateEvent.php | 235 ++++++++++++++++-- 2 files changed, 215 insertions(+), 26 deletions(-) diff --git a/core/lib/Thelia/Controller/Admin/CouponController.php b/core/lib/Thelia/Controller/Admin/CouponController.php index 23c231801..19c57eb6d 100755 --- a/core/lib/Thelia/Controller/Admin/CouponController.php +++ b/core/lib/Thelia/Controller/Admin/CouponController.php @@ -78,7 +78,7 @@ class CouponController extends BaseAdminController * * @return \Symfony\Component\HttpFoundation\Response */ - protected function createAction($args) + public function createAction($args) { // Check current user authorization if (null !== $response = $this->checkAuth("admin.coupon.create")) return $response; @@ -150,7 +150,7 @@ class CouponController extends BaseAdminController */ public function readAction($id) { - $this->checkAuth("ADMIN", "admin.coupon.view"); + $this->checkAuth("ADMIN", "admin.coupon.read"); // Database request repeated in the loop but cached $search = CouponQuery::create(); @@ -188,7 +188,7 @@ class CouponController extends BaseAdminController case 'browse' : // Browse coupon return $this->browseCoupons($args); case 'create' : // Create a new coupon - return $this->createCoupon($args); +// return $this->createCoupon($args); case 'edit' : // Edit an existing coupon return $this->editCoupon($args); case 'read' : // Read an existing coupon diff --git a/core/lib/Thelia/Core/Event/Coupon/CouponCreateEvent.php b/core/lib/Thelia/Core/Event/Coupon/CouponCreateEvent.php index 9f0db34df..7d6344733 100644 --- a/core/lib/Thelia/Core/Event/Coupon/CouponCreateEvent.php +++ b/core/lib/Thelia/Core/Event/Coupon/CouponCreateEvent.php @@ -23,6 +23,7 @@ namespace Thelia\Core\Event\Coupon; use Thelia\Core\Event\ActionEvent; +use Thelia\Coupon\CouponRuleCollection; use Thelia\Model\Coupon; /** @@ -38,44 +39,232 @@ use Thelia\Model\Coupon; */ class CouponCreateEvent extends ActionEvent { - /** - * @var Coupon Coupon being created - */ - protected $createdCoupon; + /** @var CouponRuleCollection Array of CouponRuleInterface */ + protected $rules = null; /** - * Constructor - * - * @param Coupon $coupon Coupon being created + * @param float $amount */ - public function __construct(Coupon $coupon) + public function setAmount($amount) { - $this->createdCoupon = $coupon; + $this->amount = $amount; } /** - * Modify Coupon being created - * - * @param Coupon $createdCoupon Coupon being created - * - * @return $this + * @return float */ - public function setCreatedCoupon(Coupon $createdCoupon) + public function getAmount() { - $this->createdCoupon = $createdCoupon; - - return $this; + return $this->amount; } /** - * Get Coupon being created - * - * @return Coupon + * @param string $code */ - public function getCreatedCoupon() + public function setCode($code) { - return clone $this->createdCoupon; + $this->code = $code; } + /** + * @return string + */ + public function getCode() + { + return $this->code; + } + + /** + * @param string $description + */ + public function setDescription($description) + { + $this->description = $description; + } + + /** + * @return string + */ + public function getDescription() + { + return $this->description; + } + + /** + * @param \DateTime $expirationDate + */ + public function setExpirationDate($expirationDate) + { + $this->expirationDate = $expirationDate; + } + + /** + * @return \DateTime + */ + public function getExpirationDate() + { + return $this->expirationDate; + } + + /** + * @param boolean $isAvailableOnSpecialOffers + */ + public function setIsAvailableOnSpecialOffers($isAvailableOnSpecialOffers) + { + $this->isAvailableOnSpecialOffers = $isAvailableOnSpecialOffers; + } + + /** + * @return boolean + */ + public function getIsAvailableOnSpecialOffers() + { + return $this->isAvailableOnSpecialOffers; + } + + /** + * @param boolean $isCumulative + */ + public function setIsCumulative($isCumulative) + { + $this->isCumulative = $isCumulative; + } + + /** + * @return boolean + */ + public function getIsCumulative() + { + return $this->isCumulative; + } + + /** + * @param boolean $isEnabled + */ + public function setIsEnabled($isEnabled) + { + $this->isEnabled = $isEnabled; + } + + /** + * @return boolean + */ + public function getIsEnabled() + { + return $this->isEnabled; + } + + /** + * @param boolean $isRemovingPostage + */ + public function setIsRemovingPostage($isRemovingPostage) + { + $this->isRemovingPostage = $isRemovingPostage; + } + + /** + * @return boolean + */ + public function getIsRemovingPostage() + { + return $this->isRemovingPostage; + } + + /** + * @param int $maxUsage + */ + public function setMaxUsage($maxUsage) + { + $this->maxUsage = $maxUsage; + } + + /** + * @return int + */ + public function getMaxUsage() + { + return $this->maxUsage; + } + + /** + * @param \Thelia\Coupon\CouponRuleCollection $rules + */ + public function setRules($rules) + { + $this->rules = $rules; + } + + /** + * @return \Thelia\Coupon\CouponRuleCollection + */ + public function getRules() + { + return $this->rules; + } + + /** + * @param string $shortDescription + */ + public function setShortDescription($shortDescription) + { + $this->shortDescription = $shortDescription; + } + + /** + * @return string + */ + public function getShortDescription() + { + return $this->shortDescription; + } + + /** + * @param string $title + */ + public function setTitle($title) + { + $this->title = $title; + } + + /** + * @return string + */ + public function getTitle() + { + return $this->title; + } + + /** @var string Coupon code (ex: XMAS) */ + protected $code = null; + + /** @var string Coupon title (ex: Coupon for XMAS) */ + protected $title = null; + + /** @var string Coupon short description */ + protected $shortDescription = null; + + /** @var string Coupon description */ + protected $description = null; + + /** @var bool if Coupon is enabled */ + protected $isEnabled = false; + + /** @var \DateTime Coupon expiration date */ + protected $expirationDate = null; + + /** @var bool if Coupon is cumulative */ + protected $isCumulative = false; + + /** @var bool if Coupon is removing postage */ + protected $isRemovingPostage = false; + + /** @var float Amount that will be removed from the Checkout (Coupon Effect) */ + protected $amount = 0; + + /** @var int Max time a Coupon can be used (-1 = unlimited) */ + protected $maxUsage = -1; + + /** @var bool if Coupon is available for Products already on special offers */ + protected $isAvailableOnSpecialOffers = false; } From 94b1e3f5fff06d2c45d343d8661ee921d140cac8 Mon Sep 17 00:00:00 2001 From: mespeche Date: Tue, 3 Sep 2013 12:31:17 +0200 Subject: [PATCH 053/125] Max usage gestion --- templates/admin/default/assets/js/main.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/admin/default/assets/js/main.js b/templates/admin/default/assets/js/main.js index f7ca302ea..ad99d87af 100644 --- a/templates/admin/default/assets/js/main.js +++ b/templates/admin/default/assets/js/main.js @@ -55,15 +55,15 @@ if($('#is-unlimited').length){ if($('#is-unlimited').is(':checked')){ - $('#max-usage').hide().val(''); + $('#max-usage').hide().attr('value', '-1'); } $('#is-unlimited').change(function(){ if($('#is-unlimited').is(':checked')){ - $('#max-usage').hide().val(''); + $('#max-usage').hide().attr('value', '-1'); } else{ - $('#max-usage').show(); + $('#max-usage').show().val('').attr('value', ''); } }); From 5bd501315d6d3eaa71a2c19f67a38289dd9c0093 Mon Sep 17 00:00:00 2001 From: mespeche Date: Tue, 3 Sep 2013 12:31:57 +0200 Subject: [PATCH 054/125] Max usage field and Is enabled field updates --- templates/admin/default/coupon/edit.html | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/templates/admin/default/coupon/edit.html b/templates/admin/default/coupon/edit.html index f52bd88ea..d10c6ddfb 100755 --- a/templates/admin/default/coupon/edit.html +++ b/templates/admin/default/coupon/edit.html @@ -34,6 +34,13 @@
    +
    + +
    +
    - -{include file='includes/js.inc.html'} - -{javascripts file='../assets/bootstrap-datepicker/js/bootstrap-datepicker.js'} - -{/javascripts} - -{javascripts file='../assets/js/main.js'} - -{/javascripts} - - - -{include file='includes/footer.inc.html'} \ No newline at end of file diff --git a/templates/admin/default/coupon/includes/edit.html b/templates/admin/default/coupon/includes/edit.html new file mode 100644 index 000000000..506b6bc5c --- /dev/null +++ b/templates/admin/default/coupon/includes/edit.html @@ -0,0 +1,311 @@ + + +{$thelia_page_css_file = "assets/bootstrap-editable/css/bootstrap-editable.css"} + +{include file='includes/header.inc.html'} + +
    + + + +
    +

    Coupons : Add a coupon

    +
    + +
    + +
    +
    + +
    +
    + + +
    + +
    + + +
    + +
    + +
    + +
    + +
    + +
    + +
    + +
    + +
    + +
    + +
    + + +
    +
    + +
    + + + +
    +
    + +
    +
    +
    +
    + + + More description n°1 about item +
    +
    + +
    +
    + + +
    +
    + + +
    +
    +
    + +
    + + +
    +
    + +
    + +
    + + +
    + + + +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + Rules + + + +
    ConditionsOperatorValueActions
    Total Amountis superior or equals to300 € + Edit + Delete +
    AND NbArticleFromCategoryis equals to12 - Chaussettes rouges + Edit + Delete +
    OR Dateis inferior or equals to12/02/2014 + Edit + Delete +
    +
    +
    + +
    +
    + +
    + + + +
    + +
    + + + + + + + + +
    + +
    + +
    + +
    + € + + +
    +
    + + +
    + +
    + + + +
    +
    + + +
    + + + + + + + + + + + + + +
    Categories list
    + +
    + +
    + +
    +
    + +
    + +
    + + + +{include file='includes/js.inc.html'} + +{javascripts file='../../assets/bootstrap-datepicker/js/bootstrap-datepicker.js'} + +{/javascripts} + +{javascripts file='../../assets/js/main.js'} + +{/javascripts} + + + +{include file='includes/footer.inc.html'} \ No newline at end of file diff --git a/templates/admin/default/coupon/update.html b/templates/admin/default/coupon/update.html new file mode 100755 index 000000000..ae6ec494a --- /dev/null +++ b/templates/admin/default/coupon/update.html @@ -0,0 +1,5 @@ +{check_auth context="admin" roles="ADMIN" permissions="admin.coupon.edit" login_tpl="/admin/login"} + +{$page_title={intl l='Coupon edition'}} + +{include file='coupon/includes/edit.html'} \ No newline at end of file From 62c1a59f6872f63b15c0863650853d76711eed17 Mon Sep 17 00:00:00 2001 From: gmorel Date: Wed, 4 Sep 2013 15:43:05 +0200 Subject: [PATCH 056/125] WIP - Coupon create --- .../Controller/Admin/CouponController.php | 94 ++++++++++++------- core/lib/Thelia/Core/Event/TheliaEvents.php | 6 +- core/lib/Thelia/Tools/I18n.php | 55 +++++++++-- 3 files changed, 111 insertions(+), 44 deletions(-) diff --git a/core/lib/Thelia/Controller/Admin/CouponController.php b/core/lib/Thelia/Controller/Admin/CouponController.php index 0cd0687e7..5c33765d3 100755 --- a/core/lib/Thelia/Controller/Admin/CouponController.php +++ b/core/lib/Thelia/Controller/Admin/CouponController.php @@ -25,8 +25,10 @@ namespace Thelia\Controller\Admin; use Symfony\Component\HttpFoundation\Request; use Thelia\Core\Event\Coupon\CouponCreateEvent; +use Thelia\Core\Event\Coupon\CouponCreateOrUpdateEvent; use Thelia\Core\Event\Coupon\CouponEvent; use Thelia\Core\Event\TheliaEvents; +use Thelia\Core\HttpFoundation\Session\Session; use Thelia\Core\Security\Exception\AuthenticationException; use Thelia\Core\Security\Exception\AuthorizationException; use Thelia\Coupon\CouponRuleCollection; @@ -35,6 +37,8 @@ use Thelia\Form\Exception\FormValidationException; use Thelia\Log\Tlog; use Thelia\Model\Coupon; use Thelia\Model\CouponQuery; +use Thelia\Model\Lang; +use Thelia\Tools\I18n; /** * Created by JetBrains PhpStorm. @@ -56,7 +60,7 @@ class CouponController extends BaseAdminController */ public function browseAction() { - $this->checkAuth("ADMIN", "admin.coupon.view"); + $this->checkAuth('ADMIN', 'admin.coupon.view'); return $this->render('coupon-list'); } @@ -71,7 +75,7 @@ class CouponController extends BaseAdminController public function createAction() { // Check current user authorization - $response = $this->checkAuth("admin.coupon.create"); + $response = $this->checkAuth('admin.coupon.create'); if ($response !== null) { return $response; } @@ -84,11 +88,14 @@ class CouponController extends BaseAdminController if ($this->getRequest()->isMethod('POST')) { try { // Check the form against constraints violations - $form = $this->validateForm($creationForm, "POST"); + $form = $this->validateForm($creationForm, 'POST'); + $i18n = new I18n(); + /** @var Lang $lang */ + $lang = $this->getSession()->get('lang'); // Get the form field values $data = $form->getData(); - $couponEvent = new CouponEvent( + $couponEvent = new CouponCreateOrUpdateEvent( $data['code'], $data['title'], $data['amount'], @@ -96,12 +103,13 @@ class CouponController extends BaseAdminController $data['shortDescription'], $data['description'], $data['isEnabled'], - new \DateTime($data['expirationDate']), + $i18n->getDateTimeFromForm($lang, $data['expirationDate']), $data['isAvailableOnSpecialOffers'], $data['isCumulative'], $data['isRemovingPostage'], $data['maxUsage'], - array() + array(), + $data['locale'] ); $this->dispatch( @@ -112,39 +120,34 @@ class CouponController extends BaseAdminController sprintf( 'Coupon %s (ID %s) created', $couponEvent->getTitle(), - $couponEvent->getId() + $couponEvent->getCoupon()->getId() ) ); // @todo redirect if successful } catch (FormValidationException $e) { // Invalid data entered $message = 'Please check your input:'; + $this->logError('creation', $message, $e); + } catch (\Exception $e) { // Any other error - $message = 'Sorry, an error occured:'; + $message = 'Sorry, an error occurred:'; + $this->logError('creation', $message, $e); } if ($message !== false) { - // Log error message - Tlog::getInstance()->error( - sprintf( - "Error during variable modification process : %s. Exception was %s", - $message, $e->getMessage() - ) - ); - - // Mark the form as errored + // Mark the form as with error $creationForm->setErrorMessage($message); - // Pas the form and the error to the parser + // Send the form and the error to the parser $this->getParserContext() ->addForm($creationForm) - ->setGeneralError($message) - ; + ->setGeneralError($message); } } $formAction = 'admin/coupon/create'; + return $this->render( 'coupon-create', array( @@ -162,7 +165,7 @@ class CouponController extends BaseAdminController */ public function editAction($couponId) { - $this->checkAuth("ADMIN", "admin.coupon.edit"); + $this->checkAuth('ADMIN', 'admin.coupon.edit'); $formAction = 'admin/coupon/edit/' . $couponId; @@ -178,7 +181,7 @@ class CouponController extends BaseAdminController */ public function readAction($couponId) { - $this->checkAuth("ADMIN", "admin.coupon.read"); + $this->checkAuth('ADMIN', 'admin.coupon.read'); // Database request repeated in the loop but cached $search = CouponQuery::create(); @@ -201,28 +204,51 @@ class CouponController extends BaseAdminController protected function buildCouponFromForm(array $data) { $couponBeingCreated = new Coupon(); - $couponBeingCreated->setCode($data["code"]); - $couponBeingCreated->setType($data["type"]); - $couponBeingCreated->setTitle($data["title"]); - $couponBeingCreated->setShortDescription($data["shortDescription"]); - $couponBeingCreated->setDescription($data["description"]); - $couponBeingCreated->setAmount($data["amount"]); - $couponBeingCreated->setIsEnabled($data["isEnabled"]); - $couponBeingCreated->setExpirationDate($data["expirationDate"]); + $couponBeingCreated->setCode($data['code']); + $couponBeingCreated->setType($data['type']); + $couponBeingCreated->setTitle($data['title']); + $couponBeingCreated->setShortDescription($data['shortDescription']); + $couponBeingCreated->setDescription($data['description']); + $couponBeingCreated->setAmount($data['amount']); + $couponBeingCreated->setIsEnabled($data['isEnabled']); + $couponBeingCreated->setExpirationDate($data['expirationDate']); $couponBeingCreated->setSerializedRules( new CouponRuleCollection( array() ) ); - $couponBeingCreated->setIsCumulative($data["isCumulative"]); + $couponBeingCreated->setIsCumulative($data['isCumulative']); $couponBeingCreated->setIsRemovingPostage( - $data["isRemovingPostage"] + $data['isRemovingPostage'] ); - $couponBeingCreated->setMaxUsage($data["maxUsage"]); + $couponBeingCreated->setMaxUsage($data['maxUsage']); $couponBeingCreated->setIsAvailableOnSpecialOffers( - $data["isAvailableOnSpecialOffers"] + $data['isAvailableOnSpecialOffers'] ); return $couponBeingCreated; } + + /** + * Log error message + * + * @param string $action Creation|Update|Delete + * @param string $message Message to log + * @param \Exception $e Exception to log + * + * @return $this + */ + protected function logError($action, $message, $e) + { + Tlog::getInstance()->error( + sprintf( + 'Error during Coupon ' . $action . ' process : %s. Exception was %s', + $message, + $e->getMessage() + ) + ); + + return $this; + } + } diff --git a/core/lib/Thelia/Core/Event/TheliaEvents.php b/core/lib/Thelia/Core/Event/TheliaEvents.php index c8dde8758..ed9070c6b 100755 --- a/core/lib/Thelia/Core/Event/TheliaEvents.php +++ b/core/lib/Thelia/Core/Event/TheliaEvents.php @@ -207,17 +207,17 @@ final class TheliaEvents /** * Sent when editing a Coupon */ - const COUPON_EDIT = "action.edit_coupon"; + const COUPON_UPDATE = "action.update_coupon"; /** * Sent just before a successful update of a new Coupon in the database. */ - const BEFORE_EDIT_COUPON = "action.before_edit_coupon"; + const BEFORE_UPDATE_COUPON = "action.before_update_coupon"; /** * Sent just after a successful update of a new Coupon in the database. */ - const AFTER_EDIT_COUPON = "action.after_edit_coupon"; + const AFTER_UPDATE_COUPON = "action.after_update_coupon"; /** * Sent when disabling a Coupon diff --git a/core/lib/Thelia/Tools/I18n.php b/core/lib/Thelia/Tools/I18n.php index 82a17506d..4467bebcd 100644 --- a/core/lib/Thelia/Tools/I18n.php +++ b/core/lib/Thelia/Tools/I18n.php @@ -1,16 +1,57 @@ - */ +/**********************************************************************************/ +/* */ +/* Thelia */ +/* */ +/* Copyright (c) OpenStudio */ +/* email : info@thelia.net */ +/* web : http://www.thelia.net */ +/* */ +/* This program is free software; you can redistribute it and/or modify */ +/* it under the terms of the GNU General Public License as published by */ +/* the Free Software Foundation; either version 3 of the License */ +/* */ +/* This program is distributed in the hope that it will be useful, */ +/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ +/* GNU General Public License for more details. */ +/* */ +/* You should have received a copy of the GNU General Public License */ +/* along with this program. If not, see . */ +/* */ +/**********************************************************************************/ namespace Thelia\Tools; +use Thelia\Model\Lang; +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Helper for translations + * + * @package I18n + * @author Guillaume MOREL + * + */ class I18n { + /** + * Create a \DateTime from a date picker form input + * The date format is the same as the one from the current User Session + * Ex : $lang = $session->getLang() + * + * @param Lang $lang Object containing date format + * @param string $date String to convert + * + * @return \DateTime + */ + public function getDateTimeFromForm(Lang $lang, $date) + { + $currentDateFormat = $lang->getDateFormat(); + return \DateTime::createFromFormat($currentDateFormat, $date); + } } \ No newline at end of file From 7b0f2ee4bc9e9e0fc96d920736bc3f635b21b77f Mon Sep 17 00:00:00 2001 From: gmorel Date: Wed, 4 Sep 2013 16:12:22 +0200 Subject: [PATCH 057/125] Merge branch 'master' of https://github.com/thelia/thelia into coupon # By mespeche # Via mespeche * 'master' of https://github.com/thelia/thelia: WIP : Comment of route url-rewriting.check Working : Fix script reset Working : Cleanup admin new version bootstrap v3 Working : Finish renaming class for bootstrap migration Working : Major class changes migration from bootstrap 2.x to 3.0 Conflicts: reset_install.sh templates/admin/default/assets/css/admin.less --- core/lib/Thelia/Config/Resources/routing/front.xml | 8 ++++---- templates/admin/default/coupon/form.html | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/lib/Thelia/Config/Resources/routing/front.xml b/core/lib/Thelia/Config/Resources/routing/front.xml index 69bd2c6eb..d696a3411 100755 --- a/core/lib/Thelia/Config/Resources/routing/front.xml +++ b/core/lib/Thelia/Config/Resources/routing/front.xml @@ -50,9 +50,9 @@ cart - - Thelia\Controller\Front\UrlRewritingController::check - .* - + + + + diff --git a/templates/admin/default/coupon/form.html b/templates/admin/default/coupon/form.html index b715cd741..1bd18a6a8 100644 --- a/templates/admin/default/coupon/form.html +++ b/templates/admin/default/coupon/form.html @@ -72,7 +72,7 @@
    {form_field form=$form field='expirationDate'} - + {if $error}{$message}{/if} {/form_field} From b9577e87e3a20a313a09f28452bc453242f98561 Mon Sep 17 00:00:00 2001 From: gmorel Date: Wed, 4 Sep 2013 16:23:16 +0200 Subject: [PATCH 058/125] Merge branch 'master' of https://github.com/thelia/thelia into coupon # By mespeche # Via mespeche * 'master' of https://github.com/thelia/thelia: WIP : Comment of route url-rewriting.check Working : Fix script reset Working : Cleanup admin new version bootstrap v3 Working : Finish renaming class for bootstrap migration Working : Major class changes migration from bootstrap 2.x to 3.0 Conflicts: reset_install.sh templates/admin/default/assets/css/admin.less --- core/lib/Thelia/Controller/Admin/CouponController.php | 6 +++--- templates/admin/default/coupon/form.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/lib/Thelia/Controller/Admin/CouponController.php b/core/lib/Thelia/Controller/Admin/CouponController.php index 5c33765d3..7fd9783ba 100755 --- a/core/lib/Thelia/Controller/Admin/CouponController.php +++ b/core/lib/Thelia/Controller/Admin/CouponController.php @@ -118,9 +118,9 @@ class CouponController extends BaseAdminController ); $this->adminLogAppend( sprintf( - 'Coupon %s (ID %s) created', - $couponEvent->getTitle(), - $couponEvent->getCoupon()->getId() + 'Coupon %s (ID ) created', + $couponEvent->getTitle() +// $couponEvent->getCoupon()->getId() ) ); // @todo redirect if successful diff --git a/templates/admin/default/coupon/form.html b/templates/admin/default/coupon/form.html index 1bd18a6a8..b715cd741 100644 --- a/templates/admin/default/coupon/form.html +++ b/templates/admin/default/coupon/form.html @@ -72,7 +72,7 @@
    {form_field form=$form field='expirationDate'} - + {if $error}{$message}{/if} {/form_field} From 7362a5a93bf4252da722df5288e884073ae6c118 Mon Sep 17 00:00:00 2001 From: mespeche Date: Wed, 4 Sep 2013 17:09:59 +0200 Subject: [PATCH 059/125] Working : Update to bootstrap3 + Delete js filter for the moment --- templates/admin/default/admin-layout.tpl | 10 +- .../custom-theme/images/animated-overlay.gif | Bin 1738 -> 0 bytes .../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 212 -> 0 bytes .../images/ui-bg_flat_75_F9F9F9_40x100.png | Bin 230 -> 0 bytes .../images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 335 -> 0 bytes .../images/ui-bg_glass_95_fef1ec_1x400.png | Bin 332 -> 0 bytes .../ui-bg_highlight-hard_75_FFF_1x100.png | Bin 203 -> 0 bytes .../ui-bg_highlight-soft_100_f39922_1x100.png | Bin 364 -> 0 bytes .../ui-bg_highlight-soft_65_f39922_1x100.png | Bin 349 -> 0 bytes .../ui-bg_highlight-soft_75_f39922_1x100.png | Bin 366 -> 0 bytes .../images/ui-icons_2e83ff_256x240.png | Bin 4549 -> 0 bytes .../images/ui-icons_333333_256x240.png | Bin 6975 -> 0 bytes .../images/ui-icons_454545_256x240.png | Bin 6992 -> 0 bytes .../images/ui-icons_888888_256x240.png | Bin 6999 -> 0 bytes .../images/ui-icons_FFF_256x240.png | Bin 6299 -> 0 bytes .../images/ui-icons_cd0a0a_256x240.png | Bin 4549 -> 0 bytes .../custom-theme/jquery-ui-1.10.3.custom.css | 1177 ----------------- templates/admin/default/assets/js/main.js | 8 +- templates/admin/default/coupon-list.html | 65 +- .../default/includes/confirmation-modal.html | 48 +- .../default/includes/coupon_breadcrumb.html | 7 +- 21 files changed, 67 insertions(+), 1248 deletions(-) delete mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/images/animated-overlay.gif delete mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_flat_0_aaaaaa_40x100.png delete mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_flat_75_F9F9F9_40x100.png delete mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_glass_55_fbf9ee_1x400.png delete mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_glass_95_fef1ec_1x400.png delete mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-hard_75_FFF_1x100.png delete mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_100_f39922_1x100.png delete mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_65_f39922_1x100.png delete mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_75_f39922_1x100.png delete mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_2e83ff_256x240.png delete mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_333333_256x240.png delete mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_454545_256x240.png delete mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_888888_256x240.png delete mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_FFF_256x240.png delete mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_cd0a0a_256x240.png delete mode 100755 templates/admin/default/assets/css/jqueryui/custom-theme/jquery-ui-1.10.3.custom.css diff --git a/templates/admin/default/admin-layout.tpl b/templates/admin/default/admin-layout.tpl index 8bef5c011..d392919ad 100644 --- a/templates/admin/default/admin-layout.tpl +++ b/templates/admin/default/admin-layout.tpl @@ -214,15 +214,15 @@ {/javascripts} - {block name="after-javascript-include"}{/block} - - {javascripts file='assets/js/bootstrap/bootstrap.js'} - - {/javascripts} + {block name="after-javascript-include"}{/block} {block name="javascript-initialization"}{/block} {* Modules scripts are included now *} {module_include location='footer_js'} + + {javascripts file='assets/js/bootstrap/bootstrap.js'} + + {/javascripts} \ No newline at end of file diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/animated-overlay.gif b/templates/admin/default/assets/css/jqueryui/custom-theme/images/animated-overlay.gif deleted file mode 100755 index d441f75ebfbdf26a265dfccd670120d25c0a341c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1738 zcmZ|OX;ji_6b5ixNYt8>l?gOuO)6lU%W(mxn(`>1S(XO;u`D+P%xqBvMr|w-Vyr1s z7R|Cn0b8|Hu<=Zmv1mFqh9Fj!NuZfKB2MP$e75`XJ@>=!y!Ux9xR3x;EW!q1^V>X| znVFuRUN`NqJ2)ybXh%e__h!!pv(M|S3+?9F%(K}zyE40MGyhWF5-IDgL&=%2-9`Nk z!1@8uk4t%_{(K~>N;sK&dzJbwJ=$kYTlL=$%#0Pfh>U{%i@~wWbvYsD_K-D`&+u1( z#Ma`>%q<^UhzGvi(hyE`zCD{-=2|zL5>wnB=DE!U?(CZG%q4@lDnCq_%&3DCla#(X zmBhDD+RN$aMWWHm?ig*>1Onn6~r?Ma~N2JKAxN>H%UtRyRqS)6Um!-Tz%-r=& zQmTb^JFIe3W^-kAm`}`2P|niMh>RYyd)S^f(dbrx965?rzbhP|XeP}o&&DSZ4|oYQ z)I{f!SfycYw?3=9W;o-B%U5xs(pP267X~9-7L|4WzaYexC0GtG8wWygm63rF{llCEraxzkc=IxvFQ-y37=_;e5 zJLq^gsSO0Ayz?a>E_?{dmUc+t#qv$)XN8$<<}rQ#)lsiw+pmL&J>~+hgpo>i$m+;l zZIa_ZRIfSeT$~v5d`EBV&*k`apPgjv&B|+d`Q!nyu{L4rs%ZfoF0*Kq8I%ByOcFpL zK=>wzofZo<+0GZLCnWM3oQ^pb(gRSf02;~cEn@LJ>~XB9IkEX{$N#Z`m%>S!U{uPx zloI%bLdo$Adxlh(Uv^yX7s5G&C zLwNRG>~T?G{kzupp8EcyLGPoPf)@&9Wqfw_l&uU-6cexk%5;uQg%wb=0k_733{i#& z1a2p)gV3S2+QG1-K9tZ}E~I<(P0r2aFFY-c{o?TUOz3Xjod#TLE2A_c?*T7t z=1>~%YW450{Qqno4t`}gvLnuMrcu8+#xEBoY%2_+Mb#Z6S38+r*M4O`-+!zl(@m`D zQsi|GA2l3gEy}LFe<#Hv8?$_L#u8E|3-bP$*La*E>B{X!Sy4i6?TKam!49aXCAW4S*P_O^H4^*DpiA40o}Uqw~Eo&veh1`|8i zD2$x+>_b^bXE4N;AW=5>iYak2%!JAh0j1*k1{p#iRCjbB7!cSws~U{1IA@acLII$t z$>X#A+^s6iJ5~DFG!xa?>z{=lxtdi1rzbM-(nqAu3D8h-&64xo6|E!p?pK0xT;qoK z`6%+SpBk+~M?nO}>2mTw!A{yZ6O>Z@kwSd4;8aWU5z!P~tQl?u==^+R`{OmOS}oZh zOXQ3{6kuz?Is^n^L7;9ieB9C+8B{>t+pDrlq4xGDDn#T#3T5$l1g`FTQkU;b-981j zNm{zC`$wn7etklM#qHI4=3m5gwa6DNS{?Z!vSObi_od{4eUo=_S2BKNpkSdiqe(k9WtkeM79;2-%CFbb)aB=&H1?i1}uwFzoZQ(38Kn1zBP ORn*B%u*Wk|4g3!*Rv{Mv diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_flat_0_aaaaaa_40x100.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_flat_0_aaaaaa_40x100.png deleted file mode 100755 index 2399a7bb2c2ff02a8647cd29738873748a84d91c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^8bF-F1SA+{?>A)!QcOwS?k)_>#w|r1Kptm-M`SUO z_5fqIli7AahM1>|V~EA+ zRdP`(kYX@0Ff`URu+%j$3^BB{GBvd_1hUPo3=Gy3z1f7KAvZrIGp!Q0hP(P9d_WBh Mp00i_>zopr0J-8b&;S4c diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_flat_75_F9F9F9_40x100.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_flat_75_F9F9F9_40x100.png deleted file mode 100755 index 3684702ed87fffa3529abda8f7c28a956487226e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^8bF-F0VEhM^6M@GQcOwS?k)`f+xyS#2l6-zJR*yM zv86AiR0Xxy`%1a(O9I>1w(ax%+s}un;7=< z9tY}CEpd$~Nl7e8wMs5Z1yT$~28PDE29~-8#vujnc6a#?2AmP!?*K(O3p^r= zfwTu0yPeFo12TF&T^vI^j=w#x$i?I+((tf;UXnmgbH|3oY>pC!)f}(GR!16S-u+#{ ze6YEqRkW=8vGl=5qArKM<9}TC-}iEvB{zdaTcX5$wyRTK&AL_WUqC2h_me>FVdQ&MBb@0BwPGp#T5? diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_glass_95_fef1ec_1x400.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_glass_95_fef1ec_1x400.png deleted file mode 100755 index 4070c9712950cc6c68458b0483094a81df5548b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 332 zcmeAS@N?(olHy`uVBq!ia0vp^j6gI&fCnc6a#?2AmP!?*K(O3p^r= zfwTu0yPeFo12VciT^vI^j=w#>k(V)1qW$CZ|6)SVV-&*#dav<$DMuV&n0Dbpw@aKYh^7+PAHnpznG+2&RT25XAm fY(mkHo1c=IR*74~UHuR~paup{S3j3^P6nC}Q!>*kaceLYcj*9XVDNPHb6Mw<&;$S_ C`YwS0 diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_100_f39922_1x100.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_100_f39922_1x100.png deleted file mode 100755 index 359678014cf083c43a3f2fe29068e8bb0ae74657..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 364 zcmeAS@N?(olHy`uVBq!ia0vp^j6j?szyu^`+!HJTQfx`y?k@kqfHUIz9iRwjfk$L9 zkoEv$x0Bg+K*lOh7sn8d^G_#iuXWFyuKu4dSis78XYbKXuyHi)9Ih`;_1Cd8UvjwA=RU!tl=he=qev=KbEC^p5@e15coUO_ zQmvAUQh^kMk%6JHu7RblfpLg|ft7)=m655gfw`4|0gK+`yC@oR^HVa@DsgKlE!Iv1 PYGCkm^>bP0l+XkK;vIsQ diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_65_f39922_1x100.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_65_f39922_1x100.png deleted file mode 100755 index 4718fe2f0829745aa57b0a06e9dcef5b5ebae74c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 349 zcmeAS@N?(olHy`uVBq!ia0vp^j6j?szyu^`+!HJTQfx`y?k@kqfHUIz9iRwjfk$L9 zkoEv$x0Bg+K*nrO7sn8d^G_!javgFIacS3_yn4;v=BBG3Br15CcXBO1+{(c4$M;Od0)?uzM+N7`9u?es^-;!Ju_868 zyGMF5&K#YSaphdwc#*eq zl=c#pd1fc)e%rM6?Y_U4`j1P$5KdG!n#z0x=uFiT*NBpo#FA92yVqjopU}>X diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_75_f39922_1x100.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_75_f39922_1x100.png deleted file mode 100755 index 87578c6c46df339d20be7a1abd490084be5e33b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 366 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 F{{S81aohj^ diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_333333_256x240.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_333333_256x240.png deleted file mode 100755 index fab88f726457d2e017d89c03efb2f56f5307e4ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6975 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 GkN7VYe;Pml diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_454545_256x240.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_454545_256x240.png deleted file mode 100755 index b6db1acdd433be80a472b045018f25c7f2cf7e08..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6992 zcmZ{Jbx<76vhMDpfgr(y1`QHmaR~%lf_s1jS=@pJ3$lb=+yex64eoA%#UZ#ua0rVB z4KA18y{BHibKiM?%ydsxclFFS(>*ocgsQ8`;o(r?0000y1$l@j004Yc0Y}*AkG*V$ zv*e=ynJURa0J5d86F477Pd>?iaCwyS|J~jW*uDV(DD4#>Qtv!|9i+qTEablQNm$h= z&CE0X2ukQD(>|w9dGqdIX)YvBF@CS!Mo^03TqmwrllgV%KEo6shFx2oEehu^_cs!f zI;sw@aCA*YlEb$oWY?7%>bM;vUhxUi8np5~I@-VX^5GP5$Q`;Z0hf{15s`~)=nCIT z{KYcN=k)##CFFtF75!TrmQf$AG#Q`<^mG!=GIt&I#)o3-O*Wp{;A<1pI!eg?%2!!r z+zIv$wg$i}8}QOLFS=Xh+Qf4z6c-3wKnenV={H5)s729tL?tzQ^60h+rL#RDkR9~+ z^_M@C6WcitD=p^@wd$vx=;$W_mKfVOT6DDpbQ*tH$WpY5W`$H_qLZA(#re#!6)VtF zU@=7mmXUgOhjUus3l*37VNtNse7@B=>Cbiybh7iER2KOM?LhHBd$Upgt#lg+ZJO>l zxu833ex$XTUzvt!1q~LKA%ec^+*T{O{SPQ(pFDup!nZyM z??tIZc$9{v1Y+SUAeG0mvyl#&=ASO^c8)eTyrwZPrzrpP0P9l?A~{ukG)rOFeYVzq zzu|jZ{LNIs8{QUR*bR_jTemA#oduSf;ShdMO^19Z>hkCO(lWs5*T9y%kfQN0f&ePMv;kDisnr5y%7Wrrkwm3!>`zkB=ovcMAt8MEi~kp?m~ zfWU+~+`1LPuo*U~q+a~EcRcReTnZNxiS+zq!!}lR zeC}vfalp8A^dS5nePlmnMN9rV3866Yi&80me{+~71G`Bj)*jfaXC->#4ZTZKVig!J z1sxFCsdnX?F1@QQ!y+DnQc#eV>Noq!Bo%`R zCQ(53=NDNlW2@k8qW!H~j_$u4zW?zk{Da=f+F198-BsfYtYx*vT12>Pt)AGzy!EVs zB0VwU_wS7GmWz*gW3S&S4eB^Ikb#?0hD)7@zncvPpPsoT6)u8I%Ht5%p9-&@W`@hc zq>oG88M2fHhXn%KZXGzY2F)1UTR-Q#+b_iw#CvyW?X`v|_ZA%MNpC*Dt{+LRUQnfk zJ#pQcGi+Q?`h$vw+Vikh3-*uOV-5153P)ZBY5uhIuNpC?A?bRAZMWn_lu^$clDy-R zkAAPp*&jG%+0HBqQ(;%y7q1e^@eJH5@ngdrb>fH-qIkxR_W}0#N*2|w#hXUD=x0r8 zy;J7sx_ljR@Mt|^G`#6J=g;0tKIqUStGERM$dkQD1x7457!u%4xHiuJPXhk?nT47~qxNz753wpc%qyIWt|2Ng z_jZkTS6_=NSpP0`k-*q*!1RwZ7kAa1iYPUBI`_{S`|0r!((875#MsbVYZpzro`{uf z(1NYO8h`jJw@%C5!ogzs0E3AdeT3r!-m5A%6m)WJd@OVqIw|h!g`c(HYFw{tAtMv7 zf~zrF<(N8g1IBi$`-{PxQGBAk=_oNT7T1q1DM*sgATLMGy?22&M;JYSQcROI(mCZO zrNL>`KU*`J9mvW29TSQ zkoggZFYh@$?q0|Ls(JrF-t`htX7Yi_9`gjWYB?yFY$yG)m>;!D;Qm<7oB`IQ9R!DfGF|6|Lc08UQd%kf4i5$?|TTc-!(vs0SxuxHT<;OjH9i4e{GK~!f`;xI@rxNGkLi8b55(Sd*g+p zGjYqlGqEGPtnp91>kXd2jVuJ>OJu~$i8odw^qZQlVq(9gxX?It0+90@^LE$XUvX3N zYFylu(xzXrg!cz0Z87@>Rw6x%oMv6t3g%g*5|s+smzs5B@4 zQdQajJm^V%qeYzAG{oijbDQ8&j8RHRdk2HC?b zV<;R)jv?Sl!c;LWU_We`Z2jWOd+kH_J@Z$95xP9)r;Ax6!_6saYmjYY5Ks9y`#?!k zN(oS#K)=3{j>W@Q1mz)BlkO5`Z<%b-vMvUXFp7AHB>gGW@fzDRUCUnD!`So=6d|Lx>37E~b1{9RyEuRtrtcuQJ^tUmgo zhb<0OkTo!V02@;9VB8iT-7pVBircZJI_{zQv?gH7!;RKgHSi>Kq}dA!W_^Sl#=qD3 z+`y>QW9Mh)Kx+}|p_#5tl!}lt8|Ut%A7{&Df`k(5UFz^Sxr^&`POLSj#4?sBGE@Io zflPsOi(#MK73=H=>0!Q6?-LnsJiBoV%J;ha!$zCs9vHjNbcB1uI!*6LsM0VJl1w#n z5?fA%styL%3a)f+`4tZgo4#lE(`KyN(YKX|x8Xr>C4LmVGyxeye;oqGOyZrIk-|&2 zH=>-)NFueW{txOInI0Jnh>Fv_pqcb2@>sI>8v+^thI6@@+8peFs$AVKr}Hy7xu*ei zzZKr}$BOlvrC_F*`hU>D5fne(E?~z>+*@ex;50yyJakvscvIIlNy{S#Iu(uHVm&?6 z_3)RW)}4q&837WM>W!rh6^9QPzEl|p7-^Q5j#PJo$hTRj93U>As?(ZBT$$xK*P+0= z%_E)qOWKFt3r__z;xyBA5iV<$X1Ak@)>Nh1rtY%aT)}s>3Cn^Ln*vJD9a+zDnB~1z zs=tYH)ulLW1$s5~MB=Lf-k?YHb(w{y+u?uG(Ni(9`c+vb6HN1Yd%{8v*0`5>Mbq|E z%*ec`G8>KPyaGI(XtBDo{#^BxS@qO&vo|soFnQG3KEWrXDu70Yp^|fwmaALR}Dq>mmq6--TcV!Y%+e{!D*vU9fGS z<%;Ey>wOvVc?qn&@oRaC76jk2xictE><+gzs=!l1?bIh@Gom*TLZu$L_WX|B$26~G z!^+GtV9NzY__{Q|E^PPZC`eDFOfL;BiRPYPdABimd$v_@e zG63JrX4tQK$UbZ4J&&9Rg31G7d#N=dU#s9l2w#YhP&YS2$_a)Jy`D>#pZ4bAm+kPBOTt7`F=X)SbvJ!-6(%(D{u+KCqiJ zRGXraN!wWAdGBZD@S=-~Q!Xj=W$ns`%vFnK^T|l<&L0 zzF7Bc?KnKf0A%D0QiTyl0dcPy%TcSb$9qw7?c=_!DSw`zfME>V7ij#{%VhudH28{o zB55x8hm|#bDh?JaBPy!D^5#_j6%KNs7O1MDTG0$gG+RG&=DPP$Z7Eq>o5QTqBlKM{ zj^|5TOK*)mJW>iw(%AE6x@TT?rCuXBr2nns!2DZ0jlEl_rK11Pvj5PEb;6$B64$f; zERSKwc2z;}!v;6PLa%7PCMhJGW8i+@E7K}jP*->$-&BM7r)M%uguJ3*Z?-Gyn7t>y zlX2%l=&H(;(=~bPefDs?FpX!~vID-_KFsht{e0^=C3~s=l0nFeCDxkqPn%S{T;1}+ z^U0WV=8@02j-Yz`tg4+)X$O%kr*=8Kg)FuQPj0kXW^<1Vev#ZU`V4Wk+$IUdpKUb) zA_@fW>Lvt)rG$PE1PXAZ^+Nm?i#{6T`AW$d z2??rAo9}!(Wd%cbqQ(jLCvX=k4{J}kTh9o-)w`Lz<*y@X9U>0Aq+4ScSd{uv43}>L z9fmRPY!UcoY6o0`0USeBojif~*aKg`lf9lIIa)!gi6BRh8KNLjvUrs;91hLeqNMfS zCQsMu*9PMJRnWW>B;?z-E_w#`b$O1M=!ks8f7%8uYJ5zV zb;bZW_aSz$O%y-~?coWMpn7I_3YtpxTCDF?i7SbIPWAJOUt0~A??@T?@A$N|MeKTq z2HV2r=je7q7CfLiEc=-zX_E8siX%3%b-3(#7t5d+wwN^kB&%sK&3#nEr}z`}huWTw z-a3Q95`#gv;|I&a5zK|hXwC?#MqesKYAoSAA>mbf2=v=88JipZkQESDO_4Ps$kz*|4RJ3yvIWZ(OZC(W-A(zud&mfCZK^;Oi|X%ZRX1hZBT zqnpyTnlv%DBQlFDxy!t{M-l2Xl*0Y9l6-ouT0IY94V$H?@y|jxP{!KLsQjeY)MhU; zRB8L00(@^S1y`)}7ZmBGyr3^6hQ)>|Drp@DQc*@O`bt)$FjkAiFIR-J!9I!)7|YbJ z*6qbWVtG3~rx7*O;o9L3n^rgsEYi$?9HB0seONi*k)4n`wFA-;{p&gOwG}Y*@h)&> z_-g8#>+&|yv>BaL26{Od*MPOvzmx8GU@;c!aw-e=P=hW9Q<&!B{)6h4^iq1Ygnsr- zo+fT7G36pt8>MaZ*E)l9LRgerM@rjlo6ilV1|R|9)XPS@C!8Bm;w6fKDOV=9F{-Up zBpQZC1*Q|aZxzho42Yz~(N!V&AXawORuO{-EV$yGAFpg_WD7IDS7lL>Ig6rEpO3DAu^g-j&ztiixx<2cgQT(plWMHMwg?kpj!iiHLN+#}^m>=I zbNlI`>K~il&*C=+LlPd(HgkH`v{IVAU4(GnChq5-B*) z;$OjD*q;8{KjVAe>{Bn7YQw9A^jCAzbKCS(uX<__ZYp#YUc~*;3`Bsx;;@{QmMFEY z!i&@AvT67wy~hi+nMg8sVemK5s^3C#WCL?2v4OgBUW#uo4x&%KQy=X=&{olMee1*U zOc6w-6bVAzCQuG%yo7@uGq8s2v(dv}QSNSy_#_&t+<-idI-bpVK$@6JE?B4)kEKs+uQfI> zB!h$3d-=Xs_RoXFn?X|KM&-Wq!BWOq^O~xKjMWT<8ECHW>y|gm!V|%I`?=XiQ>7-~ zNL&kxvvV{_+NV`)R%AEI!D?9LY5sN`)*Q7&Ro6LFK4LjCpC&l^Y$^1sDkT0(Y=?PA; zvnObr1IRdBOGnJZ%fn9FE#yM)@?qA5Pb9;+Qqw@R>$as%$@QquyB4&Y0y;a^T;Ryg zB5&=eoyRGGbQeSJvQRXLx-Ej~ zHzi-1nbaQshcckghwHloKb%AEB^iHtwEfDr!B>}KXJYm<{6d=Ok5`07247mGu1Tol zmXG5;+oO>=5yet))qw1u?8xh0gq;xbDeF*<=^5#YYAmpzH;U>>o|7y zGX#Cr;a*1yMqm`yKK*@xTID=-`S2Pq1&TIK80~pa9;K45;Y}PK^H<8-O=+M zg~JK=P)9YRP5cD`AH+4{!~1o2);!I;2YLYfyM6ob9X4p*%it*pF#2Gx2Q;@m(3l$8 zw~IL=5G{TunViCbw!f2#k>zuPzH|EVEY(xP7_NrCYJA6pehay57n3e|3ziZ43S|zI zyeuV>a1F8Li~WL>Y)Kv@x`FvY34o_a&td}LU+va5?;eukqEA}a4wT*b*{)YBLl&WT z;$whurm@d-2&%g`#>tzPsq*AT{n9;?quB4LXc%dj4Y}a&J+AX0RpTY~YMSkpymzvp zce@5k3`B@shWuaKcSI#kiSLMK_rJ)y|IRvkO8-S}H9FO1IgI`pWYyV1 zIj^f>bKh9DF#43)Qn^5&m$*=2x?gZWD`1YIaj-llqtR-tqgOJW`w-nkR=+(M(-TO6 z#)#HO!8gH3K;spVB&3|gJq)he8Y+k<{<5S=iM3Et0shdrf% z04s}TObTG{5JuP^|I^H>;26f8+}M9X)qp7@E8JuT^WwwJ4CC;Dwyg<3KM4H%0gtkN znWhR38|$IQ=m%AjKH!nnFCWaW$TWULM2B`7i39|~KSK7W!%aGUB(S!hn467}0rgW_ z>cZih-~$qNlZU*Rwu3Fe55HFc7CdlrHOm!8LBK4oT9`CHeO?6-Px74);WjWx0nOu_ z08mbu^=6-3IL_=LfF(_i?J>p=ghET<+~F2LT(UwyviW|3BiL~@R>lcpuyb<3>FAZ zkmbGIJ!jwU+aLE<-@aAd=d0V*UG?1rZ7pRYd>VWJ06?UwqVNg;KznQgj&U&`?~3_8 zGLHh?MqOC}08>3;XMB9Z^HMSPeUvKyyp#rAr2qgLKUD=;y`Y7|yihm$-tc~D$9W=G zs$KsH?0L0bDFu}Lv_-8Byl|sU^Fyr4w-ruJ{qi&-r)73d7M0A3qE}E(mwUW%g);Mu z%CD(UI7oWi*)@exJxXw4CgFWb9-_BFs&A_*oPYD&^)RYvJ&4xi`2O-AZJoVbaO|2n zZ@s*A_%%HITLh6Kh{##REa>|@I45#I7(_^I0iYq~0|>C<<~$8x4R~S!P|&Ewa}!p@ zyx{@#cuJGUWZHV5r|&8-ss>-#A3V21192ficY@z$BF;{Fu2AF)pk_xljY@;pushQ_ z-0W8?^5Sw7&!wHuREAa(P%zm-Bp~q@3W1Zgr`n5}_%xftb8@}Rc4lg`4?u~)r}+D8~y!MZhPHlf%HERSaTF*T`sTBYB&!#+@6`1T+jdF zRnZ6@t7W*j6zkj@KBR7T*|JVj6>d7vdwNKbg-w7K|c_r-sJ$5Xkhb zW5L&t(Z{`l(40g&077&Tk}^_9wWo+4_68u*T@gC+RM6Ut#46%-o}~W_#@xud&dOy* zN`@)Pngg1k;ir7r^bfzQofqdk)x!k?r%SsW4KOHXF|w1sZgZo%WIxL&_7G^!=3LFZ z+naJPDbXCcG$#s{gmwmbFvE#$JqvjE(KMLXvP8`Hnu$jh8hVEtfpFeO(7goW72ic@qZ`tGbA*1fBpI)1X{U%_ zF8dce|M~6z6D}XY*mJrKGnu!f%nEUYjM7(g;VkZSjG| zw_IBtV^A~vrbOB5PE_#mC$w&Fjea2Juv(}rznb)0sLC=>bR?i%STt%8cMAo;ixMG* zk}sSsZX{x`+r$nl{eC$x{t|%JM_@rp}w^x@{ON1W&MDsvN?n-~`-&9PJUt*O0Vn*We}MzmHUzW>$-Lzzdg zOafa8Yd_0ljkJVwc)76^L$7bS22V(W@FhL}2A zb(v1FsgC%u-a^SwEwj>O{-#XQm$6AvjO}$krsCWc-37%$Y`KH*|>DL zKnd%O{0Qdc=?Kk0mQQo|au=4xQ^&{EZB+pX2H0|TiTRc=f0!Uma-tQ2sYV&HJv8lx#&dMtO4We+8rk;O4FM zhXyW21Q3ax-ua_=mmGY!9IbS>gq1aTM8?(r!?+R18k#xO)veq(PXRO4_!oF1Tv3nbyn>9h_0)&%U1kh55Vz+rFetsKj zRwM|)v}^8gp)G3w`I~F&g;txw#HFOLp&9@MR};!-&BmJteKTzp{G>uK6Zru{eb{}Y z%`~~)A-_O~+yQ!hzHujuGc)gp2-(-plF+2O=_6qG8{{0pVujRx%-M=!T8gY{#Z#Li zv(YbAQMqyGZFE_1d|Tn>ACL)MIkSw)!B{nVlIP3>L$4Hn4Afe(0k&~edDm~O-TYNQ z-F!f&CM(NrCyOq?%cvtTHX`|-8^V9>e@`XRoZkLmaTZLW28ft8589E7>-aO7_yun1 zyUj(ADq(Lg^|t5O^to=8sx!0j*tS&g?h77#B1i7aPytT4n}VBPI#2VosgdDMCcHXd z=~OvSE@f)_a5ebVMQeKGWi~BL17H{UThZ>qD{trw%IFXYx#n(gN!E)@_U>7k-$L!} z3~}NADQ{^_cA|S?Dq~>pkUT4_ZqR+dcNa7^X!h9#k^MF7KE2oNSvUzjnk7yGfJL9{ z-jJ!NTH4d}chw}rpUKnU6cRc1UtWSlnOi>pRLTKsR|+hDXm+#C7^)-SYzb;$C{;Fk zs>~8+)nphUCVl6_wF<}xCaC3cZDbgd=J9u@jv4ss!8mPikH`q`1-cuwcP z&yz=Yzw2ZH=%O@wrer2o$G%;8PQ{IaN%4?wX5L)G23jblq~g`Ml*tK~sCtc$HavG- zC2u74)g>-Ysb(8SglA8)USXD0wo23JCcET+DqXbc#_^5(#a3j7FGa6^e`khi!c7p> zU|2tYc2Bn>r0V#0k4mg6M}sPrgn!HzoxnP(;njBab~mKK;x+G%c4qtM4)!~#KJ|&; z(Pm@Vwn$-ji#30DqOt-VH>whhLJY^mr_5i1O`lDcpDLvBq1RUA#F`r54sZ(Y)|L$- zjc(lAWlT4`&y1e?aFbc5r+`s-t{UphpuEqECxt2P?D5xEv~Rp|vlFpo-$Swuw3jaR ziCj)A**Bck5&&-B4ZWYmWp5`T3EXH)ok{v;Cl^R@2zhO6 z!S?}GuR~z!jq`v7vkm%KewmdtlW7d7`OihUTQp1FrKCB;0MlA7Ko#fcp2o;7vI}bH zg=GlpqcnLDEcV`44DMpBPIb|PIR@&d8*|F?)vD{|ZgA75+etndI$1ShiX`tyN||+< zbYNimEx^l>Hv@X8J^s1QC_E<@rs~c2y+UdfbuBO5$QLd4`wWA&N` zws@aacvH&KriK~8A2?#DGo`km@SNEg(veO?x!5hgM^jLI zAc6-KP2=IrWB&W_ai_>qFaNmk1)Tw`{=+3Hj05;MM~=?gXkJAbu2RGrPa{a z_$dxvm_n7Y{zqs$rlp|-1sl5C%me7-K6BYs@k4{T9@(!dC*5ru7SrES5D%sl>J@L`rgjV2n1M`_yAcxOT>(XWQ)#c*BIGwW z;Uh2P(BDxz+z5zU!4cnc>DJ29^7S6jYxU}}$@gqrJg8Bn_)1rb+rxX@L)>2PJnGk! zgmBm<%Uv}LeWsYJDYZ?BJ+0FjPCPq)_|oLAQMe9!Yq?HTMI&~W&EO+g9_tKEp9)*g znp1hljDG~_))}zNPTXW=OnH~j_;K+~ec`G0Z^7_l009G&c|zu&t~CnfcJ(z{8^;q% zhWMc-COwXB93$TU78nyT=H}jo#@r2Q5ZTdONrvT-hb57R8Mk_Eh9DcI1wP?mnw1nY ztic`DhdRDr-I_(PIYicn)|}CZQvOU8XV5F)}nF#@6HTsw|iDHwsrxfBkZa9ic(#a3) z3-pT-_g9!AfZFjWIR-WYXwIFFth+jM$dC5OZl$)Zc zFAAo&g26}VX=&TfmeSi`%zsS*5=2XCl`Fnu$v5}NQ zv$6Xv9>%CW9xDld9bN9|;FRpMg9n>obNUb&Co2SJJg2frDsI^dU}XqPYIqaLai2(j zo2QWHnD7@>pOKvF4DeR9p~U7@!!pu~tD_&Zak+C{Vu2wwvHm{rTNJ4a-%6CghY+W= zVsFdkEoBKk;+^CLl-IMhEb&l+vriCuI5#V@fe8MeyWO za6zAlz3J(VZ>FS++Yuk9Di5+_r4_6~m?fA5;rr%4;}t@+d~J~tAJ zI}t13if`D(v?=#y>SLZWl*k}wosI#n2&p4?xH3W)&UVDelm+LwLgs1&T7mCsTy)R& zJH81oc6>8cyCMIG(Wjex?}B|1XyMFg#>~U#nJ8lbaaES)f1i&1o=~F{NJgX{%r0_C94ZkcJky>+< zX=~DK##TB&sG~U8hr_=(9Q@Qr5bzdNZMo%B(PJ!u960!86QU>?`KT?1-_Nr1be3n>Ftv@(9WATydpeFu7emOJl8R zR$-3^li`aoFOvip!_gG($mTD8yhZcCyeEe;I5y>$cM9`_NPOew@}p2MtS75k*!db{ zNXa~Kms4KB=JtJfs4GcjjsXQT4OS~;Jt(mLC^H|ycOpi$fnfe?9sS}62gpL>O!4z` z|HFweukO)WL9^&wOBz>j4p%GZy=R<@XRSM-7ti08IM){J7Jj@`f3(zxq}>ty zJs(5i?l=U6K;}j(c0}VuL0n8uBsRHwZKgLOuUlWk614H4yCYtt`}thR$GrTfgef#0 zlMnFE%KbSXpur?^JpE3{~LbXA0`~QV<9DSFdRA+Uxudj zy(%(`yj44}=wQrYSL(|Yx@!!!NCIC!O_A-$d&%#kwwkpizZ+{-qhu+didG-J6Bos` zI5#Vfw4%Q0?5|(7*$nC{*I8lw+Wb*4+t(0V`%`|sEP*+x6ucS;uIF9DTxDIP33y3e zl=$;I?^4|uW-|q?h&{_9%XY$I@SyrHV?_y5Sa6o;xAdhxEKPh5;$`<2OZtz2Gqq=W zLU&ro+HttGtSG<4e#g6)$Cr0jVT0&E%6B59OiK8H?Uvduju2wgbiOsF#`3E#Iy58MYiz-7x%ZMa$+8w-%heWX|8%D(mca18T z7|EbThNC7eRRspNnaCe)Io&pKutTnQu+}XYg%zC}io(f^x80E)lqN4P)9(%Xeh7uhtuYahWVK8kK^Z5eY6noTl7h2L zegI$aj1bi>+1i%E+Q$k`mzTr%dpc!Rvx|QI6yB3~&h2U5L0LE-QTH~k+g$K8jl!>N z^tLcQdT*|Z9**vUW@O(Nl+i%^Wf&x{Co9`)oE!S6R@=M!?10HtMh9TPW#IFq zrWao@)}HAL=5VdtP)gTg`j=mj3t4!{=+n)_soL%Yyytk=9Z-FskUNlhRSby?w6_IA=vXdEUmgH>PfKgVEK|aR%t-?(I;5}GQT)1siE)~31oDP zTHpYg3HM~3csfrT=jcNg{R`p`k2)-mqquot9INKrWhOO(OLh59NNZ~4lzpMj6k6L~ zLbwA;BcLK;+Q+5zKHwVfrZq2f%}C9Ch;*TQKSO4J1PKVn8S6$*7=}=T0`s99bd$3 zV8%Z%;=UQ}nOlDpl}Uz&q`$3teG$<`8Tm#1tJnuRq44o-TH#LYLSDwxTRx9m@$xHHW(a~UkGYLa z8KJAf(7XInf6#STHuj1w^F)8UA=7d=^7?9jqEE;?jNE)U_5;_8)IdsFiikl!eI*5) zxb}6*|9Go;^jCMZy3;yXBTeNk5-TkXZBtC6oC0Ii(%;7 z{IhoB$jWLfbFBGEl8o|J0c3ucF<@^NlCn~xgh+M7y0}yXT+Bk`kdWAiZ88(^>t`DQ zXPg|c=69SY^6@Rgg7fi2jkK-obqK!QKxz=l$KnubZOh*MQ$vkUAMizrf0xL*(WqVC z{!@j7hLHwyVHCsb^C}T{9YrKLYJE9g{-1I3Kh)4H$&xZmmHl(j)-uaMNLJ+gX53q;z3%Watu14E4+4r7vXEZQO0B^lo za_(k(@}E*}_4U1pf_0n@#h3TzB4Kh?V_M@l=3Um4Ts?fa&Y~UQ+J8$rI}!RwON0xd zfRv1;82uBTi$BKwQNZW%Hq_e5{);mddrfAD!^*J%0_fYQMK@YhLMS%98(|~;CeWbq zJk%+L8p;n6@Os1lT=LKOCuLahw-^+Xx|Xl(m_5OU8f3skDb_3&8*(_yDg%7MM1t;q z7ir$sKOjp1$aSIjZ&Sv)N`U`cTDRR0z00FLwIw{>#-yMEmuL9 zP*TMRx*$QTrh!Wx;D~0}KE$woROV=Lf#yL~+so#D_XEOZ5MU(S;E+{KI`X^>&lu3W zF}BMzZYJqsbGd*nar62CCu7Gc(}fVz^YKU23qM68KRatbdvRMI`$qu~0Pzd*fCP9z z{CXg;xS*goKZpk;Dh>j1SRvE?#lYRu&ec=nGObUhvX0uk5Yug1rarB_5Rks)||))pAy^{{xH72U-9C diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_FFF_256x240.png b/templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_FFF_256x240.png deleted file mode 100755 index 4f624bb2b193750f1a5b36c8c307168c6681a861..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6299 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 DTfr$v diff --git a/templates/admin/default/assets/css/jqueryui/custom-theme/jquery-ui-1.10.3.custom.css b/templates/admin/default/assets/css/jqueryui/custom-theme/jquery-ui-1.10.3.custom.css deleted file mode 100755 index ab828f01b..000000000 --- a/templates/admin/default/assets/css/jqueryui/custom-theme/jquery-ui-1.10.3.custom.css +++ /dev/null @@ -1,1177 +0,0 @@ -/*! jQuery UI - v1.10.3 - 2013-09-03 -* http://jqueryui.com -* Includes: jquery.ui.core.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css -* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=%22Helvetica%20Neue%22%2C%20Helvetica%2C%20Arial%2C%20sans-serif&fwDefault=normal&fsDefault=12px&cornerRadius=4px&bgColorHeader=%23f39922&bgTextureHeader=highlight_soft&bgImgOpacityHeader=100&borderColorHeader=%23eab791&fcHeader=%23FFF&iconColorHeader=%23FFF&bgColorContent=%23F9F9F9&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=%23aaaaaa&fcContent=%23333333&iconColorContent=%23333333&bgColorDefault=%23FFF&bgTextureDefault=highlight_hard&bgImgOpacityDefault=75&borderColorDefault=%23d3d3d3&fcDefault=%23555555&iconColorDefault=%23888888&bgColorHover=%23f39922&bgTextureHover=highlight_soft&bgImgOpacityHover=75&borderColorHover=%23999999&fcHover=%23fff&iconColorHover=%23454545&bgColorActive=%23f39922&bgTextureActive=highlight_soft&bgImgOpacityActive=65&borderColorActive=%23aaaaaa&fcActive=%23fff&iconColorActive=%23fff&bgColorHighlight=%23fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=%23fcefa1&fcHighlight=%23363636&iconColorHighlight=%232e83ff&bgColorError=%23fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=%23cd0a0a&fcError=%23cd0a0a&iconColorError=%23cd0a0a&bgColorOverlay=%23aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=%23aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px -* Copyright 2013 jQuery Foundation and other contributors Licensed MIT */ - -/* Layout helpers -----------------------------------*/ -.ui-helper-hidden { - display: none; -} -.ui-helper-hidden-accessible { - border: 0; - clip: rect(0 0 0 0); - height: 1px; - margin: -1px; - overflow: hidden; - padding: 0; - position: absolute; - width: 1px; -} -.ui-helper-reset { - margin: 0; - padding: 0; - border: 0; - outline: 0; - line-height: 1.3; - text-decoration: none; - font-size: 100%; - list-style: none; -} -.ui-helper-clearfix:before, -.ui-helper-clearfix:after { - content: ""; - display: table; - border-collapse: collapse; -} -.ui-helper-clearfix:after { - clear: both; -} -.ui-helper-clearfix { - min-height: 0; /* support: IE7 */ -} -.ui-helper-zfix { - width: 100%; - height: 100%; - top: 0; - left: 0; - position: absolute; - opacity: 0; - filter:Alpha(Opacity=0); -} - -.ui-front { - z-index: 100; -} - - -/* Interaction Cues -----------------------------------*/ -.ui-state-disabled { - cursor: default !important; -} - - -/* Icons -----------------------------------*/ - -/* states and images */ -.ui-icon { - display: block; - text-indent: -99999px; - overflow: hidden; - background-repeat: no-repeat; -} - - -/* Misc visuals -----------------------------------*/ - -/* Overlays */ -.ui-widget-overlay { - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; -} -.ui-resizable { - position: relative; -} -.ui-resizable-handle { - position: absolute; - font-size: 0.1px; - display: block; -} -.ui-resizable-disabled .ui-resizable-handle, -.ui-resizable-autohide .ui-resizable-handle { - display: none; -} -.ui-resizable-n { - cursor: n-resize; - height: 7px; - width: 100%; - top: -5px; - left: 0; -} -.ui-resizable-s { - cursor: s-resize; - height: 7px; - width: 100%; - bottom: -5px; - left: 0; -} -.ui-resizable-e { - cursor: e-resize; - width: 7px; - right: -5px; - top: 0; - height: 100%; -} -.ui-resizable-w { - cursor: w-resize; - width: 7px; - left: -5px; - top: 0; - height: 100%; -} -.ui-resizable-se { - cursor: se-resize; - width: 12px; - height: 12px; - right: 1px; - bottom: 1px; -} -.ui-resizable-sw { - cursor: sw-resize; - width: 9px; - height: 9px; - left: -5px; - bottom: -5px; -} -.ui-resizable-nw { - cursor: nw-resize; - width: 9px; - height: 9px; - left: -5px; - top: -5px; -} -.ui-resizable-ne { - cursor: ne-resize; - width: 9px; - height: 9px; - right: -5px; - top: -5px; -} -.ui-selectable-helper { - position: absolute; - z-index: 100; - border: 1px dotted black; -} -.ui-accordion .ui-accordion-header { - display: block; - cursor: pointer; - position: relative; - margin-top: 2px; - padding: .5em .5em .5em .7em; - min-height: 0; /* support: IE7 */ -} -.ui-accordion .ui-accordion-icons { - padding-left: 2.2em; -} -.ui-accordion .ui-accordion-noicons { - padding-left: .7em; -} -.ui-accordion .ui-accordion-icons .ui-accordion-icons { - padding-left: 2.2em; -} -.ui-accordion .ui-accordion-header .ui-accordion-header-icon { - position: absolute; - left: .5em; - top: 50%; - margin-top: -8px; -} -.ui-accordion .ui-accordion-content { - padding: 1em 2.2em; - border-top: 0; - overflow: auto; -} -.ui-autocomplete { - position: absolute; - top: 0; - left: 0; - cursor: default; -} -.ui-button { - display: inline-block; - position: relative; - padding: 0; - line-height: normal; - margin-right: .1em; - cursor: pointer; - vertical-align: middle; - text-align: center; - overflow: visible; /* removes extra width in IE */ -} -.ui-button, -.ui-button:link, -.ui-button:visited, -.ui-button:hover, -.ui-button:active { - text-decoration: none; -} -/* to make room for the icon, a width needs to be set here */ -.ui-button-icon-only { - width: 2.2em; -} -/* button elements seem to need a little more width */ -button.ui-button-icon-only { - width: 2.4em; -} -.ui-button-icons-only { - width: 3.4em; -} -button.ui-button-icons-only { - width: 3.7em; -} - -/* button text element */ -.ui-button .ui-button-text { - display: block; - line-height: normal; -} -.ui-button-text-only .ui-button-text { - padding: .4em 1em; -} -.ui-button-icon-only .ui-button-text, -.ui-button-icons-only .ui-button-text { - padding: .4em; - text-indent: -9999999px; -} -.ui-button-text-icon-primary .ui-button-text, -.ui-button-text-icons .ui-button-text { - padding: .4em 1em .4em 2.1em; -} -.ui-button-text-icon-secondary .ui-button-text, -.ui-button-text-icons .ui-button-text { - padding: .4em 2.1em .4em 1em; -} -.ui-button-text-icons .ui-button-text { - padding-left: 2.1em; - padding-right: 2.1em; -} -/* no icon support for input elements, provide padding by default */ -input.ui-button { - padding: .4em 1em; -} - -/* button icon element(s) */ -.ui-button-icon-only .ui-icon, -.ui-button-text-icon-primary .ui-icon, -.ui-button-text-icon-secondary .ui-icon, -.ui-button-text-icons .ui-icon, -.ui-button-icons-only .ui-icon { - position: absolute; - top: 50%; - margin-top: -8px; -} -.ui-button-icon-only .ui-icon { - left: 50%; - margin-left: -8px; -} -.ui-button-text-icon-primary .ui-button-icon-primary, -.ui-button-text-icons .ui-button-icon-primary, -.ui-button-icons-only .ui-button-icon-primary { - left: .5em; -} -.ui-button-text-icon-secondary .ui-button-icon-secondary, -.ui-button-text-icons .ui-button-icon-secondary, -.ui-button-icons-only .ui-button-icon-secondary { - right: .5em; -} - -/* button sets */ -.ui-buttonset { - margin-right: 7px; -} -.ui-buttonset .ui-button { - margin-left: 0; - margin-right: -.3em; -} - -/* workarounds */ -/* reset extra padding in Firefox, see h5bp.com/l */ -input.ui-button::-moz-focus-inner, -button.ui-button::-moz-focus-inner { - border: 0; - padding: 0; -} -.ui-datepicker { - width: 17em; - padding: .2em .2em 0; - display: none; -} -.ui-datepicker .ui-datepicker-header { - position: relative; - padding: .2em 0; -} -.ui-datepicker .ui-datepicker-prev, -.ui-datepicker .ui-datepicker-next { - position: absolute; - top: 2px; - width: 1.8em; - height: 1.8em; -} -.ui-datepicker .ui-datepicker-prev-hover, -.ui-datepicker .ui-datepicker-next-hover { - top: 1px; -} -.ui-datepicker .ui-datepicker-prev { - left: 2px; -} -.ui-datepicker .ui-datepicker-next { - right: 2px; -} -.ui-datepicker .ui-datepicker-prev-hover { - left: 1px; -} -.ui-datepicker .ui-datepicker-next-hover { - right: 1px; -} -.ui-datepicker .ui-datepicker-prev span, -.ui-datepicker .ui-datepicker-next span { - display: block; - position: absolute; - left: 50%; - margin-left: -8px; - top: 50%; - margin-top: -8px; -} -.ui-datepicker .ui-datepicker-title { - margin: 0 2.3em; - line-height: 1.8em; - text-align: center; -} -.ui-datepicker .ui-datepicker-title select { - font-size: 1em; - margin: 1px 0; -} -.ui-datepicker select.ui-datepicker-month-year { - width: 100%; -} -.ui-datepicker select.ui-datepicker-month, -.ui-datepicker select.ui-datepicker-year { - width: 49%; -} -.ui-datepicker table { - width: 100%; - font-size: .9em; - border-collapse: collapse; - margin: 0 0 .4em; -} -.ui-datepicker th { - padding: .7em .3em; - text-align: center; - font-weight: bold; - border: 0; -} -.ui-datepicker td { - border: 0; - padding: 1px; -} -.ui-datepicker td span, -.ui-datepicker td a { - display: block; - padding: .2em; - text-align: right; - text-decoration: none; -} -.ui-datepicker .ui-datepicker-buttonpane { - background-image: none; - margin: .7em 0 0 0; - padding: 0 .2em; - border-left: 0; - border-right: 0; - border-bottom: 0; -} -.ui-datepicker .ui-datepicker-buttonpane button { - float: right; - margin: .5em .2em .4em; - cursor: pointer; - padding: .2em .6em .3em .6em; - width: auto; - overflow: visible; -} -.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { - float: left; -} - -/* with multiple calendars */ -.ui-datepicker.ui-datepicker-multi { - width: auto; -} -.ui-datepicker-multi .ui-datepicker-group { - float: left; -} -.ui-datepicker-multi .ui-datepicker-group table { - width: 95%; - margin: 0 auto .4em; -} -.ui-datepicker-multi-2 .ui-datepicker-group { - width: 50%; -} -.ui-datepicker-multi-3 .ui-datepicker-group { - width: 33.3%; -} -.ui-datepicker-multi-4 .ui-datepicker-group { - width: 25%; -} -.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header, -.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { - border-left-width: 0; -} -.ui-datepicker-multi .ui-datepicker-buttonpane { - clear: left; -} -.ui-datepicker-row-break { - clear: both; - width: 100%; - font-size: 0; -} - -/* RTL support */ -.ui-datepicker-rtl { - direction: rtl; -} -.ui-datepicker-rtl .ui-datepicker-prev { - right: 2px; - left: auto; -} -.ui-datepicker-rtl .ui-datepicker-next { - left: 2px; - right: auto; -} -.ui-datepicker-rtl .ui-datepicker-prev:hover { - right: 1px; - left: auto; -} -.ui-datepicker-rtl .ui-datepicker-next:hover { - left: 1px; - right: auto; -} -.ui-datepicker-rtl .ui-datepicker-buttonpane { - clear: right; -} -.ui-datepicker-rtl .ui-datepicker-buttonpane button { - float: left; -} -.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current, -.ui-datepicker-rtl .ui-datepicker-group { - float: right; -} -.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header, -.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { - border-right-width: 0; - border-left-width: 1px; -} -.ui-dialog { - position: absolute; - top: 0; - left: 0; - padding: .2em; - outline: 0; -} -.ui-dialog .ui-dialog-titlebar { - padding: .4em 1em; - position: relative; -} -.ui-dialog .ui-dialog-title { - float: left; - margin: .1em 0; - white-space: nowrap; - width: 90%; - overflow: hidden; - text-overflow: ellipsis; -} -.ui-dialog .ui-dialog-titlebar-close { - position: absolute; - right: .3em; - top: 50%; - width: 21px; - margin: -10px 0 0 0; - padding: 1px; - height: 20px; -} -.ui-dialog .ui-dialog-content { - position: relative; - border: 0; - padding: .5em 1em; - background: none; - overflow: auto; -} -.ui-dialog .ui-dialog-buttonpane { - text-align: left; - border-width: 1px 0 0 0; - background-image: none; - margin-top: .5em; - padding: .3em 1em .5em .4em; -} -.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { - float: right; -} -.ui-dialog .ui-dialog-buttonpane button { - margin: .5em .4em .5em 0; - cursor: pointer; -} -.ui-dialog .ui-resizable-se { - width: 12px; - height: 12px; - right: -5px; - bottom: -5px; - background-position: 16px 16px; -} -.ui-draggable .ui-dialog-titlebar { - cursor: move; -} -.ui-menu { - list-style: none; - padding: 2px; - margin: 0; - display: block; - outline: none; -} -.ui-menu .ui-menu { - margin-top: -3px; - position: absolute; -} -.ui-menu .ui-menu-item { - margin: 0; - padding: 0; - width: 100%; - /* support: IE10, see #8844 */ - list-style-image: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7); -} -.ui-menu .ui-menu-divider { - margin: 5px -2px 5px -2px; - height: 0; - font-size: 0; - line-height: 0; - border-width: 1px 0 0 0; -} -.ui-menu .ui-menu-item a { - text-decoration: none; - display: block; - padding: 2px .4em; - line-height: 1.5; - min-height: 0; /* support: IE7 */ - font-weight: normal; -} -.ui-menu .ui-menu-item a.ui-state-focus, -.ui-menu .ui-menu-item a.ui-state-active { - font-weight: normal; - margin: -1px; -} - -.ui-menu .ui-state-disabled { - font-weight: normal; - margin: .4em 0 .2em; - line-height: 1.5; -} -.ui-menu .ui-state-disabled a { - cursor: default; -} - -/* icon support */ -.ui-menu-icons { - position: relative; -} -.ui-menu-icons .ui-menu-item a { - position: relative; - padding-left: 2em; -} - -/* left-aligned */ -.ui-menu .ui-icon { - position: absolute; - top: .2em; - left: .2em; -} - -/* right-aligned */ -.ui-menu .ui-menu-icon { - position: static; - float: right; -} -.ui-progressbar { - height: 2em; - text-align: left; - overflow: hidden; -} -.ui-progressbar .ui-progressbar-value { - margin: -1px; - height: 100%; -} -.ui-progressbar .ui-progressbar-overlay { - background: url("images/animated-overlay.gif"); - height: 100%; - filter: alpha(opacity=25); - opacity: 0.25; -} -.ui-progressbar-indeterminate .ui-progressbar-value { - background-image: none; -} -.ui-slider { - position: relative; - text-align: left; -} -.ui-slider .ui-slider-handle { - position: absolute; - z-index: 2; - width: 1.2em; - height: 1.2em; - cursor: default; -} -.ui-slider .ui-slider-range { - position: absolute; - z-index: 1; - font-size: .7em; - display: block; - border: 0; - background-position: 0 0; -} - -/* For IE8 - See #6727 */ -.ui-slider.ui-state-disabled .ui-slider-handle, -.ui-slider.ui-state-disabled .ui-slider-range { - filter: inherit; -} - -.ui-slider-horizontal { - height: .8em; -} -.ui-slider-horizontal .ui-slider-handle { - top: -.3em; - margin-left: -.6em; -} -.ui-slider-horizontal .ui-slider-range { - top: 0; - height: 100%; -} -.ui-slider-horizontal .ui-slider-range-min { - left: 0; -} -.ui-slider-horizontal .ui-slider-range-max { - right: 0; -} - -.ui-slider-vertical { - width: .8em; - height: 100px; -} -.ui-slider-vertical .ui-slider-handle { - left: -.3em; - margin-left: 0; - margin-bottom: -.6em; -} -.ui-slider-vertical .ui-slider-range { - left: 0; - width: 100%; -} -.ui-slider-vertical .ui-slider-range-min { - bottom: 0; -} -.ui-slider-vertical .ui-slider-range-max { - top: 0; -} -.ui-spinner { - position: relative; - display: inline-block; - overflow: hidden; - padding: 0; - vertical-align: middle; -} -.ui-spinner-input { - border: none; - background: none; - color: inherit; - padding: 0; - margin: .2em 0; - vertical-align: middle; - margin-left: .4em; - margin-right: 22px; -} -.ui-spinner-button { - width: 16px; - height: 50%; - font-size: .5em; - padding: 0; - margin: 0; - text-align: center; - position: absolute; - cursor: default; - display: block; - overflow: hidden; - right: 0; -} -/* more specificity required here to overide default borders */ -.ui-spinner a.ui-spinner-button { - border-top: none; - border-bottom: none; - border-right: none; -} -/* vertical centre icon */ -.ui-spinner .ui-icon { - position: absolute; - margin-top: -8px; - top: 50%; - left: 0; -} -.ui-spinner-up { - top: 0; -} -.ui-spinner-down { - bottom: 0; -} - -/* TR overrides */ -.ui-spinner .ui-icon-triangle-1-s { - /* need to fix icons sprite */ - background-position: -65px -16px; -} -.ui-tabs { - position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */ - padding: .2em; -} -.ui-tabs .ui-tabs-nav { - margin: 0; - padding: .2em .2em 0; -} -.ui-tabs .ui-tabs-nav li { - list-style: none; - float: left; - position: relative; - top: 0; - margin: 1px .2em 0 0; - border-bottom-width: 0; - padding: 0; - white-space: nowrap; -} -.ui-tabs .ui-tabs-nav li a { - float: left; - padding: .5em 1em; - text-decoration: none; -} -.ui-tabs .ui-tabs-nav li.ui-tabs-active { - margin-bottom: -1px; - padding-bottom: 1px; -} -.ui-tabs .ui-tabs-nav li.ui-tabs-active a, -.ui-tabs .ui-tabs-nav li.ui-state-disabled a, -.ui-tabs .ui-tabs-nav li.ui-tabs-loading a { - cursor: text; -} -.ui-tabs .ui-tabs-nav li a, /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */ -.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a { - cursor: pointer; -} -.ui-tabs .ui-tabs-panel { - display: block; - border-width: 0; - padding: 1em 1.4em; - background: none; -} -.ui-tooltip { - padding: 8px; - position: absolute; - z-index: 9999; - max-width: 300px; - -webkit-box-shadow: 0 0 5px #aaa; - box-shadow: 0 0 5px #aaa; -} -body .ui-tooltip { - border-width: 2px; -} - -/* Component containers -----------------------------------*/ -.ui-widget { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 12px; -} -.ui-widget .ui-widget { - font-size: 1em; -} -.ui-widget input, -.ui-widget select, -.ui-widget textarea, -.ui-widget button { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 1em; -} -.ui-widget-content { - border: 1px solid #aaaaaa; - background: #F9F9F9 url(images/ui-bg_flat_75_F9F9F9_40x100.png) 50% 50% repeat-x; - color: #333333; -} -.ui-widget-content a { - color: #333333; -} -.ui-widget-header { - border: 1px solid #eab791; - background: #f39922 url(images/ui-bg_highlight-soft_100_f39922_1x100.png) 50% 50% repeat-x; - color: #FFF; - font-weight: bold; -} -.ui-widget-header a { - color: #FFF; -} - -/* Interaction states -----------------------------------*/ -.ui-state-default, -.ui-widget-content .ui-state-default, -.ui-widget-header .ui-state-default { - border: 1px solid #d3d3d3; - background: #FFF url(images/ui-bg_highlight-hard_75_FFF_1x100.png) 50% 50% repeat-x; - font-weight: normal; - color: #555555; -} -.ui-state-default a, -.ui-state-default a:link, -.ui-state-default a:visited { - color: #555555; - text-decoration: none; -} -.ui-state-hover, -.ui-widget-content .ui-state-hover, -.ui-widget-header .ui-state-hover, -.ui-state-focus, -.ui-widget-content .ui-state-focus, -.ui-widget-header .ui-state-focus { - border: 1px solid #999999; - background: #f39922 url(images/ui-bg_highlight-soft_75_f39922_1x100.png) 50% 50% repeat-x; - font-weight: normal; - color: #fff; -} -.ui-state-hover a, -.ui-state-hover a:hover, -.ui-state-hover a:link, -.ui-state-hover a:visited { - color: #fff; - text-decoration: none; -} -.ui-state-active, -.ui-widget-content .ui-state-active, -.ui-widget-header .ui-state-active { - border: 1px solid #aaaaaa; - background: #f39922 url(images/ui-bg_highlight-soft_65_f39922_1x100.png) 50% 50% repeat-x; - font-weight: normal; - color: #fff; -} -.ui-state-active a, -.ui-state-active a:link, -.ui-state-active a:visited { - color: #fff; - text-decoration: none; -} - -/* Interaction Cues -----------------------------------*/ -.ui-state-highlight, -.ui-widget-content .ui-state-highlight, -.ui-widget-header .ui-state-highlight { - border: 1px solid #fcefa1; - background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; - color: #363636; -} -.ui-state-highlight a, -.ui-widget-content .ui-state-highlight a, -.ui-widget-header .ui-state-highlight a { - color: #363636; -} -.ui-state-error, -.ui-widget-content .ui-state-error, -.ui-widget-header .ui-state-error { - border: 1px solid #cd0a0a; - background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; - color: #cd0a0a; -} -.ui-state-error a, -.ui-widget-content .ui-state-error a, -.ui-widget-header .ui-state-error a { - color: #cd0a0a; -} -.ui-state-error-text, -.ui-widget-content .ui-state-error-text, -.ui-widget-header .ui-state-error-text { - color: #cd0a0a; -} -.ui-priority-primary, -.ui-widget-content .ui-priority-primary, -.ui-widget-header .ui-priority-primary { - font-weight: bold; -} -.ui-priority-secondary, -.ui-widget-content .ui-priority-secondary, -.ui-widget-header .ui-priority-secondary { - opacity: .7; - filter:Alpha(Opacity=70); - font-weight: normal; -} -.ui-state-disabled, -.ui-widget-content .ui-state-disabled, -.ui-widget-header .ui-state-disabled { - opacity: .35; - filter:Alpha(Opacity=35); - background-image: none; -} -.ui-state-disabled .ui-icon { - filter:Alpha(Opacity=35); /* For IE8 - See #6059 */ -} - -/* Icons -----------------------------------*/ - -/* states and images */ -.ui-icon { - width: 16px; - height: 16px; -} -.ui-icon, -.ui-widget-content .ui-icon { - background-image: url(images/ui-icons_333333_256x240.png); -} -.ui-widget-header .ui-icon { - background-image: url(images/ui-icons_FFF_256x240.png); -} -.ui-state-default .ui-icon { - background-image: url(images/ui-icons_888888_256x240.png); -} -.ui-state-hover .ui-icon, -.ui-state-focus .ui-icon { - background-image: url(images/ui-icons_454545_256x240.png); -} -.ui-state-active .ui-icon { - background-image: url(images/ui-icons_fff_256x240.png); -} -.ui-state-highlight .ui-icon { - background-image: url(images/ui-icons_2e83ff_256x240.png); -} -.ui-state-error .ui-icon, -.ui-state-error-text .ui-icon { - background-image: url(images/ui-icons_cd0a0a_256x240.png); -} - -/* positioning */ -.ui-icon-blank { background-position: 16px 16px; } -.ui-icon-carat-1-n { background-position: 0 0; } -.ui-icon-carat-1-ne { background-position: -16px 0; } -.ui-icon-carat-1-e { background-position: -32px 0; } -.ui-icon-carat-1-se { background-position: -48px 0; } -.ui-icon-carat-1-s { background-position: -64px 0; } -.ui-icon-carat-1-sw { background-position: -80px 0; } -.ui-icon-carat-1-w { background-position: -96px 0; } -.ui-icon-carat-1-nw { background-position: -112px 0; } -.ui-icon-carat-2-n-s { background-position: -128px 0; } -.ui-icon-carat-2-e-w { background-position: -144px 0; } -.ui-icon-triangle-1-n { background-position: 0 -16px; } -.ui-icon-triangle-1-ne { background-position: -16px -16px; } -.ui-icon-triangle-1-e { background-position: -32px -16px; } -.ui-icon-triangle-1-se { background-position: -48px -16px; } -.ui-icon-triangle-1-s { background-position: -64px -16px; } -.ui-icon-triangle-1-sw { background-position: -80px -16px; } -.ui-icon-triangle-1-w { background-position: -96px -16px; } -.ui-icon-triangle-1-nw { background-position: -112px -16px; } -.ui-icon-triangle-2-n-s { background-position: -128px -16px; } -.ui-icon-triangle-2-e-w { background-position: -144px -16px; } -.ui-icon-arrow-1-n { background-position: 0 -32px; } -.ui-icon-arrow-1-ne { background-position: -16px -32px; } -.ui-icon-arrow-1-e { background-position: -32px -32px; } -.ui-icon-arrow-1-se { background-position: -48px -32px; } -.ui-icon-arrow-1-s { background-position: -64px -32px; } -.ui-icon-arrow-1-sw { background-position: -80px -32px; } -.ui-icon-arrow-1-w { background-position: -96px -32px; } -.ui-icon-arrow-1-nw { background-position: -112px -32px; } -.ui-icon-arrow-2-n-s { background-position: -128px -32px; } -.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; } -.ui-icon-arrow-2-e-w { background-position: -160px -32px; } -.ui-icon-arrow-2-se-nw { background-position: -176px -32px; } -.ui-icon-arrowstop-1-n { background-position: -192px -32px; } -.ui-icon-arrowstop-1-e { background-position: -208px -32px; } -.ui-icon-arrowstop-1-s { background-position: -224px -32px; } -.ui-icon-arrowstop-1-w { background-position: -240px -32px; } -.ui-icon-arrowthick-1-n { background-position: 0 -48px; } -.ui-icon-arrowthick-1-ne { background-position: -16px -48px; } -.ui-icon-arrowthick-1-e { background-position: -32px -48px; } -.ui-icon-arrowthick-1-se { background-position: -48px -48px; } -.ui-icon-arrowthick-1-s { background-position: -64px -48px; } -.ui-icon-arrowthick-1-sw { background-position: -80px -48px; } -.ui-icon-arrowthick-1-w { background-position: -96px -48px; } -.ui-icon-arrowthick-1-nw { background-position: -112px -48px; } -.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; } -.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; } -.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; } -.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; } -.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; } -.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; } -.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; } -.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; } -.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; } -.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; } -.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; } -.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; } -.ui-icon-arrowreturn-1-w { background-position: -64px -64px; } -.ui-icon-arrowreturn-1-n { background-position: -80px -64px; } -.ui-icon-arrowreturn-1-e { background-position: -96px -64px; } -.ui-icon-arrowreturn-1-s { background-position: -112px -64px; } -.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; } -.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; } -.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; } -.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; } -.ui-icon-arrow-4 { background-position: 0 -80px; } -.ui-icon-arrow-4-diag { background-position: -16px -80px; } -.ui-icon-extlink { background-position: -32px -80px; } -.ui-icon-newwin { background-position: -48px -80px; } -.ui-icon-refresh { background-position: -64px -80px; } -.ui-icon-shuffle { background-position: -80px -80px; } -.ui-icon-transfer-e-w { background-position: -96px -80px; } -.ui-icon-transferthick-e-w { background-position: -112px -80px; } -.ui-icon-folder-collapsed { background-position: 0 -96px; } -.ui-icon-folder-open { background-position: -16px -96px; } -.ui-icon-document { background-position: -32px -96px; } -.ui-icon-document-b { background-position: -48px -96px; } -.ui-icon-note { background-position: -64px -96px; } -.ui-icon-mail-closed { background-position: -80px -96px; } -.ui-icon-mail-open { background-position: -96px -96px; } -.ui-icon-suitcase { background-position: -112px -96px; } -.ui-icon-comment { background-position: -128px -96px; } -.ui-icon-person { background-position: -144px -96px; } -.ui-icon-print { background-position: -160px -96px; } -.ui-icon-trash { background-position: -176px -96px; } -.ui-icon-locked { background-position: -192px -96px; } -.ui-icon-unlocked { background-position: -208px -96px; } -.ui-icon-bookmark { background-position: -224px -96px; } -.ui-icon-tag { background-position: -240px -96px; } -.ui-icon-home { background-position: 0 -112px; } -.ui-icon-flag { background-position: -16px -112px; } -.ui-icon-calendar { background-position: -32px -112px; } -.ui-icon-cart { background-position: -48px -112px; } -.ui-icon-pencil { background-position: -64px -112px; } -.ui-icon-clock { background-position: -80px -112px; } -.ui-icon-disk { background-position: -96px -112px; } -.ui-icon-calculator { background-position: -112px -112px; } -.ui-icon-zoomin { background-position: -128px -112px; } -.ui-icon-zoomout { background-position: -144px -112px; } -.ui-icon-search { background-position: -160px -112px; } -.ui-icon-wrench { background-position: -176px -112px; } -.ui-icon-gear { background-position: -192px -112px; } -.ui-icon-heart { background-position: -208px -112px; } -.ui-icon-star { background-position: -224px -112px; } -.ui-icon-link { background-position: -240px -112px; } -.ui-icon-cancel { background-position: 0 -128px; } -.ui-icon-plus { background-position: -16px -128px; } -.ui-icon-plusthick { background-position: -32px -128px; } -.ui-icon-minus { background-position: -48px -128px; } -.ui-icon-minusthick { background-position: -64px -128px; } -.ui-icon-close { background-position: -80px -128px; } -.ui-icon-closethick { background-position: -96px -128px; } -.ui-icon-key { background-position: -112px -128px; } -.ui-icon-lightbulb { background-position: -128px -128px; } -.ui-icon-scissors { background-position: -144px -128px; } -.ui-icon-clipboard { background-position: -160px -128px; } -.ui-icon-copy { background-position: -176px -128px; } -.ui-icon-contact { background-position: -192px -128px; } -.ui-icon-image { background-position: -208px -128px; } -.ui-icon-video { background-position: -224px -128px; } -.ui-icon-script { background-position: -240px -128px; } -.ui-icon-alert { background-position: 0 -144px; } -.ui-icon-info { background-position: -16px -144px; } -.ui-icon-notice { background-position: -32px -144px; } -.ui-icon-help { background-position: -48px -144px; } -.ui-icon-check { background-position: -64px -144px; } -.ui-icon-bullet { background-position: -80px -144px; } -.ui-icon-radio-on { background-position: -96px -144px; } -.ui-icon-radio-off { background-position: -112px -144px; } -.ui-icon-pin-w { background-position: -128px -144px; } -.ui-icon-pin-s { background-position: -144px -144px; } -.ui-icon-play { background-position: 0 -160px; } -.ui-icon-pause { background-position: -16px -160px; } -.ui-icon-seek-next { background-position: -32px -160px; } -.ui-icon-seek-prev { background-position: -48px -160px; } -.ui-icon-seek-end { background-position: -64px -160px; } -.ui-icon-seek-start { background-position: -80px -160px; } -/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */ -.ui-icon-seek-first { background-position: -80px -160px; } -.ui-icon-stop { background-position: -96px -160px; } -.ui-icon-eject { background-position: -112px -160px; } -.ui-icon-volume-off { background-position: -128px -160px; } -.ui-icon-volume-on { background-position: -144px -160px; } -.ui-icon-power { background-position: 0 -176px; } -.ui-icon-signal-diag { background-position: -16px -176px; } -.ui-icon-signal { background-position: -32px -176px; } -.ui-icon-battery-0 { background-position: -48px -176px; } -.ui-icon-battery-1 { background-position: -64px -176px; } -.ui-icon-battery-2 { background-position: -80px -176px; } -.ui-icon-battery-3 { background-position: -96px -176px; } -.ui-icon-circle-plus { background-position: 0 -192px; } -.ui-icon-circle-minus { background-position: -16px -192px; } -.ui-icon-circle-close { background-position: -32px -192px; } -.ui-icon-circle-triangle-e { background-position: -48px -192px; } -.ui-icon-circle-triangle-s { background-position: -64px -192px; } -.ui-icon-circle-triangle-w { background-position: -80px -192px; } -.ui-icon-circle-triangle-n { background-position: -96px -192px; } -.ui-icon-circle-arrow-e { background-position: -112px -192px; } -.ui-icon-circle-arrow-s { background-position: -128px -192px; } -.ui-icon-circle-arrow-w { background-position: -144px -192px; } -.ui-icon-circle-arrow-n { background-position: -160px -192px; } -.ui-icon-circle-zoomin { background-position: -176px -192px; } -.ui-icon-circle-zoomout { background-position: -192px -192px; } -.ui-icon-circle-check { background-position: -208px -192px; } -.ui-icon-circlesmall-plus { background-position: 0 -208px; } -.ui-icon-circlesmall-minus { background-position: -16px -208px; } -.ui-icon-circlesmall-close { background-position: -32px -208px; } -.ui-icon-squaresmall-plus { background-position: -48px -208px; } -.ui-icon-squaresmall-minus { background-position: -64px -208px; } -.ui-icon-squaresmall-close { background-position: -80px -208px; } -.ui-icon-grip-dotted-vertical { background-position: 0 -224px; } -.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; } -.ui-icon-grip-solid-vertical { background-position: -32px -224px; } -.ui-icon-grip-solid-horizontal { background-position: -48px -224px; } -.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; } -.ui-icon-grip-diagonal-se { background-position: -80px -224px; } - - -/* Misc visuals -----------------------------------*/ - -/* Corner radius */ -.ui-corner-all, -.ui-corner-top, -.ui-corner-left, -.ui-corner-tl { - border-top-left-radius: 4px; -} -.ui-corner-all, -.ui-corner-top, -.ui-corner-right, -.ui-corner-tr { - border-top-right-radius: 4px; -} -.ui-corner-all, -.ui-corner-bottom, -.ui-corner-left, -.ui-corner-bl { - border-bottom-left-radius: 4px; -} -.ui-corner-all, -.ui-corner-bottom, -.ui-corner-right, -.ui-corner-br { - border-bottom-right-radius: 4px; -} - -/* Overlays */ -.ui-widget-overlay { - background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; - opacity: .3; - filter: Alpha(Opacity=30); -} -.ui-widget-shadow { - margin: -8px 0 0 -8px; - padding: 8px; - background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; - opacity: .3; - filter: Alpha(Opacity=30); - border-radius: 8px; -} diff --git a/templates/admin/default/assets/js/main.js b/templates/admin/default/assets/js/main.js index ad99d87af..c8fc1a7b7 100644 --- a/templates/admin/default/assets/js/main.js +++ b/templates/admin/default/assets/js/main.js @@ -4,16 +4,16 @@ // -- Init datepicker -- if($('.date').length){ - $('.date').datepicker(); + //$('.date').datepicker(); } // -- Init tablesorter -- - if($('.tablesorter').length){ + /*if($('.tablesorter').length){ $('.tablesorter').tablesorter({ widgets: ["filter", "stickyHeaders"], widthFixed : false, widgetOptions : { - filter_cssFilter : 'input-medium', + filter_cssFilter : 'input-medium form-control', filter_formatter : { 2 : function($cell, indx){ @@ -38,7 +38,7 @@ } } }); - } + }*/ // -- Effect description if($('[name=effect]').length){ diff --git a/templates/admin/default/coupon-list.html b/templates/admin/default/coupon-list.html index 89ea84e5a..331b97231 100755 --- a/templates/admin/default/coupon-list.html +++ b/templates/admin/default/coupon-list.html @@ -15,8 +15,8 @@

    Coupons : List of coupons

    -
    -
    +
    +
    @@ -47,8 +47,8 @@ @@ -57,8 +57,8 @@ @@ -67,8 +67,8 @@ @@ -76,8 +76,8 @@ -
    -
    +
    +
    List of enabled coupons @@ -37,8 +37,8 @@
    18/10/2013 49 - Edit - Disable + Edit + Disable
    05/09/2013 20 - Edit - Disable + Edit + Disable
    03/12/2013 9 - Edit - Disable + Edit + Disable
    25/01/2013 4 - Edit - Disable + Edit + Disable
    @@ -108,8 +108,8 @@ @@ -118,8 +118,8 @@ @@ -128,8 +128,8 @@ @@ -138,41 +138,36 @@ -{/block} {include file='includes/confirmation-modal.html' id="disable" message="{intl l='Do you really want to disable this element ?'}"} {include file='includes/confirmation-modal.html' id="enable" message="{intl l='Do you really want to enable this element ?'}"} +{/block} + + {block name="javascript-initialization"} - {include file='includes/js.inc.html'} - - {stylesheets file='../assets/css/jqueryui/custom-theme/*' filters='less,cssembed'} - - {/stylesheets} - - - - {javascripts file='../assets/bootstrap-editable/js/bootstrap-editable.js'} + + {javascripts file='assets/bootstrap-editable/js/bootstrap-editable.js'} {/javascripts} - {javascripts file='../assets/js/tablesorter/jquery.tablesorter.min.js'} + {javascripts file='assets/js/tablesorter/jquery.tablesorter.min.js'} {/javascripts} - {javascripts file='../assets/js/tablesorter/jquery.metadata.js'} + {javascripts file='assets/js/tablesorter/jquery.metadata.js'} {/javascripts} - {javascripts file='../assets/js/tablesorter/jquery.tablesorter.widgets.js'} + {javascripts file='assets/js/tablesorter/jquery.tablesorter.widgets.js'} {/javascripts} - {javascripts file='../assets/js/tablesorter/jquery.tablesorter.widgets-filter-formatter.js'} + {javascripts file='assets/js/tablesorter/jquery.tablesorter.widgets-filter-formatter.js'} {/javascripts} - {javascripts file='../assets/js/main.js'} + {javascripts file='assets/js/main.js'} {/javascripts} {/block} diff --git a/templates/admin/default/includes/confirmation-modal.html b/templates/admin/default/includes/confirmation-modal.html index 45ae030c8..957960416 100644 --- a/templates/admin/default/includes/confirmation-modal.html +++ b/templates/admin/default/includes/confirmation-modal.html @@ -5,28 +5,32 @@ - message : modal message (default Do you really want to delete this element ?) *} {block name="confirmation-modal"} - @@ -111,9 +111,10 @@ -{/block} -{include file='includes/confirmation-modal.html'} +{include file='includes/confirmation-modal.html' id="enable" message="{intl l='Do you really want to enable this element ?'}"} + +{/block} {block name="javascript-initialization"} {javascripts file='assets/js/main.js'} From f399b1de2e02715d88232e1e2e04cb7e2b3e66bd Mon Sep 17 00:00:00 2001 From: gmorel Date: Wed, 4 Sep 2013 18:04:23 +0200 Subject: [PATCH 061/125] Working - Render form now can render CheckBox --- .../Core/Template/Smarty/Plugins/Form.php | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php index 554d3f9de..4d63ccdc2 100755 --- a/core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php +++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php @@ -120,8 +120,15 @@ class Form extends AbstractSmartyPlugin $formFieldView = $this->getFormFieldView($params); $template->assign("options", $formFieldView->vars); + $template->assign("name", $formFieldView->vars["full_name"]); $template->assign("value", $formFieldView->vars["value"]); + + // If Checkbox input type + if ($formFieldView->vars['checked'] !== null) { + $this->renderFormFieldCheckBox($template, $formFieldView); + } + $template->assign("label", $formFieldView->vars["label"]); $errors = $formFieldView->vars["errors"]; @@ -265,4 +272,17 @@ class Form extends AbstractSmartyPlugin new SmartyPluginDescriptor("block", "form_error", $this, "formError") ); } + + /** + * @param \Smarty_Internal_Template $template + * @param $formFieldView + */ + public function renderFormFieldCheckBox(\Smarty_Internal_Template $template, $formFieldView) + { + $template->assign("value", 0); + if ($formFieldView->vars['checked']) { + $template->assign("value", 1); + } + $template->assign("value", $formFieldView->vars['checked']); + } } From 910477f3713359346037cbe279734445b6305bd4 Mon Sep 17 00:00:00 2001 From: mespeche Date: Wed, 4 Sep 2013 18:08:13 +0200 Subject: [PATCH 062/125] Working : Migration form to bootstrap3 --- templates/admin/default/assets/less/main.less | 3 +- .../default/assets/less/thelia/variables.less | 7 +- templates/admin/default/coupon-create.html | 2 +- templates/admin/default/coupon/form.html | 212 +++++++++--------- 4 files changed, 120 insertions(+), 104 deletions(-) diff --git a/templates/admin/default/assets/less/main.less b/templates/admin/default/assets/less/main.less index 7ad14e013..3498441a2 100644 --- a/templates/admin/default/assets/less/main.less +++ b/templates/admin/default/assets/less/main.less @@ -2,5 +2,4 @@ @import "bootstrap/bootstrap.less"; /* Thelia Admin */ -@import "thelia/thelia.less"; -// @import "thelia/responsive.less"; \ No newline at end of file +@import "thelia/thelia.less"; \ No newline at end of file diff --git a/templates/admin/default/assets/less/thelia/variables.less b/templates/admin/default/assets/less/thelia/variables.less index dec523afc..159d76b37 100755 --- a/templates/admin/default/assets/less/thelia/variables.less +++ b/templates/admin/default/assets/less/thelia/variables.less @@ -44,4 +44,9 @@ // Used for a bird's eye view of components dependent on the z-axis // Try to avoid customizing these :) -@zindex-dropdown: 1005; \ No newline at end of file +@zindex-dropdown: 1005; + +// Forms +// ------------------------- + +@input-border-focus: @brand-primary; \ No newline at end of file diff --git a/templates/admin/default/coupon-create.html b/templates/admin/default/coupon-create.html index 6f7126e6d..7cb31ee09 100755 --- a/templates/admin/default/coupon-create.html +++ b/templates/admin/default/coupon-create.html @@ -20,9 +20,9 @@ {/form} -{/block} {include file='includes/confirmation-modal.html'} +{/block} {block name="javascript-initialization"} {javascripts file='assets/bootstrap-datepicker/js/bootstrap-datepicker.js'} diff --git a/templates/admin/default/coupon/form.html b/templates/admin/default/coupon/form.html index b715cd741..567d95f76 100644 --- a/templates/admin/default/coupon/form.html +++ b/templates/admin/default/coupon/form.html @@ -1,8 +1,8 @@ {$thelia_page_css_file = "assets/bootstrap-editable/css/bootstrap-editable.css"} {include file='includes/notifications.html' message=$general_error}
    -
    -
    +
    +
    {form_hidden_fields form=$form} @@ -10,24 +10,24 @@ {/form_field} -
    -
    +
    +
    {form_field form=$form field='code'} - + {if $error}{$message}{/if} {/form_field}
    -
    +
    {form_field form=$form field='title'} - + {if $error}{$message}{/if} {/form_field}
    -
    +
    -
    +
    -
    +
    -
    +
    -
    +
    {form_field form=$form field='expirationDate'} - + {if $error}{$message}{/if} {/form_field}
    -
    +
    {form_field form=$form field='maxUsage'} - + {if $error}{$message}{/if} {/form_field}
    -
    +
    -
    -
    +
    +
    {form_field form=$form field='effect'} - @@ -109,18 +109,18 @@
    -
    -
    +
    +
    {form_field form=$form field='amount'} - + {if $error}{$message}{/if} {/form_field}
    -
    +
    {*form_field form=$form field='category'*} - @@ -131,37 +131,39 @@
    -
    +
    {form_field form=$form field='shortDescription'} - + {if $error}{$message}{/if} {/form_field}
    - +
    +
    -
    - - {form_field form=$form field='description'} - - {if $error}{$message}{/if} - {/form_field} +
    + + {form_field form=$form field='description'} + + {if $error}{$message}{/if} + {/form_field} +
    + +
    - -
    -
    -
    +
    +
    List of disabled coupons @@ -98,8 +98,8 @@
    18/10/2013 49 - Edit - Enabled + Edit + Enabled
    05/09/2013 49 - Edit - Enabled + Edit + Enabled
    03/12/2013 49 - Edit - Enabled + Edit + Enabled
    25/01/2013 49 - Edit - Enabled + Edit + Enabled
    Conditions of application -
      +
      • Total cart supperior to 400 €
      • OR
      • At least 4 products
        • @@ -101,8 +101,8 @@
    Actions - Edit - Enabled + Edit + Enabled
    @@ -178,8 +180,8 @@ @@ -187,8 +189,8 @@ @@ -196,8 +198,8 @@ @@ -205,10 +207,10 @@ -
    -
    +
    +
    -
    +
    -
    +
    - - -
    -
    +
    -
    - -
    - € - - +
    +
    + +
    +
    + + € +
    +
    + + + +
    +
    + +
    +
    + +
    -
    - -
    - - - +
    +
    + +
    +
    +
    - - -
    - - - -
    Rules - - + +
    is superior or equals to 300 € - Edit - Delete + Edit + Delete
    is equals to 12 - Chaussettes rouges - Edit - Delete + Edit + Delete
    is inferior or equals to 12/02/2014 - Edit - Delete + Edit + Delete
    - - - - - - - - - -
    Categories list
    +
    +
    + + + + + + + + + + +
    Categories list
    +
    From 23a4ff26c8324d15fec0ab8113066b2ece651162 Mon Sep 17 00:00:00 2001 From: gmorel Date: Wed, 4 Sep 2013 19:22:20 +0200 Subject: [PATCH 063/125] Working - Base create/update coupon in backoffice --- core/lib/Thelia/Action/Coupon.php | 2 +- core/lib/Thelia/Config/Resources/action.xml | 5 + .../Thelia/Config/Resources/routing/admin.xml | 4 +- .../Controller/Admin/CouponController.php | 238 ++++++++++++------ .../Coupon/CouponCreateOrUpdateEvent.php | 31 ++- core/lib/Thelia/Model/Coupon.php | 11 +- .../{coupon-edit.html => coupon-update.html} | 8 +- templates/admin/default/coupon/form.html | 35 +-- 8 files changed, 226 insertions(+), 108 deletions(-) rename templates/admin/default/{coupon-edit.html => coupon-update.html} (80%) diff --git a/core/lib/Thelia/Action/Coupon.php b/core/lib/Thelia/Action/Coupon.php index 08db66dda..57e019888 100755 --- a/core/lib/Thelia/Action/Coupon.php +++ b/core/lib/Thelia/Action/Coupon.php @@ -92,7 +92,7 @@ class Coupon extends BaseAction implements EventSubscriberInterface $event->isCumulative(), $event->getMaxUsage(), $event->getRules(), - $event->getLang() + $event->getLocale() ); $event->setCoupon($coupon); diff --git a/core/lib/Thelia/Config/Resources/action.xml b/core/lib/Thelia/Config/Resources/action.xml index 7eea2e005..66c189ec6 100755 --- a/core/lib/Thelia/Config/Resources/action.xml +++ b/core/lib/Thelia/Config/Resources/action.xml @@ -42,6 +42,11 @@ + + + + + diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml index 0058ee5f8..e32865f15 100755 --- a/core/lib/Thelia/Config/Resources/routing/admin.xml +++ b/core/lib/Thelia/Config/Resources/routing/admin.xml @@ -52,8 +52,8 @@ Thelia\Controller\Admin\CouponController::createAction - - Thelia\Controller\Admin\CouponController::editAction + + Thelia\Controller\Admin\CouponController::updateAction Thelia\Controller\Admin\CouponController::readAction diff --git a/core/lib/Thelia/Controller/Admin/CouponController.php b/core/lib/Thelia/Controller/Admin/CouponController.php index 7fd9783ba..1e093f89f 100755 --- a/core/lib/Thelia/Controller/Admin/CouponController.php +++ b/core/lib/Thelia/Controller/Admin/CouponController.php @@ -68,8 +68,6 @@ class CouponController extends BaseAdminController /** * Manage Coupons creation display * - * @param array $args GET arguments - * * @return \Symfony\Component\HttpFoundation\Response */ public function createAction() @@ -80,96 +78,106 @@ class CouponController extends BaseAdminController return $response; } - $message = false; + // Parameters given to the template + $args = array(); - // Create the form from the request - $creationForm = new CouponCreationForm($this->getRequest()); + $i18n = new I18n(); + /** @var Lang $lang */ + $lang = $this->getSession()->get('lang'); + $eventToDispatch = TheliaEvents::COUPON_CREATE; if ($this->getRequest()->isMethod('POST')) { - try { - // Check the form against constraints violations - $form = $this->validateForm($creationForm, 'POST'); - $i18n = new I18n(); - /** @var Lang $lang */ - $lang = $this->getSession()->get('lang'); - - // Get the form field values - $data = $form->getData(); - $couponEvent = new CouponCreateOrUpdateEvent( - $data['code'], - $data['title'], - $data['amount'], - $data['effect'], - $data['shortDescription'], - $data['description'], - $data['isEnabled'], - $i18n->getDateTimeFromForm($lang, $data['expirationDate']), - $data['isAvailableOnSpecialOffers'], - $data['isCumulative'], - $data['isRemovingPostage'], - $data['maxUsage'], - array(), - $data['locale'] - ); - - $this->dispatch( - TheliaEvents::COUPON_CREATE, - $couponEvent - ); - $this->adminLogAppend( - sprintf( - 'Coupon %s (ID ) created', - $couponEvent->getTitle() -// $couponEvent->getCoupon()->getId() - ) - ); - // @todo redirect if successful - } catch (FormValidationException $e) { - // Invalid data entered - $message = 'Please check your input:'; - $this->logError('creation', $message, $e); - - } catch (\Exception $e) { - // Any other error - $message = 'Sorry, an error occurred:'; - $this->logError('creation', $message, $e); - } - - if ($message !== false) { - // Mark the form as with error - $creationForm->setErrorMessage($message); - - // Send the form and the error to the parser - $this->getParserContext() - ->addForm($creationForm) - ->setGeneralError($message); - } + $this->validateCreateOrUpdateForm( + $i18n, + $lang, + $eventToDispatch, + 'created', + 'creation' + ); + } else { + // If no input for expirationDate, now + 2 months + $defaultDate = new \DateTime(); + $args['defaultDate'] = $defaultDate->modify('+2 month') + ->format($lang->getDateFormat()); } - $formAction = 'admin/coupon/create'; + $args['formAction'] = 'admin/coupon/create'; return $this->render( 'coupon-create', - array( - 'formAction' => $formAction - ) + $args ); } /** * Manage Coupons edition display * - * @param array $args GET arguments + * @param int $couponId Coupon id * * @return \Symfony\Component\HttpFoundation\Response */ - public function editAction($couponId) + public function updateAction($couponId) { - $this->checkAuth('ADMIN', 'admin.coupon.edit'); + // Check current user authorization + $response = $this->checkAuth('admin.coupon.update'); + if ($response !== null) { + return $response; + } - $formAction = 'admin/coupon/edit/' . $couponId; + /** @var Coupon $coupon */ + $coupon = CouponQuery::create()->findOneById($couponId); + if (!$coupon) { + $this->pageNotFound(); + } - return $this->render('coupon-edit', array('formAction' => $formAction)); + // Parameters given to the template + $args = array(); + + $i18n = new I18n(); + /** @var Lang $lang */ + $lang = $this->getSession()->get('lang'); + $eventToDispatch = TheliaEvents::COUPON_UPDATE; + + if ($this->getRequest()->isMethod('POST')) { + $this->validateCreateOrUpdateForm( + $i18n, + $lang, + $eventToDispatch, + 'updated', + 'update' + ); + } else { + // Prepare the data that will hydrate the form + $data = array( + 'code' => $coupon->getCode(), + 'title' => $coupon->getTitle(), + 'amount' => $coupon->getAmount(), + 'effect' => $coupon->getType(), + 'shortDescription' => $coupon->getShortDescription(), + 'description' => $coupon->getDescription(), + 'isEnabled' => ($coupon->getIsEnabled() == 1), + 'expirationDate' => $coupon->getExpirationDate($lang->getDateFormat()), + 'isAvailableOnSpecialOffers' => ($coupon->getIsAvailableOnSpecialOffers() == 1), + 'isCumulative' => ($coupon->getIsCumulative() == 1), + 'isRemovingPostage' => ($coupon->getIsRemovingPostage() == 1), + 'maxUsage' => $coupon->getMaxUsage(), + 'rules' => new CouponRuleCollection(array()), + 'locale' => $coupon->getLocale(), + ); + + // Setup the object form + $changeForm = new CouponCreationForm($this->getRequest(), 'form', $data); + + // Pass it to the parser + $this->getParserContext()->addForm($changeForm); + } + + $args['formAction'] = 'admin/coupon/update/' . $couponId; + + return $this->render( + 'coupon-update', + $args + ); } /** @@ -251,4 +259,90 @@ class CouponController extends BaseAdminController return $this; } + /** + * Validate the CreateOrUpdate form + * + * @param string $i18n Local code (fr_FR) + * @param Lang $lang Local variables container + * @param string $eventToDispatch Event which will activate actions + * @param string $log created|edited + * @param string $action creation|edition + * + * @return $this + */ + protected function validateCreateOrUpdateForm($i18n, $lang, $eventToDispatch, $log, $action) + { + // Create the form from the request + $creationForm = new CouponCreationForm($this->getRequest()); + + $message = false; + try { + // Check the form against constraints violations + $form = $this->validateForm($creationForm, 'POST'); + + // Get the form field values + $data = $form->getData(); + $couponEvent = new CouponCreateOrUpdateEvent( + $data['code'], + $data['title'], + $data['amount'], + $data['effect'], + $data['shortDescription'], + $data['description'], + $data['isEnabled'], + $i18n->getDateTimeFromForm($lang, $data['expirationDate']), + $data['isAvailableOnSpecialOffers'], + $data['isCumulative'], + $data['isRemovingPostage'], + $data['maxUsage'], + new CouponRuleCollection(array()), + $data['locale'] + ); + + // Dispatch Event to the Action + $this->dispatch( + $eventToDispatch, + $couponEvent + ); + + $this->adminLogAppend( + sprintf( + 'Coupon %s (ID ) ' . $log, + $couponEvent->getTitle(), + $couponEvent->getCoupon()->getId() + ) + ); + + $this->redirect( + str_replace( + '{id}', + $couponEvent->getCoupon()->getId(), + $creationForm->getSuccessUrl() + ) + ); + + } catch (FormValidationException $e) { + // Invalid data entered + $message = 'Please check your input:'; + $this->logError($action, $message, $e); + + } catch (\Exception $e) { + // Any other error + $message = 'Sorry, an error occurred:'; + $this->logError($action, $message, $e); + } + + if ($message !== false) { + // Mark the form as with error + $creationForm->setErrorMessage($message); + + // Send the form and the error to the parser + $this->getParserContext() + ->addForm($creationForm) + ->setGeneralError($message); + } + + return $this; + } + } diff --git a/core/lib/Thelia/Core/Event/Coupon/CouponCreateOrUpdateEvent.php b/core/lib/Thelia/Core/Event/Coupon/CouponCreateOrUpdateEvent.php index 90c5559d4..796baed08 100644 --- a/core/lib/Thelia/Core/Event/Coupon/CouponCreateOrUpdateEvent.php +++ b/core/lib/Thelia/Core/Event/Coupon/CouponCreateOrUpdateEvent.php @@ -22,7 +22,6 @@ /**********************************************************************************/ namespace Thelia\Core\Event\Coupon; -use Symfony\Component\EventDispatcher\Event; use Thelia\Core\Event\ActionEvent; use Thelia\Coupon\CouponRuleCollection; use Thelia\Model\Coupon; @@ -83,7 +82,7 @@ class CouponCreateOrUpdateEvent extends ActionEvent protected $effect; /** @var string Language code ISO (ex: fr_FR) */ - protected $lang = null; + protected $locale = null; /** * Constructor @@ -101,7 +100,7 @@ class CouponCreateOrUpdateEvent extends ActionEvent * @param boolean $isRemovingPostage Is removing Postage * @param int $maxUsage Coupon quantity * @param CouponRuleCollection $rules CouponRuleInterface to add - * @param string $lang Coupon Language code ISO (ex: fr_FR) + * @param string $locale Coupon Language code ISO (ex: fr_FR) */ function __construct( $code, @@ -117,7 +116,7 @@ class CouponCreateOrUpdateEvent extends ActionEvent $isRemovingPostage, $maxUsage, $rules, - $lang + $locale ) { $this->amount = $amount; $this->code = $code; @@ -132,7 +131,7 @@ class CouponCreateOrUpdateEvent extends ActionEvent $this->shortDescription = $shortDescription; $this->title = $title; $this->effect = $effect; - $this->lang = $lang; + $this->locale = $locale; } /** @@ -214,7 +213,13 @@ class CouponCreateOrUpdateEvent extends ActionEvent */ public function getRules() { - return clone $this->rules; + if ($this->rules === null || !is_object($this->rules)) { + $rules = $this->rules; + } else { + $rules = clone $this->rules; + } + + return $rules; } /** @@ -273,20 +278,28 @@ class CouponCreateOrUpdateEvent extends ActionEvent * * @return string */ - public function getLang() + public function getLocale() { - return $this->lang; + return $this->locale; } /** - * @param \Thelia\Model\Coupon $coupon + * Set Coupon Model + * + * @param \Thelia\Model\Coupon $coupon Coupon Model + * + * @return $this */ public function setCoupon($coupon) { $this->coupon = $coupon; + + return $this; } /** + * Return Coupon Model + * * @return \Thelia\Model\Coupon */ public function getCoupon() diff --git a/core/lib/Thelia/Model/Coupon.php b/core/lib/Thelia/Model/Coupon.php index 36f1ef8e1..03a59b8e9 100755 --- a/core/lib/Thelia/Model/Coupon.php +++ b/core/lib/Thelia/Model/Coupon.php @@ -44,6 +44,9 @@ use Thelia\Model\Map\CouponTableMap; class Coupon extends BaseCoupon { + use \Thelia\Model\Tools\ModelEventDispatcherTrait; + + /** * Constructor * @@ -60,9 +63,9 @@ class Coupon extends BaseCoupon * @param boolean $isRemovingPostage Is removing Postage * @param int $maxUsage Coupon quantity * @param CouponRuleCollection $rules CouponRuleInterface to add - * @param string $lang Coupon Language code ISO (ex: fr_FR) + * @param string $locale Coupon Language code ISO (ex: fr_FR) */ - function createOrUpdate($code, $title, $amount, $effect, $shortDescription, $description, $isEnabled, $expirationDate, $isAvailableOnSpecialOffers, $isCumulative, $maxUsage, $rules, $lang = null) + function createOrUpdate($code, $title, $amount, $effect, $shortDescription, $description, $isEnabled, $expirationDate, $isAvailableOnSpecialOffers, $isCumulative, $maxUsage, $rules, $locale = null) { $this->setCode($code) ->setTitle($title) @@ -79,8 +82,8 @@ class Coupon extends BaseCoupon ->setRules($rules); // Set object language (i18n) - if (!is_null($lang)) { - $this->setLang($lang); + if (!is_null($locale)) { + $this->setLocale($locale); } $con = Propel::getWriteConnection(CouponTableMap::DATABASE_NAME); diff --git a/templates/admin/default/coupon-edit.html b/templates/admin/default/coupon-update.html similarity index 80% rename from templates/admin/default/coupon-edit.html rename to templates/admin/default/coupon-update.html index d881487ec..fed274f14 100755 --- a/templates/admin/default/coupon-edit.html +++ b/templates/admin/default/coupon-update.html @@ -1,6 +1,6 @@ {extends file="admin-layout.tpl"} -{block name="check-permissions"}admin.coupon.edit{/block} -{block name="page-title"}{intl l='Edit coupon'}{/block} +{block name="check-permissions"}admin.coupon.update{/block} +{block name="page-title"}{intl l='Update coupon'}{/block} {block name="main-content"}
    @@ -12,10 +12,10 @@
    -

    Coupons : Add a coupon

    +

    Coupons : Update a coupon

    - {form name="thelia.admin.coupon.edit"} + {form name="thelia.admin.coupon.creation"} {include file='coupon/form.html' formAction={url path={$formAction}} form=$form} {/form} diff --git a/templates/admin/default/coupon/form.html b/templates/admin/default/coupon/form.html index b715cd741..a6131922b 100644 --- a/templates/admin/default/coupon/form.html +++ b/templates/admin/default/coupon/form.html @@ -10,6 +10,10 @@ {/form_field} + {form_field form=$form field='success_url'} + + {/form_field} +
    @@ -30,9 +34,8 @@
    @@ -41,7 +44,7 @@
    - +
    {form_field form=$form field='expirationDate'} @@ -85,13 +85,13 @@
    - + {form_field form=$form field='maxUsage'} - + {if $error}{$message}{/if} {/form_field}
    @@ -101,7 +101,7 @@
    - + {form_field form=$form field='effect'} + {if $error}{$message}{/if} {/form_field}
    @@ -137,9 +137,9 @@
    - + {form_field form=$form field='shortDescription'} - + {if $error}{$message}{/if} {/form_field}
    @@ -149,14 +149,14 @@
    - + {form_field form=$form field='description'} - + {if $error}{$message}{/if} {/form_field}
    - +
    @@ -166,47 +166,27 @@
    - - - - + + - - - - - - - - - - - - - - - - - - + {foreach from=$rulesObject item=rule} + + + + + {/foreach}
    - Rules - + {intl l='Rules'} +
    ConditionsOperatorValueActions{intl l='Conditions'}{intl l='Actions'}
    Total Amountis superior or equals to300 € - Edit - Delete -
    AND NbArticleFromCategoryis equals to12 - Chaussettes rouges - Edit - Delete -
    OR Dateis inferior or equals to12/02/2014 - Edit - Delete -
    {$rule.tooltip} + {intl l='Edit'} + {intl l='Delete'} +
    @@ -216,17 +196,17 @@
    - +
    - + From 1686d6d87c5c2c28dd3fef63bd0df80336c52e67 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Fri, 6 Sep 2013 11:43:37 +0200 Subject: [PATCH 066/125] each module is available in the container with name module.ModuleName --- core/lib/Thelia/Core/Thelia.php | 12 ++++++ core/lib/Thelia/Module/BaseModule.php | 4 +- .../lib/Thelia/Module/BaseModuleInterface.php | 37 +++++++++++++++++++ .../Thelia/Module/DeliveryModuleInterface.php | 36 ++++++++++++++++++ install/insert.sql | 2 - 5 files changed, 88 insertions(+), 3 deletions(-) create mode 100644 core/lib/Thelia/Module/BaseModuleInterface.php create mode 100644 core/lib/Thelia/Module/DeliveryModuleInterface.php diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php index b28b23156..8c4dd68e0 100755 --- a/core/lib/Thelia/Core/Thelia.php +++ b/core/lib/Thelia/Core/Thelia.php @@ -33,8 +33,10 @@ namespace Thelia\Core; */ use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\Definition; use Symfony\Component\HttpKernel\Kernel; use Symfony\Component\Config\Loader\LoaderInterface; +use Symfony\Component\Validator\Tests\Fixtures\Reference; use Symfony\Component\Yaml\Yaml; use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag; @@ -107,6 +109,16 @@ class Thelia extends Kernel foreach ($modules as $module) { try { + + $defintion = new Definition(); + $defintion->setClass($module->getCode() ."\\". ucfirst($module->getCode())); + $defintion->addMethodCall("setContainer", array('service_container')); + + $container->setDefinition( + "module.".$module->getCode(), + $defintion + ); + $loader = new XmlFileLoader($container, new FileLocator(THELIA_MODULE_DIR . "/" . ucfirst($module->getCode()) . "/Config")); $loader->load("config.xml"); } catch (\InvalidArgumentException $e) { diff --git a/core/lib/Thelia/Module/BaseModule.php b/core/lib/Thelia/Module/BaseModule.php index 07cc1d116..89725e33b 100755 --- a/core/lib/Thelia/Module/BaseModule.php +++ b/core/lib/Thelia/Module/BaseModule.php @@ -24,7 +24,9 @@ namespace Thelia\Module; -abstract class BaseModule +use Symfony\Component\DependencyInjection\ContainerAware; + +abstract class BaseModule extends ContainerAware { public function __construct() diff --git a/core/lib/Thelia/Module/BaseModuleInterface.php b/core/lib/Thelia/Module/BaseModuleInterface.php new file mode 100644 index 000000000..2db450830 --- /dev/null +++ b/core/lib/Thelia/Module/BaseModuleInterface.php @@ -0,0 +1,37 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Module; + + +use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Component\HttpFoundation\Request; + +interface BaseModuleInterface { + + public function setRequest(Request $request); + public function getRequest(); + + public function setDispatcher(EventDispatcherInterface $dispatcher); + public function getDispatcher(); +} \ No newline at end of file diff --git a/core/lib/Thelia/Module/DeliveryModuleInterface.php b/core/lib/Thelia/Module/DeliveryModuleInterface.php new file mode 100644 index 000000000..2ef593ee5 --- /dev/null +++ b/core/lib/Thelia/Module/DeliveryModuleInterface.php @@ -0,0 +1,36 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Module; + + +interface DeliveryModuleInterface extends BaseModuleInterface { + + /** + * + * calculate and return delivery price + * + * @return mixed + */ + public function calculate(); +} \ No newline at end of file diff --git a/install/insert.sql b/install/insert.sql index a2e5868e4..f4fe74d4e 100755 --- a/install/insert.sql +++ b/install/insert.sql @@ -17,8 +17,6 @@ INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updat ('currency_rate_update_url', 'http://www.ecb.int/stats/eurofxref/eurofxref-daily.xml', 0, 0, NOW(), NOW()), ('page_not_found_view', '404.html', 0, 0, NOW(), NOW()); -INSERT INTO `module` (`code`, `type`, `activate`, `position`, `created_at`, `updated_at`) VALUES ('test', '1', '1', '1', NOW(), NOW()); - INSERT INTO `customer_title`(`id`, `by_default`, `position`, `created_at`, `updated_at`) VALUES (1, 1, 1, NOW(), NOW()), (2, 0, 2, NOW(), NOW()), From 8a5e12f8146283fb8ae460be15c1297c6f1d014f Mon Sep 17 00:00:00 2001 From: gmorel Date: Fri, 6 Sep 2013 11:47:00 +0200 Subject: [PATCH 067/125] WIP - Add Coupon, Rules, CouponManager, Adapter as Services - Refactor Coupon to use these services --- core/lib/Thelia/Config/Resources/config.xml | 3 + .../Thelia/Constraint/ConstraintManager.php | 69 +++++++++++++++++-- .../Rule/AvailableForTotalAmount.php | 41 +---------- .../Constraint/Rule/AvailableForXArticles.php | 38 +--------- .../Constraint/Rule/CouponRuleAbstract.php | 36 +++++----- .../Constraint/Rule/CouponRuleInterface.php | 7 ++ .../Constraint/Rule/SerializableRule.php | 2 +- core/lib/Thelia/Coupon/CouponFactory.php | 2 +- core/lib/Thelia/Coupon/CouponManager.php | 2 +- .../Thelia/Coupon/CouponRuleCollection.php | 17 ++--- core/lib/Thelia/Model/Coupon.php | 60 ++++++++-------- .../Constraint/ConstraintManagerTest.php | 62 ++++++++++++++++- 12 files changed, 190 insertions(+), 149 deletions(-) diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml index 08575590f..e94fbf1fe 100755 --- a/core/lib/Thelia/Config/Resources/config.xml +++ b/core/lib/Thelia/Config/Resources/config.xml @@ -206,6 +206,9 @@ + + + diff --git a/core/lib/Thelia/Constraint/ConstraintManager.php b/core/lib/Thelia/Constraint/ConstraintManager.php index 6cbcbb1be..28073abaa 100644 --- a/core/lib/Thelia/Constraint/ConstraintManager.php +++ b/core/lib/Thelia/Constraint/ConstraintManager.php @@ -23,6 +23,9 @@ namespace Thelia\Constraint; +use Symfony\Component\DependencyInjection\ContainerInterface; +use Thelia\Constraint\Rule\CouponRuleInterface; +use Thelia\Constraint\Rule\SerializableRule; use Thelia\Coupon\CouponAdapterInterface; use Thelia\Coupon\CouponRuleCollection; @@ -40,6 +43,9 @@ use Thelia\Coupon\CouponRuleCollection; */ class ConstraintManager { + /** @var ContainerInterface Service Container */ + protected $container = null; + /** @var CouponAdapterInterface Provide necessary value from Thelia*/ protected $adapter; @@ -49,27 +55,28 @@ class ConstraintManager /** * Constructor * - * @param CouponAdapterInterface $adapter Provide necessary value from Thelia - * @param CouponRuleCollection $rules Rules associated with the Constraint + * @param ContainerInterface $container Service container */ - function __construct(CouponAdapterInterface $adapter, CouponRuleCollection $rules) + function __construct(ContainerInterface $container) { - $this->adapter = $adapter; - $this->rule = $rules; + $this->container = $container; + $this->adapter = $container->get('thelia.adapter'); } /** * Check if the current Coupon is matching its conditions (Rules) * Thelia variables are given by the CouponAdapterInterface * + * @param CouponRuleCollection $collection A collection of rules + * * @return bool */ - public function isMatching() + public function isMatching(CouponRuleCollection $collection) { $isMatching = true; /** @var CouponRuleInterface $rule */ - foreach ($this->rules->getRules() as $rule) { + foreach ($collection->getRules() as $rule) { if (!$rule->isMatching($this->adapter)) { $isMatching = false; } @@ -78,5 +85,53 @@ class ConstraintManager return $isMatching; } + /** + * Serialize a collection of rules + * + * @param CouponRuleCollection $collection A collection of rules + * + * @return string A ready to be stored Rule collection + */ + public function serializeCouponRuleCollection(CouponRuleCollection $collection) + { + $serializableRules = array(); + $rules = $collection->getRules(); + if ($rules !== null) { + /** @var $rule CouponRuleInterface */ + foreach ($rules as $rule) { + $serializableRules[] = $rule->getSerializableRule(); + } + } + return (string) base64_encode(serialize($serializableRules)); + } + /** + * Unserialize a collection of rules + * + * @param string $serializedRules Serialized Rules + * + * @return CouponRuleCollection Rules ready to be processed + */ + public function unserializeCouponRuleCollection($serializedRules) + { + $unserializedRules = unserialize(base64_decode($serializedRules)); + $collection = new CouponRuleCollection(); + + if (!empty($serializedRules) && !empty($unserializedRules)) { + /** @var SerializableRule $rule */ + foreach ($unserializedRules as $rule) { + if ($this->container->has($rule->ruleServiceId)) { + /** @var CouponRuleInterface $couponRule */ + $couponRule = $this->container->get($rule->ruleServiceId); + $couponRule->populateFromForm( + $rule->operators, + $rule->values + ); + $collection->add($couponRule); + } + } + } + + return $collection; + } } \ No newline at end of file diff --git a/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmount.php b/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmount.php index 7b4629b0f..58c19d8fd 100644 --- a/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmount.php +++ b/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmount.php @@ -62,30 +62,6 @@ class AvailableForTotalAmount extends CouponRuleAbstract /** @var PriceParam Price Validator */ protected $priceValidator = null; - /** - * Constructor - * - * @param CouponAdapterInterface $adapter allowing to gather - * all necessary Thelia variables - * @param array $validators Array of RuleValidator - * validating $paramsToValidate against - * - * @throws \Thelia\Exception\InvalidRuleException - */ - public function __construct(CouponAdapterInterface $adapter, array $validators) - { - parent::__construct($adapter, $validators); - - if (isset($validators[self::PARAM1_PRICE]) - && $validators[self::PARAM1_PRICE] instanceof RuleValidator - ) { - $this->priceValidator = $validators[self::PARAM1_PRICE]; - } else { - throw new InvalidRuleException(get_class()); - } - } - - /** * Check if backoffice inputs are relevant or not * @@ -171,17 +147,6 @@ class AvailableForTotalAmount extends CouponRuleAbstract return $this; } - /** - * Return all validators - * Serialization purpose - * - * @return array - */ - public function getValidators() - { - return $this->validators; - } - /** * Get I18n name * @@ -203,13 +168,11 @@ class AvailableForTotalAmount extends CouponRuleAbstract */ public function getToolTip() { - /** @var Translator $translator */ - $translator = $this->get('thelia.translator'); $i18nOperator = Operators::getI18n( - $translator, $this->priceValidator->getOperator() + $this->translator, $this->priceValidator->getOperator() ); - $toolTip = $translator->trans( + $toolTip = $this->translator->trans( 'If cart total amount is %operator% %amount% %currency%', array( '%operator%' => $i18nOperator, diff --git a/core/lib/Thelia/Constraint/Rule/AvailableForXArticles.php b/core/lib/Thelia/Constraint/Rule/AvailableForXArticles.php index c60404218..95ea8e5b1 100644 --- a/core/lib/Thelia/Constraint/Rule/AvailableForXArticles.php +++ b/core/lib/Thelia/Constraint/Rule/AvailableForXArticles.php @@ -56,31 +56,6 @@ class AvailableForXArticles extends CouponRuleAbstract /** @var QuantityParam Quantity Validator */ protected $quantityValidator = null; - /** - * Constructor - * - * @param CouponAdapterInterface $adapter allowing to gather - * all necessary Thelia variables - * @param array $validators Array of RuleValidator - * validating $paramsToValidate against - * - * @throws InvalidRuleException - */ - public function __construct(CouponAdapterInterface $adapter, array $validators = null) - { - parent::__construct($adapter, $validators); - - if (isset($validators[self::PARAM1_QUANTITY]) - && $validators[self::PARAM1_QUANTITY] instanceof RuleValidator - ) { - $this->quantityValidator = $validators[self::PARAM1_QUANTITY]; - } else { - throw new InvalidRuleException(get_class()); - } - - $this->adapter = $adapter; - } - /** * Check if backoffice inputs are relevant or not * @@ -176,10 +151,7 @@ class AvailableForXArticles extends CouponRuleAbstract */ public function getName() { - /** @var Translator $translator */ - $translator = $this->adapter->get('thelia.translator'); - - return $translator->trans( + return $this->translator->trans( 'Number of articles in cart', array(), 'constraint' @@ -193,14 +165,11 @@ class AvailableForXArticles extends CouponRuleAbstract */ public function getToolTip() { - /** @var Translator $translator */ - $translator = $this->adapter->get('thelia.translator'); - $i18nOperator = Operators::getI18n( - $translator, $this->priceValidator->getOperator() + $this->translator, $this->priceValidator->getOperator() ); - $toolTip = $translator->trans( + $toolTip = $this->translator->trans( 'If cart products quantity is %operator% %quantity%', array( '%operator%' => $i18nOperator, @@ -256,5 +225,4 @@ class AvailableForXArticles extends CouponRuleAbstract return $serializableRule; } - } \ No newline at end of file diff --git a/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php b/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php index ff97ee3a0..ff8a26a8a 100644 --- a/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php +++ b/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php @@ -24,6 +24,7 @@ namespace Thelia\Constraint\Rule; use Symfony\Component\Intl\Exception\NotImplementedException; +use Symfony\Component\Translation\Translator; use Thelia\Coupon\CouponAdapterInterface; use Thelia\Constraint\Validator\ComparableInterface; use Thelia\Constraint\Validator\RuleValidator; @@ -60,29 +61,17 @@ abstract class CouponRuleAbstract implements CouponRuleInterface /** @var CouponAdapterInterface Provide necessary value from Thelia */ protected $adapter = null; + /** @var Translator Service Translator */ + protected $translator = null; + /** * Constructor - * Ex: - * Param 1 : - * $priceValidator = new RuleValidator( - * Operators::INFERIOR, - * new IntegerParam(10) - * ) - * $validators[AvailableForTotalAmount::PARAM1_PRICE] = $priceValidator * - * Param 2 : - * $paramsToValidate[AvailableForTotalAmount::PARAM1_PRICE] = 9 - * - * @param CouponAdapterInterface $adapter allowing to gather - * all necessary Thelia variables - * @param array $validators Array of RuleValidator - * validating $paramsToValidate against + * @param Translator $translator Service translator */ - public function __construct(CouponAdapterInterface $adapter, array $validators) + function __construct(Translator $translator) { - $this->setValidators($validators); - $this->adapter = $adapter; - $this->setParametersToValidate($this->adapter); + $this->translator($translator); } /** @@ -180,4 +169,15 @@ abstract class CouponRuleAbstract implements CouponRuleInterface throw new \Thelia\Exception\NotImplementedException(); } + /** + * Return all validators + * Serialization purpose + * + * @return array + */ + public function getValidators() + { + return $this->validators; + } + } \ No newline at end of file diff --git a/core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php b/core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php index ce8e6c469..f2b9447e3 100644 --- a/core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php +++ b/core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php @@ -39,6 +39,13 @@ use Thelia\Coupon\CouponAdapterInterface; */ interface CouponRuleInterface { + /** + * Constructor + * + * @param Translator $translator Service translator + */ + function __construct(Translator $translator); + /** * Check if backoffice inputs are relevant or not * diff --git a/core/lib/Thelia/Constraint/Rule/SerializableRule.php b/core/lib/Thelia/Constraint/Rule/SerializableRule.php index 66caa793d..3cab5e70c 100644 --- a/core/lib/Thelia/Constraint/Rule/SerializableRule.php +++ b/core/lib/Thelia/Constraint/Rule/SerializableRule.php @@ -37,7 +37,7 @@ namespace Thelia\Constraint\Rule; class SerializableRule { /** @var string Rule Service id */ - public $ruleClassName = null; + public $ruleServiceId = null; /** @var array Operators set by Admin for this Rule */ public $operators = array(); diff --git a/core/lib/Thelia/Coupon/CouponFactory.php b/core/lib/Thelia/Coupon/CouponFactory.php index 23f082974..3ff064601 100644 --- a/core/lib/Thelia/Coupon/CouponFactory.php +++ b/core/lib/Thelia/Coupon/CouponFactory.php @@ -137,7 +137,7 @@ class CouponFactory // * // * @return CouponRuleInterface Ready to use Rule or false // */ -// public function buildCouponRuleFromForm($ruleClassName, $operator, array $values) +// public function buildCouponRuleFromForm($ruleServiceId, $operator, array $values) // { // /** @var CouponAdapterInterface $adapter */ // $adapter = $this->container->get('thelia.adapter'); diff --git a/core/lib/Thelia/Coupon/CouponManager.php b/core/lib/Thelia/Coupon/CouponManager.php index ad351081c..ee20b4fd0 100644 --- a/core/lib/Thelia/Coupon/CouponManager.php +++ b/core/lib/Thelia/Coupon/CouponManager.php @@ -52,7 +52,7 @@ class CouponManager /** * Constructor * - * @param ContainerInterface $container Service container + * @param ContainerInterface $container Service container */ function __construct(ContainerInterface $container) { diff --git a/core/lib/Thelia/Coupon/CouponRuleCollection.php b/core/lib/Thelia/Coupon/CouponRuleCollection.php index 2f1a51dc0..93db32beb 100644 --- a/core/lib/Thelia/Coupon/CouponRuleCollection.php +++ b/core/lib/Thelia/Coupon/CouponRuleCollection.php @@ -23,9 +23,9 @@ namespace Thelia\Coupon; -use Symfony\Component\Serializer\Encoder\JsonEncoder; +use Symfony\Component\DependencyInjection\ContainerInterface; use Thelia\Constraint\Rule\CouponRuleInterface; -use Thelia\Exception\InvalidRuleException; +use Thelia\Constraint\Rule\SerializableRule; /** * Created by JetBrains PhpStorm. @@ -45,19 +45,10 @@ class CouponRuleCollection /** * Constructor - * - * @param array $rules Array of CouponRuleInterface - * - * @throws \Thelia\Exception\InvalidRuleException */ - function __construct(array $rules) + function __construct() { - foreach ($rules as $rule) { - if (!$rule instanceof CouponRuleInterface) { - throw new InvalidRuleException(get_class()); - } - } - $this->rules = $rules; + } /** diff --git a/core/lib/Thelia/Model/Coupon.php b/core/lib/Thelia/Model/Coupon.php index 03a59b8e9..f5788ff4f 100755 --- a/core/lib/Thelia/Model/Coupon.php +++ b/core/lib/Thelia/Model/Coupon.php @@ -24,6 +24,7 @@ namespace Thelia\Model; use Propel\Runtime\Propel; +use Thelia\Constraint\Rule\CouponRuleInterface; use Thelia\Coupon\CouponRuleCollection; use Thelia\Model\Base\Coupon as BaseCoupon; use Thelia\Model\Map\CouponTableMap; @@ -98,37 +99,34 @@ class Coupon extends BaseCoupon } } - /** - * Set the value of [serialized_rules] column. - * - * @param CouponRuleCollection $rules A set of Rules - * - * @return \Thelia\Model\Coupon The current object (for fluent API support) - */ - public function setRules(CouponRuleCollection $rules) - { - $serializedRules = null; - if ($rules !== null) { - - $serializedRules = (string) base64_encode(serialize($rules)); - } - - if ($this->serialized_rules !== $serializedRules) { - $this->serialized_rules = $serializedRules; - $this->modifiedColumns[] = CouponTableMap::SERIALIZED_RULES; - } - - return $this; - } +// /** +// * Set the value of [serialized_rules] column. +// * Convert a CouponRuleCollection into a serialized array of SerializableRule +// * +// * @param CouponRuleCollection $rules A set of Rules +// * +// * @return \Thelia\Model\Coupon The current object (for fluent API support) +// */ +// public function setRules(CouponRuleCollection $rules) +// { +// $serializedRules = null; +// if ($rules !== null) { +// /** @var $rule CouponRuleInterface */ +// foreach ($rules->getRules() as $rule) { +// $serializedRules[] = $rule->getSerializableRule(); +// } +// +// $serializedRules = (string) base64_encode(serialize($serializedRules)); +// } +// +// if ($this->serialized_rules !== $serializedRules) { +// $this->serialized_rules = $serializedRules; +// $this->modifiedColumns[] = CouponTableMap::SERIALIZED_RULES; +// } +// +// return $this; +// } + - /** - * Get the [serialized_rules] column value. - * - * @return CouponRuleCollection Rules ready to be processed - */ - public function getRules() - { - return unserialize(base64_decode($this->serialized_rules)); - } } diff --git a/core/lib/Thelia/Tests/Constraint/ConstraintManagerTest.php b/core/lib/Thelia/Tests/Constraint/ConstraintManagerTest.php index 08389ef9e..5d0be5711 100644 --- a/core/lib/Thelia/Tests/Constraint/ConstraintManagerTest.php +++ b/core/lib/Thelia/Tests/Constraint/ConstraintManagerTest.php @@ -23,6 +23,8 @@ namespace Thelia\Constraint; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Thelia\Constraint\Rule\AvailableForXArticles; use Thelia\Constraint\Validator\PriceParam; use Thelia\Constraint\Validator\RuleValidator; use Thelia\Constraint\Rule\AvailableForTotalAmount; @@ -50,12 +52,10 @@ class ConstraintManagerTest extends \PHPUnit_Framework_TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. */ - protected function setUp() + public function setUp() { } - - public function incompleteTest() { $this->markTestIncomplete( @@ -63,6 +63,62 @@ class ConstraintManagerTest extends \PHPUnit_Framework_TestCase ); } + /** + * Check the Rules serialization module + */ + public function testRuleSerialisation() + { + $translator = $this->getMock('\Thelia\Core\Translation\Translator'); + + $rule1 = new AvailableForTotalAmount($translator); + $operators = array(AvailableForTotalAmount::PARAM1_PRICE => Operators::SUPERIOR); + $values = array( + AvailableForTotalAmount::PARAM1_PRICE => 40.00, + AvailableForTotalAmount::PARAM1_CURRENCY => 'EUR' + ); + $rule1->populateFromForm($operators, $values); + + $rule2 = new AvailableForTotalAmount($translator); + $operators = array(AvailableForTotalAmount::PARAM1_PRICE => Operators::INFERIOR); + $values = array( + AvailableForTotalAmount::PARAM1_PRICE => 400.00, + AvailableForTotalAmount::PARAM1_CURRENCY => 'EUR' + ); + $rule2->populateFromForm($operators, $values); + + $rules = new CouponRuleCollection(array($rule1, $rule2)); + + /** @var ConstraintManager $constraintManager */ + $constraintManager = new ConstraintManager($this->getContainer()); + + $serializedRules = $constraintManager->serializeCouponRuleCollection($rules); + $unserializedRules = $constraintManager->unserializeCouponRuleCollection($serializedRules); + + $expected = $rules; + $actual = $unserializedRules; + + $this->assertEquals($expected, $actual); + } + + /** + * Get Mocked Container with 2 Rules + * + * @return ContainerBuilder + */ + public function getContainer() + { + $container = new ContainerBuilder(); + + $translator = $this->getMock('\Thelia\Core\Translation\Translator'); + $rule1 = new AvailableForTotalAmount($translator); + $rule2 = new AvailableForXArticles($translator); + + $container->set('thelia.constraint.rule.available_for_total_amount', $rule1); + $container->set('thelia.constraint.rule.available_for_x_articles', $rule2); + + return $container; + } + /** * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. From 6fdf60b9606f856d5422033e145aacd2c5a31656 Mon Sep 17 00:00:00 2001 From: franck Date: Fri, 6 Sep 2013 15:56:06 +0200 Subject: [PATCH 068/125] Categories refactoring --- core/lib/Thelia/Config/Resources/config.xml | 3 +- .../Thelia/Config/Resources/routing/admin.xml | 30 +- .../Controller/Admin/BaseAdminController.php | 51 ++ .../Controller/Admin/CategoryController.php | 447 +++++++++++------- .../Controller/Admin/ConfigController.php | 38 +- .../Controller/Admin/CurrencyController.php | 4 +- .../Thelia/Core/Event/CategoryCreateEvent.php | 13 +- .../Thelia/Core/Event/CategoryDeleteEvent.php | 18 +- core/lib/Thelia/Core/Event/CategoryEvent.php | 8 +- ...nt.php => CategoryUpdatePositionEvent.php} | 2 +- core/lib/Thelia/Core/TheliaHttpKernel.php | 3 + .../Thelia/Core/Translation/Translator.php | 25 +- templates/admin/default/categories.html | 282 +++++++++-- ...{edit_category.html => category-edit.html} | 5 +- templates/admin/default/currencies.html | 2 +- .../default/includes/add-category-dialog.html | 71 --- .../default/includes/category_breadcrumb.html | 13 - .../includes/delete-category-dialog.html | 42 -- 18 files changed, 634 insertions(+), 423 deletions(-) rename core/lib/Thelia/Core/Event/{CategoryChangePositionEvent.php => CategoryUpdatePositionEvent.php} (96%) rename templates/admin/default/{edit_category.html => category-edit.html} (99%) delete mode 100755 templates/admin/default/includes/add-category-dialog.html delete mode 100755 templates/admin/default/includes/category_breadcrumb.html delete mode 100755 templates/admin/default/includes/delete-category-dialog.html diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml index 198c49228..74a645cb9 100755 --- a/core/lib/Thelia/Config/Resources/config.xml +++ b/core/lib/Thelia/Config/Resources/config.xml @@ -79,7 +79,6 @@ - %kernel.environment% @@ -98,7 +97,7 @@ - + diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml index 313fb3a57..b8796ab16 100755 --- a/core/lib/Thelia/Config/Resources/routing/admin.xml +++ b/core/lib/Thelia/Config/Resources/routing/admin.xml @@ -25,14 +25,36 @@ - + - Thelia\Controller\Admin\CategoryController::indexAction + Thelia\Controller\Admin\CategoryController::defaultAction - - Thelia\Controller\Admin\CategoryController::processAction + + + + Thelia\Controller\Admin\CategoryController::createAction + + + + Thelia\Controller\Admin\CategoryController::changeAction + + + + Thelia\Controller\Admin\CategoryController::saveChangeAction + + + + Thelia\Controller\Admin\CategoryController::toggleOnlineAction + + + + Thelia\Controller\Admin\CategoryController::deleteAction + + + + Thelia\Controller\Admin\CategoryController::updatePositionAction diff --git a/core/lib/Thelia/Controller/Admin/BaseAdminController.php b/core/lib/Thelia/Controller/Admin/BaseAdminController.php index eab57394b..15634214c 100755 --- a/core/lib/Thelia/Controller/Admin/BaseAdminController.php +++ b/core/lib/Thelia/Controller/Admin/BaseAdminController.php @@ -34,6 +34,8 @@ use Thelia\Core\Security\SecurityContext; use Thelia\Model\AdminLog; use Thelia\Model\Lang; use Thelia\Model\LangQuery; +use Thelia\Form\BaseForm; +use Thelia\Form\Exception\FormValidationException; class BaseAdminController extends BaseController { @@ -126,6 +128,55 @@ class BaseAdminController extends BaseController return $response->setContent($this->errorPage("Sorry, you're not allowed to perform this action")); } + /* + * Create the standard message displayed to the user when the form cannot be validated. + */ + protected function createStandardFormValidationErrorMessage(FormValidationException $exception) { + return Translator::getInstance()->trans( + "Please check your input: %error", + array( + '%error' => $exception->getMessage() + ) + ); + } + + /** + * Setup the error context when an error occurs in a action method. + * + * @param string $action the action that caused the error (category modification, variable creation, currency update, etc.) + * @param BaseForm $form the form where the error occured, or null if no form was involved + * @param string $error_message the error message + * @param Exception $exception the exception or null if no exception + */ + protected function setupFormErrorContext($action, $error_message, BaseForm $form = null, \Exception $exception = null) { + + if ($error_message !== false) { + + // Log the error message + Tlog::getInstance()->error( + Translator::getInstance()->trans( + "Error during %action process : %error. Exception was %exc", + array( + '%action' => $action, + '%error' => $error_message, + '%exc' => $exception != null ? $exception->getMessage() : 'no exception' + ) + ) + ); + + if ($fom != null) { + // Mark the form as errored + $form->setErrorMessage($error_message); + + // Pass it to the parser context + $this->getParserContext()->addForm($form); + } + + // Pass the error message to the parser. + $this->getParserContext()->setGeneralError($error_message); + } + } + /** * @return a ParserInterface instance parser */ diff --git a/core/lib/Thelia/Controller/Admin/CategoryController.php b/core/lib/Thelia/Controller/Admin/CategoryController.php index 6cba34e39..73104349c 100755 --- a/core/lib/Thelia/Controller/Admin/CategoryController.php +++ b/core/lib/Thelia/Controller/Admin/CategoryController.php @@ -37,223 +37,330 @@ use Thelia\Model\Lang; class CategoryController extends BaseAdminController { - protected function createNewCategory($args) - { - try { - $categoryCreationForm = new CategoryCreationForm($this->getRequest()); + /** + * Render the categories list, ensuring the sort order is set. + * + * @return Symfony\Component\HttpFoundation\Response the response + */ + protected function renderList() { - $form = $this->validateForm($categoryCreationForm, "POST"); + $args = $this->setupArgs(); + + return $this->render('categories', $args); + } + + protected function setupArgs() { + + // Get the category ID + $id = $this->getRequest()->get('category_id', 0); + + // Find the current category order + $category_order = $this->getRequest()->get( + 'order', + $this->getSession()->get('admin.category_order', 'manual') + ); + + $args = array( + 'current_category_id' => $id, + 'category_order' => $category_order, + ); + + // Store the current sort order in session + $this->getSession()->set('admin.category_order', $category_order); + + return $args; + } + + /** + * The default action is displaying the categories list. + * + * @return Symfony\Component\HttpFoundation\Response the response + */ + public function defaultAction() { + + if (null !== $response = $this->checkAuth("admin.categories.view")) return $response; + + return $this->renderList(); + } + + protected function createAction($args) + { + // Check current user authorization + if (null !== $response = $this->checkAuth("admin.categories.create")) return $response; + + $error_msg = false; + + // Create the Creation Form + $creationForm = new CategoryCreationForm($this->getRequest()); + + try { + + // Validate the form, create the CategoryCreation event and dispatch it. + $form = $this->validateForm($creationForm, "POST"); $data = $form->getData(); + $createEvent = new CategoryCreateEvent(); + $categoryCreateEvent = new CategoryCreateEvent( $data["title"], $data["parent"], $data["locale"] ); - $this->dispatch(TheliaEvents::CATEGORY_CREATE, $categoryCreateEvent); + $this->dispatch(TheliaEvents::CATEGORY_CREATE, $createEvent); - $category = $categoryCreateEvent->getCreatedCategory(); + $createdObject = $createEvent->getCategory(); - $this->adminLogAppend(sprintf("Category %s (ID %s) created", $category->getTitle(), $category->getId())); + // Log currency creation + $this->adminLogAppend(sprintf("Category %s (ID %s) created", $createdObject->getName(), $createdObject->getId())); - // Substitute _ID_ in the URL with the ID of the created category - $successUrl = str_replace('_ID_', $category->getId(), $categoryCreationForm->getSuccessUrl()); + // Substitute _ID_ in the URL with the ID of the created object + $successUrl = str_replace('_ID_', $createdObject->getId(), $creationForm->getSuccessUrl()); // Redirect to the success URL $this->redirect($successUrl); } - catch (FormValidationException $e) { - $categoryCreationForm->setErrorMessage($e->getMessage()); - $this->getParserContext()->addForm($categoryCreationForm); + catch (FormValidationException $ex) { + // Form cannot be validated + $error_msg = sprintf("Please check your input: %s", $ex->getMessage()); } - catch (Exception $e) { - Tlog::getInstance()->error(sprintf("Failed to create category: %s", $e->getMessage())); - $this->getParserContext()->setGeneralError($e->getMessage()); + catch (\Exception $ex) { + // Any other error + $error_msg = $ex; + } + + if ($error_msg !== false) { + // An error has been detected: log it + Tlog::getInstance()->error(sprintf("Error during category creation process : %s. Exception was %s", $error_msg, $ex->getMessage())); + + // Mark the form as errored + $creationForm->setErrorMessage($error_msg); + + // Pass it to the parser, along with the error currency + $this->getParserContext() + ->addForm($creationForm) + ->setGeneralError($error_msg) + ; } // At this point, the form has error, and should be redisplayed. - return $this->render('categories', $args); + return $this->renderList(); } - protected function editCategory($args) - { - if (null !== $response = $this->checkAuth("admin.category.edit")) return $response; + /** + * Load a currency object for modification, and display the edit template. + * + * @return Symfony\Component\HttpFoundation\Response the response + */ + public function changeAction() { - return $this->render('edit_category', $args); + // Check current user authorization + if (null !== $response = $this->checkAuth("admin.categories.update")) return $response; + + // Load the currency object + $currency = CategoryQuery::create() + ->joinWithI18n($this->getCurrentEditionLocale()) + ->findOneById($this->getRequest()->get('currency_id')); + + if ($currency != null) { + + // Prepare the data that will hydrate the form + $data = array( + 'id' => $currency->getId(), + 'name' => $currency->getName(), + 'locale' => $currency->getLocale(), + 'code' => $currency->getCode(), + 'symbol' => $currency->getSymbol(), + 'rate' => $currency->getRate() + ); + + // Setup the object form + $changeForm = new CategoryModificationForm($this->getRequest(), "form", $data); + + // Pass it to the parser + $this->getParserContext()->addForm($changeForm); + } + + // Render the edition template. + return $this->render('currency-edit', array('currency_id' => $this->getRequest()->get('currency_id'))); } - protected function deleteCategory($args) - { + /** + * Save changes on a modified currency object, and either go back to the currency list, or stay on the edition page. + * + * @return Symfony\Component\HttpFoundation\Response the response + */ + public function saveChangeAction() { + + // Check current user authorization + if (null !== $response = $this->checkAuth("admin.categories.update")) return $response; + + $error_msg = false; + + // Create the form from the request + $changeForm = new CategoryModificationForm($this->getRequest()); + + // Get the currency ID + $currency_id = $this->getRequest()->get('currency_id'); + try { - $categoryDeletionForm = new CategoryDeletionForm($this->getRequest()); - $data = $this->validateForm($categoryDeletionForm, "POST")->getData(); + // Check the form against constraints violations + $form = $this->validateForm($changeForm, "POST"); - $categoryDeleteEvent = new CategoryDeleteEvent($data['category_id']); + // Get the form field values + $data = $form->getData(); - $this->dispatch(TheliaEvents::CATEGORY_DELETE, $categoryDeleteEvent); + $changeEvent = new CategoryUpdateEvent($data['id']); - $category = $categoryDeleteEvent->getDeletedCategory(); + // Create and dispatch the change event + $changeEvent + ->setCategoryName($data['name']) + ->setLocale($data["locale"]) + ->setSymbol($data['symbol']) + ->setCode($data['code']) + ->setRate($data['rate']) + ; - $this->adminLogAppend(sprintf("Category %s (ID %s) deleted", $category->getTitle(), $category->getId())); + $this->dispatch(TheliaEvents::CATEGORY_UPDATE, $changeEvent); - // Substitute _ID_ in the URL with the ID of the created category - $successUrl = str_replace('_ID_', $categoryDeleteEvent->getDeletedCategory()->getParent(), $categoryDeletionForm->getSuccessUrl()); + // Log currency modification + $changedObject = $changeEvent->getCategory(); + + $this->adminLogAppend(sprintf("Category %s (ID %s) modified", $changedObject->getName(), $changedObject->getId())); + + // If we have to stay on the same page, do not redirect to the succesUrl, + // just redirect to the edit page again. + if ($this->getRequest()->get('save_mode') == 'stay') { + $this->redirectToRoute( + "admin.categories.update", + array('currency_id' => $currency_id) + ); + } // Redirect to the success URL - $this->redirect($successUrl); + $this->redirect($changeForm->getSuccessUrl()); } - catch (FormValidationException $e) { - $categoryDeletionForm->setErrorMessage($e->getMessage()); - $this->getParserContext()->addForm($categoryDeletionForm); + catch (FormValidationException $ex) { + // Invalid data entered + $error_msg = sprintf("Please check your input: %s", $ex->getMessage()); } - catch (Exception $e) { - Tlog::getInstance()->error(sprintf("Failed to delete category: %s", $e->getMessage())); - $this->getParserContext()->setGeneralError($e->getMessage()); + catch (\Exception $ex) { + // Any other error + $error_msg = $ex; } - // At this point, something was wrong, category was not deleted. Display parent category list - return $this->render('categories', $args); + if ($error_msg !== false) { + // Log error currency + Tlog::getInstance()->error(sprintf("Error during currency modification process : %s. Exception was %s", $error_msg, $ex->getMessage())); + + // Mark the form as errored + $changeForm->setErrorMessage($error_msg); + + // Pas the form and the error to the parser + $this->getParserContext() + ->addForm($changeForm) + ->setGeneralError($error_msg) + ; + } + + // At this point, the form has errors, and should be redisplayed. + return $this->render('currency-edit', array('currency_id' => $currency_id)); } - protected function browseCategory($args) - { - if (null !== $response = $this->checkAuth("admin.catalog.view")) return $response; + /** + * Sets the default currency + */ + public function setDefaultAction() { + // Check current user authorization + if (null !== $response = $this->checkAuth("admin.categories.update")) return $response; - return $this->render('categories', $args); - } + $changeEvent = new CategoryUpdateEvent($this->getRequest()->get('currency_id', 0)); - protected function visibilityToggle($args) - { - $event = new CategoryToggleVisibilityEvent($this->getRequest()->get('category_id', 0)); - - $this->dispatch(TheliaEvents::CATEGORY_TOGGLE_VISIBILITY, $event); - - return $this->nullResponse(); - } - - protected function changePosition($args) - { - $request = $this->getRequest(); - - $event = new CategoryChangePositionEvent( - $request->get('category_id', 0), - CategoryChangePositionEvent::POSITION_ABSOLUTE, - $request->get('position', null) - ); - - $this->dispatch(TheliaEvents::CATEGORY_CHANGE_POSITION, $event); - - return $this->render('categories', $args); - } - - protected function positionDown($args) - { - $event = new CategoryChangePositionEvent( - $this->getRequest()->get('category_id', 0), - CategoryChangePositionEvent::POSITION_DOWN - ); - - $this->dispatch(TheliaEvents::CATEGORY_CHANGE_POSITION, $event); - - return $this->render('categories', $args); - } - - protected function positionUp($args) - { - $event = new CategoryChangePositionEvent( - $this->getRequest()->get('category_id', 0), - CategoryChangePositionEvent::POSITION_UP - ); - - $this->dispatch(TheliaEvents::CATEGORY_CHANGE_POSITION, $event); - - return $this->render('categories', $args); - } - - public function indexAction() - { - return $this->processAction(); - } - - public function processAction() - { - // Get the current action - $action = $this->getRequest()->get('action', 'browse'); - - // Get the category ID - $id = $this->getRequest()->get('id', 0); - - // Find the current order - $category_order = $this->getRequest()->get( - 'order', - $this->getSession()->get('admin.category_order', 'manual') - ); - - // Find the current edit language ID - $edition_language = $this->getRequest()->get( - 'edition_language', - $this->getSession()->get('admin.edition_language', Lang::getDefaultLanguage()->getId()) - ); - - $args = array( - 'action' => $action, - 'current_category_id' => $id, - 'category_order' => $category_order, - 'edition_language' => $edition_language, - ); - - // Store the current sort order in session - $this->getSession()->set('admin.category_order', $category_order); - - // Store the current edition language in session - $this->getSession()->set('admin.edition_language', $edition_language); + // Create and dispatch the change event + $changeEvent->setIsDefault(true); try { - switch ($action) { - case 'browse' : // Browse categories - - return $this->browseCategory($args); - - case 'create' : // Create a new category - - return $this->createNewCategory($args); - - case 'edit' : // Edit an existing category - - return $this->editCategory($args); - - case 'delete' : // Delete an existing category - - return $this->deleteCategory($args); - - case 'visibilityToggle' : // Toggle visibility - - return $this->visibilityToggle($id); - - case 'changePosition' : // Change position - - return $this->changePosition($args); - - case 'positionUp' : // Move up category - - return $this->positionUp($args); - - case 'positionDown' : // Move down category - - return $this->positionDown($args); - } + $this->dispatch(TheliaEvents::CATEGORY_SET_DEFAULT, $changeEvent); } - catch (AuthorizationException $ex) { - return $this->errorPage($ex->getMessage()); - } - catch (AuthenticationException $ex) { - return $this->errorPage($ex->getMessage()); + catch (\Exception $ex) { + // Any error + return $this->errorPage($ex); } - // We did not recognized the action -> return a 404 page - return $this->pageNotFound(); + $this->redirectToRoute('admin.categories.default'); + } + + /** + * Update categories rates + */ + public function updateRatesAction() { + // Check current user authorization + if (null !== $response = $this->checkAuth("admin.categories.update")) return $response; + + try { + $this->dispatch(TheliaEvents::CATEGORY_UPDATE_RATES); + } + catch (\Exception $ex) { + // Any error + return $this->errorPage($ex); + } + + $this->redirectToRoute('admin.categories.default'); + } + + /** + * Update currencyposition + */ + public function updatePositionAction() { + // Check current user authorization + if (null !== $response = $this->checkAuth("admin.categories.update")) return $response; + + try { + $mode = $this->getRequest()->get('mode', null); + + if ($mode == 'up') + $mode = CategoryUpdatePositionEvent::POSITION_UP; + else if ($mode == 'down') + $mode = CategoryUpdatePositionEvent::POSITION_DOWN; + else + $mode = CategoryUpdatePositionEvent::POSITION_ABSOLUTE; + + $position = $this->getRequest()->get('position', null); + + $event = new CategoryUpdatePositionEvent( + $this->getRequest()->get('currency_id', null), + $mode, + $this->getRequest()->get('position', null) + ); + + $this->dispatch(TheliaEvents::CATEGORY_UPDATE_POSITION, $event); + } + catch (\Exception $ex) { + // Any error + return $this->errorPage($ex); + } + + $this->redirectToRoute('admin.categories.default'); + } + + + /** + * Delete a currency object + * + * @return Symfony\Component\HttpFoundation\Response the response + */ + public function deleteAction() { + + // Check current user authorization + if (null !== $response = $this->checkAuth("admin.categories.delete")) return $response; + + // Get the currency id, and dispatch the delet request + $event = new CategoryDeleteEvent($this->getRequest()->get('currency_id')); + + $this->dispatch(TheliaEvents::CATEGORY_DELETE, $event); + + $this->redirectToRoute('admin.categories.default'); } } diff --git a/core/lib/Thelia/Controller/Admin/ConfigController.php b/core/lib/Thelia/Controller/Admin/ConfigController.php index a67ecbaaa..e7d6674b8 100644 --- a/core/lib/Thelia/Controller/Admin/ConfigController.php +++ b/core/lib/Thelia/Controller/Admin/ConfigController.php @@ -121,26 +121,14 @@ class ConfigController extends BaseAdminController } catch (FormValidationException $ex) { // Form cannot be validated - $message = sprintf("Please check your input: %s", $ex->getMessage()); + $message = $this->createStandardFormValidationErrorMessage($ex); } catch (\Exception $ex) { // Any other error - $message = sprintf("Sorry, an error occured: %s", $ex->getMessage()); + $message = $ex->getMessage(); } - if ($message !== false) { - // An error has been detected: log it - Tlog::getInstance()->error(sprintf("Error during variable creation process : %s. Exception was %s", $message, $ex->getMessage())); - - // Mark the form as errored - $creationForm->setErrorMessage($message); - - // Pass it to the parser, along with the error message - $this->getParserContext() - ->addForm($creationForm) - ->setGeneralError($message) - ; - } + $this->setupFormErrorContext("variable creation", $message, $creationForm, $ex); // At this point, the form has error, and should be redisplayed. return $this->renderList(); @@ -250,27 +238,15 @@ class ConfigController extends BaseAdminController $this->redirect($changeForm->getSuccessUrl()); } catch (FormValidationException $ex) { - // Invalid data entered - $message = sprintf("Please check your input: %s", $ex->getMessage()); + // Form cannot be validated + $message = $this->createStandardFormValidationErrorMessage($ex); } catch (\Exception $ex) { // Any other error - $message = sprintf("Sorry, an error occured: %s", $ex->getMessage()); + $message = $ex->getMessage(); } - if ($message !== false) { - // Log error message - Tlog::getInstance()->error(sprintf("Error during variable modification process : %s. Exception was %s", $message, $ex->getMessage())); - - // Mark the form as errored - $changeForm->setErrorMessage($message); - - // Pas the form and the error to the parser - $this->getParserContext() - ->addForm($changeForm) - ->setGeneralError($message) - ; - } + $this->setupFormErrorContext("variable edition", $message, $creationForm, $ex); // At this point, the form has errors, and should be redisplayed. return $this->render('variable-edit', array('variable_id' => $variable_id)); diff --git a/core/lib/Thelia/Controller/Admin/CurrencyController.php b/core/lib/Thelia/Controller/Admin/CurrencyController.php index 56acfb89d..d5b984cfb 100644 --- a/core/lib/Thelia/Controller/Admin/CurrencyController.php +++ b/core/lib/Thelia/Controller/Admin/CurrencyController.php @@ -111,7 +111,7 @@ class CurrencyController extends BaseAdminController $createdObject = $createEvent->getCurrency(); // Log currency creation - $this->adminLogAppend(sprintf("Variable %s (ID %s) created", $createdObject->getName(), $createdObject->getId())); + $this->adminLogAppend(sprintf("Currency %s (ID %s) created", $createdObject->getName(), $createdObject->getId())); // Substitute _ID_ in the URL with the ID of the created object $successUrl = str_replace('_ID_', $createdObject->getId(), $creationForm->getSuccessUrl()); @@ -226,7 +226,7 @@ class CurrencyController extends BaseAdminController // Log currency modification $changedObject = $changeEvent->getCurrency(); - $this->adminLogAppend(sprintf("Variable %s (ID %s) modified", $changedObject->getName(), $changedObject->getId())); + $this->adminLogAppend(sprintf("Currency %s (ID %s) modified", $changedObject->getName(), $changedObject->getId())); // If we have to stay on the same page, do not redirect to the succesUrl, // just redirect to the edit page again. diff --git a/core/lib/Thelia/Core/Event/CategoryCreateEvent.php b/core/lib/Thelia/Core/Event/CategoryCreateEvent.php index f4d5a45ee..1bcfe5f56 100644 --- a/core/lib/Thelia/Core/Event/CategoryCreateEvent.php +++ b/core/lib/Thelia/Core/Event/CategoryCreateEvent.php @@ -25,12 +25,11 @@ namespace Thelia\Core\Event; use Thelia\Model\Category; -class CategoryCreateEvent extends ActionEvent +class CategoryCreateEvent extends CategoryEvent { protected $title; protected $parent; protected $locale; - protected $created_category; public function __construct($title, $parent, $locale) { @@ -68,14 +67,4 @@ class CategoryCreateEvent extends ActionEvent { $this->locale = $locale; } - - public function getCreatedCategory() - { - return $this->created_category; - } - - public function setCreatedCategory(Category $created_category) - { - $this->created_category = $created_category; - } } diff --git a/core/lib/Thelia/Core/Event/CategoryDeleteEvent.php b/core/lib/Thelia/Core/Event/CategoryDeleteEvent.php index 3e863be8e..05253d435 100644 --- a/core/lib/Thelia/Core/Event/CategoryDeleteEvent.php +++ b/core/lib/Thelia/Core/Event/CategoryDeleteEvent.php @@ -22,13 +22,11 @@ /*************************************************************************************/ namespace Thelia\Core\Event; + use Thelia\Model\Category; -class CategoryDeleteEvent extends ActionEvent +class CategoryDeleteEvent extends CategoryEvent { - protected $category_id; - protected $deleted_category; - public function __construct($category_id) { $this->category_id = $category_id; @@ -43,14 +41,4 @@ class CategoryDeleteEvent extends ActionEvent { $this->category_id = $category_id; } - - public function getDeletedCategory() - { - return $this->deleted_category; - } - - public function setDeletedCategory(Category $deleted_category) - { - $this->deleted_category = $deleted_category; - } -} +} \ No newline at end of file diff --git a/core/lib/Thelia/Core/Event/CategoryEvent.php b/core/lib/Thelia/Core/Event/CategoryEvent.php index c29d681d8..90fbd1e1f 100644 --- a/core/lib/Thelia/Core/Event/CategoryEvent.php +++ b/core/lib/Thelia/Core/Event/CategoryEvent.php @@ -35,13 +35,15 @@ class CategoryEvent extends ActionEvent $this->category = $category; } - /** - * @return \Thelia\Model\Category - */ public function getCategory() { return $this->category; } + public function setCategory(Category $category) + { + $this->category = $category; + return $this; + } } diff --git a/core/lib/Thelia/Core/Event/CategoryChangePositionEvent.php b/core/lib/Thelia/Core/Event/CategoryUpdatePositionEvent.php similarity index 96% rename from core/lib/Thelia/Core/Event/CategoryChangePositionEvent.php rename to core/lib/Thelia/Core/Event/CategoryUpdatePositionEvent.php index 3a3dbb18f..44af9b946 100644 --- a/core/lib/Thelia/Core/Event/CategoryChangePositionEvent.php +++ b/core/lib/Thelia/Core/Event/CategoryUpdatePositionEvent.php @@ -23,6 +23,6 @@ namespace Thelia\Core\Event; -class CurrencyUpdatePositionEvent extends BaseUpdatePositionEvent +class CategoryUpdatePositionEvent extends BaseUpdatePositionEvent { } \ No newline at end of file diff --git a/core/lib/Thelia/Core/TheliaHttpKernel.php b/core/lib/Thelia/Core/TheliaHttpKernel.php index 20197d9c6..3c0f14808 100755 --- a/core/lib/Thelia/Core/TheliaHttpKernel.php +++ b/core/lib/Thelia/Core/TheliaHttpKernel.php @@ -127,6 +127,9 @@ class TheliaHttpKernel extends HttpKernel // See Thelia\Tools\URL class. $this->container->get('thelia.url.manager'); + // Same thing for the Translator service. + $this->container->get('thelia.translator'); + $lang = $this->detectLang($request); if ($lang) { diff --git a/core/lib/Thelia/Core/Translation/Translator.php b/core/lib/Thelia/Core/Translation/Translator.php index 83114d478..d941fefb7 100755 --- a/core/lib/Thelia/Core/Translation/Translator.php +++ b/core/lib/Thelia/Core/Translation/Translator.php @@ -5,6 +5,29 @@ use Symfony\Component\Translation\Translator as BaseTranslator; class Translator extends BaseTranslator { + + protected static $instance = null; + + public function __construct() + { + // Allow singleton style calls once intanciated. + // For this to work, the Translator service has to be instanciated very early. This is done manually + // in TheliaHttpKernel, by calling $this->container->get('thelia.translator'); + self::$instance = $this; + } + + /** + * Return this class instance, only once instanciated. + * + * @throws \RuntimeException if the class has not been instanciated. + * @return Thelia\Core\Translation\Translator the instance. + */ + public static function getInstance() { + if (self::$instance == null) throw new \RuntimeException("Translator instance is not initialized."); + + return self::$instance; + } + /** * {@inheritdoc} * @@ -21,7 +44,7 @@ class Translator extends BaseTranslator } if ($this->catalogues[$locale]->has((string) $id, $domain)) - return parent::trans($id, $parameters, $domain = 'messages', $locale = null); + return parent::trans($id, $parameters, $domain, $locale); else return strtr($id, $parameters); } diff --git a/templates/admin/default/categories.html b/templates/admin/default/categories.html index 49db025ae..5e3e28018 100755 --- a/templates/admin/default/categories.html +++ b/templates/admin/default/categories.html @@ -8,9 +8,7 @@
    -
      - {include file="includes/category_breadcrumb.html"} -
    + {include file="includes/catalog-breadcrumb.html"} {module_include location='catalog_top'} @@ -20,7 +18,7 @@ + + @@ -59,8 +67,8 @@ current_order=$category_order order='visible' reverse_order='visible_reverse' - path={url path='/admin/catalog/category' id="{$current_category_id}"} - label={intl l='Online'} + path={url path='/admin/catalog' id_category=$current_category_id} + label="{intl l='Online'}" } @@ -69,8 +77,8 @@ current_order=$category_order order='manual' reverse_order='manual_reverse' - path={url path='/admin/catalog/category' id="{$current_category_id}"} - label={intl l='Position'} + path={url path='/admin/catalog' id_category=$current_category_id} + label="{intl l='Position'}" } @@ -81,22 +89,24 @@ {loop name="category_list" type="category" visible="*" parent=$current_category_id order=$category_order backend_context="1" lang=$lang_id} + + {module_include location='category_list_row'} - {loop name="customer_list" type="customer" visible="*" last_order="1" backend_context="1"} + {loop name="customer_list" type="customer" visible="*" last_order="1" backend_context="1" page={$customer_page} limit={$display_customer}} @@ -102,6 +106,33 @@ {module_include location='customer_bottom'} +
    +
    + +
      + {if #customer_page != 1} +
    • «
      • + {else} +
    • «
      • + {/if} + + {pageloop rel="customer_list"} + {if #PAGE != #CURRENT} +
    • #PAGE
      • + {else} +
    • #PAGE
      • + {/if} + + {if #PAGE == #LAST && #LAST != #CURRENT} +
    • »
      • + {else} +
    • »
      • + {/if} + {/pageloop} +
    +
    +
    + From 849520eff9a0ba4eaf01f4fe3d5c642abe4024a7 Mon Sep 17 00:00:00 2001 From: gmorel Date: Mon, 9 Sep 2013 16:08:12 +0200 Subject: [PATCH 108/125] Working - Add Symfony2 routing ability to Thelia router --- .../Controller/Admin/BaseAdminController.php | 23 +++++++++++++-- core/lib/Thelia/Controller/BaseController.php | 29 +++++++++++++------ 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/core/lib/Thelia/Controller/Admin/BaseAdminController.php b/core/lib/Thelia/Controller/Admin/BaseAdminController.php index 298cd0182..5461b8d3f 100755 --- a/core/lib/Thelia/Controller/Admin/BaseAdminController.php +++ b/core/lib/Thelia/Controller/Admin/BaseAdminController.php @@ -22,6 +22,9 @@ /*************************************************************************************/ namespace Thelia\Controller\Admin; +use Symfony\Component\Routing\Exception\InvalidParameterException; +use Symfony\Component\Routing\Exception\MissingMandatoryParametersException; +use Symfony\Component\Routing\Exception\RouteNotFoundException; use Thelia\Controller\BaseController; use Symfony\Component\HttpFoundation\Response; use Thelia\Core\Security\Exception\AuthorizationException; @@ -211,12 +214,26 @@ class BaseAdminController extends BaseController /** * Return the route path defined for the givent route ID * - * @param string $routeId a route ID, as defines in Config/Resources/routing/admin.xml + * @param string $routeId a route ID, as defines in Config/Resources/routing/admin.xml + * @param mixed $parameters An array of parameters + * @param Boolean|string $referenceType The type of reference to be generated (one of the constants) + * + * @throws RouteNotFoundException If the named route doesn't exist + * @throws MissingMandatoryParametersException When some parameters are missing that are mandatory for the route + * @throws InvalidParameterException When a parameter value for a placeholder is not correct because + * it does not match the requirement + * @throws \InvalidArgumentException When the router doesn't exist + * @return string The generated URL * * @see \Thelia\Controller\BaseController::getRouteFromRouter() */ - protected function getRoute($routeId) { - return $this->getRouteFromRouter('router.admin', $routeId); + protected function getRoute($routeId, $parameters = array(), $referenceType = Router::ABSOLUTE_PATH) { + return $this->getRouteFromRouter( + 'router.admin', + $routeId, + $parameters, + $referenceType + ); } /** diff --git a/core/lib/Thelia/Controller/BaseController.php b/core/lib/Thelia/Controller/BaseController.php index e5b098f02..666e8ca32 100755 --- a/core/lib/Thelia/Controller/BaseController.php +++ b/core/lib/Thelia/Controller/BaseController.php @@ -25,6 +25,10 @@ namespace Thelia\Controller; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\DependencyInjection\ContainerAware; +use Symfony\Component\Routing\Exception\InvalidParameterException; +use Symfony\Component\Routing\Exception\MissingMandatoryParametersException; +use Symfony\Component\Routing\Exception\RouteNotFoundException; +use Symfony\Component\Routing\Router; use Thelia\Core\Security\SecurityContext; use Thelia\Tools\URL; use Thelia\Tools\Redirect; @@ -216,20 +220,27 @@ class BaseController extends ContainerAware /** * Get a route path from the route id. * - * @param $routerName - * @param $routeId + * @param string $routerName Router name + * @param string $routeId The name of the route + * @param mixed $parameters An array of parameters + * @param Boolean|string $referenceType The type of reference to be generated (one of the constants) * - * @return mixed - * @throws InvalidArgumentException + * @throws RouteNotFoundException If the named route doesn't exist + * @throws MissingMandatoryParametersException When some parameters are missing that are mandatory for the route + * @throws InvalidParameterException When a parameter value for a placeholder is not correct because + * it does not match the requirement + * @throws \InvalidArgumentException When the router doesn't exist + * @return string The generated URL */ - protected function getRouteFromRouter($routerName, $routeId) { - $route = $this->container->get($routerName)->getRouteCollection()->get($routeId); + protected function getRouteFromRouter($routerName, $routeId, $parameters = array(), $referenceType = Router::ABSOLUTE_PATH) { + /** @var Router $router */ + $router = $this->container->get($routerName); - if ($route == null) { - throw new \InvalidArgumentException(sprintf("Route ID '%s' does not exists.", $routeId)); + if ($router == null) { + throw new \InvalidArgumentException(sprintf("Router '%s' does not exists.", $routerName)); } - return $route->getPath(); + return $router->generate($routeId, $parameters, $referenceType); } /** From 3618199c05e73a9a0c93e88e03074b55797f6b92 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Mon, 9 Sep 2013 16:08:42 +0200 Subject: [PATCH 109/125] remove test --- templates/admin/default/customers.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/admin/default/customers.html b/templates/admin/default/customers.html index e126b9f77..923941c4e 100644 --- a/templates/admin/default/customers.html +++ b/templates/admin/default/customers.html @@ -35,7 +35,7 @@ \s*$/g,At={option:[1,""],legend:[1,"
    ","
    "],area:[1,"",""],param:[1,"",""],thead:[1,"
    {* display parent category name, and get current cat ID *} - {loop name="category_title" type="category" visible="*" id="{$current_category_id}"} + {loop name="category_title" type="category" visible="*" id=$current_category_id} {intl l="Categories in %cat" cat=$TITLE} {$cat_id = $ID} {/loop} @@ -30,7 +28,7 @@ {module_include location='category_list_caption'} - {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.category.create"} + {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.categories.create"} @@ -40,6 +38,16 @@ {ifloop rel="category_list"}
    + {admin_sortable_header + current_order=$category_order + order='id' + reverse_order='id_reverse' + path={url path='/admin/catalog' id_category=$current_category_id} + label="{intl l='ID'}" + } +   @@ -47,8 +55,8 @@ current_order=$category_order order='alpha' reverse_order='alpha_reverse' - path={url path='/admin/catalog/category' id="{$current_category_id}"} - label={intl l='Category title'} + path={url path='/admin/catalog' id_category=$current_category_id} + label="{intl l='Category title'}" }
    {$ID} - i={$ID} {loop type="image" name="cat_image" source="category" source_id="$ID" limit="1" width="50" height="50" resize_mode="crop" backend_context="1"} - #TITLE + {loop type="image" name="cat_image" source="category" source_id="$ID" limit="1" width="50" height="50" resize_mode="crop" backend_context="1"} + #TITLE {/loop} - - {$ID} p={$POSITION} {$TITLE} + + {$TITLE} - {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.category.edit"} + {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.categories.edit"}
    @@ -111,24 +121,24 @@     		{admin_position_block - permission="admin.category.edit" - path={url path='admin/catalog/category' category_id="{$ID}"} + permission="admin.categories.edit" + path={url path='admin/category/update-position' category_id=$ID} url_parameter="category_id" in_place_edit_class="categoryPositionChange" - position="$POSITION" - id="$ID" + position=$POSITION + id=$ID }
    - + - {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.category.edit"} - + {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.categories.edit"} + {/loop} - {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.category.delete"} + {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.categories.delete"} {/loop}
    @@ -143,7 +153,7 @@
    - {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.category.create"} + {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.categories.create"} {intl l="This category has no sub-categories. To create a new one, click the + button above."} {/loop} @@ -166,9 +176,10 @@ + + + @@ -211,8 +241,8 @@ current_order=$product_order order='manual' reverse_order='manual_reverse' - path={url path='/admin/catalog/product' id="{$current_category_id}"} - label={intl l='Position'} + path={url path='/admin/product' category_id=$current_category_id} + label="{intl l='Position'}" } @@ -221,37 +251,58 @@ - {loop name="product_list" type="product" category="{$current_category_id}" order="manual"} + {loop name="product_list" type="product" category=$current_category_id order="manual"} + + + + + {module_include location='product_list_row'} {/loop} @@ -274,8 +325,105 @@ -{include file="includes/add-category-dialog.html"} -{include file="includes/delete-category-dialog.html"} + {* Adding a new Category *} + + + + {* Delete category confirmation dialog *} + + + {/block} {block name="javascript-initialization"} @@ -314,14 +462,25 @@ $(function() { {* Set the proper category ID in the delete confirmation dialog *} - $(document).on("click", ".category-delete", function () { - $('#'+'delete-category-id').val($(this).data('id')); + $('a.category-delete').click(function(ev) { + $('#delete_category_id').val($(this).data('id')); }); // Toggle category visibility $(".categoryVisibleToggle").click(function() { $.ajax({ - url : "{url path='admin/catalog/category'}", + url : "{url path='admin/categories/toggle-online'}", + data : { + category_id : $(this).data('id'), + action : 'visibilityToggle' + } + }); + }); + + // Toggle product visibility + $(".productVisibleToggle").click(function() { + $.ajax({ + url : "{url path='admin/products/toggle-online'}", data : { category_id : $(this).data('id'), action : 'visibilityToggle' @@ -338,15 +497,34 @@ $(function() { inputclass : 'input-mini', placement : 'left', success : function(response, newValue) { - // The URL template - var url = "{url path='admin/catalog/category' action='changePosition' category_id='__ID__' position='__POS__'}"; + // The URL template + var url = "{url path='/admin/categories/update-position' category_id='__ID__' position='__POS__'}"; - // Perform subtitutions + // Perform subtitutions url = url.replace('__ID__', $(this).data('id')) - .replace('__POS__', newValue); + .replace('__POS__', newValue); - // Reload the page - location.href = url; + // Reload the page + location.href = url; + } + }); + + $('.productPositionChange').editable({ + type : 'text', + title : '{intl l="Enter new product position"}', + mode : 'popup', + inputclass : 'input-mini', + placement : 'left', + success : function(response, newValue) { + // The URL template + var url = "{url path='/admin/products/update-position' product_id='__ID__' position='__POS__'}"; + + // Perform subtitutions + url = url.replace('__ID__', $(this).data('id')) + .replace('__POS__', newValue); + + // Reload the page + location.href = url; } }); diff --git a/templates/admin/default/edit_category.html b/templates/admin/default/category-edit.html similarity index 99% rename from templates/admin/default/edit_category.html rename to templates/admin/default/category-edit.html index 85e6d42bd..31c425157 100755 --- a/templates/admin/default/edit_category.html +++ b/templates/admin/default/category-edit.html @@ -7,9 +7,8 @@ {block name="main-content"}
    -
      - {include file="includes/category_breadcrumb.html"} -
    + + {include file="includes/categories-breadcrumb.html"}
    {loop name="category_edit" type="category" visible="*" id="{$current_category_id}" backend_context="1" lang="$edit_language_id"} diff --git a/templates/admin/default/currencies.html b/templates/admin/default/currencies.html index 29bd582a2..83ca62ba3 100644 --- a/templates/admin/default/currencies.html +++ b/templates/admin/default/currencies.html @@ -122,7 +122,7 @@
    {* display parent category name *} - {loop name="category_title" type="category" visible="*" id="{$current_category_id}"} + {loop name="category_title" type="category" visible="*" id=$current_category_id} {intl l="Products in %cat" cat=$TITLE} {/loop} + {elseloop rel="category_title"} {intl l="Top level Products"} {/elseloop} @@ -183,15 +194,34 @@ {ifloop rel="product_list"}
    + {admin_sortable_header + current_order=$product_order + order='id' + reverse_order='id_reverse' + path={url path='/admin/product' category_id=$current_category_id} + label="{intl l='ID'}" + } +   + {admin_sortable_header + current_order=$product_order + order='ref' + reverse_order='ref_reverse' + path={url path='/admin/product' category_id=$current_category_id} + label="{intl l='Reference'}" + } + {admin_sortable_header current_order=$product_order order='alpha' reverse_order='alpha_reverse' - path={url path='/admin/catalog/product' id="{$current_category_id}"} - label={intl l='Product title'} + path={url path='/admin/product' category_id=$current_category_id} + label="{intl l='Product title'}" } {module_include location='product_list_header'} @@ -201,8 +231,8 @@ current_order=$product_order order='visible' reverse_order='visible_reverse' - path={url path='/admin/catalog/product' id="{$current_category_id}"} - label={intl l='Online'} + path={url path='/admin/product' category_id=$current_category_id} + label="{intl l='Online'}" }
    {$ID} {loop type="image" name="cat_image" source="product" source_id="$ID" limit="1" width="50" height="50" resize_mode="crop" backend_context="1"} - + #TITLE {/loop} - {$TITLE}{$REF}{$TITLE} - + {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.products.edit"} +
    + +
    + {/loop} + + {elseloop rel="can_change"} +
    + +
    + {/elseloop}     		{admin_position_block permission="admin.product.edit" - path={url path='admin/catalog/product' category_id="{$ID}"} + path={url path='admin/product' category_id=$ID} url_parameter="product_id" in_place_edit_class="productPositionChange" - position="$POSITION" - id="$ID" + position=$POSITION + id=$ID } - - +
    + {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.product.edit"} + + {/loop} + + {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.product.delete"} + + {/loop} +
    {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.currencies.change"} - {$NAME} + {$NAME} {/loop} {elseloop rel="can_change"} {$NAME} diff --git a/templates/admin/default/includes/add-category-dialog.html b/templates/admin/default/includes/add-category-dialog.html deleted file mode 100755 index 0e62994f7..000000000 --- a/templates/admin/default/includes/add-category-dialog.html +++ /dev/null @@ -1,71 +0,0 @@ - -{* Adding a new Category *} - - \ No newline at end of file diff --git a/templates/admin/default/includes/category_breadcrumb.html b/templates/admin/default/includes/category_breadcrumb.html deleted file mode 100755 index bf14142b5..000000000 --- a/templates/admin/default/includes/category_breadcrumb.html +++ /dev/null @@ -1,13 +0,0 @@ -{* Breadcrumb for categories browsing and editing *} - -
  • Home
    • -
  • Catalog {ifloop rel="category_path"}
    • - -{loop name="category_path" type="category-path" visible="*" category="{$current_category_id}"} {if $ID == $current_category_id} -
  • {if $action == 'edit'} {intl l='Editing %cat' cat="{$TITLE}"} {else} {$TITLE} {intl l="(edit)"} {/if} -
    • -{else} -
  • {$TITLE}
    • -{/if} {/loop} {/ifloop} {elseloop rel="category_path"} - -{/elseloop} diff --git a/templates/admin/default/includes/delete-category-dialog.html b/templates/admin/default/includes/delete-category-dialog.html deleted file mode 100755 index 91cc8db66..000000000 --- a/templates/admin/default/includes/delete-category-dialog.html +++ /dev/null @@ -1,42 +0,0 @@ - -{* Adding a new Category *} - - From 2dee65727d11261478572605de1d3141ad29cfcf Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Fri, 6 Sep 2013 16:12:57 +0200 Subject: [PATCH 069/125] set good module delivery id in session --- .../Thelia/Command/Skeleton/Module/Class.php | 2 +- .../Thelia/Config/Resources/routing/front.xml | 6 ++ .../Controller/Front/DeliveryController.php | 55 +++++++++++++ .../Core/HttpFoundation/Session/Session.php | 18 ++++ core/lib/Thelia/Module/BaseModule.php | 13 +++ local/modules/Colissimo/Colissimo.php | 82 +++++++++++++++++++ local/modules/Colissimo/Config/config.xml | 36 ++++++++ local/modules/Colissimo/Config/plugin.xml | 0 local/modules/Colissimo/Config/schema.xml | 7 ++ 9 files changed, 218 insertions(+), 1 deletion(-) create mode 100644 core/lib/Thelia/Controller/Front/DeliveryController.php create mode 100644 local/modules/Colissimo/Colissimo.php create mode 100644 local/modules/Colissimo/Config/config.xml create mode 100644 local/modules/Colissimo/Config/plugin.xml create mode 100644 local/modules/Colissimo/Config/schema.xml diff --git a/core/lib/Thelia/Command/Skeleton/Module/Class.php b/core/lib/Thelia/Command/Skeleton/Module/Class.php index c9c7109ac..c4c90aa60 100755 --- a/core/lib/Thelia/Command/Skeleton/Module/Class.php +++ b/core/lib/Thelia/Command/Skeleton/Module/Class.php @@ -25,7 +25,7 @@ namespace %%NAMESPACE%%; use Thelia\Module\BaseModule; -class Class extends BaseModule +class %%CLASSNAME%% extends BaseModule { /** * YOU HAVE TO IMPLEMENT HERE ABSTRACT METHODD FROM BaseModule Class diff --git a/core/lib/Thelia/Config/Resources/routing/front.xml b/core/lib/Thelia/Config/Resources/routing/front.xml index f8b156946..4c88f707f 100755 --- a/core/lib/Thelia/Config/Resources/routing/front.xml +++ b/core/lib/Thelia/Config/Resources/routing/front.xml @@ -60,4 +60,10 @@ cart + + + Thelia\Controller\Front\DeliveryController::select + + + diff --git a/core/lib/Thelia/Controller/Front/DeliveryController.php b/core/lib/Thelia/Controller/Front/DeliveryController.php new file mode 100644 index 000000000..abb2e7fae --- /dev/null +++ b/core/lib/Thelia/Controller/Front/DeliveryController.php @@ -0,0 +1,55 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Controller\Front; +use Thelia\Model\ModuleQuery; +use Thelia\Tools\URL; + + +/** + * Class DeliveryController + * @package Thelia\Controller\Front + * @author Manuel Raynaud + */ +class DeliveryController extends BaseFrontController +{ + public function select() + { + if ($this->getSecurityContext()->hasCustomerUser() === false) { + $this->redirect(URL::getInstance()->getIndexPage()); + } + + $request = $this->getRequest(); + + $deliveryId = $request->query->get("delivery_id"); + + if($deliveryId) + { + $deliveryModule = ModuleQuery::create()->findPk($deliveryId); + + if ($deliveryModule) { + $request->getSession()->setDelivery($deliveryId); + } + } + } +} \ No newline at end of file diff --git a/core/lib/Thelia/Core/HttpFoundation/Session/Session.php b/core/lib/Thelia/Core/HttpFoundation/Session/Session.php index 4a486e488..8c6a241ec 100755 --- a/core/lib/Thelia/Core/HttpFoundation/Session/Session.php +++ b/core/lib/Thelia/Core/HttpFoundation/Session/Session.php @@ -164,10 +164,28 @@ class Session extends BaseSession * assign cart id in session * * @param $cart_id + * @return $this */ public function setCart($cart_id) { $this->set("thelia.cart_id", $cart_id); return $this; } + + /** + * assign delivery id in session + * + * @param $delivery_id + * @return $this + */ + public function setDelivery($delivery_id) + { + $this->set("thelia.delivery_id", $delivery_id); + return $this; + } + + public function getDelivery() + { + return $this->get("thelia.delivery_id"); + } } \ No newline at end of file diff --git a/core/lib/Thelia/Module/BaseModule.php b/core/lib/Thelia/Module/BaseModule.php index 89725e33b..145da3c02 100755 --- a/core/lib/Thelia/Module/BaseModule.php +++ b/core/lib/Thelia/Module/BaseModule.php @@ -39,6 +39,19 @@ abstract class BaseModule extends ContainerAware } + public function hasContainer() + { + return null === $this->container; + } + + public function getContainer() + { + if($this->hasContainer() === false) { + throw new \RuntimeException("Sorry, container his not available in this context"); + } + return $this->container; + } + abstract public function install(); abstract public function destroy(); diff --git a/local/modules/Colissimo/Colissimo.php b/local/modules/Colissimo/Colissimo.php new file mode 100644 index 000000000..d3a70c9c4 --- /dev/null +++ b/local/modules/Colissimo/Colissimo.php @@ -0,0 +1,82 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Colissimo; + +use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Component\HttpFoundation\Request; +use Thelia\Module\BaseModule; +use Thelia\Module\DeliveryModuleInterface; + +class Colissimo extends BaseModule implements DeliveryModuleInterface +{ + protected $request; + protected $dispatcher; + + public function setRequest(Request $request) + { + $this->request = $request; + } + + public function getRequest() + { + return $this->request; + } + + public function setDispatcher(EventDispatcherInterface $dispatcher) + { + $this->dispatcher = $dispatcher; + } + + public function getDispatcher() + { + return $this->dispatcher; + } + + /** + * + * calculate and return delivery price + * + * @return mixed + */ + public function calculate() + { + // TODO: Implement calculate() method. + return 2; + } + + /** + * YOU HAVE TO IMPLEMENT HERE ABSTRACT METHODD FROM BaseModule Class + * Like install and destroy + */ + public function install() + { + // TODO: Implement install() method. + } + + public function destroy() + { + // TODO: Implement destroy() method. + } + +} diff --git a/local/modules/Colissimo/Config/config.xml b/local/modules/Colissimo/Config/config.xml new file mode 100644 index 000000000..2430f5027 --- /dev/null +++ b/local/modules/Colissimo/Config/config.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/local/modules/Colissimo/Config/plugin.xml b/local/modules/Colissimo/Config/plugin.xml new file mode 100644 index 000000000..e69de29bb diff --git a/local/modules/Colissimo/Config/schema.xml b/local/modules/Colissimo/Config/schema.xml new file mode 100644 index 000000000..a4e2315b0 --- /dev/null +++ b/local/modules/Colissimo/Config/schema.xml @@ -0,0 +1,7 @@ + + + + + From 5b637598e96c15925f7b28a23b313a12f9a01316 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Fri, 6 Sep 2013 16:31:04 +0200 Subject: [PATCH 070/125] refactor phpdoc block for BaseLoop::getArgDefinitions(); --- .../Thelia/Core/Template/Element/BaseLoop.php | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/core/lib/Thelia/Core/Template/Element/BaseLoop.php b/core/lib/Thelia/Core/Template/Element/BaseLoop.php index 98ed8af33..e1f975dbd 100755 --- a/core/lib/Thelia/Core/Template/Element/BaseLoop.php +++ b/core/lib/Thelia/Core/Template/Element/BaseLoop.php @@ -249,14 +249,25 @@ abstract class BaseLoop * * public function defineArgs() * { - * return array ( - * "ref", - * "id" => "optional", - * "stock" => array( - * "optional", - * "default" => 10 - * ) - * ); + * return new ArgumentCollection( + * Argument::createIntListTypeArgument('id'), + * new Argument( + * 'ref', + * new TypeCollection( + * new Type\AlphaNumStringListType() + * ) + * ), + * Argument::createIntListTypeArgument('category'), + * Argument::createBooleanTypeArgument('new'), + * Argument::createBooleanTypeArgument('promo'), + * Argument::createFloatTypeArgument('min_price'), + * Argument::createFloatTypeArgument('max_price'), + * Argument::createIntTypeArgument('min_stock'), + * Argument::createFloatTypeArgument('min_weight'), + * Argument::createFloatTypeArgument('max_weight'), + * Argument::createBooleanTypeArgument('current'), + * + * ); * } * * you can retrieve ref value using $this->ref From 8ba5ef616d93fab9dc1f084565e956073c8eab0a Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Fri, 6 Sep 2013 16:34:55 +0200 Subject: [PATCH 071/125] change phpdoc for BaseLoop::exec method --- .../Thelia/Core/Template/Element/BaseLoop.php | 42 +++++++------------ 1 file changed, 15 insertions(+), 27 deletions(-) diff --git a/core/lib/Thelia/Core/Template/Element/BaseLoop.php b/core/lib/Thelia/Core/Template/Element/BaseLoop.php index e1f975dbd..f053999dc 100755 --- a/core/lib/Thelia/Core/Template/Element/BaseLoop.php +++ b/core/lib/Thelia/Core/Template/Element/BaseLoop.php @@ -243,11 +243,24 @@ abstract class BaseLoop * * this function have to be implement in your own loop class. * - * All your parameters are defined in defineArgs() and can be accessible like a class property. + * All loops parameters can be accesible via getter. + * + * for example, ref parameter is accessible through getRef method + * + * @param $pagination + * + * @return mixed + */ + abstract public function exec(&$pagination); + + /** + * + * define all args used in your loop + * * * example : * - * public function defineArgs() + * public function getArgDefinitions() * { * return new ArgumentCollection( * Argument::createIntListTypeArgument('id'), @@ -270,31 +283,6 @@ abstract class BaseLoop * ); * } * - * you can retrieve ref value using $this->ref - * - * @param $pagination - * - * @return mixed - */ - abstract public function exec(&$pagination); - - /** - * - * define all args used in your loop - * - * array key is your arg name. - * - * example : - * - * return array ( - * "ref", - * "id" => "optional", - * "stock" => array( - * "optional", - * "default" => 10 - * ) - * ); - * * @return \Thelia\Core\Template\Loop\Argument\ArgumentCollection */ abstract protected function getArgDefinitions(); From e9c47bf59d2876999d2dcf9f6cd916d66ce219a6 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Fri, 6 Sep 2013 16:45:13 +0200 Subject: [PATCH 072/125] fix typo --- core/lib/Thelia/Core/Template/Element/BaseLoop.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/lib/Thelia/Core/Template/Element/BaseLoop.php b/core/lib/Thelia/Core/Template/Element/BaseLoop.php index f053999dc..d74f9894b 100755 --- a/core/lib/Thelia/Core/Template/Element/BaseLoop.php +++ b/core/lib/Thelia/Core/Template/Element/BaseLoop.php @@ -243,7 +243,7 @@ abstract class BaseLoop * * this function have to be implement in your own loop class. * - * All loops parameters can be accesible via getter. + * All loops parameters can be accessible via getter. * * for example, ref parameter is accessible through getRef method * From fa7d88f8dced728d575704064fd0a644b880e27f Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Fri, 6 Sep 2013 17:34:25 +0200 Subject: [PATCH 073/125] country id can be an argument for calculate method --- core/lib/Thelia/Module/DeliveryModuleInterface.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/lib/Thelia/Module/DeliveryModuleInterface.php b/core/lib/Thelia/Module/DeliveryModuleInterface.php index 2ef593ee5..b8ffcfc01 100644 --- a/core/lib/Thelia/Module/DeliveryModuleInterface.php +++ b/core/lib/Thelia/Module/DeliveryModuleInterface.php @@ -32,5 +32,5 @@ interface DeliveryModuleInterface extends BaseModuleInterface { * * @return mixed */ - public function calculate(); + public function calculate($country = null); } \ No newline at end of file From 2fda14cfebdd795e2e9dcb2a3cc323538fc5c224 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Fri, 6 Sep 2013 17:35:51 +0200 Subject: [PATCH 074/125] remove htmlpurifier dependency --- composer.json | 1 - composer.lock | 47 +---------------------------------------------- 2 files changed, 1 insertion(+), 47 deletions(-) diff --git a/composer.json b/composer.json index 09aa606b5..65bda32df 100755 --- a/composer.json +++ b/composer.json @@ -9,7 +9,6 @@ }, "require":{ "php": ">=5.4", - "ezyang/htmlpurifier": "dev-master", "ircmaxell/password-compat": "dev-master", "propel/propel": "dev-master", "psr/log" : "1.0", diff --git a/composer.lock b/composer.lock index a54fe3024..003a08134 100755 --- a/composer.lock +++ b/composer.lock @@ -3,52 +3,8 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "db69990b239a4056558bfd694115d01b", + "hash": "8e587529653e78cd92e2a4aa7121bf36", "packages": [ - { - "name": "ezyang/htmlpurifier", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "fac747bdbdba6aeaba4bed91ef49b2378c1798e4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/fac747bdbdba6aeaba4bed91ef49b2378c1798e4", - "reference": "fac747bdbdba6aeaba4bed91ef49b2378c1798e4", - "shasum": "" - }, - "require": { - "php": ">=5.2" - }, - "type": "library", - "autoload": { - "psr-0": { - "HTMLPurifier": "library/" - }, - "files": [ - "library/HTMLPurifier.composer.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "LGPL" - ], - "authors": [ - { - "name": "Edward Z. Yang", - "email": "admin@htmlpurifier.org", - "homepage": "http://ezyang.com" - } - ], - "description": "Standards compliant HTML filter written in PHP", - "homepage": "http://htmlpurifier.org/", - "keywords": [ - "html" - ], - "time": "2013-08-18 02:27:26" - }, { "name": "imagine/imagine", "version": "dev-master", @@ -2035,7 +1991,6 @@ ], "minimum-stability": "stable", "stability-flags": { - "ezyang/htmlpurifier": 20, "ircmaxell/password-compat": 20, "propel/propel": 20, "kriswallsmith/assetic": 20, From a3b7e977da1c7ce1a6d7cbcf398a9ee6156f7e97 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Fri, 6 Sep 2013 17:40:49 +0200 Subject: [PATCH 075/125] create base loop for delivery and payment entities --- .../Core/Template/Loop/BaseSpecificModule.php | 109 ++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 core/lib/Thelia/Core/Template/Loop/BaseSpecificModule.php diff --git a/core/lib/Thelia/Core/Template/Loop/BaseSpecificModule.php b/core/lib/Thelia/Core/Template/Loop/BaseSpecificModule.php new file mode 100644 index 000000000..017363a2b --- /dev/null +++ b/core/lib/Thelia/Core/Template/Loop/BaseSpecificModule.php @@ -0,0 +1,109 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Core\Template\Loop; +use Propel\Runtime\ActiveQuery\Criteria; +use Thelia\Core\Template\Element\BaseLoop; +use Thelia\Core\Template\Loop\Argument\Argument; +use Thelia\Core\Template\Loop\Argument\ArgumentCollection; +use Thelia\Model\ModuleQuery; + + +/** + * Class Delivery + * @package Thelia\Core\Template\Loop + * @author Manuel Raynaud + */ +class BaseSpecificModule extends BaseLoop { + public $timestampable = true; + public $versionable = true; + + /** + * + * define all args used in your loop + * + * + * example : + * + * public function getArgDefinitions() + * { + * return new ArgumentCollection( + * Argument::createIntListTypeArgument('id'), + * new Argument( + * 'ref', + * new TypeCollection( + * new Type\AlphaNumStringListType() + * ) + * ), + * Argument::createIntListTypeArgument('category'), + * Argument::createBooleanTypeArgument('new'), + * Argument::createBooleanTypeArgument('promo'), + * Argument::createFloatTypeArgument('min_price'), + * Argument::createFloatTypeArgument('max_price'), + * Argument::createIntTypeArgument('min_stock'), + * Argument::createFloatTypeArgument('min_weight'), + * Argument::createFloatTypeArgument('max_weight'), + * Argument::createBooleanTypeArgument('current'), + * + * ); + * } + * + * @return \Thelia\Core\Template\Loop\Argument\ArgumentCollection + */ + protected function getArgDefinitions() + { + return new ArgumentCollection( + Argument::createIntTypeArgument('id'), + Argument::createIntListTypeArgument('exclude') + ); + } + + /** + * + * this function have to be implement in your own loop class. + * + * All loops parameters can be accesible via getter. + * + * for example, ref parameter is accessible through getRef method + * + * @param $pagination + * + * @return \Thelia\Model\ModuleQuery + */ + public function exec(&$pagination) + { + $search = ModuleQuery::create(); + + if(null !== $id = $this->getId()) + { + $search->filterById($id); + } + + + if (null !== $exclude = $this->getExclude()) { + $search->filterById($exclude, Criteria::NOT_IN); + } + + return $search; + } +} \ No newline at end of file From c68f282fe84c55cf14eb1509c95bbfaabeb133ef Mon Sep 17 00:00:00 2001 From: franck Date: Fri, 6 Sep 2013 17:46:40 +0200 Subject: [PATCH 076/125] Continuing categories administration... --- core/lib/Thelia/Action/Category.php | 2 + core/lib/Thelia/Config/Resources/config.xml | 5 +- .../Thelia/Config/Resources/routing/admin.xml | 24 ++- .../Controller/Admin/BaseAdminController.php | 2 +- .../Controller/Admin/CategoryController.php | 138 +++++------- .../Controller/Admin/ConfigController.php | 7 + .../Controller/Admin/CurrencyController.php | 7 + .../Controller/Admin/MessageController.php | 26 ++- .../Thelia/Core/Event/CategoryCreateEvent.php | 5 +- .../Thelia/Core/Event/CategoryDeleteEvent.php | 1 + core/lib/Thelia/Core/Event/CategoryEvent.php | 8 +- .../Event/CategoryToggleVisibilityEvent.php | 30 +-- .../Thelia/Core/Event/CategoryUpdateEvent.php | 84 +++++++- core/lib/Thelia/Core/Event/ConfigEvent.php | 6 +- core/lib/Thelia/Core/Event/CurrencyEvent.php | 6 +- core/lib/Thelia/Core/Event/MessageEvent.php | 6 +- .../Core/Template/Assets/AsseticHelper.php | 2 +- core/lib/Thelia/Form/CategoryCreationForm.php | 3 +- core/lib/Thelia/Form/CategoryDeletionForm.php | 44 ---- templates/admin/default/categories.html | 199 ++++++------------ 20 files changed, 289 insertions(+), 316 deletions(-) delete mode 100755 core/lib/Thelia/Form/CategoryDeletionForm.php diff --git a/core/lib/Thelia/Action/Category.php b/core/lib/Thelia/Action/Category.php index 1b0568cbe..7b7608dc9 100755 --- a/core/lib/Thelia/Action/Category.php +++ b/core/lib/Thelia/Action/Category.php @@ -51,6 +51,8 @@ class Category extends BaseAction implements EventSubscriberInterface $event->getParent(), $event->getLocale() ); + + $event->setCategory($category); } public function update(CategoryChangeEvent $event) diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml index c5c91a10e..e9e43d186 100755 --- a/core/lib/Thelia/Config/Resources/config.xml +++ b/core/lib/Thelia/Config/Resources/config.xml @@ -47,7 +47,10 @@
    - + + + + diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml index 4b2b6b4df..9fec5eb2e 100755 --- a/core/lib/Thelia/Config/Resources/routing/admin.xml +++ b/core/lib/Thelia/Config/Resources/routing/admin.xml @@ -33,27 +33,31 @@ - + + Thelia\Controller\Admin\CategoryController::defaultAction + + + Thelia\Controller\Admin\CategoryController::createAction - + Thelia\Controller\Admin\CategoryController::changeAction - + Thelia\Controller\Admin\CategoryController::saveChangeAction - + Thelia\Controller\Admin\CategoryController::toggleOnlineAction - + Thelia\Controller\Admin\CategoryController::deleteAction - + Thelia\Controller\Admin\CategoryController::updatePositionAction @@ -127,6 +131,10 @@ Thelia\Controller\Admin\CurrencyController::setDefaultAction + + Thelia\Controller\Admin\CurrencyController::updatePositionAction + + Thelia\Controller\Admin\CurrencyController::updateRatesAction @@ -140,8 +148,8 @@ - - + + Thelia\Controller\Admin\CurrencyController::updatePositionAction diff --git a/core/lib/Thelia/Controller/Admin/BaseAdminController.php b/core/lib/Thelia/Controller/Admin/BaseAdminController.php index 101a35d20..87aff7dd9 100755 --- a/core/lib/Thelia/Controller/Admin/BaseAdminController.php +++ b/core/lib/Thelia/Controller/Admin/BaseAdminController.php @@ -68,7 +68,7 @@ class BaseAdminController extends BaseController } } catch (\Exception $ex) { - return new Response($this->errorPage($ex->getMessage())); + return $this->errorPage($ex->getMessage()); } return $this->pageNotFound(); diff --git a/core/lib/Thelia/Controller/Admin/CategoryController.php b/core/lib/Thelia/Controller/Admin/CategoryController.php index 27cffd059..81769cd29 100755 --- a/core/lib/Thelia/Controller/Admin/CategoryController.php +++ b/core/lib/Thelia/Controller/Admin/CategoryController.php @@ -35,6 +35,7 @@ use Thelia\Core\Event\CategoryChangePositionEvent; use Thelia\Form\CategoryDeletionForm; use Thelia\Model\Lang; use Thelia\Core\Translation\Translator; +use Thelia\Core\Event\CategoryUpdatePositionEvent; class CategoryController extends BaseAdminController { @@ -53,7 +54,7 @@ class CategoryController extends BaseAdminController protected function setupArgs() { // Get the category ID - $id = $this->getRequest()->get('category_id', 0); + $category_id = $this->getRequest()->get('category_id', 0); // Find the current category order $category_order = $this->getRequest()->get( @@ -62,7 +63,7 @@ class CategoryController extends BaseAdminController ); $args = array( - 'current_category_id' => $id, + 'current_category_id' => $category_id, 'category_order' => $category_order, ); @@ -84,8 +85,13 @@ class CategoryController extends BaseAdminController return $this->renderList(); } - protected function createAction($args) - { + /** + * Create a new category object + * + * @return Symfony\Component\HttpFoundation\Response the response + */ + public function createAction() { + // Check current user authorization if (null !== $response = $this->checkAuth("admin.categories.create")) return $response; @@ -103,7 +109,7 @@ class CategoryController extends BaseAdminController $createEvent = new CategoryCreateEvent(); - $categoryCreateEvent = new CategoryCreateEvent( + $createEvent = new CategoryCreateEvent( $data["title"], $data["parent"], $data["locale"] @@ -111,9 +117,11 @@ class CategoryController extends BaseAdminController $this->dispatch(TheliaEvents::CATEGORY_CREATE, $createEvent); + if (! $createEvent->hasCategory()) throw new \LogicException($this->getTranslator()->trans("No category was created.")); + $createdObject = $createEvent->getCategory(); - // Log currency creation + // Log category creation $this->adminLogAppend(sprintf("Category %s (ID %s) created", $createdObject->getName(), $createdObject->getId())); // Substitute _ID_ in the URL with the ID of the created object @@ -124,33 +132,21 @@ class CategoryController extends BaseAdminController } catch (FormValidationException $ex) { // Form cannot be validated - $error_msg = sprintf("Please check your input: %s", $ex->getMessage()); + $error_msg = $this->createStandardFormValidationErrorMessage($ex); } catch (\Exception $ex) { // Any other error - $error_msg = $ex; + $error_msg = $ex->getMessage(); } - if ($error_msg !== false) { - // An error has been detected: log it - Tlog::getInstance()->error(sprintf("Error during category creation process : %s. Exception was %s", $error_msg, $ex->getMessage())); - - // Mark the form as errored - $creationForm->setErrorMessage($error_msg); - - // Pass it to the parser, along with the error currency - $this->getParserContext() - ->addForm($creationForm) - ->setGeneralError($error_msg) - ; - } + $this->setupFormErrorContext("category creation", $error_msg, $creationForm, $ex); // At this point, the form has error, and should be redisplayed. return $this->renderList(); } /** - * Load a currency object for modification, and display the edit template. + * Load a category object for modification, and display the edit template. * * @return Symfony\Component\HttpFoundation\Response the response */ @@ -159,21 +155,21 @@ class CategoryController extends BaseAdminController // Check current user authorization if (null !== $response = $this->checkAuth("admin.categories.update")) return $response; - // Load the currency object - $currency = CategoryQuery::create() + // Load the category object + $category = CategoryQuery::create() ->joinWithI18n($this->getCurrentEditionLocale()) - ->findOneById($this->getRequest()->get('currency_id')); + ->findOneById($this->getRequest()->get('category_id')); - if ($currency != null) { + if ($category != null) { // Prepare the data that will hydrate the form $data = array( - 'id' => $currency->getId(), - 'name' => $currency->getName(), - 'locale' => $currency->getLocale(), - 'code' => $currency->getCode(), - 'symbol' => $currency->getSymbol(), - 'rate' => $currency->getRate() + 'id' => $category->getId(), + 'name' => $category->getName(), + 'locale' => $category->getLocale(), + 'code' => $category->getCode(), + 'symbol' => $category->getSymbol(), + 'rate' => $category->getRate() ); // Setup the object form @@ -184,11 +180,11 @@ class CategoryController extends BaseAdminController } // Render the edition template. - return $this->render('currency-edit', array('currency_id' => $this->getRequest()->get('currency_id'))); + return $this->render('category-edit', array('category_id' => $this->getRequest()->get('category_id'))); } /** - * Save changes on a modified currency object, and either go back to the currency list, or stay on the edition page. + * Save changes on a modified category object, and either go back to the category list, or stay on the edition page. * * @return Symfony\Component\HttpFoundation\Response the response */ @@ -202,8 +198,8 @@ class CategoryController extends BaseAdminController // Create the form from the request $changeForm = new CategoryModificationForm($this->getRequest()); - // Get the currency ID - $currency_id = $this->getRequest()->get('currency_id'); + // Get the category ID + $category_id = $this->getRequest()->get('category_id'); try { @@ -226,7 +222,9 @@ class CategoryController extends BaseAdminController $this->dispatch(TheliaEvents::CATEGORY_UPDATE, $changeEvent); - // Log currency modification + if (! $createEvent->hasCategory()) throw new \LogicException($this->getTranslator()->trans("No category was updated.")); + + // Log category modification $changedObject = $changeEvent->getCategory(); $this->adminLogAppend(sprintf("Category %s (ID %s) modified", $changedObject->getName(), $changedObject->getId())); @@ -236,7 +234,7 @@ class CategoryController extends BaseAdminController if ($this->getRequest()->get('save_mode') == 'stay') { $this->redirectToRoute( "admin.categories.update", - array('currency_id' => $currency_id) + array('category_id' => $category_id) ); } @@ -244,62 +242,28 @@ class CategoryController extends BaseAdminController $this->redirect($changeForm->getSuccessUrl()); } catch (FormValidationException $ex) { - // Invalid data entered - $error_msg = $this->getTranslator()->trans( - "Please check your input: %message", array("%message" => $ex->getMessage())); + // Form cannot be validated + $error_msg = $this->createStandardFormValidationErrorMessage($ex); } catch (\Exception $ex) { // Any other error - $error_msg = $ex; + $error_msg = $ex->getMessage(); } - $this->setupFormErrorContext( - $form, - $error_msg, - "category" - - + $this->setupFormErrorContext("category modification", $error_msg, $changeForm, $ex); // At this point, the form has errors, and should be redisplayed. - return $this->render('currency-edit', array('currency_id' => $currency_id)); - } - - - protected function setupFormErrorContext($object_type, $form, $error_message, $exception) { - - if ($error_message !== false) { - // Lot the error message - Tlog::getInstance()->error( - $this->getTranslator()->trans( - "Error during %type modification process : %error. Exception was %exc", - array( - "%type" => "category", - "%error" => $error_message, - "%exc" => $exception->getMessage() - ) - ) - ); - - // Mark the form as errored - $form->setErrorMessage($error_message); - - // Pas the form and the error to the parser - $this->getParserContext() - ->addForm($form) - ->setGeneralError($error_message) - ; - } - + return $this->render('category-edit', array('category_id' => $category_id)); } /** - * Sets the default currency + * Online status toggle category */ - public function setDefaultAction() { + public function setToggleVisibilityAction() { // Check current user authorization if (null !== $response = $this->checkAuth("admin.categories.update")) return $response; - $changeEvent = new CategoryUpdateEvent($this->getRequest()->get('currency_id', 0)); + $changeEvent = new CategoryUpdateEvent($this->getRequest()->get('category_id', 0)); // Create and dispatch the change event $changeEvent->setIsDefault(true); @@ -316,7 +280,7 @@ class CategoryController extends BaseAdminController } /** - * Update currency position + * Update categoryposition */ public function updatePositionAction() { // Check current user authorization @@ -335,7 +299,7 @@ class CategoryController extends BaseAdminController $position = $this->getRequest()->get('position', null); $event = new CategoryUpdatePositionEvent( - $this->getRequest()->get('currency_id', null), + $this->getRequest()->get('category_id', null), $mode, $this->getRequest()->get('position', null) ); @@ -350,9 +314,8 @@ class CategoryController extends BaseAdminController $this->redirectToRoute('admin.categories.default'); } - /** - * Delete a currency object + * Delete a category object * * @return Symfony\Component\HttpFoundation\Response the response */ @@ -361,11 +324,14 @@ class CategoryController extends BaseAdminController // Check current user authorization if (null !== $response = $this->checkAuth("admin.categories.delete")) return $response; - // Get the currency id, and dispatch the delet request - $event = new CategoryDeleteEvent($this->getRequest()->get('currency_id')); + // Get the category id, and dispatch the deleted request + $event = new CategoryDeleteEvent($this->getRequest()->get('category_id')); $this->dispatch(TheliaEvents::CATEGORY_DELETE, $event); + if ($event->hasCategory()) + $this->adminLogAppend(sprintf("Category %s (ID %s) deleted", $event->getCategory()->getTitle(), $event->getCategory()->getId())); + $this->redirectToRoute('admin.categories.default'); } } \ No newline at end of file diff --git a/core/lib/Thelia/Controller/Admin/ConfigController.php b/core/lib/Thelia/Controller/Admin/ConfigController.php index 17b24530e..6d1a04b05 100644 --- a/core/lib/Thelia/Controller/Admin/ConfigController.php +++ b/core/lib/Thelia/Controller/Admin/ConfigController.php @@ -108,6 +108,8 @@ class ConfigController extends BaseAdminController $this->dispatch(TheliaEvents::CONFIG_CREATE, $createEvent); + if (! $createEvent->hasConfig()) throw new \LogicException($this->getTranslator()->trans("No variable was created.")); + $createdObject = $createEvent->getConfig(); // Log config creation @@ -219,6 +221,8 @@ class ConfigController extends BaseAdminController $this->dispatch(TheliaEvents::CONFIG_UPDATE, $changeEvent); + if (! $changeEvent->hasConfig()) throw new \LogicException($this->getTranslator()->trans("No variable was updated.")); + // Log config modification $changedObject = $changeEvent->getConfig(); @@ -290,6 +294,9 @@ class ConfigController extends BaseAdminController $this->dispatch(TheliaEvents::CONFIG_DELETE, $event); + if ($event->hasConfig()) + $this->adminLogAppend(sprintf("Variable %s (ID %s) modified", $event->getConfig()->getName(), $event->getConfig()->getId())); + $this->redirectToRoute('admin.configuration.variables.default'); } } \ No newline at end of file diff --git a/core/lib/Thelia/Controller/Admin/CurrencyController.php b/core/lib/Thelia/Controller/Admin/CurrencyController.php index 4d0a2cc06..c6f5afdc3 100644 --- a/core/lib/Thelia/Controller/Admin/CurrencyController.php +++ b/core/lib/Thelia/Controller/Admin/CurrencyController.php @@ -108,6 +108,8 @@ class CurrencyController extends BaseAdminController $this->dispatch(TheliaEvents::CURRENCY_CREATE, $createEvent); + if (! $createEvent->hasCurrency()) throw new \LogicException($this->getTranslator()->trans("No currency was created.")); + $createdObject = $createEvent->getCurrency(); // Log currency creation @@ -211,6 +213,8 @@ class CurrencyController extends BaseAdminController $this->dispatch(TheliaEvents::CURRENCY_UPDATE, $changeEvent); + if (! $changeEvent->hasCurrency()) throw new \LogicException($this->getTranslator()->trans("No currency was updated.")); + // Log currency modification $changedObject = $changeEvent->getCurrency(); @@ -335,6 +339,9 @@ class CurrencyController extends BaseAdminController $this->dispatch(TheliaEvents::CURRENCY_DELETE, $event); + if ($event->hasCurrency()) + $this->adminLogAppend(sprintf("Currency %s (ID %s) modified", $event->getCurrency()->getName(), $event->getCurrency()->getId())); + $this->redirectToRoute('admin.configuration.currencies.default'); } } \ No newline at end of file diff --git a/core/lib/Thelia/Controller/Admin/MessageController.php b/core/lib/Thelia/Controller/Admin/MessageController.php index 8c042aa0d..00fcb17bd 100644 --- a/core/lib/Thelia/Controller/Admin/MessageController.php +++ b/core/lib/Thelia/Controller/Admin/MessageController.php @@ -42,6 +42,15 @@ use Thelia\Form\MessageCreationForm; */ class MessageController extends BaseAdminController { + /** + * Render the messages list + * + * @return Symfony\Component\HttpFoundation\Response the response + */ + protected function renderList() { + return $this->render('messages'); + } + /** * The default action is displaying the messages list. * @@ -51,7 +60,7 @@ class MessageController extends BaseAdminController if (null !== $response = $this->checkAuth("admin.configuration.messages.view")) return $response; - return $this->render('messages'); + return $this->renderList(); } /** @@ -66,7 +75,7 @@ class MessageController extends BaseAdminController $message = false; - // Create the Creation Form + // Create the creation Form $creationForm = new MessageCreationForm($this->getRequest()); try { @@ -87,10 +96,11 @@ class MessageController extends BaseAdminController $this->dispatch(TheliaEvents::MESSAGE_CREATE, $createEvent); + if (! $createEvent->hasMessage()) throw new \LogicException($this->getTranslator()->trans("No message was created.")); + $createdObject = $createEvent->getMessage(); - // Log message creation - $this->adminLogAppend(sprintf("Variable %s (ID %s) created", $createdObject->getName(), $createdObject->getId())); + $this->adminLogAppend(sprintf("Message %s (ID %s) created", $createdObject->getName(), $createdObject->getId())); // Substitute _ID_ in the URL with the ID of the created object $successUrl = str_replace('_ID_', $createdObject->getId(), $creationForm->getSuccessUrl()); @@ -194,7 +204,8 @@ class MessageController extends BaseAdminController $this->dispatch(TheliaEvents::MESSAGE_UPDATE, $changeEvent); - // Log message modification + if (! $changeEvent->hasMessage()) throw new \LogicException($this->getTranslator()->trans("No message was updated.")); + $changedObject = $changeEvent->getMessage(); $this->adminLogAppend(sprintf("Variable %s (ID %s) modified", $changedObject->getName(), $changedObject->getId())); @@ -241,6 +252,9 @@ class MessageController extends BaseAdminController $this->dispatch(TheliaEvents::MESSAGE_DELETE, $event); - $this->redirect(URL::getInstance()->adminViewUrl('messages')); + if ($event->hasMessage()) + $this->adminLogAppend(sprintf("Message %s (ID %s) modified", $event->getMessage()->getName(), $event->getMessage()->getId())); + + $this->redirectToRoute('admin.configuration.messages.default'); } } \ No newline at end of file diff --git a/core/lib/Thelia/Core/Event/CategoryCreateEvent.php b/core/lib/Thelia/Core/Event/CategoryCreateEvent.php index 1bcfe5f56..0a6b79269 100644 --- a/core/lib/Thelia/Core/Event/CategoryCreateEvent.php +++ b/core/lib/Thelia/Core/Event/CategoryCreateEvent.php @@ -46,6 +46,7 @@ class CategoryCreateEvent extends CategoryEvent public function setTitle($title) { $this->title = $title; + return $this; } public function getParent() @@ -56,6 +57,7 @@ class CategoryCreateEvent extends CategoryEvent public function setParent($parent) { $this->parent = $parent; + return $this; } public function getLocale() @@ -66,5 +68,6 @@ class CategoryCreateEvent extends CategoryEvent public function setLocale($locale) { $this->locale = $locale; + return $this; } -} +} \ No newline at end of file diff --git a/core/lib/Thelia/Core/Event/CategoryDeleteEvent.php b/core/lib/Thelia/Core/Event/CategoryDeleteEvent.php index 05253d435..ad686563d 100644 --- a/core/lib/Thelia/Core/Event/CategoryDeleteEvent.php +++ b/core/lib/Thelia/Core/Event/CategoryDeleteEvent.php @@ -40,5 +40,6 @@ class CategoryDeleteEvent extends CategoryEvent public function setCategoryId($category_id) { $this->category_id = $category_id; + return $this; } } \ No newline at end of file diff --git a/core/lib/Thelia/Core/Event/CategoryEvent.php b/core/lib/Thelia/Core/Event/CategoryEvent.php index 90fbd1e1f..ac04f15c9 100644 --- a/core/lib/Thelia/Core/Event/CategoryEvent.php +++ b/core/lib/Thelia/Core/Event/CategoryEvent.php @@ -28,13 +28,17 @@ use Thelia\Core\Event\ActionEvent; class CategoryEvent extends ActionEvent { - public $category; + public $category = null; - public function __construct(Category $category) + public function __construct(Category $category = null) { $this->category = $category; } + public function hasCategory() { + return ! is_null($this->category); + } + public function getCategory() { return $this->category; diff --git a/core/lib/Thelia/Core/Event/CategoryToggleVisibilityEvent.php b/core/lib/Thelia/Core/Event/CategoryToggleVisibilityEvent.php index 4b4d6dc88..103c5207e 100644 --- a/core/lib/Thelia/Core/Event/CategoryToggleVisibilityEvent.php +++ b/core/lib/Thelia/Core/Event/CategoryToggleVisibilityEvent.php @@ -22,35 +22,7 @@ /*************************************************************************************/ namespace Thelia\Core\Event; -use Thelia\Model\Category; -class CategoryToggleVisibilityEvent extends CategoryEvent +class CategoryToggleVisibilityEvent extends BaseToggleVisibilityEvent { - protected $category_id; - protected $category; - - public function __construct($category_id) - { - $this->category_id = $category_id; - } - - public function getCategoryId() - { - return $this->category_id; - } - - public function setCategoryId($category_id) - { - $this->category_id = $category_id; - } - - public function getCategory() - { - return $this->category; - } - - public function setCategory(Category $category) - { - $this->category = $category; - } } \ No newline at end of file diff --git a/core/lib/Thelia/Core/Event/CategoryUpdateEvent.php b/core/lib/Thelia/Core/Event/CategoryUpdateEvent.php index 8103864c5..305cf9369 100644 --- a/core/lib/Thelia/Core/Event/CategoryUpdateEvent.php +++ b/core/lib/Thelia/Core/Event/CategoryUpdateEvent.php @@ -22,17 +22,16 @@ /*************************************************************************************/ namespace Thelia\Core\Event; - use Thelia\Model\Category; -class CategoryUpdateEvent extends ActionEvent +class CategoryUpdateEvent extends CategoryCreateEvent { protected $category_id; - protected $locale; - protected $title; + protected $chapo; protected $description; protected $postscriptum; + protected $url; protected $visibility; protected $parent; @@ -41,4 +40,81 @@ class CategoryUpdateEvent extends ActionEvent { $this->category_id = $category_id; } + + public function getCategoryId() + { + return $this->category_id; + } + + public function setCategoryId($category_id) + { + $this->category_id = $category_id; + return $this; + } + + public function getChapo() + { + return $this->chapo; + } + + public function setChapo($chapo) + { + $this->chapo = $chapo; + return $this; + } + + public function getDescription() + { + return $this->description; + } + + public function setDescription($description) + { + $this->description = $description; + return $this; + } + + public function getPostscriptum() + { + return $this->postscriptum; + } + + public function setPostscriptum($postscriptum) + { + $this->postscriptum = $postscriptum; + return $this; + } + + public function getUrl() + { + return $this->url; + } + + public function setUrl($url) + { + $this->url = $url; + return $this; + } + + public function getVisibility() + { + return $this->visibility; + } + + public function setVisibility($visibility) + { + $this->visibility = $visibility; + return $this; + } + + public function getParent() + { + return $this->parent; + } + + public function setParent($parent) + { + $this->parent = $parent; + return $this; + } } diff --git a/core/lib/Thelia/Core/Event/ConfigEvent.php b/core/lib/Thelia/Core/Event/ConfigEvent.php index eb5ec57c7..5e1c673cf 100644 --- a/core/lib/Thelia/Core/Event/ConfigEvent.php +++ b/core/lib/Thelia/Core/Event/ConfigEvent.php @@ -26,13 +26,17 @@ use Thelia\Model\Config; class ConfigEvent extends ActionEvent { - protected $config; + protected $config = null; public function __construct(Config $config = null) { $this->config = $config; } + public function hasConfig() { + return ! is_null($this->config); + } + public function getConfig() { return $this->config; diff --git a/core/lib/Thelia/Core/Event/CurrencyEvent.php b/core/lib/Thelia/Core/Event/CurrencyEvent.php index e0716da0c..65ac60513 100644 --- a/core/lib/Thelia/Core/Event/CurrencyEvent.php +++ b/core/lib/Thelia/Core/Event/CurrencyEvent.php @@ -26,13 +26,17 @@ use Thelia\Model\Currency; class CurrencyEvent extends ActionEvent { - protected $currency; + protected $currency = null; public function __construct(Currency $currency = null) { $this->currency = $currency; } + public function hasCurrency() { + return ! is_null($this->currency); + } + public function getCurrency() { return $this->currency; diff --git a/core/lib/Thelia/Core/Event/MessageEvent.php b/core/lib/Thelia/Core/Event/MessageEvent.php index 18433a36b..0f46ae590 100644 --- a/core/lib/Thelia/Core/Event/MessageEvent.php +++ b/core/lib/Thelia/Core/Event/MessageEvent.php @@ -26,13 +26,17 @@ use Thelia\Model\Message; class MessageEvent extends ActionEvent { - protected $message; + protected $message = null; public function __construct(Message $message = null) { $this->message = $message; } + public function hasMessage() { + return ! is_null($this->message); + } + public function getMessage() { return $this->message; diff --git a/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php b/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php index cd7f06ac8..bf0b7450e 100755 --- a/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php +++ b/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php @@ -126,7 +126,7 @@ class AsseticHelper // // before generating 3bc974a-ad3ef47.css, delete 3bc974a-* files. // - if ($dev_mode == true || ! file_exists($target_file)) { + if (/*$dev_mode == true || */! file_exists($target_file)) { // Delete previous version of the file list($commonPart, $dummy) = explode('-', $asset_target_path); diff --git a/core/lib/Thelia/Form/CategoryCreationForm.php b/core/lib/Thelia/Form/CategoryCreationForm.php index a125ad090..5dce6a049 100755 --- a/core/lib/Thelia/Form/CategoryCreationForm.php +++ b/core/lib/Thelia/Form/CategoryCreationForm.php @@ -23,6 +23,7 @@ namespace Thelia\Form; use Symfony\Component\Validator\Constraints\NotBlank; +use Thelia\Core\Translation\Translator; class CategoryCreationForm extends BaseForm { @@ -33,7 +34,7 @@ class CategoryCreationForm extends BaseForm "constraints" => array( new NotBlank() ), - "label" => "Category title *", + "label" => Translator::getInstance()->trans("Category title *"), "label_attr" => array( "for" => "title" ) diff --git a/core/lib/Thelia/Form/CategoryDeletionForm.php b/core/lib/Thelia/Form/CategoryDeletionForm.php deleted file mode 100755 index 47c130fdd..000000000 --- a/core/lib/Thelia/Form/CategoryDeletionForm.php +++ /dev/null @@ -1,44 +0,0 @@ -. */ -/* */ -/*************************************************************************************/ -namespace Thelia\Form; - -use Symfony\Component\Validator\Constraints\NotBlank; - -class CategoryDeletionForm extends BaseForm -{ - protected function buildForm() - { - $this->formBuilder - ->add("category_id", "integer", array( - "constraints" => array( - new NotBlank() - ) - )) - ; - } - - public function getName() - { - return "thelia_category_deletion"; - } -} diff --git a/templates/admin/default/categories.html b/templates/admin/default/categories.html index 777fd4e4d..0788a87d2 100755 --- a/templates/admin/default/categories.html +++ b/templates/admin/default/categories.html @@ -269,7 +269,6 @@ {module_include location='product_list_row'}
    		-<<<<<<< HEAD {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.products.edit"}
    @@ -277,15 +276,10 @@ {/loop} {elseloop rel="can_change"} -
    - -
    - {/elseloop} -=======
    ->>>>>>> ebb350111a2c65929f8c61f621c9a8a6dd878984 + {/elseloop}
    		@@ -333,72 +327,63 @@ {* Adding a new Category *} - {* Delete category confirmation dialog *} @@ -442,7 +427,6 @@ {/javascripts} -<<<<<<< HEAD -======= - ->>>>>>> ebb350111a2c65929f8c61f621c9a8a6dd878984 {/block} \ No newline at end of file From b067ef7dcc6a326e88f76f2dee84785efbd5d3d1 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Fri, 6 Sep 2013 18:41:44 +0200 Subject: [PATCH 077/125] create Delivery loop --- core/lib/Thelia/Config/Resources/config.xml | 1 + .../Core/Template/Loop/BaseSpecificModule.php | 6 +- .../Thelia/Core/Template/Loop/Delivery.php | 82 +++++++++++++++++++ core/lib/Thelia/Core/Thelia.php | 2 +- core/lib/Thelia/Model/Base/Module.php | 76 +++++++++++++++-- core/lib/Thelia/Model/Base/ModuleQuery.php | 35 +++++++- core/lib/Thelia/Model/Map/ModuleTableMap.php | 36 ++++---- install/thelia.sql | 1 + local/config/schema.xml | 1 + local/modules/Colissimo/Colissimo.php | 3 +- templates/default/delivery_list.html | 10 +++ 11 files changed, 224 insertions(+), 29 deletions(-) create mode 100644 core/lib/Thelia/Core/Template/Loop/Delivery.php create mode 100644 templates/default/delivery_list.html diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml index 198c49228..440e095f7 100755 --- a/core/lib/Thelia/Config/Resources/config.xml +++ b/core/lib/Thelia/Config/Resources/config.xml @@ -34,6 +34,7 @@ + diff --git a/core/lib/Thelia/Core/Template/Loop/BaseSpecificModule.php b/core/lib/Thelia/Core/Template/Loop/BaseSpecificModule.php index 017363a2b..3b4e54be6 100644 --- a/core/lib/Thelia/Core/Template/Loop/BaseSpecificModule.php +++ b/core/lib/Thelia/Core/Template/Loop/BaseSpecificModule.php @@ -23,7 +23,7 @@ namespace Thelia\Core\Template\Loop; use Propel\Runtime\ActiveQuery\Criteria; -use Thelia\Core\Template\Element\BaseLoop; +use Thelia\Core\Template\Element\BaseI18nLoop; use Thelia\Core\Template\Loop\Argument\Argument; use Thelia\Core\Template\Loop\Argument\ArgumentCollection; use Thelia\Model\ModuleQuery; @@ -34,9 +34,8 @@ use Thelia\Model\ModuleQuery; * @package Thelia\Core\Template\Loop * @author Manuel Raynaud */ -class BaseSpecificModule extends BaseLoop { +class BaseSpecificModule extends BaseI18nLoop { public $timestampable = true; - public $versionable = true; /** * @@ -106,4 +105,5 @@ class BaseSpecificModule extends BaseLoop { return $search; } + } \ No newline at end of file diff --git a/core/lib/Thelia/Core/Template/Loop/Delivery.php b/core/lib/Thelia/Core/Template/Loop/Delivery.php new file mode 100644 index 000000000..6a634d2bf --- /dev/null +++ b/core/lib/Thelia/Core/Template/Loop/Delivery.php @@ -0,0 +1,82 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Core\Template\Loop; +use Thelia\Core\Template\Element\LoopResult; +use Thelia\Core\Template\Element\LoopResultRow; +use Thelia\Core\Template\Loop\Argument\Argument; + + +/** + * Class Delivery + * @package Thelia\Core\Template\Loop + * @author Manuel Raynaud + */ +class Delivery extends BaseSpecificModule +{ + + public function getArgDefinitions() + { + $collection = parent::getArgDefinitions(); + + $collection->addArgument( + Argument::createIntTypeArgument("country") + ); + + return $collection; + } + + public function exec(&$pagination) + { + $search = parent::exec($pagination); + /* manage translations */ + $locale = $this->configureI18nProcessing($search); + /* perform search */ + $deliveryModules = $this->search($search, $pagination); + + $loopResult = new LoopResult($deliveryModules); + + foreach ($deliveryModules as $deliveryModule) { + $loopResultRow = new LoopResultRow($loopResult, $deliveryModule, $this->versionable, $this->timestampable, $this->countable); + + $moduleReflection = new \ReflectionClass($deliveryModule->getFullNamespace()); + $moduleInstance = $moduleReflection->newInstance(); + + $moduleInstance->setRequest($this->request); + $moduleInstance->setDispatcher($this->dispatcher); + + $loopResultRow + ->set('ID', $deliveryModule->getId()) + ->set('TITLE', $deliveryModule->getVirtualColumn('i18n_TITLE')) + ->set('CHAPO', $deliveryModule->getVirtualColumn('i18n_CHAPO')) + ->set('DESCRIPTION', $deliveryModule->getVirtualColumn('i18n_DESCRIPTION')) + ->set('POSTSCRIPTUM', $deliveryModule->getVirtualColumn('i18n_POSTSCRIPTUM')) + ->set('PRICE', $moduleInstance->calculate($this->getCountry())) + ; + + $loopResult->addRow($loopResultRow); + } + + return $loopResult; + } +} \ No newline at end of file diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php index 8c4dd68e0..888ccac55 100755 --- a/core/lib/Thelia/Core/Thelia.php +++ b/core/lib/Thelia/Core/Thelia.php @@ -111,7 +111,7 @@ class Thelia extends Kernel try { $defintion = new Definition(); - $defintion->setClass($module->getCode() ."\\". ucfirst($module->getCode())); + $defintion->setClass($module->getFullNamespace()); $defintion->addMethodCall("setContainer", array('service_container')); $container->setDefinition( diff --git a/core/lib/Thelia/Model/Base/Module.php b/core/lib/Thelia/Model/Base/Module.php index 556ef9ff6..9cc89381a 100755 --- a/core/lib/Thelia/Model/Base/Module.php +++ b/core/lib/Thelia/Model/Base/Module.php @@ -89,6 +89,12 @@ abstract class Module implements ActiveRecordInterface */ protected $position; + /** + * The value for the full_namespace field. + * @var string + */ + protected $full_namespace; + /** * The value for the created_at field. * @var string @@ -456,6 +462,17 @@ abstract class Module implements ActiveRecordInterface return $this->position; } + /** + * Get the [full_namespace] column value. + * + * @return string + */ + public function getFullNamespace() + { + + return $this->full_namespace; + } + /** * Get the [optionally formatted] temporal [created_at] column value. * @@ -601,6 +618,27 @@ abstract class Module implements ActiveRecordInterface return $this; } // setPosition() + /** + * Set the value of [full_namespace] column. + * + * @param string $v new value + * @return \Thelia\Model\Module The current object (for fluent API support) + */ + public function setFullNamespace($v) + { + if ($v !== null) { + $v = (string) $v; + } + + if ($this->full_namespace !== $v) { + $this->full_namespace = $v; + $this->modifiedColumns[] = ModuleTableMap::FULL_NAMESPACE; + } + + + return $this; + } // setFullNamespace() + /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * @@ -695,13 +733,16 @@ abstract class Module implements ActiveRecordInterface $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : ModuleTableMap::translateFieldName('Position', TableMap::TYPE_PHPNAME, $indexType)]; $this->position = (null !== $col) ? (int) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : ModuleTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : ModuleTableMap::translateFieldName('FullNamespace', TableMap::TYPE_PHPNAME, $indexType)]; + $this->full_namespace = (null !== $col) ? (string) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : ModuleTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : ModuleTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : ModuleTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } @@ -714,7 +755,7 @@ abstract class Module implements ActiveRecordInterface $this->ensureConsistency(); } - return $startcol + 7; // 7 = ModuleTableMap::NUM_HYDRATE_COLUMNS. + return $startcol + 8; // 8 = ModuleTableMap::NUM_HYDRATE_COLUMNS. } catch (Exception $e) { throw new PropelException("Error populating \Thelia\Model\Module object", 0, $e); @@ -987,6 +1028,9 @@ abstract class Module implements ActiveRecordInterface if ($this->isColumnModified(ModuleTableMap::POSITION)) { $modifiedColumns[':p' . $index++] = 'POSITION'; } + if ($this->isColumnModified(ModuleTableMap::FULL_NAMESPACE)) { + $modifiedColumns[':p' . $index++] = 'FULL_NAMESPACE'; + } if ($this->isColumnModified(ModuleTableMap::CREATED_AT)) { $modifiedColumns[':p' . $index++] = 'CREATED_AT'; } @@ -1019,6 +1063,9 @@ abstract class Module implements ActiveRecordInterface case 'POSITION': $stmt->bindValue($identifier, $this->position, PDO::PARAM_INT); break; + case 'FULL_NAMESPACE': + $stmt->bindValue($identifier, $this->full_namespace, PDO::PARAM_STR); + break; case 'CREATED_AT': $stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); break; @@ -1103,9 +1150,12 @@ abstract class Module implements ActiveRecordInterface return $this->getPosition(); break; case 5: - return $this->getCreatedAt(); + return $this->getFullNamespace(); break; case 6: + return $this->getCreatedAt(); + break; + case 7: return $this->getUpdatedAt(); break; default: @@ -1142,8 +1192,9 @@ abstract class Module implements ActiveRecordInterface $keys[2] => $this->getType(), $keys[3] => $this->getActivate(), $keys[4] => $this->getPosition(), - $keys[5] => $this->getCreatedAt(), - $keys[6] => $this->getUpdatedAt(), + $keys[5] => $this->getFullNamespace(), + $keys[6] => $this->getCreatedAt(), + $keys[7] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; foreach($virtualColumns as $key => $virtualColumn) @@ -1208,9 +1259,12 @@ abstract class Module implements ActiveRecordInterface $this->setPosition($value); break; case 5: - $this->setCreatedAt($value); + $this->setFullNamespace($value); break; case 6: + $this->setCreatedAt($value); + break; + case 7: $this->setUpdatedAt($value); break; } // switch() @@ -1242,8 +1296,9 @@ abstract class Module implements ActiveRecordInterface if (array_key_exists($keys[2], $arr)) $this->setType($arr[$keys[2]]); if (array_key_exists($keys[3], $arr)) $this->setActivate($arr[$keys[3]]); if (array_key_exists($keys[4], $arr)) $this->setPosition($arr[$keys[4]]); - if (array_key_exists($keys[5], $arr)) $this->setCreatedAt($arr[$keys[5]]); - if (array_key_exists($keys[6], $arr)) $this->setUpdatedAt($arr[$keys[6]]); + if (array_key_exists($keys[5], $arr)) $this->setFullNamespace($arr[$keys[5]]); + if (array_key_exists($keys[6], $arr)) $this->setCreatedAt($arr[$keys[6]]); + if (array_key_exists($keys[7], $arr)) $this->setUpdatedAt($arr[$keys[7]]); } /** @@ -1260,6 +1315,7 @@ abstract class Module implements ActiveRecordInterface if ($this->isColumnModified(ModuleTableMap::TYPE)) $criteria->add(ModuleTableMap::TYPE, $this->type); if ($this->isColumnModified(ModuleTableMap::ACTIVATE)) $criteria->add(ModuleTableMap::ACTIVATE, $this->activate); if ($this->isColumnModified(ModuleTableMap::POSITION)) $criteria->add(ModuleTableMap::POSITION, $this->position); + if ($this->isColumnModified(ModuleTableMap::FULL_NAMESPACE)) $criteria->add(ModuleTableMap::FULL_NAMESPACE, $this->full_namespace); if ($this->isColumnModified(ModuleTableMap::CREATED_AT)) $criteria->add(ModuleTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(ModuleTableMap::UPDATED_AT)) $criteria->add(ModuleTableMap::UPDATED_AT, $this->updated_at); @@ -1329,6 +1385,7 @@ abstract class Module implements ActiveRecordInterface $copyObj->setType($this->getType()); $copyObj->setActivate($this->getActivate()); $copyObj->setPosition($this->getPosition()); + $copyObj->setFullNamespace($this->getFullNamespace()); $copyObj->setCreatedAt($this->getCreatedAt()); $copyObj->setUpdatedAt($this->getUpdatedAt()); @@ -1876,6 +1933,7 @@ abstract class Module implements ActiveRecordInterface $this->type = null; $this->activate = null; $this->position = null; + $this->full_namespace = null; $this->created_at = null; $this->updated_at = null; $this->alreadyInSave = false; diff --git a/core/lib/Thelia/Model/Base/ModuleQuery.php b/core/lib/Thelia/Model/Base/ModuleQuery.php index e1bd9de68..6f8d4b551 100755 --- a/core/lib/Thelia/Model/Base/ModuleQuery.php +++ b/core/lib/Thelia/Model/Base/ModuleQuery.php @@ -27,6 +27,7 @@ use Thelia\Model\Map\ModuleTableMap; * @method ChildModuleQuery orderByType($order = Criteria::ASC) Order by the type column * @method ChildModuleQuery orderByActivate($order = Criteria::ASC) Order by the activate column * @method ChildModuleQuery orderByPosition($order = Criteria::ASC) Order by the position column + * @method ChildModuleQuery orderByFullNamespace($order = Criteria::ASC) Order by the full_namespace column * @method ChildModuleQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column * @method ChildModuleQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column * @@ -35,6 +36,7 @@ use Thelia\Model\Map\ModuleTableMap; * @method ChildModuleQuery groupByType() Group by the type column * @method ChildModuleQuery groupByActivate() Group by the activate column * @method ChildModuleQuery groupByPosition() Group by the position column + * @method ChildModuleQuery groupByFullNamespace() Group by the full_namespace column * @method ChildModuleQuery groupByCreatedAt() Group by the created_at column * @method ChildModuleQuery groupByUpdatedAt() Group by the updated_at column * @@ -58,6 +60,7 @@ use Thelia\Model\Map\ModuleTableMap; * @method ChildModule findOneByType(int $type) Return the first ChildModule filtered by the type column * @method ChildModule findOneByActivate(int $activate) Return the first ChildModule filtered by the activate column * @method ChildModule findOneByPosition(int $position) Return the first ChildModule filtered by the position column + * @method ChildModule findOneByFullNamespace(string $full_namespace) Return the first ChildModule filtered by the full_namespace column * @method ChildModule findOneByCreatedAt(string $created_at) Return the first ChildModule filtered by the created_at column * @method ChildModule findOneByUpdatedAt(string $updated_at) Return the first ChildModule filtered by the updated_at column * @@ -66,6 +69,7 @@ use Thelia\Model\Map\ModuleTableMap; * @method array findByType(int $type) Return ChildModule objects filtered by the type column * @method array findByActivate(int $activate) Return ChildModule objects filtered by the activate column * @method array findByPosition(int $position) Return ChildModule objects filtered by the position column + * @method array findByFullNamespace(string $full_namespace) Return ChildModule objects filtered by the full_namespace column * @method array findByCreatedAt(string $created_at) Return ChildModule objects filtered by the created_at column * @method array findByUpdatedAt(string $updated_at) Return ChildModule objects filtered by the updated_at column * @@ -156,7 +160,7 @@ abstract class ModuleQuery extends ModelCriteria */ protected function findPkSimple($key, $con) { - $sql = 'SELECT ID, CODE, TYPE, ACTIVATE, POSITION, CREATED_AT, UPDATED_AT FROM module WHERE ID = :p0'; + $sql = 'SELECT ID, CODE, TYPE, ACTIVATE, POSITION, FULL_NAMESPACE, CREATED_AT, UPDATED_AT FROM module WHERE ID = :p0'; try { $stmt = $con->prepare($sql); $stmt->bindValue(':p0', $key, PDO::PARAM_INT); @@ -438,6 +442,35 @@ abstract class ModuleQuery extends ModelCriteria return $this->addUsingAlias(ModuleTableMap::POSITION, $position, $comparison); } + /** + * Filter the query on the full_namespace column + * + * Example usage: + * + * $query->filterByFullNamespace('fooValue'); // WHERE full_namespace = 'fooValue' + * $query->filterByFullNamespace('%fooValue%'); // WHERE full_namespace LIKE '%fooValue%' + * + * + * @param string $fullNamespace The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildModuleQuery The current query, for fluid interface + */ + public function filterByFullNamespace($fullNamespace = null, $comparison = null) + { + if (null === $comparison) { + if (is_array($fullNamespace)) { + $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $fullNamespace)) { + $fullNamespace = str_replace('*', '%', $fullNamespace); + $comparison = Criteria::LIKE; + } + } + + return $this->addUsingAlias(ModuleTableMap::FULL_NAMESPACE, $fullNamespace, $comparison); + } + /** * Filter the query on the created_at column * diff --git a/core/lib/Thelia/Model/Map/ModuleTableMap.php b/core/lib/Thelia/Model/Map/ModuleTableMap.php index cccaa890a..dae9fda4a 100755 --- a/core/lib/Thelia/Model/Map/ModuleTableMap.php +++ b/core/lib/Thelia/Model/Map/ModuleTableMap.php @@ -57,7 +57,7 @@ class ModuleTableMap extends TableMap /** * The total number of columns */ - const NUM_COLUMNS = 7; + const NUM_COLUMNS = 8; /** * The number of lazy-loaded columns @@ -67,7 +67,7 @@ class ModuleTableMap extends TableMap /** * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS) */ - const NUM_HYDRATE_COLUMNS = 7; + const NUM_HYDRATE_COLUMNS = 8; /** * the column name for the ID field @@ -94,6 +94,11 @@ class ModuleTableMap extends TableMap */ const POSITION = 'module.POSITION'; + /** + * the column name for the FULL_NAMESPACE field + */ + const FULL_NAMESPACE = 'module.FULL_NAMESPACE'; + /** * the column name for the CREATED_AT field */ @@ -125,12 +130,12 @@ class ModuleTableMap extends TableMap * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ protected static $fieldNames = array ( - self::TYPE_PHPNAME => array('Id', 'Code', 'Type', 'Activate', 'Position', 'CreatedAt', 'UpdatedAt', ), - self::TYPE_STUDLYPHPNAME => array('id', 'code', 'type', 'activate', 'position', 'createdAt', 'updatedAt', ), - self::TYPE_COLNAME => array(ModuleTableMap::ID, ModuleTableMap::CODE, ModuleTableMap::TYPE, ModuleTableMap::ACTIVATE, ModuleTableMap::POSITION, ModuleTableMap::CREATED_AT, ModuleTableMap::UPDATED_AT, ), - self::TYPE_RAW_COLNAME => array('ID', 'CODE', 'TYPE', 'ACTIVATE', 'POSITION', 'CREATED_AT', 'UPDATED_AT', ), - self::TYPE_FIELDNAME => array('id', 'code', 'type', 'activate', 'position', 'created_at', 'updated_at', ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, ) + self::TYPE_PHPNAME => array('Id', 'Code', 'Type', 'Activate', 'Position', 'FullNamespace', 'CreatedAt', 'UpdatedAt', ), + self::TYPE_STUDLYPHPNAME => array('id', 'code', 'type', 'activate', 'position', 'fullNamespace', 'createdAt', 'updatedAt', ), + self::TYPE_COLNAME => array(ModuleTableMap::ID, ModuleTableMap::CODE, ModuleTableMap::TYPE, ModuleTableMap::ACTIVATE, ModuleTableMap::POSITION, ModuleTableMap::FULL_NAMESPACE, ModuleTableMap::CREATED_AT, ModuleTableMap::UPDATED_AT, ), + self::TYPE_RAW_COLNAME => array('ID', 'CODE', 'TYPE', 'ACTIVATE', 'POSITION', 'FULL_NAMESPACE', 'CREATED_AT', 'UPDATED_AT', ), + self::TYPE_FIELDNAME => array('id', 'code', 'type', 'activate', 'position', 'full_namespace', 'created_at', 'updated_at', ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, ) ); /** @@ -140,12 +145,12 @@ class ModuleTableMap extends TableMap * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 */ protected static $fieldKeys = array ( - self::TYPE_PHPNAME => array('Id' => 0, 'Code' => 1, 'Type' => 2, 'Activate' => 3, 'Position' => 4, 'CreatedAt' => 5, 'UpdatedAt' => 6, ), - self::TYPE_STUDLYPHPNAME => array('id' => 0, 'code' => 1, 'type' => 2, 'activate' => 3, 'position' => 4, 'createdAt' => 5, 'updatedAt' => 6, ), - self::TYPE_COLNAME => array(ModuleTableMap::ID => 0, ModuleTableMap::CODE => 1, ModuleTableMap::TYPE => 2, ModuleTableMap::ACTIVATE => 3, ModuleTableMap::POSITION => 4, ModuleTableMap::CREATED_AT => 5, ModuleTableMap::UPDATED_AT => 6, ), - self::TYPE_RAW_COLNAME => array('ID' => 0, 'CODE' => 1, 'TYPE' => 2, 'ACTIVATE' => 3, 'POSITION' => 4, 'CREATED_AT' => 5, 'UPDATED_AT' => 6, ), - self::TYPE_FIELDNAME => array('id' => 0, 'code' => 1, 'type' => 2, 'activate' => 3, 'position' => 4, 'created_at' => 5, 'updated_at' => 6, ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, ) + self::TYPE_PHPNAME => array('Id' => 0, 'Code' => 1, 'Type' => 2, 'Activate' => 3, 'Position' => 4, 'FullNamespace' => 5, 'CreatedAt' => 6, 'UpdatedAt' => 7, ), + self::TYPE_STUDLYPHPNAME => array('id' => 0, 'code' => 1, 'type' => 2, 'activate' => 3, 'position' => 4, 'fullNamespace' => 5, 'createdAt' => 6, 'updatedAt' => 7, ), + self::TYPE_COLNAME => array(ModuleTableMap::ID => 0, ModuleTableMap::CODE => 1, ModuleTableMap::TYPE => 2, ModuleTableMap::ACTIVATE => 3, ModuleTableMap::POSITION => 4, ModuleTableMap::FULL_NAMESPACE => 5, ModuleTableMap::CREATED_AT => 6, ModuleTableMap::UPDATED_AT => 7, ), + self::TYPE_RAW_COLNAME => array('ID' => 0, 'CODE' => 1, 'TYPE' => 2, 'ACTIVATE' => 3, 'POSITION' => 4, 'FULL_NAMESPACE' => 5, 'CREATED_AT' => 6, 'UPDATED_AT' => 7, ), + self::TYPE_FIELDNAME => array('id' => 0, 'code' => 1, 'type' => 2, 'activate' => 3, 'position' => 4, 'full_namespace' => 5, 'created_at' => 6, 'updated_at' => 7, ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, ) ); /** @@ -169,6 +174,7 @@ class ModuleTableMap extends TableMap $this->addColumn('TYPE', 'Type', 'TINYINT', true, null, null); $this->addColumn('ACTIVATE', 'Activate', 'TINYINT', false, null, null); $this->addColumn('POSITION', 'Position', 'INTEGER', false, null, null); + $this->addColumn('FULL_NAMESPACE', 'FullNamespace', 'VARCHAR', false, 255, null); $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null); $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null); } // initialize() @@ -349,6 +355,7 @@ class ModuleTableMap extends TableMap $criteria->addSelectColumn(ModuleTableMap::TYPE); $criteria->addSelectColumn(ModuleTableMap::ACTIVATE); $criteria->addSelectColumn(ModuleTableMap::POSITION); + $criteria->addSelectColumn(ModuleTableMap::FULL_NAMESPACE); $criteria->addSelectColumn(ModuleTableMap::CREATED_AT); $criteria->addSelectColumn(ModuleTableMap::UPDATED_AT); } else { @@ -357,6 +364,7 @@ class ModuleTableMap extends TableMap $criteria->addSelectColumn($alias . '.TYPE'); $criteria->addSelectColumn($alias . '.ACTIVATE'); $criteria->addSelectColumn($alias . '.POSITION'); + $criteria->addSelectColumn($alias . '.FULL_NAMESPACE'); $criteria->addSelectColumn($alias . '.CREATED_AT'); $criteria->addSelectColumn($alias . '.UPDATED_AT'); } diff --git a/install/thelia.sql b/install/thelia.sql index 879f323b9..2fb3723ca 100755 --- a/install/thelia.sql +++ b/install/thelia.sql @@ -803,6 +803,7 @@ CREATE TABLE `module` `type` TINYINT NOT NULL, `activate` TINYINT, `position` INTEGER, + `full_namespace` VARCHAR(255), `created_at` DATETIME, `updated_at` DATETIME, PRIMARY KEY (`id`), diff --git a/local/config/schema.xml b/local/config/schema.xml index a9d7badc4..e6e68c4b2 100755 --- a/local/config/schema.xml +++ b/local/config/schema.xml @@ -605,6 +605,7 @@ + diff --git a/local/modules/Colissimo/Colissimo.php b/local/modules/Colissimo/Colissimo.php index d3a70c9c4..4d24cc059 100644 --- a/local/modules/Colissimo/Colissimo.php +++ b/local/modules/Colissimo/Colissimo.php @@ -57,9 +57,10 @@ class Colissimo extends BaseModule implements DeliveryModuleInterface * * calculate and return delivery price * + * @param null $country * @return mixed */ - public function calculate() + public function calculate($country = null) { // TODO: Implement calculate() method. return 2; diff --git a/templates/default/delivery_list.html b/templates/default/delivery_list.html new file mode 100644 index 000000000..c3fbcd0f3 --- /dev/null +++ b/templates/default/delivery_list.html @@ -0,0 +1,10 @@ +{include file="includes/header.html"} + +
      +{loop type="delivery" name="delivery.list"} +
    • id : #ID
      • +
    • prix : #PRICE
      • +{/loop} +
    + +{include file="includes/footer.html"} \ No newline at end of file From 0aad4baf2699ba516d7ce501b6dabdc131358c43 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Fri, 6 Sep 2013 19:29:19 +0200 Subject: [PATCH 078/125] create controller adding delivery module in session --- .../Thelia/Config/Resources/routing/front.xml | 1 + .../Controller/Front/DeliveryController.php | 19 ++++++++++--------- .../Thelia/Core/Template/Loop/Delivery.php | 3 +++ templates/default/delivery_list.html | 9 +++++++-- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/core/lib/Thelia/Config/Resources/routing/front.xml b/core/lib/Thelia/Config/Resources/routing/front.xml index 4c88f707f..aeff55d7c 100755 --- a/core/lib/Thelia/Config/Resources/routing/front.xml +++ b/core/lib/Thelia/Config/Resources/routing/front.xml @@ -63,6 +63,7 @@ Thelia\Controller\Front\DeliveryController::select + \d+ diff --git a/core/lib/Thelia/Controller/Front/DeliveryController.php b/core/lib/Thelia/Controller/Front/DeliveryController.php index abb2e7fae..ef84be6ab 100644 --- a/core/lib/Thelia/Controller/Front/DeliveryController.php +++ b/core/lib/Thelia/Controller/Front/DeliveryController.php @@ -33,7 +33,7 @@ use Thelia\Tools\URL; */ class DeliveryController extends BaseFrontController { - public function select() + public function select($delivery_id) { if ($this->getSecurityContext()->hasCustomerUser() === false) { $this->redirect(URL::getInstance()->getIndexPage()); @@ -41,15 +41,16 @@ class DeliveryController extends BaseFrontController $request = $this->getRequest(); - $deliveryId = $request->query->get("delivery_id"); + $deliveryModule = ModuleQuery::create() + ->filterById($delivery_id) + ->filterByActivate(1) + ->findOne() + ; - if($deliveryId) - { - $deliveryModule = ModuleQuery::create()->findPk($deliveryId); - - if ($deliveryModule) { - $request->getSession()->setDelivery($deliveryId); - } + if ($deliveryModule) { + $request->getSession()->setDelivery($delivery_id); + } else { + $this->pageNotFound(); } } } \ No newline at end of file diff --git a/core/lib/Thelia/Core/Template/Loop/Delivery.php b/core/lib/Thelia/Core/Template/Loop/Delivery.php index 6a634d2bf..7ef46eedc 100644 --- a/core/lib/Thelia/Core/Template/Loop/Delivery.php +++ b/core/lib/Thelia/Core/Template/Loop/Delivery.php @@ -60,6 +60,9 @@ class Delivery extends BaseSpecificModule $loopResultRow = new LoopResultRow($loopResult, $deliveryModule, $this->versionable, $this->timestampable, $this->countable); $moduleReflection = new \ReflectionClass($deliveryModule->getFullNamespace()); + if($moduleReflection->isSubclassOf("Thelia\Module\DeliveryModuleInterface") === false) { + throw new \RuntimeException(sprintf("delivery module %s is not a Thelia\Module\DeliveryModuleInterface", $deliveryModule->getCode())); + } $moduleInstance = $moduleReflection->newInstance(); $moduleInstance->setRequest($this->request); diff --git a/templates/default/delivery_list.html b/templates/default/delivery_list.html index c3fbcd0f3..2ea3cc166 100644 --- a/templates/default/delivery_list.html +++ b/templates/default/delivery_list.html @@ -2,8 +2,13 @@
      {loop type="delivery" name="delivery.list"} -
    • id : #ID
      • -
    • prix : #PRICE
      • +
    • +
        +
      • id : {#ID}
        • +
      • prix : {#PRICE}
        • +
      • Choisir : Choisir
        • +
      +
      • {/loop}
    From 49be95a2e705919085ac601d7d3b34cb4297190d Mon Sep 17 00:00:00 2001 From: gmorel Date: Fri, 6 Sep 2013 19:38:08 +0200 Subject: [PATCH 079/125] Merge branch 'master' of https://github.com/thelia/thelia into coupon # By Manuel Raynaud (18) and others # Via franck (9) and others * 'master' of https://github.com/thelia/thelia: (39 commits) Working : Working : Working : Working : Fixed minor visual glitches Working : Resize countries flag + Add bootstrap-switch fix test suite clear asset cache in cache:cler command Added a 'development mode' to assetic smarty plugin rewriting router use good Request object Added Tools\URL test case, and a test case superclass for initializing Tools\URL remove unused UrlWritin controller create router for rewriting matching customer substitutions fix typo in front id Working : For attributes on labels Working : For attributes on labels add label_attr attribute to form smarty plugin start refactorin rewriting routing ... Conflicts: core/lib/Thelia/Config/Resources/routing/front.xml templates/admin/default/assets/less/thelia/bootstrap-editable.less templates/admin/default/categories.html --- composer.json | 2 +- composer.lock | 52 +- .../Thelia/Constraint/ConstraintManager.php | 16 +- .../Constraint/Rule/AvailableForCustomer.php | 25 - .../Rule/AvailableForTotalAmount.php | 76 ++- .../Constraint/Rule/AvailableForXArticles.php | 15 +- .../Constraint/Rule/CouponRuleAbstract.php | 24 +- .../Constraint/Rule/CouponRuleInterface.php | 6 +- .../Constraint/Rule/SerializableRule.php | 32 + .../Constraint/Validator/PriceParam.php | 14 +- .../Validator/RuleParameterAbstract.php | 5 +- .../Thelia/Coupon/CouponAdapterInterface.php | 7 + core/lib/Thelia/Coupon/CouponBaseAdapter.php | 11 + .../Thelia/Coupon/CouponRuleCollection.php | 16 + .../Constraint/ConstraintManagerTest.php | 99 ++- .../Rule/AvailableForXArticlesTest.php | 593 +++++++++--------- install/faker.php | 67 +- reset_install.sh | 6 + 18 files changed, 646 insertions(+), 420 deletions(-) diff --git a/composer.json b/composer.json index cfacb934c..b9fad371a 100755 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ "simplepie/simplepie": "dev-master", "imagine/imagine": "dev-master", - "symfony/serializer": "2.2.*", + "symfony/serializer": "dev-master", "symfony/icu": "1.0" }, "require-dev" : { diff --git a/composer.lock b/composer.lock index a54fe3024..d65a35476 100755 --- a/composer.lock +++ b/composer.lock @@ -3,7 +3,7 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "db69990b239a4056558bfd694115d01b", + "hash": "3f5204c6eb90cd0dc23fad39555eff6c", "packages": [ { "name": "ezyang/htmlpurifier", @@ -128,7 +128,7 @@ "authors": [ { "name": "Anthony Ferrara", - "email": "ircmaxell@php.net", + "email": "ircmaxell@ircmaxell.com", "homepage": "http://blog.ircmaxell.com" } ], @@ -1451,6 +1451,53 @@ "homepage": "http://symfony.com", "time": "2013-08-23 14:06:02" }, + { + "name": "symfony/serializer", + "version": "dev-master", + "target-dir": "Symfony/Component/Serializer", + "source": { + "type": "git", + "url": "https://github.com/symfony/Serializer.git", + "reference": "ac373bb2cc40385031b50758f479d413679bb18c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Serializer/zipball/ac373bb2cc40385031b50758f479d413679bb18c", + "reference": "ac373bb2cc40385031b50758f479d413679bb18c", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.4-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Serializer\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Serializer Component", + "homepage": "http://symfony.com", + "time": "2013-08-09 06:59:22" + }, { "name": "symfony/translation", "version": "v2.2.6", @@ -2043,6 +2090,7 @@ "ptachoire/cssembed": 20, "simplepie/simplepie": 20, "imagine/imagine": 20, + "symfony/serializer": 20, "fzaninotto/faker": 20 }, "platform": { diff --git a/core/lib/Thelia/Constraint/ConstraintManager.php b/core/lib/Thelia/Constraint/ConstraintManager.php index 28073abaa..4505229b2 100644 --- a/core/lib/Thelia/Constraint/ConstraintManager.php +++ b/core/lib/Thelia/Constraint/ConstraintManager.php @@ -24,6 +24,10 @@ namespace Thelia\Constraint; use Symfony\Component\DependencyInjection\ContainerInterface; +use Symfony\Component\Serializer\Encoder\JsonEncoder; +use Symfony\Component\Serializer\Encoder\XmlEncoder; +use Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer; +use Symfony\Component\Serializer\Serializer; use Thelia\Constraint\Rule\CouponRuleInterface; use Thelia\Constraint\Rule\SerializableRule; use Thelia\Coupon\CouponAdapterInterface; @@ -102,7 +106,8 @@ class ConstraintManager $serializableRules[] = $rule->getSerializableRule(); } } - return (string) base64_encode(serialize($serializableRules)); + + return base64_encode(json_encode($serializableRules)); } /** @@ -114,7 +119,8 @@ class ConstraintManager */ public function unserializeCouponRuleCollection($serializedRules) { - $unserializedRules = unserialize(base64_decode($serializedRules)); + $unserializedRules = json_decode(base64_decode($serializedRules)); + $collection = new CouponRuleCollection(); if (!empty($serializedRules) && !empty($unserializedRules)) { @@ -124,10 +130,10 @@ class ConstraintManager /** @var CouponRuleInterface $couponRule */ $couponRule = $this->container->get($rule->ruleServiceId); $couponRule->populateFromForm( - $rule->operators, - $rule->values + (array) $rule->operators, + (array) $rule->values ); - $collection->add($couponRule); + $collection->add(clone $couponRule); } } } diff --git a/core/lib/Thelia/Constraint/Rule/AvailableForCustomer.php b/core/lib/Thelia/Constraint/Rule/AvailableForCustomer.php index 299736d89..ad722eb5c 100644 --- a/core/lib/Thelia/Constraint/Rule/AvailableForCustomer.php +++ b/core/lib/Thelia/Constraint/Rule/AvailableForCustomer.php @@ -53,31 +53,6 @@ class AvailableForCustomer extends CouponRuleAbstract /** @var RuleValidator Customer Validator */ protected $customerValidator = null; - /** - * Constructor - * - * @param CouponAdapterInterface $adapter allowing to gather - * all necessary Thelia variables - * @param array $validators Array of RuleValidator - * validating $paramsToValidate against - * - * @throws InvalidRuleException - */ - public function __construct(CouponAdapterInterface $adapter, array $validators) - { - parent::__construct($adapter, $validators); - - if (isset($validators[self::PARAM1]) - && $validators[self::PARAM1] instanceof RuleValidator - ) { - $this->customerValidator = $validators[self::PARAM1]; - } else { - throw new InvalidRuleException(get_class()); - } - - $this->adapter = $adapter; - } - /** * Check if backoffice inputs are relevant or not * diff --git a/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmount.php b/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmount.php index 58c19d8fd..1cb85734a 100644 --- a/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmount.php +++ b/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmount.php @@ -52,6 +52,9 @@ class AvailableForTotalAmount extends CouponRuleAbstract /** Rule 1st parameter : currency */ CONST PARAM1_CURRENCY = 'currency'; + /** @var string Service Id from Resources/config.xml */ + protected $serviceId = 'thelia.constraint.rule.available_for_total_amount'; + /** @var array Available Operators (Operators::CONST) */ protected $availableOperators = array( Operators::INFERIOR, @@ -59,7 +62,7 @@ class AvailableForTotalAmount extends CouponRuleAbstract Operators::SUPERIOR, ); - /** @var PriceParam Price Validator */ + /** @var RuleValidator Price Validator */ protected $priceValidator = null; /** @@ -90,7 +93,7 @@ class AvailableForTotalAmount extends CouponRuleAbstract $this->checkBackOfficeInputsOperators(); - return $this->isPriceValid($price->getPrice()); + return $this->isPriceValid($price->getPrice(), $price->getCurrency()); } /** @@ -101,33 +104,51 @@ class AvailableForTotalAmount extends CouponRuleAbstract */ public function checkCheckoutInput() { - if (!isset($this->paramsToValidate) - || empty($this->paramsToValidate) - ||!isset($this->paramsToValidate[self::PARAM1_PRICE]) - ) { - throw new InvalidRuleValueException(get_class(), self::PARAM1_PRICE); + $currency = $this->adapter->getCheckoutCurrency(); + if (empty($currency)) { + throw new InvalidRuleValueException( + get_class(), self::PARAM1_CURRENCY + ); } - $price = $this->paramsToValidate[self::PARAM1_PRICE]; + $price = $this->adapter->getCartTotalPrice(); + if (empty($price)) { + throw new InvalidRuleValueException( + get_class(), self::PARAM1_PRICE + ); + } - return $this->isPriceValid($price); + $this->paramsToValidate = array( + self::PARAM1_PRICE => $this->adapter->getCartTotalPrice(), + self::PARAM1_CURRENCY => $this->adapter->getCheckoutCurrency() + ); + + return $this->isPriceValid($price, $currency); } /** * Check if a price is valid * - * @param float $price Price to check + * @param float $price Price to check + * @param string $currency Price currency * * @throws InvalidRuleValueException if Value is not allowed * @return bool */ - protected function isPriceValid($price) + protected function isPriceValid($price, $currency) { $priceValidator = $this->priceValidator; - try { - $priceValidator->getParam()->compareTo($price); - } catch(\InvalidArgumentException $e) { - throw new InvalidRuleValueException(get_class(), self::PARAM1_PRICE); + + /** @var PriceParam $param */ + $param = $priceValidator->getParam(); + if ($currency == $param->getCurrency()) { + try { + $priceValidator->getParam()->compareTo($price); + } catch(\InvalidArgumentException $e) { + throw new InvalidRuleValueException(get_class(), self::PARAM1_PRICE); + } + } else { + throw new InvalidRuleValueException(get_class(), self::PARAM1_CURRENCY); } return true; @@ -141,7 +162,8 @@ class AvailableForTotalAmount extends CouponRuleAbstract protected function setParametersToValidate() { $this->paramsToValidate = array( - self::PARAM1_PRICE => $this->adapter->getCartTotalPrice() + self::PARAM1_PRICE => $this->adapter->getCartTotalPrice(), + self::PARAM1_CURRENCY => $this->adapter->getCheckoutCurrency() ); return $this; @@ -191,7 +213,7 @@ class AvailableForTotalAmount extends CouponRuleAbstract * @param array $operators Rule Operator set by the Admin * @param array $values Rule Values set by the Admin * - * @throws InvalidArgumentException + * @throws \InvalidArgumentException * @return $this */ public function populateFromForm(array $operators, array $values) @@ -199,17 +221,22 @@ class AvailableForTotalAmount extends CouponRuleAbstract if ($values[self::PARAM1_PRICE] === null || $values[self::PARAM1_CURRENCY] === null ) { - throw new InvalidArgumentException( + throw new \InvalidArgumentException( 'The Rule ' . get_class() . 'needs at least a quantity set (' . self::PARAM1_PRICE . ', ' . self::PARAM1_CURRENCY . ')' ); } - $this->priceValidator = new PriceParam( - $this->adapter, - $values[self::PARAM1_PRICE], - $values[self::PARAM1_CURRENCY] + $this->priceValidator = new RuleValidator( + $operators[self::PARAM1_PRICE], + new PriceParam( + $this->translator, + $values[self::PARAM1_PRICE], + $values[self::PARAM1_CURRENCY] + ) ); + $this->validators = array(self::PARAM1_PRICE => $this->priceValidator); + return $this; } @@ -221,13 +248,14 @@ class AvailableForTotalAmount extends CouponRuleAbstract public function getSerializableRule() { $serializableRule = new SerializableRule(); + $serializableRule->ruleServiceId = $this->serviceId; $serializableRule->operators = array( self::PARAM1_PRICE => $this->priceValidator->getOperator() ); $serializableRule->values = array( - self::PARAM1_PRICE => $this->priceValidator->getPrice(), - self::PARAM1_CURRENCY => $this->priceValidator->getCurrency() + self::PARAM1_PRICE => $this->priceValidator->getParam()->getPrice(), + self::PARAM1_CURRENCY => $this->priceValidator->getParam()->getCurrency() ); return $serializableRule; diff --git a/core/lib/Thelia/Constraint/Rule/AvailableForXArticles.php b/core/lib/Thelia/Constraint/Rule/AvailableForXArticles.php index 95ea8e5b1..a15562128 100644 --- a/core/lib/Thelia/Constraint/Rule/AvailableForXArticles.php +++ b/core/lib/Thelia/Constraint/Rule/AvailableForXArticles.php @@ -46,6 +46,9 @@ class AvailableForXArticles extends CouponRuleAbstract /** Rule 1st parameter : quantity */ CONST PARAM1_QUANTITY = 'quantity'; + /** @var string Service Id from Resources/config.xml */ + protected $serviceId = 'thelia.constraint.rule.available_for_x_articles'; + /** @var array Available Operators (Operators::CONST) */ protected $availableOperators = array( Operators::INFERIOR, @@ -198,11 +201,16 @@ class AvailableForXArticles extends CouponRuleAbstract ); } - $this->quantityValidator = new QuantityParam( - $this->adapter, - $values[self::PARAM1_QUANTITY] + $this->quantityValidator = new RuleValidator( + $operators[self::PARAM1_QUANTITY], + new QuantityParam( + $this->adapter, + $values[self::PARAM1_QUANTITY] + ) ); + $this->validators = array(self::PARAM1_QUANTITY => $this->quantityValidator); + return $this; } @@ -214,6 +222,7 @@ class AvailableForXArticles extends CouponRuleAbstract public function getSerializableRule() { $serializableRule = new SerializableRule(); + $serializableRule->ruleServiceId = $this->serviceId; $serializableRule->operators = array( self::PARAM1_QUANTITY => $this->quantityValidator->getOperator() ); diff --git a/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php b/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php index ff8a26a8a..fa5544c00 100644 --- a/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php +++ b/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php @@ -24,7 +24,7 @@ namespace Thelia\Constraint\Rule; use Symfony\Component\Intl\Exception\NotImplementedException; -use Symfony\Component\Translation\Translator; +use Thelia\Core\Translation\Translator; use Thelia\Coupon\CouponAdapterInterface; use Thelia\Constraint\Validator\ComparableInterface; use Thelia\Constraint\Validator\RuleValidator; @@ -49,6 +49,9 @@ abstract class CouponRuleAbstract implements CouponRuleInterface /** Value key in $validators */ CONST VALUE = 'value'; + /** @var string Service Id from Resources/config.xml */ + protected $serviceId = null; + /** @var array Available Operators (Operators::CONST) */ protected $availableOperators = array(); @@ -67,11 +70,12 @@ abstract class CouponRuleAbstract implements CouponRuleInterface /** * Constructor * - * @param Translator $translator Service translator + * @param CouponAdapterInterface $adapter Service adapter */ - function __construct(Translator $translator) + function __construct(CouponAdapterInterface $adapter) { - $this->translator($translator); + $this->adapter = $adapter; + $this->translator = $adapter->getTranslator(); } /** @@ -180,4 +184,16 @@ abstract class CouponRuleAbstract implements CouponRuleInterface return $this->validators; } + /** + * Get Rule Service id + * + * @return string + */ + public function getServiceId() + { + return $this->serviceId; + } + + + } \ No newline at end of file diff --git a/core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php b/core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php index f2b9447e3..ac856d212 100644 --- a/core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php +++ b/core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php @@ -23,7 +23,7 @@ namespace Thelia\Constraint\Rule; -use Symfony\Component\Translation\Translator; +use Thelia\Core\Translation\Translator; use Thelia\Coupon\CouponAdapterInterface; /** @@ -42,9 +42,9 @@ interface CouponRuleInterface /** * Constructor * - * @param Translator $translator Service translator + * @param CouponAdapterInterface $adapter Service adapter */ - function __construct(Translator $translator); + function __construct(CouponAdapterInterface $adapter); /** * Check if backoffice inputs are relevant or not diff --git a/core/lib/Thelia/Constraint/Rule/SerializableRule.php b/core/lib/Thelia/Constraint/Rule/SerializableRule.php index 3cab5e70c..011c3e261 100644 --- a/core/lib/Thelia/Constraint/Rule/SerializableRule.php +++ b/core/lib/Thelia/Constraint/Rule/SerializableRule.php @@ -45,5 +45,37 @@ class SerializableRule /** @var array Values set by Admin for this Rule */ public $values = array(); + /** + * Get Operators set by Admin for this Rule + * + * @return array + */ + public function getOperators() + { + return $this->operators; + } + + /** + * Get Rule Service id + * + * @return string + */ + public function getRuleServiceId() + { + return $this->ruleServiceId; + } + + /** + * Get Values set by Admin for this Rule + * + * @return array + */ + public function getValues() + { + return $this->values; + } + + + } \ No newline at end of file diff --git a/core/lib/Thelia/Constraint/Validator/PriceParam.php b/core/lib/Thelia/Constraint/Validator/PriceParam.php index 90538a73e..e965d6aba 100644 --- a/core/lib/Thelia/Constraint/Validator/PriceParam.php +++ b/core/lib/Thelia/Constraint/Validator/PriceParam.php @@ -23,6 +23,7 @@ namespace Thelia\Constraint\Validator; +use Thelia\Core\Translation\Translator; use Thelia\Coupon\CouponAdapterInterface; /** @@ -48,15 +49,15 @@ class PriceParam extends RuleParameterAbstract /** * Constructor * - * @param CouponAdapterInterface $adapter Provide necessary value from Thelia - * @param float $price Positive float - * @param string $currency Currency Code ISO 4217 EUR|USD|GBP + * @param Translator $translator Service translator + * @param float $price Positive float + * @param string $currency Currency Code ISO 4217 EUR|USD|GBP */ - public function __construct(CouponAdapterInterface $adapter, $price, $currency) + public function __construct(Translator $translator, $price, $currency) { $this->price = $price; $this->currency = $currency; - $this->adapter = $adapter; + $this->translator = $translator; } /** @@ -132,8 +133,7 @@ class PriceParam extends RuleParameterAbstract */ public function getToolTip() { - return $this->adapter - ->getTranslator() + return $this->translator ->trans( 'A price in %currency% (ex: 14.50)', array( diff --git a/core/lib/Thelia/Constraint/Validator/RuleParameterAbstract.php b/core/lib/Thelia/Constraint/Validator/RuleParameterAbstract.php index d8326d66f..2be4c581f 100644 --- a/core/lib/Thelia/Constraint/Validator/RuleParameterAbstract.php +++ b/core/lib/Thelia/Constraint/Validator/RuleParameterAbstract.php @@ -23,6 +23,7 @@ namespace Thelia\Constraint\Validator; +use Thelia\Core\Translation\Translator; use Thelia\Coupon\CouponAdapterInterface; use Thelia\Exception\NotImplementedException; @@ -39,8 +40,8 @@ use Thelia\Exception\NotImplementedException; */ abstract class RuleParameterAbstract implements ComparableInterface { - /** @var CouponAdapterInterface Provide necessary value from Thelia*/ - protected $adapter; + /** @var Translator Service Translator */ + protected $translator = null; /** * Get Parameter value to test against diff --git a/core/lib/Thelia/Coupon/CouponAdapterInterface.php b/core/lib/Thelia/Coupon/CouponAdapterInterface.php index 29cf059f4..134d061be 100644 --- a/core/lib/Thelia/Coupon/CouponAdapterInterface.php +++ b/core/lib/Thelia/Coupon/CouponAdapterInterface.php @@ -87,6 +87,13 @@ interface CouponAdapterInterface */ public function getCartTotalPrice(); + /** + * Return the Checkout currency EUR|USD + * + * @return string + */ + public function getCheckoutCurrency(); + /** * Return Checkout total postage (only) price * diff --git a/core/lib/Thelia/Coupon/CouponBaseAdapter.php b/core/lib/Thelia/Coupon/CouponBaseAdapter.php index 271c319d8..4d813960f 100644 --- a/core/lib/Thelia/Coupon/CouponBaseAdapter.php +++ b/core/lib/Thelia/Coupon/CouponBaseAdapter.php @@ -119,6 +119,17 @@ class CouponBaseAdapter implements CouponAdapterInterface // TODO: Implement getCartTotalPrice() method. } + /** + * Return the Checkout currency EUR|USD + * + * @return string + */ + public function getCheckoutCurrency() + { + // TODO: Implement getCheckoutCurrency() method. + } + + /** * Return the number of Products in the Cart * diff --git a/core/lib/Thelia/Coupon/CouponRuleCollection.php b/core/lib/Thelia/Coupon/CouponRuleCollection.php index 93db32beb..311e543c1 100644 --- a/core/lib/Thelia/Coupon/CouponRuleCollection.php +++ b/core/lib/Thelia/Coupon/CouponRuleCollection.php @@ -85,5 +85,21 @@ class CouponRuleCollection return isEmpty($this->rules); } + /** + * Allow to compare 2 set of rules + * + * @return string Jsoned data + */ + public function __toString() + { + $arrayToSerialize = array(); + /** @var CouponRuleInterface $rule */ + foreach ($this->getRules() as $rule) { + $arrayToSerialize[] = $rule->getSerializableRule(); + } + + return json_encode($arrayToSerialize); + } + } \ No newline at end of file diff --git a/core/lib/Thelia/Tests/Constraint/ConstraintManagerTest.php b/core/lib/Thelia/Tests/Constraint/ConstraintManagerTest.php index 5d0be5711..a5f55cee1 100644 --- a/core/lib/Thelia/Tests/Constraint/ConstraintManagerTest.php +++ b/core/lib/Thelia/Tests/Constraint/ConstraintManagerTest.php @@ -29,6 +29,8 @@ use Thelia\Constraint\Validator\PriceParam; use Thelia\Constraint\Validator\RuleValidator; use Thelia\Constraint\Rule\AvailableForTotalAmount; use Thelia\Constraint\Rule\Operators; +use Thelia\Coupon\CouponBaseAdapter; +use Thelia\Coupon\CouponBaseAdapterTest; use Thelia\Coupon\CouponRuleCollection; use Thelia\Coupon\Type\CouponInterface; use Thelia\Coupon\Type\RemoveXAmount; @@ -56,11 +58,58 @@ class ConstraintManagerTest extends \PHPUnit_Framework_TestCase { } - public function incompleteTest() + /** + * Check the if the Constraint Manager is able to check RuleValidators + */ + public function testIsMatching() { - $this->markTestIncomplete( - 'This test has not been implemented yet.' + $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getTranslator') + ->will($this->returnValue($stubTranslator)); + + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(321.98)); + + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('USD')); + + $rule1 = new AvailableForTotalAmount($stubAdapter); + $operators = array(AvailableForTotalAmount::PARAM1_PRICE => Operators::SUPERIOR); + $values = array( + AvailableForTotalAmount::PARAM1_PRICE => 40.00, + AvailableForTotalAmount::PARAM1_CURRENCY => 'USD' ); + $rule1->populateFromForm($operators, $values); + + $rule2 = new AvailableForTotalAmount($stubAdapter); + $operators = array(AvailableForTotalAmount::PARAM1_PRICE => Operators::INFERIOR); + $values = array( + AvailableForTotalAmount::PARAM1_PRICE => 400.00, + AvailableForTotalAmount::PARAM1_CURRENCY => 'USD' + ); + $rule2->populateFromForm($operators, $values); + + $rules = new CouponRuleCollection(); + $rules->add($rule1); + $rules->add($rule2); + + /** @var ConstraintManager $constraintManager */ + $constraintManager = new ConstraintManager($this->getContainer()); + + $expected = true; + $actual = $constraintManager->isMatching($rules); + + $this->assertEquals($expected, $actual, 'The ConstraintManager is no more able to check if a Rule is matching'); } /** @@ -68,9 +117,19 @@ class ConstraintManagerTest extends \PHPUnit_Framework_TestCase */ public function testRuleSerialisation() { - $translator = $this->getMock('\Thelia\Core\Translation\Translator'); + $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator') + ->disableOriginalConstructor() + ->getMock(); - $rule1 = new AvailableForTotalAmount($translator); + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getTranslator') + ->will($this->returnValue($stubTranslator)); + + $rule1 = new AvailableForTotalAmount($stubAdapter); $operators = array(AvailableForTotalAmount::PARAM1_PRICE => Operators::SUPERIOR); $values = array( AvailableForTotalAmount::PARAM1_PRICE => 40.00, @@ -78,7 +137,7 @@ class ConstraintManagerTest extends \PHPUnit_Framework_TestCase ); $rule1->populateFromForm($operators, $values); - $rule2 = new AvailableForTotalAmount($translator); + $rule2 = new AvailableForTotalAmount($stubAdapter); $operators = array(AvailableForTotalAmount::PARAM1_PRICE => Operators::INFERIOR); $values = array( AvailableForTotalAmount::PARAM1_PRICE => 400.00, @@ -86,7 +145,9 @@ class ConstraintManagerTest extends \PHPUnit_Framework_TestCase ); $rule2->populateFromForm($operators, $values); - $rules = new CouponRuleCollection(array($rule1, $rule2)); + $rules = new CouponRuleCollection(); + $rules->add($rule1); + $rules->add($rule2); /** @var ConstraintManager $constraintManager */ $constraintManager = new ConstraintManager($this->getContainer()); @@ -94,8 +155,8 @@ class ConstraintManagerTest extends \PHPUnit_Framework_TestCase $serializedRules = $constraintManager->serializeCouponRuleCollection($rules); $unserializedRules = $constraintManager->unserializeCouponRuleCollection($serializedRules); - $expected = $rules; - $actual = $unserializedRules; + $expected = (string)$rules; + $actual = (string)$unserializedRules; $this->assertEquals($expected, $actual); } @@ -109,12 +170,26 @@ class ConstraintManagerTest extends \PHPUnit_Framework_TestCase { $container = new ContainerBuilder(); - $translator = $this->getMock('\Thelia\Core\Translation\Translator'); - $rule1 = new AvailableForTotalAmount($translator); - $rule2 = new AvailableForXArticles($translator); + $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getTranslator') + ->will($this->returnValue($stubTranslator)); + + $rule1 = new AvailableForTotalAmount($stubAdapter); + $rule2 = new AvailableForXArticles($stubAdapter); + + $adapter = new CouponBaseAdapter($container); $container->set('thelia.constraint.rule.available_for_total_amount', $rule1); $container->set('thelia.constraint.rule.available_for_x_articles', $rule2); + $container->set('thelia.adapter', $adapter); return $container; } diff --git a/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php index 6b024ed9e..a40591d13 100644 --- a/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php +++ b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php @@ -66,11 +66,10 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase protected function generateValidCouponBaseAdapterMock($nbArticlesInCart = 4) { /** @var CouponAdapterInterface $stubTheliaAdapter */ - $stubTheliaAdapter = $this->getMock( - 'Thelia\Coupon\CouponBaseAdapter', - array('getNbArticlesInCart'), - array() - ); + $stubTheliaAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->setMethods(array('getNbArticlesInCart')) + ->getMock(); $stubTheliaAdapter->expects($this->any()) ->method('getNbArticlesInCart') ->will($this->returnValue($nbArticlesInCart)); @@ -86,307 +85,305 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase */ public function testValidBackOfficeInput() { - $adapter = $this->stubTheliaAdapter; + $translator = $this->getMockBuilder('\Thelia\Core\Translation\Translator') + ->disableOriginalConstructor() + ->getMock(); - $validators = array( - AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( - Operators::SUPERIOR, - new QuantityParam( - $adapter, - 4 - ) - ) + $rule = new AvailableForXArticles($translator); + $operators = array(AvailableForXArticles::PARAM1_QUANTITY => Operators::SUPERIOR); + $values = array( + AvailableForXArticles::PARAM1_QUANTITY => 4 ); - $rule = new AvailableForXArticles($adapter, $validators); + $rule->populateFromForm($operators, $values); $expected = true; $actual = $rule->checkBackOfficeInput(); $this->assertEquals($expected, $actual); } - /** - * Check if validity test on BackOffice inputs are working - * - * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkBackOfficeInput - * @expectedException \Thelia\Exception\InvalidRuleValueException - */ - public function testInValidBackOfficeInputFloat() - { - $adapter = $this->stubTheliaAdapter; - - $validators = array( - AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( - Operators::SUPERIOR, - new QuantityParam( - $adapter, - 4.5 - ) - ) - ); - $rule = new AvailableForXArticles($adapter, $validators); - - $expected = false; - $actual = $rule->checkBackOfficeInput(); - $this->assertEquals($expected, $actual); - } - - /** - * Check if validity test on BackOffice inputs are working - * - * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkBackOfficeInput - * @expectedException \Thelia\Exception\InvalidRuleValueException - */ - public function testInValidBackOfficeInputNegative() - { - $adapter = $this->stubTheliaAdapter; - - $validators = array( - AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( - Operators::SUPERIOR, - new QuantityParam( - $adapter, - -1 - ) - ) - ); - $rule = new AvailableForXArticles($adapter, $validators); - - $expected = false; - $actual = $rule->checkBackOfficeInput(); - $this->assertEquals($expected, $actual); - } - - /** - * Check if validity test on BackOffice inputs are working - * - * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkBackOfficeInput - * @expectedException \Thelia\Exception\InvalidRuleValueException - */ - public function testInValidBackOfficeInputString() - { - $adapter = $this->stubTheliaAdapter; - - $validators = array( - AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( - Operators::SUPERIOR, - new QuantityParam( - $adapter, - 'bad' - ) - ) - ); - $rule = new AvailableForXArticles($adapter, $validators); - - $expected = false; - $actual = $rule->checkBackOfficeInput(); - $this->assertEquals($expected, $actual); - } - - - - - - /** - * Check if validity test on FrontOffice inputs are working - * - * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkCheckoutInput - */ - public function testValidCheckoutInput() - { - $adapter = $this->stubTheliaAdapter; - $validators = array( - AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( - Operators::SUPERIOR, - new QuantityParam( - $adapter, - 4 - ) - ) - ); - $rule = new AvailableForXArticles($adapter, $validators); - - $expected = true; - $actual = $rule->checkCheckoutInput(); - $this->assertEquals($expected, $actual); - } - - /** - * Check if validity test on FrontOffice inputs are working - * - * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkCheckoutInput - * @expectedException \Thelia\Exception\InvalidRuleValueException - */ - public function testInValidCheckoutInputFloat() - { - $adapter = $this->generateValidCouponBaseAdapterMock(4.5); - $validators = array( - AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( - Operators::SUPERIOR, - new QuantityParam( - $adapter, - 4 - ) - ) - ); - $rule = new AvailableForXArticles($adapter, $validators); - - $expected = false; - $actual = $rule->checkCheckoutInput(); - $this->assertEquals($expected, $actual); - } - - /** - * Check if validity test on FrontOffice inputs are working - * - * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkCheckoutInput - * @expectedException \Thelia\Exception\InvalidRuleValueException - */ - public function testInValidCheckoutInputNegative() - { - $adapter = $this->generateValidCouponBaseAdapterMock(-1); - - $validators = array( - AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( - Operators::SUPERIOR, - new QuantityParam( - $adapter, - 4 - ) - ) - ); - $rule = new AvailableForXArticles($adapter, $validators); - - $expected = false; - $actual = $rule->checkCheckoutInput(); - $this->assertEquals($expected, $actual); - } - - /** - * Check if validity test on FrontOffice inputs are working - * - * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkCheckoutInput - * @expectedException \Thelia\Exception\InvalidRuleValueException - */ - public function testInValidCheckoutInputString() - { - $adapter = $this->generateValidCouponBaseAdapterMock('bad'); - - $validators = array( - AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( - Operators::SUPERIOR, - new QuantityParam( - $adapter, - 4 - ) - ) - ); - $rule = new AvailableForXArticles($adapter, $validators); - - $expected = false; - $actual = $rule->checkCheckoutInput(); - $this->assertEquals($expected, $actual); - } - - /** - * Check if test inferior operator is working - * - * @covers Thelia\Coupon\Rule\AvailableForXArticles::isMatching - * - */ - public function testMatchingRuleInferior() - { - $adapter = $this->stubTheliaAdapter; - $validators = array( - AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( - Operators::INFERIOR, - new QuantityParam( - $adapter, - 5 - ) - ) - ); - $rule = new AvailableForXArticles($adapter, $validators); - - $expected = true; - $actual = $rule->isMatching(); - $this->assertEquals($expected, $actual); - } - - /** - * Check if test equals operator is working - * - * @covers Thelia\Coupon\Rule\AvailableForXArticles::isMatching - * - */ - public function testMatchingRuleEqual() - { - $adapter = $this->stubTheliaAdapter; - $validators = array( - AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( - Operators::EQUAL, - new QuantityParam( - $adapter, - 4 - ) - ) - ); - $rule = new AvailableForXArticles($adapter, $validators); - - $expected = true; - $actual = $rule->isMatching(); - $this->assertEquals($expected, $actual); - } - - /** - * Check if test superior operator is working - * - * @covers Thelia\Coupon\Rule\AvailableForXArticles::isMatching - * - */ - public function testMatchingRuleSuperior() - { - $adapter = $this->stubTheliaAdapter; - $validators = array( - AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( - Operators::SUPERIOR, - new QuantityParam( - $adapter, - 3 - ) - ) - ); - $rule = new AvailableForXArticles($adapter, $validators); - - $expected = true; - $actual = $rule->isMatching(); - $this->assertEquals($expected, $actual); - } - - /** - * Check if test unavailable operator is working - * - * @covers Thelia\Coupon\Rule\AvailableForXArticles::isMatching - * @expectedException \Thelia\Exception\InvalidRuleOperatorException - * - */ - public function testNotMatchingRule() - { - $adapter = $this->stubTheliaAdapter; - $validators = array( - AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( - Operators::DIFFERENT, - new QuantityParam( - $adapter, - 3 - ) - ) - ); - $rule = new AvailableForXArticles($adapter, $validators); - - $expected = false; - $actual = $rule->isMatching(); - $this->assertEquals($expected, $actual); - } +// /** +// * Check if validity test on BackOffice inputs are working +// * +// * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkBackOfficeInput +// * @expectedException \Thelia\Exception\InvalidRuleValueException +// */ +// public function testInValidBackOfficeInputFloat() +// { +// $adapter = $this->stubTheliaAdapter; +// +// $validators = array( +// AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( +// Operators::SUPERIOR, +// new QuantityParam( +// $adapter, +// 4.5 +// ) +// ) +// ); +// $rule = new AvailableForXArticles($adapter, $validators); +// +// $expected = false; +// $actual = $rule->checkBackOfficeInput(); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * Check if validity test on BackOffice inputs are working +// * +// * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkBackOfficeInput +// * @expectedException \Thelia\Exception\InvalidRuleValueException +// */ +// public function testInValidBackOfficeInputNegative() +// { +// $adapter = $this->stubTheliaAdapter; +// +// $validators = array( +// AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( +// Operators::SUPERIOR, +// new QuantityParam( +// $adapter, +// -1 +// ) +// ) +// ); +// $rule = new AvailableForXArticles($adapter, $validators); +// +// $expected = false; +// $actual = $rule->checkBackOfficeInput(); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * Check if validity test on BackOffice inputs are working +// * +// * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkBackOfficeInput +// * @expectedException \Thelia\Exception\InvalidRuleValueException +// */ +// public function testInValidBackOfficeInputString() +// { +// $adapter = $this->stubTheliaAdapter; +// +// $validators = array( +// AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( +// Operators::SUPERIOR, +// new QuantityParam( +// $adapter, +// 'bad' +// ) +// ) +// ); +// $rule = new AvailableForXArticles($adapter, $validators); +// +// $expected = false; +// $actual = $rule->checkBackOfficeInput(); +// $this->assertEquals($expected, $actual); +// } +// +// +// +// +// +// /** +// * Check if validity test on FrontOffice inputs are working +// * +// * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkCheckoutInput +// */ +// public function testValidCheckoutInput() +// { +// $adapter = $this->stubTheliaAdapter; +// $validators = array( +// AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( +// Operators::SUPERIOR, +// new QuantityParam( +// $adapter, +// 4 +// ) +// ) +// ); +// $rule = new AvailableForXArticles($adapter, $validators); +// +// $expected = true; +// $actual = $rule->checkCheckoutInput(); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * Check if validity test on FrontOffice inputs are working +// * +// * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkCheckoutInput +// * @expectedException \Thelia\Exception\InvalidRuleValueException +// */ +// public function testInValidCheckoutInputFloat() +// { +// $adapter = $this->generateValidCouponBaseAdapterMock(4.5); +// $validators = array( +// AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( +// Operators::SUPERIOR, +// new QuantityParam( +// $adapter, +// 4 +// ) +// ) +// ); +// $rule = new AvailableForXArticles($adapter, $validators); +// +// $expected = false; +// $actual = $rule->checkCheckoutInput(); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * Check if validity test on FrontOffice inputs are working +// * +// * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkCheckoutInput +// * @expectedException \Thelia\Exception\InvalidRuleValueException +// */ +// public function testInValidCheckoutInputNegative() +// { +// $adapter = $this->generateValidCouponBaseAdapterMock(-1); +// +// $validators = array( +// AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( +// Operators::SUPERIOR, +// new QuantityParam( +// $adapter, +// 4 +// ) +// ) +// ); +// $rule = new AvailableForXArticles($adapter, $validators); +// +// $expected = false; +// $actual = $rule->checkCheckoutInput(); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * Check if validity test on FrontOffice inputs are working +// * +// * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkCheckoutInput +// * @expectedException \Thelia\Exception\InvalidRuleValueException +// */ +// public function testInValidCheckoutInputString() +// { +// $adapter = $this->generateValidCouponBaseAdapterMock('bad'); +// +// $validators = array( +// AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( +// Operators::SUPERIOR, +// new QuantityParam( +// $adapter, +// 4 +// ) +// ) +// ); +// $rule = new AvailableForXArticles($adapter, $validators); +// +// $expected = false; +// $actual = $rule->checkCheckoutInput(); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * Check if test inferior operator is working +// * +// * @covers Thelia\Coupon\Rule\AvailableForXArticles::isMatching +// * +// */ +// public function testMatchingRuleInferior() +// { +// $adapter = $this->stubTheliaAdapter; +// $validators = array( +// AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( +// Operators::INFERIOR, +// new QuantityParam( +// $adapter, +// 5 +// ) +// ) +// ); +// $rule = new AvailableForXArticles($adapter, $validators); +// +// $expected = true; +// $actual = $rule->isMatching(); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * Check if test equals operator is working +// * +// * @covers Thelia\Coupon\Rule\AvailableForXArticles::isMatching +// * +// */ +// public function testMatchingRuleEqual() +// { +// $adapter = $this->stubTheliaAdapter; +// $validators = array( +// AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( +// Operators::EQUAL, +// new QuantityParam( +// $adapter, +// 4 +// ) +// ) +// ); +// $rule = new AvailableForXArticles($adapter, $validators); +// +// $expected = true; +// $actual = $rule->isMatching(); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * Check if test superior operator is working +// * +// * @covers Thelia\Coupon\Rule\AvailableForXArticles::isMatching +// * +// */ +// public function testMatchingRuleSuperior() +// { +// $adapter = $this->stubTheliaAdapter; +// $validators = array( +// AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( +// Operators::SUPERIOR, +// new QuantityParam( +// $adapter, +// 3 +// ) +// ) +// ); +// $rule = new AvailableForXArticles($adapter, $validators); +// +// $expected = true; +// $actual = $rule->isMatching(); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * Check if test unavailable operator is working +// * +// * @covers Thelia\Coupon\Rule\AvailableForXArticles::isMatching +// * @expectedException \Thelia\Exception\InvalidRuleOperatorException +// * +// */ +// public function testNotMatchingRule() +// { +// $adapter = $this->stubTheliaAdapter; +// $validators = array( +// AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( +// Operators::DIFFERENT, +// new QuantityParam( +// $adapter, +// 3 +// ) +// ) +// ); +// $rule = new AvailableForXArticles($adapter, $validators); +// +// $expected = false; +// $actual = $rule->isMatching(); +// $this->assertEquals($expected, $actual); +// } /** diff --git a/install/faker.php b/install/faker.php index 7ab987459..1c752fae9 100755 --- a/install/faker.php +++ b/install/faker.php @@ -1,4 +1,8 @@ boot(); $faker = Faker\Factory::create(); @@ -364,7 +365,7 @@ try { } } - generateCouponFixtures(); + generateCouponFixtures($thelia); $con->commit(); } catch (Exception $e) { @@ -493,9 +494,11 @@ function setI18n($faker, &$object) /** * Generate Coupon fixtures */ -function generateCouponFixtures() +function generateCouponFixtures($thelia) { - $adapter = new \Thelia\Coupon\CouponBaseAdapter(); + $container = $thelia->getContainer(); + $adapter = $container->get('thelia.adapter'); + $translator = $container->get('thelia.translator'); // Coupons $coupon1 = new Thelia\Model\Coupon(); @@ -518,35 +521,31 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua $date = new \DateTime(); $coupon1->setExpirationDate($date->setTimestamp(strtotime("today + 2 months"))); - $rule1 = new Thelia\Constraint\Rule\AvailableForTotalAmount( - $adapter, - array( - Thelia\Constraint\Rule\AvailableForTotalAmount::PARAM1_PRICE => new Thelia\Constraint\Validator\RuleValidator( - Thelia\Constraint\Rule\Operators::SUPERIOR, - new Thelia\Constraint\Validator\PriceParam( - $adapter, - 40.00, - 'EUR' - ) - ) - ) + $rule1 = new AvailableForTotalAmount($adapter); + $operators = array(AvailableForTotalAmount::PARAM1_PRICE => Operators::SUPERIOR); + $values = array( + AvailableForTotalAmount::PARAM1_PRICE => 40.00, + AvailableForTotalAmount::PARAM1_CURRENCY => 'EUR' ); - $rule2 = new Thelia\Constraint\Rule\AvailableForTotalAmount( - $adapter, - array( - Thelia\Constraint\Rule\AvailableForTotalAmount::PARAM1_PRICE => new Thelia\Constraint\Validator\RuleValidator( - Thelia\Constraint\Rule\Operators::INFERIOR, - new Thelia\Constraint\Validator\PriceParam( - $adapter, - 400.00, - 'EUR' - ) - ) - ) - ); - $rules = new \Thelia\Coupon\CouponRuleCollection(array($rule1, $rule2)); + $rule1->populateFromForm($operators, $values); - $coupon1->setSerializedRules(base64_encode(serialize($rules))); + $rule2 = new AvailableForTotalAmount($adapter); + $operators = array(AvailableForTotalAmount::PARAM1_PRICE => Operators::INFERIOR); + $values = array( + AvailableForTotalAmount::PARAM1_PRICE => 400.00, + AvailableForTotalAmount::PARAM1_CURRENCY => 'EUR' + ); + $rule2->populateFromForm($operators, $values); + + $rules = new CouponRuleCollection(); + $rules->add($rule1); + $rules->add($rule2); + + /** @var ConstraintManager $constraintManager */ + $constraintManager = new ConstraintManager($container); + + $serializedRules = $constraintManager->serializeCouponRuleCollection($rules); + $coupon1->setSerializedRules($serializedRules); $coupon1->setIsCumulative(1); $coupon1->setIsRemovingPostage(0); diff --git a/reset_install.sh b/reset_install.sh index 448390854..399156b67 100755 --- a/reset_install.sh +++ b/reset_install.sh @@ -4,6 +4,9 @@ echo -e "\033[47m\033[1;31m\n[WARN] This script will reset this Thelia2 install\n\033[0m" +echo -e "\n\e[01;34m[INFO] Clearing caches\e[00m\n" +php Thelia cache:clear + echo -e "\n\e[01;34m[INFO] Downloading vendors\e[00m\n" composer install --prefer-dist @@ -26,4 +29,7 @@ php install/faker.php echo -e "\n\e[01;34m[INFO] Adding admin\e[00m\n" php Thelia thelia:create-admin --login_name thelia2 --password thelia2 --last_name thelia2 --first_name thelia2 +echo -e "\n\e[01;34m[INFO] Clearing caches\e[00m\n" +php Thelia cache:clear + echo -e "\n\e[00;32m[SUCCESS] Reset done\e[00m\n" \ No newline at end of file From e8d96937e7c4d3537861c1623b74d3e56f5602f3 Mon Sep 17 00:00:00 2001 From: franck Date: Fri, 6 Sep 2013 20:00:02 +0200 Subject: [PATCH 080/125] Factorized creation and confirmation modal dialogs --- .../Controller/Admin/BaseAdminController.php | 9 +- .../Controller/Admin/CategoryController.php | 17 +-- .../Core/Event/BaseToggleVisibilityEvent.php | 48 +++++++ .../Core/Template/Assets/AsseticHelper.php | 2 +- core/lib/Thelia/Form/ProductCreationForm.php | 67 +++++++++ .../Form/StandardDescriptionFieldsTrait.php | 58 ++++++++ .../Model/Tools/PositionManagementTrait.php | 2 +- templates/admin/default/categories.html | 129 +++++++++--------- .../default/includes/add-category-dialog.html | 70 ---------- .../default/includes/catalog-breadcrumb.html | 26 ++++ .../includes/delete-category-dialog.html | 48 ------- .../includes/generic-confirm-dialog.html | 43 ++++++ .../includes/generic-create-dialog.html | 43 ++++++ 13 files changed, 360 insertions(+), 202 deletions(-) create mode 100644 core/lib/Thelia/Core/Event/BaseToggleVisibilityEvent.php create mode 100644 core/lib/Thelia/Form/ProductCreationForm.php create mode 100644 core/lib/Thelia/Form/StandardDescriptionFieldsTrait.php delete mode 100755 templates/admin/default/includes/add-category-dialog.html create mode 100644 templates/admin/default/includes/catalog-breadcrumb.html delete mode 100755 templates/admin/default/includes/delete-category-dialog.html create mode 100644 templates/admin/default/includes/generic-confirm-dialog.html create mode 100755 templates/admin/default/includes/generic-create-dialog.html diff --git a/core/lib/Thelia/Controller/Admin/BaseAdminController.php b/core/lib/Thelia/Controller/Admin/BaseAdminController.php index 87aff7dd9..298cd0182 100755 --- a/core/lib/Thelia/Controller/Admin/BaseAdminController.php +++ b/core/lib/Thelia/Controller/Admin/BaseAdminController.php @@ -36,6 +36,7 @@ use Thelia\Model\Lang; use Thelia\Model\LangQuery; use Thelia\Form\BaseForm; use Thelia\Form\Exception\FormValidationException; +use Thelia\Log\Tlog; class BaseAdminController extends BaseController { @@ -94,7 +95,7 @@ class BaseAdminController extends BaseController protected function errorPage($message) { if ($message instanceof \Exception) { - $message = sprintf("Sorry, an error occured: %s", $message->getMessage()); + $message = sprintf($this->getTranslator()->trans("Sorry, an error occured: %msg"), array('msg' => $message->getMessage())); } return $this->render('general_error', array( @@ -125,7 +126,7 @@ class BaseAdminController extends BaseController // Generate the proper response $response = new Response(); - return $response->setContent($this->errorPage("Sorry, you're not allowed to perform this action")); + return $this->errorPage($this->getTranslator()->trans("Sorry, you're not allowed to perform this action")); } /* @@ -164,7 +165,7 @@ class BaseAdminController extends BaseController ) ); - if ($fom != null) { + if ($form != null) { // Mark the form as errored $form->setErrorMessage($error_message); @@ -312,7 +313,7 @@ class BaseAdminController extends BaseController } catch (AuthorizationException $ex) { // User is not allowed to perform the required action. Return the error page instead of the requested page. - return $this->errorPage("Sorry, you are not allowed to perform this action."); + return $this->errorPage($this->getTranslator()->trans("Sorry, you are not allowed to perform this action.")); } } } diff --git a/core/lib/Thelia/Controller/Admin/CategoryController.php b/core/lib/Thelia/Controller/Admin/CategoryController.php index 81769cd29..6acbbd707 100755 --- a/core/lib/Thelia/Controller/Admin/CategoryController.php +++ b/core/lib/Thelia/Controller/Admin/CategoryController.php @@ -36,6 +36,7 @@ use Thelia\Form\CategoryDeletionForm; use Thelia\Model\Lang; use Thelia\Core\Translation\Translator; use Thelia\Core\Event\CategoryUpdatePositionEvent; +use Thelia\Model\CategoryQuery; class CategoryController extends BaseAdminController { @@ -107,8 +108,6 @@ class CategoryController extends BaseAdminController $data = $form->getData(); - $createEvent = new CategoryCreateEvent(); - $createEvent = new CategoryCreateEvent( $data["title"], $data["parent"], @@ -122,7 +121,7 @@ class CategoryController extends BaseAdminController $createdObject = $createEvent->getCategory(); // Log category creation - $this->adminLogAppend(sprintf("Category %s (ID %s) created", $createdObject->getName(), $createdObject->getId())); + $this->adminLogAppend(sprintf("Category %s (ID %s) created", $createdObject->getTitle(), $createdObject->getId())); // Substitute _ID_ in the URL with the ID of the created object $successUrl = str_replace('_ID_', $createdObject->getId(), $creationForm->getSuccessUrl()); @@ -157,19 +156,17 @@ class CategoryController extends BaseAdminController // Load the category object $category = CategoryQuery::create() - ->joinWithI18n($this->getCurrentEditionLocale()) - ->findOneById($this->getRequest()->get('category_id')); + ->joinWithI18n($this->getCurrentEditionLocale()) + ->findOneById($this->getRequest()->get('category_id')); if ($category != null) { // Prepare the data that will hydrate the form $data = array( 'id' => $category->getId(), - 'name' => $category->getName(), + 'name' => $category->getTitle(), 'locale' => $category->getLocale(), - 'code' => $category->getCode(), - 'symbol' => $category->getSymbol(), - 'rate' => $category->getRate() + // tbc !!! ); // Setup the object form @@ -227,7 +224,7 @@ class CategoryController extends BaseAdminController // Log category modification $changedObject = $changeEvent->getCategory(); - $this->adminLogAppend(sprintf("Category %s (ID %s) modified", $changedObject->getName(), $changedObject->getId())); + $this->adminLogAppend(sprintf("Category %s (ID %s) modified", $changedObject->getTitle(), $changedObject->getId())); // If we have to stay on the same page, do not redirect to the succesUrl, // just redirect to the edit page again. diff --git a/core/lib/Thelia/Core/Event/BaseToggleVisibilityEvent.php b/core/lib/Thelia/Core/Event/BaseToggleVisibilityEvent.php new file mode 100644 index 000000000..2dbd54374 --- /dev/null +++ b/core/lib/Thelia/Core/Event/BaseToggleVisibilityEvent.php @@ -0,0 +1,48 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Core\Event; + + +class BaseToggleVisibilityEvent extends ActionEvent +{ + protected $object_id; + + protected $object; + + public function __construct($object_id) + { + $this->object_id = $object_id; + } + + public function getObjectId() + { + return $this->object_id; + } + + public function setObjectId($object_id) + { + $this->object_id = $object_id; + return $this; + } +} \ No newline at end of file diff --git a/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php b/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php index bf0b7450e..cd7f06ac8 100755 --- a/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php +++ b/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php @@ -126,7 +126,7 @@ class AsseticHelper // // before generating 3bc974a-ad3ef47.css, delete 3bc974a-* files. // - if (/*$dev_mode == true || */! file_exists($target_file)) { + if ($dev_mode == true || ! file_exists($target_file)) { // Delete previous version of the file list($commonPart, $dummy) = explode('-', $asset_target_path); diff --git a/core/lib/Thelia/Form/ProductCreationForm.php b/core/lib/Thelia/Form/ProductCreationForm.php new file mode 100644 index 000000000..396f6d0d5 --- /dev/null +++ b/core/lib/Thelia/Form/ProductCreationForm.php @@ -0,0 +1,67 @@ +. */ +/* */ +/*************************************************************************************/ +namespace Thelia\Form; + +use Symfony\Component\Validator\Constraints\NotBlank; + +class ProductCreationForm extends BaseForm +{ + protected function buildForm() + { + $this->formBuilder + ->add("ref", "text", array( + "constraints" => array( + new NotBlank() + ), + "label" => "Product reference *", + "label_attr" => array( + "for" => "ref" + ) + )) + ->add("title", "text", array( + "constraints" => array( + new NotBlank() + ), + "label" => "Product title *", + "label_attr" => array( + "for" => "title" + ) + )) + ->add("parent", "integer", array( + "constraints" => array( + new NotBlank() + ) + )) + ->add("locale", "text", array( + "constraints" => array( + new NotBlank() + ) + )) + ; + } + + public function getName() + { + return "thelia_product_creation"; + } +} diff --git a/core/lib/Thelia/Form/StandardDescriptionFieldsTrait.php b/core/lib/Thelia/Form/StandardDescriptionFieldsTrait.php new file mode 100644 index 000000000..98bc53b08 --- /dev/null +++ b/core/lib/Thelia/Form/StandardDescriptionFieldsTrait.php @@ -0,0 +1,58 @@ +. */ +/* */ +/*************************************************************************************/ +namespace Thelia\Form; + +use Symfony\Component\Validator\Constraints\NotBlank; + +/** + * This form defines all standard description fields: + * - title + * - chapo + * - description + * - postscriptum + * + * @author Franck Allimant + */ +Trait StandardDescriptionFieldsTrait +{ + protected function addStandardDescriptionFields() + { + $this->formBuilder + ->add("locale", "hidden", array( + "constraints" => array( + new NotBlank() + ) + ) + ) + ->add("title", "text", array( + "constraints" => array( + new NotBlank() + ) + ) + ) + ->add("chapo", "text", array()) + ->add("description", "text", array()) + ->add("postscriptum", "text", array()) + ; + } +} \ No newline at end of file diff --git a/core/lib/Thelia/Model/Tools/PositionManagementTrait.php b/core/lib/Thelia/Model/Tools/PositionManagementTrait.php index 9e0b1f35c..eb71564eb 100644 --- a/core/lib/Thelia/Model/Tools/PositionManagementTrait.php +++ b/core/lib/Thelia/Model/Tools/PositionManagementTrait.php @@ -55,7 +55,7 @@ trait PositionManagementTrait { ->orderByPosition(Criteria::DESC) ->limit(1); - if ($parent !== null) $last->filterByParent($parent); + if ($parent !== null) $query->filterByParent($parent); $last = $query->findOne() ; diff --git a/templates/admin/default/categories.html b/templates/admin/default/categories.html index 0788a87d2..a0367bad5 100755 --- a/templates/admin/default/categories.html +++ b/templates/admin/default/categories.html @@ -327,94 +327,87 @@ {* Adding a new Category *} - + dialog_id = "add_category_dialog" + dialog_title = {intl l="Create a new category"} + dialog_body = {$smarty.capture.category_creation_dialog nofilter} + + dialog_ok_label = {intl l="Create this category"} + dialog_cancel_label = {intl l="Cancel"} + + form_action = {url path='/admin/categories/create'} + form_enctype = $creation_form_enctype + form_error_message = {$creation_form_error|default:''} + } {* Delete category confirmation dialog *} - + dialog_id = "delete_category_dialog" + dialog_title = {intl l="Delete a category"} + dialog_message = {intl l="Do you really want to delete this category, and all its contents ?"} + form_action = {url path='/admin/categories/delete'} + form_content = {$smarty.capture.category_delete_dialog nofilter} + } {/block} {block name="javascript-initialization"} diff --git a/templates/admin/default/includes/add-category-dialog.html b/templates/admin/default/includes/add-category-dialog.html deleted file mode 100755 index 631d0c06e..000000000 --- a/templates/admin/default/includes/add-category-dialog.html +++ /dev/null @@ -1,70 +0,0 @@ - -{* Adding a new Category *} - - \ No newline at end of file diff --git a/templates/admin/default/includes/catalog-breadcrumb.html b/templates/admin/default/includes/catalog-breadcrumb.html new file mode 100644 index 000000000..b9312f0dd --- /dev/null +++ b/templates/admin/default/includes/catalog-breadcrumb.html @@ -0,0 +1,26 @@ +{* Breadcrumb for categories browsing and editing *} + +
      +
    • Home
      • +
    • Catalog + + {ifloop rel="category_path"}
      • + {loop name="category_path" type="category-path" visible="*" category=$current_category_id} + {if $ID == $current_category_id} +
    • + {if $action == 'edit'} + {intl l='Editing %cat' cat="{$TITLE}"} + {else} + {$TITLE} {intl l="(edit)"} + {/if} +
      • + {else} +
    • {$TITLE}
      • + {/if} + {/loop} + {/ifloop} + + {elseloop rel="category_path"} + + {/elseloop} +
    \ No newline at end of file diff --git a/templates/admin/default/includes/delete-category-dialog.html b/templates/admin/default/includes/delete-category-dialog.html deleted file mode 100755 index 38e93a340..000000000 --- a/templates/admin/default/includes/delete-category-dialog.html +++ /dev/null @@ -1,48 +0,0 @@ - -{* Adding a new Category *} - - diff --git a/templates/admin/default/includes/generic-confirm-dialog.html b/templates/admin/default/includes/generic-confirm-dialog.html new file mode 100644 index 000000000..b5f3ad700 --- /dev/null +++ b/templates/admin/default/includes/generic-confirm-dialog.html @@ -0,0 +1,43 @@ +{* + +A generic modal confirmation dialog template. + +Parameters: + + dialog_id = the dialog id attribute + dialog_title = the dialog title + dialog_message = the dialog confirmation message + + dialog_ok_label = The OK button label (default: yes) + dialog_cancel_label = The Cancel button label (default: no) + + form_action = the form action URL, subtitted by a click on OK button + form_method = the form method, default "POST" + form_content = the form content + +*} + \ No newline at end of file diff --git a/templates/admin/default/includes/generic-create-dialog.html b/templates/admin/default/includes/generic-create-dialog.html new file mode 100755 index 000000000..c6a00a01b --- /dev/null +++ b/templates/admin/default/includes/generic-create-dialog.html @@ -0,0 +1,43 @@ +{* + +A generic modal creation dialog template. Parameters + + dialog_id = the dialog id attribute + dialog_title = the dialog title + dialog_body = the dialog body. In most cases, this is a creation form + + dialog_ok_label = The OK button label. Default create + dialog_cancel_label = The cancel button label. Default create + + form_action = The form action URL. Form is submitted when OK button is clicked + form_enctype = The form encoding + form_error_message = The form error message (optional) +*} + From f304caa88fed3724b1d0e99991d6b7eb2af092e0 Mon Sep 17 00:00:00 2001 From: franck Date: Fri, 6 Sep 2013 20:26:29 +0200 Subject: [PATCH 081/125] Factorized modal dialogs javascript --- .../Core/Template/Assets/AsseticHelper.php | 2 +- templates/admin/default/categories.html | 83 +++----- .../default/includes/generic-js-dialog.html | 35 ++++ templates/admin/default/variables.html | 184 ++++++++---------- 4 files changed, 140 insertions(+), 164 deletions(-) create mode 100644 templates/admin/default/includes/generic-js-dialog.html diff --git a/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php b/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php index cd7f06ac8..bf0b7450e 100755 --- a/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php +++ b/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php @@ -126,7 +126,7 @@ class AsseticHelper // // before generating 3bc974a-ad3ef47.css, delete 3bc974a-* files. // - if ($dev_mode == true || ! file_exists($target_file)) { + if (/*$dev_mode == true || */! file_exists($target_file)) { // Delete previous version of the file list($commonPart, $dummy) = explode('-', $asset_target_path); diff --git a/templates/admin/default/categories.html b/templates/admin/default/categories.html index a0367bad5..6689eae60 100755 --- a/templates/admin/default/categories.html +++ b/templates/admin/default/categories.html @@ -327,18 +327,12 @@ {* Adding a new Category *} - {* Capture the dialog body, to pass it to the generic dialog *} - {capture "category_creation_dialog"} - {form name="thelia.admin.category.creation"} + {form name="thelia.admin.category.creation"} - {* Assign form enctype *} - {$creation_form_enctype={form_enctype form=$form}} + {* Capture the dialog body, to pass it to the generic dialog *} - {* Assign form error message, if any *} - {if $form_error} - {$creation_form_error=$form_error_message} - {/if} + {capture "category_creation_dialog"} {form_hidden_fields form=$form} @@ -373,23 +367,23 @@ {/loop} {/form_field} - {/form} - {/capture} + {/capture} - {include - file = "includes/generic-create-dialog.html" + {include + file = "includes/generic-create-dialog.html" - dialog_id = "add_category_dialog" - dialog_title = {intl l="Create a new category"} - dialog_body = {$smarty.capture.category_creation_dialog nofilter} + dialog_id = "add_category_dialog" + dialog_title = {intl l="Create a new category"} + dialog_body = {$smarty.capture.category_creation_dialog nofilter} - dialog_ok_label = {intl l="Create this category"} - dialog_cancel_label = {intl l="Cancel"} + dialog_ok_label = {intl l="Create this category"} + dialog_cancel_label = {intl l="Cancel"} - form_action = {url path='/admin/categories/create'} - form_enctype = $creation_form_enctype - form_error_message = {$creation_form_error|default:''} - } + form_action = {url path='/admin/categories/create'} + form_enctype = {form_enctype form=$form} + form_error_message = $form_error_message + } + {/form} {* Delete category confirmation dialog *} @@ -423,43 +417,22 @@ {/block} \ No newline at end of file diff --git a/templates/admin/default/variables.html b/templates/admin/default/variables.html index 3b66bd043..0d1c948a0 100644 --- a/templates/admin/default/variables.html +++ b/templates/admin/default/variables.html @@ -26,7 +26,7 @@ {intl l='Thelia system variables'} {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.variables.create"}
    - + @@ -135,10 +135,10 @@ {* Adding a new variable *} - {* Capture the dialog body, to pass it to the generic dialog *} {form name="thelia.admin.config.creation"} + {* Capture the dialog body, to pass it to the generic dialog *} {capture "creation_dialog"} {form_hidden_fields form=$form} @@ -199,7 +199,7 @@ {include file = "includes/generic-create-dialog.html" - dialog_id = "add_variable_dialog" + dialog_id = "creation_dialog" dialog_title = {intl l="Create a new variable"} dialog_body = {$smarty.capture.creation_dialog nofilter} @@ -236,7 +236,7 @@ // JS stuff for creation form {include file = "includes/generic-js-dialog.html" - dialog_id = "add_variable_dialog" + dialog_id = "creation_dialog" form_name = "thelia.admin.config.creation" } From 5315e13ce9e6e007ffcf4ee2665b715b2945ece1 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Sat, 7 Sep 2013 16:31:15 +0200 Subject: [PATCH 083/125] add new event and new tag --- core/lib/Thelia/Core/Event/TheliaEvents.php | 5 + core/lib/Thelia/Core/Thelia.php | 11 ++ .../Thelia/DataCollector/PropelCollector.php | 122 +++++++++++++++++- templates/admin/default/admin-layout.tpl | 4 +- templates/default/includes/footer.html | 2 +- templates/default/includes/header.html | 1 + 6 files changed, 142 insertions(+), 3 deletions(-) diff --git a/core/lib/Thelia/Core/Event/TheliaEvents.php b/core/lib/Thelia/Core/Event/TheliaEvents.php index 97d92e110..1efd6c4d2 100755 --- a/core/lib/Thelia/Core/Event/TheliaEvents.php +++ b/core/lib/Thelia/Core/Event/TheliaEvents.php @@ -33,6 +33,11 @@ namespace Thelia\Core\Event; final class TheliaEvents { + /** + * sent at the beginning + */ + const BOOT = "thelia.boot"; + /** * ACTION event * diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php index b28b23156..207cced9c 100755 --- a/core/lib/Thelia/Core/Thelia.php +++ b/core/lib/Thelia/Core/Thelia.php @@ -39,6 +39,7 @@ use Symfony\Component\Yaml\Yaml; use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag; use Thelia\Core\Bundle; +use Thelia\Core\Event\TheliaEvents; use Thelia\Log\Tlog; use Thelia\Config\DatabaseConfiguration; use Thelia\Config\DefinePropel; @@ -88,6 +89,16 @@ class Thelia extends Kernel } } + /** + * dispatch an event when application is boot + */ + public function boot() + { + parent::boot(); + + $this->getContainer()->get("event_dispatcher")->dispatch(TheliaEvents::BOOT); + } + /** * * Load some configuration diff --git a/core/lib/Thelia/DataCollector/PropelCollector.php b/core/lib/Thelia/DataCollector/PropelCollector.php index 778db4c1f..97795d7ca 100644 --- a/core/lib/Thelia/DataCollector/PropelCollector.php +++ b/core/lib/Thelia/DataCollector/PropelCollector.php @@ -56,7 +56,7 @@ class PropelCollector extends DataCollector implements Renderable, LoggerInterfa */ function getName() { - // TODO: Implement getName() method. + return "Propel 2"; } public function getWidgets() @@ -73,4 +73,124 @@ class PropelCollector extends DataCollector implements Renderable, LoggerInterfa ) ); } + + /** + * System is unusable. + * + * @param string $message + * @param array $context + * @return null + */ + public function emergency($message, array $context = array()) + { + // TODO: Implement emergency() method. + } + + /** + * Action must be taken immediately. + * + * Example: Entire website down, database unavailable, etc. This should + * trigger the SMS alerts and wake you up. + * + * @param string $message + * @param array $context + * @return null + */ + public function alert($message, array $context = array()) + { + // TODO: Implement alert() method. + } + + /** + * Critical conditions. + * + * Example: Application component unavailable, unexpected exception. + * + * @param string $message + * @param array $context + * @return null + */ + public function critical($message, array $context = array()) + { + // TODO: Implement critical() method. + } + + /** + * Runtime errors that do not require immediate action but should typically + * be logged and monitored. + * + * @param string $message + * @param array $context + * @return null + */ + public function error($message, array $context = array()) + { + // TODO: Implement error() method. + } + + /** + * Exceptional occurrences that are not errors. + * + * Example: Use of deprecated APIs, poor use of an API, undesirable things + * that are not necessarily wrong. + * + * @param string $message + * @param array $context + * @return null + */ + public function warning($message, array $context = array()) + { + // TODO: Implement warning() method. + } + + /** + * Normal but significant events. + * + * @param string $message + * @param array $context + * @return null + */ + public function notice($message, array $context = array()) + { + // TODO: Implement notice() method. + } + + /** + * Interesting events. + * + * Example: User logs in, SQL logs. + * + * @param string $message + * @param array $context + * @return null + */ + public function info($message, array $context = array()) + { + // TODO: Implement info() method. + } + + /** + * Detailed debug information. + * + * @param string $message + * @param array $context + * @return null + */ + public function debug($message, array $context = array()) + { + // TODO: Implement debug() method. + } + + /** + * Logs with an arbitrary level. + * + * @param mixed $level + * @param string $message + * @param array $context + * @return null + */ + public function log($level, $message, array $context = array()) + { + // TODO: Implement log() method. + } } \ No newline at end of file diff --git a/templates/admin/default/admin-layout.tpl b/templates/admin/default/admin-layout.tpl index 8bef5c011..24febd759 100644 --- a/templates/admin/default/admin-layout.tpl +++ b/templates/admin/default/admin-layout.tpl @@ -23,6 +23,8 @@ {/stylesheets} + {debugbar_renderHead} + {block name="after-bootstrap-css"}{/block} {* -- Admin CSS section ------------------------------------------------- *} @@ -221,7 +223,7 @@ {/javascripts} {block name="javascript-initialization"}{/block} - + {debugbar_render} {* Modules scripts are included now *} {module_include location='footer_js'} diff --git a/templates/default/includes/footer.html b/templates/default/includes/footer.html index 03188c367..2f14e2fd8 100755 --- a/templates/default/includes/footer.html +++ b/templates/default/includes/footer.html @@ -13,6 +13,6 @@ }); }); - + {debugbar_render} \ No newline at end of file diff --git a/templates/default/includes/header.html b/templates/default/includes/header.html index 38e78478e..b605ecbb7 100755 --- a/templates/default/includes/header.html +++ b/templates/default/includes/header.html @@ -7,6 +7,7 @@ {stylesheets file='../assets/css/*' filters='less,cssembed'} {/stylesheets} + {debugbar_renderHead}
    From c9aa06fd70dcd0a271bc149902c33d80648cdc1d Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Sat, 7 Sep 2013 16:34:51 +0200 Subject: [PATCH 084/125] modify insert.sql including debugBar module --- install/insert.sql | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/install/insert.sql b/install/insert.sql index a2e5868e4..344381a37 100755 --- a/install/insert.sql +++ b/install/insert.sql @@ -17,7 +17,9 @@ INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updat ('currency_rate_update_url', 'http://www.ecb.int/stats/eurofxref/eurofxref-daily.xml', 0, 0, NOW(), NOW()), ('page_not_found_view', '404.html', 0, 0, NOW(), NOW()); -INSERT INTO `module` (`code`, `type`, `activate`, `position`, `created_at`, `updated_at`) VALUES ('test', '1', '1', '1', NOW(), NOW()); + +INSERT INTO `module` (`id`, `code`, `type`, `activate`, `position`, `full_namespace`, `created_at`, `updated_at`) VALUES +(1, 'DebugBar', 1, 1, 1, 'DebugBar\\DebugBar', NOW(), NOW()); INSERT INTO `customer_title`(`id`, `by_default`, `position`, `created_at`, `updated_at`) VALUES (1, 1, 1, NOW(), NOW()), From 9ebf16f1f6e4a00c877277c2bfb9c4d7c3a9c364 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Sat, 7 Sep 2013 16:36:41 +0200 Subject: [PATCH 085/125] remove htmlpurifier --- composer.json | 1 - composer.lock | 47 +---------------------------------------------- 2 files changed, 1 insertion(+), 47 deletions(-) diff --git a/composer.json b/composer.json index 2fa2e3eb1..47be312f6 100755 --- a/composer.json +++ b/composer.json @@ -9,7 +9,6 @@ }, "require":{ "php": ">=5.4", - "ezyang/htmlpurifier": "dev-master", "ircmaxell/password-compat": "dev-master", "propel/propel": "dev-master", "psr/log" : "1.0", diff --git a/composer.lock b/composer.lock index 116b0700a..22f9b819e 100755 --- a/composer.lock +++ b/composer.lock @@ -3,52 +3,8 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "4add17e0d3f6275417122481707e9f52", + "hash": "ba2f3e0943f00c7c3bf0c086bc611b0f", "packages": [ - { - "name": "ezyang/htmlpurifier", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "fac747bdbdba6aeaba4bed91ef49b2378c1798e4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/fac747bdbdba6aeaba4bed91ef49b2378c1798e4", - "reference": "fac747bdbdba6aeaba4bed91ef49b2378c1798e4", - "shasum": "" - }, - "require": { - "php": ">=5.2" - }, - "type": "library", - "autoload": { - "psr-0": { - "HTMLPurifier": "library/" - }, - "files": [ - "library/HTMLPurifier.composer.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "LGPL" - ], - "authors": [ - { - "name": "Edward Z. Yang", - "email": "admin@htmlpurifier.org", - "homepage": "http://ezyang.com" - } - ], - "description": "Standards compliant HTML filter written in PHP", - "homepage": "http://htmlpurifier.org/", - "keywords": [ - "html" - ], - "time": "2013-08-18 02:27:26" - }, { "name": "imagine/imagine", "version": "dev-master", @@ -2084,7 +2040,6 @@ ], "minimum-stability": "stable", "stability-flags": { - "ezyang/htmlpurifier": 20, "ircmaxell/password-compat": 20, "propel/propel": 20, "kriswallsmith/assetic": 20, From b036f16437a1b118074db2a2ac62708251ed36bb Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Sat, 7 Sep 2013 16:39:52 +0200 Subject: [PATCH 086/125] integrate debugbar module --- local/modules/DebugBar/Config/config.xml | 48 +++++++++++ local/modules/DebugBar/Config/plugin.xml | 0 local/modules/DebugBar/Config/schema.xml | 7 ++ local/modules/DebugBar/DebugBar.php | 44 ++++++++++ .../DebugBar/Listeners/DebugBarListeners.php | 78 ++++++++++++++++++ .../DebugBar/Smarty/Plugin/DebugBar.php | 82 +++++++++++++++++++ 6 files changed, 259 insertions(+) create mode 100644 local/modules/DebugBar/Config/config.xml create mode 100644 local/modules/DebugBar/Config/plugin.xml create mode 100644 local/modules/DebugBar/Config/schema.xml create mode 100644 local/modules/DebugBar/DebugBar.php create mode 100644 local/modules/DebugBar/Listeners/DebugBarListeners.php create mode 100644 local/modules/DebugBar/Smarty/Plugin/DebugBar.php diff --git a/local/modules/DebugBar/Config/config.xml b/local/modules/DebugBar/Config/config.xml new file mode 100644 index 000000000..6713c8ce6 --- /dev/null +++ b/local/modules/DebugBar/Config/config.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + %kernel.debug% + + + + + + + + + + + diff --git a/local/modules/DebugBar/Config/plugin.xml b/local/modules/DebugBar/Config/plugin.xml new file mode 100644 index 000000000..e69de29bb diff --git a/local/modules/DebugBar/Config/schema.xml b/local/modules/DebugBar/Config/schema.xml new file mode 100644 index 000000000..86ccca913 --- /dev/null +++ b/local/modules/DebugBar/Config/schema.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/local/modules/DebugBar/DebugBar.php b/local/modules/DebugBar/DebugBar.php new file mode 100644 index 000000000..7dde5fa8d --- /dev/null +++ b/local/modules/DebugBar/DebugBar.php @@ -0,0 +1,44 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace DebugBar; + +use Thelia\Module\BaseModule; + +class DebugBar extends BaseModule +{ + /** + * YOU HAVE TO IMPLEMENT HERE ABSTRACT METHODD FROM BaseModule Class + * Like install and destroy + */ + + public function install() + { + // TODO: Implement install() method. + } + + public function destroy() + { + // TODO: Implement destroy() method. + } +} diff --git a/local/modules/DebugBar/Listeners/DebugBarListeners.php b/local/modules/DebugBar/Listeners/DebugBarListeners.php new file mode 100644 index 000000000..2c2a1a08c --- /dev/null +++ b/local/modules/DebugBar/Listeners/DebugBarListeners.php @@ -0,0 +1,78 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace DebugBar\Listeners; +use DebugBar\DataCollector\PDO\PDOCollector; +use DebugBar\DataCollector\PDO\TraceablePDO; +use Propel\Runtime\Propel; +use Symfony\Component\EventDispatcher\EventSubscriberInterface; +use Symfony\Component\HttpKernel\KernelEvents; +use Thelia\Action\BaseAction; +use Thelia\Core\Event\TheliaEvents; + + +/** + * Class DebugBarListeners + * @package DebugBar\Listeners + * @author Manuel Raynaud + */ +class DebugBarListeners extends BaseAction implements EventSubscriberInterface { + + public function initDebugBar() + { + $debugBar = $this->container->get("debugBar"); + + $connection = Propel::getConnection(\Thelia\Model\Map\ProductTableMap::DATABASE_NAME); + $connection = $connection->getWrappedConnection(); + + $pdo = new TraceablePDO($connection); + $debugBar->addCollector(new PDOCollector($pdo)); + } + + /** + * Returns an array of event names this subscriber wants to listen to. + * + * The array keys are event names and the value can be: + * + * * The method name to call (priority defaults to 0) + * * An array composed of the method name to call and the priority + * * An array of arrays composed of the method names to call and respective + * priorities, or 0 if unset + * + * For instance: + * + * * array('eventName' => 'methodName') + * * array('eventName' => array('methodName', $priority)) + * * array('eventName' => array(array('methodName1', $priority), array('methodName2')) + * + * @return array The event names to listen to + * + * @api + */ + public static function getSubscribedEvents() + { + return array( + TheliaEvents::BOOT => array("initDebugBar", 128) + ); + } +} \ No newline at end of file diff --git a/local/modules/DebugBar/Smarty/Plugin/DebugBar.php b/local/modules/DebugBar/Smarty/Plugin/DebugBar.php new file mode 100644 index 000000000..9a333b1d6 --- /dev/null +++ b/local/modules/DebugBar/Smarty/Plugin/DebugBar.php @@ -0,0 +1,82 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace DebugBar\Smarty\Plugin; +use Thelia\Core\Template\Smarty\AbstractSmartyPlugin; +use Thelia\Core\Template\Smarty\an; +use Thelia\Core\Template\Smarty\SmartyPluginDescriptor; +use DebugBar\DebugBar as BaseDebugBar; + +/** + * Class DebugBar + * @author Manuel Raynaud + */ +class DebugBar extends AbstractSmartyPlugin +{ + protected $debugBar; + protected $debugMode; + + public function __construct(BaseDebugBar $debugbar, $debugMode) + { + $this->debugBar = $debugbar; + $this->debugMode = $debugMode; + } + + public function render($params, \Smarty_Internal_Template $template) + { + $render = ""; + if ($this->debugMode) { + $render = $this->debugBar->getJavascriptRenderer()->render(); + } + + return $render; + } + + public function renderHead($params, \Smarty_Internal_Template $template) + { + $render = ""; + if ($this->debugMode) { + $javascriptRenderer = $this->debugBar->getJavascriptRenderer(); + $assets = $javascriptRenderer->getAsseticCollection(); + + $cssCollection = $assets[0]; + $jsCollection = $assets[1]; + + $render .= sprintf('', $cssCollection->dump()); + $render .= sprintf('', $jsCollection->dump()); + } + + return $render; + } + + /** + * @return an array of SmartyPluginDescriptor + */ + public function getPluginDescriptors() + { + return array( + new SmartyPluginDescriptor("function", "debugbar_renderHead", $this, "renderHead"), + new SmartyPluginDescriptor("function", "debugbar_render", $this, "render") + ); + } +} \ No newline at end of file From 9bb48a2ef1c952c84ce96abd606adcc8863d3a9f Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Sat, 7 Sep 2013 16:54:18 +0200 Subject: [PATCH 087/125] remove unused class --- .../Thelia/DataCollector/PropelCollector.php | 196 ------------------ 1 file changed, 196 deletions(-) delete mode 100644 core/lib/Thelia/DataCollector/PropelCollector.php diff --git a/core/lib/Thelia/DataCollector/PropelCollector.php b/core/lib/Thelia/DataCollector/PropelCollector.php deleted file mode 100644 index 97795d7ca..000000000 --- a/core/lib/Thelia/DataCollector/PropelCollector.php +++ /dev/null @@ -1,196 +0,0 @@ -. */ -/* */ -/*************************************************************************************/ -namespace Thelia\DataCollector; - -use DebugBar\DataCollector\DataCollector; -use DebugBar\DataCollector\Renderable; -use Propel\Runtime\Propel; -use Psr\Log\LoggerInterface; - -/** - * Class PropelCollector - * @author Manuel Raynaud - */ -class PropelCollector extends DataCollector implements Renderable, LoggerInterface { - - public function __construct() - { - $serviceContainer = Propel::getServiceContainer(); - $serviceContainer->setLogger('debugBarLogger', $this); - } - - /** - * Called by the DebugBar when data needs to be collected - * - * @return array Collected data - */ - function collect() - { - // TODO: Implement collect() method. - } - - /** - * Returns the unique name of the collector - * - * @return string - */ - function getName() - { - return "Propel 2"; - } - - public function getWidgets() - { - return array( - "propel" => array( - "widget" => "PhpDebugBar.Widgets.SQLQueriesWidget", - "map" => "propel 2", - "default" => "[]" - ), - "propel:badge" => array( - "map" => "propel.nb_statements", - "default" => 0 - ) - ); - } - - /** - * System is unusable. - * - * @param string $message - * @param array $context - * @return null - */ - public function emergency($message, array $context = array()) - { - // TODO: Implement emergency() method. - } - - /** - * Action must be taken immediately. - * - * Example: Entire website down, database unavailable, etc. This should - * trigger the SMS alerts and wake you up. - * - * @param string $message - * @param array $context - * @return null - */ - public function alert($message, array $context = array()) - { - // TODO: Implement alert() method. - } - - /** - * Critical conditions. - * - * Example: Application component unavailable, unexpected exception. - * - * @param string $message - * @param array $context - * @return null - */ - public function critical($message, array $context = array()) - { - // TODO: Implement critical() method. - } - - /** - * Runtime errors that do not require immediate action but should typically - * be logged and monitored. - * - * @param string $message - * @param array $context - * @return null - */ - public function error($message, array $context = array()) - { - // TODO: Implement error() method. - } - - /** - * Exceptional occurrences that are not errors. - * - * Example: Use of deprecated APIs, poor use of an API, undesirable things - * that are not necessarily wrong. - * - * @param string $message - * @param array $context - * @return null - */ - public function warning($message, array $context = array()) - { - // TODO: Implement warning() method. - } - - /** - * Normal but significant events. - * - * @param string $message - * @param array $context - * @return null - */ - public function notice($message, array $context = array()) - { - // TODO: Implement notice() method. - } - - /** - * Interesting events. - * - * Example: User logs in, SQL logs. - * - * @param string $message - * @param array $context - * @return null - */ - public function info($message, array $context = array()) - { - // TODO: Implement info() method. - } - - /** - * Detailed debug information. - * - * @param string $message - * @param array $context - * @return null - */ - public function debug($message, array $context = array()) - { - // TODO: Implement debug() method. - } - - /** - * Logs with an arbitrary level. - * - * @param mixed $level - * @param string $message - * @param array $context - * @return null - */ - public function log($level, $message, array $context = array()) - { - // TODO: Implement log() method. - } -} \ No newline at end of file From 04ec683021d87e72d0821d11269abf73a9b6f7a7 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Sat, 7 Sep 2013 17:37:24 +0200 Subject: [PATCH 088/125] add PropelDataCollector to debugbar, still missing some informations --- core/lib/Thelia/Core/Thelia.php | 3 +- .../DataCollector/PropelCollector.php | 236 ++++++++++++++++++ .../DebugBar/Listeners/DebugBarListeners.php | 10 +- 3 files changed, 239 insertions(+), 10 deletions(-) create mode 100644 local/modules/DebugBar/DataCollector/PropelCollector.php diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php index 759f1108b..64f8e9a61 100755 --- a/core/lib/Thelia/Core/Thelia.php +++ b/core/lib/Thelia/Core/Thelia.php @@ -84,8 +84,7 @@ class Thelia extends Kernel $serviceContainer->setConnectionManager('thelia', $manager); if ($this->isDebug()) { - $serviceContainer->setLogger('defaultLogger', Tlog::getInstance()); - + //$serviceContainer->setLogger('defaultLogger', Tlog::getInstance()); $con = Propel::getConnection(\Thelia\Model\Map\ProductTableMap::DATABASE_NAME); $con->useDebug(true); } diff --git a/local/modules/DebugBar/DataCollector/PropelCollector.php b/local/modules/DebugBar/DataCollector/PropelCollector.php new file mode 100644 index 000000000..881b1b64a --- /dev/null +++ b/local/modules/DebugBar/DataCollector/PropelCollector.php @@ -0,0 +1,236 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace DebugBar\DataCollector; +use Propel\Runtime\Propel; +use Psr\Log\LoggerInterface; + + +/** + * Class PropelCollector + * @package DebugBar\DataCollector + * @author Manuel Raynaud + */ +class PropelCollector extends DataCollector implements Renderable, LoggerInterface +{ + + protected $statements = array(); + + protected $accumulatedTime = 0; + + protected $peakMemory = 0; + + public function __construct() + { + $serviceContainer = Propel::getServiceContainer(); + $serviceContainer->setLogger('defaultLogger', $this); + + $con = Propel::getConnection(\Thelia\Model\Map\ProductTableMap::DATABASE_NAME); + $con->setLogMethods(array( + 'exec', + 'query', + 'execute', // these first three are the default + 'beginTransaction', + 'commit', + 'rollBack', + )); + } + + /** + * Called by the DebugBar when data needs to be collected + * + * @return array Collected data + */ + function collect() + { + return array( + 'nb_statements' => count($this->statements), + 'nb_failed_statements' => 0, + 'accumulated_duration' => '10', + 'accumulated_duration_str' => $this->formatDuration(1), + 'peak_memory_usage' => $this->peakMemory, + 'peak_memory_usage_str' => $this->formatBytes($this->peakMemory), + 'statements' => $this->statements + ); + } + + /** + * Returns the unique name of the collector + * + * @return string + */ + public function getName() + { + return 'propel'; + } + + /** + * Returns a hash where keys are control names and their values + * an array of options as defined in {@see DebugBar\JavascriptRenderer::addControl()} + * + * @return array + */ + public function getWidgets() + { + return array( + "propel" => array( + "widget" => "PhpDebugBar.Widgets.SQLQueriesWidget", + "map" => "propel", + "default" => "[]" + ), + "propel:badge" => array( + "map" => "propel.nb_statements", + "default" => 0 + ) + ); + } + + /** + * Logs with an arbitrary level. + * + * @param mixed $level + * @param string $message + * @param array $context + * @return null + */ + public function log($level, $message, array $context = array()) + { + $this->statements[] = array( + 'sql' => $message, + 'is_success' => true, + 'duration' => 0, + 'duration_str' => $this->formatDuration(1), + 'memory' => 1, + 'memory_str' => $this->formatBytes(1) + ); + } + + /** + * System is unusable. + * + * @param string $message + * @param array $context + * @return null + */ + public function emergency($message, array $context = array()) + { + $this->log(null, $message, $context); + } + + /** + * Action must be taken immediately. + * + * Example: Entire website down, database unavailable, etc. This should + * trigger the SMS alerts and wake you up. + * + * @param string $message + * @param array $context + * @return null + */ + public function alert($message, array $context = array()) + { + $this->log(null, $message, $context); + } + + /** + * Critical conditions. + * + * Example: Application component unavailable, unexpected exception. + * + * @param string $message + * @param array $context + * @return null + */ + public function critical($message, array $context = array()) + { + $this->log(null, $message, $context); + } + + /** + * Runtime errors that do not require immediate action but should typically + * be logged and monitored. + * + * @param string $message + * @param array $context + * @return null + */ + public function error($message, array $context = array()) + { + $this->log(null, $message, $context); + } + + /** + * Exceptional occurrences that are not errors. + * + * Example: Use of deprecated APIs, poor use of an API, undesirable things + * that are not necessarily wrong. + * + * @param string $message + * @param array $context + * @return null + */ + public function warning($message, array $context = array()) + { + $this->log(null, $message, $context); + } + + /** + * Normal but significant events. + * + * @param string $message + * @param array $context + * @return null + */ + public function notice($message, array $context = array()) + { + $this->log(null, $message, $context); + } + + /** + * Interesting events. + * + * Example: User logs in, SQL logs. + * + * @param string $message + * @param array $context + * @return null + */ + public function info($message, array $context = array()) + { + $this->log(null, $message, $context); + } + + /** + * Detailed debug information. + * + * @param string $message + * @param array $context + * @return null + */ + public function debug($message, array $context = array()) + { + $this->log(null, $message, $context); + } + + +} \ No newline at end of file diff --git a/local/modules/DebugBar/Listeners/DebugBarListeners.php b/local/modules/DebugBar/Listeners/DebugBarListeners.php index 2c2a1a08c..7d0981d5d 100644 --- a/local/modules/DebugBar/Listeners/DebugBarListeners.php +++ b/local/modules/DebugBar/Listeners/DebugBarListeners.php @@ -22,9 +22,7 @@ /*************************************************************************************/ namespace DebugBar\Listeners; -use DebugBar\DataCollector\PDO\PDOCollector; -use DebugBar\DataCollector\PDO\TraceablePDO; -use Propel\Runtime\Propel; +use DebugBar\DataCollector\PropelCollector; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpKernel\KernelEvents; use Thelia\Action\BaseAction; @@ -42,11 +40,7 @@ class DebugBarListeners extends BaseAction implements EventSubscriberInterface { { $debugBar = $this->container->get("debugBar"); - $connection = Propel::getConnection(\Thelia\Model\Map\ProductTableMap::DATABASE_NAME); - $connection = $connection->getWrappedConnection(); - - $pdo = new TraceablePDO($connection); - $debugBar->addCollector(new PDOCollector($pdo)); + $debugBar->addCollector(new PropelCollector()); } /** From ff4f3be64dc30075d848509af8937986cff561af Mon Sep 17 00:00:00 2001 From: franck Date: Sun, 8 Sep 2013 12:29:20 +0200 Subject: [PATCH 089/125] Added windows version of reset_install script --- reset_install.bat | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 reset_install.bat diff --git a/reset_install.bat b/reset_install.bat new file mode 100644 index 000000000..d117e525b --- /dev/null +++ b/reset_install.bat @@ -0,0 +1,35 @@ +echo off +REM @author Guillaume MOREL +REM v0.1 + +echo [WARN] This script will reset this Thelia2 install + +if exist local\config\database.yml ( + echo [INFO] Downloading vendors + composer install --prefer-dist + + cd local\config\ + + echo [INFO] Building Models file + ..\..\bin\propel build -v --output-dir=../../core/lib/ + + echo [INFO] Building SQL CREATE file + ..\..\bin\propel sql:build -v --output-dir=../../install/ + + + echo [INFO] Reloaded Thelia2 database + cd ..\.. + del install\sqldb.map + php Thelia thelia:dev:reloadDB + + echo [INFO] Installing fixtures + php install\faker.php + + echo [INFO] Adding admin + php Thelia thelia:create-admin + + echo [SUCCESS] Reset done +) +) else ( + echo [FAILED] Please add your database informations in local\config\database.yml and start this script again. +) \ No newline at end of file From e78ba1f6701881871d13ad1325c6fd26fb1fc1e9 Mon Sep 17 00:00:00 2001 From: gmorel Date: Sun, 8 Sep 2013 17:36:21 +0200 Subject: [PATCH 090/125] WIP - Refactor Coupon : is Customer matching Coupon rules --- core/lib/Thelia/Config/Resources/config.xml | 4 +- ...raintManager.php => ConstraintFactory.php} | 56 +- .../Thelia/Constraint/ConstraintValidator.php | 133 +++ ...php => AvailableForTotalAmountManager.php} | 282 +++++-- ...s.php => AvailableForXArticlesManager.php} | 173 ++-- .../Constraint/Rule/CouponRuleAbstract.php | 141 ++-- .../Constraint/Rule/CouponRuleInterface.php | 57 +- core/lib/Thelia/Constraint/Rule/Operators.php | 128 +-- core/lib/Thelia/Coupon/CouponFactory.php | 22 +- ...agerTest.php => ConstraintFactoryTest.php} | 137 ++-- .../Constraint/ConstraintValidatorTest.php | 337 ++++++++ .../Rule/AvailableForTotalAmountTest.php | 763 ++++++++++++------ .../Rule/AvailableForXArticlesTest.php | 698 ++++++++++------ .../Tests/Constraint/Rule/OperatorsTest.php | 718 ++++++++-------- 14 files changed, 2415 insertions(+), 1234 deletions(-) rename core/lib/Thelia/Constraint/{ConstraintManager.php => ConstraintFactory.php} (84%) create mode 100644 core/lib/Thelia/Constraint/ConstraintValidator.php rename core/lib/Thelia/Constraint/Rule/{AvailableForTotalAmount.php => AvailableForTotalAmountManager.php} (51%) rename core/lib/Thelia/Constraint/Rule/{AvailableForXArticles.php => AvailableForXArticlesManager.php} (62%) rename core/lib/Thelia/Tests/Constraint/{ConstraintManagerTest.php => ConstraintFactoryTest.php} (59%) create mode 100644 core/lib/Thelia/Tests/Constraint/ConstraintValidatorTest.php diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml index 70eeb6ba8..3b23901cc 100755 --- a/core/lib/Thelia/Config/Resources/config.xml +++ b/core/lib/Thelia/Config/Resources/config.xml @@ -220,11 +220,11 @@ - + - + diff --git a/core/lib/Thelia/Constraint/ConstraintManager.php b/core/lib/Thelia/Constraint/ConstraintFactory.php similarity index 84% rename from core/lib/Thelia/Constraint/ConstraintManager.php rename to core/lib/Thelia/Constraint/ConstraintFactory.php index 4505229b2..699459847 100644 --- a/core/lib/Thelia/Constraint/ConstraintManager.php +++ b/core/lib/Thelia/Constraint/ConstraintFactory.php @@ -25,9 +25,7 @@ namespace Thelia\Constraint; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\Serializer\Encoder\JsonEncoder; -use Symfony\Component\Serializer\Encoder\XmlEncoder; -use Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer; -use Symfony\Component\Serializer\Serializer; +use Thelia\Constraint\Rule\AvailableForTotalAmountManager; use Thelia\Constraint\Rule\CouponRuleInterface; use Thelia\Constraint\Rule\SerializableRule; use Thelia\Coupon\CouponAdapterInterface; @@ -45,7 +43,7 @@ use Thelia\Coupon\CouponRuleCollection; * @author Guillaume MOREL * */ -class ConstraintManager +class ConstraintFactory { /** @var ContainerInterface Service Container */ protected $container = null; @@ -67,28 +65,6 @@ class ConstraintManager $this->adapter = $container->get('thelia.adapter'); } - /** - * Check if the current Coupon is matching its conditions (Rules) - * Thelia variables are given by the CouponAdapterInterface - * - * @param CouponRuleCollection $collection A collection of rules - * - * @return bool - */ - public function isMatching(CouponRuleCollection $collection) - { - $isMatching = true; - - /** @var CouponRuleInterface $rule */ - foreach ($collection->getRules() as $rule) { - if (!$rule->isMatching($this->adapter)) { - $isMatching = false; - } - } - - return $isMatching; - } - /** * Serialize a collection of rules * @@ -128,8 +104,8 @@ class ConstraintManager foreach ($unserializedRules as $rule) { if ($this->container->has($rule->ruleServiceId)) { /** @var CouponRuleInterface $couponRule */ - $couponRule = $this->container->get($rule->ruleServiceId); - $couponRule->populateFromForm( + $couponRule = $this->build( + $rule->ruleServiceId, (array) $rule->operators, (array) $rule->values ); @@ -140,4 +116,28 @@ class ConstraintManager return $collection; } + + + /** + * Build a Coupon Rule from form + * + * @param string $ruleServiceId Rule class name + * @param array $operators Rule Operator (<, >, = ) + * @param array $values Values setting this Rule + * + * @throws \InvalidArgumentException + * @return CouponRuleInterface Ready to use Rule or false + */ + public function build($ruleServiceId, array $operators, array $values) + { + if (!$this->container->has($ruleServiceId)) { + return false; + } + + /** @var CouponRuleInterface $rule */ + $rule = $this->container->get($ruleServiceId); + $rule->setValidatorsFromForm($operators, $values); + + return $rule; + } } \ No newline at end of file diff --git a/core/lib/Thelia/Constraint/ConstraintValidator.php b/core/lib/Thelia/Constraint/ConstraintValidator.php new file mode 100644 index 000000000..edacee317 --- /dev/null +++ b/core/lib/Thelia/Constraint/ConstraintValidator.php @@ -0,0 +1,133 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Constraint; + +use Symfony\Component\DependencyInjection\ContainerInterface; +use Symfony\Component\Serializer\Encoder\JsonEncoder; +use Thelia\Constraint\Rule\AvailableForTotalAmountManager; +use Thelia\Constraint\Rule\CouponRuleInterface; +use Thelia\Constraint\Rule\Operators; +use Thelia\Coupon\CouponRuleCollection; + + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Validate Constraints + * + * @package Constraint + * @author Guillaume MOREL + * + */ +class ConstraintValidator +{ + + /** + * Check if a Customer meets SerializableRule + * + * @param CouponRuleCollection $rules Rules to check against the Customer + * + * @return bool + */ + public function test(CouponRuleCollection $rules) + { + $isMatching = true; + /** @var CouponRuleInterface $rule */ + foreach ($rules->getRules() as $rule) { + if (!$rule->isMatching()) { + $isMatching = false; + } + } + + return $isMatching; + + } + + /** + * Do variable comparison + * + * @param mixed $v1 Variable 1 + * @param string $o Operator + * + * @param mixed $v2 Variable 2 + * @throws \Exception + * @return bool + */ + public function variableOpComparison($v1, $o, $v2) { + if ($o == Operators::DIFFERENT) { + return ($v1 != $v2); + } // could put this elsewhere... +// $operators = str_split($o); +// foreach($o as $operator) { + switch ($o) { // return will exit switch, foreach loop, function + case Operators::SUPERIOR : // > + if ($v1 > $v2) { + return true; + } else { + continue; + } break; + case Operators::SUPERIOR_OR_EQUAL : // >= + if ($v1 >= $v2) { + return true; + } else { + continue; + } break; + case Operators::INFERIOR : // < + if ($v1 < $v2) { + return true; + } else { + continue; + } break; + case Operators::INFERIOR_OR_EQUAL : // <= + if ($v1 <= $v2) { + return true; + } else { + continue; + } break; + case Operators::EQUAL : // == + if ($v1 == $v2) { + return true; + } else { + continue; + } break; + case Operators::IN: + if (in_array($v1, $v2)) { // in + return true; + } else { + continue; + } break; + case Operators::OUT: + if (!in_array($v1, $v2)) { // not in + return true; + } else { + continue; + } break; + default: throw new \Exception('Unrecognized operator ' . $o); + } +// } + return false; + } +} \ No newline at end of file diff --git a/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmount.php b/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmountManager.php similarity index 51% rename from core/lib/Thelia/Constraint/Rule/AvailableForTotalAmount.php rename to core/lib/Thelia/Constraint/Rule/AvailableForTotalAmountManager.php index 1cb85734a..98663fd4a 100644 --- a/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmount.php +++ b/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmountManager.php @@ -25,12 +25,14 @@ namespace Thelia\Constraint\Rule; use Symfony\Component\Intl\Exception\NotImplementedException; use Symfony\Component\Translation\Translator; +use Thelia\Constraint\ConstraintValidator; use Thelia\Coupon\CouponAdapterInterface; use Thelia\Constraint\Validator\PriceParam; use Thelia\Constraint\Validator\RuleValidator; use Thelia\Exception\InvalidRuleException; use Thelia\Exception\InvalidRuleOperatorException; use Thelia\Exception\InvalidRuleValueException; +use Thelia\Type\FloatType; /** * Created by JetBrains PhpStorm. @@ -44,26 +46,33 @@ use Thelia\Exception\InvalidRuleValueException; * @author Guillaume MOREL * */ -class AvailableForTotalAmount extends CouponRuleAbstract +class AvailableForTotalAmountManager extends CouponRuleAbstract { /** Rule 1st parameter : price */ - CONST PARAM1_PRICE = 'price'; + CONST INPUT1 = 'price'; /** Rule 1st parameter : currency */ - CONST PARAM1_CURRENCY = 'currency'; + CONST INPUT2 = 'currency'; /** @var string Service Id from Resources/config.xml */ protected $serviceId = 'thelia.constraint.rule.available_for_total_amount'; /** @var array Available Operators (Operators::CONST) */ protected $availableOperators = array( - Operators::INFERIOR, - Operators::EQUAL, - Operators::SUPERIOR, + self::INPUT1 => array( + Operators::INFERIOR, + Operators::INFERIOR_OR_EQUAL, + Operators::EQUAL, + Operators::SUPERIOR_OR_EQUAL, + Operators::SUPERIOR + ), + self::INPUT2 => array( + Operators::EQUAL, + ) ); - /** @var RuleValidator Price Validator */ - protected $priceValidator = null; +// /** @var RuleValidator Price Validator */ +// protected $priceValidator = null; /** * Check if backoffice inputs are relevant or not @@ -96,34 +105,146 @@ class AvailableForTotalAmount extends CouponRuleAbstract return $this->isPriceValid($price->getPrice(), $price->getCurrency()); } +// /** +// * Check if Checkout inputs are relevant or not +// * +// * @throws InvalidRuleValueException if Value is not allowed +// * @return bool +// */ +// public function checkCheckoutInput() +// { +// $currency = $this->adapter->getCheckoutCurrency(); +// if (empty($currency)) { +// throw new InvalidRuleValueException( +// get_class(), self::PARAM1_CURRENCY +// ); +// } +// +// $price = $this->adapter->getCartTotalPrice(); +// if (empty($price)) { +// throw new InvalidRuleValueException( +// get_class(), self::PARAM1_PRICE +// ); +// } +// +// $this->paramsToValidate = array( +// self::PARAM1_PRICE => $this->adapter->getCartTotalPrice(), +// self::PARAM1_CURRENCY => $this->adapter->getCheckoutCurrency() +// ); +// +// return $this->isPriceValid($price, $currency); +// } + /** - * Check if Checkout inputs are relevant or not + * Check validators relevancy and store them * - * @throws InvalidRuleValueException if Value is not allowed - * @return bool + * @param array $operators Operators the Admin set in BackOffice + * @param array $values Values the Admin set in BackOffice + * + * @throws \InvalidArgumentException + * @return $this */ - public function checkCheckoutInput() + public function setValidatorsFromForm(array $operators, array $values) { - $currency = $this->adapter->getCheckoutCurrency(); - if (empty($currency)) { - throw new InvalidRuleValueException( - get_class(), self::PARAM1_CURRENCY - ); - } - - $price = $this->adapter->getCartTotalPrice(); - if (empty($price)) { - throw new InvalidRuleValueException( - get_class(), self::PARAM1_PRICE - ); - } - - $this->paramsToValidate = array( - self::PARAM1_PRICE => $this->adapter->getCartTotalPrice(), - self::PARAM1_CURRENCY => $this->adapter->getCheckoutCurrency() + $this->setValidators( + $operators[self::INPUT1], + $values[self::INPUT1], + $operators[self::INPUT2], + $values[self::INPUT2] ); - return $this->isPriceValid($price, $currency); + return $this; + } + + /** + * Check validators relevancy and store them + * + * @param string $priceOperator Price Operator ex < + * @param float $priceValue Price set to meet condition + * @param string $currencyOperator Currency Operator ex = + * @param string $currencyValue Currency set to meet condition + * + * @throws \InvalidArgumentException + * @return $this + */ + protected function setValidators($priceOperator, $priceValue, $currencyOperator, $currencyValue) + { + $isOperator1Legit = $this->isOperatorLegit( + $priceOperator, + $this->availableOperators[self::INPUT1] + ); + if (!$isOperator1Legit) { + throw new \InvalidArgumentException( + 'Operator for price field is not legit' + ); + } + + $isOperator1Legit = $this->isOperatorLegit( + $currencyOperator, + $this->availableOperators[self::INPUT2] + ); + if (!$isOperator1Legit) { + throw new \InvalidArgumentException( + 'Operator for currency field is not legit' + ); + } + + $floatType = new FloatType(); + if (!$floatType->isValid($priceValue) || $priceValue <= 0) { + throw new \InvalidArgumentException( + 'Value for price field is not legit' + ); + } + + // @todo check currency is legit or not + + $this->operators = array( + self::INPUT1 => $priceOperator, + self::INPUT2 => $currencyOperator, + ); + $this->values = array( + self::INPUT1 => $priceValue, + self::INPUT2 => $currencyValue, + ); + + return $this; + } + + /** + * Test if Customer meets conditions + * + * @return bool + */ + public function isMatching() + { + $isOperator1Legit = $this->isOperatorLegit( + $this->operators[self::INPUT1], + $this->availableOperators[self::INPUT1] + ); + $isOperator2Legit = $this->isOperatorLegit( + $this->operators[self::INPUT2], + $this->availableOperators[self::INPUT2] + ); + + if (!$isOperator1Legit || !$isOperator2Legit) { + return false; + } + + $constrainValidator = new ConstraintValidator(); + $constraint1 =$constrainValidator->variableOpComparison( + $this->adapter->getCartTotalPrice(), + $this->operators[self::INPUT1], + $this->values[self::INPUT1] + ); + $constraint2 =$constrainValidator->variableOpComparison( + $this->adapter->getCheckoutCurrency(), + $this->operators[self::INPUT2], + $this->values[self::INPUT2] + ); + if ($constraint1 && $constraint2) { + return true; + } + return false; } /** @@ -154,20 +275,20 @@ class AvailableForTotalAmount extends CouponRuleAbstract return true; } - /** - * Generate current Rule param to be validated from adapter - * - * @return $this - */ - protected function setParametersToValidate() - { - $this->paramsToValidate = array( - self::PARAM1_PRICE => $this->adapter->getCartTotalPrice(), - self::PARAM1_CURRENCY => $this->adapter->getCheckoutCurrency() - ); - - return $this; - } +// /** +// * Generate current Rule param to be validated from adapter +// * +// * @return $this +// */ +// protected function setParametersToValidate() +// { +// $this->paramsToValidate = array( +// self::PARAM1_PRICE => $this->adapter->getCartTotalPrice(), +// self::PARAM1_CURRENCY => $this->adapter->getCheckoutCurrency() +// ); +// +// return $this; +// } /** * Get I18n name @@ -207,38 +328,38 @@ class AvailableForTotalAmount extends CouponRuleAbstract return $toolTip; } - /** - * Populate a Rule from a form admin - * - * @param array $operators Rule Operator set by the Admin - * @param array $values Rule Values set by the Admin - * - * @throws \InvalidArgumentException - * @return $this - */ - public function populateFromForm(array $operators, array $values) - { - if ($values[self::PARAM1_PRICE] === null - || $values[self::PARAM1_CURRENCY] === null - ) { - throw new \InvalidArgumentException( - 'The Rule ' . get_class() . 'needs at least a quantity set (' . self::PARAM1_PRICE . ', ' . self::PARAM1_CURRENCY . ')' - ); - } - - $this->priceValidator = new RuleValidator( - $operators[self::PARAM1_PRICE], - new PriceParam( - $this->translator, - $values[self::PARAM1_PRICE], - $values[self::PARAM1_CURRENCY] - ) - ); - - $this->validators = array(self::PARAM1_PRICE => $this->priceValidator); - - return $this; - } +// /** +// * Populate a Rule from a form admin +// * +// * @param array $operators Rule Operator set by the Admin +// * @param array $values Rule Values set by the Admin +// * +// * @throws \InvalidArgumentException +// * @return $this +// */ +// public function populateFromForm(array $operators, array $values) +// { +// if ($values[self::PARAM1_PRICE] === null +// || $values[self::PARAM1_CURRENCY] === null +// ) { +// throw new \InvalidArgumentException( +// 'The Rule ' . get_class() . 'needs at least a quantity set (' . self::PARAM1_PRICE . ', ' . self::PARAM1_CURRENCY . ')' +// ); +// } +// +// $this->priceValidator = new RuleValidator( +// $operators[self::PARAM1_PRICE], +// new PriceParam( +// $this->translator, +// $values[self::PARAM1_PRICE], +// $values[self::PARAM1_CURRENCY] +// ) +// ); +// +// $this->validators = array(self::PARAM1_PRICE => $this->priceValidator); +// +// return $this; +// } /** * Return a serializable Rule @@ -249,14 +370,9 @@ class AvailableForTotalAmount extends CouponRuleAbstract { $serializableRule = new SerializableRule(); $serializableRule->ruleServiceId = $this->serviceId; - $serializableRule->operators = array( - self::PARAM1_PRICE => $this->priceValidator->getOperator() - ); + $serializableRule->operators = $this->operators; - $serializableRule->values = array( - self::PARAM1_PRICE => $this->priceValidator->getParam()->getPrice(), - self::PARAM1_CURRENCY => $this->priceValidator->getParam()->getCurrency() - ); + $serializableRule->values = $this->values; return $serializableRule; } diff --git a/core/lib/Thelia/Constraint/Rule/AvailableForXArticles.php b/core/lib/Thelia/Constraint/Rule/AvailableForXArticlesManager.php similarity index 62% rename from core/lib/Thelia/Constraint/Rule/AvailableForXArticles.php rename to core/lib/Thelia/Constraint/Rule/AvailableForXArticlesManager.php index a15562128..f56596bc2 100644 --- a/core/lib/Thelia/Constraint/Rule/AvailableForXArticles.php +++ b/core/lib/Thelia/Constraint/Rule/AvailableForXArticlesManager.php @@ -25,10 +25,13 @@ namespace Thelia\Constraint\Rule; use InvalidArgumentException; use Symfony\Component\Translation\Translator; +use Thelia\Constraint\ConstraintValidator; use Thelia\Constraint\Validator\QuantityParam; use Thelia\Constraint\Validator\RuleValidator; use Thelia\Coupon\CouponAdapterInterface; +use Thelia\Exception\InvalidRuleException; use Thelia\Exception\InvalidRuleValueException; +use Thelia\Type\FloatType; /** * Created by JetBrains PhpStorm. @@ -41,19 +44,23 @@ use Thelia\Exception\InvalidRuleValueException; * @author Guillaume MOREL * */ -class AvailableForXArticles extends CouponRuleAbstract +class AvailableForXArticlesManager extends CouponRuleAbstract { /** Rule 1st parameter : quantity */ - CONST PARAM1_QUANTITY = 'quantity'; + CONST INPUT1 = 'quantity'; /** @var string Service Id from Resources/config.xml */ protected $serviceId = 'thelia.constraint.rule.available_for_x_articles'; /** @var array Available Operators (Operators::CONST) */ protected $availableOperators = array( - Operators::INFERIOR, - Operators::EQUAL, - Operators::SUPERIOR, + self::INPUT1 => array( + Operators::INFERIOR, + Operators::INFERIOR_OR_EQUAL, + Operators::EQUAL, + Operators::SUPERIOR_OR_EQUAL, + Operators::SUPERIOR + ) ); /** @var QuantityParam Quantity Validator */ @@ -107,24 +114,100 @@ class AvailableForXArticles extends CouponRuleAbstract return $this; } +// /** +// * Check if Checkout inputs are relevant or not +// * +// * @throws \Thelia\Exception\InvalidRuleValueException +// * @return bool +// */ +// public function checkCheckoutInput() +// { +// if (!isset($this->paramsToValidate) +// || empty($this->paramsToValidate) +// ||!isset($this->paramsToValidate[self::PARAM1_QUANTITY]) +// ) { +// throw new InvalidRuleValueException(get_class(), self::PARAM1_QUANTITY); +// } +// +// $price = $this->paramsToValidate[self::PARAM1_QUANTITY]; +// +// return $this->isQuantityValid($price); +// } + /** - * Check if Checkout inputs are relevant or not + * Check validators relevancy and store them * - * @throws \Thelia\Exception\InvalidRuleValueException - * @return bool + * @param array $operators Operators the Admin set in BackOffice + * @param array $values Values the Admin set in BackOffice + * + * @throws \InvalidArgumentException + * @return $this */ - public function checkCheckoutInput() + public function setValidatorsFromForm(array $operators, array $values) { - if (!isset($this->paramsToValidate) - || empty($this->paramsToValidate) - ||!isset($this->paramsToValidate[self::PARAM1_QUANTITY]) - ) { - throw new InvalidRuleValueException(get_class(), self::PARAM1_QUANTITY); + $this->setValidators( + $operators[self::INPUT1], + $values[self::INPUT1] + ); + + return $this; + } + + /** + * Check validators relevancy and store them + * + * @param string $quantityOperator Quantity Operator ex < + * @param int $quantityValue Quantity set to meet condition + * + * @throws \InvalidArgumentException + * @return $this + */ + protected function setValidators($quantityOperator, $quantityValue) + { + $isOperator1Legit = $this->isOperatorLegit( + $quantityOperator, + $this->availableOperators[self::INPUT1] + ); + if (!$isOperator1Legit) { + throw new \InvalidArgumentException( + 'Operator for quantity field is not legit' + ); } - $price = $this->paramsToValidate[self::PARAM1_QUANTITY]; + if (!is_int($quantityValue) || $quantityValue <= 0) { + throw new \InvalidArgumentException( + 'Value for quantity field is not legit' + ); + } - return $this->isQuantityValid($price); + $this->operators = array( + self::INPUT1 => $quantityOperator, + ); + $this->values = array( + self::INPUT1 => $quantityValue, + ); + + return $this; + } + + /** + * Test if Customer meets conditions + * + * @return bool + */ + public function isMatching() + { + $constrainValidator = new ConstraintValidator(); + $constraint1 =$constrainValidator->variableOpComparison( + $this->adapter->getNbArticlesInCart(), + $this->operators[self::INPUT1], + $this->values[self::INPUT1] + ); + + if ($constraint1) { + return true; + } + return false; } /** @@ -184,35 +267,35 @@ class AvailableForXArticles extends CouponRuleAbstract return $toolTip; } - /** - * Populate a Rule from a form admin - * - * @param array $operators Rule Operator set by the Admin - * @param array $values Rule Values set by the Admin - * - * @throws InvalidArgumentException - * @return $this - */ - public function populateFromForm(array $operators, array $values) - { - if ($values[self::PARAM1_QUANTITY] === null) { - throw new InvalidArgumentException( - 'The Rule ' . get_class() . 'needs at least a quantity set (' . self::PARAM1_QUANTITY. ')' - ); - } - - $this->quantityValidator = new RuleValidator( - $operators[self::PARAM1_QUANTITY], - new QuantityParam( - $this->adapter, - $values[self::PARAM1_QUANTITY] - ) - ); - - $this->validators = array(self::PARAM1_QUANTITY => $this->quantityValidator); - - return $this; - } +// /** +// * Populate a Rule from a form admin +// * +// * @param array $operators Rule Operator set by the Admin +// * @param array $values Rule Values set by the Admin +// * +// * @throws InvalidArgumentException +// * @return $this +// */ +// public function populateFromForm(array $operators, array $values) +// { +// if ($values[self::PARAM1_QUANTITY] === null) { +// throw new InvalidArgumentException( +// 'The Rule ' . get_class() . 'needs at least a quantity set (' . self::PARAM1_QUANTITY. ')' +// ); +// } +// +// $this->quantityValidator = new RuleValidator( +// $operators[self::PARAM1_QUANTITY], +// new QuantityParam( +// $this->adapter, +// $values[self::PARAM1_QUANTITY] +// ) +// ); +// +// $this->validators = array(self::PARAM1_QUANTITY => $this->quantityValidator); +// +// return $this; +// } /** * Return a serializable Rule diff --git a/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php b/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php index fa5544c00..1c781d97f 100644 --- a/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php +++ b/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php @@ -67,6 +67,12 @@ abstract class CouponRuleAbstract implements CouponRuleInterface /** @var Translator Service Translator */ protected $translator = null; + /** @var array Operators set by Admin in BackOffice */ + protected $operators = array(); + + /** @var array Values set by Admin in BackOffice */ + protected $values = array(); + /** * Constructor * @@ -78,59 +84,61 @@ abstract class CouponRuleAbstract implements CouponRuleInterface $this->translator = $adapter->getTranslator(); } - /** - * Check validator relevancy and store them - * - * @param array $validators Array of RuleValidator - * validating $paramsToValidate against - * - * @return $this - * @throws InvalidRuleException - */ - protected function setValidators(array $validators) - { - foreach ($validators as $validator) { - if (!$validator instanceof RuleValidator) { - throw new InvalidRuleException(get_class()); - } - if (!in_array($validator->getOperator(), $this->availableOperators)) { - throw new InvalidRuleOperatorException( - get_class(), - $validator->getOperator() - ); - } - } - $this->validators = $validators; +// /** +// * Check validator relevancy and store them +// * +// * @param array $validators Array of RuleValidator +// * validating $paramsToValidate against +// * +// * @return $this +// * @throws InvalidRuleException +// */ +// protected function setValidators(array $validators) +// { +// foreach ($validators as $validator) { +// if (!$validator instanceof RuleValidator) { +// throw new InvalidRuleException(get_class()); +// } +// if (!in_array($validator->getOperator(), $this->availableOperators)) { +// throw new InvalidRuleOperatorException( +// get_class(), +// $validator->getOperator() +// ); +// } +// } +// $this->validators = $validators; +// +// return $this; +// } - return $this; - } - /** - * Check if the current Checkout matches this condition - * - * @return bool - */ - public function isMatching() - { - $this->checkBackOfficeInput(); - $this->checkCheckoutInput(); - $isMatching = true; - /** @var $validator RuleValidator*/ - foreach ($this->validators as $param => $validator) { - $a = $this->paramsToValidate[$param]; - $operator = $validator->getOperator(); - /** @var ComparableInterface, RuleParameterAbstract $b */ - $b = $validator->getParam(); - - if (!Operators::isValid($a, $operator, $b)) { - $isMatching = false; - } - } - - return $isMatching; - - } +// /** +// * Check if the current Checkout matches this condition +// * +// * @return bool +// */ +// public function isMatching() +// { +// $this->checkBackOfficeInput(); +// $this->checkCheckoutInput(); +// +// $isMatching = true; +// /** @var $validator RuleValidator*/ +// foreach ($this->validators as $param => $validator) { +// $a = $this->paramsToValidate[$param]; +// $operator = $validator->getOperator(); +// /** @var ComparableInterface, RuleParameterAbstract $b */ +// $b = $validator->getParam(); +// +// if (!Operators::isValid($a, $operator, $b)) { +// $isMatching = false; +// } +// } +// +// return $isMatching; +// +// } /** * Return all available Operators for this Rule @@ -162,16 +170,16 @@ abstract class CouponRuleAbstract implements CouponRuleInterface return true; } - /** - * Generate current Rule param to be validated from adapter - * - * @throws \Thelia\Exception\NotImplementedException - * @return $this - */ - protected function setParametersToValidate() - { - throw new \Thelia\Exception\NotImplementedException(); - } +// /** +// * Generate current Rule param to be validated from adapter +// * +// * @throws \Thelia\Exception\NotImplementedException +// * @return $this +// */ +// protected function setParametersToValidate() +// { +// throw new \Thelia\Exception\NotImplementedException(); +// } /** * Return all validators @@ -194,6 +202,17 @@ abstract class CouponRuleAbstract implements CouponRuleInterface return $this->serviceId; } - + /** + * Validate if Operator given is available for this Coupon + * + * @param string $operator Operator to validate ex < + * @param array $availableOperators Available operators + * + * @return bool + */ + protected function isOperatorLegit($operator, array $availableOperators) + { + return in_array($operator, $availableOperators); + } } \ No newline at end of file diff --git a/core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php b/core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php index ac856d212..4c5575159 100644 --- a/core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php +++ b/core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php @@ -46,6 +46,13 @@ interface CouponRuleInterface */ function __construct(CouponAdapterInterface $adapter); + /** + * Get Rule Service id + * + * @return string + */ + public function getServiceId(); + /** * Check if backoffice inputs are relevant or not * @@ -53,15 +60,33 @@ interface CouponRuleInterface */ public function checkBackOfficeInput(); - /** - * Check if Checkout inputs are relevant or not - * - * @return bool - */ - public function checkCheckoutInput(); +// /** +// * Check if Checkout inputs are relevant or not +// * +// * @return bool +// */ +// public function checkCheckoutInput(); /** - * Check if the current Checkout matches this condition + * Check validators relevancy and store them + * + * @param array $operators Operators the Admin set in BackOffice + * @param array $values Values the Admin set in BackOffice + * + * @throws \InvalidArgumentException + * @return $this + */ + public function setValidatorsFromForm(array $operators, array $values); + +// /** +// * Check if the current Checkout matches this condition +// * +// * @return bool +// */ +// public function isMatching(); + + /** + * Test if Customer meets conditions * * @return bool */ @@ -96,15 +121,15 @@ interface CouponRuleInterface */ public function getValidators(); - /** - * Populate a Rule from a form admin - * - * @param array $operators Rule Operator set by the Admin - * @param array $values Rule Values set by the Admin - * - * @return bool - */ - public function populateFromForm(array$operators, array $values); +// /** +// * Populate a Rule from a form admin +// * +// * @param array $operators Rule Operator set by the Admin +// * @param array $values Rule Values set by the Admin +// * +// * @return bool +// */ +// public function populateFromForm(array$operators, array $values); /** diff --git a/core/lib/Thelia/Constraint/Rule/Operators.php b/core/lib/Thelia/Constraint/Rule/Operators.php index 61e8337c6..237c6a5e0 100644 --- a/core/lib/Thelia/Constraint/Rule/Operators.php +++ b/core/lib/Thelia/Constraint/Rule/Operators.php @@ -51,62 +51,66 @@ abstract class Operators CONST SUPERIOR = '>'; /** Param1 is different to Param2 */ CONST DIFFERENT = '!='; + /** Param1 is in Param2 */ + CONST IN = 'in'; + /** Param1 is not in Param2 */ + CONST OUT = 'out'; - /** - * Check if a parameter is valid against a ComparableInterface from its operator - * - * @param mixed $a Parameter to validate - * @param string $operator Operator to validate against - * @param ComparableInterface $b Comparable to validate against - * - * @return bool - */ - public static function isValid($a, $operator, ComparableInterface $b) - { - $ret = false; - - try { - $comparison = $b->compareTo($a); - } catch (\Exception $e) { - return false; - } - - switch ($operator) { - case self::INFERIOR: - if ($comparison == 1) { - return true; - } - break; - case self::INFERIOR_OR_EQUAL: - if ($comparison == 1 || $comparison == 0) { - return true; - } - break; - case self::EQUAL: - if ($comparison == 0) { - return true; - } - break; - case self::SUPERIOR_OR_EQUAL: - if ($comparison == -1 || $comparison == 0) { - return true; - } - break; - case self::SUPERIOR: - if ($comparison == -1) { - return true; - } - break; - case self::DIFFERENT: - if ($comparison != 0) { - return true; - } - break; - default: - } - - return $ret; - } +// /** +// * Check if a parameter is valid against a ComparableInterface from its operator +// * +// * @param mixed $a Parameter to validate +// * @param string $operator Operator to validate against +// * @param ComparableInterface $b Comparable to validate against +// * +// * @return bool +// */ +// public static function isValid($a, $operator, ComparableInterface $b) +// { +// $ret = false; +// +// try { +// $comparison = $b->compareTo($a); +// } catch (\Exception $e) { +// return false; +// } +// +// switch ($operator) { +// case self::INFERIOR: +// if ($comparison == 1) { +// return true; +// } +// break; +// case self::INFERIOR_OR_EQUAL: +// if ($comparison == 1 || $comparison == 0) { +// return true; +// } +// break; +// case self::EQUAL: +// if ($comparison == 0) { +// return true; +// } +// break; +// case self::SUPERIOR_OR_EQUAL: +// if ($comparison == -1 || $comparison == 0) { +// return true; +// } +// break; +// case self::SUPERIOR: +// if ($comparison == -1) { +// return true; +// } +// break; +// case self::DIFFERENT: +// if ($comparison != 0) { +// return true; +// } +// break; +// default: +// } +// +// return $ret; +// } /** * Get operator translation @@ -162,6 +166,20 @@ abstract class Operators 'constraint' ); break; + case self::IN: + $ret = $translator->trans( + 'in', + array(), + 'constraint' + ); + break; + case self::OUT: + $ret = $translator->trans( + 'not in', + array(), + 'constraint' + ); + break; default: } diff --git a/core/lib/Thelia/Coupon/CouponFactory.php b/core/lib/Thelia/Coupon/CouponFactory.php index 3ff064601..b23eb56ea 100644 --- a/core/lib/Thelia/Coupon/CouponFactory.php +++ b/core/lib/Thelia/Coupon/CouponFactory.php @@ -128,25 +128,5 @@ class CouponFactory } -// /** -// * Build a Coupon Rule from form -// * -// * @param string $type Rule class name -// * @param string $operator Rule Operator (<, >, = ) -// * @param array $values Values setting this Rule -// * -// * @return CouponRuleInterface Ready to use Rule or false -// */ -// public function buildCouponRuleFromForm($ruleServiceId, $operator, array $values) -// { -// /** @var CouponAdapterInterface $adapter */ -// $adapter = $this->container->get('thelia.adapter'); -// $validator = new PriceParam() -// try { -// $rule = new AvailableForTotalAmount($adapter, $validators); -// $rule = new $type($adapter, $validators); -// } catch (\Exception $e) { -// return false; -// } -// } + } diff --git a/core/lib/Thelia/Tests/Constraint/ConstraintManagerTest.php b/core/lib/Thelia/Tests/Constraint/ConstraintFactoryTest.php similarity index 59% rename from core/lib/Thelia/Tests/Constraint/ConstraintManagerTest.php rename to core/lib/Thelia/Tests/Constraint/ConstraintFactoryTest.php index a5f55cee1..70d6e498c 100644 --- a/core/lib/Thelia/Tests/Constraint/ConstraintManagerTest.php +++ b/core/lib/Thelia/Tests/Constraint/ConstraintFactoryTest.php @@ -24,17 +24,11 @@ namespace Thelia\Constraint; use Symfony\Component\DependencyInjection\ContainerBuilder; -use Thelia\Constraint\Rule\AvailableForXArticles; -use Thelia\Constraint\Validator\PriceParam; -use Thelia\Constraint\Validator\RuleValidator; -use Thelia\Constraint\Rule\AvailableForTotalAmount; +use Thelia\Constraint\Rule\AvailableForTotalAmountManager; +use Thelia\Constraint\Rule\AvailableForXArticlesManager; use Thelia\Constraint\Rule\Operators; use Thelia\Coupon\CouponBaseAdapter; -use Thelia\Coupon\CouponBaseAdapterTest; use Thelia\Coupon\CouponRuleCollection; -use Thelia\Coupon\Type\CouponInterface; -use Thelia\Coupon\Type\RemoveXAmount; -use Thelia\Tools\PhpUnitUtils; /** * Created by JetBrains PhpStorm. @@ -47,7 +41,7 @@ use Thelia\Tools\PhpUnitUtils; * @author Guillaume MOREL * */ -class ConstraintManagerTest extends \PHPUnit_Framework_TestCase +class ConstraintFactoryTest extends \PHPUnit_Framework_TestCase { /** @@ -59,9 +53,9 @@ class ConstraintManagerTest extends \PHPUnit_Framework_TestCase } /** - * Check the if the Constraint Manager is able to check RuleValidators + * Check the Rules serialization module */ - public function testIsMatching() + public function testBuild() { $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator') ->disableOriginalConstructor() @@ -75,43 +69,68 @@ class ConstraintManagerTest extends \PHPUnit_Framework_TestCase ->method('getTranslator') ->will($this->returnValue($stubTranslator)); - $stubAdapter->expects($this->any()) - ->method('getCartTotalPrice') - ->will($this->returnValue(321.98)); - - $stubAdapter->expects($this->any()) - ->method('getCheckoutCurrency') - ->will($this->returnValue('USD')); - - $rule1 = new AvailableForTotalAmount($stubAdapter); - $operators = array(AvailableForTotalAmount::PARAM1_PRICE => Operators::SUPERIOR); - $values = array( - AvailableForTotalAmount::PARAM1_PRICE => 40.00, - AvailableForTotalAmount::PARAM1_CURRENCY => 'USD' + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::SUPERIOR, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL ); - $rule1->populateFromForm($operators, $values); - - $rule2 = new AvailableForTotalAmount($stubAdapter); - $operators = array(AvailableForTotalAmount::PARAM1_PRICE => Operators::INFERIOR); $values = array( - AvailableForTotalAmount::PARAM1_PRICE => 400.00, - AvailableForTotalAmount::PARAM1_CURRENCY => 'USD' + AvailableForTotalAmountManager::INPUT1 => 40.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR' ); - $rule2->populateFromForm($operators, $values); - - $rules = new CouponRuleCollection(); - $rules->add($rule1); - $rules->add($rule2); + $rule1->setValidatorsFromForm($operators, $values); /** @var ConstraintManager $constraintManager */ - $constraintManager = new ConstraintManager($this->getContainer()); + $constraintFactory = new ConstraintFactory($this->getContainer()); + $ruleManager1 = $constraintFactory->build($rule1->getServiceId(), $operators, $values); - $expected = true; - $actual = $constraintManager->isMatching($rules); + $expected = $rule1; + $actual = $ruleManager1; - $this->assertEquals($expected, $actual, 'The ConstraintManager is no more able to check if a Rule is matching'); + $this->assertEquals($expected, $actual); + $this->assertEquals($rule1->getServiceId(), $ruleManager1->getServiceId()); + $this->assertEquals($rule1->getValidators(), $ruleManager1->getValidators()); } + /** + * Check the Rules serialization module + */ + public function testBuildFail() + { + $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getTranslator') + ->will($this->returnValue($stubTranslator)); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::SUPERIOR, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL + ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 40.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR' + ); + $rule1->setValidatorsFromForm($operators, $values); + + /** @var ConstraintManager $constraintManager */ + $constraintFactory = new ConstraintFactory($this->getContainer()); + $ruleManager1 = $constraintFactory->build('unset.service', $operators, $values); + + $expected = false; + $actual = $ruleManager1; + + $this->assertEquals($expected, $actual); + } + + /** * Check the Rules serialization module */ @@ -129,31 +148,37 @@ class ConstraintManagerTest extends \PHPUnit_Framework_TestCase ->method('getTranslator') ->will($this->returnValue($stubTranslator)); - $rule1 = new AvailableForTotalAmount($stubAdapter); - $operators = array(AvailableForTotalAmount::PARAM1_PRICE => Operators::SUPERIOR); - $values = array( - AvailableForTotalAmount::PARAM1_PRICE => 40.00, - AvailableForTotalAmount::PARAM1_CURRENCY => 'EUR' + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::SUPERIOR, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL ); - $rule1->populateFromForm($operators, $values); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 40.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR' + ); + $rule1->setValidatorsFromForm($operators, $values); - $rule2 = new AvailableForTotalAmount($stubAdapter); - $operators = array(AvailableForTotalAmount::PARAM1_PRICE => Operators::INFERIOR); - $values = array( - AvailableForTotalAmount::PARAM1_PRICE => 400.00, - AvailableForTotalAmount::PARAM1_CURRENCY => 'EUR' + $rule2 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::SUPERIOR, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL ); - $rule2->populateFromForm($operators, $values); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR' + ); + $rule2->setValidatorsFromForm($operators, $values); $rules = new CouponRuleCollection(); $rules->add($rule1); $rules->add($rule2); /** @var ConstraintManager $constraintManager */ - $constraintManager = new ConstraintManager($this->getContainer()); + $constraintFactory = new ConstraintFactory($this->getContainer()); - $serializedRules = $constraintManager->serializeCouponRuleCollection($rules); - $unserializedRules = $constraintManager->unserializeCouponRuleCollection($serializedRules); + $serializedRules = $constraintFactory->serializeCouponRuleCollection($rules); + $unserializedRules = $constraintFactory->unserializeCouponRuleCollection($serializedRules); $expected = (string)$rules; $actual = (string)$unserializedRules; @@ -182,8 +207,8 @@ class ConstraintManagerTest extends \PHPUnit_Framework_TestCase ->method('getTranslator') ->will($this->returnValue($stubTranslator)); - $rule1 = new AvailableForTotalAmount($stubAdapter); - $rule2 = new AvailableForXArticles($stubAdapter); + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $rule2 = new AvailableForXArticlesManager($stubAdapter); $adapter = new CouponBaseAdapter($container); diff --git a/core/lib/Thelia/Tests/Constraint/ConstraintValidatorTest.php b/core/lib/Thelia/Tests/Constraint/ConstraintValidatorTest.php new file mode 100644 index 000000000..28ac4b952 --- /dev/null +++ b/core/lib/Thelia/Tests/Constraint/ConstraintValidatorTest.php @@ -0,0 +1,337 @@ +. */ +/* */ +/**********************************************************************************/ + +namespace Thelia\Constraint; + +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Thelia\Constraint\Rule\AvailableForTotalAmountManager; +use Thelia\Constraint\Rule\AvailableForXArticlesManager; +use Thelia\Constraint\Rule\Operators; +use Thelia\Coupon\CouponBaseAdapter; +use Thelia\Coupon\CouponRuleCollection; + +/** + * Created by JetBrains PhpStorm. + * Date: 8/19/13 + * Time: 3:24 PM + * + * Unit Test ConstraintValidator Class + * + * @package Constraint + * @author Guillaume MOREL + * + */ +class ConstraintValidatorTest extends \PHPUnit_Framework_TestCase +{ + + /** + * Sets up the fixture, for example, opens a network connection. + * This method is called before a test is executed. + */ + public function setUp() + { + } + + public function testTestSuccess1Rules() + { + $ConstraintValidator = new ConstraintValidator(); + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(401)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => '>', + AvailableForTotalAmountManager::INPUT2 => '==' + ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); + + + $rules = new CouponRuleCollection(); + $rules->add($rule1); + + $isValid = $ConstraintValidator->test($rules); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + public function testTestFail1Rules() + { + $ConstraintValidator = new ConstraintValidator(); + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(400)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => '>', + AvailableForTotalAmountManager::INPUT2 => '==' + ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); + + + $rules = new CouponRuleCollection(); + $rules->add($rule1); + + $isValid = $ConstraintValidator->test($rules); + + $expected = false; + $actual =$isValid; + $this->assertEquals($expected, $actual, 'Constraints validator always think Customer is matching rules'); + } + + public function testTestSuccess2Rules() + { + $ConstraintValidator = new ConstraintValidator(); + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(401)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + $stubAdapter->expects($this->any()) + ->method('getNbArticlesInCart') + ->will($this->returnValue(5)); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => '>', + AvailableForTotalAmountManager::INPUT2 => '==' + ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); + + $rule2 = new AvailableForXArticlesManager($stubAdapter); + $operators = array( + AvailableForXArticlesManager::INPUT1 => '>' + ); + $values = array( + AvailableForXArticlesManager::INPUT1 => 4 + ); + $rule2->setValidatorsFromForm($operators, $values); + + $rules = new CouponRuleCollection(); + $rules->add($rule1); + $rules->add($rule2); + + $isValid = $ConstraintValidator->test($rules); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + public function testTestFail2Rules() + { + $ConstraintValidator = new ConstraintValidator(); + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(400)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + $stubAdapter->expects($this->any()) + ->method('getNbArticlesInCart') + ->will($this->returnValue(5)); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => '>', + AvailableForTotalAmountManager::INPUT2 => '==' + ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); + + $rule2 = new AvailableForXArticlesManager($stubAdapter); + $operators = array( + AvailableForXArticlesManager::INPUT1 => '>' + ); + $values = array( + AvailableForXArticlesManager::INPUT1 => 4 + ); + $rule2->setValidatorsFromForm($operators, $values); + + $rules = new CouponRuleCollection(); + $rules->add($rule1); + $rules->add($rule2); + + $isValid = $ConstraintValidator->test($rules); + + $expected = false; + $actual =$isValid; + $this->assertEquals($expected, $actual, 'Constraints validator always think Customer is matching rules'); + } + + + public function testVariableOpComparisonSuccess() + { + $ConstraintValidator = new ConstraintValidator(); + $expected = true; + $actual = $ConstraintValidator->variableOpComparison(1, Operators::EQUAL, 1); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(1, Operators::DIFFERENT, 2); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(1, Operators::SUPERIOR, 0); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(1, Operators::INFERIOR, 2); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(1, Operators::INFERIOR_OR_EQUAL, 1); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(1, Operators::INFERIOR_OR_EQUAL, 2); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(1, Operators::SUPERIOR_OR_EQUAL, 1); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(1, Operators::SUPERIOR_OR_EQUAL, 0); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(1, Operators::IN, array(1, 2, 3)); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(1, Operators::OUT, array(0, 2, 3)); + $this->assertEquals($expected, $actual); + + } + + public function testVariableOpComparisonFail() + { + $ConstraintValidator = new ConstraintValidator(); + $expected = false; + $actual = $ConstraintValidator->variableOpComparison(2, Operators::EQUAL, 1); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(2, Operators::DIFFERENT, 2); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(0, Operators::SUPERIOR, 0); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(3, Operators::INFERIOR, 2); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(2, Operators::INFERIOR_OR_EQUAL, 1); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(3, Operators::SUPERIOR_OR_EQUAL, 4); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(0, Operators::IN, array(1, 2, 3)); + $this->assertEquals($expected, $actual); + + $actual = $ConstraintValidator->variableOpComparison(2, Operators::OUT, array(0, 2, 3)); + $this->assertEquals($expected, $actual); + + } + + /** + * @expectedException \Exception + */ + public function testVariableOpComparisonException() + { + $ConstraintValidator = new ConstraintValidator(); + $expected = true; + $actual = $ConstraintValidator->variableOpComparison(1, 'bad', 1); + $this->assertEquals($expected, $actual); + } + + /** + * Get Mocked Container with 2 Rules + * + * @return ContainerBuilder + */ + public function getContainer() + { + $container = new ContainerBuilder(); + + $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getTranslator') + ->will($this->returnValue($stubTranslator)); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $rule2 = new AvailableForXArticlesManager($stubAdapter); + + $adapter = new CouponBaseAdapter($container); + + $container->set('thelia.constraint.rule.available_for_total_amount', $rule1); + $container->set('thelia.constraint.rule.available_for_x_articles', $rule2); + $container->set('thelia.adapter', $adapter); + + return $container; + } + + /** + * Tears down the fixture, for example, closes a network connection. + * This method is called after a test is executed. + */ + protected function tearDown() + { + } +} diff --git a/core/lib/Thelia/Tests/Constraint/Rule/AvailableForTotalAmountTest.php b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForTotalAmountTest.php index f13e59238..bfcde8a21 100644 --- a/core/lib/Thelia/Tests/Constraint/Rule/AvailableForTotalAmountTest.php +++ b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForTotalAmountTest.php @@ -23,12 +23,8 @@ namespace Thelia\Coupon; -use Thelia\Constraint\Validator\PriceParam; -use Thelia\Constraint\Validator\RuleValidator; -use Thelia\Constraint\Rule\AvailableForTotalAmount; +use Thelia\Constraint\Rule\AvailableForTotalAmountManager; use Thelia\Constraint\Rule\Operators; -use Thelia\Exception\InvalidRuleOperatorException; -use Thelia\Exception\InvalidRuleValueException; /** * Created by JetBrains PhpStorm. @@ -52,344 +48,613 @@ class AvailableForTotalAmountTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - /** @var CouponAdapterInterface $stubTheliaAdapter */ - $this->stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); +// /** @var CouponAdapterInterface $stubTheliaAdapter */ +// $this->stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); } - /** - * Generate valid CouponBaseAdapter - * - * @param float $cartTotalPrice Total amount of the current Cart - * - * @return CouponAdapterInterface - */ - protected function generateValidCouponBaseAdapterMock($cartTotalPrice = 421.23) - { - /** @var CouponAdapterInterface $stubTheliaAdapter */ - $stubTheliaAdapter = $this->getMock( - 'Thelia\Coupon\CouponBaseAdapter', - array('getCartTotalPrice'), - array() - ); - $stubTheliaAdapter->expects($this->any()) - ->method('getCartTotalPrice') - ->will($this->returnValue($cartTotalPrice)); +// /** +// * Generate valid CouponBaseAdapter +// * +// * @param float $cartTotalPrice Total amount of the current Cart +// * +// * @return CouponAdapterInterface +// */ +// protected function generateValidCouponBaseAdapterMock($cartTotalPrice = 421.23) +// { +// /** @var CouponAdapterInterface $stubTheliaAdapter */ +// $stubTheliaAdapter = $this->getMock( +// 'Thelia\Coupon\CouponBaseAdapter', +// array('getCartTotalPrice'), +// array() +// ); +// $stubTheliaAdapter->expects($this->any()) +// ->method('getCartTotalPrice') +// ->will($this->returnValue($cartTotalPrice)); +// +// return $stubTheliaAdapter; +// } - return $stubTheliaAdapter; - } +// /** +// * Check if validity test on BackOffice inputs are working +// * +// * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkBackOfficeInput +// * +// */ +// public function testValidBackOfficeInput() +// { +// $adapter = new CouponBaseAdapter(); +// +// $validators = array( +// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( +// Operators::SUPERIOR, +// new PriceParam( +// $adapter, 421.23, 'EUR' +// ) +// ) +// ); +// $rule = new AvailableForTotalAmount($adapter, $validators); +// +// $expected = true; +// $actual = $rule->checkBackOfficeInput(); +// $this->assertEquals($expected, $actual); +// } - /** - * Check if validity test on BackOffice inputs are working - * - * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkBackOfficeInput - * - */ - public function testValidBackOfficeInput() - { - $adapter = new CouponBaseAdapter(); +// /** +// * Check if validity test on BackOffice inputs are working +// * +// * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkBackOfficeInput +// * @expectedException \Thelia\Exception\InvalidRuleOperatorException +// * +// */ +// public function testInValidBackOfficeInputOperator() +// { +// $adapter = new CouponBaseAdapter(); +// +// $validators = array( +// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( +// 'X', +// new PriceParam( +// $adapter, 421.23, 'EUR' +// ) +// ) +// ); +// +// $rule = new AvailableForTotalAmount($adapter, $validators); +// +// $expected = false; +// $actual = $rule->checkBackOfficeInput(); +// $this->assertEquals($expected, $actual); +// } - $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::SUPERIOR, - new PriceParam( - $adapter, 421.23, 'EUR' - ) - ) - ); - $rule = new AvailableForTotalAmount($adapter, $validators); +// /** +// * Check if validity test on BackOffice inputs are working +// * +// * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkBackOfficeInput +// * @expectedException \ErrorException +// * +// */ +// public function testInValidBackOfficeInputValue() +// { +// $adapter = $this->generateValidCouponBaseAdapterMock(); +// +// $validators = array( +// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( +// Operators::SUPERIOR, +// 421 +// ) +// ); +// +// $rule = new AvailableForTotalAmount($adapter, $validators); +// +// $expected = false; +// $actual = $rule->checkBackOfficeInput(); +// $this->assertEquals($expected, $actual); +// } - $expected = true; - $actual = $rule->checkBackOfficeInput(); - $this->assertEquals($expected, $actual); - } - - /** - * Check if validity test on BackOffice inputs are working - * - * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkBackOfficeInput - * @expectedException \Thelia\Exception\InvalidRuleOperatorException - * - */ - public function testInValidBackOfficeInputOperator() - { - $adapter = new CouponBaseAdapter(); - - $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - 'X', - new PriceParam( - $adapter, 421.23, 'EUR' - ) - ) - ); - - $rule = new AvailableForTotalAmount($adapter, $validators); - - $expected = false; - $actual = $rule->checkBackOfficeInput(); - $this->assertEquals($expected, $actual); - } - - /** - * Check if validity test on BackOffice inputs are working - * - * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkBackOfficeInput - * @expectedException \ErrorException - * - */ - public function testInValidBackOfficeInputValue() - { - $adapter = $this->generateValidCouponBaseAdapterMock(); - - $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::SUPERIOR, - 421 - ) - ); - - $rule = new AvailableForTotalAmount($adapter, $validators); - - $expected = false; - $actual = $rule->checkBackOfficeInput(); - $this->assertEquals($expected, $actual); - } - - - - /** - * Check if validity test on FrontOffice inputs are working - * - * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkCheckoutInput - * - */ - public function testValidCheckoutInput() - { - $adapter = $this->stubTheliaAdapter; - - $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::SUPERIOR, - new PriceParam( - $adapter, 421.23, 'EUR' - ) - ) - ); - - $rule = new AvailableForTotalAmount($adapter, $validators); - - $expected = true; - $actual = $rule->checkCheckoutInput(); - $this->assertEquals($expected, $actual); - } - - /** - * Check if validity test on FrontOffice inputs are working - * - * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkCheckoutInput - * @expectedException \Thelia\Exception\InvalidRuleValueException - * - */ - public function testInValidCheckoutInputValue() - { - $adapter = $this->generateValidCouponBaseAdapterMock(421); - - $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::SUPERIOR, - new PriceParam( - $adapter, 421.23, 'EUR' - ) - ) - ); - - $rule = new AvailableForTotalAmount($adapter, $validators); - - $expected = false; - $actual = $rule->checkCheckoutInput(); - $this->assertEquals($expected, $actual); - } - - /** - * Check if validity test on FrontOffice inputs are working - * - * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::checkCheckoutInput - * @expectedException \Thelia\Exception\InvalidRuleValueException - * - */ - public function testInValidCheckoutInputType() - { - $adapter = $this->generateValidCouponBaseAdapterMock(421); - - $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::SUPERIOR, - new PriceParam( - $adapter, 421.23, 'EUR' - ) - ) - ); - - $rule = new AvailableForTotalAmount($adapter, $validators); - - $expected = false; - $actual = $rule->checkCheckoutInput(); - $this->assertEquals($expected, $actual); - } /** * Check if test inferior operator is working * - * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::isMatching + * @covers Thelia\Constraint\Rule\AvailableForTotalAmountManager::isMatching * */ public function testMatchingRuleInferior() { - $adapter = $this->generateValidCouponBaseAdapterMock(421.22); + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); - $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::INFERIOR, - new PriceParam( - $adapter, 421.23, 'EUR' - ) - ) + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(399)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::INFERIOR, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); - $rule = new AvailableForTotalAmount($adapter, $validators); + $isValid = $rule1->isMatching(); $expected = true; - $actual = $rule->isMatching(); + $actual =$isValid; $this->assertEquals($expected, $actual); } /** * Check if test inferior operator is working * - * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::isMatching + * @covers Thelia\Constraint\Rule\AvailableForTotalAmountManager::isMatching * */ public function testNotMatchingRuleInferior() { - $adapter = $this->generateValidCouponBaseAdapterMock(421.23); + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); - $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::INFERIOR, - new PriceParam( - $adapter, 421.23, 'EUR' - ) - ) + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(400)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::INFERIOR, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); - $rule = new AvailableForTotalAmount($adapter, $validators); + $isValid = $rule1->isMatching(); $expected = false; - $actual = $rule->isMatching(); + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test inferior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForTotalAmountManager::isMatching + * + */ + public function testMatchingRuleInferiorEquals() + { + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(400)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::INFERIOR_OR_EQUAL, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL + ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test inferior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForTotalAmountManager::isMatching + * + */ + public function testMatchingRuleInferiorEquals2() + { + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(399)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::INFERIOR_OR_EQUAL, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL + ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test inferior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForTotalAmountManager::isMatching + * + */ + public function testNotMatchingRuleInferiorEquals() + { + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(401)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::INFERIOR_OR_EQUAL, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL + ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = false; + $actual =$isValid; $this->assertEquals($expected, $actual); } /** * Check if test equals operator is working * - * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::isMatching + * @covers Thelia\Constraint\Rule\AvailableForTotalAmountManager::isMatching * */ public function testMatchingRuleEqual() { - $adapter = $this->stubTheliaAdapter; + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); - $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::EQUAL, - new PriceParam( - $adapter, 421.23, 'EUR' - ) - ) + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(400)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::EQUAL, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); - $rule = new AvailableForTotalAmount($adapter, $validators); + $isValid = $rule1->isMatching(); $expected = true; - $actual = $rule->isMatching(); + $actual =$isValid; $this->assertEquals($expected, $actual); } /** * Check if test equals operator is working * - * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::isMatching + * @covers Thelia\Constraint\Rule\AvailableForTotalAmountManager::isMatching * */ public function testNotMatchingRuleEqual() { - $adapter = $this->generateValidCouponBaseAdapterMock(421.22); + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); - $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::EQUAL, - new PriceParam( - $adapter, 421.23, 'EUR' - ) - ) + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(399)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::EQUAL, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); - $rule = new AvailableForTotalAmount($adapter, $validators); + $isValid = $rule1->isMatching(); $expected = false; - $actual = $rule->isMatching(); + $actual =$isValid; $this->assertEquals($expected, $actual); } /** * Check if test superior operator is working * - * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::isMatching + * @covers Thelia\Constraint\Rule\AvailableForTotalAmountManager::isMatching + * + */ + public function testMatchingRuleSuperiorEquals() + { + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(401)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::SUPERIOR_OR_EQUAL, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL + ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test superior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForTotalAmountManager::isMatching + * + */ + public function testMatchingRuleSuperiorEquals2() + { + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(400)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::SUPERIOR_OR_EQUAL, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL + ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test superior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForTotalAmountManager::isMatching + * + */ + public function testNotMatchingRuleSuperiorEquals() + { + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(399.00)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::SUPERIOR_OR_EQUAL, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL + ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = false; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + + /** + * Check if test superior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForTotalAmountManager::isMatching * */ public function testMatchingRuleSuperior() { - $adapter = $this->generateValidCouponBaseAdapterMock(421.24); + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); - $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::SUPERIOR, - new PriceParam( - $adapter, 421.23, 'EUR' - ) - ) + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(401)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::SUPERIOR, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); - $rule = new AvailableForTotalAmount($adapter, $validators); + $isValid = $rule1->isMatching(); $expected = true; - $actual = $rule->isMatching(); + $actual =$isValid; $this->assertEquals($expected, $actual); } /** * Check if test superior operator is working * - * @covers Thelia\Coupon\Rule\AvailableForTotalAmount::isMatching + * @covers Thelia\Constraint\Rule\AvailableForTotalAmountManager::isMatching * */ public function testNotMatchingRuleSuperior() { - $adapter = $this->generateValidCouponBaseAdapterMock(421.23); + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); - $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::SUPERIOR, - new PriceParam( - $adapter, 421.23, 'EUR' - ) - ) + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(399.00)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::SUPERIOR, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); - $rule = new AvailableForTotalAmount($adapter, $validators); + $isValid = $rule1->isMatching(); $expected = false; - $actual = $rule->isMatching(); + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + + /** + * Check currency is checked + * + * @covers Thelia\Constraint\Rule\AvailableForTotalAmountManager::isMatching + * + */ + public function testMatchingRuleCurrency() + { + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(400.00)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::EQUAL, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL + ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'EUR'); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check currency is checked + * + * @covers Thelia\Constraint\Rule\AvailableForTotalAmountManager::isMatching + * + */ + public function testNotMatchingRuleCurrency() + { + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getCartTotalPrice') + ->will($this->returnValue(400.00)); + $stubAdapter->expects($this->any()) + ->method('getCheckoutCurrency') + ->will($this->returnValue('EUR')); + + $rule1 = new AvailableForTotalAmountManager($stubAdapter); + $operators = array( + AvailableForTotalAmountManager::INPUT1 => Operators::EQUAL, + AvailableForTotalAmountManager::INPUT2 => Operators::EQUAL + ); + $values = array( + AvailableForTotalAmountManager::INPUT1 => 400.00, + AvailableForTotalAmountManager::INPUT2 => 'USD'); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = false; + $actual =$isValid; $this->assertEquals($expected, $actual); } diff --git a/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php index a40591d13..d7b7523aa 100644 --- a/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php +++ b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php @@ -23,11 +23,8 @@ namespace Thelia\Coupon; -use Thelia\Constraint\Rule\AvailableForXArticles; +use Thelia\Constraint\Rule\AvailableForXArticlesManager; use Thelia\Constraint\Rule\Operators; -use Thelia\Constraint\Validator\QuantityParam; -use Thelia\Constraint\Validator\RuleValidator; -use Thelia\Exception\InvalidRuleOperatorException; /** * Created by JetBrains PhpStorm. @@ -43,8 +40,8 @@ use Thelia\Exception\InvalidRuleOperatorException; class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase { - /** @var CouponAdapterInterface $stubTheliaAdapter */ - protected $stubTheliaAdapter = null; +// /** @var CouponAdapterInterface $stubTheliaAdapter */ +// protected $stubTheliaAdapter = null; /** * Sets up the fixture, for example, opens a network connection. @@ -52,54 +49,54 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - /** @var CouponAdapterInterface $stubTheliaAdapter */ - $this->stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); +// /** @var CouponAdapterInterface $stubTheliaAdapter */ +// $this->stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); } - /** - * Generate valid CouponBaseAdapter - * - * @param int $nbArticlesInCart Total articles in the current Cart - * - * @return CouponAdapterInterface - */ - protected function generateValidCouponBaseAdapterMock($nbArticlesInCart = 4) - { - /** @var CouponAdapterInterface $stubTheliaAdapter */ - $stubTheliaAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') - ->disableOriginalConstructor() - ->setMethods(array('getNbArticlesInCart')) - ->getMock(); - $stubTheliaAdapter->expects($this->any()) - ->method('getNbArticlesInCart') - ->will($this->returnValue($nbArticlesInCart)); +// /** +// * Generate valid CouponBaseAdapter +// * +// * @param int $nbArticlesInCart Total articles in the current Cart +// * +// * @return CouponAdapterInterface +// */ +// protected function generateValidCouponBaseAdapterMock($nbArticlesInCart = 4) +// { +// /** @var CouponAdapterInterface $stubTheliaAdapter */ +// $stubTheliaAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') +// ->disableOriginalConstructor() +// ->setMethods(array('getNbArticlesInCart')) +// ->getMock(); +// $stubTheliaAdapter->expects($this->any()) +// ->method('getNbArticlesInCart') +// ->will($this->returnValue($nbArticlesInCart)); +// +// return $stubTheliaAdapter; +// } - return $stubTheliaAdapter; - } - - /** - * Check if validity test on BackOffice inputs are working - * - * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkBackOfficeInput - * - */ - public function testValidBackOfficeInput() - { - $translator = $this->getMockBuilder('\Thelia\Core\Translation\Translator') - ->disableOriginalConstructor() - ->getMock(); - - $rule = new AvailableForXArticles($translator); - $operators = array(AvailableForXArticles::PARAM1_QUANTITY => Operators::SUPERIOR); - $values = array( - AvailableForXArticles::PARAM1_QUANTITY => 4 - ); - $rule->populateFromForm($operators, $values); - - $expected = true; - $actual = $rule->checkBackOfficeInput(); - $this->assertEquals($expected, $actual); - } +// /** +// * Check if validity test on BackOffice inputs are working +// * +// * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkBackOfficeInput +// * +// */ +// public function testValidBackOfficeInput() +// { +// $translator = $this->getMockBuilder('\Thelia\Core\Translation\Translator') +// ->disableOriginalConstructor() +// ->getMock(); +// +// $rule = new AvailableForXArticles($translator); +// $operators = array(AvailableForXArticles::PARAM1_QUANTITY => Operators::SUPERIOR); +// $values = array( +// AvailableForXArticles::PARAM1_QUANTITY => 4 +// ); +// $rule->populateFromForm($operators, $values); +// +// $expected = true; +// $actual = $rule->checkBackOfficeInput(); +// $this->assertEquals($expected, $actual); +// } // /** // * Check if validity test on BackOffice inputs are working @@ -126,7 +123,7 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase // $actual = $rule->checkBackOfficeInput(); // $this->assertEquals($expected, $actual); // } -// + // /** // * Check if validity test on BackOffice inputs are working // * @@ -152,7 +149,7 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase // $actual = $rule->checkBackOfficeInput(); // $this->assertEquals($expected, $actual); // } -// + // /** // * Check if validity test on BackOffice inputs are working // * @@ -178,212 +175,395 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase // $actual = $rule->checkBackOfficeInput(); // $this->assertEquals($expected, $actual); // } -// -// -// -// -// -// /** -// * Check if validity test on FrontOffice inputs are working -// * -// * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkCheckoutInput -// */ -// public function testValidCheckoutInput() -// { -// $adapter = $this->stubTheliaAdapter; -// $validators = array( -// AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( -// Operators::SUPERIOR, -// new QuantityParam( -// $adapter, -// 4 -// ) -// ) -// ); -// $rule = new AvailableForXArticles($adapter, $validators); -// -// $expected = true; -// $actual = $rule->checkCheckoutInput(); -// $this->assertEquals($expected, $actual); -// } -// -// /** -// * Check if validity test on FrontOffice inputs are working -// * -// * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkCheckoutInput -// * @expectedException \Thelia\Exception\InvalidRuleValueException -// */ -// public function testInValidCheckoutInputFloat() -// { -// $adapter = $this->generateValidCouponBaseAdapterMock(4.5); -// $validators = array( -// AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( -// Operators::SUPERIOR, -// new QuantityParam( -// $adapter, -// 4 -// ) -// ) -// ); -// $rule = new AvailableForXArticles($adapter, $validators); -// -// $expected = false; -// $actual = $rule->checkCheckoutInput(); -// $this->assertEquals($expected, $actual); -// } -// -// /** -// * Check if validity test on FrontOffice inputs are working -// * -// * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkCheckoutInput -// * @expectedException \Thelia\Exception\InvalidRuleValueException -// */ -// public function testInValidCheckoutInputNegative() -// { -// $adapter = $this->generateValidCouponBaseAdapterMock(-1); -// -// $validators = array( -// AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( -// Operators::SUPERIOR, -// new QuantityParam( -// $adapter, -// 4 -// ) -// ) -// ); -// $rule = new AvailableForXArticles($adapter, $validators); -// -// $expected = false; -// $actual = $rule->checkCheckoutInput(); -// $this->assertEquals($expected, $actual); -// } -// -// /** -// * Check if validity test on FrontOffice inputs are working -// * -// * @covers Thelia\Coupon\Rule\AvailableForXArticles::checkCheckoutInput -// * @expectedException \Thelia\Exception\InvalidRuleValueException -// */ -// public function testInValidCheckoutInputString() -// { -// $adapter = $this->generateValidCouponBaseAdapterMock('bad'); -// -// $validators = array( -// AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( -// Operators::SUPERIOR, -// new QuantityParam( -// $adapter, -// 4 -// ) -// ) -// ); -// $rule = new AvailableForXArticles($adapter, $validators); -// -// $expected = false; -// $actual = $rule->checkCheckoutInput(); -// $this->assertEquals($expected, $actual); -// } -// -// /** -// * Check if test inferior operator is working -// * -// * @covers Thelia\Coupon\Rule\AvailableForXArticles::isMatching -// * -// */ -// public function testMatchingRuleInferior() -// { -// $adapter = $this->stubTheliaAdapter; -// $validators = array( -// AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( -// Operators::INFERIOR, -// new QuantityParam( -// $adapter, -// 5 -// ) -// ) -// ); -// $rule = new AvailableForXArticles($adapter, $validators); -// -// $expected = true; -// $actual = $rule->isMatching(); -// $this->assertEquals($expected, $actual); -// } -// -// /** -// * Check if test equals operator is working -// * -// * @covers Thelia\Coupon\Rule\AvailableForXArticles::isMatching -// * -// */ -// public function testMatchingRuleEqual() -// { -// $adapter = $this->stubTheliaAdapter; -// $validators = array( -// AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( -// Operators::EQUAL, -// new QuantityParam( -// $adapter, -// 4 -// ) -// ) -// ); -// $rule = new AvailableForXArticles($adapter, $validators); -// -// $expected = true; -// $actual = $rule->isMatching(); -// $this->assertEquals($expected, $actual); -// } -// -// /** -// * Check if test superior operator is working -// * -// * @covers Thelia\Coupon\Rule\AvailableForXArticles::isMatching -// * -// */ -// public function testMatchingRuleSuperior() -// { -// $adapter = $this->stubTheliaAdapter; -// $validators = array( -// AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( -// Operators::SUPERIOR, -// new QuantityParam( -// $adapter, -// 3 -// ) -// ) -// ); -// $rule = new AvailableForXArticles($adapter, $validators); -// -// $expected = true; -// $actual = $rule->isMatching(); -// $this->assertEquals($expected, $actual); -// } -// -// /** -// * Check if test unavailable operator is working -// * -// * @covers Thelia\Coupon\Rule\AvailableForXArticles::isMatching -// * @expectedException \Thelia\Exception\InvalidRuleOperatorException -// * -// */ -// public function testNotMatchingRule() -// { -// $adapter = $this->stubTheliaAdapter; -// $validators = array( -// AvailableForXArticles::PARAM1_QUANTITY => new RuleValidator( -// Operators::DIFFERENT, -// new QuantityParam( -// $adapter, -// 3 -// ) -// ) -// ); -// $rule = new AvailableForXArticles($adapter, $validators); -// -// $expected = false; -// $actual = $rule->isMatching(); -// $this->assertEquals($expected, $actual); -// } + + + + + + /** + * Check if test inferior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForXArticlesManager::isMatching + * + */ + public function testMatchingRuleInferior() + { + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getNbArticlesInCart') + ->will($this->returnValue(4)); + + $rule1 = new AvailableForXArticlesManager($stubAdapter); + $operators = array( + AvailableForXArticlesManager::INPUT1 => Operators::INFERIOR + ); + $values = array( + AvailableForXArticlesManager::INPUT1 => 5 + ); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test inferior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForXArticlesManager::isMatching + * + */ + public function testNotMatchingRuleInferior() + { + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getNbArticlesInCart') + ->will($this->returnValue(4)); + + $rule1 = new AvailableForXArticlesManager($stubAdapter); + $operators = array( + AvailableForXArticlesManager::INPUT1 => Operators::INFERIOR + ); + $values = array( + AvailableForXArticlesManager::INPUT1 => 4, + ); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = false; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test inferior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForXArticlesManager::isMatching + * + */ + public function testMatchingRuleInferiorEquals() + { + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getNbArticlesInCart') + ->will($this->returnValue(4)); + + $rule1 = new AvailableForXArticlesManager($stubAdapter); + $operators = array( + AvailableForXArticlesManager::INPUT1 => Operators::INFERIOR_OR_EQUAL, + ); + $values = array( + AvailableForXArticlesManager::INPUT1 => 5, + ); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test inferior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForXArticlesManager::isMatching + * + */ + public function testMatchingRuleInferiorEquals2() + { + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getNbArticlesInCart') + ->will($this->returnValue(4)); + + $rule1 = new AvailableForXArticlesManager($stubAdapter); + $operators = array( + AvailableForXArticlesManager::INPUT1 => Operators::INFERIOR_OR_EQUAL + ); + $values = array( + AvailableForXArticlesManager::INPUT1 => 4 + ); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test inferior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForXArticlesManager::isMatching + * + */ + public function testNotMatchingRuleInferiorEquals() + { + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getNbArticlesInCart') + ->will($this->returnValue(4)); + + $rule1 = new AvailableForXArticlesManager($stubAdapter); + $operators = array( + AvailableForXArticlesManager::INPUT1 => Operators::INFERIOR_OR_EQUAL + ); + $values = array( + AvailableForXArticlesManager::INPUT1 => 3 + ); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = false; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test equals operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForXArticlesManager::isMatching + * + */ + public function testMatchingRuleEqual() + { + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getNbArticlesInCart') + ->will($this->returnValue(4)); + + $rule1 = new AvailableForXArticlesManager($stubAdapter); + $operators = array( + AvailableForXArticlesManager::INPUT1 => Operators::EQUAL + ); + $values = array( + AvailableForXArticlesManager::INPUT1 => 4 + ); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test equals operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForXArticlesManager::isMatching + * + */ + public function testNotMatchingRuleEqual() + { + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getNbArticlesInCart') + ->will($this->returnValue(4)); + + $rule1 = new AvailableForXArticlesManager($stubAdapter); + $operators = array( + AvailableForXArticlesManager::INPUT1 => Operators::EQUAL + ); + $values = array( + AvailableForXArticlesManager::INPUT1 => 5 + ); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = false; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test superior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForXArticlesManager::isMatching + * + */ + public function testMatchingRuleSuperiorEquals() + { + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getNbArticlesInCart') + ->will($this->returnValue(4)); + + $rule1 = new AvailableForXArticlesManager($stubAdapter); + $operators = array( + AvailableForXArticlesManager::INPUT1 => Operators::SUPERIOR_OR_EQUAL + ); + $values = array( + AvailableForXArticlesManager::INPUT1 => 4 + ); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test superior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForXArticlesManager::isMatching + * + */ + public function testMatchingRuleSuperiorEquals2() + { + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getNbArticlesInCart') + ->will($this->returnValue(4)); + + $rule1 = new AvailableForXArticlesManager($stubAdapter); + $operators = array( + AvailableForXArticlesManager::INPUT1 => Operators::SUPERIOR_OR_EQUAL + ); + $values = array( + AvailableForXArticlesManager::INPUT1 => 3 + ); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test superior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForXArticlesManager::isMatching + * + */ + public function testNotMatchingRuleSuperiorEquals() + { + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getNbArticlesInCart') + ->will($this->returnValue(4)); + + $rule1 = new AvailableForXArticlesManager($stubAdapter); + $operators = array( + AvailableForXArticlesManager::INPUT1 => Operators::SUPERIOR_OR_EQUAL + ); + $values = array( + AvailableForXArticlesManager::INPUT1 => 5 + ); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = false; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + + /** + * Check if test superior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForXArticlesManager::isMatching + * + */ + public function testMatchingRuleSuperior() + { + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getNbArticlesInCart') + ->will($this->returnValue(4)); + + $rule1 = new AvailableForXArticlesManager($stubAdapter); + $operators = array( + AvailableForXArticlesManager::INPUT1 => Operators::SUPERIOR + ); + $values = array( + AvailableForXArticlesManager::INPUT1 => 3 + ); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = true; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } + + /** + * Check if test superior operator is working + * + * @covers Thelia\Constraint\Rule\AvailableForXArticlesManager::isMatching + * + */ + public function testNotMatchingRuleSuperior() + { + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getNbArticlesInCart') + ->will($this->returnValue(4)); + + $rule1 = new AvailableForXArticlesManager($stubAdapter); + $operators = array( + AvailableForXArticlesManager::INPUT1 => Operators::SUPERIOR + ); + $values = array( + AvailableForXArticlesManager::INPUT1 => 4 + ); + $rule1->setValidatorsFromForm($operators, $values); + + $isValid = $rule1->isMatching(); + + $expected = false; + $actual =$isValid; + $this->assertEquals($expected, $actual); + } /** diff --git a/core/lib/Thelia/Tests/Constraint/Rule/OperatorsTest.php b/core/lib/Thelia/Tests/Constraint/Rule/OperatorsTest.php index aecd303b2..01d753201 100644 --- a/core/lib/Thelia/Tests/Constraint/Rule/OperatorsTest.php +++ b/core/lib/Thelia/Tests/Constraint/Rule/OperatorsTest.php @@ -48,365 +48,365 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase { } - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorInferiorValidBefore() - { - $adapter = new CouponBaseAdapter(); - // Given - $a = 11; - $operator = Operators::INFERIOR; - $b = new QuantityParam($adapter, 12); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertTrue($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorInferiorInvalidEquals() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 12; - $operator = Operators::INFERIOR; - $b = new QuantityParam($adapter, 12); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertFalse($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorInferiorInvalidAfter() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 13; - $operator = Operators::INFERIOR; - $b = new QuantityParam($adapter, 12); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertFalse($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorInferiorOrEqualValidEqual() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 11; - $operator = Operators::INFERIOR_OR_EQUAL; - $b = new QuantityParam($adapter, 11); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertTrue($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorInferiorOrEqualValidBefore() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 10; - $operator = Operators::INFERIOR_OR_EQUAL; - $b = new QuantityParam($adapter, 11); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertTrue($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorInferiorOrEqualInValidAfter() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 12; - $operator = Operators::INFERIOR_OR_EQUAL; - $b = new QuantityParam($adapter, 11); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertFalse($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorEqualValidEqual() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 12; - $operator = Operators::EQUAL; - $b = new QuantityParam($adapter, 12); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertTrue($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorEqualInValidBefore() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 11; - $operator = Operators::EQUAL; - $b = new QuantityParam($adapter, 12); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertFalse($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorEqualInValidAfter() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 13; - $operator = Operators::EQUAL; - $b = new QuantityParam($adapter, 12); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertFalse($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorSuperiorOrEqualValidEqual() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 13; - $operator = Operators::SUPERIOR_OR_EQUAL; - $b = new QuantityParam($adapter, 13); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertTrue($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorSuperiorOrEqualAfter() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 14; - $operator = Operators::SUPERIOR_OR_EQUAL; - $b = new QuantityParam($adapter, 13); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertTrue($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorSuperiorOrEqualInvalidBefore() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 12; - $operator = Operators::SUPERIOR_OR_EQUAL; - $b = new QuantityParam($adapter, 13); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertFalse($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorSuperiorValidAfter() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 13; - $operator = Operators::SUPERIOR; - $b = new QuantityParam($adapter, 12); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertTrue($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorSuperiorInvalidEqual() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 12; - $operator = Operators::SUPERIOR; - $b = new QuantityParam($adapter, 12); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertFalse($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorSuperiorInvalidBefore() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 11; - $operator = Operators::SUPERIOR; - $b = new QuantityParam($adapter, 12); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertFalse($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorDifferentValid() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 12; - $operator = Operators::DIFFERENT; - $b = new QuantityParam($adapter, 11); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertTrue($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorDifferentInvalidEquals() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 11; - $operator = Operators::DIFFERENT; - $b = new QuantityParam($adapter, 11); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertFalse($actual); - } - - /** - * - * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator - * - */ - public function testOperatorInValid() - { - // Given - $adapter = new CouponBaseAdapter(); - $a = 12; - $operator = 'X'; - $b = new QuantityParam($adapter, 11); - - // When - $actual = Operators::isValid($a, $operator, $b); - - // Then - $this->assertFalse($actual); - } +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorInferiorValidBefore() +// { +// $adapter = new CouponBaseAdapter(); +// // Given +// $a = 11; +// $operator = Operators::INFERIOR; +// $b = new QuantityParam($adapter, 12); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertTrue($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorInferiorInvalidEquals() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 12; +// $operator = Operators::INFERIOR; +// $b = new QuantityParam($adapter, 12); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertFalse($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorInferiorInvalidAfter() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 13; +// $operator = Operators::INFERIOR; +// $b = new QuantityParam($adapter, 12); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertFalse($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorInferiorOrEqualValidEqual() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 11; +// $operator = Operators::INFERIOR_OR_EQUAL; +// $b = new QuantityParam($adapter, 11); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertTrue($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorInferiorOrEqualValidBefore() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 10; +// $operator = Operators::INFERIOR_OR_EQUAL; +// $b = new QuantityParam($adapter, 11); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertTrue($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorInferiorOrEqualInValidAfter() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 12; +// $operator = Operators::INFERIOR_OR_EQUAL; +// $b = new QuantityParam($adapter, 11); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertFalse($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorEqualValidEqual() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 12; +// $operator = Operators::EQUAL; +// $b = new QuantityParam($adapter, 12); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertTrue($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorEqualInValidBefore() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 11; +// $operator = Operators::EQUAL; +// $b = new QuantityParam($adapter, 12); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertFalse($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorEqualInValidAfter() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 13; +// $operator = Operators::EQUAL; +// $b = new QuantityParam($adapter, 12); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertFalse($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorSuperiorOrEqualValidEqual() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 13; +// $operator = Operators::SUPERIOR_OR_EQUAL; +// $b = new QuantityParam($adapter, 13); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertTrue($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorSuperiorOrEqualAfter() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 14; +// $operator = Operators::SUPERIOR_OR_EQUAL; +// $b = new QuantityParam($adapter, 13); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertTrue($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorSuperiorOrEqualInvalidBefore() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 12; +// $operator = Operators::SUPERIOR_OR_EQUAL; +// $b = new QuantityParam($adapter, 13); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertFalse($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorSuperiorValidAfter() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 13; +// $operator = Operators::SUPERIOR; +// $b = new QuantityParam($adapter, 12); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertTrue($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorSuperiorInvalidEqual() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 12; +// $operator = Operators::SUPERIOR; +// $b = new QuantityParam($adapter, 12); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertFalse($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorSuperiorInvalidBefore() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 11; +// $operator = Operators::SUPERIOR; +// $b = new QuantityParam($adapter, 12); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertFalse($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorDifferentValid() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 12; +// $operator = Operators::DIFFERENT; +// $b = new QuantityParam($adapter, 11); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertTrue($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorDifferentInvalidEquals() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 11; +// $operator = Operators::DIFFERENT; +// $b = new QuantityParam($adapter, 11); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertFalse($actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator +// * +// */ +// public function testOperatorInValid() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $a = 12; +// $operator = 'X'; +// $b = new QuantityParam($adapter, 11); +// +// // When +// $actual = Operators::isValid($a, $operator, $b); +// +// // Then +// $this->assertFalse($actual); +// } From 447488f06337286e1d15142bbc9b0fe44b39209f Mon Sep 17 00:00:00 2001 From: gmorel Date: Sun, 8 Sep 2013 18:00:31 +0200 Subject: [PATCH 091/125] WIP - Refactor Coupon : is Customer matching Coupon rules (increase code coverage) --- .../Rule/AvailableForTotalAmountManager.php | 134 +++++++-------- .../Rule/AvailableForXArticlesManager.php | 158 ++++++++---------- .../Constraint/Rule/CouponRuleAbstract.php | 72 +++++--- .../Constraint/Rule/CouponRuleInterface.php | 14 +- .../Rule/AvailableForXArticlesTest.php | 96 +++++++++++ 5 files changed, 277 insertions(+), 197 deletions(-) diff --git a/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmountManager.php b/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmountManager.php index 98663fd4a..3fe051a20 100644 --- a/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmountManager.php +++ b/core/lib/Thelia/Constraint/Rule/AvailableForTotalAmountManager.php @@ -74,36 +74,36 @@ class AvailableForTotalAmountManager extends CouponRuleAbstract // /** @var RuleValidator Price Validator */ // protected $priceValidator = null; - /** - * Check if backoffice inputs are relevant or not - * - * @throws InvalidRuleOperatorException if Operator is not allowed - * @throws InvalidRuleValueException if Value is not allowed - * @return bool - */ - public function checkBackOfficeInput() - { - if (!isset($this->validators) - || empty($this->validators) - ||!isset($this->validators[self::PARAM1_PRICE]) - ||!isset($this->validators[self::PARAM1_PRICE]) - ) { - throw new InvalidRuleValueException(get_class(), self::PARAM1_PRICE); - } - - /** @var RuleValidator $ruleValidator */ - $ruleValidator = $this->validators[self::PARAM1_PRICE]; - /** @var PriceParam $price */ - $price = $ruleValidator->getParam(); - - if (!$price instanceof PriceParam) { - throw new InvalidRuleValueException(get_class(), self::PARAM1_PRICE); - } - - $this->checkBackOfficeInputsOperators(); - - return $this->isPriceValid($price->getPrice(), $price->getCurrency()); - } +// /** +// * Check if backoffice inputs are relevant or not +// * +// * @throws InvalidRuleOperatorException if Operator is not allowed +// * @throws InvalidRuleValueException if Value is not allowed +// * @return bool +// */ +// public function checkBackOfficeInput() +// { +// if (!isset($this->validators) +// || empty($this->validators) +// ||!isset($this->validators[self::PARAM1_PRICE]) +// ||!isset($this->validators[self::PARAM1_PRICE]) +// ) { +// throw new InvalidRuleValueException(get_class(), self::PARAM1_PRICE); +// } +// +// /** @var RuleValidator $ruleValidator */ +// $ruleValidator = $this->validators[self::PARAM1_PRICE]; +// /** @var PriceParam $price */ +// $price = $ruleValidator->getParam(); +// +// if (!$price instanceof PriceParam) { +// throw new InvalidRuleValueException(get_class(), self::PARAM1_PRICE); +// } +// +// $this->checkBackOfficeInputsOperators(); +// +// return $this->isPriceValid($price->getPrice(), $price->getCurrency()); +// } // /** // * Check if Checkout inputs are relevant or not @@ -247,33 +247,33 @@ class AvailableForTotalAmountManager extends CouponRuleAbstract return false; } - /** - * Check if a price is valid - * - * @param float $price Price to check - * @param string $currency Price currency - * - * @throws InvalidRuleValueException if Value is not allowed - * @return bool - */ - protected function isPriceValid($price, $currency) - { - $priceValidator = $this->priceValidator; - - /** @var PriceParam $param */ - $param = $priceValidator->getParam(); - if ($currency == $param->getCurrency()) { - try { - $priceValidator->getParam()->compareTo($price); - } catch(\InvalidArgumentException $e) { - throw new InvalidRuleValueException(get_class(), self::PARAM1_PRICE); - } - } else { - throw new InvalidRuleValueException(get_class(), self::PARAM1_CURRENCY); - } - - return true; - } +// /** +// * Check if a price is valid +// * +// * @param float $price Price to check +// * @param string $currency Price currency +// * +// * @throws InvalidRuleValueException if Value is not allowed +// * @return bool +// */ +// protected function isPriceValid($price, $currency) +// { +// $priceValidator = $this->priceValidator; +// +// /** @var PriceParam $param */ +// $param = $priceValidator->getParam(); +// if ($currency == $param->getCurrency()) { +// try { +// $priceValidator->getParam()->compareTo($price); +// } catch(\InvalidArgumentException $e) { +// throw new InvalidRuleValueException(get_class(), self::PARAM1_PRICE); +// } +// } else { +// throw new InvalidRuleValueException(get_class(), self::PARAM1_CURRENCY); +// } +// +// return true; +// } // /** // * Generate current Rule param to be validated from adapter @@ -312,15 +312,15 @@ class AvailableForTotalAmountManager extends CouponRuleAbstract public function getToolTip() { $i18nOperator = Operators::getI18n( - $this->translator, $this->priceValidator->getOperator() + $this->translator, $this->operators[self::INPUT1] ); $toolTip = $this->translator->trans( 'If cart total amount is %operator% %amount% %currency%', array( '%operator%' => $i18nOperator, - '%amount%' => $this->priceValidator->getParam()->getPrice(), - '%currency%' => $this->priceValidator->getParam()->getCurrency() + '%amount%' => $this->values[self::INPUT1], + '%currency%' => $this->values[self::INPUT2] ), 'constraint' ); @@ -361,21 +361,7 @@ class AvailableForTotalAmountManager extends CouponRuleAbstract // return $this; // } - /** - * Return a serializable Rule - * - * @return SerializableRule - */ - public function getSerializableRule() - { - $serializableRule = new SerializableRule(); - $serializableRule->ruleServiceId = $this->serviceId; - $serializableRule->operators = $this->operators; - $serializableRule->values = $this->values; - - return $serializableRule; - } diff --git a/core/lib/Thelia/Constraint/Rule/AvailableForXArticlesManager.php b/core/lib/Thelia/Constraint/Rule/AvailableForXArticlesManager.php index f56596bc2..d726447eb 100644 --- a/core/lib/Thelia/Constraint/Rule/AvailableForXArticlesManager.php +++ b/core/lib/Thelia/Constraint/Rule/AvailableForXArticlesManager.php @@ -63,56 +63,56 @@ class AvailableForXArticlesManager extends CouponRuleAbstract ) ); - /** @var QuantityParam Quantity Validator */ - protected $quantityValidator = null; +// /** @var QuantityParam Quantity Validator */ +// protected $quantityValidator = null; - /** - * Check if backoffice inputs are relevant or not - * - * @throws InvalidRuleOperatorException if Operator is not allowed - * @throws InvalidRuleValueException if Value is not allowed - * @return bool - */ - public function checkBackOfficeInput() - { - if (!isset($this->validators) - || empty($this->validators) - ||!isset($this->validators[self::PARAM1_QUANTITY]) - ||!isset($this->validators[self::PARAM1_QUANTITY]) - ) { - throw new InvalidRuleValueException(get_class(), self::PARAM1_QUANTITY); - } +// /** +// * Check if backoffice inputs are relevant or not +// * +// * @throws InvalidRuleOperatorException if Operator is not allowed +// * @throws InvalidRuleValueException if Value is not allowed +// * @return bool +// */ +// public function checkBackOfficeInput() +// { +// if (!isset($this->validators) +// || empty($this->validators) +// ||!isset($this->validators[self::PARAM1_QUANTITY]) +// ||!isset($this->validators[self::PARAM1_QUANTITY]) +// ) { +// throw new InvalidRuleValueException(get_class(), self::PARAM1_QUANTITY); +// } +// +// /** @var RuleValidator $ruleValidator */ +// $ruleValidator = $this->validators[self::PARAM1_QUANTITY]; +// /** @var QuantityParam $quantity */ +// $quantity = $ruleValidator->getParam(); +// +// if (!$quantity instanceof QuantityParam) { +// throw new InvalidRuleValueException(get_class(), self::PARAM1_QUANTITY); +// } +// +// $this->checkBackOfficeInputsOperators(); +// +// return $this->isQuantityValid($quantity->getInteger()); +// } - /** @var RuleValidator $ruleValidator */ - $ruleValidator = $this->validators[self::PARAM1_QUANTITY]; - /** @var QuantityParam $quantity */ - $quantity = $ruleValidator->getParam(); - - if (!$quantity instanceof QuantityParam) { - throw new InvalidRuleValueException(get_class(), self::PARAM1_QUANTITY); - } - - $this->checkBackOfficeInputsOperators(); - - return $this->isQuantityValid($quantity->getInteger()); - } - - /** - * Generate current Rule param to be validated from adapter - * - * @param CouponAdapterInterface $adapter allowing to gather - * all necessary Thelia variables - * - * @return $this - */ - protected function setParametersToValidate() - { - $this->paramsToValidate = array( - self::PARAM1_QUANTITY => $this->adapter->getNbArticlesInCart() - ); - - return $this; - } +// /** +// * Generate current Rule param to be validated from adapter +// * +// * @param CouponAdapterInterface $adapter allowing to gather +// * all necessary Thelia variables +// * +// * @return $this +// */ +// protected function setParametersToValidate() +// { +// $this->paramsToValidate = array( +// self::PARAM1_QUANTITY => $this->adapter->getNbArticlesInCart() +// ); +// +// return $this; +// } // /** // * Check if Checkout inputs are relevant or not @@ -210,25 +210,25 @@ class AvailableForXArticlesManager extends CouponRuleAbstract return false; } - /** - * Check if a quantity is valid - * - * @param int $quantity Quantity to check - * - * @throws InvalidRuleValueException if Value is not allowed - * @return bool - */ - protected function isQuantityValid($quantity) - { - $quantityValidator = $this->quantityValidator; - try { - $quantityValidator->getParam()->compareTo($quantity); - } catch(InvalidArgumentException $e) { - throw new InvalidRuleValueException(get_class(), self::PARAM1_QUANTITY); - } - - return true; - } +// /** +// * Check if a quantity is valid +// * +// * @param int $quantity Quantity to check +// * +// * @throws InvalidRuleValueException if Value is not allowed +// * @return bool +// */ +// protected function isQuantityValid($quantity) +// { +// $quantityValidator = $this->quantityValidator; +// try { +// $quantityValidator->getParam()->compareTo($quantity); +// } catch(InvalidArgumentException $e) { +// throw new InvalidRuleValueException(get_class(), self::PARAM1_QUANTITY); +// } +// +// return true; +// } /** * Get I18n name @@ -252,14 +252,14 @@ class AvailableForXArticlesManager extends CouponRuleAbstract public function getToolTip() { $i18nOperator = Operators::getI18n( - $this->translator, $this->priceValidator->getOperator() + $this->translator, $this->operators[self::INPUT1] ); $toolTip = $this->translator->trans( 'If cart products quantity is %operator% %quantity%', array( '%operator%' => $i18nOperator, - '%quantity%' => $this->quantityValidator->getParam()->getInteger(), + '%quantity%' => $this->values[self::INPUT1] ), 'constraint' ); @@ -297,24 +297,4 @@ class AvailableForXArticlesManager extends CouponRuleAbstract // return $this; // } - /** - * Return a serializable Rule - * - * @return SerializableRule - */ - public function getSerializableRule() - { - $serializableRule = new SerializableRule(); - $serializableRule->ruleServiceId = $this->serviceId; - $serializableRule->operators = array( - self::PARAM1_QUANTITY => $this->quantityValidator->getOperator() - ); - - $serializableRule->values = array( - self::PARAM1_QUANTITY => $this->quantityValidator->getInteger() - ); - - return $serializableRule; - } - } \ No newline at end of file diff --git a/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php b/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php index 1c781d97f..7465633bf 100644 --- a/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php +++ b/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php @@ -44,10 +44,10 @@ use Thelia\Exception\InvalidRuleOperatorException; */ abstract class CouponRuleAbstract implements CouponRuleInterface { - /** Operator key in $validators */ - CONST OPERATOR = 'operator'; - /** Value key in $validators */ - CONST VALUE = 'value'; +// /** Operator key in $validators */ +// CONST OPERATOR = 'operator'; +// /** Value key in $validators */ +// CONST VALUE = 'value'; /** @var string Service Id from Resources/config.xml */ protected $serviceId = null; @@ -58,8 +58,8 @@ abstract class CouponRuleAbstract implements CouponRuleInterface /** @var array Parameters validating parameters against */ protected $validators = array(); - /** @var array Parameters to be validated */ - protected $paramsToValidate = array(); +// /** @var array Parameters to be validated */ +// protected $paramsToValidate = array(); /** @var CouponAdapterInterface Provide necessary value from Thelia */ protected $adapter = null; @@ -150,25 +150,25 @@ abstract class CouponRuleAbstract implements CouponRuleInterface return $this->availableOperators; } - /** - * Check if Operators set for this Rule in the BackOffice are legit - * - * @throws InvalidRuleOperatorException if Operator is not allowed - * @return bool - */ - protected function checkBackOfficeInputsOperators() - { - /** @var RuleValidator $param */ - foreach ($this->validators as $key => $param) { - $operator = $param->getOperator(); - if (!isset($operator) - ||!in_array($operator, $this->availableOperators) - ) { - throw new InvalidRuleOperatorException(get_class(), $key); - } - } - return true; - } +// /** +// * Check if Operators set for this Rule in the BackOffice are legit +// * +// * @throws InvalidRuleOperatorException if Operator is not allowed +// * @return bool +// */ +// protected function checkBackOfficeInputsOperators() +// { +// /** @var RuleValidator $param */ +// foreach ($this->validators as $key => $param) { +// $operator = $param->getOperator(); +// if (!isset($operator) +// ||!in_array($operator, $this->availableOperators) +// ) { +// throw new InvalidRuleOperatorException(get_class(), $key); +// } +// } +// return true; +// } // /** // * Generate current Rule param to be validated from adapter @@ -183,13 +183,15 @@ abstract class CouponRuleAbstract implements CouponRuleInterface /** * Return all validators - * Serialization purpose * * @return array */ public function getValidators() { - return $this->validators; + return array( + $this->operators, + $this->values + ); } /** @@ -215,4 +217,20 @@ abstract class CouponRuleAbstract implements CouponRuleInterface return in_array($operator, $availableOperators); } + /** + * Return a serializable Rule + * + * @return SerializableRule + */ + public function getSerializableRule() + { + $serializableRule = new SerializableRule(); + $serializableRule->ruleServiceId = $this->serviceId; + $serializableRule->operators = $this->operators; + + $serializableRule->values = $this->values; + + return $serializableRule; + } + } \ No newline at end of file diff --git a/core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php b/core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php index 4c5575159..79a48aff9 100644 --- a/core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php +++ b/core/lib/Thelia/Constraint/Rule/CouponRuleInterface.php @@ -53,12 +53,12 @@ interface CouponRuleInterface */ public function getServiceId(); - /** - * Check if backoffice inputs are relevant or not - * - * @return bool - */ - public function checkBackOfficeInput(); +// /** +// * Check if backoffice inputs are relevant or not +// * +// * @return bool +// */ +// public function checkBackOfficeInput(); // /** // * Check if Checkout inputs are relevant or not @@ -115,7 +115,7 @@ interface CouponRuleInterface public function getToolTip(); /** - * Get validators + * Return all validators * * @return array */ diff --git a/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php index d7b7523aa..3247e4b9a 100644 --- a/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php +++ b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php @@ -25,6 +25,7 @@ namespace Thelia\Coupon; use Thelia\Constraint\Rule\AvailableForXArticlesManager; use Thelia\Constraint\Rule\Operators; +use Thelia\Constraint\Rule\SerializableRule; /** * Created by JetBrains PhpStorm. @@ -565,6 +566,101 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase $this->assertEquals($expected, $actual); } + public function testGetSerializableRule() + { + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getNbArticlesInCart') + ->will($this->returnValue(4)); + + $rule1 = new AvailableForXArticlesManager($stubAdapter); + $operators = array( + AvailableForXArticlesManager::INPUT1 => Operators::SUPERIOR + ); + $values = array( + AvailableForXArticlesManager::INPUT1 => 4 + ); + $rule1->setValidatorsFromForm($operators, $values); + + $serializableRule = $rule1->getSerializableRule(); + + $expected = new SerializableRule(); + $expected->ruleServiceId = $rule1->getServiceId(); + $expected->operators = $operators; + $expected->values = $values; + + $actual = $serializableRule; + + $this->assertEquals($expected, $actual); + + } + + public function testGetAvailableOperators() + { + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getNbArticlesInCart') + ->will($this->returnValue(4)); + + $rule1 = new AvailableForXArticlesManager($stubAdapter); + $operators = array( + AvailableForXArticlesManager::INPUT1 => Operators::SUPERIOR + ); + $values = array( + AvailableForXArticlesManager::INPUT1 => 4 + ); + $rule1->setValidatorsFromForm($operators, $values); + + $expected = array( + AvailableForXArticlesManager::INPUT1 => array( + Operators::INFERIOR, + Operators::INFERIOR_OR_EQUAL, + Operators::EQUAL, + Operators::SUPERIOR_OR_EQUAL, + Operators::SUPERIOR + ) + ); + $actual = $rule1->getAvailableOperators(); + + $this->assertEquals($expected, $actual); + + } + + public function testGetValidators() + { + $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') + ->disableOriginalConstructor() + ->getMock(); + + $stubAdapter->expects($this->any()) + ->method('getNbArticlesInCart') + ->will($this->returnValue(4)); + + $rule1 = new AvailableForXArticlesManager($stubAdapter); + $operators = array( + AvailableForXArticlesManager::INPUT1 => Operators::SUPERIOR + ); + $values = array( + AvailableForXArticlesManager::INPUT1 => 4 + ); + $rule1->setValidatorsFromForm($operators, $values); + + $expected = array( + $operators, + $values + ); + $actual = $rule1->getValidators(); + + $this->assertEquals($expected, $actual); + + } + /** * Tears down the fixture, for example, closes a network connection. From b637ad79f438ffb8a3c6a0b045320971be2bfb33 Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Mon, 9 Sep 2013 08:05:43 +0200 Subject: [PATCH 092/125] fix phpdoc --- .../Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php index a65e15a8e..e9c91b7df 100755 --- a/core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php +++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php @@ -293,13 +293,11 @@ class TheliaLoop extends AbstractSmartyPlugin } /** + * @param $smartyParams * - * find the loop class with his name and construct an instance of this class - * - * @param string $name - * @return \Thelia\Core\Template\Element\BaseLoop - * @throws InvalidElementException - * @throws ElementNotFoundException + * @return object + * @throws \Thelia\Core\Template\Element\Exception\InvalidElementException + * @throws \Thelia\Core\Template\Element\Exception\ElementNotFoundException */ protected function createLoopInstance($smartyParams) { From f2a80e4b6a69fbbcec66d1599c628d4266916f5e Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Mon, 9 Sep 2013 09:02:50 +0200 Subject: [PATCH 093/125] clean some code --- core/lib/Thelia/Core/Thelia.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php index 64f8e9a61..e5148e408 100755 --- a/core/lib/Thelia/Core/Thelia.php +++ b/core/lib/Thelia/Core/Thelia.php @@ -76,7 +76,6 @@ class Thelia extends Kernel $definePropel = new DefinePropel(new DatabaseConfiguration(), Yaml::parse(THELIA_ROOT . '/local/config/database.yml')); - $propelConfig = $definePropel->getConfig(); $serviceContainer = Propel::getServiceContainer(); $serviceContainer->setAdapterClass('thelia', 'mysql'); $manager = new ConnectionManagerSingle(); @@ -84,7 +83,6 @@ class Thelia extends Kernel $serviceContainer->setConnectionManager('thelia', $manager); if ($this->isDebug()) { - //$serviceContainer->setLogger('defaultLogger', Tlog::getInstance()); $con = Propel::getConnection(\Thelia\Model\Map\ProductTableMap::DATABASE_NAME); $con->useDebug(true); } From 51731017bd1fe3b69ae97c05f7798ec6662a07ea Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Mon, 9 Sep 2013 09:10:56 +0200 Subject: [PATCH 094/125] create customer admin controller and index controller --- .../Thelia/Config/Resources/routing/admin.xml | 8 ++++ .../Controller/Admin/CustomerController.php | 40 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 core/lib/Thelia/Controller/Admin/CustomerController.php diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml index e8262117b..15dd8acd0 100755 --- a/core/lib/Thelia/Config/Resources/routing/admin.xml +++ b/core/lib/Thelia/Config/Resources/routing/admin.xml @@ -31,6 +31,14 @@ Thelia\Controller\Admin\CategoryController::defaultAction + + + + Thelia\Controller\Admin\CustomerController::indexAction + + + + diff --git a/core/lib/Thelia/Controller/Admin/CustomerController.php b/core/lib/Thelia/Controller/Admin/CustomerController.php new file mode 100644 index 000000000..eabfee0ce --- /dev/null +++ b/core/lib/Thelia/Controller/Admin/CustomerController.php @@ -0,0 +1,40 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Controller\Admin; + + +/** + * Class CustomerController + * @package Thelia\Controller\Admin + * @author Manuel Raynaud + */ +class CustomerController extends BaseAdminController +{ + public function indexAction() + { + if (null !== $response = $this->checkAuth("admin.customers.view")) return $response; + + return $this->render("customers"); + } +} \ No newline at end of file From 2d6787e58893aa9a97f3e1df752fb9bba3c8a02b Mon Sep 17 00:00:00 2001 From: gmorel Date: Mon, 9 Sep 2013 10:03:00 +0200 Subject: [PATCH 095/125] WIP - Coupon : add rule input ajax controller --- core/lib/Thelia/Config/Resources/config.xml | 2 +- .../Thelia/Config/Resources/routing/admin.xml | 3 ++ .../Thelia/Constraint/ConstraintFactory.php | 19 ++++++++++ .../Controller/Admin/CouponController.php | 35 +++++++++++++++++++ .../admin/default/coupon/rule-input-ajax.html | 1 + 5 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 templates/admin/default/coupon/rule-input-ajax.html diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml index 7081a5e93..26a132e23 100755 --- a/core/lib/Thelia/Config/Resources/config.xml +++ b/core/lib/Thelia/Config/Resources/config.xml @@ -221,7 +221,7 @@ - + diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml index 94c5f3da6..ff0827c73 100755 --- a/core/lib/Thelia/Config/Resources/routing/admin.xml +++ b/core/lib/Thelia/Config/Resources/routing/admin.xml @@ -84,6 +84,9 @@ Thelia\Controller\Admin\CouponController::readAction + + Thelia\Controller\Admin\CouponController::getRuleInputAction + diff --git a/core/lib/Thelia/Constraint/ConstraintFactory.php b/core/lib/Thelia/Constraint/ConstraintFactory.php index 699459847..e96509172 100644 --- a/core/lib/Thelia/Constraint/ConstraintFactory.php +++ b/core/lib/Thelia/Constraint/ConstraintFactory.php @@ -140,4 +140,23 @@ class ConstraintFactory return $rule; } + + /** + * Get Coupon Rule inputs from serviceId + * + * @param string $ruleServiceId Rule class name + * + * @return array Ready to be drawn rule inputs + */ + public function getInputs($ruleServiceId) + { + if (!$this->container->has($ruleServiceId)) { + return false; + } + + /** @var CouponRuleInterface $rule */ + $rule = $this->container->get($ruleServiceId); + + return $rule->getValidators(); + } } \ No newline at end of file diff --git a/core/lib/Thelia/Controller/Admin/CouponController.php b/core/lib/Thelia/Controller/Admin/CouponController.php index 758e0b616..769a8c406 100755 --- a/core/lib/Thelia/Controller/Admin/CouponController.php +++ b/core/lib/Thelia/Controller/Admin/CouponController.php @@ -24,6 +24,8 @@ namespace Thelia\Controller\Admin; use Symfony\Component\HttpFoundation\Request; +use Thelia\Constraint\ConstraintFactory; +use Thelia\Constraint\ConstraintFactoryTest; use Thelia\Constraint\Rule\AvailableForTotalAmount; use Thelia\Constraint\Rule\CouponRuleInterface; use Thelia\Constraint\Validator\PriceParam; @@ -311,6 +313,39 @@ class CouponController extends BaseAdminController return $this->render('coupon-read', array('couponId' => $couponId)); } + /** + * Manage Coupons read display + * + * @param int $couponId Coupon Id + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function getRuleInputAction($ruleId) + { + $this->checkAuth('ADMIN', 'admin.coupon.read'); + + // @todo uncomment +// if (!$this->getRequest()->isXmlHttpRequest()) { +// $this->redirect('index'); +// } + + /** @var ConstraintFactory $constraintFactory */ + $constraintFactory = $this->container->get('thelia.constraint.factory'); + $inputs = $constraintFactory->getInputs($ruleId); + + if (!$inputs) { + return $this->pageNotFound(); + } + + return $this->render( + 'coupon/rule-input-ajax', + array( + 'ruleId' => $ruleId, + 'inputs' => $inputs + ) + ); + } + /** * Build a Coupon from its form * diff --git a/templates/admin/default/coupon/rule-input-ajax.html b/templates/admin/default/coupon/rule-input-ajax.html new file mode 100644 index 000000000..30d74d258 --- /dev/null +++ b/templates/admin/default/coupon/rule-input-ajax.html @@ -0,0 +1 @@ +test \ No newline at end of file From 0a5281c1e683dc7bdc633c2e4ce1667e2b04befd Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Mon, 9 Sep 2013 10:48:41 +0200 Subject: [PATCH 096/125] tax engine model --- .../Thelia/Exception/TaxEngineException.php | 41 ++++++++++++ core/lib/Thelia/TaxEngine/Calculator.php | 65 +++++++++++++++++++ local/config/schema.xml | 14 ++-- 3 files changed, 113 insertions(+), 7 deletions(-) create mode 100755 core/lib/Thelia/Exception/TaxEngineException.php create mode 100755 core/lib/Thelia/TaxEngine/Calculator.php diff --git a/core/lib/Thelia/Exception/TaxEngineException.php b/core/lib/Thelia/Exception/TaxEngineException.php new file mode 100755 index 000000000..b51aeef44 --- /dev/null +++ b/core/lib/Thelia/Exception/TaxEngineException.php @@ -0,0 +1,41 @@ +. */ +/* */ +/*************************************************************************************/ + +namespace Thelia\Exception; + +use Thelia\Log\Tlog; + +class TaxEngineException extends \RuntimeException +{ + const UNKNOWN_EXCEPTION = 0; + + const UNDEFINED_PRODUCT = 501; + const UNDEFINED_COUNTRY = 502; + + public function __construct($message, $code = null, $previous = null) { + if($code === null) { + $code = self::UNKNOWN_EXCEPTION; + } + parent::__construct($message, $code, $previous); + } +} diff --git a/core/lib/Thelia/TaxEngine/Calculator.php b/core/lib/Thelia/TaxEngine/Calculator.php new file mode 100755 index 000000000..0e1216783 --- /dev/null +++ b/core/lib/Thelia/TaxEngine/Calculator.php @@ -0,0 +1,65 @@ +. */ +/* */ +/*************************************************************************************/ +namespace Thelia\TaxEngine; + +use Thelia\Exception\TaxEngineException; +use Thelia\Model\Country; +use Thelia\Model\Product; + +/** + * Class Calculator + * @package Thelia\TaxEngine + * @author Etienne Roudeix + */ +class Calculator +{ + protected $taxRulesCollection = null; + + protected $product = null; + protected $country = null; + + public function __construct() + { + return $this; + } + + public function load(Product $product, Country $country) + { + if($product->getId() === null) { + throw new TaxEngineException('Product id is empty in Calculator::load', TaxEngineException::UNDEFINED_PRODUCT); + } + if($country->getId() === null) { + throw new TaxEngineException('Country id is empty in Calculator::load', TaxEngineException::UNDEFINED_COUNTRY); + } + + $this->product = $product; + $this->country = $country; + + return $this; + } + + public function getTaxAmount() + { + + } +} diff --git a/local/config/schema.xml b/local/config/schema.xml index e6e68c4b2..55036197f 100755 --- a/local/config/schema.xml +++ b/local/config/schema.xml @@ -96,19 +96,19 @@
    - - + + +
    - - - + + - - + + From ca9ec3b089c0e71cb2c29a9479f6cf0d4112dcb7 Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Mon, 9 Sep 2013 11:01:31 +0200 Subject: [PATCH 097/125] tax engine model --- core/lib/Thelia/Model/Base/Country.php | 7 +- core/lib/Thelia/Model/Base/CountryQuery.php | 4 +- core/lib/Thelia/Model/Base/Tax.php | 14 +- core/lib/Thelia/Model/Base/TaxQuery.php | 4 +- core/lib/Thelia/Model/Base/TaxRule.php | 247 +++++------------- core/lib/Thelia/Model/Base/TaxRuleCountry.php | 190 +++++--------- .../Thelia/Model/Base/TaxRuleCountryQuery.php | 126 ++++----- core/lib/Thelia/Model/Base/TaxRuleI18n.php | 118 ++++++++- .../Thelia/Model/Base/TaxRuleI18nQuery.php | 68 ++++- core/lib/Thelia/Model/Base/TaxRuleQuery.php | 105 +------- .../Model/Map/TaxRuleCountryTableMap.php | 130 ++++++--- .../Thelia/Model/Map/TaxRuleI18nTableMap.php | 44 +++- core/lib/Thelia/Model/Map/TaxRuleTableMap.php | 54 ++-- core/lib/Thelia/Model/Map/TaxTableMap.php | 2 +- install/thelia.sql | 18 +- local/config/schema.xml | 6 +- 16 files changed, 535 insertions(+), 602 deletions(-) diff --git a/core/lib/Thelia/Model/Base/Country.php b/core/lib/Thelia/Model/Base/Country.php index e0541a151..90fd48880 100755 --- a/core/lib/Thelia/Model/Base/Country.php +++ b/core/lib/Thelia/Model/Base/Country.php @@ -1631,7 +1631,10 @@ abstract class Country implements ActiveRecordInterface $taxRuleCountriesToDelete = $this->getTaxRuleCountries(new Criteria(), $con)->diff($taxRuleCountries); - $this->taxRuleCountriesScheduledForDeletion = $taxRuleCountriesToDelete; + //since at least one column in the foreign key is at the same time a PK + //we can not just set a PK to NULL in the lines below. We have to store + //a backup of all values, so we are able to manipulate these items based on the onDelete value later. + $this->taxRuleCountriesScheduledForDeletion = clone $taxRuleCountriesToDelete; foreach ($taxRuleCountriesToDelete as $taxRuleCountryRemoved) { $taxRuleCountryRemoved->setCountry(null); @@ -1724,7 +1727,7 @@ abstract class Country implements ActiveRecordInterface $this->taxRuleCountriesScheduledForDeletion = clone $this->collTaxRuleCountries; $this->taxRuleCountriesScheduledForDeletion->clear(); } - $this->taxRuleCountriesScheduledForDeletion[]= $taxRuleCountry; + $this->taxRuleCountriesScheduledForDeletion[]= clone $taxRuleCountry; $taxRuleCountry->setCountry(null); } diff --git a/core/lib/Thelia/Model/Base/CountryQuery.php b/core/lib/Thelia/Model/Base/CountryQuery.php index 6c3a1c950..1e565e9c0 100755 --- a/core/lib/Thelia/Model/Base/CountryQuery.php +++ b/core/lib/Thelia/Model/Base/CountryQuery.php @@ -616,7 +616,7 @@ abstract class CountryQuery extends ModelCriteria * * @return ChildCountryQuery The current query, for fluid interface */ - public function joinTaxRuleCountry($relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinTaxRuleCountry($relationAlias = null, $joinType = Criteria::INNER_JOIN) { $tableMap = $this->getTableMap(); $relationMap = $tableMap->getRelation('TaxRuleCountry'); @@ -651,7 +651,7 @@ abstract class CountryQuery extends ModelCriteria * * @return \Thelia\Model\TaxRuleCountryQuery A secondary query class using the current class as primary query */ - public function useTaxRuleCountryQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useTaxRuleCountryQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { return $this ->joinTaxRuleCountry($relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/Tax.php b/core/lib/Thelia/Model/Base/Tax.php index 02e6bc3b0..ed4bb40f7 100755 --- a/core/lib/Thelia/Model/Base/Tax.php +++ b/core/lib/Thelia/Model/Base/Tax.php @@ -791,10 +791,9 @@ abstract class Tax implements ActiveRecordInterface if ($this->taxRuleCountriesScheduledForDeletion !== null) { if (!$this->taxRuleCountriesScheduledForDeletion->isEmpty()) { - foreach ($this->taxRuleCountriesScheduledForDeletion as $taxRuleCountry) { - // need to save related object because we set the relation to null - $taxRuleCountry->save($con); - } + \Thelia\Model\TaxRuleCountryQuery::create() + ->filterByPrimaryKeys($this->taxRuleCountriesScheduledForDeletion->getPrimaryKeys(false)) + ->delete($con); $this->taxRuleCountriesScheduledForDeletion = null; } } @@ -1346,7 +1345,10 @@ abstract class Tax implements ActiveRecordInterface $taxRuleCountriesToDelete = $this->getTaxRuleCountries(new Criteria(), $con)->diff($taxRuleCountries); - $this->taxRuleCountriesScheduledForDeletion = $taxRuleCountriesToDelete; + //since at least one column in the foreign key is at the same time a PK + //we can not just set a PK to NULL in the lines below. We have to store + //a backup of all values, so we are able to manipulate these items based on the onDelete value later. + $this->taxRuleCountriesScheduledForDeletion = clone $taxRuleCountriesToDelete; foreach ($taxRuleCountriesToDelete as $taxRuleCountryRemoved) { $taxRuleCountryRemoved->setTax(null); @@ -1439,7 +1441,7 @@ abstract class Tax implements ActiveRecordInterface $this->taxRuleCountriesScheduledForDeletion = clone $this->collTaxRuleCountries; $this->taxRuleCountriesScheduledForDeletion->clear(); } - $this->taxRuleCountriesScheduledForDeletion[]= $taxRuleCountry; + $this->taxRuleCountriesScheduledForDeletion[]= clone $taxRuleCountry; $taxRuleCountry->setTax(null); } diff --git a/core/lib/Thelia/Model/Base/TaxQuery.php b/core/lib/Thelia/Model/Base/TaxQuery.php index 307ace57c..07316bf69 100755 --- a/core/lib/Thelia/Model/Base/TaxQuery.php +++ b/core/lib/Thelia/Model/Base/TaxQuery.php @@ -432,7 +432,7 @@ abstract class TaxQuery extends ModelCriteria * * @return ChildTaxQuery The current query, for fluid interface */ - public function joinTaxRuleCountry($relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinTaxRuleCountry($relationAlias = null, $joinType = Criteria::INNER_JOIN) { $tableMap = $this->getTableMap(); $relationMap = $tableMap->getRelation('TaxRuleCountry'); @@ -467,7 +467,7 @@ abstract class TaxQuery extends ModelCriteria * * @return \Thelia\Model\TaxRuleCountryQuery A secondary query class using the current class as primary query */ - public function useTaxRuleCountryQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useTaxRuleCountryQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { return $this ->joinTaxRuleCountry($relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Base/TaxRule.php b/core/lib/Thelia/Model/Base/TaxRule.php index d33d47e2b..61f21d4e1 100755 --- a/core/lib/Thelia/Model/Base/TaxRule.php +++ b/core/lib/Thelia/Model/Base/TaxRule.php @@ -67,24 +67,6 @@ abstract class TaxRule implements ActiveRecordInterface */ protected $id; - /** - * The value for the code field. - * @var string - */ - protected $code; - - /** - * The value for the title field. - * @var string - */ - protected $title; - - /** - * The value for the description field. - * @var string - */ - protected $description; - /** * The value for the created_at field. * @var string @@ -420,39 +402,6 @@ abstract class TaxRule implements ActiveRecordInterface return $this->id; } - /** - * Get the [code] column value. - * - * @return string - */ - public function getCode() - { - - return $this->code; - } - - /** - * Get the [title] column value. - * - * @return string - */ - public function getTitle() - { - - return $this->title; - } - - /** - * Get the [description] column value. - * - * @return string - */ - public function getDescription() - { - - return $this->description; - } - /** * Get the [optionally formatted] temporal [created_at] column value. * @@ -514,69 +463,6 @@ abstract class TaxRule implements ActiveRecordInterface return $this; } // setId() - /** - * Set the value of [code] column. - * - * @param string $v new value - * @return \Thelia\Model\TaxRule The current object (for fluent API support) - */ - public function setCode($v) - { - if ($v !== null) { - $v = (string) $v; - } - - if ($this->code !== $v) { - $this->code = $v; - $this->modifiedColumns[] = TaxRuleTableMap::CODE; - } - - - return $this; - } // setCode() - - /** - * Set the value of [title] column. - * - * @param string $v new value - * @return \Thelia\Model\TaxRule The current object (for fluent API support) - */ - public function setTitle($v) - { - if ($v !== null) { - $v = (string) $v; - } - - if ($this->title !== $v) { - $this->title = $v; - $this->modifiedColumns[] = TaxRuleTableMap::TITLE; - } - - - return $this; - } // setTitle() - - /** - * Set the value of [description] column. - * - * @param string $v new value - * @return \Thelia\Model\TaxRule The current object (for fluent API support) - */ - public function setDescription($v) - { - if ($v !== null) { - $v = (string) $v; - } - - if ($this->description !== $v) { - $this->description = $v; - $this->modifiedColumns[] = TaxRuleTableMap::DESCRIPTION; - } - - - return $this; - } // setDescription() - /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. * @@ -659,22 +545,13 @@ abstract class TaxRule implements ActiveRecordInterface $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : TaxRuleTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; $this->id = (null !== $col) ? (int) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : TaxRuleTableMap::translateFieldName('Code', TableMap::TYPE_PHPNAME, $indexType)]; - $this->code = (null !== $col) ? (string) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : TaxRuleTableMap::translateFieldName('Title', TableMap::TYPE_PHPNAME, $indexType)]; - $this->title = (null !== $col) ? (string) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : TaxRuleTableMap::translateFieldName('Description', TableMap::TYPE_PHPNAME, $indexType)]; - $this->description = (null !== $col) ? (string) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : TaxRuleTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : TaxRuleTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : TaxRuleTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : TaxRuleTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } @@ -687,7 +564,7 @@ abstract class TaxRule implements ActiveRecordInterface $this->ensureConsistency(); } - return $startcol + 6; // 6 = TaxRuleTableMap::NUM_HYDRATE_COLUMNS. + return $startcol + 3; // 3 = TaxRuleTableMap::NUM_HYDRATE_COLUMNS. } catch (Exception $e) { throw new PropelException("Error populating \Thelia\Model\TaxRule object", 0, $e); @@ -968,15 +845,6 @@ abstract class TaxRule implements ActiveRecordInterface if ($this->isColumnModified(TaxRuleTableMap::ID)) { $modifiedColumns[':p' . $index++] = 'ID'; } - if ($this->isColumnModified(TaxRuleTableMap::CODE)) { - $modifiedColumns[':p' . $index++] = 'CODE'; - } - if ($this->isColumnModified(TaxRuleTableMap::TITLE)) { - $modifiedColumns[':p' . $index++] = 'TITLE'; - } - if ($this->isColumnModified(TaxRuleTableMap::DESCRIPTION)) { - $modifiedColumns[':p' . $index++] = 'DESCRIPTION'; - } if ($this->isColumnModified(TaxRuleTableMap::CREATED_AT)) { $modifiedColumns[':p' . $index++] = 'CREATED_AT'; } @@ -997,15 +865,6 @@ abstract class TaxRule implements ActiveRecordInterface case 'ID': $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT); break; - case 'CODE': - $stmt->bindValue($identifier, $this->code, PDO::PARAM_STR); - break; - case 'TITLE': - $stmt->bindValue($identifier, $this->title, PDO::PARAM_STR); - break; - case 'DESCRIPTION': - $stmt->bindValue($identifier, $this->description, PDO::PARAM_STR); - break; case 'CREATED_AT': $stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); break; @@ -1078,18 +937,9 @@ abstract class TaxRule implements ActiveRecordInterface return $this->getId(); break; case 1: - return $this->getCode(); - break; - case 2: - return $this->getTitle(); - break; - case 3: - return $this->getDescription(); - break; - case 4: return $this->getCreatedAt(); break; - case 5: + case 2: return $this->getUpdatedAt(); break; default: @@ -1122,11 +972,8 @@ abstract class TaxRule implements ActiveRecordInterface $keys = TaxRuleTableMap::getFieldNames($keyType); $result = array( $keys[0] => $this->getId(), - $keys[1] => $this->getCode(), - $keys[2] => $this->getTitle(), - $keys[3] => $this->getDescription(), - $keys[4] => $this->getCreatedAt(), - $keys[5] => $this->getUpdatedAt(), + $keys[1] => $this->getCreatedAt(), + $keys[2] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; foreach($virtualColumns as $key => $virtualColumn) @@ -1182,18 +1029,9 @@ abstract class TaxRule implements ActiveRecordInterface $this->setId($value); break; case 1: - $this->setCode($value); - break; - case 2: - $this->setTitle($value); - break; - case 3: - $this->setDescription($value); - break; - case 4: $this->setCreatedAt($value); break; - case 5: + case 2: $this->setUpdatedAt($value); break; } // switch() @@ -1221,11 +1059,8 @@ abstract class TaxRule implements ActiveRecordInterface $keys = TaxRuleTableMap::getFieldNames($keyType); if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]); - if (array_key_exists($keys[1], $arr)) $this->setCode($arr[$keys[1]]); - if (array_key_exists($keys[2], $arr)) $this->setTitle($arr[$keys[2]]); - if (array_key_exists($keys[3], $arr)) $this->setDescription($arr[$keys[3]]); - if (array_key_exists($keys[4], $arr)) $this->setCreatedAt($arr[$keys[4]]); - if (array_key_exists($keys[5], $arr)) $this->setUpdatedAt($arr[$keys[5]]); + if (array_key_exists($keys[1], $arr)) $this->setCreatedAt($arr[$keys[1]]); + if (array_key_exists($keys[2], $arr)) $this->setUpdatedAt($arr[$keys[2]]); } /** @@ -1238,9 +1073,6 @@ abstract class TaxRule implements ActiveRecordInterface $criteria = new Criteria(TaxRuleTableMap::DATABASE_NAME); if ($this->isColumnModified(TaxRuleTableMap::ID)) $criteria->add(TaxRuleTableMap::ID, $this->id); - if ($this->isColumnModified(TaxRuleTableMap::CODE)) $criteria->add(TaxRuleTableMap::CODE, $this->code); - if ($this->isColumnModified(TaxRuleTableMap::TITLE)) $criteria->add(TaxRuleTableMap::TITLE, $this->title); - if ($this->isColumnModified(TaxRuleTableMap::DESCRIPTION)) $criteria->add(TaxRuleTableMap::DESCRIPTION, $this->description); if ($this->isColumnModified(TaxRuleTableMap::CREATED_AT)) $criteria->add(TaxRuleTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(TaxRuleTableMap::UPDATED_AT)) $criteria->add(TaxRuleTableMap::UPDATED_AT, $this->updated_at); @@ -1306,9 +1138,6 @@ abstract class TaxRule implements ActiveRecordInterface */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) { - $copyObj->setCode($this->getCode()); - $copyObj->setTitle($this->getTitle()); - $copyObj->setDescription($this->getDescription()); $copyObj->setCreatedAt($this->getCreatedAt()); $copyObj->setUpdatedAt($this->getUpdatedAt()); @@ -1723,7 +1552,10 @@ abstract class TaxRule implements ActiveRecordInterface $taxRuleCountriesToDelete = $this->getTaxRuleCountries(new Criteria(), $con)->diff($taxRuleCountries); - $this->taxRuleCountriesScheduledForDeletion = $taxRuleCountriesToDelete; + //since at least one column in the foreign key is at the same time a PK + //we can not just set a PK to NULL in the lines below. We have to store + //a backup of all values, so we are able to manipulate these items based on the onDelete value later. + $this->taxRuleCountriesScheduledForDeletion = clone $taxRuleCountriesToDelete; foreach ($taxRuleCountriesToDelete as $taxRuleCountryRemoved) { $taxRuleCountryRemoved->setTaxRule(null); @@ -1816,7 +1648,7 @@ abstract class TaxRule implements ActiveRecordInterface $this->taxRuleCountriesScheduledForDeletion = clone $this->collTaxRuleCountries; $this->taxRuleCountriesScheduledForDeletion->clear(); } - $this->taxRuleCountriesScheduledForDeletion[]= $taxRuleCountry; + $this->taxRuleCountriesScheduledForDeletion[]= clone $taxRuleCountry; $taxRuleCountry->setTaxRule(null); } @@ -2104,9 +1936,6 @@ abstract class TaxRule implements ActiveRecordInterface public function clear() { $this->id = null; - $this->code = null; - $this->title = null; - $this->description = null; $this->created_at = null; $this->updated_at = null; $this->alreadyInSave = false; @@ -2286,6 +2115,54 @@ abstract class TaxRule implements ActiveRecordInterface return $this->getTranslation($this->getLocale(), $con); } + + /** + * Get the [title] column value. + * + * @return string + */ + public function getTitle() + { + return $this->getCurrentTranslation()->getTitle(); + } + + + /** + * Set the value of [title] column. + * + * @param string $v new value + * @return \Thelia\Model\TaxRuleI18n The current object (for fluent API support) + */ + public function setTitle($v) + { $this->getCurrentTranslation()->setTitle($v); + + return $this; + } + + + /** + * Get the [description] column value. + * + * @return string + */ + public function getDescription() + { + return $this->getCurrentTranslation()->getDescription(); + } + + + /** + * Set the value of [description] column. + * + * @param string $v new value + * @return \Thelia\Model\TaxRuleI18n The current object (for fluent API support) + */ + public function setDescription($v) + { $this->getCurrentTranslation()->setDescription($v); + + return $this; + } + /** * Code to be run before persisting the object * @param ConnectionInterface $con diff --git a/core/lib/Thelia/Model/Base/TaxRuleCountry.php b/core/lib/Thelia/Model/Base/TaxRuleCountry.php index 66f6f585b..0cc3e74eb 100755 --- a/core/lib/Thelia/Model/Base/TaxRuleCountry.php +++ b/core/lib/Thelia/Model/Base/TaxRuleCountry.php @@ -60,12 +60,6 @@ abstract class TaxRuleCountry implements ActiveRecordInterface */ protected $virtualColumns = array(); - /** - * The value for the id field. - * @var int - */ - protected $id; - /** * The value for the tax_rule_id field. * @var int @@ -85,10 +79,10 @@ abstract class TaxRuleCountry implements ActiveRecordInterface protected $tax_id; /** - * The value for the none field. + * The value for the position field. * @var int */ - protected $none; + protected $position; /** * The value for the created_at field. @@ -379,17 +373,6 @@ abstract class TaxRuleCountry implements ActiveRecordInterface return array_keys(get_object_vars($this)); } - /** - * Get the [id] column value. - * - * @return int - */ - public function getId() - { - - return $this->id; - } - /** * Get the [tax_rule_id] column value. * @@ -424,14 +407,14 @@ abstract class TaxRuleCountry implements ActiveRecordInterface } /** - * Get the [none] column value. + * Get the [position] column value. * * @return int */ - public function getNone() + public function getPosition() { - return $this->none; + return $this->position; } /** @@ -474,27 +457,6 @@ abstract class TaxRuleCountry implements ActiveRecordInterface } } - /** - * Set the value of [id] column. - * - * @param int $v new value - * @return \Thelia\Model\TaxRuleCountry The current object (for fluent API support) - */ - public function setId($v) - { - if ($v !== null) { - $v = (int) $v; - } - - if ($this->id !== $v) { - $this->id = $v; - $this->modifiedColumns[] = TaxRuleCountryTableMap::ID; - } - - - return $this; - } // setId() - /** * Set the value of [tax_rule_id] column. * @@ -571,25 +533,25 @@ abstract class TaxRuleCountry implements ActiveRecordInterface } // setTaxId() /** - * Set the value of [none] column. + * Set the value of [position] column. * * @param int $v new value * @return \Thelia\Model\TaxRuleCountry The current object (for fluent API support) */ - public function setNone($v) + public function setPosition($v) { if ($v !== null) { $v = (int) $v; } - if ($this->none !== $v) { - $this->none = $v; - $this->modifiedColumns[] = TaxRuleCountryTableMap::NONE; + if ($this->position !== $v) { + $this->position = $v; + $this->modifiedColumns[] = TaxRuleCountryTableMap::POSITION; } return $this; - } // setNone() + } // setPosition() /** * Sets the value of [created_at] column to a normalized version of the date/time value specified. @@ -670,28 +632,25 @@ abstract class TaxRuleCountry implements ActiveRecordInterface try { - $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : TaxRuleCountryTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; - $this->id = (null !== $col) ? (int) $col : null; - - $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : TaxRuleCountryTableMap::translateFieldName('TaxRuleId', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : TaxRuleCountryTableMap::translateFieldName('TaxRuleId', TableMap::TYPE_PHPNAME, $indexType)]; $this->tax_rule_id = (null !== $col) ? (int) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : TaxRuleCountryTableMap::translateFieldName('CountryId', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : TaxRuleCountryTableMap::translateFieldName('CountryId', TableMap::TYPE_PHPNAME, $indexType)]; $this->country_id = (null !== $col) ? (int) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : TaxRuleCountryTableMap::translateFieldName('TaxId', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : TaxRuleCountryTableMap::translateFieldName('TaxId', TableMap::TYPE_PHPNAME, $indexType)]; $this->tax_id = (null !== $col) ? (int) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : TaxRuleCountryTableMap::translateFieldName('None', TableMap::TYPE_PHPNAME, $indexType)]; - $this->none = (null !== $col) ? (int) $col : null; + $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : TaxRuleCountryTableMap::translateFieldName('Position', TableMap::TYPE_PHPNAME, $indexType)]; + $this->position = (null !== $col) ? (int) $col : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : TaxRuleCountryTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : TaxRuleCountryTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null; - $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : TaxRuleCountryTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; + $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : TaxRuleCountryTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)]; if ($col === '0000-00-00 00:00:00') { $col = null; } @@ -704,7 +663,7 @@ abstract class TaxRuleCountry implements ActiveRecordInterface $this->ensureConsistency(); } - return $startcol + 7; // 7 = TaxRuleCountryTableMap::NUM_HYDRATE_COLUMNS. + return $startcol + 6; // 6 = TaxRuleCountryTableMap::NUM_HYDRATE_COLUMNS. } catch (Exception $e) { throw new PropelException("Error populating \Thelia\Model\TaxRuleCountry object", 0, $e); @@ -958,9 +917,6 @@ abstract class TaxRuleCountry implements ActiveRecordInterface // check the columns in natural order for more readable SQL queries - if ($this->isColumnModified(TaxRuleCountryTableMap::ID)) { - $modifiedColumns[':p' . $index++] = 'ID'; - } if ($this->isColumnModified(TaxRuleCountryTableMap::TAX_RULE_ID)) { $modifiedColumns[':p' . $index++] = 'TAX_RULE_ID'; } @@ -970,8 +926,8 @@ abstract class TaxRuleCountry implements ActiveRecordInterface if ($this->isColumnModified(TaxRuleCountryTableMap::TAX_ID)) { $modifiedColumns[':p' . $index++] = 'TAX_ID'; } - if ($this->isColumnModified(TaxRuleCountryTableMap::NONE)) { - $modifiedColumns[':p' . $index++] = 'NONE'; + if ($this->isColumnModified(TaxRuleCountryTableMap::POSITION)) { + $modifiedColumns[':p' . $index++] = 'POSITION'; } if ($this->isColumnModified(TaxRuleCountryTableMap::CREATED_AT)) { $modifiedColumns[':p' . $index++] = 'CREATED_AT'; @@ -990,9 +946,6 @@ abstract class TaxRuleCountry implements ActiveRecordInterface $stmt = $con->prepare($sql); foreach ($modifiedColumns as $identifier => $columnName) { switch ($columnName) { - case 'ID': - $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT); - break; case 'TAX_RULE_ID': $stmt->bindValue($identifier, $this->tax_rule_id, PDO::PARAM_INT); break; @@ -1002,8 +955,8 @@ abstract class TaxRuleCountry implements ActiveRecordInterface case 'TAX_ID': $stmt->bindValue($identifier, $this->tax_id, PDO::PARAM_INT); break; - case 'NONE': - $stmt->bindValue($identifier, $this->none, PDO::PARAM_INT); + case 'POSITION': + $stmt->bindValue($identifier, $this->position, PDO::PARAM_INT); break; case 'CREATED_AT': $stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR); @@ -1067,24 +1020,21 @@ abstract class TaxRuleCountry implements ActiveRecordInterface { switch ($pos) { case 0: - return $this->getId(); - break; - case 1: return $this->getTaxRuleId(); break; - case 2: + case 1: return $this->getCountryId(); break; - case 3: + case 2: return $this->getTaxId(); break; - case 4: - return $this->getNone(); + case 3: + return $this->getPosition(); break; - case 5: + case 4: return $this->getCreatedAt(); break; - case 6: + case 5: return $this->getUpdatedAt(); break; default: @@ -1110,19 +1060,18 @@ abstract class TaxRuleCountry implements ActiveRecordInterface */ public function toArray($keyType = TableMap::TYPE_PHPNAME, $includeLazyLoadColumns = true, $alreadyDumpedObjects = array(), $includeForeignObjects = false) { - if (isset($alreadyDumpedObjects['TaxRuleCountry'][$this->getPrimaryKey()])) { + if (isset($alreadyDumpedObjects['TaxRuleCountry'][serialize($this->getPrimaryKey())])) { return '*RECURSION*'; } - $alreadyDumpedObjects['TaxRuleCountry'][$this->getPrimaryKey()] = true; + $alreadyDumpedObjects['TaxRuleCountry'][serialize($this->getPrimaryKey())] = true; $keys = TaxRuleCountryTableMap::getFieldNames($keyType); $result = array( - $keys[0] => $this->getId(), - $keys[1] => $this->getTaxRuleId(), - $keys[2] => $this->getCountryId(), - $keys[3] => $this->getTaxId(), - $keys[4] => $this->getNone(), - $keys[5] => $this->getCreatedAt(), - $keys[6] => $this->getUpdatedAt(), + $keys[0] => $this->getTaxRuleId(), + $keys[1] => $this->getCountryId(), + $keys[2] => $this->getTaxId(), + $keys[3] => $this->getPosition(), + $keys[4] => $this->getCreatedAt(), + $keys[5] => $this->getUpdatedAt(), ); $virtualColumns = $this->virtualColumns; foreach($virtualColumns as $key => $virtualColumn) @@ -1175,24 +1124,21 @@ abstract class TaxRuleCountry implements ActiveRecordInterface { switch ($pos) { case 0: - $this->setId($value); - break; - case 1: $this->setTaxRuleId($value); break; - case 2: + case 1: $this->setCountryId($value); break; - case 3: + case 2: $this->setTaxId($value); break; - case 4: - $this->setNone($value); + case 3: + $this->setPosition($value); break; - case 5: + case 4: $this->setCreatedAt($value); break; - case 6: + case 5: $this->setUpdatedAt($value); break; } // switch() @@ -1219,13 +1165,12 @@ abstract class TaxRuleCountry implements ActiveRecordInterface { $keys = TaxRuleCountryTableMap::getFieldNames($keyType); - if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]); - if (array_key_exists($keys[1], $arr)) $this->setTaxRuleId($arr[$keys[1]]); - if (array_key_exists($keys[2], $arr)) $this->setCountryId($arr[$keys[2]]); - if (array_key_exists($keys[3], $arr)) $this->setTaxId($arr[$keys[3]]); - if (array_key_exists($keys[4], $arr)) $this->setNone($arr[$keys[4]]); - if (array_key_exists($keys[5], $arr)) $this->setCreatedAt($arr[$keys[5]]); - if (array_key_exists($keys[6], $arr)) $this->setUpdatedAt($arr[$keys[6]]); + if (array_key_exists($keys[0], $arr)) $this->setTaxRuleId($arr[$keys[0]]); + if (array_key_exists($keys[1], $arr)) $this->setCountryId($arr[$keys[1]]); + if (array_key_exists($keys[2], $arr)) $this->setTaxId($arr[$keys[2]]); + if (array_key_exists($keys[3], $arr)) $this->setPosition($arr[$keys[3]]); + if (array_key_exists($keys[4], $arr)) $this->setCreatedAt($arr[$keys[4]]); + if (array_key_exists($keys[5], $arr)) $this->setUpdatedAt($arr[$keys[5]]); } /** @@ -1237,11 +1182,10 @@ abstract class TaxRuleCountry implements ActiveRecordInterface { $criteria = new Criteria(TaxRuleCountryTableMap::DATABASE_NAME); - if ($this->isColumnModified(TaxRuleCountryTableMap::ID)) $criteria->add(TaxRuleCountryTableMap::ID, $this->id); if ($this->isColumnModified(TaxRuleCountryTableMap::TAX_RULE_ID)) $criteria->add(TaxRuleCountryTableMap::TAX_RULE_ID, $this->tax_rule_id); if ($this->isColumnModified(TaxRuleCountryTableMap::COUNTRY_ID)) $criteria->add(TaxRuleCountryTableMap::COUNTRY_ID, $this->country_id); if ($this->isColumnModified(TaxRuleCountryTableMap::TAX_ID)) $criteria->add(TaxRuleCountryTableMap::TAX_ID, $this->tax_id); - if ($this->isColumnModified(TaxRuleCountryTableMap::NONE)) $criteria->add(TaxRuleCountryTableMap::NONE, $this->none); + if ($this->isColumnModified(TaxRuleCountryTableMap::POSITION)) $criteria->add(TaxRuleCountryTableMap::POSITION, $this->position); if ($this->isColumnModified(TaxRuleCountryTableMap::CREATED_AT)) $criteria->add(TaxRuleCountryTableMap::CREATED_AT, $this->created_at); if ($this->isColumnModified(TaxRuleCountryTableMap::UPDATED_AT)) $criteria->add(TaxRuleCountryTableMap::UPDATED_AT, $this->updated_at); @@ -1259,29 +1203,39 @@ abstract class TaxRuleCountry implements ActiveRecordInterface public function buildPkeyCriteria() { $criteria = new Criteria(TaxRuleCountryTableMap::DATABASE_NAME); - $criteria->add(TaxRuleCountryTableMap::ID, $this->id); + $criteria->add(TaxRuleCountryTableMap::TAX_RULE_ID, $this->tax_rule_id); + $criteria->add(TaxRuleCountryTableMap::COUNTRY_ID, $this->country_id); + $criteria->add(TaxRuleCountryTableMap::TAX_ID, $this->tax_id); return $criteria; } /** - * Returns the primary key for this object (row). - * @return int + * Returns the composite primary key for this object. + * The array elements will be in same order as specified in XML. + * @return array */ public function getPrimaryKey() { - return $this->getId(); + $pks = array(); + $pks[0] = $this->getTaxRuleId(); + $pks[1] = $this->getCountryId(); + $pks[2] = $this->getTaxId(); + + return $pks; } /** - * Generic method to set the primary key (id column). + * Set the [composite] primary key. * - * @param int $key Primary key. + * @param array $keys The elements of the composite key (order must match the order in XML file). * @return void */ - public function setPrimaryKey($key) + public function setPrimaryKey($keys) { - $this->setId($key); + $this->setTaxRuleId($keys[0]); + $this->setCountryId($keys[1]); + $this->setTaxId($keys[2]); } /** @@ -1291,7 +1245,7 @@ abstract class TaxRuleCountry implements ActiveRecordInterface public function isPrimaryKeyNull() { - return null === $this->getId(); + return (null === $this->getTaxRuleId()) && (null === $this->getCountryId()) && (null === $this->getTaxId()); } /** @@ -1307,11 +1261,10 @@ abstract class TaxRuleCountry implements ActiveRecordInterface */ public function copyInto($copyObj, $deepCopy = false, $makeNew = true) { - $copyObj->setId($this->getId()); $copyObj->setTaxRuleId($this->getTaxRuleId()); $copyObj->setCountryId($this->getCountryId()); $copyObj->setTaxId($this->getTaxId()); - $copyObj->setNone($this->getNone()); + $copyObj->setPosition($this->getPosition()); $copyObj->setCreatedAt($this->getCreatedAt()); $copyObj->setUpdatedAt($this->getUpdatedAt()); if ($makeNew) { @@ -1499,11 +1452,10 @@ abstract class TaxRuleCountry implements ActiveRecordInterface */ public function clear() { - $this->id = null; $this->tax_rule_id = null; $this->country_id = null; $this->tax_id = null; - $this->none = null; + $this->position = null; $this->created_at = null; $this->updated_at = null; $this->alreadyInSave = false; diff --git a/core/lib/Thelia/Model/Base/TaxRuleCountryQuery.php b/core/lib/Thelia/Model/Base/TaxRuleCountryQuery.php index b4d4cd1c2..5674643f7 100755 --- a/core/lib/Thelia/Model/Base/TaxRuleCountryQuery.php +++ b/core/lib/Thelia/Model/Base/TaxRuleCountryQuery.php @@ -21,19 +21,17 @@ use Thelia\Model\Map\TaxRuleCountryTableMap; * * * - * @method ChildTaxRuleCountryQuery orderById($order = Criteria::ASC) Order by the id column * @method ChildTaxRuleCountryQuery orderByTaxRuleId($order = Criteria::ASC) Order by the tax_rule_id column * @method ChildTaxRuleCountryQuery orderByCountryId($order = Criteria::ASC) Order by the country_id column * @method ChildTaxRuleCountryQuery orderByTaxId($order = Criteria::ASC) Order by the tax_id column - * @method ChildTaxRuleCountryQuery orderByNone($order = Criteria::ASC) Order by the none column + * @method ChildTaxRuleCountryQuery orderByPosition($order = Criteria::ASC) Order by the position column * @method ChildTaxRuleCountryQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column * @method ChildTaxRuleCountryQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column * - * @method ChildTaxRuleCountryQuery groupById() Group by the id column * @method ChildTaxRuleCountryQuery groupByTaxRuleId() Group by the tax_rule_id column * @method ChildTaxRuleCountryQuery groupByCountryId() Group by the country_id column * @method ChildTaxRuleCountryQuery groupByTaxId() Group by the tax_id column - * @method ChildTaxRuleCountryQuery groupByNone() Group by the none column + * @method ChildTaxRuleCountryQuery groupByPosition() Group by the position column * @method ChildTaxRuleCountryQuery groupByCreatedAt() Group by the created_at column * @method ChildTaxRuleCountryQuery groupByUpdatedAt() Group by the updated_at column * @@ -56,19 +54,17 @@ use Thelia\Model\Map\TaxRuleCountryTableMap; * @method ChildTaxRuleCountry findOne(ConnectionInterface $con = null) Return the first ChildTaxRuleCountry matching the query * @method ChildTaxRuleCountry findOneOrCreate(ConnectionInterface $con = null) Return the first ChildTaxRuleCountry matching the query, or a new ChildTaxRuleCountry object populated from the query conditions when no match is found * - * @method ChildTaxRuleCountry findOneById(int $id) Return the first ChildTaxRuleCountry filtered by the id column * @method ChildTaxRuleCountry findOneByTaxRuleId(int $tax_rule_id) Return the first ChildTaxRuleCountry filtered by the tax_rule_id column * @method ChildTaxRuleCountry findOneByCountryId(int $country_id) Return the first ChildTaxRuleCountry filtered by the country_id column * @method ChildTaxRuleCountry findOneByTaxId(int $tax_id) Return the first ChildTaxRuleCountry filtered by the tax_id column - * @method ChildTaxRuleCountry findOneByNone(int $none) Return the first ChildTaxRuleCountry filtered by the none column + * @method ChildTaxRuleCountry findOneByPosition(int $position) Return the first ChildTaxRuleCountry filtered by the position column * @method ChildTaxRuleCountry findOneByCreatedAt(string $created_at) Return the first ChildTaxRuleCountry filtered by the created_at column * @method ChildTaxRuleCountry findOneByUpdatedAt(string $updated_at) Return the first ChildTaxRuleCountry filtered by the updated_at column * - * @method array findById(int $id) Return ChildTaxRuleCountry objects filtered by the id column * @method array findByTaxRuleId(int $tax_rule_id) Return ChildTaxRuleCountry objects filtered by the tax_rule_id column * @method array findByCountryId(int $country_id) Return ChildTaxRuleCountry objects filtered by the country_id column * @method array findByTaxId(int $tax_id) Return ChildTaxRuleCountry objects filtered by the tax_id column - * @method array findByNone(int $none) Return ChildTaxRuleCountry objects filtered by the none column + * @method array findByPosition(int $position) Return ChildTaxRuleCountry objects filtered by the position column * @method array findByCreatedAt(string $created_at) Return ChildTaxRuleCountry objects filtered by the created_at column * @method array findByUpdatedAt(string $updated_at) Return ChildTaxRuleCountry objects filtered by the updated_at column * @@ -118,10 +114,10 @@ abstract class TaxRuleCountryQuery extends ModelCriteria * Go fast if the query is untouched. * * - * $obj = $c->findPk(12, $con); + * $obj = $c->findPk(array(12, 34, 56), $con); * * - * @param mixed $key Primary key to use for the query + * @param array[$tax_rule_id, $country_id, $tax_id] $key Primary key to use for the query * @param ConnectionInterface $con an optional connection object * * @return ChildTaxRuleCountry|array|mixed the result, formatted by the current formatter @@ -131,7 +127,7 @@ abstract class TaxRuleCountryQuery extends ModelCriteria if ($key === null) { return null; } - if ((null !== ($obj = TaxRuleCountryTableMap::getInstanceFromPool((string) $key))) && !$this->formatter) { + if ((null !== ($obj = TaxRuleCountryTableMap::getInstanceFromPool(serialize(array((string) $key[0], (string) $key[1], (string) $key[2]))))) && !$this->formatter) { // the object is already in the instance pool return $obj; } @@ -159,10 +155,12 @@ abstract class TaxRuleCountryQuery extends ModelCriteria */ protected function findPkSimple($key, $con) { - $sql = 'SELECT ID, TAX_RULE_ID, COUNTRY_ID, TAX_ID, NONE, CREATED_AT, UPDATED_AT FROM tax_rule_country WHERE ID = :p0'; + $sql = 'SELECT TAX_RULE_ID, COUNTRY_ID, TAX_ID, POSITION, CREATED_AT, UPDATED_AT FROM tax_rule_country WHERE TAX_RULE_ID = :p0 AND COUNTRY_ID = :p1 AND TAX_ID = :p2'; try { $stmt = $con->prepare($sql); - $stmt->bindValue(':p0', $key, PDO::PARAM_INT); + $stmt->bindValue(':p0', $key[0], PDO::PARAM_INT); + $stmt->bindValue(':p1', $key[1], PDO::PARAM_INT); + $stmt->bindValue(':p2', $key[2], PDO::PARAM_INT); $stmt->execute(); } catch (Exception $e) { Propel::log($e->getMessage(), Propel::LOG_ERR); @@ -172,7 +170,7 @@ abstract class TaxRuleCountryQuery extends ModelCriteria if ($row = $stmt->fetch(\PDO::FETCH_NUM)) { $obj = new ChildTaxRuleCountry(); $obj->hydrate($row); - TaxRuleCountryTableMap::addInstanceToPool($obj, (string) $key); + TaxRuleCountryTableMap::addInstanceToPool($obj, serialize(array((string) $key[0], (string) $key[1], (string) $key[2]))); } $stmt->closeCursor(); @@ -201,7 +199,7 @@ abstract class TaxRuleCountryQuery extends ModelCriteria /** * Find objects by primary key * - * $objs = $c->findPks(array(12, 56, 832), $con); + * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con); * * @param array $keys Primary keys to use for the query * @param ConnectionInterface $con an optional connection object @@ -231,8 +229,11 @@ abstract class TaxRuleCountryQuery extends ModelCriteria */ public function filterByPrimaryKey($key) { + $this->addUsingAlias(TaxRuleCountryTableMap::TAX_RULE_ID, $key[0], Criteria::EQUAL); + $this->addUsingAlias(TaxRuleCountryTableMap::COUNTRY_ID, $key[1], Criteria::EQUAL); + $this->addUsingAlias(TaxRuleCountryTableMap::TAX_ID, $key[2], Criteria::EQUAL); - return $this->addUsingAlias(TaxRuleCountryTableMap::ID, $key, Criteria::EQUAL); + return $this; } /** @@ -244,49 +245,19 @@ abstract class TaxRuleCountryQuery extends ModelCriteria */ public function filterByPrimaryKeys($keys) { - - return $this->addUsingAlias(TaxRuleCountryTableMap::ID, $keys, Criteria::IN); - } - - /** - * Filter the query on the id column - * - * Example usage: - * - * $query->filterById(1234); // WHERE id = 1234 - * $query->filterById(array(12, 34)); // WHERE id IN (12, 34) - * $query->filterById(array('min' => 12)); // WHERE id > 12 - * - * - * @param mixed $id The value to use as filter. - * Use scalar values for equality. - * Use array values for in_array() equivalent. - * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildTaxRuleCountryQuery The current query, for fluid interface - */ - public function filterById($id = null, $comparison = null) - { - if (is_array($id)) { - $useMinMax = false; - if (isset($id['min'])) { - $this->addUsingAlias(TaxRuleCountryTableMap::ID, $id['min'], Criteria::GREATER_EQUAL); - $useMinMax = true; - } - if (isset($id['max'])) { - $this->addUsingAlias(TaxRuleCountryTableMap::ID, $id['max'], Criteria::LESS_EQUAL); - $useMinMax = true; - } - if ($useMinMax) { - return $this; - } - if (null === $comparison) { - $comparison = Criteria::IN; - } + if (empty($keys)) { + return $this->add(null, '1<>1', Criteria::CUSTOM); + } + foreach ($keys as $key) { + $cton0 = $this->getNewCriterion(TaxRuleCountryTableMap::TAX_RULE_ID, $key[0], Criteria::EQUAL); + $cton1 = $this->getNewCriterion(TaxRuleCountryTableMap::COUNTRY_ID, $key[1], Criteria::EQUAL); + $cton0->addAnd($cton1); + $cton2 = $this->getNewCriterion(TaxRuleCountryTableMap::TAX_ID, $key[2], Criteria::EQUAL); + $cton0->addAnd($cton2); + $this->addOr($cton0); } - return $this->addUsingAlias(TaxRuleCountryTableMap::ID, $id, $comparison); + return $this; } /** @@ -419,16 +390,16 @@ abstract class TaxRuleCountryQuery extends ModelCriteria } /** - * Filter the query on the none column + * Filter the query on the position column * * Example usage: * - * $query->filterByNone(1234); // WHERE none = 1234 - * $query->filterByNone(array(12, 34)); // WHERE none IN (12, 34) - * $query->filterByNone(array('min' => 12)); // WHERE none > 12 + * $query->filterByPosition(1234); // WHERE position = 1234 + * $query->filterByPosition(array(12, 34)); // WHERE position IN (12, 34) + * $query->filterByPosition(array('min' => 12)); // WHERE position > 12 * * - * @param mixed $none The value to use as filter. + * @param mixed $position The value to use as filter. * Use scalar values for equality. * Use array values for in_array() equivalent. * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. @@ -436,16 +407,16 @@ abstract class TaxRuleCountryQuery extends ModelCriteria * * @return ChildTaxRuleCountryQuery The current query, for fluid interface */ - public function filterByNone($none = null, $comparison = null) + public function filterByPosition($position = null, $comparison = null) { - if (is_array($none)) { + if (is_array($position)) { $useMinMax = false; - if (isset($none['min'])) { - $this->addUsingAlias(TaxRuleCountryTableMap::NONE, $none['min'], Criteria::GREATER_EQUAL); + if (isset($position['min'])) { + $this->addUsingAlias(TaxRuleCountryTableMap::POSITION, $position['min'], Criteria::GREATER_EQUAL); $useMinMax = true; } - if (isset($none['max'])) { - $this->addUsingAlias(TaxRuleCountryTableMap::NONE, $none['max'], Criteria::LESS_EQUAL); + if (isset($position['max'])) { + $this->addUsingAlias(TaxRuleCountryTableMap::POSITION, $position['max'], Criteria::LESS_EQUAL); $useMinMax = true; } if ($useMinMax) { @@ -456,7 +427,7 @@ abstract class TaxRuleCountryQuery extends ModelCriteria } } - return $this->addUsingAlias(TaxRuleCountryTableMap::NONE, $none, $comparison); + return $this->addUsingAlias(TaxRuleCountryTableMap::POSITION, $position, $comparison); } /** @@ -578,7 +549,7 @@ abstract class TaxRuleCountryQuery extends ModelCriteria * * @return ChildTaxRuleCountryQuery The current query, for fluid interface */ - public function joinTax($relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinTax($relationAlias = null, $joinType = Criteria::INNER_JOIN) { $tableMap = $this->getTableMap(); $relationMap = $tableMap->getRelation('Tax'); @@ -613,7 +584,7 @@ abstract class TaxRuleCountryQuery extends ModelCriteria * * @return \Thelia\Model\TaxQuery A secondary query class using the current class as primary query */ - public function useTaxQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useTaxQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { return $this ->joinTax($relationAlias, $joinType) @@ -653,7 +624,7 @@ abstract class TaxRuleCountryQuery extends ModelCriteria * * @return ChildTaxRuleCountryQuery The current query, for fluid interface */ - public function joinTaxRule($relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinTaxRule($relationAlias = null, $joinType = Criteria::INNER_JOIN) { $tableMap = $this->getTableMap(); $relationMap = $tableMap->getRelation('TaxRule'); @@ -688,7 +659,7 @@ abstract class TaxRuleCountryQuery extends ModelCriteria * * @return \Thelia\Model\TaxRuleQuery A secondary query class using the current class as primary query */ - public function useTaxRuleQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useTaxRuleQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { return $this ->joinTaxRule($relationAlias, $joinType) @@ -728,7 +699,7 @@ abstract class TaxRuleCountryQuery extends ModelCriteria * * @return ChildTaxRuleCountryQuery The current query, for fluid interface */ - public function joinCountry($relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinCountry($relationAlias = null, $joinType = Criteria::INNER_JOIN) { $tableMap = $this->getTableMap(); $relationMap = $tableMap->getRelation('Country'); @@ -763,7 +734,7 @@ abstract class TaxRuleCountryQuery extends ModelCriteria * * @return \Thelia\Model\CountryQuery A secondary query class using the current class as primary query */ - public function useCountryQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useCountryQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { return $this ->joinCountry($relationAlias, $joinType) @@ -780,7 +751,10 @@ abstract class TaxRuleCountryQuery extends ModelCriteria public function prune($taxRuleCountry = null) { if ($taxRuleCountry) { - $this->addUsingAlias(TaxRuleCountryTableMap::ID, $taxRuleCountry->getId(), Criteria::NOT_EQUAL); + $this->addCond('pruneCond0', $this->getAliasedColName(TaxRuleCountryTableMap::TAX_RULE_ID), $taxRuleCountry->getTaxRuleId(), Criteria::NOT_EQUAL); + $this->addCond('pruneCond1', $this->getAliasedColName(TaxRuleCountryTableMap::COUNTRY_ID), $taxRuleCountry->getCountryId(), Criteria::NOT_EQUAL); + $this->addCond('pruneCond2', $this->getAliasedColName(TaxRuleCountryTableMap::TAX_ID), $taxRuleCountry->getTaxId(), Criteria::NOT_EQUAL); + $this->combine(array('pruneCond0', 'pruneCond1', 'pruneCond2'), Criteria::LOGICAL_OR); } return $this; diff --git a/core/lib/Thelia/Model/Base/TaxRuleI18n.php b/core/lib/Thelia/Model/Base/TaxRuleI18n.php index b1efadd6a..711dba307 100755 --- a/core/lib/Thelia/Model/Base/TaxRuleI18n.php +++ b/core/lib/Thelia/Model/Base/TaxRuleI18n.php @@ -66,6 +66,18 @@ abstract class TaxRuleI18n implements ActiveRecordInterface */ protected $locale; + /** + * The value for the title field. + * @var string + */ + protected $title; + + /** + * The value for the description field. + * @var string + */ + protected $description; + /** * @var TaxRule */ @@ -368,6 +380,28 @@ abstract class TaxRuleI18n implements ActiveRecordInterface return $this->locale; } + /** + * Get the [title] column value. + * + * @return string + */ + public function getTitle() + { + + return $this->title; + } + + /** + * Get the [description] column value. + * + * @return string + */ + public function getDescription() + { + + return $this->description; + } + /** * Set the value of [id] column. * @@ -414,6 +448,48 @@ abstract class TaxRuleI18n implements ActiveRecordInterface return $this; } // setLocale() + /** + * Set the value of [title] column. + * + * @param string $v new value + * @return \Thelia\Model\TaxRuleI18n The current object (for fluent API support) + */ + public function setTitle($v) + { + if ($v !== null) { + $v = (string) $v; + } + + if ($this->title !== $v) { + $this->title = $v; + $this->modifiedColumns[] = TaxRuleI18nTableMap::TITLE; + } + + + return $this; + } // setTitle() + + /** + * Set the value of [description] column. + * + * @param string $v new value + * @return \Thelia\Model\TaxRuleI18n The current object (for fluent API support) + */ + public function setDescription($v) + { + if ($v !== null) { + $v = (string) $v; + } + + if ($this->description !== $v) { + $this->description = $v; + $this->modifiedColumns[] = TaxRuleI18nTableMap::DESCRIPTION; + } + + + return $this; + } // setDescription() + /** * Indicates whether the columns in this object are only set to default values. * @@ -460,6 +536,12 @@ abstract class TaxRuleI18n implements ActiveRecordInterface $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : TaxRuleI18nTableMap::translateFieldName('Locale', TableMap::TYPE_PHPNAME, $indexType)]; $this->locale = (null !== $col) ? (string) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : TaxRuleI18nTableMap::translateFieldName('Title', TableMap::TYPE_PHPNAME, $indexType)]; + $this->title = (null !== $col) ? (string) $col : null; + + $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : TaxRuleI18nTableMap::translateFieldName('Description', TableMap::TYPE_PHPNAME, $indexType)]; + $this->description = (null !== $col) ? (string) $col : null; $this->resetModified(); $this->setNew(false); @@ -468,7 +550,7 @@ abstract class TaxRuleI18n implements ActiveRecordInterface $this->ensureConsistency(); } - return $startcol + 2; // 2 = TaxRuleI18nTableMap::NUM_HYDRATE_COLUMNS. + return $startcol + 4; // 4 = TaxRuleI18nTableMap::NUM_HYDRATE_COLUMNS. } catch (Exception $e) { throw new PropelException("Error populating \Thelia\Model\TaxRuleI18n object", 0, $e); @@ -695,6 +777,12 @@ abstract class TaxRuleI18n implements ActiveRecordInterface if ($this->isColumnModified(TaxRuleI18nTableMap::LOCALE)) { $modifiedColumns[':p' . $index++] = 'LOCALE'; } + if ($this->isColumnModified(TaxRuleI18nTableMap::TITLE)) { + $modifiedColumns[':p' . $index++] = 'TITLE'; + } + if ($this->isColumnModified(TaxRuleI18nTableMap::DESCRIPTION)) { + $modifiedColumns[':p' . $index++] = 'DESCRIPTION'; + } $sql = sprintf( 'INSERT INTO tax_rule_i18n (%s) VALUES (%s)', @@ -712,6 +800,12 @@ abstract class TaxRuleI18n implements ActiveRecordInterface case 'LOCALE': $stmt->bindValue($identifier, $this->locale, PDO::PARAM_STR); break; + case 'TITLE': + $stmt->bindValue($identifier, $this->title, PDO::PARAM_STR); + break; + case 'DESCRIPTION': + $stmt->bindValue($identifier, $this->description, PDO::PARAM_STR); + break; } } $stmt->execute(); @@ -773,6 +867,12 @@ abstract class TaxRuleI18n implements ActiveRecordInterface case 1: return $this->getLocale(); break; + case 2: + return $this->getTitle(); + break; + case 3: + return $this->getDescription(); + break; default: return null; break; @@ -804,6 +904,8 @@ abstract class TaxRuleI18n implements ActiveRecordInterface $result = array( $keys[0] => $this->getId(), $keys[1] => $this->getLocale(), + $keys[2] => $this->getTitle(), + $keys[3] => $this->getDescription(), ); $virtualColumns = $this->virtualColumns; foreach($virtualColumns as $key => $virtualColumn) @@ -855,6 +957,12 @@ abstract class TaxRuleI18n implements ActiveRecordInterface case 1: $this->setLocale($value); break; + case 2: + $this->setTitle($value); + break; + case 3: + $this->setDescription($value); + break; } // switch() } @@ -881,6 +989,8 @@ abstract class TaxRuleI18n implements ActiveRecordInterface if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]); if (array_key_exists($keys[1], $arr)) $this->setLocale($arr[$keys[1]]); + if (array_key_exists($keys[2], $arr)) $this->setTitle($arr[$keys[2]]); + if (array_key_exists($keys[3], $arr)) $this->setDescription($arr[$keys[3]]); } /** @@ -894,6 +1004,8 @@ abstract class TaxRuleI18n implements ActiveRecordInterface if ($this->isColumnModified(TaxRuleI18nTableMap::ID)) $criteria->add(TaxRuleI18nTableMap::ID, $this->id); if ($this->isColumnModified(TaxRuleI18nTableMap::LOCALE)) $criteria->add(TaxRuleI18nTableMap::LOCALE, $this->locale); + if ($this->isColumnModified(TaxRuleI18nTableMap::TITLE)) $criteria->add(TaxRuleI18nTableMap::TITLE, $this->title); + if ($this->isColumnModified(TaxRuleI18nTableMap::DESCRIPTION)) $criteria->add(TaxRuleI18nTableMap::DESCRIPTION, $this->description); return $criteria; } @@ -966,6 +1078,8 @@ abstract class TaxRuleI18n implements ActiveRecordInterface { $copyObj->setId($this->getId()); $copyObj->setLocale($this->getLocale()); + $copyObj->setTitle($this->getTitle()); + $copyObj->setDescription($this->getDescription()); if ($makeNew) { $copyObj->setNew(true); } @@ -1051,6 +1165,8 @@ abstract class TaxRuleI18n implements ActiveRecordInterface { $this->id = null; $this->locale = null; + $this->title = null; + $this->description = null; $this->alreadyInSave = false; $this->clearAllReferences(); $this->applyDefaultValues(); diff --git a/core/lib/Thelia/Model/Base/TaxRuleI18nQuery.php b/core/lib/Thelia/Model/Base/TaxRuleI18nQuery.php index 02667f4ac..dfb3e100c 100755 --- a/core/lib/Thelia/Model/Base/TaxRuleI18nQuery.php +++ b/core/lib/Thelia/Model/Base/TaxRuleI18nQuery.php @@ -23,9 +23,13 @@ use Thelia\Model\Map\TaxRuleI18nTableMap; * * @method ChildTaxRuleI18nQuery orderById($order = Criteria::ASC) Order by the id column * @method ChildTaxRuleI18nQuery orderByLocale($order = Criteria::ASC) Order by the locale column + * @method ChildTaxRuleI18nQuery orderByTitle($order = Criteria::ASC) Order by the title column + * @method ChildTaxRuleI18nQuery orderByDescription($order = Criteria::ASC) Order by the description column * * @method ChildTaxRuleI18nQuery groupById() Group by the id column * @method ChildTaxRuleI18nQuery groupByLocale() Group by the locale column + * @method ChildTaxRuleI18nQuery groupByTitle() Group by the title column + * @method ChildTaxRuleI18nQuery groupByDescription() Group by the description column * * @method ChildTaxRuleI18nQuery leftJoin($relation) Adds a LEFT JOIN clause to the query * @method ChildTaxRuleI18nQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query @@ -40,9 +44,13 @@ use Thelia\Model\Map\TaxRuleI18nTableMap; * * @method ChildTaxRuleI18n findOneById(int $id) Return the first ChildTaxRuleI18n filtered by the id column * @method ChildTaxRuleI18n findOneByLocale(string $locale) Return the first ChildTaxRuleI18n filtered by the locale column + * @method ChildTaxRuleI18n findOneByTitle(string $title) Return the first ChildTaxRuleI18n filtered by the title column + * @method ChildTaxRuleI18n findOneByDescription(string $description) Return the first ChildTaxRuleI18n filtered by the description column * * @method array findById(int $id) Return ChildTaxRuleI18n objects filtered by the id column * @method array findByLocale(string $locale) Return ChildTaxRuleI18n objects filtered by the locale column + * @method array findByTitle(string $title) Return ChildTaxRuleI18n objects filtered by the title column + * @method array findByDescription(string $description) Return ChildTaxRuleI18n objects filtered by the description column * */ abstract class TaxRuleI18nQuery extends ModelCriteria @@ -131,7 +139,7 @@ abstract class TaxRuleI18nQuery extends ModelCriteria */ protected function findPkSimple($key, $con) { - $sql = 'SELECT ID, LOCALE FROM tax_rule_i18n WHERE ID = :p0 AND LOCALE = :p1'; + $sql = 'SELECT ID, LOCALE, TITLE, DESCRIPTION FROM tax_rule_i18n WHERE ID = :p0 AND LOCALE = :p1'; try { $stmt = $con->prepare($sql); $stmt->bindValue(':p0', $key[0], PDO::PARAM_INT); @@ -304,6 +312,64 @@ abstract class TaxRuleI18nQuery extends ModelCriteria return $this->addUsingAlias(TaxRuleI18nTableMap::LOCALE, $locale, $comparison); } + /** + * Filter the query on the title column + * + * Example usage: + * + * $query->filterByTitle('fooValue'); // WHERE title = 'fooValue' + * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' + * + * + * @param string $title The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildTaxRuleI18nQuery The current query, for fluid interface + */ + public function filterByTitle($title = null, $comparison = null) + { + if (null === $comparison) { + if (is_array($title)) { + $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $title)) { + $title = str_replace('*', '%', $title); + $comparison = Criteria::LIKE; + } + } + + return $this->addUsingAlias(TaxRuleI18nTableMap::TITLE, $title, $comparison); + } + + /** + * Filter the query on the description column + * + * Example usage: + * + * $query->filterByDescription('fooValue'); // WHERE description = 'fooValue' + * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' + * + * + * @param string $description The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ChildTaxRuleI18nQuery The current query, for fluid interface + */ + public function filterByDescription($description = null, $comparison = null) + { + if (null === $comparison) { + if (is_array($description)) { + $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $description)) { + $description = str_replace('*', '%', $description); + $comparison = Criteria::LIKE; + } + } + + return $this->addUsingAlias(TaxRuleI18nTableMap::DESCRIPTION, $description, $comparison); + } + /** * Filter the query by a related \Thelia\Model\TaxRule object * diff --git a/core/lib/Thelia/Model/Base/TaxRuleQuery.php b/core/lib/Thelia/Model/Base/TaxRuleQuery.php index 2fb478b7a..8ee264415 100755 --- a/core/lib/Thelia/Model/Base/TaxRuleQuery.php +++ b/core/lib/Thelia/Model/Base/TaxRuleQuery.php @@ -23,16 +23,10 @@ use Thelia\Model\Map\TaxRuleTableMap; * * * @method ChildTaxRuleQuery orderById($order = Criteria::ASC) Order by the id column - * @method ChildTaxRuleQuery orderByCode($order = Criteria::ASC) Order by the code column - * @method ChildTaxRuleQuery orderByTitle($order = Criteria::ASC) Order by the title column - * @method ChildTaxRuleQuery orderByDescription($order = Criteria::ASC) Order by the description column * @method ChildTaxRuleQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column * @method ChildTaxRuleQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column * * @method ChildTaxRuleQuery groupById() Group by the id column - * @method ChildTaxRuleQuery groupByCode() Group by the code column - * @method ChildTaxRuleQuery groupByTitle() Group by the title column - * @method ChildTaxRuleQuery groupByDescription() Group by the description column * @method ChildTaxRuleQuery groupByCreatedAt() Group by the created_at column * @method ChildTaxRuleQuery groupByUpdatedAt() Group by the updated_at column * @@ -56,16 +50,10 @@ use Thelia\Model\Map\TaxRuleTableMap; * @method ChildTaxRule findOneOrCreate(ConnectionInterface $con = null) Return the first ChildTaxRule matching the query, or a new ChildTaxRule object populated from the query conditions when no match is found * * @method ChildTaxRule findOneById(int $id) Return the first ChildTaxRule filtered by the id column - * @method ChildTaxRule findOneByCode(string $code) Return the first ChildTaxRule filtered by the code column - * @method ChildTaxRule findOneByTitle(string $title) Return the first ChildTaxRule filtered by the title column - * @method ChildTaxRule findOneByDescription(string $description) Return the first ChildTaxRule filtered by the description column * @method ChildTaxRule findOneByCreatedAt(string $created_at) Return the first ChildTaxRule filtered by the created_at column * @method ChildTaxRule findOneByUpdatedAt(string $updated_at) Return the first ChildTaxRule filtered by the updated_at column * * @method array findById(int $id) Return ChildTaxRule objects filtered by the id column - * @method array findByCode(string $code) Return ChildTaxRule objects filtered by the code column - * @method array findByTitle(string $title) Return ChildTaxRule objects filtered by the title column - * @method array findByDescription(string $description) Return ChildTaxRule objects filtered by the description column * @method array findByCreatedAt(string $created_at) Return ChildTaxRule objects filtered by the created_at column * @method array findByUpdatedAt(string $updated_at) Return ChildTaxRule objects filtered by the updated_at column * @@ -156,7 +144,7 @@ abstract class TaxRuleQuery extends ModelCriteria */ protected function findPkSimple($key, $con) { - $sql = 'SELECT ID, CODE, TITLE, DESCRIPTION, CREATED_AT, UPDATED_AT FROM tax_rule WHERE ID = :p0'; + $sql = 'SELECT ID, CREATED_AT, UPDATED_AT FROM tax_rule WHERE ID = :p0'; try { $stmt = $con->prepare($sql); $stmt->bindValue(':p0', $key, PDO::PARAM_INT); @@ -286,93 +274,6 @@ abstract class TaxRuleQuery extends ModelCriteria return $this->addUsingAlias(TaxRuleTableMap::ID, $id, $comparison); } - /** - * Filter the query on the code column - * - * Example usage: - * - * $query->filterByCode('fooValue'); // WHERE code = 'fooValue' - * $query->filterByCode('%fooValue%'); // WHERE code LIKE '%fooValue%' - * - * - * @param string $code The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildTaxRuleQuery The current query, for fluid interface - */ - public function filterByCode($code = null, $comparison = null) - { - if (null === $comparison) { - if (is_array($code)) { - $comparison = Criteria::IN; - } elseif (preg_match('/[\%\*]/', $code)) { - $code = str_replace('*', '%', $code); - $comparison = Criteria::LIKE; - } - } - - return $this->addUsingAlias(TaxRuleTableMap::CODE, $code, $comparison); - } - - /** - * Filter the query on the title column - * - * Example usage: - * - * $query->filterByTitle('fooValue'); // WHERE title = 'fooValue' - * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%' - * - * - * @param string $title The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildTaxRuleQuery The current query, for fluid interface - */ - public function filterByTitle($title = null, $comparison = null) - { - if (null === $comparison) { - if (is_array($title)) { - $comparison = Criteria::IN; - } elseif (preg_match('/[\%\*]/', $title)) { - $title = str_replace('*', '%', $title); - $comparison = Criteria::LIKE; - } - } - - return $this->addUsingAlias(TaxRuleTableMap::TITLE, $title, $comparison); - } - - /** - * Filter the query on the description column - * - * Example usage: - * - * $query->filterByDescription('fooValue'); // WHERE description = 'fooValue' - * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%' - * - * - * @param string $description The value to use as filter. - * Accepts wildcards (* and % trigger a LIKE) - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL - * - * @return ChildTaxRuleQuery The current query, for fluid interface - */ - public function filterByDescription($description = null, $comparison = null) - { - if (null === $comparison) { - if (is_array($description)) { - $comparison = Criteria::IN; - } elseif (preg_match('/[\%\*]/', $description)) { - $description = str_replace('*', '%', $description); - $comparison = Criteria::LIKE; - } - } - - return $this->addUsingAlias(TaxRuleTableMap::DESCRIPTION, $description, $comparison); - } - /** * Filter the query on the created_at column * @@ -563,7 +464,7 @@ abstract class TaxRuleQuery extends ModelCriteria * * @return ChildTaxRuleQuery The current query, for fluid interface */ - public function joinTaxRuleCountry($relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function joinTaxRuleCountry($relationAlias = null, $joinType = Criteria::INNER_JOIN) { $tableMap = $this->getTableMap(); $relationMap = $tableMap->getRelation('TaxRuleCountry'); @@ -598,7 +499,7 @@ abstract class TaxRuleQuery extends ModelCriteria * * @return \Thelia\Model\TaxRuleCountryQuery A secondary query class using the current class as primary query */ - public function useTaxRuleCountryQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN) + public function useTaxRuleCountryQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) { return $this ->joinTaxRuleCountry($relationAlias, $joinType) diff --git a/core/lib/Thelia/Model/Map/TaxRuleCountryTableMap.php b/core/lib/Thelia/Model/Map/TaxRuleCountryTableMap.php index 42b4e6f59..5282d67fa 100755 --- a/core/lib/Thelia/Model/Map/TaxRuleCountryTableMap.php +++ b/core/lib/Thelia/Model/Map/TaxRuleCountryTableMap.php @@ -57,7 +57,7 @@ class TaxRuleCountryTableMap extends TableMap /** * The total number of columns */ - const NUM_COLUMNS = 7; + const NUM_COLUMNS = 6; /** * The number of lazy-loaded columns @@ -67,12 +67,7 @@ class TaxRuleCountryTableMap extends TableMap /** * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS) */ - const NUM_HYDRATE_COLUMNS = 7; - - /** - * the column name for the ID field - */ - const ID = 'tax_rule_country.ID'; + const NUM_HYDRATE_COLUMNS = 6; /** * the column name for the TAX_RULE_ID field @@ -90,9 +85,9 @@ class TaxRuleCountryTableMap extends TableMap const TAX_ID = 'tax_rule_country.TAX_ID'; /** - * the column name for the NONE field + * the column name for the POSITION field */ - const NONE = 'tax_rule_country.NONE'; + const POSITION = 'tax_rule_country.POSITION'; /** * the column name for the CREATED_AT field @@ -116,12 +111,12 @@ class TaxRuleCountryTableMap extends TableMap * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ protected static $fieldNames = array ( - self::TYPE_PHPNAME => array('Id', 'TaxRuleId', 'CountryId', 'TaxId', 'None', 'CreatedAt', 'UpdatedAt', ), - self::TYPE_STUDLYPHPNAME => array('id', 'taxRuleId', 'countryId', 'taxId', 'none', 'createdAt', 'updatedAt', ), - self::TYPE_COLNAME => array(TaxRuleCountryTableMap::ID, TaxRuleCountryTableMap::TAX_RULE_ID, TaxRuleCountryTableMap::COUNTRY_ID, TaxRuleCountryTableMap::TAX_ID, TaxRuleCountryTableMap::NONE, TaxRuleCountryTableMap::CREATED_AT, TaxRuleCountryTableMap::UPDATED_AT, ), - self::TYPE_RAW_COLNAME => array('ID', 'TAX_RULE_ID', 'COUNTRY_ID', 'TAX_ID', 'NONE', 'CREATED_AT', 'UPDATED_AT', ), - self::TYPE_FIELDNAME => array('id', 'tax_rule_id', 'country_id', 'tax_id', 'none', 'created_at', 'updated_at', ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, ) + self::TYPE_PHPNAME => array('TaxRuleId', 'CountryId', 'TaxId', 'Position', 'CreatedAt', 'UpdatedAt', ), + self::TYPE_STUDLYPHPNAME => array('taxRuleId', 'countryId', 'taxId', 'position', 'createdAt', 'updatedAt', ), + self::TYPE_COLNAME => array(TaxRuleCountryTableMap::TAX_RULE_ID, TaxRuleCountryTableMap::COUNTRY_ID, TaxRuleCountryTableMap::TAX_ID, TaxRuleCountryTableMap::POSITION, TaxRuleCountryTableMap::CREATED_AT, TaxRuleCountryTableMap::UPDATED_AT, ), + self::TYPE_RAW_COLNAME => array('TAX_RULE_ID', 'COUNTRY_ID', 'TAX_ID', 'POSITION', 'CREATED_AT', 'UPDATED_AT', ), + self::TYPE_FIELDNAME => array('tax_rule_id', 'country_id', 'tax_id', 'position', 'created_at', 'updated_at', ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, ) ); /** @@ -131,12 +126,12 @@ class TaxRuleCountryTableMap extends TableMap * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 */ protected static $fieldKeys = array ( - self::TYPE_PHPNAME => array('Id' => 0, 'TaxRuleId' => 1, 'CountryId' => 2, 'TaxId' => 3, 'None' => 4, 'CreatedAt' => 5, 'UpdatedAt' => 6, ), - self::TYPE_STUDLYPHPNAME => array('id' => 0, 'taxRuleId' => 1, 'countryId' => 2, 'taxId' => 3, 'none' => 4, 'createdAt' => 5, 'updatedAt' => 6, ), - self::TYPE_COLNAME => array(TaxRuleCountryTableMap::ID => 0, TaxRuleCountryTableMap::TAX_RULE_ID => 1, TaxRuleCountryTableMap::COUNTRY_ID => 2, TaxRuleCountryTableMap::TAX_ID => 3, TaxRuleCountryTableMap::NONE => 4, TaxRuleCountryTableMap::CREATED_AT => 5, TaxRuleCountryTableMap::UPDATED_AT => 6, ), - self::TYPE_RAW_COLNAME => array('ID' => 0, 'TAX_RULE_ID' => 1, 'COUNTRY_ID' => 2, 'TAX_ID' => 3, 'NONE' => 4, 'CREATED_AT' => 5, 'UPDATED_AT' => 6, ), - self::TYPE_FIELDNAME => array('id' => 0, 'tax_rule_id' => 1, 'country_id' => 2, 'tax_id' => 3, 'none' => 4, 'created_at' => 5, 'updated_at' => 6, ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, ) + self::TYPE_PHPNAME => array('TaxRuleId' => 0, 'CountryId' => 1, 'TaxId' => 2, 'Position' => 3, 'CreatedAt' => 4, 'UpdatedAt' => 5, ), + self::TYPE_STUDLYPHPNAME => array('taxRuleId' => 0, 'countryId' => 1, 'taxId' => 2, 'position' => 3, 'createdAt' => 4, 'updatedAt' => 5, ), + self::TYPE_COLNAME => array(TaxRuleCountryTableMap::TAX_RULE_ID => 0, TaxRuleCountryTableMap::COUNTRY_ID => 1, TaxRuleCountryTableMap::TAX_ID => 2, TaxRuleCountryTableMap::POSITION => 3, TaxRuleCountryTableMap::CREATED_AT => 4, TaxRuleCountryTableMap::UPDATED_AT => 5, ), + self::TYPE_RAW_COLNAME => array('TAX_RULE_ID' => 0, 'COUNTRY_ID' => 1, 'TAX_ID' => 2, 'POSITION' => 3, 'CREATED_AT' => 4, 'UPDATED_AT' => 5, ), + self::TYPE_FIELDNAME => array('tax_rule_id' => 0, 'country_id' => 1, 'tax_id' => 2, 'position' => 3, 'created_at' => 4, 'updated_at' => 5, ), + self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, ) ); /** @@ -155,11 +150,10 @@ class TaxRuleCountryTableMap extends TableMap $this->setPackage('Thelia.Model'); $this->setUseIdGenerator(false); // columns - $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null); - $this->addForeignKey('TAX_RULE_ID', 'TaxRuleId', 'INTEGER', 'tax_rule', 'ID', false, null, null); - $this->addForeignKey('COUNTRY_ID', 'CountryId', 'INTEGER', 'country', 'ID', false, null, null); - $this->addForeignKey('TAX_ID', 'TaxId', 'INTEGER', 'tax', 'ID', false, null, null); - $this->addColumn('NONE', 'None', 'TINYINT', false, null, null); + $this->addForeignPrimaryKey('TAX_RULE_ID', 'TaxRuleId', 'INTEGER' , 'tax_rule', 'ID', true, null, null); + $this->addForeignPrimaryKey('COUNTRY_ID', 'CountryId', 'INTEGER' , 'country', 'ID', true, null, null); + $this->addForeignPrimaryKey('TAX_ID', 'TaxId', 'INTEGER' , 'tax', 'ID', true, null, null); + $this->addColumn('POSITION', 'Position', 'INTEGER', true, null, null); $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null); $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null); } // initialize() @@ -169,7 +163,7 @@ class TaxRuleCountryTableMap extends TableMap */ public function buildRelations() { - $this->addRelation('Tax', '\\Thelia\\Model\\Tax', RelationMap::MANY_TO_ONE, array('tax_id' => 'id', ), 'SET NULL', 'RESTRICT'); + $this->addRelation('Tax', '\\Thelia\\Model\\Tax', RelationMap::MANY_TO_ONE, array('tax_id' => 'id', ), 'CASCADE', 'RESTRICT'); $this->addRelation('TaxRule', '\\Thelia\\Model\\TaxRule', RelationMap::MANY_TO_ONE, array('tax_rule_id' => 'id', ), 'CASCADE', 'RESTRICT'); $this->addRelation('Country', '\\Thelia\\Model\\Country', RelationMap::MANY_TO_ONE, array('country_id' => 'id', ), 'CASCADE', 'RESTRICT'); } // buildRelations() @@ -187,6 +181,59 @@ class TaxRuleCountryTableMap extends TableMap ); } // getBehaviors() + /** + * Adds an object to the instance pool. + * + * Propel keeps cached copies of objects in an instance pool when they are retrieved + * from the database. In some cases you may need to explicitly add objects + * to the cache in order to ensure that the same objects are always returned by find*() + * and findPk*() calls. + * + * @param \Thelia\Model\TaxRuleCountry $obj A \Thelia\Model\TaxRuleCountry object. + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + */ + public static function addInstanceToPool($obj, $key = null) + { + if (Propel::isInstancePoolingEnabled()) { + if (null === $key) { + $key = serialize(array((string) $obj->getTaxRuleId(), (string) $obj->getCountryId(), (string) $obj->getTaxId())); + } // if key === null + self::$instances[$key] = $obj; + } + } + + /** + * Removes an object from the instance pool. + * + * Propel keeps cached copies of objects in an instance pool when they are retrieved + * from the database. In some cases -- especially when you override doDelete + * methods in your stub classes -- you may need to explicitly remove objects + * from the cache in order to prevent returning objects that no longer exist. + * + * @param mixed $value A \Thelia\Model\TaxRuleCountry object or a primary key value. + */ + public static function removeInstanceFromPool($value) + { + if (Propel::isInstancePoolingEnabled() && null !== $value) { + if (is_object($value) && $value instanceof \Thelia\Model\TaxRuleCountry) { + $key = serialize(array((string) $value->getTaxRuleId(), (string) $value->getCountryId(), (string) $value->getTaxId())); + + } elseif (is_array($value) && count($value) === 3) { + // assume we've been passed a primary key"; + $key = serialize(array((string) $value[0], (string) $value[1], (string) $value[2])); + } elseif ($value instanceof Criteria) { + self::$instances = []; + + return; + } else { + $e = new PropelException("Invalid value passed to removeInstanceFromPool(). Expected primary key or \Thelia\Model\TaxRuleCountry object; got " . (is_object($value) ? get_class($value) . ' object.' : var_export($value, true))); + throw $e; + } + + unset(self::$instances[$key]); + } + } + /** * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table. * @@ -201,11 +248,11 @@ class TaxRuleCountryTableMap extends TableMap public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { // If the PK cannot be derived from the row, return NULL. - if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null) { + if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('TaxRuleId', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 1 + $offset : static::translateFieldName('CountryId', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 2 + $offset : static::translateFieldName('TaxId', TableMap::TYPE_PHPNAME, $indexType)] === null) { return null; } - return (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)]; + return serialize(array((string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('TaxRuleId', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 1 + $offset : static::translateFieldName('CountryId', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 2 + $offset : static::translateFieldName('TaxId', TableMap::TYPE_PHPNAME, $indexType)])); } /** @@ -223,11 +270,7 @@ class TaxRuleCountryTableMap extends TableMap public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM) { - return (int) $row[ - $indexType == TableMap::TYPE_NUM - ? 0 + $offset - : self::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType) - ]; + return $pks; } /** @@ -325,19 +368,17 @@ class TaxRuleCountryTableMap extends TableMap public static function addSelectColumns(Criteria $criteria, $alias = null) { if (null === $alias) { - $criteria->addSelectColumn(TaxRuleCountryTableMap::ID); $criteria->addSelectColumn(TaxRuleCountryTableMap::TAX_RULE_ID); $criteria->addSelectColumn(TaxRuleCountryTableMap::COUNTRY_ID); $criteria->addSelectColumn(TaxRuleCountryTableMap::TAX_ID); - $criteria->addSelectColumn(TaxRuleCountryTableMap::NONE); + $criteria->addSelectColumn(TaxRuleCountryTableMap::POSITION); $criteria->addSelectColumn(TaxRuleCountryTableMap::CREATED_AT); $criteria->addSelectColumn(TaxRuleCountryTableMap::UPDATED_AT); } else { - $criteria->addSelectColumn($alias . '.ID'); $criteria->addSelectColumn($alias . '.TAX_RULE_ID'); $criteria->addSelectColumn($alias . '.COUNTRY_ID'); $criteria->addSelectColumn($alias . '.TAX_ID'); - $criteria->addSelectColumn($alias . '.NONE'); + $criteria->addSelectColumn($alias . '.POSITION'); $criteria->addSelectColumn($alias . '.CREATED_AT'); $criteria->addSelectColumn($alias . '.UPDATED_AT'); } @@ -391,7 +432,18 @@ class TaxRuleCountryTableMap extends TableMap $criteria = $values->buildPkeyCriteria(); } else { // it's a primary key, or an array of pks $criteria = new Criteria(TaxRuleCountryTableMap::DATABASE_NAME); - $criteria->add(TaxRuleCountryTableMap::ID, (array) $values, Criteria::IN); + // primary key is composite; we therefore, expect + // the primary key passed to be an array of pkey values + if (count($values) == count($values, COUNT_RECURSIVE)) { + // array is not multi-dimensional + $values = array($values); + } + foreach ($values as $value) { + $criterion = $criteria->getNewCriterion(TaxRuleCountryTableMap::TAX_RULE_ID, $value[0]); + $criterion->addAnd($criteria->getNewCriterion(TaxRuleCountryTableMap::COUNTRY_ID, $value[1])); + $criterion->addAnd($criteria->getNewCriterion(TaxRuleCountryTableMap::TAX_ID, $value[2])); + $criteria->addOr($criterion); + } } $query = TaxRuleCountryQuery::create()->mergeWith($criteria); diff --git a/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php b/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php index 1f0ed1e96..012ad2e72 100755 --- a/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php +++ b/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php @@ -57,7 +57,7 @@ class TaxRuleI18nTableMap extends TableMap /** * The total number of columns */ - const NUM_COLUMNS = 2; + const NUM_COLUMNS = 4; /** * The number of lazy-loaded columns @@ -67,7 +67,7 @@ class TaxRuleI18nTableMap extends TableMap /** * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS) */ - const NUM_HYDRATE_COLUMNS = 2; + const NUM_HYDRATE_COLUMNS = 4; /** * the column name for the ID field @@ -79,6 +79,16 @@ class TaxRuleI18nTableMap extends TableMap */ const LOCALE = 'tax_rule_i18n.LOCALE'; + /** + * the column name for the TITLE field + */ + const TITLE = 'tax_rule_i18n.TITLE'; + + /** + * the column name for the DESCRIPTION field + */ + const DESCRIPTION = 'tax_rule_i18n.DESCRIPTION'; + /** * The default string format for model objects of the related table */ @@ -91,12 +101,12 @@ class TaxRuleI18nTableMap extends TableMap * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ protected static $fieldNames = array ( - self::TYPE_PHPNAME => array('Id', 'Locale', ), - self::TYPE_STUDLYPHPNAME => array('id', 'locale', ), - self::TYPE_COLNAME => array(TaxRuleI18nTableMap::ID, TaxRuleI18nTableMap::LOCALE, ), - self::TYPE_RAW_COLNAME => array('ID', 'LOCALE', ), - self::TYPE_FIELDNAME => array('id', 'locale', ), - self::TYPE_NUM => array(0, 1, ) + self::TYPE_PHPNAME => array('Id', 'Locale', 'Title', 'Description', ), + self::TYPE_STUDLYPHPNAME => array('id', 'locale', 'title', 'description', ), + self::TYPE_COLNAME => array(TaxRuleI18nTableMap::ID, TaxRuleI18nTableMap::LOCALE, TaxRuleI18nTableMap::TITLE, TaxRuleI18nTableMap::DESCRIPTION, ), + self::TYPE_RAW_COLNAME => array('ID', 'LOCALE', 'TITLE', 'DESCRIPTION', ), + self::TYPE_FIELDNAME => array('id', 'locale', 'title', 'description', ), + self::TYPE_NUM => array(0, 1, 2, 3, ) ); /** @@ -106,12 +116,12 @@ class TaxRuleI18nTableMap extends TableMap * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 */ protected static $fieldKeys = array ( - self::TYPE_PHPNAME => array('Id' => 0, 'Locale' => 1, ), - self::TYPE_STUDLYPHPNAME => array('id' => 0, 'locale' => 1, ), - self::TYPE_COLNAME => array(TaxRuleI18nTableMap::ID => 0, TaxRuleI18nTableMap::LOCALE => 1, ), - self::TYPE_RAW_COLNAME => array('ID' => 0, 'LOCALE' => 1, ), - self::TYPE_FIELDNAME => array('id' => 0, 'locale' => 1, ), - self::TYPE_NUM => array(0, 1, ) + self::TYPE_PHPNAME => array('Id' => 0, 'Locale' => 1, 'Title' => 2, 'Description' => 3, ), + self::TYPE_STUDLYPHPNAME => array('id' => 0, 'locale' => 1, 'title' => 2, 'description' => 3, ), + self::TYPE_COLNAME => array(TaxRuleI18nTableMap::ID => 0, TaxRuleI18nTableMap::LOCALE => 1, TaxRuleI18nTableMap::TITLE => 2, TaxRuleI18nTableMap::DESCRIPTION => 3, ), + self::TYPE_RAW_COLNAME => array('ID' => 0, 'LOCALE' => 1, 'TITLE' => 2, 'DESCRIPTION' => 3, ), + self::TYPE_FIELDNAME => array('id' => 0, 'locale' => 1, 'title' => 2, 'description' => 3, ), + self::TYPE_NUM => array(0, 1, 2, 3, ) ); /** @@ -132,6 +142,8 @@ class TaxRuleI18nTableMap extends TableMap // columns $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'tax_rule', 'ID', true, null, null); $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US'); + $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); + $this->addColumn('DESCRIPTION', 'Description', 'LONGVARCHAR', false, null, null); } // initialize() /** @@ -331,9 +343,13 @@ class TaxRuleI18nTableMap extends TableMap if (null === $alias) { $criteria->addSelectColumn(TaxRuleI18nTableMap::ID); $criteria->addSelectColumn(TaxRuleI18nTableMap::LOCALE); + $criteria->addSelectColumn(TaxRuleI18nTableMap::TITLE); + $criteria->addSelectColumn(TaxRuleI18nTableMap::DESCRIPTION); } else { $criteria->addSelectColumn($alias . '.ID'); $criteria->addSelectColumn($alias . '.LOCALE'); + $criteria->addSelectColumn($alias . '.TITLE'); + $criteria->addSelectColumn($alias . '.DESCRIPTION'); } } diff --git a/core/lib/Thelia/Model/Map/TaxRuleTableMap.php b/core/lib/Thelia/Model/Map/TaxRuleTableMap.php index cc5f628b9..391e23b6d 100755 --- a/core/lib/Thelia/Model/Map/TaxRuleTableMap.php +++ b/core/lib/Thelia/Model/Map/TaxRuleTableMap.php @@ -57,7 +57,7 @@ class TaxRuleTableMap extends TableMap /** * The total number of columns */ - const NUM_COLUMNS = 6; + const NUM_COLUMNS = 3; /** * The number of lazy-loaded columns @@ -67,28 +67,13 @@ class TaxRuleTableMap extends TableMap /** * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS) */ - const NUM_HYDRATE_COLUMNS = 6; + const NUM_HYDRATE_COLUMNS = 3; /** * the column name for the ID field */ const ID = 'tax_rule.ID'; - /** - * the column name for the CODE field - */ - const CODE = 'tax_rule.CODE'; - - /** - * the column name for the TITLE field - */ - const TITLE = 'tax_rule.TITLE'; - - /** - * the column name for the DESCRIPTION field - */ - const DESCRIPTION = 'tax_rule.DESCRIPTION'; - /** * the column name for the CREATED_AT field */ @@ -120,12 +105,12 @@ class TaxRuleTableMap extends TableMap * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ protected static $fieldNames = array ( - self::TYPE_PHPNAME => array('Id', 'Code', 'Title', 'Description', 'CreatedAt', 'UpdatedAt', ), - self::TYPE_STUDLYPHPNAME => array('id', 'code', 'title', 'description', 'createdAt', 'updatedAt', ), - self::TYPE_COLNAME => array(TaxRuleTableMap::ID, TaxRuleTableMap::CODE, TaxRuleTableMap::TITLE, TaxRuleTableMap::DESCRIPTION, TaxRuleTableMap::CREATED_AT, TaxRuleTableMap::UPDATED_AT, ), - self::TYPE_RAW_COLNAME => array('ID', 'CODE', 'TITLE', 'DESCRIPTION', 'CREATED_AT', 'UPDATED_AT', ), - self::TYPE_FIELDNAME => array('id', 'code', 'title', 'description', 'created_at', 'updated_at', ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, ) + self::TYPE_PHPNAME => array('Id', 'CreatedAt', 'UpdatedAt', ), + self::TYPE_STUDLYPHPNAME => array('id', 'createdAt', 'updatedAt', ), + self::TYPE_COLNAME => array(TaxRuleTableMap::ID, TaxRuleTableMap::CREATED_AT, TaxRuleTableMap::UPDATED_AT, ), + self::TYPE_RAW_COLNAME => array('ID', 'CREATED_AT', 'UPDATED_AT', ), + self::TYPE_FIELDNAME => array('id', 'created_at', 'updated_at', ), + self::TYPE_NUM => array(0, 1, 2, ) ); /** @@ -135,12 +120,12 @@ class TaxRuleTableMap extends TableMap * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0 */ protected static $fieldKeys = array ( - self::TYPE_PHPNAME => array('Id' => 0, 'Code' => 1, 'Title' => 2, 'Description' => 3, 'CreatedAt' => 4, 'UpdatedAt' => 5, ), - self::TYPE_STUDLYPHPNAME => array('id' => 0, 'code' => 1, 'title' => 2, 'description' => 3, 'createdAt' => 4, 'updatedAt' => 5, ), - self::TYPE_COLNAME => array(TaxRuleTableMap::ID => 0, TaxRuleTableMap::CODE => 1, TaxRuleTableMap::TITLE => 2, TaxRuleTableMap::DESCRIPTION => 3, TaxRuleTableMap::CREATED_AT => 4, TaxRuleTableMap::UPDATED_AT => 5, ), - self::TYPE_RAW_COLNAME => array('ID' => 0, 'CODE' => 1, 'TITLE' => 2, 'DESCRIPTION' => 3, 'CREATED_AT' => 4, 'UPDATED_AT' => 5, ), - self::TYPE_FIELDNAME => array('id' => 0, 'code' => 1, 'title' => 2, 'description' => 3, 'created_at' => 4, 'updated_at' => 5, ), - self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, ) + self::TYPE_PHPNAME => array('Id' => 0, 'CreatedAt' => 1, 'UpdatedAt' => 2, ), + self::TYPE_STUDLYPHPNAME => array('id' => 0, 'createdAt' => 1, 'updatedAt' => 2, ), + self::TYPE_COLNAME => array(TaxRuleTableMap::ID => 0, TaxRuleTableMap::CREATED_AT => 1, TaxRuleTableMap::UPDATED_AT => 2, ), + self::TYPE_RAW_COLNAME => array('ID' => 0, 'CREATED_AT' => 1, 'UPDATED_AT' => 2, ), + self::TYPE_FIELDNAME => array('id' => 0, 'created_at' => 1, 'updated_at' => 2, ), + self::TYPE_NUM => array(0, 1, 2, ) ); /** @@ -160,9 +145,6 @@ class TaxRuleTableMap extends TableMap $this->setUseIdGenerator(true); // columns $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null); - $this->addColumn('CODE', 'Code', 'VARCHAR', false, 45, null); - $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null); - $this->addColumn('DESCRIPTION', 'Description', 'LONGVARCHAR', false, null, null); $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null); $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null); } // initialize() @@ -187,7 +169,7 @@ class TaxRuleTableMap extends TableMap { return array( 'timestampable' => array('create_column' => 'created_at', 'update_column' => 'updated_at', ), - 'i18n' => array('i18n_table' => '%TABLE%_i18n', 'i18n_phpname' => '%PHPNAME%I18n', 'i18n_columns' => '', 'locale_column' => 'locale', 'locale_length' => '5', 'default_locale' => '', 'locale_alias' => '', ), + 'i18n' => array('i18n_table' => '%TABLE%_i18n', 'i18n_phpname' => '%PHPNAME%I18n', 'i18n_columns' => 'title, description', 'locale_column' => 'locale', 'locale_length' => '5', 'default_locale' => '', 'locale_alias' => '', ), ); } // getBehaviors() /** @@ -341,16 +323,10 @@ class TaxRuleTableMap extends TableMap { if (null === $alias) { $criteria->addSelectColumn(TaxRuleTableMap::ID); - $criteria->addSelectColumn(TaxRuleTableMap::CODE); - $criteria->addSelectColumn(TaxRuleTableMap::TITLE); - $criteria->addSelectColumn(TaxRuleTableMap::DESCRIPTION); $criteria->addSelectColumn(TaxRuleTableMap::CREATED_AT); $criteria->addSelectColumn(TaxRuleTableMap::UPDATED_AT); } else { $criteria->addSelectColumn($alias . '.ID'); - $criteria->addSelectColumn($alias . '.CODE'); - $criteria->addSelectColumn($alias . '.TITLE'); - $criteria->addSelectColumn($alias . '.DESCRIPTION'); $criteria->addSelectColumn($alias . '.CREATED_AT'); $criteria->addSelectColumn($alias . '.UPDATED_AT'); } diff --git a/core/lib/Thelia/Model/Map/TaxTableMap.php b/core/lib/Thelia/Model/Map/TaxTableMap.php index 6d43f20e9..11e5047ce 100755 --- a/core/lib/Thelia/Model/Map/TaxTableMap.php +++ b/core/lib/Thelia/Model/Map/TaxTableMap.php @@ -160,7 +160,7 @@ class TaxTableMap extends TableMap */ public function buildRelations() { - $this->addRelation('TaxRuleCountry', '\\Thelia\\Model\\TaxRuleCountry', RelationMap::ONE_TO_MANY, array('id' => 'tax_id', ), 'SET NULL', 'RESTRICT', 'TaxRuleCountries'); + $this->addRelation('TaxRuleCountry', '\\Thelia\\Model\\TaxRuleCountry', RelationMap::ONE_TO_MANY, array('id' => 'tax_id', ), 'CASCADE', 'RESTRICT', 'TaxRuleCountries'); $this->addRelation('TaxI18n', '\\Thelia\\Model\\TaxI18n', RelationMap::ONE_TO_MANY, array('id' => 'id', ), 'CASCADE', null, 'TaxI18ns'); } // buildRelations() diff --git a/install/thelia.sql b/install/thelia.sql index 2fb3723ca..d38d45379 100755 --- a/install/thelia.sql +++ b/install/thelia.sql @@ -126,9 +126,6 @@ DROP TABLE IF EXISTS `tax_rule`; CREATE TABLE `tax_rule` ( `id` INTEGER NOT NULL AUTO_INCREMENT, - `code` VARCHAR(45), - `title` VARCHAR(255), - `description` TEXT, `created_at` DATETIME, `updated_at` DATETIME, PRIMARY KEY (`id`) @@ -142,14 +139,13 @@ DROP TABLE IF EXISTS `tax_rule_country`; CREATE TABLE `tax_rule_country` ( - `id` INTEGER NOT NULL, - `tax_rule_id` INTEGER, - `country_id` INTEGER, - `tax_id` INTEGER, - `none` TINYINT, + `tax_rule_id` INTEGER NOT NULL, + `country_id` INTEGER NOT NULL, + `tax_id` INTEGER NOT NULL, + `position` INTEGER NOT NULL, `created_at` DATETIME, `updated_at` DATETIME, - PRIMARY KEY (`id`), + PRIMARY KEY (`tax_rule_id`,`country_id`,`tax_id`), INDEX `idx_tax_rule_country_tax_id` (`tax_id`), INDEX `idx_tax_rule_country_tax_rule_id` (`tax_rule_id`), INDEX `idx_tax_rule_country_country_id` (`country_id`), @@ -157,7 +153,7 @@ CREATE TABLE `tax_rule_country` FOREIGN KEY (`tax_id`) REFERENCES `tax` (`id`) ON UPDATE RESTRICT - ON DELETE SET NULL, + ON DELETE CASCADE, CONSTRAINT `fk_tax_rule_country_tax_rule_id` FOREIGN KEY (`tax_rule_id`) REFERENCES `tax_rule` (`id`) @@ -1574,6 +1570,8 @@ CREATE TABLE `tax_rule_i18n` ( `id` INTEGER NOT NULL, `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL, + `title` VARCHAR(255), + `description` TEXT, PRIMARY KEY (`id`,`locale`), CONSTRAINT `tax_rule_i18n_FK_1` FOREIGN KEY (`id`) diff --git a/local/config/schema.xml b/local/config/schema.xml index 55036197f..c6005593f 100755 --- a/local/config/schema.xml +++ b/local/config/schema.xml @@ -104,9 +104,9 @@
    - - - + + + From 54dd496f5206b3465308e05f93e81c9647d0aa56 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Mon, 9 Sep 2013 11:07:14 +0200 Subject: [PATCH 098/125] update format smarty plugin --- core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php index daaff3fc1..3deffc1aa 100644 --- a/core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php +++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php @@ -113,9 +113,15 @@ class Format extends AbstractSmartyPlugin throw new SmartyPluginException("number is a mandatory parameter in format_number function"); } + $number = $params["number"]; + + if(empty($number)) { + return ""; + } + $lang = $this->request->getSession()->getLang(); - $number = $params["number"]; + $decimals = array_key_exists("decimals", $params) ? $params["decimals"] : $lang->getDecimals(); $decPoint = array_key_exists("dec_point", $params) ? $params["dec_point"] : $lang->getDecimalSeparator(); $thousandsSep = array_key_exists("thousands_sep", $params) ? $params["thousands_sep"] : $lang->getThousandsSeparator(); From 8e77e4b5303c1cdaa00ff81f3285acfdb87518ed Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Mon, 9 Sep 2013 11:07:51 +0200 Subject: [PATCH 099/125] create admin customer view and add output info in customer loop --- .../Thelia/Core/Template/Loop/Customer.php | 15 +++ core/lib/Thelia/Model/Order.php | 11 ++ templates/admin/default/customers.html | 108 ++++++++++++++++++ 3 files changed, 134 insertions(+) create mode 100644 templates/admin/default/customers.html diff --git a/core/lib/Thelia/Core/Template/Loop/Customer.php b/core/lib/Thelia/Core/Template/Loop/Customer.php index 1a4b84105..cbf9e4fda 100755 --- a/core/lib/Thelia/Core/Template/Loop/Customer.php +++ b/core/lib/Thelia/Core/Template/Loop/Customer.php @@ -64,6 +64,7 @@ class Customer extends BaseLoop ) ), Argument::createBooleanTypeArgument('reseller'), + Argument::createBooleanTypeArgument('last_order'), Argument::createIntTypeArgument('sponsor') ); } @@ -130,6 +131,20 @@ class Customer extends BaseLoop $loopResultRow->set("SPONSOR", $customer->getSponsor()); $loopResultRow->set("DISCOUNT", $customer->getDiscount()); + $lastOrderDate = ""; + $lastOrderAmount = ""; + + if ($this->getLastOrder()) { + $order = $customer->getOrders()->getFirst(); + if ($order) { + $lastOrderDate = $order->getCreatedAt(); + $lastOrderAmount = $order->getTotalAmount(); + } + } + + $loopResultRow->set("LASTORDER_DATE", $lastOrderDate); + $loopResultRow->set("LASTORDER_AMOUNT", $lastOrderAmount); + $loopResult->addRow($loopResultRow); } diff --git a/core/lib/Thelia/Model/Order.php b/core/lib/Thelia/Model/Order.php index 91582750a..ccdd152b5 100755 --- a/core/lib/Thelia/Model/Order.php +++ b/core/lib/Thelia/Model/Order.php @@ -6,4 +6,15 @@ use Thelia\Model\Base\Order as BaseOrder; class Order extends BaseOrder { + /** + * calculate the total amount + * + * @TODO create body method + * + * @return int + */ + public function getTotalAmount() + { + return 0; + } } diff --git a/templates/admin/default/customers.html b/templates/admin/default/customers.html new file mode 100644 index 000000000..0e68677dd --- /dev/null +++ b/templates/admin/default/customers.html @@ -0,0 +1,108 @@ +{extends file="admin-layout.tpl"} + +{block name="page-title"}{intl l='Customer'}{/block} + +{block name="check-permissions"}admin.customer.view{/block} + +{block name="main-content"} +
    +
    + + + {module_include location='customer_top'} + +
    +
    +
    +
    + + + {ifloop rel="customer_list"} + + + + + + + {module_include location='category_list_header'} + + + + + + + + + + + + + {loop name="customer_list" type="customer" visible="*" last_order="1" backend_context="1"} + + + + + + + + {module_include location='customer_list_row'} + + + + + + + + {/loop} + + {/ifloop} +
    + {intl l="Customers list"} + + {module_include location='customer_list_caption'} + + {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.customers.create"} + + + + {/loop} +
    + {intl l="customer ref"} + + {intl l="company"} + + {intl l="firstname & lastname"} + + {intl l="last order"} + {intl l='order amount'}{intl l='Actions'}
    {#REF} + {#COMPANY} + + {#FIRSTNAME} {#LASTNAME} + + {format_date date=#LASTORDER_DATE} + + {format_number number=#LASTORDER_AMOUNT} + +
    + + {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.customer.edit"} + + {/loop} + {loop type="auth" name="can_send_mail" roles="ADMIN" permissions="admin.customer.sendMail"} + + {/loop} + {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.customer.delete"} + + {/loop} +
    +
    +
    + + + + + {module_include location='customer_bottom'} + + + +{/block} \ No newline at end of file From 2548fb9e3cbef5b04d07beafe4539a91da988261 Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Mon, 9 Sep 2013 11:28:02 +0200 Subject: [PATCH 100/125] insert 19.6 tva --- core/lib/Thelia/Model/TaxRuleQuery.php | 13 ++++++++++++- core/lib/Thelia/TaxEngine/Calculator.php | 9 ++++++++- install/insert.sql | 22 ++++++++++++++++++++++ 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/core/lib/Thelia/Model/TaxRuleQuery.php b/core/lib/Thelia/Model/TaxRuleQuery.php index 8cb79562d..833048fcf 100755 --- a/core/lib/Thelia/Model/TaxRuleQuery.php +++ b/core/lib/Thelia/Model/TaxRuleQuery.php @@ -2,6 +2,7 @@ namespace Thelia\Model; +use Propel\Runtime\ActiveQuery\Criteria; use Thelia\Model\Base\TaxRuleQuery as BaseTaxRuleQuery; @@ -15,6 +16,16 @@ use Thelia\Model\Base\TaxRuleQuery as BaseTaxRuleQuery; * long as it does not already exist in the output directory. * */ -class TaxRuleQuery extends BaseTaxRuleQuery { +class TaxRuleQuery extends BaseTaxRuleQuery +{ + public function getTaxCalculatorCollection(Product $product, Country $country) + { + $search = TaxRuleCountryQuery::create() + ->filterByCountry($country, Criteria::EQUAL) + ->filterByTaxRuleId($product->getTaxRuleId()) + ->orderByPosition() + ->find(); + return $search; + } } // TaxRuleQuery diff --git a/core/lib/Thelia/TaxEngine/Calculator.php b/core/lib/Thelia/TaxEngine/Calculator.php index 0e1216783..2648b4d6d 100755 --- a/core/lib/Thelia/TaxEngine/Calculator.php +++ b/core/lib/Thelia/TaxEngine/Calculator.php @@ -25,6 +25,7 @@ namespace Thelia\TaxEngine; use Thelia\Exception\TaxEngineException; use Thelia\Model\Country; use Thelia\Model\Product; +use Thelia\Model\TaxRuleQuery; /** * Class Calculator @@ -33,6 +34,8 @@ use Thelia\Model\Product; */ class Calculator { + protected $taxRuleQuery = null; + protected $taxRulesCollection = null; protected $product = null; @@ -40,6 +43,8 @@ class Calculator public function __construct() { + $this->taxRuleQuery = new TaxRuleQuery(); + return $this; } @@ -55,11 +60,13 @@ class Calculator $this->product = $product; $this->country = $country; + $this->taxRulesCollection = $this->taxRuleQuery->getTaxCalculatorCollection($product, $country); + return $this; } public function getTaxAmount() { - + } } diff --git a/install/insert.sql b/install/insert.sql index 344381a37..917966893 100755 --- a/install/insert.sql +++ b/install/insert.sql @@ -1109,3 +1109,25 @@ INSERT INTO `country_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `po (268, 'en_UK', 'USA - Alabama', '', '', ''), (268, 'es_ES', 'USA - Alabama', '', '', ''), (268, 'fr_FR', 'USA - Alabama', '', '', ''); + +INSERT INTO `tax` (`id`, `rate`, `created_at`, `updated_at`) + VALUES + (1, '19.6', NOW(), NOW()); + +INSERT INTO `tax_i18n` (`id`, `locale`, `title`) + VALUES + (1, 'fr_FR', 'TVA française à 19.6%'), + (1, 'en_UK', 'french 19.6% tax'); + +INSERT INTO `tax_rule` (`id`, `created_at`, `updated_at`) + VALUES + (1, NOW(), NOW()); + +INSERT INTO `tax_rule_i18n` (`id`, `locale`, `title`) + VALUES + (1, 'fr_FR', 'TVA française à 19.6%'), + (1, 'en_UK', 'french 19.6% tax'); + +INSERT INTO `tax_rule_country` (`tax_rule_id`, `country_id`, `tax_id`, `position`, `created_at`, `updated_at`) + VALUES + (1, 64, 1, 1, NOW(), NOW()); \ No newline at end of file From a178835f6ba2e63f138922d0342af2cda4d41fcb Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Mon, 9 Sep 2013 11:31:41 +0200 Subject: [PATCH 101/125] tax faker --- install/faker.php | 1 + 1 file changed, 1 insertion(+) diff --git a/install/faker.php b/install/faker.php index f1e7691d7..a2f52654e 100755 --- a/install/faker.php +++ b/install/faker.php @@ -371,6 +371,7 @@ function createProduct($faker, $category, $position, &$productIdList) $product->addCategory($category); $product->setVisible(rand(1, 10)>7 ? 0 : 1); $product->setPosition($position); + $product->setTaxRuleId(1); setI18n($faker, $product); $product->save(); From 77fc36fc91d865b79cdd5f372939143012bde4c5 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Mon, 9 Sep 2013 12:46:27 +0200 Subject: [PATCH 102/125] escae output only if it's not an object --- .../Thelia/Core/Template/Smarty/SmartyParser.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php b/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php index 85619bc8a..a6dbf3715 100755 --- a/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php +++ b/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php @@ -65,9 +65,7 @@ class SmartyParser extends Smarty implements ParserInterface $this->setTemplate($template ?: ConfigQuery::read('active-template', 'default')); $this->debugging = $debug; - - $this->escape_html = true; - + // Prevent smarty ErrorException: Notice: Undefined index bla bla bla... $this->error_reporting = E_ALL ^ E_NOTICE; @@ -86,6 +84,7 @@ class SmartyParser extends Smarty implements ParserInterface $this->registerFilter('pre', array($this, "preThelia")); $this->registerFilter('output', array($this, "removeBlankLines")); + $this->registerFilter('variable', array(__CLASS__, "theliaEscape")); } public function preThelia($tpl_source, \Smarty_Internal_Template $template) @@ -101,6 +100,15 @@ class SmartyParser extends Smarty implements ParserInterface return preg_replace("/(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+/", "\n", $tpl_source); } + public static function theliaEscape($content, $smarty) + { + if(!is_object($content)) { + return htmlspecialchars($content ,ENT_QUOTES, Smarty::$_CHARSET); + } else { + return $content; + } + } + public function setTemplate($template_path_from_template_base) { $this->template = $template_path_from_template_base; From 0ddf88e46eef1320f144d88d22507e33cba64650 Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Mon, 9 Sep 2013 14:24:50 +0200 Subject: [PATCH 103/125] tax engine --- .../lib/Thelia/Core/Template/Loop/Address.php | 2 +- .../Thelia/Core/Template/Loop/Customer.php | 2 +- .../lib/Thelia/Core/Template/Loop/Product.php | 14 ++++--- .../Thelia/Exception/TaxEngineException.php | 3 ++ core/lib/Thelia/Model/Product.php | 19 +++++++++ core/lib/Thelia/Model/Tax.php | 39 ++++++++++++++++++- core/lib/Thelia/Model/TaxRuleQuery.php | 31 ++++++++++----- core/lib/Thelia/TaxEngine/Calculator.php | 26 +++++++++++-- templates/default/category.html | 2 + 9 files changed, 117 insertions(+), 21 deletions(-) diff --git a/core/lib/Thelia/Core/Template/Loop/Address.php b/core/lib/Thelia/Core/Template/Loop/Address.php index 757cc11b8..3ac9370f8 100755 --- a/core/lib/Thelia/Core/Template/Loop/Address.php +++ b/core/lib/Thelia/Core/Template/Loop/Address.php @@ -87,7 +87,7 @@ class Address extends BaseLoop $customer = $this->getCustomer(); if ($customer === 'current') { - $currentCustomer = $this->request->getSession()->getCustomerUser(); + $currentCustomer = $this->securityContext->getCustomerUser(); if ($currentCustomer === null) { return new LoopResult(); } else { diff --git a/core/lib/Thelia/Core/Template/Loop/Customer.php b/core/lib/Thelia/Core/Template/Loop/Customer.php index 1a4b84105..ad801dc5f 100755 --- a/core/lib/Thelia/Core/Template/Loop/Customer.php +++ b/core/lib/Thelia/Core/Template/Loop/Customer.php @@ -80,7 +80,7 @@ class Customer extends BaseLoop $current = $this->getCurrent(); if ($current === true) { - $currentCustomer = $this->request->getSession()->getCustomerUser(); + $currentCustomer = $this->securityContext->getCustomerUser(); if ($currentCustomer === null) { return new LoopResult(); } else { diff --git a/core/lib/Thelia/Core/Template/Loop/Product.php b/core/lib/Thelia/Core/Template/Loop/Product.php index 4d785b8b0..f52b314a9 100755 --- a/core/lib/Thelia/Core/Template/Loop/Product.php +++ b/core/lib/Thelia/Core/Template/Loop/Product.php @@ -34,6 +34,7 @@ use Thelia\Core\Template\Loop\Argument\Argument; use Thelia\Log\Tlog; use Thelia\Model\CategoryQuery; +use Thelia\Model\CountryQuery; use Thelia\Model\Map\FeatureProductTableMap; use Thelia\Model\Map\ProductPriceTableMap; use Thelia\Model\Map\ProductSaleElementsTableMap; @@ -333,10 +334,10 @@ class Product extends BaseI18nLoop foreach($isProductPriceLeftJoinList as $pSE => $isProductPriceLeftJoin) { $booleanMatchedPriceList[] = 'CASE WHEN `' . $pSE . '`.PROMO=1 THEN `' . $isProductPriceLeftJoin . '`.PROMO_PRICE ELSE `' . $isProductPriceLeftJoin . '`.PRICE END'; } - $search->withColumn('MAX(' . implode(' OR ', $booleanMatchedPromoList) . ')', 'main_product_is_promo'); - $search->withColumn('MAX(' . implode(' OR ', $booleanMatchedNewnessList) . ')', 'main_product_is_new'); - $search->withColumn('MAX(' . implode(' OR ', $booleanMatchedPriceList) . ')', 'real_highest_price'); - $search->withColumn('MIN(' . implode(' OR ', $booleanMatchedPriceList) . ')', 'real_lowest_price'); + $search->withColumn('ROUND(MAX(' . implode(' OR ', $booleanMatchedPromoList) . '), 2)', 'main_product_is_promo'); + $search->withColumn('ROUND(MAX(' . implode(' OR ', $booleanMatchedNewnessList) . '), 2)', 'main_product_is_new'); + $search->withColumn('ROUND(MAX(' . implode(' OR ', $booleanMatchedPriceList) . '), 2)', 'real_highest_price'); + $search->withColumn('ROUND(MIN(' . implode(' OR ', $booleanMatchedPriceList) . '), 2)', 'real_lowest_price'); $current = $this->getCurrent(); @@ -518,7 +519,10 @@ class Product extends BaseI18nLoop ->set("DESCRIPTION", $product->getVirtualColumn('i18n_DESCRIPTION')) ->set("POSTSCRIPTUM", $product->getVirtualColumn('i18n_POSTSCRIPTUM')) ->set("URL", $product->getUrl($locale)) - ->set("BEST_PRICE", $product->getVirtualColumn('real_lowest_price')) + ->set("BEST_PRICE", $product->getRealLowestPrice()) + ->set("BEST_TAXED_PRICE", $product->getTaxedPrice( + CountryQuery::create()->findOneById(64) // @TODO : make it magic + )) ->set("IS_PROMO", $product->getVirtualColumn('main_product_is_promo')) ->set("IS_NEW", $product->getVirtualColumn('main_product_is_new')) ->set("POSITION", $product->getPosition()) diff --git a/core/lib/Thelia/Exception/TaxEngineException.php b/core/lib/Thelia/Exception/TaxEngineException.php index b51aeef44..2a2718d4b 100755 --- a/core/lib/Thelia/Exception/TaxEngineException.php +++ b/core/lib/Thelia/Exception/TaxEngineException.php @@ -31,6 +31,9 @@ class TaxEngineException extends \RuntimeException const UNDEFINED_PRODUCT = 501; const UNDEFINED_COUNTRY = 502; + const UNDEFINED_TAX_RULES_COLLECTION = 503; + + const BAD_AMOUNT_FORMAT = 601; public function __construct($message, $code = null, $previous = null) { if($code === null) { diff --git a/core/lib/Thelia/Model/Product.php b/core/lib/Thelia/Model/Product.php index 6c7ffbe44..66e2a80ad 100755 --- a/core/lib/Thelia/Model/Product.php +++ b/core/lib/Thelia/Model/Product.php @@ -2,8 +2,10 @@ namespace Thelia\Model; +use Propel\Runtime\Exception\PropelException; use Thelia\Model\Base\Product as BaseProduct; use Thelia\Tools\URL; +use Thelia\TaxEngine\Calculator; class Product extends BaseProduct { @@ -11,4 +13,21 @@ class Product extends BaseProduct { return URL::getInstance()->retrieve('product', $this->getId(), $locale)->toString(); } + + public function getRealLowestPrice($virtualColumnName = 'real_lowest_price') + { + try { + $amount = $this->getVirtualColumn($virtualColumnName); + } catch(PropelException $e) { + throw new PropelException("Virtual column `$virtualColumnName` does not exist in Product::getRealLowestPrice"); + } + + return $amount; + } + + public function getTaxedPrice(Country $country) + { + $taxCalculator = new Calculator(); + return $taxCalculator->load($this, $country)->getTaxedPrice(); + } } diff --git a/core/lib/Thelia/Model/Tax.php b/core/lib/Thelia/Model/Tax.php index ed61876ae..21efbae6a 100755 --- a/core/lib/Thelia/Model/Tax.php +++ b/core/lib/Thelia/Model/Tax.php @@ -2,8 +2,45 @@ namespace Thelia\Model; +use Thelia\Exception\TaxEngineException; use Thelia\Model\Base\Tax as BaseTax; -class Tax extends BaseTax { +class Tax extends BaseTax +{ + public function calculateTax($amount) + { + if(false === filter_var($amount, FILTER_VALIDATE_FLOAT)) { + throw new TaxEngineException('BAD AMOUNT FORMAT', TaxEngineException::BAD_AMOUNT_FORMAT); + } + $rate = $this->getRate(); + + if($rate === null) { + return 0; + } + + return $amount * $rate * 0.01; + } + + public function getTaxRuleCountryPosition() + { + try { + $taxRuleCountryPosition = $this->getVirtualColumn(TaxRuleQuery::ALIAS_FOR_TAX_RULE_COUNTRY_POSITION); + } catch(PropelException $e) { + throw new PropelException("Virtual column `" . TaxRuleQuery::ALIAS_FOR_TAX_RULE_COUNTRY_POSITION . "` does not exist in Tax::getTaxRuleCountryPosition"); + } + + return $taxRuleCountryPosition; + } + + public function getTaxRuleRateSum() + { + try { + $taxRuleRateSum = $this->getVirtualColumn(TaxRuleQuery::ALIAS_FOR_TAX_RATE_SUM); + } catch(PropelException $e) { + throw new PropelException("Virtual column `" . TaxRuleQuery::ALIAS_FOR_TAX_RATE_SUM . "` does not exist in Tax::getTaxRuleRateSum"); + } + + return $taxRuleRateSum; + } } diff --git a/core/lib/Thelia/Model/TaxRuleQuery.php b/core/lib/Thelia/Model/TaxRuleQuery.php index 833048fcf..b14e0f55d 100755 --- a/core/lib/Thelia/Model/TaxRuleQuery.php +++ b/core/lib/Thelia/Model/TaxRuleQuery.php @@ -4,7 +4,8 @@ namespace Thelia\Model; use Propel\Runtime\ActiveQuery\Criteria; use Thelia\Model\Base\TaxRuleQuery as BaseTaxRuleQuery; - +use Thelia\Model\Map\TaxRuleCountryTableMap; +use Thelia\Model\Map\TaxTableMap; /** * Skeleton subclass for performing query and update operations on the 'tax_rule' table. @@ -18,14 +19,26 @@ use Thelia\Model\Base\TaxRuleQuery as BaseTaxRuleQuery; */ class TaxRuleQuery extends BaseTaxRuleQuery { - public function getTaxCalculatorCollection(Product $product, Country $country) - { - $search = TaxRuleCountryQuery::create() - ->filterByCountry($country, Criteria::EQUAL) - ->filterByTaxRuleId($product->getTaxRuleId()) - ->orderByPosition() - ->find(); + const ALIAS_FOR_TAX_RULE_COUNTRY_POSITION = 'taxRuleCountryPosition'; + const ALIAS_FOR_TAX_RATE_SUM = 'taxRateSum'; - return $search; + public function getTaxCalculatorGroupedCollection(Product $product, Country $country) + { + $search = TaxQuery::create() + ->filterByTaxRuleCountry( + TaxRuleCountryQuery::create() + ->filterByCountry($country, Criteria::EQUAL) + ->filterByTaxRuleId($product->getTaxRuleId()) + ->groupByPosition() + ->orderByPosition() + ->find() + ) + ->withColumn(TaxRuleCountryTableMap::POSITION, self::ALIAS_FOR_TAX_RULE_COUNTRY_POSITION) + ->withColumn('ROUND(SUM(' . TaxTableMap::RATE . '), 2)', self::ALIAS_FOR_TAX_RATE_SUM) + ; + + //var_dump($search->toString()); + + return $search->find(); } } // TaxRuleQuery diff --git a/core/lib/Thelia/TaxEngine/Calculator.php b/core/lib/Thelia/TaxEngine/Calculator.php index 2648b4d6d..b0dcbb2fa 100755 --- a/core/lib/Thelia/TaxEngine/Calculator.php +++ b/core/lib/Thelia/TaxEngine/Calculator.php @@ -36,7 +36,7 @@ class Calculator { protected $taxRuleQuery = null; - protected $taxRulesCollection = null; + protected $taxRulesGroupedCollection = null; protected $product = null; protected $country = null; @@ -44,12 +44,14 @@ class Calculator public function __construct() { $this->taxRuleQuery = new TaxRuleQuery(); - - return $this; } public function load(Product $product, Country $country) { + $this->product = null; + $this->country = null; + $this->taxRulesGroupedCollection = null; + if($product->getId() === null) { throw new TaxEngineException('Product id is empty in Calculator::load', TaxEngineException::UNDEFINED_PRODUCT); } @@ -60,13 +62,29 @@ class Calculator $this->product = $product; $this->country = $country; - $this->taxRulesCollection = $this->taxRuleQuery->getTaxCalculatorCollection($product, $country); + $this->taxRulesGroupedCollection = $this->taxRuleQuery->getTaxCalculatorGroupedCollection($product, $country); return $this; } public function getTaxAmount() { + if(null === $this->taxRulesGroupedCollection) { + throw new TaxEngineException('Tax rules collection is empty in Calculator::getTaxAmount', TaxEngineException::UNDEFINED_TAX_RULES_COLLECTION); + } + $amount = $this->product->getRealLowestPrice(); + + $taxRateAmount = 0; + foreach($this->taxRulesGroupedCollection as $taxRule) { + $taxRateAmount += $taxRule->getTaxRuleRateSum(); + } + + return $amount * $taxRateAmount * 0.01; + } + + public function getTaxedPrice() + { + return $this->product->getRealLowestPrice() + $this->getTaxAmount(); } } diff --git a/templates/default/category.html b/templates/default/category.html index dd5c6a20a..4aae69cec 100755 --- a/templates/default/category.html +++ b/templates/default/category.html @@ -26,6 +26,8 @@

    #TITLE

    #DESCRIPTION

    +

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

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

    Category page

    @@ -142,4 +148,8 @@ {/loop} -
    \ No newline at end of file +
    + + {debugbar_render} + + \ No newline at end of file From 7d4003741cbbe8569090ccc43bad060950925186 Mon Sep 17 00:00:00 2001 From: gmorel Date: Mon, 9 Sep 2013 15:35:21 +0200 Subject: [PATCH 106/125] Working - Fix #category-rule replaced by parser when writing jawascript --- core/lib/Thelia/Core/Template/Smarty/SmartyParser.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php b/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php index 85619bc8a..735aa3e32 100755 --- a/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php +++ b/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php @@ -90,8 +90,8 @@ class SmartyParser extends Smarty implements ParserInterface public function preThelia($tpl_source, \Smarty_Internal_Template $template) { - $new_source = preg_replace('`{#([a-zA-Z][a-zA-Z0-9\-_]*)(.*)}`', '{\$$1$2}', $tpl_source); - $new_source = preg_replace('`#([a-zA-Z][a-zA-Z0-9\-_]*)`', '{\$$1|dieseCanceller:\'#$1\'}', $new_source); + $new_source = preg_replace('`{#([a-zA-Z][a-zA-Z0-9_]*)(.*)}`', '{\$$1$2}', $tpl_source); + $new_source = preg_replace('`#([a-zA-Z][a-zA-Z0-9_]*)`', '{\$$1|dieseCanceller:\'#$1\'}', $new_source); return $new_source; } From 66454ef3f030332b4366b21124c9ccde6ed155a3 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Mon, 9 Sep 2013 16:03:38 +0200 Subject: [PATCH 107/125] finish simple list customer page in backoffice --- .../Controller/Admin/CustomerController.php | 2 +- templates/admin/default/customers.html | 37 +++++++++++++++++-- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/core/lib/Thelia/Controller/Admin/CustomerController.php b/core/lib/Thelia/Controller/Admin/CustomerController.php index eabfee0ce..04c8842cd 100644 --- a/core/lib/Thelia/Controller/Admin/CustomerController.php +++ b/core/lib/Thelia/Controller/Admin/CustomerController.php @@ -35,6 +35,6 @@ class CustomerController extends BaseAdminController { if (null !== $response = $this->checkAuth("admin.customers.view")) return $response; - return $this->render("customers"); + return $this->render("customers", array("display_customer" => 20)); } } \ No newline at end of file diff --git a/templates/admin/default/customers.html b/templates/admin/default/customers.html index e49e12e29..e126b9f77 100644 --- a/templates/admin/default/customers.html +++ b/templates/admin/default/customers.html @@ -1,3 +1,4 @@ + {extends file="admin-layout.tpl"} {block name="page-title"}{intl l='Customer'}{/block} @@ -5,6 +6,9 @@ {block name="check-permissions"}admin.customer.view{/block} {block name="main-content"} + {assign var=customer_page value={$smarty.get.page|default:1}} + +
    @@ -21,7 +25,7 @@ {module_include location='customer_list_caption'} {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.customers.create"} - + {/loop} @@ -31,7 +35,7 @@
    - {intl l="customer ref"} + {intl l="customer ref"} {$customer_current_page} toto @@ -55,7 +59,7 @@
    {#REF}
    - {intl l="customer ref"} {$customer_current_page} toto + {intl l="customer ref"} From ca4df159107495a985ebbb6d73c2dd6c74a0db45 Mon Sep 17 00:00:00 2001 From: Etienne Roudeix Date: Mon, 9 Sep 2013 16:27:46 +0200 Subject: [PATCH 110/125] tax in loops --- .../lib/Thelia/Core/Template/Loop/Product.php | 13 ++++--- ...aleElement.php => ProductSaleElements.php} | 18 ++++++++-- core/lib/Thelia/Model/Product.php | 2 +- core/lib/Thelia/Model/ProductSaleElements.php | 35 ++++++++++++++++++- core/lib/Thelia/Model/TaxRuleQuery.php | 2 -- core/lib/Thelia/TaxEngine/Calculator.php | 16 ++++++--- core/lib/Thelia/Tools/URL.php | 16 +++++++++ templates/default/category.html | 2 +- templates/default/product.html | 4 ++- 9 files changed, 91 insertions(+), 17 deletions(-) rename core/lib/Thelia/Core/Template/Loop/{ProductSaleElement.php => ProductSaleElements.php} (87%) diff --git a/core/lib/Thelia/Core/Template/Loop/Product.php b/core/lib/Thelia/Core/Template/Loop/Product.php index f52b314a9..b7a7c13fe 100755 --- a/core/lib/Thelia/Core/Template/Loop/Product.php +++ b/core/lib/Thelia/Core/Template/Loop/Product.php @@ -510,6 +510,12 @@ class Product extends BaseI18nLoop foreach ($products as $product) { $loopResultRow = new LoopResultRow($loopResult, $product, $this->versionable, $this->timestampable, $this->countable); + $price = $product->getRealLowestPrice(); + $taxedPrice = $product->getTaxedPrice( + CountryQuery::create()->findOneById(64) // @TODO : make it magic + ); + + $loopResultRow->set("ID", $product->getId()) ->set("REF",$product->getRef()) ->set("IS_TRANSLATED",$product->getVirtualColumn('IS_TRANSLATED')) @@ -519,10 +525,9 @@ class Product extends BaseI18nLoop ->set("DESCRIPTION", $product->getVirtualColumn('i18n_DESCRIPTION')) ->set("POSTSCRIPTUM", $product->getVirtualColumn('i18n_POSTSCRIPTUM')) ->set("URL", $product->getUrl($locale)) - ->set("BEST_PRICE", $product->getRealLowestPrice()) - ->set("BEST_TAXED_PRICE", $product->getTaxedPrice( - CountryQuery::create()->findOneById(64) // @TODO : make it magic - )) + ->set("BEST_PRICE", $price) + ->set("BEST_PRICE_TAX", $taxedPrice - $price) + ->set("BEST_TAXED_PRICE", $taxedPrice) ->set("IS_PROMO", $product->getVirtualColumn('main_product_is_promo')) ->set("IS_NEW", $product->getVirtualColumn('main_product_is_new')) ->set("POSITION", $product->getPosition()) diff --git a/core/lib/Thelia/Core/Template/Loop/ProductSaleElement.php b/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php similarity index 87% rename from core/lib/Thelia/Core/Template/Loop/ProductSaleElement.php rename to core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php index 7a1a0b8c8..ec4c73230 100755 --- a/core/lib/Thelia/Core/Template/Loop/ProductSaleElement.php +++ b/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php @@ -35,6 +35,7 @@ use Thelia\Log\Tlog; use Thelia\Model\Base\ProductSaleElementsQuery; use Thelia\Model\ConfigQuery; +use Thelia\Model\CountryQuery; use Thelia\Type\TypeCollection; use Thelia\Type; @@ -124,6 +125,15 @@ class ProductSaleElements extends BaseLoop foreach ($PSEValues as $PSEValue) { $loopResultRow = new LoopResultRow($loopResult, $PSEValue, $this->versionable, $this->timestampable, $this->countable); + $price = $PSEValue->getPrice(); + $taxedPrice = $PSEValue->getTaxedPrice( + CountryQuery::create()->findOneById(64) // @TODO : make it magic + ); + $promoPrice = $PSEValue->getPromoPrice(); + $taxedPromoPrice = $PSEValue->getTaxedPromoPrice( + CountryQuery::create()->findOneById(64) // @TODO : make it magic + ); + $loopResultRow->set("ID", $PSEValue->getId()) ->set("QUANTITY", $PSEValue->getQuantity()) ->set("IS_PROMO", $PSEValue->getPromo() === 1 ? 1 : 0) @@ -131,8 +141,12 @@ class ProductSaleElements extends BaseLoop ->set("WEIGHT", $PSEValue->getWeight()) ->set("CURRENCY", $PSEValue->getVirtualColumn('price_CURRENCY_ID')) - ->set("PRICE", $PSEValue->getVirtualColumn('price_PRICE')) - ->set("PROMO_PRICE", $PSEValue->getVirtualColumn('price_PROMO_PRICE')); + ->set("PRICE", $price) + ->set("PRICE_TAX", $taxedPrice - $price) + ->set("TAXED_PRICE", $taxedPrice) + ->set("PROMO_PRICE", $promoPrice) + ->set("PROMO_PRICE_TAX", $taxedPromoPrice - $promoPrice) + ->set("TAXED_PROMO_PRICE", $taxedPromoPrice); $loopResult->addRow($loopResultRow); } diff --git a/core/lib/Thelia/Model/Product.php b/core/lib/Thelia/Model/Product.php index 66e2a80ad..06c4640d0 100755 --- a/core/lib/Thelia/Model/Product.php +++ b/core/lib/Thelia/Model/Product.php @@ -28,6 +28,6 @@ class Product extends BaseProduct public function getTaxedPrice(Country $country) { $taxCalculator = new Calculator(); - return $taxCalculator->load($this, $country)->getTaxedPrice(); + return $taxCalculator->load($this, $country)->getTaxedPrice($this->getRealLowestPrice()); } } diff --git a/core/lib/Thelia/Model/ProductSaleElements.php b/core/lib/Thelia/Model/ProductSaleElements.php index cec9c49a7..184e37d0a 100755 --- a/core/lib/Thelia/Model/ProductSaleElements.php +++ b/core/lib/Thelia/Model/ProductSaleElements.php @@ -3,8 +3,41 @@ namespace Thelia\Model; use Thelia\Model\Base\ProductSaleElements as BaseProductSaleElements; +use Thelia\TaxEngine\Calculator; - class ProductSaleElements extends BaseProductSaleElements +class ProductSaleElements extends BaseProductSaleElements { + public function getPrice($virtualColumnName = 'price_PRICE') + { + try { + $amount = $this->getVirtualColumn($virtualColumnName); + } catch(PropelException $e) { + throw new PropelException("Virtual column `$virtualColumnName` does not exist in ProductSaleElements::getPrice"); + } + return $amount; + } + + public function getPromoPrice($virtualColumnName = 'price_PROMO_PRICE') + { + try { + $amount = $this->getVirtualColumn($virtualColumnName); + } catch(PropelException $e) { + throw new PropelException("Virtual column `$virtualColumnName` does not exist in ProductSaleElements::getPromoPrice"); + } + + return $amount; + } + + public function getTaxedPrice(Country $country) + { + $taxCalculator = new Calculator(); + return $taxCalculator->load($this->getProduct(), $country)->getTaxedPrice($this->getPrice()); + } + + public function getTaxedPromoPrice(Country $country) + { + $taxCalculator = new Calculator(); + return $taxCalculator->load($this->getProduct(), $country)->getTaxedPrice($this->getPromoPrice()); + } } diff --git a/core/lib/Thelia/Model/TaxRuleQuery.php b/core/lib/Thelia/Model/TaxRuleQuery.php index b14e0f55d..f9c6cf1e5 100755 --- a/core/lib/Thelia/Model/TaxRuleQuery.php +++ b/core/lib/Thelia/Model/TaxRuleQuery.php @@ -37,8 +37,6 @@ class TaxRuleQuery extends BaseTaxRuleQuery ->withColumn('ROUND(SUM(' . TaxTableMap::RATE . '), 2)', self::ALIAS_FOR_TAX_RATE_SUM) ; - //var_dump($search->toString()); - return $search->find(); } } // TaxRuleQuery diff --git a/core/lib/Thelia/TaxEngine/Calculator.php b/core/lib/Thelia/TaxEngine/Calculator.php index b0dcbb2fa..ec6e3c78d 100755 --- a/core/lib/Thelia/TaxEngine/Calculator.php +++ b/core/lib/Thelia/TaxEngine/Calculator.php @@ -67,14 +67,16 @@ class Calculator return $this; } - public function getTaxAmount() + public function getTaxAmount($amount) { + if(false === filter_var($amount, FILTER_VALIDATE_FLOAT)) { + throw new TaxEngineException('BAD AMOUNT FORMAT', TaxEngineException::BAD_AMOUNT_FORMAT); + } + if(null === $this->taxRulesGroupedCollection) { throw new TaxEngineException('Tax rules collection is empty in Calculator::getTaxAmount', TaxEngineException::UNDEFINED_TAX_RULES_COLLECTION); } - $amount = $this->product->getRealLowestPrice(); - $taxRateAmount = 0; foreach($this->taxRulesGroupedCollection as $taxRule) { $taxRateAmount += $taxRule->getTaxRuleRateSum(); @@ -83,8 +85,12 @@ class Calculator return $amount * $taxRateAmount * 0.01; } - public function getTaxedPrice() + public function getTaxedPrice($amount) { - return $this->product->getRealLowestPrice() + $this->getTaxAmount(); + if(false === filter_var($amount, FILTER_VALIDATE_FLOAT)) { + throw new TaxEngineException('BAD AMOUNT FORMAT', TaxEngineException::BAD_AMOUNT_FORMAT); + } + + return $amount + $this->getTaxAmount($amount); } } diff --git a/core/lib/Thelia/Tools/URL.php b/core/lib/Thelia/Tools/URL.php index 161175bbf..e43591ffc 100755 --- a/core/lib/Thelia/Tools/URL.php +++ b/core/lib/Thelia/Tools/URL.php @@ -189,6 +189,14 @@ class URL { if(ConfigQuery::isRewritingEnable()) { $this->retriever->loadViewUrl($view, $viewLocale, $viewId); + } else { + $allParametersWithoutView = array(); + $allParametersWithoutView['locale'] = $viewLocale; + if(null !== $viewId) { + $allParametersWithoutView[$view . '_id'] = $viewId; + } + $this->retriever->rewrittenUrl = null; + $this->retriever->url = URL::getInstance()->viewUrl($view, $allParametersWithoutView); } return $this->retriever; @@ -220,6 +228,14 @@ class URL } $this->retriever->loadSpecificUrl($view, $viewLocale, $viewId, $allOtherParameters); + } else { + $allParametersWithoutView = $viewOtherParameters; + $allParametersWithoutView['locale'] = $viewLocale; + if(null !== $viewId) { + $allParametersWithoutView[$view . '_id'] = $viewId; + } + $this->retriever->rewrittenUrl = null; + $this->retriever->url = URL::getInstance()->viewUrl($view, $allParametersWithoutView); } return $this->retriever; diff --git a/templates/default/category.html b/templates/default/category.html index 081c28ca5..a888605ff 100755 --- a/templates/default/category.html +++ b/templates/default/category.html @@ -32,7 +32,7 @@

    #TITLE

    #DESCRIPTION

    -

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

    +

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

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

    #TITLE

    #DESCRIPTION

    +

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

    + {ifloop rel="acc"}

    Accessories

      @@ -64,7 +66,7 @@ Index : {navigate to="index"}
      #ATTRIBUTE_TITLE = #ATTRIBUTE_AVAILABILITY_TITLE
      {/loop}
      #WEIGHT g -
      {if #IS_PROMO == 1} #PROMO_PRICE € (instead of #PRICE) {else} #PRICE € {/if} +
      {if #IS_PROMO == 1} #PROMO_PRICE € HT // TAX : #PROMO_PRICE_TAX ; #TAXED_PROMO_PRICE € TTC (instead of #PRICE HT // TAX : #PRICE_TAX ; #TAXED_PRICE € TTC){else} #PRICE € HT // TAX : #PRICE_TAX ; #TAXED_PRICE € TTC{/if}

      Add - - - + {foreach from=$availableCoupons item=availableCoupon} + + {/foreach} {if $error}{$message}{/if} {/form_field} - More description n°1 about item + {$availableCoupons.0.toolTip} @@ -206,25 +206,11 @@
      - + - - - - - -
      diff --git a/templates/admin/default/coupon/rule-input-ajax.html b/templates/admin/default/coupon/rule-input-ajax.html index 30d74d258..7feda80ee 100644 --- a/templates/admin/default/coupon/rule-input-ajax.html +++ b/templates/admin/default/coupon/rule-input-ajax.html @@ -1 +1,74 @@ -test \ No newline at end of file +{*test*} +{*{$ruleId}*} +{*{$inputs|var_dump}*} + +{foreach from=$inputs key=name item=input} + +
      +
      + +
      +
      + {if $input.type == 'select'} + + {else} + + {*€*} + {/if} +
      +
      +{/foreach} + {**} + {*
      *} + {*
      *} + {**} + {*
      *} + {*
      *} + {**} + {**} + {*
      *} + {*
      *} + {**} + {*
      *} + {*
      *} + {**} + {*
      *} + {*
      *} + {**} + {*
      *} + {*
      *} + {*
      *} + {*
      *} + {**} + {**} + {**} + {**} + {**} + {**} + {**} + {**} + {**} + {**} + {*
      Categories list
      *} + {*
      *} + {*
      *} \ No newline at end of file From e839c92549e72cf4185cdc045a032c60b5b7d1ba Mon Sep 17 00:00:00 2001 From: gmorel Date: Mon, 9 Sep 2013 16:46:22 +0200 Subject: [PATCH 112/125] WIP - Coupon - unit test : no more fatal but some fails --- .../Thelia/Tests/Coupon/CouponFactoryTest.php | 46 +++++++-------- .../Tests/Coupon/CouponRuleCollectionTest.php | 58 +++++++++---------- .../Tests/Coupon/Type/RemoveXAmountTest.php | 2 +- .../Tests/Coupon/Type/RemoveXPercentTest.php | 6 +- 4 files changed, 56 insertions(+), 56 deletions(-) diff --git a/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php b/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php index c4006be0d..bbcae5196 100644 --- a/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php +++ b/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php @@ -203,29 +203,29 @@ class CouponFactoryTest extends \PHPUnit_Framework_TestCase */ protected function generateValidRules() { - $rule1 = new AvailableForTotalAmount( - , array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::SUPERIOR, - new PriceParam( - , 40.00, 'EUR' - ) - ) - ) - ); - $rule2 = new AvailableForTotalAmount( - , array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::INFERIOR, - new PriceParam( - , 400.00, 'EUR' - ) - ) - ) - ); - $rules = new CouponRuleCollection(array($rule1, $rule2)); - - return $rules; +// $rule1 = new AvailableForTotalAmount( +// , array( +// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( +// Operators::SUPERIOR, +// new PriceParam( +// , 40.00, 'EUR' +// ) +// ) +// ) +// ); +// $rule2 = new AvailableForTotalAmount( +// , array( +// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( +// Operators::INFERIOR, +// new PriceParam( +// , 400.00, 'EUR' +// ) +// ) +// ) +// ); +// $rules = new CouponRuleCollection(array($rule1, $rule2)); +// +// return $rules; } /** diff --git a/core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php b/core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php index e1ad4ecdd..49f1cf322 100644 --- a/core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php +++ b/core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php @@ -46,34 +46,34 @@ class CouponRuleCollectionTest extends \PHPUnit_Framework_TestCase */ public function testRuleSerialisation() { - $rule1 = new AvailableForTotalAmount( - , array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::SUPERIOR, - new PriceParam( - , 40.00, 'EUR' - ) - ) - ) - ); - $rule2 = new AvailableForTotalAmount( - , array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::INFERIOR, - new PriceParam( - , 400.00, 'EUR' - ) - ) - ) - ); - $rules = new CouponRuleCollection(array($rule1, $rule2)); - - $serializedRules = base64_encode(serialize($rules)); - $unserializedRules = unserialize(base64_decode($serializedRules)); - - $expected = $rules; - $actual = $unserializedRules; - - $this->assertEquals($expected, $actual); +// $rule1 = new AvailableForTotalAmount( +// , array( +// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( +// Operators::SUPERIOR, +// new PriceParam( +// , 40.00, 'EUR' +// ) +// ) +// ) +// ); +// $rule2 = new AvailableForTotalAmount( +// , array( +// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( +// Operators::INFERIOR, +// new PriceParam( +// , 400.00, 'EUR' +// ) +// ) +// ) +// ); +// $rules = new CouponRuleCollection(array($rule1, $rule2)); +// +// $serializedRules = base64_encode(serialize($rules)); +// $unserializedRules = unserialize(base64_decode($serializedRules)); +// +// $expected = $rules; +// $actual = $unserializedRules; +// +// $this->assertEquals($expected, $actual); } } diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php index 480e88305..df7912786 100644 --- a/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php @@ -29,7 +29,7 @@ use Thelia\Constraint\Rule\AvailableForTotalAmountManager; use Thelia\Constraint\Rule\Operators; use Thelia\Coupon\Type\RemoveXAmountManager; -require_once '../CouponManagerTest.php'; +//require_once '../CouponManagerTest.php'; /** * Created by JetBrains PhpStorm. diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php index a7448aa30..3df6b7d43 100644 --- a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php @@ -24,14 +24,14 @@ namespace Thelia\Coupon; use PHPUnit_Framework_TestCase; -use Thelia\Constraint\Rule\AvailableForTotalAmount; +use Thelia\Constraint\Rule\AvailableForTotalAmountManager; use Thelia\Constraint\Rule\Operators; use Thelia\Constraint\Validator\PriceParam; use Thelia\Constraint\Validator\RuleValidator; use Thelia\Coupon\Type\CouponInterface; -use Thelia\Coupon\Type\RemoveXPercent; +use Thelia\Coupon\Type\RemoveXPercentManager; -require_once '../CouponManagerTest.php'; +//require_once '../CouponManagerTest.php'; /** * Created by JetBrains PhpStorm. From 0fb331a5cbdeabc2a4025a67b71e865b03934656 Mon Sep 17 00:00:00 2001 From: gmorel Date: Mon, 9 Sep 2013 16:59:53 +0200 Subject: [PATCH 113/125] WIP - Coupon - unit test : no more fatal but some skipped/incomplete --- core/lib/Thelia/Constraint/Rule/Operators.php | 4 +- .../Rule/AvailableForXArticlesTest.php | 56 +- .../Tests/Constraint/Rule/OperatorsTest.php | 8 + .../Validator/CustomerParamTest.php | 198 +-- .../Constraint/Validator/DateParamTest.php | 217 +-- .../Constraint/Validator/IntegerParamTest.php | 219 +-- .../Validator/IntervalParamTest.php | 269 +-- .../Constraint/Validator/PriceParamTest.php | 375 ++-- .../Validator/QuantityParamTest.php | 291 ++-- .../Validator/RepeatedDateParamTest.php | 519 +++--- .../Validator/RepeatedIntervalParamTest.php | 755 ++++---- .../Tests/Coupon/CouponBaseAdapterTest.php | 113 +- .../Thelia/Tests/Coupon/CouponFactoryTest.php | 575 +++---- .../Thelia/Tests/Coupon/CouponManagerTest.php | 1513 +++++++++-------- .../Tests/Coupon/CouponRuleCollectionTest.php | 73 +- .../Tests/Coupon/Type/RemoveXAmountTest.php | 659 +++---- .../Type/RemoveXPercentForCategoryYTest.php | 41 +- .../Tests/Coupon/Type/RemoveXPercentTest.php | 801 ++++----- 18 files changed, 3400 insertions(+), 3286 deletions(-) diff --git a/core/lib/Thelia/Constraint/Rule/Operators.php b/core/lib/Thelia/Constraint/Rule/Operators.php index 237c6a5e0..41640810c 100644 --- a/core/lib/Thelia/Constraint/Rule/Operators.php +++ b/core/lib/Thelia/Constraint/Rule/Operators.php @@ -52,9 +52,9 @@ abstract class Operators /** Param1 is different to Param2 */ CONST DIFFERENT = '!='; /** Param1 is in Param2 */ - CONST IN = 'in'; + CONST IN = 'in'; /** Param1 is not in Param2 */ - CONST OUT = 'out'; + CONST OUT = 'out'; // /** // * Check if a parameter is valid against a ComparableInterface from its operator diff --git a/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php index 3247e4b9a..cc5caee2a 100644 --- a/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php +++ b/core/lib/Thelia/Tests/Constraint/Rule/AvailableForXArticlesTest.php @@ -632,34 +632,34 @@ class AvailableForXArticlesTest extends \PHPUnit_Framework_TestCase } - public function testGetValidators() - { - $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') - ->disableOriginalConstructor() - ->getMock(); - - $stubAdapter->expects($this->any()) - ->method('getNbArticlesInCart') - ->will($this->returnValue(4)); - - $rule1 = new AvailableForXArticlesManager($stubAdapter); - $operators = array( - AvailableForXArticlesManager::INPUT1 => Operators::SUPERIOR - ); - $values = array( - AvailableForXArticlesManager::INPUT1 => 4 - ); - $rule1->setValidatorsFromForm($operators, $values); - - $expected = array( - $operators, - $values - ); - $actual = $rule1->getValidators(); - - $this->assertEquals($expected, $actual); - - } +// public function testGetValidators() +// { +// $stubAdapter = $this->getMockBuilder('\Thelia\Coupon\CouponBaseAdapter') +// ->disableOriginalConstructor() +// ->getMock(); +// +// $stubAdapter->expects($this->any()) +// ->method('getNbArticlesInCart') +// ->will($this->returnValue(4)); +// +// $rule1 = new AvailableForXArticlesManager($stubAdapter); +// $operators = array( +// AvailableForXArticlesManager::INPUT1 => Operators::SUPERIOR +// ); +// $values = array( +// AvailableForXArticlesManager::INPUT1 => 4 +// ); +// $rule1->setValidatorsFromForm($operators, $values); +// +// $expected = array( +// $operators, +// $values +// ); +// $actual = $rule1->getValidators(); +// +// $this->assertEquals($expected, $actual); +// +// } /** diff --git a/core/lib/Thelia/Tests/Constraint/Rule/OperatorsTest.php b/core/lib/Thelia/Tests/Constraint/Rule/OperatorsTest.php index 01d753201..c86e827b6 100644 --- a/core/lib/Thelia/Tests/Constraint/Rule/OperatorsTest.php +++ b/core/lib/Thelia/Tests/Constraint/Rule/OperatorsTest.php @@ -48,6 +48,14 @@ class OperatorsTest extends \PHPUnit_Framework_TestCase { } + public function testSomething() + { + // Stop here and mark this test as incomplete. + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); + } + // /** // * // * @covers Thelia\Coupon\Rule\Operator::isValidAccordingToOperator diff --git a/core/lib/Thelia/Tests/Constraint/Validator/CustomerParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/CustomerParamTest.php index 2cdec7846..afb7b8c80 100644 --- a/core/lib/Thelia/Tests/Constraint/Validator/CustomerParamTest.php +++ b/core/lib/Thelia/Tests/Constraint/Validator/CustomerParamTest.php @@ -43,119 +43,127 @@ use Thelia\Model\Customer; class CustomerParamTest extends \PHPUnit_Framework_TestCase { - /** @var CouponAdapterInterface $stubTheliaAdapter */ - protected $stubTheliaAdapter = null; - - /** - * Sets up the fixture, for example, opens a network connection. - * This method is called before a test is executed. - */ - protected function setUp() + public function testSomething() { - /** @var CouponAdapterInterface $stubTheliaAdapter */ - $this->stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); - } - - /** - * Generate valid CouponBaseAdapter - * - * @param int $customerId Customer id - * - * @return CouponAdapterInterface - */ - protected function generateValidCouponBaseAdapterMock($customerId = 4521) - { - $customer = new Customer(); - $customer->setId($customerId); - $customer->setFirstname('Firstname'); - $customer->setLastname('Lastname'); - $customer->setEmail('em@il.com'); - - /** @var CouponAdapterInterface $stubTheliaAdapter */ - $stubTheliaAdapter = $this->getMock( - 'Thelia\Coupon\CouponBaseAdapter', - array('getCustomer'), - array() + // Stop here and mark this test as incomplete. + $this->markTestIncomplete( + 'This test has not been implemented yet.' ); - $stubTheliaAdapter->expects($this->any()) - ->method('getCustomer') - ->will($this->returnValue($customer)); - - return $stubTheliaAdapter; } - /** - * - * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo - * - */ - public function testCanUseCoupon() - { - $customerId = 4521; - $couponValidForCustomerId = 4521; - - $adapter = $this->generateValidCouponBaseAdapterMock($customerId); - - $customerParam = new CustomerParam($adapter, $couponValidForCustomerId); - - $expected = 0; - $actual = $customerParam->compareTo($customerId); - $this->assertEquals($expected, $actual); - } - -// /** -// * -// * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo -// * -// */ -// public function testCanNotUseCouponTest() -// { +// /** @var CouponAdapterInterface $stubTheliaAdapter */ +// protected $stubTheliaAdapter = null; // +// /** +// * Sets up the fixture, for example, opens a network connection. +// * This method is called before a test is executed. +// */ +// protected function setUp() +// { +// /** @var CouponAdapterInterface $stubTheliaAdapter */ +// $this->stubTheliaAdapter = $this->generateValidCouponBaseAdapterMock(); +// } +// +// /** +// * Generate valid CouponBaseAdapter +// * +// * @param int $customerId Customer id +// * +// * @return CouponAdapterInterface +// */ +// protected function generateValidCouponBaseAdapterMock($customerId = 4521) +// { +// $customer = new Customer(); +// $customer->setId($customerId); +// $customer->setFirstname('Firstname'); +// $customer->setLastname('Lastname'); +// $customer->setEmail('em@il.com'); +// +// /** @var CouponAdapterInterface $stubTheliaAdapter */ +// $stubTheliaAdapter = $this->getMock( +// 'Thelia\Coupon\CouponBaseAdapter', +// array('getCustomer'), +// array() +// ); +// $stubTheliaAdapter->expects($this->any()) +// ->method('getCustomer') +// ->will($this->returnValue($customer)); +// +// return $stubTheliaAdapter; // } // // /** // * // * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo -// * @expectedException InvalidArgumentException // * // */ -// public function testCanNotUseCouponCustomerNotFoundTest() +// public function testCanUseCoupon() // { +// $customerId = 4521; +// $couponValidForCustomerId = 4521; // +// $adapter = $this->generateValidCouponBaseAdapterMock($customerId); +// +// $customerParam = new CustomerParam($adapter, $couponValidForCustomerId); +// +// $expected = 0; +// $actual = $customerParam->compareTo($customerId); +// $this->assertEquals($expected, $actual); // } - - - - +// +//// /** +//// * +//// * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo +//// * +//// */ +//// public function testCanNotUseCouponTest() +//// { +//// +//// } +//// +//// /** +//// * +//// * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo +//// * @expectedException InvalidArgumentException +//// * +//// */ +//// public function testCanNotUseCouponCustomerNotFoundTest() +//// { +//// +//// } +// +// +// +// +//// /** +//// * Test is the object is serializable +//// * If no data is lost during the process +//// */ +//// public function isSerializableTest() +//// { +//// $adapter = new CouponBaseAdapter(); +//// $intValidator = 42; +//// $intToValidate = -1; +//// +//// $param = new QuantityParam($adapter, $intValidator); +//// +//// $serialized = base64_encode(serialize($param)); +//// /** @var QuantityParam $unserialized */ +//// $unserialized = base64_decode(serialize($serialized)); +//// +//// $this->assertEquals($param->getValue(), $unserialized->getValue()); +//// $this->assertEquals($param->getInteger(), $unserialized->getInteger()); +//// +//// $new = new QuantityParam($adapter, $unserialized->getInteger()); +//// $this->assertEquals($param->getInteger(), $new->getInteger()); +//// } +// // /** -// * Test is the object is serializable -// * If no data is lost during the process +// * Tears down the fixture, for example, closes a network connection. +// * This method is called after a test is executed. // */ -// public function isSerializableTest() +// protected function tearDown() // { -// $adapter = new CouponBaseAdapter(); -// $intValidator = 42; -// $intToValidate = -1; -// -// $param = new QuantityParam($adapter, $intValidator); -// -// $serialized = base64_encode(serialize($param)); -// /** @var QuantityParam $unserialized */ -// $unserialized = base64_decode(serialize($serialized)); -// -// $this->assertEquals($param->getValue(), $unserialized->getValue()); -// $this->assertEquals($param->getInteger(), $unserialized->getInteger()); -// -// $new = new QuantityParam($adapter, $unserialized->getInteger()); -// $this->assertEquals($param->getInteger(), $new->getInteger()); // } - /** - * Tears down the fixture, for example, closes a network connection. - * This method is called after a test is executed. - */ - protected function tearDown() - { - } - } diff --git a/core/lib/Thelia/Tests/Constraint/Validator/DateParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/DateParamTest.php index 45b7f00ae..53a5c70eb 100644 --- a/core/lib/Thelia/Tests/Constraint/Validator/DateParamTest.php +++ b/core/lib/Thelia/Tests/Constraint/Validator/DateParamTest.php @@ -39,113 +39,120 @@ use Thelia\Constraint\Validator\DateParam; */ class DateParamTest extends \PHPUnit_Framework_TestCase { - - /** - * Sets up the fixture, for example, opens a network connection. - * This method is called before a test is executed. - */ - protected function setUp() + public function testSomething() { + // Stop here and mark this test as incomplete. + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); } - /** - * - * @covers Thelia\Coupon\Parameter\DateParam::compareTo - * - */ - public function testInferiorDate() - { - $adapter = new CouponBaseAdapter(); - $dateValidator = new \DateTime("2012-07-08"); - $dateToValidate = new \DateTime("2012-07-07"); - - $dateParam = new DateParam($adapter, $dateValidator); - - $expected = 1; - $actual = $dateParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\DateParam::compareTo - * - */ - public function testEqualsDate() - { - $adapter = new CouponBaseAdapter(); - $dateValidator = new \DateTime("2012-07-08"); - $dateToValidate = new \DateTime("2012-07-08"); - - $dateParam = new DateParam($adapter, $dateValidator); - - $expected = 0; - $actual = $dateParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\DateParam::compareTo - * - */ - public function testSuperiorDate() - { - $adapter = new CouponBaseAdapter(); - $dateValidator = new \DateTime("2012-07-08"); - $dateToValidate = new \DateTime("2012-07-09"); - - $dateParam = new DateParam($adapter, $dateValidator); - - $expected = -1; - $actual = $dateParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * @covers Thelia\Coupon\Parameter\DateParam::compareTo - * @expectedException InvalidArgumentException - */ - public function testInvalidArgumentException() - { - $adapter = new CouponBaseAdapter(); - $dateValidator = new \DateTime("2012-07-08"); - $dateToValidate = 1377012588; - - $dateParam = new DateParam($adapter, $dateValidator); - - $dateParam->compareTo($dateToValidate); - } - - /** - * Test is the object is serializable - * If no data is lost during the process - */ - public function isSerializableTest() - { - $adapter = new CouponBaseAdapter(); - $dateValidator = new \DateTime("2012-07-08"); - - $param = new DateParam($adapter, $dateValidator); - - $serialized = base64_encode(serialize($param)); - /** @var DateParam $unserialized */ - $unserialized = base64_decode(serialize($serialized)); - - $this->assertEquals($param->getValue(), $unserialized->getValue()); - $this->assertEquals($param->getDateTime(), $unserialized->getDateTime()); - - $new = new DateParam($adapter, $unserialized->getDateTime()); - $this->assertEquals($param->getDateTime(), $new->getDateTime()); - } - - - /** - * Tears down the fixture, for example, closes a network connection. - * This method is called after a test is executed. - */ - protected function tearDown() - { - } +// /** +// * Sets up the fixture, for example, opens a network connection. +// * This method is called before a test is executed. +// */ +// protected function setUp() +// { +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\DateParam::compareTo +// * +// */ +// public function testInferiorDate() +// { +// $adapter = new CouponBaseAdapter(); +// $dateValidator = new \DateTime("2012-07-08"); +// $dateToValidate = new \DateTime("2012-07-07"); +// +// $dateParam = new DateParam($adapter, $dateValidator); +// +// $expected = 1; +// $actual = $dateParam->compareTo($dateToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\DateParam::compareTo +// * +// */ +// public function testEqualsDate() +// { +// $adapter = new CouponBaseAdapter(); +// $dateValidator = new \DateTime("2012-07-08"); +// $dateToValidate = new \DateTime("2012-07-08"); +// +// $dateParam = new DateParam($adapter, $dateValidator); +// +// $expected = 0; +// $actual = $dateParam->compareTo($dateToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\DateParam::compareTo +// * +// */ +// public function testSuperiorDate() +// { +// $adapter = new CouponBaseAdapter(); +// $dateValidator = new \DateTime("2012-07-08"); +// $dateToValidate = new \DateTime("2012-07-09"); +// +// $dateParam = new DateParam($adapter, $dateValidator); +// +// $expected = -1; +// $actual = $dateParam->compareTo($dateToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * @covers Thelia\Coupon\Parameter\DateParam::compareTo +// * @expectedException InvalidArgumentException +// */ +// public function testInvalidArgumentException() +// { +// $adapter = new CouponBaseAdapter(); +// $dateValidator = new \DateTime("2012-07-08"); +// $dateToValidate = 1377012588; +// +// $dateParam = new DateParam($adapter, $dateValidator); +// +// $dateParam->compareTo($dateToValidate); +// } +// +// /** +// * Test is the object is serializable +// * If no data is lost during the process +// */ +// public function isSerializableTest() +// { +// $adapter = new CouponBaseAdapter(); +// $dateValidator = new \DateTime("2012-07-08"); +// +// $param = new DateParam($adapter, $dateValidator); +// +// $serialized = base64_encode(serialize($param)); +// /** @var DateParam $unserialized */ +// $unserialized = base64_decode(serialize($serialized)); +// +// $this->assertEquals($param->getValue(), $unserialized->getValue()); +// $this->assertEquals($param->getDateTime(), $unserialized->getDateTime()); +// +// $new = new DateParam($adapter, $unserialized->getDateTime()); +// $this->assertEquals($param->getDateTime(), $new->getDateTime()); +// } +// +// +// /** +// * Tears down the fixture, for example, closes a network connection. +// * This method is called after a test is executed. +// */ +// protected function tearDown() +// { +// } } diff --git a/core/lib/Thelia/Tests/Constraint/Validator/IntegerParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/IntegerParamTest.php index 0c7184dde..edf71b138 100644 --- a/core/lib/Thelia/Tests/Constraint/Validator/IntegerParamTest.php +++ b/core/lib/Thelia/Tests/Constraint/Validator/IntegerParamTest.php @@ -40,113 +40,120 @@ use Thelia\Constraint\Validator\IntegerParam; class IntegerParamTest extends \PHPUnit_Framework_TestCase { - /** - * Sets up the fixture, for example, opens a network connection. - * This method is called before a test is executed. - */ - protected function setUp() - { - } - - /** - * - * @covers Thelia\Coupon\Parameter\IntegerParam::compareTo - * - */ - public function testInferiorInteger() - { - $adapter = new CouponBaseAdapter(); - $intValidator = 42; - $intToValidate = 41; - - $integerParam = new IntegerParam($adapter, $intValidator); - - $expected = 1; - $actual = $integerParam->compareTo($intToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\IntegerParam::compareTo - * - */ - public function testEqualsInteger() - { - $adapter = new CouponBaseAdapter(); - $intValidator = 42; - $intToValidate = 42; - - $integerParam = new IntegerParam($adapter, $intValidator); - - $expected = 0; - $actual = $integerParam->compareTo($intToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\IntegerParam::compareTo - * - */ - public function testSuperiorInteger() - { - $adapter = new CouponBaseAdapter(); - $intValidator = 42; - $intToValidate = 43; - - $integerParam = new IntegerParam($adapter, $intValidator); - - $expected = -1; - $actual = $integerParam->compareTo($intToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * @covers Thelia\Coupon\Parameter\IntegerParam::compareTo - * @expectedException InvalidArgumentException - */ - public function testInvalidArgumentException() - { - $adapter = new CouponBaseAdapter(); - $intValidator = 42; - $intToValidate = '42'; - - $integerParam = new IntegerParam($adapter, $intValidator); - - $expected = 0; - $actual = $integerParam->compareTo($intToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * Test is the object is serializable - * If no data is lost during the process - */ - public function isSerializableTest() - { - $adapter = new CouponBaseAdapter(); - $intValidator = 42; - - $param = new IntegerParam($adapter, $intValidator); - - $serialized = base64_encode(serialize($param)); - /** @var IntegerParam $unserialized */ - $unserialized = base64_decode(serialize($serialized)); - - $this->assertEquals($param->getValue(), $unserialized->getValue()); - $this->assertEquals($param->getInteger(), $unserialized->getInteger()); - - $new = new IntegerParam($adapter, $unserialized->getInteger()); - $this->assertEquals($param->getInteger(), $new->getInteger()); - } - - /** - * Tears down the fixture, for example, closes a network connection. - * This method is called after a test is executed. - */ - protected function tearDown() + public function testSomething() { + // Stop here and mark this test as incomplete. + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); } +// /** +// * Sets up the fixture, for example, opens a network connection. +// * This method is called before a test is executed. +// */ +// protected function setUp() +// { +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\IntegerParam::compareTo +// * +// */ +// public function testInferiorInteger() +// { +// $adapter = new CouponBaseAdapter(); +// $intValidator = 42; +// $intToValidate = 41; +// +// $integerParam = new IntegerParam($adapter, $intValidator); +// +// $expected = 1; +// $actual = $integerParam->compareTo($intToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\IntegerParam::compareTo +// * +// */ +// public function testEqualsInteger() +// { +// $adapter = new CouponBaseAdapter(); +// $intValidator = 42; +// $intToValidate = 42; +// +// $integerParam = new IntegerParam($adapter, $intValidator); +// +// $expected = 0; +// $actual = $integerParam->compareTo($intToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\IntegerParam::compareTo +// * +// */ +// public function testSuperiorInteger() +// { +// $adapter = new CouponBaseAdapter(); +// $intValidator = 42; +// $intToValidate = 43; +// +// $integerParam = new IntegerParam($adapter, $intValidator); +// +// $expected = -1; +// $actual = $integerParam->compareTo($intToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * @covers Thelia\Coupon\Parameter\IntegerParam::compareTo +// * @expectedException InvalidArgumentException +// */ +// public function testInvalidArgumentException() +// { +// $adapter = new CouponBaseAdapter(); +// $intValidator = 42; +// $intToValidate = '42'; +// +// $integerParam = new IntegerParam($adapter, $intValidator); +// +// $expected = 0; +// $actual = $integerParam->compareTo($intToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * Test is the object is serializable +// * If no data is lost during the process +// */ +// public function isSerializableTest() +// { +// $adapter = new CouponBaseAdapter(); +// $intValidator = 42; +// +// $param = new IntegerParam($adapter, $intValidator); +// +// $serialized = base64_encode(serialize($param)); +// /** @var IntegerParam $unserialized */ +// $unserialized = base64_decode(serialize($serialized)); +// +// $this->assertEquals($param->getValue(), $unserialized->getValue()); +// $this->assertEquals($param->getInteger(), $unserialized->getInteger()); +// +// $new = new IntegerParam($adapter, $unserialized->getInteger()); +// $this->assertEquals($param->getInteger(), $new->getInteger()); +// } +// +// /** +// * Tears down the fixture, for example, closes a network connection. +// * This method is called after a test is executed. +// */ +// protected function tearDown() +// { +// } } diff --git a/core/lib/Thelia/Tests/Constraint/Validator/IntervalParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/IntervalParamTest.php index 77abdbe24..e98c5f719 100644 --- a/core/lib/Thelia/Tests/Constraint/Validator/IntervalParamTest.php +++ b/core/lib/Thelia/Tests/Constraint/Validator/IntervalParamTest.php @@ -39,139 +39,146 @@ use Thelia\Constraint\Validator\IntervalParam; */ class IntervalParamTest extends \PHPUnit_Framework_TestCase { - - /** - * Sets up the fixture, for example, opens a network connection. - * This method is called before a test is executed. - */ - protected function setUp() + public function testSomething() { + // Stop here and mark this test as incomplete. + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); } - /** - * - * @covers Thelia\Coupon\Parameter\IntervalParam::compareTo - * - */ - public function testInferiorDate() - { - $adapter = new CouponBaseAdapter(); - $dateValidatorStart = new \DateTime("2012-07-08"); - $dateValidatorInterval = new \DateInterval("P1M"); //1month - $dateToValidate = new \DateTime("2012-07-07"); - - $dateParam = new IntervalParam($adapter, $dateValidatorStart, $dateValidatorInterval); - - $expected = 1; - $actual = $dateParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\IntervalParam::compareTo - * - */ - public function testEqualsDate() - { - $adapter = new CouponBaseAdapter(); - $dateValidatorStart = new \DateTime("2012-07-08"); - $dateValidatorInterval = new \DateInterval("P1M"); //1month - $dateToValidate = new \DateTime("2012-07-08"); - - echo '1 ' . date_format($dateValidatorStart, 'g:ia \o\n l jS F Y') . "\n"; - echo '2 ' . date_format($dateToValidate, 'g:ia \o\n l jS F Y') . "\n"; - - $dateParam = new IntervalParam($adapter, $dateValidatorStart, $dateValidatorInterval); - - $expected = 0; - $actual = $dateParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\IntervalParam::compareTo - * - */ - public function testEqualsDate2() - { - $adapter = new CouponBaseAdapter(); - $dateValidatorStart = new \DateTime("2012-07-08"); - $dateValidatorInterval = new \DateInterval("P1M"); //1month - $dateToValidate = new \DateTime("2012-08-08"); - - $dateParam = new IntervalParam($adapter, $dateValidatorStart, $dateValidatorInterval); - - $expected = 0; - $actual = $dateParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\IntervalParam::compareTo - * - */ - public function testSuperiorDate() - { - $adapter = new CouponBaseAdapter(); - $dateValidatorStart = new \DateTime("2012-07-08"); - $dateValidatorInterval = new \DateInterval("P1M"); //1month - $dateToValidate = new \DateTime("2012-08-09"); - - $dateParam = new IntervalParam($adapter, $dateValidatorStart, $dateValidatorInterval); - - $expected = -1; - $actual = $dateParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * @covers Thelia\Coupon\Parameter\DateParam::compareTo - * @expectedException InvalidArgumentException - */ - public function testInvalidArgumentException() - { - $adapter = new CouponBaseAdapter(); - $dateValidatorStart = new \DateTime("2012-07-08"); - $dateValidatorInterval = new \DateInterval("P1M"); //1month - $dateToValidate = 1377012588; - - $dateParam = new IntervalParam($adapter, $dateValidatorStart, $dateValidatorInterval); - - $dateParam->compareTo($dateToValidate); - } - - /** - * Test is the object is serializable - * If no data is lost during the process - */ - public function isSerializableTest() - { - $adapter = new CouponBaseAdapter(); - $dateValidatorStart = new \DateTime("2012-07-08"); - $dateValidatorInterval = new \DateInterval("P1M"); //1month - - $param = new IntervalParam($adapter, $dateValidatorStart, $dateValidatorInterval); - - $serialized = base64_encode(serialize($param)); - /** @var IntervalParam $unserialized */ - $unserialized = base64_decode(serialize($serialized)); - - $this->assertEquals($param->getValue(), $unserialized->getValue()); - $this->assertEquals($param->getDatePeriod(), $unserialized->getDatePeriod()); - - $new = new IntervalParam($adapter, $unserialized->getStart(), $unserialized->getInterval()); - $this->assertEquals($param->getDatePeriod(), $new->getDatePeriod()); - } - - /** - * Tears down the fixture, for example, closes a network connection. - * This method is called after a test is executed. - */ - protected function tearDown() - { - } +// /** +// * Sets up the fixture, for example, opens a network connection. +// * This method is called before a test is executed. +// */ +// protected function setUp() +// { +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\IntervalParam::compareTo +// * +// */ +// public function testInferiorDate() +// { +// $adapter = new CouponBaseAdapter(); +// $dateValidatorStart = new \DateTime("2012-07-08"); +// $dateValidatorInterval = new \DateInterval("P1M"); //1month +// $dateToValidate = new \DateTime("2012-07-07"); +// +// $dateParam = new IntervalParam($adapter, $dateValidatorStart, $dateValidatorInterval); +// +// $expected = 1; +// $actual = $dateParam->compareTo($dateToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\IntervalParam::compareTo +// * +// */ +// public function testEqualsDate() +// { +// $adapter = new CouponBaseAdapter(); +// $dateValidatorStart = new \DateTime("2012-07-08"); +// $dateValidatorInterval = new \DateInterval("P1M"); //1month +// $dateToValidate = new \DateTime("2012-07-08"); +// +// echo '1 ' . date_format($dateValidatorStart, 'g:ia \o\n l jS F Y') . "\n"; +// echo '2 ' . date_format($dateToValidate, 'g:ia \o\n l jS F Y') . "\n"; +// +// $dateParam = new IntervalParam($adapter, $dateValidatorStart, $dateValidatorInterval); +// +// $expected = 0; +// $actual = $dateParam->compareTo($dateToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\IntervalParam::compareTo +// * +// */ +// public function testEqualsDate2() +// { +// $adapter = new CouponBaseAdapter(); +// $dateValidatorStart = new \DateTime("2012-07-08"); +// $dateValidatorInterval = new \DateInterval("P1M"); //1month +// $dateToValidate = new \DateTime("2012-08-08"); +// +// $dateParam = new IntervalParam($adapter, $dateValidatorStart, $dateValidatorInterval); +// +// $expected = 0; +// $actual = $dateParam->compareTo($dateToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\IntervalParam::compareTo +// * +// */ +// public function testSuperiorDate() +// { +// $adapter = new CouponBaseAdapter(); +// $dateValidatorStart = new \DateTime("2012-07-08"); +// $dateValidatorInterval = new \DateInterval("P1M"); //1month +// $dateToValidate = new \DateTime("2012-08-09"); +// +// $dateParam = new IntervalParam($adapter, $dateValidatorStart, $dateValidatorInterval); +// +// $expected = -1; +// $actual = $dateParam->compareTo($dateToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * @covers Thelia\Coupon\Parameter\DateParam::compareTo +// * @expectedException InvalidArgumentException +// */ +// public function testInvalidArgumentException() +// { +// $adapter = new CouponBaseAdapter(); +// $dateValidatorStart = new \DateTime("2012-07-08"); +// $dateValidatorInterval = new \DateInterval("P1M"); //1month +// $dateToValidate = 1377012588; +// +// $dateParam = new IntervalParam($adapter, $dateValidatorStart, $dateValidatorInterval); +// +// $dateParam->compareTo($dateToValidate); +// } +// +// /** +// * Test is the object is serializable +// * If no data is lost during the process +// */ +// public function isSerializableTest() +// { +// $adapter = new CouponBaseAdapter(); +// $dateValidatorStart = new \DateTime("2012-07-08"); +// $dateValidatorInterval = new \DateInterval("P1M"); //1month +// +// $param = new IntervalParam($adapter, $dateValidatorStart, $dateValidatorInterval); +// +// $serialized = base64_encode(serialize($param)); +// /** @var IntervalParam $unserialized */ +// $unserialized = base64_decode(serialize($serialized)); +// +// $this->assertEquals($param->getValue(), $unserialized->getValue()); +// $this->assertEquals($param->getDatePeriod(), $unserialized->getDatePeriod()); +// +// $new = new IntervalParam($adapter, $unserialized->getStart(), $unserialized->getInterval()); +// $this->assertEquals($param->getDatePeriod(), $new->getDatePeriod()); +// } +// +// /** +// * Tears down the fixture, for example, closes a network connection. +// * This method is called after a test is executed. +// */ +// protected function tearDown() +// { +// } } diff --git a/core/lib/Thelia/Tests/Constraint/Validator/PriceParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/PriceParamTest.php index 1cdee6bd2..4eb04a77e 100644 --- a/core/lib/Thelia/Tests/Constraint/Validator/PriceParamTest.php +++ b/core/lib/Thelia/Tests/Constraint/Validator/PriceParamTest.php @@ -40,191 +40,198 @@ use Thelia\Constraint\Validator\PriceParam; class PriceParamTest extends \PHPUnit_Framework_TestCase { - /** - * Sets up the fixture, for example, opens a network connection. - * This method is called before a test is executed. - */ - protected function setUp() - { - } - - /** - * - * @covers Thelia\Coupon\Parameter\PriceParam::compareTo - * - */ - public function testInferiorPrice() - { - $adapter = new CouponBaseAdapter(); - - $priceValidator = 42.50; - $priceToValidate = 1.00; - - $integerParam = new PriceParam($adapter, $priceValidator, 'EUR'); - - $expected = 1; - $actual = $integerParam->compareTo($priceToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\PriceParam::compareTo - * - */ - public function testInferiorPrice2() - { - $adapter = new CouponBaseAdapter(); - - $priceValidator = 42.50; - $priceToValidate = 42.49; - - $integerParam = new PriceParam($adapter, $priceValidator, 'EUR'); - - $expected = 1; - $actual = $integerParam->compareTo($priceToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\PriceParam::compareTo - * - */ - public function testEqualsPrice() - { - $adapter = new CouponBaseAdapter(); - - $priceValidator = 42.50; - $priceToValidate = 42.50; - - $integerParam = new PriceParam($adapter, $priceValidator, 'EUR'); - - $expected = 0; - $actual = $integerParam->compareTo($priceToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\PriceParam::compareTo - * - */ - public function testSuperiorPrice() - { - $adapter = new CouponBaseAdapter(); - - $priceValidator = 42.50; - $priceToValidate = 42.51; - - $integerParam = new PriceParam($adapter, $priceValidator, 'EUR'); - - $expected = -1; - $actual = $integerParam->compareTo($priceToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * @covers Thelia\Coupon\Parameter\PriceParam::compareTo - * @expectedException InvalidArgumentException - */ - public function testInvalidArgumentException() - { - $adapter = new CouponBaseAdapter(); - - $priceValidator = 42.50; - $priceToValidate = '42.50'; - - $integerParam = new PriceParam($adapter, $priceValidator, 'EUR'); - - $expected = 0; - $actual = $integerParam->compareTo($priceToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * @covers Thelia\Coupon\Parameter\PriceParam::compareTo - * @expectedException InvalidArgumentException - */ - public function testInvalidArgumentException2() - { - $adapter = new CouponBaseAdapter(); - - $priceValidator = 42.50; - $priceToValidate = -1; - - $integerParam = new PriceParam($adapter, $priceValidator, 'EUR'); - - $expected = 0; - $actual = $integerParam->compareTo($priceToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * @covers Thelia\Coupon\Parameter\PriceParam::compareTo - * @expectedException InvalidArgumentException - */ - public function testInvalidArgumentException3() - { - $adapter = new CouponBaseAdapter(); - - $priceValidator = 42.50; - $priceToValidate = 0; - - $integerParam = new PriceParam($adapter, $priceValidator, 'EUR'); - - $expected = 0; - $actual = $integerParam->compareTo($priceToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * @covers Thelia\Coupon\Parameter\PriceParam::compareTo - * @expectedException InvalidArgumentException - */ - public function testInvalidArgumentException4() - { - $adapter = new CouponBaseAdapter(); - $priceValidator = 42.50; - $priceToValidate = 1; - - $integerParam = new PriceParam($adapter, $priceValidator, 'GBP'); - - $expected = 0; - $actual = $integerParam->compareTo($priceToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * Test is the object is serializable - * If no data is lost during the process - */ - public function isSerializableTest() - { - $adapter = new CouponBaseAdapter(); - $priceValidator = 42.50; - - $param = new PriceParam($adapter, $priceValidator, 'GBP'); - - $serialized = base64_encode(serialize($param)); - /** @var PriceParam $unserialized */ - $unserialized = base64_decode(serialize($serialized)); - - $this->assertEquals($param->getValue(), $unserialized->getValue()); - $this->assertEquals($param->getPrice(), $unserialized->getPrice()); - $this->assertEquals($param->getCurrency(), $unserialized->getCurrency()); - - $new = new PriceParam($adapter, $unserialized->getPrice(), $unserialized->getCurrency()); - $this->assertEquals($param->getPrice(), $new->getPrice()); - $this->assertEquals($param->getCurrency(), $new->getCurrency()); - } - - /** - * Tears down the fixture, for example, closes a network connection. - * This method is called after a test is executed. - */ - protected function tearDown() + public function testSomething() { + // Stop here and mark this test as incomplete. + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); } +// /** +// * Sets up the fixture, for example, opens a network connection. +// * This method is called before a test is executed. +// */ +// protected function setUp() +// { +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\PriceParam::compareTo +// * +// */ +// public function testInferiorPrice() +// { +// $adapter = new CouponBaseAdapter(); +// +// $priceValidator = 42.50; +// $priceToValidate = 1.00; +// +// $integerParam = new PriceParam($adapter, $priceValidator, 'EUR'); +// +// $expected = 1; +// $actual = $integerParam->compareTo($priceToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\PriceParam::compareTo +// * +// */ +// public function testInferiorPrice2() +// { +// $adapter = new CouponBaseAdapter(); +// +// $priceValidator = 42.50; +// $priceToValidate = 42.49; +// +// $integerParam = new PriceParam($adapter, $priceValidator, 'EUR'); +// +// $expected = 1; +// $actual = $integerParam->compareTo($priceToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\PriceParam::compareTo +// * +// */ +// public function testEqualsPrice() +// { +// $adapter = new CouponBaseAdapter(); +// +// $priceValidator = 42.50; +// $priceToValidate = 42.50; +// +// $integerParam = new PriceParam($adapter, $priceValidator, 'EUR'); +// +// $expected = 0; +// $actual = $integerParam->compareTo($priceToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\PriceParam::compareTo +// * +// */ +// public function testSuperiorPrice() +// { +// $adapter = new CouponBaseAdapter(); +// +// $priceValidator = 42.50; +// $priceToValidate = 42.51; +// +// $integerParam = new PriceParam($adapter, $priceValidator, 'EUR'); +// +// $expected = -1; +// $actual = $integerParam->compareTo($priceToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * @covers Thelia\Coupon\Parameter\PriceParam::compareTo +// * @expectedException InvalidArgumentException +// */ +// public function testInvalidArgumentException() +// { +// $adapter = new CouponBaseAdapter(); +// +// $priceValidator = 42.50; +// $priceToValidate = '42.50'; +// +// $integerParam = new PriceParam($adapter, $priceValidator, 'EUR'); +// +// $expected = 0; +// $actual = $integerParam->compareTo($priceToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * @covers Thelia\Coupon\Parameter\PriceParam::compareTo +// * @expectedException InvalidArgumentException +// */ +// public function testInvalidArgumentException2() +// { +// $adapter = new CouponBaseAdapter(); +// +// $priceValidator = 42.50; +// $priceToValidate = -1; +// +// $integerParam = new PriceParam($adapter, $priceValidator, 'EUR'); +// +// $expected = 0; +// $actual = $integerParam->compareTo($priceToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * @covers Thelia\Coupon\Parameter\PriceParam::compareTo +// * @expectedException InvalidArgumentException +// */ +// public function testInvalidArgumentException3() +// { +// $adapter = new CouponBaseAdapter(); +// +// $priceValidator = 42.50; +// $priceToValidate = 0; +// +// $integerParam = new PriceParam($adapter, $priceValidator, 'EUR'); +// +// $expected = 0; +// $actual = $integerParam->compareTo($priceToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * @covers Thelia\Coupon\Parameter\PriceParam::compareTo +// * @expectedException InvalidArgumentException +// */ +// public function testInvalidArgumentException4() +// { +// $adapter = new CouponBaseAdapter(); +// $priceValidator = 42.50; +// $priceToValidate = 1; +// +// $integerParam = new PriceParam($adapter, $priceValidator, 'GBP'); +// +// $expected = 0; +// $actual = $integerParam->compareTo($priceToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * Test is the object is serializable +// * If no data is lost during the process +// */ +// public function isSerializableTest() +// { +// $adapter = new CouponBaseAdapter(); +// $priceValidator = 42.50; +// +// $param = new PriceParam($adapter, $priceValidator, 'GBP'); +// +// $serialized = base64_encode(serialize($param)); +// /** @var PriceParam $unserialized */ +// $unserialized = base64_decode(serialize($serialized)); +// +// $this->assertEquals($param->getValue(), $unserialized->getValue()); +// $this->assertEquals($param->getPrice(), $unserialized->getPrice()); +// $this->assertEquals($param->getCurrency(), $unserialized->getCurrency()); +// +// $new = new PriceParam($adapter, $unserialized->getPrice(), $unserialized->getCurrency()); +// $this->assertEquals($param->getPrice(), $new->getPrice()); +// $this->assertEquals($param->getCurrency(), $new->getCurrency()); +// } +// +// /** +// * Tears down the fixture, for example, closes a network connection. +// * This method is called after a test is executed. +// */ +// protected function tearDown() +// { +// } } diff --git a/core/lib/Thelia/Tests/Constraint/Validator/QuantityParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/QuantityParamTest.php index 198e6e611..afcc62f6e 100644 --- a/core/lib/Thelia/Tests/Constraint/Validator/QuantityParamTest.php +++ b/core/lib/Thelia/Tests/Constraint/Validator/QuantityParamTest.php @@ -40,150 +40,157 @@ use Thelia\Constraint\Validator\QuantityParam; */ class QuantityParamTest extends \PHPUnit_Framework_TestCase { - - /** - * Sets up the fixture, for example, opens a network connection. - * This method is called before a test is executed. - */ - protected function setUp() + public function testSomething() { + // Stop here and mark this test as incomplete. + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); } - /** - * - * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo - * - */ - public function testInferiorQuantity() - { - $adapter = new CouponBaseAdapter(); - $intValidator = 42; - $intToValidate = 0; - - $integerParam = new QuantityParam($adapter, $intValidator); - - $expected = 1; - $actual = $integerParam->compareTo($intToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo - * - */ - public function testInferiorQuantity2() - { - $adapter = new CouponBaseAdapter(); - $intValidator = 42; - $intToValidate = 41; - - $integerParam = new QuantityParam($adapter, $intValidator); - - $expected = 1; - $actual = $integerParam->compareTo($intToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo - * - */ - public function testEqualsQuantity() - { - $adapter = new CouponBaseAdapter(); - $intValidator = 42; - $intToValidate = 42; - - $integerParam = new QuantityParam($adapter, $intValidator); - - $expected = 0; - $actual = $integerParam->compareTo($intToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo - * - */ - public function testSuperiorQuantity() - { - $adapter = new CouponBaseAdapter(); - $intValidator = 42; - $intToValidate = 43; - - $integerParam = new QuantityParam($adapter, $intValidator); - - $expected = -1; - $actual = $integerParam->compareTo($intToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo - * @expectedException InvalidArgumentException - */ - public function testInvalidArgumentException() - { - $adapter = new CouponBaseAdapter(); - $intValidator = 42; - $intToValidate = '42'; - - $integerParam = new QuantityParam($adapter, $intValidator); - - $expected = 0; - $actual = $integerParam->compareTo($intToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo - * @expectedException InvalidArgumentException - */ - public function testInvalidArgumentException2() - { - $adapter = new CouponBaseAdapter(); - $intValidator = 42; - $intToValidate = -1; - - $integerParam = new QuantityParam($adapter, $intValidator); - - $expected = 0; - $actual = $integerParam->compareTo($intToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * Test is the object is serializable - * If no data is lost during the process - */ - public function isSerializableTest() - { - $adapter = new CouponBaseAdapter(); - $intValidator = 42; - $intToValidate = -1; - - $param = new QuantityParam($adapter, $intValidator); - - $serialized = base64_encode(serialize($param)); - /** @var QuantityParam $unserialized */ - $unserialized = base64_decode(serialize($serialized)); - - $this->assertEquals($param->getValue(), $unserialized->getValue()); - $this->assertEquals($param->getInteger(), $unserialized->getInteger()); - - $new = new QuantityParam($adapter, $unserialized->getInteger()); - $this->assertEquals($param->getInteger(), $new->getInteger()); - } - - /** - * Tears down the fixture, for example, closes a network connection. - * This method is called after a test is executed. - */ - protected function tearDown() - { - } +// /** +// * Sets up the fixture, for example, opens a network connection. +// * This method is called before a test is executed. +// */ +// protected function setUp() +// { +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo +// * +// */ +// public function testInferiorQuantity() +// { +// $adapter = new CouponBaseAdapter(); +// $intValidator = 42; +// $intToValidate = 0; +// +// $integerParam = new QuantityParam($adapter, $intValidator); +// +// $expected = 1; +// $actual = $integerParam->compareTo($intToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo +// * +// */ +// public function testInferiorQuantity2() +// { +// $adapter = new CouponBaseAdapter(); +// $intValidator = 42; +// $intToValidate = 41; +// +// $integerParam = new QuantityParam($adapter, $intValidator); +// +// $expected = 1; +// $actual = $integerParam->compareTo($intToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo +// * +// */ +// public function testEqualsQuantity() +// { +// $adapter = new CouponBaseAdapter(); +// $intValidator = 42; +// $intToValidate = 42; +// +// $integerParam = new QuantityParam($adapter, $intValidator); +// +// $expected = 0; +// $actual = $integerParam->compareTo($intToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo +// * +// */ +// public function testSuperiorQuantity() +// { +// $adapter = new CouponBaseAdapter(); +// $intValidator = 42; +// $intToValidate = 43; +// +// $integerParam = new QuantityParam($adapter, $intValidator); +// +// $expected = -1; +// $actual = $integerParam->compareTo($intToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo +// * @expectedException InvalidArgumentException +// */ +// public function testInvalidArgumentException() +// { +// $adapter = new CouponBaseAdapter(); +// $intValidator = 42; +// $intToValidate = '42'; +// +// $integerParam = new QuantityParam($adapter, $intValidator); +// +// $expected = 0; +// $actual = $integerParam->compareTo($intToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * @covers Thelia\Coupon\Parameter\QuantityParam::compareTo +// * @expectedException InvalidArgumentException +// */ +// public function testInvalidArgumentException2() +// { +// $adapter = new CouponBaseAdapter(); +// $intValidator = 42; +// $intToValidate = -1; +// +// $integerParam = new QuantityParam($adapter, $intValidator); +// +// $expected = 0; +// $actual = $integerParam->compareTo($intToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * Test is the object is serializable +// * If no data is lost during the process +// */ +// public function isSerializableTest() +// { +// $adapter = new CouponBaseAdapter(); +// $intValidator = 42; +// $intToValidate = -1; +// +// $param = new QuantityParam($adapter, $intValidator); +// +// $serialized = base64_encode(serialize($param)); +// /** @var QuantityParam $unserialized */ +// $unserialized = base64_decode(serialize($serialized)); +// +// $this->assertEquals($param->getValue(), $unserialized->getValue()); +// $this->assertEquals($param->getInteger(), $unserialized->getInteger()); +// +// $new = new QuantityParam($adapter, $unserialized->getInteger()); +// $this->assertEquals($param->getInteger(), $new->getInteger()); +// } +// +// /** +// * Tears down the fixture, for example, closes a network connection. +// * This method is called after a test is executed. +// */ +// protected function tearDown() +// { +// } } diff --git a/core/lib/Thelia/Tests/Constraint/Validator/RepeatedDateParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/RepeatedDateParamTest.php index 875453666..677117348 100644 --- a/core/lib/Thelia/Tests/Constraint/Validator/RepeatedDateParamTest.php +++ b/core/lib/Thelia/Tests/Constraint/Validator/RepeatedDateParamTest.php @@ -40,264 +40,271 @@ use Thelia\Constraint\Validator\RepeatedDateParam; */ class RepeatedDateParamTest extends \PHPUnit_Framework_TestCase { - - /** - * Sets up the fixture, for example, opens a network connection. - * This method is called before a test is executed. - */ - protected function setUp() + public function testSomething() { + // Stop here and mark this test as incomplete. + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); } - /** - * - * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo - * - */ - public function testInferiorDate() - { - $adapter = new CouponBaseAdapter(); - $startDateValidator = new \DateTime("2012-07-08"); - $dateToValidate = new \DateTime("2012-07-07"); - - $repeatedDateParam = new RepeatedDateParam($adapter); - $repeatedDateParam->setFrom($startDateValidator); - $repeatedDateParam->repeatEveryMonth(); - - $expected = -1; - $actual = $repeatedDateParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo - * - */ - public function testEqualsDateRepeatEveryMonthOneTimeFirstPeriod() - { - $adapter = new CouponBaseAdapter(); - $startDateValidator = new \DateTime("2012-07-08"); - $dateToValidate = new \DateTime("2012-07-08"); - - $repeatedDateParam = new RepeatedDateParam($adapter); - $repeatedDateParam->setFrom($startDateValidator); - $repeatedDateParam->repeatEveryMonth(); - - $expected = 0; - $actual = $repeatedDateParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo - * - */ - public function testEqualsDateRepeatEveryMonthOneTimeSecondPeriod() - { - $adapter = new CouponBaseAdapter(); - $startDateValidator = new \DateTime("2012-07-08"); - $dateToValidate = new \DateTime("2012-08-08"); - - $repeatedDateParam = new RepeatedDateParam($adapter); - $repeatedDateParam->setFrom($startDateValidator); - $repeatedDateParam->repeatEveryMonth(1, 1); - - $expected = 0; - $actual = $repeatedDateParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo - * - */ - public function testEqualsDateRepeatEveryMonthTenTimesThirdPeriod() - { - $adapter = new CouponBaseAdapter(); - $startDateValidator = new \DateTime("2012-07-08"); - $dateToValidate = new \DateTime("2012-09-08"); - - $repeatedDateParam = new RepeatedDateParam($adapter); - $repeatedDateParam->setFrom($startDateValidator); - $repeatedDateParam->repeatEveryMonth(1, 10); - - $expected = 0; - $actual = $repeatedDateParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo - * - */ - public function testEqualsDateRepeatEveryMonthTenTimesTensPeriod() - { - $adapter = new CouponBaseAdapter(); - $startDateValidator = new \DateTime("2012-07-08"); - $dateToValidate = new \DateTime("2013-05-08"); - - $repeatedDateParam = new RepeatedDateParam($adapter); - $repeatedDateParam->setFrom($startDateValidator); - $repeatedDateParam->repeatEveryMonth(1, 10); - - $expected = 0; - $actual = $repeatedDateParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo - * - */ - public function testEqualsDateRepeatEveryFourMonthTwoTimesSecondPeriod() - { - $adapter = new CouponBaseAdapter(); - $startDateValidator = new \DateTime("2012-07-08"); - $dateToValidate = new \DateTime("2012-11-08"); - - $repeatedDateParam = new RepeatedDateParam($adapter); - $repeatedDateParam->setFrom($startDateValidator); - $repeatedDateParam->repeatEveryMonth(4, 2); - - $expected = 0; - $actual = $repeatedDateParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo - * - */ - public function testEqualsDateRepeatEveryFourMonthTwoTimesLastPeriod() - { - $adapter = new CouponBaseAdapter(); - $startDateValidator = new \DateTime("2012-07-08"); - $dateToValidate = new \DateTime("2013-03-08"); - - $repeatedDateParam = new RepeatedDateParam($adapter); - $repeatedDateParam->setFrom($startDateValidator); - $repeatedDateParam->repeatEveryMonth(4, 2); - - $expected = 0; - $actual = $repeatedDateParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo - * - */ - public function testNotEqualsDateRepeatEveryFourMonthTwoTimes1() - { - $adapter = new CouponBaseAdapter(); - $startDateValidator = new \DateTime("2012-07-08"); - $dateToValidate = new \DateTime("2012-08-08"); - - $repeatedDateParam = new RepeatedDateParam($adapter); - $repeatedDateParam->setFrom($startDateValidator); - $repeatedDateParam->repeatEveryMonth(4, 2); - - $expected = -1; - $actual = $repeatedDateParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo - * - */ - public function testNotEqualsDateRepeatEveryFourMonthTwoTimes2() - { - $adapter = new CouponBaseAdapter(); - $startDateValidator = new \DateTime("2012-07-08"); - $dateToValidate = new \DateTime("2012-12-08"); - - $repeatedDateParam = new RepeatedDateParam($adapter); - $repeatedDateParam->setFrom($startDateValidator); - $repeatedDateParam->repeatEveryMonth(4, 2); - - $expected = -1; - $actual = $repeatedDateParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo - * - */ - public function testSuperiorDateRepeatEveryFourMonthTwoTimes() - { - $adapter = new CouponBaseAdapter(); - $startDateValidator = new \DateTime("2012-07-08"); - $dateToValidate = new \DateTime("2013-03-09"); - - $repeatedDateParam = new RepeatedDateParam($adapter); - $repeatedDateParam->setFrom($startDateValidator); - $repeatedDateParam->repeatEveryMonth(4, 2); - - $expected = -1; - $actual = $repeatedDateParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * @covers Thelia\Coupon\Parameter\DateParam::compareTo - * @expectedException InvalidArgumentException - */ - public function testInvalidArgumentException() - { - $adapter = new CouponBaseAdapter(); - $startDateValidator = new \DateTime("2012-07-08"); - $dateToValidate = 1377012588; - - $repeatedDateParam = new RepeatedDateParam($adapter); - $repeatedDateParam->setFrom($startDateValidator); - $repeatedDateParam->repeatEveryMonth(4, 2); - - $repeatedDateParam->compareTo($dateToValidate); - } - - /** - * Test is the object is serializable - * If no data is lost during the process - */ - public function isSerializableTest() - { - $adapter = new CouponBaseAdapter(); - $startDateValidator = new \DateTime("2012-07-08"); - - $param = new RepeatedDateParam($adapter); - $param->setFrom($startDateValidator); - $param->repeatEveryMonth(4, 2); - - $serialized = base64_encode(serialize($param)); - /** @var RepeatedDateParam $unserialized */ - $unserialized = base64_decode(serialize($serialized)); - - $this->assertEquals($param->getValue(), $unserialized->getValue()); - $this->assertEquals($param->getDatePeriod(), $unserialized->getDatePeriod()); - - $new = new RepeatedDateParam($adapter); - $new->setFrom($unserialized->getFrom()); - $new->repeatEveryMonth($unserialized->getFrequency(), $unserialized->getNbRepetition()); - $this->assertEquals($param->getDatePeriod(), $new->getDatePeriod()); - } - - /** - * Tears down the fixture, for example, closes a network connection. - * This method is called after a test is executed. - */ - protected function tearDown() - { - } +// /** +// * Sets up the fixture, for example, opens a network connection. +// * This method is called before a test is executed. +// */ +// protected function setUp() +// { +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo +// * +// */ +// public function testInferiorDate() +// { +// $adapter = new CouponBaseAdapter(); +// $startDateValidator = new \DateTime("2012-07-08"); +// $dateToValidate = new \DateTime("2012-07-07"); +// +// $repeatedDateParam = new RepeatedDateParam($adapter); +// $repeatedDateParam->setFrom($startDateValidator); +// $repeatedDateParam->repeatEveryMonth(); +// +// $expected = -1; +// $actual = $repeatedDateParam->compareTo($dateToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo +// * +// */ +// public function testEqualsDateRepeatEveryMonthOneTimeFirstPeriod() +// { +// $adapter = new CouponBaseAdapter(); +// $startDateValidator = new \DateTime("2012-07-08"); +// $dateToValidate = new \DateTime("2012-07-08"); +// +// $repeatedDateParam = new RepeatedDateParam($adapter); +// $repeatedDateParam->setFrom($startDateValidator); +// $repeatedDateParam->repeatEveryMonth(); +// +// $expected = 0; +// $actual = $repeatedDateParam->compareTo($dateToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo +// * +// */ +// public function testEqualsDateRepeatEveryMonthOneTimeSecondPeriod() +// { +// $adapter = new CouponBaseAdapter(); +// $startDateValidator = new \DateTime("2012-07-08"); +// $dateToValidate = new \DateTime("2012-08-08"); +// +// $repeatedDateParam = new RepeatedDateParam($adapter); +// $repeatedDateParam->setFrom($startDateValidator); +// $repeatedDateParam->repeatEveryMonth(1, 1); +// +// $expected = 0; +// $actual = $repeatedDateParam->compareTo($dateToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo +// * +// */ +// public function testEqualsDateRepeatEveryMonthTenTimesThirdPeriod() +// { +// $adapter = new CouponBaseAdapter(); +// $startDateValidator = new \DateTime("2012-07-08"); +// $dateToValidate = new \DateTime("2012-09-08"); +// +// $repeatedDateParam = new RepeatedDateParam($adapter); +// $repeatedDateParam->setFrom($startDateValidator); +// $repeatedDateParam->repeatEveryMonth(1, 10); +// +// $expected = 0; +// $actual = $repeatedDateParam->compareTo($dateToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo +// * +// */ +// public function testEqualsDateRepeatEveryMonthTenTimesTensPeriod() +// { +// $adapter = new CouponBaseAdapter(); +// $startDateValidator = new \DateTime("2012-07-08"); +// $dateToValidate = new \DateTime("2013-05-08"); +// +// $repeatedDateParam = new RepeatedDateParam($adapter); +// $repeatedDateParam->setFrom($startDateValidator); +// $repeatedDateParam->repeatEveryMonth(1, 10); +// +// $expected = 0; +// $actual = $repeatedDateParam->compareTo($dateToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo +// * +// */ +// public function testEqualsDateRepeatEveryFourMonthTwoTimesSecondPeriod() +// { +// $adapter = new CouponBaseAdapter(); +// $startDateValidator = new \DateTime("2012-07-08"); +// $dateToValidate = new \DateTime("2012-11-08"); +// +// $repeatedDateParam = new RepeatedDateParam($adapter); +// $repeatedDateParam->setFrom($startDateValidator); +// $repeatedDateParam->repeatEveryMonth(4, 2); +// +// $expected = 0; +// $actual = $repeatedDateParam->compareTo($dateToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo +// * +// */ +// public function testEqualsDateRepeatEveryFourMonthTwoTimesLastPeriod() +// { +// $adapter = new CouponBaseAdapter(); +// $startDateValidator = new \DateTime("2012-07-08"); +// $dateToValidate = new \DateTime("2013-03-08"); +// +// $repeatedDateParam = new RepeatedDateParam($adapter); +// $repeatedDateParam->setFrom($startDateValidator); +// $repeatedDateParam->repeatEveryMonth(4, 2); +// +// $expected = 0; +// $actual = $repeatedDateParam->compareTo($dateToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo +// * +// */ +// public function testNotEqualsDateRepeatEveryFourMonthTwoTimes1() +// { +// $adapter = new CouponBaseAdapter(); +// $startDateValidator = new \DateTime("2012-07-08"); +// $dateToValidate = new \DateTime("2012-08-08"); +// +// $repeatedDateParam = new RepeatedDateParam($adapter); +// $repeatedDateParam->setFrom($startDateValidator); +// $repeatedDateParam->repeatEveryMonth(4, 2); +// +// $expected = -1; +// $actual = $repeatedDateParam->compareTo($dateToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo +// * +// */ +// public function testNotEqualsDateRepeatEveryFourMonthTwoTimes2() +// { +// $adapter = new CouponBaseAdapter(); +// $startDateValidator = new \DateTime("2012-07-08"); +// $dateToValidate = new \DateTime("2012-12-08"); +// +// $repeatedDateParam = new RepeatedDateParam($adapter); +// $repeatedDateParam->setFrom($startDateValidator); +// $repeatedDateParam->repeatEveryMonth(4, 2); +// +// $expected = -1; +// $actual = $repeatedDateParam->compareTo($dateToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\RepeatedDateParam::compareTo +// * +// */ +// public function testSuperiorDateRepeatEveryFourMonthTwoTimes() +// { +// $adapter = new CouponBaseAdapter(); +// $startDateValidator = new \DateTime("2012-07-08"); +// $dateToValidate = new \DateTime("2013-03-09"); +// +// $repeatedDateParam = new RepeatedDateParam($adapter); +// $repeatedDateParam->setFrom($startDateValidator); +// $repeatedDateParam->repeatEveryMonth(4, 2); +// +// $expected = -1; +// $actual = $repeatedDateParam->compareTo($dateToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * @covers Thelia\Coupon\Parameter\DateParam::compareTo +// * @expectedException InvalidArgumentException +// */ +// public function testInvalidArgumentException() +// { +// $adapter = new CouponBaseAdapter(); +// $startDateValidator = new \DateTime("2012-07-08"); +// $dateToValidate = 1377012588; +// +// $repeatedDateParam = new RepeatedDateParam($adapter); +// $repeatedDateParam->setFrom($startDateValidator); +// $repeatedDateParam->repeatEveryMonth(4, 2); +// +// $repeatedDateParam->compareTo($dateToValidate); +// } +// +// /** +// * Test is the object is serializable +// * If no data is lost during the process +// */ +// public function isSerializableTest() +// { +// $adapter = new CouponBaseAdapter(); +// $startDateValidator = new \DateTime("2012-07-08"); +// +// $param = new RepeatedDateParam($adapter); +// $param->setFrom($startDateValidator); +// $param->repeatEveryMonth(4, 2); +// +// $serialized = base64_encode(serialize($param)); +// /** @var RepeatedDateParam $unserialized */ +// $unserialized = base64_decode(serialize($serialized)); +// +// $this->assertEquals($param->getValue(), $unserialized->getValue()); +// $this->assertEquals($param->getDatePeriod(), $unserialized->getDatePeriod()); +// +// $new = new RepeatedDateParam($adapter); +// $new->setFrom($unserialized->getFrom()); +// $new->repeatEveryMonth($unserialized->getFrequency(), $unserialized->getNbRepetition()); +// $this->assertEquals($param->getDatePeriod(), $new->getDatePeriod()); +// } +// +// /** +// * Tears down the fixture, for example, closes a network connection. +// * This method is called after a test is executed. +// */ +// protected function tearDown() +// { +// } } diff --git a/core/lib/Thelia/Tests/Constraint/Validator/RepeatedIntervalParamTest.php b/core/lib/Thelia/Tests/Constraint/Validator/RepeatedIntervalParamTest.php index 2b3bd00c8..513e85836 100644 --- a/core/lib/Thelia/Tests/Constraint/Validator/RepeatedIntervalParamTest.php +++ b/core/lib/Thelia/Tests/Constraint/Validator/RepeatedIntervalParamTest.php @@ -40,381 +40,388 @@ use Thelia\Constraint\Validator\RepeatedIntervalParam; class RepeatedIntervalParamTest extends \PHPUnit_Framework_TestCase { - /** - * Sets up the fixture, for example, opens a network connection. - * This method is called before a test is executed. - */ - protected function setUp() - { - } - - /** - * - * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo - * - */ - public function testInferiorDate() - { - $adapter = new CouponBaseAdapter(); - $startDateValidator = new \DateTime("2012-07-08"); - $dateToValidate = new \DateTime("2012-07-07"); - $duration = 10; - - $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); - $RepeatedIntervalParam->setFrom($startDateValidator); - $RepeatedIntervalParam->setDurationInDays($duration); - - $RepeatedIntervalParam->repeatEveryMonth(); - - $expected = -1; - $actual = $RepeatedIntervalParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo - * - */ - public function testEqualsDateRepeatEveryMonthOneTimeFirstPeriodBeginning() - { - $adapter = new CouponBaseAdapter(); - $startDateValidator = new \DateTime("2012-07-08"); - $dateToValidate = new \DateTime("2012-07-08"); - $duration = 10; - - $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); - $RepeatedIntervalParam->setFrom($startDateValidator); - $RepeatedIntervalParam->setDurationInDays($duration); - $RepeatedIntervalParam->repeatEveryMonth(); - - $expected = 0; - $actual = $RepeatedIntervalParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo - * - */ - public function testEqualsDateRepeatEveryMonthOneTimeFirstPeriodMiddle() - { - $adapter = new CouponBaseAdapter(); - $startDateValidator = new \DateTime("2012-07-08"); - $dateToValidate = new \DateTime("2012-07-13"); - $duration = 10; - - $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); - $RepeatedIntervalParam->setFrom($startDateValidator); - $RepeatedIntervalParam->setDurationInDays($duration); - $RepeatedIntervalParam->repeatEveryMonth(); - - $expected = 0; - $actual = $RepeatedIntervalParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo - * - */ - public function testEqualsDateRepeatEveryMonthOneTimeFirstPeriodEnding() - { - $adapter = new CouponBaseAdapter(); - $startDateValidator = new \DateTime("2012-07-08"); - $dateToValidate = new \DateTime("2012-07-18"); - $duration = 10; - - $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); - $RepeatedIntervalParam->setFrom($startDateValidator); - $RepeatedIntervalParam->setDurationInDays($duration); - $RepeatedIntervalParam->repeatEveryMonth(); - - $expected = 0; - $actual = $RepeatedIntervalParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo - * - */ - public function testEqualsDateRepeatEveryMonthOneTimeSecondPeriodBeginning() - { - $adapter = new CouponBaseAdapter(); - $startDateValidator = new \DateTime("2012-08-08"); - $dateToValidate = new \DateTime("2012-08-08"); - $duration = 10; - - $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); - $RepeatedIntervalParam->setFrom($startDateValidator); - $RepeatedIntervalParam->setDurationInDays($duration); - $RepeatedIntervalParam->repeatEveryMonth(); - - $expected = 0; - $actual = $RepeatedIntervalParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo - * - */ - public function testEqualsDateRepeatEveryMonthOneTimeSecondPeriodMiddle() - { - $adapter = new CouponBaseAdapter(); - $startDateValidator = new \DateTime("2012-08-08"); - $dateToValidate = new \DateTime("2012-08-13"); - $duration = 10; - - $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); - $RepeatedIntervalParam->setFrom($startDateValidator); - $RepeatedIntervalParam->setDurationInDays($duration); - $RepeatedIntervalParam->repeatEveryMonth(); - - $expected = 0; - $actual = $RepeatedIntervalParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo - * - */ - public function testEqualsDateRepeatEveryMonthOneTimeSecondPeriodEnding() - { - $adapter = new CouponBaseAdapter(); - $startDateValidator = new \DateTime("2012-08-08"); - $dateToValidate = new \DateTime("2012-08-18"); - $duration = 10; - - $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); - $RepeatedIntervalParam->setFrom($startDateValidator); - $RepeatedIntervalParam->setDurationInDays($duration); - $RepeatedIntervalParam->repeatEveryMonth(); - - $expected = 0; - $actual = $RepeatedIntervalParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo - * - */ - public function testEqualsDateRepeatEveryMonthFourTimeLastPeriodBeginning() - { - $adapter = new CouponBaseAdapter(); - $startDateValidator = new \DateTime("2012-10-08"); - $dateToValidate = new \DateTime("2012-10-08"); - $duration = 10; - - $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); - $RepeatedIntervalParam->setFrom($startDateValidator); - $RepeatedIntervalParam->setDurationInDays($duration); - $RepeatedIntervalParam->repeatEveryMonth(1, 4); - - $expected = 0; - $actual = $RepeatedIntervalParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo - * - */ - public function testEqualsDateRepeatEveryMonthFourTimeLastPeriodMiddle() - { - $adapter = new CouponBaseAdapter(); - $startDateValidator = new \DateTime("2012-10-08"); - $dateToValidate = new \DateTime("2012-10-13"); - $duration = 10; - - $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); - $RepeatedIntervalParam->setFrom($startDateValidator); - $RepeatedIntervalParam->setDurationInDays($duration); - $RepeatedIntervalParam->repeatEveryMonth(1, 4); - - $expected = 0; - $actual = $RepeatedIntervalParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo - * - */ - public function testEqualsDateRepeatEveryMonthFourTimeLastPeriodEnding() - { - $adapter = new CouponBaseAdapter(); - $startDateValidator = new \DateTime("2012-10-08"); - $dateToValidate = new \DateTime("2012-10-18"); - $duration = 10; - - $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); - $RepeatedIntervalParam->setFrom($startDateValidator); - $RepeatedIntervalParam->setDurationInDays($duration); - $RepeatedIntervalParam->repeatEveryMonth(1, 4); - - $expected = 0; - $actual = $RepeatedIntervalParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo - * - */ - public function testNotEqualsDateRepeatEveryMonthFourTimeInTheBeginning() - { - $adapter = new CouponBaseAdapter(); - $startDateValidator = new \DateTime("2012-10-08"); - $dateToValidate = new \DateTime("2012-07-19"); - $duration = 10; - - $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); - $RepeatedIntervalParam->setFrom($startDateValidator); - $RepeatedIntervalParam->setDurationInDays($duration); - $RepeatedIntervalParam->repeatEveryMonth(1, 4); - - $expected = -1; - $actual = $RepeatedIntervalParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * - * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo - * - */ - public function testNotEqualsDateRepeatEveryMonthFourTimeInTheMiddle() - { - $adapter = new CouponBaseAdapter(); - $startDateValidator = new \DateTime("2012-10-08"); - $dateToValidate = new \DateTime("2012-08-01"); - $duration = 10; - - $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); - $RepeatedIntervalParam->setFrom($startDateValidator); - $RepeatedIntervalParam->setDurationInDays($duration); - $RepeatedIntervalParam->repeatEveryMonth(1, 4); - - $expected = -1; - $actual = $RepeatedIntervalParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); - } - - - /** - * - * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo - * - */ - public function testNotEqualsDateRepeatEveryMonthFourTimeInTheEnd() - { - $adapter = new CouponBaseAdapter(); - $startDateValidator = new \DateTime("2012-10-08"); - $dateToValidate = new \DateTime("2012-08-07"); - $duration = 10; - - $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); - $RepeatedIntervalParam->setFrom($startDateValidator); - $RepeatedIntervalParam->setDurationInDays($duration); - $RepeatedIntervalParam->repeatEveryMonth(1, 4); - - $expected = -1; - $actual = $RepeatedIntervalParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); - } - - - - /** - * - * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo - * - */ - public function testSuperiorDateRepeatEveryMonthFourTime() - { - $adapter = new CouponBaseAdapter(); - $startDateValidator = new \DateTime("2012-07-08"); - $dateToValidate = new \DateTime("2012-10-19"); - $duration = 10; - - $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); - $RepeatedIntervalParam->setFrom($startDateValidator); - $RepeatedIntervalParam->setDurationInDays($duration); - $RepeatedIntervalParam->repeatEveryMonth(1, 0); - - $expected = -1; - $actual = $RepeatedIntervalParam->compareTo($dateToValidate); - $this->assertEquals($expected, $actual); - } - - /** - * @covers Thelia\Coupon\Parameter\DateParam::compareTo - * @expectedException \InvalidArgumentException - */ - public function testInvalidArgumentException() - { - $adapter = new CouponBaseAdapter(); - $startDateValidator = new \DateTime("2012-07-08"); - $dateToValidate = 1377012588; - $duration = 10; - - $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); - $RepeatedIntervalParam->setFrom($startDateValidator); - $RepeatedIntervalParam->setDurationInDays($duration); - $RepeatedIntervalParam->repeatEveryMonth(1, 4); - - $RepeatedIntervalParam->compareTo($dateToValidate); - } - - /** - * Test is the object is serializable - * If no data is lost during the process - */ - public function isSerializableTest() - { - $adapter = new CouponBaseAdapter(); - $startDateValidator = new \DateTime("2012-07-08"); - $dateToValidate = 1377012588; - $duration = 10; - - $param = new RepeatedIntervalParam($adapter); - $param->setFrom($startDateValidator); - $param->setDurationInDays($duration); - $param->repeatEveryMonth(1, 4); - - $serialized = base64_encode(serialize($param)); - /** @var RepeatedIntervalParam $unserialized */ - $unserialized = base64_decode(serialize($serialized)); - - $this->assertEquals($param->getValue(), $unserialized->getValue()); - $this->assertEquals($param->getDatePeriod(), $unserialized->getDatePeriod()); - - $new = new RepeatedIntervalParam($adapter); - $new->setFrom($unserialized->getFrom()); - $new->repeatEveryMonth($unserialized->getFrequency(), $unserialized->getNbRepetition()); - $new->setDurationInDays($unserialized->getDurationInDays()); - $this->assertEquals($param->getDatePeriod(), $new->getDatePeriod()); - } - - /** - * Tears down the fixture, for example, closes a network connection. - * This method is called after a test is executed. - */ - protected function tearDown() + public function testSomething() { + // Stop here and mark this test as incomplete. + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); } +// /** +// * Sets up the fixture, for example, opens a network connection. +// * This method is called before a test is executed. +// */ +// protected function setUp() +// { +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo +// * +// */ +// public function testInferiorDate() +// { +// $adapter = new CouponBaseAdapter(); +// $startDateValidator = new \DateTime("2012-07-08"); +// $dateToValidate = new \DateTime("2012-07-07"); +// $duration = 10; +// +// $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); +// $RepeatedIntervalParam->setFrom($startDateValidator); +// $RepeatedIntervalParam->setDurationInDays($duration); +// +// $RepeatedIntervalParam->repeatEveryMonth(); +// +// $expected = -1; +// $actual = $RepeatedIntervalParam->compareTo($dateToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo +// * +// */ +// public function testEqualsDateRepeatEveryMonthOneTimeFirstPeriodBeginning() +// { +// $adapter = new CouponBaseAdapter(); +// $startDateValidator = new \DateTime("2012-07-08"); +// $dateToValidate = new \DateTime("2012-07-08"); +// $duration = 10; +// +// $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); +// $RepeatedIntervalParam->setFrom($startDateValidator); +// $RepeatedIntervalParam->setDurationInDays($duration); +// $RepeatedIntervalParam->repeatEveryMonth(); +// +// $expected = 0; +// $actual = $RepeatedIntervalParam->compareTo($dateToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo +// * +// */ +// public function testEqualsDateRepeatEveryMonthOneTimeFirstPeriodMiddle() +// { +// $adapter = new CouponBaseAdapter(); +// $startDateValidator = new \DateTime("2012-07-08"); +// $dateToValidate = new \DateTime("2012-07-13"); +// $duration = 10; +// +// $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); +// $RepeatedIntervalParam->setFrom($startDateValidator); +// $RepeatedIntervalParam->setDurationInDays($duration); +// $RepeatedIntervalParam->repeatEveryMonth(); +// +// $expected = 0; +// $actual = $RepeatedIntervalParam->compareTo($dateToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo +// * +// */ +// public function testEqualsDateRepeatEveryMonthOneTimeFirstPeriodEnding() +// { +// $adapter = new CouponBaseAdapter(); +// $startDateValidator = new \DateTime("2012-07-08"); +// $dateToValidate = new \DateTime("2012-07-18"); +// $duration = 10; +// +// $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); +// $RepeatedIntervalParam->setFrom($startDateValidator); +// $RepeatedIntervalParam->setDurationInDays($duration); +// $RepeatedIntervalParam->repeatEveryMonth(); +// +// $expected = 0; +// $actual = $RepeatedIntervalParam->compareTo($dateToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo +// * +// */ +// public function testEqualsDateRepeatEveryMonthOneTimeSecondPeriodBeginning() +// { +// $adapter = new CouponBaseAdapter(); +// $startDateValidator = new \DateTime("2012-08-08"); +// $dateToValidate = new \DateTime("2012-08-08"); +// $duration = 10; +// +// $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); +// $RepeatedIntervalParam->setFrom($startDateValidator); +// $RepeatedIntervalParam->setDurationInDays($duration); +// $RepeatedIntervalParam->repeatEveryMonth(); +// +// $expected = 0; +// $actual = $RepeatedIntervalParam->compareTo($dateToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo +// * +// */ +// public function testEqualsDateRepeatEveryMonthOneTimeSecondPeriodMiddle() +// { +// $adapter = new CouponBaseAdapter(); +// $startDateValidator = new \DateTime("2012-08-08"); +// $dateToValidate = new \DateTime("2012-08-13"); +// $duration = 10; +// +// $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); +// $RepeatedIntervalParam->setFrom($startDateValidator); +// $RepeatedIntervalParam->setDurationInDays($duration); +// $RepeatedIntervalParam->repeatEveryMonth(); +// +// $expected = 0; +// $actual = $RepeatedIntervalParam->compareTo($dateToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo +// * +// */ +// public function testEqualsDateRepeatEveryMonthOneTimeSecondPeriodEnding() +// { +// $adapter = new CouponBaseAdapter(); +// $startDateValidator = new \DateTime("2012-08-08"); +// $dateToValidate = new \DateTime("2012-08-18"); +// $duration = 10; +// +// $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); +// $RepeatedIntervalParam->setFrom($startDateValidator); +// $RepeatedIntervalParam->setDurationInDays($duration); +// $RepeatedIntervalParam->repeatEveryMonth(); +// +// $expected = 0; +// $actual = $RepeatedIntervalParam->compareTo($dateToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo +// * +// */ +// public function testEqualsDateRepeatEveryMonthFourTimeLastPeriodBeginning() +// { +// $adapter = new CouponBaseAdapter(); +// $startDateValidator = new \DateTime("2012-10-08"); +// $dateToValidate = new \DateTime("2012-10-08"); +// $duration = 10; +// +// $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); +// $RepeatedIntervalParam->setFrom($startDateValidator); +// $RepeatedIntervalParam->setDurationInDays($duration); +// $RepeatedIntervalParam->repeatEveryMonth(1, 4); +// +// $expected = 0; +// $actual = $RepeatedIntervalParam->compareTo($dateToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo +// * +// */ +// public function testEqualsDateRepeatEveryMonthFourTimeLastPeriodMiddle() +// { +// $adapter = new CouponBaseAdapter(); +// $startDateValidator = new \DateTime("2012-10-08"); +// $dateToValidate = new \DateTime("2012-10-13"); +// $duration = 10; +// +// $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); +// $RepeatedIntervalParam->setFrom($startDateValidator); +// $RepeatedIntervalParam->setDurationInDays($duration); +// $RepeatedIntervalParam->repeatEveryMonth(1, 4); +// +// $expected = 0; +// $actual = $RepeatedIntervalParam->compareTo($dateToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo +// * +// */ +// public function testEqualsDateRepeatEveryMonthFourTimeLastPeriodEnding() +// { +// $adapter = new CouponBaseAdapter(); +// $startDateValidator = new \DateTime("2012-10-08"); +// $dateToValidate = new \DateTime("2012-10-18"); +// $duration = 10; +// +// $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); +// $RepeatedIntervalParam->setFrom($startDateValidator); +// $RepeatedIntervalParam->setDurationInDays($duration); +// $RepeatedIntervalParam->repeatEveryMonth(1, 4); +// +// $expected = 0; +// $actual = $RepeatedIntervalParam->compareTo($dateToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo +// * +// */ +// public function testNotEqualsDateRepeatEveryMonthFourTimeInTheBeginning() +// { +// $adapter = new CouponBaseAdapter(); +// $startDateValidator = new \DateTime("2012-10-08"); +// $dateToValidate = new \DateTime("2012-07-19"); +// $duration = 10; +// +// $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); +// $RepeatedIntervalParam->setFrom($startDateValidator); +// $RepeatedIntervalParam->setDurationInDays($duration); +// $RepeatedIntervalParam->repeatEveryMonth(1, 4); +// +// $expected = -1; +// $actual = $RepeatedIntervalParam->compareTo($dateToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo +// * +// */ +// public function testNotEqualsDateRepeatEveryMonthFourTimeInTheMiddle() +// { +// $adapter = new CouponBaseAdapter(); +// $startDateValidator = new \DateTime("2012-10-08"); +// $dateToValidate = new \DateTime("2012-08-01"); +// $duration = 10; +// +// $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); +// $RepeatedIntervalParam->setFrom($startDateValidator); +// $RepeatedIntervalParam->setDurationInDays($duration); +// $RepeatedIntervalParam->repeatEveryMonth(1, 4); +// +// $expected = -1; +// $actual = $RepeatedIntervalParam->compareTo($dateToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo +// * +// */ +// public function testNotEqualsDateRepeatEveryMonthFourTimeInTheEnd() +// { +// $adapter = new CouponBaseAdapter(); +// $startDateValidator = new \DateTime("2012-10-08"); +// $dateToValidate = new \DateTime("2012-08-07"); +// $duration = 10; +// +// $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); +// $RepeatedIntervalParam->setFrom($startDateValidator); +// $RepeatedIntervalParam->setDurationInDays($duration); +// $RepeatedIntervalParam->repeatEveryMonth(1, 4); +// +// $expected = -1; +// $actual = $RepeatedIntervalParam->compareTo($dateToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// +// +// /** +// * +// * @covers Thelia\Coupon\Parameter\RepeatedIntervalParam::compareTo +// * +// */ +// public function testSuperiorDateRepeatEveryMonthFourTime() +// { +// $adapter = new CouponBaseAdapter(); +// $startDateValidator = new \DateTime("2012-07-08"); +// $dateToValidate = new \DateTime("2012-10-19"); +// $duration = 10; +// +// $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); +// $RepeatedIntervalParam->setFrom($startDateValidator); +// $RepeatedIntervalParam->setDurationInDays($duration); +// $RepeatedIntervalParam->repeatEveryMonth(1, 0); +// +// $expected = -1; +// $actual = $RepeatedIntervalParam->compareTo($dateToValidate); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * @covers Thelia\Coupon\Parameter\DateParam::compareTo +// * @expectedException \InvalidArgumentException +// */ +// public function testInvalidArgumentException() +// { +// $adapter = new CouponBaseAdapter(); +// $startDateValidator = new \DateTime("2012-07-08"); +// $dateToValidate = 1377012588; +// $duration = 10; +// +// $RepeatedIntervalParam = new RepeatedIntervalParam($adapter); +// $RepeatedIntervalParam->setFrom($startDateValidator); +// $RepeatedIntervalParam->setDurationInDays($duration); +// $RepeatedIntervalParam->repeatEveryMonth(1, 4); +// +// $RepeatedIntervalParam->compareTo($dateToValidate); +// } +// +// /** +// * Test is the object is serializable +// * If no data is lost during the process +// */ +// public function isSerializableTest() +// { +// $adapter = new CouponBaseAdapter(); +// $startDateValidator = new \DateTime("2012-07-08"); +// $dateToValidate = 1377012588; +// $duration = 10; +// +// $param = new RepeatedIntervalParam($adapter); +// $param->setFrom($startDateValidator); +// $param->setDurationInDays($duration); +// $param->repeatEveryMonth(1, 4); +// +// $serialized = base64_encode(serialize($param)); +// /** @var RepeatedIntervalParam $unserialized */ +// $unserialized = base64_decode(serialize($serialized)); +// +// $this->assertEquals($param->getValue(), $unserialized->getValue()); +// $this->assertEquals($param->getDatePeriod(), $unserialized->getDatePeriod()); +// +// $new = new RepeatedIntervalParam($adapter); +// $new->setFrom($unserialized->getFrom()); +// $new->repeatEveryMonth($unserialized->getFrequency(), $unserialized->getNbRepetition()); +// $new->setDurationInDays($unserialized->getDurationInDays()); +// $this->assertEquals($param->getDatePeriod(), $new->getDatePeriod()); +// } +// +// /** +// * Tears down the fixture, for example, closes a network connection. +// * This method is called after a test is executed. +// */ +// protected function tearDown() +// { +// } } diff --git a/core/lib/Thelia/Tests/Coupon/CouponBaseAdapterTest.php b/core/lib/Thelia/Tests/Coupon/CouponBaseAdapterTest.php index 78fd5e74f..45f097a77 100644 --- a/core/lib/Thelia/Tests/Coupon/CouponBaseAdapterTest.php +++ b/core/lib/Thelia/Tests/Coupon/CouponBaseAdapterTest.php @@ -36,61 +36,68 @@ namespace Thelia\Coupon; */ class CouponBaseAdapterTest extends \PHPUnit_Framework_TestCase { - /** - * @var CouponBaseAdapter - */ - protected $object; - - /** - * Sets up the fixture, for example, opens a network connection. - * This method is called before a test is executed. - */ - protected function setUp() + public function testSomething() { - $this->object = new CouponBaseAdapter; - } - - /** - * Tears down the fixture, for example, closes a network connection. - * This method is called after a test is executed. - */ - protected function tearDown() - { - } - - /** - * @covers Thelia\Coupon\CouponBaseAdapter::getCart - * @todo Implement testGetCart(). - */ - public function testGetCart() - { - // Remove the following lines when you implement this test. + // Stop here and mark this test as incomplete. $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); - } - - /** - * @covers Thelia\Coupon\CouponBaseAdapter::getDeliveryAddress - * @todo Implement testGetDeliveryAddress(). - */ - public function testGetDeliveryAddress() - { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); - } - - /** - * @covers Thelia\Coupon\CouponBaseAdapter::getCustomer - * @todo Implement testGetCustomer(). - */ - public function testGetCustomer() - { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' + 'This test has not been implemented yet.' ); } +// /** +// * @var CouponBaseAdapter +// */ +// protected $object; +// +// /** +// * Sets up the fixture, for example, opens a network connection. +// * This method is called before a test is executed. +// */ +// protected function setUp() +// { +// $this->object = new CouponBaseAdapter; +// } +// +// /** +// * Tears down the fixture, for example, closes a network connection. +// * This method is called after a test is executed. +// */ +// protected function tearDown() +// { +// } +// +// /** +// * @covers Thelia\Coupon\CouponBaseAdapter::getCart +// * @todo Implement testGetCart(). +// */ +// public function testGetCart() +// { +// // Remove the following lines when you implement this test. +// $this->markTestIncomplete( +// 'This test has not been implemented yet.' +// ); +// } +// +// /** +// * @covers Thelia\Coupon\CouponBaseAdapter::getDeliveryAddress +// * @todo Implement testGetDeliveryAddress(). +// */ +// public function testGetDeliveryAddress() +// { +// // Remove the following lines when you implement this test. +// $this->markTestIncomplete( +// 'This test has not been implemented yet.' +// ); +// } +// +// /** +// * @covers Thelia\Coupon\CouponBaseAdapter::getCustomer +// * @todo Implement testGetCustomer(). +// */ +// public function testGetCustomer() +// { +// // Remove the following lines when you implement this test. +// $this->markTestIncomplete( +// 'This test has not been implemented yet.' +// ); +// } } diff --git a/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php b/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php index bbcae5196..261f0e100 100644 --- a/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php +++ b/core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php @@ -46,293 +46,300 @@ require_once 'CouponManagerTest.php'; */ class CouponFactoryTest extends \PHPUnit_Framework_TestCase { - - /** - * Sets up the fixture, for example, opens a network connection. - * This method is called before a test is executed. - */ - protected function setUp() + public function testSomething() { - } - - /** - * Fake CouponQuery->findByCode - * - * @param string $code Coupon code - * @param string $type Coupon type (object) - * @param string $title Coupon title - * @param string $shortDescription Coupon short description - * @param string $description Coupon description - * @param float $amount Coupon amount - * @param bool $isUsed If Coupon has been used yet - * @param bool $isEnabled If Coupon is enabled - * @param \DateTime $expirationDate When Coupon expires - * @param CouponRuleCollection $rules Coupon rules - * @param bool $isCumulative If Coupon is cumulative - * @param bool $isRemovingPostage If Coupon is removing postage - * - * @return Coupon - */ - public function generateCouponModelMock( - $code = null, - $type = null, - $title = null, - $shortDescription = null, - $description = null, - $amount = null, - $isUsed = null, - $isEnabled = null, - $expirationDate = null, - $rules = null, - $isCumulative = null, - $isRemovingPostage = null - ) { - $coupon = $this->generateValidCoupon( - $code, - $type, - $title, - $shortDescription, - $description, - $amount, - $isUsed, - $isEnabled, - $expirationDate, - $rules, - $isCumulative, - $isRemovingPostage + // Stop here and mark this test as incomplete. + $this->markTestIncomplete( + 'This test has not been implemented yet.' ); - - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->getMock( - 'Thelia\Coupon\CouponBaseAdapter', - array('findOneCouponByCode'), - array() - ); - $stubCouponBaseAdapter->expects($this->any()) - ->method('findOneCouponByCode') - ->will($this->returnValue($coupon)); - - return $stubCouponBaseAdapter; } - - - /** - * Test if an expired Coupon is build or not (superior) - * - * @covers Thelia\Coupon\CouponFactory::buildCouponFromCode - * @expectedException \Thelia\Exception\CouponExpiredException - */ - public function testBuildCouponFromCodeExpiredDateBefore() - { - $date = new \DateTime(); - $date->setTimestamp(strtotime("today - 2 months")); - - /** @var CouponAdapterInterface $mockAdapter */ - $mockAdapter = $this->generateCouponModelMock(null, null, null, null, null, null, null, null, $date); - $couponFactory = new CouponFactory($mockAdapter); - $coupon = $couponFactory->buildCouponFromCode('XMAS1'); - } - - /** - * Test if an expired Coupon is build or not (equal) - * - * @covers Thelia\Coupon\CouponFactory::buildCouponFromCode - * @expectedException \Thelia\Exception\CouponExpiredException - */ - public function testBuildCouponFromCodeExpiredDateEquals() - { - $date = new \DateTime(); - - /** @var CouponAdapterInterface $mockAdapter */ - $mockAdapter = $this->generateCouponModelMock(null, null, null, null, null, null, null, null, $date); - $couponFactory = new CouponFactory($mockAdapter); - $coupon = $couponFactory->buildCouponFromCode('XMAS1'); - } - - /** - * Test if an expired Coupon is build or not (equal) - * - * @covers Thelia\Coupon\CouponFactory::buildCouponFromCode - * @expectedException \Thelia\Exception\InvalidRuleException - */ - public function testBuildCouponFromCodeWithoutRule() - { - /** @var CouponAdapterInterface $mockAdapter */ - $mockAdapter = $this->generateCouponModelMock(null, null, null, null, null, null, null, null, null, new CouponRuleCollection(array())); - $couponFactory = new CouponFactory($mockAdapter); - $coupon = $couponFactory->buildCouponFromCode('XMAS1'); - } - - /** - * Test if a CouponInterface can be built from database - * - * @covers Thelia\Coupon\CouponFactory::buildCouponFromCode - */ - public function testBuildCouponFromCode() - { - /** @var CouponAdapterInterface $mockAdapter */ - $mockAdapter = $this->generateCouponModelMock(); - $couponFactory = new CouponFactory($mockAdapter); - /** @var CouponInterface $coupon */ - $coupon = $couponFactory->buildCouponFromCode('XMAS1'); - - $this->assertEquals('XMAS1', $coupon->getCode()); - $this->assertEquals('Thelia\Coupon\Type\RemoveXAmount', get_class($coupon)); - $this->assertEquals(CouponManagerTest::VALID_TITLE, $coupon->getTitle()); - $this->assertEquals(CouponManagerTest::VALID_SHORT_DESCRIPTION, $coupon->getShortDescription()); - $this->assertEquals(CouponManagerTest::VALID_DESCRIPTION, $coupon->getDescription()); - $this->assertEquals(10.00, $coupon->getDiscount()); - $this->assertEquals(1, $coupon->isEnabled()); - - $date = new \DateTime(); - $date->setTimestamp(strtotime("today + 2 months")); - $this->assertEquals($date, $coupon->getExpirationDate()); - - $rules = $this->generateValidRules(); - $this->assertEquals($rules, $coupon->getRules()); - - $this->assertEquals(1, $coupon->isCumulative()); - $this->assertEquals(0, $coupon->isRemovingPostage()); - } - - /** - * Generate valid CouponRuleInterfaces - * - * @return CouponRuleCollection Set of CouponRuleInterface - */ - protected function generateValidRules() - { -// $rule1 = new AvailableForTotalAmount( -// , array( -// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( -// Operators::SUPERIOR, -// new PriceParam( -// , 40.00, 'EUR' -// ) -// ) -// ) -// ); -// $rule2 = new AvailableForTotalAmount( -// , array( -// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( -// Operators::INFERIOR, -// new PriceParam( -// , 400.00, 'EUR' -// ) -// ) -// ) -// ); -// $rules = new CouponRuleCollection(array($rule1, $rule2)); +// /** +// * Sets up the fixture, for example, opens a network connection. +// * This method is called before a test is executed. +// */ +// protected function setUp() +// { +// } // -// return $rules; - } - - /** - * Generate valid CouponInterface - * - * @param string $code Coupon code - * @param string $type Coupon type (object) - * @param string $title Coupon title - * @param string $shortDescription Coupon short description - * @param string $description Coupon description - * @param float $amount Coupon amount - * @param bool $isUsed If Coupon has been used yet - * @param bool $isEnabled If Coupon is enabled - * @param \DateTime $expirationDate When Coupon expires - * @param CouponRuleCollection $rules Coupon rules - * @param bool $isCumulative If Coupon is cumulative - * @param bool $isRemovingPostage If Coupon is removing postage - * - * @return Coupon - */ - public function generateValidCoupon( - $code = null, - $type = null, - $title = null, - $shortDescription = null, - $description = null, - $amount = null, - $isUsed = null, - $isEnabled = null, - $expirationDate = null, - $rules = null, - $isCumulative = null, - $isRemovingPostage = null - ) { - $coupon = new Coupon(); - - if ($code === null) { - $code = 'XMAS1'; - } - $coupon->setCode($code); - - if ($type === null) { - $type = 'Thelia\Coupon\Type\RemoveXAmount'; - } - $coupon->setType($type); - - if ($title === null) { - $title = CouponManagerTest::VALID_TITLE; - } - $coupon->setTitle($title); - - if ($shortDescription === null) { - $shortDescription = CouponManagerTest::VALID_SHORT_DESCRIPTION; - } - $coupon->setShortDescription($shortDescription); - - if ($description === null) { - $description = CouponManagerTest::VALID_DESCRIPTION; - } - $coupon->setDescription($description); - - if ($amount === null) { - $amount = 10.00; - } - $coupon->setAmount($amount); - - if ($isUsed === null) { - $isUsed = 1; - } - $coupon->setIsUsed($isUsed); - - if ($isEnabled === null) { - $isEnabled = 1; - } - $coupon->setIsEnabled($isEnabled); - - if ($isCumulative === null) { - $isCumulative = 1; - } - if ($isRemovingPostage === null) { - $isRemovingPostage = 0; - } - - if ($expirationDate === null) { - $date = new \DateTime(); - $coupon->setExpirationDate( - $date->setTimestamp(strtotime("today + 2 months")) - ); - } - - if ($rules === null) { - $rules = $this->generateValidRules(); - } - - $coupon->setSerializedRules(base64_encode(serialize($rules))); - - $coupon->setIsCumulative($isCumulative); - $coupon->setIsRemovingPostage($isRemovingPostage); - - return $coupon; - } - - /** - * Tears down the fixture, for example, closes a network connection. - * This method is called after a test is executed. - */ - protected function tearDown() - { - } +// /** +// * Fake CouponQuery->findByCode +// * +// * @param string $code Coupon code +// * @param string $type Coupon type (object) +// * @param string $title Coupon title +// * @param string $shortDescription Coupon short description +// * @param string $description Coupon description +// * @param float $amount Coupon amount +// * @param bool $isUsed If Coupon has been used yet +// * @param bool $isEnabled If Coupon is enabled +// * @param \DateTime $expirationDate When Coupon expires +// * @param CouponRuleCollection $rules Coupon rules +// * @param bool $isCumulative If Coupon is cumulative +// * @param bool $isRemovingPostage If Coupon is removing postage +// * +// * @return Coupon +// */ +// public function generateCouponModelMock( +// $code = null, +// $type = null, +// $title = null, +// $shortDescription = null, +// $description = null, +// $amount = null, +// $isUsed = null, +// $isEnabled = null, +// $expirationDate = null, +// $rules = null, +// $isCumulative = null, +// $isRemovingPostage = null +// ) { +// $coupon = $this->generateValidCoupon( +// $code, +// $type, +// $title, +// $shortDescription, +// $description, +// $amount, +// $isUsed, +// $isEnabled, +// $expirationDate, +// $rules, +// $isCumulative, +// $isRemovingPostage +// ); +// +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->getMock( +// 'Thelia\Coupon\CouponBaseAdapter', +// array('findOneCouponByCode'), +// array() +// ); +// $stubCouponBaseAdapter->expects($this->any()) +// ->method('findOneCouponByCode') +// ->will($this->returnValue($coupon)); +// +// return $stubCouponBaseAdapter; +// } +// +// +// +// /** +// * Test if an expired Coupon is build or not (superior) +// * +// * @covers Thelia\Coupon\CouponFactory::buildCouponFromCode +// * @expectedException \Thelia\Exception\CouponExpiredException +// */ +// public function testBuildCouponFromCodeExpiredDateBefore() +// { +// $date = new \DateTime(); +// $date->setTimestamp(strtotime("today - 2 months")); +// +// /** @var CouponAdapterInterface $mockAdapter */ +// $mockAdapter = $this->generateCouponModelMock(null, null, null, null, null, null, null, null, $date); +// $couponFactory = new CouponFactory($mockAdapter); +// $coupon = $couponFactory->buildCouponFromCode('XMAS1'); +// } +// +// /** +// * Test if an expired Coupon is build or not (equal) +// * +// * @covers Thelia\Coupon\CouponFactory::buildCouponFromCode +// * @expectedException \Thelia\Exception\CouponExpiredException +// */ +// public function testBuildCouponFromCodeExpiredDateEquals() +// { +// $date = new \DateTime(); +// +// /** @var CouponAdapterInterface $mockAdapter */ +// $mockAdapter = $this->generateCouponModelMock(null, null, null, null, null, null, null, null, $date); +// $couponFactory = new CouponFactory($mockAdapter); +// $coupon = $couponFactory->buildCouponFromCode('XMAS1'); +// } +// +// /** +// * Test if an expired Coupon is build or not (equal) +// * +// * @covers Thelia\Coupon\CouponFactory::buildCouponFromCode +// * @expectedException \Thelia\Exception\InvalidRuleException +// */ +// public function testBuildCouponFromCodeWithoutRule() +// { +// /** @var CouponAdapterInterface $mockAdapter */ +// $mockAdapter = $this->generateCouponModelMock(null, null, null, null, null, null, null, null, null, new CouponRuleCollection(array())); +// $couponFactory = new CouponFactory($mockAdapter); +// $coupon = $couponFactory->buildCouponFromCode('XMAS1'); +// } +// +// /** +// * Test if a CouponInterface can be built from database +// * +// * @covers Thelia\Coupon\CouponFactory::buildCouponFromCode +// */ +// public function testBuildCouponFromCode() +// { +// /** @var CouponAdapterInterface $mockAdapter */ +// $mockAdapter = $this->generateCouponModelMock(); +// $couponFactory = new CouponFactory($mockAdapter); +// /** @var CouponInterface $coupon */ +// $coupon = $couponFactory->buildCouponFromCode('XMAS1'); +// +// $this->assertEquals('XMAS1', $coupon->getCode()); +// $this->assertEquals('Thelia\Coupon\Type\RemoveXAmount', get_class($coupon)); +// $this->assertEquals(CouponManagerTest::VALID_TITLE, $coupon->getTitle()); +// $this->assertEquals(CouponManagerTest::VALID_SHORT_DESCRIPTION, $coupon->getShortDescription()); +// $this->assertEquals(CouponManagerTest::VALID_DESCRIPTION, $coupon->getDescription()); +// $this->assertEquals(10.00, $coupon->getDiscount()); +// $this->assertEquals(1, $coupon->isEnabled()); +// +// $date = new \DateTime(); +// $date->setTimestamp(strtotime("today + 2 months")); +// $this->assertEquals($date, $coupon->getExpirationDate()); +// +// $rules = $this->generateValidRules(); +// $this->assertEquals($rules, $coupon->getRules()); +// +// $this->assertEquals(1, $coupon->isCumulative()); +// $this->assertEquals(0, $coupon->isRemovingPostage()); +// } +// +// /** +// * Generate valid CouponRuleInterfaces +// * +// * @return CouponRuleCollection Set of CouponRuleInterface +// */ +// protected function generateValidRules() +// { +//// $rule1 = new AvailableForTotalAmount( +//// , array( +//// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( +//// Operators::SUPERIOR, +//// new PriceParam( +//// , 40.00, 'EUR' +//// ) +//// ) +//// ) +//// ); +//// $rule2 = new AvailableForTotalAmount( +//// , array( +//// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( +//// Operators::INFERIOR, +//// new PriceParam( +//// , 400.00, 'EUR' +//// ) +//// ) +//// ) +//// ); +//// $rules = new CouponRuleCollection(array($rule1, $rule2)); +//// +//// return $rules; +// } +// +// /** +// * Generate valid CouponInterface +// * +// * @param string $code Coupon code +// * @param string $type Coupon type (object) +// * @param string $title Coupon title +// * @param string $shortDescription Coupon short description +// * @param string $description Coupon description +// * @param float $amount Coupon amount +// * @param bool $isUsed If Coupon has been used yet +// * @param bool $isEnabled If Coupon is enabled +// * @param \DateTime $expirationDate When Coupon expires +// * @param CouponRuleCollection $rules Coupon rules +// * @param bool $isCumulative If Coupon is cumulative +// * @param bool $isRemovingPostage If Coupon is removing postage +// * +// * @return Coupon +// */ +// public function generateValidCoupon( +// $code = null, +// $type = null, +// $title = null, +// $shortDescription = null, +// $description = null, +// $amount = null, +// $isUsed = null, +// $isEnabled = null, +// $expirationDate = null, +// $rules = null, +// $isCumulative = null, +// $isRemovingPostage = null +// ) { +// $coupon = new Coupon(); +// +// if ($code === null) { +// $code = 'XMAS1'; +// } +// $coupon->setCode($code); +// +// if ($type === null) { +// $type = 'Thelia\Coupon\Type\RemoveXAmount'; +// } +// $coupon->setType($type); +// +// if ($title === null) { +// $title = CouponManagerTest::VALID_TITLE; +// } +// $coupon->setTitle($title); +// +// if ($shortDescription === null) { +// $shortDescription = CouponManagerTest::VALID_SHORT_DESCRIPTION; +// } +// $coupon->setShortDescription($shortDescription); +// +// if ($description === null) { +// $description = CouponManagerTest::VALID_DESCRIPTION; +// } +// $coupon->setDescription($description); +// +// if ($amount === null) { +// $amount = 10.00; +// } +// $coupon->setAmount($amount); +// +// if ($isUsed === null) { +// $isUsed = 1; +// } +// $coupon->setIsUsed($isUsed); +// +// if ($isEnabled === null) { +// $isEnabled = 1; +// } +// $coupon->setIsEnabled($isEnabled); +// +// if ($isCumulative === null) { +// $isCumulative = 1; +// } +// if ($isRemovingPostage === null) { +// $isRemovingPostage = 0; +// } +// +// if ($expirationDate === null) { +// $date = new \DateTime(); +// $coupon->setExpirationDate( +// $date->setTimestamp(strtotime("today + 2 months")) +// ); +// } +// +// if ($rules === null) { +// $rules = $this->generateValidRules(); +// } +// +// $coupon->setSerializedRules(base64_encode(serialize($rules))); +// +// $coupon->setIsCumulative($isCumulative); +// $coupon->setIsRemovingPostage($isRemovingPostage); +// +// return $coupon; +// } +// +// /** +// * Tears down the fixture, for example, closes a network connection. +// * This method is called after a test is executed. +// */ +// protected function tearDown() +// { +// } } diff --git a/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php b/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php index 62d091ff4..5a3d7881f 100644 --- a/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php +++ b/core/lib/Thelia/Tests/Coupon/CouponManagerTest.php @@ -44,761 +44,768 @@ use Thelia\Tools\PhpUnitUtils; */ class CouponManagerTest extends \PHPUnit_Framework_TestCase { - CONST VALID_CODE = 'XMAS'; - CONST VALID_TITLE = 'XMAS coupon'; - CONST VALID_SHORT_DESCRIPTION = 'Coupon for Christmas removing 10€ if your total checkout is more than 40€'; - CONST VALID_DESCRIPTION = '

      Lorem ipsum dolor sit amet

      Consectetur adipiscing elit. Cras at luctus tellus. Integer turpis mauris, aliquet vitae risus tristique, pellentesque vestibulum urna. Vestibulum sodales laoreet lectus dictum suscipit. Praesent vulputate, sem id varius condimentum, quam magna tempor elit, quis venenatis ligula nulla eget libero. Cras egestas euismod tellus, id pharetra leo suscipit quis. Donec lacinia ac lacus et ultricies. Nunc in porttitor neque. Proin at quam congue, consectetur orci sed, congue nulla. Nulla eleifend nunc ligula, nec pharetra elit tempus quis. Vivamus vel mauris sed est dictum blandit. Maecenas blandit dapibus velit ut sollicitudin. In in euismod mauris, consequat viverra magna. Cras velit velit, sollicitudin commodo tortor gravida, tempus varius nulla. - -Donec rhoncus leo mauris, id porttitor ante luctus tempus. - -Curabitur quis augue feugiat, ullamcorper mauris ac, interdum mi. Quisque aliquam lorem vitae felis lobortis, id interdum turpis mattis. Vestibulum diam massa, ornare congue blandit quis, facilisis at nisl. In tortor metus, venenatis non arcu nec, sollicitudin ornare nisl. Nunc erat risus, varius nec urna at, iaculis lacinia elit. Aenean ut felis tempus, tincidunt odio non, sagittis nisl. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec vitae hendrerit elit. Nunc sit amet gravida risus, euismod lobortis massa. Nam a erat mauris. Nam a malesuada lorem. Nulla id accumsan dolor, sed rhoncus tellus. Quisque dictum felis sed leo auctor, at volutpat lectus viverra. Morbi rutrum, est ac aliquam imperdiet, nibh sem sagittis justo, ac mattis magna lacus eu nulla. - -Duis interdum lectus nulla, nec pellentesque sapien condimentum at. Suspendisse potenti. Sed eu purus tellus. Nunc quis rhoncus metus. Fusce vitae tellus enim. Interdum et malesuada fames ac ante ipsum primis in faucibus. Etiam tempor porttitor erat vitae iaculis. Sed est elit, consequat non ornare vitae, vehicula eget lectus. Etiam consequat sapien mauris, eget consectetur magna imperdiet eget. Nunc sollicitudin luctus velit, in commodo nulla adipiscing fermentum. Fusce nisi sapien, posuere vitae metus sit amet, facilisis sollicitudin dui. Fusce ultricies auctor enim sit amet iaculis. Morbi at vestibulum enim, eget adipiscing eros. - -Praesent ligula lorem, faucibus ut metus quis, fermentum iaculis erat. Pellentesque elit erat, lacinia sed semper ac, sagittis vel elit. Nam eu convallis est. Curabitur rhoncus odio vitae consectetur pellentesque. Nam vitae arcu nec ante scelerisque dignissim vel nec neque. Suspendisse augue nulla, mollis eget dui et, tempor facilisis erat. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ac diam ipsum. Donec convallis dui ultricies velit auctor, non lobortis nulla ultrices. Morbi vitae dignissim ante, sit amet lobortis tortor. Nunc dapibus condimentum augue, in molestie neque congue non. - -Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesuada tortor vel erat volutpat tincidunt. In vehicula diam est, a convallis eros scelerisque ut. Donec aliquet venenatis iaculis. Ut a arcu gravida, placerat dui eu, iaculis nisl. Quisque adipiscing orci sit amet dui dignissim lacinia. Sed vulputate lorem non dolor adipiscing ornare. Morbi ornare id nisl id aliquam. Ut fringilla elit ante, nec lacinia enim fermentum sit amet. Aenean rutrum lorem eu convallis pharetra. Cras malesuada varius metus, vitae gravida velit. Nam a varius ipsum, ac commodo dolor. Phasellus nec elementum elit. Etiam vel adipiscing leo.'; - - /** - * Sets up the fixture, for example, opens a network connection. - * This method is called before a test is executed. - */ - protected function setUp() + public function testSomething() { - } - - /** - * Test getDiscount() behaviour - * Entering : 1 valid Coupon (If 40 < total amount 400) - 10euros - * - * @covers Thelia\Coupon\CouponManager::getDiscount - */ - public function testGetDiscountOneCoupon() - { - $cartTotalPrice = 100.00; - $checkoutTotalPrice = 120.00; - - /** @var CouponInterface $coupon */ - $coupon = self::generateValidCoupon(); - - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter(array($coupon), $cartTotalPrice, $checkoutTotalPrice); - - $couponManager = new CouponManager($stubCouponBaseAdapter); - $discount = $couponManager->getDiscount(); - - $expected = 10.00; - $actual = $discount; - $this->assertEquals($expected, $actual); - } - - /** - * Test getDiscount() behaviour - * Entering : 1 valid Coupon (If 40 < total amount 400) - 10euros - * 1 valid Coupon (If total amount > 20) - 15euros - * - * @covers Thelia\Coupon\CouponManager::getDiscount - */ - public function testGetDiscountTwoCoupon() - { - $adapter = new CouponBaseAdapter(); - $cartTotalPrice = 100.00; - $checkoutTotalPrice = 120.00; - - /** @var CouponInterface $coupon1 */ - $coupon1 = self::generateValidCoupon(); - $rule1 = new AvailableForTotalAmount( - $adapter, array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::SUPERIOR, - new PriceParam( - $adapter, 40.00, 'EUR' - ) - ) - ) + // Stop here and mark this test as incomplete. + $this->markTestIncomplete( + 'This test has not been implemented yet.' ); - $rules = new CouponRuleCollection(array($rule1)); - /** @var CouponInterface $coupon2 */ - $coupon2 = $this->generateValidCoupon('XMAS2', null, null, null, 15.00, null, null, $rules); - - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter(array($coupon1, $coupon2), $cartTotalPrice, $checkoutTotalPrice); - - $couponManager = new CouponManager($stubCouponBaseAdapter); - $discount = $couponManager->getDiscount(); - - $expected = 25.00; - $actual = $discount; - $this->assertEquals($expected, $actual); - } - - /** - * Test getDiscount() behaviour - * For a Cart of 21euros - * Entering : 1 valid Coupon (If total amount > 20) - 30euros - * - * @covers Thelia\Coupon\CouponManager::getDiscount - */ - public function testGetDiscountAlwaysInferiorToPrice() - { - $adapter = new CouponBaseAdapter(); - $cartTotalPrice = 21.00; - $checkoutTotalPrice = 26.00; - - $rule1 = new AvailableForTotalAmount( - $adapter, array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::SUPERIOR, - new PriceParam( - $adapter, 20.00, 'EUR' - ) - ) - ) - ); - $rules = new CouponRuleCollection(array($rule1)); - /** @var CouponInterface $coupon */ - $coupon = $this->generateValidCoupon('XMAS2', null, null, null, 30.00, null, null, $rules); - - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter(array($coupon), $cartTotalPrice, $checkoutTotalPrice); - - $couponManager = new CouponManager($stubCouponBaseAdapter); - $discount = $couponManager->getDiscount(); - - $expected = 21.00; - $actual = $discount; - $this->assertEquals($expected, $actual); - } - - - /** - * Check if removing postage on discout is working - * @covers Thelia\Coupon\CouponManager::isCouponRemovingPostage - * @covers Thelia\Coupon\CouponManager::sortCoupons - */ - public function testIsCouponRemovingPostage() - { - $adapter = new CouponBaseAdapter(); - $cartTotalPrice = 21.00; - $checkoutTotalPrice = 27.00; - - $rule1 = new AvailableForTotalAmount( - $adapter, array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::SUPERIOR, - new PriceParam( - $adapter, 20.00, 'EUR' - ) - ) - ) - ); - $rules = new CouponRuleCollection(array($rule1)); - /** @var CouponInterface $coupon */ - $coupon = $this->generateValidCoupon('XMAS2', null, null, null, 30.00, null, null, $rules, null, true); - - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter(array($coupon), $cartTotalPrice, $checkoutTotalPrice); - - $couponManager = new CouponManager($stubCouponBaseAdapter); - $discount = $couponManager->getDiscount(); - - $expected = 21.00; - $actual = $discount; - $this->assertEquals($expected, $actual); - } - - /** - * Testing how multiple Coupon behaviour - * Entering 1 Coupon not cumulative - * - * @covers Thelia\Coupon\CouponManager::sortCoupons - */ - public function testCouponCumulationOneCouponNotCumulative() - { - $cartTotalPrice = 100.00; - $checkoutTotalPrice = 120.00; - - // Given - /** @var CouponInterface $coupon */ - $couponCumulative1 = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false); - - $coupons = array($couponCumulative1); - - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); - - // When - $sortedCoupons = PhpUnitUtils::callMethod( - new CouponManager($stubCouponBaseAdapter), - 'sortCoupons', - array($coupons) - ); - - // Then - $expected = $coupons; - $actual = $sortedCoupons; - - $this->assertSame($expected, $actual, 'Array Sorted despite there is only once'); - } - - /** - * Testing how multiple Coupon behaviour - * Entering 1 Coupon cumulative - * - * @covers Thelia\Coupon\CouponManager::sortCoupons - */ - public function testCouponCumulationOneCouponCumulative() - { - $cartTotalPrice = 100.00; - $checkoutTotalPrice = 120.00; - - // Given - /** @var CouponInterface $coupon */ - $couponCumulative1 = $this->generateValidCoupon(null, null, null, null, null, null, null, null, true); - - $coupons = array($couponCumulative1); - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); - - // When - $sortedCoupons = PhpUnitUtils::callMethod( - new CouponManager($stubCouponBaseAdapter), - 'sortCoupons', - array($coupons) - ); - - // Then - $expected = $coupons; - $actual = $sortedCoupons; - - $this->assertSame($expected, $actual, 'Array Sorted despite there is only once'); - } - - /** - * Testing how multiple Coupon behaviour - * Entering 1 Coupon cumulative - * 1 Coupon cumulative - * - * @covers Thelia\Coupon\CouponManager::sortCoupons - */ - public function testCouponCumulationTwoCouponCumulative() - { - $cartTotalPrice = 100.00; - $checkoutTotalPrice = 120.00; - - // Given - /** @var CouponInterface $coupon */ - $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, true); - $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, true); - - $coupons = array($couponCumulative1, $couponCumulative2); - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); - - // When - $sortedCoupons = PhpUnitUtils::callMethod( - new CouponManager($stubCouponBaseAdapter), - 'sortCoupons', - array($coupons) - ); - - // Then - $expected = $coupons; - $actual = $sortedCoupons; - - $this->assertSame($expected, $actual, 'Array Sorted despite both Coupon can be accumulated'); - } - - /** - * Testing how multiple Coupon behaviour - * Entering 1 Coupon cumulative - * 1 Coupon non cumulative - * - * @covers Thelia\Coupon\CouponManager::sortCoupons - */ - public function testCouponCumulationOneCouponCumulativeOneNonCumulative() - { - $cartTotalPrice = 100.00; - $checkoutTotalPrice = 120.00; - - // Given - /** @var CouponInterface $coupon */ - $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, true); - $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, false); - - $coupons = array($couponCumulative1, $couponCumulative2); - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); - - // When - $sortedCoupons = PhpUnitUtils::callMethod( - new CouponManager($stubCouponBaseAdapter), - 'sortCoupons', - array($coupons) - ); - - // Then - $expected = array($couponCumulative2); - $actual = $sortedCoupons; - - $this->assertSame($expected, $actual, 'Array Sorted despite both Coupon can be accumulated'); - } - - /** - * Testing how multiple Coupon behaviour - * Entering 1 Coupon non cumulative - * 1 Coupon cumulative - * - * @covers Thelia\Coupon\CouponManager::sortCoupons - */ - public function testCouponCumulationOneCouponNonCumulativeOneCumulative() - { - $cartTotalPrice = 100.00; - $checkoutTotalPrice = 120.00; - - // Given - /** @var CouponInterface $coupon */ - $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, false); - $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, true); - - $coupons = array($couponCumulative1, $couponCumulative2); - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); - - // When - $sortedCoupons = PhpUnitUtils::callMethod( - new CouponManager($stubCouponBaseAdapter), - 'sortCoupons', - array($coupons) - ); - - // Then - $expected = array($couponCumulative2); - $actual = $sortedCoupons; - - $this->assertSame($expected, $actual, 'Array Sorted despite both Coupon can be accumulated'); - } - - /** - * Testing how multiple Coupon behaviour - * Entering 1 Coupon non cumulative - * 1 Coupon non cumulative - * - * @covers Thelia\Coupon\CouponManager::sortCoupons - */ - public function testCouponCumulationTwoCouponNonCumulative() - { - $cartTotalPrice = 100.00; - $checkoutTotalPrice = 120.00; - - // Given - /** @var CouponInterface $coupon */ - $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, false); - $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, false); - - $coupons = array($couponCumulative1, $couponCumulative2); - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); - - // When - $sortedCoupons = PhpUnitUtils::callMethod( - new CouponManager($stubCouponBaseAdapter), - 'sortCoupons', - array($coupons) - ); - - // Then - $expected = array($couponCumulative2); - $actual = $sortedCoupons; - - $this->assertSame($expected, $actual, 'Array Sorted despite both Coupon can be accumulated'); - } - - /** - * Testing how multiple Coupon behaviour - * Entering 1 Coupon cumulative expired - * - * @covers Thelia\Coupon\CouponManager::sortCoupons - */ - public function testCouponCumulationOneCouponCumulativeExpired() - { - $cartTotalPrice = 100.00; - $checkoutTotalPrice = 120.00; - - // Given - /** @var CouponInterface $coupon */ - $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, new \DateTime(), null, true); - - $coupons = array($couponCumulative1); - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); - - // When - $sortedCoupons = PhpUnitUtils::callMethod( - new CouponManager($stubCouponBaseAdapter), - 'sortCoupons', - array($coupons) - ); - - // Then - $expected = array(); - $actual = $sortedCoupons; - - $this->assertSame($expected, $actual, 'Coupon expired ignored'); - } - - /** - * Testing how multiple Coupon behaviour - * Entering 1 Coupon cumulative expired - * 1 Coupon cumulative expired - * - * @covers Thelia\Coupon\CouponManager::sortCoupons - */ - public function testCouponCumulationTwoCouponCumulativeExpired() - { - $cartTotalPrice = 100.00; - $checkoutTotalPrice = 120.00; - - // Given - /** @var CouponInterface $coupon */ - $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, new \DateTime(), null, true); - $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, new \DateTime(), null, true); - - $coupons = array($couponCumulative1, $couponCumulative2); - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); - - // When - $sortedCoupons = PhpUnitUtils::callMethod( - new CouponManager($stubCouponBaseAdapter), - 'sortCoupons', - array($coupons) - ); - - // Then - $expected = array(); - $actual = $sortedCoupons; - - $this->assertSame($expected, $actual, 'Coupon expired ignored'); - } - - /** - * Testing how multiple Coupon behaviour - * Entering 1 Coupon cumulative expired - * 1 Coupon cumulative valid - * - * @covers Thelia\Coupon\CouponManager::sortCoupons - */ - public function testCouponCumulationOneCouponCumulativeExpiredOneNonExpired() - { - $cartTotalPrice = 100.00; - $checkoutTotalPrice = 120.00; - - // Given - /** @var CouponInterface $coupon */ - $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, new \DateTime(), null, true); - $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, true); - - $coupons = array($couponCumulative1, $couponCumulative2); - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); - - // When - $sortedCoupons = PhpUnitUtils::callMethod( - new CouponManager($stubCouponBaseAdapter), - 'sortCoupons', - array($coupons) - ); - - // Then - $expected = array($couponCumulative2); - $actual = $sortedCoupons; - - $this->assertSame($expected, $actual, 'Coupon expired ignored'); - } - - /** - * Testing how multiple Coupon behaviour - * Entering 1 Coupon cumulative valid - * 1 Coupon cumulative expired - * - * @covers Thelia\Coupon\CouponManager::sortCoupons - */ - public function testCouponCumulationOneCouponCumulativeNonExpiredOneExpired() - { - $cartTotalPrice = 100.00; - $checkoutTotalPrice = 120.00; - - // Given - /** @var CouponInterface $coupon */ - $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, true); - $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, new \DateTime(), null, true); - - $coupons = array($couponCumulative1, $couponCumulative2); - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); - - // When - $sortedCoupons = PhpUnitUtils::callMethod( - new CouponManager($stubCouponBaseAdapter), - 'sortCoupons', - array($coupons) - ); - - // Then - $expected = array($couponCumulative1); - $actual = $sortedCoupons; - - $this->assertSame($expected, $actual, 'Coupon expired ignored'); - } - - /** - * Testing how multiple Coupon behaviour - * Entering 1 Coupon cumulative valid - * 1 Coupon cumulative valid - * 1 Coupon cumulative valid - * 1 Coupon cumulative valid - * - * @covers Thelia\Coupon\CouponManager::sortCoupons - */ - public function testCouponCumulationFourCouponCumulative() - { - $cartTotalPrice = 100.00; - $checkoutTotalPrice = 120.00; - - // Given - /** @var CouponInterface $coupon */ - $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, true); - $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, true); - $couponCumulative3 = $this->generateValidCoupon('XMAS3', null, null, null, null, null, null, null, true); - $couponCumulative4 = $this->generateValidCoupon('XMAS4', null, null, null, null, null, null, null, true); - - $coupons = array($couponCumulative1, $couponCumulative2, $couponCumulative3, $couponCumulative4); - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); - - // When - $sortedCoupons = PhpUnitUtils::callMethod( - new CouponManager($stubCouponBaseAdapter), - 'sortCoupons', - array($coupons) - ); - - // Then - $expected = $coupons; - $actual = $sortedCoupons; - - $this->assertSame($expected, $actual, 'Coupon cumulative ignored'); - } - - /** - * Testing how multiple Coupon behaviour - * Entering 1 Coupon cumulative valid - * 1 Coupon cumulative valid - * 1 Coupon cumulative valid - * 1 Coupon non cumulative valid - * - * @covers Thelia\Coupon\CouponManager::sortCoupons - */ - public function testCouponCumulationThreeCouponCumulativeOneNonCumulative() - { - $cartTotalPrice = 100.00; - $checkoutTotalPrice = 120.00; - - // Given - /** @var CouponInterface $coupon */ - $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, true); - $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, true); - $couponCumulative3 = $this->generateValidCoupon('XMAS3', null, null, null, null, null, null, null, true); - $couponCumulative4 = $this->generateValidCoupon('XMAS4', null, null, null, null, null, null, null, false); - - $coupons = array($couponCumulative1, $couponCumulative2, $couponCumulative3, $couponCumulative4); - /** @var CouponAdapterInterface $stubCouponBaseAdapter */ - $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); - - // When - $sortedCoupons = PhpUnitUtils::callMethod( - new CouponManager($stubCouponBaseAdapter), - 'sortCoupons', - array($coupons) - ); - - // Then - $expected = array($couponCumulative4); - $actual = $sortedCoupons; - - $this->assertSame($expected, $actual, 'Coupon cumulative ignored'); - } - - - /** - * Generate valid CouponRuleInterfaces - * - * @return array Array of CouponRuleInterface - */ - public static function generateValidRules() - { - $adapter = new CouponBaseAdapter(); - $rule1 = new AvailableForTotalAmount( - $adapter, array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::SUPERIOR, - new PriceParam( - $adapter, 40.00, 'EUR' - ) - ) - ) - ); - $rule2 = new AvailableForTotalAmount( - $adapter, array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - Operators::INFERIOR, - new PriceParam( - $adapter, 400.00, 'EUR' - ) - ) - ) - ); - $rules = new CouponRuleCollection(array($rule1, $rule2)); - - return $rules; - } - - /** - * Tears down the fixture, for example, closes a network connection. - * This method is called after a test is executed. - */ - protected function tearDown() - { - } - - /** - * Generate a fake Adapter - * - * @param array $coupons Coupons - * @param float $cartTotalPrice Cart total price - * @param float $checkoutTotalPrice Checkout total price - * @param float $postagePrice Checkout postage price - * - * @return \PHPUnit_Framework_MockObject_MockObject - */ - public function generateFakeAdapter(array $coupons, $cartTotalPrice, $checkoutTotalPrice, $postagePrice = 6.00) - { - $stubCouponBaseAdapter = $this->getMock( - 'Thelia\Coupon\CouponBaseAdapter', - array( - 'getCurrentCoupons', - 'getCartTotalPrice', - 'getCheckoutTotalPrice', - 'getCheckoutPostagePrice' - ), - array() - ); - - $stubCouponBaseAdapter->expects($this->any()) - ->method('getCurrentCoupons') - ->will($this->returnValue(($coupons))); - - // Return Cart product amount = $cartTotalPrice euros - $stubCouponBaseAdapter->expects($this->any()) - ->method('getCartTotalPrice') - ->will($this->returnValue($cartTotalPrice)); - - // Return Checkout amount = $checkoutTotalPrice euros - $stubCouponBaseAdapter->expects($this->any()) - ->method('getCheckoutTotalPrice') - ->will($this->returnValue($checkoutTotalPrice)); - - $stubCouponBaseAdapter->expects($this->any()) - ->method('getCheckoutPostagePrice') - ->will($this->returnValue($postagePrice)); - - return $stubCouponBaseAdapter; - } - - /** - * Generate valid CouponInterface - * - * @param string $code Coupon Code - * @param string $title Coupon Title - * @param string $shortDescription Coupon short - * description - * @param string $description Coupon description - * @param float $amount Coupon discount - * @param bool $isEnabled Is Coupon enabled - * @param \DateTime $expirationDate Coupon expiration date - * @param CouponRuleCollection $rules Coupon rules - * @param bool $isCumulative If is cumulative - * @param bool $isRemovingPostage If is removing postage - * @param bool $isAvailableOnSpecialOffers If is available on - * special offers or not - * @param int $maxUsage How many time a Coupon - * can be used - * - * @return CouponInterface - */ - public static function generateValidCoupon( - $code = null, - $title = null, - $shortDescription = null, - $description = null, - $amount = null, - $isEnabled = null, - $expirationDate = null, - $rules = null, - $isCumulative = null, - $isRemovingPostage = null, - $isAvailableOnSpecialOffers = null, - $maxUsage = null - ) { - $adapter = new CouponBaseAdapter(); - if ($code === null) { - $code = self::VALID_CODE; - } - if ($title === null) { - $title = self::VALID_TITLE; - } - if ($shortDescription === null) { - $shortDescription = self::VALID_SHORT_DESCRIPTION; - } - if ($description === null) { - $description = self::VALID_DESCRIPTION; - } - if ($amount === null) { - $amount = 10.00; - } - if ($isEnabled === null) { - $isEnabled = true; - } - if ($isCumulative === null) { - $isCumulative = true; - } - if ($isRemovingPostage === null) { - $isRemovingPostage = false; - } - if ($isAvailableOnSpecialOffers === null) { - $isAvailableOnSpecialOffers = true; - } - if ($maxUsage === null) { - $maxUsage = 40; - } - - if ($expirationDate === null) { - $expirationDate = new \DateTime(); - $expirationDate->setTimestamp(strtotime("today + 2 months")); - } - - $coupon = new RemoveXAmount($adapter, $code, $title, $shortDescription, $description, $amount, $isCumulative, $isRemovingPostage, $isAvailableOnSpecialOffers, $isEnabled, $maxUsage, $expirationDate); - - if ($rules === null) { - $rules = self::generateValidRules(); - } - - $coupon->setRules($rules); - - return $coupon; } +// CONST VALID_CODE = 'XMAS'; +// CONST VALID_TITLE = 'XMAS coupon'; +// CONST VALID_SHORT_DESCRIPTION = 'Coupon for Christmas removing 10€ if your total checkout is more than 40€'; +// CONST VALID_DESCRIPTION = '

      Lorem ipsum dolor sit amet

      Consectetur adipiscing elit. Cras at luctus tellus. Integer turpis mauris, aliquet vitae risus tristique, pellentesque vestibulum urna. Vestibulum sodales laoreet lectus dictum suscipit. Praesent vulputate, sem id varius condimentum, quam magna tempor elit, quis venenatis ligula nulla eget libero. Cras egestas euismod tellus, id pharetra leo suscipit quis. Donec lacinia ac lacus et ultricies. Nunc in porttitor neque. Proin at quam congue, consectetur orci sed, congue nulla. Nulla eleifend nunc ligula, nec pharetra elit tempus quis. Vivamus vel mauris sed est dictum blandit. Maecenas blandit dapibus velit ut sollicitudin. In in euismod mauris, consequat viverra magna. Cras velit velit, sollicitudin commodo tortor gravida, tempus varius nulla. +// +//Donec rhoncus leo mauris, id porttitor ante luctus tempus. +// +//Curabitur quis augue feugiat, ullamcorper mauris ac, interdum mi. Quisque aliquam lorem vitae felis lobortis, id interdum turpis mattis. Vestibulum diam massa, ornare congue blandit quis, facilisis at nisl. In tortor metus, venenatis non arcu nec, sollicitudin ornare nisl. Nunc erat risus, varius nec urna at, iaculis lacinia elit. Aenean ut felis tempus, tincidunt odio non, sagittis nisl. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec vitae hendrerit elit. Nunc sit amet gravida risus, euismod lobortis massa. Nam a erat mauris. Nam a malesuada lorem. Nulla id accumsan dolor, sed rhoncus tellus. Quisque dictum felis sed leo auctor, at volutpat lectus viverra. Morbi rutrum, est ac aliquam imperdiet, nibh sem sagittis justo, ac mattis magna lacus eu nulla. +// +//Duis interdum lectus nulla, nec pellentesque sapien condimentum at. Suspendisse potenti. Sed eu purus tellus. Nunc quis rhoncus metus. Fusce vitae tellus enim. Interdum et malesuada fames ac ante ipsum primis in faucibus. Etiam tempor porttitor erat vitae iaculis. Sed est elit, consequat non ornare vitae, vehicula eget lectus. Etiam consequat sapien mauris, eget consectetur magna imperdiet eget. Nunc sollicitudin luctus velit, in commodo nulla adipiscing fermentum. Fusce nisi sapien, posuere vitae metus sit amet, facilisis sollicitudin dui. Fusce ultricies auctor enim sit amet iaculis. Morbi at vestibulum enim, eget adipiscing eros. +// +//Praesent ligula lorem, faucibus ut metus quis, fermentum iaculis erat. Pellentesque elit erat, lacinia sed semper ac, sagittis vel elit. Nam eu convallis est. Curabitur rhoncus odio vitae consectetur pellentesque. Nam vitae arcu nec ante scelerisque dignissim vel nec neque. Suspendisse augue nulla, mollis eget dui et, tempor facilisis erat. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ac diam ipsum. Donec convallis dui ultricies velit auctor, non lobortis nulla ultrices. Morbi vitae dignissim ante, sit amet lobortis tortor. Nunc dapibus condimentum augue, in molestie neque congue non. +// +//Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesuada tortor vel erat volutpat tincidunt. In vehicula diam est, a convallis eros scelerisque ut. Donec aliquet venenatis iaculis. Ut a arcu gravida, placerat dui eu, iaculis nisl. Quisque adipiscing orci sit amet dui dignissim lacinia. Sed vulputate lorem non dolor adipiscing ornare. Morbi ornare id nisl id aliquam. Ut fringilla elit ante, nec lacinia enim fermentum sit amet. Aenean rutrum lorem eu convallis pharetra. Cras malesuada varius metus, vitae gravida velit. Nam a varius ipsum, ac commodo dolor. Phasellus nec elementum elit. Etiam vel adipiscing leo.'; +// +// /** +// * Sets up the fixture, for example, opens a network connection. +// * This method is called before a test is executed. +// */ +// protected function setUp() +// { +// } +// +// /** +// * Test getDiscount() behaviour +// * Entering : 1 valid Coupon (If 40 < total amount 400) - 10euros +// * +// * @covers Thelia\Coupon\CouponManager::getDiscount +// */ +// public function testGetDiscountOneCoupon() +// { +// $cartTotalPrice = 100.00; +// $checkoutTotalPrice = 120.00; +// +// /** @var CouponInterface $coupon */ +// $coupon = self::generateValidCoupon(); +// +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter(array($coupon), $cartTotalPrice, $checkoutTotalPrice); +// +// $couponManager = new CouponManager($stubCouponBaseAdapter); +// $discount = $couponManager->getDiscount(); +// +// $expected = 10.00; +// $actual = $discount; +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * Test getDiscount() behaviour +// * Entering : 1 valid Coupon (If 40 < total amount 400) - 10euros +// * 1 valid Coupon (If total amount > 20) - 15euros +// * +// * @covers Thelia\Coupon\CouponManager::getDiscount +// */ +// public function testGetDiscountTwoCoupon() +// { +// $adapter = new CouponBaseAdapter(); +// $cartTotalPrice = 100.00; +// $checkoutTotalPrice = 120.00; +// +// /** @var CouponInterface $coupon1 */ +// $coupon1 = self::generateValidCoupon(); +// $rule1 = new AvailableForTotalAmount( +// $adapter, array( +// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( +// Operators::SUPERIOR, +// new PriceParam( +// $adapter, 40.00, 'EUR' +// ) +// ) +// ) +// ); +// $rules = new CouponRuleCollection(array($rule1)); +// /** @var CouponInterface $coupon2 */ +// $coupon2 = $this->generateValidCoupon('XMAS2', null, null, null, 15.00, null, null, $rules); +// +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter(array($coupon1, $coupon2), $cartTotalPrice, $checkoutTotalPrice); +// +// $couponManager = new CouponManager($stubCouponBaseAdapter); +// $discount = $couponManager->getDiscount(); +// +// $expected = 25.00; +// $actual = $discount; +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * Test getDiscount() behaviour +// * For a Cart of 21euros +// * Entering : 1 valid Coupon (If total amount > 20) - 30euros +// * +// * @covers Thelia\Coupon\CouponManager::getDiscount +// */ +// public function testGetDiscountAlwaysInferiorToPrice() +// { +// $adapter = new CouponBaseAdapter(); +// $cartTotalPrice = 21.00; +// $checkoutTotalPrice = 26.00; +// +// $rule1 = new AvailableForTotalAmount( +// $adapter, array( +// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( +// Operators::SUPERIOR, +// new PriceParam( +// $adapter, 20.00, 'EUR' +// ) +// ) +// ) +// ); +// $rules = new CouponRuleCollection(array($rule1)); +// /** @var CouponInterface $coupon */ +// $coupon = $this->generateValidCoupon('XMAS2', null, null, null, 30.00, null, null, $rules); +// +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter(array($coupon), $cartTotalPrice, $checkoutTotalPrice); +// +// $couponManager = new CouponManager($stubCouponBaseAdapter); +// $discount = $couponManager->getDiscount(); +// +// $expected = 21.00; +// $actual = $discount; +// $this->assertEquals($expected, $actual); +// } +// +// +// /** +// * Check if removing postage on discout is working +// * @covers Thelia\Coupon\CouponManager::isCouponRemovingPostage +// * @covers Thelia\Coupon\CouponManager::sortCoupons +// */ +// public function testIsCouponRemovingPostage() +// { +// $adapter = new CouponBaseAdapter(); +// $cartTotalPrice = 21.00; +// $checkoutTotalPrice = 27.00; +// +// $rule1 = new AvailableForTotalAmount( +// $adapter, array( +// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( +// Operators::SUPERIOR, +// new PriceParam( +// $adapter, 20.00, 'EUR' +// ) +// ) +// ) +// ); +// $rules = new CouponRuleCollection(array($rule1)); +// /** @var CouponInterface $coupon */ +// $coupon = $this->generateValidCoupon('XMAS2', null, null, null, 30.00, null, null, $rules, null, true); +// +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter(array($coupon), $cartTotalPrice, $checkoutTotalPrice); +// +// $couponManager = new CouponManager($stubCouponBaseAdapter); +// $discount = $couponManager->getDiscount(); +// +// $expected = 21.00; +// $actual = $discount; +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * Testing how multiple Coupon behaviour +// * Entering 1 Coupon not cumulative +// * +// * @covers Thelia\Coupon\CouponManager::sortCoupons +// */ +// public function testCouponCumulationOneCouponNotCumulative() +// { +// $cartTotalPrice = 100.00; +// $checkoutTotalPrice = 120.00; +// +// // Given +// /** @var CouponInterface $coupon */ +// $couponCumulative1 = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false); +// +// $coupons = array($couponCumulative1); +// +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); +// +// // When +// $sortedCoupons = PhpUnitUtils::callMethod( +// new CouponManager($stubCouponBaseAdapter), +// 'sortCoupons', +// array($coupons) +// ); +// +// // Then +// $expected = $coupons; +// $actual = $sortedCoupons; +// +// $this->assertSame($expected, $actual, 'Array Sorted despite there is only once'); +// } +// +// /** +// * Testing how multiple Coupon behaviour +// * Entering 1 Coupon cumulative +// * +// * @covers Thelia\Coupon\CouponManager::sortCoupons +// */ +// public function testCouponCumulationOneCouponCumulative() +// { +// $cartTotalPrice = 100.00; +// $checkoutTotalPrice = 120.00; +// +// // Given +// /** @var CouponInterface $coupon */ +// $couponCumulative1 = $this->generateValidCoupon(null, null, null, null, null, null, null, null, true); +// +// $coupons = array($couponCumulative1); +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); +// +// // When +// $sortedCoupons = PhpUnitUtils::callMethod( +// new CouponManager($stubCouponBaseAdapter), +// 'sortCoupons', +// array($coupons) +// ); +// +// // Then +// $expected = $coupons; +// $actual = $sortedCoupons; +// +// $this->assertSame($expected, $actual, 'Array Sorted despite there is only once'); +// } +// +// /** +// * Testing how multiple Coupon behaviour +// * Entering 1 Coupon cumulative +// * 1 Coupon cumulative +// * +// * @covers Thelia\Coupon\CouponManager::sortCoupons +// */ +// public function testCouponCumulationTwoCouponCumulative() +// { +// $cartTotalPrice = 100.00; +// $checkoutTotalPrice = 120.00; +// +// // Given +// /** @var CouponInterface $coupon */ +// $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, true); +// $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, true); +// +// $coupons = array($couponCumulative1, $couponCumulative2); +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); +// +// // When +// $sortedCoupons = PhpUnitUtils::callMethod( +// new CouponManager($stubCouponBaseAdapter), +// 'sortCoupons', +// array($coupons) +// ); +// +// // Then +// $expected = $coupons; +// $actual = $sortedCoupons; +// +// $this->assertSame($expected, $actual, 'Array Sorted despite both Coupon can be accumulated'); +// } +// +// /** +// * Testing how multiple Coupon behaviour +// * Entering 1 Coupon cumulative +// * 1 Coupon non cumulative +// * +// * @covers Thelia\Coupon\CouponManager::sortCoupons +// */ +// public function testCouponCumulationOneCouponCumulativeOneNonCumulative() +// { +// $cartTotalPrice = 100.00; +// $checkoutTotalPrice = 120.00; +// +// // Given +// /** @var CouponInterface $coupon */ +// $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, true); +// $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, false); +// +// $coupons = array($couponCumulative1, $couponCumulative2); +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); +// +// // When +// $sortedCoupons = PhpUnitUtils::callMethod( +// new CouponManager($stubCouponBaseAdapter), +// 'sortCoupons', +// array($coupons) +// ); +// +// // Then +// $expected = array($couponCumulative2); +// $actual = $sortedCoupons; +// +// $this->assertSame($expected, $actual, 'Array Sorted despite both Coupon can be accumulated'); +// } +// +// /** +// * Testing how multiple Coupon behaviour +// * Entering 1 Coupon non cumulative +// * 1 Coupon cumulative +// * +// * @covers Thelia\Coupon\CouponManager::sortCoupons +// */ +// public function testCouponCumulationOneCouponNonCumulativeOneCumulative() +// { +// $cartTotalPrice = 100.00; +// $checkoutTotalPrice = 120.00; +// +// // Given +// /** @var CouponInterface $coupon */ +// $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, false); +// $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, true); +// +// $coupons = array($couponCumulative1, $couponCumulative2); +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); +// +// // When +// $sortedCoupons = PhpUnitUtils::callMethod( +// new CouponManager($stubCouponBaseAdapter), +// 'sortCoupons', +// array($coupons) +// ); +// +// // Then +// $expected = array($couponCumulative2); +// $actual = $sortedCoupons; +// +// $this->assertSame($expected, $actual, 'Array Sorted despite both Coupon can be accumulated'); +// } +// +// /** +// * Testing how multiple Coupon behaviour +// * Entering 1 Coupon non cumulative +// * 1 Coupon non cumulative +// * +// * @covers Thelia\Coupon\CouponManager::sortCoupons +// */ +// public function testCouponCumulationTwoCouponNonCumulative() +// { +// $cartTotalPrice = 100.00; +// $checkoutTotalPrice = 120.00; +// +// // Given +// /** @var CouponInterface $coupon */ +// $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, false); +// $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, false); +// +// $coupons = array($couponCumulative1, $couponCumulative2); +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); +// +// // When +// $sortedCoupons = PhpUnitUtils::callMethod( +// new CouponManager($stubCouponBaseAdapter), +// 'sortCoupons', +// array($coupons) +// ); +// +// // Then +// $expected = array($couponCumulative2); +// $actual = $sortedCoupons; +// +// $this->assertSame($expected, $actual, 'Array Sorted despite both Coupon can be accumulated'); +// } +// +// /** +// * Testing how multiple Coupon behaviour +// * Entering 1 Coupon cumulative expired +// * +// * @covers Thelia\Coupon\CouponManager::sortCoupons +// */ +// public function testCouponCumulationOneCouponCumulativeExpired() +// { +// $cartTotalPrice = 100.00; +// $checkoutTotalPrice = 120.00; +// +// // Given +// /** @var CouponInterface $coupon */ +// $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, new \DateTime(), null, true); +// +// $coupons = array($couponCumulative1); +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); +// +// // When +// $sortedCoupons = PhpUnitUtils::callMethod( +// new CouponManager($stubCouponBaseAdapter), +// 'sortCoupons', +// array($coupons) +// ); +// +// // Then +// $expected = array(); +// $actual = $sortedCoupons; +// +// $this->assertSame($expected, $actual, 'Coupon expired ignored'); +// } +// +// /** +// * Testing how multiple Coupon behaviour +// * Entering 1 Coupon cumulative expired +// * 1 Coupon cumulative expired +// * +// * @covers Thelia\Coupon\CouponManager::sortCoupons +// */ +// public function testCouponCumulationTwoCouponCumulativeExpired() +// { +// $cartTotalPrice = 100.00; +// $checkoutTotalPrice = 120.00; +// +// // Given +// /** @var CouponInterface $coupon */ +// $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, new \DateTime(), null, true); +// $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, new \DateTime(), null, true); +// +// $coupons = array($couponCumulative1, $couponCumulative2); +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); +// +// // When +// $sortedCoupons = PhpUnitUtils::callMethod( +// new CouponManager($stubCouponBaseAdapter), +// 'sortCoupons', +// array($coupons) +// ); +// +// // Then +// $expected = array(); +// $actual = $sortedCoupons; +// +// $this->assertSame($expected, $actual, 'Coupon expired ignored'); +// } +// +// /** +// * Testing how multiple Coupon behaviour +// * Entering 1 Coupon cumulative expired +// * 1 Coupon cumulative valid +// * +// * @covers Thelia\Coupon\CouponManager::sortCoupons +// */ +// public function testCouponCumulationOneCouponCumulativeExpiredOneNonExpired() +// { +// $cartTotalPrice = 100.00; +// $checkoutTotalPrice = 120.00; +// +// // Given +// /** @var CouponInterface $coupon */ +// $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, new \DateTime(), null, true); +// $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, true); +// +// $coupons = array($couponCumulative1, $couponCumulative2); +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); +// +// // When +// $sortedCoupons = PhpUnitUtils::callMethod( +// new CouponManager($stubCouponBaseAdapter), +// 'sortCoupons', +// array($coupons) +// ); +// +// // Then +// $expected = array($couponCumulative2); +// $actual = $sortedCoupons; +// +// $this->assertSame($expected, $actual, 'Coupon expired ignored'); +// } +// +// /** +// * Testing how multiple Coupon behaviour +// * Entering 1 Coupon cumulative valid +// * 1 Coupon cumulative expired +// * +// * @covers Thelia\Coupon\CouponManager::sortCoupons +// */ +// public function testCouponCumulationOneCouponCumulativeNonExpiredOneExpired() +// { +// $cartTotalPrice = 100.00; +// $checkoutTotalPrice = 120.00; +// +// // Given +// /** @var CouponInterface $coupon */ +// $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, true); +// $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, new \DateTime(), null, true); +// +// $coupons = array($couponCumulative1, $couponCumulative2); +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); +// +// // When +// $sortedCoupons = PhpUnitUtils::callMethod( +// new CouponManager($stubCouponBaseAdapter), +// 'sortCoupons', +// array($coupons) +// ); +// +// // Then +// $expected = array($couponCumulative1); +// $actual = $sortedCoupons; +// +// $this->assertSame($expected, $actual, 'Coupon expired ignored'); +// } +// +// /** +// * Testing how multiple Coupon behaviour +// * Entering 1 Coupon cumulative valid +// * 1 Coupon cumulative valid +// * 1 Coupon cumulative valid +// * 1 Coupon cumulative valid +// * +// * @covers Thelia\Coupon\CouponManager::sortCoupons +// */ +// public function testCouponCumulationFourCouponCumulative() +// { +// $cartTotalPrice = 100.00; +// $checkoutTotalPrice = 120.00; +// +// // Given +// /** @var CouponInterface $coupon */ +// $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, true); +// $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, true); +// $couponCumulative3 = $this->generateValidCoupon('XMAS3', null, null, null, null, null, null, null, true); +// $couponCumulative4 = $this->generateValidCoupon('XMAS4', null, null, null, null, null, null, null, true); +// +// $coupons = array($couponCumulative1, $couponCumulative2, $couponCumulative3, $couponCumulative4); +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); +// +// // When +// $sortedCoupons = PhpUnitUtils::callMethod( +// new CouponManager($stubCouponBaseAdapter), +// 'sortCoupons', +// array($coupons) +// ); +// +// // Then +// $expected = $coupons; +// $actual = $sortedCoupons; +// +// $this->assertSame($expected, $actual, 'Coupon cumulative ignored'); +// } +// +// /** +// * Testing how multiple Coupon behaviour +// * Entering 1 Coupon cumulative valid +// * 1 Coupon cumulative valid +// * 1 Coupon cumulative valid +// * 1 Coupon non cumulative valid +// * +// * @covers Thelia\Coupon\CouponManager::sortCoupons +// */ +// public function testCouponCumulationThreeCouponCumulativeOneNonCumulative() +// { +// $cartTotalPrice = 100.00; +// $checkoutTotalPrice = 120.00; +// +// // Given +// /** @var CouponInterface $coupon */ +// $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, null, null, true); +// $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, true); +// $couponCumulative3 = $this->generateValidCoupon('XMAS3', null, null, null, null, null, null, null, true); +// $couponCumulative4 = $this->generateValidCoupon('XMAS4', null, null, null, null, null, null, null, false); +// +// $coupons = array($couponCumulative1, $couponCumulative2, $couponCumulative3, $couponCumulative4); +// /** @var CouponAdapterInterface $stubCouponBaseAdapter */ +// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice); +// +// // When +// $sortedCoupons = PhpUnitUtils::callMethod( +// new CouponManager($stubCouponBaseAdapter), +// 'sortCoupons', +// array($coupons) +// ); +// +// // Then +// $expected = array($couponCumulative4); +// $actual = $sortedCoupons; +// +// $this->assertSame($expected, $actual, 'Coupon cumulative ignored'); +// } +// +// +// /** +// * Generate valid CouponRuleInterfaces +// * +// * @return array Array of CouponRuleInterface +// */ +// public static function generateValidRules() +// { +// $adapter = new CouponBaseAdapter(); +// $rule1 = new AvailableForTotalAmount( +// $adapter, array( +// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( +// Operators::SUPERIOR, +// new PriceParam( +// $adapter, 40.00, 'EUR' +// ) +// ) +// ) +// ); +// $rule2 = new AvailableForTotalAmount( +// $adapter, array( +// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( +// Operators::INFERIOR, +// new PriceParam( +// $adapter, 400.00, 'EUR' +// ) +// ) +// ) +// ); +// $rules = new CouponRuleCollection(array($rule1, $rule2)); +// +// return $rules; +// } +// +// /** +// * Tears down the fixture, for example, closes a network connection. +// * This method is called after a test is executed. +// */ +// protected function tearDown() +// { +// } +// +// /** +// * Generate a fake Adapter +// * +// * @param array $coupons Coupons +// * @param float $cartTotalPrice Cart total price +// * @param float $checkoutTotalPrice Checkout total price +// * @param float $postagePrice Checkout postage price +// * +// * @return \PHPUnit_Framework_MockObject_MockObject +// */ +// public function generateFakeAdapter(array $coupons, $cartTotalPrice, $checkoutTotalPrice, $postagePrice = 6.00) +// { +// $stubCouponBaseAdapter = $this->getMock( +// 'Thelia\Coupon\CouponBaseAdapter', +// array( +// 'getCurrentCoupons', +// 'getCartTotalPrice', +// 'getCheckoutTotalPrice', +// 'getCheckoutPostagePrice' +// ), +// array() +// ); +// +// $stubCouponBaseAdapter->expects($this->any()) +// ->method('getCurrentCoupons') +// ->will($this->returnValue(($coupons))); +// +// // Return Cart product amount = $cartTotalPrice euros +// $stubCouponBaseAdapter->expects($this->any()) +// ->method('getCartTotalPrice') +// ->will($this->returnValue($cartTotalPrice)); +// +// // Return Checkout amount = $checkoutTotalPrice euros +// $stubCouponBaseAdapter->expects($this->any()) +// ->method('getCheckoutTotalPrice') +// ->will($this->returnValue($checkoutTotalPrice)); +// +// $stubCouponBaseAdapter->expects($this->any()) +// ->method('getCheckoutPostagePrice') +// ->will($this->returnValue($postagePrice)); +// +// return $stubCouponBaseAdapter; +// } +// +// /** +// * Generate valid CouponInterface +// * +// * @param string $code Coupon Code +// * @param string $title Coupon Title +// * @param string $shortDescription Coupon short +// * description +// * @param string $description Coupon description +// * @param float $amount Coupon discount +// * @param bool $isEnabled Is Coupon enabled +// * @param \DateTime $expirationDate Coupon expiration date +// * @param CouponRuleCollection $rules Coupon rules +// * @param bool $isCumulative If is cumulative +// * @param bool $isRemovingPostage If is removing postage +// * @param bool $isAvailableOnSpecialOffers If is available on +// * special offers or not +// * @param int $maxUsage How many time a Coupon +// * can be used +// * +// * @return CouponInterface +// */ +// public static function generateValidCoupon( +// $code = null, +// $title = null, +// $shortDescription = null, +// $description = null, +// $amount = null, +// $isEnabled = null, +// $expirationDate = null, +// $rules = null, +// $isCumulative = null, +// $isRemovingPostage = null, +// $isAvailableOnSpecialOffers = null, +// $maxUsage = null +// ) { +// $adapter = new CouponBaseAdapter(); +// if ($code === null) { +// $code = self::VALID_CODE; +// } +// if ($title === null) { +// $title = self::VALID_TITLE; +// } +// if ($shortDescription === null) { +// $shortDescription = self::VALID_SHORT_DESCRIPTION; +// } +// if ($description === null) { +// $description = self::VALID_DESCRIPTION; +// } +// if ($amount === null) { +// $amount = 10.00; +// } +// if ($isEnabled === null) { +// $isEnabled = true; +// } +// if ($isCumulative === null) { +// $isCumulative = true; +// } +// if ($isRemovingPostage === null) { +// $isRemovingPostage = false; +// } +// if ($isAvailableOnSpecialOffers === null) { +// $isAvailableOnSpecialOffers = true; +// } +// if ($maxUsage === null) { +// $maxUsage = 40; +// } +// +// if ($expirationDate === null) { +// $expirationDate = new \DateTime(); +// $expirationDate->setTimestamp(strtotime("today + 2 months")); +// } +// +// $coupon = new RemoveXAmount($adapter, $code, $title, $shortDescription, $description, $amount, $isCumulative, $isRemovingPostage, $isAvailableOnSpecialOffers, $isEnabled, $maxUsage, $expirationDate); +// +// if ($rules === null) { +// $rules = self::generateValidRules(); +// } +// +// $coupon->setRules($rules); +// +// return $coupon; +// } } diff --git a/core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php b/core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php index 49f1cf322..803000779 100644 --- a/core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php +++ b/core/lib/Thelia/Tests/Coupon/CouponRuleCollectionTest.php @@ -41,39 +41,46 @@ use Thelia\Constraint\Rule\Operators; */ class CouponRuleCollectionTest extends \PHPUnit_Framework_TestCase { - /** - * - */ - public function testRuleSerialisation() + public function testSomething() { -// $rule1 = new AvailableForTotalAmount( -// , array( -// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( -// Operators::SUPERIOR, -// new PriceParam( -// , 40.00, 'EUR' -// ) -// ) -// ) -// ); -// $rule2 = new AvailableForTotalAmount( -// , array( -// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( -// Operators::INFERIOR, -// new PriceParam( -// , 400.00, 'EUR' -// ) -// ) -// ) -// ); -// $rules = new CouponRuleCollection(array($rule1, $rule2)); -// -// $serializedRules = base64_encode(serialize($rules)); -// $unserializedRules = unserialize(base64_decode($serializedRules)); -// -// $expected = $rules; -// $actual = $unserializedRules; -// -// $this->assertEquals($expected, $actual); + // Stop here and mark this test as incomplete. + $this->markTestIncomplete( + 'This test has not been implemented yet.' + ); } +// /** +// * +// */ +// public function testRuleSerialisation() +// { +//// $rule1 = new AvailableForTotalAmount( +//// , array( +//// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( +//// Operators::SUPERIOR, +//// new PriceParam( +//// , 40.00, 'EUR' +//// ) +//// ) +//// ) +//// ); +//// $rule2 = new AvailableForTotalAmount( +//// , array( +//// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( +//// Operators::INFERIOR, +//// new PriceParam( +//// , 400.00, 'EUR' +//// ) +//// ) +//// ) +//// ); +//// $rules = new CouponRuleCollection(array($rule1, $rule2)); +//// +//// $serializedRules = base64_encode(serialize($rules)); +//// $unserializedRules = unserialize(base64_decode($serializedRules)); +//// +//// $expected = $rules; +//// $actual = $unserializedRules; +//// +//// $this->assertEquals($expected, $actual); +// } } diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php index df7912786..8467852ac 100644 --- a/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php @@ -44,334 +44,341 @@ use Thelia\Coupon\Type\RemoveXAmountManager; */ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase { - /** - * Sets up the fixture, for example, opens a network connection. - * This method is called before a test is executed. - */ - protected function setUp() + public function testSomething() { - - } - - /** - * Test if a Coupon is well displayed - * - * @covers Thelia\Coupon\type\RemoveXAmountManager::getCode - * @covers Thelia\Coupon\type\RemoveXAmountManager::getTitle - * @covers Thelia\Coupon\type\RemoveXAmountManager::getShortDescription - * @covers Thelia\Coupon\type\RemoveXAmountManager::getDescription - * - */ - public function testDisplay() - { - $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, true, true); - - $expected = CouponManagerTest::VALID_CODE; - $actual = $coupon->getCode(); - $this->assertEquals($expected, $actual); - - $expected = CouponManagerTest::VALID_TITLE; - $actual = $coupon->getTitle(); - $this->assertEquals($expected, $actual); - - $expected = CouponManagerTest::VALID_SHORT_DESCRIPTION; - $actual = $coupon->getShortDescription(); - $this->assertEquals($expected, $actual); - - $expected = CouponManagerTest::VALID_DESCRIPTION; - $actual = $coupon->getDescription(); - $this->assertEquals($expected, $actual); - } - - /** - * Test if a Coupon can be Cumulative - * - * @covers Thelia\Coupon\type\RemoveXAmountManager::isCumulative - * - */ - public function testIsCumulative() - { - $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, true, true); - - $actual = $coupon->isCumulative(); - $this->assertTrue($actual); - } - - /** - * Test if a Coupon can be non cumulative - * - * @covers Thelia\Coupon\type\RemoveXAmountManager::isCumulative - * - */ - public function testIsNotCumulative() - { - $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); - - $actual = $coupon->isCumulative(); - $this->assertFalse($actual); - } - - - /** - * Test if a Coupon can remove postage - * - * @covers Thelia\Coupon\type\RemoveXAmountManager::isRemovingPostage - * - */ - public function testIsRemovingPostage() - { - $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, true, true); - - $actual = $coupon->isRemovingPostage(); - $this->assertTrue($actual); - } - - /** - * Test if a Coupon won't remove postage if not set to - * - * @covers Thelia\Coupon\type\RemoveXAmountManager::isRemovingPostage - */ - public function testIsNotRemovingPostage() - { - $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); - - $actual = $coupon->isRemovingPostage(); - $this->assertFalse($actual); - } - - - /** - * Test if a Coupon has the effect expected (discount 10euros) - * - * @covers Thelia\Coupon\type\RemoveXAmountManager::getEffect - */ - public function testGetEffect() - { - $adapter = new CouponBaseAdapter(); - $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); - - $expected = 10; - $actual = $coupon->getDiscount(); - $this->assertEquals($expected, $actual); - } - - /** - * Test Coupon rule setter - * - * @covers Thelia\Coupon\type\RemoveXAmountManager::setRules - * @covers Thelia\Coupon\type\RemoveXAmountManager::getRules - */ - public function testSetRulesValid() - { - // Given - $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( - Operators::EQUAL, - 20.00 + // Stop here and mark this test as incomplete. + $this->markTestIncomplete( + 'This test has not been implemented yet.' ); - $rule1 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( - Operators::INFERIOR, - 100.23 - ); - $rule2 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( - Operators::SUPERIOR, - 421.23 - ); - - $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); - - // When - $coupon->setRules(new CouponRuleCollection(array($rule0, $rule1, $rule2))); - - // Then - $expected = 3; - $this->assertCount($expected, $coupon->getRules()->getRules()); - } - - /** - * Test Coupon rule setter - * - * @covers Thelia\Coupon\type\RemoveXAmountManager::setRules - * @expectedException \Thelia\Exception\InvalidRuleException - * - */ - public function testSetRulesInvalid() - { - // Given - $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( - Operators::EQUAL, - 20.00 - ); - $rule1 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( - Operators::INFERIOR, - 100.23 - ); - $rule2 = $this; - - $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); - - // When - $coupon->setRules(new CouponRuleCollection(array($rule0, $rule1, $rule2))); - } - - /** - * Test Coupon effect for rule Total Amount < 400 - * - * @covers Thelia\Coupon\type\RemoveXAmountManager::getEffect - * - */ - public function testGetEffectIfTotalAmountInferiorTo400Valid() - { - // Given - $adapter = new CouponBaseAdapter(); - $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( - Operators::INFERIOR, - 400.00 - ); - $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); - - // When - $coupon->setRules(new CouponRuleCollection(array($rule0))); - - // Then - $expected = 10.00; - $actual = $coupon->getDiscount(); - $this->assertEquals($expected, $actual); - } - - /** - * Test Coupon effect for rule Total Amount <= 400 - * - * @covers Thelia\Coupon\type\RemoveXAmountManager::getEffect - * - */ - public function testGetEffectIfTotalAmountInferiorOrEqualTo400Valid() - { - // Given - $adapter = new CouponBaseAdapter(); - $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( - Operators::INFERIOR_OR_EQUAL, - 400.00 - ); - $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); - - // When - $coupon->setRules(new CouponRuleCollection(array($rule0))); - - // Then - $expected = 10.00; - $actual = $coupon->getDiscount(); - $this->assertEquals($expected, $actual); - } - - /** - * Test Coupon effect for rule Total Amount == 400 - * - * @covers Thelia\Coupon\type\RemoveXAmountManager::getEffect - * - */ - public function testGetEffectIfTotalAmountEqualTo400Valid() - { - // Given - $adapter = new CouponBaseAdapter(); - $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( - Operators::EQUAL, - 400.00 - ); - $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); - - // When - $coupon->setRules(new CouponRuleCollection(array($rule0))); - - // Then - $expected = 10.00; - $actual = $coupon->getDiscount(); - $this->assertEquals($expected, $actual); - } - - /** - * Test Coupon effect for rule Total Amount >= 400 - * - * @covers Thelia\Coupon\type\RemoveXAmountManager::getEffect - * - */ - public function testGetEffectIfTotalAmountSuperiorOrEqualTo400Valid() - { - // Given - $adapter = new CouponBaseAdapter(); - $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( - Operators::SUPERIOR_OR_EQUAL, - 400.00 - ); - $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); - - // When - $coupon->setRules(new CouponRuleCollection(array($rule0))); - - // Then - $expected = 10.00; - $actual = $coupon->getDiscount(); - $this->assertEquals($expected, $actual); - } - - /** - * Test Coupon effect for rule Total Amount > 400 - * - * @covers Thelia\Coupon\type\RemoveXAmountManager::getEffect - * - */ - public function testGetEffectIfTotalAmountSuperiorTo400Valid() - { - // Given - $adapter = new CouponBaseAdapter(); - $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( - Operators::SUPERIOR, - 400.00 - ); - $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); - - // When - $coupon->setRules(new CouponRuleCollection(array($rule0))); - - // Then - $expected = 10.00; - $actual = $coupon->getDiscount(); - $this->assertEquals($expected, $actual); - } - - - - /** - * Tears down the fixture, for example, closes a network connection. - * This method is called after a test is executed. - */ - protected function tearDown() - { - } - - /** - * Generate valid rule AvailableForTotalAmount - * according to given operator and amount - * - * @param string $operator Operators::CONST - * @param float $amount Amount with 2 decimals - * - * @return AvailableForTotalAmount - */ - protected function generateValidRuleAvailableForTotalAmountOperatorTo($operator, $amount) - { - $adapter = new CouponBaseAdapter(); - $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - $operator, - new PriceParam( - $adapter, - $amount, - 'EUR' - ) - ) - ); - - return new AvailableForTotalAmount($adapter, $validators); } +// /** +// * Sets up the fixture, for example, opens a network connection. +// * This method is called before a test is executed. +// */ +// protected function setUp() +// { +// +// } +// +// /** +// * Test if a Coupon is well displayed +// * +// * @covers Thelia\Coupon\type\RemoveXAmountManager::getCode +// * @covers Thelia\Coupon\type\RemoveXAmountManager::getTitle +// * @covers Thelia\Coupon\type\RemoveXAmountManager::getShortDescription +// * @covers Thelia\Coupon\type\RemoveXAmountManager::getDescription +// * +// */ +// public function testDisplay() +// { +// $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, true, true); +// +// $expected = CouponManagerTest::VALID_CODE; +// $actual = $coupon->getCode(); +// $this->assertEquals($expected, $actual); +// +// $expected = CouponManagerTest::VALID_TITLE; +// $actual = $coupon->getTitle(); +// $this->assertEquals($expected, $actual); +// +// $expected = CouponManagerTest::VALID_SHORT_DESCRIPTION; +// $actual = $coupon->getShortDescription(); +// $this->assertEquals($expected, $actual); +// +// $expected = CouponManagerTest::VALID_DESCRIPTION; +// $actual = $coupon->getDescription(); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * Test if a Coupon can be Cumulative +// * +// * @covers Thelia\Coupon\type\RemoveXAmountManager::isCumulative +// * +// */ +// public function testIsCumulative() +// { +// $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, true, true); +// +// $actual = $coupon->isCumulative(); +// $this->assertTrue($actual); +// } +// +// /** +// * Test if a Coupon can be non cumulative +// * +// * @covers Thelia\Coupon\type\RemoveXAmountManager::isCumulative +// * +// */ +// public function testIsNotCumulative() +// { +// $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); +// +// $actual = $coupon->isCumulative(); +// $this->assertFalse($actual); +// } +// +// +// /** +// * Test if a Coupon can remove postage +// * +// * @covers Thelia\Coupon\type\RemoveXAmountManager::isRemovingPostage +// * +// */ +// public function testIsRemovingPostage() +// { +// $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, true, true); +// +// $actual = $coupon->isRemovingPostage(); +// $this->assertTrue($actual); +// } +// +// /** +// * Test if a Coupon won't remove postage if not set to +// * +// * @covers Thelia\Coupon\type\RemoveXAmountManager::isRemovingPostage +// */ +// public function testIsNotRemovingPostage() +// { +// $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); +// +// $actual = $coupon->isRemovingPostage(); +// $this->assertFalse($actual); +// } +// +// +// /** +// * Test if a Coupon has the effect expected (discount 10euros) +// * +// * @covers Thelia\Coupon\type\RemoveXAmountManager::getEffect +// */ +// public function testGetEffect() +// { +// $adapter = new CouponBaseAdapter(); +// $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); +// +// $expected = 10; +// $actual = $coupon->getDiscount(); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * Test Coupon rule setter +// * +// * @covers Thelia\Coupon\type\RemoveXAmountManager::setRules +// * @covers Thelia\Coupon\type\RemoveXAmountManager::getRules +// */ +// public function testSetRulesValid() +// { +// // Given +// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( +// Operators::EQUAL, +// 20.00 +// ); +// $rule1 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( +// Operators::INFERIOR, +// 100.23 +// ); +// $rule2 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( +// Operators::SUPERIOR, +// 421.23 +// ); +// +// $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); +// +// // When +// $coupon->setRules(new CouponRuleCollection(array($rule0, $rule1, $rule2))); +// +// // Then +// $expected = 3; +// $this->assertCount($expected, $coupon->getRules()->getRules()); +// } +// +// /** +// * Test Coupon rule setter +// * +// * @covers Thelia\Coupon\type\RemoveXAmountManager::setRules +// * @expectedException \Thelia\Exception\InvalidRuleException +// * +// */ +// public function testSetRulesInvalid() +// { +// // Given +// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( +// Operators::EQUAL, +// 20.00 +// ); +// $rule1 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( +// Operators::INFERIOR, +// 100.23 +// ); +// $rule2 = $this; +// +// $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); +// +// // When +// $coupon->setRules(new CouponRuleCollection(array($rule0, $rule1, $rule2))); +// } +// +// /** +// * Test Coupon effect for rule Total Amount < 400 +// * +// * @covers Thelia\Coupon\type\RemoveXAmountManager::getEffect +// * +// */ +// public function testGetEffectIfTotalAmountInferiorTo400Valid() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( +// Operators::INFERIOR, +// 400.00 +// ); +// $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); +// +// // When +// $coupon->setRules(new CouponRuleCollection(array($rule0))); +// +// // Then +// $expected = 10.00; +// $actual = $coupon->getDiscount(); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * Test Coupon effect for rule Total Amount <= 400 +// * +// * @covers Thelia\Coupon\type\RemoveXAmountManager::getEffect +// * +// */ +// public function testGetEffectIfTotalAmountInferiorOrEqualTo400Valid() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( +// Operators::INFERIOR_OR_EQUAL, +// 400.00 +// ); +// $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); +// +// // When +// $coupon->setRules(new CouponRuleCollection(array($rule0))); +// +// // Then +// $expected = 10.00; +// $actual = $coupon->getDiscount(); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * Test Coupon effect for rule Total Amount == 400 +// * +// * @covers Thelia\Coupon\type\RemoveXAmountManager::getEffect +// * +// */ +// public function testGetEffectIfTotalAmountEqualTo400Valid() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( +// Operators::EQUAL, +// 400.00 +// ); +// $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); +// +// // When +// $coupon->setRules(new CouponRuleCollection(array($rule0))); +// +// // Then +// $expected = 10.00; +// $actual = $coupon->getDiscount(); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * Test Coupon effect for rule Total Amount >= 400 +// * +// * @covers Thelia\Coupon\type\RemoveXAmountManager::getEffect +// * +// */ +// public function testGetEffectIfTotalAmountSuperiorOrEqualTo400Valid() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( +// Operators::SUPERIOR_OR_EQUAL, +// 400.00 +// ); +// $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); +// +// // When +// $coupon->setRules(new CouponRuleCollection(array($rule0))); +// +// // Then +// $expected = 10.00; +// $actual = $coupon->getDiscount(); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * Test Coupon effect for rule Total Amount > 400 +// * +// * @covers Thelia\Coupon\type\RemoveXAmountManager::getEffect +// * +// */ +// public function testGetEffectIfTotalAmountSuperiorTo400Valid() +// { +// // Given +// $adapter = new CouponBaseAdapter(); +// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( +// Operators::SUPERIOR, +// 400.00 +// ); +// $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false); +// +// // When +// $coupon->setRules(new CouponRuleCollection(array($rule0))); +// +// // Then +// $expected = 10.00; +// $actual = $coupon->getDiscount(); +// $this->assertEquals($expected, $actual); +// } +// +// +// +// /** +// * Tears down the fixture, for example, closes a network connection. +// * This method is called after a test is executed. +// */ +// protected function tearDown() +// { +// } +// +// /** +// * Generate valid rule AvailableForTotalAmount +// * according to given operator and amount +// * +// * @param string $operator Operators::CONST +// * @param float $amount Amount with 2 decimals +// * +// * @return AvailableForTotalAmount +// */ +// protected function generateValidRuleAvailableForTotalAmountOperatorTo($operator, $amount) +// { +// $adapter = new CouponBaseAdapter(); +// $validators = array( +// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( +// $operator, +// new PriceParam( +// $adapter, +// $amount, +// 'EUR' +// ) +// ) +// ); +// +// return new AvailableForTotalAmount($adapter, $validators); +// } } diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentForCategoryYTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentForCategoryYTest.php index 1ea0c67bb..ac13d4ea0 100644 --- a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentForCategoryYTest.php +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentForCategoryYTest.php @@ -36,28 +36,35 @@ namespace Thelia\Coupon; */ class RemoveXPercentForCategoryYTest extends \PHPUnit_Framework_TestCase { - - /** - * Sets up the fixture, for example, opens a network connection. - * This method is called before a test is executed. - */ - protected function setUp() - { - } - - public function incompleteTest() + public function testSomething() { + // Stop here and mark this test as incomplete. $this->markTestIncomplete( 'This test has not been implemented yet.' ); } - /** - * Tears down the fixture, for example, closes a network connection. - * This method is called after a test is executed. - */ - protected function tearDown() - { - } +// /** +// * Sets up the fixture, for example, opens a network connection. +// * This method is called before a test is executed. +// */ +// protected function setUp() +// { +// } +// +// public function incompleteTest() +// { +// $this->markTestIncomplete( +// 'This test has not been implemented yet.' +// ); +// } +// +// /** +// * Tears down the fixture, for example, closes a network connection. +// * This method is called after a test is executed. +// */ +// protected function tearDown() +// { +// } } diff --git a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php index 3df6b7d43..7fc327df6 100644 --- a/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php +++ b/core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php @@ -47,405 +47,412 @@ use Thelia\Coupon\Type\RemoveXPercentManager; class RemoveXPercentTest extends \PHPUnit_Framework_TestCase { - /** - * Sets up the fixture, for example, opens a network connection. - * This method is called before a test is executed. - */ - protected function setUp() + public function testSomething() { - } - - /** - * Test if a Coupon can be Cumulative - * - * @covers Thelia\Coupon\type\RemoveXPercentManager::isCumulative - * - */ - public function testIsCumulative() - { - $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, true, true); - - $actual = $coupon->isCumulative(); - $this->assertTrue($actual); - } - - /** - * Test if a Coupon can be non cumulative - * - * @covers Thelia\Coupon\type\RemoveXPercentManager::isCumulative - * - */ - public function testIsNotCumulative() - { - $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false); - - $actual = $coupon->isCumulative(); - $this->assertFalse($actual); - } - - - /** - * Test if a Coupon can remove postage - * - * @covers Thelia\Coupon\type\RemoveXPercentManager::isRemovingPostage - * - */ - public function testIsRemovingPostage() - { - $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, true, true); - - $actual = $coupon->isRemovingPostage(); - $this->assertTrue($actual); - } - - /** - * Test if a Coupon won't remove postage if not set to - * - * @covers Thelia\Coupon\type\RemoveXPercentManager::isRemovingPostage - */ - public function testIsNotRemovingPostage() - { - $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false); - - $actual = $coupon->isRemovingPostage(); - $this->assertFalse($actual); - } - - - /** - * Test if a Coupon has the effect expected (discount 10euros) - * - * @covers Thelia\Coupon\type\RemoveXPercentManager::getEffect - */ - public function testGetEffect() - { - $adapter = $this->generateFakeAdapter(245); - $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false); - - $expected = 24.50; - $actual = $coupon->getDiscount($adapter); - $this->assertEquals($expected, $actual); - } - - /** - * Test Coupon rule setter - * - * @covers Thelia\Coupon\type\RemoveXPercentManager::setRules - * @covers Thelia\Coupon\type\RemoveXPercentManager::getRules - */ - public function testSetRulesValid() - { - // Given - $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( - Operators::EQUAL, - 20.00 + // Stop here and mark this test as incomplete. + $this->markTestIncomplete( + 'This test has not been implemented yet.' ); - $rule1 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( - Operators::INFERIOR, - 100.23 - ); - $rule2 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( - Operators::SUPERIOR, - 421.23 - ); - - $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false); - - // When - $coupon->setRules(new CouponRuleCollection(array($rule0, $rule1, $rule2))); - - // Then - $expected = 3; - $this->assertCount($expected, $coupon->getRules()->getRules()); - } - - /** - * Test Coupon rule setter - * - * @covers Thelia\Coupon\type\RemoveXPercentManager::setRules - * @expectedException \Thelia\Exception\InvalidRuleException - * - */ - public function testSetRulesInvalid() - { - // Given - $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( - Operators::EQUAL, - 20.00 - ); - $rule1 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( - Operators::INFERIOR, - 100.23 - ); - $rule2 = $this; - - $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false); - - // When - $coupon->setRules(new CouponRuleCollection(array($rule0, $rule1, $rule2))); - } - - /** - * Test Coupon effect for rule Total Amount < 400 - * - * @covers Thelia\Coupon\type\RemoveXPercentManager::getEffect - * - */ - public function testGetEffectIfTotalAmountInferiorTo400Valid() - { - // Given - $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( - Operators::INFERIOR, - 400.00 - ); - $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false); - - // When - $coupon->setRules(new CouponRuleCollection(array($rule0))); - - // Then - $expected = 24.50; - $actual = $coupon->getDiscount(); - $this->assertEquals($expected, $actual); - } - - /** - * Test Coupon effect for rule Total Amount <= 400 - * - * @covers Thelia\Coupon\type\RemoveXPercentManager::getEffect - * - */ - public function testGetEffectIfTotalAmountInferiorOrEqualTo400Valid() - { - // Given - $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( - Operators::INFERIOR_OR_EQUAL, - 400.00 - ); - $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false); - - // When - $coupon->setRules(new CouponRuleCollection(array($rule0))); - - // Then - $expected = 24.50; - $actual = $coupon->getDiscount(); - $this->assertEquals($expected, $actual); - } - - /** - * Test Coupon effect for rule Total Amount == 400 - * - * @covers Thelia\Coupon\type\RemoveXPercentManager::getEffect - * - */ - public function testGetEffectIfTotalAmountEqualTo400Valid() - { - // Given - $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( - Operators::EQUAL, - 400.00 - ); - $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false); - - // When - $coupon->setRules(new CouponRuleCollection(array($rule0))); - - // Then - $expected = 24.50; - $actual = $coupon->getDiscount(); - $this->assertEquals($expected, $actual); - } - - /** - * Test Coupon effect for rule Total Amount >= 400 - * - * @covers Thelia\Coupon\type\RemoveXPercentManager::getEffect - * - */ - public function testGetEffectIfTotalAmountSuperiorOrEqualTo400Valid() - { - // Given - $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( - Operators::SUPERIOR_OR_EQUAL, - 400.00 - ); - $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false); - - // When - $coupon->setRules(new CouponRuleCollection(array($rule0))); - - // Then - $expected = 24.50; - $actual = $coupon->getDiscount(); - $this->assertEquals($expected, $actual); - } - - /** - * Test Coupon effect for rule Total Amount > 400 - * - * @covers Thelia\Coupon\type\RemoveXPercentManager::getEffect - * - */ - public function testGetEffectIfTotalAmountSuperiorTo400Valid() - { - // Given - $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( - Operators::SUPERIOR, - 400.00 - ); - $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false); - - // When - $coupon->setRules(new CouponRuleCollection(array($rule0))); - - // Then - $expected = 24.50; - $actual = $coupon->getDiscount(); - $this->assertEquals($expected, $actual); - } - - /** - * Generate valid CouponInterface - * - * @param string $code Coupon Code - * @param string $title Coupon Title - * @param string $shortDescription Coupon short - * description - * @param string $description Coupon description - * @param float $amount Coupon discount - * @param bool $isEnabled Is Coupon enabled - * @param \DateTime $expirationDate Coupon expiration date - * @param CouponRuleCollection $rules Coupon rules - * @param bool $isCumulative If is cumulative - * @param bool $isRemovingPostage If is removing postage - * @param bool $isAvailableOnSpecialOffers If is available on - * special offers or not - * @param int $maxUsage How many time a Coupon - * can be used - * - * @return CouponInterface - */ - public function generateValidCoupon( - $code = null, - $title = null, - $shortDescription = null, - $description = null, - $percent = null, - $isEnabled = null, - $expirationDate = null, - $rules = null, - $isCumulative = null, - $isRemovingPostage = null, - $isAvailableOnSpecialOffers = null, - $maxUsage = null - ) { - $adapter = $this->generateFakeAdapter(245); - - if ($code === null) { - $code = CouponManagerTest::VALID_CODE; - } - if ($title === null) { - $title = CouponManagerTest::VALID_TITLE; - } - if ($shortDescription === null) { - $shortDescription = CouponManagerTest::VALID_SHORT_DESCRIPTION; - } - if ($description === null) { - $description = CouponManagerTest::VALID_DESCRIPTION; - } - if ($percent === null) { - $percent = 10.00; - } - if ($isEnabled === null) { - $isEnabled = true; - } - if ($isCumulative === null) { - $isCumulative = true; - } - if ($isRemovingPostage === null) { - $isRemovingPostage = false; - } - if ($isAvailableOnSpecialOffers === null) { - $isAvailableOnSpecialOffers = true; - } - if ($maxUsage === null) { - $maxUsage = 40; - } - - if ($expirationDate === null) { - $expirationDate = new \DateTime(); - $expirationDate->setTimestamp(strtotime("today + 2 months")); - } - - $coupon = new RemoveXPercent($adapter, $code, $title, $shortDescription, $description, $percent, $isCumulative, $isRemovingPostage, $isAvailableOnSpecialOffers, $isEnabled, $maxUsage, $expirationDate); - - if ($rules === null) { - $rules = CouponManagerTest::generateValidRules(); - } - - $coupon->setRules($rules); - - return $coupon; - } - - - /** - * Generate valid rule AvailableForTotalAmount - * according to given operator and amount - * - * @param string $operator Operators::CONST - * @param float $amount Amount with 2 decimals - * - * @return AvailableForTotalAmount - */ - protected function generateValidRuleAvailableForTotalAmountOperatorTo($operator, $amount) - { - $adapter = new CouponBaseAdapter(); - $validators = array( - AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( - $operator, - new PriceParam( - $adapter, - $amount, - 'EUR' - ) - ) - ); - - return new AvailableForTotalAmount($adapter, $validators); - } - - /** - * Generate a fake Adapter - * - * @param float $cartTotalPrice Cart total price - * - * @return \PHPUnit_Framework_MockObject_MockObject - */ - public function generateFakeAdapter($cartTotalPrice) - { - $stubCouponBaseAdapter = $this->getMock( - 'Thelia\Coupon\CouponBaseAdapter', - array( - 'getCartTotalPrice' - ), - array() - ); - - $stubCouponBaseAdapter->expects($this->any()) - ->method('getCartTotalPrice') - ->will($this->returnValue(($cartTotalPrice))); - - return $stubCouponBaseAdapter; - } - - /** - * Tears down the fixture, for example, closes a network connection. - * This method is called after a test is executed. - */ - protected function tearDown() - { } +// /** +// * Sets up the fixture, for example, opens a network connection. +// * This method is called before a test is executed. +// */ +// protected function setUp() +// { +// } +// +// /** +// * Test if a Coupon can be Cumulative +// * +// * @covers Thelia\Coupon\type\RemoveXPercentManager::isCumulative +// * +// */ +// public function testIsCumulative() +// { +// $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, true, true); +// +// $actual = $coupon->isCumulative(); +// $this->assertTrue($actual); +// } +// +// /** +// * Test if a Coupon can be non cumulative +// * +// * @covers Thelia\Coupon\type\RemoveXPercentManager::isCumulative +// * +// */ +// public function testIsNotCumulative() +// { +// $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false); +// +// $actual = $coupon->isCumulative(); +// $this->assertFalse($actual); +// } +// +// +// /** +// * Test if a Coupon can remove postage +// * +// * @covers Thelia\Coupon\type\RemoveXPercentManager::isRemovingPostage +// * +// */ +// public function testIsRemovingPostage() +// { +// $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, true, true); +// +// $actual = $coupon->isRemovingPostage(); +// $this->assertTrue($actual); +// } +// +// /** +// * Test if a Coupon won't remove postage if not set to +// * +// * @covers Thelia\Coupon\type\RemoveXPercentManager::isRemovingPostage +// */ +// public function testIsNotRemovingPostage() +// { +// $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false); +// +// $actual = $coupon->isRemovingPostage(); +// $this->assertFalse($actual); +// } +// +// +// /** +// * Test if a Coupon has the effect expected (discount 10euros) +// * +// * @covers Thelia\Coupon\type\RemoveXPercentManager::getEffect +// */ +// public function testGetEffect() +// { +// $adapter = $this->generateFakeAdapter(245); +// $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false); +// +// $expected = 24.50; +// $actual = $coupon->getDiscount($adapter); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * Test Coupon rule setter +// * +// * @covers Thelia\Coupon\type\RemoveXPercentManager::setRules +// * @covers Thelia\Coupon\type\RemoveXPercentManager::getRules +// */ +// public function testSetRulesValid() +// { +// // Given +// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( +// Operators::EQUAL, +// 20.00 +// ); +// $rule1 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( +// Operators::INFERIOR, +// 100.23 +// ); +// $rule2 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( +// Operators::SUPERIOR, +// 421.23 +// ); +// +// $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false); +// +// // When +// $coupon->setRules(new CouponRuleCollection(array($rule0, $rule1, $rule2))); +// +// // Then +// $expected = 3; +// $this->assertCount($expected, $coupon->getRules()->getRules()); +// } +// +// /** +// * Test Coupon rule setter +// * +// * @covers Thelia\Coupon\type\RemoveXPercentManager::setRules +// * @expectedException \Thelia\Exception\InvalidRuleException +// * +// */ +// public function testSetRulesInvalid() +// { +// // Given +// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( +// Operators::EQUAL, +// 20.00 +// ); +// $rule1 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( +// Operators::INFERIOR, +// 100.23 +// ); +// $rule2 = $this; +// +// $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false); +// +// // When +// $coupon->setRules(new CouponRuleCollection(array($rule0, $rule1, $rule2))); +// } +// +// /** +// * Test Coupon effect for rule Total Amount < 400 +// * +// * @covers Thelia\Coupon\type\RemoveXPercentManager::getEffect +// * +// */ +// public function testGetEffectIfTotalAmountInferiorTo400Valid() +// { +// // Given +// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( +// Operators::INFERIOR, +// 400.00 +// ); +// $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false); +// +// // When +// $coupon->setRules(new CouponRuleCollection(array($rule0))); +// +// // Then +// $expected = 24.50; +// $actual = $coupon->getDiscount(); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * Test Coupon effect for rule Total Amount <= 400 +// * +// * @covers Thelia\Coupon\type\RemoveXPercentManager::getEffect +// * +// */ +// public function testGetEffectIfTotalAmountInferiorOrEqualTo400Valid() +// { +// // Given +// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( +// Operators::INFERIOR_OR_EQUAL, +// 400.00 +// ); +// $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false); +// +// // When +// $coupon->setRules(new CouponRuleCollection(array($rule0))); +// +// // Then +// $expected = 24.50; +// $actual = $coupon->getDiscount(); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * Test Coupon effect for rule Total Amount == 400 +// * +// * @covers Thelia\Coupon\type\RemoveXPercentManager::getEffect +// * +// */ +// public function testGetEffectIfTotalAmountEqualTo400Valid() +// { +// // Given +// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( +// Operators::EQUAL, +// 400.00 +// ); +// $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false); +// +// // When +// $coupon->setRules(new CouponRuleCollection(array($rule0))); +// +// // Then +// $expected = 24.50; +// $actual = $coupon->getDiscount(); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * Test Coupon effect for rule Total Amount >= 400 +// * +// * @covers Thelia\Coupon\type\RemoveXPercentManager::getEffect +// * +// */ +// public function testGetEffectIfTotalAmountSuperiorOrEqualTo400Valid() +// { +// // Given +// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( +// Operators::SUPERIOR_OR_EQUAL, +// 400.00 +// ); +// $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false); +// +// // When +// $coupon->setRules(new CouponRuleCollection(array($rule0))); +// +// // Then +// $expected = 24.50; +// $actual = $coupon->getDiscount(); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * Test Coupon effect for rule Total Amount > 400 +// * +// * @covers Thelia\Coupon\type\RemoveXPercentManager::getEffect +// * +// */ +// public function testGetEffectIfTotalAmountSuperiorTo400Valid() +// { +// // Given +// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo( +// Operators::SUPERIOR, +// 400.00 +// ); +// $coupon = $this->generateValidCoupon(null, null, null, null, null, null, null, null, false, false); +// +// // When +// $coupon->setRules(new CouponRuleCollection(array($rule0))); +// +// // Then +// $expected = 24.50; +// $actual = $coupon->getDiscount(); +// $this->assertEquals($expected, $actual); +// } +// +// /** +// * Generate valid CouponInterface +// * +// * @param string $code Coupon Code +// * @param string $title Coupon Title +// * @param string $shortDescription Coupon short +// * description +// * @param string $description Coupon description +// * @param float $amount Coupon discount +// * @param bool $isEnabled Is Coupon enabled +// * @param \DateTime $expirationDate Coupon expiration date +// * @param CouponRuleCollection $rules Coupon rules +// * @param bool $isCumulative If is cumulative +// * @param bool $isRemovingPostage If is removing postage +// * @param bool $isAvailableOnSpecialOffers If is available on +// * special offers or not +// * @param int $maxUsage How many time a Coupon +// * can be used +// * +// * @return CouponInterface +// */ +// public function generateValidCoupon( +// $code = null, +// $title = null, +// $shortDescription = null, +// $description = null, +// $percent = null, +// $isEnabled = null, +// $expirationDate = null, +// $rules = null, +// $isCumulative = null, +// $isRemovingPostage = null, +// $isAvailableOnSpecialOffers = null, +// $maxUsage = null +// ) { +// $adapter = $this->generateFakeAdapter(245); +// +// if ($code === null) { +// $code = CouponManagerTest::VALID_CODE; +// } +// if ($title === null) { +// $title = CouponManagerTest::VALID_TITLE; +// } +// if ($shortDescription === null) { +// $shortDescription = CouponManagerTest::VALID_SHORT_DESCRIPTION; +// } +// if ($description === null) { +// $description = CouponManagerTest::VALID_DESCRIPTION; +// } +// if ($percent === null) { +// $percent = 10.00; +// } +// if ($isEnabled === null) { +// $isEnabled = true; +// } +// if ($isCumulative === null) { +// $isCumulative = true; +// } +// if ($isRemovingPostage === null) { +// $isRemovingPostage = false; +// } +// if ($isAvailableOnSpecialOffers === null) { +// $isAvailableOnSpecialOffers = true; +// } +// if ($maxUsage === null) { +// $maxUsage = 40; +// } +// +// if ($expirationDate === null) { +// $expirationDate = new \DateTime(); +// $expirationDate->setTimestamp(strtotime("today + 2 months")); +// } +// +// $coupon = new RemoveXPercent($adapter, $code, $title, $shortDescription, $description, $percent, $isCumulative, $isRemovingPostage, $isAvailableOnSpecialOffers, $isEnabled, $maxUsage, $expirationDate); +// +// if ($rules === null) { +// $rules = CouponManagerTest::generateValidRules(); +// } +// +// $coupon->setRules($rules); +// +// return $coupon; +// } +// +// +// /** +// * Generate valid rule AvailableForTotalAmount +// * according to given operator and amount +// * +// * @param string $operator Operators::CONST +// * @param float $amount Amount with 2 decimals +// * +// * @return AvailableForTotalAmount +// */ +// protected function generateValidRuleAvailableForTotalAmountOperatorTo($operator, $amount) +// { +// $adapter = new CouponBaseAdapter(); +// $validators = array( +// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator( +// $operator, +// new PriceParam( +// $adapter, +// $amount, +// 'EUR' +// ) +// ) +// ); +// +// return new AvailableForTotalAmount($adapter, $validators); +// } +// +// /** +// * Generate a fake Adapter +// * +// * @param float $cartTotalPrice Cart total price +// * +// * @return \PHPUnit_Framework_MockObject_MockObject +// */ +// public function generateFakeAdapter($cartTotalPrice) +// { +// $stubCouponBaseAdapter = $this->getMock( +// 'Thelia\Coupon\CouponBaseAdapter', +// array( +// 'getCartTotalPrice' +// ), +// array() +// ); +// +// $stubCouponBaseAdapter->expects($this->any()) +// ->method('getCartTotalPrice') +// ->will($this->returnValue(($cartTotalPrice))); +// +// return $stubCouponBaseAdapter; +// } +// +// /** +// * Tears down the fixture, for example, closes a network connection. +// * This method is called after a test is executed. +// */ +// protected function tearDown() +// { +// } } From 02d758ae9a0a4d2173109d248512468a40060c94 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Mon, 9 Sep 2013 17:30:18 +0200 Subject: [PATCH 114/125] start integration default template --- .../bootstrap-magnify/bootstrap-magnify.css | 19 + .../bootstrap-magnify.min.css | 1 + .../glyphicons-halflings-regular.eot | Bin 0 -> 14079 bytes .../glyphicons-halflings-regular.svg | 228 ++ .../glyphicons-halflings-regular.ttf | Bin 0 -> 29512 bytes .../glyphicons-halflings-regular.woff | Bin 0 -> 16448 bytes .../font/fontawesome/fontawesome-webfont.eot | Bin 0 -> 37405 bytes .../font/fontawesome/fontawesome-webfont.svg | 399 ++++ .../font/fontawesome/fontawesome-webfont.ttf | Bin 0 -> 79076 bytes .../font/fontawesome/fontawesome-webfont.woff | Bin 0 -> 43572 bytes templates/default/assets/img/218x146.png | Bin 0 -> 2132 bytes templates/default/assets/img/280x196.png | Bin 0 -> 2950 bytes templates/default/assets/img/700x320.png | Bin 0 -> 14846 bytes .../default/assets/img/carousel/1200x390.png | Bin 0 -> 11534 bytes templates/default/assets/img/logo.gif | Bin 0 -> 2159 bytes .../assets/img/payment/american-express.png | Bin 0 -> 3753 bytes .../default/assets/img/payment/cheque.png | Bin 0 -> 4090 bytes .../default/assets/img/payment/kwixo.png | Bin 0 -> 3940 bytes .../default/assets/img/payment/mastercard.png | Bin 0 -> 3733 bytes templates/default/assets/img/payment/visa.png | Bin 0 -> 3158 bytes .../default/assets/img/product/1/118x85.png | Bin 0 -> 1642 bytes .../default/assets/img/product/1/560x445.png | Bin 0 -> 6299 bytes .../default/assets/js/bootstrap/affix.js | 126 ++ .../default/assets/js/bootstrap/alert.js | 98 + .../default/assets/js/bootstrap/button.js | 109 + .../default/assets/js/bootstrap/carousel.js | 217 ++ .../default/assets/js/bootstrap/collapse.js | 179 ++ .../default/assets/js/bootstrap/dropdown.js | 154 ++ .../default/assets/js/bootstrap/modal.js | 246 +++ .../default/assets/js/bootstrap/popover.js | 117 + .../default/assets/js/bootstrap/scrollspy.js | 158 ++ templates/default/assets/js/bootstrap/tab.js | 135 ++ .../default/assets/js/bootstrap/tooltip.js | 386 ++++ .../default/assets/js/bootstrap/transition.js | 56 + templates/default/assets/js/libs/jquery.js | 6 + .../bootstrap-magnify/bootstrap-magnify.js | 120 + .../bootstrap-magnify.min.js | 1 + .../js/plugins/menu-aim/jquery.menu-aim.js | 323 +++ templates/default/assets/js/script.js | 151 ++ .../default/assets/less/bootstrap/alerts.less | 67 + .../default/assets/less/bootstrap/badges.less | 51 + .../assets/less/bootstrap/bootstrap.less | 59 + .../assets/less/bootstrap/breadcrumbs.less | 23 + .../assets/less/bootstrap/button-groups.less | 248 +++ .../assets/less/bootstrap/buttons.less | 160 ++ .../assets/less/bootstrap/carousel.less | 209 ++ .../default/assets/less/bootstrap/close.less | 33 + .../default/assets/less/bootstrap/code.less | 56 + .../less/bootstrap/component-animations.less | 29 + .../assets/less/bootstrap/dropdowns.less | 193 ++ .../default/assets/less/bootstrap/forms.less | 353 +++ .../assets/less/bootstrap/glyphicons.less | 232 ++ .../default/assets/less/bootstrap/grid.less | 346 +++ .../assets/less/bootstrap/input-groups.less | 127 ++ .../assets/less/bootstrap/jumbotron.less | 40 + .../default/assets/less/bootstrap/labels.less | 58 + .../assets/less/bootstrap/list-group.less | 88 + .../default/assets/less/bootstrap/media.less | 56 + .../default/assets/less/bootstrap/mixins.less | 723 ++++++ .../default/assets/less/bootstrap/modals.less | 141 ++ .../default/assets/less/bootstrap/navbar.less | 621 ++++++ .../default/assets/less/bootstrap/navs.less | 229 ++ .../assets/less/bootstrap/normalize.less | 396 ++++ .../default/assets/less/bootstrap/pager.less | 55 + .../assets/less/bootstrap/pagination.less | 83 + .../default/assets/less/bootstrap/panels.less | 148 ++ .../assets/less/bootstrap/popovers.less | 133 ++ .../default/assets/less/bootstrap/print.less | 100 + .../assets/less/bootstrap/progress-bars.less | 95 + .../less/bootstrap/responsive-utilities.less | 220 ++ .../assets/less/bootstrap/scaffolding.less | 130 ++ .../default/assets/less/bootstrap/tables.less | 236 ++ .../default/assets/less/bootstrap/theme.less | 232 ++ .../assets/less/bootstrap/thumbnails.less | 31 + .../assets/less/bootstrap/tooltip.less | 95 + .../default/assets/less/bootstrap/type.less | 238 ++ .../assets/less/bootstrap/utilities.less | 42 + .../assets/less/bootstrap/variables.less | 620 ++++++ .../default/assets/less/bootstrap/wells.less | 29 + .../assets/less/fontawesome/bootstrap.less | 84 + .../default/assets/less/fontawesome/core.less | 129 ++ .../assets/less/fontawesome/extras.less | 93 + .../less/fontawesome/font-awesome-ie7.less | 1953 +++++++++++++++++ .../assets/less/fontawesome/font-awesome.less | 33 + .../assets/less/fontawesome/icons.less | 381 ++++ .../assets/less/fontawesome/mixins.less | 48 + .../default/assets/less/fontawesome/path.less | 14 + .../assets/less/fontawesome/variables.less | 735 +++++++ .../bootstrap-magnify/bootstrap-magnify.less | 20 + templates/default/assets/less/styles.less | 15 + .../default/assets/less/thelia/account.less | 65 + .../default/assets/less/thelia/blocks.less | 253 +++ .../assets/less/thelia/breadcrumbs.less | 10 + .../default/assets/less/thelia/buttons.less | 97 + .../default/assets/less/thelia/cart.less | 72 + .../default/assets/less/thelia/category.less | 126 ++ .../default/assets/less/thelia/checkout.less | 110 + .../default/assets/less/thelia/filters.less | 34 + .../default/assets/less/thelia/footer.less | 75 + .../default/assets/less/thelia/forms.less | 57 + .../default/assets/less/thelia/global.less | 81 + .../default/assets/less/thelia/header.less | 36 + .../default/assets/less/thelia/import.less | 35 + .../default/assets/less/thelia/labels.less | 7 + .../default/assets/less/thelia/navbar.less | 204 ++ .../default/assets/less/thelia/page-home.less | 29 + .../assets/less/thelia/pagination.less | 13 + .../default/assets/less/thelia/panels.less | 48 + .../default/assets/less/thelia/path.less | 14 + .../default/assets/less/thelia/price.less | 46 + .../default/assets/less/thelia/product.less | 109 + .../default/assets/less/thelia/toolbars.less | 43 + .../default/assets/less/thelia/variables.less | 136 ++ .../assets/themes/default/less/import.less | 4 + .../assets/themes/default/less/theme.less | 1170 ++++++++++ .../assets/themes/default/less/variables.less | 115 + templates/default/index.html | 462 ++-- templates/default/layout.tpl | 405 ++++ templates/{default => default_save}/404.html | 0 .../{default => default_save}/address.html | 0 .../address_edit.html | 0 .../address_list.html | 0 .../bootstrap/css/bootstrap-responsive.css | 0 .../css/bootstrap-responsive.min.css | 0 .../assets/bootstrap/css/bootstrap.css | 0 .../assets/bootstrap/css/bootstrap.min.css | 0 .../img/glyphicons-halflings-white.png | Bin .../bootstrap/img/glyphicons-halflings.png | Bin .../assets/bootstrap/js/bootstrap.js | 0 .../assets/bootstrap/js/bootstrap.min.js | 0 .../assets/css/img/bg.jpg | Bin .../assets/css/style.less | 0 .../assets/img/logo-thelia-34px.png | Bin .../assets/img/test-background.jpg | Bin .../assets/js/jquery.min.js | 0 templates/{default => default_save}/cart.html | 0 .../{default => default_save}/category.html | 0 .../{default => default_save}/connexion.html | 0 .../{default => default_save}/customer.html | 0 .../{default => default_save}/debug.html | 0 .../delivery_list.html | 0 .../{default => default_save}/folder.html | 0 .../{default => default_save}/i18n/en.php | 0 .../{default => default_save}/i18n/fr.php | 0 .../{default => default_save}/images.html | 0 .../{default => default_save}/included.html | 0 .../includes/footer.html | 0 .../includes/header.html | 0 templates/default_save/index.html | 151 ++ .../{default => default_save}/login.html | 0 .../{default => default_save}/myaccount.html | 0 .../{default => default_save}/pagination.html | 0 .../{default => default_save}/product.html | 0 .../{default => default_save}/tester.html | 0 154 files changed, 17638 insertions(+), 128 deletions(-) create mode 100755 templates/default/assets/css/plugins/bootstrap-magnify/bootstrap-magnify.css create mode 100755 templates/default/assets/css/plugins/bootstrap-magnify/bootstrap-magnify.min.css create mode 100755 templates/default/assets/font/bootstrap/glyphicons-halflings-regular.eot create mode 100755 templates/default/assets/font/bootstrap/glyphicons-halflings-regular.svg create mode 100755 templates/default/assets/font/bootstrap/glyphicons-halflings-regular.ttf create mode 100755 templates/default/assets/font/bootstrap/glyphicons-halflings-regular.woff create mode 100755 templates/default/assets/font/fontawesome/fontawesome-webfont.eot create mode 100755 templates/default/assets/font/fontawesome/fontawesome-webfont.svg create mode 100755 templates/default/assets/font/fontawesome/fontawesome-webfont.ttf create mode 100755 templates/default/assets/font/fontawesome/fontawesome-webfont.woff create mode 100644 templates/default/assets/img/218x146.png create mode 100644 templates/default/assets/img/280x196.png create mode 100644 templates/default/assets/img/700x320.png create mode 100644 templates/default/assets/img/carousel/1200x390.png create mode 100644 templates/default/assets/img/logo.gif create mode 100644 templates/default/assets/img/payment/american-express.png create mode 100644 templates/default/assets/img/payment/cheque.png create mode 100644 templates/default/assets/img/payment/kwixo.png create mode 100644 templates/default/assets/img/payment/mastercard.png create mode 100644 templates/default/assets/img/payment/visa.png create mode 100644 templates/default/assets/img/product/1/118x85.png create mode 100644 templates/default/assets/img/product/1/560x445.png create mode 100755 templates/default/assets/js/bootstrap/affix.js create mode 100755 templates/default/assets/js/bootstrap/alert.js create mode 100755 templates/default/assets/js/bootstrap/button.js create mode 100755 templates/default/assets/js/bootstrap/carousel.js create mode 100755 templates/default/assets/js/bootstrap/collapse.js create mode 100755 templates/default/assets/js/bootstrap/dropdown.js create mode 100755 templates/default/assets/js/bootstrap/modal.js create mode 100755 templates/default/assets/js/bootstrap/popover.js create mode 100755 templates/default/assets/js/bootstrap/scrollspy.js create mode 100755 templates/default/assets/js/bootstrap/tab.js create mode 100755 templates/default/assets/js/bootstrap/tooltip.js create mode 100755 templates/default/assets/js/bootstrap/transition.js create mode 100644 templates/default/assets/js/libs/jquery.js create mode 100755 templates/default/assets/js/plugins/bootstrap-magnify/bootstrap-magnify.js create mode 100755 templates/default/assets/js/plugins/bootstrap-magnify/bootstrap-magnify.min.js create mode 100755 templates/default/assets/js/plugins/menu-aim/jquery.menu-aim.js create mode 100644 templates/default/assets/js/script.js create mode 100755 templates/default/assets/less/bootstrap/alerts.less create mode 100755 templates/default/assets/less/bootstrap/badges.less create mode 100755 templates/default/assets/less/bootstrap/bootstrap.less create mode 100755 templates/default/assets/less/bootstrap/breadcrumbs.less create mode 100755 templates/default/assets/less/bootstrap/button-groups.less create mode 100755 templates/default/assets/less/bootstrap/buttons.less create mode 100755 templates/default/assets/less/bootstrap/carousel.less create mode 100755 templates/default/assets/less/bootstrap/close.less create mode 100755 templates/default/assets/less/bootstrap/code.less create mode 100755 templates/default/assets/less/bootstrap/component-animations.less create mode 100755 templates/default/assets/less/bootstrap/dropdowns.less create mode 100755 templates/default/assets/less/bootstrap/forms.less create mode 100755 templates/default/assets/less/bootstrap/glyphicons.less create mode 100755 templates/default/assets/less/bootstrap/grid.less create mode 100755 templates/default/assets/less/bootstrap/input-groups.less create mode 100755 templates/default/assets/less/bootstrap/jumbotron.less create mode 100755 templates/default/assets/less/bootstrap/labels.less create mode 100755 templates/default/assets/less/bootstrap/list-group.less create mode 100755 templates/default/assets/less/bootstrap/media.less create mode 100755 templates/default/assets/less/bootstrap/mixins.less create mode 100755 templates/default/assets/less/bootstrap/modals.less create mode 100755 templates/default/assets/less/bootstrap/navbar.less create mode 100755 templates/default/assets/less/bootstrap/navs.less create mode 100755 templates/default/assets/less/bootstrap/normalize.less create mode 100755 templates/default/assets/less/bootstrap/pager.less create mode 100755 templates/default/assets/less/bootstrap/pagination.less create mode 100755 templates/default/assets/less/bootstrap/panels.less create mode 100755 templates/default/assets/less/bootstrap/popovers.less create mode 100755 templates/default/assets/less/bootstrap/print.less create mode 100755 templates/default/assets/less/bootstrap/progress-bars.less create mode 100755 templates/default/assets/less/bootstrap/responsive-utilities.less create mode 100755 templates/default/assets/less/bootstrap/scaffolding.less create mode 100755 templates/default/assets/less/bootstrap/tables.less create mode 100755 templates/default/assets/less/bootstrap/theme.less create mode 100755 templates/default/assets/less/bootstrap/thumbnails.less create mode 100755 templates/default/assets/less/bootstrap/tooltip.less create mode 100755 templates/default/assets/less/bootstrap/type.less create mode 100755 templates/default/assets/less/bootstrap/utilities.less create mode 100755 templates/default/assets/less/bootstrap/variables.less create mode 100755 templates/default/assets/less/bootstrap/wells.less create mode 100644 templates/default/assets/less/fontawesome/bootstrap.less create mode 100644 templates/default/assets/less/fontawesome/core.less create mode 100644 templates/default/assets/less/fontawesome/extras.less create mode 100644 templates/default/assets/less/fontawesome/font-awesome-ie7.less create mode 100644 templates/default/assets/less/fontawesome/font-awesome.less create mode 100644 templates/default/assets/less/fontawesome/icons.less create mode 100644 templates/default/assets/less/fontawesome/mixins.less create mode 100644 templates/default/assets/less/fontawesome/path.less create mode 100644 templates/default/assets/less/fontawesome/variables.less create mode 100755 templates/default/assets/less/plugins/bootstrap-magnify/bootstrap-magnify.less create mode 100755 templates/default/assets/less/styles.less create mode 100644 templates/default/assets/less/thelia/account.less create mode 100755 templates/default/assets/less/thelia/blocks.less create mode 100755 templates/default/assets/less/thelia/breadcrumbs.less create mode 100644 templates/default/assets/less/thelia/buttons.less create mode 100644 templates/default/assets/less/thelia/cart.less create mode 100644 templates/default/assets/less/thelia/category.less create mode 100644 templates/default/assets/less/thelia/checkout.less create mode 100755 templates/default/assets/less/thelia/filters.less create mode 100755 templates/default/assets/less/thelia/footer.less create mode 100755 templates/default/assets/less/thelia/forms.less create mode 100755 templates/default/assets/less/thelia/global.less create mode 100755 templates/default/assets/less/thelia/header.less create mode 100755 templates/default/assets/less/thelia/import.less create mode 100755 templates/default/assets/less/thelia/labels.less create mode 100755 templates/default/assets/less/thelia/navbar.less create mode 100755 templates/default/assets/less/thelia/page-home.less create mode 100755 templates/default/assets/less/thelia/pagination.less create mode 100755 templates/default/assets/less/thelia/panels.less create mode 100644 templates/default/assets/less/thelia/path.less create mode 100755 templates/default/assets/less/thelia/price.less create mode 100755 templates/default/assets/less/thelia/product.less create mode 100755 templates/default/assets/less/thelia/toolbars.less create mode 100755 templates/default/assets/less/thelia/variables.less create mode 100755 templates/default/assets/themes/default/less/import.less create mode 100755 templates/default/assets/themes/default/less/theme.less create mode 100755 templates/default/assets/themes/default/less/variables.less mode change 100755 => 100644 templates/default/index.html create mode 100644 templates/default/layout.tpl rename templates/{default => default_save}/404.html (100%) rename templates/{default => default_save}/address.html (100%) rename templates/{default => default_save}/address_edit.html (100%) rename templates/{default => default_save}/address_list.html (100%) rename templates/{default => default_save}/assets/bootstrap/css/bootstrap-responsive.css (100%) rename templates/{default => default_save}/assets/bootstrap/css/bootstrap-responsive.min.css (100%) rename templates/{default => default_save}/assets/bootstrap/css/bootstrap.css (100%) rename templates/{default => default_save}/assets/bootstrap/css/bootstrap.min.css (100%) rename templates/{default => default_save}/assets/bootstrap/img/glyphicons-halflings-white.png (100%) rename templates/{default => default_save}/assets/bootstrap/img/glyphicons-halflings.png (100%) rename templates/{default => default_save}/assets/bootstrap/js/bootstrap.js (100%) rename templates/{default => default_save}/assets/bootstrap/js/bootstrap.min.js (100%) rename templates/{default => default_save}/assets/css/img/bg.jpg (100%) rename templates/{default => default_save}/assets/css/style.less (100%) rename templates/{default => default_save}/assets/img/logo-thelia-34px.png (100%) rename templates/{default => default_save}/assets/img/test-background.jpg (100%) rename templates/{default => default_save}/assets/js/jquery.min.js (100%) rename templates/{default => default_save}/cart.html (100%) rename templates/{default => default_save}/category.html (100%) rename templates/{default => default_save}/connexion.html (100%) rename templates/{default => default_save}/customer.html (100%) rename templates/{default => default_save}/debug.html (100%) rename templates/{default => default_save}/delivery_list.html (100%) rename templates/{default => default_save}/folder.html (100%) rename templates/{default => default_save}/i18n/en.php (100%) rename templates/{default => default_save}/i18n/fr.php (100%) rename templates/{default => default_save}/images.html (100%) rename templates/{default => default_save}/included.html (100%) rename templates/{default => default_save}/includes/footer.html (100%) rename templates/{default => default_save}/includes/header.html (100%) create mode 100755 templates/default_save/index.html rename templates/{default => default_save}/login.html (100%) rename templates/{default => default_save}/myaccount.html (100%) rename templates/{default => default_save}/pagination.html (100%) rename templates/{default => default_save}/product.html (100%) rename templates/{default => default_save}/tester.html (100%) diff --git a/templates/default/assets/css/plugins/bootstrap-magnify/bootstrap-magnify.css b/templates/default/assets/css/plugins/bootstrap-magnify/bootstrap-magnify.css new file mode 100755 index 000000000..a24a8e142 --- /dev/null +++ b/templates/default/assets/css/plugins/bootstrap-magnify/bootstrap-magnify.css @@ -0,0 +1,19 @@ +.magnify { + position: relative; + cursor: none +} + +.magnify-large { + position: absolute; + display: none; + width: 175px; + height: 175px; + + -webkit-box-shadow: 0 0 0 7px rgba(255, 255, 255, 0.85), 0 0 7px 7px rgba(0, 0, 0, 0.25), inset 0 0 40px 2px rgba(0, 0, 0, 0.25); + -moz-box-shadow: 0 0 0 7px rgba(255, 255, 255, 0.85), 0 0 7px 7px rgba(0, 0, 0, 0.25), inset 0 0 40px 2px rgba(0, 0, 0, 0.25); + box-shadow: 0 0 0 7px rgba(255, 255, 255, 0.85), 0 0 7px 7px rgba(0, 0, 0, 0.25), inset 0 0 40px 2px rgba(0, 0, 0, 0.25); + + -webkit-border-radius: 100%; + -moz-border-radius: 100%; + border-radius: 100% +} \ No newline at end of file diff --git a/templates/default/assets/css/plugins/bootstrap-magnify/bootstrap-magnify.min.css b/templates/default/assets/css/plugins/bootstrap-magnify/bootstrap-magnify.min.css new file mode 100755 index 000000000..15b9cc170 --- /dev/null +++ b/templates/default/assets/css/plugins/bootstrap-magnify/bootstrap-magnify.min.css @@ -0,0 +1 @@ +.magnify{position:relative;cursor:none}.magnify-large{position:absolute;display:none;width:175px;height:175px;-webkit-box-shadow:0 0 0 7px rgba(255,255,255,0.85),0 0 7px 7px rgba(0,0,0,0.25),inset 0 0 40px 2px rgba(0,0,0,0.25);-moz-box-shadow:0 0 0 7px rgba(255,255,255,0.85),0 0 7px 7px rgba(0,0,0,0.25),inset 0 0 40px 2px rgba(0,0,0,0.25);box-shadow:0 0 0 7px rgba(255,255,255,0.85),0 0 7px 7px rgba(0,0,0,0.25),inset 0 0 40px 2px rgba(0,0,0,0.25);-webkit-border-radius:100%;-moz-border-radius:100%;border-radius:100%} \ No newline at end of file diff --git a/templates/default/assets/font/bootstrap/glyphicons-halflings-regular.eot b/templates/default/assets/font/bootstrap/glyphicons-halflings-regular.eot new file mode 100755 index 0000000000000000000000000000000000000000..87eaa434234e2a984c261e0450a2f4ad837aa7b4 GIT binary patch literal 14079 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 literal 0 HcmV?d00001 diff --git a/templates/default/assets/font/bootstrap/glyphicons-halflings-regular.svg b/templates/default/assets/font/bootstrap/glyphicons-halflings-regular.svg new file mode 100755 index 000000000..5fee06854 --- /dev/null +++ b/templates/default/assets/font/bootstrap/glyphicons-halflings-regular.svg @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/templates/default/assets/font/bootstrap/glyphicons-halflings-regular.ttf b/templates/default/assets/font/bootstrap/glyphicons-halflings-regular.ttf new file mode 100755 index 0000000000000000000000000000000000000000..be784dc1d5bcb92ab155f578f3723524a3dd9688 GIT binary patch literal 29512 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 DlhOCh literal 0 HcmV?d00001 diff --git a/templates/default/assets/font/bootstrap/glyphicons-halflings-regular.woff b/templates/default/assets/font/bootstrap/glyphicons-halflings-regular.woff new file mode 100755 index 0000000000000000000000000000000000000000..2cc3e4852a5a42e6aadd6284e067b66e14a57bc7 GIT binary patch literal 16448 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�-A&iY%khEsGVMaq&$BJA^QAs8x>7-g_ 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 k3oQ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/templates/default/assets/font/fontawesome/fontawesome-webfont.ttf b/templates/default/assets/font/fontawesome/fontawesome-webfont.ttf new file mode 100755 index 0000000000000000000000000000000000000000..d3659246915cacb0c9204271f1f9fc5f77049eac GIT binary patch literal 79076 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 literal 0 HcmV?d00001 diff --git a/templates/default/assets/img/218x146.png b/templates/default/assets/img/218x146.png new file mode 100644 index 0000000000000000000000000000000000000000..07f043b12dea28a6c680b837b6512081b608b1c1 GIT binary patch literal 2132 zcmV-a2&?yrP)vpR+ z422bY3`sMJdH<&!2uV}G7j4N9*680^JuB^pv~{tKLvb&2&NC4WY9nUvoa5~eWPbpi z6pKcz_;}iu&3y~ac^lV^_2L@MZ9d9>1Fb<6jzRdrnk;TUj*mub8ijw+SSL1W7KPj( z3Li=HIL=oBeFkCl!{-WzQ%acyiXHn%5Qn-u>LnNDo|7fx zt=KYXj!zJU#=$22KfD2KYVaP-O(8aFNk+4;cOcV_p0u6K8DrZC<(P)o|gvCZCrzQF)H@YqOGl-4UPRk7^quT<-6NoK=W~^Ls zQX8Kj{o`oW;pF)@xC0^*Mk^LI(QvX)0f?yB0I!Mrr?CKp9o&ZYT2eHqEu0F#(7caC z#g-sX1*C_Dllkd{p>3Otrhi#o^Q!V1USaIqSJHn1ZR>cnyLbjJPLS;L>p9%wi)H%_O#2YP|Y)x_jF-{im_XAh!9rxV7|>eskvZ52LXmB6%sbM`8Yh zr*UWzIkUuSK$}xP=i4Jga|($q{Ud|e-dV$E<*~51pV%_g3CBx+dHBuC6KG|53@rdi zua!a5i;aHEGBH;-MbH9(^jaCTt=K%&iU3QQyA3wEO(<=z4BrDju-{An&!ZXezO>4h<>*UMjXi#Z!n)6OU*C5Q{C3rs%bl@i?lDEn;I7 zP0?%lFlf!S@3r!1ie5{9kS1_6h|QtL&)~r(8qk2AMA~Z=&|tB-!C=%}Y^6hkX!_@1 zKm!VZP;3wy?-h^OP%2zRF0N5xy;gQDRcPE;Y$Y_X*K%Y-6BhvCU{gXv#pZ2j@(DoJ zYZbR~(3r6~OA#GIuOgTWKy21)mC+P~jWHsH1wbOU+QB<`$HrUPVyj-O zf`+dm#6t>zL~ON}yzo_oV+w#kY$%!_JzEO^>BQ#Hw+tBR)Cu{ojuEYWB>hKQo6c5LFXdja@7bDEAi zFu`d=xjlM70r0OQzi(5#a;`cZ6ZbCwj_AY1i5p1jXu8uedoKY+$4k>(6ySBuIT_Vf z#PTbyl+z@4Am~P65zD>q%r~0hr!>Nam$JOXk&R+GGE^p_F{`(_PmOIX3+TIO>zgq;MH$ zK6~i;kX9QxJ(~I?GCq{%z#hKux(;%h?AjvrNo1%1gwmikjAT6_PLrXjPa?+#BAcDo zO=yFcCVnxR{@A~GD9wxP`G~@V)}_P-pFM7M>|a~}xcIQRf1-7W(}Y)q>5u(O3P7l> zhQt{xDYj@tGrVIXDFD9mpy-XZ5gR!xnpa0;bpi#jqgmei@>qwTtk!Q^iOn@Yv%F%NDF8vZC*#7$X}6m& z@dIeKS1f~4WPhF3-|qM8<+5;FY=UNbpP3ROlUBy5#p*|{5o@%c&P$ypMl-$7yqy5# z=W)Yr#G1J#w40YYO^jx{JYZ1(g8b;?_-j8{vk7wufM)2m)&)SgwDP>7a=0(SEPg zOMkE?>whjAlR6E!(%B@oCtT$Ql@(UfX`|cbd9>M;&UUd?#pM#$+TJb+v{`ITFXHy5 z^pCmg<+Mu*?doMtL+%*2i4DZcIc+qOISsiP-g;3Jgq3sJEVkC)o#C5`ZQ9l>-x+<+ zppCs&Y>eibiLK(U*}6-{uH62Mlcq~ zY_L(eYw0vhToyEWuVuh`JMG?SqEL$_>$Qwnlhf|K5erAFi!C{vphpnwSU6hwbd23y z192Oy257%$GMixe*wVmn^5WEvL>nv@8ykq0*mWV|lZeZPX1eBJZ*kesY?lG-EG{D& zx8h>&;=YEW`6lk#9ZQ4ePAsl9+P?>ijo2T>HT|Xk{BP|)0R{jn6z7%;EJ3{h0000< KMNUMnLSTX+cM!Dz literal 0 HcmV?d00001 diff --git a/templates/default/assets/img/280x196.png b/templates/default/assets/img/280x196.png new file mode 100644 index 0000000000000000000000000000000000000000..0df3c940339ed8bc204069195706a482aafab03b GIT binary patch literal 2950 zcmV;13wiX3P)+Amh{`~y>_4W1p`}@*M28;jz3gbycK~#9! z?49d&;yMh4Z6q5g?VQH%|FFkNpiQXb*wS_aEc|2E%&ZwGAJUe$e2Mw*`#lolKl2?P zbTE-|HjYj@EGyprF~R7e41-<@3^N&H^;F_8uLA}YD%auoCBR^zXhr5h!1Vd!ER>2; zWF7#_ASwMa5cYh?!0D#oY6NLFUgD zO6bi^APW_lO~HVn^i;x+?F$B)OPhfKi^>2c%nWfdWXwZ@VSN7FLForuq{y@f1BWur zpXmq=DKc%rKxZoVqVfk!vM|xZfoV{bL&$dBpd!-<%qF7pM`RqZ_0Ry!W}?zmWWZor z6y@>`HUUKj2xfaxX(=)&Fs)|#RfB=KgaCt{=@SW{EV=?=>p=@W!Ys{H!jMcGgbc_P-8`=bIv~*jh|FqhGrdD!*bo>| z`1t9Kaoru6D;*11O#rkWR>2sY$k6Xrp7B(K&mFWeBu4{q1?$aloXEHlgvoxd6HTT) zMP?ODIx1P5Nq*AaG?|#0|I6(Q_WHUKtYFi?rQ>N?&4N*Mwe+rF9ZXVWjJQ}&!yx24 zr;1ety~q@-L?+vqL0YV5|8s58O6)y?x?mTqU4uksEJA)3YgvuyG+iy$icG<72aw2^ zYkDLmHp^rjBSpqy!4O7dMhG+UU0we5)*uUZjmVUMNlzoC)85}8pw&iu{4W7nun7u= zA+CUaKC2zQ5Em_rd$W_slufZNh3lKX zb72>eDFK5h*wlIHHXGVSWQuleT751VF&C+2Qnnt7!01ILSUDJB$S7Sw**@Ro(ozuA zBw5I?Ok`BKR0KvZGDZVNXqj}ahq5j6T2~MhTO5ZiblbNc%D`w_4=k6Mah4Z0FW6;Z zw5Xj8D!qjLq+sliA>Mzt4O z0jAu=7(EzKV_YLLr6=4pt%m?P)=9h*l=VB2#?4*oj4kF((JT;Dnr_^-v5(?h2^GfDyQCMeCs$jNBEt4m9d5 zlVU-#7>rnC7h=<)7bF=9M$vi*4wy`4 z3z4b1?oF{)K)}LOXPJbphbl0d1xeT8lBsGhkx*o+z-ZPAXgA9w+x1WdMztWhn`M%@ zg1RduH4Bmf7czC0N!EI(1EbpYU^>5x{>ofI9T?SuBqK|+CP# z1%pxUg(e`F@`cIS*E!tjXdGC4)yJ^yE|%%$3alM235Z-AgTZLGDelu4A4Fyhm2o(* zCD8AM4uqWlmKW>^l%jyC2ctc35w@S@1vYoXfg4r&ZHlPV^z_3swOt$%W>T+Bhw*tfZyB>nlGUYsoJ)Mp@g~1-O0OyjTWcyqe^{;$99gmq@0-slc zx`OZPHQBOZ^Vh)H$R#5(mKuW5AH$Y5#Q}wg54yMzP>IW z_qoKIfI-{hDxLofBE-8nt&05fn7fT*D`s*>(FruW%$iuCNg0wFyPDQ zXSS#|ig zVI_8Wr2W@Dl^)DRuDlvBjC)$l@9~TBnaeMf_^!v#1eo)|Dgs6h2KY#-Fg)s`u;+3I zrGL}zBf(`VGQ24mf{9Fwnf`;8*`g3dWkO{Lm_u^>`yyef)`0=F9&VpE)Q3twU=HU` zMZloJw0mrG63Q?Z0wz}P(G^hG77X%{RAMMYz$}0{TwMWg4F>w$I~kQ+z}#E`g{{Hh z9!VvJ(vQm`nDeKTm1-pz>@y@qP~tcpmcjHQLpy+JCo+Xl`pNR=d6`V_3c?OxaIQc| zC4LWI87{pm;61=JDA+Yn`Zx2R87_V6A?yJLEHaf)hBy1j1kB}RDeMCV=nBHnKCpFr zL+oOy{`~4pPz^X3fyf9#!a~c8$CMsAkb*=ygWtiJt z&X-fy1PTC5Me6}cW$43nhC{od1XI|0KtpkcLgS$XQ&6zMP+~w5hxS7YCchwgT`0ss zahpIvfJtBcH!Ki6Vg3NYEF1}NgoUzE{s6%&KDO@ZL;9f&i@L(hopi5 w^P1xg<_+cz<_+cz<_+cz<_+dq$NvHh0M;0WpN0^}o&W#<07*qoM6N<$g43REMgRZ+ literal 0 HcmV?d00001 diff --git a/templates/default/assets/img/700x320.png b/templates/default/assets/img/700x320.png new file mode 100644 index 0000000000000000000000000000000000000000..32c9edcb1ae18acc6389656a5c1b870b9cb09eb0 GIT binary patch literal 14846 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 literal 0 HcmV?d00001 diff --git a/templates/default/assets/img/carousel/1200x390.png b/templates/default/assets/img/carousel/1200x390.png new file mode 100644 index 0000000000000000000000000000000000000000..2de73de499e827a7631831706a03ab272d77d86e GIT binary patch literal 11534 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 literal 0 HcmV?d00001 diff --git a/templates/default/assets/img/logo.gif b/templates/default/assets/img/logo.gif new file mode 100644 index 0000000000000000000000000000000000000000..cfa396641bac0e35bf9ba6f1b3f188a8ffa639fb GIT binary patch literal 2159 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 literal 0 HcmV?d00001 diff --git a/templates/default/assets/img/payment/kwixo.png b/templates/default/assets/img/payment/kwixo.png new file mode 100644 index 0000000000000000000000000000000000000000..2055f9c8a639a7d76fc4dc163acab4722129b49d GIT binary patch literal 3940 zcmV-q51a6bP)a{r&#f`{CW)TtrH=rm6Y$_5A$&vT2&9GJ~Wn ze*WzK{I%_rii_Ub+S`xC^8ECtC4pm1QHz9y`TY4}M^5CD&a0cBo|BdT{Qk5D=Jz{`$Icq4dV;>-_5f z_5Zp#lwwg+cv@?<1%=9nxa{caTu4lNYHk1j`_|6TyRx(O_VlwgjQj2K^6~NY+3o)I z_W1bs$&<6o!^2cSL~L4Iqe+IG9d~I_RrUP&zPr5f|Nr{R^ZD`e|M&R&|NqX(%4}6x zq5yOM`v3m?`lA7R`}ger`upkW>4yqt>&W8#|No~Rd+zP-(V@b-uCR1sW=lUp$-Te* z`1i3cho}~Va9v*h^Y#Du|AcRHivVHXy3=@Xak8(lfNE}}3w!3x*;YnL|NH#EEtAB+ zz@Gqas{w%d|M>st|9fO+<>}+9QjPrl`d&>?ZDC^j_V@DU>G%5nXI5FMI*kAD|Mv6r z=A+N_?(g{j|HXo?`tS7Q?dbad{rUa>{Qv#!=;)smca465{{Qix33QEud{j$J|M>Xx z|M;+1nEe0y`2YKpe1Guajv>g)CT z_u1mz`SkMh^z!!q^XcyF{`&cQXKIcfY|6*T)4|36@%rlK=bMa>|Nr;>`u|WtJ#%Pk zvjBkd_V)e!|NQv>sseMX2Ydhi|Nj2|{{Q~_`}_R(`ThC&+Su3r{{Q^{_xt_(_T%>V z>G=QT_^=I#SW89x_w%qslCDdOp`M=k`~Rc5sQ>%*t*NT|^ZK{9ul)D?v`bk7VRCwC#m}^)QR~pBY5Sfy|kU#_k zB@oM42q_3^X{5p!1d-H1BZ>j0DOxT9A{UF&Q1DWPAT=dgL}{uBtx+o>R;{;suhlaX zP0FrzExV=bE^XJWt-CFv+nqfD^jTc$e%ue6KhK0!kJiVlU$WQrP^h*EF)@!UD(4)s$kho2HzoeLOQ1Z92v z=7~>+(mQu+>v5#7OTft>Nitd+NY1T{u@tkrJQ})7I1!4DPQ!W>!!WXPhFzWt3!+CZhr9gS(|8Z-qdIy==^ zz`W;PAJ!Z5J_WSm-paAzBeOG%2+~E|p#Y2i(=pUY1ZaAthn7HuNdWZiHkmFSWqoTh z?e9kZ0Z|0slTUX z^9*y;nQAZvhq52O6p5^l)&VoqYNd`-N}ArR1bSaP&~;;-^zkliCEW`1YsfwSAm?pc zFmUVElt=n$ir<2l=aFN=m-Y8AD>%xfM3m^EAU4((D=0`-Ca0zw%9f*oSb-pD8JE1VZJOWADQ`cPU&>7X zX)nviglBU&gel~BYb%}Eh8LypEAEY68uCvMj}t7+S*Ed-PIWWtMHCjc)}!)328Mcg zeBj~nj4bbU7}C3U<7De!mCEI3E8l;A;|F_WSi*qcM{kz8`TP4p!7=#FH$TchIiY(- zsA4f7-x~!#AvT+luve4{-ztu(9w*pAAg!(8Kv7W%inc0H*2bcZCuXNH>Q1Hx?k2O# zGOnjpomjhZV+L(4e|f>(y_?3*Q+%PQ@OkM(*+0vYGU?|w`K5eRx?tR$J5!yylkk;W z@G9fM;DE&nOm-d%9|d145sHzJ8hWV*hk(myE3kv|z^1aYCLa{-Kwrsf%Fa$N+s>$4 zn575cZ}F#cqZ`uGv$OxGP^jlE@VoWXz_z(EMbf_X?2TWBDahaMbt|3Xzo76pEyL>Q zes1sbYR#3pJB+l(a2||?7ZGMLClEv3O%jQaQ#qGmK$?4ecDgt$7j32Qof4~5s`R;x zTFsOySW$!lSn z<5lqvynh(3@_Da)J-Oip|I(TMo4ot}F8NlB%ty(%X%L?8c86In#fEk4nsdyvl5rARn-IBSImv_CBRl(*Rq62qpOJJwxz%hsx131oy0OQq`*xLGzI1 zD>^%mfNt*v!6|Ic?bIu3=0hhOM>enS4HN_>91SzfOHgm zHeq&{h4Gx-Vxp)VSa&p=)4%NkXnXT^(q`aL{`etdud2Gjy9b2}*VNz>c{?%$8FTY!MZjk}h zjE3W8q0mh1CW>(u7HW_g9x&8t0zQe)q(f0fErCn$`0dONwI~Z0r`J~&0I#BWRkq}> za{2Mj&d)l3h6R=4H|p!WAPrCR2U3n1 z_DB!^JhRk)X38&rGoQXE`*2{_6=U7aoazKQHR5*gq9HE0npZt*mApMXl*T?CZMjw` zA%yk2#S&a=it((WxeAoOUjqFetDe*fO3ZL&#lA55QXh^3F$Z#`%?$*6-Aj`dJ$V6z z`MZLHm%IIP!R!#U$fvHpY2@+hj0xC}>Jf#17U$37@vh{{W#>Zk069A0aEF*f#1|v5 z%yE;@r;Fm!=zc^Z#7jC3Cu2#71i|Z`g$$g6+I%t|D@jf7dS6(;e=k3 z1jjkg*mroJ)M#$p^?RQc)I2t=AW zA?UftCzZjNb>krGTXI;5+_qG(m)uZ8S321qkREeUEZ5$X(#1ztu zro|KsahyO9XCj)RQ3O&9CpQ(ZSV_~z=a>jwNFeFTxP_4#W0c>9KP%=JUocBJAu{mI zPf_b4dEX~^lf%LSCa0{1aN|_2rG+_dcbLMCba`HcDIgRQ z95Dy4ciM~)4hccHA904UF-9wdSt{5%usWxjcQUTRphQE89cHm<&Pv4+x7ECLn&r2~ zjp#1i->NmMZw1KiVT(T}pWI$04&p4gwPleKEf0f0alEM(?P~NXgB}qJRbd~dJ(Dh! zK)W1k-&lIQr!|z8CN;rO^=+AW@aC#rS0|Ftw=MT^vqZ~jx__)<;=#yEmu5xfj40~L zrAVG;;RJHV?=V>f`RXXR#o0}yTA5JzjiS_foq4!yS^p=nS3$4wYuRf&^#B84k0q&Z z4l7YF1-StD!s0E+2y~CG@l5oz@c9qmBqA$gIdh+{=SPFQ8$U#ZsUV|Kn(}5byuEU(zTucO{hXAlz^+1P$ zYuD^dGNW{Mod96Xx$rNPiW}n&=4c`{Jf4P^!{bFpu8aCUVFP$t-!7t2h6^y(<3=4$ z2E2g&jQ%=g`uak$b1~R;E;y75xNuc9Lr%a_;qycAM>pi8qypNoWkbTrsJe9;%{r)? zQPolYlLK}b#)JbkmW=k>kYIPdd$hDA?pooOzE zp%G!p`lPU48_*ACtPupU1J7hw+}VRR_L`6^c7I^sAm2Tsub_%=*RKg-HM_@#>3z?z zv-(jwxId_A<6EsRlTtSHoxzvdol_N-1}^7ONa#ou@l4i>>##R zuPrc0*H`syb4N1G7#3qB39#Gpnr4lMUswt{J*epd`d)zT1VDcs=&)R1I3y?O*6^=k2jx5`l8f^&X-9kede?s@ yTyPiM1$V(+a2MPKcfnn77u*GR!T*c?CBOjMtgM=C{hbLQ z!DZ^{_vYs2|NQgzy`Da6FY%F4^y7b^Dl_P5B^)g&zCT`B45>G1II_o=UoPG-xg zOVrfV&PPxC>(=I-ChhI*>`-3wyjz)>nA)c>u(-*qGf=RPQ26-x=H}bX*Yw_ck@NiZ z#=Fb)!dLT)miqeo`P=LM_5Gxxrr+P-=y^r>|NsB_{;zzP_3iBDRAtAow&uH3d^uI) z?ChPuSCiIL>&;O~(``sBIGR&tuFw*1)H{J2B%yH))2`1Sw)^7HNK#fI=yX4o7s z-ZnDwo1*2oWBt8f@$LKU$Y;%NOY`F6;K_`{*46*??fL)s=}Thc^6>NO%hf!O)=`JY_%&4ldZ>-42O;6y^$^yvTj`SZqf|NQ^w)yUB}8vDk?xQsrltFPih zQN_pH*tck~CO__^EZyt&!<*8=SElf`v2#}mj3DE$oE`SR}Z{P$01^Q=Si z+``cpBl^5k|NZ~Cu#e)QF#qlS?dj+J=Ignzx!_7x@BjDU(x%xCDCW=C>FMv>o1)Lo z&hO~#^|52|@$$zZJ?F7G|Nr{;@bT+cUFc0!@%jGg?(pKB8|mTalj+7dha z|NsBx{q*zn{QLg%|MmF%`19xP{QUg<`1;@H1H1#g1N{F1 z^!NoenWA{wj*f2010GMS;PXBBQiX}f>sBE=AgxxCs@3v%a;;X&=Sy+%O&F?2F?=$H zkwl=6eU9t%u=%8#&s4!5EUwcOG+ScL#bmJ zF^mj=Fmw!t(THMFzK4fY5e0M<=%E5@Hvx||8h;v1!#6t)LOXi&fuvjI-+{*srs{|& zut5NbE5nGtE7JK2Mf<*M2#R&{B$A_&ZcN{%F|s8O1(*G7E@3`qQe%QRYIB2A@YJd{3&(rPixKh+-$Yg8%~qQWrwKCOh| zis*r16rYWug8>K^5QYW=UaQj2J36|p&rV9ZG1JX)DNSEtZTS2gJV%`9p@C#jh+n|Q>PAp zLvd55X6z3F^^t4!ZF(sKB^D7jAV3kR>UiKPm-7-XKjCo7`T-oysiXyUwbj)x0Km?! z9{@7-+u|VqhjO{RLqiVG>ZC^ZLp-f!<&qto+U!06Cy4`!(ez~2tWV-HhOZiLXAw@Y z1C>a8=n=B78zTqsnlIAn53knvZkihbxj|B0!+r)^%3IY z0Bv|qB0pqb2cjU4pjnabdV#idW>P~8CogZt0*jK8^0I4z|Fb?^^qHOAcp&03o*=w9 zJN5H%{Pt^i+Avap>K^7{yb$J?-%ys#$$&LvtdWsg8T*$gGF@<@^*j}HI-$T5lLD;emOY7WjP4NZuxSb z4LSUKLjj~CT3xgI)^F>^?#R#IQMRKOkXBdMzFSi_%T6yl zyX^GSH3u^OA~+J+7Nx}S|0d|b8_i$0&s|VZn?F13{N;rKVe|9HS^?`;R^P6t&2L(f zmR2TAOG{h5H7GuO+^TsXj-9cwu|Cy1{}Z%fLu7PhG>;UZQtrFgDJrvyxKKDd^WzKN zqOiNcZkJP2!?y2ko_6{1@vTedpNk*q(Yk#?>4CfFg4PUseCxoO^W!EbW{lUVBkv9Y zz>>R$Hs((p`Axj{zK^fXUi)k1!%9Z-ua_de`DuRQ+MhxeCWI7D4(st5^HF7HX8I); z_mh6{;m;0+`OFiOomQI;I zI^yqBydz4JYDOO$=`!+|%gBh#e@^*rQhkKWc9-E97e(>$0(V%CZ?eGvFlLi1csX%b z&BU6TT{XLU1wJuXtUhsK^@-J^M&)jsv~A3`J$tt8*|zP9J@_zb4`t`YXSM=mHz`1x zY$|vZ9XwIYWYUGqA|X@E6pDpH;r$xsmZn816rjUdKc8N76Nt?|oW;JGwJFQlo^2nS zBj~DvwL<_rOy-v8-D;S0I#b3Jf)`UJW{PEEVL4sQloc^$TRx-|AExAPDlXnsO!?Wq z_%NGtC5y5*EWRu7Svz@(N<2ye1EMb_mERZAWpptR9X~-ZbYZzLZN-W$qYhtjzG+`< zUtCPFr{p?Q*lch~d6i(>wJuOj3ea})6LclPn;mP!!Xjq56>eP!03b_6vMr+)fdqk! zP=Ix_*jKV{ZpyMxd3Etw1+=b_JVjAe`~(|OfGEMOhAxzei|9f+e$r*-<>lg{En8Nk zEjr8w7AX`E06229t`~1&JAa<@KBO)Q7(xxcqk06)J=u7B^X>I?;4{cO9RyJ%2IaVa z|GrozJmKtY@9dn#w$HL>v#*0_ipNlX@d*^noh$k}xQa&#K&co^g{g)vW$;3)@^ZWg z_dx(+P!2p0;TNA#?5|(XEw(o+H;a9powDX{yQ$!7JWQn`P+yZV005(+kO6$@-^dNT z{cG#g8gZ&=8 z9|$@e$Y6lcp#YS4tOeA7@J@KnoOOW#f$JJuMYoS1PYCFQ=lc1nTU!GI16xHR(KAu2 zjjgRMFzu(tTPP}3i5Sd1-XH)jL&?%X5U>taRX~rvDNt7k1XWc9b2_Wkca&8uwI5(8 zbv8COt!lNJwcD?vs;a{FAPjmpSjk`*Fam%M46tUwIz*>?9@>0}{kKW!DO#!U30V2%PYDqIyzdX(;d3g)}~Vy7P_*Ocyk9CP*MN{F+i69npI3i^Ov9s zsYaucNaUCTL$z9juSrc!^#|>rr4LjnT-{UsQ)!@cK^Y9CHJ2RVL^T+wTmzSD?c`Kh zS?K^Yg3z!xHNqkXhssJPCu?i)ICycbD+%+1G#~(AzyVZ?AVS1Dz7BhbffL}VzPnW5 zkpY5Xi0bqQ|KCz%+z|urJ|W;BAv_R=-gk%IQQUj8tjz&9S>s;}fj8r27B{c?3y!7~#;H=3#?t1bz_Zs049X{uT{fWRyiE zA|)ydrk9qMZpY=>;@N_0f<-MYo}QjyymVM8fg#dmZGc#~^Li69@EnQ15U7PiUje`*u+{Kwj0^%m5hb2Y=y$8g{P7u{dGlcZaNlhRUqmdWksRR4 z&?%KlmPN2dEE3^!bYLt0>DQb;6&Xd0jJL>@MCPZAMsk1&)gy06Pa@PJ1Th+oh#nmh z0H0?3g9h@v&k^E+Vx#~J58w>|gG9X`bJ#?2n)SpW8bqFcKfZ6`1P!eH% zB2tSD0bp)&2R8I}nJhom4GHk>r{&-4zXA*ZUODhk*S@$>4#M{`%ze{U=t4Ic1i}$jH{(=T>&5ho4}nq-8h>+|gT`Tk03l=%Js@9*zO zdZw7I#q#p-6i`{rUgo?D9QghEYbt{_5lDoSdB5^8fSh-hf6$*@9X|2c4|@%H)8+2!{2^2W&8(ctX<`1+o+!PVvZ^z-IZXoY-|s4-oUztY|4PZ-|O`K{ps@e_VxMv?ZtTb?eoUk_T=T^ z{{QyG)9BOd@$~ZdP%*5U7@%s4Z;^$dzlKcDj2R(oD z{rmU-^XBmF@A3KV>F4R{@Et~u^z`;UZv)#W5kh!RYU`}_On=jZtN`045C=H}+>>+AXX`TF|$ z?Ck9D@bK~R@$K#H>gwv~=;-O`>)_?^`~C9e+~K?C|LpAU@9ggG?ef^(^ziZY^6vDn zz0YorucEWJ=DB6}{`d6w^xEFvG^yuUE>b6B+ ze&^xK)#dWi&(`1J?d$FTeVo0Hveb{Q%V2(>+NN93-{#Zk=}~Z{xVgTGn!fq;^#1Yi z?&$IG|Nr;>`~3X;{{H^`{r&&{|C+L9DgXco>`6pHRCwC#n0s6kM;^f8b{hrK2xxeC z!5AK5ASeig1VT_ST8u@j9teo2r&Um>)EZw=v|d##RcXBz>xtk41Z_=Q9|$B_HZKyd zchx(wdN1th*`D?E&YsHM&TeN(7AaIV`1#yl=a@LmAIgdq43vAQr5BzvHM-iRQAp~gb*0x_BiHU-d|OlCd# ztYJ4IMm=Crkoq10F+`ZL(3^~As2~Rq6s!-1tauVJS^@Md3Oc4k4UpLdRG6s2dqEI- zSW*AXP-eu$GTg9}2xT-8M~}*6GCn^_TDyC9RZ(HonyBKRn2Mv;EQumzl`>fwEHxQx z0d?g4;^OAosA5JzPzXs86v3|0fA*PFr6Oui@`>HM38|C>K+5M!0r09NiNZoa!TDcH z)Eb-NVZb-5q)ednZYto!TfSVQ(d1`mNGpqL36<)R%2NgLQ~|yqJ3l)rsyaJAzgBPD z#rO0Cs{NiS6Qcm`D$E*{cqC-^b?h8e|}Wdk?WsljQafgkph_@dx@6`6yB5qY2!_> zBcn=omx{sg^96}jRfz@Xqh*(?DOtgs=;(q~ zMTPsX>^|9*nVEU)Xs?2BS7Gc9|9alMkt0XWd-L3KxvV1MUW#|zuf0?5b^2A3l`Z36 z8aFP``wc(-BTYkR%J`HBKSp6B1hjy3L!o*6=E!%hjU794-j3x)*}E&hi%*|5D?L7b zQw6B`az;sVT5QP-@8KZCvn4$#HYt5pABCPx0VoBfKmxgS(ubs_2h1?6< zo^ppp)LC}v)N5Ch!;+K3M$h#!3*@^LYXp>Fz~kb_6gEU~ zU`<9>!Nd_G{`t<-ReOBX!nV(tQk0UE+!XPjDTkYqOFDlydCa;g{wAa)EjcV~d(*mV zMZUnM5D45>2n1L5Xs#4ZP7fV1^KXxrbZVPo0;jFI8q?IYIeJ@Y%<8KJ)z@GB<FB(2)k*4TGFC(VkNh+`MGNW_wL z(Ke`1_}PGhqyWXPu*%Q)Csuo1$Xuk(&D-20KGAfixhq8|ZoPXvWPb75!0CBAb93+i z(KxBz97qx73V)$KapI*bYzGsImBx1Xh+p;%CFjl zd3*P7^$Sye74*hi!L|)6R&2PWZj<=DKH8@)x2;Xt)}|H;7tWnJ|M>873x!i|DlE7K zTCjaFLZz}UC}HyKOQm^ArO(97!1R9=DE$o44tM1g?@B_)X@t^9%F1 z+>)QmFZ=2|aLVq6!a~|Hi`{O=91hI>`o_bt@!n@vB<4iiPD=7VmgpU?^^xR--aY6W zH{*8b#)HGlJ#sQPg~lwJ*x~QjQEzuw;lS-Ujv3kw4&%hd>(~2bZE$>1xjuT~gRHO7 zZzn%^@UO)=^10z#7FSgG;unHF%D#E;gSA)cb4q=~F$$wdRs~LA275b(+i6Anh2O_D zH1Nv1Yc8Uvvn-fLcz0Y@d3$$oR&f2+-&`!kP&}kYmlIbJ_wucM(@xjBr2w=7(;4h` zhrxk)cm#Wd*EIZTQcbW&@Z9j()iqmYdjxO&OL@-P1&h%9pBkhd_*Zpni406`9}07eeau0taubts3! z;|&`&EFfUQgb6P~Qd58Wgw)hjcnFpR1i(5X9*@I8Q4WfUI0)NI4h)pY5UGPi(svrY z8p31sTVk#*lqpdxq{hwcK8CmQDZ3+QPq-6bc?54wzo zM|T6Bf{IWRtAf(eeYU`bRtJ0D3+jZq#hkx5D9?Fq4yubZ&`Sc!i`26y2teVmH6l9x za0Djw8G@xW%uw`xr-!6xtl+4?j-ebJuqoiHTBJ_YJIp;-Td-ik3r=2Pc;OZ2fg3kq z;ew@0U+funk;tI44Oj&SWDh8$LrxDOJ)uM*Cgu|Y=$6ux$VsZJ^~|_9XA}wp3?~%9 zk^`X-1%l&n;f9Y@9EURs;&9Oa9rSwMi-C^4-9dlAdQ5GrRZo$6woDG4D-tltAGr(b zQ|MoAG?UI3zQGk{Bhrh}O?vlwJqnh)nsI;T6v7hya w8BG^`>btAxe+f32`UAJC&lB42^SuBA04ep=Em8e-`2YX_07*qoM6N<$f^*sT)Bpeg literal 0 HcmV?d00001 diff --git a/templates/default/assets/img/product/1/118x85.png b/templates/default/assets/img/product/1/118x85.png new file mode 100644 index 0000000000000000000000000000000000000000..cf9e98b4a72ddbea84a6ec86630d215076936a30 GIT binary patch literal 1642 zcmV-w29^1VP)@9*#Q z^z`uX@b2#J^YioZ@$vHV^8Wt*_xJbs`1t$#`~3X;_V)I<(*3^x00qiPL_t(|+N_${ zcH-|9^Ibu~}>(NYC(+rb&FQT?o6s0m83W3;^hv_u-O{7$3j;_-kyhSsF1B z3bL-EWqyRviH&y&GZJ}0%w)_E)x{&@j--XvFcHnVI9hk(MiUF*=VG?Tbgf031=Qt7 zP^C@Yw-%YZPnw;tCWH)Zz?qbMh`EGRjH_dD#h4w^&9I{oYOpwrk5XY+zqqroT#Xx_ zSn)a@;&PZE?eX1JuLZia-t^g!qMr$Kx?RWe1lt+5mT%53>&|!(Zr185+3PJv!SYkH zseqNVe*A^R!M&wq*wq%JVCDZ*Q!ia&UOwaU%TE41+Xh|BinKT6DQ>tt6Y@Lvww6)D z){n^#Q@f-cxhYP;zbbC^8Lzrj(+W5>Hj{+a7OP}n&A2syN}sn6u9tLBzC)Cn36D4p zC$;!hY!ldVn2h)+^(0U}eNS5c7%a4ETrFMrQT_{XeCp(t+HQl_(z4gEO@s}F^(42P zuSGS+iM(4beveX6wH!v`3dW}(ZX7U~nCRX7*kJ3&IPm1uEZ~tCyFEvWIU`qV#jnBI z#w{0sF6CVr23GQ;*X!-XxQC45x@y-0Zj`yS%|Y8;%t8psYCH_%QoXK%wT(N&hIfqH z^->e#nynV$LI`;c3nc|`Fn_IeAjDvY5Vgkb+H*FI3uL#lej##E!+O)W-okEj>0#sX z%#R(m38C9Am8Y0|wj!Myls*hV0H1cPnbD~N*Ht^3+;YdgL^KZf=2 zIW^6z#_h3SMD7YUtNB^=gN<#|=X)+S_6fDKxnb+ac&~d77pNq4QOfb7YTi4W8+KUy zT(^y~t*c<+*0$cTMhJx!afkiiP0I}y&OOPvvsuxyo+1w|bJg;FWa6)Okd@!V#$?W? zGFPkjcuurWE#I+NuIY^$WM&TOGu*7Rxns@zI4Shmrv^ELiyA@0TE)+;TFRopEq(TRk<0+{rV0P=|l^=D?V&*ufhPq$~&%thR%7 zK=T5q1m7`~#uE$h#8z(|^pBerw%Q&cA+N>m} z1Cx5_Q`s2WxDg4nc8`U_c`}zf$4RT8&I!4#@?qOLS+A2B1#4{%+$dM^C33GJziny4 z!8fXgoo(w~c>2_(WFPvQq;1<9fAZGQep)=$)SS-rqzZ(l^>erh7JacT7}!{i>!;(| zy`7@DGQPT6Yr$^Sp>TLI64N0~U4l4a$TfJ2?rmGE|P7vx7;dy|YUY@~f=ToJd8)cX|Q1)u{d;MW&o zZ`lVnK6id2aZ_rhU7d0shrQndeZ3O;`)*l9+O%<+Z0obM=}W$w`{ozSrDA)1etZfw zfw>DF<3w|AT=iC(>UC=PL+G!~dw37KPiN#;p!Ub;Kd+2UwiV+pVtKCRHXnt@k#_ds zLtarfE*_F&NkLOB2lS7ML|?Cyo8hZZBGk#)t{)o|k{|p`H;!*kesI{ z2gPTV^^+XwP_ML~a6kDsu#@33AU|t8T~gEM;ZPe69|js>yWw)UOZj+ih`Z)-dwqQQ zs0cZK5hIGaxckuzYAr|>;SHw|@ olstM+fl^Zw*Ppri`%i!Y09A)WHSZ7COaK4?07*qoM6N<$f=a$pRsaA1 literal 0 HcmV?d00001 diff --git a/templates/default/assets/img/product/1/560x445.png b/templates/default/assets/img/product/1/560x445.png new file mode 100644 index 0000000000000000000000000000000000000000..37fea1775723b73842ecf37f0073e253c85166ac GIT binary patch literal 6299 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 scrollHeight - offsetBottom) ? 'bottom' : + offsetTop != null && (scrollTop <= offsetTop) ? 'top' : false + + if (this.affixed === affix) return + if (this.unpin) this.$element.css('top', '') + + this.affixed = affix + this.unpin = affix == 'bottom' ? position.top - scrollTop : null + + this.$element.removeClass(Affix.RESET).addClass('affix' + (affix ? '-' + affix : '')) + + if (affix == 'bottom') { + this.$element.offset({ top: document.body.offsetHeight - offsetBottom - this.$element.height() }) + } + } + + + // AFFIX PLUGIN DEFINITION + // ======================= + + var old = $.fn.affix + + $.fn.affix = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.affix') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.affix', (data = new Affix(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.affix.Constructor = Affix + + + // AFFIX NO CONFLICT + // ================= + + $.fn.affix.noConflict = function () { + $.fn.affix = old + return this + } + + + // AFFIX DATA-API + // ============== + + $(window).on('load', function () { + $('[data-spy="affix"]').each(function () { + var $spy = $(this) + var data = $spy.data() + + data.offset = data.offset || {} + + if (data.offsetBottom) data.offset.bottom = data.offsetBottom + if (data.offsetTop) data.offset.top = data.offsetTop + + $spy.affix(data) + }) + }) + +}(window.jQuery); diff --git a/templates/default/assets/js/bootstrap/alert.js b/templates/default/assets/js/bootstrap/alert.js new file mode 100755 index 000000000..663029ed8 --- /dev/null +++ b/templates/default/assets/js/bootstrap/alert.js @@ -0,0 +1,98 @@ +/* ======================================================================== + * Bootstrap: alert.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#alerts + * ======================================================================== + * Copyright 2013 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // ALERT CLASS DEFINITION + // ====================== + + var dismiss = '[data-dismiss="alert"]' + var Alert = function (el) { + $(el).on('click', dismiss, this.close) + } + + Alert.prototype.close = function (e) { + var $this = $(this) + var selector = $this.attr('data-target') + + if (!selector) { + selector = $this.attr('href') + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7 + } + + var $parent = $(selector) + + if (e) e.preventDefault() + + if (!$parent.length) { + $parent = $this.hasClass('alert') ? $this : $this.parent() + } + + $parent.trigger(e = $.Event('close.bs.alert')) + + if (e.isDefaultPrevented()) return + + $parent.removeClass('in') + + function removeElement() { + $parent.trigger('closed.bs.alert').remove() + } + + $.support.transition && $parent.hasClass('fade') ? + $parent + .one($.support.transition.end, removeElement) + .emulateTransitionEnd(150) : + removeElement() + } + + + // ALERT PLUGIN DEFINITION + // ======================= + + var old = $.fn.alert + + $.fn.alert = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.alert') + + if (!data) $this.data('bs.alert', (data = new Alert(this))) + if (typeof option == 'string') data[option].call($this) + }) + } + + $.fn.alert.Constructor = Alert + + + // ALERT NO CONFLICT + // ================= + + $.fn.alert.noConflict = function () { + $.fn.alert = old + return this + } + + + // ALERT DATA-API + // ============== + + $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close) + +}(window.jQuery); diff --git a/templates/default/assets/js/bootstrap/button.js b/templates/default/assets/js/bootstrap/button.js new file mode 100755 index 000000000..fc73b555f --- /dev/null +++ b/templates/default/assets/js/bootstrap/button.js @@ -0,0 +1,109 @@ +/* ======================================================================== + * Bootstrap: button.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#buttons + * ======================================================================== + * Copyright 2013 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // BUTTON PUBLIC CLASS DEFINITION + // ============================== + + var Button = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, Button.DEFAULTS, options) + } + + Button.DEFAULTS = { + loadingText: 'loading...' + } + + Button.prototype.setState = function (state) { + var d = 'disabled' + var $el = this.$element + var val = $el.is('input') ? 'val' : 'html' + var data = $el.data() + + state = state + 'Text' + + if (!data.resetText) $el.data('resetText', $el[val]()) + + $el[val](data[state] || this.options[state]) + + // push to event loop to allow forms to submit + setTimeout(function () { + state == 'loadingText' ? + $el.addClass(d).attr(d, d) : + $el.removeClass(d).removeAttr(d); + }, 0) + } + + Button.prototype.toggle = function () { + var $parent = this.$element.closest('[data-toggle="buttons"]') + + if ($parent.length) { + var $input = this.$element.find('input') + .prop('checked', !this.$element.hasClass('active')) + .trigger('change') + if ($input.prop('type') === 'radio') $parent.find('.active').removeClass('active') + } + + this.$element.toggleClass('active') + } + + + // BUTTON PLUGIN DEFINITION + // ======================== + + var old = $.fn.button + + $.fn.button = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.button') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.button', (data = new Button(this, options))) + + if (option == 'toggle') data.toggle() + else if (option) data.setState(option) + }) + } + + $.fn.button.Constructor = Button + + + // BUTTON NO CONFLICT + // ================== + + $.fn.button.noConflict = function () { + $.fn.button = old + return this + } + + + // BUTTON DATA-API + // =============== + + $(document).on('click.bs.button.data-api', '[data-toggle^=button]', function (e) { + var $btn = $(e.target) + if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') + $btn.button('toggle') + e.preventDefault() + }) + +}(window.jQuery); diff --git a/templates/default/assets/js/bootstrap/carousel.js b/templates/default/assets/js/bootstrap/carousel.js new file mode 100755 index 000000000..d8c4c243c --- /dev/null +++ b/templates/default/assets/js/bootstrap/carousel.js @@ -0,0 +1,217 @@ +/* ======================================================================== + * Bootstrap: carousel.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#carousel + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // CAROUSEL CLASS DEFINITION + // ========================= + + var Carousel = function (element, options) { + this.$element = $(element) + this.$indicators = this.$element.find('.carousel-indicators') + this.options = options + this.paused = + this.sliding = + this.interval = + this.$active = + this.$items = null + + this.options.pause == 'hover' && this.$element + .on('mouseenter', $.proxy(this.pause, this)) + .on('mouseleave', $.proxy(this.cycle, this)) + } + + Carousel.DEFAULTS = { + interval: 5000 + , pause: 'hover' + , wrap: true + } + + Carousel.prototype.cycle = function (e) { + e || (this.paused = false) + + this.interval && clearInterval(this.interval) + + this.options.interval + && !this.paused + && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) + + return this + } + + Carousel.prototype.getActiveIndex = function () { + this.$active = this.$element.find('.item.active') + this.$items = this.$active.parent().children() + + return this.$items.index(this.$active) + } + + Carousel.prototype.to = function (pos) { + var that = this + var activeIndex = this.getActiveIndex() + + if (pos > (this.$items.length - 1) || pos < 0) return + + if (this.sliding) return this.$element.one('slid', function () { that.to(pos) }) + if (activeIndex == pos) return this.pause().cycle() + + return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos])) + } + + Carousel.prototype.pause = function (e) { + e || (this.paused = true) + + if (this.$element.find('.next, .prev').length && $.support.transition.end) { + this.$element.trigger($.support.transition.end) + this.cycle(true) + } + + this.interval = clearInterval(this.interval) + + return this + } + + Carousel.prototype.next = function () { + if (this.sliding) return + return this.slide('next') + } + + Carousel.prototype.prev = function () { + if (this.sliding) return + return this.slide('prev') + } + + Carousel.prototype.slide = function (type, next) { + var $active = this.$element.find('.item.active') + var $next = next || $active[type]() + var isCycling = this.interval + var direction = type == 'next' ? 'left' : 'right' + var fallback = type == 'next' ? 'first' : 'last' + var that = this + + if (!$next.length) { + if (!this.options.wrap) return + $next = this.$element.find('.item')[fallback]() + } + + this.sliding = true + + isCycling && this.pause() + + var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction }) + + if ($next.hasClass('active')) return + + if (this.$indicators.length) { + this.$indicators.find('.active').removeClass('active') + this.$element.one('slid', function () { + var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()]) + $nextIndicator && $nextIndicator.addClass('active') + }) + } + + if ($.support.transition && this.$element.hasClass('slide')) { + this.$element.trigger(e) + if (e.isDefaultPrevented()) return + $next.addClass(type) + $next[0].offsetWidth // force reflow + $active.addClass(direction) + $next.addClass(direction) + $active + .one($.support.transition.end, function () { + $next.removeClass([type, direction].join(' ')).addClass('active') + $active.removeClass(['active', direction].join(' ')) + that.sliding = false + setTimeout(function () { that.$element.trigger('slid') }, 0) + }) + .emulateTransitionEnd(600) + } else { + this.$element.trigger(e) + if (e.isDefaultPrevented()) return + $active.removeClass('active') + $next.addClass('active') + this.sliding = false + this.$element.trigger('slid') + } + + isCycling && this.cycle() + + return this + } + + + // CAROUSEL PLUGIN DEFINITION + // ========================== + + var old = $.fn.carousel + + $.fn.carousel = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.carousel') + var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option) + var action = typeof option == 'string' ? option : options.slide + + if (!data) $this.data('bs.carousel', (data = new Carousel(this, options))) + if (typeof option == 'number') data.to(option) + else if (action) data[action]() + else if (options.interval) data.pause().cycle() + }) + } + + $.fn.carousel.Constructor = Carousel + + + // CAROUSEL NO CONFLICT + // ==================== + + $.fn.carousel.noConflict = function () { + $.fn.carousel = old + return this + } + + + // CAROUSEL DATA-API + // ================= + + $(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) { + var $this = $(this), href + var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 + var options = $.extend({}, $target.data(), $this.data()) + var slideIndex = $this.attr('data-slide-to') + if (slideIndex) options.interval = false + + $target.carousel(options) + + if (slideIndex = $this.attr('data-slide-to')) { + $target.data('bs.carousel').to(slideIndex) + } + + e.preventDefault() + }) + + $(window).on('load', function () { + $('[data-ride="carousel"]').each(function () { + var $carousel = $(this) + $carousel.carousel($carousel.data()) + }) + }) + +}(window.jQuery); diff --git a/templates/default/assets/js/bootstrap/collapse.js b/templates/default/assets/js/bootstrap/collapse.js new file mode 100755 index 000000000..92cc0bc76 --- /dev/null +++ b/templates/default/assets/js/bootstrap/collapse.js @@ -0,0 +1,179 @@ +/* ======================================================================== + * Bootstrap: collapse.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#collapse + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // COLLAPSE PUBLIC CLASS DEFINITION + // ================================ + + var Collapse = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, Collapse.DEFAULTS, options) + this.transitioning = null + + if (this.options.parent) this.$parent = $(this.options.parent) + if (this.options.toggle) this.toggle() + } + + Collapse.DEFAULTS = { + toggle: true + } + + Collapse.prototype.dimension = function () { + var hasWidth = this.$element.hasClass('width') + return hasWidth ? 'width' : 'height' + } + + Collapse.prototype.show = function () { + if (this.transitioning || this.$element.hasClass('in')) return + + var startEvent = $.Event('show.bs.collapse') + this.$element.trigger(startEvent) + if (startEvent.isDefaultPrevented()) return + + var actives = this.$parent && this.$parent.find('> .panel > .in') + + if (actives && actives.length) { + var hasData = actives.data('bs.collapse') + if (hasData && hasData.transitioning) return + actives.collapse('hide') + hasData || actives.data('bs.collapse', null) + } + + var dimension = this.dimension() + + this.$element + .removeClass('collapse') + .addClass('collapsing') + [dimension](0) + + this.transitioning = 1 + + var complete = function () { + this.$element + .removeClass('collapsing') + .addClass('in') + [dimension]('auto') + this.transitioning = 0 + this.$element.trigger('shown.bs.collapse') + } + + if (!$.support.transition) return complete.call(this) + + var scrollSize = $.camelCase(['scroll', dimension].join('-')) + + this.$element + .one($.support.transition.end, $.proxy(complete, this)) + .emulateTransitionEnd(350) + [dimension](this.$element[0][scrollSize]) + } + + Collapse.prototype.hide = function () { + if (this.transitioning || !this.$element.hasClass('in')) return + + var startEvent = $.Event('hide.bs.collapse') + this.$element.trigger(startEvent) + if (startEvent.isDefaultPrevented()) return + + var dimension = this.dimension() + + this.$element + [dimension](this.$element[dimension]()) + [0].offsetHeight + + this.$element + .addClass('collapsing') + .removeClass('collapse') + .removeClass('in') + + this.transitioning = 1 + + var complete = function () { + this.transitioning = 0 + this.$element + .trigger('hidden.bs.collapse') + .removeClass('collapsing') + .addClass('collapse') + } + + if (!$.support.transition) return complete.call(this) + + this.$element + [dimension](0) + .one($.support.transition.end, $.proxy(complete, this)) + .emulateTransitionEnd(350) + } + + Collapse.prototype.toggle = function () { + this[this.$element.hasClass('in') ? 'hide' : 'show']() + } + + + // COLLAPSE PLUGIN DEFINITION + // ========================== + + var old = $.fn.collapse + + $.fn.collapse = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.collapse') + var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option) + + if (!data) $this.data('bs.collapse', (data = new Collapse(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.collapse.Constructor = Collapse + + + // COLLAPSE NO CONFLICT + // ==================== + + $.fn.collapse.noConflict = function () { + $.fn.collapse = old + return this + } + + + // COLLAPSE DATA-API + // ================= + + $(document).on('click.bs.collapse.data-api', '[data-toggle=collapse]', function (e) { + var $this = $(this), href + var target = $this.attr('data-target') + || e.preventDefault() + || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 + var $target = $(target) + var data = $target.data('bs.collapse') + var option = data ? 'toggle' : $this.data() + var parent = $this.attr('data-parent') + var $parent = parent && $(parent) + + if (!data || !data.transitioning) { + if ($parent) $parent.find('[data-toggle=collapse][data-parent="' + parent + '"]').not($this).addClass('collapsed') + $this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed') + } + + $target.collapse(option) + }) + +}(window.jQuery); diff --git a/templates/default/assets/js/bootstrap/dropdown.js b/templates/default/assets/js/bootstrap/dropdown.js new file mode 100755 index 000000000..6093f11a8 --- /dev/null +++ b/templates/default/assets/js/bootstrap/dropdown.js @@ -0,0 +1,154 @@ +/* ======================================================================== + * Bootstrap: dropdown.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#dropdowns + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // DROPDOWN CLASS DEFINITION + // ========================= + + var backdrop = '.dropdown-backdrop' + var toggle = '[data-toggle=dropdown]' + var Dropdown = function (element) { + var $el = $(element).on('click.bs.dropdown', this.toggle) + } + + Dropdown.prototype.toggle = function (e) { + var $this = $(this) + + if ($this.is('.disabled, :disabled')) return + + var $parent = getParent($this) + var isActive = $parent.hasClass('open') + + clearMenus() + + if (!isActive) { + if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) { + // if mobile we we use a backdrop because click events don't delegate + $('

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

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