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

Merge branch 'develop' into 'devops-staging'

Browse Source 
Develop

See merge request empatnusabangsa/ppob/ppob-frontend!3
This commit is contained in:
ilham dwi pratama 2021-12-21 07:24:45 +00:00
commit 5f502663fe
14 changed files with 226 additions and 302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pages/Config/Commission.js
View File

@ -1,5 +1,5 @@
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 { BreadcumbComponent } from "../../component/BreadcumbComponent";
import { useStore } from "../../utils/useStore";
@ -24,6 +24,11 @@ export const Commission = observer(() => {
modalLoader.setLoading(false);
} catch (e) {
modalLoader.setLoading(false);
if (e.response?.body?.message) {
message.error(e.response.body.message);
return;
}
message.error(e.message);
}
};

7
src/pages/Config/Partner.js
View File

@ -1,5 +1,5 @@
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 {BreadcumbComponent} from "../../component/BreadcumbComponent";
import {useStore} from "../../utils/useStore";
@ -22,6 +22,11 @@ export const Partner = observer(() => {
modalLoader.setLoading(false);
} catch (e) {
modalLoader.setLoading(false);
if (e.response?.body?.message) {
message.error(e.response.body.message);
return;
}
message.error(e.message);
}
};

5
src/pages/Config/Supplier.js
View File

@ -37,6 +37,11 @@ export const Supplier = observer(() => {
modalLoader.setLoading(false);
} catch (e) {
modalLoader.setLoading(false);
if (e.response?.body?.message) {
message.error(e.response.body.message);
return;
}
message.error(e.message);
}
};

9
src/pages/Login/Login.js
View File

