diff --git a/src/component/TopupsaldoModal.js b/src/component/TopupsaldoModal.js
index 376869e..cd9ff86 100644
--- a/src/component/TopupsaldoModal.js
+++ b/src/component/TopupsaldoModal.js
@@ -1,8 +1,8 @@
-import React, {useContext} from "react";
-import {Form, Input, message, Modal} from "antd";
-import {observer} from "mobx-react-lite";
-import {useStore} from "../utils/useStore";
-import {ModalLoaderContext} from "../utils/modal";
+import React, { useContext } from "react";
+import { Form, Input, message, Modal, InputNumber } from "antd";
+import { observer } from "mobx-react-lite";
+import { useStore } from "../utils/useStore";
+import { ModalLoaderContext } from "../utils/modal";
export const TopupsaldoModal = observer((props) => {
const store = useStore();
@@ -27,7 +27,7 @@ export const TopupsaldoModal = observer((props) => {
store.supplier.visibleModalTransaction = false;
form.resetFields();
};
-
+
return (
{
-
+
-
+
+ `Rp. ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ",")
+ }
+ parser={(value) => value.replace(/\Rp.\s?|(,*)/g, "")}
+ />
diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js
index d2649d0..2583356 100644
--- a/src/pages/Membership/DetailUser.js
+++ b/src/pages/Membership/DetailUser.js
@@ -7,12 +7,14 @@ import {observer} from "mobx-react-lite";
import {FilterOutlined} from "@ant-design/icons";
import {format, parseISO} from "date-fns";
import {ModalLoaderContext} from "../../utils/modal";
+import { useParams } from "react-router-dom";
const {Title, Text} = Typography;
export const DetailUser = observer(() => {
const store = useStore();
const modalLoader = useContext(ModalLoaderContext);
+ const { id } = useParams();
const routeData = [
{
@@ -24,12 +26,13 @@ export const DetailUser = observer(() => {
name: Detail User,
},
];
-
+console.log(id)
useEffect(() => {
(async () => {
modalLoader.setLoading(true);
await Promise.allSettled([
store.authentication.getProfile(),
+ store.transaction.getDataHistoryTopUp(id),
store.transaction.getDataHistoryTransaction(),
]);
modalLoader.setLoading(false);
@@ -83,7 +86,7 @@ export const DetailUser = observer(() => {
Name
- {store.authentication.profileData?.userDetail?.name}
+ {store.transaction.data.name}
Role
diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js
index 887861b..811b9fc 100644
--- a/src/pages/Membership/Membership.js
+++ b/src/pages/Membership/Membership.js
@@ -14,7 +14,7 @@ import {
Space,
Table,
Tag,
- InputNumber
+ InputNumber,
} from "antd";
import { useStore } from "../../utils/useStore";
import { observer } from "mobx-react-lite";
@@ -101,10 +101,16 @@ export const Membership = observer(() => {
};
}
+ let response = null;
+
(await store.authentication.userData.role) === "Admin"
- ? store.transaction.distributeAdmin(data)
- : store.transaction.distribute(data);
- message.success("Success Top Up");
+ ? (response = await store.transaction.distributeAdmin(data))
+ : (response = await store.transaction.distribute(data));
+
+ response?.body?.statusCode === 200
+ ? message.success("Success Top Up")
+ : message.error("Failed Top Up");
+
modalLoader.setLoading(false);
//await store.supplier.getData()
} catch (e) {
@@ -217,8 +223,9 @@ export const Membership = observer(() => {