From 9144a9ff5648dac70fa33d6afa9ef184afe8cd68 Mon Sep 17 00:00:00 2001 From: "ajat91.sudrajat" Date: Wed, 26 Jan 2022 12:22:16 +0700 Subject: [PATCH] Tambah Fitur --- src/pages/Membership/DetailUser.js | 222 +++++++++++++++-------------- src/pages/Membership/Konfirmasi.js | 2 +- 2 files changed, 114 insertions(+), 110 deletions(-) diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js index 3d5f1cb..3d3e488 100644 --- a/src/pages/Membership/DetailUser.js +++ b/src/pages/Membership/DetailUser.js @@ -341,19 +341,12 @@ export const DetailUser = observer(() => { const handleSubmitFilter = async () => { const data = form.getFieldsValue(); - console.log(data.start_date); - console.log(data.end_date); - - const awal = (store.transaction.filterStart = moment( - data.start_date - ).format("YYYY-MM-DD HH:mm:ss")); - const akhir = (store.transaction.filterEnd = moment(data.end_date).format( + store.transaction.filterStart = moment(data.start_date).format( "YYYY-MM-DD HH:mm:ss" - )); - console.log(awal); - console.log(akhir); - console.log(store.authentication.dataProfit.id, "id auth"); - console.log(store.membership.dataDetail.id, "id member"); + ); + store.transaction.filterEnd = moment(data.end_date).format( + "YYYY-MM-DD HH:mm:ss" + ); modalLoader.setLoading(true); await store.transaction.getDetailHistoryTransaction( store.authentication.dataProfit.id @@ -773,104 +766,115 @@ export const DetailUser = observer(() => { )} {store.ui.mediaQuery.isMobile && ( - { - store.transaction.pageSize = pageSize; - store.transaction.page = page - 1; - modalLoader.setLoading(true); - await getData(); - modalLoader.setLoading(false); - }, - pageSize: store.transaction.pageSize, - total: store.transaction.total_data, - current: store.transaction.page + 1, - style: { marginBottom: "1rem", marginRight: "1rem" }, - }} - dataSource={ - store.transaction.dataDetailHistoryTransactionDetailUser - } - style={{ padding: 0 }} - renderItem={(item) => { - return ( -
- - -

- Price : {item.price}
- - Tujuan : {item.transaction_destination} - {" "} -
- - Kode Transaksi : {item.transaction_code} - {" "} -
- - Status :{" "} - { - + + { + store.transaction.pageSize = pageSize; + store.transaction.page = page - 1; + modalLoader.setLoading(true); + await getData(); + modalLoader.setLoading(false); + }, + pageSize: store.transaction.pageSize, + total: store.transaction.total_data, + current: store.transaction.page + 1, + style: { marginBottom: "1rem", marginRight: "1rem" }, + }} + dataSource={ + store.transaction.dataDetailHistoryTransactionDetailUser + } + style={{ padding: 0 }} + renderItem={(item) => { + return ( +

+ + +

+ Price : {item.price}
+ + Tujuan : {item.transaction_destination} + {" "} +
+ + Kode Transaksi : {item.transaction_code} + {" "} +
+ + Status :{" "} + { + + {item.status === 1 + ? "Success" : item.status === 0 - ? "warning" - : "processing" - } - > - {item.status === 1 - ? "Success" - : item.status === 0 - ? "Pending" - : "Failed"} - - } - {" "} -
- - No.Seri : {item.seri_number} - {" "} -
- - IDTrx Mitra :{" "} - {item.partner_transaction_code} - {" "} -
- - Transaction Date :{" "} - {format( - parseISO(item.created_at), - "dd-MM-yyyy" - )} - {" "} -
-

-
- } - /> -
- -
- ); - }} - /> + ? "Pending" + : "Failed"} + + } + {" "} +
+ + No.Seri : {item.seri_number} + {" "} +
+ + IDTrx Mitra :{" "} + {item.partner_transaction_code} + {" "} +
+ + Transaction Date :{" "} + {format( + parseISO(item.created_at), + "dd-MM-yyyy hh:mm:ss" + )} + {" "} +
+

+ + } + /> + + + + ); + }} + /> + )} diff --git a/src/pages/Membership/Konfirmasi.js b/src/pages/Membership/Konfirmasi.js index d6c4f3f..136ff16 100644 --- a/src/pages/Membership/Konfirmasi.js +++ b/src/pages/Membership/Konfirmasi.js @@ -463,7 +463,7 @@ export const Konfirmasi = observer(() => { style={ store.ui.mediaQuery.isDesktop ? { - width: "22vw", + width: "20vw", borderColor: "salmon", marginLeft: "10px", }