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

Merge branch 'develop' into MED-98

Browse Source
This commit is contained in:
Karli
2025-09-30 21:48:02 +03:00
parent 7931057714 5c09cdcc2f
commit d3442ae724
60 changed files with 3841 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/auth/update-account/_lib/server/update-account.ts
View File

@@ -16,7 +16,6 @@ export const onUpdateAccount = enhanceAction(
try {
await api.updateAccount(params);
console.log('SUCCESS', pathsConfig.auth.updateAccountSuccess);
} catch (err: unknown) {
if (err instanceof Error) {
console.warn('On update account error: ' + err.message);

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);

11
app/home/(user)/_components/booking/booking-container.tsx
View File

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

113
app/home/(user)/_components/booking/booking-pagination.tsx Normal file
View File

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

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,

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

@@ -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>
);
};

5
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;

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);

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

@@ -1,24 +1,27 @@
'use server';
import { z } from 'zod';
import type { StoreCart, StoreOrder } from '@medusajs/types';
import jwt from 'jsonwebtoken';
import type { StoreCart, StoreOrder } from "@medusajs/types";
import { z } from 'zod';
import { initiateMultiPaymentSession, placeOrder } from "@lib/data/cart";
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';
@@ -39,12 +42,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,
@@ -52,7 +59,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 ({
@@ -91,23 +99,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');
}
@@ -117,14 +132,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');
@@ -183,6 +199,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;
}
};

2
app/home/[account]/_components/team-account-health-details.tsx
View File

@@ -2,10 +2,10 @@ import React from 'react';
import { Database } from '@/packages/supabase/src/database.types';
import type { BmiThresholds } from '@kit/accounts/types/accounts';
import { Card } from '@kit/ui/card';
import { Trans } from '@kit/ui/trans';
import { cn } from '@kit/ui/utils';
import type { BmiThresholds } from '@kit/accounts/types/accounts';
import { getAccountHealthDetailsFields } from '../_lib/server/load-team-account-health-details';
import { TeamAccountStatisticsProps } from './team-account-statistics';

20
app/home/[account]/_components/team-account-statistics.tsx
View File

