Skip to content

C
clone_excelso
Commit d86c543d authored by Wahyu Adjie Prasetyo's avatar Wahyu Adjie Prasetyo
Browse files
Options

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

parents b3985ef7 28c2ce01
Show whitespace changes
Inline Side-by-side
Showing with 52 additions and 40 deletions
view/OrderHistory.js
View file @ d86c543d
......@@ -69,6 +69,7 @@ class OrderHistory extends React.Component {
</View>
<ScrollView style={styles.body}>
{this.state.indicator == true ? (<ActivityIndicator style={{ justifyContent: "center" }} size="large" color="#c9af6d" />) :
this.state.order_list.length ? (
this.state.order_list.map((item, key) => (
<TouchableOpacity key={key} onPress={() => this.props.navigation.navigate('Order Detail', { idTrans: item.id })}>
<View style={{ marginTop: 5 }} key={key}>
......@@ -83,8 +84,8 @@ class OrderHistory extends React.Component {
</View>
</TouchableOpacity>
</View>
<View style={{ justifyContent: 'center', marginVertical: 5, marginLeft:20, borderLeftWidth: 1, borderColor: 'grey' }}>
<View style={{margin:30}}>
<View style={{ justifyContent: 'center', marginVertical: 5, marginLeft: 20, borderLeftWidth: 1, borderColor: 'grey' }}>
<View style={{ margin: 30 }}>
<Text style={{ fontFamily: 'Gotham-Black', color: '#c9af6d', fontSize: 12, margin: 2 }}>{item.trans_status_display}</Text>
</View>
</View>
......@@ -92,6 +93,11 @@ class OrderHistory extends React.Component {
</View>
</TouchableOpacity>
))
) : (
<View style={{ justifyContent: 'center', alignItems: 'center', height: 100 }}>
<Text style={{ textAlign: 'left', fontSize: 12, fontFamily: 'Gotham-Light', color: 'grey' }}>No Order History</Text>
</View>
)
}
</ScrollView>
</View>
......
view/TransactionHistory.js
View file @ d86c543d
......@@ -39,10 +39,11 @@ class TransactionHistory extends React.Component {
<View style={styles.container}>
<ScrollView style={styles.body}>
{
this.state.history_list.length ? (
this.state.history_list.map((item) => (
item.transactions.map((i, k) => (
<TouchableOpacity key={k} onPress={() => this.props.navigation.navigate('Transaction Detail', {idTrans:i.id})}>
<TouchableOpacity key={k} onPress={() => this.props.navigation.navigate('Transaction Detail', { idTrans: i.id })}>
<View style={{ marginTop: 5 }} key={k}>
<View style={{ flex: 2, height: 120, margin: 5, borderRadius: 5, borderWidth: 1, flexDirection: 'row' }}>
<View style={{ justifyContent: 'center', margin: 10 }}>
......@@ -55,8 +56,8 @@ class TransactionHistory extends React.Component {
</View>
</TouchableOpacity>
</View>
<View style={{ justifyContent: 'center', marginVertical: 5, marginLeft:20, borderLeftWidth: 1, borderColor: 'grey' }}>
<View style={{margin:30}}>
<View style={{ justifyContent: 'center', marginVertical: 5, marginLeft: 20, borderLeftWidth: 1, borderColor: 'grey' }}>
<View style={{ margin: 30 }}>
<Text style={{ fontFamily: 'Gotham-Black', color: '#c9af6d', fontSize: 12, margin: 2 }}>{i.trans_status_display}</Text>
</View>
</View>
......@@ -65,6 +66,11 @@ class TransactionHistory extends React.Component {
</TouchableOpacity>
))
))
) : (
<View style={{ justifyContent: 'center', alignItems: 'center', height: 100 }}>
<Text style={{ textAlign: 'left', fontSize: 12, fontFamily: 'Gotham-Light', color: 'grey' }}>No Transaction History</Text>
</View>
)
}
</ScrollView>
</View>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment