ordering-ui-admin-external 1.18.0 → 1.19.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (29) hide show
  1. package/_bundles/{ordering-ui-admin.d6ceaa81e226693746d5.js → ordering-ui-admin.661a37246ac77dcc4edf.js} +2 -2
  2. package/_modules/components/Home/HomePage/index.js +7 -1
  3. package/_modules/components/Login/LoginForm/index.js +7 -1
  4. package/_modules/components/Marketing/EnterprisePromotionListing/index.js +1 -1
  5. package/_modules/components/Messages/MessagesListing/index.js +1 -1
  6. package/_modules/components/MyProducts/OrderingWebsite/index.js +47 -2
  7. package/_modules/components/MyProducts/OrderingWebsite/styles.js +13 -3
  8. package/_modules/components/OrderingProducts/SiteTheme/index.js +13 -9
  9. package/_modules/components/Orders/DeliveriesManager/index.js +1 -1
  10. package/_modules/components/Orders/Messages/index.js +22 -95
  11. package/_modules/components/Orders/OrderBill/index.js +2 -2
  12. package/_modules/components/SidebarMenu/index.js +34 -33
  13. package/_modules/components/Stores/BusinessLocation/index.js +8 -7
  14. package/_modules/components/Stores/BusinessPreorderDetails/index.js +1 -13
  15. package/package.json +2 -2
  16. package/src/components/Home/HomePage/index.js +2 -2
  17. package/src/components/Login/LoginForm/index.js +4 -1
  18. package/src/components/Marketing/EnterprisePromotionListing/index.js +1 -1
  19. package/src/components/Messages/MessagesListing/index.js +1 -1
  20. package/src/components/MyProducts/OrderingWebsite/index.js +66 -2
  21. package/src/components/MyProducts/OrderingWebsite/styles.js +37 -0
  22. package/src/components/OrderingProducts/SiteTheme/index.js +7 -3
  23. package/src/components/Orders/DeliveriesManager/index.js +1 -1
  24. package/src/components/Orders/Messages/index.js +27 -225
  25. package/src/components/Orders/OrderBill/index.js +5 -1
  26. package/src/components/SidebarMenu/index.js +8 -8
  27. package/src/components/Stores/BusinessLocation/index.js +2 -1
  28. package/src/components/Stores/BusinessPreorderDetails/index.js +2 -2
  29. /package/_bundles/{ordering-ui-admin.d6ceaa81e226693746d5.js.LICENSE.txt → ordering-ui-admin.661a37246ac77dcc4edf.js.LICENSE.txt} +0 -0
@@ -34,7 +34,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
34
34
  function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
35
35
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
36
36
  var SidebarMenuUI = function SidebarMenuUI(props) {
37
- var _configs$powered_by_o, _configs$appointments, _sessionState$user, _sessionState$user2, _sessionState$user3, _sessionState$user4, _sessionState$user5, _sessionState$user6, _sessionState$user7, _configs$dashboard_lo, _theme$images, _theme$images$logos, _sessionState$user8, _sessionState$user9, _sessionState$user10, _sessionState$user13, _sessionState$user14, _sessionState$user15, _sessionState$user16, _sessionState$user18, _sessionState$user19, _sessionState$user20, _sessionState$user21, _sessionState$user22, _sessionState$user23, _sessionState$user24, _sessionState$user25, _sessionState$user26, _sessionState$user27, _sessionState$user28, _sessionState$user29, _sessionState$user30, _sessionState$user31, _sessionState$user32, _sessionState$user33, _sessionState$user34, _sessionState$user35, _sessionState$user36;
37
+ var _configs$powered_by_o, _configs$appointments, _sessionState$user, _sessionState$user2, _sessionState$user3, _sessionState$user4, _sessionState$user5, _sessionState$user6, _sessionState$user7, _configs$dashboard_lo, _theme$images, _theme$images$logos, _sessionState$user8, _sessionState$user9, _sessionState$user10, _sessionState$user11, _sessionState$user14, _sessionState$user15, _sessionState$user16, _sessionState$user17, _sessionState$user19, _sessionState$user20, _sessionState$user21, _sessionState$user22, _sessionState$user23, _sessionState$user24, _sessionState$user25, _sessionState$user26, _sessionState$user27, _sessionState$user28, _sessionState$user29, _sessionState$user30, _sessionState$user31, _sessionState$user32, _sessionState$user33, _sessionState$user34, _sessionState$user35, _sessionState$user36, _sessionState$user37;
38
38
  var getBillingToken = props.getBillingToken,
39
39
  billingUrl = props.billingUrl;
40
40
  var location = (0, _reactRouterDom.useLocation)();
@@ -316,15 +316,12 @@ var SidebarMenuUI = function SidebarMenuUI(props) {
316
316
  }
317
317
  events.emit('go_to_page', data);
318
318
  };
