ordering-ui-external 1.9.6 → 2.0.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 (96) hide show
  1. package/_bundles/{0.ordering-ui.55652fab015bca672f9d.js → 0.ordering-ui.32113e17b220a7b5ae09.js} +1 -1
  2. package/_bundles/{1.ordering-ui.55652fab015bca672f9d.js → 1.ordering-ui.32113e17b220a7b5ae09.js} +1 -1
  3. package/_bundles/{2.ordering-ui.55652fab015bca672f9d.js → 2.ordering-ui.32113e17b220a7b5ae09.js} +1 -1
  4. package/_bundles/{4.ordering-ui.55652fab015bca672f9d.js → 4.ordering-ui.32113e17b220a7b5ae09.js} +1 -1
  5. package/_bundles/{5.ordering-ui.55652fab015bca672f9d.js → 5.ordering-ui.32113e17b220a7b5ae09.js} +1 -1
  6. package/_bundles/{6.ordering-ui.55652fab015bca672f9d.js → 6.ordering-ui.32113e17b220a7b5ae09.js} +1 -1
  7. package/_bundles/{7.ordering-ui.55652fab015bca672f9d.js → 7.ordering-ui.32113e17b220a7b5ae09.js} +2 -2
  8. package/_bundles/{7.ordering-ui.55652fab015bca672f9d.js.LICENSE.txt → 7.ordering-ui.32113e17b220a7b5ae09.js.LICENSE.txt} +0 -0
  9. package/_bundles/{8.ordering-ui.55652fab015bca672f9d.js → 8.ordering-ui.32113e17b220a7b5ae09.js} +1 -1
  10. package/_bundles/{9.ordering-ui.55652fab015bca672f9d.js → 9.ordering-ui.32113e17b220a7b5ae09.js} +1 -1
  11. package/_bundles/ordering-ui.32113e17b220a7b5ae09.js +2 -0
  12. package/_bundles/{ordering-ui.55652fab015bca672f9d.js.LICENSE.txt → ordering-ui.32113e17b220a7b5ae09.js.LICENSE.txt} +0 -0
  13. package/_modules/components/Confirm/index.js +4 -2
  14. package/_modules/components/Header/index.js +4 -2
  15. package/_modules/components/SmartAppBanner/index.js +4 -2
  16. package/_modules/themes/callcenterOriginal/src/components/Orders/OrdersTable/index.js +32 -11
  17. package/_modules/themes/callcenterOriginal/src/components/Orders/OrdersTable/styles.js +1 -1
  18. package/_modules/themes/five/src/components/Cart/index.js +5 -5
  19. package/_modules/themes/five/src/components/Checkout/index.js +4 -0
  20. package/_modules/themes/five/src/components/Footer/index.js +4 -2
  21. package/_modules/themes/five/src/components/Header/layouts/Kiosk/index.js +4 -2
  22. package/_modules/themes/five/src/components/Modal/index.js +4 -2
  23. package/_modules/themes/five/src/components/MultiCartsPaymethodsAndWallets/index.js +1 -1
  24. package/_modules/themes/five/src/components/MultiCheckout/index.js +12 -10
  25. package/_modules/themes/five/src/components/MultiOrdersDetails/SingleOrderCard.js +1 -1
  26. package/_modules/themes/five/src/components/MultiOrdersDetails/index.js +1 -0
  27. package/_modules/themes/five/src/components/NavigationBar/index.js +4 -2
  28. package/_modules/themes/five/src/components/NotNetworkConnectivity/index.js +4 -2
  29. package/_modules/themes/five/src/components/ProductForm/index.js +27 -26
  30. package/_modules/themes/five/src/components/ReviewDriver/index.js +4 -2
  31. package/_modules/themes/five/src/components/ReviewOrder/index.js +4 -2
  32. package/_modules/themes/five/src/components/ReviewProduct/index.js +4 -2
  33. package/_modules/themes/five/src/components/ReviewTrigger/index.js +4 -2
  34. package/_modules/themes/five/src/components/SignUpApproval/index.js +4 -2
  35. package/_modules/themes/five/src/styles/Buttons/index.js +5 -3
  36. package/_modules/themes/five/src/styles/Inputs/index.js +1 -1
  37. package/_modules/themes/seven/src/components/Header/index.js +4 -2
  38. package/_modules/themes/six/src/components/Header/index.js +4 -2
  39. package/package.json +2 -2
  40. package/src/components/CancellationComponent/index.js +31 -27
  41. package/src/components/Confirm/index.js +2 -0
  42. package/src/components/Header/index.js +2 -0
  43. package/src/components/SmartAppBanner/index.js +2 -0
  44. package/src/themes/callcenterOriginal/src/components/Orders/OrdersTable/index.js +43 -19
  45. package/src/themes/callcenterOriginal/src/components/Orders/OrdersTable/styles.js +1 -0
  46. package/src/themes/five/src/components/Cart/index.js +9 -4
  47. package/src/themes/five/src/components/Checkout/index.js +2 -0
  48. package/src/themes/five/src/components/Footer/index.js +2 -0
  49. package/src/themes/five/src/components/Header/layouts/Kiosk/index.js +2 -0
  50. package/src/themes/five/src/components/Modal/index.js +2 -0
  51. package/src/themes/five/src/components/MultiCartsPaymethodsAndWallets/index.js +1 -1
  52. package/src/themes/five/src/components/MultiCheckout/index.js +11 -6
  53. package/src/themes/five/src/components/MultiOrdersDetails/SingleOrderCard.js +1 -1
  54. package/src/themes/five/src/components/MultiOrdersDetails/index.js +1 -0
  55. package/src/themes/five/src/components/NavigationBar/index.js +2 -0
  56. package/src/themes/five/src/components/NotNetworkConnectivity/index.js +2 -0
  57. package/src/themes/five/src/components/ProductForm/index.js +11 -11
  58. package/src/themes/five/src/components/ReviewDriver/index.js +2 -0
  59. package/src/themes/five/src/components/ReviewOrder/index.js +2 -0
  60. package/src/themes/five/src/components/ReviewProduct/index.js +2 -0
  61. package/src/themes/five/src/components/ReviewTrigger/index.js +2 -0
  62. package/src/themes/five/src/components/SignUpApproval/index.js +2 -0
  63. package/src/themes/five/src/styles/Buttons/index.js +3 -1
  64. package/src/themes/five/src/styles/Inputs/index.js +1 -1
  65. package/src/themes/seven/src/components/Header/index.js +2 -0
  66. package/src/themes/six/src/components/Header/index.js +2 -0
  67. package/template/components/HelmetTags/index.js +2 -0
  68. package/template/components/ListenPageChanges/index.js +2 -0
  69. package/template/components/ScrollToTop/index.js +2 -0
  70. package/template/components/SubdomainComponent/index.js +4 -39
  71. package/template/config.json +2 -1
  72. package/template/pages/AddressList/index.js +2 -0
  73. package/template/pages/BusinessListingSearch/index.js +2 -0
  74. package/template/pages/BusinessProductsList/index.js +2 -0
  75. package/template/pages/BusinessesList/index.js +2 -0
  76. package/template/pages/Checkout/index.js +2 -0
  77. package/template/pages/Cms/index.js +2 -0
  78. package/template/pages/Favorite/index.js +2 -0
  79. package/template/pages/Help/index.js +2 -0
  80. package/template/pages/Home/index.js +2 -0
  81. package/template/pages/MessagesList/index.js +2 -0
  82. package/template/pages/MultiCheckout/index.js +5 -0
  83. package/template/pages/MultiOrdersDetails/index.js +2 -0
  84. package/template/pages/MyOrders/index.js +2 -0
  85. package/template/pages/OrderDetails/index.js +2 -0
  86. package/template/pages/PageNotFound/index.js +2 -0
  87. package/template/pages/PagesList/index.js +2 -0
  88. package/template/pages/Profile/index.js +2 -0
  89. package/template/pages/Promotions/index.js +2 -0
  90. package/template/pages/ResetPassword/index.js +2 -0
  91. package/template/pages/SessionsList/index.js +2 -0
  92. package/template/pages/SignUpBusiness/index.js +2 -0
  93. package/template/pages/SignUpDriver/index.js +2 -0
  94. package/template/pages/UserVerification/index.js +2 -0
  95. package/template/pages/Wallets/index.js +2 -0
  96. package/_bundles/ordering-ui.55652fab015bca672f9d.js +0 -2
