diff --git a/app/Factory/BankIntegrationFactory.php b/app/Factory/BankIntegrationFactory.php index df0b1734c00f..cdcac8340857 100644 --- a/app/Factory/BankIntegrationFactory.php +++ b/app/Factory/BankIntegrationFactory.php @@ -23,7 +23,7 @@ class BankIntegrationFactory $bank_integration->user_id = $user_id; $bank_integration->company_id = $company_id; - $bank_integration->provider_bank_name = ''; + $bank_integration->provider_name = ''; $bank_integration->bank_account_id = ''; $bank_integration->bank_account_name = ''; $bank_integration->bank_account_number = ''; diff --git a/app/Factory/BankTransactionFactory.php b/app/Factory/BankTransactionFactory.php index f5bbb92d31de..a6f4eceb677d 100644 --- a/app/Factory/BankTransactionFactory.php +++ b/app/Factory/BankTransactionFactory.php @@ -16,10 +16,9 @@ use Illuminate\Support\Str; class BankTransactionFactory { - public static function create(int $company_id, int $user_id, int $account_id) :BankTransaction + public static function create(int $company_id, int $user_id) :BankTransaction { $bank_transaction = new BankTransaction; - $bank_transaction->account_id = $account_id; $bank_transaction->user_id = $user_id; $bank_transaction->company_id = $company_id; @@ -30,7 +29,6 @@ class BankTransactionFactory $bank_transaction->date = now()->format('Y-m-d'); $bank_transaction->description = ''; $bank_transaction->is_matched = 0; - $bank_transaction->base_type = 'CREDIT'; return $bank_transaction; } diff --git a/app/Jobs/Bank/ProcessBankTransactions.php b/app/Jobs/Bank/ProcessBankTransactions.php index 01ebe903bdd2..090e6a9b4fda 100644 --- a/app/Jobs/Bank/ProcessBankTransactions.php +++ b/app/Jobs/Bank/ProcessBankTransactions.php @@ -31,7 +31,7 @@ class ProcessBankTransactions implements ShouldQueue private BankIntegration $bank_integration; - private string $from_date; + private ?string $from_date; private bool $stop_loop = true; /** diff --git a/app/Jobs/Ninja/BankTransactionSync.php b/app/Jobs/Ninja/BankTransactionSync.php index 39697818b503..61366fc7d763 100644 --- a/app/Jobs/Ninja/BankTransactionSync.php +++ b/app/Jobs/Ninja/BankTransactionSync.php @@ -62,16 +62,18 @@ class BankTransactionSync implements ShouldQueue // $queue = Ninja::isHosted() ? 'bank' : 'default'; - if($account->isPaid()) - { + // if($account->isPaid()) + // { $account->bank_integrations->each(function ($bank_integration) use ($account){ + nlog("processing {$account->bank_integration_account_id} - {$bank_integration->id}"); + ProcessBankTransactions::dispatch($account->bank_integration_account_id, $bank_integration); }); - } + // } }); } diff --git a/app/Repositories/BankTransactionRepository.php b/app/Repositories/BankTransactionRepository.php index c74b5abefbad..e407adb67c0e 100644 --- a/app/Repositories/BankTransactionRepository.php +++ b/app/Repositories/BankTransactionRepository.php @@ -21,7 +21,7 @@ use App\Models\TaskStatus; class BankTransactionRepository extends BaseRepository { - public function store($data, BankTransaction $bank_transaction) + public function save($data, BankTransaction $bank_transaction) { //stub to store