From 642748897bb05d7b2ed57348c5796e4c5459ff11 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 17 Jan 2024 06:50:13 +1100
Subject: [PATCH] Fixes for tax exports

---
 app/Export/CSV/TaskExport.php                    | 16 ++++------------
 app/Http/Controllers/InvoiceController.php       |  2 +-
 .../Requests/Invoice/UpdateInvoiceRequest.php    |  2 +-
 app/Models/Company.php                           |  2 +-
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/app/Export/CSV/TaskExport.php b/app/Export/CSV/TaskExport.php
index 1334ff578b56..fb128b022e8d 100644
--- a/app/Export/CSV/TaskExport.php
+++ b/app/Export/CSV/TaskExport.php
@@ -119,7 +119,7 @@ class TaskExport extends BaseExport
 
                     $this->storage_array = [];
                 });
-        // nlog($this->storage_item_array);
+
         return array_merge(['columns' => $header], $this->storage_item_array);
     }
 
@@ -139,19 +139,11 @@ class TaskExport extends BaseExport
             } elseif (in_array($key, ['task.start_date', 'task.end_date', 'task.duration'])) {
                 $entity[$key] = '';
             } else {
-                // nlog($key);
                 $entity[$key] = $this->decorator->transform($key, $task);
-                // $entity[$key] = $this->resolveKey($key, $task, $this->entity_transformer);
             }
 
-            // $entity['task.start_date'] = '';
-            // $entity['task.end_date'] = '';
-            // $entity['task.duration'] = '';
-
         }
 
-
-
         if (is_null($task->time_log) || (is_array(json_decode($task->time_log, 1)) && count(json_decode($task->time_log, 1)) == 0)) {
             $this->storage_array[] = $entity;
         } else {
@@ -200,9 +192,9 @@ class TaskExport extends BaseExport
 
             $this->storage_array[] = $entity;
 
-            unset($entity['task.start_date']);
-            unset($entity['task.end_date']);
-            unset($entity['task.duration']);
+            $entity['task.start_date'] = '';
+            $entity['task.end_date'] = '';
+            $entity['task.duration'] = '';
         }
 
     }
diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index e9c438ec16b3..cc3813ad3c88 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -408,7 +408,7 @@ class InvoiceController extends BaseController
         }
 
         if ($invoice->isLocked()) {
-            return response()->json(['message' => ctrans('texts.locked_invoice')], 403);
+            return response()->json(['message' => ctrans('texts.locked_invoice')], 422);
         }
 
         $old_invoice = $invoice->line_items;
diff --git a/app/Http/Requests/Invoice/UpdateInvoiceRequest.php b/app/Http/Requests/Invoice/UpdateInvoiceRequest.php
index 26c520d2c027..ad4d584ae689 100644
--- a/app/Http/Requests/Invoice/UpdateInvoiceRequest.php
+++ b/app/Http/Requests/Invoice/UpdateInvoiceRequest.php
@@ -57,7 +57,7 @@ class UpdateInvoiceRequest extends Request
             $rules['file'] = $this->file_validation;
         }
 
-        $rules['id'] = new LockedInvoiceRule($this->invoice);
+        // $rules['id'] = new LockedInvoiceRule($this->invoice);
 
         $rules['number'] = ['bail', 'sometimes', 'nullable', Rule::unique('invoices')->where('company_id', $user->company()->id)->ignore($this->invoice->id)];
 
diff --git a/app/Models/Company.php b/app/Models/Company.php
index 5b393b53d901..ea2e2915ae15 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -431,7 +431,7 @@ class Company extends BaseModel
 
     public function bank_integrations(): HasMany
     {
-        return $this->hasMany(BankIntegration::class);
+        return $this->hasMany(BankIntegration::class)->withTrashed();
     }
 
     public function bank_transactions(): HasMany