beenull/ctrlpanel
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix vouchers

Browse source
This commit is contained in:
1Day 2021-12-13 16:27:56 +01:00
parent f54bed1c4a
commit ae67bd9a42
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/Admin/VoucherController.php
View file

@ -161,7 +161,7 @@ class VoucherController extends Controller
event(new UserUpdateCreditsEvent($request->user())); event(new UserUpdateCreditsEvent($request->user()));
return response()->json([ return response()->json([
'success' => "{$voucher->credits} " . CREDITS_DISPLAY_NAME . " have been added to your balance!" 'success' => "{$voucher->credits} " . CREDITS_DISPLAY_NAME ." ". __("have been added to your balance!")
]); ]);
} }
@ -201,7 +201,7 @@ class VoucherController extends Controller
}) })
->addColumn('status', function (Voucher $voucher) { ->addColumn('status', function (Voucher $voucher) {
$color = 'success'; $color = 'success';
if ($voucher->getStatus() != 'VALID') $color = 'danger'; if ($voucher->getStatus() != __('VALID')) $color = 'danger';
return '<span class="badge badge-' . $color . '">' . $voucher->getStatus() . '</span>'; return '<span class="badge badge-' . $color . '">' . $voucher->getStatus() . '</span>';
}) })
->editColumn('uses', function (Voucher $voucher) { ->editColumn('uses', function (Voucher $voucher) {

4
app/Models/Voucher.php
View file

@ -86,10 +86,10 @@ class Voucher extends Model
{ {
if ($this->users()->count() >= $this->uses) return 'USES_LIMIT_REACHED'; if ($this->users()->count() >= $this->uses) return 'USES_LIMIT_REACHED';
if (!is_null($this->expires_at)) { if (!is_null($this->expires_at)) {
if ($this->expires_at->isPast()) return 'EXPIRED'; if ($this->expires_at->isPast()) return __('EXPIRED');
} }
return 'VALID'; return __('VALID');
} }
/** /**

6
resources/lang/de.json
View file

@ -304,7 +304,7 @@
"This voucher has expired": "Gutschein abgelaufen", "This voucher has expired": "Gutschein abgelaufen",
"You already redeemed this voucher code": "Du hast diesen Gutschein bereits eingelöst", "You already redeemed this voucher code": "Du hast diesen Gutschein bereits eingelöst",
"You can't redeem this voucher because you would exceed the limit of ": "Du kannst diesen Gutschein nicht einlösen sonst hast du zu viele ", "You can't redeem this voucher because you would exceed the limit of ": "Du kannst diesen Gutschein nicht einlösen sonst hast du zu viele ",
" have been added to your balance!": "Wurden deinem Konto hinzugefügt", "have been added to your balance!": "wurden deinem Konto hinzugefügt",
"Invoice": "Rechnung", "Invoice": "Rechnung",
"Serial No.": "Rechnungsnr.", "Serial No.": "Rechnungsnr.",
"Invoice date": "Rechnungsdatum", "Invoice date": "Rechnungsdatum",
@ -348,6 +348,8 @@
"If you have any questions please let us know.": "Solltest du weiter fragen haben, melde dich gerne beim Support!", "If you have any questions please let us know.": "Solltest du weiter fragen haben, melde dich gerne beim Support!",
"Regards": "mit freundlichen Grüßen", "Regards": "mit freundlichen Grüßen",
"Getting started!": "Den Anfang machen!" "Getting started!": "Den Anfang machen!",
"EXPIRED": "ABGELAUFEN",
"VALID": "GÜLTIG"
} }