diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js
index 2cfe7c6..d8013ed 100644
--- a/src/pages/Membership/DetailUser.js
+++ b/src/pages/Membership/DetailUser.js
@@ -15,7 +15,7 @@ import {
Image,
Modal,
Form,
- DatePicker,
+ DatePicker, Input,
} from "antd";
import { UserOutlined, FilterOutlined,ExportOutlined } from "@ant-design/icons";
import { BreadcumbComponent } from "../../component/BreadcumbComponent";
@@ -36,6 +36,7 @@ export const DetailUser = observer(() => {
const store = useStore();
const [form] = Form.useForm();
const [formExport] = Form.useForm();
+ const [formFilterByTrxCode] = Form.useForm();
const modalLoader = useContext(ModalLoaderContext);
const { id } = useParams();
const [visibleModal, setVisibleModal] = useState(false);
@@ -43,8 +44,10 @@ export const DetailUser = observer(() => {
const [confirmLoading, setConfirmLoading] = useState(false);
const [filterStart, setFilterStart] = useState([]);
const [filterEnd, setFilterEnd] = useState([]);
+ const [filterTrxId, setFilterTrxId] = useState([]);
const [visibleHis, setVisibleHis] = useState(true);
const [actionFilter, setAction] = useState(false);
+ const [actionFilterByCode, setActionFilterByCode] = useState(false);
const [modalExport, setModalExport] = useState(false);
useEffect(() => {
@@ -389,6 +392,21 @@ export const DetailUser = observer(() => {
setAction(false);
};
+ const handleRemoveFilterByTrxId = async () => {
+ store.transaction.filterStart = null;
+ store.transaction.filterEnd = null;
+ store.transaction.filterTrxId = null;
+ formFilterByTrxCode.resetFields();
+ setFilterStart([]);
+ setFilterEnd([]);
+ setFilterTrxId([]);
+ store.transaction.visibleModalFilterTransactionByCode = false;
+ setActionFilterByCode(false);
+ await store.transaction.getDetailHistoryTransaction(
+ store.authentication.dataProfit.id
+ );
+ };
+
const handleCancelFilter = async () => {
store.transaction.filterStart = null;
store.transaction.filterEnd = null;
@@ -404,6 +422,15 @@ export const DetailUser = observer(() => {
setAction(false);
};
+ const handleCancelFilterByTrxId = async () => {
+ store.transaction.filterStart = null;
+ store.transaction.filterEnd = null;
+ store.transaction.filterTrxId = null;
+ store.transaction.visibleModalFilterTransactionByCode = false;
+
+ setActionFilterByCode(false);
+ };
+
const handleSubmitFilter = async () => {
const data = form.getFieldsValue();
store.transaction.filterStart = moment(data.start_date).format(
@@ -424,6 +451,20 @@ export const DetailUser = observer(() => {
store.transaction.visibleModalFilterTransaction = false;
setAction(false);
};
+
+ const handleSubmitFilterByTrxId = async (data) => {
+ store.transaction.filterStart = null
+ store.transaction.filterEnd = null
+ store.transaction.filterTrxId = data.trx_id
+ modalLoader.setLoading(true);
+
+ modalLoader.setLoading(false);
+ store.transaction.visibleModalFilterTransactionByCode = false;
+ setActionFilterByCode(false);
+ await store.transaction.getDetailHistoryTransaction(
+ store.authentication.dataProfit.id
+ );
+ };
const footerLayoutFilter = [
,
];
+
+ const footerLayoutFilterByTrxId = [
+ ,
+ ,
+ ,
+ ];
+
return (
{
Filter
+
+
{
+
+ {
+ store.transaction.filterStart = null;
+ store.transaction.filterEnd = null;
+ store.transaction.filterTrxId = null;
+ store.transaction.visibleModalFilterTransactionByCode = false;
+ actionFilter === true
+ ? await store.transaction.getDataHistoryTopUp(id)
+ : await store.transaction.getDetailHistoryTransaction(
+ store.authentication.dataProfit.id
+ );
+ //await store.transaction.getDetailHistoryTransaction();
+ }}
+ >
+
+
+
+
+
+
+
+
+
+
{
const store = useStore();
const [form] = Form.useForm();
+ const [formFilterByTrxCode] = Form.useForm();
const [formExport] = Form.useForm();
const { id } = useParams();
const modalLoader = useContext(ModalLoaderContext);
const [filterStart, setFilterStart] = useState([]);
const [filterEnd, setFilterEnd] = useState([]);
+ const [filterTrxId, setFilterTrxId] = useState([]);
const [actionFilter, setAction] = useState(false);
+ const [actionFilterByCode, setActionFilterByCode] = useState(false);
const [visible, setVisible] = useState(false);
const [modalExport, setModalExport] = useState(false);
@@ -93,6 +96,19 @@ export const Profile = observer(() => {
setAction(false);
};
+ const handleRemoveFilterByTrxId = async () => {
+ store.transaction.filterStart = null;
+ store.transaction.filterEnd = null;
+ store.transaction.filterTrxId = null;
+ formFilterByTrxCode.resetFields();
+ setFilterStart([]);
+ setFilterEnd([]);
+ setFilterTrxId([]);
+ store.transaction.visibleModalFilterTransactionByCode = false;
+ setActionFilterByCode(false);
+ await store.transaction.getDataHistoryTransaction();
+ };
+
const handleCancelFilter = async () => {
store.transaction.filterStart = null;
//form.resetFields();
@@ -107,6 +123,15 @@ export const Profile = observer(() => {
//await store.transaction.getDataHistoryTransaction();
};
+ const handleCancelFilterByTrxId = async () => {
+ store.transaction.filterStart = null;
+ store.transaction.filterEnd = null;
+ store.transaction.filterTrxId = null;
+ store.transaction.visibleModalFilterTransactionByCode = false;
+
+ setActionFilterByCode(false);
+ };
+
const handleSubmitFilter = async () => {
const data = form.getFieldsValue();
store.transaction.filterStart = moment(data.start_date).format(
@@ -129,6 +154,18 @@ export const Profile = observer(() => {
setAction(false);
};
+ const handleSubmitFilterByTrxId = async (data) => {
+ store.transaction.filterStart = null
+ store.transaction.filterEnd = null
+ store.transaction.filterTrxId = data.trx_id
+ modalLoader.setLoading(true);
+
+ modalLoader.setLoading(false);
+ store.transaction.visibleModalFilterTransactionByCode = false;
+ setActionFilterByCode(false);
+ await store.transaction.getDataHistoryTransaction();
+ };
+
const footerLayoutFilter = [
,
];
+
+ const footerLayoutFilterByTrxId = [
+ ,
+ ,
+ ,
+ ];
+
const columns = [
{
title: "Nama Produk",
@@ -705,6 +775,18 @@ export const Profile = observer(() => {
Filter
+
+
{store.ui.mediaQuery.isDesktop && (