diff --git a/src/pages/member/OrderDetail.tsx b/src/pages/member/OrderDetail.tsx index d62eb6b..5f7a00a 100644 --- a/src/pages/member/OrderDetail.tsx +++ b/src/pages/member/OrderDetail.tsx @@ -341,53 +341,73 @@ export default function OrderDetail() { {/* QR Code Display for pending QRIS payments */} - {order.payment_status === "pending" && order.payment_method === "qris" && order.qr_string && !isQrExpired && ( + {order.payment_status === "pending" && order.payment_method === "qris" && !isQrExpired && (
- - - - Scan QR code ini dengan aplikasi e-wallet atau mobile banking Anda - {timeRemaining && ( - - (Kadaluarsa dalam {timeRemaining}) - - )} - - + {order.qr_string ? ( + <> + + + + Scan QR code ini dengan aplikasi e-wallet atau mobile banking Anda + {timeRemaining && ( + + (Kadaluarsa dalam {timeRemaining}) + + )} + + -
-
- -
+
+
+ +
-
-

{formatIDR(order.total_amount)}

-

- Order ID: {order.id.slice(0, 8)} -

-
+
+

{formatIDR(order.total_amount)}

+

+ Order ID: {order.id.slice(0, 8)} +

+
- {isPolling && ( -
- - Menunggu pembayaran... + {isPolling && ( +
+ + Menunggu pembayaran... +
+ )} + +
+ 🔒 Pembayaran Aman + ⚡ QRIS Standar Bank Indonesia +
+ + {order.payment_url && ( + + )}
- )} - -
- 🔒 Pembayaran Aman - ⚡ QRIS Standar Bank Indonesia -
- - {order.payment_url && ( - - )} -
+ + ) : ( + // No QR string yet - show loading or payment URL option + + + + Sedang memproses QR code... + {order.payment_url && ( + + )} + + + )}
)} @@ -546,28 +566,6 @@ export default function OrderDetail() {
- - {/* Consulting Slots Detail */} - - - Detail Jadwal - - -
- {consultingSlots.map((slot, index) => ( -
-
-

Blok {index + 1}

-

{slot.start_time.substring(0, 5)} - {slot.end_time.substring(0, 5)} WIB

-
- - {slot.status === "confirmed" ? "Terkonfirmasi" : slot.status} - -
- ))} -
-
-
) : order.order_items.length > 0 ? ( // === Product Orders (has order_items) ===