diff --git a/Modules/HospitalPortal/Http/Controllers/ApotekController.php b/Modules/HospitalPortal/Http/Controllers/ApotekController.php index 33bf41ac..d8a7ff71 100644 --- a/Modules/HospitalPortal/Http/Controllers/ApotekController.php +++ b/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" diff --git a/frontend/hospital-portal/src/components/Table.tsx b/frontend/hospital-portal/src/components/Table.tsx index fa7877bc..99aa7d91 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 = ['waiting_pharmacy', 'order_prepared', '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', 'failed']; const [open, setOpen] = useState(false); const [loading, setLoading] = useState(true); @@ -269,7 +269,7 @@ const allowedStatusesForCSLMS = ['waiting_pharmacy', 'order_prepared', 'ready', const handleClickKonfirmasi = (row: any) => { setTxtStatusDriver(''); setTxtIDDriver(''); - if(row.sStatus === 'ready') + if(row.sStatus === 'ready' || row.sStatus === 'failed') { //close setDialogIDRow(row.id === dialogIDRow ? null : row.id); diff --git a/frontend/hospital-portal/src/lang/en-US.json b/frontend/hospital-portal/src/lang/en-US.json index f0cc26c8..9a51911d 100755 --- a/frontend/hospital-portal/src/lang/en-US.json +++ b/frontend/hospital-portal/src/lang/en-US.json @@ -133,6 +133,7 @@ "txtOK": "Yes", "txtFindingDriver": "Finding a driver...", "txtDriverFound": "The driver’s been grabbed with the ID", - "txtButtonClose": "Close" + "txtButtonClose": "Close", + "txtLabelFailed": "Failed" } diff --git a/frontend/hospital-portal/src/lang/id-ID.json b/frontend/hospital-portal/src/lang/id-ID.json index 11264a04..d830cd4a 100755 --- a/frontend/hospital-portal/src/lang/id-ID.json +++ b/frontend/hospital-portal/src/lang/id-ID.json @@ -133,5 +133,6 @@ "txtOK": "Ya", "txtFindingDriver" : "Sedang mencari driver...", "txtDriverFound" : "Driver sudah didapat dengan ID", - "txtButtonClose": "Tutup" + "txtButtonClose": "Tutup", + "txtLabelFailed": "Gagal Pengiriman" } diff --git a/frontend/hospital-portal/src/sections/dashboardApotek/TableList.tsx b/frontend/hospital-portal/src/sections/dashboardApotek/TableList.tsx index 3b061ec7..87027d83 100644 --- a/frontend/hospital-portal/src/sections/dashboardApotek/TableList.tsx +++ b/frontend/hospital-portal/src/sections/dashboardApotek/TableList.tsx @@ -353,6 +353,10 @@ export default function TableList() { + ): obj.status === 'failed' ? ( + ) : (