@licklist/design 0.71.5-dev.0 → 0.71.5-dev.10

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

@@ -9,6 +9,9 @@ import { Switch, NumberInput } from '../../../../static'
 const SALE_DEADLINE_BEFORE_TYPE = 'before'
 const SALE_DEADLINE_AFTER_TYPE = 'after'
 
+export const SALE_DEADLINE_NAME_CATEGORY = 'saleDeadlineCategory'
+export const SALE_DEADLINE_NAME = 'saleDeadline'
+
 const SALE_DEADLINES_EVENT_START_TYPES = [
   { type: SALE_DEADLINE_BEFORE_TYPE },
   { type: SALE_DEADLINE_AFTER_TYPE },
@@ -18,11 +21,28 @@ type DeadlineType =
   | typeof SALE_DEADLINE_BEFORE_TYPE
   | typeof SALE_DEADLINE_AFTER_TYPE
 
+export const DEADLINE_NAME = [
+  SALE_DEADLINE_NAME_CATEGORY,
+  SALE_DEADLINE_NAME,
+] as const
+
+export type DeadLineNameType = (typeof DEADLINE_NAME)[number]
+
 type SaleDeadlineType = {
   saleDeadline: null | number
+} | {
+  [key: string] : null | number
 }
 
-export const SaleDeadline = ({ disabled = false }: { disabled?: boolean }) => {
+export const SaleDeadline = ({
+  disabled = false,
+  onlyBefore = false,
+  deadLineCategory,
+}: {
+  disabled?: boolean
+  onlyBefore?: boolean
+  deadLineCategory?: string
+}) => {
   const { t } = useTranslation(['Design'])
   const {
     control,
@@ -32,9 +52,11 @@ export const SaleDeadline = ({ disabled = false }: { disabled?: boolean }) => {
   const [deadlineType, setDeadlineType] = useState<DeadlineType>(
     SALE_DEADLINE_BEFORE_TYPE,
   )
-  const saleDeadline = watch('saleDeadline')
+  
+  const saleDeadline = watch(deadLineCategory || SALE_DEADLINE_NAME) 
 
   useEffect(() => {
+    if (onlyBefore) return
     if (saleDeadline > 0) {
       setDeadlineType(SALE_DEADLINE_AFTER_TYPE)
     }
@@ -45,11 +67,11 @@ export const SaleDeadline = ({ disabled = false }: { disabled?: boolean }) => {
     <Form.Group className='sales-deadline'>
       <Form.Label>{t('Design:salesDeadline')}</Form.Label>
       <Form.Control.Feedback type='invalid'>
-        {errors.saleDeadline?.message}
+        {errors.root?.message}
       </Form.Control.Feedback>
       <Controller
         control={control}
-        name='saleDeadline'
+        name={deadLineCategory || SALE_DEADLINE_NAME}
         render={({
           field: { value, onChange },
           fieldState: { invalid, error },
@@ -111,18 +133,22 @@ export const SaleDeadline = ({ disabled = false }: { disabled?: boolean }) => {
 
           return (
             <>
-              <Form.Group className='d-flex flex-column flex-grow-1 align-items-start'>
-                <Switch
-                  name='sale-deadline'
-                  options={SALE_DEADLINES_EVENT_START_TYPES.map(({ type }) => ({
-                    id: type,
-                    value: t(`Design:${type}`),
-                  }))}
-                  value={deadlineType}
-                  onChange={changeValueByType}
-                  disabled={disabled}
-                />
-              </Form.Group>
+              {!onlyBefore && (
+                <Form.Group className='d-flex flex-column flex-grow-1 align-items-start'>
+                  <Switch
+                    name='sale-deadline'
+                    options={SALE_DEADLINES_EVENT_START_TYPES.map(
+                      ({ type }) => ({
+                        id: type,
+                        value: t(`Design:${type}`),
+                      }),
+                    )}
+                    value={deadlineType}
+                    onChange={changeValueByType}
+                    disabled={disabled}
+                  />
+                </Form.Group>
+              )}
               <div className='d-flex'>
                 <Form.Group className='d-flex flex-column col-4 pl-0'>
                   <Form.Label>{t('Design:saleDays')}</Form.Label>

package/src/events/edit-event-modal/hooks/useValidationOptions.tsx

@@ -12,11 +12,6 @@ export const useValidationOptions = () => {
       required: t('Validation:fieldRequired', {
         attribute: t('start'),
       }) as string,
-      // TODO: uncomment when event splitting is implemented
-      // and extract into plugins
-      validate: (value) =>
-        DateTime.fromISO(value).diffNow().toMillis() > 0 ||
-        (t('Validation:fieldValidEventStart') as string),
     },
 
     end: {

package/src/events/edit-event-modal/utils/getDefaultProductSet.ts

@@ -20,6 +20,7 @@ export const getDefaultValues = (
   relyOnPeopleType: productSet?.relyOnPeopleType ?? null,
   thankYouPageUrl: productSet?.thankYouPageUrl ?? '',
   fieldSetId: productSet?.fieldSetId,
+  saleDeadline: productSet?.saleDeadline,
   emailTemplates:
     productSet?.mailTemplates && productSet?.mailTemplates?.length > 0
       ? getFilteredTemplates(productSet?.mailTemplates)

package/src/events/edit-recurrent-event-modal/EditRecurrentEventModal.tsx

@@ -61,7 +61,12 @@ export const EditRecurrentEventModal = ({
       <Form onSubmit={handleSubmit(onSubmit)} noValidate>
         <Modal.Header className='border-0'>
           <Modal.Title as='h6'>{title}</Modal.Title>
-          <Button variant='danger' className='btn-sm rounded' onClick={onHide}>
+          <Button
+            variant='danger'
+            className='btn-sm rounded'
+            disabled={disabled}
+            onClick={onHide}
+          >
             <FaTimes size={16} />
           </Button>
         </Modal.Header>

package/src/events/event-statistic-modal/EventStatisticModal.tsx

@@ -12,6 +12,7 @@ export type EventStatisticModalProps = {
   date?: Event['startAt'] | null
   eventStatistic?: EventStatistic | null
   title?: string
+  eventId?: string
 }
 
 export const EventStatisticModal = ({
@@ -20,10 +21,11 @@ export const EventStatisticModal = ({
   date,
   eventStatistic,
   title,
+  eventId,
 }: EventStatisticModalProps) => {
   const { t } = useTranslation('Design')
 
-  const data = useTableData(date, eventStatistic)
+  const data = useTableData(date, eventStatistic, eventId )
   const handleClose = () => {
     setIsOpen(false)
   }

package/src/events/event-statistic-modal/hooks/useTableData.tsx

@@ -11,6 +11,7 @@ import { StaticTableData } from '../../../table'
 export const useTableData = (
   date: Event['startAt'] | null,
   eventStatistic: EventStatistic | null,
+  eventId: string
 ) => {
   const { t } = useTranslation('Design')
   const { formatNumber } = useIntl()
@@ -33,6 +34,7 @@ export const useTableData = (
   const transformStatisticToTableRows = (
     date: Event['startAt'],
     statistic: EventStatistic | null,
+    eventId: string
   ) => {
     if (!statistic) {
       return []
@@ -40,7 +42,7 @@ export const useTableData = (
 
     const tableDataRows: StaticTableData[] = []
 
-    convertEventStatisticToTableData(date, statistic).forEach(
+    convertEventStatisticToTableData(date, statistic, eventId).forEach(
       ({ name, quantity, total, isBold, isHeader, key }) => {
         const formattedTotal = !Object.keys(TRANSLATION_KEYS).includes(
           String(total),
@@ -82,9 +84,9 @@ export const useTableData = (
   }
 
   useEffect(() => {
-    setTableRows(transformStatisticToTableRows(date, eventStatistic))
+    setTableRows(transformStatisticToTableRows(date, eventStatistic, eventId))
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [date, eventStatistic])
+  }, [date, eventId, eventStatistic])
 
   return tableRows
 }

package/src/events/event-statistic-modal/utils/index.ts

@@ -1,7 +1,7 @@
 import { EventStatistic } from '@licklist/core/dist/DataMapper/Provider/EventStatisticDataMapper'
 import { DateTime } from 'luxon'
 import { DATE_FORMAT, DATE_TIME_FULL_FORMAT } from '@licklist/core/dist/Config'
-import { values } from 'lodash'
+import { values, maxBy } from 'lodash'
 
 export const TRANSLATION_KEYS = {
   shortQuantity: 'shortQuantity',
@@ -36,7 +36,6 @@ export const convertEventStatisticToTableData = (
   const summaryFormattedDate = DateTime.fromISO(date)
     .toUTC()
     .toFormat(DATE_FORMAT)
-
   const summaryDays =
     Object.keys(eventStatistic?.productCategorySummary)?.filter(
       (date) =>
@@ -46,15 +45,11 @@ export const convertEventStatisticToTableData = (
     ) ?? []
 
   const summaryMap = new Map<string, TableDataRecord>()
-
-  const maxTotalQuantity = values(eventStatistic?.productCategorySummary)
+  const allProductsSummary = values(eventStatistic?.productCategorySummary)
     .flat()
     .flatMap((categorySummary) => categorySummary.productsSummary)
-    .reduce(
-      (acc, productSummary) =>
-        productSummary.totalQuantity > acc ? productSummary.totalQuantity : acc,
-      0,
-    )
+
+  const maxTotalQuantity = maxBy(allProductsSummary, 'id').totalQuantity || 0
 
   summaryDays
     .map((day) => eventStatistic?.productCategorySummary[day])
@@ -69,9 +64,7 @@ export const convertEventStatisticToTableData = (
     .forEach(
       ({ totalPerCategory, productsSummary = [], categoryName, eventId }) => {
         let quantity = 0
-
         totalAmount += totalPerCategory || 0
-
         if (!summaryMap.has(`${categoryName}`)) {
           summaryMap.set(`${categoryName}`, {
             name: categoryName,
@@ -113,13 +106,13 @@ export const convertEventStatisticToTableData = (
             })
           },
         )
-
         const prevTotalPerCategory = summaryMap.get(
           `${categoryName}.${TRANSLATION_KEYS.totalPerCategory}`,
         ) ?? {
           quantity: 0,
           total: 0,
         }
+
         summaryMap.set(`${categoryName}.${TRANSLATION_KEYS.totalPerCategory}`, {
           name: TRANSLATION_KEYS.totalPerCategory,
           key: `${eventId}.${categoryName}.${TRANSLATION_KEYS.totalPerCategory}`,
@@ -127,7 +120,6 @@ export const convertEventStatisticToTableData = (
           total: String(Number(prevTotalPerCategory.total) + totalPerCategory),
           isBold: true,
         })
-
         totalQuantity += quantity
       },
     )

package/src/iframe/page/components/PageBody/constants.ts

@@ -1,4 +1,5 @@
 export const TAB_WIDTH = 768
+export const MOBILE_WIDTH = 480
 export const RIGHT_BLOCK_RESIZED_EVENT = 'RIGHT_BLOCK_RESIZED_EVENT'
 // The sum of paddings in PageBody + header for first block
 export const STANDARD_BODY_PADDING = 48 + 49

package/src/iframe/page/components/PageBody/hooks/useResizePageBody.ts

@@ -2,6 +2,7 @@ import { useEffect, useMemo, useState, useRef } from 'react'
 import { useWindowDimensions } from '@licklist/plugins/dist/hooks/Media/useWindowDimensions'
 import {
   TAB_WIDTH,
+  MOBILE_WIDTH,
   STANDARD_BODY_PADDING,
   STANDARD_HEADER_FOOTER_SIZE,
   RIGHT_BLOCK_RESIZED_EVENT,
@@ -60,6 +61,16 @@ export const useResizePageBody = () => {
       })
     }
 
+    if (width <= MOBILE_WIDTH && Boolean(CALENDAR_WRAPPER_HEIGHT)) {
+      return {
+        maxHeight:
+          height -
+          STANDARD_BODY_PADDING -
+          rightBlockHeight -
+          CALENDAR_WRAPPER_HEIGHT,
+      }
+  
+    }  
     return {
       maxHeight:
         height -
@@ -87,7 +98,6 @@ export const useResizePageBody = () => {
 
     if (width >= TAB_WIDTH && !isContainerSizeApplied) {
       isContainerSizeApplied.current = true
-
       setLeftBlockContainerSizes({
         width: leftBlockContainer.clientWidth,
         height: leftBlockContainer.clientHeight,
@@ -117,7 +127,6 @@ export const useResizePageBody = () => {
       ) {
         minimalMapSize.current = calculatedMinimalMapSize
       }
-
       return {
         width: leftBlockContainer.clientWidth,
         height: minimalMapSize.current,

package/src/iframe/ryft/RyftPaymentForm.tsx

@@ -5,12 +5,14 @@ import { useForm } from 'react-hook-form'
 import Button from 'react-bootstrap/Button'
 import { useHistory } from 'react-router-dom'
 import Alert from 'react-bootstrap/Alert'
+import {
+  STATUS_APPROVED,
+  STATUS_CAPTURED,
+  STATUS_PENDING_ACTION,
+  STATUS_PENDING_PAYMENT,
+} from '@licklist/core/dist/DataMapper/Order/PaymentSessionOrderDataMapper'
 import {
   useRyftPayment,
-  RYFT_STATUS_APPROVED,
-  RYFT_STATUS_CAPTURED,
-  RYFT_STATUS_PENDING_ACTION,
-  RYFT_STATUS_PENDING_PAYMENT,
   AttemptPaymentResponse,
 } from '@licklist/plugins/dist/hooks/Ryft/useRyftPayment'
 import { ProviderPaymentSettings } from '@licklist/core/dist/DataMapper/Setting/ProviderPaymentSettingsDataMapper'
@@ -105,7 +107,7 @@ export const RyftPaymentForm = ({
 
       if ('requiredAction' in paymentSession) {
         if (
-          paymentSession.status !== RYFT_STATUS_PENDING_ACTION ||
+          paymentSession.status !== STATUS_PENDING_ACTION ||
           !paymentSession.requiredAction?.url
         ) {
           redirectOnFailAttempt(paymentSession)
@@ -117,9 +119,9 @@ export const RyftPaymentForm = ({
       }
 
       if (
-        paymentSession.status === RYFT_STATUS_APPROVED ||
-        paymentSession.status === RYFT_STATUS_CAPTURED ||
-        paymentSession.status === RYFT_STATUS_PENDING_PAYMENT
+        paymentSession.status === STATUS_APPROVED ||
+        paymentSession.status === STATUS_CAPTURED ||
+        paymentSession.status === STATUS_PENDING_PAYMENT
       ) {
         redirectOnFailAttempt(paymentSession)
         return

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

@@ -23,6 +23,7 @@ import { ruleForUrlWithProtocol } from '@licklist/plugins/dist/validation/Rules/
 import { WorkHour } from '@licklist/core/dist/DataMapper/Provider/WorkHourDataMapper'
 import { checkIfZoneCategory } from '@licklist/plugins'
 import { Image } from '@licklist/core/dist/DataMapper/Media/ImageDataMapper'
+import { SaleDeadline } from 'src/events/edit-event-modal/component/SaleDeadline'
 import { WarningMessage } from '../../static'
 import { SelectItem } from '../../types/generic/SelectItem'
 import {
@@ -66,6 +67,7 @@ export interface ProductSetControlValues extends DateAndRecurrenceInputValues {
   productGroups?: SelectItem[]
   relyOnPeopleType?: RelyOnPeopleType | null
   fieldSetId?: number
+  saleDeadline?: number
   steps: Step[]
   emailTemplates?: TemplateItem[]
   smsTemplates?: TemplateItem[]
@@ -93,6 +95,7 @@ export interface ProductSetControlProps {
   workHours: WorkHour[] | undefined
   providerHasBookingManagement?: boolean
   isOverrides?: boolean
+  saleDeadline?: number
   isCreateNewOverrides?: boolean
   timeZone: string
 }
@@ -222,6 +225,8 @@ export function ProductSetControl({
           </>
         )}
 
+        <SaleDeadline disabled={false} onlyBefore />
+
         <div className='divider' />
 
         <TutorialGifCard isOverrides={isOverrides} />

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

@@ -86,6 +86,7 @@ const getCategoryDefaultValue = (
   remainderExpireAfter: undefined,
   hasBookingManagement: false,
   weight: 0,
+  saleDeadlineCategory: 0,
   isReusable: false,
   hasSubEvents: false,
   products: [],

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

@@ -59,6 +59,7 @@ export interface ProductSetFormProps
   isCreateAction?: boolean
   isOverrides?: boolean
   workHours?: WorkHour[]
+  saleDeadline?: number
   isCreateNewOverrides?: boolean
   timeZone: string
 }
@@ -77,6 +78,7 @@ export function ProductSetForm({
   zones,
   isCreateAction,
   workHours,
+  saleDeadline,
   isOverrides,
   isCreateNewOverrides,
   timeZone,

package/src/product-set/product-category/ProductCategoryControl.tsx

@@ -17,6 +17,10 @@ import { Switch, BooleanSwitch } from '../../static'
 import { ProductSetFormValues } from '../form/ProductSetForm'
 import { IsDeletableEvent, ProductCategory } from '../types'
 import { ReactComponent as IncrementIcon } from '../../assets/dashboard/increment.svg'
+import {
+  SaleDeadline,
+  SALE_DEADLINE_NAME_CATEGORY,
+} from '../../events/edit-event-modal/component/SaleDeadline/SaleDeadline'
 
 export interface ProductCategoryControlValues extends FormValues {
   id: number
@@ -36,6 +40,7 @@ export interface ProductCategoryControlValues extends FormValues {
   hasSubEvents?: boolean
   weight?: number
   isReusable?: boolean
+  saleDeadlineCategory?: number
   termsAndConditions?: string
   sort: number | null
 }
@@ -423,6 +428,14 @@ export function ProductCategoryControl({
                 </div>
               </Form.Group>
             )}
+
+            <SaleDeadline
+              disabled={false}
+              deadLineCategory={
+                `${fieldNamePrefix}.${SALE_DEADLINE_NAME_CATEGORY}` as const
+              }
+              onlyBefore
+            />
             {/*