Skip to content

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

add

parent 54402b9e
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 17 deletions
app.json
View file @ bf45214c
{ {
"expo": { "expo": {
"name": "Excelso_update 17.00 / 22.05.2020", "name": "Excelso_update 13.00 / 27.05.2020",
"slug": "excelso-pro", "slug": "excelso-pro",
"privacy": "public", "privacy": "public",
"sdkVersion": "36.0.0", "sdkVersion": "36.0.0",
......
view/Account.js
View file @ bf45214c
...@@ -249,10 +249,10 @@ class Account extends React.Component { ...@@ -249,10 +249,10 @@ class Account extends React.Component {
<View style={{ flexDirection: 'row', flex: 1 }}> <View style={{ flexDirection: 'row', flex: 1 }}>
<View style={{ flex: 0.2, justifyContent: 'center' }}> <View style={{ flex: 0.2, justifyContent: 'center' }}>
{/* <Text>{i18n.t('balance')}</Text> */} {/* <Text>{i18n.t('balance')}</Text> */}
<Text style={{ fontSize: 10, fontFamily: 'Gotham-Light' }}>BALANCE</Text> <Text style={{ fontSize: 14, fontFamily: 'Gotham-Light' }}>BALANCE</Text>
</View> </View>
<View style={{ flex: 0.8, alignItems: 'center' }}> <View style={{ flex: 0.8, alignItems: 'center' }}>
<Text style={{ fontSize: 20, fontFamily: 'Gotham-Black', color: 'gray' }}>IDR {this.state.balance}</Text> <Text style={{ fontSize: 12, fontFamily: 'Gotham-Black', color: 'gray' }}>IDR {this.state.balance}</Text>
</View> </View>
</View> </View>
...@@ -260,10 +260,10 @@ class Account extends React.Component { ...@@ -260,10 +260,10 @@ class Account extends React.Component {
<View style={{ flexDirection: 'row', flex: 1 }}> <View style={{ flexDirection: 'row', flex: 1 }}>
<View style={{ flex: 0.2, justifyContent: 'center' }}> <View style={{ flex: 0.2, justifyContent: 'center' }}>
{/* <Text>{i18n.t('balance')}</Text> */} {/* <Text>{i18n.t('balance')}</Text> */}
<Text style={{ fontSize: 10, fontFamily: 'Gotham-Light' }}>POINTS</Text> <Text style={{ fontSize: 14, fontFamily: 'Gotham-Light' }}>POINTS</Text>
</View> </View>
<View style={{ flex: 0.8, alignItems: 'center' }}> <View style={{ flex: 0.8, alignItems: 'center' }}>
<Text style={{ fontSize: 20, fontFamily: 'Gotham-Black', color: 'gray' }}>IDR {this.state.points}</Text> <Text style={{ fontSize: 12, fontFamily: 'Gotham-Black', color: 'gray' }}>IDR {this.state.points}</Text>
</View> </View>
</View> </View>
</Card> </Card>
......
view/Home.js
View file @ bf45214c
...@@ -429,6 +429,8 @@ const styles = StyleSheet.create({ ...@@ -429,6 +429,8 @@ const styles = StyleSheet.create({
alignItems: 'center' alignItems: 'center'
}, },
buttonDelivery: { buttonDelivery: {
justifyContent:'center',
height:40,
marginTop: 10, marginTop: 10,
paddingTop: 15, paddingTop: 15,
paddingBottom: 15, paddingBottom: 15,
...@@ -442,7 +444,8 @@ const styles = StyleSheet.create({ ...@@ -442,7 +444,8 @@ const styles = StyleSheet.create({
top: -20, top: -20,
}, },
buttonPickup: { buttonPickup: {
height: 50, justifyContent:'center',
height: 40,
marginTop: 10, marginTop: 10,
paddingTop: 15, paddingTop: 15,
paddingBottom: 15, paddingBottom: 15,
......
view/Item.js
View file @ bf45214c
...@@ -3,6 +3,7 @@ import { View, Text, StyleSheet, ScrollView, TouchableOpacity, Image, TextInput, ...@@ -3,6 +3,7 @@ import { View, Text, StyleSheet, ScrollView, TouchableOpacity, Image, TextInput,
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import ActionType from '../redux/globalActionType'; import ActionType from '../redux/globalActionType';
import NumberFormat from 'react-number-format'; import NumberFormat from 'react-number-format';
import { Icon } from 'react-native-elements'
class Item extends React.Component { class Item extends React.Component {
...@@ -98,21 +99,36 @@ class Item extends React.Component { ...@@ -98,21 +99,36 @@ class Item extends React.Component {
<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: 12, margin: 5, marginRight: 10, fontFamily: 'Gotham-Black', 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 onPress={() => this.handleAddDescription()}> <TouchableOpacity style={{ justifyContent: 'center' }} onPress={() => this.handleAddDescription()}>
<View style={styles.shadowEdit}> <View style={styles.shadowEdit}>
<Image source={(require('../assets/icon/icon-pencil.png'))} style={{ height: 25, width: 25, marginLeft: 5, marginRight: 5 }}></Image> <Icon
name='ios-american-football'
type='ionicon'
color='#838383'
size={20}
/>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
<View style={styles.shadowAdd}> <View style={styles.shadowAdd}>
<TouchableOpacity onPress={() => this.props.handleMin()}> <TouchableOpacity style={{ alignSelf: 'center' }} onPress={() => this.props.handleMin()}>
<Text style={{ fontSize: 25, alignSelf: 'center' }}> - </Text> <Icon
name='ios-american-football'
type='ionicon'
color='#838383'
size={20}
/>
</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', fontSize: 15, 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()}>
<Text style={{ fontSize: 25, alignSelf: 'center' }}> + </Text> <Icon
name='ios-american-football'
type='ionicon'
color='#838383'
size={20}
/>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
</View> </View>
...@@ -137,10 +153,11 @@ const styles = StyleSheet.create({ ...@@ -137,10 +153,11 @@ const styles = StyleSheet.create({
shadowOffset: { width: 0, height: 2 }, shadowOffset: { width: 0, height: 2 },
shadowOpacity: 0.8, shadowOpacity: 0.8,
shadowRadius: 2, shadowRadius: 2,
elevation: 1, elevation: 0.5,
marginLeft: 5, marginLeft: 5,
marginRight: 5, marginRight: 5,
marginTop: 5, marginTop: 5,
justifyContent: 'center'
}, },
shadowAdd: { shadowAdd: {
height: 30, height: 30,
...@@ -157,7 +174,8 @@ const styles = StyleSheet.create({ ...@@ -157,7 +174,8 @@ const styles = StyleSheet.create({
marginLeft: 5, marginLeft: 5,
marginRight: 5, marginRight: 5,
marginTop: 5, marginTop: 5,
flexDirection: 'row' flexDirection: 'row',
justifyContent:'center'
}, },
shadowMin: { shadowMin: {
height: 20, height: 20,
...@@ -174,6 +192,7 @@ const styles = StyleSheet.create({ ...@@ -174,6 +192,7 @@ const styles = StyleSheet.create({
marginLeft: 5, marginLeft: 5,
marginRight: 5, marginRight: 5,
marginTop: 5, marginTop: 5,
justifyContent:'center'
}, },
centerViewModal: { centerViewModal: {
flex: 1, flex: 1,
......
view/MenuSelection.js
View file @ bf45214c
...@@ -301,7 +301,7 @@ class MenuSelection extends React.Component { ...@@ -301,7 +301,7 @@ class MenuSelection extends React.Component {
/> />
</View> </View>
<View style={{ height: 1, backgroundColor: 'grey', marginRight: 10, marginLeft: 10, marginTop: 5, }}></View> <View style={{ height: 1, backgroundColor: 'grey', marginRight: 10, marginLeft: 10, marginTop: 5, }}></View>
<View style={{ flex: 3 }}> <View style={{ flex: 3,marginRight:10,marginLeft:10 }}>
{this.state.indicator == true ? ( {this.state.indicator == true ? (
<ActivityIndicator style={{ top: 10 }} size="large" color="#c9af6d" /> <ActivityIndicator style={{ top: 10 }} size="large" color="#c9af6d" />
) : ( ) : (
...@@ -325,9 +325,9 @@ class MenuSelection extends React.Component { ...@@ -325,9 +325,9 @@ class MenuSelection extends React.Component {
<View style={{ height: 70 }}> <View style={{ height: 70 }}>
<View style={{ flex: 1, flexDirection: 'row' }}> <View style={{ flex: 1, flexDirection: 'row' }}>
<View style={{ flex: 1 }}> <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 }}> {this.props.order_quantity} Item {this.props.type_pickup == true ? (null) : (
<Text style={{ fontSize: 12 }}> Ongkir {this.props.grabamount} </Text> <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={''} />
)} </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' }}>Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} />
</View> </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