ordering-ui-external 5.0.2 → 5.0.3

package/_modules/components/Checkout/index.js

@@ -133,12 +133,7 @@ var CheckoutUI = function CheckoutUI(props) {
       showOnSelected: t(option === null || option === void 0 ? void 0 : option.name.toUpperCase().replace(/\s/g, '_'), option === null || option === void 0 ? void 0 : option.name)
     };
   }));
-  var handlePlaceOrder = function handlePlaceOrder() {
-    setCreateOrder(true);
-    if (!userErrors.length) {
-      handlerClickPlaceOrder && handlerClickPlaceOrder();
-      return;
-    }
+  var handleCheckoutValidationError = function handleCheckoutValidationError() {
     setAlertState({
       open: true,
       content: Object.values(userErrors).map(function (error) {
@@ -147,6 +142,14 @@ var CheckoutUI = function CheckoutUI(props) {
     });
     setIsUserDetailsEdit(true);
   };
+  var handlePlaceOrder = function handlePlaceOrder() {
+    if (!userErrors.length) {
+      setCreateOrder(true);
+      handlerClickPlaceOrder && handlerClickPlaceOrder();
+      return;
+    }
+    handleCheckoutValidationError();
+  };
   var closeAlert = function closeAlert() {
     setAlertState({
       open: false,
@@ -385,7 +388,9 @@ var CheckoutUI = function CheckoutUI(props) {
     setCardData: setCardData,
     handlePlaceOrder: handlePlaceOrder,
     onPlaceOrderClick: onPlaceOrderClick,
-    setCreateOrder: setCreateOrder
+    setCreateOrder: setCreateOrder,
+    userErrors: userErrors,
+    handleCheckoutValidationError: handleCheckoutValidationError
   })), (_props$beforeElements8 = props.beforeElementsSectionSix) === null || _props$beforeElements8 === void 0 ? void 0 : _props$beforeElements8.map(function (BeforeElement, i) {
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
       key: i

package/_modules/components/PaymentOptions/index.js

@@ -102,7 +102,9 @@ var PaymentOptionsUI = function PaymentOptionsUI(props) {
     onPlaceOrderClick = props.onPlaceOrderClick,
     setCreateOrder = props.setCreateOrder,
     handlePlaceOrder = props.handlePlaceOrder,
-    paymethods = props.paymethods;
+    paymethods = props.paymethods,
+    userErrors = props.userErrors,
+    handleCheckoutValidationError = props.handleCheckoutValidationError;
   var _useLanguage = (0, _orderingComponentsExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -133,6 +135,10 @@ var PaymentOptionsUI = function PaymentOptionsUI(props) {
   var stripeDirectMethods = ['stripe_direct'].concat(methodsPay);
   var handlePaymentMethodClick = function handlePaymentMethodClick(paymethod) {
     var _validationFields$fie, _validationFields$fie2, _validationFields$fie3, _validationFields$fie4, _validationFields$fie5, _validationFields$fie6;
+    if ((paymethod === null || paymethod === void 0 ? void 0 : paymethod.gateway) === 'paypal' && (userErrors === null || userErrors === void 0 ? void 0 : userErrors.length) > 0) {
+      handleCheckoutValidationError();
+      return;
+    }
     if ((paymethod === null || paymethod === void 0 ? void 0 : paymethod.gateway) === 'paypal' && options.type === 1 && validationFields !== null && validationFields !== void 0 && (_validationFields$fie = validationFields.fields) !== null && _validationFields$fie !== void 0 && (_validationFields$fie2 = _validationFields$fie.checkout) !== null && _validationFields$fie2 !== void 0 && (_validationFields$fie3 = _validationFields$fie2.driver_tip) !== null && _validationFields$fie3 !== void 0 && _validationFields$fie3.enabled && validationFields !== null && validationFields !== void 0 && (_validationFields$fie4 = validationFields.fields) !== null && _validationFields$fie4 !== void 0 && (_validationFields$fie5 = _validationFields$fie4.checkout) !== null && _validationFields$fie5 !== void 0 && (_validationFields$fie6 = _validationFields$fie5.driver_tip) !== null && _validationFields$fie6 !== void 0 && _validationFields$fie6.required && Number(cart === null || cart === void 0 ? void 0 : cart.driver_tip) <= 0) {
       setAlertState({
         open: true,

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

@@ -16,6 +16,7 @@ var _GoogleGpsButton = require("../../../../../components/GoogleGpsButton");
 var _styles = require("./styles");
 var _Buttons = require("../../styles/Buttons");
 var _Inputs = require("../../styles/Inputs");
+var _styledComponents = require("styled-components");
 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; }
@@ -49,7 +50,7 @@ var inputNames = [{
   code: 'Address notes'
 }];
 var AddressFormUI = function AddressFormUI(props) {
-  var _addressState$address, _ref, _formState$changes$ad, _formState$changes, _addressState$address2, _addressState$address3, _orderingTheme$theme, _orderingTheme$theme$, _orderingTheme$theme$2, _orderingTheme$theme$3, _orderingTheme$theme$4, _addressState$address4, _formState$changes$lo, _formState$changes2, _orderingTheme$theme2, _orderingTheme$theme3, _orderingTheme$theme4, _orderingTheme$theme5, _orderingTheme$theme6, _orderingTheme$theme7, _orderingTheme$theme8, _orderingTheme$theme9, _configState$configs, _configState$configs$, _configState$configs2, _configState$configs3, _configState$configs4, _configState$configs5, _configState$configs6, _configState$configs7, _props$beforeElements, _props$beforeComponen, _props$beforeMidEleme, _props$beforeMidCompo, _props$afterMidElemen, _props$afterMidCompon, _orderState$options6, _orderState$options6$, _props$afterComponent, _props$afterElements;
+  var _addressState$address, _ref, _formState$changes$ad, _formState$changes, _addressState$address2, _addressState$address3, _theme$header, _theme$header$compone, _theme$header$compone2, _theme$header$compone3, _addressState$address4, _formState$changes$lo, _formState$changes2, _theme$address, _theme$address$compon, _theme$address$compon2, _theme$address2, _theme$address2$compo, _theme$address2$compo2, _configState$configs, _configState$configs$, _configState$configs2, _configState$configs3, _configState$configs4, _configState$configs5, _configState$configs6, _configState$configs7, _props$beforeElements, _props$beforeComponen, _props$beforeMidEleme, _props$beforeMidCompo, _props$afterMidElemen, _props$afterMidCompon, _orderState$options6, _orderState$options6$, _props$afterComponent, _props$afterElements;
   var addressesList = props.addressesList,
     googleMapsControls = props.googleMapsControls,
     formState = props.formState,
@@ -75,9 +76,7 @@ var AddressFormUI = function AddressFormUI(props) {
   var _useSession = (0, _orderingComponentsExternal.useSession)(),
     _useSession2 = _slicedToArray(_useSession, 1),
     auth = _useSession2[0].auth;
-  var _useOrderingTheme = (0, _orderingComponentsExternal.useOrderingTheme)(),
-    _useOrderingTheme2 = _slicedToArray(_useOrderingTheme, 1),
-    orderingTheme = _useOrderingTheme2[0];
+  var theme = (0, _styledComponents.useTheme)();
   var _useState = (0, _react.useState)({
       selectedFromAutocomplete: true
     }),
@@ -106,13 +105,13 @@ var AddressFormUI = function AddressFormUI(props) {
     firstLocationNoEdit = _useState10[0],
     setFirstLocationNoEdit = _useState10[1];
   var isEditing = !!((_addressState$address3 = addressState.address) !== null && _addressState$address3 !== void 0 && _addressState$address3.id);
-  var isChew = (orderingTheme === null || orderingTheme === void 0 ? void 0 : (_orderingTheme$theme = orderingTheme.theme) === null || _orderingTheme$theme === void 0 ? void 0 : (_orderingTheme$theme$ = _orderingTheme$theme.header) === null || _orderingTheme$theme$ === void 0 ? void 0 : (_orderingTheme$theme$2 = _orderingTheme$theme$.components) === null || _orderingTheme$theme$2 === void 0 ? void 0 : (_orderingTheme$theme$3 = _orderingTheme$theme$2.layout) === null || _orderingTheme$theme$3 === void 0 ? void 0 : (_orderingTheme$theme$4 = _orderingTheme$theme$3.type) === null || _orderingTheme$theme$4 === void 0 ? void 0 : _orderingTheme$theme$4.toLowerCase()) === 'chew';
+  var isChew = (theme === null || theme === void 0 ? void 0 : (_theme$header = theme.header) === null || _theme$header === void 0 ? void 0 : (_theme$header$compone = _theme$header.components) === null || _theme$header$compone === void 0 ? void 0 : (_theme$header$compone2 = _theme$header$compone.layout) === null || _theme$header$compone2 === void 0 ? void 0 : (_theme$header$compone3 = _theme$header$compone2.type) === null || _theme$header$compone3 === void 0 ? void 0 : _theme$header$compone3.toLowerCase()) === 'chew';
   var _useState11 = (0, _react.useState)(isEditing ? addressState === null || addressState === void 0 ? void 0 : (_addressState$address4 = addressState.address) === null || _addressState$address4 === void 0 ? void 0 : _addressState$address4.location : (_formState$changes$lo = (_formState$changes2 = formState.changes) === null || _formState$changes2 === void 0 ? void 0 : _formState$changes2.location) !== null && _formState$changes$lo !== void 0 ? _formState$changes$lo : null),
     _useState12 = _slicedToArray(_useState11, 2),
     locationChange = _useState12[0],
     setLocationChange = _useState12[1];
-  var isHideMap = orderingTheme === null || orderingTheme === void 0 ? void 0 : (_orderingTheme$theme2 = orderingTheme.theme) === null || _orderingTheme$theme2 === void 0 ? void 0 : (_orderingTheme$theme3 = _orderingTheme$theme2.address) === null || _orderingTheme$theme3 === void 0 ? void 0 : (_orderingTheme$theme4 = _orderingTheme$theme3.components) === null || _orderingTheme$theme4 === void 0 ? void 0 : (_orderingTheme$theme5 = _orderingTheme$theme4.map) === null || _orderingTheme$theme5 === void 0 ? void 0 : _orderingTheme$theme5.hidden;
-  var isHideIcons = orderingTheme === null || orderingTheme === void 0 ? void 0 : (_orderingTheme$theme6 = orderingTheme.theme) === null || _orderingTheme$theme6 === void 0 ? void 0 : (_orderingTheme$theme7 = _orderingTheme$theme6.address) === null || _orderingTheme$theme7 === void 0 ? void 0 : (_orderingTheme$theme8 = _orderingTheme$theme7.components) === null || _orderingTheme$theme8 === void 0 ? void 0 : (_orderingTheme$theme9 = _orderingTheme$theme8.icons) === null || _orderingTheme$theme9 === void 0 ? void 0 : _orderingTheme$theme9.hidden;
+  var isHideMap = theme === null || theme === void 0 ? void 0 : (_theme$address = theme.address) === null || _theme$address === void 0 ? void 0 : (_theme$address$compon = _theme$address.components) === null || _theme$address$compon === void 0 ? void 0 : (_theme$address$compon2 = _theme$address$compon.map) === null || _theme$address$compon2 === void 0 ? void 0 : _theme$address$compon2.hidden;
+  var isHideIcons = theme === null || theme === void 0 ? void 0 : (_theme$address2 = theme.address) === null || _theme$address2 === void 0 ? void 0 : (_theme$address2$compo = _theme$address2.components) === null || _theme$address2$compo === void 0 ? void 0 : (_theme$address2$compo2 = _theme$address2$compo.icons) === null || _theme$address2$compo2 === void 0 ? void 0 : _theme$address2$compo2.hidden;
   var maxLimitLocation = configState === null || configState === void 0 ? void 0 : (_configState$configs = configState.configs) === null || _configState$configs === void 0 ? void 0 : (_configState$configs$ = _configState$configs.meters_to_change_address) === null || _configState$configs$ === void 0 ? void 0 : _configState$configs$.value;
   var googleMapsApiKey = configState === null || configState === void 0 ? void 0 : (_configState$configs2 = configState.configs) === null || _configState$configs2 === void 0 ? void 0 : (_configState$configs3 = _configState$configs2.google_maps_api_key) === null || _configState$configs3 === void 0 ? void 0 : _configState$configs3.value;
   var isLocationRequired = ((_configState$configs4 = configState.configs) === null || _configState$configs4 === void 0 ? void 0 : (_configState$configs5 = _configState$configs4.google_autocomplete_selection_required) === null || _configState$configs5 === void 0 ? void 0 : _configState$configs5.value) === '1' || ((_configState$configs6 = configState.configs) === null || _configState$configs6 === void 0 ? void 0 : (_configState$configs7 = _configState$configs6.google_autocomplete_selection_required) === null || _configState$configs7 === void 0 ? void 0 : _configState$configs7.value) === 'true';
@@ -321,8 +320,8 @@ var AddressFormUI = function AddressFormUI(props) {
     });
   };
   var showFieldWithTheme = function showFieldWithTheme(name) {
-    var _orderingTheme$theme10, _orderingTheme$theme11, _orderingTheme$theme12, _orderingTheme$theme13, _orderingTheme$theme14, _orderingTheme$theme15;
-    return !(orderingTheme !== null && orderingTheme !== void 0 && (_orderingTheme$theme10 = orderingTheme.theme) !== null && _orderingTheme$theme10 !== void 0 && (_orderingTheme$theme11 = _orderingTheme$theme10.header) !== null && _orderingTheme$theme11 !== void 0 && (_orderingTheme$theme12 = _orderingTheme$theme11.components) !== null && _orderingTheme$theme12 !== void 0 && (_orderingTheme$theme13 = _orderingTheme$theme12.address_form) !== null && _orderingTheme$theme13 !== void 0 && (_orderingTheme$theme14 = _orderingTheme$theme13.components) !== null && _orderingTheme$theme14 !== void 0 && (_orderingTheme$theme15 = _orderingTheme$theme14[name]) !== null && _orderingTheme$theme15 !== void 0 && _orderingTheme$theme15.hidden);
+    var _theme$address3, _theme$address3$compo, _theme$address3$compo2;
+    return !(theme !== null && theme !== void 0 && (_theme$address3 = theme.address) !== null && _theme$address3 !== void 0 && (_theme$address3$compo = _theme$address3.components) !== null && _theme$address3$compo !== void 0 && (_theme$address3$compo2 = _theme$address3$compo[name]) !== null && _theme$address3$compo2 !== void 0 && _theme$address3$compo2.hidden);
   };
   (0, _react.useEffect)(function () {
     var _formState$result, _ref5, _formState$changes$ad3, _formState$changes9, _addressState$address8, _ref6, _formState$changes$ad4, _formState$changes10, _addressState$address9;

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

@@ -42,7 +42,7 @@ var EmptyBtnWrapper = _styledComponents.default.div(_templateObject9 || (_templa
   return props.theme.colors.darkTextColor;
 });
 exports.EmptyBtnWrapper = EmptyBtnWrapper;
-var HeaderContent = _styledComponents.default.div(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n  margin-bottom: 10px;\n  .back-arrow {\n    font-size: 24px;\n    cursor: pointer;\n  }\n  .fixed-arrow {\n    position: fixed;\n    top: 0;\n    left: 0;\n    z-index: 10001;\n    width: 100vw;\n    background-color: ", ";\n    height: 56px;\n    display: flex;\n    align-items: center;\n    ", "\n    @media (min-width: 993px){\n      width: 100px;\n    }\n  }\n  .fixed-arrow-width{\n    width: 100vw;\n  }\n"])), function (props) {
+var HeaderContent = _styledComponents.default.div(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n  margin-bottom: 10px;\n  .back-arrow {\n    font-size: 24px;\n    cursor: pointer;\n  }\n  .fixed-arrow {\n    position: fixed;\n    top: 0;\n    left: 0;\n    z-index: 10001;\n    width: 100vw;\n    background-color: ", ";\n    height: 56px;\n    display: flex;\n    align-items: center;\n    ", "\n    @media (min-width: 993px){\n      width: 100px;\n    }\n  }\n  .fixed-arrow-width{\n    width: 100vw;      \n  }\n"])), function (props) {
   return props.theme.colors.backgroundPage;
 }, function (props) {
   var _props$theme;

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

@@ -295,9 +295,9 @@ var BusinessesListingUI = function BusinessesListingUI(props) {
     onSearch: handleChangeSearch,
     handleCustomEnter: function handleCustomEnter() {
       var _configs$advanced_bus;
-      return (configs === null || configs === void 0 ? void 0 : (_configs$advanced_bus = configs.advanced_business_search_enabled) === null || _configs$advanced_bus === void 0 ? void 0 : _configs$advanced_bus.value) === '1' ? onRedirectPage({
+      return (configs === null || configs === void 0 ? void 0 : (_configs$advanced_bus = configs.advanced_business_search_enabled) === null || _configs$advanced_bus === void 0 ? void 0 : _configs$advanced_bus.value) === '0' ? null : onRedirectPage({
         page: 'business_search'
-      }) : null;
+      });
     }
   }), !hideCities && (citiesState === null || citiesState === void 0 ? void 0 : (_citiesState$cities5 = citiesState.cities) === null || _citiesState$cities5 === void 0 ? void 0 : _citiesState$cities5.length) > 0 && /*#__PURE__*/_react.default.createElement(_Buttons.Button, {
     color: "primary",

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

@@ -42,7 +42,7 @@ var mapConfigs = {
   }
 };
 var MultiCheckoutUI = function MultiCheckoutUI(props) {
-  var _Object$values, _cartGroup$result, _paymethodSelected$pa, _cardList$cards, _configs$checkout_mul, _configs$driver_tip_o, _configs$driver_tip_o2, _configs$driver_tip_o3, _configs$multi_busine, _configs$driver_tip_o4, _configs$driver_tip_o5, _cartGroup$result2, _loyaltyPlansState$re, _creditPointPlan$busi, _creditPointPlan$busi2, _loyaltyPlansState$re2, _creditPointGeneralPl, _creditPointGeneralPl2, _configs$google_maps_, _customerState$user, _cartGroup$result3, _cartGroup$result4, _validationFields$fie9, _validationFields$fie10, _validationFields$fie11, _configs$multi_busine2, _validationFields$fie12, _validationFields$fie13, _validationFields$fie14, _configs$driver_tip_t, _configs$driver_tip_u, _configs$driver_tip_t2, _openCarts$, _configs$multi_busine6, _configs$multi_busine7;
+  var _Object$values, _cartGroup$result, _paymethodSelected$pa, _cardList$cards, _configs$checkout_mul, _configs$driver_tip_o, _configs$driver_tip_o2, _configs$driver_tip_o3, _configs$multi_busine, _configs$driver_tip_o4, _configs$driver_tip_o5, _cartGroup$result2, _loyaltyPlansState$re, _creditPointPlan$busi, _creditPointPlan$busi2, _loyaltyPlansState$re2, _creditPointGeneralPl, _creditPointGeneralPl2, _configs$cash_wallet, _configs$wallet_enabl, _configs$wallet_cash_, _configs$wallet_credi, _configs$google_maps_, _customerState$user, _cartGroup$result3, _cartGroup$result4, _validationFields$fie9, _validationFields$fie10, _validationFields$fie11, _configs$multi_busine2, _validationFields$fie12, _validationFields$fie13, _validationFields$fie14, _configs$driver_tip_t, _configs$driver_tip_u, _configs$driver_tip_t2, _openCarts$, _configs$multi_busine6, _configs$multi_busine7;
   var placing = props.placing,
     isCustomerMode = props.isCustomerMode,
     openCarts = props.openCarts,
@@ -132,6 +132,7 @@ var MultiCheckoutUI = function MultiCheckoutUI(props) {
   var loyalBusinessAvailable = (_creditPointGeneralPl = creditPointGeneralPlan === null || creditPointGeneralPlan === void 0 ? void 0 : (_creditPointGeneralPl2 = creditPointGeneralPlan.businesses) === null || _creditPointGeneralPl2 === void 0 ? void 0 : _creditPointGeneralPl2.filter(function (b) {
     return b.accumulates;
   })) !== null && _creditPointGeneralPl !== void 0 ? _creditPointGeneralPl : [];
+  var isWalletEnabled = (configs === null || configs === void 0 ? void 0 : (_configs$cash_wallet = configs.cash_wallet) === null || _configs$cash_wallet === void 0 ? void 0 : _configs$cash_wallet.value) && (configs === null || configs === void 0 ? void 0 : (_configs$wallet_enabl = configs.wallet_enabled) === null || _configs$wallet_enabl === void 0 ? void 0 : _configs$wallet_enabl.value) === '1' && ((configs === null || configs === void 0 ? void 0 : (_configs$wallet_cash_ = configs.wallet_cash_enabled) === null || _configs$wallet_cash_ === void 0 ? void 0 : _configs$wallet_cash_.value) === '1' || (configs === null || configs === void 0 ? void 0 : (_configs$wallet_credi = configs.wallet_credit_point_enabled) === null || _configs$wallet_credi === void 0 ? void 0 : _configs$wallet_credi.value) === '1');
   var accumulationRateBusiness = function accumulationRateBusiness(businessId) {
     var _loyalBusinessAvailab, _loyalBusinessAvailab2, _creditPointGeneralPl3;
     var value = (_loyalBusinessAvailab = loyalBusinessAvailable === null || loyalBusinessAvailable === void 0 ? void 0 : (_loyalBusinessAvailab2 = loyalBusinessAvailable.find(function (loyal) {
@@ -330,7 +331,7 @@ var MultiCheckoutUI = function MultiCheckoutUI(props) {
     return sum + (cart === null || cart === void 0 ? void 0 : cart.driver_tip);
   }, 0) > 0 && (configs === null || configs === void 0 ? void 0 : (_configs$multi_busine7 = configs.multi_business_checkout_show_combined_driver_tip) === null || _configs$multi_busine7 === void 0 ? void 0 : _configs$multi_busine7.value) === '1' && /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement("p", null, t('DRIVER_TIP', 'Driver tip')), /*#__PURE__*/_react.default.createElement("p", null, parsePrice(openCarts.reduce(function (sum, cart) {
     return sum + (cart === null || cart === void 0 ? void 0 : cart.driver_tip);
-  }, 0)))), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("h4", null, t('TOTAL_FOR_ALL_CARTS', 'Total for all Carts')), /*#__PURE__*/_react.default.createElement("h4", null, parsePrice(totalCartsPrice))), !!loyaltyRewardValue && isFinite(loyaltyRewardValue) && /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement("p", null, "\xA0"), /*#__PURE__*/_react.default.createElement("p", null, t('REWARD_LOYALTY_POINT', 'Reward :amount: on loyalty points').replace(':amount:', loyaltyRewardValue))), /*#__PURE__*/_react.default.createElement("p", null, t('MULTI_CHECKOUT_DESCRIPTION', 'You will receive a receipt for each business. The payment is not combined between multiple stores. Each payment is processed by the store')))), /*#__PURE__*/_react.default.createElement(_styles.WrapperPlaceOrderButton, null, /*#__PURE__*/_react.default.createElement(_Buttons.Button, {
+  }, 0)))), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("h4", null, t('TOTAL_FOR_ALL_CARTS', 'Total for all Carts')), /*#__PURE__*/_react.default.createElement("h4", null, parsePrice(totalCartsPrice))), isWalletEnabled && !!loyaltyRewardValue && isFinite(loyaltyRewardValue) && /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement("p", null, "\xA0"), /*#__PURE__*/_react.default.createElement("p", null, t('REWARD_LOYALTY_POINT', 'Reward :amount: on loyalty points').replace(':amount:', loyaltyRewardValue))), /*#__PURE__*/_react.default.createElement("p", null, t('MULTI_CHECKOUT_DESCRIPTION', 'You will receive a receipt for each business. The payment is not combined between multiple stores. Each payment is processed by the store')))), /*#__PURE__*/_react.default.createElement(_styles.WrapperPlaceOrderButton, null, /*#__PURE__*/_react.default.createElement(_Buttons.Button, {
     color: "primary",
     disabled: isDisablePlaceOrderButton || placing || (cartGroup === null || cartGroup === void 0 ? void 0 : cartGroup.loading),
     onClick: handlePlaceOrder

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

@@ -110,7 +110,7 @@ var OrderHistory = function OrderHistory(props) {
         return (0, _utils.getTraduction)(status);
     }
   };
-  return /*#__PURE__*/_react.default.createElement(_styles.OrderHistoryContainer, null, !(messages !== null && messages !== void 0 && messages.loading) && order && /*#__PURE__*/_react.default.createElement(_styles.HistoryItemWrapper, null, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.CheckCircleFill, null), /*#__PURE__*/_react.default.createElement(_styles.DetailWrapper, null, /*#__PURE__*/_react.default.createElement("h3", null, t('ORDER_PLACED', 'Order placed'), " ", ' ', t('VIA', 'Via'), ' ', order.app_id ? t(order.app_id.toUpperCase(), order.app_id) : t('OTHER', 'Other')), /*#__PURE__*/_react.default.createElement("p", null, parseDate(order.created_at, {
+  return /*#__PURE__*/_react.default.createElement(_styles.OrderHistoryContainer, null, !(messages !== null && messages !== void 0 && messages.loading) && order && /*#__PURE__*/_react.default.createElement(_styles.HistoryItemWrapper, null, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.CheckCircleFill, null), /*#__PURE__*/_react.default.createElement(_styles.DetailWrapper, null, /*#__PURE__*/_react.default.createElement("h3", null, t('ORDER_PLACED', 'Order placed'), " ", ' ', !props.hideViaText && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, t('VIA', 'Via'), ' ', order.app_id ? t(order.app_id.toUpperCase(), order.app_id) : t('OTHER', 'Other'))), /*#__PURE__*/_react.default.createElement("p", null, parseDate(order.created_at, {
     outputFormat: "MMM DD, ".concat(configs === null || configs === void 0 ? void 0 : (_configs$general_hour = configs.general_hour_format) === null || _configs$general_hour === void 0 ? void 0 : _configs$general_hour.value)
   })))), messages && (messages === null || messages === void 0 ? void 0 : messages.messages.map(function (message, i) {
     var _message$change, _message$change2, _message$change3, _message$change4, _message$driver, _message$driver2, _configs$general_hour2;

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

@@ -782,6 +782,7 @@ var OrderDetailsUI = function OrderDetailsUI(props) {
     content: confirm.content,
     acceptText: t('ACCEPT', 'Accept'),
     open: confirm.open,
+    hideViaText: props.hideViaText,
     onClose: function onClose() {
       return handleOriginalReorder();
     },

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

@@ -24,7 +24,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var OrderTypeSelectorContentUI = function OrderTypeSelectorContentUI(props) {
-  var _props$beforeElements, _props$beforeComponen, _props$afterComponent, _props$afterElements;
+  var _theme$order_types, _theme$order_types$co, _props$beforeElements, _props$beforeComponen, _props$afterComponent, _props$afterElements;
   var handleChangeOrderType = props.handleChangeOrderType,
     orderTypes = props.orderTypes,
     onClose = props.onClose,
@@ -40,21 +40,22 @@ var OrderTypeSelectorContentUI = function OrderTypeSelectorContentUI(props) {
     onClose && onClose();
     handleChangeOrderType && handleChangeOrderType(orderType);
   };
+  var titleOrdertype = theme === null || theme === void 0 ? void 0 : (_theme$order_types = theme.order_types) === null || _theme$order_types === void 0 ? void 0 : (_theme$order_types$co = _theme$order_types.components) === null || _theme$order_types$co === void 0 ? void 0 : _theme$order_types$co.title_menu;
   var orderTypeImage = function orderTypeImage(type) {
-    var _theme$order_types, _theme$order_types$co, _theme$order_types$co2, _theme$order_types$co3;
-    return theme === null || theme === void 0 ? void 0 : (_theme$order_types = theme.order_types) === null || _theme$order_types === void 0 ? void 0 : (_theme$order_types$co = _theme$order_types.components) === null || _theme$order_types$co === void 0 ? void 0 : (_theme$order_types$co2 = _theme$order_types$co[type]) === null || _theme$order_types$co2 === void 0 ? void 0 : (_theme$order_types$co3 = _theme$order_types$co2.components) === null || _theme$order_types$co3 === void 0 ? void 0 : _theme$order_types$co3.image;
+    var _theme$order_types2, _theme$order_types2$c, _theme$order_types2$c2, _theme$order_types2$c3;
+    return theme === null || theme === void 0 ? void 0 : (_theme$order_types2 = theme.order_types) === null || _theme$order_types2 === void 0 ? void 0 : (_theme$order_types2$c = _theme$order_types2.components) === null || _theme$order_types2$c === void 0 ? void 0 : (_theme$order_types2$c2 = _theme$order_types2$c[type]) === null || _theme$order_types2$c2 === void 0 ? void 0 : (_theme$order_types2$c3 = _theme$order_types2$c2.components) === null || _theme$order_types2$c3 === void 0 ? void 0 : _theme$order_types2$c3.image;
   };
   var orderTypeTitle = function orderTypeTitle(type) {
-    var _theme$order_types2, _theme$order_types2$c, _theme$order_types2$c2, _theme$order_types2$c3;
-    return theme === null || theme === void 0 ? void 0 : (_theme$order_types2 = theme.order_types) === null || _theme$order_types2 === void 0 ? void 0 : (_theme$order_types2$c = _theme$order_types2.components) === null || _theme$order_types2$c === void 0 ? void 0 : (_theme$order_types2$c2 = _theme$order_types2$c[type]) === null || _theme$order_types2$c2 === void 0 ? void 0 : (_theme$order_types2$c3 = _theme$order_types2$c2.components) === null || _theme$order_types2$c3 === void 0 ? void 0 : _theme$order_types2$c3.title;
+    var _theme$order_types3, _theme$order_types3$c, _theme$order_types3$c2, _theme$order_types3$c3;
+    return theme === null || theme === void 0 ? void 0 : (_theme$order_types3 = theme.order_types) === null || _theme$order_types3 === void 0 ? void 0 : (_theme$order_types3$c = _theme$order_types3.components) === null || _theme$order_types3$c === void 0 ? void 0 : (_theme$order_types3$c2 = _theme$order_types3$c[type]) === null || _theme$order_types3$c2 === void 0 ? void 0 : (_theme$order_types3$c3 = _theme$order_types3$c2.components) === null || _theme$order_types3$c3 === void 0 ? void 0 : _theme$order_types3$c3.title;
   };
   var orderTypeDescription = function orderTypeDescription(type) {
-    var _theme$order_types3, _theme$order_types3$c, _theme$order_types3$c2, _theme$order_types3$c3;
-    return theme === null || theme === void 0 ? void 0 : (_theme$order_types3 = theme.order_types) === null || _theme$order_types3 === void 0 ? void 0 : (_theme$order_types3$c = _theme$order_types3.components) === null || _theme$order_types3$c === void 0 ? void 0 : (_theme$order_types3$c2 = _theme$order_types3$c[type]) === null || _theme$order_types3$c2 === void 0 ? void 0 : (_theme$order_types3$c3 = _theme$order_types3$c2.components) === null || _theme$order_types3$c3 === void 0 ? void 0 : _theme$order_types3$c3.description;
+    var _theme$order_types4, _theme$order_types4$c, _theme$order_types4$c2, _theme$order_types4$c3;
+    return theme === null || theme === void 0 ? void 0 : (_theme$order_types4 = theme.order_types) === null || _theme$order_types4 === void 0 ? void 0 : (_theme$order_types4$c = _theme$order_types4.components) === null || _theme$order_types4$c === void 0 ? void 0 : (_theme$order_types4$c2 = _theme$order_types4$c[type]) === null || _theme$order_types4$c2 === void 0 ? void 0 : (_theme$order_types4$c3 = _theme$order_types4$c2.components) === null || _theme$order_types4$c3 === void 0 ? void 0 : _theme$order_types4$c3.description;
   };
   var orderTypeCallAction = function orderTypeCallAction(type) {
-    var _theme$order_types4, _theme$order_types4$c, _theme$order_types4$c2, _theme$order_types4$c3;
-    return theme === null || theme === void 0 ? void 0 : (_theme$order_types4 = theme.order_types) === null || _theme$order_types4 === void 0 ? void 0 : (_theme$order_types4$c = _theme$order_types4.components) === null || _theme$order_types4$c === void 0 ? void 0 : (_theme$order_types4$c2 = _theme$order_types4$c[type]) === null || _theme$order_types4$c2 === void 0 ? void 0 : (_theme$order_types4$c3 = _theme$order_types4$c2.components) === null || _theme$order_types4$c3 === void 0 ? void 0 : _theme$order_types4$c3.call_to_action;
+    var _theme$order_types5, _theme$order_types5$c, _theme$order_types5$c2, _theme$order_types5$c3;
+    return theme === null || theme === void 0 ? void 0 : (_theme$order_types5 = theme.order_types) === null || _theme$order_types5 === void 0 ? void 0 : (_theme$order_types5$c = _theme$order_types5.components) === null || _theme$order_types5$c === void 0 ? void 0 : (_theme$order_types5$c2 = _theme$order_types5$c[type]) === null || _theme$order_types5$c2 === void 0 ? void 0 : (_theme$order_types5$c3 = _theme$order_types5$c2.components) === null || _theme$order_types5$c3 === void 0 ? void 0 : _theme$order_types5$c3.call_to_action;
   };
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "order-type",
@@ -69,7 +70,7 @@ var OrderTypeSelectorContentUI = function OrderTypeSelectorContentUI(props) {
     return /*#__PURE__*/_react.default.createElement(BeforeComponent, _extends({
       key: i
     }, props));
-  }), /*#__PURE__*/_react.default.createElement(_styles.OrderTypeSelectorContainer, null, /*#__PURE__*/_react.default.createElement(_styles.OrderTypeListTitle, null, t('HOW_WILL_YOU_DELIVERY_TYPE', 'How will you delivery type?')), orderTypes && (configTypes ? orderTypes.filter(function (type) {
+  }), /*#__PURE__*/_react.default.createElement(_styles.OrderTypeSelectorContainer, null, /*#__PURE__*/_react.default.createElement(_styles.OrderTypeListTitle, null, titleOrdertype || t('HOW_WILL_YOU_DELIVERY_TYPE', 'How will you delivery type?')), orderTypes && (configTypes ? orderTypes.filter(function (type) {
     return configTypes === null || configTypes === void 0 ? void 0 : configTypes.includes(type.value);
   }) : orderTypes).map(function (item, i) {
     var _item$text, _item$text$replace, _orderStatus$options, _item$text2, _item$text2$replace, _item$text3, _item$text3$replace, _item$text4, _item$text4$replace;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-external",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "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": "4.0.1",
+    "ordering-components-external": "4.0.2",
     "payment": "^2.4.6",
     "polished": "^3.6.6",
     "react-bootstrap-icons": "^1.7.2",

package/src/components/Checkout/index.js

@@ -100,12 +100,7 @@ const CheckoutUI = (props) => {
     }
   })
 
-  const handlePlaceOrder = () => {
-    setCreateOrder(true)
-    if (!userErrors.length) {
-      handlerClickPlaceOrder && handlerClickPlaceOrder()
-      return
-    }
+  const handleCheckoutValidationError = () => {
     setAlertState({
       open: true,
       content: Object.values(userErrors).map(error => error)
@@ -113,6 +108,15 @@ const CheckoutUI = (props) => {
     setIsUserDetailsEdit(true)
   }
 
+  const handlePlaceOrder = () => {
+    if (!userErrors.length) {
+      setCreateOrder(true)
+      handlerClickPlaceOrder && handlerClickPlaceOrder()
+      return
+    }
+    handleCheckoutValidationError()
+  }
+
   const closeAlert = () => {
     setAlertState({
       open: false,
@@ -394,6 +398,8 @@ const CheckoutUI = (props) => {
                 handlePlaceOrder={handlePlaceOrder}
                 onPlaceOrderClick={onPlaceOrderClick}
                 setCreateOrder={setCreateOrder}
+                userErrors={userErrors}
+                handleCheckoutValidationError={handleCheckoutValidationError}
               />
             </PaymentMethodContainer>
           )}

package/src/components/PaymentOptions/index.js

@@ -87,7 +87,9 @@ const PaymentOptionsUI = (props) => {
     onPlaceOrderClick,
     setCreateOrder,
     handlePlaceOrder,
-    paymethods
+    paymethods,
+    userErrors,
+    handleCheckoutValidationError
   } = props
   const [, t] = useLanguage()
   const [{ token }] = useSession()
@@ -105,6 +107,10 @@ const PaymentOptionsUI = (props) => {
   const stripeDirectMethods = ['stripe_direct', ...methodsPay]
 
   const handlePaymentMethodClick = (paymethod) => {
+    if (paymethod?.gateway === 'paypal' && userErrors?.length > 0) {
+      handleCheckoutValidationError()
+      return
+    }
     if (paymethod?.gateway === 'paypal' &&
       options.type === 1 &&
       validationFields?.fields?.checkout?.driver_tip?.enabled &&

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

@@ -34,6 +34,7 @@ import {
 
 import { Button } from '../../styles/Buttons'
 import { Input, TextArea } from '../../styles/Inputs'
+import { useTheme } from 'styled-components'
 
 const inputNames = [
   { name: 'address', code: 'Address' },
@@ -63,14 +64,14 @@ const AddressFormUI = (props) => {
   const [, t] = useLanguage()
   const formMethods = useForm()
   const [{ auth }] = useSession()
-  const [orderingTheme] = useOrderingTheme()
+  const theme = useTheme()
   const [state, setState] = useState({ selectedFromAutocomplete: true })
   const [addressTag, setAddressTag] = useState(addressState?.address?.tag)
   const [alertState, setAlertState] = useState({ open: false, content: [] })
   const [addressValue, setAddressValue] = useState(formState.changes?.address ?? addressState.address?.address ?? '')
   const [firstLocationNoEdit, setFirstLocationNoEdit] = useState({ value: null })
   const isEditing = !!addressState.address?.id
-  const isChew = orderingTheme?.theme?.header?.components?.layout?.type?.toLowerCase() === 'chew'
+  const isChew = theme?.header?.components?.layout?.type?.toLowerCase() === 'chew'
 
   const [locationChange, setLocationChange] = useState(
     isEditing
@@ -78,8 +79,8 @@ const AddressFormUI = (props) => {
       : formState.changes?.location ?? null
   )
 
-  const isHideMap = orderingTheme?.theme?.address?.components?.map?.hidden
-  const isHideIcons = orderingTheme?.theme?.address?.components?.icons?.hidden
+  const isHideMap = theme?.address?.components?.map?.hidden
+  const isHideIcons = theme?.address?.components?.icons?.hidden
 
   const maxLimitLocation = configState?.configs?.meters_to_change_address?.value
   const googleMapsApiKey = configState?.configs?.google_maps_api_key?.value
@@ -253,7 +254,7 @@ const AddressFormUI = (props) => {
   }
 
   const showFieldWithTheme = (name) => {
-    return !orderingTheme?.theme?.header?.components?.address_form?.components?.[name]?.hidden
+    return !theme?.address?.components?.[name]?.hidden
   }
 
   useEffect(() => {

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

@@ -168,7 +168,7 @@ export const HeaderContent = styled.div`
     }
   }
   .fixed-arrow-width{
-    width: 100vw;
+    width: 100vw;      
   }
 `
 export const OrderContextUIWrapper = styled.div`

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

@@ -273,7 +273,9 @@ const BusinessesListingUI = (props) => {
                 isCustomLayout={isCustomLayout}
                 placeholder={t('SEARCH_BUSINESSES', 'Search Businesses')}
                 onSearch={handleChangeSearch}
-                handleCustomEnter={() => configs?.advanced_business_search_enabled?.value === '1' ? onRedirectPage({ page: 'business_search' }) : null}
+                handleCustomEnter={() => configs?.advanced_business_search_enabled?.value === '0'
+                  ? null
+                  : onRedirectPage({ page: 'business_search' })}
               />
             )}
             {!hideCities && citiesState?.cities?.length > 0 && (

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

@@ -108,6 +108,9 @@ const MultiCheckoutUI = (props) => {
   const creditPointPlanOnBusiness = businessIds.every((bid) => loyalBusinessIds.includes(bid)) && creditPointPlan
   const creditPointGeneralPlan = loyaltyPlansState?.result?.find((loyal) => loyal.type === 'credit_point')
   const loyalBusinessAvailable = creditPointGeneralPlan?.businesses?.filter((b) => b.accumulates) ?? []
+  const isWalletEnabled = (configs?.cash_wallet?.value && configs?.wallet_enabled?.value === '1' &&
+    (configs?.wallet_cash_enabled?.value === '1' ||
+    configs?.wallet_credit_point_enabled?.value === '1'))
 
   const accumulationRateBusiness = (businessId) => {
     const value = loyalBusinessAvailable?.find((loyal) => loyal.business_id === businessId)?.accumulation_rate ?? 0
@@ -371,7 +374,7 @@ const MultiCheckoutUI = (props) => {
                     <h4>{t('TOTAL_FOR_ALL_CARTS', 'Total for all Carts')}</h4>
                     <h4>{parsePrice(totalCartsPrice)}</h4>
                   </div>
-                  {!!loyaltyRewardValue && isFinite(loyaltyRewardValue) && (
+                  {isWalletEnabled && !!loyaltyRewardValue && isFinite(loyaltyRewardValue) && (
                     <span>
                       <p>&nbsp;</p>
                       <p>{t('REWARD_LOYALTY_POINT', 'Reward :amount: on loyalty points').replace(':amount:', loyaltyRewardValue)}</p>

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

@@ -111,8 +111,12 @@ export const OrderHistory = (props) => {
           <DetailWrapper>
             <h3>
               {t('ORDER_PLACED', 'Order placed')} {' '}
-              {t('VIA', 'Via')}{' '}
-              {order.app_id ? t(order.app_id.toUpperCase(), order.app_id) : t('OTHER', 'Other')}
+              {!props.hideViaText && (
+                <>
+                  {t('VIA', 'Via')}{' '}
+                  {order.app_id ? t(order.app_id.toUpperCase(), order.app_id) : t('OTHER', 'Other')}
+                </>
+              )}
             </h3>
             <p>{parseDate(order.created_at, { outputFormat: `MMM DD, ${configs?.general_hour_format?.value}` })}</p>
           </DetailWrapper>

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

@@ -816,6 +816,7 @@ const OrderDetailsUI = (props) => {
         content={confirm.content}
         acceptText={t('ACCEPT', 'Accept')}
         open={confirm.open}
+        hideViaText={props.hideViaText}
         onClose={() => handleOriginalReorder()}
         onCancel={() => handleOriginalReorder()}
         onAccept={confirm.handleOnAccept}

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

@@ -28,11 +28,11 @@ export const OrderTypeSelectorContentUI = (props) => {
     handleChangeOrderType && handleChangeOrderType(orderType)
   }
 
+  const titleOrdertype = theme?.order_types?.components?.title_menu
   const orderTypeImage = (type) => theme?.order_types?.components?.[type]?.components?.image
   const orderTypeTitle = (type) => theme?.order_types?.components?.[type]?.components?.title
   const orderTypeDescription = (type) => theme?.order_types?.components?.[type]?.components?.description
   const orderTypeCallAction = (type) => theme?.order_types?.components?.[type]?.components?.call_to_action
-
   return (
     <div className='order-type' style={{ overflow: 'hidden' }}>
       {props.beforeElements?.map((BeforeElement, i) => (
@@ -42,7 +42,7 @@ export const OrderTypeSelectorContentUI = (props) => {
       {props.beforeComponents?.map((BeforeComponent, i) => (
         <BeforeComponent key={i} {...props} />))}
       <OrderTypeSelectorContainer>
-        <OrderTypeListTitle>{t('HOW_WILL_YOU_DELIVERY_TYPE', 'How will you delivery type?')}</OrderTypeListTitle>
+        <OrderTypeListTitle>{titleOrdertype || t('HOW_WILL_YOU_DELIVERY_TYPE', 'How will you delivery type?')}</OrderTypeListTitle>
         {
           orderTypes && (configTypes ? orderTypes.filter(type => configTypes?.includes(type.value)) : orderTypes).map((item, i) => (
             <OrderTypeListItemContainer

package/template/pages/OrderDetails/index.js

@@ -27,6 +27,7 @@ export const OrderDetailsPage = (props) => {
     ...props,
     orderId,
     hashKey,
+    hideViaText: settings?.project === 'chewproject',
     urlToShare: (hashKey) => hashKey ? `${window.location.origin}/orders/${orderId}?hash=${hashKey}` : null,
     handleOrderRedirect: () => {
       history.push('/profile/orders')