Adjustments for tax reports
This commit is contained in:
parent
8c25834ac4
commit
084ddcc7b8
|
|
@ -74,6 +74,7 @@ class ProjectReport extends BaseExport
|
||||||
'company_name' => $this->company->present()->name(),
|
'company_name' => $this->company->present()->name(),
|
||||||
'created_on' => $this->translateDate(now()->format('Y-m-d'), $this->company->date_format(), $this->company->locale()),
|
'created_on' => $this->translateDate(now()->format('Y-m-d'), $this->company->date_format(), $this->company->locale()),
|
||||||
'created_by' => $user_name,
|
'created_by' => $user_name,
|
||||||
|
'charts' => $this->getCharts($projects),
|
||||||
];
|
];
|
||||||
|
|
||||||
$ts = new TemplateService();
|
$ts = new TemplateService();
|
||||||
|
|
@ -114,4 +115,21 @@ class ProjectReport extends BaseExport
|
||||||
return $taskAllocationData;
|
return $taskAllocationData;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function getCharts(array $projects)
|
||||||
|
{
|
||||||
|
|
||||||
|
if(!class_exists(Modules\Admin\Services\ChartService::class)) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$chartService = new Modules\Admin\Services\ChartService();
|
||||||
|
|
||||||
|
return $projects->map(function ($project) use ($chartService) {
|
||||||
|
return [
|
||||||
|
'id' => $project->hashed_id,
|
||||||
|
'budgeted_hours' => $chartService->getBudgetedHours($project),
|
||||||
|
]
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -34,7 +34,7 @@ class TaxSummaryReport extends BaseExport
|
||||||
|
|
||||||
public Writer $csv;
|
public Writer $csv;
|
||||||
|
|
||||||
public string $date_key = 'created_at';
|
public string $date_key = 'date';
|
||||||
|
|
||||||
private array $taxes = [];
|
private array $taxes = [];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1081,6 +1081,7 @@ class TemplateService
|
||||||
{
|
{
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
'id' => $project->hashed_id,
|
||||||
'name' => $project->name ?: '',
|
'name' => $project->name ?: '',
|
||||||
'number' => $project->number ?: '',
|
'number' => $project->number ?: '',
|
||||||
'created_at' => $this->translateDate($project->created_at, $project->client->date_format(), $project->client->locale()),
|
'created_at' => $this->translateDate($project->created_at, $project->client->date_format(), $project->client->locale()),
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue