ordering-ui-external 1.6.7 → 1.7.0

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

@@ -37,6 +37,7 @@ import { AppleLogin } from '../AppleLogin'
 import AiOutlineEye from '@meronex/icons/ai/AiOutlineEye'
 import AiOutlineEyeInvisible from '@meronex/icons/ai/AiOutlineEyeInvisible'
 import { sortInputFields } from '../../../../../utils'
+import { useRecaptcha } from '../../../../../hooks/useRecaptcha'
 
 const notValidationFields = ['coupon', 'driver_tip', 'mobile_phone', 'address', 'address_notes']
 
@@ -63,6 +64,8 @@ const SignUpFormUI = (props) => {
   const [{ configs }] = useConfig()
   const formMethods = useForm()
   const [alertState, setAlertState] = useState({ open: false, content: [] })
+  const [recaptchaConfig] = useRecaptcha(enableReCaptcha)
+  const [reCaptchaVersion, setRecaptchaVersion] = useState({ version: '', siteKey: '' })
   const [, { login }] = useSession()
   const emailInput = useRef(null)
   const isFacebookLogin = configs?.facebook_login?.value === 'true'
@@ -165,6 +168,22 @@ const SignUpFormUI = (props) => {
 
   useEffect(() => {
     if (!formState.loading && formState.result?.error) {
+      if (formState.result?.result?.[0] === 'ERROR_AUTH_VERIFICATION_CODE') {
+        if (configs?.security_recaptcha_site_key?.value) {
+          setRecaptchaVersion({ version: 'v2', siteKey: configs?.security_recaptcha_site_key?.value })
+          setAlertState({
+            open: true,
+            content: [t('TRY_AGAIN', 'Please try again')]
+          })
+          return
+        }
+        setAlertState({
+          open: true,
+          content: [t('CONFIG_DOESNOT_RECAPTCHA_KEY', 'the config doesn\'t have recaptcha site key')]
+        })
+        return
+      }
+
       setAlertState({
         open: true,
         content: formState.result?.result || [t('ERROR', 'Error')]
@@ -183,6 +202,12 @@ const SignUpFormUI = (props) => {
     }
   }, [formMethods.errors])
 
+  useEffect(() => {
+    if (recaptchaConfig?.siteKey) {
+      setRecaptchaVersion({ version: recaptchaConfig?.version, siteKey: recaptchaConfig?.siteKey })
+    }
+  }, [recaptchaConfig])
+
   useEffect(() => {
     if (!validationFields.loading) {
       Object.values(validationFields?.fields?.checkout).map(field => !notValidationFields.includes(field.code) && (
@@ -392,9 +417,9 @@ const SignUpFormUI = (props) => {
             )}
 
             {props.isRecaptchaEnable && enableReCaptcha && (
-                <ReCaptchaWrapper>
-                  <ReCaptcha handleReCaptcha={handleReCaptcha} />
-                </ReCaptchaWrapper>
+              <ReCaptchaWrapper>
+                <ReCaptcha handleReCaptcha={handleReCaptcha} reCaptchaVersion={reCaptchaVersion} />
+              </ReCaptchaWrapper>
             )}
 
             <Button

package/src/utils/index.js

@@ -293,6 +293,59 @@ export const shape = {
   capsuleShape: 'capsule_shape'
 }
 
+/**
+ * Function to get formatted time list
+ * @param {*} selectedDate = selected Date
+ * @param {*} schedule = schedule list
+ * @param {*} is12Hours = variable for time format
+ */
+export const getTimes = (selectedDate, schedule, is12Hours) => {
+  const date = new Date()
+  const times = []
+  for (let k = 0; k < schedule[selectedDate.getDay()].lapses.length; k++) {
+    const open = {
+      hour: schedule[selectedDate.getDay()].lapses[k].open.hour,
+      minute: schedule[selectedDate.getDay()].lapses[k].open.minute
+    }
+    const close = {
+      hour: schedule[selectedDate.getDay()].lapses[k].close.hour,
+      minute: schedule[selectedDate.getDay()].lapses[k].close.minute
+    }
+    for (let i = open.hour; i <= close.hour; i++) {
+      if (date.getDate() !== selectedDate.getDate() || i >= date.getHours()) {
+        let hour = ''
+        let meridian = ''
+        if (is12Hours) {
+          if (i === 0) {
+            hour = '12'
+            meridian = ' ' + 'AM'
+          } else if (i > 0 && i < 12) {
+            hour = (i < 10 ? '0' + i : i)
+            meridian = ' ' + 'AM'
+          } else if (i === 12) {
+            hour = '12'
+            meridian = ' ' + 'PM'
+          } else {
+            hour = ((i - 12 < 10) ? '0' + (i - 12) : `${(i - 12)}`)
+            meridian = ' ' + 'PM'
+          }
+        } else {
+          hour = i < 10 ? '0' + i : i
+        }
+        for (let j = (i === open.hour ? open.minute : 0); j <= (i === close.hour ? close.minute : 59); j += 15) {
+          if (i !== date.getHours() || j >= date.getMinutes() || date.getDate() !== selectedDate.getDate()) {
+            times.push({
+              text: hour + ':' + (j < 10 ? '0' + j : j) + meridian,
+              value: (i < 10 ? '0' + i : i) + ':' + (j < 10 ? '0' + j : j)
+            })
+          }
+        }
+      }
+    }
+  }
+  return times
+}
+
 /**
  * List of price to filter businesses
  */

package/template/app.js

@@ -73,7 +73,7 @@ export const App = () => {
   const [orderStatus, { changeType, getLastOrderHasNoReview }] = useOrder()
   const [{ configs, loading: configLoading }] = useConfig()
   const [{ loading: siteLoading }] = useSite()
-  const [, t] = useLanguage()
+  const [languageState, t] = useLanguage()
   const [orderingTheme] = useOrderingTheme()
   const [loaded, setLoaded] = useState(false)
   const onlineStatus = useOnlineStatus()
@@ -164,7 +164,8 @@ export const App = () => {
             businessType: user?.level,
             project: settings.project,
             dashboardUrl: settings.url_dashboard,
-            dashboardLoginUrl: `${settings.url_dashboard}/login/?project=${settings.project}&token=${user?.session?.access_token}`
+            dashboardLoginUrl: `${settings.url_dashboard}/login/?project=${settings.project}&token=${user?.session?.access_token}`,
+            contactEmail: settings.contact_email
           }
         }) : setAlertState({
           open: true,
@@ -181,7 +182,8 @@ export const App = () => {
           businessType: user?.level,
           project: settings.project,
           dashboardUrl: settings.url_dashboard,
-          dashboardLoginUrl: `${settings.url_dashboard}/login/?project=${settings.project}&token=${user?.session?.access_token}`
+          dashboardLoginUrl: `${settings.url_dashboard}/login/?project=${settings.project}&token=${user?.session?.access_token}`,
+          contactEmail: settings.contact_email
         }
       }) : setAlertState({
         open: true,
@@ -319,6 +321,16 @@ export const App = () => {
     }
   }, [])
 
+  useEffect(() => {
+    if (
+      languageState?.error &&
+      languageState?.error?.includes('This project does not exist') &&
+      settings?.use_project_subdomain
+    ) {
+      window.open('https://www.ordering.co', '_self')
+    }
+  }, [languageState])
+
   useEffect(() => {
     if (!orderStatus.loading) {
       const localCountryCode = orderStatus?.options?.address?.country_code ??

package/template/config.json

@@ -17,6 +17,7 @@
   "store_apple_id": "",
   "store_kindle_id": "",
   "url_dashboard": "https://app.tryordering.com",
+  "contact_email": "support@ordering.co",
   "use_kiosk": false,
   "businessSlug": "",
   "franchiseSlug": null,

package/template/pages/BusinessProductsList/index.js

@@ -135,9 +135,9 @@ export const BusinessProductsList = (props) => {
     onProductRedirect: ({ slug, category, product }) => {
       if (!category && !product) {
         if (businessUrlTemplate === '/store/:business_slug' || businessUrlTemplate === '/:business_slug') {
-          return events.emit('go_to_page', { page: 'business', params: { business_slug: slug } })
+          return events.emit('go_to_page', { page: 'business', params: { business_slug: slug }, replace: true })
         } else {
-          return events.emit('go_to_page', { page: 'business', search: `?${businessUrlTemplate.split('?')[1].replace(':business_slug', '')}${slug}` })
+          return events.emit('go_to_page', { page: 'business', search: `?${businessUrlTemplate.split('?')[1].replace(':business_slug', '')}${slug}`, replace: true })
         }
       }
       if (productUrlTemplate === '/store/:business_slug/:category_slug/:product_slug' || productUrlTemplate === '/:business_slug/:category_slug/:product_slug') {