Merge branch 'develop' into 'devops-staging'

Bug Fixing

See merge request empatnusabangsa/ppob/ppob-frontend!97
This commit is contained in:
ajat sudrajat 2022-01-27 08:41:16 +00:00
commit 54149a5e0c
5 changed files with 15 additions and 18 deletions

View File

@ -5,7 +5,6 @@ import {
Input, Input,
message, message,
Modal, Modal,
Select,
Space, Space,
Table, Table,
List, List,

View File

@ -1,10 +1,7 @@
import React, { useState } from "react"; import React from "react";
import { import {
Form,
Input,
Modal, Modal,
Select, Select,
InputNumber,
Row, Row,
Title, Title,
Col, Col,

View File

@ -80,13 +80,19 @@ export const Konfirmasi = observer(() => {
title: "Foto Identitas", title: "Foto Identitas",
dataIndex: ["user_detail", "image_identity"], dataIndex: ["user_detail", "image_identity"],
key: "user_detail.image_identity", key: "user_detail.image_identity",
render: (text, record) => ( render: (text, record) =>
<Image record.user_detail?.image_identity ? (
src={`${appConfig.apiUrl}/config/image/${text}`} <Image
style={{ width: "5vw" }} src={`${appConfig.apiUrl}/config/image/${text}`}
alt={record.image_identity} style={{ width: "5vw" }}
/> alt={record.image_identity}
), />
) : (
<Image
src="https://st4.depositphotos.com/14953852/24787/v/600/depositphotos_247872612-stock-illustration-no-image-available-icon-vector.jpg"
style={{ width: "5vw" }}
/>
),
}, },
{ {
title: "Foto Toko", title: "Foto Toko",
@ -378,7 +384,7 @@ export const Konfirmasi = observer(() => {
> >
Foto Identitas Foto Identitas
</Button> </Button>
{item.user_detail?.image_store !== "\"\"" ? ( {item.user_detail?.image_store !== '""' ? (
<Button <Button
style={ style={
item.is_active === true item.is_active === true

View File

@ -5,15 +5,12 @@ import {
Col, Col,
Divider, Divider,
Image, Image,
Input,
List, List,
message, message,
DatePicker, DatePicker,
Row, Row,
Table, Table,
Tag, Tag,
Typography,
Select,
Form, Form,
Modal, Modal,
} from "antd"; } from "antd";

View File

@ -8,8 +8,6 @@ import {LINKS} from "../../routes/app";
import {CategoryComponent} from "../../component/CategoryComponent"; import {CategoryComponent} from "../../component/CategoryComponent";
import {ModalLoaderContext} from "../../utils/modal"; import {ModalLoaderContext} from "../../utils/modal";
const {TabPane} = Tabs;
const {Search} = Input;
export const Category = observer(() => { export const Category = observer(() => {
const store = useStore(); const store = useStore();