diff --git a/Modules/Internal/Http/Controllers/Api/Linksehat/PaymentController.php b/Modules/Internal/Http/Controllers/Api/Linksehat/PaymentController.php index d58163a9..95e25ca7 100644 --- a/Modules/Internal/Http/Controllers/Api/Linksehat/PaymentController.php +++ b/Modules/Internal/Http/Controllers/Api/Linksehat/PaymentController.php @@ -20,7 +20,7 @@ class PaymentController extends Controller { // return $request->toArray(); $appointments = Appointment::query() - ->where('sPaymentStatus', 'settlement') + ->where('sPaymentStatus', '!=' ,'cod') ->with(['healthCare', 'healthCare.commission', 'detail', 'user', 'doctor', 'doctor.user']); if ($request->has('search')) { @@ -55,8 +55,8 @@ class PaymentController extends Controller // }); $appointments = $appointments->where(function($q) use ($request) { - $q->where('dAgreeOn', '>=', $request->appointment_start) - ->where('dAgreeOn', '<=', $request->appointment_end); + $q->where('dCreateOn', '>=', $request->appointment_start) + ->where('dCreateOn', '<=', $request->appointment_end); }); } diff --git a/frontend/dashboard/src/pages/Report/LinksehatPayments/List.tsx b/frontend/dashboard/src/pages/Report/LinksehatPayments/List.tsx index 338d64b2..07c565a0 100644 --- a/frontend/dashboard/src/pages/Report/LinksehatPayments/List.tsx +++ b/frontend/dashboard/src/pages/Report/LinksehatPayments/List.tsx @@ -342,8 +342,8 @@ export default function List() { {row.health_care?.sHealthCare ?? '-'} - {row.detail?.sPaymentDetails?.settlement_time ?? '-'} - {row.detail?.dTanggalAppointment ?? ''} + {row.detail?.sPaymentDetails?.settlement_time ?? row.detail?.sPaymentDetails?.transaction_time} + {row.detail?.dTanggalAppointment ? row.detail?.dTanggalAppointment : row.detail?.dCreateOn } {row.nID} {row.sBookingCode ?? ''} {row.doctor?.user?.full_name ?? '-'}