This commit is contained in:
shafi54 2026-11-10 17:28:29 +05:30
parent 176e3eea9d
commit 5e658c8d3a
12 changed files with 220 additions and 9 deletions

View file

@ -895,6 +895,9 @@ Use these fixture names in the cases below.
| AOD-23 | happy | Back to orders | route | | AOD-23 | happy | Back to orders | route |
| AOD-24 | edge | customer link | user detail route | | AOD-24 | edge | customer link | user detail route |
| AOD-25 | edge | no OrderOptionsMenu on details | only the explicit Cancel/Back actions are present (current) | | AOD-25 | edge | no OrderOptionsMenu on details | only the explicit Cancel/Back actions are present (current) |
| AOD-26 | edge | delivered timestamp | "Delivered on …" when deliveredAt is set |
| AOD-27 | edge | not delivered | no delivered timestamp |
| AOD-28 | edge | packed timestamp | per-item "Packed …" only when packagedAt is set |
### 13.2 OrderNotesForm / CancelOrderDialog / OrderOptionsMenu ### 13.2 OrderNotesForm / CancelOrderDialog / OrderOptionsMenu

View file

@ -182,6 +182,17 @@ export default function OrderDetails() {
Placed on {dayjs(order.createdAt).format("MMM DD, YYYY • h:mm A")} Placed on {dayjs(order.createdAt).format("MMM DD, YYYY • h:mm A")}
</MyText> </MyText>
</View> </View>
{order.deliveredAt && (
<View
testID="order-delivered-at"
style={tw`flex-row items-center bg-green-50 p-3 rounded-xl mt-2`}
>
<MaterialIcons name="check-circle" size={20} color="#10B981" />
<MyText style={tw`ml-2 text-green-800 font-medium`}>
Delivered on {dayjs(order.deliveredAt).format("MMM DD, YYYY • h:mm A")}
</MyText>
</View>
)}
</View> </View>
{/* Cancellation Reason */} {/* Cancellation Reason */}
@ -403,6 +414,14 @@ export default function OrderDetails() {
</MyText> </MyText>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
{item.packagedAt && (
<MyText
testID={`order-item-packaged-at-${item.id}`}
style={tw`text-[10px] text-gray-400 mt-1`}
>
Packed {dayjs(item.packagedAt).format("MMM DD, YYYY • h:mm A")}
</MyText>
)}
</View> </View>
<MyText style={tw`text-sm font-bold text-gray-900`}> <MyText style={tw`text-sm font-bold text-gray-900`}>
₹{item.amount} ₹{item.amount}

View file

@ -312,10 +312,11 @@ export const ORDER_DETAILS = {
adminNotes: null, adminNotes: null,
userNotes: null, userNotes: null,
createdAt: new Date().toISOString(), createdAt: new Date().toISOString(),
deliveredAt: null,
status: 'pending', status: 'pending',
isPackaged: false, isPackaged: false,
isDelivered: false, isDelivered: false,
items: ORDER_ITEMS.map((i) => ({ ...i, quantity: String(i.quantity), price: String(i.price) })), items: ORDER_ITEMS.map((i) => ({ ...i, quantity: String(i.quantity), price: String(i.price), packagedAt: null })),
cancelReason: null, cancelReason: null,
cancellationReviewed: false, cancellationReviewed: false,
couponData: null, couponData: null,

View file

@ -357,4 +357,40 @@ describe('Order details (AOD-01..25)', () => {
expect(view.getByTestId('order-details-cancel-button')).toBeTruthy() expect(view.getByTestId('order-details-cancel-button')).toBeTruthy()
expect(view.getByTestId('order-details-back-button')).toBeTruthy() expect(view.getByTestId('order-details-back-button')).toBeTruthy()
}) })
it('AOD-26: the delivered timestamp renders when the order is delivered', async () => {
setProcedure('admin.order.getOrderDetails', {
data: order({
status: 'delivered',
isDelivered: true,
isPackaged: true,
deliveredAt: '2026-11-10T10:15:00.000Z',
}),
})
const view = await renderDetails()
expect(view.getByTestId('order-delivered-at')).toBeTruthy()
expect(view.getByText(/Delivered on/)).toBeTruthy()
})
it('AOD-27: no delivered timestamp before the order is delivered', async () => {
const view = await renderDetails()
expect(view.queryByTestId('order-delivered-at')).toBeNull()
})
it('AOD-28: a packaged item shows when it was packed', async () => {
const items = ORDER_DETAILS.items.map((item, index) =>
index === 0
? { ...item, isPackaged: true, packagedAt: '2026-11-10T09:30:00.000Z' }
: { ...item, isPackaged: true, packagedAt: null },
)
setProcedure('admin.order.getOrderDetails', { data: order({ items }) })
const view = await renderDetails()
expect(view.getByTestId('order-item-packaged-at-1')).toBeTruthy()
expect(view.getByText(/Packed/)).toBeTruthy()
// A packaged item with no recorded time renders no timestamp.
expect(view.queryByTestId('order-item-packaged-at-2')).toBeNull()
})
}) })

