From 072e070d0913849d0e7db81479d244aa75666a60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Mon, 2 Feb 2026 22:40:27 +0000
Subject: [PATCH] Datetime financial year support custom date range..

---
 app/Traits/DateTime.php | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/app/Traits/DateTime.php b/app/Traits/DateTime.php
index 984f1dfa7..4fdae988e 100644
--- a/app/Traits/DateTime.php
+++ b/app/Traits/DateTime.php
@@ -53,7 +53,7 @@ trait DateTime
         return [$start, $end];
     }
 
-    public function getFinancialStart($year = null): Date
+    public function getFinancialStart($year = null, $date = null): Date
     {
         $start_of_year = Date::now()->startOfYear();
 
@@ -66,7 +66,7 @@ trait DateTime
         $financial_start = Date::create($year, $month, $day);
 
         if ((setting('localisation.financial_denote') == 'ends') && ($financial_start->dayOfYear != 1) || 
-            $financial_start->greaterThan(Date::now())
+            $financial_start->greaterThan($date ?? Date::now())
         ) {
             $financial_start->subYear();
         }
@@ -74,10 +74,10 @@ trait DateTime
         return $financial_start;
     }
 
-    public function getFinancialWeek($year = null): CarbonPeriod
+    public function getFinancialWeek($year = null, $date = null): CarbonPeriod
     {
         $today = Date::today();
-        $financial_weeks = $this->getFinancialWeeks($year);
+        $financial_weeks = $this->getFinancialWeeks($year, $date);
 
         foreach ($financial_weeks as $week) {
             if ($today->lessThan($week->getStartDate()) || $today->greaterThan($week->getEndDate())) {
@@ -96,10 +96,10 @@ trait DateTime
         return $this_week;
     }
 
-    public function getFinancialMonth($year = null): CarbonPeriod
+    public function getFinancialMonth($year = null, $date = null): CarbonPeriod
     {
         $today = Date::today();
-        $financial_months = $this->getFinancialMonths($year);
+        $financial_months = $this->getFinancialMonths($year, $date);
 
         foreach ($financial_months as $month) {
             if ($today->lessThan($month->getStartDate()) || $today->greaterThan($month->getEndDate())) {
@@ -118,10 +118,10 @@ trait DateTime
         return $this_month;
     }
 
-    public function getFinancialQuarter($year = null): CarbonPeriod
+    public function getFinancialQuarter($year = null, $date = null): CarbonPeriod
     {
         $today = Date::today();
-        $financial_quarters = $this->getFinancialQuarters($year);
+        $financial_quarters = $this->getFinancialQuarters($year, $date);
 
         foreach ($financial_quarters as $quarter) {
             if ($today->lessThan($quarter->getStartDate()) || $today->greaterThan($quarter->getEndDate())) {
@@ -140,18 +140,18 @@ trait DateTime
         return $this_quarter;
     }
 
-    public function getFinancialYear($year = null): CarbonPeriod
+    public function getFinancialYear($year = null, $date = null): CarbonPeriod
     {
-        $financial_start = $this->getFinancialStart($year);
+        $financial_start = $this->getFinancialStart($year, $date);
 
         return CarbonPeriod::create($financial_start, $financial_start->copy()->addYear()->subDay()->endOfDay());
     }
 
-    public function getFinancialWeeks($year = null): array
+    public function getFinancialWeeks($year = null, $date = null): array
     {
         $weeks = [];
 
-        $start = $this->getFinancialStart($year);
+        $start = $this->getFinancialStart($year, $date);
 
         $w = 52;
 
@@ -166,11 +166,11 @@ trait DateTime
         return $weeks;
     }
 
-    public function getFinancialMonths($year = null): array
+    public function getFinancialMonths($year = null, $date = null): array
     {
         $months = [];
 
-        $start = $this->getFinancialStart($year);
+        $start = $this->getFinancialStart($year, $date);
 
         $m = 12;
 
@@ -185,11 +185,11 @@ trait DateTime
         return $months;
     }
 
-    public function getFinancialQuarters($year = null): array
+    public function getFinancialQuarters($year = null, $date = null): array
     {
         $quarters = [];
 
-        $start = $this->getFinancialStart($year);
+        $start = $this->getFinancialStart($year, $date);
 
         $q = 4;
 
@@ -285,7 +285,7 @@ trait DateTime
 
         switch ($period) {
             case 'yearly':
-                $financial_year = $this->getFinancialYear($year);
+                $financial_year = $this->getFinancialYear($year, $date);
 
                 if ($date->greaterThanOrEqualTo($financial_year->getStartDate()) && $date->lessThanOrEqualTo($financial_year->getEndDate())) {
                     if (setting('localisation.financial_denote') == 'begins') {
@@ -297,7 +297,7 @@ trait DateTime
 
                 break;
             case 'quarterly':
-                $quarters = $this->getFinancialQuarters($year);
+                $quarters = $this->getFinancialQuarters($year, $date);
 
                 foreach ($quarters as $quarter) {
                     if ($date->lessThan($quarter->getStartDate()) || $date->greaterThan($quarter->getEndDate())) {
@@ -314,7 +314,7 @@ trait DateTime
 
                 break;
             case 'weekly':
-                $weeks = $this->getFinancialWeeks($year);
+                $weeks = $this->getFinancialWeeks($year, $date);
 
                 foreach ($weeks as $week) {
                     if ($date->lessThan($week->getStartDate()) || $date->greaterThan($week->getEndDate())) {