From 33c2ee702b1c8681870bf1eed8aa67b4b21c45af Mon Sep 17 00:00:00 2001
From: Nabeel Shahzad <nshahzad@gmail.com>
Date: Mon, 5 Mar 2018 13:15:47 -0600
Subject: [PATCH] Cleanup subfleet expense name; reload page on recalculate
 #130

---
 app/Services/FinanceService.php                | 5 +++--
 resources/views/admin/pireps/scripts.blade.php | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Services/FinanceService.php b/app/Services/FinanceService.php
index 14beb849..66eff4fe 100644
--- a/app/Services/FinanceService.php
+++ b/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'
             );
diff --git a/resources/views/admin/pireps/scripts.blade.php b/resources/views/admin/pireps/scripts.blade.php
index 406d2d97..90deee67 100644
--- a/resources/views/admin/pireps/scripts.blade.php
+++ b/resources/views/admin/pireps/scripts.blade.php
@@ -65,7 +65,7 @@ $(document).ready(() => {
             },
             success: (data) => {
                 console.log(data);
-                //location.reload();
+                location.reload();
             }
         });
     });