From 0db6e311e98ec64fbdbfdd2c7cfbc29311090237 Mon Sep 17 00:00:00 2001 From: Arnaz Date: Tue, 31 Oct 2017 22:17:56 +0700 Subject: [PATCH 1/8] get order status and payment proof --- app/components/MyOrders/index.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/components/MyOrders/index.js b/app/components/MyOrders/index.js index 037fdf39..a3c699c6 100644 --- a/app/components/MyOrders/index.js +++ b/app/components/MyOrders/index.js @@ -1,7 +1,7 @@ import React from 'react'; import { View, ScrollView, Text, Image } from 'react-native'; -import { Container, Header, Tab, Tabs, TabHeading, Icon, List } from 'native-base'; +import { List } from 'native-base'; import { Actions } from 'react-native-router-flux'; import { connect } from 'react-redux'; import { createStructuredSelector } from 'reselect'; @@ -14,13 +14,12 @@ import Button from '../../components/Button'; import styles from './style'; import strings from '../../localization'; import OrderList from '../../containers/OrderList'; - +import { getUpdateOrderStatus, getPaymentProof } from '../../containers/OrderDetail/selectors'; const icon = require('./../../../assets/images/icon.png'); const noTicket = require('./../../../assets/images/noticket.png'); const MyOrders = (props) => { - // console.log('landing here props', props); return ( @@ -53,6 +52,8 @@ const MyOrders = (props) => { key={order.id} order={order} confirmPayment={this.confirmPayment} + statusProgress={props.orderStatus} + paymentProof={props.paymentProof} onPress={() => { Actions.orderDetail({ orderId: order.id, @@ -83,7 +84,9 @@ MyOrders.propTypes = { }; const mapStateToProps = createStructuredSelector({ - orders: selectors.getOrders() + orders: selectors.getOrders(), + orderStatus: getUpdateOrderStatus(), + paymentProof: getPaymentProof() }); export default connect(mapStateToProps, actions)(MyOrders); From 87a080b75b985c86c0dc4b338b70c74524e8347d Mon Sep 17 00:00:00 2001 From: Arnaz Date: Tue, 31 Oct 2017 22:19:40 +0700 Subject: [PATCH 2/8] remove unused components --- app/components/MyOrders/style.js | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/app/components/MyOrders/style.js b/app/components/MyOrders/style.js index 183db1a5..f4e03912 100644 --- a/app/components/MyOrders/style.js +++ b/app/components/MyOrders/style.js @@ -38,22 +38,6 @@ const styles = StyleSheet.create({ justifyContent: 'center', backgroundColor: 'transparent' }, - tabs: { - }, - tabHeading: { - flex: 1, - backgroundColor: '#FF6F00' - }, - tabTitle: { - fontSize: 16, - fontFamily: 'Montserrat', - fontWeight: '500', - color: '#FFF' - }, - tabBarSelectedItemStyle: { - borderBottomWidth: 2, - borderBottomColor: 'red' - } }); export default styles; From 13b403cccb2e70ee172564dc91647327548c1885 Mon Sep 17 00:00:00 2001 From: Arnaz Date: Tue, 31 Oct 2017 22:19:59 +0700 Subject: [PATCH 3/8] make function status label for order item --- app/components/OrderItem/index.js | 43 +++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/app/components/OrderItem/index.js b/app/components/OrderItem/index.js index 97aaba18..110e61ab 100644 --- a/app/components/OrderItem/index.js +++ b/app/components/OrderItem/index.js @@ -1,3 +1,4 @@ + import 'intl'; import 'intl/locale-data/jsonp/id'; import React, { Component } from 'react'; @@ -64,7 +65,7 @@ export default class OrderItem extends Component { color = 'red'; } else if (stat === 'paid') { color = 'green'; - } else if (stat === 'need authorization') { + } else if (stat === 'in progress') { color = 'blue'; } else { color = '#777'; @@ -101,9 +102,34 @@ export default class OrderItem extends Component { return `${dt[1]}-${dt[2]}-${dt[3]}`; }; - render() { + statusLabel = () => { const { status, color } = this.state; - const { order } = this.props; + const { paymentProof } = this.props; + if (status) { + return ( + + + {this.state.status.toUpperCase()} + + {this.ticketTypes()} + + ); + } else if (paymentProof) { + return ( + + + IN PROGRESS + + {this.ticketTypes()} + + ); + } + + } + + render() { + const { order, paymentProof } = this.props; + console.log("PAYMEBRPROOF", paymentProof); return ( this.props.onPress()}> @@ -118,16 +144,7 @@ export default class OrderItem extends Component { alignItems: 'center' }} > - {status ? ( - - - {this.state.status.toUpperCase()} - - {this.ticketTypes()} - - ) : ( - - )} + {this.statusLabel()} From 36f9c2d0c17442cb14ba2160f6a123e44b346829 Mon Sep 17 00:00:00 2001 From: Arnaz Date: Tue, 31 Oct 2017 22:21:12 +0700 Subject: [PATCH 4/8] edit styling for view text --- app/components/OrderItem/styles.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/components/OrderItem/styles.js b/app/components/OrderItem/styles.js index 91124cd5..e04ea90b 100644 --- a/app/components/OrderItem/styles.js +++ b/app/components/OrderItem/styles.js @@ -48,16 +48,17 @@ const styles = StyleSheet.create({ borderColor: 'transparent', elevation: 0 }, - viewText1: { + viewText: { flex: 0, flexDirection: 'row', - margin: 20, + marginTop: 8 }, buttonSection: { flex: 1, flexDirection: 'row', justifyContent: 'center', alignItems: 'center', + marginLeft: 10 }, statusText: { fontWeight: 'bold', From 909197af13f698de92999a0691c02856c36ea8ad Mon Sep 17 00:00:00 2001 From: Arnaz Date: Tue, 31 Oct 2017 22:21:41 +0700 Subject: [PATCH 5/8] add ternary for in process status in order detail --- app/containers/OrderDetail/index.js | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/app/containers/OrderDetail/index.js b/app/containers/OrderDetail/index.js index 1d657a3f..105b0bd6 100644 --- a/app/containers/OrderDetail/index.js +++ b/app/containers/OrderDetail/index.js @@ -250,13 +250,21 @@ class OrderDetail extends Component { save - ) : ( - - {this.state.status === 'capture' ? 'PAID' : this.state.status.toUpperCase()} - - )} + ) : (status === 'in process' ? + ( + + {this.state.status.toUpperCase()} + + ) + : ( + + {this.state.status === 'capture' ? 'PAID' : this.state.status.toUpperCase()} + + ))} {strings.order.orderNumber} From 738b467303dae9be2ad9d40828c2b0947c0670f3 Mon Sep 17 00:00:00 2001 From: Arnaz Date: Wed, 1 Nov 2017 13:40:43 +0700 Subject: [PATCH 6/8] add in progress status in helper --- app/helpers.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/helpers.js b/app/helpers.js index c678c32d..3fed3959 100644 --- a/app/helpers.js +++ b/app/helpers.js @@ -117,6 +117,11 @@ export const transactionStatus = (payment) => { color: 'red' }; } + else if (payment.transaction_status === 'in progress') { + return { + message: 'in progress', + color: 'red' + }; return { message: payment.transaction_status, color: 'grey' From e329b3950b692c623b10f769d311cf70b7a920b4 Mon Sep 17 00:00:00 2001 From: Arnaz Date: Wed, 1 Nov 2017 16:12:20 +0700 Subject: [PATCH 7/8] change in progress to blue --- app/helpers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers.js b/app/helpers.js index 6ca00a07..81d23e8e 100644 --- a/app/helpers.js +++ b/app/helpers.js @@ -119,7 +119,7 @@ export const transactionStatus = (payment) => { } else if (payment.transaction_status === 'in progress') { return { message: 'in progress', - color: 'red' + color: 'blue' }; } return { From b4a793cc906e29a5c5a0bfa38c0c7668a1d38ed0 Mon Sep 17 00:00:00 2001 From: Arnaz Date: Wed, 1 Nov 2017 16:16:07 +0700 Subject: [PATCH 8/8] change in progress color into blue --- app/helpers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers.js b/app/helpers.js index 81d23e8e..49b33ac8 100644 --- a/app/helpers.js +++ b/app/helpers.js @@ -119,7 +119,7 @@ export const transactionStatus = (payment) => { } else if (payment.transaction_status === 'in progress') { return { message: 'in progress', - color: 'blue' + color: 'blue' }; } return {