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

tb

Browse Source
This commit is contained in:
Link Medis Sehat
2023-12-07 09:29:02 +07:00
parent c365e6b021
commit 6edf7311f3
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,7 @@ class PaymentController extends Controller
{ {
// return $request->toArray(); // return $request->toArray();
$appointments = Appointment::query() $appointments = Appointment::query()
->where('sPaymentStatus', 'settlement') ->where('sPaymentStatus', '!=' ,'cod')
->with(['healthCare', 'healthCare.commission', 'detail', 'user', 'doctor', 'doctor.user']); ->with(['healthCare', 'healthCare.commission', 'detail', 'user', 'doctor', 'doctor.user']);
if ($request->has('search')) { if ($request->has('search')) {
@@ -55,8 +55,8 @@ class PaymentController extends Controller
// }); // });
$appointments = $appointments->where(function($q) use ($request) { $appointments = $appointments->where(function($q) use ($request) {
$q->where('dAgreeOn', '>=', $request->appointment_start) $q->where('dCreateOn', '>=', $request->appointment_start)
->where('dAgreeOn', '<=', $request->appointment_end); ->where('dCreateOn', '<=', $request->appointment_end);
}); });
} }

4
frontend/dashboard/src/pages/Report/LinksehatPayments/List.tsx
View File

@@ -342,8 +342,8 @@ export default function List() {
</IconButton> </IconButton>
</TableCell> </TableCell>
<TableCell align="left">{row.health_care?.sHealthCare ?? '-'}</TableCell> <TableCell align="left">{row.health_care?.sHealthCare ?? '-'}</TableCell>
<TableCell align="left">{row.detail?.sPaymentDetails?.settlement_time ?? '-'}</TableCell> <TableCell align="left">{row.detail?.sPaymentDetails?.settlement_time ?? row.detail?.sPaymentDetails?.transaction_time}</TableCell>
<TableCell align="left">{row.detail?.dTanggalAppointment ?? ''}</TableCell> <TableCell align="left">{row.detail?.dTanggalAppointment ? row.detail?.dTanggalAppointment : row.detail?.dCreateOn }</TableCell>
<TableCell align="left">{row.nID}</TableCell> <TableCell align="left">{row.nID}</TableCell>
<TableCell align="left">{row.sBookingCode ?? ''}</TableCell> <TableCell align="left">{row.sBookingCode ?? ''}</TableCell>
<TableCell align="left">{row.doctor?.user?.full_name ?? '-'}</TableCell> <TableCell align="left">{row.doctor?.user?.full_name ?? '-'}</TableCell>