diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js
index b250765..47c6662 100644
--- a/src/pages/Membership/DetailUser.js
+++ b/src/pages/Membership/DetailUser.js
@@ -169,6 +169,9 @@ export const DetailUser = observer(() => {
title: "Status",
dataIndex: "status",
key: "status",
+ render: (text, record) => {
+ return {record.status === 1 ? "Success" : "Pending"};
+ },
},
{
title: "No Seri",
@@ -222,9 +225,11 @@ export const DetailUser = observer(() => {
-
- Detail User
-
+
+
+ Detail User
+
+
{store.authentication.userData.role === "Admin" && (
{
-
+
@@ -366,7 +371,7 @@ export const DetailUser = observer(() => {
-
+
diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js
index 5fa9a55..a368fff 100644
--- a/src/pages/Profile/Profile.js
+++ b/src/pages/Profile/Profile.js
@@ -10,6 +10,8 @@ import {
Modal,
Form,
Input,
+ Divider,
+ List
} from "antd";
import moment from "moment";
import { BreadcumbComponent } from "../../component/BreadcumbComponent";
@@ -135,6 +137,9 @@ export const Profile = observer(() => {
title: "Status",
dataIndex: "status",
key: "status",
+ render: (text, record) => {
+ return {record.status === 1 ? "Success" : "Pending"};
+ },
},
{
title: "No Seri",
@@ -216,7 +221,7 @@ export const Profile = observer(() => {
-
+
@@ -235,8 +240,8 @@ export const Profile = observer(() => {
{store.authentication.userData.role != "Admin Partner" &&
- (store.authentication.userData.role != "Retail" && (
-
+ store.authentication.userData.role != "Retail" && (
+
@@ -254,7 +259,7 @@ export const Profile = observer(() => {
- ))}
+ )}
@@ -271,26 +276,90 @@ export const Profile = observer(() => {
Filter
- {
- let pageNumber = page.current;
- store.transaction.pageSizeHistoryTransaction = page.pageSize;
- store.transaction.pageHistoryTransaction = pageNumber - 1;
- modalLoader.setLoading(true);
- await store.transaction.getDataHistoryTransaction();
- modalLoader.setLoading(false);
- }}
- />
+ {store.ui.mediaQuery.isDesktop && (
+ {
+ let pageNumber = page.current;
+ store.transaction.pageSizeHistoryTransaction =
+ page.pageSize;
+ store.transaction.pageHistoryTransaction = pageNumber - 1;
+ modalLoader.setLoading(true);
+ await store.transaction.getDataHistoryTransaction();
+ modalLoader.setLoading(false);
+ }}
+ />
+ )}
+ {store.ui.mediaQuery.isMobile && (
+ {
+ let pageNumber = page.current;
+ store.transaction.pageSizeHistoryTransaction =
+ page.pageSize;
+ store.transaction.pageHistoryTransaction = pageNumber - 1;
+ modalLoader.setLoading(true);
+ await store.transaction.getDataHistoryTransaction();
+ modalLoader.setLoading(false);
+ }}
+ style={{ padding: 0 }}
+ renderItem={(item) => {
+ return (
+
+
+
+
+ Price : {item.price}
+ Tujuan : {item.transaction_destination}
+ Kode Transaksi : {item.transaction_code}
+ Status : {item.status === 1 ? "Success" : "Pending"}
+ No.Seri : {item.seri_number}
+ IDTrx Mitra : {item.partner_transaction_code}
+ Transaction Date : {format(parseISO(item.created_at), "dd-MM-yyyy")}
+
+
+ }
+ />
+
+
+
+ );
+ }}
+ />
+ )}