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

Modules/Internal/Transformers/ReportPrescriptionResource.php

@@ -1,7 +1,8 @@
 <?php
-
 namespace Modules\Internal\Transformers;
 
+
+use App\Helpers\Helper;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Carbon\Carbon;
 
@@ -24,7 +25,9 @@ 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
+            'status_prescription' => $this->status_prescription,
+            'price_delivery' => $this->ongkir,
+            'apotek_name' => $this->nIDApotek ? Helper::getOrganization($this->nIDApotek) : '-',
         ];
 
         return $data;