kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-04 03:43:07 +00:00
Code Issues Projects Releases Wiki Activity

Allow user to submit direction.

Browse Source
This commit is contained in:
James Cole
2021-04-10 07:56:50 +02:00
parent f9ac40a811
commit 083749e8fe
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Api/V1/Requests/Models/Account/StoreRequest.php
View File

@@ -83,7 +83,8 @@ class StoreRequest extends FormRequest
if ('liability' === $data['account_type_name'] || 'liabilities' === $data['account_type_name']) {
$data['opening_balance'] = bcmul($this->string('liability_amount'), '-1');
$data['opening_balance_date'] = $this->date('liability_start_date');
$data['account_type_name'] = $this->string('liability_type');
$data['account_type_name'] = $this->string('liability_type');
$data['liability_direction'] = $this->string('liability_direction');
$data['account_type_id'] = null;
}
@@ -118,11 +119,12 @@ class StoreRequest extends FormRequest
'account_role' => sprintf('in:%s|required_if:type,asset', $accountRoles),
'credit_card_type' => sprintf('in:%s|required_if:account_role,ccAsset', $ccPaymentTypes),
'monthly_payment_date' => 'date' . '|required_if:account_role,ccAsset|required_if:credit_card_type,monthlyFull',
'liability_type' => 'required_if:type,liability|in:loan,debt,mortgage',
'liability_amount' => 'required_if:type,liability|min:0|numeric',
'liability_start_date' => 'required_if:type,liability|date',
'interest' => 'required_if:type,liability|between:0,100|numeric',
'interest_period' => 'required_if:type,liability|in:daily,monthly,yearly',
'liability_type' => 'required_if:type,liability|required_if:type,liabilities|in:loan,debt,mortgage',
'liability_amount' => 'required_if:type,liability|required_if:type,liabilities|min:0|numeric',
'liability_direction' => 'required_if:type,liability|required_if:type,liabilities|in:credit,debit',
'liability_start_date' => 'required_if:type,liability|required_if:type,liabilities|date',
'interest' => 'required_if:type,liability|required_if:type,liabilities|between:0,100|numeric',
'interest_period' => 'required_if:type,liability|required_if:type,liabilities|in:daily,monthly,yearly',
'notes' => 'min:0|max:65536',
];

2
app/Api/V1/Requests/Models/Account/UpdateRequest.php
View File

@@ -68,6 +68,7 @@ class UpdateRequest extends FormRequest
'order' => ['order', 'integer'],
'currency_id' => ['currency_id', 'integer'],
'currency_code' => ['currency_code', 'string'],
'liability_direction' => ['liability_direction', 'string']
];
$data = $this->getAllData($fields);
$data = $this->appendLocationData($data, null);
@@ -112,6 +113,7 @@ class UpdateRequest extends FormRequest
'credit_card_type' => sprintf('in:%s|nullable|required_if:account_role,ccAsset', $ccPaymentTypes),
'monthly_payment_date' => 'date' . '|nullable|required_if:account_role,ccAsset|required_if:credit_card_type,monthlyFull',
'liability_type' => 'required_if:type,liability|in:loan,debt,mortgage',
'liability_direction' => 'required_if:type,liability|in:credit,debit',
'interest' => 'required_if:type,liability|between:0,100|numeric',
'interest_period' => 'required_if:type,liability|in:daily,monthly,yearly',
'notes' => 'min:0|max:65536',