Merge branch 'master' into modules

core/lib/Thelia/Action/Coupon.php

@@ -25,14 +25,14 @@ namespace Thelia\Action;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Thelia\Condition\ConditionFactory;
-use Thelia\Condition\ConditionManagerInterface;
+use Thelia\Condition\Implementation\ConditionInterface;
 use Thelia\Core\Event\Coupon\CouponConsumeEvent;
 use Thelia\Core\Event\Coupon\CouponCreateOrUpdateEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Core\HttpFoundation\Request;
 use Thelia\Coupon\CouponFactory;
 use Thelia\Coupon\CouponManager;
-use Thelia\Coupon\ConditionCollection;
+use Thelia\Condition\ConditionCollection;
 use Thelia\Coupon\Type\CouponInterface;
 use Thelia\Model\Coupon as CouponModel;
 use Thelia\Model\CouponQuery;
@@ -94,6 +94,7 @@ class Coupon extends BaseAction implements EventSubscriberInterface
     public function consume(CouponConsumeEvent $event)
     {
         $totalDiscount = 0;
+        $isValid = false;
 
         /** @var CouponFactory $couponFactory */
         $couponFactory = $this->container->get('thelia.coupon.factory');
@@ -104,40 +105,40 @@ class Coupon extends BaseAction implements EventSubscriberInterface
         /** @var CouponInterface $coupon */
         $coupon = $couponFactory->buildCouponFromCode($event->getCode());
 
-        $isValid = $coupon->isMatching();
+        if ($coupon) {
+            $isValid = $coupon->isMatching();
+            if ($isValid) {
+                /** @var Request $request */
+                $request = $this->container->get('request');
+                $consumedCoupons = $request->getSession()->getConsumedCoupons();
 
-        if ($isValid) {
-            /** @var Request $request */
-            $request = $this->container->get('request');
-            $consumedCoupons = $request->getSession()->getConsumedCoupons();
+                if (!isset($consumedCoupons) || !$consumedCoupons) {
+                    $consumedCoupons = array();
+                }
 
-            if (!isset($consumedCoupons) || !$consumedCoupons) {
-                $consumedCoupons = array();
+                // Prevent accumulation of the same Coupon on a Checkout
+                $consumedCoupons[$event->getCode()] = $event->getCode();
+
+                $request->getSession()->setConsumedCoupons($consumedCoupons);
+
+                $totalDiscount = $couponManager->getDiscount();
+                // @todo insert false product in cart with the name of the coupon and the discount as negative price
+
+                // Decrement coupon quantity
+                // @todo move this part in after order event
+                $couponQuery = CouponQuery::create();
+                $couponModel = $couponQuery->findOneByCode($coupon->getCode());
+                $couponManager->decrementQuantity($couponModel);
+
+                $request
+                    ->getSession()
+                    ->getCart()
+                    ->setDiscount($totalDiscount)
+                    ->save();
             }
-
-            // Prevent accumulation of the same Coupon on a Checkout
-            $consumedCoupons[$event->getCode()] = $event->getCode();
-
-            $request->getSession()->setConsumedCoupons($consumedCoupons);
-
-            $totalDiscount = $couponManager->getDiscount();
-            // @todo insert false product in cart with the name of the coupon and the discount as negative price
-
-            // Decrement coupon quantity
-            // @todo move this part in after order event
-            $couponQuery = CouponQuery::create();
-            $couponModel = $couponQuery->findOneByCode($coupon->getCode());
-            $couponManager->decrementeQuantity($couponModel);
-
-            $request
-                ->getSession()
-                ->getCart()
-                ->setDiscount($totalDiscount)
-                ->save()
-            ;
-
         }
 
+
         $event->setIsValid($isValid);
         $event->setDiscount($totalDiscount);
     }
@@ -154,7 +155,7 @@ class Coupon extends BaseAction implements EventSubscriberInterface
         $coupon->setDispatcher($this->getDispatcher());
 
         // Set default condition if none found
-        /** @var ConditionManagerInterface $noConditionRule */
+        /** @var ConditionInterface $noConditionRule */
         $noConditionRule = $this->container->get('thelia.condition.match_for_everyone');
         /** @var ConditionFactory $conditionFactory */
         $conditionFactory = $this->container->get('thelia.condition.factory');

core/lib/Thelia/Action/Product.php

@@ -113,7 +113,7 @@ class Product extends BaseAction implements EventSubscriberInterface
                 ->save()
             ;
 
-            // Update the rewriten URL, if required
+            // Update the rewritten URL, if required
             $product->setRewrittenUrl($event->getLocale(), $event->getUrl());
 
             // Update default category (ifd required)
@@ -282,8 +282,12 @@ class Product extends BaseAction implements EventSubscriberInterface
 
             $product->setTemplateId($template_id)->save($con);
 
+            // Create a new default product sale element
+            $product->createProductSaleElement($con, 0, 0, 0, $event->getCurrencyId(), true);
+
             // Store all the stuff !
             $con->commit();
+
         } catch (\Exception $ex) {
 
             $con->rollback();

core/lib/Thelia/Action/ProductSaleElement.php

@@ -67,7 +67,7 @@ class ProductSaleElement extends BaseAction implements EventSubscriberInterface
 
             if ($salesElement == null) {
                 // Create a new default product sale element
-                $salesElement = $event->getProduct()->createDefaultProductSaleElement($con, 0, 0, 0, $event->getCurrencyId(), true);
+                $salesElement = $event->getProduct()->createProductSaleElement($con, 0, 0, 0, $event->getCurrencyId(), true);
             } else {
                 // This (new) one is the default
                 $salesElement->setIsDefault(true)->save($con);