ordering-ui-admin-external 1.28.0 → 1.29.0

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

@@ -14,6 +14,7 @@ var _reactQrCode = _interopRequireDefault(require("react-qr-code"));
 var _reactToPrint = _interopRequireDefault(require("react-to-print"));
 var _Shared = require("../../Shared");
 var _styles2 = require("./styles");
+var _utils = require("../../../utils");
 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; }
@@ -35,6 +36,9 @@ var BusinessQRCodeOption = function BusinessQRCodeOption(props) {
   var _useApi = (0, _orderingComponentsAdminExternal.useApi)(),
     _useApi2 = _slicedToArray(_useApi, 1),
     ordering = _useApi2[0];
+  var _useConfig = (0, _orderingComponentsAdminExternal.useConfig)(),
+    _useConfig2 = _slicedToArray(_useConfig, 1),
+    configs = _useConfig2[0].configs;
   var _useWindowSize = (0, _useWindowSize2.useWindowSize)(),
     width = _useWindowSize.width;
   var _useState = (0, _react.useState)(false),
@@ -61,7 +65,7 @@ var BusinessQRCodeOption = function BusinessQRCodeOption(props) {
     });
   };
   var generateQRCode = function generateQRCode() {
-    var _numberRef$current, _siteState$site, _siteState$site2, _siteState$site3, _numberRef$current2, _numberRef$current3;
+    var _numberRef$current, _configs$site_url, _configs$site_url2, _numberRef$current2, _numberRef$current3;
     var errors = [];
     if ((item === null || item === void 0 ? void 0 : item.key) !== 'pick_up' && !(numberRef !== null && numberRef !== void 0 && (_numberRef$current = numberRef.current) !== null && _numberRef$current !== void 0 && _numberRef$current.value)) {
       errors.push((item === null || item === void 0 ? void 0 : item.key) === 'eat_in' ? t('VALIDATION_ERROR_REQUIRED', 'Table number is required').replace('_attribute_', t('TABLE_NUMBER', 'Table number')) : t('VALIDATION_ERROR_REQUIRED', 'Spot number is required').replace('_attribute_', t('SPOT_NUMBER', 'Spot number')));
@@ -73,7 +77,7 @@ var BusinessQRCodeOption = function BusinessQRCodeOption(props) {
       });
       return;
     }
-    var storeUrl = siteState !== null && siteState !== void 0 && (_siteState$site = siteState.site) !== null && _siteState$site !== void 0 && _siteState$site.domain && (siteState === null || siteState === void 0 ? void 0 : (_siteState$site2 = siteState.site) === null || _siteState$site2 === void 0 ? void 0 : _siteState$site2.ssl_process_status) === 'ended' ? "https://".concat(siteState === null || siteState === void 0 ? void 0 : (_siteState$site3 = siteState.site) === null || _siteState$site3 === void 0 ? void 0 : _siteState$site3.domain, "/store/").concat(business === null || business === void 0 ? void 0 : business.slug) : "https://".concat(ordering.project, ".tryordering.com/store/").concat(business === null || business === void 0 ? void 0 : business.slug);
+    var storeUrl = configs !== null && configs !== void 0 && (_configs$site_url = configs.site_url) !== null && _configs$site_url !== void 0 && _configs$site_url.value ? "".concat((0, _utils.checkSiteUrl)(configs === null || configs === void 0 ? void 0 : (_configs$site_url2 = configs.site_url) === null || _configs$site_url2 === void 0 ? void 0 : _configs$site_url2.value), "store/").concat(business === null || business === void 0 ? void 0 : business.slug) : "https://".concat(ordering.project, ".tryordering.com/store/").concat(business === null || business === void 0 ? void 0 : business.slug);
     var tsNumber = (item === null || item === void 0 ? void 0 : item.key) !== 'pick_up' ? (item === null || item === void 0 ? void 0 : item.key) === 'eat_in' ? "&table_number=".concat(numberRef === null || numberRef === void 0 ? void 0 : (_numberRef$current2 = numberRef.current) === null || _numberRef$current2 === void 0 ? void 0 : _numberRef$current2.value) : "&spot_number=".concat(numberRef === null || numberRef === void 0 ? void 0 : (_numberRef$current3 = numberRef.current) === null || _numberRef$current3 === void 0 ? void 0 : _numberRef$current3.value) : '';
     var compltedUrl = "".concat(storeUrl, "?order_type=").concat(item.value).concat(tsNumber);
     setCode(compltedUrl);

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

