Merge remote-tracking branch 'refs/remotes/origin/staging' into staging

Modules/HospitalPortal/Http/Controllers/ApotekController.php

@@ -70,6 +70,7 @@ class ApotekController extends Controller
                             WHEN tx_prescription_orders.sStatus = "waiting_pharmacy" THEN "Diterima"
                             WHEN tx_prescription_orders.sStatus = "order_prepared" THEN "Siap Diambil"
                             WHEN tx_prescription_orders.sStatus = "ready" THEN "Cari Kurir"
+                            WHEN tx_prescription_orders.sStatus = "failed" THEN "Cari Kurir"
                             WHEN tx_prescription_orders.sStatus = "waiting_for_courir" THEN "Kurir Sudah Ambil Pesanan"
                             WHEN tx_prescription_orders.sStatus = "package_picked_up" THEN "Sedang diantar ke Alamat Tujuan"
                             WHEN tx_prescription_orders.sStatus = "package_on_delivery" THEN "Selesai"

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,7 @@
 namespace Modules\Internal\Http\Controllers\Api;
 
 use App\Helpers\Helper;
+use App\Models\Organization;
 use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
@@ -110,11 +111,21 @@ 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' => $request->organizations,
             'password' => Hash::make($request->password),
         ]);
 
@@ -164,6 +175,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);

Modules/Internal/Routes/api.php

@@ -398,6 +398,7 @@ Route::prefix('internal')->group(function () {
         Route::get('user/access/{id}', [UserManagementController::class, 'edit_access']);
         Route::put('user/access/{id}', [UserManagementController::class, 'update_access']);
         Route::get('role-list', [UserManagementController::class, 'list_role']);
+        Route::get('organization-list', [UserManagementController::class, 'list_organization']);
 
         // Navigation
         Route::get('navigations', [NavigationController::class, 'index']);

Modules/Internal/Transformers/OrganizationResource.php

@@ -27,12 +27,14 @@ class OrganizationResource extends JsonResource
                 }
                 $corporatePartner = implode(', ', $corporateName);
             }
-            
-        } 
+
+        }
         $organization = [
             'id' => $this->id,
             'name' => $this->name,
             'type' => $this->type,
+            'no_hp' => $this->phone,
+            'email' => $this->email,
             'code' => $this->code,
             'description' => $this->description,
             'kodeRs' => $this->meta->KodeRS ?? null,