Merge branch 'develop' into trunk

app/Http/Controllers/CouponController.php

@@ -38,7 +38,7 @@ class CouponController extends Controller
             $coupon->coupon_quantity = $this->getFullQuantity($coupon);
             // ---- Calcul de la quantité restante toutes campagnes comprises grace aux fonctions dans CouponTrait.php
             $coupon->coupon_left = 0;
-// $coupon->coupon_quantity -  $this->getUsedQuantity($coupon);
+            // $coupon->coupon_quantity -  $this->getUsedQuantity($coupon);
         }
 
         return view('coupon.index', ['coupons' => $coupons, 'camps' => $campIds]);
@@ -69,6 +69,7 @@ class CouponController extends Controller
         $data = $request->all();
 
         $v = Validator::make($data, [
+            'coupon_code' => 'required|unique:coupon,coupon_code',
             'coupon_validity_text' => 'required',
             'coupon_legal_mentions' => 'required',
             'coupon_decoration_image' => 'required|image|mimes:jpeg,png',
@@ -82,7 +83,7 @@ class CouponController extends Controller
         });
 
         if ($v->fails()) {
-            return redirect('bo/coupon/' . $coupon->coupon_id . '/edit')
+            return redirect()->back()
                 ->withErrors($v)
                 ->withInput();
         }
@@ -279,7 +280,7 @@ class CouponController extends Controller
             return redirect()->route('coupon.edit', ['coupon' => $coupon]);
         } else {
             return view('holder');
-        }//end if
+        } //end if
 
         return redirect()->route('coupon.edit', ['coupon' => $coupon]);
     }

staging-resources.yaml

@@ -0,0 +1,20 @@
+---
+apiVersion: traefik.io/v1alpha1
+kind: IngressRoute
+metadata:
+  name: ${CI_PROJECT_PATH_SLUG}-ingress-route
+spec:
+  entryPoints:
+  - web
+  - websecure
+  routes:
+  - match: Host(`${APP_DOMAIN}`)
+    kind: Rule
+    services:
+    - name: ${CI_PROJECT_PATH_SLUG}-service
+      port: 80
+    middlewares:
+    - name: admin-ldc-whitelist
+      namespace: common-services
+  tls:
+    secretName: ${CRT_TLS_NAME}