Skip to content

C
clone_excelso
Commit 6766c621 authored by Fred's avatar Fred
Browse files
Options

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

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
parents ed8222d5 ab72ace4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 404 additions and 242 deletions
lib/en.json
View file @ 6766c621
{
"welcome":"NEXT",
"login":"LOGIN",
"Confirmpassword":"Confirm Password",
"Name":"Name",
"other":"Other",
"male":"Male",
"female":"Female",
"pilih":"Select",
"NotActivate":"You have not activated the card",
"NotorderHistory":"No Order History",
"gender":"Gender",
"dob":"Date of Birth",
"logout":"LOGOUT",
"email":"Email",
"phone":"Phone",
"changepassword":"CHANGE PASSWORD",
"save":"Save",
"currentpassword":"Current Password",
"newpassword":"New Password",
"repeatpassword":"Repeat Password",
"language":"LANGUAGE",
"password":"Password",
"register":"REGISTER",
"forgotPassword":"FORGOT PASSWORD",
......@@ -10,11 +28,12 @@
"privacy":"our service guide rules and privacy policy",
"rewardhistory":"REDEEM E-VOUCHER HISTORY",
"titlerewardhistory":"REWARDS E-VOUCHER",
"orderhistory":"ORDER HISTORY",
"allcity":"All city",
"name":"Name",
"dob":"Date of Birth",
"gender":"Gender",
"submit":"Submit",
"submit":"SUBMIT",
"cancel":"CANCEL",
"resendemail":"RENSEND EMAIL TOKEN",
"enterToken":"Enter Token",
"delivery":"DELIVERY",
"pickup":"PICKUP",
......@@ -29,5 +48,16 @@
"balance" : "BALANCE",
"point" : "POINTS :",
"profile" : "Profile",
"View cart":"View Cart"
"Viewcart":"View Cart",
"Viewprofil" :"View Profile",
"searchaddress":"Search Address",
"addaddress":"Add Address",
"label":"Label",
"selectaddress":"SELECT",
"detail":"Details",
"Transferbalance":"TRANSFER BALANCE",
"Transactionhistory":"TRANSFER HISTORY",
"Renewal":"RENEWAL",
"Usebalancepoint":"USE BALANCE / POINTS",
"Acitvatecard":"ACTIVATE CARD"
}
\ No newline at end of file
lib/id.json
View file @ 6766c621
{
"welcome": "LANJUT",
"login":"MASUK",
"register":"DAFTAR",
"Confirmpassword":"Konfirmasi Password",
"Name":"Nama",
"NotorderHistory":"Tidak ada riwayat transaksi",
"NotActivate":"Anda belum aktivasi kartu",
"dob":"Tanggal Lahir",
"logout":"KELUAR",
"email":"Email",
"phone":"Telephone",
"other":"Lain",
"male":"Pria",
"female":"Wanita",
"pilih":"pilih",
"gender":"Jenis Kelamin",
"password":"Kata Sandi",
"signin":"Masuk",
"register":"DAFTAR",
"forgotPassword":"LUPA KATA SANDI",
"policy":"Dengan Login atau Register, Kamu menyetujui aturan",
"privacy":"Panduan Layanan dan Kebijakan Privasi kami",
"name":"Nama",
"dob":"Tanggal Lahir",
"gender":"Jenis Kelamin",
"submit":"Kirim",
"submit":"KIRIM",
"cancel":"BATALKAN",
"searchaddress":"Cari Alamat",
"addaddress":"Tambah Alamat",
"selectaddress":"PILIH",
"label":"Label",
"detail":"Details",
"resendemail":"KIRIM ULANG EMAIL TOKEN",
"enterToken":"Masukan Token",
"delivery":"ANTAR",
"pickup":"AMBIL",
"changepassword":"GANTI KATA SANDI",
"currentpassword":"Kata sandi lama",
"newpassword":"Kata sandi baru",
"repeatpassword":"Ulangi Kata sandi",
"save":"Simpan",
"language":"BAHASA",
"orderInfo" :"KAMU AKAN AMBIL PESANANMU DI",
"orderNow" :"PESAN SEKARANG",
"rewardhistory":"RIWAYAT HISTORY",
"rewardhistory":"RIWAYAT REWARDS",
"orderhistory":"RIWAYAT ORDER",
"titlerewardhistory":"VOUCHER",
"allcity":"Semua kota",
"cardnumber" :"NOMOR KARTU",
"expired": "Berakhir Pada",
"promotion":"PROMOSI HARI INI",
"deliveryinfo":"PESANAN MU AKAN DI ANTAR",
"deliveryinfo":"DRIVER KAMI AKAN MENGIRIMKAN PESANAN ANDA KE",
"topup":" PENGISIAN SALDO ",
"usebalance": "GUNAKAN SALDO",
"balance" :"SALDO",
......@@ -31,8 +54,13 @@
"profile" :"Profil",
"upgradePremium" :"Tingkatkan Premium",
"cardActivation" :"Aktivasi Kartu",
"View cart":"Lihat Keranjang"
"Viewcart":"Keranjang",
"Viewprofil" :"Lihat Profil",
"Transferbalance":"TRANSFER SALDO",
"Transactionhistory":"RIWAYAT TRANSFER",
"Renewal":"RENEWAL",
"Usebalancepoint":"GUNAKAN SALDO / POINT",
"Acitvatecard":"AKTIVASI KARTU"
}
......
view/Account.js
View file @ 6766c621
This diff is collapsed.
view/AddreesDetail.js
View file @ 6766c621
......@@ -10,6 +10,7 @@ import Axios from 'axios';
import Spinner from 'react-native-loading-spinner-overlay';
import { MaterialCommunityIcons, Ionicons } from '@expo/vector-icons';
import ActionType from '../redux/globalActionType';
import i18n from 'i18n-js';
class AddreesDetail extends React.Component {
......@@ -227,13 +228,13 @@ class AddreesDetail extends React.Component {
</View>
</View>
<View style={styles.field_name_addrees}>
<Text style={{ fontFamily: 'Gotham-Black', color: "#ccb46c", textAlign: 'center', fontSize: 18 }}>Label</Text>
<Text style={{ fontFamily: 'Gotham-Black', color: "#ccb46c", textAlign: 'center', fontSize: 18 }}>{i18n.t('label')}</Text>
<TextInput style={{ height: 40, borderWidth: 1, padding: 5, flex: 1, margin: 10, borderRadius: 10, borderColor: 'grey' }} onChangeText={(name) => this.setState({ name })} />
</View>
<View style={styles.field_detail_addrees}>
<Text style={{ fontFamily: 'Gotham-Black', color: "#ccb46c",textAlign:'center', fontSize: 18 }}>Detail</Text>
<Text style={{ fontFamily: 'Gotham-Black', color: "#ccb46c",textAlign:'center', fontSize: 18 }}>{i18n.t('detail')}</Text>
<TextInput
style={{ height: 150, borderWidth: 1, padding: 5, flex: 1, margin: 10, borderRadius: 10, borderColor: 'grey' }}
onChangeText={(description) => this.setState({ description })}
......@@ -243,7 +244,7 @@ class AddreesDetail extends React.Component {
<View style={{ margin: 50, justifyContent: 'center' }}>
<TouchableOpacity onPress={() => this.saveAddress()}>
<View style={{ height: 40, borderRadius: 10, backgroundColor: '#CFB368', justifyContent: 'center' }}>
<Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 16, textAlign: 'center' }}> Tambah Alamat</Text>
<Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 16, textAlign: 'center' }}>{i18n.t('addaddress')}</Text>
</View>
</TouchableOpacity>
</View>
......@@ -315,6 +316,7 @@ const mapStateToProps = (state) => {
return {
session_id: state.session_id,
language: state.language,
}
}
......
view/ChangeLanguage.js
View file @ 6766c621
......@@ -42,7 +42,6 @@ class Language extends React.Component {
<View style={{ flex: 0.2 }} />
<View style={styles.body}>
{
this.props.language == 'en' ? (
<>
......@@ -127,7 +126,7 @@ class Language extends React.Component {
<TouchableOpacity onPress={() => this.props.navigation.goBack()}>
<View style={styles.button}>
<Text style={{ color: 'white', fontSize: 16, fontFamily: 'Gotham-Black' }}>Save</Text>
<Text style={{ color: 'white', fontSize: 16, fontFamily: 'Gotham-Black' }}>{i18n.t('save')}</Text>
</View>
</TouchableOpacity>
</View>
......
view/ChangePassword.js
View file @ 6766c621
......@@ -4,6 +4,7 @@ import Axios from 'axios';
import { BASE_URL_CHANGE_PASSWORD } from '../model/Base_Model';
import { connect } from 'react-redux';
import MyStatusBar from './MyStatusBar';
import i18n from 'i18n-js';
class ChangePassword extends React.Component {
constructor(props) {
......@@ -47,7 +48,7 @@ class ChangePassword extends React.Component {
<View style={styles.field_token}>
<View style={{ marginBottom: 25 }}>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Black', color: '#CFB368', textAlign: 'center' }}>Current Password</Text>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Black', color: '#CFB368', textAlign: 'center' }}>{i18n.t('currentpassword')}</Text>
</View>
<View style={styles.items2}>
<TextInput style={styles.textInput}
......@@ -59,7 +60,7 @@ class ChangePassword extends React.Component {
</View>
<View style={styles.field_token}>
<View style={{ marginBottom: 25 }}>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Black', color: '#CFB368', textAlign: 'center' }}>New Password</Text>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Black', color: '#CFB368', textAlign: 'center' }}>{i18n.t('newpassword')}</Text>
</View>
<View style={styles.items2}>
<TextInput style={styles.textInput}
......@@ -71,7 +72,7 @@ class ChangePassword extends React.Component {
</View>
<View style={styles.field_token}>
<View style={{ marginBottom: 25 }}>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Black', color: '#CFB368', textAlign: 'center' }}>Repeat Password</Text>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Black', color: '#CFB368', textAlign: 'center' }}>{i18n.t('repeatpassword')}</Text>
</View>
<View style={styles.items2}>
<TextInput style={styles.textInput}
......@@ -87,7 +88,7 @@ class ChangePassword extends React.Component {
<TouchableOpacity onPress={() => this.changePassword()}>
<View style={styles.button}>
<Text style={{ color: 'white', fontSize: 12, fontFamily: 'Gotham-Black' }}>Change Password</Text>
<Text style={{ color: 'white', fontSize: 16, fontFamily: 'Gotham-Black' }}>{i18n.t('changepassword')}</Text>
</View>
</TouchableOpacity>
</View>
......@@ -146,8 +147,9 @@ const styles = StyleSheet.create({
backgroundColor: '#CFB368',
marginTop: 50,
marginHorizontal: 100,
borderRadius: 15,
borderRadius: 10,
padding:10,
height:40,
alignItems: 'center',
justifyContent: 'center'
},
......@@ -157,6 +159,7 @@ const styles = StyleSheet.create({
const mapStateToProps = (state) => {
return {
session_id: state.session_id,
language: state.language
}
}
......
view/DeliveryAddrees.js
View file @ 6766c621
......@@ -7,6 +7,7 @@ import Axios from 'axios';
import ActionType from '../redux/globalActionType';
import { MaterialCommunityIcons, Ionicons } from '@expo/vector-icons';
import MyStatusBar from './MyStatusBar';
import i18n from 'i18n-js';
// import ravLog from '../helper/debug';
......@@ -197,9 +198,6 @@ class DeliveryAddrees extends React.Component {
})
// let recalculateProps = {
// order_total: 0,
// order_quantity:0,
......@@ -237,7 +235,7 @@ class DeliveryAddrees extends React.Component {
/>
</View>
<View>
<Text style={{ textAlign: 'center', color: '#ccb46c', fontFamily: 'Gotham-Light', marginRight: 20 }}>PILIH</Text>
<Text style={{ textAlign: 'center', color: '#ccb46c', fontFamily: 'Gotham-Light', marginRight: 20 }}>{i18n.t('selectaddress')}</Text>
</View>
</View>
......@@ -266,7 +264,7 @@ class DeliveryAddrees extends React.Component {
<MaterialCommunityIcons name="map-marker" size={32} color="#ccb46c" />
</View>
<View style={{ flex: 6 }}>
<TextInput style={{ height: 45 }} placeholder="Cari Alamat"
<TextInput style={{ height: 45 }} placeholder={i18n.t('searchaddress')}
onChangeText={text => this.filterData(text)}
onClear={text => this.filterData('')}
value={this.state.search}></TextInput>
......@@ -278,7 +276,7 @@ class DeliveryAddrees extends React.Component {
<View style={styles.btn_addreess}>
<TouchableOpacity onPress={() => this.addAdreess()}>
<View style={{ height: 40, borderRadius: 10, marginRight: 70, marginLeft: 70, backgroundColor: '#CFB368', justifyContent: 'center', alignContent: 'center' }}>
<Text style={{ fontFamily: 'Gotham-Black', textAlign: 'center', color: 'white', fontSize: 16 }}> Tambah Alamat </Text>
<Text style={{ fontFamily: 'Gotham-Black', textAlign: 'center', color: 'white', fontSize: 16 }}> {i18n.t('addaddress')} </Text>
</View>
</TouchableOpacity>
......@@ -344,7 +342,8 @@ const mapStateToProps = (state) => {
return {
session_id: state.session_id,
addressId: state.addressId
addressId: state.addressId,
language: state.language
}
}
......
view/EmailConfirmation.js
View file @ 6766c621
......@@ -7,6 +7,7 @@ import ActionType from '../redux/globalActionType';
import { BASE_URL_LOGIN } from '../model/Base_Model';
import Spinner from 'react-native-loading-spinner-overlay';
import MyStatusBar from './MyStatusBar';
import i18n from 'i18n-js';
class EmailConfirmation extends React.Component {
......@@ -212,19 +213,19 @@ class EmailConfirmation extends React.Component {
value={this.state.confirmation_number}
autoCapitalize="none"
value={this.state.email}
keyboardType='email-address' />
keyboardType='numeric' />
<TouchableOpacity style={{ height: 100 }} onPress={() => this.handleSubmit()}>
<View style={{ backgroundColor: '#CFB368', height: 45, top: 10, borderRadius: 10, marginRight: 50, marginLeft: 50 }}>
<Text style={{ alignSelf: 'center', top: 10, color: 'white', fontFamily: 'Gotham-Black', fontSize: 20 }}>SUBMIT</Text>
<Text style={{ alignSelf: 'center', top: 10, color: 'white', fontFamily: 'Gotham-Black', fontSize: 20 }}>{i18n.t('submit')}</Text>
</View>
</TouchableOpacity>
<TouchableOpacity style={{ height: 100 }} onPress={() => this.handleCancel()}>
<View style={{ backgroundColor: '#CFB368', height: 45, top: 10, borderRadius: 10, marginRight: 50, marginLeft: 50 }}>
<Text style={{ alignSelf: 'center', top: 10, color: 'white', fontFamily: 'Gotham-Black', fontSize: 20 }}>CANCEL</Text>
<Text style={{ alignSelf: 'center', top: 10, color: 'white', fontFamily: 'Gotham-Black', fontSize: 20 }}>{i18n.t('cancel')}</Text>
</View>
</TouchableOpacity>
<TouchableOpacity style={{ height: 60 }} onPress={() => this.handleResend()}>
<Text style={{ alignSelf: 'center', color: '#CFB368', fontFamily: 'Gotham-Black', fontSize: 20, top: 10 }}>RESEND EMAIL TOKEN</Text>
<Text style={{ alignSelf: 'center', color: '#CFB368', fontFamily: 'Gotham-Black', fontSize: 20, top: 10 }}>{i18n.t('resendemail')}</Text>
</TouchableOpacity>
{this.props.proses == 'Register' ? (
<TouchableOpacity style={{ height: 60 }} onPress={() => this.props.navigation.navigate('Change Email')}>
......@@ -310,7 +311,8 @@ const mapStateToProps = (state) => {
page: state.page,
registration_id: state.registration_id,
pageEmailConfirmation: state.pageEmailConfirmation,
proses: state.proses
proses: state.proses,
language: state.language
}
}
......
view/Home.js
View file @ 6766c621
......@@ -41,7 +41,7 @@ class Home extends React.Component {
componentDidMount() {
// const { navigation } = this.props
// CheckVersion(navigation)
const screenWidth = Math.round(Dimensions.get('window').width);
this.setState({
slider_height: screenWidth
......@@ -66,7 +66,7 @@ class Home extends React.Component {
this._account();
if (this.props.outlet_id == '' && this.props.name_outlet == '' && this.props.outlet_detailadress == '') {
this._getPermissions()
} else {
this.setState({
indicator: false,
......@@ -316,8 +316,8 @@ class Home extends React.Component {
{i18n.t('orderInfo')}
</Text> */}
<Text style={{ textAlign: 'center', fontSize: 12, fontFamily: 'Gotham-Black', color: '#838383' }}>
{i18n.t('orderInfo')}
</Text>
{i18n.t('orderInfo')}
</Text>
{this.state.indicator == true ? (
<ActivityIndicator size="small" color="#c9af6d" />
) : (
......@@ -352,7 +352,7 @@ class Home extends React.Component {
{i18n.t('orderInfo')}
</Text> */}
<Text style={{ textAlign: 'center', fontSize: 12, fontFamily: 'Gotham-Black', color: '#838383' }}>
OUR DRIVER WILL DELIVER YOUR ORDER TO
{i18n.t('orderInfo')}
</Text>
{this.state.indicator == true ? (
<ActivityIndicator size="small" color="#c9af6d" />
......@@ -365,7 +365,7 @@ class Home extends React.Component {
<Text style={{ textAlign: 'center', bottom: 5, color: 'white' }}>{i18n.t('orderNow')}</Text>
</TouchableOpacity> */}
<TouchableOpacity style={styles.submitOrder} activeOpacity={.5} onPress={() => this._orderNow()}>
<Text style={{ textAlign: 'center', color: 'white', fontFamily: 'Gotham-Black', fontSize: 16 }}>ORDER NOW</Text>
<Text style={{ textAlign: 'center', color: 'white', fontFamily: 'Gotham-Black', fontSize: 16 }}>{i18n.t('orderNow')}</Text>
</TouchableOpacity>
</Card>
)
......@@ -385,20 +385,17 @@ class Home extends React.Component {
) :
this.state.account_number === "" ? (
<View style={styles.card}>
<Card style={{ padding: 10, margin: 10, alignContent: 'center' }}>
<Text style={{ textAlign: "center", fontFamily: 'Gotham-Light' }}> Anda belum aktivasi kartu</Text>
<Text>
</Text>
<Text style={{ textAlign: "center", fontSize: 40, color: '#c9af6d' }}>
</Text>
<View style={styles.line}></View>
<Text style={{ textAlign: 'left', fontWeight: 'bold' }}> {'\n'}
<Card style={{ padding: 10, margin: 10, alignContent: 'center', backgroundColor: '#838383' }}>
<View style={{ flex: 1, backgroundColor: 'grey', height: 150, borderRadius: 20, marginRight: 10, marginLeft: 10, justifyContent: 'center' }}>
<View style={{ justifyContent: 'center' }}>
<TouchableOpacity onPress={() => this.props.navigation.navigate('Card Activation')}>
<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>
</View>
</TouchableOpacity>
</View>
</Text>
<View style={styles.line}></View>
<Text style={{ textAlign: 'left', fontWeight: 'bold' }}>{'\n'}
</Text>
</View>
</Card>
</View>
) :
......@@ -672,7 +669,7 @@ const mapStateToProps = (state) => {
// login
in_payment: state.in_payment,
BASE_URL : state.BASE_URL,
BASE_URL: state.BASE_URL,
email: state.email,
outlet_id: state.outlet_id,
name_outlet: state.name_outlet,
......
view/MenuSelection.js
View file @ 6766c621
......@@ -11,6 +11,7 @@ import * as Location from 'expo-location';
import * as Permissions from 'expo-permissions';
import * as Device from 'expo-device';
import NumberFormat from 'react-number-format';
import i18n from 'i18n-js';
class MenuSelection extends React.Component {
constructor(props) {
......@@ -342,7 +343,7 @@ class MenuSelection extends React.Component {
<View>
<View style={{ height: 40, borderRadius: 10, width: '68%', backgroundColor: '#CFB368', marginRight: 20, marginLeft: 40, top: 15, flexDirection: 'row', marginBottom: 30 }}>
<Image source={(require('../assets/icon/icon-order.png'))} style={{ height: 40, width: 40, tintColor: 'white', }}></Image>
<Text style={{ fontFamily: 'Gotham-Light', color: 'white', fontSize: 16, alignSelf: 'center', textAlign: 'center' }}>View Cart</Text>
<Text style={{ fontFamily: 'Gotham-Light', color: 'white', fontSize: 16, alignSelf: 'center', textAlign: 'center' }}>{i18n.t('Viewcart')}</Text>
</View>
</View>
</TouchableOpacity>
......@@ -389,7 +390,8 @@ const mapStateToProps = (state) => {
order_total: state.order_total,
quantity: state.quantity,
address: state.address,
menu_item: state.menu_item
menu_item: state.menu_item,
language: state.language
}
}
......
view/New_Register.js
View file @ 6766c621
This diff is collapsed.
view/OrderHistory.js
View file @ 6766c621
......@@ -6,6 +6,7 @@ import Axios from 'axios';
import session from '../function/session';
import moment from 'moment'
import { Divider } from 'react-native-elements';
import i18n from 'i18n-js';
class OrderHistory extends React.Component {
......@@ -85,7 +86,7 @@ class OrderHistory extends React.Component {
return (
<View style={styles.container}>
<View style={styles.header}>
<Text style={{ color: 'white', textAlign: 'center', fontSize: 20, fontFamily: 'Gotham-Black' }}>ORDER HISTORY</Text>
<Text style={{ color: 'white', textAlign: 'center', fontSize: 20, fontFamily: 'Gotham-Black' }}>{i18n.t('orderhistory')}</Text>
</View>
<ScrollView style={styles.body}>
{this.state.indicator == true ? (<ActivityIndicator style={{ justifyContent: "center" }} size="large" color="#c9af6d" />) :
......@@ -115,7 +116,7 @@ class OrderHistory extends React.Component {
))
) : (
<View style={{ justifyContent: 'center', alignItems: 'center', height: 100 }}>
<Text style={{ textAlign: 'left', fontSize: 12, fontFamily: 'Gotham-Light', color: 'grey' }}>No Order History</Text>
<Text style={{ textAlign: 'left', fontSize: 12, fontFamily: 'Gotham-Light', color: 'grey' }}>{i18n.t('NotorderHistory')}</Text>
</View>
)
}
......@@ -151,6 +152,7 @@ const mapStateToProps = (state) => {
return {
session_id: state.session_id,
language: state.language
}
}
......
view/ProfilePage.js
View file @ 6766c621
This diff is collapsed.
view/TransactionHistory.js
View file @ 6766c621
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