Merge branch 'develop' of https://github.com/MR-medreport/MRB2B into MED-103

This commit is contained in:
Helena
2025-09-17 18:17:01 +03:00
80 changed files with 4888 additions and 1558 deletions

View File

@@ -2,7 +2,7 @@
import Link from 'next/link';
import type { AccountWithParams } from '@/packages/features/accounts/src/server/api';
import type { AccountWithParams } from '@kit/accounts/types/accounts';
import { Database } from '@/packages/supabase/src/database.types';
import { BlendingModeIcon, RulerHorizontalIcon } from '@radix-ui/react-icons';
import {

View File

@@ -4,12 +4,12 @@ import { useMemo } from 'react';
import Link from 'next/link';
import SignOutDropdownItem from '@kit/shared/components/sign-out-dropdown-item';
import { StoreCart } from '@medusajs/types';
import { Cross, Menu, Shield, ShoppingCart } from 'lucide-react';
import { Cross, Menu, Shield, ShoppingCart, UserCircle } from 'lucide-react';
import { usePersonalAccountData } from '@kit/accounts/hooks/use-personal-account-data';
import { ApplicationRoleEnum } from '@kit/accounts/types/accounts';
import SignOutDropdownItem from '@kit/shared/components/sign-out-dropdown-item';
import DropdownLink from '@kit/shared/components/ui/dropdown-link';
import {
pathsConfig,
@@ -102,7 +102,14 @@ export function HomeMobileNavigation(props: {
<DropdownMenuSeparator />
</If>
<DropdownMenuGroup>{Links}</DropdownMenuGroup>
<DropdownMenuGroup>
{Links}
<DropdownLink
Icon={<UserCircle className="w-4 stroke-[1.5px]" />}
path={pathsConfig.app.personalAccountSettings}
label="common:routes.profile"
/>
</DropdownMenuGroup>
<If condition={isSuperAdmin}>
<DropdownMenuSeparator />
@@ -146,5 +153,3 @@ export function HomeMobileNavigation(props: {
</DropdownMenu>
);
}

View File

@@ -1,6 +1,6 @@
import { Trans } from '@kit/ui/trans';
import { formatDate } from 'date-fns';
import { AnalysisOrder } from "~/lib/services/order.service";
import type { AnalysisOrder } from "~/lib/types/analysis-order";
export default function OrderDetails({ order }: {
order: AnalysisOrder

View File

@@ -1,4 +1,4 @@
import { AnalysisOrder } from "~/lib/services/order.service";
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";

View File

@@ -17,7 +17,7 @@ import {
} from '@kit/ui/table';
import { Trans } from '@kit/ui/trans';
import { AnalysisOrder } from '~/lib/services/order.service';
import type { AnalysisOrder } from '~/lib/types/analysis-order';
import { logAnalysisResultsNavigateAction } from './actions';