From e1ce45848af25795d704877f06676e3cea85009e Mon Sep 17 00:00:00 2001
From: Muhammad Fadli <mhdfdl41@gmail.com>
Date: Thu, 4 May 2023 00:58:10 +0700
Subject: [PATCH] - 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(() => {
             <Col span={24}>
               <Form layout="vertical" name="filter" form={formExport}>
                 <Form.Item
-                    name="tanggal_export"
-                    label="Tanggal"
+                    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%" }} />
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(() => {
           <Col span={24}>
             <Form layout="vertical" name="filter" form={formExport}>
               <Form.Item
-                name="tanggal_export"
-                label="Tanggal"
-                rules={[{ required: true, message: "Please input Date!" }]}
+                  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>
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");