@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
|
@@ -36,4 +36,5 @@ declare function useSelectedConfirmLoc(): [any[], (args_0: any[] | ((prev: any[]
|
|
|
36
36
|
declare function useSelectAll(): [boolean, (args_0: boolean | ((prev: boolean) => boolean)) => void];
|
|
37
37
|
declare function usePostLoading(): [boolean, (args_0: boolean | ((prev: boolean) => boolean)) => void];
|
|
38
38
|
declare function useFinalPayload(): [any[], (args_0: any[] | ((prev: any[]) => any[])) => void];
|
|
39
|
-
|
|
39
|
+
declare function useClearState(): [boolean, (args_0: boolean | ((prev: boolean) => boolean)) => void];
|
|
40
|
+
export { useAtom, useFilter, useStaticData, useRowCollectedCount, useRowDeliveredCount, useReminderData, useInQueueData, useEmailInvoice, useCustomerData, useActionType, useLocationData, useSelectedOrders, useReturnPayload, useNewReturnPayload, useGroupedPayload, useStatusOrderData, useSelectedConfirmLoc, useSelectAll, usePostLoading, useFinalPayload, useClearState, };
|
|
@@ -3541,6 +3541,7 @@ var selectedLocationConfirm = /*#__PURE__*/jotai.atom([]);
|
|
|
3541
3541
|
var selectAll = /*#__PURE__*/jotai.atom(false);
|
|
3542
3542
|
var postLoading = /*#__PURE__*/jotai.atom(false);
|
|
3543
3543
|
var _final = /*#__PURE__*/jotai.atom([]);
|
|
3544
|
+
var clearState = /*#__PURE__*/jotai.atom(false);
|
|
3544
3545
|
var selectedOrderlList = /*#__PURE__*/jotai.atom([]);
|
|
3545
3546
|
function useSelectedOrders() {
|
|
3546
3547
|
return jotai.useAtom(selectedOrderlList);
|
|
@@ -3583,6 +3584,9 @@ function usePostLoading() {
|
|
|
3583
3584
|
function useFinalPayload() {
|
|
3584
3585
|
return jotai.useAtom(_final);
|
|
3585
3586
|
}
|
|
3587
|
+
function useClearState() {
|
|
3588
|
+
return jotai.useAtom(clearState);
|
|
3589
|
+
}
|
|
3586
3590
|
|
|
3587
3591
|
var _templateObject$U, _templateObject2$G, _templateObject3$m, _templateObject4$a, _templateObject5$5, _templateObject6$3, _templateObject7$3;
|
|
3588
3592
|
function Loader(props) {
|
|
@@ -9324,13 +9328,12 @@ var filterReducer = function filterReducer(state, action) {
|
|
|
9324
9328
|
value: action.payload
|
|
9325
9329
|
}])
|
|
9326
9330
|
});
|
|
9327
|
-
|
|
9328
|
-
|
|
9329
|
-
|
|
9330
|
-
|
|
9331
|
-
|
|
9332
|
-
|
|
9333
|
-
// };
|
|
9331
|
+
case 'CLEAR_CLIENT':
|
|
9332
|
+
return _extends({}, state, {
|
|
9333
|
+
'x-filters': state['x-filters'].filter(function (f) {
|
|
9334
|
+
return f.field !== 'order.customer_id';
|
|
9335
|
+
})
|
|
9336
|
+
});
|
|
9334
9337
|
case 'CLEAR_ACTION':
|
|
9335
9338
|
return _extends({}, state, {
|
|
9336
9339
|
'x-filters': state['x-filters'].filter(function (f) {
|
|
@@ -9418,6 +9421,9 @@ function SelectionFilter() {
|
|
|
9418
9421
|
setSelectAll = _useSelectAll[1];
|
|
9419
9422
|
var _useSelectedConfirmLo = useSelectedConfirmLoc(),
|
|
9420
9423
|
setCheck = _useSelectedConfirmLo[1];
|
|
9424
|
+
var _useClearState = useClearState(),
|
|
9425
|
+
clearState = _useClearState[0],
|
|
9426
|
+
setClear = _useClearState[1];
|
|
9421
9427
|
//client options
|
|
9422
9428
|
var clientOptions = customers == null ? void 0 : customers.map(function (option) {
|
|
9423
9429
|
var _option$customer_name, _option$customer_name2;
|
|
@@ -9444,9 +9450,8 @@ function SelectionFilter() {
|
|
|
9444
9450
|
};
|
|
9445
9451
|
});
|
|
9446
9452
|
//client change
|
|
9447
|
-
var handleSelectChange = function handleSelectChange(
|
|
9453
|
+
var handleSelectChange = function handleSelectChange(_value, option) {
|
|
9448
9454
|
setNewPayload([]);
|
|
9449
|
-
console.log(value, 'value');
|
|
9450
9455
|
var selectedLabel = option == null ? void 0 : option.label;
|
|
9451
9456
|
var selectedValue = option == null ? void 0 : option.id;
|
|
9452
9457
|
var selectedUuids = option == null ? void 0 : option.uuid;
|
|
@@ -9454,6 +9459,8 @@ function SelectionFilter() {
|
|
|
9454
9459
|
var selectedCustomerId = option.gsit_customer_id;
|
|
9455
9460
|
setSelectedClient(selectedValue);
|
|
9456
9461
|
setName(selectedLabel);
|
|
9462
|
+
// storedName(selectedLabel);
|
|
9463
|
+
//set items in local storage
|
|
9457
9464
|
localStorage.setItem('clientName', selectedLabel);
|
|
9458
9465
|
localStorage.setItem('clientId', selectedValue.toString());
|
|
9459
9466
|
localStorage.setItem('account_number', selectAccountNumber);
|
|
@@ -9463,12 +9470,14 @@ function SelectionFilter() {
|
|
|
9463
9470
|
var storedCustomerId = localStorage.getItem('customer_id');
|
|
9464
9471
|
var storedUuid = localStorage.getItem('uuid');
|
|
9465
9472
|
setUuid(storedUuid);
|
|
9473
|
+
//set payload
|
|
9466
9474
|
setReturnPayload(function (prevState) {
|
|
9467
9475
|
return _extends({}, prevState, {
|
|
9468
9476
|
account_number: storedAccNo,
|
|
9469
9477
|
customer_id: storedCustomerId
|
|
9470
9478
|
});
|
|
9471
9479
|
});
|
|
9480
|
+
//filtering locations
|
|
9472
9481
|
var filteredSubLocations = locationData == null ? void 0 : locationData.filter(function (subCat) {
|
|
9473
9482
|
return (subCat == null ? void 0 : subCat.customer_id) === storedUuid;
|
|
9474
9483
|
}).map(function (subCat) {
|
|
@@ -9478,6 +9487,7 @@ function SelectionFilter() {
|
|
|
9478
9487
|
};
|
|
9479
9488
|
});
|
|
9480
9489
|
setFilteredLocationOptions(filteredSubLocations);
|
|
9490
|
+
//clearing states
|
|
9481
9491
|
setUuid('');
|
|
9482
9492
|
setSelectedReturnOrder([]);
|
|
9483
9493
|
setNewPayload([]);
|
|
@@ -9525,8 +9535,6 @@ function SelectionFilter() {
|
|
|
9525
9535
|
var handleActionClick = function handleActionClick(value) {
|
|
9526
9536
|
setSelectedFilterValue(value);
|
|
9527
9537
|
};
|
|
9528
|
-
var storedName = localStorage.getItem('clientName');
|
|
9529
|
-
var storedClientId = localStorage.getItem('clientId');
|
|
9530
9538
|
//Apply filters
|
|
9531
9539
|
var applyFilters = function applyFilters() {
|
|
9532
9540
|
if (storedName) {
|
|
@@ -9571,6 +9579,8 @@ function SelectionFilter() {
|
|
|
9571
9579
|
});
|
|
9572
9580
|
}
|
|
9573
9581
|
};
|
|
9582
|
+
var storedName = localStorage.getItem('clientName');
|
|
9583
|
+
var storedClientId = localStorage.getItem('clientId');
|
|
9574
9584
|
React.useEffect(function () {
|
|
9575
9585
|
if (storedClientId) {
|
|
9576
9586
|
dispatch({
|
|
@@ -9599,7 +9609,20 @@ function SelectionFilter() {
|
|
|
9599
9609
|
});
|
|
9600
9610
|
}
|
|
9601
9611
|
}, [selectedFilterValue, selectedLocationValue]);
|
|
9602
|
-
|
|
9612
|
+
var handleClear = function handleClear() {
|
|
9613
|
+
setClear(false);
|
|
9614
|
+
localStorage.removeItem('clientName');
|
|
9615
|
+
localStorage.removeItem('clientId');
|
|
9616
|
+
setClear(true);
|
|
9617
|
+
};
|
|
9618
|
+
React.useEffect(function () {
|
|
9619
|
+
if (clearState) {
|
|
9620
|
+
dispatch({
|
|
9621
|
+
type: 'CLEAR_CLIENT'
|
|
9622
|
+
});
|
|
9623
|
+
window.location.href = '/returnclient';
|
|
9624
|
+
}
|
|
9625
|
+
}, [clearState]);
|
|
9603
9626
|
return React__default.createElement(Wrapper$k, null, React__default.createElement(FilterRow, null, React__default.createElement(LeftColumn, null, React__default.createElement(FilterColumn, null, React__default.createElement(Label$g, null, "Clients"), React__default.createElement(StyledAntSelect$4, {
|
|
9604
9627
|
options: clientOptions,
|
|
9605
9628
|
placeholder: "Select Client Name",
|
|
@@ -9607,7 +9630,9 @@ function SelectionFilter() {
|
|
|
9607
9630
|
style: {
|
|
9608
9631
|
minWidth: '14vw'
|
|
9609
9632
|
},
|
|
9610
|
-
value: storedName
|
|
9633
|
+
value: storedName,
|
|
9634
|
+
allowClear: true,
|
|
9635
|
+
onClear: handleClear
|
|
9611
9636
|
})), storedName && location.pathname.includes("filter/") ? React__default.createElement(React__default.Fragment, null, React__default.createElement(FilterColumn, null, React__default.createElement(Label$g, null, "Action Type"), React__default.createElement(StyledAntSelect$4, {
|
|
9612
9637
|
options: actionTypeOptions,
|
|
9613
9638
|
placeholder: "Select Action Type",
|
|
@@ -11230,6 +11255,9 @@ var ModalManager = function ModalManager() {
|
|
|
11230
11255
|
setShouldPerformAction(false);
|
|
11231
11256
|
setSelectAll(false);
|
|
11232
11257
|
setError(null);
|
|
11258
|
+
// for local
|
|
11259
|
+
// navigate('/order-return');
|
|
11260
|
+
// for dev
|
|
11233
11261
|
navigate('returnclient/order-return');
|
|
11234
11262
|
}
|
|
11235
11263
|
}, [response, apiError, postLoading]);
|
|
@@ -12535,6 +12563,7 @@ function ReturnClient() {
|
|
|
12535
12563
|
setLocationData = _useLocationData[1];
|
|
12536
12564
|
var _useStatusOrderData = useStatusOrderData(),
|
|
12537
12565
|
setStatusOfOrders = _useStatusOrderData[1];
|
|
12566
|
+
// const [dispatchvalue] = useAtom(filtersReducerAtom);
|
|
12538
12567
|
var splitPath = function splitPath(str) {
|
|
12539
12568
|
var _str$split;
|
|
12540
12569
|
var parts = str == null || (_str$split = str.split('/')) == null ? void 0 : _str$split.filter(function (part) {
|
|
@@ -12548,6 +12577,7 @@ function ReturnClient() {
|
|
|
12548
12577
|
localStorage.removeItem('clientName');
|
|
12549
12578
|
localStorage.removeItem('clientId');
|
|
12550
12579
|
localStorage.removeItem('uuid');
|
|
12580
|
+
// dispatch({ type: 'CLEAR_CLIENT' });
|
|
12551
12581
|
}
|
|
12552
12582
|
}, [location.pathname]);
|
|
12553
12583
|
React.useEffect(function () {
|