Merge branch 'develop' into 'devops-staging'
Develop See merge request empatnusabangsa/ppob/ppob-frontend!3
This commit is contained in:
commit
5f502663fe
|
@ -1,5 +1,5 @@
|
||||||
import React, {useContext, useEffect, useState} from "react";
|
import React, {useContext, useEffect, useState} from "react";
|
||||||
import { Button, Card, Col, Input, Row, Tabs } from "antd";
|
import { Button, Card, Col, Input, Row, Tabs ,message} from "antd";
|
||||||
import { FilterOutlined, PlusSquareOutlined } from "@ant-design/icons";
|
import { FilterOutlined, PlusSquareOutlined } from "@ant-design/icons";
|
||||||
import { BreadcumbComponent } from "../../component/BreadcumbComponent";
|
import { BreadcumbComponent } from "../../component/BreadcumbComponent";
|
||||||
import { useStore } from "../../utils/useStore";
|
import { useStore } from "../../utils/useStore";
|
||||||
|
@ -24,6 +24,11 @@ export const Commission = observer(() => {
|
||||||
modalLoader.setLoading(false);
|
modalLoader.setLoading(false);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
modalLoader.setLoading(false);
|
modalLoader.setLoading(false);
|
||||||
|
if (e.response?.body?.message) {
|
||||||
|
message.error(e.response.body.message);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
message.error(e.message);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import React, {useContext, useEffect, useState} from "react";
|
import React, {useContext, useEffect, useState} from "react";
|
||||||
import {Button, Card, Col, Input, Row, Tabs} from "antd";
|
import {Button, Card, Col, Input, Row, Tabs,message} from "antd";
|
||||||
import {FilterOutlined, PlusSquareOutlined,} from "@ant-design/icons";
|
import {FilterOutlined, PlusSquareOutlined,} from "@ant-design/icons";
|
||||||
import {BreadcumbComponent} from "../../component/BreadcumbComponent";
|
import {BreadcumbComponent} from "../../component/BreadcumbComponent";
|
||||||
import {useStore} from "../../utils/useStore";
|
import {useStore} from "../../utils/useStore";
|
||||||
|
@ -22,6 +22,11 @@ export const Partner = observer(() => {
|
||||||
modalLoader.setLoading(false);
|
modalLoader.setLoading(false);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
modalLoader.setLoading(false);
|
modalLoader.setLoading(false);
|
||||||
|
if (e.response?.body?.message) {
|
||||||
|
message.error(e.response.body.message);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
message.error(e.message);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -37,6 +37,11 @@ export const Supplier = observer(() => {
|
||||||
modalLoader.setLoading(false);
|
modalLoader.setLoading(false);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
modalLoader.setLoading(false);
|
modalLoader.setLoading(false);
|
||||||
|
if (e.response?.body?.message) {
|
||||||
|
message.error(e.response.body.message);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
message.error(e.message);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,34 +1,29 @@
|
||||||
import React, {useContext} from "react";
|
import React from "react";
|
||||||
import {observer} from 'mobx-react-lite';
|
import {observer} from 'mobx-react-lite';
|
||||||
import {useStore} from "../../utils/useStore";
|
import {useStore} from "../../utils/useStore";
|
||||||
import {Button, Card, Col, Form, Input, message, Row, Typography} from 'antd';
|
import {Button, Card, Col, Form, Input, message, Row, Typography} from 'antd';
|
||||||
import {useHistory} from "react-router-dom";
|
import {useHistory} from "react-router-dom";
|
||||||
import {LINKS} from "../../routes/app";
|
import {LINKS} from "../../routes/app";
|
||||||
import {ModalLoaderContext} from "../../utils/modal";
|
|
||||||
|
|
||||||
export const Login = observer(() => {
|
export const Login = observer(() => {
|
||||||
const store = useStore();
|
const store = useStore();
|
||||||
let history = useHistory();
|
let history = useHistory();
|
||||||
const [form] = Form.useForm();
|
const [form] = Form.useForm();
|
||||||
const modalLoader = useContext(ModalLoaderContext);
|
|
||||||
|
|
||||||
const handleLogin = async (params) => {
|
const handleLogin = async (params) => {
|
||||||
try {
|
try {
|
||||||
modalLoader.setLoading(true);
|
|
||||||
await store.authentication.login({
|
await store.authentication.login({
|
||||||
username: params.username,
|
username: params.username,
|
||||||
password: params.password,
|
password: params.password,
|
||||||
});
|
});
|
||||||
modalLoader.setLoading(false);
|
|
||||||
history.push(LINKS.HOME);
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
modalLoader.setLoading(true);
|
|
||||||
if (e.response?.body?.message) {
|
if (e.response?.body?.message) {
|
||||||
message.error(e.response.body.message);
|
message.error(e.response.body.message);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
message.error(e.message);
|
message.error(e.message);
|
||||||
}
|
}
|
||||||
|
history.push(LINKS.HOME);
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|
|
@ -53,6 +53,11 @@ export const Membership = observer(() => {
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error(e);
|
console.error(e);
|
||||||
modalLoader.setLoading(false);
|
modalLoader.setLoading(false);
|
||||||
|
if (e.response?.body?.message) {
|
||||||
|
message.error(e.response.body.message);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
message.error(e.message);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,26 +1,8 @@
|
||||||
import React, {useState, useEffect, useContext} from "react";
|
import React, {useContext, useEffect} from "react";
|
||||||
import {
|
import {Button, Card, Col, Divider, Image, Input, List, message, Row, Space, Table,} from "antd";
|
||||||
Button,
|
|
||||||
Card,
|
|
||||||
Col,
|
|
||||||
Divider,
|
|
||||||
Image,
|
|
||||||
Input,
|
|
||||||
List,
|
|
||||||
message,
|
|
||||||
Row,
|
|
||||||
Space,
|
|
||||||
Table,
|
|
||||||
} from "antd";
|
|
||||||
import {useStore} from "../../utils/useStore";
|
import {useStore} from "../../utils/useStore";
|
||||||
import {observer} from "mobx-react-lite";
|
import {observer} from "mobx-react-lite";
|
||||||
import {
|
import {CheckCircleOutlined, CloseOutlined, FilterOutlined,} from "@ant-design/icons";
|
||||||
CheckCircleOutlined,
|
|
||||||
CloseOutlined,
|
|
||||||
FilterOutlined,
|
|
||||||
PlusSquareOutlined,
|
|
||||||
} from "@ant-design/icons";
|
|
||||||
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";
|
||||||
|
@ -35,10 +17,15 @@ export const Payback = observer(() => {
|
||||||
const init = async () => {
|
const init = async () => {
|
||||||
try {
|
try {
|
||||||
modalLoader.setLoading(true);
|
modalLoader.setLoading(true);
|
||||||
await store.payback.getDataUser();
|
await store.payback.getData();
|
||||||
modalLoader.setLoading(false);
|
modalLoader.setLoading(false);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
modalLoader.setLoading(false);
|
modalLoader.setLoading(false);
|
||||||
|
if (e.response?.body?.message) {
|
||||||
|
message.error(e.response.body.message);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
message.error(e.message);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -47,11 +34,6 @@ export const Payback = observer(() => {
|
||||||
|
|
||||||
|
|
||||||
const columns = [
|
const columns = [
|
||||||
{
|
|
||||||
title: "Name",
|
|
||||||
dataIndex: "name",
|
|
||||||
key: "name",
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
title: "Picture",
|
title: "Picture",
|
||||||
dataIndex: "image_prove",
|
dataIndex: "image_prove",
|
||||||
|
@ -72,37 +54,37 @@ export const Payback = observer(() => {
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: "Action",
|
title: "Action",
|
||||||
|
dataIndex: "amount",
|
||||||
key: "action",
|
key: "action",
|
||||||
width: 100,
|
|
||||||
render: (text, record) => (
|
render: (text, record) => (
|
||||||
<Space size="middle">
|
<Space size="middle">
|
||||||
<Button
|
<Button
|
||||||
onClick={async () => {
|
onClick={async () => {
|
||||||
await handleAction(record, "accept");
|
await handleAction(record, "accept");
|
||||||
}}
|
}}
|
||||||
icon={<CheckCircleOutlined/>}
|
icon={<CheckCircleOutlined/>}
|
||||||
style={{
|
style={{
|
||||||
backgroundColor: "#1bb91d",
|
backgroundColor: "#1bb91d",
|
||||||
color: "#fff",
|
color: "#fff",
|
||||||
borderColor: "#1bb91d",
|
borderColor: "#1bb91d",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
Accept
|
Accept
|
||||||
</Button>
|
</Button>
|
||||||
<Button
|
<Button
|
||||||
onClick={async () => {
|
onClick={async () => {
|
||||||
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>
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
@ -123,9 +105,9 @@ export const Payback = observer(() => {
|
||||||
const onSubmit = async (data) => {
|
const onSubmit = async (data) => {
|
||||||
modalLoader.setLoading(true);
|
modalLoader.setLoading(true);
|
||||||
try {
|
try {
|
||||||
// await store.membership.create(data);
|
// await store.payback.create(data);
|
||||||
// message.success("Success Add New Member");
|
// message.success("Success Add New Member");
|
||||||
// await store.membership.getData();
|
// await store.payback.getData();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error(e, "apa errornya");
|
console.error(e, "apa errornya");
|
||||||
message.error("Failed Add Member");
|
message.error("Failed Add Member");
|
||||||
|
@ -170,83 +152,85 @@ export const Payback = observer(() => {
|
||||||
</Col>
|
</Col>
|
||||||
</Row>
|
</Row>
|
||||||
{store.ui.mediaQuery.isDesktop && (
|
{store.ui.mediaQuery.isDesktop && (
|
||||||
<Table
|
<Table
|
||||||
key="1"
|
key="1"
|
||||||
hasEmpty
|
hasEmpty
|
||||||
columns={columns}
|
columns={columns}
|
||||||
dataSource={store.payback.data}
|
dataSource={store.payback.data}
|
||||||
bordered
|
bordered
|
||||||
// pagination={{
|
pagination={{
|
||||||
// pageSize: store.membership.pageSize,
|
pageSize: store.payback.page,
|
||||||
// total: store.membership.total_data,
|
total: store.payback.total_data,
|
||||||
// current: store.membership.page + 1,
|
current: store.payback.pageSize + 1,
|
||||||
// showSizeChanger: true,
|
showSizeChanger: true,
|
||||||
// simple: false
|
simple: false
|
||||||
// }}
|
}}
|
||||||
// onChange={async (page) => {
|
onChange={async (page) => {
|
||||||
// let pageNumber = page.current;
|
let pageNumber = page.current;
|
||||||
// store.membership.pageSize = page.pageSize;
|
store.payback.pageSize = page.pageSize;
|
||||||
// store.membership.page = pageNumber - 1;
|
store.payback.page = pageNumber - 1;
|
||||||
// // store.membership.isLoading = true;
|
modalLoader.setLoading(true);
|
||||||
// await store.membership.getData();
|
await store.payback.getData();
|
||||||
// // store.membership.isLoading = false;
|
modalLoader.setLoading(false);
|
||||||
// }}
|
}}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{store.ui.mediaQuery.isMobile && (
|
{store.ui.mediaQuery.isMobile && (
|
||||||
<List
|
<List
|
||||||
itemLayout="horizontal"
|
itemLayout="horizontal"
|
||||||
position={"top"}
|
position={"top"}
|
||||||
// pagination={{
|
pagination={{
|
||||||
// onChange: (page) => {
|
onChange: async (page) => {
|
||||||
// store.membership.pageSize = page.pageSize;
|
store.payback.pageSize = page.pageSize;
|
||||||
// store.membership.page = page.current;
|
store.payback.page = page.current;
|
||||||
// store.membership.getData();
|
modalLoader.setLoading(true);
|
||||||
// },
|
await store.payback.getData();
|
||||||
// pageSize: store.membership.pageSize,
|
modalLoader.setLoading(false);
|
||||||
// total: store.membership.total_data,
|
},
|
||||||
// current: store.membership.page,
|
pageSize: store.payback.pageSize,
|
||||||
// style: {marginBottom: "1rem", marginRight: "1rem"},
|
total: store.payback.total_data,
|
||||||
// }}
|
current: store.payback.page,
|
||||||
dataSource={store.payback.data}
|
style: {marginBottom: "1rem", marginRight: "1rem"},
|
||||||
style={{padding: 0}}
|
}}
|
||||||
renderItem={(item) => {
|
dataSource={store.payback.data}
|
||||||
return (
|
style={{padding: 0}}
|
||||||
<div>
|
renderItem={(item) => {
|
||||||
<List.Item
|
return (
|
||||||
key={item.id}
|
<div>
|
||||||
style={{
|
<List.Item
|
||||||
backgroundColor: "#ffffff",
|
key={item.id}
|
||||||
paddingTop: 0,
|
style={{
|
||||||
paddingBottom: 0,
|
backgroundColor: "#ffffff",
|
||||||
display: "flex",
|
paddingTop: 0,
|
||||||
flexDirection: "row",
|
paddingBottom: 0,
|
||||||
alignItems: "center",
|
display: "flex",
|
||||||
justifyContent: "center",
|
flexDirection: "row",
|
||||||
}}
|
alignItems: "center",
|
||||||
>
|
justifyContent: "center",
|
||||||
<List.Item.Meta
|
}}
|
||||||
className={["cariparkir-container"].join(" ")}
|
>
|
||||||
title={item.name}
|
<List.Item.Meta
|
||||||
description={
|
className={["cariparkir-container"].join(" ")}
|
||||||
<div style={{}}>
|
title={item.name}
|
||||||
<Image src={item.picture} preview={false}/>
|
description={
|
||||||
</div>
|
<div style={{}}>
|
||||||
}
|
<Image src={item.picture} preview={false}/>
|
||||||
/>
|
</div>
|
||||||
<div style={{marginRight: 16}}>
|
}
|
||||||
<p
|
/>
|
||||||
style={{
|
<div style={{marginRight: 16}}>
|
||||||
fontSize: 9,
|
<p
|
||||||
margin: 0,
|
style={{
|
||||||
}}
|
fontSize: 9,
|
||||||
>
|
margin: 0,
|
||||||
{item.amount}
|
}}
|
||||||
</p>
|
>
|
||||||
</div>
|
{item.amount}
|
||||||
</List.Item>
|
</p>
|
||||||
<Divider plain style={{margin: 0}}/>
|
</div>
|
||||||
|
</List.Item>
|
||||||
|
<Divider plain style={{margin: 0}}/>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}}
|
}}
|
||||||
|
@ -254,19 +238,6 @@ export const Payback = observer(() => {
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</Card>
|
</Card>
|
||||||
|
|
||||||
{/* <PaybackModal
|
|
||||||
visible={visibleModal}
|
|
||||||
confirmLoading={confirmLoading}
|
|
||||||
initialData={initialData}
|
|
||||||
onCreate={async (data) => {
|
|
||||||
await onSubmit(data);
|
|
||||||
}}
|
|
||||||
onCancel={() => {
|
|
||||||
setInitialData({});
|
|
||||||
setVisibleModal(false);
|
|
||||||
}}
|
|
||||||
/> */}
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,25 +1,8 @@
|
||||||
import React, {useState, useEffect, useContext} from "react";
|
import React, {useContext, useEffect, useState} from "react";
|
||||||
import {
|
import {Button, Card, Col, Divider, Image, Input, List, message, Row, Table,} from "antd";
|
||||||
Button,
|
|
||||||
Card,
|
|
||||||
Col,
|
|
||||||
Divider,
|
|
||||||
Image,
|
|
||||||
Input,
|
|
||||||
List,
|
|
||||||
message,
|
|
||||||
Row,
|
|
||||||
Space,
|
|
||||||
Table,
|
|
||||||
} from "antd";
|
|
||||||
import {useStore} from "../../utils/useStore";
|
import {useStore} from "../../utils/useStore";
|
||||||
import {observer} from "mobx-react-lite";
|
import {observer} from "mobx-react-lite";
|
||||||
import {
|
import {FilterOutlined, PlusSquareOutlined,} from "@ant-design/icons";
|
||||||
CheckCircleOutlined,
|
|
||||||
CloseOutlined,
|
|
||||||
FilterOutlined,
|
|
||||||
PlusSquareOutlined,
|
|
||||||
} from "@ant-design/icons";
|
|
||||||
import {PaybackModal} from "./PaybackModal";
|
import {PaybackModal} from "./PaybackModal";
|
||||||
import {BreadcumbComponent} from "../../component/BreadcumbComponent";
|
import {BreadcumbComponent} from "../../component/BreadcumbComponent";
|
||||||
import {LINKS} from "../../routes/app";
|
import {LINKS} from "../../routes/app";
|
||||||
|
@ -37,11 +20,16 @@ export const PaybackFromUser = observer(() => {
|
||||||
const init = async () => {
|
const init = async () => {
|
||||||
try {
|
try {
|
||||||
modalLoader.setLoading(true);
|
modalLoader.setLoading(true);
|
||||||
await store.payback.getData();
|
await store.payback.getDataUser();
|
||||||
await store.authentication.getProfile();
|
await store.authentication.getProfile();
|
||||||
modalLoader.setLoading(false);
|
modalLoader.setLoading(false);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
modalLoader.setLoading(false);
|
modalLoader.setLoading(false);
|
||||||
|
if (e.response?.body?.message) {
|
||||||
|
message.error(e.response.body.message);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
message.error(e.message);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -68,76 +56,6 @@ export const PaybackFromUser = observer(() => {
|
||||||
dataIndex: "amount",
|
dataIndex: "amount",
|
||||||
key: "amount",
|
key: "amount",
|
||||||
},
|
},
|
||||||
{
|
|
||||||
title: "Action",
|
|
||||||
dataIndex: "amount",
|
|
||||||
key: "action",
|
|
||||||
render: (text, record) => (
|
|
||||||
<Space size="middle">
|
|
||||||
<Button
|
|
||||||
onClick={async () => {
|
|
||||||
await handleAction(record, "accept");
|
|
||||||
}}
|
|
||||||
icon={<CheckCircleOutlined/>}
|
|
||||||
style={{
|
|
||||||
backgroundColor: "#1bb91d",
|
|
||||||
color: "#fff",
|
|
||||||
borderColor: "#1bb91d",
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
Accept
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
onClick={async () => {
|
|
||||||
await handleAction(record, "reject");
|
|
||||||
}}
|
|
||||||
icon={<CloseOutlined/>}
|
|
||||||
style={{
|
|
||||||
backgroundColor: "#ff1c1c",
|
|
||||||
color: "#fff",
|
|
||||||
borderColor: "#ff1c1c",
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
Reject
|
|
||||||
</Button>
|
|
||||||
</Space>
|
|
||||||
),
|
|
||||||
},
|
|
||||||
// {
|
|
||||||
// title: "Action",
|
|
||||||
// key: "action",
|
|
||||||
// width: 100,
|
|
||||||
// render: (text, record) => (
|
|
||||||
// <Space size="middle">
|
|
||||||
// <Button
|
|
||||||
// onClick={async () => {
|
|
||||||
// await handleAction(record, "accept");
|
|
||||||
// }}
|
|
||||||
// icon={<CheckCircleOutlined />}
|
|
||||||
// style={{
|
|
||||||
// backgroundColor: "#1bb91d",
|
|
||||||
// color: "#fff",
|
|
||||||
// borderColor: "#1bb91d",
|
|
||||||
// }}
|
|
||||||
// >
|
|
||||||
// Accept
|
|
||||||
// </Button>
|
|
||||||
// <Button
|
|
||||||
// onClick={async () => {
|
|
||||||
// await handleAction(record, "reject");
|
|
||||||
// }}
|
|
||||||
// icon={<CloseOutlined />}
|
|
||||||
// style={{
|
|
||||||
// backgroundColor: "#ff1c1c",
|
|
||||||
// color: "#fff",
|
|
||||||
// borderColor: "#ff1c1c",
|
|
||||||
// }}
|
|
||||||
// >
|
|
||||||
// Reject
|
|
||||||
// </Button>
|
|
||||||
// </Space>
|
|
||||||
// ),
|
|
||||||
// },
|
|
||||||
];
|
];
|
||||||
|
|
||||||
const routeData = [
|
const routeData = [
|
||||||
|
@ -203,26 +121,26 @@ export const PaybackFromUser = observer(() => {
|
||||||
</Row>
|
</Row>
|
||||||
{store.ui.mediaQuery.isDesktop && (
|
{store.ui.mediaQuery.isDesktop && (
|
||||||
<Table
|
<Table
|
||||||
key="1"
|
key="1"
|
||||||
hasEmpty
|
hasEmpty
|
||||||
columns={columns}
|
columns={columns}
|
||||||
dataSource={store.payback.data}
|
dataSource={store.payback.dataPaybackUser}
|
||||||
bordered
|
bordered
|
||||||
pagination={{
|
pagination={{
|
||||||
pageSize: store.payback.pageSize,
|
pageSize: store.payback.pageSizePaybackUser,
|
||||||
total: store.payback.total_data,
|
total: store.payback.total_dataPaybackUser,
|
||||||
current: store.payback.page + 1,
|
current: store.payback.pageSizePaybackUser + 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.pageSizePaybackUser = page.pageSize;
|
||||||
store.payback.page = pageNumber - 1;
|
store.payback.pageSizePaybackUser = pageNumber - 1;
|
||||||
modalLoader.setLoading(true);
|
modalLoader.setLoading(true);
|
||||||
await store.payback.getData();
|
await store.payback.getDataUser();
|
||||||
modalLoader.setLoading(false);
|
modalLoader.setLoading(false);
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
@ -232,18 +150,18 @@ export const PaybackFromUser = observer(() => {
|
||||||
position={"top"}
|
position={"top"}
|
||||||
pagination={{
|
pagination={{
|
||||||
onChange: async (page) => {
|
onChange: async (page) => {
|
||||||
store.payback.pageSize = page.pageSize;
|
store.payback.pageSizePaybackUser = page.pageSize;
|
||||||
store.payback.page = page.current;
|
store.payback.pageSizePaybackUser = page.current;
|
||||||
modalLoader.setLoading(true);
|
modalLoader.setLoading(true);
|
||||||
await store.payback.getData();
|
await store.payback.getDataUser();
|
||||||
modalLoader.setLoading(false);
|
modalLoader.setLoading(false);
|
||||||
},
|
},
|
||||||
pageSize: store.payback.pageSize,
|
pageSize: store.payback.pageSizePaybackUser,
|
||||||
total: store.payback.total_data,
|
total: store.payback.total_dataPaybackUser,
|
||||||
current: store.payback.page,
|
current: store.payback.pageSizePaybackUser,
|
||||||
style: {marginBottom: "1rem", marginRight: "1rem"},
|
style: {marginBottom: "1rem", marginRight: "1rem"},
|
||||||
}}
|
}}
|
||||||
dataSource={store.payback.data}
|
dataSource={store.payback.dataPaybackUser}
|
||||||
style={{padding: 0}}
|
style={{padding: 0}}
|
||||||
renderItem={(item) => {
|
renderItem={(item) => {
|
||||||
return (
|
return (
|
||||||
|
|
|
@ -85,8 +85,11 @@ export const PaybackModal = ({visible, onCreate, onCancel, initialData}) => {
|
||||||
await store.payback.getData();
|
await store.payback.getData();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
modalLoader.setLoading(false);
|
modalLoader.setLoading(false);
|
||||||
console.log(e, "apa errornya");
|
if (e.response?.body?.message) {
|
||||||
message.error("Failed Add Member");
|
message.error(e.response.body.message);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
message.error(e.message);
|
||||||
}
|
}
|
||||||
form.resetFields();
|
form.resetFields();
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import React, {useContext, useEffect, useState} from "react";
|
import React, {useContext, useEffect, useState} from "react";
|
||||||
import {Button, Card, Col, Input, Row, Tabs} from "antd";
|
import {Button, Card, Col, Input, Row, Tabs,message} from "antd";
|
||||||
import {FilterOutlined, PlusSquareOutlined} from "@ant-design/icons";
|
import {FilterOutlined, PlusSquareOutlined} from "@ant-design/icons";
|
||||||
import {BreadcumbComponent} from "../../component/BreadcumbComponent";
|
import {BreadcumbComponent} from "../../component/BreadcumbComponent";
|
||||||
import {useStore} from "../../utils/useStore";
|
import {useStore} from "../../utils/useStore";
|
||||||
|
@ -23,6 +23,11 @@ export const Category = observer(() => {
|
||||||
modalLoader.setLoading(false);
|
modalLoader.setLoading(false);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
modalLoader.setLoading(false);
|
modalLoader.setLoading(false);
|
||||||
|
if (e.response?.body?.message) {
|
||||||
|
message.error(e.response.body.message);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
message.error(e.message);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import React, {useContext, useEffect} from "react";
|
import React, {useContext, useEffect} from "react";
|
||||||
import {Button, Card, Col, Input, Row, Upload} from "antd";
|
import {Button, Card, Col, Input, Row, Upload,message} from "antd";
|
||||||
import {FilterOutlined, PlusSquareOutlined, UploadOutlined,} from "@ant-design/icons";
|
import {FilterOutlined, PlusSquareOutlined, UploadOutlined,} from "@ant-design/icons";
|
||||||
import {BreadcumbComponent} from "../../component/BreadcumbComponent";
|
import {BreadcumbComponent} from "../../component/BreadcumbComponent";
|
||||||
import {useStore} from "../../utils/useStore";
|
import {useStore} from "../../utils/useStore";
|
||||||
|
@ -27,6 +27,11 @@ export const Product = observer(() => {
|
||||||
modalLoader.setLoading(false);
|
modalLoader.setLoading(false);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
modalLoader.setLoading(false);
|
modalLoader.setLoading(false);
|
||||||
|
if (e.response?.body?.message) {
|
||||||
|
message.error(e.response.body.message);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
message.error(e.message);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import React, {useContext, useEffect, useState} from "react";
|
import React, {useContext, useEffect, useState} from "react";
|
||||||
import {Button, Card, Col, Input, Row} from "antd";
|
import {Button, Card, Col, Input, Row,message} from "antd";
|
||||||
import {PlusSquareOutlined} from "@ant-design/icons";
|
import {PlusSquareOutlined} from "@ant-design/icons";
|
||||||
import {BreadcumbComponent} from "../../component/BreadcumbComponent";
|
import {BreadcumbComponent} from "../../component/BreadcumbComponent";
|
||||||
import {useStore} from "../../utils/useStore";
|
import {useStore} from "../../utils/useStore";
|
||||||
|
@ -22,6 +22,11 @@ export const Subcategory = observer(() => {
|
||||||
modalLoader.setLoading(false);
|
modalLoader.setLoading(false);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
modalLoader.setLoading(false);
|
modalLoader.setLoading(false);
|
||||||
|
if (e.response?.body?.message) {
|
||||||
|
message.error(e.response.body.message);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
message.error(e.message);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -25,6 +25,11 @@ export const Product = observer(() => {
|
||||||
modalLoader.setLoading(false);
|
modalLoader.setLoading(false);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
modalLoader.setLoading(false);
|
modalLoader.setLoading(false);
|
||||||
|
if (e.response?.body?.message) {
|
||||||
|
message.error(e.response.body.message);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
message.error(e.message);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import React, {useContext, useEffect, useState} from "react";
|
import React, {useContext, useEffect, useState,message} from "react";
|
||||||
import {useStore} from "../../utils/useStore";
|
import {useStore} from "../../utils/useStore";
|
||||||
import {Card, Tabs} from "antd";
|
import {Card, Tabs} from "antd";
|
||||||
import {BreadcumbComponent} from "../../component/BreadcumbComponent";
|
import {BreadcumbComponent} from "../../component/BreadcumbComponent";
|
||||||
|
@ -23,6 +23,11 @@ export const Transaction = observer(() => {
|
||||||
modalLoader.setLoading(false);
|
modalLoader.setLoading(false);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
modalLoader.setLoading(false);
|
modalLoader.setLoading(false);
|
||||||
|
if (e.response?.body?.message) {
|
||||||
|
message.error(e.response.body.message);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
message.error(e.message);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -9,15 +9,10 @@ export class Payback {
|
||||||
filterCategory = null;
|
filterCategory = null;
|
||||||
visibleModalPayback = false;
|
visibleModalPayback = false;
|
||||||
|
|
||||||
pagePayback = 0;
|
pagePaybackUser = 0;
|
||||||
pageSizePayback = 10;
|
pageSizePaybackUser = 10;
|
||||||
dataPayback = [];
|
dataPaybackUser = [];
|
||||||
total_dataPayback = 0;
|
total_dataPaybackUser = 0;
|
||||||
|
|
||||||
pageSubPayback = 0;
|
|
||||||
pageSizeSubPayback = 10;
|
|
||||||
dataSubPayback = [];
|
|
||||||
total_dataPayback = 0;
|
|
||||||
|
|
||||||
constructor(ctx) {
|
constructor(ctx) {
|
||||||
this.ctx = ctx;
|
this.ctx = ctx;
|
||||||
|
@ -27,14 +22,12 @@ export class Payback {
|
||||||
async getData() {
|
async getData() {
|
||||||
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.page}&pageSize=${this.pageSize}`
|
||||||
);
|
);
|
||||||
//console.log(response)
|
this.data = response.body.data.map((item, idx) => {
|
||||||
this.data =
|
item.key = idx;
|
||||||
response.body.data.map((item, idx) => {
|
return item;
|
||||||
item.key = idx;
|
}) ?? [];
|
||||||
return item;
|
|
||||||
}) ?? [];
|
|
||||||
|
|
||||||
this.total_data = response.body.count ?? 0;
|
this.total_data = response.body.count ?? 0;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
@ -45,16 +38,14 @@ export class Payback {
|
||||||
async getDataUser() {
|
async getDataUser() {
|
||||||
try {
|
try {
|
||||||
const response = await http.get(
|
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.dataPaybackUser = response.body.data.map((item, idx) => {
|
||||||
this.data =
|
item.key = idx;
|
||||||
response.body.data.map((item, idx) => {
|
return item;
|
||||||
item.key = idx;
|
}) ?? [];
|
||||||
return item;
|
|
||||||
}) ?? [];
|
|
||||||
|
|
||||||
this.total_data = response.body.count ?? 0;
|
this.total_dataPaybackUser = response.body.count ?? 0;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error(e);
|
console.error(e);
|
||||||
}
|
}
|
||||||
|
@ -79,6 +70,7 @@ export class Payback {
|
||||||
console.error(e);
|
console.error(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async create(data) {
|
async create(data) {
|
||||||
try {
|
try {
|
||||||
console.log(data)
|
console.log(data)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user