From 951e460c5a4639a9b20cb4919a01e58eef224457 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 3 Feb 2023 13:29:53 +1100
Subject: [PATCH] Fixes when importing invoices with associated payments.
 Ensure we use the correct applied amount

---
 app/Http/Requests/Payment/StorePaymentRequest.php | 2 +-
 app/Import/Providers/BaseImport.php               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Requests/Payment/StorePaymentRequest.php b/app/Http/Requests/Payment/StorePaymentRequest.php
index 9614199f76b7..8a276d75bf50 100644
--- a/app/Http/Requests/Payment/StorePaymentRequest.php
+++ b/app/Http/Requests/Payment/StorePaymentRequest.php
@@ -39,7 +39,7 @@ class StorePaymentRequest extends Request
     public function prepareForValidation()
     {
         $input = $this->all();
-
+nlog($input);
         $invoices_total = 0;
         $credits_total = 0;
 
diff --git a/app/Import/Providers/BaseImport.php b/app/Import/Providers/BaseImport.php
index 937ca6447090..994b6d70225f 100644
--- a/app/Import/Providers/BaseImport.php
+++ b/app/Import/Providers/BaseImport.php
@@ -368,7 +368,7 @@ class BaseImport
                                 $payment_data['invoices'] = [
                                     [
                                         'invoice_id' => $invoice->id,
-                                        'amount' => $payment_data['amount'] ?? null,
+                                        'amount' => min($invoice->amount, $payment_data['amount']) ?? null,
                                     ],
                                 ];