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

Fix some stuff in account API calls. still need to solve location.

Browse Source
This commit is contained in:
James Cole
2021-03-08 17:56:21 +01:00
parent 4d34160ede
commit 2a975c302f
5 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Api/V1/Controllers/Models/Account/UpdateController.php
View File

@@ -63,7 +63,7 @@ class UpdateController extends Controller
* Update account.
*
* @param UpdateRequest $request
* @param Account $account
* @param Account $account
*
* @return JsonResponse
*/
@@ -71,8 +71,9 @@ class UpdateController extends Controller
{
$data = $request->getUpdateData();
$data['type'] = config('firefly.shortNamesByFullName.' . $account->accountType->type);
$this->repository->update($account, $data);
$manager = $this->getManager();
$account = $this->repository->update($account, $data);
$manager = $this->getManager();
$account->refresh();
/** @var AccountTransformer $transformer */
$transformer = app(AccountTransformer::class);

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

@@ -68,6 +68,7 @@ class UpdateRequest extends FormRequest
'BIC' => $this->nullableString('bic'),
'account_number' => $this->nullableString('account_number'),
'account_role' => $this->nullableString('account_role'),
'liability_type' => $this->nullableString('liability_type'),
'opening_balance' => $this->nullableString('opening_balance'),
'opening_balance_date' => $this->date('opening_balance_date'),
'cc_type' => $this->nullableString('credit_card_type'),
@@ -76,7 +77,7 @@ class UpdateRequest extends FormRequest
'interest' => $this->nullableString('interest'),
'interest_period' => $this->nullableString('interest_period'),
];
if(null !== $this->get('order')) {
if (null !== $this->get('order')) {
$data['order'] = $this->integer('order');
}
@@ -122,8 +123,6 @@ class UpdateRequest extends FormRequest
'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',
'notes' => 'min:0|max:65536',