Passed
Push — master ( 7f26b3...cea505 )
by Thomas
06:43
created
app/Providers/AuthServiceProvider.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -30,70 +30,70 @@
 block discarded – undo
30 30
          * a user is allowed to edit the course grades if they are the teacher for this course,
31 31
          * or if they have explicit permission to do so
32 32
          */
33
-        Gate::define('edit-course-grades', fn ($user, $course) => $user->isTeacher() && $user->id == $course->teacher_id || $user->can('evaluation.edit'));
33
+        Gate::define('edit-course-grades', fn($user, $course) => $user->isTeacher() && $user->id == $course->teacher_id || $user->can('evaluation.edit'));
34 34
 
35 35
         /*
36 36
          * a user is allowed to view the course attendance sheet if they are the teacher for this course,
37 37
          * or if they have explicit permission to view all course attendance sheets
38 38
          */
39
-        Gate::define('view-course-attendance', fn ($user, $course) => $user->isTeacher() && $user->id == $course->teacher_id || $user->can('attendance.view'));
39
+        Gate::define('view-course-attendance', fn($user, $course) => $user->isTeacher() && $user->id == $course->teacher_id || $user->can('attendance.view'));
40 40
 
41 41
         /*
42 42
          * a user is allowed to view the event attendance sheet if they are the teacher for this event,
43 43
          * if they are the teacher for this course,
44 44
          * or if they have explicit permission to view all event attendance sheets
45 45
          */
46
-        Gate::define('view-event-attendance', fn ($user, $event) => ($event->teacher_id == $user->id) || ($event->course->teacher_id == $user->id) || $user->can('attendance.view'));
46
+        Gate::define('view-event-attendance', fn($user, $event) => ($event->teacher_id == $user->id) || ($event->course->teacher_id == $user->id) || $user->can('attendance.view'));
47 47
 
48 48
         /*
49 49
          * a user is allowed to edit an attendance sheet if they are the teacher for the event,
50 50
          * if they are the teacher for the course,
51 51
          * or if they have explicit permission to edit any attendance sheets
52 52
          */
53
-        Gate::define('edit-attendance', fn ($user, $event) => ($event->teacher_id == $user->id) || ($event->course->teacher_id == $user->id) || $user->can('attendance.edit'));
53
+        Gate::define('edit-attendance', fn($user, $event) => ($event->teacher_id == $user->id) || ($event->course->teacher_id == $user->id) || $user->can('attendance.edit'));
54 54
 
55 55
         /*
56 56
          * teachers are allowed to view their own calendar,
57 57
          * and users with explicit permission can view all calendars
58 58
          */
59
-        Gate::define('view-teacher-calendar', fn ($user, $teacher) => ($user->isTeacher() && $user->id == $teacher->id) || $user->can('calendars.view'));
59
+        Gate::define('view-teacher-calendar', fn($user, $teacher) => ($user->isTeacher() && $user->id == $teacher->id) || $user->can('calendars.view'));
60 60
 
61 61
         /*
62 62
          * teachers are allowed to view their own courses,
63 63
          * and users with explicit permission can view all courses
64 64
          */
65
-        Gate::define('view-course', fn ($user, Course $course) => ($user->isTeacher() && $user->id == $course->teacher_id) || $user->can('courses.view'));
65
+        Gate::define('view-course', fn($user, Course $course) => ($user->isTeacher() && $user->id == $course->teacher_id) || $user->can('courses.view'));
66 66
 
67 67
         /*
68 68
          * the user is allowed to view the result if they are the student,
69 69
          * if they are a teacher
70 70
          * of if they have explicit permission to view any result
71 71
          */
72
-        Gate::define('view-enrollment', fn ($user, $enrollment) => ($user->isStudent() && $user->id == $enrollment->student_id) || $user->isTeacher() || $user->can('evaluation.view'));
72
+        Gate::define('view-enrollment', fn($user, $enrollment) => ($user->isStudent() && $user->id == $enrollment->student_id) || $user->isTeacher() || $user->can('evaluation.view'));
73 73
 
