Merge remote-tracking branch 'origin/staging' into origin/production
This commit is contained in:
@@ -164,7 +164,7 @@ class LivechatController extends Controller
|
||||
$sheet->setCellValue('A' . $startFrom, $indexLiveChat + 1);
|
||||
$sheet->setCellValue('B' . $startFrom, $liveChat->nID ?? '-');
|
||||
$sheet->setCellValue('C' . $startFrom, Carbon::parse($liveChat->dCreateOn)->format('d-m-Y'));
|
||||
$sheet->setCellValue('D' . $startFrom, Carbon::parse($liveChat->dCreateOn)->format('H:m:i'));
|
||||
$sheet->setCellValue('D' . $startFrom, Carbon::parse($liveChat->dCreateOn)->format('H:i:s'));
|
||||
// $sheet->setCellValue('D' . $startFrom, Carbon::parse($liveChat->dRequestTime)->format('H:i:s'));
|
||||
$sheet->setCellValue('E' . $startFrom, $liveChat->healthCare->sHealthCare ?? '-');
|
||||
$sheet->setCellValue('F' . $startFrom, $fullNameDoctor);
|
||||
|
||||
@@ -29,8 +29,8 @@ class LivechatResource extends JsonResource
|
||||
. ' ' . $this->appointment->appointmentDetail->tTimeAppointment :
|
||||
null,
|
||||
'status_appointment' => $this->appointment->paymentStatus ?? null,
|
||||
'date_created' => Carbon::parse($this->dRequestTime)->format('d-m-Y') ?? null,
|
||||
'time_request' => Carbon::parse($this->dRequestTime)->format('H:i:s') ?? null,
|
||||
'date_created' => Carbon::parse($this->dCreateOn)->format('d-m-Y') ?? null,
|
||||
'time_request' => Carbon::parse($this->dCreateOn)->format('H:i:s') ?? null,
|
||||
'patient_media' => $this->sMedia ?? null,
|
||||
'doctor_media' => $this->sMediaDokter ?? null,
|
||||
'appointment_media' => $this->appointment->sMedia ?? null,
|
||||
|
||||
Reference in New Issue
Block a user