diff --git a/src/component/PartnerComponent.js b/src/component/PartnerComponent.js
index 66f0329..b200a82 100644
--- a/src/component/PartnerComponent.js
+++ b/src/component/PartnerComponent.js
@@ -286,7 +286,19 @@ export const PartnerComponent = observer((props) => {
)}
-
+{!idData && (
+
+
+
+ )}
{!isChangePassword && (
<>
{
key: ["coa", "amount"],
width: "20%",
render: (text, record) =>
- new Intl.NumberFormat("id-ID", {
- style: "currency",
- currency: "IDR",
- }).format(text),
+ text
+ ? new Intl.NumberFormat("id-ID", {
+ style: "currency",
+ currency: "IDR",
+ }).format(text)
+ : "-",
},
{
title: "Status",
diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js
index 1e031b9..2ab68be 100644
--- a/src/pages/Membership/Membership.js
+++ b/src/pages/Membership/Membership.js
@@ -43,10 +43,11 @@ export const Membership = observer(() => {
const init = async () => {
try {
setIsLoading(true);
+ const isAdmin = store.authentication.userData.role === "Admin";
+
await getData();
- store.role.getData();
- if (store.authentication.userData.role === "Admin")
- await store.supplier.getData();
+ await store.role.getData(isAdmin);
+ if (isAdmin) await store.supplier.getData();
setIsLoading(false);
} catch (e) {
setIsLoading(false);
diff --git a/src/store/role.js b/src/store/role.js
index 51bd959..28b027d 100644
--- a/src/store/role.js
+++ b/src/store/role.js
@@ -1,50 +1,52 @@
-import {makeAutoObservable} from "mobx";
-import {http} from "../utils/http";
+import { makeAutoObservable } from "mobx";
+import { http } from "../utils/http";
export class Role {
- page = null;
- pageSize = null;
- data = [];
- total_data = 0
+ page = null;
+ pageSize = null;
+ data = [];
+ total_data = 0;
- constructor(ctx) {
- this.ctx = ctx;
- makeAutoObservable(this);
- }
+ constructor(ctx) {
+ this.ctx = ctx;
+ makeAutoObservable(this);
+ }
- async getData() {
- try {
- const response = await http.get(`/config/roles?page=${this.page}&pageSize=${this.pageSize}`);
- this.data = response.body.data ?? []
- this.total_data = response.body.total_data ?? 0
- } catch (e) {
- console.error(e);
- }
+ async getData(isForMembership = false) {
+ try {
+ const response = await http.get(
+ `/config/roles${isForMembership ? "/for-membership" : ""}?page=${
+ this.page
+ }&pageSize=${this.pageSize}`
+ );
+ this.data = response.body.data ?? [];
+ this.total_data = response.body.total_data ?? 0;
+ } catch (e) {
+ console.error(e);
}
+ }
- async create(data) {
- try {
- return await http.post('/users').send(data)
- } catch (e) {
- console.error(e);
- }
+ async create(data) {
+ try {
+ return await http.post("/users").send(data);
+ } catch (e) {
+ console.error(e);
}
+ }
- async update(id, data) {
- try {
- return await http.put('/users/' + id).send(data);
- } catch (e) {
- console.error(e);
- }
+ async update(id, data) {
+ try {
+ return await http.put("/users/" + id).send(data);
+ } catch (e) {
+ console.error(e);
}
+ }
- async delete(id) {
- try {
- return await http.del('/users/' + id);
- } catch (e) {
- console.error(e);
- }
+ async delete(id) {
+ try {
+ return await http.del("/users/" + id);
+ } catch (e) {
+ console.error(e);
}
+ }
}
-
-