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

# Conflicts:
#	view/Renewal.js

lib/en.json

@@ -15,6 +15,12 @@
     "logout":"LOGOUT",
     "email":"Email",
     "phone":"Phone",
+    "amount":"Amount",
+    "currentbalance":"Current Balance",
+    "renewalfees":"Renewal of fees",
+    "renewuntil":"Renew Until",
+    "renew":"RENEW",
+    "message":"Message",
     "changepassword":"CHANGE PASSWORD",
     "save":"Save",
     "currentpassword":"Current Password",
@@ -30,7 +36,13 @@
     "titlerewardhistory":"REWARDS E-VOUCHER",
     "orderhistory":"ORDER HISTORY",
     "allcity":"All city",
+    "emptyvoucherlist":"No E-Voucher Available",
+    "emptyvoucherhistory":"No E-Voucher Available",
     "name":"Name",
+    "open":"OPEN",
+    "closed":"CLOSED",
+    "openinghours":"Opening Hours",
+    "searchpickups":"Search the pickup store location",
     "submit":"SUBMIT",
     "cancel":"CANCEL",
     "resendemail":"RENSEND EMAIL TOKEN",
@@ -46,7 +58,8 @@
     "promotion":"TODAY PROMOTION",
     "expired": "Expired At",
     "balance" : "BALANCE",
-    "point" : "POINTS :",
+    "redeem":"REDEEM",
+    "point" : "POINTS",
     "profile" : "Profile",
     "Viewcart":"View Cart",
     "Viewprofil" :"View Profile",
@@ -56,9 +69,14 @@
     "selectaddress":"SELECT",
     "detail":"Details",
     "Transferbalance":"TRANSFER BALANCE",
-    "Transactionhistory":"TRANSFER HISTORY",
+    "Transactionhistory":"TRANSACTION HISTORY",
     "Renewal":"RENEWAL",
     "Usebalancepoint":"USE BALANCE / POINTS",
     "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

@@ -10,6 +10,18 @@
   "logout":"KELUAR",
   "email":"Email",
   "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",
   "male":"Pria",
   "female":"Wanita",
@@ -50,17 +62,22 @@
   "topup":" PENGISIAN SALDO ",
   "usebalance": "GUNAKAN SALDO",
   "balance" :"SALDO",
-  "point" : "POINT",
+  "redeem":"REDEEM",
+  "point" : "POIN",
   "profile" :"Profil",
   "upgradePremium" :"TINGKATKAN PREMIUM",
   "cardActivation" :"Aktivasi Kartu",
   "Viewcart":"Keranjang",
   "Viewprofil" :"Lihat Profil",
   "Transferbalance":"TRANSFER SALDO",
-  "Transactionhistory":"RIWAYAT TRANSFER",
+  "Transactionhistory":"RIWAYAT TRANSAKSI",
   "Renewal":"RENEWAL",
   "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

@@ -372,9 +372,6 @@ class Home extends React.Component {
 
               }
 
