@licklist/design 0.70.6 → 0.70.8-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.
- package/dist/affiliate/form/AffiliateForm.d.ts.map +1 -1
- package/dist/assets/iframe/available.svg +4 -4
- package/dist/assets/iframe/available.svg.js +16 -18
- package/dist/auth/Login/LoginComponent.js +2 -1
- package/dist/availability-indicator/AvailabilityIndicator.d.ts +4 -2
- package/dist/availability-indicator/AvailabilityIndicator.d.ts.map +1 -1
- package/dist/availability-indicator/AvailabilityIndicator.js +112 -18
- package/dist/calendar/Calendar.d.ts +2 -0
- package/dist/calendar/Calendar.d.ts.map +1 -1
- package/dist/calendar/components/CalendarDates/CalendarDates.d.ts +2 -2
- package/dist/calendar/components/CalendarDates/CalendarDates.d.ts.map +1 -1
- package/dist/calendar/components/CalendarDates/CalendarDates.js +3 -2
- package/dist/calendar/utils/index.d.ts +8 -2
- package/dist/calendar/utils/index.d.ts.map +1 -1
- package/dist/calendar/utils/index.js +9 -21
- package/dist/date-time-button/DateContent.d.ts.map +1 -1
- package/dist/date-time-button/DateContent.js +3 -3
- package/dist/date-time-button/DateTimeButton.d.ts +3 -1
- package/dist/date-time-button/DateTimeButton.d.ts.map +1 -1
- package/dist/date-time-button/DateTimeButton.js +5 -3
- package/dist/events/edit-event-modal/component/SelectEventProductSet/component/EditEventProductSet.js +3 -2
- package/dist/events/edit-event-modal/utils/getDefaultProductSet.d.ts.map +1 -1
- package/dist/events/edit-event-modal/utils/getDefaultProductSet.js +0 -1
- package/dist/events/event-venue-map/EventVenueMap.d.ts.map +1 -1
- package/dist/events/event-venue-map/EventVenueMap.js +1 -0
- package/dist/events/event-venue-map/hooks/useCanvasSize.d.ts.map +1 -1
- package/dist/events/event-venue-map/hooks/useCanvasSize.js +11 -4
- package/dist/iframe/activity-card/ActivityCard.d.ts +3 -1
- package/dist/iframe/activity-card/ActivityCard.d.ts.map +1 -1
- package/dist/iframe/activity-card/ActivityCard.js +5 -3
- package/dist/iframe/event/ticket-description/TicketDescription.d.ts.map +1 -1
- package/dist/iframe/event/ticket-description/TicketDescription.js +43 -32
- package/dist/iframe/order-process/components/CategoryProduct/components/NumberInput/NumberInput.d.ts.map +1 -1
- package/dist/iframe/order-process/components/CategoryProduct/components/NumberInput/NumberInput.js +13 -0
- package/dist/iframe/payment/order-items-table/utils/paymentSummary.d.ts.map +1 -1
- package/dist/iframe/ryft/RyftPaymentForm.d.ts.map +1 -1
- package/dist/iframe/ryft/RyftPaymentForm.js +25 -12
- package/dist/iframe/ryft/utils/ryft-form.d.ts.map +1 -1
- package/dist/iframe/ryft/utils/ryft-form.js +4 -5
- package/dist/layout/DropDown.d.ts +2 -1
- package/dist/layout/DropDown.d.ts.map +1 -1
- package/dist/notification/email-template/control/EmailTemplateControl.d.ts.map +1 -1
- package/dist/notification/email-template/control/EmailTemplateControl.js +3 -0
- package/dist/product-set/form/ProductCategoriesControl.d.ts.map +1 -1
- package/dist/product-set/form/ProductCategoriesControl.js +48 -2
- package/dist/product-set/form/ProductSetForm.d.ts +4 -1
- package/dist/product-set/form/ProductSetForm.d.ts.map +1 -1
- package/dist/product-set/form/ProductSetForm.js +1 -1
- package/dist/product-set/form/ProductZonesControl.d.ts.map +1 -1
- package/dist/product-set/form/ProductZonesControl.js +0 -2
- package/dist/product-set/form/ProductsControl.js +1 -0
- package/dist/product-set/form/SelectCategoryModal.d.ts +12 -0
- package/dist/product-set/form/SelectCategoryModal.d.ts.map +1 -1
- package/dist/product-set/form/SelectCategoryModal.js +1 -1
- package/dist/product-set/form/SubProductsControl.d.ts.map +1 -1
- package/dist/product-set/form/SubProductsControl.js +0 -3
- package/dist/product-set/form/VenueMapSetModal.d.ts.map +1 -1
- package/dist/product-set/form/VenueMapSetModal.js +7 -7
- package/dist/product-set/form/VenueMapsControl.d.ts.map +1 -1
- package/dist/product-set/form/VenueMapsControl.js +0 -3
- package/dist/product-set/product/ProductControl.d.ts.map +1 -1
- package/dist/product-set/product/advanced-options/AdvancedOptions.js +1 -1
- package/dist/product-set/product/booking-management/ProductBookingManagementControl.d.ts.map +1 -1
- package/dist/product-set/product/booking-management/ProductBookingManagementControl.js +6 -0
- package/dist/product-set/product/deposit/ProductDepositControl.d.ts.map +1 -1
- package/dist/product-set/product/deposit/ProductDepositControl.js +3 -0
- package/dist/product-set/product/duration/ProductDurationControl.d.ts.map +1 -1
- package/dist/product-set/product/duration/ProductDurationControl.js +6 -0
- package/dist/product-set/product/price/ProductPriceControl.d.ts.map +1 -1
- package/dist/product-set/product/price/ProductPriceControl.js +3 -0
- package/dist/product-set/product/quantity/ProductQuantityConstantControl.d.ts.map +1 -1
- package/dist/product-set/product/quantity/ProductQuantityConstantControl.js +6 -0
- package/dist/product-set/product/quantity/ProductQuantityControl.d.ts.map +1 -1
- package/dist/product-set/product/quantity/ProductQuantityControl.js +6 -0
- package/dist/product-set/product/quantity/ProductQuantityRechargingControl.d.ts.map +1 -1
- package/dist/product-set/product/quantity/ProductQuantityRechargingControl.js +4 -1
- package/dist/product-set/product-category/ProductCategoryControl.d.ts.map +1 -1
- package/dist/product-set/product-category/ProductCategoryControl.js +12 -0
- package/dist/recurrence-input/RecurrenceEndInput.d.ts.map +1 -1
- package/dist/recurrence-input/RecurrenceEndInput.js +3 -0
- package/dist/recurring-date-picker-input/RecurrenceEndInput.d.ts.map +1 -1
- package/dist/resource/form/components/CapacityControl.d.ts.map +1 -1
- package/dist/resource/form/components/CapacityControl.js +3 -0
- package/dist/resource/form/components/SortControl.d.ts.map +1 -1
- package/dist/resource/form/components/SortControl.js +3 -0
- package/dist/sales/booking/results/components/ResultCard.d.ts.map +1 -1
- package/dist/sales/booking/results/components/ResultCard.js +0 -2
- package/dist/sales/coupon/control/CouponFormControl.d.ts.map +1 -1
- package/dist/sales/coupon/control/CouponFormControl.js +21 -0
- package/dist/setting/admin/PaymentFeeForm.d.ts.map +1 -1
- package/dist/setting/admin/PaymentFeeForm.js +16 -1
- package/dist/setting/dashboard/DashboardSettingForm.d.ts.map +1 -1
- package/dist/setting/dashboard/DashboardSettingForm.js +4 -1
- package/dist/snippet/snippet-template/preview/Preview.d.ts.map +1 -1
- package/dist/snippet/snippet-template/preview/Preview.js +11 -3
- package/dist/sortable-tree/SortableTreeItem.d.ts +2 -1
- package/dist/sortable-tree/SortableTreeItem.d.ts.map +1 -1
- package/dist/sortable-tree/SortableTreeItem.js +10 -4
- package/dist/static/CurrencyNumberInput.d.ts.map +1 -1
- package/dist/static/CurrencyNumberInput.js +3 -0
- package/dist/static/form-number-input/FormNumberInput.d.ts.map +1 -1
- package/dist/static/form-number-input/FormNumberInput.js +3 -0
- package/dist/static/number-input/NumberInput.d.ts.map +1 -1
- package/dist/static/number-input/NumberInput.js +3 -0
- package/dist/styles/availability-indicator/AvailabilityIndicator.scss +9 -0
- package/dist/styles/date-time-button/DateTimeButton.scss +2 -1
- package/dist/styles/iframe-events/TicketDescription.scss +1 -1
- package/dist/styles/iframe-external-modal/IframeExternalModal.scss +2 -2
- package/dist/styles/product-set/ProductSetForm.scss +22 -0
- package/dist/styles/ryft-payment-form/RyftPaymentForm.scss +1 -3
- package/dist/styles/sales/BookingResults.scss +1 -1
- package/dist/tiptap-editor/TipTapEditor.d.ts +2 -1
- package/dist/tiptap-editor/TipTapEditor.d.ts.map +1 -1
- package/dist/tiptap-editor/TipTapEditor.js +32 -2
- package/dist/zone/form/components/GameDurationControl.d.ts.map +1 -1
- package/dist/zone/form/components/GameDurationControl.js +3 -0
- package/dist/zone/form/components/SortControl.d.ts.map +1 -1
- package/dist/zone/form/components/SortControl.js +3 -0
- package/package.json +8 -6
- package/src/affiliate/form/AffiliateForm.tsx +1 -0
- package/src/assets/iframe/available.svg +4 -4
- package/src/auth/Login/LoginComponent.tsx +1 -1
- package/src/availability-indicator/AvailabilityIndicator.tsx +92 -17
- package/src/calendar/Calendar.tsx +2 -0
- package/src/calendar/components/CalendarDates/CalendarDates.tsx +3 -0
- package/src/calendar/utils/index.ts +17 -26
- package/src/date-time-button/DateContent.tsx +3 -3
- package/src/date-time-button/DateTimeButton.tsx +7 -3
- package/src/events/edit-event-modal/utils/getDefaultProductSet.ts +0 -1
- package/src/events/event-venue-map/EventVenueMap.tsx +1 -0
- package/src/events/event-venue-map/hooks/useCanvasSize.ts +5 -1
- package/src/iframe/activity-card/ActivityCard.tsx +15 -2
- package/src/iframe/event/ticket-description/TicketDescription.tsx +35 -22
- package/src/iframe/order-process/components/CategoryProduct/components/NumberInput/NumberInput.tsx +9 -0
- package/src/iframe/payment/order-items-table/utils/paymentSummary.tsx +1 -0
- package/src/iframe/ryft/RyftPaymentForm.tsx +14 -3
- package/src/iframe/ryft/utils/ryft-form.ts +6 -5
- package/src/layout/DropDown.tsx +1 -1
- package/src/notification/email-template/control/EmailTemplateControl.tsx +1 -0
- package/src/product-set/form/ProductCategoriesControl.tsx +37 -1
- package/src/product-set/form/ProductSetForm.tsx +6 -2
- package/src/product-set/form/ProductZonesControl.tsx +1 -4
- package/src/product-set/form/SelectCategoryModal.tsx +2 -2
- package/src/product-set/form/SubProductsControl.tsx +0 -3
- package/src/product-set/form/VenueMapSetModal.tsx +8 -9
- package/src/product-set/form/VenueMapsControl.tsx +0 -3
- package/src/product-set/product/ProductControl.tsx +0 -1
- package/src/product-set/product/advanced-options/AdvancedOptions.tsx +1 -1
- package/src/product-set/product/booking-management/ProductBookingManagementControl.tsx +2 -0
- package/src/product-set/product/deposit/ProductDepositControl.tsx +1 -0
- package/src/product-set/product/duration/ProductDurationControl.tsx +2 -0
- package/src/product-set/product/price/ProductPriceControl.tsx +1 -0
- package/src/product-set/product/quantity/ProductQuantityConstantControl.tsx +2 -0
- package/src/product-set/product/quantity/ProductQuantityControl.tsx +2 -0
- package/src/product-set/product/quantity/ProductQuantityRechargingControl.tsx +1 -0
- package/src/product-set/product-category/ProductCategoryControl.tsx +4 -0
- package/src/product-set/product-zone/ProductZoneControl.tsx +1 -1
- package/src/recurrence-input/RecurrenceEndInput.tsx +1 -0
- package/src/recurring-date-picker-input/RecurrenceEndInput.tsx +1 -0
- package/src/resource/form/components/CapacityControl.tsx +1 -0
- package/src/resource/form/components/SortControl.tsx +1 -0
- package/src/sales/booking/results/components/ResultCard.tsx +0 -2
- package/src/sales/coupon/control/CouponFormControl.tsx +7 -0
- package/src/setting/admin/PaymentFeeForm.tsx +5 -0
- package/src/setting/dashboard/DashboardSettingForm.tsx +1 -0
- package/src/snippet/snippet-template/preview/Preview.tsx +13 -5
- package/src/sortable-tree/SortableTreeItem.tsx +6 -0
- package/src/static/CurrencyNumberInput.tsx +1 -0
- package/src/static/form-number-input/FormNumberInput.tsx +1 -0
- package/src/static/number-input/NumberInput.tsx +1 -0
- package/src/styles/availability-indicator/AvailabilityIndicator.scss +9 -0
- package/src/styles/date-time-button/DateTimeButton.scss +2 -1
- package/src/styles/iframe-events/TicketDescription.scss +1 -1
- package/src/styles/iframe-external-modal/IframeExternalModal.scss +2 -2
- package/src/styles/product-set/ProductSetForm.scss +22 -0
- package/src/styles/ryft-payment-form/RyftPaymentForm.scss +1 -3
- package/src/styles/sales/BookingResults.scss +1 -1
- package/src/tiptap-editor/TipTapEditor.tsx +8 -1
- package/src/zone/form/components/GameDurationControl.tsx +1 -0
- package/src/zone/form/components/SortControl.tsx +1 -0
- package/yarn.lock +53 -36
|
@@ -1,40 +1,31 @@
|
|
|
1
|
+
import { TimeZone } from '@licklist/core/dist/DataMapper/Common/TimeZoneDataMapper'
|
|
1
2
|
import { DateTime, Interval } from 'luxon'
|
|
2
3
|
|
|
3
|
-
|
|
4
|
-
initialDate
|
|
5
|
-
timeZone
|
|
6
|
-
)
|
|
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
|
-
|
|
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
|
|
25
|
-
|
|
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
|
-
|
|
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
|
|
58
|
+
if (isToday(date)) return 'today'
|
|
59
59
|
|
|
60
|
-
if (isTomorrow(date
|
|
60
|
+
if (isTomorrow(date)) return 'tomorrow'
|
|
61
61
|
|
|
62
62
|
return date.toFormat(DAY_OF_WEEK)
|
|
63
63
|
}
|
|
@@ -2,6 +2,7 @@ import { ReactElement } from 'react'
|
|
|
2
2
|
import clsx from 'clsx'
|
|
3
3
|
import { DateTime } from 'luxon'
|
|
4
4
|
import { ZoneResourcesAvailability } from '@licklist/core/dist/DataMapper/Order/ZoneResourcesAvailabilityDataMapper'
|
|
5
|
+
import { AvailabilityFormat } from '@licklist/core/dist/DataMapper/Provider/SnippetDataMapper'
|
|
5
6
|
import { AvailabilityIndicator } from '../availability-indicator'
|
|
6
7
|
import { DateContent } from './DateContent'
|
|
7
8
|
|
|
@@ -21,6 +22,7 @@ export type DateTimeButtonProps = {
|
|
|
21
22
|
resources?: ZoneResourcesAvailability | null
|
|
22
23
|
showResources?: boolean
|
|
23
24
|
variant: Variant
|
|
25
|
+
availabilityFormat?: AvailabilityFormat | null
|
|
24
26
|
}
|
|
25
27
|
|
|
26
28
|
export const DateTimeButton = ({
|
|
@@ -33,6 +35,7 @@ export const DateTimeButton = ({
|
|
|
33
35
|
resources,
|
|
34
36
|
showResources,
|
|
35
37
|
variant = Variant.week,
|
|
38
|
+
availabilityFormat,
|
|
36
39
|
}: DateTimeButtonProps) => {
|
|
37
40
|
const isSoldOut =
|
|
38
41
|
_isSoldOut ||
|
|
@@ -43,7 +46,7 @@ export const DateTimeButton = ({
|
|
|
43
46
|
const isPast = variant === Variant.time ? isPastTime(date) : isPastDate(date)
|
|
44
47
|
|
|
45
48
|
const isDisabled = _isDisabled || isSoldOut || isPast
|
|
46
|
-
|
|
49
|
+
const isUnavailable = _isDisabled || isPast
|
|
47
50
|
return (
|
|
48
51
|
<button
|
|
49
52
|
type='button'
|
|
@@ -67,10 +70,11 @@ export const DateTimeButton = ({
|
|
|
67
70
|
variant={variant}
|
|
68
71
|
/>
|
|
69
72
|
{price && !isDisabled && <div className='price'>{price}</div>}
|
|
70
|
-
{showResources && resources && (
|
|
73
|
+
{showResources && (resources || isUnavailable) && (
|
|
71
74
|
<AvailabilityIndicator
|
|
75
|
+
availabilityFormat={availabilityFormat}
|
|
72
76
|
resources={resources}
|
|
73
|
-
isUnavailable={
|
|
77
|
+
isUnavailable={isUnavailable}
|
|
74
78
|
isSoldOut={isSoldOut}
|
|
75
79
|
/>
|
|
76
80
|
)}
|
|
@@ -10,13 +10,17 @@ export const useCanvasSize = ({
|
|
|
10
10
|
width: componentWidth,
|
|
11
11
|
height: componentHeight,
|
|
12
12
|
}: CanvasSizeProps) => {
|
|
13
|
+
// TODO Fix often updating of width and height
|
|
13
14
|
const { width, height } = useWindowDimensions()
|
|
14
15
|
|
|
16
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
17
|
+
const memoizedDimensions = useMemo(() => ({ width, height }), [width])
|
|
18
|
+
|
|
15
19
|
const memoedComponentParameters = useMemo(() => {
|
|
16
20
|
if (!componentWidth && !componentHeight) return null
|
|
17
21
|
|
|
18
22
|
return { width: componentWidth, height: componentHeight }
|
|
19
23
|
}, [componentWidth, componentHeight])
|
|
20
24
|
|
|
21
|
-
return memoedComponentParameters ||
|
|
25
|
+
return memoedComponentParameters || memoizedDimensions
|
|
22
26
|
}
|
|
@@ -2,6 +2,7 @@ import { ReactNode } from 'react'
|
|
|
2
2
|
import clsx from 'clsx'
|
|
3
3
|
import { Image } from '@licklist/core/dist/DataMapper/Media/ImageDataMapper'
|
|
4
4
|
import { ZoneResourcesAvailability } from '@licklist/core/dist/DataMapper/Order/ZoneResourcesAvailabilityDataMapper'
|
|
5
|
+
import { AvailabilityFormat } from '@licklist/core/dist/DataMapper/Provider/SnippetDataMapper'
|
|
5
6
|
import { AvailabilityIndicator } from '../../availability-indicator'
|
|
6
7
|
|
|
7
8
|
export const LAYOUT_GRID = 'grid'
|
|
@@ -18,6 +19,7 @@ export type ActivityCardProps = {
|
|
|
18
19
|
availableTimes?: string | null
|
|
19
20
|
image?: Image | null
|
|
20
21
|
resources?: ZoneResourcesAvailability
|
|
22
|
+
availabilityFormat?: AvailabilityFormat | null
|
|
21
23
|
}
|
|
22
24
|
|
|
23
25
|
export const ActivityCard = ({
|
|
@@ -30,6 +32,7 @@ export const ActivityCard = ({
|
|
|
30
32
|
onSelect,
|
|
31
33
|
isSelected,
|
|
32
34
|
layout = LAYOUT_GRID,
|
|
35
|
+
availabilityFormat,
|
|
33
36
|
resources,
|
|
34
37
|
}: ActivityCardProps) => {
|
|
35
38
|
if (layout === LAYOUT_GRID) {
|
|
@@ -50,7 +53,12 @@ export const ActivityCard = ({
|
|
|
50
53
|
{description && (
|
|
51
54
|
<div className='mt-2 activity-card-description'>{description}</div>
|
|
52
55
|
)}
|
|
53
|
-
{resources &&
|
|
56
|
+
{resources && (
|
|
57
|
+
<AvailabilityIndicator
|
|
58
|
+
resources={resources}
|
|
59
|
+
availabilityFormat={availabilityFormat}
|
|
60
|
+
/>
|
|
61
|
+
)}
|
|
54
62
|
</div>
|
|
55
63
|
</button>
|
|
56
64
|
)
|
|
@@ -76,7 +84,12 @@ export const ActivityCard = ({
|
|
|
76
84
|
{description && (
|
|
77
85
|
<div className='mt-2 activity-card-description'>{description}</div>
|
|
78
86
|
)}
|
|
79
|
-
{resources &&
|
|
87
|
+
{resources && (
|
|
88
|
+
<AvailabilityIndicator
|
|
89
|
+
resources={resources}
|
|
90
|
+
availabilityFormat={availabilityFormat}
|
|
91
|
+
/>
|
|
92
|
+
)}
|
|
80
93
|
</div>
|
|
81
94
|
|
|
82
95
|
<hr className='list-activity-card-hr' />
|
|
@@ -30,7 +30,6 @@ export function TicketDescription({
|
|
|
30
30
|
canExpand = true,
|
|
31
31
|
}: TicketDescriptionProps) {
|
|
32
32
|
const [isDescriptionExpanded, setIsDescriptionExpanded] = useState(false)
|
|
33
|
-
const showDescription = !!description
|
|
34
33
|
|
|
35
34
|
const wrapperClasses = clsx('ticket-description', className)
|
|
36
35
|
|
|
@@ -42,24 +41,6 @@ export function TicketDescription({
|
|
|
42
41
|
'--description-wrapper-height': 'inherit',
|
|
43
42
|
} as CSSProperties
|
|
44
43
|
|
|
45
|
-
const renderDescription = () => (
|
|
46
|
-
<div className='description-content'>
|
|
47
|
-
<div className='d-flex flex-column'>
|
|
48
|
-
<div className='product-title'>
|
|
49
|
-
{title} {isRequired && <span>*</span>}
|
|
50
|
-
</div>
|
|
51
|
-
{showDescription && (
|
|
52
|
-
<TipTapEditor
|
|
53
|
-
viewMode
|
|
54
|
-
disabled
|
|
55
|
-
content={description}
|
|
56
|
-
editorStyle={{ backgroundColor: 'transparent' }}
|
|
57
|
-
/>
|
|
58
|
-
)}
|
|
59
|
-
</div>
|
|
60
|
-
</div>
|
|
61
|
-
)
|
|
62
|
-
|
|
63
44
|
return (
|
|
64
45
|
<div className={wrapperClasses}>
|
|
65
46
|
<div
|
|
@@ -78,14 +59,46 @@ export function TicketDescription({
|
|
|
78
59
|
isExpanded={isDescriptionExpanded}
|
|
79
60
|
setIsExpanded={setIsDescriptionExpanded}
|
|
80
61
|
>
|
|
81
|
-
|
|
62
|
+
<Description
|
|
63
|
+
title={title}
|
|
64
|
+
isRequired={isRequired}
|
|
65
|
+
description={description}
|
|
66
|
+
/>
|
|
82
67
|
</TextExpand>
|
|
83
68
|
) : (
|
|
84
|
-
|
|
69
|
+
<Description
|
|
70
|
+
title={title}
|
|
71
|
+
isRequired={isRequired}
|
|
72
|
+
description={description}
|
|
73
|
+
/>
|
|
85
74
|
)}
|
|
86
75
|
</div>
|
|
87
76
|
</div>
|
|
88
|
-
{price && <div className={clsx(
|
|
77
|
+
{price && <div className={clsx({ 'mt-5': description })}>{price}</div>}
|
|
89
78
|
</div>
|
|
90
79
|
)
|
|
91
80
|
}
|
|
81
|
+
|
|
82
|
+
const Description = ({
|
|
83
|
+
title,
|
|
84
|
+
isRequired,
|
|
85
|
+
description,
|
|
86
|
+
}: Pick<TicketDescriptionProps, 'title' | 'isRequired' | 'description'>) => (
|
|
87
|
+
<div className='description-content'>
|
|
88
|
+
<div className='d-flex flex-column'>
|
|
89
|
+
<div className='product-title'>
|
|
90
|
+
{title} {isRequired && <span>*</span>}
|
|
91
|
+
</div>
|
|
92
|
+
|
|
93
|
+
{!!description && (
|
|
94
|
+
<TipTapEditor
|
|
95
|
+
viewMode
|
|
96
|
+
disabled
|
|
97
|
+
content={description}
|
|
98
|
+
editorStyle={{ backgroundColor: 'transparent' }}
|
|
99
|
+
hideEmptyEditor
|
|
100
|
+
/>
|
|
101
|
+
)}
|
|
102
|
+
</div>
|
|
103
|
+
</div>
|
|
104
|
+
)
|
package/src/iframe/order-process/components/CategoryProduct/components/NumberInput/NumberInput.tsx
CHANGED
|
@@ -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
|
}`}
|
|
@@ -33,6 +33,11 @@ export const ryftErrorMap: Record<string, string> = {
|
|
|
33
33
|
|
|
34
34
|
export type RyftPaymentFormValues = Record<string, never>
|
|
35
35
|
|
|
36
|
+
interface GoogleAndApplePayResponse {
|
|
37
|
+
paymentSession: AttemptPaymentResponse
|
|
38
|
+
eventName: string
|
|
39
|
+
}
|
|
40
|
+
|
|
36
41
|
export interface RyftPaymentFormProps {
|
|
37
42
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
38
43
|
accountId: any
|
|
@@ -89,10 +94,10 @@ export const RyftPaymentForm = ({
|
|
|
89
94
|
setReferrerBeforePayment()
|
|
90
95
|
}
|
|
91
96
|
|
|
92
|
-
const handleSubmit = async () => {
|
|
97
|
+
const handleSubmit = async (_paymentSession?: AttemptPaymentResponse) => {
|
|
93
98
|
setIsBtnDisabled(true)
|
|
94
99
|
try {
|
|
95
|
-
const paymentSession = await onSubmit()
|
|
100
|
+
const paymentSession = _paymentSession || (await onSubmit())
|
|
96
101
|
|
|
97
102
|
if (!paymentSession) {
|
|
98
103
|
setRyftError('unknown_error')
|
|
@@ -164,6 +169,12 @@ export const RyftPaymentForm = ({
|
|
|
164
169
|
addEventHandler('cardValidationChanged', (e: MessageEvent['data']) => {
|
|
165
170
|
setIsValid(e.isValid)
|
|
166
171
|
})
|
|
172
|
+
addEventHandler(
|
|
173
|
+
'walletPaymentSessionResult',
|
|
174
|
+
(e: MessageEvent<GoogleAndApplePayResponse>['data']) => {
|
|
175
|
+
handleSubmit(e.paymentSession)
|
|
176
|
+
},
|
|
177
|
+
)
|
|
167
178
|
|
|
168
179
|
setRyftInitFailure(false)
|
|
169
180
|
},
|
|
@@ -218,7 +229,7 @@ export const RyftPaymentForm = ({
|
|
|
218
229
|
ref={formRef}
|
|
219
230
|
id='ryft-pay-form'
|
|
220
231
|
noValidate
|
|
221
|
-
onSubmit={methods.handleSubmit(handleSubmit)}
|
|
232
|
+
onSubmit={methods.handleSubmit(() => handleSubmit())}
|
|
222
233
|
className='ryft-payment-form'
|
|
223
234
|
>
|
|
224
235
|
<div className='form-disable-box' id='form-disable-box' />
|
|
@@ -61,20 +61,22 @@ export const injectComponentsInRyftForm = ({
|
|
|
61
61
|
divider.id = 'mobile-pay-divider'
|
|
62
62
|
container.id = 'mobile-pay-divider-container'
|
|
63
63
|
container.append(dividerText, divider)
|
|
64
|
-
const payIframe = document.getElementById(
|
|
64
|
+
const payIframe = document.getElementById('ryft-pay-iframe')
|
|
65
65
|
if (payIframe) {
|
|
66
66
|
const formBox = document.getElementById('form-disable-box')
|
|
67
67
|
if (formBox) {
|
|
68
|
-
formBox.style.display = isDisableButton ?
|
|
68
|
+
formBox.style.display = isDisableButton ? 'block' : 'none'
|
|
69
69
|
}
|
|
70
70
|
|
|
71
71
|
const googleButton = document.getElementById(
|
|
72
72
|
'gpay-button-online-api-id',
|
|
73
73
|
) as HTMLButtonElement
|
|
74
|
-
const appleButton =document.getElementById(
|
|
74
|
+
const appleButton = document.getElementById(
|
|
75
|
+
'ryft-pay-apple-pay-button',
|
|
76
|
+
) as HTMLButtonElement
|
|
75
77
|
if (googleButton) {
|
|
76
78
|
googleButton.disabled = isDisableButton
|
|
77
|
-
googleButton.style.opacity = isDisableButton ? '1' : '0.6'
|
|
79
|
+
googleButton.style.opacity = !isDisableButton ? '1' : '0.6'
|
|
78
80
|
}
|
|
79
81
|
if (appleButton) {
|
|
80
82
|
appleButton.disabled = isDisableButton
|
|
@@ -86,7 +88,6 @@ export const injectComponentsInRyftForm = ({
|
|
|
86
88
|
const applePayButton = document.createElement('button')
|
|
87
89
|
applePayButton.id = 'apple-pay'
|
|
88
90
|
applePayButton.type = 'button'
|
|
89
|
-
applePayButton.style.opacity = !isDisableButton ? '1' : '0.6'
|
|
90
91
|
applePayButton.className = 'bg-dark btn btn-primary apple-pay-button'
|
|
91
92
|
applePayButton.textContent = t('Events:payWithApple')
|
|
92
93
|
applePayButton.onclick = onApplePayButtonClick
|
package/src/layout/DropDown.tsx
CHANGED
|
@@ -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 || ''}
|
|
@@ -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 {
|
|
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}
|
|
@@ -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,
|
|
@@ -28,12 +28,16 @@ import { ErrorModal } from '../../iframe/order-process/components/ErrorModal'
|
|
|
28
28
|
export interface WithIsLoading {
|
|
29
29
|
isLoading: boolean
|
|
30
30
|
}
|
|
31
|
+
export interface WithIdOptional {
|
|
32
|
+
id?: number
|
|
33
|
+
}
|
|
34
|
+
|
|
31
35
|
export interface WithId {
|
|
32
36
|
id: number
|
|
33
37
|
}
|
|
34
38
|
export interface ProductSetFormValues
|
|
35
39
|
extends FormValues,
|
|
36
|
-
|
|
40
|
+
WithIdOptional,
|
|
37
41
|
ProductSetControlValues {
|
|
38
42
|
steps: Step[]
|
|
39
43
|
isOverrides?: boolean
|
|
@@ -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
|
/>
|
|
@@ -2,7 +2,7 @@ import { useCallback, useContext, useMemo } from 'react'
|
|
|
2
2
|
import { Modal, Button, Form } from 'react-bootstrap'
|
|
3
3
|
import clsx from 'clsx'
|
|
4
4
|
import { useTranslation } from 'react-i18next'
|
|
5
|
-
import { useFormContext } from 'react-hook-form'
|
|
5
|
+
import { useFormContext, useWatch } from 'react-hook-form'
|
|
6
6
|
import HookFormService from '@licklist/plugins/dist/services/Form/HookFormService'
|
|
7
7
|
import { PointProduct } from '@licklist/core/dist/DataMapper/Product/PointProductDataMapper'
|
|
8
8
|
import { VenueMap } from '@licklist/core/dist/DataMapper/Product/VenueMapDataMapper'
|
|
@@ -11,7 +11,6 @@ import { WarningMessage } from '../../static'
|
|
|
11
11
|
import { ProductSetLoadingContext } from './context'
|
|
12
12
|
import { ProductSetFormValues } from './ProductSetForm'
|
|
13
13
|
import { VenueMapsControl } from './VenueMapsControl'
|
|
14
|
-
import { ProductCategory } from '../types'
|
|
15
14
|
|
|
16
15
|
type VenueMapSetModalProps = {
|
|
17
16
|
isVisible: boolean
|
|
@@ -34,6 +33,7 @@ export const VenueMapSetModal = ({
|
|
|
34
33
|
watch,
|
|
35
34
|
setValue,
|
|
36
35
|
trigger,
|
|
36
|
+
control,
|
|
37
37
|
} = useFormContext<ProductSetFormValues>()
|
|
38
38
|
|
|
39
39
|
const key = `steps.${stepIndex}.venueMapSetId` as const
|
|
@@ -41,9 +41,10 @@ export const VenueMapSetModal = ({
|
|
|
41
41
|
|
|
42
42
|
const venueMapSetId: number | null = watch(key) || null
|
|
43
43
|
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
44
|
+
const productCategories = useWatch({
|
|
45
|
+
control,
|
|
46
|
+
name: `steps.${stepIndex}.productCategories`,
|
|
47
|
+
})
|
|
47
48
|
|
|
48
49
|
const pointProducts: Partial<PointProduct>[] = watch(productPointsKey) || []
|
|
49
50
|
|
|
@@ -70,12 +71,10 @@ export const VenueMapSetModal = ({
|
|
|
70
71
|
)
|
|
71
72
|
|
|
72
73
|
const products = useMemo(() => {
|
|
73
|
-
if (!productCategories
|
|
74
|
-
return []
|
|
75
|
-
}
|
|
74
|
+
if (!productCategories?.length) return []
|
|
76
75
|
|
|
77
76
|
return productCategories.reduce(
|
|
78
|
-
(prevProducts, currentCategory
|
|
77
|
+
(prevProducts, currentCategory) => [
|
|
79
78
|
...prevProducts,
|
|
80
79
|
...(currentCategory.products || []),
|
|
81
80
|
],
|
|
@@ -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}
|
|
@@ -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}
|