academico-sis / academico

app/Models/Enrollment.php

Spacing +9 added lines, -9 removed lines

@@ -56,11 +56,11 @@ 
     public function scopeWithoutChildren($query)
     {
         return $query
-            ->where(function ($query) {
+            ->where(function($query) {
                 $query->whereDoesntHave('childrenEnrollments')
                 ->where('parent_id', null);
             })
-            ->orWhere(function ($query) {
+            ->orWhere(function($query) {
                 $query->where('parent_id', null);
             })
             ->get();
@@ -82,7 +82,7 @@ 
 
     public function scopePeriod(Builder $query, int $periodId)
     {
-        return $query->whereHas('course', function ($q) use ($periodId) {
+        return $query->whereHas('course', function($q) use ($periodId) {
             $q->where('period_id', $periodId);
         });
     }
@@ -315,7 +315,7 @@ 
         }
 
         // if enabled, retrieve the default price category for the student
-        if (config('invoicing.price_categories_enabled') && $this->student?->price_category) {
+        if (config('invoicing.price_categories_enabled') && $this->student ? ->price_category) {
             $price_category = $this->student->price_category;
 
             return $this->course->$price_category ?? 0;
@@ -340,12 +340,12 @@ 
         $paidAmount = 0;
 
         foreach ($this->invoices as $invoice) {
-            $paidAmount += $invoice->payments?->sum('value') ?? 0;
+            $paidAmount += $invoice->payments ? ->sum('value') ?? 0;
         }
 
         $balance -= $paidAmount;
 
-        return number_format(- $balance, 2);
+        return number_format(-$balance, 2);
     }
 
     public function cancel()
@@ -359,11 +359,11 @@ 
 
         // delete attendance records related to the enrollment
         $attendances = $this->course->attendance->where('student_id', $this->student->id);
-        Attendance::destroy($attendances->map(fn ($item, $key) => $item->id));
+        Attendance::destroy($attendances->map(fn($item, $key) => $item->id));
 
         foreach ($this->course->children as $child) {
             $attendances = $child->attendance->where('student_id', $this->student->id);
-            Attendance::destroy($attendances->map(fn ($item, $key) => $item->id));
+            Attendance::destroy($attendances->map(fn($item, $key) => $item->id));
         }
 
         $this->delete();
@@ -394,7 +394,7 @@ 
                 }
 
                 // if one book is expired
-                if ($this->student && $this->student->books->where('id', $book->id)->filter(fn ($book) => $book->pivot->expiry_date == null || $book->pivot->expiry_date > Carbon::now())->count() == 0) {
+                if ($this->student && $this->student->books->where('id', $book->id)->filter(fn($book) => $book->pivot->expiry_date == null || $book->pivot->expiry_date > Carbon::now())->count() == 0) {
                     return 'EXP';
                 }
             }

app/Http/Controllers/Admin/EnrollmentCrudController.php

Spacing +14 added lines, -14 removed lines

@@ -118,9 +118,9 @@ 
                 'attribute' => 'lastname',
                 'label' => __('Last Name'),
                 'type' => 'relationship',
-                'searchLogic' => function ($query, $column, $searchTerm) {
-                    $query->orWhereHas('student', function ($q) use ($searchTerm) {
-                        $q->whereHas('user', function ($q) use ($searchTerm) {
+                'searchLogic' => function($query, $column, $searchTerm) {
+                    $query->orWhereHas('student', function($q) use ($searchTerm) {
+                        $q->whereHas('user', function($q) use ($searchTerm) {
                             $q->where('lastname', 'like', '%'.$searchTerm.'%');
                         });
                     });
@@ -133,9 +133,9 @@ 
                 'attribute' => 'firstname',
                 'label' => __('First Name'),
                 'type' => 'relationship',
-                'searchLogic' => function ($query, $column, $searchTerm) {
-                    $query->orWhereHas('student', function ($q) use ($searchTerm) {
-                        $q->whereHas('user', function ($q) use ($searchTerm) {
+                'searchLogic' => function($query, $column, $searchTerm) {
+                    $query->orWhereHas('student', function($q) use ($searchTerm) {
+                        $q->whereHas('user', function($q) use ($searchTerm) {
                             $q->where('firstname', 'like', '%'.$searchTerm.'%');
                         });
                     });
@@ -227,8 +227,8 @@ 
                 'name' => 'status_id',
                 'type' => 'select2_multiple',
                 'label'=> __('Status'),
-            ], fn () => EnrollmentStatusType::all()->pluck('name', 'id')->toArray(),
-            function ($values) {
+            ], fn() => EnrollmentStatusType::all()->pluck('name', 'id')->toArray(),
+            function($values) {
                 // if the filter is active
                 foreach (json_decode($values, null, 512, JSON_THROW_ON_ERROR) as $value) {
                     CRUD::addClause('orWhere', 'status_id', $value);
@@ -239,7 +239,7 @@ 
                 'name' => 'period_id',
                 'type' => 'select2',
                 'label'=> __('Period'),
-            ], fn () => Period::all()->pluck('name', 'id')->toArray(), function ($value) {
+            ], fn() => Period::all()->pluck('name', 'id')->toArray(), function($value) {
                 // if the filter is active
                 CRUD::addClause('period', $value);
             });
@@ -250,12 +250,12 @@ 
                     'type' => 'select2',
                     'label'=> __('Scholarship'),
                 ],
-                fn () => Scholarship::all()->pluck('name', 'id')->toArray(),
-                function ($value) { // if the filter is active
+                fn() => Scholarship::all()->pluck('name', 'id')->toArray(),
+                function($value) { // if the filter is active
                     if ($value == 'all') {
                         CRUD::addClause('whereHas', 'scholarships');
                     } else {
-                        CRUD::addClause('whereHas', 'scholarships', function ($q) use ($value) {
+                        CRUD::addClause('whereHas', 'scholarships', function($q) use ($value) {
                             $q->where('scholarships.id', $value);
                         });
                     }
@@ -275,7 +275,7 @@ 
             ->get();
 
         // get related comments
-        $comments = $enrollment->invoices->map(fn (Invoice $invoice) => $invoice->comments)->flatten()->concat($enrollment->comments);
+        $comments = $enrollment->invoices->map(fn(Invoice $invoice) => $invoice->comments)->flatten()->concat($enrollment->comments);
 
         $scholarships = Scholarship::all();
 
@@ -306,7 +306,7 @@ 
             'model'     => \App\Models\Course::class, // foreign key model
             'attribute' => 'name', // foreign key attribute that is shown to user
 
-            'options'   => (fn ($query) => $query->orderBy('level_id', 'ASC')->where('period_id', $this->crud->getCurrentEntry()->course->period_id)->get()),
+            'options'   => (fn($query) => $query->orderBy('level_id', 'ASC')->where('period_id', $this->crud->getCurrentEntry()->course->period_id)->get()),
         ]);
 
         CRUD::addField(array_merge([