Skip to content

C
clone_excelso
Commit 62271999 authored by Trisno's avatar Trisno
Browse files
Options

translate order

parent 179e48f2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 44 deletions
lib/en.json
View file @ 62271999
...@@ -121,7 +121,13 @@ ...@@ -121,7 +121,13 @@
"paymentDetails":"PAYMENT DETAILS", "paymentDetails":"PAYMENT DETAILS",
"note":"Note", "note":"Note",
"headerConfirmOrder":"CONFIRM YOUR ORDER", "headerConfirmOrder":"CONFIRM YOUR ORDER",
"orderProcess":"ORDER PROCESS" "orderProcess":"ORDER PROCESS",
"seeOrderDetail":"See Order Detail",
"lookingForDriver":"Looking For Driver",
"help":"HELP",
"youRated":"You Rated",
"rateOrder":"Rate Order"
} }
\ No newline at end of file
lib/id.json
View file @ 62271999
...@@ -121,7 +121,12 @@ ...@@ -121,7 +121,12 @@
"yourBalanceUsed": "Saldo Kamu Digunakan", "yourBalanceUsed": "Saldo Kamu Digunakan",
"yourPointsUsed": "Poin Kamu Digunakan", "yourPointsUsed": "Poin Kamu Digunakan",
"paymentDetails": "DETAIL PEMBAYARAN", "paymentDetails": "DETAIL PEMBAYARAN",
"note":"Keterangan", "note": "Keterangan",
"headerConfirmOrder":"CONFIRM YOUR ORDER@", "headerConfirmOrder": "CONFIRM YOUR ORDER@",
"orderProcess":"PROSES PESANAN" "orderProcess": "PROSES PESANAN",
"seeOrderDetail": "Lihat Detail Pemesanan",
"lookingForDriver": "Mencari Driver",
"help": "BANTUAN",
"youRated": "You Rated@",
"rateOrder": "Rate Order@"
} }
\ No newline at end of file
view/OrderDetail.js
View file @ 62271999
This diff is collapsed.
view/OrderHistory.js
View file @ 62271999
...@@ -43,28 +43,28 @@ class OrderHistory extends React.Component { ...@@ -43,28 +43,28 @@ class OrderHistory extends React.Component {
let params = { let params = {
session_id: this.props.session_id session_id: this.props.session_id
} }
Axios.post(this.props.BASE_URL+'crm/v2/transaction/list', params).then(res => { Axios.post(this.props.BASE_URL + 'crm/v2/transaction/list', params).then(res => {
let data = res.data.data let data = res.data.data
// console.log(data) // console.log(data)
data.map((item) => { data.map((item) => {
if (item.trans_status_display == 'On Queue') { if (item.trans_status_display == 'On Queue') {
item.trans_status_display = 'Queueing' item.trans_status_display = 'Queueing'
} else } else
if (item.trans_status_display == 'On Process') { if (item.trans_status_display == 'On Process') {
item.trans_status_display = 'Processing' item.trans_status_display = 'Processing'
} else } else
if (item.trans_status_display == 'Ready to Pickup') { if (item.trans_status_display == 'Ready to Pickup') {
item.trans_status_display = 'Ready for Pickup' item.trans_status_display = 'Ready for Pickup'
} else } else
if (item.trans_status_display == 'On Delivery') { if (item.trans_status_display == 'On Delivery') {
item.trans_status_display = 'Delivering' item.trans_status_display = 'Delivering'
} else } else
if (item.trans_status_display == 'On Completed') { if (item.trans_status_display == 'On Completed') {
item.trans_status_display = 'Completed' item.trans_status_display = 'Completed'
} else } else
if (item.trans_status_display == 'Cancelled') { if (item.trans_status_display == 'Cancelled') {
item.trans_status_display = 'Cancelled' item.trans_status_display = 'Cancelled'
} }
// console.log(data) // console.log(data)
}) })
...@@ -94,18 +94,18 @@ class OrderHistory extends React.Component { ...@@ -94,18 +94,18 @@ class OrderHistory extends React.Component {
this.state.order_list.map((item, key) => ( this.state.order_list.map((item, key) => (
<TouchableOpacity key={key} onPress={() => this.props.navigation.navigate('Order Detail', { idTrans: item.id })}> <TouchableOpacity key={key} onPress={() => this.props.navigation.navigate('Order Detail', { idTrans: item.id })}>
<View style={{ marginTop: 5 }} key={key}> <View style={{ marginTop: 5 }} key={key}>
<View style={{ flex: 2, height: 120, margin: 5, borderRadius: 5, borderWidth: 1, borderColor:'#838383', flexDirection: 'row' }}> <View style={{ flex: 2, height: 120, margin: 5, borderRadius: 5, borderWidth: 1, borderColor: '#838383', flexDirection: 'row' }}>
<View style={{ flex:1.1, justifyContent: 'center', margin: 10}}> <View style={{ flex: 1.1, justifyContent: 'center', margin: 10 }}>
<Text style={{ fontFamily: 'Gotham-Black', color: 'grey', fontSize: 12, margin: 2 }}>{item.outlet}</Text> <Text style={{ fontFamily: 'Gotham-Black', color: 'grey', fontSize: 12, margin: 2 }}>{item.outlet}</Text>
<Text style={{ fontFamily: 'Gotham-Light', color: 'grey', fontSize: 12, margin: 2 }}>{moment(item.trans_time).format("DD MMMM YYYY, hh:mm A")}</Text> <Text style={{ fontFamily: 'Gotham-Light', color: 'grey', fontSize: 12, margin: 2 }}>{moment(item.trans_time).format("DD MMMM YYYY, hh:mm A")}</Text>
<Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 12, margin: 2 }}>{item.trans_type_display}</Text> <Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 12, margin: 2 }}>{item.trans_type_display}</Text>
<TouchableOpacity onPress={() => this.props.navigation.navigate('Order Detail', { idTrans: item.id })}> <TouchableOpacity onPress={() => this.props.navigation.navigate('Order Detail', { idTrans: item.id })}>
<View style={{ height: 40, borderRadius: 10, backgroundColor: '#CFB368', justifyContent: 'center', marginVertical:5 }}> <View style={{ height: 40, borderRadius: 10, backgroundColor: '#CFB368', justifyContent: 'center', marginVertical: 5 }}>
<Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 12, textAlign: 'center',paddingHorizontal:5}}>Lihat Detail Pemesanan</Text> <Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 12, textAlign: 'center', paddingHorizontal: 5 }}>{i18n.t('seeOrderDetail')}</Text>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
<View style={{ flex:0.9, justifyContent: 'center', alignItems:'center', margin: 10, marginLeft: 15, borderLeftWidth: 1, borderColor: '#838383' }}> <View style={{ flex: 0.9, justifyContent: 'center', alignItems: 'center', margin: 10, marginLeft: 15, borderLeftWidth: 1, borderColor: '#838383' }}>
<View> <View>
<Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 12 }}>{item.trans_status_display}</Text> <Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 12 }}>{item.trans_status_display}</Text>
</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