From 3c80dcedf66d216aa11d8bc7baf1c046b5aa75db Mon Sep 17 00:00:00 2001
From: "ajat91.sudrajat" <ajat91.sudrajat@gmail.com>
Date: Fri, 7 Jan 2022 17:58:01 +0700
Subject: [PATCH] Perbaikan PPOB

---
 src/pages/Membership/DetailUser.js | 58 +++++++++++----------------
 src/pages/Profile/Profile.js       | 63 +++++++++++++++++++++---------
 2 files changed, 67 insertions(+), 54 deletions(-)

diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js
index dc7c59b..ce05945 100644
--- a/src/pages/Membership/DetailUser.js
+++ b/src/pages/Membership/DetailUser.js
@@ -392,46 +392,32 @@ export const DetailUser = observer(() => {
                     : "Inaktif"}
                 </Text>
               </Col>
+              <Col span={12}>
+                <Text strong>Foto Identitas</Text>
+              </Col>
+              <Col span={12}>
+                <Text strong>Foto Toko</Text>
+              </Col>
+              <Col span={12}>
+                <Text>
+                <Image
+                          src={`${appConfig.apiUrl}/config/image/${store.authentication.dataProfit.userDetail?.image_identity}`}
+                          style={{ width: "10vw" }}
+                        />
+                </Text>
+              </Col>
+              <Col span={12}>
+                <Text>
+                <Image
+                          src={`${appConfig.apiUrl}/config/image/${store.authentication.dataProfit.userDetail?.image_store}`}
+                          style={{ width: "10vw" }}
+                        />
+                </Text>
+              </Col>
             </Row>
           </Col>
           <Col lg={12} xs={24}>
             <Row>
-              <Col lg={24} xs={24}>
-                <Row>
-                  <Col span={store.ui.mediaQuery.isMobile ? 24 : 10}>
-                    <Row justify={"center"}>
-                      <Col lg={22} xs={12}>
-                        <Title strong level={3} style={styleSaldoTitle}>
-                          Foto Identitas
-                        </Title>
-                      </Col>
-                      <Col lg={15} xs={12}>
-                        <Image
-                          src={`${appConfig.apiUrl}/config/image/${store.authentication.dataProfit.userDetail?.image_identity}`}
-                          style={{ width: "10vw" }}
-                        />
-                      </Col>
-                      <Col></Col>
-                    </Row>
-                  </Col>
-                  <Col span={store.ui.mediaQuery.isMobile ? 24 : 10}>
-                    <Row justify={"center"}>
-                      <Col lg={22} xs={12}>
-                        <Title strong level={3} style={styleSaldoTitle}>
-                          Foto Toko
-                        </Title>
-                      </Col>
-                      <Col lg={18} xs={12}>
-                        <Image
-                          src={`${appConfig.apiUrl}/config/image/${store.authentication.dataProfit.userDetail?.image_store}`}
-                          style={{ width: "10vw" }}
-                        />
-                      </Col>
-                      <Col></Col>
-                    </Row>
-                  </Col>
-                </Row>
-              </Col>
               <Col lg={24} xs={24}>
                 <Row>
                   <Col span={store.ui.mediaQuery.isMobile ? 24 : 10}>
diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js
index eb02367..47a2556 100644
--- a/src/pages/Profile/Profile.js
+++ b/src/pages/Profile/Profile.js
@@ -12,6 +12,7 @@ import {
   Input,
   Divider,
   List,
+  Image,
   Tag,
 } from "antd";
 import moment from "moment";
@@ -21,6 +22,8 @@ import { useStore } from "../../utils/useStore";
 import { observer } from "mobx-react-lite";
 import { FilterOutlined } from "@ant-design/icons";
 import { format, parseISO } from "date-fns";
+import { appConfig } from "../../config/app";
+
 import { ModalLoaderContext } from "../../utils/modal";
 
 const { Title, Text } = Typography;
@@ -64,7 +67,7 @@ export const Profile = observer(() => {
     store.transaction.visibleModalFilterTransaction = false;
   };
 
-  const handleCancelFilter = async() => {
+  const handleCancelFilter = async () => {
     store.transaction.filterStart = null;
     //form.resetFields();
     store.transaction.filterEnd = null;
@@ -74,13 +77,17 @@ export const Profile = 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('YYYY-MM-DD HH:mm:ss');
-    console.log(awal)
-    console.log(akhir)
+    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);
@@ -120,7 +127,6 @@ export const Profile = observer(() => {
       title: "Price",
       dataIndex: "price",
       key: "price",
-
       render: (text) =>
         new Intl.NumberFormat("id-ID", {
           style: "currency",
@@ -176,19 +182,20 @@ export const Profile = observer(() => {
       dataIndex: "partner_transaction_code",
       key: "partner_transaction_code",
     },
-    {
-      title: "Tanggal Transaksi",
-      dataIndex: "created_at",
-      key: "created_at",
-      render: (text, record) => {
-        return <Text>{format(parseISO(record.created_at), "dd-MM-yyyy")}</Text>;
-      },
-    },
     {
       title: "Alasan Gagal",
       dataIndex: "failed_reason",
       key: "failed_reason",
     },
+    {
+      title: "Tanggal Transaksi",
+      dataIndex: "created_at",
+      key: "created_at",
+
+      render: (text, record) => {
+        return <Text>{format(parseISO(record.created_at), "dd-MM-yyyy")}</Text>;
+      },
+    },
   ];
 
   const styleSaldoTitle = store.ui.mediaQuery.isDesktop
@@ -249,6 +256,24 @@ export const Profile = observer(() => {
                   {store.authentication.profileData.superior?.username}
                 </Text>
               </Col>
+              <Col span={12}>
+                <Text strong>Foto Identitas</Text>
+              </Col>
+              <Col span={12}>
+                <Text strong>Foto Toko</Text>
+              </Col>
+              <Col span={12}>
+                <Image
+                  src={`${appConfig.apiUrl}/config/image/${store.authentication.profileData.userDetail?.image_identity}`}
+                  style={{ width: "10vw" }}
+                />
+              </Col>
+              <Col span={12}>
+                <Image
+                  src={`${appConfig.apiUrl}/config/image/${store.authentication.profileData.userDetail?.image_store}`}
+                  style={{ width: "10vw" }}
+                />
+              </Col>
             </Row>
           </Col>
           <Col span={store.ui.mediaQuery.isMobile ? 24 : 5}>
@@ -310,6 +335,8 @@ export const Profile = observer(() => {
                 <Table
                   columns={columns}
                   bordered
+                  scroll={{ x: 1300 }}
+                  //scroll={{ x: 1500, y: 300 }}
                   dataSource={store.transaction.dataHistoryTransaction}
                   pagination={{
                     pageSize: store.transaction.pageSizeHistoryTransaction,
@@ -439,7 +466,7 @@ export const Profile = observer(() => {
         visible={store.transaction.visibleModalFilterTransaction}
         title={"Filter"}
         footer={footerLayoutFilter}
-        onCancel={async() => {
+        onCancel={async () => {
           //form.resetFields();
           store.transaction.filterStart = null;
           store.transaction.filterEnd = null;