@licklist/design 0.78.5-dev.1 → 0.78.5-dev.13

package/src/notification/email-template/control/EmailTemplateControl.tsx

@@ -27,6 +27,7 @@ export interface EmailTemplateControlProps {
   meta: string
   defaultAttachments?: Attachment[]
   notificationTypes?: NotificationType[]
+  waiverType?: boolean
   getDefaultTemplateMetaByType?: (type?: NotificationType | null) => string
 }
 
@@ -38,6 +39,7 @@ export const EmailTemplateControl = forwardRef(
       options = [],
       defaultAttachments = [],
       notificationTypes = [],
+      waiverType = false,
       getDefaultTemplateMetaByType,
     }: EmailTemplateControlProps,
     ref: any,
@@ -196,7 +198,7 @@ export const EmailTemplateControl = forwardRef(
         })
       })
     }
-
+ 
     return (
       <>
         <Row>
@@ -284,7 +286,7 @@ export const EmailTemplateControl = forwardRef(
           </Form.Group>
         </Row>
 
-        <Row>
+        { !waiverType && (<Row>
           <Form.Group as={Col}>
             <Form.Check
               {...register('isActive')}
@@ -301,7 +303,7 @@ export const EmailTemplateControl = forwardRef(
               custom
             />
           </Form.Group>
-        </Row>
+        </Row>)}
         <Row className='mb-4'>
           <Form.Group as={Col}>
             <Form.Label>{t('Design:emailBody')}</Form.Label>
@@ -374,7 +376,7 @@ export const EmailTemplateControl = forwardRef(
                 }
                 // should show dropdown only if user want to include PDF file
                 if (option.type === OPTION_TYPE.files_selector) {
-                  const fileSelectors = JSON.parse(option.defaultValue)
+                   const fileSelectors =  option?.defaultValue ? JSON.parse(option.defaultValue) : ''
                   const fileNames = Object.values(fileSelectors)
                   const fileKeys = Object.keys(fileSelectors)
 
@@ -423,7 +425,7 @@ export const EmailTemplateControl = forwardRef(
                   )
                 }
 
-                if (option.type === OPTION_TYPE.days_reminder) {
+                if (option.type === OPTION_TYPE.days_reminder || option.type === OPTION_TYPE.waiver_reminder ) {
                   return (
                     <>
                       <Form.Label className='mt-4'>

package/src/notification/email-template/form/EmailTemplateForm.tsx

@@ -41,6 +41,7 @@ export interface EmailTemplateProps extends HasPermissionProp {
   placeholders?: NotificationPlaceholder[]
   options?: TemplateOption[]
   serverErrors?: ServerError
+  waiverType?: boolean
   notificationTypes?: NotificationType[]
   getDefaultTemplateMetaByType?: (type?: NotificationType | null) => string
   onTypeChange?: (type?: NotificationType | null) => void
@@ -54,6 +55,7 @@ export const EmailTemplateForm = ({
   placeholders = [],
   options = [],
   serverErrors,
+  waiverType,
   notificationTypes = [],
   getDefaultTemplateMetaByType,
   onTypeChange,
@@ -93,6 +95,7 @@ export const EmailTemplateForm = ({
       >
         <EmailTemplateControl
           ref={emailEditorRef}
+          waiverType={waiverType}
           setIsLoading={setIsLoading}
           meta={defaultValues?.meta || null}
           defaultAttachments={defaultValues?.attachments || []}

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

@@ -2,7 +2,8 @@ import { useEffect, useState } from 'react'
 import { FormValues } from '@licklist/plugins/dist/types/services/Form/hook-form-service'
 import { Button, Form, Col, Row } from 'react-bootstrap'
 import { FormProvider, useForm } from 'react-hook-form'
-import { TFunction, useTranslation } from 'react-i18next'
+import { TFunction } from 'i18next'
+import { 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'

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

@@ -2,14 +2,13 @@ import { EmailTemplate } from '@licklist/core/dist/DataMapper/Notification/Email
 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 { TFunction } from 'i18next'
 import { UseFormSetError } from 'react-hook-form'
 import { checkIfZoneCategory } from '@licklist/plugins'
 import { ProductSet } from '@licklist/core/dist/DataMapper/Product/ProductSetDataMapper'
 import { TemplateItem } from '../control/ProductSetControl'
 import { ProductSetFormValues } from '../form/ProductSetForm'
 
-
 interface CheckAvailableTimesErrors {
   values: ProductSetFormValues
   setError: UseFormSetError<ProductSetFormValues>
@@ -61,21 +60,23 @@ export const getFilteredTemplates = (
     }))
 }
 
-export  const updateModifiersSetAtProductSetForm = (data: ProductSetFormValues) => ({
+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[])
-                  : [],
-          })),
+  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,

package/src/recurrence-input/RecurrenceInput.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable prefer-destructuring */
 /* eslint-disable react-hooks/exhaustive-deps */
 import { DateTime } from 'luxon'
-import { useEffect, useReducer, useState } from 'react'
+import { useEffect, useReducer } from 'react'
 import RRule, { Frequency, Weekday } from 'rrule'
 import RecurrenceEndInput, { defaultOccurrences } from './RecurrenceEndInput'
 import RecurrenceIntervalAndFrequencyInput from './RecurrenceIntervalAndFrequencyInput'
@@ -37,7 +37,7 @@ export function RecurrenceInput({
 
   useEffect(
     // TODO: unhardcode timezone
-    () =>
+    () => {
       onChange(
         RRule.optionsToString({
           freq: state.freq,
@@ -47,7 +47,8 @@ export function RecurrenceInput({
           tzid: 'Europe/London',
           ...state,
         }).replace('RRULE:', ''),
-      ),
+      )
+    },
     [state],
   )
 

package/src/setting/dashboard/payments/payments-modal/PaymentsModal.tsx

@@ -25,6 +25,7 @@ export function PaymentsModal({
 
   return (
     <Modal show={isVisible} onHide={onHide} centered>
+      {/* @ts-ignore */}
       <Modal.Header closeButton>
         <Modal.Title>{t('Design:setEmail')}</Modal.Title>
       </Modal.Header>

package/src/snippet/snippet-template/preview/Preview.tsx

@@ -1,6 +1,5 @@
 import { useContext, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { MemoryRouter } from 'react-router-dom'
 import { Button } from 'react-bootstrap'
 import {
   SNIPPET_TEMPLATE_TYPE_VENUE_MAP,
@@ -79,14 +78,12 @@ export function Preview({
                 <div className='mt-5 pt-5 external-header'>
                   <PageHeader showCloseButton showBackButton>
                     <Timer timer={600} />
-                    <MemoryRouter initialEntries={['/step1', '/step2']}>
-                      <NavigationSteps
-                        steps={[
-                          { pathname: '/step1', key: '/step1', name: 'Burger' },
-                          { pathname: '/step2', key: '/step2', name: 'Cheese' },
-                        ]}
-                      />
-                    </MemoryRouter>
+                    <NavigationSteps
+                      steps={[
+                        { pathname: '/step1', key: '/step1', name: 'Burger' },
+                        { pathname: '/step2', key: '/step2', name: 'Cheese' },
+                      ]}
+                    />
                   </PageHeader>
                 </div>
               </div>