shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved financial quarters to trait

Browse Source
This commit is contained in:
Denis Duliçi 2021-02-08 12:07:22 +03:00
parent 53f20c890e
commit 8cfbf82e0a
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Abstracts/Report.php
View File

@ -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;
}
}

13
app/Traits/DateTime.php
View File

@ -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';