ordering-ui-external 2.5.2 → 2.5.4

package/_modules/themes/five/src/components/ProductOptionSubOption/index.js

@@ -20,12 +20,12 @@ var _MdRadioButtonUnchecked = _interopRequireDefault(require("@meronex/icons/md/
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -43,7 +43,8 @@ var ProductOptionSubOptionUI = function ProductOptionSubOptionUI(props) {
     toggleSelect = props.toggleSelect,
     changePosition = props.changePosition,
     isSoldOut = props.isSoldOut,
-    setIsScrollAvailable = props.setIsScrollAvailable;
+    setIsScrollAvailable = props.setIsScrollAvailable,
+    onChange = props.onChange;
   var disableIncrement = option !== null && option !== void 0 && option.limit_suboptions_by_max ? balance === (option === null || option === void 0 ? void 0 : option.max) || state.quantity === suboption.max : state.quantity === (suboption === null || suboption === void 0 ? void 0 : suboption.max) || !state.selected && balance === (option === null || option === void 0 ? void 0 : option.max);
   var price = option !== null && option !== void 0 && option.with_half_option && suboption !== null && suboption !== void 0 && suboption.half_price && state.position !== 'whole' ? suboption === null || suboption === void 0 ? void 0 : suboption.half_price : suboption === null || suboption === void 0 ? void 0 : suboption.price;
   var _useLanguage = (0, _orderingComponentsExternal.useLanguage)(),
@@ -58,10 +59,7 @@ var ProductOptionSubOptionUI = function ProductOptionSubOptionUI(props) {
     _useState2 = _slicedToArray(_useState, 2),
     showMessage = _useState2[0],
     setShowMessage = _useState2[1];
-  var _useState3 = (0, _react.useState)(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    isDirty = _useState4[0],
-    setIsDirty = _useState4[1];
+  var dirtyRef = (0, _react.useRef)(null);
   var handleIncrement = function handleIncrement(e) {
     e.stopPropagation();
     increment();
@@ -76,8 +74,8 @@ var ProductOptionSubOptionUI = function ProductOptionSubOptionUI(props) {
   };
   var handleSuboptionClick = function handleSuboptionClick() {
     var _option$suboptions;
+    dirtyRef.current = true;
     toggleSelect();
-    setIsDirty(true);
     if (balance === (option === null || option === void 0 ? void 0 : option.max) && (option === null || option === void 0 ? void 0 : (_option$suboptions = option.suboptions) === null || _option$suboptions === void 0 ? void 0 : _option$suboptions.length) > balance && !((option === null || option === void 0 ? void 0 : option.min) === 1 && (option === null || option === void 0 ? void 0 : option.max) === 1) && !state.selected) {
       setShowMessage(true);
     }
@@ -89,11 +87,19 @@ var ProductOptionSubOptionUI = function ProductOptionSubOptionUI(props) {
     }
   }, [balance]);
   (0, _react.useEffect)(function () {
-    if (balance === (option === null || option === void 0 ? void 0 : option.max) && state !== null && state !== void 0 && state.selected && isDirty) {
-      setIsDirty(false);
+    if (balance === (option === null || option === void 0 ? void 0 : option.max) && state !== null && state !== void 0 && state.selected && dirtyRef) {
+      dirtyRef.current = false;
       setIsScrollAvailable(true);
     }
   }, [state === null || state === void 0 ? void 0 : state.selected]);
+  (0, _react.useEffect)(function () {
+    if (dirtyRef !== null && dirtyRef !== void 0 && dirtyRef.current || !(suboption !== null && suboption !== void 0 && suboption.preselected) || !(option !== null && option !== void 0 && option.respect_to)) return;
+    var newState = _objectSpread(_objectSpread({}, state), {}, {
+      selected: suboption === null || suboption === void 0 ? void 0 : suboption.preselected,
+      quantity: state.selected ? 0 : 1
+    });
+    onChange(newState, suboption, option);
+  }, [suboption, dirtyRef, option]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (_props$beforeElements = props.beforeElements) === null || _props$beforeElements === void 0 ? void 0 : _props$beforeElements.map(function (BeforeElement, i) {
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
       key: i

package/_modules/themes/five/src/components/ReviewOrder/styles.js

@@ -95,7 +95,7 @@ var CommentButton = (0, _styledComponents.default)(_Buttons.Button)(_templateObj
   });
 });
 exports.CommentButton = CommentButton;
-var ContinueContainer = _styledComponents.default.div(_templateObject24 || (_templateObject24 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n  p{\n    flex: 1\n  }\n"])));
+var ContinueContainer = _styledComponents.default.div(_templateObject24 || (_templateObject24 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n  p{\n    flex: 1;\n    margin: 0;\n  }\n"])));
 exports.ContinueContainer = ContinueContainer;
 var MultiLogosContainer = _styledComponents.default.div(_templateObject25 || (_templateObject25 = _taggedTemplateLiteral(["\n  display: flex;\n  justify-content: space-around;\n"])));
 exports.MultiLogosContainer = MultiLogosContainer;

package/_modules/themes/five/src/components/Wallets/index.js

@@ -90,7 +90,7 @@ var WalletsUI = function WalletsUI(props) {
     }, (_walletName$wallet$ty2 = walletName[wallet.type]) === null || _walletName$wallet$ty2 === void 0 ? void 0 : _walletName$wallet$ty2.name);
   }))), /*#__PURE__*/_react.default.createElement(_styles.WrapContent, null, /*#__PURE__*/_react.default.createElement(_styles.Transactions, {
     isLoyaltyLevel: !!loyaltyLevel
-  }, /*#__PURE__*/_react.default.createElement(_styles.SectionWrapper, null, /*#__PURE__*/_react.default.createElement(_styles.BalanceElement, null, /*#__PURE__*/_react.default.createElement("h1", null, (currentWalletSelected === null || currentWalletSelected === void 0 ? void 0 : currentWalletSelected.type) === 'cash' ? parsePrice(currentWalletSelected === null || currentWalletSelected === void 0 ? void 0 : currentWalletSelected.balance) : currentWalletSelected === null || currentWalletSelected === void 0 ? void 0 : currentWalletSelected.balance), /*#__PURE__*/_react.default.createElement("span", null, (currentWalletSelected === null || currentWalletSelected === void 0 ? void 0 : currentWalletSelected.type) === 'cash' ? configs === null || configs === void 0 ? void 0 : (_configs$stripe_curre = configs.stripe_currency) === null || _configs$stripe_curre === void 0 ? void 0 : _configs$stripe_curre.value : t('POINTS', 'Points')))), /*#__PURE__*/_react.default.createElement("div", {
+  }, /*#__PURE__*/_react.default.createElement(_styles.SectionWrapper, null, /*#__PURE__*/_react.default.createElement(_styles.BalanceElement, null, /*#__PURE__*/_react.default.createElement("h1", null, (currentWalletSelected === null || currentWalletSelected === void 0 ? void 0 : currentWalletSelected.type) === 'cash' ? parsePrice(currentWalletSelected === null || currentWalletSelected === void 0 ? void 0 : currentWalletSelected.balance) : currentWalletSelected === null || currentWalletSelected === void 0 ? void 0 : currentWalletSelected.balance), /*#__PURE__*/_react.default.createElement("span", null, (currentWalletSelected === null || currentWalletSelected === void 0 ? void 0 : currentWalletSelected.type) === 'cash' ? configs === null || configs === void 0 ? void 0 : (_configs$stripe_curre = configs.stripe_currency) === null || _configs$stripe_curre === void 0 ? void 0 : _configs$stripe_curre.value : t('POINTS', 'Points')))), /*#__PURE__*/_react.default.createElement(_GiftCardUI.GiftCardUI, null), /*#__PURE__*/_react.default.createElement("div", {
     className: "transactions_list"
   }, !(transactionsList !== null && transactionsList !== void 0 && transactionsList.loading) && ((_transactionsList$lis = transactionsList.list) === null || _transactionsList$lis === void 0 ? void 0 : (_transactionsList$lis2 = _transactionsList$lis["wallet:".concat(currentWalletSelected === null || currentWalletSelected === void 0 ? void 0 : currentWalletSelected.id)]) === null || _transactionsList$lis2 === void 0 ? void 0 : _transactionsList$lis2.length) > 0 && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("h2", {
     style: {

package/_modules/utils/index.js

@@ -903,7 +903,7 @@ var getOrderStatus = function getOrderStatus(s) {
     key: 0,
     value: t('PENDING', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag = theme.defaultLanguages) === null || _theme$defaultLanguag === void 0 ? void 0 : _theme$defaultLanguag.PENDING) || 'Pending'),
     slug: 'PENDING',
-    percentage: 25
+    percentage: 10
   }, {
     key: 1,
     value: t('COMPLETED', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag2 = theme.defaultLanguages) === null || _theme$defaultLanguag2 === void 0 ? void 0 : _theme$defaultLanguag2.COMPLETED) || 'Completed'),
@@ -923,7 +923,7 @@ var getOrderStatus = function getOrderStatus(s) {
     key: 4,
     value: t('PREPARATION_COMPLETED', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag5 = theme.defaultLanguages) === null || _theme$defaultLanguag5 === void 0 ? void 0 : _theme$defaultLanguag5.PREPARATION_COMPLETED) || 'Preparation Completed'),
     slug: 'PREPARATION_COMPLETED',
-    percentage: 70
+    percentage: 20
   }, {
     key: 5,
     value: t('REJECTED_BY_BUSINESS', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag6 = theme.defaultLanguages) === null || _theme$defaultLanguag6 === void 0 ? void 0 : _theme$defaultLanguag6.REJECTED_BY_BUSINESS) || 'Rejected by business'),
@@ -938,17 +938,17 @@ var getOrderStatus = function getOrderStatus(s) {
     key: 7,
     value: t('ACCEPTED_BY_BUSINESS', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag8 = theme.defaultLanguages) === null || _theme$defaultLanguag8 === void 0 ? void 0 : _theme$defaultLanguag8.ACCEPTED_BY_BUSINESS) || 'Accepted by business'),
     slug: 'ACCEPTED_BY_BUSINESS',
-    percentage: 35
+    percentage: 15
   }, {
     key: 8,
     value: t('ACCEPTED_BY_DRIVER', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag9 = theme.defaultLanguages) === null || _theme$defaultLanguag9 === void 0 ? void 0 : _theme$defaultLanguag9.ACCEPTED_BY_DRIVER) || 'Accepted by driver'),
     slug: 'ACCEPTED_BY_DRIVER',
-    percentage: 45
+    percentage: 40
   }, {
     key: 9,
     value: t('PICK_UP_COMPLETED_BY_DRIVER', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag10 = theme.defaultLanguages) === null || _theme$defaultLanguag10 === void 0 ? void 0 : _theme$defaultLanguag10.PICK_UP_COMPLETED_BY_DRIVER) || 'Pick up completed by driver'),
     slug: 'PICK_UP_COMPLETED_BY_DRIVER',
-    percentage: 80
+    percentage: 70
   }, {
     key: 10,
     value: t('PICK_UP_FAILED_BY_DRIVER', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag11 = theme.defaultLanguages) === null || _theme$defaultLanguag11 === void 0 ? void 0 : _theme$defaultLanguag11.PICK_UP_FAILED_BY_DRIVER) || 'Pick up Failed by driver'),
