@bjsdistribution/dms-client-return 0.0.21 → 0.0.22
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/dms-client-return.cjs.development.js +4 -12
- 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 +4 -12
- package/dist/dms-client-return.esm.js.map +1 -1
- package/package.json +1 -1
- package/src/components/order-daily-overview/header-filters/SelectionFilter.tsx +0 -3
- package/src/components/order-daily-overview/return-after-table/ReturnAfterTable.tsx +0 -2
- package/src/components/order-daily-overview/return-order-table/return-orders-filters/ReturnOrderTable.tsx +3 -8
- package/src/index.tsx +6 -2
|
@@ -9540,7 +9540,6 @@ function SelectionFilter() {
|
|
|
9540
9540
|
type: 'SET_CLIENT_FILTER',
|
|
9541
9541
|
payload: storedClientId
|
|
9542
9542
|
});
|
|
9543
|
-
// Reset to the first page
|
|
9544
9543
|
dispatch({
|
|
9545
9544
|
type: 'SET_PAGE',
|
|
9546
9545
|
payload: 1
|
|
@@ -9557,7 +9556,6 @@ function SelectionFilter() {
|
|
|
9557
9556
|
type: 'SET_ACTIONS_FILTER',
|
|
9558
9557
|
payload: selectedFilterValue
|
|
9559
9558
|
});
|
|
9560
|
-
// Reset to the first page
|
|
9561
9559
|
dispatch({
|
|
9562
9560
|
type: 'SET_PAGE',
|
|
9563
9561
|
payload: 1
|
|
@@ -9569,7 +9567,6 @@ function SelectionFilter() {
|
|
|
9569
9567
|
type: 'SET_LOCATION_FILTER',
|
|
9570
9568
|
payload: selectedLocationValue
|
|
9571
9569
|
});
|
|
9572
|
-
// Reset to the first page
|
|
9573
9570
|
dispatch({
|
|
9574
9571
|
type: 'SET_PAGE',
|
|
9575
9572
|
payload: 1
|
|
@@ -10002,13 +9999,11 @@ var ReturnOrderTable = function ReturnOrderTable() {
|
|
|
10002
9999
|
setPaginationObject = _UsePaginationData[1];
|
|
10003
10000
|
var _usefetchAgain = usefetchAgain(),
|
|
10004
10001
|
callForFetch = _usefetchAgain[0];
|
|
10005
|
-
// console.log(callForFetch, 'callForFetchcallForFetchcallForFetchcallForFetch');
|
|
10006
10002
|
var OpenDropDown = function OpenDropDown(index) {
|
|
10007
10003
|
setPrintToggle(function (prevIndex) {
|
|
10008
10004
|
return prevIndex === index ? null : index;
|
|
10009
10005
|
});
|
|
10010
10006
|
};
|
|
10011
|
-
console.log(newpayload, 'newpayload');
|
|
10012
10007
|
// Close dropdown outside click
|
|
10013
10008
|
React.useEffect(function () {
|
|
10014
10009
|
document.addEventListener('mousedown', handleClickOutside);
|
|
@@ -10102,8 +10097,6 @@ var ReturnOrderTable = function ReturnOrderTable() {
|
|
|
10102
10097
|
setGrouped([]);
|
|
10103
10098
|
}
|
|
10104
10099
|
};
|
|
10105
|
-
console.log(selectedReturnOrder, 'selectedReturnOrder');
|
|
10106
|
-
console.log(newpayload, 'newpayload');
|
|
10107
10100
|
var handleSelectOrderReturn = function handleSelectOrderReturn(id, return_location, return_locations, order_product_return_action, new_location, legacy_product_id) {
|
|
10108
10101
|
setSelectedReturnOrder(function (prevSelectedLocations) {
|
|
10109
10102
|
var isSelected = prevSelectedLocations == null ? void 0 : prevSelectedLocations.some(function (loc) {
|
|
@@ -10186,7 +10179,7 @@ var ReturnOrderTable = function ReturnOrderTable() {
|
|
|
10186
10179
|
}, React__default.createElement(dmsComponentLibrary.Checkbox, {
|
|
10187
10180
|
checked: selectAll,
|
|
10188
10181
|
onChange: handleSelectAll
|
|
10189
|
-
})) : React__default.createElement("th", null), React__default.createElement("th", null, "Product Location"), React__default.createElement("th", null, "Return Location"), React__default.createElement("th", null, "Recipient"), React__default.createElement("th", null, "
|
|
10182
|
+
})) : React__default.createElement("th", null), React__default.createElement("th", null, "Product Location"), React__default.createElement("th", null, "Return Location"), React__default.createElement("th", null, "Recipient"), React__default.createElement("th", null, "Code"), React__default.createElement("th", null, "Description"), React__default.createElement("th", null, "Part"), React__default.createElement("th", null, "Weight"), React__default.createElement("th", null, "CBM"), React__default.createElement("th", null, "Return Reason"), React__default.createElement("th", null, "Collected"), React__default.createElement("th", null, "Collection Reason"), React__default.createElement("th", {
|
|
10190
10183
|
className: "emailInvoiceShare"
|
|
10191
10184
|
}, "Labels"))), React__default.createElement("tbody", null, load ? React__default.createElement("tr", null, React__default.createElement("td", {
|
|
10192
10185
|
colSpan: 6
|
|
@@ -10197,7 +10190,7 @@ var ReturnOrderTable = function ReturnOrderTable() {
|
|
|
10197
10190
|
})) : (returnData == null ? void 0 : returnData.length) === 0 ? React__default.createElement("tr", null, React__default.createElement("td", {
|
|
10198
10191
|
colSpan: 14
|
|
10199
10192
|
}, React__default.createElement(EmptyDataContainer$1, null, React__default.createElement(antd.Empty, null)))) : returnData == null ? void 0 : returnData.map(function (item, index) {
|
|
10200
|
-
var _item$order_product_r2, _item$orders_products, _item$orders_products2, _item$order_data, _item$order_data2, _item$
|
|
10193
|
+
var _item$order_product_r2, _item$orders_products, _item$orders_products2, _item$order_data, _item$order_data2, _item$return_reasons, _item$order_product_r3, _item$collection_reas;
|
|
10201
10194
|
return React__default.createElement("tr", {
|
|
10202
10195
|
key: item.id
|
|
10203
10196
|
}, React__default.createElement("td", null, (item == null || (_item$order_product_r2 = item.order_product_return_action) == null ? void 0 : _item$order_product_r2.type) == 'RTS' ? React__default.createElement(React__default.Fragment, null, React__default.createElement(dmsComponentLibrary.Checkbox, {
|
|
@@ -10225,7 +10218,7 @@ var ReturnOrderTable = function ReturnOrderTable() {
|
|
|
10225
10218
|
style: {
|
|
10226
10219
|
color: '#888075'
|
|
10227
10220
|
}
|
|
10228
|
-
}, displayValueOrNA(item == null || (_item$order_data2 = item.order_data) == null || (_item$order_data2 = _item$order_data2.order_recipient) == null ? void 0 : _item$order_data2.postcode)))), React__default.createElement("td", null, displayValueOrNA(item == null
|
|
10221
|
+
}, displayValueOrNA(item == null || (_item$order_data2 = item.order_data) == null || (_item$order_data2 = _item$order_data2.order_recipient) == null ? void 0 : _item$order_data2.postcode)))), React__default.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.code)), React__default.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.description)), React__default.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.parts_count)), React__default.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.weight), ' ', item != null && item.weight && (item == null ? void 0 : item.weight) !== null ? 'KG' : ''), React__default.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.cube)), React__default.createElement("td", null, displayValueOrNA(item == null || (_item$return_reasons = item.return_reasons) == null ? void 0 : _item$return_reasons.reason)), React__default.createElement("td", null, (item == null || (_item$order_product_r3 = item.order_product_returns) == null ? void 0 : _item$order_product_r3.length) > 0 ? item.order_product_returns.map(function (ret) {
|
|
10229
10222
|
return ret != null && ret.collected_at ? dateFns.format(new Date(ret.collected_at), 'dd/MM/yyyy') : 'UNKNOWN';
|
|
10230
10223
|
}) : 'UNKNOWN'), React__default.createElement("td", null, displayValueOrNA(item == null || (_item$collection_reas = item.collection_reasons) == null ? void 0 : _item$collection_reas.reason)), React__default.createElement("td", null, React__default.createElement("ul", {
|
|
10231
10224
|
className: "actionbox"
|
|
@@ -12528,11 +12521,10 @@ function ReturnClient() {
|
|
|
12528
12521
|
console.log(selectedClientString, 'selectedClient');
|
|
12529
12522
|
console.log("../filter/:" + selectedClientString);
|
|
12530
12523
|
React.useEffect(function () {
|
|
12531
|
-
if (location.pathname.includes('/
|
|
12524
|
+
if (location.pathname.includes('/returnclient')) {
|
|
12532
12525
|
localStorage.removeItem('clientName');
|
|
12533
12526
|
localStorage.removeItem('clientId');
|
|
12534
12527
|
localStorage.removeItem('uuid');
|
|
12535
|
-
localStorage.removeItem('customer_id');
|
|
12536
12528
|
// dispatch({ type: 'CLEAR_CLIENT', payload: [] });
|
|
12537
12529
|
}
|
|
12538
12530
|
}, [location.pathname]);
|