ordering-ui-external 1.5.0 → 1.5.2
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.
- package/_bundles/{0.ordering-ui.b1e32f04828ea3f944e1.js → 0.ordering-ui.5de718771fdf8a9bc402.js} +0 -0
- package/_bundles/{1.ordering-ui.b1e32f04828ea3f944e1.js → 1.ordering-ui.5de718771fdf8a9bc402.js} +0 -0
- package/_bundles/{2.ordering-ui.b1e32f04828ea3f944e1.js → 2.ordering-ui.5de718771fdf8a9bc402.js} +0 -0
- package/_bundles/{4.ordering-ui.b1e32f04828ea3f944e1.js → 4.ordering-ui.5de718771fdf8a9bc402.js} +0 -0
- package/_bundles/{5.ordering-ui.b1e32f04828ea3f944e1.js → 5.ordering-ui.5de718771fdf8a9bc402.js} +0 -0
- package/_bundles/{6.ordering-ui.b1e32f04828ea3f944e1.js → 6.ordering-ui.5de718771fdf8a9bc402.js} +0 -0
- package/_bundles/{7.ordering-ui.b1e32f04828ea3f944e1.js → 7.ordering-ui.5de718771fdf8a9bc402.js} +1 -1
- package/_bundles/{7.ordering-ui.b1e32f04828ea3f944e1.js.LICENSE.txt → 7.ordering-ui.5de718771fdf8a9bc402.js.LICENSE.txt} +0 -0
- package/_bundles/{8.ordering-ui.b1e32f04828ea3f944e1.js → 8.ordering-ui.5de718771fdf8a9bc402.js} +0 -0
- package/_bundles/{9.ordering-ui.b1e32f04828ea3f944e1.js → 9.ordering-ui.5de718771fdf8a9bc402.js} +0 -0
- package/_bundles/{ordering-ui.b1e32f04828ea3f944e1.js → ordering-ui.5de718771fdf8a9bc402.js} +2 -2
- package/_bundles/{ordering-ui.b1e32f04828ea3f944e1.js.LICENSE.txt → ordering-ui.5de718771fdf8a9bc402.js.LICENSE.txt} +0 -0
- package/_modules/themes/five/index.js +42 -0
- package/_modules/themes/five/src/components/OrderDetails/index.js +46 -7
- package/_modules/themes/five/src/components/OrderDetails/styles.js +11 -3
- package/package.json +1 -1
- package/src/themes/five/index.js +13 -1
- package/src/themes/five/src/components/OrderDetails/index.js +45 -8
- package/src/themes/five/src/components/OrderDetails/styles.js +50 -0
|
File without changes
|
|
@@ -9,6 +9,12 @@ Object.defineProperty(exports, "AccordionDropdown", {
|
|
|
9
9
|
return _AccordionDropdown.AccordionDropdown;
|
|
10
10
|
}
|
|
11
11
|
});
|
|
12
|
+
Object.defineProperty(exports, "ActionsSection", {
|
|
13
|
+
enumerable: true,
|
|
14
|
+
get: function get() {
|
|
15
|
+
return _ActionsSection.ActionsSection;
|
|
16
|
+
}
|
|
17
|
+
});
|
|
12
18
|
Object.defineProperty(exports, "AddressDetails", {
|
|
13
19
|
enumerable: true,
|
|
14
20
|
get: function get() {
|
|
@@ -357,6 +363,12 @@ Object.defineProperty(exports, "NotNetworkConnectivity", {
|
|
|
357
363
|
return _NotNetworkConnectivity.NotNetworkConnectivity;
|
|
358
364
|
}
|
|
359
365
|
});
|
|
366
|
+
Object.defineProperty(exports, "OrderBillSection", {
|
|
367
|
+
enumerable: true,
|
|
368
|
+
get: function get() {
|
|
369
|
+
return _OrderBillSection.OrderBillSection;
|
|
370
|
+
}
|
|
371
|
+
});
|
|
360
372
|
Object.defineProperty(exports, "OrderDetails", {
|
|
361
373
|
enumerable: true,
|
|
362
374
|
get: function get() {
|
|
@@ -369,12 +381,24 @@ Object.defineProperty(exports, "OrderDetailsKiosk", {
|
|
|
369
381
|
return _Kiosk2.OrderDetails;
|
|
370
382
|
}
|
|
371
383
|
});
|
|
384
|
+
Object.defineProperty(exports, "OrderHistory", {
|
|
385
|
+
enumerable: true,
|
|
386
|
+
get: function get() {
|
|
387
|
+
return _OrderHistory.OrderHistory;
|
|
388
|
+
}
|
|
389
|
+
});
|
|
372
390
|
Object.defineProperty(exports, "OrderItAgain", {
|
|
373
391
|
enumerable: true,
|
|
374
392
|
get: function get() {
|
|
375
393
|
return _OrderItAgain.OrderItAgain;
|
|
376
394
|
}
|
|
377
395
|
});
|
|
396
|
+
Object.defineProperty(exports, "OrderPreferencesSection", {
|
|
397
|
+
enumerable: true,
|
|
398
|
+
get: function get() {
|
|
399
|
+
return _OrderPreferencesSections.OrderPreferencesSection;
|
|
400
|
+
}
|
|
401
|
+
});
|
|
378
402
|
Object.defineProperty(exports, "OrderProgress", {
|
|
379
403
|
enumerable: true,
|
|
380
404
|
get: function get() {
|
|
@@ -471,6 +495,12 @@ Object.defineProperty(exports, "ProductOptionSubOption", {
|
|
|
471
495
|
return _ProductOptionSubOption.ProductOptionSubOption;
|
|
472
496
|
}
|
|
473
497
|
});
|
|
498
|
+
Object.defineProperty(exports, "ProductShare", {
|
|
499
|
+
enumerable: true,
|
|
500
|
+
get: function get() {
|
|
501
|
+
return _ProductShare.ProductShare;
|
|
502
|
+
}
|
|
503
|
+
});
|
|
474
504
|
Object.defineProperty(exports, "ProfessionalFilter", {
|
|
475
505
|
enumerable: true,
|
|
476
506
|
get: function get() {
|
|
@@ -627,6 +657,12 @@ Object.defineProperty(exports, "StripeRedirectForm", {
|
|
|
627
657
|
return _StripeRedirectForm.StripeRedirectForm;
|
|
628
658
|
}
|
|
629
659
|
});
|
|
660
|
+
Object.defineProperty(exports, "Switch", {
|
|
661
|
+
enumerable: true,
|
|
662
|
+
get: function get() {
|
|
663
|
+
return _Switch.Switch;
|
|
664
|
+
}
|
|
665
|
+
});
|
|
630
666
|
Object.defineProperty(exports, "TextArea", {
|
|
631
667
|
enumerable: true,
|
|
632
668
|
get: function get() {
|
|
@@ -788,8 +824,14 @@ var _ProfessionalFilter = require("./src/components/ProfessionalFilter");
|
|
|
788
824
|
var _SearchProducts = require("./src/components/SearchProducts");
|
|
789
825
|
var _MultiCartsPaymethodsAndWallets = require("./src/components/MultiCartsPaymethodsAndWallets");
|
|
790
826
|
var _ProfessionalProfile = require("./src/components/ProfessionalProfile");
|
|
827
|
+
var _OrderHistory = require("./src/components/OrderDetails/OrderHistory");
|
|
828
|
+
var _OrderBillSection = require("./src/components/OrderDetails/OrderBillSection");
|
|
829
|
+
var _OrderPreferencesSections = require("./src/components/OrderDetails/OrderPreferencesSections");
|
|
830
|
+
var _ActionsSection = require("./src/components/OrderDetails/ActionsSection");
|
|
831
|
+
var _ProductShare = require("./src/components/ProductShare");
|
|
791
832
|
var _Buttons = require("./src/styles/Buttons");
|
|
792
833
|
var _Inputs = require("./src/styles/Inputs");
|
|
793
834
|
var _Select = require("./src/styles/Select");
|
|
794
835
|
var _Checkbox = require("../../styles/Checkbox");
|
|
836
|
+
var _Switch = require("../../styles/Switch");
|
|
795
837
|
var _NavigationBar = require("./src/components/NavigationBar");
|
|
@@ -9,6 +9,7 @@ var _react = _interopRequireWildcard(require("react"));
|
|
|
9
9
|
var _reactLoadingSkeleton = _interopRequireDefault(require("react-loading-skeleton"));
|
|
10
10
|
var _orderingComponentsExternal = require("ordering-components-external");
|
|
11
11
|
var _RiUser2Fill = _interopRequireDefault(require("@meronex/icons/ri/RiUser2Fill"));
|
|
12
|
+
var _FaUserAlt = _interopRequireDefault(require("@meronex/icons/fa/FaUserAlt"));
|
|
12
13
|
var _Buttons = require("../../styles/Buttons");
|
|
13
14
|
var _NotFoundSource = require("../NotFoundSource");
|
|
14
15
|
var _ProductItemAccordion = require("../ProductItemAccordion");
|
|
@@ -33,6 +34,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
|
|
|
33
34
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
34
35
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
35
36
|
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
|
37
|
+
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
|
38
|
+
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
39
|
+
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
|
40
|
+
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
|
36
41
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
37
42
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
38
43
|
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
@@ -46,7 +51,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
|
|
|
46
51
|
function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
|
|
47
52
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
48
53
|
var OrderDetailsUI = function OrderDetailsUI(props) {
|
|
49
|
-
var _configs$google_maps_, _orderingTheme$theme, _orderingTheme$theme$, _orderingTheme$theme$2, _orderingTheme$theme$3, _orderingTheme$theme2, _orderingTheme$theme3, _orderingTheme$theme4, _orderingTheme$theme5, _orderingTheme$theme6, _orderingTheme$theme7, _orderingTheme$theme8, _orderingTheme$theme9, _orderingTheme$theme10, _orderingTheme$theme11, _orderingTheme$theme12, _orderingTheme$theme13, _orderingTheme$theme14, _orderingTheme$theme15, _orderingTheme$theme16, _orderingTheme$theme17, _orderingTheme$theme18, _orderingTheme$theme19, _orderingTheme$theme20, _orderingTheme$theme21, _orderingTheme$theme22, _orderingTheme$theme23, _orderingTheme$theme24, _orderingTheme$theme25, _orderingTheme$theme26, _orderingTheme$theme27, _orderingTheme$theme28, _orderingTheme$theme29, _orderingTheme$theme30, _orderingTheme$theme31, _orderingTheme$theme32, _orderingTheme$theme33, _orderingTheme$theme34, _orderingTheme$theme35, _orderingTheme$theme36, _orderingTheme$theme37, _orderingTheme$theme38, _orderingTheme$theme39, _orderingTheme$theme40, _orderingTheme$theme41, _orderingTheme$theme42, _orderingTheme$theme43, _orderingTheme$theme44, _orderingTheme$theme45, _orderingTheme$theme46, _orderingTheme$theme47, _orderingTheme$theme48, _orderingTheme$theme49, _orderingTheme$theme50, _orderingTheme$theme51, _orderingTheme$theme52, _orderingTheme$theme53, _orderingTheme$theme54, _orderingTheme$theme55, _orderingTheme$theme56, _orderingTheme$theme57, _orderingTheme$theme58, _orderingTheme$theme59, _orderingTheme$theme60, _orderingTheme$theme61, _orderingTheme$theme62, _orderingTheme$theme63, _orderingTheme$theme64, _orderingTheme$theme65, _orderingTheme$theme66, _orderingTheme$theme67, _orderingTheme$theme68, _orderingTheme$theme69, _orderingTheme$theme70, _orderingTheme$theme71, _orderingTheme$theme72, _orderingTheme$theme73, _orderingTheme$theme74, _orderingTheme$theme75, _orderingTheme$theme76, _orderingTheme$theme77, _orderingTheme$theme78, _orderingTheme$theme79, _orderingTheme$theme80, _orderingTheme$theme81, _orderingTheme$theme82, _orderingTheme$theme83, _orderingTheme$theme84, _orderingTheme$theme85, _orderingTheme$theme86, _orderingTheme$theme87, _orderingTheme$theme88, _orderingTheme$theme89, _orderingTheme$theme90, _orderingTheme$theme91, _orderingTheme$theme92, _orderingTheme$theme93, _orderingTheme$theme94, _orderingTheme$theme95, _orderingTheme$theme96, _orderingTheme$theme97, _order$driver, _order$driver2, _theme$images, _theme$images$dummies, _order$business2, _order$business3, _theme$images2, _theme$images2$dummie, _order$customer, _order$customer2, _theme$images3, _theme$images3$dummie, _theme$defaultLanguag28, _configs$guest_uuid_a, _orderTypes$find, _getOrderStatus, _getOrderStatus2, _theme$defaultLanguag29, _order$business4, _order$business5, _order$business6, _order$business7, _order$business8, _order$place, _order$place2, _getOrderStatus3, _getOrderStatus4, _order$business9, _order$customer3, _order$customer4, _order$customer5, _order$customer6, _order$customer7, _order$customer8, _order$customer9, _order$customer10, _theme$defaultLanguag30, _order$driver4, _order$driver5, _order$driver6, _order$driver7, _order$driver8, _order$driver9, _order$driver10,
|
|
54
|
+
var _configs$google_maps_, _orderingTheme$theme, _orderingTheme$theme$, _orderingTheme$theme$2, _orderingTheme$theme$3, _orderingTheme$theme2, _orderingTheme$theme3, _orderingTheme$theme4, _orderingTheme$theme5, _orderingTheme$theme6, _orderingTheme$theme7, _orderingTheme$theme8, _orderingTheme$theme9, _orderingTheme$theme10, _orderingTheme$theme11, _orderingTheme$theme12, _orderingTheme$theme13, _orderingTheme$theme14, _orderingTheme$theme15, _orderingTheme$theme16, _orderingTheme$theme17, _orderingTheme$theme18, _orderingTheme$theme19, _orderingTheme$theme20, _orderingTheme$theme21, _orderingTheme$theme22, _orderingTheme$theme23, _orderingTheme$theme24, _orderingTheme$theme25, _orderingTheme$theme26, _orderingTheme$theme27, _orderingTheme$theme28, _orderingTheme$theme29, _orderingTheme$theme30, _orderingTheme$theme31, _orderingTheme$theme32, _orderingTheme$theme33, _orderingTheme$theme34, _orderingTheme$theme35, _orderingTheme$theme36, _orderingTheme$theme37, _orderingTheme$theme38, _orderingTheme$theme39, _orderingTheme$theme40, _orderingTheme$theme41, _orderingTheme$theme42, _orderingTheme$theme43, _orderingTheme$theme44, _orderingTheme$theme45, _orderingTheme$theme46, _orderingTheme$theme47, _orderingTheme$theme48, _orderingTheme$theme49, _orderingTheme$theme50, _orderingTheme$theme51, _orderingTheme$theme52, _orderingTheme$theme53, _orderingTheme$theme54, _orderingTheme$theme55, _orderingTheme$theme56, _orderingTheme$theme57, _orderingTheme$theme58, _orderingTheme$theme59, _orderingTheme$theme60, _orderingTheme$theme61, _orderingTheme$theme62, _orderingTheme$theme63, _orderingTheme$theme64, _orderingTheme$theme65, _orderingTheme$theme66, _orderingTheme$theme67, _orderingTheme$theme68, _orderingTheme$theme69, _orderingTheme$theme70, _orderingTheme$theme71, _orderingTheme$theme72, _orderingTheme$theme73, _orderingTheme$theme74, _orderingTheme$theme75, _orderingTheme$theme76, _orderingTheme$theme77, _orderingTheme$theme78, _orderingTheme$theme79, _orderingTheme$theme80, _orderingTheme$theme81, _orderingTheme$theme82, _orderingTheme$theme83, _orderingTheme$theme84, _orderingTheme$theme85, _orderingTheme$theme86, _orderingTheme$theme87, _orderingTheme$theme88, _orderingTheme$theme89, _orderingTheme$theme90, _orderingTheme$theme91, _orderingTheme$theme92, _orderingTheme$theme93, _orderingTheme$theme94, _orderingTheme$theme95, _orderingTheme$theme96, _orderingTheme$theme97, _order$driver, _order$driver2, _theme$images, _theme$images$dummies, _order$business2, _order$business3, _theme$images2, _theme$images2$dummie, _order$customer, _order$customer2, _theme$images3, _theme$images3$dummie, _theme$defaultLanguag28, _configs$guest_uuid_a, _orderTypes$find, _getOrderStatus, _getOrderStatus2, _theme$defaultLanguag29, _order$business4, _order$business5, _order$business6, _order$business7, _order$business8, _order$place, _order$place2, _getOrderStatus3, _getOrderStatus4, _order$business9, _order$customer3, _order$customer4, _order$customer5, _order$customer6, _order$customer7, _order$customer8, _order$customer9, _order$customer10, _theme$defaultLanguag30, _order$driver4, _order$driver5, _order$driver6, _order$driver7, _order$driver8, _order$driver9, _order$driver10, _theme$defaultLanguag31, _theme$defaultLanguag32, _theme$defaultLanguag33, _openTaxModal$data, _openTaxModal$data2, _openTaxModal$data3, _openTaxModal$data4, _openTaxModal$data$fi, _openTaxModal$data5, _openTaxModal$data6;
|
|
50
55
|
var userCustomerId = props.userCustomerId,
|
|
51
56
|
handleChangeOrderStatus = props.handleChangeOrderStatus,
|
|
52
57
|
handleBusinessRedirect = props.handleBusinessRedirect,
|
|
@@ -502,6 +507,45 @@ var OrderDetailsUI = function OrderDetailsUI(props) {
|
|
|
502
507
|
}));
|
|
503
508
|
handleReorder(order.id);
|
|
504
509
|
};
|
|
510
|
+
var getProductList = function getProductList() {
|
|
511
|
+
var professionalList = order === null || order === void 0 ? void 0 : order.products.reduce(function (prev, current) {
|
|
512
|
+
var _current$calendar_eve3;
|
|
513
|
+
var found = prev.find(function (item) {
|
|
514
|
+
var _current$calendar_eve, _current$calendar_eve2;
|
|
515
|
+
return item.id === (current === null || current === void 0 ? void 0 : (_current$calendar_eve = current.calendar_event) === null || _current$calendar_eve === void 0 ? void 0 : (_current$calendar_eve2 = _current$calendar_eve.professional) === null || _current$calendar_eve2 === void 0 ? void 0 : _current$calendar_eve2.id);
|
|
516
|
+
});
|
|
517
|
+
if (found || !(current !== null && current !== void 0 && current.calendar_event)) {
|
|
518
|
+
return prev;
|
|
519
|
+
}
|
|
520
|
+
return [].concat(_toConsumableArray(prev), [current === null || current === void 0 ? void 0 : (_current$calendar_eve3 = current.calendar_event) === null || _current$calendar_eve3 === void 0 ? void 0 : _current$calendar_eve3.professional]);
|
|
521
|
+
}, []);
|
|
522
|
+
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (professionalList === null || professionalList === void 0 ? void 0 : professionalList.length) > 0 && professionalList.map(function (professional, i) {
|
|
523
|
+
return /*#__PURE__*/_react.default.createElement(_styles.ProfessionalBlock, {
|
|
524
|
+
key: i
|
|
525
|
+
}, /*#__PURE__*/_react.default.createElement(_styles.ProfessionalWrapper, null, professional !== null && professional !== void 0 && professional.photo ? /*#__PURE__*/_react.default.createElement("img", {
|
|
526
|
+
src: professional === null || professional === void 0 ? void 0 : professional.photo,
|
|
527
|
+
alt: ""
|
|
528
|
+
}) : /*#__PURE__*/_react.default.createElement(_FaUserAlt.default, null), /*#__PURE__*/_react.default.createElement("p", null, professional === null || professional === void 0 ? void 0 : professional.name, " ", professional === null || professional === void 0 ? void 0 : professional.lastname)), order === null || order === void 0 ? void 0 : order.products.filter(function (product) {
|
|
529
|
+
var _product$calendar_eve, _product$calendar_eve2;
|
|
530
|
+
return (product === null || product === void 0 ? void 0 : (_product$calendar_eve = product.calendar_event) === null || _product$calendar_eve === void 0 ? void 0 : (_product$calendar_eve2 = _product$calendar_eve.professional) === null || _product$calendar_eve2 === void 0 ? void 0 : _product$calendar_eve2.id) === (professional === null || professional === void 0 ? void 0 : professional.id);
|
|
531
|
+
}).map(function (product) {
|
|
532
|
+
return /*#__PURE__*/_react.default.createElement(_ProductItemAccordion.ProductItemAccordion, {
|
|
533
|
+
key: product.id,
|
|
534
|
+
product: product
|
|
535
|
+
});
|
|
536
|
+
}));
|
|
537
|
+
}), order === null || order === void 0 ? void 0 : order.products.filter(function (product) {
|
|
538
|
+
return !(product !== null && product !== void 0 && product.calendar_event);
|
|
539
|
+
}).map(function (product) {
|
|
540
|
+
return /*#__PURE__*/_react.default.createElement(_ProductItemAccordion.ProductItemAccordion, {
|
|
541
|
+
key: product.id,
|
|
542
|
+
product: product
|
|
543
|
+
});
|
|
544
|
+
}));
|
|
545
|
+
};
|
|
546
|
+
var sortedProductList = (0, _react.useMemo)(function () {
|
|
547
|
+
return getProductList();
|
|
548
|
+
}, [order === null || order === void 0 ? void 0 : order.products]);
|
|
505
549
|
var ActionsSectionProps = {
|
|
506
550
|
order: order,
|
|
507
551
|
handleBusinessRedirect: handleBusinessRedirect,
|
|
@@ -710,12 +754,7 @@ var OrderDetailsUI = function OrderDetailsUI(props) {
|
|
|
710
754
|
}) : /*#__PURE__*/_react.default.createElement(_RiUser2Fill.default, null)), /*#__PURE__*/_react.default.createElement("div", null, showDriverName && /*#__PURE__*/_react.default.createElement("h2", null, order === null || order === void 0 ? void 0 : (_order$driver6 = order.driver) === null || _order$driver6 === void 0 ? void 0 : _order$driver6.name, " ", order === null || order === void 0 ? void 0 : (_order$driver7 = order.driver) === null || _order$driver7 === void 0 ? void 0 : _order$driver7.lastname), showDriverEmail && /*#__PURE__*/_react.default.createElement("p", null, order === null || order === void 0 ? void 0 : (_order$driver8 = order.driver) === null || _order$driver8 === void 0 ? void 0 : _order$driver8.email), showDriverPhone && /*#__PURE__*/_react.default.createElement("p", null, (order === null || order === void 0 ? void 0 : (_order$driver9 = order.driver) === null || _order$driver9 === void 0 ? void 0 : _order$driver9.cellphone) || (order === null || order === void 0 ? void 0 : (_order$driver10 = order.driver) === null || _order$driver10 === void 0 ? void 0 : _order$driver10.phone))))), !isOriginalLayout && /*#__PURE__*/_react.default.createElement(OrderMapSection, null)), ((order === null || order === void 0 ? void 0 : order.delivery_type) === 1 || (order === null || order === void 0 ? void 0 : order.comment)) && /*#__PURE__*/_react.default.createElement(_styles.OrderPreferences, null, /*#__PURE__*/_react.default.createElement(_OrderPreferencesSections.OrderPreferencesSection, {
|
|
711
755
|
order: order,
|
|
712
756
|
placeSpotTypes: placeSpotTypes
|
|
713
|
-
}))), /*#__PURE__*/_react.default.createElement(_styles.WrapperRightContainer, null, /*#__PURE__*/_react.default.createElement(_styles.OrderProducts, null, /*#__PURE__*/_react.default.createElement(_styles.HeaderTitle, null, /*#__PURE__*/_react.default.createElement(OrderHeaderInfoSection, null), /*#__PURE__*/_react.default.createElement(OrderActionsSection, null)),
|
|
714
|
-
return /*#__PURE__*/_react.default.createElement(_ProductItemAccordion.ProductItemAccordion, {
|
|
715
|
-
key: product.id,
|
|
716
|
-
product: product
|
|
717
|
-
});
|
|
718
|
-
})), /*#__PURE__*/_react.default.createElement(_OrderBillSection.OrderBillSection, {
|
|
757
|
+
}))), /*#__PURE__*/_react.default.createElement(_styles.WrapperRightContainer, null, /*#__PURE__*/_react.default.createElement(_styles.OrderProducts, null, /*#__PURE__*/_react.default.createElement(_styles.HeaderTitle, null, /*#__PURE__*/_react.default.createElement(OrderHeaderInfoSection, null), /*#__PURE__*/_react.default.createElement(OrderActionsSection, null)), sortedProductList, /*#__PURE__*/_react.default.createElement(_OrderBillSection.OrderBillSection, {
|
|
719
758
|
order: order,
|
|
720
759
|
setOpenTaxModal: setOpenTaxModal
|
|
721
760
|
})))), (openMessages.driver || openMessages.business) && /*#__PURE__*/_react.default.createElement(_Messages.Messages, {
|
|
@@ -4,10 +4,10 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
|
-
exports.WrapperRightContainer = exports.WrapperLeftContainer = exports.WrapperDriver = exports.WrapperContainer = exports.TitleContainer = exports.StatusBar = exports.SkeletonWrapper = exports.SkeletonBlockWrapp = exports.SkeletonBlock = exports.ShareOrder = exports.SectionTitleContainer = exports.SectionTitle = exports.ReviewWrapper = exports.ReviewOrderLink = exports.ReOrder = exports.PlaceSpotSection = exports.PhotoBlock = exports.OrderStatusAndLinkContainer = exports.OrderProducts = exports.OrderPreferences = exports.OrderInfo = exports.OrderIdSec = exports.OrderHistoryContainer = exports.OrderDriver = exports.OrderCustomer = exports.OrderBusiness = exports.OrderBill = exports.OrderActions = exports.NewOrder = exports.MyOrderActions = exports.MessagesIcon = exports.MapWrapper = exports.Map = exports.LinkWrapper = exports.HistoryItemWrapper = exports.HeaderTitle = exports.HeaderInfo = exports.ExclamationWrapper = exports.Exclamation = exports.Divider = exports.DetailWrapper = exports.Content = exports.Container = exports.CommentContainer = exports.ButtonWrapper = exports.BusinessWrapper = exports.BusinessTitle = exports.BusinessInfo = exports.BusinessExternalWrapper = exports.BtsOrderStatus = exports.ActionsBlock = void 0;
|
|
7
|
+
exports.WrapperRightContainer = exports.WrapperLeftContainer = exports.WrapperDriver = exports.WrapperContainer = exports.TitleContainer = exports.StatusBar = exports.SkeletonWrapper = exports.SkeletonBlockWrapp = exports.SkeletonBlock = exports.ShareOrder = exports.SectionTitleContainer = exports.SectionTitle = exports.ReviewWrapper = exports.ReviewOrderLink = exports.ReOrder = exports.ProfessionalWrapper = exports.ProfessionalBlock = exports.PlaceSpotSection = exports.PhotoBlock = exports.OrderStatusAndLinkContainer = exports.OrderProducts = exports.OrderPreferences = exports.OrderInfo = exports.OrderIdSec = exports.OrderHistoryContainer = exports.OrderDriver = exports.OrderCustomer = exports.OrderBusiness = exports.OrderBill = exports.OrderActions = exports.NewOrder = exports.MyOrderActions = exports.MessagesIcon = exports.MapWrapper = exports.Map = exports.LinkWrapper = exports.HistoryItemWrapper = exports.HeaderTitle = exports.HeaderInfo = exports.ExclamationWrapper = exports.Exclamation = exports.Divider = exports.DetailWrapper = exports.Content = exports.Container = exports.CommentContainer = exports.ButtonWrapper = exports.BusinessWrapper = exports.BusinessTitle = exports.BusinessInfo = exports.BusinessExternalWrapper = exports.BtsOrderStatus = exports.ActionsBlock = void 0;
|
|
8
8
|
var _react = _interopRequireDefault(require("react"));
|
|
9
9
|
var _styledComponents = _interopRequireWildcard(require("styled-components"));
|
|
10
|
-
var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18, _templateObject19, _templateObject20, _templateObject21, _templateObject22, _templateObject23, _templateObject24, _templateObject25, _templateObject26, _templateObject27, _templateObject28, _templateObject29, _templateObject30, _templateObject31, _templateObject32, _templateObject33, _templateObject34, _templateObject35, _templateObject36, _templateObject37, _templateObject38, _templateObject39, _templateObject40, _templateObject41, _templateObject42, _templateObject43, _templateObject44, _templateObject45, _templateObject46, _templateObject47, _templateObject48, _templateObject49, _templateObject50, _templateObject51, _templateObject52, _templateObject53, _templateObject54, _templateObject55, _templateObject56, _templateObject57, _templateObject58, _templateObject59, _templateObject60, _templateObject61, _templateObject62;
|
|
10
|
+
var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18, _templateObject19, _templateObject20, _templateObject21, _templateObject22, _templateObject23, _templateObject24, _templateObject25, _templateObject26, _templateObject27, _templateObject28, _templateObject29, _templateObject30, _templateObject31, _templateObject32, _templateObject33, _templateObject34, _templateObject35, _templateObject36, _templateObject37, _templateObject38, _templateObject39, _templateObject40, _templateObject41, _templateObject42, _templateObject43, _templateObject44, _templateObject45, _templateObject46, _templateObject47, _templateObject48, _templateObject49, _templateObject50, _templateObject51, _templateObject52, _templateObject53, _templateObject54, _templateObject55, _templateObject56, _templateObject57, _templateObject58, _templateObject59, _templateObject60, _templateObject61, _templateObject62, _templateObject63, _templateObject64, _templateObject65;
|
|
11
11
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
12
12
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
13
13
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
@@ -174,4 +174,12 @@ exports.ButtonWrapper = ButtonWrapper;
|
|
|
174
174
|
var MapWrapper = _styledComponents.default.div(_templateObject61 || (_templateObject61 = _taggedTemplateLiteral(["\n width: 100%;\n margin-top: 20px;\n\n @media (min-width: 769px) {\n width: 50%;\n margin-top: 0px;\n }\n"])));
|
|
175
175
|
exports.MapWrapper = MapWrapper;
|
|
176
176
|
var BusinessExternalWrapper = _styledComponents.default.div(_templateObject62 || (_templateObject62 = _taggedTemplateLiteral(["\n display: flex;\n flex-direction: column;\n width: 100%;\n\n @media (min-width: 769px) {\n width: 50%;\n }\n"])));
|
|
177
|
-
exports.BusinessExternalWrapper = BusinessExternalWrapper;
|
|
177
|
+
exports.BusinessExternalWrapper = BusinessExternalWrapper;
|
|
178
|
+
var ProfessionalWrapper = _styledComponents.default.div(_templateObject63 || (_templateObject63 = _taggedTemplateLiteral(["\n display: flex;\n align-items: center;\n margin: 0px 10px 10px 10px;\n\n > img {\n width: 55px;\n height: 55px;\n min-width: 55px;\n border-radius: 8px;\n object-fit: cover;\n }\n\n > svg {\n width: 55px;\n height: 55px;\n min-width: 55px;\n }\n\n > p {\n font-weight: 600;\n font-size: 17px;\n line-height: 26px;\n margin-left: 14px;\n\n ", "\n }\n\n @media (min-width: 411px) {\n > img {\n width: 65px;\n height: 65px;\n min-width: 65px;\n }\n > svg {\n width: 65px;\n height: 65px;\n min-width: 65px;\n }\n }\n"])), function (props) {
|
|
179
|
+
return props.theme.rtl && (0, _styledComponents.css)(_templateObject64 || (_templateObject64 = _taggedTemplateLiteral(["\n margin-left: 0px;\n margin-right: 14px;\n "])));
|
|
180
|
+
});
|
|
181
|
+
exports.ProfessionalWrapper = ProfessionalWrapper;
|
|
182
|
+
var ProfessionalBlock = _styledComponents.default.div(_templateObject65 || (_templateObject65 = _taggedTemplateLiteral(["\n border-bottom: 1px solid ", ";\n margin-bottom: 15px;\n"])), function (props) {
|
|
183
|
+
return props.theme.colors.disabled;
|
|
184
|
+
});
|
|
185
|
+
exports.ProfessionalBlock = ProfessionalBlock;
|
package/package.json
CHANGED
package/src/themes/five/index.js
CHANGED
|
@@ -105,11 +105,17 @@ import { ProfessionalFilter } from './src/components/ProfessionalFilter'
|
|
|
105
105
|
import { SearchProducts } from './src/components/SearchProducts'
|
|
106
106
|
import { MultiCartsPaymethodsAndWallets } from './src/components/MultiCartsPaymethodsAndWallets'
|
|
107
107
|
import { ProfessionalProfile } from './src/components/ProfessionalProfile'
|
|
108
|
+
import { OrderHistory } from './src/components/OrderDetails/OrderHistory'
|
|
109
|
+
import { OrderBillSection } from './src/components/OrderDetails/OrderBillSection'
|
|
110
|
+
import { OrderPreferencesSection } from './src/components/OrderDetails/OrderPreferencesSections'
|
|
111
|
+
import { ActionsSection } from './src/components/OrderDetails/ActionsSection'
|
|
112
|
+
import { ProductShare } from './src/components/ProductShare'
|
|
108
113
|
|
|
109
114
|
import { Button } from './src/styles/Buttons'
|
|
110
115
|
import { Input, TextArea } from './src/styles/Inputs'
|
|
111
116
|
import { Select } from './src/styles/Select'
|
|
112
117
|
import { Checkbox } from '../../styles/Checkbox'
|
|
118
|
+
import { Switch } from '../../styles/Switch'
|
|
113
119
|
import { NavigationBar } from './src/components/NavigationBar'
|
|
114
120
|
|
|
115
121
|
export {
|
|
@@ -220,6 +226,11 @@ export {
|
|
|
220
226
|
SearchProducts,
|
|
221
227
|
MultiCartsPaymethodsAndWallets,
|
|
222
228
|
ProfessionalProfile,
|
|
229
|
+
OrderHistory,
|
|
230
|
+
OrderBillSection,
|
|
231
|
+
OrderPreferencesSection,
|
|
232
|
+
ActionsSection,
|
|
233
|
+
ProductShare,
|
|
223
234
|
|
|
224
235
|
// styles
|
|
225
236
|
Button,
|
|
@@ -227,5 +238,6 @@ export {
|
|
|
227
238
|
TextArea,
|
|
228
239
|
Select,
|
|
229
240
|
Checkbox,
|
|
230
|
-
NavigationBar
|
|
241
|
+
NavigationBar,
|
|
242
|
+
Switch
|
|
231
243
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React, { useState, useEffect } from 'react'
|
|
1
|
+
import React, { useState, useEffect, useMemo } from 'react'
|
|
2
2
|
import Skeleton from 'react-loading-skeleton'
|
|
3
3
|
import {
|
|
4
4
|
useLanguage,
|
|
@@ -12,6 +12,7 @@ import {
|
|
|
12
12
|
useOrderingTheme
|
|
13
13
|
} from 'ordering-components-external'
|
|
14
14
|
import RiUser2Fill from '@meronex/icons/ri/RiUser2Fill'
|
|
15
|
+
import FaUserAlt from '@meronex/icons/fa/FaUserAlt'
|
|
15
16
|
|
|
16
17
|
import { Button } from '../../styles/Buttons'
|
|
17
18
|
import { NotFoundSource } from '../NotFoundSource'
|
|
@@ -65,7 +66,9 @@ import {
|
|
|
65
66
|
OrderStatusAndLinkContainer,
|
|
66
67
|
LinkWrapper,
|
|
67
68
|
MapWrapper,
|
|
68
|
-
BusinessExternalWrapper
|
|
69
|
+
BusinessExternalWrapper,
|
|
70
|
+
ProfessionalWrapper,
|
|
71
|
+
ProfessionalBlock
|
|
69
72
|
} from './styles'
|
|
70
73
|
import { useTheme } from 'styled-components'
|
|
71
74
|
import { TaxInformation } from '../TaxInformation'
|
|
@@ -285,6 +288,45 @@ const OrderDetailsUI = (props) => {
|
|
|
285
288
|
handleReorder(order.id)
|
|
286
289
|
}
|
|
287
290
|
|
|
291
|
+
const getProductList = () => {
|
|
292
|
+
const professionalList = order?.products.reduce((prev, current) => {
|
|
293
|
+
const found = prev.find(item => item.id === current?.calendar_event?.professional?.id)
|
|
294
|
+
if (found || !current?.calendar_event) {
|
|
295
|
+
return prev
|
|
296
|
+
}
|
|
297
|
+
return [...prev, current?.calendar_event?.professional]
|
|
298
|
+
}, [])
|
|
299
|
+
|
|
300
|
+
return (
|
|
301
|
+
<>
|
|
302
|
+
{professionalList?.length > 0 && professionalList.map((professional, i) => (
|
|
303
|
+
<ProfessionalBlock key={i}>
|
|
304
|
+
<ProfessionalWrapper>
|
|
305
|
+
{professional?.photo
|
|
306
|
+
? <img src={professional?.photo} alt='' />
|
|
307
|
+
: <FaUserAlt />}
|
|
308
|
+
<p>{professional?.name} {professional?.lastname}</p>
|
|
309
|
+
</ProfessionalWrapper>
|
|
310
|
+
{order?.products.filter(product => product?.calendar_event?.professional?.id === professional?.id).map(product => (
|
|
311
|
+
<ProductItemAccordion
|
|
312
|
+
key={product.id}
|
|
313
|
+
product={product}
|
|
314
|
+
/>
|
|
315
|
+
))}
|
|
316
|
+
</ProfessionalBlock>
|
|
317
|
+
))}
|
|
318
|
+
{order?.products.filter(product => !product?.calendar_event).map(product => (
|
|
319
|
+
<ProductItemAccordion
|
|
320
|
+
key={product.id}
|
|
321
|
+
product={product}
|
|
322
|
+
/>
|
|
323
|
+
))}
|
|
324
|
+
</>
|
|
325
|
+
)
|
|
326
|
+
}
|
|
327
|
+
|
|
328
|
+
const sortedProductList = useMemo(() => getProductList(), [order?.products])
|
|
329
|
+
|
|
288
330
|
const ActionsSectionProps = {
|
|
289
331
|
order,
|
|
290
332
|
handleBusinessRedirect,
|
|
@@ -661,12 +703,7 @@ const OrderDetailsUI = (props) => {
|
|
|
661
703
|
<OrderHeaderInfoSection />
|
|
662
704
|
<OrderActionsSection />
|
|
663
705
|
</HeaderTitle>
|
|
664
|
-
{
|
|
665
|
-
<ProductItemAccordion
|
|
666
|
-
key={product.id}
|
|
667
|
-
product={product}
|
|
668
|
-
/>
|
|
669
|
-
))}
|
|
706
|
+
{sortedProductList}
|
|
670
707
|
<OrderBillSection
|
|
671
708
|
order={order}
|
|
672
709
|
setOpenTaxModal={setOpenTaxModal}
|
|
@@ -737,3 +737,53 @@ export const BusinessExternalWrapper = styled.div`
|
|
|
737
737
|
width: 50%;
|
|
738
738
|
}
|
|
739
739
|
`
|
|
740
|
+
|
|
741
|
+
export const ProfessionalWrapper = styled.div`
|
|
742
|
+
display: flex;
|
|
743
|
+
align-items: center;
|
|
744
|
+
margin: 0px 10px 10px 10px;
|
|
745
|
+
|
|
746
|
+
> img {
|
|
747
|
+
width: 55px;
|
|
748
|
+
height: 55px;
|
|
749
|
+
min-width: 55px;
|
|
750
|
+
border-radius: 8px;
|
|
751
|
+
object-fit: cover;
|
|
752
|
+
}
|
|
753
|
+
|
|
754
|
+
> svg {
|
|
755
|
+
width: 55px;
|
|
756
|
+
height: 55px;
|
|
757
|
+
min-width: 55px;
|
|
758
|
+
}
|
|
759
|
+
|
|
760
|
+
> p {
|
|
761
|
+
font-weight: 600;
|
|
762
|
+
font-size: 17px;
|
|
763
|
+
line-height: 26px;
|
|
764
|
+
margin-left: 14px;
|
|
765
|
+
|
|
766
|
+
${props => props.theme.rtl && css`
|
|
767
|
+
margin-left: 0px;
|
|
768
|
+
margin-right: 14px;
|
|
769
|
+
`}
|
|
770
|
+
}
|
|
771
|
+
|
|
772
|
+
@media (min-width: 411px) {
|
|
773
|
+
> img {
|
|
774
|
+
width: 65px;
|
|
775
|
+
height: 65px;
|
|
776
|
+
min-width: 65px;
|
|
777
|
+
}
|
|
778
|
+
> svg {
|
|
779
|
+
width: 65px;
|
|
780
|
+
height: 65px;
|
|
781
|
+
min-width: 65px;
|
|
782
|
+
}
|
|
783
|
+
}
|
|
784
|
+
`
|
|
785
|
+
|
|
786
|
+
export const ProfessionalBlock = styled.div`
|
|
787
|
+
border-bottom: 1px solid ${props => props.theme.colors.disabled};
|
|
788
|
+
margin-bottom: 15px;
|
|
789
|
+
`
|