Merge remote-tracking branch 'origin/staging' into origin/production
This commit is contained in:
@@ -36,7 +36,7 @@ class LivechatController extends Controller
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($endDate) {
|
if ($endDate) {
|
||||||
$livechat = $livechat->where('dCreateOn', '<=', $endDate);
|
$livechat = $livechat->where('dCreateOn', '<', $endDate);
|
||||||
}
|
}
|
||||||
|
|
||||||
$livechat = $livechat->latest()->paginate(15);
|
$livechat = $livechat->latest()->paginate(15);
|
||||||
@@ -71,7 +71,7 @@ class LivechatController extends Controller
|
|||||||
$query->where('dCreateOn', '>=', $startDate);
|
$query->where('dCreateOn', '>=', $startDate);
|
||||||
}
|
}
|
||||||
if ($endDate) {
|
if ($endDate) {
|
||||||
$query->where('dCreateOn', '<=', $endDate);
|
$query->where('dCreateOn', '<', $endDate);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
->orderBy('nID', 'desc')
|
->orderBy('nID', 'desc')
|
||||||
|
|||||||
Reference in New Issue
Block a user