@licklist/design 0.44.485-dev.9 → 0.44.485-dev.91

package/src/iframe/order-process/components/BookingSummary/components/ProductsByMenuStep/ProductsByMenuStep.tsx

@@ -2,13 +2,13 @@ import React, { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { useIntl } from "react-intl";
 import * as Config from "@licklist/core/dist/Config";
-import { ProductQuantityCheckResponse } from "@licklist/plugins/dist/types/Api/verifyStock";
+import { QuantityCheckProductInfo } from "@licklist/plugins/dist/types/Api/verifyStock";
 import { Order, MenuStep } from "../../../../../../types";
 
 export type ProductsByMenuStepsProps = {
   orderProducts: Order[];
   step: MenuStep;
-  productsWithErrors?: ProductQuantityCheckResponse["products"];
+  productsWithErrors?: QuantityCheckProductInfo[];
 };
 
 const getIdFromEntity = (entities: { id: number }[]) =>

package/src/iframe/order-process/components/BookingSummary/types/index.ts

@@ -1,4 +1,4 @@
-import { ProductQuantityCheckResponse } from "@licklist/plugins/dist/types/Api/verifyStock";
+import { QuantityCheckProductInfo } from "@licklist/plugins/dist/types/Api/verifyStock";
 import { MenuStep, Order } from "../../../../../types";
 
 export const MOBILE_WIDTH = 576;
@@ -6,17 +6,17 @@ export const ACCORDION_KEY = "booking-summary";
 
 export type BookingSummaryProps = {
   date: string;
-  menuSteps: MenuStep[];
-  formValues: {
+  menuSteps?: MenuStep[];
+  formValues?: {
     [key: string]: Order;
   };
   totalWithDiscount?: number;
   isNotShownPeopleAmount?: boolean;
-  eventName: string;
+  eventName?: string;
   hasPeopleInput?: boolean;
   transactionFee?: number;
   isFreePayment?: boolean;
-  productsWithErrors?: ProductQuantityCheckResponse["products"];
+  productsWithErrors?: QuantityCheckProductInfo[];
   isLoading?: boolean;
   peopleAmount: number;
 };

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

@@ -1,8 +1,12 @@
 import { Order } from "../../../../../types";
 
-export const cartSumByOrderProducts = (orderProducts: Order[]) =>
-  orderProducts.reduce((prevSumValue: number, product) => {
+export const cartSumByOrderProducts = (orderProducts?: Order[]) => {
+  if (!orderProducts || !orderProducts.length) {
+    return 0;
+  }
+  return orderProducts.reduce((prevSumValue: number, product) => {
     return (
       prevSumValue + (product?.deposit || product?.price) * product.quantity
     );
   }, 0);
+};

package/src/iframe/order-process/components/CalendarStepsForm/CalendarStepsForm.stories.tsx

@@ -425,6 +425,7 @@ export function Default() {
                 menuStepWithVenueMap={MENU_STEPS[0] as any}
                 title="Select a product"
                 activeVenueMapId="7"
+                soldOutProducts={[{ product_id: 148, message: "message" }]}
               />
             }
             rightBlock={

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

@@ -19,10 +19,11 @@ import {
 import { Step } from "@licklist/core/dist/DataMapper/Product/StepDataMapper";
 import { useTranslation } from "react-i18next";
 import { Product } from "@licklist/core/dist/DataMapper/Product/ProductDataMapper";
+import { QuantityCheckProductInfo } from "@licklist/plugins/dist/types/Api/verifyStock";
 import { Category } from "./components/Category";
 import { MenuStep } from "../../../../types";
 import { STEP_FORM_ID } from "../../constants";
-import { ErrorModal } from "./components/ErrorModal";
+import { ErrorModal } from "../ErrorModal/ErrorModal";
 import { PageBody } from "../../../page/components/PageBody";
 import {
   CalendarSelect,
@@ -30,8 +31,9 @@ import {
 } from "../../../event/event-calendar/components/CalendarSelect";
 import { IframeEventVenueMap } from "../../../event/event-venue-map";
 import { VenueMapRef } from "../../../../events/event-venue-map/components/VenueMap";
-import { useCategory } from "../utils/category";
+import { useCategoryVerification } from "../utils/useCategoryVerification";
 
+// TODO move this component into apps/iframe
 export interface CalendarStepsFormProps {
   step: MenuStep;
   isLastMenuStep: boolean;
@@ -44,6 +46,7 @@ export interface CalendarStepsFormProps {
   onActiveVenueMapChange?: (nextVenueMapId: string) => void;
   title: string;
   menuStepWithVenueMap: Step;
+  soldOutProducts?: QuantityCheckProductInfo[];
 }
 
 export type StepsFormRef = {
@@ -67,12 +70,13 @@ export const CalendarStepsForm = forwardRef<
       title,
       menuStepWithVenueMap,
       onActiveVenueMapChange,
+      soldOutProducts,
     },
     ref
   ) => {
     const form = useForm({ defaultValues });
     const canvasRef = useRef<VenueMapRef>(null);
-    const { verifyCategoryItems } = useCategory();
+    const verifyCategoryItems = useCategoryVerification();
     const {
       control,
       formState: { errors },
@@ -340,12 +344,14 @@ export const CalendarStepsForm = forwardRef<
                       ref={canvasRef}
                       choosedProductUuids={choosedProductUuids}
                       errorOnChoosedProductUuids={errorOnChoosedProductUuids}
+                      soldOutProducts={soldOutProducts}
                     />
                     <Category
                       productCategories={step?.productCategories}
                       activePointId={activePointId}
                       pointProducts={menuStepWithVenueMap.pointProducts}
                       onCloseModal={onCloseProductModal}
+                      soldOutProducts={soldOutProducts}
                     />
                   </>
                 )}

package/src/iframe/order-process/components/CalendarStepsForm/components/Category.tsx

@@ -1,5 +1,6 @@
 import React from "react";
 import { PointProduct } from "@licklist/core/dist/DataMapper/Product/PointProductDataMapper";
+import { QuantityCheckProductInfo } from "@licklist/plugins/dist/types/Api/verifyStock";
 import { ProductCategory } from "../../../../../types";
 import { CategoryProductModal } from "./CategoryProductModal";
 
@@ -8,6 +9,7 @@ export type CategoryProps = {
   activePointId?: number;
   pointProducts: PointProduct[];
   onCloseModal: () => void;
+  soldOutProducts?: QuantityCheckProductInfo[];
 };
 
 export const Category = ({
@@ -15,6 +17,7 @@ export const Category = ({
   activePointId,
   pointProducts,
   onCloseModal,
+  soldOutProducts,
 }: CategoryProps) => {
   return (
     <>
@@ -31,6 +34,7 @@ export const Category = ({
                     activePointId={activePointId}
                     pointProducts={pointProducts}
                     onCloseModal={onCloseModal}
+                    soldOutProducts={soldOutProducts}
                   />
                 );
               })}

package/src/iframe/order-process/components/CalendarStepsForm/components/CategoryProductModal.tsx

@@ -2,6 +2,7 @@ import React, { useMemo } from "react";
 import clsx from "clsx";
 import { Button } from "react-bootstrap";
 import { PointProduct } from "@licklist/core/dist/DataMapper/Product/PointProductDataMapper";
+import { QuantityCheckProductInfo } from "@licklist/plugins/dist/types/Api/verifyStock";
 import { ProductCategory, Product } from "../../../../../types";
 import { CategoryProduct } from "../../CategoryProduct";
 import Icon from "../../../../../static/Icon";
@@ -12,6 +13,7 @@ export type CategoryProductModalProps = {
   category: ProductCategory;
   pointProducts: PointProduct[];
   onCloseModal: () => void;
+  soldOutProducts?: QuantityCheckProductInfo[];
 };
 
 export const CategoryProductModal = ({
@@ -20,6 +22,7 @@ export const CategoryProductModal = ({
   category,
   pointProducts,
   onCloseModal,
+  soldOutProducts,
 }: CategoryProductModalProps) => {
   const activePointProduct = useMemo(
     () =>
@@ -42,6 +45,7 @@ export const CategoryProductModal = ({
         product={product}
         category={category}
         canExpandDescription={false}
+        soldOutProducts={soldOutProducts}
       />
       <div className="close-modal-button">
         <Button

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

@@ -5,16 +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"];
+  productsWithErrors?: QuantityCheckProductInfo[];
+  soldOutProducts?: QuantityCheckProductInfo[];
 }
 
 export const CategoryProduct = ({
@@ -22,6 +23,7 @@ export const CategoryProduct = ({
   category,
   canExpandDescription = true,
   productsWithErrors,
+  soldOutProducts,
 }: CategoryProductProps) => {
   const { formatNumber } = useIntl();
   const { t } = useTranslation(["Design", "Validation"]);
@@ -49,6 +51,16 @@ export const CategoryProduct = ({
     return product.deposit;
   }, [category, product]);
 
+  const checkIfSoldOutProduct = () => {
+    if (!soldOutProducts || product?.isSoldOut) {
+      return undefined;
+    }
+    const error = soldOutProducts.find(
+      (productWithError) => productWithError.product_id === product.id
+    );
+    return !!error?.message;
+  };
+
   useEffect(() => {
     if (!productQuantityError) {
       return;
@@ -71,17 +83,32 @@ export const CategoryProduct = ({
           // One case when no value is that we have product,
           // but didn't click on number input.
           // If it will be required then required check fired firstly.
-          if (!value) return true;
 
-          const { isRequired = false, maxAmount = 0, minAmount = 0 } = product;
+          const {
+            isRequired = false,
+            maxAmount = 0,
+            minAmount = 0,
+            minSpend,
+            price,
+          } = product;
 
-          const { quantity = 0 } = value;
+          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;
 
-          if (!quantity && !isRequired) {
+          if (!currentQuantity && !isRequired) {
             return true;
           }
 
-          if (!quantity && isRequired) {
+          if (!currentQuantity && isRequired) {
             return t("Design:pleaseSelectAtLeastFrom", {
               min: 1,
               type: "item",
@@ -89,14 +116,18 @@ export const CategoryProduct = ({
             }) as string;
           }
 
-          if (quantity < minAmount) {
+          if (currentQuantity < minAmount) {
             return t("Validation:fieldMinNumber", {
               min: product.minAmount,
               attribute: product.name,
             }) as string;
           }
 
-          if (maxAmount && quantity >= minAmount && maxAmount < quantity) {
+          if (
+            maxAmount &&
+            currentQuantity >= minAmount &&
+            maxAmount < currentQuantity
+          ) {
             return t("Validation:quantityMaxNumber", {
               max: product.maxAmount,
             }) as string;
@@ -134,9 +165,12 @@ export const CategoryProduct = ({
               <ProductQuantityInput
                 onChange={onChange}
                 productInfo={productInfo}
-                ref={ref}
+                refCallback={ref}
                 clearErrors={clearErrors}
-                product={product}
+                product={{
+                  ...product,
+                  isSoldOut: product?.isSoldOut || checkIfSoldOutProduct(),
+                }}
                 category={category}
                 invalid={invalid}
                 deposit={deposit}

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

@@ -10,6 +10,7 @@ interface NumberInputProps {
   onArrowDown?: (value: number) => void;
   min?: number;
   max?: number;
+  placeholder?: string;
   defaultValue?: number;
   disabled?: boolean;
 }
@@ -24,6 +25,7 @@ export const NumberInput = forwardRef<HTMLInputElement, NumberInputProps>(
       onArrowUp,
       min,
       max,
+      placeholder,
       defaultValue,
       disabled,
     },
@@ -66,6 +68,7 @@ export const NumberInput = forwardRef<HTMLInputElement, NumberInputProps>(
           min={min}
           max={max}
           defaultValue={defaultValue}
+          placeholder={placeholder}
           height="5rem"
           disabled={disabled}
           ref={ref}

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,
@@ -83,7 +83,7 @@ export const ProductQuantityInput = ({
           deposit,
           price: product.price,
           productsCategoryId: category.id,
-          quantity: val,
+          quantity: val || null,
         });
         clearErrors(`${product.id}` as const);
       }}
@@ -110,8 +110,9 @@ export const ProductQuantityInput = ({
         clearErrors(`${product.id}` as const);
       }}
       min={0}
+      placeholder="0"
       disabled={product.isSoldOut}
-      value={productInfo?.quantity || 0}
+      value={productInfo?.quantity}
       className={clsx(invalid && "error")}
     />
   );

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

@@ -5,7 +5,7 @@ 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;

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/Timer.stories.tsx

@@ -11,7 +11,7 @@ export function Default() {
   return (
     <div className="payment-process">
       <div className="col-lg-4">
-        <Timer timer={300} />
+        <Timer timer={120000} />
       </div>
     </div>
   );

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

@@ -1,7 +1,7 @@
-export const fancyTimeFormat = (duration: number) => {
-  const mins = Math.floor((duration % 3600) / 60);
-  const secs = Math.floor(duration) % 60;
-
+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" : ""}`;

package/src/iframe/order-process/components/utils/{category.ts → useCategoryVerification.ts}

@@ -1,30 +1,34 @@
 import { useTranslation } from "react-i18next";
-import { MenuStep } from "../../../../types";
+import { MenuStep, Order } from "src/types";
 
 interface CategoryError {
   message: string;
   id: number;
 }
-export const useCategory = () => {
+
+// TODO it's temporary solution, please remove it later
+export const useCategoryVerification = () => {
   const { t } = useTranslation("Validation");
-  const verifyCategoryItems = (
-    values: Record<string, any>,
+
+  return (
+    values: Record<Order["id"], Order>,
     step: MenuStep
   ): CategoryError | void => {
     let errorMessage;
+
     const productArray = Object.values(values).filter(
       (product) => product?.quantity > 0
     );
+
     step?.productCategories.forEach(
       ({ minSubItems, maxSubItems, id, name }) => {
-        if (!minSubItems && !maxSubItems) {
-          return;
-        }
+        if (!minSubItems && !maxSubItems) return;
 
         const categoryProductsQuantity = productArray.filter(
-          (product) => Number(product?.productsCategoryId) === Number(id)
+          (product) => product?.productsCategoryId === id
         ).length;
-        if (categoryProductsQuantity < minSubItems) {
+
+        if (minSubItems && categoryProductsQuantity < minSubItems) {
           const message = t("Validation:fieldMinNumber", {
             min: minSubItems,
             attribute: `number of products in the ${name} category`,
@@ -33,6 +37,7 @@ export const useCategory = () => {
 
           return;
         }
+
         if (maxSubItems && categoryProductsQuantity > maxSubItems) {
           const message = t("Validation:fieldMaxNumber", {
             max: maxSubItems,
@@ -42,7 +47,7 @@ export const useCategory = () => {
         }
       }
     );
+
     return errorMessage;
   };
-  return { verifyCategoryItems };
 };

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/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,9 @@ export const LeftBlock = ({
 
   return (
     <div className={clsx("left-block", className)} {...props}>
-      {title && (
+      {pageTitle && (
         <div className="navigation">
-          <p className="title">{title}</p>
+          <div className="title">{pageTitle}</div>
           {component}
         </div>
       )}

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

@@ -75,22 +75,37 @@ export const getProductQuantityAndPrice = (
 export const getPaymentValueByType = (
   payments: Order["payments"],
   paymentTypeTitle: string
-) => {
+): number => {
+  if (!payments || !payments.length) {
+    return 0;
+  }
   if (paymentTypeTitle === PAYMENT_TYPE_TITLES.FEE) {
     const feeWithoutVatValue =
-      payments?.find(
-        (payment) => payment.paymentType.title === paymentTypeTitle
-      )?.amount ?? 0;
+      payments?.reduce((sumOfPayments, payment) => {
+        if (payment.paymentType.title !== PAYMENT_TYPE_TITLES.FEE) {
+          return sumOfPayments;
+        }
+
+        return sumOfPayments + (payment?.amount ?? 0);
+      }, 0) ?? 0;
 
     const vatValue =
-      payments?.find(
-        (payment) => payment.paymentType.title === PAYMENT_TYPE_TITLES.VAT
-      )?.amount ?? 0;
+      payments?.reduce((sumOfPayments, payment) => {
+        if (payment.paymentType.title !== PAYMENT_TYPE_TITLES.VAT) {
+          return sumOfPayments;
+        }
+        return sumOfPayments + (payment?.amount ?? 0);
+      }, 0) ?? 0;
     return feeWithoutVatValue + vatValue;
   }
+
   return (
-    payments?.find((payment) => payment.paymentType.title === paymentTypeTitle)
-      ?.amount ?? 0
+    payments?.reduce((sumOfPayments, payment) => {
+      if (payment.paymentType.title !== paymentTypeTitle) {
+        return sumOfPayments;
+      }
+      return sumOfPayments + (payment?.amount ?? 0);
+    }, 0) ?? 0
   );
 };