forge-joniko/ldc-mesbr-app
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- no gitted prod modif

Browse source
This commit is contained in:
Vincent BRIDIER 2021-06-30 11:11:05 +02:00
parent c42e793dd5
commit a82fec884a
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/CouponController.php
View file

@ -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]);

2
app/Http/Controllers/StatistiqueController.php
View file

@ -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');

2
app/Http/Middleware/TrustProxies.php
View file

@ -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.

2
resources/views/template/mur/imprimer.blade.php
View file

@ -49,8 +49,8 @@
}
else {
document.location.href="/merci";
window.print();
document.location.href="/merci";
}
}

2
resources/views/template/murnoselection/index.blade.php
View file

@ -51,8 +51,8 @@ function impressionexe() {
setTimeout("impressionexe()",2500);
}
else {
document.location.href="/merci";
window.print();
document.location.href="/merci";
}
}

2
resources/views/template/panierselection/imprimer.blade.php
View file

@ -48,8 +48,8 @@
}
else {
document.location.href="/merci";
window.print();
document.location.href="/merci";
}
}