From d0531c19d7380f4bef851553ab33bbf3aeaccc30 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 9 Jun 2023 14:52:59 +1000 Subject: [PATCH] Fixes for date ranges --- app/Services/Client/Statement.php | 12 ++++++------ app/Services/Report/ARSummaryReport.php | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/Services/Client/Statement.php b/app/Services/Client/Statement.php index e315b5e7d464..63406638a343 100644 --- a/app/Services/Client/Statement.php +++ b/app/Services/Client/Statement.php @@ -371,28 +371,28 @@ class Statement return $ranges; case '60': - $ranges[0] = now()->startOfDay()->subDays(30); + $ranges[0] = now()->startOfDay()->subDays(31); $ranges[1] = now()->startOfDay()->subDays(60); return $ranges; case '90': - $ranges[0] = now()->startOfDay()->subDays(60); + $ranges[0] = now()->startOfDay()->subDays(61); $ranges[1] = now()->startOfDay()->subDays(90); return $ranges; case '120': - $ranges[0] = now()->startOfDay()->subDays(90); + $ranges[0] = now()->startOfDay()->subDays(91); $ranges[1] = now()->startOfDay()->subDays(120); return $ranges; case '120+': - $ranges[0] = now()->startOfDay()->subDays(120); + $ranges[0] = now()->startOfDay()->subDays(121); $ranges[1] = now()->startOfDay()->subYears(20); return $ranges; default: - $ranges[0] = now()->startOfDay()->subDays(0); - $ranges[1] = now()->subDays(30); + $ranges[0] = now()->startOfDay(); + $ranges[1] = now()->startOfDay()->subDays(30); return $ranges; } diff --git a/app/Services/Report/ARSummaryReport.php b/app/Services/Report/ARSummaryReport.php index c0299ce9a650..ebbb891cfee7 100644 --- a/app/Services/Report/ARSummaryReport.php +++ b/app/Services/Report/ARSummaryReport.php @@ -173,22 +173,22 @@ class ARSummaryReport extends BaseExport return $ranges; case '60': - $ranges[0] = now()->startOfDay()->subDays(30); + $ranges[0] = now()->startOfDay()->subDays(31); $ranges[1] = now()->startOfDay()->subDays(60); return $ranges; case '90': - $ranges[0] = now()->startOfDay()->subDays(60); + $ranges[0] = now()->startOfDay()->subDays(61); $ranges[1] = now()->startOfDay()->subDays(90); return $ranges; case '120': - $ranges[0] = now()->startOfDay()->subDays(90); + $ranges[0] = now()->startOfDay()->subDays(91); $ranges[1] = now()->startOfDay()->subDays(120); return $ranges; case '120+': - $ranges[0] = now()->startOfDay()->subDays(120); + $ranges[0] = now()->startOfDay()->subDays(121); $ranges[1] = now()->startOfDay()->subYears(20); return $ranges;