ordering-ui-admin-external 1.38.4 → 1.38.6

package/_modules/components/Home/HomePage/index.js

@@ -260,12 +260,7 @@ var HomeUI = function HomeUI(props) {
       }));
     }));
   };
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles.HomeContainer, null, width > 997 && !isEnabledWhiteLabelModule && /*#__PURE__*/_react.default.createElement(_styles.OrderingButtonWrapper, null, /*#__PURE__*/_react.default.createElement("span", null, t('WHAT_DO_YOU_WANT_SEE_ORDERING', 'What do you want to see in ordering?')), /*#__PURE__*/_react.default.createElement(_Buttons.Button, {
-    color: "primary",
-    onClick: function onClick() {
-      return setShowForm(true);
-    }
-  }, t('CLICK_HERE', 'Click here'))), /*#__PURE__*/_react.default.createElement(_styles.Breadcrumb, null, isCollapse && /*#__PURE__*/_react.default.createElement(_Buttons.IconButton, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles.HomeContainer, null, /*#__PURE__*/_react.default.createElement(_styles.Breadcrumb, null, isCollapse && /*#__PURE__*/_react.default.createElement(_Buttons.IconButton, {
     color: "black",
     onClick: function onClick() {
       return handleMenuCollapse(false);
@@ -284,12 +279,7 @@ var HomeUI = function HomeUI(props) {
   }, t('VISIT_MY_WEBSITE', 'Visit my Website')))), /*#__PURE__*/_react.default.createElement("img", {
     src: (_project$projectStatu4 = project[(_projectStatus$projec9 = projectStatus.project) === null || _projectStatus$projec9 === void 0 ? void 0 : _projectStatus$projec9.current_status]) === null || _project$projectStatu4 === void 0 ? void 0 : _project$projectStatu4.image,
     alt: ""
-  }))), width < 997 && !isEnabledWhiteLabelModule && /*#__PURE__*/_react.default.createElement(_styles.OrderingButtonBlock, null, /*#__PURE__*/_react.default.createElement("h2", null, t('WHAT_DO_YOU_WANT', 'What do you want to'), /*#__PURE__*/_react.default.createElement("span", null, " ".concat(t('SEE_IN_ORDERING', 'see in ordering')), "?")), /*#__PURE__*/_react.default.createElement(_Buttons.Button, {
-    color: "primary",
-    onClick: function onClick() {
-      return setShowForm(true);
-    }
-  }, t('CLICK_HERE', 'Click here'))), /*#__PURE__*/_react.default.createElement(_styles.ParagraphHeaders, null, /*#__PURE__*/_react.default.createElement("p", null, t('REPORTS', 'Reports')), /*#__PURE__*/_react.default.createElement(_Buttons.Button, {
+  }))), /*#__PURE__*/_react.default.createElement(_styles.ParagraphHeaders, null, /*#__PURE__*/_react.default.createElement("p", null, t('REPORTS', 'Reports')), /*#__PURE__*/_react.default.createElement(_Buttons.Button, {
     color: "lightPrimary",
     onClick: function onClick() {
       return handleGoToPage({

package/_modules/components/Orders/AllInOne/index.js

@@ -252,7 +252,8 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
     setSlaSettingTime: setSlaSettingTime
   }), /*#__PURE__*/_react.default.createElement(_styles.MainContentContainer, null, /*#__PURE__*/_react.default.createElement(_styles.TopContent, null, /*#__PURE__*/_react.default.createElement(_styles.DriversContainer, null, /*#__PURE__*/_react.default.createElement(_DriversManager.DriversManager, {
     setMapsData: setMapsData,
-    handleUpdateAssignedOrders: handleUpdateAssignedOrders
+    handleUpdateAssignedOrders: handleUpdateAssignedOrders,
+    disableSocketRoomDriver: true
   })), /*#__PURE__*/_react.default.createElement(_styles.OrdersContainer, null, /*#__PURE__*/_react.default.createElement(_OrderStatusFilterBar.OrderStatusFilterBar, {
     isUseQuery: isUseQuery,
     selectedOrderStatus: ordersStatusGroup,
@@ -322,7 +323,8 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
     isTourFlag: isTourFlag,
     setIsTourFlag: setIsTourFlag,
     setIsTourOpen: setIsTourOpen,
-    drivers: driversList.drivers
+    drivers: driversList.drivers,
+    disableSocketRoomDriver: true
   }), /*#__PURE__*/_react.default.createElement(_OrderNotification.OrderNotification, {
     customerId: props.customerId
   }), totalSelectedOrder > 0 && /*#__PURE__*/_react.default.createElement(_styles.WrapperIndicator, null, selectedOrderIds.length, "/", totalSelectedOrder), /*#__PURE__*/_react.default.createElement(_WizardOrders.WizardOrders, {

package/_modules/components/Orders/OrderContactInformation/index.js

@@ -218,7 +218,8 @@ var OrderContactInformation = function OrderContactInformation(props) {
     setCurrentTourStep: setCurrentTourStep,
     handleOpenMessages: handleOpenMessages,
     isOrderDrivers: true,
-    orderId: order === null || order === void 0 ? void 0 : order.id
+    orderId: order === null || order === void 0 ? void 0 : order.id,
+    disableSocketRoomDriver: true
   })), !(order !== null && order !== void 0 && order.driver_company_id) && !(commentInfoState !== null && commentInfoState !== void 0 && commentInfoState.open) && /*#__PURE__*/_react.default.createElement(_styles2.DriverSelectorContainer, null, /*#__PURE__*/_react.default.createElement("p", null, t('DRIVER_ASSIGN', 'Driver assign')), /*#__PURE__*/_react.default.createElement(_DriverSelector.DriverSelector, {
     small: true,
     isPhoneView: true,
@@ -229,7 +230,8 @@ var OrderContactInformation = function OrderContactInformation(props) {
     handleOpenMessages: handleOpenMessages,
     isOrderDrivers: true,
     orderId: order === null || order === void 0 ? void 0 : order.id,
-    setCommentInfostate: setCommentInfostate
+    setCommentInfostate: setCommentInfostate,
+    disableSocketRoomDriver: true
   })), /*#__PURE__*/_react.default.createElement(_styles2.DriverInfoContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.DriverInfo, null, /*#__PURE__*/_react.default.createElement(_styles2.PhotoWrapper, null, order !== null && order !== void 0 && (_order$driver = order.driver) !== null && _order$driver !== void 0 && _order$driver.photo || order !== null && order !== void 0 && (_order$external_drive = order.external_driver) !== null && _order$external_drive !== void 0 && _order$external_drive.photo ? /*#__PURE__*/_react.default.createElement(_styles2.Photo, {
     bgimage: optimizeImage((order === null || order === void 0 || (_order$driver2 = order.driver) === null || _order$driver2 === void 0 ? void 0 : _order$driver2.photo) || (order === null || order === void 0 || (_order$external_drive2 = order.external_driver) === null || _order$external_drive2 === void 0 ? void 0 : _order$external_drive2.photo), 'h_50,c_limit')
   }) : /*#__PURE__*/_react.default.createElement(_FaUserAlt.default, null)), order.driver_id ? /*#__PURE__*/_react.default.createElement(_styles2.InfoContent, null, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("p", null, order === null || order === void 0 || (_order$driver3 = order.driver) === null || _order$driver3 === void 0 ? void 0 : _order$driver3.name, " ", order === null || order === void 0 || (_order$driver4 = order.driver) === null || _order$driver4 === void 0 ? void 0 : _order$driver4.middle_name, " ", order === null || order === void 0 || (_order$driver5 = order.driver) === null || _order$driver5 === void 0 ? void 0 : _order$driver5.lastname, " ", order === null || order === void 0 || (_order$driver6 = order.driver) === null || _order$driver6 === void 0 ? void 0 : _order$driver6.second_lastname), (order === null || order === void 0 || (_order$driver7 = order.driver) === null || _order$driver7 === void 0 ? void 0 : _order$driver7.cellphone) && /*#__PURE__*/_react.default.createElement(_styles.IconButton, {

package/_modules/components/Orders/OrdersLateralBar/index.js

@@ -128,7 +128,8 @@ var OrdersLateralBar = function OrdersLateralBar(props) {
     driverId: isDriver ? user.id : null,
     customerId: isCustomer ? user.id : null,
     businessId: isBusiness ? business.id : null,
-    handleCustomOrderDetail: handleCustomOrderDetail
+    handleCustomOrderDetail: handleCustomOrderDetail,
+    disableSocketRoomDriver: true
   })));
 };
 exports.OrdersLateralBar = OrdersLateralBar;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-admin-external",
-  "version": "1.38.4",
+  "version": "1.38.6",
   "description": "Ordering UI Admin Components",
   "main": "./_modules/index.js",
   "exports": {
@@ -83,7 +83,7 @@
     "lodash": "^4.17.20",
     "moment": "^2.29.1",
     "moment-range": "^4.0.2",
-    "ordering-components-admin-external": "1.38.2",
+    "ordering-components-admin-external": "1.38.4",
     "polished": "^3.6.7",
     "prop-types": "^15.7.2",
     "react-big-calendar": "^1.4.2",

package/src/components/Home/HomePage/index.js

@@ -237,12 +237,6 @@ const HomeUI = (props) => {
   return (
     <>
       <HomeContainer>
-        {width > 997 && !isEnabledWhiteLabelModule && (
-          <OrderingButtonWrapper>
-            <span>{t('WHAT_DO_YOU_WANT_SEE_ORDERING', 'What do you want to see in ordering?')}</span>
-            <Button color='primary' onClick={() => setShowForm(true)}>{t('CLICK_HERE', 'Click here')}</Button>
-          </OrderingButtonWrapper>
-        )}
         <Breadcrumb>
           {isCollapse && (
             <IconButton
@@ -300,17 +294,6 @@ const HomeUI = (props) => {
             )}
           </>
         )}
-
-        {width < 997 && !isEnabledWhiteLabelModule && (
-          <OrderingButtonBlock>
-            <h2>
-              {t('WHAT_DO_YOU_WANT', 'What do you want to')}
-              <span>{` ${t('SEE_IN_ORDERING', 'see in ordering')}`}?</span>
-            </h2>
-            <Button color='primary' onClick={() => setShowForm(true)}>{t('CLICK_HERE', 'Click here')}</Button>
-          </OrderingButtonBlock>
-        )}
-
         <ParagraphHeaders>
           <p>{t('REPORTS', 'Reports')}</p>
           <Button

package/src/components/Orders/AllInOne/index.js

@@ -218,6 +218,7 @@ const OrdersManagerUI = (props) => {
               <DriversManager
                 setMapsData={setMapsData}
                 handleUpdateAssignedOrders={handleUpdateAssignedOrders}
+                disableSocketRoomDriver
               />
             </DriversContainer>
             <OrdersContainer>
@@ -308,6 +309,7 @@ const OrdersManagerUI = (props) => {
           setIsTourFlag={setIsTourFlag}
           setIsTourOpen={setIsTourOpen}
           drivers={driversList.drivers}
+          disableSocketRoomDriver
         />
       )}
 

package/src/components/Orders/OrderContactInformation/index.js

@@ -329,6 +329,7 @@ export const OrderContactInformation = (props) => {
                 handleOpenMessages={handleOpenMessages}
                 isOrderDrivers
                 orderId={order?.id}
+                disableSocketRoomDriver
               />
             </CompanySelectorContainer>
           )}
@@ -346,6 +347,7 @@ export const OrderContactInformation = (props) => {
                 isOrderDrivers
                 orderId={order?.id}
                 setCommentInfostate={setCommentInfostate}
+                disableSocketRoomDriver
               />
             </DriverSelectorContainer>
           )}

package/src/components/Orders/OrdersLateralBar/index.js

@@ -147,6 +147,7 @@ export const OrdersLateralBar = (props) => {
           customerId={isCustomer ? user.id : null}
           businessId={isBusiness ? business.id : null}
           handleCustomOrderDetail={handleCustomOrderDetail}
+          disableSocketRoomDriver
         />
       </OrdersContainer>
     </LateralBarContainer>

package/template/config.json

@@ -11,5 +11,6 @@
   "socket": {
     "url": "https://socket-v3.ordering.co"
   },
-  "use_project_domain": true
+  "use_project_domain": false,
+  "use_batch_sockets": false
 }

package/template/pages/AllInOne/index.js

@@ -2,11 +2,13 @@ import React from 'react'
 import { HelmetTags } from '../../components/HelmetTags'
 import { AllInOne as AllInOneController } from '../../../src/components/Orders'
 import { addQueryToUrl, removeQueryToUrl } from '../../../src/utils'
+import settings from '../../config.json'
 
 export const AllInOne = (props) => {
   const ordersListProps = {
     ...props,
     isUseQuery: true,
+    useBatchSockets: settings?.use_batch_sockets,
     onOrderRedirect: (orderId) => {
       if (!orderId) {
         return removeQueryToUrl(['id', 'section', 'tab'])

package/template/pages/DeliveriesManager/index.js

@@ -2,11 +2,13 @@ import React from 'react'
 import { HelmetTags } from '../../components/HelmetTags'
 import { DeliveriesManager as DeliveriesManagerController } from '../../../src/components/Orders'
 import { addQueryToUrl, removeQueryToUrl } from '../../../src/utils'
+import settings from '../../config.json'
 
 export const DeliveriesManager = (props) => {
   const deliveriesManagerProps = {
     ...props,
     isUseQuery: true,
+    useBatchSockets: settings?.use_batch_sockets,
     onOrderRedirect: (orderId) => {
       if (!orderId) {
         return removeQueryToUrl(['id'])

package/template/pages/DriversList/index.js

@@ -2,6 +2,7 @@ import React from 'react'
 import { HelmetTags } from '../../components/HelmetTags'
 import { useEvent } from 'ordering-components-admin-external'
 import { DriversManager as DriversManagerController } from '../../../src/components/Orders'
+import settings from '../../config.json'
 
 export const DriversList = (props) => {
   const [events] = useEvent()
@@ -9,6 +10,7 @@ export const DriversList = (props) => {
     ...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'],
     onDriverRedirect: (driverId) => {
       if (!driverId) {