@licklist/design 0.74.0-dev.0 → 0.74.0-dev.1

package/src/events/edit-event-modal/component/SelectEventProductSet/SelectEventProductSet.tsx

@@ -21,6 +21,7 @@ interface SelectEventProductSetProps extends HasPermissionProp {
   timeZone: string
   eventProductSet?: ProductSet
   overrideNameError?: string
+  isWaiverEnabled: boolean
 }
 
 export const SelectEventProductSet = ({
@@ -32,6 +33,7 @@ export const SelectEventProductSet = ({
   timeZone,
   eventProductSet,
   overrideNameError,
+  isWaiverEnabled,
 }: SelectEventProductSetProps) => {
   const productSets = eventProductSet
     ? [..._productSets, eventProductSet]
@@ -216,6 +218,7 @@ export const SelectEventProductSet = ({
           }
           timeZone={timeZone}
           overrideNameError={overrideNameError}
+          isWaiverEnabled={isWaiverEnabled}
         />
       )}
     </>

package/src/events/edit-event-modal/component/SelectEventProductSet/component/EditEventProductSet.tsx

@@ -24,6 +24,7 @@ interface EditEventProductSetProps {
   defaultValues?: EditEventFormValues['editedProductSet']
   timeZone: string
   overrideNameError?: string
+  isWaiverEnabled: boolean
 }
 
 export const EditEventProductSet = ({
@@ -31,6 +32,7 @@ export const EditEventProductSet = ({
   defaultValues,
   timeZone,
   overrideNameError,
+  isWaiverEnabled,
 }: EditEventProductSetProps) => {
   const { companyId } = useParams<{
     companyId: string
@@ -139,6 +141,7 @@ export const EditEventProductSet = ({
             isOverrides
             workHours={undefined}
             timeZone={timeZone}
+            isWaiverEnabled={isWaiverEnabled}
           />
           <Button
             disabled={isLoading}

package/src/product-set/control/ProductSetControl.tsx

@@ -100,6 +100,7 @@ export interface ProductSetControlProps {
   hasGeneralTicket?: boolean
   isCreateNewOverrides?: boolean
   timeZone: string
+  isWaiverEnabled: boolean
 }
 
 export function ProductSetControl({
@@ -118,6 +119,7 @@ export function ProductSetControl({
   isOverrides = false,
   isCreateNewOverrides = false,
   timeZone,
+  isWaiverEnabled,
 }: ProductSetControlProps) {
   const { t } = useTranslation(['Design', 'Validation', 'Notification'])
   const {
@@ -238,6 +240,7 @@ export function ProductSetControl({
           isEventEditProductSet={isEventEditProductSet}
           isOverrides={isOverrides}
           isCreateNewOverrides={isCreateNewOverrides}
+          isWaiverEnabled={isWaiverEnabled}
         />
       </Col>
       <Col md={6} sm={12}>
@@ -309,14 +312,17 @@ export function ProductSetControl({
             </Form.Control.Feedback>
           </Form.Group>
 
-          <Form.Group controlId='hasGeneralTicket' className='checkbox-second-column mt-4'>
-          <Form.Check
-            data-testid='save-as-template-checkbox'
-            label={t('Design:hasGeneralTicket')}
-            {...register('hasGeneralTicket')}
-            custom
-          />
-        </Form.Group>
+          <Form.Group
+            controlId='hasGeneralTicket'
+            className='checkbox-second-column mt-4'
+          >
+            <Form.Check
+              data-testid='save-as-template-checkbox'
+              label={t('Design:hasGeneralTicket')}
+              {...register('hasGeneralTicket')}
+              custom
+            />
+          </Form.Group>
 
           <Form.Group controlId={termsAndConditionsId}>
             <Form.Label>{t('Design:termsAndConditions')}</Form.Label>

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

@@ -66,6 +66,7 @@ interface ProductCategoriesControlProps extends WithIsLoading {
   isOverrides?: boolean
   isEventEditProductSet?: boolean
   isCreateNewOverrides?: boolean
+  isWaiverEnabled: boolean
 }
 
 const getCategoryDefaultValue = (
@@ -99,6 +100,7 @@ export function ProductCategoriesControl({
   isOverrides,
   isEventEditProductSet,
   isCreateNewOverrides,
+  isWaiverEnabled,
 }: ProductCategoriesControlProps) {
   const { t } = useTranslation('Design')
   const {
@@ -347,6 +349,7 @@ export function ProductCategoriesControl({
                     isOverrides={isOverrides}
                     isEventEditProductSet={isEventEditProductSet}
                     isCreateNewOverrides={isCreateNewOverrides}
+                    isWaiverEnabled={isWaiverEnabled}
                   />
                 </SortableTree.Item>
               )}

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

@@ -57,6 +57,7 @@ export interface ProductSetFormProps
   providerHasMap?: boolean
   venueMapSets?: VenueMapSet[]
   providerHasBookingManagement?: boolean
+  isWaiverEnabled: boolean
   zones?: Zone[] | null
   isCreateAction?: boolean
   isOverrides?: boolean
@@ -79,6 +80,7 @@ export function ProductSetForm({
   providerHasMap = false,
   venueMapSets = [],
   providerHasBookingManagement,
+  isWaiverEnabled,
   zones,
   isCreateAction,
   workHours,
@@ -210,6 +212,7 @@ export function ProductSetForm({
                   isOverrides={isOverrides}
                   isCreateNewOverrides={isCreateNewOverrides}
                   timeZone={timeZone}
+                  isWaiverEnabled={isWaiverEnabled}
                 />
                 <Row>
                   <Col md={6} sm={12} />

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

@@ -12,15 +12,12 @@ import { useTranslation } from 'react-i18next'
 import { DEFAULT_PRODUCT_TYPE } from '@licklist/core/dist/DataMapper/Product/ProductDataMapper'
 import { generateUuid } from '@licklist/core/dist/Services'
 import HookFormService from '@licklist/plugins/dist/services/Form/HookFormService'
-
 import { CategoryType } from '@licklist/core/dist/DataMapper/Product/ProductCategoryDataMapper'
 import { ProductControl, ProductControlProps, ProductSetFormValues } from '..'
 import { SortableTree } from '../../sortable-tree'
 import { CreateProductSetItem } from '../item/CreateProductSetItem'
 import { Product } from '../types'
 import { WithIsLoading } from './ProductSetForm'
-// @TODO not for first release
-// import Popover from "./ProductSetFormPopover";
 import { useSortableTreeFunctions } from '../hooks/useSortableTreeFunctions'
 import { SubProductsControl } from './SubProductsControl'
 import { ProductSetModalClasses } from '../../sortable-tree/SortableTreeItem'
@@ -35,6 +32,7 @@ interface ProductsControlProps extends WithIsLoading {
   isOverrides?: boolean
   isEventEditProductSet?: boolean
   isCreateNewOverrides?: boolean
+  isWaiverEnabled: boolean
 }
 
 const getDefaultProductValue = (sort: number): Product => ({
@@ -78,6 +76,7 @@ export function ProductsControl({
   isOverrides,
   isEventEditProductSet,
   isCreateNewOverrides,
+  isWaiverEnabled,
 }: ProductsControlProps) {
   const { t } = useTranslation('Design')
   const form = useFormContext<ProductSetFormValues>()
@@ -282,6 +281,7 @@ export function ProductsControl({
                       isOverrides={
                         isNewProductOverrides || isOverridesProductSet
                       }
+                      isWaiverEnabled={isWaiverEnabled}
                     />
                   }
                   onDelete={() => onProductRemove(index)}
@@ -289,7 +289,6 @@ export function ProductsControl({
                     trigger(`${productControlFieldName}.${index}`)
                   }
                   saveValidField={saveValidField}
-                  // preItem={<Popover className="d-none d-sm-block" />}
                 >
                   <SubProductsControl
                     isLoading={isLoading}
@@ -315,9 +314,7 @@ export function ProductsControl({
           }
         }}
       />
-      <div className='manual-form-error'>
-        {categoryProductErrors && categoryProductErrors.message}
-      </div>
+      <div className='manual-form-error'>{categoryProductErrors?.message}</div>
     </>
   )
 }

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

@@ -21,6 +21,7 @@ interface StepsControlProps {
   isOverrides?: boolean
   isEventEditProductSet?: boolean
   isCreateNewOverrides?: boolean
+  isWaiverEnabled: boolean
 }
 
 export function StepsControl({
@@ -28,6 +29,7 @@ export function StepsControl({
   isOverrides,
   isEventEditProductSet,
   isCreateNewOverrides,
+  isWaiverEnabled,
 }: StepsControlProps) {
   const form = useFormContext<ProductSetFormValues>()
   const { t } = useTranslation('Design')
@@ -150,6 +152,7 @@ export function StepsControl({
                   isOverrides={isOverrides}
                   isCreateNewOverrides={isCreateNewOverrides}
                   isEventEditProductSet={isEventEditProductSet}
+                  isWaiverEnabled={isWaiverEnabled}
                 />
               </SortableTree.Item>
             )}
@@ -167,9 +170,7 @@ export function StepsControl({
           }
         }}
       />
-      <div className='manual-form-error'>
-        {errors.steps && errors.steps.message}
-      </div>
+      <div className='manual-form-error'>{errors.steps?.message}</div>
     </>
   )
 }

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

@@ -56,6 +56,7 @@ export function SubProductsControl({
               quantityType={quantityType}
               allowDeposits={false}
               hasBookingManagement={false}
+              isWaiverEnabled={false}
               fieldNamePrefix={
                 // eslint-disable-next-line max-len
                 `steps.${stepIndex}.productCategories.${productCategoryIndex}.products.${productIndex}.subProducts.${index}` as const

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

@@ -1,11 +1,13 @@
 import {
   CategoryType,
   QuantityType,
-  QUANTITY_TYPE_CONSTANT,
-  QUANTITY_TYPE_LIST_DTO,
-  QUANTITY_TYPE_RECHARGING,
 } from '@licklist/core/dist/DataMapper/Product/ProductCategoryDataMapper'
-import { ProductType } from '@licklist/core/dist/DataMapper/Product/ProductDataMapper'
+import {
+  PRODUCT_WAIVER_TYPE_ADULT,
+  PRODUCT_WAIVER_TYPE_CHILD,
+  ProductType,
+  ProductWaiverType,
+} from '@licklist/core/dist/DataMapper/Product/ProductDataMapper'
 import HookFormService from '@licklist/plugins/dist/services/Form/HookFormService'
 import clsx from 'clsx'
 import {
@@ -28,7 +30,6 @@ import {
   Controller,
   Path,
   useFormContext,
-  useWatch,
   UnpackNestedValue,
   PathValue,
 } from 'react-hook-form'
@@ -107,6 +108,7 @@ export interface ProductControlValues
   sort: number | null
   color?: string
   productZones?: ProductZoneControlValues[]
+  waiverType?: ProductWaiverType | null
 }
 
 export interface ProductControlProps<T>
@@ -123,6 +125,7 @@ export interface ProductControlProps<T>
   hasTicket?: boolean
   categoryType?: CategoryType
   isOverrides?: boolean
+  isWaiverEnabled: boolean
 }
 
 export function ProductControl<T extends FormValues>({
@@ -136,6 +139,7 @@ export function ProductControl<T extends FormValues>({
   productName,
   categoryType,
   isOverrides = false,
+  isWaiverEnabled,
 }: ProductControlProps<T>) {
   const {
     register,
@@ -416,6 +420,36 @@ export function ProductControl<T extends FormValues>({
             name={`${fieldNamePrefix}.isSoldOut` as Path<T>}
           />
         </Form.Group>
+
+        {isWaiverEnabled && (
+          <Form.Group>
+            <Form.Label>{t('Design:waiverType')}</Form.Label>
+            <Form.Control
+              {...register(`${fieldNamePrefix}.waiverType` as Path<T>)}
+              as='select'
+              defaultValue={PRODUCT_WAIVER_TYPE_ADULT}
+              disabled={isOverrides}
+              isInvalid={HookFormService.isInvalid(
+                `${fieldNamePrefix}.waiverType` as Path<T>,
+                errors,
+              )}
+            >
+              <option value={PRODUCT_WAIVER_TYPE_ADULT}>
+                {t('Design:adult')}
+              </option>
+              <option value={PRODUCT_WAIVER_TYPE_CHILD}>
+                {t('Design:child')}
+              </option>
+            </Form.Control>
+            <Form.Control.Feedback type='invalid'>
+              {HookFormService.getErrors(
+                `${fieldNamePrefix}.waiverType` as Path<T>,
+                errors,
+              )}
+            </Form.Control.Feedback>
+          </Form.Group>
+        )}
+
         <Form.Group controlId={advancedId} className='custom-checkbox'>
           <Form.Check
             custom