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:13:51 +00:00
commit 1f0557332e
1 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -469,9 +469,11 @@ export const DetailUser = observer(() => {
Ganti Password Ganti Password
</Button> </Button>
{((store.authentication.userData.role === "Sales" && {((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.authentication.userData.role === "Supervisor" &&
store.membership.dataDetail.is_rejected === true)) && ( store.membership.dataDetail.is_rejected === true &&
store.membership.dataDetail.is_active === false)) && (
<Button <Button
style={{ style={{
backgroundColor: "#1bb91d", backgroundColor: "#1bb91d",
@ -566,7 +568,8 @@ export const DetailUser = observer(() => {
<Text strong>Foto Toko</Text> <Text strong>Foto Toko</Text>
<Text> <Text>
<Row> <Row>
{store.authentication.listImage?store.authentication.listImage.map( {store.authentication.listImage
? store.authentication.listImage.map(
(item, index) => ( (item, index) => (
<Image <Image
key={index} key={index}
@ -578,7 +581,8 @@ export const DetailUser = observer(() => {
style={{ width: "10vw", marginRight: 15 }} style={{ width: "10vw", marginRight: 15 }}
/> />
) )
) : ""} )
: ""}
</Row> </Row>
</Text> </Text>
</Col> </Col>
@ -608,7 +612,9 @@ export const DetailUser = observer(() => {
<Text strong>Foto Toko</Text> <Text strong>Foto Toko</Text>
<Text> <Text>
<Row> <Row>
{store.authentication.listImage?store.authentication.listImage.map((item, index) => ( {store.authentication.listImage
? store.authentication.listImage.map(
(item, index) => (
<Image <Image
key={index} key={index}
src={ src={
@ -618,7 +624,9 @@ export const DetailUser = observer(() => {
} }
style={{ width: "10vw", marginRight: 15 }} style={{ width: "10vw", marginRight: 15 }}
/> />
)):""} )
)
: ""}
</Row> </Row>
</Text> </Text>
</Col> </Col>
@ -815,7 +823,8 @@ export const DetailUser = observer(() => {
description={ description={
<div style={{}}> <div style={{}}>
<p> <p>
<small>Pembeli : {item.buyer}</small> <br /> <small>Pembeli : {item.buyer}</small>{" "}
<br />
<small>Price : {item.price}</small> <br /> <small>Price : {item.price}</small> <br />
<small> <small>
Tujuan : {item.transaction_destination} Tujuan : {item.transaction_destination}