ordering-ui-external 14.1.28 → 14.1.30

package/_modules/themes/callcenterOriginal/src/components/PhoneAutocomplete/index.js

@@ -171,7 +171,7 @@ var PhoneAutocompleteUI = function PhoneAutocompleteUI(props) {
   }, [customersPhones === null || customersPhones === void 0 ? void 0 : customersPhones.error]);
   var onInputChange = function onInputChange(inputValue, _ref2) {
     var action = _ref2.action;
-    if (action === 'menu-close' || action === 'input-blur' || action === 'set-value' || inputValue.charAt(0) === '0') {
+    if (action === 'menu-close' || action === 'input-blur' || action === 'set-value') {
       return;
     }
     if (!inputValue) {

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

@@ -9,6 +9,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactHookForm = require("react-hook-form");
 var _reactLoadingSkeleton = _interopRequireDefault(require("react-loading-skeleton"));
 var _libphonenumberJs = _interopRequireDefault(require("libphonenumber-js"));
+var _reactPhoneNumberInput = require("react-phone-number-input");
 var _reactOtpInput = _interopRequireDefault(require("react-otp-input"));
 var _reactBootstrapIcons = require("react-bootstrap-icons");
 var _orderingComponentsExternal = require("ordering-components-external");
@@ -260,17 +261,23 @@ var SignUpFormUI = function SignUpFormUI(props) {
       }
     };
     if (isValid) {
+      var _configs$validation_p, _configs$validation_p2;
       phoneNumberParser = (0, _libphonenumberJs.default)(number);
+      if (!parseInt((_configs$validation_p = configs === null || configs === void 0 || (_configs$validation_p2 = configs.validation_phone_number_lib) === null || _configs$validation_p2 === void 0 ? void 0 : _configs$validation_p2.value) !== null && _configs$validation_p !== void 0 ? _configs$validation_p : 1, 10)) {
+        var _phoneNumberParser;
+        if ((_phoneNumberParser = phoneNumberParser) !== null && _phoneNumberParser !== void 0 && _phoneNumberParser.nationalNumber) phoneNumberParser.nationalNumber = (0, _reactPhoneNumberInput.formatPhoneNumber)(number);
+      }
     }
     if (phoneNumberParser) {
+      var _phoneNumberParser2, _phoneNumberParser3;
       phoneNumber = {
         country_phone_code: {
           name: 'country_phone_code',
-          value: phoneNumberParser.countryCallingCode
+          value: (_phoneNumberParser2 = phoneNumberParser) === null || _phoneNumberParser2 === void 0 ? void 0 : _phoneNumberParser2.countryCallingCode
         },
         cellphone: {
           name: 'cellphone',
-          value: phoneNumberParser.nationalNumber
+          value: (_phoneNumberParser3 = phoneNumberParser) === null || _phoneNumberParser3 === void 0 ? void 0 : _phoneNumberParser3.nationalNumber
         }
       };
     }
@@ -368,7 +375,7 @@ var SignUpFormUI = function SignUpFormUI(props) {
     }
   }, [recaptchaConfig]);
   var preventWhiteSpaceOnKeyDown = function preventWhiteSpaceOnKeyDown(e) {
-    if (e.key === " ") {
+    if (e.key === ' ') {
       e.preventDefault();
     }
   };

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

@@ -10,6 +10,7 @@ var _reactLoadingSkeleton = _interopRequireDefault(require("react-loading-skelet
 var _orderingComponentsExternal = require("ordering-components-external");
 var _reactHookForm = require("react-hook-form");
 var _libphonenumberJs = _interopRequireDefault(require("libphonenumber-js"));
+var _reactPhoneNumberInput = require("react-phone-number-input");
 var _styledComponents = require("styled-components");
 var _SignUpForm = require("../SignUpForm");
 var _styles = require("./styles");
@@ -249,17 +250,23 @@ var UserFormDetailsUI = exports.UserFormDetailsUI = function UserFormDetailsUI(p
       }
     };
     if (isValid) {
+      var _configs$validation_p, _configs$validation_p2;
       phoneNumberParser = (0, _libphonenumberJs.default)(number);
+      if (!parseInt((_configs$validation_p = configs === null || configs === void 0 || (_configs$validation_p2 = configs.validation_phone_number_lib) === null || _configs$validation_p2 === void 0 ? void 0 : _configs$validation_p2.value) !== null && _configs$validation_p !== void 0 ? _configs$validation_p : 1, 10)) {
+        var _phoneNumberParser;
+        if ((_phoneNumberParser = phoneNumberParser) !== null && _phoneNumberParser !== void 0 && _phoneNumberParser.nationalNumber) phoneNumberParser.nationalNumber = (0, _reactPhoneNumberInput.formatPhoneNumber)(number);
+      }
     }
     if (phoneNumberParser) {
+      var _phoneNumberParser2, _phoneNumberParser3;
       phoneNumber = {
         country_phone_code: {
           name: 'country_phone_code',
-          value: phoneNumberParser.countryCallingCode
+          value: (_phoneNumberParser2 = phoneNumberParser) === null || _phoneNumberParser2 === void 0 ? void 0 : _phoneNumberParser2.countryCallingCode
         },
         cellphone: {
           name: 'cellphone',
-          value: phoneNumberParser.nationalNumber
+          value: (_phoneNumberParser3 = phoneNumberParser) === null || _phoneNumberParser3 === void 0 ? void 0 : _phoneNumberParser3.nationalNumber
         }
       };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-external",
-  "version": "14.1.28",
+  "version": "14.1.30",
   "description": "Ordering UI Components",
   "main": "./_modules/index.js",
   "exports": {
@@ -88,7 +88,7 @@
     "lodash": "^4.17.19",
     "moment": "^2.29.4",
     "nanoid": "^4.0.0",
-    "ordering-components-external": "13.0.33",
+    "ordering-components-external": "13.0.34",
     "payment": "^2.4.6",
     "polished": "^3.6.6",
     "react-bootstrap-icons": "^1.7.2",

package/src/themes/callcenterOriginal/src/components/PhoneAutocomplete/index.js

@@ -123,7 +123,7 @@ const PhoneAutocompleteUI = (props) => {
   }, [customersPhones?.error])
 
   const onInputChange = (inputValue, { action }) => {
-    if (action === 'menu-close' || action === 'input-blur' || action === 'set-value' || inputValue.charAt(0) === '0') {
+    if (action === 'menu-close' || action === 'input-blur' || action === 'set-value') {
       return
     }
     if (!inputValue) {

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

@@ -2,6 +2,8 @@ import React, { useState, useEffect } from 'react'
 import { useForm } from 'react-hook-form'
 import Skeleton from 'react-loading-skeleton'
 import parsePhoneNumber from 'libphonenumber-js'
+import { formatPhoneNumber } from 'react-phone-number-input'
+
 import OtpInput from 'react-otp-input'
 
 import {
@@ -229,16 +231,19 @@ const SignUpFormUI = (props) => {
     }
     if (isValid) {
       phoneNumberParser = parsePhoneNumber(number)
+      if (!parseInt(configs?.validation_phone_number_lib?.value ?? 1, 10)) {
+        if (phoneNumberParser?.nationalNumber) phoneNumberParser.nationalNumber = formatPhoneNumber(number)
+      }
     }
     if (phoneNumberParser) {
       phoneNumber = {
         country_phone_code: {
           name: 'country_phone_code',
-          value: phoneNumberParser.countryCallingCode
+          value: phoneNumberParser?.countryCallingCode
         },
         cellphone: {
           name: 'cellphone',
-          value: phoneNumberParser.nationalNumber
+          value: phoneNumberParser?.nationalNumber
         }
       }
     }
@@ -327,7 +332,7 @@ const SignUpFormUI = (props) => {
   }, [recaptchaConfig])
 
   const preventWhiteSpaceOnKeyDown = (e) => {
-    if (e.key === " ") {
+    if (e.key === ' ') {
       e.preventDefault()
     }
   }

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

@@ -3,6 +3,8 @@ import Skeleton from 'react-loading-skeleton'
 import { useSession, useLanguage, useCustomer, useConfig } from 'ordering-components-external'
 import { useForm } from 'react-hook-form'
 import parsePhoneNumber from 'libphonenumber-js'
+import { formatPhoneNumber } from 'react-phone-number-input'
+
 import { useTheme } from 'styled-components'
 import { SignUpForm } from '../SignUpForm'
 
@@ -205,16 +207,19 @@ export const UserFormDetailsUI = (props) => {
     }
     if (isValid) {
       phoneNumberParser = parsePhoneNumber(number)
+      if (!parseInt(configs?.validation_phone_number_lib?.value ?? 1, 10)) {
+        if (phoneNumberParser?.nationalNumber) phoneNumberParser.nationalNumber = formatPhoneNumber(number)
+      }
     }
     if (phoneNumberParser) {
       phoneNumber = {
         country_phone_code: {
           name: 'country_phone_code',
-          value: phoneNumberParser.countryCallingCode
+          value: phoneNumberParser?.countryCallingCode
         },
         cellphone: {
           name: 'cellphone',
-          value: phoneNumberParser.nationalNumber
+          value: phoneNumberParser?.nationalNumber
         }
       }
     }

package/template/app.js

@@ -517,14 +517,14 @@ export const App = () => {
     />
   ) : (
     <div style={{ marginBottom: windowSize.width < 576 && onlineStatus ? 80 : 0 }}>
-      {!!configs?.track_id_google_analytics?.value && (
-        <Analytics trackId={configs?.track_id_google_analytics?.value} />
+      {(!!configs?.track_id_google_analytics?.value || !!settings?.store_google_analytics_id) && (
+        <Analytics trackId={singleBusinessConfig?.isActive ? settings?.store_google_analytics_id : configs?.track_id_google_analytics?.value} />
       )}
-      {!!configs?.segment_track_id?.value && (
-        <AnalyticsSegment writeKey={configs?.segment_track_id?.value} />
+      {(!!configs?.segment_track_id?.value || !!settings?.store_segment_id) && (
+        <AnalyticsSegment writeKey={singleBusinessConfig?.isActive ? settings?.store_segment_id : configs?.segment_track_id?.value} />
       )}
-      {!!configs?.facebook_id?.value && FacebookPixel && (
-        <FacebookPixel trackId={configs?.facebook_id?.value} />
+      {(!!configs?.facebook_id?.value || !!settings?.store_facebook_pixel_id) && FacebookPixel && (
+        <FacebookPixel trackId={singleBusinessConfig?.isActive ? settings?.store_facebook_pixel_id : configs?.facebook_id?.value} />
       )}
       {!loaded && <SpinnerLoader />}
       <SmartAppBanner

package/template/config.js

@@ -3,7 +3,10 @@ import settings from './config.json'
 const keysToNull = [
   'franchiseId',
   'franchiseSlug',
-  'businessSlug'
+  'businessSlug',
+  'store_facebook_pixel_id',
+  'store_google_analytics_id',
+  'store_segment_id'
 ]
 
 keysToNull.forEach(key => {

package/template/config.json

@@ -17,6 +17,9 @@
   "store_android_id": "",
   "store_apple_id": "",
   "store_kindle_id": "",
+  "store_facebook_pixel_id": "0",
+  "store_google_analytics_id": "0",
+  "store_segment_id": "0",
   "url_dashboard": "https://app.tryordering.com",
   "contact_email": "support@ordering.co",
   "use_kiosk": false,