update filter
This commit is contained in:
@@ -22,6 +22,7 @@ use App\Models\File;
|
|||||||
use App\Models\FilesMcu;
|
use App\Models\FilesMcu;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
use App\Models\Member;
|
use App\Models\Member;
|
||||||
|
use Carbon\Carbon;
|
||||||
|
|
||||||
class ClaimRequestController extends Controller
|
class ClaimRequestController extends Controller
|
||||||
{
|
{
|
||||||
@@ -41,11 +42,18 @@ class ClaimRequestController extends Controller
|
|||||||
});
|
});
|
||||||
})
|
})
|
||||||
->when($request->start_date, function ($q, $startDate) {
|
->when($request->start_date, function ($q, $startDate) {
|
||||||
$q->where('submission_date', '>', $startDate);
|
$q->where('submission_date', '>', Carbon::parse($startDate)->subDay());
|
||||||
})
|
})
|
||||||
->when($request->end_date, function ($q, $endDate) {
|
->when($request->end_date, function ($q, $endDate) use ($request) {
|
||||||
$q->where('submission_date', '<', $endDate);
|
// Jika tanggal akhir diberikan dan tidak sama dengan tanggal mulai
|
||||||
|
if ($request->start_date != $request->end_date) {
|
||||||
|
$q->where('submission_date', '<', Carbon::parse($endDate)->addDay());
|
||||||
|
} else {
|
||||||
|
$q->where('submission_date', '<=', Carbon::parse($endDate));
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
->when($request->service_code, function ($q, $serviceCode) {
|
->when($request->service_code, function ($q, $serviceCode) {
|
||||||
$q->whereIn('service_code', $serviceCode);
|
$q->whereIn('service_code', $serviceCode);
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -157,7 +157,7 @@ export default function List() {
|
|||||||
<LocalizationProvider dateAdapter={AdapterDateFns}>
|
<LocalizationProvider dateAdapter={AdapterDateFns}>
|
||||||
<DesktopDatePicker
|
<DesktopDatePicker
|
||||||
label="End Date"
|
label="End Date"
|
||||||
inputFormat="MM/dd/yyyy"
|
inputFormat="dd/MM/yyyy"
|
||||||
value={searchParams.get('end_date')}
|
value={searchParams.get('end_date')}
|
||||||
onChange={(value) => {
|
onChange={(value) => {
|
||||||
try {
|
try {
|
||||||
|
|||||||
Reference in New Issue
Block a user