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

Merge branch 'develop' into 'devops-production'

Browse Source 
Develop

See merge request empatnusabangsa/ppob/ppob-frontend!119
This commit is contained in:
ajat sudrajat
2022-02-03 07:02:37 +00:00
parent 78923fc727 b18e2dc619
commit 56b8008ee0
27 changed files with 929 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/pages/Product/Category.js
View File

@@ -1,13 +1,12 @@
import React, {useContext, useEffect, useState} from "react";
import {Button, Card, Col, Input, Row, Tabs,message} from "antd";
import {FilterOutlined, PlusSquareOutlined} from "@ant-design/icons";
import {BreadcumbComponent} from "../../component/BreadcumbComponent";
import {useStore} from "../../utils/useStore";
import {observer} from "mobx-react-lite";
import {LINKS} from "../../routes/app";
import {CategoryComponent} from "../../component/CategoryComponent";
import {ModalLoaderContext} from "../../utils/modal";
import React, { useContext, useEffect, useState } from "react";
import { Button, Card, Col, Input, Row, Tabs, message } from "antd";
import { FilterOutlined, PlusSquareOutlined } from "@ant-design/icons";
import { BreadcumbComponent } from "../../component/BreadcumbComponent";
import { useStore } from "../../utils/useStore";
import { observer } from "mobx-react-lite";
import { LINKS } from "../../routes/app";
import { CategoryComponent } from "../../component/CategoryComponent";
import { ModalLoaderContext } from "../../utils/modal";
export const Category = observer(() => {
const store = useStore();
@@ -49,11 +48,13 @@ export const Category = observer(() => {
<Card>
<Row style={{ marginBottom: 20 }}>
<Col span={24} style={{ textAlign: "right" }}>
<Button
onClick={() => (store.category.visibleModalCategory = true)}
>
<PlusSquareOutlined /> New
</Button>
{store.authentication.userData.role !== "Customer Service" && (
<Button
onClick={() => (store.category.visibleModalCategory = true)}
>
<PlusSquareOutlined /> New
</Button>
)}
</Col>
</Row>

2
src/pages/Product/Product.js
View File

@@ -250,7 +250,7 @@ export const Product = observer(() => {
visible={visibleModalUpload}
title={"Upload Excel Product"}
okText={"Create"}
cancelText="Cancel"
cancelText="Batal"
onCancel={() => {
form.resetFields();
handleCancel();

14
src/pages/Product/Subcategory.js
View File

@@ -55,11 +55,15 @@ export const Subcategory = observer(() => {
<Card>
<Row style={{ marginBottom: 20 }}>
<Col span={24} style={{ textAlign: "right" }}>
<Button
onClick={() => (store.subcategory.visibleModalSubcategory = true)}
>
<PlusSquareOutlined /> New
</Button>
{store.authentication.userData.role !== "Customer Service" && (
<Button
onClick={() =>
(store.subcategory.visibleModalSubcategory = true)
}
>
<PlusSquareOutlined /> New
</Button>
)}
</Col>
</Row>
<SubcategoryComponent />