From 8d07c4d2c57530fdf67b1932822331fc9efa6ac5 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 4 Jan 2024 21:29:33 +1100
Subject: [PATCH] v5.8.1

---
 VERSION.txt                            | 2 +-
 app/Repositories/PaymentRepository.php | 7 ++++++-
 config/ninja.php                       | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index edb1d397cf28..885bc9f72da8 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.8.0
\ No newline at end of file
+5.8.1
\ No newline at end of file
diff --git a/app/Repositories/PaymentRepository.php b/app/Repositories/PaymentRepository.php
index cb5ebc89baca..2edd5589badc 100644
--- a/app/Repositories/PaymentRepository.php
+++ b/app/Repositories/PaymentRepository.php
@@ -107,7 +107,12 @@ class PaymentRepository extends BaseRepository
         }
 
         /*Fill the payment*/
-        $payment->fill($data);
+        $fill_data = $data;
+
+        if($this->import_mode && isset($fill_data['invoices']))
+            unset($fill_data['invoices']);
+
+        $payment->fill($fill_data);
         $payment->is_manual = true;
         $payment->status_id = Payment::STATUS_COMPLETED;
 
diff --git a/config/ninja.php b/config/ninja.php
index 43e15c65e927..c464fb0d8768 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.63'),
-    'app_tag' => env('APP_TAG', '5.7.63'),
+    'app_version' => env('APP_VERSION', '5.8.1'),
+    'app_tag' => env('APP_TAG', '5.8.1'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),