ordering-ui-admin-external 1.27.1 → 1.28.1

package/src/components/BusinessIntelligence/DriverAnalytics/index.js

@@ -246,18 +246,11 @@ const DriverAnalyticsUI = (props) => {
           onClose={() => setIsBrandFilter(false)}
         />
       </Modal>
-      <Modal
-        width='450px'
-        height='650px'
-        padding='25px'
-        open={openCountryFilter}
-        onClose={() => setOpenCountryFilter(false)}
-      >
-        <CountryFilter
-          {...props}
-          onClose={() => setOpenCountryFilter(false)}
-        />
-      </Modal>
+      <CountryFilter
+        {...props}
+        openCountryFilter={openCountryFilter}
+        setOpenCountryFilter={setOpenCountryFilter}
+      />
     </BusinessAnalyticsContainer>
   )
 }

package/src/components/BusinessIntelligence/ReportsBusinessDistance/index.js

@@ -276,18 +276,11 @@ const ReportsBusinessDistanceUI = (props) => {
           {...props} onClose={() => setIsBrandFilter(false)}
         />
       </Modal>
-      <Modal
-        width='450px'
-        height='650px'
-        padding='25px'
-        open={openCountryFilter}
-        onClose={() => setOpenCountryFilter(false)}
-      >
-        <CountryFilter
-          {...props}
-          onClose={() => setOpenCountryFilter(false)}
-        />
-      </Modal>
+      <CountryFilter
+        {...props}
+        openCountryFilter={openCountryFilter}
+        setOpenCountryFilter={setOpenCountryFilter}
+      />
     </ReportsDistanceContainer>
   )
 }

package/src/components/BusinessIntelligence/ReportsBusinessSpend/index.js

@@ -222,18 +222,11 @@ const ReportsBusinessSpendUI = (props) => {
           {...props} onClose={() => setIsBrandFilter(false)}
         />
       </Modal>
-      <Modal
-        width='450px'
-        height='650px'
-        padding='25px'
-        open={openCountryFilter}
-        onClose={() => setOpenCountryFilter(false)}
-      >
-        <CountryFilter
-          {...props}
-          onClose={() => setOpenCountryFilter(false)}
-        />
-      </Modal>
+      <CountryFilter
+        {...props}
+        openCountryFilter={openCountryFilter}
+        setOpenCountryFilter={setOpenCountryFilter}
+      />
     </ReportsBusinessSpendContainer>
   )
 }

package/src/components/BusinessIntelligence/ReportsDriverDistance/index.js

@@ -242,18 +242,11 @@ const ReportsDriverDistanceUI = (props) => {
             setAvailableDriverIds={setAvailableDriverIds}
           />
         </Modal>
-        <Modal
-          width='450px'
-          height='650px'
-          padding='25px'
-          open={openCountryFilter}
-          onClose={() => setOpenCountryFilter(false)}
-        >
-          <CountryFilter
-            {...props}
-            onClose={() => setOpenCountryFilter(false)}
-          />
-        </Modal>
+        <CountryFilter
+          {...props}
+          openCountryFilter={openCountryFilter}
+          setOpenCountryFilter={setOpenCountryFilter}
+        />
       </DriverDistanceContainer>
       <Alert
         title={t('DRIVER_SCHEDULE', 'Driver schedule')}

package/src/components/BusinessIntelligence/ReportsDriverOrder/index.js

@@ -205,18 +205,11 @@ const ReportsDriverOrderUI = (props) => {
           onClose={() => setIsBrandFilter(false)}
         />
       </Modal>
-      <Modal
-        width='450px'
-        height='650px'
-        padding='25px'
-        open={openCountryFilter}
-        onClose={() => setOpenCountryFilter(false)}
-      >
-        <CountryFilter
-          {...props}
-          onClose={() => setOpenCountryFilter(false)}
-        />
-      </Modal>
+      <CountryFilter
+        {...props}
+        openCountryFilter={openCountryFilter}
+        setOpenCountryFilter={setOpenCountryFilter}
+      />
     </ReportsBusinessSpendContainer>
   )
 }

package/src/components/BusinessIntelligence/ReportsDriverOrderTime/index.js

@@ -229,18 +229,11 @@ const ReportsDriverOrderTimeUI = (props) => {
           onClose={() => setIsOrderTypeFilter(false)}
         />
       </Modal> */}
-      <Modal
-        width='450px'
-        height='650px'
-        padding='25px'
-        open={openCountryFilter}
-        onClose={() => setOpenCountryFilter(false)}
-      >
-        <CountryFilter
-          {...props}
-          onClose={() => setOpenCountryFilter(false)}
-        />
-      </Modal>
+      <CountryFilter
+        {...props}
+        openCountryFilter={openCountryFilter}
+        setOpenCountryFilter={setOpenCountryFilter}
+      />
     </ReportsBusinessSpendContainer>
   )
 }

package/src/components/BusinessIntelligence/ReportsDriverSpend/index.js

@@ -217,18 +217,11 @@ const ReportsDriverSpendUI = (props) => {
           {...props} onClose={() => setIsBrandFilter(false)}
         />
       </Modal>
-      <Modal
-        width='450px'
-        height='650px'
-        padding='25px'
-        open={openCountryFilter}
-        onClose={() => setOpenCountryFilter(false)}
-      >
-        <CountryFilter
-          {...props}
-          onClose={() => setOpenCountryFilter(false)}
-        />
-      </Modal>
+      <CountryFilter
+        {...props}
+        openCountryFilter={openCountryFilter}
+        setOpenCountryFilter={setOpenCountryFilter}
+      />
     </ReportsBusinessSpendContainer>
   )
 }

package/src/components/BusinessIntelligence/ReportsGeneralSales/index.js

@@ -241,18 +241,11 @@ const ReportsGeneralSalesUI = (props) => {
           isFranchise
         />
       </Modal>
-      <Modal
-        width='450px'
-        height='650px'
-        padding='25px'
-        open={openCountryFilter}
-        onClose={() => setOpenCountryFilter(false)}
-      >
-        <CountryFilter
-          {...props}
-          onClose={() => setOpenCountryFilter(false)}
-        />
-      </Modal>
+      <CountryFilter
+        {...props}
+        openCountryFilter={openCountryFilter}
+        setOpenCountryFilter={setOpenCountryFilter}
+      />
     </ReportsBusinessSpendContainer>
   )
 }

package/src/components/BusinessIntelligence/ReportsHeatMap/index.js

@@ -217,18 +217,11 @@ const ReportsHeatMapUI = (props) => {
             {...props} onClose={() => setIsBrandFilter(false)}
           />
         </Modal>
-        <Modal
-          width='450px'
-          height='650px'
-          padding='25px'
-          open={openCountryFilter}
-          onClose={() => setOpenCountryFilter(false)}
-        >
-          <CountryFilter
-            {...props}
-            onClose={() => setOpenCountryFilter(false)}
-          />
-        </Modal>
+        <CountryFilter
+          {...props}
+          openCountryFilter={openCountryFilter}
+          setOpenCountryFilter={setOpenCountryFilter}
+        />
       </HeatMapContainer>
       <Alert
         title={t('HEAT_MAP', 'Heat map')}

package/src/components/BusinessIntelligence/ReportsOrderDistance/index.js

@@ -253,18 +253,11 @@ const ReportsOrderDistanceUI = (props) => {
           {...props} onClose={() => setIsBrandFilter(false)}
         />
       </Modal>
-      <Modal
-        width='450px'
-        height='650px'
-        padding='25px'
-        open={openCountryFilter}
-        onClose={() => setOpenCountryFilter(false)}
-      >
-        <CountryFilter
-          {...props}
-          onClose={() => setOpenCountryFilter(false)}
-        />
-      </Modal>
+      <CountryFilter
+        {...props}
+        openCountryFilter={openCountryFilter}
+        setOpenCountryFilter={setOpenCountryFilter}
+      />
     </ReportsDistanceContainer>
   )
 }

package/src/components/BusinessIntelligence/ReportsOrderStatus/index.js

@@ -295,18 +295,11 @@ const ReportsOrderStatusUI = (props) => {
             onClose={() => setIsOrderTypeFilter(false)}
           />
         </Modal>
-        <Modal
-          width='450px'
-          height='650px'
-          padding='25px'
-          open={openCountryFilter}
-          onClose={() => setOpenCountryFilter(false)}
-        >
-          <CountryFilter
-            {...props}
-            onClose={() => setOpenCountryFilter(false)}
-          />
-        </Modal>
+        <CountryFilter
+          {...props}
+          openCountryFilter={openCountryFilter}
+          setOpenCountryFilter={setOpenCountryFilter}
+        />
       </OrderStatusContainer>
       <Alert
         title={t('DRIVER_SCHEDULE', 'Driver schedule')}

package/src/components/BusinessIntelligence/ReportsOrders/index.js

@@ -213,18 +213,11 @@ const ReportsOrdersUI = (props) => {
           {...props} onClose={() => setIsBrandFilter(false)}
         />
       </Modal>
-      <Modal
-        width='450px'
-        height='650px'
-        padding='25px'
-        open={openCountryFilter}
-        onClose={() => setOpenCountryFilter(false)}
-      >
-        <CountryFilter
-          {...props}
-          onClose={() => setOpenCountryFilter(false)}
-        />
-      </Modal>
+      <CountryFilter
+        {...props}
+        openCountryFilter={openCountryFilter}
+        setOpenCountryFilter={setOpenCountryFilter}
+      />
     </ReportsOrdersContainer>
   )
 }

