k4rli/medreport_mrb2b
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(MED-131): show other (non analysis-package) orders

Browse Source
This commit is contained in:
Karli
2025-08-04 17:32:54 +03:00
parent 74ccbfd4d7
commit 0ba23b6c8e
6 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/home/(user)/(dashboard)/order/page.tsx
View File

@@ -10,6 +10,7 @@ import { Trans } from '@kit/ui/trans';
import { HomeLayoutPageHeader } from '../../_components/home-page-header';
import OrdersTable from '../../_components/orders/orders-table';
import { withI18n } from '~/lib/i18n/with-i18n';
import type { IOrderLineItem } from '../../_components/orders/types';
export async function generateMetadata() {
const { t } = await createI18nServerInstance();
@@ -29,11 +30,17 @@ async function OrdersPage() {
}
const analysisPackagesType = productTypes.find(({ metadata }) => metadata?.handle === 'analysis-packages');
const analysisPackageOrders = orders.flatMap(({ id, items, payment_status, fulfillment_status }) => items
const analysisPackageOrders: IOrderLineItem[] = orders.flatMap(({ id, items, payment_status, fulfillment_status }) => items
?.filter((item) => item.product_type_id === analysisPackagesType?.id)
.map((item) => ({ item, orderId: id, orderStatus: `${payment_status}/${fulfillment_status}` }))
|| []);
const otherOrders: IOrderLineItem[] = orders
.filter(({ items }) => items?.some((item) => item.product_type_id !== analysisPackagesType?.id))
.flatMap(({ id, items, payment_status, fulfillment_status }) => items
?.map((item) => ({ item, orderId: id, orderStatus: `${payment_status}/${fulfillment_status}` }))
|| []);
return (
<>
<HomeLayoutPageHeader
@@ -41,7 +48,8 @@ async function OrdersPage() {
description={<Trans i18nKey={'orders:description'} />}
/>
<PageBody>
<OrdersTable orderItems={analysisPackageOrders} />
<OrdersTable orderItems={analysisPackageOrders} title="orders:table.analysisPackage" />
<OrdersTable orderItems={otherOrders} title="orders:table.otherOrders" />
</PageBody>
</>
);