Historique Superviseur OK
This commit is contained in:
Brice Zele
parent
7ac6080020
commit
e597ceb6c3
|
|
@ -24,7 +24,7 @@ import Dialog from "react-native-dialog";
|
|||
import { Typography } from '../../config/typography';
|
||||
import * as Utils from '../../utils/DeviceUtils';
|
||||
import { IlinkEmitter } from "../../utils/events";
|
||||
import { cutString, cutStringWithoutDot, isEmptyObject, transactionHistoryIlinkLabel, isIlinkWorldWallet, optionDepotScreen, optionIdentificationScreen, optionPaiementFacture, optionRetraitScreen, transactionHistoryLabel, optionNanoCreditScreen, optionNanoCreditAgentScreen } from '../../utils/UtilsFunction';
|
||||
import { cutString, cutStringWithoutDot, isEmptyObject, transactionHistoryIlinkLabel, isIlinkWorldWallet, optionDepotScreen, optionIdentificationScreen, optionPaiementFacture, optionRetraitScreen, transactionHistoryLabel, optionNanoCreditScreen, optionNanoCreditAgentScreen, displayTransactionType } from '../../utils/UtilsFunction';
|
||||
import { depositActionReset } from '../../webservice/DepositApi';
|
||||
import { baseUrl } from '../../webservice/IlinkConstants';
|
||||
import { getWalletDetailActivated, resetWalletListDetailReducer } from '../../webservice/WalletApi';
|
||||
|
|
@ -163,7 +163,7 @@ class WalletDetail extends Component {
|
|||
this.props.getHyperSuperTransactionHistoryAction(result.response.id, false);
|
||||
break;
|
||||
case "hyper":
|
||||
this.props.getHyperSuperTransactionHistoryAction(result.response.id, true);
|
||||
this.props.getHyperSuperTransactionHistoryAction(user.network_id, true);
|
||||
break;
|
||||
}
|
||||
this.setState({});
|
||||
|
|
@ -503,7 +503,7 @@ class WalletDetail extends Component {
|
|||
</View>
|
||||
);
|
||||
|
||||
renderModalHistoryDetail = () => {
|
||||
renderModalHistoryDetail = (wallet) => {
|
||||
const { historyItemDetail } = this.state;
|
||||
|
||||
return (
|
||||
|
|
@ -631,7 +631,7 @@ class WalletDetail extends Component {
|
|||
return (
|
||||
<TouchableOpacity onPress={() => { this.setState({ displaySuperHyperModalHistory: true, historyItemDetail: item }) }} style={[styles.contentService, { borderBottomColor: Color.primaryColor }]}>
|
||||
{
|
||||
Object.keys(omit(item, ['id', 'id_transaction', 'type_historique', 'frais', 'init_country', 'final_country', 'source', 'emetteur', 'montant_net_final', 'montant_net_init', 'reseau_payeur', 'operation'])).map((element, i) => (
|
||||
Object.keys(omit(item, ['id', 'id_transaction', 'date_cassation', 'etat', 'type', 'date_fin', 'duree_mois', 'id_epargne', 'type_historique', 'frais', 'init_country', 'final_country', 'source', 'emetteur', 'montant_net_final', 'montant_net_init', 'reseau_payeur', 'operation', 'retrait_cash', 'type_historique', 'type_caution', 'id_demande', 'montant_rembourse', 'partiellement_rembourse', 'duree_mois', 'etat', 'interet', 'taxe', 'date_validation', 'date_remboursement_prevu', 'date_remboursement', 'id_user', 'id_wallet_agent', 'id_network', 'user', 'user_phone', 'agent', 'codeParrain'])).map((element, i) => (
|
||||
<View style={{ alignItems: 'center' }} key={i}>
|
||||
<Text style={[Typography.overline, Color.grayColor], { marginTop: 4 }}>
|
||||
{
|
||||
|
|
@ -652,7 +652,7 @@ class WalletDetail extends Component {
|
|||
|
||||
}
|
||||
|
||||
renderModalSuperHyperHistoryDetail = () => {
|
||||
renderModalSuperHyperHistoryDetail = (wallet) => {
|
||||
const { historyItemDetail } = this.state;
|
||||
|
||||
return (
|
||||
|
|
@ -661,6 +661,221 @@ class WalletDetail extends Component {
|
|||
|
||||
<Dialog.Title>Détail de l'historique</Dialog.Title>
|
||||
|
||||
{isEqual(historyItemDetail.type_historique, 'N') &&
|
||||
<ScrollView persistentScrollbar={true}>
|
||||
<View style={[styles.blockView, { borderBottomColor: Color.borderColor }]}>
|
||||
<View style={{ flexDirection: 'row', marginTop: 10 }}>
|
||||
<View style={{ flex: 1 }}>
|
||||
<Text style={[styles.body2]}>Type</Text>
|
||||
</View>
|
||||
<View style={{ flex: 1, alignItems: 'flex-end' }}>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}>{displayTransactionType(this.state.historyItemDetail.type_historique)}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{ flexDirection: 'row', marginTop: 10 }}>
|
||||
<View style={{ flex: 1 }}>
|
||||
<Text style={[styles.body2]}>{I18n.t('ID_DEMAND')}</Text>
|
||||
</View>
|
||||
<View style={{ flex: 1, alignItems: 'flex-end' }}>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.id_demande}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{ flexDirection: 'row', marginTop: 10 }}>
|
||||
<View style={{ flex: 1 }}>
|
||||
<Text style={[styles.body2]}>{I18n.t('STATUS')}</Text>
|
||||
</View>
|
||||
<View style={{ flex: 1, alignItems: 'flex-end' }}>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.etat}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{ flexDirection: 'row', marginTop: 10 }}>
|
||||
<View style={{ flex: 1 }}>
|
||||
<Text style={[styles.body2]}>{I18n.t('DEMAND_DURATION_IN_MONTH')}</Text>
|
||||
</View>
|
||||
<View style={{ flex: 1, alignItems: 'flex-end' }}>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.duree_mois}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{ flexDirection: 'row', marginTop: 10 }}>
|
||||
<View style={{ flex: 1 }}>
|
||||
<Text tyle={[Typography.body2]}>{I18n.t('AMOUNT')}</Text>
|
||||
</View>
|
||||
<View style={{ flex: 1, alignItems: 'flex-end' }}>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.montant + ' ' + wallet.currency_code}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{ flexDirection: 'row', marginTop: 10 }}>
|
||||
<View style={{ flex: 1 }}>
|
||||
<Text tyle={[Typography.body2]}>{I18n.t('AMOUNT_REFUND')}</Text>
|
||||
</View>
|
||||
<View style={{ flex: 1, alignItems: 'flex-end' }}>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.montant_rembourse + ' ' + wallet.currency_code}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{ flexDirection: 'row', marginTop: 10 }}>
|
||||
<View style={{ flex: 1 }}>
|
||||
<Text tyle={[Typography.body2]}>{I18n.t('AMOUNT_PARTIALLY_REFUND')}</Text>
|
||||
</View>
|
||||
<View style={{ flex: 1, alignItems: 'flex-end' }}>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.partiellement_rembourse + ' ' + wallet.currency_code}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{ flexDirection: 'row', marginTop: 10 }}>
|
||||
<View style={{ flex: 1 }}>
|
||||
<Text tyle={[Typography.body2]}>{I18n.t('TAXES')}</Text>
|
||||
</View>
|
||||
<View style={{ flex: 1, alignItems: 'flex-end' }}>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.taxe + ' ' + wallet.currency_code}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{ flexDirection: 'row', marginTop: 10 }}>
|
||||
<View style={{ flex: 1 }}>
|
||||
<Text tyle={[Typography.body2]}>{I18n.t('INTERET')}</Text>
|
||||
</View>
|
||||
<View style={{ flex: 1, alignItems: 'flex-end' }}>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.interet + ' ' + wallet.currency_code}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{ flexDirection: 'row', marginTop: 10 }}>
|
||||
<View style={{ flex: 1 }}>
|
||||
<Text tyle={[Typography.body2]}>{I18n.t('WITHDRAWAL_IN_CASH')}</Text>
|
||||
</View>
|
||||
<View style={{ flex: 1, alignItems: 'flex-end' }}>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.retrait_cash + ' ' + wallet.currency_code}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{ flexDirection: 'row', marginTop: 10 }}>
|
||||
<View style={{ flex: 1 }}>
|
||||
<Text style={[styles.body2]}>{I18n.t('CREATION_DATE')}</Text>
|
||||
</View>
|
||||
<View style={{ flex: 1, alignItems: 'flex-end' }}>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.date_creation}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{ flexDirection: 'row', marginTop: 10 }}>
|
||||
<View style={{ flex: 1 }}>
|
||||
<Text tyle={[Typography.body2]}>{I18n.t('DEMAND_DATE')}</Text>
|
||||
</View>
|
||||
<View style={{ flex: 1, alignItems: 'flex-end' }}>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.date_demande}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{ flexDirection: 'row', marginTop: 10 }}>
|
||||
<View style={{ flex: 1 }}>
|
||||
<Text tyle={[Typography.body2]}>{I18n.t('DATE_REMBOURSEMENT_PREVU')}</Text>
|
||||
</View>
|
||||
<View style={{ flex: 1, alignItems: 'flex-end' }}>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.date_remboursement_prevu}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{ flexDirection: 'row', marginTop: 10 }}>
|
||||
<View style={{ flex: 1 }}>
|
||||
<Text tyle={[Typography.body2]}>{I18n.t('DATE_REMBOURSEMENT')}</Text>
|
||||
</View>
|
||||
<View style={{ flex: 1, alignItems: 'flex-end' }}>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.date_remboursement}</Text>
|
||||
</View>
|
||||
</View>
|
||||
</View>
|
||||
</ScrollView>
|
||||
}
|
||||
|
||||
{isEqual(historyItemDetail.type_historique, 'E') &&
|
||||
|
||||
<View style={[styles.blockView, { borderBottomColor: Color.borderColor }]}>
|
||||
<View style={{ flexDirection: 'row', marginTop: 10 }}>
|
||||
<View style={{ flex: 1 }}>
|
||||
<Text style={[styles.body2]}>Type</Text>
|
||||
</View>
|
||||
<View style={{ flex: 1, alignItems: 'flex-end' }}>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}>{displayTransactionType(this.state.historyItemDetail.type_historique)}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{ flexDirection: 'row', marginTop: 10 }}>
|
||||
<View style={{ flex: 1 }}>
|
||||
<Text style={[styles.body2]}>{I18n.t('ID_DEMAND')}</Text>
|
||||
</View>
|
||||
<View style={{ flex: 1, alignItems: 'flex-end' }}>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.id_demande}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{ flexDirection: 'row', marginTop: 10 }}>
|
||||
<View style={{ flex: 1 }}>
|
||||
<Text style={[styles.body2]}>{I18n.t('STATUS')}</Text>
|
||||
</View>
|
||||
<View style={{ flex: 1, alignItems: 'flex-end' }}>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.etat}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{ flexDirection: 'row', marginTop: 10 }}>
|
||||
<View style={{ flex: 1 }}>
|
||||
<Text style={[styles.body2]}>{I18n.t('DEMAND_DURATION_IN_MONTH')}</Text>
|
||||
</View>
|
||||
<View style={{ flex: 1, alignItems: 'flex-end' }}>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.duree_mois}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{ flexDirection: 'row', marginTop: 10 }}>
|
||||
<View style={{ flex: 1 }}>
|
||||
<Text style={[styles.body2]}>Type</Text>
|
||||
</View>
|
||||
<View style={{ flex: 1, alignItems: 'flex-end' }}>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.type}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{ flexDirection: 'row', marginTop: 10 }}>
|
||||
<View style={{ flex: 1 }}>
|
||||
<Text tyle={[Typography.body2]}>{I18n.t('AMOUNT')}</Text>
|
||||
</View>
|
||||
<View style={{ flex: 1, alignItems: 'flex-end' }}>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.montant + ' ' + wallet.currency_code}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{ flexDirection: 'row', marginTop: 10 }}>
|
||||
<View style={{ flex: 1 }}>
|
||||
<Text tyle={[Typography.body2]}>{I18n.t('TAXES')}</Text>
|
||||
</View>
|
||||
<View style={{ flex: 1, alignItems: 'flex-end' }}>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.taxe + ' ' + wallet.currency_code}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{ flexDirection: 'row', marginTop: 10 }}>
|
||||
<View style={{ flex: 1 }}>
|
||||
<Text tyle={[Typography.body2]}>{I18n.t('INTERET')}</Text>
|
||||
</View>
|
||||
<View style={{ flex: 1, alignItems: 'flex-end' }}>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.interet + ' ' + wallet.currency_code}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{ flexDirection: 'row', marginTop: 10 }}>
|
||||
<View style={{ flex: 1 }}>
|
||||
<Text style={[styles.body2]}>{I18n.t('CREATION_DATE')}</Text>
|
||||
</View>
|
||||
<View style={{ flex: 1, alignItems: 'flex-end' }}>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.date_creation}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{ flexDirection: 'row', marginTop: 10 }}>
|
||||
<View style={{ flex: 1 }}>
|
||||
<Text tyle={[Typography.body2]}>{I18n.t('FINAL_DATE')}</Text>
|
||||
</View>
|
||||
<View style={{ flex: 1, alignItems: 'flex-end' }}>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.date_fin}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{ flexDirection: 'row', marginTop: 10 }}>
|
||||
<View style={{ flex: 1 }}>
|
||||
<Text tyle={[Typography.body2]}>{I18n.t('CASSATION_DATE')}</Text>
|
||||
</View>
|
||||
<View style={{ flex: 1, alignItems: 'flex-end' }}>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.date_cassation}</Text>
|
||||
</View>
|
||||
</View>
|
||||
</View>
|
||||
}
|
||||
|
||||
{isEqual(historyItemDetail.type_historique, 'T') &&
|
||||
|
||||
<View>
|
||||
<View style={[styles.blockView, { borderBottomColor: Color.borderColor }]}>
|
||||
<View style={{ flexDirection: 'row', marginTop: 10 }}>
|
||||
|
|
@ -762,7 +977,7 @@ class WalletDetail extends Component {
|
|||
</View>
|
||||
|
||||
</View>
|
||||
|
||||
}
|
||||
<Dialog.Button bold={true} label={I18n.t('OK')} onPress={() => {
|
||||
this.setState({
|
||||
displaySuperHyperModalHistory: !this.state.displaySuperHyperModalHistory,
|
||||
|
|
@ -1414,7 +1629,10 @@ class WalletDetail extends Component {
|
|||
return (
|
||||
<>
|
||||
{this.state.displayModalHistory && this.renderModalHistoryDetail()}
|
||||
{this.state.displaySuperHyperModalHistory && this.renderModalSuperHyperHistoryDetail()}
|
||||
{this.props.result !== null &&
|
||||
this.state.displaySuperHyperModalHistory &&
|
||||
this.renderModalSuperHyperHistoryDetail(this.props.result.response)}
|
||||
|
||||
<StatusBar
|
||||
backgroundColor={Color.primaryDarkColor}
|
||||
barStyle="light-content"
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ import _ from 'lodash';
|
|||
import Icons from 'react-native-vector-icons/Ionicons'
|
||||
import { FontWeight, Typography } from '../../config/typography';
|
||||
import LottieView from 'lottie-react-native';
|
||||
import { isIlinkWorldWallet, optionDepotScreen, optionPaiementFactureSubScreen, displayTransactionType, displayToast, cutStringWithoutDot, cutString } from '../../utils/UtilsFunction';
|
||||
import { isIlinkWorldWallet, optionDepotScreen, optionPaiementFactureSubScreen, displayTransactionType, displayToast, cutStringWithoutDot, cutString, transactionHistoryIlinkLabel } from '../../utils/UtilsFunction';
|
||||
import chunk from 'lodash/chunk';
|
||||
import thousands from 'thousands';
|
||||
import Tag from '../../components/Tag';
|
||||
|
|
@ -384,7 +384,7 @@ class WalletOptionSelect extends Component {
|
|||
<>
|
||||
<View style={[styles.contentService, { borderBottomColor: Color.primaryColor }]}>
|
||||
{
|
||||
transactionHistoryNanoCreditLabel().map((item, index) => (
|
||||
transactionHistoryIlinkLabel().map((item, index) => (
|
||||
<View style={{ alignItems: 'center' }} key={index}>
|
||||
<Icon name={item.icon} size={24} color={Color.primaryColor} />
|
||||
<Text style={[Typography.overline, Color.grayColor], { marginTop: 4 }}>
|
||||
|
|
@ -418,7 +418,7 @@ class WalletOptionSelect extends Component {
|
|||
{
|
||||
|
||||
!isNil(this.state.user.category) ?
|
||||
Object.keys(omit(item, ['id', 'retrait_cash', 'id_demande', 'montant_rembourse', 'partiellement_rembourse', 'duree_mois', 'etat', 'interet', 'taxe', 'date_validation', 'date_remboursement_prevu', 'date_remboursement', 'id_user', 'id_wallet_agent', 'id_network', 'user', 'user_phone', 'agent', 'codeParrain'])).map((element, i) => (
|
||||
Object.keys(omit(item, ['id', 'retrait_cash', 'type_historique', 'type_caution', 'id_demande', 'montant_rembourse', 'partiellement_rembourse', 'duree_mois', 'etat', 'interet', 'taxe', 'date_validation', 'date_remboursement_prevu', 'date_remboursement', 'id_user', 'id_wallet_agent', 'id_network', 'user', 'user_phone', 'agent', 'codeParrain'])).map((element, i) => (
|
||||
<View style={{ alignItems: 'center' }} key={i}>
|
||||
|
||||
<Text style={[Typography.overline, Color.grayColor], { marginTop: 4 }}>
|
||||
|
|
@ -426,9 +426,7 @@ class WalletOptionSelect extends Component {
|
|||
isEqual(element, 'montant') ?
|
||||
` ${thousands(item[element], ' ')} ${this.state.wallet.currency_code}`
|
||||
: isEqual(element, 'date_creation') ?
|
||||
cutStringWithoutDot(item[element], 16) :
|
||||
isEqual(element, 'type_historique') ?
|
||||
displayTransactionType(item[element])
|
||||
cutStringWithoutDot(item[element], 16)
|
||||
: item[element]
|
||||
}
|
||||
</Text>
|
||||
|
|
|
|||
Loading…
Reference in New Issue