@licklist/design 0.44.485-dev.5 → 0.44.485-dev.50

package/src/events/event-venue-map/components/VenueMap/VenueMap.tsx

@@ -11,6 +11,7 @@ import {
   EventVenueMapContext,
   EventVenueMapContextProps,
 } from "@licklist/plugins/dist/context/event/EventVenueMapContext";
+import { ProductQuantityCheckResponse } from "@licklist/plugins/dist/types/Api/verifyStock";
 import { useImage } from "../../hooks/useImage";
 import { useStageActions } from "../../hooks/useStageActions";
 import { MapPoint } from "../MapPoint";
@@ -32,6 +33,7 @@ export type VenueMapProps = {
   usedInIframe?: boolean;
   choosedProductUuids?: string[];
   errorOnChoosedProductUuids?: string[];
+  soldOutProducts?: ProductQuantityCheckResponse["products"];
 };
 
 export const VenueMap = forwardRef<VenueMapRef, VenueMapProps>(
@@ -45,6 +47,7 @@ export const VenueMap = forwardRef<VenueMapRef, VenueMapProps>(
       usedInIframe = false,
       choosedProductUuids = [],
       errorOnChoosedProductUuids = [],
+      soldOutProducts,
     },
     ref
   ) => {
@@ -112,13 +115,18 @@ export const VenueMap = forwardRef<VenueMapRef, VenueMapProps>(
       );
 
       if (!currentProduct) return false;
-
+      const selectedProduct = products.find(
+        (product) => product.uuid === currentProduct.productUuid
+      );
       return (
-        products.find((product) => product.uuid === currentProduct.productUuid)
-          ?.isSoldOut || false
+        selectedProduct?.isSoldOut ||
+        (selectedProduct &&
+          !!soldOutProducts?.find(
+            (product) => product?.product_id === selectedProduct?.id
+          )) ||
+        false
       );
     };
