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

Perbaikan Project PPOB

Browse Source
This commit is contained in:
ajat91.sudrajat 2022-01-03 12:15:08 +07:00
parent a851ce019e
commit c19d1386f3
4 changed files with 472 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/index.css
View File

@ -76,3 +76,7 @@ code {
.profile-container .ant-popover-inner-content { .profile-container .ant-popover-inner-content {
padding: 0 !important; padding: 0 !important;
} }
.ant-menu-item-divider{
border-style: transparent !important;
}

594
src/pages/Home/Home.js
View File

@ -8,6 +8,7 @@ import {
BarChartOutlined, BarChartOutlined,
} from "@ant-design/icons"; } from "@ant-design/icons";
import { ModalLoaderContext } from "../../utils/modal"; import { ModalLoaderContext } from "../../utils/modal";
import Title from "antd/lib/skeleton/Title";
export const Home = observer(() => { export const Home = observer(() => {
const modalLoader = useContext(ModalLoaderContext); const modalLoader = useContext(ModalLoaderContext);
@ -20,7 +21,7 @@ export const Home = observer(() => {
await getData(); await getData();
await store.membership.getDataBySuperior(); await store.membership.getDataBySuperior();
await store.partner.getData(); await store.partner.getData();
if(isAdmin){ if (isAdmin) {
await store.transaction.getDataTransaction(); await store.transaction.getDataTransaction();
await store.transaction.getDataTransactionB2B(); await store.transaction.getDataTransactionB2B();
} else { } else {
@ -99,152 +100,230 @@ export const Home = observer(() => {
]; ];
return ( return (
<div> <div>
{store.ui.mediaQuery.isDesktop && store.authentication.userData.role === "Admin" && ( {store.ui.mediaQuery.isDesktop &&
<Row store.authentication.userData.role === "Admin" && (
style={{
marginTop: 30,
marginLeft: 30,
}}
>
<Card
className={"shadow"}
hoverable
style={{
marginLeft: 20,
height: 200,
marginBottom: 10,
borderColor: "salmon",
width: "45%",
}}
>
<Row>
{/*<BarChartOutlined style={{ fontSize: 25 ,marginRight:80}} />*/}
<PageHeader title={<span>{store.transaction.dataTransaction.total_transaction} Transaksi B2C</span>}>
<p>
<h4>Total Penjualan : { new Intl.NumberFormat("id-ID", {
style: "currency",
currency: "IDR",
}).format(store.transaction.dataTransaction.total_amount)}</h4>
<h4>Total Modal : { new Intl.NumberFormat("id-ID", {
style: "currency",
currency: "IDR",
}).format(store.transaction.dataTransaction.total_modal)}</h4>
<h4>Total Profit : { new Intl.NumberFormat("id-ID", {
style: "currency",
currency: "IDR",
}).format(store.transaction.dataTransaction.total_profit)}</h4>
<h4>Total Komisi : { new Intl.NumberFormat("id-ID", {
style: "currency",
currency: "IDR",
}).format(store.transaction.dataTransaction.total_commission)}</h4>
</p>
</PageHeader>
</Row>
</Card>
<Card
className={"shadow"}
hoverable
style={{
marginLeft: 20,
height: 200,
marginBottom: 10,
borderColor: "salmon",
width: "45%",
}}
>
<Row>
<PageHeader title={<span>{store.transaction.dataTransactionB2B.total_transaction} Transaksi B2B</span>}>
<p>
<h4>Total Penjualan : { new Intl.NumberFormat("id-ID", {
style: "currency",
currency: "IDR",
}).format(store.transaction.dataTransactionB2B.total_amount)}</h4>
<h4>Total Modal : { new Intl.NumberFormat("id-ID", {
style: "currency",
currency: "IDR",
}).format(store.transaction.dataTransactionB2B.total_modal)}</h4>
<h4>Total Profit : { new Intl.NumberFormat("id-ID", {
style: "currency",
currency: "IDR",
}).format(store.transaction.dataTransactionB2B.total_profit)}</h4>
</p>
</PageHeader>
</Row>
</Card>
{/*<Card*/}
{/* className={"shadow"}*/}
{/* hoverable*/}
{/* style={{*/}
{/* marginLeft: 20,*/}
{/* height: 200,*/}
{/* marginBottom: 10,*/}
{/* borderColor: "salmon",*/}
{/* width: "30%",*/}
{/* }}*/}
{/*>*/}
{/* <Row>*/}
{/* <PageHeader title={<span>Total Keuntungan B2C</span>}>*/}
{/* <span>*/}
{/* {new Intl.NumberFormat("id-ID", {*/}
{/* style: "currency",*/}
{/* currency: "IDR",*/}
{/* }).format(store.authentication.profileData?.wallet || 0)}*/}
{/* </span>*/}
{/* </PageHeader>*/}
{/* </Row>*/}
{/*</Card>*/}
</Row>
)}
{store.ui.mediaQuery.isDesktop && store.authentication.userData.role === "Admin Partner" && (
<Row <Row
style={{ style={{
marginTop: 30, marginTop: 30,
marginLeft: 30, marginLeft: 30,
}} }}
> >
<Card <Card
className={"shadow"} className={"shadow"}
hoverable hoverable
style={{ title={
marginLeft: 20, <span
height: 200, style={{
marginBottom: 10, fontSize: 20,
borderColor: "salmon", fontStyle: "bold",
width: "45%", textAlign: "center",
}} }}
>
{store.transaction.dataTransaction.total_transaction}{" "}
Transaksi B2C
</span>
}
style={{
marginLeft: 20,
height: 200,
marginBottom: 10,
borderColor: "salmon",
width: "45%",
}}
>
<Row>
<Row style={{ marginTop: 20 }}>
<Col style={{ marginRight: 40 }}>
<p>
<h4>
Total Penjualan :{" "}
{new Intl.NumberFormat("id-ID", {
style: "currency",
currency: "IDR",
}).format(
store.transaction.dataTransaction.total_amount
)}
</h4>
<h4>
Total Modal :{" "}
{new Intl.NumberFormat("id-ID", {
style: "currency",
currency: "IDR",
}).format(
store.transaction.dataTransaction.total_modal
)}
</h4>
</p>
</Col>
<Col>
<p>
<h4>
Total Profit :{" "}
{new Intl.NumberFormat("id-ID", {
style: "currency",
currency: "IDR",
}).format(
store.transaction.dataTransaction.total_profit
)}
</h4>
<h4>
Total Komisi :{" "}
{new Intl.NumberFormat("id-ID", {
style: "currency",
currency: "IDR",
}).format(
store.transaction.dataTransaction.total_commission
)}
</h4>
</p>
</Col>
</Row>
</Row>
</Card>
<Card
className={"shadow"}
hoverable
title={
<span
style={{
fontSize: 20,
fontStyle: "bold",
textAlign: "center",
}}
>
{store.transaction.dataTransactionB2B.total_transaction}{" "}
Transaksi B2B
</span>
}
style={{
marginLeft: 20,
height: 200,
marginBottom: 10,
borderColor: "salmon",
width: "45%",
}}
>
<Row>
<Row style={{ marginTop: 20 }}>
<Col style={{ marginRight: 40 }}>
<p>
<h4>
Total Penjualan :{" "}
{new Intl.NumberFormat("id-ID", {
style: "currency",
currency: "IDR",
}).format(
store.transaction.dataTransactionB2B.total_amount
)}
</h4>
<h4>
Total Modal :{" "}
{new Intl.NumberFormat("id-ID", {
style: "currency",
currency: "IDR",
}).format(
store.transaction.dataTransactionB2B.total_modal
)}
</h4>
</p>
</Col>
<Col>
<p>
<h4>
Total Profit :{" "}
{new Intl.NumberFormat("id-ID", {
style: "currency",
currency: "IDR",
}).format(
store.transaction.dataTransactionB2B.total_profit
)}
</h4>
</p>
</Col>
</Row>
</Row>
</Card>
{/*<Card*/}
{/* className={"shadow"}*/}
{/* hoverable*/}
{/* style={{*/}
{/* marginLeft: 20,*/}
{/* height: 200,*/}
{/* marginBottom: 10,*/}
{/* borderColor: "salmon",*/}
{/* width: "30%",*/}
{/* }}*/}
{/*>*/}
{/* <Row>*/}
{/* <PageHeader title={<span>Total Keuntungan B2C</span>}>*/}
{/* <span>*/}
{/* {new Intl.NumberFormat("id-ID", {*/}
{/* style: "currency",*/}
{/* currency: "IDR",*/}
{/* }).format(store.authentication.profileData?.wallet || 0)}*/}
{/* </span>*/}
{/* </PageHeader>*/}
{/* </Row>*/}
{/*</Card>*/}
</Row>
)}
{store.ui.mediaQuery.isDesktop &&
store.authentication.userData.role === "Admin Partner" && (
<Row
style={{
marginTop: 30,
marginLeft: 30,
}}
>
<Card
className={"shadow"}
hoverable
style={{
marginLeft: 20,
height: 200,
marginBottom: 10,
borderColor: "salmon",
width: "45%",
}}
> >
<Row> <Row>
<PageHeader title={<span>Total Transaksi</span>}> <PageHeader title={<span>Total Transaksi</span>}>
<p> <p>
<h4>{store.transaction.dataTransactionPartner.total_transaction}</h4> <h4>
{
store.transaction.dataTransactionPartner
.total_transaction
}
</h4>
</p> </p>
</PageHeader> </PageHeader>
</Row> </Row>
</Card> </Card>
<Card <Card
className={"shadow"} className={"shadow"}
hoverable hoverable
style={{ style={{
marginLeft: 20, marginLeft: 20,
height: 200, height: 200,
marginBottom: 10, marginBottom: 10,
borderColor: "salmon", borderColor: "salmon",
width: "45%", width: "45%",
}} }}
> >
<Row> <Row>
<PageHeader title={<span>Total Penjualan</span>}> <PageHeader title={<span>Total Penjualan</span>}>
<p> <p>
<h4>{ new Intl.NumberFormat("id-ID", { <h4>
style: "currency", {new Intl.NumberFormat("id-ID", {
currency: "IDR", style: "currency",
}).format(store.transaction.dataTransactionPartner.total_amount)}</h4> currency: "IDR",
}).format(
store.transaction.dataTransactionPartner.total_amount
)}
</h4>
</p> </p>
</PageHeader> </PageHeader>
</Row> </Row>
@ -272,7 +351,258 @@ export const Home = observer(() => {
{/* </Row>*/} {/* </Row>*/}
{/*</Card>*/} {/*</Card>*/}
</Row> </Row>
)} )}
{store.ui.mediaQuery.isMobile &&
store.authentication.userData.role === "Admin" && (
<Row
style={{
marginTop: 20,
marginLeft: 10,
}}
>
<Card
className={"shadow"}
hoverable
title={
<span
style={{
fontSize: 20,
fontStyle: "bold",
textAlign: "center",
}}
>
{store.transaction.dataTransaction.total_transaction}{" "}
Transaksi B2C
</span>
}
style={{
marginLeft: 10,
height: 220,
marginBottom: 10,
borderColor: "salmon",
width: "90%",
}}
>
<Row>
<Row>
<Col style={{ marginRight: 40 }}>
<p>
<h4>
Total Penjualan :{" "}
{new Intl.NumberFormat("id-ID", {
style: "currency",
currency: "IDR",
}).format(
store.transaction.dataTransaction.total_amount
)}
</h4>
<h4>
Total Modal :{" "}
{new Intl.NumberFormat("id-ID", {
style: "currency",
currency: "IDR",
}).format(
store.transaction.dataTransaction.total_modal
)}
</h4>
</p>
</Col>
<Col>
<p>
<h4>
Total Profit :{" "}
{new Intl.NumberFormat("id-ID", {
style: "currency",
currency: "IDR",
}).format(
store.transaction.dataTransaction.total_profit
)}
</h4>
<h4>
Total Komisi :{" "}
{new Intl.NumberFormat("id-ID", {
style: "currency",
currency: "IDR",
}).format(
store.transaction.dataTransaction.total_commission
)}
</h4>
</p>
</Col>
</Row>
</Row>
</Card>
<Card
className={"shadow"}
hoverable
title={
<span
style={{
fontSize: 20,
fontStyle: "bold",
textAlign: "center",
}}
>
{store.transaction.dataTransactionB2B.total_transaction}{" "}
Transaksi B2B
</span>
}
style={{
marginLeft: 10,
height: 200,
borderColor: "salmon",
width: "90%",
}}
>
<Row>
<Row>
<Col style={{ marginRight: 40 }}>
<p>
<h4>
Total Penjualan :{" "}
{new Intl.NumberFormat("id-ID", {
style: "currency",
currency: "IDR",
}).format(
store.transaction.dataTransactionB2B.total_amount
)}
</h4>
<h4>
Total Modal :{" "}
{new Intl.NumberFormat("id-ID", {
style: "currency",
currency: "IDR",
}).format(
store.transaction.dataTransactionB2B.total_modal
)}
</h4>
</p>
</Col>
<Col>
<p>
<h4>
Total Profit :{" "}
{new Intl.NumberFormat("id-ID", {
style: "currency",
currency: "IDR",
}).format(
store.transaction.dataTransactionB2B.total_profit
)}
</h4>
</p>
</Col>
</Row>
</Row>
</Card>
{/*<Card*/}
{/* className={"shadow"}*/}
{/* hoverable*/}
{/* style={{*/}
{/* marginLeft: 20,*/}
{/* height: 200,*/}
{/* marginBottom: 10,*/}
{/* borderColor: "salmon",*/}
{/* width: "30%",*/}
{/* }}*/}
{/*>*/}
{/* <Row>*/}
{/* <PageHeader title={<span>Total Keuntungan B2C</span>}>*/}
{/* <span>*/}
{/* {new Intl.NumberFormat("id-ID", {*/}
{/* style: "currency",*/}
{/* currency: "IDR",*/}
{/* }).format(store.authentication.profileData?.wallet || 0)}*/}
{/* </span>*/}
{/* </PageHeader>*/}
{/* </Row>*/}
{/*</Card>*/}
</Row>
)}
{store.ui.mediaQuery.isMobile &&
store.authentication.userData.role === "Admin Partner" && (
<Row
style={{
marginTop: 20,
marginLeft: 10,
}}
>
<Card
className={"shadow"}
hoverable
style={{
marginLeft: 10,
height: 200,
marginBottom: 10,
borderColor: "salmon",
width: "90%",
}}
>
<Row>
<PageHeader title={<span>Total Transaksi</span>}>
<p>
<h4>
{
store.transaction.dataTransactionPartner
.total_transaction
}
</h4>
</p>
</PageHeader>
</Row>
</Card>
<Card
className={"shadow"}
hoverable
style={{
marginLeft: 10,
height: 200,
marginBottom: 10,
borderColor: "salmon",
width: "90%",
}}
>
<Row>
<PageHeader title={<span>Total Penjualan</span>}>
<p>
<h4>
{new Intl.NumberFormat("id-ID", {
style: "currency",
currency: "IDR",
}).format(
store.transaction.dataTransactionPartner.total_amount
)}
</h4>
</p>
</PageHeader>
</Row>
</Card>
{/*<Card*/}
{/* className={"shadow"}*/}
{/* hoverable*/}
{/* style={{*/}
{/* marginLeft: 20,*/}
{/* height: 200,*/}
{/* marginBottom: 10,*/}
{/* borderColor: "salmon",*/}
{/* width: "30%",*/}
{/* }}*/}
{/*>*/}
{/* <Row>*/}
{/* <PageHeader title={<span>Total Keuntungan B2C</span>}>*/}
{/* <span>*/}
{/* {new Intl.NumberFormat("id-ID", {*/}
{/* style: "currency",*/}
{/* currency: "IDR",*/}
{/* }).format(store.authentication.profileData?.wallet || 0)}*/}
{/* </span>*/}
{/* </PageHeader>*/}
{/* </Row>*/}
{/*</Card>*/}
</Row>
)}
{/*{store.authentication.userData.role === "Admin" &&*/} {/*{store.authentication.userData.role === "Admin" &&*/}
{/* store.ui.mediaQuery.isDesktop && (*/} {/* store.ui.mediaQuery.isDesktop && (*/}
{/* <Row style={{ marginLeft: 50, marginTop: 10 }}>*/} {/* <Row style={{ marginLeft: 50, marginTop: 10 }}>*/}

2
src/pages/Membership/DetailUser.js
View File

@ -224,7 +224,7 @@ export const DetailUser = observer(() => {
<Card> <Card>
<Row style={{marginBottom:10}}> <Row style={{marginBottom:10}}>
<Title strong level={2} >Detail User</Title> <Title strong level={2} >Detail User</Title>
<Col lg={20} xs={20} style={{ textAlign: "right" }}> <Col lg={20} xs={20} style={{textAlign: "right" }}>
{store.authentication.userData.role === "Admin" && ( {store.authentication.userData.role === "Admin" && (
<Space <Space
size="middle" size="middle"

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

@ -377,7 +377,11 @@ export const Membership = observer(() => {
current: store.membership.page + 1, current: store.membership.page + 1,
style: { marginBottom: "1rem", marginRight: "1rem" }, style: { marginBottom: "1rem", marginRight: "1rem" },
}} }}
dataSource={store.membership.data} dataSource={
store.authentication.userData.role === "Admin"
? store.membership.dataMember
: store.membership.data
}
style={{ padding: 0 }} style={{ padding: 0 }}
renderItem={(item) => { renderItem={(item) => {
return ( return (