From 40055a0095d0adc932799ec0a6322a61f26cf855 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 10 Nov 2022 18:06:09 +1100 Subject: [PATCH] Fixes for csv inget --- app/Import/Transformers/Bank/BankTransformer.php | 4 ++-- app/Jobs/Import/CSVIngest.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Import/Transformers/Bank/BankTransformer.php b/app/Import/Transformers/Bank/BankTransformer.php index 80086111bc7a..cfdb2b01b9bf 100644 --- a/app/Import/Transformers/Bank/BankTransformer.php +++ b/app/Import/Transformers/Bank/BankTransformer.php @@ -56,10 +56,10 @@ class BankTransformer extends BaseTransformer private function calculateType($transaction) { - if(array_key_exists('bank.base_type', $transaction) && $transaction['bank.base_type'] == 'CREDIT') + if(array_key_exists('bank.base_type', $transaction) && ($transaction['bank.base_type'] == 'CREDIT') || strtolower($transaction['bank.base_type']) == 'deposit') return 'CREDIT'; - if(array_key_exists('bank.base_type', $transaction) && $transaction['bank.base_type'] == 'DEBIT') + if(array_key_exists('bank.base_type', $transaction) && ($transaction['bank.base_type'] == 'DEBIT') || strtolower($transaction['bank.bank_type']) == 'withdrawal') return 'DEBIT'; if(array_key_exists('bank.category_id', $transaction)) diff --git a/app/Jobs/Import/CSVIngest.php b/app/Jobs/Import/CSVIngest.php index fea1c441542f..1f9a652d906a 100644 --- a/app/Jobs/Import/CSVIngest.php +++ b/app/Jobs/Import/CSVIngest.php @@ -83,8 +83,8 @@ class CSVIngest implements ShouldQueue $this->checkContacts(); - if(Ninja::isHosted()) - app('queue.worker')->shouldQuit = 1; + // if(Ninja::isHosted()) + // app('queue.worker')->shouldQuit = 1; }