Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek

view/Auth.js

@@ -444,7 +444,19 @@ class Auth extends React.Component {
             },
             title: 'TRANSACTION HISTORY'
           }} />
-        <Stack.Screen name="Transaction Detail" component={TransactionDetail} />
+        <Stack.Screen name="Transaction Detail" component={TransactionDetail}
+        options={{
+          headerStyle: { backgroundColor: "#CFB368" },
+          headerBackTitleStyle: { color: 'white' },
+          headerTintColor: '#fff',
+          headerTitleAlign: 'center',
+          headerTitleStyle: {
+            fontFamily: 'Gotham-Black',
+            color: 'white',
+            fontSize: 18,
+          },
+          title: 'TRANSACTION DETAIL'
+        }} />
         {/* <Stack.Screen name="Email Confirmation" component={EmailConfirmation} /> */}
 
         <Stack.Screen name="News Detail" component={NewsDetail} options={{ headerShown: false }} />

view/TransactionDetail.js

@@ -3,6 +3,7 @@ import { View, Text, TextInput, StyleSheet, ScrollView, Alert, TouchableOpacity,
 import { Card } from 'react-native-shadow-cards'
 import { connect } from 'react-redux'
 import Axios from 'axios'
+import moment from 'moment'
 
 class TransactionDetail extends React.Component {
     constructor(props) {
@@ -20,7 +21,9 @@ class TransactionDetail extends React.Component {
             trans_time: '',
             trans_total: '',
             point_reduce: '',
-            transaction_detail: []
+            transaction_detail: [],
+            detail_trans: '',
+            numberId: ''
         }
     }
 
@@ -47,9 +50,12 @@ class TransactionDetail extends React.Component {
                 trans_time: data.trans_time,
                 trans_total: data.trans_total,
                 point_reduce: data.point_reduce,
-                transaction_detail: data.transaction_detail
+                transaction_detail: data.transaction_detail,
+                detail_trans: data,
+                numberId: data.id.substring(0, 5)
             })
-            // console.log(this.state.history_list)
+            console.log(this.state.detail_trans)
+            // console.log(this.props.route.params.idTrans)
         })
     }
 
@@ -57,7 +63,9 @@ class TransactionDetail extends React.Component {
         return (
             <View style={styles.container}>
                 <View style={styles.header}>
-                    <Text style={{ textAlign: 'center', margin: 20, fontSize: 25, alignSelf: 'center' }}>Transaction Detail</Text>
+                    <Text style={{ fontSize: 16, fontFamily: 'Gotham-Light', textAlign: 'center' }}>{this.state.numberId}</Text>
+                    <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', textAlign: 'center' }}>{moment(this.state.detail_trans.trans_time).format('DD MMMM YYYY HH:mm:ss')}</Text>
+                    <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', textAlign: 'center' }}>{this.state.detail_trans.trans_status_display}</Text>
                 </View>
                 <View style={styles.body}>
                     <Card style={{ padding: 10, margin: 10, alignContent: 'center' }}>
@@ -100,15 +108,13 @@ const styles = StyleSheet.create({
         backgroundColor: 'white',
     },
     header: {
-
-        flex: 0.5,
-
+        justifyContent: 'center',
+        flex: 0.2,
+        borderBottomWidth:1
     },
 
     body: {
-        flex: 3,
-        margin: 5,
-
+        flex: 0.8,
     },
     list_detail_order: {
         flex: 1,