-
-
-
               {
                 this.state.indicatorProfileCard == true ? (
                   <View style={styles.card}>
@@ -432,7 +429,7 @@ class Home extends React.Component {
                           <View style={{ flexDirection: 'row', flex: 1 }}>
                             <View style={{ flex: 0.3, justifyContent: 'center' }}>
                               {/* <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 style={{ flex: 0.7, alignItems: 'center' }}>
                               <Text style={{ fontSize: 14, fontFamily: 'Gotham-Black', color: 'gray' }}>IDR {this.state.balance}</Text>
@@ -447,7 +444,7 @@ class Home extends React.Component {
                           <View style={{ flexDirection: 'row', flex: 1 }}>
                             <View style={{ flex: 0.3, justifyContent: 'center' }}>
                               {/* <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 style={{ flex: 0.7, alignItems: 'center' }}>
                               <Text style={{ fontSize: 14, fontFamily: 'Gotham-Black', color: 'gray' }}>IDR {this.state.point}</Text>

view/PickupName.js

@@ -12,6 +12,7 @@ import { connect } from 'react-redux';
 import * as Permissions from 'expo-permissions';
 import * as Device from 'expo-device';
 import MyStatusBar from './MyStatusBar';
+import i18n from 'i18n-js';
 
 class PickupName extends React.Component {
     constructor(props) {
@@ -215,11 +216,11 @@ class PickupName extends React.Component {
                                             <View style={{ margin: 5 }}>
                                                 <Text style={{ fontFamily: 'Gotham-Black', color: 'grey', fontSize: 20 }}>{item.name}</Text>
                                                 <View style={{ flexDirection: 'row' }}>
-                                                    {item.can_accept_order == true ? (<Text style={{ fontFamily: 'Gotham-Black', color: "#ccb46c", top: 5 }}>OPEN   </Text>)
-                                                        : (<Text style={{ fontFamily: 'Gotham-Black', color: "#ccb46c" }}>CLOSED  </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" }}>{i18n.t('closed')}  </Text>)}
                                                 </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' }}>
                                                 {item.full_address}
                                             </Text>
@@ -249,11 +250,11 @@ class PickupName extends React.Component {
                                             <View style={{ margin: 5 }}>
                                                 <Text style={{ fontFamily: 'Gotham-Black', color: 'grey', fontSize: 20 }}>{item.name}</Text>
                                                 <View style={{ flexDirection: 'row' }}>
-                                                    {item.can_accept_order == true ? (<Text style={{ fontFamily: 'Gotham-Black', color: "#ccb46c", top: 5 }}>OPEN   </Text>)
-                                                        : (<Text style={{ fontFamily: 'Gotham-Black', color: "#ccb46c" }}>CLOSED  </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" }}>{i18n.t('closed')}  </Text>)}
                                                 </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' }}>
                                                 {item.full_address}
                                             </Text>
@@ -299,7 +300,7 @@ class PickupName extends React.Component {
                             <MaterialCommunityIcons name="map-marker" size={32} color="#ccb46c" />
                         </View>
                         <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)}
                                 onClear={text => this.filterData('')}
                                 value={this.state.search}></TextInput>
@@ -396,7 +397,8 @@ const mapStateToProps = (state) => {
         session_id: state.session_id,
         outlet_id: state.outlet_id,
         name_outlet: state.name_outlet,
-        outlet_detailadress: state.outlet_detailadress
+        outlet_detailadress: state.outlet_detailadress,
+        language: state.language
     }
 }
 

view/Renewal.js

@@ -3,6 +3,7 @@ import { View, Text, StyleSheet, Button, Alert, TouchableOpacity } from 'react-n
 import { connect } from 'react-redux';
 import Axios from 'axios';
 import MyStatusBar from './MyStatusBar';
+import i18n from 'i18n-js';
 
 class Renewal extends React.Component {
     constructor(props) {
@@ -80,7 +81,7 @@ class Renewal extends React.Component {
                 <View style={styles.body}>
                     <View style={styles.cont_curent_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 style={styles.value_current_balance}>
                             <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 {
                     </View>
                     <View style={styles.cont_curent_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 style={styles.value_current_balance}>
                             <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 {
                     </View>
                     <View style={styles.cont_curent_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 style={styles.value_current_balance}>
                             <Text style={{ textAlign: 'center', fontSize: 12, fontFamily: 'Gotham-Black', color:'gray' }}>{this.state.expired}</Text>
@@ -105,7 +106,7 @@ class Renewal extends React.Component {
 
                     <View style={styles.cont_curent_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 style={styles.value_current_balance}>
                             <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 {
                     </View> */}
                     <TouchableOpacity onPress={() => this._renewal()}>
                         <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>
                     </TouchableOpacity>
                 </View>
@@ -171,6 +172,7 @@ const styles = StyleSheet.create({
 const mapStateToProps = (state) => {
     return {
         session_id: state.session_id,
+        language: state.language
     }
 }
 export default connect(mapStateToProps)(Renewal);

view/RewardsList.js

@@ -79,7 +79,7 @@ class RewardsList extends React.Component {
                                                         <Text style={{ textAlign: 'left', fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>{item.reward.subtitle}</Text>
                                                     </View>
                                                     <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>
                                                     </View>
                                                 </View>
@@ -89,7 +89,7 @@ class RewardsList extends React.Component {
                                 ))
                             ) : (
                                     <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/TransferBalance.js

@@ -4,6 +4,7 @@ import Axios from 'axios';
 import { connect } from 'react-redux';
 import ActionType from '../redux/globalActionType';
 import MyStatusBar from './MyStatusBar';
+import i18n from 'i18n-js';
 
 class TransferBalance extends React.Component {
     constructor(props) {
@@ -84,23 +85,23 @@ class TransferBalance extends React.Component {
             <ScrollView>
             <View style={{ flex: 3 }}>
                 <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 }}
                                     onChangeText={(destination) => this.setState({ destination })}
                                     value={this.state.destination}
                                     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 }}
                                     onChangeText={(amount) => this.setState({ amount })}
                                     value={this.state.amount}
                                     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 }}
                         onChangeText={(no_tlp) => this.setState({ no_tlp })}
                         editable={false}>
                             {this.state.balance}
                     </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 }}
                          onChangeText={(reference) => this.setState({ reference })}
                          value={this.state.reference}>
@@ -113,7 +114,7 @@ class TransferBalance extends React.Component {
                         <View style={{ flex: 1, margin: 5 }}>
                         <TouchableOpacity title="Edit" onPress={() => this.handleSend()}>
                             <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>
                             </TouchableOpacity>
                         </View>
@@ -180,7 +181,8 @@ const styles = StyleSheet.create({
 const mapStateToProps = (state) => {
     return {
         session_id: state.session_id,
-        set_card: state.set_card
+        set_card: state.set_card,
+        language: state.language
     }
 }