diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js
index 47c6662..58b9970 100644
--- a/src/pages/Membership/DetailUser.js
+++ b/src/pages/Membership/DetailUser.js
@@ -41,6 +41,7 @@ export const DetailUser = observer(() => {
return () => {
store.membership.dataDetail = {};
store.transaction.dataHistoryTopUp = [];
+ store.authentication.dataProfit = [];
store.transaction.dataDetailHistoryTransaction = [];
};
}, []);
@@ -49,6 +50,7 @@ export const DetailUser = observer(() => {
const isAdmin = store.authentication.userData.role === "Admin";
await Promise.allSettled([
store.transaction.getDataHistoryTopUp(id),
+ store.authentication.getProfit(id),
store.transaction.getDetailHistoryTransaction(id),
store.membership.getDetail(id),
store.role.getData(isAdmin),
@@ -313,26 +315,26 @@ export const DetailUser = observer(() => {
Name
- {store.membership.dataDetail.userDetail?.name}
+ {store.authentication.dataProfit.userDetail?.name}
Username
- {store.membership.dataDetail.username}
+ {store.authentication.dataProfit.username}
Role
- {store.membership.dataDetail.roles?.name}
+ {store.authentication.dataProfit.roles?.name}
Phone Number
- {store.membership.dataDetail.userDetail?.phone_number}
+ {store.authentication.dataProfit.userDetail?.phone_number}
@@ -340,7 +342,7 @@ export const DetailUser = observer(() => {
- {store.membership.dataDetail.isActive === true
+ {store.authentication.dataProfit.isActive === true
? "Aktif"
: "Inaktif"}
@@ -364,7 +366,7 @@ export const DetailUser = observer(() => {
style: "currency",
currency: "IDR",
}).format(
- store.authentication.profileData?.wallet || 0
+ store.authentication.dataProfit.wallet || 0
)}
diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js
index 90cbd55..28b5b77 100644
--- a/src/pages/Membership/Membership.js
+++ b/src/pages/Membership/Membership.js
@@ -222,6 +222,7 @@ export const Membership = observer(() => {
onClick={async () => {
await store.transaction.getDataHistoryTopUp(record.id);
await store.transaction.getDetailHistoryTransaction(record.id);
+ await store.authentication.getProfit(record.id);
//await store.transaction.getDataHistoryTransaction()
history.push(LINKS.USER_DETAIL.replace(":id", record.id));
console.log(record.id);
diff --git a/src/store/authentication.js b/src/store/authentication.js
index 6cde95a..f6eee2e 100644
--- a/src/store/authentication.js
+++ b/src/store/authentication.js
@@ -8,6 +8,7 @@ export class Authentication {
isLoginLoading = false;
ctx;
profileData = {};
+ dataProfit=[]
constructor(ctx) {
this.ctx = ctx;
@@ -51,6 +52,17 @@ export class Authentication {
}
}
+ async getProfit(id) {
+ try {
+ const response = await http.get(`/auth/profile/${id}`);
+ console.log(response)
+ this.dataProfit = response.body ?? [];
+ this.total_data = response?.body?.count ?? 0;
+ } catch (e) {
+ console.error(e);
+ }
+ }
+
async getProfile() {
try {
const response = await http.get('/auth/profile');
diff --git a/src/store/transaction.js b/src/store/transaction.js
index c74cafb..d3095cd 100644
--- a/src/store/transaction.js
+++ b/src/store/transaction.js
@@ -40,6 +40,7 @@ export class Transaction {
dataTransactionB2B = [];
dataTransactionPartner = [];
+
//filter
visibleModalFilterTransaction = false;
filterStart = null;
@@ -51,6 +52,7 @@ export class Transaction {
makeAutoObservable(this);
}
+
async getData() {
try {
const response = await http.get(