Merge remote-tracking branch 'origin/staging' into origin/production

Modules/Internal/Transformers/ReportPrescriptionResource.php

@@ -16,7 +16,6 @@ class ReportPrescriptionResource extends JsonResource
     public function toArray($request)
     {
         $patientName = $this->user ? $this->user->sFirstName .' '. $this->user->sLastName : '-';
-      
         $data = [
             'id' => $this->nID,
             'patient_name' => $patientName,
@@ -25,6 +24,7 @@ class ReportPrescriptionResource extends JsonResource
             'date_consultation' => $this->dTanggalResep ? Carbon::parse($this->dTanggalResep)->format('Y-m-d H:i:s') : null,
             'doctor_name' => $this->sDokterName ? $this->sDokterName : '-',
             'items' => $this->items ? $this->items : [],
+            'status_prescription' => $this->status_prescription
         ];
 
         return $data;