diff --git a/src/pages/App/DesktopLayout.js b/src/pages/App/DesktopLayout.js
index 1b47af9..4316984 100644
--- a/src/pages/App/DesktopLayout.js
+++ b/src/pages/App/DesktopLayout.js
@@ -10,6 +10,8 @@ import {
   DatabaseOutlined,
   FileAddOutlined,
   FileSyncOutlined,
+  FileProtectOutlined,
+  ShoppingCartOutlined,
 } from "@ant-design/icons";
 import { AppRoute, LINKS } from "../../routes/app";
 import { useStore } from "../../utils/useStore";
@@ -122,12 +124,12 @@ export const DesktopLayout = observer(() => {
               {store.authentication.userData.role !== "Retail" && (
                 <Menu.Item key="membership">
                   <Link to={LINKS.MEMBERSHIP}>
-                    <HomeOutlined />
+            <FileProtectOutlined />
                     <span>Membership</span>
                   </Link>
                 </Menu.Item>
               )}
-              {store.authentication.userData.role !== "Retail" && (
+              {store.authentication.userData.role === "Admin" && (
                 <SubMenu
                   key="config"
                   icon={<HomeOutlined />}
@@ -154,10 +156,10 @@ export const DesktopLayout = observer(() => {
                   </Menu.Item>
                 </SubMenu>
               )}
-              {store.authentication.userData.role !== "Retail" && (
+              {store.authentication.userData.role === "Admin" && (
                 <SubMenu
                   key="product-main"
-                  icon={<ProfileOutlined />}
+                  icon={<DatabaseOutlined />}
                   title="Product"
                 >
                   <Menu.Item key="product">
@@ -180,28 +182,28 @@ export const DesktopLayout = observer(() => {
                   </Menu.Item>
                 </SubMenu>
               )}
-              {store.authentication.userData.role !== "Retail" && (
+              {store.authentication.userData.role !== "Admin" && (
                 <Menu.Item key="product">
                   <Link to={LINKS.PRODUCT}>
-                    <HomeOutlined />
+                    <DatabaseOutlined />
                     <span>Product</span>
                   </Link>
                 </Menu.Item>
               )}
+              {store.authentication.userData.role === "Retail" && (
+                <Menu.Item key="transaction">
+                  <Link to={LINKS.TRANSACTION}>
+                    <ShoppingCartOutlined />
+                    <span>Transaction</span>
+                  </Link>
+                </Menu.Item>
+              )}
               <Menu.Item key="payback">
                 <Link to={LINKS.PAYBACK}>
-                  <HomeOutlined />
+                  <DatabaseOutlined />
                   <span>Payback</span>
                 </Link>
               </Menu.Item>
-              {store.authentication.userData.role === "Retail" && (
-                <Menu.Item key="transaction">
-                  <Link to={LINKS.TRANSACTION}>
-                    <HomeOutlined />
-                    <span>Transaction</span>
-                  </Link>
-                </Menu.Item>
-              )}
               <Menu.Item key="profile">
                 <Link to={LINKS.PROFILE}>
                   <UserOutlined />
diff --git a/src/pages/App/MenuList.js b/src/pages/App/MenuList.js
index afc5508..f7796cd 100644
--- a/src/pages/App/MenuList.js
+++ b/src/pages/App/MenuList.js
@@ -12,6 +12,7 @@ import {
   MoneyCollectOutlined,
   ProfileOutlined,
   ProjectOutlined,
+  ShoppingCartOutlined,
   UserOutlined,
 } from "@ant-design/icons";
 import { observer } from "mobx-react-lite";
@@ -59,7 +60,7 @@ export const MenuList = observer((props) => {
           </Link>
         </Menu.Item>
       )}
-      {store.authentication.userData.role !== "Retail" && (
+      {store.authentication.userData.role === "Admin" && (
         <SubMenu key="config" icon={<MenuUnfoldOutlined />} title="Config">
           <Menu.Item key="partner">
             <Link to={LINKS.PARTNER}>
@@ -81,7 +82,7 @@ export const MenuList = observer((props) => {
           </Menu.Item>
         </SubMenu>
       )}
-      {store.authentication.userData.role !== "Retail" && (
+      {store.authentication.userData.role === "Admin" && (
         <SubMenu key="product-main" icon={<ProfileOutlined />} title="Product">
           <Menu.Item key="product">
             <Link to={LINKS.PRODUCT}>
@@ -103,10 +104,18 @@ export const MenuList = observer((props) => {
           </Menu.Item>
         </SubMenu>
       )}
-      {store.authentication.userData.role === ("Retail" || "Admin") && (
+      {store.authentication.userData.role !== "Admin" && (
+        <Menu.Item key="retail">
+          <Link to={LINKS.PRODUCT}>
+            <DatabaseOutlined />
+            <span>Product</span>
+          </Link>
+        </Menu.Item>
+      )}
+      {store.authentication.userData.role === "Retail" && (
         <Menu.Item key="transaction">
           <Link to={LINKS.TRANSACTION}>
-            <HomeOutlined />
+            <ShoppingCartOutlined />
             <span>Transaction</span>
           </Link>
         </Menu.Item>
@@ -117,14 +126,6 @@ export const MenuList = observer((props) => {
           <span>Payback</span>
         </Link>
       </Menu.Item>
-      {store.authentication.userData.role === ("Retail" || "Admin") && (
-        <Menu.Item key="transaction">
-          <Link to={LINKS.TRANSACTION}>
-            <HomeOutlined />
-            <span>Transaction</span>
-          </Link>
-        </Menu.Item>
-      )}
       <Menu.Item key="profile">
         <Link to={LINKS.PROFILE}>
           <UserOutlined />
diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js
index 8bcf4e6..3db8042 100644
--- a/src/pages/Membership/Membership.js
+++ b/src/pages/Membership/Membership.js
@@ -45,7 +45,8 @@ export const Membership = observer(() => {
         setIsLoading(true);
         await getData();
         store.role.getData();
-        await store.supplier.getData();
+        if (store.authentication.userData.role === "Admin")
+          await store.supplier.getData();
         setIsLoading(false);
       } catch (e) {
         setIsLoading(false);
@@ -85,10 +86,11 @@ export const Membership = observer(() => {
   const handleSubmitTransaction = async (data) => {
     setConfirmLoading(true);
     try {
-      let input = data;
       data.destination = destination;
 
-      await store.transaction.distributeAdmin(data);
+      (await store.authentication.userData.role) === "Admin"
+        ? store.transaction.distributeAdmin(data)
+        : store.transaction.distribute(data);
       message.success("Success Top Up");
       //await store.supplier.getData()
     } catch (e) {
@@ -266,11 +268,6 @@ export const Membership = observer(() => {
   };
   return (
     <div className={["ppob-container"].join(" ")}>
-      {/* <Modal title="Basic Modal" visible={isModalVisible} onOk={handleOk} onCancel={handleCancel}>
-        <p>Some contents...</p>
-        <p>Some contents...</p>
-        <p>Some contents...</p>
-      </Modal> */}
       <BreadcumbComponent data={routeData} />
       <Card>
         <div>
@@ -410,19 +407,21 @@ export const Membership = observer(() => {
         }}
       >
         <Form form={form} layout="vertical">
-          <Form.Item
-            name="supplier"
-            label="Supplier"
-            rules={[{ required: true, message: "Please input supplier!" }]}
-          >
-            <Select placeholder="Select Code Supplier" allowClear>
-              {store.supplier.data.map((item) => (
-                <Option value={item.code} key={item.code}>
-                  {item.code}
-                </Option>
-              ))}
-            </Select>
-          </Form.Item>
+          {store.authentication.userData.role === "Admin" && (
+            <Form.Item
+              name="supplier"
+              label="Supplier"
+              rules={[{ required: true, message: "Please input supplier!" }]}
+            >
+              <Select placeholder="Select Code Supplier" allowClear>
+                {store.supplier.data.map((item) => (
+                  <Option value={item.code} key={item.code}>
+                    {item.code}
+                  </Option>
+                ))}
+              </Select>
+            </Form.Item>
+          )}
           <Form.Item
             name="amount"
             label="Amount"
diff --git a/src/pages/Payback/Payback.js b/src/pages/Payback/Payback.js
index c3c6738..2b2742d 100644
--- a/src/pages/Payback/Payback.js
+++ b/src/pages/Payback/Payback.js
@@ -1,290 +1,308 @@
-import React, {useState} from "react";
-import {Button, Card, Col, Divider, Image, Input, List, message, Row, Space, Table,} from "antd";
-import {useStore} from "../../utils/useStore";
-import {observer} from "mobx-react-lite";
-import {CheckCircleOutlined, CloseOutlined, FilterOutlined, PlusSquareOutlined,} from "@ant-design/icons";
-import {PaybackModal} from "./PaybackModal";
-import {BreadcumbComponent} from "../../component/BreadcumbComponent";
-import {LINKS} from "../../routes/app";
+import React, { useState } from "react";
+import {
+  Button,
+  Card,
+  Col,
+  Divider,
+  Image,
+  Input,
+  List,
+  message,
+  Row,
+  Space,
+  Table,
+} from "antd";
+import { useStore } from "../../utils/useStore";
+import { observer } from "mobx-react-lite";
+import {
+  CheckCircleOutlined,
+  CloseOutlined,
+  FilterOutlined,
+  PlusSquareOutlined,
+} from "@ant-design/icons";
+import { PaybackModal } from "./PaybackModal";
+import { BreadcumbComponent } from "../../component/BreadcumbComponent";
+import { LINKS } from "../../routes/app";
 
-const {Search} = Input;
+const { Search } = Input;
 
 export const Payback = observer(() => {
-    const store = useStore();
-    const [visibleModal, setVisibleModal] = useState(false);
-    const [confirmLoading, setConfirmLoading] = useState(false);
-    const [initialData, setInitialData] = useState({});
+  const store = useStore();
+  const [visibleModal, setVisibleModal] = useState(false);
+  const [confirmLoading, setConfirmLoading] = useState(false);
+  const [initialData, setInitialData] = useState({});
 
-    // useEffect(() => {
-    //     // const init = async () => {
-    //     //   try {
-    //     //     setIsLoading(true);
-    //     //     await store.membership.getData();
-    //     //     await store.role.getData();
-    //     //     setIsLoading(false);
-    //     //   } catch (e) {
-    //     //     setIsLoading(false);
-    //     //   }
-    //     // };
-    //
-    //     // init();
-    // }, []);
+  // useEffect(() => {
+  //     // const init = async () => {
+  //     //   try {
+  //     //     setIsLoading(true);
+  //     //     await store.membership.getData();
+  //     //     await store.role.getData();
+  //     //     setIsLoading(false);
+  //     //   } catch (e) {
+  //     //     setIsLoading(false);
+  //     //   }
+  //     // };
+  //
+  //     // init();
+  // }, []);
 
-    const dummyData = [
-        {
-            key: '1',
-            id: 1,
-            name: "John Doe",
-            picture: "https://presidenproperti.com/wp-content/uploads/2018/11/blog-ph.jpg",
-            amount: "Rp. 1.000.000",
-        },
-        {
-            key: '2',
-            id: 1,
-            name: "John Doe",
-            picture: "https://presidenproperti.com/wp-content/uploads/2018/11/blog-ph.jpg",
-            amount: "Rp. 1.000.000",
-        },
-        {
-            key: '3',
-            id: 1,
-            name: "John Doe",
-            picture: "https://presidenproperti.com/wp-content/uploads/2018/11/blog-ph.jpg",
-            amount: "Rp. 1.000.000",
-        },
-        {
-            key: '4',
-            id: 1,
-            name: "John Doe",
-            picture: "https://presidenproperti.com/wp-content/uploads/2018/11/blog-ph.jpg",
-            amount: "Rp. 1.000.000",
-        },
-    ]
+  const dummyData = [
+    {
+      key: "1",
+      id: 1,
+      name: "John Doe",
+      picture:
+        "https://presidenproperti.com/wp-content/uploads/2018/11/blog-ph.jpg",
+      amount: "Rp. 1.000.000",
+    },
+    {
+      key: "2",
+      id: 1,
+      name: "John Doe",
+      picture:
+        "https://presidenproperti.com/wp-content/uploads/2018/11/blog-ph.jpg",
+      amount: "Rp. 1.000.000",
+    },
+    {
+      key: "3",
+      id: 1,
+      name: "John Doe",
+      picture:
+        "https://presidenproperti.com/wp-content/uploads/2018/11/blog-ph.jpg",
+      amount: "Rp. 1.000.000",
+    },
+    {
+      key: "4",
+      id: 1,
+      name: "John Doe",
+      picture:
+        "https://presidenproperti.com/wp-content/uploads/2018/11/blog-ph.jpg",
+      amount: "Rp. 1.000.000",
+    },
+  ];
 
-    const columns = [
-        {
-            title: "Name",
-            dataIndex: "name",
-            key: "name",
-        },
-        {
-            title: "Picture",
-            dataIndex: "picture",
-            key: "picture",
-            render: (text, record) => (
-                <Image
-                    src={record.picture}
-                    style={{width: 50, height: 50}}
-                    shape="circle"
-                    alt="avatar"
-                />
-            ),
-        },
-        {
-            title: "Amount",
-            dataIndex: "amount",
-            key: "amount",
-        },
-        {
-            title: "Action",
-            key: "action",
-            width: 100,
-            render: (text, record) => (
-                <Space size="middle">
-                    <Button
-                        onClick={async () => {
-                            await handleAction(record, 'accept');
-                        }}
-                        icon={<CheckCircleOutlined/>}
-                        style={{
-                            backgroundColor: "#1bb91d",
-                            color: "#fff",
-                            borderColor: "#1bb91d",
-                        }}
-                    >
-                        Accept
-                    </Button>
-                    <Button
-                        onClick={async () => {
-                            await handleAction(record, 'reject');
-                        }}
-                        icon={<CloseOutlined/>}
-                        style={{
-                            backgroundColor: "#ff1c1c",
-                            color: "#fff",
-                            borderColor: "#ff1c1c",
-                        }}
-                    >
-                        Reject
-                    </Button>
-                </Space>
-            ),
-        },
-    ];
+  const columns = [
+    {
+      title: "Name",
+      dataIndex: "name",
+      key: "name",
+    },
+    {
+      title: "Picture",
+      dataIndex: "picture",
+      key: "picture",
+      render: (text, record) => (
+        <Image
+          src={record.picture}
+          style={{ width: 50, height: 50 }}
+          shape="circle"
+          alt="avatar"
+        />
+      ),
+    },
+    {
+      title: "Amount",
+      dataIndex: "amount",
+      key: "amount",
+    },
+    {
+      title: "Action",
+      key: "action",
+      width: 100,
+      render: (text, record) => (
+        <Space size="middle">
+          <Button
+            onClick={async () => {
+              await handleAction(record, "accept");
+            }}
+            icon={<CheckCircleOutlined />}
+            style={{
+              backgroundColor: "#1bb91d",
+              color: "#fff",
+              borderColor: "#1bb91d",
+            }}
+          >
+            Accept
+          </Button>
+          <Button
+            onClick={async () => {
+              await handleAction(record, "reject");
+            }}
+            icon={<CloseOutlined />}
+            style={{
+              backgroundColor: "#ff1c1c",
+              color: "#fff",
+              borderColor: "#ff1c1c",
+            }}
+          >
+            Reject
+          </Button>
+        </Space>
+      ),
+    },
+  ];
 
-    const routeData = [
-        {
-            route: LINKS.HOME,
-            name: "Home",
-        },
-        {
-            route: LINKS.PAYBACK,
-            name: <span style={{fontWeight: "bold"}}>Payback</span>,
-        },
-    ];
+  if(store.authentication.userData.role === "Retail") columns.pop();
 
-    const onSubmit = async (data) => {
-        setConfirmLoading(true);
-        try {
-            // await store.membership.create(data);
-            // message.success("Success Add New Member");
-            // await store.membership.getData();
-        } catch (e) {
-            console.error(e, "apa errornya");
-            message.error("Failed Add Member");
-        }
-        setConfirmLoading(false);
-        setVisibleModal(false);
-    };
+  const routeData = [
+    {
+      route: LINKS.HOME,
+      name: "Home",
+    },
+    {
+      route: LINKS.PAYBACK,
+      name: <span style={{ fontWeight: "bold" }}>Payback</span>,
+    },
+  ];
 
-    const handleAction = async (record, type) => {
+  const onSubmit = async (data) => {
+    setConfirmLoading(true);
+    try {
+      // await store.membership.create(data);
+      // message.success("Success Add New Member");
+      // await store.membership.getData();
+    } catch (e) {
+      console.error(e, "apa errornya");
+      message.error("Failed Add Member");
+    }
+    setConfirmLoading(false);
+    setVisibleModal(false);
+  };
 
-    };
+  const handleAction = async (record, type) => {};
 
-    return (
-        <div className={["ppob-container"].join(" ")}>
-            {/* <Modal title="Basic Modal" visible={isModalVisible} onOk={handleOk} onCancel={handleCancel}>
-        <p>Some contents...</p>
-        <p>Some contents...</p>
-        <p>Some contents...</p>
-      </Modal> */}
-            <BreadcumbComponent data={routeData}/>
-            <Card>
-                <div>
-                    <Row style={{marginBottom: 20}}>
-                        <Col span={12}>
-                            <Button>
-                                <FilterOutlined/>
-                                Filter
-                            </Button>
-                        </Col>
-                        <Col span={12} style={{textAlign: "right"}}>
-                            <Search
-                                placeholder="input search text"
-                                style={{
-                                    width: store.ui.mediaQuery.isMobile ? 160 : 200,
-                                    marginRight: store.ui.mediaQuery.isMobile ? 0 : 10,
-                                    marginBottom: store.ui.mediaQuery.isMobile ? 10 : 0,
-                                }}
-                            />
-                            <Button
-                                onClick={() => {
-                                    setInitialData({});
-                                    setVisibleModal(true);
-                                }}
-                            >
-                                <PlusSquareOutlined/> New
-                            </Button>
-                        </Col>
-                    </Row>
-                    {store.ui.mediaQuery.isDesktop && (
-                        <Table
-                            key="1"
-                            hasEmpty
-                            columns={columns}
-                            dataSource={dummyData}
-                            bordered
-                            // pagination={{
-                            //     pageSize: store.membership.pageSize,
-                            //     total: store.membership.total_data,
-                            //     current: store.membership.page + 1,
-                            //     showSizeChanger: true,
-                            //     simple: false
-                            // }}
-                            // onChange={async (page) => {
-                            //     let pageNumber = page.current;
-                            //     store.membership.pageSize = page.pageSize;
-                            //     store.membership.page = pageNumber - 1;
-                            //     // store.membership.isLoading = true;
-                            //     await store.membership.getData();
-                            //     // store.membership.isLoading = false;
-                            // }}
-                        />
-                    )}
-
-                    {store.ui.mediaQuery.isMobile && (
-                        <List
-                            itemLayout="horizontal"
-                            position={"top"}
-                            // pagination={{
-                            //     onChange: (page) => {
-                            //         store.membership.pageSize = page.pageSize;
-                            //         store.membership.page = page.current;
-                            //         store.membership.getData();
-                            //     },
-                            //     pageSize: store.membership.pageSize,
-                            //     total: store.membership.total_data,
-                            //     current: store.membership.page,
-                            //     style: {marginBottom: "1rem", marginRight: "1rem"},
-                            // }}
-                            dataSource={dummyData}
-                            style={{padding: 0}}
-                            renderItem={(item) => {
-                                return (
-                                    <div>
-                                        <List.Item
-                                            key={item.id}
-                                            style={{
-                                                backgroundColor: "#ffffff",
-                                                paddingTop: 0,
-                                                paddingBottom: 0,
-                                                display: "flex",
-                                                flexDirection: "row",
-                                                alignItems: "center",
-                                                justifyContent: "center",
-                                            }}
-                                        >
-                                            <List.Item.Meta
-                                                className={["cariparkir-container"].join(" ")}
-                                                title={item.name}
-                                                description={
-                                                    <div style={{}}>
-                                                        <Image src={item.picture} preview={false}/>
-                                                    </div>
-                                                }
-                                            />
-                                            <div style={{marginRight: 16}}>
-                                                <p
-                                                    style={{
-                                                        fontSize: 9,
-                                                        margin: 0,
-                                                    }}
-                                                >
-                                                    {item.amount}
-                                                </p>
-                                            </div>
-                                        </List.Item>
-                                        <Divider plain style={{margin: 0}}/>
-                                    </div>
-                                );
-                            }}
-                        />
-                    )}
-                </div>
-            </Card>
-
-            <PaybackModal
-                visible={visibleModal}
-                confirmLoading={confirmLoading}
-                initialData={initialData}
-                onCreate={async (data) => {
-                    await onSubmit(data);
+  return (
+    <div className={["ppob-container"].join(" ")}>
+      <BreadcumbComponent data={routeData} />
+      <Card>
+        <div>
+          <Row style={{ marginBottom: 20 }}>
+            <Col span={12}>
+              <Button>
+                <FilterOutlined />
+                Filter
+              </Button>
+            </Col>
+            <Col span={12} style={{ textAlign: "right" }}>
+              <Search
+                placeholder="input search text"
+                style={{
+                  width: store.ui.mediaQuery.isMobile ? 160 : 200,
+                  marginRight: store.ui.mediaQuery.isMobile ? 0 : 10,
+                  marginBottom: store.ui.mediaQuery.isMobile ? 10 : 0,
                 }}
-                onCancel={() => {
+              />
+              {store.authentication.userData.role !== "Admin" && (
+                <Button
+                  onClick={() => {
                     setInitialData({});
-                    setVisibleModal(false);
-                }}
+                    setVisibleModal(true);
+                  }}
+                >
+                  <PlusSquareOutlined /> New
+                </Button>
+              )}
+            </Col>
+          </Row>
+          {store.ui.mediaQuery.isDesktop && (
+            <Table
+              key="1"
+              hasEmpty
+              columns={columns}
+              dataSource={dummyData}
+              bordered
+              // pagination={{
+              //     pageSize: store.membership.pageSize,
+              //     total: store.membership.total_data,
+              //     current: store.membership.page + 1,
+              //     showSizeChanger: true,
+              //     simple: false
+              // }}
+              // onChange={async (page) => {
+              //     let pageNumber = page.current;
+              //     store.membership.pageSize = page.pageSize;
+              //     store.membership.page = pageNumber - 1;
+              //     // store.membership.isLoading = true;
+              //     await store.membership.getData();
+              //     // store.membership.isLoading = false;
+              // }}
             />
+          )}
+
+          {store.ui.mediaQuery.isMobile && (
+            <List
+              itemLayout="horizontal"
+              position={"top"}
+              // pagination={{
+              //     onChange: (page) => {
+              //         store.membership.pageSize = page.pageSize;
+              //         store.membership.page = page.current;
+              //         store.membership.getData();
+              //     },
+              //     pageSize: store.membership.pageSize,
+              //     total: store.membership.total_data,
+              //     current: store.membership.page,
+              //     style: {marginBottom: "1rem", marginRight: "1rem"},
+              // }}
+              dataSource={dummyData}
+              style={{ padding: 0 }}
+              renderItem={(item) => {
+                return (
+                  <div>
+                    <List.Item
+                      key={item.id}
+                      style={{
+                        backgroundColor: "#ffffff",
+                        paddingTop: 0,
+                        paddingBottom: 0,
+                        display: "flex",
+                        flexDirection: "row",
+                        alignItems: "center",
+                        justifyContent: "center",
+                      }}
+                    >
+                      <List.Item.Meta
+                        className={["cariparkir-container"].join(" ")}
+                        title={item.name}
+                        description={
+                          <div style={{}}>
+                            <Image src={item.picture} preview={false} />
+                          </div>
+                        }
+                      />
+                      <div style={{ marginRight: 16 }}>
+                        <p
+                          style={{
+                            fontSize: 9,
+                            margin: 0,
+                          }}
+                        >
+                          {item.amount}
+                        </p>
+                      </div>
+                    </List.Item>
+                    <Divider plain style={{ margin: 0 }} />
+                  </div>
+                );
+              }}
+            />
+          )}
         </div>
-    );
+      </Card>
+
+      <PaybackModal
+        visible={visibleModal}
+        confirmLoading={confirmLoading}
+        initialData={initialData}
+        onCreate={async (data) => {
+          await onSubmit(data);
+        }}
+        onCancel={() => {
+          setInitialData({});
+          setVisibleModal(false);
+        }}
+      />
+    </div>
+  );
 });