package/src/components/BusinessIntelligence/ReportsSaleAndCategory/index.js

@@ -248,18 +248,11 @@ const ReportsSaleAndCategoryUI = (props) => {
           {...props} onClose={() => setIsBrandFilter(false)}
         />
       </Modal>
-      <Modal
-        width='450px'
-        height='650px'
-        padding='25px'
-        open={openCountryFilter}
-        onClose={() => setOpenCountryFilter(false)}
-      >
-        <CountryFilter
-          {...props}
-          onClose={() => setOpenCountryFilter(false)}
-        />
-      </Modal>
+      <CountryFilter
+        {...props}
+        openCountryFilter={openCountryFilter}
+        setOpenCountryFilter={setOpenCountryFilter}
+      />
     </ReportsContainer>
   )
 }

package/src/components/BusinessIntelligence/ReportsSales/index.js

@@ -215,18 +215,11 @@ const ReportsSalesUI = (props) => {
           {...props} onClose={() => setIsBrandFilter(false)}
         />
       </Modal>
-      <Modal
-        width='450px'
-        height='650px'
-        padding='25px'
-        open={openCountryFilter}
-        onClose={() => setOpenCountryFilter(false)}
-      >
-        <CountryFilter
-          {...props}
-          onClose={() => setOpenCountryFilter(false)}
-        />
-      </Modal>
+      <CountryFilter
+        {...props}
+        openCountryFilter={openCountryFilter}
+        setOpenCountryFilter={setOpenCountryFilter}
+      />
     </ReportsOrdersContainer>
   )
 }

package/src/components/Delivery/DriversGroupAddForm/GeneralForm/index.js

