From 73df9cc4949fee8d70eecb3e7770225f25d0832b Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 4 Feb 2024 11:15:53 +1100
Subject: [PATCH] Small improvement for document imports

---
 .../TaskScheduler/StoreSchedulerRequest.php   |  2 +-
 app/Jobs/Util/Import.php                      | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/Http/Requests/TaskScheduler/StoreSchedulerRequest.php b/app/Http/Requests/TaskScheduler/StoreSchedulerRequest.php
index e204c36bcddb..78481ef80717 100644
--- a/app/Http/Requests/TaskScheduler/StoreSchedulerRequest.php
+++ b/app/Http/Requests/TaskScheduler/StoreSchedulerRequest.php
@@ -49,7 +49,7 @@ class StoreSchedulerRequest extends Request
             'parameters.entity_id' => ['bail', 'sometimes', 'string'],
             'parameters.report_name' => ['bail','sometimes', 'string', 'required_if:template,email_report','in:ar_detailed,ar_summary,client_balance,tax_summary,profitloss,client_sales,user_sales,product_sales,activity,client,contact,client_contact,credit,document,expense,invoice,invoice_item,quote,quote_item,recurring_invoice,payment,product,task'],
             'parameters.date_key' => ['bail','sometimes', 'string'],
-            'parameters.status' => ['bail','sometimes', 'string'],
+            'parameters.status' => ['bail','sometimes', 'nullable', 'string'],
         ];
 
         return $rules;
diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index 894c6046d764..cf65f4576284 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -1145,8 +1145,6 @@ class Import implements ShouldQueue
 
             $key = "invoices_{$resource['id']}";
 
-            nlog($invoice->id);
-
             $this->ids['invoices'][$key] = [
                 'old' => $resource['id'],
                 'new' => $invoice->id,
@@ -1352,11 +1350,11 @@ class Import implements ShouldQueue
             '*.client_id' => ['required'],
         ];
 
-        $validator = Validator::make($data, $rules);
+        // $validator = Validator::make($data, $rules);
 
-        if ($validator->fails()) {
-            throw new MigrationValidatorFailed(json_encode($validator->errors()));
-        }
+        // if ($validator->fails()) {
+        //     throw new MigrationValidatorFailed(json_encode($validator->errors()));
+        // }
 
         $payment_repository = new PaymentMigrationRepository(new CreditRepository());
 
@@ -1527,18 +1525,19 @@ class Import implements ShouldQueue
                     }
                 }
 
-                if (!$entity) {
-                    continue;
-                }
+                
                     // throw new Exception("Resource invoice/quote document not available.");
             }
 
-
             if (array_key_exists('expense_id', $resource) && $resource['expense_id'] && array_key_exists('expenses', $this->ids)) {
                 $expense_id = $this->transformId('expenses', $resource['expense_id']);
                 $entity = Expense::query()->where('id', $expense_id)->withTrashed()->first();
             }
 
+            if (!$entity) {
+                continue;
+            }
+
             $file_url = $resource['url'];
             $file_name = $resource['name'];
             $file_path = sys_get_temp_dir().'/'.$file_name;