diff --git a/.prettierignore b/.prettierignore index dca02d0..e10846e 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,3 +1,5 @@ database.types.ts playwright-report -*.hbs \ No newline at end of file +*.hbs +.history +node_modules diff --git a/app/home/(user)/_components/cart/analysis-location.tsx b/app/home/(user)/_components/cart/analysis-location.tsx index 38189a5..7189fea 100644 --- a/app/home/(user)/_components/cart/analysis-location.tsx +++ b/app/home/(user)/_components/cart/analysis-location.tsx @@ -1,13 +1,10 @@ 'use client'; -import { zodResolver } from '@hookform/resolvers/zod'; import { StoreCart, StoreCartLineItem } from '@medusajs/types'; -import { useForm } from 'react-hook-form'; +import { useFormContext } from 'react-hook-form'; import { useTranslation } from 'react-i18next'; import { toast } from 'sonner'; -import { z } from 'zod'; -import { Form } from '@kit/ui/form'; import { Select, SelectContent, @@ -22,10 +19,6 @@ import { Trans } from '@kit/ui/trans'; import { updateCartPartnerLocation } from '../../_lib/server/update-cart-partner-location'; import partnerLocations from './partner-locations.json'; -const AnalysisLocationSchema = z.object({ - locationId: z.string().min(1), -}); - export default function AnalysisLocation({ cart, synlabAnalyses, @@ -35,21 +28,15 @@ export default function AnalysisLocation({ }) { const { t } = useTranslation('cart'); - const form = useForm>({ - defaultValues: { - locationId: (cart.metadata?.partner_location_id as string) ?? '', - }, - resolver: zodResolver(AnalysisLocationSchema), - }); + const { watch, setValue } = useFormContext(); + const currentValue = watch('locationId'); const getLocation = (locationId: string) => partnerLocations.find(({ name }) => name === locationId); - const selectedLocation = getLocation(form.watch('locationId')); + const selectedLocation = getLocation(currentValue); - const onSubmit = async ({ - locationId, - }: z.infer) => { + const handleUpdateCartPartnerLocation = async (locationId: string) => { const promise = updateCartPartnerLocation({ cartId: cart.id, lineIds: synlabAnalyses.map(({ id }) => id), @@ -70,53 +57,48 @@ export default function AnalysisLocation({

-
- onSubmit(data))} - className="mb-2 flex w-full flex-1 gap-x-2" +
+ { - form.setValue('locationId', value, { - shouldValidate: true, - shouldDirty: true, - shouldTouch: true, - }); + + + - return onSubmit(form.getValues()); - }} - > - - - - - - {Object.entries( - partnerLocations.reduce( - (acc, curr) => ({ - ...acc, - [curr.city]: [ - ...((acc[curr.city] as typeof partnerLocations) ?? []), - curr, - ], - }), - {} as Record, - ), - ).map(([city, locations]) => ( - - {city} - {locations.map((location) => ( - - {location.name} - - ))} - - ))} - - - - + + {Object.entries( + partnerLocations.reduce( + (acc, curr) => ({ + ...acc, + [curr.city]: [ + ...((acc[curr.city] as typeof partnerLocations) ?? []), + curr, + ], + }), + {} as Record, + ), + ).map(([city, locations]) => ( + + {city} + {locations.map((location) => ( + + {location.name} + + ))} + + ))} + + +
{selectedLocation && (
diff --git a/app/home/(user)/_components/cart/cart-form-content.tsx b/app/home/(user)/_components/cart/cart-form-content.tsx new file mode 100644 index 0000000..7082b74 --- /dev/null +++ b/app/home/(user)/_components/cart/cart-form-content.tsx @@ -0,0 +1,213 @@ +'use client'; + +import { formatCurrency } from '@/packages/shared/src/utils'; +import { StoreCart, StoreCartLineItem } from '@medusajs/types'; +import { Loader2 } from 'lucide-react'; +import { useFormContext } from 'react-hook-form'; +import { useTranslation } from 'react-i18next'; + +import { Button } from '@kit/ui/button'; +import { Card, CardContent, CardHeader } from '@kit/ui/card'; +import { Checkbox } from '@kit/ui/checkbox'; +import { FormControl, FormField, FormItem, FormLabel } from '@kit/ui/form'; +import { Trans } from '@kit/ui/trans'; + +import { cn } from '~/lib/utils'; + +import AnalysisLocation from './analysis-location'; +import CartItems from './cart-items'; +import CartServiceItems from './cart-service-items'; +import DiscountCode from './discount-code'; +import { EnrichedCartItem, GetBalanceSummarySelection } from './types'; + +const IS_DISCOUNT_SHOWN = true as boolean; + +export default function CartFormContent({ + cart, + synlabAnalyses, + ttoServiceItems, + unavailableLineItemIds, + isInitiatingSession, + getBalanceSummarySelection, +}: { + cart: StoreCart; + synlabAnalyses: StoreCartLineItem[]; + ttoServiceItems: EnrichedCartItem[]; + unavailableLineItemIds?: string[]; + isInitiatingSession: boolean; + getBalanceSummarySelection: GetBalanceSummarySelection; +}) { + const { + i18n: { language }, + } = useTranslation(); + const { watch } = useFormContext(); + + const items = cart?.items ?? []; + const hasCartItems = cart && Array.isArray(items) && items.length > 0; + + const isLocationsShown = synlabAnalyses.length > 0; + + const useCompanyBenefits = watch('useCompanyBenefits'); + const balanceSummary = getBalanceSummarySelection({ useCompanyBenefits }); + + const { benefitsAmount, benefitsAmountTotal, montonioAmount } = + balanceSummary; + + const hasBenefitsApplied = benefitsAmountTotal > 0 && !!useCompanyBenefits; + + return ( + <> +
+ + +
+ {hasCartItems && ( + <> +
+
+

+ +

+
+
+

+ {formatCurrency({ + value: cart.subtotal, + currencyCode: cart.currency_code, + locale: language, + })} +

+
+
+
+
+

+ +

+
+
+

+ {formatCurrency({ + value: cart.discount_total, + currencyCode: cart.currency_code, + locale: language, + })} +

+
+
+ {hasBenefitsApplied && ( +
+
+

+ +

+
+
+

+ {formatCurrency({ + value: benefitsAmount, + currencyCode: cart.currency_code, + locale: language, + })} +

+
+
+ )} +
+
+

+ +

+
+
+

+ {formatCurrency({ + value: montonioAmount, + currencyCode: cart.currency_code, + locale: language, + })} +

+
+
+ + {benefitsAmountTotal > 0 && ( + ( + +
+ + + + + + +
+ + )} + /> + )} + + )} + +
+ {IS_DISCOUNT_SHOWN && ( + + +
+ +
+ + + + + + )} + + {isLocationsShown && ( + + +
+ +
+ + + + + + )} +
+ +
+ +
+ + ); +} diff --git a/app/home/(user)/_components/cart/cart-form.tsx b/app/home/(user)/_components/cart/cart-form.tsx new file mode 100644 index 0000000..4df207b --- /dev/null +++ b/app/home/(user)/_components/cart/cart-form.tsx @@ -0,0 +1,49 @@ +'use client'; + +import { zodResolver } from '@hookform/resolvers/zod'; +import type { StoreCart } from '@medusajs/types'; +import { useForm } from 'react-hook-form'; +import { z } from 'zod'; + +import { Form } from '@kit/ui/form'; + +const CartFormSchema = z.object({ + code: z.string().optional(), + locationId: z.string().optional(), + useCompanyBenefits: z.boolean(), +}); + +export type CartFormOnSubmit = ( + data: z.infer, +) => Promise; + +export default function CartForm({ + children, + cart, + onSubmit, +}: { + children: React.ReactNode; + cart: StoreCart; + onSubmit: CartFormOnSubmit; +}) { + const form = useForm>({ + defaultValues: { + code: '', + locationId: (cart.metadata?.partner_location_id as string) ?? '', + useCompanyBenefits: true, + }, + resolver: zodResolver(CartFormSchema), + }); + + const handleSubmit: CartFormOnSubmit = async (data) => { + await onSubmit(data); + }; + + return ( +
+ handleSubmit(data))}> + {children} +
+ + ); +} diff --git a/app/home/(user)/_components/cart/discount-code.tsx b/app/home/(user)/_components/cart/discount-code.tsx index 84ef51d..d4ca87f 100644 --- a/app/home/(user)/_components/cart/discount-code.tsx +++ b/app/home/(user)/_components/cart/discount-code.tsx @@ -1,18 +1,16 @@ 'use client'; -import React from 'react'; +import React, { useState } from 'react'; -import { zodResolver } from '@hookform/resolvers/zod'; import { convertToLocale } from '@lib/util/money'; import { StoreCart, StorePromotion } from '@medusajs/types'; import { Badge, Text } from '@medusajs/ui'; import Trash from '@modules/common/icons/trash'; -import { useForm } from 'react-hook-form'; +import { useFormContext } from 'react-hook-form'; import { useTranslation } from 'react-i18next'; -import { z } from 'zod'; import { Button } from '@kit/ui/button'; -import { Form, FormControl, FormField, FormItem } from '@kit/ui/form'; +import { FormControl, FormField, FormItem } from '@kit/ui/form'; import { Input } from '@kit/ui/input'; import { toast } from '@kit/ui/sonner'; import { Trans } from '@kit/ui/trans'; @@ -22,10 +20,6 @@ import { removePromotionCodeAction, } from './discount-code-actions'; -const DiscountCodeSchema = z.object({ - code: z.string().min(1), -}); - export default function DiscountCode({ cart, }: { @@ -35,8 +29,13 @@ export default function DiscountCode({ }) { const { t } = useTranslation('cart'); + const { setValue, watch } = useFormContext(); + const currentValue = watch('code'); + const { promotions = [] } = cart; + const [isAddingPromotionCode, setIsAddingPromotionCode] = useState(false); + const removePromotionCode = async (code: string) => { const appliedCodes = promotions .filter((p) => p.code !== undefined) @@ -55,57 +54,56 @@ export default function DiscountCode({ }; const addPromotionCode = async (code: string) => { + if (!code || code.length === 0) { + return; + } + + setIsAddingPromotionCode(true); const loading = toast.loading(t('cart:discountCode.addLoading')); const result = await addPromotionCodeAction(code); toast.dismiss(loading); if (result.success) { toast.success(t('cart:discountCode.addSuccess')); - form.reset(); + setValue('code', ''); } else { toast.error(t('cart:discountCode.addError')); } + setIsAddingPromotionCode(false); }; - const form = useForm>({ - defaultValues: { - code: '', - }, - resolver: zodResolver(DiscountCodeSchema), - }); - return (

-
- addPromotionCode(data.code))} - className="mb-2 flex w-full flex-1 flex-col gap-x-2 gap-y-2 sm:flex-row" - > - ( - - - - - - )} - /> +
+ ( + + + + + + )} + /> - - - + +
{promotions.length > 0 && (
diff --git a/app/home/(user)/_components/cart/index.tsx b/app/home/(user)/_components/cart/index.tsx index 6ac2c76..e6db902 100644 --- a/app/home/(user)/_components/cart/index.tsx +++ b/app/home/(user)/_components/cart/index.tsx @@ -1,28 +1,20 @@ 'use client'; -import { useState } from 'react'; +import { useCallback, 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 CartForm, { CartFormOnSubmit } from './cart-form'; +import CartFormContent from './cart-form-content'; import { EnrichedCartItem } from './types'; -const IS_DISCOUNT_SHOWN = true as boolean; - export default function Cart({ accountId, cart, @@ -45,6 +37,47 @@ export default function Cart({ const [unavailableLineItemIds, setUnavailableLineItemIds] = useState(); + const getBalanceSummarySelection = useCallback( + ({ + useCompanyBenefits, + }: { + useCompanyBenefits: boolean; + }): { + benefitsAmount: number; + benefitsAmountTotal: number; + montonioAmount: number; + } => { + if (!cart) { + return { + benefitsAmount: 0, + benefitsAmountTotal: 0, + montonioAmount: 0, + }; + } + + const benefitsAmountTotal = balanceSummary?.totalBalance ?? 0; + const cartTotal = cart.total; + if (!useCompanyBenefits) { + return { + benefitsAmount: 0, + benefitsAmountTotal, + montonioAmount: cartTotal, + }; + } + + const benefitsAmount = + benefitsAmountTotal > cartTotal ? cartTotal : benefitsAmountTotal; + const montonioAmount = + benefitsAmount > 0 ? cartTotal - benefitsAmount : cartTotal; + return { + benefitsAmount, + benefitsAmountTotal, + montonioAmount, + }; + }, + [balanceSummary, cart], + ); + const items = cart?.items ?? []; const hasCartItems = cart && Array.isArray(items) && items.length > 0; @@ -68,14 +101,17 @@ export default function Cart({ ); } - async function initiateSession() { + const initiateSession: CartFormOnSubmit = async ({ useCompanyBenefits }) => { setIsInitiatingSession(true); try { + const { benefitsAmount } = getBalanceSummarySelection({ + useCompanyBenefits, + }); const { url, isFullyPaidByBenefits, orderId, unavailableLineItemIds } = await initiatePayment({ accountId, - balanceSummary: balanceSummary!, + benefitsAmount, cart: cart!, language, }); @@ -94,148 +130,20 @@ export default function Cart({ console.error('Failed to initiate payment', error); setIsInitiatingSession(false); } - } - - const isLocationsShown = synlabAnalyses.length > 0; - - const companyBenefitsTotal = balanceSummary?.totalBalance ?? 0; - const montonioTotal = - cart && companyBenefitsTotal > 0 - ? cart.total - companyBenefitsTotal - : cart.total; + }; return (
-
- + - -
- {hasCartItems && ( - <> -
-
-

- -

-
-
-

- {formatCurrency({ - value: cart.subtotal, - currencyCode: cart.currency_code, - locale: language, - })} -

-
-
-
-
-

- -

-
-
-

- {formatCurrency({ - value: cart.discount_total, - currencyCode: cart.currency_code, - locale: language, - })} -

-
-
- {companyBenefitsTotal > 0 && ( -
-
-

- -

-
-
-

- {formatCurrency({ - value: - companyBenefitsTotal > cart.total - ? cart.total - : companyBenefitsTotal, - currencyCode: cart.currency_code, - locale: language, - })} -

-
-
- )} -
-
-

- -

-
-
-

- {formatCurrency({ - value: montonioTotal < 0 ? 0 : montonioTotal, - currencyCode: cart.currency_code, - locale: language, - })} -

-
-
- - )} - -
- {IS_DISCOUNT_SHOWN && ( - - -
- -
- - - - - - )} - - {isLocationsShown && ( - - -
- -
- - - - - - )} -
- -
- -
+
); } diff --git a/app/home/(user)/_components/cart/types.ts b/app/home/(user)/_components/cart/types.ts index b7de7ce..7d04ae1 100644 --- a/app/home/(user)/_components/cart/types.ts +++ b/app/home/(user)/_components/cart/types.ts @@ -8,12 +8,6 @@ export interface MontonioOrderToken { merchantReference: string; merchantReferenceDisplay: string; paymentStatus: - | 'PAID' - | 'FAILED' - | 'CANCELLED' - | 'PENDING' - | 'EXPIRED' - | 'REFUNDED' | 'PAID' | 'FAILED' | 'CANCELLED' @@ -37,3 +31,13 @@ export enum CartItemType { } export type EnrichedCartItem = StoreCartLineItem & { reservation: Reservation }; + +export type GetBalanceSummarySelection = ({ + useCompanyBenefits, +}: { + useCompanyBenefits: boolean; +}) => { + benefitsAmount: number; + benefitsAmountTotal: number; + montonioAmount: number; +}; diff --git a/app/home/(user)/_lib/server/cart-actions.ts b/app/home/(user)/_lib/server/cart-actions.ts index bfd1081..77640b3 100644 --- a/app/home/(user)/_lib/server/cart-actions.ts +++ b/app/home/(user)/_lib/server/cart-actions.ts @@ -9,8 +9,6 @@ import type { StoreCart, StoreOrder } from '@medusajs/types'; import jwt from 'jsonwebtoken'; import { z } from 'zod'; -import type { AccountBalanceSummary } from '@kit/accounts/services/account-balance.service'; - import { createI18nServerInstance } from '~/lib/i18n/i18n.server'; import { bookAppointment } from '~/lib/services/connected-online.service'; import { sendOrderToMedipost } from '~/lib/services/medipost/medipostPrivateMessage.service'; @@ -67,12 +65,12 @@ const env = () => export const initiatePayment = async ({ accountId, - balanceSummary, + benefitsAmount, cart, language, }: { accountId: string; - balanceSummary: AccountBalanceSummary; + benefitsAmount: number; cart: StoreCart; language: string; }) => { @@ -83,7 +81,7 @@ export const initiatePayment = async ({ totalByMontonio, totalByBenefits, isFullyPaidByBenefits, - } = await initiateMultiPaymentSession(cart, balanceSummary.totalBalance); + } = await initiateMultiPaymentSession(cart, benefitsAmount); if (!isFullyPaidByBenefits) { if (!montonioPaymentSessionId) { diff --git a/app/home/(user)/_lib/server/load-analysis-packages.ts b/app/home/(user)/_lib/server/load-analysis-packages.ts index f564e08..19f6043 100644 --- a/app/home/(user)/_lib/server/load-analysis-packages.ts +++ b/app/home/(user)/_lib/server/load-analysis-packages.ts @@ -3,7 +3,7 @@ import { cache } from 'react'; import { getAnalysisElementMedusaProductIds } from '@/utils/medusa-product'; import { listProductTypes, listProducts } from '@lib/data/products'; import { listRegions } from '@lib/data/regions'; -import type { StoreProduct } from '@medusajs/types'; +import type { StoreProduct, StoreProductType } from '@medusajs/types'; import type { AccountWithParams } from '@kit/accounts/types/accounts'; import type { AnalysisPackageWithVariant } from '@kit/shared/components/select-analysis-package'; @@ -118,17 +118,12 @@ async function analysisPackageElementsLoader({ async function analysisPackagesWithVariantLoader({ account, countryCode, + productType, }: { account: AccountWithParams; countryCode: string; + productType: StoreProductType; }) { - const productTypes = await loadProductTypes(); - const productType = productTypes.find( - ({ metadata }) => metadata?.handle === 'analysis-packages', - ); - if (!productType) { - return null; - } const analysisPackagesResponse = await listProducts({ countryCode, queryParams: { limit: 100, 'type_id[0]': productType.id }, @@ -171,12 +166,23 @@ async function analysisPackagesLoader() { throw new Error('Account not found'); } - const countryCodes = await loadCountryCodes(); + const [countryCodes, productTypes] = await Promise.all([ + loadCountryCodes(), + loadProductTypes(), + ]); const countryCode = countryCodes[0]!; + const productType = productTypes.find( + ({ metadata }) => metadata?.handle === 'analysis-packages', + ); + + if (!productType) { + return { analysisPackageElements: [], analysisPackages: [], countryCode }; + } const analysisPackagesWithVariant = await analysisPackagesWithVariantLoader({ account, countryCode, + productType, }); if (!analysisPackagesWithVariant) { return { analysisPackageElements: [], analysisPackages: [], countryCode }; diff --git a/app/home/(user)/settings/_components/account-preferences-form.tsx b/app/home/(user)/settings/_components/account-preferences-form.tsx index 7fbd6f5..c8cdd45 100644 --- a/app/home/(user)/settings/_components/account-preferences-form.tsx +++ b/app/home/(user)/settings/_components/account-preferences-form.tsx @@ -3,7 +3,6 @@ import { zodResolver } from '@hookform/resolvers/zod'; import { useForm } from 'react-hook-form'; -import { Trans } from '@kit/ui/trans'; import { useRevalidatePersonalAccountDataQuery } from '@kit/accounts/hooks/use-personal-account-data'; import type { AccountWithParams } from '@kit/accounts/types/accounts'; import { Button } from '@kit/ui/button'; @@ -12,6 +11,7 @@ import { Form } from '@kit/ui/form'; import { LanguageSelector } from '@kit/ui/language-selector'; import { toast } from '@kit/ui/sonner'; import { Switch } from '@kit/ui/switch'; +import { Trans } from '@kit/ui/trans'; import { AccountPreferences, diff --git a/app/home/(user)/settings/_components/account-settings-form.tsx b/app/home/(user)/settings/_components/account-settings-form.tsx index 0ab1bdc..5c1a098 100644 --- a/app/home/(user)/settings/_components/account-settings-form.tsx +++ b/app/home/(user)/settings/_components/account-settings-form.tsx @@ -3,7 +3,6 @@ import { zodResolver } from '@hookform/resolvers/zod'; import { useForm } from 'react-hook-form'; -import { Trans } from '@kit/ui/trans'; import { useRevalidatePersonalAccountDataQuery } from '@kit/accounts/hooks/use-personal-account-data'; import type { AccountWithParams } from '@kit/accounts/types/accounts'; import { Button } from '@kit/ui/button'; @@ -24,6 +23,7 @@ import { SelectValue, } from '@kit/ui/select'; import { toast } from '@kit/ui/sonner'; +import { Trans } from '@kit/ui/trans'; import { AccountSettings, diff --git a/lib/services/medusaCart.service.ts b/lib/services/medusaCart.service.ts index fa9c05c..2700ee1 100644 --- a/lib/services/medusaCart.service.ts +++ b/lib/services/medusaCart.service.ts @@ -31,8 +31,10 @@ const env = () => .min(1), }) .parse({ - medusaBackendPublicUrl: (process.env.DEV_MONTONIO_CALLBACK_URL || process.env.MEDUSA_BACKEND_PUBLIC_URL)!, - siteUrl: (process.env.DEV_MONTONIO_CALLBACK_URL || process.env.NEXT_PUBLIC_SITE_URL)!, + medusaBackendPublicUrl: (process.env.DEV_MONTONIO_CALLBACK_URL || + process.env.MEDUSA_BACKEND_PUBLIC_URL)!, + siteUrl: (process.env.DEV_MONTONIO_CALLBACK_URL || + process.env.NEXT_PUBLIC_SITE_URL)!, }); export async function handleAddToCart({ diff --git a/public/locales/en/cart.json b/public/locales/en/cart.json index 8e471b5..a23077e 100644 --- a/public/locales/en/cart.json +++ b/public/locales/en/cart.json @@ -63,7 +63,7 @@ "promotionsTotal": "Promotions total", "companyBenefitsTotal": "Company benefits total", "subtotal": "Subtotal", - "benefitsTotal": "Paid with benefits", + "benefitsTotal": "Paid with company benefits", "montonioTotal": "Paid with Montonio", "total": "Total", "giftCard": "Gift card" @@ -94,5 +94,8 @@ "editServiceItem": { "title": "Edit booking", "description": "Edit booking details" + }, + "companyBenefits": { + "label": "Use company benefits" } } diff --git a/public/locales/et/cart.json b/public/locales/et/cart.json index 8154d57..5790c31 100644 --- a/public/locales/et/cart.json +++ b/public/locales/et/cart.json @@ -61,7 +61,7 @@ "order": { "title": "Tellimus", "promotionsTotal": "Soodustuse summa", - "companyBenefitsTotal": "Toetuse summa", + "companyBenefitsTotal": "Tööandja katab", "subtotal": "Vahesumma", "benefitsTotal": "Tasutud tervisetoetusest", "montonioTotal": "Tasutud Montonio'ga", @@ -94,5 +94,8 @@ "editServiceItem": { "title": "Muuda broneeringut", "description": "Muuda broneeringu andmeid" + }, + "companyBenefits": { + "label": "Kasuta tööandja tervisetoetust" } } diff --git a/public/locales/ru/cart.json b/public/locales/ru/cart.json index d11ba44..e900175 100644 --- a/public/locales/ru/cart.json +++ b/public/locales/ru/cart.json @@ -94,5 +94,8 @@ "editServiceItem": { "title": "Изменить бронирование", "description": "Изменить данные бронирования" + }, + "companyBenefits": { + "label": "Использовать выгоды компании" } }