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

Minor fixes for rules

Browse Source
This commit is contained in:
David Bomba 2022-11-24 08:05:08 +11:00
parent 08630874b8
commit d34337edb5
3 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,13 +35,16 @@ class StoreBankTransactionRuleRequest extends Request
$rules = [
'name' => 'bail|required|string',
'rules' => 'bail|array',
'rules.*.operator' => 'bail|required|nullable',
'rules.*.search_key' => 'bail|required|nullable',
'rules.*.value' => 'bail|required|nullable',
'auto_convert' => 'bail|sometimes|bool',
'matches_on_all' => 'bail|sometimes|bool',
'applies_to' => 'bail|sometimes|string',
];
if(isset($this->category_id))
$rules['category_id'] = 'bail|sometimes|exists:expense_categories,id,'.auth()->user()->company()->id.',is_deleted,0';
$rules['category_id'] = 'bail|sometimes|exists:expense_categories,id,company_id,'.auth()->user()->company()->id.',is_deleted,0';
if(isset($this->vendor_id))
$rules['vendor_id'] = 'bail|sometimes|exists:vendors,id,company_id,'.auth()->user()->company()->id.',is_deleted,0';

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

@ -34,6 +34,9 @@ class UpdateBankTransactionRuleRequest extends Request
$rules = [
'name' => 'bail|required|string',
'rules' => 'bail|array',
'rules.*.operator' => 'bail|required|nullable',
'rules.*.search_key' => 'bail|required|nullable',
'rules.*.value' => 'bail|required|nullable',
'auto_convert' => 'bail|sometimes|bool',
'matches_on_all' => 'bail|sometimes|bool',
'applies_to' => 'bail|sometimes|string',

43
tests/Feature/BankTransactionRuleApiTest.php
View File

@ -60,6 +60,49 @@ if(isset($this->vendor_id))
if(isset($this->client_id))
$rules['client_id'] = 'bail|sometimes|exists:clients,id,company_id,'.auth()->user()->company()->id.',is_deleted,0';
*/
public function testBankRuleCategoryIdValidation()
{
$data = [
'name' => 'The First Rule',
'rules' => [
[
"operator" => "contains",
"search_key" => "description",
"value" => "mobile"
],
],
'assigned_user_id' => null,
'auto_convert' => false,
'matches_on_all' => true,
'applies_to' => 'DEBIT',
'category_id' => $this->expense_category->hashed_id,
'vendor_id' => $this->vendor->hashed_id
];
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token,
])->postJson('/api/v1/bank_transaction_rules/', $data);
$arr = $response->json();
$response->assertStatus(200);
$this->assertEquals('DEBIT', $arr['data']['applies_to']);
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token,
])->putJson('/api/v1/bank_transaction_rules/'. $arr['data']['id'], $data);
$arr = $response->json();
$response->assertStatus(200);
$this->assertEquals('DEBIT', $arr['data']['applies_to']);
}
public function testBankRulePost()
{