@@ -54,7 +54,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
54
54
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
55
55
  _swiper.default.use([_swiper.Navigation, _swiper.Thumbs]);
56
56
  var ProductOptionsUI = function ProductOptionsUI(props) {
57
- var _configs$unaddressed_, _theme$defaultLanguag, _theme$defaultLanguag2, _theme$defaultLanguag3, _theme$defaultLanguag4, _props$afterMidElemen, _props$afterMidCompon, _orderState$options, _orderState$options2, _theme$defaultLanguag5, _theme$defaultLanguag6, _theme$defaultLanguag7, _orderState$options3, _orderState$options4, _theme$defaultLanguag8, _theme$defaultLanguag9, _theme$defaultLanguag10, _theme$defaultLanguag11, _theme$defaultLanguag12, _theme$defaultLanguag13, _theme$defaultLanguag14, _error$;
57
+ var _configs$unaddressed_, _theme$defaultLanguag, _product$ingredients2, _product$extras, _product$ingredients3, _product$ingredients4, _product$ingredients5, _product$extras2, _theme$defaultLanguag2, _theme$defaultLanguag3, _props$afterMidElemen, _props$afterMidCompon, _orderState$options, _orderState$options2, _theme$defaultLanguag4, _theme$defaultLanguag5, _theme$defaultLanguag6, _orderState$options3, _orderState$options4, _theme$defaultLanguag7, _theme$defaultLanguag8, _theme$defaultLanguag9, _theme$defaultLanguag10, _theme$defaultLanguag11, _theme$defaultLanguag12, _theme$defaultLanguag13, _error$;
58
58
  var businessSlug = props.businessSlug,
59
59
  editMode = props.editMode,
60
60
  isSoldOut = props.isSoldOut,
@@ -179,7 +179,8 @@ var ProductOptionsUI = function ProductOptionsUI(props) {
179
179
  }
180
180
  };
