kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into adminlte4

Browse Source
This commit is contained in:
James Cole
2023-08-09 14:14:57 +02:00
parent 3925077223 72c99d3834
commit fc0fee161e
15 changed files with 487 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Api/V2/Controllers/Chart/AccountController.php
View File

@@ -71,6 +71,8 @@ class AccountController extends Controller
* If a transaction has foreign currency = native currency, the foreign amount will be used, no conversion
* will take place.
*
* TODO validate and set administration_id from request
*
* @param DateRequest $request
*
* @return JsonResponse
@@ -80,15 +82,11 @@ class AccountController extends Controller
*/
public function dashboard(DateRequest $request): JsonResponse
{
// parameters for chart:
$dates = $request->getAll();
/** @var Carbon $start */
$start = $dates['start'];
$start = $this->parameters->get('start');
/** @var Carbon $end */
$end = $dates['end'];
$end = $this->parameters->get('end');
$end->endOfDay();
/** @var User $user */
$user = auth()->user();
// user's preferences
$defaultSet = $this->repository->getAccountsByType([AccountType::ASSET, AccountType::DEFAULT])->pluck('id')->toArray();

7
app/Api/V2/Controllers/Chart/BalanceController.php
View File

@@ -69,6 +69,9 @@ class BalanceController extends Controller
* If the transaction being processed is already in native currency OR if the
* foreign amount is in the native currency, the amount will not be converted.
*
* TODO validate and set administration_id
* TODO collector set group, not user
*
* @param BalanceChartRequest $request
*
* @return JsonResponse
@@ -78,9 +81,9 @@ class BalanceController extends Controller
{
$params = $request->getAll();
/** @var Carbon $start */
$start = $params['start'];
$start = $this->parameters->get('start');
/** @var Carbon $end */
$end = $params['end'];
$end = $this->parameters->get('end');
$end->endOfDay();
/** @var Collection $accounts */
$accounts = $params['accounts'];

2
app/Api/V2/Controllers/Chart/BudgetController.php
View File

@@ -69,6 +69,8 @@ class BudgetController extends Controller
/**
* @param DateRequest $request
*
* TODO see autocomplete/accountcontroller
*
* @return JsonResponse
* @throws FireflyException
*/

6
app/Api/V2/Controllers/Chart/CategoryController.php
View File

@@ -61,6 +61,7 @@ class CategoryController extends Controller
/**
* TODO may be worth to move to a handler but the data is simple enough.
* TODO see autoComplete/account controller
*
* @param DateRequest $request
*
@@ -69,11 +70,10 @@ class CategoryController extends Controller
*/
public function dashboard(DateRequest $request): JsonResponse
{
$params = $request->getAll();
/** @var Carbon $start */
$start = $params['start'];
$start = $this->parameters->get('start');
/** @var Carbon $end */
$end = $params['end'];
$end = $this->parameters->get('end');
$accounts = $this->accountRepos->getAccountsByType([AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::ASSET, AccountType::DEFAULT]);
$default = app('amount')->getDefaultCurrency();
$converter = new ExchangeRateConverter();