@@ -14,7 +14,8 @@ export const GeneralForm = (props) => {
   const {
     driversManagers,
     changesState,
-    handleChangesState
+    handleChangesState,
+    handleChangeType
   } = props
 
   const [, t] = useLanguage()
@@ -79,7 +80,7 @@ export const GeneralForm = (props) => {
           placeholder={t('SELECT_TYPE', 'Select type')}
           options={typeOptions}
           defaultValue={changesState?.type}
-          onChange={val => handleChangesState({ type: val })}
+          onChange={val => handleChangeType(val)}
         />
       </InputWrapper>
 

package/src/components/Delivery/DriversGroupDetails/index.js

@@ -50,7 +50,6 @@ const DriversGroupDetailsUI = (props) => {
   const autoAssignType = configState?.configs?.autoassign_type?.value
 
   const [showMenu, setShowMenu] = useState('general')
-  const [useAdvanced, setUseAdvanced] = useState(false)
   const [driversGroupMenus, setDriversGroupMenus] = useState([])
   const [confirm, setConfirm] = useState({ open: false, content: null, handleOnAccept: null })
   const [alertState, setAlertState] = useState({ open: false, content: [] })
@@ -63,7 +62,7 @@ const DriversGroupDetailsUI = (props) => {
         { key: 'general', value: t('GENERAL', 'General') },
         { key: 'businesses', value: t('BUSINESSES', 'Businesses') }
       ]
-      : (useAdvanced && autoAssignType !== 'basic')
+      : (autoAssignType !== 'basic')
         ? [
           { key: 'general', value: t('GENERAL', 'General') },
           { key: 'businesses', value: t('BUSINESSES', 'Businesses') },
@@ -80,7 +79,7 @@ const DriversGroupDetailsUI = (props) => {
           { key: 'logs', value: t('LOGS', 'Logs') }
         ]
     setDriversGroupMenus(_driversGroupMenus)
-  }, [useAdvanced, driversGroupState?.driversGroup])
+  }, [driversGroupState?.driversGroup])
 
   const onDeleteGroup = () => {
     setConfirm({
@@ -110,10 +109,6 @@ const DriversGroupDetailsUI = (props) => {
     setIsExpand(prev => !prev)
   }
 
-  useEffect(() => {
-    setUseAdvanced(!(driversGroupState.driversGroup?.autoassign_amount_drivers === 0 && driversGroupState.driversGroup?.orders_group_max_orders === 0))
-  }, [driversGroupState.driversGroup])
-
   useEffect(() => {
     handleParentSidebarMove(0)
     setIsOpenDetails(false)
@@ -222,8 +217,6 @@ const DriversGroupDetailsUI = (props) => {
           <DriversGroupGeneralForm
             {...props}
             curDriversGroup={driversGroupState.driversGroup}
-            useAdvanced={useAdvanced}
-            setUseAdvanced={setUseAdvanced}
             handleNextClick={handleNextClick}
           />
         )}

package/src/components/Delivery/DriversGroupGeneralForm/index.js

@@ -1,15 +1,14 @@
 import React, { useState, useEffect } from 'react'
-import { useLanguage, useConfig, useSession } from 'ordering-components-admin-external'
+import { useLanguage, useSession } from 'ordering-components-admin-external'
 import { useForm } from 'react-hook-form'
-import { Input, Checkbox, Button, SecondSelect as DefaultSelect } from '../../../styles'
+import { Input, Button, SecondSelect as DefaultSelect } from '../../../styles'
 import { Alert } from '../../Shared'
 import { DriversGroupDrivers } from '../DriversGroupDrivers'
 import { DriversGroupCompanies } from '../DriversGroupCompanies'
 
 import {
   Container,
-  InputWrapper,
-  CheckboxContainer
+  InputWrapper
 } from './styles'
 
 export const DriversGroupGeneralForm = (props) => {
@@ -18,8 +17,6 @@ export const DriversGroupGeneralForm = (props) => {
     driversManagers,
     changesState,
     handleChangesState,
-    useAdvanced,
-    setUseAdvanced,
     handleUpdateDriversGroup,
     handleAddDriversGroup,
     actionDisabled,
@@ -30,11 +27,8 @@ export const DriversGroupGeneralForm = (props) => {
   const [, t] = useLanguage()
   const { handleSubmit, register, errors } = useForm()
   const [alertState, setAlertState] = useState({ open: false, content: [] })
-  const [configState] = useConfig()
   const [{ user }] = useSession()
 
-  const autoAssignType = configState?.configs?.autoassign_type?.value
-
   const typeOptions = [
     { value: 0, content: t('IN_HOUSE_DRIVERS', 'In house drivers') },
     { value: 1, content: t('DRIVER_COMPANIES', 'Driver companies') }
@@ -54,17 +48,6 @@ export const DriversGroupGeneralForm = (props) => {
     { value: 2, content: t('URGENT', 'Urgent') }
   ]
 
-  const handleLogistic = (checked) => {
-    setUseAdvanced(checked)
-    if (checked) return
-    const changes = {
-      autoassign_amount_drivers: 0,
-      orders_group_max_orders: 0
-    }
-    if (!driversGroupState.driversGroup) return
-    handleUpdateDriversGroup(changes)
-  }
-
   const onSubmit = () => {
     if (driversGroupState.driversGroup) {
       if (changesState?.drivers === '[]') {
@@ -184,15 +167,6 @@ export const DriversGroupGeneralForm = (props) => {
           onChange={val => handleChangesState({ priority: val })}
         />
       </InputWrapper>
-      {driversGroupState.driversGroup && autoAssignType !== 'basic' && (
-        <CheckboxContainer>
-          <Checkbox
-            checked={useAdvanced}
-            onChange={e => handleLogistic(e.target.checked)}
-          />
-          <p>{t('USE_ADVANCED_LOGISTIC', 'Use advanced logistic')}</p>
-        </CheckboxContainer>
-      )}
       <Button
         borderRadius='8px'
         color='primary'

package/src/components/Delivery/DriversGroupGeneralForm/styles.js

@@ -42,18 +42,3 @@ export const InputWrapper = styled.div`
     }
   }
 `
-
-export const CheckboxContainer = styled.div`
-  display: flex;
-  align-items: center;
-
-  p {
-    font-size: 14px;
-    margin: 0px;
-    ${props => props.theme?.rtl ? css`
-      padding-right: 10px;
-    ` : css`
-      padding-left: 10px;
-    `}
-  }
-`

package/src/components/Delivery/DriversGroupsList/index.js

@@ -96,7 +96,7 @@ export const DriversGroupsList = (props) => {
     <>
       <DriversGroupsContainer>
         <TableWrapper>
-          <GroupsTable data-tour='tour_delivery_completed'>
+          <GroupsTable data-tour='tour_delivery_completed' disabled={isFromStore}>
             <thead>
               <tr>
                 <th>
@@ -105,11 +105,15 @@ export const DriversGroupsList = (props) => {
                       onClick={() => handleAllSelectGroup()}
                       isChecked={!driversGroupsState.loading && (selectedGroupList.length === driversGroupsState.groups.length)}
                     >
-                      {
-                        !driversGroupsState.loading && (selectedGroupList.length === driversGroupsState.groups.length)
-                          ? <MdCheckBox />
-                          : <MdCheckBoxOutlineBlank />
-                      }
+                      {!isFromStore && (
+                        <>
+                          {
+                            !driversGroupsState.loading && (selectedGroupList.length === driversGroupsState.groups.length)
+                              ? <MdCheckBox />
+                              : <MdCheckBoxOutlineBlank />
+                          }
+                        </>
+                      )}
                     </CheckBoxWrapper>
                     <span>{t('ID', 'ID')}</span>
                   </GroupIdWrapper>
@@ -129,11 +133,13 @@ export const DriversGroupsList = (props) => {
                     {t('TYPE', 'Type')}
                   </DriverGroupTypeContainer>
                 </th>
-                <th>
-                  <ActionsContainer>
-                    {t('ACTIONS', 'Actions')}
-                  </ActionsContainer>
-                </th>
+                {!isFromStore && (
+                  <th>
+                    <ActionsContainer>
+                      {t('ACTIONS', 'Actions')}
+                    </ActionsContainer>
+                  </th>
+                )}
               </tr>
             </thead>
             {driversGroupsState.loading ? (
@@ -142,7 +148,7 @@ export const DriversGroupsList = (props) => {
                   <tr>
                     <td>
                       <GroupIdWrapper>
-                        <Skeleton width={18} height={18} />
+                        {!isFromStore && <Skeleton width={18} height={18} />}
                         <Skeleton width={40} style={{ margin: '0px 5px' }} />
                       </GroupIdWrapper>
                     </td>
@@ -167,13 +173,15 @@ export const DriversGroupsList = (props) => {
                         <Skeleton width={70} />
                       </DriverGroupTypeContainer>
                     </td>
-                    <td>
-                      <ActionsContainer>
-                        <EnableWrapper>
-                          <Skeleton width={50} />
-                        </EnableWrapper>
-                      </ActionsContainer>
-                    </td>
+                    {!isFromStore && (
+                      <td>
+                        <ActionsContainer>
+                          <EnableWrapper>
+                            <Skeleton width={50} />
+                          </EnableWrapper>
+                        </ActionsContainer>
+                      </td>
+                    )}
                   </tr>
                 </tbody>
               ))
@@ -187,17 +195,19 @@ export const DriversGroupsList = (props) => {
                   <tr>
                     <td>
                       <GroupIdWrapper>
-                        <CheckBoxWrapper
-                          className='group-checkbox'
-                          onClick={() => handleSelectGroup(group.id)}
-                          isChecked={selectedGroupList.includes(group.id)}
-                        >
-                          {
-                            selectedGroupList.includes(group.id)
-                              ? <MdCheckBox />
-                              : <MdCheckBoxOutlineBlank />
-                          }
-                        </CheckBoxWrapper>
+                        {!isFromStore && (
+                          <CheckBoxWrapper
+                            className='group-checkbox'
+                            onClick={() => handleSelectGroup(group.id)}
+                            isChecked={selectedGroupList.includes(group.id)}
+                          >
+                            {
+                              selectedGroupList.includes(group.id)
+                                ? <MdCheckBox />
+                                : <MdCheckBoxOutlineBlank />
+                            }
+                          </CheckBoxWrapper>
+                        )}
                         <span>{group?.id}</span>
                       </GroupIdWrapper>
                     </td>
@@ -230,18 +240,20 @@ export const DriversGroupsList = (props) => {
                         {getTypeTag(group?.type)}
                       </DriverGroupTypeContainer>
                     </td>
-                    <td>
-                      <ActionsContainer>
-                        <EnableWrapper className='group-enabled'>
-                          <span>{t('ENABLE', 'Enable')}</span>
-                          <Switch
-                            disabled={actionDisabled}
-                            defaultChecked={group?.enabled}
-                            onChange={enabled => handleUpdateDriversGroup?.(group.id, { enabled: enabled })}
-                          />
-                        </EnableWrapper>
-                      </ActionsContainer>
-                    </td>
+                    {!isFromStore && (
+                      <td>
+                        <ActionsContainer>
+                          <EnableWrapper className='group-enabled'>
+                            <span>{t('ENABLE', 'Enable')}</span>
+                            <Switch
+                              disabled={actionDisabled}
+                              defaultChecked={group?.enabled}
+                              onChange={enabled => handleUpdateDriversGroup?.(group.id, { enabled: enabled })}
+                            />
+                          </EnableWrapper>
+                        </ActionsContainer>
+                      </td>
+                    )}
                   </tr>
                 </tbody>
               ))