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

src/pages/Membership/Membership.js

@@ -1,28 +1,8 @@
 import React, {useContext, useEffect, useState} from "react";
-import {
+import {Button, Card, Col, Divider, Form, Input, List, message, Modal, Row, Select, Space, Table, Tag,} from "antd";
-  Button,
-  Card,
-  Col,
-  Divider,
-  Input,
-  List,
-  message,
-  Modal,
-  Row,
-  Space,
-  Table,
-  Tag,
-  Form,
-  Select,
-} from "antd";
 import {useStore} from "../../utils/useStore";
 import {observer} from "mobx-react-lite";
-import {
+import {DownloadOutlined, ExclamationCircleOutlined, PlusSquareOutlined,} from "@ant-design/icons";
-  ExclamationCircleOutlined,
-  FilterOutlined,
-  PlusSquareOutlined,
-  DownloadOutlined,
-} from "@ant-design/icons";
 import {MembershipModal} from "./MembershipModal";
 import {BreadcumbComponent} from "../../component/BreadcumbComponent";
 import {LINKS} from "../../routes/app";
@@ -133,9 +113,28 @@ export const Membership = observer(() => {
       key: "role",
     },
     {
-      title: "Saldo",
+      title: "Saldo di Supplier",
       dataIndex: ["coa", "amount"],
       key: ["coa", "amount"],
+      width: "20%",
+      render: (text) => (
+          new Intl.NumberFormat("id-ID", {
+            style: "currency",
+            currency: "IDR",
+          }).format(text)
+      )
+    },
+    {
+      title: "Saldo di System",
+      dataIndex: ["coa_undistribute", "amount"],
+      key: ["coa_undistribute", "amount"],
+      width: "20%",
+      render: (text) => (
+          new Intl.NumberFormat("id-ID", {
+            style: "currency",
+            currency: "IDR",
+          }).format(text)
+      )
     },
     {
       title: "Status",

src/pages/Membership/MembershipModal.js

@@ -1,16 +1,15 @@
 import React from "react";
-import { Form, Input, Modal, Select } from "antd";
+import {Form, Input, Modal, Select} from "antd";
-import { capitalize } from "lodash";
+import {useStore} from "../../utils/useStore";
-import { useStore } from "../../utils/useStore";
 
 export const MembershipModal = ({
                                     visible,
                                     onCreate,
                                     onCancel,
                                     initialData,
-}) => {
+                                }) => {
     const [form] = Form.useForm();
-  const { Option } = Select;
+    const {Option} = Select;
     const store = useStore();
 
   return (
@@ -77,7 +76,7 @@ export const MembershipModal = ({
             label="Password"
             rules={[{ required: false, message: "Please input password!" }]}
           >
-            <Input />
+              <Input.Password/>
           </Form.Item>
         )}
         {((initialData.id && !initialData.isChangePassword) ||