From d5f3d59a32e96c55eb00425d49a7f1739a192f98 Mon Sep 17 00:00:00 2001
From: "ajat91.sudrajat" <ajat91.sudrajat@gmail.com>
Date: Thu, 13 Jan 2022 14:16:30 +0700
Subject: [PATCH] Perbaikan Project PPOB

---
 src/component/CategoryComponent.js    |   2 +-
 src/component/PartnerComponent.js     |   6 +-
 src/component/ProductComponent.js     |   2 +-
 src/component/SubcategoryComponent.js |   2 +-
 src/component/SupplierComponent.js    |   2 +-
 src/pages/Membership/DetailUser.js    |   2 +-
 src/pages/Membership/Picture.js       | 141 --------------------------
 src/pages/Payback/Payback.js          |   2 +-
 src/pages/Payback/PaybackCreated.js   |  30 +++++-
 src/pages/Product/Category.js         |   2 +-
 src/pages/Product/Product.js          |   2 +-
 src/pages/Product/ProductDetail.js    |  70 ++++++-------
 12 files changed, 76 insertions(+), 187 deletions(-)
 delete mode 100644 src/pages/Membership/Picture.js

diff --git a/src/component/CategoryComponent.js b/src/component/CategoryComponent.js
index 627881e..76b164a 100644
--- a/src/component/CategoryComponent.js
+++ b/src/component/CategoryComponent.js
@@ -175,7 +175,7 @@ export const CategoryComponent = observer((props) => {
                   }}
                 >
                   <List.Item.Meta
