ordering-ui-admin-external 1.32.1 → 1.32.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/{ordering-ui-admin.6b45d7a224bb5f1d2841.js → ordering-ui-admin.4f45fe63ec89421145a4.js} +2 -2
- package/_modules/components/BusinessIntelligence/AnalyticsCalendar/index.js +34 -12
- package/_modules/components/BusinessIntelligence/ReportsDriverSchedule/index.js +2 -1
- package/_modules/components/Orders/OrderContactInformation/index.js +6 -2
- package/_modules/components/Orders/OrderDetailsHeader/styles.js +5 -3
- package/package.json +2 -2
- package/src/components/BusinessIntelligence/AnalyticsCalendar/index.js +37 -12
- package/src/components/BusinessIntelligence/ReportsDriverSchedule/index.js +1 -0
- package/src/components/Orders/OrderContactInformation/index.js +8 -0
- package/src/components/Orders/OrderDetailsHeader/styles.js +12 -3
- /package/_bundles/{ordering-ui-admin.6b45d7a224bb5f1d2841.js.LICENSE.txt → ordering-ui-admin.4f45fe63ec89421145a4.js.LICENSE.txt} +0 -0
|
@@ -26,26 +26,31 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
|
|
|
26
26
|
function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
|
|
27
27
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
28
28
|
var AnalyticsCalendar = function AnalyticsCalendar(props) {
|
|
29
|
-
var _state$language;
|
|
29
|
+
var _state$language, _state$language2;
|
|
30
30
|
var handleChangeDate = props.handleChangeDate,
|
|
31
31
|
defaultValue = props.defaultValue,
|
|
32
|
-
leftAlign = props.leftAlign
|
|
32
|
+
leftAlign = props.leftAlign,
|
|
33
|
+
isSingleDate = props.isSingleDate;
|
|
33
34
|
var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
|
|
34
35
|
_useLanguage2 = _slicedToArray(_useLanguage, 2),
|
|
35
36
|
state = _useLanguage2[0],
|
|
36
37
|
t = _useLanguage2[1];
|
|
37
|
-
var _useState = (0, _react.useState)(
|
|
38
|
+
var _useState = (0, _react.useState)(null),
|
|
39
|
+
_useState2 = _slicedToArray(_useState, 2),
|
|
40
|
+
date = _useState2[0],
|
|
41
|
+
setDate = _useState2[1];
|
|
42
|
+
var _useState3 = (0, _react.useState)([{
|
|
38
43
|
startDate: null,
|
|
39
44
|
endDate: null,
|
|
40
45
|
key: 'selection'
|
|
41
46
|
}]),
|
|
42
|
-
_useState2 = _slicedToArray(_useState, 2),
|
|
43
|
-
dateRange = _useState2[0],
|
|
44
|
-
setDateRange = _useState2[1];
|
|
45
|
-
var _useState3 = (0, _react.useState)(false),
|
|
46
47
|
_useState4 = _slicedToArray(_useState3, 2),
|
|
47
|
-
|
|
48
|
-
|
|
48
|
+
dateRange = _useState4[0],
|
|
49
|
+
setDateRange = _useState4[1];
|
|
50
|
+
var _useState5 = (0, _react.useState)(false),
|
|
51
|
+
_useState6 = _slicedToArray(_useState5, 2),
|
|
52
|
+
isShowCalendar = _useState6[0],
|
|
53
|
+
setIsShowCalendar = _useState6[1];
|
|
49
54
|
var calendarRef = (0, _react.useRef)();
|
|
50
55
|
var handleClickOutside = function handleClickOutside(e) {
|
|
51
56
|
var _calendarRef$current;
|
|
@@ -66,6 +71,10 @@ var AnalyticsCalendar = function AnalyticsCalendar(props) {
|
|
|
66
71
|
}
|
|
67
72
|
setDateRange([item.selection]);
|
|
68
73
|
};
|
|
74
|
+
var handleChangeSingleDate = function handleChangeSingleDate(selectedDate) {
|
|
75
|
+
handleChangeDate((0, _moment.default)(selectedDate).format('YYYY-MM-DD'), (0, _moment.default)(selectedDate).format('YYYY-MM-DD'));
|
|
76
|
+
setDate(selectedDate);
|
|
77
|
+
};
|
|
69
78
|
var dateFormat = function dateFormat(date1, date2) {
|
|
70
79
|
var formattedDate = "".concat((0, _moment.default)(date1).format('YYYY-MM-DD'), "~").concat((0, _moment.default)(date2).format('YYYY-MM-DD'));
|
|
71
80
|
if ((0, _moment.default)(date1).format('YYYY') === (0, _moment.default)(date2).format('YYYY')) {
|
|
@@ -80,6 +89,11 @@ var AnalyticsCalendar = function AnalyticsCalendar(props) {
|
|
|
80
89
|
};
|
|
81
90
|
}, [isShowCalendar]);
|
|
82
91
|
(0, _react.useEffect)(function () {
|
|
92
|
+
if (isSingleDate && defaultValue) {
|
|
93
|
+
setDate(new Date(defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.from));
|
|
94
|
+
console.log('this is date');
|
|
95
|
+
return;
|
|
96
|
+
}
|
|
83
97
|
if (defaultValue && (defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.from) !== '' && (defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.to) !== '') {
|
|
84
98
|
setDateRange([{
|
|
85
99
|
startDate: new Date(defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.from),
|
|
@@ -90,13 +104,21 @@ var AnalyticsCalendar = function AnalyticsCalendar(props) {
|
|
|
90
104
|
}, []);
|
|
91
105
|
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.Button, {
|
|
92
106
|
onClick: handleOpenCalendar
|
|
93
|
-
}, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.Calendar4, null), dateRange[0].startDate ? dateFormat(dateRange[0].startDate, dateRange[0].endDate) : t('SELECT_DATE_RANGE', 'Select Date Range')), isShowCalendar && /*#__PURE__*/_react.default.createElement(_styles3.AnalyticsCalendarContainer, {
|
|
107
|
+
}, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.Calendar4, null), isSingleDate ? date ? (0, _moment.default)(date).format('YYYY-MM-DD') : t('SELECT_DATE', 'Select a Date') : dateRange[0].startDate ? dateFormat(dateRange[0].startDate, dateRange[0].endDate) : t('SELECT_DATE_RANGE', 'Select Date Range')), isShowCalendar && /*#__PURE__*/_react.default.createElement(_styles3.AnalyticsCalendarContainer, {
|
|
94
108
|
className: "ordering-calendar",
|
|
95
109
|
ref: calendarRef,
|
|
96
110
|
leftAlign: leftAlign
|
|
97
|
-
}, /*#__PURE__*/_react.default.createElement(_reactDateRange.
|
|
98
|
-
editableDateInputs: true,
|
|
111
|
+
}, isSingleDate ? /*#__PURE__*/_react.default.createElement(_reactDateRange.Calendar, {
|
|
99
112
|
locale: (0, _utils.getLocale)(state === null || state === void 0 || (_state$language = state.language) === null || _state$language === void 0 ? void 0 : _state$language.code, locales),
|
|
113
|
+
date: date,
|
|
114
|
+
onChange: function onChange(date) {
|
|
115
|
+
return handleChangeSingleDate(date);
|
|
116
|
+
},
|
|
117
|
+
startDatePlaceholder: t('EARLY', 'Early'),
|
|
118
|
+
endDatePlaceholder: t('CONTINUOUS', 'Continuous')
|
|
119
|
+
}) : /*#__PURE__*/_react.default.createElement(_reactDateRange.DateRange, {
|
|
120
|
+
editableDateInputs: true,
|
|
121
|
+
locale: (0, _utils.getLocale)(state === null || state === void 0 || (_state$language2 = state.language) === null || _state$language2 === void 0 ? void 0 : _state$language2.code, locales),
|
|
100
122
|
onChange: function onChange(item) {
|
|
101
123
|
return handleChangeDates(item);
|
|
102
124
|
},
|
|
@@ -206,7 +206,8 @@ var ReportsDriverScheduleUI = function ReportsDriverScheduleUI(props) {
|
|
|
206
206
|
}
|
|
207
207
|
}, t('DRIVER', 'Driver'), " (", filterList !== null && filterList !== void 0 && filterList.drivers_ids ? filterList === null || filterList === void 0 ? void 0 : filterList.drivers_ids.length : t('ALL', 'All'), ")")), /*#__PURE__*/_react.default.createElement(_styles2.TimeZoneAndCalendar, null, /*#__PURE__*/_react.default.createElement(_styles2.AnalyticsTimeZoneWrapper, null, /*#__PURE__*/_react.default.createElement(_AnalyticsFilterTimeZone.AnalyticsFilterTimeZone, props)), /*#__PURE__*/_react.default.createElement(_styles2.CalendarWrapper, null, /*#__PURE__*/_react.default.createElement(_AnalyticsCalendar.AnalyticsCalendar, {
|
|
208
208
|
handleChangeDate: handleChangeDate,
|
|
209
|
-
defaultValue: filterList
|
|
209
|
+
defaultValue: filterList,
|
|
210
|
+
isSingleDate: true
|
|
210
211
|
})))), /*#__PURE__*/_react.default.createElement(_styles2.DistancePerBrandWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.ScheduleTitleBlock, {
|
|
211
212
|
active: (reportData === null || reportData === void 0 || (_reportData$content3 = reportData.content) === null || _reportData$content3 === void 0 || (_reportData$content3 = _reportData$content3.data) === null || _reportData$content3 === void 0 ? void 0 : _reportData$content3.length) > 0
|
|
212
213
|
}, /*#__PURE__*/_react.default.createElement("h2", null, t('DRIVER_SCHEDULE', 'DRIVER SCHEDULE')), /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.Download, {
|
|
@@ -27,7 +27,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
|
|
|
27
27
|
function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
|
|
28
28
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
29
29
|
var OrderContactInformation = function OrderContactInformation(props) {
|
|
30
|
-
var _order$business, _order$business2, _order$business3, _order$business4, _order$business5, _order$business6, _order$business7, _order$business8, _order$business9, _order$business10, _order$business11, _order$business12, _order$business13, _order$business14, _order$business15, _order$customer, _order$customer2, _order$customer3, _order$customer4, _order$customer5, _order$customer6, _order$customer7, _order$customer8, _order$customer9, _order$customer10, _order$customer11, _order$customer12, _order$customer13, _order$customer17, _order$customer18, _order$customer19, _order$customer20, _order$customer21, _order$customer22, _order$customer23, _order$customer24, _order$customer25, _order$customer26, _order$customer27, _order$customer28, _order$customer29, _order$customer30, _order$customer31, _order$customer32, _order$customer33, _order$customer34, _order$customer35, _order$driver_company, _order$driver_id, _order$driver, _order$driver2, _order$driver3, _order$driver4, _order$driver5, _order$driver6, _order$driver7;
|
|
30
|
+
var _order$business, _order$business2, _order$business3, _order$business4, _order$business5, _order$business6, _order$business7, _order$business8, _order$business9, _order$business10, _order$business11, _order$business12, _order$business13, _order$business14, _order$business15, _order$customer, _order$customer2, _order$customer3, _order$customer4, _order$customer5, _order$customer6, _order$customer7, _order$customer8, _order$customer9, _order$customer10, _order$customer11, _order$customer12, _order$customer13, _order$customer17, _order$customer18, _order$customer19, _order$customer20, _order$customer21, _order$customer22, _order$customer23, _order$customer24, _order$customer25, _order$customer26, _order$customer27, _order$customer28, _order$customer29, _order$customer30, _order$customer31, _order$customer32, _order$customer33, _order$customer34, _order$customer35, _order$customer36, _order$customer37, _order$customer38, _order$customer39, _order$customer40, _order$driver_company, _order$driver_id, _order$driver, _order$driver2, _order$driver3, _order$driver4, _order$driver5, _order$driver6, _order$driver7;
|
|
31
31
|
var order = props.order,
|
|
32
32
|
isTourOpen = props.isTourOpen,
|
|
33
33
|
setCurrentTourStep = props.setCurrentTourStep,
|
|
@@ -107,7 +107,11 @@ var OrderContactInformation = function OrderContactInformation(props) {
|
|
|
107
107
|
href: "http://maps.google.com/?q=".concat(order === null || order === void 0 || (_order$customer28 = order.customer) === null || _order$customer28 === void 0 ? void 0 : _order$customer28.address),
|
|
108
108
|
rel: "noopener noreferrer",
|
|
109
109
|
target: "_blank"
|
|
110
|
-
}, order === null || order === void 0 || (_order$customer29 = order.customer) === null || _order$customer29 === void 0 ? void 0 : _order$customer29.address))), !!(order !== null && order !== void 0 && (_order$customer30 = order.customer) !== null && _order$customer30 !== void 0 && _order$customer30.
|
|
110
|
+
}, order === null || order === void 0 || (_order$customer29 = order.customer) === null || _order$customer29 === void 0 ? void 0 : _order$customer29.address))), !!(order !== null && order !== void 0 && (_order$customer30 = order.customer) !== null && _order$customer30 !== void 0 && _order$customer30.location) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('LOCATION', 'Location')), /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement("a", {
|
|
111
|
+
href: "http://maps.google.com/?q=".concat(order === null || order === void 0 || (_order$customer31 = order.customer) === null || _order$customer31 === void 0 || (_order$customer31 = _order$customer31.location) === null || _order$customer31 === void 0 ? void 0 : _order$customer31.lat, ",").concat(order === null || order === void 0 || (_order$customer32 = order.customer) === null || _order$customer32 === void 0 || (_order$customer32 = _order$customer32.location) === null || _order$customer32 === void 0 ? void 0 : _order$customer32.lng),
|
|
112
|
+
rel: "noopener noreferrer",
|
|
113
|
+
target: "_blank"
|
|
114
|
+
}, order === null || order === void 0 || (_order$customer33 = order.customer) === null || _order$customer33 === void 0 || (_order$customer33 = _order$customer33.location) === null || _order$customer33 === void 0 ? void 0 : _order$customer33.lat, ", ", order === null || order === void 0 || (_order$customer34 = order.customer) === null || _order$customer34 === void 0 || (_order$customer34 = _order$customer34.location) === null || _order$customer34 === void 0 ? void 0 : _order$customer34.lng))), !!(order !== null && order !== void 0 && (_order$customer35 = order.customer) !== null && _order$customer35 !== void 0 && _order$customer35.internal_number) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('INTERNAL_NUMBER', 'Internal number')), /*#__PURE__*/_react.default.createElement("td", null, order === null || order === void 0 || (_order$customer36 = order.customer) === null || _order$customer36 === void 0 ? void 0 : _order$customer36.internal_number)), !!(order !== null && order !== void 0 && (_order$customer37 = order.customer) !== null && _order$customer37 !== void 0 && _order$customer37.address_notes) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('NOTES', 'Notes')), /*#__PURE__*/_react.default.createElement("td", null, order === null || order === void 0 || (_order$customer38 = order.customer) === null || _order$customer38 === void 0 ? void 0 : _order$customer38.address_notes)), !!(order !== null && order !== void 0 && (_order$customer39 = order.customer) !== null && _order$customer39 !== void 0 && _order$customer39.zipcode) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('ZIPCODE', 'Zipcode')), /*#__PURE__*/_react.default.createElement("td", null, order === null || order === void 0 || (_order$customer40 = order.customer) === null || _order$customer40 === void 0 ? void 0 : _order$customer40.zipcode)), !!(order !== null && order !== void 0 && order.on_behalf_of) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('ON_BEHALF_OF', 'On behalf of')), /*#__PURE__*/_react.default.createElement("td", null, order === null || order === void 0 ? void 0 : order.on_behalf_of))))))), (order === null || order === void 0 ? void 0 : order.delivery_type) === 1 && !isServiceOrder && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !(order !== null && order !== void 0 && order.driver_id) && /*#__PURE__*/_react.default.createElement(_styles2.CompanySelectorContainer, null, /*#__PURE__*/_react.default.createElement("p", null, t('DRIVER_COMPANY', 'Driver company')), /*#__PURE__*/_react.default.createElement(_CompanySelector.CompanySelector, {
|
|
111
115
|
small: true,
|
|
112
116
|
isPhoneView: true,
|
|
113
117
|
defaultValue: (_order$driver_company = order === null || order === void 0 ? void 0 : order.driver_company_id) !== null && _order$driver_company !== void 0 ? _order$driver_company : 'default',
|
|
@@ -35,9 +35,11 @@ var StripeLink = _styledComponents.default.a(_templateObject10 || (_templateObje
|
|
|
35
35
|
exports.StripeLink = StripeLink;
|
|
36
36
|
var PrinterSelectContainer = _styledComponents.default.div(_templateObject11 || (_templateObject11 = _taggedTemplateLiteral(["\n position: relative;\n margin-right: 8px;\n"])));
|
|
37
37
|
exports.PrinterSelectContainer = PrinterSelectContainer;
|
|
38
|
-
var PrinterSelect = _styledComponents.default.div(_templateObject12 || (_templateObject12 = _taggedTemplateLiteral(["\n position: absolute;\n border-radius: 8px;\n display: flex;\n flex-direction: column;\n z-index: 100;\n border: 1px solid ", ";\n\n button {\n padding:
|
|
39
|
-
return props.theme.colors.
|
|
38
|
+
var PrinterSelect = _styledComponents.default.div(_templateObject12 || (_templateObject12 = _taggedTemplateLiteral(["\n position: absolute;\n right: 0;\n border-radius: 8px;\n display: flex;\n flex-direction: column;\n z-index: 100;\n padding: 0.5rem 0;\n border: 1px solid ", ";\n box-shadow: 0px 4px 10px rgba(0,0,0,0.12);\n z-index: 12;\n background-color: ", ";\n\n button {\n height: auto;\n padding: 0.25rem 1.5rem;\n font-size: 12px;\n border-radius: 0px;\n font-weight: 400;\n color: ", ";\n &:hover {\n background-color: #f5f5f5;\n }\n }\n"])), function (props) {
|
|
39
|
+
return props.theme.colors.borderColor;
|
|
40
40
|
}, function (props) {
|
|
41
|
-
return props.theme.colors.
|
|
41
|
+
return props.theme.colors.white;
|
|
42
|
+
}, function (props) {
|
|
43
|
+
return props.theme.colors.headingColor;
|
|
42
44
|
});
|
|
43
45
|
exports.PrinterSelect = PrinterSelect;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ordering-ui-admin-external",
|
|
3
|
-
"version": "1.32.
|
|
3
|
+
"version": "1.32.2",
|
|
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.32.
|
|
86
|
+
"ordering-components-admin-external": "1.32.1",
|
|
87
87
|
"polished": "^3.6.7",
|
|
88
88
|
"prop-types": "^15.7.2",
|
|
89
89
|
"react-big-calendar": "^1.4.2",
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React, { useEffect, useState, useRef } from 'react'
|
|
2
2
|
import { useLanguage } from 'ordering-components-admin-external'
|
|
3
3
|
import moment from 'moment'
|
|
4
|
-
import { DateRange } from 'react-date-range'
|
|
4
|
+
import { DateRange, Calendar } from 'react-date-range'
|
|
5
5
|
import 'react-date-range/dist/styles.css'
|
|
6
6
|
import 'react-date-range/dist/theme/default.css'
|
|
7
7
|
import { Calendar4 } from 'react-bootstrap-icons'
|
|
@@ -14,11 +14,13 @@ export const AnalyticsCalendar = (props) => {
|
|
|
14
14
|
const {
|
|
15
15
|
handleChangeDate,
|
|
16
16
|
defaultValue,
|
|
17
|
-
leftAlign
|
|
17
|
+
leftAlign,
|
|
18
|
+
isSingleDate
|
|
18
19
|
} = props
|
|
19
20
|
|
|
20
21
|
const [state, t] = useLanguage()
|
|
21
22
|
|
|
23
|
+
const [date, setDate] = useState(null)
|
|
22
24
|
const [dateRange, setDateRange] = useState([
|
|
23
25
|
{
|
|
24
26
|
startDate: null,
|
|
@@ -49,6 +51,11 @@ export const AnalyticsCalendar = (props) => {
|
|
|
49
51
|
setDateRange([item.selection])
|
|
50
52
|
}
|
|
51
53
|
|
|
54
|
+
const handleChangeSingleDate = (selectedDate) => {
|
|
55
|
+
handleChangeDate(moment(selectedDate).format('YYYY-MM-DD'), moment(selectedDate).format('YYYY-MM-DD'))
|
|
56
|
+
setDate(selectedDate)
|
|
57
|
+
}
|
|
58
|
+
|
|
52
59
|
const dateFormat = (date1, date2) => {
|
|
53
60
|
let formattedDate = `${moment(date1).format('YYYY-MM-DD')}~${moment(date2).format('YYYY-MM-DD')}`
|
|
54
61
|
if (moment(date1).format('YYYY') === moment(date2).format('YYYY')) {
|
|
@@ -64,6 +71,12 @@ export const AnalyticsCalendar = (props) => {
|
|
|
64
71
|
}, [isShowCalendar])
|
|
65
72
|
|
|
66
73
|
useEffect(() => {
|
|
74
|
+
if (isSingleDate && defaultValue) {
|
|
75
|
+
setDate(new Date(defaultValue?.from))
|
|
76
|
+
console.log('this is date')
|
|
77
|
+
return
|
|
78
|
+
}
|
|
79
|
+
|
|
67
80
|
if (defaultValue && defaultValue?.from !== '' && defaultValue?.to !== '') {
|
|
68
81
|
setDateRange([
|
|
69
82
|
{
|
|
@@ -80,21 +93,33 @@ export const AnalyticsCalendar = (props) => {
|
|
|
80
93
|
<Button onClick={handleOpenCalendar}>
|
|
81
94
|
<Calendar4 />
|
|
82
95
|
{
|
|
83
|
-
|
|
96
|
+
isSingleDate
|
|
97
|
+
? (date ? moment(date).format('YYYY-MM-DD') : t('SELECT_DATE', 'Select a Date'))
|
|
98
|
+
: (dateRange[0].startDate ? dateFormat(dateRange[0].startDate, dateRange[0].endDate) : t('SELECT_DATE_RANGE', 'Select Date Range'))
|
|
84
99
|
}
|
|
85
100
|
</Button>
|
|
86
101
|
{
|
|
87
102
|
isShowCalendar && (
|
|
88
103
|
<AnalyticsCalendarContainer className='ordering-calendar' ref={calendarRef} leftAlign={leftAlign}>
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
104
|
+
{isSingleDate ? (
|
|
105
|
+
<Calendar
|
|
106
|
+
locale={getLocale(state?.language?.code, locales)}
|
|
107
|
+
date={date}
|
|
108
|
+
onChange={(date) => handleChangeSingleDate(date)}
|
|
109
|
+
startDatePlaceholder={t('EARLY', 'Early')}
|
|
110
|
+
endDatePlaceholder={t('CONTINUOUS', 'Continuous')}
|
|
111
|
+
/>
|
|
112
|
+
) : (
|
|
113
|
+
<DateRange
|
|
114
|
+
editableDateInputs
|
|
115
|
+
locale={getLocale(state?.language?.code, locales)}
|
|
116
|
+
onChange={item => handleChangeDates(item)}
|
|
117
|
+
moveRangeOnFirstSelection={false}
|
|
118
|
+
ranges={dateRange}
|
|
119
|
+
startDatePlaceholder={t('EARLY', 'Early')}
|
|
120
|
+
endDatePlaceholder={t('CONTINUOUS', 'Continuous')}
|
|
121
|
+
/>
|
|
122
|
+
)}
|
|
98
123
|
</AnalyticsCalendarContainer>
|
|
99
124
|
)
|
|
100
125
|
}
|
|
@@ -186,6 +186,14 @@ export const OrderContactInformation = (props) => {
|
|
|
186
186
|
</td>
|
|
187
187
|
</tr>
|
|
188
188
|
)}
|
|
189
|
+
{!!order?.customer?.location && (
|
|
190
|
+
<tr>
|
|
191
|
+
<td>{t('LOCATION', 'Location')}</td>
|
|
192
|
+
<td>
|
|
193
|
+
<a href={`http://maps.google.com/?q=${order?.customer?.location?.lat},${order?.customer?.location?.lng}`} rel='noopener noreferrer' target='_blank'>{order?.customer?.location?.lat}, {order?.customer?.location?.lng}</a>
|
|
194
|
+
</td>
|
|
195
|
+
</tr>
|
|
196
|
+
)}
|
|
189
197
|
{!!order?.customer?.internal_number && (
|
|
190
198
|
<tr>
|
|
191
199
|
<td>{t('INTERNAL_NUMBER', 'Internal number')}</td>
|
|
@@ -89,15 +89,24 @@ export const PrinterSelectContainer = styled.div`
|
|
|
89
89
|
|
|
90
90
|
export const PrinterSelect = styled.div`
|
|
91
91
|
position: absolute;
|
|
92
|
+
right: 0;
|
|
92
93
|
border-radius: 8px;
|
|
93
94
|
display: flex;
|
|
94
95
|
flex-direction: column;
|
|
95
96
|
z-index: 100;
|
|
96
|
-
|
|
97
|
+
padding: 0.5rem 0;
|
|
98
|
+
border: 1px solid ${props => props.theme.colors.borderColor};
|
|
99
|
+
box-shadow: 0px 4px 10px rgba(0,0,0,0.12);
|
|
100
|
+
z-index: 12;
|
|
101
|
+
background-color: ${props => props.theme.colors.white};
|
|
97
102
|
|
|
98
103
|
button {
|
|
99
|
-
|
|
100
|
-
|
|
104
|
+
height: auto;
|
|
105
|
+
padding: 0.25rem 1.5rem;
|
|
106
|
+
font-size: 12px;
|
|
107
|
+
border-radius: 0px;
|
|
108
|
+
font-weight: 400;
|
|
109
|
+
color: ${props => props.theme.colors.headingColor};
|
|
101
110
|
&:hover {
|
|
102
111
|
background-color: #f5f5f5;
|
|
103
112
|
}
|