From 9196c5b573707749b0ca6816e515cc55159d5ab5 Mon Sep 17 00:00:00 2001
From: "ajat91.sudrajat" <ajat91.sudrajat@gmail.com>
Date: Wed, 5 Jan 2022 16:12:59 +0700
Subject: [PATCH] Perbaikan Filter Pembayaran -> dibuat oleh saya

---
 src/pages/Membership/Membership.js  | 10 ++++++++--
 src/pages/Payback/PaybackCreated.js |  9 +++++++--
 src/pages/Profile/Profile.js        | 11 +++++++++--
 src/store/membership.js             |  8 +++++---
 4 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js
index 5e6f930..a4a7de7 100644
--- a/src/pages/Membership/Membership.js
+++ b/src/pages/Membership/Membership.js
@@ -352,7 +352,10 @@ export const Membership = observer(() => {
               bordered
               pagination={{
                 pageSize: store.membership.pageSize,
-                total: store.membership.total_data,
+                total:
+                  store.authentication.userData.role === "Admin"
+                    ? store.membership.dataTotal
+                    : store.membership.total_data,
                 current: store.membership.page + 1,
                 showSizeChanger: true,
                 simple: false,
@@ -382,7 +385,10 @@ export const Membership = observer(() => {
                   modalLoader.setLoading(false);
                 },
                 pageSize: store.membership.pageSize,
-                total: store.membership.totalData,
+                total:
+                  store.authentication.userData.role === "Admin"
+                    ? store.membership.dataTotal
+                    : store.membership.total_data,
                 current: store.membership.page + 1,
                 style: { marginBottom: "1rem", marginRight: "1rem" },
               }}
diff --git a/src/pages/Payback/PaybackCreated.js b/src/pages/Payback/PaybackCreated.js
index 542434b..193f9da 100644
--- a/src/pages/Payback/PaybackCreated.js
+++ b/src/pages/Payback/PaybackCreated.js
@@ -26,6 +26,7 @@ import { LINKS } from "../../routes/app";
 import { ModalLoaderContext } from "../../utils/modal";
 import { appConfig } from "../../config/app";
 import { PAYBACK_STATUS } from "../../constants/payback";
+import moment from 'moment';
 
 const { Search } = Input;
 
@@ -37,6 +38,7 @@ export const PaybackCreated = observer(() => {
   const [filterMembership, setFilterMembership] = useState([]);
   const [initialData, setInitialData] = useState({});
   const modalLoader = useContext(ModalLoaderContext);
+  
 
   useEffect(() => {
     const init = async () => {
@@ -130,8 +132,11 @@ export const PaybackCreated = observer(() => {
     //store.payback.filterMembership = filterMembership;
     // const awal = format(parseISO(data.start_date), "dd-MM-yyyy")
     // const akhir = format(parseISO(data.start_date), "dd-MM-yyyy")
-    store.payback.filterStart = data.start_date;
-    store.payback.filterEnd = data.end_date;
+    //const awal= format(startOfDay(date.start_date()), 'yyyy-MM-dd 00:00')
+    const awal=store.payback.filterStart = moment(data.start_date).format('YYYY-MM-DD HH:mm:ss');
+    const akhir=store.payback.filterEnd = moment(data.end_date).format('YYYY-MM-DD HH:mm:ss');
+    console.log(awal)
+    console.log(akhir)
     modalLoader.setLoading(true);
     await store.payback.getDataCreated();
     modalLoader.setLoading(false);
diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js
index 6fd9e47..564651c 100644
--- a/src/pages/Profile/Profile.js
+++ b/src/pages/Profile/Profile.js
@@ -74,8 +74,15 @@ export const Profile = observer(() => {
 
   const handleSubmitFilter = async () => {
     const data = form.getFieldsValue();
-    store.transaction.filterStart = data.start_date;
-    store.transaction.filterEnd = data.end_date;
+    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('YYYY-MM-DD HH:mm:ss');
+    console.log(awal)
+    console.log(akhir)
+    // store.transaction.filterStart = data.start_date;
+    // store.transaction.filterEnd = data.end_date;
     modalLoader.setLoading(true);
     await store.transaction.getDataHistoryTransaction();
     modalLoader.setLoading(false);
diff --git a/src/store/membership.js b/src/store/membership.js
index 6540186..8b92707 100644
--- a/src/store/membership.js
+++ b/src/store/membership.js
@@ -6,6 +6,7 @@ export class Membership {
     pageSize = 10
     data = [];
     total_data = 0;
+    dataTotal=0;
 
     dataDetail = {};
     dataMember=[];
@@ -36,8 +37,8 @@ export class Membership {
             //     return item
             // }) ?? []
 
-            this.total_data = response?.body?.count ?? 0
-            //console.log(this.total_data)
+            this.dataTotal = response?.body?.count ?? 0
+            //console.log(this.dataTotal)
         } catch (e) {
             console.error(e);
         }
@@ -66,7 +67,8 @@ export class Membership {
                 return item
             }) ?? []
 
-            this.totalData = response?.body?.count ?? 0
+            this.total_data = response?.body?.count ?? 0
+            //console.log(this.total_data)
         } catch (e) {
             console.error(e);
         }