ordering-ui-admin-external 1.3.6 → 1.3.7

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

@@ -42,7 +42,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var DeliveriesLocation = function DeliveriesLocation(props) {
-  var _configState$configs, _configState$configs$, _interActionMapOrder$7, _interActionMapOrder$8, _interActionMapOrder$9, _interActionMapOrder$10, _interActionMapOrder$11, _interActionMapOrder$12, _interActionMapOrder$13, _interActionMapOrder$14, _interActionMapOrder$15, _interActionMapOrder$16, _interActionMapOrder$17, _interActionMapOrder$18, _interActionMapOrder$19, _interActionMapOrder$20, _interActionMapOrder$21;
+  var _configState$configs, _configState$configs$, _configState$configs2, _configState$configs3, _configState$configs4, _configState$configs5, _interActionMapOrder$7, _interActionMapOrder$8, _interActionMapOrder$9, _interActionMapOrder$10, _interActionMapOrder$11, _interActionMapOrder$12, _interActionMapOrder$13, _interActionMapOrder$14, _interActionMapOrder$15, _interActionMapOrder$16, _interActionMapOrder$17, _interActionMapOrder$18, _interActionMapOrder$19, _interActionMapOrder$20, _interActionMapOrder$21;
 
   var driversList = props.driversList,
       interActionMapOrder = props.interActionMapOrder;
@@ -57,11 +57,15 @@ var DeliveriesLocation = function DeliveriesLocation(props) {
       configState = _useConfig2[0];
 
   var googleMapsApiKey = configState === null || configState === void 0 ? void 0 : (_configState$configs = configState.configs) === null || _configState$configs === void 0 ? void 0 : (_configState$configs$ = _configState$configs.google_maps_api_key) === null || _configState$configs$ === void 0 ? void 0 : _configState$configs$.value;
+  var defaultLatitude = Number(configState === null || configState === void 0 ? void 0 : (_configState$configs2 = configState.configs) === null || _configState$configs2 === void 0 ? void 0 : (_configState$configs3 = _configState$configs2.location_default_latitude) === null || _configState$configs3 === void 0 ? void 0 : _configState$configs3.value);
+  var defaultLongitude = Number(configState === null || configState === void 0 ? void 0 : (_configState$configs4 = configState.configs) === null || _configState$configs4 === void 0 ? void 0 : (_configState$configs5 = _configState$configs4.location_default_longitude) === null || _configState$configs5 === void 0 ? void 0 : _configState$configs5.value);
+  var isInvalidDefaultLocation = isNaN(defaultLatitude) || isNaN(defaultLongitude);
+  var defaultCenter = {
+    lat: !isInvalidDefaultLocation ? defaultLatitude : 40.7744146,
+    lng: !isInvalidDefaultLocation ? defaultLongitude : -73.9678064
+  };
 
-  var _useState = (0, _react.useState)({
-    lat: 19.4326,
-    lng: -99.1332
-  }),
+  var _useState = (0, _react.useState)(defaultCenter),
       _useState2 = _slicedToArray(_useState, 2),
       mapCenter = _useState2[0],
       setMapCenter = _useState2[1];
@@ -91,10 +95,6 @@ var DeliveriesLocation = function DeliveriesLocation(props) {
       interActionOrderDriverLocation = _useState12[0],
       setInterActionOrderDriverLocation = _useState12[1];
 
-  var defaultCenter = {
-    lat: 19.4326,
-    lng: -99.1332
-  };
   var defaultZoom = 10;
   var mapRef = (0, _react.useRef)(null);
 

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

@@ -36,7 +36,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var DriversLocation = function DriversLocation(props) {
-  var _configState$configs, _configState$configs$;
+  var _configState$configs, _configState$configs$, _configState$configs2, _configState$configs3, _configState$configs4, _configState$configs5;
 
   var driversIsOnline = props.driversIsOnline,
       onlineDrivers = props.onlineDrivers,
@@ -48,16 +48,21 @@ var DriversLocation = function DriversLocation(props) {
       configState = _useConfig2[0];
 
   var googleMapsApiKey = configState === null || configState === void 0 ? void 0 : (_configState$configs = configState.configs) === null || _configState$configs === void 0 ? void 0 : (_configState$configs$ = _configState$configs.google_maps_api_key) === null || _configState$configs$ === void 0 ? void 0 : _configState$configs$.value;
+  var defaultLatitude = Number(configState === null || configState === void 0 ? void 0 : (_configState$configs2 = configState.configs) === null || _configState$configs2 === void 0 ? void 0 : (_configState$configs3 = _configState$configs2.location_default_latitude) === null || _configState$configs3 === void 0 ? void 0 : _configState$configs3.value);
+  var defaultLongitude = Number(configState === null || configState === void 0 ? void 0 : (_configState$configs4 = configState.configs) === null || _configState$configs4 === void 0 ? void 0 : (_configState$configs5 = _configState$configs4.location_default_longitude) === null || _configState$configs5 === void 0 ? void 0 : _configState$configs5.value);
+  var isInvalidDefaultLocation = isNaN(defaultLatitude) || isNaN(defaultLongitude);
+  var defaultCenter = {
+    lat: !isInvalidDefaultLocation ? defaultLatitude : 40.7744146,
+    lng: !isInvalidDefaultLocation ? defaultLongitude : -73.9678064
+  };
+  var defaultZoom = 10;
 
-  var _useState = (0, _react.useState)({
-    lat: 19.4326,
-    lng: -99.1332
-  }),
+  var _useState = (0, _react.useState)(defaultCenter),
       _useState2 = _slicedToArray(_useState, 2),
       mapCenter = _useState2[0],
       setMapCenter = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(10),
+  var _useState3 = (0, _react.useState)(defaultZoom),
       _useState4 = _slicedToArray(_useState3, 2),
       mapZoom = _useState4[0],
       setMapZoom = _useState4[1];
@@ -72,11 +77,6 @@ var DriversLocation = function DriversLocation(props) {
       mapFitted = _useState8[0],
       setMapFitted = _useState8[1];
 
-  var defaultCenter = {
-    lat: 19.4326,
-    lng: -99.1332
-  };
-  var defaultZoom = 10;
   var mapRef = (0, _react.useRef)(null);
 
   var _useState9 = (0, _react.useState)([]),
@@ -145,7 +145,14 @@ var DriversLocation = function DriversLocation(props) {
 
 
   (0, _react.useEffect)(function () {
-    if (showDrivers.length === 0 || mapLoaded) return;
+    if (mapLoaded) return;
+
+    if (showDrivers.length === 0) {
+      setMapZoom(defaultZoom);
+      setMapCenter(defaultCenter);
+      setMapFitted(false);
+      return;
+    }
 
     if (!mapFitted) {
       mapFit();

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

@@ -56,7 +56,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var DriversManagerUI = function DriversManagerUI(props) {
   var onDriverRedirect = props.onDriverRedirect,
       handleChangeSearch = props.handleChangeSearch,
-      searchValue = props.searchValue;
+      searchValue = props.searchValue,
+      driversIsOnline = props.driversIsOnline;
   var _props$driversList = props.driversList,
       drivers = _props$driversList.drivers,
       loading = _props$driversList.loading;
@@ -117,6 +118,9 @@ var DriversManagerUI = function DriversManagerUI(props) {
       setIsOpenDriverOrders(true);
     }
   }, [drivers, loading]);
+  (0, _react.useEffect)(function () {
+    setSelectedDriver(null);
+  }, [driversIsOnline]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles.DriversContainer, null, /*#__PURE__*/_react.default.createElement(_styles.DriversHeader, null, /*#__PURE__*/_react.default.createElement(_styles.HeaderTitleContainer, null, isCollapse && /*#__PURE__*/_react.default.createElement(_Buttons.IconButton, {
     color: "black",
     onClick: function onClick() {

package/_modules/components/Settings/PluginList/index.js

@@ -60,7 +60,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var PluginListUI = function PluginListUI(props) {
-  var _pluginListState$sysP, _currentPlugins$plugi, _pluginListState$sysP2, _currentPlugins$sysPl;
+  var _pluginListState$sysP, _currentPlugins$plugi;
 
   var pluginListState = props.pluginListState,
       isAddMode = props.isAddMode,
@@ -289,36 +289,6 @@ var PluginListUI = function PluginListUI(props) {
     handleChangePageSize: function handleChangePageSize(e) {
       return _handleChangePageSize(e, 'plugins');
     }
-  }))), !pluginListState.loading && ((_pluginListState$sysP2 = pluginListState.sysPlugins) === null || _pluginListState$sysP2 === void 0 ? void 0 : _pluginListState$sysP2.length) > 0 && /*#__PURE__*/_react.default.createElement(_styles2.PLuginsSeparator, {
-    h: "50%"
-  }, /*#__PURE__*/_react.default.createElement(_styles2.Header, {
-    mb: 0
-  }, /*#__PURE__*/_react.default.createElement("h1", {
-    style: {
-      marginTop: 20
-    }
-  }, t('SYSTEM_PLUGINS', 'System Plugins'))), /*#__PURE__*/_react.default.createElement(_styles2.PluginsTable, null, /*#__PURE__*/_react.default.createElement("thead", null, /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("th", null, t('PLUGINS', 'Plugins')), /*#__PURE__*/_react.default.createElement("th", null, t('ACTIONS', 'Actions')))), currentPlugins.sysPlugins.map(function (plugin) {
-    return /*#__PURE__*/_react.default.createElement(_styles2.PluginTbody, {
-      key: plugin.id
-    }, /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, plugin === null || plugin === void 0 ? void 0 : plugin.name), /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles2.ActionsContainer, null, plugin !== null && plugin !== void 0 && plugin.installed ? /*#__PURE__*/_react.default.createElement("span", null, t('SYSTEM_PLUGIN_INSTALLED', 'Installed')) : /*#__PURE__*/_react.default.createElement(_styles.Button, {
-      borderRadius: "8px",
-      color: "lightPrimary",
-      onClick: function onClick() {
-        return handleInstallSysPlugin(plugin.id);
-      }
-    }, /*#__PURE__*/_react.default.createElement("span", null, t('INSTALL', 'Install')))))));
-  })), /*#__PURE__*/_react.default.createElement(_styles2.PagesBottomContainer, {
-    justifyContent: "flex-end"
-  }, ((_currentPlugins$sysPl = currentPlugins.sysPlugins) === null || _currentPlugins$sysPl === void 0 ? void 0 : _currentPlugins$sysPl.length) > 0 && /*#__PURE__*/_react.default.createElement(_Shared.Pagination, {
-    currentPage: currentPage.sysPlugins,
-    totalPages: totalPages.sysPlugins,
-    handleChangePage: function handleChangePage(e) {
-      return _handleChangePage(e, 'sysPlugins');
-    },
-    defaultPageSize: pluginsPerPage.sysPlugins,
-    handleChangePageSize: function handleChangePageSize(e) {
-      return _handleChangePageSize(e, 'sysPlugins');
-    }
   })))), /*#__PURE__*/_react.default.createElement(_Shared.Alert, {
     title: t('WEB_APPNAME', 'Ordering'),
     content: alertState.content,

package/_modules/components/SidebarMenu/index.js

@@ -85,11 +85,12 @@ var SidebarMenu = function SidebarMenu(props) {
     id: 3,
     title: t('DRIVERS_DASHBOARD', 'Drivers Dashboard'),
     pageName: 'drivers'
-  }, {
-    id: 4,
-    title: t('APPOINTMENTS', 'Appointments'),
-    pageName: 'appointments'
-  }];
+  } // {
+  //   id: 4,
+  //   title: t('APPOINTMENTS', 'Appointments'),
+  //   pageName: 'appointments'
+  // }
+  ];
   var loyaltySubMenus = [{
     id: 1,
     title: t('REWARDS_PROGRAMS', 'Rewards programs'),
@@ -145,12 +146,13 @@ var SidebarMenu = function SidebarMenu(props) {
     title: t('MANAGERS', 'Managers'),
     pageName: 'managers',
     url: '/users/managers'
-  }, {
-    id: 3,
-    title: t('PROFESSIONALS', 'Professionals'),
-    pageName: 'professionals',
-    url: '/users/professionals'
-  }];
+  } // {
+  //   id: 3,
+  //   title: t('PROFESSIONALS', 'Professionals'),
+  //   pageName: 'professionals',
+  //   url: '/users/professionals'
+  // }
+  ];
   var settingsSubMenus = [{
     id: 1,
     title: t('BASIC_SETTINGS', 'Basic settings'),

package/_modules/components/Stores/BusinessProductAddForm/index.js

@@ -106,10 +106,8 @@ var BusinessProductAddFormUI = function BusinessProductAddFormUI(props) {
   var typeList = [{
     value: 'item',
     content: /*#__PURE__*/_react.default.createElement(_styles2.Option, null, t('ITEM', 'Item'))
-  }, {
-    value: 'service',
-    content: /*#__PURE__*/_react.default.createElement(_styles2.Option, null, t('SERVICE', 'Service'))
-  }];
+  } // { value: 'service', content: <Option>{t('SERVICE', 'Service')}</Option> }
+  ];
   var durationList = [{
     value: 15,
     content: /*#__PURE__*/_react.default.createElement(_styles2.Option, null, "15 ", /*#__PURE__*/_react.default.createElement("span", null, t('MINUTES', 'minutes')))

package/_modules/components/Stores/BusinessesListingHeader/index.js

@@ -89,13 +89,7 @@ var BusinessesListingHeader = function BusinessesListingHeader(props) {
     onClick: function onClick() {
       return handleOpenAddBusiness();
     }
-  }, t('ADD_NEW_STORE', 'Add new store')), /*#__PURE__*/_react.default.createElement(_styles.Button, {
-    color: "lightPrimary",
-    borderRadius: "8px",
-    onClick: function onClick() {
-      return handleOpenSync();
-    }
-  }, t('SYNC', 'Sync')), /*#__PURE__*/_react.default.createElement(_Shared.SearchBar, {
+  }, t('ADD_NEW_STORE', 'Add new store')), /*#__PURE__*/_react.default.createElement(_Shared.SearchBar, {
     isCustomLayout: true,
     lazyLoad: true,
     onSearch: onSearch,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-admin-external",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "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.3.0",
+    "ordering-components-admin-external": "1.3.1",
     "polished": "^3.6.7",
     "prop-types": "^15.7.2",
     "react-big-calendar": "^1.4.2",

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

@@ -27,15 +27,21 @@ export const DeliveriesLocation = (props) => {
   const [configState] = useConfig()
   const googleMapsApiKey = configState?.configs?.google_maps_api_key?.value
 
-  const [mapCenter, setMapCenter] = useState({ lat: 19.4326, lng: -99.1332 })
+  const defaultLatitude = Number(configState?.configs?.location_default_latitude?.value)
+  const defaultLongitude = Number(configState?.configs?.location_default_longitude?.value)
+  const isInvalidDefaultLocation = isNaN(defaultLatitude) || isNaN(defaultLongitude)
+  const defaultCenter = {
+    lat: !isInvalidDefaultLocation ? defaultLatitude : 40.7744146,
+    lng: !isInvalidDefaultLocation ? defaultLongitude : -73.9678064
+  }
+
+  const [mapCenter, setMapCenter] = useState(defaultCenter)
   const [mapZoom, setMapZoom] = useState(10)
   const [activeDrivers, setActiveDrivers] = useState([])
   const [mapLoaded, setMapLoaded] = useState(true)
   const [mapFitted, setMapFitted] = useState(false)
 
   const [interActionOrderDriverLocation, setInterActionOrderDriverLocation] = useState(null)
-
-  const defaultCenter = { lat: 19.4326, lng: -99.1332 }
   const defaultZoom = 10
   const mapRef = useRef(null)
 

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

@@ -18,13 +18,20 @@ export const DriversLocation = (props) => {
   const [configState] = useConfig()
   const googleMapsApiKey = configState?.configs?.google_maps_api_key?.value
 
-  const [mapCenter, setMapCenter] = useState({ lat: 19.4326, lng: -99.1332 })
-  const [mapZoom, setMapZoom] = useState(10)
+  const defaultLatitude = Number(configState?.configs?.location_default_latitude?.value)
+  const defaultLongitude = Number(configState?.configs?.location_default_longitude?.value)
+  const isInvalidDefaultLocation = isNaN(defaultLatitude) || isNaN(defaultLongitude)
+  const defaultCenter = {
+    lat: !isInvalidDefaultLocation ? defaultLatitude : 40.7744146,
+    lng: !isInvalidDefaultLocation ? defaultLongitude : -73.9678064
+  }
+  const defaultZoom = 10
+
+  const [mapCenter, setMapCenter] = useState(defaultCenter)
+  const [mapZoom, setMapZoom] = useState(defaultZoom)
   const [mapLoaded, setMapLoaded] = useState(true)
   const [mapFitted, setMapFitted] = useState(false)
 
-  const defaultCenter = { lat: 19.4326, lng: -99.1332 }
-  const defaultZoom = 10
   const mapRef = useRef(null)
 
   const [showDrivers, setShowDrivers] = useState([])
@@ -83,7 +90,13 @@ export const DriversLocation = (props) => {
 
   // Fit bounds on mount, and when the markers change
   useEffect(() => {
-    if (showDrivers.length === 0 || mapLoaded) return
+    if (mapLoaded) return
+    if (showDrivers.length === 0) {
+      setMapZoom(defaultZoom)
+      setMapCenter(defaultCenter)
+      setMapFitted(false)
+      return
+    }
     if (!mapFitted) {
       mapFit()
     }

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

@@ -20,7 +20,8 @@ const DriversManagerUI = (props) => {
   const {
     onDriverRedirect,
     handleChangeSearch,
-    searchValue
+    searchValue,
+    driversIsOnline
   } = props
 
   const { drivers, loading } = props.driversList
@@ -63,6 +64,10 @@ const DriversManagerUI = (props) => {
     }
   }, [drivers, loading])
 
+  useEffect(() => {
+    setSelectedDriver(null)
+  }, [driversIsOnline])
+
   return (
     <>
       <DriversContainer>

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

@@ -234,7 +234,7 @@ const PluginListUI = (props) => {
           )}
         </PLuginsSeparator>
 
-        {!pluginListState.loading && pluginListState.sysPlugins?.length > 0 && (
+        {/* {!pluginListState.loading && pluginListState.sysPlugins?.length > 0 && (
           <PLuginsSeparator h='50%'>
             <Header mb={0}>
               <h1 style={{ marginTop: 20 }}>{t('SYSTEM_PLUGINS', 'System Plugins')}</h1>
@@ -282,7 +282,7 @@ const PluginListUI = (props) => {
               )}
             </PagesBottomContainer>
           </PLuginsSeparator>
-        )}
+        )} */}
       </PluginListContainer>
       <Alert
         title={t('WEB_APPNAME', 'Ordering')}

package/src/components/SidebarMenu/index.js

@@ -64,12 +64,12 @@ export const SidebarMenu = (props) => {
       id: 3,
       title: t('DRIVERS_DASHBOARD', 'Drivers Dashboard'),
       pageName: 'drivers'
-    },
-    {
-      id: 4,
-      title: t('APPOINTMENTS', 'Appointments'),
-      pageName: 'appointments'
     }
+    // {
+    //   id: 4,
+    //   title: t('APPOINTMENTS', 'Appointments'),
+    //   pageName: 'appointments'
+    // }
   ]
 
   const loyaltySubMenus = [
@@ -141,13 +141,13 @@ export const SidebarMenu = (props) => {
       title: t('MANAGERS', 'Managers'),
       pageName: 'managers',
       url: '/users/managers'
-    },
-    {
-      id: 3,
-      title: t('PROFESSIONALS', 'Professionals'),
-      pageName: 'professionals',
-      url: '/users/professionals'
     }
+    // {
+    //   id: 3,
+    //   title: t('PROFESSIONALS', 'Professionals'),
+    //   pageName: 'professionals',
+    //   url: '/users/professionals'
+    // }
   ]
 
   const settingsSubMenus = [

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

@@ -51,8 +51,8 @@ const BusinessProductAddFormUI = (props) => {
   const [isCustom, setIsCustom] = useState(false)
 
   const typeList = [
-    { value: 'item', content: <Option>{t('ITEM', 'Item')}</Option> },
-    { value: 'service', content: <Option>{t('SERVICE', 'Service')}</Option> }
+    { value: 'item', content: <Option>{t('ITEM', 'Item')}</Option> }
+    // { value: 'service', content: <Option>{t('SERVICE', 'Service')}</Option> }
   ]
 
   const durationList = [

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

@@ -73,13 +73,13 @@ export const BusinessesListingHeader = (props) => {
         >
           {t('ADD_NEW_STORE', 'Add new store')}
         </Button>
-        <Button
+        {/* <Button
           color='lightPrimary'
           borderRadius='8px'
           onClick={() => handleOpenSync()}
         >
           {t('SYNC', 'Sync')}
-        </Button>
+        </Button> */}
         <SearchBar
           isCustomLayout
           lazyLoad