@licklist/design 0.69.5 → 0.69.6-dev.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (160) hide show
  1. package/dist/affiliate/form/AffiliateForm.d.ts.map +1 -1
  2. package/dist/auth/Login/LoginComponent.js +2 -1
  3. package/dist/calendar/utils/index.d.ts +8 -2
  4. package/dist/calendar/utils/index.d.ts.map +1 -1
  5. package/dist/calendar/utils/index.js +9 -21
  6. package/dist/date-time-button/DateContent.d.ts.map +1 -1
  7. package/dist/date-time-button/DateContent.js +3 -3
  8. package/dist/events/edit-event-modal/component/SelectEventProductSet/SelectEventProductSet.d.ts.map +1 -1
  9. package/dist/events/edit-event-modal/component/SelectEventProductSet/SelectEventProductSet.js +6 -6
  10. package/dist/events/edit-event-modal/component/SelectEventProductSet/component/EditEventProductSet.js +2 -1
  11. package/dist/events/edit-event-modal/utils/getDefaultProductSet.d.ts.map +1 -1
  12. package/dist/events/edit-event-modal/utils/getDefaultProductSet.js +0 -1
  13. package/dist/events/event-card/utils.d.ts +1 -0
  14. package/dist/events/event-card/utils.d.ts.map +1 -1
  15. package/dist/events/event-card/utils.js +6 -2
  16. package/dist/iframe/activity-card/ActivityCard.d.ts +3 -1
  17. package/dist/iframe/activity-card/ActivityCard.d.ts.map +1 -1
  18. package/dist/iframe/activity-card/ActivityCard.js +8 -1
  19. package/dist/iframe/order-process/components/CategoryProduct/components/NumberInput/NumberInput.d.ts.map +1 -1
  20. package/dist/iframe/order-process/components/CategoryProduct/components/NumberInput/NumberInput.js +13 -0
  21. package/dist/iframe/order-process/components/CategoryProduct/components/ProductQuantityInput/ProductQuantityInput.d.ts.map +1 -1
  22. package/dist/iframe/order-process/components/CategoryProduct/components/ProductQuantityInput/ProductQuantityInput.js +2 -0
  23. package/dist/iframe/payment/order-items-table/utils/paymentSummary.d.ts.map +1 -1
  24. package/dist/iframe/ryft/RyftPaymentForm.d.ts +2 -2
  25. package/dist/iframe/ryft/RyftPaymentForm.d.ts.map +1 -1
  26. package/dist/iframe/ryft/RyftPaymentForm.js +8 -2
  27. package/dist/iframe/ryft/utils/ryft-form.d.ts +2 -1
  28. package/dist/iframe/ryft/utils/ryft-form.d.ts.map +1 -1
  29. package/dist/iframe/ryft/utils/ryft-form.js +20 -1
  30. package/dist/layout/DropDown.d.ts +2 -1
  31. package/dist/layout/DropDown.d.ts.map +1 -1
  32. package/dist/notification/email-template/control/EmailTemplateControl.d.ts.map +1 -1
  33. package/dist/notification/email-template/control/EmailTemplateControl.js +3 -0
  34. package/dist/product-set/control/DateAndRecurrenceInput.d.ts.map +1 -1
  35. package/dist/product-set/control/DateAndRecurrenceInput.js +4 -3
  36. package/dist/product-set/control/DateInput.d.ts.map +1 -1
  37. package/dist/product-set/control/DateInput.js +2 -2
  38. package/dist/product-set/form/ProductCategoriesControl.d.ts.map +1 -1
  39. package/dist/product-set/form/ProductCategoriesControl.js +48 -2
  40. package/dist/product-set/form/ProductSetForm.d.ts +4 -1
  41. package/dist/product-set/form/ProductSetForm.d.ts.map +1 -1
  42. package/dist/product-set/form/ProductSetForm.js +57 -2
  43. package/dist/product-set/form/ProductZonesControl.d.ts.map +1 -1
  44. package/dist/product-set/form/ProductZonesControl.js +0 -2
  45. package/dist/product-set/form/ProductsControl.js +1 -0
  46. package/dist/product-set/form/SelectCategoryModal.d.ts +12 -0
  47. package/dist/product-set/form/SelectCategoryModal.d.ts.map +1 -1
  48. package/dist/product-set/form/SelectCategoryModal.js +1 -1
  49. package/dist/product-set/form/SubProductsControl.d.ts.map +1 -1
  50. package/dist/product-set/form/SubProductsControl.js +0 -3
  51. package/dist/product-set/form/VenueMapsControl.d.ts.map +1 -1
  52. package/dist/product-set/form/VenueMapsControl.js +0 -3
  53. package/dist/product-set/product/ProductControl.d.ts.map +1 -1
  54. package/dist/product-set/product/booking-management/ProductBookingManagementControl.d.ts.map +1 -1
  55. package/dist/product-set/product/booking-management/ProductBookingManagementControl.js +6 -0
  56. package/dist/product-set/product/deposit/ProductDepositControl.d.ts.map +1 -1
  57. package/dist/product-set/product/deposit/ProductDepositControl.js +3 -0
  58. package/dist/product-set/product/duration/ProductDurationControl.d.ts.map +1 -1
  59. package/dist/product-set/product/duration/ProductDurationControl.js +6 -0
  60. package/dist/product-set/product/price/ProductPriceControl.d.ts.map +1 -1
  61. package/dist/product-set/product/price/ProductPriceControl.js +3 -0
  62. package/dist/product-set/product/quantity/ProductQuantityConstantControl.d.ts.map +1 -1
  63. package/dist/product-set/product/quantity/ProductQuantityConstantControl.js +6 -0
  64. package/dist/product-set/product/quantity/ProductQuantityControl.d.ts.map +1 -1
  65. package/dist/product-set/product/quantity/ProductQuantityControl.js +6 -0
  66. package/dist/product-set/product/quantity/ProductQuantityRechargingControl.d.ts.map +1 -1
  67. package/dist/product-set/product/quantity/ProductQuantityRechargingControl.js +4 -1
  68. package/dist/product-set/product-category/ProductCategoryControl.d.ts.map +1 -1
  69. package/dist/product-set/product-category/ProductCategoryControl.js +12 -0
  70. package/dist/recurrence-input/RecurrenceEndInput.d.ts.map +1 -1
  71. package/dist/recurrence-input/RecurrenceEndInput.js +3 -0
  72. package/dist/recurring-date-picker-input/RecurrenceEndInput.d.ts.map +1 -1
  73. package/dist/resource/form/components/CapacityControl.d.ts.map +1 -1
  74. package/dist/resource/form/components/CapacityControl.js +3 -0
  75. package/dist/resource/form/components/SortControl.d.ts.map +1 -1
  76. package/dist/resource/form/components/SortControl.js +3 -0
  77. package/dist/sales/booking/results/components/ResultCard.d.ts.map +1 -1
  78. package/dist/sales/booking/results/components/ResultCard.js +0 -2
  79. package/dist/sales/coupon/control/CouponFormControl.d.ts.map +1 -1
  80. package/dist/sales/coupon/control/CouponFormControl.js +21 -0
  81. package/dist/setting/admin/PaymentFeeForm.d.ts.map +1 -1
  82. package/dist/setting/admin/PaymentFeeForm.js +16 -1
  83. package/dist/setting/dashboard/DashboardSettingForm.d.ts.map +1 -1
  84. package/dist/setting/dashboard/DashboardSettingForm.js +4 -1
  85. package/dist/snippet/snippet-template/preview/Preview.d.ts.map +1 -1
  86. package/dist/snippet/snippet-template/preview/Preview.js +6 -0
  87. package/dist/sortable-tree/SortableTreeItem.d.ts +2 -1
  88. package/dist/sortable-tree/SortableTreeItem.d.ts.map +1 -1
  89. package/dist/sortable-tree/SortableTreeItem.js +10 -4
  90. package/dist/static/CurrencyNumberInput.d.ts.map +1 -1
  91. package/dist/static/CurrencyNumberInput.js +3 -0
  92. package/dist/static/form-number-input/FormNumberInput.d.ts.map +1 -1
  93. package/dist/static/form-number-input/FormNumberInput.js +3 -0
  94. package/dist/static/number-input/NumberInput.d.ts.map +1 -1
  95. package/dist/static/number-input/NumberInput.js +3 -0
  96. package/dist/styles/availability-indicator/AvailabilityIndicator.scss +9 -0
  97. package/dist/styles/iframe-external-modal/IframeExternalModal.scss +2 -2
  98. package/dist/styles/product-set/ProductSetForm.scss +22 -0
  99. package/dist/styles/ryft-payment-form/RyftPaymentForm.scss +25 -0
  100. package/dist/styles/sales/BookingResults.scss +1 -1
  101. package/dist/zone/form/components/GameDurationControl.d.ts.map +1 -1
  102. package/dist/zone/form/components/GameDurationControl.js +3 -0
  103. package/dist/zone/form/components/SortControl.d.ts.map +1 -1
  104. package/dist/zone/form/components/SortControl.js +3 -0
  105. package/package.json +9 -8
  106. package/src/affiliate/form/AffiliateForm.tsx +1 -0
  107. package/src/auth/Login/LoginComponent.tsx +1 -1
  108. package/src/calendar/utils/index.ts +17 -26
  109. package/src/date-time-button/DateContent.tsx +3 -3
  110. package/src/events/edit-event-modal/component/SelectEventProductSet/SelectEventProductSet.tsx +12 -10
  111. package/src/events/edit-event-modal/utils/getDefaultProductSet.ts +0 -1
  112. package/src/events/event-card/utils.ts +5 -1
  113. package/src/iframe/activity-card/ActivityCard.tsx +6 -0
  114. package/src/iframe/order-process/components/CategoryProduct/components/NumberInput/NumberInput.tsx +9 -0
  115. package/src/iframe/order-process/components/CategoryProduct/components/ProductQuantityInput/ProductQuantityInput.tsx +1 -0
  116. package/src/iframe/payment/order-items-table/utils/paymentSummary.tsx +1 -0
  117. package/src/iframe/ryft/RyftPaymentForm.tsx +9 -4
  118. package/src/iframe/ryft/utils/ryft-form.ts +28 -2
  119. package/src/layout/DropDown.tsx +1 -1
  120. package/src/notification/email-template/control/EmailTemplateControl.tsx +1 -0
  121. package/src/product-set/control/DateAndRecurrenceInput.tsx +3 -1
  122. package/src/product-set/control/DateInput.tsx +2 -1
  123. package/src/product-set/form/ProductCategoriesControl.tsx +37 -1
  124. package/src/product-set/form/ProductSetForm.tsx +15 -3
  125. package/src/product-set/form/ProductZonesControl.tsx +1 -4
  126. package/src/product-set/form/SelectCategoryModal.tsx +2 -2
  127. package/src/product-set/form/SubProductsControl.tsx +0 -3
  128. package/src/product-set/form/VenueMapsControl.tsx +0 -3
  129. package/src/product-set/product/ProductControl.tsx +0 -1
  130. package/src/product-set/product/advanced-options/AdvancedOptions.tsx +1 -1
  131. package/src/product-set/product/booking-management/ProductBookingManagementControl.tsx +2 -0
  132. package/src/product-set/product/deposit/ProductDepositControl.tsx +1 -0
  133. package/src/product-set/product/duration/ProductDurationControl.tsx +2 -0
  134. package/src/product-set/product/price/ProductPriceControl.tsx +1 -0
  135. package/src/product-set/product/quantity/ProductQuantityConstantControl.tsx +2 -0
  136. package/src/product-set/product/quantity/ProductQuantityControl.tsx +2 -0
  137. package/src/product-set/product/quantity/ProductQuantityRechargingControl.tsx +1 -0
  138. package/src/product-set/product-category/ProductCategoryControl.tsx +4 -0
  139. package/src/product-set/product-zone/ProductZoneControl.tsx +1 -1
  140. package/src/recurrence-input/RecurrenceEndInput.tsx +1 -0
  141. package/src/recurring-date-picker-input/RecurrenceEndInput.tsx +1 -0
  142. package/src/resource/form/components/CapacityControl.tsx +1 -0
  143. package/src/resource/form/components/SortControl.tsx +1 -0
  144. package/src/sales/booking/results/components/ResultCard.tsx +0 -2
  145. package/src/sales/coupon/control/CouponFormControl.tsx +7 -0
  146. package/src/setting/admin/PaymentFeeForm.tsx +5 -0
  147. package/src/setting/dashboard/DashboardSettingForm.tsx +1 -0
  148. package/src/snippet/snippet-template/preview/Preview.tsx +6 -0
  149. package/src/sortable-tree/SortableTreeItem.tsx +6 -0
  150. package/src/static/CurrencyNumberInput.tsx +1 -0
  151. package/src/static/form-number-input/FormNumberInput.tsx +1 -0
  152. package/src/static/number-input/NumberInput.tsx +1 -0
  153. package/src/styles/availability-indicator/AvailabilityIndicator.scss +9 -0
  154. package/src/styles/iframe-external-modal/IframeExternalModal.scss +2 -2
  155. package/src/styles/product-set/ProductSetForm.scss +22 -0
  156. package/src/styles/ryft-payment-form/RyftPaymentForm.scss +25 -0
  157. package/src/styles/sales/BookingResults.scss +1 -1
  158. package/src/zone/form/components/GameDurationControl.tsx +1 -0
  159. package/src/zone/form/components/SortControl.tsx +1 -0
  160. package/yarn.lock +20 -54
