ordering-ui-admin-external 1.40.3 → 1.40.5
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.ea5f0d232e9a59d783b0.js → ordering-ui-admin.79529368a9955be3ce9e.js} +2 -2
- package/_modules/components/Orders/OrderDetailsHeader/index.js +2 -2
- package/_modules/components/Stores/ProductExtras/index.js +4 -2
- package/package.json +2 -2
- package/src/components/Orders/OrderDetailsHeader/index.js +2 -2
- package/src/components/Stores/ProductExtras/index.js +2 -2
- /package/_bundles/{ordering-ui-admin.ea5f0d232e9a59d783b0.js.LICENSE.txt → ordering-ui-admin.79529368a9955be3ce9e.js.LICENSE.txt} +0 -0
|
@@ -94,7 +94,7 @@ var OrderDetailsHeader = exports.OrderDetailsHeader = function OrderDetailsHeade
|
|
|
94
94
|
return document.removeEventListener('click', closeSelect);
|
|
95
95
|
};
|
|
96
96
|
}, [showPrinterOptions]);
|
|
97
|
-
return /*#__PURE__*/_react.default.createElement(_styles2.OrderDetailsHeaderContainer, null, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("h1", null, isServiceOrder ? t('APPOINTMENT_NO', 'Appointment No.') : t('INVOICE_ORDER_NO', 'Order No'), " ",
|
|
97
|
+
return /*#__PURE__*/_react.default.createElement(_styles2.OrderDetailsHeaderContainer, null, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("h1", null, isServiceOrder ? t('APPOINTMENT_NO', 'Appointment No.') : t('INVOICE_ORDER_NO', 'Order No'), " ", order.id), /*#__PURE__*/_react.default.createElement(_styles2.ButtonGroup, null, (user === null || user === void 0 ? void 0 : user.level) !== 5 && /*#__PURE__*/_react.default.createElement(_styles.IconButton, {
|
|
98
98
|
color: "black",
|
|
99
99
|
active: openMessage === null || openMessage === void 0 ? void 0 : openMessage.chat,
|
|
100
100
|
onClick: function onClick() {
|
|
@@ -161,7 +161,7 @@ var OrderDetailsHeader = exports.OrderDetailsHeader = function OrderDetailsHeade
|
|
|
161
161
|
onClick: function onClick() {
|
|
162
162
|
return closeSideBar();
|
|
163
163
|
}
|
|
164
|
-
}, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.XLg, null)))), (order === null || order === void 0 ? void 0 : order.external_id) && /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("h2", null, t('EXTERNAL_ID', 'External ID :'), " ", order === null || order === void 0 ? void 0 : order.external_id)), /*#__PURE__*/_react.default.createElement("p", null, (order === null || order === void 0 || (_order$payment_events = order.payment_events) === null || _order$payment_events === void 0 ? void 0 : _order$payment_events.length) > 0 ? order === null || order === void 0 || (_order$payment_events2 = order.payment_events) === null || _order$payment_events2 === void 0 ? void 0 : _order$payment_events2.filter(function (item) {
|
|
164
|
+
}, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.XLg, null)))), showExternalId && (order === null || order === void 0 ? void 0 : order.external_id) && /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("h2", null, t('EXTERNAL_ID', 'External ID :'), " ", order === null || order === void 0 ? void 0 : order.external_id)), /*#__PURE__*/_react.default.createElement("p", null, (order === null || order === void 0 || (_order$payment_events = order.payment_events) === null || _order$payment_events === void 0 ? void 0 : _order$payment_events.length) > 0 ? order === null || order === void 0 || (_order$payment_events2 = order.payment_events) === null || _order$payment_events2 === void 0 ? void 0 : _order$payment_events2.filter(function (item) {
|
|
165
165
|
return item.event === 'payment';
|
|
166
166
|
}).map(function (event, i) {
|
|
167
167
|
var _walletName$event$wal, _event$wallet_event, _event$paymethod, _event$paymethod2, _event$data, _event$paymethod3, _event$data2, _event$data3, _event$data4, _event$data5;
|
|
@@ -37,6 +37,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
|
|
|
37
37
|
function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
|
|
38
38
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
39
39
|
var ProductExtrasUI = function ProductExtrasUI(props) {
|
|
40
|
+
var _extrasState$extras4;
|
|
40
41
|
var productState = props.productState,
|
|
41
42
|
extrasState = props.extrasState,
|
|
42
43
|
isAddMode = props.isAddMode,
|
|
@@ -219,7 +220,8 @@ var ProductExtrasUI = function ProductExtrasUI(props) {
|
|
|
219
220
|
(0, _react.useEffect)(function () {
|
|
220
221
|
var extraId = query.get('extra');
|
|
221
222
|
if (extraId) {
|
|
222
|
-
var
|
|
223
|
+
var _extrasState$extras3;
|
|
224
|
+
var initExtra = extrasState === null || extrasState === void 0 || (_extrasState$extras3 = extrasState.extras) === null || _extrasState$extras3 === void 0 ? void 0 : _extrasState$extras3.find(function (extra) {
|
|
223
225
|
return extra.id === Number(extraId);
|
|
224
226
|
});
|
|
225
227
|
initExtra && handleOpenExtraDetails(null, initExtra, true);
|
|
@@ -231,7 +233,7 @@ var ProductExtrasUI = function ProductExtrasUI(props) {
|
|
|
231
233
|
onClick: function onClick() {
|
|
232
234
|
return handleOpenAddForm();
|
|
233
235
|
}
|
|
234
|
-
}, t('ADD_PRODUCT_OPTION', 'Add product option'))), (extrasState === null || extrasState === void 0 ? void 0 : extrasState.extras) && (extrasState === null || extrasState === void 0 ? void 0 :
|
|
236
|
+
}, t('ADD_PRODUCT_OPTION', 'Add product option'))), (extrasState === null || extrasState === void 0 ? void 0 : extrasState.extras) && (extrasState === null || extrasState === void 0 || (_extrasState$extras4 = extrasState.extras) === null || _extrasState$extras4 === void 0 ? void 0 : _extrasState$extras4.sort(function (a, b) {
|
|
235
237
|
return a.rank - b.rank;
|
|
236
238
|
}).map(function (extra, index) {
|
|
237
239
|
var _theme$images$icons, _extraIds$includes;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ordering-ui-admin-external",
|
|
3
|
-
"version": "1.40.
|
|
3
|
+
"version": "1.40.5",
|
|
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.40.
|
|
86
|
+
"ordering-components-admin-external": "1.40.3",
|
|
87
87
|
"polished": "^3.6.7",
|
|
88
88
|
"prop-types": "^15.7.2",
|
|
89
89
|
"react-big-calendar": "^1.4.2",
|
|
@@ -96,7 +96,7 @@ export const OrderDetailsHeader = (props) => {
|
|
|
96
96
|
return (
|
|
97
97
|
<OrderDetailsHeaderContainer>
|
|
98
98
|
<div>
|
|
99
|
-
<h1>{isServiceOrder ? t('APPOINTMENT_NO', 'Appointment No.') : t('INVOICE_ORDER_NO', 'Order No')} {
|
|
99
|
+
<h1>{isServiceOrder ? t('APPOINTMENT_NO', 'Appointment No.') : t('INVOICE_ORDER_NO', 'Order No')} {order.id}</h1>
|
|
100
100
|
<ButtonGroup>
|
|
101
101
|
{user?.level !== 5 && (
|
|
102
102
|
<ButtonLink
|
|
@@ -184,7 +184,7 @@ export const OrderDetailsHeader = (props) => {
|
|
|
184
184
|
</ButtonLink>
|
|
185
185
|
</ButtonGroup>
|
|
186
186
|
</div>
|
|
187
|
-
{order?.external_id && (
|
|
187
|
+
{showExternalId && order?.external_id && (
|
|
188
188
|
<div>
|
|
189
189
|
<h2>
|
|
190
190
|
{t('EXTERNAL_ID', 'External ID :')} {order?.external_id}
|
|
@@ -153,7 +153,7 @@ const ProductExtrasUI = (props) => {
|
|
|
153
153
|
useEffect(() => {
|
|
154
154
|
const extraId = query.get('extra')
|
|
155
155
|
if (extraId) {
|
|
156
|
-
const initExtra = extrasState?.extras
|
|
156
|
+
const initExtra = extrasState?.extras?.find(extra => extra.id === Number(extraId))
|
|
157
157
|
initExtra && handleOpenExtraDetails(null, initExtra, true)
|
|
158
158
|
}
|
|
159
159
|
}, [])
|
|
@@ -171,7 +171,7 @@ const ProductExtrasUI = (props) => {
|
|
|
171
171
|
{t('ADD_PRODUCT_OPTION', 'Add product option')}
|
|
172
172
|
</Button>
|
|
173
173
|
</Header>
|
|
174
|
-
{extrasState?.extras && extrasState?.extras
|
|
174
|
+
{extrasState?.extras && extrasState?.extras?.sort((a, b) => a.rank - b.rank).map((extra, index) => {
|
|
175
175
|
const isLastExtra = index === extrasState.extras.length - 1
|
|
176
176
|
return (
|
|
177
177
|
<ExtraOption
|