@licklist/design 0.66.6 → 0.66.7-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.
Files changed (80) hide show
  1. package/dist/events/edit-event-modal/component/SelectEventProductSet/SelectEventProductSet.d.ts.map +1 -1
  2. package/dist/events/edit-event-modal/component/SelectEventProductSet/SelectEventProductSet.js +1 -1
  3. package/dist/events/edit-event-modal/component/SelectEventProductSet/component/EditEventProductSet.d.ts.map +1 -1
  4. package/dist/events/edit-event-modal/component/SelectEventProductSet/component/EditEventProductSet.js +1 -1
  5. package/dist/events/edit-event-modal/utils/getDefaultProductSet.d.ts.map +1 -1
  6. package/dist/events/edit-event-modal/utils/getDefaultProductSet.js +1 -1
  7. package/dist/iframe/payment/order-items-table/utils/paymentSummary.d.ts.map +1 -1
  8. package/dist/notification/email-template/card/EmailTemplateCard.d.ts +2 -1
  9. package/dist/notification/email-template/card/EmailTemplateCard.d.ts.map +1 -1
  10. package/dist/notification/email-template/card/EmailTemplateCard.js +1 -1
  11. package/dist/notification/email-template/control/EmailTemplateControl.d.ts.map +1 -1
  12. package/dist/notification/email-template/control/EmailTemplateControl.js +1 -1
  13. package/dist/notification/sms-template/card/SmsTemplateCard.d.ts +2 -1
  14. package/dist/notification/sms-template/card/SmsTemplateCard.d.ts.map +1 -1
  15. package/dist/notification/sms-template/card/SmsTemplateCard.js +1 -1
  16. package/dist/product-set/control/DateAndRecurrenceInput.d.ts +1 -1
  17. package/dist/product-set/control/DateAndRecurrenceInput.d.ts.map +1 -1
  18. package/dist/product-set/control/DateAndRecurrenceInput.js +1 -1
  19. package/dist/product-set/control/ProductSetControl.d.ts +1 -1
  20. package/dist/product-set/control/ProductSetControl.d.ts.map +1 -1
  21. package/dist/product-set/control/ProductSetControl.js +1 -1
  22. package/dist/product-set/form/ProductCategoriesControl.d.ts.map +1 -1
  23. package/dist/product-set/form/ProductCategoriesControl.js +1 -1
  24. package/dist/product-set/form/ProductSetForm.d.ts +4 -1
  25. package/dist/product-set/form/ProductSetForm.d.ts.map +1 -1
  26. package/dist/product-set/form/ProductSetForm.js +1 -1
  27. package/dist/product-set/hooks/useSortableTreeFunctions.d.ts.map +1 -1
  28. package/dist/product-set/hooks/useSortableTreeFunctions.js +1 -1
  29. package/dist/product-set/product/ProductControl.d.ts.map +1 -1
  30. package/dist/provider/working-hours-input/WorkingHoursInputDescription.d.ts.map +1 -1
  31. package/dist/provider/working-hours-input/WorkingHoursInputDescription.js +1 -1
  32. package/dist/recurring-date-picker-input/RecurringDatePickerInput.d.ts +3 -1
  33. package/dist/recurring-date-picker-input/RecurringDatePickerInput.d.ts.map +1 -1
  34. package/dist/recurring-date-picker-input/RecurringDatePickerInput.js +1 -1
  35. package/dist/recurring-date-picker-input/utils.d.ts +5 -0
  36. package/dist/recurring-date-picker-input/utils.d.ts.map +1 -1
  37. package/dist/recurring-date-picker-input/utils.js +1 -1
  38. package/dist/sales/booking/results/components/ResultCard.d.ts.map +1 -1
  39. package/dist/setting/admin/AdminSettingForm.d.ts +2 -2
  40. package/dist/setting/admin/AdminSettingForm.d.ts.map +1 -1
  41. package/dist/styles/sales/BookingResults.scss +1 -1
  42. package/dist/styles/snippet-templates/SnippetTemplateCard.scss +3 -0
  43. package/dist/styles/zones/ZoneForm.scss +2 -1
  44. package/dist/zone/form/ZoneForm.d.ts +2 -2
  45. package/dist/zone/form/ZoneForm.d.ts.map +1 -1
  46. package/dist/zone/form/ZoneForm.js +1 -1
  47. package/dist/zone/form/components/ZoneControl.d.ts +2 -2
  48. package/dist/zone/form/components/ZoneControl.d.ts.map +1 -1
  49. package/dist/zone/form/components/ZoneControl.js +1 -1
  50. package/dist/zone/form/components/ZoneRecurrencesControl.d.ts +4 -4
  51. package/dist/zone/form/components/ZoneRecurrencesControl.d.ts.map +1 -1
  52. package/dist/zone/form/components/ZoneRecurrencesControl.js +1 -1
  53. package/dist/zone/form/utils/dates.d.ts.map +1 -1
  54. package/package.json +3 -5
  55. package/src/events/edit-event-modal/component/SelectEventProductSet/SelectEventProductSet.tsx +6 -8
  56. package/src/events/edit-event-modal/component/SelectEventProductSet/component/EditEventProductSet.tsx +1 -0
  57. package/src/events/edit-event-modal/utils/getDefaultProductSet.ts +0 -1
  58. package/src/iframe/payment/order-items-table/utils/paymentSummary.tsx +1 -0
  59. package/src/notification/email-template/card/EmailTemplateCard.tsx +43 -36
  60. package/src/notification/email-template/control/EmailTemplateControl.tsx +1 -0
  61. package/src/notification/sms-template/card/SmsTemplateCard.tsx +9 -0
  62. package/src/product-set/control/DateAndRecurrenceInput.tsx +3 -4
  63. package/src/product-set/control/ProductSetControl.tsx +8 -3
  64. package/src/product-set/form/ProductCategoriesControl.tsx +3 -2
  65. package/src/product-set/form/ProductSetForm.tsx +10 -2
  66. package/src/product-set/hooks/useSortableTreeFunctions.ts +0 -1
  67. package/src/product-set/product/ProductControl.tsx +1 -1
  68. package/src/provider/working-hours-input/WorkingHoursInputDescription.tsx +4 -18
  69. package/src/recurring-date-picker-input/RecurringDatePickerInput.stories.tsx +13 -7
  70. package/src/recurring-date-picker-input/RecurringDatePickerInput.tsx +12 -1
  71. package/src/recurring-date-picker-input/utils.ts +90 -1
  72. package/src/sales/booking/results/components/ResultCard.tsx +0 -3
  73. package/src/setting/admin/AdminSettingForm.tsx +2 -2
  74. package/src/styles/sales/BookingResults.scss +1 -1
  75. package/src/styles/snippet-templates/SnippetTemplateCard.scss +3 -0
  76. package/src/styles/zones/ZoneForm.scss +2 -1
  77. package/src/zone/form/ZoneForm.tsx +3 -2
  78. package/src/zone/form/components/ZoneControl.tsx +3 -3
  79. package/src/zone/form/components/ZoneRecurrencesControl.tsx +7 -5
  80. package/src/zone/form/utils/dates.ts +9 -10
