@licklist/design 0.71.18-dev.1 → 0.71.18-dev.11

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

@@ -1,14 +1,19 @@
+import { useState } from 'react'
 import clsx from 'clsx'
 import { Button } from 'react-bootstrap'
+import { isEmpty } from 'lodash'
 import { useTranslation } from 'react-i18next'
 import { FieldValues, RefCallBack, UseFormClearErrors } from 'react-hook-form'
 import {
   Product,
   ProductCategory,
 } from '@licklist/plugins/dist/types/context/sale/menuSteps'
+import { OrderModifierByProduct } from '@licklist/core/dist/DataMapper/Order/OrderModifiierByProduct'
 import { NumberInput } from '../NumberInput'
+ // eslint-disable-next-line
+import { ProductWithModifierSetModal } from '../../../../../ProductWithModifierModal/ModifierSetModal/ProductWithModifierSetModal'
 
-interface FormOrderItem {
+export interface FormOrderItem {
   id: number
   name: string
   price: number
@@ -17,6 +22,7 @@ interface FormOrderItem {
   deposit?: number | null
   quantity: number
   capacity?: number | null
+  orderModifiersSets?: OrderModifierByProduct[] | null
 }
 
 interface ProductQuantityInputProps {
@@ -40,6 +46,7 @@ export const ProductQuantityInput = ({
   invalid,
 }: ProductQuantityInputProps) => {
   const { t } = useTranslation('Design')
+  const [open, handleOpenModal] = useState(false)
 
   const onChange = (quantity: number | null) => {
     _onChange({
@@ -48,12 +55,35 @@ export const ProductQuantityInput = ({
       deposit: product?.deposit,
       hasDeposit: category.allowDeposits && product?.deposit < product.price,
       price: product.price,
+      orderModifiersSets: [],
       productCategoryId: category.id,
       quantity,
       capacity: product?.capacity,
     })
   }
 
+  const onChangeWithModifierSets = (productOrder: FormOrderItem) => {
+    if (isEmpty(productInfo)) {
+      _onChange(productOrder)
+      return handleOpenModal(false)
+    }
+
+    _onChange({
+      id: productInfo.id,
+      name: productInfo.name,
+      deposit: productInfo?.deposit,
+      hasDeposit: productInfo.hasDeposit,
+      price: productInfo.price,
+      orderModifiersSets: productInfo.orderModifiersSets?.concat(
+        productOrder.orderModifiersSets,
+      ),
+      productCategoryId: category.id,
+      quantity: productInfo.quantity + productOrder.quantity,
+      capacity: productInfo?.capacity,
+    })
+    return handleOpenModal(false)
+  }
+
   if (product.isSoldOut) {
     return (
       <div className='iframe-event__sold-out-wrapper'>
@@ -62,6 +92,33 @@ export const ProductQuantityInput = ({
     )
   }
 
+  if ((product as Product).modifiersSet.length) {
+    return (
+      <>
+        <Button
+          ref={refCallback}
+          disabled={product.isSoldOut}
+          className={clsx(
+            `iframe-event__${
+              productInfo?.quantity ? 'unselect-product' : 'select-product'
+            }`,
+            invalid && 'error',
+          )}
+          onClick={() => handleOpenModal(true)}
+        >
+          +
+        </Button>
+        <ProductWithModifierSetModal
+          show={open}
+          onHide={() => handleOpenModal(false)}
+          onChange={onChangeWithModifierSets}
+          product={product}
+          category={category}
+        />
+      </>
+    )
+  }
+
   if (product?.maxAmount === 1) {
     return (
       <Button

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

@@ -0,0 +1,86 @@
+import { Button } from 'react-bootstrap'
+import { useTranslation } from 'react-i18next'
+import { FaTrashAlt } from 'react-icons/fa'
+import { Config } from '@licklist/core'
+import { useIntl } from 'react-intl'
+import { OrderModifierByProduct } from '@licklist/core/dist/DataMapper/Order/OrderModifiierByProduct'
+import {
+  getOrderProductModifiersPrice,
+  getModifierName,
+} from '../../../BookingSummary/utils'
+
+export interface FormOrderItem {
+  id: number
+  name: string
+  price: number
+  productCategoryId: number
+  hasDeposit?: boolean
+  deposit?: number | null
+  quantity: number
+  capacity?: number | null
+  orderModifiersSets?: OrderModifierByProduct[] | null
+}
+
+interface ProductQuantityInputProps {
+  modifier: OrderModifierByProduct
+  modifierKey: number
+  isManualBooking?: boolean
+  isSummary? :boolean
+  deleteOrderModifier?: (order: number) => void
+  editOrderModifierSet?: (order: number) => void
+}
+
+export const ProductWithModifier = ({
+  modifier,
+  modifierKey,
+  isManualBooking = false,
+  isSummary = false,
+  deleteOrderModifier,
+  editOrderModifierSet,
+}: ProductQuantityInputProps) => {
+  const { t } = useTranslation('Design')
+  const { formatNumber } = useIntl()
+
+  const modifierName = getModifierName(modifier)
+
+  const orderModifierDescription = `${modifier.productQuantity}`
+
+  const modifierPrice = getOrderProductModifiersPrice(modifier)
+
+  const fullModifiersPrice = formatNumber(modifierPrice, {
+    style: 'currency',
+    currency: Config.Currency.GBP,
+  })
+  return (
+    <div
+      key={modifierKey}
+      className='d-flex p-2 justify-content-between align-items-center'
+    >
+      <div className='d-flex'>
+        <p className='font-weight-bold w-25 pr-4'>{`${orderModifierDescription} x`}</p>
+        <p>{modifierName ? ` ${modifierName}` : t('withoutModifier')}</p>
+      </div>
+      {isManualBooking || isSummary ? (
+        <p className='price'>{fullModifiersPrice}</p>
+      ) : (
+        <div>
+          <Button
+            className='ml-2'
+            variant='link'
+            onClick={() => editOrderModifierSet(modifierKey)}
+          >
+            {t('customise')}
+          </Button>
+
+          <Button
+            className='ml-2'
+            variant='link'
+            onClick={() => deleteOrderModifier(modifierKey)}
+          >
+            <FaTrashAlt />
+          </Button>
+        </div>
+      )}
+    </div>
+  )
+}

package/src/iframe/order-process/components/CategoryProduct/constants.ts

@@ -0,0 +1 @@
+export const MAX_PRODUCT_NUMBER = 100000 // max number

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

@@ -0,0 +1,25 @@
+import { useEffect } from 'react'
+
+export type UseOnWindowUnmountProps = {
+  onBeforeUnload: (event: Event) => void
+  onPopState: (event: Event) => void
+}
+
+export const useOnWindowUnmount = ({
+  onBeforeUnload,
+  onPopState,
+}: UseOnWindowUnmountProps) => {
+  useEffect(() => {
+    window.history.pushState(null, '', window.location.pathname)
+    window.addEventListener('beforeunload', onBeforeUnload)
+    window.addEventListener('popstate', onPopState)
+
+    return () => {
+      window.removeEventListener('beforeunload', onBeforeUnload)
+      window.removeEventListener('popstate', onPopState)
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [])
+
+  return null
+}

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

@@ -1,8 +1,9 @@
 import { useMemo } from 'react'
-import { uniqueId } from 'lodash'
+import { uniqueId, flatMap, flatten, map } from 'lodash'
 import { useIntl } from 'react-intl'
 import { useTranslation } from 'react-i18next'
 import { Product } from '@licklist/core/dist/DataMapper/Product/ProductDataMapper'
+import { OrderModifier } from '@licklist/core/dist/DataMapper/Order/OrderModifierDataMapper'
 import {
   PAYMENT_TYPE_VAT,
   PAYMENT_TYPE_FEE,
@@ -12,6 +13,10 @@ import { StaticTableData } from '../../../../table'
 import { getProductQuantityAndPrice, getTotalSumByCategory } from '../utils'
 import { OrderItemsTableProps, SummaryItem } from '../types'
 import { getOrderSummaryItems } from '../utils/paymentSummary'
+import { Order } from '@licklist/core/dist/DataMapper'
+import { OrderPayment } from '@licklist/core/dist/DataMapper/Order/OrderPaymentDataMapper'
+import { OrderProduct } from '@licklist/core/dist/DataMapper/Order/OrderProductDataMapper'
+import { OrderModifierByProduct } from '@licklist/core/dist/DataMapper/Order/OrderModifiierByProduct'
 
 const CURRENCY_DEFAULT = 'GBP'
 export const PAYMENT_TYPE_TRANSLATE_KEYS = {
@@ -50,19 +55,67 @@ export const useTableData = ({
     ),
   })
 
-  const renderProductItem = (product: Product) => {
-    const { quantity, price } = getProductQuantityAndPrice(
-      order.orderProducts,
-      product,
-    )
+  const reworkProductStructure = (order: OrderProduct) =>
+    order
+      ? flatMap(order, (item) => {
+          if (!item || !Array.isArray(item)) return []
+          return item.map((modGroup, idx) => ({
+            deletedAt: order.deletedAt ?? null,
+            id: `${order.id}-${idx + 1}`, // Ensuring uniqueness with string concatenation
+            orderId: order.orderId ?? null,
+            price: order.price ?? 0,
+            productId: order.productId ?? '',
+            quantity: modGroup.productQuantity ?? 1,
+            deposit: order.deposit ?? 0,
+            orderProductModifiers: modGroup.modifiers.map((mod) => ({
+              modifierId: mod.modifierId ?? '',
+              price: mod.price ?? 0,
+              productId: mod.productId ?? '',
+              quantity: mod.quantity ?? 1,
+              modifierSetId: mod.modifierSetId ?? '',
+              modifier: mod.modifier ?? null,
+            })),
+          }))
+        })
+      : []
+
+  const renderProductItem = ({
+    product,
+    productsForCategory,
+  }: {
+    product: OrderProduct
+    productsForCategory: Product[]
+  }) => {
+    if (product.quantity === 0) {
+      return null
+    }
+ 
+    const name =
+      productsForCategory.find((item) => item.id === product.productId)?.name || ''
 
+    return {
+      key: product.id,
+      name,
+      quantity: (
+        <div className='quantity'>
+          <div className='multiplier'>x</div>
+          {product.quantity}
+        </div>
+      ),
+      price: formatPrice(product.price),
+      modifier: product?.orderProductModifiers?.map(renderModifierItem) || [],
+    }
+  }
+
+  const renderModifierItem = (orderModifier: OrderModifier) => {
+    const { quantity, modifier, modifierId, price } = orderModifier
     if (quantity === 0) {
       return null
     }
 
     return {
-      key: product.id,
-      name: product.name,
+      key: modifierId,
+      name: ` - ${modifier?.name || ''}`,
       quantity: (
         <div className='quantity'>
           <div className='multiplier'>x</div>
@@ -80,15 +133,33 @@ export const useTableData = ({
 
     return productCategories.reduce(
       (previousValues: StaticTableData[], categoryId) => {
-        const products = order.products.filter(
+        const productsForCategory = order?.products.filter(
           (product) => product.productCategoryId === categoryId,
         )
 
+        const products = order.orderProducts.filter((el) =>
+          productsForCategory
+            .map((product) => product.id)
+            .includes(el.productId),
+        )
+
         if (!products.length) {
           return previousValues
         }
-
-        const filteredProducts = products.map(renderProductItem).filter(Boolean)
+        const productsWithReworkedModifier = products.map((product) => {
+          if (!product.orderProductModifiers.length) return product
+          return reworkProductStructure(product)
+        })
+
+        const filteredProducts =  flatten(productsWithReworkedModifier).map(
+          (product) =>
+            renderProductItem({ product , productsForCategory }),
+        )
+ 
+        const productWithModifier = flatMap(filteredProducts, (item) => [
+          item,
+          ...item.modifier,
+        ])
 
         if (!filteredProducts.length) {
           return previousValues
@@ -96,8 +167,8 @@ export const useTableData = ({
 
         return [
           ...previousValues,
-          renderCategoryItem(products),
-          ...filteredProducts,
+          renderCategoryItem(productsForCategory),
+          ...productWithModifier,
         ]
       },
       [],
@@ -133,6 +204,5 @@ export const useTableData = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [order, externalDiscount, isPaymentProcessed],
   )
-
   return data
 }

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

@@ -6,6 +6,7 @@ import { Product } from '@licklist/core/dist/DataMapper/Product/ProductDataMappe
 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'
+import { OrderModifier } from '@licklist/core/dist/DataMapper/Order/OrderModifierDataMapper'
 
 const TRANSLATE_KEYS = {
   totalAmount: 'totalPaid',
@@ -28,6 +29,7 @@ export const calculateTotalPrice = (
   order: Order,
   externalPaymentDetails?: ExternalPaymnetDetail[],
 ) => {
+
   const totalPrice =
     order?.orderProducts?.reduce(
       (total: number, product) =>
@@ -125,5 +127,26 @@ export const getTotalSumByCategory = (
       product,
     )
 
+    const modifierFromProduct = orderProducts.find(
+      (orderProduct) => orderProduct.productId === product.id,
+    )?.orderProductModifiers
+    if (modifierFromProduct) {
+      const modifierPrice = modifierFromProduct.reduce(
+        (prevSum: number, { modifiers }) => {
+          const modifiersPrices = modifiers.reduce(
+            (prevSumModifier: number, modifier: OrderModifier) =>
+              prevSumModifier + modifier.price * modifier.quantity,
+            0,
+          )
+
+          return prevSum + modifiersPrices
+        },
+        0,
+      )
+      const priceWithModifier = price + modifierPrice
+
+      return prevSum + priceWithModifier * quantity
+    }
+
     return prevSum + price * quantity
   }, 0)

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

@@ -23,7 +23,7 @@ const paymentNotProcessedSummary = ({
     ? getExternalPaymentDetail(paymentDetail)
     : undefined
 
-  const total = calculateTotalPrice(order, externalPaymentDetail)
+  const total = order?.fullAmount || calculateTotalPrice(order, externalPaymentDetail)
 
   const summaryItems: SummaryItem[] = [
     {
@@ -58,7 +58,7 @@ const processedPaymentSummary = ({
           price: getPaymentValueByType(order.payments, key),
         }))
 
-  const total = calculateTotalPrice(order, externalPaymentDetail)
+  const total = order.fullAmount || calculateTotalPrice(order, externalPaymentDetail)
 
   const totalDiscount = calculateTotalDiscount(order.payments)
 

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

@@ -131,6 +131,12 @@ export const PaymentPage = ({
   const totalPaidWithRemainingToPay =
     data?.amount_to_pay && !!Number(data?.amount_to_pay)
 
+  const totalBooked = paymentMetadata
+    ? paymentMetadata.paid
+      ? paymentMetadata.total - paymentMetadata.paid
+      : paymentMetadata.total
+    : orderTotalAmountByFormValues + (bookingSummaryProps?.transactionFee ?? 0)
+
   return (
     <Page className='payment_link'>
       {/* TODO wait for Brad's design for close and go back buttons */}
@@ -156,16 +162,8 @@ export const PaymentPage = ({
             <BookingSummary
               {...bookingSummaryProps}
               isPaymentPage
-              headerComponent={
-                <SummaryTotalBlock
-                  amount={
-                    paymentMetadata
-                      ? paymentMetadata.total
-                      : orderTotalAmountByFormValues +
-                        (bookingSummaryProps?.transactionFee || 0)
-                  }
-                />
-              }
+              headerTitle={t('totalBooking')}
+              headerComponent={<SummaryTotalBlock amount={totalBooked} />}
               footer={
                 <div className='d-flex flex-column justify-content-between'>
                   {paymentMetadata ? (

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

@@ -6,6 +6,7 @@ import { TFunction, useTranslation } from 'react-i18next'
 import { VenueMapSet } from '@licklist/core/dist/DataMapper/Product/VenueMapSetDataMapper'
 import { ServerError } from '@licklist/plugins/dist/hooks/Api/useHttpQuery'
 import FormErrorService from '@licklist/plugins/dist/services/Form/FormErrorService'
+import { ModifierSet } from '@licklist/core/dist/DataMapper/Product/ModifierSetDataMapper'
 
 import { isEqual } from 'lodash'
 // eslint-disable-next-line max-len
@@ -22,7 +23,11 @@ import {
 import { Step } from '../types'
 import { ProductSetContextProvider, ProductSetLoadingContext } from './context'
 import { SelectItem } from '../../types/generic/SelectItem'
-import { checkAvailableTimesErrors, getFilteredTemplates } from '../utils'
+import {
+  checkAvailableTimesErrors,
+  updateModifiersSetAtProductSetForm,
+  getFilteredTemplates,
+} from '../utils'
 import { ErrorModal } from '../../iframe/order-process/components/ErrorModal'
 
 export interface WithIsLoading {
@@ -62,6 +67,7 @@ export interface ProductSetFormProps
   saleDeadline?: number
   isCreateNewOverrides?: boolean
   timeZone: string
+  modifiersSetList?: ModifierSet[]
 }
 
 export function ProductSetForm({
@@ -71,6 +77,7 @@ export function ProductSetForm({
   onSubmitAndRedirect,
   onSubmitNoRedirect,
   productGroupList,
+  modifiersSetList,
   serverErrors,
   providerHasMap = false,
   venueMapSets = [],
@@ -95,7 +102,7 @@ export function ProductSetForm({
   const [errorMessage, setErrorMessage] = useState('')
 
   const form = useForm<ProductSetFormValues>({
-    defaultValues,
+    defaultValues: updateModifiersSetAtProductSetForm(defaultValues),
     mode: 'onChange',
   })
 
@@ -122,7 +129,7 @@ export function ProductSetForm({
     if (!defaultValues || isEqual(defaultValues, formValues)) {
       return
     }
-    reset(defaultValues)
+    reset(updateModifiersSetAtProductSetForm(defaultValues))
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [defaultValues])
 
@@ -162,6 +169,7 @@ export function ProductSetForm({
     <ProductSetContextProvider
       productGroupList={productGroupList}
       providerHasMap={providerHasMap}
+      modifiersSetList={modifiersSetList}
       venueMapSets={venueMapSets}
       providerHasBookingManagement={providerHasBookingManagement}
       zones={zones}

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

@@ -49,6 +49,8 @@ const getDefaultProductValue = (sort: number): Product => ({
   maxQuantity: null,
   totalQuantity: 0,
   isAvailable: true,
+  modifiersSet: [],
+  modifiersSetsId: [],
   isSoldOut: false,
   isRequired: false,
   isUnlimited: false,
@@ -139,6 +141,16 @@ export function ProductsControl({
     ],
   })
 
+  const modifierSets = useWatch({
+    control,
+    name: [
+      ...fields.map(
+        (_, index) =>
+          `${productControlFieldName}.${index}.modifiersSet` as const,
+      ),
+    ],
+  })
+
   const categoryProductErrors =
     errors?.steps?.[stepIndex]?.productCategories?.[productCategoryIndex]
       ?.products
@@ -199,6 +211,7 @@ export function ProductsControl({
             : isOverrides && !!product.originalProductId
 
           const isNewProductOverrides = isCreateNewOverrides && !!product.id
+          const modifiersSets = modifierSets[index]?.length || 0
 
           return (
             <Controller
@@ -226,21 +239,26 @@ export function ProductsControl({
                   edit={() => edit(index)}
                   secondaryBadge={getBadgeConfig(categoryType, t(categoryType))}
                   subTitle={
-                    <div className='product-set-badges-container'>
-                      <div className='product-set-subtitle-dot product-set-subtitle-product-dot' />
-                      <span>
-                        {`£${prices[index]} ${t('each')} - ${t('qty')}:${
-                          !isUnlimitedQuantities[index]
-                            ? ` ${quantities[index]}`
-                            : t(' unlimited')
-                        } ${
-                          !isUnlimitedQuantities[index]
-                            ? ` - ${t('possibleRevenue')} £${
-                                prices[index] * quantities[index]
-                              }`
-                            : ''
-                        } `}
-                      </span>
+                    <div className='d-flex justify-content-between'>
+                      <div className='product-set-badges-container'>
+                        <div className='product-set-subtitle-dot product-set-subtitle-product-dot' />
+                        <span>
+                          {`£${prices[index]} ${t('each')} - ${t('qty')}:${
+                            !isUnlimitedQuantities[index]
+                              ? ` ${quantities[index]}`
+                              : t(' unlimited')
+                          } ${
+                            !isUnlimitedQuantities[index]
+                              ? ` - ${t('possibleRevenue')} £${
+                                  prices[index] * quantities[index]
+                                }`
+                              : ''
+                          } `}
+                        </span>
+                      </div>
+                      {!!modifiersSets && (
+                        <Badge className='modifier-badge'>{`${modifiersSets} ${t('modifiersSets')}`}</Badge>
+                      )}
                     </div>
                   }
                   modalLabel={t('addNewProduct')}

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

@@ -7,15 +7,18 @@ import {
   Dispatch,
 } from 'react'
 import { VenueMapSet } from '@licklist/core/dist/DataMapper/Product/VenueMapSetDataMapper'
+import { ModifierSet } from '@licklist/core/dist/DataMapper/Product/ModifierSetDataMapper'
 // eslint-disable-next-line max-len
 import { ProviderBookingManagementSetting } from '@licklist/core/dist/DataMapper/Provider/ProviderBookingManagementSettingDataMapper'
 import { Zone } from '@licklist/core/dist/DataMapper/Provider/ZoneDataMapper'
 import { SelectItem } from '../../types/generic/SelectItem'
 
+
 interface LoadingContext {
   isLoading: boolean
   setLoading: (loading: boolean) => void
   productGroupList?: SelectItem[]
+  modifiersSetList?: ModifierSet[] | null
   providerHasMap?: boolean | null
   venueMapSets?: VenueMapSet[]
   providerHasBookingManagement?: ProviderBookingManagementSetting['hasBookingManagement']
@@ -43,6 +46,7 @@ type ProductSetContextProviderProps = PropsWithChildren<
 export function ProductSetContextProvider({
   children,
   productGroupList = [],
+  modifiersSetList =[],
   providerHasMap = false,
   venueMapSets = [],
   providerHasBookingManagement,
@@ -62,6 +66,7 @@ export function ProductSetContextProvider({
         isLoading: loading,
         setLoading,
         productGroupList,
+        modifiersSetList,
         providerHasMap,
         venueMapSets,
         providerHasBookingManagement,