Skip to content

N
new_excelso
Commit 0e7652ba 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 51963584 3c2fa17b
Show whitespace changes
Inline Side-by-side
Showing with 44 additions and 23 deletions
package-lock.json
View file @ 0e7652ba
...@@ -5003,9 +5003,9 @@ ...@@ -5003,9 +5003,9 @@
} }
}, },
"moment": { "moment": {
"version": "2.24.0", "version": "2.25.3",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", "resolved": "https://registry.npmjs.org/moment/-/moment-2.25.3.tgz",
"integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" "integrity": "sha512-PuYv0PHxZvzc15Sp8ybUCoQ+xpyPWvjOuK72a5ovzp2LI32rJXOiIfyoFoYvG3s6EwwrdkMyWuRiEHSZRLJNdg=="
}, },
"morgan": { "morgan": {
"version": "1.9.1", "version": "1.9.1",
......
package.json
View file @ 0e7652ba
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
"expo-location": "^8.0.0", "expo-location": "^8.0.0",
"expo-permissions": "^8.0.0", "expo-permissions": "^8.0.0",
"i18n-js": "^3.5.1", "i18n-js": "^3.5.1",
"moment": "^2.25.3",
"native-base": "2.13.8", "native-base": "2.13.8",
"react": "~16.9.0", "react": "~16.9.0",
"react-currency-format": "^1.0.0", "react-currency-format": "^1.0.0",
......
view/RewardsList.js
View file @ 0e7652ba
...@@ -3,6 +3,7 @@ import { View, Text, Image, StyleSheet, ScrollView, Alert, TouchableOpacity } fr ...@@ -3,6 +3,7 @@ import { View, Text, Image, StyleSheet, ScrollView, Alert, TouchableOpacity } fr
import { Card } from 'react-native-shadow-cards' import { Card } from 'react-native-shadow-cards'
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import Axios from 'axios'; import Axios from 'axios';
import moment from 'moment'
class RewardsList extends React.Component { class RewardsList extends React.Component {
constructor(props) { constructor(props) {
...@@ -20,48 +21,67 @@ class RewardsList extends React.Component { ...@@ -20,48 +21,67 @@ class RewardsList extends React.Component {
}); });
} }
componentWillUnmount () { componentWillUnmount() {
this._unsubscribe() this._unsubscribe()
} }
getRewardsList () { getRewardsList() {
let params = { let params = {
session_id: this.props.session_id session_id: this.props.session_id
} }
Axios.post('https://excelsocrm.ravintoladev.com/crm/v2/reward/get_list', params).then(res => { Axios.post('https://excelsocrm.ravintoladev.com/crm/v2/reward/get_list', params).then(res => {
let data = res.data.rewards let data = res.data.rewards
// console.log(data) // console.log(data)
data.map((item,key) => {
// console.log(item.expire_time)
item.expire_time = moment(item.expire_time).format("DD MMMM YYYY")
})
// console.log(data)
this.setState({ this.setState({
rewardsList: data rewardsList: data
}) })
}).catch(error => { }).catch(error => {
let response = error.response.data; let response = error.response.data;
Alert.alert(response.status,response.msg); Alert.alert(response.status, response.msg);
}) })
} }
render() { render() {
return( return (
<View style={styles.container}> <View style={styles.container}>
<View style={styles.header}> <View style={styles.header}>
<Text style={{color:'white', textAlign :'center', fontSize: 28}}>REWARDS E-VOUCHER</Text> <Text style={{ color: 'white', textAlign: 'center', fontSize: 28 }}>REWARDS E-VOUCHER</Text>
</View> </View>
<ScrollView style={styles.body}> <ScrollView style={styles.body}>
{ {
this.state.rewardsList.map((item,key) => ( this.state.rewardsList.map((item, key) => (
<TouchableOpacity key={key} onPress={() => this.props.navigation.navigate('Reward Detail', {rewardId:item.id})}> <TouchableOpacity key={key} onPress={() => this.props.navigation.navigate('Reward Detail', { rewardId: item.id })}>
<View style={{ alignItems: 'center' }}>
<Card style={{ padding: 5, margin: 10 }}>
<View>
<Image source={{ uri: item.reward.title_image }} <Image source={{ uri: item.reward.title_image }}
resizeMethod="resize" resizeMethod="scale"
resizeMode='contain' resizeMode='stretch'
style={{ height: 250, width:'100%'}}/> style={{ height: 150, width: 430 }} />
{/* <Text>{item.reward.title}</Text> </View>
<Text>{item.reward.subtitle}</Text> */} <View style={{ flexDirection: 'row', justifyContent:'space-between', padding:10 }}>
<View>
<Text>{item.reward.title}</Text>
<Text>{item.reward.subtitle}</Text>
</View>
<View>
<Text style={{textAlign:'right'}}>Expired</Text>
<Text style={{textAlign:'right'}}>{item.expire_time}</Text>
</View>
</View>
</Card>
</View>
</TouchableOpacity> </TouchableOpacity>
)) ))
} }
<TouchableOpacity> <TouchableOpacity>
<Text style={{textAlign:'right', color:'#ccb46c'}}>REDEEM E-VOUCHER HISTORY</Text> <Text style={{ textAlign: 'right', color: '#ccb46c' }}>REDEEM E-VOUCHER HISTORY</Text>
</TouchableOpacity> </TouchableOpacity>
</ScrollView> </ScrollView>
</View> </View>
...@@ -76,8 +96,8 @@ const styles = StyleSheet.create({ ...@@ -76,8 +96,8 @@ const styles = StyleSheet.create({
}, },
header: { header: {
flex: 0.1, flex: 0.1,
backgroundColor:'#ccb46c', backgroundColor: '#ccb46c',
justifyContent:'center' justifyContent: 'center'
}, },
body: { body: {
......
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