tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging' into origin/production

Browse Source
This commit is contained in:
Linksehat Staging Server
2023-09-14 13:46:26 +07:00
parent 450cf57339 9f3b59a634
commit c365e6b021
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/Internal/Http/Controllers/Api/LivechatController.php
View File

@@ -36,9 +36,9 @@ class LivechatController extends Controller
} }
if ($endDate) { if ($endDate) {
$endDate = date('Y-m-d', strtotime($endDate . ' +1 day'));
$livechat = $livechat->where('dCreateOn', '<', $endDate); $livechat = $livechat->where('dCreateOn', '<', $endDate);
} }
$livechat = $livechat->latest()->paginate(15); $livechat = $livechat->latest()->paginate(15);
return response()->json(Helper::paginateResources(LivechatResource::collection($livechat))); return response()->json(Helper::paginateResources(LivechatResource::collection($livechat)));
@@ -71,6 +71,7 @@ class LivechatController extends Controller
$query->where('dCreateOn', '>=', $startDate); $query->where('dCreateOn', '>=', $startDate);
} }
if ($endDate) { if ($endDate) {
$endDate = date('Y-m-d', strtotime($endDate . ' +1 day'));
$query->where('dCreateOn', '<', $endDate); $query->where('dCreateOn', '<', $endDate);
} }
}) })