PPOB/ppob-frontend
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into 'devops-production'

Browse Source 
Revert "fix product filter when page 2 and then filter didn't detect list item < 10"

See merge request empatnusabangsa/ppob/ppob-frontend!184
This commit is contained in:
Rahman Efendi 2022-08-05 05:44:39 +00:00
commit 73b0d0faf8
1 changed files with 74 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/pages/Membership/DetailUser.js
View File

@ -196,6 +196,18 @@ export const DetailUser = observer(() => {
dataIndex: "name", dataIndex: "name",
key: "name", key: "name",
}, },
{
title: "Supplier",
dataIndex: "supplier_name",
key: "supplier_name",
},
{
title: "Profit Produk",
dataIndex: "profit_produk",
key: "",
render: (text, record) =>
record.price - record.product_price
},
{ {
title: "Harga", title: "Harga",
dataIndex: "price", dataIndex: "price",
@ -274,6 +286,8 @@ export const DetailUser = observer(() => {
key: "failed_reason", key: "failed_reason",
}, },
]; ];
if (store.authentication.userData.role !== "Admin") delete column[1];
if (store.authentication.userData.role !== "Admin") delete column[2];
const routeData = [ const routeData = [
{ {
@ -750,7 +764,7 @@ export const DetailUser = observer(() => {
style={{ marginBottom: "1rem", marginLeft: 5 }} style={{ marginBottom: "1rem", marginLeft: 5 }}
onClick={() => { onClick={() => {
store.transaction.visibleModalFilterTransaction = true; store.transaction.visibleModalFilterTransaction = true;
store.transaction.page=0; store.transaction.page = 0;
setAction(true); setAction(true);
}} }}
> >
@ -787,7 +801,7 @@ export const DetailUser = observer(() => {
style={{ marginBottom: "1rem" }} style={{ marginBottom: "1rem" }}
onClick={() => { onClick={() => {
store.transaction.visibleModalFilterTransaction = true; store.transaction.visibleModalFilterTransaction = true;
store.transaction.page=0; store.transaction.page = 0;
setAction(true); setAction(true);
}} }}
> >
@ -869,7 +883,7 @@ export const DetailUser = observer(() => {
style={{ marginBottom: "1rem", marginLeft: 5 }} style={{ marginBottom: "1rem", marginLeft: 5 }}
onClick={() => { onClick={() => {
store.transaction.visibleModalFilterTransaction = true; store.transaction.visibleModalFilterTransaction = true;
store.transaction.page=0; store.transaction.page = 0;
}} }}
> >
<FilterOutlined /> <FilterOutlined />
@ -909,7 +923,7 @@ export const DetailUser = observer(() => {
style={{ marginBottom: "1rem" }} style={{ marginBottom: "1rem" }}
onClick={() => { onClick={() => {
store.transaction.visibleModalFilterTransaction = true; store.transaction.visibleModalFilterTransaction = true;
store.transaction.page=0; store.transaction.page = 0;
}} }}
> >
<FilterOutlined /> <FilterOutlined />