From a82fec884ad79ac2fdb7a1cba55e4b0f783b2ef7 Mon Sep 17 00:00:00 2001 From: Vincent BRIDIER Date: Wed, 30 Jun 2021 11:11:05 +0200 Subject: [PATCH] - no gitted prod modif --- app/Http/Controllers/CouponController.php | 2 +- app/Http/Controllers/StatistiqueController.php | 2 +- app/Http/Middleware/TrustProxies.php | 2 +- resources/views/template/mur/imprimer.blade.php | 2 +- resources/views/template/murnoselection/index.blade.php | 2 +- resources/views/template/panierselection/imprimer.blade.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/CouponController.php b/app/Http/Controllers/CouponController.php index cab727f..757acc0 100644 --- a/app/Http/Controllers/CouponController.php +++ b/app/Http/Controllers/CouponController.php @@ -40,7 +40,7 @@ class CouponController extends Controller // ---- Calcul de la quantité mise à disposition grace aux fonctions dans CouponTrait.php $coupon->coupon_quantity = $this->getFullQuantity($coupon); // ---- Calcul de la quantité restante toutes campagnes comprises grace aux fonctions dans CouponTrait.php - $coupon->coupon_left = $coupon->coupon_quantity - $this->getUsedQuantity($coupon); + $coupon->coupon_left = 0; //$coupon->coupon_quantity - $this->getUsedQuantity($coupon); } return view('coupon.index', ['coupons' => $coupons, 'camps' => $campIds]); diff --git a/app/Http/Controllers/StatistiqueController.php b/app/Http/Controllers/StatistiqueController.php index 2b9f81c..66ca0f6 100644 --- a/app/Http/Controllers/StatistiqueController.php +++ b/app/Http/Controllers/StatistiqueController.php @@ -85,7 +85,7 @@ class StatistiqueController extends Controller $coupon->diffused = $this->getDiffusedQuantity($coupon); $coupon->isPrintable = $this->isAvailableToPrint($coupon, $campagne); $coupon->isPaused = $this->isPausedToPrint($coupon, $campagne); - $coupon->color = $colors[$count]; + $coupon->color = $coupon->color = "#" . str_pad( dechex( mt_rand( 0, 255 ) ), 2, '0', STR_PAD_LEFT) . str_pad( dechex( mt_rand( 0, 255 ) ), 2, '0', STR_PAD_LEFT) . str_pad( dechex( mt_rand( 0, 255 ) ), 2, '0', STR_PAD_LEFT); $count++; } $enddate = date('Y-m-d'); diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php index d7eadcb..52990c1 100644 --- a/app/Http/Middleware/TrustProxies.php +++ b/app/Http/Middleware/TrustProxies.php @@ -13,7 +13,7 @@ class TrustProxies extends Middleware * * @var array */ - protected $proxies = ['192.168.34.1', '192.168.31.1', '192.168.31.2']; + protected $proxies = ['*']; /** * The headers that should be used to detect proxies. diff --git a/resources/views/template/mur/imprimer.blade.php b/resources/views/template/mur/imprimer.blade.php index 03af72f..ae2aec7 100644 --- a/resources/views/template/mur/imprimer.blade.php +++ b/resources/views/template/mur/imprimer.blade.php @@ -49,8 +49,8 @@ } else { - document.location.href="/merci"; window.print(); + document.location.href="/merci"; } } diff --git a/resources/views/template/murnoselection/index.blade.php b/resources/views/template/murnoselection/index.blade.php index f200c44..20dcbbc 100644 --- a/resources/views/template/murnoselection/index.blade.php +++ b/resources/views/template/murnoselection/index.blade.php @@ -51,8 +51,8 @@ function impressionexe() { setTimeout("impressionexe()",2500); } else { - document.location.href="/merci"; window.print(); + document.location.href="/merci"; } } diff --git a/resources/views/template/panierselection/imprimer.blade.php b/resources/views/template/panierselection/imprimer.blade.php index 2190cf3..a5c9b0b 100644 --- a/resources/views/template/panierselection/imprimer.blade.php +++ b/resources/views/template/panierselection/imprimer.blade.php @@ -48,8 +48,8 @@ } else { - document.location.href="/merci"; window.print(); + document.location.href="/merci"; } }