View file

@ -9,6 +9,7 @@ import {
Zap, Zap,
CircleAlert, CircleAlert,
Check, Check,
CheckCircle,
Package, Package,
Truck, Truck,
ChevronRight, ChevronRight,
@ -192,6 +193,17 @@ function OrderDetails() {
Placed on {dayjs(order.createdAt).format('MMM DD, YYYY • h:mm A')} Placed on {dayjs(order.createdAt).format('MMM DD, YYYY • h:mm A')}
</MyText> </MyText>
</div> </div>
{order.deliveredAt && (
<div
data-testid="order-delivered-at"
className="mt-2 flex flex-row items-center rounded-xl bg-green-50 p-3"
>
<CheckCircle size={20} color="#10B981" />
<MyText className="ml-2 font-medium text-green-800">
Delivered on {dayjs(order.deliveredAt).format('MMM DD, YYYY • h:mm A')}
</MyText>
</div>
)}
</div> </div>
{/* Cancellation Reason */} {/* Cancellation Reason */}
@ -391,6 +403,14 @@ function OrderDetails() {
</MyText> </MyText>
</button> </button>
</div> </div>
{item.packagedAt && (
<MyText
data-testid={`order-item-packaged-at-${item.id}`}
className="mt-1 block text-[10px] text-gray-400"
>
Packed {dayjs(item.packagedAt).format('MMM DD, YYYY • h:mm A')}
</MyText>
)}
</div> </div>
<MyText className="text-sm font-bold text-gray-900"> <MyText className="text-sm font-bold text-gray-900">
₹{item.amount} ₹{item.amount}

View file

@ -1187,12 +1187,12 @@ Covered by UCOMP-01..11. Add admin-side cases in section 7.
| AORD-10 | happy | updateNotes | stored | | AORD-10 | happy | updateNotes | stored |
| AORD-11 | error | unknown | error | | AORD-11 | error | unknown | error |
| AORD-12 | edge | empty notes | stored null | | AORD-12 | edge | empty notes | stored null |
| AORD-13 | happy | updatePackaged true/false | status; user notification | | AORD-13 | happy | updatePackaged true/false | status; user notification; item packagedAt stamped then cleared |
| AORD-14 | error | unknown order | 404 | | AORD-14 | error | unknown order | 404 |
| AORD-15 | edge | string orderId | schema requires string | | AORD-15 | edge | string orderId | schema requires string |
| AORD-16 | happy | updateDelivered true/false | user status success/pending | | AORD-16 | happy | updateDelivered true/false | user status success/pending; deliveredAt stamped, kept on repeat, cleared |
| AORD-17 | error | unknown | 404 | | AORD-17 | error | unknown | 404 |
| AORD-18 | happy | updateOrderItemPackaging | flags | | AORD-18 | happy | updateOrderItemPackaging | flags; packagedAt follows the Packaged toggle |
| AORD-19 | error | unknown item | 404 | | AORD-19 | error | unknown item | 404 |
| AORD-20 | edge | only one flag supplied | other preserved | | AORD-20 | edge | only one flag supplied | other preserved |
| AORD-21 | happy | removeDeliveryCharge | 0; user sees | | AORD-21 | happy | removeDeliveryCharge | 0; user sees |

View file

@ -327,6 +327,9 @@ describe('admin.order.updatePackaged / updateDelivered (AORD-13..17)', () => {
const fx = await createCatalogOrderFixture({ price: 100 }) const fx = await createCatalogOrderFixture({ price: 100 })
const orderId = await placeOne(fx) const orderId = await placeOne(fx)
const before: any = await admin.admin.order.getOrderDetails.query({ orderId })
expect(before.items[0].packagedAt).toBeNull()
const packed: any = await admin.admin.order.updatePackaged.mutate({ const packed: any = await admin.admin.order.updatePackaged.mutate({
orderId: String(orderId), orderId: String(orderId),
isPackaged: true, isPackaged: true,
@ -336,9 +339,17 @@ describe('admin.order.updatePackaged / updateDelivered (AORD-13..17)', () => {
expect(afterPacked.deliveryStatus).toBe('packaged') expect(afterPacked.deliveryStatus).toBe('packaged')
expect(afterPacked.orderStatus).toBe('success') expect(afterPacked.orderStatus).toBe('success')
// Every item is stamped with the packaging moment.
const packedDetail: any = await admin.admin.order.getOrderDetails.query({ orderId })
expect(typeof packedDetail.items[0].packagedAt).toBe('string')
expect(Number.isNaN(new Date(packedDetail.items[0].packagedAt).getTime())).toBe(false)
await admin.admin.order.updatePackaged.mutate({ orderId: String(orderId), isPackaged: false }) await admin.admin.order.updatePackaged.mutate({ orderId: String(orderId), isPackaged: false })
const afterUnpacked: any = await detail(fx.user.token, orderId) const afterUnpacked: any = await detail(fx.user.token, orderId)
expect(afterUnpacked.deliveryStatus).toBe('pending') expect(afterUnpacked.deliveryStatus).toBe('pending')
const unpackedDetail: any = await admin.admin.order.getOrderDetails.query({ orderId })
expect(unpackedDetail.items[0].packagedAt).toBeNull()
}) })
it('AORD-14: updatePackaged on an unknown order is NOT_FOUND 404', async () => { it('AORD-14: updatePackaged on an unknown order is NOT_FOUND 404', async () => {
@ -363,6 +374,9 @@ describe('admin.order.updatePackaged / updateDelivered (AORD-13..17)', () => {
const fx = await createCatalogOrderFixture({ price: 100 }) const fx = await createCatalogOrderFixture({ price: 100 })
const orderId = await placeOne(fx) const orderId = await placeOne(fx)
const before: any = await admin.admin.order.getOrderDetails.query({ orderId })
expect(before.deliveredAt).toBeNull()
const res: any = await admin.admin.order.updateDelivered.mutate({ const res: any = await admin.admin.order.updateDelivered.mutate({
orderId: String(orderId), orderId: String(orderId),
isDelivered: true, isDelivered: true,
@ -372,10 +386,21 @@ describe('admin.order.updatePackaged / updateDelivered (AORD-13..17)', () => {
expect(delivered.orderStatus).toBe('success') expect(delivered.orderStatus).toBe('success')
expect(delivered.deliveryStatus).toBe('success') expect(delivered.deliveryStatus).toBe('success')
// The delivery moment is recorded and survives a repeat "delivered" call.
const deliveredDetail: any = await admin.admin.order.getOrderDetails.query({ orderId })
expect(typeof deliveredDetail.deliveredAt).toBe('string')
expect(Number.isNaN(new Date(deliveredDetail.deliveredAt).getTime())).toBe(false)
await admin.admin.order.updateDelivered.mutate({ orderId: String(orderId), isDelivered: true })
const repeat: any = await admin.admin.order.getOrderDetails.query({ orderId })
expect(repeat.deliveredAt).toBe(deliveredDetail.deliveredAt)
await admin.admin.order.updateDelivered.mutate({ orderId: String(orderId), isDelivered: false }) await admin.admin.order.updateDelivered.mutate({ orderId: String(orderId), isDelivered: false })
const pending: any = await detail(fx.user.token, orderId) const pending: any = await detail(fx.user.token, orderId)
expect(pending.orderStatus).toBe('success') expect(pending.orderStatus).toBe('success')
expect(pending.deliveryStatus).toBe('pending') expect(pending.deliveryStatus).toBe('pending')
const pendingDetail: any = await admin.admin.order.getOrderDetails.query({ orderId })
expect(pendingDetail.deliveredAt).toBeNull()
}) })
it('AORD-17: updateDelivered on an unknown order is NOT_FOUND 404', async () => { it('AORD-17: updateDelivered on an unknown order is NOT_FOUND 404', async () => {
@ -410,6 +435,15 @@ describe('admin.order.updateOrderItemPackaging (AORD-18..20)', () => {
const after: any = await admin.admin.order.getOrderDetails.query({ orderId }) const after: any = await admin.admin.order.getOrderDetails.query({ orderId })
expect(after.items[0].isPackaged).toBe(true) expect(after.items[0].isPackaged).toBe(true)
expect(after.items[0].isPackageVerified).toBe(true) expect(after.items[0].isPackageVerified).toBe(true)
expect(typeof after.items[0].packagedAt).toBe('string')
await admin.admin.order.updateOrderItemPackaging.mutate({
orderItemId: itemId,
isPackaged: false,
})
const unpacked: any = await admin.admin.order.getOrderDetails.query({ orderId })
expect(unpacked.items[0].isPackaged).toBe(false)
expect(unpacked.items[0].packagedAt).toBeNull()
}) })
it('AORD-19: an unknown order item is NOT_FOUND 404', async () => { it('AORD-19: an unknown order item is NOT_FOUND 404', async () => {

View file

@ -881,3 +881,58 @@ cart looked frozen.
- submit <LoadingDialog> (nested Modal) - submit <LoadingDialog> (nested Modal)
+ inline absolute-fill overlay with the same spinner + message inside the form's + inline absolute-fill overlay with the same spinner + message inside the form's
KeyboardAvoidingView; no second native modal to leave behind KeyboardAvoidingView; no second native modal to leave behind
[2026-11-10 17:22:58 IST] admin orders: record packaging time and delivery time.
Both columns already exist on the SQLite schema (order_items.packaged_at from
migration 0004/0005, orders.delivered_at from 0005) and were never written. No
new migration is needed; this wires the writes and surfaces the values in the
admin order-details screens (RN admin-ui + web admin-web).
--- packages/db_helper_sqlite/src/lib/date.ts
+ export function nullableDate(value: Date | null | undefined): Date | null
(timestampText's fromDriver maps NULL to new Date(0); treat epoch as null)
--- packages/db_helper_sqlite/src/admin-apis/order.ts
updateOrderPackaged:
- .set({ is_packaged: isPackaged })
+ isPackaged true -> { is_packaged: true, packagedAt: COALESCE(packaged_at, now) }
+ isPackaged false -> { is_packaged: false, packagedAt: null }
+ !isPackaged also clears orders.deliveredAt (it already reset isDelivered)
updateOrderDelivered:
+ stamps orders.deliveredAt = now on the first delivered=true, keeps it on repeat
+ calls, and clears it on delivered=false
updateOrderItemPackaging:
+ isPackaged true -> packaged_at = existing ?? now
+ isPackaged false -> packaged_at = null
getOrderDetails:
+ deliveredAt (order) and packagedAt (per item), epoch-as-null
--- packages/db_helper_sqlite/src/lib/order-items-archive.ts
- packagedAt: row.packagedAt ? row.packagedAt.toISOString() : null
+ packagedAt: nullableDate(row.packagedAt)?.toISOString() ?? null
(an unset timestamp was archived as 1970-01-01T00:00:00.000Z)
--- packages/shared/types/admin.ts
+ AdminOrderDetails.deliveredAt: Date | null
+ AdminOrderDetailsItem.packagedAt: Date | null
--- apps/admin-ui/app/(drawer)/dashboard/manage-orders/order-details/[id].tsx
+ testID "order-delivered-at" row in the header when order.deliveredAt
+ testID `order-item-packaged-at-<id>` under each item when item.packagedAt
--- apps/admin-web/src/routes/dashboard.orders.$id.tsx
+ same two blocks (web counterpart)
--- apps/backend/tests/api/admin-order.test.ts
+ AORD-13: asserts packagedAt is stamped then cleared on un-pack
+ AORD-16: asserts deliveredAt is stamped then cleared on un-deliver
+ AORD-18: asserts the per-item packagedAt follows the Packaged toggle
--- apps/admin-ui/tests/fixtures/index.ts
+ deliveredAt / packagedAt on ORDER_DETAILS and its items
--- apps/admin-ui/tests/pages/order-details.test.tsx
+ AOD-26: delivered timestamp renders when order.deliveredAt is set
+ AOD-27: no delivered timestamp before delivery
+ AOD-28: per-item packed timestamp renders only when packagedAt is set

View file

@ -8,7 +8,7 @@ import {
orders, orders,
orderStatus, orderStatus,
} from '../db/schema' } from '../db/schema'
import { and, desc, eq, inArray, isNull, lt, SQL } from 'drizzle-orm' import { and, desc, eq, inArray, isNull, lt, sql, SQL } from 'drizzle-orm'
import { releaseCouponUsageIfGroupFullyCancelled } from '../user-apis/order' import { releaseCouponUsageIfGroupFullyCancelled } from '../user-apis/order'
import { import {
attachOrderItems, attachOrderItems,
@ -32,7 +32,7 @@ import type {
GetAllOrdersInput, GetAllOrdersInput,
} from '@packages/shared' } from '@packages/shared'
import type { InferSelectModel } from 'drizzle-orm' import type { InferSelectModel } from 'drizzle-orm'
import { coerceDate } from '../lib/date' import { coerceDate, nullableDate } from '../lib/date'
import { marketStatsForRegion } from '../lib/market-stats' import { marketStatsForRegion } from '../lib/market-stats'
import { composeSkuName, composeUnitNotation } from '../lib/sku-features' import { composeSkuName, composeUnitNotation } from '../lib/sku-features'
@ -109,7 +109,15 @@ export async function updateOrderPackaged(regionId: number, orderId: string, isP
await db await db
.update(orderItems) .update(orderItems)
.set({ is_packaged: isPackaged }) .set(
isPackaged
? {
is_packaged: true,
// First packaging moment wins; re-marking must not move the clock.
packagedAt: sql`COALESCE(${orderItems.packagedAt}, ${new Date().toISOString()})`,
}
: { is_packaged: false, packagedAt: null }
)
.where(eq(orderItems.orderId, orderIdNumber)) .where(eq(orderItems.orderId, orderIdNumber))
if (!isPackaged) { if (!isPackaged) {
@ -117,6 +125,11 @@ export async function updateOrderPackaged(regionId: number, orderId: string, isP
.update(orderStatus) .update(orderStatus)
.set({ isPackaged, isDelivered: false }) .set({ isPackaged, isDelivered: false })
.where(eq(orderStatus.orderId, orderIdNumber)) .where(eq(orderStatus.orderId, orderIdNumber))
// Un-packaging resets delivery, so the recorded delivery time goes with it.
await db
.update(orders)
.set({ deliveredAt: null })
.where(eq(orders.id, orderIdNumber))
} else { } else {
await db await db
.update(orderStatus) .update(orderStatus)
@ -136,7 +149,7 @@ export async function updateOrderDelivered(regionId: number, orderId: string, is
const orderCheck = await db.query.orders.findFirst({ const orderCheck = await db.query.orders.findFirst({
where: and(eq(orders.id, orderIdNumber), eq(orders.regionId, regionId)), where: and(eq(orders.id, orderIdNumber), eq(orders.regionId, regionId)),
columns: { id: true }, columns: { id: true, deliveredAt: true },
}) })
if (!orderCheck) { if (!orderCheck) {
return null return null
@ -147,6 +160,16 @@ export async function updateOrderDelivered(regionId: number, orderId: string, is
.set({ isDelivered }) .set({ isDelivered })
.where(eq(orderStatus.orderId, orderIdNumber)) .where(eq(orderStatus.orderId, orderIdNumber))
// Stamp the first delivery moment; a repeat "delivered" call keeps it, and
// un-delivering clears it so the next delivery gets a fresh time.
const deliveredAt = isDelivered
? nullableDate(orderCheck.deliveredAt) ?? new Date()
: null
await db
.update(orders)
.set({ deliveredAt })
.where(eq(orders.id, orderIdNumber))
const order = await db.query.orders.findFirst({ const order = await db.query.orders.findFirst({
where: and(eq(orders.id, orderIdNumber), eq(orders.regionId, regionId)), where: and(eq(orders.id, orderIdNumber), eq(orders.regionId, regionId)),
}) })
@ -238,6 +261,7 @@ export async function getOrderDetails(regionId: number, orderId: number): Promis
adminNotes: orderData.adminNotes, adminNotes: orderData.adminNotes,
userNotes: orderData.userNotes, userNotes: orderData.userNotes,
createdAt: orderData.createdAt, createdAt: orderData.createdAt,
deliveredAt: nullableDate(orderData.deliveredAt),
status, status,
isPackaged: orderStatusRecord?.isPackaged || false, isPackaged: orderStatusRecord?.isPackaged || false,
isDelivered: orderStatusRecord?.isDelivered || false, isDelivered: orderStatusRecord?.isDelivered || false,
@ -252,6 +276,7 @@ export async function getOrderDetails(regionId: number, orderId: number): Promis
amount: parseFloat(item.price.toString()) * parseFloat(item.quantity || '0'), amount: parseFloat(item.price.toString()) * parseFloat(item.quantity || '0'),
isPackaged: item.is_packaged, isPackaged: item.is_packaged,
isPackageVerified: item.is_package_verified, isPackageVerified: item.is_package_verified,
packagedAt: nullableDate(item.packagedAt),
features: (item.sku.features || []).map((f: any) => ({ features: (item.sku.features || []).map((f: any) => ({
featureName: f.featureName, featureName: f.featureName,
featureValue: f.featureValue, featureValue: f.featureValue,
@ -286,10 +311,14 @@ export async function updateOrderItemPackaging(
const updateData: Partial<{ const updateData: Partial<{
is_packaged: boolean is_packaged: boolean
is_package_verified: boolean is_package_verified: boolean
packaged_at: Date | null
}> = {} }> = {}
if (isPackaged !== undefined) { if (isPackaged !== undefined) {
updateData.is_packaged = isPackaged updateData.is_packaged = isPackaged
updateData.packaged_at = isPackaged
? nullableDate(orderItem.packagedAt) ?? new Date()
: null
} }
if (isPackageVerified !== undefined) { if (isPackageVerified !== undefined) {
updateData.is_package_verified = isPackageVerified updateData.is_package_verified = isPackageVerified

View file

@ -1,3 +1,14 @@
/**
* `timestampText` reads SQL NULL back as `new Date(0)`, so a plain `?? null`
* would hand clients 1970-01-01 instead of "not set". Anything at or before the
* epoch is treated as unset.
*/
export function nullableDate(value: Date | null | undefined): Date | null {
if (!value) return null
const time = value instanceof Date ? value.getTime() : NaN
return Number.isNaN(time) || time <= 0 ? null : value
}
export function coerceDate(value: unknown): Date | null { export function coerceDate(value: unknown): Date | null {
if (value instanceof Date) { if (value instanceof Date) {
return Number.isNaN(value.getTime()) ? null : value return Number.isNaN(value.getTime()) ? null : value

View file

@ -1,6 +1,7 @@
import { and, eq, gt, inArray, isNull, sql } from 'drizzle-orm' import { and, eq, gt, inArray, isNull, sql } from 'drizzle-orm'
import { db } from '../db/db_index' import { db } from '../db/db_index'
import { orderItems, orders, productSkus, type OrderItemSnapshot } from '../db/schema' import { orderItems, orders, productSkus, type OrderItemSnapshot } from '../db/schema'
import { nullableDate } from './date'
const IST_OFFSET_MS = 5.5 * 60 * 60 * 1000 const IST_OFFSET_MS = 5.5 * 60 * 60 * 1000
const DAY_MS = 24 * 60 * 60 * 1000 const DAY_MS = 24 * 60 * 60 * 1000
@ -132,7 +133,7 @@ export function buildSnapshot(
discountedPrice: row.discountedPrice, discountedPrice: row.discountedPrice,
isPackaged: row.is_packaged, isPackaged: row.is_packaged,
isPackageVerified: row.is_package_verified, isPackageVerified: row.is_package_verified,
packagedAt: row.packagedAt ? row.packagedAt.toISOString() : null, packagedAt: nullableDate(row.packagedAt)?.toISOString() ?? null,
productName: sku.product.name, productName: sku.product.name,
skuName: sku.name, skuName: sku.name,
image: Array.isArray(sku.images) && sku.images.length > 0 ? sku.images[0] : null, image: Array.isArray(sku.images) && sku.images.length > 0 ? sku.images[0] : null,

View file

@ -90,6 +90,7 @@ export interface AdminOrderDetailsItem extends AdminOrderItemCore {
price: string; price: string;
productSize: number; productSize: number;
unit?: string; unit?: string;
packagedAt: Date | null;
} }
export interface AdminOrderDetailsCouponData { export interface AdminOrderDetailsCouponData {
@ -112,6 +113,7 @@ export interface AdminOrderDetails {
adminNotes: string | null; adminNotes: string | null;
userNotes: string | null; userNotes: string | null;
createdAt: Date; createdAt: Date;
deliveredAt: Date | null;
status: 'pending' | 'delivered' | 'cancelled'; status: 'pending' | 'delivered' | 'cancelled';
isPackaged: boolean; isPackaged: boolean;
isDelivered: boolean; isDelivered: boolean;