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

Modules/Internal/Http/Controllers/Api/Linksehat/PrescriptionController.php

@@ -26,7 +26,14 @@ class PrescriptionController extends Controller
     {
         // return $request->toArray();
         $prescription = Prescription::query()
-            ->with(['livechat', 'user', 'items']);
+            ->with(['livechat', 'user', 'items'])
+            ->join('tx_prescription_orders', 'tx_prescriptions.nID', '=', 'tx_prescription_orders.nIDPrescription')
+            ->select(
+                'tx_prescriptions.*',
+                'tx_prescription_orders.sStatus as status_prescription',
+                'tx_prescription_orders.sAddress as kirim_ke',
+                'tx_prescription_orders.sDeliveryMethod as delivery',
+            );
         if ($request->has('search')) {
             $search = $request->search;
             $prescription->where(function ($query) use ($search) {
@@ -34,13 +41,12 @@ class PrescriptionController extends Controller
                     ->orWhere('sKodeResep', 'LIKE', '%' . $search . "%");
             });
         }
-            
         if (($request->has('prescription_start') || $request->has('prescription_end'))
             && !empty($request->prescription_start)
             && !empty($request->prescription_end)
         ) {
-           
-           
+
+
             $prescription = $prescription->where(function($q) use ($request) {
                 $q->where('dTanggalResep', '>=', $request->prescription_start)
                     ->where('dTanggalResep', '<=', $request->prescription_end);
@@ -156,6 +162,7 @@ class PrescriptionController extends Controller
             'Date Consultation',
             'Patient',
             'Doctor',
+            'Status',
             'Jenis Obat (Drugs)',
             'Jumlah Obat (QTY)',
             'Cara Minum Obat',
@@ -178,7 +185,7 @@ class PrescriptionController extends Controller
             });
         }
 
-        if ($request->has('prescription_start') && $request->has('prescription_end') && 
+        if ($request->has('prescription_start') && $request->has('prescription_end') &&
             !empty($request->prescription_start) && !empty($request->prescription_end)) {
             $prescriptionQuery->whereBetween('dTanggalResep', [$request->prescription_start, $request->prescription_end]);
         }

Modules/Internal/Http/Controllers/Api/LivechatController.php

@@ -88,8 +88,8 @@ class LivechatController extends Controller
                 }
             })
             ->orderBy('nID', 'desc')
-            ->get(['nID', 'nIDUser', 'dRequestTime', 'dAcceptTime', 'dStartTime', 'dEndTime', 'nIDDokter', 'nIDHealthCare', 'nIDAppointment', 'sStatus', 'sMediaDokter', 'sMedia', 'dCreateOn']);
-      
+            ->get(['nID', 'nIDUser', 'nIDDokter', 'nIDHealthCare', 'nIDAppointment', 'sStatus', 'sMediaDokter', 'sMedia', 'dCreateOn']);
+
         $headers = [
             ['value' => 'No', 'cell' => 'A1', 'mergeCell' => true, 'mergeToCell' => 'A2'],
             ['value' => 'Kode TC', 'cell' => 'B1', 'mergeCell' => true, 'mergeToCell' => 'B2'],
@@ -150,18 +150,18 @@ class LivechatController extends Controller
             $nIDUser = $liveChat->user->nIDUser ?? 0; // Principal or Dependent
             $paymentMethod =  $liveChat->appointment ? Helper::sPaymentMethod($liveChat->appointment->sPaymentMethod) : 'N/A';
             $fullNameDoctor = '-';
-            if ($liveChat->doctor->user !== null) {
+            if (!empty($liveChat->doctor->user)) {
                 $fullNameDoctor = '';
-                
+
                 if ($liveChat->doctor->user->detail !== null) {
                     if ($liveChat->doctor->user->detail->sTitlePrefix !== null) {
                         $fullNameDoctor .= $liveChat->doctor->user->detail->sTitlePrefix . '. ';
                     }
-                    
+
                     if ($liveChat->doctor->user->full_name !== null) {
                         $fullNameDoctor .= $liveChat->doctor->user->full_name . ' ';
                     }
-                    
+
                     if ($liveChat->doctor->user->detail->sTitleSuffix !== null) {
                         $fullNameDoctor .= $liveChat->doctor->user->detail->sTitleSuffix;
                     }
@@ -171,7 +171,7 @@ class LivechatController extends Controller
             $recordType = 'P';
             if ($nIDUser){
                 $recordType = 'D';
-            } 
+            }
             switch ($status) {
                 case 0:
                     $statusLivechat = "Request TC";

Modules/Internal/Http/Controllers/Api/NavigationController.php

@@ -54,6 +54,7 @@ class NavigationController extends Controller
                             'permission' => $child['permission'],
                         ];
                     }, $navItem['children']),
+                    'icon' => $navItem['icon'],
                     'permission' => $navItem['permission'],
                 ];
             }, $navigationMaster)

Modules/Internal/Http/Controllers/Api/OrganizationController.php

@@ -48,6 +48,8 @@ class OrganizationController extends Controller
     public function store(Request $request)
     {
         $organization = [
+            'phone' => $request->no_hp,
+            'email' => $request->email,
             'code' => $request->code,
             'name' => $request->name,
             'type' => 'hospital',
@@ -119,6 +121,8 @@ class OrganizationController extends Controller
         $update_organization = Organization::find($id);
 
         $update_organization->update([
+            'phone' => $request->no_hp,
+            'email' => $request->email,
             'code' => $request->code,
             'name' => $request->name,
             'type' => 'hospital',
@@ -152,7 +156,7 @@ class OrganizationController extends Controller
             'lat' => $request->lat,
             'lng' => $request->lng,
         ]);
-        
+
         $update_organization->main_address_id = $newAddres->id;
         $update_organization->save();
 

Modules/Internal/Http/Controllers/Api/UserManagementController.php

@@ -3,6 +3,8 @@
 namespace Modules\Internal\Http\Controllers\Api;
 
 use App\Helpers\Helper;
+use App\Models\Organization;
+use App\Models\CorporateManager;
 use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
@@ -110,14 +112,30 @@ class UserManagementController extends Controller
         return response()->json($data);
     }
 
+    public function list_organization(Request $request)
+    {
+        $query = Organization::where('type', 'hospital')->get();
+        $data = [
+            'data' => $query
+        ];
+        return response()->json($data);
+    }
+
     public function store_access(Request $request){
         $user = User::create([
             'email' => $request->email,
             'username' => $request->username,
             'role_id' => $request->roles,
+            'organization_id' => !empty($request->organizations) ? $request->organizations : null ,
             'password' => Hash::make($request->password),
         ]);
 
+        if ($request->corporates){
+            CorporateManager::create([
+                'user_id' =>  $user->id,
+                'corporate_id' => $request->corporates
+            ]);
+        }
         $person = Person::updateOrCreate(
             [
                 'id' => $user->person_id
@@ -164,6 +182,7 @@ class UserManagementController extends Controller
         $userAccess->email = $request->email;
         $userAccess->username = $request->username;
         $userAccess->role_id = $request->roles;
+        $userAccess->organization_id = $request->organizations;
 
         if ($request->password){
             $userAccess->password = Hash::make($request->password);