ordering-ui-external 1.8.5 → 1.8.7

package/_modules/themes/five/src/components/BusinessesListing/layouts/OriginalBusinessesListing/index.js

@@ -371,7 +371,7 @@ var BusinessesListingUI = function BusinessesListingUI(props) {
     businessList: businessesList.businesses,
     userLocation: orderState === null || orderState === void 0 ? void 0 : (_orderState$options6 = orderState.options) === null || _orderState$options6 === void 0 ? void 0 : (_orderState$options6$ = _orderState$options6.address) === null || _orderState$options6$ === void 0 ? void 0 : _orderState$options6$.location,
     setErrors: setMapErrors
-  })), hasHighRatedBusiness && !props.franchiseId && /*#__PURE__*/_react.default.createElement(_styles.HightestRatedWrapper, null, /*#__PURE__*/_react.default.createElement(_styles.Divider, null), /*#__PURE__*/_react.default.createElement(_HighestRated.HighestRated, {
+  })), !isChew && hasHighRatedBusiness && !props.franchiseId && /*#__PURE__*/_react.default.createElement(_styles.HightestRatedWrapper, null, /*#__PURE__*/_react.default.createElement(_styles.Divider, null), /*#__PURE__*/_react.default.createElement(_HighestRated.HighestRated, {
     handleClickAddress: handleClickAddress,
     setHasHighRatedBusiness: setHasHighRatedBusiness,
     onBusinessClick: onBusinessClick,

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

@@ -20,7 +20,6 @@ var _useWindowSize = require("../../../../../hooks/useWindowSize");
 var _TaxInformation = require("../TaxInformation");
 var _Inputs = require("../../styles/Inputs");
 var _SpinnerLoader = require("../../../../../components/SpinnerLoader");
-var _CartStoresListing = require("../../../../franchise/src/components/CartStoresListing");
 var _DriverTips = require("../DriverTips");
 var _ServiceForm = require("../ServiceForm");
 var _styles = require("./styles");
@@ -95,6 +94,9 @@ var CartUI = function CartUI(props) {
     _useSite2 = _slicedToArray(_useSite, 1),
     site = _useSite2[0].site;
   var windowSize = (0, _useWindowSize.useWindowSize)();
+  var _useCustomer = (0, _orderingComponentsExternal.useCustomer)(),
+    _useCustomer2 = _slicedToArray(_useCustomer, 1),
+    user = _useCustomer2[0].user;
   var driverTipsOptions = typeof (configs === null || configs === void 0 ? void 0 : (_configs$driver_tip_o = configs.driver_tip_options) === null || _configs$driver_tip_o === void 0 ? void 0 : _configs$driver_tip_o.value) === 'string' ? JSON.parse(configs === null || configs === void 0 ? void 0 : (_configs$driver_tip_o2 = configs.driver_tip_options) === null || _configs$driver_tip_o2 === void 0 ? void 0 : _configs$driver_tip_o2.value) || [] : (configs === null || configs === void 0 ? void 0 : (_configs$driver_tip_o3 = configs.driver_tip_options) === null || _configs$driver_tip_o3 === void 0 ? void 0 : _configs$driver_tip_o3.value) || [];
   var _useState = (0, _react.useState)({
       open: false,
@@ -133,7 +135,6 @@ var CartUI = function CartUI(props) {
     setIsUpselling = _useState14[1];
   var _useState15 = (0, _react.useState)(false),
     _useState16 = _slicedToArray(_useState15, 2),
-    openChangeStore = _useState16[0],
     setOpenChangeStore = _useState16[1];
   var businessUrlTemplate = (site === null || site === void 0 ? void 0 : site.business_url_template) || '/store/:business_slug';
   var isCouponEnabled = validationFields === null || validationFields === void 0 ? void 0 : (_validationFields$fie = validationFields.fields) === null || _validationFields$fie === void 0 ? void 0 : (_validationFields$fie2 = _validationFields$fie.checkout) === null || _validationFields$fie2 === void 0 ? void 0 : (_validationFields$fie3 = _validationFields$fie2.coupon) === null || _validationFields$fie3 === void 0 ? void 0 : _validationFields$fie3.enabled;
@@ -267,7 +268,7 @@ var CartUI = function CartUI(props) {
         setConfirm(_objectSpread(_objectSpread({}, confirm), {}, {
           open: false
         }));
-        handleRemoveOfferClick(id);
+        handleRemoveOfferClick(id, user === null || user === void 0 ? void 0 : user.id);
       }
     });
   };
@@ -587,27 +588,6 @@ var CartUI = function CartUI(props) {
     openUpselling: openUpselling,
     canOpenUpselling: canOpenUpselling,
     setCanOpenUpselling: setCanOpenUpselling
-  })), /*#__PURE__*/_react.default.createElement(_Modal.Modal, {
-    width: "70%",
-    title: t('CHANGE_STORE', 'Change store'),
-    open: openChangeStore,
-    padding: "20px",
-    closeOnBackdrop: true,
-    modalTitleStyle: {
-      display: 'flex',
-      justifyContent: 'center'
-    },
-    onClose: function onClose() {
-      return setOpenChangeStore(false);
-    }
-  }, /*#__PURE__*/_react.default.createElement(_CartStoresListing.CartStoresListing, {
-    isStore: isStore,
-    pageChangeStore: "business",
-    cartuuid: cart === null || cart === void 0 ? void 0 : cart.uuid,
-    onClose: function onClose() {
-      return setOpenChangeStore(false);
-    },
-    handleCustomStoreRedirect: handleStoreRedirect
   }))), (_props$afterComponent = props.afterComponents) === null || _props$afterComponent === void 0 ? void 0 : _props$afterComponent.map(function (AfterComponent, i) {
     return /*#__PURE__*/_react.default.createElement(AfterComponent, _extends({
       key: i

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

@@ -289,7 +289,7 @@ var UserFormDetailsUI = function UserFormDetailsUI(props) {
   (0, _react.useEffect)(function () {
     var _formState$changes9, _formState$changes10, _configs$verification2;
     if (isChanged && userPhoneNumber && isValidPhoneNumber && formState !== null && formState !== void 0 && (_formState$changes9 = formState.changes) !== null && _formState$changes9 !== void 0 && _formState$changes9.country_phone_code && formState !== null && formState !== void 0 && (_formState$changes10 = formState.changes) !== null && _formState$changes10 !== void 0 && _formState$changes10.cellphone && (configs === null || configs === void 0 ? void 0 : (_configs$verification2 = configs.verification_phone_required) === null || _configs$verification2 === void 0 ? void 0 : _configs$verification2.value) === '1') {
-      setWillVerifyOtpState(true);
+      setWillVerifyOtpState && setWillVerifyOtpState(true);
     }
   }, [isValidPhoneNumber, userPhoneNumber, configs === null || configs === void 0 ? void 0 : (_configs$verification3 = configs.verification_phone_required) === null || _configs$verification3 === void 0 ? void 0 : _configs$verification3.value, isChanged]);
   (0, _react.useEffect)(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-external",
-  "version": "1.8.5",
+  "version": "1.8.7",
   "description": "Ordering UI Components",
   "main": "./_modules/index.js",
   "exports": {
@@ -85,7 +85,7 @@
     "libphonenumber-js": "^1.9.4",
     "lodash": "^4.17.19",
     "moment": "^2.29.4",
-    "ordering-components-external": "1.7.1",
+    "ordering-components-external": "1.7.2",
     "polished": "^3.6.6",
     "react-bootstrap-icons": "^1.7.2",
     "react-calendar": "^3.3.1",

package/src/themes/five/src/components/BusinessesListing/layouts/OriginalBusinessesListing/index.js

@@ -368,7 +368,7 @@ const BusinessesListingUI = (props) => {
             )}
           </>
         )}
-        {hasHighRatedBusiness && !props.franchiseId && (
+        {!isChew && hasHighRatedBusiness && !props.franchiseId && (
           <HightestRatedWrapper>
             <Divider />
             <HighestRated

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

@@ -1,5 +1,16 @@
 import React, { useState, useEffect } from 'react'
-import { Cart as CartController, useOrder, useLanguage, useEvent, useUtils, useValidationFields, useConfig, useOrderingTheme, useSite } from 'ordering-components-external'
+import {
+  Cart as CartController,
+  useOrder,
+  useLanguage,
+  useEvent,
+  useUtils,
+  useValidationFields,
+  useConfig,
+  useOrderingTheme,
+  useSite,
+  useCustomer
+} from 'ordering-components-external'
 import { Button } from '../../styles/Buttons'
 import { ProductItemAccordion } from '../ProductItemAccordion'
 import { BusinessItemAccordion } from '../BusinessItemAccordion'
@@ -13,7 +24,6 @@ import { useWindowSize } from '../../../../../hooks/useWindowSize'
 import { TaxInformation } from '../TaxInformation'
 import { TextArea } from '../../styles/Inputs'
 import { SpinnerLoader } from '../../../../../components/SpinnerLoader'
-import { CartStoresListing } from '../../../../franchise/src/components/CartStoresListing'
 import { DriverTips } from '../DriverTips'
 import { ServiceForm } from '../ServiceForm'
 import {
@@ -69,6 +79,7 @@ const CartUI = (props) => {
   const [{ configs }] = useConfig()
   const [{ site }] = useSite()
   const windowSize = useWindowSize()
+  const [{ user }] = useCustomer()
 
   const driverTipsOptions = typeof configs?.driver_tip_options?.value === 'string'
     ? JSON.parse(configs?.driver_tip_options?.value) || []
@@ -81,7 +92,7 @@ const CartUI = (props) => {
   const [canOpenUpselling, setCanOpenUpselling] = useState(false)
   const [openTaxModal, setOpenTaxModal] = useState({ open: false, tax: null })
   const [isUpselling, setIsUpselling] = useState(false)
-  const [openChangeStore, setOpenChangeStore] = useState(false)
+  const [, setOpenChangeStore] = useState(false)
 
   const businessUrlTemplate = site?.business_url_template || '/store/:business_slug'
 
@@ -198,7 +209,7 @@ const CartUI = (props) => {
       title: t('OFFER', 'Offer'),
       handleOnAccept: () => {
         setConfirm({ ...confirm, open: false })
-        handleRemoveOfferClick(id)
+        handleRemoveOfferClick(id, user?.id)
       }
     })
   }
@@ -622,7 +633,7 @@ const CartUI = (props) => {
           )}
         </CartSticky>
 
-        <Modal
+        {/* <Modal
           width='70%'
           title={t('CHANGE_STORE', 'Change store')}
           open={openChangeStore}
@@ -638,7 +649,7 @@ const CartUI = (props) => {
             onClose={() => setOpenChangeStore(false)}
             handleCustomStoreRedirect={handleStoreRedirect}
           />
-        </Modal>
+        </Modal> */}
 
       </CartContainer>
       {props.afterComponents?.map((AfterComponent, i) => (

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

@@ -260,7 +260,7 @@ export const UserFormDetailsUI = (props) => {
 
   useEffect(() => {
     if (isChanged && userPhoneNumber && isValidPhoneNumber && formState?.changes?.country_phone_code && formState?.changes?.cellphone && configs?.verification_phone_required?.value === '1') {
-      setWillVerifyOtpState(true)
+      setWillVerifyOtpState && setWillVerifyOtpState(true)
     }
   }, [isValidPhoneNumber, userPhoneNumber, configs?.verification_phone_required?.value, isChanged])