@@ -973,7 +973,7 @@ var getOrderStatus = function getOrderStatus(s) {
     key: 14,
     value: t('ORDER_NOT_READY', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag15 = theme.defaultLanguages) === null || _theme$defaultLanguag15 === void 0 ? void 0 : _theme$defaultLanguag15.ORDER_NOT_READY) || 'Order not ready'),
     slug: 'ORDER_NOT_READY',
-    percentage: 65
+    percentage: 15
   }, {
     key: 15,
     value: t('ORDER_PICKEDUP_COMPLETED_BY_CUSTOMER', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag16 = theme.defaultLanguages) === null || _theme$defaultLanguag16 === void 0 ? void 0 : _theme$defaultLanguag16.ORDER_PICKEDUP_COMPLETED_BY_CUSTOMER) || 'Order picked up completed by customer'),
@@ -993,7 +993,7 @@ var getOrderStatus = function getOrderStatus(s) {
     key: 18,
     value: t('ORDER_DRIVER_ALMOST_ARRIVED_BUSINESS', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag19 = theme.defaultLanguages) === null || _theme$defaultLanguag19 === void 0 ? void 0 : _theme$defaultLanguag19.ORDER_DRIVER_ALMOST_ARRIVED_BUSINESS) || 'Driver almost arrived to business'),
     slug: 'ORDER_DRIVER_ALMOST_ARRIVED_BUSINESS',
