Merge branch 'develop'

This commit is contained in:
2019-12-26 15:38:06 -03:00

View File

@ -69,7 +69,7 @@ class Cierre extends Model
public function fecha(\DateTime $fecha = null)
{
if ($fecha == null) {
return Carbon::parse($this->fecha, config('app.timezone'));
return Carbon::parse($this->fecha, 'America/Santiago');//, config('app.timezone'));
}
$this->fecha = $fecha->format('Y-m-d');
}