Merge branch 'develop' into 'devops-staging'
Develop See merge request empatnusabangsa/ppob/ppob-frontend!176
This commit is contained in:
commit
e7fbfe7fa5
|
@ -62,8 +62,8 @@ export const ProductComponent = observer((props) => {
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: "Harga Beli",
|
title: "Harga Beli",
|
||||||
dataIndex: "current_price_price",
|
dataIndex: "price",
|
||||||
key: "current_price_price",
|
key: "price",
|
||||||
render: (text) =>
|
render: (text) =>
|
||||||
new Intl.NumberFormat("id-ID", {
|
new Intl.NumberFormat("id-ID", {
|
||||||
style: "currency",
|
style: "currency",
|
||||||
|
@ -100,6 +100,16 @@ export const ProductComponent = observer((props) => {
|
||||||
currency: "IDR",
|
currency: "IDR",
|
||||||
}).format(text),
|
}).format(text),
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
title: "Partner fee",
|
||||||
|
dataIndex: "partner_fee",
|
||||||
|
key: "partner_fee",
|
||||||
|
render: (text) =>
|
||||||
|
new Intl.NumberFormat("id-ID", {
|
||||||
|
style: "currency",
|
||||||
|
currency: "IDR",
|
||||||
|
}).format(text),
|
||||||
|
},
|
||||||
{
|
{
|
||||||
title: "Supplier",
|
title: "Supplier",
|
||||||
dataIndex: "supplier_name",
|
dataIndex: "supplier_name",
|
||||||
|
@ -140,13 +150,14 @@ export const ProductComponent = observer((props) => {
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
//if (store.authentication.userData.role === "Admin Partner") delete columns[2];
|
//if (store.authentication.userData.role === "Admin Partner") delete columns[2];
|
||||||
if (store.authentication.userData.role === "Admin Partner") delete columns[9];
|
if (store.authentication.userData.role === "Admin Partner") delete columns[10];
|
||||||
if (store.authentication.userData.role === "Admin Partner") delete columns[3];
|
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 Partner") delete columns[4];
|
||||||
if (store.authentication.userData.role !== "Admin") delete columns[8];
|
if (store.authentication.userData.role !== "Admin") delete columns[9];
|
||||||
if (store.authentication.userData.role !== "Admin") delete columns[6];
|
if (store.authentication.userData.role !== "Admin") delete columns[6];
|
||||||
|
if (store.authentication.userData.role !== "Admin") delete columns[7];
|
||||||
if (store.authentication.userData.role !== "Admin") delete columns[2];
|
if (store.authentication.userData.role !== "Admin") delete columns[2];
|
||||||
if (store.authentication.userData.role === "Admin Partner") delete columns[7];
|
if (store.authentication.userData.role === "Admin Partner") delete columns[8];
|
||||||
//if (store.authentication.userData.role !== "Admin") delete columns[8];
|
//if (store.authentication.userData.role !== "Admin") delete columns[8];
|
||||||
//if (store.authentication.userData.role === "Admin Partner") delete columns[5];
|
//if (store.authentication.userData.role === "Admin Partner") delete columns[5];
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user