+ Saldo System : {item.name}
Role : {item.roleName}
- Saldo Supplier : {item.coa.amount}
- {" "}
-
-
- Saldo System : {item.coa.amount}
+ Saldo Supplier : {item.coa?.amount}
{" "}
);
});
diff --git a/src/pages/Membership/MembershipModal.js b/src/pages/Membership/MembershipModal.js
index b7b1ade..c58d4e8 100644
--- a/src/pages/Membership/MembershipModal.js
+++ b/src/pages/Membership/MembershipModal.js
@@ -1,7 +1,17 @@
import React, { useState } from "react";
-import { Form, Input, Modal, Select, InputNumber } from "antd";
+import {
+ Form,
+ Input,
+ Modal,
+ Select,
+ InputNumber,
+ Row,
+ Col,
+ Typography,
+} from "antd";
import { useStore } from "../../utils/useStore";
+const { Title, Text } = Typography;
export const MembershipModal = ({
visible,
onCreate,
diff --git a/src/pages/Payback/Payback.js b/src/pages/Payback/Payback.js
index 7ffebc2..7a3e6a8 100644
--- a/src/pages/Payback/Payback.js
+++ b/src/pages/Payback/Payback.js
@@ -1,4 +1,4 @@
-import React, { useContext, useEffect } from "react";
+import React, { useContext, useEffect, useState } from "react";
import {
Button,
Card,
@@ -13,6 +13,9 @@ import {
Space,
Table,
Tag,
+ Select,
+ Typography,
+ DatePicker,
} from "antd";
import { useStore } from "../../utils/useStore";
import { observer } from "mobx-react-lite";
@@ -31,10 +34,14 @@ import { capitalize } from "lodash";
import { PAYBACK_STATUS } from "../../constants/payback";
const { Search } = Input;
-
+const { RangePicker } = DatePicker;
export const Payback = observer(() => {
+ const { Option } = Select;
+ const { Title } = Typography;
const store = useStore();
const modalLoader = useContext(ModalLoaderContext);
+ const [filterSupplier, setFilterSupplier] = useState([]);
+ const [filterSubCategories, setFilterSubCategories] = useState([]);
useEffect(() => {
const init = async () => {
@@ -201,6 +208,67 @@ export const Payback = observer(() => {
modalLoader.setLoading(false);
};
+ const handleRemoveFilter = async () => {
+ store.product.filterSupplier = null;
+ store.product.filterSubCategory = null;
+ setFilterSupplier([]);
+ store.product.filterCategory = null;
+ setFilterSubCategories([]);
+ await store.product.getData();
+ store.product.visibleModalFilterProduct = false;
+ };
+
+ const handleCancelFilter = () => {
+ setFilterSupplier([]);
+ store.product.filterCategory = null;
+ setFilterSubCategories([]);
+ store.payback.visibleModalFilterPayback = false;
+ };
+
+ const handleSubmitFilter = async () => {
+ store.product.filterSupplier = filterSupplier;
+ store.product.filterSubCategory = filterSubCategories;
+ modalLoader.setLoading(true);
+ await store.product.getData();
+ modalLoader.setLoading(false);
+ store.product.visibleModalFilterProduct = false;
+ };
+
+ const handleFilterCategory = async (value) => {
+ if (value) {
+ store.product.filterCategory = value;
+ await store.product.getDataSubCategories();
+ } else {
+ store.product.filterCategory = null;
+ await store.product.getDataSubCategories();
+ }
+ };
+
+ const footerLayoutFilter = [
+
@@ -208,10 +276,14 @@ export const Payback = observer(() => {
- {/*
{/* {
)}
+
+
+
+
+ From
+
+
+
+
+
+ Date
+
+
+ {/* */}
+
+ {/*
+
+ Filter Sub-Categories
+
+
+ */}
+
+
);
});
diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js
index 7bbab08..58017d7 100644
--- a/src/pages/Profile/Profile.js
+++ b/src/pages/Profile/Profile.js
@@ -1,18 +1,32 @@
-import React, {useContext, useEffect} from "react";
-import {Button, 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 {FilterOutlined} from "@ant-design/icons";
-import {format, parseISO} from "date-fns";
-import {ModalLoaderContext} from "../../utils/modal";
-
-const {Title, Text} = Typography;
+import React, { useContext, useEffect, useState } from "react";
+import {
+ Button,
+ Card,
+ Col,
+ Row,
+ Table,
+ Typography,
+ DatePicker,
+ Modal,
+ Form,
+} from "antd";
+import moment from "moment";
+import { BreadcumbComponent } from "../../component/BreadcumbComponent";
+import { LINKS } from "../../routes/app";
+import { useStore } from "../../utils/useStore";
+import { observer } from "mobx-react-lite";
+import { FilterOutlined } from "@ant-design/icons";
+import { format, parseISO } from "date-fns";
+import { ModalLoaderContext } from "../../utils/modal";
+const { Title, Text } = Typography;
+const { RangePicker } = DatePicker;
export const Profile = observer(() => {
const store = useStore();
+ const [form] = Form.useForm();
const modalLoader = useContext(ModalLoaderContext);
+ const [filterStart, setFilterStart] = useState([]);
+ const [filterEnd, setFilterEnd] = useState([]);
const routeData = [
{
@@ -21,7 +35,7 @@ export const Profile = observer(() => {
},
{
route: LINKS.PROFILE,
- name: