ordering-ui-admin-external 1.43.64 → 1.43.66

package/template/pages/DriversList/index.js

@@ -11,7 +11,7 @@ export const DriversList = (props) => {
     isSearchByName: true,
     isSearchByCellphone: true,
     useBatchSockets: settings?.use_batch_sockets,
-    propsToFetch: ['id', 'name', 'lastname', 'location', 'enabled', 'available', 'busy', 'driver_groups', 'assigned_orders_count', 'last_order_assigned_at', 'last_location_at', 'cellphone', 'photo', 'qualification'],
+    propsToFetch: ['id', 'name', 'lastname', 'location', 'enabled', 'available', 'busy', 'driver_groups.name', 'driver_groups.id', 'assigned_orders_count', 'photo', 'last_location_at'],
     onDriverRedirect: (driverId) => {
       if (!driverId) {
         return events.emit('go_to_page', { page: 'drivers', replace: true })

package/template/pages/OrdersList/index.js

@@ -3,14 +3,20 @@ import { HelmetTags } from '../../components/HelmetTags'
 import { OrdersManager as OrdersManagerController } from '../../../src/components/Orders'
 import { addQueryToUrl, removeQueryToUrl } from '../../../src/utils'
 import settings from '../../config.json'
+import { useFilterValues } from '../../../src/contexts/FilterValuesContext'
 
 export const OrdersList = (props) => {
+  const [filterValues] = useFilterValues()
+
   const ordersListProps = {
     ...props,
     franchiseId: settings?.franchiseId,
     isUseQuery: true,
     disableSocketRoomDriver: true,
     useFranchiseImages: settings?.use_franchise_images,
+    defaultFilterValues: filterValues,
+    getDriversByControls: true,
+    disableDriverLocationsSockets: true,
     onOrderRedirect: (orderId) => {
       if (!orderId) {
         return removeQueryToUrl(['id', 'section', 'tab'])