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

Merge branch 'develop' into MED-49

Browse Source
This commit is contained in:
Danel Kungla
2025-09-26 17:23:09 +03:00
parent b674640bd8 f50f64ebcf
commit 4003284f3a
84 changed files with 1997 additions and 939 deletions
Download Patch File Download Diff File Expand all files Collapse all files

258
app/home/(user)/(dashboard)/cart/montonio-callback/actions.ts
View File

@@ -2,107 +2,13 @@
import { MontonioOrderToken } from '@/app/home/(user)/_components/cart/types';
import { loadCurrentUserAccount } from '@/app/home/(user)/_lib/server/load-user-account';
import { placeOrder, retrieveCart } from '@lib/data/cart';
import { listProductTypes } from '@lib/data/products';
import type { StoreOrder } from '@medusajs/types';
import { retrieveCart } from '@lib/data/cart';
import jwt from 'jsonwebtoken';
import { z } from 'zod';
import { AccountWithParams } from '@kit/accounts/types/accounts';
import { createNotificationsApi } from '@kit/notifications/api';
import { getSupabaseServerAdminClient } from '@kit/supabase/server-admin-client';
import { handlePlaceOrder } from '../../../_lib/server/cart-actions';
import { createI18nServerInstance } from '~/lib/i18n/i18n.server';
import { bookAppointment } from '~/lib/services/connected-online.service';
import { sendOrderToMedipost } from '~/lib/services/medipost/medipostPrivateMessage.service';
import { getOrderedAnalysisIds } from '~/lib/services/medusaOrder.service';
import {
createAnalysisOrder,
getAnalysisOrder,
} from '~/lib/services/order.service';
import { getOrderedTtoServices } from '~/lib/services/reservation.service';
import { FailureReason } from '~/lib/types/connected-online';
const ANALYSIS_PACKAGES_TYPE_HANDLE = 'analysis-packages';
const ANALYSIS_TYPE_HANDLE = 'synlab-analysis';
const MONTONIO_PAID_STATUS = 'PAID';
const env = () =>
z
.object({
emailSender: z
.string({
error: 'EMAIL_SENDER is required',
})
.min(1),
siteUrl: z
.string({
error: 'NEXT_PUBLIC_SITE_URL is required',
})
.min(1),
isEnabledDispatchOnMontonioCallback: z.boolean({
error: 'MEDIPOST_ENABLE_DISPATCH_ON_MONTONIO_CALLBACK is required',
}),
})
.parse({
emailSender: process.env.EMAIL_SENDER,
siteUrl: process.env.NEXT_PUBLIC_SITE_URL!,
isEnabledDispatchOnMontonioCallback:
process.env.MEDIPOST_ENABLE_DISPATCH_ON_MONTONIO_CALLBACK === 'true',
});
const sendEmail = async ({
account,
email,
analysisPackageName,
partnerLocationName,
language,
}: {
account: Pick<AccountWithParams, 'name' | 'id'>;
email: string;
analysisPackageName: string;
partnerLocationName: string;
language: string;
}) => {
const client = getSupabaseServerAdminClient();
try {
const { renderSynlabAnalysisPackageEmail } = await import(
'@kit/email-templates'
);
const { getMailer } = await import('@kit/mailers');
const mailer = await getMailer();
const { html, subject } = await renderSynlabAnalysisPackageEmail({
analysisPackageName,
personName: account.name,
partnerLocationName,
language,
});
await mailer
.sendEmail({
from: env().emailSender,
to: email,
subject,
html,
})
.catch((error) => {
throw new Error(`Failed to send email, message=${error}`);
});
await createNotificationsApi(client).createNotification({
account_id: account.id,
body: html,
});
await createNotificationsApi(client).createNotification({
account_id: account.id,
body: html,
});
} catch (error) {
throw new Error(`Failed to send email, message=${error}`);
}
};
async function decodeOrderToken(orderToken: string) {
const secretKey = process.env.MONTONIO_SECRET_KEY as string;
@@ -129,71 +35,6 @@ async function getCartByOrderToken(decoded: MontonioOrderToken) {
return cart;
}
async function getOrderResultParameters(medusaOrder: StoreOrder) {
const { productTypes } = await listProductTypes();
const analysisPackagesType = productTypes.find(
({ metadata }) => metadata?.handle === ANALYSIS_PACKAGES_TYPE_HANDLE,
);
const analysisType = productTypes.find(
({ metadata }) => metadata?.handle === ANALYSIS_TYPE_HANDLE,
);
const analysisPackageOrderItem = medusaOrder.items?.find(
({ product_type_id }) => product_type_id === analysisPackagesType?.id,
);
const analysisItems = medusaOrder.items?.filter(
({ product_type_id }) => product_type_id === analysisType?.id,
);
return {
medusaOrderId: medusaOrder.id,
email: medusaOrder.email,
analysisPackageOrder: analysisPackageOrderItem
? {
partnerLocationName:
(analysisPackageOrderItem?.metadata
?.partner_location_name as string) ?? '',
analysisPackageName: analysisPackageOrderItem?.title ?? '',
}
: null,
analysisItemsOrder:
Array.isArray(analysisItems) && analysisItems.length > 0
? analysisItems.map(({ product }) => ({
analysisName: product?.title ?? '',
analysisId: (product?.metadata?.analysisIdOriginal as string) ?? '',
}))
: null,
};
}
async function sendAnalysisPackageOrderEmail({
account,
email,
analysisPackageOrder,
}: {
account: AccountWithParams;
email: string;
analysisPackageOrder: {
partnerLocationName: string;
analysisPackageName: string;
};
}) {
const { language } = await createI18nServerInstance();
const { analysisPackageName, partnerLocationName } = analysisPackageOrder;
try {
await sendEmail({
account: { id: account.id, name: account.name },
email,
analysisPackageName,
partnerLocationName,
language,
});
console.info(`Successfully sent analysis package order email to ${email}`);
} catch (error) {
console.error('Failed to send email', error);
}
}
export async function processMontonioCallback(orderToken: string) {
const { account } = await loadCurrentUserAccount();
if (!account) {
@@ -203,99 +44,8 @@ export async function processMontonioCallback(orderToken: string) {
try {
const decoded = await decodeOrderToken(orderToken);
const cart = await getCartByOrderToken(decoded);
const medusaOrder = await placeOrder(cart.id, {
revalidateCacheTags: false,
});
const orderedAnalysisElements = await getOrderedAnalysisIds({
medusaOrder,
});
const orderContainsSynlabItems = !!orderedAnalysisElements?.length;
try {
const existingAnalysisOrder = await getAnalysisOrder({
medusaOrderId: medusaOrder.id,
});
console.info(
`Analysis order already exists for medusaOrderId=${medusaOrder.id}, orderId=${existingAnalysisOrder.id}`,
);
return { success: true, orderId: existingAnalysisOrder.id };
} catch {
// ignored
}
let orderId;
if (orderContainsSynlabItems) {
orderId = await createAnalysisOrder({
medusaOrder,
orderedAnalysisElements,
});
}
const orderResult = await getOrderResultParameters(medusaOrder);
const { medusaOrderId, email, analysisPackageOrder, analysisItemsOrder } =
orderResult;
const orderedTtoServices = await getOrderedTtoServices({ medusaOrder });
let bookServiceResults: {
success: boolean;
reason?: FailureReason;
serviceId?: number;
}[] = [];
if (orderedTtoServices?.length) {
const bookingPromises = orderedTtoServices.map((service) =>
bookAppointment(
service.service_id,
service.clinic_id,
service.service_user_id,
service.sync_user_id,
service.start_time,
),
);
bookServiceResults = await Promise.all(bookingPromises);
}
if (email) {
if (analysisPackageOrder) {
await sendAnalysisPackageOrderEmail({
account,
email,
analysisPackageOrder,
});
} else {
console.info(`Order has no analysis package, skipping email.`);
}
if (analysisItemsOrder) {
// @TODO send email for separate analyses
console.warn(
`Order has analysis items, but no email template exists yet`,
);
} else {
console.info(`Order has no analysis items, skipping email.`);
}
} else {
console.error('Missing email to send order result email', orderResult);
}
if (env().isEnabledDispatchOnMontonioCallback && orderContainsSynlabItems) {
await sendOrderToMedipost({ medusaOrderId, orderedAnalysisElements });
}
if (bookServiceResults.some(({ success }) => success === false)) {
const failedServiceBookings = bookServiceResults.filter(
({ success }) => success === false,
);
return {
success: false,
failedServiceBookings,
orderId,
};
}
return { success: true, orderId };
const result = await handlePlaceOrder({ cart });
return result;
} catch (error) {
console.error('Failed to place order', error);
throw new Error(`Failed to place order, message=${error}`);

25
app/home/(user)/(dashboard)/cart/page.tsx
View File

@@ -1,5 +1,3 @@
import { notFound } from 'next/navigation';
import { createI18nServerInstance } from '@/lib/i18n/i18n.server';
import { PageBody, PageHeader } from '@/packages/ui/src/makerkit/page';
import { retrieveCart } from '@lib/data/cart';
@@ -13,6 +11,8 @@ import { findProductTypeIdByHandle } from '~/lib/utils';
import Cart from '../../_components/cart';
import CartTimer from '../../_components/cart/cart-timer';
import { loadCurrentUserAccount } from '../../_lib/server/load-user-account';
import { AccountBalanceService } from '@kit/accounts/services/account-balance.service';
import { EnrichedCartItem } from '../../_components/cart/types';
export async function generateMetadata() {
@@ -24,12 +24,21 @@ export async function generateMetadata() {
}
async function CartPage() {
const cart = await retrieveCart().catch((error) => {
console.error('Failed to retrieve cart', error);
return notFound();
});
const [
cart,
{ productTypes },
{ account },
] = await Promise.all([
retrieveCart(),
listProductTypes(),
loadCurrentUserAccount(),
]);
const { productTypes } = await listProductTypes();
if (!account) {
return null;
}
const balanceSummary = await new AccountBalanceService().getBalanceSummary(account.id);
const synlabAnalysisTypeId = findProductTypeIdByHandle(
productTypes,
@@ -70,9 +79,11 @@ async function CartPage() {
{isTimerShown && <CartTimer cartItem={item} />}
</PageHeader>
<Cart
accountId={account.id}
cart={cart}
synlabAnalyses={synlabAnalyses}
ttoServiceItems={ttoServiceItems}
balanceSummary={balanceSummary}
/>
</PageBody>
);

81
app/home/(user)/(dashboard)/order/[orderId]/confirmed/order-confirmed-loading-wrapper.tsx Normal file
View File

@@ -0,0 +1,81 @@
'use client';
import CartTotals from '@/app/home/(user)/_components/order/cart-totals';
import OrderDetails from '@/app/home/(user)/_components/order/order-details';
import OrderItems from '@/app/home/(user)/_components/order/order-items';
import Divider from '@modules/common/components/divider';
import { PageBody, PageHeader } from '@kit/ui/page';
import { Trans } from '@kit/ui/trans';
import { StoreOrder } from '@medusajs/types';
import { AnalysisOrder } from '~/lib/types/analysis-order';
import { useEffect, useRef, useState } from 'react';
import { retrieveOrder } from '@lib/data/orders';
import { GlobalLoader } from '@kit/ui/makerkit/global-loader';
function OrderConfirmedLoadingWrapper({
medusaOrder: initialMedusaOrder,
order,
}: {
medusaOrder: StoreOrder;
order: AnalysisOrder;
}) {
const [medusaOrder, setMedusaOrder] = useState<StoreOrder>(initialMedusaOrder);
const fetchingRef = useRef(false);
const paymentStatus = medusaOrder.payment_status;
const medusaOrderId = order.medusa_order_id;
useEffect(() => {
if (paymentStatus === 'captured') {
return;
}
const interval = setInterval(async () => {
if (fetchingRef.current) {
return;
}
fetchingRef.current = true;
const medusaOrder = await retrieveOrder(medusaOrderId, false);
fetchingRef.current = false;
setMedusaOrder(medusaOrder);
}, 2_000);
return () => clearInterval(interval);
}, [paymentStatus, medusaOrderId]);
const isPaid = paymentStatus === 'captured';
if (!isPaid) {
return (
<PageBody>
<div className="flex flex-col justify-start items-center h-full pt-[10vh]">
<div>
<GlobalLoader />
</div>
<h4 className="text-center">
<Trans i18nKey="cart:orderConfirmed.paymentConfirmationLoading" />
</h4>
</div>
</PageBody>
);
}
return (
<PageBody>
<PageHeader title={<Trans i18nKey="cart:orderConfirmed.title" />} />
<Divider />
<div className="small:grid-cols-[1fr_360px] grid grid-cols-1 gap-x-40 gap-y-6 lg:px-4">
<OrderDetails order={order} />
<Divider />
<OrderItems medusaOrder={medusaOrder} />
<CartTotals medusaOrder={medusaOrder} />
</div>
</PageBody>
);
}
export default OrderConfirmedLoadingWrapper;

20
app/home/(user)/(dashboard)/order/[orderId]/confirmed/page.tsx
View File

@@ -1,18 +1,13 @@
import { redirect } from 'next/navigation';
import CartTotals from '@/app/home/(user)/_components/order/cart-totals';
import OrderDetails from '@/app/home/(user)/_components/order/order-details';
import OrderItems from '@/app/home/(user)/_components/order/order-items';
import { createI18nServerInstance } from '@/lib/i18n/i18n.server';
import { retrieveOrder } from '@lib/data/orders';
import Divider from '@modules/common/components/divider';
import { pathsConfig } from '@kit/shared/config';
import { PageBody, PageHeader } from '@kit/ui/page';
import { Trans } from '@kit/ui/trans';
import { withI18n } from '~/lib/i18n/with-i18n';
import { getAnalysisOrder } from '~/lib/services/order.service';
import OrderConfirmedLoadingWrapper from './order-confirmed-loading-wrapper';
export async function generateMetadata() {
const { t } = await createI18nServerInstance();
@@ -41,18 +36,7 @@ async function OrderConfirmedPage(props: {
redirect(pathsConfig.app.myOrders);
}
return (
<PageBody>
<PageHeader title={<Trans i18nKey="cart:orderConfirmed.title" />} />
<Divider />
<div className="small:grid-cols-[1fr_360px] grid grid-cols-1 gap-x-40 gap-y-6 lg:px-4">
<OrderDetails order={order} />
<Divider />
<OrderItems medusaOrder={medusaOrder} />
<CartTotals medusaOrder={medusaOrder} />
</div>
</PageBody>
);
return <OrderConfirmedLoadingWrapper medusaOrder={medusaOrder} order={order} />;
}
export default withI18n(OrderConfirmedPage);

19
app/home/(user)/(dashboard)/order/[orderId]/page.tsx
View File

@@ -26,17 +26,7 @@ async function OrderConfirmedPage(props: {
params: Promise<{ orderId: string }>;
}) {
const params = await props.params;
const order = await getAnalysisOrder({
analysisOrderId: Number(params.orderId),
}).catch(() => null);
if (!order) {
redirect(pathsConfig.app.myOrders);
}
const medusaOrder = await retrieveOrder(order.medusa_order_id).catch(
() => null,
);
const medusaOrder = await retrieveOrder(params.orderId).catch(() => null);
if (!medusaOrder) {
redirect(pathsConfig.app.myOrders);
}
@@ -46,7 +36,12 @@ async function OrderConfirmedPage(props: {
<PageHeader title={<Trans i18nKey="cart:order.title" />} />
<Divider />
<div className="small:grid-cols-[1fr_360px] grid grid-cols-1 gap-x-40 gap-y-6 lg:px-4">
<OrderDetails order={order} />
<OrderDetails
order={{
id: medusaOrder.id,
created_at: medusaOrder.created_at,
}}
/>
<Divider />
<OrderItems medusaOrder={medusaOrder} />
<CartTotals medusaOrder={medusaOrder} />

16
app/home/(user)/(dashboard)/order/page.tsx
View File

@@ -18,6 +18,8 @@ import { listOrders } from '~/medusa/lib/data/orders';
import { HomeLayoutPageHeader } from '../../_components/home-page-header';
import OrderBlock from '../../_components/orders/order-block';
const ORDERS_LIMIT = 50;
export async function generateMetadata() {
const { t } = await createI18nServerInstance();
@@ -27,10 +29,12 @@ export async function generateMetadata() {
}
async function OrdersPage() {
const medusaOrders = await listOrders();
const analysisOrders = await getAnalysisOrders();
const ttoOrders = await getTtoOrders();
const { productTypes } = await listProductTypes();
const [medusaOrders, analysisOrders, ttoOrders, { productTypes }] = await Promise.all([
listOrders(ORDERS_LIMIT),
getAnalysisOrders(),
getTtoOrders(),
listProductTypes(),
]);
if (!medusaOrders || !productTypes || !ttoOrders) {
redirect(pathsConfig.auth.signIn);
@@ -56,6 +60,7 @@ async function OrdersPage() {
const analysisOrder = analysisOrders.find(
({ medusa_order_id }) => medusa_order_id === medusaOrder.id,
);
if (!medusaOrder) {
return null;
}
@@ -81,6 +86,7 @@ async function OrdersPage() {
<OrderBlock
medusaOrderId={medusaOrder.id}
analysisOrder={analysisOrder}
medusaOrderStatus={medusaOrder.status}
itemsAnalysisPackage={medusaOrderItemsAnalysisPackages}
itemsTtoService={medusaOrderItemsTtoServices}
itemsOther={medusaOrderItemsOther}
@@ -88,7 +94,7 @@ async function OrdersPage() {
</React.Fragment>
);
})}
{analysisOrders.length === 0 && (
{analysisOrders.length === 0 && ttoOrders.length === 0 && (
<h5 className="mt-6">
<Trans i18nKey="orders:noOrders" />
</h5>

16
app/home/(user)/_components/booking/time-slots.tsx
View File

@@ -133,15 +133,17 @@ const TimeSlots = ({
return toast.error(t('booking:serviceNotFound'));
}
const bookTimePromise = updateReservationTime(
const bookTimePromise = updateReservationTime({
reservationId,
timeSlot.StartTime,
Number(syncedService.id),
timeSlot.UserID,
timeSlot.SyncUserID,
booking.selectedLocationId ? booking.selectedLocationId : null,
newStartTime: timeSlot.StartTime,
newServiceId: Number(syncedService.id),
newAppointmentUserId: timeSlot.UserID,
newSyncUserId: timeSlot.SyncUserID,
newLocationId: booking.selectedLocationId
? booking.selectedLocationId
: null,
cartId,
);
});
toast.promise(() => bookTimePromise, {
success: <Trans i18nKey={'booking:bookTimeSuccess'} />,

77
app/home/(user)/_components/cart/index.tsx
View File

@@ -2,9 +2,7 @@
import { useState } from 'react';
import { handleNavigateToPayment } from '@/lib/services/medusaCart.service';
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';
@@ -17,30 +15,39 @@ import AnalysisLocation from './analysis-location';
import CartItems from './cart-items';
import CartServiceItems from './cart-service-items';
import DiscountCode from './discount-code';
import { initiatePayment } from '../../_lib/server/cart-actions';
import { useRouter } from 'next/navigation';
import { AccountBalanceSummary } from '@kit/accounts/services/account-balance.service';
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 +67,38 @@ 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({
try {
const { url, isFullyPaidByBenefits, orderId, unavailableLineItemIds } = await initiatePayment({
accountId,
balanceSummary: balanceSummary!,
cart: cart!,
language,
paymentSessionId,
});
if (result.url) {
window.location.href = result.url;
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 +132,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 +148,24 @@ 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 +175,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 +211,6 @@ export default function Cart({
cart={{ ...cart }}
synlabAnalyses={synlabAnalyses}
/>
<AnalysisLocation
cart={{ ...cart }}
synlabAnalyses={synlabAnalyses}
/>
</CardContent>
</Card>
)}
@@ -192,7 +219,7 @@ export default function Cart({
<div>
<Button
className="h-10"
onClick={initiatePayment}
onClick={initiateSession}
disabled={isInitiatingSession}
>
{isInitiatingSession && (

55
app/home/(user)/_components/dashboard-cards.tsx
View File

@@ -3,12 +3,33 @@ import Link from 'next/link';
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 { Trans } from '@kit/ui/trans';
import { formatCurrency } from '@/packages/shared/src/utils';
import { createI18nServerInstance } from '@/lib/i18n/i18n.server';
import { cn } from '@kit/ui/lib/utils';
import { loadCurrentUserAccount } from '../_lib/server/load-user-account';
import { getAccountBalanceSummary } from '../_lib/server/balance-actions';
export default async function DashboardCards() {
const { language } = await createI18nServerInstance();
const { account } = await loadCurrentUserAccount();
const balanceSummary = account ? await getAccountBalanceSummary(account.id) : null;
export default function DashboardCards() {
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 +59,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>;
}

8
app/home/(user)/_components/dashboard.tsx
View File

@@ -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,7 @@ 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 +137,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;

52
app/home/(user)/_components/order/cart-totals.tsx
View File

@@ -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,16 @@ 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">
@@ -86,8 +96,11 @@ export default function CartTotals({
</span>
</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 +117,42 @@ 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>
);
}

10
app/home/(user)/_components/order/order-details.tsx
View File

@@ -2,16 +2,18 @@ import { formatDate } from 'date-fns';
import { Trans } from '@kit/ui/trans';
import type { AnalysisOrder } from '~/lib/types/analysis-order';
export default function OrderDetails({ order }: { order: AnalysisOrder }) {
export default function OrderDetails({
order,
}: {
order: { id: string; created_at: string | Date };
}) {
return (
<div className="flex flex-col gap-y-2">
<div>
<span className="font-bold">
<Trans i18nKey="cart:orderConfirmed.orderNumber" />:{' '}
</span>
<span>{order.medusa_order_id}</span>
<span className="break-all">{order.id}</span>
</div>
<div>

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

@@ -5,18 +5,20 @@ import { Eye } from 'lucide-react';
import { Trans } from '@kit/ui/makerkit/trans';
import type { AnalysisOrder } from '~/lib/types/analysis-order';
import type { AnalysisOrder } from '~/lib/types/order';
import OrderItemsTable from './order-items-table';
export default function OrderBlock({
analysisOrder,
medusaOrderStatus,
itemsAnalysisPackage,
itemsTtoService,
itemsOther,
medusaOrderId,
}: {
analysisOrder?: AnalysisOrder;
medusaOrderStatus: string;
itemsAnalysisPackage: StoreOrderLineItem[];
itemsTtoService: StoreOrderLineItem[];
itemsOther: StoreOrderLineItem[];
@@ -50,7 +52,11 @@ export default function OrderBlock({
<OrderItemsTable
items={itemsAnalysisPackage}
title="orders:table.analysisPackage"
analysisOrder={analysisOrder}
order={{
medusaOrderId: analysisOrder.medusa_order_id,
id: analysisOrder.id,
status: analysisOrder.status,
}}
/>
)}
{itemsTtoService && (
@@ -58,12 +64,18 @@ export default function OrderBlock({
items={itemsTtoService}
title="orders:table.ttoService"
type="ttoService"
order={{
status: medusaOrderStatus.toUpperCase(),
medusaOrderId,
}}
/>
)}
<OrderItemsTable
items={itemsOther}
title="orders:table.otherOrders"
analysisOrder={analysisOrder}
order={{
status: analysisOrder?.status,
}}
/>
</div>
</div>

30
app/home/(user)/_components/orders/order-items-table.tsx
View File

@@ -17,7 +17,7 @@ import {
} from '@kit/ui/table';
import { Trans } from '@kit/ui/trans';
import type { AnalysisOrder } from '~/lib/types/analysis-order';
import type { Order } from '~/lib/types/order';
import { logAnalysisResultsNavigateAction } from './actions';
@@ -26,12 +26,12 @@ export type OrderItemType = 'analysisOrder' | 'ttoService';
export default function OrderItemsTable({
items,
title,
analysisOrder,
order,
type = 'analysisOrder',
}: {
items: StoreOrderLineItem[];
title: string;
analysisOrder?: AnalysisOrder;
order: Order;
type?: OrderItemType;
}) {
const router = useRouter();
@@ -42,10 +42,12 @@ export default function OrderItemsTable({
const isAnalysisOrder = type === 'analysisOrder';
const openAnalysisResults = async () => {
if (analysisOrder) {
await logAnalysisResultsNavigateAction(analysisOrder.medusa_order_id);
router.push(`${pathsConfig.app.analysisResults}/${analysisOrder.id}`);
const openDetailedView = async () => {
if (isAnalysisOrder && order?.medusaOrderId && order?.id) {
await logAnalysisResultsNavigateAction(order.medusaOrderId);
router.push(`${pathsConfig.app.analysisResults}/${order.id}`);
} else {
router.push(`${pathsConfig.app.myOrders}/${order.medusaOrderId}`);
}
};
@@ -84,17 +86,15 @@ export default function OrderItemsTable({
<TableCell className="min-w-[180px] px-6">
<Trans
i18nKey={`orders:status.${type}.${analysisOrder?.status ?? 'CONFIRMED'}`}
i18nKey={`orders:status.${type}.${order?.status ?? 'CONFIRMED'}`}
/>
</TableCell>
{isAnalysisOrder && (
<TableCell className="px-6 text-right">
<Button size="sm" onClick={openAnalysisResults}>
<Trans i18nKey="analysis-results:view" />
</Button>
</TableCell>
)}
<TableCell className="px-6 text-right">
<Button size="sm" onClick={openDetailedView}>
<Trans i18nKey="analysis-results:view" />
</Button>
</TableCell>
</TableRow>
))}
</TableBody>

8
app/home/(user)/_lib/server/actions.ts
View File

@@ -23,16 +23,16 @@ export async function createInitialReservationAction(
});
if (addedItem) {
const reservation = await createInitialReservation(
const reservation = await createInitialReservation({
serviceId,
clinicId,
appointmentUserId,
syncUserId,
syncUserID: syncUserId,
startTime,
addedItem.id,
medusaLineItemId: addedItem.id,
locationId,
comments,
);
});
await updateLineItem({
lineId: addedItem.id,

13
app/home/(user)/_lib/server/balance-actions.ts Normal file
View File

@@ -0,0 +1,13 @@
'use server';
import { AccountBalanceService, AccountBalanceSummary } from '@kit/accounts/services/account-balance.service';
export async function getAccountBalanceSummary(accountId: string): Promise<AccountBalanceSummary | null> {
try {
const service = new AccountBalanceService();
return await service.getBalanceSummary(accountId);
} catch (error) {
console.error('Error getting account balance summary:', error);
return null;
}
}

347
app/home/(user)/_lib/server/cart-actions.ts Normal file
View File

@@ -0,0 +1,347 @@
'use server';
import { z } from 'zod';
import jwt from 'jsonwebtoken';
import type { StoreCart, StoreOrder } from "@medusajs/types";
import { initiateMultiPaymentSession, placeOrder } from "@lib/data/cart";
import type { AccountBalanceSummary } from "@kit/accounts/services/account-balance.service";
import { handleNavigateToPayment } from "~/lib/services/medusaCart.service";
import { loadCurrentUserAccount } from "./load-user-account";
import { getOrderedAnalysisIds } from "~/lib/services/medusaOrder.service";
import { createAnalysisOrder, getAnalysisOrder } from "~/lib/services/order.service";
import { listProductTypes } from "@lib/data";
import { sendOrderToMedipost } from "~/lib/services/medipost/medipostPrivateMessage.service";
import { AccountWithParams } from "@/packages/features/accounts/src/types/accounts";
import { createI18nServerInstance } from "~/lib/i18n/i18n.server";
import { getSupabaseServerAdminClient } from "@/packages/supabase/src/clients/server-admin-client";
import { createNotificationsApi } from "@/packages/features/notifications/src/server/api";
import { FailureReason } from '~/lib/types/connected-online';
import { getOrderedTtoServices } from '~/lib/services/reservation.service';
import { bookAppointment } from '~/lib/services/connected-online.service';
const ANALYSIS_PACKAGES_TYPE_HANDLE = 'analysis-packages';
const ANALYSIS_TYPE_HANDLE = 'synlab-analysis';
const env = () =>
z
.object({
emailSender: z
.string({
error: 'EMAIL_SENDER is required',
})
.min(1),
siteUrl: z
.string({
error: 'NEXT_PUBLIC_SITE_URL is required',
})
.min(1),
isEnabledDispatchOnMontonioCallback: z.boolean({
error: 'MEDIPOST_ENABLE_DISPATCH_ON_MONTONIO_CALLBACK is required',
}),
medusaBackendPublicUrl: z.string({
error: 'MEDUSA_BACKEND_PUBLIC_URL is required',
}).min(1),
companyBenefitsPaymentSecretKey: z.string({
error: 'COMPANY_BENEFITS_PAYMENT_SECRET_KEY is required',
}).min(1),
})
.parse({
emailSender: process.env.EMAIL_SENDER,
siteUrl: process.env.NEXT_PUBLIC_SITE_URL!,
isEnabledDispatchOnMontonioCallback:
process.env.MEDIPOST_ENABLE_DISPATCH_ON_MONTONIO_CALLBACK === 'true',
medusaBackendPublicUrl: process.env.MEDUSA_BACKEND_PUBLIC_URL!,
companyBenefitsPaymentSecretKey: process.env.COMPANY_BENEFITS_PAYMENT_SECRET_KEY!,
});
export const initiatePayment = async ({
accountId,
balanceSummary,
cart,
language,
}: {
accountId: string;
balanceSummary: AccountBalanceSummary;
cart: StoreCart;
language: string;
}) => {
try {
const {
montonioPaymentSessionId,
companyBenefitsPaymentSessionId,
totalByMontonio,
totalByBenefits,
isFullyPaidByBenefits,
} = await initiateMultiPaymentSession(cart, balanceSummary.totalBalance);
if (!isFullyPaidByBenefits) {
if (!montonioPaymentSessionId) {
throw new Error('Montonio payment session ID is missing');
}
const props = await handleNavigateToPayment({
language,
paymentSessionId: montonioPaymentSessionId,
amount: totalByMontonio,
currencyCode: cart.currency_code,
cartId: cart.id,
});
return { ...props, isFullyPaidByBenefits };
} else {
// place order if all paid already
const { orderId } = await handlePlaceOrder({ cart });
const companyBenefitsOrderToken = jwt.sign({
accountId,
companyBenefitsPaymentSessionId,
orderId,
totalByBenefits,
}, env().companyBenefitsPaymentSecretKey, {
algorithm: 'HS256',
});
const webhookResponse = await fetch(`${env().medusaBackendPublicUrl}/hooks/payment/company-benefits_company-benefits`, {
method: 'POST',
body: JSON.stringify({
orderToken: companyBenefitsOrderToken,
}),
headers: {
'Content-Type': 'application/json',
},
});
if (!webhookResponse.ok) {
throw new Error('Failed to send company benefits webhook');
}
return { isFullyPaidByBenefits, orderId, unavailableLineItemIds: [] };
}
} catch (error) {
console.error('Error initiating payment', error);
}
return { url: null, isFullyPaidByBenefits: false, orderId: null, unavailableLineItemIds: [] };
}
export async function handlePlaceOrder({
cart,
}: {
cart: StoreCart;
}) {
const { account } = await loadCurrentUserAccount();
if (!account) {
throw new Error('Account not found in context');
}
try {
const medusaOrder = await placeOrder(cart.id, {
revalidateCacheTags: false,
});
const orderedAnalysisElements = await getOrderedAnalysisIds({
medusaOrder,
});
const orderContainsSynlabItems = !!orderedAnalysisElements?.length;
try {
const existingAnalysisOrder = await getAnalysisOrder({
medusaOrderId: medusaOrder.id,
});
console.info(
`Analysis order already exists for medusaOrderId=${medusaOrder.id}, orderId=${existingAnalysisOrder.id}`,
);
return { success: true, orderId: existingAnalysisOrder.id };
} catch {
// ignored
}
let orderId: number | undefined = undefined;
if (orderContainsSynlabItems) {
orderId = await createAnalysisOrder({
medusaOrder,
orderedAnalysisElements,
});
}
const orderResult = await getOrderResultParameters(medusaOrder);
const { medusaOrderId, email, analysisPackageOrder, analysisItemsOrder } =
orderResult;
const orderedTtoServices = await getOrderedTtoServices({ medusaOrder });
let bookServiceResults: {
success: boolean;
reason?: FailureReason;
serviceId?: number;
}[] = [];
if (orderedTtoServices?.length) {
const bookingPromises = orderedTtoServices.map((service) =>
bookAppointment(
service.service_id,
service.clinic_id,
service.service_user_id,
service.sync_user_id,
service.start_time,
),
);
bookServiceResults = await Promise.all(bookingPromises);
}
if (email) {
if (analysisPackageOrder) {
await sendAnalysisPackageOrderEmail({
account,
email,
analysisPackageOrder,
});
} else {
console.info(`Order has no analysis package, skipping email.`);
}
if (analysisItemsOrder) {
// @TODO send email for separate analyses
console.warn(
`Order has analysis items, but no email template exists yet`,
);
} else {
console.info(`Order has no analysis items, skipping email.`);
}
} else {
console.error('Missing email to send order result email', orderResult);
}
if (env().isEnabledDispatchOnMontonioCallback) {
await sendOrderToMedipost({ medusaOrderId, orderedAnalysisElements });
}
if (bookServiceResults.some(({ success }) => success === false)) {
const failedServiceBookings = bookServiceResults.filter(
({ success }) => success === false,
);
return {
success: false,
failedServiceBookings,
orderId,
};
}
return { success: true, orderId };
} catch (error) {
console.error('Failed to place order', error);
throw new Error(`Failed to place order, message=${error}`);
}
}
async function sendAnalysisPackageOrderEmail({
account,
email,
analysisPackageOrder,
}: {
account: AccountWithParams;
email: string;
analysisPackageOrder: {
partnerLocationName: string;
analysisPackageName: string;
};
}) {
const { language } = await createI18nServerInstance();
const { analysisPackageName, partnerLocationName } = analysisPackageOrder;
try {
await sendEmail({
account: { id: account.id, name: account.name },
email,
analysisPackageName,
partnerLocationName,
language,
});
console.info(`Successfully sent analysis package order email to ${email}`);
} catch (error) {
console.error(
`Failed to send analysis package order email to ${email}`,
error,
);
}
}
async function getOrderResultParameters(medusaOrder: StoreOrder) {
const { productTypes } = await listProductTypes();
const analysisPackagesType = productTypes.find(
({ metadata }) => metadata?.handle === ANALYSIS_PACKAGES_TYPE_HANDLE,
);
const analysisType = productTypes.find(
({ metadata }) => metadata?.handle === ANALYSIS_TYPE_HANDLE,
);
const analysisPackageOrderItem = medusaOrder.items?.find(
({ product_type_id }) => product_type_id === analysisPackagesType?.id,
);
const analysisItems = medusaOrder.items?.filter(
({ product_type_id }) => product_type_id === analysisType?.id,
);
return {
medusaOrderId: medusaOrder.id,
email: medusaOrder.email,
analysisPackageOrder: analysisPackageOrderItem
? {
partnerLocationName:
(analysisPackageOrderItem?.metadata
?.partner_location_name as string) ?? '',
analysisPackageName: analysisPackageOrderItem?.title ?? '',
}
: null,
analysisItemsOrder:
Array.isArray(analysisItems) && analysisItems.length > 0
? analysisItems.map(({ product }) => ({
analysisName: product?.title ?? '',
analysisId: (product?.metadata?.analysisIdOriginal as string) ?? '',
}))
: null,
};
}
const sendEmail = async ({
account,
email,
analysisPackageName,
partnerLocationName,
language,
}: {
account: Pick<AccountWithParams, 'name' | 'id'>;
email: string;
analysisPackageName: string;
partnerLocationName: string;
language: string;
}) => {
const client = getSupabaseServerAdminClient();
try {
const { renderSynlabAnalysisPackageEmail } = await import(
'@kit/email-templates'
);
const { getMailer } = await import('@kit/mailers');
const mailer = await getMailer();
const { html, subject } = await renderSynlabAnalysisPackageEmail({
analysisPackageName,
personName: account.name,
partnerLocationName,
language,
});
await mailer
.sendEmail({
from: env().emailSender,
to: email,
subject,
html,
})
.catch((error) => {
throw new Error(`Failed to send email, message=${error}`);
});
await createNotificationsApi(client).createNotification({
account_id: account.id,
body: html,
});
} catch (error) {
throw new Error(`Failed to send email, message=${error}`);
}
};

3
app/home/(user)/_lib/server/is-valid-open-ai-env.ts
View File

@@ -1,9 +1,8 @@
import OpenAI from 'openai';
export const isValidOpenAiEnv = async () => {
const client = new OpenAI();
try {
const client = new OpenAI();
await client.models.list();
return true;
} catch (e) {