@@ -76,6 +76,7 @@ export const AffiliateForm = ({
76
76
  const copyToClipboard = () =>
77
77
  // eslint-disable-next-line consistent-return
78
78
  window.navigator.clipboard.writeText(formValues.link)
79
+
79
80
  return (
80
81
  <FormProvider {...form}>
81
82
  <Form onSubmit={form.handleSubmit(handleSubmit)}>
@@ -44,7 +44,7 @@ const LoginComponent = ({
44
44
  const handleError = (error: any) => {
45
45
  notification.danger({
46
46
  title: 'Error',
47
- message: error.message,
47
+ message: error?.response?.data?.message || error.message,
48
48
  })
49
49
  }
50
50
 
@@ -1,40 +1,31 @@
1
+ import { TimeZone } from '@licklist/core/dist/DataMapper/Common/TimeZoneDataMapper'
1
2
  import { DateTime, Interval } from 'luxon'
2
3
 
3
- export const getMonthCalendarDates = (
4
- initialDate: DateTime,
5
- timeZone?: string,
6
- ): DateTime[] => {
4
+ type Builder = (args: {
5
+ initialDate?: DateTime
6
+ timeZone: TimeZone['name']
7
+ }) => DateTime[]
8
+
9
+ export const getMonthCalendarDates: Builder = ({
10
+ initialDate: _initialDate,
11
+ timeZone,
12
+ }): DateTime[] => {
13
+ const initialDate = _initialDate || DateTime.now().setZone(timeZone)
14
+
7
15
  const startOfMonth = initialDate.startOf('month')
8
16
  const endOfMonth = initialDate.endOf('month')
9
17
 
10
- const dateTimes = Interval.fromDateTimes(startOfMonth, endOfMonth)
18
+ return Interval.fromDateTimes(startOfMonth, endOfMonth)
11
19
  .splitBy({ day: 1 })
12
20
  .map((d) => d.start)
13
-
14
- if (timeZone) {
15
- return dateTimes.map((date) =>
16
- date.setZone(timeZone, { keepLocalTime: true }),
17
- )
18
- }
19
-
20
- return dateTimes
21
21
  }
22
22
 
23
- export const getWeekCalendarDates = (
24
- initialDate: DateTime,
25
- timeZone?: string,
26
- ): DateTime[] => {
23
+ export const getWeekCalendarDates: Builder = ({ timeZone }): DateTime[] => {
24
+ const initialDate = DateTime.now().setZone(timeZone)
25
+
27
26
  const lastDay = initialDate.plus({ days: 7 })
28
27
 
29
- const dateTimes = Interval.fromDateTimes(initialDate, lastDay)
28
+ return Interval.fromDateTimes(initialDate, lastDay)
30
29
  .splitBy({ day: 1 })
31
30
  .map((d) => d.start)
32
-
33
- if (timeZone) {
34
- return dateTimes.map((date) =>
35
- date.setZone(timeZone, { keepLocalTime: true }),
36
- )
37
- }
38
-
39
- return dateTimes
40
31
  }
@@ -6,9 +6,9 @@ import {
6
6
  } from '@licklist/core/dist/Config'
7
7
  import { getDayWithOrdinal } from '@licklist/plugins/dist/utils/formatDate'
8
8
  import clsx from 'clsx'
9
- import { isToday, isTomorrow } from 'date-fns'
10
9
  import { DateTime } from 'luxon'
11
10
  import { useTranslation } from 'react-i18next'
11
+ import { isToday, isTomorrow } from '@licklist/plugins/dist'
12
12
  import { DateTimeButtonProps, Variant } from './DateTimeButton'
13
13
 
14
14
  type DateContentProps = Pick<
@@ -55,9 +55,9 @@ export const DateContent = ({
55
55
  }
56
56
 
57
57
  const getDate = (date: DateTime): string => {
58
- if (isToday(date.toJSDate())) return 'today'
58
+ if (isToday(date)) return 'today'
59
59
 
60
- if (isTomorrow(date.toJSDate())) return 'tomorrow'
60
+ if (isTomorrow(date)) return 'tomorrow'
61
61
 
62
62
  return date.toFormat(DAY_OF_WEEK)
63
63
  }
@@ -5,6 +5,7 @@ import { useId } from '@react-aria/utils'
5
5
  import { Controller, useFormContext } from 'react-hook-form'
6
6
  import { HasPermissionProp } from '@licklist/plugins/dist/types/permission/Permission'
7
7
  import { ProductSet } from '@licklist/core/dist/DataMapper/Product/ProductSetDataMapper'
8
+ import { uniqBy } from 'lodash'
8
9
  import { getTypeHeadItemsFromMenus } from '../../../../product-set/utils'
9
10
  import { ConfirmModal } from '../../../../modals/confirmation/ConfirmModal'
10
11
  import { EditEventFormValues } from '../EditEventForm/EditEventForm'
@@ -52,16 +53,17 @@ export const SelectEventProductSet = ({
52
53
  const productSetId = watch('productSetId')
53
54
  const editedProductSet = watch('editedProductSet')
54
55
 
55
- const typeheadValues = getTypeHeadItemsFromMenus(
56
- editedProductSet
57
- ? productSets.map((productSet) => {
58
- if (productSet.id === editedProductSet.id) {
59
- return editedProductSet
60
- }
61
-
62
- return productSet
63
- })
64
- : productSets,
56
+ const typeheadValues = uniqBy(
57
+ getTypeHeadItemsFromMenus(
58
+ editedProductSet
59
+ ? productSets.map((productSet) =>
60
+ productSet.id === editedProductSet.id
61
+ ? editedProductSet
62
+ : productSet,
63
+ )
64
+ : productSets,
65
+ ),
66
+ (item) => item.id,
65
67
  )
66
68
  const selectedProductSetTypeheadValue = productSetId
67
69
  ? typeheadValues?.find((typeheadValue) => typeheadValue.id === productSetId)
@@ -39,7 +39,6 @@ export const getDefaultValues = (
39
39
  ...product,
40
40
  subProducts: subProducts?.map(({ ...subProducts }) => ({
41
41
  ...subProducts,
42
- originalProductId: null,
43
42
  productCategoryId: undefined,
44
43
  })),
45
44
  productCategoryId: undefined,
@@ -21,10 +21,14 @@ export const formatContentWithoutTags = (
21
21
  .replace(/\s\s+/g, ' ')
22
22
 
23
23
  const words = trimmedText.slice(0, maxLength).split(' ')
24
+ const contentWithMinLength = content.slice(0, MIN_EVENT_DESCRIPTION_SIZE)
24
25
  const index = String(content).indexOf(words[words.length - 2])
25
- return content.slice(0, index).concat('...')
26
+ const slicedContent = content.slice(0, index)
27
+ const contentWithMinSize = contentWithMinLength.length > slicedContent.length ? contentWithMinLength : slicedContent
28
+ return contentWithMinSize.concat('...')
26
29
  }
27
30
 
31
+ export const MIN_EVENT_DESCRIPTION_SIZE = 150
28
32
  export const EVENT_DESCRIPTION_SIZE = 350
29
33
 
30
34
  /**
@@ -1,6 +1,8 @@
1
1
  import { ReactNode } from 'react'
2
2
  import clsx from 'clsx'
3
3
  import { Image } from '@licklist/core/dist/DataMapper/Media/ImageDataMapper'
4
+ import { ZoneResourcesAvailability } from '@licklist/core/dist/DataMapper/Order/ZoneResourcesAvailabilityDataMapper'
5
+ import { AvailabilityIndicator } from '../../availability-indicator'
4
6
 
5
7
  export const LAYOUT_GRID = 'grid'
6
8
  export const LAYOUT_LIST = 'list'
@@ -15,6 +17,7 @@ export type ActivityCardProps = {
15
17
  layout?: typeof LAYOUT_GRID | typeof LAYOUT_LIST
16
18
  availableTimes?: string | null
17
19
  image?: Image | null
20
+ resources?: ZoneResourcesAvailability
18
21
  }
19
22
 
20
23
  export const ActivityCard = ({
@@ -27,6 +30,7 @@ export const ActivityCard = ({
27
30
  onSelect,
28
31
  isSelected,
29
32
  layout = LAYOUT_GRID,
33
+ resources,
30
34
  }: ActivityCardProps) => {
31
35
  if (layout === LAYOUT_GRID) {
32
36
  return (
@@ -46,6 +50,7 @@ export const ActivityCard = ({
46
50
  {description && (
47
51
  <div className='mt-2 activity-card-description'>{description}</div>
48
52
  )}
53
+ {resources && <AvailabilityIndicator resources={resources} />}
49
54
  </div>
50
55
  </button>
51
56
  )
@@ -71,6 +76,7 @@ export const ActivityCard = ({
71
76
  {description && (
72
77
  <div className='mt-2 activity-card-description'>{description}</div>
73
78
  )}
79
+ {resources && <AvailabilityIndicator resources={resources} />}
74
80
  </div>
75
81
 
76
82
  <hr className='list-activity-card-hr' />
@@ -89,6 +89,7 @@ export const NumberInput = forwardRef<HTMLInputElement, NumberInputProps>(
89
89
  <FormControl
90
90
  type='number'
91
91
  onChange={(e) => handleChangeValue(Number(e.target.value))}
92
+ onWheel={(event) => event.currentTarget.blur()}
92
93
  value={value}
93
94
  min={0}
94
95
  max={max}
@@ -101,6 +102,14 @@ export const NumberInput = forwardRef<HTMLInputElement, NumberInputProps>(
101
102
  <button
102
103
  type='button'
103
104
  onClick={handleArrowUpClick}
105
+ onWheel={(event) => event.currentTarget.blur()}
106
+ onFocus={(event) =>
107
+ event.target.addEventListener(
108
+ 'wheel',
109
+ (event) => event.preventDefault(),
110
+ { passive: false },
111
+ )
112
+ }
104
113
  className={`payment-number-input__btn-up ${
105
114
  plusButtonGreyedOut && 'disabled-number-input-button'
106
115
  }`}
@@ -51,6 +51,7 @@ export const ProductQuantityInput = ({
51
51
  hasDeposit: category.allowDeposits && product?.deposit < product.price,
52
52
  price: product.price,
53
53
  productCategoryId: category.id,
54
+ zoneId: category.zone?.id,
54
55
  quantity,
55
56
  capacity: product?.capacity,
56
57
  })
@@ -61,6 +61,7 @@ const processedPaymentSummary = ({
61
61
  const total = calculateTotalPrice(order, externalPaymentDetail)
62
62
 
63
63
  const totalDiscount = calculateTotalDiscount(order.payments)
64
+
64
65
  let summaryItems: SummaryItem[] = [
65
66
  {
66
67
  translateKey: AMOUNT_TOTAL,
@@ -38,7 +38,7 @@ export interface RyftPaymentFormProps {
38
38
  isCreateLoading: boolean
39
39
  isAppUsingInIframe?: boolean
40
40
  onApplePayButtonClick?: () => void
41
- applePayButtonDisabled?: boolean
41
+ payButtonDisabled?: boolean
42
42
  initRyft: (
43
43
  onSuccess: () => void,
44
44
  onFailure: (error?: string) => void,
@@ -57,6 +57,7 @@ export const RyftPaymentForm = ({
57
57
  initRyft,
58
58
  resetReferrer,
59
59
  onSubmit,
60
+ payButtonDisabled,
60
61
  }: RyftPaymentFormProps) => {
61
62
  const { t } = useTranslation(['Design', 'Validation', 'Ryft'])
62
63
  const formRef = useRef<HTMLFormElement | null>(null)
@@ -89,7 +90,6 @@ export const RyftPaymentForm = ({
89
90
 
90
91
  const handleSubmit = async () => {
91
92
  setIsBtnDisabled(true)
92
-
93
93
  try {
94
94
  const paymentSession = await onSubmit()
95
95
 
@@ -142,17 +142,21 @@ export const RyftPaymentForm = ({
142
142
  t,
143
143
  isAppUsingInIframe,
144
144
  onApplePayButtonClick,
145
+ isDisableButton: !payButtonDisabled,
145
146
  additionalPaymentMethodsEnabled:
146
147
  providerPaymentSettings?.additionalPaymentMethodsEnabled,
147
148
  })
148
149
  },
149
150
  // eslint-disable-next-line react-hooks/exhaustive-deps
150
- [formRef.current?.childNodes?.length, showApplePayButton],
151
+ [
152
+ formRef.current?.childNodes?.length,
153
+ showApplePayButton,
154
+ payButtonDisabled,
155
+ ],
151
156
  )
152
157
 
153
158
  useEffect(() => {
154
159
  if (!accountId.data?.account_id || accountId.isError) return
155
-
156
160
  initRyft(
157
161
  () => {
158
162
  addEventHandler('cardValidationChanged', (e: MessageEvent['data']) => {
@@ -215,6 +219,7 @@ export const RyftPaymentForm = ({
215
219
  onSubmit={methods.handleSubmit(handleSubmit)}
216
220
  className='ryft-payment-form'
217
221
  >
222
+ <div className='form-disable-box' id='form-disable-box' />
218
223
  <div className='submit-button-wrapper mt-4 p-1'>
219
224
  <Button type='submit' disabled={isBtnDisabled || !isValid}>
220
225
  {isBtnDisabled && <ButtonLoader />}
@@ -7,6 +7,7 @@ interface InjectComponentsInRyftForm
7
7
  'onApplePayButtonClick' | 'isAppUsingInIframe'
8
8
  > {
9
9
  t: TFunction<string[]>
10
+ isDisableButton?: boolean
10
11
  additionalPaymentMethodsEnabled?: boolean
11
12
  }
12
13
 
@@ -14,16 +15,19 @@ export const injectComponentsInRyftForm = ({
14
15
  t,
15
16
  additionalPaymentMethodsEnabled,
16
17
  isAppUsingInIframe,
18
+ isDisableButton,
17
19
  onApplePayButtonClick,
18
20
  }: InjectComponentsInRyftForm) => {
19
21
  const cardContainer = document.getElementById('ryft-pay-iframe')
20
-
21
22
  if (!cardContainer) {
22
23
  return
23
24
  }
24
25
  // Removing of the old title container
25
26
  document.getElementById('card-title-container')?.remove()
26
27
 
28
+ cardContainer.style.opacity = isDisableButton ? '0.6' : '1'
29
+ cardContainer.ariaDisabled = isDisableButton?.toString()
30
+
27
31
  const cardTitle = document.createElement('div')
28
32
  const cardText = document.createElement('div')
29
33
  const cardTitleContainer = document.createElement('div')
@@ -35,7 +39,6 @@ export const injectComponentsInRyftForm = ({
35
39
  cardContainer?.before(cardTitleContainer)
36
40
 
37
41
  const payGrid = document.getElementById('ryft-pay-grid')
38
-
39
42
  if (!payGrid || !additionalPaymentMethodsEnabled) {
40
43
  return
41
44
  }
@@ -58,6 +61,29 @@ export const injectComponentsInRyftForm = ({
58
61
  divider.id = 'mobile-pay-divider'
59
62
  container.id = 'mobile-pay-divider-container'
60
63
  container.append(dividerText, divider)
64
+ const payIframe = document.getElementById('ryft-pay-iframe')
65
+ if (payIframe) {
66
+ const formBox = document.getElementById('form-disable-box')
67
+ if (formBox) {
68
+ formBox.style.display = isDisableButton ? 'block' : 'none'
69
+ }
70
+
71
+ const googleButton = document.getElementById(
72
+ 'gpay-button-online-api-id',
73
+ ) as HTMLButtonElement
74
+ const appleButton = document.getElementById(
75
+ 'ryft-pay-apple-pay-button',
76
+ ) as HTMLButtonElement
77
+ if (googleButton) {
78
+ googleButton.disabled = isDisableButton
79
+ googleButton.style.opacity = isDisableButton ? '1' : '0.6'
80
+ }
81
+ if (appleButton) {
82
+ appleButton.disabled = isDisableButton
83
+ appleButton.style.opacity = isDisableButton ? '1' : '0.6'
84
+ }
85
+ }
86
+
61
87
  if (isAppUsingInIframe) {
62
88
  const applePayButton = document.createElement('button')
63
89
  applePayButton.id = 'apple-pay'
@@ -1,4 +1,4 @@
1
- import { forwardRef } from 'react'
1
+ import React, { forwardRef } from 'react'
2
2
 
3
3
  interface Props {
4
4
  children?: React.ReactNode | React.ReactNode[]
@@ -434,6 +434,7 @@ export const EmailTemplateControl = forwardRef(
434
434
  `templateOptionValues.${option?.id}.value`,
435
435
  )}
436
436
  type='number'
437
+ onWheel={(event) => event.currentTarget.blur()}
437
438
  placeholder={t(`Design:${option.name}`)}
438
439
  id={option.name + option.id}
439
440
  defaultValue={option.selectedValue || ''}
@@ -198,6 +198,8 @@ export const DateAndRecurrenceInput = ({
198
198
  move(prevIndex, nextIndex)
199
199
  }
200
200
 
201
+ const errorMessage = errors.menuRecurrences?.message || errors.menuRecurrences?.root?.message
202
+
201
203
  useEffect(() => {
202
204
  if (fields.length) {
203
205
  clearErrors('menuRecurrences')
@@ -307,7 +309,7 @@ export const DateAndRecurrenceInput = ({
307
309
  />
308
310
 
309
311
  <div className='manual-form-error'>
310
- {errors.menuRecurrences?.message}
312
+ {errorMessage}
311
313
  </div>
312
314
  </div>
313
315
  </OverlayTrigger>
@@ -247,7 +247,8 @@ export const DateInput = ({
247
247
  menuRecurrence={menuRecurrence}
248
248
  onEdit={() => handleOnEdit(menuRecurrence, index)}
249
249
  errorMessage={
250
- errors?.menuRecurrences?.[`${index}`]?.availableTimes?.message
250
+ errors?.menuRecurrences?.[`${index}`]?.availableTimes
251
+ ?.message || errors?.menuRecurrences?.[`${index}`]?.message
251
252
  }
252
253
  />
253
254
  ))}
@@ -8,6 +8,7 @@ import {
8
8
  useFormContext,
9
9
  useWatch,
10
10
  } from 'react-hook-form'
11
+ import { FaBars, FaBowlingBall, FaCalendar, FaTicketAlt } from 'react-icons/fa'
11
12
  import { useTranslation } from 'react-i18next'
12
13
  import { useSensor, MouseSensor } from '@dnd-kit/core'
13
14
  import {
@@ -25,7 +26,11 @@ import { ProductCategoryControl } from '../product-category'
25
26
  import { ProductCategory } from '../types'
26
27
  import { ProductsControl } from './ProductsControl'
27
28
  import { ProductSetFormValues, WithIsLoading } from './ProductSetForm'
28
- import { SelectCategoryModal } from './SelectCategoryModal'
29
+ import {
30
+ SelectCategoryModal,
31
+ CATEGORY_TYPES_NAMES,
32
+ CategoryConfig,
33
+ } from './SelectCategoryModal'
29
34
  import { ProductSetLoadingContext } from './context'
30
35
  import { VenueMapSetModal } from './VenueMapSetModal'
31
36
  import { moveArrayElements, sortArrayByIndex } from '../utils'
@@ -33,6 +38,29 @@ import { useSortableTreeFunctions } from '../hooks/useSortableTreeFunctions'
33
38
  // @TODO not for first release
34
39
  // import Popover from "./ProductSetFormPopover";
35
40
 
41
+ const CATEGORIES_TYPE: Partial<Record<CategoryType, CategoryConfig>> = {
42
+ [CATEGORY_TYPES_NAMES.tickets]: {
43
+ label: 'tickets',
44
+ icon: <FaTicketAlt color='#0e8ce2' size={10} />,
45
+ },
46
+ [CATEGORY_TYPES_NAMES.bookings]: {
47
+ label: 'bookings',
48
+ icon: <FaCalendar color='#0e8ce2' size={10} />,
49
+ },
50
+ [CATEGORY_TYPES_NAMES.menuItems]: {
51
+ label: 'menuItems',
52
+ icon: <FaBars color='#0e8ce2' size={10} />,
53
+ },
54
+ [CATEGORY_TYPES_NAMES.game]: {
55
+ label: 'game',
56
+ icon: <FaBowlingBall color='#0e8ce2' size={10} />,
57
+ },
58
+ [CATEGORY_TYPES_NAMES.fixedDuration]: {
59
+ label: 'fixedDuration',
60
+ icon: <FaCalendar color='#0e8ce2' size={10} />,
61
+ },
62
+ }
63
+
36
64
  interface ProductCategoriesControlProps extends WithIsLoading {
37
65
  stepIndex: number
38
66
  isOverrides?: boolean
@@ -228,6 +256,8 @@ export function ProductCategoriesControl({
228
256
  setIsExpanded(productCategoryId)
229
257
  }
230
258
 
259
+ const categoryType = CATEGORIES_TYPE[productCategory.type]
260
+
231
261
  return (
232
262
  <Controller
233
263
  key={`product-category-${productCategory._id}`}
@@ -272,6 +302,12 @@ export function ProductCategoriesControl({
272
302
  )}
273
303
  modalClass={ProductSetModalClasses.category}
274
304
  isNewAdded={showCategoryModal}
305
+ itemButton={
306
+ <div className='btn-outline-primary item-icon sm border border-primary rounded-sm'>
307
+ {categoryType.icon}
308
+ <span className='ml-2'>{t(categoryType.label)}</span>
309
+ </div>
310
+ }
275
311
  body={
276
312
  <ProductCategoryControl
277
313
  isLoading={isLoading}
@@ -1,4 +1,4 @@
1
- import { useEffect } from 'react'
1
+ import { useEffect, useState } from 'react'
2
2
  import { FormValues } from '@licklist/plugins/dist/types/services/Form/hook-form-service'
3
3
  import { Button, Form, Col, Row } from 'react-bootstrap'
4
4
  import { FormProvider, useForm } from 'react-hook-form'
@@ -12,7 +12,7 @@ import { isEqual } from 'lodash'
12
12
  import { ProviderBookingManagementSetting } from '@licklist/core/dist/DataMapper/Provider/ProviderBookingManagementSettingDataMapper'
13
13
  import { Zone } from '@licklist/core/dist/DataMapper/Provider/ZoneDataMapper'
14
14
  import { WorkHour } from '@licklist/core/dist/DataMapper/Provider/WorkHourDataMapper'
15
- import { transformErrorToMessage } from '@licklist/plugins'
15
+ import { transformErrorToMessage } from '@licklist/plugins/dist/utils/error'
16
16
  import { Dialog, useDialogContext } from '../../modals/dialog'
17
17
  import {
18
18
  ProductSetControl,
@@ -23,16 +23,21 @@ import { Step } from '../types'
23
23
  import { ProductSetContextProvider, ProductSetLoadingContext } from './context'
24
24
  import { SelectItem } from '../../types/generic/SelectItem'
25
25
  import { checkAvailableTimesErrors, getFilteredTemplates } from '../utils'
26
+ import { ErrorModal } from '../../iframe/order-process/components/ErrorModal'
26
27
 
27
28
  export interface WithIsLoading {
28
29
  isLoading: boolean
29
30
  }
31
+ export interface WithIdOptional {
32
+ id?: number
33
+ }
34
+
30
35
  export interface WithId {
31
36
  id: number
32
37
  }
33
38
  export interface ProductSetFormValues
34
39
  extends FormValues,
35
- WithId,
40
+ WithIdOptional,
36
41
  ProductSetControlValues {
37
42
  steps: Step[]
38
43
  isOverrides?: boolean
@@ -85,6 +90,7 @@ export function ProductSetForm({
85
90
  onApproveDialog,
86
91
  onDeclineDialog,
87
92
  } = useDialogContext()
93
+ const [errorMessage, setErrorMessage] = useState('')
88
94
 
89
95
  const form = useForm<ProductSetFormValues>({
90
96
  defaultValues,
@@ -166,6 +172,12 @@ export function ProductSetForm({
166
172
  onDecline={onDeclineDialog}
167
173
  />
168
174
 
175
+ <ErrorModal
176
+ message={errorMessage}
177
+ isOpen={!!errorMessage}
178
+ onClose={() => setErrorMessage('')}
179
+ />
180
+
169
181
  <FormProvider {...form}>
170
182
  <Form onSubmit={form.handleSubmit(submitHandler(onSubmitAndRedirect))}>
171
183
  <ProductSetLoadingContext.Consumer>
@@ -1,7 +1,4 @@
1
- // eslint-disable-next-line @typescript-eslint/ban-ts-comment
2
- // @ts-nocheck
3
- import React, { useContext, useState } from 'react'
4
-
1
+ import { useContext, useState } from 'react'
5
2
  import {
6
3
  ArrayPath,
7
4
  Controller,
@@ -25,7 +25,7 @@ import {
25
25
  } from 'react-icons/fa'
26
26
  import { ProductSetLoadingContext } from './context'
27
27
 
28
- const CATEGORY_TYPES_NAMES = {
28
+ export const CATEGORY_TYPES_NAMES = {
29
29
  menuItems: CATEGORY_TYPE_MENU_ITEMS,
30
30
  tickets: CATEGORY_TYPE_TICKETS,
31
31
  bookings: CATEGORY_TYPE_BOOKINGS,
@@ -33,7 +33,7 @@ const CATEGORY_TYPES_NAMES = {
33
33
  fixedDuration: CATEGORY_TYPE_FIXED_DURATION,
34
34
  } as const
35
35
 
36
- type CategoryConfig = { label: string; icon: ReactElement }
36
+ export type CategoryConfig = { label: string; icon: ReactElement }
37
37
 
38
38
  const MAIN_CATEGORIES: Partial<Record<CategoryType, CategoryConfig>> = {
39
39
  [CATEGORY_TYPES_NAMES.tickets]: {
@@ -70,9 +70,6 @@ export function SubProductsControl({
70
70
  images: subProducts[index]?.images as Image[],
71
71
  }
72
72
  // @ts-expect-error TS2345
73
- // @TODO fix prod type error
74
- // eslint-disable-next-line @typescript-eslint/ban-ts-comment
75
- // @ts-ignore
76
73
  append(subProductCopy)
77
74
  }}
78
75
  />
@@ -46,9 +46,6 @@ export const VenueMapsControl = ({
46
46
  url={image.url}
47
47
  name={name}
48
48
  points={points}
49
- // @TODO fix prod type error
50
- // eslint-disable-next-line @typescript-eslint/ban-ts-comment
51
- // @ts-ignore
52
49
  products={products}
53
50
  pointProducts={pointProducts}
54
51
  onPointProductsChange={onPointProductsChange}
@@ -34,7 +34,6 @@ import {
34
34
  } from 'react-hook-form'
35
35
  import { useTranslation } from 'react-i18next'
36
36
  import { useImages } from '@licklist/plugins/dist/hooks/Media/useImages'
37
-
38
37
  import {
39
38
  Image,
40
39
  IMAGE_TYPE_IMAGE,
@@ -1,4 +1,4 @@
1
- import React, { useContext } from 'react'
1
+ import { useContext } from 'react'
2
2
  import { Col, Form } from 'react-bootstrap'
3
3
  import { Controller, Path, useFormContext } from 'react-hook-form'
4
4
  import { HookFormService } from '@licklist/plugins'
@@ -86,6 +86,7 @@ export function ProductBookingManagementControl<T extends FormValues>(
86
86
  <Form.Control
87
87
  ref={ref}
88
88
  type='number'
89
+ onWheel={(event) => event.currentTarget.blur()}
89
90
  min={0}
90
91
  step={1}
91
92
  value={value as string}
@@ -129,6 +130,7 @@ export function ProductBookingManagementControl<T extends FormValues>(
129
130
  <Form.Control
130
131
  ref={ref}
131
132
  type='number'
133
+ onWheel={(event) => event.currentTarget.blur()}
132
134
  min='0'
133
135
  step='1'
134
136
  value={value as string}
@@ -50,6 +50,7 @@ export function ProductDepositControl<T extends FormValues>(
50
50
  <Form.Control
51
51
  ref={ref}
52
52
  type='number'
53
+ onWheel={(event) => event.currentTarget.blur()}
53
54
  min={0}
54
55
  max={Number(totalPrice)}
55
56
  step='0.01'
@@ -91,6 +91,7 @@ export const ProductDurationControl = <T,>({
91
91
  <Form.Control
92
92
  type='number'
93
93
  min={0}
94
+ onWheel={(event) => event.currentTarget.blur()}
94
95
  step={1}
95
96
  value={durationHours}
96
97
  disabled={disabled}
@@ -127,6 +128,7 @@ export const ProductDurationControl = <T,>({
127
128
  type='number'
128
129
  min={0}
129
130
  step={1}
131
+ onWheel={(event) => event.currentTarget.blur()}
130
132
  disabled={disabled}
131
133
  value={durationMinutes}
132
134
  isInvalid={isInvalid}
@@ -59,6 +59,7 @@ export function ProductPriceControl<T extends FormValues>({
59
59
  ref={ref}
60
60
  type='number'
61
61
  min={0}
62
+ onWheel={(event) => event.currentTarget.blur()}
62
63
  max={999999.99}
63
64
  step='0.01'
64
65
  value={value as string}