From 97fa456a0a12b366b4252f5c0d795e9c7b863b3a Mon Sep 17 00:00:00 2001 From: Thibault Richy Date: Thu, 28 Mar 2019 16:19:05 +0100 Subject: [PATCH] Fix update et showbasket on multiple coupons --- app/Http/Controllers/PanierController.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/PanierController.php b/app/Http/Controllers/PanierController.php index 860a356..227e34b 100644 --- a/app/Http/Controllers/PanierController.php +++ b/app/Http/Controllers/PanierController.php @@ -328,6 +328,13 @@ class PanierController extends Controller } if(isset($request->refsite) && $request->refsite != ""){ $refsite = $request->refsite; + if($refsite != $campagne->camp_siteId){ + return Response::json([ + 'Statut' => 'KO', + 'Code' => 103, + 'Message' => 'La campagne ne correspond à aucune campagnes du site' + ]); + } }else{ $error = true; } @@ -540,8 +547,9 @@ class PanierController extends Controller $response->Commune = $contact->contact_ville; $allPanierContent = $panier->panierContents()->get(); + $panCont = []; foreach($allPanierContent as $panierContent){ - $panCont = []; + $coupon = Coupon::where(['coupon_id' => $panierContent->panier_content_couponId])->first(); if($coupon){ array_push($panCont, $coupon->coupon_code." - ".$coupon->coupon_name." (x".$panierContent->panier_content_quantity.")"); @@ -638,9 +646,9 @@ class PanierController extends Controller $response->Email = $contact->contact_email; $response->CodePostal = $contact->contact_cp; $response->Commune = $contact->contact_ville; - + $panCont = []; foreach($allPanierContent as $panierContent){ - $panCont = []; + $coupon = Coupon::where(['coupon_id' => $panierContent->panier_content_couponId])->first(); if($coupon){ array_push($panCont, $coupon->coupon_code." - ".$coupon->coupon_name." (x".$panierContent->panier_content_quantity.")");