74 74
         /*
75 75
          * if the user is the teacher of the course
76 76
          * of if they have explicit permission to enroll students
77 77
          */
78
-        Gate::define('enroll-in-course', fn ($user, $course) => $course->teacher_id == $user->id || $user->can('enrollments.edit'));
78
+        Gate::define('enroll-in-course', fn($user, $course) => $course->teacher_id == $user->id || $user->can('enrollments.edit'));
79 79
 
80 80
         /*
81 81
          * if the user is a teacher
82 82
          * of if they have explicit permission to enroll students
83 83
          */
84
-        Gate::define('enroll-students', fn ($user) => $user->isTeacher() || $user->can('enrollments.edit'));
84
+        Gate::define('enroll-students', fn($user) => $user->isTeacher() || $user->can('enrollments.edit'));
85 85
 
86 86
         /*
87 87
          * teachers are allowed to view their own hours,
88 88
          * and users with explicit permission can view all hours
89 89
          */
90
-        Gate::define('view-teacher-hours', fn ($user, $teacher) => ($user->isTeacher() && $user->id == $teacher->id) || $user->can('hr.view'));
90
+        Gate::define('view-teacher-hours', fn($user, $teacher) => ($user->isTeacher() && $user->id == $teacher->id) || $user->can('hr.view'));
91 91
 
92 92
         /*
93 93
          * teachers are allowed to edit results for their own students
94 94
          * as well as users with explicit permission to edit any result
95 95
          */
