From 59afb55963ce630af95913cb00c671961e7af7df Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 14 Nov 2022 09:33:04 +1100 Subject: [PATCH] ensure bank integration id is always present --- .../Requests/BankTransaction/StoreBankTransactionRequest.php | 3 +++ .../Requests/BankTransaction/UpdateBankTransactionRequest.php | 3 +++ app/Repositories/BankTransactionRepository.php | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/Http/Requests/BankTransaction/StoreBankTransactionRequest.php b/app/Http/Requests/BankTransaction/StoreBankTransactionRequest.php index b292453df8c5..65f4665feffd 100644 --- a/app/Http/Requests/BankTransaction/StoreBankTransactionRequest.php +++ b/app/Http/Requests/BankTransaction/StoreBankTransactionRequest.php @@ -34,6 +34,9 @@ class StoreBankTransactionRequest extends Request $rules = []; + if(isset($this->bank_integration_id)) + $rules['bank_integration_id'] = 'bail|required|exists:bank_integrations,id,company_id,'.auth()->user()->company()->id.',is_deleted,0'; + return $rules; } diff --git a/app/Http/Requests/BankTransaction/UpdateBankTransactionRequest.php b/app/Http/Requests/BankTransaction/UpdateBankTransactionRequest.php index 9fa3f7ccb240..4f251c916766 100644 --- a/app/Http/Requests/BankTransaction/UpdateBankTransactionRequest.php +++ b/app/Http/Requests/BankTransaction/UpdateBankTransactionRequest.php @@ -45,6 +45,9 @@ class UpdateBankTransactionRequest extends Request if(isset($this->expense_id)) $rules['expense_id'] = 'bail|required|exists:expenses,id,company_id,'.auth()->user()->company()->id.',is_deleted,0'; + if(isset($this->bank_integration_id)) + $rules['bank_integration_id'] = 'bail|required|exists:bank_integrations,id,company_id,'.auth()->user()->company()->id.',is_deleted,0'; + return $rules; } diff --git a/app/Repositories/BankTransactionRepository.php b/app/Repositories/BankTransactionRepository.php index 186f8c67ead8..390b8f56ffb2 100644 --- a/app/Repositories/BankTransactionRepository.php +++ b/app/Repositories/BankTransactionRepository.php @@ -24,7 +24,7 @@ class BankTransactionRepository extends BaseRepository public function save($data, BankTransaction $bank_transaction) { - if(!isset($bank_transaction->bank_integration_id) && array_key_exists('bank_integration_id', $data)) + if(array_key_exists('bank_integration_id', $data)) $bank_transaction->bank_integration_id = $data['bank_integration_id']; $bank_transaction->fill($data);