@bjsdistribution/dms-client-return 0.1.68-prod → 0.1.69-prod
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/dist/components/order-view/utils.d.ts +0 -1
- package/dist/dms-client-return.cjs.development.js +38 -18
- package/dist/dms-client-return.cjs.development.js.map +1 -1
- package/dist/dms-client-return.cjs.production.min.js +1 -1
- package/dist/dms-client-return.cjs.production.min.js.map +1 -1
- package/dist/dms-client-return.esm.js +39 -19
- package/dist/dms-client-return.esm.js.map +1 -1
- package/package.json +1 -1
- package/src/components/order-daily-overview/return-order-table/return-orders-filters/ReturnOrderTable.tsx +40 -25
- package/src/components/order-daily-overview/return-order-table/return-orders-filters/returnstyles.ts +8 -1
- package/src/components/order-view/modalsPopup/ModalManager.tsx +18 -5
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React, { useState, useEffect, useRef, useMemo, Suspense } from 'react';
|
|
2
2
|
import { useSearchParams, useNavigate, useParams, NavLink, useLocation, Routes, Route, Navigate } from 'react-router-dom';
|
|
3
3
|
import styled, { css } from 'styled-components';
|
|
4
|
-
import { Select, Spin, notification, Skeleton, Empty, DatePicker, message,
|
|
4
|
+
import { Select, Spin, notification, Skeleton, Empty, Tooltip, DatePicker, message, Input as Input$3, Checkbox as Checkbox$1, Dropdown, Space } from 'antd';
|
|
5
5
|
import { useAtom, atom } from 'jotai';
|
|
6
6
|
import { format, isValid, parseISO } from 'date-fns';
|
|
7
7
|
import { atomWithReducer } from 'jotai/utils';
|
|
@@ -2401,7 +2401,7 @@ var StyledFilterBtnLabel = /*#__PURE__*/styled.div(_templateObject37 || (_templa
|
|
|
2401
2401
|
|
|
2402
2402
|
var _templateObject18, _templateObject19, _templateObject20, _templateObject21;
|
|
2403
2403
|
var EmptyDataContainer$1 = /*#__PURE__*/styled.div(_templateObject18 || (_templateObject18 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n display: flex;\n justify-content: center;\n"])));
|
|
2404
|
-
var StyledTable$1 = /*#__PURE__*/styled.table(_templateObject19 || (_templateObject19 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n border-spacing: 0 10px;\n width: 100%;\n /* min-width: 1600px; */\n thead {\n white-space: nowrap;\n position: sticky;\n top: 10px;\n z-index: 1;\n background: #fff;\n box-shadow: 0px 0px 1px #ffffff, 0px -10px 1px #ffffff;\n tr {\n border-radius: 40px;\n border-spacing: 0 10px;\n position: relative;\n font-family: 'lato', sans-serif;\n .emailInvoiceCheckbox {\n padding-right: 0px;\n width: 0;\n > div {\n width: fit-content;\n }\n }\n .custom-check {\n position:
|
|
2404
|
+
var StyledTable$1 = /*#__PURE__*/styled.table(_templateObject19 || (_templateObject19 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n border-spacing: 0 10px;\n width: 100%;\n /* min-width: 1600px; */\n thead {\n white-space: nowrap;\n position: sticky;\n top: 10px;\n z-index: 1;\n background: #fff;\n box-shadow: 0px 0px 1px #ffffff, 0px -10px 1px #ffffff;\n tr {\n border-radius: 40px;\n border-spacing: 0 10px;\n position: relative;\n font-family: 'lato', sans-serif;\n .emailInvoiceCheckbox {\n padding-right: 0px;\n width: 0;\n > div {\n width: fit-content;\n }\n }\n .custom-check {\n position: absolute;\n }\n .emailInvoiceNo {\n padding-left: 0px;\n }\n .emailInvoiceShare {\n width: 100px;\n }\n th {\n color: #3a3630;\n font-size: 14px;\n font-style: normal;\n font-weight: 600;\n line-height: normal;\n padding: 11px 15px;\n background: #f0f2f2;\n border-right: none;\n border-left: none;\n text-align: left;\n border: 1px solid rgba(0, 0, 0, 0.08);\n border-width: 1px 0;\n &:first-child {\n border-radius: 100px 0 0 100px;\n border-left: 1px solid rgba(0, 0, 0, 0.08);\n }\n &:last-child {\n border-radius: 0px 100px 100px 0;\n border-right: 1px solid rgba(0, 0, 0, 0.08);\n }\n .sortIconClass {\n cursor: pointer;\n display: flex;\n }\n }\n }\n }\n tbody {\n max-height: 400px;\n overflow-y: auto;\n tr {\n td {\n color: #3a3630;\n font-size: 13px;\n font-style: normal;\n font-weight: 400;\n line-height: normal;\n padding: 12px 15px;\n background: #fff;\n border: 1px solid rgba(0, 0, 0, 0.08);\n border-right: none;\n border-left: none;\n position: relative;\n .disabled-wrapper {\n cursor: not-allowed !important;\n display: inline-block;\n * {\n pointer-events: none !important;\n }\n }\n .actionbox {\n display: flex;\n gap: 5px;\n }\n .shareIconContainer {\n display: flex;\n padding: 2px 12px;\n align-items: center;\n gap: 8px;\n border-radius: 20px;\n border: 1px solid var(--tonal-brown-101, #e2e0db);\n background: #fff;\n list-style-type: none;\n /* padding-left: 0; */\n /* fontWeight: 600,\n paddingLeft: 0, */\n cursor: pointer;\n position: relative;\n }\n .statusCancelled {\n color: #e95252;\n /* background: rgba(233, 82, 82, 0.15); */\n padding: 4px 8px;\n border-radius: 4px;\n }\n\n .statusOnHold {\n color: #f4a503;\n /* background: #fff1d6; */\n padding: 4px 8px;\n border-radius: 4px;\n }\n\n .statusSubContracted {\n color: #845adf;\n /* background: rgba(132, 90, 223, 0.15); */\n padding: 4px 8px;\n border-radius: 4px;\n }\n\n .statusAwaiting {\n color: #845adf;\n /* background: rgba(132, 90, 223, 0.15); */\n padding: 4px 8px;\n border-radius: 4px;\n }\n\n .statusCompleted {\n color: #1f9254;\n /* background: rgba(41, 204, 106, 0.15); */\n padding: 4px 8px;\n border-radius: 4px;\n }\n\n .statusOutstanding {\n color: #f4a503;\n /* background: #fff1d6; */\n padding: 4px 8px;\n border-radius: 4px;\n }\n\n .statusUnknown {\n color: #000;\n /* background: #fff; */\n padding: 4px 8px;\n border-radius: 4px;\n }\n .statustext {\n color: #1f9254;\n font-family: 'Open Sans';\n font-size: 12px;\n font-style: normal;\n font-weight: 600;\n line-height: normal;\n }\n .downloadcontainer {\n display: flex;\n padding: 2px 12px;\n align-items: center;\n\n width: 28px;\n height: 28px;\n flex-direction: column;\n\n border-radius: 14px;\n border: 1px solid #e2e0db;\n background: #fff;\n }\n .statuscontainer {\n display: flex;\n padding: 5px 30px 5px 30px;\n justify-content: center;\n align-items: center;\n gap: 5px;\n flex: 1 0 0;\n border-radius: 22px;\n background: rgba(41, 204, 106, 0.15);\n }\n .awaiting {\n display: flex;\n min-width: 85px;\n padding: 6px 10px;\n justify-content: center;\n align-items: center;\n gap: 5px;\n border-radius: 22px;\n background: rgba(233, 82, 82, 0.15);\n color: #e95252;\n font-family: 'Open Sans';\n font-size: 12px;\n font-weight: 600;\n }\n ul > li > a {\n text-decoration: none !important;\n color: #0099ff;\n }\n }\n &:nth-child(even) td {\n background: #f6fbff;\n }\n td:first-child {\n border-radius: 100px 0 0 100px;\n border-left: 1px solid rgba(0, 0, 0, 0.08);\n }\n td:last-child {\n border-radius: 0px 100px 100px 0;\n border-right: 1px solid rgba(0, 0, 0, 0.08);\n }\n .flex {\n display: flex;\n flex-direction: row;\n gap: 5px;\n height: 29px;\n align-items: center;\n }\n\n &.insideTable {\n td {\n border-radius: 0;\n border: none;\n &:last-child {\n border-radius: 0;\n border-right: none;\n }\n }\n table {\n border-spacing: 0;\n width: 100%;\n border-radius: 5px;\n border: 1px solid rgba(0, 0, 0, 0.08);\n overflow: hidden;\n border-top-left-radius: 15px;\n border-top-right-radius: 15px;\n thead {\n tr {\n border-bottom: none;\n th {\n padding: 14px 20px;\n text-align: left;\n border-top: 0;\n border-right: 0;\n border-left: 0;\n background: #f8fafc;\n\n &:first-child {\n border-radius: 0;\n border-left: 1px solid rgba(0, 0, 0, 0.08);\n border-top-left-radius: 15px;\n }\n &:last-child {\n border-radius: 0;\n }\n }\n }\n }\n tbody {\n tr.product-row td {\n border-bottom: none;\n }\n\n tr.ni-row td {\n border-top: none;\n padding-top: 0;\n background: #fff;\n }\n\n tr.product-row td:first-child {\n border-bottom-left-radius: 0;\n }\n\n tr.product-row td:last-child {\n border-bottom-right-radius: 0;\n }\n\n tr.ni-row td:first-child {\n border-top-left-radius: 0;\n }\n\n tr.ni-row td:last-child {\n border-top-right-radius: 0;\n }\n\n tr.ni-row:nth-child(even) td {\n background: #fff;\n }\n tr {\n td {\n padding: 14px 20px;\n text-align: left;\n border-bottom: 1px solid rgba(58, 54, 48, 0.15);\n background: #fff;\n > svg {\n transform: scale(1.5);\n background-color: #edebe8;\n border-radius: 20px;\n padding: 5px;\n }\n &:last-child {\n border-radius: 0;\n border-right: none;\n }\n }\n }\n }\n }\n }\n }\n }\n\n .actions {\n display: flex;\n align-items: center;\n gap: 20px;\n > svg {\n transform: scale(1.5);\n background-color: #edebe8;\n border-radius: 20px;\n padding: 5px;\n }\n\n .close-icon {\n transform: scale(1.3);\n background-color: transparent;\n border-radius: 0;\n padding: 0;\n }\n }\n"])));
|
|
2405
2405
|
// Styled components
|
|
2406
2406
|
var StyledTableWrapper$1 = /*#__PURE__*/styled.div(_templateObject20 || (_templateObject20 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n max-height: 60vh;\n overflow-x: auto;\n // min-height: 50vh;\n\n .fortables {\n max-height: 60vh;\n overflow-x: auto;\n min-height: 50vh;\n }\n /* height: 600px; */\n /* box-shadow: 0px 0px 30px 6px rgba(46, 45, 116, 0.05); */\n &::-webkit-scrollbar {\n width: 5px;\n border-radius: 100px;\n height: 5px;\n }\n\n &::-webkit-scrollbar-track {\n background: #777;\n border-radius: 100px;\n }\n\n &::-webkit-scrollbar-thumb {\n background: #7b61ff;\n border-radius: 100px;\n }\n\n &::-webkit-scrollbar-thumb:hover {\n background: #7b61ff;\n }\n"])));
|
|
2407
2407
|
var CustomDrop = /*#__PURE__*/styled.div(_templateObject21 || (_templateObject21 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n /* border-radius: 20px;\n border: 1px solid #e2e0db;\n background: #fff;\n display: flex;\n padding: 4px 8px;\n gap: 8px;\n align-items: center; */\n cursor: pointer;\n &.active .drop {\n transform: rotate(180deg);\n }\n"])));
|
|
@@ -2743,19 +2743,26 @@ var ReturnOrderTable = function ReturnOrderTable() {
|
|
|
2743
2743
|
}))) : (sortedData == null ? void 0 : sortedData.length) === 0 ? React.createElement("tr", null, React.createElement("td", {
|
|
2744
2744
|
colSpan: 14
|
|
2745
2745
|
}, React.createElement(EmptyDataContainer, null, React.createElement(Empty, null)))) : sortedData == null ? void 0 : sortedData.map(function (item, index) {
|
|
2746
|
-
var
|
|
2746
|
+
var _item$client_name;
|
|
2747
2747
|
return React.createElement("tr", {
|
|
2748
2748
|
key: item.id
|
|
2749
|
-
}, React.createElement("td", null, isSelectableItem(item) ?
|
|
2750
|
-
|
|
2751
|
-
|
|
2752
|
-
|
|
2753
|
-
|
|
2754
|
-
|
|
2755
|
-
|
|
2756
|
-
|
|
2757
|
-
|
|
2758
|
-
|
|
2749
|
+
}, React.createElement("td", null, isSelectableItem(item) ? function (_selectedReturnOrder$2) {
|
|
2750
|
+
var isDisabled = (selectedReturnOrder == null ? void 0 : selectedReturnOrder.length) > 0 && ((_selectedReturnOrder$2 = selectedReturnOrder[0]) == null ? void 0 : _selectedReturnOrder$2.product_return_action) !== (item == null ? void 0 : item.product_return_action);
|
|
2751
|
+
return React.createElement(Tooltip, {
|
|
2752
|
+
title: isDisabled ? 'Cannot select different return actions' : ''
|
|
2753
|
+
}, React.createElement("span", {
|
|
2754
|
+
className: isDisabled ? 'disabled-wrapper' : ''
|
|
2755
|
+
}, React.createElement(Checkbox, {
|
|
2756
|
+
className: "custom-check",
|
|
2757
|
+
disabled: isDisabled,
|
|
2758
|
+
checked: selectedReturnOrder.some(function (selectedInvoice) {
|
|
2759
|
+
return (selectedInvoice == null ? void 0 : selectedInvoice.id) === (item == null ? void 0 : item.id);
|
|
2760
|
+
}),
|
|
2761
|
+
onChange: function onChange() {
|
|
2762
|
+
return handleSelectOrderReturn(item == null ? void 0 : item.id, item == null ? void 0 : item.return_location, item == null ? void 0 : item.return_location_name, item == null ? void 0 : item.product_return_action, item == null ? void 0 : item.legacy_product_id);
|
|
2763
|
+
}
|
|
2764
|
+
})));
|
|
2765
|
+
}() : null), React.createElement("td", null, (item == null ? void 0 : item.location) !== null && (item == null ? void 0 : item.location) !== undefined ? item == null ? void 0 : item.location : React.createElement("div", {
|
|
2759
2766
|
className: "awaiting"
|
|
2760
2767
|
}, "Awaiting")), React.createElement("td", null, " ", displayValueOrNA(item == null ? void 0 : item.return_location_name)), React.createElement("td", {
|
|
2761
2768
|
title: (_item$client_name = item == null ? void 0 : item.client_name) != null ? _item$client_name : ''
|
|
@@ -3115,10 +3122,13 @@ var ModalManager = function ModalManager() {
|
|
|
3115
3122
|
var _useAtom = useAtom(countReducerAtom),
|
|
3116
3123
|
popupName = _useAtom[0],
|
|
3117
3124
|
dispatch = _useAtom[1];
|
|
3125
|
+
var _useState = useState(false),
|
|
3126
|
+
hasStartedLoading = _useState[0],
|
|
3127
|
+
setHasStartedLoading = _useState[1];
|
|
3118
3128
|
var _useDeleteProdsID = useDeleteProdsID(),
|
|
3119
3129
|
selectedRows = _useDeleteProdsID[0];
|
|
3120
|
-
var
|
|
3121
|
-
setIsFormValid =
|
|
3130
|
+
var _useState2 = useState(false),
|
|
3131
|
+
setIsFormValid = _useState2[1];
|
|
3122
3132
|
var _useFinalPayload = useFinalPayload(),
|
|
3123
3133
|
newGrouped = _useFinalPayload[0];
|
|
3124
3134
|
var _usePostLoading = usePostLoading(),
|
|
@@ -3163,6 +3173,7 @@ var ModalManager = function ModalManager() {
|
|
|
3163
3173
|
response = _useApiHook.data,
|
|
3164
3174
|
setShouldPerformAction = _useApiHook.setShouldPerformAction,
|
|
3165
3175
|
confirmLoading = _useApiHook.loading,
|
|
3176
|
+
apiError = _useApiHook.error,
|
|
3166
3177
|
setError = _useApiHook.setError;
|
|
3167
3178
|
useEffect(function () {
|
|
3168
3179
|
SetPostLoading(confirmLoading);
|
|
@@ -3183,13 +3194,21 @@ var ModalManager = function ModalManager() {
|
|
|
3183
3194
|
}),
|
|
3184
3195
|
callSendEmail = _useAxios.fetchData;
|
|
3185
3196
|
useEffect(function () {
|
|
3197
|
+
if (confirmLoading) {
|
|
3198
|
+
setHasStartedLoading(true);
|
|
3199
|
+
}
|
|
3200
|
+
}, [confirmLoading]);
|
|
3201
|
+
useEffect(function () {
|
|
3202
|
+
if (!hasStartedLoading) return;
|
|
3203
|
+
if (confirmLoading || postLoading) return;
|
|
3186
3204
|
// @ts-ignore
|
|
3187
|
-
if (response && (response == null ? void 0 : response.code) == 500 || (response == null ? void 0 : response.code) == 400) {
|
|
3205
|
+
if (apiError || response && ((response == null ? void 0 : response.code) == 500 || (response == null ? void 0 : response.code) == 400)) {
|
|
3206
|
+
setHasStartedLoading(false);
|
|
3188
3207
|
// @ts-ignore
|
|
3208
|
+
var errorMessage = (apiError == null ? void 0 : apiError.message) || (response == null ? void 0 : response.message) || 'Failed to create return';
|
|
3189
3209
|
notification.error({
|
|
3190
3210
|
message: 'Failure',
|
|
3191
|
-
|
|
3192
|
-
description: "" + (response == null ? void 0 : response.message)
|
|
3211
|
+
description: errorMessage
|
|
3193
3212
|
});
|
|
3194
3213
|
dispatch({
|
|
3195
3214
|
type: 'close'
|
|
@@ -3205,6 +3224,7 @@ var ModalManager = function ModalManager() {
|
|
|
3205
3224
|
// @ts-ignore
|
|
3206
3225
|
} else if ((response == null ? void 0 : response.code) === 201 || (response == null ? void 0 : response.code) === 200) {
|
|
3207
3226
|
var _response$data;
|
|
3227
|
+
setHasStartedLoading(false);
|
|
3208
3228
|
notification.success({
|
|
3209
3229
|
message: 'Success',
|
|
3210
3230
|
// @ts-ignore
|
|
@@ -3246,7 +3266,7 @@ var ModalManager = function ModalManager() {
|
|
|
3246
3266
|
// for dev
|
|
3247
3267
|
//navigate('/orders/view/return/overview');
|
|
3248
3268
|
}
|
|
3249
|
-
}, [postLoading]);
|
|
3269
|
+
}, [postLoading, confirmLoading, hasStartedLoading, response]);
|
|
3250
3270
|
return React.createElement(React.Fragment, null, (popupName == null ? void 0 : popupName.state) === 'create-return' && React.createElement(React.Fragment, null, React.createElement(AntModal, {
|
|
3251
3271
|
openStatus: (popupName == null ? void 0 : popupName.state) == 'create-return' ? true : false,
|
|
3252
3272
|
closeModal: function closeModal() {
|