ordering-ui-admin-external 1.45.15 → 1.45.17
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.fe65e52f55e5e87dc919.js → ordering-ui-admin.78eb29f036d994aa39f8.js} +2 -2
- package/_modules/components/MyProducts/ContentForm/index.js +4 -0
- package/_modules/components/Orders/Messages/index.js +12 -4
- package/package.json +2 -2
- package/src/components/MyProducts/ContentForm/index.js +4 -0
- package/src/components/Orders/Messages/index.js +10 -3
- /package/_bundles/{ordering-ui-admin.fe65e52f55e5e87dc919.js.LICENSE.txt → ordering-ui-admin.78eb29f036d994aa39f8.js.LICENSE.txt} +0 -0
|
@@ -140,6 +140,10 @@ var ContentFormUI = function ContentFormUI(props) {
|
|
|
140
140
|
}, [pageContent]);
|
|
141
141
|
var onInit = function onInit(note) {
|
|
142
142
|
note.reset();
|
|
143
|
+
if (!content) {
|
|
144
|
+
note.insertText('');
|
|
145
|
+
return;
|
|
146
|
+
}
|
|
143
147
|
var regex = /(\<\w*)((\s\/\>)|(.*\<\/\w*\>))/i;
|
|
144
148
|
if ((content === null || content === void 0 ? void 0 : content.match(regex)) !== null) {
|
|
145
149
|
note.replace(content);
|
|
@@ -280,6 +280,13 @@ var MessagesUI = exports.MessagesUI = function MessagesUI(props) {
|
|
|
280
280
|
if (messages.messages[messages.messages.length - 1].read) return;
|
|
281
281
|
handleReadMessages(messages.messages[messages.messages.length - 1].id);
|
|
282
282
|
};
|
|
283
|
+
var getAuthor = function getAuthor(message) {
|
|
284
|
+
if (message !== null && message !== void 0 && message.author_id) {
|
|
285
|
+
var _message$author, _message$author2, _message$author3;
|
|
286
|
+
return ((message === null || message === void 0 || (_message$author = message.author) === null || _message$author === void 0 ? void 0 : _message$author.name) || '') + (message !== null && message !== void 0 && (_message$author2 = message.author) !== null && _message$author2 !== void 0 && _message$author2.lastname ? ' ' + (message === null || message === void 0 || (_message$author3 = message.author) === null || _message$author3 === void 0 ? void 0 : _message$author3.lastname) : '');
|
|
287
|
+
}
|
|
288
|
+
return t('AUTHOR_SYSTEM', 'System');
|
|
289
|
+
};
|
|
283
290
|
(0, _react.useEffect)(function () {
|
|
284
291
|
if (!isChat) return;
|
|
285
292
|
if (order !== null && order !== void 0 && order.driver) {
|
|
@@ -306,7 +313,8 @@ var MessagesUI = exports.MessagesUI = function MessagesUI(props) {
|
|
|
306
313
|
if (messages.loading) return;
|
|
307
314
|
var _filteredMessages = messages.messages.filter(function (message) {
|
|
308
315
|
if (message.type === 2) {
|
|
309
|
-
|
|
316
|
+
var _message$comment;
|
|
317
|
+
return message === null || message === void 0 || (_message$comment = message.comment) === null || _message$comment === void 0 || (_message$comment = _message$comment.toLocaleLowerCase()) === null || _message$comment === void 0 ? void 0 : _message$comment.includes(messageSearchValue === null || messageSearchValue === void 0 ? void 0 : messageSearchValue.toLocaleLowerCase());
|
|
310
318
|
}
|
|
311
319
|
return true;
|
|
312
320
|
});
|
|
@@ -421,7 +429,7 @@ var MessagesUI = exports.MessagesUI = function MessagesUI(props) {
|
|
|
421
429
|
})), tabActive === 'logistic_information' && /*#__PURE__*/_react.default.createElement(_styles.WrapperLogisticInformation, null, /*#__PURE__*/_react.default.createElement(_OrderLogisticInformation.OrderLogisticInformation, {
|
|
422
430
|
orderId: order.id
|
|
423
431
|
}))), filteredMessages.length > 0 && filteredMessages.map(function (message) {
|
|
424
|
-
var
|
|
432
|
+
var _order$business2, _order$customer2, _order$driver2, _order$business3, _order$customer3, _order$driver3, _order$business4, _order$customer4, _order$driver4, _order$business5, _order$customer5, _order$driver5;
|
|
425
433
|
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
|
|
426
434
|
key: message.id
|
|
427
435
|
}, history && tabActive === 'order_history' && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, message.type === 0 && /*#__PURE__*/_react.default.createElement(_styles.MessageConsole, {
|
|
@@ -432,7 +440,7 @@ var MessagesUI = exports.MessagesUI = function MessagesUI(props) {
|
|
|
432
440
|
utc: false
|
|
433
441
|
}) + " (".concat(t('BUSINESS_TIME', 'Business time'), ")")) + '</b>').replace('_via_', '<b>' + t(order.app_id ? order.app_id.toUpperCase() : 'OTHER') + '</b>')
|
|
434
442
|
}
|
|
435
|
-
}), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("strong", null, t('APP_ID', 'App ID'), ": "), message === null || message === void 0 ? void 0 : message.app_id), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("strong", null, t('AUTHOR', 'Author'), ": "),
|
|
443
|
+
}), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("strong", null, t('APP_ID', 'App ID'), ": "), message === null || message === void 0 ? void 0 : message.app_id), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("strong", null, t('AUTHOR', 'Author'), ": "), getAuthor(message)), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("strong", null, t('USER_AGENT', 'User agent'), ": "), message === null || message === void 0 ? void 0 : message.user_agent), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("strong", null, t('IP', 'IP'), ": "), message === null || message === void 0 ? void 0 : message.ip), /*#__PURE__*/_react.default.createElement(_styles.TimeofSent, null, getTimeAgo(message === null || message === void 0 ? void 0 : message.created_at)))), message.type === 1 && /*#__PURE__*/_react.default.createElement(_styles.MessageConsole, {
|
|
436
444
|
key: message.id,
|
|
437
445
|
style: {
|
|
438
446
|
display: "".concat(tabActive === 'order_history' ? 'inline-flex' : 'none')
|
|
@@ -446,7 +454,7 @@ var MessagesUI = exports.MessagesUI = function MessagesUI(props) {
|
|
|
446
454
|
overlay: /*#__PURE__*/_react.default.createElement(_reactBootstrap.Tooltip, null, parseDate(message.created_at))
|
|
447
455
|
}, /*#__PURE__*/_react.default.createElement(_styles.TimeofSent, null, getTimeAgo(message.created_at)))))), isChat && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, message.type === 0 && /*#__PURE__*/_react.default.createElement(_styles.MessageConsole, {
|
|
448
456
|
key: message.id
|
|
449
|
-
}, /*#__PURE__*/_react.default.createElement(_styles.BubbleConsole, null, /*#__PURE__*/_react.default.createElement("p", null, t('ORDER_PLACED_FOR', 'Order placed for'), " ", ' ', /*#__PURE__*/_react.default.createElement("strong", null, parseDate(order.created_at)), " ", ' ', t('VIA', 'Via'), ' ', /*#__PURE__*/_react.default.createElement("strong", null, order.app_id ? t(order.app_id.toUpperCase(), order.app_id) : t('OTHER', 'Other')), ' '), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("strong", null, t('APP_ID', 'App ID'), ": "), message === null || message === void 0 ? void 0 : message.app_id), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("strong", null, t('AUTHOR', 'Author'), ": "),
|
|
457
|
+
}, /*#__PURE__*/_react.default.createElement(_styles.BubbleConsole, null, /*#__PURE__*/_react.default.createElement("p", null, t('ORDER_PLACED_FOR', 'Order placed for'), " ", ' ', /*#__PURE__*/_react.default.createElement("strong", null, parseDate(order.created_at)), " ", ' ', t('VIA', 'Via'), ' ', /*#__PURE__*/_react.default.createElement("strong", null, order.app_id ? t(order.app_id.toUpperCase(), order.app_id) : t('OTHER', 'Other')), ' '), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("strong", null, t('APP_ID', 'App ID'), ": "), message === null || message === void 0 ? void 0 : message.app_id), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("strong", null, t('AUTHOR', 'Author'), ": "), getAuthor(message)), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("strong", null, t('USER_AGENT', 'User agent'), ": "), message === null || message === void 0 ? void 0 : message.user_agent), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("strong", null, t('IP', 'IP'), ": "), message === null || message === void 0 ? void 0 : message.ip), /*#__PURE__*/_react.default.createElement(_styles.TimeofSent, null, getTimeAgo(message === null || message === void 0 ? void 0 : message.created_at)))), message.type === 1 && /*#__PURE__*/_react.default.createElement(_styles.MessageConsole, {
|
|
450
458
|
key: message.id,
|
|
451
459
|
style: {
|
|
452
460
|
display: "".concat(tabActive === 'order_history' ? 'inline-flex' : 'none')
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ordering-ui-admin-external",
|
|
3
|
-
"version": "1.45.
|
|
3
|
+
"version": "1.45.17",
|
|
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.43.
|
|
86
|
+
"ordering-components-admin-external": "1.43.71",
|
|
87
87
|
"polished": "^3.6.7",
|
|
88
88
|
"prop-types": "^15.7.2",
|
|
89
89
|
"react-big-calendar": "^1.4.2",
|
|
@@ -121,6 +121,10 @@ const ContentFormUI = (props) => {
|
|
|
121
121
|
|
|
122
122
|
const onInit = (note) => {
|
|
123
123
|
note.reset()
|
|
124
|
+
if (!content) {
|
|
125
|
+
note.insertText('')
|
|
126
|
+
return
|
|
127
|
+
}
|
|
124
128
|
const regex = /(\<\w*)((\s\/\>)|(.*\<\/\w*\>))/i
|
|
125
129
|
if (content?.match(regex) !== null) {
|
|
126
130
|
note.replace(content)
|
|
@@ -267,6 +267,13 @@ export const MessagesUI = (props) => {
|
|
|
267
267
|
handleReadMessages(messages.messages[messages.messages.length - 1].id)
|
|
268
268
|
}
|
|
269
269
|
|
|
270
|
+
const getAuthor = (message) => {
|
|
271
|
+
if (message?.author_id) {
|
|
272
|
+
return (message?.author?.name || '') + (message?.author?.lastname ? ' ' + message?.author?.lastname : '')
|
|
273
|
+
}
|
|
274
|
+
return t('AUTHOR_SYSTEM', 'System')
|
|
275
|
+
}
|
|
276
|
+
|
|
270
277
|
useEffect(() => {
|
|
271
278
|
if (!isChat) return
|
|
272
279
|
if (order?.driver) {
|
|
@@ -285,7 +292,7 @@ export const MessagesUI = (props) => {
|
|
|
285
292
|
if (messages.loading) return
|
|
286
293
|
const _filteredMessages = messages.messages.filter(message => {
|
|
287
294
|
if (message.type === 2) {
|
|
288
|
-
return message
|
|
295
|
+
return message?.comment?.toLocaleLowerCase()?.includes(messageSearchValue?.toLocaleLowerCase())
|
|
289
296
|
}
|
|
290
297
|
return true
|
|
291
298
|
})
|
|
@@ -484,7 +491,7 @@ export const MessagesUI = (props) => {
|
|
|
484
491
|
}}
|
|
485
492
|
/>
|
|
486
493
|
<div><strong>{t('APP_ID', 'App ID')}: </strong>{message?.app_id}</div>
|
|
487
|
-
<div><strong>{t('AUTHOR', 'Author')}: </strong>{message
|
|
494
|
+
<div><strong>{t('AUTHOR', 'Author')}: </strong>{getAuthor(message)}</div>
|
|
488
495
|
<div><strong>{t('USER_AGENT', 'User agent')}: </strong>{message?.user_agent}</div>
|
|
489
496
|
<div><strong>{t('IP', 'IP')}: </strong>{message?.ip}</div>
|
|
490
497
|
<TimeofSent>{getTimeAgo(message?.created_at)}</TimeofSent>
|
|
@@ -526,7 +533,7 @@ export const MessagesUI = (props) => {
|
|
|
526
533
|
</strong>{' '}
|
|
527
534
|
</p>
|
|
528
535
|
<div><strong>{t('APP_ID', 'App ID')}: </strong>{message?.app_id}</div>
|
|
529
|
-
<div><strong>{t('AUTHOR', 'Author')}: </strong>{message
|
|
536
|
+
<div><strong>{t('AUTHOR', 'Author')}: </strong>{getAuthor(message)}</div>
|
|
530
537
|
<div><strong>{t('USER_AGENT', 'User agent')}: </strong>{message?.user_agent}</div>
|
|
531
538
|
<div><strong>{t('IP', 'IP')}: </strong>{message?.ip}</div>
|
|
532
539
|
<TimeofSent>{getTimeAgo(message?.created_at)}</TimeofSent>
|