Skip to content

C
clone_excelso
Commit 17dbae23 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 

# Conflicts:
#	view/Home.js
parents 9ff85470 ec44f125
Show whitespace changes
Inline Side-by-side
Showing with 105 additions and 46 deletions
app.json
View file @ 17dbae23
{ {
"expo": { "expo": {
"extra" : {
"buildNumber" : "100",
"remarks": ""
},
"name": "Excelso CRM", "name": "Excelso CRM",
"slug": "excelso-crm", "slug": "excelso-crm",
"privacy": "public", "privacy": "public",
...@@ -9,10 +14,9 @@ ...@@ -9,10 +14,9 @@
"android", "android",
"web" "web"
], ],
"androidStatusBar": {
"hidden": "true"
},
"version": "2.0.0", "version": "2.0.0",
"orientation": "portrait", "orientation": "portrait",
"icon": "./assets/excelso.png", "icon": "./assets/excelso.png",
"splash": { "splash": {
...@@ -29,14 +33,14 @@ ...@@ -29,14 +33,14 @@
"ios": { "ios": {
"supportsTablet": true, "supportsTablet": true,
"bundleIdentifier": "id.web.ravintola.excelsocrm", "bundleIdentifier": "id.web.ravintola.excelsocrm",
"buildNumber": "2006250900", "buildNumber": "2006290000",
"config": { "config": {
"googleMapsApiKey": "AIzaSyCvIFNvXKmBNetqPrV4VnjvF772avYbA3M" "googleMapsApiKey": "AIzaSyCvIFNvXKmBNetqPrV4VnjvF772avYbA3M"
} }
}, },
"android": { "android": {
"package": "id.web.ravintola.excelsocrm", "package": "id.web.ravintola.excelsocrm",
"versionCode": 2006250900, "versionCode": 2006290000,
"config": { "config": {
"googleMaps": { "googleMaps": {
"apiKey": "AIzaSyAcCfuNHVFstDUE-ZDafWsiUmA3ON79cqo" "apiKey": "AIzaSyAcCfuNHVFstDUE-ZDafWsiUmA3ON79cqo"
......
lib/en.json
View file @ 17dbae23
...@@ -144,5 +144,7 @@ ...@@ -144,5 +144,7 @@
"alertyes":"Yes", "alertyes":"Yes",
"alertno":"No", "alertno":"No",
"active": "Active", "active": "Active",
"alertreedemexpired":"Sorry, the redemption code has expired, please cancel!" "alertreedemexpired":"Sorry, the redemption code has expired, please cancel!",
"taxincluded":"(Tax Included)",
"tax":"Tax"
} }
\ No newline at end of file
lib/id.json
View file @ 17dbae23
...@@ -146,6 +146,8 @@ ...@@ -146,6 +146,8 @@
"alertyes":"Ya", "alertyes":"Ya",
"alertno":"Tidak", "alertno":"Tidak",
"active": "Aktif ", "active": "Aktif ",
"alertreedemexpired":"Mohon maaf kode redeem sudah tidak berlaku, Mohon Batalkan !" "alertreedemexpired":"Mohon maaf kode redeem sudah tidak berlaku, Mohon Batalkan !",
"taxincluded":"(Harga sudah termasuk pajak)",
"tax":"Pajak"
} }
\ No newline at end of file
view/Account.js
View file @ 17dbae23
...@@ -483,11 +483,8 @@ class Account extends React.Component { ...@@ -483,11 +483,8 @@ class Account extends React.Component {
} }
<View style={{ flex: 1, marginBottom: 20, marginTop: 25 }}> <View style={{ flex: 1, marginBottom: 20, marginTop: 25 }}>
{Platform.OS === 'ios' ? ( <Text style={{ color: 'grey', fontSize: 12, textAlign: 'center' }}>Version {Constants.manifest.version} Build {Constants.manifest.extra.buildNumber}</Text>
<Text style={{ color: 'grey', fontSize: 12, textAlign: 'center' }}>Version {Constants.manifest.version} Build {Constants.manifest.ios.buildNumber}</Text> <Text style={{ color: 'grey', fontSize: 12, textAlign: 'center' }}>{Constants.manifest.extra.remarks}</Text>
) : (
<Text style={{ color: 'grey', fontSize: 12, textAlign: 'center' }}>Version {Constants.manifest.version} Build {Constants.manifest.android.versionCode}</Text>
)}
</View> </View>
</ScrollView> </ScrollView>
......
view/Auth.js
View file @ 17dbae23
...@@ -184,7 +184,21 @@ class Auth extends React.Component { ...@@ -184,7 +184,21 @@ class Auth extends React.Component {
}, },
title: 'SETTING URL' title: 'SETTING URL'
}} /> }} />
<Stack.Screen name="Home" component={Home} /> {/* <Stack.Screen name="Home" component={Home} /> */}
<Stack.Screen name="Home" component={HomePage}
options={{
headerShown: false,
headerRight: props => <HandleInbox {...props} />,
title: 'TODAY PROMOTION',
headerStyle: { backgroundColor: '#CFB368' },
headerTitleContainerStyle: { alignContent: 'center' },
headerTitleStyle: {
alignSelf: 'center',
fontFamily: 'Gotham-Black',
color: 'white',
textAlign: 'center'
}
}} />
<Stack.Screen name="Profile" component={ProfilePage} options={{ <Stack.Screen name="Profile" component={ProfilePage} options={{
headerStyle: { backgroundColor: '#CFB368' }, headerStyle: { backgroundColor: '#CFB368' },
headerTitleContainerStyle: { alignContent: 'center' }, headerTitleContainerStyle: { alignContent: 'center' },
......
view/Home.js
View file @ 17dbae23
...@@ -289,7 +289,10 @@ class Home extends React.Component { ...@@ -289,7 +289,10 @@ class Home extends React.Component {
}) })
} }
<<<<<<< HEAD
=======
>>>>>>> ec44f1258a343da5f41e3439f3f9aeeaa56bb661
onClickClaimCredit() { onClickClaimCredit() {
Alert.alert( Alert.alert(
"", "",
...@@ -306,7 +309,7 @@ class Home extends React.Component { ...@@ -306,7 +309,7 @@ class Home extends React.Component {
], ],
{ cancelable: false }, { cancelable: false },
) )
} }
render() { render() {
const {navigation} = this.props const {navigation} = this.props
...@@ -318,14 +321,15 @@ class Home extends React.Component { ...@@ -318,14 +321,15 @@ class Home extends React.Component {
return ( return (
<View style={styles.container}> <View style={styles.container}>
<StatusBar /> <StatusBar backgroundColor='#CFB368' />
<ScrollView> <ScrollView>
<View style={{ flex: 6 }}> <View style={{ flex: 6 }}>
<View style={styles.header}> <View style={styles.header}>
<View style={{ flex: 1, alignItems: 'flex-end' }}> <View style={{ flex: 0.1, padding: 15 }} />
<View style={{ flex: 0.8, alignItems: 'center', padding: 15 }}>
<Text style={styles.titleText}>{i18n.t('promotion')}</Text> <Text style={styles.titleText}>{i18n.t('promotion')}</Text>
</View> </View>
<View style={{ margin: 15, flex: 0.15, alignItems: 'flex-end' }}> <View style={{ padding: 15, flex: 0.1, alignItems: 'flex-end' }}>
<TouchableOpacity onPress={() => this.props.navigation.navigate('Inbox List')}> <TouchableOpacity onPress={() => this.props.navigation.navigate('Inbox List')}>
<SimpleLineIcons name="bell" size={24} color="white" /> <SimpleLineIcons name="bell" size={24} color="white" />
{ {
...@@ -529,7 +533,7 @@ class Home extends React.Component { ...@@ -529,7 +533,7 @@ class Home extends React.Component {
<View style={{ flex: 1, height: 80, borderRadius: 20, marginRight: 10, marginLeft: 10, justifyContent: 'center' }}> <View style={{ flex: 1, height: 80, borderRadius: 20, marginRight: 10, marginLeft: 10, justifyContent: 'center' }}>
<NumberFormat decimalScale={0} value={this.state.old_balance} renderText={value => <Text style={{ fontSize: 14, fontFamily: 'Gotham-Light', textAlign: 'center', marginBottom: 10, color: '#838383' }}>CREDIT : Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} /> <NumberFormat decimalScale={0} value={this.state.old_balance} renderText={value => <Text style={{ fontSize: 14, fontFamily: 'Gotham-Light', textAlign: 'center', marginBottom: 10, color: '#838383' }}>CREDIT : Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} />
<View style={{ justifyContent: 'center' }}> <View style={{ justifyContent: 'center' }}>
<TouchableOpacity onPress={() => this.handleClaimCredit()}> <TouchableOpacity onPress={() => this.onClickClaimCredit()}>
<View style={{ height: 40, borderRadius: 10, backgroundColor: '#CFB368', marginRight: 20, marginLeft: 20, justifyContent: 'center' }}> <View style={{ height: 40, borderRadius: 10, backgroundColor: '#CFB368', marginRight: 20, marginLeft: 20, justifyContent: 'center' }}>
<Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 20, textAlign: 'center', margin: 15 }}>CLAIM CREDIT</Text> <Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 20, textAlign: 'center', margin: 15 }}>CLAIM CREDIT</Text>
</View> </View>
...@@ -656,6 +660,16 @@ class Home extends React.Component { ...@@ -656,6 +660,16 @@ class Home extends React.Component {
<Text style={{ textAlign: 'center', color: 'white', fontFamily: 'Gotham-Black', fontSize: 14 }}>{i18n.t('topup')}</Text> <Text style={{ textAlign: 'center', color: 'white', fontFamily: 'Gotham-Black', fontSize: 14 }}>{i18n.t('topup')}</Text>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
<<<<<<< HEAD
</View>
<View style={{ justifyContent: 'center', flex: 1 }}>
<TouchableOpacity onPress={() => this.onClickClaimCredit()}>
<View style={{ height: 40, borderRadius: 10, backgroundColor: '#CFB368', marginRight: 20, marginLeft: 20, justifyContent: 'center' }}>
<Text style={{ textAlign: 'center', color: 'white', fontFamily: 'Gotham-Black', fontSize: 14 }}>{i18n.t('usebalance')}</Text>
</View>
</TouchableOpacity>
</View>
=======
</View> </View>
<View style={{ justifyContent: 'center', flex: 1 }}> <View style={{ justifyContent: 'center', flex: 1 }}>
<TouchableOpacity onPress={() => this.onClickClaimCredit()}> <TouchableOpacity onPress={() => this.onClickClaimCredit()}>
...@@ -664,6 +678,7 @@ class Home extends React.Component { ...@@ -664,6 +678,7 @@ class Home extends React.Component {
</View> </View>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
>>>>>>> ec44f1258a343da5f41e3439f3f9aeeaa56bb661
</View> </View>
<View style={{ height: 40 }}></View> <View style={{ height: 40 }}></View>
</View> </View>
...@@ -683,11 +698,11 @@ const styles = StyleSheet.create({ ...@@ -683,11 +698,11 @@ const styles = StyleSheet.create({
flex: 0.1, flex: 0.1,
flexDirection: 'row', flexDirection: 'row',
backgroundColor: '#CFB368', backgroundColor: '#CFB368',
paddingTop: StatusBar.currentHeight
// justifyContent: 'space-between', // justifyContent: 'space-between',
// alignItems: 'center' // alignItems: 'center'
}, },
titleText: { titleText: {
margin: 15,
fontSize: 20, fontSize: 20,
// fontWeight: 'bold', // fontWeight: 'bold',
fontFamily: 'Gotham-Black', fontFamily: 'Gotham-Black',
......
view/MenuSelection.js
View file @ 17dbae23
...@@ -298,8 +298,8 @@ class MenuSelection extends React.Component { ...@@ -298,8 +298,8 @@ class MenuSelection extends React.Component {
render() { render() {
return ( return (
<View style={styles.container}> <View style={styles.container}>
<StatusBar/> <StatusBar backgroundColor='#CFB368'/>
<View style={{ flex: 0.5, height: 50, flexDirection: 'row' }}> <View style={{ flex: 0.5, height: 50, flexDirection: 'row', paddingTop: StatusBar.currentHeight }}>
<FlatList horizontal={true} style={{ flexDirection: 'row' }} <FlatList horizontal={true} style={{ flexDirection: 'row' }}
showsHorizontalScrollIndicator={false} showsHorizontalScrollIndicator={false}
data={this.state.listCategory} data={this.state.listCategory}
......
view/OrderDetail.js
View file @ 17dbae23
...@@ -542,6 +542,31 @@ class OrderDetail extends React.Component { ...@@ -542,6 +542,31 @@ class OrderDetail extends React.Component {
<NumberFormat decimalScale={0} value={this.state.detail_trans.trans_subtotal} renderText={value => <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: 'grey', textAlign: 'right' }}>Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} /> <NumberFormat decimalScale={0} value={this.state.detail_trans.trans_subtotal} renderText={value => <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: 'grey', textAlign: 'right' }}>Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} />
</View> </View>
</View> </View>
{
this.state.detail_trans.trans_type == 3 ? (
<View style={{ marginHorizontal: 10, flexDirection: 'row', justifyContent: 'space-between', flex: 1 }}>
<View style={{ flex: 0.5, marginLeft: 10, marginVertical: 5 }}>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: 'grey' }}>{i18n.t('tax')}</Text>
</View>
<View style={{ flex: 0.5, marginVertical: 5, alignItems: 'flex-end', marginRight: 10 }}>
{/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', textAlign: 'right' }}>{this.state.detail_trans.trans_subtotal}</Text> */}
<NumberFormat decimalScale={0} value={this.state.detail_trans.trans_tax} renderText={value => <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: 'grey', textAlign: 'right' }}>Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} />
</View>
</View>
) : (
<View style={{ marginHorizontal: 10, flexDirection: 'row', justifyContent: 'space-between', flex: 1 }}>
<View style={{ flex: 0.5, marginLeft: 10, marginVertical: 5 }}>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: 'grey' }}>{i18n.t('taxincluded')}</Text>
</View>
{/* <View style={{ flex: 0.5, marginVertical: 5, alignItems: 'flex-end', marginRight: 10 }}> */}
{/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', textAlign: 'right' }}>{this.state.detail_trans.trans_subtotal}</Text> */}
{/* <NumberFormat decimalScale={0} value={this.state.detail_trans.trans_tax} renderText={value => <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: 'grey', textAlign: 'right' }}>Rp. {value}</Text>} displayType={'text'} thousandSeparator={true} prefix={''} /> */}
{/* </View> */}
</View>
)
}
{ {
this.state.detail_trans != '' ? ( this.state.detail_trans != '' ? (
this.state.detail_trans.used_reward.length ? ( this.state.detail_trans.used_reward.length ? (
......
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