@licklist/design 0.71.18-dev.3 → 0.71.18-dev.4

package/dist/iframe/payment/order-items-table/hooks/useTableData.js

@@ -1,10 +1,10 @@
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { useMemo } from 'react';
-import { uniqueId } from 'lodash';
+import { flatten, flatMap, uniqueId } from 'lodash';
 import { useIntl } from 'react-intl';
 import { useTranslation } from 'react-i18next';
 import { PAYMENT_TYPE_NET_PROFIT, PAYMENT_TYPE_FEE, PAYMENT_TYPE_VAT } from '@licklist/core/dist/DataMapper/Order/PaymentDataMapper';
-import { getTotalSumByCategory, getProductQuantityAndPrice } from '../utils/index.js';
+import { getTotalSumByCategory } from '../utils/index.js';
 import { getOrderSummaryItems } from '../utils/paymentSummary.js';
 
 function _array_like_to_array(arr, len) {
@@ -74,14 +74,68 @@ var useTableData = function(param) {
             price: wrapLabelContent("".concat(t('total'), ": ").concat(formatPrice(getTotalSumByCategory(order.orderProducts, products))))
         };
     };
-    var renderProductItem = function(product) {
-        var _getProductQuantityAndPrice = getProductQuantityAndPrice(order.orderProducts, product), quantity = _getProductQuantityAndPrice.quantity, price = _getProductQuantityAndPrice.price;
-        if (quantity === 0) {
+    var reworkProductStructure = function(order) {
+        return order ? flatMap(order, function(item) {
+            if (!item || !Array.isArray(item)) return [];
+            return item.map(function(modGroup, idx) {
+                var _order_deletedAt, _order_orderId, _order_price, _order_productId, _modGroup_productQuantity, _order_deposit;
+                return {
+                    deletedAt: (_order_deletedAt = order.deletedAt) !== null && _order_deletedAt !== void 0 ? _order_deletedAt : null,
+                    id: "".concat(order.id, "-").concat(idx + 1),
+                    orderId: (_order_orderId = order.orderId) !== null && _order_orderId !== void 0 ? _order_orderId : null,
+                    price: (_order_price = order.price) !== null && _order_price !== void 0 ? _order_price : 0,
+                    productId: (_order_productId = order.productId) !== null && _order_productId !== void 0 ? _order_productId : '',
+                    quantity: (_modGroup_productQuantity = modGroup.productQuantity) !== null && _modGroup_productQuantity !== void 0 ? _modGroup_productQuantity : 1,
+                    deposit: (_order_deposit = order.deposit) !== null && _order_deposit !== void 0 ? _order_deposit : 0,
+                    orderProductModifiers: modGroup.modifiers.map(function(mod) {
+                        var _mod_modifierId, _mod_price, _mod_productId, _mod_quantity, _mod_modifierSetId, _mod_modifier;
+                        return {
+                            modifierId: (_mod_modifierId = mod.modifierId) !== null && _mod_modifierId !== void 0 ? _mod_modifierId : '',
+                            price: (_mod_price = mod.price) !== null && _mod_price !== void 0 ? _mod_price : 0,
+                            productId: (_mod_productId = mod.productId) !== null && _mod_productId !== void 0 ? _mod_productId : '',
+                            quantity: (_mod_quantity = mod.quantity) !== null && _mod_quantity !== void 0 ? _mod_quantity : 1,
+                            modifierSetId: (_mod_modifierSetId = mod.modifierSetId) !== null && _mod_modifierSetId !== void 0 ? _mod_modifierSetId : '',
+                            modifier: (_mod_modifier = mod.modifier) !== null && _mod_modifier !== void 0 ? _mod_modifier : null
+                        };
+                    })
+                };
+            });
+        }) : [];
+    };
+    var renderProductItem = function(param) {
+        var product = param.product, productsForCategory = param.productsForCategory;
+        var _productsForCategory_find, _product_orderProductModifiers;
+        if (product.quantity === 0) {
             return null;
         }
+        var name = ((_productsForCategory_find = productsForCategory.find(function(item) {
+            return item.id === product.productId;
+        })) === null || _productsForCategory_find === void 0 ? void 0 : _productsForCategory_find.name) || '';
         return {
             key: product.id,
-            name: product.name,
+            name: name,
+            quantity: /*#__PURE__*/ jsxs("div", {
+                className: "quantity",
+                children: [
+                    /*#__PURE__*/ jsx("div", {
+                        className: "multiplier",
+                        children: "x"
+                    }),
+                    product.quantity
+                ]
+            }),
+            price: formatPrice(product.price),
+            modifier: (product === null || product === void 0 ? void 0 : (_product_orderProductModifiers = product.orderProductModifiers) === null || _product_orderProductModifiers === void 0 ? void 0 : _product_orderProductModifiers.map(renderModifierItem)) || []
+        };
+    };
+    var renderModifierItem = function(orderModifier) {
+        var quantity = orderModifier.quantity, modifier = orderModifier.modifier, modifierId = orderModifier.modifierId, price = orderModifier.price;
+        if (quantity === 0) {
+            return null;
+        }
+        return {
+            key: modifierId,
+            name: " - ".concat((modifier === null || modifier === void 0 ? void 0 : modifier.name) || ''),
             quantity: /*#__PURE__*/ jsxs("div", {
                 className: "quantity",
                 children: [
@@ -100,19 +154,38 @@ var useTableData = function(param) {
             return product.productCategoryId;
         })));
         return productCategories.reduce(function(previousValues, categoryId) {
-            var products = order.products.filter(function(product) {
+            var productsForCategory = order === null || order === void 0 ? void 0 : order.products.filter(function(product) {
                 return product.productCategoryId === categoryId;
             });
+            var products = order.orderProducts.filter(function(el) {
+                return productsForCategory.map(function(product) {
+                    return product.id;
+                }).includes(el.productId);
+            });
             if (!products.length) {
                 return previousValues;
             }
-            var filteredProducts = products.map(renderProductItem).filter(Boolean);
+            var productsWithReworkedModifier = products.map(function(product) {
+                if (!product.orderProductModifiers.length) return product;
+                return reworkProductStructure(product);
+            });
+            var filteredProducts = flatten(productsWithReworkedModifier).map(function(product) {
+                return renderProductItem({
+                    product: product,
+                    productsForCategory: productsForCategory
+                });
+            });
+            var productWithModifier = flatMap(filteredProducts, function(item) {
+                return [
+                    item
+                ].concat(_to_consumable_array(item.modifier));
+            });
             if (!filteredProducts.length) {
                 return previousValues;
             }
             return _to_consumable_array(previousValues).concat([
-                renderCategoryItem(products)
-            ], _to_consumable_array(filteredProducts));
+                renderCategoryItem(productsForCategory)
+            ], _to_consumable_array(productWithModifier));
         }, []);
     };
     var renderSummaryItems = function(summaryItems) {

package/dist/iframe/payment/order-items-table/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/iframe/payment/order-items-table/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EAEN,MAAM,sDAAsD,CAAA;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,0DAA0D,CAAA;AAElF,OAAO,EAAE,aAAa,EAAE,MAAM,8DAA8D,CAAA;AAS5F,oBAAY,mBAAmB;IAC7B,GAAG,QAAQ;IACX,UAAU,eAAe;IACzB,GAAG,QAAQ;CACZ;AAED,UAAU,qBAAqB;IAC7B,YAAY,EAAE,MAAM,CAAA;IACpB,KAAK,EAAE,MAAM,CAAA;CACd;AAED,eAAO,MAAM,mBAAmB,UACvB,KAAK,2BACa,qBAAqB,EAAE,WAsBjD,CAAA;AAED,eAAO,MAAM,sBAAsB,aAAc,KAAK,CAAC,UAAU,CAAC,WAUjE,CAAA;AAED,eAAO,MAAM,0BAA0B,kBACtB,KAAK,CAAC,eAAe,CAAC,WAC5B,OAAO;;;CAMjB,CAAA;AAED,eAAO,MAAM,qBAAqB,aACtB,KAAK,CAAC,UAAU,CAAC,oBACT,MAAM,KACvB,MAgCF,CAAA;AAED,eAAO,MAAM,wBAAwB,kBAAmB,aAAa;;;GAIhE,CAAA;AAEL,eAAO,MAAM,qBAAqB,kBACjB,KAAK,CAAC,eAAe,CAAC,YAC3B,OAAO,EAAE,WASd,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/iframe/payment/order-items-table/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EAEN,MAAM,sDAAsD,CAAA;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,0DAA0D,CAAA;AAElF,OAAO,EAAE,aAAa,EAAE,MAAM,8DAA8D,CAAA;AAU5F,oBAAY,mBAAmB;IAC7B,GAAG,QAAQ;IACX,UAAU,eAAe;IACzB,GAAG,QAAQ;CACZ;AAED,UAAU,qBAAqB;IAC7B,YAAY,EAAE,MAAM,CAAA;IACpB,KAAK,EAAE,MAAM,CAAA;CACd;AAED,eAAO,MAAM,mBAAmB,UACvB,KAAK,2BACa,qBAAqB,EAAE,WAuBjD,CAAA;AAED,eAAO,MAAM,sBAAsB,aAAc,KAAK,CAAC,UAAU,CAAC,WAUjE,CAAA;AAED,eAAO,MAAM,0BAA0B,kBACtB,KAAK,CAAC,eAAe,CAAC,WAC5B,OAAO;;;CAMjB,CAAA;AAED,eAAO,MAAM,qBAAqB,aACtB,KAAK,CAAC,UAAU,CAAC,oBACT,MAAM,KACvB,MAgCF,CAAA;AAED,eAAO,MAAM,wBAAwB,kBAAmB,aAAa;;;GAIhE,CAAA;AAEL,eAAO,MAAM,qBAAqB,kBACjB,KAAK,CAAC,eAAe,CAAC,YAC3B,OAAO,EAAE,WA8Bd,CAAA"}

package/dist/iframe/payment/order-items-table/utils/index.js

@@ -91,7 +91,22 @@ var getExternalPaymentDetail = function(paymentDetail) {
 };
 var getTotalSumByCategory = function(orderProducts, products) {
     return products.reduce(function(prevSum, product) {
+        var _orderProducts_find;
         var _getProductQuantityAndPrice = getProductQuantityAndPrice(orderProducts, product), quantity = _getProductQuantityAndPrice.quantity, price = _getProductQuantityAndPrice.price;
+        var modifierFromProduct = (_orderProducts_find = orderProducts.find(function(orderProduct) {
+            return orderProduct.productId === product.id;
+        })) === null || _orderProducts_find === void 0 ? void 0 : _orderProducts_find.orderProductModifiers;
+        if (modifierFromProduct) {
+            var modifierPrice = modifierFromProduct.reduce(function(prevSum, param) {
+                var modifiers = param.modifiers;
+                var modifiersPrices = modifiers.reduce(function(prevSumModifier, modifier) {
+                    return prevSumModifier + modifier.price * modifier.quantity;
+                }, 0);
+                return prevSum + modifiersPrices;
+            }, 0);
+            var priceWithModifier = price + modifierPrice;
+            return prevSum + priceWithModifier * quantity;
+        }
         return prevSum + price * quantity;
     }, 0);
 };

package/dist/iframe/payment/order-items-table/utils/paymentSummary.js

@@ -30,7 +30,7 @@ function _unsupported_iterable_to_array(o, minLen) {
 var paymentNotProcessedSummary = function(param) {
     var order = param.order, externalDiscount = param.externalDiscount, paymentDetail = param.paymentDetail;
     var externalPaymentDetail = paymentDetail ? getExternalPaymentDetail(paymentDetail) : undefined;
-    var total = calculateTotalPrice(order, externalPaymentDetail);
+    var total = (order === null || order === void 0 ? void 0 : order.fullAmount) || calculateTotalPrice(order, externalPaymentDetail);
     var summaryItems = [
         {
             translateKey: AMOUNT_TOTAL,
@@ -56,7 +56,7 @@ var processedPaymentSummary = function(param) {
             price: getPaymentValueByType(order.payments, key)
         };
     });
-    var total = calculateTotalPrice(order, externalPaymentDetail);
+    var total = order.fullAmount || calculateTotalPrice(order, externalPaymentDetail);
     var totalDiscount = calculateTotalDiscount(order.payments);
     var summaryItems = [
         {

package/dist/product-set/form/ProductSetForm.d.ts

@@ -1,6 +1,7 @@
 import { FormValues } from '@licklist/plugins/dist/types/services/Form/hook-form-service';
 import { VenueMapSet } from '@licklist/core/dist/DataMapper/Product/VenueMapSetDataMapper';
 import { ServerError } from '@licklist/plugins/dist/hooks/Api/useHttpQuery';
+import { ModifierSet } from '@licklist/core/dist/DataMapper/Product/ModifierSetDataMapper';
 import { ProviderBookingManagementSetting } from '@licklist/core/dist/DataMapper/Provider/ProviderBookingManagementSettingDataMapper';
 import { Zone } from '@licklist/core/dist/DataMapper/Provider/ZoneDataMapper';
 import { WorkHour } from '@licklist/core/dist/DataMapper/Provider/WorkHourDataMapper';
@@ -37,6 +38,7 @@ export interface ProductSetFormProps extends WithIsLoading, ProductSetControlSha
     saleDeadline?: number;
     isCreateNewOverrides?: boolean;
     timeZone: string;
+    modifiersSetList?: ModifierSet[];
 }
-export declare function ProductSetForm({ companyName, isLoading, defaultValues, onSubmitAndRedirect, onSubmitNoRedirect, productGroupList, serverErrors, providerHasMap, venueMapSets, providerHasBookingManagement, zones, isCreateAction, workHours, saleDeadline, isOverrides, isCreateNewOverrides, timeZone, ...shared }: ProductSetFormProps): import("react/jsx-runtime").JSX.Element;
+export declare function ProductSetForm({ companyName, isLoading, defaultValues, onSubmitAndRedirect, onSubmitNoRedirect, productGroupList, modifiersSetList, serverErrors, providerHasMap, venueMapSets, providerHasBookingManagement, zones, isCreateAction, workHours, saleDeadline, isOverrides, isCreateNewOverrides, timeZone, ...shared }: ProductSetFormProps): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=ProductSetForm.d.ts.map

package/dist/product-set/form/ProductSetForm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProductSetForm.d.ts","sourceRoot":"","sources":["../../../src/product-set/form/ProductSetForm.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,8DAA8D,CAAA;AAIzF,OAAO,EAAE,WAAW,EAAE,MAAM,8DAA8D,CAAA;AAC1F,OAAO,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAA;AAK3E,OAAO,EAAE,gCAAgC,EAAE,MAAM,oFAAoF,CAAA;AACrI,OAAO,EAAE,IAAI,EAAE,MAAM,wDAAwD,CAAA;AAC7E,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAA;AAGrF,OAAO,EAEL,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAA;AAE/B,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAA;AAI3D,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,OAAO,CAAA;CACnB;AACD,MAAM,WAAW,cAAc;IAC7B,EAAE,CAAC,EAAE,MAAM,CAAA;CACZ;AAED,MAAM,WAAW,MAAM;IACrB,EAAE,EAAE,MAAM,CAAA;CACX;AACD,MAAM,WAAW,oBACf,SAAQ,UAAU,EAChB,cAAc,EACd,uBAAuB;IACzB,KAAK,EAAE,IAAI,EAAE,CAAA;IACb,WAAW,CAAC,EAAE,OAAO,CAAA;CACtB;AAED,MAAM,WAAW,mBACf,SAAQ,aAAa,EACnB,uBAAuB;IACzB,WAAW,EAAE,MAAM,CAAA;IACnB,aAAa,CAAC,EAAE,oBAAoB,CAAA;IACpC,mBAAmB,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,CAAA;IAC3D,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,CAAA;IAC3D,gBAAgB,CAAC,EAAE,UAAU,EAAE,CAAA;IAC/B,YAAY,CAAC,EAAE,WAAW,CAAA;IAC1B,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,YAAY,CAAC,EAAE,WAAW,EAAE,CAAA;IAC5B,4BAA4B,CAAC,EAAE,gCAAgC,CAAC,sBAAsB,CAAC,CAAA;IACvF,KAAK,CAAC,EAAE,IAAI,EAAE,GAAG,IAAI,CAAA;IACrB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAA;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,wBAAgB,cAAc,CAAC,EAC7B,WAAW,EACX,SAAS,EACT,aAAa,EACb,mBAAmB,EACnB,kBAAkB,EAClB,gBAAgB,EAChB,YAAY,EACZ,cAAsB,EACtB,YAAiB,EACjB,4BAA4B,EAC5B,KAAK,EACL,cAAc,EACd,SAAS,EACT,YAAY,EACZ,WAAW,EACX,oBAAoB,EACpB,QAAQ,EACR,GAAG,MAAM,EACV,EAAE,mBAAmB,2CAiKrB"}
+{"version":3,"file":"ProductSetForm.d.ts","sourceRoot":"","sources":["../../../src/product-set/form/ProductSetForm.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,8DAA8D,CAAA;AAIzF,OAAO,EAAE,WAAW,EAAE,MAAM,8DAA8D,CAAA;AAC1F,OAAO,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAA;AAE3E,OAAO,EAAE,WAAW,EAAE,MAAM,8DAA8D,CAAA;AAI1F,OAAO,EAAE,gCAAgC,EAAE,MAAM,oFAAoF,CAAA;AACrI,OAAO,EAAE,IAAI,EAAE,MAAM,wDAAwD,CAAA;AAC7E,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAA;AAGrF,OAAO,EAEL,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAA;AAE/B,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAA;AAQ3D,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,OAAO,CAAA;CACnB;AACD,MAAM,WAAW,cAAc;IAC7B,EAAE,CAAC,EAAE,MAAM,CAAA;CACZ;AAED,MAAM,WAAW,MAAM;IACrB,EAAE,EAAE,MAAM,CAAA;CACX;AACD,MAAM,WAAW,oBACf,SAAQ,UAAU,EAChB,cAAc,EACd,uBAAuB;IACzB,KAAK,EAAE,IAAI,EAAE,CAAA;IACb,WAAW,CAAC,EAAE,OAAO,CAAA;CACtB;AAED,MAAM,WAAW,mBACf,SAAQ,aAAa,EACnB,uBAAuB;IACzB,WAAW,EAAE,MAAM,CAAA;IACnB,aAAa,CAAC,EAAE,oBAAoB,CAAA;IACpC,mBAAmB,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,CAAA;IAC3D,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,CAAA;IAC3D,gBAAgB,CAAC,EAAE,UAAU,EAAE,CAAA;IAC/B,YAAY,CAAC,EAAE,WAAW,CAAA;IAC1B,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,YAAY,CAAC,EAAE,WAAW,EAAE,CAAA;IAC5B,4BAA4B,CAAC,EAAE,gCAAgC,CAAC,sBAAsB,CAAC,CAAA;IACvF,KAAK,CAAC,EAAE,IAAI,EAAE,GAAG,IAAI,CAAA;IACrB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAA;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,QAAQ,EAAE,MAAM,CAAA;IAChB,gBAAgB,CAAC,EAAE,WAAW,EAAE,CAAA;CACjC;AAED,wBAAgB,cAAc,CAAC,EAC7B,WAAW,EACX,SAAS,EACT,aAAa,EACb,mBAAmB,EACnB,kBAAkB,EAClB,gBAAgB,EAChB,gBAAgB,EAChB,YAAY,EACZ,cAAsB,EACtB,YAAiB,EACjB,4BAA4B,EAC5B,KAAK,EACL,cAAc,EACd,SAAS,EACT,YAAY,EACZ,WAAW,EACX,oBAAoB,EACpB,QAAQ,EACR,GAAG,MAAM,EACV,EAAE,mBAAmB,2CAkKrB"}

package/dist/product-set/form/ProductSetForm.js

@@ -10,7 +10,7 @@ import { Dialog } from '../../modals/dialog/Dialog.js';
 import { useDialogContext } from '../../modals/dialog/DialogContext.js';
 import { ProductSetControl } from '../control/ProductSetControl.js';
 import { ProductSetContextProvider, ProductSetLoadingContext } from './context.js';
-import { getFilteredTemplates, checkAvailableTimesErrors } from '../utils/index.js';
+import { updateModifiersSetAtProductSetForm, getFilteredTemplates, checkAvailableTimesErrors } from '../utils/index.js';
 import { ErrorModal } from '../../iframe/order-process/components/ErrorModal/ErrorModal.js';
 
 function _array_like_to_array(arr, len) {
@@ -139,13 +139,14 @@ function _unsupported_iterable_to_array(o, minLen) {
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
 function ProductSetForm(_param) {
-    var companyName = _param.companyName, isLoading = _param.isLoading, defaultValues = _param.defaultValues, onSubmitAndRedirect = _param.onSubmitAndRedirect, onSubmitNoRedirect = _param.onSubmitNoRedirect, productGroupList = _param.productGroupList, serverErrors = _param.serverErrors, _param_providerHasMap = _param.providerHasMap, providerHasMap = _param_providerHasMap === void 0 ? false : _param_providerHasMap, _param_venueMapSets = _param.venueMapSets, venueMapSets = _param_venueMapSets === void 0 ? [] : _param_venueMapSets, providerHasBookingManagement = _param.providerHasBookingManagement, zones = _param.zones, isCreateAction = _param.isCreateAction, workHours = _param.workHours; _param.saleDeadline; var isOverrides = _param.isOverrides, isCreateNewOverrides = _param.isCreateNewOverrides, timeZone = _param.timeZone, shared = _object_without_properties(_param, [
+    var companyName = _param.companyName, isLoading = _param.isLoading, defaultValues = _param.defaultValues, onSubmitAndRedirect = _param.onSubmitAndRedirect, onSubmitNoRedirect = _param.onSubmitNoRedirect, productGroupList = _param.productGroupList, modifiersSetList = _param.modifiersSetList, serverErrors = _param.serverErrors, _param_providerHasMap = _param.providerHasMap, providerHasMap = _param_providerHasMap === void 0 ? false : _param_providerHasMap, _param_venueMapSets = _param.venueMapSets, venueMapSets = _param_venueMapSets === void 0 ? [] : _param_venueMapSets, providerHasBookingManagement = _param.providerHasBookingManagement, zones = _param.zones, isCreateAction = _param.isCreateAction, workHours = _param.workHours; _param.saleDeadline; var isOverrides = _param.isOverrides, isCreateNewOverrides = _param.isCreateNewOverrides, timeZone = _param.timeZone, shared = _object_without_properties(_param, [
         "companyName",
         "isLoading",
         "defaultValues",
         "onSubmitAndRedirect",
         "onSubmitNoRedirect",
         "productGroupList",
+        "modifiersSetList",
         "serverErrors",
         "providerHasMap",
         "venueMapSets",
@@ -162,7 +163,7 @@ function ProductSetForm(_param) {
     var _useDialogContext = useDialogContext(), isShownDialog = _useDialogContext.isShownDialog, onBeforeUnload = _useDialogContext.onBeforeUnload, onPopState = _useDialogContext.onPopState, onApproveDialog = _useDialogContext.onApproveDialog, onDeclineDialog = _useDialogContext.onDeclineDialog;
     var _useState = _sliced_to_array(useState(''), 2), errorMessage = _useState[0], setErrorMessage = _useState[1];
     var form = useForm({
-        defaultValues: defaultValues,
+        defaultValues: updateModifiersSetAtProductSetForm(defaultValues),
         mode: 'onChange'
     });
     var setError = form.setError, reset = form.reset;
@@ -183,7 +184,7 @@ function ProductSetForm(_param) {
         if (!defaultValues || isEqual(defaultValues, formValues)) {
             return;
         }
-        reset(defaultValues);
+        reset(updateModifiersSetAtProductSetForm(defaultValues));
     // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
         defaultValues
@@ -217,6 +218,7 @@ function ProductSetForm(_param) {
     return /*#__PURE__*/ jsxs(ProductSetContextProvider, {
         productGroupList: productGroupList,
         providerHasMap: providerHasMap,
+        modifiersSetList: modifiersSetList,
         venueMapSets: venueMapSets,
         providerHasBookingManagement: providerHasBookingManagement,
         zones: zones,

package/dist/product-set/form/ProductsControl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProductsControl.d.ts","sourceRoot":"","sources":["../../../src/product-set/form/ProductsControl.tsx"],"names":[],"mappings":"AAeA,OAAO,EAAE,YAAY,EAAE,MAAM,kEAAkE,CAAA;AAC/F,OAAO,EAAkB,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,IAAI,CAAA;AAI9E,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAQhD,UAAU,oBAAqB,SAAQ,aAAa;IAClD,YAAY,EAAE,mBAAmB,CAAC,oBAAoB,CAAC,CAAC,cAAc,CAAC,CAAA;IACvE,SAAS,EAAE,MAAM,CAAA;IACjB,oBAAoB,EAAE,MAAM,CAAA;IAC5B,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,YAAY,EAAE,YAAY,CAAA;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAC/B,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AA6BD,wBAAgB,eAAe,CAAC,EAC9B,SAAS,EACT,YAAY,EACZ,SAAS,EACT,oBAAoB,EACpB,SAAS,EACT,YAAY,EACZ,WAAW,EACX,qBAAqB,EACrB,oBAAoB,GACrB,EAAE,oBAAoB,2CAkOtB"}
+{"version":3,"file":"ProductsControl.d.ts","sourceRoot":"","sources":["../../../src/product-set/form/ProductsControl.tsx"],"names":[],"mappings":"AAeA,OAAO,EAAE,YAAY,EAAE,MAAM,kEAAkE,CAAA;AAC/F,OAAO,EAAkB,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,IAAI,CAAA;AAI9E,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAQhD,UAAU,oBAAqB,SAAQ,aAAa;IAClD,YAAY,EAAE,mBAAmB,CAAC,oBAAoB,CAAC,CAAC,cAAc,CAAC,CAAA;IACvE,SAAS,EAAE,MAAM,CAAA;IACjB,oBAAoB,EAAE,MAAM,CAAA;IAC5B,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,YAAY,EAAE,YAAY,CAAA;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAC/B,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AA+BD,wBAAgB,eAAe,CAAC,EAC9B,SAAS,EACT,YAAY,EACZ,SAAS,EACT,oBAAoB,EACpB,SAAS,EACT,YAAY,EACZ,WAAW,EACX,qBAAqB,EACrB,oBAAoB,GACrB,EAAE,oBAAoB,2CAyOtB"}

package/dist/product-set/form/ProductsControl.js

@@ -112,6 +112,8 @@ var getDefaultProductValue = function(sort) {
         maxQuantity: null,
         totalQuantity: 0,
         isAvailable: true,
+        modifiersSet: [],
+        modifiersSetsId: [],
         isSoldOut: false,
         isRequired: false,
         isUnlimited: false,
@@ -210,6 +212,7 @@ function ProductsControl(param) {
                 ],
                 children: fields.map(function(product, index) {
                     var isOverridesProductSet = isEventEditProductSet ? !!product.id : isOverrides && !!product.originalProductId;
+                    var modifierSets = (product === null || product === void 0 ? void 0 : product.modifiersSet.length) || 0;
                     var isNewProductOverrides = isCreateNewOverrides && !!product.id;
                     return /*#__PURE__*/ jsx(Controller, {
                         control: control,
@@ -240,13 +243,22 @@ function ProductsControl(param) {
                                 },
                                 secondaryBadge: getBadgeConfig(categoryType, t(categoryType)),
                                 subTitle: /*#__PURE__*/ jsxs("div", {
-                                    className: "product-set-badges-container",
+                                    className: "d-flex justify-content-between",
                                     children: [
-                                        /*#__PURE__*/ jsx("div", {
-                                            className: "product-set-subtitle-dot product-set-subtitle-product-dot"
+                                        /*#__PURE__*/ jsxs("div", {
+                                            className: "product-set-badges-container",
+                                            children: [
+                                                /*#__PURE__*/ jsx("div", {
+                                                    className: "product-set-subtitle-dot product-set-subtitle-product-dot"
+                                                }),
+                                                /*#__PURE__*/ jsx("span", {
+                                                    children: "\xa3".concat(prices[index], " ").concat(t('each'), " - ").concat(t('qty'), ":").concat(!isUnlimitedQuantities[index] ? " ".concat(quantities[index]) : t(' unlimited'), " ").concat(!isUnlimitedQuantities[index] ? " - ".concat(t('possibleRevenue'), " \xa3").concat(prices[index] * quantities[index]) : '', " ")
+                                                })
+                                            ]
                                         }),
-                                        /*#__PURE__*/ jsx("span", {
-                                            children: "\xa3".concat(prices[index], " ").concat(t('each'), " - ").concat(t('qty'), ":").concat(!isUnlimitedQuantities[index] ? " ".concat(quantities[index]) : t(' unlimited'), " ").concat(!isUnlimitedQuantities[index] ? " - ".concat(t('possibleRevenue'), " \xa3").concat(prices[index] * quantities[index]) : '', " ")
+                                        !!modifierSets && /*#__PURE__*/ jsx(Badge, {
+                                            className: "modifier-badge",
+                                            children: "".concat(modifierSets, " ").concat(t('modifiersSets'))
                                         })
                                     ]
                                 }),

package/dist/product-set/form/context.d.ts

@@ -1,5 +1,6 @@
 import { PropsWithChildren, SetStateAction, Dispatch } from 'react';
 import { VenueMapSet } from '@licklist/core/dist/DataMapper/Product/VenueMapSetDataMapper';
+import { ModifierSet } from '@licklist/core/dist/DataMapper/Product/ModifierSetDataMapper';
 import { ProviderBookingManagementSetting } from '@licklist/core/dist/DataMapper/Provider/ProviderBookingManagementSettingDataMapper';
 import { Zone } from '@licklist/core/dist/DataMapper/Provider/ZoneDataMapper';
 import { SelectItem } from '../../types/generic/SelectItem';
@@ -7,6 +8,7 @@ interface LoadingContext {
     isLoading: boolean;
     setLoading: (loading: boolean) => void;
     productGroupList?: SelectItem[];
+    modifiersSetList?: ModifierSet[] | null;
     providerHasMap?: boolean | null;
     venueMapSets?: VenueMapSet[];
     providerHasBookingManagement?: ProviderBookingManagementSetting['hasBookingManagement'];
@@ -16,6 +18,6 @@ interface LoadingContext {
 }
 export declare const ProductSetLoadingContext: import("react").Context<LoadingContext>;
 type ProductSetContextProviderProps = PropsWithChildren<Omit<LoadingContext, 'isLoading' | 'setLoading' | 'expandedProductCategories' | 'setExpandedProductCategories'>>;
-export declare function ProductSetContextProvider({ children, productGroupList, providerHasMap, venueMapSets, providerHasBookingManagement, zones, }: ProductSetContextProviderProps): import("react/jsx-runtime").JSX.Element;
+export declare function ProductSetContextProvider({ children, productGroupList, modifiersSetList, providerHasMap, venueMapSets, providerHasBookingManagement, zones, }: ProductSetContextProviderProps): import("react/jsx-runtime").JSX.Element;
 export {};
 //# sourceMappingURL=context.d.ts.map

package/dist/product-set/form/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../src/product-set/form/context.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,cAAc,EAId,QAAQ,EACT,MAAM,OAAO,CAAA;AACd,OAAO,EAAE,WAAW,EAAE,MAAM,8DAA8D,CAAA;AAE1F,OAAO,EAAE,gCAAgC,EAAE,MAAM,oFAAoF,CAAA;AACrI,OAAO,EAAE,IAAI,EAAE,MAAM,wDAAwD,CAAA;AAC7E,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAA;AAE3D,UAAU,cAAc;IACtB,SAAS,EAAE,OAAO,CAAA;IAClB,UAAU,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;IACtC,gBAAgB,CAAC,EAAE,UAAU,EAAE,CAAA;IAC/B,cAAc,CAAC,EAAE,OAAO,GAAG,IAAI,CAAA;IAC/B,YAAY,CAAC,EAAE,WAAW,EAAE,CAAA;IAC5B,4BAA4B,CAAC,EAAE,gCAAgC,CAAC,sBAAsB,CAAC,CAAA;IACvF,KAAK,CAAC,EAAE,IAAI,EAAE,GAAG,IAAI,CAAA;IACrB,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAClD,4BAA4B,EAAE,QAAQ,CACpC,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CACxC,CAAA;CACF;AAED,eAAO,MAAM,wBAAwB,yCAEpC,CAAA;AAED,KAAK,8BAA8B,GAAG,iBAAiB,CACrD,IAAI,CACF,cAAc,EACZ,WAAW,GACX,YAAY,GACZ,2BAA2B,GAC3B,8BAA8B,CACjC,CACF,CAAA;AAED,wBAAgB,yBAAyB,CAAC,EACxC,QAAQ,EACR,gBAAqB,EACrB,cAAsB,EACtB,YAAiB,EACjB,4BAA4B,EAC5B,KAAK,GACN,EAAE,8BAA8B,2CA0BhC"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../src/product-set/form/context.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,cAAc,EAId,QAAQ,EACT,MAAM,OAAO,CAAA;AACd,OAAO,EAAE,WAAW,EAAE,MAAM,8DAA8D,CAAA;AAC1F,OAAO,EAAE,WAAW,EAAE,MAAM,8DAA8D,CAAA;AAE1F,OAAO,EAAE,gCAAgC,EAAE,MAAM,oFAAoF,CAAA;AACrI,OAAO,EAAE,IAAI,EAAE,MAAM,wDAAwD,CAAA;AAC7E,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAA;AAG3D,UAAU,cAAc;IACtB,SAAS,EAAE,OAAO,CAAA;IAClB,UAAU,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;IACtC,gBAAgB,CAAC,EAAE,UAAU,EAAE,CAAA;IAC/B,gBAAgB,CAAC,EAAE,WAAW,EAAE,GAAG,IAAI,CAAA;IACvC,cAAc,CAAC,EAAE,OAAO,GAAG,IAAI,CAAA;IAC/B,YAAY,CAAC,EAAE,WAAW,EAAE,CAAA;IAC5B,4BAA4B,CAAC,EAAE,gCAAgC,CAAC,sBAAsB,CAAC,CAAA;IACvF,KAAK,CAAC,EAAE,IAAI,EAAE,GAAG,IAAI,CAAA;IACrB,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAClD,4BAA4B,EAAE,QAAQ,CACpC,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CACxC,CAAA;CACF;AAED,eAAO,MAAM,wBAAwB,yCAEpC,CAAA;AAED,KAAK,8BAA8B,GAAG,iBAAiB,CACrD,IAAI,CACF,cAAc,EACZ,WAAW,GACX,YAAY,GACZ,2BAA2B,GAC3B,8BAA8B,CACjC,CACF,CAAA;AAED,wBAAgB,yBAAyB,CAAC,EACxC,QAAQ,EACR,gBAAqB,EACrB,gBAAoB,EACpB,cAAsB,EACtB,YAAiB,EACjB,4BAA4B,EAC5B,KAAK,GACN,EAAE,8BAA8B,2CA2BhC"}

package/dist/product-set/form/context.js

@@ -49,7 +49,7 @@ function _unsupported_iterable_to_array(o, minLen) {
 }
 var ProductSetLoadingContext = /*#__PURE__*/ createContext(null);
 function ProductSetContextProvider(param) {
-    var children = param.children, _param_productGroupList = param.productGroupList, productGroupList = _param_productGroupList === void 0 ? [] : _param_productGroupList, _param_providerHasMap = param.providerHasMap, providerHasMap = _param_providerHasMap === void 0 ? false : _param_providerHasMap, _param_venueMapSets = param.venueMapSets, venueMapSets = _param_venueMapSets === void 0 ? [] : _param_venueMapSets, providerHasBookingManagement = param.providerHasBookingManagement, zones = param.zones;
+    var children = param.children, _param_productGroupList = param.productGroupList, productGroupList = _param_productGroupList === void 0 ? [] : _param_productGroupList, _param_modifiersSetList = param.modifiersSetList, modifiersSetList = _param_modifiersSetList === void 0 ? [] : _param_modifiersSetList, _param_providerHasMap = param.providerHasMap, providerHasMap = _param_providerHasMap === void 0 ? false : _param_providerHasMap, _param_venueMapSets = param.venueMapSets, venueMapSets = _param_venueMapSets === void 0 ? [] : _param_venueMapSets, providerHasBookingManagement = param.providerHasBookingManagement, zones = param.zones;
     var _useState = _sliced_to_array(useState(undefined), 2), zonesState = _useState[0], setZonesState = _useState[1];
     var _useState1 = _sliced_to_array(useState(false), 2), loading = _useState1[0], setLoading = _useState1[1];
     var _useState2 = _sliced_to_array(useState({}), 2), expandedProductCategories = _useState2[0], setExpandedProductCategories = _useState2[1];
@@ -63,6 +63,7 @@ function ProductSetContextProvider(param) {
             isLoading: loading,
             setLoading: setLoading,
             productGroupList: productGroupList,
+            modifiersSetList: modifiersSetList,
             providerHasMap: providerHasMap,
             venueMapSets: venueMapSets,
             providerHasBookingManagement: providerHasBookingManagement,

package/dist/product-set/product/ProductControl.d.ts

@@ -7,6 +7,12 @@ import { ProductBookingManagementControlProps } from './booking-management/Produ
 import { ProductDepositControlValues } from './deposit/ProductDepositControl';
 import { IsDeletableEvent } from '../types';
 import { ProductZoneControlValues } from '../product-zone';
+export interface ModifiersSet {
+    id: number;
+    value?: string;
+    name?: string;
+    label?: string;
+}
 export interface ProductControlValues extends FormValues, ProductDepositControlValues {
     name: string;
     productGroupId: number;
@@ -26,6 +32,8 @@ export interface ProductControlValues extends FormValues, ProductDepositControlV
     hasSpecialNotes: boolean;
     minSpend?: number | null;
     type?: ProductType;
+    modifiersSetsId?: Array<ModifiersSet>;
+    modifiersSet?: Array<ModifiersSet>;
     weight?: number;
     tierId?: number;
     images: Image[] | null;

package/dist/product-set/product/ProductControl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProductControl.d.ts","sourceRoot":"","sources":["../../../src/product-set/product/ProductControl.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,YAAY,EAIb,MAAM,kEAAkE,CAAA;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,0DAA0D,CAAA;AAGtF,OAAO,EACL,mBAAmB,EACnB,UAAU,EACX,MAAM,8DAA8D,CAAA;AAErE,OAAO,EACL,WAAW,EAKZ,MAAM,OAAO,CAAA;AAed,OAAO,EACL,KAAK,EAEN,MAAM,sDAAsD,CAAA;AAO7D,OAAO,EAEL,oCAAoC,EACrC,MAAM,sDAAsD,CAAA;AAC7D,OAAO,EAEL,2BAA2B,EAC5B,MAAM,iCAAiC,CAAA;AAOxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAG3C,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAA;AAM1D,MAAM,WAAW,oBACf,SAAQ,UAAU,EAChB,2BAA2B;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,cAAc,EAAE,MAAM,CAAA;IACtB,WAAW,EAAE,MAAM,CAAA;IACnB,kBAAkB,EAAE,MAAM,CAAA;IAC1B,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,CAAA;IACf,WAAW,EAAE,MAAM,CAAA;IACnB,WAAW,EAAE,MAAM,CAAA;IACnB,aAAa,EAAE,MAAM,CAAA;IACrB,WAAW,EAAE,OAAO,CAAA;IACpB,SAAS,EAAE,OAAO,CAAA;IAClB,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAA;IAChC,WAAW,EAAE,OAAO,CAAA;IACpB,UAAU,EAAE,OAAO,CAAA;IACnB,gBAAgB,EAAE,MAAM,CAAA;IACxB,eAAe,EAAE,OAAO,CAAA;IACxB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,IAAI,CAAC,EAAE,WAAW,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAA;IACtB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IACnB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,YAAY,CAAC,EAAE,wBAAwB,EAAE,CAAA;CAC1C;AAED,MAAM,WAAW,mBAAmB,CAAC,CAAC,CACpC,SAAQ,gBAAgB,EACtB,mBAAmB,CAAC,CAAC,CAAC,EACtB,oCAAoC,CAAC,CAAC,CAAC;IACzC,SAAS,EAAE,OAAO,CAAA;IAClB,YAAY,EAAE,YAAY,CAAA;IAC1B,aAAa,EAAE,OAAO,CAAA;IACtB,oBAAoB,EAAE,OAAO,CAAA;IAC7B,MAAM,CAAC,EAAE,MAAM,IAAI,CAAA;IACnB,mBAAmB,EAAE,CAAC,CAAC,EAAE,WAAW,CAAC,gBAAgB,CAAC,KAAK,IAAI,CAAA;IAC/D,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,YAAY,CAAC,EAAE,YAAY,CAAA;IAC3B,WAAW,CAAC,EAAE,OAAO,CAAA;CACtB;AAED,wBAAgB,cAAc,CAAC,CAAC,SAAS,UAAU,EAAE,EACnD,SAAiB,EACjB,eAAe,EACf,aAAqB,EACrB,oBAA4B,EAC5B,QAAa,EACb,MAAM,EACN,mBAAmB,EACnB,WAAW,EACX,SAAS,EACT,YAAY,EACZ,WAAmB,GACpB,EAAE,mBAAmB,CAAC,CAAC,CAAC,2CAwWxB"}
+{"version":3,"file":"ProductControl.d.ts","sourceRoot":"","sources":["../../../src/product-set/product/ProductControl.tsx"],"names":[],"mappings":"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"}

package/dist/product-set/product/ProductControl.js

@@ -13,6 +13,8 @@ import { useTranslation } from 'react-i18next';
 import { useImages } from '@licklist/plugins/dist/hooks/Media/useImages';
 import { IMAGE_TYPE_IMAGE } from '@licklist/core/dist/DataMapper/Media/ImageDataMapper';
 import { FaClipboard } from 'react-icons/fa';
+import { Typeahead } from '../../typeahead/Typeahead.js';
+import { convertToTypeaheadOptions } from '../../sales/coupon/utils/index.js';
 import { checkIfZoneCategory } from '@licklist/plugins';
 import { FileUpload } from '../../file-upload/FileUpload.js';
 import '../../static/index.js';
@@ -130,7 +132,7 @@ function _unsupported_iterable_to_array(o, minLen) {
 function ProductControl(param) {
     var _param_isLoading = param.isLoading, isLoading = _param_isLoading === void 0 ? false : _param_isLoading, fieldNamePrefix = param.fieldNamePrefix, _param_allowDeposits = param.allowDeposits, allowDeposits = _param_allowDeposits === void 0 ? false : _param_allowDeposits, _param_hasBookingManagement = param.hasBookingManagement, hasBookingManagement = _param_hasBookingManagement === void 0 ? false : _param_hasBookingManagement, _param_zoneList = param.zoneList, zoneList = _param_zoneList === void 0 ? [] : _param_zoneList, onCopy = param.onCopy, onProductNameChange = param.onProductNameChange, productName = param.productName, hasTicket = param.hasTicket, categoryType = param.categoryType, _param_isOverrides = param.isOverrides, isOverrides = _param_isOverrides === void 0 ? false : _param_isOverrides;
     var _useFormContext = useFormContext(), register = _useFormContext.register, control = _useFormContext.control, errors = _useFormContext.formState.errors, setValue = _useFormContext.setValue, getValues = _useFormContext.getValues, watch = _useFormContext.watch;
-    var setLoading = useContext(ProductSetLoadingContext).setLoading;
+    var _useContext = useContext(ProductSetLoadingContext), setLoading = _useContext.setLoading, modifiersSetList = _useContext.modifiersSetList;
     var t = useTranslation([
         'Design',
         'Validation',
@@ -206,6 +208,7 @@ function ProductControl(param) {
     ]);
     var quantitySelector = quantityValue !== null && quantityValue !== void 0 ? quantityValue : '1';
     var quantity = QUANTITY_TYPE_LIST_DTO[quantitySelector];
+    var modifierList = convertToTypeaheadOptions(modifiersSetList);
     return /*#__PURE__*/ jsxs(Fragment, {
         children: [
             /*#__PURE__*/ jsx(Row, {
@@ -349,6 +352,27 @@ function ProductControl(param) {
                     ]
                 })
             }),
+            /*#__PURE__*/ jsx(Row, {
+                children: /*#__PURE__*/ jsx(Col, {
+                    children: /*#__PURE__*/ jsxs(Form.Group, {
+                        className: "mb-3",
+                        children: [
+                            /*#__PURE__*/ jsx(Form.Label, {
+                                children: t('Design:addModifierSet')
+                            }),
+                            /*#__PURE__*/ jsx(Typeahead, _object_spread_props(_object_spread({
+                                name: "modifierList",
+                                options: modifierList
+                            }, register("".concat(fieldNamePrefix, ".modifiersSet"))), {
+                                isMultipleChoise: true,
+                                isCouponForm: true,
+                                placeholder: t('Design:choose'),
+                                noOptionsMessage: t('Design:noSelectedModifier')
+                            }))
+                        ]
+                    })
+                })
+            }),
             /*#__PURE__*/ jsxs(Row, {
                 className: "my-4 mx-0 d-flex flex-column",
                 children: [

package/dist/product-set/utils/index.d.ts

@@ -20,6 +20,94 @@ export declare const sortArrayByIndex: <T>(array: T[]) => (T & {
     sort: number;
 })[];
 export declare const getFilteredTemplates: (templates?: EmailTemplate[] | SmsTemplate[], formTemplates?: TemplateItem[]) => TemplateItem[] | undefined;
+export declare const updateModifiersSetAtProductSetForm: (data: ProductSetFormValues) => {
+    steps: {
+        productCategories: {
+            products: {
+                modifiersSet: {
+                    id: number;
+                    value: string;
+                    label: string;
+                }[];
+                id: number;
+                name: string;
+                productGroupId: number;
+                description: string;
+                termsAndConditions: string;
+                price: number;
+                deposit: number;
+                minQuantity: number;
+                maxQuantity: number;
+                totalQuantity: number;
+                isAvailable: boolean;
+                isSoldOut: boolean;
+                originalProductId: number | null;
+                isUnlimited: boolean;
+                isRequired: boolean;
+                quantitySelector: number;
+                hasSpecialNotes: boolean;
+                minSpend?: number | null;
+                type?: import("@licklist/core/dist/DataMapper/Product/ProductDataMapper").ProductType;
+                modifiersSetsId?: Array<import("..").ModifiersSet>;
+                weight?: number;
+                tierId?: number;
+                images: import("@licklist/core/dist/DataMapper/Media/ImageDataMapper").Image[] | null;
+                uuid: string;
+                sort: number | null;
+                color?: string;
+                productZones?: import("../product-zone").ProductZoneControlValues[];
+                subProducts?: import("../types").SubProduct[];
+                _id?: number;
+            }[];
+            id: number;
+            uniqueId?: string;
+            name: string;
+            minSubItems: number | null;
+            maxSubItems: number | null;
+            overallQuantity?: number | null;
+            quantityType: import("@licklist/core/dist/DataMapper/Product/ProductCategoryDataMapper").QuantityType;
+            type: import("@licklist/core/dist/DataMapper/Product/ProductCategoryDataMapper").CategoryType;
+            isTimeRelated: boolean;
+            collectUserInfo: boolean;
+            hasTicket: boolean;
+            allowDeposits: boolean;
+            remainderExpireAfter?: number;
+            hasBookingManagement: boolean;
+            hasSubEvents?: boolean;
+            weight?: number;
+            isReusable?: boolean;
+            saleDeadlineCategory?: number;
+            termsAndConditions?: string;
+            sort: number | null;
+            _id?: number;
+        }[];
+        id: number;
+        name: string;
+        weight?: number;
+        termsAndConditions?: string;
+        hasMap: boolean;
+        venueMapSetId: null | number;
+        pointProducts?: Partial<import("@licklist/core/dist/DataMapper/Product/PointProductDataMapper").PointProduct>[];
+        _id?: number;
+    }[];
+    isOverrides?: boolean;
+    id?: number;
+    name: string;
+    description?: string;
+    image?: import("@licklist/core/dist/DataMapper/Media/ImageDataMapper").Image;
+    type: import("@licklist/core/dist/DataMapper/Product/ProductSetDataMapper").ProductSetType;
+    termsAndConditions: string;
+    thankYouPageUrl: string;
+    operationalCost: import("@licklist/core/dist/DataMapper/Product/ProductSetDataMapper").OperationalCostType;
+    productGroups?: import("../../types/generic/SelectItem").SelectItem[];
+    relyOnPeopleType?: import("@licklist/core/dist/DataMapper/Product/ProductSetDataMapper").RelyOnPeopleType | null;
+    fieldSetId?: number;
+    saleDeadline?: number;
+    emailTemplates?: TemplateItem[];
+    smsTemplates?: TemplateItem[];
+    localImageBlobURL?: string;
+    menuRecurrences?: Partial<import("@licklist/core/dist/DataMapper/Product/ProductSetRecurrenceDataMapper").ProductSetRecurrence>[];
+};
 export declare const checkAvailableTimesErrors: ({ values, setError, t, }: CheckAvailableTimesErrors) => boolean;
 export declare const getTypeHeadItemsFromMenus: (menus?: (ProductSet | ProductSetFormValues)[]) => MenuTypeheadItem[];
 export {};

package/dist/product-set/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/product-set/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qEAAqE,CAAA;AACnG,OAAO,EAAE,WAAW,EAAE,MAAM,mEAAmE,CAAA;AAC/F,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEjD,OAAO,EAAE,UAAU,EAAE,MAAM,6DAA6D,CAAA;AACxF,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAE7D,UAAU,yBAAyB;IACjC,MAAM,EAAE,oBAAoB,CAAA;IAC5B,QAAQ,EAAE,eAAe,CAAC,oBAAoB,CAAC,CAAA;IAC/C,CAAC,EAAE,SAAS,CAAA;CACb;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;CACd;AACD,eAAO,MAAM,iBAAiB,GAAI,CAAC,SAC1B,CAAC,EAAE,aACC,MAAM,aACN,MAAM,QAQlB,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,CAAC,EAAE;;IACmB,CAAA;AAEjE,eAAO,MAAM,oBAAoB,eACnB,aAAa,EAAE,GAAG,WAAW,EAAE,kBAC3B,YAAY,EAAE,KAC7B,YAAY,EAAE,GAAG,SAmBnB,CAAA;AAED,eAAO,MAAM,yBAAyB,6BAInC,yBAAyB,YA0B3B,CAAA;AAED,eAAO,MAAM,yBAAyB,WAC5B,CAAC,UAAU,GAAG,oBAAoB,CAAC,EAAE,KAC5C,gBAAgB,EACwD,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/product-set/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qEAAqE,CAAA;AACnG,OAAO,EAAE,WAAW,EAAE,MAAM,mEAAmE,CAAA;AAG/F,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEjD,OAAO,EAAE,UAAU,EAAE,MAAM,6DAA6D,CAAA;AACxF,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAG7D,UAAU,yBAAyB;IACjC,MAAM,EAAE,oBAAoB,CAAA;IAC5B,QAAQ,EAAE,eAAe,CAAC,oBAAoB,CAAC,CAAA;IAC/C,CAAC,EAAE,SAAS,CAAA;CACb;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;CACd;AACD,eAAO,MAAM,iBAAiB,GAAI,CAAC,SAC1B,CAAC,EAAE,aACC,MAAM,aACN,MAAM,QAQlB,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,CAAC,EAAE;;IACmB,CAAA;AAEjE,eAAO,MAAM,oBAAoB,eACnB,aAAa,EAAE,GAAG,WAAW,EAAE,kBAC3B,YAAY,EAAE,KAC7B,YAAY,EAAE,GAAG,SAmBnB,CAAA;AAED,eAAQ,MAAM,kCAAkC,SAAU,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAc5E,CAAC;AAEH,eAAO,MAAM,yBAAyB,6BAInC,yBAAyB,YA0B3B,CAAA;AAED,eAAO,MAAM,yBAAyB,WAC5B,CAAC,UAAU,GAAG,oBAAoB,CAAC,EAAE,KAC5C,gBAAgB,EACwD,CAAA"}

package/dist/product-set/utils/index.js

@@ -1,3 +1,4 @@
+import { convertToTypeaheadOptions } from '../../sales/coupon/utils/index.js';
 import { checkIfZoneCategory } from '@licklist/plugins';
 
 function _array_like_to_array(arr, len) {
@@ -109,6 +110,23 @@ var getFilteredTemplates = function(templates, formTemplates) {
         };
     });
 };
+var updateModifiersSetAtProductSetForm = function(data) {
+    return _object_spread_props(_object_spread({}, data), {
+        steps: data.steps.map(function(step) {
+            return _object_spread_props(_object_spread({}, step), {
+                productCategories: step.productCategories.map(function(category) {
+                    return _object_spread_props(_object_spread({}, category), {
+                        products: category.products.map(function(product) {
+                            return _object_spread_props(_object_spread({}, product), {
+                                modifiersSet: (product === null || product === void 0 ? void 0 : product.modifiersSet) ? convertToTypeaheadOptions(product.modifiersSet) : []
+                            });
+                        })
+                    });
+                })
+            });
+        })
+    });
+};
 var checkAvailableTimesErrors = function(param) {
     var values = param.values, setError = param.setError, t = param.t;
     var _values_steps, _values_menuRecurrences;
@@ -146,4 +164,4 @@ var getTypeHeadItemsFromMenus = function(menus) {
     });
 };
 
-export { checkAvailableTimesErrors, getFilteredTemplates, getTypeHeadItemsFromMenus, moveArrayElements, sortArrayByIndex };
+export { checkAvailableTimesErrors, getFilteredTemplates, getTypeHeadItemsFromMenus, moveArrayElements, sortArrayByIndex, updateModifiersSetAtProductSetForm };

package/dist/sales/coupon/utils/index.d.ts

@@ -1,5 +1,6 @@
+import { ModifierSet } from '@licklist/core/dist/DataMapper/Product/ModifierSetDataMapper';
 import { ProductGroup } from '@licklist/core/dist/DataMapper/Product/ProductGroupDataMapper';
-export declare const convertToTypeaheadOptions: (productGroups?: ProductGroup[]) => {
+export declare const convertToTypeaheadOptions: (productGroups?: ProductGroup[] | ModifierSet[]) => {
     id: number;
     value: string;
     label: string;

package/dist/sales/coupon/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/sales/coupon/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,+DAA+D,CAAA;AAE5F,eAAO,MAAM,yBAAyB,mBAAoB,YAAY,EAAE;;;;GAUvE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/sales/coupon/utils/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,8DAA8D,CAAA;AAC1F,OAAO,EAAE,YAAY,EAAE,MAAM,+DAA+D,CAAA;AAE5F,eAAO,MAAM,yBAAyB,mBAAoB,YAAY,EAAE,GAAG,WAAW,EAAE;;;;GAUvF,CAAA"}