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:54 +00:00
commit 784e4a71f6
1 changed files with 74 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
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",
@ -232,15 +244,15 @@ export const DetailUser = observer(() => {
record.status === 1 record.status === 1
? "success" ? "success"
: record.status === 0 : record.status === 0
? "warning" ? "warning"
: "processing" : "processing"
} }
> >
{record.status === 1 {record.status === 1
? "Success" ? "Success"
: record.status === 0 : record.status === 0
? "Pending" ? "Pending"
: "Failed"} : "Failed"}
</Tag> </Tag>
); );
}, },
@ -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 = [
{ {
@ -303,16 +317,16 @@ export const DetailUser = observer(() => {
const styleSaldoTitle = store.ui.mediaQuery.isDesktop const styleSaldoTitle = store.ui.mediaQuery.isDesktop
? { ? {
display: "flex", display: "flex",
justifyContent: "center", justifyContent: "center",
} }
: { fontSize: "0.75rem" }; : { fontSize: "0.75rem" };
const styleSaldoContent = store.ui.mediaQuery.isDesktop const styleSaldoContent = store.ui.mediaQuery.isDesktop
? { ? {
fontSize: "1.25rem", fontSize: "1.25rem",
display: "flex", display: "flex",
justifyContent: "center", justifyContent: "center",
} }
: null; : null;
const data = store.authentication.listImage; const data = store.authentication.listImage;
console.log(data, "ini data"); console.log(data, "ini data");
@ -330,8 +344,8 @@ export const DetailUser = observer(() => {
actionFilter === true actionFilter === true
? await store.transaction.getDataHistoryTopUp(id) ? await store.transaction.getDataHistoryTopUp(id)
: await store.transaction.getDetailHistoryTransaction( : await store.transaction.getDetailHistoryTransaction(
store.authentication.dataProfit.id store.authentication.dataProfit.id
); );
// await store.transaction.getDetailHistoryTransaction( // await store.transaction.getDetailHistoryTransaction(
// store.authentication.dataProfit.id // store.authentication.dataProfit.id
// ); // );
@ -346,8 +360,8 @@ export const DetailUser = observer(() => {
actionFilter === true actionFilter === true
? await store.transaction.getDataHistoryTopUp(id) ? await store.transaction.getDataHistoryTopUp(id)
: await store.transaction.getDetailHistoryTransaction( : await store.transaction.getDetailHistoryTransaction(
store.authentication.dataProfit.id store.authentication.dataProfit.id
); );
// await store.transaction.getDetailHistoryTransaction( // await store.transaction.getDetailHistoryTransaction(
// store.authentication.dataProfit.id // store.authentication.dataProfit.id
// ); // );
@ -366,8 +380,8 @@ export const DetailUser = observer(() => {
actionFilter === true actionFilter === true
? await store.transaction.getDataHistoryTopUp(id) ? await store.transaction.getDataHistoryTopUp(id)
: await store.transaction.getDetailHistoryTransaction( : await store.transaction.getDetailHistoryTransaction(
store.authentication.dataProfit.id store.authentication.dataProfit.id
); );
modalLoader.setLoading(false); modalLoader.setLoading(false);
store.transaction.filterStart = null; store.transaction.filterStart = null;
store.transaction.filterEnd = null; store.transaction.filterEnd = null;
@ -502,16 +516,16 @@ export const DetailUser = observer(() => {
(store.authentication.userData.role === "Supervisor" && (store.authentication.userData.role === "Supervisor" &&
store.membership.dataDetail.is_rejected === true && store.membership.dataDetail.is_rejected === true &&
store.membership.dataDetail.is_active === false)) && ( store.membership.dataDetail.is_active === false)) && (
<Button <Button
style={{ style={{
backgroundColor: "#1bb91d", backgroundColor: "#1bb91d",
color: "#fff", color: "#fff",
}} }}
onClick={() => handleResend(store.membership.dataDetail.id)} onClick={() => handleResend(store.membership.dataDetail.id)}
> >
Resend Resend
</Button> </Button>
)} )}
{store.authentication.userData.role === "Admin" && ( {store.authentication.userData.role === "Admin" && (
<Button <Button
onClick={() => withdrawProfit(store.membership.dataDetail.id)} onClick={() => withdrawProfit(store.membership.dataDetail.id)}
@ -579,7 +593,7 @@ export const DetailUser = observer(() => {
</Col> </Col>
{store.authentication.userData.role === "Admin" && {store.authentication.userData.role === "Admin" &&
store.authentication.dataProfit.roles?.name !== store.authentication.dataProfit.roles?.name !==
"Admin Partner" && ( "Admin Partner" && (
<Row> <Row>
<Col span={12}> <Col span={12}>
<Text strong>Foto Identitas</Text> <Text strong>Foto Identitas</Text>
@ -600,12 +614,12 @@ export const DetailUser = observer(() => {
</Col> </Col>
{store.authentication.dataProfit.roles?.name === {store.authentication.dataProfit.roles?.name ===
"Retail" && ( "Retail" && (
<Col span={24}> <Col span={24}>
<Text strong>Foto Toko</Text> <Text strong>Foto Toko</Text>
<Text> <Text>
<Row> <Row>
{store.authentication.listImage {store.authentication.listImage
? store.authentication.listImage.map( ? store.authentication.listImage.map(
(item, index) => ( (item, index) => (
<Image <Image
key={index} key={index}
@ -618,11 +632,11 @@ export const DetailUser = observer(() => {
/> />
) )
) )
: ""} : ""}
</Row> </Row>
</Text> </Text>
</Col> </Col>
)} )}
</Row> </Row>
)} )}
{store.authentication.userData.role === "Sales" && ( {store.authentication.userData.role === "Sales" && (
@ -650,18 +664,18 @@ export const DetailUser = observer(() => {
<Row> <Row>
{store.authentication.listImage {store.authentication.listImage
? store.authentication.listImage.map( ? store.authentication.listImage.map(
(item, index) => ( (item, index) => (
<Image <Image
key={index} key={index}
src={ src={
item item
? `${appConfig.apiUrl}/config/image/${item}` ? `${appConfig.apiUrl}/config/image/${item}`
: "https://st4.depositphotos.com/14953852/24787/v/600/depositphotos_247872612-stock-illustration-no-image-available-icon-vector.jpg" : "https://st4.depositphotos.com/14953852/24787/v/600/depositphotos_247872612-stock-illustration-no-image-available-icon-vector.jpg"
} }
style={{ width: "10vw", marginRight: 15 }} style={{ width: "10vw", marginRight: 15 }}
/> />
)
) )
)
: ""} : ""}
</Row> </Row>
</Text> </Text>
@ -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 />
@ -975,15 +989,15 @@ export const DetailUser = observer(() => {
item.status === 1 item.status === 1
? "success" ? "success"
: item.status === 0 : item.status === 0
? "warning" ? "warning"
: "processing" : "processing"
} }
> >
{item.status === 1 {item.status === 1
? "Success" ? "Success"
: item.status === 0 : item.status === 0
? "Pending" ? "Pending"
: "Failed"} : "Failed"}
</Tag> </Tag>
} }
</small>{" "} </small>{" "}
@ -1047,8 +1061,8 @@ export const DetailUser = observer(() => {
actionFilter === true actionFilter === true
? await store.transaction.getDataHistoryTopUp(id) ? await store.transaction.getDataHistoryTopUp(id)
: await store.transaction.getDetailHistoryTransaction( : await store.transaction.getDetailHistoryTransaction(
store.authentication.dataProfit.id store.authentication.dataProfit.id
); );
//await store.transaction.getDetailHistoryTransaction(); //await store.transaction.getDetailHistoryTransaction();
}} }}
> >