96
-        Gate::define('edit-result', function ($user, $enrollment) {
96
+        Gate::define('edit-result', function($user, $enrollment) {
97 97
             if ($user->can('evaluation.edit')) {
98 98
                 return true;
99 99
             }
Please login to merge, or discard this patch.
app/Http/Controllers/Admin/EnrollmentCrudController.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -97,14 +97,14 @@  discard block
 block discarded – undo
97 97
 
98 98
         CRUD::addColumns([['name' => 'id',
99 99
             'label' => 'ID',
100
-            'wrapper' => ['element' => function ($crud, $column, $entry) {
100
+            'wrapper' => ['element' => function($crud, $column, $entry) {
101 101
                 return $entry->status_id > 2 ? 'del' : 'span';
102 102
             }], ],
103 103
 
104 104
             ['label' => __('ID number'),
105 105
                 'type' => 'text',
106 106
                 'name' => 'student.idnumber',
107
-                'wrapper' => ['element' => function ($crud, $column, $entry) {
107
+                'wrapper' => ['element' => function($crud, $column, $entry) {
108 108
                     return $entry->status_id > 2 ? 'del' : 'span';
109 109
                 }], ],
110 110
 
@@ -113,17 +113,17 @@  discard block
 block discarded – undo
113 113
                 'attribute' => 'lastname',
114 114
                 'label' => __('Last Name'),
115 115
                 'type' => 'relationship',
116
-                'wrapper' => ['element' => function ($crud, $column, $entry) {
116
+                'wrapper' => ['element' => function($crud, $column, $entry) {
117 117
                     return $entry->status_id > 2 ? 'del' : 'span';
118 118
                 }],
119 119
                 'orderable' => true,
120
-                'orderLogic' => function ($query, $column, $columnDirection) {
120
+                'orderLogic' => function($query, $column, $columnDirection) {
121 121
                     return $query->leftJoin('users', 'enrollments.student_id', '=', 'users.id')
122 122
                         ->orderBy('users.lastname', $columnDirection)->select('enrollments.*');
123 123
                 },
124
-                'searchLogic' => function ($query, $column, $searchTerm) {
125
-                    $query->orWhereHas('student', function ($q) use ($searchTerm) {
126
-                        $q->whereHas('user', function ($q) use ($searchTerm) {
124
+                'searchLogic' => function($query, $column, $searchTerm) {
125
+                    $query->orWhereHas('student', function($q) use ($searchTerm) {
126
+                        $q->whereHas('user', function($q) use ($searchTerm) {
127 127
                             $q->where('lastname', 'like', '%'.$searchTerm.'%');
128 128
                         });
129 129
                     });
@@ -135,17 +135,17 @@  discard block
 block discarded – undo
135 135
                 'attribute' => 'firstname',
136 136
                 'label' => __('First Name'),
137 137
                 'type' => 'relationship',
138
-                'wrapper' => ['element' => function ($crud, $column, $entry) {
138
+                'wrapper' => ['element' => function($crud, $column, $entry) {
139 139
                     return $entry->status_id > 2 ? 'del' : 'span';
140 140
                 }],
141
-                'searchLogic' => function ($query, $column, $searchTerm) {
142
-                    $query->orWhereHas('student', function ($q) use ($searchTerm) {
143
-                        $q->whereHas('user', function ($q) use ($searchTerm) {
141
+                'searchLogic' => function($query, $column, $searchTerm) {
142
+                    $query->orWhereHas('student', function($q) use ($searchTerm) {
143
+                        $q->whereHas('user', function($q) use ($searchTerm) {
144 144
                             $q->where('firstname', 'like', '%'.$searchTerm.'%');
145 145
                         });
146 146
                     });
147 147
                 },
148
-                'orderLogic' => function ($query, $column, $columnDirection) {
148
+                'orderLogic' => function($query, $column, $columnDirection) {
149 149
                     return $query->leftJoin('users', 'enrollments.student_id', '=', 'users.id')
150 150
                         ->orderBy('users.firstname', $columnDirection)->select('enrollments.*');
151 151
                 },
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
                     'name' => 'course.period',
170 170
                     'label' => __('Period'),
171 171
                     'attribute' => 'name',
172
-                    'orderLogic' => function ($query, $column, $columnDirection) {
172
+                    'orderLogic' => function($query, $column, $columnDirection) {
173 173
                         return $query->leftJoin('courses', 'enrollments.course_id', '=', 'courses.id')
174 174
                             ->orderBy('courses.period_id', $columnDirection)->select('enrollments.*');
175 175
                     },
@@ -184,9 +184,9 @@  discard block
 block discarded – undo
184 184
             'attribute' => 'name',
185 185
             'model' => EnrollmentStatusType::class,
186 186
             'wrapper' => ['element' => 'span',
187
-                'class' => function ($crud, $column, $entry) {
187
+                'class' => function($crud, $column, $entry) {
188 188
                     return 'badge badge-pill badge-'.$entry->enrollmentStatus->styling();
189
-                }, ], ]]);
189
+                },], ]]);
190 190
 
191 191
         if (config('invoicing.allow_scheduled_payments')) {
192 192
             CRUD::addColumn(['name' => 'scheduledPayments',
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
         if ($this->mode === 'global') {
233 233
             CRUD::addFilter(['name' => 'status_id',
234 234
                 'type' => 'select2_multiple',
235
-                'label' => __('Status'), ], fn () => EnrollmentStatusType::all()->pluck('name', 'id')->toArray(), function ($values) {
235
+                'label' => __('Status'), ], fn() => EnrollmentStatusType::all()->pluck('name', 'id')->toArray(), function($values) {
236 236
                     foreach (json_decode($values, null, 512, JSON_THROW_ON_ERROR) as $value) {
237 237
                         CRUD::addClause('orWhere', 'status_id', $value);
238 238
                     }
@@ -240,17 +240,17 @@  discard block
 block discarded – undo
240 240
 
241 241
             CRUD::addFilter(['name' => 'period_id',
242 242
                 'type' => 'select2',
243
-                'label' => __('Period'), ], fn () => Period::all()->pluck('name', 'id')->toArray(), function ($value) {
243
+                'label' => __('Period'), ], fn() => Period::all()->pluck('name', 'id')->toArray(), function($value) {
244 244
                     CRUD::addClause('period', $value);
245 245
                 });
246 246
 
247 247
             CRUD::addFilter(['name' => 'scholarship',
248 248
                 'type' => 'select2',
249
-                'label' => __('Scholarship'), ], fn () => Scholarship::all()->pluck('name', 'id')->toArray(), function ($value) {
249
+                'label' => __('Scholarship'), ], fn() => Scholarship::all()->pluck('name', 'id')->toArray(), function($value) {
250 250
                     if ($value == 'all') {
251 251
                         CRUD::addClause('whereHas', 'scholarships');
252 252
                     } else {
253
-                        CRUD::addClause('whereHas', 'scholarships', function ($q) use ($value) {
253
+                        CRUD::addClause('whereHas', 'scholarships', function($q) use ($value) {
254 254
                             $q->where('scholarships.id', $value);
255 255
                         });
256 256
                     }
@@ -271,8 +271,8 @@  discard block
 block discarded – undo
271 271
         // then load the page
272 272
         $commentsIncludingInvoices = $enrollment->comments
273 273
             ->concat($enrollment->invoices()
274
-                ->map(fn($invoice) => $invoice->comments->map(function ($comment) use ($invoice) {
275
-                    $comment->prefix = '(' . __('Invoice') . " " . ($invoice->invoice_reference ?? $invoice->id) . ")";
274
+                ->map(fn($invoice) => $invoice->comments->map(function($comment) use ($invoice) {
275
+                    $comment->prefix = '('.__('Invoice')." ".($invoice->invoice_reference ?? $invoice->id).")";
276 276
                     return $comment;
277 277
                 }))
278 278
                 ->flatten()
@@ -304,7 +304,7 @@  discard block
 block discarded – undo
304 304
             'model' => Course::class,
305 305
             'attribute' => 'name',
306 306
 
307
-            'options' => (fn ($query) => $query->orderBy('level_id', 'ASC')->where('period_id', $this->crud->getCurrentEntry()->course->period_id)->get()),
307
+            'options' => (fn($query) => $query->orderBy('level_id', 'ASC')->where('period_id', $this->crud->getCurrentEntry()->course->period_id)->get()),
308 308
         ]);
309 309
 
310 310
         CRUD::addField(array_merge([
Please login to merge, or discard this patch.
app/Http/Controllers/Admin/InvoiceCrudController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
         CRUD::setModel(Invoice::class);
30 30
         CRUD::setRoute(config('backpack.base.route_prefix').'/invoice');
31 31
         CRUD::setEntityNameStrings(__('invoice'), __('invoices'));
32
-        if (! config('invoicing.price_categories_enabled')) {
32
+        if (!config('invoicing.price_categories_enabled')) {
33 33
             $this->crud->addButtonFromView('top', 'createInvoice', 'createInvoice', 'start');
34 34
         }
35 35
     }
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
                 'label' => __('Date range'),
105 105
             ],
106 106
             false,
107
-            function ($value) { // if the filter is active, apply these constraints
107
+            function($value) { // if the filter is active, apply these constraints
108 108
                 $dates = json_decode($value, null, 512, JSON_THROW_ON_ERROR);
109 109
 
110 110
                 if ($dates->from) {
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
     {
148 148
         $invoice = Invoice::findOrFail($id)->load('payments');
149 149
 
150
-        if (! backpack_user()->can('enrollments.edit')) {
150
+        if (!backpack_user()->can('enrollments.edit')) {
151 151
             abort(403);
152 152
         }
153 153
 
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
             'invoice' => $invoice,
156 156
             'availablePaymentMethods' => Paymentmethod::all(),
157 157
             'editable' => true,
158
-            'enrollment' => $invoice->enrollments->first()?->product,
158
+            'enrollment' => $invoice->enrollments->first() ? ->product,
159 159
             'comments' => $invoice->comments,
160 160
             'afterSuccessUrl' => $invoice->enrollments->count() > 0 ? "/enrollment/{$invoice->enrollments->first()->product_id}/show" : '/invoice', // TODO fix this, an invoice can theoretically contain several enrollments
161 161
         ]);
Please login to merge, or discard this patch.