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!2
This commit is contained in:
Hasta Ragil Saputra 2021-12-21 04:03:45 +00:00
commit 9b59ef55ed
25 changed files with 1182 additions and 1154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/component/CategoryComponent.js
View File

@ -1,18 +1,17 @@
import React, {useState} from "react"; import React, {useContext, useState} from "react";
import {Button, Form, Input, message, Modal, Select, Space, Table,} from "antd"; import {Button, Form, Input, message, Modal, Select, Space, Table,} from "antd";
import {observer} from "mobx-react-lite"; import {observer} from "mobx-react-lite";
import {useHistory} from "react-router-dom"; import {useHistory} from "react-router-dom";
import {useStore} from "../utils/useStore"; import {useStore} from "../utils/useStore";
import {LINKS} from "../routes/app"; import {LINKS} from "../routes/app";
import {ModalLoaderContext} from "../utils/modal";
export const CategoryComponent = observer((props) => { export const CategoryComponent = observer((props) => {
const store = useStore(); const store = useStore();
const [form] = Form.useForm(); const [form] = Form.useForm();
const {Option} = Select;
const history = useHistory(); const history = useHistory();
const [idData, setIdData] = useState(""); const [idData, setIdData] = useState("");
const [confirmLoading, setConfirmLoading] = useState(false); const modalLoader = useContext(ModalLoaderContext);
const [isLoading, setIsLoading] = useState(false);
const handleEditButton = (data) => { const handleEditButton = (data) => {
console.log(data, "isi data"); console.log(data, "isi data");
@ -75,7 +74,9 @@ export const CategoryComponent = observer((props) => {
const deleteData = async (id) => { const deleteData = async (id) => {
try { try {
console.log(id); console.log(id);
modalLoader.setLoading(true);
await store.category.delete(id); await store.category.delete(id);
modalLoader.setLoading(true);
message.success("Data Berhasil Dihapus"); message.success("Data Berhasil Dihapus");
history.push(LINKS.PRODUCT); history.push(LINKS.PRODUCT);
} catch (err) { } catch (err) {
@ -92,19 +93,19 @@ export const CategoryComponent = observer((props) => {
const handleSubmit = async (data) => { const handleSubmit = async (data) => {
console.log(data, "isi data2"); console.log(data, "isi data2");
if (idData !== "") { if (idData !== "") {
setConfirmLoading(true); modalLoader.setLoading(true);
try { try {
await store.category.update(idData, data); await store.category.update(idData, data);
message.success("Success Update Data Category"); message.success("Success Update Data Category");
} catch (e) { } catch (e) {
message.error("Failed Update Data Category"); message.error("Failed Update Data Category");
} }
setConfirmLoading(false); modalLoader.setLoading(false);
store.category.visibleModalCategory = false; store.category.visibleModalCategory = false;
setIdData(""); setIdData("");
form.resetFields(); form.resetFields();
} else { } else {
setConfirmLoading(true); modalLoader.setLoading(true);
try { try {
await store.category.create(data); await store.category.create(data);
message.success("Success Add New Category"); message.success("Success Add New Category");
@ -112,7 +113,7 @@ export const CategoryComponent = observer((props) => {
console.log(e, "apa errornya"); console.log(e, "apa errornya");
message.error("Failed Add Category"); message.error("Failed Add Category");
} }
setConfirmLoading(false); modalLoader.setLoading(false);
store.category.visibleModalCategory = false; store.category.visibleModalCategory = false;
setIdData(""); setIdData("");
form.resetFields(); form.resetFields();
@ -122,7 +123,7 @@ export const CategoryComponent = observer((props) => {
return ( return (
<div> <div>
<Table <Table
style={{ textAlign: "center" }} style={{textAlign: "center"}}
columns={columns} columns={columns}
dataSource={store.category.data} dataSource={store.category.data}
bordered bordered
@ -137,9 +138,9 @@ export const CategoryComponent = observer((props) => {
let pageNumber = page.current; let pageNumber = page.current;
store.category.pageSize = page.pageSize; store.category.pageSize = page.pageSize;
store.category.page = pageNumber - 1; store.category.page = pageNumber - 1;
// store.membership.isLoading = true; modalLoader.setLoading(true);
await store.category.getData(); await store.category.getData();
// store.membership.isLoading = false; modalLoader.setLoading(false);
}} }}
/> />
@ -169,16 +170,16 @@ export const CategoryComponent = observer((props) => {
<Form.Item <Form.Item
name="code" name="code"
label="Code" label="Code"
rules={[{ required: true, message: "Please input name code!" }]} rules={[{required: true, message: "Please input name code!"}]}
> >
<Input /> <Input/>
</Form.Item> </Form.Item>
<Form.Item <Form.Item
name="name" name="name"
label="Name" label="Name"
rules={[{ required: true, message: "Please input name category!" }]} rules={[{required: true, message: "Please input name category!"}]}
> >
<Input /> <Input/>
</Form.Item> </Form.Item>
</Form> </Form>
</Modal> </Modal>

47
src/component/CommissionComponent.js
View File

@ -1,32 +1,17 @@
import React, {useEffect, useState} from "react"; import React, {useContext, useEffect, useState} from "react";
import {Button, Form, Input, message, Modal, Select, Space, Table,} from "antd"; import {Button, Form, Input, message, Modal, Select, Space, Table,} from "antd";
import {observer} from "mobx-react-lite"; import {observer} from "mobx-react-lite";
import {useHistory} from "react-router-dom"; import {useHistory} from "react-router-dom";
import {useStore} from "../utils/useStore"; import {useStore} from "../utils/useStore";
import {LINKS} from "../routes/app"; import {LINKS} from "../routes/app";
import {ModalLoaderContext} from "../utils/modal";
export const CommissionComponent = observer((props) => { export const CommissionComponent = observer((props) => {
const store = useStore(); const store = useStore();
const [form] = Form.useForm(); const [form] = Form.useForm();
const {Option} = Select;
const history = useHistory(); const history = useHistory();
const [idData, setIdData] = useState(""); const [idData, setIdData] = useState("");
const [confirmLoading, setConfirmLoading] = useState(false); const modalLoader = useContext(ModalLoaderContext);
const [isLoading, setIsLoading] = useState(false);
useEffect(() => {
const init = async () => {
try {
setIsLoading(true);
//await store.product.getDataSubCategories();
setIsLoading(false);
} catch (e) {
setIsLoading(false);
}
};
init();
}, []);
const handleEditButton = (data) => { const handleEditButton = (data) => {
console.log(data, "isi data"); console.log(data, "isi data");
@ -59,32 +44,20 @@ export const CommissionComponent = observer((props) => {
}, },
]; ];
const deleteData = async (id) => {
try {
console.log(id);
await store.commission.delete(id);
message.success("Data Berhasil Dihapus");
history.push(LINKS.PRODUCT);
} catch (err) {
console.log("error", err);
message.error("Gagal menghapus");
}
};
const handleCancel = () => { const handleCancel = () => {
setIdData(""); setIdData("");
store.commission.visibleModalCommission = false; store.commission.visibleModalCommission = false;
}; };
const handleSubmit = async (data) => { const handleSubmit = async (data) => {
setConfirmLoading(true); modalLoader.setLoading(true);
try { try {
await store.commission.update(idData, data); await store.commission.update(idData, data);
message.success("Success Update Data Member"); message.success("Success Update Data Member");
} catch (e) { } catch (e) {
message.error("Failed Update Data Member"); message.error("Failed Update Data Member");
} }
setConfirmLoading(false); modalLoader.setLoading(false);
store.commission.visibleModalCommission = false; store.commission.visibleModalCommission = false;
setIdData(""); setIdData("");
form.resetFields(); form.resetFields();
@ -93,7 +66,7 @@ export const CommissionComponent = observer((props) => {
return ( return (
<div> <div>
<Table <Table
style={{ textAlign: "center" }} style={{textAlign: "center"}}
columns={columns} columns={columns}
dataSource={store.commission.data} dataSource={store.commission.data}
bordered bordered
@ -108,9 +81,9 @@ export const CommissionComponent = observer((props) => {
let pageNumber = page.current; let pageNumber = page.current;
store.commission.pageSize = page.pageSize; store.commission.pageSize = page.pageSize;
store.commission.page = pageNumber - 1; store.commission.page = pageNumber - 1;
// store.membership.isLoading = true; modalLoader.setLoading(true);
await store.commission.getData(); await store.commission.getData();
// store.membership.isLoading = false; modalLoader.setLoading(false);
}} }}
/> />
@ -140,9 +113,9 @@ export const CommissionComponent = observer((props) => {
<Form.Item <Form.Item
name="value" name="value"
label="Commission" label="Commission"
rules={[{ required: true, message: "Please input commission!" }]} rules={[{required: true, message: "Please input commission!"}]}
> >
<Input /> <Input/>
</Form.Item> </Form.Item>
</Form> </Form>
</Modal> </Modal>

82
src/component/PartnerComponent.js
View File

@ -1,41 +1,27 @@
import React, {useEffect, useState} from "react"; import React, {useContext, useEffect, useState} from "react";
import {Button, Form, Input, message, Modal, Select, Space, Table, Tag,} from "antd"; import {Button, Form, Input, message, Modal, Select, Space, Table, Tag,} from "antd";
import {observer} from "mobx-react-lite"; import {observer} from "mobx-react-lite";
import {ExclamationCircleOutlined} from "@ant-design/icons"; import {ExclamationCircleOutlined} from "@ant-design/icons";
import {useHistory} from "react-router-dom"; import {useHistory} from "react-router-dom";
import {useStore} from "../utils/useStore"; import {useStore} from "../utils/useStore";
import {LINKS} from "../routes/app"; import {LINKS} from "../routes/app";
import {ModalLoaderContext} from "../utils/modal";
export const PartnerComponent = observer((props) => { export const PartnerComponent = observer((props) => {
const store = useStore(); const store = useStore();
const [form] = Form.useForm(); const [form] = Form.useForm();
const {Option} = Select;
const history = useHistory(); const history = useHistory();
const [idData, setIdData] = useState(""); const [idData, setIdData] = useState("");
const [isChangePassword, setIsChangePassword] = useState(false); const [isChangePassword, setIsChangePassword] = useState(false);
const [confirmLoading, setConfirmLoading] = useState(false); const modalLoader = useContext(ModalLoaderContext);
const [isLoading, setIsLoading] = useState(false);
useEffect(() => {
const init = async () => {
try {
setIsLoading(true);
await store.partner.getData();
setIsLoading(false);
} catch (e) {
setIsLoading(false);
}
};
init();
}, []);
const changeStatus = async (id, isActive) => { const changeStatus = async (id, isActive) => {
const status = isActive ? "inactive" : "active"; const status = isActive ? "inactive" : "active";
const status2 = isActive ? "Inactivating" : "Activating"; const status2 = isActive ? "Inactivating" : "Activating";
modalLoader.setLoading(true);
try { try {
const response = await store.partner.changeStatus(id, status); const response = await store.partner.changeStatus(id, status);
modalLoader.setLoading(false);
response?.body?.statusCode === 201 response?.body?.statusCode === 201
? message.success(`Success ${status2} Partner`) ? message.success(`Success ${status2} Partner`)
: message.error(`Failed ${status2} Partner`); : message.error(`Failed ${status2} Partner`);
@ -92,7 +78,7 @@ export const PartnerComponent = observer((props) => {
render: (text, record) => ( render: (text, record) => (
<Tag <Tag
color={record?.status === true ? "processing" : "#E3E8EE"} color={record?.status === true ? "processing" : "#E3E8EE"}
style={{ color: "#4F566B", cursor: "pointer" }} style={{color: "#4F566B", cursor: "pointer"}}
> >
{record?.status === true ? " ACTIVE" : "INACTIVE"} {record?.status === true ? " ACTIVE" : "INACTIVE"}
</Tag> </Tag>
@ -121,8 +107,9 @@ export const PartnerComponent = observer((props) => {
const deleteData = async (id) => { const deleteData = async (id) => {
try { try {
console.log(id); modalLoader.setLoading(true);
await store.partner.delete(id); await store.partner.delete(id);
modalLoader.setLoading(false);
message.success("Data Berhasil Dihapus"); message.success("Data Berhasil Dihapus");
history.push(LINKS.PARTNER); history.push(LINKS.PARTNER);
} catch (err) { } catch (err) {
@ -134,7 +121,7 @@ export const PartnerComponent = observer((props) => {
const handleDelete = (id) => { const handleDelete = (id) => {
Modal.confirm({ Modal.confirm({
title: "Are you sure delete this record?", title: "Are you sure delete this record?",
icon: <ExclamationCircleOutlined />, icon: <ExclamationCircleOutlined/>,
okText: "Yes", okText: "Yes",
okType: "primary", okType: "primary",
cancelText: "Cancel", cancelText: "Cancel",
@ -155,9 +142,10 @@ export const PartnerComponent = observer((props) => {
const handleSubmit = async (data) => { const handleSubmit = async (data) => {
console.log(data, "isi data2"); console.log(data, "isi data2");
if (idData !== "") { if (idData !== "") {
setConfirmLoading(true); modalLoader.setLoading(true);
try { try {
await store.partner.update(idData, data); await store.partner.update(idData, data);
modalLoader.setLoading(false);
message.success( message.success(
isChangePassword isChangePassword
? "Failed Change Partner Password" ? "Failed Change Partner Password"
@ -165,27 +153,27 @@ export const PartnerComponent = observer((props) => {
); );
//await store.partner.getData() //await store.partner.getData()
} catch (e) { } catch (e) {
modalLoader.setLoading(true);
message.error( message.error(
isChangePassword isChangePassword
? "Failed Change Partner Password" ? "Failed Change Partner Password"
: "Failed Update Data Partner" : "Failed Update Data Partner"
); );
} }
setConfirmLoading(false);
store.partner.visibleModalPartner = false; store.partner.visibleModalPartner = false;
setIdData(""); setIdData("");
form.resetFields(); form.resetFields();
} else { } else {
setConfirmLoading(true); modalLoader.setLoading(true);
try { try {
await store.partner.create(data); await store.partner.create(data);
message.success("Success Add New Partner"); message.success("Success Add New Partner");
//await store.partner.getData() modalLoader.setLoading(false);
} catch (e) { } catch (e) {
console.log(e, "apa errornya"); console.log(e, "apa errornya");
message.error("Failed Add Partner"); message.error("Failed Add Partner");
} }
setConfirmLoading(false); modalLoader.setLoading(false);
store.partner.visibleModalPartner = false; store.partner.visibleModalPartner = false;
setIdData(""); setIdData("");
form.resetFields(); form.resetFields();
@ -194,7 +182,7 @@ export const PartnerComponent = observer((props) => {
return ( return (
<div> <div>
<Table <Table
style={{ textAlign: "center" }} style={{textAlign: "center"}}
columns={columns} columns={columns}
dataSource={store.partner.data} dataSource={store.partner.data}
bordered bordered
@ -209,9 +197,9 @@ export const PartnerComponent = observer((props) => {
let pageNumber = page.current; let pageNumber = page.current;
store.partner.pageSize = page.pageSize; store.partner.pageSize = page.pageSize;
store.partner.page = pageNumber - 1; store.partner.page = pageNumber - 1;
//store.membership.isLoading = true; modalLoader.setLoading(true);
await store.partner.getData(); await store.partner.getData();
// store.membership.isLoading = false; modalLoader.setLoading(false);
}} }}
/> />
@ -250,11 +238,11 @@ export const PartnerComponent = observer((props) => {
label="Name" label="Name"
rules={[ rules={[
idData idData
? { required: false } ? {required: false}
: { required: true, message: "Please input password name!" }, : {required: true, message: "Please input password name!"},
]} ]}
> >
<Input /> <Input/>
</Form.Item> </Form.Item>
)} )}
{!idData && ( {!idData && (
@ -263,11 +251,11 @@ export const PartnerComponent = observer((props) => {
label="Owner" label="Owner"
rules={[ rules={[
idData idData
? { required: false } ? {required: false}
: { required: true, message: "Please input password owner!" }, : {required: true, message: "Please input password owner!"},
]} ]}
> >
<Input /> <Input/>
</Form.Item> </Form.Item>
)} )}
{((idData && isChangePassword) || !idData) && ( {((idData && isChangePassword) || !idData) && (
@ -276,27 +264,27 @@ export const PartnerComponent = observer((props) => {
label="Password Account" label="Password Account"
rules={[ rules={[
idData idData
? { required: false } ? {required: false}
: { : {
required: true, required: true,
message: "Please input password account!", message: "Please input password account!",
}, },
]} ]}
> >
<Input /> <Input/>
</Form.Item> </Form.Item>
)} )}
{!idData && ( {!idData && (
<Form.Item <Form.Item
name="phone_number" name="phone_number"
label="Phone Number" label="Phone Number"
rules={[ rules={[
idData idData
? { required: false } ? {required: false}
: { required: true, message: "Please input password phone number!" }, : {required: true, message: "Please input password phone number!"},
]} ]}
> >
<Input /> <Input/>
</Form.Item> </Form.Item>
)} )}
{!isChangePassword && ( {!isChangePassword && (
@ -306,25 +294,25 @@ export const PartnerComponent = observer((props) => {
label="Npwp" label="Npwp"
rules={[ rules={[
idData idData
? { required: false } ? {required: false}
: { required: true, message: "Please input npwp!" }, : {required: true, message: "Please input npwp!"},
]} ]}
> >
<Input /> <Input/>
</Form.Item> </Form.Item>
<Form.Item <Form.Item
name="address" name="address"
label="Address" label="Address"
rules={[ rules={[
idData idData
? { required: false } ? {required: false}
: { : {
required: true, required: true,
message: "Please input address!", message: "Please input address!",
}, },
]} ]}
> >
<Input /> <Input/>
</Form.Item> </Form.Item>
</> </>
)} )}

28
src/component/ProductComponent.js
View File

@ -1,4 +1,4 @@
import React, {useState} from "react"; import React, {useContext, useState} from "react";
import {Button, Col, Form, Input, message, Modal, Row, Select, Table, Tag, Typography} from "antd"; import {Button, Col, Form, Input, message, Modal, Row, Select, Table, Tag, Typography} from "antd";
import {observer} from "mobx-react-lite"; import {observer} from "mobx-react-lite";
import {ExclamationCircleOutlined} from "@ant-design/icons"; import {ExclamationCircleOutlined} from "@ant-design/icons";
@ -6,6 +6,7 @@ import {useHistory} from "react-router-dom";
import {capitalize} from "lodash"; import {capitalize} from "lodash";
import {useStore} from "../utils/useStore"; import {useStore} from "../utils/useStore";
import {LINKS} from "../routes/app"; import {LINKS} from "../routes/app";
import {ModalLoaderContext} from "../utils/modal";
const {Title, Text} = Typography; const {Title, Text} = Typography;
@ -15,11 +16,10 @@ export const ProductComponent = observer((props) => {
const {Option} = Select; const {Option} = Select;
const history = useHistory(); const history = useHistory();
const [idData, setIdData] = useState(''); const [idData, setIdData] = useState('');
const [confirmLoading, setConfirmLoading] = useState(false);
const [isLoading, setIsLoading] = useState(false);
const [filterSupplier, setFilterSupplier] = useState(null); const [filterSupplier, setFilterSupplier] = useState(null);
const [filterCategories, setFilterCategories] = useState(null); const [filterCategories, setFilterCategories] = useState(null);
const [filterSubCategories, setFilterSubCategories] = useState(null); const [filterSubCategories, setFilterSubCategories] = useState(null);
const modalLoader = useContext(ModalLoaderContext);
const handleEditButton = (data) => { const handleEditButton = (data) => {
console.log(data, "isi data") console.log(data, "isi data")
@ -48,13 +48,13 @@ export const ProductComponent = observer((props) => {
}, },
{ {
title: "Harga Beli", title: "Harga Beli",
dataIndex: ["currentPrice","price"], dataIndex: ["currentPrice", "price"],
key: ["currentPrice","price"], key: ["currentPrice", "price"],
}, },
{ {
title: "Harga Jual", title: "Harga Jual",
dataIndex: ["currentPrice","mark_up_price"], dataIndex: ["currentPrice", "mark_up_price"],
key: ["currentPrice","mark_up_price"], key: ["currentPrice", "mark_up_price"],
}, },
// { // {
// title: "Gangguan", // title: "Gangguan",
@ -120,19 +120,19 @@ export const ProductComponent = observer((props) => {
const handleSubmit = async (data) => { const handleSubmit = async (data) => {
console.log(data, "isi data2") console.log(data, "isi data2")
if (idData !== '') { if (idData !== '') {
setConfirmLoading(true); modalLoader.setLoading(true);
try { try {
await store.product.update(idData, data) await store.product.update(idData, data)
message.success("Success Update Data Member") message.success("Success Update Data Member")
} catch (e) { } catch (e) {
message.error("Failed Update Data Member") message.error("Failed Update Data Member")
} }
setConfirmLoading(false); modalLoader.setLoading(false);
store.product.visibleModalProduct = false; store.product.visibleModalProduct = false;
setIdData(''); setIdData('');
form.resetFields(); form.resetFields();
} else { } else {
setConfirmLoading(true); modalLoader.setLoading(true);
try { try {
await store.product.create(data) await store.product.create(data)
message.success("Success Add New Member") message.success("Success Add New Member")
@ -140,7 +140,7 @@ export const ProductComponent = observer((props) => {
console.log(e, "apa errornya") console.log(e, "apa errornya")
message.error("Failed Add Member") message.error("Failed Add Member")
} }
setConfirmLoading(false); modalLoader.setLoading(false);
store.product.visibleModalProduct = false; store.product.visibleModalProduct = false;
setIdData(''); setIdData('');
form.resetFields(); form.resetFields();
@ -167,7 +167,9 @@ export const ProductComponent = observer((props) => {
const handleSubmitFilter = async () => { const handleSubmitFilter = async () => {
store.product.filterSupplier = filterSupplier; store.product.filterSupplier = filterSupplier;
store.product.filterSubCategory = filterSubCategories; store.product.filterSubCategory = filterSubCategories;
modalLoader.setLoading(true);
await store.product.getData(); await store.product.getData();
modalLoader.setLoading(false);
store.product.visibleModalFilterProduct = false; store.product.visibleModalFilterProduct = false;
}; };
@ -199,9 +201,9 @@ export const ProductComponent = observer((props) => {
let pageNumber = page.current; let pageNumber = page.current;
store.product.pageSize = page.pageSize; store.product.pageSize = page.pageSize;
store.product.page = pageNumber - 1; store.product.page = pageNumber - 1;
// store.membership.isLoading = true; modalLoader.setLoading(true);
await store.product.getData(); await store.product.getData();
// store.membership.isLoading = false; modalLoader.setLoading(false);
}} }}
/> />

35
src/component/Subcategory.js
View File

@ -1,17 +1,16 @@
import React, {useState} from "react"; import React, {useContext, useState} from "react";
import {Button, Form, Input, message, Modal, Select, Space, Table,} from "antd"; import {Button, Form, Input, message, Modal, Select, Space, Table,} from "antd";
import {observer} from "mobx-react-lite"; import {observer} from "mobx-react-lite";
import {useHistory} from "react-router-dom"; import {useHistory} from "react-router-dom";
import {useStore} from "../utils/useStore"; import {useStore} from "../utils/useStore";
import {ModalLoaderContext} from "../utils/modal";
export const SubcategoryComponent = observer((props) => { export const SubcategoryComponent = observer((props) => {
const store = useStore(); const store = useStore();
const [form] = Form.useForm(); const [form] = Form.useForm();
const {Option} = Select; const {Option} = Select;
const history = useHistory();
const [idData, setIdData] = useState(""); const [idData, setIdData] = useState("");
const [confirmLoading, setConfirmLoading] = useState(false); const modalLoader = useContext(ModalLoaderContext);
const [isLoading, setIsLoading] = useState(false);
const getData = async () => { const getData = async () => {
await store.category.getData(); await store.category.getData();
@ -64,7 +63,7 @@ export const SubcategoryComponent = observer((props) => {
const handleSubmit = async (data) => { const handleSubmit = async (data) => {
console.log(data, "isi data2"); console.log(data, "isi data2");
if (idData !== "") { if (idData !== "") {
setConfirmLoading(true); modalLoader.setLoading(true);
try { try {
await store.subcategory.update(idData, data); await store.subcategory.update(idData, data);
await getData(); await getData();
@ -72,12 +71,12 @@ export const SubcategoryComponent = observer((props) => {
} catch (e) { } catch (e) {
message.error("Failed Update Data Category"); message.error("Failed Update Data Category");
} }
setConfirmLoading(false); modalLoader.setLoading(false);
store.subcategory.visibleModalSubcategory = false; store.subcategory.visibleModalSubcategory = false;
setIdData(""); setIdData("");
form.resetFields(); form.resetFields();
} else { } else {
setConfirmLoading(true); modalLoader.setLoading(true);
try { try {
await store.subcategory.create(data); await store.subcategory.create(data);
await getData(); await getData();
@ -86,7 +85,7 @@ export const SubcategoryComponent = observer((props) => {
console.log(e, "apa errornya"); console.log(e, "apa errornya");
message.error("Failed Add Category"); message.error("Failed Add Category");
} }
setConfirmLoading(false); modalLoader.setLoading(false);
store.subcategory.visibleModalSubcategory = false; store.subcategory.visibleModalSubcategory = false;
setIdData(""); setIdData("");
form.resetFields(); form.resetFields();
@ -96,7 +95,7 @@ export const SubcategoryComponent = observer((props) => {
return ( return (
<div> <div>
<Table <Table
style={{ textAlign: "center" }} style={{textAlign: "center"}}
columns={columns} columns={columns}
dataSource={store.subcategory.data} dataSource={store.subcategory.data}
bordered bordered
@ -107,13 +106,13 @@ export const SubcategoryComponent = observer((props) => {
showSizeChanger: true, showSizeChanger: true,
simple: false, simple: false,
}} }}
onChange={(page) => { onChange={async (page) => {
let pageNumber = page.current; let pageNumber = page.current;
store.subcategory.pageSize = page.pageSize; store.subcategory.pageSize = page.pageSize;
store.subcategory.page = pageNumber - 1; store.subcategory.page = pageNumber - 1;
// store.membership.isLoading = true; modalLoader.setLoading(true);
getData(); await getData();
// store.membership.isLoading = false; modalLoader.setLoading(false);
}} }}
/> />
@ -145,24 +144,24 @@ export const SubcategoryComponent = observer((props) => {
name="code" name="code"
label="Code" label="Code"
rules={[ rules={[
{ required: true, message: "Please input code category!" }, {required: true, message: "Please input code category!"},
]} ]}
> >
<Input /> <Input/>
</Form.Item> </Form.Item>
)} )}
<Form.Item <Form.Item
name="name" name="name"
label="Name" label="Name"
rules={[{ required: true, message: "Please input name category!" }]} rules={[{required: true, message: "Please input name category!"}]}
> >
<Input /> <Input/>
</Form.Item> </Form.Item>
{!idData && ( {!idData && (
<Form.Item <Form.Item
name="categoryId" name="categoryId"
label="Categories" label="Categories"
rules={[{ required: true, message: "Please input category id!" }]} rules={[{required: true, message: "Please input category id!"}]}
> >
<Select placeholder="Select Category" allowClear> <Select placeholder="Select Category" allowClear>
{store.category.data.map((item) => ( {store.category.data.map((item) => (

37
src/component/SupplierComponent.js
View File

@ -1,4 +1,4 @@
import React, {useState} from "react"; import React, {useContext, useState} from "react";
import {Button, Form, Input, message, Modal, Space, Table, Tag} from "antd"; import {Button, Form, Input, message, Modal, Space, Table, Tag} from "antd";
import {observer} from "mobx-react-lite"; import {observer} from "mobx-react-lite";
import {ExclamationCircleOutlined} from "@ant-design/icons"; import {ExclamationCircleOutlined} from "@ant-design/icons";
@ -6,12 +6,14 @@ import {useHistory} from "react-router-dom";
import {useStore} from "../utils/useStore"; import {useStore} from "../utils/useStore";
import {LINKS} from "../routes/app"; import {LINKS} from "../routes/app";
import {TopupsaldoModal} from "./TopupsaldoModal"; import {TopupsaldoModal} from "./TopupsaldoModal";
import {ModalLoaderContext} from "../utils/modal";
export const SupplierComponent = observer((props) => { export const SupplierComponent = observer((props) => {
const store = useStore(); const store = useStore();
const [form] = Form.useForm(); const [form] = Form.useForm();
const history = useHistory(); const history = useHistory();
const [idData, setIdData] = useState(""); const [idData, setIdData] = useState("");
const modalLoader = useContext(ModalLoaderContext);
const handleEditButton = (data) => { const handleEditButton = (data) => {
console.log(data, "isi data"); console.log(data, "isi data");
@ -37,12 +39,14 @@ export const SupplierComponent = observer((props) => {
const status = isActive ? "inactive" : "active"; const status = isActive ? "inactive" : "active";
const status2 = isActive ? "Inactivating" : "Activating"; const status2 = isActive ? "Inactivating" : "Activating";
try { try {
modalLoader.setLoading(true);
const response = await store.supplier.changeStatus(id, status); const response = await store.supplier.changeStatus(id, status);
modalLoader.setLoading(false);
response?.body?.statusCode === 201 response?.body?.statusCode === 201
? message.success(`Success ${status2} Supplier`) ? message.success(`Success ${status2} Supplier`)
: message.error(`Failed ${status2} Supplier`); : message.error(`Failed ${status2} Supplier`);
} catch (err) { } catch (err) {
modalLoader.setLoading(false);
console.log("error", err); console.log("error", err);
message.error(`Failed ${status2} Supplier`); message.error(`Failed ${status2} Supplier`);
} }
@ -69,7 +73,7 @@ export const SupplierComponent = observer((props) => {
new Intl.NumberFormat("id-ID", { new Intl.NumberFormat("id-ID", {
style: "currency", style: "currency",
currency: "IDR", currency: "IDR",
}).format(text), }).format(text)
}, },
{ {
title: "Status", title: "Status",
@ -79,7 +83,7 @@ export const SupplierComponent = observer((props) => {
render: (text, record) => ( render: (text, record) => (
<Tag <Tag
color={record?.status === true ? "processing" : "#E3E8EE"} color={record?.status === true ? "processing" : "#E3E8EE"}
style={{ color: "#4F566B" }} style={{color: "#4F566B"}}
> >
{record?.status === true ? " ACTIVE" : "INACTIVE"} {record?.status === true ? " ACTIVE" : "INACTIVE"}
</Tag> </Tag>
@ -107,10 +111,13 @@ export const SupplierComponent = observer((props) => {
const deleteData = async (id) => { const deleteData = async (id) => {
try { try {
console.log(id); console.log(id);
modalLoader.setLoading(true);
await store.supplier.delete(id); await store.supplier.delete(id);
modalLoader.setLoading(false);
message.success("Data Berhasil Dihapus"); message.success("Data Berhasil Dihapus");
history.push(LINKS.PRODUCT); history.push(LINKS.PRODUCT);
} catch (err) { } catch (err) {
modalLoader.setLoading(false);
console.log("error", err); console.log("error", err);
message.error("Gagal menghapus"); message.error("Gagal menghapus");
} }
@ -119,7 +126,7 @@ export const SupplierComponent = observer((props) => {
const handleDelete = (id) => { const handleDelete = (id) => {
Modal.confirm({ Modal.confirm({
title: "Are you sure delete this record?", title: "Are you sure delete this record?",
icon: <ExclamationCircleOutlined />, icon: <ExclamationCircleOutlined/>,
okText: "Yes", okText: "Yes",
okType: "primary", okType: "primary",
cancelText: "Cancel", cancelText: "Cancel",
@ -141,18 +148,21 @@ export const SupplierComponent = observer((props) => {
console.log(data, "isi data2"); console.log(data, "isi data2");
if (idData !== "") { if (idData !== "") {
try { try {
modalLoader.setLoading(true);
await store.supplier.update(idData, data); await store.supplier.update(idData, data);
message.success("Success Update Data Member"); message.success("Success Update Data Member");
await store.supplier.getData();
} catch (e) { } catch (e) {
modalLoader.setLoading(false);
message.error("Failed Update Data Member"); message.error("Failed Update Data Member");
} }
modalLoader.setLoading(false);
store.supplier.visibleModalSupplier = false; store.supplier.visibleModalSupplier = false;
setIdData(""); setIdData("");
form.resetFields(); form.resetFields();
} else { } else {
try { try {
modalLoader.setLoading(true);
await store.supplier.create(data); await store.supplier.create(data);
message.success("Success Add New Member"); message.success("Success Add New Member");
} catch (e) { } catch (e) {
@ -160,6 +170,7 @@ export const SupplierComponent = observer((props) => {
message.error("Failed Add Member"); message.error("Failed Add Member");
} }
modalLoader.setLoading(false);
store.supplier.visibleModalSupplier = false; store.supplier.visibleModalSupplier = false;
setIdData(""); setIdData("");
form.resetFields(); form.resetFields();
@ -169,7 +180,7 @@ export const SupplierComponent = observer((props) => {
return ( return (
<div> <div>
<Table <Table
style={{ textAlign: "center" }} style={{textAlign: "center"}}
columns={columns} columns={columns}
dataSource={store.supplier.data} dataSource={store.supplier.data}
bordered bordered
@ -184,7 +195,9 @@ export const SupplierComponent = observer((props) => {
let pageNumber = page.current; let pageNumber = page.current;
store.supplier.pageSize = page.pageSize; store.supplier.pageSize = page.pageSize;
store.supplier.page = pageNumber - 1; store.supplier.page = pageNumber - 1;
modalLoader.setLoading(true);
await store.supplier.getData(); await store.supplier.getData();
modalLoader.setLoading(false);
}} }}
/> />
<Modal <Modal
@ -213,22 +226,22 @@ export const SupplierComponent = observer((props) => {
<Form.Item <Form.Item
name="name" name="name"
label="Name" label="Name"
rules={[{ required: true, message: "Please input name!" }]} rules={[{required: true, message: "Please input name!"}]}
> >
<Input /> <Input/>
</Form.Item> </Form.Item>
{!idData && ( {!idData && (
<Form.Item <Form.Item
name="code" name="code"
label="Kode" label="Kode"
rules={[{ required: true, message: "Please input kode!" }]} rules={[{required: true, message: "Please input kode!"}]}
> >
<Input /> <Input/>
</Form.Item> </Form.Item>
)} )}
</Form> </Form>
</Modal> </Modal>
<TopupsaldoModal code={store.supplier.code} /> <TopupsaldoModal code={store.supplier.code}/>
</div> </div>
); );
}); });

15
src/component/TopupsaldoModal.js
View File

@ -1,20 +1,21 @@
import React from "react"; import React, {useContext} from "react";
import {Form, Input, message, Modal} from "antd"; import {Form, Input, message, Modal} from "antd";
import {observer} from "mobx-react-lite"; import {observer} from "mobx-react-lite";
import {useStore} from "../utils/useStore"; import {useStore} from "../utils/useStore";
import {ModalLoaderContext} from "../utils/modal";
export const TopupsaldoModal = observer((props) => { export const TopupsaldoModal = observer((props) => {
const store = useStore(); const store = useStore();
const [form] = Form.useForm(); const [form] = Form.useForm();
const modalLoader = useContext(ModalLoaderContext);
const handleCancelTransaction = () => { const handleCancelTransaction = () => {
store.supplier.visibleModalTransaction = false; store.supplier.visibleModalTransaction = false;
}; };
const handleSubmitTransaction = async (data) => { const handleSubmitTransaction = async (data) => {
console.log(data, "isi data2");
try { try {
modalLoader.setLoading(true);
await store.supplier.createTransaction(data); await store.supplier.createTransaction(data);
message.success("Success Top Up"); message.success("Success Top Up");
} catch (e) { } catch (e) {
@ -22,9 +23,11 @@ export const TopupsaldoModal = observer((props) => {
message.error("Failed Top Up"); message.error("Failed Top Up");
} }
modalLoader.setLoading(false);
store.supplier.visibleModalTransaction = false; store.supplier.visibleModalTransaction = false;
form.resetFields(); form.resetFields();
}; };
return ( return (
<div> <div>
<Modal <Modal
@ -59,14 +62,14 @@ export const TopupsaldoModal = observer((props) => {
label="Supplier" label="Supplier"
rules={[{required: true, message: "Please input supplier!"}]} rules={[{required: true, message: "Please input supplier!"}]}
> >
<Input disabled={true} /> <Input disabled={true}/>
</Form.Item> </Form.Item>
<Form.Item <Form.Item
name="amount" name="amount"
label="Amount" label="Amount"
rules={[{ required: true, message: "Please input amount!" }]} rules={[{required: true, message: "Please input amount!"}]}
> >
<Input /> <Input/>
</Form.Item> </Form.Item>
</Form> </Form>
</Modal> </Modal>

18
src/pages/App/DesktopLayout.js
View File

@ -12,6 +12,8 @@ import {
FileSyncOutlined, FileSyncOutlined,
FileProtectOutlined, FileProtectOutlined,
ShoppingCartOutlined, ShoppingCartOutlined,
AlipayOutlined,
PayCircleOutlined
} from "@ant-design/icons"; } from "@ant-design/icons";
import { AppRoute, LINKS } from "../../routes/app"; import { AppRoute, LINKS } from "../../routes/app";
import { useStore } from "../../utils/useStore"; import { useStore } from "../../utils/useStore";
@ -202,12 +204,24 @@ export const DesktopLayout = observer(() => {
</Link> </Link>
</Menu.Item> </Menu.Item>
)} )}
<Menu.Item key="payback"> <SubMenu
key="payback-main"
icon={<ProfileOutlined />}
title="Payback"
>
<Menu.Item key="payback-to-user">
<Link to={LINKS.PAYBACK}> <Link to={LINKS.PAYBACK}>
<DatabaseOutlined /> <PayCircleOutlined />
<span>Payback To</span>
</Link>
</Menu.Item>
<Menu.Item key="payback-from-user">
<Link to={LINKS.PAYBACKFROMUSER}>
<AlipayOutlined />
<span>Payback</span> <span>Payback</span>
</Link> </Link>
</Menu.Item> </Menu.Item>
</SubMenu>
{store.authentication.userData.role !== "Admin" && ( {store.authentication.userData.role !== "Admin" && (
<Menu.Item key="profile"> <Menu.Item key="profile">
<Link to={LINKS.PROFILE}> <Link to={LINKS.PROFILE}>

10
src/pages/App/MenuList.js
View File

@ -14,6 +14,8 @@ import {
ProjectOutlined, ProjectOutlined,
ShoppingCartOutlined, ShoppingCartOutlined,
UserOutlined, UserOutlined,
AlipayOutlined,
PayCircleOutlined
} from "@ant-design/icons"; } from "@ant-design/icons";
import { observer } from "mobx-react-lite"; import { observer } from "mobx-react-lite";
import { useStore } from "../../utils/useStore"; import { useStore } from "../../utils/useStore";
@ -127,14 +129,14 @@ export const MenuList = observer((props) => {
<SubMenu key="payback-main" icon={<ProfileOutlined />} title="Payback"> <SubMenu key="payback-main" icon={<ProfileOutlined />} title="Payback">
<Menu.Item key="payback-to-user"> <Menu.Item key="payback-to-user">
<Link to={LINKS.PAYBACK}> <Link to={LINKS.PAYBACK}>
<DatabaseOutlined /> <PayCircleOutlined />
<span>Payback</span> <span>Payback To</span>
</Link> </Link>
</Menu.Item> </Menu.Item>
<Menu.Item key="payback-from-user"> <Menu.Item key="payback-from-user">
<Link to={LINKS.PAYBACKFROMUSER}> <Link to={LINKS.PAYBACKFROMUSER}>
<DatabaseOutlined /> <AlipayOutlined/>
<span>Payback User</span> <span>Payback</span>
</Link> </Link>
</Menu.Item> </Menu.Item>
</SubMenu> </SubMenu>

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

@ -1,4 +1,4 @@
import React, { 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 } 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";
@ -6,23 +6,24 @@ import { useStore } from "../../utils/useStore";
import { observer } from "mobx-react-lite"; import { observer } from "mobx-react-lite";
import { CommissionComponent } from "../../component/CommissionComponent"; import { CommissionComponent } from "../../component/CommissionComponent";
import { LINKS } from "../../routes/app"; import { LINKS } from "../../routes/app";
import {ModalLoaderContext} from "../../utils/modal";
const { TabPane } = Tabs; const { TabPane } = Tabs;
const { Search } = Input; const { Search } = Input;
export const Commission = observer(() => { export const Commission = observer(() => {
const [isLoading, setIsLoading] = useState(false);
const store = useStore(); const store = useStore();
const modalLoader = useContext(ModalLoaderContext);
useEffect(() => { useEffect(() => {
const init = async () => { const init = async () => {
try { try {
setIsLoading(true); modalLoader.setLoading(true);
//await store.commission.getDataCategories(); //await store.commission.getDataCategories();
await store.commission.getData(); await store.commission.getData();
setIsLoading(false); modalLoader.setLoading(false);
} catch (e) { } catch (e) {
setIsLoading(false); modalLoader.setLoading(false);
} }
}; };

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

@ -1,4 +1,4 @@
import React, {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} 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";
@ -6,34 +6,28 @@ import {useStore} from "../../utils/useStore";
import {observer} from "mobx-react-lite"; import {observer} from "mobx-react-lite";
import {PartnerComponent} from "../../component/PartnerComponent"; import {PartnerComponent} from "../../component/PartnerComponent";
import {LINKS} from "../../routes/app"; import {LINKS} from "../../routes/app";
import {ModalLoaderContext} from "../../utils/modal";
const {TabPane} = Tabs;
const {Search} = Input; const {Search} = Input;
export const Partner = observer(() => { export const Partner = observer(() => {
const [isLoading, setIsLoading] = useState(false);
const store = useStore(); const store = useStore();
const modalLoader = useContext(ModalLoaderContext);
useEffect(() => { useEffect(() => {
const init = async () => { const init = async () => {
try { try {
setIsLoading(true); modalLoader.setLoading(true);
//await store.partner.getDataCategories();
await store.partner.getData(); await store.partner.getData();
setIsLoading(false); modalLoader.setLoading(false);
} catch (e) { } catch (e) {
setIsLoading(false); modalLoader.setLoading(false);
} }
}; };
init(); init();
}, []); }, []);
// const handleChangeTabPane = async (key) => {
// store.partner.filterCategory = key;
// console.log(key);
// };
const routeData = [ const routeData = [
{ {
route: LINKS.HOME, route: LINKS.HOME,
@ -70,7 +64,7 @@ export const Partner = observer(() => {
</Button> </Button>
</Col> </Col>
</Row> </Row>
<PartnerComponent /> <PartnerComponent/>
</Card> </Card>
</div> </div>
); );

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

@ -1,4 +1,4 @@
import React, { useEffect, useState } from "react"; import React, {useContext, useEffect, useState} from "react";
import { import {
Button, Button,
Card, Card,
@ -21,26 +21,22 @@ import { useStore } from "../../utils/useStore";
import { observer } from "mobx-react-lite"; import { observer } from "mobx-react-lite";
import { SupplierComponent } from "../../component/SupplierComponent"; import { SupplierComponent } from "../../component/SupplierComponent";
import { LINKS } from "../../routes/app"; import { LINKS } from "../../routes/app";
import {ModalLoaderContext} from "../../utils/modal";
const { TabPane } = Tabs;
const { Search } = Input; const { Search } = Input;
const { Option } = Select;
export const Supplier = observer(() => { export const Supplier = observer(() => {
const [isLoading, setIsLoading] = useState(false);
const [confirmLoading, setConfirmLoading] = useState(false);
const [form] = Form.useForm();
const store = useStore(); const store = useStore();
const modalLoader = useContext(ModalLoaderContext);
useEffect(() => { useEffect(() => {
const init = async () => { const init = async () => {
try { try {
setIsLoading(true); modalLoader.setLoading(true);
//await store.supplier.getDataCategories();
await store.supplier.getData(); await store.supplier.getData();
setIsLoading(false); modalLoader.setLoading(false);
} catch (e) { } catch (e) {
setIsLoading(false); modalLoader.setLoading(false);
} }
}; };

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

@ -1,23 +1,28 @@
import React from "react"; import React, {useContext} 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); 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;

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

@ -1,4 +1,4 @@
import React, { useEffect, useState } from "react"; import React, {useContext, useEffect, useState} from "react";
import { import {
Button, Button,
Card, Card,
@ -15,20 +15,21 @@ import {
Form, Form,
Select, Select,
} from "antd"; } 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 {
ExclamationCircleOutlined, ExclamationCircleOutlined,
FilterOutlined, FilterOutlined,
PlusSquareOutlined, PlusSquareOutlined,
DownloadOutlined, DownloadOutlined,
} from "@ant-design/icons"; } from "@ant-design/icons";
import { MembershipModal } from "./MembershipModal"; import {MembershipModal} from "./MembershipModal";
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";
const { Search } = Input; const {Search} = Input;
const { Option } = Select; const {Option} = Select;
export const Membership = observer(() => { export const Membership = observer(() => {
const [form] = Form.useForm(); const [form] = Form.useForm();
const store = useStore(); const store = useStore();
@ -37,55 +38,57 @@ export const Membership = observer(() => {
const [destination, setDestination] = useState(null); const [destination, setDestination] = useState(null);
const [initialData, setInitialData] = useState({}); const [initialData, setInitialData] = useState({});
const [confirmLoading, setConfirmLoading] = useState(false); const [confirmLoading, setConfirmLoading] = useState(false);
const [isLoading, setIsLoading] = useState(false); const modalLoader = useContext(ModalLoaderContext);
useEffect(() => { useEffect(() => {
const init = async () => { const init = async () => {
try { try {
setIsLoading(true); modalLoader.setLoading(true);
const isAdmin = store.authentication.userData.role === "Admin"; const isAdmin = store.authentication.userData.role === "Admin";
await getData(); await getData();
await store.role.getData(isAdmin); await store.role.getData(isAdmin);
if (isAdmin) await store.supplier.getData(); await store.supplier.getData();
setIsLoading(false); modalLoader.setLoading(false);
} catch (e) { } catch (e) {
setIsLoading(false); console.error(e);
modalLoader.setLoading(false);
} }
}; };
init(); init();
}, []); }, []);
const getData = () => { const getData = async () => {
store.authentication.userData.role === "Admin" store.authentication.userData.role === "Admin"
? store.membership.getData() ? await store.membership.getData()
: store.membership.getDataBySuperior(); : await store.membership.getDataBySuperior();
}; };
const changeStatus = async (id, isActive) => { const changeStatus = async (id, isActive) => {
const status = isActive ? "inactive" : "active"; const status = isActive ? "inactive" : "active";
const status2 = isActive ? "Inactivating" : "Activating"; const status2 = isActive ? "Inactivating" : "Activating";
console.log(status);
try { try {
modalLoader.setLoading(true);
const response = await store.membership.changeStatus(id, status); const response = await store.membership.changeStatus(id, status);
modalLoader.setLoading(false);
response?.body?.statusCode === 201 response?.body?.statusCode === 201
? message.success(`Success ${status2} Membership`) ? message.success(`Success ${status2} Membership`)
: message.error(`Failed ${status2} Membership`); : message.error(`Failed ${status2} Membership`);
} catch (err) { } catch (err) {
console.log("error", err); modalLoader.setLoading(false);
message.error(`Failed ${status2} Membership`); message.error(`Failed ${status2} Membership`);
} }
}; };
const handleCancelTransaction = () => { const handleCancelTransaction = () => {
setIsVisibleTopUpModal(false); setIsVisibleTopUpModal(false);
setDestination(null); setDestination(null);
}; };
const handleSubmitTransaction = async (data) => { const handleSubmitTransaction = async (data) => {
setConfirmLoading(true); modalLoader.setLoading(true);
try { try {
data.destination = destination; data.destination = destination;
if (data.amount) { if (data.amount) {
@ -99,9 +102,11 @@ export const Membership = observer(() => {
? store.transaction.distributeAdmin(data) ? store.transaction.distributeAdmin(data)
: store.transaction.distribute(data); : store.transaction.distribute(data);
message.success("Success Top Up"); message.success("Success Top Up");
modalLoader.setLoading(false);
//await store.supplier.getData() //await store.supplier.getData()
} catch (e) { } catch (e) {
console.log(e, "apa errornya"); console.log(e, "apa errornya");
modalLoader.setLoading(false);
message.error("Failed Top Up"); message.error("Failed Top Up");
} }
setConfirmLoading(false); setConfirmLoading(false);
@ -117,16 +122,16 @@ export const Membership = observer(() => {
key: "name", key: "name",
render: (text, record) => record?.name ?? record?.username, render: (text, record) => record?.name ?? record?.username,
}, },
{
title: "Username",
dataIndex: "username",
key: "username",
},
{ {
title: "Role", title: "Role",
dataIndex: "roleName", dataIndex: "roleName",
key: "role", key: "role",
}, },
{
title: "Saldo",
dataIndex: ["coa", "amount"],
key: ["coa", "amount"],
},
{ {
title: "Status", title: "Status",
dataIndex: "isActive", dataIndex: "isActive",
@ -134,7 +139,7 @@ export const Membership = observer(() => {
render: (text, record) => ( render: (text, record) => (
<Tag <Tag
color={record?.isActive === true ? "processing" : "#E3E8EE"} color={record?.isActive === true ? "processing" : "#E3E8EE"}
style={{ color: "#4F566B" }} style={{color: "#4F566B"}}
> >
{record?.isActive === true ? " ACTIVE" : "INACTIVE"} {record?.isActive === true ? " ACTIVE" : "INACTIVE"}
</Tag> </Tag>
@ -158,7 +163,7 @@ export const Membership = observer(() => {
setIsVisibleTopUpModal(true); setIsVisibleTopUpModal(true);
}} }}
> >
<DownloadOutlined /> Top Up Saldo <DownloadOutlined/> Top Up Saldo
</Button> </Button>
<Button <Button
onClick={() => { onClick={() => {
@ -209,7 +214,7 @@ export const Membership = observer(() => {
}, },
{ {
route: "/app/membership", route: "/app/membership",
name: <span style={{ fontWeight: "bold" }}>Membership</span>, name: <span style={{fontWeight: "bold"}}>Membership</span>,
}, },
]; ];
@ -218,6 +223,7 @@ export const Membership = observer(() => {
if (initialData.id) { if (initialData.id) {
setConfirmLoading(true); setConfirmLoading(true);
modalLoader.setLoading(true);
try { try {
await store.membership.update(initialData.id, data); await store.membership.update(initialData.id, data);
message.success( message.success(
@ -226,7 +232,9 @@ export const Membership = observer(() => {
: "Success Update Data Member" : "Success Update Data Member"
); );
await getData(); await getData();
modalLoader.setLoading(false);
} catch (e) { } catch (e) {
modalLoader.setLoading(true);
message.error( message.error(
initialData.isChangePassword initialData.isChangePassword
? "Failed Update Member Password" ? "Failed Update Member Password"
@ -237,6 +245,7 @@ export const Membership = observer(() => {
setVisibleModal(false); setVisibleModal(false);
} else { } else {
setConfirmLoading(true); setConfirmLoading(true);
modalLoader.setLoading(true);
try { try {
await store.membership.create(data); await store.membership.create(data);
message.success("Success Add New Member"); message.success("Success Add New Member");
@ -245,6 +254,7 @@ export const Membership = observer(() => {
console.log(e, "apa errornya"); console.log(e, "apa errornya");
message.error("Failed Add Member"); message.error("Failed Add Member");
} }
modalLoader.setLoading(false);
setConfirmLoading(false); setConfirmLoading(false);
setVisibleModal(false); setVisibleModal(false);
setInitialData({}); setInitialData({});
@ -254,7 +264,7 @@ export const Membership = observer(() => {
const handleDelete = (record) => { const handleDelete = (record) => {
Modal.confirm({ Modal.confirm({
title: "Are you sure delete this record?", title: "Are you sure delete this record?",
icon: <ExclamationCircleOutlined />, icon: <ExclamationCircleOutlined/>,
okText: "Yes", okText: "Yes",
okType: "primary", okType: "primary",
cancelText: "Cancel", cancelText: "Cancel",
@ -276,17 +286,17 @@ export const Membership = observer(() => {
return ( return (
<div className={["ppob-container"].join(" ")}> <div className={["ppob-container"].join(" ")}>
<BreadcumbComponent data={routeData} /> <BreadcumbComponent data={routeData}/>
<Card> <Card>
<div> <div>
<Row style={{ marginBottom: 20 }}> <Row style={{marginBottom: 20}}>
<Col span={12}> <Col span={12}>
{/* <Button> {/* <Button>
<FilterOutlined /> <FilterOutlined />
Filter Filter
</Button> */} </Button> */}
</Col> </Col>
<Col span={12} style={{ textAlign: "right" }}> <Col span={12} style={{textAlign: "right"}}>
<Search <Search
placeholder="input search text" placeholder="input search text"
style={{ style={{
@ -301,7 +311,7 @@ export const Membership = observer(() => {
setVisibleModal(true); setVisibleModal(true);
}} }}
> >
<PlusSquareOutlined /> New <PlusSquareOutlined/> New
</Button> </Button>
</Col> </Col>
</Row> </Row>
@ -323,9 +333,9 @@ export const Membership = observer(() => {
let pageNumber = page.current; let pageNumber = page.current;
store.membership.pageSize = page.pageSize; store.membership.pageSize = page.pageSize;
store.membership.page = pageNumber - 1; store.membership.page = pageNumber - 1;
// store.membership.isLoading = true; modalLoader.setLoading(true);
await getData(); await getData();
// store.membership.isLoading = false; modalLoader.setLoading(false);
}} }}
/> />
)} )}
@ -335,18 +345,20 @@ export const Membership = observer(() => {
itemLayout="horizontal" itemLayout="horizontal"
position={"top"} position={"top"}
pagination={{ pagination={{
onChange: (page) => { onChange: async (page) => {
store.membership.pageSize = page.pageSize; store.membership.pageSize = page.pageSize;
store.membership.page = page.current; store.membership.page = page.current;
getData(); modalLoader.setLoading(true);
await getData();
modalLoader.setLoading(false);
}, },
pageSize: store.membership.pageSize, pageSize: store.membership.pageSize,
total: store.membership.total_data, total: store.membership.total_data,
current: store.membership.page, current: store.membership.page,
style: { marginBottom: "1rem", marginRight: "1rem" }, style: {marginBottom: "1rem", marginRight: "1rem"},
}} }}
dataSource={store.membership.data} dataSource={store.membership.data}
style={{ padding: 0 }} style={{padding: 0}}
renderItem={(item) => { renderItem={(item) => {
return ( return (
<div> <div>
@ -368,12 +380,12 @@ export const Membership = observer(() => {
description={ description={
<div style={{}}> <div style={{}}>
<p> <p>
<small>Username : {item.username}</small> <br /> <small>Username : {item.username}</small> <br/>
</p> </p>
</div> </div>
} }
/> />
<div style={{ marginRight: 16 }}> <div style={{marginRight: 16}}>
<p <p
style={{ style={{
fontSize: 9, fontSize: 9,
@ -384,7 +396,7 @@ export const Membership = observer(() => {
</p> </p>
</div> </div>
</List.Item> </List.Item>
<Divider plain style={{ margin: 0 }} /> <Divider plain style={{margin: 0}}/>
</div> </div>
); );
}} }}
@ -418,7 +430,7 @@ export const Membership = observer(() => {
<Form.Item <Form.Item
name="supplier" name="supplier"
label="Supplier" label="Supplier"
rules={[{ required: true, message: "Please input supplier!" }]} rules={[{required: true, message: "Please input supplier!"}]}
> >
<Select placeholder="Select Code Supplier" allowClear> <Select placeholder="Select Code Supplier" allowClear>
{store.supplier.data.map((item) => ( {store.supplier.data.map((item) => (
@ -431,9 +443,9 @@ export const Membership = observer(() => {
<Form.Item <Form.Item
name="amount" name="amount"
label="Amount" label="Amount"
rules={[{ required: true, message: "Please input amount!" }]} rules={[{required: true, message: "Please input amount!"}]}
> >
<Input /> <Input/>
</Form.Item> </Form.Item>
</Form> </Form>
</Modal> </Modal>

1
src/pages/Membership/MembershipModal.js
View File

@ -11,7 +11,6 @@ export const MembershipModal = ({
}) => { }) => {
const [form] = Form.useForm(); const [form] = Form.useForm();
const { Option } = Select; const { Option } = Select;
const dataStatus = ["true", "false"];
const store = useStore(); const store = useStore();
return ( return (

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

@ -1,4 +1,4 @@
import React, { useState ,useEffect} from "react"; import React, {useState, useEffect, useContext} from "react";
import { import {
Button, Button,
Card, Card,
@ -12,38 +12,33 @@ import {
Space, Space,
Table, Table,
} from "antd"; } 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, CheckCircleOutlined,
CloseOutlined, CloseOutlined,
FilterOutlined, FilterOutlined,
PlusSquareOutlined, PlusSquareOutlined,
} from "@ant-design/icons"; } 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";
import {ModalLoaderContext} from "../../utils/modal";
const { Search } = Input; const {Search} = Input;
export const Payback = observer(() => { export const Payback = observer(() => {
const store = useStore(); const store = useStore();
const [visibleModal, setVisibleModal] = useState(false); const modalLoader = useContext(ModalLoaderContext);
const [confirmLoading, setConfirmLoading] = useState(false);
const [initialData, setInitialData] = useState({});
//const [confirmLoading, setConfirmLoading] = useState(false);
const [isLoading, setIsLoading] = useState(false);
useEffect(() => { useEffect(() => {
const init = async () => { const init = async () => {
try { try {
setIsLoading(true); modalLoader.setLoading(true);
await store.payback.getDataUser(); await store.payback.getDataUser();
//await store.role.getData(); modalLoader.setLoading(false);
setIsLoading(false);
} catch (e) { } catch (e) {
setIsLoading(false); modalLoader.setLoading(false);
} }
}; };
@ -64,7 +59,7 @@ export const Payback = observer(() => {
render: (text, record) => ( render: (text, record) => (
<Image <Image
src={record.picture} src={record.picture}
style={{ width: 50, height: 50 }} style={{width: 50, height: 50}}
shape="circle" shape="circle"
alt="avatar" alt="avatar"
/> />
@ -85,7 +80,7 @@ export const Payback = observer(() => {
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",
@ -98,7 +93,7 @@ export const Payback = observer(() => {
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",
@ -112,7 +107,7 @@ export const Payback = observer(() => {
}, },
]; ];
if(store.authentication.userData.role === "Retail") columns.pop(); if (store.authentication.userData.role === "Retail") columns.pop();
const routeData = [ const routeData = [
{ {
@ -121,12 +116,12 @@ export const Payback = observer(() => {
}, },
{ {
route: LINKS.PAYBACK, route: LINKS.PAYBACK,
name: <span style={{ fontWeight: "bold" }}>Payback</span>, name: <span style={{fontWeight: "bold"}}>Payback</span>,
}, },
]; ];
const onSubmit = async (data) => { const onSubmit = async (data) => {
setConfirmLoading(true); modalLoader.setLoading(true);
try { try {
// await store.membership.create(data); // await store.membership.create(data);
// message.success("Success Add New Member"); // message.success("Success Add New Member");
@ -135,25 +130,25 @@ export const Payback = observer(() => {
console.error(e, "apa errornya"); console.error(e, "apa errornya");
message.error("Failed Add Member"); message.error("Failed Add Member");
} }
setConfirmLoading(false); modalLoader.setLoading(false);
setVisibleModal(false);
}; };
const handleAction = async (record, type) => {}; const handleAction = async (record, type) => {
};
return ( return (
<div className={["ppob-container"].join(" ")}> <div className={["ppob-container"].join(" ")}>
<BreadcumbComponent data={routeData} /> <BreadcumbComponent data={routeData}/>
<Card> <Card>
<div> <div>
<Row style={{ marginBottom: 20 }}> <Row style={{marginBottom: 20}}>
<Col span={12}> <Col span={12}>
<Button> <Button>
<FilterOutlined /> <FilterOutlined/>
Filter Filter
</Button> </Button>
</Col> </Col>
<Col span={12} style={{ textAlign: "right" }}> <Col span={12} style={{textAlign: "right"}}>
<Search <Search
placeholder="input search text" placeholder="input search text"
style={{ style={{
@ -162,7 +157,7 @@ export const Payback = observer(() => {
marginBottom: store.ui.mediaQuery.isMobile ? 10 : 0, marginBottom: store.ui.mediaQuery.isMobile ? 10 : 0,
}} }}
/> />
{store.authentication.userData.role !== "Admin" && ( {/* {store.authentication.userData.role !== "Admin" && (
<Button <Button
onClick={() => { onClick={() => {
setInitialData({}); setInitialData({});
@ -171,7 +166,7 @@ export const Payback = observer(() => {
> >
<PlusSquareOutlined /> New <PlusSquareOutlined /> New
</Button> </Button>
)} )} */}
</Col> </Col>
</Row> </Row>
{store.ui.mediaQuery.isDesktop && ( {store.ui.mediaQuery.isDesktop && (
@ -215,7 +210,7 @@ export const Payback = observer(() => {
// style: {marginBottom: "1rem", marginRight: "1rem"}, // style: {marginBottom: "1rem", marginRight: "1rem"},
// }} // }}
dataSource={store.payback.data} dataSource={store.payback.data}
style={{ padding: 0 }} style={{padding: 0}}
renderItem={(item) => { renderItem={(item) => {
return ( return (
<div> <div>
@ -236,11 +231,11 @@ export const Payback = observer(() => {
title={item.name} title={item.name}
description={ description={
<div style={{}}> <div style={{}}>
<Image src={item.picture} preview={false} /> <Image src={item.picture} preview={false}/>
</div> </div>
} }
/> />
<div style={{ marginRight: 16 }}> <div style={{marginRight: 16}}>
<p <p
style={{ style={{
fontSize: 9, fontSize: 9,
@ -251,7 +246,7 @@ export const Payback = observer(() => {
</p> </p>
</div> </div>
</List.Item> </List.Item>
<Divider plain style={{ margin: 0 }} /> <Divider plain style={{margin: 0}}/>
</div> </div>
); );
}} }}
@ -260,7 +255,7 @@ export const Payback = observer(() => {
</div> </div>
</Card> </Card>
<PaybackModal {/* <PaybackModal
visible={visibleModal} visible={visibleModal}
confirmLoading={confirmLoading} confirmLoading={confirmLoading}
initialData={initialData} initialData={initialData}
@ -271,7 +266,7 @@ export const Payback = observer(() => {
setInitialData({}); setInitialData({});
setVisibleModal(false); setVisibleModal(false);
}} }}
/> /> */}
</div> </div>
); );
}); });

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

@ -1,4 +1,4 @@
import React, { useState ,useEffect} from "react"; import React, {useState, useEffect, useContext} from "react";
import { import {
Button, Button,
Card, Card,
@ -12,38 +12,36 @@ import {
Space, Space,
Table, Table,
} from "antd"; } 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, CheckCircleOutlined,
CloseOutlined, CloseOutlined,
FilterOutlined, FilterOutlined,
PlusSquareOutlined, PlusSquareOutlined,
} from "@ant-design/icons"; } 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";
import {ModalLoaderContext} from "../../utils/modal";
const { Search } = Input; const {Search} = Input;
export const PaybackFromUser = observer(() => { export const PaybackFromUser = observer(() => {
const store = useStore(); const store = useStore();
const [visibleModal, setVisibleModal] = useState(false); const [visibleModal, setVisibleModal] = useState(false);
const [confirmLoading, setConfirmLoading] = useState(false);
const [initialData, setInitialData] = useState({}); const [initialData, setInitialData] = useState({});
//const [confirmLoading, setConfirmLoading] = useState(false); const modalLoader = useContext(ModalLoaderContext);
const [isLoading, setIsLoading] = useState(false);
useEffect(() => { useEffect(() => {
const init = async () => { const init = async () => {
try { try {
setIsLoading(true); modalLoader.setLoading(true);
await store.payback.getData(); await store.payback.getData();
//await store.role.getData(); await store.authentication.getProfile();
setIsLoading(false); modalLoader.setLoading(false);
} catch (e) { } catch (e) {
setIsLoading(false); modalLoader.setLoading(false);
} }
}; };
@ -52,19 +50,14 @@ export const PaybackFromUser = observer(() => {
const columns = [ const columns = [
// {
// title: "Name",
// dataIndex: "name",
// key: "name",
// },
{ {
title: "Picture", title: "Picture",
dataIndex: "image_prove", dataIndex: "image_prove",
key: "image_prove", key: "image_prove",
render: (text, record) => ( render: (text, record) => (
<Image <Image
src={record.picture} src={record.image_prove}
style={{ width: 50, height: 50 }} style={{width: 50, height: 50}}
shape="circle" shape="circle"
alt="avatar" alt="avatar"
/> />
@ -75,6 +68,41 @@ 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", // title: "Action",
// key: "action", // key: "action",
@ -112,8 +140,6 @@ export const PaybackFromUser = observer(() => {
// }, // },
]; ];
if(store.authentication.userData.role === "Retail") columns.pop();
const routeData = [ const routeData = [
{ {
route: LINKS.HOME, route: LINKS.HOME,
@ -121,12 +147,12 @@ export const PaybackFromUser = observer(() => {
}, },
{ {
route: LINKS.PAYBACKFROMUSER, route: LINKS.PAYBACKFROMUSER,
name: <span style={{ fontWeight: "bold" }}>Payback User</span>, name: <span style={{fontWeight: "bold"}}>Payback User</span>,
}, },
]; ];
const onSubmit = async (data) => { const onSubmit = async (data) => {
setConfirmLoading(true); modalLoader.setLoading(true);
try { try {
// await store.membership.create(data); // await store.membership.create(data);
// message.success("Success Add New Member"); // message.success("Success Add New Member");
@ -135,25 +161,26 @@ export const PaybackFromUser = observer(() => {
console.error(e, "apa errornya"); console.error(e, "apa errornya");
message.error("Failed Add Member"); message.error("Failed Add Member");
} }
setConfirmLoading(false); modalLoader.setLoading(false);
setVisibleModal(false); setVisibleModal(false);
}; };
const handleAction = async (record, type) => {}; const handleAction = async (record, type) => {
};
return ( return (
<div className={["ppob-container"].join(" ")}> <div className={["ppob-container"].join(" ")}>
<BreadcumbComponent data={routeData} /> <BreadcumbComponent data={routeData}/>
<Card> <Card>
<div> <div>
<Row style={{ marginBottom: 20 }}> <Row style={{marginBottom: 20}}>
<Col span={12}> <Col span={12}>
<Button> <Button>
<FilterOutlined /> <FilterOutlined/>
Filter Filter
</Button> </Button>
</Col> </Col>
<Col span={12} style={{ textAlign: "right" }}> <Col span={12} style={{textAlign: "right"}}>
<Search <Search
placeholder="input search text" placeholder="input search text"
style={{ style={{
@ -169,7 +196,7 @@ export const PaybackFromUser = observer(() => {
setVisibleModal(true); setVisibleModal(true);
}} }}
> >
<PlusSquareOutlined /> New <PlusSquareOutlined/> New
</Button> </Button>
)} )}
</Col> </Col>
@ -181,21 +208,21 @@ export const PaybackFromUser = observer(() => {
columns={columns} columns={columns}
dataSource={store.payback.data} dataSource={store.payback.data}
bordered bordered
// pagination={{ pagination={{
// pageSize: store.membership.pageSize, pageSize: store.payback.pageSize,
// total: store.membership.total_data, total: store.payback.total_data,
// current: store.membership.page + 1, current: store.payback.page + 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);
// }} }}
/> />
)} )}
@ -203,19 +230,21 @@ export const PaybackFromUser = observer(() => {
<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,
style: {marginBottom: "1rem", marginRight: "1rem"},
}}
dataSource={store.payback.data} dataSource={store.payback.data}
style={{ padding: 0 }} style={{padding: 0}}
renderItem={(item) => { renderItem={(item) => {
return ( return (
<div> <div>
@ -236,11 +265,11 @@ export const PaybackFromUser = observer(() => {
title={item.name} title={item.name}
description={ description={
<div style={{}}> <div style={{}}>
<Image src={item.picture} preview={false} /> <Image src={item.image_prove} preview={false}/>
</div> </div>
} }
/> />
<div style={{ marginRight: 16 }}> <div style={{marginRight: 16}}>
<p <p
style={{ style={{
fontSize: 9, fontSize: 9,
@ -251,7 +280,7 @@ export const PaybackFromUser = observer(() => {
</p> </p>
</div> </div>
</List.Item> </List.Item>
<Divider plain style={{ margin: 0 }} /> <Divider plain style={{margin: 0}}/>
</div> </div>
); );
}} }}
@ -262,7 +291,6 @@ export const PaybackFromUser = observer(() => {
<PaybackModal <PaybackModal
visible={visibleModal} visible={visibleModal}
confirmLoading={confirmLoading}
initialData={initialData} initialData={initialData}
onCreate={async (data) => { onCreate={async (data) => {
await onSubmit(data); await onSubmit(data);

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

@ -1,4 +1,4 @@
import React, { useState, useEffect } from "react"; import React, {useState, useEffect, useContext} from "react";
import { import {
Button, Button,
Form, Form,
@ -8,36 +8,22 @@ import {
Modal, Modal,
Upload, Upload,
} from "antd"; } from "antd";
import { useStore } from "../../utils/useStore"; import {useStore} from "../../utils/useStore";
import { appConfig } from "../../config/app"; import {appConfig} from "../../config/app";
import { LoadingOutlined, UploadOutlined } from "@ant-design/icons"; import {LoadingOutlined, UploadOutlined} from "@ant-design/icons";
import {ModalLoaderContext} from "../../utils/modal";
export const PaybackModal = ({ visible, onCreate, onCancel, initialData }) => { export const PaybackModal = ({visible, onCreate, onCancel, initialData}) => {
const [form] = Form.useForm(); const [form] = Form.useForm();
const store = useStore(); const store = useStore();
const [fileList, setFileList] = useState([]); const [fileList, setFileList] = useState([]);
const [previewTitle, setPreviewTitle] = useState(""); const [previewTitle, setPreviewTitle] = useState("");
const [previewImage, setPreviewImage] = useState(""); const [previewImage, setPreviewImage] = useState("");
const [loading, setLoading] = useState(false);
const [fileUrl, setFileUrl] = useState(""); const [fileUrl, setFileUrl] = useState("");
const firstIndexFileList = fileList[0]; const firstIndexFileList = fileList[0];
const [isLoading, setIsLoading] = useState(false); const [loading, setLoading] = useState(false);
const modalLoader = useContext(ModalLoaderContext);
useEffect(() => {
const init = async () => {
try {
setIsLoading(true);
//await store.membership.getData();
//await store.role.getData();
await store.authentication.getProfile();
setIsLoading(false);
} catch (e) {
setIsLoading(false);
}
};
init();
}, []);
const beforeUpload = (file) => { const beforeUpload = (file) => {
let isPdf, isLt2M; let isPdf, isLt2M;
let allowedFile = ["image/jpeg", "image/png", "application/pdf"]; let allowedFile = ["image/jpeg", "image/png", "application/pdf"];
@ -58,7 +44,7 @@ export const PaybackModal = ({ visible, onCreate, onCancel, initialData }) => {
setPreviewTitle(file.url?.substring(file.url?.lastIndexOf("/") + 1)); setPreviewTitle(file.url?.substring(file.url?.lastIndexOf("/") + 1));
}; };
const handleChange = ({ fileList }) => { const handleChange = ({fileList}) => {
setFileList(fileList); setFileList(fileList);
if (fileList.length && fileList[0].status === "done") { if (fileList.length && fileList[0].status === "done") {
form.setFieldsValue({ form.setFieldsValue({
@ -74,9 +60,9 @@ export const PaybackModal = ({ visible, onCreate, onCancel, initialData }) => {
const uploadButton = ( const uploadButton = (
<div> <div>
{loading ? ( {loading ? (
<LoadingOutlined /> <LoadingOutlined/>
) : ( ) : (
<Button icon={<UploadOutlined />}>Click to Upload</Button> <Button icon={<UploadOutlined/>}>Click to Upload</Button>
)} )}
</div> </div>
); );
@ -92,14 +78,16 @@ export const PaybackModal = ({ visible, onCreate, onCancel, initialData }) => {
const handleSubmit = async (data) => { const handleSubmit = async (data) => {
console.log(data, "isi data2"); console.log(data, "isi data2");
try { try {
modalLoader.setLoading(true);
await store.payback.create(data); await store.payback.create(data);
message.success("Success Add New Member"); modalLoader.setLoading(false);
message.success("Success Add Payback");
await store.payback.getData();
} catch (e) { } catch (e) {
modalLoader.setLoading(false);
console.log(e, "apa errornya"); console.log(e, "apa errornya");
message.error("Failed Add Member"); message.error("Failed Add Member");
} }
store.payback.visibleModalPayback = false;
form.resetFields(); form.resetFields();
}; };
@ -135,15 +123,14 @@ export const PaybackModal = ({ visible, onCreate, onCancel, initialData }) => {
<Form.Item <Form.Item
name="destination" name="destination"
label="destination" label="destination"
rules={[{ required: true, message: "Please input Name!" }]} rules={[{required: true, message: "Please input Name!"}]}
initialValue={store.authentication.profileData.superior?.id} initialValue={store.authentication.profileData.superior?.id}
> >
<Input /> <Input/>
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Upload Picture" label="Upload Picture"
name="image_prove" name="image_prove"
initialValue={"tes"}
> >
<div <div
style={{ style={{
@ -163,7 +150,6 @@ export const PaybackModal = ({ visible, onCreate, onCancel, initialData }) => {
beforeUpload={beforeUpload} beforeUpload={beforeUpload}
onPreview={handlePreview} onPreview={handlePreview}
onChange={handleChange} onChange={handleChange}
defaultValue={"tes"}
> >
{!firstIndexFileList ? uploadButton : null} {!firstIndexFileList ? uploadButton : null}
</Upload> </Upload>
@ -182,7 +168,7 @@ export const PaybackModal = ({ visible, onCreate, onCancel, initialData }) => {
<img <img
src={previewImage} src={previewImage}
alt="preview" alt="preview"
style={{ width: "100%" }} style={{width: "100%"}}
/> />
</div> </div>
<h5>{previewTitle}</h5> <h5>{previewTitle}</h5>
@ -196,9 +182,9 @@ export const PaybackModal = ({ visible, onCreate, onCancel, initialData }) => {
<Form.Item <Form.Item
name="amount" name="amount"
label="amount" label="amount"
rules={[{ required: true, message: "Please input Amount!" }]} rules={[{required: true, message: "Please input Amount!"}]}
> >
<Input /> <Input/>
</Form.Item> </Form.Item>
</Form> </Form>
</Modal> </Modal>

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

@ -1,4 +1,4 @@
import React, {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} 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";
@ -6,22 +6,23 @@ import {useStore} from "../../utils/useStore";
import {observer} from "mobx-react-lite"; import {observer} from "mobx-react-lite";
import {LINKS} from "../../routes/app"; import {LINKS} from "../../routes/app";
import {CategoryComponent} from "../../component/CategoryComponent"; import {CategoryComponent} from "../../component/CategoryComponent";
import {ModalLoaderContext} from "../../utils/modal";
const {TabPane} = Tabs; const {TabPane} = Tabs;
const {Search} = Input; const {Search} = Input;
export const Category = observer(() => { export const Category = observer(() => {
const [isLoading, setIsLoading] = useState(false);
const store = useStore(); const store = useStore();
const modalLoader = useContext(ModalLoaderContext);
useEffect(() => { useEffect(() => {
const init = async () => { const init = async () => {
try { try {
setIsLoading(true); modalLoader.setLoading(true);
await store.category.getData(); await store.category.getData();
setIsLoading(false); modalLoader.setLoading(false);
} catch (e) { } catch (e) {
setIsLoading(false); modalLoader.setLoading(false);
} }
}; };

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

@ -1,4 +1,4 @@
import React, {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} from "antd";
import {PlusSquareOutlined} from "@ant-design/icons"; import {PlusSquareOutlined} from "@ant-design/icons";
import {BreadcumbComponent} from "../../component/BreadcumbComponent"; import {BreadcumbComponent} from "../../component/BreadcumbComponent";
@ -6,21 +6,22 @@ import {useStore} from "../../utils/useStore";
import {observer} from "mobx-react-lite"; import {observer} from "mobx-react-lite";
import {LINKS} from "../../routes/app"; import {LINKS} from "../../routes/app";
import {SubcategoryComponent} from "../../component/Subcategory"; import {SubcategoryComponent} from "../../component/Subcategory";
import {ModalLoaderContext} from "../../utils/modal";
const {Search} = Input; const {Search} = Input;
export const Subcategory = observer(() => { export const Subcategory = observer(() => {
const [isLoading, setIsLoading] = useState(false);
const store = useStore(); const store = useStore();
const modalLoader = useContext(ModalLoaderContext);
useEffect(() => { useEffect(() => {
const init = async () => { const init = async () => {
try { try {
setIsLoading(true); modalLoader.setLoading(true);
getData(); await getData();
setIsLoading(false); modalLoader.setLoading(false);
} catch (e) { } catch (e) {
setIsLoading(false); modalLoader.setLoading(false);
} }
}; };
@ -39,22 +40,22 @@ export const Subcategory = observer(() => {
}, },
{ {
route: LINKS.SUBCATEGORY, route: LINKS.SUBCATEGORY,
name: <span style={{ fontWeight: "bold" }}>Sub Category</span>, name: <span style={{fontWeight: "bold"}}>Sub Category</span>,
}, },
]; ];
return ( return (
<div className={["ppob-container"].join(" ")}> <div className={["ppob-container"].join(" ")}>
<BreadcumbComponent data={routeData} /> <BreadcumbComponent data={routeData}/>
<Card> <Card>
<Row style={{ marginBottom: 20 }}> <Row style={{marginBottom: 20}}>
<Col span={12}> <Col span={12}>
{/* <Button> {/* <Button>
<FilterOutlined /> <FilterOutlined />
Filter Filter
</Button> */} </Button> */}
</Col> </Col>
<Col span={12} style={{ textAlign: "right" }}> <Col span={12} style={{textAlign: "right"}}>
<Search <Search
placeholder="input search text" placeholder="input search text"
style={{ style={{
@ -66,11 +67,11 @@ export const Subcategory = observer(() => {
<Button <Button
onClick={() => (store.subcategory.visibleModalSubcategory = true)} onClick={() => (store.subcategory.visibleModalSubcategory = true)}
> >
<PlusSquareOutlined /> New <PlusSquareOutlined/> New
</Button> </Button>
</Col> </Col>
</Row> </Row>
<SubcategoryComponent /> <SubcategoryComponent/>
</Card> </Card>
</div> </div>
); );

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

@ -1,4 +1,4 @@
import React, {useEffect} from "react"; import React, {useContext, useEffect} from "react";
import {Button, Card, Col, Row, Table, Typography} from "antd"; import {Button, Card, Col, Row, Table, Typography} from "antd";
import {BreadcumbComponent} from "../../component/BreadcumbComponent"; import {BreadcumbComponent} from "../../component/BreadcumbComponent";
import {LINKS} from "../../routes/app"; import {LINKS} from "../../routes/app";
@ -6,11 +6,14 @@ import {useStore} from "../../utils/useStore";
import {observer} from "mobx-react-lite"; import {observer} from "mobx-react-lite";
import {FilterOutlined} from "@ant-design/icons"; import {FilterOutlined} from "@ant-design/icons";
import {format, parseISO} from "date-fns"; import {format, parseISO} from "date-fns";
import {ModalLoaderContext} from "../../utils/modal";
const {Title, Text} = Typography; const {Title, Text} = Typography;
export const Profile = observer(() => { export const Profile = observer(() => {
const store = useStore(); const store = useStore();
const modalLoader = useContext(ModalLoaderContext);
const routeData = [ const routeData = [
{ {
route: LINKS.HOME, route: LINKS.HOME,
@ -24,10 +27,12 @@ export const Profile = observer(() => {
useEffect(() => { useEffect(() => {
(async () => { (async () => {
modalLoader.setLoading(true);
await Promise.allSettled([ await Promise.allSettled([
store.authentication.getProfile(), store.authentication.getProfile(),
store.transaction.getDataHistoryTransaction(), store.transaction.getDataHistoryTransaction(),
]); ]);
modalLoader.setLoading(false);
})() })()
}, []); }, []);

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

@ -1,8 +1,9 @@
import React, {useEffect, useState} from "react"; import React, {useContext, useEffect, useState} from "react";
import {useStore} from "../../utils/useStore"; import {useStore} from "../../utils/useStore";
import {Button, Card, Col, Input, message, Modal, Row, Select} from "antd"; import {Button, Card, Col, Input, message, Modal, Row, Select} from "antd";
import {observer} from "mobx-react-lite"; import {observer} from "mobx-react-lite";
import {MoneyCollectOutlined} from "@ant-design/icons"; import {MoneyCollectOutlined} from "@ant-design/icons";
import {ModalLoaderContext} from "../../utils/modal";
const {Search} = Input; const {Search} = Input;
const {Option} = Select; const {Option} = Select;
@ -10,18 +11,20 @@ const {Option} = Select;
export const Product = observer(() => { export const Product = observer(() => {
const store = useStore(); const store = useStore();
const [isLoading, setIsLoading] = useState(false);
const [productData, setProductData] = useState([]); const [productData, setProductData] = useState([]);
const modalLoader = useContext(ModalLoaderContext);
useEffect(() => { useEffect(() => {
const init = async () => { const init = async () => {
try { try {
setIsLoading(true); modalLoader.setLoading(true);
await store.transaction.getDataSubCategories(); await Promise.allSettled([
await store.transaction.getDataCategories(); store.transaction.getDataSubCategories(),
setIsLoading(false); store.transaction.getDataCategories()
])
modalLoader.setLoading(false);
} catch (e) { } catch (e) {
setIsLoading(false); modalLoader.setLoading(false);
} }
}; };
@ -44,21 +47,25 @@ export const Product = observer(() => {
const handleChangeSubcategory = async (item) => { const handleChangeSubcategory = async (item) => {
store.transaction.filterSubCategory = item; store.transaction.filterSubCategory = item;
modalLoader.setLoading(true);
await store.transaction.getData(); await store.transaction.getData();
modalLoader.setLoading(false);
}; };
const handleBuyProduct = async (data) => { const handleBuyProduct = async (data) => {
modalLoader.setLoading(true);
try { try {
const response = await store.transaction.buyProduct({productCode: data}); const response = await store.transaction.buyProduct({productCode: data});
if (response.status === 200) { // if (response.status === 200) {
message.success("Success Buy Product"); message.success("Success Buy Product");
} else { // } else {
message.error("Failed Buy Product"); //message.error("Failed Buy Product");
} //}
} catch (e) { } catch (e) {
console.log(e, "apa errornya"); console.log(e, "apa errornya");
message.error("Failed Buy Product"); message.error("Failed Buy Product");
} }
modalLoader.setLoading(false);
}; };
return ( return (
@ -136,7 +143,7 @@ export const Product = observer(() => {
</Row> </Row>
)} )}
{productData.length !== 0 && ( {productData.length !== 0 && (
<Col style={{ textAlign: "right" }}> <Col style={{textAlign: "right"}}>
<Button style={{backgroundColor: "#2D9CDB", color: "white"}}> <Button style={{backgroundColor: "#2D9CDB", color: "white"}}>
Beli Sekarang Beli Sekarang
</Button> </Button>

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

@ -1,27 +1,28 @@
import React, {useEffect, useState} from "react"; import React, {useContext, useEffect, useState} 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";
import {Product} from "./Product"; import {Product} from "./Product";
import {LINKS} from "../../routes/app"; import {LINKS} from "../../routes/app";
import {observer} from "mobx-react-lite"; import {observer} from "mobx-react-lite";
import {ModalLoaderContext} from "../../utils/modal";
const {TabPane} = Tabs; const {TabPane} = Tabs;
export const Transaction = observer(() => { export const Transaction = observer(() => {
const store = useStore(); const store = useStore();
const [isLoading, setIsLoading] = useState(false); const modalLoader = useContext(ModalLoaderContext);
// Init // Init
useEffect(() => { useEffect(() => {
const init = async () => { const init = async () => {
try { try {
setIsLoading(true); modalLoader.setLoading(true);
await store.transaction.getDataCategories(); await store.transaction.getDataCategories();
setIsLoading(false); modalLoader.setLoading(false);
} catch (e) { } catch (e) {
setIsLoading(false); modalLoader.setLoading(false);
} }
}; };
@ -35,7 +36,9 @@ export const Transaction = observer(() => {
const handleChangeTabs = async (key) => { const handleChangeTabs = async (key) => {
store.transaction.filterCategory = key; store.transaction.filterCategory = key;
modalLoader.setLoading(true);
await store.transaction.getDataSubCategories(); await store.transaction.getDataSubCategories();
modalLoader.setLoading(false);
}; };
const routeData = [ const routeData = [

26
src/store/payback.js
View File

@ -9,15 +9,15 @@ export class Payback {
filterCategory = null; filterCategory = null;
visibleModalPayback = false; visibleModalPayback = false;
pageCategories = 0; pagePayback = 0;
pageSizeCategories = 10; pageSizePayback = 10;
dataCategories = []; dataPayback = [];
total_dataCategories = 0; total_dataPayback = 0;
pageSubCategories = 0; pageSubPayback = 0;
pageSizeSubCategories = 10; pageSizeSubPayback = 10;
dataSubCategories = []; dataSubPayback = [];
total_dataSubCategories = 0; total_dataPayback = 0;
constructor(ctx) { constructor(ctx) {
this.ctx = ctx; this.ctx = ctx;
@ -31,12 +31,12 @@ export class Payback {
); );
//console.log(response) //console.log(response)
this.data = this.data =
response.body[0].map((item, idx) => { response.body.data.map((item, idx) => {
item.key = idx; item.key = idx;
return item; return item;
}) ?? []; }) ?? [];
this.total_data = response?.body?.count ?? 0; this.total_data = response.body.count ?? 0;
} catch (e) { } catch (e) {
console.error(e); console.error(e);
} }
@ -47,14 +47,14 @@ export class Payback {
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.page}&pageSize=${this.pageSize}`
); );
console.log(response); //console.log(response);
this.data = this.data =
response.body[0].map((item, idx) => { response.body.data.map((item, idx) => {
item.key = idx; item.key = idx;
return item; return item;
}) ?? []; }) ?? [];
this.total_data = response?.body?.count ?? 0; this.total_data = response.body.count ?? 0;
} catch (e) { } catch (e) {
console.error(e); console.error(e);
} }