lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove use of NOW() for SQLite fix. Closes #488

Browse Source
This commit is contained in:
James Brooks
2015-03-02 09:55:04 +00:00
parent f46aa42dd9
commit 4ca0455b20
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Models/Incident.php
View File

@@ -2,10 +2,12 @@
namespace CachetHQ\Cachet\Models;
use CachetHQ\Cachet\Facades\Setting as SettingFacade;
use CachetHQ\Cachet\Transformers\IncidentTransformer;
use Dingo\Api\Transformer\TransformableInterface;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletingTrait;
use Jenssegers\Date\Date;
use McCool\LaravelAutoPresenter\PresenterInterface;
use Watson\Validating\ValidatingTrait;
@@ -68,7 +70,9 @@ class Incident extends Model implements TransformableInterface, PresenterInterfa
*/
public function scopeScheduled($query)
{
return $query->where('status', 0)->whereRaw('scheduled_at >= NOW()');
$timestamp = (new Date())->setTimezone(SettingFacade::get('app_timezone'))->format('Y-m-d H:i:s');
return $query->where('status', 0)->whereRaw('scheduled_at >= "'.$timestamp.'"');
}
/**
@@ -81,7 +85,9 @@ class Incident extends Model implements TransformableInterface, PresenterInterfa
public function scopeNotScheduled($query)
{
return $query->where(function ($query) {
return $query->whereNull('scheduled_at')->orWhereRaw('scheduled_at <= NOW()');
$timestamp = (new Date())->setTimezone(SettingFacade::get('app_timezone'))->format('Y-m-d H:i:s');
return $query->whereNull('scheduled_at')->orWhereRaw('scheduled_at <= "'.$timestamp.'"');
});
}