Skip to content

N
new_excelso
Commit 7e5dc705 authored by Fred's avatar Fred
Browse files
Options

Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek 

# Conflicts:
#	view/Renewal.js
parents 382a49fe dd81db28
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 46 deletions
lib/en.json
View file @ 7e5dc705
...@@ -15,6 +15,12 @@ ...@@ -15,6 +15,12 @@
"logout":"LOGOUT", "logout":"LOGOUT",
"email":"Email", "email":"Email",
"phone":"Phone", "phone":"Phone",
"amount":"Amount",
"currentbalance":"Current Balance",
"renewalfees":"Renewal of fees",
"renewuntil":"Renew Until",
"renew":"RENEW",
"message":"Message",
"changepassword":"CHANGE PASSWORD", "changepassword":"CHANGE PASSWORD",
"save":"Save", "save":"Save",
"currentpassword":"Current Password", "currentpassword":"Current Password",
...@@ -30,7 +36,13 @@ ...@@ -30,7 +36,13 @@
"titlerewardhistory":"REWARDS E-VOUCHER", "titlerewardhistory":"REWARDS E-VOUCHER",
"orderhistory":"ORDER HISTORY", "orderhistory":"ORDER HISTORY",
"allcity":"All city", "allcity":"All city",
"emptyvoucherlist":"No E-Voucher Available",
"emptyvoucherhistory":"No E-Voucher Available",
"name":"Name", "name":"Name",
"open":"OPEN",
"closed":"CLOSED",
"openinghours":"Opening Hours",
"searchpickups":"Search the pickup store location",
"submit":"SUBMIT", "submit":"SUBMIT",
"cancel":"CANCEL", "cancel":"CANCEL",
"resendemail":"RENSEND EMAIL TOKEN", "resendemail":"RENSEND EMAIL TOKEN",
...@@ -46,7 +58,8 @@ ...@@ -46,7 +58,8 @@
"promotion":"TODAY PROMOTION", "promotion":"TODAY PROMOTION",
"expired": "Expired At", "expired": "Expired At",
"balance" : "BALANCE", "balance" : "BALANCE",
"point" : "POINTS :", "redeem":"REDEEM",
"point" : "POINTS",
"profile" : "Profile", "profile" : "Profile",
"Viewcart":"View Cart", "Viewcart":"View Cart",
"Viewprofil" :"View Profile", "Viewprofil" :"View Profile",
...@@ -56,9 +69,14 @@ ...@@ -56,9 +69,14 @@
"selectaddress":"SELECT", "selectaddress":"SELECT",
"detail":"Details", "detail":"Details",
"Transferbalance":"TRANSFER BALANCE", "Transferbalance":"TRANSFER BALANCE",
"Transactionhistory":"TRANSFER HISTORY", "Transactionhistory":"TRANSACTION HISTORY",
"Renewal":"RENEWAL", "Renewal":"RENEWAL",
"Usebalancepoint":"USE BALANCE / POINTS", "Usebalancepoint":"USE BALANCE / POINTS",
"Acitvatecard":"ACTIVATE CARD", "Acitvatecard":"ACTIVATE CARD",
"upgradePremium" :"UPGRADE PREMIUM" "upgradePremium" :"UPGRADE PREMIUM",
"alertpoin":"Sorry, your points are not enough",
"alertselectpayment":"Please choose a payment method",
"alertbalance":"Sorry, your balance are not enough",
"alertbalancepoin":"Sorry, your balance and points are not enough"
} }
\ No newline at end of file
lib/id.json
View file @ 7e5dc705
...@@ -10,6 +10,18 @@ ...@@ -10,6 +10,18 @@
"logout":"KELUAR", "logout":"KELUAR",
"email":"Email", "email":"Email",
"phone":"Telephone", "phone":"Telephone",
"amount":"Jumlah",
"currentbalance":"Saldo saat ini",
"renewalfees":"Biaya Perpanjang",
"renewuntil":"Perpanjang Hingga",
"emptyvoucherlist":"Tidak Ada E-Voucher Tersedia",
"emptyvoucherhistory":"Tidak Ada E-Voucher Tersedia",
"open":"BUKA",
"closed":"TUTUP",
"searchpickups":"Cari lokasi pickup store",
"openinghours":"Buka Pada Jam",
"renew":"PERPANJANG",
"message":"Pesan",
"other":"Lain", "other":"Lain",
"male":"Pria", "male":"Pria",
"female":"Wanita", "female":"Wanita",
...@@ -50,17 +62,22 @@ ...@@ -50,17 +62,22 @@
"topup":" PENGISIAN SALDO ", "topup":" PENGISIAN SALDO ",
"usebalance": "GUNAKAN SALDO", "usebalance": "GUNAKAN SALDO",
"balance" :"SALDO", "balance" :"SALDO",
"point" : "POINT", "redeem":"REDEEM",
"point" : "POIN",
"profile" :"Profil", "profile" :"Profil",
"upgradePremium" :"TINGKATKAN PREMIUM", "upgradePremium" :"TINGKATKAN PREMIUM",
"cardActivation" :"Aktivasi Kartu", "cardActivation" :"Aktivasi Kartu",
"Viewcart":"Keranjang", "Viewcart":"Keranjang",
"Viewprofil" :"Lihat Profil", "Viewprofil" :"Lihat Profil",
"Transferbalance":"TRANSFER SALDO", "Transferbalance":"TRANSFER SALDO",
"Transactionhistory":"RIWAYAT TRANSFER", "Transactionhistory":"RIWAYAT TRANSAKSI",
"Renewal":"RENEWAL", "Renewal":"RENEWAL",
"Usebalancepoint":"GUNAKAN SALDO / POINT", "Usebalancepoint":"GUNAKAN SALDO / POINT",
"Acitvatecard":"AKTIVASI KARTU" "Acitvatecard":"AKTIVASI KARTU",
"alertpoin":"Maaf Point tidak cukup",
"alertselectpayment":"Silahkan pilih metode pembayaran",
"alertbalance":"Maaf Saldo tidak cukup",
"alertbalancepoin":"Maaf Saldo dan poin tidak cukup"
} }
......
view/Home.js
View file @ 7e5dc705
...@@ -372,9 +372,6 @@ class Home extends React.Component { ...@@ -372,9 +372,6 @@ class Home extends React.Component {
} }
{ {
this.state.indicatorProfileCard == true ? ( this.state.indicatorProfileCard == true ? (
<View style={styles.card}> <View style={styles.card}>
...@@ -432,7 +429,7 @@ class Home extends React.Component { ...@@ -432,7 +429,7 @@ class Home extends React.Component {
<View style={{ flexDirection: 'row', flex: 1 }}> <View style={{ flexDirection: 'row', flex: 1 }}>
<View style={{ flex: 0.3, justifyContent: 'center' }}> <View style={{ flex: 0.3, justifyContent: 'center' }}>
{/* <Text>{i18n.t('balance')}</Text> */} {/* <Text>{i18n.t('balance')}</Text> */}
<Text style={{ fontSize: 14, fontFamily: 'Gotham-Light' }}>{i18n.t('balance')}</Text> <Text style={{ fontSize: 14, fontFamily: 'Gotham-Light' }}>{i18n.t('balance')} : </Text>
</View> </View>
<View style={{ flex: 0.7, alignItems: 'center' }}> <View style={{ flex: 0.7, alignItems: 'center' }}>
<Text style={{ fontSize: 14, fontFamily: 'Gotham-Black', color: 'gray' }}>IDR {this.state.balance}</Text> <Text style={{ fontSize: 14, fontFamily: 'Gotham-Black', color: 'gray' }}>IDR {this.state.balance}</Text>
...@@ -447,7 +444,7 @@ class Home extends React.Component { ...@@ -447,7 +444,7 @@ class Home extends React.Component {
<View style={{ flexDirection: 'row', flex: 1 }}> <View style={{ flexDirection: 'row', flex: 1 }}>
<View style={{ flex: 0.3, justifyContent: 'center' }}> <View style={{ flex: 0.3, justifyContent: 'center' }}>
{/* <Text>{i18n.t('balance')}</Text> */} {/* <Text>{i18n.t('balance')}</Text> */}
<Text style={{ fontSize: 14, fontFamily: 'Gotham-Light' }}>{i18n.t('point')}</Text> <Text style={{ fontSize: 14, fontFamily: 'Gotham-Light' }}>{i18n.t('point')} : </Text>
</View> </View>
<View style={{ flex: 0.7, alignItems: 'center' }}> <View style={{ flex: 0.7, alignItems: 'center' }}>
<Text style={{ fontSize: 14, fontFamily: 'Gotham-Black', color: 'gray' }}>IDR {this.state.point}</Text> <Text style={{ fontSize: 14, fontFamily: 'Gotham-Black', color: 'gray' }}>IDR {this.state.point}</Text>
......
view/PickupName.js
View file @ 7e5dc705
...@@ -12,6 +12,7 @@ import { connect } from 'react-redux'; ...@@ -12,6 +12,7 @@ import { connect } from 'react-redux';
import * as Permissions from 'expo-permissions'; import * as Permissions from 'expo-permissions';
import * as Device from 'expo-device'; import * as Device from 'expo-device';
import MyStatusBar from './MyStatusBar'; import MyStatusBar from './MyStatusBar';
import i18n from 'i18n-js';
class PickupName extends React.Component { class PickupName extends React.Component {
constructor(props) { constructor(props) {
...@@ -215,11 +216,11 @@ class PickupName extends React.Component { ...@@ -215,11 +216,11 @@ class PickupName extends React.Component {
<View style={{ margin: 5 }}> <View style={{ margin: 5 }}>
<Text style={{ fontFamily: 'Gotham-Black', color: 'grey', fontSize: 20 }}>{item.name}</Text> <Text style={{ fontFamily: 'Gotham-Black', color: 'grey', fontSize: 20 }}>{item.name}</Text>
<View style={{ flexDirection: 'row' }}> <View style={{ flexDirection: 'row' }}>
{item.can_accept_order == true ? (<Text style={{ fontFamily: 'Gotham-Black', color: "#ccb46c", top: 5 }}>OPEN </Text>) {item.can_accept_order == true ? (<Text style={{ fontFamily: 'Gotham-Black', color: "#ccb46c", top: 5 }}>{i18n.t('open')} </Text>)
: (<Text style={{ fontFamily: 'Gotham-Black', color: "#ccb46c" }}>CLOSED </Text>)} : (<Text style={{ fontFamily: 'Gotham-Black', color: "#ccb46c" }}>{i18n.t('closed')} </Text>)}
</View> </View>
</View> </View>
<Text style={{ fontFamily: 'Gotham-Light', color: '#CFB368' }}> Opening Hours : {item.open_time} - {item.close_time}</Text> <Text style={{ fontFamily: 'Gotham-Light', color: '#CFB368' }}>{i18n.t('openinghours')} : {item.open_time} - {item.close_time}</Text>
<Text style={{ margin: 5, color: '#b1b1b2', fontFamily: 'Gotham-Light' }}> <Text style={{ margin: 5, color: '#b1b1b2', fontFamily: 'Gotham-Light' }}>
{item.full_address} {item.full_address}
</Text> </Text>
...@@ -249,11 +250,11 @@ class PickupName extends React.Component { ...@@ -249,11 +250,11 @@ class PickupName extends React.Component {
<View style={{ margin: 5 }}> <View style={{ margin: 5 }}>
<Text style={{ fontFamily: 'Gotham-Black', color: 'grey', fontSize: 20 }}>{item.name}</Text> <Text style={{ fontFamily: 'Gotham-Black', color: 'grey', fontSize: 20 }}>{item.name}</Text>
<View style={{ flexDirection: 'row' }}> <View style={{ flexDirection: 'row' }}>
{item.can_accept_order == true ? (<Text style={{ fontFamily: 'Gotham-Black', color: "#ccb46c", top: 5 }}>OPEN </Text>) {item.can_accept_order == true ? (<Text style={{ fontFamily: 'Gotham-Black', color: "#ccb46c", top: 5 }}>{i18n.t('open')} </Text>)
: (<Text style={{ fontFamily: 'Gotham-Black', color: "#ccb46c" }}>CLOSED </Text>)} : (<Text style={{ fontFamily: 'Gotham-Black', color: "#ccb46c" }}>{i18n.t('closed')} </Text>)}
</View> </View>
</View> </View>
<Text style={{ fontFamily: 'Gotham-Light', color: '#CFB368' }}> Opening Hours : {item.open_time} - {item.close_time}</Text> <Text style={{ fontFamily: 'Gotham-Light', color: '#CFB368' }}> {i18n.t('openinghours')} : {item.open_time} - {item.close_time}</Text>
<Text style={{ margin: 5, color: '#b1b1b2', fontFamily: 'Gotham-Light' }}> <Text style={{ margin: 5, color: '#b1b1b2', fontFamily: 'Gotham-Light' }}>
{item.full_address} {item.full_address}
</Text> </Text>
...@@ -299,7 +300,7 @@ class PickupName extends React.Component { ...@@ -299,7 +300,7 @@ class PickupName extends React.Component {
<MaterialCommunityIcons name="map-marker" size={32} color="#ccb46c" /> <MaterialCommunityIcons name="map-marker" size={32} color="#ccb46c" />
</View> </View>
<View style={{ flex: 6 }}> <View style={{ flex: 6 }}>
<TextInput style={{ height: 45 }} placeholder="Cari lokasi Pickup Store" <TextInput style={{ height: 45 }} placeholder={i18n.t('searchpickups')}
onChangeText={text => this.filterData(text)} onChangeText={text => this.filterData(text)}
onClear={text => this.filterData('')} onClear={text => this.filterData('')}
value={this.state.search}></TextInput> value={this.state.search}></TextInput>
...@@ -396,7 +397,8 @@ const mapStateToProps = (state) => { ...@@ -396,7 +397,8 @@ const mapStateToProps = (state) => {
session_id: state.session_id, session_id: state.session_id,
outlet_id: state.outlet_id, outlet_id: state.outlet_id,
name_outlet: state.name_outlet, name_outlet: state.name_outlet,
outlet_detailadress: state.outlet_detailadress outlet_detailadress: state.outlet_detailadress,
language: state.language
} }
} }
......
view/Renewal.js
View file @ 7e5dc705
...@@ -3,6 +3,7 @@ import { View, Text, StyleSheet, Button, Alert, TouchableOpacity } from 'react-n ...@@ -3,6 +3,7 @@ import { View, Text, StyleSheet, Button, Alert, TouchableOpacity } from 'react-n
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import Axios from 'axios'; import Axios from 'axios';
import MyStatusBar from './MyStatusBar'; import MyStatusBar from './MyStatusBar';
import i18n from 'i18n-js';
class Renewal extends React.Component { class Renewal extends React.Component {
constructor(props) { constructor(props) {
...@@ -80,7 +81,7 @@ class Renewal extends React.Component { ...@@ -80,7 +81,7 @@ class Renewal extends React.Component {
<View style={styles.body}> <View style={styles.body}>
<View style={styles.cont_curent_balance}> <View style={styles.cont_curent_balance}>
<View style={styles.current_balance}> <View style={styles.current_balance}>
<Text style={{ textAlign: 'center', fontSize: 12, fontFamily: 'Gotham-Black', color:'#CFB368' }}>Current Balance</Text> <Text style={{ textAlign: 'center', fontSize: 12, fontFamily: 'Gotham-Black', color:'#CFB368' }}>{i18n.t('currentbalance')}</Text>
</View> </View>
<View style={styles.value_current_balance}> <View style={styles.value_current_balance}>
<Text style={{ textAlign: 'center', fontSize: 12, fontFamily: 'Gotham-Black', color:'gray' }}>IDR {this.state.current_balance}</Text> <Text style={{ textAlign: 'center', fontSize: 12, fontFamily: 'Gotham-Black', color:'gray' }}>IDR {this.state.current_balance}</Text>
...@@ -88,7 +89,7 @@ class Renewal extends React.Component { ...@@ -88,7 +89,7 @@ class Renewal extends React.Component {
</View> </View>
<View style={styles.cont_curent_balance}> <View style={styles.cont_curent_balance}>
<View style={styles.current_balance}> <View style={styles.current_balance}>
<Text style={{ textAlign: 'center', fontSize: 12, fontFamily: 'Gotham-Black', color:'#CFB368' }}>Biaya Renewal</Text> <Text style={{ textAlign: 'center', fontSize: 12, fontFamily: 'Gotham-Black', color:'#CFB368' }}>{i18n.t('renewalfees')}</Text>
</View> </View>
<View style={styles.value_current_balance}> <View style={styles.value_current_balance}>
<Text style={{ textAlign: 'center', fontSize: 12, fontFamily: 'Gotham-Black', color:'gray' }}>IDR {this.state.biaya_renewal}</Text> <Text style={{ textAlign: 'center', fontSize: 12, fontFamily: 'Gotham-Black', color:'gray' }}>IDR {this.state.biaya_renewal}</Text>
...@@ -96,7 +97,7 @@ class Renewal extends React.Component { ...@@ -96,7 +97,7 @@ class Renewal extends React.Component {
</View> </View>
<View style={styles.cont_curent_balance}> <View style={styles.cont_curent_balance}>
<View style={styles.current_balance}> <View style={styles.current_balance}>
<Text style={{ textAlign: 'center', fontSize: 12, fontFamily: 'Gotham-Black', color:'#CFB368' }}>Expired</Text> <Text style={{ textAlign: 'center', fontSize: 12, fontFamily: 'Gotham-Black', color:'#CFB368' }}>{i18n.t('expired')}</Text>
</View> </View>
<View style={styles.value_current_balance}> <View style={styles.value_current_balance}>
<Text style={{ textAlign: 'center', fontSize: 12, fontFamily: 'Gotham-Black', color:'gray' }}>{this.state.expired}</Text> <Text style={{ textAlign: 'center', fontSize: 12, fontFamily: 'Gotham-Black', color:'gray' }}>{this.state.expired}</Text>
...@@ -105,7 +106,7 @@ class Renewal extends React.Component { ...@@ -105,7 +106,7 @@ class Renewal extends React.Component {
<View style={styles.cont_curent_balance}> <View style={styles.cont_curent_balance}>
<View style={styles.current_balance}> <View style={styles.current_balance}>
<Text style={{ textAlign: 'center', fontSize: 12, fontFamily: 'Gotham-Black', color:'#CFB368' }}>Renew Until</Text> <Text style={{ textAlign: 'center', fontSize: 12, fontFamily: 'Gotham-Black', color:'#CFB368' }}>{i18n.t('renewuntil')}</Text>
</View> </View>
<View style={styles.value_current_balance}> <View style={styles.value_current_balance}>
<Text style={{ textAlign: 'center', fontSize: 12, fontFamily: 'Gotham-Black', color:'gray' }}>{this.state.renew_until}</Text> <Text style={{ textAlign: 'center', fontSize: 12, fontFamily: 'Gotham-Black', color:'gray' }}>{this.state.renew_until}</Text>
...@@ -116,7 +117,7 @@ class Renewal extends React.Component { ...@@ -116,7 +117,7 @@ class Renewal extends React.Component {
</View> */} </View> */}
<TouchableOpacity onPress={() => this._renewal()}> <TouchableOpacity onPress={() => this._renewal()}>
<View style={styles.button}> <View style={styles.button}>
<Text style={{ color: 'white', fontSize: 16, textAlign: 'center', fontFamily: 'Gotham-Black' }}>RENEW</Text> <Text style={{ color: 'white', fontSize: 16, textAlign: 'center', fontFamily: 'Gotham-Black' }}>{i18n.t('renew')}</Text>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
...@@ -171,6 +172,7 @@ const styles = StyleSheet.create({ ...@@ -171,6 +172,7 @@ const styles = StyleSheet.create({
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
return { return {
session_id: state.session_id, session_id: state.session_id,
language: state.language
} }
} }
export default connect(mapStateToProps)(Renewal); export default connect(mapStateToProps)(Renewal);
view/RewardsList.js
View file @ 7e5dc705
...@@ -79,7 +79,7 @@ class RewardsList extends React.Component { ...@@ -79,7 +79,7 @@ class RewardsList extends React.Component {
<Text style={{ textAlign: 'left', fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>{item.reward.subtitle}</Text> <Text style={{ textAlign: 'left', fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>{item.reward.subtitle}</Text>
</View> </View>
<View style={{ flex: 0.4 }}> <View style={{ flex: 0.4 }}>
<Text style={{ textAlign: 'right', fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>Expired On</Text> <Text style={{ textAlign: 'right', fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>{i18n.t('expired')}</Text>
<Text style={{ textAlign: 'right', fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>{item.expire_time}</Text> <Text style={{ textAlign: 'right', fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>{item.expire_time}</Text>
</View> </View>
</View> </View>
...@@ -89,7 +89,7 @@ class RewardsList extends React.Component { ...@@ -89,7 +89,7 @@ class RewardsList extends React.Component {
)) ))
) : ( ) : (
<View style={{ justifyContent: 'center', alignItems: 'center', height: 100 }}> <View style={{ justifyContent: 'center', alignItems: 'center', height: 100 }}>
<Text style={{ textAlign: 'left', fontSize: 12, fontFamily: 'Gotham-Light', color: 'grey' }}>No E-Voucher Available</Text> <Text style={{ textAlign: 'left', fontSize: 12, fontFamily: 'Gotham-Light', color: 'grey' }}>{i18n.t('emptyvoucherlist')}</Text>
</View> </View>
)) ))
} }
......
view/TransferBalance.js
View file @ 7e5dc705
...@@ -4,6 +4,7 @@ import Axios from 'axios'; ...@@ -4,6 +4,7 @@ import Axios from 'axios';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import ActionType from '../redux/globalActionType'; import ActionType from '../redux/globalActionType';
import MyStatusBar from './MyStatusBar'; import MyStatusBar from './MyStatusBar';
import i18n from 'i18n-js';
class TransferBalance extends React.Component { class TransferBalance extends React.Component {
constructor(props) { constructor(props) {
...@@ -84,23 +85,23 @@ class TransferBalance extends React.Component { ...@@ -84,23 +85,23 @@ class TransferBalance extends React.Component {
<ScrollView> <ScrollView>
<View style={{ flex: 3 }}> <View style={{ flex: 3 }}>
<View style={{ flex: 1, margin: 20,top:20 }}> <View style={{ flex: 1, margin: 20,top:20 }}>
<Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 3 }}>Phone</Text> <Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 3 }}>{i18n.t('phone')}</Text>
<TextInput style={{ height: 40, borderWidth: 1, padding: 5, margin: 10, borderRadius: 10, borderColor: 'grey', fontFamily: 'Gotham-Black', textAlign: 'center', color: 'grey', fontWeight: 'bold', fontSize: 20 }} <TextInput style={{ height: 40, borderWidth: 1, padding: 5, margin: 10, borderRadius: 10, borderColor: 'grey', fontFamily: 'Gotham-Black', textAlign: 'center', color: 'grey', fontWeight: 'bold', fontSize: 20 }}
onChangeText={(destination) => this.setState({ destination })} onChangeText={(destination) => this.setState({ destination })}
value={this.state.destination} value={this.state.destination}
keyboardType='number-pad' /> keyboardType='number-pad' />
<Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 3 }}>Amount</Text> <Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 3 }}>{i18n.t('amount')}</Text>
<TextInput style={{ height: 40, borderWidth: 1, padding: 5, margin: 10, borderRadius: 10, borderColor: 'grey', fontFamily: 'Gotham-Black', textAlign: 'center', color: 'grey', fontWeight: 'bold', fontSize: 20 }} <TextInput style={{ height: 40, borderWidth: 1, padding: 5, margin: 10, borderRadius: 10, borderColor: 'grey', fontFamily: 'Gotham-Black', textAlign: 'center', color: 'grey', fontWeight: 'bold', fontSize: 20 }}
onChangeText={(amount) => this.setState({ amount })} onChangeText={(amount) => this.setState({ amount })}
value={this.state.amount} value={this.state.amount}
keyboardType='number-pad'/> keyboardType='number-pad'/>
<Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 3 }}>Current Balance</Text> <Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 3 }}>{i18n.t('currentbalance')}</Text>
<TextInput style={{ height: 40, borderWidth: 1, padding: 5, margin: 10, borderRadius: 10, borderColor: 'grey', fontFamily: 'Gotham-Black', textAlign: 'center', color: 'grey', fontWeight: 'bold', fontSize: 20 }} <TextInput style={{ height: 40, borderWidth: 1, padding: 5, margin: 10, borderRadius: 10, borderColor: 'grey', fontFamily: 'Gotham-Black', textAlign: 'center', color: 'grey', fontWeight: 'bold', fontSize: 20 }}
onChangeText={(no_tlp) => this.setState({ no_tlp })} onChangeText={(no_tlp) => this.setState({ no_tlp })}
editable={false}> editable={false}>
{this.state.balance} {this.state.balance}
</TextInput> </TextInput>
<Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 3 }}>Message</Text> <Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 3 }}>{i18n.t('message')}</Text>
<TextInput style={{ height: 100, borderWidth: 1, padding: 5, margin: 10, borderRadius: 10, borderColor: 'grey', fontFamily: 'Gotham-Black', textAlign: 'center', color: 'grey', fontWeight: 'bold', fontSize: 20 }} <TextInput style={{ height: 100, borderWidth: 1, padding: 5, margin: 10, borderRadius: 10, borderColor: 'grey', fontFamily: 'Gotham-Black', textAlign: 'center', color: 'grey', fontWeight: 'bold', fontSize: 20 }}
onChangeText={(reference) => this.setState({ reference })} onChangeText={(reference) => this.setState({ reference })}
value={this.state.reference}> value={this.state.reference}>
...@@ -113,7 +114,7 @@ class TransferBalance extends React.Component { ...@@ -113,7 +114,7 @@ class TransferBalance extends React.Component {
<View style={{ flex: 1, margin: 5 }}> <View style={{ flex: 1, margin: 5 }}>
<TouchableOpacity title="Edit" onPress={() => this.handleSend()}> <TouchableOpacity title="Edit" onPress={() => this.handleSend()}>
<View style={{ height: 40, borderRadius: 20, backgroundColor: '#CFB368',marginRight:40,marginLeft:40,justifyContent:'center'}}> <View style={{ height: 40, borderRadius: 20, backgroundColor: '#CFB368',marginRight:40,marginLeft:40,justifyContent:'center'}}>
<Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 19, textAlign: 'center', margin: 20 }}>Save</Text> <Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 19, textAlign: 'center', margin: 20 }}>{i18n.t('save')}</Text>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
...@@ -180,7 +181,8 @@ const styles = StyleSheet.create({ ...@@ -180,7 +181,8 @@ const styles = StyleSheet.create({
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
return { return {
session_id: state.session_id, session_id: state.session_id,
set_card: state.set_card set_card: state.set_card,
language: state.language
} }
} }
......
view/UseBalance.js
View file @ 7e5dc705
...@@ -9,6 +9,7 @@ import ActionType from '../redux/globalActionType'; ...@@ -9,6 +9,7 @@ import ActionType from '../redux/globalActionType';
import Spinner from 'react-native-loading-spinner-overlay'; import Spinner from 'react-native-loading-spinner-overlay';
import PinRequest from './PinRequest' import PinRequest from './PinRequest'
import MyStatusBar from './MyStatusBar'; import MyStatusBar from './MyStatusBar';
import i18n from 'i18n-js';
class UseBalance extends React.Component { class UseBalance extends React.Component {
...@@ -120,11 +121,11 @@ class UseBalance extends React.Component { ...@@ -120,11 +121,11 @@ class UseBalance extends React.Component {
redeem() { redeem() {
if (this.state.checkedBalance == false && this.state.checkedPoint == false && this.state.checkedBalancePoint == false) { if (this.state.checkedBalance == false && this.state.checkedPoint == false && this.state.checkedBalancePoint == false) {
Alert.alert('Error', 'Silahkan pilih metode pembayaran') Alert.alert('Error', i18n.t('alertselectpayment') )
} else { } else {
if (this.state.checkedBalance) { if (this.state.checkedBalance) {
if (parseInt(this.state.input_redeem) > parseInt(this.state.kasproBalance)) { if (parseInt(this.state.input_redeem) > parseInt(this.state.kasproBalance)) {
Alert.alert('', 'Maaf Balance tidak cukup') Alert.alert('', i18n.t('alertbalance'))
} else { } else {
let params = { let params = {
session_id: this.props.session_id, session_id: this.props.session_id,
...@@ -163,7 +164,7 @@ class UseBalance extends React.Component { ...@@ -163,7 +164,7 @@ class UseBalance extends React.Component {
} }
} else if (this.state.checkedPoint) { } else if (this.state.checkedPoint) {
if (parseInt(this.state.input_redeem) > parseInt(this.state.kasproPoint)) { if (parseInt(this.state.input_redeem) > parseInt(this.state.kasproPoint)) {
Alert.alert('', 'Maaf Point tidak cukup') Alert.alert('', i18n.t('alertpoin'))
} else { } else {
let params = { let params = {
session_id: this.props.session_id, session_id: this.props.session_id,
...@@ -202,7 +203,7 @@ class UseBalance extends React.Component { ...@@ -202,7 +203,7 @@ class UseBalance extends React.Component {
} }
} else { } else {
if (parseInt(this.state.input_redeem) > parseInt(parseInt(this.state.kasproPoint) + parseInt(this.state.kasproBalance))) { if (parseInt(this.state.input_redeem) > parseInt(parseInt(this.state.kasproPoint) + parseInt(this.state.kasproBalance))) {
Alert.alert('', 'Maaf Balance dan Point tidak cukup') Alert.alert('', i18n.t('alertbalancepoin'))
} else { } else {
if (parseInt(this.state.kasproPoint) - parseInt(this.state.input_redeem) <= -1) { if (parseInt(this.state.kasproPoint) - parseInt(this.state.input_redeem) <= -1) {
// Alert.alert('masuk coy') // Alert.alert('masuk coy')
...@@ -330,11 +331,11 @@ class UseBalance extends React.Component { ...@@ -330,11 +331,11 @@ class UseBalance extends React.Component {
</Modal> </Modal>
<View style={{ flex: 3 }}> <View style={{ flex: 3 }}>
<View style={{ flex: 1, marginRight: 30, marginLeft: 30, top: 50 }}> <View style={{ flex: 1, marginRight: 30, marginLeft: 30, top: 50 }}>
<Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 3 }}>Balance</Text> <Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 3 }}>{i18n.t('balance')}</Text>
<Text style={{ fontFamily: 'Gotham-Black', color: '#838383', fontSize: 18, textAlign: 'center', margin: 1 }}>IDR {this.state.current_balance}</Text> <Text style={{ fontFamily: 'Gotham-Black', color: '#838383', fontSize: 18, textAlign: 'center', margin: 1 }}>IDR {this.state.current_balance}</Text>
<Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 3, marginTop: 10 }}>Points</Text> <Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 3, marginTop: 10 }}>{i18n.t('point')}</Text>
<Text style={{ fontFamily: 'Gotham-Black', color: '#838383', fontSize: 18, textAlign: 'center', margin: 1 }}>IDR {this.state.kaspro_point}</Text> <Text style={{ fontFamily: 'Gotham-Black', color: '#838383', fontSize: 18, textAlign: 'center', margin: 1 }}>IDR {this.state.kaspro_point}</Text>
...@@ -342,7 +343,7 @@ class UseBalance extends React.Component { ...@@ -342,7 +343,7 @@ class UseBalance extends React.Component {
onChangeText={(redeem_balance) => this.setState({ redeem_balance })} onChangeText={(redeem_balance) => this.setState({ redeem_balance })}
keyboardType='numeric'>{this.state.current_balance}</TextInput> */} keyboardType='numeric'>{this.state.current_balance}</TextInput> */}
<Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 3, marginTop: 10 }}>Redeem</Text> <Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 3, marginTop: 10 }}>{i18n.t('redeem')}</Text>
<TextInput style={{ height: 40, borderWidth: 1, padding: 5, margin: 3, marginBottom: 20, borderRadius: 10, borderColor: 'grey', fontFamily: 'Gotham-Black', textAlign: 'center', color: 'grey', fontWeight: 'bold', fontSize: 20 }} <TextInput style={{ height: 40, borderWidth: 1, padding: 5, margin: 3, marginBottom: 20, borderRadius: 10, borderColor: 'grey', fontFamily: 'Gotham-Black', textAlign: 'center', color: 'grey', fontWeight: 'bold', fontSize: 20 }}
onChangeText={(input_redeem) => this.setState({ input_redeem })} onChangeText={(input_redeem) => this.setState({ input_redeem })}
placeholder='0' placeholder='0'
...@@ -357,7 +358,7 @@ class UseBalance extends React.Component { ...@@ -357,7 +358,7 @@ class UseBalance extends React.Component {
<Card style={{ margin: 5, padding: 10, backgroundColor: 'gray' }}> <Card style={{ margin: 5, padding: 10, backgroundColor: 'gray' }}>
<View style={{ flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center' }}> <View style={{ flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center' }}>
<View> <View>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Black', color: 'white' }}>EXCELSO BALANCE</Text> <Text style={{ fontSize: 12, fontFamily: 'Gotham-Black', color: 'white' }}>EXCELSO {i18n.t('balance')}</Text>
</View> </View>
<View> <View>
<FontAwesome name='circle-o' size={30} color={'#ccb46c'} /> <FontAwesome name='circle-o' size={30} color={'#ccb46c'} />
...@@ -371,7 +372,7 @@ class UseBalance extends React.Component { ...@@ -371,7 +372,7 @@ class UseBalance extends React.Component {
<Card style={{ margin: 5, padding: 10 }}> <Card style={{ margin: 5, padding: 10 }}>
<View style={{ flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center' }}> <View style={{ flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center' }}>
<View> <View>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Black', color: 'grey' }}>EXCELSO BALANCE</Text> <Text style={{ fontSize: 12, fontFamily: 'Gotham-Black', color: 'grey' }}>EXCELSO {i18n.t('balance')}</Text>
</View> </View>
<View> <View>
<CheckBox <CheckBox
...@@ -395,7 +396,7 @@ class UseBalance extends React.Component { ...@@ -395,7 +396,7 @@ class UseBalance extends React.Component {
<Card style={{ margin: 5, padding: 10, backgroundColor: 'gray' }}> <Card style={{ margin: 5, padding: 10, backgroundColor: 'gray' }}>
<View style={{ flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center' }}> <View style={{ flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center' }}>
<View> <View>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Black', color: 'white' }}>EXCELSO POINTS</Text> <Text style={{ fontSize: 12, fontFamily: 'Gotham-Black', color: 'white' }}>EXCELSO {i18n.t('point')}</Text>
</View> </View>
<View> <View>
<FontAwesome name='circle-o' size={30} color={'#ccb46c'} /> <FontAwesome name='circle-o' size={30} color={'#ccb46c'} />
...@@ -410,7 +411,7 @@ class UseBalance extends React.Component { ...@@ -410,7 +411,7 @@ class UseBalance extends React.Component {
<Card style={{ margin: 5, padding: 10 }}> <Card style={{ margin: 5, padding: 10 }}>
<View style={{ flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center' }}> <View style={{ flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center' }}>
<View> <View>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Black', color: 'grey' }}>EXCELSO POINTS</Text> <Text style={{ fontSize: 12, fontFamily: 'Gotham-Black', color: 'grey' }}>EXCELSO {i18n.t('point')}</Text>
</View> </View>
<View> <View>
<CheckBox <CheckBox
...@@ -434,7 +435,7 @@ class UseBalance extends React.Component { ...@@ -434,7 +435,7 @@ class UseBalance extends React.Component {
<Card style={{ margin: 5, padding: 10, backgroundColor: 'gray' }}> <Card style={{ margin: 5, padding: 10, backgroundColor: 'gray' }}>
<View style={{ flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center' }}> <View style={{ flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center' }}>
<View> <View>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Black', color: 'white' }}>EXCELSO BALANCE + POINTS</Text> <Text style={{ fontSize: 12, fontFamily: 'Gotham-Black', color: 'white' }}>EXCELSO {i18n.t('balance')} + {i18n.t('point')}</Text>
</View> </View>
<View> <View>
<FontAwesome name='circle-o' size={30} color={'#ccb46c'} /> <FontAwesome name='circle-o' size={30} color={'#ccb46c'} />
...@@ -449,7 +450,7 @@ class UseBalance extends React.Component { ...@@ -449,7 +450,7 @@ class UseBalance extends React.Component {
<Card style={{ margin: 5, padding: 10 }}> <Card style={{ margin: 5, padding: 10 }}>
<View style={{ flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center' }}> <View style={{ flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center' }}>
<View> <View>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Black', color: 'grey' }}>EXCELSO BALANCE + POINTS</Text> <Text style={{ fontSize: 12, fontFamily: 'Gotham-Black', color: 'grey' }}>EXCELSO {i18n.t('balance')} + {i18n.t('point')}</Text>
</View> </View>
<View> <View>
<CheckBox <CheckBox
...@@ -470,7 +471,7 @@ class UseBalance extends React.Component { ...@@ -470,7 +471,7 @@ class UseBalance extends React.Component {
</View> </View>
<TouchableOpacity style={{ height: 150 }} onPress={() => this.redeem()}> <TouchableOpacity style={{ height: 150 }} onPress={() => this.redeem()}>
<View style={{ backgroundColor: '#CFB368', height: 40, top: 20, borderRadius: 10, marginRight: 50, marginLeft: 50 }}> <View style={{ backgroundColor: '#CFB368', height: 40, top: 20, borderRadius: 10, marginRight: 50, marginLeft: 50 }}>
<Text style={{ alignSelf: 'center', top: 10, color: 'white', fontFamily: 'Gotham-Black', fontSize: 20 }}>REDEEM</Text> <Text style={{ alignSelf: 'center', top: 10, color: 'white', fontFamily: 'Gotham-Black', fontSize: 20 }}>{i18n.t('redeem')}</Text>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
</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