From fcbc1640ca51c51ff272235744ee9d3c7e178048 Mon Sep 17 00:00:00 2001 From: rahman Date: Mon, 8 Aug 2022 14:54:09 +0700 Subject: [PATCH 1/3] feat: add column sisa saldo --- src/pages/Membership/DetailUser.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js index ddc12c7..641eb66 100644 --- a/src/pages/Membership/DetailUser.js +++ b/src/pages/Membership/DetailUser.js @@ -218,6 +218,16 @@ export const DetailUser = observer(() => { currency: "IDR", }).format(text), }, + { + title: "Sisa Saldo", + dataIndex: "balance_remaining", + key: "balance_remaining", + render: (text) => + new Intl.NumberFormat("id-ID", { + style: "currency", + currency: "IDR", + }).format(text), + }, { title: "Pembeli", dataIndex: "buyer", @@ -288,6 +298,7 @@ export const DetailUser = observer(() => { ]; if (store.authentication.userData.role !== "Admin") delete column[1]; if (store.authentication.userData.role !== "Admin") delete column[2]; + if (store.authentication.userData.role !== "Admin") delete column[4]; const routeData = [ { From bf7f143315a1870df4eb1086081fc4d5671060b0 Mon Sep 17 00:00:00 2001 From: Fadli Date: Thu, 11 Aug 2022 00:01:35 +0700 Subject: [PATCH 2/3] - change field profit produk to mark_up_price --- src/pages/Membership/DetailUser.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js index 641eb66..258fe6e 100644 --- a/src/pages/Membership/DetailUser.js +++ b/src/pages/Membership/DetailUser.js @@ -203,10 +203,8 @@ export const DetailUser = observer(() => { }, { title: "Profit Produk", - dataIndex: "profit_produk", - key: "", - render: (text, record) => - record.price - record.product_price + dataIndex: "mark_up_price", + key: "mark_up_price", }, { title: "Harga", From 8946922b5bd22971d510a804778b22af1688870d Mon Sep 17 00:00:00 2001 From: rahman Date: Fri, 12 Aug 2022 18:28:38 +0700 Subject: [PATCH 3/3] feat: add column sisa saldo in admin partner --- src/pages/Profile/Profile.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js index 28614d4..b14a43e 100644 --- a/src/pages/Profile/Profile.js +++ b/src/pages/Profile/Profile.js @@ -168,6 +168,16 @@ export const Profile = observer(() => { currency: "IDR", }).format(text), }, + { + title: "Sisa Saldo", + dataIndex: "balance_remaining", + key: "balance_remaining", + render: (text) => + new Intl.NumberFormat("id-ID", { + style: "currency", + currency: "IDR", + }).format(text), + }, { title: "Pembeli", dataIndex: "buyer", @@ -342,6 +352,7 @@ export const Profile = observer(() => { }, }, ]; + if (store.authentication.userData.role !== "Admin Partner") delete columns[2]; const styleSaldoTitle = store.ui.mediaQuery.isDesktop ? { display: "flex",