ordering-ui-admin-external 1.28.0 → 1.29.0

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

@@ -1,5 +1,5 @@
 import React, { useEffect, useState, useRef } from 'react'
-import { useLanguage, useApi } from 'ordering-components-admin-external'
+import { useLanguage, useApi, useConfig } from 'ordering-components-admin-external'
 import { useWindowSize } from '../../../hooks/useWindowSize'
 import { Button, Input } from '../../../styles'
 import { X as Close } from 'react-bootstrap-icons'
@@ -15,6 +15,7 @@ import {
   QRCodeLayout,
   TableNumberHintText
 } from './styles'
+import { checkSiteUrl } from '../../../utils'
 
 export const BusinessQRCodeOption = (props) => {
   const {
@@ -27,6 +28,7 @@ export const BusinessQRCodeOption = (props) => {
 
   const [, t] = useLanguage()
   const [ordering] = useApi()
+  const [{ configs }] = useConfig()
   const { width } = useWindowSize()
   const [isMenuOpen, setIsMenuOpen] = useState(false)
   const [alertState, setAlertState] = useState({ open: false, content: [] })
@@ -58,8 +60,8 @@ export const BusinessQRCodeOption = (props) => {
       })
       return
     }
-    const storeUrl = siteState?.site?.domain && siteState?.site?.ssl_process_status === 'ended'
-      ? `https://${siteState?.site?.domain}/store/${business?.slug}`
+    const storeUrl = configs?.site_url?.value
+      ? `${checkSiteUrl(configs?.site_url?.value)}store/${business?.slug}`
       : `https://${ordering.project}.tryordering.com/store/${business?.slug}`
     const tsNumber = item?.key !== 'pick_up'
       ? (item?.key === 'eat_in'

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

@@ -1,6 +1,6 @@
 import React, { useState } from 'react'
 import Skeleton from 'react-loading-skeleton'
-import { useLanguage, useUtils, useEvent, useApi } from 'ordering-components-admin-external'
+import { useLanguage, useUtils, useEvent, useApi, useConfig } from 'ordering-components-admin-external'
 import BsChevronRight from '@meronex/icons/bs/BsChevronRight'
 import { useTheme } from 'styled-components'
 import { Dropdown, DropdownButton } from 'react-bootstrap'
@@ -26,6 +26,7 @@ import {
   BusinessPreviewHeader,
   ButtonWrapper
 } from './styles'
+import { checkSiteUrl } from '../../../utils'
 
 export const BusinessSummary = (props) => {
   const {
@@ -46,6 +47,7 @@ export const BusinessSummary = (props) => {
   const [, t] = useLanguage()
   const [{ optimizeImage }] = useUtils()
   const [events] = useEvent()
+  const [{ configs }] = useConfig()
   const theme = useTheme()
   const [ordering] = useApi()
   const { width } = useWindowSize()
@@ -58,10 +60,10 @@ export const BusinessSummary = (props) => {
   }
 
   const handleOpenSite = () => {
-    const url = siteState?.site?.domain && siteState?.site?.ssl_process_status === 'ended'
-      ? `https://${siteState?.site?.domain}/store/${businessState?.business?.slug}`
+    const storeUrl = configs?.site_url?.value
+      ? `${checkSiteUrl(configs?.site_url?.value)}store/${businessState?.business?.slug}`
       : `https://${ordering.project}.tryordering.com/store/${businessState?.business?.slug}`
-    window.open(url, '_blank')
+    window.open(storeUrl, '_blank')
   }
 
   const itemsExcluded = !!spoonityConfig ? ['publishing', 'personalization'] : ['publishing', 'spoonity_key', 'personalization']

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

@@ -39,7 +39,9 @@ const UserAddFormUI = (props) => {
     isCheckout,
     handleChangeUserType,
     handlechangeImage,
-    handleChangeSwtich
+    handleChangeSwtich,
+    defaultPhoneNumber,
+    isFromCustomOrder
   } = props
   const formMethods = useForm()
   const [, t] = useLanguage()
@@ -59,7 +61,7 @@ const UserAddFormUI = (props) => {
     cleanFormState && cleanFormState({ result: { error: false } })
   }
 
-  const showInputPhoneNumber = validationFields?.fields?.checkout?.cellphone?.enabled ?? false
+  const showInputPhoneNumber = isFromCustomOrder ?? validationFields?.fields?.checkout?.cellphone?.enabled ?? false
 
   const onSubmit = () => {
     const isPhoneNumberValid = userPhoneNumber ? isValidPhoneNumber : true
@@ -198,6 +200,13 @@ const UserAddFormUI = (props) => {
     })
   }, [formMethods])
 
+  useEffect(() => {
+    if (defaultPhoneNumber) {
+      setUserPhoneNumber(defaultPhoneNumber)
+      handleChangePhoneNumber(defaultPhoneNumber, true)
+    }
+  }, [defaultPhoneNumber])
+
   return (
     <>
       <FormContainer>
@@ -311,7 +320,7 @@ const UserAddFormUI = (props) => {
               <WrapperUserTypeSelector>
                 <UserTypeSelector
                   isPrimary
-                  defaultUserType={formState?.changes?.level}
+                  defaultUserType={formState?.changes?.level || 3}
                   handleChangeUserType={handleChangeUserType}
                 />
               </WrapperUserTypeSelector>

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

@@ -4,8 +4,8 @@ export const FormContainer = styled.div`
   width: 100%;
 
   h1 {
-    font-size: 24px;
-    font-weight: 600;
+    font-size: 20px;
+    font-weight: 700;
     width: 100%;
     margin-bottom: 0px;
     color: ${props => props.theme.colors.headingColor};

package/src/styles/Selects/index.js

@@ -96,7 +96,7 @@ export const Options = styled.div`
 `
 
 export const OptionsInner = styled.div`
-  overflow: auto;
+  overflow-x: hidden;
   margin: ${({ optionInnerMargin }) => optionInnerMargin};
   max-height: ${({ optionInnerMaxHeight }) => optionInnerMaxHeight};
   overscroll-behavior: contain;

package/src/utils/index.js

@@ -216,6 +216,11 @@ export const findExitingCode = (countryCode) => {
   return code?.countryCode
 }
 
+export const findExitingCountryPhoneCode = (countryCode) => {
+  const code = CODES.find(code => code.countryCode === (countryCode || '').toUpperCase())
+  return code?.phoneCode
+}
+
 /**
  * Function to check if a number is decimal or not
  * @param {*} value number to check if decimal or not