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

added invoice variable to display month numerical (#1033)

Browse Source
This commit is contained in:
Kevin Papst
2019-08-14 23:30:45 +02:00
committed by GitHub
parent 455861ec69
commit b5972bb680
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,8 +104,10 @@ trait RendererTrait
'template.due_days' => $model->getTemplate()->getDueDays(), 'template.due_days' => $model->getTemplate()->getDueDays(),
'query.begin' => $this->getFormattedDateTime($model->getQuery()->getBegin()), 'query.begin' => $this->getFormattedDateTime($model->getQuery()->getBegin()),
'query.day' => $model->getQuery()->getBegin()->format('d'),
'query.end' => $this->getFormattedDateTime($model->getQuery()->getEnd()), 'query.end' => $this->getFormattedDateTime($model->getQuery()->getEnd()),
'query.month' => $this->getFormattedMonthName($model->getQuery()->getBegin()), 'query.month' => $this->getFormattedMonthName($model->getQuery()->getBegin()),
'query.month_number' => $model->getQuery()->getBegin()->format('m'),
'query.year' => $model->getQuery()->getBegin()->format('Y'), 'query.year' => $model->getQuery()->getBegin()->format('Y'),
]; ];

5
tests/Invoice/Renderer/DebugRendererTest.php
View File

@@ -45,6 +45,9 @@ class DebugRendererTest extends TestCase
$this->assertEntryStructure($row, $meta); $this->assertEntryStructure($row, $meta);
} }
$begin = $model->getQuery()->getBegin();
self::assertEquals($begin->format('m'), $data['model']['query.month_number']);
self::assertEquals($begin->format('d'), $data['model']['query.day']);
// TODO check values or formats? // TODO check values or formats?
} }
@@ -67,8 +70,10 @@ class DebugRendererTest extends TestCase
'template.payment_terms', 'template.payment_terms',
'template.due_days', 'template.due_days',
'query.begin', 'query.begin',
'query.day',
'query.end', 'query.end',
'query.month', 'query.month',
'query.month_number',
'query.year', 'query.year',
'customer.id', 'customer.id',
'customer.address', 'customer.address',