Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-01 03:14:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Pad out operators for rules

Browse Source
This commit is contained in:
David Bomba 2022-11-13 15:41:34 +11:00
parent 6ef21be16c
commit dc6aca74b2
3 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Requests/BankTransactionRule/StoreBankTransactionRuleRequest.php
View File

@ -33,7 +33,12 @@ class StoreBankTransactionRuleRequest extends Request
{ {
/* Ensure we have a client name, and that all emails are unique*/ /* Ensure we have a client name, and that all emails are unique*/
$rules = [ $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)) if (isset($this->currency_id))

7
app/Http/Requests/BankTransactionRule/UpdateBankTransactionRuleRequest.php
View File

@ -32,7 +32,12 @@ class UpdateBankTransactionRuleRequest extends Request
{ {
/* Ensure we have a client name, and that all emails are unique*/ /* Ensure we have a client name, and that all emails are unique*/
$rules = [ $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)) if (isset($this->currency_id))

26
app/Models/BankTransactionRule.php
View File

@ -36,6 +36,32 @@ class BankTransactionRule extends BaseModel
protected $dates = [ 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() public function getEntityType()
{ {
return self::class; return self::class;