Fix coupon error without message

thelia-modules · Apr 15, 2021 · c409beb · c409beb
1 parent fa1e6c9
commit c409beb
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/Config/module.xml b/Config/module.xml
@@ -20,7 +20,7 @@
         <language>en_US</language>
         <language>fr_FR</language>
     </languages>
-    <version>1.0.11</version>
+    <version>1.0.13</version>
     <authors>
         <author>
             <name>Vincent Lopes-Vicente</name>

diff --git a/Controller/Front/CouponController.php b/Controller/Front/CouponController.php
@@ -4,6 +4,7 @@
 namespace OpenApi\Controller\Front;
 
 
+use Front\Front;
 use OpenApi\Model\Api\Coupon;
 use OpenApi\Model\Api\Error;
 use OpenApi\OpenApi;
@@ -14,6 +15,7 @@
 use OpenApi\Annotations as OA;
 use Symfony\Component\Routing\Annotation\Route;
 use Thelia\Core\Translation\Translator;
+use Thelia\Exception\UnmatchableConditionException;
 use Thelia\Model\CouponQuery;
 
 /**
@@ -71,9 +73,13 @@ public function submitCoupon(Request $request)
             throw new \Exception(Translator::getInstance()->trans('No coupons were found for this coupon code.', [], OpenApi::DOMAIN_NAME));
         }
 
-        $event = new CouponConsumeEvent($openApiCoupon->getCode());
-        $this->getDispatcher()->dispatch(TheliaEvents::COUPON_CONSUME, $event);
-        $openApiCoupon = $this->getModelFactory()->buildModel('Coupon', $theliaCoupon);
+        try {
+            $event = new CouponConsumeEvent($openApiCoupon->getCode());
+            $this->getDispatcher()->dispatch(TheliaEvents::COUPON_CONSUME, $event);
+            $openApiCoupon = $this->getModelFactory()->buildModel('Coupon', $theliaCoupon);
+        } catch (UnmatchableConditionException $exception) {
+            throw new \Exception(Translator::getInstance()->trans('You should sign in or register to use this coupon.', [], OpenApi::DOMAIN_NAME));
+        }
 
         return $this->jsonResponse($openApiCoupon);
     }

diff --git a/I18n/fr_FR.php b/I18n/fr_FR.php
@@ -1,8 +1,9 @@
 <?php
 
 return array(
-    'This value should not be blank' => 'Cette valeur ne peut pas être vide',
-    'No customer found for this email.' => 'Aucun compte client correspondant',
+    'Content does not exist.' => 'Le contenu demandé n\'éxiste pas.',
     'No coupons were found for this coupon code.' => 'Aucun code promo correspondant',
-    'Content does not exist.' => "Le contenu demandé n'éxiste pas."
+    'No customer found for this email.' => 'Aucun compte client correspondant',
+    'This value should not be blank' => 'Cette valeur ne peut pas être vide',
+    'You should sign in or register to use this coupon.' => 'Vous devez vous connecter ou vous inscrire pour utiliser ce coupon',
 );
diff --git a/Model/Api/Cart.php b/Model/Api/Cart.php
@@ -252,7 +252,7 @@ public function getDiscount()
      */
     public function setDiscount($discount)
     {
-        $this->discount = $discount;
+        $this->discount = (float)$discount;
         return $this;
     }