From e1ce45848af25795d704877f06676e3cea85009e Mon Sep 17 00:00:00 2001 From: Muhammad Fadli Date: Thu, 4 May 2023 00:58:10 +0700 Subject: [PATCH 1/4] - added form for between dates transaction history excel export --- src/pages/Membership/DetailUser.js | 14 +++++++++++--- src/pages/Profile/Profile.js | 17 +++++++++++++---- src/store/transaction.js | 2 +- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js index c51034f..0390da1 100644 --- a/src/pages/Membership/DetailUser.js +++ b/src/pages/Membership/DetailUser.js @@ -167,7 +167,8 @@ export const DetailUser = observer(() => { const handleSubmitExport = async () => { const date = formExport.getFieldsValue(); const dataDate ={ - dateStart: moment(date.tanggal_export).format("YYYY-MM-DD") + dateStart: moment(date.start_date).format("YYYY-MM-DD"), + dateEnd: moment(date.end_date).format("YYYY-MM-DD") } modalLoader.setLoading(true); try { @@ -1149,8 +1150,15 @@ export const DetailUser = observer(() => {
+ + + diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js index ce2da7c..855e265 100644 --- a/src/pages/Profile/Profile.js +++ b/src/pages/Profile/Profile.js @@ -389,7 +389,8 @@ export const Profile = observer(() => { const handleSubmitExport = async () => { const date = formExport.getFieldsValue(); const dataDate ={ - dateStart: moment(date.tanggal_export).format("YYYY-MM-DD") + dateStart: moment(date.start_date).format("YYYY-MM-DD"), + dateEnd: moment(date.end_date).format("YYYY-MM-DD") } modalLoader.setLoading(true); try { @@ -1038,9 +1039,17 @@ export const Profile = observer(() => { + + + + diff --git a/src/store/transaction.js b/src/store/transaction.js index 1ac8c0a..ea758df 100644 --- a/src/store/transaction.js +++ b/src/store/transaction.js @@ -285,7 +285,7 @@ export class Transaction { }).then((response) => { var fileDownload = require('react-file-download'); message.success("Success export"); - fileDownload(response.data, `Mutasi Transaki ${data.userDetail.name} ${date.dateStart}.xlsx`); + fileDownload(response.data, `Mutasi Transaki ${data.userDetail.name} ${date.dateStart} - ${date.dateEnd}.xlsx`); return fileDownload; }).catch(function (error) { message.error("No data to export"); From 566a8d089c42a9cdb6f116fbf6ad9dfc27e1cd2f Mon Sep 17 00:00:00 2001 From: Muhammad Fadli Date: Thu, 4 May 2023 02:11:20 +0700 Subject: [PATCH 2/4] - fix pagination between history transaction, etc --- src/pages/Membership/DetailUser.js | 4 ++-- src/pages/Profile/Profile.js | 16 ++++++++-------- src/store/transaction.js | 16 ++++++++++------ 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js index 0390da1..dbbdc46 100644 --- a/src/pages/Membership/DetailUser.js +++ b/src/pages/Membership/DetailUser.js @@ -829,8 +829,8 @@ export const DetailUser = observer(() => { }} onChange={async (page) => { let pageNumber = page.current; - store.transaction.pageSize = page.pageSize; - store.transaction.page = pageNumber - 1; + store.transaction.pageSizeHistoryTopUp = page.pageSize; + store.transaction.pageHistoryTopUp = pageNumber - 1; modalLoader.setLoading(true); await getData(); modalLoader.setLoading(false); diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js index 855e265..5d37bb1 100644 --- a/src/pages/Profile/Profile.js +++ b/src/pages/Profile/Profile.js @@ -601,16 +601,16 @@ export const Profile = observer(() => { dataSource={store.transaction.dataHistoryTopUpProfile} bordered pagination={{ - pageSize: store.transaction.pageSize, + pageSize: store.transaction.pageSizeHistoryTopUpProfile, total: store.transaction.total_dataHistoryTopUpProfile, - current: store.transaction.page + 1, + current: store.transaction.pageHistoryTopUpProfile + 1, showSizeChanger: true, simple: false, }} onChange={async (page) => { let pageNumber = page.current; - store.transaction.pageSize = page.pageSize; - store.transaction.page = pageNumber - 1; + store.transaction.pageSizeHistoryTopUpProfile = page.pageSize; + store.transaction.pageHistoryTopUpProfile = pageNumber - 1; modalLoader.setLoading(true); await store.transaction.getDataHistoryTopUpProfile( store.authentication.profileData?.id @@ -854,16 +854,16 @@ export const Profile = observer(() => { dataSource={store.transaction.dataHistorybillProfile} bordered pagination={{ - pageSize: store.transaction.pageSize, + pageSize: store.transaction.pageSizeHistorybillProfile, total: store.transaction.total_dataHistorybillProfile, - current: store.transaction.page + 1, + current: store.transaction.pageHistorybillProfile + 1, showSizeChanger: true, simple: false, }} onChange={async (page) => { let pageNumber = page.current; - store.transaction.pageSize = page.pageSize; - store.transaction.page = pageNumber - 1; + store.transaction.pageSizeHistorybillProfile = page.pageSize; + store.transaction.pageHistorybillProfile = pageNumber - 1; modalLoader.setLoading(true); await store.transaction.getDataHistoryCheckBill(); modalLoader.setLoading(false); diff --git a/src/store/transaction.js b/src/store/transaction.js index ea758df..cab2987 100644 --- a/src/store/transaction.js +++ b/src/store/transaction.js @@ -46,9 +46,13 @@ export class Transaction { dataHistoryTopUp = []; total_dataHistoryTopUp = 0; + pageHistorybillProfile = 0; + pageSizeHistorybillProfile = 10; dataHistorybillProfile = []; total_dataHistorybillProfile = 0; + pageHistoryTopUpProfile = 0; + pageSizeHistoryTopUpProfile = 10; dataHistoryTopUpProfile = []; total_dataHistoryTopUpProfile = 0; @@ -141,12 +145,12 @@ export class Transaction { async getDataHistoryCheckBill() { try { - const response = await http.get( - `/transaction/check-bill-history` - ); // const response = await http.get( - // `/transaction/check-bill-history?page=${this.page}&pageSize=${this.pageSize}&start=${this.filterStart}&end=${this.filterEnd}` + // `/transaction/check-bill-history` // ); + const response = await http.get( + `/transaction/check-bill-history?page=${this.pageHistorybillProfile}&pageSize=${this.pageSizeHistorybillProfile}` + ); console.log("bill", response); this.dataHistorybillProfile = response.body.data ?? []; this.total_dataHistorybillProfile = response?.body?.count ?? 0; @@ -183,7 +187,7 @@ export class Transaction { async getDataHistoryTopUp(id) { try { const response = await http.get( - `/transaction/history-deposit?page=${this.page}&pageSize=${this.pageSize}&user-destination=${id}&start=${this.filterStart}&end=${this.filterEnd}` + `/transaction/history-deposit?page=${this.pageHistoryTopUp}&pageSize=${this.pageSizeHistoryTopUp}&user-destination=${id}&start=${this.filterStart}&end=${this.filterEnd}` ); console.log(response, 'get data history') this.dataHistoryTopUp = response.body.data ?? []; @@ -196,7 +200,7 @@ export class Transaction { async getDataHistoryTopUpProfile(id) { try { const response = await http.get( - `/transaction/history-deposit-profile?page=${this.page}&pageSize=${this.pageSize}&user-destination=${id}&start=${this.filterStart}&end=${this.filterEnd}` + `/transaction/history-deposit-profile?page=${this.pageHistoryTopUpProfile}&pageSize=${this.pageSizeHistoryTopUpProfile}&user-destination=${id}&start=${this.filterStart}&end=${this.filterEnd}` ); console.log(response, 'get data history Profile') this.dataHistoryTopUpProfile = response.body.data ?? []; From e2fea03de93d61a86f92ca6f6a34641fd7cee3a3 Mon Sep 17 00:00:00 2001 From: Muhammad Fadli Date: Thu, 4 May 2023 02:23:33 +0700 Subject: [PATCH 3/4] - fix date time timezone and format in topup history --- src/pages/Membership/DetailUser.js | 7 ++----- src/pages/Profile/Profile.js | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js index dbbdc46..7226a7a 100644 --- a/src/pages/Membership/DetailUser.js +++ b/src/pages/Membership/DetailUser.js @@ -208,7 +208,7 @@ export const DetailUser = observer(() => { render: (text, record) => { return ( - {format(parseISO(record.transaction_date), "dd MMMM yyyy")} + {moment(new Date (record.transaction_date).toISOString().slice(0, -1)).format("dd MMMM yyyy")} ); }, @@ -900,10 +900,7 @@ export const DetailUser = observer(() => {
Transaction Date :{" "} - {format( - parseISO(item.transaction_date), - "dd-MM-yyyy hh:mm:ss" - )} + {moment(new Date (item.transaction_date).toISOString().slice(0, -1)).format("dd-MM-yyyy hh:mm:ss")} {" "}

diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js index 5d37bb1..3c88d2d 100644 --- a/src/pages/Profile/Profile.js +++ b/src/pages/Profile/Profile.js @@ -273,7 +273,7 @@ export const Profile = observer(() => { render: (text, record) => { return ( - {format(parseISO(record.transaction_date), "dd MMMM yyyy HH:mm:ss")} + {moment(new Date (record.transaction_date).toISOString().slice(0, -1)).format("dd MMMM yyyy HH:mm:ss")} ); }, @@ -678,10 +678,7 @@ export const Profile = observer(() => {
Transaction Date :{" "} - {format( - parseISO(item.transaction_date), - "dd-MM-yyyy" - )} + {moment(new Date (item.transaction_date).toISOString().slice(0, -1)).format("dd-MM-yyyy")} {" "}

From c2d46f8b00ddeb8a7102291a262d3f0bbcd0d820 Mon Sep 17 00:00:00 2001 From: Muhammad Fadli Date: Thu, 4 May 2023 02:36:48 +0700 Subject: [PATCH 4/4] - fix PAGINATION error in transaction history --- src/pages/Membership/DetailUser.js | 10 +++++----- src/pages/Profile/Profile.js | 21 +++++++++------------ 2 files changed, 14 insertions(+), 17 deletions(-) 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") } {" "}