Cleanup subfleet expense name; reload page on recalculate #130

app/Services/FinanceService.php

@@ -177,8 +177,9 @@ class FinanceService extends BaseService
      */
     public function paySubfleetExpenses(Pirep $pirep)
     {
+        $subfleet = $pirep->aircraft->subfleet;
         $subfleet_expenses = SubfleetExpense::where([
-            'subfleet_id' => $pirep->aircraft->subfleet_id,
+            'subfleet_id' => $subfleet->id,
         ])->get();
 
         if(!$subfleet_expenses) {
@@ -195,7 +196,7 @@ class FinanceService extends BaseService
                 null,
                 Money::createFromAmount($expense->amount),
                 $pirep,
-                'Subfleet Expense: '.$expense->name,
+                'Subfleet ('.$subfleet->type.'): '.$expense->name,
                 null,
                 'subfleet_expense'
             );

resources/views/admin/pireps/scripts.blade.php

@@ -65,7 +65,7 @@ $(document).ready(() => {
             },
             success: (data) => {
                 console.log(data);
-                //location.reload();
+                location.reload();
             }
         });
     });