Skip to content

Add countdown timer ... again #649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
denisenricohasyim93 wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Add countdown timer ... again #649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd08f1c
Add countdown timer
denisenricohasyim93 Nov 1, 2017
4e41cec
fix something
denisenricohasyim93 Nov 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/components/MyOrders/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { View, ScrollView, Text, Image } from 'react-native';
import { Container, Header, Tab, Tabs, TabHeading, Icon, List } from 'native-base';
import { Actions } from 'react-native-router-flux';
import { connect } from 'react-redux';
import CountdownCircle from 'react-native-countdown-circle';
import { createStructuredSelector } from 'reselect';
import PropTypes from 'prop-types';

Expand Down
56 changes: 43 additions & 13 deletions app/components/OrderItem/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@ import 'intl';
import 'intl/locale-data/jsonp/id';
import React, { Component } from 'react';
import { Text, Grid, Col, Button, Card, CardItem } from 'native-base';
import Moment from 'moment';
import PropTypes from 'prop-types';
import { TouchableOpacity, View } from 'react-native';
import { Actions } from 'react-native-router-flux';
import Icon from 'react-native-vector-icons/Ionicons';
import CountdownCircle from 'react-native-countdown-circle';
import styles from './styles';
import ListItem from '../ListItem';
import { formatDate, transactionStatus, localeDate } from '../../helpers';
import { formatDate, transactionStatus, localeDate, localeDateConvertToSecond } from '../../helpers';
// import { PRIMARYCOLOR } from '../../constants';
let amount = 0;
export default class OrderItem extends Component {
Expand Down Expand Up @@ -112,23 +114,51 @@ export default class OrderItem extends Component {
<Text note style={styles.orderId}>
{localeDate(order.created_at)}
</Text>
{ ((localeDateConvertToSecond(order.payment.expired_at) - localeDateConvertToSecond(Moment())) > 0) ?
<CountdownCircle
seconds={localeDateConvertToSecond(order.payment.expired_at) - localeDateConvertToSecond(Moment())}
radius={30}
borderWidth={8}
color="#ff003f"
bgColor="#fff"
textStyle={{ fontSize: 20 }}
onTimeElapsed={() => console.log('Elapsed!')}
/>
:
null
}
<View style={{ flex: 1,
flexDirection: 'row',
justifyContent: 'space-between',
alignItems: 'center' }}
>
<View style={styles.viewText}>
{status ? (
<View style={{ flexDirection: 'row', marginTop: 8 }}>
<Text note style={[ styles.statusText, { backgroundColor: color, color: 'white' } ]}>
{this.state.status.toUpperCase()}
</Text>
{this.ticketTypes()}
</View>
) : (
<View />
)}
</View>
{ ((localeDateConvertToSecond(order.payment.expired_at) - localeDateConvertToSecond(Moment())) <= 0) ?
(<View style={styles.viewText}>
{status ? (
<View style={{ flexDirection: 'row', marginTop: 8 }}>
<Text note style={[ styles.statusText, { backgroundColor: 'grey', color: 'white' } ]}>
EXPIRED
</Text>
{this.ticketTypes()}
</View>
) : (
<View />
)}
</View>)
:
(<View style={styles.viewText}>
{status ? (
<View style={{ flexDirection: 'row', marginTop: 8 }}>
<Text note style={[ styles.statusText, { backgroundColor: color, color: 'white' } ]}>
{this.state.status.toUpperCase()}
</Text>
{this.ticketTypes()}
</View>
) : (
<View />
)}
</View>)
}
<Text />
</View>
</View>
Expand Down
28 changes: 25 additions & 3 deletions app/containers/OrderDetail/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import {
import { connect } from 'react-redux';
import { createStructuredSelector } from 'reselect';
import { Actions } from 'react-native-router-flux';
import CountdownCircle from 'react-native-countdown-circle';
import HeaderPoint from '../../components/Header';
import Icon from 'react-native-vector-icons/Ionicons';
import ImagePicker from 'react-native-image-crop-picker';
Expand All @@ -41,13 +42,14 @@ import * as actions from './actions';
import * as selectors from './selectors';
import TicketType from '../../components/TicketType';
import TicketDetail from '../../components/TicketDetail';
import { localeDateWithoutHour, transactionStatus, getProfileData } from '../../helpers';
import { localeDateWithoutHour, transactionStatus, getProfileData, localeDateConvertToSecond } from '../../helpers';

const Back = require('../../../assets/images/back.png');
const logo = require('../../../assets/images/bankmandiri.png');

const { width, height } = Dimensions.get('window');
const noImage = require('./../../../assets/images/noimage.png');

const url = 'https://api.devsummit.io/static/Ref_Bank.PDF';

let total = 0;
Expand All @@ -61,7 +63,7 @@ class OrderDetail extends Component {
color: '',
modalVisible: false,
scalesPageToFit: true,
userId: '',
userId: ''
};
}

Expand Down Expand Up @@ -221,6 +223,7 @@ class OrderDetail extends Component {
const { payment, verification } = included || {};
const { status } = this.state;
const { isConfirming, isUpdating } = this.props;
console.log('landing here orderdetail', this.props.order);
if (isUpdating || isConfirming || Object.keys(order).length === 0) {
return (
<Container>
Expand Down Expand Up @@ -250,13 +253,32 @@ class OrderDetail extends Component {
<Icon name="ios-checkmark-circle" color={PRIMARYCOLOR} />
<Text style={styles.textButton}>save</Text>
</Button>
) : (
) : (((localeDateConvertToSecond(order.included.payment.expired_at) - localeDateConvertToSecond(Moment())) < 0) ?
<Text
style={[ styles.statusText, { backgroundColor: 'grey' || PRIMARYCOLOR } ]}
>
EXPIRED
</Text>
:
<Text
style={[ styles.statusText, { backgroundColor: this.state.color || PRIMARYCOLOR } ]}
>
{this.state.status === 'capture' ? 'PAID' : this.state.status.toUpperCase()}
</Text>
)}
{ ((localeDateConvertToSecond(order.included.payment.expired_at) - localeDateConvertToSecond(Moment())) > 0) ?
<CountdownCircle
seconds={localeDateConvertToSecond(order.included.payment.expired_at) - localeDateConvertToSecond(Moment())}
radius={30}
borderWidth={8}
color="#ff003f"
bgColor="#fff"
textStyle={{ fontSize: 20 }}
onTimeElapsed={() => console.log('Elapsed!')}
/>
:
null
}
<Row>
<Col style={{ flex: 2 }}>
<Text>{strings.order.orderNumber}</Text>
Expand Down
6 changes: 6 additions & 0 deletions app/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,12 @@ export const localeDate = (date) => {
.format('YYYY-MM-DD HH:mm:ss');
};

export const localeDateConvertToSecond = (date) => {
return Moment.utc(date)
.local()
.diff(Moment().startOf('day'), 'seconds');
};

export const localeDateWithoutHour = (date) => {
return Moment.utc(date)
.locale([ 'en', 'id' ])
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"react-native-busy-indicator": "^1.1.0",
"react-native-code-push": "^5.1.0-beta",
"react-native-collapsible": "^0.9.0",
"react-native-countdown-circle": "^2.0.0",
"react-native-document-picker": "^2.0.0",
"react-native-facebook-account-kit": "^0.7.0",
"react-native-fcm": "^9.3.0",
Expand Down