diff --git a/apps/portal/src/features/orders/views/OrderDetail.tsx b/apps/portal/src/features/orders/views/OrderDetail.tsx index ec75fd1d..fda0e90d 100644 --- a/apps/portal/src/features/orders/views/OrderDetail.tsx +++ b/apps/portal/src/features/orders/views/OrderDetail.tsx @@ -329,51 +329,39 @@ export function OrderDetailContainer() {
{/* Header Section */}
-
- {/* Row 1: Title, Date, Pricing */} -
-
+
+ {/* Left: Title & Date */} +
+

{serviceLabel}

- {placedDate && ( -

{placedDate}

- )} -
- - {/* Pricing Section */} -
- {totals.monthlyTotal > 0 && ( -
-

Monthly

-

- {yenFormatter.format(totals.monthlyTotal)} -

-
- )} - {totals.oneTimeTotal > 0 && ( -
-

One-Time

-

- {yenFormatter.format(totals.oneTimeTotal)} -

-
+ {statusDescriptor && ( + )}
+ {placedDate && ( +

{placedDate}

+ )}
- {/* Row 2: Status */} - {statusDescriptor && ( -
- - {statusDescriptor.nextAction && ( - {statusDescriptor.nextAction} - )} -
- )} + {/* Right: Pricing Section */} +
+ {totals.monthlyTotal > 0 && ( +
+

Monthly

+

+ {yenFormatter.format(totals.monthlyTotal)} +

+
+ )} + {totals.oneTimeTotal > 0 && ( +
+

One-Time

+

+ {yenFormatter.format(totals.oneTimeTotal)} +

+
+ )} +
@@ -464,14 +452,29 @@ export function OrderDetailContainer() {
+ {/* Next Steps Section */} + {statusDescriptor?.nextAction && ( +
+
+ +
+

Next Steps

+

+ {statusDescriptor.nextAction} +

+
+
+
+ )} + {showFeeNotice && ( -
+
-

Additional fees may apply

-

- Weekend installation, express setup, or specialised configuration work can add extra costs. We'll always confirm with you before applying any additional charges. +

Installation Fee Notice

+

+ Standard installation is included. Additional charges may apply for weekend scheduling, express service, or specialized equipment installation. Any extra fees will be discussed and approved by you before work begins.