From 20b13d131b44053129104991454dc325f206afd6 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 14 Jan 2021 07:33:45 +1100
Subject: [PATCH] Return expense response when using delete route

---
 app/Http/Controllers/ExpenseController.php | 5 ++---
 app/Jobs/Util/UploadFile.php               | 3 +++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/ExpenseController.php b/app/Http/Controllers/ExpenseController.php
index fa4676ab01..c2c2fede38 100644
--- a/app/Http/Controllers/ExpenseController.php
+++ b/app/Http/Controllers/ExpenseController.php
@@ -426,10 +426,9 @@ class ExpenseController extends BaseController
      */
     public function destroy(DestroyExpenseRequest $request, Expense $expense)
     {
-        //may not need these destroy routes as we are using actions to 'archive/delete'
-        $expense->delete();
+        $this->expense_repo->delete($expense);
 
-        return response()->json([], 200);
+        return $this->itemResponse($expense->fresh());
     }
 
     /**
diff --git a/app/Jobs/Util/UploadFile.php b/app/Jobs/Util/UploadFile.php
index 68d896ab74..4f070a8c93 100644
--- a/app/Jobs/Util/UploadFile.php
+++ b/app/Jobs/Util/UploadFile.php
@@ -66,6 +66,9 @@ class UploadFile implements ShouldQueue
      */
     public function handle() : ?Document
     {
+        if(!$this->file)
+            return null;
+
         $path = self::PROPERTIES[$this->type]['path'];
 
         if ($this->company) {