Skip to content

C
clone_excelso
Commit 9117ecfc 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

parents 1c10b5b7 b1f1b2f0
Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 24 deletions
view/Home.js
View file @ 9117ecfc
...@@ -183,6 +183,15 @@ class Home extends React.Component { ...@@ -183,6 +183,15 @@ class Home extends React.Component {
}) })
} }
_useBalance(){
if(this.props.in_payment){
this.props.navigation.navigate('Redeem Code')
} else {
this.props.navigation.navigate('UseBalance')
}
}
_pickup() { _pickup() {
this.props.navigation.navigate('Pickup Name', { from: 'home' }); this.props.navigation.navigate('Pickup Name', { from: 'home' });
} }
...@@ -206,7 +215,7 @@ class Home extends React.Component { ...@@ -206,7 +215,7 @@ class Home extends React.Component {
} }
render() { render() {
// console.log(this.state.images) // console.log(this.props.in_payment)
return ( return (
<View style={styles.container}> <View style={styles.container}>
<ScrollView> <ScrollView>
...@@ -385,7 +394,7 @@ class Home extends React.Component { ...@@ -385,7 +394,7 @@ class Home extends React.Component {
</TouchableOpacity> </TouchableOpacity>
<TouchableOpacity <TouchableOpacity
// style={styles.submitUpgradePemium} // style={styles.submitUpgradePemium}
activeOpacity={.5} onPress={() => this.props.navigation.navigate('UseBalance')}> activeOpacity={.5} onPress={() => this._useBalance()}>
<View style={styles.topUseBalance}> <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: 16 }}>USE BALANCE </Text>
</View> </View>
...@@ -534,6 +543,7 @@ const mapStateToProps = (state) => { ...@@ -534,6 +543,7 @@ const mapStateToProps = (state) => {
return { return {
// login // login
in_payment: state.in_payment,
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/RedeemCode.js
View file @ 9117ecfc
import React from 'react'; import React from 'react';
import { View, Text, TextInput, StyleSheet, Button, TouchableOpacity, Alert, } from 'react-native'; import { View, Text, TextInput, StyleSheet, Button, TouchableOpacity, Alert, BackHandler } from 'react-native';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import Axios from 'axios'; import Axios from 'axios';
import ActionType from '../redux/globalActionType';
class RedeemCode extends React.Component { class RedeemCode extends React.Component {
...@@ -12,6 +13,22 @@ class RedeemCode extends React.Component { ...@@ -12,6 +13,22 @@ class RedeemCode extends React.Component {
} }
} }
// componentDidMount() {
// BackHandler.addEventListener('hardwareBackPress', this.handleBackButtonClick);
// }
// // componentWillUnmount() {
// // BackHandler.removeEventListener('hardwareBackPress', this.handleBackButtonClick);
// // }
// handleBackButtonClick() {
// this.props.navigation.navigate('Home', { screen: 'HOME' });
// return true;
// }
cancel() { cancel() {
let params = { let params = {
session_id: this.props.session_id, session_id: this.props.session_id,
...@@ -19,6 +36,16 @@ class RedeemCode extends React.Component { ...@@ -19,6 +36,16 @@ class RedeemCode extends React.Component {
Axios.post('https://excelsocrm.ravintoladev.com/crm/v2/point/refund', params).then(res => { Axios.post('https://excelsocrm.ravintoladev.com/crm/v2/point/refund', params).then(res => {
console.log(res.data) console.log(res.data)
let redeemProps = {
in_payment: false,
redeem_code: '',
balance_redeem: '',
point_redeem: ''
}
this.props.setRedeem(redeemProps)
Alert.alert('', 'Berhasil dibatalkan') Alert.alert('', 'Berhasil dibatalkan')
this.props.navigation.navigate('Home', { screen: 'HOME' }); this.props.navigation.navigate('Home', { screen: 'HOME' });
}).catch(error => { }).catch(error => {
...@@ -42,7 +69,7 @@ class RedeemCode extends React.Component { ...@@ -42,7 +69,7 @@ class RedeemCode extends React.Component {
<Text style={{ textAlign: 'center', fontSize: 25 }}>Payment Code</Text> <Text style={{ textAlign: 'center', fontSize: 25 }}>Payment Code</Text>
</View> */} </View> */}
<View style={{ marginTop: 50 }}> <View style={{ marginTop: 50 }}>
<Text style={{ fontFamily: 'Gotham-Black', color: '#838383', fontSize: 26, textAlign: 'center' }}>{this.props.route.params.redeemCode}</Text> <Text style={{ fontFamily: 'Gotham-Black', color: '#838383', fontSize: 26, textAlign: 'center' }}>{this.props.redeem_code}</Text>
<View style={{ borderWidth: 1, marginRight: 20, marginLeft: 20, borderColor: '#838383' }}></View> <View style={{ borderWidth: 1, marginRight: 20, marginLeft: 20, borderColor: '#838383' }}></View>
</View> </View>
<View style={styles.body}> <View style={styles.body}>
...@@ -51,7 +78,7 @@ class RedeemCode extends React.Component { ...@@ -51,7 +78,7 @@ class RedeemCode extends React.Component {
<Text style={{ fontSize: 20, fontFamily: 'Gotham-Black', color: '#838383' }} >Balance</Text> <Text style={{ fontSize: 20, fontFamily: 'Gotham-Black', color: '#838383' }} >Balance</Text>
</View> </View>
<View style={{ flex: 1, margin: 10 }}> <View style={{ flex: 1, margin: 10 }}>
<Text style={{ fontSize: 20, fontFamily: 'Gotham-Black', color: '#838383' }}>{this.props.route.params.balanceUsed}</Text> <Text style={{ fontSize: 20, fontFamily: 'Gotham-Black', color: '#838383' }}>{this.props.balance_redeem}</Text>
</View> </View>
</View> </View>
<View style={styles.current_balance}> <View style={styles.current_balance}>
...@@ -59,7 +86,7 @@ class RedeemCode extends React.Component { ...@@ -59,7 +86,7 @@ class RedeemCode extends React.Component {
<Text style={{ fontSize: 20, fontFamily: 'Gotham-Black', color: '#838383' }} >Points</Text> <Text style={{ fontSize: 20, fontFamily: 'Gotham-Black', color: '#838383' }} >Points</Text>
</View> </View>
<View style={{ flex: 1, margin: 10 }}> <View style={{ flex: 1, margin: 10 }}>
<Text style={{ fontSize: 20, fontFamily: 'Gotham-Black', color: '#838383' }}>{this.props.route.params.pointUsed}</Text> <Text style={{ fontSize: 20, fontFamily: 'Gotham-Black', color: '#838383' }}>{this.props.point_redeem}</Text>
</View> </View>
</View> </View>
{/* <View style={styles.redeem}> {/* <View style={styles.redeem}>
...@@ -127,7 +154,24 @@ const styles = StyleSheet.create({ ...@@ -127,7 +154,24 @@ const styles = StyleSheet.create({
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
return { return {
session_id: state.session_id, session_id: state.session_id,
redeem_code: state.redeem_code,
balance_redeem: state.balance_redeem,
point_redeem: state.point_redeem
}
}
const mapDispatchToProps = (dispacth) => {
return {
setRedeem: (redeemProps) => dispacth({
type: ActionType.SET_REEDEM,
data: {
in_payment: redeemProps.in_payment,
redeem_code: redeemProps.redeem_code,
balance_redeem: redeemProps.balance_redeem,
point_redeem: redeemProps.point_redeem
}
}),
} }
} }
export default connect(mapStateToProps)(RedeemCode); export default connect(mapStateToProps, mapDispatchToProps)(RedeemCode);
\ No newline at end of file \ No newline at end of file
view/UseBalance.js
View file @ 9117ecfc
...@@ -123,17 +123,24 @@ class UseBalance extends React.Component { ...@@ -123,17 +123,24 @@ class UseBalance extends React.Component {
balance: this.state.input_redeem, balance: this.state.input_redeem,
point: 0 point: 0
} }
console.log(params) // console.log(params)
Axios.post('https://excelsocrm.ravintoladev.com/crm/v2/point/redeem', params).then(res => { Axios.post('https://excelsocrm.ravintoladev.com/crm/v2/point/redeem', params).then(res => {
// console.log(res.data) // console.log(res.data)
let respon = res.data let respon = res.data
Alert.alert('', 'Sukses Redeem') // Alert.alert('', 'Sukses Redeem')
this.props.navigation.navigate('Redeem Code', {
redeemCode: respon.redeem_code, let redeemProps = {
balanceUsed: respon.use_balance, in_payment: true,
pointUsed: respon.use_point redeem_code: respon.redeem_code,
}) balance_redeem: respon.use_balance,
point_redeem: respon.use_point
}
this.props.setRedeem(redeemProps)
this.props.navigation.navigate('Redeem Code')
}).catch(error => { }).catch(error => {
let response = error.response.data let response = error.response.data
if (response.code === "EMPTY_PIN") { if (response.code === "EMPTY_PIN") {
...@@ -158,13 +165,20 @@ class UseBalance extends React.Component { ...@@ -158,13 +165,20 @@ class UseBalance extends React.Component {
console.log(params) console.log(params)
Axios.post('https://excelsocrm.ravintoladev.com/crm/v2/point/redeem', params).then(res => { Axios.post('https://excelsocrm.ravintoladev.com/crm/v2/point/redeem', params).then(res => {
// console.log(res.data)
let respon = res.data let respon = res.data
Alert.alert('', 'Sukses Redeem') // Alert.alert('', 'Sukses Redeem')
this.props.navigation.navigate('Redeem Code', { let redeemProps = {
redeemCode: respon.redeem_code, in_payment: true,
balanceUsed: respon.use_balance, redeem_code: respon.redeem_code,
pointUsed: respon.use_point balance_redeem: respon.use_balance,
}) point_redeem: respon.use_point
}
this.props.setRedeem(redeemProps)
this.props.navigation.navigate('Redeem Code')
}).catch(error => { }).catch(error => {
let response = error.response.data let response = error.response.data
if (response.code === "EMPTY_PIN") { if (response.code === "EMPTY_PIN") {
...@@ -517,13 +531,13 @@ const mapDispatchToProps = (dispacth) => { ...@@ -517,13 +531,13 @@ const mapDispatchToProps = (dispacth) => {
setRedeem: (redeemProps) => dispacth({ setRedeem: (redeemProps) => dispacth({
type: ActionType.SET_REEDEM, type: ActionType.SET_REEDEM,
data: { data: {
in_payment: redeemProps.in_payment, in_payment: redeemProps.in_payment,
redeem_code:redeemPropsa.redeem_code, redeem_code: redeemProps.redeem_code,
balance_redeem: redeemProps.balance_redeem, balance_redeem: redeemProps.balance_redeem,
point_redeem: redeemProps.point_redeem point_redeem: redeemProps.point_redeem
} }
}), }),
} }
} }
export default connect(mapStateToProps,mapDispatchToProps)(UseBalance); export default connect(mapStateToProps, mapDispatchToProps)(UseBalance);
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