Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-19 16:01:34 +02:00
Code Issues Releases Activity

Fixes for #584

Browse Source
This commit is contained in:
Hillel Coren 2015-12-31 10:04:12 +02:00
parent 565b26ba27
commit c2c51360dd
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Models/Account.php
View File

@ -290,7 +290,13 @@ class Account extends Eloquent
public function getCustomDateTimeFormat()
{
return $this->getCustomDateFormat() . ' ' . $this->getCustomTimeFormat();
$format = $this->datetime_format ? $this->datetime_format->format : DEFAULT_DATETIME_FORMAT;
if ($this->military_time) {
$format = str_replace('g:i a', 'H:i', $format);
}
return $format;
}
public function getGatewayByType($type = PAYMENT_TYPE_ANY)

2
app/Ninja/Presenters/TaskPresenter.php
View File

@ -31,7 +31,7 @@ class TaskPresenter extends Presenter {
$start = $account->formatDateTime("@{$start}");
$end = $account->formatTime("@{$end}");
$times[] = "###{$start} - {$end}";
$times[] = "### {$start} - {$end}";
}
return implode("\n", $times);