diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js
index 7226a7a..ef56e03 100644
--- a/src/pages/Membership/DetailUser.js
+++ b/src/pages/Membership/DetailUser.js
@@ -856,15 +856,15 @@ export const DetailUser = observer(() => {
position={"top"}
pagination={{
onChange: async (page, pageSize) => {
- store.transaction.pageSize = pageSize;
- store.transaction.page = page - 1;
+ store.transaction.pageSizeHistoryTopUp = pageSize;
+ store.transaction.pageHistoryTopUp = page - 1;
modalLoader.setLoading(true);
await getData();
modalLoader.setLoading(false);
},
- pageSize: store.transaction.pageSize,
- total: store.transaction.total_data,
- current: store.transaction.page + 1,
+ pageSize: store.transaction.pageSizeHistoryTopUp,
+ total: store.transaction.total_dataHistoryTopUp,
+ current: store.transaction.pageHistoryTopUp + 1,
style: { marginBottom: "1rem", marginRight: "1rem" },
}}
dataSource={store.transaction.dataHistoryTopUp}
diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js
index 3c88d2d..9d4eec7 100644
--- a/src/pages/Profile/Profile.js
+++ b/src/pages/Profile/Profile.js
@@ -629,17 +629,17 @@ export const Profile = observer(() => {
onChange: async (page, pageSize) => {
console.log(page, "Page");
console.log(pageSize, "Page size");
- store.transaction.pageSize = pageSize;
- store.transaction.page = page - 1;
+ store.transaction.pageSizeHistoryTopUpProfile = pageSize;
+ store.transaction.pageHistoryTopUpProfile = page - 1;
modalLoader.setLoading(true);
await store.transaction.getDataHistoryTopUpProfile(
store.authentication.profileData?.id
);
modalLoader.setLoading(false);
},
- pageSize: store.transaction.pageSize,
+ pageSize: store.transaction.pageSizeHistoryTopUpProfile,
total: store.transaction.total_dataHistoryTopUpProfile,
- current: store.transaction.page + 1,
+ current: store.transaction.pageHistoryTopUpProfile + 1,
style: { marginBottom: "1rem", marginRight: "1rem" },
}}
style={{ padding: 0 }}
@@ -877,15 +877,15 @@ export const Profile = observer(() => {
onChange: async (page, pageSize) => {
console.log(page, "Page");
console.log(pageSize, "Page size");
- store.transaction.pageSize = pageSize;
- store.transaction.page = page - 1;
+ store.transaction.pageSizeHistorybillProfile = pageSize;
+ store.transaction.pageHistorybillProfile = page - 1;
modalLoader.setLoading(true);
await store.transaction.getDataHistoryCheckBill();
modalLoader.setLoading(false);
},
- pageSize: store.transaction.pageSize,
+ pageSize: store.transaction.pageSizeHistorybillProfile,
total: store.transaction.total_dataHistorybillProfile,
- current: store.transaction.page + 1,
+ current: store.transaction.pageHistorybillProfile + 1,
style: { marginBottom: "1rem", marginRight: "1rem" },
}}
style={{ padding: 0 }}
@@ -924,10 +924,7 @@ export const Profile = observer(() => {
Transaction Date :{" "}
- {format(
- parseISO(item.transaction_date),
- "dd-MM-yyyy"
- )}
+ { moment(new Date (item.created_at).toISOString().slice(0, -1)).format("MM-DD-YYYY dd-MM-yyyy") }
{" "}