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

Merge pull request #10160 from firefly-iii/fix-9867

Browse Source 
Fix #9867
This commit is contained in:
James Cole
2025-04-20 12:47:35 +02:00
committed by GitHub
parent 2e87e179f0 12d74f15c0
commit 002c5485f5
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/Chart/AccountController.php
View File

@@ -82,13 +82,16 @@ class AccountController extends Controller
*/ */
public function expenseAccounts(): JsonResponse public function expenseAccounts(): JsonResponse
{ {
Log::debug('RevenueAccounts'); Log::debug('ExpenseAccounts');
/** @var Carbon $start */ /** @var Carbon $start */
$start = clone session('start', today(config('app.timezone'))->startOfMonth()); $start = clone session('start', today(config('app.timezone'))->startOfMonth());
/** @var Carbon $end */ /** @var Carbon $end */
$end = clone session('end', today(config('app.timezone'))->endOfMonth()); $end = clone session('end', today(config('app.timezone'))->endOfMonth());
$start->startOfDay();
$end->endOfDay();
$cache = new CacheProperties(); $cache = new CacheProperties();
$cache->addProperty($start); $cache->addProperty($start);
$cache->addProperty($end); $cache->addProperty($end);
@@ -97,7 +100,6 @@ class AccountController extends Controller
if ($cache->has()) { if ($cache->has()) {
return response()->json($cache->get()); return response()->json($cache->get());
} }
$start->subDay();
// prep some vars: // prep some vars:
$currencies = []; $currencies = [];
@@ -557,6 +559,10 @@ class AccountController extends Controller
/** @var Carbon $end */ /** @var Carbon $end */
$end = clone session('end', today(config('app.timezone'))->endOfMonth()); $end = clone session('end', today(config('app.timezone'))->endOfMonth());
$start->startOfDay();
$end->endOfDay();
$cache = new CacheProperties(); $cache = new CacheProperties();
$cache->addProperty($start); $cache->addProperty($start);
$cache->addProperty($end); $cache->addProperty($end);
@@ -565,7 +571,6 @@ class AccountController extends Controller
if ($cache->has()) { if ($cache->has()) {
return response()->json($cache->get()); return response()->json($cache->get());
} }
$start->subDay();
// prep some vars: // prep some vars:
$currencies = []; $currencies = [];