From d348d2ce4e5b7e99c2dc57904c81a51d87e1d4d3 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 16 Aug 2022 10:45:51 +1000 Subject: [PATCH] Bank transactions --- app/Jobs/Bank/ProcessBankTransactions.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/Jobs/Bank/ProcessBankTransactions.php b/app/Jobs/Bank/ProcessBankTransactions.php index db100b98d31e..5566f1e9ba65 100644 --- a/app/Jobs/Bank/ProcessBankTransactions.php +++ b/app/Jobs/Bank/ProcessBankTransactions.php @@ -94,11 +94,12 @@ class ProcessBankTransactions implements ShouldQueue //income transactions $transactions = $yodlee->getTransactions($data); + + $bts = BankTransaction::whereIn('transaction_id', array_column($transactions, 'transaction_id'))->where('company_id', $company->id)->withTrashed()->get('transaction_id'); + foreach($transactions as $transaction) { - if(BankTransaction::where('transaction_id', $transaction['transaction_id'])->where('company_id', $company->id)->withTrashed()->exists()) - continue; $bt = BankTransaction::create( $transaction @@ -114,7 +115,9 @@ class ProcessBankTransactions implements ShouldQueue MultiDB::setDb($company->db); - $this->bank_integration->from_date = now(); + $last_transaction = end($transactions); + + $this->bank_integration->from_date = isset($last_transaction['date']) ? \Carbon\Carbon::parse($last_transaction['date']) : now(); $this->bank_integration->save(); }