@@ -1 +1 @@
1
- {"version":3,"file":"ResultCard.d.ts","sourceRoot":"","sources":["../../../../../src/sales/booking/results/components/ResultCard.tsx"],"names":[],"mappings":";AAKA,OAAO,EACL,KAAK,EAEN,MAAM,sDAAsD,CAAC;AAC9D,OAAO,EAAE,IAAI,EAAE,MAAM,oDAAoD,CAAC;AAQ1E,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,KAAK,CAAC;IACb,WAAW,CAAC,EAAE,IAAI,CAAC;IACnB,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC,CAAC;AAIF,eAAO,MAAM,UAAU,oDAKpB,eAAe,gBA2FjB,CAAC"}
1
+ {"version":3,"file":"ResultCard.d.ts","sourceRoot":"","sources":["../../../../../src/sales/booking/results/components/ResultCard.tsx"],"names":[],"mappings":";AAKA,OAAO,EACL,KAAK,EAEN,MAAM,sDAAsD,CAAC;AAC9D,OAAO,EAAE,IAAI,EAAE,MAAM,oDAAoD,CAAC;AAO1E,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,KAAK,CAAC;IACb,WAAW,CAAC,EAAE,IAAI,CAAC;IACnB,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC,CAAC;AAEF,eAAO,MAAM,UAAU,oDAKpB,eAAe,gBA2FjB,CAAC"}
@@ -1,6 +1,6 @@
1
1
  /// <reference types="react" />
2
2
  import { HasPermissionProp } from "@licklist/plugins/dist/types/permission/Permission";
3
- import { ProviderType } from "@licklist/core/dist/DataMapper/Provider/ProvidableDataMapper";
3
+ import { ProvidableType } from "@licklist/core/dist/DataMapper/Provider/ProvidableDataMapper";
4
4
  import { PaymentFeeFormFieldValues } from "./PaymentFeeForm";
5
5
  import { Currency } from "../../types/currency";
