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

added pdf template and other invoice improvements (#1693)

Browse Source
This commit is contained in:
Kevin Papst
2020-05-10 16:19:59 +02:00
committed by GitHub
parent 4e1ffedc20
commit e3749c8e8f
45 changed files with 561 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Twig/DateExtensions.php
View File

@@ -91,7 +91,11 @@ class DateExtensions extends AbstractExtension
}
if (!$date instanceof DateTime) {
$date = new DateTime($date);
try {
$date = new DateTime($date);
} catch (\Exception $ex) {
return $date;
}
}
return date_format($date, $this->dateFormat);
@@ -109,7 +113,11 @@ class DateExtensions extends AbstractExtension
}
if (!$date instanceof DateTime) {
$date = new DateTime($date);
try {
$date = new DateTime($date);
} catch (\Exception $ex) {
return $date;
}
}
return $date->format($this->dateTimeFormat);
@@ -128,7 +136,11 @@ class DateExtensions extends AbstractExtension
}
if (!$date instanceof DateTime) {
$date = new DateTime($date);
try {
$date = new DateTime($date);
} catch (\Exception $ex) {
return $date;
}
}
$timezone = date_default_timezone_get();
@@ -158,7 +170,11 @@ class DateExtensions extends AbstractExtension
public function dateFormat($date, string $format)
{
if (!$date instanceof DateTime) {
$date = new DateTime($date);
try {
$date = new DateTime($date);
} catch (\Exception $ex) {
return $date;
}
}
return date_format($date, $format);

20
src/Twig/Extensions.php
View File

@@ -193,7 +193,12 @@ class Extensions extends AbstractExtension
*/
public function currency($currency)
{
return Currencies::getSymbol($currency);
try {
return Currencies::getSymbol(strtoupper($currency));
} catch (\Exception $ex) {
}
return $currency;
}
/**
@@ -202,7 +207,12 @@ class Extensions extends AbstractExtension
*/
public function language($language)
{
return Languages::getName($language, $this->locale);
try {
return Languages::getName(strtolower($language), $this->locale);
} catch (\Exception $ex) {
}
return $language;
}
/**
@@ -211,9 +221,9 @@ class Extensions extends AbstractExtension
*/
public function country($country)
{
$country = strtoupper($country);
if (Countries::exists($country)) {
return Countries::getName($country);
try {
return Countries::getName(strtoupper($country));
} catch (\Exception $ex) {
}
return $country;