From a790a23c93e479479bb23b64f95c53e1b9d5ed7a Mon Sep 17 00:00:00 2001
From: "ajat91.sudrajat" <ajat91.sudrajat@gmail.com>
Date: Fri, 4 Feb 2022 20:20:04 +0700
Subject: [PATCH] Bug Fixing

---
 src/component/ProductComponent.js  |  4 ++--
 src/pages/Membership/DetailUser.js |  4 ++--
 src/pages/Membership/Membership.js | 22 ++++++++++++----------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js
index b01aca2..df8ddf6 100644
--- a/src/component/ProductComponent.js
+++ b/src/component/ProductComponent.js
@@ -128,7 +128,7 @@ export const ProductComponent = observer((props) => {
       ),
     },
   ];
-  if (store.authentication.userData.role !== "Admin") columns.pop();
+  //if (store.authentication.userData.role !== "Admin") columns.pop();
   //if (store.authentication.userData.role === "Admin Partner") delete columns[2];
   if (store.authentication.userData.role === "Admin Partner") delete columns[3];
   if (store.authentication.userData.role != "Admin Partner") delete columns[4];
@@ -136,7 +136,7 @@ export const ProductComponent = observer((props) => {
   if (store.authentication.userData.role !== "Admin") delete columns[2];
   if (store.authentication.userData.role !== "Admin") delete columns[5];
   if (store.authentication.userData.role === "Admin Partner") delete columns[7];
-  if (store.authentication.userData.role !== "Admin") delete columns[8];
+  //if (store.authentication.userData.role !== "Admin") delete columns[8];
   //if (store.authentication.userData.role === "Admin Partner") delete columns[5];
 
   const deleteData = async (id) => {
diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js
index 7257b59..642ae26 100644
--- a/src/pages/Membership/DetailUser.js
+++ b/src/pages/Membership/DetailUser.js
@@ -412,8 +412,8 @@ export const DetailUser = observer(() => {
             Detail User
           </Title>
           <Col
-            lg={store.authentication.userData.role === "Admin" ? 18 : 13}
-            xs={store.authentication.userData.role === "Admin" ? 18 : 13}
+            lg={store.authentication.userData.role === "Admin" ? 18 : 17}
+            xs={store.authentication.userData.role === "Admin" ? 18 : 17}
             style={{ textAlign: "right" }}
           >
             <Space
diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js
index 8852743..d843581 100644
--- a/src/pages/Membership/Membership.js
+++ b/src/pages/Membership/Membership.js
@@ -201,15 +201,17 @@ export const Membership = observer(() => {
       key: "action",
       render: (text, record) => (
         <Space size="middle">
-          <Button
-            onClick={() => {
-              setDestination(record?.id);
-              console.log(record?.id);
-              setIsVisibleTopUpModal(true);
-            }}
-          >
-            <DownloadOutlined /> Top Up Saldo
-          </Button>
+          {store.authentication.userData.role === "Admin" && (
+            <Button
+              onClick={() => {
+                setDestination(record?.id);
+                console.log(record?.id);
+                setIsVisibleTopUpModal(true);
+              }}
+            >
+              <DownloadOutlined /> Top Up Saldo
+            </Button>
+          )}
           <Button
             onClick={async () => {
               await store.transaction.getDataHistoryTopUp(record.id);
@@ -226,7 +228,7 @@ export const Membership = observer(() => {
     },
   ];
 
-  if (store.authentication.userData.role === "Customer Service") columns.pop();
+  //if (store.authentication.userData.role === "Customer Service") columns.pop();
   const routeData = [
     {
       route: LINKS.HOME,