Skip to content

C
clone_excelso
Commit 56233833 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 85efc67b aeb99cb4
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 15 deletions
view/ItemShopingCart.js
View file @ 56233833
...@@ -76,7 +76,7 @@ class ItemShoping extends React.Component { ...@@ -76,7 +76,7 @@ class ItemShoping extends React.Component {
</View> </View>
</Modal> </Modal>
<View style={{ flex: 1, flexDirection: 'row', height: 100 }}> <View style={{ flex: 1, flexDirection: 'row', height: 100, marginVertical:5 }}>
<View style={{ flex: 1, height: 100 }}> <View style={{ flex: 1, height: 100 }}>
<TouchableOpacity onPress={() => this.props.navigation.navigate('Menu Detail', { nameMenu: item.name, desc: item.description, image: item.image })}> <TouchableOpacity onPress={() => this.props.navigation.navigate('Menu Detail', { nameMenu: item.name, desc: item.description, image: item.image })}>
<Image source={{ uri: item.image }} style={{ height: 100, width: 100, borderRadius: 10, }}></Image> <Image source={{ uri: item.image }} style={{ height: 100, width: 100, borderRadius: 10, }}></Image>
......
view/MenuConfirmation.js
View file @ 56233833
...@@ -218,7 +218,7 @@ class MenuConfirmation extends React.Component { ...@@ -218,7 +218,7 @@ class MenuConfirmation extends React.Component {
{/* <View style={{ margin: 10, padding: 20, borderBottomWidth: 1 }}> {/* <View style={{ margin: 10, padding: 20, borderBottomWidth: 1 }}>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', textAlign: 'center' }}>{moment().utcOffset('+07:00').format('DD MMMM YYYY HH:mm:ss')}</Text> <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', textAlign: 'center' }}>{moment().utcOffset('+07:00').format('DD MMMM YYYY HH:mm:ss')}</Text>
</View> */} </View> */}
<View style={{ flex: 1, flexDirection: 'row', borderBottomWidth: 1, borderColor:'#838383', margin: 10, paddingBottom: 30, padding: 10 }}> <View style={{ flex: 1, flexDirection: 'row', borderBottomWidth: 1, borderColor:'#838383', margin: 10, paddingBottom: 20, padding: 10 }}>
<View style={{ flex: 0.1, justifyContent: 'center' }}> <View style={{ flex: 0.1, justifyContent: 'center' }}>
<FontAwesome name="map-marker" size={24} color="red" /> <FontAwesome name="map-marker" size={24} color="red" />
</View> </View>
......
view/OrderHistory.js
View file @ 56233833
...@@ -65,7 +65,7 @@ class OrderHistory extends React.Component { ...@@ -65,7 +65,7 @@ class OrderHistory extends React.Component {
return ( return (
<View style={styles.container}> <View style={styles.container}>
<View style={styles.header}> <View style={styles.header}>
<Text style={{ color: 'white', textAlign: 'center', fontSize: 18, fontFamily: 'Gotham-Black' }}>ORDER HISTORY</Text> <Text style={{ color: 'white', textAlign: 'center', fontSize: 20, fontFamily: 'Gotham-Black' }}>ORDER HISTORY</Text>
</View> </View>
<ScrollView style={styles.body}> <ScrollView style={styles.body}>
{this.state.indicator == true ? (<ActivityIndicator style={{ justifyContent: "center" }} size="large" color="#c9af6d" />) : {this.state.indicator == true ? (<ActivityIndicator style={{ justifyContent: "center" }} size="large" color="#c9af6d" />) :
...@@ -73,20 +73,20 @@ class OrderHistory extends React.Component { ...@@ -73,20 +73,20 @@ class OrderHistory extends React.Component {
this.state.order_list.map((item, key) => ( this.state.order_list.map((item, key) => (
<TouchableOpacity key={key} onPress={() => this.props.navigation.navigate('Order Detail', { idTrans: item.id })}> <TouchableOpacity key={key} onPress={() => this.props.navigation.navigate('Order Detail', { idTrans: item.id })}>
<View style={{ marginTop: 5 }} key={key}> <View style={{ marginTop: 5 }} key={key}>
<View style={{ flex: 2, height: 120, margin: 5, borderRadius: 5, borderWidth: 1, flexDirection: 'row' }}> <View style={{ flex: 2, height: 120, margin: 5, borderRadius: 5, borderWidth: 1, borderColor:'#838383', flexDirection: 'row' }}>
<View style={{ justifyContent: 'center', margin: 10 }}> <View style={{ flex:1.1, justifyContent: 'center', margin: 10}}>
<Text style={{ fontFamily: 'Gotham-Black', color: 'grey', fontSize: 12, margin: 2 }}>{item.outlet}</Text> <Text style={{ fontFamily: 'Gotham-Black', color: 'grey', fontSize: 12, margin: 2 }}>{item.outlet}</Text>
<Text style={{ fontFamily: 'Gotham-Light', color: 'grey', fontSize: 12, margin: 2 }}>{moment(item.trans_time).format("DD MMMM YYYY, hh:mm A")}</Text> <Text style={{ fontFamily: 'Gotham-Light', color: 'grey', fontSize: 12, margin: 2 }}>{moment(item.trans_time).format("DD MMMM YYYY, hh:mm A")}</Text>
<Text style={{ fontFamily: 'Gotham-Black', color: '#c9af6d', fontSize: 12, margin: 2 }}>{item.trans_type_display}</Text> <Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 12, margin: 2 }}>{item.trans_type_display}</Text>
<TouchableOpacity onPress={() => this.props.navigation.navigate('Order Detail', { idTrans: item.id })}> <TouchableOpacity onPress={() => this.props.navigation.navigate('Order Detail', { idTrans: item.id })}>
<View style={{ height: 40, borderRadius: 10, backgroundColor: '#CFB368', justifyContent: 'center' }}> <View style={{ height: 40, borderRadius: 10, backgroundColor: '#CFB368', justifyContent: 'center', marginTop:10 }}>
<Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 12, textAlign: 'center', margin: 15 }}>Lihat Detail Pemesanan</Text> <Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 12, textAlign: 'center',paddingHorizontal:5}}>Lihat Detail Pemesanan</Text>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
<View style={{ justifyContent: 'center', marginVertical: 5, marginLeft: 20, borderLeftWidth: 1, borderColor: 'grey' }}> <View style={{ flex:0.9, justifyContent: 'center', alignItems:'center', margin: 10, marginLeft: 15, borderLeftWidth: 1, borderColor: '#838383' }}>
<View style={{ margin: 30 }}> <View>
<Text style={{ fontFamily: 'Gotham-Black', color: '#c9af6d', fontSize: 12, margin: 2 }}>{item.trans_status_display}</Text> <Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 12 }}>{item.trans_status_display}</Text>
</View> </View>
</View> </View>
</View> </View>
......
view/ShoppingCart.js
View file @ 56233833
...@@ -666,7 +666,7 @@ class ShoppingCart extends React.Component { ...@@ -666,7 +666,7 @@ class ShoppingCart extends React.Component {
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: 'gray' }}>Ongkos Kirim</Text> <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: 'gray' }}>Ongkos Kirim</Text>
</View> </View>
{this.props.order_item.length ? ( {this.props.order_item.length ? (
<View style={{ paddingRight: 30, paddingTop: 5, alignItems: 'flex-end' }}> <View style={{ paddingRight: 20, paddingTop: 5, alignItems: 'flex-end' }}>
{/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: 'gray' }}>{this.props.grabamount}</Text> */} {/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: 'gray' }}>{this.props.grabamount}</Text> */}
<NumberFormat decimalScale={0} value={this.props.grabamount} renderText={value => <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: 'gray' }}>Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} /> <NumberFormat decimalScale={0} value={this.props.grabamount} renderText={value => <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: 'gray' }}>Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} />
</View> </View>
...@@ -706,7 +706,7 @@ class ShoppingCart extends React.Component { ...@@ -706,7 +706,7 @@ class ShoppingCart extends React.Component {
} }
</View> </View>
) : ( ) : (
<View style={{ marginTop: 10, paddingRight: 30, alignItems: 'flex-end' }}> <View style={{ marginTop: 10, paddingRight: 20, alignItems: 'flex-end' }}>
{/* {this.props.order_item.length ? ( {/* {this.props.order_item.length ? (
<Text style={{ fontSize: 35, color: '#ccb46c' }}>{Math.max(0, this.props.order_total - this.props.voucher.reward.value + this.props.grabamount)}</Text> <Text style={{ fontSize: 35, color: '#ccb46c' }}>{Math.max(0, this.props.order_total - this.props.voucher.reward.value + this.props.grabamount)}</Text>
) : ( ) : (
...@@ -727,9 +727,9 @@ class ShoppingCart extends React.Component { ...@@ -727,9 +727,9 @@ class ShoppingCart extends React.Component {
{ {
this.props.order_item.length ? ( this.props.order_item.length ? (
<NumberFormat decimalScale={0} value={Math.max(0, this.props.order_total - this.props.voucher.reward.value + this.props.grabamount)} renderText={value => <Text style={{ fontSize: 18, color: '#CFB368', fontFamily: 'Gotham-Black' }}>Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} /> <NumberFormat decimalScale={0} value={Math.max(0, this.props.order_total - this.props.voucher.reward.value + this.props.grabamount)} renderText={value => <Text style={{ fontSize: 20, color: '#CFB368', fontFamily: 'Gotham-Black' }}>Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} />
) : ( ) : (
<NumberFormat decimalScale={0} value={0} renderText={value => <Text style={{ fontSize: 18, color: '#CFB368', fontFamily: 'Gotham-Black' }}>Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} /> <NumberFormat decimalScale={0} value={0} renderText={value => <Text style={{ fontSize: 20, color: '#CFB368', fontFamily: 'Gotham-Black' }}>Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} />
) )
} }
</> </>
......
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