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

See merge request empatnusabangsa/ppob/ppob-frontend!53
This commit is contained in:
ajat sudrajat 2022-01-06 05:32:09 +00:00
commit 1626db4f9d
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,9 @@ import {
WindowsOutlined, WindowsOutlined,
SlackOutlined, SlackOutlined,
AppstoreAddOutlined, AppstoreAddOutlined,
PieChartOutlined,
AppstoreOutlined, AppstoreOutlined,
DollarCircleOutlined,
} 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";
@ -187,12 +189,12 @@ export const DesktopLayout = observer(() => {
{store.authentication.userData.role === "Admin" && ( {store.authentication.userData.role === "Admin" && (
<SubMenu <SubMenu
key="product-main" key="product-main"
icon={<AppstoreAddOutlined />} icon={<PieChartOutlined />}
title="Product" title="Product"
> >
<Menu.Item key="product"> <Menu.Item key="product">
<Link to={LINKS.PRODUCT}> <Link to={LINKS.PRODUCT}>
<DatabaseOutlined /> <PieChartOutlined />
<span>Produk</span> <span>Produk</span>
</Link> </Link>
</Menu.Item> </Menu.Item>
@ -217,7 +219,7 @@ export const DesktopLayout = observer(() => {
{store.authentication.userData.role === "Supervisor" && ( {store.authentication.userData.role === "Supervisor" && (
<Menu.Item key="product"> <Menu.Item key="product">
<Link to={LINKS.PRODUCT}> <Link to={LINKS.PRODUCT}>
<AppstoreAddOutlined /> <PieChartOutlined />
<span>Produk</span> <span>Produk</span>
</Link> </Link>
</Menu.Item> </Menu.Item>
@ -225,7 +227,7 @@ export const DesktopLayout = observer(() => {
{store.authentication.userData.role === "Admin Partner" && ( {store.authentication.userData.role === "Admin Partner" && (
<Menu.Item key="product"> <Menu.Item key="product">
<Link to={LINKS.PRODUCT}> <Link to={LINKS.PRODUCT}>
<AppstoreAddOutlined /> <PieChartOutlined />
<span>Produk</span> <span>Produk</span>
</Link> </Link>
</Menu.Item> </Menu.Item>
@ -233,7 +235,7 @@ export const DesktopLayout = observer(() => {
{store.authentication.userData.role === "Sales" && ( {store.authentication.userData.role === "Sales" && (
<Menu.Item key="product"> <Menu.Item key="product">
<Link to={LINKS.PRODUCT}> <Link to={LINKS.PRODUCT}>
<AppstoreAddOutlined /> <PieChartOutlined />
<span>Produk</span> <span>Produk</span>
</Link> </Link>
</Menu.Item> </Menu.Item>
@ -257,7 +259,7 @@ export const DesktopLayout = observer(() => {
{store.authentication.userData.role !== "Admin Partner" && ( {store.authentication.userData.role !== "Admin Partner" && (
<SubMenu <SubMenu
key="payback-main" key="payback-main"
icon={<ProfileOutlined />} icon={<DollarCircleOutlined />}
title="Pembayaran" title="Pembayaran"
> >
{store.authentication.userData.role !== "Retail" && ( {store.authentication.userData.role !== "Retail" && (

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

@ -19,6 +19,8 @@ import {
SettingOutlined, SettingOutlined,
IdcardOutlined, IdcardOutlined,
AppstoreAddOutlined, AppstoreAddOutlined,
DollarCircleOutlined,
PieChartOutlined
} 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";
@ -121,7 +123,7 @@ export const MenuList = observer((props) => {
> >
<Menu.Item key="produk"> <Menu.Item key="produk">
<Link to={LINKS.PRODUCT}> <Link to={LINKS.PRODUCT}>
<AliyunOutlined /> <PieChartOutlined />
<span>Produk</span> <span>Produk</span>
</Link> </Link>
</Menu.Item> </Menu.Item>
@ -146,7 +148,7 @@ export const MenuList = observer((props) => {
{store.authentication.userData.role === "Admin Partner" && ( {store.authentication.userData.role === "Admin Partner" && (
<Menu.Item key="retail"> <Menu.Item key="retail">
<Link to={LINKS.PRODUCT}> <Link to={LINKS.PRODUCT}>
<AppstoreAddOutlined /> <PieChartOutlined />
<span>Produk</span> <span>Produk</span>
</Link> </Link>
</Menu.Item> </Menu.Item>
@ -154,7 +156,7 @@ export const MenuList = observer((props) => {
{store.authentication.userData.role === "Sales" && ( {store.authentication.userData.role === "Sales" && (
<Menu.Item key="retail"> <Menu.Item key="retail">
<Link to={LINKS.PRODUCT}> <Link to={LINKS.PRODUCT}>
<AppstoreAddOutlined /> <PieChartOutlined />
<span>Produk</span> <span>Produk</span>
</Link> </Link>
</Menu.Item> </Menu.Item>
@ -162,7 +164,7 @@ export const MenuList = observer((props) => {
{store.authentication.userData.role === "Supervisor" && ( {store.authentication.userData.role === "Supervisor" && (
<Menu.Item key="retail"> <Menu.Item key="retail">
<Link to={LINKS.PRODUCT}> <Link to={LINKS.PRODUCT}>
<AppstoreAddOutlined /> <PieChartOutlined />
<span>Produk</span> <span>Produk</span>
</Link> </Link>
</Menu.Item> </Menu.Item>
@ -178,7 +180,7 @@ export const MenuList = observer((props) => {
{store.authentication.userData.role !== "Admin Partner" && ( {store.authentication.userData.role !== "Admin Partner" && (
<SubMenu <SubMenu
key="payback-main" key="payback-main"
icon={<CodepenOutlined />} icon={<DollarCircleOutlined />}
title="Pembayaran" title="Pembayaran"
> >
{store.authentication.userData.role !== "Retail" && ( {store.authentication.userData.role !== "Retail" && (

4
src/store/membership.js
View File

@ -57,7 +57,7 @@ export class Membership {
async getDataBySuperior() { async getDataBySuperior() {
try { try {
const response = await http.get(`/users/find-by-supperior?page=${this.page}&pageSize=${this.pageSize}`); const response = await http.get(`/users/find-by-supperior?page=${this.page}&pageSize=${this.pageSize}`);
//console.log(response) console.log(response)
this.data = response.body.data.map((item, idx) => { this.data = response.body.data.map((item, idx) => {
item.key = idx; item.key = idx;
item.name = item?.user_detail?.name; item.name = item?.user_detail?.name;
@ -68,7 +68,7 @@ export class Membership {
}) ?? [] }) ?? []
this.total_data = response?.body?.count ?? 0 this.total_data = response?.body?.count ?? 0
//console.log(this.total_data) console.log(this.total_data)
} catch (e) { } catch (e) {
console.error(e); console.error(e);
} }