From bcb672920c0ece9a4626177d61e70a6cab4fe734 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 20 May 2024 06:55:36 +0200 Subject: [PATCH] Fix chart, uses new filter. --- app/Support/Http/Api/ParsesQueryFilters.php | 8 +++++++- resources/assets/v2/src/api/v2/chart/account/dashboard.js | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/Support/Http/Api/ParsesQueryFilters.php b/app/Support/Http/Api/ParsesQueryFilters.php index 2d35c4e5ce..4479bea2e3 100644 --- a/app/Support/Http/Api/ParsesQueryFilters.php +++ b/app/Support/Http/Api/ParsesQueryFilters.php @@ -34,8 +34,14 @@ trait ParsesQueryFilters { $date = today(); + $value = $parameters->filter()?->value($field, date('Y-m-d')); + if(is_array($value)) { + Log::error(sprintf('Multiple values for date field "%s". Using first value.', $field)); + $value = $value[0]; + } + try { - $date = Carbon::createFromFormat('Y-m-d', $parameters->filter()?->value($field, date('Y-m-d')), config('app.timezone')); + $date = Carbon::createFromFormat('Y-m-d', $value, config('app.timezone')); } catch (InvalidFormatException $e) { Log::debug(sprintf('Invalid date format in request. Using today: %s', $e->getMessage())); } diff --git a/resources/assets/v2/src/api/v2/chart/account/dashboard.js b/resources/assets/v2/src/api/v2/chart/account/dashboard.js index 521bf7405b..eb0c336ea0 100644 --- a/resources/assets/v2/src/api/v2/chart/account/dashboard.js +++ b/resources/assets/v2/src/api/v2/chart/account/dashboard.js @@ -25,7 +25,7 @@ export default class Dashboard { dashboard(start, end) { let startStr = format(start, 'y-MM-dd'); let endStr = format(end, 'y-MM-dd'); - return api.get('/api/v2/chart/account/dashboard', {params: {start: startStr, end: endStr}}); + return api.get('/api/v2/chart/account/dashboard', {params: {filter: {start: startStr, end: endStr}}}); } expense(start, end) {