diff --git a/src/component/SubcategoryComponent.js b/src/component/SubcategoryComponent.js index 3cbeb2a..fd742f2 100644 --- a/src/component/SubcategoryComponent.js +++ b/src/component/SubcategoryComponent.js @@ -85,7 +85,7 @@ export const SubcategoryComponent = observer((props) => { : message.error( response?.body?.message || "Gagal Ubah Data Sub Kategori" ); - //await getData(); + await getData(); } catch (e) { message.error( e.response?.body?.message || "Gagal Ubah Data Sub Kategori" @@ -106,6 +106,7 @@ export const SubcategoryComponent = observer((props) => { : message.error( response?.body?.message || "Gagal Tambah Sub Kategori" ); + await getData(); } catch (e) { console.log(e, "apa errornya"); message.error(e.response?.body?.message || "Gagal Tambah Sub Kategori"); diff --git a/src/pages/App/DesktopLayout.js b/src/pages/App/DesktopLayout.js index 2a51446..b4399bf 100644 --- a/src/pages/App/DesktopLayout.js +++ b/src/pages/App/DesktopLayout.js @@ -140,6 +140,14 @@ export const DesktopLayout = observer(() => { )} + {store.authentication.userData.role === "Sales" && ( + + + + Keanggotaan + + + )} {store.authentication.userData.role === "Supervisor" && ( @@ -221,6 +229,14 @@ export const DesktopLayout = observer(() => { )} + {store.authentication.userData.role === "Sales" && ( + + + + Produk + + + )} {store.authentication.userData.role === "Admin Partner" && ( @@ -237,8 +253,7 @@ export const DesktopLayout = observer(() => { )} - {store.authentication.userData.role !== "Admin Partner" && - store.authentication.userData.role !== "Retail" && ( + {store.authentication.userData.role !== "Admin Partner" && ( } diff --git a/src/pages/App/MenuList.js b/src/pages/App/MenuList.js index f5ee614..607b3ae 100644 --- a/src/pages/App/MenuList.js +++ b/src/pages/App/MenuList.js @@ -51,14 +51,14 @@ export const MenuList = observer((props) => { overflowedIndicator={0} forceSubMenuRender={true} > - {/* {store.authentication.userData.role === "Admin" && ( */} - - - - Beranda - - - {/* )} */} + {store.authentication.userData.role !== "Retail" && ( + + + + Beranda + + + )} {store.authentication.userData.role === "Admin" && ( @@ -75,6 +75,14 @@ export const MenuList = observer((props) => { )} + {store.authentication.userData.role === "Sales" && ( + + + + Keanggotaan + + + )} {store.authentication.userData.role === "Admin" && ( } title="Config"> @@ -135,6 +143,14 @@ export const MenuList = observer((props) => { )} + {store.authentication.userData.role === "Sales" && ( + + + + Produk + + + )} {store.authentication.userData.role === "Supervisor" && ( @@ -151,31 +167,30 @@ export const MenuList = observer((props) => { )} - {store.authentication.userData.role !== "Retail" && - store.authentication.userData.role !== "Admin Partner" && ( - } - title="Pembayaran" - > - {store.authentication.userData.role !== "Retail" && ( - - - - Konfirmasi - - - )} - {store.authentication.userData.role !== "Admin" && ( - - - - Dibuat oleh Saya - - - )} - - )} + {store.authentication.userData.role !== "Admin Partner" && ( + } + title="Pembayaran" + > + {store.authentication.userData.role !== "Retail" && ( + + + + Konfirmasi + + + )} + {store.authentication.userData.role !== "Admin" && ( + + + + Dibuat oleh Saya + + + )} + + )} {store.authentication.userData.role !== "Admin" && ( diff --git a/src/pages/Login/Login.js b/src/pages/Login/Login.js index 7a46f2e..a0df820 100644 --- a/src/pages/Login/Login.js +++ b/src/pages/Login/Login.js @@ -1,9 +1,9 @@ import React from "react"; -import {observer} from 'mobx-react-lite'; -import {useStore} from "../../utils/useStore"; -import {Button, Card, Col, Form, Input, message, Row, Typography} from 'antd'; -import {useHistory} from "react-router-dom"; -import {LINKS} from "../../routes/app"; +import { observer } from "mobx-react-lite"; +import { useStore } from "../../utils/useStore"; +import { Button, Card, Col, Form, Input, message, Row, Typography } from "antd"; +import { useHistory } from "react-router-dom"; +import { LINKS } from "../../routes/app"; export const Login = observer(() => { const store = useStore(); @@ -23,21 +23,31 @@ export const Login = observer(() => { } message.error(e.message); } - history.push(LINKS.HOME); - } + store.authentication.userData.role === "Retail" + ? history.push(LINKS.TRANSACTION) + : history.push(LINKS.HOME); + }; return ( -
- +
+ -
-
+
+
{
{ onFinish={handleLogin} className={"w-9/12"} > - - + + - - + +
- +
diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js index fd5fe25..1c12ed3 100644 --- a/src/pages/Membership/Membership.js +++ b/src/pages/Membership/Membership.js @@ -327,13 +327,10 @@ export const Membership = observer(() => { description={

+ Saldo System : {item.name}
Role : {item.roleName}
- Saldo Supplier : {item.coa.amount} - {" "} -
- - Saldo System : {item.coa.amount} + Saldo Supplier : {item.coa?.amount} {" "}