Merge pull request #77 from MR-medreport/develop

develop -> main
2025-09-06 19:59:39 +00:00
parent 3d268b6061 dfcfdb8f97
commit 7a479787c8
10 changed files with 152 additions and 92 deletions
--- a/app/home/(user)/_components/cart/discount-code.tsx
+++ b/app/home/(user)/_components/cart/discount-code.tsx
@@ -1,6 +1,7 @@
 "use client"

-import { Badge, Heading, Text } from "@medusajs/ui"
+import { Badge, Text } from "@medusajs/ui"
+import { toast } from '@kit/ui/sonner';
 import React, { useActionState } from "react";

 import { applyPromotions, submitPromotionForm } from "@lib/data/cart"
@@ -31,11 +32,19 @@ export default function DiscountCode({ cart }: {

  const removePromotionCode = async (code: string) => {
    const validPromotions = promotions.filter(
-      (promotion) => promotion.code !== code
+      (promotion) => promotion.code !== code,
    )

    await applyPromotions(
-      validPromotions.filter((p) => p.code === undefined).map((p) => p.code!)
+      validPromotions.filter((p) => p.code === undefined).map((p) => p.code!),
+      {
+        onSuccess: () => {
+          toast.success(t('cart:discountCode.removeSuccess'));
+        },
+        onError: () => {
+          toast.error(t('cart:discountCode.removeError'));
+        },
+      }
    )
  }

@@ -45,7 +54,14 @@ export default function DiscountCode({ cart }: {
      .map((p) => p.code!)
    codes.push(code.toString())

-    await applyPromotions(codes)
+    await applyPromotions(codes, {
+      onSuccess: () => {
+        toast.success(t('cart:discountCode.addSuccess'));
+      },
+      onError: () => {
+        toast.error(t('cart:discountCode.addError'));
+      },
+    });

    form.reset()
  }
@@ -64,7 +80,7 @@ export default function DiscountCode({ cart }: {
      <Form {...form}>
        <form
          onSubmit={form.handleSubmit((data) => addPromotionCode(data.code))}
-          className="w-full mb-2 flex gap-x-2"
+          className="w-full mb-2 flex gap-x-2 sm:flex-row flex-col gap-y-2"
        >
          <FormField
            name={'code'}
@@ -87,16 +103,12 @@ export default function DiscountCode({ cart }: {
        </form>
      </Form>

-      <p className="text-sm text-muted-foreground">
-        <Trans i18nKey={'cart:discountCode.subtitle'} />
-      </p>
-
-      {promotions.length > 0 && (
-        <div className="w-full flex items-center">
-          <div className="flex flex-col w-full">
-            <Heading className="txt-medium mb-2">
-              Promotion(s) applied:
-            </Heading>
+      {promotions.length > 0 ? (
+        <div className="w-full flex items-center mt-4">
+          <div className="flex flex-col w-full gap-y-2">
+            <p>
+              <Trans i18nKey={'cart:discountCode.appliedCodes'} />
+            </p>

            {promotions.map((promotion) => {
              return (
@@ -110,6 +122,7 @@ export default function DiscountCode({ cart }: {
                      <Badge
                        color={promotion.is_automatic ? "green" : "grey"}
                        size="small"
+                        className="px-4"
                      >
                        {promotion.code}
                      </Badge>{" "}
@@ -151,7 +164,7 @@ export default function DiscountCode({ cart }: {
                    >
                      <Trash size={14} />
                      <span className="sr-only">
-                        Remove discount code from order
+                        <Trans i18nKey={'cart:discountCode.remove'} />
                      </span>
                    </button>
                  )}
@@ -160,6 +173,10 @@ export default function DiscountCode({ cart }: {
            })}
          </div>
        </div>
+      ) : (
+        <p className="text-sm text-muted-foreground">
+          <Trans i18nKey={'cart:discountCode.subtitle'} />
+        </p>
      )}
    </div>
  )
--- a/app/home/(user)/_components/cart/index.tsx
+++ b/app/home/(user)/_components/cart/index.tsx
@@ -18,7 +18,7 @@ import { useTranslation } from "react-i18next";
 import { handleNavigateToPayment } from "@/lib/services/medusaCart.service";
 import AnalysisLocation from "./analysis-location";

-const IS_DISCOUNT_SHOWN = false as boolean;
+const IS_DISCOUNT_SHOWN = true as boolean;

 export default function Cart({
  cart,
@@ -77,28 +77,62 @@ export default function Cart({
        <CartItems cart={cart} items={ttoServiceItems} productColumnLabelKey="cart:items.ttoServices.productColumnLabel" />
      </div>
      {hasCartItems && (
-        <div className="flex justify-end gap-x-4 px-6 py-4">
-          <div className="mr-[36px]">
-            <p className="ml-0 font-bold text-sm">
-              <Trans i18nKey="cart:total" />
-            </p>
+        <>
+          <div className="flex justify-end gap-x-4 px-6 pt-4">
+            <div className="mr-[36px]">
+              <p className="ml-0 font-bold text-sm text-muted-foreground">
+                <Trans i18nKey="cart:subtotal" />
+              </p>
+            </div>
+            <div className="mr-[116px]">
+              <p className="text-sm">
+                {formatCurrency({
+                  value: cart.subtotal,
+                  currencyCode: cart.currency_code,
+                  locale: language,
+                })}
+              </p>
+            </div>
          </div>
-          <div className="mr-[116px]">
-            <p className="text-sm">
-              {formatCurrency({
-                value: cart.total,
-                currencyCode: cart.currency_code,
-                locale: language,
-              })}
-            </p>
+          <div className="flex justify-end gap-x-4 px-6 py-2">
+            <div className="mr-[36px]">
+              <p className="ml-0 font-bold text-sm text-muted-foreground">
+                <Trans i18nKey="cart:promotionsTotal" />
+              </p>
+            </div>
+            <div className="mr-[116px]">
+              <p className="text-sm">
+                {formatCurrency({
+                  value: cart.discount_total,
+                  currencyCode: cart.currency_code,
+                  locale: language,
+                })}
+              </p>
+            </div>
          </div>
-        </div>
+          <div className="flex justify-end gap-x-4 px-6">
+            <div className="mr-[36px]">
+              <p className="ml-0 font-bold text-sm">
+                <Trans i18nKey="cart:total" />
+              </p>
+            </div>
+            <div className="mr-[116px]">
+              <p className="text-sm">
+                {formatCurrency({
+                  value: cart.total,
+                  currencyCode: cart.currency_code,
+                  locale: language,
+                })}
+              </p>
+            </div>
+          </div>
+        </>
      )}

-      <div className="flex gap-y-6 py-8">
+      <div className="flex sm:flex-row flex-col gap-y-6 py-8 gap-x-4">
        {IS_DISCOUNT_SHOWN && (
          <Card
-            className="flex flex-col justify-between w-1/2"
+            className="flex flex-col justify-between w-full sm:w-1/2"
          >
            <CardHeader className="pb-4">
              <h5>
@@ -113,7 +147,7 @@ export default function Cart({

        {isLocationsShown && (
          <Card
-            className="flex flex-col justify-between w-1/2"
+            className="flex flex-col justify-between w-full sm:w-1/2"
          >
            <CardHeader className="pb-4">
              <h5>
--- a/lib/services/medipost.service.ts
+++ b/lib/services/medipost.service.ts
@@ -10,6 +10,7 @@ import {
  getClientInstitution,
  getClientPerson,
  getConfidentiality,
+  getOrderEnteredPerson,
  getPais,
  getPatient,
  getProviderInstitution,
@@ -553,14 +554,12 @@ export async function composeOrderXML({
  ${getPais(USER, RECIPIENT, orderCreatedAt, orderId)}
  <Tellimus cito="EI">
 		<ValisTellimuseId>${orderId}</ValisTellimuseId>
-		<!--<TellijaAsutus>-->
 	  ${getClientInstitution()}
-		<!--<TeostajaAsutus>-->
 		${getProviderInstitution()}
-		<!--<TellijaIsik>-->
-    ${getClientPerson(person)}
+    ${getClientPerson()}
+    ${getOrderEnteredPerson()}
 		<TellijaMarkused>${comment ?? ''}</TellijaMarkused>
-		${getPatient(person)}
+    ${getPatient(person)}
 		${getConfidentiality()}
    ${specimenSection.join('')}
    ${analysisSection?.join('')}
--- a/lib/services/medipostTest.service.ts
+++ b/lib/services/medipostTest.service.ts
@@ -3,6 +3,7 @@
 import {
  getClientInstitution,
  getClientPerson,
+  getOrderEnteredPerson,
  getPais,
  getPatient,
  getProviderInstitution,
@@ -104,7 +105,8 @@ export async function composeOrderTestResponseXML({
 		<ValisTellimuseId>${orderId}</ValisTellimuseId>
 	    ${getClientInstitution({ index: 1 })}
 		  ${getProviderInstitution({ index: 1 })}
-      ${getClientPerson(person)}
+      ${getClientPerson()}
+      ${getOrderEnteredPerson()}
 		<TellijaMarkused>Siia tuleb tellija poolne märkus</TellijaMarkused>

 		${getPatient(person)}
--- a/lib/templates/medipost-order.ts
+++ b/lib/templates/medipost-order.ts
@@ -21,70 +21,48 @@ export const getPais = (
    <Saaja>${recipient}</Saaja>
    <Aeg>${format(createdAt, DATE_TIME_FORMAT)}</Aeg>
    <SaadetisId>${orderId}</SaadetisId>
-    <Email>argo@medreport.ee</Email>
+    <Email>info@medreport.ee</Email>
  </Pais>`;
 };

 export const getClientInstitution = ({ index }: { index?: number } = {}) => {
-  if (isProd) {
-    // return correct data
-  }
  return `<Asutus tyyp="TELLIJA" ${index ? ` jarjenumber="${index}"` : ''}>
      <AsutuseId>16381793</AsutuseId>
      <AsutuseNimi>MedReport OÜ</AsutuseNimi>
-      <AsutuseKood>TSU</AsutuseKood>
+      <AsutuseKood>MRP</AsutuseKood>
      <Telefon>+37258871517</Telefon>
    </Asutus>`;
 };

 export const getProviderInstitution = ({ index }: { index?: number } = {}) => {
-  if (isProd) {
-    // return correct data
-  }
  return `<Asutus tyyp="TEOSTAJA" ${index ? ` jarjenumber="${index}"` : ''}>
      <AsutuseId>11107913</AsutuseId>
-      <AsutuseNimi>Synlab HTI Tallinn</AsutuseNimi>
-      <AsutuseKood>SLA</AsutuseKood>
+      <AsutuseNimi>Synlab Eesti OÜ</AsutuseNimi>
+      <AsutuseKood>HTI</AsutuseKood>
      <AllyksuseNimi>Synlab HTI Tallinn</AllyksuseNimi>
-      <Telefon>+3723417123</Telefon>
+      <Telefon>+37217123</Telefon>
    </Asutus>`;
 };

-export const getClientPerson = ({
-  idCode,
-  firstName,
-  lastName,
-  phone,
-}: {
-  idCode: string,
-  firstName: string,
-  lastName: string,
-  phone: string,
-}) => {
-  if (isProd) {
-    // return correct data
-  }
+export const getClientPerson = () => {
  return `<Personal tyyp="TELLIJA" jarjenumber="1">
      <PersonalOID>1.3.6.1.4.1.28284.6.2.4.9</PersonalOID>
-      <PersonalKood>${idCode}</PersonalKood>
-      <PersonalPerekonnaNimi>${lastName}</PersonalPerekonnaNimi>
-      <PersonalEesNimi>${firstName}</PersonalEesNimi>
-      ${phone ? `<Telefon>${phone.startsWith('+372') ? phone : `+372${phone}`}</Telefon>` : ''}
+      <PersonalKood>D07907</PersonalKood>
+      <PersonalPerekonnaNimi>Eduard</PersonalPerekonnaNimi>
+      <PersonalEesNimi>Tsvetkov</PersonalEesNimi>
+      <Telefon>+37258131202</Telefon>
    </Personal>`;
 };

-// export const getOrderEnteredPerson = () => {
-//   if (isProd) {
-//     // return correct data
-//   }
-//   return `<Personal tyyp="SISESTAJA" jarjenumber="1">
-//       <PersonalOID>1.3.6.1.4.1.28284.6.2.4.9</PersonalOID>
-//       <PersonalKood>D07907</PersonalKood>
-//       <PersonalPerekonnaNimi>Eduard</PersonalPerekonnaNimi>
-//       <PersonalEesNimi>Tsvetkov</PersonalEesNimi>
-//       <Telefon>+37258131202</Telefon>
-//     </Personal>`;
-// };
+export const getOrderEnteredPerson = () => {
+  return `<Personal tyyp="SISESTAJA" jarjenumber="2">
+      <PersonalOID>1.3.6.1.4.1.28284.6.2.4.9</PersonalOID>
+      <PersonalKood>D07907</PersonalKood>
+      <PersonalPerekonnaNimi>Eduard</PersonalPerekonnaNimi>
+      <PersonalEesNimi>Tsvetkov</PersonalEesNimi>
+      <Telefon>+37258131202</Telefon>
+    </Personal>`;
+};

 export const getPatient = ({
  idCode,
--- a/packages/features/medusa-storefront/src/lib/data/cart.ts
+++ b/packages/features/medusa-storefront/src/lib/data/cart.ts
@@ -87,7 +87,10 @@ export async function getOrSetCart(countryCode: string) {
  return cart;
 }

-export async function updateCart({ id, ...data }: HttpTypes.StoreUpdateCart & { id?: string }) {
+export async function updateCart(
+  { id, ...data }: HttpTypes.StoreUpdateCart & { id?: string },
+  { onSuccess, onError }: { onSuccess: () => void, onError: () => void } = { onSuccess: () => {}, onError: () => {} }, 
+) {
  const cartId = id || (await getCartId());

  if (!cartId) {
@@ -109,9 +112,13 @@ export async function updateCart({ id, ...data }: HttpTypes.StoreUpdateCart & {
      const fulfillmentCacheTag = await getCacheTag("fulfillment");
      revalidateTag(fulfillmentCacheTag);

+      onSuccess();
      return cart;
    })
-    .catch(medusaError);
+    .catch((e) => {
+      onError();
+      return medusaError(e);
+    });
 }

 export async function addToCart({
@@ -259,7 +266,10 @@ export async function initiatePaymentSession(
    .catch(medusaError);
 }

-export async function applyPromotions(codes: string[]) {
+export async function applyPromotions(
+  codes: string[],
+  { onSuccess, onError }: { onSuccess: () => void, onError: () => void } = { onSuccess: () => {}, onError: () => {} }, 
+) {
  const cartId = await getCartId();

  if (!cartId) {
@@ -278,8 +288,13 @@ export async function applyPromotions(codes: string[]) {

      const fulfillmentCacheTag = await getCacheTag("fulfillment");
      revalidateTag(fulfillmentCacheTag);
+
+      onSuccess();
    })
-    .catch(medusaError);
+    .catch((e) => {
+      onError();
+      return medusaError(e);
+    });
 }

 export async function applyGiftCard(code: string) {
--- a/packages/features/medusa-storefront/src/lib/data/customer.ts
+++ b/packages/features/medusa-storefront/src/lib/data/customer.ts
@@ -127,7 +127,7 @@ export async function login(_currentState: unknown, formData: FormData) {
  }
 }

-export async function signout(countryCode: string) {
+export async function signout(countryCode?: string, shouldRedirect = true) {
  await sdk.auth.logout()

  await removeAuthToken()
@@ -140,7 +140,9 @@ export async function signout(countryCode: string) {
  const cartCacheTag = await getCacheTag("carts")
  revalidateTag(cartCacheTag)

-  redirect(`/${countryCode}/account`)
+  if (shouldRedirect) {
+    redirect(`/${countryCode!}/account`)
+  }
 }

 export async function transferCart() {
--- a/packages/supabase/src/hooks/use-sign-out.ts
+++ b/packages/supabase/src/hooks/use-sign-out.ts
@@ -1,12 +1,14 @@
 import { useMutation } from '@tanstack/react-query';

 import { useSupabase } from './use-supabase';
+import { signout } from '../../../features/medusa-storefront/src/lib/data/customer';

 export function useSignOut() {
  const client = useSupabase();

  return useMutation({
-    mutationFn: () => {
+    mutationFn: async () => {
+      await signout(undefined, false);
      return client.auth.signOut();
    },
  });
--- a/public/locales/en/cart.json
+++ b/public/locales/en/cart.json
@@ -5,6 +5,7 @@
  "emptyCartMessageDescription": "Add items to your cart to continue.",
  "subtotal": "Subtotal",
  "total": "Total",
+  "promotionsTotal": "Promotions total",
  "table": {
    "item": "Item",
    "quantity": "Quantity",
@@ -24,10 +25,13 @@
    "timeoutAction": "Continue"
  },
  "discountCode": {
+    "title": "Gift card or promotion code",
    "label": "Add Promotion Code(s)",
    "apply": "Apply",
    "subtitle": "If you wish, you can add a promotion code",
-    "placeholder": "Enter promotion code"
+    "placeholder": "Enter promotion code",
+    "remove": "Remove promotion code",
+    "appliedCodes": "Promotion(s) applied:"
  },
  "items": {
    "synlabAnalyses": {
--- a/public/locales/et/cart.json
+++ b/public/locales/et/cart.json
@@ -4,6 +4,7 @@
  "emptyCartMessage": "Sinu ostukorv on tühi",
  "emptyCartMessageDescription": "Lisa tooteid ostukorvi, et jätkata.",
  "subtotal": "Vahesumma",
+  "promotionsTotal": "Soodustuse summa",
  "total": "Summa",
  "table": {
    "item": "Toode",
@@ -28,7 +29,13 @@
    "label": "Lisa promo kood",
    "apply": "Rakenda",
    "subtitle": "Kui soovid, võid lisada promo koodi",
-    "placeholder": "Sisesta promo kood"
+    "placeholder": "Sisesta promo kood",
+    "remove": "Eemalda promo kood",
+    "appliedCodes": "Rakendatud sooduskoodid:",
+    "removeError": "Sooduskoodi eemaldamine ebaõnnestus",
+    "removeSuccess": "Sooduskood eemaldatud",
+    "addError": "Sooduskoodi rakendamine ebaõnnestus",
+    "addSuccess": "Sooduskood rakendatud"
  },
  "items": {
    "synlabAnalyses": {