@licklist/design 0.44.485-dev.17 → 0.44.485-dev.2

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

@@ -1,6 +1,5 @@
 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";
 
@@ -9,7 +8,6 @@ export type CategoryProps = {
   activePointId?: number;
   pointProducts: PointProduct[];
   onCloseModal: () => void;
-  soldOutProducts?: ProductQuantityCheckResponse["products"];
 };
 
 export const Category = ({
@@ -17,7 +15,6 @@ export const Category = ({
   activePointId,
   pointProducts,
   onCloseModal,
-  soldOutProducts,
 }: CategoryProps) => {
   return (
     <>
@@ -34,7 +31,6 @@ export const Category = ({
                     activePointId={activePointId}
                     pointProducts={pointProducts}
                     onCloseModal={onCloseModal}
-                    soldOutProducts={soldOutProducts}
                   />
                 );
               })}

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

@@ -2,7 +2,6 @@ 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";
@@ -13,7 +12,6 @@ export type CategoryProductModalProps = {
   category: ProductCategory;
   pointProducts: PointProduct[];
   onCloseModal: () => void;
-  soldOutProducts?: ProductQuantityCheckResponse["products"];
 };
 
 export const CategoryProductModal = ({
@@ -22,7 +20,6 @@ export const CategoryProductModal = ({
   category,
   pointProducts,
   onCloseModal,
-  soldOutProducts,
 }: CategoryProductModalProps) => {
   const activePointProduct = useMemo(
     () =>
@@ -45,7 +42,6 @@ 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,7 +8,6 @@ import { StepsFormProps } from "../StepsForm/StepsForm";
 interface CategoryProps {
   productCategories: ProductCategory[];
   productsWithErrors?: StepsFormProps["productsWithErrors"];
-  soldOutProducts?: StepsFormProps["productsWithErrors"];
   errors?: DeepMap<Record<string, any>, FieldError>;
 }
 
@@ -16,7 +15,6 @@ export function Category({
   productCategories,
   productsWithErrors,
   errors,
-  soldOutProducts,
 }: CategoryProps) {
   return (
     <>
@@ -39,7 +37,6 @@ export function Category({
                     product={product}
                     category={category}
                     productsWithErrors={productsWithErrors}
-                    soldOutProducts={soldOutProducts}
                   />
                 );
               })}

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

@@ -15,7 +15,6 @@ interface CategoryProductProps {
   category: ProductCategory;
   canExpandDescription?: boolean;
   productsWithErrors?: StepsFormProps["productsWithErrors"];
-  soldOutProducts?: StepsFormProps["productsWithErrors"];
 }
 
 export const CategoryProduct = ({
@@ -23,7 +22,6 @@ export const CategoryProduct = ({
   category,
   canExpandDescription = true,
   productsWithErrors,
-  soldOutProducts,
 }: CategoryProductProps) => {
   const { formatNumber } = useIntl();
   const { t } = useTranslation(["Design", "Validation"]);
@@ -51,16 +49,6 @@ 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;
@@ -148,10 +136,7 @@ export const CategoryProduct = ({
                 productInfo={productInfo}
                 ref={ref}
                 clearErrors={clearErrors}
-                product={{
-                  ...product,
-                  isSoldOut: product?.isSoldOut || checkIfSoldOutProduct(),
-                }}
+                product={product}
                 category={category}
                 invalid={invalid}
                 deposit={deposit}

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

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

package/src/iframe/payment/order-items-table/OrderItemsTable.stories.tsx

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

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

@@ -1,16 +1,13 @@
-import {
-  Order,
-  ORDER_FEE_CHARGE_TYPE_CLIENT,
-} from "@licklist/core/dist/DataMapper/Order/OrderDataMapper";
+import { Order } 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 {
@@ -19,35 +16,14 @@ export enum PAYMENT_TYPE_TITLES {
   VAT = "VAT",
 }
 
-interface ExternalPaymnetDetail {
-  translateKey: string;
-  price: number;
-}
-
-export const calculateTotalPrice = (
-  order: Order,
-  externalPaymentDetails?: ExternalPaymnetDetail[]
-) => {
-  const totalPrice =
-    order?.orderProducts?.reduce(
+export const calculateTotalPrice = (orderProducts: Order["orderProducts"]) => {
+  return (
+    orderProducts?.reduce(
       (total: number, product) =>
         total + (product?.quantity ?? 1) * product.price,
       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;
+    ) ?? 0
+  );
 };
 
 export const calculateTotalDiscount = (payments: Order["payments"]) => {
@@ -75,37 +51,21 @@ 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?.reduce((sumOfPayments, payment) => {
-        if (payment.paymentType.title !== PAYMENT_TYPE_TITLES.FEE) {
-          return sumOfPayments;
-        }
-
-        return sumOfPayments + (payment?.amount ?? 0);
-      }, 0) ?? 0;
+      payments.find((payment) => payment.paymentType.title === paymentTypeTitle)
+        ?.amount ?? 0;
 
     const vatValue =
-      payments?.reduce((sumOfPayments, payment) => {
-        if (payment.paymentType.title !== PAYMENT_TYPE_TITLES.VAT) {
-          return sumOfPayments;
-        }
-        return sumOfPayments + (payment?.amount ?? 0);
-      }, 0) ?? 0;
+      payments.find(
+        (payment) => payment.paymentType.title === PAYMENT_TYPE_TITLES.VAT
+      )?.amount ?? 0;
     return feeWithoutVatValue + vatValue;
   }
-
   return (
-    payments?.reduce((sumOfPayments, payment) => {
-      if (payment.paymentType.title !== paymentTypeTitle) {
-        return sumOfPayments;
-      }
-      return sumOfPayments + (payment?.amount ?? 0);
-    }, 0) ?? 0
+    payments.find((payment) => payment.paymentType.title === paymentTypeTitle)
+      ?.amount ?? 0
   );
 };
 

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

@@ -15,7 +15,6 @@ 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;
@@ -100,17 +99,6 @@ export const PaymentPage = ({
     );
   }
 
-  const orderTotalAmounByFormValues = cartSumByOrderProducts(
-    Object.values(bookingSummaryProps?.formValues)
-  );
-
-  // 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"
@@ -139,7 +127,7 @@ export const PaymentPage = ({
             bottomBlock={
               <BookingSummaryFooter showButton={false}>
                 <div className="d-flex flex-column justify-content-between">
-                  {paymentMetadata ? (
+                  {paymentMetadata && (
                     <>
                       <SummaryTotalBlock
                         label={t("total")}
@@ -149,39 +137,12 @@ export const PaymentPage = ({
                         label={t("paidSum")}
                         amount={paymentMetadata.paid || 0}
                       />
-                      <SummaryTotalBlock
-                        label={t("remaining")}
-                        amount={
-                          data?.amount +
-                          (bookingSummaryProps?.transactionFee || 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-status-page/PaymentStatusPage.tsx

@@ -9,8 +9,6 @@ import { BookingSummary, BookingSummaryFooter } from "../../order-process";
 import { PaymentStatusHeader } from "../payment-status-header/PaymentStatusHeader";
 import { SummaryTotalBlock } from "../../order-process/components/BookingSummary/components/SummaryTotal";
 import { BookingSummaryProps } from "../../order-process/components/BookingSummary/types";
-import { PaymentMetadata } from "../payment-page/PaymentPage";
-import { cartSumByOrderProducts } from "../../order-process/components/BookingSummary/utils";
 
 export const ORDER_STATUS_FAILED = "failed";
 export const ORDER_STATUS_SUCCESS = "success";
@@ -25,6 +23,7 @@ interface PaymentStatusComponentProps {
   onCloseWindow: () => void;
   onBack?: () => void;
   onTryAgain?: () => void;
+  totalAmount?: number;
   isLoading?: boolean;
   status: OrderStatusPrefix;
   isAppUsingInIframe?: boolean;
@@ -32,8 +31,6 @@ interface PaymentStatusComponentProps {
   EventCardComponent?: ReactNode;
   showCloseButton?: boolean;
   email?: string;
-  totalAmount?: number;
-  paymentMetadata?: PaymentMetadata;
 }
 
 // @TODO In future think, how to reuse this component in Iframe Pending, Success and Failed Pages
@@ -41,6 +38,7 @@ export const PaymentStatusPage = ({
   onCloseWindow,
   onBack,
   onTryAgain,
+  totalAmount,
   isLoading,
   status,
   isAppUsingInIframe,
@@ -48,8 +46,6 @@ export const PaymentStatusPage = ({
   EventCardComponent,
   showCloseButton = false,
   email,
-  totalAmount = 0,
-  paymentMetadata,
 }: PaymentStatusComponentProps) => {
   const { t } = useTranslation("Design");
 
@@ -69,20 +65,6 @@ export const PaymentStatusPage = ({
   if (isLoading) {
     return <LoaderIndicator isLoaded={false} />;
   }
-
-  const orderTotalAmounByFormValues = cartSumByOrderProducts(
-    Object.values(bookingSummaryProps?.formValues)
-  );
-
-  // 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.
-  // For payment status page booking summary props can be empty
-  // so we should also check for them
-  const isCalculatedAmountGreaterThanOrderAmount =
-    bookingSummaryProps && orderTotalAmounByFormValues > totalAmount;
-
   return (
     <Page
       className="payment-status-page"
@@ -116,51 +98,16 @@ export const PaymentStatusPage = ({
           <PageBody.RightBlock
             bottomBlock={
               <BookingSummaryFooter showButton={false}>
-                <div className="d-flex flex-column justify-content-between">
-                  {paymentMetadata ? (
-                    <>
-                      <SummaryTotalBlock
-                        label={t("total")}
-                        amount={paymentMetadata.total || 0}
-                      />
-                      <SummaryTotalBlock
-                        label={t("paidSum")}
-                        amount={paymentMetadata.paid || 0}
-                      />
-                      <SummaryTotalBlock
-                        label={t("remaining")}
-                        amount={
-                          totalAmount +
-                          (bookingSummaryProps?.transactionFee || 0)
-                        }
-                      />
-                    </>
-                  ) : (
-                    <>
-                      {isCalculatedAmountGreaterThanOrderAmount && (
-                        <SummaryTotalBlock
-                          label={t("total")}
-                          amount={
-                            orderTotalAmounByFormValues +
-                            (bookingSummaryProps?.transactionFee || 0)
-                          }
-                        />
-                      )}
-
-                      <SummaryTotalBlock
-                        label={t(
-                          isCalculatedAmountGreaterThanOrderAmount
-                            ? "totalWithDiscount"
-                            : "total"
-                        )}
-                        amount={
-                          totalAmount +
-                          (bookingSummaryProps?.transactionFee || 0)
-                        }
-                      />
-                    </>
-                  )}
-                </div>
+                {bookingSummaryProps?.formValues ? (
+                  <BookingSummary.SummaryTotal
+                    formValues={bookingSummaryProps?.formValues}
+                  />
+                ) : (
+                  <SummaryTotalBlock
+                    label={t("total")}
+                    amount={totalAmount || 0}
+                  />
+                )}
               </BookingSummaryFooter>
             }
           >

package/src/product-set/form/ProductCategoriesControl.tsx

@@ -165,10 +165,7 @@ export function ProductCategoriesControl({
         return sum + Number(product.price) * Number(product.totalQuantity);
       }, 0);
       const quantity = productCategory.products?.reduce((sum, product) => {
-        const productQuantity = !product.isUnlimited
-          ? Number(product.totalQuantity)
-          : 0;
-        return sum + productQuantity;
+        return sum + Number(product.totalQuantity);
       }, 0);
 
       setProductCategoryState((prevState) => ({

package/src/product-set/form/ProductsControl.tsx

@@ -85,14 +85,11 @@ export function ProductsControl({
     trigger,
     setValue,
     watch,
-    getValues,
   } = form;
 
   const productControlFieldName =
     `steps.${stepIndex}.productCategories.${productCategoryIndex}.products` as const;
 
-  const productPointsKey = `steps.${stepIndex}.pointProducts` as const;
-
   const { fields, append, remove, move } = useFieldArray({
     name: productControlFieldName,
     control,
@@ -159,22 +156,6 @@ export function ProductsControl({
     });
   };
 
-  const onProductRemove = (index: number) => {
-    const currentProduct = getValues(
-      `${productControlFieldName}.${index}` as const
-    );
-
-    const currentPointProducts = getValues(productPointsKey);
-
-    setValue(
-      productPointsKey,
-      currentPointProducts?.filter(
-        (product) => product.productUuid !== currentProduct.uuid
-      ) || []
-    );
-    remove(index);
-  };
-
   return (
     <>
       <SortableTree
@@ -238,7 +219,7 @@ export function ProductsControl({
                     categoryType={categoryType}
                   />
                 }
-                onDelete={() => onProductRemove(index)}
+                onDelete={() => remove(index)}
                 validate={() => trigger(`${productControlFieldName}.${index}`)}
                 // preItem={<Popover className="d-none d-sm-block" />}
               >