Skip to content

N
new_excelso
Commit 3d55aa89 authored by Trisno's avatar Trisno
Browse files
Options

set default redux grabamount :0, bug alert di order confirmation

parent b50fa240
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 56 deletions
redux/globalReducer.js
View file @ 3d55aa89
...@@ -68,7 +68,7 @@ const globalState = { ...@@ -68,7 +68,7 @@ const globalState = {
addressId: '', addressId: '',
grabtype: '', grabtype: '',
grabamount: '', grabamount: 0,
grabpickup: '', grabpickup: '',
grabdropoff: '', grabdropoff: '',
grabdestination: '', grabdestination: '',
......
view/MenuConfirmation.js
View file @ 3d55aa89
...@@ -27,7 +27,7 @@ class MenuConfirmation extends React.Component { ...@@ -27,7 +27,7 @@ class MenuConfirmation extends React.Component {
componentDidMount() { componentDidMount() {
// console.log(" DESTINASI : "+ this.props.grabdestination) // console.log(" DESTINASI : "+ this.props.grabdestination)
console.log("ONGKIR"+ this.props.grabamount) console.log("ONGKIR" + this.props.grabamount)
// console.log("drop off"+this.props.grabdropoff) // console.log("drop off"+this.props.grabdropoff)
// console.log("pickup"+this.props.grabpickup) // console.log("pickup"+this.props.grabpickup)
// console.log("type" +this.props.grabtype) // console.log("type" +this.props.grabtype)
...@@ -71,7 +71,7 @@ class MenuConfirmation extends React.Component { ...@@ -71,7 +71,7 @@ class MenuConfirmation extends React.Component {
} }
} }
console.log(params) // console.log(params)
Axios.post('https://excelsocrm.ravintoladev.com/crm/v2/transaction/booking', params).then(res => { Axios.post('https://excelsocrm.ravintoladev.com/crm/v2/transaction/booking', params).then(res => {
let data_order = res.data.data.id let data_order = res.data.data.id
...@@ -115,8 +115,13 @@ class MenuConfirmation extends React.Component { ...@@ -115,8 +115,13 @@ class MenuConfirmation extends React.Component {
{ cancelable: false } { cancelable: false }
); );
}).catch(error => { }).catch(error => {
let response = error.response.data; console.log(error.response)
Alert.alert(response.msg); if (error.response.status <= 500) {
Alert.alert(String(error.response.status), 'Internal Server Error')
} else {
let response = error.response.data;
Alert.alert('', response.msg);
}
this.setState({ this.setState({
spinner: false, spinner: false,
}) })
...@@ -140,7 +145,7 @@ class MenuConfirmation extends React.Component { ...@@ -140,7 +145,7 @@ class MenuConfirmation extends React.Component {
} }
} }
console.log(params) // console.log(params)
Axios.post('https://excelsocrm.ravintoladev.com/crm/v2/transaction/booking', params).then(res => { Axios.post('https://excelsocrm.ravintoladev.com/crm/v2/transaction/booking', params).then(res => {
let data_order = res.data.data.id let data_order = res.data.data.id
...@@ -184,12 +189,12 @@ class MenuConfirmation extends React.Component { ...@@ -184,12 +189,12 @@ class MenuConfirmation extends React.Component {
{ cancelable: false } { cancelable: false }
); );
}).catch(error => { }).catch(error => {
// const { navigation } = this.props if (error.response.status <= 500) {
// let response = error.response.data Alert.alert(String(error.response.status), 'Internal Server Error')
// session(response, navigation) } else {
console.log("INI ERROR : " + JSON.stringify(error) ) let response = error.response.data;
Alert.alert(error.response.msg); Alert.alert('', response.msg);
Alert.alert(error) }
this.setState({ this.setState({
spinner: false, spinner: false,
}) })
...@@ -207,7 +212,7 @@ class MenuConfirmation extends React.Component { ...@@ -207,7 +212,7 @@ class MenuConfirmation extends React.Component {
render() { render() {
console.log(this.props.session_id) // console.log(this.props.session_id)
let total = 0 let total = 0
return ( return (
<ScrollView style={styles.container}> <ScrollView style={styles.container}>
...@@ -219,18 +224,18 @@ class MenuConfirmation extends React.Component { ...@@ -219,18 +224,18 @@ 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: 20, 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>
{ {
this.props.type_pickup == true ? ( this.props.type_pickup == true ? (
<View style={{ flex: 0.7, justifyContent: 'center'}}> <View style={{ flex: 0.7, justifyContent: 'center' }}>
<Text style={{ textAlign: 'left', fontSize: 14,fontFamily: 'Gotham-Black', color: '#838383' }}>Excelso {this.props.name_outlet}</Text> <Text style={{ textAlign: 'left', fontSize: 14, fontFamily: 'Gotham-Black', color: '#838383' }}>Excelso {this.props.name_outlet}</Text>
<Text style={{ textAlign: 'left', fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>Excelso {this.props.outlet_detailadress}</Text> <Text style={{ textAlign: 'left', fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>Excelso {this.props.outlet_detailadress}</Text>
</View> </View>
) : ( ) : (
<View style={{ flex: 0.7, justifyContent: 'center'}}> <View style={{ flex: 0.7, justifyContent: 'center' }}>
<Text style={{ textAlign: 'left', fontSize: 14, fontFamily: 'Gotham-Black', color: '#838383' }}>{this.props.home_address}</Text> <Text style={{ textAlign: 'left', fontSize: 14, fontFamily: 'Gotham-Black', color: '#838383' }}>{this.props.home_address}</Text>
<Text style={{ textAlign: 'left', fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>{this.props.address}</Text> <Text style={{ textAlign: 'left', fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>{this.props.address}</Text>
</View> </View>
...@@ -239,11 +244,11 @@ class MenuConfirmation extends React.Component { ...@@ -239,11 +244,11 @@ class MenuConfirmation extends React.Component {
} }
{ {
this.props.type_pickup == true ? ( this.props.type_pickup == true ? (
<View style={{ flex: 0.2, justifyContent: 'center'}}> <View style={{ flex: 0.2, justifyContent: 'center' }}>
<Text style={{ textAlign: 'right', fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>PICKUP</Text> <Text style={{ textAlign: 'right', fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>PICKUP</Text>
</View> </View>
) : ( ) : (
<View style={{ flex: 0.2, justifyContent: 'center'}}> <View style={{ flex: 0.2, justifyContent: 'center' }}>
<Text style={{ textAlign: 'right', fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>DELIVERY</Text> <Text style={{ textAlign: 'right', fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>DELIVERY</Text>
</View> </View>
...@@ -251,7 +256,7 @@ class MenuConfirmation extends React.Component { ...@@ -251,7 +256,7 @@ class MenuConfirmation extends React.Component {
} }
</View> </View>
<View style={{ marginHorizontal: 10, paddingLeft: 10 }}> <View style={{ marginHorizontal: 10, paddingLeft: 10 }}>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color:'#838383' }}>PESANAN</Text> <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>PESANAN</Text>
</View> </View>
{ {
this.props.order_item.map((item, index) => { this.props.order_item.map((item, index) => {
...@@ -259,21 +264,21 @@ class MenuConfirmation extends React.Component { ...@@ -259,21 +264,21 @@ class MenuConfirmation extends React.Component {
return ( return (
<View style={{ margin: 0 }} key={index} > <View style={{ margin: 0 }} key={index} >
<View style={{ flex: 1, margin: 10, flexDirection: 'row', justifyContent: 'space-around' }}> <View style={{ flex: 1, margin: 10, flexDirection: 'row', justifyContent: 'space-around' }}>
<View style={{ flex: 0.1, alignItems: 'center', justifyContent:'center', alignItems:'center', marginLeft:18 }}> <View style={{ flex: 0.1, alignItems: 'center', justifyContent: 'center', alignItems: 'center', marginLeft: 18 }}>
<Text style={{ fontSize: 20, fontFamily: 'Gotham-Light', color:'#838383' }}>{item.quantity}</Text> <Text style={{ fontSize: 20, fontFamily: 'Gotham-Light', color: '#838383' }}>{item.quantity}</Text>
</View> </View>
<View style={{ flex: 0.2, alignItems: 'center'}}> <View style={{ flex: 0.2, alignItems: 'center' }}>
<Image source={{ uri: item.image }} style={{ height: 50, width: 50, borderRadius: 5}}></Image> <Image source={{ uri: item.image }} style={{ height: 50, width: 50, borderRadius: 5 }}></Image>
</View> </View>
{/* <View style={{ flex: 0.1, alignItems: 'flex-start', justifyContent:'center', }}> {/* <View style={{ flex: 0.1, alignItems: 'flex-start', justifyContent:'center', }}>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light' }}>x</Text> <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light' }}>x</Text>
</View> */} </View> */}
<View style={{ flex: 0.4, alignItems: 'baseline', justifyContent:'center', alignItems:'flex-start', paddingLeft:10}}> <View style={{ flex: 0.4, alignItems: 'baseline', justifyContent: 'center', alignItems: 'flex-start', paddingLeft: 10 }}>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color:'#838383' }}>{item.name} </Text> <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>{item.name} </Text>
</View> </View>
<View style={{ flex: 0.3, alignItems: 'flex-end', justifyContent:'center', paddingRight:5}}> <View style={{ flex: 0.3, alignItems: 'flex-end', justifyContent: 'center', paddingRight: 5 }}>
{/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color:'#838383' }}>{item.quantity * item.price} </Text> */} {/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color:'#838383' }}>{item.quantity * item.price} </Text> */}
<NumberFormat decimalScale={0} value={item.quantity * item.price} renderText={value => <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color:'#838383' }}>Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} /> <NumberFormat decimalScale={0} value={item.quantity * item.price} renderText={value => <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} />
</View> </View>
</View> </View>
</View> </View>
...@@ -285,16 +290,16 @@ class MenuConfirmation extends React.Component { ...@@ -285,16 +290,16 @@ class MenuConfirmation extends React.Component {
null null
) : ( ) : (
<> <>
<View style={{ borderTopWidth: 1, borderColor:'#838383', margin: 10, padding: 10 }}> <View style={{ borderTopWidth: 1, borderColor: '#838383', margin: 10, padding: 10 }}>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color:'#838383' }}>VOUCHER</Text> <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>VOUCHER</Text>
</View> </View>
<View style={{ flex:1, flexDirection: 'row', justifyContent: 'space-between', margin: 10, marginTop: -20 }}> <View style={{ flex: 1, flexDirection: 'row', justifyContent: 'space-between', margin: 10, marginTop: -20 }}>
<View style={{ flex:0.8, margin: 10, paddingLeft: 10 }}> <View style={{ flex: 0.8, margin: 10, paddingLeft: 10 }}>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color:'#838383' }}>{this.props.voucher.reward.title}</Text> <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>{this.props.voucher.reward.title}</Text>
</View> </View>
<TouchableOpacity onPress={() => this.props.navigation.navigate('Reward Detail', { rewardId: this.props.voucher.id })}> <TouchableOpacity onPress={() => this.props.navigation.navigate('Reward Detail', { rewardId: this.props.voucher.id })}>
<View style={{ flex:0.2, marginVertical:10, paddingRight:5 }}> <View style={{ flex: 0.2, marginVertical: 10, paddingRight: 5 }}>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#CFB368' }}>View Detail</Text> <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#CFB368' }}>View Detail</Text>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
...@@ -302,47 +307,47 @@ class MenuConfirmation extends React.Component { ...@@ -302,47 +307,47 @@ class MenuConfirmation extends React.Component {
</> </>
) )
} }
<View style={{ borderTopWidth: 1, borderColor:'#838383', marginHorizontal: 10, paddingLeft: 10, padding: 10}}> <View style={{ borderTopWidth: 1, borderColor: '#838383', marginHorizontal: 10, paddingLeft: 10, padding: 10 }}>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color:'#838383' }}>PAYMENT</Text> <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>PAYMENT</Text>
</View> </View>
<View style={{ flex: 1, flexDirection: 'row', justifyContent: 'space-between',marginTop: -10 }}> <View style={{ flex: 1, flexDirection: 'row', justifyContent: 'space-between', marginTop: -10 }}>
<View style={{ flex:0.5, margin: 10, paddingLeft: 20 }}> <View style={{ flex: 0.5, margin: 10, paddingLeft: 20 }}>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color:'#838383' }}>Balance Used</Text> <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>Balance Used</Text>
</View> </View>
<View style={{ flex:0.5, margin: 10, alignItems:'flex-end', paddingRight:5 }}> <View style={{ flex: 0.5, margin: 10, alignItems: 'flex-end', paddingRight: 5 }}>
{/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light' }}>{this.props.route.params.balanceUsed}</Text> */} {/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light' }}>{this.props.route.params.balanceUsed}</Text> */}
<NumberFormat decimalScale={0} value={this.props.route.params.balanceUsed} renderText={value => <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} /> <NumberFormat decimalScale={0} value={this.props.route.params.balanceUsed} renderText={value => <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} />
</View> </View>
</View> </View>
<View style={{ flex: 1, flexDirection: 'row', justifyContent: 'space-between',marginTop: -10 }}> <View style={{ flex: 1, flexDirection: 'row', justifyContent: 'space-between', marginTop: -10 }}>
<View style={{ flex:0.5, margin: 10, paddingLeft: 20 }}> <View style={{ flex: 0.5, margin: 10, paddingLeft: 20 }}>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color:'#838383' }}>Point Used</Text> <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>Point Used</Text>
</View> </View>
<View style={{flex:0.5, margin: 10, alignItems:'flex-end', paddingRight:5}}> <View style={{ flex: 0.5, margin: 10, alignItems: 'flex-end', paddingRight: 5 }}>
{/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light' }}>{this.props.route.params.pointused}</Text> */} {/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light' }}>{this.props.route.params.pointused}</Text> */}
<NumberFormat decimalScale={0} value={this.props.route.params.pointused} renderText={value => <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} /> <NumberFormat decimalScale={0} value={this.props.route.params.pointused} renderText={value => <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} />
</View> </View>
</View> </View>
<View style={{ borderTopWidth: 1, borderColor:'#838383', margin: 10, paddingLeft: 10, padding: 10, paddingBottom: -10, flexDirection: 'row', justifyContent: 'space-between', flex: 1}}> <View style={{ borderTopWidth: 1, borderColor: '#838383', margin: 10, paddingLeft: 10, padding: 10, paddingBottom: -10, flexDirection: 'row', justifyContent: 'space-between', flex: 1 }}>
<View style={{ flex: 0.6 }}> <View style={{ flex: 0.6 }}>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color:'#838383' }}>Harga</Text> <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>Harga</Text>
</View> </View>
<View style={{ flex: 0.4, marginRight: -5 }}> <View style={{ flex: 0.4, marginRight: -5 }}>
{/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', textAlign: 'right', color:'#838383' }}>{total}</Text> */} {/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', textAlign: 'right', color:'#838383' }}>{total}</Text> */}
<NumberFormat decimalScale={0} value={total} renderText={value => <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', textAlign: 'right', color:'#838383' }}>Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} /> <NumberFormat decimalScale={0} value={total} renderText={value => <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', textAlign: 'right', color: '#838383' }}>Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} />
</View> </View>
</View> </View>
{ {
this.props.value_voucher == '' ? ( this.props.value_voucher == '' ? (
null null
) : ( ) : (
<View style={{ margin: 10, marginTop: -10, paddingLeft: 10, padding: 10, paddingBottom: -10, flexDirection: 'row', justifyContent: 'space-between', flex: 1}}> <View style={{ margin: 10, marginTop: -10, paddingLeft: 10, padding: 10, paddingBottom: -10, flexDirection: 'row', justifyContent: 'space-between', flex: 1 }}>
<View style={{ flex: 0.6 }}> <View style={{ flex: 0.6 }}>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color:'#838383' }}>Voucher</Text> <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>Voucher</Text>
</View> </View>
<View style={{ flex: 0.4, marginRight: -5 }}> <View style={{ flex: 0.4, marginRight: -5 }}>
{/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', textAlign: 'right', color:'#838383' }}>- {this.props.voucher.reward.value}</Text> */} {/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', textAlign: 'right', color:'#838383' }}>- {this.props.voucher.reward.value}</Text> */}
<NumberFormat decimalScale={0} value={this.props.voucher.reward.value} renderText={value => <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', textAlign: 'right', color:'#838383' }}>- Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} /> <NumberFormat decimalScale={0} value={this.props.voucher.reward.value} renderText={value => <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', textAlign: 'right', color: '#838383' }}>- Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} />
</View> </View>
</View> </View>
) )
...@@ -351,24 +356,24 @@ class MenuConfirmation extends React.Component { ...@@ -351,24 +356,24 @@ class MenuConfirmation extends React.Component {
this.props.type_pickup == true ? ( this.props.type_pickup == true ? (
null null
) : ( ) : (
<View style={{ margin: 10, marginTop: -10, paddingLeft: 10, padding: 10, paddingBottom: -10, flexDirection: 'row', justifyContent: 'space-between', flex: 1}}> <View style={{ margin: 10, marginTop: -10, paddingLeft: 10, padding: 10, paddingBottom: -10, flexDirection: 'row', justifyContent: 'space-between', flex: 1 }}>
<View style={{ flex: 0.6 }}> <View style={{ flex: 0.6 }}>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color:'#838383' }}>Ongkos Kirim</Text> <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>Ongkos Kirim</Text>
</View> </View>
<View style={{ flex: 0.4, marginRight: -5 }}> <View style={{ flex: 0.4, marginRight: -5 }}>
{/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', textAlign: 'right' }}>{this.props.grabamount}</Text> */} {/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', textAlign: 'right' }}>{this.props.grabamount}</Text> */}
<NumberFormat decimalScale={0} value={this.props.grabamount} renderText={value => <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', textAlign: 'right', color:'#838383' }}>- Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} /> <NumberFormat decimalScale={0} value={this.props.grabamount} renderText={value => <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', textAlign: 'right', color: '#838383' }}>- Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} />
</View> </View>
</View> </View>
) )
} }
<View style={{ marginVertical:10, marginHorizontal:9, paddingHorizontal:10, flexDirection: 'row', justifyContent: 'space-between', flex: 1 }}> <View style={{ marginVertical: 10, marginHorizontal: 9, paddingHorizontal: 10, flexDirection: 'row', justifyContent: 'space-between', flex: 1 }}>
<View style={{ flex: 0.6 }}> <View style={{ flex: 0.6 }}>
<Text style={{ fontSize: 20, fontFamily: 'Gotham-Black', color: '#CFB368' }}>Total</Text> <Text style={{ fontSize: 20, fontFamily: 'Gotham-Black', color: '#CFB368' }}>Total</Text>
</View> </View>
{ {
this.props.value_voucher == '' ? ( this.props.value_voucher == '' ? (
<View style={{ flex: 0.4, marginRight: -5, }}> <View style={{ flex: 0.4, marginRight: -5, }}>
{/* <Text style={{ fontSize: 20, fontFamily: 'Gotham-Black', textAlign: 'right', color: '#CFB368' }}>{this.props.order_total + this.props.grabamount}</Text> */} {/* <Text style={{ fontSize: 20, fontFamily: 'Gotham-Black', textAlign: 'right', color: '#CFB368' }}>{this.props.order_total + this.props.grabamount}</Text> */}
<NumberFormat decimalScale={0} value={this.props.order_total + this.props.grabamount} renderText={value => <Text style={{ fontSize: 20, fontFamily: 'Gotham-Black', textAlign: 'right', color: '#CFB368' }}>Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} /> <NumberFormat decimalScale={0} value={this.props.order_total + this.props.grabamount} renderText={value => <Text style={{ fontSize: 20, fontFamily: 'Gotham-Black', textAlign: 'right', color: '#CFB368' }}>Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} />
</View> </View>
...@@ -494,7 +499,7 @@ const styles = StyleSheet.create({ ...@@ -494,7 +499,7 @@ const styles = StyleSheet.create({
marginTop: 25, marginTop: 25,
marginHorizontal: 40, marginHorizontal: 40,
borderRadius: 10, borderRadius: 10,
height:40, height: 40,
alignItems: 'center', alignItems: 'center',
justifyContent: 'center', justifyContent: 'center',
}, },
......
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