Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop

src/pages/Product/Product.js

@@ -1,5 +1,5 @@
 import React, {useContext, useEffect} from "react";
-import {Button, Card, Col, Input, Row, Upload,message} from "antd";
+import {Button, Card, Col, Input, message, Row, Upload} from "antd";
 import {FilterOutlined, PlusSquareOutlined, UploadOutlined,} from "@ant-design/icons";
 import {BreadcumbComponent} from "../../component/BreadcumbComponent";
 import {useStore} from "../../utils/useStore";
@@ -20,8 +20,8 @@ export const Product = observer(() => {
         modalLoader.setLoading(true);
         await Promise.allSettled([
           store.supplier.getData(),
-          store.product.getDataCategories(),
           store.category.getData(),
+          store.category.getDataSubCategories(),
         ]);
         await store.product.getData();
         modalLoader.setLoading(false);

src/pages/Transaction/Product.js

@@ -69,14 +69,11 @@ export const Product = observer(() => {
       <Row>
         <Col span={24}>
           <Select
-            placeholder={"Select Sub Category"}
-            allowClear={true}
-            onChange={(val) => {
-              if (val) {
-                handleChangeSubcategory(val);
-              }
-            }}
-            style={{marginBottom: "10px", width: "100%"}}
+              placeholder={"Select Sub Category"}
+              allowClear={true}
+              onChange={(val) => handleChangeSubcategory(val)}
+              style={{marginBottom: "10px", width: "100%"}}
+              value={store.transaction.filterSubCategory}
           >
             {store.transaction.dataSubCategories.map((item, index) => (
               <Option key={item.id} value={item.id}>

src/pages/Transaction/Transaction.js

@@ -34,9 +34,10 @@ export const Transaction = observer(() => {
   }, []);
 
   const handleChangeTabs = async (key) => {
+    modalLoader.setLoading(true);
     store.transaction.dataSubCategories = [];
     store.transaction.data = [];
-    modalLoader.setLoading(true);
+    store.transaction.filterSubCategory = null;
     store.transaction.filterCategory = key;
     await store.transaction.getDataSubCategories();
     modalLoader.setLoading(false);