Merge branch 'develop' into 'devops-staging'

Bug Fixing

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

src/component/CategoryComponent.js

@@ -8,7 +8,7 @@ import {
   Space,
   Table,
   List,
-  Divider
+  Divider,
 } from "antd";
 import { observer } from "mobx-react-lite";
 import { useHistory } from "react-router-dom";
@@ -55,6 +55,8 @@ export const CategoryComponent = observer((props) => {
     },
   ];
 
+  if (store.authentication.userData.role === "Customer Service") columns.pop();
+
   const deleteData = async (id) => {
     try {
       console.log(id);

src/component/SubcategoryComponent.js

@@ -67,6 +67,8 @@ export const SubcategoryComponent = observer((props) => {
     },
   ];
 
+  if (store.authentication.userData.role === "Customer Service") columns.pop();
+  
   const handleCancel = () => {
     setIdData("");
     store.subcategory.visibleModalSubcategory = false;

src/pages/Membership/DetailUser.js

@@ -42,6 +42,7 @@ export const DetailUser = observer(() => {
   const [filterStart, setFilterStart] = useState([]);
   const [filterEnd, setFilterEnd] = useState([]);
   const [visibleHis, setVisibleHis] = useState(true);
+  const [actionFilter, setAction] = useState(false);
 
   useEffect(() => {
     (async () => {
@@ -326,19 +327,31 @@ export const DetailUser = observer(() => {
     form.resetFields();
     setFilterStart([]);
     setFilterEnd([]);
-    await store.transaction.getDetailHistoryTransaction(
+    actionFilter === true
+      ? await store.transaction.getDataHistoryTopUp(id)
+      : await store.transaction.getDetailHistoryTransaction(
           store.authentication.dataProfit.id
         );
+    // await store.transaction.getDetailHistoryTransaction(
+    //   store.authentication.dataProfit.id
+    // );
     store.transaction.visibleModalFilterTransaction = false;
+    setAction(false)
   };
 
   const handleCancelFilter = async () => {
     store.transaction.filterStart = null;
     store.transaction.filterEnd = null;
     store.transaction.visibleModalFilterTransaction = false;
-    await store.transaction.getDetailHistoryTransaction(
+    actionFilter === true
+      ? await store.transaction.getDataHistoryTopUp(id)
+      : await store.transaction.getDetailHistoryTransaction(
           store.authentication.dataProfit.id
         );
+    // await store.transaction.getDetailHistoryTransaction(
+    //   store.authentication.dataProfit.id
+    // );
+    setAction(false)
   };
 
   const handleSubmitFilter = async () => {
@@ -350,13 +363,16 @@ export const DetailUser = observer(() => {
       "YYYY-MM-DD HH:mm:ss"
     );
     modalLoader.setLoading(true);
-    await store.transaction.getDetailHistoryTransaction(
+    actionFilter === true
+      ? await store.transaction.getDataHistoryTopUp(id)
+      : await store.transaction.getDetailHistoryTransaction(
           store.authentication.dataProfit.id
         );
     modalLoader.setLoading(false);
     store.transaction.filterStart = null;
     store.transaction.filterEnd = null;
     store.transaction.visibleModalFilterTransaction = false;
+    setAction(false)
   };
   const footerLayoutFilter = [
     <Button
@@ -719,6 +735,16 @@ export const DetailUser = observer(() => {
           <Col span={24}>
             <Tabs defaultActiveKey="1">
               <TabPane tab="History Top Up" key="1">
+                <Button
+                  style={{ marginBottom: "1rem", marginLeft: 5 }}
+                  onClick={() => {
+                    store.transaction.visibleModalFilterTransaction = true;
+                    setAction(true);
+                  }}
+                >
+                  <FilterOutlined />
+                  Filter
+                </Button>
                 <Table
                   key="1"
                   hasEmpty
@@ -922,7 +948,12 @@ export const DetailUser = observer(() => {
           store.transaction.filterStart = null;
           store.transaction.filterEnd = null;
           store.transaction.visibleModalFilterTransaction = false;
-          await store.transaction.getDetailHistoryTransaction();
+          actionFilter === true
+            ? await store.transaction.getDataHistoryTopUp(id)
+            : await store.transaction.getDetailHistoryTransaction(
+                store.authentication.dataProfit.id
+              );
+          //await store.transaction.getDetailHistoryTransaction();
         }}
       >
         <Row>

src/pages/Membership/Membership.js

@@ -168,7 +168,7 @@ export const Membership = observer(() => {
 
   const columns = [
     {
-      title: "Name",
+      title: "Nama",
       dataIndex: "name",
       key: "name",
       render: (text, record) => record?.name ?? record?.username,

src/pages/Profile/Profile.js

@@ -36,7 +36,7 @@ export const Profile = observer(() => {
   const modalLoader = useContext(ModalLoaderContext);
   const [filterStart, setFilterStart] = useState([]);
   const [filterEnd, setFilterEnd] = useState([]);
-  const [action, setAction] = useState(false);
+  const [actionFilter, setAction] = useState(false);
 
   const routeData = [
     {
@@ -77,8 +77,14 @@ export const Profile = observer(() => {
     form.resetFields();
     setFilterStart([]);
     setFilterEnd([]);
-    await store.transaction.getDataHistoryTransaction();
+    //await store.transaction.getDataHistoryTransaction();
+    actionFilter === true
+      ? await store.transaction.getDataHistoryTopUpProfile(
+          store.authentication.profileData?.id
+        )
+      : await store.transaction.getDataHistoryTransaction();
     store.transaction.visibleModalFilterTransaction = false;
+    setAction(false)
   };
 
   const handleCancelFilter = async () => {
@@ -86,7 +92,13 @@ export const Profile = observer(() => {
     //form.resetFields();
     store.transaction.filterEnd = null;
     store.transaction.visibleModalFilterTransaction = false;
-    await store.transaction.getDataHistoryTransaction();
+    actionFilter === true
+      ? await store.transaction.getDataHistoryTopUpProfile(
+          store.authentication.profileData?.id
+        )
+      : await store.transaction.getDataHistoryTransaction();
+      setAction(false)
+    //await store.transaction.getDataHistoryTransaction();
   };
 
   const handleSubmitFilter = async () => {
@@ -98,12 +110,17 @@ export const Profile = observer(() => {
       "YYYY-MM-DD HH:mm:ss"
     ));
     modalLoader.setLoading(true);
-    await store.transaction.getDataHistoryTransaction();
+    actionFilter === true
+      ? await store.transaction.getDataHistoryTopUpProfile(
+          store.authentication.profileData?.id
+        )
+      : await store.transaction.getDataHistoryTransaction();
     modalLoader.setLoading(false);
     store.transaction.filterStart = null;
     store.transaction.filterEnd = null;
     //form.resetFields();
     store.transaction.visibleModalFilterTransaction = false;
+    setAction(false)
   };
 
   const footerLayoutFilter = [
@@ -665,7 +682,11 @@ export const Profile = observer(() => {
           store.transaction.filterStart = null;
           store.transaction.filterEnd = null;
           store.transaction.visibleModalFilterTransaction = false;
-          await store.transaction.getDataHistoryTransaction();
+          actionFilter === true
+            ? await store.transaction.getDataHistoryTopUpProfile(
+                store.authentication.profileData?.id
+              )
+            : await store.transaction.getDataHistoryTransaction();
         }}
       >
         <Row>

src/store/transaction.js

@@ -158,7 +158,7 @@ export class Transaction {
   async getDataHistoryTopUp(id) {
     try {
       const response = await http.get(
-        `/transaction/history-deposit?page=${this.pageHistoryTopUp}&pageSize=${this.pageSizeHistoryTopUp}&user-destination=${id}`
+        `/transaction/history-deposit?page=${this.pageHistoryTopUp}&pageSize=${this.pageSizeHistoryTopUp}&user-destination=${id}&start=${this.filterStart}&end=${this.filterEnd}`
       );
       console.log(response,'get data history')
       this.dataHistoryTopUp = response.body.data ?? [];