@ -1,34 +1,29 @@
import React, {useContext} from "react";
import React from "react";
import {observer} from 'mobx-react-lite';
import {useStore} from "../../utils/useStore";
import {Button, Card, Col, Form, Input, message, Row, Typography} from 'antd';
import {useHistory} from "react-router-dom";
import {LINKS} from "../../routes/app";
import {ModalLoaderContext} from "../../utils/modal";
export const Login = observer(() => {
const store = useStore();
let history = useHistory();
const [form] = Form.useForm();
const modalLoader = useContext(ModalLoaderContext);
const handleLogin = async (params) => {
try {
modalLoader.setLoading(true);
await store.authentication.login({
username: params.username,
password: params.password,
});
modalLoader.setLoading(false);
history.push(LINKS.HOME);
} catch (e) {
modalLoader.setLoading(true);
if (e.response?.body?.message) {
message.error(e.response.body.message);
return;
}
message.error(e.message);
}
history.push(LINKS.HOME);
}
return (

5
src/pages/Membership/Membership.js
View File

@ -53,6 +53,11 @@ export const Membership = observer(() => {
} catch (e) {
console.error(e);
modalLoader.setLoading(false);
if (e.response?.body?.message) {
message.error(e.response.body.message);
return;
}
message.error(e.message);
}
};

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

@ -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,10 +17,15 @@ 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);
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 = [
{
title: "Name",
dataIndex: "name",
key: "name",
},
{
title: "Picture",
dataIndex: "image_prove",
@ -72,8 +54,8 @@ export const Payback = observer(() => {
},
{
title: "Action",
dataIndex: "amount",
key: "action",
width: 100,
render: (text, record) => (
<Space size="middle">
<Button
@ -123,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");
@ -176,21 +158,21 @@ export const Payback = observer(() => {
columns={columns}
dataSource={store.payback.data}
bordered
// pagination={{
// pageSize: store.membership.pageSize,
// total: store.membership.total_data,
// current: store.membership.page + 1,
// showSizeChanger: true,
// simple: false
// }}
// onChange={async (page) => {
// 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;
// }}
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);
}}
/>
)}
@ -198,17 +180,19 @@ export const Payback = observer(() => {
<List
itemLayout="horizontal"
position={"top"}
// pagination={{
// onChange: (page) => {
// 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"},
// }}
pagination={{
onChange: async (page) => {
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) => {
@ -254,19 +238,6 @@ export const Payback = observer(() => {
)}
</div>
</Card>
{/* <PaybackModal
visible={visibleModal}
confirmLoading={confirmLoading}
initialData={initialData}
onCreate={async (data) => {
await onSubmit(data);
}}
onCancel={() => {
setInitialData({});
setVisibleModal(false);
}}
/> */}
</div>
);
});

128
src/pages/Payback/PaybackFromUser.js
View File

@ -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,11 +20,16 @@ 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) {
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",
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 = [
@ -206,21 +124,21 @@ export const PaybackFromUser = observer(() => {
key="1"
hasEmpty
columns={columns}
dataSource={store.payback.data}
dataSource={store.payback.dataPaybackUser}
bordered
pagination={{
pageSize: store.payback.pageSize,
total: store.payback.total_data,
current: store.payback.page + 1,
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.pageSize = page.pageSize;
store.payback.page = pageNumber - 1;
store.payback.pageSizePaybackUser = page.pageSize;
store.payback.pageSizePaybackUser = pageNumber - 1;
modalLoader.setLoading(true);
await store.payback.getData();
await store.payback.getDataUser();
modalLoader.setLoading(false);
}}
/>
@ -232,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 (

7
src/pages/Payback/PaybackModal.js
View File

@ -85,8 +85,11 @@ export const PaybackModal = ({visible, onCreate, onCancel, initialData}) => {
await store.payback.getData();
} catch (e) {
modalLoader.setLoading(false);
console.log(e, "apa errornya");
message.error("Failed Add Member");
if (e.response?.body?.message) {
message.error(e.response.body.message);
return;
}
message.error(e.message);
}
form.resetFields();
};

7
src/pages/Product/Category.js
View File

@ -1,5 +1,5 @@
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 {BreadcumbComponent} from "../../component/BreadcumbComponent";
import {useStore} from "../../utils/useStore";
@ -23,6 +23,11 @@ export const Category = observer(() => {
modalLoader.setLoading(false);
} catch (e) {
modalLoader.setLoading(false);
if (e.response?.body?.message) {
message.error(e.response.body.message);
return;
}
message.error(e.message);
}
};

7
src/pages/Product/Product.js
View File

@ -1,5 +1,5 @@
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 {BreadcumbComponent} from "../../component/BreadcumbComponent";
import {useStore} from "../../utils/useStore";
@ -27,6 +27,11 @@ export const Product = observer(() => {
modalLoader.setLoading(false);
} catch (e) {
modalLoader.setLoading(false);
if (e.response?.body?.message) {
message.error(e.response.body.message);
return;
}
message.error(e.message);
}
};

7
src/pages/Product/Subcategory.js
View File

@ -1,5 +1,5 @@
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 {BreadcumbComponent} from "../../component/BreadcumbComponent";
import {useStore} from "../../utils/useStore";
@ -22,6 +22,11 @@ export const Subcategory = observer(() => {
modalLoader.setLoading(false);
} catch (e) {
modalLoader.setLoading(false);
if (e.response?.body?.message) {
message.error(e.response.body.message);
return;
}
message.error(e.message);
}
};

5
src/pages/Transaction/Product.js
View File

@ -25,6 +25,11 @@ export const Product = observer(() => {
modalLoader.setLoading(false);
} catch (e) {
modalLoader.setLoading(false);
if (e.response?.body?.message) {
message.error(e.response.body.message);
return;
}
message.error(e.message);
}
};

7
src/pages/Transaction/Transaction.js
View File

@ -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 {Card, Tabs} from "antd";
import {BreadcumbComponent} from "../../component/BreadcumbComponent";
@ -23,6 +23,11 @@ export const Transaction = observer(() => {
modalLoader.setLoading(false);
} catch (e) {
modalLoader.setLoading(false);
if (e.response?.body?.message) {
message.error(e.response.body.message);
return;
}
message.error(e.message);
}
};

26
src/store/payback.js
View File

@ -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;
@ -29,9 +24,7 @@ export class Payback {
const response = await http.get(
`/transaction/deposit-return?page=${this.page}&pageSize=${this.pageSize}`
);
//console.log(response)
this.data =
response.body.data.map((item, idx) => {
this.data = response.body.data.map((item, idx) => {
item.key = idx;
return item;
}) ?? [];
@ -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) => {
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)