diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js index 82e2aee..14eb0b4 100644 --- a/src/pages/Membership/DetailUser.js +++ b/src/pages/Membership/DetailUser.js @@ -28,16 +28,12 @@ export const DetailUser = observer(() => { const modalLoader = useContext(ModalLoaderContext); const { id } = useParams(); const [visibleModal, setVisibleModal] = useState(false); - const [isVisibleTopUpModal, setIsVisibleTopUpModal] = useState(false); - const [destination, setDestination] = useState(null); const [initialData, setInitialData] = useState({}); const [confirmLoading, setConfirmLoading] = useState(false); useEffect(() => { (async () => { modalLoader.setLoading(true); - store.transaction.getDataHistoryTransaction(); - store.transaction.getDetailHistoryTransaction(); await getData(); modalLoader.setLoading(false); })(); @@ -347,9 +343,9 @@ export const DetailUser = observer(() => { dataSource={store.transaction.dataHistoryTopUp} bordered pagination={{ - pageSize: store.transaction.pageSize, - total: store.transaction.total_data, - current: store.transaction.page + 1, + pageSize: store.transaction.pageSizeHistoryTransaction, + total: store.transaction.total_dataHistoryTransaction, + current: store.transaction.pageHistoryTransaction + 1, showSizeChanger: true, simple: false, }} @@ -375,12 +371,12 @@ export const DetailUser = observer(() => { key="1" hasEmpty columns={column} - dataSource={store.transaction.dataDetailHistoryTransaction} + dataSource={store.transaction.dataDetailHistoryTransactionDetailUser} bordered pagination={{ - pageSize: store.transaction.pageSize, - total: store.transaction.total_data, - current: store.transaction.page + 1, + pageSize: store.transaction.pageSizeHistoryTransactionDetailUser, + total: store.transaction.total_dataDetailHistoryTransactionDetailUser, + current: store.transaction.pageHistoryTransactionDetailUser + 1, showSizeChanger: true, simple: false, }} diff --git a/src/store/transaction.js b/src/store/transaction.js index 50d8274..8cddde4 100644 --- a/src/store/transaction.js +++ b/src/store/transaction.js @@ -26,20 +26,26 @@ export class Transaction { dataHistoryTransaction = []; total_dataHistoryTransaction = 0; + pageHistoryTransactionDetailUser = 0; + pageSizeHistoryTransactionDetailUser = 10; + dataHistoryTransactionDetailUser = []; + total_dataHistoryTransactionDetailUser = 0; + pageHistoryTopUp = 0; pageSizeHistoryTopUp = 10; dataHistoryTopUp = []; total_dataHistoryTopUp = 0; + dataTransaction = []; dataTransactionB2B = []; dataTransactionPartner = []; - dataDetailHistoryTransaction = []; - total_dataDetailHistoryTransaction=0; //filter visibleModalFilterTransaction = false; filterStart = null; filterEnd = null; + filterStartDetailUser = null; + filterEndDetailUser = null; constructor(ctx) { this.ctx = ctx; makeAutoObservable(this); @@ -129,10 +135,10 @@ export class Transaction { async getDetailHistoryTransaction(id) { try { - const response = await http.get(`/transaction/history-user/${id}`); + const response = await http.get(`/transaction/history-user/${id}?page=${this.pageHistoryTransactionDetailUser}&pageSize=${this.pageSizeHistoryTransactionDetailUser}&start=${this.filterStartDetailUser}&end=${this.filterEndDetailUser}`); console.log(response,'Data Trans'); - this.dataDetailHistoryTransaction = response.body.data ?? []; - this.total_dataDetailHistoryTransaction = response?.body?.count ?? 0; + this.dataDetailHistoryTransactionDetailUser = response.body.data ?? []; + this.total_dataDetailHistoryTransactionDetailUser = response?.body?.count ?? 0; } catch (e) { console.error(e); }