Merge branch 'phase2_transation_intergate_api' into 'dev_phase2'

Phase2 transation intergate api

See merge request !6

src/RootView.js

@@ -31,7 +31,7 @@ const RootView = (props) => {
 
         <StackNavigation />
       </View>
-      <VersionChecker/>
+      {/*<VersionChecker/>*/}
       <NoInternetComponent />
     </>
   );

src/Screens/Transaction/PriceList/Item.js

@@ -17,27 +17,25 @@ import R from '../../../assets/R';
 import Block from '../../../components/Block';
 
 const Item = (props) => {
-  const {item} = props;
+  const {item, isEndItem} = props;
   return (
-    <View style={styles.container}>
+    <View style={[styles.container, isEndItem && {marginBottom: HEIGHTXD(100)}]}>
       <TouchableOpacity onPress={() => props.onPress(item)}>
         <Block flex={1} row>
-          <View style={styles.wrapDate}>
             <Image source={R.images.iconRecharge} style={styles.imgIcon} />
-          </View>
-          <Block padding={[5, 10]} space={'between'} flex={1}>
+          <Block padding={[0, WIDTHXD(40)]} space={'between'} flex={1}>
             <View
               style={{
                 flex: 1,
                 flexDirection: 'row',
                 justifyContent: 'space-between',
               }}>
-              <Text numberOfLines={2} style={styles.txtBlack}>
-                Ngô CBOT
+              <Text numberOfLines={2} style={[styles.txtBlack, {flexWrap: 'wrap', flex: 1}]} numberOfLines={1} ellipsizeMode='tail'>
+                {item.name}
               </Text>
-              <Text style={styles.txtMoney}>{toPriceVnd(300000)}</Text>
+              <Text style={styles.txtMoney}>{toPriceVnd(item.fee)}</Text>
             </View>
-            <Text style={styles.txt}>ZCE</Text>
+            <Text style={styles.txt}>{item.code}</Text>
           </Block>
         </Block>
       </TouchableOpacity>
@@ -49,8 +47,7 @@ export default Item;
 
 const styles = StyleSheet.create({
   container: {
-    marginTop: 10,
-    paddingVertical: 10,
+    paddingVertical: HEIGHTXD(40),
     shadowColor: '#000',
     shadowOffset: {
       width: 0,
@@ -59,10 +56,10 @@ const styles = StyleSheet.create({
     shadowOpacity: 0.25,
     shadowRadius: 3.84,
     elevation: 5,
-    marginHorizontal: 10,
     backgroundColor: R.colors.white,
-    marginBottom: 10,
     borderRadius: HEIGHTXD(30),
+    marginVertical: HEIGHTXD(15),
+    marginHorizontal: WIDTHXD(30)
   },
 
   wrapLeft: {
@@ -70,19 +67,14 @@ const styles = StyleSheet.create({
     borderTopLeftRadius: HEIGHTXD(30),
     borderBottomStartRadius: HEIGHTXD(30),
   },
-  wrapDate: {
-    justifyContent: 'center',
-    paddingLeft: 10,
-  },
   txtTitle: {
     fontSize: getFontXD(42),
     color: R.colors.black,
     fontWeight: 'bold',
   },
   txt: {
-    fontSize: getFontXD(39),
-    color: '#929292',
-    fontStyle: 'italic',
+    fontSize: getFontXD(36),
+    color: 'black',
   },
   rowBet: {
     flexDirection: 'row',
@@ -90,14 +82,14 @@ const styles = StyleSheet.create({
     alignItems: 'center',
   },
   txtBlack: {
-    fontSize: getFontXD(42),
+    fontSize: getFontXD(50),
     color: 'black',
-    fontWeight: 'bold',
   },
   imgIcon: {
-    width: WIDTHXD(178),
-    height: HEIGHTXD(178),
+    width: WIDTHXD(150),
+    height: HEIGHTXD(150),
     resizeMode: 'contain',
+    marginLeft: WIDTHXD(35)
   },
   txtMoney: {
     fontSize: getFontXD(42),

src/Screens/Transaction/PriceList/PriceList.js

 import React, {useState, useEffect} from 'react';
-import {getListNotification} from '../../../apis/Functions/users';
+import {getListCategoryProduct, getTransactionListByCategory} from '../../../apis/Functions/Transaction';
 import PriceListView from './PriceListView';
 import I18n from '../../../helper/i18/i18n';
+import {Alert, Platform} from 'react-native';
+
 const PriceList = (props) => {
     const [selected, setSelected] = useState('');
     const [page, setPage] = useState(1);
     const [data, setData] = useState([]);
     const [tottalPage, setTotalPage] = useState(1);
-  const [isRefresh, setisRefresh] = useState(false);
-  const [fillter, setFillters] = useState('ALL');
+    const [isRefresh, setIsRefresh] = useState(false);
+    const [filters, setFilters] = useState([]);
+    const [filterId, setFilterId] = useState(-1);
 
     useEffect(() => {
+        getCategoryData();
+    }, []);
+    useEffect(() => {
+        setData([])
         getData();
-  }, [fillter]);
+    }, [filterId]);
+
+    const getCategoryData = async () => {
+        // setIsRefresh(true);
+        const res = await getListCategoryProduct({
+            keyword: '',
+            platform: Platform.OS,
+            page_size: 20,
+            page_index: 1,
+            type: 'PRODUCT',
+        });
+        if ((res.data.code = 200 && res.data.data)) {
+            let data = [];
+            data.push({id: -1, name: 'All'});
+            setFilters(data.concat([...res.data.data]));
+        } else {
+            Alert.alert(I18n.t('Notification'), res.data.message);
+        }
+    };
+
+    const onRefresh = () => {
+        setPage(1);
+        getData();
+    };
 
     const getData = async () => {
-    setisRefresh(true);
+        setIsRefresh(true);
         setPage(1);
-    const res = await getListNotification({
+        const res = await getTransactionListByCategory({
             keyword: '',
             platform: Platform.OS,
             page_size: 10,
             page_index: 1,
-      type: fillter,
+            category_id: filterId,
         });
-    setisRefresh(false);
+        setIsRefresh(false);
+        console.log('getData', res);
         if ((res.data.code = 200 && res.data.data)) {
             setData(res.data.data);
             setTotalPage(res.data.meta.pages);
@@ -33,29 +64,27 @@ const PriceList = (props) => {
         }
     };
 
-  const onRefresh = () => {
-    getData();
-  };
-
     const onLoadMore = () => {
         console.log(tottalPage);
-    if (page < tottalPage) getDataLoadMore();
+        if (page < tottalPage) {
+            getDataLoadMore();
+        }
     };
 
     const getDataLoadMore = async () => {
-    setisRefresh(true);
-    const res = await getListNotification({
+        setIsRefresh(true);
+        const res = await getTransactionListByCategory({
             keyword: '',
             platform: Platform.OS,
             page_size: 10,
-      page_index: 1,
-      type: fillter,
+            page_index: page + 1,
+            category_id: filterId,
         });
         setPage(page + 1);
         if (res.data.code == 200) {
             setData(data.concat(res.data.data));
         }
-    setisRefresh(false);
+        setIsRefresh(false);
     };
 
     return (
@@ -63,8 +92,9 @@ const PriceList = (props) => {
             onRefresh={onRefresh}
             isRefresh={isRefresh}
             onLoadMore={onLoadMore}
-      setFillters={setFillters}
-      fillter={fillter}
+            setFilterId={setFilterId}
+            filterId={filterId}
+            filters={filters}
             data={data}
         />
     );

src/Screens/Transaction/PriceList/PriceListView.js

@@ -10,7 +10,7 @@ import {
 
 import HeaderDrawer from '../../../components/Header/HeaderDrawer';
 import Item from './Item';
-import {getFontXD} from '../../../Config/Functions';
+import {getFontXD, HEIGHTXD} from '../../../Config/Functions';
 import AppText from '../../../components/AppText';
 import {PRODUCTDETAIL} from '../../../routers/ScreenNames';
 import {useNavigation} from '@react-navigation/native';
@@ -38,34 +38,32 @@ const Fillters = [
     },
 ];
 
-const NotificaitonView = (props) => {
-  const {onRefresh, isRefresh, onLoadMore, setFillters, fillter, data} = props;
+const PriceListView = (props) => {
+    const {onRefresh, isRefresh, onLoadMore, setFilterId, filters, data, filterId} = props;
     const navigate = useNavigation();
-
     return (
         <View style={{flex: 1}}>
             <View style={styles.headerContainer}>
                 <ScrollView horizontal showsHorizontalScrollIndicator={false}>
-          {Fillters.map((e) => (
+                    {filters.map((e) => (
                         <TouchableOpacity
-              key={e.value}
-              onPress={() => setFillters(e.value)}
+                            key={e.id}
+                            onPress={() => setFilterId(e.id)}
                             style={[
                                 styles.itemFillter,
-                fillter == e.value ? {borderColor: '#1473E6'} : null,
+                                filterId == e.id ? {borderColor: '#1473E6'} : null,
                             ]}>
-              <AppText
-                i18nKey={e.name}
+                            <Text
                                 style={[
                                     styles.txtFillter,
-                  fillter == e.value ? {color: '#1473E6'} : {},
-                ]}></AppText>
+                                    filterId == e.id ? {color: '#1473E6'} : {},
+                                ]}>{e.name}</Text>
                         </TouchableOpacity>
                     ))}
                 </ScrollView>
             </View>
 
-      {data.length == 0 ? (
+            {data.length == 0 && !isRefresh? (
                 <View style={{justifyContent: 'center', alignItems: 'center', flex: 1}}>
                     <AppText
                         i18nKey={'NoData'}
@@ -76,6 +74,7 @@ const NotificaitonView = (props) => {
                 </View>
             ) : (
                 <FlatList
+                    style={{paddingVertical: HEIGHTXD(15)}}
                     keyExtractor={(item) => item.id}
                     data={data}
                     refreshing={isRefresh}
@@ -84,7 +83,8 @@ const NotificaitonView = (props) => {
                     onEndReached={(info) => {
                         onLoadMore();
                     }}
-          renderItem={({item}) => <Item item={item}
+                    renderItem={({item, index}) => <Item item={item}
+                                                  isEndItem={index == data.length -1}
                                                   onPress={(item) => navigate.navigate(PRODUCTDETAIL)}/>}
                 />
             )}
@@ -121,4 +121,4 @@ const styles = StyleSheet.create({
     },
 });
 
-export default NotificaitonView;
+export default PriceListView;

src/apis/Functions/Transaction.js

+import {GetData} from '../helpers';
+
+import url from '../url';
+
+export const getListCategoryProduct = async (body) =>
+  GetData(url.urlGetCategoryNew, body)
+    .then((res) => res)
+    .catch((err) => err);
+
+export const getTransactionListByCategory = async (body) =>
+  GetData(url.urlGetTransactionListByCategory, body)
+    .then((res) => res)
+    .catch((err) => err);

src/apis/url.js

@@ -38,4 +38,7 @@ export default {
 
   urlUpdateLanguage: root + 'api/v1/customers/update-language',
   urlGetNewestVersionInfo: root + 'api/v1/settings/version',
+
+  //Transaction
+  urlGetTransactionListByCategory: `${root}api/v1/transactions/price-table`,
 };