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

Sementara Fix Filter Date

Browse Source
This commit is contained in:
R
2023-04-06 17:23:25 +07:00
parent 7d198583a4
commit da87a53623
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Modules/Internal/Http/Controllers/Api/Linksehat/PaymentController.php
View File

@@ -37,21 +37,26 @@ class PaymentController extends Controller
&& !empty($request->appointment_start) && !empty($request->appointment_start)
&& !empty($request->appointment_end) && !empty($request->appointment_end)
) { ) {
$appointments = $appointments->whereHas('detail', function (Builder $detail) use ($request) { // $appointments = $appointments->whereHas('detail', function (Builder $detail) use ($request) {
// Appointment Start // // Appointment Start
// if ($request->has('appointment_start')) { // // if ($request->has('appointment_start')) {
$detail->where('dTanggalAppointment', '>=', $request->appointment_start); // $detail->where('dTanggalAppointment', '>=', $request->appointment_start);
// } else { // // } else {
// $detail->where('dTanggalAppointment', '>', now()->format('Y-m-d')); // // $detail->where('dTanggalAppointment', '>', now()->format('Y-m-d'));
// } // // }
// if ($request->has('appointment_end')) { // // if ($request->has('appointment_end')) {
$detail->where('dTanggalAppointment', '<=', $request->appointment_end); // $detail->where('dTanggalAppointment', '<=', $request->appointment_end);
// } else { // // } else {
// $detail->where('dTanggalAppointment', '<', now()->addDay(1)->format('Y-m-d')); // // $detail->where('dTanggalAppointment', '<', now()->addDay(1)->format('Y-m-d'));
// } // // }
// });
$appointments = $appointments->where(function($q) use ($request) {
$q->where('dAgreeOn', '>=', $request->appointment_start)
->where('dAgreeOn', '<=', $request->appointment_end);
}); });
} }