From b24ea23e3dbe47c553630d30c37fd18bf9e25e5b Mon Sep 17 00:00:00 2001
From: "ajat91.sudrajat" <ajat91.sudrajat@gmail.com>
Date: Mon, 10 Jan 2022 18:17:35 +0700
Subject: [PATCH] Bug Fixing Project PPOB

---
 src/component/ProductComponent.js  | 42 ++++++++++++++++--------------
 src/pages/App/DesktopLayout.js     | 25 +++++++++++-------
 src/pages/Membership/DetailUser.js |  8 ++++++
 src/pages/Membership/Membership.js | 12 ++++++---
 src/pages/Profile/Profile.js       |  6 ++---
 src/store/membership.js            |  1 +
 6 files changed, 59 insertions(+), 35 deletions(-)

diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js
index 83ba644..2a41284 100644
--- a/src/component/ProductComponent.js
+++ b/src/component/ProductComponent.js
@@ -487,26 +487,28 @@ export const ProductComponent = observer((props) => {
         }}
       >
         <Row>
-          <Col span={24}>
-            <Title level={5} type={"secondary"} strong>
-              Filter Supplier
-            </Title>
-            <Select
-              mode={"multiple"}
-              placeholder="Choose Supplier"
-              onChange={(val) => {
-                setFilterSupplier(val);
-              }}
-              style={{ marginBottom: "20px", width: "100%" }}
-              value={filterSupplier}
-            >
-              {store.supplier.data.map((item) => (
-                <Option value={item.id} key={item.id}>
-                  {item.name}
-                </Option>
-              ))}
-            </Select>
-          </Col>
+          {store.authentication.userData.role === "Admin" && (
+            <Col span={24}>
+              <Title level={5} type={"secondary"} strong>
+                Filter Supplier
+              </Title>
+              <Select
+                mode={"multiple"}
+                placeholder="Choose Supplier"
+                onChange={(val) => {
+                  setFilterSupplier(val);
+                }}
+                style={{ marginBottom: "20px", width: "100%" }}
+                value={filterSupplier}
+              >
+                {store.supplier.data.map((item) => (
+                  <Option value={item.id} key={item.id}>
+                    {item.name}
+                  </Option>
+                ))}
+              </Select>
+            </Col>
+          )}
           <Col span={24}>
             <Title level={5} type={"secondary"} strong>
               Filter Sub-Categories
diff --git a/src/pages/App/DesktopLayout.js b/src/pages/App/DesktopLayout.js
index 1c42c2e..50fffbd 100644
--- a/src/pages/App/DesktopLayout.js
+++ b/src/pages/App/DesktopLayout.js
@@ -126,15 +126,22 @@ export const DesktopLayout = observer(() => {
             }}
           >
             <Menu>
-              {store.authentication.userData.role === "Admin" ||
-                (store.authentication.userData.role === "Admin Partner" && (
-                  <Menu.Item key="home">
-                    <Link to={LINKS.HOME}>
-                      <HomeOutlined />
-                      <span>Beranda</span>
-                    </Link>
-                  </Menu.Item>
-                ))}
+              {store.authentication.userData.role === "Admin" && (
+                <Menu.Item key="home">
+                  <Link to={LINKS.HOME}>
+                    <HomeOutlined />
+                    <span>Beranda</span>
+                  </Link>
+                </Menu.Item>
+              )}
+              {store.authentication.userData.role === "Admin Partner" && (
+                <Menu.Item key="home">
+                  <Link to={LINKS.HOME}>
+                    <HomeOutlined />
+                    <span>Beranda</span>
+                  </Link>
+                </Menu.Item>
+              )}
               {store.authentication.userData.role === "Admin" && (
                 <Menu.Item key="membership">
                   <Link to={LINKS.MEMBERSHIP}>
diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js
index 9d82233..2df1e6e 100644
--- a/src/pages/Membership/DetailUser.js
+++ b/src/pages/Membership/DetailUser.js
@@ -304,11 +304,19 @@ export const DetailUser = observer(() => {
                       id: store.membership.dataDetail.id,
                       name: store.membership.dataDetail.userDetail.name,
                       username: store.membership.dataDetail.username,
+                      identity_number: store.membership.dataDetail.userDetail.identity_number,
+                      image_identity: store.membership.dataDetail?.userDetail.image_identity,
+                      image_store: store.membership.dataDetail?.userDetail.image_store,
                       phone_number:
                         store.membership.dataDetail.userDetail.phone_number,
                       roleId: store.membership.dataDetail.roles.id,
                       isChangePassword: false,
+                     
                     });
+                    console.log(store.membership.dataDetail.userDetail.identity_number)
+                    console.log(store.membership.dataDetail.userDetail.id)
+                    console.log(store.membership.dataDetail.userDetail.image_identity)
+                    console.log(store.membership.dataDetail.username)
                     setVisibleModal(true);
                   }}
                 >
diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js
index 4892e97..b8c1cfd 100644
--- a/src/pages/Membership/Membership.js
+++ b/src/pages/Membership/Membership.js
@@ -259,7 +259,13 @@ export const Membership = observer(() => {
       setConfirmLoading(true);
       modalLoader.setLoading(true);
       try {
-        await store.membership.update(initialData.id, data);
+        console.log(data, "edit data");
+        const request = {
+          ...data,
+          image_identity: image,
+          image_store: imageStore,
+        };
+        await store.membership.update(initialData.id, request);
         message.success(
           initialData.isChangePassword
             ? "Success Change Member Password"
@@ -520,8 +526,8 @@ export const Membership = observer(() => {
         visible={visibleModal}
         confirmLoading={confirmLoading}
         initialData={initialData}
-        onCreate={async (data,image,imageStore) => {
-          onSubmit(data,image,imageStore);
+        onCreate={async (data, image, imageStore) => {
+          onSubmit(data, image, imageStore);
         }}
         onCancel={async () => {
           setInitialData({});
diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js
index 11c64cb..ca45c15 100644
--- a/src/pages/Profile/Profile.js
+++ b/src/pages/Profile/Profile.js
@@ -256,7 +256,7 @@ export const Profile = observer(() => {
                   {store.authentication.profileData.superior?.username}
                 </Text>
               </Col>
-              {store.authentication.userData.role === "Sales" && (
+              {store.authentication.userData.role === "Retail" && (
                 <Row>
                   <Col span={12}>
                     <Text strong>Foto Identitas</Text>
@@ -292,7 +292,7 @@ export const Profile = observer(() => {
                   </Col>
                 </Row>
               )}
-              {store.authentication.userData.role === "Supervisor" && (
+              {/* {store.authentication.userData.role === "Supervisor" && (
                 <Row>
                   <Col span={12}>
                     <Text strong>Foto Identitas</Text>
@@ -312,7 +312,7 @@ export const Profile = observer(() => {
                     </Text>
                   </Col>
                 </Row>
-              )}
+              )} */}
             </Row>
           </Col>
           <Col span={store.ui.mediaQuery.isMobile ? 24 : 5}>
diff --git a/src/store/membership.js b/src/store/membership.js
index e1fd2a3..1f7f1f4 100644
--- a/src/store/membership.js
+++ b/src/store/membership.js
@@ -86,6 +86,7 @@ export class Membership {
     async update(id, data) {
         try {
             const response = await http.put('/users/' + id).send(data);
+            console.log(data,"data dari store")
             return response;
         } catch (e) {
             console.error(e);