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

Merge branch 'develop' into trunk

Browse source
This commit is contained in:
Vincent BRIDIER 2025-11-12 17:31:45 +01:00
commit 4cca7dea5e
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -33,7 +33,8 @@ 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]);
}

2
app/Traits/GenerateBR.php
View file

@ -352,7 +352,7 @@ trait GenerateBR
imagecopy($mask, $test, 60, 250, 0, 0, imagesx($test), imagesy($test));
} else {
$codeBarre = $coupon->coupon_code . strtoupper($contact->contact_id);
$codeBarre = $coupon->coupon_code . strval($contact->contact_id);
$codeBarrePrint = $codeBarre;
$generator = new \Picqer\Barcode\BarcodeGeneratorPNG();
$base64 = $generator->getBarcode($codeBarrePrint, $generator::TYPE_CODE_128_A, 2, 46);