319
-
320
- // const handleGoToLink = (link) => {
321
- // window.open(link, '_blank')
322
- // }
323
-
324
- // const handleOpenSite = () => {
325
- // handleGoToLink(`https://${ordering.project}.tryordering.com`)
326
- // }
327
-
319
+ var handleGoToLink = function handleGoToLink(link) {
320
+ window.open(link, '_blank');
321
+ };
322
+ var handleOpenSite = function handleOpenSite() {
323
+ handleGoToLink("https://".concat(ordering.project, ".tryordering.com"));
324
+ };
328
325
  (0, _react.useEffect)(function () {
329
326
  if (windowSize.width < 1024) {
330
327
  handleMenuCollapse(true);
@@ -393,19 +390,23 @@ var SidebarMenuUI = function SidebarMenuUI(props) {
393
390
  className: "d-flex flex-column justify-content-between p-1 pt-0"
394
391
  }, /*#__PURE__*/_react.default.createElement("div", {
395
392
  className: "d-flex flex-column"
396
- }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion, null, (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user8 = sessionState.user) === null || _sessionState$user8 === void 0 ? void 0 : _sessionState$user8.level) !== 5 && (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user9 = sessionState.user) === null || _sessionState$user9 === void 0 ? void 0 : _sessionState$user9.level) !== 8 && /*#__PURE__*/_react.default.createElement(_styles.MenuContainer, null, /*#__PURE__*/_react.default.createElement(ContextAwareToggle, {
393
+ }, (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user8 = sessionState.user) === null || _sessionState$user8 === void 0 ? void 0 : _sessionState$user8.level) === 0 && /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
394
+ className: "d-flex align-items-center",
395
+ variant: false,
396
+ onClick: handleOpenSite
397
+ }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.BoxArrowUpRight, null), /*#__PURE__*/_react.default.createElement("span", null, t('MY_WEBSITE', 'My Website'))), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion, null, (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user9 = sessionState.user) === null || _sessionState$user9 === void 0 ? void 0 : _sessionState$user9.level) !== 5 && (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user10 = sessionState.user) === null || _sessionState$user10 === void 0 ? void 0 : _sessionState$user10.level) !== 8 && /*#__PURE__*/_react.default.createElement(_styles.MenuContainer, null, /*#__PURE__*/_react.default.createElement(ContextAwareToggle, {
397
398
  eventKey: "0",
398
399
  active: location.pathname === '/home',
399
400
  page: "home",
400
401
  handleGoToPage: handleGoToPage
401
- }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.HouseDoor, null), /*#__PURE__*/_react.default.createElement("span", null, t('HOME', 'Home')))), (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user10 = sessionState.user) === null || _sessionState$user10 === void 0 ? void 0 : _sessionState$user10.level) !== 8 && /*#__PURE__*/_react.default.createElement(_styles.MenuContainer, null, /*#__PURE__*/_react.default.createElement(ContextAwareToggle, {
402
+ }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.HouseDoor, null), /*#__PURE__*/_react.default.createElement("span", null, t('HOME', 'Home')))), (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user11 = sessionState.user) === null || _sessionState$user11 === void 0 ? void 0 : _sessionState$user11.level) !== 8 && /*#__PURE__*/_react.default.createElement(_styles.MenuContainer, null, /*#__PURE__*/_react.default.createElement(ContextAwareToggle, {
402
403
  eventKey: "1",
403
404
  active: location.pathname === '/orders' || location.pathname === '/deliveries' || location.pathname === '/drivers' || location.pathname === '/appointments' || location.pathname === '/gift-cards'
404
405
  }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.ListCheck, null), /*#__PURE__*/_react.default.createElement("span", null, t('ORDERS', 'Orders'))), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Collapse, {
405
406
  eventKey: "1"
406
407
  }, /*#__PURE__*/_react.default.createElement(_styles.MenuContent, null, ordersSubMenus.map(function (item) {
407
- var _sessionState$user11, _sessionState$user12;
408
- return !((sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user11 = sessionState.user) === null || _sessionState$user11 === void 0 ? void 0 : _sessionState$user11.level) === 2 && item.pageName === 'drivers') && !((sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user12 = sessionState.user) === null || _sessionState$user12 === void 0 ? void 0 : _sessionState$user12.level) === 5 && item.pageName === 'appointments') && (item.pageName === 'appointments' ? isEnabledAppointmentsFeature && /*#__PURE__*/_react.default.createElement(_styles.SubMenu, {
408
+ var _sessionState$user12, _sessionState$user13;
409
+ return !((sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user12 = sessionState.user) === null || _sessionState$user12 === void 0 ? void 0 : _sessionState$user12.level) === 2 && item.pageName === 'drivers') && !((sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user13 = sessionState.user) === null || _sessionState$user13 === void 0 ? void 0 : _sessionState$user13.level) === 5 && item.pageName === 'appointments') && (item.pageName === 'appointments' ? isEnabledAppointmentsFeature && /*#__PURE__*/_react.default.createElement(_styles.SubMenu, {
409
410
  key: item.id,
410
411
  active: location.pathname.includes(item.url),
411
412
  onClick: function onClick() {
@@ -422,19 +423,19 @@ var SidebarMenuUI = function SidebarMenuUI(props) {
422
423
  });
423
424
  }
424
425
  }, (0, _utils.firstLetterCapital)(item.title)));
425
- })))), (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user13 = sessionState.user) === null || _sessionState$user13 === void 0 ? void 0 : _sessionState$user13.level) !== 5 && (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user14 = sessionState.user) === null || _sessionState$user14 === void 0 ? void 0 : _sessionState$user14.level) !== 8 && /*#__PURE__*/_react.default.createElement(_styles.MenuContainer, null, /*#__PURE__*/_react.default.createElement(ContextAwareToggle, {
426
+ })))), (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user14 = sessionState.user) === null || _sessionState$user14 === void 0 ? void 0 : _sessionState$user14.level) !== 5 && (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user15 = sessionState.user) === null || _sessionState$user15 === void 0 ? void 0 : _sessionState$user15.level) !== 8 && /*#__PURE__*/_react.default.createElement(_styles.MenuContainer, null, /*#__PURE__*/_react.default.createElement(ContextAwareToggle, {
426
427
  eventKey: "2",
427
428
  page: "messages",
428
429
  handleGoToPage: handleGoToPage,
429
430
  active: location.pathname === '/messages'
430
- }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.Chat, null), /*#__PURE__*/_react.default.createElement("span", null, t('MESSAGES', 'Messages')))), (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user15 = sessionState.user) === null || _sessionState$user15 === void 0 ? void 0 : _sessionState$user15.level) !== 5 && (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user16 = sessionState.user) === null || _sessionState$user16 === void 0 ? void 0 : _sessionState$user16.level) !== 8 && /*#__PURE__*/_react.default.createElement(_styles.MenuContainer, null, /*#__PURE__*/_react.default.createElement(ContextAwareToggle, {
431
+ }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.Chat, null), /*#__PURE__*/_react.default.createElement("span", null, t('MESSAGES', 'Messages')))), (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user16 = sessionState.user) === null || _sessionState$user16 === void 0 ? void 0 : _sessionState$user16.level) !== 5 && (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user17 = sessionState.user) === null || _sessionState$user17 === void 0 ? void 0 : _sessionState$user17.level) !== 8 && /*#__PURE__*/_react.default.createElement(_styles.MenuContainer, null, /*#__PURE__*/_react.default.createElement(ContextAwareToggle, {
431
432
  eventKey: "3",
432
433
  active: location.pathname.includes('stores')
433
434
  }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.Shop, null), /*#__PURE__*/_react.default.createElement("span", null, t('STORES', 'Stores'))), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Collapse, {
434
435
  eventKey: "3"
435
436
  }, /*#__PURE__*/_react.default.createElement(_styles.MenuContent, null, storesSubMenus.map(function (item) {
436
- var _sessionState$user17;
437
- return !((sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user17 = sessionState.user) === null || _sessionState$user17 === void 0 ? void 0 : _sessionState$user17.level) === 2 && item.pageName === 'brand') && /*#__PURE__*/_react.default.createElement(_styles.SubMenu, {
437
+ var _sessionState$user18;
438
+ return !((sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user18 = sessionState.user) === null || _sessionState$user18 === void 0 ? void 0 : _sessionState$user18.level) === 2 && item.pageName === 'brand') && /*#__PURE__*/_react.default.createElement(_styles.SubMenu, {
438
439
  key: item.id,
439
440
  active: location.pathname.includes(item === null || item === void 0 ? void 0 : item.url),
440
441
  onClick: function onClick() {
@@ -443,12 +444,12 @@ var SidebarMenuUI = function SidebarMenuUI(props) {
443
444
  });
444
445
  }
445
446
  }, item.title);
446
- })))), ((sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user18 = sessionState.user) === null || _sessionState$user18 === void 0 ? void 0 : _sessionState$user18.level) === 0 || (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user19 = sessionState.user) === null || _sessionState$user19 === void 0 ? void 0 : _sessionState$user19.level) === 2) && /*#__PURE__*/_react.default.createElement(_styles.MenuContainer, null, /*#__PURE__*/_react.default.createElement(ContextAwareToggle, {
447
+ })))), ((sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user19 = sessionState.user) === null || _sessionState$user19 === void 0 ? void 0 : _sessionState$user19.level) === 0 || (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user20 = sessionState.user) === null || _sessionState$user20 === void 0 ? void 0 : _sessionState$user20.level) === 2) && /*#__PURE__*/_react.default.createElement(_styles.MenuContainer, null, /*#__PURE__*/_react.default.createElement(ContextAwareToggle, {
447
448
  eventKey: "4",
448
449
  active: location.pathname === '/users/customers' || location.pathname === '/users/managers' || location.pathname === '/users/operation' || location.pathname === '/users/professionals'
449
450
  }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.People, null), /*#__PURE__*/_react.default.createElement("span", null, t('USERS', 'Users'))), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Collapse, {
450
451
  eventKey: "4"
451
- }, /*#__PURE__*/_react.default.createElement(_styles.MenuContent, null, ((sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user20 = sessionState.user) === null || _sessionState$user20 === void 0 ? void 0 : _sessionState$user20.level) === 2 ? usersSubMenus.filter(function (menu) {
452
+ }, /*#__PURE__*/_react.default.createElement(_styles.MenuContent, null, ((sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user21 = sessionState.user) === null || _sessionState$user21 === void 0 ? void 0 : _sessionState$user21.level) === 2 ? usersSubMenus.filter(function (menu) {
452
453
  return buisnessOwnerUsersMenuIncluded.includes(menu.id);
453
454
  }) : usersSubMenus).map(function (item) {
454
455
  return item.pageName === 'professionals' ? isEnabledAppointmentsFeature && /*#__PURE__*/_react.default.createElement(_styles.SubMenu, {
@@ -468,12 +469,12 @@ var SidebarMenuUI = function SidebarMenuUI(props) {
468
469
  });
469
470
  }
470
471
  }, item.title);
471
- })))), (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user21 = sessionState.user) === null || _sessionState$user21 === void 0 ? void 0 : _sessionState$user21.level) !== 5 && (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user22 = sessionState.user) === null || _sessionState$user22 === void 0 ? void 0 : _sessionState$user22.level) !== 8 && /*#__PURE__*/_react.default.createElement(_styles.MenuContainer, null, /*#__PURE__*/_react.default.createElement(ContextAwareToggle, {
472
+ })))), (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user22 = sessionState.user) === null || _sessionState$user22 === void 0 ? void 0 : _sessionState$user22.level) !== 5 && (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user23 = sessionState.user) === null || _sessionState$user23 === void 0 ? void 0 : _sessionState$user23.level) !== 8 && /*#__PURE__*/_react.default.createElement(_styles.MenuContainer, null, /*#__PURE__*/_react.default.createElement(ContextAwareToggle, {
472
473
  eventKey: "5",
473
474
  active: location.pathname === '/intelligence/business' || location.pathname === '/intelligence/drivers' || location.pathname.includes('/intelligence/reviews') || location.pathname === '/intelligence/invoice' || location.pathname === '/intelligence/reports'
474
475
  }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.BarChartLine, null), /*#__PURE__*/_react.default.createElement("span", null, (0, _utils.firstLetterCapital)(t('BUSINESS_INTELLIGENCE', 'Business Intelligence')))), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Collapse, {
475
476
  eventKey: "5"
476
- }, /*#__PURE__*/_react.default.createElement(_styles.MenuContent, null, ((sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user23 = sessionState.user) === null || _sessionState$user23 === void 0 ? void 0 : _sessionState$user23.level) === 2 ? businessIntelligenceSubMenus.filter(function (menu) {
477
+ }, /*#__PURE__*/_react.default.createElement(_styles.MenuContent, null, ((sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user24 = sessionState.user) === null || _sessionState$user24 === void 0 ? void 0 : _sessionState$user24.level) === 2 ? businessIntelligenceSubMenus.filter(function (menu) {
477
478
  return businessOwnerIntelligencesIncluded.includes(menu.id);
478
479
  }) : businessIntelligenceSubMenus).map(function (item) {
479
480
  return /*#__PURE__*/_react.default.createElement(_styles.SubMenu, {
@@ -485,7 +486,7 @@ var SidebarMenuUI = function SidebarMenuUI(props) {
485
486
  });
486
487
  }
487
488
  }, (0, _utils.firstLetterCapital)(item.title));
488
- })))), ((sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user24 = sessionState.user) === null || _sessionState$user24 === void 0 ? void 0 : _sessionState$user24.level) === 0 || (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user25 = sessionState.user) === null || _sessionState$user25 === void 0 ? void 0 : _sessionState$user25.level) === 5) && /*#__PURE__*/_react.default.createElement(_styles.MenuContainer, null, /*#__PURE__*/_react.default.createElement(ContextAwareToggle, {
489
+ })))), ((sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user25 = sessionState.user) === null || _sessionState$user25 === void 0 ? void 0 : _sessionState$user25.level) === 0 || (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user26 = sessionState.user) === null || _sessionState$user26 === void 0 ? void 0 : _sessionState$user26.level) === 5) && /*#__PURE__*/_react.default.createElement(_styles.MenuContainer, null, /*#__PURE__*/_react.default.createElement(ContextAwareToggle, {
489
490
  eventKey: "7",
490
491
  active: location.pathname === '/delivery/drivers-list' || location.pathname === '/delivery/drivers-managers' || location.pathname === '/delivery/drivers-companies' || location.pathname === '/delivery/drivers-groups'
491
492
  }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.Truck, null), /*#__PURE__*/_react.default.createElement("span", null, t('DELIVERY', 'Delivery'))), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Collapse, {
@@ -500,7 +501,7 @@ var SidebarMenuUI = function SidebarMenuUI(props) {
500
501
  });
