Skip to content

C
clone_excelso
Commit 3f11d92e authored by Trisno's avatar Trisno
Browse files
Options

benerin design 'you rated' dan top up balance

parent 835a7a79
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 31 deletions
view/Home.js
View file @ 3f11d92e
......@@ -113,8 +113,8 @@ class Home extends React.Component {
images: imageLink,
slugs: slugs
})
}).catch(error =>{
}).catch(error => {
const { navigation } = this.props
let response = error.response.data
session(response, navigation)
......@@ -174,17 +174,17 @@ class Home extends React.Component {
indicator: false
})
}).catch(error => {
const { navigation } = this.props
let response_data = error.response.data
let error_status = error.response.status
session(response_data,error_status,navigation)
session(response_data, error_status, navigation)
})
}
_useBalance(){
if(this.props.in_payment){
_useBalance() {
if (this.props.in_payment) {
this.props.navigation.navigate('Redeem Code')
} else {
this.props.navigation.navigate('UseBalance')
......@@ -264,7 +264,7 @@ class Home extends React.Component {
width: '100%',
}}
imageLoadingColor='#c7c7c7'
onCurrentImagePressed={(index) => this.props.navigation.navigate('News Detail', {slug: this.state.slugs[index]})}
onCurrentImagePressed={(index) => this.props.navigation.navigate('News Detail', { slug: this.state.slugs[index] })}
/>
</View>
<View style={styles.content}>
......@@ -287,13 +287,13 @@ class Home extends React.Component {
{/* <Text style={{ textAlign: 'center', fontSize: 12, }}>
{i18n.t('orderInfo')}
</Text> */}
<Text style={{ textAlign: 'center', fontSize: 12, fontFamily: 'Gotham-Black', color:'#838383' }}>
<Text style={{ textAlign: 'center', fontSize: 12, fontFamily: 'Gotham-Black', color: '#838383' }}>
YOU WILL PICKUP YOUR ORDER AT
</Text>
{this.state.indicator == true ? (
<ActivityIndicator size="small" color="#c9af6d" />
) : (
<Text style={{ textAlign: "center", fontSize: 12, top: 5, fontFamily: 'Gotham-Light', color:'#838383' }}>
<Text style={{ textAlign: "center", fontSize: 12, top: 5, fontFamily: 'Gotham-Light', color: '#838383' }}>
Excelso {this.props.name_outlet}
</Text>
)}
......@@ -335,7 +335,7 @@ class Home extends React.Component {
{/* <Text>
YOUR CARD NUMBER | {this.state.expire_date}
</Text> */}
<View style={{ flexDirection: 'row', flex: 1, paddingBottom:5 }}>
<View style={{ flexDirection: 'row', flex: 1, paddingBottom: 5 }}>
<View style={{ flex: 0.5 }}>
<Text style={{ fontSize: 10, fontFamily: 'Gotham-Light' }}>YOUR CARD NUMBER</Text>
</View>
......@@ -360,8 +360,8 @@ class Home extends React.Component {
{/* <Text>{i18n.t('balance')}</Text> */}
<Text style={{ fontSize: 14, fontFamily: 'Gotham-Light' }}>BALANCE</Text>
</View>
<View style={{ flex: 0.7, alignItems:'center'}}>
<Text style={{ fontSize: 14, fontFamily: 'Gotham-Black', color:'gray' }}>IDR {this.state.balance}</Text>
<View style={{ flex: 0.7, alignItems: 'center' }}>
<Text style={{ fontSize: 14, fontFamily: 'Gotham-Black', color: 'gray' }}>IDR {this.state.balance}</Text>
</View>
</View>
......@@ -375,13 +375,13 @@ class Home extends React.Component {
{/* <Text>{i18n.t('balance')}</Text> */}
<Text style={{ fontSize: 14, fontFamily: 'Gotham-Light' }}>POINTS</Text>
</View>
<View style={{ flex: 0.7,alignItems:'center' }}>
<Text style={{ fontSize: 14, fontFamily: 'Gotham-Black', color:'gray' }}>IDR {this.state.point}</Text>
<View style={{ flex: 0.7, alignItems: 'center' }}>
<Text style={{ fontSize: 14, fontFamily: 'Gotham-Black', color: 'gray' }}>IDR {this.state.point}</Text>
</View>
</View>
</Card>
</View>
)
}
<View style={{ flexDirection: 'row', flex: 1 }}>
......@@ -389,14 +389,14 @@ class Home extends React.Component {
// style={styles.submitUpgradePemium}
activeOpacity={.5} onPress={() => this.props.navigation.navigate('TopUpInfo')}>
<View style={styles.topUseBalance}>
<Text style={{ textAlign: 'center', color: 'white', fontFamily: 'Gotham-Black', fontSize: 16 }}>TOP BALANCE </Text>
<Text style={{ textAlign: 'center', color: 'white', fontFamily: 'Gotham-Black', fontSize: 14 }}>TOP UP BALANCE </Text>
</View>
</TouchableOpacity>
<TouchableOpacity
<TouchableOpacity
// style={styles.submitUpgradePemium}
activeOpacity={.5} onPress={() => this._useBalance()}>
<View style={styles.topUseBalance}>
<Text style={{ textAlign: 'center', color: 'white', fontFamily: 'Gotham-Black', fontSize: 16 }}>USE BALANCE </Text>
<Text style={{ textAlign: 'center', color: 'white', fontFamily: 'Gotham-Black', fontSize: 14 }}>USE BALANCE </Text>
</View>
</TouchableOpacity>
</View>
......@@ -439,8 +439,8 @@ const styles = StyleSheet.create({
alignItems: 'center'
},
buttonDelivery: {
justifyContent:'center',
height:40,
justifyContent: 'center',
height: 40,
marginTop: 10,
paddingTop: 15,
paddingBottom: 15,
......@@ -454,7 +454,7 @@ const styles = StyleSheet.create({
top: -20,
},
buttonPickup: {
justifyContent:'center',
justifyContent: 'center',
height: 40,
marginTop: 10,
paddingTop: 15,
......@@ -470,9 +470,9 @@ const styles = StyleSheet.create({
},
submitOrder: {
height:40,
height: 40,
margin: 10,
paddingTop:10,
paddingTop: 10,
backgroundColor: '#CFB368',
borderRadius: 10,
borderWidth: 0,
......@@ -481,15 +481,15 @@ const styles = StyleSheet.create({
topUseBalance: {
flex: 0.5,
height:40,
backgroundColor: 'green',
height: 40,
top: 20,
margin:5,
margin: 5,
padding: 10,
paddingHorizontal: 15,
paddingBottom : 10,
paddingHorizontal: 16,
borderRadius: 10,
backgroundColor: '#CFB368',
paddingBottom: -5
// paddingBottom: -5
},
line: {
......
view/OrderDetail.js
View file @ 3f11d92e
......@@ -245,7 +245,7 @@ class OrderDetail extends React.Component {
</View>
<View style={{ flex: 0.4, alignItems: 'baseline', justifyContent: 'center', alignItems: 'flex-start', paddingLeft: 10 }}>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: 'grey' }}>{item.item_name} </Text>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: 'grey',top:10 }}>{item.item_note} </Text>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: 'grey',top:10 }}>Keterangan : {item.item_note} </Text>
</View>
<View style={{ flex: 0.3, alignItems: 'flex-end', justifyContent: 'center', paddingRight: 10 }}>
{/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light' }}>{item.item_quantity * item.item_price} </Text> */}
......@@ -375,7 +375,7 @@ class OrderDetail extends React.Component {
this.state.is_reviewed ? (
<View style={{ height: 70, borderWidth: 1, borderRadius: 10, justifyContent: 'center', margin: 30, borderColor: '#CFB368' }}>
<Text style={{ fontFamily: 'Gotham-Light', color: '#838383', fontSize: 16, textAlign: 'center', paddingHorizontal: 5 }}> You Rated ({this.state.review_rating}) </Text>
<Text style={{ fontFamily: 'Gotham-Light', color: '#838383', fontSize: 16, textAlign: 'center', paddingHorizontal: 5 }}> You Rated </Text>
<Rating imageSize={20} style={{ top: 5 }} readonly startingValue={this.state.review_rating} ratingBackgroundColor='#CFB368' />
</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