From 59427ba5c20e69337a6dba3b42f0fcc4e443350a Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 30 Apr 2023 19:12:49 +0200 Subject: [PATCH] Fix #7446 --- app/Http/Controllers/Bill/IndexController.php | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/app/Http/Controllers/Bill/IndexController.php b/app/Http/Controllers/Bill/IndexController.php index 390f6ac419..6bbe980bf9 100644 --- a/app/Http/Controllers/Bill/IndexController.php +++ b/app/Http/Controllers/Bill/IndexController.php @@ -80,7 +80,10 @@ class IndexController extends Controller $defaultCurrency = app('amount')->getDefaultCurrency(); $parameters = new ParameterBag(); - $parameters->set('start', $start); + // sub one day from temp start so the last paid date is one day before it should be. + $tempStart = clone $start; + $tempStart->subDay(); + $parameters->set('start', $tempStart); $parameters->set('end', $end); /** @var BillTransformer $transformer */ @@ -108,18 +111,6 @@ class IndexController extends Controller 'object_group_title' => $array['object_group_title'], 'bills' => [], ]; - // var_dump($array);exit; - // // expected today? default: - // $array['next_expected_match_diff'] = trans('firefly.not_expected_period'); - // $nextExpectedMatch = new Carbon($array['next_expected_match']); - // if ($nextExpectedMatch->isToday()) { - // $array['next_expected_match_diff'] = trans('firefly.today'); - // } - // $current = $array['pay_dates'][0] ?? null; - // if (null !== $current && !$nextExpectedMatch->isToday()) { - // $currentExpectedMatch = Carbon::createFromFormat('Y-m-d\TH:i:sP', $current); - // $array['next_expected_match_diff'] = $currentExpectedMatch->diffForHumans(today(), Carbon::DIFF_RELATIVE_TO_NOW); - // } $currency = $bill->transactionCurrency ?? $defaultCurrency; $array['currency_id'] = $currency->id;