501
502
  }
502
503
  }, (0, _utils.firstLetterCapital)(item.title));
503
- })))), (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user26 = sessionState.user) === null || _sessionState$user26 === void 0 ? void 0 : _sessionState$user26.level) === 0 && /*#__PURE__*/_react.default.createElement(_styles.MenuContainer, null, /*#__PURE__*/_react.default.createElement(ContextAwareToggle, {
504
+ })))), (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user27 = sessionState.user) === null || _sessionState$user27 === void 0 ? void 0 : _sessionState$user27.level) === 0 && /*#__PURE__*/_react.default.createElement(_styles.MenuContainer, null, /*#__PURE__*/_react.default.createElement(ContextAwareToggle, {
504
505
  eventKey: "8",
505
506
  active: location.pathname === '/marketing/promotions-enterprise' || location.pathname === '/marketing/campaign' || location.pathname === '/marketing/ad-banners'
506
507
  }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.GraphUp, null), /*#__PURE__*/_react.default.createElement("span", null, t('MARKETING', 'Marketing'))), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Collapse, {
@@ -515,7 +516,7 @@ var SidebarMenuUI = function SidebarMenuUI(props) {
515
516
  });
516
517
  }
517
518
  }, (0, _utils.firstLetterCapital)(item.title));
518
- })))), (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user27 = sessionState.user) === null || _sessionState$user27 === void 0 ? void 0 : _sessionState$user27.level) === 0 && /*#__PURE__*/_react.default.createElement(_styles.MenuContainer, null, /*#__PURE__*/_react.default.createElement(ContextAwareToggle, {
519
+ })))), (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user28 = sessionState.user) === null || _sessionState$user28 === void 0 ? void 0 : _sessionState$user28.level) === 0 && /*#__PURE__*/_react.default.createElement(_styles.MenuContainer, null, /*#__PURE__*/_react.default.createElement(ContextAwareToggle, {
519
520
  eventKey: "9",
520
521
  active: location.pathname === '/loyalty/rewards-programs' || location.pathname === '/loyalty/levels' || location.pathname === '/loyalty/reports'
521
522
  }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.Award, null), /*#__PURE__*/_react.default.createElement("span", null, t('LOYALTY', 'Loyalty'))), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Collapse, {
@@ -530,7 +531,7 @@ var SidebarMenuUI = function SidebarMenuUI(props) {
530
531
  });
