Skip to content

Commit 6b79d84

Browse files
committed
fix
1 parent d67c038 commit 6b79d84

2 files changed

Lines changed: 11 additions & 6 deletions

File tree

app/Http/Controllers/POS/AttendeeController.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
use App\Http\Controllers\Controller;
77
use App\Models\Event;
88
use App\Models\EventUser;
9-
use App\Models\Fursuit\States\Rejected;
109
use App\Models\User;
1110
use Illuminate\Http\RedirectResponse;
1211
use Illuminate\Http\Request;
@@ -58,11 +57,8 @@ public function show(string $attendeeId, Request $request): Response
5857

5958
$user = $eventUser->user;
6059

61-
// Get all badges for the user
60+
// Get all badges for the user (including rejected ones)
6261
$allBadges = $user->badges()
63-
->whereHas('fursuit', function ($query) {
64-
$query->where('status', '!=', Rejected::$name);
65-
})
6662
->with(['fursuit.species', 'fursuit.event'])
6763
->get()
6864
->load('wallet');

resources/js/Components/POS/Attendee/BadgesTable.vue

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,16 @@ function changeHandout(badgeId, undo) {
5151
<Column v-if="!props.readonly" selectionMode="multiple" headerStyle="width: 3rem"></Column>
5252
<Column field="custom_id" header="ID"></Column>
5353
<Column field="fursuit.name" header="Fursuit"></Column>
54-
<Column field="fursuit.status" header="Fursuit Status"></Column>
54+
<Column field="fursuit.status" header="Approval">
55+
<template #body="slotProps">
56+
<Tag
57+
:severity="slotProps.data.fursuit.status === 'approved' ? 'success' :
58+
slotProps.data.fursuit.status === 'rejected' ? 'danger' :
59+
'warning'"
60+
:value="slotProps.data.fursuit.status ? slotProps.data.fursuit.status.charAt(0).toUpperCase() + slotProps.data.fursuit.status.slice(1) : 'Unknown'"
61+
/>
62+
</template>
63+
</Column>
5564
<Column field="printed_at" header="Print">
5665
<template #body="slotProps">
5766
{{ (slotProps.data.printed_at) ? dayjs(slotProps.data.printed_at).format('DD.MM.YY') : '-' }}

0 commit comments

Comments
 (0)