ordering-ui-external 14.1.6 → 14.1.7
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/{7.ordering-ui.e903b3a8ca5ebdd5b64b.js → 7.ordering-ui.d53641b81f759911f36f.js} +1 -1
- package/_bundles/ordering-ui.d53641b81f759911f36f.js +2 -0
- package/_modules/themes/five/src/components/Messages/MapMessages.js +1 -2
- package/_modules/themes/five/src/components/Messages/index.js +2 -7
- package/package.json +1 -1
- package/src/themes/five/src/components/Messages/MapMessages.js +1 -2
- package/src/themes/five/src/components/Messages/index.js +17 -24
- package/_bundles/ordering-ui.e903b3a8ca5ebdd5b64b.js +0 -2
- /package/_bundles/{0.ordering-ui.e903b3a8ca5ebdd5b64b.js → 0.ordering-ui.d53641b81f759911f36f.js} +0 -0
- /package/_bundles/{1.ordering-ui.e903b3a8ca5ebdd5b64b.js → 1.ordering-ui.d53641b81f759911f36f.js} +0 -0
- /package/_bundles/{2.ordering-ui.e903b3a8ca5ebdd5b64b.js → 2.ordering-ui.d53641b81f759911f36f.js} +0 -0
- /package/_bundles/{4.ordering-ui.e903b3a8ca5ebdd5b64b.js → 4.ordering-ui.d53641b81f759911f36f.js} +0 -0
- /package/_bundles/{5.ordering-ui.e903b3a8ca5ebdd5b64b.js → 5.ordering-ui.d53641b81f759911f36f.js} +0 -0
- /package/_bundles/{6.ordering-ui.e903b3a8ca5ebdd5b64b.js → 6.ordering-ui.d53641b81f759911f36f.js} +0 -0
- /package/_bundles/{7.ordering-ui.e903b3a8ca5ebdd5b64b.js.LICENSE.txt → 7.ordering-ui.d53641b81f759911f36f.js.LICENSE.txt} +0 -0
- /package/_bundles/{8.ordering-ui.e903b3a8ca5ebdd5b64b.js → 8.ordering-ui.d53641b81f759911f36f.js} +0 -0
- /package/_bundles/{9.ordering-ui.e903b3a8ca5ebdd5b64b.js → 9.ordering-ui.d53641b81f759911f36f.js} +0 -0
- /package/_bundles/{ordering-ui.e903b3a8ca5ebdd5b64b.js.LICENSE.txt → ordering-ui.d53641b81f759911f36f.js.LICENSE.txt} +0 -0
|
@@ -26,7 +26,6 @@ var MapMessages = exports.MapMessages = function MapMessages(props) {
|
|
|
26
26
|
var order = props.order,
|
|
27
27
|
filterSpecialStatus = props.filterSpecialStatus,
|
|
28
28
|
handleModalImage = props.handleModalImage,
|
|
29
|
-
hideLogBookMessages = props.hideLogBookMessages,
|
|
30
29
|
getLevel = props.getLevel,
|
|
31
30
|
business = props.business,
|
|
32
31
|
driver = props.driver,
|
|
@@ -53,7 +52,7 @@ var MapMessages = exports.MapMessages = function MapMessages(props) {
|
|
|
53
52
|
setMessagesToShow = _useState4[1];
|
|
54
53
|
(0, _react.useEffect)(function () {
|
|
55
54
|
var _props$messages, _props$messagesToShow, _props$messages2, _props$messagesToShow2;
|
|
56
|
-
if (!((_props$messages = props.messages) !== null && _props$messages !== void 0 && (_props$messages = _props$messages.messages) !== null && _props$messages !== void 0 && _props$messages.length) && !((_props$messagesToShow = props.messagesToShow) !== null && _props$messagesToShow !== void 0 && (_props$messagesToShow = _props$messagesToShow.messages) !== null && _props$messagesToShow !== void 0 && _props$messagesToShow.length)
|
|
55
|
+
if (!((_props$messages = props.messages) !== null && _props$messages !== void 0 && (_props$messages = _props$messages.messages) !== null && _props$messages !== void 0 && _props$messages.length) && !((_props$messagesToShow = props.messagesToShow) !== null && _props$messagesToShow !== void 0 && (_props$messagesToShow = _props$messagesToShow.messages) !== null && _props$messagesToShow !== void 0 && _props$messagesToShow.length)) return;
|
|
57
56
|
var messages_ = _objectSpread(_objectSpread({}, props.messages), {}, {
|
|
58
57
|
messages: (_props$messages2 = props.messages) === null || _props$messages2 === void 0 || (_props$messages2 = _props$messages2.messages) === null || _props$messages2 === void 0 ? void 0 : _props$messages2.filter(function (msg) {
|
|
59
58
|
return msg.type !== 1 && msg.type !== 0;
|
|
@@ -40,7 +40,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
|
|
|
40
40
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
41
41
|
var filterSpecialStatus = ['prepared_in', 'delivered_in', 'delivery_datetime'];
|
|
42
42
|
var MessagesUI = function MessagesUI(props) {
|
|
43
|
-
var
|
|
43
|
+
var _messages$messages, _order$business, _theme$images, _order$business2, _order$driver, _order$driver2, _order$business3, _theme$images2, _order$driver3, _order$business4, _order$driver4, _order$business6, _theme$images3, _order$driver5, _messagesToShow$messa;
|
|
44
44
|
var order = props.order,
|
|
45
45
|
messages = props.messages,
|
|
46
46
|
handleSend = props.handleSend,
|
|
@@ -58,9 +58,6 @@ var MessagesUI = function MessagesUI(props) {
|
|
|
58
58
|
setCanRead = props.setCanRead,
|
|
59
59
|
profileMessages = props.profileMessages;
|
|
60
60
|
var theme = (0, _styledComponents.useTheme)();
|
|
61
|
-
var _useConfig = (0, _orderingComponentsExternal.useConfig)(),
|
|
62
|
-
_useConfig2 = _slicedToArray(_useConfig, 1),
|
|
63
|
-
configs = _useConfig2[0].configs;
|
|
64
61
|
var _useLanguage = (0, _orderingComponentsExternal.useLanguage)(),
|
|
65
62
|
_useLanguage2 = _slicedToArray(_useLanguage, 2),
|
|
66
63
|
t = _useLanguage2[1];
|
|
@@ -95,7 +92,6 @@ var MessagesUI = function MessagesUI(props) {
|
|
|
95
92
|
var imageRef = (0, _react.useRef)(null);
|
|
96
93
|
var previousStatus = [1, 2, 5, 6, 10, 11, 12, 15, 16, 17];
|
|
97
94
|
var chatDisabled = previousStatus.includes(order === null || order === void 0 ? void 0 : order.status);
|
|
98
|
-
var hideLogBookMessages = (configs === null || configs === void 0 || (_configs$order_logboo = configs.order_logbook_enabled) === null || _configs$order_logboo === void 0 ? void 0 : _configs$order_logboo.value) === '0';
|
|
99
95
|
var quickMessageList = [{
|
|
100
96
|
key: 'message_1',
|
|
101
97
|
text: t('CUSTOMER_MESSAGE_1', 'Lorem ipsum 1')
|
|
@@ -400,12 +396,11 @@ var MessagesUI = function MessagesUI(props) {
|
|
|
400
396
|
}))), /*#__PURE__*/_react.default.createElement(_styles.MessageCustomer, null, /*#__PURE__*/_react.default.createElement(_styles.SkeletonBubbleCustomer, null, /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
|
|
401
397
|
width: 200,
|
|
402
398
|
height: 100
|
|
403
|
-
})))), !(messages !== null && messages !== void 0 && messages.loading) && order && /*#__PURE__*/_react.default.createElement(_styles.MessageContentWrapper, null,
|
|
399
|
+
})))), !(messages !== null && messages !== void 0 && messages.loading) && order && /*#__PURE__*/_react.default.createElement(_styles.MessageContentWrapper, null, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles.MessageCreatedDate, null, /*#__PURE__*/_react.default.createElement("span", null, parseDate(order.created_at, {
|
|
404
400
|
outputFormat: 'MMM DD, YYYY'
|
|
405
401
|
}))), /*#__PURE__*/_react.default.createElement(_styles.MessageConsole, null, /*#__PURE__*/_react.default.createElement(_styles.BubbleConsole, 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(_styles.TimeofSent, null, parseTime(order.created_at))))), /*#__PURE__*/_react.default.createElement(_MapMessages.MapMessages, {
|
|
406
402
|
messages: messagesToShow !== null && messagesToShow !== void 0 && (_messagesToShow$messa = messagesToShow.messages) !== null && _messagesToShow$messa !== void 0 && _messagesToShow$messa.length ? messagesToShow : messages,
|
|
407
403
|
messagesToShow: messagesToShow,
|
|
408
|
-
hideLogBookMessages: hideLogBookMessages,
|
|
409
404
|
order: order,
|
|
410
405
|
filterSpecialStatus: filterSpecialStatus,
|
|
411
406
|
handleModalImage: handleModalImage,
|
package/package.json
CHANGED
|
@@ -7,7 +7,6 @@ export const MapMessages = (props) => {
|
|
|
7
7
|
order,
|
|
8
8
|
filterSpecialStatus,
|
|
9
9
|
handleModalImage,
|
|
10
|
-
hideLogBookMessages,
|
|
11
10
|
getLevel,
|
|
12
11
|
business,
|
|
13
12
|
driver,
|
|
@@ -22,7 +21,7 @@ export const MapMessages = (props) => {
|
|
|
22
21
|
const [messagesToShow, setMessagesToShow] = useState(props.messagesToShow)
|
|
23
22
|
|
|
24
23
|
useEffect(() => {
|
|
25
|
-
if (
|
|
24
|
+
if (!props.messages?.messages?.length && !props.messagesToShow?.messages?.length) return
|
|
26
25
|
const messages_ = {
|
|
27
26
|
...props.messages,
|
|
28
27
|
messages: props.messages?.messages?.filter(msg => msg.type !== 1 && msg.type !== 0)
|
|
@@ -4,8 +4,7 @@ import {
|
|
|
4
4
|
Messages as MessagesController,
|
|
5
5
|
useUtils,
|
|
6
6
|
useLanguage,
|
|
7
|
-
useEvent
|
|
8
|
-
useConfig
|
|
7
|
+
useEvent
|
|
9
8
|
} from 'ordering-components-external'
|
|
10
9
|
import { useForm } from 'react-hook-form'
|
|
11
10
|
import IosSend from '@meronex/icons/ios/IosSend'
|
|
@@ -83,7 +82,6 @@ const MessagesUI = (props) => {
|
|
|
83
82
|
} = props
|
|
84
83
|
|
|
85
84
|
const theme = useTheme()
|
|
86
|
-
const [{ configs }] = useConfig()
|
|
87
85
|
const [, t] = useLanguage()
|
|
88
86
|
const { handleSubmit, register, errors, setValue } = useForm()
|
|
89
87
|
const [alertState, setAlertState] = useState({ open: false, content: [] })
|
|
@@ -95,8 +93,6 @@ const MessagesUI = (props) => {
|
|
|
95
93
|
const previousStatus = [1, 2, 5, 6, 10, 11, 12, 15, 16, 17]
|
|
96
94
|
const chatDisabled = previousStatus.includes(order?.status)
|
|
97
95
|
|
|
98
|
-
const hideLogBookMessages = configs?.order_logbook_enabled?.value === '0'
|
|
99
|
-
|
|
100
96
|
const quickMessageList = [
|
|
101
97
|
{ key: 'message_1', text: t('CUSTOMER_MESSAGE_1', 'Lorem ipsum 1') },
|
|
102
98
|
{ key: 'message_2', text: t('CUSTOMER_MESSAGE_2', 'Lorem ipsum 2') },
|
|
@@ -480,28 +476,25 @@ const MessagesUI = (props) => {
|
|
|
480
476
|
{
|
|
481
477
|
!messages?.loading && order && (
|
|
482
478
|
<MessageContentWrapper>
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
<
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
<
|
|
489
|
-
|
|
490
|
-
|
|
491
|
-
|
|
492
|
-
|
|
493
|
-
|
|
494
|
-
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
</>
|
|
500
|
-
)}
|
|
479
|
+
<>
|
|
480
|
+
<MessageCreatedDate>
|
|
481
|
+
<span>{parseDate(order.created_at, { outputFormat: 'MMM DD, YYYY' })}</span>
|
|
482
|
+
</MessageCreatedDate>
|
|
483
|
+
<MessageConsole>
|
|
484
|
+
<BubbleConsole>
|
|
485
|
+
{t('ORDER_PLACED_FOR', 'Order placed for')} {' '}
|
|
486
|
+
<strong>{parseDate(order.created_at)}</strong> {' '}
|
|
487
|
+
{t('VIA', 'Via')}{' '}
|
|
488
|
+
<strong>
|
|
489
|
+
{order.app_id ? t(order.app_id.toUpperCase(), order.app_id) : t('OTHER', 'Other')}
|
|
490
|
+
</strong>{' '}
|
|
491
|
+
<TimeofSent>{parseTime(order.created_at)}</TimeofSent>
|
|
492
|
+
</BubbleConsole>
|
|
493
|
+
</MessageConsole>
|
|
494
|
+
</>
|
|
501
495
|
<MapMessages
|
|
502
496
|
messages={messagesToShow?.messages?.length ? messagesToShow : messages}
|
|
503
497
|
messagesToShow={messagesToShow}
|
|
504
|
-
hideLogBookMessages={hideLogBookMessages}
|
|
505
498
|
order={order}
|
|
506
499
|
filterSpecialStatus={filterSpecialStatus}
|
|
507
500
|
handleModalImage={handleModalImage}
|