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

Fix https://github.com/firefly-iii/firefly-iii/issues/7992

Browse Source
This commit is contained in:
James Cole
2023-09-24 03:22:18 +02:00
parent eef0f4bd4e
commit 94c190668c
4 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Api/V2/Controllers/Autocomplete/AccountController.php
View File

@@ -32,6 +32,7 @@ use FireflyIII\Models\AccountType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface as AdminAccountRepositoryInterface;
use FireflyIII\Support\Http\Api\AccountFilter;
use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
use Illuminate\Http\JsonResponse;
/**
@@ -40,6 +41,7 @@ use Illuminate\Http\JsonResponse;
class AccountController extends Controller
{
use AccountFilter;
use ValidatesUserGroupTrait;
private AdminAccountRepositoryInterface $adminRepository;
private array $balanceTypes;
@@ -56,6 +58,11 @@ class AccountController extends Controller
$this->repository = app(AccountRepositoryInterface::class);
$this->adminRepository = app(AdminAccountRepositoryInterface::class);
$userGroup = $this->validateUserGroup($request);
if (null !== $userGroup) {
$this->adminRepository->setUserGroup($userGroup);
}
return $next($request);
}
);
@@ -79,12 +86,10 @@ class AccountController extends Controller
*/
public function accounts(AutocompleteRequest $request): JsonResponse
{
throw new FireflyException('uses old administration ID check, needs to be updated. 1');
$data = $request->getData();
$types = $data['types'];
$query = $data['query'];
$date = $this->parameters->get('date') ?? today(config('app.timezone'));
$this->adminRepository->setAdministrationId($data['administration_id']);
$return = [];
$result = $this->adminRepository->searchAccount((string)$query, $types, $data['limit']);

13
app/Api/V2/Controllers/Model/Bill/SumController.php
View File

@@ -28,6 +28,7 @@ use FireflyIII\Api\V2\Controllers\Controller;
use FireflyIII\Api\V2\Request\Generic\DateRequest;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Repositories\UserGroups\Bill\BillRepositoryInterface;
use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
use Illuminate\Http\JsonResponse;
/**
@@ -35,6 +36,8 @@ use Illuminate\Http\JsonResponse;
*/
class SumController extends Controller
{
use ValidatesUserGroupTrait;
private BillRepositoryInterface $repository;
/**
@@ -47,6 +50,12 @@ class SumController extends Controller
function ($request, $next) {
$this->repository = app(BillRepositoryInterface::class);
$userGroup = $this->validateUserGroup($request);
if (null !== $userGroup) {
$this->repository->setUserGroup($userGroup);
}
return $next($request);
}
);
@@ -64,8 +73,6 @@ class SumController extends Controller
*/
public function paid(DateRequest $request): JsonResponse
{
throw new FireflyException('uses old administration ID check, needs to be updated.6');
$this->repository->setAdministrationId(auth()->user()->user_group_id);
$result = $this->repository->sumPaidInRange($this->parameters->get('start'), $this->parameters->get('end'));
// convert to JSON response:
@@ -84,8 +91,6 @@ class SumController extends Controller
*/
public function unpaid(DateRequest $request): JsonResponse
{
throw new FireflyException('uses old administration ID check, needs to be updated.7');
$this->repository->setAdministrationId(auth()->user()->user_group_id);
$result = $this->repository->sumUnpaidInRange($this->parameters->get('start'), $this->parameters->get('end'));
// convert to JSON response:

2
app/Api/V2/Request/Chart/BalanceChartRequest.php
View File

@@ -25,6 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V2\Request\Chart;
use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
use FireflyIII\Support\Request\ChecksLogin;
use FireflyIII\Support\Request\ConvertsDataTypes;
use Illuminate\Foundation\Http\FormRequest;
@@ -37,6 +38,7 @@ class BalanceChartRequest extends FormRequest
{
use ConvertsDataTypes;
use ChecksLogin;
use ValidatesUserGroupTrait;
/**
* Get all data from the request.