ordering-ui-admin-external 1.29.3 → 1.30.0

package/src/components/Orders/CreateCustomOrder/SelectProducts/styles.js

@@ -3,59 +3,6 @@ import styled, { css } from 'styled-components'
 export const Container = styled.div`
   margin-top: 50px;
 `
-export const SearchProductsWrapper = styled.div`
-  position: relative;
-  margin-top: 11px;
-
-  > input {
-    width: 100%;
-    height: 44px;
-    ${props => props.theme?.rtl ? css`
-      padding-left: 40px;
-    ` : css`
-      padding-right: 40px;
-    `}
-  }
-
-  span.loading {
-    position: absolute;
-    top: 10px;
-    ${props => props.theme?.rtl ? css`
-      left: 10px;
-    ` : css`
-      right: 10px;
-    `}
-
-    @keyframes spinner-content {
-      0% { transform: rotate(0) }
-      100% { transform: rotate(360deg) }
-    }
-
-    svg {
-      animation: spinner-content 1.85s linear infinite;
-      color: ${props => props.theme.colors.headingColor};
-    }
-  }
-`
-
-export const OptionsToSelectContainer = styled.div`
-  z-index: 100;
-  position: absolute;
-  top: 50px;
-  left: 0;
-  width: 100%;
-  max-height: 300px;
-  overflow-x: hidden;
-  border-radius: 8px;
-  border: 1px solid ${props => props.theme.colors.borderColor};
-  background-color: ${props => props.theme.colors.backgroundPage};
-  padding: 9px 0;
-
-  > p {
-    font-size: 12px;
-    margin: 0 16px;
-  }
-`
 export const SelectOption = styled.div`
   cursor: pointer;
   width: 100%;
@@ -159,3 +106,57 @@ export const ProductEditDeleteActions = styled.div`
     }
   }
 `
+
+export const SelectWrapper = styled.div`
+  margin-top: 11px;
+
+  .select {
+    width: 100%;
+    background: ${props => props.theme.colors.secundary};
+    border: none;
+    font-size: 14px;
+
+    > div:first-child {
+      padding-top: 4px;
+      padding-bottom: 4px;
+    }
+    .list {
+      max-width: 100%;
+    }
+  }
+`
+export const Option = styled.div`
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  padding: 5px;
+  border-radius: 7.6px;
+  img {
+    min-height: 38px;
+    min-width: 38px;
+    height: 38px;
+    width: 38px;
+    border-radius: 8px;
+    object-fit: cover;
+    box-shadow: rgba(99, 99, 99, 0.2) 0px 2px 8px 0px;
+    ${props => props.theme?.rtl ? css`
+      margin-left: 8px;
+    ` : css`
+      margin-right: 8px;
+    `}
+  }
+  > span {
+    max-width: 200px;
+    font-size: 14px;
+    font-weight: 700;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+  }
+
+  @media (min-width: 768px) {
+    > span {
+      max-width: 560px;
+    }
+  }
+`

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

@@ -145,89 +145,43 @@ export const SettingsListUI = (props) => {
                 {
                   configs.length > 0 && configs.map((config, i) => (
                     !settingsNotAllowed.includes(config.key) && (
-                    <div key={i}>
-                      {
-                        config.type === 1 && (
-                          <FormGroupText className='form-group'>
-                            <label>{config?.name}</label>
-                            {config?.description && <Description>{config?.description}</Description>}
-                            <input
-                              type='text'
-                              value={config?.value}
-                              onChange={(e) => handleInputChange(e.target.value, config?.id)}
-                              onKeyPress={(e) => handleKeyPress(e, config?.key)}
-                              className='form-control'
-                              placeholder={config?.name}
-                            />
-                          </FormGroupText>
-                        )
-                      }
-                      {
-                        config.type === 2 && (
-                          config.key === 'country_autocomplete' ? (
-                            <SettingsCountryFilter
-                              defaultValue={config?.value}
-                              handleSelectChange={(value) => handleInputChange(value, config?.id)}
-                              label={config?.name}
-                              description={config?.description}
-                            />
-                          ) : (
-                            <SettingsSelectUI
-                              config={config}
-                              defaultValue={config?.value}
-                              handleSelectChange={(value) => handleInputChange(value, config?.id)}
-                            />
-                          )
-                        )
-                      }
-                      {
-                        config.type === 3 && (
-                          <CheckBoxWrapper>
-                            {config?.name && (
-                              <label>{config?.name}</label>
-                            )}
-                            {config?.description && (
-                              <p>{config?.description}</p>
-                            )}
-                            {
-                              config?.options?.length > 0 && config?.options?.map((item, j) => (
-                                <FormGroupWrapper key={j}>
-                                  <FormGroupCheck className='checkbox'>
-                                    <label>
-                                      <input
-                                        type='checkbox'
-                                        name={item?.value}
-                                        data-id={config?.id}
-                                        defaultChecked={config?.value.split('|').includes(item?.value)}
-                                        onChange={(e) => handleCheckBoxChange(e, true, config?.value)}
-                                      />
-                                      {t(item.text.toUpperCase(), item.text.replace(/_/g, ' ').toLowerCase())}
-                                    </label>
-                                  </FormGroupCheck>
-                                </FormGroupWrapper>
-                              ))
-                            }
-                            {
-                              !config?.options && <OptionsError>{t('NO_OPTIONS_VALUE', 'There is no options value')}</OptionsError>
-                            }
-                          </CheckBoxWrapper>
-                        )
-                      }
-                      {
-                        config.type === 4 && (
-                          config.key === 'driver_tip_options' ? (
+                      <div key={i}>
+                        {
+                          config.type === 1 && (
                             <FormGroupText className='form-group'>
                               <label>{config?.name}</label>
                               {config?.description && <Description>{config?.description}</Description>}
                               <input
                                 type='text'
-                                defaultValue={formatArray(config?.value)}
+                                value={config?.value}
                                 onChange={(e) => handleInputChange(e.target.value, config?.id)}
+                                onKeyPress={(e) => handleKeyPress(e, config?.key)}
                                 className='form-control'
-                                placeholder='placeholder'
+                                placeholder={config?.name}
                               />
                             </FormGroupText>
-                          ) : (
+                          )
+                        }
+                        {
+                          config.type === 2 && (
+                            config.key === 'country_autocomplete' ? (
+                              <SettingsCountryFilter
+                                defaultValue={config?.value}
+                                handleSelectChange={(value) => handleInputChange(value, config?.id)}
+                                label={config?.name}
+                                description={config?.description}
+                              />
+                            ) : (
+                              <SettingsSelectUI
+                                config={config}
+                                defaultValue={config?.value}
+                                handleSelectChange={(value) => handleInputChange(value, config?.id)}
+                              />
+                            )
+                          )
+                        }
+                        {
+                          config.type === 3 && (
                             <CheckBoxWrapper>
                               {config?.name && (
                                 <label>{config?.name}</label>
@@ -244,28 +198,74 @@ export const SettingsListUI = (props) => {
                                           type='checkbox'
                                           name={item?.value}
                                           data-id={config?.id}
-                                          defaultChecked={JSON.parse(config?.value).includes(parseInt(item?.value))}
-                                          onChange={(e) => handleCheckBoxChange(e, false, config?.value)}
+                                          defaultChecked={config?.value.split('|').includes(item?.value)}
+                                          onChange={(e) => handleCheckBoxChange(e, true, config?.value)}
                                         />
-                                        {item.text}
+                                        {t(item.text.toUpperCase(), item.text.replace(/_/g, ' ').toLowerCase())}
                                       </label>
                                     </FormGroupCheck>
                                   </FormGroupWrapper>
                                 ))
                               }
-                              {!config?.options && <OptionsError>{t('NO_OPTIONS_VALUE', 'There is no options value')}</OptionsError>}
+                              {
+                                !config?.options && <OptionsError>{t('NO_OPTIONS_VALUE', 'There is no options value')}</OptionsError>
+                              }
                             </CheckBoxWrapper>
                           )
-                        )
-                      }
-                      {
-                        config.type === 5 && (
-                          <SettingsImage
-                            config={config}
-                            saveConfig={saveConfig}
-                          />
-                        )
-                      }
+                        }
+                        {
+                          config.type === 4 && (
+                            config.key === 'driver_tip_options' ? (
+                              <FormGroupText className='form-group'>
+                                <label>{config?.name}</label>
+                                {config?.description && <Description>{config?.description}</Description>}
+                                <input
+                                  type='text'
+                                  defaultValue={formatArray(config?.value)}
+                                  onChange={(e) => handleInputChange(e.target.value, config?.id)}
+                                  className='form-control'
+                                  placeholder='placeholder'
+                                />
+                              </FormGroupText>
+                            ) : (
+                              <CheckBoxWrapper>
+                                {config?.name && (
+                                  <label>{config?.name}</label>
+                                )}
+                                {config?.description && (
+                                  <p>{config?.description}</p>
+                                )}
+                                {
+                                  config?.options?.length > 0 && config?.options?.map((item, j) => (
+                                    <FormGroupWrapper key={j}>
+                                      <FormGroupCheck className='checkbox'>
+                                        <label>
+                                          <input
+                                            type='checkbox'
+                                            name={item?.value}
+                                            data-id={config?.id}
+                                            defaultChecked={JSON.parse(config?.value).includes(parseInt(item?.value))}
+                                            onChange={(e) => handleCheckBoxChange(e, false, config?.value)}
+                                          />
+                                          {item.text}
+                                        </label>
+                                      </FormGroupCheck>
+                                    </FormGroupWrapper>
+                                  ))
+                                }
+                                {!config?.options && <OptionsError>{t('NO_OPTIONS_VALUE', 'There is no options value')}</OptionsError>}
+                              </CheckBoxWrapper>
+                            )
+                          )
+                        }
+                        {
+                          config.type === 5 && (
+                            <SettingsImage
+                              config={config}
+                              saveConfig={saveConfig}
+                            />
+                          )
+                        }
                         {/* {config.type === 6 && (
                         <>
                           <FormGroupText className='form-group'>
@@ -289,7 +289,7 @@ export const SettingsListUI = (props) => {
                           </FormGroupText>
                         </>
                         )} */}
-                    </div>
+                      </div>
                     )
                   ))
                 }

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

@@ -53,7 +53,7 @@ const ScheduleUI = (props) => {
   const [{ configs }] = useConfig()
   const [{ parseDate }] = useUtils()
 
-  const is12Hours = configs.format_time?.value === '12'
+  const is12Hours = configs?.general_hour_format?.value?.includes('hh:mm')
 
   const [alertState, setAlertState] = useState({ open: false, content: [] })
   const [confirm, setConfirm] = useState({ open: false, content: null, handleOnAccept: null })

package/src/components/SidebarMenu/index.js

@@ -22,7 +22,7 @@ import {
   X as CloseIcon
 } from 'react-bootstrap-icons'
 import { useTheme } from 'styled-components'
-import { SidebarMenu as SidebarMenuController, useEvent, useLanguage, useSession, useConfig, useApi } from 'ordering-components-admin-external'
+import { SidebarMenu as SidebarMenuController, useEvent, useLanguage, useSession, useConfig, useApi, useSite } from 'ordering-components-admin-external'
 import { useWindowSize } from '../../hooks/useWindowSize'
 import { Accordion, Image, Button, AccordionContext, useAccordionToggle } from 'react-bootstrap'
 import { LanguageSelector } from '../LanguageSelector'
@@ -53,6 +53,7 @@ const SidebarMenuUI = (props) => {
   const [events] = useEvent()
   const [, t] = useLanguage()
   const [sessionState] = useSession()
+  const [{ site }] = useSite()
   const [{ configs }] = useConfig()
   const [ordering] = useApi()
   const [{ isCollapse }, { handleMenuCollapse }] = useInfoShare()
@@ -388,7 +389,12 @@ const SidebarMenuUI = (props) => {
   }
 
   const handleOpenSite = () => {
-    handleGoToLink(configs?.site_url?.value || `https://${ordering.project}.tryordering.com`)
+    const siteUrl = site?.domain && site?.ssl_process_status === 'ended'
+      ? `https://${site?.domain}`
+      : configs?.site_url?.value
+        ? configs?.site_url?.value
+        : `https://${ordering.project}.tryordering.com`
+    handleGoToLink(siteUrl)
   }
 
   useEffect(() => {

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

@@ -222,9 +222,11 @@ const BusinessProductsListingUI = (props) => {
   }
 
   const handleOpenSite = () => {
-    const storeUrl = configs?.site_url?.value
-      ? `${checkSiteUrl(configs?.site_url?.value)}store/${businessState?.business?.slug}`
-      : `https://${ordering.project}.tryordering.com/store/${businessState?.business?.slug}`
+    const storeUrl = siteState?.site?.domain && siteState?.site?.ssl_process_status === 'ended'
+      ? `https://${siteState?.site?.domain}/store/${businessState?.business?.slug}`
+      : configs?.site_url?.value
+        ? `${checkSiteUrl(configs?.site_url?.value)}store/${businessState?.business?.slug}`
+        : `https://${ordering.project}.tryordering.com/store/${businessState?.business?.slug}`
     window.open(storeUrl, '_blank')
   }
 

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

@@ -60,9 +60,11 @@ export const BusinessQRCodeOption = (props) => {
       })
       return
     }
