ordering-ui-admin-external 1.42.2 → 1.42.4
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/{ordering-ui-admin.c1782bc1c61d75bbc817.js → ordering-ui-admin.3e25fedce2d4ce901566.js} +2 -2
- package/_modules/components/MyProducts/AdvancedSettings/index.js +8 -0
- package/_modules/components/Orders/OrdersTable/Order.js +10 -2
- package/_modules/components/Orders/OrdersTable/index.js +22 -4
- package/_modules/components/Orders/OrdersTable/styles.js +36 -34
- package/package.json +2 -2
- package/src/components/MyProducts/AdvancedSettings/index.js +4 -1
- package/src/components/Orders/OrdersTable/Order.js +13 -4
- package/src/components/Orders/OrdersTable/index.js +13 -1
- package/src/components/Orders/OrdersTable/styles.js +14 -0
- /package/_bundles/{ordering-ui-admin.c1782bc1c61d75bbc817.js.LICENSE.txt → ordering-ui-admin.3e25fedce2d4ce901566.js.LICENSE.txt} +0 -0
|
@@ -171,6 +171,14 @@ var AdvancedSettings = exports.AdvancedSettings = function AdvancedSettings(prop
|
|
|
171
171
|
name: t('BUSINESS_HEADER', 'Business header'),
|
|
172
172
|
type: 'hidden',
|
|
173
173
|
path: 'business_view.components.header.hidden'
|
|
174
|
+
}, {
|
|
175
|
+
name: t('BUSINESS_HEADER_REVIEWS', 'Business header reviews'),
|
|
176
|
+
type: 'hidden',
|
|
177
|
+
path: 'business_view.components.header.components.business.components.reviews.hidden'
|
|
178
|
+
}, {
|
|
179
|
+
name: t('BUSINESS_POPUP_REVIEWS', 'Business popup reviews'),
|
|
180
|
+
type: 'hidden',
|
|
181
|
+
path: 'business_view.components.header.components.reviews.hidden'
|
|
174
182
|
}];
|
|
175
183
|
var businessInfoList = [{
|
|
176
184
|
name: t('DESCRIPTION', 'Description'),
|
|
@@ -225,13 +225,21 @@ var Order = exports.Order = /*#__PURE__*/_react.default.memo(function (props) {
|
|
|
225
225
|
className: order === null || order === void 0 ? void 0 : order.time_status
|
|
226
226
|
}, displayDelayedTime(order))));
|
|
227
227
|
}
|
|
228
|
+
if (column === 'eta') {
|
|
229
|
+
return /*#__PURE__*/_react.default.createElement("td", {
|
|
230
|
+
className: "eta",
|
|
231
|
+
key: "eta".concat(i, "-").concat(index)
|
|
232
|
+
}, /*#__PURE__*/_react.default.createElement(_styles.EtaInfo, null, /*#__PURE__*/_react.default.createElement("p", {
|
|
233
|
+
className: "bold"
|
|
234
|
+
}, '')));
|
|
235
|
+
}
|
|
228
236
|
if (column === 'channel') {
|
|
229
237
|
return /*#__PURE__*/_react.default.createElement("td", {
|
|
230
238
|
className: "channelInfo",
|
|
231
239
|
key: "channelInfo".concat(i, "-").concat(index)
|
|
232
|
-
}, /*#__PURE__*/_react.default.createElement(_styles.
|
|
240
|
+
}, /*#__PURE__*/_react.default.createElement(_styles.ChannelInfo, null, /*#__PURE__*/_react.default.createElement("p", {
|
|
233
241
|
className: "bold"
|
|
234
|
-
},
|
|
242
|
+
}, order.app_id)));
|
|
235
243
|
}
|
|
236
244
|
if (column === 'total') {
|
|
237
245
|
var _allowColumns$total, _order$summary;
|
|
@@ -243,9 +243,22 @@ var OrdersTable = exports.OrdersTable = /*#__PURE__*/(0, _react.memo)(function (
|
|
|
243
243
|
return (_orderStatus$Number = orderStatus === null || orderStatus === void 0 ? void 0 : orderStatus[Number(s)]) !== null && _orderStatus$Number !== void 0 ? _orderStatus$Number : s;
|
|
244
244
|
};
|
|
245
245
|
var handleChangeAllowColumns = function handleChangeAllowColumns(type) {
|
|
246
|
-
var
|
|
246
|
+
var _column2;
|
|
247
|
+
var _column = {};
|
|
248
|
+
if (type === 'channel') {
|
|
249
|
+
_column = {
|
|
250
|
+
visable: allowColumns[type].visable,
|
|
251
|
+
title: t('CHANNEL', 'Channel'),
|
|
252
|
+
className: 'channelInfo',
|
|
253
|
+
draggable: true,
|
|
254
|
+
colSpan: 1,
|
|
255
|
+
order: 12
|
|
256
|
+
};
|
|
257
|
+
} else {
|
|
258
|
+
_column = allowColumns[type];
|
|
259
|
+
}
|
|
247
260
|
var updatedAllowColumns = _objectSpread(_objectSpread({}, allowColumns), {}, _defineProperty({}, type, _objectSpread(_objectSpread({}, _column), {}, {
|
|
248
|
-
visable: !(_column !== null &&
|
|
261
|
+
visable: !((_column2 = _column) !== null && _column2 !== void 0 && _column2.visable)
|
|
249
262
|
})));
|
|
250
263
|
setAllowColumns(updatedAllowColumns);
|
|
251
264
|
saveUserSettings(JSON.parse(JSON.stringify(updatedAllowColumns)));
|
|
@@ -469,7 +482,7 @@ var OrdersTable = exports.OrdersTable = /*#__PURE__*/(0, _react.memo)(function (
|
|
|
469
482
|
alt: "six dots"
|
|
470
483
|
}), /*#__PURE__*/_react.default.createElement("span", null, (_allowColumns$column9 = allowColumns[column]) === null || _allowColumns$column9 === void 0 ? void 0 : _allowColumns$column9.title)));
|
|
471
484
|
})))), orderList.loading || !allowColumns ? _toConsumableArray(Array(10).keys()).map(function (i) {
|
|
472
|
-
var _allowColumns$slaBar2, _allowColumns$orderNu2, _allowColumns$dateTim2, _allowColumns$orderNu3, _allowColumns$dateTim3, _allowColumns$externa, _allowColumns$cartGro, _allowColumns$driverG, _allowColumns$status, _allowColumns$busines, _allowColumns$custome, _allowColumns$driver, _allowColumns$deliver, _allowColumns$status2, _allowColumns$advance, _allowColumns$advance2, _allowColumns$advance3, _allowColumns$total;
|
|
485
|
+
var _allowColumns$slaBar2, _allowColumns$orderNu2, _allowColumns$dateTim2, _allowColumns$orderNu3, _allowColumns$dateTim3, _allowColumns$externa, _allowColumns$cartGro, _allowColumns$driverG, _allowColumns$status, _allowColumns$busines, _allowColumns$custome, _allowColumns$driver, _allowColumns$deliver, _allowColumns$status2, _allowColumns$advance, _allowColumns$advance2, _allowColumns$advance3, _allowColumns$channel, _allowColumns$total;
|
|
473
486
|
return /*#__PURE__*/_react.default.createElement(_styles.OrderTbody, {
|
|
474
487
|
key: i
|
|
475
488
|
}, /*#__PURE__*/_react.default.createElement("tr", null, (allowColumns === null || allowColumns === void 0 || (_allowColumns$slaBar2 = allowColumns.slaBar) === null || _allowColumns$slaBar2 === void 0 ? void 0 : _allowColumns$slaBar2.visable) && /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles.Timestatus, null)), /*#__PURE__*/_react.default.createElement("td", {
|
|
@@ -596,7 +609,12 @@ var OrdersTable = exports.OrdersTable = /*#__PURE__*/(0, _react.memo)(function (
|
|
|
596
609
|
width: 60
|
|
597
610
|
})), /*#__PURE__*/_react.default.createElement("p", null, /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
|
|
598
611
|
width: 60
|
|
599
|
-
})))), !isSelectedOrders && /*#__PURE__*/_react.default.createElement("td", {
|
|
612
|
+
})))), (allowColumns === null || allowColumns === void 0 || (_allowColumns$channel = allowColumns.channel) === null || _allowColumns$channel === void 0 ? void 0 : _allowColumns$channel.visable) && !isSelectedOrders && /*#__PURE__*/_react.default.createElement("td", {
|
|
613
|
+
className: "orderStatusTitle"
|
|
614
|
+
}, /*#__PURE__*/_react.default.createElement(_styles.WrapOrderStatusSelector, null, /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
|
|
615
|
+
width: 100,
|
|
616
|
+
height: 30
|
|
617
|
+
}))), !isSelectedOrders && /*#__PURE__*/_react.default.createElement("td", {
|
|
600
618
|
className: "orderPrice"
|
|
601
619
|
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
602
620
|
className: "info"
|
|
@@ -4,9 +4,9 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
|
-
exports.WrapperPagination = exports.WrapperImage = exports.WrapOrderStatusSelector = exports.Timestatus = exports.Timer = exports.Table = exports.StatusInfo = exports.PriorityDot = exports.OrdersCountWrapper = exports.OrdersContainer = exports.OrderType = exports.OrderTbody = exports.OrderNumberContainer = exports.LogisticStatusDot = exports.InfoWrapper = exports.DriversInfo = exports.DragTh = exports.CustomerInfo = exports.CheckBox = exports.BusinessInfo = void 0;
|
|
7
|
+
exports.WrapperPagination = exports.WrapperImage = exports.WrapOrderStatusSelector = exports.Timestatus = exports.Timer = exports.Table = exports.StatusInfo = exports.PriorityDot = exports.OrdersCountWrapper = exports.OrdersContainer = exports.OrderType = exports.OrderTbody = exports.OrderNumberContainer = exports.LogisticStatusDot = exports.InfoWrapper = exports.EtaInfo = exports.DriversInfo = exports.DragTh = exports.CustomerInfo = exports.CheckBox = exports.ChannelInfo = exports.BusinessInfo = void 0;
|
|
8
8
|
var _styledComponents = _interopRequireWildcard(require("styled-components"));
|
|
9
|
-
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;
|
|
9
|
+
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;
|
|
10
10
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
|
|
11
11
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
12
12
|
function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
|
|
@@ -86,116 +86,118 @@ var BusinessInfo = exports.BusinessInfo = _styledComponents.default.div(_templat
|
|
|
86
86
|
});
|
|
87
87
|
var CustomerInfo = exports.CustomerInfo = (0, _styledComponents.default)(BusinessInfo)(_templateObject20 || (_templateObject20 = _taggedTemplateLiteral(["\n p {\n max-width: 125px;\n }\n"])));
|
|
88
88
|
var StatusInfo = exports.StatusInfo = _styledComponents.default.div(_templateObject21 || (_templateObject21 = _taggedTemplateLiteral(["\n .bold {\n max-width: 150px;\n font-weight: 600;\n margin: 0;\n }\n"])));
|
|
89
|
-
var
|
|
89
|
+
var ChannelInfo = exports.ChannelInfo = _styledComponents.default.div(_templateObject22 || (_templateObject22 = _taggedTemplateLiteral(["\n .bold {\n max-width: 150px;\n font-weight: 600;\n margin: 0;\n }\n"])));
|
|
90
|
+
var EtaInfo = exports.EtaInfo = _styledComponents.default.div(_templateObject23 || (_templateObject23 = _taggedTemplateLiteral(["\n .bold {\n max-width: 150px;\n font-weight: 600;\n margin: 0;\n }\n"])));
|
|
91
|
+
var DriversInfo = exports.DriversInfo = _styledComponents.default.div(_templateObject24 || (_templateObject24 = _taggedTemplateLiteral(["\n .select {\n > div:first-child {\n padding-left: 0;\n padding-right: 0;\n }\n }\n > div {\n > div {\n border: none;\n &:first-child {\n .driver-photo {\n width: 45px;\n height: 45px;\n }\n .driver-info {\n p {\n color: ", ";\n font-size: 14px;\n font-weight: 600;\n }\n span {\n display: initial;\n }\n }\n }\n }\n }\n ", "\n"])), function (props) {
|
|
90
92
|
var _props$theme$colors6;
|
|
91
93
|
return (_props$theme$colors6 = props.theme.colors) === null || _props$theme$colors6 === void 0 ? void 0 : _props$theme$colors6.headingColor;
|
|
92
94
|
}, function (_ref6) {
|
|
93
95
|
var noClick = _ref6.noClick;
|
|
94
|
-
return noClick && (0, _styledComponents.css)(
|
|
96
|
+
return noClick && (0, _styledComponents.css)(_templateObject25 || (_templateObject25 = _taggedTemplateLiteral(["\n pointer-events: none;\n "])));
|
|
95
97
|
});
|
|
96
|
-
var WrapperImage = exports.WrapperImage = _styledComponents.default.div(
|
|
97
|
-
var OrderType = exports.OrderType = _styledComponents.default.div(
|
|
98
|
+
var WrapperImage = exports.WrapperImage = _styledComponents.default.div(_templateObject26 || (_templateObject26 = _taggedTemplateLiteral(["\n max-width: 45px;\n max-height: 45px;\n height: 45px;\n width: 45px;\n box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.1);\n border-radius: 7.6px;\n position: relative;\n\n img {\n width: 100%;\n height: 100%;\n object-fit: cover;\n border-radius: 7.6px;\n }\n\n svg {\n width: 100%;\n height: 100%;\n padding: 7px;\n box-sizing: border-box;\n border-radius: 50%;\n }\n"])));
|
|
99
|
+
var OrderType = exports.OrderType = _styledComponents.default.div(_templateObject27 || (_templateObject27 = _taggedTemplateLiteral(["\n display: flex;\n align-items: center;\n\n img, svg {\n width: 25px;\n height: 30px;\n }\n\n img {\n border-radius: unset;\n border: none;\n }\n\n span {\n color: ", ";\n font-size: 14px;\n ", "\n }\n"])), function (props) {
|
|
98
100
|
return props.theme.colors.headingColor;
|
|
99
101
|
}, function (props) {
|
|
100
102
|
var _props$theme5;
|
|
101
|
-
return (_props$theme5 = props.theme) !== null && _props$theme5 !== void 0 && _props$theme5.rtl ? (0, _styledComponents.css)(
|
|
103
|
+
return (_props$theme5 = props.theme) !== null && _props$theme5 !== void 0 && _props$theme5.rtl ? (0, _styledComponents.css)(_templateObject28 || (_templateObject28 = _taggedTemplateLiteral(["\n margin-right: 5px;\n "]))) : (0, _styledComponents.css)(_templateObject29 || (_templateObject29 = _taggedTemplateLiteral(["\n margin-left: 5px;\n "])));
|
|
102
104
|
});
|
|
103
|
-
var WrapOrderStatusSelector = exports.WrapOrderStatusSelector = _styledComponents.default.div(
|
|
105
|
+
var WrapOrderStatusSelector = exports.WrapOrderStatusSelector = _styledComponents.default.div(_templateObject30 || (_templateObject30 = _taggedTemplateLiteral(["\n > div {\n p {\n font-size: 14px;\n }\n > div:first-child {\n p {\n color: ", ";\n max-width: 140px;\n }\n }\n }\n"])), function (props) {
|
|
104
106
|
var _props$theme$colors7;
|
|
105
107
|
return (_props$theme$colors7 = props.theme.colors) === null || _props$theme$colors7 === void 0 ? void 0 : _props$theme$colors7.headingColor;
|
|
106
108
|
});
|
|
107
|
-
var WrapperPagination = exports.WrapperPagination = _styledComponents.default.div(
|
|
108
|
-
var LogisticStatusDot = exports.LogisticStatusDot = _styledComponents.default.span(
|
|
109
|
+
var WrapperPagination = exports.WrapperPagination = _styledComponents.default.div(_templateObject31 || (_templateObject31 = _taggedTemplateLiteral(["\n padding-top: 5px;\n"])));
|
|
110
|
+
var LogisticStatusDot = exports.LogisticStatusDot = _styledComponents.default.span(_templateObject32 || (_templateObject32 = _taggedTemplateLiteral(["\n width: 6px;\n height: 6px;\n border-radius: 50%;\n display: inline-block;\n\n ", "\n\n ", "\n ", "\n ", "\n ", "\n ", "\n"])), function (props) {
|
|
109
111
|
var _props$theme6;
|
|
110
|
-
return (_props$theme6 = props.theme) !== null && _props$theme6 !== void 0 && _props$theme6.rtl ? (0, _styledComponents.css)(
|
|
112
|
+
return (_props$theme6 = props.theme) !== null && _props$theme6 !== void 0 && _props$theme6.rtl ? (0, _styledComponents.css)(_templateObject33 || (_templateObject33 = _taggedTemplateLiteral(["\n margin-right: 6px;\n "]))) : (0, _styledComponents.css)(_templateObject34 || (_templateObject34 = _taggedTemplateLiteral(["\n margin-left: 6px;\n "])));
|
|
111
113
|
}, function (_ref7) {
|
|
112
114
|
var status = _ref7.status;
|
|
113
|
-
return status === 0 && (0, _styledComponents.css)(
|
|
115
|
+
return status === 0 && (0, _styledComponents.css)(_templateObject35 || (_templateObject35 = _taggedTemplateLiteral(["\n background-color: ", ";\n "])), function (props) {
|
|
114
116
|
return props.theme.colors.orange;
|
|
115
117
|
});
|
|
116
118
|
}, function (_ref8) {
|
|
117
119
|
var status = _ref8.status;
|
|
118
|
-
return status === 1 && (0, _styledComponents.css)(
|
|
120
|
+
return status === 1 && (0, _styledComponents.css)(_templateObject36 || (_templateObject36 = _taggedTemplateLiteral(["\n background-color: ", ";\n "])), function (props) {
|
|
119
121
|
return props.theme.colors.warning;
|
|
120
122
|
});
|
|
121
123
|
}, function (_ref9) {
|
|
122
124
|
var status = _ref9.status;
|
|
123
|
-
return status === 2 && (0, _styledComponents.css)(
|
|
125
|
+
return status === 2 && (0, _styledComponents.css)(_templateObject37 || (_templateObject37 = _taggedTemplateLiteral(["\n background-color: ", ";\n "])), function (props) {
|
|
124
126
|
return props.theme.colors.info;
|
|
125
127
|
});
|
|
126
128
|
}, function (_ref10) {
|
|
127
129
|
var status = _ref10.status;
|
|
128
|
-
return status === 3 && (0, _styledComponents.css)(
|
|
130
|
+
return status === 3 && (0, _styledComponents.css)(_templateObject38 || (_templateObject38 = _taggedTemplateLiteral(["\n background-color: ", ";\n "])), function (props) {
|
|
129
131
|
return props.theme.colors.danger;
|
|
130
132
|
});
|
|
131
133
|
}, function (_ref11) {
|
|
132
134
|
var status = _ref11.status;
|
|
133
|
-
return status === 4 && (0, _styledComponents.css)(
|
|
135
|
+
return status === 4 && (0, _styledComponents.css)(_templateObject39 || (_templateObject39 = _taggedTemplateLiteral(["\n background-color: ", ";\n "])), function (props) {
|
|
134
136
|
return props.theme.colors.success;
|
|
135
137
|
});
|
|
136
138
|
});
|
|
137
|
-
var PriorityDot = exports.PriorityDot = _styledComponents.default.span(
|
|
139
|
+
var PriorityDot = exports.PriorityDot = _styledComponents.default.span(_templateObject40 || (_templateObject40 = _taggedTemplateLiteral(["\n width: 6px;\n height: 6px;\n border-radius: 50%;\n display: inline-block;\n\n ", "\n\n ", "\n ", "\n ", "\n ", "\n"])), function (props) {
|
|
138
140
|
var _props$theme7;
|
|
139
|
-
return (_props$theme7 = props.theme) !== null && _props$theme7 !== void 0 && _props$theme7.rtl ? (0, _styledComponents.css)(
|
|
141
|
+
return (_props$theme7 = props.theme) !== null && _props$theme7 !== void 0 && _props$theme7.rtl ? (0, _styledComponents.css)(_templateObject41 || (_templateObject41 = _taggedTemplateLiteral(["\n margin-right: 6px;\n "]))) : (0, _styledComponents.css)(_templateObject42 || (_templateObject42 = _taggedTemplateLiteral(["\n margin-left: 6px;\n "])));
|
|
140
142
|
}, function (_ref12) {
|
|
141
143
|
var priority = _ref12.priority;
|
|
142
|
-
return priority === -1 && (0, _styledComponents.css)(
|
|
144
|
+
return priority === -1 && (0, _styledComponents.css)(_templateObject43 || (_templateObject43 = _taggedTemplateLiteral(["\n background-color: ", ";\n "])), function (props) {
|
|
143
145
|
return props.theme.colors.secundaryLight;
|
|
144
146
|
});
|
|
145
147
|
}, function (_ref13) {
|
|
146
148
|
var priority = _ref13.priority;
|
|
147
|
-
return priority === 0 && (0, _styledComponents.css)(
|
|
149
|
+
return priority === 0 && (0, _styledComponents.css)(_templateObject44 || (_templateObject44 = _taggedTemplateLiteral(["\n background-color: ", ";\n "])), function (props) {
|
|
148
150
|
return props.theme.colors.primary;
|
|
149
151
|
});
|
|
150
152
|
}, function (_ref14) {
|
|
151
153
|
var priority = _ref14.priority;
|
|
152
|
-
return priority === 1 && (0, _styledComponents.css)(
|
|
154
|
+
return priority === 1 && (0, _styledComponents.css)(_templateObject45 || (_templateObject45 = _taggedTemplateLiteral(["\n background-color: ", ";\n "])), function (props) {
|
|
153
155
|
return props.theme.colors.warning;
|
|
154
156
|
});
|
|
155
157
|
}, function (_ref15) {
|
|
156
158
|
var priority = _ref15.priority;
|
|
157
|
-
return priority === 2 && (0, _styledComponents.css)(
|
|
159
|
+
return priority === 2 && (0, _styledComponents.css)(_templateObject46 || (_templateObject46 = _taggedTemplateLiteral(["\n background-color: ", ";\n "])), function (props) {
|
|
158
160
|
return props.theme.colors.danger;
|
|
159
161
|
});
|
|
160
162
|
});
|
|
161
|
-
var Timestatus = exports.Timestatus = _styledComponents.default.div(
|
|
163
|
+
var Timestatus = exports.Timestatus = _styledComponents.default.div(_templateObject47 || (_templateObject47 = _taggedTemplateLiteral(["\n width: 4px;\n height: 37px;\n border-radius: 20px 20px 20px 20px;\n ", "\n ", "\n ", "\n"])), function (_ref16) {
|
|
162
164
|
var timeState = _ref16.timeState;
|
|
163
|
-
return timeState === 'in_time' && (0, _styledComponents.css)(
|
|
165
|
+
return timeState === 'in_time' && (0, _styledComponents.css)(_templateObject48 || (_templateObject48 = _taggedTemplateLiteral(["\n background-color: #00D27A;\n "])));
|
|
164
166
|
}, function (_ref17) {
|
|
165
167
|
var timeState = _ref17.timeState;
|
|
166
|
-
return timeState === 'at_risk' && (0, _styledComponents.css)(
|
|
168
|
+
return timeState === 'at_risk' && (0, _styledComponents.css)(_templateObject49 || (_templateObject49 = _taggedTemplateLiteral(["\n background-color: #FFC700;\n "])));
|
|
167
169
|
}, function (_ref18) {
|
|
168
170
|
var timeState = _ref18.timeState;
|
|
169
|
-
return timeState === 'delayed' && (0, _styledComponents.css)(
|
|
171
|
+
return timeState === 'delayed' && (0, _styledComponents.css)(_templateObject50 || (_templateObject50 = _taggedTemplateLiteral(["\n background-color: #E63757;\n "])));
|
|
170
172
|
});
|
|
171
|
-
var Timer = exports.Timer = _styledComponents.default.div(
|
|
173
|
+
var Timer = exports.Timer = _styledComponents.default.div(_templateObject51 || (_templateObject51 = _taggedTemplateLiteral(["\n min-width: 65px;\n p {\n margin: 0px;\n color: ", ";\n font-size: 12px;\n }\n\n .bold {\n font-size: 14px;\n font-weight: 600;\n color: ", ";\n }\n\n .in_time{\n color: #00D27A;\n }\n\n .at_risk {\n color: #FFC700;\n }\n\n .delayed {\n color: #E63757;\n }\n"])), function (props) {
|
|
172
174
|
var _props$theme$colors8;
|
|
173
175
|
return (_props$theme$colors8 = props.theme.colors) === null || _props$theme$colors8 === void 0 ? void 0 : _props$theme$colors8.lightGray;
|
|
174
176
|
}, function (props) {
|
|
175
177
|
var _props$theme$colors9;
|
|
176
178
|
return (_props$theme$colors9 = props.theme.colors) === null || _props$theme$colors9 === void 0 ? void 0 : _props$theme$colors9.headingColor;
|
|
177
179
|
});
|
|
178
|
-
var OrdersCountWrapper = exports.OrdersCountWrapper = _styledComponents.default.div(
|
|
180
|
+
var OrdersCountWrapper = exports.OrdersCountWrapper = _styledComponents.default.div(_templateObject52 || (_templateObject52 = _taggedTemplateLiteral(["\n height: 16px;\n display: flex;\n align-items: center;\n justify-content: center;\n border-radius: 50px;\n background-color: ", ";\n color: ", ";\n font-weight: 400;\n font-size: 9px;\n line-height: 12px;\n padding: 2px 5px;\n position: absolute;\n top: -9px;\n right: -5px;\n ", "\n\n ", "\n"])), function (props) {
|
|
179
181
|
return props.theme.colors.backgroundInfo;
|
|
180
182
|
}, function (props) {
|
|
181
183
|
return props.theme.colors.primary;
|
|
182
184
|
}, function (props) {
|
|
183
|
-
return props.theme.rtl && (0, _styledComponents.css)(
|
|
185
|
+
return props.theme.rtl && (0, _styledComponents.css)(_templateObject53 || (_templateObject53 = _taggedTemplateLiteral(["\n left: -5px;\n right: initial;\n "])));
|
|
184
186
|
}, function (_ref19) {
|
|
185
187
|
var isNew = _ref19.isNew;
|
|
186
|
-
return isNew && (0, _styledComponents.css)(
|
|
188
|
+
return isNew && (0, _styledComponents.css)(_templateObject54 || (_templateObject54 = _taggedTemplateLiteral(["\n background-color: ", ";\n color: ", ";\n "])), function (props) {
|
|
187
189
|
return props.theme.colors.lightGreen;
|
|
188
190
|
}, function (props) {
|
|
189
191
|
return props.theme.colors.success;
|
|
190
192
|
});
|
|
191
193
|
});
|
|
192
|
-
var DragTh = exports.DragTh = _styledComponents.default.th(
|
|
194
|
+
var DragTh = exports.DragTh = _styledComponents.default.th(_templateObject55 || (_templateObject55 = _taggedTemplateLiteral(["\n cursor: pointer;\n ", "\n"])), function (_ref20) {
|
|
193
195
|
var selectedDragOver = _ref20.selectedDragOver;
|
|
194
|
-
return selectedDragOver && (0, _styledComponents.css)(
|
|
196
|
+
return selectedDragOver && (0, _styledComponents.css)(_templateObject56 || (_templateObject56 = _taggedTemplateLiteral(["\n border: 1px solid ", ";\n "])), function (props) {
|
|
195
197
|
return props.theme.colors.primary;
|
|
196
198
|
});
|
|
197
199
|
});
|
|
198
|
-
var InfoWrapper = exports.InfoWrapper = _styledComponents.default.div(
|
|
200
|
+
var InfoWrapper = exports.InfoWrapper = _styledComponents.default.div(_templateObject57 || (_templateObject57 = _taggedTemplateLiteral(["\n position: relative;\n ", "\n\n .bold {\n max-width: 150px;\n font-weight: 600;\n margin: 0;\n }\n\n &:hover > div {\n visibility: visible;\n opacity: 1;\n }\n"])), function (props) {
|
|
199
201
|
var _props$theme8;
|
|
200
|
-
return (_props$theme8 = props.theme) !== null && _props$theme8 !== void 0 && _props$theme8.rtl ? (0, _styledComponents.css)(
|
|
202
|
+
return (_props$theme8 = props.theme) !== null && _props$theme8 !== void 0 && _props$theme8.rtl ? (0, _styledComponents.css)(_templateObject58 || (_templateObject58 = _taggedTemplateLiteral(["\n margin-left: 4px;\n "]))) : (0, _styledComponents.css)(_templateObject59 || (_templateObject59 = _taggedTemplateLiteral(["\n margin-right: 4px;\n "])));
|
|
201
203
|
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ordering-ui-admin-external",
|
|
3
|
-
"version": "1.42.
|
|
3
|
+
"version": "1.42.4",
|
|
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.42.
|
|
86
|
+
"ordering-components-admin-external": "1.42.2",
|
|
87
87
|
"polished": "^3.6.7",
|
|
88
88
|
"prop-types": "^15.7.2",
|
|
89
89
|
"react-big-calendar": "^1.4.2",
|
|
@@ -72,7 +72,10 @@ export const AdvancedSettings = (props) => {
|
|
|
72
72
|
{ name: t('SEARCH', 'Search'), type: 'hidden', path: 'business_view.components.reviews.components.search.hidden' },
|
|
73
73
|
{ name: t('BUSINESS_LOGO', 'Business logo'), type: 'hidden', path: 'business_view.components.header.components.logo.hidden' },
|
|
74
74
|
{ name: t('BUSINESS_INFO_ICON', 'Business info icon'), type: 'hidden', path: 'business_view.components.header.components.business_info.hidden' },
|
|
75
|
-
{ name: t('BUSINESS_HEADER', 'Business header'), type: 'hidden', path: 'business_view.components.header.hidden' }
|
|
75
|
+
{ name: t('BUSINESS_HEADER', 'Business header'), type: 'hidden', path: 'business_view.components.header.hidden' },
|
|
76
|
+
{ name: t('BUSINESS_HEADER_REVIEWS', 'Business header reviews'), type: 'hidden', path: 'business_view.components.header.components.business.components.reviews.hidden' },
|
|
77
|
+
{ name: t('BUSINESS_POPUP_REVIEWS', 'Business popup reviews'), type: 'hidden', path: 'business_view.components.header.components.reviews.hidden' }
|
|
78
|
+
|
|
76
79
|
]
|
|
77
80
|
|
|
78
81
|
const businessInfoList = [
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React from 'react'
|
|
2
|
-
import { BusinessInfo, CheckBox, CustomerInfo, LogisticStatusDot, OrderNumberContainer, OrdersCountWrapper, PriorityDot, StatusInfo, Timer, Timestatus, WrapperImage, InfoWrapper } from './styles'
|
|
2
|
+
import { BusinessInfo, CheckBox, CustomerInfo, LogisticStatusDot, OrderNumberContainer, OrdersCountWrapper, PriorityDot, StatusInfo, Timer, Timestatus, WrapperImage, InfoWrapper, ChannelInfo, EtaInfo } from './styles'
|
|
3
3
|
import RiCheckboxFill from '@meronex/icons/ri/RiCheckboxFill'
|
|
4
4
|
import RiCheckboxBlankLine from '@meronex/icons/ri/RiCheckboxBlankLine'
|
|
5
5
|
import { useLanguage, useUtils } from 'ordering-components-admin-external'
|
|
@@ -274,12 +274,21 @@ export const Order = React.memo((props) => {
|
|
|
274
274
|
</td>
|
|
275
275
|
)
|
|
276
276
|
}
|
|
277
|
+
if (column === 'eta') {
|
|
278
|
+
return (
|
|
279
|
+
<td className='eta' key={`eta${i}-${index}`}>
|
|
280
|
+
<EtaInfo>
|
|
281
|
+
<p className='bold'>{''}</p>
|
|
282
|
+
</EtaInfo>
|
|
283
|
+
</td>
|
|
284
|
+
)
|
|
285
|
+
}
|
|
277
286
|
if (column === 'channel') {
|
|
278
287
|
return (
|
|
279
288
|
<td className='channelInfo' key={`channelInfo${i}-${index}`}>
|
|
280
|
-
<
|
|
281
|
-
<p className='bold'>{
|
|
282
|
-
</
|
|
289
|
+
<ChannelInfo>
|
|
290
|
+
<p className='bold'>{order.app_id}</p>
|
|
291
|
+
</ChannelInfo>
|
|
283
292
|
</td>
|
|
284
293
|
)
|
|
285
294
|
}
|
|
@@ -262,7 +262,12 @@ export const OrdersTable = memo((props) => {
|
|
|
262
262
|
}
|
|
263
263
|
|
|
264
264
|
const handleChangeAllowColumns = (type) => {
|
|
265
|
-
|
|
265
|
+
let _column = {}
|
|
266
|
+
if (type === 'channel'){
|
|
267
|
+
_column = { visable:allowColumns[type].visable ,title: t('CHANNEL', 'Channel'), className: 'channelInfo', draggable: true, colSpan: 1, order: 12 }
|
|
268
|
+
}else{
|
|
269
|
+
_column = allowColumns[type]
|
|
270
|
+
}
|
|
266
271
|
const updatedAllowColumns = {
|
|
267
272
|
...allowColumns,
|
|
268
273
|
[type]: { ..._column, visable: !_column?.visable }
|
|
@@ -625,6 +630,13 @@ export const OrdersTable = memo((props) => {
|
|
|
625
630
|
</div>
|
|
626
631
|
</td>
|
|
627
632
|
)}
|
|
633
|
+
{allowColumns?.channel?.visable && !isSelectedOrders && (
|
|
634
|
+
<td className='orderStatusTitle'>
|
|
635
|
+
<WrapOrderStatusSelector>
|
|
636
|
+
<Skeleton width={100} height={30} />
|
|
637
|
+
</WrapOrderStatusSelector>
|
|
638
|
+
</td>
|
|
639
|
+
)}
|
|
628
640
|
{!isSelectedOrders && (
|
|
629
641
|
<td className='orderPrice'>
|
|
630
642
|
<div className='info'>
|
|
@@ -185,6 +185,20 @@ export const StatusInfo = styled.div`
|
|
|
185
185
|
margin: 0;
|
|
186
186
|
}
|
|
187
187
|
`
|
|
188
|
+
export const ChannelInfo = styled.div`
|
|
189
|
+
.bold {
|
|
190
|
+
max-width: 150px;
|
|
191
|
+
font-weight: 600;
|
|
192
|
+
margin: 0;
|
|
193
|
+
}
|
|
194
|
+
`
|
|
195
|
+
export const EtaInfo = styled.div`
|
|
196
|
+
.bold {
|
|
197
|
+
max-width: 150px;
|
|
198
|
+
font-weight: 600;
|
|
199
|
+
margin: 0;
|
|
200
|
+
}
|
|
201
|
+
`
|
|
188
202
|
|
|
189
203
|
export const DriversInfo = styled.div`
|
|
190
204
|
.select {
|