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

Merge branch 'develop' into 'devops-staging'

Browse Source 
Bug Fixing

See merge request empatnusabangsa/ppob/ppob-frontend!96
This commit is contained in:
ajat sudrajat 2022-01-27 05:14:01 +00:00
commit 53b87a4203
1 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -469,9 +469,11 @@ export const DetailUser = observer(() => {
Ganti Password
</Button>
{((store.authentication.userData.role === "Sales" &&
store.membership.dataDetail.is_rejected === true) ||
store.membership.dataDetail.is_rejected === true &&
store.membership.dataDetail.is_active === false) ||
(store.authentication.userData.role === "Supervisor" &&
store.membership.dataDetail.is_rejected === true)) && (
store.membership.dataDetail.is_rejected === true &&
store.membership.dataDetail.is_active === false)) && (
<Button
style={{
backgroundColor: "#1bb91d",
@ -566,19 +568,21 @@ export const DetailUser = observer(() => {
<Text strong>Foto Toko</Text>
<Text>
<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 }}
/>
)
) : ""}
{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 }}
/>
)
)
: ""}
</Row>
</Text>
</Col>
@ -608,17 +612,21 @@ export const DetailUser = observer(() => {
<Text strong>Foto Toko</Text>
<Text>
<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 }}
/>
)):""}
{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 }}
/>
)
)
: ""}
</Row>
</Text>
</Col>
@ -815,7 +823,8 @@ export const DetailUser = observer(() => {
description={
<div style={{}}>
<p>
<small>Pembeli : {item.buyer}</small> <br />
<small>Pembeli : {item.buyer}</small>{" "}
<br />
<small>Price : {item.price}</small> <br />
<small>
Tujuan : {item.transaction_destination}