@bjsdistribution/dms-client-return 0.0.26 → 0.0.27
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/store.d.ts +2 -1
- package/dist/dms-client-return.cjs.development.js +43 -13
- 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 +43 -13
- 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 +29 -5
- package/src/components/order-daily-overview/header-filters/filterStore.ts +7 -7
- package/src/components/order-view/modalsPopup/ModalManager.tsx +5 -0
- package/src/components/store.ts +7 -0
- package/src/index.tsx +2 -5
|
@@ -3533,6 +3533,7 @@ var selectedLocationConfirm = /*#__PURE__*/atom([]);
|
|
|
3533
3533
|
var selectAll = /*#__PURE__*/atom(false);
|
|
3534
3534
|
var postLoading = /*#__PURE__*/atom(false);
|
|
3535
3535
|
var _final = /*#__PURE__*/atom([]);
|
|
3536
|
+
var clearState = /*#__PURE__*/atom(false);
|
|
3536
3537
|
var selectedOrderlList = /*#__PURE__*/atom([]);
|
|
3537
3538
|
function useSelectedOrders() {
|
|
3538
3539
|
return useAtom(selectedOrderlList);
|
|
@@ -3575,6 +3576,9 @@ function usePostLoading() {
|
|
|
3575
3576
|
function useFinalPayload() {
|
|
3576
3577
|
return useAtom(_final);
|
|
3577
3578
|
}
|
|
3579
|
+
function useClearState() {
|
|
3580
|
+
return useAtom(clearState);
|
|
3581
|
+
}
|
|
3578
3582
|
|
|
3579
3583
|
var _templateObject$U, _templateObject2$G, _templateObject3$m, _templateObject4$a, _templateObject5$5, _templateObject6$3, _templateObject7$3;
|
|
3580
3584
|
function Loader(props) {
|
|
@@ -9316,13 +9320,12 @@ var filterReducer = function filterReducer(state, action) {
|
|
|
9316
9320
|
value: action.payload
|
|
9317
9321
|
}])
|
|
9318
9322
|
});
|
|
9319
|
-
|
|
9320
|
-
|
|
9321
|
-
|
|
9322
|
-
|
|
9323
|
-
|
|
9324
|
-
|
|
9325
|
-
// };
|
|
9323
|
+
case 'CLEAR_CLIENT':
|
|
9324
|
+
return _extends({}, state, {
|
|
9325
|
+
'x-filters': state['x-filters'].filter(function (f) {
|
|
9326
|
+
return f.field !== 'order.customer_id';
|
|
9327
|
+
})
|
|
9328
|
+
});
|
|
9326
9329
|
case 'CLEAR_ACTION':
|
|
9327
9330
|
return _extends({}, state, {
|
|
9328
9331
|
'x-filters': state['x-filters'].filter(function (f) {
|
|
@@ -9410,6 +9413,9 @@ function SelectionFilter() {
|
|
|
9410
9413
|
setSelectAll = _useSelectAll[1];
|
|
9411
9414
|
var _useSelectedConfirmLo = useSelectedConfirmLoc(),
|
|
9412
9415
|
setCheck = _useSelectedConfirmLo[1];
|
|
9416
|
+
var _useClearState = useClearState(),
|
|
9417
|
+
clearState = _useClearState[0],
|
|
9418
|
+
setClear = _useClearState[1];
|
|
9413
9419
|
//client options
|
|
9414
9420
|
var clientOptions = customers == null ? void 0 : customers.map(function (option) {
|
|
9415
9421
|
var _option$customer_name, _option$customer_name2;
|
|
@@ -9436,9 +9442,8 @@ function SelectionFilter() {
|
|
|
9436
9442
|
};
|
|
9437
9443
|
});
|
|
9438
9444
|
//client change
|
|
9439
|
-
var handleSelectChange = function handleSelectChange(
|
|
9445
|
+
var handleSelectChange = function handleSelectChange(_value, option) {
|
|
9440
9446
|
setNewPayload([]);
|
|
9441
|
-
console.log(value, 'value');
|
|
9442
9447
|
var selectedLabel = option == null ? void 0 : option.label;
|
|
9443
9448
|
var selectedValue = option == null ? void 0 : option.id;
|
|
9444
9449
|
var selectedUuids = option == null ? void 0 : option.uuid;
|
|
@@ -9446,6 +9451,8 @@ function SelectionFilter() {
|
|
|
9446
9451
|
var selectedCustomerId = option.gsit_customer_id;
|
|
9447
9452
|
setSelectedClient(selectedValue);
|
|
9448
9453
|
setName(selectedLabel);
|
|
9454
|
+
// storedName(selectedLabel);
|
|
9455
|
+
//set items in local storage
|
|
9449
9456
|
localStorage.setItem('clientName', selectedLabel);
|
|
9450
9457
|
localStorage.setItem('clientId', selectedValue.toString());
|
|
9451
9458
|
localStorage.setItem('account_number', selectAccountNumber);
|
|
@@ -9455,12 +9462,14 @@ function SelectionFilter() {
|
|
|
9455
9462
|
var storedCustomerId = localStorage.getItem('customer_id');
|
|
9456
9463
|
var storedUuid = localStorage.getItem('uuid');
|
|
9457
9464
|
setUuid(storedUuid);
|
|
9465
|
+
//set payload
|
|
9458
9466
|
setReturnPayload(function (prevState) {
|
|
9459
9467
|
return _extends({}, prevState, {
|
|
9460
9468
|
account_number: storedAccNo,
|
|
9461
9469
|
customer_id: storedCustomerId
|
|
9462
9470
|
});
|
|
9463
9471
|
});
|
|
9472
|
+
//filtering locations
|
|
9464
9473
|
var filteredSubLocations = locationData == null ? void 0 : locationData.filter(function (subCat) {
|
|
9465
9474
|
return (subCat == null ? void 0 : subCat.customer_id) === storedUuid;
|
|
9466
9475
|
}).map(function (subCat) {
|
|
@@ -9470,6 +9479,7 @@ function SelectionFilter() {
|
|
|
9470
9479
|
};
|
|
9471
9480
|
});
|
|
9472
9481
|
setFilteredLocationOptions(filteredSubLocations);
|
|
9482
|
+
//clearing states
|
|
9473
9483
|
setUuid('');
|
|
9474
9484
|
setSelectedReturnOrder([]);
|
|
9475
9485
|
setNewPayload([]);
|
|
@@ -9517,8 +9527,6 @@ function SelectionFilter() {
|
|
|
9517
9527
|
var handleActionClick = function handleActionClick(value) {
|
|
9518
9528
|
setSelectedFilterValue(value);
|
|
9519
9529
|
};
|
|
9520
|
-
var storedName = localStorage.getItem('clientName');
|
|
9521
|
-
var storedClientId = localStorage.getItem('clientId');
|
|
9522
9530
|
//Apply filters
|
|
9523
9531
|
var applyFilters = function applyFilters() {
|
|
9524
9532
|
if (storedName) {
|
|
@@ -9563,6 +9571,8 @@ function SelectionFilter() {
|
|
|
9563
9571
|
});
|
|
9564
9572
|
}
|
|
9565
9573
|
};
|
|
9574
|
+
var storedName = localStorage.getItem('clientName');
|
|
9575
|
+
var storedClientId = localStorage.getItem('clientId');
|
|
9566
9576
|
useEffect(function () {
|
|
9567
9577
|
if (storedClientId) {
|
|
9568
9578
|
dispatch({
|
|
@@ -9591,7 +9601,20 @@ function SelectionFilter() {
|
|
|
9591
9601
|
});
|
|
9592
9602
|
}
|
|
9593
9603
|
}, [selectedFilterValue, selectedLocationValue]);
|
|
9594
|
-
|
|
9604
|
+
var handleClear = function handleClear() {
|
|
9605
|
+
setClear(false);
|
|
9606
|
+
localStorage.removeItem('clientName');
|
|
9607
|
+
localStorage.removeItem('clientId');
|
|
9608
|
+
setClear(true);
|
|
9609
|
+
};
|
|
9610
|
+
useEffect(function () {
|
|
9611
|
+
if (clearState) {
|
|
9612
|
+
dispatch({
|
|
9613
|
+
type: 'CLEAR_CLIENT'
|
|
9614
|
+
});
|
|
9615
|
+
window.location.href = '/returnclient';
|
|
9616
|
+
}
|
|
9617
|
+
}, [clearState]);
|
|
9595
9618
|
return React.createElement(Wrapper$k, null, React.createElement(FilterRow, null, React.createElement(LeftColumn, null, React.createElement(FilterColumn, null, React.createElement(Label$g, null, "Clients"), React.createElement(StyledAntSelect$4, {
|
|
9596
9619
|
options: clientOptions,
|
|
9597
9620
|
placeholder: "Select Client Name",
|
|
@@ -9599,7 +9622,9 @@ function SelectionFilter() {
|
|
|
9599
9622
|
style: {
|
|
9600
9623
|
minWidth: '14vw'
|
|
9601
9624
|
},
|
|
9602
|
-
value: storedName
|
|
9625
|
+
value: storedName,
|
|
9626
|
+
allowClear: true,
|
|
9627
|
+
onClear: handleClear
|
|
9603
9628
|
})), storedName && location.pathname.includes("filter/") ? React.createElement(React.Fragment, null, React.createElement(FilterColumn, null, React.createElement(Label$g, null, "Action Type"), React.createElement(StyledAntSelect$4, {
|
|
9604
9629
|
options: actionTypeOptions,
|
|
9605
9630
|
placeholder: "Select Action Type",
|
|
@@ -11222,6 +11247,9 @@ var ModalManager = function ModalManager() {
|
|
|
11222
11247
|
setShouldPerformAction(false);
|
|
11223
11248
|
setSelectAll(false);
|
|
11224
11249
|
setError(null);
|
|
11250
|
+
// for local
|
|
11251
|
+
// navigate('/order-return');
|
|
11252
|
+
// for dev
|
|
11225
11253
|
navigate('returnclient/order-return');
|
|
11226
11254
|
}
|
|
11227
11255
|
}, [response, apiError, postLoading]);
|
|
@@ -12527,6 +12555,7 @@ function ReturnClient() {
|
|
|
12527
12555
|
setLocationData = _useLocationData[1];
|
|
12528
12556
|
var _useStatusOrderData = useStatusOrderData(),
|
|
12529
12557
|
setStatusOfOrders = _useStatusOrderData[1];
|
|
12558
|
+
// const [dispatchvalue] = useAtom(filtersReducerAtom);
|
|
12530
12559
|
var splitPath = function splitPath(str) {
|
|
12531
12560
|
var _str$split;
|
|
12532
12561
|
var parts = str == null || (_str$split = str.split('/')) == null ? void 0 : _str$split.filter(function (part) {
|
|
@@ -12540,6 +12569,7 @@ function ReturnClient() {
|
|
|
12540
12569
|
localStorage.removeItem('clientName');
|
|
12541
12570
|
localStorage.removeItem('clientId');
|
|
12542
12571
|
localStorage.removeItem('uuid');
|
|
12572
|
+
// dispatch({ type: 'CLEAR_CLIENT' });
|
|
12543
12573
|
}
|
|
12544
12574
|
}, [location.pathname]);
|
|
12545
12575
|
useEffect(function () {
|