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

WIP : coupon refactor + fix

Browse Source
This commit is contained in:
gmorel
2013-09-26 18:18:45 +02:00
parent a1f898ff3b
commit dde8501790
7 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -206,7 +206,7 @@ class CouponController extends BaseAdminController
/** @var ConditionFactory $conditionFactory */
$conditionFactory = $this->container->get('thelia.condition.factory');
$conditions = $conditionFactory->unserializeConditionCollection(
$coupon->getSerializedRules()
$coupon->getSerializedConditions()
);
var_dump($coupon->getIsEnabled());;
var_dump($coupon->getIsAvailableOnSpecialOffers());;

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

@@ -106,7 +106,7 @@ class Coupon extends BaseI18nLoop
foreach ($coupons as $coupon) {
$loopResultRow = new LoopResultRow();
$conditions = $conditionFactory->unserializeConditionCollection(
$coupon->getSerializedRules()
$coupon->getSerializedConditions()
);
/** @var CouponInterface $couponManager */

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

@@ -132,7 +132,7 @@ class CouponFactory
/** @var ConditionFactory $conditionFactory */
$conditionFactory = $this->container->get('thelia.condition.factory');
$conditions = $conditionFactory->unserializeConditionCollection(
$model->getSerializedRules()
$model->getSerializedConditions()
);
$couponManager->setConditions($conditions);

6
core/lib/Thelia/Model/Coupon.php
View File

@@ -84,8 +84,8 @@ class Coupon extends BaseCoupon
->setMaxUsage($maxUsage);
// If no rule given, set default rule
if (null === $this->getSerializedRules()) {
$this->setSerializedRules($defaultSerializedRule);
if (null === $this->getSerializedConditions()) {
$this->setSerializedConditions($defaultSerializedRule);
}
// Set object language (i18n)
@@ -115,7 +115,7 @@ class Coupon extends BaseCoupon
*/
public function createOrUpdateConditions($serializableConditions, $locale)
{
$this->setSerializedRules($serializableConditions);
$this->setSerializedConditions($serializableConditions);
// Set object language (i18n)
if (!is_null($locale)) {

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

@@ -327,7 +327,7 @@ class CouponFactoryTest extends \PHPUnit_Framework_TestCase
// $rules = $this->generateValidRules();
// }
//
// $coupon->setSerializedRules(base64_encode(serialize($rules)));
// $coupon->setSerializedConditions(base64_encode(serialize($rules)));
//
// $coupon->setIsCumulative($isCumulative);
// $coupon->setIsRemovingPostage($isRemovingPostage);