@licklist/design 0.73.0 → 0.74.0-dev.1
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/dashboard/chartBar.svg.js +2 -2
- package/dist/auth/Authorizer.d.ts.map +1 -1
- package/dist/auth/Authorizer.js +2 -1
- package/dist/auth/Login/LoginComponent.js +2 -1
- package/dist/auth/Router.d.ts.map +1 -1
- package/dist/auth/Router.js +18 -14
- package/dist/events/edit-event-modal/component/EditEventForm/EditEventForm.d.ts +2 -1
- package/dist/events/edit-event-modal/component/EditEventForm/EditEventForm.d.ts.map +1 -1
- package/dist/events/edit-event-modal/component/EditEventForm/EditEventForm.js +3 -2
- package/dist/events/edit-event-modal/component/SelectEventProductSet/SelectEventProductSet.d.ts +2 -1
- package/dist/events/edit-event-modal/component/SelectEventProductSet/SelectEventProductSet.d.ts.map +1 -1
- package/dist/events/edit-event-modal/component/SelectEventProductSet/SelectEventProductSet.js +3 -2
- package/dist/events/edit-event-modal/component/SelectEventProductSet/component/EditEventProductSet.d.ts +2 -1
- package/dist/events/edit-event-modal/component/SelectEventProductSet/component/EditEventProductSet.d.ts.map +1 -1
- package/dist/events/edit-event-modal/component/SelectEventProductSet/component/EditEventProductSet.js +6 -4
- package/dist/events/edit-event-modal/utils/getDefaultProductSet.js +1 -1
- package/dist/events/event-statistic-modal/EventStatisticModal.d.ts +2 -1
- package/dist/events/event-statistic-modal/EventStatisticModal.d.ts.map +1 -1
- package/dist/events/event-statistic-modal/EventStatisticModal.js +2 -2
- package/dist/events/event-statistic-modal/hooks/useTableData.d.ts +1 -1
- package/dist/events/event-statistic-modal/hooks/useTableData.d.ts.map +1 -1
- package/dist/events/event-statistic-modal/hooks/useTableData.js +2 -1
- package/dist/events/event-statistic-modal/utils/index.js +3 -3
- 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/ProductWithModifierModal/ModifierSetModal/ProductWithModifierSetModal.js +2 -3
- package/dist/iframe/ProductWithModifierModal/ModifierSetModal/controll/ModifierSetControll.d.ts.map +1 -1
- package/dist/iframe/ProductWithModifierModal/ModifierSetModal/controll/ModifierSetControll.js +4 -11
- package/dist/iframe/order-process/components/BookingSummary/components/ProductSummary/ProductSummary.d.ts.map +1 -1
- 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/utils/ryft-form.d.ts.map +1 -1
- package/dist/iframe/ryft/utils/ryft-form.js +4 -5
- package/dist/index.d.ts +0 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +0 -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/control/ProductSetControl.d.ts +4 -1
- package/dist/product-set/control/ProductSetControl.d.ts.map +1 -1
- package/dist/product-set/control/ProductSetControl.js +13 -2
- package/dist/product-set/form/ProductCategoriesControl.d.ts +2 -1
- package/dist/product-set/form/ProductCategoriesControl.d.ts.map +1 -1
- package/dist/product-set/form/ProductCategoriesControl.js +3 -2
- package/dist/product-set/form/ProductSetForm.d.ts +7 -4
- package/dist/product-set/form/ProductSetForm.d.ts.map +1 -1
- package/dist/product-set/form/ProductSetForm.js +5 -3
- 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.d.ts +2 -1
- package/dist/product-set/form/ProductsControl.d.ts.map +1 -1
- package/dist/product-set/form/ProductsControl.js +7 -3
- package/dist/product-set/form/StepsControl.d.ts +2 -1
- package/dist/product-set/form/StepsControl.d.ts.map +1 -1
- package/dist/product-set/form/StepsControl.js +5 -3
- package/dist/product-set/form/SubProductsControl.d.ts.map +1 -1
- package/dist/product-set/form/SubProductsControl.js +1 -3
- package/dist/product-set/form/VenueMapsControl.d.ts.map +1 -1
- package/dist/product-set/form/VenueMapsControl.js +0 -3
- package/dist/product-set/form/context.d.ts +1 -2
- package/dist/product-set/form/context.d.ts.map +1 -1
- package/dist/product-set/product/ProductControl.d.ts +6 -2
- package/dist/product-set/product/ProductControl.d.ts.map +1 -1
- package/dist/product-set/product/ProductControl.js +36 -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/scanRange/ProductScanRangeControl.d.ts +12 -0
- package/dist/product-set/product/scanRange/ProductScanRangeControl.d.ts.map +1 -0
- package/dist/product-set/product/scanRange/ProductScanRangeControl.js +153 -0
- package/dist/product-set/product/scanRange/index.d.ts +2 -0
- package/dist/product-set/product/scanRange/index.d.ts.map +1 -0
- package/dist/product-set/product-category/ProductCategoryControl.d.ts.map +1 -1
- package/dist/product-set/product-category/ProductCategoryControl.js +12 -0
- package/dist/product-set/utils/index.d.ts +5 -1
- package/dist/product-set/utils/index.d.ts.map +1 -1
- 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/dashboard/DashboardSettingForm.d.ts.map +1 -1
- package/dist/setting/dashboard/DashboardSettingForm.js +4 -1
- package/dist/setting/index.d.ts +0 -2
- package/dist/setting/index.d.ts.map +1 -1
- package/dist/sortable-tree/SortableTreeItem.d.ts.map +1 -1
- 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/form/CustomCheckbox.scss +31 -0
- package/dist/styles/iframe-events/Calendar.scss +1 -1
- package/dist/styles/iframe-external-modal/IframeExternalModal.scss +2 -2
- package/dist/styles/product-set/ProductSetForm.scss +2 -3
- package/dist/styles/ryft-payment-form/RyftPaymentForm.scss +1 -3
- package/dist/styles/sales/BookingResults.scss +1 -1
- 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 +12 -6
- package/src/affiliate/form/AffiliateForm.tsx +1 -0
- package/src/auth/Authorizer.tsx +1 -0
- package/src/auth/Login/LoginComponent.tsx +1 -1
- package/src/auth/Router.tsx +19 -19
- package/src/events/edit-event-modal/component/EditEventForm/EditEventForm.tsx +15 -7
- package/src/events/edit-event-modal/component/SelectEventProductSet/SelectEventProductSet.tsx +3 -0
- package/src/events/edit-event-modal/component/SelectEventProductSet/component/EditEventProductSet.tsx +3 -0
- package/src/events/edit-event-modal/utils/getDefaultProductSet.ts +1 -1
- package/src/events/event-statistic-modal/EventStatisticModal.tsx +3 -1
- package/src/events/event-statistic-modal/hooks/useTableData.tsx +2 -1
- package/src/events/event-statistic-modal/utils/index.ts +4 -4
- package/src/events/event-venue-map/EventVenueMap.tsx +1 -0
- package/src/events/event-venue-map/hooks/useCanvasSize.ts +5 -1
- package/src/iframe/ProductWithModifierModal/ModifierSetModal/ProductWithModifierSetModal.tsx +2 -2
- package/src/iframe/ProductWithModifierModal/ModifierSetModal/controll/ModifierSetControll.tsx +5 -13
- package/src/iframe/order-process/components/BookingSummary/components/ProductSummary/ProductSummary.tsx +1 -0
- 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/utils/ryft-form.ts +6 -5
- package/src/index.ts +0 -1
- package/src/layout/DropDown.tsx +1 -1
- package/src/notification/email-template/control/EmailTemplateControl.tsx +1 -0
- package/src/product-set/control/ProductSetControl.tsx +17 -0
- package/src/product-set/form/ProductCategoriesControl.tsx +3 -0
- package/src/product-set/form/ProductSetForm.tsx +10 -6
- package/src/product-set/form/ProductZonesControl.tsx +1 -4
- package/src/product-set/form/ProductsControl.tsx +6 -7
- package/src/product-set/form/StepsControl.tsx +4 -3
- package/src/product-set/form/SubProductsControl.tsx +1 -3
- package/src/product-set/form/VenueMapsControl.tsx +0 -3
- package/src/product-set/form/context.tsx +2 -5
- package/src/product-set/product/ProductControl.tsx +57 -18
- 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/scanRange/ProductScanRangeControl.stories.ts +45 -0
- package/src/product-set/product/scanRange/ProductScanRangeControl.tsx +163 -0
- package/src/product-set/product/scanRange/index.ts +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/dashboard/DashboardSettingForm.tsx +1 -0
- package/src/setting/index.ts +0 -2
- package/src/sortable-tree/SortableTreeItem.tsx +1 -6
- 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/form/CustomCheckbox.scss +31 -0
- package/src/styles/iframe-events/Calendar.scss +1 -1
- package/src/styles/iframe-external-modal/IframeExternalModal.scss +2 -2
- package/src/styles/product-set/ProductSetForm.scss +2 -3
- package/src/styles/ryft-payment-form/RyftPaymentForm.scss +1 -3
- package/src/styles/sales/BookingResults.scss +1 -1
- package/src/zone/form/components/GameDurationControl.tsx +1 -0
- package/src/zone/form/components/SortControl.tsx +1 -0
- package/yarn.lock +827 -877
- package/dist/header/BookeditHeader.d.ts +0 -12
- package/dist/header/BookeditHeader.d.ts.map +0 -1
- package/dist/header/BookeditHeader.js +0 -21
- package/dist/header/Header.d.ts +0 -24
- package/dist/header/Header.d.ts.map +0 -1
- package/dist/header/Header.js +0 -81
- package/dist/header/elements/CompanySelector.d.ts +0 -11
- package/dist/header/elements/CompanySelector.d.ts.map +0 -1
- package/dist/header/elements/CompanySelector.js +0 -36
- package/dist/header/elements/index.d.ts +0 -3
- package/dist/header/elements/index.d.ts.map +0 -1
- package/dist/header/index.d.ts +0 -6
- package/dist/header/index.d.ts.map +0 -1
- package/dist/setting/admin/AdminSettingForm.d.ts +0 -25
- package/dist/setting/admin/AdminSettingForm.d.ts.map +0 -1
- package/dist/setting/admin/AdminSettingForm.js +0 -220
- package/dist/setting/admin/PaymentFeeForm.d.ts +0 -13
- package/dist/setting/admin/PaymentFeeForm.d.ts.map +0 -1
- package/dist/setting/admin/PaymentFeeForm.js +0 -424
- package/dist/setting/admin/index.d.ts +0 -2
- package/dist/setting/admin/index.d.ts.map +0 -1
- package/dist/setting/system/SystemSettingForm.d.ts +0 -10
- package/dist/setting/system/SystemSettingForm.d.ts.map +0 -1
- package/dist/setting/system/SystemSettingForm.js +0 -95
- package/dist/setting/system/index.d.ts +0 -2
- package/dist/setting/system/index.d.ts.map +0 -1
- package/dist/types/currency.d.ts +0 -5
- package/dist/types/currency.d.ts.map +0 -1
- package/src/header/BookeditHeader.tsx +0 -34
- package/src/header/Header.stories.tsx +0 -72
- package/src/header/Header.tsx +0 -107
- package/src/header/elements/CompanySelector.tsx +0 -47
- package/src/header/elements/Elements.stories.tsx +0 -33
- package/src/header/elements/index.ts +0 -3
- package/src/header/index.ts +0 -7
- package/src/setting/admin/AdminSetting.stories.tsx +0 -52
- package/src/setting/admin/AdminSettingForm.tsx +0 -196
- package/src/setting/admin/PaymentFeeForm.tsx +0 -304
- package/src/setting/admin/index.ts +0 -1
- package/src/setting/system/SystemSetting.stories.tsx +0 -26
- package/src/setting/system/SystemSettingForm.tsx +0 -62
- package/src/setting/system/index.ts +0 -1
- package/src/types/currency.ts +0 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/setting/index.ts"],"names":[],"mappings":"AAAA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/setting/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SortableTreeItem.d.ts","sourceRoot":"","sources":["../../src/sortable-tree/SortableTreeItem.tsx"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"SortableTreeItem.d.ts","sourceRoot":"","sources":["../../src/sortable-tree/SortableTreeItem.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAoC,MAAM,OAAO,CAAA;AAiBnE,eAAO,MAAM,sBAAsB;;;;;CAKzB,CAAA;AAEV,MAAM,MAAM,0BAA0B,GACpC,CAAC,OAAO,sBAAsB,CAAC,CAAC,MAAM,OAAO,sBAAsB,CAAC,CAAA;AAEtE,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,SAAS,CAAA;IACjB,QAAQ,CAAC,EAAE,SAAS,CAAA;IACpB,IAAI,EAAE,SAAS,CAAA;IACf,QAAQ,CAAC,EAAE,SAAS,CAAA;IACpB,OAAO,CAAC,EAAE,SAAS,CAAA;IACnB,UAAU,CAAC,EAAE,SAAS,CAAA;IACtB,QAAQ,CAAC,EAAE,SAAS,CAAA;IACpB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;IACxB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,aAAa,CAAC,EAAE,MAAM,IAAI,CAAA;IAC1B,IAAI,CAAC,EAAE,MAAM,IAAI,CAAA;IACjB,cAAc,CAAC,EAAE,MAAM,IAAI,CAAA;IAC3B,UAAU,CAAC,EAAE,0BAA0B,CAAA;IACvC,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;IACrB,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAA;IACjC,cAAc,CAAC,EAAE;QACf,KAAK,EAAE,MAAM,CAAA;QACb,SAAS,EAAE,MAAM,CAAA;KAClB,CAAA;IACD,aAAa,CAAC,EAAE,MAAM,IAAI,CAAA;IAC1B,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB;AAED,wBAAgB,gBAAgB,CAAC,EAC/B,EAAE,EACF,KAAK,EACL,KAAK,EACL,QAAQ,EACR,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,QAAQ,EACR,aAAa,EACb,UAAkB,EAClB,YAAmB,EACnB,SAAiB,EACjB,cAAqB,EACrB,iBAAsB,EACtB,UAAe,EACf,UAAU,EACV,UAAkB,EAClB,QAAQ,EACR,QAAQ,EACR,aAAa,EACb,cAAc,EACd,IAAI,EACJ,cAAc,EACd,aAAa,EACb,UAAU,EACV,UAAU,GACX,EAAE,qBAAqB,2CA+TvB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CurrencyNumberInput.d.ts","sourceRoot":"","sources":["../../src/static/CurrencyNumberInput.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAc,SAAS,EAAE,MAAM,OAAO,CAAA;AAC7C,OAAO,EAAQ,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAExD,MAAM,WAAW,wBAAyB,SAAQ,gBAAgB;IAChE,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,WAAW,CAAC,gBAAgB,CAAC,KAAK,IAAI,CAAA;IAC3D,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,CAAC,EAAE,SAAS,CAAA;IACjB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAED,eAAO,MAAM,mBAAmB,
|
|
1
|
+
{"version":3,"file":"CurrencyNumberInput.d.ts","sourceRoot":"","sources":["../../src/static/CurrencyNumberInput.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAc,SAAS,EAAE,MAAM,OAAO,CAAA;AAC7C,OAAO,EAAQ,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAExD,MAAM,WAAW,wBAAyB,SAAQ,gBAAgB;IAChE,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,WAAW,CAAC,gBAAgB,CAAC,KAAK,IAAI,CAAA;IAC3D,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,CAAC,EAAE,SAAS,CAAA;IACjB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAED,eAAO,MAAM,mBAAmB,uHAqC/B,CAAA"}
|
|
@@ -88,6 +88,9 @@ var CurrencyNumberInput = /*#__PURE__*/ forwardRef(function(_param, ref) {
|
|
|
88
88
|
disabled: disabled,
|
|
89
89
|
value: value,
|
|
90
90
|
onChange: onChange,
|
|
91
|
+
onWheel: function(event) {
|
|
92
|
+
return event.currentTarget.blur();
|
|
93
|
+
},
|
|
91
94
|
ref: ref
|
|
92
95
|
}, props)),
|
|
93
96
|
/*#__PURE__*/ jsx(Form.Control.Feedback, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FormNumberInput.d.ts","sourceRoot":"","sources":["../../../src/static/form-number-input/FormNumberInput.tsx"],"names":[],"mappings":"AAGA,OAAO,EAEL,eAAe,EAGhB,MAAM,iBAAiB,CAAA;AAIxB,UAAU,oBAAoB;IAC5B,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IAClC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,KAAK,CAAC,EAAE,IAAI,CACV,eAAe,EACf,KAAK,GAAG,KAAK,GAAG,UAAU,GAAG,UAAU,GAAG,SAAS,CACpD,CAAA;CACF;AAED,eAAO,MAAM,eAAe,2DAOzB,oBAAoB,
|
|
1
|
+
{"version":3,"file":"FormNumberInput.d.ts","sourceRoot":"","sources":["../../../src/static/form-number-input/FormNumberInput.tsx"],"names":[],"mappings":"AAGA,OAAO,EAEL,eAAe,EAGhB,MAAM,iBAAiB,CAAA;AAIxB,UAAU,oBAAoB;IAC5B,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IAClC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,KAAK,CAAC,EAAE,IAAI,CACV,eAAe,EACf,KAAK,GAAG,KAAK,GAAG,UAAU,GAAG,UAAU,GAAG,SAAS,CACpD,CAAA;CACF;AAED,eAAO,MAAM,eAAe,2DAOzB,oBAAoB,4CAkEtB,CAAA"}
|
|
@@ -106,6 +106,9 @@ var FormNumberInput = function(param) {
|
|
|
106
106
|
type: "number",
|
|
107
107
|
step: step,
|
|
108
108
|
disabled: disabled,
|
|
109
|
+
onWheel: function(event) {
|
|
110
|
+
return event.currentTarget.blur();
|
|
111
|
+
},
|
|
109
112
|
isInvalid: HookFormService.isInvalid(fieldName, errors)
|
|
110
113
|
}, field), {
|
|
111
114
|
onChange: function(event) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NumberInput.d.ts","sourceRoot":"","sources":["../../../src/static/number-input/NumberInput.tsx"],"names":[],"mappings":"AAIA,UAAU,gBAAgB;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IACjC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IACnC,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IACrC,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,wBAAgB,WAAW,CAAC,EAC1B,QAAgB,EAChB,SAAc,EACd,KAAK,EACL,QAAQ,EACR,WAAW,EACX,SAAS,EACT,GAAG,EACH,GAAG,EACH,YAAY,GACb,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"NumberInput.d.ts","sourceRoot":"","sources":["../../../src/static/number-input/NumberInput.tsx"],"names":[],"mappings":"AAIA,UAAU,gBAAgB;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IACjC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IACnC,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IACrC,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,wBAAgB,WAAW,CAAC,EAC1B,QAAgB,EAChB,SAAc,EACd,KAAK,EACL,QAAQ,EACR,WAAW,EACX,SAAS,EACT,GAAG,EACH,GAAG,EACH,YAAY,GACb,EAAE,gBAAgB,2CAoDlB"}
|
|
@@ -28,3 +28,34 @@
|
|
|
28
28
|
z-index: 2;
|
|
29
29
|
}
|
|
30
30
|
}
|
|
31
|
+
|
|
32
|
+
.checkbox-second-column {
|
|
33
|
+
margin-top: 1rem;
|
|
34
|
+
display: flex;
|
|
35
|
+
z-index: 2;
|
|
36
|
+
align-items: center;
|
|
37
|
+
|
|
38
|
+
.custom-checkbox .custom-control-label::before {
|
|
39
|
+
width: 1.5rem;
|
|
40
|
+
height: 1.5rem;
|
|
41
|
+
border-radius: 0.5rem;
|
|
42
|
+
border: 2px solid #0e8ce2;
|
|
43
|
+
margin-top: -0.3rem;
|
|
44
|
+
}
|
|
45
|
+
.custom-checkbox .custom-control-label::after {
|
|
46
|
+
width: 1.5rem;
|
|
47
|
+
height: 1.5rem;
|
|
48
|
+
top: 0;
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
.custom-control-label {
|
|
52
|
+
padding-left: 0.5rem;
|
|
53
|
+
font-weight: 400;
|
|
54
|
+
font-size: 1rem;
|
|
55
|
+
min-height: 3rem;
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
.checkbox-input {
|
|
59
|
+
z-index: 2;
|
|
60
|
+
}
|
|
61
|
+
}
|
|
@@ -15,7 +15,7 @@ body[bkdt-scrollable='false'] .bkdt-mask {
|
|
|
15
15
|
left: 0;
|
|
16
16
|
width: 100%;
|
|
17
17
|
height: 100%;
|
|
18
|
-
z-index:
|
|
18
|
+
z-index: 2147483646;
|
|
19
19
|
background-color: rgba(0, 0, 0, 0.5);
|
|
20
20
|
display: none;
|
|
21
21
|
}
|
|
@@ -24,7 +24,7 @@ body[bkdt-scrollable='false'] .bkdt-mask {
|
|
|
24
24
|
position: fixed;
|
|
25
25
|
top: 0;
|
|
26
26
|
left: 0;
|
|
27
|
-
z-index:
|
|
27
|
+
z-index: 2147483647;
|
|
28
28
|
display: none;
|
|
29
29
|
width: 100%;
|
|
30
30
|
height: 100%;
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
.product-set-form {
|
|
2
|
-
|
|
3
2
|
input,
|
|
4
3
|
textarea,
|
|
5
4
|
select,
|
|
@@ -211,8 +210,8 @@
|
|
|
211
210
|
|
|
212
211
|
.sortable-tree-item-toggle {
|
|
213
212
|
.product-zone-badge {
|
|
214
|
-
background-color: #
|
|
215
|
-
color: #
|
|
213
|
+
background-color: #efe9f5;
|
|
214
|
+
color: #84269b;
|
|
216
215
|
font-size: 0.875rem;
|
|
217
216
|
font-weight: 600;
|
|
218
217
|
}
|
|
@@ -102,7 +102,6 @@
|
|
|
102
102
|
}
|
|
103
103
|
|
|
104
104
|
.ryft-payment-form {
|
|
105
|
-
|
|
106
105
|
.form-disable-box {
|
|
107
106
|
display: none;
|
|
108
107
|
position: absolute;
|
|
@@ -184,7 +183,6 @@
|
|
|
184
183
|
}
|
|
185
184
|
|
|
186
185
|
@include media-breakpoint-up(md) {
|
|
187
|
-
|
|
188
186
|
.ryft-payment-form,
|
|
189
187
|
.form-disable-box {
|
|
190
188
|
height: 50%;
|
|
@@ -213,4 +211,4 @@
|
|
|
213
211
|
.divider {
|
|
214
212
|
display: none !important;
|
|
215
213
|
}
|
|
216
|
-
}
|
|
214
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GameDurationControl.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/components/GameDurationControl.tsx"],"names":[],"mappings":"AAOA,KAAK,wBAAwB,GAAG;IAC9B,SAAS,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,mBAAmB,mBAE7B,wBAAwB,
|
|
1
|
+
{"version":3,"file":"GameDurationControl.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/components/GameDurationControl.tsx"],"names":[],"mappings":"AAOA,KAAK,wBAAwB,GAAG;IAC9B,SAAS,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,mBAAmB,mBAE7B,wBAAwB,4CAgC1B,CAAA"}
|
|
@@ -77,6 +77,9 @@ var GameDurationControl = function(param) {
|
|
|
77
77
|
required: false,
|
|
78
78
|
min: 1
|
|
79
79
|
})), {
|
|
80
|
+
onWheel: function(event) {
|
|
81
|
+
return event.currentTarget.blur();
|
|
82
|
+
},
|
|
80
83
|
placeholder: t('Design:duration'),
|
|
81
84
|
isInvalid: Boolean(errors.defaultDuration),
|
|
82
85
|
disabled: isLoading
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SortControl.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/components/SortControl.tsx"],"names":[],"mappings":"AAOA,KAAK,gBAAgB,GAAG;IACtB,SAAS,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,WAAW,kBAAmB,gBAAgB,
|
|
1
|
+
{"version":3,"file":"SortControl.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/components/SortControl.tsx"],"names":[],"mappings":"AAOA,KAAK,gBAAgB,GAAG;IACtB,SAAS,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,WAAW,kBAAmB,gBAAgB,4CAoC1D,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@licklist/design",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.74.0-dev.1",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "git+ssh://git@bitbucket.org/artelogicsoft/licklist_design.git"
|
|
@@ -42,9 +42,9 @@
|
|
|
42
42
|
]
|
|
43
43
|
},
|
|
44
44
|
"peerDependencies": {
|
|
45
|
-
"@licklist/core": "0.32.
|
|
45
|
+
"@licklist/core": "0.32.15-dev.3",
|
|
46
46
|
"@licklist/eslint-config": "0.5.6",
|
|
47
|
-
"@licklist/plugins": "0.35.
|
|
47
|
+
"@licklist/plugins": "0.35.1-dev.9",
|
|
48
48
|
"lodash": "4.17.21",
|
|
49
49
|
"luxon": "3.5.0",
|
|
50
50
|
"react": "17.0.2",
|
|
@@ -61,9 +61,9 @@
|
|
|
61
61
|
"@dnd-kit/utilities": "2.0.0",
|
|
62
62
|
"@fortawesome/fontawesome-svg-core": "1.2.34",
|
|
63
63
|
"@fortawesome/free-solid-svg-icons": "5.15.2",
|
|
64
|
-
"@licklist/core": "0.
|
|
64
|
+
"@licklist/core": "0.31.2-dev.18",
|
|
65
65
|
"@licklist/eslint-config": "0.5.6",
|
|
66
|
-
"@licklist/plugins": "0.35.
|
|
66
|
+
"@licklist/plugins": "0.35.1-dev.9",
|
|
67
67
|
"@mantine/core": "6.0.22",
|
|
68
68
|
"@mantine/hooks": "6.0.22",
|
|
69
69
|
"@mdx-js/react": "1.6.22",
|
|
@@ -195,6 +195,10 @@
|
|
|
195
195
|
"vite-plugin-svgr": "4.2.0",
|
|
196
196
|
"vite-tsconfig-paths": "5.0.1"
|
|
197
197
|
},
|
|
198
|
+
"resolutions": {
|
|
199
|
+
"@types/react": "17.0.80",
|
|
200
|
+
"@types/react-dom": "17.0.25"
|
|
201
|
+
},
|
|
198
202
|
"lint-staged": {
|
|
199
203
|
"*.{ts,tsx}": [
|
|
200
204
|
"yarn lint:fix",
|
|
@@ -202,8 +206,10 @@
|
|
|
202
206
|
"yarn tsc"
|
|
203
207
|
]
|
|
204
208
|
},
|
|
209
|
+
"packageManager": "yarn@4.4.0",
|
|
205
210
|
"volta": {
|
|
206
211
|
"node": "20.9.0",
|
|
207
212
|
"yarn": "4.4.0"
|
|
208
|
-
}
|
|
213
|
+
},
|
|
214
|
+
"stableVersion": "0.71.4-dev.1"
|
|
209
215
|
}
|
|
@@ -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)}>
|
package/src/auth/Authorizer.tsx
CHANGED
package/src/auth/Router.tsx
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import { ReactNode
|
|
1
|
+
import { ReactNode } from 'react'
|
|
2
2
|
import { Router as BrowserRouter } from 'react-router-dom'
|
|
3
|
-
import App from '@licklist/plugins/dist/services/App/App'
|
|
4
3
|
import history from '@licklist/plugins/dist/services/History/History'
|
|
5
4
|
|
|
6
5
|
export interface RouterProps {
|
|
@@ -10,24 +9,25 @@ export interface RouterProps {
|
|
|
10
9
|
function Router(props: RouterProps) {
|
|
11
10
|
const { children } = props
|
|
12
11
|
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
12
|
+
// uncomment if necessary to debug history
|
|
13
|
+
// useEffect(() => {
|
|
14
|
+
// if (App.isDevelopment()) {
|
|
15
|
+
// console.info('initial history is: ', JSON.stringify(history, null, 2))
|
|
16
|
+
// history.listen((location, action) => {
|
|
17
|
+
// if (!location) {
|
|
18
|
+
// return
|
|
19
|
+
// }
|
|
20
20
|
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
}, [])
|
|
21
|
+
// console.info(
|
|
22
|
+
// `The current URL is ${location.pathname}${location.search}${location.hash}`,
|
|
23
|
+
// )
|
|
24
|
+
// console.info(
|
|
25
|
+
// `The last navigation action was ${action}`,
|
|
26
|
+
// JSON.stringify(history, null, 2),
|
|
27
|
+
// )
|
|
28
|
+
// })
|
|
29
|
+
// }
|
|
30
|
+
// }, [])
|
|
31
31
|
|
|
32
32
|
// TODO fix issue react router types
|
|
33
33
|
// @ts-expect-error
|
|
@@ -36,7 +36,6 @@ import { ProductSetFormValues } from '../../../../product-set/form/ProductSetFor
|
|
|
36
36
|
import { isUrlValid } from '../../utils/isUrlValid'
|
|
37
37
|
import { toSimpleDateTime } from '../../utils/checkIfEventBooked'
|
|
38
38
|
|
|
39
|
-
|
|
40
39
|
export interface EditEventFormValues extends IntervalInputValues {
|
|
41
40
|
name: string
|
|
42
41
|
startAt: string
|
|
@@ -72,6 +71,7 @@ export interface EditEventFormProps extends HasPermissionProp {
|
|
|
72
71
|
disabledRecurrent?: boolean
|
|
73
72
|
isCopyCreate?: boolean
|
|
74
73
|
isBooked?: boolean
|
|
74
|
+
isWaiverEnabled: boolean
|
|
75
75
|
}
|
|
76
76
|
|
|
77
77
|
const eventImageTypes = {
|
|
@@ -97,6 +97,7 @@ export const EditEventForm = ({
|
|
|
97
97
|
disabledRecurrent = false,
|
|
98
98
|
isCopyCreate = false,
|
|
99
99
|
isBooked = false,
|
|
100
|
+
isWaiverEnabled,
|
|
100
101
|
}: EditEventFormProps) => {
|
|
101
102
|
const { t } = useTranslation(['Design', 'Validation'])
|
|
102
103
|
|
|
@@ -200,9 +201,13 @@ export const EditEventForm = ({
|
|
|
200
201
|
rrule && setValue('rrule', rrule?.concat(`;EXDATE=${defaultExDate}`))
|
|
201
202
|
}, [defaultExDate, rrule])
|
|
202
203
|
|
|
203
|
-
const isChanged = !isEqual(
|
|
204
|
+
const isChanged = !isEqual(
|
|
205
|
+
watchedValues,
|
|
206
|
+
sanitizeDefaultValues(defaultEventValues),
|
|
207
|
+
)
|
|
204
208
|
const isChangedTime =
|
|
205
|
-
watchedValues?.start !==
|
|
209
|
+
watchedValues?.start !==
|
|
210
|
+
toSimpleDateTime(defaultEventValues?.startAt || '') ||
|
|
206
211
|
watchedValues?.end !== toSimpleDateTime(defaultEventValues?.endAt || '')
|
|
207
212
|
const isSinglEventWithBooked = !rrule && isBooked && isChangedTime
|
|
208
213
|
|
|
@@ -438,6 +443,7 @@ export const EditEventForm = ({
|
|
|
438
443
|
timeZone={timeZone}
|
|
439
444
|
eventProductSet={eventProductSet}
|
|
440
445
|
overrideNameError={overrideNameError}
|
|
446
|
+
isWaiverEnabled={isWaiverEnabled}
|
|
441
447
|
/>
|
|
442
448
|
|
|
443
449
|
{isSinglEventWithBooked && (
|
|
@@ -453,9 +459,13 @@ export const EditEventForm = ({
|
|
|
453
459
|
}
|
|
454
460
|
className='save-event'
|
|
455
461
|
type='button'
|
|
456
|
-
onClick={() =>
|
|
462
|
+
onClick={() =>
|
|
463
|
+
confirm(handleSubmit(onSaveEvent, onErrorSubmit))
|
|
464
|
+
}
|
|
457
465
|
>
|
|
458
|
-
{formState.isSubmitting
|
|
466
|
+
{formState.isSubmitting
|
|
467
|
+
? `${t('saveAndAdd')}...`
|
|
468
|
+
: t('saveAndAdd')}
|
|
459
469
|
</Button>
|
|
460
470
|
)}
|
|
461
471
|
</ConfirmModal>
|
|
@@ -519,5 +529,3 @@ const sanitizeDefaultValues = (
|
|
|
519
529
|
recurrenceEndAt: values?.recurrenceEndAt ?? undefined,
|
|
520
530
|
}
|
|
521
531
|
}
|
|
522
|
-
|
|
523
|
-
|
package/src/events/edit-event-modal/component/SelectEventProductSet/SelectEventProductSet.tsx
CHANGED
|
@@ -21,6 +21,7 @@ interface SelectEventProductSetProps extends HasPermissionProp {
|
|
|
21
21
|
timeZone: string
|
|
22
22
|
eventProductSet?: ProductSet
|
|
23
23
|
overrideNameError?: string
|
|
24
|
+
isWaiverEnabled: boolean
|
|
24
25
|
}
|
|
25
26
|
|
|
26
27
|
export const SelectEventProductSet = ({
|
|
@@ -32,6 +33,7 @@ export const SelectEventProductSet = ({
|
|
|
32
33
|
timeZone,
|
|
33
34
|
eventProductSet,
|
|
34
35
|
overrideNameError,
|
|
36
|
+
isWaiverEnabled,
|
|
35
37
|
}: SelectEventProductSetProps) => {
|
|
36
38
|
const productSets = eventProductSet
|
|
37
39
|
? [..._productSets, eventProductSet]
|
|
@@ -216,6 +218,7 @@ export const SelectEventProductSet = ({
|
|
|
216
218
|
}
|
|
217
219
|
timeZone={timeZone}
|
|
218
220
|
overrideNameError={overrideNameError}
|
|
221
|
+
isWaiverEnabled={isWaiverEnabled}
|
|
219
222
|
/>
|
|
220
223
|
)}
|
|
221
224
|
</>
|
|
@@ -24,6 +24,7 @@ interface EditEventProductSetProps {
|
|
|
24
24
|
defaultValues?: EditEventFormValues['editedProductSet']
|
|
25
25
|
timeZone: string
|
|
26
26
|
overrideNameError?: string
|
|
27
|
+
isWaiverEnabled: boolean
|
|
27
28
|
}
|
|
28
29
|
|
|
29
30
|
export const EditEventProductSet = ({
|
|
@@ -31,6 +32,7 @@ export const EditEventProductSet = ({
|
|
|
31
32
|
defaultValues,
|
|
32
33
|
timeZone,
|
|
33
34
|
overrideNameError,
|
|
35
|
+
isWaiverEnabled,
|
|
34
36
|
}: EditEventProductSetProps) => {
|
|
35
37
|
const { companyId } = useParams<{
|
|
36
38
|
companyId: string
|
|
@@ -139,6 +141,7 @@ export const EditEventProductSet = ({
|
|
|
139
141
|
isOverrides
|
|
140
142
|
workHours={undefined}
|
|
141
143
|
timeZone={timeZone}
|
|
144
|
+
isWaiverEnabled={isWaiverEnabled}
|
|
142
145
|
/>
|
|
143
146
|
<Button
|
|
144
147
|
disabled={isLoading}
|
|
@@ -14,6 +14,7 @@ export const getDefaultValues = (
|
|
|
14
14
|
name: productSet?.name ?? '',
|
|
15
15
|
description: productSet?.description ?? '',
|
|
16
16
|
image: productSet?.image,
|
|
17
|
+
hasGeneralTicket: productSet?.hasGeneralTicket,
|
|
17
18
|
type: productSet?.type ?? DEFAULT_PRODUCT_SET_TYPE,
|
|
18
19
|
termsAndConditions: productSet?.termsAndConditions ?? '',
|
|
19
20
|
operationalCost: productSet?.operationalCost ?? DEFAULT_OPERATIONAL_COST_TYPE,
|
|
@@ -40,7 +41,6 @@ export const getDefaultValues = (
|
|
|
40
41
|
...product,
|
|
41
42
|
subProducts: subProducts?.map(({ ...subProducts }) => ({
|
|
42
43
|
...subProducts,
|
|
43
|
-
originalProductId: null,
|
|
44
44
|
productCategoryId: undefined,
|
|
45
45
|
})),
|
|
46
46
|
productCategoryId: undefined,
|
|
@@ -12,6 +12,7 @@ export type EventStatisticModalProps = {
|
|
|
12
12
|
date?: Event['startAt'] | null
|
|
13
13
|
eventStatistic?: EventStatistic | null
|
|
14
14
|
title?: string
|
|
15
|
+
eventId?: string
|
|
15
16
|
}
|
|
16
17
|
|
|
17
18
|
export const EventStatisticModal = ({
|
|
@@ -20,10 +21,11 @@ export const EventStatisticModal = ({
|
|
|
20
21
|
date,
|
|
21
22
|
eventStatistic,
|
|
22
23
|
title,
|
|
24
|
+
eventId,
|
|
23
25
|
}: EventStatisticModalProps) => {
|
|
24
26
|
const { t } = useTranslation('Design')
|
|
25
27
|
|
|
26
|
-
const data = useTableData(date, eventStatistic)
|
|
28
|
+
const data = useTableData(date, eventStatistic, eventId)
|
|
27
29
|
const handleClose = () => {
|
|
28
30
|
setIsOpen(false)
|
|
29
31
|
}
|
|
@@ -11,6 +11,7 @@ import { StaticTableData } from '../../../table'
|
|
|
11
11
|
export const useTableData = (
|
|
12
12
|
date: Event['startAt'] | null,
|
|
13
13
|
eventStatistic: EventStatistic | null,
|
|
14
|
+
eventId: string,
|
|
14
15
|
) => {
|
|
15
16
|
const { t } = useTranslation('Design')
|
|
16
17
|
const { formatNumber } = useIntl()
|
|
@@ -84,7 +85,7 @@ export const useTableData = (
|
|
|
84
85
|
useEffect(() => {
|
|
85
86
|
setTableRows(transformStatisticToTableRows(date, eventStatistic))
|
|
86
87
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
87
|
-
}, [date, eventStatistic])
|
|
88
|
+
}, [date, eventId, eventStatistic])
|
|
88
89
|
|
|
89
90
|
return tableRows
|
|
90
91
|
}
|
|
@@ -33,15 +33,15 @@ export const convertEventStatisticToTableData = (
|
|
|
33
33
|
return []
|
|
34
34
|
}
|
|
35
35
|
|
|
36
|
-
const summaryFormattedDate = DateTime.fromISO(date)
|
|
37
|
-
|
|
38
|
-
|
|
36
|
+
const summaryFormattedDate = DateTime.fromISO(date).toFormat(
|
|
37
|
+
DATE_TIME_FULL_FORMAT,
|
|
38
|
+
)
|
|
39
39
|
|
|
40
40
|
const summaryDays =
|
|
41
41
|
Object.keys(eventStatistic?.productCategorySummary)?.filter(
|
|
42
42
|
(date) =>
|
|
43
43
|
DateTime.fromFormat(date, DATE_TIME_FULL_FORMAT).toFormat(
|
|
44
|
-
|
|
44
|
+
DATE_TIME_FULL_FORMAT,
|
|
45
45
|
) === summaryFormattedDate,
|
|
46
46
|
) ?? []
|
|
47
47
|
|
|
@@ -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
|
}
|
package/src/iframe/ProductWithModifierModal/ModifierSetModal/ProductWithModifierSetModal.tsx
CHANGED
|
@@ -48,12 +48,12 @@ export const ProductWithModifierSetModal = ({
|
|
|
48
48
|
</button>
|
|
49
49
|
</div>
|
|
50
50
|
<div className='right-block' id='select-event-container'>
|
|
51
|
-
<div className={clsx('manual-booking-container', !product
|
|
51
|
+
<div className={clsx('manual-booking-container', !product.images.length && 'tw-mt-8')}>
|
|
52
52
|
<div className='manual-booking-header'>
|
|
53
53
|
<TicketDescription
|
|
54
54
|
title={product.name}
|
|
55
55
|
description={product.description}
|
|
56
|
-
className={clsx('iframe-event__product-description', !product
|
|
56
|
+
className={clsx('iframe-event__product-description', !product.images.length && 'mt-6')}
|
|
57
57
|
classNameProductModal='d-block'
|
|
58
58
|
images={product.images}
|
|
59
59
|
isRequired={product.isRequired}
|
package/src/iframe/ProductWithModifierModal/ModifierSetModal/controll/ModifierSetControll.tsx
CHANGED
|
@@ -35,9 +35,6 @@ export const ModifiersSetControl = ({
|
|
|
35
35
|
const { t } = useTranslation('App')
|
|
36
36
|
|
|
37
37
|
const orderModifiersSets = watch(`${productId}.orderProductModifiers`)
|
|
38
|
-
const filteredOrderModifiersSets = orderModifiersSets
|
|
39
|
-
?.flat(Infinity)
|
|
40
|
-
?.filter((item) => item && typeof item === 'object')
|
|
41
38
|
|
|
42
39
|
const { formatNumber } = useIntl()
|
|
43
40
|
const formatToCurrency = (value: number) =>
|
|
@@ -61,9 +58,8 @@ export const ModifiersSetControl = ({
|
|
|
61
58
|
const selectedModifier = modifiers?.find(
|
|
62
59
|
(item) => item.id === Number(e.target.defaultValue || e.target.id),
|
|
63
60
|
)
|
|
64
|
-
|
|
65
61
|
const checkSelectedModifier =
|
|
66
|
-
|
|
62
|
+
orderModifiersSets?.find(
|
|
67
63
|
(modifier) => modifier?.modifierId === selectedModifier?.id,
|
|
68
64
|
)?.quantity === 1
|
|
69
65
|
|
|
@@ -129,11 +125,9 @@ export const ModifiersSetControl = ({
|
|
|
129
125
|
)
|
|
130
126
|
}, [isEditMode])
|
|
131
127
|
|
|
132
|
-
const radioButtonDefaultModifier = currentOrderModifiersSets
|
|
133
|
-
.
|
|
134
|
-
|
|
135
|
-
)
|
|
136
|
-
?.modifierId.toString()
|
|
128
|
+
const radioButtonDefaultModifier = currentOrderModifiersSets.find((modifier) =>
|
|
129
|
+
modifierSet.modifiers.some((rl) => rl.id === modifier.modifierId)
|
|
130
|
+
)?.modifierId.toString();
|
|
137
131
|
|
|
138
132
|
return (
|
|
139
133
|
<>
|
|
@@ -173,9 +167,7 @@ export const ModifiersSetControl = ({
|
|
|
173
167
|
inline
|
|
174
168
|
id={modifier.id.toString()}
|
|
175
169
|
defaultChecked={!!selectedOrderModifierId}
|
|
176
|
-
defaultValue={
|
|
177
|
-
selectedOrderModifierId || modifier.id.toString()
|
|
178
|
-
}
|
|
170
|
+
defaultValue={selectedOrderModifierId || modifier.id.toString()}
|
|
179
171
|
checked={field.value === modifier.id.toString()}
|
|
180
172
|
onChange={onChange}
|
|
181
173
|
type='radio'
|
|
@@ -3,6 +3,7 @@ import { useIntl } from 'react-intl'
|
|
|
3
3
|
import * as Config from '@licklist/core/dist/Config'
|
|
4
4
|
import { OrderItem } from '@licklist/plugins/dist/types/context/Iframe/orderItems'
|
|
5
5
|
import { OrderModifierByProduct } from '@licklist/core/dist/DataMapper/Order/OrderModifiierByProduct'
|
|
6
|
+
import { calculateTotalModifiersPrice } from '../../utils'
|
|
6
7
|
import { ProductWithModifier } from '../../../CategoryProduct/components/ProductWithModifier/ProductWithModifier'
|
|
7
8
|
|
|
8
9
|
|