Merge branch 'develop' into 'devops-staging'

Develop

See merge request empatnusabangsa/ppob/ppob-frontend!33
This commit is contained in:
ilham dwi pratama 2022-01-02 18:18:05 +00:00
commit 6b1c05cfea
2 changed files with 138 additions and 80 deletions

View File

@ -189,6 +189,7 @@ export const DetailUser = observer(() => {
},
},
];
const routeData = [
{
route: LINKS.HOME,
@ -204,6 +205,19 @@ export const DetailUser = observer(() => {
},
];
const styleSaldoTitle = store.ui.mediaQuery.isDesktop
? {
display: "flex",
justifyContent: "center",
}
: { fontSize: "0.75rem" };
const styleSaldoContent = store.ui.mediaQuery.isDesktop
? {
fontSize: "1.25rem",
display: "flex",
justifyContent: "center",
}
: null;
return (
<div className={["ppob-container"].join(" ")}>
<BreadcumbComponent data={routeData} />
@ -251,6 +265,8 @@ export const DetailUser = observer(() => {
</Row>
</Col>
<Col lg={12} xs={24}>
<Row>
<Col lg={24} xs={24} style={{marginBottom: 30}}>
{store.authentication.userData.role === "Admin" && (
<Title strong level={3}>
Action User Detail
@ -330,6 +346,48 @@ export const DetailUser = observer(() => {
</Space>
)}
</Col>
<Col lg={24} xs={24}>
<Row>
<Col lg={12} xs={12}>
<Row justify={"center"}>
<Col lg={12} xs={12}>
<Title strong level={3} style={styleSaldoTitle}>
Saldo
</Title>
</Col>
<Col lg={24} xs={12}>
<Text style={styleSaldoContent}>
{new Intl.NumberFormat("id-ID", {
style: "currency",
currency: "IDR",
}).format(store.authentication.profileData?.wallet || 0)}
</Text>
</Col>
<Col></Col>
</Row>
</Col>
<Col lg={12} xs={12}>
<Row justify={"center"}>
<Col lg={12} xs={12}>
<Title strong level={3} style={styleSaldoTitle}>
Profit
</Title>
</Col>
<Col lg={24} xs={12}>
<Text style={styleSaldoContent}>
{new Intl.NumberFormat("id-ID", {
style: "currency",
currency: "IDR",
}).format(store.authentication.profileData?.profit || 0)}
</Text>
</Col>
<Col></Col>
</Row>
</Col>
</Row>
</Col>
</Row>
</Col>
</Row>
<Row>
<Col span={24}>

View File

@ -234,8 +234,8 @@ export const Profile = observer(() => {
<Col></Col>
</Row>
</Col>
{store.authentication.userData.role === "Admin" ||
(store.authentication.userData.role === "Supervisor" && (
{store.authentication.userData.role != "Admin Partner" &&
(store.authentication.userData.role != "Retail" && (
<Col span={store.ui.mediaQuery.isMobile ? 8 : 5}>
<Row justify={"center"}>
<Col lg={12} xs={12}>