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

feat: create email template for TTO reservation confirmation

Browse Source 
feat: implement order notifications service with TTO reservation confirmation handling

feat: create migration for TTO booking email webhook trigger
This commit is contained in:
Danel Kungla
2025-09-30 16:05:43 +03:00
parent 4003284f3a
commit 72f6f2b716
56 changed files with 3692 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@ import { PageBody, PageHeader } from '@/packages/ui/src/makerkit/page';
import { retrieveCart } from '@lib/data/cart';
import { listProductTypes } from '@lib/data/products';
import { AccountBalanceService } from '@kit/accounts/services/account-balance.service';
import { Trans } from '@kit/ui/trans';
import { withI18n } from '~/lib/i18n/with-i18n';
@@ -11,9 +12,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';
import { loadCurrentUserAccount } from '../../_lib/server/load-user-account';
export async function generateMetadata() {
const { t } = await createI18nServerInstance();
@@ -24,11 +24,7 @@ export async function generateMetadata() {
}
async function CartPage() {
const [
cart,
{ productTypes },
{ account },
] = await Promise.all([
const [cart, { productTypes }, { account }] = await Promise.all([
retrieveCart(),
listProductTypes(),
loadCurrentUserAccount(),
@@ -38,7 +34,9 @@ async function CartPage() {
return null;
}
const balanceSummary = await new AccountBalanceService().getBalanceSummary(account.id);
const balanceSummary = await new AccountBalanceService().getBalanceSummary(
account.id,
);
const synlabAnalysisTypeId = findProductTypeIdByHandle(
productTypes,

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

@@ -1,18 +1,19 @@
'use client';
import { useEffect, useRef, useState } from 'react';
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 { retrieveOrder } from '@lib/data/orders';
import { StoreOrder } from '@medusajs/types';
import Divider from '@modules/common/components/divider';
import { GlobalLoader } from '@kit/ui/makerkit/global-loader';
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,
@@ -21,7 +22,8 @@ function OrderConfirmedLoadingWrapper({
medusaOrder: StoreOrder;
order: AnalysisOrder;
}) {
const [medusaOrder, setMedusaOrder] = useState<StoreOrder>(initialMedusaOrder);
const [medusaOrder, setMedusaOrder] =
useState<StoreOrder>(initialMedusaOrder);
const fetchingRef = useRef(false);
const paymentStatus = medusaOrder.payment_status;
@@ -52,7 +54,7 @@ function OrderConfirmedLoadingWrapper({
if (!isPaid) {
return (
<PageBody>
<div className="flex flex-col justify-start items-center h-full pt-[10vh]">
<div className="flex h-full flex-col items-center justify-start pt-[10vh]">
<div>
<GlobalLoader />
</div>

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

@@ -7,6 +7,7 @@ import { pathsConfig } from '@kit/shared/config';
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() {
@@ -36,7 +37,9 @@ async function OrderConfirmedPage(props: {
redirect(pathsConfig.app.myOrders);
}
return <OrderConfirmedLoadingWrapper medusaOrder={medusaOrder} order={order} />;
return (
<OrderConfirmedLoadingWrapper medusaOrder={medusaOrder} order={order} />
);
}
export default withI18n(OrderConfirmedPage);

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

@@ -29,12 +29,13 @@ export async function generateMetadata() {
}
async function OrdersPage() {
const [medusaOrders, analysisOrders, ttoOrders, { productTypes }] = await Promise.all([
listOrders(ORDERS_LIMIT),
getAnalysisOrders(),
getTtoOrders(),
listProductTypes(),
]);
const [medusaOrders, analysisOrders, ttoOrders, { productTypes }] =
await Promise.all([
listOrders(ORDERS_LIMIT),
getAnalysisOrders(),
getTtoOrders(),
listProductTypes(),
]);
if (!medusaOrders || !productTypes || !ttoOrders) {
redirect(pathsConfig.auth.signIn);

1
app/home/(user)/_components/booking/booking.provider.tsx
View File

@@ -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,

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

@@ -167,7 +167,7 @@ const TimeSlots = ({
return handleBookTime(timeSlot);
};
console.log('paginatedBookings', booking.isLoadingTimeSlots);
return (
<Skeleton
isLoading={booking.isLoadingTimeSlots}

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

@@ -2,22 +2,23 @@
import { useState } from 'react';
import { useRouter } from 'next/navigation';
import { formatCurrency } from '@/packages/shared/src/utils';
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';
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;
@@ -71,12 +72,13 @@ export default function Cart({
setIsInitiatingSession(true);
try {
const { url, isFullyPaidByBenefits, orderId, unavailableLineItemIds } = await initiatePayment({
accountId,
balanceSummary: balanceSummary!,
cart: cart!,
language,
});
const { url, isFullyPaidByBenefits, orderId, unavailableLineItemIds } =
await initiatePayment({
accountId,
balanceSummary: balanceSummary!,
cart: cart!,
language,
});
if (unavailableLineItemIds) {
setUnavailableLineItemIds(unavailableLineItemIds);
}
@@ -97,7 +99,10 @@ export default function Cart({
const isLocationsShown = synlabAnalyses.length > 0;
const companyBenefitsTotal = balanceSummary?.totalBalance ?? 0;
const montonioTotal = cart && companyBenefitsTotal > 0 ? cart.total - companyBenefitsTotal : cart.total;
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">
@@ -158,7 +163,10 @@ export default function Cart({
<div className={`sm:mr-[112px] sm:w-[50px]`}>
<p className="text-right text-sm">
{formatCurrency({
value: (companyBenefitsTotal > cart.total ? cart.total : companyBenefitsTotal),
value:
companyBenefitsTotal > cart.total
? cart.total
: companyBenefitsTotal,
currencyCode: cart.currency_code,
locale: language,
})}

7
app/home/(user)/_components/cart/types.ts
View File

@@ -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'

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

@@ -1,5 +1,7 @@
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';
@@ -11,25 +13,27 @@ import {
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 { Trans } from '@kit/ui/trans';
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;
const balanceSummary = account
? await getAccountBalanceSummary(account.id)
: null;
return (
<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"
@@ -79,7 +83,7 @@ export default async function DashboardCards() {
<Trans
i18nKey="dashboard:heroCard.benefits.validUntil"
values={{ date: '31.12.2025' }}
/>
/>
</CardDescription>
</CardContent>
</Card>

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

@@ -14,7 +14,10 @@ import {
User,
} from 'lucide-react';
import type { AccountWithParams, BmiThresholds } 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 {

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

@@ -9,8 +9,8 @@ import { useTranslation } from 'react-i18next';
import { Trans } from '@kit/ui/trans';
const PaymentProviderIds = {
COMPANY_BENEFITS: "pp_company-benefits_company-benefits",
MONTONIO: "pp_montonio_montonio",
COMPANY_BENEFITS: 'pp_company-benefits_company-benefits',
MONTONIO: 'pp_montonio_montonio',
};
export default function CartTotals({
@@ -30,10 +30,12 @@ export default function CartTotals({
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);
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>
@@ -96,7 +98,6 @@ export default function CartTotals({
</span>
</div>
)}
</div>
<div className="my-4 h-px w-full border-b border-gray-200" />
@@ -126,7 +127,10 @@ export default function CartTotals({
<span className="flex items-center gap-x-1">
<Trans i18nKey="cart:order.benefitsTotal" />
</span>
<span data-testid="cart-subtotal" data-value={companyBenefitsPayment.amount || 0}>
<span
data-testid="cart-subtotal"
data-value={companyBenefitsPayment.amount || 0}
>
-{' '}
{formatCurrency({
value: companyBenefitsPayment.amount ?? 0,
@@ -142,7 +146,10 @@ export default function CartTotals({
<span className="flex items-center gap-x-1">
<Trans i18nKey="cart:order.montonioTotal" />
</span>
<span data-testid="cart-subtotal" data-value={montonioPayment.amount || 0}>
<span
data-testid="cart-subtotal"
data-value={montonioPayment.amount || 0}
>
-{' '}
{formatCurrency({
value: montonioPayment.amount ?? 0,

9
app/home/(user)/_lib/server/balance-actions.ts
View File

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

110
app/home/(user)/_lib/server/cart-actions.ts
View File

@@ -1,25 +1,29 @@
'use server';
import { z } from 'zod';
import { AccountWithParams } from '@/packages/features/accounts/src/types/accounts';
import { createNotificationsApi } from '@/packages/features/notifications/src/server/api';
import { getSupabaseServerAdminClient } from '@/packages/supabase/src/clients/server-admin-client';
import { listProductTypes } from '@lib/data';
import { initiateMultiPaymentSession, placeOrder } from '@lib/data/cart';
import type { StoreCart, StoreOrder } from '@medusajs/types';
import jwt from 'jsonwebtoken';
import { z } from 'zod';
import type { StoreCart, StoreOrder } from "@medusajs/types";
import type { AccountBalanceSummary } from '@kit/accounts/services/account-balance.service';
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 { createI18nServerInstance } from '~/lib/i18n/i18n.server';
import { bookAppointment } from '~/lib/services/connected-online.service';
import { sendOrderToMedipost } from '~/lib/services/medipost/medipostPrivateMessage.service';
import { handleNavigateToPayment } from '~/lib/services/medusaCart.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';
import { loadCurrentUserAccount } from './load-user-account';
const ANALYSIS_PACKAGES_TYPE_HANDLE = 'analysis-packages';
const ANALYSIS_TYPE_HANDLE = 'synlab-analysis';
@@ -40,12 +44,16 @@ const env = () =>
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),
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,
@@ -53,7 +61,8 @@ const env = () =>
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!,
companyBenefitsPaymentSecretKey:
process.env.COMPANY_BENEFITS_PAYMENT_SECRET_KEY!,
});
export const initiatePayment = async ({
@@ -92,23 +101,30 @@ export const initiatePayment = async ({
// 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',
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');
}
@@ -118,14 +134,15 @@ export const initiatePayment = async ({
console.error('Error initiating payment', error);
}
return { url: null, isFullyPaidByBenefits: false, orderId: null, unavailableLineItemIds: [] };
}
return {
url: null,
isFullyPaidByBenefits: false,
orderId: null,
unavailableLineItemIds: [],
};
};
export async function handlePlaceOrder({
cart,
}: {
cart: StoreCart;
}) {
export async function handlePlaceOrder({ cart }: { cart: StoreCart }) {
const { account } = await loadCurrentUserAccount();
if (!account) {
throw new Error('Account not found in context');
@@ -184,6 +201,7 @@ export async function handlePlaceOrder({
);
bookServiceResults = await Promise.all(bookingPromises);
}
// TODO: SEND EMAIL
if (email) {
if (analysisPackageOrder) {

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

@@ -6,7 +6,7 @@ export const isValidOpenAiEnv = async () => {
await client.models.list();
return true;
} catch (e) {
console.log('No openAI env');
console.log('AI not enabled');
return false;
}
};