Merge branch 'devops-staging' into 'main'
Devops staging See merge request empatnusabangsa/ppob/ppob-frontend!183
This commit is contained in:
commit
a349c6ef1a
|
|
@ -196,6 +196,18 @@ export const DetailUser = observer(() => {
|
|||
dataIndex: "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",
|
||||
dataIndex: "price",
|
||||
|
|
@ -232,15 +244,15 @@ export const DetailUser = observer(() => {
|
|||
record.status === 1
|
||||
? "success"
|
||||
: record.status === 0
|
||||
? "warning"
|
||||
: "processing"
|
||||
? "warning"
|
||||
: "processing"
|
||||
}
|
||||
>
|
||||
{record.status === 1
|
||||
? "Success"
|
||||
: record.status === 0
|
||||
? "Pending"
|
||||
: "Failed"}
|
||||
? "Pending"
|
||||
: "Failed"}
|
||||
</Tag>
|
||||
);
|
||||
},
|
||||
|
|
@ -274,6 +286,8 @@ export const DetailUser = observer(() => {
|
|||
key: "failed_reason",
|
||||
},
|
||||
];
|
||||
if (store.authentication.userData.role !== "Admin") delete column[1];
|
||||
if (store.authentication.userData.role !== "Admin") delete column[2];
|
||||
|
||||
const routeData = [
|
||||
{
|
||||
|
|
@ -303,16 +317,16 @@ export const DetailUser = observer(() => {
|
|||
|
||||
const styleSaldoTitle = store.ui.mediaQuery.isDesktop
|
||||
? {
|
||||
display: "flex",
|
||||
justifyContent: "center",
|
||||
}
|
||||
display: "flex",
|
||||
justifyContent: "center",
|
||||
}
|
||||
: { fontSize: "0.75rem" };
|
||||
const styleSaldoContent = store.ui.mediaQuery.isDesktop
|
||||
? {
|
||||
fontSize: "1.25rem",
|
||||
display: "flex",
|
||||
justifyContent: "center",
|
||||
}
|
||||
fontSize: "1.25rem",
|
||||
display: "flex",
|
||||
justifyContent: "center",
|
||||
}
|
||||
: null;
|
||||
const data = store.authentication.listImage;
|
||||
console.log(data, "ini data");
|
||||
|
|
@ -330,8 +344,8 @@ export const DetailUser = observer(() => {
|
|||
actionFilter === true
|
||||
? await store.transaction.getDataHistoryTopUp(id)
|
||||
: await store.transaction.getDetailHistoryTransaction(
|
||||
store.authentication.dataProfit.id
|
||||
);
|
||||
store.authentication.dataProfit.id
|
||||
);
|
||||
// await store.transaction.getDetailHistoryTransaction(
|
||||
// store.authentication.dataProfit.id
|
||||
// );
|
||||
|
|
@ -346,8 +360,8 @@ export const DetailUser = observer(() => {
|
|||
actionFilter === true
|
||||
? await store.transaction.getDataHistoryTopUp(id)
|
||||
: await store.transaction.getDetailHistoryTransaction(
|
||||
store.authentication.dataProfit.id
|
||||
);
|
||||
store.authentication.dataProfit.id
|
||||
);
|
||||
// await store.transaction.getDetailHistoryTransaction(
|
||||
// store.authentication.dataProfit.id
|
||||
// );
|
||||
|
|
@ -366,8 +380,8 @@ export const DetailUser = observer(() => {
|
|||
actionFilter === true
|
||||
? await store.transaction.getDataHistoryTopUp(id)
|
||||
: await store.transaction.getDetailHistoryTransaction(
|
||||
store.authentication.dataProfit.id
|
||||
);
|
||||
store.authentication.dataProfit.id
|
||||
);
|
||||
modalLoader.setLoading(false);
|
||||
store.transaction.filterStart = null;
|
||||
store.transaction.filterEnd = null;
|
||||
|
|
@ -502,16 +516,16 @@ export const DetailUser = observer(() => {
|
|||
(store.authentication.userData.role === "Supervisor" &&
|
||||
store.membership.dataDetail.is_rejected === true &&
|
||||
store.membership.dataDetail.is_active === false)) && (
|
||||
<Button
|
||||
style={{
|
||||
backgroundColor: "#1bb91d",
|
||||
color: "#fff",
|
||||
}}
|
||||
onClick={() => handleResend(store.membership.dataDetail.id)}
|
||||
>
|
||||
Resend
|
||||
</Button>
|
||||
)}
|
||||
<Button
|
||||
style={{
|
||||
backgroundColor: "#1bb91d",
|
||||
color: "#fff",
|
||||
}}
|
||||
onClick={() => handleResend(store.membership.dataDetail.id)}
|
||||
>
|
||||
Resend
|
||||
</Button>
|
||||
)}
|
||||
{store.authentication.userData.role === "Admin" && (
|
||||
<Button
|
||||
onClick={() => withdrawProfit(store.membership.dataDetail.id)}
|
||||
|
|
@ -579,7 +593,7 @@ export const DetailUser = observer(() => {
|
|||
</Col>
|
||||
{store.authentication.userData.role === "Admin" &&
|
||||
store.authentication.dataProfit.roles?.name !==
|
||||
"Admin Partner" && (
|
||||
"Admin Partner" && (
|
||||
<Row>
|
||||
<Col span={12}>
|
||||
<Text strong>Foto Identitas</Text>
|
||||
|
|
@ -600,12 +614,12 @@ export const DetailUser = observer(() => {
|
|||
</Col>
|
||||
{store.authentication.dataProfit.roles?.name ===
|
||||
"Retail" && (
|
||||
<Col span={24}>
|
||||
<Text strong>Foto Toko</Text>
|
||||
<Text>
|
||||
<Row>
|
||||
{store.authentication.listImage
|
||||
? store.authentication.listImage.map(
|
||||
<Col span={24}>
|
||||
<Text strong>Foto Toko</Text>
|
||||
<Text>
|
||||
<Row>
|
||||
{store.authentication.listImage
|
||||
? store.authentication.listImage.map(
|
||||
(item, index) => (
|
||||
<Image
|
||||
key={index}
|
||||
|
|
@ -618,11 +632,11 @@ export const DetailUser = observer(() => {
|
|||
/>
|
||||
)
|
||||
)
|
||||
: ""}
|
||||
</Row>
|
||||
</Text>
|
||||
</Col>
|
||||
)}
|
||||
: ""}
|
||||
</Row>
|
||||
</Text>
|
||||
</Col>
|
||||
)}
|
||||
</Row>
|
||||
)}
|
||||
{store.authentication.userData.role === "Sales" && (
|
||||
|
|
@ -650,18 +664,18 @@ export const DetailUser = observer(() => {
|
|||
<Row>
|
||||
{store.authentication.listImage
|
||||
? store.authentication.listImage.map(
|
||||
(item, index) => (
|
||||
<Image
|
||||
key={index}
|
||||
src={
|
||||
item
|
||||
? `${appConfig.apiUrl}/config/image/${item}`
|
||||
: "https://st4.depositphotos.com/14953852/24787/v/600/depositphotos_247872612-stock-illustration-no-image-available-icon-vector.jpg"
|
||||
}
|
||||
style={{ width: "10vw", marginRight: 15 }}
|
||||
/>
|
||||
)
|
||||
(item, index) => (
|
||||
<Image
|
||||
key={index}
|
||||
src={
|
||||
item
|
||||
? `${appConfig.apiUrl}/config/image/${item}`
|
||||
: "https://st4.depositphotos.com/14953852/24787/v/600/depositphotos_247872612-stock-illustration-no-image-available-icon-vector.jpg"
|
||||
}
|
||||
style={{ width: "10vw", marginRight: 15 }}
|
||||
/>
|
||||
)
|
||||
)
|
||||
: ""}
|
||||
</Row>
|
||||
</Text>
|
||||
|
|
@ -750,7 +764,7 @@ export const DetailUser = observer(() => {
|
|||
style={{ marginBottom: "1rem", marginLeft: 5 }}
|
||||
onClick={() => {
|
||||
store.transaction.visibleModalFilterTransaction = true;
|
||||
store.transaction.page=0;
|
||||
store.transaction.page = 0;
|
||||
setAction(true);
|
||||
}}
|
||||
>
|
||||
|
|
@ -787,7 +801,7 @@ export const DetailUser = observer(() => {
|
|||
style={{ marginBottom: "1rem" }}
|
||||
onClick={() => {
|
||||
store.transaction.visibleModalFilterTransaction = true;
|
||||
store.transaction.page=0;
|
||||
store.transaction.page = 0;
|
||||
setAction(true);
|
||||
}}
|
||||
>
|
||||
|
|
@ -869,7 +883,7 @@ export const DetailUser = observer(() => {
|
|||
style={{ marginBottom: "1rem", marginLeft: 5 }}
|
||||
onClick={() => {
|
||||
store.transaction.visibleModalFilterTransaction = true;
|
||||
store.transaction.page=0;
|
||||
store.transaction.page = 0;
|
||||
}}
|
||||
>
|
||||
<FilterOutlined />
|
||||
|
|
@ -909,7 +923,7 @@ export const DetailUser = observer(() => {
|
|||
style={{ marginBottom: "1rem" }}
|
||||
onClick={() => {
|
||||
store.transaction.visibleModalFilterTransaction = true;
|
||||
store.transaction.page=0;
|
||||
store.transaction.page = 0;
|
||||
}}
|
||||
>
|
||||
<FilterOutlined />
|
||||
|
|
@ -975,15 +989,15 @@ export const DetailUser = observer(() => {
|
|||
item.status === 1
|
||||
? "success"
|
||||
: item.status === 0
|
||||
? "warning"
|
||||
: "processing"
|
||||
? "warning"
|
||||
: "processing"
|
||||
}
|
||||
>
|
||||
{item.status === 1
|
||||
? "Success"
|
||||
: item.status === 0
|
||||
? "Pending"
|
||||
: "Failed"}
|
||||
? "Pending"
|
||||
: "Failed"}
|
||||
</Tag>
|
||||
}
|
||||
</small>{" "}
|
||||
|
|
@ -1047,8 +1061,8 @@ export const DetailUser = observer(() => {
|
|||
actionFilter === true
|
||||
? await store.transaction.getDataHistoryTopUp(id)
|
||||
: await store.transaction.getDetailHistoryTransaction(
|
||||
store.authentication.dataProfit.id
|
||||
);
|
||||
store.authentication.dataProfit.id
|
||||
);
|
||||
//await store.transaction.getDetailHistoryTransaction();
|
||||
}}
|
||||
>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user