531
532
  }
532
533
  }, (0, _utils.firstLetterCapital)(item.title));
533
- })))), (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user28 = sessionState.user) === null || _sessionState$user28 === void 0 ? void 0 : _sessionState$user28.level) === 0 && /*#__PURE__*/_react.default.createElement(_styles.MenuContainer, null, /*#__PURE__*/_react.default.createElement(ContextAwareToggle, {
534
+ })))), (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user29 = sessionState.user) === null || _sessionState$user29 === void 0 ? void 0 : _sessionState$user29.level) === 0 && /*#__PURE__*/_react.default.createElement(_styles.MenuContainer, null, /*#__PURE__*/_react.default.createElement(ContextAwareToggle, {
534
535
  eventKey: "10",
535
536
  active: location.pathname === '/cart-recovery/open-carts' || location.pathname === '/cart-recovery/recovery-actions'
536
537
  }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.Cart3, null), /*#__PURE__*/_react.default.createElement("span", null, t('CART_RECOVERY', 'Cart recovery'))), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Collapse, {
@@ -545,7 +546,7 @@ var SidebarMenuUI = function SidebarMenuUI(props) {
545
546
  });
546
547
  }
547
548
  }, (0, _utils.firstLetterCapital)(item.title));
548
- })))), (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user29 = sessionState.user) === null || _sessionState$user29 === void 0 ? void 0 : _sessionState$user29.level) === 0 && /*#__PURE__*/_react.default.createElement(_styles.MenuContainer, null, /*#__PURE__*/_react.default.createElement("span", null, t('SALES_CHANNELS_AND_PRODUCTS', 'Sales channels and products')), /*#__PURE__*/_react.default.createElement(ContextAwareToggle, {
549
+ })))), (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user30 = sessionState.user) === null || _sessionState$user30 === void 0 ? void 0 : _sessionState$user30.level) === 0 && /*#__PURE__*/_react.default.createElement(_styles.MenuContainer, null, /*#__PURE__*/_react.default.createElement("span", null, t('SALES_CHANNELS_AND_PRODUCTS', 'Sales channels and products')), /*#__PURE__*/_react.default.createElement(ContextAwareToggle, {
549
550
  eventKey: "12",
550
551
  active: location.pathname === '/my-products/ordering-website' || location.pathname === '/my-products/customer-app' || location.pathname === '/my-products/store-app' || location.pathname === '/my-products/driver-app' || location.pathname === '/my-products/pos-app' || location.pathname === '/my-products/call-center-app' || location.pathname === '/my-products/kiosk-app' || location.pathname === '/my-products/custom-project'
551
552
  }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.BagCheck, null), /*#__PURE__*/_react.default.createElement("span", null, t('MY_PRODUCTS', 'My products'))), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Collapse, {
@@ -562,7 +563,7 @@ var SidebarMenuUI = function SidebarMenuUI(props) {
562
563
  }, item.title);
