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

fix: change wording menu payback

Browse Source
This commit is contained in:
caturbgs 2021-12-22 21:40:07 +07:00
parent b1d35e2df6
commit 8f6620e7aa
6 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -207,22 +207,22 @@ export const DesktopLayout = observer(() => {
)} )}
<SubMenu <SubMenu
key="payback-main" key="payback-main"
icon={<ProfileOutlined />} icon={<ProfileOutlined/>}
title="Payback" title="Created"
> >
{store.authentication.userData.role !== "Retail" && ( {store.authentication.userData.role !== "Retail" && (
<Menu.Item key="payback-to-user"> <Menu.Item key="payback-to-user">
<Link to={LINKS.PAYBACK}> <Link to={LINKS.PAYBACK}>
<PayCircleOutlined /> <PayCircleOutlined/>
<span>Payback To</span> <span>Confirmation</span>
</Link> </Link>
</Menu.Item> </Menu.Item>
)} )}
{store.authentication.userData.role !== "Admin" && ( {store.authentication.userData.role !== "Admin" && (
<Menu.Item key="payback-from-user"> <Menu.Item key="payback-from-user">
<Link to={LINKS.PAYBACK_FROM_USER}> <Link to={LINKS.PAYBACK_CREATED}>
<AlipayOutlined/> <AlipayOutlined/>
<span>Payback</span> <span>Created</span>
</Link> </Link>
</Menu.Item> </Menu.Item>
)} )}

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

@ -131,16 +131,16 @@ export const MenuList = observer((props) => {
{store.authentication.userData.role !== "Retail" && ( {store.authentication.userData.role !== "Retail" && (
<Menu.Item key="payback-to-user"> <Menu.Item key="payback-to-user">
<Link to={LINKS.PAYBACK}> <Link to={LINKS.PAYBACK}>
<PayCircleOutlined /> <PayCircleOutlined/>
<span>Payback To</span> <span>Confirmation</span>
</Link> </Link>
</Menu.Item> </Menu.Item>
)} )}
{store.authentication.userData.role !== "Admin" && ( {store.authentication.userData.role !== "Admin" && (
<Menu.Item key="payback-from-user"> <Menu.Item key="payback-from-user">
<Link to={LINKS.PAYBACK_FROM_USER}> <Link to={LINKS.PAYBACK_CREATED}>
<AlipayOutlined/> <AlipayOutlined/>
<span>Payback</span> <span>Created</span>
</Link> </Link>
</Menu.Item> </Menu.Item>
)} )}

1
src/pages/Payback/Payback.js
View File

@ -33,7 +33,6 @@ export const Payback = observer(() => {
init(); init();
}, []); }, []);
const columns = [ const columns = [
{ {
title: "Picture", title: "Picture",

5
src/pages/Payback/PaybackFromUser.js → src/pages/Payback/PaybackCreated.js
View File

@ -10,7 +10,7 @@ import {ModalLoaderContext} from "../../utils/modal";
const {Search} = Input; const {Search} = Input;
export const PaybackFromUser = observer(() => { export const PaybackCreated = observer(() => {
const store = useStore(); const store = useStore();
const [initialData, setInitialData] = useState({}); const [initialData, setInitialData] = useState({});
const modalLoader = useContext(ModalLoaderContext); const modalLoader = useContext(ModalLoaderContext);
@ -37,7 +37,6 @@ export const PaybackFromUser = observer(() => {
init(); init();
}, []); }, []);
const columns = [ const columns = [
{ {
title: "Picture", title: "Picture",
@ -70,7 +69,7 @@ export const PaybackFromUser = observer(() => {
name: "Home", name: "Home",
}, },
{ {
route: LINKS.PAYBACK_FROM_USER, route: LINKS.PAYBACK_CREATED,
name: <span style={{fontWeight: "bold"}}>Payback User</span>, name: <span style={{fontWeight: "bold"}}>Payback User</span>,
}, },
]; ];

4
src/pages/Payback/PaybackModal.js
View File

@ -68,7 +68,7 @@ export const PaybackModal = ({initialData}) => {
image_prove: responseFilename image_prove: responseFilename
} }
await store.payback.create(request); await store.payback.create(request);
message.success("Success Add Payback"); message.success("Success Add Created");
} catch (e) { } catch (e) {
if (e.response?.body?.message) { if (e.response?.body?.message) {
message.error(e.response.body.message); message.error(e.response.body.message);
@ -97,7 +97,7 @@ export const PaybackModal = ({initialData}) => {
return ( return (
<Modal <Modal
visible={store.payback.visibleModalPayback} visible={store.payback.visibleModalPayback}
title={"Create a new Payback"} title={"Create a new Created"}
okText={"Create"} okText={"Create"}
cancelText="Cancel" cancelText="Cancel"
onCancel={handleCancel} onCancel={handleCancel}

8
src/routes/app.js
View File

@ -12,7 +12,7 @@ import {Partner} from "../pages/Config/Partner";
import {Supplier} from "../pages/Config/Supplier"; import {Supplier} from "../pages/Config/Supplier";
import {Category} from "../pages/Product/Category"; import {Category} from "../pages/Product/Category";
import {Payback} from "../pages/Payback/Payback"; import {Payback} from "../pages/Payback/Payback";
import {PaybackFromUser} from "../pages/Payback/PaybackFromUser"; import {PaybackCreated} from "../pages/Payback/PaybackCreated";
import {Subcategory} from "../pages/Product/Subcategory"; import {Subcategory} from "../pages/Product/Subcategory";
export const LINKS = { export const LINKS = {
@ -27,7 +27,7 @@ export const LINKS = {
SUPPLIER: "/app/supplier", SUPPLIER: "/app/supplier",
CATEGORY: "/app/category", CATEGORY: "/app/category",
PAYBACK: "/app/payback", PAYBACK: "/app/payback",
PAYBACK_FROM_USER: "/app/payback-from-user", PAYBACK_CREATED: "/app/payback-created",
SUBCATEGORY: "/app/subcategory", SUBCATEGORY: "/app/subcategory",
USER_DETAIL: "/app/user-detail", USER_DETAIL: "/app/user-detail",
PRODUCT_DETAIL: "/app/product-detail", PRODUCT_DETAIL: "/app/product-detail",
@ -47,8 +47,8 @@ export const AppRoute = () => {
<Route path={LINKS.COMMISSION}> <Route path={LINKS.COMMISSION}>
<Commission/> <Commission/>
</Route> </Route>
<Route path={LINKS.PAYBACK_FROM_USER}> <Route path={LINKS.PAYBACK_CREATED}>
<PaybackFromUser/> <PaybackCreated/>
</Route> </Route>
<Route path={LINKS.CATEGORY}> <Route path={LINKS.CATEGORY}>
<Category/> <Category/>