@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
|
@@ -100,7 +100,6 @@ export declare const compareOrderDetailsStates: (oldData: OrdersType, newData: O
|
|
|
100
100
|
order_customs_details?: import("./types").OrderCustomsDetails | undefined;
|
|
101
101
|
show_customs_details?: false | undefined;
|
|
102
102
|
import_reference: string | null;
|
|
103
|
-
return_action?: string[] | null | undefined;
|
|
104
103
|
};
|
|
105
104
|
export declare const sanitizeInput: (value: string) => string;
|
|
106
105
|
export declare const getEnvironment: () => 'development' | 'release_us' | 'release_uk' | 'staging';
|
|
@@ -2409,7 +2409,7 @@ var StyledFilterBtnLabel = /*#__PURE__*/styled__default.div(_templateObject37 ||
|
|
|
2409
2409
|
|
|
2410
2410
|
var _templateObject18, _templateObject19, _templateObject20, _templateObject21;
|
|
2411
2411
|
var EmptyDataContainer$1 = /*#__PURE__*/styled__default.div(_templateObject18 || (_templateObject18 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n display: flex;\n justify-content: center;\n"])));
|
|
2412
|
-
var StyledTable$1 = /*#__PURE__*/styled__default.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:
|
|
2412
|
+
var StyledTable$1 = /*#__PURE__*/styled__default.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"])));
|
|
2413
2413
|
// Styled components
|
|
2414
2414
|
var StyledTableWrapper$1 = /*#__PURE__*/styled__default.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"])));
|
|
2415
2415
|
var CustomDrop = /*#__PURE__*/styled__default.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"])));
|
|
@@ -2751,19 +2751,26 @@ var ReturnOrderTable = function ReturnOrderTable() {
|
|
|
2751
2751
|
}))) : (sortedData == null ? void 0 : sortedData.length) === 0 ? React__default.createElement("tr", null, React__default.createElement("td", {
|
|
2752
2752
|
colSpan: 14
|
|
2753
2753
|
}, React__default.createElement(EmptyDataContainer, null, React__default.createElement(antd.Empty, null)))) : sortedData == null ? void 0 : sortedData.map(function (item, index) {
|
|
2754
|
-
var
|
|
2754
|
+
var _item$client_name;
|
|
2755
2755
|
return React__default.createElement("tr", {
|
|
2756
2756
|
key: item.id
|
|
2757
|
-
}, React__default.createElement("td", null, isSelectableItem(item) ?
|
|
2758
|
-
|
|
2759
|
-
|
|
2760
|
-
|
|
2761
|
-
|
|
2762
|
-
|
|
2763
|
-
|
|
2764
|
-
|
|
2765
|
-
|
|
2766
|
-
|
|
2757
|
+
}, React__default.createElement("td", null, isSelectableItem(item) ? function (_selectedReturnOrder$2) {
|
|
2758
|
+
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);
|
|
2759
|
+
return React__default.createElement(antd.Tooltip, {
|
|
2760
|
+
title: isDisabled ? 'Cannot select different return actions' : ''
|
|
2761
|
+
}, React__default.createElement("span", {
|
|
2762
|
+
className: isDisabled ? 'disabled-wrapper' : ''
|
|
2763
|
+
}, React__default.createElement(dmsComponentLibrary.Checkbox, {
|
|
2764
|
+
className: "custom-check",
|
|
2765
|
+
disabled: isDisabled,
|
|
2766
|
+
checked: selectedReturnOrder.some(function (selectedInvoice) {
|
|
2767
|
+
return (selectedInvoice == null ? void 0 : selectedInvoice.id) === (item == null ? void 0 : item.id);
|
|
2768
|
+
}),
|
|
2769
|
+
onChange: function onChange() {
|
|
2770
|
+
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);
|
|
2771
|
+
}
|
|
2772
|
+
})));
|
|
2773
|
+
}() : null), React__default.createElement("td", null, (item == null ? void 0 : item.location) !== null && (item == null ? void 0 : item.location) !== undefined ? item == null ? void 0 : item.location : React__default.createElement("div", {
|
|
2767
2774
|
className: "awaiting"
|
|
2768
2775
|
}, "Awaiting")), React__default.createElement("td", null, " ", displayValueOrNA(item == null ? void 0 : item.return_location_name)), React__default.createElement("td", {
|
|
2769
2776
|
title: (_item$client_name = item == null ? void 0 : item.client_name) != null ? _item$client_name : ''
|
|
@@ -3123,10 +3130,13 @@ var ModalManager = function ModalManager() {
|
|
|
3123
3130
|
var _useAtom = jotai.useAtom(countReducerAtom),
|
|
3124
3131
|
popupName = _useAtom[0],
|
|
3125
3132
|
dispatch = _useAtom[1];
|
|
3133
|
+
var _useState = React.useState(false),
|
|
3134
|
+
hasStartedLoading = _useState[0],
|
|
3135
|
+
setHasStartedLoading = _useState[1];
|
|
3126
3136
|
var _useDeleteProdsID = useDeleteProdsID(),
|
|
3127
3137
|
selectedRows = _useDeleteProdsID[0];
|
|
3128
|
-
var
|
|
3129
|
-
setIsFormValid =
|
|
3138
|
+
var _useState2 = React.useState(false),
|
|
3139
|
+
setIsFormValid = _useState2[1];
|
|
3130
3140
|
var _useFinalPayload = useFinalPayload(),
|
|
3131
3141
|
newGrouped = _useFinalPayload[0];
|
|
3132
3142
|
var _usePostLoading = usePostLoading(),
|
|
@@ -3171,6 +3181,7 @@ var ModalManager = function ModalManager() {
|
|
|
3171
3181
|
response = _useApiHook.data,
|
|
3172
3182
|
setShouldPerformAction = _useApiHook.setShouldPerformAction,
|
|
3173
3183
|
confirmLoading = _useApiHook.loading,
|
|
3184
|
+
apiError = _useApiHook.error,
|
|
3174
3185
|
setError = _useApiHook.setError;
|
|
3175
3186
|
React.useEffect(function () {
|
|
3176
3187
|
SetPostLoading(confirmLoading);
|
|
@@ -3191,13 +3202,21 @@ var ModalManager = function ModalManager() {
|
|
|
3191
3202
|
}),
|
|
3192
3203
|
callSendEmail = _useAxios.fetchData;
|
|
3193
3204
|
React.useEffect(function () {
|
|
3205
|
+
if (confirmLoading) {
|
|
3206
|
+
setHasStartedLoading(true);
|
|
3207
|
+
}
|
|
3208
|
+
}, [confirmLoading]);
|
|
3209
|
+
React.useEffect(function () {
|
|
3210
|
+
if (!hasStartedLoading) return;
|
|
3211
|
+
if (confirmLoading || postLoading) return;
|
|
3194
3212
|
// @ts-ignore
|
|
3195
|
-
if (response && (response == null ? void 0 : response.code) == 500 || (response == null ? void 0 : response.code) == 400) {
|
|
3213
|
+
if (apiError || response && ((response == null ? void 0 : response.code) == 500 || (response == null ? void 0 : response.code) == 400)) {
|
|
3214
|
+
setHasStartedLoading(false);
|
|
3196
3215
|
// @ts-ignore
|
|
3216
|
+
var errorMessage = (apiError == null ? void 0 : apiError.message) || (response == null ? void 0 : response.message) || 'Failed to create return';
|
|
3197
3217
|
antd.notification.error({
|
|
3198
3218
|
message: 'Failure',
|
|
3199
|
-
|
|
3200
|
-
description: "" + (response == null ? void 0 : response.message)
|
|
3219
|
+
description: errorMessage
|
|
3201
3220
|
});
|
|
3202
3221
|
dispatch({
|
|
3203
3222
|
type: 'close'
|
|
@@ -3213,6 +3232,7 @@ var ModalManager = function ModalManager() {
|
|
|
3213
3232
|
// @ts-ignore
|
|
3214
3233
|
} else if ((response == null ? void 0 : response.code) === 201 || (response == null ? void 0 : response.code) === 200) {
|
|
3215
3234
|
var _response$data;
|
|
3235
|
+
setHasStartedLoading(false);
|
|
3216
3236
|
antd.notification.success({
|
|
3217
3237
|
message: 'Success',
|
|
3218
3238
|
// @ts-ignore
|
|
@@ -3254,7 +3274,7 @@ var ModalManager = function ModalManager() {
|
|
|
3254
3274
|
// for dev
|
|
3255
3275
|
//navigate('/orders/view/return/overview');
|
|
3256
3276
|
}
|
|
3257
|
-
}, [postLoading]);
|
|
3277
|
+
}, [postLoading, confirmLoading, hasStartedLoading, response]);
|
|
3258
3278
|
return React__default.createElement(React__default.Fragment, null, (popupName == null ? void 0 : popupName.state) === 'create-return' && React__default.createElement(React__default.Fragment, null, React__default.createElement(dmsComponentLibrary.AntModal, {
|
|
3259
3279
|
openStatus: (popupName == null ? void 0 : popupName.state) == 'create-return' ? true : false,
|
|
3260
3280
|
closeModal: function closeModal() {
|