From 7e065166f38f5efe7740b8b52f0163779a21bce2 Mon Sep 17 00:00:00 2001 From: "ajat91.sudrajat" Date: Fri, 21 Jan 2022 14:30:11 +0700 Subject: [PATCH] Konfirm Retail Page --- src/pages/Membership/DetailUser.js | 2 +- src/pages/Membership/Konfirmasi.js | 229 ++++++++++++++++++++++-- src/pages/Membership/MembershipModal.js | 38 ++-- src/pages/Product/Category.js | 2 +- src/pages/Product/Product.js | 2 +- 5 files changed, 247 insertions(+), 26 deletions(-) diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js index 3f0fb4a..621b4ba 100644 --- a/src/pages/Membership/DetailUser.js +++ b/src/pages/Membership/DetailUser.js @@ -509,7 +509,7 @@ export const DetailUser = observer(() => { ); console.log(store.membership.dataDetail.userDetail.id); console.log( - store.membership.dataDetail.userDetail.image_identity + store.membership.dataDetail.userDetail.image_identity,"gambar id" ); console.log(store.membership.dataDetail.username); setVisibleModal(true); diff --git a/src/pages/Membership/Konfirmasi.js b/src/pages/Membership/Konfirmasi.js index 528431a..a59cc57 100644 --- a/src/pages/Membership/Konfirmasi.js +++ b/src/pages/Membership/Konfirmasi.js @@ -17,6 +17,7 @@ import { Typography, DatePicker, Form, + Divinder, } from "antd"; import { useStore } from "../../utils/useStore"; import { observer } from "mobx-react-lite"; @@ -34,8 +35,10 @@ import { appConfig } from "../../config/app"; import { capitalize } from "lodash"; import { PAYBACK_STATUS } from "../../constants/payback"; import moment from "moment"; +import { useHistory } from "react-router-dom"; export const Konfirmasi = observer(() => { + const history = useHistory(); const { Option } = Select; const { Title } = Typography; const [form] = Form.useForm(); @@ -43,6 +46,10 @@ export const Konfirmasi = observer(() => { const modalLoader = useContext(ModalLoaderContext); const [filterMembership, setFilterMembership] = useState([]); const [filterSubCategories, setFilterSubCategories] = useState([]); + const [visibleModalToko, setVisibleModalToko] = useState(false); + const [VisibleModalIdentitas, setVisibleModalIdentitas] = useState(false); + const [toko, setToko] = useState({}); + const [identitas, setIdentitas] = useState({}); useEffect(() => { const init = async () => { @@ -71,7 +78,7 @@ export const Konfirmasi = observer(() => { key: "userData_name", }, { - title: "Picture", + title: "Foto Identitas", dataIndex: "image_prove", key: "image_prove", render: (text, record) => ( @@ -83,15 +90,30 @@ export const Konfirmasi = observer(() => { ), }, { - title: "Amount", - dataIndex: "amount", - key: "amount", - width: "20%", - render: (text) => - new Intl.NumberFormat("id-ID", { - style: "currency", - currency: "IDR", - }).format(text), + title: "Foto Toko", + dataIndex: "image_prove", + key: "image_prove", + render: (text, record) => ( + // {record.id} + + ), }, { title: "Action", @@ -279,6 +301,20 @@ export const Konfirmasi = observer(() => { Apply , ]; + const gambar = [ + { + mobil: + "https://www.toyota.astra.co.id/sites/default/files/2021-11/4-avanza-silver-mica-metallic.png", + }, + { + mobil: + "https://foto.kontan.co.id/B0DdG0ycDkrB5FyHTkyjMhz4opk=/smart/2021/04/22/1618664119p.jpg", + }, + { + mobil: + "https://static.wixstatic.com/media/bce131_b85b43380cb44ad493776b810c0389ac~mv2.png/v1/fill/w_688,h_408,al_c/bce131_b85b43380cb44ad493776b810c0389ac~mv2.png", + }, + ]; return (
{ {PAYBACK_STATUS[item.status]} )} + +

} />
-

{ src={`${appConfig.apiUrl}/config/image/${item.image_prove}`} style={{ width: "10vw" }} /> -

+

*/}
@@ -471,6 +536,144 @@ export const Konfirmasi = observer(() => { { + form.resetFields(); + setVisibleModalToko(false); + setVisibleModalIdentitas(false); + }} + width={1000} + footer={false} + // footer={footerLayoutFilter} + // footer={[ + // , + // , + // , + // ]} + // cancelText="Cancel" + // onCancel={() => { + // form.resetFields(); + // handleCancel(); + // }} + // onOk={() => { + // form + // .validateFields() + // .then((values) => { + // console.log(values, "isi form"); + // handleBuyProduct(values, item.product_code); + // form.resetFields(); + // }) + // .catch((info) => { + // console.error("Validate Failed:", info); + // }); + // }} + > + {visibleModalToko === true ? ( + + {gambar.map((gmbr, idx) => ( + + {idx} + + ))} + + ) : ( + {identitas.id} + )} + + {/*
+ + + +
*/} + + {/* { - + */} ); }); diff --git a/src/pages/Membership/MembershipModal.js b/src/pages/Membership/MembershipModal.js index 731976d..e309648 100644 --- a/src/pages/Membership/MembershipModal.js +++ b/src/pages/Membership/MembershipModal.js @@ -81,7 +81,9 @@ export const MembershipModal = ({ ); }; - const handleCancel1 = () => { setPreviewVisible(false) }; + const handleCancel1 = () => { + setPreviewVisible(false); + }; const beforeUpload = (file) => { let isLt2M; @@ -112,20 +114,36 @@ export const MembershipModal = ({ }; const uploadHandler = async (args) => { + // if (fileList === "") { const file = args.file; const res = await store.payback.uploadImages(file); console.log(res, "ini respon 1"); setImage(`${appConfig.apiUrl}/config/image/${res.body.filename}`); - setResponseFilename(res.body.filename); + //setResponseFilename(res.body.filename); + console.log(initialData.image_identity) + initialData.image_identity !== "" + ? file === "" + ? setResponseFilename(initialData.image_identity) + : setResponseFilename(res.body.filename) + : setResponseFilename(res.body.filename); setFileList([ - { - uid: "-1", - name: res.body.filename, - status: "done", - url: `${appConfig.apiUrl}/config/image/${res.body.filename}`, - }, - ]); + { + uid: "-1", + name: res.body.filename, + status: "done", + url: `${appConfig.apiUrl}/config/image/${res.body.filename}`, + }, + ]); setLoading(false); + // } else { + // const file = args.file; + // const res = await store.payback.uploadImages(file); + // console.log(res, "ini respon 1"); + // setImage(`${appConfig.apiUrl}/config/image/${initialData.image_identity}`); + // setResponseFilename(initialData.image_identity); + // setFileList([initialData.image_identity]); + // setLoading(false); + // } }; const uploadHandlerStore = async (args) => { @@ -141,7 +159,7 @@ export const MembershipModal = ({ name: res.body.filename, status: "done", url: `${appConfig.apiUrl}/config/image/${res.body.filename}`, - } + }, ]); setLoadingStore(false); diff --git a/src/pages/Product/Category.js b/src/pages/Product/Category.js index 68fd2cd..ca64fd7 100644 --- a/src/pages/Product/Category.js +++ b/src/pages/Product/Category.js @@ -46,7 +46,7 @@ export const Category = observer(() => { ]; return ( -
+
diff --git a/src/pages/Product/Product.js b/src/pages/Product/Product.js index 0645284..2b80bf6 100644 --- a/src/pages/Product/Product.js +++ b/src/pages/Product/Product.js @@ -177,7 +177,7 @@ export const Product = observer(() => { }; return ( -
+