Skip to content

Commit c4a7f48

Browse files
committed
Fix for #714
1 parent 356a045 commit c4a7f48

File tree

2 files changed

+32
-25
lines changed

2 files changed

+32
-25
lines changed

app/Livewire/KktNetreg.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class KktNetreg extends Component
1919
*/
2020
public function getUnpaidUsersProperty()
2121
{
22-
$query = User::hasToPayKKTNetreg()->canView();
22+
$query = User::hasToPayKKTNetreg();
2323

2424
$query->where(function (Builder $query) {
2525
foreach ($this->workshops as $workshop) {

resources/views/student-council/economic-committee/kktnetreg_component.blade.php

+31-24
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,24 @@
2929
</div>
3030
</div>
3131
@forelse($this->unpaidUsers as $user)
32-
@can('view', $user)
33-
<div class="row">
34-
<div class="col s12 xl3">
32+
<div class="row">
33+
<div class="col s12 xl3">
34+
@can('view', $user)
3535
<a href="{{ route('users.show', ['user' => $user->id]) }}"><b>{{ $user->name }}</b></a><br>
3636
{{ $user->email }}
3737
@if($user->hasEducationalInformation())
3838
<br>{{ $user->educationalInformation->neptun ?? '' }}
3939
@endif
40-
</div>
41-
<div class="col s12 xl4">
42-
@if($user->hasEducationalInformation())
43-
@include('user.workshop_tags', ['workshops' => $user->workshops, 'newline' => true])
44-
@endif
45-
</div>
40+
@else
41+
<b>{{ $user->name }}</b>
42+
@endcan
43+
</div>
44+
<div class="col s12 xl4">
45+
@if($user->hasEducationalInformation())
46+
@include('user.workshop_tags', ['workshops' => $user->workshops, 'newline' => true])
47+
@endif
4648
</div>
47-
@endcan
49+
</div>
4850
@empty
4951
@lang('user.no_such_user')
5052
@endforelse
@@ -67,28 +69,33 @@
6769
</div>
6870
@forelse($this->payments as $transaction)
6971
@php($user = $transaction->payer)
70-
@can('view', $user)
71-
<div class="row">
72-
<div class="col s12 xl3">
72+
<div class="row">
73+
<div class="col s12 xl3">
74+
@can('view', $user)
7375
<a href="{{ route('users.show', ['user' => $user->id]) }}"><b>{{ $user->name }}</b></a><br>
7476
{{ $user->email }}
7577
@if($user->hasEducationalInformation())
7678
<br>{{ $user->educationalInformation->neptun ?? '' }}
7779
@endif
78-
</div>
79-
<div class="col s12 xl4">
80+
@else
81+
<b>{{ $user->name }}</b>
8082
@if($user->hasEducationalInformation())
81-
@include('user.workshop_tags', ['workshops' => $user->workshops, 'newline' => true])
83+
<br>{{ $user->educationalInformation->neptun ?? '' }}
8284
@endif
83-
</div>
84-
<div class="col s12 xl1" style="padding-left:50px;">
85-
{{ $transaction->comment }}
86-
<br>
87-
{{ $transaction->amount }}
88-
</div>
89-
85+
@endcan
86+
</div>
87+
<div class="col s12 xl4">
88+
@if($user->hasEducationalInformation())
89+
@include('user.workshop_tags', ['workshops' => $user->workshops, 'newline' => true])
90+
@endif
91+
</div>
92+
<div class="col s12 xl1" style="padding-left:50px;">
93+
{{ $transaction->comment }}
94+
<br>
95+
{{ $transaction->amount }}
9096
</div>
91-
@endcan
97+
98+
</div>
9299
@empty
93100
@lang('checkout.no_such_payment')
94101
@endforelse

0 commit comments

Comments
 (0)