181
181
  var handleSaveProduct = function handleSaveProduct() {
182
- var isErrors = Object.values(errors).length > 0;
182
+ var _Object$values;
183
+ var isErrors = ((_Object$values = Object.values(errors)) === null || _Object$values === void 0 ? void 0 : _Object$values.length) > 0;
183
184
  if (!isErrors) {
184
185
  handleSave && handleSave();
185
186
  return;
@@ -236,7 +237,7 @@ var ProductOptionsUI = function ProductOptionsUI(props) {
236
237
  };
237
238
  var getOverFlowImage = function getOverFlowImage(url) {
238
239
  var keys = url.split('/');
239
- var _videoId = keys[keys.length - 1];
240
+ var _videoId = keys[(keys === null || keys === void 0 ? void 0 : keys.length) - 1];
240
241
  var overFlowImg = 'http://img.youtube.com/vi/' + _videoId + '/0.jpg';
241
242
  return overFlowImg;
242
243
  };
@@ -251,9 +252,9 @@ var ProductOptionsUI = function ProductOptionsUI(props) {
251
252
  handleChangeProductCartQuantity(quantity);
252
253
  };
253
254
  var scrollDown = function scrollDown() {
254
- var _document$getElements, _document$getElements2;
255
+ var _Object$values2, _document$getElements, _document$getElements2;
255
256
  var adjustHeight = (windowSize === null || windowSize === void 0 ? void 0 : windowSize.width) > 768 ? 50 : 55;
256
- var isErrors = Object.values(errors).length > 0;
257
+ var isErrors = ((_Object$values2 = Object.values(errors)) === null || _Object$values2 === void 0 ? void 0 : _Object$values2.length) > 0;
257
258
  if (!isErrors) {
258
259
  return;
259
260
  }
@@ -289,19 +290,18 @@ var ProductOptionsUI = function ProductOptionsUI(props) {
289
290
  var handleScroll = function handleScroll() {
290
291
  var extraHeight = 60;
291
292
  if ((product === null || product === void 0 ? void 0 : product.ingredients.length) > 0 || (product === null || product === void 0 ? void 0 : product.extras.length) > 0) {
292
- var _product$ingredients, _product$extras;
293
+ var _product$ingredients;
293
294
  var menuList = [];
294
295
  if ((product === null || product === void 0 ? void 0 : (_product$ingredients = product.ingredients) === null || _product$ingredients === void 0 ? void 0 : _product$ingredients.length) > 0) menuList.push('ingredients');
295
- (product === null || product === void 0 ? void 0 : (_product$extras = product.extras) === null || _product$extras === void 0 ? void 0 : _product$extras.length) > 0 && product.extras.sort(function (a, b) {
296
+ (product === null || product === void 0 ? void 0 : product.extras.length) > 0 && (product === null || product === void 0 ? void 0 : product.extras.sort(function (a, b) {
296
297
  return a.rank - b.rank;
297
298
  }).forEach(function (extra) {
298
- var _extra$options;
299
- ((_extra$options = extra.options) === null || _extra$options === void 0 ? void 0 : _extra$options.length) > 0 && extra.options.sort(function (a, b) {
299
+ (extra === null || extra === void 0 ? void 0 : extra.options.length) > 0 && (extra === null || extra === void 0 ? void 0 : extra.options.sort(function (a, b) {
300
300
  return a.rank - b.rank;
301
301
  }).forEach(function (option) {
302
302
  showOption(option) && menuList.push("id_".concat(option === null || option === void 0 ? void 0 : option.id));
303
- });
304
- });
303
+ }));
304
+ }));
305
305
  menuList.forEach(function (menu) {
306
306
  var elementTop = scrollElement.scrollTop;
307
307
  var topPos = document.getElementById(menu).offsetTop;
@@ -525,11 +525,11 @@ var ProductOptionsUI = function ProductOptionsUI(props) {
525
525
  src: optimizeImage((tag === null || tag === void 0 ? void 0 : tag.image) || ((_theme$images2 = theme.images) === null || _theme$images2 === void 0 ? void 0 : (_theme$images2$dummie = _theme$images2.dummies) === null || _theme$images2$dummie === void 0 ? void 0 : _theme$images2$dummie.product), 'h_40,c_limit'),
526
526
  alt: ""
527
527
  }), /*#__PURE__*/_react.default.createElement("span", null, tag.name));
528
- })), /*#__PURE__*/_react.default.createElement(_styles.Divider, null), /*#__PURE__*/_react.default.createElement(_styles.ProductEdition, null, ((product === null || product === void 0 ? void 0 : product.ingredients.length) > 0 || (product === null || product === void 0 ? void 0 : product.extras.length) > 0) && /*#__PURE__*/_react.default.createElement(_styles.ProductTabContainer, {
528
+ })), /*#__PURE__*/_react.default.createElement(_styles.Divider, null), /*#__PURE__*/_react.default.createElement(_styles.ProductEdition, null, ((product === null || product === void 0 ? void 0 : (_product$ingredients2 = product.ingredients) === null || _product$ingredients2 === void 0 ? void 0 : _product$ingredients2.length) > 0 || (product === null || product === void 0 ? void 0 : (_product$extras = product.extras) === null || _product$extras === void 0 ? void 0 : _product$extras.length) > 0) && /*#__PURE__*/_react.default.createElement(_styles.ProductTabContainer, {
529
529
  id: "all"
530
530
  }, /*#__PURE__*/_react.default.createElement(_Tabs.Tabs, null, /*#__PURE__*/_react.default.createElement(_AutoScroll.AutoScroll, {
531
531
  scrollId: "optionList"
532
- }, (product === null || product === void 0 ? void 0 : product.ingredients.length) > 0 && /*#__PURE__*/_react.default.createElement(_Tabs.Tab, {
532
+ }, (product === null || product === void 0 ? void 0 : (_product$ingredients3 = product.ingredients) === null || _product$ingredients3 === void 0 ? void 0 : _product$ingredients3.length) > 0 && /*#__PURE__*/_react.default.createElement(_Tabs.Tab, {
533
533
  key: "ingredients",
534
534
  id: "menu_ingredients",
535
535
  active: tabValue === 'ingredients',
@@ -540,7 +540,8 @@ var ProductOptionsUI = function ProductOptionsUI(props) {
540
540
  }, t('INGREDIENTS', 'ingredients')), product === null || product === void 0 ? void 0 : product.extras.sort(function (a, b) {
541
541
  return a.rank - b.rank;
542
542
  }).map(function (extra) {
543
- return extra.options.sort(function (a, b) {
543
+ var _extra$options;
544
+ return (_extra$options = extra.options) === null || _extra$options === void 0 ? void 0 : _extra$options.sort(function (a, b) {
544
545
  return a.rank - b.rank;
545
546
  }).map(function (option) {
546
547
  return showOption(option) && /*#__PURE__*/_react.default.createElement(_Tabs.Tab, {
@@ -553,9 +554,9 @@ var ProductOptionsUI = function ProductOptionsUI(props) {
553
554
  borderBottom: true
554
555
  }, option === null || option === void 0 ? void 0 : option.name);
555
556
  });
556
- })))), (product === null || product === void 0 ? void 0 : product.ingredients.length) > 0 && /*#__PURE__*/_react.default.createElement("div", {
557
+ })))), (product === null || product === void 0 ? void 0 : (_product$ingredients4 = product.ingredients) === null || _product$ingredients4 === void 0 ? void 0 : _product$ingredients4.length) > 0 && /*#__PURE__*/_react.default.createElement("div", {
557
558
  id: "ingredients"
558
- }, (product === null || product === void 0 ? void 0 : product.ingredients.length) > 0 && /*#__PURE__*/_react.default.createElement(_styles.SectionTitle, null, t('INGREDIENTS', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag2 = theme.defaultLanguages) === null || _theme$defaultLanguag2 === void 0 ? void 0 : _theme$defaultLanguag2.INGREDIENTS) || 'Ingredients')), /*#__PURE__*/_react.default.createElement(_styles.WrapperIngredients, {
559
+ }, (product === null || product === void 0 ? void 0 : (_product$ingredients5 = product.ingredients) === null || _product$ingredients5 === void 0 ? void 0 : _product$ingredients5.length) > 0 && /*#__PURE__*/_react.default.createElement(_styles.SectionTitle, null, t('INGREDIENTS', (theme === null || theme === void 0 ? void 0 : theme.defaultLanguages.INGREDIENTS) || 'Ingredients')), /*#__PURE__*/_react.default.createElement(_styles.WrapperIngredients, {
559
560
  isProductSoldout: isSoldOut || maxProductQuantity <= 0
560
561
  }, product === null || product === void 0 ? void 0 : product.ingredients.map(function (ingredient) {
561
562
  return /*#__PURE__*/_react.default.createElement(_ProductIngredient.ProductIngredient, {
@@ -565,7 +566,7 @@ var ProductOptionsUI = function ProductOptionsUI(props) {
565
566
  onChange: handleChangeIngredientState,
566
567
  isSoldOut: isSoldOut
567
568
  });
568
- }))), /*#__PURE__*/_react.default.createElement("div", null, product === null || product === void 0 ? void 0 : product.extras.sort(function (a, b) {
569
+ }))), /*#__PURE__*/_react.default.createElement("div", null, product === null || product === void 0 ? void 0 : (_product$extras2 = product.extras) === null || _product$extras2 === void 0 ? void 0 : _product$extras2.sort(function (a, b) {
569
570
  return a.rank - b.rank;
570
571
  }).map(function (extra) {
571
572
  return extra.options.sort(function (a, b) {
@@ -601,9 +602,9 @@ var ProductOptionsUI = function ProductOptionsUI(props) {
601
602
  });
602
603
  }))));
603
604
  });
604
- })), !(product !== null && product !== void 0 && product.hide_special_instructions) && /*#__PURE__*/_react.default.createElement(_styles.ProductComment, null, /*#__PURE__*/_react.default.createElement(_styles.SectionTitle, null, t('COMMENTS', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag3 = theme.defaultLanguages) === null || _theme$defaultLanguag3 === void 0 ? void 0 : _theme$defaultLanguag3.SPECIAL_COMMENT) || 'COMMENTS')), /*#__PURE__*/_react.default.createElement(_Inputs.TextArea, {
605
+ })), !(product !== null && product !== void 0 && product.hide_special_instructions) && /*#__PURE__*/_react.default.createElement(_styles.ProductComment, null, /*#__PURE__*/_react.default.createElement(_styles.SectionTitle, null, t('COMMENTS', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag2 = theme.defaultLanguages) === null || _theme$defaultLanguag2 === void 0 ? void 0 : _theme$defaultLanguag2.SPECIAL_COMMENT) || 'COMMENTS')), /*#__PURE__*/_react.default.createElement(_Inputs.TextArea, {
605
606
  rows: 4,
606
- placeholder: t('SPECIAL_COMMENT', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag4 = theme.defaultLanguages) === null || _theme$defaultLanguag4 === void 0 ? void 0 : _theme$defaultLanguag4.SPECIAL_COMMENT) || 'Special comment'),
607
+ placeholder: t('SPECIAL_COMMENT', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag3 = theme.defaultLanguages) === null || _theme$defaultLanguag3 === void 0 ? void 0 : _theme$defaultLanguag3.SPECIAL_COMMENT) || 'Special comment'),
607
608
  defaultValue: productCart.comment,
