Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 04:07:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge tax report changes

Browse Source
This commit is contained in:
Hillel Coren 2018-01-01 11:10:59 +02:00
parent c1ae4109a9
commit 1b60d2ee8a
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/Ninja/Reports/TaskReport.php
View File

@ -13,24 +13,39 @@ class TaskReport extends AbstractReport
'project',
'description',
'duration',
'amount',
];
public function run()
{
$startDate = date_create($this->startDate);
$endDate = date_create($this->endDate);
$tasks = Task::scope()
->orderBy('created_at', 'desc')
->with('client.contacts')
->with('client.contacts', 'project', 'account')
->withArchived()
->dateRange($this->startDate, $this->endDate);
->dateRange($startDate, $endDate);
foreach ($tasks->get() as $task) {
$amount = $task->getRate() * ($task->getDuration() / 60 / 60);
if ($task->client && $task->client->currency_id) {
$currencyId = $task->client->currency_id;
} else {
$currencyId = auth()->user()->account->getCurrencyId();
}
$this->data[] = [
$task->client ? ($this->isExport ? $task->client->getDisplayName() : $task->client->present()->link) : trans('texts.unassigned'),
$this->isExport ? $task->getStartTime() : link_to($task->present()->url, $task->getStartTime()),
$task->present()->project,
$task->description,
Utils::formatTime($task->getDuration()),
Utils::formatMoney($amount, $currencyId),
];
$this->addToTotals($currencyId, 'duration', $task->getDuration());
$this->addToTotals($currencyId, 'amount', $amount);
}
}
}