diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js index d1bcb5f..5e6f930 100644 --- a/src/pages/Membership/Membership.js +++ b/src/pages/Membership/Membership.js @@ -352,7 +352,7 @@ export const Membership = observer(() => { bordered pagination={{ pageSize: store.membership.pageSize, - total: store.membership.totalData, + total: store.membership.total_data, current: store.membership.page + 1, showSizeChanger: true, simple: false, @@ -362,6 +362,7 @@ export const Membership = observer(() => { store.membership.pageSize = page.pageSize; store.membership.page = pageNumber - 1; modalLoader.setLoading(true); + await store.membership.getData(); await getData(); modalLoader.setLoading(false); }} @@ -528,7 +529,7 @@ export const Membership = observer(() => { visible={store.membership.visibleModalFilterMembership} title={"Filter"} footer={footerLayoutFilter} - onCancel={async() => { + onCancel={async () => { // setFilterMembership([]); // setFilterPartner([]); store.membership.filterMembership = null; diff --git a/src/pages/Payback/Payback.js b/src/pages/Payback/Payback.js index 0f85258..7573c46 100644 --- a/src/pages/Payback/Payback.js +++ b/src/pages/Payback/Payback.js @@ -486,12 +486,12 @@ export const Payback = observer(() => { - From + Sender