Merge pull request #560 from roadster31/coupon-fix

Coupon fix

core/lib/Thelia/Action/Coupon.php

@@ -118,6 +118,8 @@ class Coupon extends BaseAction implements EventSubscriberInterface
         $this->couponManager->clear();
 
         $this->request->getSession()->setConsumedCoupons(array());
+
+        $this->updateOrderDiscount(null);
     }
 
     /**

core/lib/Thelia/Condition/Implementation/MatchForTotalAmount.php

@@ -93,7 +93,7 @@ class MatchForTotalAmount extends ConditionAbstract
     public function isMatching()
     {
         $condition1 = $this->conditionValidator->variableOpComparison(
-            $this->facade->getCartTotalPrice(),
+            $this->facade->getCartTotalTaxPrice(),
             $this->operators[self::CART_TOTAL],
             $this->values[self::CART_TOTAL]
         );

core/lib/Thelia/Tests/Condition/Implementation/MatchForTotalAmountTest.php

@@ -48,7 +48,7 @@ class MatchForTotalAmountTest extends \PHPUnit_Framework_TestCase
             ->getMock();
 
         $stubFacade->expects($this->any())
-            ->method('getCartTotalPrice')
+            ->method('getCartTotalTaxPrice')
             ->will($this->returnValue($cartTotalPrice));
 
         $stubFacade->expects($this->any())