ordering-ui-admin-external 1.40.8 → 1.41.0

package/_modules/components/BusinessIntelligence/AnalyticsMap/index.js

@@ -21,14 +21,11 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var AnalyticsMap = exports.AnalyticsMap = function AnalyticsMap(props) {
-  var _configState$configs, _configState$configs2, _theme$images;
+  var _Number, _configState$configs, _Number2, _configState$configs2, _configState$configs3, _configState$configs4, _theme$images;
   var locationList = props.locationList;
   var _useConfig = (0, _orderingComponentsAdminExternal.useConfig)(),
     _useConfig2 = _slicedToArray(_useConfig, 1),
     configState = _useConfig2[0];
-  var _useSession = (0, _orderingComponentsAdminExternal.useSession)(),
-    _useSession2 = _slicedToArray(_useSession, 1),
-    user = _useSession2[0].user;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -37,10 +34,9 @@ var AnalyticsMap = exports.AnalyticsMap = function AnalyticsMap(props) {
     _useState2 = _slicedToArray(_useState, 2),
     isHeat = _useState2[0],
     setIsHeat = _useState2[1];
-  // const defaultCenter = { lat: 37.775, lng: -122.434 }
   var defaultCenter = {
-    lat: 40.77473399999999,
-    lng: -73.9653844
+    lat: (_Number = Number((_configState$configs = configState.configs) === null || _configState$configs === void 0 || (_configState$configs = _configState$configs.location_default_latitude) === null || _configState$configs === void 0 ? void 0 : _configState$configs.value)) !== null && _Number !== void 0 ? _Number : 40.77473399999999,
+    lng: (_Number2 = Number((_configState$configs2 = configState.configs) === null || _configState$configs2 === void 0 || (_configState$configs2 = _configState$configs2.location_default_longitude) === null || _configState$configs2 === void 0 ? void 0 : _configState$configs2.value)) !== null && _Number2 !== void 0 ? _Number2 : -73.9653844
   };
   var googleMapsControls = {
     defaultZoom: 15,
@@ -59,9 +55,9 @@ var AnalyticsMap = exports.AnalyticsMap = function AnalyticsMap(props) {
   }, [locationList]);
   return /*#__PURE__*/_react.default.createElement(_styles.Container, null, locationList !== null && locationList !== void 0 && locationList.loading ? /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
     height: 320
-  }) : /*#__PURE__*/_react.default.createElement(_styles.WrapperMap, null, (configState === null || configState === void 0 || (_configState$configs = configState.configs) === null || _configState$configs === void 0 || (_configState$configs = _configState$configs.google_maps_api_key) === null || _configState$configs === void 0 ? void 0 : _configState$configs.value) && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_orderingComponentsAdminExternal.GoogleMapsMap, {
-    apiKey: configState === null || configState === void 0 || (_configState$configs2 = configState.configs) === null || _configState$configs2 === void 0 || (_configState$configs2 = _configState$configs2.google_maps_api_key) === null || _configState$configs2 === void 0 ? void 0 : _configState$configs2.value,
-    location: (user === null || user === void 0 ? void 0 : user.location) || defaultCenter,
+  }) : /*#__PURE__*/_react.default.createElement(_styles.WrapperMap, null, (configState === null || configState === void 0 || (_configState$configs3 = configState.configs) === null || _configState$configs3 === void 0 || (_configState$configs3 = _configState$configs3.google_maps_api_key) === null || _configState$configs3 === void 0 ? void 0 : _configState$configs3.value) && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_orderingComponentsAdminExternal.GoogleMapsMap, {
+    apiKey: configState === null || configState === void 0 || (_configState$configs4 = configState.configs) === null || _configState$configs4 === void 0 || (_configState$configs4 = _configState$configs4.google_maps_api_key) === null || _configState$configs4 === void 0 ? void 0 : _configState$configs4.value,
+    location: defaultCenter,
     locations: locationList === null || locationList === void 0 ? void 0 : locationList.locations,
     mapControls: googleMapsControls,
     isHeatMap: true,

package/_modules/components/Orders/OrdersTable/styles.js

@@ -195,7 +195,7 @@ var DragTh = exports.DragTh = _styledComponents.default.th(_templateObject53 ||
     return props.theme.colors.primary;
   });
 });
