PPOB/ppob-frontend
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: payback menu swap API

Browse Source
This commit is contained in:
caturbgs 2021-12-22 22:06:37 +07:00
parent 8f6620e7aa
commit 3bce86ea5f
3 changed files with 93 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
src/pages/Payback/Payback.js
View File

@ -17,9 +17,9 @@ export const Payback = observer(() => {
useEffect(() => { useEffect(() => {
const init = async () => { const init = async () => {
try { try {
modalLoader.setLoading(true); modalLoader.setLoading(true);
await store.payback.getData(); await store.payback.getDataConfirmation();
modalLoader.setLoading(false); modalLoader.setLoading(false);
} catch (e) { } catch (e) {
modalLoader.setLoading(false); modalLoader.setLoading(false);
if (e.response?.body?.message) { if (e.response?.body?.message) {
@ -82,17 +82,17 @@ export const Payback = observer(() => {
await handleAction(record, "reject"); await handleAction(record, "reject");
}} }}
icon={<CloseOutlined/>} icon={<CloseOutlined/>}
style={{ style={{
backgroundColor: "#ff1c1c", backgroundColor: "#ff1c1c",
color: "#fff", color: "#fff",
borderColor: "#ff1c1c", borderColor: "#ff1c1c",
}} }}
> >
Reject Reject
</Button> </Button>
</Space> </Space>
), ),
}, },
]; ];
if (store.authentication.userData.role === "Retail") columns.pop(); if (store.authentication.userData.role === "Retail") columns.pop();
@ -162,23 +162,23 @@ export const Payback = observer(() => {
key="1" key="1"
hasEmpty hasEmpty
columns={columns} columns={columns}
dataSource={store.payback.data} dataSource={store.payback.dataConfirmation}
bordered bordered
// pagination={{ pagination={{
// pageSize: store.payback.page, pageSize: store.payback.pageSizeConfirmation,
// total: store.payback.total_data, total: store.payback.totalDataConfirmation,
// current: store.payback.pageSize + 1, current: store.payback.pageSizeConfirmation + 1,
// showSizeChanger: true, showSizeChanger: true,
// simple: false simple: false
// }} }}
// onChange={async (page) => { onChange={async (page) => {
// let pageNumber = page.current; let pageNumber = page.current;
// store.payback.pageSize = page.pageSize; store.payback.pageSizeConfirmation = page.pageSize;
// store.payback.page = pageNumber - 1; store.payback.pageConfirmation = pageNumber - 1;
// modalLoader.setLoading(true); modalLoader.setLoading(true);
// await store.payback.getData(); await store.payback.getDataConfirmation();
// modalLoader.setLoading(false); modalLoader.setLoading(false);
// }} }}
/> />
)} )}
@ -186,30 +186,30 @@ export const Payback = observer(() => {
<List <List
itemLayout="horizontal" itemLayout="horizontal"
position={"top"} position={"top"}
// pagination={{ pagination={{
// onChange: async (page) => { onChange: async (page) => {
// store.payback.pageSize = page.pageSize; store.payback.pageSizeConfirmation = page.pageSize;
// store.payback.page = page.current; store.payback.pageConfirmation = page.current - 1;
// modalLoader.setLoading(true); modalLoader.setLoading(true);
// await store.payback.getData(); await store.payback.getDataConfirmation();
// modalLoader.setLoading(false); modalLoader.setLoading(false);
// }, },
// pageSize: store.payback.pageSize, pageSize: store.payback.pageSizeConfirmation,
// total: store.payback.total_data, total: store.payback.totalDataConfirmation,
// current: store.payback.page, current: store.payback.pageConfirmation + 1,
// style: {marginBottom: "1rem", marginRight: "1rem"}, style: {marginBottom: "1rem", marginRight: "1rem"},
// }} }}
dataSource={store.payback.data} dataSource={store.payback.dataConfirmation}
style={{padding: 0}} style={{padding: 0}}
renderItem={(item) => { renderItem={(item) => {
return ( return (
<div> <div>
<List.Item <List.Item
key={item.id} key={item.id}
style={{ style={{
backgroundColor: "#ffffff", backgroundColor: "#ffffff",
paddingTop: 0, paddingTop: 0,
paddingBottom: 0, paddingBottom: 0,
display: "flex", display: "flex",
flexDirection: "row", flexDirection: "row",
alignItems: "center", alignItems: "center",

44
src/pages/Payback/PaybackCreated.js
View File

@ -7,6 +7,7 @@ import {PaybackModal} from "./PaybackModal";
import {BreadcumbComponent} from "../../component/BreadcumbComponent"; import {BreadcumbComponent} from "../../component/BreadcumbComponent";
import {LINKS} from "../../routes/app"; import {LINKS} from "../../routes/app";
import {ModalLoaderContext} from "../../utils/modal"; import {ModalLoaderContext} from "../../utils/modal";
import {appConfig} from "../../config/app";
const {Search} = Input; const {Search} = Input;
@ -20,8 +21,8 @@ export const PaybackCreated = observer(() => {
try { try {
modalLoader.setLoading(true); modalLoader.setLoading(true);
await Promise.allSettled([ await Promise.allSettled([
store.payback.getDataUser(), store.payback.getDataCreated(),
store.authentication.getProfile() store.authentication.getProfile(),
]); ]);
modalLoader.setLoading(false); modalLoader.setLoading(false);
} catch (e) { } catch (e) {
@ -43,12 +44,11 @@ export const PaybackCreated = observer(() => {
dataIndex: "image_prove", dataIndex: "image_prove",
key: "image_prove", key: "image_prove",
render: (text, record) => ( render: (text, record) => (
<Image <Image
src={record.image_prove} src={`${appConfig.apiUrl}/config/image/${text}`}
style={{width: 50, height: 50}} style={{width: '5vw'}}
shape="circle" alt={record.id}
alt="avatar" />
/>
), ),
}, },
{ {
@ -112,21 +112,21 @@ export const PaybackCreated = observer(() => {
key="1" key="1"
hasEmpty hasEmpty
columns={columns} columns={columns}
dataSource={store.payback.dataPaybackUser} dataSource={store.payback.dataCreated}
bordered bordered
pagination={{ pagination={{
pageSize: store.payback.pageSizePaybackUser, pageSize: store.payback.pageSizeCreated,
total: store.payback.total_dataPaybackUser, total: store.payback.totalDataCreated,
current: store.payback.pageSizePaybackUser + 1, current: store.payback.pageCreated + 1,
showSizeChanger: true, showSizeChanger: true,
simple: false simple: false
}} }}
onChange={async (page) => { onChange={async (page) => {
let pageNumber = page.current; let pageNumber = page.current;
store.payback.pageSizePaybackUser = page.pageSize; store.payback.pageSizeCreated = page.pageSize;
store.payback.pageSizePaybackUser = pageNumber - 1; store.payback.pageCreated = pageNumber - 1;
modalLoader.setLoading(true); modalLoader.setLoading(true);
//await store.payback.getDataUser(); await store.payback.getDataCreated();
modalLoader.setLoading(false); modalLoader.setLoading(false);
}} }}
/> />
@ -138,18 +138,18 @@ export const PaybackCreated = observer(() => {
position={"top"} position={"top"}
pagination={{ pagination={{
onChange: async (page) => { onChange: async (page) => {
store.payback.pageSizePaybackUser = page.pageSize; store.payback.pageSizeCreated = page.pageSize;
store.payback.pageSizePaybackUser = page.current; store.payback.pageCreated = page.current - 1;
modalLoader.setLoading(true); modalLoader.setLoading(true);
await store.payback.getDataUser(); await store.payback.getDataCreated();
modalLoader.setLoading(false); modalLoader.setLoading(false);
}, },
pageSize: store.payback.pageSizePaybackUser, pageSize: store.payback.pageSizeCreated,
total: store.payback.total_dataPaybackUser, total: store.payback.totalDataCreated,
current: store.payback.pageSizePaybackUser, current: store.payback.pageCreated + 1,
style: {marginBottom: "1rem", marginRight: "1rem"}, style: {marginBottom: "1rem", marginRight: "1rem"},
}} }}
dataSource={store.payback.dataPaybackUser} dataSource={store.payback.dataCreated}
style={{padding: 0}} style={{padding: 0}}
renderItem={(item) => { renderItem={(item) => {
return ( return (

38
src/store/payback.js
View File

@ -2,50 +2,50 @@ import {makeAutoObservable} from "mobx";
import {http} from "../utils/http"; import {http} from "../utils/http";
export class Payback { export class Payback {
page = 0; pageCreated = 0;
pageSize = 10; pageSizeCreated = 10;
data = []; dataCreated = [];
total_data = 0; totalDataCreated = 0;
filterCategory = null; filterCategory = null;
visibleModalPayback = false; visibleModalPayback = false;
pagePaybackUser = 0; pageConfirmation = 0;
pageSizePaybackUser = 10; pageSizeConfirmation = 10;
dataPaybackUser = []; dataConfirmation = [];
total_dataPaybackUser = 0; totalDataConfirmation = 0;
constructor(ctx) { constructor(ctx) {
this.ctx = ctx; this.ctx = ctx;
makeAutoObservable(this); makeAutoObservable(this);
} }
async getData() { async getDataCreated() {
try { try {
const response = await http.get( 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; item.key = idx;
return item; return item;
}) ?? []; }) ?? [];
this.total_data = response.body.count ?? 0; this.totalDataCreated = response.body.count ?? 0;
} catch (e) { } catch (e) {
console.error(e); console.error(e);
} }
} }
async getDataUser() { async getDataConfirmation() {
try { try {
const response = await http.get( 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; item.key = idx;
return item; return item;
}) ?? []; }) ?? [];
this.total_dataPaybackUser = response.body.count ?? 0; this.totalDataConfirmation = response.body.count ?? 0;
} catch (e) { } catch (e) {
console.error(e); console.error(e);
} }
@ -54,7 +54,7 @@ export class Payback {
async update(id, data) { async update(id, data) {
try { try {
const response = await http.put(`/config/commission/${id}`).send(data); const response = await http.put(`/config/commission/${id}`).send(data);
await this.getData(); await this.getDataCreated();
return response; return response;
} catch (e) { } catch (e) {
console.error(e); console.error(e);
@ -64,7 +64,7 @@ export class Payback {
async delete(id) { async delete(id) {
try { try {
const response = await http.del(`/product/${id}`); const response = await http.del(`/product/${id}`);
await this.getData(); await this.getDataCreated();
return response; return response;
} catch (e) { } catch (e) {
console.error(e); console.error(e);
@ -74,7 +74,7 @@ export class Payback {
async create(data) { async create(data) {
try { try {
const response = await http.post("/transaction/deposit-return").send(data); const response = await http.post("/transaction/deposit-return").send(data);
await this.getData(); await this.getDataCreated();
return response; return response;
} catch (e) { } catch (e) {
console.error(e); console.error(e);