Merge branch 'develop' into 'devops-staging'

Tambah Fitur

See merge request empatnusabangsa/ppob/ppob-frontend!87

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);
+    store.transaction.filterStart = moment(data.start_date).format(
-    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);
+    store.transaction.filterEnd = moment(data.end_date).format(
-    console.log(akhir);
+      "YYYY-MM-DD HH:mm:ss"
-    console.log(store.authentication.dataProfit.id, "id auth");
+    );
-    console.log(store.membership.dataDetail.id, "id member");
     modalLoader.setLoading(true);
     await store.transaction.getDetailHistoryTransaction(
       store.authentication.dataProfit.id
@@ -773,6 +766,16 @@ export const DetailUser = observer(() => {
                 )}
 
                 {store.ui.mediaQuery.isMobile && (
+                  <div>
+                    <Button
+                      style={{ marginBottom: "1rem" }}
+                      onClick={() => {
+                        store.transaction.visibleModalFilterTransaction = true;
+                      }}
+                    >
+                      <FilterOutlined />
+                      Filter
+                    </Button>
                     <List
                       itemLayout="horizontal"
                       position={"top"}
@@ -857,7 +860,7 @@ export const DetailUser = observer(() => {
                                         Transaction Date :{" "}
                                         {format(
                                           parseISO(item.created_at),
-                                        "dd-MM-yyyy"
+                                          "dd-MM-yyyy hh:mm:ss"
                                         )}
                                       </small>{" "}
                                       <br />
@@ -871,6 +874,7 @@ export const DetailUser = observer(() => {
                         );
                       }}
                     />
+                  </div>
                 )}
               </TabPane>
             </Tabs>

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",
                       }