608
609
  onChange: handleChangeCommentState,
609
610
  disabled: !(productCart && !isSoldOut && maxProductQuantity)
@@ -658,11 +659,11 @@ var ProductOptionsUI = function ProductOptionsUI(props) {
658
659
  return handleSaveProduct();
659
660
  },
660
661
  disabled: orderState.loading || (productCart === null || productCart === void 0 ? void 0 : productCart.quantity) === 0 || (product === null || product === void 0 ? void 0 : product.minimum_per_order) && (productCart === null || productCart === void 0 ? void 0 : productCart.quantity) + productAddedToCartLength < (product === null || product === void 0 ? void 0 : product.minimum_per_order) || (product === null || product === void 0 ? void 0 : product.maximum_per_order) && (productCart === null || productCart === void 0 ? void 0 : productCart.quantity) + productAddedToCartLength > (product === null || product === void 0 ? void 0 : product.maximum_per_order)
661
- }, orderState.loading ? /*#__PURE__*/_react.default.createElement("span", null, t('LOADING', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag5 = theme.defaultLanguages) === null || _theme$defaultLanguag5 === void 0 ? void 0 : _theme$defaultLanguag5.LOADING) || 'Loading')) : /*#__PURE__*/_react.default.createElement("span", null, editMode ? t('UPDATE', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag6 = theme.defaultLanguages) === null || _theme$defaultLanguag6 === void 0 ? void 0 : _theme$defaultLanguag6.UPDATE) || 'Update') : t('ADD', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag7 = theme.defaultLanguages) === null || _theme$defaultLanguag7 === void 0 ? void 0 : _theme$defaultLanguag7.ADD) || 'Add'))), auth && !((_orderState$options3 = orderState.options) !== null && _orderState$options3 !== void 0 && _orderState$options3.address_id || unaddressedTypes.includes(orderState === null || orderState === void 0 ? void 0 : (_orderState$options4 = orderState.options) === null || _orderState$options4 === void 0 ? void 0 : _orderState$options4.type)) && (orderState.loading ? /*#__PURE__*/_react.default.createElement(_Buttons.Button, {
662
+ }, orderState.loading ? /*#__PURE__*/_react.default.createElement("span", null, t('LOADING', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag4 = theme.defaultLanguages) === null || _theme$defaultLanguag4 === void 0 ? void 0 : _theme$defaultLanguag4.LOADING) || 'Loading')) : /*#__PURE__*/_react.default.createElement("span", null, editMode ? t('UPDATE', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag5 = theme.defaultLanguages) === null || _theme$defaultLanguag5 === void 0 ? void 0 : _theme$defaultLanguag5.UPDATE) || 'Update') : t('ADD', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag6 = theme.defaultLanguages) === null || _theme$defaultLanguag6 === void 0 ? void 0 : _theme$defaultLanguag6.ADD) || 'Add'))), auth && !((_orderState$options3 = orderState.options) !== null && _orderState$options3 !== void 0 && _orderState$options3.address_id || unaddressedTypes.includes(orderState === null || orderState === void 0 ? void 0 : (_orderState$options4 = orderState.options) === null || _orderState$options4 === void 0 ? void 0 : _orderState$options4.type)) && (orderState.loading ? /*#__PURE__*/_react.default.createElement(_Buttons.Button, {
662
663
  className: "add",
663
664
  color: "primary",
664
665
  disabled: true
665
- }, t('LOADING', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag8 = theme.defaultLanguages) === null || _theme$defaultLanguag8 === void 0 ? void 0 : _theme$defaultLanguag8.LOADING) || 'Loading')) : /*#__PURE__*/_react.default.createElement(_AddressList.AddressList, {
666
+ }, t('LOADING', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag7 = theme.defaultLanguages) === null || _theme$defaultLanguag7 === void 0 ? void 0 : _theme$defaultLanguag7.LOADING) || 'Loading')) : /*#__PURE__*/_react.default.createElement(_AddressList.AddressList, {
666
667
  isModal: true,
667
668
  userId: isNaN(userCustomer === null || userCustomer === void 0 ? void 0 : userCustomer.id) ? null : userCustomer === null || userCustomer === void 0 ? void 0 : userCustomer.id,
668
669
  addressList: isNaN(userCustomer === null || userCustomer === void 0 ? void 0 : userCustomer.id) ? user.addresses : null,
@@ -675,7 +676,7 @@ var ProductOptionsUI = function ProductOptionsUI(props) {
675
676
  onClick: function onClick() {
676
677
  return setModalIsOpen(true);
677
678
  }
678
- }, isSoldOut || maxProductQuantity <= 0 ? t('SOLD_OUT', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag9 = theme.defaultLanguages) === null || _theme$defaultLanguag9 === void 0 ? void 0 : _theme$defaultLanguag9.SOLD_OUT) || 'Sold out') : t('LOGIN_SIGNUP', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag10 = theme.defaultLanguages) === null || _theme$defaultLanguag10 === void 0 ? void 0 : _theme$defaultLanguag10.LOGIN_SIGNUP) || 'Login / Sign Up'))))), modalIsOpen && !auth && /*#__PURE__*/_react.default.createElement(_Modal.Modal, {
679
+ }, isSoldOut || maxProductQuantity <= 0 ? t('SOLD_OUT', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag8 = theme.defaultLanguages) === null || _theme$defaultLanguag8 === void 0 ? void 0 : _theme$defaultLanguag8.SOLD_OUT) || 'Sold out') : t('LOGIN_SIGNUP', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag9 = theme.defaultLanguages) === null || _theme$defaultLanguag9 === void 0 ? void 0 : _theme$defaultLanguag9.LOGIN_SIGNUP) || 'Login / Sign Up'))))), modalIsOpen && !auth && /*#__PURE__*/_react.default.createElement(_Modal.Modal, {
679
680
  open: modalIsOpen,
680
681
  onClose: function onClose() {
681
682
  return closeModal();
@@ -690,7 +691,7 @@ var ProductOptionsUI = function ProductOptionsUI(props) {
690
691
  });
691
692
  },
692
693
  href: "#"
693
- }, t('CREATE_ACCOUNT', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag11 = theme.defaultLanguages) === null || _theme$defaultLanguag11 === void 0 ? void 0 : _theme$defaultLanguag11.CREATE_ACCOUNT) || 'Create account')),
694
+ }, t('CREATE_ACCOUNT', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag10 = theme.defaultLanguages) === null || _theme$defaultLanguag10 === void 0 ? void 0 : _theme$defaultLanguag10.CREATE_ACCOUNT) || 'Create account')),
694
695
  elementLinkToForgotPassword: /*#__PURE__*/_react.default.createElement("a", {
695
696
  onClick: function onClick(e) {
696
697
  return handleCustomModalClick(e, {
@@ -698,7 +699,7 @@ var ProductOptionsUI = function ProductOptionsUI(props) {
698
699
  });
699
700
  },
700
701
  href: "#"
701
- }, t('RESET_PASSWORD', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag12 = theme.defaultLanguages) === null || _theme$defaultLanguag12 === void 0 ? void 0 : _theme$defaultLanguag12.RESET_PASSWORD) || 'Reset password')),
702
+ }, t('RESET_PASSWORD', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag11 = theme.defaultLanguages) === null || _theme$defaultLanguag11 === void 0 ? void 0 : _theme$defaultLanguag11.RESET_PASSWORD) || 'Reset password')),
702
703
  useLoginByCellphone: true,
