diff --git a/app/Api/V1/Requests/Models/Account/StoreRequest.php b/app/Api/V1/Requests/Models/Account/StoreRequest.php index deb9634225..6659baf155 100644 --- a/app/Api/V1/Requests/Models/Account/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Account/StoreRequest.php @@ -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', ]; diff --git a/app/Api/V1/Requests/Models/Account/UpdateRequest.php b/app/Api/V1/Requests/Models/Account/UpdateRequest.php index 4b30887327..c53f70168a 100644 --- a/app/Api/V1/Requests/Models/Account/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Account/UpdateRequest.php @@ -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',