Skip to content

C
clone_excelso
Commit 0d42aa0a 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 

# Conflicts:
#	view/Home.js
parents ecbc05a7 88e02761
Expand all Show whitespace changes
Inline Side-by-side
Showing with 210 additions and 119 deletions
view/Home.js
View file @ 0d42aa0a
...@@ -385,20 +385,17 @@ class Home extends React.Component { ...@@ -385,20 +385,17 @@ class Home extends React.Component {
) : ) :
this.state.account_number === "" ? ( this.state.account_number === "" ? (
<View style={styles.card}> <View style={styles.card}>
<Card style={{ padding: 10, margin: 10, alignContent: 'center' }}> <Card style={{ padding: 10, margin: 10, alignContent: 'center', backgroundColor: '#838383' }}>
<Text style={{ textAlign: "center", fontFamily: 'Gotham-Light' }}> {i18n.t('NotActivate')}</Text> <View style={{ flex: 1, backgroundColor: 'grey', height: 150, borderRadius: 20, marginRight: 10, marginLeft: 10, justifyContent: 'center' }}>
<Text> <View style={{ justifyContent: 'center' }}>
</Text> <TouchableOpacity onPress={() => this.props.navigation.navigate('Card Activation')}>
<Text style={{ textAlign: "center", fontSize: 40, color: '#c9af6d' }}> <View style={{ height: 50, borderRadius: 20, backgroundColor: 'white', marginRight: 20, marginLeft: 20, }}>
<Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 15 }}> {i18n.t('Acitvatecard')}</Text>
</Text> </View>
<View style={styles.line}></View> </TouchableOpacity>
<Text style={{ textAlign: 'left', fontWeight: 'bold' }}> {'\n'} </View>
</Text> </View>
<View style={styles.line}></View>
<Text style={{ textAlign: 'left', fontWeight: 'bold' }}>{'\n'}
</Text>
</Card> </Card>
</View> </View>
) : ) :
...@@ -672,7 +669,7 @@ const mapStateToProps = (state) => { ...@@ -672,7 +669,7 @@ const mapStateToProps = (state) => {
// login // login
in_payment: state.in_payment, in_payment: state.in_payment,
BASE_URL : state.BASE_URL, BASE_URL: state.BASE_URL,
email: state.email, email: state.email,
outlet_id: state.outlet_id, outlet_id: state.outlet_id,
name_outlet: state.name_outlet, name_outlet: state.name_outlet,
......
view/New_Register.js
View file @ 0d42aa0a
...@@ -59,19 +59,19 @@ class NewRegister extends React.Component { ...@@ -59,19 +59,19 @@ class NewRegister extends React.Component {
let date_list = [] let date_list = []
for (let i = 1; i <= 31; i++) { for (let i = 1; i <= 31; i++) {
date_list.push({label: String(i), value: i}); date_list.push({ label: String(i), value: i });
} }
let month_list = [] let month_list = []
for (let i = 1; i <= 12; i++) { for (let i = 1; i <= 12; i++) {
const month_name = month[i]; const month_name = month[i];
month_list.push({label: month_name, value: i}); month_list.push({ label: month_name, value: i });
} }
let year_list = [] let year_list = []
let current_year = new Date().getFullYear(); let current_year = new Date().getFullYear();
let start_year = current_year - 65; let start_year = current_year - 65;
let end_year = current_year - 13; let end_year = current_year - 13;
for (let i = start_year; i <= end_year; i++) { for (let i = start_year; i <= end_year; i++) {
year_list.push({label: String(i), value: i}); year_list.push({ label: String(i), value: i });
} }
this.setState({ this.setState({
date: date_list, date: date_list,
...@@ -91,7 +91,7 @@ class NewRegister extends React.Component { ...@@ -91,7 +91,7 @@ class NewRegister extends React.Component {
for (const key in list_gender) { for (const key in list_gender) {
if (list_gender.hasOwnProperty(key)) { if (list_gender.hasOwnProperty(key)) {
const row = list_gender[key]; const row = list_gender[key];
gender_list.push({label: row, value: key}) gender_list.push({ label: row, value: key })
} }
} }
this.setState({ this.setState({
...@@ -245,16 +245,18 @@ class NewRegister extends React.Component { ...@@ -245,16 +245,18 @@ class NewRegister extends React.Component {
this.props.navigation.navigate('Email Confirmation') this.props.navigation.navigate('Email Confirmation')
}).catch(error => { }).catch(error => {
this.setState({
spinner: false,
})
// console.log(JSON.stringify(error.response)); // console.log(JSON.stringify(error.response));
let response = error.response.data; let response = error.response.data;
Alert.alert( Alert.alert(
'', '',
response.msg, response.msg,
[ [
{ text: 'OK' } {
text: 'OK', onPress: () => this.setState({
spinner: false,
})
}
] ]
) )
}) })
...@@ -351,21 +353,21 @@ class NewRegister extends React.Component { ...@@ -351,21 +353,21 @@ class NewRegister extends React.Component {
<RNPickerSelect onValueChange={(value) => this.setState({ dob_day: value })} <RNPickerSelect onValueChange={(value) => this.setState({ dob_day: value })}
items={this.state.date} items={this.state.date}
placeholder={{ label: '-- Select --' }} placeholder={{ label: '-- Select --' }}
style={{inputIOSContainer: {paddingVertical: 10, alignItems: 'center'}}} style={{ inputIOSContainer: { paddingVertical: 10, alignItems: 'center' } }}
/> />
</View> </View>
<View style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}> <View style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}>
<RNPickerSelect onValueChange={(value) => this.setState({ dob_month: value })} <RNPickerSelect onValueChange={(value) => this.setState({ dob_month: value })}
items={this.state.month} items={this.state.month}
placeholder={{ label: '-- Select --' }} placeholder={{ label: '-- Select --' }}
style={{inputIOSContainer: {paddingVertical: 10, alignItems: 'center'}}} style={{ inputIOSContainer: { paddingVertical: 10, alignItems: 'center' } }}
/> />
</View> </View>
<View style={{ flex: 1, alignItems: 'center', justifyContent: 'center', marginRight: 10 }}> <View style={{ flex: 1, alignItems: 'center', justifyContent: 'center', marginRight: 10 }}>
<RNPickerSelect onValueChange={(value) => this.setState({ dob_year: value })} <RNPickerSelect onValueChange={(value) => this.setState({ dob_year: value })}
items={this.state.year} items={this.state.year}
placeholder={{ label: '-- Select --' }} placeholder={{ label: '-- Select --' }}
style={{inputIOSContainer: {paddingVertical: 10, alignItems: 'center'}}} style={{ inputIOSContainer: { paddingVertical: 10, alignItems: 'center' } }}
/> />
</View> </View>
</View> </View>
...@@ -425,7 +427,7 @@ class NewRegister extends React.Component { ...@@ -425,7 +427,7 @@ class NewRegister extends React.Component {
<RNPickerSelect onValueChange={(value) => this.setState({ gender: value })} <RNPickerSelect onValueChange={(value) => this.setState({ gender: value })}
items={this.state.gender_list} items={this.state.gender_list}
placeholder={{ label: '-- Select --' }} placeholder={{ label: '-- Select --' }}
style={{inputIOSContainer: {paddingVertical: 10, alignItems: 'center'}}} style={{ inputIOSContainer: { paddingVertical: 10, alignItems: 'center' } }}
/> />
</View> </View>
) : ( ) : (
...@@ -453,8 +455,8 @@ class NewRegister extends React.Component { ...@@ -453,8 +455,8 @@ class NewRegister extends React.Component {
<Text style={{ color: '#CFB368' }}>{i18n.t('login')}</Text> <Text style={{ color: '#CFB368' }}>{i18n.t('login')}</Text>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
<View style={{flex : 1}}> <View style={{ flex: 1 }}>
<Image source={require('../assets/images/file-register.png')} resizeMethod='resize' resizeMode='contain' style={{height:300, width:'100%'}}></Image> <Image source={require('../assets/images/file-register.png')} resizeMethod='resize' resizeMode='contain' style={{ height: 300, width: '100%' }}></Image>
</View> </View>
</View> </View>
</ScrollView> </ScrollView>
...@@ -519,7 +521,7 @@ const styles = StyleSheet.create({ ...@@ -519,7 +521,7 @@ const styles = StyleSheet.create({
fontSize: 26, fontSize: 26,
fontWeight: 'bold', fontWeight: 'bold',
color: 'white', color: 'white',
fontFamily : 'Gotham-Black' fontFamily: 'Gotham-Black'
}, },
textInput: { textInput: {
height: 40, height: 40,
......
view/TransactionHistory.js
View file @ 0d42aa0a
This diff is collapsed.
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