ordering-ui-external 14.1.1 → 14.1.3

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

@@ -45,6 +45,7 @@ const UserDetailsUI = (props) => {
   const userData = userState.result?.result || props.userData || formState.result?.result || user
 
   const validationFieldsLength = Object.values(validationFields?.fields?.checkout)?.map(field => field.enabled)
+  const countryPhoneCode = userData?.country_phone_code ?? userData?.country_code
 
   useEffect(() => {
     if (isUserDetailsEdit) {
@@ -121,8 +122,8 @@ const UserDetailsUI = (props) => {
                 <PhoneContainer>
                   <CountryFlag>
                     {
-                      userData?.country_phone_code && userData?.cellphone && (
-                        <PhoneInput onChange={() => { }} defaultCountry={parsePhoneNumber(`+${(userData?.country_phone_code?.replace('+', ''))} ${userData?.cellphone.replace(`+${userData?.country_phone_code}`, '')}`)?.country} />
+                      countryPhoneCode && userData?.cellphone && (
+                        <PhoneInput onChange={() => { }} defaultCountry={parsePhoneNumber(`+${(countryPhoneCode?.replace('+', ''))} ${userData?.cellphone?.replace(`+${countryPhoneCode}`, '')}`)?.country} />
                       )
                     }
                   </CountryFlag>

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

@@ -47,6 +47,7 @@ export const UserFormDetailsUI = (props) => {
   const emailInput = useRef(null)
 
   const user = userData || userSession
+  const countryPhoneCode = user?.country_phone_code ?? user?.country_code
 
   const closeAlert = () => {
     setAlertState({
@@ -70,8 +71,8 @@ export const UserFormDetailsUI = (props) => {
         setUserPhoneNumber(phone)
         return
       }
-      if (user?.country_phone_code) {
-        phone = `+${user?.country_phone_code} ${user?.cellphone}`
+      if (countryPhoneCode) {
+        phone = `+${countryPhoneCode} ${user?.cellphone}`
       } else {
         phone = user?.cellphone
       }
@@ -94,7 +95,7 @@ export const UserFormDetailsUI = (props) => {
       return
     }
     if (!isPhoneNumberValid && userPhoneNumber) {
-      if (user?.country_phone_code) {
+      if (countryPhoneCode) {
         setAlertState({
           open: true,
           content: [t('INVALID_ERROR_PHONE_NUMBER', 'The Phone Number field is invalid')]
@@ -308,29 +309,6 @@ export const UserFormDetailsUI = (props) => {
                 />
               </InputPhoneNumberWrapper>
             )}
-            {!isCheckout && (
-              <InputGroup>
-                <p>{t('PASSWORD', 'Password')}</p>
-                <Input
-                  type='password'
-                  name='password'
-                  className='form'
-                  disabled={!isEdit}
-                  borderBottom
-                  placeholder={t('FRONT_VISUALS_PASSWORD', 'Password')}
-                  onChange={handleChangeInput}
-                  ref={formMethods.register({
-                    required: isRequiredField('password')
-                      ? t('VALIDATION_ERROR_PASSWORD_REQUIRED', 'The field Password is required').replace('_attribute_', t('PASSWORD', 'Password'))
-                      : null,
-                    minLength: {
-                      value: 8,
-                      message: t('VALIDATION_ERROR_PASSWORD_MIN_STRING', 'The Password must be at least 8 characters.').replace('_attribute_', t('PASSWORD', 'Password')).replace('_min_', 8)
-                    }
-                  })}
-                />
-              </InputGroup>
-            )}
             <Divider />
             {
               props.afterMidElements?.map((MidElement, i) => (

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

@@ -132,16 +132,25 @@ const BusinessPreorderUI = (props) => {
 
   useEffect(() => {
     if (cateringPreorder) {
+      let _timeLists = []
       const schedule = business && getActualSchedule()
-      if (!schedule && cateringPreorder && Object.keys(business)?.length > 0) {
-        setIsEnabled(false)
+      if (!schedule && business) {
+        setTimeList([])
         return
       }
-      const _timeLists = hoursList
-        .filter(hour => (Object.keys(business || {})?.length === 0 || schedule?.lapses?.some(lapse =>
-          moment(dateSelected + ` ${hour.startTime}`) >= moment(dateSelected + ` ${lapse.open.hour}:${lapse.open.minute}`).add(preorderLeadTime, 'minutes') && moment(dateSelected + ` ${hour.endTime}`) <= moment(dateSelected + ` ${lapse.close.hour}:${lapse.close.minute}`))) &&
-          moment(dateSelected + ` ${hour.startTime}`) < moment(dateSelected + ` ${hour.endTime}`) &&
-          (moment().add(preorderLeadTime, 'minutes') < moment(dateSelected + ` ${hour.startTime}`) || !cateringPreorder))
+
+      _timeLists = hoursList
+        .filter(hour => {
+          return (Object.keys(business || {})?.length === 0 || schedule?.lapses?.some((lapse) => {
+            const openHour = lapse.open.hour < 10 ? `0${lapse.open.hour}` : lapse.open.hour
+            const openMinute = lapse.open.minute < 10 ? `0${lapse.open.minute}` : lapse.open.minute
+            const closeHour = lapse.close.hour < 10 ? `0${lapse.close.hour}` : lapse.close.hour
+            const closeMinute = lapse.close.minute < 10 ? `0${lapse.close.minute}` : lapse.close.minute
+            return moment(dateSelected + ` ${hour.startTime}`) >= moment(dateSelected + ` ${openHour}:${openMinute}`).add(preorderLeadTime, 'minutes') && moment(dateSelected + ` ${hour.endTime}`) <= moment(dateSelected + ` ${closeHour}:${closeMinute}`)
+          })) &&
+            (moment(dateSelected + ` ${hour.startTime}`) < moment(dateSelected + ` ${hour.endTime}`)) &&
+            (moment().add(preorderLeadTime, 'minutes') < moment(dateSelected + ` ${hour.startTime}`) || !cateringPreorder)
+        })
         .map(hour => {
           return {
             value: hour.startTime,
@@ -161,14 +170,15 @@ const BusinessPreorderUI = (props) => {
             )
           }
         })
-      setIsEnabled(true)
-      setTimeList(_timeLists)
+      if (_timeLists?.length > 0) {
+        setTimeList(_timeLists)
+      }
     } else {
       const selectedMenu = menu ? (menu?.use_business_schedule ? business : menu) : business
       const _times = getTimeList(dateSelected, selectedMenu)
       setTimeList(_times)
     }
-  }, [dateSelected, menu, business, cateringPreorder, hoursList])
+  }, [dateSelected, menu, JSON.stringify(business), cateringPreorder, JSON.stringify(hoursList), dateSelected])
 
   useEffect(() => {
     if (type === 'business_hours') setMenu(null)
@@ -263,7 +273,7 @@ const BusinessPreorderUI = (props) => {
           </DateWrapper>
 
           <TimeListWrapper>
-            {(isEnabled && timeList?.length > 0) ? (
+            {((isEnabled || cateringPreorder) && timeList?.length > 0) ? (
               <>
                 {timeList.map((time, i) => (
                   <TimeItem

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

@@ -256,7 +256,7 @@ const MomentControlUI = (props) => {
               isLoading={orderState?.loading}
             >
               {isASP ? <CheckedIcon /> : <CgRadioCheck />}
-              <span>{t('CHECKOUT_ASAP', 'ASAP')} ({moment(new Date()).format('LLLL')} + {t('DELIVERY_TIME', 'delivery time')})</span>
+              <span>{t('CHECKOUT_ASAP', 'ASAP')} ({moment(new Date()).format(`dddd, MMMM DD, YYYY ${configs?.general_hour_format?.value}`)} + {t('DELIVERY_TIME', 'delivery time')})</span>
             </CheckBoxWrapper>
           )}
           <CheckBoxWrapper