feat: create email template for TTO reservation confirmation
feat: implement order notifications service with TTO reservation confirmation handling feat: create migration for TTO booking email webhook trigger
This commit is contained in:
@@ -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';
|
||||
|
||||
@@ -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!),
|
||||
)
|
||||
}
|
||||
>
|
||||
|
||||
@@ -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;
|
||||
})(),
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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,
|
||||
),
|
||||
},
|
||||
};
|
||||
};
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -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 }>;
|
||||
|
||||
@@ -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', {
|
||||
|
||||
@@ -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');
|
||||
|
||||
@@ -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({
|
||||
|
||||
Reference in New Issue
Block a user