diff --git a/app/Abstracts/Report.php b/app/Abstracts/Report.php index 57f4758de..6a121f0a8 100644 --- a/app/Abstracts/Report.php +++ b/app/Abstracts/Report.php @@ -16,7 +16,6 @@ use App\Traits\Charts; use App\Traits\DateTime; use App\Traits\SearchString; use App\Utilities\Chartjs; -use Carbon\CarbonPeriod; use Date; use Illuminate\Support\Str; @@ -376,7 +375,7 @@ abstract class Report break; case 'quarterly': - $quarters = $this->getFiscalBaseQuarters($this->year); + $quarters = $this->getFinancialQuarters($this->year); foreach ($quarters as $quarter) { if ($date->lessThan($quarter->getStartDate()) || $date->greaterThan($quarter->getEndDate())) { @@ -498,16 +497,4 @@ abstract class Report ], ]; } - - private function getFiscalBaseQuarters($year) - { - $periods = []; - $fiscal_start = $this->getFinancialStart($year); - - for ($i = 0; $i < 4; $i++) { - $periods[] = CarbonPeriod::create($fiscal_start->copy()->addQuarters($i), $fiscal_start->copy()->addQuarters($i + 1)->subDay()); - } - - return $periods; - } } diff --git a/app/Traits/DateTime.php b/app/Traits/DateTime.php index 8a34f319b..350d7c163 100644 --- a/app/Traits/DateTime.php +++ b/app/Traits/DateTime.php @@ -3,6 +3,7 @@ namespace App\Traits; use App\Traits\SearchString; +use Carbon\CarbonPeriod; use Date; trait DateTime @@ -117,6 +118,18 @@ trait DateTime return $financial_start; } + public function getFinancialQuarters($year) + { + $quarters = []; + $start = $this->getFinancialStart($year); + + for ($i = 0; $i < 4; $i++) { + $quarters[] = CarbonPeriod::create($start->copy()->addQuarters($i), $start->copy()->addQuarters($i + 1)->subDay()); + } + + return $quarters; + } + public function getMonthlyDateFormat($year = null) { $format = 'M';