@bjsdistribution/dms-client-return 0.1.34-prod → 0.1.35-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/dms-client-return.cjs.development.js +15 -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 +15 -13
- package/dist/dms-client-return.esm.js.map +1 -1
- package/package.json +1 -1
- package/src/components/client-portal/OutstandingTable.tsx +1 -1
- package/src/components/client-portal/ReturnStatus.tsx +7 -7
- package/src/components/client-portal/return-confirm/ConfirmedMain.tsx +5 -6
package/package.json
CHANGED
|
@@ -146,7 +146,7 @@ const OutstandingTable = () => {
|
|
|
146
146
|
if (clientPortal && debouncedSearchText === '') {
|
|
147
147
|
fetchData();
|
|
148
148
|
}
|
|
149
|
-
}, [JSON.stringify(modifiedFilters), debouncedSearchText]);
|
|
149
|
+
}, [JSON.stringify(modifiedFilters), debouncedSearchText, pagination]);
|
|
150
150
|
|
|
151
151
|
useEffect(() => {
|
|
152
152
|
setLoading(returnDataLoad);
|
|
@@ -94,15 +94,15 @@ const ReturnStatus = () => {
|
|
|
94
94
|
count: count?.outstanding_count,
|
|
95
95
|
label: 'Outstanding Return',
|
|
96
96
|
},
|
|
97
|
+
// {
|
|
98
|
+
// id: 2,
|
|
99
|
+
// icon: 'scheduled_for_return',
|
|
100
|
+
// status: 'scheduled_for_return',
|
|
101
|
+
// count: count?.scheduled_count,
|
|
102
|
+
// label: 'Scheduled For Return',
|
|
103
|
+
// },
|
|
97
104
|
{
|
|
98
105
|
id: 2,
|
|
99
|
-
icon: 'scheduled_for_return',
|
|
100
|
-
status: 'scheduled_for_return',
|
|
101
|
-
count: count?.scheduled_count,
|
|
102
|
-
label: 'Scheduled For Return',
|
|
103
|
-
},
|
|
104
|
-
{
|
|
105
|
-
id: 3,
|
|
106
106
|
icon: 'return_completed',
|
|
107
107
|
status: 'return_completed',
|
|
108
108
|
count: count?.completed_count,
|
|
@@ -11,7 +11,7 @@ import ReturnConfirmedTable from './ReturnConfirmedTable';
|
|
|
11
11
|
import {
|
|
12
12
|
useItemsPerReturnPage,
|
|
13
13
|
useLoading,
|
|
14
|
-
UsePaginationData,
|
|
14
|
+
// UsePaginationData,
|
|
15
15
|
UsePaginationReturnData,
|
|
16
16
|
} from '../../order-daily-overview/store/store';
|
|
17
17
|
import { filtersReducerReturnAtom } from '../../order-daily-overview/return-after-table/table-filters/ReturnFilterStore';
|
|
@@ -30,10 +30,10 @@ const ConfirmedMain = () => {
|
|
|
30
30
|
const { 'x-pagination': pagination } = statePagination;
|
|
31
31
|
const [state] = useAtom(dateFilterCPReducer);
|
|
32
32
|
const { 'x-filters': filters } = state;
|
|
33
|
-
const [paginationObj] = UsePaginationReturnData();
|
|
33
|
+
const [paginationObj, setReturnPaginationObject] = UsePaginationReturnData();
|
|
34
34
|
const [, setCurrentPage] = useState(1);
|
|
35
35
|
const [itemsPerPage, setItemsPerPage] = useItemsPerReturnPage();
|
|
36
|
-
const [, setPaginationObject] = UsePaginationData();
|
|
36
|
+
// const [, setPaginationObject] = UsePaginationData();
|
|
37
37
|
const { page, total } = paginationObj;
|
|
38
38
|
const [debouncedSearchText] = useSearchAfterText();
|
|
39
39
|
const handlePageChange = (page: number) => {
|
|
@@ -61,18 +61,17 @@ const ConfirmedMain = () => {
|
|
|
61
61
|
if (clientPortal && debouncedSearchText === '') {
|
|
62
62
|
fetchData();
|
|
63
63
|
}
|
|
64
|
-
}, [JSON.stringify(filters), debouncedSearchText]);
|
|
64
|
+
}, [JSON.stringify(filters), debouncedSearchText, pagination]);
|
|
65
65
|
|
|
66
66
|
useEffect(() => {
|
|
67
67
|
setLoading(loading);
|
|
68
68
|
|
|
69
69
|
if (fetchedReturnOrderData?.data) {
|
|
70
70
|
setReturnConfirmedData(fetchedReturnOrderData?.data);
|
|
71
|
-
|
|
72
71
|
if (paginationData) {
|
|
73
72
|
try {
|
|
74
73
|
const { count, ...rest } = JSON.parse(paginationData);
|
|
75
|
-
|
|
74
|
+
setReturnPaginationObject(rest);
|
|
76
75
|
} catch (error) {
|
|
77
76
|
notification.error({
|
|
78
77
|
message: 'Error',
|