From 7f6539d10ace3838996d71db8dee528ac620a927 Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Thu, 26 Jun 2025 15:06:21 +0300 Subject: [PATCH] order-card: show date --- apps/web/components/shared/order-card.tsx | 6 +++++- packages/utils/src/datetime-format.ts | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/apps/web/components/shared/order-card.tsx b/apps/web/components/shared/order-card.tsx index 938fb4c..b19f6bf 100644 --- a/apps/web/components/shared/order-card.tsx +++ b/apps/web/components/shared/order-card.tsx @@ -4,6 +4,7 @@ import { ReadonlyTimeRange } from './time-range/readonly'; import { getBadge } from '@/components/shared/status'; import type * as GQL from '@repo/graphql/types'; import { Avatar, AvatarFallback, AvatarImage } from '@repo/ui/components/ui/avatar'; +import { formatDate } from '@repo/utils/datetime-format'; import Link from 'next/link'; type OrderComponentProps = GQL.OrderFieldsFragment & { @@ -14,6 +15,7 @@ type OrderCustomer = GQL.CustomerFieldsFragment; export function OrderCard({ avatarSource, documentId, ...order }: Readonly) { const services = order?.services.map((service) => service?.name).join(', '); + const date = order?.slot?.date; const customer = avatarSource === 'master' ? order?.slot?.master : order?.client; @@ -25,7 +27,9 @@ export function OrderCard({ avatarSource, documentId, ...order }: Readonly}
- {services} + + {formatDate(date).user('DD.MM.YYYY')} • {services} +
{/* {clientName} */} diff --git a/packages/utils/src/datetime-format.ts b/packages/utils/src/datetime-format.ts index a870209..d313cf7 100644 --- a/packages/utils/src/datetime-format.ts +++ b/packages/utils/src/datetime-format.ts @@ -20,10 +20,10 @@ export function formatDate(date: Date | string) { return { db: () => dayjs(date).format('YYYY-MM-DD'), - user: () => { + user: (template?: string) => { const lang = document.documentElement.lang || 'ru'; dayjs.locale(lang); - return dayjs(date).format('D MMMM YYYY'); + return dayjs(date).format(template || 'D MMMM YYYY'); }, }; }