From d683951c4947d8b361bc3fa7eaad86e0663842e2 Mon Sep 17 00:00:00 2001
From: "ajat91.sudrajat" <ajat91.sudrajat@gmail.com>
Date: Fri, 4 Feb 2022 19:26:02 +0700
Subject: [PATCH 1/3] Bug Fixing

---
 src/component/ProductComponent.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js
index 4a37738..3a3cc7c 100644
--- a/src/component/ProductComponent.js
+++ b/src/component/ProductComponent.js
@@ -228,9 +228,13 @@ export const ProductComponent = observer((props) => {
     store.product.filterSupplier = filterSupplier;
     store.product.filterSubCategory = filterSubCategories;
     modalLoader.setLoading(true);
+    store.authentication.userData.role === "Admin Partner"
+                ? await store.product.getData()
+                : await store.product.getData()
     await store.product.getData();
     modalLoader.setLoading(false);
     store.product.visibleModalFilterProduct = false;
+    //store.product.page=1
   };
 
   const footerLayoutFilter = [
@@ -478,6 +482,7 @@ export const ProductComponent = observer((props) => {
         visible={store.product.visibleModalFilterProduct}
         title={"Filter"}
         footer={footerLayoutFilter}
+        onClick={store.product.page + 1}
         onCancel={async () => {
           // setFilterSupplier([]);
           // setFilterSubCategories([]);

From 8ec940d618c317dcc34a3610c619e0d2677c589f Mon Sep 17 00:00:00 2001
From: "ajat91.sudrajat" <ajat91.sudrajat@gmail.com>
Date: Fri, 4 Feb 2022 19:51:51 +0700
Subject: [PATCH 2/3] Bug Fixing

---
 src/component/ProductComponent.js    |  8 +++---
 src/pages/Product/Product.js         |  1 +
 src/pages/Transaction/Product.js     | 37 ++++++++++++++--------------
 src/pages/Transaction/Transaction.js | 37 ++++++++++++++--------------
 4 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js
index 3a3cc7c..b01aca2 100644
--- a/src/component/ProductComponent.js
+++ b/src/component/ProductComponent.js
@@ -228,9 +228,9 @@ export const ProductComponent = observer((props) => {
     store.product.filterSupplier = filterSupplier;
     store.product.filterSubCategory = filterSubCategories;
     modalLoader.setLoading(true);
-    store.authentication.userData.role === "Admin Partner"
-                ? await store.product.getData()
-                : await store.product.getData()
+    // store.authentication.userData.role === "Admin Partner"
+    //             ? await store.product.getData()
+    //             : await store.product.getData()
     await store.product.getData();
     modalLoader.setLoading(false);
     store.product.visibleModalFilterProduct = false;
@@ -482,7 +482,7 @@ export const ProductComponent = observer((props) => {
         visible={store.product.visibleModalFilterProduct}
         title={"Filter"}
         footer={footerLayoutFilter}
-        onClick={store.product.page + 1}
+        
         onCancel={async () => {
           // setFilterSupplier([]);
           // setFilterSubCategories([]);
diff --git a/src/pages/Product/Product.js b/src/pages/Product/Product.js
index 3cadd9c..1ff75cf 100644
--- a/src/pages/Product/Product.js
+++ b/src/pages/Product/Product.js
@@ -195,6 +195,7 @@ export const Product = observer(() => {
               <Button
                 onClick={() => {
                   store.product.visibleModalFilterProduct = true;
+                  store.product.page=0
                 }}
               >
                 <FilterOutlined />
diff --git a/src/pages/Transaction/Product.js b/src/pages/Transaction/Product.js
index ff73f3c..2d89bca 100644
--- a/src/pages/Transaction/Product.js
+++ b/src/pages/Transaction/Product.js
@@ -215,6 +215,7 @@ export const Product = observer(() => {
             style={{
               backgroundColor: "#4e79e7",
               color: "#fff",
+              marginRight:10
             }}
             onClick={() => {
               form
@@ -231,24 +232,24 @@ export const Product = observer(() => {
           >
             Beli
           </Button>,
-          <Button
-            key="Beli Stag"
-            type="primary"
-            onClick={() => {
-              form
-                .validateFields()
-                .then((values) => {
-                  console.log(values, "isi form");
-                  handleBuyStag(values, barang.product_code);
-                  form.resetFields();
-                })
-                .catch((info) => {
-                  console.error("Validate Failed:", info);
-                });
-            }}
-          >
-            Beli Staging
-          </Button>,
+          // <Button
+          //   key="Beli Stag"
+          //   type="primary"
+          //   onClick={() => {
+          //     form
+          //       .validateFields()
+          //       .then((values) => {
+          //         console.log(values, "isi form");
+          //         handleBuyStag(values, barang.product_code);
+          //         form.resetFields();
+          //       })
+          //       .catch((info) => {
+          //         console.error("Validate Failed:", info);
+          //       });
+          //   }}
+          // >
+          //   Beli Staging
+          // </Button>,
         ]}
       >
         <Form form={form} layout="vertical">
diff --git a/src/pages/Transaction/Transaction.js b/src/pages/Transaction/Transaction.js
index 3a8ec96..69468dc 100644
--- a/src/pages/Transaction/Transaction.js
+++ b/src/pages/Transaction/Transaction.js
@@ -294,6 +294,7 @@ export const Transaction = observer(() => {
                   style={{
                     backgroundColor: "#4e79e7",
                     color: "#fff",
+                    marginRight:10
                   }}
                   onClick={() => {
                     form
@@ -310,24 +311,24 @@ export const Transaction = observer(() => {
                 >
                   Beli
                 </Button>,
-                <Button
-                  key="Beli Stag"
-                  type="primary"
-                  onClick={() => {
-                    form
-                      .validateFields()
-                      .then((values) => {
-                        console.log(values, "isi form");
-                        handleBuyStag(values, barang.product_code);
-                        form.resetFields();
-                      })
-                      .catch((info) => {
-                        console.error("Validate Failed:", info);
-                      });
-                  }}
-                >
-                  Beli Staging
-                </Button>,
+                // <Button
+                //   key="Beli Stag"
+                //   type="primary"
+                //   onClick={() => {
+                //     form
+                //       .validateFields()
+                //       .then((values) => {
+                //         console.log(values, "isi form");
+                //         handleBuyStag(values, barang.product_code);
+                //         form.resetFields();
+                //       })
+                //       .catch((info) => {
+                //         console.error("Validate Failed:", info);
+                //       });
+                //   }}
+                // >
+                //   Beli Staging
+                // </Button>,
               ]}
             >
               <Form form={form} layout="vertical">

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 3/3] 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,