@@ -4,6 +4,11 @@ import { useState } from 'react';
import { redirect } from 'next/navigation';
import type {
Account,
AccountParams,
BmiThresholds,
} from '@/packages/features/accounts/src/types/accounts';
import { Database } from '@/packages/supabase/src/database.types';
import { format } from 'date-fns';
import { enGB, et } from 'date-fns/locale';
@@ -16,11 +21,10 @@ import { Trans } from '@kit/ui/makerkit/trans';
import { Button } from '@kit/ui/shadcn/button';
import { DateRange } from '@kit/ui/shadcn/calendar';
import { TeamAccountBenefitExpensesOverview } from '../_lib/server/load-team-account-benefit-expenses-overview';
import { AccountBenefitStatistics } from '../_lib/server/load-team-account-benefit-statistics';
import TeamAccountBenefitStatistics from './team-account-benefit-statistics';
import TeamAccountHealthDetails from './team-account-health-details';
import type { Account, AccountParams, BmiThresholds } from '@/packages/features/accounts/src/types/accounts';
import { TeamAccountBenefitExpensesOverview } from '../_lib/server/load-team-account-benefit-expenses-overview';
export interface TeamAccountStatisticsProps {
teamAccount: Account;
@@ -53,7 +57,7 @@ export default function TeamAccountStatistics({
return (
<>
<div className="mt-4 flex flex-col gap-4 sm:gap-0 sm:flex-row items-center justify-between">
<div className="mt-4 flex flex-col items-center justify-between gap-4 sm:flex-row sm:gap-0">
<h4 className="font-bold">
<Trans
i18nKey={'teams:home.headerTitle'}
@@ -78,7 +82,10 @@ export default function TeamAccountStatistics({
'animate-in fade-in flex flex-col space-y-4 pb-36 duration-500'
}
>
<TeamAccountBenefitStatistics accountBenefitStatistics={accountBenefitStatistics} expensesOverview={expensesOverview} />
<TeamAccountBenefitStatistics
accountBenefitStatistics={accountBenefitStatistics}
expensesOverview={expensesOverview}
/>
<h5 className="mt-4 mb-2">
<Trans i18nKey="teams:home.healthDetails" />
@@ -125,10 +132,7 @@ export default function TeamAccountStatistics({
className="border-warning/40 hover:bg-warning/20 relative flex h-full cursor-pointer flex-col justify-center px-6 py-4 transition-colors"
onClick={() =>
redirect(
createPath(
pathsConfig.app.accountBilling,
teamAccount.slug!,
),
createPath(pathsConfig.app.accountBilling, teamAccount.slug!),
)
}
>

24
app/home/[account]/_lib/server/load-team-account-benefit-expenses-overview.ts
View File

@@ -1,5 +1,6 @@
import { getSupabaseServerClient } from "@/packages/supabase/src/clients/server-client";
import { loadCompanyPersonalAccountsBalanceEntries } from "./load-team-account-benefit-statistics";
import { getSupabaseServerClient } from '@/packages/supabase/src/clients/server-client';
import { loadCompanyPersonalAccountsBalanceEntries } from './load-team-account-benefit-statistics';
export interface TeamAccountBenefitExpensesOverview {
benefitAmount: number | null;
@@ -10,7 +11,7 @@ export interface TeamAccountBenefitExpensesOverview {
total: number;
}
const MANAGEMENT_FEE = 5.50;
const MANAGEMENT_FEE = 5.5;
const MONTHS = 12;
const QUARTERS = 4;
@@ -32,15 +33,19 @@ export async function loadTeamAccountBenefitExpensesOverview({
.single();
let benefitAmount: TeamAccountBenefitExpensesOverview['benefitAmount'] = null;
let benefitOccurrence: TeamAccountBenefitExpensesOverview['benefitOccurrence'] = null;
let benefitOccurrence: TeamAccountBenefitExpensesOverview['benefitOccurrence'] =
null;
if (error) {
console.warn('Failed to load team account benefit expenses overview');
} else {
benefitAmount = data.benefit_amount as TeamAccountBenefitExpensesOverview['benefitAmount'];
benefitOccurrence = data.benefit_occurrence as TeamAccountBenefitExpensesOverview['benefitOccurrence'];
benefitAmount =
data.benefit_amount as TeamAccountBenefitExpensesOverview['benefitAmount'];
benefitOccurrence =
data.benefit_occurrence as TeamAccountBenefitExpensesOverview['benefitOccurrence'];
}
const { purchaseEntriesTotal } = await loadCompanyPersonalAccountsBalanceEntries({ accountId: companyId });
const { purchaseEntriesTotal } =
await loadCompanyPersonalAccountsBalanceEntries({ accountId: companyId });
return {
benefitAmount,
@@ -55,7 +60,8 @@ export async function loadTeamAccountBenefitExpensesOverview({
const currentDate = new Date();
const createdAt = new Date(data.created_at);
const isCreatedThisYear = createdAt.getFullYear() === currentDate.getFullYear();
const isCreatedThisYear =
createdAt.getFullYear() === currentDate.getFullYear();
if (benefitOccurrence === 'yearly') {
return benefitAmount * employeeCount;
} else if (benefitOccurrence === 'monthly') {
@@ -71,5 +77,5 @@ export async function loadTeamAccountBenefitExpensesOverview({
}
return 0;
})(),
}
};
}

36
app/home/[account]/_lib/server/load-team-account-benefit-statistics.ts
View File

@@ -16,7 +16,7 @@ export interface AccountBenefitStatistics {
analysisPackagesCount: number;
analysisPackagesSum: number;
}
};
}
export const loadCompanyPersonalAccountsBalanceEntries = async ({
@@ -38,12 +38,21 @@ export const loadCompanyPersonalAccountsBalanceEntries = async ({
.from('account_balance_entries')
.select('*')
.eq('is_active', true)
.in('account_id', accountMemberships.map(({ user_id }) => user_id))
.in(
'account_id',
accountMemberships.map(({ user_id }) => user_id),
)
.throwOnError();
const purchaseEntries = accountBalanceEntries.filter(({ entry_type }) => entry_type === 'purchase');
const analysesEntries = purchaseEntries.filter(({ is_analysis_order }) => is_analysis_order);
const analysisPackagesEntries = purchaseEntries.filter(({ is_analysis_package_order }) => is_analysis_package_order);
const purchaseEntries = accountBalanceEntries.filter(
({ entry_type }) => entry_type === 'purchase',
);
const analysesEntries = purchaseEntries.filter(
({ is_analysis_order }) => is_analysis_order,
);
const analysisPackagesEntries = purchaseEntries.filter(
({ is_analysis_package_order }) => is_analysis_package_order,
);
return {
accountBalanceEntries,
@@ -51,9 +60,12 @@ export const loadCompanyPersonalAccountsBalanceEntries = async ({
analysisPackagesEntries,
companyAccountsCount: count || 0,
purchaseEntries,
purchaseEntriesTotal: purchaseEntries.reduce((acc, { amount }) => acc + Math.abs(amount || 0), 0),
purchaseEntriesTotal: purchaseEntries.reduce(
(acc, { amount }) => acc + Math.abs(amount || 0),
0,
),
};
}
};
export const loadAccountBenefitStatistics = async (
accountId: string,
@@ -86,10 +98,16 @@ export const loadAccountBenefitStatistics = async (
totalSum: purchaseEntriesTotal,
analysesCount: analysesEntries.length,
analysesSum: analysesEntries.reduce((acc, { amount }) => acc + Math.abs(amount || 0), 0),
analysesSum: analysesEntries.reduce(
(acc, { amount }) => acc + Math.abs(amount || 0),
0,
),
analysisPackagesCount: analysisPackagesEntries.length,
analysisPackagesSum: analysisPackagesEntries.reduce((acc, { amount }) => acc + Math.abs(amount || 0), 0),
analysisPackagesSum: analysisPackagesEntries.reduce(
(acc, { amount }) => acc + Math.abs(amount || 0),
0,
),
},
};
};

3
app/home/[account]/_lib/server/load-team-account-health-details.ts
View File

@@ -4,6 +4,8 @@ import { Database } from '@/packages/supabase/src/database.types';
import Isikukood from 'isikukood';
import { Clock, TrendingUp, User } from 'lucide-react';
import type { BmiThresholds } from '@kit/accounts/types/accounts';
import {
bmiFromMetric,
getBmiBackgroundColor,
@@ -11,7 +13,6 @@ import {
} from '~/lib/utils';
import { TeamAccountStatisticsProps } from '../../_components/team-account-statistics';
import type { BmiThresholds } from '@kit/accounts/types/accounts';
interface AccountHealthDetailsField {
title: string;

16
app/home/[account]/billing/_components/health-benefit-form-client.tsx
View File

@@ -1,11 +1,17 @@
'use client';
import { useState } from 'react';
import { useRouter } from 'next/navigation';
import { UpdateHealthBenefitSchema } from '@/packages/billing/core/src/schema';
import {
Account,
CompanyParams,
} from '@/packages/features/accounts/src/types/accounts';
import { zodResolver } from '@hookform/resolvers/zod';
import { useForm } from 'react-hook-form';
import { useTranslation } from 'react-i18next';
import { Button } from '@kit/ui/button';
import { Form } from '@kit/ui/form';
@@ -17,8 +23,6 @@ import { cn } from '~/lib/utils';
import { updateHealthBenefit } from '../_lib/server/server-actions';
import HealthBenefitFields from './health-benefit-fields';
import { Account, CompanyParams } from '@/packages/features/accounts/src/types/accounts';
import { useTranslation } from 'react-i18next';
const HealthBenefitFormClient = ({
account,
@@ -29,7 +33,7 @@ const HealthBenefitFormClient = ({
}) => {
const { t } = useTranslation('account');
const router = useRouter();
const [currentCompanyParams, setCurrentCompanyParams] =
useState<CompanyParams>(companyParams);
const [isLoading, setIsLoading] = useState<boolean>(false);
@@ -42,7 +46,7 @@ const HealthBenefitFormClient = ({
amount: currentCompanyParams.benefit_amount || 0,
},
});
const isDirty = form.formState.isDirty;
const onSubmit = (data: { occurrence: string; amount: number }) => {
@@ -75,7 +79,7 @@ const HealthBenefitFormClient = ({
onSubmit={form.handleSubmit(onSubmit)}
>
<HealthBenefitFields />
<Button
type="submit"
className="relative"
@@ -96,5 +100,3 @@ const HealthBenefitFormClient = ({
};
export default HealthBenefitFormClient;

17
app/home/[account]/billing/_components/health-benefit-form.tsx
View File

@@ -1,12 +1,15 @@
import {
Account,
CompanyParams,
} from '@/packages/features/accounts/src/types/accounts';
import { PiggyBankIcon } from 'lucide-react';
import { Separator } from '@kit/ui/shadcn/separator';
import { Trans } from '@kit/ui/trans';
import { TeamAccountBenefitExpensesOverview } from '../../_lib/server/load-team-account-benefit-expenses-overview';
import HealthBenefitFormClient from './health-benefit-form-client';
import YearlyExpensesOverview from './yearly-expenses-overview';
import { TeamAccountBenefitExpensesOverview } from '../../_lib/server/load-team-account-benefit-expenses-overview';
import { Account, CompanyParams } from '@/packages/features/accounts/src/types/accounts';
const HealthBenefitForm = async ({
account,
@@ -31,9 +34,9 @@ const HealthBenefitForm = async ({
</h4>
</div>
</div>
<div className="flex flex-col-reverse sm:flex-row gap-6">
<div className="border-border w-full sm:w-1/3 rounded-lg border">
<div className="flex flex-col-reverse gap-6 sm:flex-row">
<div className="border-border w-full rounded-lg border sm:w-1/3">
<div className="p-6">
<div className="flex h-16 w-16 items-center justify-center rounded-full bg-orange-100">
<PiggyBankIcon className="h-[32px] w-[32px] stroke-orange-400 stroke-2" />
@@ -46,7 +49,7 @@ const HealthBenefitForm = async ({
<Separator />
<div className="p-6">
<HealthBenefitFormClient
<HealthBenefitFormClient
account={account}
companyParams={companyParams}
/>
@@ -58,7 +61,7 @@ const HealthBenefitForm = async ({
employeeCount={employeeCount}
expensesOverview={expensesOverview}
/>
<p className="text-muted-foreground text-sm">
<Trans i18nKey="billing:healthBenefitForm.info" />
</p>

14
app/home/[account]/billing/_components/yearly-expenses-overview.tsx
View File

@@ -1,9 +1,11 @@
'use client';
import { formatCurrency } from '@/packages/shared/src/utils';
import { useTranslation } from 'react-i18next';
import { Trans } from '@kit/ui/makerkit/trans';
import { Separator } from '@kit/ui/separator';
import { formatCurrency } from '@/packages/shared/src/utils';
import { useTranslation } from 'react-i18next';
import { TeamAccountBenefitExpensesOverview } from '../../_lib/server/load-team-account-benefit-expenses-overview';
const YearlyExpensesOverview = ({
@@ -13,7 +15,9 @@ const YearlyExpensesOverview = ({
employeeCount?: number;
expensesOverview: TeamAccountBenefitExpensesOverview;
}) => {
const { i18n: { language } } = useTranslation();
const {
i18n: { language },
} = useTranslation();
return (
<div className="border-border rounded-lg border p-6">
@@ -24,9 +28,7 @@ const YearlyExpensesOverview = ({
<p className="text-sm font-medium">
<Trans i18nKey="billing:expensesOverview.employeeCount" />
</p>
<span className="text-primary text-sm font-bold">
{employeeCount}
</span>
<span className="text-primary text-sm font-bold">{employeeCount}</span>
</div>
<div className="mt-3 flex justify-between">
<p className="text-sm font-medium">

2
app/home/[account]/billing/page.tsx
View File

@@ -6,8 +6,8 @@ import { PageBody } from '@kit/ui/page';
import { createI18nServerInstance } from '~/lib/i18n/i18n.server';
import { withI18n } from '~/lib/i18n/with-i18n';
import HealthBenefitForm from './_components/health-benefit-form';
import { loadTeamAccountBenefitExpensesOverview } from '../_lib/server/load-team-account-benefit-expenses-overview';
import HealthBenefitForm from './_components/health-benefit-form';
interface TeamAccountBillingPageProps {
params: Promise<{ account: string }>;

17
app/home/[account]/members/_lib/server/members-page.loader.ts
View File

@@ -2,10 +2,10 @@ import 'server-only';
import { SupabaseClient } from '@supabase/supabase-js';
import { getSupabaseServerAdminClient } from '@/packages/supabase/src/clients/server-admin-client';
import { Database } from '@/packages/supabase/src/database.types';
import { loadTeamWorkspace } from '~/home/[account]/_lib/server/team-account-workspace.loader';
import { getSupabaseServerAdminClient } from '@/packages/supabase/src/clients/server-admin-client';
/**
* Load data for the members page
@@ -22,7 +22,10 @@ export async function loadMembersPageData(
loadInvitations(client, slug),
canAddMember,
workspace,
loadAccountMembersBenefitsUsage(getSupabaseServerAdminClient(), workspace.account.id),
loadAccountMembersBenefitsUsage(
getSupabaseServerAdminClient(),
workspace.account.id,
),
]);
}
@@ -66,10 +69,12 @@ async function loadAccountMembers(
export async function loadAccountMembersBenefitsUsage(
client: SupabaseClient<Database>,
accountId: string,
): Promise<{
personal_account_id: string;
benefit_amount: number;
}[]> {
): Promise<
{
personal_account_id: string;
benefit_amount: number;
}[]
> {
const { data, error } = await client
.schema('medreport')
.rpc('get_benefits_usages_for_company_members', {

9
app/home/[account]/members/page.tsx
View File

@@ -42,8 +42,13 @@ async function TeamAccountMembersPage({ params }: TeamAccountMembersPageProps) {
const client = getSupabaseServerClient();
const slug = (await params).account;
const [members, invitations, canAddMember, { user, account }, membersBenefitsUsage] =
await loadMembersPageData(client, slug);
const [
members,
invitations,
canAddMember,
{ user, account },
membersBenefitsUsage,
] = await loadMembersPageData(client, slug);
const canManageRoles = account.permissions.includes('roles.manage');
const canManageInvitations = account.permissions.includes('invites.manage');

16
app/home/[account]/page.tsx
View File

@@ -17,8 +17,8 @@ import {
} from '~/lib/services/audit/pageView.service';
import { Dashboard } from './_components/dashboard';
import { loadAccountBenefitStatistics } from './_lib/server/load-team-account-benefit-statistics';
import { loadTeamAccountBenefitExpensesOverview } from './_lib/server/load-team-account-benefit-expenses-overview';
import { loadAccountBenefitStatistics } from './_lib/server/load-team-account-benefit-statistics';
interface TeamAccountHomePageProps {
params: Promise<{ account: string }>;
@@ -41,11 +41,15 @@ function TeamAccountHomePage({ params }: TeamAccountHomePageProps) {
const teamAccount = use(teamAccountsApi.getTeamAccount(account));
const { memberParams, members } = use(teamAccountsApi.getMembers(account));
const bmiThresholds = use(userAnalysesApi.fetchBmiThresholds());
const accountBenefitStatistics = use(loadAccountBenefitStatistics(teamAccount.id));
const expensesOverview = use(loadTeamAccountBenefitExpensesOverview({
companyId: teamAccount.id,
employeeCount: members.length,
}));
const accountBenefitStatistics = use(
loadAccountBenefitStatistics(teamAccount.id),
);
const expensesOverview = use(
loadTeamAccountBenefitExpensesOverview({
companyId: teamAccount.id,
employeeCount: members.length,
}),
);
use(
createPageViewLog({