-
     return (
       <div className="venue-map" style={{ width, height }}>
         <div className="zone-name">

package/src/iframe/event/event-order-short-summary/components/Summary/Summary.tsx

@@ -8,25 +8,25 @@ export type SummaryDataType = {
   quantity?: number;
 }[];
 
-export type SummaryProps = ({
-  data: SummaryDataType,
-}) => React.PropsWithChildren<any>;
+export const Summary = ({ data = [] }: { data: SummaryDataType }) => {
+  return (
+    <>
+      {data.map(({ name, image, quantity, title }) => {
+        const classNames = clsx("name", "mb-4", image && "align-items-center");
 
-export const Summary: SummaryProps = ({ data = [] }) => {
-  return data.map(({ name, image, quantity, title }) => {
-    const classNames = clsx("name", "mb-4", image && "align-items-center");
-
-    return (
-      <div key={name} className="summary">
-        <p className="title mb-1">{title}</p>
-        <div className={classNames}>
-          {image && <img className="image mr-3" src={image} alt={name} />}
-          {quantity && quantity > 1 && (
-            <span className="quantity mr-3">{quantity}x</span>
-          )}
-          {name}
-        </div>
-      </div>
-    );
-  });
+        return (
+          <div key={name} className="summary">
+            <p className="title mb-1">{title}</p>
+            <div className={classNames}>
+              {image && <img className="image mr-3" src={image} alt={name} />}
+              {quantity && quantity > 1 && (
+                <span className="quantity mr-3">{quantity}x</span>
+              )}
+              {name}
+            </div>
+          </div>
+        );
+      })}
+    </>
+  );
 };

package/src/iframe/event/event-venue-map/IframeEventVenueMap.stories.tsx

@@ -6,6 +6,7 @@ import { Page, PageBody, PageHeader } from "../../page";
 import { BookingSummaryFooter } from "../../order-process/components/BookingSummaryFooter";
 import { BookingSummary } from "../../order-process/components/BookingSummary";
 import { CalendarSelect } from "../event-calendar/components/CalendarSelect";
+import { Product } from "../../../types";
 
 export default {
   title: "Iframe/Event/IframeEventVenueMap",
@@ -268,6 +269,10 @@ export function Default() {
               pointProducts={MENU_STEPS[0].pointProducts}
               usedInIframe={usedInIframe}
               onPointClick={(pointId) => console.log({ pointId })}
+              products={
+                MENU_STEPS[0].productCategories[0]
+                  .products as Partial<Product>[]
+              }
               choosedProductUuids={[
                 "beb6393c-2fdd-40f7-bb92-8800685b203f",
                 "beb6393c-2fdd-40f7-bb92-8800685b203a",

package/src/iframe/order-process/OrderProcess.stories.tsx

@@ -49,6 +49,7 @@ const productCategories = [
 
         price: 5,
         deposit: 3,
+        minSub: 10,
         isRequired: true,
         images: IMAGES,
       },
@@ -197,14 +198,14 @@ export default {
 } as Meta;
 
 const TimerWrapper = () => {
-  const [timer, setTimer] = useState(60);
+  const [timer, setTimer] = useState(120000);
   const updateTimerState = () => {
     setTimer((prevValue) => {
       if (prevValue <= 0) {
         return 0;
       }
 
-      const nexValue = prevValue - 1;
+      const nexValue = prevValue - 1000;
 
       return nexValue;
     });

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

@@ -25,6 +25,9 @@ export const BookingSummary = ({
   const { formatNumber } = useIntl();
 
   const orderProducts = useMemo(() => {
+    if (!formValues) {
+      return undefined;
+    }
     const products = Object.values(formValues).filter(Boolean) as Order[];
 
     return products?.filter((prod) => prod?.quantity !== 0);
@@ -47,7 +50,7 @@ export const BookingSummary = ({
         </div>
         <hr />
 
-        {orderProducts.length > 0 ? (
+        {orderProducts?.length > 0 ? (
           <div>
             <div className="cart-items">
               {menuSteps.map((menuStep: MenuStep) => {

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

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

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,6 +19,7 @@ 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 { ProductQuantityCheckResponse } from "@licklist/plugins/dist/types/Api/verifyStock";
 import { Category } from "./components/Category";
 import { MenuStep } from "../../../../types";
 import { STEP_FORM_ID } from "../../constants";
@@ -44,6 +45,7 @@ export interface CalendarStepsFormProps {
   onActiveVenueMapChange?: (nextVenueMapId: string) => void;
   title: string;
   menuStepWithVenueMap: Step;
+  soldOutProducts?: ProductQuantityCheckResponse["products"];
 }
 
 export type StepsFormRef = {
@@ -67,6 +69,7 @@ export const CalendarStepsForm = forwardRef<
       title,
       menuStepWithVenueMap,
       onActiveVenueMapChange,
+      soldOutProducts,
     },
     ref
   ) => {
@@ -340,12 +343,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 { ProductQuantityCheckResponse } 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?: ProductQuantityCheckResponse["products"];
 };
 
 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 { ProductQuantityCheckResponse } 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?: ProductQuantityCheckResponse["products"];
 };
 
 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/Category/Category.tsx

@@ -8,6 +8,7 @@ import { StepsFormProps } from "../StepsForm/StepsForm";
 interface CategoryProps {
   productCategories: ProductCategory[];
   productsWithErrors?: StepsFormProps["productsWithErrors"];
+  soldOutProducts?: StepsFormProps["productsWithErrors"];
   errors?: DeepMap<Record<string, any>, FieldError>;
 }
 
@@ -15,6 +16,7 @@ export function Category({
   productCategories,
   productsWithErrors,
   errors,
+  soldOutProducts,
 }: CategoryProps) {
   return (
     <>
@@ -37,6 +39,7 @@ export function Category({
                     product={product}
                     category={category}
                     productsWithErrors={productsWithErrors}
+                    soldOutProducts={soldOutProducts}
                   />
                 );
               })}

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

@@ -15,6 +15,7 @@ interface CategoryProductProps {
   category: ProductCategory;
   canExpandDescription?: boolean;
   productsWithErrors?: StepsFormProps["productsWithErrors"];
+  soldOutProducts?: StepsFormProps["productsWithErrors"];
 }
 
 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;
@@ -136,7 +167,10 @@ export const CategoryProduct = ({
                 productInfo={productInfo}
                 ref={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

@@ -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/StepsForm/StepsForm.tsx

@@ -32,6 +32,7 @@ export interface StepsFormProps {
   setFormErrors?: (errors: Record<string, any>) => void;
   id?: string;
   productsWithErrors?: ProductQuantityCheckResponse["products"];
+  soldOutProducts?: ProductQuantityCheckResponse["products"];
 }
 
 export type StepsFormRef = {
@@ -49,6 +50,7 @@ export const StepsForm = forwardRef<StepsFormRef, StepsFormProps>(
       setFormErrors,
       id = STEP_FORM_ID,
       productsWithErrors,
+      soldOutProducts,
     },
     ref
   ) => {
@@ -150,6 +152,7 @@ export const StepsForm = forwardRef<StepsFormRef, StepsFormProps>(
                 productCategories={step?.productCategories}
                 productsWithErrors={productsWithErrors}
                 errors={errors}
+                soldOutProducts={soldOutProducts}
               />
 
               {errors[NO_ORDER_ITEMS_ERROR] && (

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/payment/order-items-table/OrderItemsTable.stories.tsx

@@ -1,6 +1,7 @@
 import React from "react";
 import { Meta } from "@storybook/react";
 import { boolean } from "@storybook/addon-knobs";
+import { ORDER_FEE_CHARGE_TYPE_CLIENT } from "@licklist/core/dist/DataMapper/Order/OrderDataMapper";
 import { OrderItemsTable } from "./OrderItemsTable";
 
 export default {
@@ -24,6 +25,7 @@ export function Default(args) {
 
 Default.args = {
   order: {
+    feeChargeType: ORDER_FEE_CHARGE_TYPE_CLIENT,
     products: [
       {
         id: 1,

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

@@ -20,7 +20,7 @@ import {
 import { OrderItemsTableProps, SummaryItem } from "../types";
 
 const CURRENCY_DEFAULT = "GBP";
-const TRANSLATE_KEYS = {
+export const PAYMENT_TYPE_TRANSLATE_KEYS = {
   [PAYMENT_TYPE_NET_PROFIT]: "netAmount",
   [PAYMENT_TYPE_FEE]: "bookeditFee",
   [PAYMENT_TYPE_VAT]: "vat",
@@ -128,7 +128,11 @@ export const useTableData = ({
   };
 
   const paymentNotProcessedSummary = () => {
-    const total = calculateTotalPrice(order.orderProducts);
+    const externalPaymentDetail = paymentDetail
+      ? getExternalPaymentDetail(paymentDetail)
+      : undefined;
+
+    const total = calculateTotalPrice(order, externalPaymentDetail);
 
     const summaryItems: SummaryItem[] = [
       {
@@ -144,7 +148,7 @@ export const useTableData = ({
       });
     }
 
-    if (paymentDetail) {
+    if (externalPaymentDetail) {
       return [...summaryItems, ...getExternalPaymentDetail(paymentDetail)];
     }
 
@@ -152,7 +156,18 @@ export const useTableData = ({
   };
 
   const processedPaymentSummary = () => {
-    const total = calculateTotalPrice(order.orderProducts);
+    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[] = [
@@ -170,7 +185,7 @@ export const useTableData = ({
     }
 
     if (paymentDetail && !order.payments.length) {
-      return [...summaryItems, ...getExternalPaymentDetail(paymentDetail)];
+      return [...summaryItems, ...externalPaymentDetail];
     }
 
     summaryItems.push({
@@ -180,15 +195,7 @@ export const useTableData = ({
     if (totalWithDiscount <= 0) {
       return summaryItems;
     }
-    summaryItems = [
-      ...summaryItems,
-      ...Object.keys(TRANSLATE_KEYS).map((key) => {
-        return {
-          translateKey: TRANSLATE_KEYS[key],
-          price: getPaymentValueByType(order.payments, key),
-        };
-      }),
-    ];
+    summaryItems = [...summaryItems, ...externalPaymentDetail];
 
     if (totalWithDiscount > order.totalAmount) {
       summaryItems.push({