tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
ivan-sim
2024-10-09 11:05:55 +07:00
parent 9a4e9db798
commit 0233058e66
5 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Modules/HospitalPortal/Http/Controllers/ApotekController.php
View File

@@ -70,6 +70,7 @@ class ApotekController extends Controller
WHEN tx_prescription_orders.sStatus = "waiting_pharmacy" THEN "Diterima" WHEN tx_prescription_orders.sStatus = "waiting_pharmacy" THEN "Diterima"
WHEN tx_prescription_orders.sStatus = "order_prepared" THEN "Siap Diambil" WHEN tx_prescription_orders.sStatus = "order_prepared" THEN "Siap Diambil"
WHEN tx_prescription_orders.sStatus = "ready" THEN "Cari Kurir" 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 = "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_picked_up" THEN "Sedang diantar ke Alamat Tujuan"
WHEN tx_prescription_orders.sStatus = "package_on_delivery" THEN "Selesai" WHEN tx_prescription_orders.sStatus = "package_on_delivery" THEN "Selesai"

4
frontend/hospital-portal/src/components/Table.tsx
View File

@@ -230,7 +230,7 @@ export default function Table<T>({
const formattedRoleName = user?.role.name; const formattedRoleName = user?.role.name;
// List of statuses for 'apotek' // List of statuses for 'apotek'
const allowedStatusesForApotek = ['waiting_pharmacy', 'order_prepared']; 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 [open, setOpen] = useState(false);
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
@@ -269,7 +269,7 @@ const allowedStatusesForCSLMS = ['waiting_pharmacy', 'order_prepared', 'ready',
const handleClickKonfirmasi = (row: any) => { const handleClickKonfirmasi = (row: any) => {
setTxtStatusDriver(''); setTxtStatusDriver('');
setTxtIDDriver(''); setTxtIDDriver('');
if(row.sStatus === 'ready') if(row.sStatus === 'ready' || row.sStatus === 'failed')
{ {
//close //close
setDialogIDRow(row.id === dialogIDRow ? null : row.id); setDialogIDRow(row.id === dialogIDRow ? null : row.id);

3
frontend/hospital-portal/src/lang/en-US.json
View File

@@ -133,6 +133,7 @@
"txtOK": "Yes", "txtOK": "Yes",
"txtFindingDriver": "Finding a driver...", "txtFindingDriver": "Finding a driver...",
"txtDriverFound": "The driver’s been grabbed with the ID", "txtDriverFound": "The driver’s been grabbed with the ID",
"txtButtonClose": "Close" "txtButtonClose": "Close",
"txtLabelFailed": "Failed"
} }

3
frontend/hospital-portal/src/lang/id-ID.json
View File

@@ -133,5 +133,6 @@
"txtOK": "Ya", "txtOK": "Ya",
"txtFindingDriver" : "Sedang mencari driver...", "txtFindingDriver" : "Sedang mencari driver...",
"txtDriverFound" : "Driver sudah didapat dengan ID", "txtDriverFound" : "Driver sudah didapat dengan ID",
"txtButtonClose": "Tutup" "txtButtonClose": "Tutup",
"txtLabelFailed": "Gagal Pengiriman"
} }

5
frontend/hospital-portal/src/sections/dashboardApotek/TableList.tsx
View File

@@ -353,6 +353,10 @@ export default function TableList() {
<Label color='primary'> <Label color='primary'>
{localeData.txtLabelWaitingForPayment} {localeData.txtLabelWaitingForPayment}
</Label> </Label>
): obj.status === 'failed' ? (
<Label color='error'>
{localeData.txtLabelFailed}
</Label>
) : ( ) : (
<Label color='primary'> <Label color='primary'>
Pending Pending
@@ -404,6 +408,7 @@ export default function TableList() {
{"id": "package_picked_up", "name": localeData.txtLabelPackagePickedUp }, {"id": "package_picked_up", "name": localeData.txtLabelPackagePickedUp },
{"id": "package_on_delivery", "name": localeData.txtLabelPackageOnDelivery }, {"id": "package_on_delivery", "name": localeData.txtLabelPackageOnDelivery },
{"id": "package_delivered", "name": localeData.txtLabelPackageDelivered }, {"id": "package_delivered", "name": localeData.txtLabelPackageDelivered },
{"id": "failed", "name": localeData.txtLabelFailed },
]; ];
setStatusData(status) setStatusData(status)