@licklist/design 0.71.18-dev.6 → 0.71.18-dev.7

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 (30) hide show
  1. package/dist/iframe/ProductWithModifierModal/ModifierSetModal/ProductWithModifierSetForm.d.ts.map +1 -1
  2. package/dist/iframe/ProductWithModifierModal/ModifierSetModal/ProductWithModifierSetForm.js +15 -7
  3. package/dist/iframe/ProductWithModifierModal/ModifierSetModal/ProductWithModifierSetModal.js +1 -1
  4. package/dist/iframe/ProductWithModifierModal/ModifierSetModal/controll/ModifierSetControll.d.ts.map +1 -1
  5. package/dist/iframe/ProductWithModifierModal/ModifierSetModal/controll/ModifierSetControll.js +18 -10
  6. package/dist/iframe/ProductWithModifierModal/ModifierSetModal/controll/ProductControll.js +1 -1
  7. package/dist/iframe/ProductWithModifierModal/utils.d.ts.map +1 -1
  8. package/dist/iframe/ProductWithModifierModal/utils.js +3 -1
  9. package/dist/iframe/order-process/components/BookingSummary/components/ProductSummary/ProductSummary.d.ts.map +1 -1
  10. package/dist/iframe/order-process/components/BookingSummary/components/ProductSummary/ProductSummary.js +9 -23
  11. package/dist/iframe/order-process/components/BookingSummary/utils/index.d.ts.map +1 -1
  12. package/dist/iframe/order-process/components/BookingSummary/utils/index.js +1 -1
  13. package/dist/iframe/order-process/components/CategoryProduct/components/ProductWithModifier/ProductWithModifier.d.ts +2 -1
  14. package/dist/iframe/order-process/components/CategoryProduct/components/ProductWithModifier/ProductWithModifier.d.ts.map +1 -1
  15. package/dist/iframe/order-process/components/CategoryProduct/components/ProductWithModifier/ProductWithModifier.js +3 -3
  16. package/dist/styles/date-time-button/DateTimeButton.scss +7 -0
  17. package/dist/styles/events/EditEventModal.scss +2 -0
  18. package/package.json +1 -1
  19. package/src/iframe/ProductWithModifierModal/ModifierSetModal/ProductWithModifierSetForm.tsx +13 -6
  20. package/src/iframe/ProductWithModifierModal/ModifierSetModal/ProductWithModifierSetModal.tsx +1 -1
  21. package/src/iframe/ProductWithModifierModal/ModifierSetModal/controll/ModifierSetControll.tsx +20 -9
  22. package/src/iframe/ProductWithModifierModal/ModifierSetModal/controll/ProductControll.tsx +1 -1
  23. package/src/iframe/ProductWithModifierModal/utils.ts +3 -2
  24. package/src/iframe/order-process/components/BookingSummary/components/ProductSummary/ProductSummary.tsx +10 -21
  25. package/src/iframe/order-process/components/BookingSummary/utils/index.ts +1 -2
  26. package/src/iframe/order-process/components/CategoryProduct/components/ProductQuantityInput/ProductQuantityInput.tsx +1 -1
  27. package/src/iframe/order-process/components/CategoryProduct/components/ProductWithModifier/ProductWithModifier.tsx +4 -2
  28. package/src/styles/date-time-button/DateTimeButton.scss +7 -0
  29. package/src/styles/events/EditEventModal.scss +2 -0
  30. package/yarn.lock +118 -118
package/dist/iframe/ProductWithModifierModal/ModifierSetModal/ProductWithModifierSetForm.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ProductWithModifierSetForm.d.ts","sourceRoot":"","sources":["../../../../src/iframe/ProductWithModifierModal/ModifierSetModal/ProductWithModifierSetForm.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,QAAQ,EAAE,MAAM,qDAAqD,CAAA;AAC9E,OAAO,EAAE,sBAAsB,EAAE,MAAM,8DAA8D,CAAA;AACrG,OAAO,EAAE,OAAO,EAAE,MAAM,qDAAqD,CAAA;AAI7E,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAExD,OAAO,EAAE,aAAa,EAAE,MAAM,qGAAqG,CAAA;AAInI,MAAM,WAAW,uBAAuB;IACtC,KAAK,EAAE,QAAQ,EAAE,CAAA;CAClB;AAED,UAAU,+BAA+B;IACvC,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,eAAe,CAAA;IACzB,iBAAiB,CAAC,EAAE,sBAAsB,CAAA;IAC1C,QAAQ,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,CAAA;CAC3C;AAkBD,eAAO,MAAM,0BAA0B,wDAKpC,+BAA+B,4CAyJjC,CAAA"}
1
+ {"version":3,"file":"ProductWithModifierSetForm.d.ts","sourceRoot":"","sources":["../../../../src/iframe/ProductWithModifierModal/ModifierSetModal/ProductWithModifierSetForm.tsx"],"names":[],"mappings":"AAOA,OAAO,EAAE,QAAQ,EAAE,MAAM,qDAAqD,CAAA;AAC9E,OAAO,EAAE,sBAAsB,EAAE,MAAM,8DAA8D,CAAA;AACrG,OAAO,EAAE,OAAO,EAAE,MAAM,qDAAqD,CAAA;AAI7E,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAExD,OAAO,EAAE,aAAa,EAAE,MAAM,qGAAqG,CAAA;AAKnI,MAAM,WAAW,uBAAuB;IACtC,KAAK,EAAE,QAAQ,EAAE,CAAA;CAClB;AAED,UAAU,+BAA+B;IACvC,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,eAAe,CAAA;IACzB,iBAAiB,CAAC,EAAE,sBAAsB,CAAA;IAC1C,QAAQ,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,CAAA;CAC3C;AAkBD,eAAO,MAAM,0BAA0B,wDAKpC,+BAA+B,4CA8JjC,CAAA"}
package/dist/iframe/ProductWithModifierModal/ModifierSetModal/ProductWithModifierSetForm.js CHANGED
@@ -1,4 +1,5 @@
1
1
  import { jsx, jsxs } from 'react/jsx-runtime';
2
+ import { useMemo } from 'react';
2
3
  import { useForm, FormProvider, Controller } from 'react-hook-form';
3
4
  import { Form, Button } from 'react-bootstrap';
4
5
  import { isEmpty, uniqBy } from 'lodash';
@@ -6,7 +7,6 @@ import { useTranslation } from 'react-i18next';
6
7
  import { useIntl } from 'react-intl';
7
8
  import { Currency } from '@licklist/core/dist/Config';
8
9
  import 'recharts';
9
- import 'react';
10
10
  import 'react-loader';
11
11
  import '@licklist/plugins/dist/hooks/Media/useWindowDimensions';
12
12
  import clsx from 'clsx';
@@ -176,6 +176,14 @@ var ProductWithModifierSetForm = function(param) {
176
176
  onChange(value);
177
177
  }
178
178
  };
179
+ var disabledAddButton = useMemo(function() {
180
+ if (defaultProductQuantity) return false;
181
+ return !productQuantity || !isEmpty(errors);
182
+ }, [
183
+ defaultProductQuantity,
184
+ productQuantity,
185
+ errors
186
+ ]);
179
187
  var modifierPrice = getOrderProductModifiersPrice(orderModifierSets[0]);
180
188
  var productWithModifierPrice = (product.price * productQuantity || 0) + modifierPrice;
181
189
  var formatNumber = useIntl().formatNumber;
@@ -204,14 +212,14 @@ var ProductWithModifierSetForm = function(param) {
204
212
  min: {
205
213
  value: 1,
206
214
  message: t('Validation:fieldMinNumber', {
207
- attribute: t('minItems'),
215
+ attribute: t('product'),
208
216
  min: 1
209
217
  })
210
218
  },
211
219
  max: {
212
220
  value: !product.isUnlimited ? product.maxQuantity : MAX_PRODUCT_NUMBER,
213
221
  message: t('Validation:fieldMaxNumber', {
214
- attribute: t('maxItems'),
222
+ attribute: t('product'),
215
223
  max: product.maxQuantity
216
224
  })
217
225
  }
@@ -243,10 +251,10 @@ var ProductWithModifierSetForm = function(param) {
243
251
  })
244
252
  }),
