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

Merge branch 'develop' into feature/MED-129

Browse Source
This commit is contained in:
Danel Kungla
2025-09-24 15:00:27 +03:00
parent 249611886b 4c003b3cb5
commit 7817ae0448
622 changed files with 19603 additions and 10824 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/home/(user)/_components/orders/actions.ts
View File

@@ -1,9 +1,15 @@
'use server';
import { createPageViewLog, PageViewAction } from "~/lib/services/audit/pageView.service";
import { loadCurrentUserAccount } from "../../_lib/server/load-user-account";
import {
PageViewAction,
createPageViewLog,
} from '~/lib/services/audit/pageView.service';
export async function logAnalysisResultsNavigateAction(analysisOrderId: string) {
import { loadCurrentUserAccount } from '../../_lib/server/load-user-account';
export async function logAnalysisResultsNavigateAction(
analysisOrderId: string,
) {
const { account } = await loadCurrentUserAccount();
if (!account) {
throw new Error('Account not found');

88
app/home/(user)/_components/orders/order-block.tsx
View File

@@ -1,39 +1,71 @@
import type { AnalysisOrder } from "~/lib/types/analysis-order";
import { Trans } from '@kit/ui/makerkit/trans';
import { StoreOrderLineItem } from "@medusajs/types";
import OrderItemsTable from "./order-items-table";
import Link from "next/link";
import { Eye } from "lucide-react";
import Link from 'next/link';
export default function OrderBlock({ analysisOrder, itemsAnalysisPackage, itemsTtoService, itemsOther, medusaOrderId }: {
analysisOrder?: AnalysisOrder,
itemsAnalysisPackage: StoreOrderLineItem[],
itemsTtoService: StoreOrderLineItem[],
itemsOther: StoreOrderLineItem[],
medusaOrderId: string,
import { StoreOrderLineItem } from '@medusajs/types';
import { Eye } from 'lucide-react';
import { Trans } from '@kit/ui/makerkit/trans';
import type { AnalysisOrder } from '~/lib/types/analysis-order';
import OrderItemsTable from './order-items-table';
export default function OrderBlock({
analysisOrder,
itemsAnalysisPackage,
itemsTtoService,
itemsOther,
medusaOrderId,
}: {
analysisOrder?: AnalysisOrder;
itemsAnalysisPackage: StoreOrderLineItem[];
itemsTtoService: StoreOrderLineItem[];
itemsOther: StoreOrderLineItem[];
medusaOrderId: string;
}) {
return (
<div className="flex flex-col gap-4">
<h4>
<Trans i18nKey="analysis-results:orderTitle" values={{ orderNumber: medusaOrderId }} />
<Trans
i18nKey="analysis-results:orderTitle"
values={{ orderNumber: medusaOrderId }}
/>
</h4>
{analysisOrder && <div className="flex gap-2">
<h5>
<Trans i18nKey={`orders:status.${analysisOrder.status}`} />
</h5>
<Link href={`/home/order/${analysisOrder.id}`} className="flex items-center justify-between text-small-regular">
<button
className="flex gap-x-1 text-ui-fg-subtle hover:text-ui-fg-base cursor-pointer"
{analysisOrder && (
<div className="flex gap-2">
<h5>
<Trans i18nKey={`orders:status.${analysisOrder.status}`} />
</h5>
<Link
href={`/home/order/${analysisOrder.id}`}
className="text-small-regular flex items-center justify-between"
>
<Eye />
</button>
</Link>
</div>}
<button className="text-ui-fg-subtle hover:text-ui-fg-base flex cursor-pointer gap-x-1">
<Eye />
</button>
</Link>
</div>
)}
<div className="flex flex-col gap-4">
{analysisOrder && <OrderItemsTable items={itemsAnalysisPackage} title="orders:table.analysisPackage" analysisOrder={analysisOrder} />}
{itemsTtoService && <OrderItemsTable items={itemsTtoService} title="orders:table.ttoService" type='ttoService' />}
<OrderItemsTable items={itemsOther} title="orders:table.otherOrders" analysisOrder={analysisOrder} />
{analysisOrder && (
<OrderItemsTable
items={itemsAnalysisPackage}
title="orders:table.analysisPackage"
analysisOrder={analysisOrder}
/>
)}
{itemsTtoService && (
<OrderItemsTable
items={itemsTtoService}
title="orders:table.ttoService"
type="ttoService"
/>
)}
<OrderItemsTable
items={itemsOther}
title="orders:table.otherOrders"
analysisOrder={analysisOrder}
/>
</div>
</div>
)
);
}