Merge branch 'main' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into devops-production

This commit is contained in:
Fadli 2022-08-15 02:32:05 +07:00
commit 0fe7dc2054
2 changed files with 24 additions and 4 deletions

View File

@ -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",
@ -218,6 +216,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 +296,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 = [
{

View File

@ -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",