Skip to content

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

update menu selection

parent dd6fb4a6
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 25 deletions
view/Item.js
View file @ c4854811
...@@ -75,7 +75,7 @@ class Item extends React.Component { ...@@ -75,7 +75,7 @@ class Item extends React.Component {
</View> </View>
<TouchableOpacity onPress={() => this.setState({ modalVisible: false })}> <TouchableOpacity onPress={() => this.setState({ modalVisible: false })}>
<View style={styles.button}> <View style={styles.button}>
<Text style={{ color: 'white', fontWeight: 'bold', fontSize: 22 }}>Confirm</Text> <Text style={{ color: 'white', fontWeight: 'bold', fontSize: 16 }}>CONFIRM</Text>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
...@@ -95,39 +95,39 @@ class Item extends React.Component { ...@@ -95,39 +95,39 @@ class Item extends React.Component {
</View> </View>
<View style={{ flex: 2, height: 150 }}> <View style={{ flex: 2, height: 150 }}>
<View style={{ marginLeft: 5, marginRight: 5 }}> <View style={{ marginLeft: 5, marginRight: 5 }}>
<Text style={{ fontSize: 15, margin: 5, marginRight: 10, fontFamily: 'Gotham-Black' }}>{item.name}</Text> <Text style={{ fontSize: 14, margin: 5, marginRight: 10, fontFamily: 'Gotham-Black', color: '#838383' }}>{item.name}</Text>
<NumberFormat decimalScale={0} value={item.price} renderText={value => <Text style={{ fontSize: 12, margin: 5, marginRight: 10, fontFamily: 'Gotham-Black', color: 'grey' }}>Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} /> <NumberFormat decimalScale={0} value={item.price} renderText={value => <Text style={{ fontSize: 14, margin: 5, marginRight: 10, fontFamily: 'Gotham-Light', color: 'grey' }}>Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} />
</View> </View>
<View style={{ marginLeft: 5, marginRight: 5, flexDirection: 'row' }}> <View style={{ marginLeft: 5, marginRight: 5, flexDirection: 'row' }}>
<TouchableOpacity style={{ justifyContent: 'center' }} onPress={() => this.handleAddDescription()}> <TouchableOpacity style={{ justifyContent: 'center' }} onPress={() => this.handleAddDescription()}>
<View style={styles.shadowEdit}> <View style={styles.shadowEdit}>
<Icon <Icon
name='ios-american-football' name='pencil'
type='ionicon' type='simple-line-icon'
color='#838383' color='#838383'
size={20} size={18}
/> />
</View> </View>
</TouchableOpacity> </TouchableOpacity>
<View style={styles.shadowAdd}> <View style={styles.shadowAdd}>
<TouchableOpacity style={{ alignSelf: 'center' }} onPress={() => this.props.handleMin()}> <TouchableOpacity style={{ alignSelf: 'center' }} onPress={() => this.props.handleMin()}>
<Icon <Icon
name='ios-american-football' name='minus'
type='ionicon' type='font-awesome'
color='#838383' color='#CFB368'
size={20} size={18}
/> />
</TouchableOpacity> </TouchableOpacity>
<TextInput <TextInput
style={{ padding: 2, textAlign: 'center', fontFamily: 'Gotham-Black', fontSize: 15, marginRight: 5, marginLeft: 5 }} style={{ padding: 2, textAlign: 'center', fontFamily: 'Gotham-Black', color: '#838383', fontSize: 14, marginRight: 5, marginLeft: 5 }}
keyboardType={'numeric'} keyboardType={'numeric'}
onChangeText={(qty) => this.handleChangeQuantity(item, qty)}>{item.qty}</TextInput> onChangeText={(qty) => this.handleChangeQuantity(item, qty)}>{item.qty}</TextInput>
<TouchableOpacity style={{ alignSelf: 'center' }} onPress={() => this.props.handleAdd()}> <TouchableOpacity style={{ alignSelf: 'center' }} onPress={() => this.props.handleAdd()}>
<Icon <Icon
name='ios-american-football' name='plus'
type='ionicon' type='font-awesome'
color='#838383' color='#CFB368'
size={20} size={18}
/> />
</TouchableOpacity> </TouchableOpacity>
</View> </View>
...@@ -175,7 +175,7 @@ const styles = StyleSheet.create({ ...@@ -175,7 +175,7 @@ const styles = StyleSheet.create({
marginRight: 5, marginRight: 5,
marginTop: 5, marginTop: 5,
flexDirection: 'row', flexDirection: 'row',
justifyContent:'center' justifyContent: 'center'
}, },
shadowMin: { shadowMin: {
height: 20, height: 20,
...@@ -192,7 +192,7 @@ const styles = StyleSheet.create({ ...@@ -192,7 +192,7 @@ const styles = StyleSheet.create({
marginLeft: 5, marginLeft: 5,
marginRight: 5, marginRight: 5,
marginTop: 5, marginTop: 5,
justifyContent:'center' justifyContent: 'center'
}, },
centerViewModal: { centerViewModal: {
flex: 1, flex: 1,
...@@ -210,6 +210,9 @@ const styles = StyleSheet.create({ ...@@ -210,6 +210,9 @@ const styles = StyleSheet.create({
textInput: { textInput: {
height: 40, height: 40,
width: 250, width: 250,
fontFamily: 'Gotham-Light',
fontSize: 14,
color: '#838383',
borderColor: 'gray', borderColor: 'gray',
borderWidth: 1, borderWidth: 1,
marginHorizontal: 30, marginHorizontal: 30,
...@@ -217,9 +220,9 @@ const styles = StyleSheet.create({ ...@@ -217,9 +220,9 @@ const styles = StyleSheet.create({
}, },
button: { button: {
backgroundColor: '#CFB368', backgroundColor: '#CFB368',
padding: 20, height: 40,
paddingHorizontal:20,
borderRadius: 10, borderRadius: 10,
paddingVertical: 5,
alignItems: 'center', alignItems: 'center',
justifyContent: 'center' justifyContent: 'center'
}, },
......
view/MenuSelection.js
View file @ c4854811
...@@ -326,17 +326,17 @@ class MenuSelection extends React.Component { ...@@ -326,17 +326,17 @@ class MenuSelection extends React.Component {
<View style={{ flex: 1, flexDirection: 'row' }}> <View style={{ flex: 1, flexDirection: 'row' }}>
<View style={{ flex: 1, justifyContent:'flex-start' }}> <View style={{ flex: 1, justifyContent:'flex-start' }}>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Black', textAlign: 'center', top: 10 }}> {this.props.order_quantity} Item {this.props.type_pickup == true ? (null) : ( <Text style={{ fontSize: 12, fontFamily: 'Gotham-Black', textAlign: 'center', top: 10, color:'#838383' }}>{this.props.order_quantity} Item {this.props.type_pickup == true ? (null) : (
<NumberFormat decimalScale={0} value={this.props.grabamount} renderText={value => <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', top: 20, textAlign: 'center' }}>Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} /> <NumberFormat decimalScale={0} value={this.props.grabamount} renderText={value => <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', top: 20, textAlign: 'center', color:'#838383' }}>/ Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} />
)} </Text> )} </Text>
<NumberFormat decimalScale={0} value={this.props.order_total} renderText={value => <Text style={{ fontSize: 20, fontFamily: 'Gotham-Light', top: 20, textAlign: 'center' }}>Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} /> <NumberFormat decimalScale={0} value={this.props.order_total} renderText={value => <Text style={{ fontSize: 20, fontFamily: 'Gotham-Light', top: 20, textAlign: 'center', color:'#838383' }}>Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} />
</View> </View>
<View style={{ flex: 1, height: 100 }}> <View style={{ flex: 1, height: 100 }}>
<TouchableOpacity onPress={() => this.props.navigation.navigate('Shopping Cart')}> <TouchableOpacity onPress={() => this.props.navigation.navigate('Shopping Cart')}>
<View> <View>
<View style={{ height: 40, borderRadius: 10, width: '65%', backgroundColor: '#CFB368', marginRight: 20, marginLeft: 40, top: 15, flexDirection: 'row', marginBottom: 30 }}> <View style={{ height: 40, borderRadius: 10, width: '68%', backgroundColor: '#CFB368', marginRight: 20, marginLeft: 40, top: 15, flexDirection: 'row', marginBottom: 30 }}>
<Image source={(require('../assets/icon/icon-order.png'))} style={{ height: 40, width: 40, tintColor: 'white', }}></Image> <Image source={(require('../assets/icon/icon-order.png'))} style={{ height: 40, width: 40, tintColor: 'white', }}></Image>
<Text style={{ fontFamily: 'Gotham-Light', color: 'white', fontSize: 15, alignSelf: 'center', textAlign: 'center' }}>View Cart</Text> <Text style={{ fontFamily: 'Gotham-Light', color: 'white', fontSize: 16, alignSelf: 'center', textAlign: 'center' }}>View Cart</Text>
</View> </View>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
......
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