@licklist/design 0.44.526 → 0.44.528

package/src/iframe/order-process/components/CategoryProduct/CategoryProduct.tsx

@@ -5,17 +5,17 @@ import { useTranslation } from "react-i18next";
 import { useIntl } from "react-intl";
 import * as Config from "@licklist/core/dist/Config";
 import HookFormService from "@licklist/plugins/dist/services/Form/HookFormService";
+import { QuantityCheckProductInfo } from "@licklist/plugins/dist/types/Api/verifyStock";
 import { TicketDescription } from "../../../event/ticket-description";
 import { ProductCategory, Product } from "../../../../types";
-import { StepsFormProps } from "../StepsForm/StepsForm";
 import { ProductQuantityInput } from "./components/ProductQuantityInput";
 
 interface CategoryProductProps {
   product: Product;
   category: ProductCategory;
   canExpandDescription?: boolean;
-  productsWithErrors?: StepsFormProps["productsWithErrors"];
-  soldOutProducts?: StepsFormProps["productsWithErrors"];
+  productsWithErrors?: QuantityCheckProductInfo[];
+  soldOutProducts?: QuantityCheckProductInfo[];
 }
 
 export const CategoryProduct = ({
@@ -84,23 +84,9 @@ export const CategoryProduct = ({
           // but didn't click on number input.
           // If it will be required then required check fired firstly.
 
-          const {
-            isRequired = false,
-            maxAmount = 0,
-            minAmount = 0,
-            minSpend,
-            price,
-          } = product;
+          const { isRequired = false, maxAmount = 0, minAmount = 0 } = product;
 
           const currentQuantity = value?.quantity ?? 0;
-          if (minSpend && currentQuantity * price < minSpend) {
-            return t("Design:minimumSpendSumValidation", {
-              minSpend: formatNumber(minSpend, {
-                style: "currency",
-                currency: Config.Currency.GBP,
-              }),
-            }) as string;
-          }
 
           if (!value) return true;
 
@@ -165,7 +151,7 @@ export const CategoryProduct = ({
               <ProductQuantityInput
                 onChange={onChange}
                 productInfo={productInfo}
-                ref={ref}
+                refCallback={ref}
                 clearErrors={clearErrors}
                 product={{
                   ...product,

package/src/iframe/order-process/components/CategoryProduct/components/ProductQuantityInput/ProductQuantityInput.tsx

@@ -21,7 +21,7 @@ interface ProductQuantityInputProps {
   clearErrors: UseFormClearErrors<FieldValues>;
   onChange: (value: FormOrderItem) => void;
   deposit?: number;
-  ref: RefCallBack;
+  refCallback: RefCallBack;
   invalid: boolean;
   productInfo: FormOrderItem;
 }
@@ -31,7 +31,7 @@ export const ProductQuantityInput = ({
   category,
   onChange,
   clearErrors,
-  ref,
+  refCallback,
   productInfo,
   invalid,
   deposit,
@@ -59,7 +59,7 @@ export const ProductQuantityInput = ({
   if (product?.maxAmount === 1) {
     return (
       <Button
-        ref={ref}
+        ref={refCallback}
         disabled={product.isSoldOut}
         className={clsx(
           `iframe-event__${
@@ -75,7 +75,7 @@ export const ProductQuantityInput = ({
   }
   return (
     <NumberInput
-      ref={ref}
+      ref={refCallback}
       onChange={(val) => {
         onChange({
           id: product.id,

package/src/iframe/order-process/components/{CalendarStepsForm/components → ErrorModal}/ErrorModal.tsx

@@ -5,17 +5,19 @@ import ModalHeader from "react-bootstrap/ModalHeader";
 import ModalTitle from "react-bootstrap/ModalTitle";
 import ModalBody from "react-bootstrap/ModalBody";
 import Modal from "react-bootstrap/Modal";
-import Icon from "../../../../../static/Icon";
+import Icon from "../../../../static/Icon";
 
 export interface ErrorModalProps {
   isOpen: boolean;
   onClose?: () => void;
+  message?: string;
   messageKey?: string;
 }
 
 export const ErrorModal = ({
   isOpen = false,
   onClose,
+  message,
   messageKey,
 }: ErrorModalProps) => {
   const { t } = useTranslation("Design");
@@ -47,15 +49,16 @@ export const ErrorModal = ({
       </ModalHeader>
       <ModalBody className="confirmation-modal-body">
         <div className="d-flex m-5 justify-content-center manual-form-error">
-          {messageKey ? (
-            t(messageKey)
-          ) : (
-            <Trans
-              t={t}
-              i18nKey="pleaseSelectAtLeastFrom"
-              values={{ min: 1, type: "item", from: "those categories" }}
-            />
-          )}
+          {message ||
+            (messageKey ? (
+              t(messageKey)
+            ) : (
+              <Trans
+                t={t}
+                i18nKey="pleaseSelectAtLeastFrom"
+                values={{ min: 1, type: "item", from: "those categories" }}
+              />
+            ))}
         </div>
       </ModalBody>
     </Modal>

package/src/iframe/order-process/components/ErrorModal/index.ts

@@ -0,0 +1 @@
+export { ErrorModal } from "./ErrorModal";

package/src/iframe/order-process/components/NavigationSteps/NavigationSteps.tsx

@@ -10,13 +10,15 @@ import clsx from "clsx";
 import { useTranslation } from "react-i18next";
 import { SnippetLoader } from "../../../../static";
 
+export type NavigationStep = {
+  pathname: string;
+  key: string;
+  name: string;
+  queryParams?: Record<string, string>;
+};
+
 type NavigationStepsProps = {
-  steps: {
-    pathname: string;
-    key: string;
-    name: string;
-    queryParams?: Record<string, string>;
-  }[];
+  steps: NavigationStep[];
   isLoading?: boolean;
 };
 

package/src/iframe/order-process/components/NavigationSteps/index.ts

@@ -1 +1 @@
-export { NavigationSteps } from "./NavigationSteps";
+export { NavigationSteps, NavigationStep } from "./NavigationSteps";

package/src/iframe/order-process/components/Timer/utils/index.ts

@@ -1,10 +1,7 @@
-export const fancyTimeFormat = (miliseconds: number) => {
-  const date = new Date(miliseconds);
-  const mins = date.getMinutes();
-  const secs = date.getSeconds();
-  let timerString = "";
-
-  timerString += `${mins}:${secs < 10 ? "0" : ""}`;
-  timerString += `${secs}`;
-  return timerString;
+export const fancyTimeFormat = (milliseconds: number) => {
+  const totalSeconds = Math.floor(milliseconds / 1000);
+  const minutes = Math.floor(totalSeconds / 60);
+  const seconds = totalSeconds % 60;
+  const formattedSecs = seconds < 10 ? `0${seconds}` : `${seconds}`;
+  return `${minutes}:${formattedSecs}`;
 };

package/src/iframe/order-process/components/utils/useCategoryVerification.ts

@@ -0,0 +1,82 @@
+import { ProductCategory } from "@licklist/core/dist/DataMapper/Product/ProductCategoryDataMapper";
+import { Currency } from "@licklist/core/dist/Config";
+import { useIntl } from "react-intl";
+import { useTranslation } from "react-i18next";
+import { Order } from "src/types";
+
+interface CategoryError {
+  message: string;
+  id?: number;
+}
+
+// TODO it's temporary solution, please remove it later
+export const useCategoryVerification = () => {
+  const { t } = useTranslation("Validation");
+  const { formatNumber } = useIntl();
+  return (
+    values: Record<Order["id"], Order>,
+    productCategories?: ProductCategory[]
+  ): CategoryError | void => {
+    let errorMessage: { id?: number; message: string } | void;
+    const productArray = Object.values(values).filter(
+      (product) => product?.quantity > 0
+    );
+    const sumOfMinSpends = productCategories.reduce((acc, productCategory) => {
+      const { products } = productCategory;
+      const selectedProducts = products.filter((product) =>
+        productArray.map((el) => el.id).includes(product?.id)
+      );
+
+      const productMinSpendsSum =
+        selectedProducts?.reduce(
+          (sum, product) => sum + (product?.minSpend || 0),
+          0
+        ) || 0;
+
+      return acc + productMinSpendsSum;
+    }, 0);
+
+    const totalPrice = productArray.reduce(
+      (total, product) => total + product.price * product.quantity,
+      0
+    );
+
+    productCategories.forEach(({ minSubItems, maxSubItems, id, name }) => {
+      if (!minSubItems && !maxSubItems) return;
+
+      const categoryProductsQuantity = productArray.filter(
+        (product) => product?.productsCategoryId === id
+      ).length;
+
+      if (minSubItems && categoryProductsQuantity < minSubItems) {
+        const message = t("Validation:fieldMinNumber", {
+          min: minSubItems,
+          attribute: `number of products in the ${name} category`,
+        });
+        errorMessage = { id, message };
+
+        return;
+      }
+
+      if (maxSubItems && categoryProductsQuantity > maxSubItems) {
+        const message = t("Validation:fieldMaxNumber", {
+          max: maxSubItems,
+          attribute: `number of products in the ${name} category`,
+        });
+        errorMessage = { id, message };
+      }
+    });
+
+    if (totalPrice < sumOfMinSpends && !errorMessage) {
+      const message = t("Design:minimumSpendSumValidation", {
+        minSpend: formatNumber(sumOfMinSpends, {
+          style: "currency",
+          currency: Currency.GBP,
+        }),
+      }) as string;
+      errorMessage = { message };
+    }
+
+    return errorMessage;
+  };
+};

package/src/iframe/order-process/index.ts

@@ -1,6 +1,5 @@
 export { BookingSummary } from "./components/BookingSummary";
-export { NavigationSteps } from "./components/NavigationSteps";
-export { StepsForm } from "./components/StepsForm";
+export { NavigationSteps, NavigationStep } from "./components/NavigationSteps";
 export { Timer } from "./components/Timer";
 export { NavigationFooter } from "./components/NavigationFooter";
 export { PaymentCard } from "./components/PaymentCard";
@@ -8,3 +7,5 @@ export { BookingSummaryFooter } from "./components/BookingSummaryFooter";
 export type { BookingSummaryFooterProps } from "./components/BookingSummaryFooter";
 export { CalendarStepsForm } from "./components/CalendarStepsForm";
 export type { CalendarStepsFormProps } from "./components/CalendarStepsForm";
+export { useCategoryVerification } from "./components/utils/useCategoryVerification";
+export { ErrorModal } from "./components/ErrorModal";

package/src/iframe/page/Page.stories.tsx

@@ -6,7 +6,7 @@ import { Page } from "./Page";
 import { PageHeader } from "./components/PageHeader";
 import { PageBody } from "./components/PageBody";
 import { IframeEventCard } from "../event/event-card/IframeEventCard";
-import { CalendarSelect } from "../event/event-calendar/components/CalendarSelect";
+import { CalendarSelect } from "../../calendar/components/CalendarSelect";
 
 export default {
   title: "Iframe/Page/Page",
@@ -219,7 +219,7 @@ export function Default() {
               <>
                 <CalendarSelect
                   options={[{ label: "Floor 1", value: "1" }]}
-                  value={"1"}
+                  value="1"
                   onChange={(chagedId: string) => console.log({ chagedId })}
                 />
               </>

package/src/iframe/page/components/PageBody/PageBody.tsx

@@ -21,7 +21,7 @@ export const PageBody = ({
     <div className={clsx("page-body", className)} {...props}>
       {children}
       {leftBlock}
-      {rightBlock && rightBlock}
+      {rightBlock}
     </div>
   );
 };

package/src/iframe/page/components/PageBody/components/LeftBlock/LeftBlock.tsx

@@ -6,14 +6,14 @@ import { useResizePageBody } from "../../hooks/useResizePageBody";
 
 export type LeftBlockProps = PropsWithChildren<
   {
-    title?: string;
+    pageTitle?: ReactNode;
     component?: ReactNode;
     childrenClassName?: string;
   } & HTMLAttributes<HTMLDivElement>
 >;
 
 export const LeftBlock = ({
-  title,
+  pageTitle,
   children,
   className,
   component,
@@ -24,9 +24,14 @@ export const LeftBlock = ({
 
   return (
     <div className={clsx("left-block", className)} {...props}>
-      {title && (
+      {pageTitle && (
         <div className="navigation">
-          <p className="title">{title}</p>
+          {typeof pageTitle === "string" ? (
+            <div className="title">{pageTitle}</div>
+          ) : (
+            pageTitle
+          )}
+
           {component}
         </div>
       )}

package/src/iframe/page/components/PageHeader/PageHeader.tsx

@@ -1,4 +1,5 @@
 import React, { PropsWithChildren, HTMLAttributes, useCallback } from "react";
+import { BackButton } from "../../../back-button/BackButton";
 import { useSnippetStepsBackgroundColor } from "./hooks/useSnippetStepsBackgroundColor";
 
 export type PageHeaderProps = PropsWithChildren<
@@ -35,19 +36,7 @@ export const PageHeader = ({
   return (
     <div className="page-header" {...props}>
       <div className="header-container">
-        {showBackButton && (
-          <div className="button-wrapper back-button">
-            <div
-              className="back-button"
-              onClick={onReturnBack}
-              onKeyPress={onReturnBack}
-              role="button"
-              tabIndex={0}
-            >
-              &lt;
-            </div>
-          </div>
-        )}
+        {showBackButton && <BackButton onClick={onReturnBack} />}
         {children && (
           <div className="children-wrapper" style={style}>
             {children}

package/src/iframe/payment/order-items-table/hooks/useTableData.tsx

@@ -9,15 +9,9 @@ import {
   PAYMENT_TYPE_NET_PROFIT,
 } from "@licklist/core/dist/DataMapper/Order/PaymentDataMapper";
 import { StaticTableData } from "../../../../table";
-import {
-  getProductQuantityAndPrice,
-  calculateTotalDiscount,
-  calculateTotalPrice,
-  getPaymentValueByType,
-  getExternalPaymentDetail,
-  getTotalSumByCategory,
-} from "../utils";
+import { getProductQuantityAndPrice, getTotalSumByCategory } from "../utils";
 import { OrderItemsTableProps, SummaryItem } from "../types";
+import { getOrderSummaryItems } from "../utils/paymentSummary";
 
 const CURRENCY_DEFAULT = "GBP";
 export const PAYMENT_TYPE_TRANSLATE_KEYS = {
@@ -114,9 +108,7 @@ export const useTableData = ({
     );
   };
 
-  const renderSummaryItems = (
-    summaryItems: { translateKey: string; price: number }[]
-  ) => {
+  const renderSummaryItems = (summaryItems: SummaryItem[]) => {
     return summaryItems.map(({ translateKey, price }) => {
       return {
         key: uniqueId(`summary-info-${translateKey}`),
@@ -127,93 +119,6 @@ export const useTableData = ({
     });
   };
 
-  const paymentNotProcessedSummary = () => {
-    const externalPaymentDetail = paymentDetail
-      ? getExternalPaymentDetail(paymentDetail)
-      : undefined;
-
-    const total = calculateTotalPrice(order, externalPaymentDetail);
-
-    const summaryItems: SummaryItem[] = [
-      {
-        translateKey: "amountTotal",
-        price: total,
-      },
-    ];
-
-    if (externalDiscount) {
-      summaryItems.push({
-        price: externalDiscount,
-        translateKey: "amountWithDiscount",
-      });
-    }
-
-    if (externalPaymentDetail) {
-      return [...summaryItems, ...getExternalPaymentDetail(paymentDetail)];
-    }
-
-    return summaryItems;
-  };
-
-  const processedPaymentSummary = () => {
-    const externalPaymentDetail =
-      paymentDetail && !order.payments.length
-        ? getExternalPaymentDetail(paymentDetail)
-        : Object.keys(PAYMENT_TYPE_TRANSLATE_KEYS).map((key) => {
-            return {
-              translateKey: PAYMENT_TYPE_TRANSLATE_KEYS[key],
-              price: getPaymentValueByType(order.payments, key),
-            };
-          });
-
-    const total = calculateTotalPrice(order, externalPaymentDetail);
-
-    const totalDiscount = calculateTotalDiscount(order.payments);
-    const totalWithDiscount = total - Number(totalDiscount);
-    let summaryItems: SummaryItem[] = [
-      {
-        translateKey: "amountTotal",
-        price: total,
-      },
-    ];
-
-    if (totalDiscount) {
-      summaryItems.push({
-        translateKey: "amountWithDiscount",
-        price: totalWithDiscount < 0 ? 0 : totalWithDiscount,
-      });
-    }
-
-    if (paymentDetail && !order.payments.length) {
-      return [...summaryItems, ...externalPaymentDetail];
-    }
-
-    summaryItems.push({
-      translateKey: "totalPaid",
-      price: totalWithDiscount <= 0 ? 0 : order.totalAmount,
-    });
-    if (totalWithDiscount <= 0) {
-      return summaryItems;
-    }
-    summaryItems = [...summaryItems, ...externalPaymentDetail];
-
-    if (totalWithDiscount > order.totalAmount) {
-      summaryItems.push({
-        translateKey: "remainingToPay",
-        price: totalWithDiscount - order.totalAmount,
-      });
-    }
-    return summaryItems;
-  };
-
-  const getOrderSummaryItems = () => {
-    if (!isPaymentProcessed) {
-      return paymentNotProcessedSummary();
-    }
-
-    return processedPaymentSummary();
-  };
-
   const data = useMemo(
     () => {
       if (!order) {
@@ -222,7 +127,14 @@ export const useTableData = ({
 
       return [
         ...renderProductsContent(),
-        ...renderSummaryItems(getOrderSummaryItems()),
+        ...renderSummaryItems(
+          getOrderSummaryItems({
+            order,
+            paymentDetail,
+            isPaymentProcessed,
+            externalDiscount,
+          })
+        ),
       ];
     },
     // eslint-disable-next-line react-hooks/exhaustive-deps

package/src/iframe/payment/order-items-table/types/index.ts

@@ -1,7 +1,24 @@
 import { Order } from "@licklist/core/dist/DataMapper/Order/OrderDataMapper";
 import { PaymentDetail } from "@licklist/core/dist/DataMapper/Order/PaymentDetailDataMapper";
 
-export type SummaryItem = { translateKey: string; price: number };
+export const AMOUNT_TOTAL = "amountTotal";
+export const AMOUNT_WITH_DISCOUNT = "amountWithDiscount";
+export const TOTAL_PAID = "totalPaid";
+export const REMAINING_TO_PAY = "remainingToPay";
+
+export const SUMMARY_TRANSLATE_KEYS = [
+  AMOUNT_TOTAL,
+  AMOUNT_WITH_DISCOUNT,
+  TOTAL_PAID,
+  REMAINING_TO_PAY,
+];
+
+export type SUMMARY_TRANSLATE_KEY = typeof SUMMARY_TRANSLATE_KEYS[number];
+
+export type SummaryItem = {
+  translateKey: SUMMARY_TRANSLATE_KEY;
+  price: number;
+};
 
 export type OrderItemsTableProps = {
   order?: Order;

package/src/iframe/payment/order-items-table/utils/paymentSummary.tsx

@@ -0,0 +1,118 @@
+import { PAYMENT_TYPE_TRANSLATE_KEYS } from "../hooks/useTableData";
+import {
+  AMOUNT_TOTAL,
+  AMOUNT_WITH_DISCOUNT,
+  OrderItemsTableProps,
+  REMAINING_TO_PAY,
+  SummaryItem,
+  TOTAL_PAID,
+} from "../types";
+import {
+  calculateTotalDiscount,
+  calculateTotalPrice,
+  getExternalPaymentDetail,
+  getPaymentValueByType,
+} from "./index";
+
+const paymentNotProcessedSummary = ({
+  order,
+  externalDiscount,
+  paymentDetail,
+}: OrderItemsTableProps) => {
+  const externalPaymentDetail = paymentDetail
+    ? getExternalPaymentDetail(paymentDetail)
+    : undefined;
+
+  const total = calculateTotalPrice(order, externalPaymentDetail);
+
+  const summaryItems: SummaryItem[] = [
+    {
+      translateKey: AMOUNT_TOTAL,
+      price: total,
+    },
+  ];
+
+  if (externalDiscount) {
+    summaryItems.push({
+      price: externalDiscount,
+      translateKey: AMOUNT_WITH_DISCOUNT,
+    });
+  }
+
+  if (externalPaymentDetail) {
+    return [...summaryItems, ...getExternalPaymentDetail(paymentDetail)];
+  }
+
+  return summaryItems;
+};
+
+const processedPaymentSummary = ({
+  order,
+  paymentDetail,
+}: OrderItemsTableProps) => {
+  const externalPaymentDetail =
+    paymentDetail && !order.payments.length
+      ? getExternalPaymentDetail(paymentDetail)
+      : Object.keys(PAYMENT_TYPE_TRANSLATE_KEYS).map((key) => {
+          return {
+            translateKey: PAYMENT_TYPE_TRANSLATE_KEYS[key],
+            price: getPaymentValueByType(order.payments, key),
+          };
+        });
+
+  const total = calculateTotalPrice(order, externalPaymentDetail);
+
+  const totalDiscount = calculateTotalDiscount(order.payments);
+  const totalWithDiscount = total - Number(totalDiscount);
+  let summaryItems: SummaryItem[] = [
+    {
+      translateKey: AMOUNT_TOTAL,
+      price: total,
+    },
+  ];
+
+  if (totalDiscount) {
+    summaryItems.push({
+      translateKey: AMOUNT_WITH_DISCOUNT,
+      price: totalWithDiscount < 0 ? 0 : totalWithDiscount,
+    });
+  }
+
+  if (paymentDetail && !order.payments.length) {
+    return [...summaryItems, ...externalPaymentDetail];
+  }
+
+  summaryItems.push({
+    translateKey: TOTAL_PAID,
+    price: totalWithDiscount <= 0 ? 0 : order.totalAmount,
+  });
+  if (totalWithDiscount <= 0) {
+    return summaryItems;
+  }
+  summaryItems = [...summaryItems, ...externalPaymentDetail];
+
+  if (totalWithDiscount > order.totalAmount) {
+    summaryItems.push({
+      translateKey: REMAINING_TO_PAY,
+      price: totalWithDiscount - order.totalAmount,
+    });
+  }
+  return summaryItems;
+};
+
+export const getOrderSummaryItems = ({
+  order,
+  externalDiscount,
+  paymentDetail,
+  isPaymentProcessed,
+}: OrderItemsTableProps): SummaryItem[] => {
+  if (!isPaymentProcessed) {
+    return paymentNotProcessedSummary({
+      order,
+      externalDiscount,
+      paymentDetail,
+    });
+  }
+
+  return processedPaymentSummary({ order, paymentDetail });
+};