ordering-ui-external 2.6.8 → 2.7.0

package/_modules/themes/five/index.js

@@ -171,6 +171,12 @@ Object.defineProperty(exports, "Checkout", {
     return _Checkout.Checkout;
   }
 });
+Object.defineProperty(exports, "Confirm", {
+  enumerable: true,
+  get: function get() {
+    return _Confirm.Confirm;
+  }
+});
 Object.defineProperty(exports, "DriverTips", {
   enumerable: true,
   get: function get() {
@@ -621,6 +627,12 @@ Object.defineProperty(exports, "Select", {
     return _Select.Select;
   }
 });
+Object.defineProperty(exports, "SendGiftCard", {
+  enumerable: true,
+  get: function get() {
+    return _SendGiftCard.SendGiftCard;
+  }
+});
 Object.defineProperty(exports, "ServiceForm", {
   enumerable: true,
   get: function get() {
@@ -693,6 +705,12 @@ Object.defineProperty(exports, "Switch", {
     return _Switch.Switch;
   }
 });
+Object.defineProperty(exports, "TaxInformation", {
+  enumerable: true,
+  get: function get() {
+    return _TaxInformation.TaxInformation;
+  }
+});
 Object.defineProperty(exports, "TextArea", {
   enumerable: true,
   get: function get() {
@@ -864,6 +882,9 @@ var _ActionsSection = require("./src/components/OrderDetails/ActionsSection");
 var _ProductShare = require("./src/components/ProductShare");
 var _MultiCart = require("./src/components/MultiCart");
 var _QueryLoginSpoonity = require("./src/components/QueryLoginSpoonity");
+var _Confirm = require("./src/components/Confirm");
+var _TaxInformation = require("./src/components/TaxInformation");
+var _SendGiftCard = require("./src/components/GiftCard/SendGiftCard");
 var _Buttons = require("./src/styles/Buttons");
 var _Inputs = require("./src/styles/Inputs");
 var _Select = require("./src/styles/Select");

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

@@ -116,9 +116,13 @@ var BusinessControllerUI = function BusinessControllerUI(props) {
   // }
 
   var handleBusinessClick = function handleBusinessClick(e) {
-    var _favoriteRef$current;
+    var _favoriteRef$current, _business$menus;
     if (favoriteRef !== null && favoriteRef !== void 0 && (_favoriteRef$current = favoriteRef.current) !== null && _favoriteRef$current !== void 0 && _favoriteRef$current.contains(e.target)) return;
-    if (onPreorderBusiness && !isBusinessOpen) onPreorderBusiness(business);else handleClick(business);
+    var hasMenu = business === null || business === void 0 ? void 0 : (_business$menus = business.menus) === null || _business$menus === void 0 ? void 0 : _business$menus.filter(function (menu) {
+      var _menu$products;
+      return (menu === null || menu === void 0 ? void 0 : menu.enabled) && (menu === null || menu === void 0 ? void 0 : (_menu$products = menu.products) === null || _menu$products === void 0 ? void 0 : _menu$products.length) > 0;
+    }).length;
+    if (onPreorderBusiness && (!isBusinessOpen || !hasMenu)) onPreorderBusiness(business);else handleClick(business);
   };
   var handleChangeFavorite = function handleChangeFavorite() {
     if (auth) {

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

@@ -79,7 +79,8 @@ var BusinessProductsListingUI = function BusinessProductsListingUI(props) {
     onBusinessClick = props.onBusinessClick,
     handleChangePriceFilterValues = props.handleChangePriceFilterValues,
     priceFilterValues = props.priceFilterValues,
-    handleUpdateProfessionals = props.handleUpdateProfessionals;
+    handleUpdateProfessionals = props.handleUpdateProfessionals,
+    isCustomLayout = props.isCustomLayout;
   var business = businessState.business,
     loading = businessState.loading,
     error = businessState.error;
@@ -309,7 +310,7 @@ var BusinessProductsListingUI = function BusinessProductsListingUI(props) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _carts = carts === null || carts === void 0 ? void 0 : carts[adjustBusinessId];
-            products = carts === null || carts === void 0 ? void 0 : (_carts$adjustBusiness = carts[adjustBusinessId]) === null || _carts$adjustBusiness === void 0 ? void 0 : _carts$adjustBusiness.products;
+            products = (carts === null || carts === void 0 ? void 0 : (_carts$adjustBusiness = carts[adjustBusinessId]) === null || _carts$adjustBusiness === void 0 ? void 0 : _carts$adjustBusiness.products) || [];
             unavailableProducts = products.filter(function (product) {
               return product.valid !== true;
             });
@@ -422,7 +423,7 @@ var BusinessProductsListingUI = function BusinessProductsListingUI(props) {
       setBusiness({});
     };
   }, [cateringPreorder, business]);
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles.ProductsContainer, null, !props.useKioskApp && /*#__PURE__*/_react.default.createElement(_styles.HeaderContent, null, !location.pathname.includes('/marketplace') && /*#__PURE__*/_react.default.createElement("div", {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles.ProductsContainer, null, !props.useKioskApp && /*#__PURE__*/_react.default.createElement(_styles.HeaderContent, null, !isCustomLayout && !location.pathname.includes('/marketplace') && /*#__PURE__*/_react.default.createElement("div", {
     id: "back-arrow"
   }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.ArrowLeft, {
     className: "back-arrow",
@@ -444,8 +445,8 @@ var BusinessProductsListingUI = function BusinessProductsListingUI(props) {
     businessState: businessState,
     sortByOptions: sortByOptions,
     categoryState: categoryState,
+    isCustomLayout: isCustomLayout,
     categoriesState: props.categoriesState,
-    isCustomLayout: props.isCustomLayout,
     useKioskApp: props.useKioskApp,
     categorySelected: categorySelected,
     openCategories: openCategories,

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

@@ -454,7 +454,7 @@ var CartUI = function CartUI(props) {
         return onRemoveOffer(offer === null || offer === void 0 ? void 0 : offer.id);
       }
     }))), /*#__PURE__*/_react.default.createElement("td", null, "- ", parsePrice(offer === null || offer === void 0 ? void 0 : (_offer$summary2 = offer.summary) === null || _offer$summary2 === void 0 ? void 0 : _offer$summary2.discount)));
-  })), (orderState === null || orderState === void 0 ? void 0 : (_orderState$options3 = orderState.options) === null || _orderState$options3 === void 0 ? void 0 : _orderState$options3.type) === 1 && (cart === null || cart === void 0 ? void 0 : cart.delivery_price_with_discount) > 0 && !hideDeliveryFee && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('DELIVERY_FEE', 'Delivery Fee')), /*#__PURE__*/_react.default.createElement("td", null, parsePrice(cart === null || cart === void 0 ? void 0 : cart.delivery_price_with_discount))), !hideCartDiscount && (cart === null || cart === void 0 ? void 0 : (_cart$offers7 = cart.offers) === null || _cart$offers7 === void 0 ? void 0 : _cart$offers7.length) > 0 && (cart === null || cart === void 0 ? void 0 : (_cart$offers8 = cart.offers) === null || _cart$offers8 === void 0 ? void 0 : (_cart$offers8$filter = _cart$offers8.filter(function (offer) {
+  })), (orderState === null || orderState === void 0 ? void 0 : (_orderState$options3 = orderState.options) === null || _orderState$options3 === void 0 ? void 0 : _orderState$options3.type) === 1 && !hideDeliveryFee && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('DELIVERY_FEE', 'Delivery Fee')), /*#__PURE__*/_react.default.createElement("td", null, parsePrice(cart === null || cart === void 0 ? void 0 : cart.delivery_price_with_discount))), !hideCartDiscount && (cart === null || cart === void 0 ? void 0 : (_cart$offers7 = cart.offers) === null || _cart$offers7 === void 0 ? void 0 : _cart$offers7.length) > 0 && (cart === null || cart === void 0 ? void 0 : (_cart$offers8 = cart.offers) === null || _cart$offers8 === void 0 ? void 0 : (_cart$offers8$filter = _cart$offers8.filter(function (offer) {
     return (offer === null || offer === void 0 ? void 0 : offer.target) === 2;
   })) === null || _cart$offers8$filter === void 0 ? void 0 : _cart$offers8$filter.map(function (offer) {
     var _offer$summary3;

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

@@ -622,7 +622,8 @@ var Checkout = function Checkout(props) {
     handleOrderRedirect = props.handleOrderRedirect,
     handleCheckoutRedirect = props.handleCheckoutRedirect,
     handleSearchRedirect = props.handleSearchRedirect,
-    handleCheckoutListRedirect = props.handleCheckoutListRedirect;
+    handleCheckoutListRedirect = props.handleCheckoutListRedirect,
+    businessSlug = props.businessSlug;
   var _useOrder3 = (0, _orderingComponentsExternal.useOrder)(),
     _useOrder4 = _slicedToArray(_useOrder3, 2),
     orderState = _useOrder4[0],
@@ -671,6 +672,10 @@ var Checkout = function Checkout(props) {
     var _cart$products3;
     return (cart === null || cart === void 0 ? void 0 : cart.products) && (cart === null || cart === void 0 ? void 0 : (_cart$products3 = cart.products) === null || _cart$products3 === void 0 ? void 0 : _cart$products3.length);
   })) || null);
+  var carts = businessSlug ? cartsWithProducts.filter(function (cart) {
+    var _cart$business6;
+    return (cart === null || cart === void 0 ? void 0 : (_cart$business6 = cart.business) === null || _cart$business6 === void 0 ? void 0 : _cart$business6.slug) === businessSlug || businessSlug === (cart === null || cart === void 0 ? void 0 : cart.business_id);
+  }) : cartsWithProducts;
   var closeAlert = function closeAlert() {
     setAlertState({
       open: false,
@@ -713,7 +718,7 @@ var Checkout = function Checkout(props) {
           case 0:
             _context.prev = 0;
             result = {};
-            cart = cartsWithProducts.find(function (cart) {
+            cart = carts.find(function (cart) {
               return cart.uuid === cartId;
             });
             userCustomer = JSON.parse(window.localStorage.getItem('user-customer'));
@@ -853,12 +858,12 @@ var Checkout = function Checkout(props) {
     isResetPaymethod: isResetPaymethod,
     setIsResetPaymethod: setIsResetPaymethod
   });
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !cartUuid && orderState.carts && cartsWithProducts && (cartsWithProducts === null || cartsWithProducts === void 0 ? void 0 : cartsWithProducts.length) === 0 && /*#__PURE__*/_react.default.createElement(_NotFoundSource.NotFoundSource, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !cartUuid && orderState.carts && carts && (carts === null || carts === void 0 ? void 0 : carts.length) === 0 && /*#__PURE__*/_react.default.createElement(_NotFoundSource.NotFoundSource, {
     content: t('NOT_FOUND_CARTS', 'Sorry, You don\'t seem to have any carts.'),
     btnTitle: t('SEARCH_REDIRECT', 'Go to Businesses'),
     onClickButton: handleSearchRedirect
-  }), !cartUuid && orderState.carts && cartsWithProducts && (cartsWithProducts === null || cartsWithProducts === void 0 ? void 0 : cartsWithProducts.length) > 0 && /*#__PURE__*/_react.default.createElement(_styles.CartsList, null, /*#__PURE__*/_react.default.createElement(_CartContent.CartContent, {
-    carts: cartsWithProducts,
+  }), !cartUuid && orderState.carts && carts && (carts === null || carts === void 0 ? void 0 : carts.length) > 0 && /*#__PURE__*/_react.default.createElement(_styles.CartsList, null, /*#__PURE__*/_react.default.createElement(_CartContent.CartContent, {
+    carts: carts,
     isOrderStateCarts: !!orderState.carts,
     isForceOpenCart: true
   })), cartUuid && cartState.error && ((_cartState$error = cartState.error) === null || _cartState$error === void 0 ? void 0 : _cartState$error.length) > 0 && /*#__PURE__*/_react.default.createElement(_NotFoundSource.NotFoundSource, {

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

@@ -58,7 +58,9 @@ var Header = function Header(props) {
     isHideSignup = props.isHideSignup,
     isCustomerMode = props.isCustomerMode,
     searchValue = props.searchValue,
-    setSearchValue = props.setSearchValue;
+    setSearchValue = props.setSearchValue,
+    businessSlug = props.businessSlug,
+    notificationState = props.notificationState;
   var _useLocation = (0, _reactRouterDom.useLocation)(),
     pathname = _useLocation.pathname;
   var _useEvent = (0, _orderingComponentsExternal.useEvent)(),
@@ -146,6 +148,10 @@ var Header = function Header(props) {
     var _cart$products;
     return cart.products && ((_cart$products = cart.products) === null || _cart$products === void 0 ? void 0 : _cart$products.length) > 0;
   }) || null;
+  var carts = businessSlug ? cartsWithProducts.filter(function (cart) {
+    var _cart$business;
+    return (cart === null || cart === void 0 ? void 0 : (_cart$business = cart.business) === null || _cart$business === void 0 ? void 0 : _cart$business.slug) === businessSlug || businessSlug === (cart === null || cart === void 0 ? void 0 : cart.business_id);
+  }) : cartsWithProducts;
   var windowSize = (0, _useWindowSize.useWindowSize)();
   var onlineStatus = (0, _useOnlineStatus.useOnlineStatus)();
   var userCustomer = JSON.parse(window.localStorage.getItem('user-customer'));
@@ -366,7 +372,7 @@ var Header = function Header(props) {
     }
   }, t('SIGN_UP', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag3 = theme.defaultLanguages) === null || _theme$defaultLanguag3 === void 0 ? void 0 : _theme$defaultLanguag3.SIGN_UP) || 'Sign up'))), auth && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, isShowOrderOptions && (windowSize.width > 768 ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !isMulticheckoutPage ? /*#__PURE__*/_react.default.createElement(_CartPopover.CartPopover, {
     open: openPopover.cart,
-    carts: cartsWithProducts,
+    carts: carts,
     onClick: function onClick() {
       return handleTogglePopover('cart');
     },
@@ -379,7 +385,7 @@ var Header = function Header(props) {
     setPreorderBusiness: setPreorderBusiness
   }) : null) : /*#__PURE__*/_react.default.createElement(_HeaderOption.HeaderOption, {
     variant: "cart",
-    totalCarts: cartsWithProducts === null || cartsWithProducts === void 0 ? void 0 : cartsWithProducts.length,
+    totalCarts: carts === null || carts === void 0 ? void 0 : carts.length,
     onClick: function onClick(variant) {
       return openModal(variant);
     }
@@ -431,7 +437,7 @@ var Header = function Header(props) {
     },
     width: modalSelected === 'address' ? orderState !== null && orderState !== void 0 && (_orderState$options17 = orderState.options) !== null && _orderState$options17 !== void 0 && _orderState$options17.user_id ? '70%' : '50%' : '700px'
   }), modalSelected === 'cart' && /*#__PURE__*/_react.default.createElement(_CartContent.CartContent, {
-    carts: cartsWithProducts,
+    carts: carts,
     isOrderStateCarts: !!orderState.carts,
     onClose: function onClose() {
       return setModalIsOpen(false);

package/_modules/themes/five/src/components/OrderDetails/OrderBillSection.js

@@ -134,7 +134,7 @@ var OrderBillSection = function OrderBillSection(props) {
       size: "20",
       color: theme.colors.primary
     }))), /*#__PURE__*/_react.default.createElement("td", null, "- ", parsePrice(offer === null || offer === void 0 ? void 0 : (_offer$summary2 = offer.summary) === null || _offer$summary2 === void 0 ? void 0 : _offer$summary2.discount)));
-  })), (order === null || order === void 0 ? void 0 : (_order$summary12 = order.summary) === null || _order$summary12 === void 0 ? void 0 : _order$summary12.delivery_price) > 0 && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('DELIVERY_FEE', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag4 = theme.defaultLanguages) === null || _theme$defaultLanguag4 === void 0 ? void 0 : _theme$defaultLanguag4.DELIVERY_FEE) || 'Delivery Fee')), /*#__PURE__*/_react.default.createElement("td", null, parsePrice(order === null || order === void 0 ? void 0 : (_order$summary13 = order.summary) === null || _order$summary13 === void 0 ? void 0 : _order$summary13.delivery_price))), (order === null || order === void 0 ? void 0 : (_order$offers6 = order.offers) === null || _order$offers6 === void 0 ? void 0 : _order$offers6.length) > 0 && (order === null || order === void 0 ? void 0 : (_order$offers7 = order.offers) === null || _order$offers7 === void 0 ? void 0 : (_order$offers7$filter = _order$offers7.filter(function (offer) {
+  })), typeof (order === null || order === void 0 ? void 0 : (_order$summary12 = order.summary) === null || _order$summary12 === void 0 ? void 0 : _order$summary12.delivery_price) === 'number' && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('DELIVERY_FEE', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag4 = theme.defaultLanguages) === null || _theme$defaultLanguag4 === void 0 ? void 0 : _theme$defaultLanguag4.DELIVERY_FEE) || 'Delivery Fee')), /*#__PURE__*/_react.default.createElement("td", null, parsePrice(order === null || order === void 0 ? void 0 : (_order$summary13 = order.summary) === null || _order$summary13 === void 0 ? void 0 : _order$summary13.delivery_price))), (order === null || order === void 0 ? void 0 : (_order$offers6 = order.offers) === null || _order$offers6 === void 0 ? void 0 : _order$offers6.length) > 0 && (order === null || order === void 0 ? void 0 : (_order$offers7 = order.offers) === null || _order$offers7 === void 0 ? void 0 : (_order$offers7$filter = _order$offers7.filter(function (offer) {
     return (offer === null || offer === void 0 ? void 0 : offer.target) === 2;
   })) === null || _order$offers7$filter === void 0 ? void 0 : _order$offers7$filter.map(function (offer) {
     var _offer$name3, _offer$name3$toUpperC, _offer$summary3;

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

@@ -28,13 +28,27 @@ var OrderEta = function OrderEta(props) {
     estimatedDeliveryTime = _useState2[0],
     setEstimatedDeliveryTime = _useState2[1];
   var getEstimatedDeliveryTime = function getEstimatedDeliveryTime() {
-    var _estimatedTime = null;
+    var estimatedUtcTime = null;
     var totalEta = 0;
+    if (order !== null && order !== void 0 && order.delivered_in) totalEta += order === null || order === void 0 ? void 0 : order.delivered_in;
+    if (order !== null && order !== void 0 && order.prepared_in) totalEta += order === null || order === void 0 ? void 0 : order.prepared_in;
+    if ((order === null || order === void 0 ? void 0 : order.delivery_type) === 1 && order !== null && order !== void 0 && order.eta_drive_time) {
+      totalEta += order === null || order === void 0 ? void 0 : order.eta_drive_time;
+    }
     var _delivery = order !== null && order !== void 0 && order.delivery_datetime_utc ? order === null || order === void 0 ? void 0 : order.delivery_datetime_utc : order === null || order === void 0 ? void 0 : order.delivery_datetime;
     if (order !== null && order !== void 0 && order.eta_current_status_time) {
       var _order$reporting_data;
       var currentStatueEta = order === null || order === void 0 ? void 0 : order.eta_current_status_time;
       totalEta += currentStatueEta;
+      var previousStatusTimes = 0;
+      if (order !== null && order !== void 0 && order.eta_previous_status_times) {
+        Object.keys(order.eta_previous_status_times).map(function (key) {
+          if (!key.includes('status_penalty')) {
+            previousStatusTimes += order.eta_previous_status_times[key];
+          }
+        });
+      }
+      totalEta += previousStatusTimes;
       var nextStatusTimes = 0;
       if (order !== null && order !== void 0 && order.eta_next_status_times) {
         Object.keys(order.eta_next_status_times).map(function (key) {
@@ -49,15 +63,11 @@ var OrderEta = function OrderEta(props) {
       if (diffTimeAsMinutes <= 0) {
         totalEta += Math.floor(Math.abs(diffTimeAsMinutes / (order === null || order === void 0 ? void 0 : order.eta_current_status_time)) + 1) * (order === null || order === void 0 ? void 0 : order.eta_current_status_penalty_time);
       }
-      _estimatedTime = _moment.default.utc(_delivery).add(totalEta, 'minutes');
     } else {
-      var timesToAdd = 0;
-      if (order !== null && order !== void 0 && order.delivered_in) timesToAdd += order === null || order === void 0 ? void 0 : order.delivered_in;
-      if (order !== null && order !== void 0 && order.prepared_in) timesToAdd += order === null || order === void 0 ? void 0 : order.prepared_in;
-      var _etaTime = (order === null || order === void 0 ? void 0 : order.eta_time) + timesToAdd;
-      _estimatedTime = _moment.default.utc(_delivery).add(_etaTime, 'minutes');
+      totalEta = (order === null || order === void 0 ? void 0 : order.eta_time) + totalEta;
     }
-    _estimatedTime = outputFormat ? (0, _moment.default)(_estimatedTime).local().format(outputFormat) : parseDate(_estimatedTime, {
+    estimatedUtcTime = _moment.default.utc(_delivery).add(totalEta, 'minutes');
+    var _estimatedTime = outputFormat ? (0, _moment.default)(estimatedUtcTime).local().format(outputFormat) : parseDate(estimatedUtcTime, {
       utc: false
     });
     setEstimatedDeliveryTime(_estimatedTime);

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

@@ -72,7 +72,7 @@ var SectionTitle = _styledComponents.default.h3(_templateObject18 || (_templateO
 exports.SectionTitle = SectionTitle;
 var ProductComment = _styledComponents.default.div(_templateObject19 || (_templateObject19 = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: column;\n  margin-bottom: 130px;\n\n  textarea {\n    margin-top: 8px;\n  }\n\n  p {\n    font-weight: 300;\n    margin-bottom: 5px;\n  }\n\n  @media (min-width: 577px) {\n    margin-bottom: 62px;\n  }\n\n  @media (min-width: 769px) {\n    margin-bottom: 0px;\n    padding-bottom: 10px;\n  }\n"])));
 exports.ProductComment = ProductComment;
-var ProductActions = _styledComponents.default.div(_templateObject20 || (_templateObject20 = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: column;\n  align-items: center;\n  padding: 10px 0px;\n  width: 100%;\n  z-index: 9999997;\n\n  position: fixed;\n  bottom: 0;\n  right: 0;\n  width: 100%;\n  background-color: #FFF;\n\n  div.price {\n    padding-top: 10px;\n    color: ", ";\n    h4 {\n      margin: 0;\n      font-weight: 600;\n      font-size: 20px;\n      line-height: 20px;\n    }\n    span {\n      font-size: 13px;\n      color: #D83520;\n      line-height: 15px;\n    }\n  }\n\n  div.incdec-control {\n    width: 135px;\n    display: flex;\n    justify-content: space-around;\n    align-items: center;\n    position: relative;\n\n    svg {\n      width: 25px;\n      height: 25px;\n      cursor: pointer;\n    }\n  }\n\n  div.price-amount-block {\n    display: flex;\n    justify-content: space-between;\n    width: 70%\n  }\n\n  svg {\n    color: ", ";\n  }\n\n  svg.disabled {\n    pointer-events: none;\n    color: #CED4DA;\n  }\n\n  button:disabled,\n  button.disabled {\n    background: #E9ECEF;\n    border: 1px solid #E9ECEF;\n    color: #B1BCCC;\n  }\n\n  button.add {\n    width: 90%;\n    padding: 5px 10px;\n    margin-top: 10px;\n    position: relative;\n\n    &.soldout {\n      width: 100%;\n      pointer-events: none;\n    }\n  }\n  .qty {\n    flex: 1;\n    text-align: center;\n    display: flex;\n    align-items: center;\n    height: 38px;\n    min-width: 60px;\n    box-sizing: border-box;\n    padding: 0;\n    margin: 0 10px;\n  }\n\n  #address_control {\n    button.add {\n      width: calc(100% - 20px) !important;\n      margin: 10px 10px 0 10px;\n    }\n  }\n  \n  div#address_list {\n    padding: 0;\n  }\n\n  @media (min-width: 577px) {\n    position: sticky;\n  }\n\n  @media (min-width: 1200px) {\n    bottom: 0px;\n    flex-direction: row;\n    justify-content: space-between;\n    border-top: 1px solid #E9ECEF;\n    width: calc(100% + 40px);\n    transform: translateX(-20px);\n    padding: 10px 20px;\n    box-sizing: border-box;\n\n    ", "\n\n    div.price {\n      width: 25%;\n    }\n\n    button.add {\n      width: 35%;\n      margin-top: 0;\n    }\n\n    div.incdec-control {\n      padding-right: 18%;\n      &.show-weight-unit{\n        width: 30%;\n      }\n    }\n  }\n"])), function (props) {
+var ProductActions = _styledComponents.default.div(_templateObject20 || (_templateObject20 = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: column;\n  align-items: center;\n  padding: 10px 0px;\n  width: 100%;\n  z-index: 9999997;\n\n  position: fixed;\n  bottom: 0;\n  right: 0;\n  width: 100%;\n  background-color: #FFF;\n\n  div.price {\n    padding-top: 10px;\n    color: ", ";\n    h4 {\n      margin: 0;\n      font-weight: 600;\n      font-size: 20px;\n      line-height: 20px;\n    }\n    span {\n      font-size: 13px;\n      color: #D83520;\n      line-height: 15px;\n    }\n  }\n\n  div.incdec-control {\n    width: 135px;\n    display: flex;\n    justify-content: space-around;\n    align-items: center;\n    position: relative;\n\n    svg {\n      width: 25px;\n      height: 25px;\n      cursor: pointer;\n    }\n  }\n\n  div.price-amount-block {\n    display: flex;\n    justify-content: space-between;\n    width: 70%\n  }\n\n  svg {\n    color: ", ";\n  }\n\n  svg.disabled {\n    pointer-events: none;\n    color: #CED4DA;\n  }\n\n  button:disabled,\n  button.disabled {\n    background: #E9ECEF;\n    border: 1px solid #E9ECEF;\n    color: #B1BCCC;\n  }\n\n  button.add {\n    width: 90%;\n    padding: 5px 10px;\n    margin-top: 10px;\n    position: relative;\n\n    &.soldout {\n      width: 100%;\n      pointer-events: none;\n    }\n  }\n  .qty {\n    flex: 1;\n    text-align: center;\n    display: flex;\n    align-items: center;\n    height: 38px;\n    min-width: 60px;\n    box-sizing: border-box;\n    padding: 0;\n    margin: 0 10px;\n  }\n\n  #address_control {\n    button.add {\n      width: calc(100% - 20px) !important;\n      margin: 10px 10px 0 10px;\n    }\n  }\n  \n  div#address_list {\n    padding: 0;\n  }\n\n  @media (min-width: 577px) {\n    position: sticky;\n  }\n\n  @media (min-width: 1200px) {\n    bottom: 0px;\n    flex-direction: row;\n    justify-content: space-between;\n    border-top: 1px solid #E9ECEF;\n    width: calc(100% + 40px);\n    transform: translateX(-20px);\n    padding: 10px 20px;\n    box-sizing: border-box;\n\n    ", "\n\n    div.price {\n      width: 25%;\n    }\n\n    button.add {\n      width: 35%;\n      margin-top: 0;\n    }\n\n    div.incdec-control {\n      margin-right: 18%;\n      &.show-weight-unit{\n        width: 30%;\n      }\n    }\n  }\n"])), function (props) {
   var _props$theme;
   return (_props$theme = props.theme) === null || _props$theme === void 0 ? void 0 : _props$theme.colors.darkTextColor;
 }, function (props) {

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

@@ -149,7 +149,7 @@ var RenderProductsLayout = function RenderProductsLayout(props) {
   }, [categoryClicked]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !isLoading && (business === null || business === void 0 ? void 0 : business.id) && /*#__PURE__*/_react.default.createElement(_styles.WrappLayout, {
     isCartOnProductsList: isCartOnProductsList
-  }, (!hideBusinessNearCity && !useKioskApp || props.forceShowNearBusiness) && /*#__PURE__*/_react.default.createElement(_styles.NearBusiness, null, /*#__PURE__*/_react.default.createElement(_BusinessesListing.BusinessesListing, {
+  }, (!hideBusinessNearCity && !useKioskApp || props.forceShowNearBusiness) && !isCustomLayout && /*#__PURE__*/_react.default.createElement(_styles.NearBusiness, null, /*#__PURE__*/_react.default.createElement(_BusinessesListing.BusinessesListing, {
     logosLayout: true,
     propsToFetch: ['id', 'logo', 'location', 'timezone', 'schedule', 'open', 'slug'],
     cityId: businessState === null || businessState === void 0 ? void 0 : (_businessState$busine = businessState.business) === null || _businessState$busine === void 0 ? void 0 : _businessState$busine.city_id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-external",
-  "version": "2.6.8",
+  "version": "2.7.0",
   "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.7.5",
+    "ordering-components-external": "2.8.0",
     "payment": "^2.4.6",
     "polished": "^3.6.6",
     "react-bootstrap-icons": "^1.7.2",

package/src/themes/five/index.js

@@ -115,6 +115,9 @@ import { ActionsSection } from './src/components/OrderDetails/ActionsSection'
 import { ProductShare } from './src/components/ProductShare'
 import { MultiCart } from './src/components/MultiCart'
 import { QueryLoginSpoonity } from './src/components/QueryLoginSpoonity'
+import { Confirm } from './src/components/Confirm'
+import { TaxInformation } from './src/components/TaxInformation'
+import { SendGiftCard } from './src/components/GiftCard/SendGiftCard'
 
 import { Button } from './src/styles/Buttons'
 import { Input, TextArea } from './src/styles/Inputs'
@@ -241,6 +244,9 @@ export {
   ProductShare,
   MultiCart,
   QueryLoginSpoonity,
+  Confirm,
+  TaxInformation,
+  SendGiftCard,
   // styles
   Button,
   Input,

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

@@ -95,8 +95,8 @@ const BusinessControllerUI = (props) => {
 
   const handleBusinessClick = (e) => {
     if (favoriteRef?.current?.contains(e.target)) return
-
-    if (onPreorderBusiness && !isBusinessOpen) onPreorderBusiness(business)
+    const hasMenu = business?.menus?.filter(menu => menu?.enabled && menu?.products?.length > 0).length
+    if (onPreorderBusiness && (!isBusinessOpen || !hasMenu)) onPreorderBusiness(business)
     else handleClick(business)
   }
 

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

@@ -83,7 +83,8 @@ const BusinessProductsListingUI = (props) => {
     onBusinessClick,
     handleChangePriceFilterValues,
     priceFilterValues,
-    handleUpdateProfessionals
+    handleUpdateProfessionals,
+    isCustomLayout
   } = props
 
   const { business, loading, error } = businessState
@@ -224,7 +225,7 @@ const BusinessProductsListingUI = (props) => {
   }
   const adjustBusiness = async (adjustBusinessId) => {
     const _carts = carts?.[adjustBusinessId]
-    const products = carts?.[adjustBusinessId]?.products
+    const products = carts?.[adjustBusinessId]?.products || []
     const unavailableProducts = products.filter(product => product.valid !== true)
     const alreadyRemoved = sessionStorage.getItem('already-removed')
     sessionStorage.removeItem('already-removed')
@@ -327,7 +328,7 @@ const BusinessProductsListingUI = (props) => {
       <ProductsContainer>
         {!props.useKioskApp && (
           <HeaderContent>
-            {!location.pathname.includes('/marketplace') && (
+            {!isCustomLayout && !location.pathname.includes('/marketplace') && (
               <div id='back-arrow'>
                 <ArrowLeft className='back-arrow' onClick={() => handleGoToBusinessList()} />
               </div>
@@ -352,8 +353,8 @@ const BusinessProductsListingUI = (props) => {
           businessState={businessState}
           sortByOptions={sortByOptions}
           categoryState={categoryState}
+          isCustomLayout={isCustomLayout}
           categoriesState={props.categoriesState}
-          isCustomLayout={props.isCustomLayout}
           useKioskApp={props.useKioskApp}
           categorySelected={categorySelected}
           openCategories={openCategories}

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

@@ -421,7 +421,7 @@ const CartUI = (props) => {
                         </tr>
                       ))
                     }
-                    {orderState?.options?.type === 1 && cart?.delivery_price_with_discount > 0 && !hideDeliveryFee && (
+                    {orderState?.options?.type === 1 && !hideDeliveryFee && (
                       <tr>
                         <td>{t('DELIVERY_FEE', 'Delivery Fee')}</td>
                         <td>{parsePrice(cart?.delivery_price_with_discount)}</td>

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

@@ -3,7 +3,7 @@ import VscWarning from '@meronex/icons/vsc/VscWarning'
 import Skeleton from 'react-loading-skeleton'
 import { useTheme } from 'styled-components'
 import { Modal } from '../Modal'
-import {  
+import {
   Checkout as CheckoutController,
   useOrder,
   useSession,
@@ -755,7 +755,8 @@ export const Checkout = (props) => {
     handleOrderRedirect,
     handleCheckoutRedirect,
     handleSearchRedirect,
-    handleCheckoutListRedirect
+    handleCheckoutListRedirect,
+    businessSlug
   } = props
 
   const [orderState, { confirmCart }] = useOrder()
@@ -772,7 +773,9 @@ export const Checkout = (props) => {
   const [isResetPaymethod, setIsResetPaymethod] = useState(false)
 
   const cartsWithProducts = orderState?.carts && (Object.values(orderState?.carts)?.filter(cart => cart?.products && cart?.products?.length) || null)
-
+  const carts = businessSlug
+    ? cartsWithProducts.filter((cart) => cart?.business?.slug === businessSlug || businessSlug === cart?.business_id)
+    : cartsWithProducts
   const closeAlert = () => {
     setAlertState({
       open: false,
@@ -812,7 +815,7 @@ export const Checkout = (props) => {
   const getOrder = async (cartId) => {
     try {
       let result = {}
-      const cart = cartsWithProducts.find(cart => cart.uuid === cartId)
+      const cart = carts.find(cart => cart.uuid === cartId)
       const userCustomer = JSON.parse(window.localStorage.getItem('user-customer'))
       if (cart && !userCustomer) {
         result = { ...cart }
@@ -920,17 +923,17 @@ export const Checkout = (props) => {
 
   return (
     <>
-      {!cartUuid && orderState.carts && cartsWithProducts && cartsWithProducts?.length === 0 && (
+      {!cartUuid && orderState.carts && carts && carts?.length === 0 && (
         <NotFoundSource
           content={t('NOT_FOUND_CARTS', 'Sorry, You don\'t seem to have any carts.')}
           btnTitle={t('SEARCH_REDIRECT', 'Go to Businesses')}
           onClickButton={handleSearchRedirect}
         />
       )}
-      {!cartUuid && orderState.carts && cartsWithProducts && cartsWithProducts?.length > 0 && (
+      {!cartUuid && orderState.carts && carts && carts?.length > 0 && (
         <CartsList>
           <CartContent
-            carts={cartsWithProducts}
+            carts={carts}
             isOrderStateCarts={!!orderState.carts}
             isForceOpenCart
           />

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

@@ -59,7 +59,9 @@ export const Header = (props) => {
     isHideSignup,
     isCustomerMode,
     searchValue,
-    setSearchValue
+    setSearchValue,
+    businessSlug,
+    notificationState
   } = props
 
   const { pathname } = useLocation()
@@ -90,6 +92,9 @@ export const Header = (props) => {
   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 carts = businessSlug
+    ? cartsWithProducts.filter((cart) => cart?.business?.slug === businessSlug || businessSlug === cart?.business_id)
+    : cartsWithProducts
 
   const windowSize = useWindowSize()
   const onlineStatus = useOnlineStatus()
@@ -367,7 +372,7 @@ export const Header = (props) => {
                           {!isMulticheckoutPage ? (
                             <CartPopover
                               open={openPopover.cart}
-                              carts={cartsWithProducts}
+                              carts={carts}
                               onClick={() => handleTogglePopover('cart')}
                               onClose={() => handleClosePopover('cart')}
                               auth={auth}
@@ -380,7 +385,7 @@ export const Header = (props) => {
                       ) : (
                         <HeaderOption
                           variant='cart'
-                          totalCarts={cartsWithProducts?.length}
+                          totalCarts={carts?.length}
                           onClick={(variant) => openModal(variant)}
                         />
                       )
@@ -469,7 +474,7 @@ export const Header = (props) => {
         >
           {modalSelected === 'cart' && (
             <CartContent
-              carts={cartsWithProducts}
+              carts={carts}
               isOrderStateCarts={!!orderState.carts}
               onClose={() => setModalIsOpen(false)}
             />

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

@@ -175,7 +175,7 @@ export const OrderBillSection = (props) => {
               </tr>
             ))
           }
-          {order?.summary?.delivery_price > 0 && (
+          {typeof order?.summary?.delivery_price === 'number' && (
             <tr>
               <td>{t('DELIVERY_FEE', theme?.defaultLanguages?.DELIVERY_FEE || 'Delivery Fee')}</td>
               <td>{parsePrice(order?.summary?.delivery_price)}</td>

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

@@ -12,14 +12,31 @@ export const OrderEta = (props) => {
   const [estimatedDeliveryTime, setEstimatedDeliveryTime] = useState(null)
 
   const getEstimatedDeliveryTime = () => {
-    let _estimatedTime = null
+    let estimatedUtcTime = null
     let totalEta = 0
+    if (order?.delivered_in) totalEta += order?.delivered_in
+    if (order?.prepared_in) totalEta += order?.prepared_in
+    if (order?.delivery_type === 1 && order?.eta_drive_time) {
+      totalEta += order?.eta_drive_time
+    }
+
     const _delivery = order?.delivery_datetime_utc
       ? order?.delivery_datetime_utc
       : order?.delivery_datetime
+
     if (order?.eta_current_status_time) {
       const currentStatueEta = order?.eta_current_status_time
       totalEta += currentStatueEta
+      let previousStatusTimes = 0
+      if (order?.eta_previous_status_times) {
+        Object.keys(order.eta_previous_status_times).map(key => {
+          if (!key.includes('status_penalty')) {
+            previousStatusTimes += order.eta_previous_status_times[key]
+          }
+        })
+      }
+      totalEta += previousStatusTimes
+
       let nextStatusTimes = 0
       if (order?.eta_next_status_times) {
         Object.keys(order.eta_next_status_times).map(key => {
@@ -28,7 +45,6 @@ export const OrderEta = (props) => {
           }
         })
       }
-
       totalEta += nextStatusTimes
 
       const diffTimeAsSeconds = moment.utc(order?.reporting_data?.at[`status:${order.status}`]).add(order?.eta_current_status_time, 'minutes').diff(moment().utc(), 'seconds')
@@ -36,15 +52,11 @@ export const OrderEta = (props) => {
       if (diffTimeAsMinutes <= 0) {
         totalEta += (Math.floor(Math.abs(diffTimeAsMinutes / order?.eta_current_status_time) + 1) * order?.eta_current_status_penalty_time)
       }
-      _estimatedTime = moment.utc(_delivery).add(totalEta, 'minutes')
     } else {
-      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')
+      totalEta = order?.eta_time + totalEta
     }
-    _estimatedTime = outputFormat ? moment(_estimatedTime).local().format(outputFormat) : parseDate(_estimatedTime, { utc: false })
+    estimatedUtcTime = moment.utc(_delivery).add(totalEta, 'minutes')
+    const _estimatedTime = outputFormat ? moment(estimatedUtcTime).local().format(outputFormat) : parseDate(estimatedUtcTime, { utc: false })
     setEstimatedDeliveryTime(_estimatedTime)
   }
 

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

@@ -398,7 +398,7 @@ export const ProductActions = styled.div`
     }
 
     div.incdec-control {
-      padding-right: 18%;
+      margin-right: 18%;
       &.show-weight-unit{
         width: 30%;
       }

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

@@ -160,7 +160,7 @@ export const RenderProductsLayout = (props) => {
     <>
       {!isLoading && business?.id && (
         <WrappLayout isCartOnProductsList={isCartOnProductsList}>
-          {((!hideBusinessNearCity && !useKioskApp) || props.forceShowNearBusiness) && (
+          {((!hideBusinessNearCity && !useKioskApp) || props.forceShowNearBusiness) && !isCustomLayout && (
             <NearBusiness>
               <BusinessesListing
                 logosLayout