From 2850d70ee87be1ad841bf95923d9c478680daebf Mon Sep 17 00:00:00 2001
From: Thibault Richy <thibault.richy@ldc.fr>
Date: Tue, 26 Feb 2019 08:57:56 +0100
Subject: [PATCH] middleware https / Fix API

---
 app/Http/Controllers/CampagneController.php | 10 ++++++----
 app/Http/Controllers/PanierController.php   |  2 +-
 app/Http/Kernel.php                         |  1 +
 app/Http/Middleware/HttpsProtocol.php       | 18 ++++++++++++++++++
 4 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 app/Http/Middleware/HttpsProtocol.php

diff --git a/app/Http/Controllers/CampagneController.php b/app/Http/Controllers/CampagneController.php
index 2d5298f..407deb3 100644
--- a/app/Http/Controllers/CampagneController.php
+++ b/app/Http/Controllers/CampagneController.php
@@ -12,12 +12,14 @@ use App\Notification;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\File;
+use App\Traits\CouponTrait;
 use Response;
 
 
 class CampagneController extends Controller
 {
     //use BarcodeGenerator;
+    use CouponTrait;
     /**
      * Display a listing of the resource.
      *
@@ -200,7 +202,7 @@ class CampagneController extends Controller
             if(!$campagne){
                 return Response::json([
                     'Statut' => 'KO',
-                    'Code' => 105,
+                    'Code' => 103,
                     'Message' => 'La campagne n\'existe pas'
                 ]);
             }
@@ -265,7 +267,7 @@ class CampagneController extends Controller
         
         if($coupons->count() > 0){
             foreach($coupons as $coupon){
-                var_dump($coupon->coupon_id);
+                //var_dump($coupon->coupon_id);
                 // ---- Calcul du nombre de BR consommé
                 $diffuseMur = Mur::where(['mur_campId' => $campagne->camp_id, 'mur_couponId' => $coupon->coupon_id])->count();
 
@@ -277,7 +279,7 @@ class CampagneController extends Controller
                 $diffuse = $diffuseMur + $diffusePanier;
 
                 // ---- Calcul de la quantité restante
-                $qRestante = $coupon->coupon_quantity - $diffuse;
+                $qRestante = $this->getFullQuantity($coupon) - $this->getUsedQuantity($coupon);
                 // ---- En ligne oui/non
                 $enligne = ($coupon->coupon_published == 1)?	"oui" :	"non";
 
@@ -296,7 +298,7 @@ class CampagneController extends Controller
                 $codeTraitement = Array (
                     "Code traitement" => $coupon->coupon_code,
                     "Nom" => $coupon->coupon_name,
-                    "Nb à diffuser" => $coupon->coupon_quantity,
+                    "Nb à diffuser" => $this->getFullQuantity($coupon),
                     "Nb diffusé" => $diffuse,
                     "Quantité restante" => $qRestante,
                     "Valeur faciale" => $coupon->coupon_value."€",
diff --git a/app/Http/Controllers/PanierController.php b/app/Http/Controllers/PanierController.php
index d57003a..529e3e1 100644
--- a/app/Http/Controllers/PanierController.php
+++ b/app/Http/Controllers/PanierController.php
@@ -509,7 +509,7 @@ class PanierController extends Controller
 			if(!$campagne){
                 return Response::json([
                     'Statut' => 'KO',
-                    'Code' => 105,
+                    'Code' => 103,
                     'Message' => 'La campagne n\'existe pas'
                 ]);
             }
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index a45c963..1ab62f3 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -19,6 +19,7 @@ class Kernel extends HttpKernel
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
         \App\Http\Middleware\TrustProxies::class,
+        \App\Http\Middleware\HttpsProtocol::class
     ];
 
     /**
diff --git a/app/Http/Middleware/HttpsProtocol.php b/app/Http/Middleware/HttpsProtocol.php
new file mode 100644
index 0000000..509a94b
--- /dev/null
+++ b/app/Http/Middleware/HttpsProtocol.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Support\Facades\App;
+
+class HttpsProtocol {
+
+    public function handle($request, Closure $next)
+    {
+            if (!$request->secure() && (App::environment() === 'production' || App::environment() === 'dev')) {
+                return redirect()->secure($request->getRequestUri());
+            }
+
+            return $next($request); 
+    }
+}
\ No newline at end of file