diff --git a/src/component/PartnerComponent.js b/src/component/PartnerComponent.js
index cfddd6f..29c3a46 100644
--- a/src/component/PartnerComponent.js
+++ b/src/component/PartnerComponent.js
@@ -391,7 +391,7 @@ export const PartnerComponent = observer((props) => {
)}
{((idData && isChangePassword) || !idData) && (
{
},
];
if (store.authentication.userData.role !== "Admin") columns.pop();
- if (store.authentication.userData.role !== "Admin") delete columns[2];
+ if (store.authentication.userData.role === "Admin Partner") delete columns[2];
if (store.authentication.userData.role === "Admin Partner") delete columns[3];
+ if (store.authentication.userData.role != "Admin Partner") delete columns[4];
if (store.authentication.userData.role !== "Admin") delete columns[6];
if (store.authentication.userData.role === "Admin Partner") delete columns[7];
- if (store.authentication.userData.role === "Admin") delete columns[4];
if (store.authentication.userData.role !== "Admin") delete columns[8];
if (store.authentication.userData.role === "Admin Partner") delete columns[5];
diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js
index e3c60fa..da92fe1 100644
--- a/src/pages/Membership/Membership.js
+++ b/src/pages/Membership/Membership.js
@@ -537,7 +537,7 @@ export const Membership = observer(() => {
value={filterMembership}
>
{store.membership.data.map((item) => (
-
))}
diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js
index 9cd63ba..9837f2d 100644
--- a/src/pages/Profile/Profile.js
+++ b/src/pages/Profile/Profile.js
@@ -131,13 +131,13 @@ export const Profile = observer(() => {
},
{
title: "Tujuan",
- dataIndex: "tujuan",
- key: "tujuan",
+ dataIndex: "transaction_destination",
+ key: "transaction_destination",
},
{
- title: "ID Transaksi",
- dataIndex: "id_transaksi",
- key: "id_transaksi",
+ title: "Kode Transaksi",
+ dataIndex: "transaction_code",
+ key: "transaction_code",
},
{
title: "Status",
@@ -146,13 +146,13 @@ export const Profile = observer(() => {
},
{
title: "No Seri",
- dataIndex: "no_seri",
- key: "no_seri",
+ dataIndex: "seri_number",
+ key: "seri_number",
},
{
title: "IDTrx Mitra",
- dataIndex: "idtrx_mitra",
- key: "idtrx_mitra",
+ dataIndex: "partner_transaction_code",
+ key: "partner_transaction_code",
},
{
title: "Transaction Date",
@@ -256,7 +256,7 @@ export const Profile = observer(() => {
{new Intl.NumberFormat("id-ID", {
style: "currency",
currency: "IDR",
- }).format(store.authentication.profileData?.wallet || 0)}
+ }).format(store.authentication.profileData?.profit || 0)}
diff --git a/src/store/membership.js b/src/store/membership.js
index 197eb89..a9f78cb 100644
--- a/src/store/membership.js
+++ b/src/store/membership.js
@@ -21,7 +21,7 @@ export class Membership {
async getData() {
try {
- const response = await http.get(`/users?page=${this.page}&pageSize=${this.pageSize}&superrior=${this.filterMembership}&type=${this.filterPartner}`);
+ const response = await http.get(`/users?page=${this.page}&pageSize=${this.pageSize}&superior=${this.filterMembership}&type=${this.filterPartner}`);
// console.log(this.filterMembership)
// console.log(this.filterPartner)
// console.log(response)