jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

added decimal format variable for invoice duration (#1037)

Browse Source
This commit is contained in:
Kevin Papst
2019-08-15 21:31:13 +02:00
committed by GitHub
parent b5972bb680
commit 9611646bc6
10 changed files with 119 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Invoice/Renderer/AbstractRenderer.php
View File

@@ -89,4 +89,13 @@ abstract class AbstractRenderer
{
return $this->extension->duration($seconds);
}
/**
* @param int $seconds
* @return mixed
*/
protected function getFormattedDecimalDuration($seconds)
{
return $this->extension->durationDecimal($seconds);
}
}

10
src/Invoice/Renderer/RendererTrait.php
View File

@@ -74,6 +74,12 @@ trait RendererTrait
*/
abstract protected function getFormattedDuration($seconds);
/**
* @param int $seconds
* @return mixed
*/
abstract protected function getFormattedDecimalDuration($seconds);
/**
* @param InvoiceModel $model
* @return array
@@ -93,6 +99,7 @@ trait RendererTrait
'invoice.vat' => $model->getCalculator()->getVat(),
'invoice.tax' => $this->getFormattedMoney($model->getCalculator()->getTax(), $currency),
'invoice.total_time' => $this->getFormattedDuration($model->getCalculator()->getTimeWorked()),
'invoice.duration_decimal' => $this->getFormattedDecimalDuration($model->getCalculator()->getTimeWorked()),
'invoice.total' => $this->getFormattedMoney($model->getCalculator()->getTotal(), $currency),
'invoice.subtotal' => $this->getFormattedMoney($model->getCalculator()->getSubtotal(), $currency),
@@ -177,7 +184,7 @@ trait RendererTrait
if (null !== $timesheet->getFixedRate()) {
$rate = $timesheet->getFixedRate();
$hourlyRate = $timesheet->getFixedRate();
$amount = 1;
$amount = 1; // FIXME fixed rates
}
if (empty($description)) {
@@ -206,6 +213,7 @@ trait RendererTrait
'entry.total' => $this->getFormattedMoney($rate, $currency),
'entry.currency' => $currency,
'entry.duration' => $timesheet->getDuration(),
'entry.duration_decimal' => $this->getFormattedDecimalDuration($timesheet->getDuration()),
'entry.duration_minutes' => number_format($timesheet->getDuration() / 60),
'entry.begin' => $this->getFormattedDateTime($begin),
'entry.begin_time' => $this->getFormattedTime($begin),