Fix timezones presenting
This commit is contained in:
@@ -2,12 +2,20 @@
|
||||
|
||||
namespace CachetHQ\Cachet\Presenters;
|
||||
|
||||
use CachetHQ\Cachet\Facades\Setting;
|
||||
use CachetHQ\Cachet\Models\Incident;
|
||||
use Jenssegers\Date\Date;
|
||||
use McCool\LaravelAutoPresenter\BasePresenter;
|
||||
|
||||
class IncidentPresenter extends BasePresenter
|
||||
{
|
||||
/**
|
||||
* Time zone setting.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $tz;
|
||||
|
||||
/**
|
||||
* Create a incident presenter instance.
|
||||
*
|
||||
@@ -16,6 +24,7 @@ class IncidentPresenter extends BasePresenter
|
||||
public function __construct(Incident $incident)
|
||||
{
|
||||
$this->resource = $incident;
|
||||
$this->tz = Setting::get('app_timezone');
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -25,7 +34,9 @@ class IncidentPresenter extends BasePresenter
|
||||
*/
|
||||
public function created_at_diff()
|
||||
{
|
||||
return (new Date($this->resource->created_at))->diffForHumans();
|
||||
return (new Date($this->resource->created_at))
|
||||
->setTimezone($this->tz)
|
||||
->diffForHumans();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -35,7 +46,9 @@ class IncidentPresenter extends BasePresenter
|
||||
*/
|
||||
public function created_at_formated()
|
||||
{
|
||||
return ucfirst((new Date($this->resource->created_at))->format('l j F Y H:i:s'));
|
||||
return ucfirst((new Date($this->resource->created_at))
|
||||
->setTimezone($this->tz)
|
||||
->format('l j F Y H:i:s'));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -45,6 +58,6 @@ class IncidentPresenter extends BasePresenter
|
||||
*/
|
||||
public function created_at_iso()
|
||||
{
|
||||
return $this->resource->created_at->toISO8601String();
|
||||
return $this->resource->created_at->setTimezone($this->tz)->toISO8601String();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user