From 14fe82e36148f36904634dd9474c05920deeb222 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Jun 2023 06:10:16 +0200 Subject: [PATCH] fix: #7655 --- app/Http/Controllers/Bill/IndexController.php | 3 ++- app/Transformers/BillTransformer.php | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Bill/IndexController.php b/app/Http/Controllers/Bill/IndexController.php index 6ee7bad3b8..b9a81bece5 100644 --- a/app/Http/Controllers/Bill/IndexController.php +++ b/app/Http/Controllers/Bill/IndexController.php @@ -82,7 +82,8 @@ class IndexController extends Controller $parameters = new ParameterBag(); // sub one day from temp start so the last paid date is one day before it should be. $tempStart = clone $start; - $tempStart->subDay(); + // 2023-06-23 do not sub one day from temp start, fix is in BillTransformer::payDates instead + //$tempStart->subDay(); $parameters->set('start', $tempStart); $parameters->set('end', $end); diff --git a/app/Transformers/BillTransformer.php b/app/Transformers/BillTransformer.php index 076f34f1c8..01235e6d58 100644 --- a/app/Transformers/BillTransformer.php +++ b/app/Transformers/BillTransformer.php @@ -256,6 +256,8 @@ class BillTransformer extends AbstractTransformer } $set = new Collection(); $currentStart = clone $this->parameters->get('start'); + // 2023-06-23 subDay to fix 7655 + $currentStart->subDay(); $loop = 0; while ($currentStart <= $this->parameters->get('end')) { $nextExpectedMatch = $this->nextDateMatch($bill, $currentStart);