6
6
  export type AdminSettingFormFieldValues = {
@@ -19,7 +19,7 @@ export interface AdminSettingFormProps extends HasPermissionProp {
19
19
  providerMetadata: {
20
20
  country?: string;
21
21
  providableId?: number;
22
- providerType?: ProviderType;
22
+ providerType?: ProvidableType;
23
23
  };
24
24
  }
25
25
  export declare const AdminSettingForm: ({ isLoading, defaultValues, onSubmit, currencies, hasPermission, providerMetadata, }: AdminSettingFormProps) => JSX.Element;
@@ -1 +1 @@
1
- {"version":3,"file":"AdminSettingForm.d.ts","sourceRoot":"","sources":["../../../src/setting/admin/AdminSettingForm.tsx"],"names":[],"mappings":";AAMA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAC;AAOvF,OAAO,EAAE,YAAY,EAAE,MAAM,8DAA8D,CAAC;AAE5F,OAAO,EAAkB,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,MAAM,MAAM,2BAA2B,GAAG;IACxC,uBAAuB,EAAE,MAAM,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,IAAI,GAAG,OAAO,CAAC;IAC/B,oBAAoB,EAAE,IAAI,GAAG,OAAO,CAAC;IACrC,+BAA+B,EAAE,IAAI,GAAG,OAAO,CAAC;IAChD,0BAA0B,EAAE,IAAI,GAAG,OAAO,CAAC;CAC5C,GAAG,yBAAyB,CAAC;AAE9B,MAAM,WAAW,qBAAsB,SAAQ,iBAAiB;IAC9D,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,2BAA2B,KAAK,IAAI,CAAC;IACvD,aAAa,CAAC,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC;IACrD,UAAU,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC7B,gBAAgB,EAAE;QAChB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,YAAY,CAAC,EAAE,YAAY,CAAC;KAC7B,CAAC;CACH;AAED,eAAO,MAAM,gBAAgB,yFAO1B,qBAAqB,gBAwJvB,CAAC"}
1
+ {"version":3,"file":"AdminSettingForm.d.ts","sourceRoot":"","sources":["../../../src/setting/admin/AdminSettingForm.tsx"],"names":[],"mappings":";AAMA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAC;AAOvF,OAAO,EAAE,cAAc,EAAE,MAAM,8DAA8D,CAAC;AAE9F,OAAO,EAAkB,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,MAAM,MAAM,2BAA2B,GAAG;IACxC,uBAAuB,EAAE,MAAM,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,IAAI,GAAG,OAAO,CAAC;IAC/B,oBAAoB,EAAE,IAAI,GAAG,OAAO,CAAC;IACrC,+BAA+B,EAAE,IAAI,GAAG,OAAO,CAAC;IAChD,0BAA0B,EAAE,IAAI,GAAG,OAAO,CAAC;CAC5C,GAAG,yBAAyB,CAAC;AAE9B,MAAM,WAAW,qBAAsB,SAAQ,iBAAiB;IAC9D,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,2BAA2B,KAAK,IAAI,CAAC;IACvD,aAAa,CAAC,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC;IACrD,UAAU,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC7B,gBAAgB,EAAE;QAChB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,YAAY,CAAC,EAAE,cAAc,CAAC;KAC/B,CAAC;CACH;AAED,eAAO,MAAM,gBAAgB,yFAO1B,qBAAqB,gBAwJvB,CAAC"}
@@ -5,7 +5,7 @@
5
5
  flex-wrap: wrap;
6
6
 
7
7
  .result-card {
8
- height: 14.25rem;
8
+ height: 14rem;
9
9
  border: 1px solid $gray-400;
10
10
  max-width: calc(50% - 0.75rem);
11
11
  flex: 0 0 calc(50% - 0.75rem);
@@ -65,6 +65,9 @@ $snippet-template-card-button-transition: $product-set-card-transition !default;
65
65
  }
66
66
 
67
67
  .snippet-template-card-button {
68
+ display: flex;
69
+ justify-content: center;
70
+ align-items: center;
68
71
  padding: 0;
69
72
  border: none;
70
73
  background: transparent;
@@ -1,4 +1,5 @@
1
1
  .zone-available-times {
2
+ overscroll-behavior: contain;
2
3
  display: flex;
3
4
  flex-wrap: wrap;
4
5
  gap: 1.5rem;
@@ -7,4 +8,4 @@
7
8
  justify-content: start;
8
9
  width: 95%;
9
10
  overflow: scroll;
10
- }
11
+ }
@@ -7,10 +7,10 @@ export type ZoneFormProps = {
7
7
  onSubmit: (values: Partial<Zone>) => void;
8
8
  serverErrors?: ServerError;
9
9
  isLoading?: boolean;
10
- workHours?: WorkHour[];
10
+ workHours: WorkHour[] | undefined;
11
11
  };
12
12
  export type ZoneFormValues = Partial<Zone> & {
13
13
  localImageBlobURL?: string;
14
14
  };
15
- export declare const ZoneForm: ({ defaultValues, onSubmit, serverErrors, isLoading, }: ZoneFormProps) => JSX.Element;
15
+ export declare const ZoneForm: ({ defaultValues, onSubmit, serverErrors, isLoading, workHours, }: ZoneFormProps) => JSX.Element;
16
16
  //# sourceMappingURL=ZoneForm.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"ZoneForm.d.ts","sourceRoot":"","sources":["../../../src/zone/form/ZoneForm.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAE,IAAI,EAAE,MAAM,wDAAwD,CAAC;AAC9E,OAAO,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAE5E,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AAGtF,MAAM,MAAM,aAAa,GAAG;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,QAAQ,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC;IAC1C,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG;IAC3C,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,eAAO,MAAM,QAAQ,0DAKlB,aAAa,gBAiDf,CAAC"}
1
+ {"version":3,"file":"ZoneForm.d.ts","sourceRoot":"","sources":["../../../src/zone/form/ZoneForm.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAE,IAAI,EAAE,MAAM,wDAAwD,CAAC;AAC9E,OAAO,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAE5E,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AAGtF,MAAM,MAAM,aAAa,GAAG;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,QAAQ,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC;IAC1C,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG;IAC3C,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,eAAO,MAAM,QAAQ,qEAMlB,aAAa,gBAiDf,CAAC"}
@@ -1 +1 @@
1
- "use strict";function e(e){return e&&"object"==typeof e&&"default"in e?e.default:e}Object.defineProperty(exports,"__esModule",{value:!0});var r=require("tslib"),t=require("react"),o=e(t),n=require("react-i18next"),s=require("react-bootstrap"),a=require("react-hook-form"),l=e(require("@licklist/plugins/dist/services/Form/FormErrorService")),i=require("./components/ZoneControl.js");exports.ZoneForm=function(e){var u=e.defaultValues,c=e.onSubmit,m=e.serverErrors,d=e.isLoading,f=void 0!==d&&d,b=n.useTranslation("Design").t,p=a.useForm({mode:"onChange",defaultValues:{zoneRecurrences:[]}}),v=p.reset,E=p.setError,g=p.handleSubmit,q=(0,p.watch)();return t.useEffect((function(){u&&v(u)}),[u,v]),t.useEffect((function(){m&&l.handleServerErrors(m,E)}),[m,E]),o.createElement(a.FormProvider,r.__assign({},p),o.createElement(s.Form,{onSubmit:g((function(e){e.localImageBlobURL;var t=r.__rest(e,["localImageBlobURL"]);c(t)}))},o.createElement(i.ZoneControl,{isLoading:f}),o.createElement(s.Row,null,o.createElement(s.Col,{md:6,sm:12}),o.createElement(s.Col,{className:"product-set-save-btn-wrapper p-0 pl-4 d-flex mw-100",md:6,sm:12},o.createElement(s.Button,{className:"product-set-save-btn mt-5 ml-5 d-no dne d-md-block",type:"submit",disabled:f||!q.name},b("saveAndClose"))))))};
1
+ "use strict";function e(e){return e&&"object"==typeof e&&"default"in e?e.default:e}Object.defineProperty(exports,"__esModule",{value:!0});var r=require("tslib"),t=require("react"),o=e(t),n=require("react-i18next"),s=require("react-bootstrap"),a=require("react-hook-form"),l=e(require("@licklist/plugins/dist/services/Form/FormErrorService")),u=require("./components/ZoneControl.js");exports.ZoneForm=function(e){var i=e.defaultValues,c=e.onSubmit,m=e.serverErrors,d=e.isLoading,f=void 0!==d&&d,b=e.workHours,p=n.useTranslation("Design").t,v=a.useForm({mode:"onChange",defaultValues:{zoneRecurrences:[]}}),E=v.reset,g=v.setError,q=v.handleSubmit,w=(0,v.watch)();return t.useEffect((function(){i&&E(i)}),[i,E]),t.useEffect((function(){m&&l.handleServerErrors(m,g)}),[m,g]),o.createElement(a.FormProvider,r.__assign({},v),o.createElement(s.Form,{onSubmit:q((function(e){e.localImageBlobURL;var t=r.__rest(e,["localImageBlobURL"]);c(t)}))},o.createElement(u.ZoneControl,{isLoading:f,workHours:b}),o.createElement(s.Row,null,o.createElement(s.Col,{md:6,sm:12}),o.createElement(s.Col,{className:"product-set-save-btn-wrapper p-0 pl-4 d-flex mw-100",md:6,sm:12},o.createElement(s.Button,{className:"product-set-save-btn mt-5 ml-5 d-no dne d-md-block",type:"submit",disabled:f||!w.name},p("saveAndClose"))))))};
@@ -2,7 +2,7 @@
2
2
  import { WorkHour } from "@licklist/core/dist/DataMapper/Provider/WorkHourDataMapper";
3
3
  export type ZoneControlProps = {
4
4
  isLoading: boolean;
5
- workHours?: WorkHour[];
5
+ workHours: WorkHour[] | undefined;
6
6
  };
7
- export declare const ZoneControl: ({ isLoading }: ZoneControlProps) => JSX.Element;
7
+ export declare const ZoneControl: ({ isLoading, workHours }: ZoneControlProps) => JSX.Element;
8
8
  //# sourceMappingURL=ZoneControl.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"ZoneControl.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/components/ZoneControl.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AAStF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,WAAW,kBAAmB,gBAAgB,gBA0B1D,CAAC"}
1
+ {"version":3,"file":"ZoneControl.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/components/ZoneControl.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AAStF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;CACnC,CAAC;AAEF,eAAO,MAAM,WAAW,6BAA8B,gBAAgB,gBA0BrE,CAAC"}
@@ -1 +1 @@
1
- "use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e,r=require("react"),t=(e=r)&&"object"==typeof e&&"default"in e?e.default:e,o=require("react-bootstrap"),n=require("./NameControl.js"),l=require("./ZoneTypeControl.js"),a=require("./SortControl.js"),i=require("./ZoneRecurrencesControl.js"),m=require("./DescriptionControl.js"),s=require("./ZoneImageControl.js"),c=require("./GameDurationControl.js");exports.ZoneControl=function(e){var r=e.isLoading;return t.createElement(o.Row,null,t.createElement(o.Col,{md:6,sm:12,className:"pr-5"},t.createElement(n.NameControl,{isLoading:r}),t.createElement(i.ZoneRecurrencesControl,null),t.createElement("hr",null),t.createElement(o.Row,null,t.createElement(o.Col,{md:6,sm:6},t.createElement(l.ZoneTypeControl,{isLoading:r}),t.createElement(a.SortControl,{isLoading:r}),t.createElement(c.GameDurationControl,{isLoading:r})),t.createElement(o.Col,{md:6,sm:6},t.createElement(s.ZoneImageControl,{isLoading:r}))),t.createElement("hr",null),t.createElement(o.Row,null,t.createElement(o.Col,{md:12,sm:12},t.createElement(m.DescriptionControl,{isLoading:r})))))};
1
+ "use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e,r=require("react"),o=(e=r)&&"object"==typeof e&&"default"in e?e.default:e,t=require("react-bootstrap"),n=require("./NameControl.js"),l=require("./ZoneTypeControl.js"),a=require("./SortControl.js"),i=require("./ZoneRecurrencesControl.js"),s=require("./DescriptionControl.js"),m=require("./ZoneImageControl.js"),c=require("./GameDurationControl.js");exports.ZoneControl=function(e){var r=e.isLoading,u=e.workHours;return o.createElement(t.Row,null,o.createElement(t.Col,{md:6,sm:12,className:"pr-5"},o.createElement(n.NameControl,{isLoading:r}),o.createElement(i.ZoneRecurrencesControl,{workHours:u}),o.createElement("hr",null),o.createElement(t.Row,null,o.createElement(t.Col,{md:6,sm:6},o.createElement(l.ZoneTypeControl,{isLoading:r}),o.createElement(a.SortControl,{isLoading:r}),o.createElement(c.GameDurationControl,{isLoading:r})),o.createElement(t.Col,{md:6,sm:6},o.createElement(m.ZoneImageControl,{isLoading:r}))),o.createElement("hr",null),o.createElement(t.Row,null,o.createElement(t.Col,{md:12,sm:12},o.createElement(s.DescriptionControl,{isLoading:r})))))};
@@ -4,9 +4,9 @@ import { WorkHour } from "@licklist/core/dist/DataMapper/Provider/WorkHourDataMa
4
4
  export interface DateAndRecurrenceInputValues {
5
5
  zoneRecurrences?: Partial<ZoneRecurrence>[];
6
6
  }
7
- export type ZoneRecurrenceControlProps = {
8
- workHours?: WorkHour[];
9
- isLoading?: boolean;
7
+ type ZoneRecurrenceControlProps = {
8
+ workHours: WorkHour[] | undefined;
10
9
  };
11
- export declare const ZoneRecurrencesControl: () => JSX.Element;
10
+ export declare const ZoneRecurrencesControl: ({ workHours, }: ZoneRecurrenceControlProps) => JSX.Element;
11
+ export {};
12
12
  //# sourceMappingURL=ZoneRecurrencesControl.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"ZoneRecurrencesControl.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/components/ZoneRecurrencesControl.tsx"],"names":[],"mappings":";AAMA,OAAO,EAAE,cAAc,EAAE,MAAM,kEAAkE,CAAC;AAMlG,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AAWtF,MAAM,WAAW,4BAA4B;IAC3C,eAAe,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;CAC7C;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,sBAAsB,mBAsMlC,CAAC"}
1
+ {"version":3,"file":"ZoneRecurrencesControl.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/components/ZoneRecurrencesControl.tsx"],"names":[],"mappings":";AAMA,OAAO,EAAE,cAAc,EAAE,MAAM,kEAAkE,CAAC;AAMlG,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AAWtF,MAAM,WAAW,4BAA4B;IAC3C,eAAe,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;CAC7C;AAED,KAAK,0BAA0B,GAAG;IAChC,SAAS,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;CACnC,CAAC;AAEF,eAAO,MAAM,sBAAsB,mBAEhC,0BAA0B,gBAuM5B,CAAC"}
@@ -1 +1 @@
1
- "use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e,r=require("tslib"),t=require("react"),n=(e=t)&&"object"==typeof e&&"default"in e?e.default:e,i=require("react-i18next"),o=require("react-bootstrap"),a=require("../../../static/Icon.js"),u=require("react-hook-form"),l=require("@react-aria/utils"),c=require("react-use");require("../../../static/index.js");var d=require("@dnd-kit/core"),s=require("@dnd-kit/sortable"),m=require("../../../modals/confirmation/ConfirmModal.js"),v=require("../../../recurring-date-picker-input/RecurringDatePickerInput.js"),f=require("../../../product-set/control/DateAndRecurrenceInput.js"),p=require("./ZoneRecurrenceControl.js");exports.ZoneRecurrencesControl=function(){var e,g,_=u.useFormContext(),E=_.control,q=_.register,x=_.formState.errors,C=_.getValues,D=_.setValue,R=_.clearErrors,b=u.useFieldArray({name:"zoneRecurrences",control:E,keyName:"_id"}),y=b.fields,I=b.append,S=b.update,k=b.move,z=r.__read(t.useState(!1),2),N=z[0],h=z[1],j=r.__read(t.useState({index:null,values:null}),2),T=j[0],A=j[1],w=function(){return A({index:null,values:null})},F=t.useRef();c.useClickAway(F,(function(e){var r,t,n;m.CONFIRM_MODAL_ACTIONS.includes(null===(n=null===(t=null===(r=e.target)||void 0===r?void 0:r.attributes)||void 0===t?void 0:t.getNamedItem("data-id"))||void 0===n?void 0:n.value)||(h(!1),w())}));var M=l.useId(),P=i.useTranslation(["Design","Validation"]).t,O=function(){w(),h((function(e){return!e}))};return t.useEffect((function(){y.length&&R("zoneRecurrences")}),[y,R]),n.createElement(o.Form.Group,null,n.createElement(o.Form.Label,null,P("zoneAvailable")),n.createElement(o.OverlayTrigger,{show:N,overlay:n.createElement(o.Popover,{id:M,className:"rounded"},n.createElement(o.Popover.Content,{className:"shadow-lg rounded",ref:F},n.createElement(v.RecurringDatePickerInput,{defaultValues:T.values,onChange:function(e){return r.__awaiter(void 0,void 0,void 0,(function(){var t,n,i;return r.__generator(this,(function(r){return t={rrule:e.rrule,startDate:e.startDate,endDate:e.endDate,startTime:e.startTime,endTime:e.endTime},(null===(n=T.values)||void 0===n?void 0:n.id)&&(t.id=null===(i=T.values)||void 0===i?void 0:i.id),null!==T.index?S(T.index,t):I(t),h((function(){return!1})),w(),[2]}))}))},onDelete:function(){var e=T.index;h(!1),w(),setTimeout((function(){var r=C().zoneRecurrences;D("zoneRecurrences",(void 0===r?[]:r).filter((function(r,t){return t!==e})))}),100)},setInitialStartDateAfterSelect:!0}))),trigger:"click",placement:"bottom",popperConfig:{modifiers:[f.sameWidthPopperModifier]}},n.createElement("div",{className:"zone-recurrences"},n.createElement(d.DndContext,{onDragEnd:function(e){var r=e.over,t=e.active;if(r.id!==t.id){var n=y.findIndex((function(e){return String(e._id)===t.id})),i=y.findIndex((function(e){return String(e._id)===r.id}));k(n,i)}}},n.createElement(s.SortableContext,{items:null!==(e=null==y?void 0:y.map((function(e){return String(e._id)})))&&void 0!==e?e:[],strategy:s.verticalListSortingStrategy},null==y?void 0:y.map((function(e,r){return n.createElement(p.ZoneRecurrenceControl,{key:e._id,zoneRecurrence:e,onEdit:function(){return function(e,r){w(),A({index:r,values:e}),h((function(){return!0}))}(e,r)}})})))),n.createElement("div",{className:"zone-recurrence-icon-wrapper",role:"button",tabIndex:0,onClick:O,onKeyDown:O},n.createElement(a.default,{type:"plus-circle",height:"1rem",className:"zone-recurrence-icon-add mr-2"}),P("addDates")),n.createElement(o.Form.Control,r.__assign({type:"hidden"},q("zoneRecurrences",{required:{value:!0,message:P("Validation:fieldMinNumber",{attribute:P("dates"),min:1})}}))),n.createElement("div",{className:"manual-form-error"},null===(g=x.zoneRecurrences)||void 0===g?void 0:g.message))))};
1
+ "use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e,r=require("tslib"),t=require("react"),n=(e=t)&&"object"==typeof e&&"default"in e?e.default:e,i=require("react-i18next"),o=require("react-bootstrap"),a=require("../../../static/Icon.js"),u=require("react-hook-form"),l=require("@react-aria/utils"),c=require("react-use");require("../../../static/index.js");var d=require("@dnd-kit/core"),s=require("@dnd-kit/sortable"),m=require("../../../modals/confirmation/ConfirmModal.js"),v=require("../../../recurring-date-picker-input/RecurringDatePickerInput.js"),f=require("../../../product-set/control/DateAndRecurrenceInput.js"),p=require("./ZoneRecurrenceControl.js");exports.ZoneRecurrencesControl=function(e){var g,_,E=e.workHours,q=u.useFormContext(),x=q.control,C=q.register,D=q.formState.errors,R=q.getValues,b=q.setValue,k=q.clearErrors,y=u.useFieldArray({name:"zoneRecurrences",control:x,keyName:"_id"}),I=y.fields,S=y.append,z=y.update,N=y.move,h=r.__read(t.useState(!1),2),j=h[0],w=h[1],T=r.__read(t.useState({index:null,values:null}),2),A=T[0],F=T[1],M=function(){return F({index:null,values:null})},P=t.useRef();c.useClickAway(P,(function(e){var r,t,n;m.CONFIRM_MODAL_ACTIONS.includes(null===(n=null===(t=null===(r=e.target)||void 0===r?void 0:r.attributes)||void 0===t?void 0:t.getNamedItem("data-id"))||void 0===n?void 0:n.value)||(w(!1),M())}));var O=l.useId(),V=i.useTranslation(["Design","Validation"]).t,L=function(){M(),w((function(e){return!e}))};return t.useEffect((function(){I.length&&k("zoneRecurrences")}),[I,k]),n.createElement(o.Form.Group,null,n.createElement(o.Form.Label,null,V("zoneAvailable")),n.createElement(o.OverlayTrigger,{show:j,overlay:n.createElement(o.Popover,{id:O,className:"rounded"},n.createElement(o.Popover.Content,{className:"shadow-lg rounded",ref:P},n.createElement(v.RecurringDatePickerInput,{defaultValues:A.values,onChange:function(e){return r.__awaiter(void 0,void 0,void 0,(function(){var t,n,i;return r.__generator(this,(function(r){return t={rrule:e.rrule,startDate:e.startDate,endDate:e.endDate,startTime:e.startTime,endTime:e.endTime},(null===(n=A.values)||void 0===n?void 0:n.id)&&(t.id=null===(i=A.values)||void 0===i?void 0:i.id),null!==A.index?z(A.index,t):S(t),w((function(){return!1})),M(),[2]}))}))},onDelete:function(){var e=A.index;w(!1),M(),setTimeout((function(){var r=R().zoneRecurrences;b("zoneRecurrences",(void 0===r?[]:r).filter((function(r,t){return t!==e})))}),100)},setInitialStartDateAfterSelect:!0,workHours:E}))),trigger:"click",placement:"bottom",popperConfig:{modifiers:[f.sameWidthPopperModifier]}},n.createElement("div",{className:"zone-recurrences"},n.createElement(d.DndContext,{onDragEnd:function(e){var r=e.over,t=e.active;if(r.id!==t.id){var n=I.findIndex((function(e){return String(e._id)===t.id})),i=I.findIndex((function(e){return String(e._id)===r.id}));N(n,i)}}},n.createElement(s.SortableContext,{items:null!==(g=null==I?void 0:I.map((function(e){return String(e._id)})))&&void 0!==g?g:[],strategy:s.verticalListSortingStrategy},null==I?void 0:I.map((function(e,r){return n.createElement(p.ZoneRecurrenceControl,{key:e._id,zoneRecurrence:e,onEdit:function(){return function(e,r){M(),F({index:r,values:e}),w((function(){return!0}))}(e,r)}})})))),n.createElement("div",{className:"zone-recurrence-icon-wrapper",role:"button",tabIndex:0,onClick:L,onKeyDown:L},n.createElement(a.default,{type:"plus-circle",height:"1rem",className:"zone-recurrence-icon-add mr-2"}),V("addDates")),n.createElement(o.Form.Control,r.__assign({type:"hidden"},C("zoneRecurrences",{required:{value:!0,message:V("Validation:fieldMinNumber",{attribute:V("dates"),min:1})}}))),n.createElement("div",{className:"manual-form-error"},null===(_=D.zoneRecurrences)||void 0===_?void 0:_.message))))};
@@ -1 +1 @@
1
- {"version":3,"file":"dates.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/utils/dates.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AAOtF,eAAO,MAAM,qBAAqB,cACrB,MAAM,WACR,MAAM,6BAuChB,CAAC;AAEF,eAAO,MAAM,wBAAwB,eAAgB,QAAQ,EAAE,aA0C9D,CAAC"}
1
+ {"version":3,"file":"dates.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/utils/dates.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AAOtF,eAAO,MAAM,qBAAqB,cACrB,MAAM,WACR,MAAM,6BAuChB,CAAC;AAEF,eAAO,MAAM,wBAAwB,eAAgB,QAAQ,EAAE,aAyC9D,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@licklist/design",
3
- "version": "0.66.6",
3
+ "version": "0.66.7-dev.1",
4
4
  "repository": {
5
5
  "type": "git",
6
6
  "url": "git+ssh://git@bitbucket.org/artelogicsoft/licklist_design.git"
@@ -50,9 +50,9 @@
50
50
  "@fortawesome/free-brands-svg-icons": "5.15.2",
51
51
  "@fortawesome/free-solid-svg-icons": "5.15.2",
52
52
  "@fortawesome/react-fontawesome": "0.1.9",
53
- "@licklist/core": "0.28.2",
53
+ "@licklist/core": ">=0.28.0-dev.0 < 0.28.0",
54
54
  "@licklist/eslint-config": "0.4.5",
55
- "@licklist/plugins": "0.30.3",
55
+ "@licklist/plugins": ">=0.30.0-dev.1 < 0.30.0",
56
56
  "@mdx-js/react": "1.6.22",
57
57
  "@popperjs/core": "2.11.8",
58
58
  "@react-aria/utils": "3.9.0",
@@ -116,7 +116,6 @@
116
116
  "emojibase": "6.1.0",
117
117
  "emojibase-data": "7.0.1",
118
118
  "emojibase-regex": "6.0.1",
119
- "enzyme": "3.11.0",
120
119
  "eslint": "7.32.0",
121
120
  "eslint-config-airbnb": "18.2.1",
122
121
  "eslint-config-prettier": "8.3.0",
@@ -189,7 +188,6 @@
189
188
  "devDependencies": {
190
189
  "@types/react": "17.0.2",
191
190
  "@types/react-dom": "17.0.2",
192
- "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
193
191
  "identity-obj-proxy": "^3.0.0"
194
192
  },
195
193
  "volta": {
@@ -206,14 +206,12 @@ export const SelectEventProductSet = ({
206
206
  </Form.Group>
207
207
  </div>
208
208
  {showEditProductSet && productSetId && (
209
- <>
210
- <EditEventProductSet
211
- onSubmit={onSubmit}
212
- defaultValues={
213
- productSetId === editedProductSet?.id && editedProductSet
214
- }
215
- />
216
- </>
209
+ <EditEventProductSet
210
+ onSubmit={onSubmit}
211
+ defaultValues={
212
+ productSetId === editedProductSet?.id && editedProductSet
213
+ }
214
+ />
217
215
  )}
218
216
  </>
219
217
  );
@@ -125,6 +125,7 @@ export const EditEventProductSet = ({
125
125
  fee={feeInPercent}
126
126
  isEventEditProductSet
127
127
  isOverrides
128
+ workHours={undefined}
128
129
  />
129
130
  <Button
130
131
  disabled={isLoading}
@@ -37,7 +37,6 @@ export const getDefaultValues = (
37
37
  ...product,
38
38
  subProducts: subProducts?.map(({ zoneId, ...subProducts }) => ({
39
39
  ...subProducts,
40
- originalProductId: null,
41
40
  productCategoryId: undefined,
42
41
  zoneId,
43
42
  })),
@@ -63,6 +63,7 @@ const processedPaymentSummary = ({
63
63
  const total = calculateTotalPrice(order, externalPaymentDetail);
64
64
 
65
65
  const totalDiscount = calculateTotalDiscount(order.payments);
66
+
66
67
  let summaryItems: SummaryItem[] = [
67
68
  {
68
69
  translateKey: AMOUNT_TOTAL,
@@ -14,6 +14,7 @@ export interface EmailTemplateCardProps extends HasPermissionProp {
14
14
  isDefault: boolean;
15
15
  isActive: boolean;
16
16
  onRemove: () => void;
17
+ onDuplicate: () => void;
17
18
  type: NotificationType;
18
19
  }
19
20
 
@@ -22,6 +23,7 @@ export function EmailTemplateCard({
22
23
  href,
23
24
  subject,
24
25
  onRemove,
26
+ onDuplicate,
25
27
  isDefault = false,
26
28
  isActive = false,
27
29
  hasPermission = true,
@@ -32,43 +34,48 @@ export function EmailTemplateCard({
32
34
  const texts = useTranslatedParameters({ isDefault, isActive });
33
35
 
34
36
  return (
35
- <>
36
- <div className="snippet-template-card">
37
- <div className="snippet-template-card-header">
38
- <Link to={href}>{name}</Link>
39
- {hasPermission && Boolean(onRemove) && (
40
- <ConfirmModal
41
- type={ConfirmModalType.remove}
42
- content={t("areUSureYouWantToDelete", {
43
- name,
44
- type: t("emailTemplate").toLowerCase(),
45
- })}
46
- >
47
- {(confirm) => (
48
- <button
49
- type="button"
50
- className="snippet-template-card-button"
51
- onClick={(e) => {
52
- e.stopPropagation();
53
- confirm(onRemove);
54
- }}
55
- >
56
- <Icon type="trash-alt" />
57
- </button>
58
- )}
59
- </ConfirmModal>
60
- )}
61
- </div>
62
- <div className={`mt-${isDefault ? "3" : "4"}`}>
63
- {!!texts.length && <p className="mb-1">{texts}</p>}
64
- <div className="d-flex flex-column">
65
- <span className="snippet-template-card-subject">{subject}</span>
66
- <p className="mb-0">
67
- {t(`Design:type`)}:&nbsp;{t(`Design:${type}`)}
68
- </p>
69
- </div>
37
+ <div className="snippet-template-card">
38
+ <div className="snippet-template-card-header">
39
+ <Link to={href}>{name}</Link>
40
+ {hasPermission && Boolean(onRemove) && (
41
+ <ConfirmModal
42
+ type={ConfirmModalType.remove}
43
+ content={t("areUSureYouWantToDelete", {
44
+ name,
45
+ type: t("emailTemplate").toLowerCase(),
46
+ })}
47
+ >
48
+ {(confirm) => (
49
+ <button
50
+ type="button"
51
+ className="snippet-template-card-button"
52
+ onClick={(e) => {
53
+ e.stopPropagation();
54
+ confirm(onRemove);
55
+ }}
56
+ >
57
+ <Icon type="trash-alt" />
58
+ </button>
59
+ )}
60
+ </ConfirmModal>
61
+ )}
62
+ <button
63
+ type="button"
64
+ className="snippet-template-card-button"
65
+ onClick={onDuplicate}
66
+ >
67
+ <Icon type="copy" />
68
+ </button>
69
+ </div>
70
+ <div className={`mt-${isDefault ? "3" : "4"}`}>
71
+ {!!texts.length && <p className="mb-1">{texts}</p>}
72
+ <div className="d-flex flex-column">
73
+ <span className="snippet-template-card-subject">{subject}</span>
74
+ <p className="mb-0">
75
+ {t(`Design:type`)}:&nbsp;{t(`Design:${type}`)}
76
+ </p>
70
77
  </div>
71
78
  </div>
72
- </>
79
+ </div>
73
80
  );
74
81
  }
@@ -74,6 +74,7 @@ export const EmailTemplateControl = React.forwardRef(
74
74
  const id = watch("id");
75
75
 
76
76
  useEffect(() => {
77
+ if (!ref.current) return;
77
78
  if (id || !getDefaultTemplateMetaByType || !type) return;
78
79
 
79
80
  const formValues = getValues();
@@ -11,6 +11,7 @@ export interface SmsTemplateCardProps extends HasPermissionProp {
11
11
  name: string;
12
12
  href: string;
13
13
  onRemove: () => void;
14
+ onDuplicate: () => void;
14
15
  isDefault: boolean;
15
16
  isActive: boolean;
16
17
  type: NotificationType;
@@ -20,6 +21,7 @@ export function SmsTemplateCard({
20
21
  name,
21
22
  href,
22
23
  onRemove,
24
+ onDuplicate,
23
25
  hasPermission = true,
24
26
  isDefault = false,
25
27
  isActive = false,
@@ -55,6 +57,13 @@ export function SmsTemplateCard({
55
57
  )}
56
58
  </ConfirmModal>
57
59
  )}
60
+ <button
61
+ type="button"
62
+ className="snippet-template-card-button"
63
+ onClick={onDuplicate}
64
+ >
65
+ <Icon type="copy" />
66
+ </button>
58
67
  </div>
59
68
  <div className="mt-2">
60
69
  {!!texts.length && <p className="mb-1">{texts}</p>}
@@ -28,15 +28,13 @@ import {
28
28
  AvailableTimesControlRef,
29
29
  } from "../../zone/form/components/AvailableTimesControl";
30
30
 
31
- // eslint-disable-next-line max-len
32
-
33
31
  export interface DateAndRecurrenceInputValues {
34
32
  menuRecurrences?: Partial<ProductSetRecurrence>[];
35
33
  }
36
34
 
37
35
  interface DateAndRecurrenceInputProps {
38
36
  isEventEditProductSet?: boolean;
39
- workHours?: WorkHour[];
37
+ workHours: WorkHour[] | undefined;
40
38
  providerHasBookingManagement: boolean;
41
39
  isLoading?: boolean;
42
40
  }
@@ -90,7 +88,7 @@ export const DateAndRecurrenceInput = ({
90
88
  clearEditState();
91
89
  });
92
90
 
93
- const popoverId = useId()!;
91
+ const popoverId = useId();
94
92
 
95
93
  const { t } = useTranslation("Design");
96
94
 
@@ -228,6 +226,7 @@ export const DateAndRecurrenceInput = ({
228
226
  defaultValues={editState.values}
229
227
  onChange={handleRecurringDateChange}
230
228
  onDelete={handleDelete}
229
+ workHours={workHours}
231
230
  >
232
231
  {providerHasBookingManagement && (
233
232
  <AvailableTimesControl
@@ -85,7 +85,7 @@ export interface ProductSetControlProps {
85
85
  fieldSets?: FieldSet[];
86
86
  showEmailTemplate?: boolean;
87
87
  showSmsTemplate?: boolean;
88
- workHours?: WorkHour[];
88
+ workHours: WorkHour[] | undefined;
89
89
  providerHasBookingManagement?: boolean;
90
90
  isOverrides?: boolean;
91
91
  isCreateNewOverrides?: boolean;
@@ -126,6 +126,11 @@ export function ProductSetControl({
126
126
  const showSmsTemplateSelector = showSmsTemplate && !isOverrides;
127
127
  const showEmailTemplateSelector = showEmailTemplate && !isOverrides;
128
128
  const showDateSelector = !isEventEditProductSet && isOverrides;
129
+
130
+ const isZoneAdded = steps?.some(({ productCategories }) =>
131
+ productCategories?.some(({ zoneId }) => zoneId)
132
+ );
133
+
129
134
  return (
130
135
  <Row
131
136
  className={`product-set-form ${
@@ -169,7 +174,7 @@ export function ProductSetControl({
169
174
 
170
175
  {showDateSelector ? (
171
176
  <DateInput
172
- workHours={workHours}
177
+ workHours={isZoneAdded ? workHours : undefined}
173
178
  isLoading={isLoading}
174
179
  providerHasBookingManagement={providerHasBookingManagement}
175
180
  />
@@ -178,7 +183,7 @@ export function ProductSetControl({
178
183
  {isCreateAction && (
179
184
  <DateAndRecurrenceInput
180
185
  isEventEditProductSet={isEventEditProductSet}
181
- workHours={workHours}
186
+ workHours={isZoneAdded ? workHours : undefined}
182
187
  isLoading={isLoading}
183
188
  providerHasBookingManagement={providerHasBookingManagement}
184
189
  />
@@ -218,8 +218,9 @@ export function ProductCategoriesControl({
218
218
  ? String(productCategory.id)
219
219
  : productCategory.uniqueId;
220
220
 
221
- const isOverridesCategory = productCategory.products.some((product) =>
222
- isEventEditProductSet ? !!product.id : !!product.originalProductId
221
+ const isOverridesCategory = productCategory.products?.some(
222
+ (product) =>
223
+ isEventEditProductSet ? !!product.id : !!product.originalProductId
223
224
  );
224
225
  const isNewOverridesCategory =
225
226
  isCreateNewOverrides && !!productCategory.id;
@@ -26,12 +26,16 @@ import { checkAvailableTimesErrors, getFilteredTemplates } from "../utils";
26
26
  export interface WithIsLoading {
27
27
  isLoading: boolean;
28
28
  }
29
+ export interface WithIdOptional {
30
+ id?: number;
31
+ }
32
+
29
33
  export interface WithId {
30
34
  id: number;
31
35
  }
32
36
  export interface ProductSetFormValues
33
37
  extends FormValues,
34
- WithId,
38
+ WithIdOptional,
35
39
  ProductSetControlValues {
36
40
  steps: Step[];
37
41
  isOverrides?: boolean;
@@ -117,7 +121,11 @@ export function ProductSetForm({
117
121
  }, [serverErrors, setError]);
118
122
 
119
123
  useEffect(() => {
120
- window.history.pushState(null, "", window.location.pathname);
124
+ window.history.pushState(
125
+ null,
126
+ "",
127
+ window.location.pathname + window.location.search
128
+ );
121
129
  window.addEventListener("beforeunload", onBeforeUnload);
122
130
  window.addEventListener("popstate", onPopState);
123
131
 
@@ -22,7 +22,6 @@ export const useSortableTreeFunctions = ({
22
22
  };
23
23
 
24
24
  const cancelChanges = (index: number) => {
25
- if (isOverrides) return;
26
25
  if (!previousValue) {
27
26
  // eslint-disable-next-line consistent-return
28
27
  return remove(index);
@@ -12,12 +12,12 @@ import {
12
12
  PRODUCT_DEfAULT_COLORS,
13
13
  } from "@licklist/core/dist/DataMapper/Product/ProductDataMapper";
14
14
  import HookFormService from "@licklist/plugins/dist/services/Form/HookFormService";
15
+ import clsx from "clsx";
15
16
  import {
16
17
  FieldNamePrefixPath,
17
18
  FormValues,
18
19
  } from "@licklist/plugins/dist/types/services/Form/hook-form-service";
19
20
  import { useId } from "@react-aria/utils";
20
- import clsx from "clsx";
21
21
  import React, {
22
22
  ChangeEvent,
23
23
  useCallback,
@@ -1,9 +1,7 @@
1
- import { DateTime } from "luxon";
2
1
  import React from "react";
3
2
  import { Col, Row } from "react-bootstrap";
4
3
  import { useFormContext } from "react-hook-form";
5
4
  import { useTranslation } from "react-i18next";
6
- import { TIME_FORMAT } from "@licklist/core/dist/Config";
7
5
  import { WorkingHoursInputValues } from ".";
8
6
  import { useWeekdays } from "./utils";
9
7
 
@@ -25,22 +23,10 @@ export function WorkingHoursInputDescription() {
25
23
  <Row key={i}>
26
24
  <Col xs="auto">{weekdays[i]}:</Col>
27
25
  <Col>
28
- {weekday?.end
29
- ? weekday.start
30
- ? t("timeInterval", {
31
- start: DateTime.fromISO(weekday.start).toFormat(
32
- TIME_FORMAT
33
- ),
34
- end: DateTime.fromISO(weekday.start).toFormat(
35
- TIME_FORMAT
36
- ),
37
- })
38
- : t("timeFrom", {
39
- start: DateTime.fromISO(weekday.start).toFormat(
40
- TIME_FORMAT
41
- ),
42
- })
43
- : null}
26
+ {t("timeInterval", {
27
+ start: weekday.start,
28
+ end: weekday.end,
29
+ })}
44
30
  </Col>
45
31
  </Row>
46
32
  );
@@ -1,22 +1,19 @@
1
1
  import React from "react";
2
2
  import { Meta, Story } from "@storybook/react";
3
3
  import { Card } from "react-bootstrap";
4
+ import { DateTime } from "luxon";
5
+ import { DATE_FORMAT, TIME_FORMAT } from "@licklist/core/dist/Config/Date";
4
6
  import {
5
7
  RecurringDatePickerInput,
6
8
  RecurringDatePickerInputProps,
7
9
  } from "./RecurringDatePickerInput";
8
- import { DateTime } from "luxon";
9
- import { DATE_FORMAT, TIME_FORMAT } from "@licklist/core/dist/Config/Date";
10
10
 
11
11
  export default {
12
12
  title: "RecurringDatePickerInput",
13
13
  component: RecurringDatePickerInput,
14
14
  } as Meta;
15
15
 
16
- interface DefaultRecurringDatePickerInputProps
17
- extends RecurringDatePickerInputProps {}
18
-
19
- export const Default: Story<DefaultRecurringDatePickerInputProps> = (args) => {
16
+ export const Default: Story<RecurringDatePickerInputProps> = (args) => {
20
17
  return (
21
18
  <Card style={{ maxWidth: "max-content" }}>
22
19
  <Card.Body>
@@ -25,7 +22,7 @@ export const Default: Story<DefaultRecurringDatePickerInputProps> = (args) => {
25
22
  </Card>
26
23
  );
27
24
  };
28
- export const Valid: Story<DefaultRecurringDatePickerInputProps> = (args) => {
25
+ export const Valid: Story<RecurringDatePickerInputProps> = (args) => {
29
26
  return (
30
27
  <Card style={{ maxWidth: "max-content" }}>
31
28
  <Card.Body>
@@ -36,6 +33,15 @@ export const Valid: Story<DefaultRecurringDatePickerInputProps> = (args) => {
36
33
  };
37
34
  Default.args = {
38
35
  onChange: (data) => console.log("onSubmit", data),
36
+ workHours: [
37
+ { start: "20:00", end: "04:00", day: 0, description: "" },
38
+ { start: "20:00", end: "04:00", day: 1, description: "" },
39
+ { start: "20:00", end: "04:00", day: 2, description: "" },
40
+ { start: "20:00", end: "12:00", day: 3, description: "" },
41
+ { start: "20:00", end: "23:00", day: 4, description: "" },
42
+ { start: "08:00", end: "12:00", day: 5, description: "" },
43
+ { start: "10:00", end: "16:00", day: 6, description: "" },
44
+ ],
39
45
  };
40
46
  Valid.args = {
41
47
  onChange: (data) => console.log("onSubmit", data),