563
564
  })))))), /*#__PURE__*/_react.default.createElement("div", {
564
565
  className: "d-flex flex-column mt-4"
565
- }, /*#__PURE__*/_react.default.createElement(_styles.LanguageSelectorContainer, null, /*#__PURE__*/_react.default.createElement(_LanguageSelector.LanguageSelector, null)), (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user30 = sessionState.user) === null || _sessionState$user30 === void 0 ? void 0 : _sessionState$user30.level) === 0 && /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion, null, /*#__PURE__*/_react.default.createElement(_styles.MenuContainer, null, /*#__PURE__*/_react.default.createElement(ContextAwareToggle, {
566
+ }, /*#__PURE__*/_react.default.createElement(_styles.LanguageSelectorContainer, null, /*#__PURE__*/_react.default.createElement(_LanguageSelector.LanguageSelector, null)), (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user31 = sessionState.user) === null || _sessionState$user31 === void 0 ? void 0 : _sessionState$user31.level) === 0 && /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion, null, /*#__PURE__*/_react.default.createElement(_styles.MenuContainer, null, /*#__PURE__*/_react.default.createElement(ContextAwareToggle, {
566
567
  eventKey: "5",
567
568
  active: location.pathname === '/settings/basic' || location.pathname === '/settings/operation' || location.pathname === '/settings/plugin' || location.pathname === '/settings/pages' || location.pathname === '/settings/integrations' || location.pathname === '/settings/places' || location.pathname === '/settings/advanced' || location.pathname === '/settings/language'
568
569
  }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.Gear, null), /*#__PURE__*/_react.default.createElement("span", null, t('SETTINGS', 'Settings'))), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Collapse, {
@@ -577,7 +578,7 @@ var SidebarMenuUI = function SidebarMenuUI(props) {
577
578
  });
578
579
  }
579
580
  }, (0, _utils.firstLetterCapital)(item.title));
580
- }))))), (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user31 = sessionState.user) === null || _sessionState$user31 === void 0 ? void 0 : _sessionState$user31.level) === 0 && /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
581
+ }))))), (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user32 = sessionState.user) === null || _sessionState$user32 === void 0 ? void 0 : _sessionState$user32.level) === 0 && /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
581
582
  className: "d-flex align-items-center",
582
583
  variant: location.pathname === '/support' && 'primary',
583
584
  onClick: function onClick() {
@@ -585,7 +586,7 @@ var SidebarMenuUI = function SidebarMenuUI(props) {
585
586
  page: 'support'
586
587
  });
587
588
  }