703
704
  isPopup: true,
704
705
  useKioskApp: props.useKioskApp
@@ -710,7 +711,7 @@ var ProductOptionsUI = function ProductOptionsUI(props) {
710
711
  });
711
712
  },
712
713
  href: "#"
713
- }, t('LOGIN', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag13 = theme.defaultLanguages) === null || _theme$defaultLanguag13 === void 0 ? void 0 : _theme$defaultLanguag13.LOGIN) || 'Login')),
714
+ }, t('LOGIN', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag12 = theme.defaultLanguages) === null || _theme$defaultLanguag12 === void 0 ? void 0 : _theme$defaultLanguag12.LOGIN) || 'Login')),
714
715
  useLoginByCellphone: true,
715
716
  useChekoutFileds: true,
716
717
  handleSuccessSignup: handleSuccessSignup,
@@ -723,7 +724,7 @@ var ProductOptionsUI = function ProductOptionsUI(props) {
723
724
  });
724
725
  },
725
726
  href: "#"
726
- }, t('LOGIN', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag14 = theme.defaultLanguages) === null || _theme$defaultLanguag14 === void 0 ? void 0 : _theme$defaultLanguag14.LOGIN) || 'Login')),
727
+ }, t('LOGIN', (theme === null || theme === void 0 ? void 0 : (_theme$defaultLanguag13 = theme.defaultLanguages) === null || _theme$defaultLanguag13 === void 0 ? void 0 : _theme$defaultLanguag13.LOGIN) || 'Login')),
727
728
  isPopup: true
728
729
  })), error && error.length > 0 && /*#__PURE__*/_react.default.createElement(_NotFoundSource.NotFoundSource, {
729
730
  content: ((_error$ = error[0]) === null || _error$ === void 0 ? void 0 : _error$.message) || error[0]
@@ -4,7 +4,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
4
4
  Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
- exports.ReviewDriver = void 0;
7
+ exports.default = exports.ReviewDriver = void 0;
8
8
  var _react = _interopRequireWildcard(require("react"));
9
9
  var _reactHookForm = require("react-hook-form");
10
10
  var _orderingComponentsExternal = require("ordering-components-external");
@@ -273,4 +273,6 @@ var ReviewDriver = function ReviewDriver(props) {
273
273
  });
274
274
  return /*#__PURE__*/_react.default.createElement(_orderingComponentsExternal.ReviewDriver, reviewDriverProps);
275
275
  };
276
- exports.ReviewDriver = ReviewDriver;
276
+ exports.ReviewDriver = ReviewDriver;
277
+ var _default = ReviewDriver;
278
+ exports.default = _default;
@@ -4,7 +4,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
4
4
  Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
- exports.ReviewOrder = void 0;
7
+ exports.default = exports.ReviewOrder = void 0;
8
8
  var _react = _interopRequireWildcard(require("react"));
9
9
  var _reactHookForm = require("react-hook-form");
10
10
  var _orderingComponentsExternal = require("ordering-components-external");
@@ -292,4 +292,6 @@ var ReviewOrder = function ReviewOrder(props) {
292
292
  });
293
293
  return /*#__PURE__*/_react.default.createElement(_orderingComponentsExternal.OrderReview, ReviewOrderProps);
294
294
  };
295
- exports.ReviewOrder = ReviewOrder;
295
+ exports.ReviewOrder = ReviewOrder;
296
+ var _default = ReviewOrder;
297
+ exports.default = _default;
@@ -4,7 +4,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
4
4
  Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
- exports.ReviewProduct = void 0;
7
+ exports.default = exports.ReviewProduct = void 0;
8
8
  var _react = _interopRequireWildcard(require("react"));
9
9
  var _orderingComponentsExternal = require("ordering-components-external");