-    percentage: 55
+    percentage: 50
   }, {
     key: 19,
     value: t('ORDER_DRIVER_ALMOST_ARRIVED_CUSTOMER', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag20 = theme.defaultLanguages) === null || _theme$defaultLanguag20 === void 0 ? void 0 : _theme$defaultLanguag20.ORDER_DRIVER_ALMOST_ARRIVED_CUSTOMER) || 'Driver almost arrived to customer'),
@@ -1008,17 +1008,17 @@ var getOrderStatus = function getOrderStatus(s) {
     key: 21,
     value: t('ORDER_CUSTOMER_ARRIVED_BUSINESS', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag22 = theme.defaultLanguages) === null || _theme$defaultLanguag22 === void 0 ? void 0 : _theme$defaultLanguag22.ORDER_CUSTOMER_ARRIVED_BUSINESS) || 'Customer arrived to business'),
     slug: 'ORDER_CUSTOMER_ARRIVED_BUSINESS',
-    percentage: 95
+    percentage: 90
   }, {
     key: 22,
     value: t('ORDER_LOOKING_FOR_DRIVER', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag23 = theme.defaultLanguages) === null || _theme$defaultLanguag23 === void 0 ? void 0 : _theme$defaultLanguag23.ORDER_LOOKING_FOR_DRIVER) || 'Looking for driver'),
     slug: 'ORDER_LOOKING_FOR_DRIVER',
-    percentage: 35
+    percentage: 30
   }, {
     key: 23,
     value: t('ORDER_DRIVER_ON_WAY', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag24 = theme.defaultLanguages) === null || _theme$defaultLanguag24 === void 0 ? void 0 : _theme$defaultLanguag24.ORDER_DRIVER_ON_WAY) || 'Driver on way'),
     slug: 'ORDER_DRIVER_ON_WAY',
