From f25af382a58fa6744a44c1dda9faeb34fa3c0f48 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 12 Dec 2023 17:27:55 +1100
Subject: [PATCH] v5.7.62

---
 VERSION.txt                                |  2 +-
 app/Http/Requests/Import/ImportRequest.php | 10 ++++++++++
 config/ninja.php                           |  4 ++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index 5fd68abd0349..432493c23c5a 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.7.61
\ No newline at end of file
+5.7.62
\ No newline at end of file
diff --git a/app/Http/Requests/Import/ImportRequest.php b/app/Http/Requests/Import/ImportRequest.php
index 541f4f1c422c..f528452b0708 100644
--- a/app/Http/Requests/Import/ImportRequest.php
+++ b/app/Http/Requests/Import/ImportRequest.php
@@ -40,4 +40,14 @@ class ImportRequest extends Request
             'bank_integration_id' => 'bail|required_with:column_map.bank_transaction|min:2'
         ];
     }
+
+    public function prepareForValidation()
+    {
+        $input = $this->all();
+
+        if(!isset($input['column_map']['bank_transaction']) && array_key_exists('bank_integration_id',$input)) 
+            unset($input['bank_integration_id']);
+
+        $this->replace($input);
+    }
 }
diff --git a/config/ninja.php b/config/ninja.php
index 9132ad5f793d..6221456e165f 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -17,8 +17,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => env('APP_VERSION', '5.7.61'),
-    'app_tag' => env('APP_TAG', '5.7.61'),
+    'app_version' => env('APP_VERSION', '5.7.62'),
+    'app_tag' => env('APP_TAG', '5.7.62'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),