diff --git a/src/components/admin/OrdersTable.tsx b/src/components/admin/OrdersTable.tsx index d1b0613..e268030 100644 --- a/src/components/admin/OrdersTable.tsx +++ b/src/components/admin/OrdersTable.tsx @@ -93,6 +93,7 @@ export function OrdersTable() { Ordernummer Kund + Leveransadress Datum Status Belopp @@ -101,33 +102,57 @@ export function OrdersTable() { {filteredOrders?.length === 0 ? ( - + Inga ordrar hittades ) : ( - filteredOrders?.map((order) => ( - - {order.order_number} - -
-
{order.customer_name || "—"}
-
{order.customer_email}
-
-
- - {format(new Date(order.created_at), "d MMM yyyy, HH:mm", { locale: sv })} - - - - {statusLabels[order.status] || order.status} - - - - {Number(order.total_amount).toLocaleString("sv-SE")} {order.currency} - -
- )) + filteredOrders?.map((order) => { + const item = Array.isArray(order.items) ? order.items[0] : null; + const lev = item?.leverans; + const phone = item?.telefon; + const comments = item?.kommentarer; + return ( + + {order.order_number} + +
+
{order.customer_name || "—"}
+
{order.customer_email}
+ {phone &&
{phone}
} +
+
+ + {lev ? ( +
+
{lev.adress || "—"}
+
+ {[lev.postnummer, lev.stad].filter(Boolean).join(" ")} +
+ {comments && ( +
+ "{comments}" +
+ )} +
+ ) : ( + + )} +
+ + {format(new Date(order.created_at), "d MMM yyyy, HH:mm", { locale: sv })} + + + + {statusLabels[order.status] || order.status} + + + + {Number(order.total_amount).toLocaleString("sv-SE")} {order.currency} + +
+ ); + }) )}