-    const storeUrl = configs?.site_url?.value
-      ? `${checkSiteUrl(configs?.site_url?.value)}store/${business?.slug}`
-      : `https://${ordering.project}.tryordering.com/store/${business?.slug}`
+    const storeUrl = siteState?.site?.domain && siteState?.site?.ssl_process_status === 'ended'
+      ? `https://${siteState?.site?.domain}/store/${business?.slug}`
+      : 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'
         ? `&table_number=${numberRef?.current?.value}`

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

@@ -60,9 +60,11 @@ export const BusinessSummary = (props) => {
   }
 
   const handleOpenSite = () => {
-    const storeUrl = configs?.site_url?.value
-      ? `${checkSiteUrl(configs?.site_url?.value)}store/${businessState?.business?.slug}`
-      : `https://${ordering.project}.tryordering.com/store/${businessState?.business?.slug}`
+    const storeUrl = siteState?.site?.domain && siteState?.site?.ssl_process_status === 'ended'
+      ? `https://${siteState?.site?.domain}/store/${businessState?.business?.slug}`
+      : configs?.site_url?.value
+        ? `${checkSiteUrl(configs?.site_url?.value)}store/${businessState?.business?.slug}`
+        : `https://${ordering.project}.tryordering.com/store/${businessState?.business?.slug}`
     window.open(storeUrl, '_blank')
   }