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) => { }} > - - - Filter Supplier - - - + {store.authentication.userData.role === "Admin" && ( + + + Filter Supplier + + + + )} 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 2c20247..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); }} > @@ -392,36 +400,96 @@ export const DetailUser = observer(() => { : "Inaktif"} </Text> </Col> - <Col span={12}> - <Text strong>Foto Identitas</Text> - </Col> - <Col span={12}> - <Text strong>Foto Toko</Text> - </Col> - <Col span={12}> - <Text> - <Image - src={ - store.authentication.dataProfit.userDetail?.image_identity - ? `${appConfig.apiUrl}/config/image/${store.authentication.dataProfit.userDetail?.image_identity}` - : "https://st4.depositphotos.com/14953852/24787/v/600/depositphotos_247872612-stock-illustration-no-image-available-icon-vector.jpg" - } - style={{ width: "10vw" }} - /> - </Text> - </Col> - <Col span={12}> - <Text> - <Image - src={ - store.authentication.dataProfit.userDetail?.image_store - ? `${appConfig.apiUrl}/config/image/${store.authentication.dataProfit.userDetail?.image_store}` - : "https://st4.depositphotos.com/14953852/24787/v/600/depositphotos_247872612-stock-illustration-no-image-available-icon-vector.jpg" - } - style={{ width: "10vw" }} - /> - </Text> - </Col> + {store.authentication.userData.role === "Sales" && ( + <Row> + <Col span={12}> + <Text strong>Foto Identitas</Text> + </Col> + <Col span={12}> + <Text strong>Foto Toko</Text> + </Col> + <Col span={12}> + <Text> + <Image + src={ + store.authentication.dataProfit.profileData + ?.image_identity + ? `${appConfig.apiUrl}/config/image/${store.authentication.dataProfit.userDetail?.image_identity}` + : "https://st4.depositphotos.com/14953852/24787/v/600/depositphotos_247872612-stock-illustration-no-image-available-icon-vector.jpg" + } + style={{ width: "10vw" }} + /> + </Text> + </Col> + <Col span={12}> + <Text> + <Image + src={ + store.authentication.dataProfit.profileData + ?.image_store + ? `${appConfig.apiUrl}/config/image/${store.authentication.dataProfit.userDetail?.image_store}` + : "https://st4.depositphotos.com/14953852/24787/v/600/depositphotos_247872612-stock-illustration-no-image-available-icon-vector.jpg" + } + style={{ width: "10vw" }} + /> + </Text> + </Col> + </Row> + )} + {store.authentication.userData.role === "Admin" && ( + <Row> + <Col span={12}> + <Text strong>Foto Identitas</Text> + </Col> + <Col span={12}> + <Text strong>Foto Toko</Text> + </Col> + <Col span={12}> + <Text> + <Image + src={ + store.authentication.dataProfit.profileData?.image_identity + ? "https://st4.depositphotos.com/14953852/24787/v/600/depositphotos_247872612-stock-illustration-no-image-available-icon-vector.jpg" + : `${appConfig.apiUrl}/config/image/${store.authentication.dataProfit.userDetail?.image_identity}`} + style={{ width: "10vw" }} + /> + </Text> + </Col> + <Col span={12}> + <Text> + <Image + src={ + store.authentication.dataProfit.profileData + ?.image_store + ?"https://st4.depositphotos.com/14953852/24787/v/600/depositphotos_247872612-stock-illustration-no-image-available-icon-vector.jpg" + : `${appConfig.apiUrl}/config/image/${store.authentication.dataProfit.userDetail?.image_store}` } + style={{ width: "10vw" }} + /> + </Text> + </Col> + </Row> + )} + {store.authentication.userData.role === "Supervisor" && ( + <Row> + <Col span={12}> + <Text strong>Foto Identitas</Text> + </Col> + <Col span={12}></Col> + <Col span={12}> + <Text> + <Image + src={ + store.authentication.dataProfit.profileData + ?.image_identity + ? `${appConfig.apiUrl}/config/image/${store.authentication.profileData.userDetail?.image_identity}` + : "https://st4.depositphotos.com/14953852/24787/v/600/depositphotos_247872612-stock-illustration-no-image-available-icon-vector.jpg" + } + style={{ width: "10vw" }} + /> + </Text> + </Col> + </Row> + )} </Row> </Col> <Col lg={12} xs={24}> 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 69a1806..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,14 +292,12 @@ 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> </Col> - <Col span={12}> - <Text strong>Foto Toko</Text> - </Col> + <Col span={12}></Col> <Col span={12}> <Text> <Image @@ -313,21 +311,8 @@ export const Profile = observer(() => { /> </Text> </Col> - <Col span={12}> - <Text> - <Image - src={ - store.authentication.dataProfit.profileData - ?.image_store - ? `${appConfig.apiUrl}/config/image/${store.authentication.profileData.userDetail?.image_store}` - : "https://st4.depositphotos.com/14953852/24787/v/600/depositphotos_247872612-stock-illustration-no-image-available-icon-vector.jpg" - } - style={{ width: "10vw" }} - /> - </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);