Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop

src/pages/Membership/Membership.js

@@ -1,35 +1,16 @@
-import React, { useContext, useEffect, useState } from "react";
-import {
-  Button,
-  Card,
-  Col,
-  Divider,
-  Form,
-  Input,
-  List,
-  message,
-  Modal,
-  Row,
-  Select,
-  Space,
-  Table,
-  Tag,
-} from "antd";
-import { useStore } from "../../utils/useStore";
-import { observer } from "mobx-react-lite";
-import {
-  DownloadOutlined,
-  ExclamationCircleOutlined,
-  PlusSquareOutlined,
-} from "@ant-design/icons";
-import { MembershipModal } from "./MembershipModal";
-import { BreadcumbComponent } from "../../component/BreadcumbComponent";
-import { LINKS } from "../../routes/app";
-import { Link, useHistory } from "react-router-dom";
-import { ModalLoaderContext } from "../../utils/modal";
+import React, {useContext, useEffect, useState} from "react";
+import {Button, Card, Col, Divider, Form, Input, List, message, Modal, Row, Select, Space, Table, Tag,} from "antd";
+import {useStore} from "../../utils/useStore";
+import {observer} from "mobx-react-lite";
+import {DownloadOutlined, PlusSquareOutlined,} from "@ant-design/icons";
+import {MembershipModal} from "./MembershipModal";
+import {BreadcumbComponent} from "../../component/BreadcumbComponent";
+import {LINKS} from "../../routes/app";
+import {useHistory} from "react-router-dom";
+import {ModalLoaderContext} from "../../utils/modal";
 
-const { Search } = Input;
-const { Option } = Select;
+const {Search} = Input;
+const {Option} = Select;
 export const Membership = observer(() => {
   const history = useHistory();
   const [form] = Form.useForm();
@@ -357,7 +338,7 @@ export const Membership = observer(() => {
                 store.membership.pageSize = page.pageSize;
                 store.membership.page = pageNumber - 1;
                 modalLoader.setLoading(true);
-                //await getData();
+                await getData();
                 modalLoader.setLoading(false);
               }}
             />

src/pages/Payback/Payback.js

@@ -6,6 +6,7 @@ import {CheckCircleOutlined, CloseOutlined, FilterOutlined,} from "@ant-design/i
 import {BreadcumbComponent} from "../../component/BreadcumbComponent";
 import {LINKS} from "../../routes/app";
 import {ModalLoaderContext} from "../../utils/modal";
+import {appConfig} from "../../config/app";
 
 const {Search} = Input;
 
@@ -39,12 +40,11 @@ export const Payback = observer(() => {
       dataIndex: "image_prove",
       key: "image_prove",
       render: (text, record) => (
-        <Image
-          src={record.picture}
-          style={{width: 50, height: 50}}
-          shape="circle"
-          alt="avatar"
-        />
+          <Image
+              src={`${appConfig.apiUrl}/config/image/${text}`}
+              style={{width: '5vw'}}
+              alt={record.id}
+          />
       ),
     },
     {

src/pages/Payback/PaybackModal.js

@@ -12,7 +12,7 @@ export const PaybackModal = ({initialData}) => {
   const [image, setImage] = useState("");
   const [fileList, setFileList] = useState([]);
   const [previewImage, setPreviewImage] = useState("");
-  const [previewVisible, setPreviewVisible] = useState(false);
+  const [responseFilename, setResponseFilename] = useState("");
   const [loading, setLoading] = useState(false);
   const modalLoader = useContext(ModalLoaderContext);
 
@@ -34,6 +34,7 @@ export const PaybackModal = ({initialData}) => {
     const file = args.file;
     const res = await http.upload(file);
     setImage(`${appConfig.apiUrl}/config/image/${res.body.filename}`);
+    setResponseFilename(res.body.filename);
     setFileList([{
       uid: '-1',
       name: 'image',
@@ -62,7 +63,8 @@ export const PaybackModal = ({initialData}) => {
     try {
       const request = {
         ...data,
-        destination: store.authentication.profileData.superior?.id
+        destination: store.authentication.profileData.superior?.id,
+        image_prove: responseFilename
       }
       await store.payback.create(request);
       message.success("Success Add Payback");
@@ -74,21 +76,21 @@ export const PaybackModal = ({initialData}) => {
       message.error(e.message);
     }
     modalLoader.setLoading(false);
-    form.resetFields();
     store.payback.visibleModalPayback = false;
+    form.resetFields();
     setImage("");
     setFileList([]);
     setPreviewImage("");
-    setPreviewVisible(false);
+    setResponseFilename("");
   };
 
   const handleCancel = () => {
     form.resetFields();
-    store.payback.visibleModalPayback = false;
     setImage("");
     setFileList([]);
     setPreviewImage("");
-    setPreviewVisible(false);
+    setResponseFilename("");
+    store.payback.visibleModalPayback = false;
   }
 
   return (
@@ -126,7 +128,6 @@ export const PaybackModal = ({initialData}) => {
                   fileList={fileList}
                   onPreview={(file) => {
                     setPreviewImage(file.url || file.filename);
-                    setPreviewVisible(file.url || file.filename);
                   }}
                   showUploadList={true}
                   onChange={handleChange}

src/pages/Product/Product.js

@@ -21,7 +21,7 @@ export const Product = observer(() => {
         await Promise.allSettled([
           store.supplier.getData(),
           store.category.getData(),
-          store.category.getDataSubCategories(),
+          store.product.getDataSubCategories(),
         ]);
         await store.product.getData();
         modalLoader.setLoading(false);