ordering-ui-admin-external 1.43.39 → 1.43.41

package/_modules/components/Orders/ProductItemAccordion/index.js

@@ -75,10 +75,38 @@ var ProductItemAccordion = exports.ProductItemAccordion = function ProductItemAc
   var productActionsEdit = (0, _react.useRef)(null);
   var productActionsDelete = (0, _react.useRef)(null);
   var productInfo = function productInfo() {
+    var _product$options;
+    var options = JSON.parse(JSON.stringify(Object.values((_product$options = product.options) !== null && _product$options !== void 0 ? _product$options : {})));
+    var extraGroups = options.reduce(function (acc, option) {
+      var _option$extra$rank, _option$extra;
+      var extraRank = (_option$extra$rank = option === null || option === void 0 || (_option$extra = option.extra) === null || _option$extra === void 0 ? void 0 : _option$extra.rank) !== null && _option$extra$rank !== void 0 ? _option$extra$rank : option === null || option === void 0 ? void 0 : option.rank;
+      acc[extraRank] = acc[extraRank] || [];
+      acc[extraRank].push(option);
+      return acc;
+    }, {});
+    var sortedExtraGroups = Object.entries(extraGroups).sort(function (_ref, _ref2) {
+      var _ref3 = _slicedToArray(_ref, 1),
+        rankA = _ref3[0];
+      var _ref4 = _slicedToArray(_ref2, 1),
+        rankB = _ref4[0];
+      return rankA - rankB;
+    });
+    sortedExtraGroups.forEach(function (_ref5) {
+      var _ref6 = _slicedToArray(_ref5, 2),
+        _ = _ref6[0],
+        group = _ref6[1];
+      group.sort(function (a, b) {
+        return a.rank - b.rank;
+      });
+    });
+    options = sortedExtraGroups.flatMap(function (_ref7) {
+      var _ref8 = _slicedToArray(_ref7, 2),
+        group = _ref8[1];
+      return group;
+    });
     if (isCartProduct) {
-      var _product$ingredients, _product$options;
+      var _product$ingredients;
       var ingredients = JSON.parse(JSON.stringify(Object.values((_product$ingredients = product.ingredients) !== null && _product$ingredients !== void 0 ? _product$ingredients : {})));
-      var options = JSON.parse(JSON.stringify(Object.values((_product$options = product.options) !== null && _product$options !== void 0 ? _product$options : {})));
       options = options.map(function (option) {
         var _option$suboptions;
         option.suboptions = Object.values((_option$suboptions = option.suboptions) !== null && _option$suboptions !== void 0 ? _option$suboptions : {});
@@ -89,7 +117,9 @@ var ProductItemAccordion = exports.ProductItemAccordion = function ProductItemAc
         options: options
       });
     }
-    return product;
+    return _objectSpread(_objectSpread({}, product), {}, {
+      options: options
+    });
   };
   var toggleAccordion = function toggleAccordion(e) {
     var _productSelect$curren, _productActionsEdit$c, _productActionsDelete;
@@ -106,11 +136,11 @@ var ProductItemAccordion = exports.ProductItemAccordion = function ProductItemAc
       changeQuantity(product, parseInt(value));
     }
   };