@@ -17,6 +17,7 @@ var _Shared = require("../../Shared");
 var _BusinessPreview = require("../BusinessPreview");
 var _useWindowSize2 = require("../../../hooks/useWindowSize");
 var _styles2 = require("./styles");
+var _utils = require("../../../utils");
 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; }
@@ -55,6 +56,9 @@ var BusinessSummary = function BusinessSummary(props) {
   var _useEvent = (0, _orderingComponentsAdminExternal.useEvent)(),
     _useEvent2 = _slicedToArray(_useEvent, 1),
     events = _useEvent2[0];
+  var _useConfig = (0, _orderingComponentsAdminExternal.useConfig)(),
+    _useConfig2 = _slicedToArray(_useConfig, 1),
+    configs = _useConfig2[0].configs;
   var theme = (0, _styledComponents.useTheme)();
   var _useApi = (0, _orderingComponentsAdminExternal.useApi)(),
     _useApi2 = _slicedToArray(_useApi, 1),
@@ -87,9 +91,9 @@ var BusinessSummary = function BusinessSummary(props) {
     });
   };
   var handleOpenSite = function handleOpenSite() {
-    var _siteState$site, _siteState$site2, _siteState$site3, _businessState$busine2, _businessState$busine3;
-    var url = siteState !== null && siteState !== void 0 && (_siteState$site = siteState.site) !== null && _siteState$site !== void 0 && _siteState$site.domain && (siteState === null || siteState === void 0 ? void 0 : (_siteState$site2 = siteState.site) === null || _siteState$site2 === void 0 ? void 0 : _siteState$site2.ssl_process_status) === 'ended' ? "https://".concat(siteState === null || siteState === void 0 ? void 0 : (_siteState$site3 = siteState.site) === null || _siteState$site3 === void 0 ? void 0 : _siteState$site3.domain, "/store/").concat(businessState === null || businessState === void 0 ? void 0 : (_businessState$busine2 = businessState.business) === null || _businessState$busine2 === void 0 ? void 0 : _businessState$busine2.slug) : "https://".concat(ordering.project, ".tryordering.com/store/").concat(businessState === null || businessState === void 0 ? void 0 : (_businessState$busine3 = businessState.business) === null || _businessState$busine3 === void 0 ? void 0 : _businessState$busine3.slug);
-    window.open(url, '_blank');
+    var _configs$site_url, _configs$site_url2, _businessState$busine2, _businessState$busine3;
+    var storeUrl = configs !== null && configs !== void 0 && (_configs$site_url = configs.site_url) !== null && _configs$site_url !== void 0 && _configs$site_url.value ? "".concat((0, _utils.checkSiteUrl)(configs === null || configs === void 0 ? void 0 : (_configs$site_url2 = configs.site_url) === null || _configs$site_url2 === void 0 ? void 0 : _configs$site_url2.value), "store/").concat(businessState === null || businessState === void 0 ? void 0 : (_businessState$busine2 = businessState.business) === null || _businessState$busine2 === void 0 ? void 0 : _businessState$busine2.slug) : "https://".concat(ordering.project, ".tryordering.com/store/").concat(businessState === null || businessState === void 0 ? void 0 : (_businessState$busine3 = businessState.business) === null || _businessState$busine3 === void 0 ? void 0 : _businessState$busine3.slug);
+    window.open(storeUrl, '_blank');
   };
   var itemsExcluded = !!spoonityConfig ? ['publishing', 'personalization'] : ['publishing', 'spoonity_key', 'personalization'];
   var businessConfigs = [{

package/_modules/components/Users/UserAddForm/index.js

@@ -36,7 +36,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 UserAddFormUI = function UserAddFormUI(props) {
-  var _validationFields$fie, _validationFields$fie2, _validationFields$fie3, _validationFields$fie4, _formState$changes2, _formState$changes3, _formState$changes4, _validationFields$fie5, _props$afterMidElemen, _props$afterMidCompon, _formState$changes5;
+  var _ref, _validationFields$fie, _validationFields$fie2, _validationFields$fie3, _formState$changes2, _formState$changes3, _formState$changes4, _validationFields$fie4, _props$afterMidElemen, _props$afterMidCompon, _formState$changes5;
   var formState = props.formState,
     showField = props.showField,
     cleanFormState = props.cleanFormState,
@@ -47,7 +47,9 @@ var UserAddFormUI = function UserAddFormUI(props) {
     isCheckout = props.isCheckout,
     handleChangeUserType = props.handleChangeUserType,
     handlechangeImage = props.handlechangeImage,
-    handleChangeSwtich = props.handleChangeSwtich;
+    handleChangeSwtich = props.handleChangeSwtich,
+    defaultPhoneNumber = props.defaultPhoneNumber,
+    isFromCustomOrder = props.isFromCustomOrder;
   var formMethods = (0, _reactHookForm.useForm)();
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
@@ -88,7 +90,7 @@ var UserAddFormUI = function UserAddFormUI(props) {
       }
     });
   };
-  var showInputPhoneNumber = (_validationFields$fie = validationFields === null || validationFields === void 0 ? void 0 : (_validationFields$fie2 = validationFields.fields) === null || _validationFields$fie2 === void 0 ? void 0 : (_validationFields$fie3 = _validationFields$fie2.checkout) === null || _validationFields$fie3 === void 0 ? void 0 : (_validationFields$fie4 = _validationFields$fie3.cellphone) === null || _validationFields$fie4 === void 0 ? void 0 : _validationFields$fie4.enabled) !== null && _validationFields$fie !== void 0 ? _validationFields$fie : false;
+  var showInputPhoneNumber = (_ref = isFromCustomOrder !== null && isFromCustomOrder !== void 0 ? isFromCustomOrder : 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.cellphone) === null || _validationFields$fie3 === void 0 ? void 0 : _validationFields$fie3.enabled) !== null && _ref !== void 0 ? _ref : false;
   var onSubmit = function onSubmit() {
     var isPhoneNumberValid = userPhoneNumber ? isValidPhoneNumber : true;
     if (!isPhoneNumberValid && userPhoneNumber) {
@@ -233,6 +235,12 @@ var UserAddFormUI = function UserAddFormUI(props) {
       }
     });
   }, [formMethods]);
