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

Merge branch 'develop' into 'devops-staging'

Browse Source 
Bug Fixing PPOB

See merge request empatnusabangsa/ppob/ppob-frontend!83
This commit is contained in:
ajat sudrajat 2022-01-24 11:01:11 +00:00
commit c635cdd51e
2 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,6 +165,26 @@ export const DesktopLayout = observer(() => {
</Menu.Item>
</SubMenu>
)}
{store.authentication.userData.role === "Supervisor" && (
<SubMenu
key="keanggotaan"
icon={<UsergroupAddOutlined />}
title="Keanggotaan"
>
<Menu.Item key="membership">
<Link to={LINKS.MEMBERSHIP}>
<UnorderedListOutlined />
<span>List Anggota</span>
</Link>
</Menu.Item>
<Menu.Item key="konfirmasi">
<Link to={LINKS.KONFIRMASI}>
<FormOutlined />
<span>Konfirmasi Retail</span>
</Link>
</Menu.Item>
</SubMenu>
)}
{store.authentication.userData.role === "Sales" && (
<Menu.Item key="membership">
<Link to={LINKS.MEMBERSHIP}>
@ -173,14 +193,14 @@ export const DesktopLayout = observer(() => {
</Link>
</Menu.Item>
)}
{store.authentication.userData.role === "Supervisor" && (
{/* {store.authentication.userData.role === "Supervisor" && (
<Menu.Item key="membership">
<Link to={LINKS.MEMBERSHIP}>
<IdcardOutlined />
<span>Keanggotaan</span>
</Link>
</Menu.Item>
)}
)} */}
{store.authentication.userData.role === "Admin" && (
<SubMenu
key="config"

33
src/pages/Membership/Konfirmasi.js
View File

@ -123,7 +123,7 @@ export const Konfirmasi = observer(() => {
width: "10%",
render: (text, record) =>
record.is_active === false ? (
<Space size="middle">
<Space size="small">
<Button
onClick={async () => {
Modal.confirm({
@ -315,10 +315,10 @@ export const Konfirmasi = observer(() => {
store.authentication.userData.role === "Admin" ? routeData : dataRoute
}
/>
<Card >
<Card>
<div style={{ marginTop: 30 }}>
{/* <Row style={{ marginBottom: 20 }}> */}
{/* <Col span={12}>
{/* <Col span={12}>
<Button
onClick={() => {
store.payback.visibleModalFilterPayback = true;
@ -328,8 +328,8 @@ export const Konfirmasi = observer(() => {
Filter
</Button>
</Col> */}
{/* <Col span={12} style={{ textAlign: "right" }}> */}
{/* <Search
{/* <Col span={12} style={{ textAlign: "right" }}> */}
{/* <Search
placeholder="input search text"
style={{
width: store.ui.mediaQuery.isMobile ? 160 : 200,
@ -337,7 +337,7 @@ export const Konfirmasi = observer(() => {
marginBottom: store.ui.mediaQuery.isMobile ? 10 : 0,
}}
/> */}
{/* </Col> */}
{/* </Col> */}
{/* </Row> */}
{store.ui.mediaQuery.isDesktop && (
<Table
@ -400,14 +400,14 @@ export const Konfirmasi = observer(() => {
>
<List.Item.Meta
className={[""].join(" ")}
title={item.userData_name}
// title={item.username}
description={
<div style={{}}>
<p>
<small>Username: {item.username}</small>
<b>Username: {item.username}</b>
<br />
{item.is_active === false ? (
<Space size="middle">
<Space size="small">
<Button
onClick={async () => {
Modal.confirm({
@ -473,7 +473,13 @@ export const Konfirmasi = observer(() => {
</Tag>
)}
<Button
style={{ marginRight: 10, marginTop: 7 }}
style={
item.is_active === true
? {
marginTop: 5,
}
: { marginLeft: 10, marginTop: 5 }
}
onClick={async () => {
// await store.transaction.getDataHistoryTopUp(record.id);
// await store.transaction.getDetailHistoryTransaction(record.id);
@ -488,6 +494,13 @@ export const Konfirmasi = observer(() => {
Foto Identitas
</Button>
<Button
style={
item.is_active === true
? {
marginLeft:10,
}
: {marginTop: 10 }
}
onClick={async () => {
setToko(item);
setVisibleModalToko(true);