@licklist/design 0.71.18-dev.3 → 0.71.18-dev.4

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/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,
@@ -198,6 +200,8 @@ export function ProductsControl({
             ? !!product.id
             : isOverrides && !!product.originalProductId
 
+          const modifierSets = product?.modifiersSet.length || 0
+
           const isNewProductOverrides = isCreateNewOverrides && !!product.id
 
           return (
@@ -226,21 +230,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>
+                      {!!modifierSets && (
+                        <Badge className='modifier-badge'>{`${modifierSets} ${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,

package/src/product-set/product/ProductControl.tsx

@@ -39,6 +39,8 @@ import {
   IMAGE_TYPE_IMAGE,
 } from '@licklist/core/dist/DataMapper/Media/ImageDataMapper'
 import { FaClipboard } from 'react-icons/fa'
+import { Typeahead } from 'src/typeahead'
+import { convertToTypeaheadOptions } from 'src/sales/coupon/utils'
 import { checkIfZoneCategory } from '@licklist/plugins'
 import { FileUpload } from '../../file-upload'
 import { BooleanSwitch } from '../../static'
@@ -65,6 +67,14 @@ import { ProductZoneControlValues } from '../product-zone'
 import { AdvancedOptions } from './advanced-options'
 import { ProductZonesControl } from '../form/ProductZonesControl'
 
+
+export interface ModifiersSet {
+  id: number
+  value?: string
+  name?: string
+  label?: string
+}
+
 // TO DO refactor this file
 // and add correct types
 export interface ProductControlValues
@@ -88,6 +98,8 @@ export interface ProductControlValues
   hasSpecialNotes: boolean
   minSpend?: number | null
   type?: ProductType
+  modifiersSetsId?: Array<ModifiersSet>
+  modifiersSet?: Array<ModifiersSet>
   weight?: number
   tierId?: number
   images: Image[] | null
@@ -111,6 +123,7 @@ export interface ProductControlProps<T>
   hasTicket?: boolean
   categoryType?: CategoryType
   isOverrides?: boolean
+
 }
 
 export function ProductControl<T extends FormValues>({
@@ -126,6 +139,7 @@ export function ProductControl<T extends FormValues>({
   categoryType,
   isOverrides = false,
 }: ProductControlProps<T>) {
+
   const {
     register,
     control,
@@ -135,14 +149,16 @@ export function ProductControl<T extends FormValues>({
     watch,
   } = useFormContext<T>()
 
-  const { setLoading } = useContext(ProductSetLoadingContext)
+  const { setLoading, modifiersSetList } = useContext(ProductSetLoadingContext)
   const { t } = useTranslation(['Design', 'Validation', 'ProductSet'])
   const [expanded, setExpanded] = useState(false)
+
   const [initialImages, setInitialImages] = useState<Image[] | null>(null)
   // @TODO: After checking "isUnlimited" checkbox need to reset field totalQuantity
   const isUnlimited = Boolean(
     watch(`${fieldNamePrefix}.isUnlimited` as Path<T>),
   )
+
   const advancedId = useId()
   const nameId = useId()
 
@@ -200,6 +216,7 @@ export function ProductControl<T extends FormValues>({
     setInitialImages(formImages as Image[])
   }, [getValues, setInitialImages, fieldNamePrefix])
 
+
   useEffect(() => {
     if (Array.isArray(images)) {
       setValue(
@@ -212,6 +229,9 @@ export function ProductControl<T extends FormValues>({
 
   const quantitySelector = quantityValue ?? '1'
   const quantity = QUANTITY_TYPE_LIST_DTO[quantitySelector as string]
+
+  const modifierList = convertToTypeaheadOptions(modifiersSetList)
+
   return (
     <>
       <Row>
@@ -354,6 +374,22 @@ export function ProductControl<T extends FormValues>({
           </Form.Group>
         </Col>
       </Row>
+      <Row>
+        <Col>
+          <Form.Group className='mb-3'>
+            <Form.Label>{t('Design:addModifierSet')}</Form.Label>
+            <Typeahead
+              name='modifierList'
+              options={modifierList}
+              {...register(`${fieldNamePrefix}.modifiersSet` as Path<T>)}
+              isMultipleChoise
+              isCouponForm
+              placeholder={t('Design:choose')}
+              noOptionsMessage={t('Design:noSelectedModifier')}
+            />
+          </Form.Group>
+        </Col>
+      </Row>
 
       <Row className='my-4 mx-0 d-flex flex-column'>
         {isZoneCategory && (

package/src/product-set/utils/index.ts

@@ -1,5 +1,7 @@
 import { EmailTemplate } from '@licklist/core/dist/DataMapper/Notification/EmailTemplateDataMapper'
 import { SmsTemplate } from '@licklist/core/dist/DataMapper/Notification/SmsTemplateDataMapper'
+import { ModifierSet } from '@licklist/core/dist/DataMapper/Product/ModifierSetDataMapper'
+import { convertToTypeaheadOptions } from 'src/sales/coupon/utils'
 import { TFunction } from 'react-i18next'
 import { UseFormSetError } from 'react-hook-form'
 import { checkIfZoneCategory } from '@licklist/plugins'
@@ -7,6 +9,7 @@ import { ProductSet } from '@licklist/core/dist/DataMapper/Product/ProductSetDat
 import { TemplateItem } from '../control/ProductSetControl'
 import { ProductSetFormValues } from '../form/ProductSetForm'
 
+
 interface CheckAvailableTimesErrors {
   values: ProductSetFormValues
   setError: UseFormSetError<ProductSetFormValues>
@@ -58,6 +61,22 @@ export const getFilteredTemplates = (
     }))
 }
 
+export  const updateModifiersSetAtProductSetForm = (data: ProductSetFormValues) => ({
+  ...data,
+  steps: data.steps.map(step => ({
+      ...step,
+      productCategories: step.productCategories.map(category => ({
+          ...category,
+          products: category.products.map(product => ({
+              ...product,
+              modifiersSet: product?.modifiersSet
+                  ? convertToTypeaheadOptions(product.modifiersSet as ModifierSet[])
+                  : [],
+          })),
+      })),
+  })),
+});
+
 export const checkAvailableTimesErrors = ({
   values,
   setError,

package/src/sales/coupon/utils/index.ts

@@ -1,13 +1,15 @@
+
+import { ModifierSet } from '@licklist/core/dist/DataMapper/Product/ModifierSetDataMapper'
 import { ProductGroup } from '@licklist/core/dist/DataMapper/Product/ProductGroupDataMapper'
 
-export const convertToTypeaheadOptions = (productGroups?: ProductGroup[]) => {
+export const convertToTypeaheadOptions = (productGroups?: ProductGroup[] | ModifierSet[]) => {
   if (!productGroups || !productGroups.length) {
     return []
   }
 
-  return productGroups.map(({ id, name }: ProductGroup) => ({
+  return productGroups.map(({ id, name }: ProductGroup | ModifierSet ) => ({
     id: Number(id),
     value: name,
-    label: name,
+    label: name ,
   }))
 }

package/src/styles/iframe-page/Page.scss

@@ -24,6 +24,22 @@
     min-width: auto;
   }
 
+  .manual-booking-form-modal {
+    width: 40vw !important;
+    left: 60vh;
+  
+    .modal-content {
+      height: 96vh;
+      margin-left: auto;
+    }
+  
+    @include media-breakpoint-down(sm) {
+      width: 100vw !important;
+      left: 0;
+      top: 10% !important;
+    }
+  }
+
   .header-block {
     margin-bottom: 1rem;
   }

package/src/styles/iframe-page/PageBody.scss

@@ -10,6 +10,8 @@
     height: calc(100svh - 5.5rem);
   }
 
+
+
   .left-block {
     flex: 1;
     align-items: stretch;
@@ -25,6 +27,8 @@
       min-height: calc(100svh - 6.5rem);
     }
 
+
+
     .navigation {
       font-size: 1.125rem;
       font-weight: 500;

package/src/styles/modals/Modals.scss

@@ -6,6 +6,22 @@
   z-index: 1080;
 }
 
+.manual-booking-form-modal {
+  width: 40vw !important;
+  left: 66vw;
+
+  .modal-content {
+    min-height: 95vh;
+    margin-left: auto;
+  }
+
+  @include media-breakpoint-down(sm) {
+    width: 100vw !important;
+    left: 0;
+    top: 10% !important;
+  }
+}
+
 .confirm-modal {
   z-index: 1081;
 }

package/src/styles/product-set/ProductSetForm.scss

@@ -58,6 +58,11 @@
     font-weight: 600;
   }
 
+  .modifier-badge {
+    font-size: 0.5rem;
+    font-weight: 400;
+  }
+
   .step-badge {
     background-color: #ffdbdb;
     color: #d52902;
@@ -81,6 +86,11 @@
     background-color: #e9f5ea;
     color: #269b36;
   }
+
+  .modifier-badge {
+    background-color: #e9f5ea;
+    color: #269b36;
+  }
 }
 
 .product-set-mobile-footer {

package/src/styles/sales/ManualBooking.scss

@@ -234,6 +234,12 @@
     margin-bottom: 2rem;
   }
 
+  .quantity-container-product {
+    display: flex;
+    justify-content: center;
+    margin: 1rem;
+  }
+
   .save-btn:disabled {
     background-color: #fafafa;
     border: none;

package/src/styles/themes/bookedit/index.scss

@@ -51,6 +51,20 @@
   border-bottom: 1px solid #f0f0f0;
 }
 
+ .modifier-header {
+  background-color: color('white');
+  padding: 0 2.5rem;
+  z-index: 2;
+  margin-top: 1rem;
+  min-height: 2rem;
+}
+
+.modifier-container {
+  background-color: color('white');
+  border-bottom: 2px solid #f0f0f0;
+  padding-bottom: 1rem;
+}
+
 .header-user-image {
   width: 3rem;
   height: 3rem;