adminnistrateur
/
ilink-world
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correction de bugs

This commit is contained in:
Brice Zele 2020-12-05 18:14:33 +01:00
parent 210d09c49f
commit 5bfad5f025
8 changed files with 1598 additions and 1440 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
redux/actions/EnvoieUserType.js
View File

@ -1,125 +1,144 @@
import {
ENVOIE_WALLET_TO_WALLET_USER_PENDING, ENVOIE_WALLET_TO_WALLET_USER_SUCCESS, ENVOIE_WALLET_TO_WALLET_USER_ERROR, ENVOIE_WALLET_TO_WALLET_USER_RESET, ENVOIE_WALLET_TO_WALLET_USER_GET_COMMISSION_ERROR,
ENVOIE_WALLET_TO_WALLET_USER_GET_COMMISSION_PENDING, ENVOIE_WALLET_TO_WALLET_USER_GET_COMMISSION_SUCCESS, ENVOIE_WALLET_TO_WALLET_USER_GET_COMMISSION_RESET, ENVOIE_WALLET_TO_CASH_USER_GET_COMMISSION_PENDING, ENVOIE_WALLET_TO_CASH_USER_SUCCESS, ENVOIE_WALLET_TO_CASH_USER_ERROR, ENVOIE_WALLET_TO_CASH_USER_RESET,
ENVOIE_WALLET_TO_CASH_USER_GET_COMMISSION_SUCCESS, ENVOIE_WALLET_TO_CASH_USER_GET_COMMISSION_ERROR, ENVOIE_WALLET_TO_CASH_USER_GET_COMMISSION_RESET,
ENVOIE_WALLET_TO_CARD_USER_PENDING, ENVOIE_WALLET_TO_CARD_USER_SUCCESS, ENVOIE_WALLET_TO_CARD_USER_ERROR, ENVOIE_WALLET_TO_CARD_USER_RESET,
ENVOIE_WALLET_TO_CARD_USER_GET_COMMISSION_PENDING, ENVOIE_WALLET_TO_CARD_USER_GET_COMMISSION_SUCCESS, ENVOIE_WALLET_TO_CARD_USER_GET_COMMISSION_ERROR, ENVOIE_WALLET_TO_CARD_USER_GET_COMMISSION_RESET
ENVOIE_WALLET_TO_CARD_USER_ERROR,
ENVOIE_WALLET_TO_CARD_USER_GET_COMMISSION_ERROR,
ENVOIE_WALLET_TO_CARD_USER_GET_COMMISSION_PENDING,
ENVOIE_WALLET_TO_CARD_USER_GET_COMMISSION_RESET,
ENVOIE_WALLET_TO_CARD_USER_GET_COMMISSION_SUCCESS,
ENVOIE_WALLET_TO_CARD_USER_PENDING,
ENVOIE_WALLET_TO_CARD_USER_RESET,
ENVOIE_WALLET_TO_CARD_USER_SUCCESS,
ENVOIE_WALLET_TO_CASH_USER_ERROR,
ENVOIE_WALLET_TO_CASH_USER_GET_COMMISSION_ERROR,
ENVOIE_WALLET_TO_CASH_USER_GET_COMMISSION_PENDING,
ENVOIE_WALLET_TO_CASH_USER_GET_COMMISSION_RESET,
ENVOIE_WALLET_TO_CASH_USER_GET_COMMISSION_SUCCESS,
ENVOIE_WALLET_TO_CASH_USER_PENDING,
ENVOIE_WALLET_TO_CASH_USER_RESET,
ENVOIE_WALLET_TO_CASH_USER_SUCCESS,
ENVOIE_WALLET_TO_WALLET_USER_ERROR,
ENVOIE_WALLET_TO_WALLET_USER_GET_COMMISSION_ERROR,
ENVOIE_WALLET_TO_WALLET_USER_GET_COMMISSION_PENDING,
ENVOIE_WALLET_TO_WALLET_USER_GET_COMMISSION_RESET,
ENVOIE_WALLET_TO_WALLET_USER_GET_COMMISSION_SUCCESS,
ENVOIE_WALLET_TO_WALLET_USER_PENDING,
ENVOIE_WALLET_TO_WALLET_USER_RESET,
ENVOIE_WALLET_TO_WALLET_USER_SUCCESS
} from "../types/EnvoieUserType";
export const fetchEnvoieUserWalletToWalletPending = () => ({
type: ENVOIE_WALLET_TO_WALLET_USER_PENDING
type: ENVOIE_WALLET_TO_WALLET_USER_PENDING
});
export const fetchEnvoieUserWalletToWalletSuccess = (res) => ({
type: ENVOIE_WALLET_TO_WALLET_USER_SUCCESS,
result: res,
type: ENVOIE_WALLET_TO_WALLET_USER_SUCCESS,
result: res,
});
export const fetchEnvoieUserWalletToWalletError = (error) => ({
type: ENVOIE_WALLET_TO_WALLET_USER_ERROR,
result: error
type: ENVOIE_WALLET_TO_WALLET_USER_ERROR,
result: error
});
export const fetchEnvoieUserWalletToWalletReset = (error) => ({
type: ENVOIE_WALLET_TO_WALLET_USER_RESET
type: ENVOIE_WALLET_TO_WALLET_USER_RESET
});
/****************/
export const fetchEnvoieUserWalletToWalleGetCommissiontPending = () => ({
type: ENVOIE_WALLET_TO_WALLET_USER_GET_COMMISSION_PENDING
type: ENVOIE_WALLET_TO_WALLET_USER_GET_COMMISSION_PENDING
});
export const fetchEnvoieUserWalletToWalletGetCommissionSuccess = (res) => ({
type: ENVOIE_WALLET_TO_WALLET_USER_GET_COMMISSION_SUCCESS,
result: res,
type: ENVOIE_WALLET_TO_WALLET_USER_GET_COMMISSION_SUCCESS,
result: res,
});
export const fetchEnvoieUserWalletToWalletGetCommissionError = (error) => ({
type: ENVOIE_WALLET_TO_WALLET_USER_GET_COMMISSION_ERROR,
result: error
type: ENVOIE_WALLET_TO_WALLET_USER_GET_COMMISSION_ERROR,
result: error
});
export const fetchEnvoieUserWalletToWalleGetCommissiontReset = (error) => ({
type: ENVOIE_WALLET_TO_WALLET_USER_GET_COMMISSION_RESET
type: ENVOIE_WALLET_TO_WALLET_USER_GET_COMMISSION_RESET
});
/*--------------------------------------------------------------------*/
export const fetchEnvoieUserWalletToCashPending = () => ({
type: ENVOIE_WALLET_TO_CASH_USER_GET_COMMISSION_PENDING
type: ENVOIE_WALLET_TO_CASH_USER_PENDING
});
export const fetchEnvoieUserWalletToCashSuccess = (res) => ({
type: ENVOIE_WALLET_TO_CASH_USER_SUCCESS,
result: res,
type: ENVOIE_WALLET_TO_CASH_USER_SUCCESS,
result: res,
});
export const fetchEnvoieUserWalletToCashError = (error) => ({
type: ENVOIE_WALLET_TO_CASH_USER_ERROR,
result: error
type: ENVOIE_WALLET_TO_CASH_USER_ERROR,
result: error
});
export const fetchEnvoieUserWalletToCashReset = (error) => ({
type: ENVOIE_WALLET_TO_CASH_USER_RESET
export const fetchEnvoieUserWalletToCashReset = () => ({
type: ENVOIE_WALLET_TO_CASH_USER_RESET
});
/****************/
export const fetchEnvoieUserWalletToCashGetCommissiontPending = () => ({
type: ENVOIE_WALLET_TO_CASH_USER_GET_COMMISSION_PENDING
type: ENVOIE_WALLET_TO_CASH_USER_GET_COMMISSION_PENDING
});
export const fetchEnvoieUserWalletToCashGetCommissionSuccess = (res) => ({
type: ENVOIE_WALLET_TO_CASH_USER_GET_COMMISSION_SUCCESS,
result: res,
type: ENVOIE_WALLET_TO_CASH_USER_GET_COMMISSION_SUCCESS,
result: res,
});
export const fetchEnvoieUserWalletToCashGetCommissionError = (error) => ({
type: ENVOIE_WALLET_TO_CASH_USER_GET_COMMISSION_ERROR,
result: error
type: ENVOIE_WALLET_TO_CASH_USER_GET_COMMISSION_ERROR,
result: error
});
export const fetchEnvoieUserWalletToCashGetCommissiontReset = (error) => ({
type: ENVOIE_WALLET_TO_CASH_USER_GET_COMMISSION_RESET
type: ENVOIE_WALLET_TO_CASH_USER_GET_COMMISSION_RESET
});
/*--------------------------------------------------------------------*/
export const fetchEnvoieUserWalletToCardPending = () => ({
type: ENVOIE_WALLET_TO_CARD_USER_PENDING
type: ENVOIE_WALLET_TO_CARD_USER_PENDING
});
export const fetchEnvoieUserWalletToCardSuccess = (res) => ({
type: ENVOIE_WALLET_TO_CARD_USER_SUCCESS,
result: res,
type: ENVOIE_WALLET_TO_CARD_USER_SUCCESS,
result: res,
});
export const fetchEnvoieUserWalletToCardError = (error) => ({
type: ENVOIE_WALLET_TO_CARD_USER_ERROR,
result: error
type: ENVOIE_WALLET_TO_CARD_USER_ERROR,
result: error
});
export const fetchEnvoieUserWalletToCardReset = (error) => ({
type: ENVOIE_WALLET_TO_CARD_USER_RESET
type: ENVOIE_WALLET_TO_CARD_USER_RESET
});
/****************/
export const fetchEnvoieUserWalletToCardGetCommissiontPending = () => ({
type: ENVOIE_WALLET_TO_CARD_USER_GET_COMMISSION_PENDING
type: ENVOIE_WALLET_TO_CARD_USER_GET_COMMISSION_PENDING
});
export const fetchEnvoieUserWalletToCardGetCommissionSuccess = (res) => ({
type: ENVOIE_WALLET_TO_CARD_USER_GET_COMMISSION_SUCCESS,
result: res,
type: ENVOIE_WALLET_TO_CARD_USER_GET_COMMISSION_SUCCESS,
result: res,
});
export const fetchEnvoieUserWalletToCardGetCommissionError = (error) => ({
type: ENVOIE_WALLET_TO_CARD_USER_GET_COMMISSION_ERROR,
result: error
type: ENVOIE_WALLET_TO_CARD_USER_GET_COMMISSION_ERROR,
result: error
});
export const fetchEnvoieUserWalletToCardGetCommissiontReset = (error) => ({
type: ENVOIE_WALLET_TO_CARD_USER_GET_COMMISSION_RESET
type: ENVOIE_WALLET_TO_CARD_USER_GET_COMMISSION_RESET
});

61
redux/reducers/EnvoieUserWalletToCashReducer.js
View File

@ -1,33 +1,42 @@
import { ENVOIE_WALLET_TO_CASH_USER_PENDING, ENVOIE_WALLET_TO_CASH_USER_SUCCESS, ENVOIE_WALLET_TO_CASH_USER_ERROR } from "../types/EnvoieUserType";
import {
ENVOIE_WALLET_TO_CASH_USER_ERROR,
ENVOIE_WALLET_TO_CASH_USER_PENDING,
ENVOIE_WALLET_TO_CASH_USER_RESET,
ENVOIE_WALLET_TO_CASH_USER_SUCCESS
} from "../types/EnvoieUserType";
const initialState = {
loading: false,
result: null,
error: null
loading: false,
result: null,
error: null
};
export default (state = initialState, action) => {
switch (action.type) {
case ENVOIE_WALLET_TO_CASH_USER_PENDING: return {
...state,
loading: true
}
case ENVOIE_WALLET_TO_CASH_USER_SUCCESS: return {
...state,
loading: false,
result: action.result.data,
error: null
}
case ENVOIE_WALLET_TO_CASH_USER_ERROR: return {
...state,
loading: false,
result: null,
error: action.result
}
case ENVOIE_WALLET_TO_CASH_USER_PENDING: return initialState;
switch (action.type) {
case ENVOIE_WALLET_TO_CASH_USER_PENDING:
return {
...state,
loading: true
}
case ENVOIE_WALLET_TO_CASH_USER_SUCCESS:
return {
...state,
loading: false,
result: action.result.data,
error: null
}
case ENVOIE_WALLET_TO_CASH_USER_ERROR:
return {
...state,
loading: false,
result: null,
error: action.result
}
case ENVOIE_WALLET_TO_CASH_USER_RESET:
return initialState;
default: {
return state;
}
}
default: {
return state;
}
}
};

161
screens/account/UpdateInformations.js
View File

@ -1,21 +1,21 @@
import React,{Component} from 'react';
import {StyleSheet,View,Text,Image,StatusBar,ScrollView,Alert} from 'react-native';
let theme=require('./../../utils/theme.json');
import {readUser,updatePosition,updateUserData} from './../../webservice/AuthApi';
import {getAgentNetworksList} from './../../webservice/NetworkApi'
import {responsiveHeight, responsiveWidth} from 'react-native-responsive-dimensions';
import MapView,{Marker} from 'react-native-maps';
import React, {Component} from 'react';
import {Alert, View} from 'react-native';
import {readUser, updatePosition, updateUserData} from './../../webservice/AuthApi';
import {responsiveHeight} from 'react-native-responsive-dimensions';
import Icon from 'react-native-vector-icons/FontAwesome5'
import Button from 'apsl-react-native-button'
import CardView from "react-native-cardview";
const route=require('./../../route.json')
import I18n from 'react-native-i18n'
import {Header} from "react-native-elements";
import {IlinkEmitter} from "../../utils/events";
import Geolocation from 'react-native-geolocation-service';
let theme = require('./../../utils/theme.json');
const route = require('./../../route.json')
require('./../../utils/Translations')
const height=responsiveHeight(100)-250;
export default class UpdateInformations extends Component {
const height = responsiveHeight(100) - 250;
export default class UpdateInformations extends Component {
static navigatorStyle = {
navBarHidden: false,
navBarBackgroundColor: theme.primaryDark,
@ -25,101 +25,114 @@ export default class UpdateInformations extends Component {
statusBarColor: theme.primaryDarkAdvanced,
statusBarTextColorScheme: 'light',
};
static options(passProps){
static options(passProps) {
return {
statusBar:{
drawBehind:false
statusBar: {
drawBehind: false
},
topBar:{
title:{
text:"Mise à jour des informations",
color:"white"
topBar: {
title: {
text: "Mise à jour des informations",
color: "white"
},
background:{
color:theme.primaryDark
background: {
color: theme.primaryDark
}
}
}
}
static navigationOptions = ({navigation})=>{
static navigationOptions = ({navigation}) => {
return {
headerTitle: I18n.t('CHANGE_INFORMATION'),
drawerIcon: ({ tintColor }) => (
<Icon
name={'user'}
size={24}
/>
),
}};
constructor(props){
headerTitle: I18n.t('CHANGE_INFORMATION'),
drawerIcon: ({tintColor}) => (
<Icon
name={'user'}
size={24}
/>
),
}
};
constructor(props) {
super(props)
this.state=this.initiateItems()
this.state = this.initiateItems()
IlinkEmitter.on("langueChange", this.updateLangue.bind(this))
this.showUserState()
}
async showUserState(){
const user=await readUser()
this.setState({user:user})
if(user.longitude<=0 && user.latitude<=0){
Alert.alert(I18n.t('TITLE_NEED_POSITION'),I18n.t('TEXT_NEED_POSITION'),[{text:'Ok'}])
async showUserState() {
const user = await readUser()
this.setState({user: user})
if (user.longitude <= 0 && user.latitude <= 0) {
Alert.alert(I18n.t('TITLE_NEED_POSITION'), I18n.t('TEXT_NEED_POSITION'), [{text: 'Ok'}])
}
}
updateLangue(){
this.props.navigation.setParams({name:I18n.t('CHANGE_INFORMATION')})
updateLangue() {
this.props.navigation.setParams({name: I18n.t('CHANGE_INFORMATION')})
this.forceUpdate()
}
render(){
render() {
return (
<View style={{flex:1,backgroundColor:theme.primary}}>
<View style={{flex: 1, backgroundColor: theme.primary}}>
<Button
isLoading={this.state.positionEnabled}
style={{backgroundColor:theme.primaryDark,
marginTop:responsiveHeight(5),
height:responsiveHeight(7),
marginRight:10,
marginLeft:10,
borderColor:'transparent'
}} textStyle={{color:"white",fontSize:20,fontWeight:'bold'}} onPress={()=>this.onClickUpdatePosition()}>{I18n.t('UPDATE_POSITION_TEXT')}</Button>
</View>);
isLoading={this.state.positionEnabled}
style={{
backgroundColor: theme.primaryDark,
marginTop: responsiveHeight(5),
height: responsiveHeight(7),
marginRight: 10,
marginLeft: 10,
borderColor: 'transparent'
}} textStyle={{color: "white", fontSize: 20, fontWeight: 'bold'}}
onPress={() => this.onClickUpdatePosition()}>{I18n.t('UPDATE_POSITION_TEXT')}</Button>
</View>);
}
initiateItems() {
return{
positionEnabled:false,
return {
positionEnabled: false,
}
}
onClickUpdatePosition() {
this.setState({positionEnabled:true})
navigator.geolocation.getCurrentPosition((position) => {
onClickUpdatePosition() {
this.setState({positionEnabled: true})
Geolocation.getCurrentPosition((position) => {
const myPosition = position.coords;
updatePosition(myPosition.longitude,myPosition.latitude).then((response)=> {
var title='';
var message='';
this.setState({positionEnabled:false})
updatePosition(myPosition.longitude, myPosition.latitude).then((response) => {
var title = '';
var message = '';
this.setState({positionEnabled: false})
console.log(response.error)
if(response.error===undefined){
updateUserData({longitude:myPosition.longitude,latitude:myPosition.latitude})
message=I18n.t('POSITION_UPDATE_SUCCESS_TEXT')
title=I18n.t('UPDATE_SUCCESS');
}else{
title=I18n.t("TITLE_UPDATE_POSITION_FAILED")
switch (response.error){
case -3:message=I18n.t('TEXT_UDATE_POSITION_FAILED_1');break
case -2:message=I18n.t('TEXT_UDATE_POSITION_FAILED_2');
break;
if (response.error === undefined) {
updateUserData({longitude: myPosition.longitude, latitude: myPosition.latitude})
message = I18n.t('POSITION_UPDATE_SUCCESS_TEXT')
title = I18n.t('UPDATE_SUCCESS');
} else {
title = I18n.t("TITLE_UPDATE_POSITION_FAILED")
switch (response.error) {
case -3:
message = I18n.t('TEXT_UDATE_POSITION_FAILED_1');
break
case -2:
message = I18n.t('TEXT_UDATE_POSITION_FAILED_2');
break;
}
}
Alert.alert(title,message,[{text:"Ok",onPress:()=>{
this.props.navigation.popToTop()
}}])
}).catch((e)=>{
this.setState({positionEnabled:false})
Alert.alert(title, message, [{
text: "Ok", onPress: () => {
this.props.navigation.popToTop()
}
}])
}).catch((e) => {
this.setState({positionEnabled: false})
})
}, null, this.props.geolocationOptions);

5
screens/history-request/MyHistory.js
View File

@ -21,7 +21,6 @@ import {accent, primary, primaryDark, purpleLight} from './../../utils/theme.jso
import {PagerTabIndicator} from 'react-native-best-viewpager'
import IconWithBadge from "../IconWithBadge";
import {Appbar, Divider, Menu, Provider} from 'react-native-paper';
import DeviceInfo from 'react-native-device-info';
var moment = require('moment-timezone');
const momentJS = require('moment');
@ -322,11 +321,11 @@ class MyHistory extends React.Component {
<Button onPress={this._openMenu}>Show menu</Button>
}
>
<Menu.Item onPress={() => {
{/* <Menu.Item onPress={() => {
this.setState({isSectionned: !this.state.isSectionned})
this._closeMenu()
}}
title="Section"/>
title="Section"/>*/}
<Divider/>
<Menu.Item onPress={() => {

1189
screens/identification/ModifyIdentificationUser.js
View File

File diff suppressed because it is too large Load Diff

3
screens/wallet/WalletOptionSelect.js
View File

@ -48,6 +48,7 @@ import {responsiveWidth} from 'react-native-responsive-dimensions';
import {getWalletDetailActivated} from "../../webservice/WalletApi";
import {getWalletTransactionHistoryUser} from "../../webservice/WalletTransactionHistoryApi";
import {getUserIdentificationAction} from "../../webservice/IdentificationApi";
import {store} from "../../redux/store";
const route = require('./../../route.json');
let slugify = require('slugify');
@ -64,7 +65,7 @@ class WalletOptionSelect extends Component {
wallet: this.props.navigation.state.params.wallet,
lottie: this.props.navigation.state.params.lottie,
onGoBack: this.props.navigation.state.params.onGoBack,
isIdentified: this.props.navigation.state.params.isIdentified || null,
isIdentified: store.getState().getUserIdentificationReducer.result !== null ? store.getState().getUserIdentificationReducer.result.response.isIdentified : false,
isNanoCredit: this.props.navigation.state.params.hasOwnProperty('isNanoCredit'),
user: null,
displayModalHistory: false,

1514
screens/wallet/agent/EnvoiCashVersCashAgent.js
View File

File diff suppressed because it is too large Load Diff

2
utils/i18n/fr.json
View File

@ -249,7 +249,7 @@
"DELETE_GROUP": "Supprimer le groupe",
"CREATOR": "Créateur",
"NOTIFICATIONS": "Notification",
"NO_NOTIFICATION": "Vous n'avez aucune Fnotification",
"NO_NOTIFICATION": "Vous n'avez aucune notification",
"CONFIGURATIONS": "Configuration",
"LOGOUT": "Déconnexion",
"HINT_HOME_SEARCH": " Chercher un lieu, quartier ou ville ",