-                    className={["cariparkir-container"].join(" ")}
+                    className={[""].join(" ")}
                     title={item.code}
                     description={
                       <div style={{}}>
diff --git a/src/component/PartnerComponent.js b/src/component/PartnerComponent.js
index afeec2e..a9ca3c1 100644
--- a/src/component/PartnerComponent.js
+++ b/src/component/PartnerComponent.js
@@ -265,7 +265,7 @@ export const PartnerComponent = observer((props) => {
                   }}
                 >
                   <List.Item.Meta
-                    className={["cariparkir-container"].join(" ")}
+                    className={[""].join(" ")}
                     title={item.code}
                     description={
                       <div style={{}}>
@@ -275,7 +275,7 @@ export const PartnerComponent = observer((props) => {
                             <small>Npwp : {item.npwp}</small> <br />
                             <small>Address : {item.address}</small>
                           </div>
-                          <Space size="middle">
+                          <Space size="small">
                             <Button
                               type={
                                 item?.status === true ? "danger" : "primary"
@@ -359,7 +359,7 @@ export const PartnerComponent = observer((props) => {
               rules={[
                 idData
                   ? { required: false }
-                  : { required: true, message: "Please input password name!" },
+                  : { required: true, message: "Please input name!" },
               ]}
             >
               <Input />
diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js
index ec75eb0..c654360 100644
--- a/src/component/ProductComponent.js
+++ b/src/component/ProductComponent.js
@@ -343,7 +343,7 @@ export const ProductComponent = observer((props) => {
                   }}
                 >
                   <List.Item.Meta
-                    className={["cariparkir-container"].join(" ")}
+                    className={[""].join(" ")}
                     title={item.product_code}
                     description={
                       <div style={{}}>
diff --git a/src/component/SubcategoryComponent.js b/src/component/SubcategoryComponent.js
index e7ae6eb..7074c20 100644
--- a/src/component/SubcategoryComponent.js
+++ b/src/component/SubcategoryComponent.js
@@ -178,7 +178,7 @@ export const SubcategoryComponent = observer((props) => {
                   }}
                 >
                   <List.Item.Meta
-                    className={["cariparkir-container"].join(" ")}
+                    className={[""].join(" ")}
                     title={item.code}
                     description={
                       <div style={{}}>
diff --git a/src/component/SupplierComponent.js b/src/component/SupplierComponent.js
index 194b3a8..c193caa 100644
--- a/src/component/SupplierComponent.js
+++ b/src/component/SupplierComponent.js
@@ -281,7 +281,7 @@ export const SupplierComponent = observer((props) => {
                   }}
                 >
                   <List.Item.Meta
-                    className={["cariparkir-container"].join(" ")}
+                    className={[""].join(" ")}
                     title={item.code}
                     description={
                       <div style={{}}>
diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js
index 9f7cf33..749a86b 100644
--- a/src/pages/Membership/DetailUser.js
+++ b/src/pages/Membership/DetailUser.js
@@ -280,7 +280,7 @@ export const DetailUser = observer(() => {
     "detail gambar"
   );
   return (
-    <div className={["ppob-container"].join(" ")}>
+    <div className={[""].join(" ")}>
       <BreadcumbComponent data={routeData} />
       <Card>
         <Row style={{ marginBottom: 10 }}>
diff --git a/src/pages/Membership/Picture.js b/src/pages/Membership/Picture.js
deleted file mode 100644
index c959da7..0000000
--- a/src/pages/Membership/Picture.js
+++ /dev/null
@@ -1,141 +0,0 @@
-import React from 'react';
-import { Image, Modal, Upload, message } from 'antd';
-import { PlusOutlined } from '@ant-design/icons';
-import { http } from "../utils/http";
-
-function getBase64(file) {
-  return new Promise((resolve, reject) => {
-    const reader = new FileReader();
-    reader.readAsDataURL(file);
-    reader.onload = () => resolve(reader.result);
-    reader.onerror = error => reject(error);
-  });
-}
-
-export class PicturesWall extends React.Component {
-  state = {
-    previewVisible: false,
-    previewImage: '',
-    previewTitle: '',
-    fileList: [],
-  };
-
-  handleCancel = () => this.setState({ previewVisible: false });
-
-  handlePreview = async file => {
-    if (!file.url && !file.preview) {
-      file.preview = await getBase64(file.originFileObj);
-    }
-
-    this.setState({
-      previewImage: file.url || file.preview,
-      previewTitle: file.name || file.url.substring(file.url.lastIndexOf('/') + 1),
-      previewVisible: true,
-    });
-  };
-
-  handlePreviewCancel = () => {
-    this.setState({
-      previewVisible: false,
-    });
-  };
-
-  handleChange = ({ fileList }, info) => {
-
-    // if (this.props.maxUpload) {
-    //   if (fileList.length > this.props.maxUpload) {
-    //     fileList.splice(0, 1)
-    //   }
-    // }
-
-    // if (info.file.status !== 'uploading') {
-    //   console.log(info.file, info.fileList);
-    // }
-    // if (info.file.status === 'done') {
-    //   message.success(`${info.file.name} file uploaded successfully`);
-    // } else if (info.file.status === 'error') {
-    //   message.error(`${info.file.name} file upload failed.`);
-    // }
-
-    this.setState({ fileList })
-  };
-
-  render() {
-    const { previewVisible, previewImage, fileList, previewTitle, handlePreviewCancel } = this.state;
-    const uploadButton = (
-      <div>
-        <PlusOutlined />
-        <div style={{ marginTop: 8 }}>Upload</div>
-      </div>
-    );
-
-    return (
-      <>
-        <Upload
-          action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
-          listType="picture-card"
-          fileList={fileList}
-          accept={'.png, .jpg, .jpeg, .PNG, .JPG, .JPEG'}
-          onPreview={this.handlePreview}
-          onChange={this.handleChange}
-          beforeUpload={(file) => {
-            console.log({ file })
-            http.uploadAntd({
-              file,
-              onError() {
-
-              },
-              onProgress(event) {
-                console.log({ event })
-              },
-              onSuccess: (res) => {
-                if (this.props.onUpload) {
-                  const { fileList } = this.state
-                  const index = fileList.findIndex(d => d.uid === file.uid)
-
-                  if (fileList.length > this.props.maxUpload) {
-                    this.setState({
-                      fileList: []
-                    }) && this.props.onUpload()
-                    message.error('Upload foto tidak boleh melebihi batas maksimal!');
-                  } else {
-                    fileList[index].path = res.body.path
-                    this.setState({
-                      ...fileList
-                    })
-                    this.props.onUpload(fileList)
-
-                  }
-                }
-              }
-            })
-            return false;
-          }}
-          {...(this.props.uploadProps || {})}
-        >
-          {/* {fileList.length > this.props.maxUpload ?
-            this.setState({
-              fileList: []
-            }) && this.props.onUpload() && null
-            :
-            ''} */}
-          {fileList.length >= this.props.maxUpload ? '' : uploadButton}
-        </Upload>
-
-        <Modal
-          visible={previewVisible}
-          title={previewTitle}
-          footer={null}
-          onCancel={this.handleCancel}
-        >
-          <Image
-            onClick={this.handleCancel}
-            src={previewImage}
-          />
-        </Modal>
-      </>
-    );
-  }
-}
-
-export default PicturesWall;
diff --git a/src/pages/Payback/Payback.js b/src/pages/Payback/Payback.js
index 7575b04..167e9ca 100644
--- a/src/pages/Payback/Payback.js
+++ b/src/pages/Payback/Payback.js
@@ -366,7 +366,7 @@ export const Payback = observer(() => {
                       }}
                     >
                       <List.Item.Meta
-                        className={["cariparkir-container"].join(" ")}
+                        className={[""].join(" ")}
                         title={item.userData_name}
                         description={
                           <div style={{}}>
diff --git a/src/pages/Payback/PaybackCreated.js b/src/pages/Payback/PaybackCreated.js
index bdc2aa8..397b7d7 100644
--- a/src/pages/Payback/PaybackCreated.js
+++ b/src/pages/Payback/PaybackCreated.js
@@ -304,11 +304,39 @@ export const PaybackCreated = observer(() => {
                       }}
                     >
                       <List.Item.Meta
-                        className={["cariparkir-container"].join(" ")}
+                        className={[""].join(" ")}
                         title={item.name}
                         description={
                           <div style={{}}>
                             <small>Amount: {item.amount}</small>
+                            <br/>
+                            <div style={{marginTop:5}}>
+                            <small>Status  : </small>
+                            <Tag
+                              color={
+                                item.status === 0
+                                  ? "purple"
+                                  : item.status === 1
+                                  ? "blue"
+                                  : item.status === 2
+                                  ? "warning"
+                                  : item.status === 3
+                                  ? "success"
+                                  : "red"
+                              }
+                            >
+                              {item.status === 0
+                                ? "Pending"
+                                : item.status === 1
+                                ? "Success"
+                                : item.status === 2
+                                ? "Failed"
+                                : item.status === 3
+                                ? "Approved"
+                                : "Rejected"}
+                            </Tag>
+                            </div>
+                            
                           </div>
                         }
                       />
diff --git a/src/pages/Product/Category.js b/src/pages/Product/Category.js
index ca64fd7..68fd2cd 100644
--- a/src/pages/Product/Category.js
+++ b/src/pages/Product/Category.js
@@ -46,7 +46,7 @@ export const Category = observer(() => {
   ];
 
   return (
-    <div className={["ppob-container"].join(" ")}>
+    <div className={[""].join(" ")}>
       <BreadcumbComponent data={routeData} />
       <Card>
         <Row style={{ marginBottom: 20 }}>
diff --git a/src/pages/Product/Product.js b/src/pages/Product/Product.js
index d9bb8d5..4421368 100644
--- a/src/pages/Product/Product.js
+++ b/src/pages/Product/Product.js
@@ -152,7 +152,7 @@ export const Product = observer(() => {
   };
 
   return (
-      <div className={["ppob-container"].join(" ")}>
+      <div className={[""].join(" ")}>
         <BreadcumbComponent data={routeData}/>
         <Card>
               <div>
diff --git a/src/pages/Product/ProductDetail.js b/src/pages/Product/ProductDetail.js
index 0d6e884..22cb5f9 100644
--- a/src/pages/Product/ProductDetail.js
+++ b/src/pages/Product/ProductDetail.js
@@ -1,18 +1,18 @@
-import React, {useContext, useEffect} from "react";
-import {Card, Col, Row, Table, Typography} from "antd";
-import {BreadcumbComponent} from "../../component/BreadcumbComponent";
-import {LINKS} from "../../routes/app";
-import {useStore} from "../../utils/useStore";
-import {observer} from "mobx-react-lite";
-import {format, parseISO} from "date-fns";
-import {ModalLoaderContext} from "../../utils/modal";
-import {useParams} from "react-router-dom";
+import React, { useContext, useEffect } from "react";
+import { Card, Col, Row, Table, Typography, Tag } from "antd";
+import { BreadcumbComponent } from "../../component/BreadcumbComponent";
+import { LINKS } from "../../routes/app";
+import { useStore } from "../../utils/useStore";
+import { observer } from "mobx-react-lite";
+import { format, parseISO } from "date-fns";
+import { ModalLoaderContext } from "../../utils/modal";
+import { useParams } from "react-router-dom";
 
-const {Title, Text} = Typography;
+const { Title, Text } = Typography;
 
 export const ProductDetail = observer(() => {
   const store = useStore();
-  const {id} = useParams();
+  const { id } = useParams();
   const modalLoader = useContext(ModalLoaderContext);
 
   const routeData = [
@@ -25,8 +25,8 @@ export const ProductDetail = observer(() => {
       name: <span style={{ fontWeight: "bold" }}>Produk</span>,
     },
     {
-      route: LINKS.PRODUCT_DETAIL.replace(':id', `${id}`),
-      name: <span style={{fontWeight: "bold"}}>Detail Produk</span>,
+      route: LINKS.PRODUCT_DETAIL.replace(":id", `${id}`),
+      name: <span style={{ fontWeight: "bold" }}>Detail Produk</span>,
     },
   ];
 
@@ -68,7 +68,7 @@ export const ProductDetail = observer(() => {
       key: "startDate",
       render: (text) => {
         return (
-            <Text>{text ? format(parseISO(text), "dd MMMM yyyy") : "-"}</Text>
+          <Text>{text ? format(parseISO(text), "dd MMMM yyyy") : "-"}</Text>
         );
       },
     },
@@ -78,7 +78,9 @@ export const ProductDetail = observer(() => {
       key: "endDate",
       render: (text) => {
         return (
-            <Text>{text ? format(parseISO(text), "dd MMMM yyyy") : "Sampai Sekarang"}</Text>
+          <Text>
+            {text ? format(parseISO(text), "dd MMMM yyyy") : "Sampai Sekarang"}
+          </Text>
         );
       },
     },
@@ -99,7 +101,7 @@ export const ProductDetail = observer(() => {
     : null;
 
   return (
-    <div className={["ppob-container"].join(" ")}>
+    <div className={[""].join(" ")}>
       <BreadcumbComponent data={routeData} />
       <Card>
         <Title strong>Product Detail</Title>
@@ -157,24 +159,24 @@ export const ProductDetail = observer(() => {
                 Filter
               </Button> */}
               <Table
-                  columns={columns}
-                  dataSource={store.product.dataPriceHistory}
-                  bordered
-                  pagination={{
-                    pageSize: store.product.pageSizePriceHistory,
-                    total: store.product.totalDataPriceHistory,
-                    current: store.product.pagePriceHistory + 1,
-                    showSizeChanger: true,
-                    simple: false,
-                  }}
-                  onChange={async (page) => {
-                    let pageNumber = page.current;
-                    store.product.pageSizePriceHistory = page.pageSize;
-                    store.product.pagePriceHistory = pageNumber - 1;
-                    modalLoader.setLoading(true);
-                    await store.product.getPriceHistoryByProduct(id);
-                    modalLoader.setLoading(false);
-                  }}
+                columns={columns}
+                dataSource={store.product.dataPriceHistory}
+                bordered
+                pagination={{
+                  pageSize: store.product.pageSizePriceHistory,
+                  total: store.product.totalDataPriceHistory,
+                  current: store.product.pagePriceHistory + 1,
+                  showSizeChanger: true,
+                  simple: false,
+                }}
+                onChange={async (page) => {
+                  let pageNumber = page.current;
+                  store.product.pageSizePriceHistory = page.pageSize;
+                  store.product.pagePriceHistory = pageNumber - 1;
+                  modalLoader.setLoading(true);
+                  await store.product.getPriceHistoryByProduct(id);
+                  modalLoader.setLoading(false);
+                }}
               />
             </div>
           </Col>