-var InfoWrapper = exports.InfoWrapper = _styledComponents.default.div(_templateObject55 || (_templateObject55 = _taggedTemplateLiteral(["\n  position: relative;\n  ", "\n  .bold {\n    max-width: 150px;\n    font-weight: 600;\n    margin: 0;\n  }\n  &:hover > div {\n    visibility: visible;\n    opacity: 1;\n  }\n"])), function (props) {
+var InfoWrapper = exports.InfoWrapper = _styledComponents.default.div(_templateObject55 || (_templateObject55 = _taggedTemplateLiteral(["\n  position: relative;\n  ", "\n\n  .bold {\n    max-width: 150px;\n    font-weight: 600;\n    margin: 0;\n  }\n\n  &:hover > div {\n    visibility: visible;\n    opacity: 1;\n  }\n"])), function (props) {
   var _props$theme8;
   return (_props$theme8 = props.theme) !== null && _props$theme8 !== void 0 && _props$theme8.rtl ? (0, _styledComponents.css)(_templateObject56 || (_templateObject56 = _taggedTemplateLiteral(["\n    margin-left: 4px;\n  "]))) : (0, _styledComponents.css)(_templateObject57 || (_templateObject57 = _taggedTemplateLiteral(["\n    margin-right: 4px;\n  "])));
 });

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

@@ -33,7 +33,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var BusinessSummary = exports.BusinessSummary = function BusinessSummary(props) {
-  var _configs$white_label_, _businessState$busine5, _businessState$busine6, _businessState$busine7, _businessState$busine8, _theme$images, _businessState$busine9;
+  var _configs$white_label_, _sessionState$user, _sessionState$user2, _configs$allow_busine, _businessState$busine5, _businessState$busine6, _businessState$busine7, _businessState$busine8, _theme$images, _businessState$busine9;
   var isAdmin = props.isAdmin,
     businessState = props.businessState,
     actionSidebar = props.actionSidebar,
@@ -73,6 +73,9 @@ var BusinessSummary = exports.BusinessSummary = function BusinessSummary(props)
     _useState4 = _slicedToArray(_useState3, 2),
     selectedView = _useState4[0],
     setSelectedView = _useState4[1];
+  var _useSession = (0, _orderingComponentsAdminExternal.useSession)(),
+    _useSession2 = _slicedToArray(_useSession, 1),
+    sessionState = _useSession2[0];
   var _useState5 = (0, _react.useState)({
       open: false,
       content: null,
@@ -82,6 +85,7 @@ var BusinessSummary = exports.BusinessSummary = function BusinessSummary(props)
     confirm = _useState6[0],
     setConfirm = _useState6[1];
   var isEnabledWhiteLabelModule = configs === null || configs === void 0 || (_configs$white_label_ = configs.white_label_module) === null || _configs$white_label_ === void 0 ? void 0 : _configs$white_label_.value;
+  var isAllowRegisteredBusiness = (sessionState === null || sessionState === void 0 || (_sessionState$user = sessionState.user) === null || _sessionState$user === void 0 ? void 0 : _sessionState$user.level) === 0 || (sessionState === null || sessionState === void 0 || (_sessionState$user2 = sessionState.user) === null || _sessionState$user2 === void 0 ? void 0 : _sessionState$user2.level) === 2 && (configs === null || configs === void 0 || (_configs$allow_busine = configs.allow_business_owner_register_business) === null || _configs$allow_busine === void 0 ? void 0 : _configs$allow_busine.value) === '1';
   var handleOpenCategory = function handleOpenCategory() {
     var _businessState$busine;
     events.emit('go_to_page', {
@@ -197,7 +201,7 @@ var BusinessSummary = exports.BusinessSummary = function BusinessSummary(props)
     onClick: function onClick() {
       return setIsBusinessPreview(true);
     }
-  }, t('PREVIEW', 'Preview')), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Item, {
+  }, t('PREVIEW', 'Preview')), isAllowRegisteredBusiness && /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Item, {
     onClick: function onClick() {
       return handleDuplicateBusiness();
     }

package/index-template.js

@@ -298,7 +298,7 @@ if (!(window?.location?.hostname === 'localhost')) {
     integrations: [
       new Integrations.BrowserTracing()
     ],
-    release: process.env.npm_package_version ? 'ordering-ui-admin-release@' + process.env.npm_package_version : 'ordering-ui-admin-release@' + '1.1.3',
+    release: process.env.npm_package_version ? 'ordering-ui-admin-release@' + process.env.npm_package_version : 'ordering-ui-admin-release@' + '1.2.0',
     // Release health
     autoSessionTracking: true,
     ignoreErrors: [

package/package.json

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

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

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import { useConfig, useSession, useLanguage, GoogleMapsMap } from 'ordering-components-admin-external'
+import { useConfig, useLanguage, GoogleMapsMap } from 'ordering-components-admin-external'
 import { useTheme } from 'styled-components'
 import {
   Container,
@@ -13,12 +13,14 @@ export const AnalyticsMap = (props) => {
     locationList
   } = props
   const [configState] = useConfig()
-  const [{ user }] = useSession()
   const [, t] = useLanguage()
   const theme = useTheme()
   const [isHeat, setIsHeat] = useState(false)
-  // const defaultCenter = { lat: 37.775, lng: -122.434 }
-  const defaultCenter = { lat: 40.77473399999999, lng: -73.9653844 }
+
+  const defaultCenter = {
+    lat: Number(configState.configs?.location_default_latitude?.value) ?? 40.77473399999999,
+    lng: Number(configState.configs?.location_default_longitude?.value) ?? -73.9653844
+  }
 
   const googleMapsControls = {
     defaultZoom: 15,
@@ -47,7 +49,7 @@ export const AnalyticsMap = (props) => {
               <>
                 <GoogleMapsMap
                   apiKey={configState?.configs?.google_maps_api_key?.value}
-                  location={user?.location || defaultCenter}
+                  location={defaultCenter}
                   locations={locationList?.locations}
                   mapControls={googleMapsControls}
                   isHeatMap

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

@@ -133,4 +133,4 @@ export const InvoiceBusinessManager = (props) => {
     UIComponent: InvoiceBusinessManagerUI
   }
   return <InvoiceBusinessManagerController {...invoiceBusinessManagerProps} />
-}
+}

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

@@ -95,4 +95,4 @@ export const InvoiceOrderType = (props) => {
       </ActionBtnWrapper>
     </InvoiceOrderTypeContainer>
   )
-}
+}

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

@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useRef } from 'react'
 import { useLocation } from 'react-router-dom'
 import { useLanguage, UsersList as UsersListController } from 'ordering-components-admin-external'
-  import { getStorageItem, removeStorageItem, setStorageItem, addQueryToUrl } from '../../../utils'
+ import { getStorageItem, removeStorageItem, setStorageItem, addQueryToUrl } from '../../../utils'
 
 import { UsersListingHeader } from '../UsersListingHeader'
 import { UserTypeFilter } from '../UserTypeFilter'

package/src/components/Orders/OrdersTable/styles.js

@@ -418,11 +418,13 @@ export const InfoWrapper = styled.div`
   ` : css`
     margin-right: 4px;
   `}
+
   .bold {
     max-width: 150px;
     font-weight: 600;
     margin: 0;
   }
+
   &:hover > div {
     visibility: visible;
     opacity: 1;

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

@@ -1,6 +1,6 @@
 import React, { useState } from 'react'
 import Skeleton from 'react-loading-skeleton'
-import { useLanguage, useUtils, useEvent, useApi, useConfig } from 'ordering-components-admin-external'
+import { useLanguage, useUtils, useEvent, useApi, useConfig, useSession } from 'ordering-components-admin-external'
 import BsChevronRight from '@meronex/icons/bs/BsChevronRight'
 import { useTheme } from 'styled-components'
 import { Dropdown, DropdownButton } from 'react-bootstrap'
@@ -53,9 +53,11 @@ export const BusinessSummary = (props) => {
   const { width } = useWindowSize()
   const [isBusinessPreview, setIsBusinessPreview] = useState(false)
   const [selectedView, setSelectedView] = useState('desktop')
+  const [sessionState] = useSession()
   const [confirm, setConfirm] = useState({ open: false, content: null, handleOnAccept: null })
 
   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 handleOpenCategory = () => {
     events.emit('go_to_page', { page: 'store', params: { store: businessState?.business?.slug } })
@@ -216,11 +218,13 @@ export const BusinessSummary = (props) => {
                 >
                   {t('PREVIEW', 'Preview')}
                 </Dropdown.Item>
+                {isAllowRegisteredBusiness &&
                 <Dropdown.Item
                   onClick={() => handleDuplicateBusiness()}
                 >
                   {t('DUPLICATE', 'Duplicate')}
                 </Dropdown.Item>
+               }
                 {!isEnabledWhiteLabelModule && (
                   <Dropdown.Item
                     onClick={() => handleSelectedItem('personalization')}
@@ -352,4 +356,4 @@ export const BusinessSummary = (props) => {
       </Modal>
     </>
   )
-}
+}