Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
N
new_excelso
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Prasetya Saputra
new_excelso
Commits
49199f65
Commit
49199f65
authored
May 28, 2020
by
Trisno
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update order
parent
6854a17e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
90 additions
and
68 deletions
+90
-68
OrderDetail.js
view/OrderDetail.js
+88
-66
OrderHistory.js
view/OrderHistory.js
+2
-2
No files found.
view/OrderDetail.js
View file @
49199f65
...
@@ -23,7 +23,7 @@ class OrderDetail extends React.Component {
...
@@ -23,7 +23,7 @@ class OrderDetail extends React.Component {
detail_trans
:
''
,
detail_trans
:
''
,
trans_status
:
''
,
trans_status
:
''
,
modalVisible
:
false
,
modalVisible
:
false
,
reason
:
''
reason
:
''
}
}
...
@@ -55,7 +55,7 @@ class OrderDetail extends React.Component {
...
@@ -55,7 +55,7 @@ class OrderDetail extends React.Component {
handleOrderCancel
()
{
handleOrderCancel
()
{
// console.log(this.state.reason)
// console.log(this.state.reason)
let
params
=
{
let
params
=
{
session_id
:
this
.
props
.
session_id
,
session_id
:
this
.
props
.
session_id
,
transaction_id
:
this
.
props
.
route
.
params
.
idTrans
,
transaction_id
:
this
.
props
.
route
.
params
.
idTrans
,
...
@@ -82,6 +82,7 @@ class OrderDetail extends React.Component {
...
@@ -82,6 +82,7 @@ class OrderDetail extends React.Component {
// console.log("PARAMETER : " + JSON.stringify(params))
// console.log("PARAMETER : " + JSON.stringify(params))
Axios
.
post
(
'https://excelsocrm.ravintoladev.com/crm/v2/transaction/detail'
,
params
).
then
(
res
=>
{
Axios
.
post
(
'https://excelsocrm.ravintoladev.com/crm/v2/transaction/detail'
,
params
).
then
(
res
=>
{
let
data
=
res
.
data
let
data
=
res
.
data
// console.log('ini data' + JSON.stringify(data))
// console.log("INI OUTLET "+ data.outlet)
// console.log("INI OUTLET "+ data.outlet)
// console.log("OUTLET-CODE" + data.outlet_code)
// console.log("OUTLET-CODE" + data.outlet_code)
// console.log("TRANS-DISPLAY" + data.trans_type_display)
// console.log("TRANS-DISPLAY" + data.trans_type_display)
...
@@ -110,7 +111,7 @@ class OrderDetail extends React.Component {
...
@@ -110,7 +111,7 @@ class OrderDetail extends React.Component {
}
}
render
()
{
render
()
{
//
console.log(this.state.detail_trans)
console
.
log
(
this
.
state
.
detail_trans
)
// console.log(this.state.detail_trans.used_reward)
// console.log(this.state.detail_trans.used_reward)
return
(
return
(
<
View
style
=
{
styles
.
container
}
>
<
View
style
=
{
styles
.
container
}
>
...
@@ -143,24 +144,26 @@ class OrderDetail extends React.Component {
...
@@ -143,24 +144,26 @@ class OrderDetail extends React.Component {
<
/Modal
>
<
/Modal
>
<
View
style
=
{
styles
.
header
}
>
<
View
style
=
{
styles
.
header
}
>
<
Text
style
=
{{
fontSize
:
16
,
fontFamily
:
'Gotham-Light'
,
textAlign
:
'center'
,
color
:
'grey'
}}
>
#
{
this
.
state
.
numberId
}
<
/Text
>
<
Text
style
=
{{
fontSize
:
20
,
fontFamily
:
'Gotham-Light'
,
textAlign
:
'center'
,
color
:
'grey'
}}
>
#
{
this
.
state
.
numberId
}
<
/Text
>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
textAlign
:
'center'
,
color
:
'grey'
}}
>
{
moment
(
this
.
state
.
detail_trans
.
trans_time
).
format
(
'DD MMMM YYYY HH:mm:ss'
)}
<
/Text
>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
textAlign
:
'center'
,
color
:
'grey'
}}
>
{
moment
(
this
.
state
.
detail_trans
.
trans_time
).
format
(
'DD MMMM YYYY HH:mm:ss'
)}
<
/Text
>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
textAlign
:
'center'
,
color
:
'grey'
}}
>
{
this
.
state
.
detail_trans
.
trans_status_display
}
<
/Text
>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
textAlign
:
'center'
,
color
:
'grey'
}}
>
{
this
.
state
.
detail_trans
.
trans_status_display
}
<
/Text
>
<
/View
>
<
/View
>
<
ScrollView
style
=
{
styles
.
body
}
>
<
ScrollView
style
=
{
styles
.
body
}
>
<
View
style
=
{{
flex
:
1
,
flexDirection
:
'row'
,
borderBottomWidth
:
1
,
borderColor
:
'grey'
,
margin
:
10
,
paddingBottom
:
3
0
,
padding
:
10
}}
>
<
View
style
=
{{
flex
:
1
,
flexDirection
:
'row'
,
borderBottomWidth
:
1
,
borderColor
:
'grey'
,
margin
Horizontal
:
1
0
,
padding
:
10
}}
>
<
View
style
=
{{
flex
:
0.1
,
justifyContent
:
'center'
}}
>
<
View
style
=
{{
flex
:
0.1
,
justifyContent
:
'center'
}}
>
<
FontAwesome
name
=
"map-marker"
size
=
{
24
}
color
=
"
red
"
/>
<
FontAwesome
name
=
"map-marker"
size
=
{
24
}
color
=
"
#d34343
"
/>
<
/View
>
<
/View
>
{
{
this
.
state
.
detail_trans
.
trans_type_display
==
'Pick Up'
?
(
this
.
state
.
detail_trans
.
trans_type_display
==
'Pick Up'
?
(
<
View
style
=
{{
flex
:
0.6
,
justifyContent
:
'center'
}}
>
<
View
style
=
{{
flex
:
0.6
,
justifyContent
:
'center'
}}
>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
color
:
'grey'
}}
>
{
this
.
state
.
outlet
}
<
/Text
>
{
/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', color: 'grey' }}>{this.state.detail_trans.outlet}</Text> */
}
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
color
:
'grey'
}}
>
{
this
.
state
.
detail_trans
.
outlet_address
}
<
/Text
>
<
/View
>
<
/View
>
)
:
(
)
:
(
<
View
style
=
{{
flex
:
0.6
,
justifyContent
:
'center'
}}
>
<
View
style
=
{{
flex
:
0.6
,
justifyContent
:
'center'
}}
>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
color
:
'grey'
}}
>
{
this
.
state
.
recipient_address
}
<
/Text
>
<
Text
style
=
{{
fontSize
:
14
,
fontFamily
:
'Gotham-Light'
,
color
:
'grey'
}}
>
{
this
.
state
.
detail_trans
.
recipient_address_name
}
<
/Text
>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
color
:
'grey'
}}
>
{
this
.
state
.
detail_trans
.
recipient_address
}
<
/Text
>
<
/View
>
<
/View
>
)
)
...
@@ -179,29 +182,35 @@ class OrderDetail extends React.Component {
...
@@ -179,29 +182,35 @@ class OrderDetail extends React.Component {
}
}
<
/View
>
<
/View
>
<
View
style
=
{{
margin
:
10
,
paddingLeft
:
10
}}
>
<
View
style
=
{{
margin
:
10
,
paddingLeft
:
10
}}
>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
color
:
'grey'
}}
>
P
esanan
<
/Text
>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
color
:
'grey'
}}
>
P
ESANAN
<
/Text
>
<
/View
>
<
/View
>
{
{
this
.
state
.
transaction_detail
.
map
((
item
,
index
)
=>
{
this
.
state
.
transaction_detail
.
map
((
item
,
index
)
=>
{
// total = total + item.quantity * item.price
// total = total + item.quantity * item.price
return
(
return
(
<
View
style
=
{{
margin
:
10
}}
key
=
{
index
}
>
<
View
style
=
{{
margin
:
10
}}
key
=
{
index
}
>
<
View
style
=
{{
flex
:
1
,
margin
:
10
,
flexDirection
:
'row'
,
justifyContent
:
'space-around'
}}
>
{
<
View
style
=
{{
flex
:
0.3
,
alignItems
:
'center'
}}
>
item
.
item_code
==
'GRAB-DELIVERY'
?
(
{
/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light' }}>{item.item_quantity}</Text> */
}
null
<
NumberFormat
decimalScale
=
{
0
}
value
=
{
item
.
item_quantity
}
renderText
=
{
value
=>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
color
:
'grey'
}}
>
{
value
}
<
/Text>} displayType={'text'} thousandSeparator={true} prefix={''} /
>
)
:
(
<
/View
>
<
View
style
=
{{
flex
:
1
,
margin
:
10
,
flexDirection
:
'row'
,
justifyContent
:
'space-around'
}}
>
<
View
style
=
{{
flex
:
0.1
,
alignItems
:
'flex-start'
}}
>
<
View
style
=
{{
flex
:
0.3
,
alignItems
:
'center'
}}
>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
color
:
'grey'
}}
>
x
<
/Text
>
{
/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light' }}>{item.item_quantity}</Text> */
}
<
/View
>
<
NumberFormat
decimalScale
=
{
0
}
value
=
{
item
.
item_quantity
}
renderText
=
{
value
=>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
color
:
'grey'
}}
>
{
value
}
<
/Text>} displayType={'text'} thousandSeparator={true} prefix={''} /
>
<
View
style
=
{{
flex
:
0.3
,
alignItems
:
'baseline'
}}
>
<
/View
>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
color
:
'grey'
}}
>
{
item
.
item_name
}
<
/Text
>
<
View
style
=
{{
flex
:
0.1
,
alignItems
:
'flex-start'
}}
>
<
/View
>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
color
:
'grey'
}}
>
x
<
/Text
>
<
View
style
=
{{
flex
:
0.3
,
alignItems
:
'flex-end'
}}
>
<
/View
>
{
/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light' }}>{item.item_quantity * item.item_price} </Text> */
}
<
View
style
=
{{
flex
:
0.3
,
alignItems
:
'baseline'
}}
>
<
NumberFormat
decimalScale
=
{
0
}
value
=
{
item
.
item_quantity
*
item
.
item_price
}
renderText
=
{
value
=>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
color
:
'grey'
}}
>
Rp
.
{
value
}
<
/Text>} displayType={'text'} thousandSeparator={true} prefix={''} /
>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
color
:
'grey'
}}
>
{
item
.
item_name
}
<
/Text
>
<
/View
>
<
/View
>
<
/View
>
<
View
style
=
{{
flex
:
0.3
,
alignItems
:
'flex-end'
}}
>
{
/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light' }}>{item.item_quantity * item.item_price} </Text> */
}
<
NumberFormat
decimalScale
=
{
0
}
value
=
{
item
.
item_quantity
*
item
.
item_price
}
renderText
=
{
value
=>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
color
:
'grey'
}}
>
Rp
.
{
value
}
<
/Text>} displayType={'text'} thousandSeparator={true} prefix={''} /
>
<
/View
>
<
/View
>
)
}
<
/View
>
<
/View
>
)
)
})
})
...
@@ -228,72 +237,84 @@ class OrderDetail extends React.Component {
...
@@ -228,72 +237,84 @@ class OrderDetail extends React.Component {
</>
</>
)
)
} */
}
} */
}
<
View
style
=
{{
borderTopWidth
:
1
,
borderColor
:
'grey'
,
margin
:
10
,
paddingLeft
:
10
,
padding
:
20
,
paddingBottom
:
-
10
}}
>
<
View
style
=
{{
borderTopWidth
:
1
,
borderColor
:
'grey'
,
marginHorizontal
:
10
}}
>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
color
:
'grey'
}}
>
Payment
<
/Text
>
<
View
style
=
{{
paddingLeft
:
10
,
paddingTop
:
10
}}
>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
color
:
'grey'
}}
>
PAYMENT
<
/Text
>
<
/View
>
<
/View
>
<
/View
>
<
View
style
=
{{
flex
Direction
:
'row'
,
justifyContent
:
'space-between'
,
margin
:
10
,
marginTop
:
-
10
}}
>
<
View
style
=
{{
flex
:
1
,
flexDirection
:
'row'
,
justifyContent
:
'space-between'
,
marginHorizontal
:
10
}}
>
<
View
style
=
{{
margin
:
10
,
paddingLeft
:
10
}}
>
<
View
style
=
{{
flex
:
0.5
,
marginLeft
:
20
,
marginVertical
:
5
}}
>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
color
:
'grey'
}}
>
Balance
Used
<
/Text
>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
color
:
'grey'
}}
>
Balance
Used
<
/Text
>
<
/View
>
<
/View
>
<
View
style
=
{{
margin
:
10
,
paddingRight
:
5
}}
>
<
View
style
=
{{
flex
:
0.5
,
marginVertical
:
5
,
alignItems
:
'flex-end'
,
marginRight
:
10
}}
>
{
/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light' }}>{this.state.detail_trans.trans_paid}</Text> */
}
{
/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light' }}>{this.state.detail_trans.trans_paid}</Text> */
}
<
NumberFormat
decimalScale
=
{
0
}
value
=
{
this
.
state
.
detail_trans
.
trans_paid
}
renderText
=
{
value
=>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
color
:
'grey'
}}
>
Rp
.
{
value
}
<
/Text>} displayType={'text'} thousandSeparator={true} prefix={''} /
>
<
NumberFormat
decimalScale
=
{
0
}
value
=
{
this
.
state
.
detail_trans
.
point_reduce
}
renderText
=
{
value
=>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
color
:
'grey'
}}
>
Rp
.
{
value
}
<
/Text>} displayType={'text'} thousandSeparator={true} prefix={''} /
>
<
/View
>
<
/View
>
<
/View
>
<
/View
>
<
View
style
=
{{
flex
Direction
:
'row'
,
justifyContent
:
'space-between'
,
margin
:
10
,
marginTop
:
-
10
}}
>
<
View
style
=
{{
flex
:
1
,
flexDirection
:
'row'
,
justifyContent
:
'space-between'
,
marginHorizontal
:
10
}}
>
<
View
style
=
{{
margin
:
10
,
paddingLeft
:
10
}}
>
<
View
style
=
{{
flex
:
0.5
,
marginLeft
:
20
,
marginVertical
:
5
}}
>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
color
:
'grey'
}}
>
Point
Used
<
/Text
>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
color
:
'grey'
}}
>
Point
Used
<
/Text
>
<
/View
>
<
/View
>
<
View
style
=
{{
margin
:
10
,
paddingRight
:
5
}}
>
<
View
style
=
{{
flex
:
0.5
,
marginVertical
:
5
,
alignItems
:
'flex-end'
,
marginRight
:
10
}}
>
{
/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light' }}>{this.state.detail_trans.point_booked}</Text> */
}
{
/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light' }}>{this.state.detail_trans.point_booked}</Text> */
}
<
NumberFormat
decimalScale
=
{
0
}
value
=
{
this
.
state
.
detail_trans
.
point_booked
}
renderText
=
{
value
=>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
color
:
'grey'
}}
>
Rp
.
{
value
}
<
/Text>} displayType={'text'} thousandSeparator={true} prefix={''} /
>
<
NumberFormat
decimalScale
=
{
0
}
value
=
{
this
.
state
.
detail_trans
.
point_booked
}
renderText
=
{
value
=>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
color
:
'grey'
}}
>
Rp
.
{
value
}
<
/Text>} displayType={'text'} thousandSeparator={true} prefix={''} /
>
<
/View
>
<
/View
>
<
/View
>
<
/View
>
<
View
style
=
{{
borderTopWidth
:
1
,
borderColor
:
'grey'
,
margin
:
10
,
paddingLeft
:
10
,
padding
:
20
,
paddingBottom
:
-
10
,
flexDirection
:
'row'
,
justifyContent
:
'space-between'
,
flex
:
1
,
flexDirection
:
'row'
}}
>
<
View
style
=
{{
marginTop
:
5
,
borderTopWidth
:
1
,
borderColor
:
'grey'
,
marginHorizontal
:
10
,
flexDirection
:
'row'
,
justifyContent
:
'space-between'
,
flex
:
1
}}
>
<
View
style
=
{{
flex
:
0.
6
}}
>
<
View
style
=
{{
flex
:
0.
5
,
marginLeft
:
10
,
marginVertical
:
5
}}
>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
color
:
'grey'
}}
>
Harga
<
/Text
>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
color
:
'grey'
}}
>
Harga
<
/Text
>
<
/View
>
<
/View
>
<
View
style
=
{{
flex
:
0.
4
,
marginRight
:
-
5
}}
>
<
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> */
}
{
/* <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_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_discount
==
''
?
(
this
.
state
.
detail_trans
!=
''
?
(
null
this
.
state
.
detail_trans
.
used_reward
.
length
?
(
)
:
(
<
View
style
=
{{
flexDirection
:
'row'
,
justifyContent
:
'space-between'
,
flex
:
1
,
marginHorizontal
:
10
}}
>
<
View
style
=
{{
margin
:
10
,
marginTop
:
-
10
,
paddingLeft
:
10
,
padding
:
20
,
paddingBottom
:
-
10
,
flexDirection
:
'row'
,
justifyContent
:
'space-between'
,
flex
:
1
,
flexDirection
:
'row'
}}
>
<
View
style
=
{{
flex
:
0.5
,
marginLeft
:
10
,
marginVertical
:
5
}}
>
<
View
style
=
{{
flex
:
0.6
}}
>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
color
:
'grey'
}}
>
Voucher
<
/Text
>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
color
:
'grey'
}}
>
Voucher
<
/Text
>
<
/View
>
<
/View
>
<
View
style
=
{{
flex
:
0.
4
,
marginRight
:
-
5
}}
>
<
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_discount}</Text> */
}
{
/* <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', textAlign: 'right' }}>- {this.state.detail_trans.trans_discount}</Text> */
}
<
NumberFormat
decimalScale
=
{
0
}
value
=
{
this
.
state
.
detail_trans
.
trans_discount
}
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
.
used_reward
[
0
].
reward
.
value
}
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
>
)
)
:(
null
)
)
:
(
null
)
}
}
{
/* {
{
this.props.type_pickup == true ? (
this
.
state
.
detail_trans
!=
''
?
(
null
this
.
state
.
detail_trans
.
trans_type
==
2
?
(
) : (
<
View
style
=
{{
flexDirection
:
'row'
,
justifyContent
:
'space-between'
,
flex
:
1
,
marginHorizontal
:
10
}}
>
<View style={{ margin: 10, marginTop: -10, paddingLeft: 10, padding: 20, paddingBottom: -10, flexDirection: 'row', justifyContent: 'space-between', flex: 1, flexDirection: 'row' }}>
<
View
style
=
{{
flex
:
0.5
,
marginLeft
:
10
,
marginVertical
:
5
}}
>
<View style={{ flex: 0.6 }}>
<
Text
style
=
{{
fontSize
:
12
,
fontFamily
:
'Gotham-Light'
,
color
:
'grey'
}}
>
Ongkis
kirim
<
/Text
>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light' }}>Ongkos Kirim</Text>
<
/View
>
<
/View
>
<View style={{ flex: 0.4, marginRight: -5 }}>
<
View
style
=
{{
flex
:
0.5
,
marginVertical
:
5
,
alignItems
:
'flex-end'
,
marginRight
:
10
}}
>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', textAlign: 'right' }}>{this.props.grabamount}</Text>
{
this
.
state
.
detail_trans
.
transaction_detail
.
map
((
item
,
index
)
=>
{
// console.log(item)
if
(
item
.
item_code
==
'GRAB-DELIVERY'
)
{
return
(
<
NumberFormat
decimalScale
=
{
0
}
value
=
{
item
.
item_price
}
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_discount} 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
>
)
)
:(
null
)
} */
}
)
:
(
null
)
<
View
style
=
{{
margin
:
10
,
marginTop
:
-
10
,
paddingLeft
:
10
,
padding
:
20
,
paddingBottom
:
-
10
,
flexDirection
:
'row'
,
justifyContent
:
'space-between'
,
flex
:
1
,
flexDirection
:
'row'
}}
>
}
<
View
style
=
{{
flex
:
0.6
}}
>
<
View
style
=
{{
flexDirection
:
'row'
,
justifyContent
:
'space-between'
,
flex
:
1
,
marginHorizontal
:
10
,
marginTop
:
5
}}
>
<
Text
style
=
{{
fontSize
:
15
,
fontFamily
:
'Gotham-Black'
,
color
:
'#CFB368'
}}
>
Total
<
/Text
>
<
View
style
=
{{
flex
:
0.5
,
marginLeft
:
10
,
marginVertical
:
5
}}
>
<
Text
style
=
{{
fontSize
:
20
,
fontFamily
:
'Gotham-Black'
,
color
:
'#CFB368'
}}
>
Total
<
/Text
>
<
/View
>
<
/View
>
<
View
style
=
{{
flex
:
0.
4
,
marginRight
:
-
5
}}
>
<
View
style
=
{{
flex
:
0.
5
,
marginVertical
:
5
,
alignItems
:
'flex-end'
,
marginRight
:
10
}}
>
{
/* <Text style={{ fontSize: 20, fontFamily: 'Gotham-Black', textAlign: 'right', color: '#CFB368' }}>{this.state.detail_trans.trans_total}</Text> */
}
{
/* <Text style={{ fontSize: 20, fontFamily: 'Gotham-Black', textAlign: 'right', color: '#CFB368' }}>{this.state.detail_trans.trans_total}</Text> */
}
<
NumberFormat
decimalScale
=
{
0
}
value
=
{
this
.
state
.
detail_trans
.
trans_total
}
renderText
=
{
value
=>
<
Text
style
=
{{
fontSize
:
15
,
fontFamily
:
'Gotham-Black'
,
textAlign
:
'right'
,
color
:
'#CFB368'
}}
>
Rp
.
{
value
}
<
/Text>} displayType={'text'} thousandSeparator={true} prefix={''} /
>
<
NumberFormat
decimalScale
=
{
0
}
value
=
{
this
.
state
.
detail_trans
.
point_reduce
}
renderText
=
{
value
=>
<
Text
style
=
{{
fontSize
:
20
,
fontFamily
:
'Gotham-Black'
,
textAlign
:
'right'
,
color
:
'#CFB368'
}}
>
Rp
.
{
value
}
<
/Text>} displayType={'text'} thousandSeparator={true} prefix={''} /
>
<
/View
>
<
/View
>
<
/View
>
<
/View
>
{
{
...
@@ -347,15 +368,16 @@ const styles = StyleSheet.create({
...
@@ -347,15 +368,16 @@ const styles = StyleSheet.create({
},
},
header
:
{
header
:
{
justifyContent
:
'center'
,
justifyContent
:
'center'
,
flex
:
0.
2
,
flex
:
0.
1
,
borderBottomWidth
:
1
,
borderBottomWidth
:
1
,
borderColor
:
'grey'
,
borderColor
:
'#838383'
,
margin
:
10
marginHorizontal
:
10
,
padding
:
10
},
},
body
:
{
body
:
{
flex
:
0.8
,
flex
:
0.8
,
margin
:
5
,
margin
:
0
,
},
},
list_detail_order
:
{
list_detail_order
:
{
flex
:
1
,
flex
:
1
,
...
@@ -394,7 +416,7 @@ const styles = StyleSheet.create({
...
@@ -394,7 +416,7 @@ const styles = StyleSheet.create({
},
},
button2
:
{
button2
:
{
backgroundColor
:
'#CFB368'
,
backgroundColor
:
'#CFB368'
,
padding
:
20
,
padding
:
20
,
borderRadius
:
10
,
borderRadius
:
10
,
paddingVertical
:
5
,
paddingVertical
:
5
,
alignItems
:
'center'
,
alignItems
:
'center'
,
...
...
view/OrderHistory.js
View file @
49199f65
...
@@ -44,7 +44,7 @@ class OrderHistory extends React.Component {
...
@@ -44,7 +44,7 @@ class OrderHistory extends React.Component {
}
}
Axios
.
post
(
'https://excelsocrm.ravintoladev.com/crm/v2/transaction/list'
,
params
).
then
(
res
=>
{
Axios
.
post
(
'https://excelsocrm.ravintoladev.com/crm/v2/transaction/list'
,
params
).
then
(
res
=>
{
let
data
=
res
.
data
.
data
let
data
=
res
.
data
.
data
console
.
log
(
data
)
//
console.log(data)
this
.
setState
({
this
.
setState
({
order_list
:
data
,
order_list
:
data
,
indicator
:
false
,
indicator
:
false
,
...
@@ -79,7 +79,7 @@ class OrderHistory extends React.Component {
...
@@ -79,7 +79,7 @@ class OrderHistory extends React.Component {
<
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'
,
margin
Top
:
10
}}
>
<
View
style
=
{{
height
:
40
,
borderRadius
:
10
,
backgroundColor
:
'#CFB368'
,
justifyContent
:
'center'
,
margin
Vertical
:
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
}}
>
Lihat
Detail
Pemesanan
<
/Text
>
<
/View
>
<
/View
>
<
/TouchableOpacity
>
<
/TouchableOpacity
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment