diff --git a/src/pages/Payback/Payback.js b/src/pages/Payback/Payback.js
index 8ade44a..a87baff 100644
--- a/src/pages/Payback/Payback.js
+++ b/src/pages/Payback/Payback.js
@@ -1,26 +1,8 @@
-import React, {useState, useEffect, useContext} from "react";
-import {
- Button,
- Card,
- Col,
- Divider,
- Image,
- Input,
- List,
- message,
- Row,
- Space,
- Table,
-} from "antd";
+import React, {useContext, useEffect} from "react";
+import {Button, Card, Col, Divider, Image, Input, List, message, Row, Space, Table,} from "antd";
import {useStore} from "../../utils/useStore";
import {observer} from "mobx-react-lite";
-import {
- CheckCircleOutlined,
- CloseOutlined,
- FilterOutlined,
- PlusSquareOutlined,
-} from "@ant-design/icons";
-import {PaybackModal} from "./PaybackModal";
+import {CheckCircleOutlined, CloseOutlined, FilterOutlined,} from "@ant-design/icons";
import {BreadcumbComponent} from "../../component/BreadcumbComponent";
import {LINKS} from "../../routes/app";
import {ModalLoaderContext} from "../../utils/modal";
@@ -35,7 +17,7 @@ export const Payback = observer(() => {
const init = async () => {
try {
modalLoader.setLoading(true);
- await store.payback.getDataUser();
+ await store.payback.getData();
modalLoader.setLoading(false);
} catch (e) {
modalLoader.setLoading(false);
@@ -52,11 +34,6 @@ export const Payback = observer(() => {
const columns = [
- {
- title: "Name",
- dataIndex: "name",
- key: "name",
- },
{
title: "Picture",
dataIndex: "image_prove",
@@ -77,37 +54,37 @@ export const Payback = observer(() => {
},
{
title: "Action",
+ dataIndex: "amount",
key: "action",
- width: 100,
render: (text, record) => (
-
-
-
-
+
+
+
+
),
},
];
@@ -128,9 +105,9 @@ export const Payback = observer(() => {
const onSubmit = async (data) => {
modalLoader.setLoading(true);
try {
- // await store.membership.create(data);
+ // await store.payback.create(data);
// message.success("Success Add New Member");
- // await store.membership.getData();
+ // await store.payback.getData();
} catch (e) {
console.error(e, "apa errornya");
message.error("Failed Add Member");
@@ -175,83 +152,85 @@ export const Payback = observer(() => {
{store.ui.mediaQuery.isDesktop && (
- {
- // let pageNumber = page.current;
- // store.membership.pageSize = page.pageSize;
- // store.membership.page = pageNumber - 1;
- // // store.membership.isLoading = true;
- // await store.membership.getData();
- // // store.membership.isLoading = false;
- // }}
- />
+ {
+ let pageNumber = page.current;
+ store.payback.pageSize = page.pageSize;
+ store.payback.page = pageNumber - 1;
+ modalLoader.setLoading(true);
+ await store.payback.getData();
+ modalLoader.setLoading(false);
+ }}
+ />
)}
{store.ui.mediaQuery.isMobile && (
- {
- // store.membership.pageSize = page.pageSize;
- // store.membership.page = page.current;
- // store.membership.getData();
- // },
- // pageSize: store.membership.pageSize,
- // total: store.membership.total_data,
- // current: store.membership.page,
- // style: {marginBottom: "1rem", marginRight: "1rem"},
- // }}
- dataSource={store.payback.data}
- style={{padding: 0}}
- renderItem={(item) => {
- return (
-
- }
- />
-
-
-
+ {
+ 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}
+ style={{padding: 0}}
+ renderItem={(item) => {
+ return (
+
+ }
+ />
+
+
+
);
}}
@@ -259,19 +238,6 @@ export const Payback = observer(() => {
)}
-
- {/* {
- await onSubmit(data);
- }}
- onCancel={() => {
- setInitialData({});
- setVisibleModal(false);
- }}
- /> */}
);
});
diff --git a/src/pages/Payback/PaybackFromUser.js b/src/pages/Payback/PaybackFromUser.js
index 8f359f4..3df9981 100644
--- a/src/pages/Payback/PaybackFromUser.js
+++ b/src/pages/Payback/PaybackFromUser.js
@@ -1,25 +1,8 @@
-import React, {useState, useEffect, useContext} from "react";
-import {
- Button,
- Card,
- Col,
- Divider,
- Image,
- Input,
- List,
- message,
- Row,
- Space,
- Table,
-} from "antd";
+import React, {useContext, useEffect, useState} from "react";
+import {Button, Card, Col, Divider, Image, Input, List, message, Row, Table,} from "antd";
import {useStore} from "../../utils/useStore";
import {observer} from "mobx-react-lite";
-import {
- CheckCircleOutlined,
- CloseOutlined,
- FilterOutlined,
- PlusSquareOutlined,
-} from "@ant-design/icons";
+import {FilterOutlined, PlusSquareOutlined,} from "@ant-design/icons";
import {PaybackModal} from "./PaybackModal";
import {BreadcumbComponent} from "../../component/BreadcumbComponent";
import {LINKS} from "../../routes/app";
@@ -37,7 +20,7 @@ export const PaybackFromUser = observer(() => {
const init = async () => {
try {
modalLoader.setLoading(true);
- await store.payback.getData();
+ await store.payback.getDataUser();
await store.authentication.getProfile();
modalLoader.setLoading(false);
} catch (e) {
@@ -73,76 +56,6 @@ export const PaybackFromUser = observer(() => {
dataIndex: "amount",
key: "amount",
},
- {
- title: "Action",
- dataIndex: "amount",
- key: "action",
- render: (text, record) => (
-
-
-
-
- ),
- },
- // {
- // title: "Action",
- // key: "action",
- // width: 100,
- // render: (text, record) => (
- //
- //
- //
- //
- // ),
- // },
];
const routeData = [
@@ -208,26 +121,26 @@ export const PaybackFromUser = observer(() => {
{store.ui.mediaQuery.isDesktop && (
{
- let pageNumber = page.current;
- store.payback.pageSize = page.pageSize;
- store.payback.page = pageNumber - 1;
- modalLoader.setLoading(true);
- await store.payback.getData();
- modalLoader.setLoading(false);
- }}
+ key="1"
+ hasEmpty
+ columns={columns}
+ dataSource={store.payback.dataPaybackUser}
+ bordered
+ pagination={{
+ pageSize: store.payback.pageSizePaybackUser,
+ total: store.payback.total_dataPaybackUser,
+ current: store.payback.pageSizePaybackUser + 1,
+ showSizeChanger: true,
+ simple: false
+ }}
+ onChange={async (page) => {
+ let pageNumber = page.current;
+ store.payback.pageSizePaybackUser = page.pageSize;
+ store.payback.pageSizePaybackUser = pageNumber - 1;
+ modalLoader.setLoading(true);
+ await store.payback.getDataUser();
+ modalLoader.setLoading(false);
+ }}
/>
)}
@@ -237,18 +150,18 @@ export const PaybackFromUser = observer(() => {
position={"top"}
pagination={{
onChange: async (page) => {
- store.payback.pageSize = page.pageSize;
- store.payback.page = page.current;
+ store.payback.pageSizePaybackUser = page.pageSize;
+ store.payback.pageSizePaybackUser = page.current;
modalLoader.setLoading(true);
- await store.payback.getData();
+ await store.payback.getDataUser();
modalLoader.setLoading(false);
},
- pageSize: store.payback.pageSize,
- total: store.payback.total_data,
- current: store.payback.page,
+ pageSize: store.payback.pageSizePaybackUser,
+ total: store.payback.total_dataPaybackUser,
+ current: store.payback.pageSizePaybackUser,
style: {marginBottom: "1rem", marginRight: "1rem"},
}}
- dataSource={store.payback.data}
+ dataSource={store.payback.dataPaybackUser}
style={{padding: 0}}
renderItem={(item) => {
return (
diff --git a/src/store/payback.js b/src/store/payback.js
index adbc4f4..e11861d 100644
--- a/src/store/payback.js
+++ b/src/store/payback.js
@@ -9,15 +9,10 @@ export class Payback {
filterCategory = null;
visibleModalPayback = false;
- pagePayback = 0;
- pageSizePayback = 10;
- dataPayback = [];
- total_dataPayback = 0;
-
- pageSubPayback = 0;
- pageSizeSubPayback = 10;
- dataSubPayback = [];
- total_dataPayback = 0;
+ pagePaybackUser = 0;
+ pageSizePaybackUser = 10;
+ dataPaybackUser = [];
+ total_dataPaybackUser = 0;
constructor(ctx) {
this.ctx = ctx;
@@ -27,14 +22,12 @@ export class Payback {
async getData() {
try {
const response = await http.get(
- `/transaction/deposit-return?page=${this.page}&pageSize=${this.pageSize}`
+ `/transaction/deposit-return?page=${this.page}&pageSize=${this.pageSize}`
);
- //console.log(response)
- this.data =
- response.body.data.map((item, idx) => {
- item.key = idx;
- return item;
- }) ?? [];
+ this.data = response.body.data.map((item, idx) => {
+ item.key = idx;
+ return item;
+ }) ?? [];
this.total_data = response.body.count ?? 0;
} catch (e) {
@@ -45,16 +38,14 @@ export class Payback {
async getDataUser() {
try {
const response = await http.get(
- `/transaction/deposit-return/confirmation?page=${this.page}&pageSize=${this.pageSize}`
+ `/transaction/deposit-return/confirmation?page=${this.pagePaybackUser}&pageSize=${this.pageSizePaybackUser}`
);
- //console.log(response);
- this.data =
- response.body.data.map((item, idx) => {
- item.key = idx;
- return item;
- }) ?? [];
+ this.dataPaybackUser = response.body.data.map((item, idx) => {
+ item.key = idx;
+ return item;
+ }) ?? [];
- this.total_data = response.body.count ?? 0;
+ this.total_dataPaybackUser = response.body.count ?? 0;
} catch (e) {
console.error(e);
}
@@ -79,6 +70,7 @@ export class Payback {
console.error(e);
}
}
+
async create(data) {
try {
console.log(data)