Skip to content

N
new_excelso
Commit 40abadf3 authored by Trisno's avatar Trisno
Browse files
Options

add tax if trans type dine in, else 'Tax Included'

parent c13a6ea2
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 4 deletions
app.json
View file @ 40abadf3
......@@ -29,14 +29,14 @@
"ios": {
"supportsTablet": true,
"bundleIdentifier": "id.web.ravintola.excelsocrm",
"buildNumber": "2006250900",
"buildNumber": "2006261600",
"config": {
"googleMapsApiKey": "AIzaSyCvIFNvXKmBNetqPrV4VnjvF772avYbA3M"
}
},
"android": {
"package": "id.web.ravintola.excelsocrm",
"versionCode": 2006250900,
"versionCode": 2006261600,
"config": {
"googleMaps": {
"apiKey": "AIzaSyAcCfuNHVFstDUE-ZDafWsiUmA3ON79cqo"
......
lib/en.json
View file @ 40abadf3
......@@ -144,5 +144,7 @@
"alertyes":"Yes",
"alertno":"No",
"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 @ 40abadf3
......@@ -146,6 +146,8 @@
"alertyes":"Ya",
"alertno":"Tidak",
"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/OrderDetail.js
View file @ 40abadf3
......@@ -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={''} />
</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.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