588
- }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.Headset, null), /*#__PURE__*/_react.default.createElement("span", null, t('SUPPORT', 'Support'))), (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user32 = sessionState.user) === null || _sessionState$user32 === void 0 ? void 0 : _sessionState$user32.level) === 0 && /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
589
+ }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.Headset, null), /*#__PURE__*/_react.default.createElement("span", null, t('SUPPORT', 'Support'))), (sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user33 = sessionState.user) === null || _sessionState$user33 === void 0 ? void 0 : _sessionState$user33.level) === 0 && /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
589
590
  className: "d-flex align-items-center",
590
591
  variant: false,
591
592
  onClick: function onClick() {
@@ -602,12 +603,12 @@ var SidebarMenuUI = function SidebarMenuUI(props) {
602
603
  page: 'profile'
603
604
  });
604
605
  }
605
- }, sessionState !== null && sessionState !== void 0 && (_sessionState$user33 = sessionState.user) !== null && _sessionState$user33 !== void 0 && _sessionState$user33.photo ? /*#__PURE__*/_react.default.createElement(_reactBootstrap.Image, {
606
- src: sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user34 = sessionState.user) === null || _sessionState$user34 === void 0 ? void 0 : _sessionState$user34.photo,
606
+ }, sessionState !== null && sessionState !== void 0 && (_sessionState$user34 = sessionState.user) !== null && _sessionState$user34 !== void 0 && _sessionState$user34.photo ? /*#__PURE__*/_react.default.createElement(_reactBootstrap.Image, {
607
+ src: sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user35 = sessionState.user) === null || _sessionState$user35 === void 0 ? void 0 : _sessionState$user35.photo,
607
608
  width: "30px",
608
609
  height: "30px",
609
610
  roundedCircle: true
610
- }) : /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.PersonFill, null), /*#__PURE__*/_react.default.createElement("span", null, sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user35 = sessionState.user) === null || _sessionState$user35 === void 0 ? void 0 : _sessionState$user35.name, " ", sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user36 = sessionState.user) === null || _sessionState$user36 === void 0 ? void 0 : _sessionState$user36.lastname)), /*#__PURE__*/_react.default.createElement(_LogoutButton.LogoutButton, null))))));
611
+ }) : /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.PersonFill, null), /*#__PURE__*/_react.default.createElement("span", null, sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user36 = sessionState.user) === null || _sessionState$user36 === void 0 ? void 0 : _sessionState$user36.name, " ", sessionState === null || sessionState === void 0 ? void 0 : (_sessionState$user37 = sessionState.user) === null || _sessionState$user37 === void 0 ? void 0 : _sessionState$user37.lastname)), /*#__PURE__*/_react.default.createElement(_LogoutButton.LogoutButton, null))))));
611
612
  };
612
613
  var ContextAwareToggle = function ContextAwareToggle(_ref2) {
613
614
  var children = _ref2.children,
@@ -89,22 +89,23 @@ var BusinessLocation = function BusinessLocation(props) {
89
89
  var getTimeZone = /*#__PURE__*/function () {
90
90
  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(address) {
91
91
  var _address$location, _address$location2;
92
- var date, timestamp, url, response, result;
92
+ var date, timestamp, timezoneApiKey, url, response, result;
93
93
  return _regeneratorRuntime().wrap(function _callee$(_context) {
94
94
  while (1) switch (_context.prev = _context.next) {
95
95
  case 0:
96
96
  date = new Date();
97
97
  timestamp = Math.floor(date.getTime() / 1000);
98
- url = "https://maps.googleapis.com/maps/api/timezone/json?location=".concat(address === null || address === void 0 ? void 0 : (_address$location = address.location) === null || _address$location === void 0 ? void 0 : _address$location.lat, ",").concat(address === null || address === void 0 ? void 0 : (_address$location2 = address.location) === null || _address$location2 === void 0 ? void 0 : _address$location2.lng, "&timestamp=").concat(timestamp, "&key=").concat(googleMapsApiKey);
99
- _context.next = 5;
98
+ timezoneApiKey = googleMapsApiKey === 'AIzaSyBvsSkMYPSDSkdk7YFrSf5FoGonIzr6fJ0' ? 'AIzaSyCYPCOfiTo9jxuxLWnWTup6mmICPxfLegI' : googleMapsApiKey;
99
+ url = "https://maps.googleapis.com/maps/api/timezone/json?location=".concat(address === null || address === void 0 ? void 0 : (_address$location = address.location) === null || _address$location === void 0 ? void 0 : _address$location.lat, ",").concat(address === null || address === void 0 ? void 0 : (_address$location2 = address.location) === null || _address$location2 === void 0 ? void 0 : _address$location2.lng, "&timestamp=").concat(timestamp, "&key=").concat(timezoneApiKey);
100
+ _context.next = 6;
100
101
  return fetch(url, {
101
102
  method: 'GET'
102
103
  });
103
- case 5:
104
+ case 6:
104
105
  response = _context.sent;
105
- _context.next = 8;
106
+ _context.next = 9;
106
107
  return response.json();
107
- case 8:
108
+ case 9:
108
109
  result = _context.sent;
109
110
  setFormState(function (prevState) {
110
111
  return _objectSpread(_objectSpread({}, prevState), {}, {
@@ -118,7 +119,7 @@ var BusinessLocation = function BusinessLocation(props) {
118
119
  })
119
120
  });
120
121
  });
121
- case 10:
122
+ case 11:
122
123
  case "end":
123
124
  return _context.stop();
124
125
  }
@@ -125,18 +125,6 @@ var BusinessPreorderDetails = function BusinessPreorderDetails(props) {
125
125
  color: "primary",
126
126
  disabled: formState.loading || Object.keys(formState.changes).length === 0,
127
127
  onClick: handleUpdateBusinessClick
128
- }, t('SAVE', 'Save'))), /*#__PURE__*/_react.default.createElement(_styles3.Divider, null), /*#__PURE__*/_react.default.createElement(_BusinessCateringDelivery.BusinessCateringDelivery, {
129
- minutes: minutes,
130
- type: "catering_delivery",
131
- business: business,
132
- changePreorderConfigs: changePreorderConfigs,
133
- disabled: actionStatus === null || actionStatus === void 0 ? void 0 : actionStatus.loading
134
- }), /*#__PURE__*/_react.default.createElement(_BusinessCateringDelivery.BusinessCateringDelivery, {
135
- minutes: minutes,
136
- type: "catering_pickup",
137
- business: business,
138
- changePreorderConfigs: changePreorderConfigs,
139
- disabled: actionStatus === null || actionStatus === void 0 ? void 0 : actionStatus.loading
140
- }), /*#__PURE__*/_react.default.createElement(_styles2.Margin, null));
128
+ }, t('SAVE', 'Save'))));
141
129
  };
