Skip to content

N
new_excelso
Commit c102a7a4 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 bf058ee3 179e48f2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 53 deletions
lib/en.json
View file @ c102a7a4
......@@ -65,6 +65,11 @@
"token": "Token",
"delivery": "DELIVERY",
"rateDelivery":"Delivery",
"price":"Price",
"discount":"Discount",
"total":"TOTAL",
"checkout":"CHECKOUT",
"headerShoppingCart":"SHOPPING CART",
"pickup": "PICKUP",
"orderInfo": "YOU WILL PICKUP YOUR ORDER AT",
"orderNow": "ORDER NOW",
......@@ -99,5 +104,24 @@
"alertselectpayment": "Please choose a payment method",
"alertbalance": "Sorry, your balance are not enough",
"alertbalancepoin": "Sorry, your balance and points are not enough",
"headerResetPassword": "RESET PASSWORD"
"headerResetPassword": "RESET PASSWORD",
"yourOrders": "YOUR ORDER(S)",
"addMore":"+ ADD MORE",
"addVoucher":"+ ADD VOUCHER",
"removeVoucher":"Remove Voucher",
"viewDetail":"View Detail",
"payment":"PAYMENT",
"balanceUsed":"Balance Used",
"pointUsed":"Point Used",
"paymentMethods":"PAYMENT METHODS",
"yourBalance":"Your Balance",
"yourPoints":"Your Points",
"yourBalanceUsed":"Your Balance Used",
"yourPointsUsed":"Your Points Used",
"paymentDetails":"PAYMENT DETAILS",
"note":"Note",
"headerConfirmOrder":"CONFIRM YOUR ORDER",
"orderProcess":"ORDER PROCESS"
}
\ No newline at end of file
lib/id.json
View file @ c102a7a4
......@@ -56,7 +56,12 @@
"enterToken": "Masukan Token",
"token": "Token",
"delivery": "ANTAR",
"rateDelivery":"Ongkos Kirim",
"rateDelivery": "Ongkos Kirim",
"price": "Harga",
"discount": "Diskon",
"total": "TOTAL",
"checkout": "CHECKOUT@",
"headerShoppingCart": "SHOPPING CART@",
"pickup": "AMBIL",
"changepassword": "GANTI KATA SANDI",
"changeEmail": "GANTI EMAIL",
......@@ -101,5 +106,22 @@
"alertselectpayment": "Silahkan pilih metode pembayaran",
"alertbalance": "Maaf Saldo tidak cukup",
"alertbalancepoin": "Maaf Saldo dan poin tidak cukup",
"headerResetPassword": "GANTI PASSWORD"
"headerResetPassword": "GANTI PASSWORD",
"yourOrders": "PESANANMU",
"addMore": "+ TAMBAH LAGI",
"addVoucher": "+ TAMBAH VOUCHER",
"removeVoucher": "Hapus Voucher",
"viewDetail": "Lihat Detail",
"payment": "PEMBAYARAN",
"balanceUsed": "Saldo Digunakan",
"pointUsed": "Poin Digunakan",
"paymentMethods": "METODE PEMBAYARAN",
"yourBalance": "Saldo Kamu",
"yourPoints": "Poin Kamu",
"yourBalanceUsed": "Saldo Kamu Digunakan",
"yourPointsUsed": "Poin Kamu Digunakan",
"paymentDetails": "DETAIL PEMBAYARAN",
"note":"Keterangan",
"headerConfirmOrder":"CONFIRM YOUR ORDER@",
"orderProcess":"PROSES PESANAN"
}
\ No newline at end of file
view/Auth.js
View file @ c102a7a4
......@@ -513,7 +513,7 @@ class Auth extends React.Component {
fontSize: 20,
color: 'white',
textAlign: 'center'
}, title: 'SHOPPING CART'
}, title: i18n.t('headerShoppingCart')
}} />
<Stack.Screen name="Order History" component={OrderHistory} />
<Stack.Screen name="Reward History" component={RewardHistory}
......@@ -721,7 +721,7 @@ class Auth extends React.Component {
color: 'white',
fontSize: 20,
},
title: 'CONFIRM YOUR ORDER'
title: i18n.t('headerConfirmOrder')
}} />
<Stack.Screen name="Date Time" component={DateTime} />
<Stack.Screen name="New Register" component={NewRegister}
......
view/ChangePassword.js
View file @ c102a7a4
......@@ -29,7 +29,7 @@ class ChangePassword extends React.Component {
"password": this.state.Password,
"password_confirmation": this.state.Password_confirmation
}
Axios.post(this.props.BASE_URL+'crm/v2/auth/change_password', params).then(res => {
Axios.post(this.props.BASE_URL + 'crm/v2/auth/change_password', params).then(res => {
this.props.navigation.navigate('Profile');
Toast.show('Ganti Password Berhasil')
}).catch(error => {
......@@ -88,8 +88,8 @@ class ChangePassword extends React.Component {
<Button title="Change Password" onPress={() => this.changePassword()}></Button>
</View> */}
<TouchableOpacity onPress={() => this.changePassword()}>
<View style={styles.button}>
<TouchableOpacity onPress={() => this.changePassword()} style={styles.button}>
<View>
<Text style={{ color: 'white', fontSize: 16, fontFamily: 'Gotham-Black' }}>{i18n.t('changepassword')}</Text>
</View>
</TouchableOpacity>
......@@ -148,10 +148,10 @@ const styles = StyleSheet.create({
button: {
backgroundColor: '#CFB368',
marginTop: 50,
marginHorizontal: 100,
marginHorizontal: 80,
borderRadius: 10,
padding:10,
height:40,
padding: 10,
height: 40,
alignItems: 'center',
justifyContent: 'center'
},
......@@ -162,7 +162,7 @@ const mapStateToProps = (state) => {
return {
session_id: state.session_id,
language: state.language,
BASE_URL : state.BASE_URL
BASE_URL: state.BASE_URL
}
}
......
view/MenuConfirmation.js
View file @ c102a7a4
......@@ -9,6 +9,7 @@ import moment from 'moment'
import { FontAwesome } from '@expo/vector-icons';
import NumberFormat from 'react-number-format';
import MyStatusBar from './MyStatusBar';
import i18n from 'i18n-js';
class MenuConfirmation extends React.Component {
constructor(props) {
super(props)
......@@ -250,18 +251,18 @@ class MenuConfirmation extends React.Component {
{
this.props.type_pickup == true ? (
<View style={{ flex: 0.2, justifyContent: 'center' }}>
<Text style={{ textAlign: 'right', fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>PICKUP</Text>
<Text style={{ textAlign: 'right', fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>{i18n.t('pickup')}</Text>
</View>
) : (
<View style={{ flex: 0.2, justifyContent: 'center' }}>
<Text style={{ textAlign: 'right', fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>DELIVERY</Text>
<Text style={{ textAlign: 'right', fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>{i18n.t('delivery')}</Text>
</View>
)
}
</View>
<View style={{ marginHorizontal: 10, paddingLeft: 10 }}>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>PESANAN</Text>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>{i18n.t('yourOrders')}</Text>
</View>
{
this.props.order_item.map((item, index) => {
......@@ -285,7 +286,7 @@ class MenuConfirmation extends React.Component {
(item.note == undefined || item.note == "") ? (
null
) : (
<Text style={{ fontSize: 10, fontFamily: 'Gotham-Light', color: '#838383' }}>Keterangan : {item.note} </Text>
<Text style={{ fontSize: 10, fontFamily: 'Gotham-Light', color: '#838383' }}>{i18n.t('note')} : {item.note} </Text>
)
}
......@@ -314,7 +315,7 @@ class MenuConfirmation extends React.Component {
</View>
<TouchableOpacity onPress={() => this.props.navigation.navigate('Reward Detail', { rewardId: this.props.voucher.id })}>
<View style={{ flex: 0.2, marginVertical: 10, paddingRight: 5 }}>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#CFB368' }}>View Detail</Text>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#CFB368' }}>{i18n.t('viewDetail')}</Text>
</View>
</TouchableOpacity>
</View>
......@@ -322,11 +323,11 @@ class MenuConfirmation extends React.Component {
)
}
<View style={{ borderTopWidth: 1, borderColor: '#838383', marginHorizontal: 10, paddingLeft: 10, padding: 10 }}>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>PAYMENT</Text>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>{i18n.t('payment')}</Text>
</View>
<View style={{ flex: 1, flexDirection: 'row', justifyContent: 'space-between', marginTop: -10 }}>
<View style={{ flex: 0.5, margin: 10, paddingLeft: 20 }}>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>Balance Used</Text>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>{i18n.t('balanceUsed')}</Text>
</View>
<View style={{ flex: 0.5, margin: 10, alignItems: 'flex-end', paddingRight: 5 }}>
{/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light' }}>{this.props.route.params.balanceUsed}</Text> */}
......@@ -335,7 +336,7 @@ class MenuConfirmation extends React.Component {
</View>
<View style={{ flex: 1, flexDirection: 'row', justifyContent: 'space-between', marginTop: -10 }}>
<View style={{ flex: 0.5, margin: 10, paddingLeft: 20 }}>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>Point Used</Text>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>{i18n.t('pointUsed')}</Text>
</View>
<View style={{ flex: 0.5, margin: 10, alignItems: 'flex-end', paddingRight: 5 }}>
{/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light' }}>{this.props.route.params.pointused}</Text> */}
......@@ -344,7 +345,7 @@ class MenuConfirmation extends React.Component {
</View>
<View style={{ borderTopWidth: 1, borderColor: '#838383', margin: 10, paddingLeft: 10, padding: 10, paddingBottom: -10, flexDirection: 'row', justifyContent: 'space-between', flex: 1 }}>
<View style={{ flex: 0.6 }}>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>Harga</Text>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>{i18n.t('price')}</Text>
</View>
<View style={{ flex: 0.4, marginRight: -5 }}>
{/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', textAlign: 'right', color:'#838383' }}>{total}</Text> */}
......@@ -357,7 +358,7 @@ class MenuConfirmation extends React.Component {
) : (
<View style={{ margin: 10, marginTop: -10, paddingLeft: 10, padding: 10, paddingBottom: -10, flexDirection: 'row', justifyContent: 'space-between', flex: 1 }}>
<View style={{ flex: 0.6 }}>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>Voucher</Text>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>{i18n.t('discount')}</Text>
</View>
<View style={{ flex: 0.4, marginRight: -5 }}>
{/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', textAlign: 'right', color:'#838383' }}>- {this.props.voucher.reward.value}</Text> */}
......@@ -372,7 +373,7 @@ class MenuConfirmation extends React.Component {
) : (
<View style={{ margin: 10, marginTop: -10, paddingLeft: 10, padding: 10, paddingBottom: -10, flexDirection: 'row', justifyContent: 'space-between', flex: 1 }}>
<View style={{ flex: 0.6 }}>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>Ongkos Kirim</Text>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>{i18n.t('rateDelivery')}</Text>
</View>
<View style={{ flex: 0.4, marginRight: -5 }}>
{/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', textAlign: 'right' }}>{this.props.grabamount}</Text> */}
......@@ -383,7 +384,7 @@ class MenuConfirmation extends React.Component {
}
<View style={{ marginVertical: 10, marginHorizontal: 9, paddingHorizontal: 10, flexDirection: 'row', justifyContent: 'space-between', flex: 1 }}>
<View style={{ flex: 0.6 }}>
<Text style={{ fontSize: 20, fontFamily: 'Gotham-Black', color: '#CFB368' }}>Total</Text>
<Text style={{ fontSize: 20, fontFamily: 'Gotham-Black', color: '#CFB368' }}>{i18n.t('total')}</Text>
</View>
{
this.props.value_voucher == '' ? (
......@@ -478,7 +479,7 @@ class MenuConfirmation extends React.Component {
</View> */}
<TouchableOpacity onPress={() => this.setOrder(this.props.type_pickup)}>
<View style={styles.button}>
<Text style={{ color: 'white', fontSize: 16, fontFamily: 'Gotham-Black' }}>Proses Pesanan</Text>
<Text style={{ color: 'white', fontSize: 16, fontFamily: 'Gotham-Black' }}>{i18n.t('orderProcess')}</Text>
</View>
</TouchableOpacity>
<View style={{ height: 30 }} />
......
view/ShoppingCart.js
View file @ c102a7a4
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