ordering-ui-admin-external 1.43.20 → 1.43.22

package/src/components/Delivery/index.js

@@ -23,12 +23,14 @@ import { DriversGroupOrders } from './DriversGroupOrders'
 import { DriversGroupAutoassign } from './DriversGroupAutoassign'
 import { DriversMarkAsBusy } from './DriversMarkAsBusy'
 import { GoogleGpsButton } from './GoogleGpsButton'
+import { DriversTimeDisplay } from './DriversTimeDisplay'
 
 export {
   AddressList,
   AddressForm,
   DeliveryUsersListing,
   DriversCompaniesListing,
+  DriversTimeDisplay,
   DriversGroupsListing,
   WizardDelivery,
   DriverGroupSetting,

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

@@ -2,6 +2,10 @@ import React, { useEffect } from 'react'
 import { useLanguage, useUtils, useConfig, SettingsLogs as SettingsLogsController } from 'ordering-components-admin-external'
  import Skeleton from 'react-loading-skeleton'
  import { Modal, Pagination } from '../../Shared'
+ import { IconButton } from '../../../styles'
+ import { useInfoShare } from '../../../contexts/InfoShareContext'
+import { List as MenuIcon } from 'react-bootstrap-icons'
+
 
  import {
   DriversGroupLogsContainer,
@@ -30,6 +34,7 @@ const SettingsLogsUI = (props) => {
 
   const [, t] = useLanguage()
   const [{ parseDate }] = useUtils()
+  const [{ isCollapse }, { handleMenuCollapse }] = useInfoShare()
   const [open, setOpen] = React.useState(false)
   const [schedules, setSchedules] = React.useState({
     newSchedule: [],
@@ -108,6 +113,14 @@ const SettingsLogsUI = (props) => {
   return (
     <>
     <DriversGroupLogsContainer>
+      {isCollapse && (
+        <IconButton
+          color='black'
+          onClick={() => handleMenuCollapse(false)}
+        >
+          <MenuIcon />
+        </IconButton>
+      )}
       <HeaderContainer>
         <HeaderTitleContainer>
           <h1>{t('SETTINGS_LOGS', 'Settings Logs')}</h1>

package/src/components/SidebarMenu/index.js

@@ -359,6 +359,13 @@ const SidebarMenuUI = (props) => {
       pageName: 'drivers_groups',
       url: '/delivery/drivers-groups',
       enabled: sessionState?.user?.level === 5 || sessionState?.user?.level === 0
+    },
+    {
+      id: 5,
+      title: t('DRIVERS_TIME_DISPLAY', 'Drivers time display'),
+      pageName: 'drivers_time_display',
+      url: '/delivery/drivers-time-display',
+      enabled: sessionState?.user?.level === 5 || sessionState?.user?.level === 0
     }
   ]
 
@@ -703,7 +710,8 @@ const SidebarMenuUI = (props) => {
                           location.pathname === '/delivery/drivers-list' ||
                           location.pathname === '/delivery/drivers-managers' ||
                           location.pathname === '/delivery/drivers-companies' ||
-                          location.pathname === '/delivery/drivers-groups'
+                          location.pathname === '/delivery/drivers-groups' ||
+                          location.pathname === '/delivery/drivers-time-display'
                         }
                       >
                         <Truck />

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

@@ -52,6 +52,7 @@ export const BusinessDetailsUI = (props) => {
     actionStatus,
     handleUpdatePreorderConfigs,
     handleUpdateSpoonityKey,
+    handleSyncEvent,
     spoonityKeyState,
     siteState
   } = props
@@ -175,6 +176,7 @@ export const BusinessDetailsUI = (props) => {
           handleSucessUpdateBusiness={handleSucessUpdateBusiness}
           handleDuplicateBusiness={handleDuplicateBusiness}
           handleDeleteBusiness={handleDeleteBusiness}
+          handleSyncEvent={handleSyncEvent}
           extraOpen={extraOpen}
           spoonityConfig={spoonityConfig}
           siteState={siteState}

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

@@ -38,6 +38,7 @@ export const BusinessSummary = (props) => {
     handleSelectedItem,
     handleDuplicateBusiness,
     handleDeleteBusiness,
+    handleSyncEvent,
     extraOpen,
     spoonityConfig,
     siteState,
@@ -58,7 +59,8 @@ export const BusinessSummary = (props) => {
 
   const isEnabledWhiteLabelModule = configs?.white_label_module?.value
   const isAllowRegisteredBusiness = ((sessionState?.user?.level === 0) || (sessionState?.user?.level === 2 && configs?.allow_business_owner_register_business?.value === '1'))
-
+  const projectsForEnableSync = ['dominosordering']
+  const enableSyncFunctions = projectsForEnableSync.includes(ordering.project)
   const handleOpenCategory = () => {
     events.emit('go_to_page', { page: 'store', params: { store: businessState?.business?.slug } })
   }
@@ -218,13 +220,13 @@ export const BusinessSummary = (props) => {
                 >
                   {t('PREVIEW', 'Preview')}
                 </Dropdown.Item>
-                {isAllowRegisteredBusiness &&
-                <Dropdown.Item
-                  onClick={() => handleDuplicateBusiness()}
-                >
-                  {t('DUPLICATE', 'Duplicate')}
-                </Dropdown.Item>
-               }
+                {isAllowRegisteredBusiness && (
+                  <Dropdown.Item
+                    onClick={() => handleDuplicateBusiness()}
+                  >
+                    {t('DUPLICATE', 'Duplicate')}
+                  </Dropdown.Item>
+                )}
                 {!isEnabledWhiteLabelModule && (
                   <Dropdown.Item
                     onClick={() => handleSelectedItem('personalization')}
@@ -237,6 +239,25 @@ export const BusinessSummary = (props) => {
                 >
                   {t('CUSTOM_FIELDS', 'Custom fields')}
                 </Dropdown.Item>
+                {enableSyncFunctions && (
+                  <>
+                    <Dropdown.Item
+                      onClick={() => handleSyncEvent('business')}
+                    >
+                      {t('SYNC_BUSINESS', 'Sync Business')}
+                    </Dropdown.Item>
+                    <Dropdown.Item
+                      onClick={() => handleSyncEvent('menu')}
+                    >
+                      {t('SYNC_PRODUCTS', 'Sync Products')}
+                    </Dropdown.Item>
+                    <Dropdown.Item
+                      onClick={() => handleSyncEvent('coupons')}
+                    >
+                      {t('SYNC_COUPONS', 'Sync Coupons')}
+                    </Dropdown.Item>
+                  </>
+                )}
                 <Dropdown.Item
                   onClick={() => onClickDeleteBusiness()}
                 >

package/src/index.js

@@ -120,6 +120,7 @@ import {
   DeliveryUsersListing,
   DriversCompaniesListing,
   DriversGroupsListing,
+  DriversTimeDisplay,
   WizardDelivery,
   DriverGroupSetting,
   DriversCompaniesList,
@@ -540,6 +541,7 @@ export {
   DeliveryUsersListing,
   DriversCompaniesListing,
   DriversGroupsListing,
+  DriversTimeDisplay,
   WizardDelivery,
   DriverGroupSetting,
   DriversCompaniesList,

package/src/utils/index.js

@@ -622,3 +622,57 @@ export const disableReasons = () => {
   }
   return disableReasonDictionary
 }
+
+export const TwelveHours = [
+  '12:00 AM',
+  '01:00 AM',
+  '02:00 AM',
+  '03:00 AM',
+  '04:00 AM',
+  '05:00 AM',
+  '06:00 AM',
+  '07:00 AM',
+  '08:00 AM',
+  '09:00 AM',
+  '10:00 AM',
+  '11:00 AM',
+  '12:00 PM',
+  '01:00 PM',
+  '02:00 PM',
+  '03:00 PM',
+  '04:00 PM',
+  '05:00 PM',
+  '06:00 PM',
+  '07:00 PM',
+  '08:00 PM',
+  '09:00 PM',
+  '10:00 PM',
+  '11:00 PM'
+]
+
+export const TwentyFourHours = [
+  '00:00',
+  '01:00',
+  '02:00',
+  '03:00',
+  '04:00',
+  '05:00',
+  '06:00',
+  '07:00',
+  '08:00',
+  '09:00',
+  '10:00',
+  '11:00',
+  '12:00',
+  '13:00',
+  '14:00',
+  '15:00',
+  '16:00',
+  '17:00',
+  '18:00',
+  '19:00',
+  '20:00',
+  '21:00',
+  '22:00',
+  '23:00'
+]

package/template/app.js

@@ -88,6 +88,7 @@ import { BusinessDevicesList } from './pages/BusinessDevicesList'
 import { SettingsLogs } from './pages/SettingsLogs'
 import { Banners } from '../src/components/Banners'
 import { useProjectState } from '../src/contexts/ProjectContext'
+import { DriversTimeDisplay } from './pages/DriverTimeDisplay'
 
 export const App = () => {
   const history = useHistory()
@@ -374,7 +375,9 @@ export const App = () => {
                     <ProtectedRoute path='/delivery/drivers-groups' allowedLevels={[0, 5]}>
                       <DriversGroupsList />
                     </ProtectedRoute>
-
+                    <ProtectedRoute path='/delivery/drivers-time-display' allowedLevels={[0, 5]}>
+                      <DriversTimeDisplay />
+                    </ProtectedRoute>
                     <ProtectedRoute path='/marketing/promotions-enterprise' allowedLevels={[0]}>
                       <EnterprisePromotionList />
                     </ProtectedRoute>

package/template/components/ListenPageChanges/index.js

@@ -55,6 +55,7 @@ export const ListenPageChanges = ({ children }) => {
     drivers_managers: '/delivery/drivers-managers',
     drivers_companies: '/delivery/drivers-companies',
     drivers_groups: '/delivery/drivers-groups',
+    drivers_time_display: '/delivery/drivers-time-display',
     enterprise_promotions: '/marketing/promotions-enterprise',
     campaign: '/marketing/campaign',
     ad_banners: '/marketing/ad-banners',

package/template/helmetdata.json

@@ -237,6 +237,13 @@
     "robots": "index, follow",
     "canonicalUrl": ""
   },
+  "drivers_time_display": {
+    "title": "Driver time display",
+    "description": "a dummy description about this page",
+    "keywords": "test, dummy, data",
+    "robots": "index, follow",
+    "canonicalUrl": ""
+  },
   "ordering_products": {
     "title": "Ordering Products",
     "description": "a dummy description about this page",

package/template/pages/DriverTimeDisplay/index.js

@@ -0,0 +1,12 @@
+import React from 'react'
+import { HelmetTags } from '../../components/HelmetTags'
+import {DriversTimeDisplay as DriversTimeDisplayController} from '../../../src/components/Delivery/DriversTimeDisplay'
+
+export const DriversTimeDisplay = (props) => {
+  return (
+    <>
+      <HelmetTags page='drivers_time_display' />
+      <DriversTimeDisplayController {...props} />
+    </>
+  )
+}