This commit is contained in:
James Cole
2025-11-01 18:44:32 +01:00
parent a941dca5e1
commit 8ff40e22e0
6 changed files with 11 additions and 13 deletions

View File

@@ -81,6 +81,7 @@ class AccountController extends Controller
*/ */
public function accounts(AutocompleteApiRequest $request): JsonResponse public function accounts(AutocompleteApiRequest $request): JsonResponse
{ {
Log::debug('Before All.');
[ [
'types' => $types, 'types' => $types,
'query' => $query, 'query' => $query,
@@ -89,7 +90,6 @@ class AccountController extends Controller
] ]
= $request->attributes->all(); = $request->attributes->all();
$date ??= today(config('app.timezone')); $date ??= today(config('app.timezone'));
// set date to end-of-day for account balance. so it is at $date 23:59:59 // set date to end-of-day for account balance. so it is at $date 23:59:59

View File

@@ -37,7 +37,7 @@ class AutocompleteApiRequest extends AggregateFormRequest
protected function getRequests(): array protected function getRequests(): array
{ {
return [ return [
DateRequest::class, DateRequest::class,
[PaginationRequest::class, 'sort_class' => Account::class], [PaginationRequest::class, 'sort_class' => Account::class],
AccountTypesApiRequest::class, AccountTypesApiRequest::class,
QueryRequest::class, QueryRequest::class,

View File

@@ -40,10 +40,6 @@ class DateRangeRequest extends ApiRequest
$validator->after( $validator->after(
function (Validator $validator): void { function (Validator $validator): void {
if ($validator->failed()) { if ($validator->failed()) {
// set null values
$this->attributes->set('start', null);
$this->attributes->set('end', null);
return; return;
} }
$start = $this->getCarbonDate('start')?->startOfDay(); $start = $this->getCarbonDate('start')?->startOfDay();

View File

@@ -47,11 +47,14 @@ class AccountTypesApiRequest extends ApiRequest
if ($validator->failed()) { if ($validator->failed()) {
return; return;
} }
$types = explode(',', $this->convertString('types', 'all'));
$type = $this->convertString('types', 'all'); $result = [];
$this->attributes->add([ // split and find all types:
'types' => $this->mapAccountTypes($type), foreach ($types as $type) {
]); $result = array_merge($result, $this->mapAccountTypes($type));
}
$result = array_unique($result);
$this->attributes->set('types', $result);
} }
); );
} }

View File

@@ -68,12 +68,10 @@ class PaginationRequest extends ApiRequest
$user = auth()->user(); $user = auth()->user();
$limit = (int)Preferences::getForUser($user, 'listPageSize', 50)->data; $limit = (int)Preferences::getForUser($user, 'listPageSize', 50)->data;
} }
$page = $this->convertInteger('page'); $page = $this->convertInteger('page');
$page = min(max(1, $page), 2 ** 16); $page = min(max(1, $page), 2 ** 16);
$offset = ($page - 1) * $limit; $offset = ($page - 1) * $limit;
$sort = $this->sortClass ? $this->convertSortParameters('sort', $this->sortClass) : $this->get('sort'); $sort = $this->sortClass ? $this->convertSortParameters('sort', $this->sortClass) : $this->get('sort');
$this->attributes->set('limit', $limit); $this->attributes->set('limit', $limit);
$this->attributes->set('sort', $sort); $this->attributes->set('sort', $sort);
$this->attributes->set('page', $page); $this->attributes->set('page', $page);

View File

@@ -7,6 +7,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Fixed ### Fixed
- #11144
- #11147 - #11147
## 6.4.3 - 2025-11-01 ## 6.4.3 - 2025-11-01