Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 08:54:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Payment edge cases

Browse Source
This commit is contained in:
David Bomba 2019-10-08 09:05:41 +10:00
parent 9a60e72a56
commit 091673a7ac
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Models/Payment.php
View File

@ -104,6 +104,9 @@ class Payment extends BaseModel
public function clientPaymentDate() public function clientPaymentDate()
{ {
if(!$this->payment_date)
return '';
$date_format = DateFormat::find($this->client->getSetting('date_format_id')); $date_format = DateFormat::find($this->client->getSetting('date_format_id'));
return $this->createClientDate($this->payment_date, $this->client->timezone()->name)->format($date_format->format); return $this->createClientDate($this->payment_date, $this->client->timezone()->name)->format($date_format->format);

4
app/Utils/Traits/MakesDates.php
View File

@ -32,7 +32,7 @@ trait MakesDates
if(is_string($utc_date)) if(is_string($utc_date))
$utc_date = $this->convertToDateObject($utc_date); $utc_date = $this->convertToDateObject($utc_date);
return $utc_date->setTimezone(new \DateTimeZone($timezone)); return $utc_date->setTimezone(new \DateTimeZone($timezone));
} }
@ -79,7 +79,7 @@ trait MakesDates
public function formatDateTimestamp($timestamp, string $format) :string public function formatDateTimestamp($timestamp, string $format) :string
{ {
return Carbon::createFromTimestamp($date)->format($format); return Carbon::createFromTimestamp($timestamp)->format($format);
} }