@licklist/design 0.44.485-dev.4 → 0.44.485-dev.40

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({

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

@@ -1,13 +1,16 @@
-import { Order } from "@licklist/core/dist/DataMapper/Order/OrderDataMapper";
+import {
+  Order,
+  ORDER_FEE_CHARGE_TYPE_CLIENT,
+} from "@licklist/core/dist/DataMapper/Order/OrderDataMapper";
 import { Product } from "@licklist/core/dist/DataMapper/Product/ProductDataMapper";
 import { PAYMENT_TYPE_DISCOUNT } from "@licklist/core/dist/DataMapper/Order/PaymentDataMapper";
 import { PaymentDetail } from "@licklist/core/dist/DataMapper/Order/PaymentDetailDataMapper";
+import { PAYMENT_TYPE_TRANSLATE_KEYS } from "../hooks/useTableData";
 
 const TRANSLATE_KEYS = {
   totalAmount: "totalPaid",
   netAmount: "netAmount",
   fee: "bookeditFee",
-  remainingToPay: "remainingToPay",
 };
 
 export enum PAYMENT_TYPE_TITLES {
@@ -16,14 +19,35 @@ export enum PAYMENT_TYPE_TITLES {
   VAT = "VAT",
 }
 
-export const calculateTotalPrice = (orderProducts: Order["orderProducts"]) => {
-  return (
-    orderProducts?.reduce(
+interface ExternalPaymnetDetail {
+  translateKey: string;
+  price: number;
+}
+
+export const calculateTotalPrice = (
+  order: Order,
+  externalPaymentDetails?: ExternalPaymnetDetail[]
+) => {
+  const totalPrice =
+    order?.orderProducts?.reduce(
       (total: number, product) =>
         total + (product?.quantity ?? 1) * product.price,
       0
-    ) ?? 0
-  );
+    ) ?? 0;
+
+  if (
+    order?.feeChargeType !== ORDER_FEE_CHARGE_TYPE_CLIENT ||
+    !externalPaymentDetails
+  ) {
+    return totalPrice;
+  }
+
+  const fee =
+    externalPaymentDetails.find(
+      (externalPayment) =>
+        externalPayment.translateKey === PAYMENT_TYPE_TRANSLATE_KEYS.fee
+    )?.price || 0;
+  return totalPrice + fee;
 };
 
 export const calculateTotalDiscount = (payments: Order["payments"]) => {
@@ -51,21 +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
   );
 };
 

package/src/iframe/payment/payment-page/PaymentPage.tsx

@@ -15,6 +15,7 @@ import {
 import { PaymentTimer } from "./PaymentTimer";
 import { Page, PageBody, PageHeader } from "../../page";
 import { BookingSummary, BookingSummaryFooter } from "../../order-process";
+import { cartSumByOrderProducts } from "../../order-process/components/BookingSummary/utils";
 
 export interface PaymentMetadata {
   total: number;
@@ -99,6 +100,19 @@ export const PaymentPage = ({
     );
   }
 
+  const orderTotalAmounByFormValues = cartSumByOrderProducts(
+    bookingSummaryProps && bookingSummaryProps?.formValues
+      ? Object.values(bookingSummaryProps?.formValues)
+      : undefined
+  );
+
+  // User can fill promocode only in iframe appcliation.
+  // It didn't possible via payment link. This check will
+  // be applied when there are no metadata and in case when
+  // orderValues sum is greater than amount in order.
+  const isCalculatedAmountGreaterThanOrderAmount =
+    orderTotalAmounByFormValues > data?.amount;
+
   return (
     <Page
       className="payment_link"
@@ -127,7 +141,7 @@ export const PaymentPage = ({
             bottomBlock={
               <BookingSummaryFooter showButton={false}>
                 <div className="d-flex flex-column justify-content-between">
-                  {paymentMetadata && (
+                  {paymentMetadata ? (
                     <>
                       <SummaryTotalBlock
                         label={t("total")}
@@ -137,12 +151,38 @@ export const PaymentPage = ({
                         label={t("paidSum")}
                         amount={paymentMetadata.paid || 0}
                       />
+                      <SummaryTotalBlock
+                        label={t("remaining")}
+                        amount={
+                          paymentMetadata.total - paymentMetadata.paid || 0
+                        }
+                      />
+                    </>
+                  ) : (
+                    <>
+                      {isCalculatedAmountGreaterThanOrderAmount && (
+                        <SummaryTotalBlock
+                          label={t("total")}
+                          amount={
+                            orderTotalAmounByFormValues +
+                            (bookingSummaryProps?.transactionFee || 0)
+                          }
+                        />
+                      )}
+
+                      <SummaryTotalBlock
+                        label={t(
+                          isCalculatedAmountGreaterThanOrderAmount
+                            ? "totalWithDiscount"
+                            : "total"
+                        )}
+                        amount={
+                          data?.amount +
+                          (bookingSummaryProps?.transactionFee || 0)
+                        }
+                      />
                     </>
                   )}
-                  <SummaryTotalBlock
-                    label={t(paymentMetadata ? "remaining" : "total")}
-                    amount={data?.amount || 0}
-                  />
                 </div>
               </BookingSummaryFooter>
             }

package/src/iframe/payment/payment-page/PaymentTimer.tsx

@@ -1,16 +1,41 @@
-import React, { useContext, useLayoutEffect } from "react";
+import React, { useContext, useEffect, useLayoutEffect } from "react";
 import { PaymentSessionContext } from "@licklist/plugins/dist/context/payment/PaymentSessionContext";
+import { useTimer } from "@licklist/plugins/dist";
 import { Timer } from "../../order-process";
 
+// 10 minutes in ms
+export const PAYMENT_TIMER_TOTAL_TIME = 600000;
+
 export const PaymentTimer = () => {
-  const { timer, startPaymentSessionTimer, isTimerStarted, setTimer } =
-    useContext(PaymentSessionContext);
+  const { timer, startTimer, isTimerStarted, resetTimer } = useTimer({
+    timerTime: PAYMENT_TIMER_TOTAL_TIME,
+  });
+
+  const { setIsPaymentSessionExpired, isResetTimer } = useContext(
+    PaymentSessionContext
+  );
+
+  useEffect(() => {
+    if (!isResetTimer) {
+      return;
+    }
+    resetTimer();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isResetTimer]);
+
+  useEffect(() => {
+    // Sometimes we can get not round time in ms
+    if (timer > 1000) {
+      return;
+    }
+    setIsPaymentSessionExpired(true);
+    resetTimer();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [timer]);
 
   useLayoutEffect(() => {
-    setTimer(600);
     if (isTimerStarted) return;
-
-    startPaymentSessionTimer();
+    startTimer();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);