From 3bce86ea5fabe2c22a6428196da79a48ac9db900 Mon Sep 17 00:00:00 2001 From: caturbgs Date: Wed, 22 Dec 2021 22:06:37 +0700 Subject: [PATCH] fix: payback menu swap API --- src/pages/Payback/Payback.js | 104 ++++++++++++++-------------- src/pages/Payback/PaybackCreated.js | 44 ++++++------ src/store/payback.js | 38 +++++----- 3 files changed, 93 insertions(+), 93 deletions(-) diff --git a/src/pages/Payback/Payback.js b/src/pages/Payback/Payback.js index c1ff5b4..96768ba 100644 --- a/src/pages/Payback/Payback.js +++ b/src/pages/Payback/Payback.js @@ -17,9 +17,9 @@ export const Payback = observer(() => { useEffect(() => { const init = async () => { try { - modalLoader.setLoading(true); - await store.payback.getData(); - modalLoader.setLoading(false); + modalLoader.setLoading(true); + await store.payback.getDataConfirmation(); + modalLoader.setLoading(false); } catch (e) { modalLoader.setLoading(false); if (e.response?.body?.message) { @@ -82,17 +82,17 @@ export const Payback = observer(() => { await handleAction(record, "reject"); }} icon={} - style={{ - backgroundColor: "#ff1c1c", - color: "#fff", - borderColor: "#ff1c1c", - }} - > - Reject - - - ), - }, + style={{ + backgroundColor: "#ff1c1c", + color: "#fff", + borderColor: "#ff1c1c", + }} + > + Reject + + + ), + }, ]; if (store.authentication.userData.role === "Retail") columns.pop(); @@ -162,23 +162,23 @@ export const Payback = observer(() => { key="1" hasEmpty columns={columns} - dataSource={store.payback.data} + dataSource={store.payback.dataConfirmation} bordered - // pagination={{ - // pageSize: store.payback.page, - // total: store.payback.total_data, - // current: store.payback.pageSize + 1, - // showSizeChanger: true, - // simple: false - // }} - // onChange={async (page) => { - // let pageNumber = page.current; - // store.payback.pageSize = page.pageSize; - // store.payback.page = pageNumber - 1; - // modalLoader.setLoading(true); - // await store.payback.getData(); - // modalLoader.setLoading(false); - // }} + pagination={{ + pageSize: store.payback.pageSizeConfirmation, + total: store.payback.totalDataConfirmation, + current: store.payback.pageSizeConfirmation + 1, + showSizeChanger: true, + simple: false + }} + onChange={async (page) => { + let pageNumber = page.current; + store.payback.pageSizeConfirmation = page.pageSize; + store.payback.pageConfirmation = pageNumber - 1; + modalLoader.setLoading(true); + await store.payback.getDataConfirmation(); + modalLoader.setLoading(false); + }} /> )} @@ -186,30 +186,30 @@ export const Payback = observer(() => { { - // store.payback.pageSize = page.pageSize; - // store.payback.page = page.current; - // modalLoader.setLoading(true); - // await store.payback.getData(); - // modalLoader.setLoading(false); - // }, - // pageSize: store.payback.pageSize, - // total: store.payback.total_data, - // current: store.payback.page, - // style: {marginBottom: "1rem", marginRight: "1rem"}, - // }} - dataSource={store.payback.data} + pagination={{ + onChange: async (page) => { + store.payback.pageSizeConfirmation = page.pageSize; + store.payback.pageConfirmation = page.current - 1; + modalLoader.setLoading(true); + await store.payback.getDataConfirmation(); + modalLoader.setLoading(false); + }, + pageSize: store.payback.pageSizeConfirmation, + total: store.payback.totalDataConfirmation, + current: store.payback.pageConfirmation + 1, + style: {marginBottom: "1rem", marginRight: "1rem"}, + }} + dataSource={store.payback.dataConfirmation} style={{padding: 0}} renderItem={(item) => { - return ( -
- + { try { modalLoader.setLoading(true); await Promise.allSettled([ - store.payback.getDataUser(), - store.authentication.getProfile() + store.payback.getDataCreated(), + store.authentication.getProfile(), ]); modalLoader.setLoading(false); } catch (e) { @@ -43,12 +44,11 @@ export const PaybackCreated = observer(() => { dataIndex: "image_prove", key: "image_prove", render: (text, record) => ( - avatar + {record.id} ), }, { @@ -112,21 +112,21 @@ export const PaybackCreated = observer(() => { key="1" hasEmpty columns={columns} - dataSource={store.payback.dataPaybackUser} + dataSource={store.payback.dataCreated} bordered pagination={{ - pageSize: store.payback.pageSizePaybackUser, - total: store.payback.total_dataPaybackUser, - current: store.payback.pageSizePaybackUser + 1, + pageSize: store.payback.pageSizeCreated, + total: store.payback.totalDataCreated, + current: store.payback.pageCreated + 1, showSizeChanger: true, simple: false }} onChange={async (page) => { let pageNumber = page.current; - store.payback.pageSizePaybackUser = page.pageSize; - store.payback.pageSizePaybackUser = pageNumber - 1; + store.payback.pageSizeCreated = page.pageSize; + store.payback.pageCreated = pageNumber - 1; modalLoader.setLoading(true); - //await store.payback.getDataUser(); + await store.payback.getDataCreated(); modalLoader.setLoading(false); }} /> @@ -138,18 +138,18 @@ export const PaybackCreated = observer(() => { position={"top"} pagination={{ onChange: async (page) => { - store.payback.pageSizePaybackUser = page.pageSize; - store.payback.pageSizePaybackUser = page.current; + store.payback.pageSizeCreated = page.pageSize; + store.payback.pageCreated = page.current - 1; modalLoader.setLoading(true); - await store.payback.getDataUser(); + await store.payback.getDataCreated(); modalLoader.setLoading(false); }, - pageSize: store.payback.pageSizePaybackUser, - total: store.payback.total_dataPaybackUser, - current: store.payback.pageSizePaybackUser, + pageSize: store.payback.pageSizeCreated, + total: store.payback.totalDataCreated, + current: store.payback.pageCreated + 1, style: {marginBottom: "1rem", marginRight: "1rem"}, }} - dataSource={store.payback.dataPaybackUser} + dataSource={store.payback.dataCreated} style={{padding: 0}} renderItem={(item) => { return ( diff --git a/src/store/payback.js b/src/store/payback.js index 366f530..104c406 100644 --- a/src/store/payback.js +++ b/src/store/payback.js @@ -2,50 +2,50 @@ import {makeAutoObservable} from "mobx"; import {http} from "../utils/http"; export class Payback { - page = 0; - pageSize = 10; - data = []; - total_data = 0; + pageCreated = 0; + pageSizeCreated = 10; + dataCreated = []; + totalDataCreated = 0; filterCategory = null; visibleModalPayback = false; - pagePaybackUser = 0; - pageSizePaybackUser = 10; - dataPaybackUser = []; - total_dataPaybackUser = 0; + pageConfirmation = 0; + pageSizeConfirmation = 10; + dataConfirmation = []; + totalDataConfirmation = 0; constructor(ctx) { this.ctx = ctx; makeAutoObservable(this); } - async getData() { + async getDataCreated() { try { const response = await http.get( - `/transaction/deposit-return?page=${this.page}&pageSize=${this.pageSize}` + `/transaction/deposit-return?page=${this.pageCreated}&pageSize=${this.pageSizeCreated}` ); - this.data = response.body.data.map((item, idx) => { + this.dataCreated = response.body.data.map((item, idx) => { item.key = idx; return item; }) ?? []; - this.total_data = response.body.count ?? 0; + this.totalDataCreated = response.body.count ?? 0; } catch (e) { console.error(e); } } - async getDataUser() { + async getDataConfirmation() { try { const response = await http.get( - `/transaction/deposit-return/confirmation?page=${this.pagePaybackUser}&pageSize=${this.pageSizePaybackUser}` + `/transaction/deposit-return/confirmation?page=${this.pageConfirmation}&pageSize=${this.pageSizeConfirmation}` ); - this.dataPaybackUser = response.body.data.map((item, idx) => { + this.dataConfirmation = response.body.data.map((item, idx) => { item.key = idx; return item; }) ?? []; - this.total_dataPaybackUser = response.body.count ?? 0; + this.totalDataConfirmation = response.body.count ?? 0; } catch (e) { console.error(e); } @@ -54,7 +54,7 @@ export class Payback { async update(id, data) { try { const response = await http.put(`/config/commission/${id}`).send(data); - await this.getData(); + await this.getDataCreated(); return response; } catch (e) { console.error(e); @@ -64,7 +64,7 @@ export class Payback { async delete(id) { try { const response = await http.del(`/product/${id}`); - await this.getData(); + await this.getDataCreated(); return response; } catch (e) { console.error(e); @@ -74,7 +74,7 @@ export class Payback { async create(data) { try { const response = await http.post("/transaction/deposit-return").send(data); - await this.getData(); + await this.getDataCreated(); return response; } catch (e) { console.error(e);