-    percentage: 45
+    percentage: 80
   }];
   var objectStatus = orderStatus.find(function (o) {
     return o.key === status;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-external",
-  "version": "2.5.2",
+  "version": "2.5.4",
   "description": "Ordering UI Components",
   "main": "./_modules/index.js",
   "exports": {
@@ -87,7 +87,7 @@
     "lodash": "^4.17.19",
     "moment": "^2.29.4",
     "nanoid": "^4.0.0",
-    "ordering-components-external": "2.6.0",
+    "ordering-components-external": "2.6.1",
     "polished": "^3.6.6",
     "react-bootstrap-icons": "^1.7.2",
     "react-calendar": "^3.3.1",

package/src/components/UserProfileForm/index.js

@@ -164,8 +164,7 @@ const UserProfileFormUI = (props) => {
               ) : (
                 <UserData>
                   <h1>
-                    {showCustomerName && (userData?.name || user?.name)}
-                    {showCustomerLastName && (userData?.lastname || user?.lastname)}
+                    {showCustomerName && (userData?.name || user?.name)} {showCustomerLastName && (userData?.lastname || user?.lastname)}
                   </h1>
                   <p>{(showCustomerEmail && (userData?.email || user.email))}</p>
                   {(showCustomerCellphone && (userData?.cellphone || user?.cellphone)) && (

package/src/components/VerticalOrdersLayout/index.js

@@ -20,7 +20,8 @@ export const VerticalOrdersLayout = (props) => {
     orders,
     pagination,
     loadMoreOrders,
-    handleUpdateOrderList
+    handleUpdateOrderList,
+    setRefreshOrders
   } = props
 
   const [, t] = useLanguage()
@@ -58,6 +59,7 @@ export const VerticalOrdersLayout = (props) => {
   const handleCloseReivew = () => {
     setReviewStatus({ order: false, product: false, driver: false })
     setIsReviewOpen(false)
+    setRefreshOrders(true)
   }
 
   const handleClickReview = (order) => {

package/src/themes/five/src/components/BusinessBasicInformation/styles.js

@@ -8,12 +8,12 @@ export const BusinessContainer = styled.div`
   box-sizing: border-box;
   position: relative;
   max-height: 324px;
-  height: 324px;
+  height: 150px;
   background-repeat: no-repeat, repeat;
   background-size: cover;
   object-fit: cover;
   background-position: center;
-  min-height: 200px;
+  min-height: 150px;
   justify-content: start;
   align-items: flex-end;
 
@@ -21,6 +21,10 @@ export const BusinessContainer = styled.div`
     background-color: #cccccc;
   `}
 
+  ${props => props.bgimage && props.isChew && css`
+    height: 180px;
+  `}
+
   ${props => props.bgimage && (!props.isClosed && !props.isChew) && css`
     background-image: url(${props.bgimage});
   `}
@@ -45,6 +49,8 @@ export const BusinessContainer = styled.div`
 
   @media (min-width: 576px) {
     border-radius: 7.6px;
+    height: 324px;
+    min-height: 200px;
   }
 
 
@@ -54,8 +60,8 @@ export const BusinessContent = styled.div`
   margin: 0;
   margin-left: 35px;
   margin-bottom: -35px;
-  max-height: 80px;
-  width: 80px;
+  max-height: 70px;
+  width: 70px;
   box-shadow: rgba(0, 0, 0, 0.16) 0px 1px 4px;
 
   @media (min-width: 576px) {
@@ -71,10 +77,10 @@ export const BusinessContent = styled.div`
 `
 
 export const WrapperBusinessLogo = styled.div`
-  max-width: 80px;
-  max-height: 80px;
-  width: 80px;
-  height: 80px;
+  max-width: 70px;
+  max-height: 70px;
+  width: 70px;
+  height: 70px;
 
   @media (min-width: 576px) {
     max-width: 124px;
@@ -94,7 +100,7 @@ const BusinessLogoStyled = styled.div`
   background-size: cover;
   object-fit: cover;
   background-position: center;
-  min-height: 80px;
+  min-height: 70px;
   border-radius: 7.6px;
   @media (min-width: 576px) {
     min-height: 124px;

package/src/themes/five/src/components/Cart/index.js

@@ -345,7 +345,9 @@ const CartUI = (props) => {
                             )}
                             <IconContainer>
                               <BsInfoCircle size='20' color={theme.colors.primary} onClick={() => setOpenTaxModal({ open: true, data: offer, type: 'offer_target_1' })} />
-                              <MdCloseCircle size='24' color={theme.colors.primary} onClick={() => onRemoveOffer(offer?.id)} />
+                              {!!offer?.id && (
+                                <MdCloseCircle size='24' color={theme.colors.primary} onClick={() => onRemoveOffer(offer?.id)} />
+                              )}
                             </IconContainer>
                           </td>
                           <td>
@@ -408,7 +410,7 @@ const CartUI = (props) => {
                             )}
                             <IconContainer>
                               <BsInfoCircle size='20' color={theme.colors.primary} onClick={() => setOpenTaxModal({ open: true, data: offer, type: 'offer_target_3' })} />
-                              {!offer?.type && (
+                              {!!offer?.id && (
                                 <MdCloseCircle size='24' color={theme.colors.primary} onClick={() => onRemoveOffer(offer?.id)} />
                               )}
                             </IconContainer>
@@ -435,7 +437,7 @@ const CartUI = (props) => {
                             )}
                             <IconContainer>
                               <BsInfoCircle size='20' color={theme.colors.primary} onClick={() => setOpenTaxModal({ open: true, data: offer, type: 'offer_target_2' })} />
-                              {!offer?.type && (
+                              {!!offer?.id && (
                                 <MdCloseCircle size='24' color={theme.colors.primary} onClick={() => onRemoveOffer(offer?.id)} />
                               )}
                             </IconContainer>

package/src/themes/five/src/components/CartContent/index.js

@@ -137,6 +137,9 @@ export const CartContent = (props) => {
                   <h4>{t('TOTAL_FOR_ALL_CARTS', 'Total for all Carts')}</h4>
                   <h4>{parsePrice(totalCartsPrice)}</h4>
                 </div>
+                <span>
+                  <p>{t('CART_GROUP_MESSAGE_ALERT', 'Discounts may be applied at the time of payment for this group.')}</p>
+                </span>
               </MultiCartPriceContainer>
             )}
           </>

package/src/themes/five/src/components/Header/index.js

@@ -87,6 +87,8 @@ export const Header = (props) => {
   const [confirm, setConfirm] = useState({ open: false, content: null, handleOnAccept: null })
   const [isFarAway, setIsFarAway] = useState(false)
 
+  const isMulticheckoutPage = window.location.pathname?.includes('/multi-checkout')
+
   const cartsWithProducts = (orderState?.carts && Object.values(orderState?.carts).filter(cart => cart.products && cart.products?.length > 0)) || null
 
   const windowSize = useWindowSize()
@@ -236,7 +238,7 @@ export const Header = (props) => {
               <img alt='Isotype' width={isChew ? '70px' : '35px'} height={isChew ? '20px' : '45px'} src={isChew ? theme?.images?.logos?.chewLogo : (isHome && windowSize.width < 576 ? theme?.images?.logos?.isotypeInvert : orderingTheme?.theme?.my_products?.components?.images?.components?.logo?.components?.image || theme?.images?.logos?.isotype)} loading='lazy' />
             </LogoHeader>
           </LeftHeader>
-          {isShowOrderOptions && !props.isCustomLayout && windowSize.width >= 576 && (
+          {isShowOrderOptions && windowSize.width >= 576 && (
             <Menu id='center-side' className='left-header' isCustomerMode={isCustomerMode} isChew={isChew}>
               {windowSize.width > 850 && isFarAway && (
                 <FarAwayMessage>
@@ -361,16 +363,20 @@ export const Header = (props) => {
                   <>
                     {isShowOrderOptions && (
                       windowSize.width > 768 ? (
-                        <CartPopover
-                          open={openPopover.cart}
-                          carts={cartsWithProducts}
-                          onClick={() => handleTogglePopover('cart')}
-                          onClose={() => handleClosePopover('cart')}
-                          auth={auth}
-                          location={location}
-                          isCustomerMode={isCustomerMode}
-                          setPreorderBusiness={setPreorderBusiness}
-                        />
+                        <>
+                          {!isMulticheckoutPage ? (
+                            <CartPopover
+                              open={openPopover.cart}
+                              carts={cartsWithProducts}
+                              onClick={() => handleTogglePopover('cart')}
+                              onClose={() => handleClosePopover('cart')}
+                              auth={auth}
+                              location={location}
+                              isCustomerMode={isCustomerMode}
+                              setPreorderBusiness={setPreorderBusiness}
+                            />
+                          ) : null}
+                        </>
                       ) : (
                         <HeaderOption
                           variant='cart'

package/src/themes/five/src/components/MultiCheckout/index.js

@@ -57,7 +57,6 @@ const MultiCheckoutUI = (props) => {
     isCustomerMode,
     openCarts,
     loyaltyPlansState,
-    totalCartsPrice,
     handleGroupPlaceOrder,
     paymethodSelected,
     handleSelectPaymethod,
@@ -101,6 +100,7 @@ const MultiCheckoutUI = (props) => {
     ? JSON.parse(configs?.driver_tip_options?.value) || []
     : configs?.driver_tip_options?.value || []
 
+  const totalCartsPrice = cartGroup?.result?.balance
   const methodsPay = ['global_google_pay', 'global_apple_pay']
   const creditPointPlan = loyaltyPlansState?.result?.find((loyal) => loyal.type === 'credit_point')
   const businessIds = openCarts.map((cart) => cart.business_id)

package/src/themes/five/src/components/OrderDetails/OrderEta.js

@@ -38,9 +38,10 @@ export const OrderEta = (props) => {
       }
       _estimatedTime = moment.utc(_delivery).add(totalEta, 'minutes')
     } else {
-      const _etaTime = order?.delivered_in
-        ? order?.delivered_in + order?.eta_time
-        : order?.eta_time
+      let timesToAdd = 0
+      if (order?.delivered_in) timesToAdd += order?.delivered_in
+      if (order?.prepared_in) timesToAdd += order?.prepared_in
+      const _etaTime = order?.eta_time + timesToAdd
       _estimatedTime = moment.utc(_delivery).add(_etaTime, 'minutes')
     }
     _estimatedTime = outputFormat ? moment(_estimatedTime).local().format(outputFormat) : parseDate(_estimatedTime, { utc: false })

package/src/themes/five/src/components/OrderDetails/OrderHistory.js

@@ -129,11 +129,17 @@ export const OrderHistory = (props) => {
                   ? getLogisticTagStatus(parseInt(message.change.new, 10))
                   : message.change?.attribute === 'delivered_in' ? (
                     <h3>
-                        <strong>{t('TIME_ADDED_BY_DRIVER', 'Time added by driver')}</strong><br />
-                        {formatSeconds(parseInt(message.change.new, 10))}
+                      <strong>{t('TIME_ADDED_BY_DRIVER', 'Time added by driver')}</strong><br />
+                      {formatSeconds(parseInt(message.change.new, 10))}
                     </h3>
                   )
-                    :t(getStatus(parseInt(message.change.new, 10)))
+                    : message.change?.attribute === 'prepared_in' ? (
+                      <h3>
+                        <strong>{t('TIME_ADDED_BY_BUSINESS', 'Time added by business')}</strong><br />
+                        {formatSeconds(parseInt(message.change.new, 10))}
+                      </h3>
+                    )
+                      : t(getStatus(parseInt(message.change.new, 10)))
                 }
               </h3>
             ) : (

package/src/themes/five/src/components/OrdersOption/index.js

@@ -65,7 +65,8 @@ const OrdersOptionUI = (props) => {
     handleUpdateProfessionals,
     businesses,
     handleUpdateBusinesses,
-    getPage
+    getPage,
+    loadOrders,
   } = props
 
   const [, t] = useLanguage()
@@ -73,6 +74,7 @@ const OrdersOptionUI = (props) => {
   const [events] = useEvent()
   const { width } = useWindowSize()
   const { loading, error, orders: values } = orderList
+  const [refreshOrders , setRefreshOrders] = useState(false)
 
   const _orders = customArray || values || []
   const uniqueOrders = []
@@ -186,6 +188,13 @@ const OrdersOptionUI = (props) => {
     }
   }, [reorderState])
 
+  useEffect(() => {
+		if (refreshOrders) {
+			loadOrders(false, false, false, true)
+			setRefreshOrders(false)
+		}
+	}, [refreshOrders])
+
   return (
     <>
       {props.beforeElements?.map((BeforeElement, i) => (
@@ -340,6 +349,7 @@ const OrdersOptionUI = (props) => {
             getOrderStatus={getOrderStatus}
             handleReorder={handleReorder}
             handleUpdateOrderList={handleUpdateOrderList}
+            setRefreshOrders={setRefreshOrders}
           />
         )
       )}

package/src/themes/five/src/components/ProductOptionSubOption/index.js

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react'
+import React, { useState, useEffect, useRef } from 'react'
 import {
   ProductOptionSuboption as ProductSubOptionController,
   useUtils,
@@ -37,7 +37,8 @@ const ProductOptionSubOptionUI = (props) => {
     toggleSelect,
     changePosition,
     isSoldOut,
-    setIsScrollAvailable
+    setIsScrollAvailable,
+    onChange
   } = props
 
   const disableIncrement = option?.limit_suboptions_by_max ? (balance === option?.max || state.quantity === suboption.max) : state.quantity === suboption?.max || (!state.selected && balance === option?.max)
@@ -46,7 +47,7 @@ const ProductOptionSubOptionUI = (props) => {
   const [{ parsePrice }] = useUtils()
   const { width } = useWindowSize()
   const [showMessage, setShowMessage] = useState(false)
-  const [isDirty, setIsDirty] = useState(false)
+  const dirtyRef = useRef(null)
 
   const handleIncrement = (e) => {
     e.stopPropagation()
@@ -64,8 +65,8 @@ const ProductOptionSubOptionUI = (props) => {
   }
 
   const handleSuboptionClick = () => {
+    dirtyRef.current = true
     toggleSelect()
-    setIsDirty(true)
     if (balance === option?.max && option?.suboptions?.length > balance && !(option?.min === 1 && option?.max === 1) && !state.selected) {
       setShowMessage(true)
     }
@@ -78,12 +79,17 @@ const ProductOptionSubOptionUI = (props) => {
   }, [balance])
 
   useEffect(() => {
-    if (balance === option?.max && state?.selected && isDirty) {
-      setIsDirty(false)
+    if (balance === option?.max && state?.selected && dirtyRef) {
+      dirtyRef.current = false
       setIsScrollAvailable(true)
     }
   }, [state?.selected])
 
+  useEffect(() => {
+    if (dirtyRef?.current || !suboption?.preselected || !option?.respect_to) return
+    const newState = { ...state, selected: suboption?.preselected, quantity: state.selected ? 0 : 1 }
+    onChange(newState, suboption, option)
+  }, [suboption, dirtyRef, option])
   return (
     <>
       {props.beforeElements?.map((BeforeElement, i) => (

package/src/themes/five/src/components/ReviewOrder/styles.js

@@ -256,7 +256,8 @@ export const ContinueContainer = styled.div`
   display: flex;
   align-items: center;
   p{
-    flex: 1
+    flex: 1;
+    margin: 0;
   }
 `
 

package/src/themes/five/src/components/Wallets/index.js

@@ -109,7 +109,7 @@ const WalletsUI = (props) => {
                     </span>
                   </BalanceElement>
                 </SectionWrapper>
-                {/* <GiftCardUI /> */}
+                <GiftCardUI />
                 <div className='transactions_list'>
                   {!transactionsList?.loading && transactionsList.list?.[`wallet:${currentWalletSelected?.id}`]?.length > 0 && (
                     <>

package/src/utils/index.js

@@ -627,30 +627,30 @@ export const getOrderStatus = (s) => {
   const theme = useTheme()
   const status = parseInt(s)
   const orderStatus = [
-    { key: 0, value: t('PENDING', theme?.defaultLanguages?.PENDING || 'Pending'), slug: 'PENDING', percentage: 25 },
+    { key: 0, value: t('PENDING', theme?.defaultLanguages?.PENDING || 'Pending'), slug: 'PENDING', percentage: 10 },
     { key: 1, value: t('COMPLETED', theme?.defaultLanguages?.COMPLETED || 'Completed'), slug: 'COMPLETED', percentage: 100 },
     { key: 2, value: t('REJECTED', theme?.defaultLanguages?.REJECTED || 'Rejected'), slug: 'REJECTED', percentage: 0 },
     { key: 3, value: t('DRIVER_IN_BUSINESS', theme?.defaultLanguages?.DRIVER_IN_BUSINESS || 'Driver in business'), slug: 'DRIVER_IN_BUSINESS', percentage: 60 },
-    { key: 4, value: t('PREPARATION_COMPLETED', theme?.defaultLanguages?.PREPARATION_COMPLETED || 'Preparation Completed'), slug: 'PREPARATION_COMPLETED', percentage: 70 },
+    { key: 4, value: t('PREPARATION_COMPLETED', theme?.defaultLanguages?.PREPARATION_COMPLETED || 'Preparation Completed'), slug: 'PREPARATION_COMPLETED', percentage: 20 },
     { key: 5, value: t('REJECTED_BY_BUSINESS', theme?.defaultLanguages?.REJECTED_BY_BUSINESS || 'Rejected by business'), slug: 'REJECTED_BY_BUSINESS', percentage: 0 },
     { key: 6, value: t('REJECTED_BY_DRIVER', theme?.defaultLanguages?.REJECTED_BY_DRIVER || 'Rejected by Driver'), slug: 'REJECTED_BY_DRIVER', percentage: 0 },
-    { key: 7, value: t('ACCEPTED_BY_BUSINESS', theme?.defaultLanguages?.ACCEPTED_BY_BUSINESS || 'Accepted by business'), slug: 'ACCEPTED_BY_BUSINESS', percentage: 35 },
-    { key: 8, value: t('ACCEPTED_BY_DRIVER', theme?.defaultLanguages?.ACCEPTED_BY_DRIVER || 'Accepted by driver'), slug: 'ACCEPTED_BY_DRIVER', percentage: 45 },
-    { key: 9, value: t('PICK_UP_COMPLETED_BY_DRIVER', theme?.defaultLanguages?.PICK_UP_COMPLETED_BY_DRIVER || 'Pick up completed by driver'), slug: 'PICK_UP_COMPLETED_BY_DRIVER', percentage: 80 },
+    { key: 7, value: t('ACCEPTED_BY_BUSINESS', theme?.defaultLanguages?.ACCEPTED_BY_BUSINESS || 'Accepted by business'), slug: 'ACCEPTED_BY_BUSINESS', percentage: 15 },
+    { key: 8, value: t('ACCEPTED_BY_DRIVER', theme?.defaultLanguages?.ACCEPTED_BY_DRIVER || 'Accepted by driver'), slug: 'ACCEPTED_BY_DRIVER', percentage: 40 },
+    { key: 9, value: t('PICK_UP_COMPLETED_BY_DRIVER', theme?.defaultLanguages?.PICK_UP_COMPLETED_BY_DRIVER || 'Pick up completed by driver'), slug: 'PICK_UP_COMPLETED_BY_DRIVER', percentage: 70 },
     { key: 10, value: t('PICK_UP_FAILED_BY_DRIVER', theme?.defaultLanguages?.PICK_UP_FAILED_BY_DRIVER || 'Pick up Failed by driver'), slug: 'PICK_UP_FAILED_BY_DRIVER', percentage: 0 },
     { key: 11, value: t('DELIVERY_COMPLETED_BY_DRIVER', theme?.defaultLanguages?.DELIVERY_COMPLETED_BY_DRIVER || 'Delivery completed by driver'), slug: 'DELIVERY_COMPLETED_BY_DRIVER', percentage: 100 },
     { key: 12, value: t('DELIVERY_FAILED_BY_DRIVER', theme?.defaultLanguages?.DELIVERY_FAILED_BY_DRIVER || 'Delivery Failed by driver'), slug: 'DELIVERY_FAILED_BY_DRIVER', percentage: 0 },
     { key: 13, value: t('PREORDER', theme?.defaultLanguages?.PREORDER || 'PreOrder'), slug: 'PREORDER', percentage: 0 },
-    { key: 14, value: t('ORDER_NOT_READY', theme?.defaultLanguages?.ORDER_NOT_READY || 'Order not ready'), slug: 'ORDER_NOT_READY', percentage: 65 },
+    { key: 14, value: t('ORDER_NOT_READY', theme?.defaultLanguages?.ORDER_NOT_READY || 'Order not ready'), slug: 'ORDER_NOT_READY', percentage: 15 },
     { key: 15, value: t('ORDER_PICKEDUP_COMPLETED_BY_CUSTOMER', theme?.defaultLanguages?.ORDER_PICKEDUP_COMPLETED_BY_CUSTOMER || 'Order picked up completed by customer'), slug: 'ORDER_PICKEDUP_COMPLETED_BY_CUSTOMER', percentage: 100 },
     { key: 16, value: t('ORDER_STATUS_CANCELLED_BY_CUSTOMER', theme?.defaultLanguages?.ORDER_STATUS_CANCELLED_BY_CUSTOMER || 'Order cancelled by customer'), slug: 'ORDER_STATUS_CANCELLED_BY_CUSTOMER', percentage: 0 },
     { key: 17, value: t('ORDER_NOT_PICKEDUP_BY_CUSTOMER', theme?.defaultLanguages?.ORDER_NOT_PICKEDUP_BY_CUSTOMER || 'Order not picked up by customer'), slug: 'ORDER_NOT_PICKEDUP_BY_CUSTOMER', percentage: 0 },
-    { key: 18, value: t('ORDER_DRIVER_ALMOST_ARRIVED_BUSINESS', theme?.defaultLanguages?.ORDER_DRIVER_ALMOST_ARRIVED_BUSINESS || 'Driver almost arrived to business'), slug: 'ORDER_DRIVER_ALMOST_ARRIVED_BUSINESS', percentage: 55 },
+    { key: 18, value: t('ORDER_DRIVER_ALMOST_ARRIVED_BUSINESS', theme?.defaultLanguages?.ORDER_DRIVER_ALMOST_ARRIVED_BUSINESS || 'Driver almost arrived to business'), slug: 'ORDER_DRIVER_ALMOST_ARRIVED_BUSINESS', percentage: 50 },
     { key: 19, value: t('ORDER_DRIVER_ALMOST_ARRIVED_CUSTOMER', theme?.defaultLanguages?.ORDER_DRIVER_ALMOST_ARRIVED_CUSTOMER || 'Driver almost arrived to customer'), slug: 'ORDER_DRIVER_ALMOST_ARRIVED_CUSTOMER', percentage: 90 },
     { key: 20, value: t('ORDER_CUSTOMER_ALMOST_ARRIVED_BUSINESS', theme?.defaultLanguages?.ORDER_CUSTOMER_ALMOST_ARRIVED_BUSINESS || 'Customer almost arrived to business'), slug: 'ORDER_CUSTOMER_ALMOST_ARRIVED_BUSINESS', percentage: 90 },
-    { key: 21, value: t('ORDER_CUSTOMER_ARRIVED_BUSINESS', theme?.defaultLanguages?.ORDER_CUSTOMER_ARRIVED_BUSINESS || 'Customer arrived to business'), slug: 'ORDER_CUSTOMER_ARRIVED_BUSINESS', percentage: 95 },
-    { key: 22, value: t('ORDER_LOOKING_FOR_DRIVER', theme?.defaultLanguages?.ORDER_LOOKING_FOR_DRIVER || 'Looking for driver'), slug: 'ORDER_LOOKING_FOR_DRIVER', percentage: 35 },
-    { key: 23, value: t('ORDER_DRIVER_ON_WAY', theme?.defaultLanguages?.ORDER_DRIVER_ON_WAY || 'Driver on way'), slug: 'ORDER_DRIVER_ON_WAY', percentage: 45 }
+    { key: 21, value: t('ORDER_CUSTOMER_ARRIVED_BUSINESS', theme?.defaultLanguages?.ORDER_CUSTOMER_ARRIVED_BUSINESS || 'Customer arrived to business'), slug: 'ORDER_CUSTOMER_ARRIVED_BUSINESS', percentage: 90 },
+    { key: 22, value: t('ORDER_LOOKING_FOR_DRIVER', theme?.defaultLanguages?.ORDER_LOOKING_FOR_DRIVER || 'Looking for driver'), slug: 'ORDER_LOOKING_FOR_DRIVER', percentage: 30 },
+    { key: 23, value: t('ORDER_DRIVER_ON_WAY', theme?.defaultLanguages?.ORDER_DRIVER_ON_WAY || 'Driver on way'), slug: 'ORDER_DRIVER_ON_WAY', percentage: 80 }
   ]
   const objectStatus = orderStatus.find((o) => o.key === status)
   return objectStatus && objectStatus

package/template/app.js

@@ -476,6 +476,7 @@ export const App = () => {
                 isHome={isHome}
                 location={location}
                 isCustomLayout={singleBusinessConfig.isActive}
+                singleBusinessConfig={singleBusinessConfig}
                 searchValue={searchValue}
                 setSearchValue={setSearchValue}
               />
@@ -616,7 +617,7 @@ export const App = () => {
                               isUserVerifyRequired ? (
                                 <Redirect to='/verify' />
                               ) : (
-                                (orderStatus.options?.address?.location || isAllowUnaddressOrderType)
+                                (orderStatus.options?.address?.location || isAllowUnaddressOrderType) && !singleBusinessConfig.isActive
                                   ? <BusinessesList searchValueCustom={searchValue} />
                                   : <Redirect to={singleBusinessConfig.isActive ? `/${singleBusinessConfig.businessSlug}` : '/'} />
                               )