ordering-ui-admin-external 1.20.1 → 1.21.0

package/src/components/Orders/OrdersTable/styles.js

@@ -102,7 +102,7 @@ export const OrderTbody = styled.tbody`
   border-bottom: 1px solid ${props => props.theme.colors.borderColor};
   cursor: pointer;
 
-  /* &[data-status="delayed"] {
+  &[data-status="delayed"] {
     background-color: ${props => props.theme.colors.danger100};
     td {
       border-top: 1px solid ${props => props.theme.colors.danger} !important;
@@ -115,7 +115,7 @@ export const OrderTbody = styled.tbody`
       border-top: 1px solid ${props => props.theme.colors.warning} !important;
       border-bottom: 1px solid ${props => props.theme.colors.warning} !important;
     }
-  } */
+  }
   &:hover {
     background-color: ${props => props.theme.colors.lightPrimary};
   }

package/src/components/Settings/IntegrationListing/index.js

@@ -141,7 +141,7 @@ export const IntegrationListing = (props) => {
               <p>{t('CONNECT_LALAMOVE_DESCRIPTION', 'Send orders directly to your drivers in LalaMove and keep customers happy with their deliveries.')}</p>
             </SettingItemContent>
           </SettingItemContainer>
-          {/* <SettingItemContainer
+          <SettingItemContainer
             onClick={() => handleOpenSetting('picker_express')}
           >
             <IconWrapper fullWidth>
@@ -151,7 +151,7 @@ export const IntegrationListing = (props) => {
               <h5>{t('CONNECT_WITH_PICKER_EXPRESS', 'Connect with Picker Express')}</h5>
               <p>{t('CONNECT_PICKER_EXPRESS_DESCRIPTION', 'Picker express connect you with +200 hundred thousand driver from +10 delivery companies from your city.')}</p>
             </SettingItemContent>
-          </SettingItemContainer> */}
+          </SettingItemContainer>
           <SettingItemContainer
             onClick={() => handleOpenSetting('deliverect')}
           >

package/src/components/Settings/SettingsList/index.js

@@ -33,7 +33,7 @@ export const SettingsListUI = (props) => {
     saveConfig
   } = props
 
-  const settingsNotAllowed = ['guest_checkout_enabled', 'allowed_order_types_guest_checkout', 'platform_store_giftcard_enabled']
+  const settingsNotAllowed = ['guest_checkout_enabled', 'allowed_order_types_guest_checkout']
 
   const [, t] = useLanguage()
   const [alertState, setAlertState] = useState({ open: false, content: [] })

package/src/components/Shared/ConfirmAdmin/index.js

@@ -4,6 +4,7 @@ import parsePhoneNumber from 'libphonenumber-js'
 import OtpInput from 'react-otp-input'
 import {
   useLanguage,
+  useSession,
   CheckPassword as CheckPasswordController
 } from 'ordering-components-admin-external'
 import { Modal } from '../Modal'
@@ -40,15 +41,17 @@ const ConfirmAdminUI = (props) => {
     generateOtpCode,
 
     checkCodeState,
-    credentials,
     handleChangeInput,
     handleChangeCredentials
   } = props
 
   const [, t] = useLanguage()
+  const [{ user }] = useSession()
   const { handleSubmit, register, errors } = useForm()
   const [alertState, setAlertState] = useState({ open: false, content: [] })
   const [willVerifyOtpState, setWillVerifyOtpState] = useState(false)
+  const [userPhoneNumber, setUserPhoneNumber] = useState(null)
+  const [isValidPhoneNumber, setIsValidPhoneNumber] = useState('')
 
   const numOtpInputs = confirmTab === 'otp' ? 6 : 4
   const otpPlaceholder = [...Array(numOtpInputs)].fill(0).join('')
@@ -71,6 +74,7 @@ const ConfirmAdminUI = (props) => {
   }
 
   const handleChangePhoneNumber = (number, isValid) => {
+    setUserPhoneNumber(number)
     let phoneNumberParser = null
     let values = { country_phone_code: '', cellphone: '' }
 
@@ -98,12 +102,22 @@ const ConfirmAdminUI = (props) => {
   }
 
   const onSubmit = () => {
-    if (confirmTab === 'otp' && otpType === 'cellphone' && !credentials?.country_phone_code && !credentials?.cellphone) {
-      setAlertState({
-        open: true,
-        content: [t('PHONE_NUMBER_IS_NOT_VALID', 'Phone number is not valid')]
-      })
-      return
+    if (confirmTab === 'otp' && otpType === 'cellphone') {
+      const isPhoneNumberValid = userPhoneNumber ? isValidPhoneNumber : true
+      if (!userPhoneNumber) {
+        setAlertState({
+          open: true,
+          content: [t('VALIDATION_ERROR_MOBILE_PHONE_REQUIRED', 'The field Phone Number is required.')]
+        })
+        return
+      }
+      if (!isPhoneNumberValid && userPhoneNumber) {
+        setAlertState({
+          open: true,
+          content: [t('PHONE_NUMBER_IS_NOT_VALID', 'Phone number is not valid')]
+        })
+        return
+      }
     }
     if (confirmTab === 'password') {
       getCheckPassword()
@@ -159,6 +173,32 @@ const ConfirmAdminUI = (props) => {
     }
   }, [errors])
 
+  useEffect(() => {
+    const _credentials = {}
+    if (user) {
+      if (user?.cellphone) {
+        let phone = null
+        if (user?.cellphone && user?.country_phone_code) {
+          phone = `+${user?.country_phone_code} ${user?.cellphone}`
+          _credentials.country_phone_code = user.country_phone_code
+          _credentials.cellphone = user.cellphone
+        } else if (user?.country_phone_code) {
+          phone = `+${user?.country_phone_code} ${user?.cellphone}`
+          _credentials.country_phone_code = user.country_phone_code
+          _credentials.cellphone = user?.cellphone
+        } else {
+          phone = user?.cellphone
+          _credentials.cellphone = user?.cellphone
+        }
+        setUserPhoneNumber(phone)
+      }
+      if (user?.email) {
+        _credentials.email = user?.email
+      }
+      handleChangeCredentials(_credentials)
+    }
+  }, [user])
+
   return (
     <Modal
       open={open}
@@ -216,6 +256,7 @@ const ConfirmAdminUI = (props) => {
               type='email'
               name='email'
               placeholder={t('EMAIL', 'Email')}
+              defaultValue={user?.email}
               ref={register({
                 required: t(
                   'VALIDATION_ERROR_REQUIRED',
@@ -238,7 +279,11 @@ const ConfirmAdminUI = (props) => {
         {!willVerifyOtpState && confirmTab === 'otp' && otpType === 'cellphone' && (
           <FormController>
             <InputPhoneNumber
+              isUser
+              user={user}
+              value={userPhoneNumber}
               setValue={handleChangePhoneNumber}
+              handleIsValid={setIsValidPhoneNumber}
             />
           </FormController>
         )}

package/src/components/Shared/Schedule/index.js

@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react'
 import {
   useLanguage,
   useConfig,
+  useUtils,
   Schedule as ScheduleController
 } from 'ordering-components-admin-external'
 import {
@@ -22,7 +23,8 @@ import {
   IconWrapper,
   SelectWrapper,
   AddScheduleIconWrapper,
-  TrashIconWrapper
+  TrashIconWrapper,
+  DateWrapper
 } from './styles'
 
 const ScheduleUI = (props) => {
@@ -43,11 +45,13 @@ const ScheduleUI = (props) => {
     selectedCopyDays,
     cleanSelectedCopyDays,
     handleSelectCopyTimes,
-    handleApplyScheduleCopyTimes
+    handleApplyScheduleCopyTimes,
+    isShowDate
   } = props
 
   const [, t] = useLanguage()
   const [{ configs }] = useConfig()
+  const [{ parseDate }] = useUtils()
 
   const is12Hours = configs.format_time?.value === '12'
 
@@ -87,6 +91,12 @@ const ScheduleUI = (props) => {
     })
   }
 
+  const getNextDate = (x) => {
+    const now = new Date()
+    now.setDate(now.getDate() + (x + (7 - now.getDay())) % 7)
+    return now
+  }
+
   useEffect(() => {
     if (!isTimeChangeError) return
     setAlertState({
@@ -164,7 +174,12 @@ const ScheduleUI = (props) => {
                 checked={schedule?.enabled}
                 onChange={e => handleEnabledSchedule(daysOfWeekIndex, e.target.checked)}
               />
-              <h4>{daysOfWeek[daysOfWeekIndex]}</h4>
+              <DateWrapper>
+                <h4>{daysOfWeek[daysOfWeekIndex]}</h4>
+                {isShowDate && (
+                  <h4 className='date'>{parseDate(getNextDate(daysOfWeekIndex), { outputFormat: 'YYYY-MM-DD' })}</h4>
+                )}
+              </DateWrapper>
             </div>
             {schedule?.enabled ? (
               <div>

package/src/components/Shared/Schedule/styles.js

@@ -22,16 +22,16 @@ export const TimeScheduleItemContainer = styled.div`
     }
 
     &:first-child {
-      width: 95px;
+      min-width: 95px;
     }
 
     &:nth-child(2) {
       flex-direction: column;
       flex: 1;
       ${props => props.theme?.rtl ? css`
-        padding-right: 10px;
+        padding-right: 8px;
       ` : css`
-        padding-left: 10px;
+        padding-left: 8px;
       `}
       > div {
         display: flex;
@@ -72,7 +72,7 @@ export const TimeScheduleItemContainer = styled.div`
     > div {
       h4 {
         font-size: 14px;
-        padding: 0 16px;
+        padding: 0 12px;
       }
       &:nth-child(2) {
         p {
@@ -124,7 +124,7 @@ export const SelectWrapper = styled.div`
   }
 
   @media (min-width: 450px) {
-    width: 100px;
+    width: 95px;
     .select {
       > div {
         font-size: 16px;
@@ -135,6 +135,7 @@ export const SelectWrapper = styled.div`
 
 export const Option = styled.div`
   white-space: nowrap;
+  font-size: 15px;
 `
 
 export const SplitLine = styled.div`
@@ -186,3 +187,13 @@ export const AddScheduleIconWrapper = styled.div`
     width: 56px;
   }
 `
+export const DateWrapper = styled.div`
+  display: flex;
+  flex-direction: column;
+
+  h4 {
+    &.date {
+      font-weight: normal;
+    }
+  }
+`

package/src/components/SidebarMenu/index.js

@@ -843,7 +843,7 @@ const SidebarMenuUI = (props) => {
                     </MenuContainer>
                   </Accordion>
                 )}
-                {sessionState?.user?.level === 0 && (
+                {/* {sessionState?.user?.level === 0 && (
                   <Button
                     className='d-flex align-items-center'
                     variant={location.pathname === '/ordering-products' && 'primary'}
@@ -852,7 +852,7 @@ const SidebarMenuUI = (props) => {
                     <WindowDock />
                     <span>{t('ORDERING_PRODUCTS', 'Ordering products')}</span>
                   </Button>
-                )}
+                )} */}
                 {sessionState?.user?.level === 0 && (
                   <Button
                     className='d-flex align-items-center'

package/src/components/Support/index.js

@@ -45,7 +45,7 @@ export const Support = (props) => {
             <Button
               borderRadius='7.6px'
               color='primary'
-              onClick={() => handleGoToLink('https://www.ordering.co/ordering-sales')}
+              onClick={() => handleGoToLink('https://www.ordering.co/contact-ordering')}
               outline
             >
               {t('SALES_CONTACT', 'Sales Contact')}