142
130
  exports.BusinessPreorderDetails = BusinessPreorderDetails;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ordering-ui-admin-external",
3
- "version": "1.18.0",
3
+ "version": "1.19.0",
4
4
  "description": "Ordering UI Admin Components",
5
5
  "main": "./_modules/index.js",
6
6
  "exports": {
@@ -83,7 +83,7 @@
83
83
  "lodash": "^4.17.20",
84
84
  "moment": "^2.29.1",
85
85
  "moment-range": "^4.0.2",
86
- "ordering-components-admin-external": "1.18.1",
86
+ "ordering-components-admin-external": "1.19.0",
87
87
  "polished": "^3.6.7",
88
88
  "prop-types": "^15.7.2",
89
89
  "react-big-calendar": "^1.4.2",
@@ -249,13 +249,13 @@ const HomeUI = (props) => {
249
249
  >
250
250
  {project[projectStatus.project?.current_status]?.status}
251
251
  </ProjectCurrentStatus>
252
- {/* <Button
252
+ <Button
253
253
  color='primary'
254
254
  borderRadius='8px'
255
255
  onClick={() => window.open(`https://${ordering?.project}.tryordering.com`, '_blank')}
256
256
  >
257
257
  {t('VISIT_MY_WEBSITE', 'Visit my Website')}
258
- </Button> */}
258
+ </Button>
259
259
  </ProjectStatusWrapper>
260
260
  </ProjectInfoWrapper>
261
261
  <img src={project[projectStatus.project?.current_status]?.image} alt='' />
@@ -498,10 +498,13 @@ const LoginFormUI = (props) => {
498
498
  }
499
499
 
500
500
  export const LoginForm = (props) => {
501
+ const [configFile, setConfigFile] = useContext(ConfigFileContext)
501
502
  const loginControllerProps = {
502
503
  ...props,
503
504
  UIComponent: LoginFormUI,
504
- allowedLevels: [0, 2, 5, 8]
505
+ allowedLevels: [0, 2, 5, 8],
506
+ configFile,
507
+ setConfigFile
505
508
  }
506
509
  return <LoginFormController {...loginControllerProps} />
507
510
  }
@@ -136,7 +136,7 @@ const EnterprisePromotionListingUI = (props) => {
136
136
  sitesState={sitesState}
137
137
  businessesList={businessesList}
138
138
  paymethodsState={paymethodsState}
139
- promotion={selectedPromotion}
139
+ promotion={selectedPromotion || {}}
140
140
  promotionId={curPromotionId}
141
141
  promotionsList={promotionListState.promotions}
142
142
  handleSuccessUpdatePromotions={handleSuccessUpdatePromotions}
@@ -207,7 +207,7 @@ const MessagesListingUI = (props) => {
207
207
  open={isOpenOrderDetail}
208
208
  order={detailsOrder}
209
209
  orderId={orderDetailId}
210
- driversList={driversList}
210
+ drivers={driversList.drivers}
211
211
  onClose={() => setIsOpenOrderDetail(false)}
212
212
  />
213
213
  )}
@@ -8,8 +8,11 @@ import {
8
8
  Image as DumyPhoto,
9
9
  CheckSquareFill as CheckedIcon,
10
10
  Square as UnCheckedIcon,
11
- InfoCircle
11
+ InfoCircle,
12
+ RecordCircleFill,
13
+ Circle
12
14
  } from 'react-bootstrap-icons'
15
+
13
16
  import { useTheme } from 'styled-components'
14
17
  import { Alert, Modal, ImageCrop, ColorPicker } from '../../Shared'
15
18
  import { ContentForm } from '../ContentForm'
@@ -39,7 +42,9 @@ import {
39
42
  Tabs,
40
43
  Tab,
41
44
  HeaderInfoWrapper,
42
- InfoContent
45
+ InfoContent,
46
+ RadioItem,
47
+ SlugWrapper
43
48
  } from './styles'
44
49
  import Skeleton from 'react-loading-skeleton'
45
50
  import { AdvancedSettings } from '../AdvancedSettings'
@@ -302,6 +307,65 @@ const OrderingWebsiteUI = (props) => {
302
307
  </FormGroup>
303
308
  </InnerBlock>
304
309
  </InputFormWrapper>
310
+ <InputFormWrapper>
311
+ <InnerBlock>
312
+ <h4>{t('WEBSITE_THEME', 'Website Theme')}</h4>
313
+ {orderingTheme?.loading ? (
314
+ <Skeleton height={20} width={150} />
315
+ ) : (
316
+ <>
317
+ <RadioItem
318
+ onClick={() => handleChangeValue('marketplace', 'website_theme', 'type')}
319
+ >
320
+ {themeValues?.website_theme?.components?.type === 'marketplace' ? <RecordCircleFill className='active' /> : <Circle />}
321
+ <span>{t('MARKETPLACE', 'Marketplace')}</span>
322
+ </RadioItem>
323
+
324
+ <RadioItem
325
+ onClick={() => handleChangeValue('franchise', 'website_theme', 'type')}
326
+ >
327
+ {themeValues?.website_theme?.components?.type === 'franchise' ? <RecordCircleFill className='active' /> : <Circle />}
328
+ <span>{t('REPORT_HEADER_FRANCHISES', 'Franchise')}</span>
329
+ </RadioItem>
330
+ {themeValues?.website_theme?.components?.type === 'franchise' && (
331
+ <SlugWrapper>
332
+ <label>{t('FRANCHISE_SLUG', 'Franchise slug')}</label>
333
+ <Input
334
+ name='name'
335
+ placeholder={t('SLUG', 'Slug')}
336
+ value={themeValues?.website_theme?.components?.franchise_slug || ''}
337
+ onChange={e => handleChangeValue(e.target.value, 'website_theme', 'franchise_slug')}
338
+ onKeyPress={e => {
339
+ if (e.which === 32) { e.preventDefault() }
340
+ }}
341
+ />
342
+ </SlugWrapper>
343
+ )}
344
+
345
+ <RadioItem
346
+ onClick={() => handleChangeValue('single_store', 'website_theme', 'type')}
347
+ >
348
+ {themeValues?.website_theme?.components?.type === 'single_store' ? <RecordCircleFill className='active' /> : <Circle />}
349
+ <span>{t('SINGLE_STORE', 'Single Store')}</span>
350
+ </RadioItem>
351
+ {themeValues?.website_theme?.components?.type === 'single_store' && (
352
+ <SlugWrapper>
353
+ <label>{t('BUSINESS_SLUG', 'Business slug')}</label>
354
+ <Input
355
+ name='name'
356
+ placeholder={t('SLUG', 'Slug')}
357
+ value={themeValues?.website_theme?.components?.business_slug || ''}
358
+ onChange={e => handleChangeValue(e.target.value, 'website_theme', 'business_slug')}
359
+ onKeyPress={e => {
360
+ if (e.which === 32) { e.preventDefault() }
361
+ }}
362
+ />
363
+ </SlugWrapper>
364
+ )}
365
+ </>
366
+ )}
367
+ </InnerBlock>
368
+ </InputFormWrapper>
305
369
  <InputFormWrapper>
306
370
  <h4>{t('IMAGES', 'Images')}</h4>
307
371
  <InnerBlock>
@@ -448,3 +448,40 @@ export const InfoContent = styled.div`
448
448
  min-width: 535px;
449
449
  }
450
450
  `
451
+ export const RadioItem = styled.div`
452
+ display: flex;
453
+ align-items: center;
454
+ padding: 12px 0;
455
+ cursor: pointer;
456
+
457
+ svg {
458
+ font-size: 16px;
459
+ color: ${props => props.theme.colors.secundaryLight};
460
+ &.active {
461
+ color: ${props => props.theme.colors.primary};
462
+ }
463
+ margin-right: 20px;
464
+ ${props => props.theme.rtl && css`
465
+ margin-left: 20px;
466
+ margin-right: 0px;
467
+ `}
468
+ }
469
+ span {
470
+ font-weight: 400;
471
+ font-size: 14px;
472
+ line-height: 24px;
473
+ }
474
+ `
475
+ export const SlugWrapper = styled.div`
476
+ margin-bottom: 20px;
477
+ label {
478
+ display: block;
479
+ margin-bottom: 12px;
480
+ font-weight: 400;
481
+ font-size: 14px;
482
+ line-height: 24px;
483
+ }
484
+ > input, textarea {
485
+ width: 100%;
486
+ }
487
+ `
@@ -84,12 +84,16 @@ const SiteThemeUI = (props) => {
84
84
  }, [themesList])
85
85
 
86
86
  const recursiveAssign = (a, b) => {
87
- if (Object(b) !== b) return b
88
- if (Object(a) !== a) a = {}
87
+ if (b) {
88
+ if (Object(b) !== b) return b
89
+ if (Object(a) !== a) a = {}
89
90
  for (const key in b) {
90
91
  a[key] = recursiveAssign(a[key], b[key])
91
92
  }
92
93
  return a
94
+ } else {
95
+ return a
96
+ }
93
97
  }
94
98
 
95
99
  useEffect(() => {
@@ -164,7 +168,7 @@ const SiteThemeUI = (props) => {
164
168
  const optionObject = components[block][option]
165
169
  return (
166
170
  <React.Fragment key={option}>
167
- {typeof themeValues[selectedPage].components?.[block]?.[option] !== 'undefined' && (
171
+ {typeof themeValues[selectedPage]?.components?.[block]?.[option] !== 'undefined' && (
168
172
  <ThemeOption
169
173
  name={option}
170
174
  optionObject={optionObject}
@@ -115,7 +115,7 @@ const DeliveriesManagerUI = (props) => {
115
115
  open={isOpenOrderDetail}
116
116
  order={detailsOrder}
117
117
  orderId={orderDetailId}
118
- driversList={driversList}
118
+ drivers={driversList.drivers}
119
119
  onClose={() => handleBackRedirect()}
120
120
  />
121
121
  )}