10
10
  var _reactHookForm = require("react-hook-form");
@@ -266,4 +266,6 @@ var ReviewProduct = function ReviewProduct(props) {
266
266
  });
267
267
  return /*#__PURE__*/_react.default.createElement(_orderingComponentsExternal.ReviewProduct, reviewProductProps);
268
268
  };
269
- exports.ReviewProduct = ReviewProduct;
269
+ exports.ReviewProduct = ReviewProduct;
270
+ var _default = ReviewProduct;
271
+ exports.default = _default;
@@ -4,7 +4,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
4
4
  Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
- exports.ReviewTrigger = void 0;
7
+ exports.default = exports.ReviewTrigger = void 0;
8
8
  var _react = _interopRequireWildcard(require("react"));
9
9
  var _orderingComponentsExternal = require("ordering-components-external");
10
10
  var _BsArrowRight = _interopRequireDefault(require("@meronex/icons/bs/BsArrowRight"));
@@ -97,4 +97,6 @@ var ReviewTrigger = function ReviewTrigger(props) {
97
97
  }, AfterElement);
98
98
  }));
99
99
  };
100
- exports.ReviewTrigger = ReviewTrigger;
100
+ exports.ReviewTrigger = ReviewTrigger;
101
+ var _default = ReviewTrigger;
102
+ exports.default = _default;
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.SignUpApproval = void 0;
6
+ exports.default = exports.SignUpApproval = void 0;
7
7
  var _react = _interopRequireDefault(require("react"));
8
8
  var _styledComponents = require("styled-components");
9
9
  var _Buttons = require("../../styles/Buttons");
@@ -86,4 +86,6 @@ var SignUpApproval = function SignUpApproval(props) {
86
86
  href: "mailto:".concat(t('SIGNUP_DRIVER_EMAIL', contactEmail))
87
87
  }, t('SIGNUP_DRIVER_EMAIL', contactEmail)))));
88
88
  };
89
- exports.SignUpApproval = SignUpApproval;
89
+ exports.SignUpApproval = SignUpApproval;
90
+ var _default = SignUpApproval;
91
+ exports.default = _default;
@@ -4,7 +4,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
4
4
  Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
- exports.Button = void 0;
7
+ exports.default = exports.Button = void 0;
8
8
  var _styledComponents = _interopRequireWildcard(require("styled-components"));
9
9
  var _polished = require("polished");
10
10
  var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18, _templateObject19, _templateObject20, _templateObject21, _templateObject22;
@@ -23,7 +23,7 @@ var Button = _styledComponents.default.button(_templateObject || (_templateObjec
23
23
  return ((_props$theme = props.theme) === null || _props$theme === void 0 ? void 0 : _props$theme.rtl) && (0, _styledComponents.css)(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n text-align: right;\n "])));
24
24
  }, function (props) {
25
25
  var _props$theme2;
26
- return ((_props$theme2 = props.theme) === null || _props$theme2 === void 0 ? void 0 : _props$theme2.rtl) && (0, _styledComponents.css)(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n padding-right: 15%;\n padding-left: 0\n "])));
26
+ return ((_props$theme2 = props.theme) === null || _props$theme2 === void 0 ? void 0 : _props$theme2.rtl) && (0, _styledComponents.css)(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n padding-right: 15%;\n padding-left: 0;\n "])));
27
27
  });
28
28
  }, function (_ref3) {
29
29
  var outline = _ref3.outline;
@@ -212,4 +212,6 @@ var Button = _styledComponents.default.button(_templateObject || (_templateObjec
212
212
  });
213
213
  });
214
214
  });
215
- exports.Button = Button;
215
+ exports.Button = Button;
216
+ var _default = Button;
217
+ exports.default = _default;
@@ -50,7 +50,7 @@ var InputGroupRight = (0, _styledComponents.default)(InputGroupLeft)(_templateOb
50
50
  return ((_props$theme3 = props.theme) === null || _props$theme3 === void 0 ? void 0 : _props$theme3.rtl) && (0, _styledComponents.css)(_templateObject13 || (_templateObject13 = _taggedTemplateLiteral(["\n border-left-width: 1px;\n border-right-width: 0;\n border-radius: 0 0 34px 34px;\n "])));
51
51
  }, _Buttons.Button, function (props) {
52
52
  var _props$theme4;
53
- return ((_props$theme4 = props.theme) === null || _props$theme4 === void 0 ? void 0 : _props$theme4.rtl) && (0, _styledComponents.css)(_templateObject14 || (_templateObject14 = _taggedTemplateLiteral(["\n margin-left: -7px;\n margin-right: 0\n "])));
53
+ return ((_props$theme4 = props.theme) === null || _props$theme4 === void 0 ? void 0 : _props$theme4.rtl) && (0, _styledComponents.css)(_templateObject14 || (_templateObject14 = _taggedTemplateLiteral(["\n margin-left: -7px;\n margin-right: 0;\n "])));
54
54
  });
55
55
  exports.InputGroupRight = InputGroupRight;
56
56
  var InputPrimary = (0, _styledComponents.default)(Input)(_templateObject15 || (_templateObject15 = _taggedTemplateLiteral(["\n background: #FFF;\n color: ", ";\n border-color: ", ";\n &:focus {\n border-color: ", ";\n }\n"])), function (props) {
@@ -4,7 +4,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
4
4
  Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
- exports.SignUpIcon = exports.SignInIcon = exports.Header = void 0;
7
+ exports.default = exports.SignUpIcon = exports.SignInIcon = exports.Header = void 0;
8
8
  var _react = _interopRequireWildcard(require("react"));
9
9
  var _reactRouterDom = require("react-router-dom");
10
10
  var _orderingComponentsExternal = require("ordering-components-external");
@@ -391,4 +391,6 @@ var SignUpIcon = function SignUpIcon() {
391
391
  d: "M492,397h-55v-55c0-11.046-8.954-20-20-20c-11.046,0-20,8.954-20,20v55h-55c-11.046,0-20,8.954-20,20 c0,11.046,8.954,20,20,20h55v55c0,11.046,8.954,20,20,20c11.046,0,20-8.954,20-20v-55h55c11.046,0,20-8.954,20-20 C512,405.954,503.046,397,492,397z"
392
392
  }))));
393
393
  };
394
- exports.SignUpIcon = SignUpIcon;
394
+ exports.SignUpIcon = SignUpIcon;
395
+ var _default = Header;
396
+ exports.default = _default;
@@ -4,7 +4,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
4
4
  Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
- exports.Header = void 0;
7
+ exports.default = exports.Header = void 0;
8
8
  var _react = _interopRequireWildcard(require("react"));
