diff --git a/client/src/entities/order/api/admin-order-api.ts b/client/src/entities/order/api/admin-order-api.ts index 9ff8947..98f6439 100644 --- a/client/src/entities/order/api/admin-order-api.ts +++ b/client/src/entities/order/api/admin-order-api.ts @@ -4,6 +4,7 @@ export type AdminOrderListItem = { id: string status: string deliveryType: 'delivery' | 'pickup' + deliveryFeeLocked: boolean deliveryCarrier?: string | null paymentMethod?: 'online' | 'on_pickup' totalCents: number diff --git a/client/src/pages/admin-orders/ui/AdminOrdersPage.tsx b/client/src/pages/admin-orders/ui/AdminOrdersPage.tsx index 2cf60ef..85f7b3d 100644 --- a/client/src/pages/admin-orders/ui/AdminOrdersPage.tsx +++ b/client/src/pages/admin-orders/ui/AdminOrdersPage.tsx @@ -137,13 +137,12 @@ export function AdminOrdersPage() { {group.items.map((o) => { const knownStatus = ORDER_STATUSES.includes(o.status as (typeof ORDER_STATUSES)[number]) - const deliveryFeeLocked = (o as typeof o & { deliveryFeeLocked?: boolean }).deliveryFeeLocked ?? true const showPriceApprovalChip = knownStatus && orderRequiresPriceApproval({ status: o.status as (typeof ORDER_STATUSES)[number], deliveryType: o.deliveryType, - deliveryFeeLocked, + deliveryFeeLocked: o.deliveryFeeLocked, }) return ( diff --git a/server/src/routes/api/admin-orders.js b/server/src/routes/api/admin-orders.js index 2f67809..25d152c 100644 --- a/server/src/routes/api/admin-orders.js +++ b/server/src/routes/api/admin-orders.js @@ -53,6 +53,7 @@ export async function registerAdminOrderRoutes(fastify) { id: o.id, status: o.status, deliveryType: o.deliveryType, + deliveryFeeLocked: o.deliveryFeeLocked, deliveryCarrier: o.deliveryCarrier, paymentMethod: o.paymentMethod, totalCents: o.totalCents,