MED-103: add booking functionality

2025-09-17 18:11:13 +03:00
parent 7c92b787ce
commit 22f7fa134b
44 changed files with 1923 additions and 479 deletions
--- a/app/home/(user)/_components/booking/booking-container.tsx
+++ b/app/home/(user)/_components/booking/booking-container.tsx
@@ -1,28 +1,57 @@
 'use client';

-import React from 'react';
+import { isBefore, isSameDay } from 'date-fns';
+import { uniq } from 'lodash';

 import { Calendar } from '@kit/ui/shadcn/calendar';
 import { Card } from '@kit/ui/shadcn/card';

 import { ServiceCategory } from '../service-categories';
-import { BookingProvider } from './booking.provider';
+import { BookingProvider, useBooking } from './booking.provider';
 import LocationSelector from './location-selector';
 import ServiceSelector from './service-selector';
 import TimeSlots from './time-slots';

+const BookingCalendar = () => {
+  const { selectedDate, setSelectedDate, isLoadingTimeSlots, timeSlots } =
+    useBooking();
+  const availableDates = uniq(timeSlots?.map((timeSlot) => timeSlot.StartTime));
+
+  return (
+    <Card className="mb-4">
+      <Calendar
+        mode="single"
+        selected={selectedDate}
+        onSelect={setSelectedDate}
+        disabled={(date) => {
+          const today = new Date();
+          today.setHours(0, 0, 0, 0);
+          return (
+            isBefore(date, today) ||
+            !availableDates.some((dateWithBooking) =>
+              isSameDay(date, dateWithBooking),
+            )
+          );
+        }}
+        className="rounded-md border"
+        {...(isLoadingTimeSlots && {
+          className: 'rounded-md border opacity-50 pointer-events-none',
+        })}
+      />
+    </Card>
+  );
+};
+
 const BookingContainer = ({ category }: { category: ServiceCategory }) => {
  return (
    <BookingProvider category={category}>
-      <div className="flex flex-row gap-6">
+      <div className="flex max-h-full flex-row gap-6">
        <div className="flex flex-col">
          <ServiceSelector products={category.products} />
-          <Card className="mb-4">
-            <Calendar />
-          </Card>
-          {/* <LocationSelector /> */}
+          <BookingCalendar />
+          <LocationSelector />
        </div>
-        <TimeSlots />
+        <TimeSlots countryCode={category.countryCode} />
      </div>
    </BookingProvider>
  );
--- a/app/home/(user)/_components/booking/booking.context.ts
+++ b/app/home/(user)/_components/booking/booking.context.ts
@@ -3,16 +3,75 @@ import { createContext } from 'react';
 import { StoreProduct } from '@medusajs/types';
 import { noop } from 'lodash';

+import { Tables } from '@kit/supabase/database';
+
+export type Location = Tables<
+  { schema: 'medreport' },
+  'connected_online_locations'
+>;
+
+export type TimeSlotResponse = {
+  timeSlots: TimeSlot[];
+  locations: Location[];
+};
+
+export type TimeSlot = {
+  ClinicID: number;
+  LocationID: number;
+  UserID: number;
+  SyncUserID: number;
+  ServiceID: number;
+  HKServiceID: number;
+  StartTime: Date;
+  EndTime: Date;
+  PayorCode: string;
+  serviceProvider?: ServiceProvider;
+  syncedService?: SyncedService;
+} & { location?: Location };
+
+export type ServiceProvider = {
+  name: string;
+  id: number;
+  jobTitleEn: string | null;
+  jobTitleEt: string | null;
+  jobTitleRu: string | null;
+  clinicId: number;
+};
+
+export type SyncedService = Tables<
+  { schema: 'medreport' },
+  'connected_online_services'
+> & {
+  providerClinic: ProviderClinic;
+};
+
+export type ProviderClinic = Tables<
+  { schema: 'medreport' },
+  'connected_online_providers'
+> & { locations: Location[] };
+
 const BookingContext = createContext<{
-  timeSlots: string[];
+  timeSlots: TimeSlot[] | null;
  selectedService: StoreProduct | null;
-  setSelectedService: (selectedService: any) => void;
+  locations: Location[] | null;
+  selectedLocationId: number | null;
+  selectedDate?: Date;
+  isLoadingTimeSlots?: boolean;
+  setSelectedService: (selectedService?: StoreProduct) => void;
+  setSelectedLocationId: (selectedLocationId: number | null) => void;
  updateTimeSlots: (serviceId: number) => Promise<void>;
+  setSelectedDate: (selectedDate?: Date) => void;
 }>({
-  timeSlots: [],
+  timeSlots: null,
  selectedService: null,
+  locations: null,
+  selectedLocationId: null,
+  selectedDate: new Date(),
+  isLoadingTimeSlots: false,
  setSelectedService: (_) => _,
+  setSelectedLocationId: (_) => _,
  updateTimeSlots: async (_) => noop(),
+  setSelectedDate: (_) => _,
 });

 export { BookingContext };
--- a/app/home/(user)/_components/booking/booking.provider.tsx
+++ b/app/home/(user)/_components/booking/booking.provider.tsx
@@ -1,14 +1,14 @@
-import React, { useState } from 'react';
+import React, { useContext, useEffect, useState } from 'react';

 import { StoreProduct } from '@medusajs/types';

-import { getAvailableAppointmentsForService } from '~/lib/services/connected-online.service';
+import { getAvailableTimeSlotsForDisplay } from '~/lib/services/connected-online.service';

 import { ServiceCategory } from '../service-categories';
-import { BookingContext } from './booking.context';
+import { BookingContext, Location, TimeSlot } from './booking.context';

 export function useBooking() {
-  const context = React.useContext(BookingContext);
+  const context = useContext(BookingContext);

  if (!context) {
    throw new Error('useBooking must be used within a BookingProvider.');
@@ -24,21 +24,54 @@ export const BookingProvider: React.FC<{
  const [selectedService, setSelectedService] = useState<StoreProduct | null>(
    category.products[0] || null,
  );
-  const [timeSlots, setTimeSlots] = useState<string[]>([]);
+  const [selectedLocationId, setSelectedLocationId] = useState<number | null>(
+    null,
+  );
+  const [selectedDate, setSelectedDate] = useState<Date>();
+  const [timeSlots, setTimeSlots] = useState<TimeSlot[] | null>(null);
+  const [locations, setLocations] = useState<Location[] | null>(null);
+  const [isLoadingTimeSlots, setIsLoadingTimeSlots] = useState<boolean>(false);

-  const updateTimeSlots = async (serviceId: number) => {
-    const response = await getAvailableAppointmentsForService(serviceId);
-    console.log('updateTimeSlots response', response);
-    // Fetch time slots based on the selected service ID
+  useEffect(() => {
+    let metadataServiceIds = [];
+    try {
+      metadataServiceIds = JSON.parse(
+        selectedService?.metadata?.serviceIds as string,
+      );
+    } catch (e) {
+      return;
+    }
+    if (metadataServiceIds.length) {
+      updateTimeSlots(metadataServiceIds);
+    }
+  }, [selectedService?.metadata?.serviceIds, selectedLocationId]);
+
+  const updateTimeSlots = async (serviceIds: number[]) => {
+    setIsLoadingTimeSlots(true);
+    try {
+      const response = await getAvailableTimeSlotsForDisplay(serviceIds, selectedLocationId);
+      setTimeSlots(response.timeSlots);
+      setLocations(response.locations)
+    } catch (error) {
+      setTimeSlots(null);
+    } finally {
+      setIsLoadingTimeSlots(false);
+    }
  };

  return (
    <BookingContext.Provider
      value={{
        timeSlots,
+        locations,
        selectedService,
+        selectedLocationId,
+        setSelectedLocationId,
+        selectedDate,
+        isLoadingTimeSlots,
        setSelectedService,
        updateTimeSlots,
+        setSelectedDate,
      }}
    >
      {children}
--- a/app/home/(user)/_components/booking/location-selector.tsx
+++ b/app/home/(user)/_components/booking/location-selector.tsx
@@ -1,9 +1,60 @@
-import React from 'react';
+import { Label } from '@medusajs/ui';
+import { useTranslation } from 'react-i18next';

+import { RadioGroup, RadioGroupItem } from '@kit/ui/radio-group';
 import { Card } from '@kit/ui/shadcn/card';
+import { Trans } from '@kit/ui/trans';
+
+import { useBooking } from './booking.provider';

 const LocationSelector = () => {
-  return <Card className="p-4">LocationSelector</Card>;
+  const { t } = useTranslation();
+  const {
+    selectedService,
+    selectedLocationId,
+    setSelectedLocationId,
+    locations,
+  } = useBooking();
+
+  const onLocationSelect = (locationId: number | string | null) => {
+    if (locationId === 'all') return setSelectedLocationId(null);
+    setSelectedLocationId(Number(locationId));
+  };
+
+  return (
+    <Card className="mb-4 p-4">
+      <h5 className="text-semibold mb-2">
+        <Trans i18nKey="booking:locations" />
+      </h5>
+      <div className="flex flex-col">
+        <RadioGroup
+          className="mb-2 flex flex-col"
+          onValueChange={(val) => onLocationSelect(val)}
+        >
+          <div className="flex items-center gap-2">
+            <RadioGroupItem
+              value={'all'}
+              id={'all'}
+              checked={selectedLocationId === null}
+            />
+            <Label htmlFor={'all'}>{t('booking:showAllLocations')}</Label>
+          </div>
+          {locations?.map((location) => (
+            <div key={location.sync_id} className="flex items-center gap-2">
+              <RadioGroupItem
+                value={location.sync_id.toString()}
+                id={location.sync_id.toString()}
+                checked={selectedLocationId === location.sync_id}
+              />
+              <Label htmlFor={location.sync_id.toString()}>
+                {location.name}
+              </Label>
+            </div>
+          ))}
+        </RadioGroup>
+      </div>
+    </Card>
+  );
 };

 export default LocationSelector;
--- a/app/home/(user)/_components/booking/service-selector.tsx
+++ b/app/home/(user)/_components/booking/service-selector.tsx
@@ -1,9 +1,8 @@
-import React, { useState } from 'react';
+import { useState } from 'react';

 import { StoreProduct } from '@medusajs/types';
-import { ArrowUp, ChevronDown } from 'lucide-react';
+import { ChevronDown } from 'lucide-react';

-import { Button } from '@kit/ui/shadcn/button';
 import { Card } from '@kit/ui/shadcn/card';
 import { Label } from '@kit/ui/shadcn/label';
 import {
@@ -12,27 +11,26 @@ import {
  PopoverTrigger,
 } from '@kit/ui/shadcn/popover';
 import { RadioGroup, RadioGroupItem } from '@kit/ui/shadcn/radio-group';
+import { Trans } from '@kit/ui/trans';

 import { useBooking } from './booking.provider';

 const ServiceSelector = ({ products }: { products: StoreProduct[] }) => {
-  const { selectedService, setSelectedService, updateTimeSlots } = useBooking();
-  const [collapsed, setCollapsed] = React.useState(false);
-  const [firstFourProducts, setFirstFourProducts] = useState<StoreProduct[]>(
-    products.slice(0, 4),
-  );
+  const { selectedService, setSelectedService } = useBooking();
+  const [collapsed, setCollapsed] = useState(false);
+  const [firstFourProducts] = useState<StoreProduct[]>(products.slice(0, 4));

  const onServiceSelect = async (productId: StoreProduct['id']) => {
    const product = products.find((p) => p.id === productId);
    setSelectedService(product);
    setCollapsed(false);
-    await updateTimeSlots((product!.metadata!.serviceId as number) || 0);
  };

-  console.log('selectedService', selectedService);
  return (
    <Card className="mb-4 p-4">
-      <h5 className="text-semibold mb-2">Teenused</h5>
+      <h5 className="text-semibold mb-2">
+        <Trans i18nKey="booking:services" />
+      </h5>
      <Popover open={collapsed} onOpenChange={setCollapsed}>
        <div className="flex flex-col">
          <RadioGroup
@@ -56,7 +54,9 @@ const ServiceSelector = ({ products }: { products: StoreProduct[] }) => {
              onClick={() => setCollapsed((_) => !_)}
              className="flex cursor-pointer items-center justify-between border-t py-1"
            >
-              <span>Kuva kõik</span>
+              <span>
+                <Trans i18nKey="booking:showAll" />
+              </span>
              <ChevronDown />
            </div>
          </PopoverTrigger>
--- a/app/home/(user)/_components/booking/time-slots.tsx
+++ b/app/home/(user)/_components/booking/time-slots.tsx
@@ -1,94 +1,257 @@
-import React from 'react';
+import { useMemo, useState } from 'react';
+
+import { useRouter } from 'next/navigation';

 import { formatCurrency } from '@/packages/shared/src/utils';
-import { format } from 'date-fns';
+import { addHours, isAfter, isSameDay } from 'date-fns';
+import { orderBy } from 'lodash';
+import { useTranslation } from 'react-i18next';

+import { pathsConfig } from '@kit/shared/config';
+import { formatDateAndTime } from '@kit/shared/utils';
 import { Button } from '@kit/ui/shadcn/button';
 import { Card } from '@kit/ui/shadcn/card';
+import { toast } from '@kit/ui/sonner';
 import { Trans } from '@kit/ui/trans';
+import { cn } from '@kit/ui/utils';

-import { AvailableAppointmentsResponse } from '~/lib/types/connected-online';
+import { createInitialReservationAction } from '../../_lib/server/actions';
+import { ServiceProvider, TimeSlot } from './booking.context';
+import { useBooking } from './booking.provider';

-const dummyData: AvailableAppointmentsResponse['Data']['T_Booking'] = [
-  {
-    ServiceID: 1,
-    StartTime: new Date('2024-10-10T10:00:00Z'),
-    EndTime: new Date('2024-10-10T11:00:00Z'),
-    HKServiceID: 0,
-    ClinicID: '',
-    LocationID: 0,
-    UserID: 0,
-    SyncUserID: 0,
-    PayorCode: '',
-  },
-  {
-    ServiceID: 1,
-    StartTime: new Date('2024-10-10T11:00:00Z'),
-    EndTime: new Date('2024-10-10T12:00:00Z'),
-    HKServiceID: 0,
-    ClinicID: '',
-    LocationID: 0,
-    UserID: 0,
-    SyncUserID: 0,
-    PayorCode: '',
-  },
-  {
-    ServiceID: 2,
-    StartTime: new Date('2024-10-10T12:00:00Z'),
-    EndTime: new Date('2024-10-10T13:00:00Z'),
-    HKServiceID: 0,
-    ClinicID: '',
-    LocationID: 0,
-    UserID: 0,
-    SyncUserID: 0,
-    PayorCode: '',
-  },
-];
+const getServiceProviderTitle = (
+  currentLocale: string,
+  serviceProvider?: ServiceProvider,
+) => {
+  if (!serviceProvider) return null;
+  if (currentLocale === 'en') return serviceProvider.jobTitleEn;
+  if (currentLocale === 'ru') return serviceProvider.jobTitleRu;
+
+  return serviceProvider.jobTitleEt;
+};
+
+const PAGE_SIZE = 7;
+
+const TimeSlots = ({ countryCode }: { countryCode: string }) => {
+  const [currentPage, setCurrentPage] = useState(1);
+
+  const {
+    t,
+    i18n: { language: currentLocale },
+  } = useTranslation();
+
+  const booking = useBooking();
+
+  const router = useRouter();
+
+  const selectedDate = booking.selectedDate ?? new Date();
+
+  const filteredBookings = useMemo(
+    () =>
+      orderBy(
+        booking?.timeSlots?.filter(({ StartTime }) => {
+          const firstAvailableTimeToSelect = isSameDay(selectedDate, new Date())
+            ? addHours(new Date(), 0.5)
+            : selectedDate;
+          return isAfter(StartTime, firstAvailableTimeToSelect);
+        }) ?? [],
+        'StartTime',
+        'asc',
+      ),
+    [booking.timeSlots, selectedDate],
+  );
+
+  const totalPages = Math.ceil(filteredBookings.length / PAGE_SIZE);
+
+  const paginatedBookings = useMemo(() => {
+    const startIndex = (currentPage - 1) * PAGE_SIZE;
+    const endIndex = startIndex + PAGE_SIZE;
+    return filteredBookings.slice(startIndex, endIndex);
+  }, [filteredBookings, currentPage, PAGE_SIZE]);
+
+  const handlePageChange = (page: number) => {
+    setCurrentPage(page);
+  };
+
+  const generatePageNumbers = () => {
+    const pages = [];
+    const maxVisiblePages = 5;
+
+    if (totalPages <= maxVisiblePages) {
+      for (let i = 1; i <= totalPages; i++) {
+        pages.push(i);
+      }
+    } else {
+      if (currentPage <= 3) {
+        for (let i = 1; i <= 4; i++) {
+          pages.push(i);
+        }
+        pages.push('...');
+        pages.push(totalPages);
+      } else if (currentPage >= totalPages - 2) {
+        pages.push(1);
+        pages.push('...');
+        for (let i = totalPages - 3; i <= totalPages; i++) {
+          pages.push(i);
+        }
+      } else {
+        pages.push(1);
+        pages.push('...');
+        for (let i = currentPage - 1; i <= currentPage + 1; i++) {
+          pages.push(i);
+        }
+        pages.push('...');
+        pages.push(totalPages);
+      }
+    }
+
+    return pages;
+  };
+
+  if (!booking?.timeSlots?.length) {
+    return null;
+  }
+
+  const handleBookTime = async (timeSlot: TimeSlot, comments?: string) => {
+    const selectedService = booking.selectedService;
+
+    const selectedVariant = selectedService?.variants?.[0];
+
+    const syncedService = timeSlot.syncedService;
+    if (!syncedService || !selectedVariant) {
+      return toast.error(t('booking:serviceNotFound'));
+    }
+
+    const bookTimePromise = createInitialReservationAction(
+      selectedVariant,
+      countryCode,
+      Number(syncedService.id),
+      syncedService?.clinic_id,
+      timeSlot.UserID,
+      timeSlot.SyncUserID,
+      timeSlot.StartTime,
+      booking.selectedLocationId ? booking.selectedLocationId : null,
+      comments,
+    ).then(() => {
+      router.push(pathsConfig.app.cart);
+    });
+
+    toast.promise(() => bookTimePromise, {
+      success: <Trans i18nKey={'booking:bookTimeSuccess'} />,
+      error: <Trans i18nKey={'booking:bookTimeError'} />,
+      loading: <Trans i18nKey={'booking:bookTimeLoading'} />,
+    });
+  };

-const TimeSlots = () => {
  return (
-    <div className="flex w-full flex-col gap-2">
-      {dummyData.map((data) => (
-        <Card
-          className="flex justify-between p-4"
-          key={data.ServiceID + '-time-slot'}
-        >
-          <div>
-            <span>{format(data.StartTime.toString(), 'HH:mm')}</span>
-            <div className="flex">
-              <h5 className="after:mx-2 after:content-['·']">
-                Dr. Jüri Mardikas
-              </h5>
-              <span className="after:mx-2 after:content-['·']">Kardioloog</span>
-              <span>Tervisekassa aeg</span>
-            </div>
-            <div className="flex text-xs">
-              <span className="after:mx-2 after:content-['·']">
-                Ülemiste Tervisemaja 2
-              </span>
-              <span className="after:mx-2 after:content-['·']">
-                Ülemiste füsioteraapiakliinik
-              </span>
-              <span className="after:mx-2 after:content-['·']">
-                Sepapaja 2/1
-              </span>
-              <span>Tallinn</span>
-            </div>
+    <div className="flex w-full flex-col gap-4">
+      <div className="flex h-full w-full flex-col gap-2 overflow-auto">
+        {paginatedBookings.map((timeSlot, index) => {
+          const isEHIF = timeSlot.HKServiceID > 0;
+          const serviceProviderTitle = getServiceProviderTitle(
+            currentLocale,
+            timeSlot.serviceProvider,
+          );
+          const price =
+            booking.selectedService?.variants?.[0]?.calculated_price
+              ?.calculated_amount;
+          return (
+            <Card className="flex justify-between p-4" key={index}>
+              <div>
+                <span>{formatDateAndTime(timeSlot.StartTime.toString())}</span>
+                <div className="flex">
+                  <h5
+                    className={cn(
+                      (serviceProviderTitle || isEHIF) &&
+                        "after:mx-2 after:content-['·']",
+                    )}
+                  >
+                    {timeSlot.serviceProvider?.name}
+                  </h5>
+                  {serviceProviderTitle && (
+                    <span
+                      className={cn(isEHIF && "after:mx-2 after:content-['·']")}
+                    >
+                      {serviceProviderTitle}
+                    </span>
+                  )}
+                  {isEHIF && <span>{t('booking:ehifBooking')}</span>}
+                </div>
+                <div className="flex text-xs">
+                  {timeSlot.location?.address}
+                </div>
+              </div>
+              <div className="flex-end flex items-center justify-center gap-2">
+                <span className="text-sm font-semibold">
+                  {formatCurrency({
+                    currencyCode: 'EUR',
+                    locale: 'et-EE',
+                    value: price ?? '',
+                  })}
+                </span>
+                <Button onClick={() => handleBookTime(timeSlot)} size="sm">
+                  <Trans i18nKey="common:book" />
+                </Button>
+              </div>
+            </Card>
+          );
+        })}
+
+        {!paginatedBookings.length && (
+          <div className="wrap text-muted-foreground flex size-full content-center-safe justify-center-safe">
+            <p>{t('booking:noResults')}</p>
          </div>
-          <div className="flex-end flex items-center justify-center gap-2">
-            <span className="text-sm font-semibold">
-              {formatCurrency({
-                currencyCode: 'EUR',
-                locale: 'et-EE',
-                value: 20,
-              })}
-            </span>
-            <Button>
-              <Trans i18nKey="Broneeri" />
+        )}
+      </div>
+
+      {totalPages > 1 && (
+        <div className="flex items-center justify-between">
+          <div className="text-muted-foreground text-sm">
+            {t('common:pageOfPages', {
+              page: currentPage,
+              total: totalPages,
+            })}
+          </div>
+
+          <div className="flex items-center gap-1">
+            <Button
+              variant="outline"
+              size="sm"
+              onClick={() => handlePageChange(currentPage - 1)}
+              disabled={currentPage === 1}
+            >
+              <Trans i18nKey="common:previous" defaultValue="Previous" />
+            </Button>
+
+            {generatePageNumbers().map((page, index) => (
+              <Button
+                key={index}
+                variant={page === currentPage ? 'default' : 'outline'}
+                size="sm"
+                onClick={() =>
+                  typeof page === 'number' && handlePageChange(page)
+                }
+                disabled={page === '...'}
+                className={cn(
+                  'min-w-[2rem]',
+                  page === '...' && 'cursor-default hover:bg-transparent',
+                )}
+              >
+                {page}
+              </Button>
+            ))}
+
+            <Button
+              variant="outline"
+              size="sm"
+              onClick={() => handlePageChange(currentPage + 1)}
+              disabled={currentPage === totalPages}
+            >
+              <Trans i18nKey="common:next" defaultValue="Next" />
            </Button>
          </div>
-        </Card>
-      ))}
+        </div>
+      )}
    </div>
  );
 };
--- a/app/home/(user)/_components/order-analyses-cards.tsx
+++ b/app/home/(user)/_components/order-analyses-cards.tsx
@@ -101,7 +101,6 @@ export default function OrderAnalysesCards({
                  {title}
                  {description && (
                    <>
-                      {'  '}
                      <InfoTooltip
                        content={
                          <div className='flex flex-col gap-2'>
--- a/app/home/(user)/_components/orders/order-block.tsx
+++ b/app/home/(user)/_components/orders/order-block.tsx
@@ -5,17 +5,19 @@ import OrderItemsTable from "./order-items-table";
 import Link from "next/link";
 import { Eye } from "lucide-react";

-export default function OrderBlock({ analysisOrder, itemsAnalysisPackage, itemsOther }: {
-  analysisOrder: AnalysisOrder,
+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: analysisOrder.medusa_order_id }} />
+        <Trans i18nKey="analysis-results:orderTitle" values={{ orderNumber: medusaOrderId }} />
      </h4>
-      <div className="flex gap-2">
+      {analysisOrder && <div className="flex gap-2">
        <h5>
          <Trans i18nKey={`orders:status.${analysisOrder.status}`} />
        </h5>
@@ -26,9 +28,10 @@ export default function OrderBlock({ analysisOrder, itemsAnalysisPackage, itemsO
            <Eye />
          </button>
        </Link>
-      </div>
+      </div>}
      <div className="flex flex-col gap-4">
-        <OrderItemsTable items={itemsAnalysisPackage} title="orders:table.analysisPackage" 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>
--- a/app/home/(user)/_components/orders/order-items-table.tsx
+++ b/app/home/(user)/_components/orders/order-items-table.tsx
@@ -4,7 +4,6 @@ import { useRouter } from 'next/navigation';

 import { StoreOrderLineItem } from '@medusajs/types';
 import { formatDate } from 'date-fns';
-import { Eye } from 'lucide-react';

 import { pathsConfig } from '@kit/shared/config';
 import { Button } from '@kit/ui/button';
@@ -22,14 +21,18 @@ import { AnalysisOrder } from '~/lib/services/order.service';

 import { logAnalysisResultsNavigateAction } from './actions';

+export type OrderItemType = 'analysisOrder' | 'ttoService';
+
 export default function OrderItemsTable({
  items,
  title,
  analysisOrder,
+  type = 'analysisOrder',
 }: {
  items: StoreOrderLineItem[];
  title: string;
-  analysisOrder: AnalysisOrder;
+  analysisOrder?: AnalysisOrder;
+  type?: OrderItemType;
 }) {
  const router = useRouter();

@@ -37,9 +40,13 @@ export default function OrderItemsTable({
    return null;
  }

+  const isAnalysisOrder = type === 'analysisOrder';
+
  const openAnalysisResults = async () => {
-    await logAnalysisResultsNavigateAction(analysisOrder.medusa_order_id);
-    router.push(`${pathsConfig.app.analysisResults}/${analysisOrder.id}`);
+    if (analysisOrder) {
+      await logAnalysisResultsNavigateAction(analysisOrder.medusa_order_id);
+      router.push(`${pathsConfig.app.analysisResults}/${analysisOrder.id}`);
+    }
  };

  return (
@@ -52,10 +59,10 @@ export default function OrderItemsTable({
          <TableHead className="px-6">
            <Trans i18nKey="orders:table.createdAt" />
          </TableHead>
-          <TableHead className="px-6">
+          <TableHead className={'px-6'}>
            <Trans i18nKey="orders:table.status" />
          </TableHead>
-          <TableHead className="px-6"></TableHead>
+          {isAnalysisOrder && <TableHead className="px-6"></TableHead>}
        </TableRow>
      </TableHeader>
      <TableBody>
@@ -65,7 +72,7 @@ export default function OrderItemsTable({
          )
          .map((orderItem) => (
            <TableRow className="w-full" key={orderItem.id}>
-              <TableCell className="text-left w-[100%] px-6">
+              <TableCell className="w-[100%] px-6 text-left">
                <p className="txt-medium-plus text-ui-fg-base">
                  {orderItem.product_title}
                </p>
@@ -76,14 +83,18 @@ export default function OrderItemsTable({
              </TableCell>

              <TableCell className="min-w-[180px] px-6">
-                <Trans i18nKey={`orders:status.${analysisOrder.status}`} />
+                <Trans
+                  i18nKey={`orders:status.${type}.${analysisOrder?.status ?? 'CONFIRMED'}`}
+                />
              </TableCell>

-              <TableCell className="px-6 text-right">
-                <Button size="sm" onClick={openAnalysisResults}>
-                  <Trans i18nKey="analysis-results:view" />
-                </Button>
-              </TableCell>
+              {isAnalysisOrder && (
+                <TableCell className="px-6 text-right">
+                  <Button size="sm" onClick={openAnalysisResults}>
+                    <Trans i18nKey="analysis-results:view" />
+                  </Button>
+                </TableCell>
+              )}
            </TableRow>
          ))}
      </TableBody>
--- a/app/home/(user)/_components/service-categories.tsx
+++ b/app/home/(user)/_components/service-categories.tsx
@@ -17,6 +17,7 @@ export interface ServiceCategory {
  color: string;
  description: string;
  products: StoreProduct[];
+  countryCode: string;
 }

 const ServiceCategories = ({