9
9
  var _reactRouterDom = require("react-router-dom");
10
10
  var _orderingComponentsExternal = require("ordering-components-external");
@@ -349,4 +349,6 @@ var styles = {
349
349
  };
350
350
  Header.defaultProps = {
351
351
  isShowOrderOptions: true
352
- };
352
+ };
353
+ var _default = Header;
354
+ exports.default = _default;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ordering-ui-external",
3
- "version": "1.9.6",
3
+ "version": "2.0.0",
4
4
  "description": "Ordering UI Components",
5
5
  "main": "./_modules/index.js",
6
6
  "exports": {
@@ -86,7 +86,7 @@
86
86
  "libphonenumber-js": "^1.9.4",
87
87
  "lodash": "^4.17.19",
88
88
  "moment": "^2.29.4",
89
- "ordering-components-external": "1.9.2",
89
+ "ordering-components-external": "2.0.0",
90
90
  "polished": "^3.6.6",
91
91
  "react-bootstrap-icons": "^1.7.2",
92
92
  "react-calendar": "^3.3.1",
@@ -17,45 +17,49 @@ export const CancellationComponent = props => {
17
17
  <>
18
18
  <Hero>
19
19
  {(bgUrl || theme.images?.general?.businessHero) && (
20
- <BgImg src={bgUrl || theme.images?.general?.businessHero} alt="bg"/>
20
+ <BgImg src={bgUrl || theme.images?.general?.businessHero} alt='bg' />
21
21
  )}
22
22
  <HeroText>
23
- {(logoUrl || theme.images?.logos?.logotype) && (
24
- <LogoImg src={logoUrl || theme.images?.logos?.logotype} alt="logo"/>
25
- )}
26
- <h1 className="title">{t('CANCELLATION_TITLE', 'SITE OUT OF SERVICE')}</h1>
27
- <h4 className="sub-title" dangerouslySetInnerHTML={{
28
- __html:t('CANCELLATION_SUBTITLE', 'This website has been archived or suspended in accordance with our :Terms of Service').replace(':Terms of Service', `<b><i>${t('CANCELLATION_TERMS', 'Terms of Service')}</i></b>`)
29
- }}/>
23
+ {(logoUrl || theme.images?.logos?.logotype) && (
24
+ <LogoImg src={logoUrl || theme.images?.logos?.logotype} alt='logo' />
25
+ )}
26
+ <h1 className='title'>{t('CANCELLATION_TITLE', 'SITE OUT OF SERVICE')}</h1>
27
+ <h4
28
+ className='sub-title' dangerouslySetInnerHTML={{
29
+ __html: t('CANCELLATION_SUBTITLE', 'This website has been archived or suspended in accordance with our :Terms of Service').replace(':Terms of Service', `<b><i>${t('CANCELLATION_TERMS', 'Terms of Service')}</i></b>`)
30
+ }}
31
+ />
30
32
  </HeroText>
31
33
  </Hero>
32
34
  <Content>
33
35
  <p dangerouslySetInnerHTML={{
34
- __html:t('CANCELLATION_OWNER_TEXT', 'If you are the :owner of this website contact us to reactivate your website.').replace(':owner', `<b>${t('CANCELLATION_OWNER', 'owner')}</b>`)
35
- }}/>
36
- {ButtonComponent &&(
37
- <ButtonComponent color='primary'>{t('CANCELLATION_CONTACT_US', 'Contact us')}</ButtonComponent>
38
- )}
36
+ __html: t('CANCELLATION_OWNER_TEXT', 'If you are the :owner of this website contact us to reactivate your website.').replace(':owner', `<b>${t('CANCELLATION_OWNER', 'owner')}</b>`)
37
+ }}
38
+ />
39
+ {ButtonComponent && (
40
+ <ButtonComponent color='primary'>{t('CANCELLATION_CONTACT_US', 'Contact us')}</ButtonComponent>
41
+ )}
39
42
  </Content>
40
43
  <Segment>
41
- <p dangerouslySetInnerHTML={{
42
- __html:t('CANCELLATION_OWNER_TEXT', 'If you are a :customer let the owner know you midd this website, just write your email below.').replace(':customer', `<b>${t('CANCELLATION_CUSTOMER', 'customer')}</b>`)
43
- }}/>
44
- <InputWrapper>
44
+ <p dangerouslySetInnerHTML={{
45
+ __html: t('CANCELLATION_OWNER_TEXT', 'If you are a :customer let the owner know you midd this website, just write your email below.').replace(':customer', `<b>${t('CANCELLATION_CUSTOMER', 'customer')}</b>`)
46
+ }}
47
+ />
48
+ <InputWrapper>
45
49
  <BusinessSearch>
46
- {InputComponent &&(
50
+ {InputComponent && (
47
51
  <InputComponent
48
- name='Email'
49
- placeholder={t('CANCELLATION_INPUT_PLACEHOLDER', 'Email')}
50
- />
51
- )}
52
+ name='Email'
53
+ placeholder={t('CANCELLATION_INPUT_PLACEHOLDER', 'Email')}
54
+ />
55
+ )}
52
56
  </BusinessSearch>
