Merge branch 'develop' into MED-102

2025-09-30 18:08:04 +03:00
parent 52eac590a4 94de67f801
commit b967cecb80
104 changed files with 5607 additions and 1104 deletions
--- a/app/home/(user)/_components/booking/booking-container.tsx
+++ b/app/home/(user)/_components/booking/booking-container.tsx
@@ -32,7 +32,16 @@ const BookingContainer = ({
    <BookingProvider category={{ products }} service={cartItem?.product}>
      <div className="xs:flex-row flex max-h-full flex-col gap-6">
        <div className="flex flex-col">
-          <ServiceSelector products={products} />
+          <ServiceSelector
+            products={products.filter((product) => {
+              if (product.metadata?.serviceIds) {
+                return Array.isArray(
+                  JSON.parse(product.metadata.serviceIds as string),
+                );
+              }
+              return false;
+            })}
+          />
          <BookingCalendar />
          <LocationSelector />
        </div>
--- a/app/home/(user)/_components/booking/booking-pagination.tsx
+++ b/app/home/(user)/_components/booking/booking-pagination.tsx
@@ -0,0 +1,113 @@
+import React from 'react';
+
+import { useTranslation } from 'react-i18next';
+
+import { Trans } from '@kit/ui/makerkit/trans';
+import { cn } from '@kit/ui/shadcn';
+import { Button } from '@kit/ui/shadcn/button';
+
+const BookingPagination = ({
+  totalPages,
+  setCurrentPage,
+  currentPage,
+}: {
+  totalPages: number;
+  setCurrentPage: (page: number) => void;
+  currentPage: number;
+}) => {
+  const { t } = useTranslation();
+
+  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 (totalPages === 0) {
+    return (
+      <div className="wrap text-muted-foreground flex size-full content-center-safe justify-center-safe">
+        <p>{t('booking:noResults')}</p>
+      </div>
+    );
+  }
+
+  return (
+    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={() => setCurrentPage(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' && setCurrentPage(page)}
+              disabled={page === '...'}
+              className={cn(
+                'min-w-[2rem]',
+                page === '...' && 'cursor-default hover:bg-transparent',
+              )}
+            >
+              {page}
+            </Button>
+          ))}
+
+          <Button
+            variant="outline"
+            size="sm"
+            onClick={() => setCurrentPage(currentPage + 1)}
+            disabled={currentPage === totalPages}
+          >
+            <Trans i18nKey="common:next" defaultValue="Next" />
+          </Button>
+        </div>
+      </div>
+    )
+  );
+};
+
+export default BookingPagination;
--- a/app/home/(user)/_components/booking/booking.provider.tsx
+++ b/app/home/(user)/_components/booking/booking.provider.tsx
@@ -45,7 +45,6 @@ export const BookingProvider: React.FC<{
  const updateTimeSlots = async (serviceIds: number[]) => {
    setIsLoadingTimeSlots(true);
    try {
-      console.log('serviceIds', serviceIds, selectedLocationId);
      const response = await getAvailableTimeSlotsForDisplay(
        serviceIds,
        selectedLocationId,
--- a/app/home/(user)/_components/booking/time-slots.tsx
+++ b/app/home/(user)/_components/booking/time-slots.tsx
@@ -11,6 +11,7 @@ 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 { Skeleton } from '@kit/ui/shadcn/skeleton';
 import { toast } from '@kit/ui/sonner';
 import { Trans } from '@kit/ui/trans';
 import { cn } from '@kit/ui/utils';
@@ -19,6 +20,7 @@ import { updateReservationTime } from '~/lib/services/reservation.service';

 import { createInitialReservationAction } from '../../_lib/server/actions';
 import { EnrichedCartItem } from '../cart/types';
+import BookingPagination from './booking-pagination';
 import { ServiceProvider, TimeSlot } from './booking.context';
 import { useBooking } from './booking.provider';

@@ -68,57 +70,16 @@ const TimeSlots = ({
        }) ?? [],
        'StartTime',
        'asc',
-      ),
+      ).filter(({ StartTime }) => isSameDay(StartTime, selectedDate)),
    [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;
  }
@@ -143,12 +104,17 @@ const TimeSlots = ({
      timeSlot.StartTime,
      booking.selectedLocationId ? booking.selectedLocationId : null,
      comments,
-    ).then(() => {
-      if (onComplete) {
-        onComplete();
-      }
-      router.push(pathsConfig.app.cart);
-    });
+    )
+      .then(() => {
+        if (onComplete) {
+          onComplete();
+        }
+        router.push(pathsConfig.app.cart);
+      })
+      .catch((error) => {
+        console.error('Booking error: ', error);
+        throw error;
+      });

    toast.promise(() => bookTimePromise, {
      success: <Trans i18nKey={'booking:bookTimeSuccess'} />,
@@ -203,10 +169,13 @@ const TimeSlots = ({
  };

  return (
-    <div className="flex w-full flex-col gap-4">
+    <Skeleton
+      isLoading={booking.isLoadingTimeSlots}
+      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 isHaigeKassa = timeSlot.HKServiceID > 0;
          const serviceProviderTitle = getServiceProviderTitle(
            currentLocale,
            timeSlot.serviceProvider,
@@ -214,6 +183,7 @@ const TimeSlots = ({
          const price =
            booking.selectedService?.variants?.[0]?.calculated_price
              ?.calculated_amount ?? cartItem?.unit_price;
+
          return (
            <Card
              className="xs:flex xs:justify-between grid w-full justify-center-safe gap-3 p-4"
@@ -224,7 +194,7 @@ const TimeSlots = ({
                <div className="flex">
                  <h5
                    className={cn(
-                      (serviceProviderTitle || isEHIF) &&
+                      (serviceProviderTitle || isHaigeKassa) &&
                        "after:mx-2 after:content-['·']",
                    )}
                  >
@@ -232,12 +202,14 @@ const TimeSlots = ({
                  </h5>
                  {serviceProviderTitle && (
                    <span
-                      className={cn(isEHIF && "after:mx-2 after:content-['·']")}
+                      className={cn(
+                        isHaigeKassa && "after:mx-2 after:content-['·']",
+                      )}
                    >
                      {serviceProviderTitle}
                    </span>
                  )}
-                  {isEHIF && <span>{t('booking:ehifBooking')}</span>}
+                  {isHaigeKassa && <span>{t('booking:ehifBooking')}</span>}
                </div>
                <div className="flex text-xs">{timeSlot.location?.address}</div>
              </div>
@@ -256,63 +228,14 @@ const TimeSlots = ({
            </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>

-      {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>
-        </div>
-      )}
-    </div>
+      <BookingPagination
+        totalPages={Math.ceil(filteredBookings.length / PAGE_SIZE)}
+        setCurrentPage={setCurrentPage}
+        currentPage={currentPage}
+      />
+    </Skeleton>
  );
 };

--- a/app/home/(user)/_components/cart/index.tsx
+++ b/app/home/(user)/_components/cart/index.tsx
@@ -2,17 +2,19 @@

 import { useState } from 'react';

-import { handleNavigateToPayment } from '@/lib/services/medusaCart.service';
+import { useRouter } from 'next/navigation';
+
 import { formatCurrency } from '@/packages/shared/src/utils';
-import { initiatePaymentSession } from '@lib/data/cart';
 import { StoreCart, StoreCartLineItem } from '@medusajs/types';
 import { Loader2 } from 'lucide-react';
 import { useTranslation } from 'react-i18next';

+import { AccountBalanceSummary } from '@kit/accounts/services/account-balance.service';
 import { Button } from '@kit/ui/button';
 import { Card, CardContent, CardHeader } from '@kit/ui/card';
 import { Trans } from '@kit/ui/trans';

+import { initiatePayment } from '../../_lib/server/cart-actions';
 import AnalysisLocation from './analysis-location';
 import CartItems from './cart-items';
 import CartServiceItems from './cart-service-items';
@@ -22,25 +24,31 @@ import { EnrichedCartItem } from './types';
 const IS_DISCOUNT_SHOWN = true as boolean;

 export default function Cart({
+  accountId,
  cart,
  synlabAnalyses,
  ttoServiceItems,
+  balanceSummary,
 }: {
+  accountId: string;
  cart: StoreCart | null;
  synlabAnalyses: StoreCartLineItem[];
  ttoServiceItems: EnrichedCartItem[];
+  balanceSummary: AccountBalanceSummary | null;
 }) {
  const {
    i18n: { language },
  } = useTranslation();

  const [isInitiatingSession, setIsInitiatingSession] = useState(false);
+  const router = useRouter();
  const [unavailableLineItemIds, setUnavailableLineItemIds] =
    useState<string[]>();

  const items = cart?.items ?? [];
+  const hasCartItems = cart && Array.isArray(items) && items.length > 0;

-  if (!cart || items.length === 0) {
+  if (!hasCartItems) {
    return (
      <div className="content-container py-5 lg:px-4">
        <div>
@@ -60,32 +68,42 @@ export default function Cart({
    );
  }

-  async function initiatePayment() {
+  async function initiateSession() {
    setIsInitiatingSession(true);
-    const response = await initiatePaymentSession(cart!, {
-      provider_id: 'pp_montonio_montonio',
-    });
-    if (response.payment_collection) {
-      const { payment_sessions } = response.payment_collection;
-      const paymentSessionId = payment_sessions![0]!.id;
-      const result = await handleNavigateToPayment({
-        language,
-        paymentSessionId,
-      });
-      if (result.url) {
-        window.location.href = result.url;
+
+    try {
+      const { url, isFullyPaidByBenefits, orderId, unavailableLineItemIds } =
+        await initiatePayment({
+          accountId,
+          balanceSummary: balanceSummary!,
+          cart: cart!,
+          language,
+        });
+      if (unavailableLineItemIds) {
+        setUnavailableLineItemIds(unavailableLineItemIds);
      }
-      if (result.unavailableLineItemIds) {
-        setUnavailableLineItemIds(result.unavailableLineItemIds);
+      if (url) {
+        window.location.href = url;
+      } else if (isFullyPaidByBenefits) {
+        if (typeof orderId !== 'number') {
+          throw new Error('Order ID is missing');
+        }
+        router.push(`/home/order/${orderId}/confirmed`);
      }
-    } else {
+    } catch (error) {
+      console.error('Failed to initiate payment', error);
      setIsInitiatingSession(false);
    }
  }

-  const hasCartItems = Array.isArray(cart.items) && cart.items.length > 0;
  const isLocationsShown = synlabAnalyses.length > 0;

+  const companyBenefitsTotal = balanceSummary?.totalBalance ?? 0;
+  const montonioTotal =
+    cart && companyBenefitsTotal > 0
+      ? cart.total - companyBenefitsTotal
+      : cart.total;
+
  return (
    <div className="small:grid-cols-[1fr_360px] grid grid-cols-1 gap-x-40 lg:px-4">
      <div className="flex flex-col gap-y-6 bg-white">
@@ -119,7 +137,7 @@ export default function Cart({
              </p>
            </div>
          </div>
-          <div className="flex gap-x-4 px-4 py-2 sm:justify-end sm:px-6 sm:py-4">
+          <div className="flex gap-x-4 px-4 pt-2 sm:justify-end sm:px-6 sm:pt-4">
            <div className="w-full sm:mr-[42px] sm:w-auto">
              <p className="text-muted-foreground ml-0 text-sm font-bold">
                <Trans i18nKey="cart:order.promotionsTotal" />
@@ -135,6 +153,27 @@ export default function Cart({
              </p>
            </div>
          </div>
+          {companyBenefitsTotal > 0 && (
+            <div className="flex gap-x-4 px-4 py-2 sm:justify-end sm:px-6 sm:py-4">
+              <div className="w-full sm:mr-[42px] sm:w-auto">
+                <p className="text-muted-foreground ml-0 text-sm font-bold">
+                  <Trans i18nKey="cart:order.companyBenefitsTotal" />
+                </p>
+              </div>
+              <div className={`sm:mr-[112px] sm:w-[50px]`}>
+                <p className="text-right text-sm">
+                  {formatCurrency({
+                    value:
+                      companyBenefitsTotal > cart.total
+                        ? cart.total
+                        : companyBenefitsTotal,
+                    currencyCode: cart.currency_code,
+                    locale: language,
+                  })}
+                </p>
+              </div>
+            </div>
+          )}
          <div className="flex gap-x-4 px-4 sm:justify-end sm:px-6">
            <div className="w-full sm:mr-[42px] sm:w-auto">
              <p className="ml-0 text-sm font-bold">
@@ -144,7 +183,7 @@ export default function Cart({
            <div className={`sm:mr-[112px] sm:w-[50px]`}>
              <p className="text-right text-sm">
                {formatCurrency({
-                  value: cart.total,
+                  value: montonioTotal < 0 ? 0 : montonioTotal,
                  currencyCode: cart.currency_code,
                  locale: language,
                })}
@@ -180,10 +219,6 @@ export default function Cart({
                cart={{ ...cart }}
                synlabAnalyses={synlabAnalyses}
              />
-              <AnalysisLocation
-                cart={{ ...cart }}
-                synlabAnalyses={synlabAnalyses}
-              />
            </CardContent>
          </Card>
        )}
@@ -192,7 +227,7 @@ export default function Cart({
      <div>
        <Button
          className="h-10"
-          onClick={initiatePayment}
+          onClick={initiateSession}
          disabled={isInitiatingSession}
        >
          {isInitiatingSession && (
--- a/app/home/(user)/_components/cart/types.ts
+++ b/app/home/(user)/_components/cart/types.ts
@@ -1,5 +1,6 @@
-import { StoreCartLineItem } from "@medusajs/types";
-import { Reservation } from "~/lib/types/reservation";
+import { StoreCartLineItem } from '@medusajs/types';
+
+import { Reservation } from '~/lib/types/reservation';

 export interface MontonioOrderToken {
  uuid: string;
@@ -12,7 +13,7 @@ export interface MontonioOrderToken {
    | 'CANCELLED'
    | 'PENDING'
    | 'EXPIRED'
-    | 'REFUNDED';
+    | 'REFUNDED'
    | 'PAID'
    | 'FAILED'
    | 'CANCELLED'
--- a/app/home/(user)/_components/dashboard-cards.tsx
+++ b/app/home/(user)/_components/dashboard-cards.tsx
@@ -1,14 +1,39 @@
 import Link from 'next/link';

+import { createI18nServerInstance } from '@/lib/i18n/i18n.server';
+import { formatCurrency } from '@/packages/shared/src/utils';
 import { ChevronRight, HeartPulse } from 'lucide-react';

 import { Button } from '@kit/ui/button';
-import { Card, CardDescription, CardFooter, CardHeader } from '@kit/ui/card';
+import {
+  Card,
+  CardContent,
+  CardDescription,
+  CardFooter,
+  CardHeader,
+  CardTitle,
+} from '@kit/ui/card';
+import { cn } from '@kit/ui/lib/utils';
 import { Trans } from '@kit/ui/trans';

-export default function DashboardCards() {
+import { getAccountBalanceSummary } from '../_lib/server/balance-actions';
+import { loadCurrentUserAccount } from '../_lib/server/load-user-account';
+
+export default async function DashboardCards() {
+  const { language } = await createI18nServerInstance();
+
+  const { account } = await loadCurrentUserAccount();
+  const balanceSummary = account
+    ? await getAccountBalanceSummary(account.id)
+    : null;
+
  return (
-    <div className="flex gap-4">
+    <div
+      className={cn(
+        'grid grid-cols-1 gap-4',
+        'md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
+      )}
+    >
      <Card
        variant="gradient-success"
        className="xs:w-1/2 flex w-full flex-col justify-between sm:w-auto"
@@ -38,6 +63,34 @@ export default function DashboardCards() {
          </CardDescription>
        </CardFooter>
      </Card>
+
+      <Card className="flex flex-col justify-center">
+        <CardHeader>
+          <CardTitle size="h5">
+            <Trans i18nKey="dashboard:heroCard.benefits.title" />
+          </CardTitle>
+        </CardHeader>
+
+        <CardContent>
+          <Figure>
+            {formatCurrency({
+              value: balanceSummary?.totalBalance || 0,
+              locale: language,
+              currencyCode: 'EUR',
+            })}
+          </Figure>
+          <CardDescription>
+            <Trans
+              i18nKey="dashboard:heroCard.benefits.validUntil"
+              values={{ date: '31.12.2025' }}
+            />
+          </CardDescription>
+        </CardContent>
+      </Card>
    </div>
  );
 }
+
+function Figure(props: React.PropsWithChildren) {
+  return <div className={'text-3xl font-bold'}>{props.children}</div>;
+}
--- a/app/home/(user)/_components/dashboard.tsx
+++ b/app/home/(user)/_components/dashboard.tsx
@@ -2,7 +2,6 @@

 import Link from 'next/link';

-import { Database } from '@/packages/supabase/src/database.types';
 import { BlendingModeIcon, RulerHorizontalIcon } from '@radix-ui/react-icons';
 import { isNil } from 'lodash';
 import {
@@ -15,7 +14,10 @@ import {
  User,
 } from 'lucide-react';

-import type { AccountWithParams } from '@kit/accounts/types/accounts';
+import type {
+  AccountWithParams,
+  BmiThresholds,
+} from '@kit/accounts/types/accounts';
 import { pathsConfig } from '@kit/shared/config';
 import { Button } from '@kit/ui/button';
 import {
@@ -138,10 +140,7 @@ export default function Dashboard({
  bmiThresholds,
 }: {
  account: AccountWithParams;
-  bmiThresholds: Omit<
-    Database['medreport']['Tables']['bmi_thresholds']['Row'],
-    'id'
-  >[];
+  bmiThresholds: Omit<BmiThresholds, 'id'>[];
 }) {
  const height = account.accountParams?.height || 0;
  const weight = account.accountParams?.weight || 0;
--- a/app/home/(user)/_components/order/cart-totals.tsx
+++ b/app/home/(user)/_components/order/cart-totals.tsx
@@ -8,6 +8,11 @@ import { useTranslation } from 'react-i18next';

 import { Trans } from '@kit/ui/trans';

+const PaymentProviderIds = {
+  COMPANY_BENEFITS: 'pp_company-benefits_company-benefits',
+  MONTONIO: 'pp_montonio_montonio',
+};
+
 export default function CartTotals({
  medusaOrder,
 }: {
@@ -20,11 +25,18 @@ export default function CartTotals({
    currency_code,
    total,
    subtotal,
-    tax_total,
    discount_total,
    gift_card_total,
+    payment_collections,
  } = medusaOrder;

+  const montonioPayment = payment_collections?.[0]?.payments?.find(
+    ({ provider_id }) => provider_id === PaymentProviderIds.MONTONIO,
+  );
+  const companyBenefitsPayment = payment_collections?.[0]?.payments?.find(
+    ({ provider_id }) => provider_id === PaymentProviderIds.COMPANY_BENEFITS,
+  );
+
  return (
    <div>
      <div className="txt-medium text-ui-fg-subtle flex flex-col gap-y-2">
@@ -87,7 +99,9 @@ export default function CartTotals({
          </div>
        )}
      </div>
+
      <div className="my-4 h-px w-full border-b border-gray-200" />
+
      <div className="text-ui-fg-base txt-medium mb-2 flex items-center justify-between">
        <span className="font-bold">
          <Trans i18nKey="cart:order.total" />
@@ -104,7 +118,48 @@ export default function CartTotals({
          })}
        </span>
      </div>
-      <div className="mt-4 h-px w-full border-b border-gray-200" />
+
+      <div className="my-4 h-px w-full border-b border-gray-200" />
+
+      <div className="txt-medium text-ui-fg-subtle flex flex-col gap-y-2">
+        {companyBenefitsPayment && (
+          <div className="flex items-center justify-between">
+            <span className="flex items-center gap-x-1">
+              <Trans i18nKey="cart:order.benefitsTotal" />
+            </span>
+            <span
+              data-testid="cart-subtotal"
+              data-value={companyBenefitsPayment.amount || 0}
+            >
+              -{' '}
+              {formatCurrency({
+                value: companyBenefitsPayment.amount ?? 0,
+                currencyCode: currency_code,
+                locale: language,
+              })}
+            </span>
+          </div>
+        )}
+
+        {montonioPayment && (
+          <div className="flex items-center justify-between">
+            <span className="flex items-center gap-x-1">
+              <Trans i18nKey="cart:order.montonioTotal" />
+            </span>
+            <span
+              data-testid="cart-subtotal"
+              data-value={montonioPayment.amount || 0}
+            >
+              -{' '}
+              {formatCurrency({
+                value: montonioPayment.amount ?? 0,
+                currencyCode: currency_code,
+                locale: language,
+              })}
+            </span>
+          </div>
+        )}
+      </div>
    </div>
  );
 }
--- a/app/home/(user)/_components/order/order-details.tsx
+++ b/app/home/(user)/_components/order/order-details.tsx
@@ -2,8 +2,6 @@ import { formatDate } from 'date-fns';

 import { Trans } from '@kit/ui/trans';

-import type { AnalysisOrder } from '~/lib/types/order';
-
 export default function OrderDetails({
  order,
 }: {
@@ -15,7 +13,7 @@ export default function OrderDetails({
        <span className="font-bold">
          <Trans i18nKey="cart:orderConfirmed.orderNumber" />:{' '}
        </span>
-        <span>{order.id}</span>
+        <span className="break-all">{order.id}</span>
      </div>

      <div>