diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js index 435ba80..d3eed8f 100644 --- a/src/pages/Membership/DetailUser.js +++ b/src/pages/Membership/DetailUser.js @@ -163,7 +163,7 @@ export const DetailUser = observer(() => { { title: "Pengirim", dataIndex: "sender_name", - key: "sender_name" + key: "sender_name", }, { title: "Nominal", @@ -396,8 +396,8 @@ export const DetailUser = observer(() => { Detail User { wrap={true} style={{ textAlign: "center" }} > - - - + {store.authentication.userData.role === "Admin" && ( + + + + + + )} {((store.authentication.userData.role === "Sales" && store.membership.dataDetail.is_rejected === true && store.membership.dataDetail.is_active === false) || diff --git a/src/store/transaction.js b/src/store/transaction.js index 4c481de..a934936 100644 --- a/src/store/transaction.js +++ b/src/store/transaction.js @@ -171,7 +171,7 @@ export class Transaction { async getDataHistoryTopUpProfile(id) { try { const response = await http.get( - `/transaction/history-deposit-profile?page=${this.page}&pageSize=${this.pageSize}&user-destination=${id}` + `/transaction/history-deposit-profile?page=${this.page}&pageSize=${this.pageSize}&user-destination=${id}&start=${this.filterStart}&end=${this.filterEnd}` ); console.log(response,'get data history Profile') this.dataHistoryTopUpProfile = response.body.data ?? [];