53
- {ButtonComponent &&(
54
- <ButtonComponent color='primary'>
55
- {t('CANCELLATION_SEND_BUTTON', 'Send')}
56
- </ButtonComponent>
57
+ {ButtonComponent && (
58
+ <ButtonComponent color='primary'>
59
+ {t('CANCELLATION_SEND_BUTTON', 'Send')}
60
+ </ButtonComponent>
57
61
  )}
58
- </InputWrapper>
62
+ </InputWrapper>
59
63
  </Segment>
60
64
  </>
61
65
  )
@@ -87,3 +87,5 @@ export const Confirm = (props) => {
87
87
  }
88
88
 
89
89
  export const Alert = Confirm
90
+
91
+ export default Confirm
@@ -443,3 +443,5 @@ const styles = {
443
443
  Header.defaultProps = {
444
444
  isShowOrderOptions: true
445
445
  }
446
+
447
+ export default Header
@@ -38,3 +38,5 @@ export const SmartAppBanner = (props) => {
38
38
  }
39
39
  return <SmartAppBannerController {...smartAppBannerProps} />
40
40
  }
41
+
42
+ export default SmartAppBanner
@@ -309,7 +309,18 @@ export const OrdersTable = (props) => {
309
309
  {!isSelectedOrders && (
310
310
  <thead>
311
311
  <tr>
312
- {allowColumns && Object.keys(allowColumns).filter(col => allowColumns[col]?.visable && allowColumns[col]?.order !== 0)
312
+ {allowColumns && (Object.keys(allowColumns).filter(col => allowColumns[col]?.visable && allowColumns[col]?.order !== 0)?.length === 0 ?
313
+ (
314
+ <th className='orderPrice' key={`noDragTh-${i}`}>
315
+ <ColumnAllowSettingPopover
316
+ allowColumns={allowColumns}
317
+ optionsDefault={optionsDefault}
318
+ handleChangeAllowColumns={handleChangeAllowColumns}
319
+ isOrder
320
+ />
321
+ </th>
322
+ ) : (
323
+ Object.keys(allowColumns).filter(col => allowColumns[col]?.visable && allowColumns[col]?.order !== 0)
313
324
  .sort((col1, col2) => allowColumns[col1]?.order - allowColumns[col2]?.order)
314
325
  .map((column, i, array) => {
315
326
  if (column === 'slaBar') {
@@ -317,24 +328,36 @@ export const OrdersTable = (props) => {
317
328
  }
318
329
  if (column === 'orderNumber') {
319
330
  return (
320
- <th
321
- className={!(allowColumns?.orderNumber?.visable || allowColumns?.dateTime?.visable) ? 'orderNo small' : 'orderNo'}
322
- key={`noDragTh-${i}`}
323
- colSpan={allowColumns?.slaBar?.visable ? 2 : 1}
324
- >
325
- <CheckBox
326
- isChecked={!orderList.loading && isAllChecked}
327
- onClick={() => handleSelecteAllOrder()}
328
- className='orderCheckBox'
331
+ <React.Fragment key={i}>
332
+ <th
333
+ className={!(allowColumns?.orderNumber?.visable || allowColumns?.dateTime?.visable) ? 'orderNo small' : 'orderNo'}
334
+ key={`noDragTh-${i}`}
335
+ colSpan={allowColumns?.slaBar?.visable ? 2 : 1}
329
336
  >
330
- {(!orderList.loading && isAllChecked) ? (
331
- <RiCheckboxFill />
332
- ) : (
333
- <RiCheckboxBlankLine />
334
- )}
335
- </CheckBox>
336
- {t('ORDER', 'Order')}
337
- </th>
337
+ <CheckBox
338
+ isChecked={!orderList.loading && isAllChecked}
339
+ onClick={() => handleSelecteAllOrder()}
340
+ className='orderCheckBox'
341
+ >
342
+ {(!orderList.loading && isAllChecked) ? (
343
+ <RiCheckboxFill />
344
+ ) : (
345
+ <RiCheckboxBlankLine />
346
+ )}
347
+ </CheckBox>
348
+ {t('ORDER', 'Order')}
349
+ </th>
350
+ {column === [...array].pop() && (
351
+ <th className='orderPrice' key={`noDragTh-${i}`}>
352
+ <ColumnAllowSettingPopover
353
+ allowColumns={allowColumns}
354
+ optionsDefault={optionsDefault}
355
+ handleChangeAllowColumns={handleChangeAllowColumns}
356
+ isOrder
357
+ />
358
+ </th>
359
+ )}
360
+ </React.Fragment>
338
361
  )
339
362
  }
340
363
  if (column === 'total' || (column !== 'total' && column === [...array].pop())) {
@@ -388,7 +411,8 @@ export const OrdersTable = (props) => {
388
411
  <span>{allowColumns[column]?.title}</span>
389
412
  </div>
390
413
  </DragTh>)
391
- })}
414
+ })
415
+ ))}
392
416
  </tr>
393
417
  </thead>
394
418
  )}
@@ -29,6 +29,7 @@ export const OrdersContainer = styled.div`
29
29
  export const Table = styled.table`
30
30
  width: calc(100% - 10px);
31
31
  min-width: 900px;
32
+ min-height: 35vh;
32
33
 
33
34
  th,
34
35
  td {
@@ -391,7 +391,9 @@ const CartUI = (props) => {
391
391
  )}
392
392
  <IconContainer>
393
393
  <BsInfoCircle size='20' color={theme.colors.primary} onClick={() => setOpenTaxModal({ open: true, data: offer, type: 'offer_target_3' })} />
394
- <MdCloseCircle size='24' color={theme.colors.primary} onClick={() => onRemoveOffer(offer?.id)} />
394
+ {!offer?.type && (
395
+ <MdCloseCircle size='24' color={theme.colors.primary} onClick={() => onRemoveOffer(offer?.id)} />
396
+ )}
395
397
  </IconContainer>
396
398
  </td>
397
399
  <td>
@@ -403,7 +405,7 @@ const CartUI = (props) => {
403
405
  {orderState?.options?.type === 1 && cart?.delivery_price > 0 && !hideDeliveryFee && (
404
406
  <tr>
405
407
  <td>{t('DELIVERY_FEE', 'Delivery Fee')}</td>
406
- <td>{parsePrice(cart?.delivery_price_with_discount ?? cart?.delivery_price)}</td>
408
+ <td>{parsePrice(cart?.delivery_price)}</td>
407
409
  </tr>
408
410
  )}
409
411
  {
@@ -416,7 +418,9 @@ const CartUI = (props) => {
416
418
  )}
417
419
  <IconContainer>
418
420
  <BsInfoCircle size='20' color={theme.colors.primary} onClick={() => setOpenTaxModal({ open: true, data: offer, type: 'offer_target_2' })} />
419
- <MdCloseCircle size='24' color={theme.colors.primary} onClick={() => onRemoveOffer(offer?.id)} />
421
+ {!offer?.type && (
422
+ <MdCloseCircle size='24' color={theme.colors.primary} onClick={() => onRemoveOffer(offer?.id)} />
423
+ )}
420
424
  </IconContainer>
421
425
  </td>
422
426
  <td>
@@ -450,7 +454,8 @@ const CartUI = (props) => {
450
454
  </CouponContainer>
451
455
  )}
452
456
  {
453
- isMultiCheckout &&
457
+ !isStore &&
458
+ !isMultiCheckout &&
454
459
  cart &&
455
460
  cart?.business_id &&
456
461
  orderState?.options?.type === 1 &&
@@ -784,6 +784,8 @@ export const Checkout = (props) => {
784
784
  useEffect(() => {
785
785
  if (token && cartUuid) {
786
786
  getOrder(cartUuid)
787
+ } else {
788
+ setCartState({ ...cartState, loading: false })
787
789
  }
788
790
  }, [token, cartUuid])
789
791
 
@@ -63,3 +63,5 @@ export const Footer = ({ isFooterPage }) => {
63
63
  </Container>
64
64
  )
65
65
  }
66
+
67
+ export default Footer