From 47b8f1fc84346a07c0cabba8f828cf3d564e0845 Mon Sep 17 00:00:00 2001
From: "ajat91.sudrajat" <ajat91.sudrajat@gmail.com>
Date: Fri, 31 Dec 2021 07:32:39 +0700
Subject: [PATCH] bug fixing

---
 src/pages/Membership/Membership.js | 18 ++++++++---
 src/pages/Profile/Profile.js       | 50 ++++++++++++++++++++++++++++--
 2 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js
index ae1cd98..e3c60fa 100644
--- a/src/pages/Membership/Membership.js
+++ b/src/pages/Membership/Membership.js
@@ -94,14 +94,19 @@ export const Membership = observer(() => {
   };
 
   const handleRemoveFilter = async () => {
-    store.membership.filterMembership = null;
-    store.membership.filterPartner = null;
     setFilterMembership([]);
     setFilterPartner([]);
-    //store.product.filterCategory = null;
-    //setFilterSubCategories([]);
+    store.membership.visibleModalFilterMembership = false;
     await store.membership.getData();
-    store.membership.visibleModalFiltermembership = false;
+    
+
+    // store.transaction.filterStart = null;
+    // store.transaction.filterEnd = null;
+    // form.resetFields();
+    // setFilterStart([]);
+    // setFilterEnd([]);
+    // await store.transaction.getDataHistoryTransaction();
+    // store.transaction.visibleModalFilterTransaction = false;
   };
   const handleCancelFilter = () => {
     setFilterMembership([]);
@@ -513,6 +518,9 @@ export const Membership = observer(() => {
         visible={store.membership.visibleModalFilterMembership}
         title={"Filter"}
         footer={footerLayoutFilter}
+        onCancel={() => {
+          store.membership.visibleModalFilterMembership = false;
+        }}
       >
         <Row>
           <Col span={24}>
diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js
index ac999c2..9cd63ba 100644
--- a/src/pages/Profile/Profile.js
+++ b/src/pages/Profile/Profile.js
@@ -53,14 +53,16 @@ export const Profile = observer(() => {
   const handleRemoveFilter = async () => {
     store.transaction.filterStart = null;
     store.transaction.filterEnd = null;
+    form.resetFields();
     setFilterStart([]);
     setFilterEnd([]);
     await store.transaction.getDataHistoryTransaction();
-    store.product.visibleModalFilterProduct = false;
+    store.transaction.visibleModalFilterTransaction = false;
   };
 
   const handleCancelFilter = () => {
     store.transaction.filterStart = null;
+    form.resetFields();
     store.transaction.filterEnd = null;
     store.transaction.visibleModalFilterTransaction = false;
   };
@@ -79,6 +81,10 @@ export const Profile = observer(() => {
     <Button
       key={"remove"}
       onClick={handleRemoveFilter}
+      // onCancel={() => {
+      //   form.resetFields();
+      //   store.membership.visibleModalFilterTransaction=false
+      // }}
       style={{
         backgroundColor: "#e74e5e",
         color: "#fff",
@@ -86,7 +92,13 @@ export const Profile = observer(() => {
     >
       Remove Filter
     </Button>,
-    <Button key={"cancel"} onClick={handleCancelFilter}>
+    <Button key={"cancel"} 
+    onClick={handleCancelFilter}
+    // onCancel={() => {
+    //   form.resetFields();
+    //   store.membership.visibleModalFilterTransaction=false
+    // }}
+    >
       Cancel
     </Button>,
     <Button
@@ -292,10 +304,44 @@ export const Profile = observer(() => {
         </Row>
         <div />
       </Card>
+      {/* <Modal
+        visible={store.transaction.visibleModalFilterTransaction}
+        title={"Filter"}
+        footer={footerLayoutFilter}
+        onCancel={() => {
+          form.resetFields();
+          store.membership.visibleModalFilterTransaction=false
+        }}
+      >
+        <Row>
+          <Col span={24}>
+            <Form layout="vertical" name="filter" form={form}>
+              <Form.Item
+                name="start_date"
+                label="Dari"
+                rules={[{ required: true, message: "Please input Date!" }]}
+              >
+                <DatePicker style={{ width: "100%" }} />
+              </Form.Item>
+              <Form.Item
+                name="end_date"
+                label="Sampai"
+                rules={[{ required: true, message: "Please input Date!" }]}
+              >
+                <DatePicker style={{ width: "100%" }} />
+              </Form.Item>
+            </Form>
+          </Col>
+        </Row>
+      </Modal> */}
       <Modal
         visible={store.transaction.visibleModalFilterTransaction}
         title={"Filter"}
         footer={footerLayoutFilter}
+        onCancel={() => {
+          form.resetFields();
+          store.transaction.visibleModalFilterTransaction=false
+        }}
       >
         <Row>
           <Col span={24}>