Merge branch 'develop' into MED-157
This commit is contained in:
@@ -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 {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -18,7 +18,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';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user