diff --git a/app/Http/Requests/BankTransactionRule/StoreBankTransactionRuleRequest.php b/app/Http/Requests/BankTransactionRule/StoreBankTransactionRuleRequest.php index 158a59bf462e..9641bfd1846f 100644 --- a/app/Http/Requests/BankTransactionRule/StoreBankTransactionRuleRequest.php +++ b/app/Http/Requests/BankTransactionRule/StoreBankTransactionRuleRequest.php @@ -33,7 +33,12 @@ class StoreBankTransactionRuleRequest extends Request { /* Ensure we have a client name, and that all emails are unique*/ $rules = [ - 'name' => 'bail|required|string' + 'name' => 'bail|required|string', + 'rules' => 'bail|array', + 'auto_convert' => 'bail|sometimes|bool', + 'matches_on_all' => 'bail|sometimes|bool', + 'applies_to' => 'bail|sometimes|bool', + 'record_as' => 'bail|sometimes|bool', ]; if (isset($this->currency_id)) diff --git a/app/Http/Requests/BankTransactionRule/UpdateBankTransactionRuleRequest.php b/app/Http/Requests/BankTransactionRule/UpdateBankTransactionRuleRequest.php index 3ccbc9565364..2955bf76796e 100644 --- a/app/Http/Requests/BankTransactionRule/UpdateBankTransactionRuleRequest.php +++ b/app/Http/Requests/BankTransactionRule/UpdateBankTransactionRuleRequest.php @@ -32,7 +32,12 @@ class UpdateBankTransactionRuleRequest extends Request { /* Ensure we have a client name, and that all emails are unique*/ $rules = [ - 'name' => 'bail|required|string' + 'name' => 'bail|required|string', + 'rules' => 'bail|array', + 'auto_convert' => 'bail|sometimes|bool', + 'matches_on_all' => 'bail|sometimes|bool', + 'applies_to' => 'bail|sometimes|bool', + 'record_as' => 'bail|sometimes|bool', ]; if (isset($this->currency_id)) diff --git a/app/Models/BankTransactionRule.php b/app/Models/BankTransactionRule.php index fa6cccd4cadc..26d9bb68baee 100644 --- a/app/Models/BankTransactionRule.php +++ b/app/Models/BankTransactionRule.php @@ -36,6 +36,32 @@ class BankTransactionRule extends BaseModel protected $dates = [ ]; + /* Columns to search */ + protected array $search_keys = [ + 'client_id' => 'client', + 'vendor_id' => 'vendor', + 'description' => 'description', + 'transaction_reference' => 'transaction_reference', + 'amount' => 'amount', + ]; + + /* Amount */ + protected array $number_operators = [ + '=', + '>', + '>=', + '<', + '<=' + ]; + + /* Description, Client, Vendor, Reference Number */ + protected array $string_operators = [ + 'is', + 'contains', + 'starts_with', + 'is_empty', + ]; + public function getEntityType() { return self::class;