245
253
  /*#__PURE__*/ jsxs("div", {
246
- className: " d-flex justify-content-center",
254
+ className: " d-flex flex-column align-items-center justify-content-center",
247
255
  children: [
248
256
  /*#__PURE__*/ jsx("div", {
249
- className: "price pl-5",
257
+ className: "modifier-price pb-4 pl-5",
250
258
  children: formatToCurrency(product.price)
251
259
  }),
252
260
  (error === null || error === void 0 ? void 0 : error.message) && /*#__PURE__*/ jsx("div", {
@@ -266,9 +274,9 @@ var ProductWithModifierSetForm = function(param) {
266
274
  as: "button",
267
275
  variant: "primary",
268
276
  className: "w-100",
269
- disabled: !productQuantity || !isEmpty(errors),
277
+ disabled: disabledAddButton,
270
278
  onClick: onSubmit,
271
- children: "".concat(t('App:add')).concat(modifierPrice ? " (".concat(formatToCurrency(productWithModifierPrice), ")") : '')
279
+ children: "".concat(t('Design:add')).concat(modifierPrice ? " (".concat(formatToCurrency(productWithModifierPrice), ")") : '')
272
280
  })
273
281
  ]
274
282
  })
package/dist/iframe/ProductWithModifierModal/ModifierSetModal/ProductWithModifierSetModal.js CHANGED
@@ -64,7 +64,7 @@ var ProductWithModifierSetModal = function(param) {
64
64
  children: /*#__PURE__*/ jsx(TicketDescription, {
65
65
  title: product.name,
66
66
  description: product.description,
67
- className: clsx('iframe-event__product-description'),
67
+ className: clsx('iframe-event__product-description', !product.images && 'mt-4'),
68
68
  classNameProductModal: "d-block",
69
69
  images: product.images,
70
70
  isRequired: product.isRequired,
package/dist/iframe/ProductWithModifierModal/ModifierSetModal/controll/ModifierSetControll.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ModifierSetControll.d.ts","sourceRoot":"","sources":["../../../../../src/iframe/ProductWithModifierModal/ModifierSetModal/controll/ModifierSetControll.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,8DAA8D,CAAA;AAC5F,OAAO,EAAE,QAAQ,EAAE,MAAM,2DAA2D,CAAA;AACpF,OAAO,EAAE,WAAW,EAAE,MAAM,8DAA8D,CAAA;AAY1F,UAAU,yBAAyB;IACjC,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAA;IACtB,WAAW,EAAE,WAAW,CAAA;IACxB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;IACjB,wBAAwB,CAAC,EAAE,aAAa,EAAE,CAAA;CAC3C;AAED,eAAO,MAAM,mBAAmB,4FAO7B,yBAAyB,4CAsU3B,CAAA"}
1
+ {"version":3,"file":"ModifierSetControll.d.ts","sourceRoot":"","sources":["../../../../../src/iframe/ProductWithModifierModal/ModifierSetModal/controll/ModifierSetControll.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,8DAA8D,CAAA;AAC5F,OAAO,EAAE,QAAQ,EAAE,MAAM,2DAA2D,CAAA;AACpF,OAAO,EAAE,WAAW,EAAE,MAAM,8DAA8D,CAAA;AAY1F,UAAU,yBAAyB;IACjC,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAA;IACtB,WAAW,EAAE,WAAW,CAAA;IACxB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;IACjB,wBAAwB,CAAC,EAAE,aAAa,EAAE,CAAA;CAC3C;AAED,eAAO,MAAM,mBAAmB,4FAO7B,yBAAyB,4CAiV3B,CAAA"}
package/dist/iframe/ProductWithModifierModal/ModifierSetModal/controll/ModifierSetControll.js CHANGED
@@ -62,9 +62,11 @@ import '@tanstack/react-table';
62
62
 
63
63
  var ModifiersSetControl = function(param) {
64
64
  var modifierSet = param.modifierSet, modifiers = param.modifiers, productId = param.productId, _param_isLoading = param.isLoading, isLoading = _param_isLoading === void 0 ? false : _param_isLoading, _param_isEditMode = param.isEditMode, isEditMode = _param_isEditMode === void 0 ? false : _param_isEditMode, orderProductModifierSets = param.orderProductModifierSets;
65
+ var _currentOrderModifiersSets_find;
65
66
  var _useFormContext = useFormContext(), control = _useFormContext.control, watch = _useFormContext.watch, setValue = _useFormContext.setValue, trigger = _useFormContext.trigger;
66
67
  var t = useTranslation('App').t;
67
68
  var orderModifiersSets = watch("".concat(productId, ".orderProductModifiers"));
69
+ console.log(orderModifiersSets, 'orderModifiersSets');
68
70
  var formatNumber = useIntl().formatNumber;
69
71
  var formatToCurrency = function(value) {
70
72
  return formatNumber(value, {
@@ -89,6 +91,7 @@ var ModifiersSetControl = function(param) {
89
91
  var checkSelectedModifier = (orderModifiersSets === null || orderModifiersSets === void 0 ? void 0 : (_orderModifiersSets_find = orderModifiersSets.find(function(modifier) {
90
92
  return (modifier === null || modifier === void 0 ? void 0 : modifier.modifierId) === (selectedModifier === null || selectedModifier === void 0 ? void 0 : selectedModifier.id);
91
93
  })) === null || _orderModifiersSets_find === void 0 ? void 0 : _orderModifiersSets_find.quantity) === 1;
94
+ console.log(orderModifiersSets, 'orderModifiersSets -1');
92
95
  if (selectedModifier && type === 'radio') {
93
96
  modifiers.forEach(function(modifier) {
94
97
  var isSelected = modifier.id === selectedModifier.id;
@@ -100,7 +103,8 @@ var ModifiersSetControl = function(param) {
100
103
  quantity: isSelected ? 1 : 0,
101
104
  modifierSetId: modifierSet.id
102
105
  };
103
- setValue("".concat(productId, ".orderProductModifiers.").concat(modifierSet.id), orderModifiers);
106
+ console.log(orderModifiers, 'orderModifiers');
107
+ setValue("".concat(productId, ".orderProductModifiers.").concat(modifierSet.id, ".").concat(orderModifiers.modifierId), orderModifiers);
104
108
  });
105
109
  }
106
110
  if (selectedModifier && type === 'checkbox') {
@@ -135,14 +139,17 @@ var ModifiersSetControl = function(param) {
135
139
  }, [
136
140
  isEditMode
137
141
  ]);
142
+ var radioButtonDefaultModifier = (_currentOrderModifiersSets_find = currentOrderModifiersSets.find(function(modifier) {
143
+ return modifierSet.modifiers.some(function(rl) {
144
+ return rl.id === modifier.modifierId;
145
+ });
146
+ })) === null || _currentOrderModifiersSets_find === void 0 ? void 0 : _currentOrderModifiersSets_find.modifierId.toString();
138
147
  return /*#__PURE__*/ jsx(Fragment, {
139
148
  children: (modifierSet === null || modifierSet === void 0 ? void 0 : modifierSet.maxItems) === 1 && modifiers.every(function(modifier) {
140
149
  return modifier.maxItems === 1;
141
- }) && !(currentOrderModifiersSets === null || currentOrderModifiersSets === void 0 ? void 0 : currentOrderModifiersSets.find(function(modifier) {
142
- return !!(modifier === null || modifier === void 0 ? void 0 : modifier.quantity);
143
- })) ? /*#__PURE__*/ jsx(Fragment, {
150
+ }) ? /*#__PURE__*/ jsx(Fragment, {
144
151
  children: /*#__PURE__*/ jsx(Controller, {
145
- name: "".concat(productId, ".orderProductModifiers.").concat(modifierSet.id),
152
+ name: "".concat(productId, ".modifier"),
146
153
  control: control,
147
154
  rules: {
148
155
  required: {
@@ -172,7 +179,7 @@ var ModifiersSetControl = function(param) {
172
179
  inline: true,
173
180
  id: modifier.id.toString(),
174
181
  defaultChecked: !!selectedOrderModifierId,
175
- defaultValue: modifier.id.toString(),
182
+ defaultValue: selectedOrderModifierId || modifier.id.toString(),
176
183
  checked: field.value === modifier.id.toString(),
177
184
  onChange: onChange,
178
185
  type: "radio",
@@ -186,7 +193,7 @@ var ModifiersSetControl = function(param) {
186
193
  children: modifier.description
187
194
  }),
188
195
  /*#__PURE__*/ jsxs("div", {
189
- className: "price",
196
+ className: "modifier-price",
190
197
  children: [
191
198
  "+ ",
192
199
  formatToCurrency(modifier.price)
@@ -204,7 +211,8 @@ var ModifiersSetControl = function(param) {
204
211
  })
205
212
  ]
206
213
  });
207
- }
214
+ },
215
+ defaultValue: radioButtonDefaultModifier
208
216
  })
209
217
  }) : /*#__PURE__*/ jsx(Fragment, {
210
218
  children: modifiers === null || modifiers === void 0 ? void 0 : modifiers.map(function(modifier, index) {
@@ -264,7 +272,7 @@ var ModifiersSetControl = function(param) {
264
272
  children: modifier.description
265
273
  }),
266
274
  /*#__PURE__*/ jsxs("div", {
267
- className: "price",
275
+ className: "modifier-price",
268
276
  children: [
269
277
  "+ ",
270
278
  formatToCurrency(modifier.price)
@@ -354,7 +362,7 @@ var ModifiersSetControl = function(param) {
354
362
  children: modifier.description
355
363
  }),
356
364
  /*#__PURE__*/ jsxs("div", {
357
- className: "pl-2 price",
365
+ className: "pl-2 modifier-price",
358
366
  children: [
359
367
  "+ ",
360
368
  formatToCurrency(modifier.price)
package/dist/iframe/ProductWithModifierModal/ModifierSetModal/controll/ProductControll.js CHANGED
@@ -11,7 +11,7 @@ var ProductControl = function(param) {
11
11
  .t;
12
12
  var _useFormContext = useFormContext(), control = _useFormContext.control, watch = _useFormContext.watch, isValid = _useFormContext.formState.isValid, clearErrors = _useFormContext.clearErrors;
13
13
  var modifiersSet = (product === null || product === void 0 ? void 0 : product.modifiersSet) || [];
14
- var orderModifiersSets = watch("".concat(product.id, ".orderProductModifiers"));
14
+ var orderModifiersSets = watch("".concat(product.id, ".orderProductModifier"));
15
15
  useEffect(function() {
16
16
  if (!isValid) return;
17
17
  clearErrors();
package/dist/iframe/ProductWithModifierModal/utils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/iframe/ProductWithModifierModal/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,8DAA8D,CAAA;AAG5F,MAAM,MAAM,kBAAkB,GAAG,OAAO,GAAG,UAAU,GAAG,UAAU,CAAA;AAElE,eAAO,MAAM,yBAAyB,iBACpB,aAAa,EAAE,KAC5B,aAAa,EAUf,CAAA;AAED,eAAO,MAAM,6BAA6B,uBACpB,aAAa,EAAE,6BAOpC,CAAA"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/iframe/ProductWithModifierModal/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,8DAA8D,CAAA;AAG5F,MAAM,MAAM,kBAAkB,GAAG,OAAO,GAAG,UAAU,GAAG,UAAU,CAAA;AAElE,eAAO,MAAM,yBAAyB,iBACpB,aAAa,EAAE,KAC5B,aAAa,EAUf,CAAA;AAED,eAAO,MAAM,6BAA6B,uBACpB,aAAa,EAAE,6BAQpC,CAAA"}
package/dist/iframe/ProductWithModifierModal/utils.js CHANGED
@@ -1,8 +1,9 @@
1
1
  import { uniqBy } from 'lodash';
2
2
 
3
3
  var filteredOrderModifierSets = function(modifiersSet) {
4
+ var _modifiersSet_flat;
4
5
  if (!modifiersSet) return [];
5
- var orderModifier = modifiersSet.flat().filter(function(modifier) {
6
+ var orderModifier = modifiersSet === null || modifiersSet === void 0 ? void 0 : (_modifiersSet_flat = modifiersSet.flat()) === null || _modifiersSet_flat === void 0 ? void 0 : _modifiersSet_flat.filter(function(modifier) {
6
7
  return !!(modifier === null || modifier === void 0 ? void 0 : modifier.quantity);
7
8
  });
8
9
  return uniqBy(orderModifier, function(item) {
@@ -10,6 +11,7 @@ var filteredOrderModifierSets = function(modifiersSet) {
10
11
  });
11
12
  };
12
13
  var orderProductModifiersQuantity = function(orderModifiersSets, modifierSet) {
14
+ if (!(orderModifiersSets === null || orderModifiersSets === void 0 ? void 0 : orderModifiersSets.length)) return 0;
13
15
  var filteredOrderModifier = filteredOrderModifierSets(orderModifiersSets);
14
16
  return filteredOrderModifier.filter(function(item) {
15
17
  return (item === null || item === void 0 ? void 0 : item.modifierSetId) === modifierSet.id;
package/dist/iframe/order-process/components/BookingSummary/components/ProductSummary/ProductSummary.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ProductSummary.d.ts","sourceRoot":"","sources":["../../../../../../src/iframe/order-process/components/BookingSummary/components/ProductSummary/ProductSummary.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,wDAAwD,CAAA;AAGlF,KAAK,mBAAmB,GAAG;IACzB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,YAAY,EAAE,SAAS,CAAA;CACxB,CAAA;AAED,eAAO,MAAM,cAAc,kDAIxB,mBAAmB,4CAyDrB,CAAA"}
1
+ {"version":3,"file":"ProductSummary.d.ts","sourceRoot":"","sources":["../../../../../../src/iframe/order-process/components/BookingSummary/components/ProductSummary/ProductSummary.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,wDAAwD,CAAA;AAIlF,KAAK,mBAAmB,GAAG;IACzB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,YAAY,EAAE,SAAS,CAAA;CACxB,CAAA;AAED,eAAO,MAAM,cAAc,kDAIxB,mBAAmB,4CA6CrB,CAAA"}
package/dist/iframe/order-process/components/BookingSummary/components/ProductSummary/ProductSummary.js CHANGED
@@ -3,6 +3,7 @@ import { useTranslation } from 'react-i18next';
3
3
  import { useIntl } from 'react-intl';
4
4
  import * as Config from '@licklist/core/dist/Config';
5
5
  import { calculateTotalModifiersPrice } from '../../utils/index.js';
6
+ import { ProductWithModifier } from '../../../CategoryProduct/components/ProductWithModifier/ProductWithModifier.js';
6
7
 
7
8
  var ProductSummary = function(param) {
8
9
  var name = param.name, productQuantityError = param.productQuantityError, orderProduct = param.orderProduct;
@@ -15,15 +16,6 @@ var ProductSummary = function(param) {
15
16
  style: 'currency',
16
17
  currency: Config.Currency.GBP
17
18
  });
18
- var modifiersName = "".concat((_orderProduct_orderModifiersSets = orderProduct.orderModifiersSets) === null || _orderProduct_orderModifiersSets === void 0 ? void 0 : _orderProduct_orderModifiersSets.map(function(modifierProduct) {
19
- return modifierProduct === null || modifierProduct === void 0 ? void 0 : modifierProduct.modifiers.map(function(item) {
20
- return (item === null || item === void 0 ? void 0 : item.quantity) > 1 ? "".concat(item === null || item === void 0 ? void 0 : item.quantity, "x - ").concat(item === null || item === void 0 ? void 0 : item.name) : item === null || item === void 0 ? void 0 : item.name;
21
- }).join(', ');
22
- }).join(', '));
23
- var fullModifiersPrice = formatNumber(modifierSetsPrice, {
24
- style: 'currency',
25
- currency: Config.Currency.GBP
26
- });
27
19
  return /*#__PURE__*/ jsxs("div", {
28
20
  className: "product",
29
21
  children: [
@@ -48,20 +40,14 @@ var ProductSummary = function(param) {
48
40
  })
49
41
  ]
50
42
  }),
51
- fullModifiersPrice && /*#__PURE__*/ jsxs(Fragment, {
52
- children: [
53
- /*#__PURE__*/ jsx("p", {
54
- className: "mt-2",
55
- children: modifiersName
56
- }),
57
- /*#__PURE__*/ jsx("div", {
58
- className: "d-flex justify-content-end",
59
- children: /*#__PURE__*/ jsx("p", {
60
- className: "price",
61
- children: fullModifiersPrice
62
- })
63
- })
64
- ]
43
+ !!(orderProduct === null || orderProduct === void 0 ? void 0 : (_orderProduct_orderModifiersSets = orderProduct.orderModifiersSets) === null || _orderProduct_orderModifiersSets === void 0 ? void 0 : _orderProduct_orderModifiersSets.length) && /*#__PURE__*/ jsx(Fragment, {
44
+ children: orderProduct.orderModifiersSets.map(function(modifier, index) {
45
+ return /*#__PURE__*/ jsx(ProductWithModifier, {
46
+ modifier: modifier,
47
+ modifierKey: index,
48
+ isSummary: true
49
+ }, modifier.productQuantity.toString());
50
+ })
65
51
  }),
66
52
  productQuantityError && /*#__PURE__*/ jsx("p", {
67
53
  className: "iframe-event__message-error",
package/dist/iframe/order-process/components/BookingSummary/utils/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/iframe/order-process/components/BookingSummary/utils/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,sBAAsB,EACvB,MAAM,8DAA8D,CAAA;AACrE,OAAO,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAA;AACvF,OAAO,EAAE,SAAS,EAAE,MAAM,wDAAwD,CAAA;AAElF,eAAO,MAAM,sBAAsB,mCAGhC;IACD,aAAa,CAAC,EAAE,SAAS,EAAE,CAAA;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB,WAmBA,CAAA;AAED,eAAO,MAAM,eAAe,aAChB,sBAAsB,mBACf,OAAO,WAMzB,CAAA;AAED,eAAO,MAAM,4BAA4B,uBACnB,sBAAsB,EAAE,WAUO,CAAA;AAErD,eAAO,MAAM,6BAA6B,wBACnB,sBAAsB,WAU5C,CAAA;AAED,eAAO,MAAM,eAAe,uBACN,wBAAwB,EAAE,aACnC,SAAS,CAAC,IAAI,CAAC,KACzB,MAAM,GAAG,SAGA,CAAA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/iframe/order-process/components/BookingSummary/utils/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,sBAAsB,EACvB,MAAM,8DAA8D,CAAA;AACrE,OAAO,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAA;AACvF,OAAO,EAAE,SAAS,EAAE,MAAM,wDAAwD,CAAA;AAElF,eAAO,MAAM,sBAAsB,mCAGhC;IACD,aAAa,CAAC,EAAE,SAAS,EAAE,CAAA;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB,WAkBA,CAAA;AAED,eAAO,MAAM,eAAe,aAChB,sBAAsB,mBACf,OAAO,WAMzB,CAAA;AAED,eAAO,MAAM,4BAA4B,uBACnB,sBAAsB,EAAE,WAUO,CAAA;AAErD,eAAO,MAAM,6BAA6B,wBACnB,sBAAsB,WAU5C,CAAA;AAED,eAAO,MAAM,eAAe,uBACN,wBAAwB,EAAE,aACnC,SAAS,CAAC,IAAI,CAAC,KACzB,MAAM,GAAG,SAGA,CAAA"}
package/dist/iframe/order-process/components/BookingSummary/utils/index.js CHANGED
@@ -12,7 +12,7 @@ var cartSumByOrderProducts = function(param) {
12
12
  };
13
13
  var getModifierName = function(modifier, isManualBooking) {
14
14
  var modifierName = function(orderModifier) {
15
- return !isManualBooking ? orderModifier === null || orderModifier === void 0 ? void 0 : orderModifier.name : orderModifier.modifier.name;
15
+ return isManualBooking ? orderModifier.modifier.name : orderModifier === null || orderModifier === void 0 ? void 0 : orderModifier.name;
16
16
  };
17
17
  return "".concat(modifier.modifiers.map(function(item) {
18
18
  return (item === null || item === void 0 ? void 0 : item.quantity) > 1 ? "".concat(item === null || item === void 0 ? void 0 : item.quantity, "x - ").concat(modifierName(item)) : modifierName(item);
package/dist/iframe/order-process/components/CategoryProduct/components/ProductWithModifier/ProductWithModifier.d.ts CHANGED
@@ -14,9 +14,10 @@ interface ProductQuantityInputProps {
14
14
  modifier: OrderModifierByProduct;
15
15
  modifierKey: number;
16
16
  isManualBooking?: boolean;
17
+ isSummary?: boolean;
17
18
  deleteOrderModifier?: (order: number) => void;
18
19
  editOrderModifierSet?: (order: number) => void;
19
20
  }
20
- export declare const ProductWithModifier: ({ modifier, modifierKey, isManualBooking, deleteOrderModifier, editOrderModifierSet, }: ProductQuantityInputProps) => import("react/jsx-runtime").JSX.Element;
21
+ export declare const ProductWithModifier: ({ modifier, modifierKey, isManualBooking, isSummary, deleteOrderModifier, editOrderModifierSet, }: ProductQuantityInputProps) => import("react/jsx-runtime").JSX.Element;
21
22
  export {};
22
23
  //# sourceMappingURL=ProductWithModifier.d.ts.map
package/dist/iframe/order-process/components/CategoryProduct/components/ProductWithModifier/ProductWithModifier.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ProductWithModifier.d.ts","sourceRoot":"","sources":["../../../../../../src/iframe/order-process/components/CategoryProduct/components/ProductWithModifier/ProductWithModifier.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8DAA8D,CAAA;AAMrG,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,iBAAiB,EAAE,MAAM,CAAA;IACzB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,kBAAkB,CAAC,EAAE,sBAAsB,EAAE,GAAG,IAAI,CAAA;CACrD;AAED,UAAU,yBAAyB;IACjC,QAAQ,EAAE,sBAAsB,CAAA;IAChC,WAAW,EAAE,MAAM,CAAA;IACnB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IAC7C,oBAAoB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;CAC/C;AAED,eAAO,MAAM,mBAAmB,2FAM7B,yBAAyB,4CA8C3B,CAAA"}
1
+ {"version":3,"file":"ProductWithModifier.d.ts","sourceRoot":"","sources":["../../../../../../src/iframe/order-process/components/CategoryProduct/components/ProductWithModifier/ProductWithModifier.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8DAA8D,CAAA;AAMrG,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,iBAAiB,EAAE,MAAM,CAAA;IACzB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,kBAAkB,CAAC,EAAE,sBAAsB,EAAE,GAAG,IAAI,CAAA;CACrD;AAED,UAAU,yBAAyB;IACjC,QAAQ,EAAE,sBAAsB,CAAA;IAChC,WAAW,EAAE,MAAM,CAAA;IACnB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IAC7C,oBAAoB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;CAC/C;AAED,eAAO,MAAM,mBAAmB,sGAO7B,yBAAyB,4CA8C3B,CAAA"}
package/dist/iframe/order-process/components/CategoryProduct/components/ProductWithModifier/ProductWithModifier.js CHANGED
@@ -7,7 +7,7 @@ import { useIntl } from 'react-intl';
7
7
  import { getModifierName, getOrderProductModifiersPrice } from '../../../BookingSummary/utils/index.js';
8
8
 
9
9
  var ProductWithModifier = function(param) {
10
- var modifier = param.modifier, modifierKey = param.modifierKey, _param_isManualBooking = param.isManualBooking, isManualBooking = _param_isManualBooking === void 0 ? false : _param_isManualBooking, deleteOrderModifier = param.deleteOrderModifier, editOrderModifierSet = param.editOrderModifierSet;
10
+ var modifier = param.modifier, modifierKey = param.modifierKey, _param_isManualBooking = param.isManualBooking, isManualBooking = _param_isManualBooking === void 0 ? false : _param_isManualBooking, _param_isSummary = param.isSummary, isSummary = _param_isSummary === void 0 ? false : _param_isSummary, deleteOrderModifier = param.deleteOrderModifier, editOrderModifierSet = param.editOrderModifierSet;
11
11
  var t = useTranslation('Design').t;
12
12
  var formatNumber = useIntl().formatNumber;
13
13
  var modifierName = getModifierName(modifier, isManualBooking);
@@ -24,7 +24,7 @@ var ProductWithModifier = function(param) {
24
24
  className: "d-flex",
25
25
  children: [
26
26
  /*#__PURE__*/ jsx("p", {
27
- className: "font-weight-bold pr-4",
27
+ className: "font-weight-bold w-25 pr-4",
28
28
  children: "".concat(orderModifierDescription, " x")
29
29
  }),
30
30
  /*#__PURE__*/ jsx("p", {
@@ -32,7 +32,7 @@ var ProductWithModifier = function(param) {
32
32
  })
33
33
  ]
34
34
  }),
35
- isManualBooking ? /*#__PURE__*/ jsx("p", {
35
+ isManualBooking || isSummary ? /*#__PURE__*/ jsx("p", {
36
36
  className: "price",
37
37
  children: fullModifiersPrice
38
38
  }) : /*#__PURE__*/ jsxs("div", {
package/dist/styles/date-time-button/DateTimeButton.scss CHANGED
@@ -105,3 +105,10 @@
105
105
  font-weight: 300;
106
106
  color: $snippet-calendar-button-font-color;
107
107
  }
108
+
109
+ .modifier-price {
110
+ font-size: 1rem;
111
+ line-height: 1.03rem;
112
+ font-weight: 500;
113
+ color: $snippet-calendar-button-font-color;
114
+ }
package/dist/styles/events/EditEventModal.scss CHANGED
@@ -37,6 +37,8 @@
37
37
  .edit-step-dialog {
38
38
  .custom-checkbox {
39
39
  align-items: unset;
40
+ position: relative;
41
+ z-index: 0;
40
42
  .form-check-label {
41
43
  margin-top: 1rem;
42
44
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@licklist/design",
3
- "version": "0.71.18-dev.6",
3
+ "version": "0.71.18-dev.7",
4
4
  "repository": {
5
5
  "type": "git",
6
6
  "url": "git+ssh://git@bitbucket.org/artelogicsoft/licklist_design.git"
package/src/iframe/ProductWithModifierModal/ModifierSetModal/ProductWithModifierSetForm.tsx CHANGED
@@ -1,3 +1,4 @@
1
+ import { useMemo } from 'react'
1
2
  import { Controller, FormProvider, useForm } from 'react-hook-form'
2
3
  import { Button, Form } from 'react-bootstrap'
3
4
  import { isEmpty, uniqBy } from 'lodash'
@@ -16,6 +17,7 @@ import { FormOrderItem } from '../../order-process/components/CategoryProduct/co
16
17
  import { getOrderProductModifiersPrice } from '../../order-process/components/BookingSummary/utils'
17
18
  import { ProductControl } from './controll/ProductControll'
18
19
 
20
+
19
21
  export interface ManualBookingFormValues {
20
22
  steps: MenuStep[]
21
23
  }
@@ -111,6 +113,11 @@ export const ProductWithModifierSetForm = ({
111
113
  }
112
114
  }
113
115
 
116
+ const disabledAddButton = useMemo(() => {
117
+ if (defaultProductQuantity) return false
118
+ return !productQuantity || !isEmpty(errors)
119
+ }, [defaultProductQuantity, productQuantity, errors])
120
+
114
121
  const modifierPrice = getOrderProductModifiersPrice(orderModifierSets[0])
115
122
  const productWithModifierPrice =
116
123
  (product.price * productQuantity || 0) + modifierPrice
@@ -134,7 +141,7 @@ export const ProductWithModifierSetForm = ({
134
141
  min: {
135
142
  value: 1,
136
143
  message: t('Validation:fieldMinNumber', {
137
- attribute: t('minItems'),
144
+ attribute: t('product'),
138
145
  min: 1,
139
146
  }) as string,
140
147
  },
@@ -143,7 +150,7 @@ export const ProductWithModifierSetForm = ({
143
150
  ? product.maxQuantity
144
151
  : MAX_PRODUCT_NUMBER,
145
152
  message: t('Validation:fieldMaxNumber', {
146
- attribute: t('maxItems'),
153
+ attribute: t('product'),
147
154
  max: product.maxQuantity,
148
155
  }) as string,
149
156
  },
@@ -173,8 +180,8 @@ export const ProductWithModifierSetForm = ({
173
180
  isLoading={isSubmitting}
174
181
  />
175
182
  </div>
176
- <div className=' d-flex justify-content-center'>
177
- <div className='price pl-5'>
183
+ <div className=' d-flex flex-column align-items-center justify-content-center'>
184
+ <div className='modifier-price pb-4 pl-5'>
178
185
  {formatToCurrency(product.price)}
179
186
  </div>
180
187
  {error?.message && (
@@ -192,10 +199,10 @@ export const ProductWithModifierSetForm = ({
192
199
  as='button'
193
200
  variant='primary'
194
201
  className='w-100'
195
- disabled={!productQuantity || !isEmpty(errors)}
202
+ disabled={disabledAddButton}
196
203
  onClick={onSubmit}
197
204
  >
198
- {`${t('App:add')}${modifierPrice ? ` (${formatToCurrency(productWithModifierPrice)})` : ''}`}
205
+ {`${t('Design:add')}${modifierPrice ? ` (${formatToCurrency(productWithModifierPrice)})` : ''}`}
199
206
  </Button>
200
207
  </div>
201
208
  </div>
package/src/iframe/ProductWithModifierModal/ModifierSetModal/ProductWithModifierSetModal.tsx CHANGED
@@ -53,7 +53,7 @@ export const ProductWithModifierSetModal = ({
53
53
  <TicketDescription
54
54
  title={product.name}
55
55
  description={product.description}
56
- className={clsx('iframe-event__product-description')}
56
+ className={clsx('iframe-event__product-description', !product.images && 'mt-4')}
57
57
  classNameProductModal='d-block'
58
58
  images={product.images}
59
59
  isRequired={product.isRequired}
package/src/iframe/ProductWithModifierModal/ModifierSetModal/controll/ModifierSetControll.tsx CHANGED
@@ -36,6 +36,8 @@ export const ModifiersSetControl = ({
36
36
 
37
37
  const orderModifiersSets = watch(`${productId}.orderProductModifiers`)
38
38
 
39
+ console.log(orderModifiersSets, 'orderModifiersSets')
40
+
39
41
  const { formatNumber } = useIntl()
40
42
  const formatToCurrency = (value: number) =>
41
43
  formatNumber(value, { style: 'currency', currency: Currency.GBP })
@@ -62,7 +64,7 @@ export const ModifiersSetControl = ({
62
64
  orderModifiersSets?.find(
63
65
  (modifier) => modifier?.modifierId === selectedModifier?.id,
64
66
  )?.quantity === 1
65
-
67
+ console.log(orderModifiersSets, 'orderModifiersSets -1')
66
68
  if (selectedModifier && type === 'radio') {
67
69
  modifiers.forEach((modifier) => {
68
70
  const isSelected = modifier.id === selectedModifier.id
@@ -74,8 +76,11 @@ export const ModifiersSetControl = ({
74
76
  quantity: isSelected ? 1 : 0,
75
77
  modifierSetId: modifierSet.id,
76
78
  }
79
+
80
+ console.log(orderModifiers, 'orderModifiers')
81
+
77
82
  setValue(
78
- `${productId}.orderProductModifiers.${modifierSet.id}`,
83
+ `${productId}.orderProductModifiers.${modifierSet.id}.${orderModifiers.modifierId}`,
79
84
  orderModifiers,
80
85
  )
81
86
  })
@@ -124,14 +129,19 @@ export const ModifiersSetControl = ({
124
129
  )
125
130
  }, [isEditMode])
126
131
 
132
+ const radioButtonDefaultModifier = currentOrderModifiersSets.find((modifier) =>
133
+ modifierSet.modifiers.some((rl) => rl.id === modifier.modifierId)
134
+ )?.modifierId.toString();
135
+
136
+
137
+
127
138
  return (
128
139
  <>
129
140
  {modifierSet?.maxItems === 1 &&
130
- modifiers.every((modifier) => modifier.maxItems === 1) &&
131
- !currentOrderModifiersSets?.find((modifier) => !!modifier?.quantity) ? (
141
+ modifiers.every((modifier) => modifier.maxItems === 1) ? (
132
142
  <>
133
143
  <Controller
134
- name={`${productId}.orderProductModifiers.${modifierSet.id}`}
144
+ name={`${productId}.modifier`}
135
145
  control={control}
136
146
  rules={{
137
147
  required: {
@@ -162,7 +172,7 @@ export const ModifiersSetControl = ({
162
172
  inline
163
173
  id={modifier.id.toString()}
164
174
  defaultChecked={!!selectedOrderModifierId}
165
- defaultValue={modifier.id.toString()}
175
+ defaultValue={selectedOrderModifierId || modifier.id.toString()}
166
176
  checked={field.value === modifier.id.toString()}
167
177
  onChange={onChange}
168
178
  type='radio'
@@ -171,7 +181,7 @@ export const ModifiersSetControl = ({
171
181
  />
172
182
  <div className='mt-3 w-100 pl-2'>
173
183
  <p>{modifier.description}</p>
174
- <div className='price'>
184
+ <div className='modifier-price'>
175
185
  + {formatToCurrency(modifier.price)}
176
186
  </div>
177
187
  </div>
@@ -187,6 +197,7 @@ export const ModifiersSetControl = ({
187
197
  </>
188
198
  )
189
199
  }}
200
+ defaultValue={radioButtonDefaultModifier}
190
201
  />
191
202
  </>
192
203
  ) : (
@@ -248,7 +259,7 @@ export const ModifiersSetControl = ({
248
259
  </div>
249
260
  <div className='mt-3 w-100 pl-2'>
250
261
  <p>{modifier.description}</p>
251
- <div className='price'>
262
+ <div className='modifier-price'>
252
263
  + {formatToCurrency(modifier.price)}
253
264
  </div>
254
265
  </div>
@@ -332,7 +343,7 @@ export const ModifiersSetControl = ({
332
343
  </div>
333
344
  <div className='p-2 mt-3 w-100 pl-4'>
334
345
  <p className='pl-2'>{modifier.description}</p>
335
- <div className='pl-2 price'>
346
+ <div className='pl-2 modifier-price'>
336
347
  + {formatToCurrency(modifier.price)}
337
348
  </div>
338
349
  {error?.message && (
package/src/iframe/ProductWithModifierModal/ModifierSetModal/controll/ProductControll.tsx CHANGED
@@ -25,7 +25,7 @@ export const ProductControl = ({
25
25
  clearErrors,
26
26
  } = useFormContext()
27
27
  const modifiersSet = product?.modifiersSet || []
28
- const orderModifiersSets = watch(`${product.id}.orderProductModifiers`)
28
+ const orderModifiersSets = watch(`${product.id}.orderProductModifier`)
29
29
 
30
30
  useEffect(() => {
31
31
  if (!isValid) return
package/src/iframe/ProductWithModifierModal/utils.ts CHANGED
@@ -8,8 +8,8 @@ export const filteredOrderModifierSets = (
8
8
  ): OrderModifier[] => {
9
9
  if (!modifiersSet) return []
10
10
  const orderModifier = modifiersSet
11
- .flat()
12
- .filter((modifier) => !!modifier?.quantity)
11
+ ?.flat()
12
+ ?.filter((modifier) => !!modifier?.quantity)
13
13
 
14
14
  return uniqBy(
15
15
  orderModifier,
@@ -21,6 +21,7 @@ export const filteredOrderModifierSets = (
21
21
  orderModifiersSets: OrderModifier[],
22
22
  modifierSet,
23
23
  ) => {
24
+ if (!orderModifiersSets?.length) return 0
24
25
  const filteredOrderModifier = filteredOrderModifierSets(orderModifiersSets)
25
26
  return filteredOrderModifier.filter(
26
27
  (item) => item?.modifierSetId === modifierSet.id,
package/src/iframe/order-process/components/BookingSummary/components/ProductSummary/ProductSummary.tsx CHANGED
@@ -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 { calculateTotalModifiersPrice } from '../../utils'
6
+ import { ProductWithModifier } from '../../../CategoryProduct/components/ProductWithModifier/ProductWithModifier'
6
7
 
7
8
  type ProductSummaryProps = {
8
9
  name?: string
@@ -29,22 +30,6 @@ export const ProductSummary = ({
29
30
  currency: Config.Currency.GBP,
30
31
  })
31
32
 
32
- const modifiersName = `${orderProduct.orderModifiersSets
33
- ?.map((modifierProduct) =>
34
- modifierProduct?.modifiers
35
- .map((item) =>
36
- item?.quantity > 1
37
- ? `${item?.quantity}x - ${item?.name}`
38
- : item?.name,
39
- )
40
- .join(', '),
41
- )
42
- .join(', ')}`
43
-
44
- const fullModifiersPrice = formatNumber(modifierSetsPrice, {
45
- style: 'currency',
46
- currency: Config.Currency.GBP,
47
- })
48
33
 
49
34
  return (
50
35
  <div className='product'>
@@ -57,12 +42,16 @@ export const ProductSummary = ({
57
42
  {modifierSetsPrice && <p className='price'>{fullPrice}</p>}
58
43
  </div>
59
44
 
60
- {fullModifiersPrice && (
45
+ {!!orderProduct?.orderModifiersSets?.length && (
61
46
  <>
62
- <p className='mt-2'>{modifiersName}</p>
63
- <div className='d-flex justify-content-end'>
64
- <p className='price'>{fullModifiersPrice}</p>
65
- </div>
47
+ {orderProduct.orderModifiersSets.map((modifier, index) => (
48
+ <ProductWithModifier
49
+ key={modifier.productQuantity.toString()}
50
+ modifier={modifier}
51
+ modifierKey={index}
52
+ isSummary
53
+ />
54
+ ))}
66
55
  </>
67
56
  )}
68
57
 
package/src/iframe/order-process/components/BookingSummary/utils/index.ts CHANGED
@@ -17,7 +17,6 @@ export const cartSumByOrderProducts = ({
17
17
  }
18
18
  return orderProducts.reduce((prevSumValue: number, product) => {
19
19
  if (!product) return 0
20
-
21
20
  const modifiersPrice = calculateTotalModifiersPrice(
22
21
  product?.orderModifiersSets,
23
22
  )
@@ -37,7 +36,7 @@ export const getModifierName = (
37
36
  isManualBooking: boolean,
38
37
  ) => {
39
38
  const modifierName = (orderModifier: OrderModifier) =>
40
- !isManualBooking ? orderModifier?.name : orderModifier.modifier.name
39
+ isManualBooking ? orderModifier.modifier.name : orderModifier?.name
41
40
  return `${modifier.modifiers.map((item) => (
42
41
  item?.quantity > 1 ? `${item?.quantity}x - ${modifierName(item)}` : modifierName(item))).join(', ')}`
43
42
  }
package/src/iframe/order-process/components/CategoryProduct/components/ProductQuantityInput/ProductQuantityInput.tsx CHANGED
@@ -92,7 +92,7 @@ export const ProductQuantityInput = ({
92
92
  )
93
93
  }
94
94
 
95
- if (product.modifiersSet.length) {
95
+ if ((product as Product).modifiersSet.length) {
96
96
  return (
97
97
  <>
98
98
  <Button
package/src/iframe/order-process/components/CategoryProduct/components/ProductWithModifier/ProductWithModifier.tsx CHANGED
@@ -25,6 +25,7 @@ interface ProductQuantityInputProps {
25
25
  modifier: OrderModifierByProduct
26
26
  modifierKey: number
27
27
  isManualBooking?: boolean
28
+ isSummary? :boolean
28
29
  deleteOrderModifier?: (order: number) => void
29
30
  editOrderModifierSet?: (order: number) => void
30
31
  }
@@ -33,6 +34,7 @@ export const ProductWithModifier = ({
33
34
  modifier,
34
35
  modifierKey,
35
36
  isManualBooking = false,
37
+ isSummary = false,
36
38
  deleteOrderModifier,
37
39
  editOrderModifierSet,
38
40
  }: ProductQuantityInputProps) => {
@@ -55,10 +57,10 @@ export const ProductWithModifier = ({
55
57
  className='d-flex p-2 justify-content-between align-items-center'
56
58
  >
57
59
  <div className='d-flex'>
58
- <p className='font-weight-bold pr-4'>{`${orderModifierDescription} x`}</p>
60
+ <p className='font-weight-bold w-25 pr-4'>{`${orderModifierDescription} x`}</p>
59
61
  <p>{modifierName ? ` ${modifierName}` : t('withoutModifier')}</p>
60
62
  </div>
61
- {isManualBooking ? (
63
+ {isManualBooking || isSummary ? (
62
64
  <p className='price'>{fullModifiersPrice}</p>
63
65
  ) : (
64
66
  <div>
package/src/styles/date-time-button/DateTimeButton.scss CHANGED
@@ -105,3 +105,10 @@
105
105
  font-weight: 300;
106
106
  color: $snippet-calendar-button-font-color;
107
107
  }
108
+
109
+ .modifier-price {
110
+ font-size: 1rem;
111
+ line-height: 1.03rem;
112
+ font-weight: 500;
113
+ color: $snippet-calendar-button-font-color;
114
+ }
package/src/styles/events/EditEventModal.scss CHANGED
@@ -37,6 +37,8 @@
37
37
  .edit-step-dialog {
38
38
  .custom-checkbox {
39
39
  align-items: unset;
40
+ position: relative;
41
+ z-index: 0;
40
42
  .form-check-label {
41
43
  margin-top: 1rem;
42
44
  }
package/yarn.lock CHANGED
@@ -3303,135 +3303,135 @@ __metadata:
3303
3303
  languageName: node
3304
3304
  linkType: hard
3305
3305
 
3306
- "@rollup/rollup-android-arm-eabi@npm:4.32.1":
3307
- version: 4.32.1
3308
- resolution: "@rollup/rollup-android-arm-eabi@npm:4.32.1"
3306
+ "@rollup/rollup-android-arm-eabi@npm:4.34.4":
3307
+ version: 4.34.4
3308
+ resolution: "@rollup/rollup-android-arm-eabi@npm:4.34.4"
3309
3309
  conditions: os=android & cpu=arm
3310
3310
  languageName: node
3311
3311
  linkType: hard
3312
3312
 
3313
- "@rollup/rollup-android-arm64@npm:4.32.1":
3314
- version: 4.32.1
3315
- resolution: "@rollup/rollup-android-arm64@npm:4.32.1"
3313
+ "@rollup/rollup-android-arm64@npm:4.34.4":
3314
+ version: 4.34.4
3315
+ resolution: "@rollup/rollup-android-arm64@npm:4.34.4"
3316
3316
  conditions: os=android & cpu=arm64
3317
3317
  languageName: node
3318
3318
  linkType: hard
3319
3319
 
3320
- "@rollup/rollup-darwin-arm64@npm:4.32.1":
3321
- version: 4.32.1
3322
- resolution: "@rollup/rollup-darwin-arm64@npm:4.32.1"
3320
+ "@rollup/rollup-darwin-arm64@npm:4.34.4":
3321
+ version: 4.34.4
3322
+ resolution: "@rollup/rollup-darwin-arm64@npm:4.34.4"
3323
3323
  conditions: os=darwin & cpu=arm64
3324
3324
  languageName: node
3325
3325
  linkType: hard
3326
3326
 
3327
- "@rollup/rollup-darwin-x64@npm:4.32.1":
3328
- version: 4.32.1
3329
- resolution: "@rollup/rollup-darwin-x64@npm:4.32.1"
3327
+ "@rollup/rollup-darwin-x64@npm:4.34.4":
3328
+ version: 4.34.4
3329
+ resolution: "@rollup/rollup-darwin-x64@npm:4.34.4"
3330
3330
  conditions: os=darwin & cpu=x64
3331
3331
  languageName: node
3332
3332
  linkType: hard
3333
3333
 
3334
- "@rollup/rollup-freebsd-arm64@npm:4.32.1":
3335
- version: 4.32.1
3336
- resolution: "@rollup/rollup-freebsd-arm64@npm:4.32.1"
3334
+ "@rollup/rollup-freebsd-arm64@npm:4.34.4":
3335
+ version: 4.34.4
3336
+ resolution: "@rollup/rollup-freebsd-arm64@npm:4.34.4"
3337
3337
  conditions: os=freebsd & cpu=arm64
3338
3338
  languageName: node
3339
3339
  linkType: hard
3340
3340
 
3341
- "@rollup/rollup-freebsd-x64@npm:4.32.1":
3342
- version: 4.32.1
3343
- resolution: "@rollup/rollup-freebsd-x64@npm:4.32.1"
3341
+ "@rollup/rollup-freebsd-x64@npm:4.34.4":
3342
+ version: 4.34.4
3343
+ resolution: "@rollup/rollup-freebsd-x64@npm:4.34.4"
3344
3344
  conditions: os=freebsd & cpu=x64
3345
3345
  languageName: node
3346
3346
  linkType: hard
3347
3347
 
3348
- "@rollup/rollup-linux-arm-gnueabihf@npm:4.32.1":
3349
- version: 4.32.1
3350
- resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.32.1"
3348
+ "@rollup/rollup-linux-arm-gnueabihf@npm:4.34.4":
3349
+ version: 4.34.4
3350
+ resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.34.4"
3351
3351
  conditions: os=linux & cpu=arm & libc=glibc
3352
3352
  languageName: node
3353
3353
  linkType: hard
3354
3354
 
3355
- "@rollup/rollup-linux-arm-musleabihf@npm:4.32.1":
3356
- version: 4.32.1
3357
- resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.32.1"
3355
+ "@rollup/rollup-linux-arm-musleabihf@npm:4.34.4":
3356
+ version: 4.34.4
3357
+ resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.34.4"
3358
3358
  conditions: os=linux & cpu=arm & libc=musl
3359
3359
  languageName: node
3360
3360
  linkType: hard
3361
3361
 
3362
- "@rollup/rollup-linux-arm64-gnu@npm:4.32.1":
3363
- version: 4.32.1
3364
- resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.32.1"
3362
+ "@rollup/rollup-linux-arm64-gnu@npm:4.34.4":
3363
+ version: 4.34.4
3364
+ resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.34.4"
3365
3365
  conditions: os=linux & cpu=arm64 & libc=glibc
3366
3366
  languageName: node
3367
3367
  linkType: hard
3368
3368
 
3369
- "@rollup/rollup-linux-arm64-musl@npm:4.32.1":
3370
- version: 4.32.1
3371
- resolution: "@rollup/rollup-linux-arm64-musl@npm:4.32.1"
3369
+ "@rollup/rollup-linux-arm64-musl@npm:4.34.4":
3370
+ version: 4.34.4
3371
+ resolution: "@rollup/rollup-linux-arm64-musl@npm:4.34.4"
3372
3372
  conditions: os=linux & cpu=arm64 & libc=musl
3373
3373
  languageName: node
3374
3374
  linkType: hard
3375
3375
 
3376
- "@rollup/rollup-linux-loongarch64-gnu@npm:4.32.1":
3377
- version: 4.32.1
3378
- resolution: "@rollup/rollup-linux-loongarch64-gnu@npm:4.32.1"
3376
+ "@rollup/rollup-linux-loongarch64-gnu@npm:4.34.4":
3377
+ version: 4.34.4
3378
+ resolution: "@rollup/rollup-linux-loongarch64-gnu@npm:4.34.4"
3379
3379
  conditions: os=linux & cpu=loong64 & libc=glibc
3380
3380
  languageName: node
3381
3381
  linkType: hard
3382
3382
 
3383
- "@rollup/rollup-linux-powerpc64le-gnu@npm:4.32.1":
3384
- version: 4.32.1
3385
- resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.32.1"
3383
+ "@rollup/rollup-linux-powerpc64le-gnu@npm:4.34.4":
3384
+ version: 4.34.4
3385
+ resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.34.4"
3386
3386
  conditions: os=linux & cpu=ppc64 & libc=glibc
3387
3387
  languageName: node
3388
3388
  linkType: hard
3389
3389
 
3390
- "@rollup/rollup-linux-riscv64-gnu@npm:4.32.1":
3391
- version: 4.32.1
3392
- resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.32.1"
3390
+ "@rollup/rollup-linux-riscv64-gnu@npm:4.34.4":
3391
+ version: 4.34.4
3392
+ resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.34.4"
3393
3393
  conditions: os=linux & cpu=riscv64 & libc=glibc
3394
3394
  languageName: node
3395
3395
  linkType: hard
3396
3396
 
3397
- "@rollup/rollup-linux-s390x-gnu@npm:4.32.1":
3398
- version: 4.32.1
3399
- resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.32.1"
3397
+ "@rollup/rollup-linux-s390x-gnu@npm:4.34.4":
3398
+ version: 4.34.4
3399
+ resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.34.4"
3400
3400
  conditions: os=linux & cpu=s390x & libc=glibc
3401
3401
  languageName: node
3402
3402
  linkType: hard
3403
3403
 
3404
- "@rollup/rollup-linux-x64-gnu@npm:4.32.1":
3405
- version: 4.32.1
3406
- resolution: "@rollup/rollup-linux-x64-gnu@npm:4.32.1"
3404
+ "@rollup/rollup-linux-x64-gnu@npm:4.34.4":
3405
+ version: 4.34.4
3406
+ resolution: "@rollup/rollup-linux-x64-gnu@npm:4.34.4"
3407
3407
  conditions: os=linux & cpu=x64 & libc=glibc
3408
3408
  languageName: node
3409
3409
  linkType: hard
3410
3410
 
3411
- "@rollup/rollup-linux-x64-musl@npm:4.32.1":
3412
- version: 4.32.1
3413
- resolution: "@rollup/rollup-linux-x64-musl@npm:4.32.1"
3411
+ "@rollup/rollup-linux-x64-musl@npm:4.34.4":
3412
+ version: 4.34.4
3413
+ resolution: "@rollup/rollup-linux-x64-musl@npm:4.34.4"
3414
3414
  conditions: os=linux & cpu=x64 & libc=musl
3415
3415
  languageName: node
3416
3416
  linkType: hard
3417
3417
 
3418
- "@rollup/rollup-win32-arm64-msvc@npm:4.32.1":
3419
- version: 4.32.1
3420
- resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.32.1"
3418
+ "@rollup/rollup-win32-arm64-msvc@npm:4.34.4":
3419
+ version: 4.34.4
3420
+ resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.34.4"
3421
3421
  conditions: os=win32 & cpu=arm64
3422
3422
  languageName: node
3423
3423
  linkType: hard
3424
3424
 
3425
- "@rollup/rollup-win32-ia32-msvc@npm:4.32.1":
3426
- version: 4.32.1
3427
- resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.32.1"
3425
+ "@rollup/rollup-win32-ia32-msvc@npm:4.34.4":
3426
+ version: 4.34.4
3427
+ resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.34.4"
3428
3428
  conditions: os=win32 & cpu=ia32
3429
3429
  languageName: node
3430
3430
  linkType: hard
3431
3431
 
3432
- "@rollup/rollup-win32-x64-msvc@npm:4.32.1":
3433
- version: 4.32.1
3434
- resolution: "@rollup/rollup-win32-x64-msvc@npm:4.32.1"
3432
+ "@rollup/rollup-win32-x64-msvc@npm:4.34.4":
3433
+ version: 4.34.4
3434
+ resolution: "@rollup/rollup-win32-x64-msvc@npm:4.34.4"
3435
3435
  conditions: os=win32 & cpu=x64
3436
3436
  languageName: node
3437
3437
  linkType: hard
@@ -5692,11 +5692,11 @@ __metadata:
5692
5692
  linkType: hard
5693
5693
 
5694
5694
  "@types/node@npm:*":
5695
- version: 22.12.0
5696
- resolution: "@types/node@npm:22.12.0"
5695
+ version: 22.13.1
5696
+ resolution: "@types/node@npm:22.13.1"
5697
5697
  dependencies:
5698
5698
  undici-types: "npm:~6.20.0"
5699
- checksum: 10c0/be220706732d95db2ed1c441c1e64cab90bf9a47519ce6f4c79cc5a9ec9d5c517131a149a9ac30afac1a30103e67e3a00d453ba7c1b0141608a3a7ba6397c303
5699
+ checksum: 10c0/d4e56d41d8bd53de93da2651c0a0234e330bd7b1b6d071b1a94bd3b5ee2d9f387519e739c52a15c1faa4fb9d97e825b848421af4b2e50e6518011e7adb4a34b7
5700
5700
  languageName: node
5701
5701
  linkType: hard
5702
5702
 
@@ -8100,9 +8100,9 @@ __metadata:
8100
8100
  linkType: hard
8101
8101
 
8102
8102
  "caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001109, caniuse-lite@npm:^1.0.30001125, caniuse-lite@npm:^1.0.30001646, caniuse-lite@npm:^1.0.30001688":
8103
- version: 1.0.30001696
8104
- resolution: "caniuse-lite@npm:1.0.30001696"
8105
- checksum: 10c0/8060584c612b2bc232995a6e31153432de7946b5417d3b3505a3ab76e632e5568ccc7bae38f1a977f21d4fc214f9e64be829213f810694172c9109e258cb5be8
8103
+ version: 1.0.30001697
8104
+ resolution: "caniuse-lite@npm:1.0.30001697"
8105
+ checksum: 10c0/c114045be1bb5e610ca14c619157472910401bf59cc4d3050cc64ecd6887345ae8f685a5474c126755fabbd6e02f899b3b743218ab46dcbd5b6880607b67e18e
8106
8106
  languageName: node
8107
8107
  linkType: hard
8108
8108
 
@@ -9889,9 +9889,9 @@ __metadata:
9889
9889
  linkType: hard
9890
9890
 
9891
9891
  "electron-to-chromium@npm:^1.3.564, electron-to-chromium@npm:^1.5.73":
9892
- version: 1.5.90
9893
- resolution: "electron-to-chromium@npm:1.5.90"
9894
- checksum: 10c0/864715adfebb5932a78f776c99f28a50942884302b42ee6de0ab64ca135891a5a43af3a7c719a7335687c0ee201561011e37d4994558a795f67b9e44f20fc6ee
9892
+ version: 1.5.93
9893
+ resolution: "electron-to-chromium@npm:1.5.93"
9894
+ checksum: 10c0/0420b6ebbe9bd3601f1e9ead963fe749d85d7558ecee9347b64023ca2b6d6a4bd833954d782d1b0a0bd94b064dbacece57e8f730b954109e950def89ee970ef7
9895
9895
  languageName: node
9896
9896
  linkType: hard
9897
9897
 
@@ -12532,12 +12532,12 @@ __metadata:
12532
12532
  linkType: hard
12533
12533
 
12534
12534
  "import-fresh@npm:^3.0.0, import-fresh@npm:^3.1.0, import-fresh@npm:^3.2.1, import-fresh@npm:^3.3.0":
12535
- version: 3.3.0
12536
- resolution: "import-fresh@npm:3.3.0"
12535
+ version: 3.3.1
12536
+ resolution: "import-fresh@npm:3.3.1"
12537
12537
  dependencies:
12538
12538
  parent-module: "npm:^1.0.0"
12539
12539
  resolve-from: "npm:^4.0.0"
12540
- checksum: 10c0/7f882953aa6b740d1f0e384d0547158bc86efbf2eea0f1483b8900a6f65c5a5123c2cf09b0d542cc419d0b98a759ecaeb394237e97ea427f2da221dc3cd80cc3
12540
+ checksum: 10c0/bf8cc494872fef783249709385ae883b447e3eb09db0ebd15dcead7d9afe7224dad7bd7591c6b73b0b19b3c0f9640eb8ee884f01cfaf2887ab995b0b36a0cbec
12541
12541
  languageName: node
12542
12542
  linkType: hard
12543
12543
 
@@ -12617,8 +12617,8 @@ __metadata:
12617
12617
  linkType: hard
12618
12618
 
12619
12619
  "input-format@npm:^0.3.5":
12620
- version: 0.3.12
12621
- resolution: "input-format@npm:0.3.12"
12620
+ version: 0.3.14
12621
+ resolution: "input-format@npm:0.3.14"
12622
12622
  dependencies:
12623
12623
  prop-types: "npm:^15.8.1"
12624
12624
  peerDependencies:
@@ -12629,7 +12629,7 @@ __metadata:
12629
12629
  optional: true
12630
12630
  react-dom:
12631
12631
  optional: true
12632
- checksum: 10c0/c05ab46e75ff628a3bb72e5e343a95d860f612c2b2301571c8d8af17831fbb5847aad0a33eb832038b29ccf7ebf30a0eab6c27241b6a8a0b762def75bfd4ccf3
12632
+ checksum: 10c0/37bb23e0dd15223b2ac8a25b09bc26e4d613cbd93c040dcdb490a1661dd0782c2742ad819b9dbd4b154a9e09ce1a69046a78e4ee943171b7ec86b07b50324ad6
12633
12633
  languageName: node
12634
12634
  linkType: hard
12635
12635
 
@@ -12805,12 +12805,12 @@ __metadata:
12805
12805
  linkType: hard
12806
12806
 
12807
12807
  "is-boolean-object@npm:^1.2.1":
12808
- version: 1.2.1
12809
- resolution: "is-boolean-object@npm:1.2.1"
12808
+ version: 1.2.2
12809
+ resolution: "is-boolean-object@npm:1.2.2"
12810
12810
  dependencies:
12811
- call-bound: "npm:^1.0.2"
12811
+ call-bound: "npm:^1.0.3"
12812
12812
  has-tostringtag: "npm:^1.0.2"
12813
- checksum: 10c0/2ef601d255a39fdbde79cfe6be80c27b47430ed6712407f29b17d002e20f64c1e3d6692f1d842ba16bf1e9d8ddf1c4f13cac3ed7d9a4a21290f44879ebb4e8f5
12813
+ checksum: 10c0/36ff6baf6bd18b3130186990026f5a95c709345c39cd368468e6c1b6ab52201e9fd26d8e1f4c066357b4938b0f0401e1a5000e08257787c1a02f3a719457001e
12814
12814
  languageName: node
12815
12815
  linkType: hard
12816
12816
 
@@ -13224,11 +13224,11 @@ __metadata:
13224
13224
  linkType: hard
13225
13225
 
13226
13226
  "is-weakref@npm:^1.0.2, is-weakref@npm:^1.1.0":
13227
- version: 1.1.0
13228
- resolution: "is-weakref@npm:1.1.0"
13227
+ version: 1.1.1
13228
+ resolution: "is-weakref@npm:1.1.1"
13229
13229
  dependencies:
13230
- call-bound: "npm:^1.0.2"
13231
- checksum: 10c0/aa835f62e29cb60132ecb3ec7d11bd0f39ec7322325abe8412b805aef47153ec2daefdb21759b049711c674f49b13202a31d8d126bcdff7d8671c78babd4ae5b
13230
+ call-bound: "npm:^1.0.3"
13231
+ checksum: 10c0/8e0a9c07b0c780949a100e2cab2b5560a48ecd4c61726923c1a9b77b6ab0aa0046c9e7fb2206042296817045376dee2c8ab1dabe08c7c3dfbf195b01275a085b
13232
13232
  languageName: node
13233
13233
  linkType: hard
13234
13234
 
@@ -15280,9 +15280,9 @@ __metadata:
15280
15280
  linkType: hard
15281
15281
 
15282
15282
  "object-inspect@npm:^1.12.0, object-inspect@npm:^1.13.3":
15283
- version: 1.13.3
15284
- resolution: "object-inspect@npm:1.13.3"
15285
- checksum: 10c0/cc3f15213406be89ffdc54b525e115156086796a515410a8d390215915db9f23c8eab485a06f1297402f440a33715fe8f71a528c1dcbad6e1a3bcaf5a46921d4
15283
+ version: 1.13.4
15284
+ resolution: "object-inspect@npm:1.13.4"
15285
+ checksum: 10c0/d7f8711e803b96ea3191c745d6f8056ce1f2496e530e6a19a0e92d89b0fa3c76d910c31f0aa270432db6bd3b2f85500a376a83aaba849a8d518c8845b3211692
15286
15286
  languageName: node
15287
15287
  linkType: hard
15288
15288
 
@@ -16079,14 +16079,14 @@ __metadata:
16079
16079
  linkType: hard
16080
16080
 
16081
16081
  "postcss-calc@npm:^10.0.2":
16082
- version: 10.1.0
16083
- resolution: "postcss-calc@npm:10.1.0"
16082
+ version: 10.1.1
16083
+ resolution: "postcss-calc@npm:10.1.1"
16084
16084
  dependencies:
16085
16085
  postcss-selector-parser: "npm:^7.0.0"
16086
16086
  postcss-value-parser: "npm:^4.2.0"
16087
16087
  peerDependencies:
16088
16088
  postcss: ^8.4.38
16089
- checksum: 10c0/63f8f77f2b5f2987f0ae6b731a1034fabbb777fbec3f778662351b6c9ae006d431daca1e3e2c315acfa3aa94b3e4c1b71c4e76c6b9a8d5321398814e84446415
16089
+ checksum: 10c0/616d3b7b15a524fa86ff1b2be7d9f2369c7794fd44c946f117380e519b064e9ac8d1414ea29de0238b130f2b2a5eb2fb59758cc5478af40b04a012992fb1075b
16090
16090
  languageName: node
16091
16091
  linkType: hard
16092
16092
 
@@ -18927,28 +18927,28 @@ __metadata:
18927
18927
  linkType: hard
18928
18928
 
18929
18929
  "rollup@npm:^4.13.0":
18930
- version: 4.32.1
18931
- resolution: "rollup@npm:4.32.1"
18932
- dependencies:
18933
- "@rollup/rollup-android-arm-eabi": "npm:4.32.1"
18934
- "@rollup/rollup-android-arm64": "npm:4.32.1"
18935
- "@rollup/rollup-darwin-arm64": "npm:4.32.1"
18936
- "@rollup/rollup-darwin-x64": "npm:4.32.1"
18937
- "@rollup/rollup-freebsd-arm64": "npm:4.32.1"
18938
- "@rollup/rollup-freebsd-x64": "npm:4.32.1"
18939
- "@rollup/rollup-linux-arm-gnueabihf": "npm:4.32.1"
18940
- "@rollup/rollup-linux-arm-musleabihf": "npm:4.32.1"
18941
- "@rollup/rollup-linux-arm64-gnu": "npm:4.32.1"
18942
- "@rollup/rollup-linux-arm64-musl": "npm:4.32.1"
18943
- "@rollup/rollup-linux-loongarch64-gnu": "npm:4.32.1"
18944
- "@rollup/rollup-linux-powerpc64le-gnu": "npm:4.32.1"
18945
- "@rollup/rollup-linux-riscv64-gnu": "npm:4.32.1"
18946
- "@rollup/rollup-linux-s390x-gnu": "npm:4.32.1"
18947
- "@rollup/rollup-linux-x64-gnu": "npm:4.32.1"
18948
- "@rollup/rollup-linux-x64-musl": "npm:4.32.1"
18949
- "@rollup/rollup-win32-arm64-msvc": "npm:4.32.1"
18950
- "@rollup/rollup-win32-ia32-msvc": "npm:4.32.1"
18951
- "@rollup/rollup-win32-x64-msvc": "npm:4.32.1"
18930
+ version: 4.34.4
18931
+ resolution: "rollup@npm:4.34.4"
18932
+ dependencies:
18933
+ "@rollup/rollup-android-arm-eabi": "npm:4.34.4"
18934
+ "@rollup/rollup-android-arm64": "npm:4.34.4"
18935
+ "@rollup/rollup-darwin-arm64": "npm:4.34.4"
18936
+ "@rollup/rollup-darwin-x64": "npm:4.34.4"
18937
+ "@rollup/rollup-freebsd-arm64": "npm:4.34.4"
18938
+ "@rollup/rollup-freebsd-x64": "npm:4.34.4"
18939
+ "@rollup/rollup-linux-arm-gnueabihf": "npm:4.34.4"
18940
+ "@rollup/rollup-linux-arm-musleabihf": "npm:4.34.4"
18941
+ "@rollup/rollup-linux-arm64-gnu": "npm:4.34.4"
18942
+ "@rollup/rollup-linux-arm64-musl": "npm:4.34.4"
18943
+ "@rollup/rollup-linux-loongarch64-gnu": "npm:4.34.4"
18944
+ "@rollup/rollup-linux-powerpc64le-gnu": "npm:4.34.4"
18945
+ "@rollup/rollup-linux-riscv64-gnu": "npm:4.34.4"
18946
+ "@rollup/rollup-linux-s390x-gnu": "npm:4.34.4"
18947
+ "@rollup/rollup-linux-x64-gnu": "npm:4.34.4"
18948
+ "@rollup/rollup-linux-x64-musl": "npm:4.34.4"
18949
+ "@rollup/rollup-win32-arm64-msvc": "npm:4.34.4"
18950
+ "@rollup/rollup-win32-ia32-msvc": "npm:4.34.4"
18951
+ "@rollup/rollup-win32-x64-msvc": "npm:4.34.4"
18952
18952
  "@types/estree": "npm:1.0.6"
18953
18953
  fsevents: "npm:~2.3.2"
18954
18954
  dependenciesMeta:
@@ -18994,7 +18994,7 @@ __metadata:
18994
18994
  optional: true
18995
18995
  bin:
18996
18996
  rollup: dist/bin/rollup
18997
- checksum: 10c0/b40339d207ee873d5cb78456381d11be367ed44bf02506bb7b1e70ad24537b4e2f06f7b24a1d9dff054c34330e032cfbedecf217228dfdc850d421b49d640144
18997
+ checksum: 10c0/a81e2268be82ce431714ab13214b75750a066f9c5e3a29cc085963a4dd2f3bbff0b17c0a14227c0499aa513a5f3271622158e2bc3cc33a5462ee958a22f5517a
18998
18998
  languageName: node
18999
18999
  linkType: hard
19000
19000
 
@@ -19276,11 +19276,11 @@ __metadata:
19276
19276
  linkType: hard
19277
19277
 
19278
19278
  "semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.5.3, semver@npm:^7.5.4":
19279
- version: 7.7.0
19280
- resolution: "semver@npm:7.7.0"
19279
+ version: 7.7.1
19280
+ resolution: "semver@npm:7.7.1"
19281
19281
  bin:
19282
19282
  semver: bin/semver.js
19283
- checksum: 10c0/bcd1c03209b4be7d8ca86c976a0410beba7d4ec1d49d846a4be154b958db1ff5eaee50760c1d4f4070b19dee3236b8672d3e09642c53ea23740398bba2538a2d
19283
+ checksum: 10c0/fd603a6fb9c399c6054015433051bdbe7b99a940a8fb44b85c2b524c4004b023d7928d47cb22154f8d054ea7ee8597f586605e05b52047f048278e4ac56ae958
19284
19284
  languageName: node
19285
19285
  linkType: hard
19286
19286
 
@@ -20573,8 +20573,8 @@ __metadata:
20573
20573
  linkType: hard
20574
20574
 
20575
20575
  "terser@npm:^5.3.4":
20576
- version: 5.37.0
20577
- resolution: "terser@npm:5.37.0"
20576
+ version: 5.38.0
20577
+ resolution: "terser@npm:5.38.0"
20578
20578
  dependencies:
20579
20579
  "@jridgewell/source-map": "npm:^0.3.3"
20580
20580
  acorn: "npm:^8.8.2"
@@ -20582,7 +20582,7 @@ __metadata:
20582
20582
  source-map-support: "npm:~0.5.20"
20583
20583
  bin:
20584
20584
  terser: bin/terser
20585
- checksum: 10c0/ff0dc79b0a0da821e7f5bf7a047eab6d04e70e88b62339a0f1d71117db3310e255f5c00738fa3b391f56c3571f800a00047720261ba04ced0241c1f9922199f4
20585
+ checksum: 10c0/49f681fcdf3818160479eea8e415842f1716184853fc21fb0b2046ce8ef889e4e07d6c908c98895b2c53e6447ed558fbba7e20ac8adfe10a17d5764c63836185
20586
20586
  languageName: node
20587
20587
  linkType: hard
20588
20588
 
@@ -21763,9 +21763,9 @@ __metadata:
21763
21763
  linkType: hard
21764
21764
 
21765
21765
  "vscode-uri@npm:^3.0.8":
21766
- version: 3.0.8
21767
- resolution: "vscode-uri@npm:3.0.8"
21768
- checksum: 10c0/f7f217f526bf109589969fe6e66b71e70b937de1385a1d7bb577ca3ee7c5e820d3856a86e9ff2fa9b7a0bc56a3dd8c3a9a557d3fedd7df414bc618d5e6b567f9
21766
+ version: 3.1.0
21767
+ resolution: "vscode-uri@npm:3.1.0"
21768
+ checksum: 10c0/5f6c9c10fd9b1664d71fab4e9fbbae6be93c7f75bb3a1d9d74399a88ab8649e99691223fd7cef4644376cac6e94fa2c086d802521b9a8e31c5af3e60f0f35624
21769
21769
  languageName: node
21770
21770
  linkType: hard
21771
21771