+  (0, _react.useEffect)(function () {
+    if (defaultPhoneNumber) {
+      setUserPhoneNumber(defaultPhoneNumber);
+      handleChangePhoneNumber(defaultPhoneNumber, true);
+    }
+  }, [defaultPhoneNumber]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.FormContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.FormInput, {
     onSubmit: formMethods.handleSubmit(onSubmit),
     isCheckout: isCheckout,
@@ -262,7 +270,7 @@ var UserAddFormUI = function UserAddFormUI(props) {
     alt: "user image",
     loading: "lazy"
   }), /*#__PURE__*/_react.default.createElement(_styles2.UploadImageIconContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.UploadImageIcon, null, /*#__PURE__*/_react.default.createElement(_BiImage.default, null))))))), !(validationFields !== null && validationFields !== void 0 && validationFields.loading) ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _utils.sortInputFields)({
-    values: validationFields === null || validationFields === void 0 ? void 0 : (_validationFields$fie5 = validationFields.fields) === null || _validationFields$fie5 === void 0 ? void 0 : _validationFields$fie5.checkout
+    values: validationFields === null || validationFields === void 0 ? void 0 : (_validationFields$fie4 = validationFields.fields) === null || _validationFields$fie4 === void 0 ? void 0 : _validationFields$fie4.checkout
   }).map(function (field) {
     var _formState$result5, _formState$result6, _formState$changes$fi, _formState$result7, _formState$result8, _formState$changes$fi2;
     return showField && showField(field.code) && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
@@ -319,7 +327,7 @@ var UserAddFormUI = function UserAddFormUI(props) {
     }, props));
   }), /*#__PURE__*/_react.default.createElement(_styles2.WrapperUserTypeSelector, null, /*#__PURE__*/_react.default.createElement(_UserTypeSelector.UserTypeSelector, {
     isPrimary: true,
-    defaultUserType: formState === null || formState === void 0 ? void 0 : (_formState$changes5 = formState.changes) === null || _formState$changes5 === void 0 ? void 0 : _formState$changes5.level,
+    defaultUserType: (formState === null || formState === void 0 ? void 0 : (_formState$changes5 = formState.changes) === null || _formState$changes5 === void 0 ? void 0 : _formState$changes5.level) || 3,
     handleChangeUserType: handleChangeUserType
   })), /*#__PURE__*/_react.default.createElement(_styles2.ActionsForm, null, /*#__PURE__*/_react.default.createElement(_styles.Button, {
     color: "primary",

package/_modules/components/Users/UserAddForm/styles.js

@@ -10,7 +10,7 @@ var _templateObject, _templateObject2, _templateObject3, _templateObject4, _temp
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-var FormContainer = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  width: 100%;\n\n  h1 {\n    font-size: 24px;\n    font-weight: 600;\n    width: 100%;\n    margin-bottom: 0px;\n    color: ", ";\n  }\n"])), function (props) {
+var FormContainer = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  width: 100%;\n\n  h1 {\n    font-size: 20px;\n    font-weight: 700;\n    width: 100%;\n    margin-bottom: 0px;\n    color: ", ";\n  }\n"])), function (props) {
   return props.theme.colors.headingColor;
 });
 exports.FormContainer = FormContainer;

package/_modules/styles/Selects/index.js

@@ -62,7 +62,7 @@ var Options = _styledComponents.default.div(_templateObject9 || (_templateObject
   return isAbsolute && (0, _styledComponents.css)(_templateObject14 || (_templateObject14 = _taggedTemplateLiteral(["\n    position: absolute;\n    margin-top: 7px;\n  "])));
 });
 exports.Options = Options;
-var OptionsInner = _styledComponents.default.div(_templateObject15 || (_templateObject15 = _taggedTemplateLiteral(["\n  overflow: auto;\n  margin: ", ";\n  max-height: ", ";\n  overscroll-behavior: contain;\n"])), function (_ref10) {
+var OptionsInner = _styledComponents.default.div(_templateObject15 || (_templateObject15 = _taggedTemplateLiteral(["\n  overflow-x: hidden;\n  margin: ", ";\n  max-height: ", ";\n  overscroll-behavior: contain;\n"])), function (_ref10) {
   var optionInnerMargin = _ref10.optionInnerMargin;
   return optionInnerMargin;
 }, function (_ref11) {

package/_modules/utils/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.widgetURL = exports.verifyDecimals = exports.stringToSlug = exports.sortInputFields = exports.shape = exports.setStorageItem = exports.scrollTo = exports.ribbonValues = exports.reviewCommentList = exports.removeStorageItem = exports.orderRejectCommentList = exports.optimizeImage = exports.getUniqueId = exports.getStorageItem = exports.getStarWidth = exports.getSeconds = exports.getOrderStatus = exports.getOrderStatuPickUp = exports.getMinutes = exports.getLocale = exports.getIconCard = exports.getHours = exports.getCurrenySymbol = exports.getCurrentDiffDays = exports.getAgoMinutes = exports.formatUrlVideo = exports.formatSeconds = exports.firstLetterCapital = exports.findExitingCode = exports.fieldsToSort = exports.convertHoursToMinutes = exports.convertHMS = exports.checkValidUrlFormat = exports.checkSiteUrl = exports.checkPreSiteUrl = exports.capitalize = exports.bytesConverter = exports.DriverTipsOptions = void 0;
+exports.widgetURL = exports.verifyDecimals = exports.stringToSlug = exports.sortInputFields = exports.shape = exports.setStorageItem = exports.scrollTo = exports.ribbonValues = exports.reviewCommentList = exports.removeStorageItem = exports.orderRejectCommentList = exports.optimizeImage = exports.getUniqueId = exports.getStorageItem = exports.getStarWidth = exports.getSeconds = exports.getOrderStatus = exports.getOrderStatuPickUp = exports.getMinutes = exports.getLocale = exports.getIconCard = exports.getHours = exports.getCurrenySymbol = exports.getCurrentDiffDays = exports.getAgoMinutes = exports.formatUrlVideo = exports.formatSeconds = exports.firstLetterCapital = exports.findExitingCountryPhoneCode = exports.findExitingCode = exports.fieldsToSort = exports.convertHoursToMinutes = exports.convertHMS = exports.checkValidUrlFormat = exports.checkSiteUrl = exports.checkPreSiteUrl = exports.capitalize = exports.bytesConverter = exports.DriverTipsOptions = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _FaCcMastercard = _interopRequireDefault(require("@meronex/icons/fa/FaCcMastercard"));
 var _FaCcVisa = _interopRequireDefault(require("@meronex/icons/fa/FaCcVisa"));
@@ -252,6 +252,13 @@ var findExitingCode = function findExitingCode(countryCode) {
   });
   return code === null || code === void 0 ? void 0 : code.countryCode;
 };
+exports.findExitingCode = findExitingCode;
+var findExitingCountryPhoneCode = function findExitingCountryPhoneCode(countryCode) {
+  var code = _orderingComponentsAdminExternal.CODES.find(function (code) {
+    return code.countryCode === (countryCode || '').toUpperCase();
+  });
+  return code === null || code === void 0 ? void 0 : code.phoneCode;
+};
 
 /**
  * Function to check if a number is decimal or not
@@ -259,7 +266,7 @@ var findExitingCode = function findExitingCode(countryCode) {
  * @param {*} parser function fallback when is decimal
  * @returns string
  */
-exports.findExitingCode = findExitingCode;
+exports.findExitingCountryPhoneCode = findExitingCountryPhoneCode;
 var verifyDecimals = function verifyDecimals(value, parser) {
   if (value % 1 === 0) {
     return value;

package/index-template.js

@@ -297,7 +297,7 @@ if (!(window?.location?.hostname === 'localhost')) {
     integrations: [
       new Integrations.BrowserTracing()
     ],
-    release: process.env.npm_package_version ? 'ordering-ui-admin-release@' + process.env.npm_package_version : 'ordering-ui-admin-release@' + '1.0.2',
+    release: process.env.npm_package_version ? 'ordering-ui-admin-release@' + process.env.npm_package_version : 'ordering-ui-admin-release@' + '1.0.3',
     // Release health
     autoSessionTracking: true,
     ignoreErrors: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-admin-external",
-  "version": "1.28.0",
+  "version": "1.29.0",
   "description": "Ordering UI Admin Components",
   "main": "./_modules/index.js",
   "exports": {
@@ -63,8 +63,8 @@
     "@popperjs/core": "^2.5.4",
     "@sentry/react": "^5.27.4",
     "@sentry/tracing": "^5.27.4",
-    "@stripe/react-stripe-js": "^1.1.2",
-    "@stripe/stripe-js": "^1.11.0",
+    "@stripe/react-stripe-js": "^2.1.0",
+    "@stripe/stripe-js": "^1.54.0",
     "body-scroll-lock": "^4.0.0-beta.0",
     "bootstrap": "^4.6.0",
     "chart.js": "^3.5.0",
@@ -83,7 +83,7 @@
     "lodash": "^4.17.20",
     "moment": "^2.29.1",
     "moment-range": "^4.0.2",
-    "ordering-components-admin-external": "1.28.0",
+    "ordering-components-admin-external": "1.29.0",
     "polished": "^3.6.7",
     "prop-types": "^15.7.2",
     "react-big-calendar": "^1.4.2",
@@ -91,11 +91,13 @@
     "react-bootstrap-icons": "^1.5.0",
     "react-chartjs-2": "^3.0.4",
     "react-color": "^2.19.3",
+    "react-credit-cards-2": "^1.0.1",
     "react-date-range": "^1.4.0",
     "react-datepicker": "^3.7.0",
     "react-helmet": "^6.1.0",
     "react-hook-form": "^6.11.3",
     "react-hubspot-form": "^1.3.7",
+    "react-linkify": "^1.0.0-alpha",
     "react-loading-skeleton": "^2.1.1",
     "react-numeric-input": "^2.2.3",
     "react-otp-input": "^2.4.0",

package/src/components/Delivery/AddressForm/styles.js

@@ -141,11 +141,11 @@ export const Title = styled.div`
 export const CloseButtonWrapper = styled.span`
   position: fixed;
   cursor: pointer;
-  top: 30px;
+  top: 20px;
   ${props => props.theme?.rtl ? css`
-    left: 10px;
+    left: 20px;
   ` : css`
-    right: 10px;
+    right: 20px;
   `}
 `
 

package/src/components/Delivery/AddressList/index.js

@@ -15,8 +15,7 @@ import {
   AddressList as AddressListController,
   useLanguage,
   useOrder,
-  useCustomer,
-  useEvent
+  useCustomer
 } from 'ordering-components-admin-external'
 
 import {
@@ -30,7 +29,7 @@ import {
   WrapperAddressForm
 } from './styles'
 
-import { Confirm, Modal, NotFoundSource } from '../../Shared'
+import { Confirm, NotFoundSource } from '../../Shared'
 import { Button } from '../../../styles/Buttons'
 import { AddressForm } from '../AddressForm'
 import { useTheme } from 'styled-components'
@@ -60,7 +59,6 @@ const AddressListUI = (props) => {
 
   const [, t] = useLanguage()
   const [orderState] = useOrder()
-  const [events] = useEvent()
 
   const [curAddress, setCurAddress] = useState(false)
   const [addressOpen, setAddressOpen] = useState(false)
@@ -107,7 +105,6 @@ const AddressListUI = (props) => {
 
   const handleSetAddress = (address) => {
     if (checkAddress(address) && userCustomerSetup?.id === user?.id) {
-      events.emit('go_to_page', { page: 'search' })
       setCustomerModalOpen && setCustomerModalOpen(false)
       return
     }
@@ -176,12 +173,6 @@ const AddressListUI = (props) => {
 
   return (
     <>
-      {props.beforeElements?.map((BeforeElement, i) => (
-        <React.Fragment key={i}>
-          {BeforeElement}
-        </React.Fragment>))}
-      {props.beforeComponents?.map((BeforeComponent, i) => (
-        <BeforeComponent key={i} {...props} />))}
       <AddressListContainer id='address_control' isLoading={actionStatus?.loading || orderState?.loading}>
         {
           (!isPopover || !addressOpen) && (
@@ -197,43 +188,6 @@ const AddressListUI = (props) => {
           )
         }
 
-        {!isSeletectedUserAddresses && (
-          <>
-            {
-              isPopover && addressOpen && (
-                <AddressForm
-                  userId={userId}
-                  addressesList={addressList?.addresses}
-                  useValidationFileds
-                  address={curAddress}
-                  onCancel={() => setAddressOpen(false)}
-                  onSaveAddress={handleSaveAddress}
-                  userCustomerSetup={userCustomerSetup}
-                />
-              )
-            }
-            {
-              !isPopover && (
-                <Modal
-                  title={t('ADDRESS', 'Address')}
-                  open={!isPopover && addressOpen}
-                  onClose={() => setAddressOpen(false)}
-                >
-                  <AddressForm
-                    userId={userId}
-                    addressesList={addressList?.addresses}
-                    useValidationFileds
-                    address={curAddress}
-                    onCancel={() => setAddressOpen(false)}
-                    onSaveAddress={handleSaveAddress}
-                    userCustomerSetup={userCustomerSetup}
-                  />
-                </Modal>
-              )
-            }
-          </>
-        )}
-
         {
           !addressList.loading &&
           !actionStatus.loading &&
@@ -245,12 +199,10 @@ const AddressListUI = (props) => {
             <AddressListUl id='list'>
               {uniqueAddressesList.map(address => (
                 <AddressItem key={address?.id}>
-                  <div className='wrapAddress' onClick={() => !isSeletectedUserAddresses && handleSetAddress(address)}>
-                    {!isSeletectedUserAddresses && (
-                      <span className='radio'>
-                        {checkAddress(address) ? <IosRadioButtonOn /> : <IosRadioButtonOff />}
-                      </span>
-                    )}
+                  <div className='wrapAddress' onClick={() => handleSetAddress(address)}>
+                    <span className='radio'>
+                      {address?.default ? <IosRadioButtonOn color={theme.colors.primary} /> : <IosRadioButtonOff />}
+                    </span>
                     <span className='tag'>
                       {address?.tag === 'home' && <HouseDoor />}
                       {address?.tag === 'office' && <Building />}
@@ -361,13 +313,6 @@ const AddressListUI = (props) => {
           />
         </WrapperAddressForm>
       )}
-
-      {props.afterComponents?.map((AfterComponent, i) => (
-        <AfterComponent key={i} {...props} />))}
-      {props.afterElements?.map((AfterElement, i) => (
-        <React.Fragment key={i}>
-          {AfterElement}
-        </React.Fragment>))}
     </>
   )
 }

package/src/components/Delivery/AddressList/styles.js

@@ -184,7 +184,7 @@ export const WrapperAddressForm = styled.div`
   height: calc(var(--vh, 1vh) * 100);
   overflow: auto;
   box-sizing: border-box;
-  padding: 35px 20px;
+  padding: 25px 20px;
 
   ${props => props.theme?.rtl ? css`
     border-right: 1px solid #E9ECEF;

package/src/components/Delivery/DriversGroupLogs/index.js

@@ -63,6 +63,12 @@ export const DriversGroupLogsUI = (props) => {
     getDriversGroupLogs(expectedPage, pageSize)
   }
 
+  const getValidLogData = (data) => {
+    return typeof data === 'object'
+      ? Object.values(data)
+      : typeof data === 'string' ? JSON.parse(data) : data
+  }
+
   useEffect(() => {
     if (logsList.loading || logsList.logs.length > 0 || paginationProps.totalPages <= 1) return
     if (paginationProps.currentPage !== paginationProps.totalPages) {
@@ -133,12 +139,12 @@ export const DriversGroupLogsUI = (props) => {
                       </td>
                       <td>
                         <EventTypeContainer>
-                          <p>{t(log?.event)}</p>
+                          <p>{t((log?.event || '').toUpperCase())}</p>
                         </EventTypeContainer>
                       </td>
                       <td>
                         <DataListTable>
-                          {log?.data && (typeof log?.data === 'object' ? Object.values(log?.data) : log?.data).map((item, i) => (
+                          {log?.data && getValidLogData(log?.data).map((item, i) => (
                             <tbody key={i}>
                               <tr>
                                 <td>{getAttributeName(item?.attribute)}</td>

package/src/components/Delivery/UserAddForm/index.js

@@ -340,20 +340,39 @@ const UserAddFormUI = (props) => {
                   )
                 )}
                 {isDriversPage && (
-                  <InputWrapper>
-                    <DefaultSelect
-                      placeholder={t('SELECT_TIMEZONE', 'Select a timezone')}
-                      defaultValue={formState?.changes?.timezone}
-                      options={timezonesOptions}
-                      onChange={val => handleChangeSwtich('timezone', val)}
-                      optionInnerMaxHeight='300px'
-                      isShowSearchBar
-                      searchBarIsCustomLayout
-                      searchBarIsNotLazyLoad
-                      searchValue={timezoneSearchValue}
-                      handleChangeSearch={setTimezoneSearchValue}
+                  <>
+                    <Input
+                      name='external_id'
+                      className='form'
+                      placeholder={t('EXTERNAL_ID', 'External Id')}
+                      defaultValue={
+                        formState?.result?.result
+                          ? formState?.result?.result?.external_id
+                          : formState?.changes?.external_id ?? ''
+                      }
+                      onChange={handleChangeInput}
+                      autoComplete='off'
+                      onKeyPress={(e) => {
+                        if (!/^[0-9]$/.test(e.key)) {
+                          e.preventDefault()
+                        }
+                      }}
                     />
-                  </InputWrapper>
+                    <InputWrapper>
+                      <DefaultSelect
+                        placeholder={t('SELECT_TIMEZONE', 'Select a timezone')}
+                        defaultValue={formState?.changes?.timezone}
+                        options={timezonesOptions}
+                        onChange={val => handleChangeSwtich('timezone', val)}
+                        optionInnerMaxHeight='300px'
+                        isShowSearchBar
+                        searchBarIsCustomLayout
+                        searchBarIsNotLazyLoad
+                        searchValue={timezoneSearchValue}
+                        handleChangeSearch={setTimezoneSearchValue}
+                      />
+                    </InputWrapper>
+                  </>
                 )}
                 {!!showInputPhoneNumber && (
                   <InputPhoneNumber

package/src/components/Delivery/UserFormDetails/index.js

@@ -274,20 +274,37 @@ export const UserFormDetailsUI = (props) => {
               )
             )}
             {isDriversPage && (
-              <InputWrapper isTimezone>
-                <DefaultSelect
-                  placeholder={t('SELECT_TIMEZONE', 'Select a timezone')}
-                  defaultValue={formState?.changes?.timezone ?? user?.timezone ?? ''}
-                  options={timezonesOptions}
-                  onChange={val => handleChangeSwtich('timezone', val)}
-                  optionInnerMaxHeight='300px'
-                  isShowSearchBar
-                  searchBarIsCustomLayout
-                  searchBarIsNotLazyLoad
-                  searchValue={timezoneSearchValue}
-                  handleChangeSearch={setTimezoneSearchValue}
+              <>
+                <Input
+                  name='external_id'
+                  className='form'
+                  placeholder={t('EXTERNAL_ID', 'External Id')}
+                  defaultValue={
+                    formState?.changes?.external_id ?? (user && user?.external_id) ?? ''
+                  }
+                  onChange={handleChangeInput}
+                  autoComplete='off'
+                  onKeyPress={(e) => {
+                    if (!/^[0-9]$/.test(e.key)) {
+                      e.preventDefault()
+                    }
+                  }}
                 />
-              </InputWrapper>
+                <InputWrapper isTimezone>
+                  <DefaultSelect
+                    placeholder={t('SELECT_TIMEZONE', 'Select a timezone')}
+                    defaultValue={formState?.changes?.timezone ?? user?.timezone ?? ''}
+                    options={timezonesOptions}
+                    onChange={val => handleChangeSwtich('timezone', val)}
+                    optionInnerMaxHeight='300px'
+                    isShowSearchBar
+                    searchBarIsCustomLayout
+                    searchBarIsNotLazyLoad
+                    searchValue={timezoneSearchValue}
+                    handleChangeSearch={setTimezoneSearchValue}
+                  />
+                </InputWrapper>
+              </>
             )}
             {!!showInputPhoneNumber && (
               <InputPhoneNumber

package/src/components/Home/HomePage/index.js

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import { useLanguage, useUtils, useEvent, useSession, useApi, Home as HomeController } from 'ordering-components-admin-external'
+import { useLanguage, useUtils, useEvent, useSession, useApi, Home as HomeController, useConfig } from 'ordering-components-admin-external'
 import { Line } from 'react-chartjs-2'
 import moment from 'moment'
 import { IconButton, Button } from '../../../styles/Buttons'
@@ -59,6 +59,7 @@ const HomeUI = (props) => {
 
   const theme = useTheme()
   const [, t] = useLanguage()
+  const [{ configs }] = useConfig()
   const [{ isCollapse }, { handleMenuCollapse }] = useInfoShare()
   const [timeAxes, setTimeAxes] = useState([])
   const [events] = useEvent()
@@ -280,7 +281,7 @@ const HomeUI = (props) => {
                     <Button
                       color='primary'
                       borderRadius='8px'
-                      onClick={() => window.open(`https://${ordering?.project}.tryordering.com`, '_blank')}
+                      onClick={() => window.open(configs?.site_url?.value || `https://${ordering?.project}.tryordering.com`, '_blank')}
                     >
                       {t('VISIT_MY_WEBSITE', 'Visit my Website')}
                     </Button>

package/src/components/MyProducts/OrderingWebsite/index.js

@@ -1,5 +1,5 @@
 import React, { useRef, useState } from 'react'
-import { useLanguage, ExamineClick, DragAndDrop, useApi, OrderingWebsite as OrderingWebsiteController } from 'ordering-components-admin-external'
+import { useLanguage, ExamineClick, DragAndDrop, useConfig, useApi, OrderingWebsite as OrderingWebsiteController } from 'ordering-components-admin-external'
 import { useInfoShare } from '../../../contexts/InfoShareContext'
 import { useLocation } from 'react-router-dom'
 import { Button, IconButton, Input, TextArea } from '../../../styles'
@@ -75,6 +75,7 @@ const OrderingWebsiteUI = (props) => {
   } = props
 
   const [, t] = useLanguage()
+  const [{ configs }] = useConfig()
   const [{ isCollapse }, { handleMenuCollapse }] = useInfoShare()
   const theme = useTheme()
   const [ordering] = useApi()
@@ -228,7 +229,7 @@ const OrderingWebsiteUI = (props) => {
               <Button
                 color='primary'
                 borderRadius='8px'
-                onClick={() => window.open(`https://${ordering?.project}.tryordering.com`, '_blank')}
+                onClick={() => window.open(configs?.site_url?.value || `https://${ordering?.project}.tryordering.com`, '_blank')}
               >
                 {t('VISIT_MY_WEBSITE', 'Visit My Website')}
               </Button>
@@ -345,14 +346,14 @@ const OrderingWebsiteUI = (props) => {
                   {orderingTheme?.loading ? (
                     <Skeleton height={40} style={{ width: '100%' }} />
                   ) : (
-                        <Button
-                          color='primary'
-                          outline
-                          borderRadius='8px'
+                    <Button
+                      color='primary'
+                      outline
+                      borderRadius='8px'
                       onClick={() => window.open('https://www.ordering.co/custom-domain-change', '_blank')}
-                        >
+                    >
                       {t('REQUEST_CUSTOM_DOMAIN', 'Request custom domain')}
-                        </Button>
+                    </Button>
                     // <>
                     //   {site?.domain && site?.ssl_status !== 'error' && (
                     //     <TemporalDomail isDisabled={site?.ssl_process_status === 'pending'} marginBottom={site?.ssl_process_status === 'ended'}>

package/src/components/OrderingProducts/SiteTheme/index.js

@@ -147,7 +147,7 @@ const SiteThemeUI = (props) => {
                     {!!themeStructure[selectedPage]?.components && (
                     Object.keys(themeStructure[selectedPage]?.components)?.map(block => {
                       const components = themeStructure[selectedPage].components
-                      return (
+                      return block !== 'birthday' && (
                         <BlockContainer key={block}>
                           <h3>{getTitle(block)}</h3>
                           {(block === 'image' || block === 'dummy_image') && components[block]?.value_type === 'string' && (