-  var getFormattedSubOptionName = function getFormattedSubOptionName(_ref) {
-    var quantity = _ref.quantity,
-      name = _ref.name,
-      position = _ref.position,
-      price = _ref.price;
+  var getFormattedSubOptionName = function getFormattedSubOptionName(_ref9) {
+    var quantity = _ref9.quantity,
+      name = _ref9.name,
+      position = _ref9.position,
+      price = _ref9.price;
     if (name !== 'No') {
       var pos = position ? "(".concat(position, ")") : '';
       return price > 0 ? "".concat(name, " ").concat(pos, " ").concat(parsePrice(quantity * price, {

package/_modules/components/Stores/BusinessMenu/index.js

@@ -192,7 +192,7 @@ var BusinessMenuUI = function BusinessMenuUI(props) {
     }, /*#__PURE__*/_react.default.createElement(_styles2.CheckboxWrapper, {
       className: "business_checkbox_control"
     }, /*#__PURE__*/_react.default.createElement(_styles.Checkbox, {
-      defaultChecked: menu === null || menu === void 0 ? void 0 : menu.enabled,
+      checked: menu === null || menu === void 0 ? void 0 : menu.enabled,
       onChange: function onChange(e) {
         return handleChangeBusinessMenuActiveState(menu === null || menu === void 0 ? void 0 : menu.id, e.target.checked);
       }

package/_modules/components/Stores/BusinessMenuOptions/index.js

@@ -44,7 +44,9 @@ var BusinessMenuOptionsUI = function BusinessMenuOptionsUI(props) {
     isSelectedSharedMenus = props.isSelectedSharedMenus,
     handleDeleteMenu = props.handleDeleteMenu,
     setIsOpenSharedProduct = props.setIsOpenSharedProduct,
-    sitesState = props.sitesState;
+    sitesState = props.sitesState,
+    setMenuList = props.setMenuList,
+    menuList = props.menuList;
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var theme = (0, _styledComponents.useTheme)();
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
@@ -167,12 +169,16 @@ var BusinessMenuOptionsUI = function BusinessMenuOptionsUI(props) {
   }, t('SHARE_WITH', 'Share with'))))), !isSelectedSharedMenus || ((_Object$keys5 = Object.keys(menu)) === null || _Object$keys5 === void 0 ? void 0 : _Object$keys5.length) === 0 ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, selectedMenuOption === 'basic' && /*#__PURE__*/_react.default.createElement(_BusinessMenuBasicOptions.BusinessMenuBasicOptions, props), selectedMenuOption === 'channels' && /*#__PURE__*/_react.default.createElement(_BusinessMenuChannels.BusinessMenuChannels, props), selectedMenuOption === 'share_with' && /*#__PURE__*/_react.default.createElement(_BusinessMenuShare.BusinessMenuShare, {
     menu: menu,
     business: business,
-    handleUpdateBusinessState: handleUpdateBusinessState
+    handleUpdateBusinessState: handleUpdateBusinessState,
+    setMenuList: setMenuList,
+    menuList: menuList
   })) : /*#__PURE__*/_react.default.createElement(_BusinessSharedMenuProducts.BusinessSharedMenuProducts, {
     menu: menu,
     business: business,
     handleUpdateBusinessState: handleUpdateBusinessState,
-    setIsOpenSharedProduct: setIsOpenSharedProduct
+    setIsOpenSharedProduct: setIsOpenSharedProduct,
+    setMenuList: setMenuList,
+    menuList: menuList
   }), /*#__PURE__*/_react.default.createElement(_Shared.Modal, {
     width: "70%",
     open: isCustomFieldsOpen,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-admin-external",
-  "version": "1.43.39",
+  "version": "1.43.41",
   "description": "Ordering UI Admin Components",
   "main": "./_modules/index.js",
   "exports": {
@@ -83,7 +83,7 @@
     "lodash": "^4.17.20",
     "moment": "^2.29.1",
     "moment-range": "^4.0.2",
-    "ordering-components-admin-external": "1.43.26",
+    "ordering-components-admin-external": "1.43.27",
     "polished": "^3.6.7",
     "prop-types": "^15.7.2",
     "react-big-calendar": "^1.4.2",

package/src/components/Orders/ProductItemAccordion/index.js

@@ -56,10 +56,24 @@ export const ProductItemAccordion = (props) => {
   const productActionsDelete = useRef(null)
 
   const productInfo = () => {
+    let options = JSON.parse(JSON.stringify(Object.values(product.options ?? {})))
+    const extraGroups = options.reduce((acc, option) => {
+      const extraRank = option?.extra?.rank ?? option?.rank
+      acc[extraRank] = acc[extraRank] || []
+      acc[extraRank].push(option)
+      return acc
+    }, {})
+
+    const sortedExtraGroups = Object.entries(extraGroups).sort(([rankA], [rankB]) => rankA - rankB)
+
+    sortedExtraGroups.forEach(([_, group]) => {
+      group.sort((a, b) => a.rank - b.rank)
+    })
+
+    options = sortedExtraGroups.flatMap(([, group]) => group)
+
     if (isCartProduct) {
       const ingredients = JSON.parse(JSON.stringify(Object.values(product.ingredients ?? {})))
-      let options = JSON.parse(JSON.stringify(Object.values(product.options ?? {})))
-
       options = options.map(option => {
         option.suboptions = Object.values(option.suboptions ?? {})
         return option
@@ -70,7 +84,7 @@ export const ProductItemAccordion = (props) => {
         options
       }
     }
-    return product
+    return { ...product, options }
   }
 
   const toggleAccordion = (e) => {

package/src/components/Stores/BusinessMenu/index.js

@@ -180,7 +180,7 @@ const BusinessMenuUI = (props) => {
               className='business_checkbox_control'
             >
               <Checkbox
-                defaultChecked={menu?.enabled}
+                checked={menu?.enabled}
                 onChange={e => handleChangeBusinessMenuActiveState(menu?.id, e.target.checked)}
               />
             </CheckboxWrapper>

package/src/components/Stores/BusinessMenuOptions/index.js

@@ -37,7 +37,9 @@ const BusinessMenuOptionsUI = (props) => {
     isSelectedSharedMenus,
     handleDeleteMenu,
     setIsOpenSharedProduct,
-    sitesState
+    sitesState,
+    setMenuList,
+    menuList
   } = props
 
   const query = new URLSearchParams(useLocation().search)
@@ -194,6 +196,8 @@ const BusinessMenuOptionsUI = (props) => {
                 menu={menu}
                 business={business}
                 handleUpdateBusinessState={handleUpdateBusinessState}
+                setMenuList={setMenuList}
+                menuList={menuList}
               />
             )}
           </>
@@ -203,6 +207,8 @@ const BusinessMenuOptionsUI = (props) => {
             business={business}
             handleUpdateBusinessState={handleUpdateBusinessState}
             setIsOpenSharedProduct={setIsOpenSharedProduct}
+            setMenuList={setMenuList}
+            menuList={menuList}
           />
         )}
         <Modal