From 422a7c9d65ec2a9a222ac25d9bc06792e82cd1ac Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Sat, 18 Mar 2023 05:17:56 +0800
Subject: [PATCH] import bank record

---
 .../Imports/ImportBankRecordController.php    | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/Imports/ImportBankRecordController.php b/app/Http/Controllers/Imports/ImportBankRecordController.php
index 6b0f212e..43799bfd 100644
--- a/app/Http/Controllers/Imports/ImportBankRecordController.php
+++ b/app/Http/Controllers/Imports/ImportBankRecordController.php
@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers\Imports;
 
-use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
 use App\Classes\Modules\Imports\Services\ImportsBankRecord;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\PaymentMethodType;
@@ -10,7 +9,6 @@ use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Models\Booking;
 use App\Models\Group;
 use App\Models\Transaction;
-use App\Models\Wallet;
 use Illuminate\Http\Request;
 use Maatwebsite\Excel\Facades\Excel;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
@@ -53,21 +51,28 @@ class ImportBankRecordController
                 $date = Date::excelToDateTimeObject($row['date']);
                 $credit = (float) $row['credit'];
                 $debit = (float) $row['debit'];
-
-                $creditTransactions = $this->getTransactions($date, $credit, TransactionType::PAYMENT, Booking::class, PaymentMethodType::WALLET, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
-                $debitTransactions = $this->getTransactions($date, $debit, null, null, null, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED], Group::class);
+                $creditTransactions = [];
+                $debitTransactions = [];
 
                 $systemReference = null;
+
+                if($credit){
+                    $creditTransactions = $this->getTransactions($date, $credit, TransactionType::PAYMENT, Booking::class, PaymentMethodType::WALLET, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+                    foreach ($creditTransactions as $transaction) {
+                        $systemReference[] = $transaction->owner instanceof Booking ? $transaction->owner->marking : $transaction->bill_no;
+                    }
+                }
+
+                if($debit){
+                    $debitTransactions = $this->getTransactions($date, $debit, null, null, null, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED], Group::class);
+                    foreach ($debitTransactions as $transaction) {
+                        $systemReference[] = $transaction->reference;
+                    }
+                }
+
+
                 $multiple = count($creditTransactions) + count($debitTransactions) > 1 ? $yes : $no;
 
-                foreach ($creditTransactions as $transaction) {
-                    $systemReference[] = $transaction->owner instanceof Booking ? $transaction->owner->marking : $transaction->bill_no;
-                }
-
-                foreach ($debitTransactions as $transaction) {
-                    $systemReference[] = $transaction->reference;
-                }
-
                 $systemReference = $systemReference ? implode(',', $systemReference) : null;
 
                 $matches = $systemReference == $row['remarkreferences'] ? $yes : $no;