From 3fb8dbb09176d654e4e19d5cfac6b9c36c494352 Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Mon, 7 Oct 2024 15:22:53 +0700 Subject: [PATCH] Update --- Modules/HospitalPortal/Http/Controllers/ApotekController.php | 4 +++- frontend/hospital-portal/src/components/Table.tsx | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Modules/HospitalPortal/Http/Controllers/ApotekController.php b/Modules/HospitalPortal/Http/Controllers/ApotekController.php index 1c83b8a5..33bf41ac 100644 --- a/Modules/HospitalPortal/Http/Controllers/ApotekController.php +++ b/Modules/HospitalPortal/Http/Controllers/ApotekController.php @@ -26,7 +26,9 @@ class ApotekController extends Controller $results = DB::connection('oldlms')->table('tx_prescriptions') ->join('tx_prescription_orders', 'tx_prescription_orders.nIDPrescription', '=', 'tx_prescriptions.nID') ->join('tm_users', 'tm_users.nID', '=', 'tx_prescriptions.nIDUser') - ->where('tx_prescription_orders.nIDApotek', '=', auth()->user()->organization_id) + ->when(auth()->user()->organization_id, function ($query, $organizationId) { + $query->where('tx_prescription_orders.nIDApotek', '=', $organizationId); + }) ->when($request->input('search'), function ($query, $search) { $query->where(function ($query) use ($search) { $query->orWhere('tx_prescriptions.sKodeResep', 'like', "%" . $search . "%") diff --git a/frontend/hospital-portal/src/components/Table.tsx b/frontend/hospital-portal/src/components/Table.tsx index e288ec31..fa7877bc 100755 --- a/frontend/hospital-portal/src/components/Table.tsx +++ b/frontend/hospital-portal/src/components/Table.tsx @@ -230,7 +230,7 @@ export default function Table({ const formattedRoleName = user?.role.name; // List of statuses for 'apotek' const allowedStatusesForApotek = ['waiting_pharmacy', 'order_prepared']; -const allowedStatusesForCSLMS = ['ready', 'waiting_for_courir', 'package_picked_up', 'package_on_delivery']; +const allowedStatusesForCSLMS = ['waiting_pharmacy', 'order_prepared', 'ready', 'waiting_for_courir', 'package_picked_up', 'package_on_delivery']; const [open, setOpen] = useState(false); const [loading, setLoading] = useState(true);