notification working

This commit is contained in:
Brice Zele 2020-08-24 20:18:19 +01:00
parent 5e0d806967
commit 04c20dd6f8
20 changed files with 1103 additions and 754 deletions

31
App.js
View File

@ -134,9 +134,34 @@ const AppStack = createDrawerNavigator({
createGroupNanoCredit: CreateGroupNanoCredit,
groupNanoCredit: {
screen: createBottomTabNavigator({
demandeValidationGroupe: DemandValidationGroup,
myNanoCreditGroup: MyNanoCreditGroup,
OthersDemand: UserAccount
demandeValidationGroupe: {
screen: DemandValidationGroup,
navigationOptions: {
tabBarLabel: I18n.t('DEMAND_VALIDATION_GROUP_RECEIVE'),
tabBarIcon: ({ focused, horizontal, tintColor }) => {
return (<IconWithBadge
badgeCount={0}
size={20}
name={"account-multiple-plus"}
color={focused ? tintColor : "grey"}
/>)
}
}
},
myNanoCreditGroup: {
screen: MyNanoCreditGroup,
navigationOptions: {
tabBarLabel: I18n.t('MY_GROUP'),
tabBarIcon: ({ focused, horizontal, tintColor }) => {
return (<IconWithBadge
badgeCount={0}
size={20}
name={"account-multiple"}
color={focused ? tintColor : "grey"}
/>)
}
}
},
}, {
headerMode: "none",
header: null,

File diff suppressed because one or more lines are too long

View File

@ -56,5 +56,6 @@
"createGroupNanoCredit": "createGroupNanoCredit",
"groupNanoCredit": "groupNanoCredit",
"demandGroupNanoCreditDetail": "demandeValidationGroupe",
"adhererGroupNanoCredit": "adhererGroupNanoCredit"
"adhererGroupNanoCredit": "adhererGroupNanoCredit",
"myNanoCreditGroup": "myNanoCreditGroup"
}

View File

@ -171,6 +171,8 @@
"ACTIVATED": "has been activated",
"CREDIT_MANAGE": "Credit Management",
"GROUP_MANAGE": "Group Management",
"MODIFY_GROUP": "Modify group",
"DELETE_GROUP": "Delete group",
"CREATOR": "Creator",
"NOTIFICATIONS": "Notification",
"NO_NOTIFICATION": "You haven't any notification",
@ -416,6 +418,8 @@
"DEMAND_TEXT_FIRST_PART_YOU": "You made a request for ",
"REQUEST_SEND": "Request Sent",
"DEMAND_RECEIVE": "Requests received",
"DEMAND_VALIDATION_GROUP_RECEIVE": "Validation requests",
"DEMAND_DELETE_GROUP_RECEIVE": "Removal requests",
"TO_": "credit to",
"DEMAND_SEND_SUCCESFUL": "Your request has been sent successfully!",
"SAVE_HISTORY": "Save history",

View File

@ -176,6 +176,8 @@
"ACTIVATED": "a été activé",
"CREDIT_MANAGE": "Gestion de credit",
"GROUP_MANAGE": "Gestion du groupe",
"MODIFY_GROUP": "Modifier le groupe",
"DELETE_GROUP": "Supprimer le groupe",
"CREATOR": "Créateur",
"NOTIFICATIONS": "Notification",
"NO_NOTIFICATION": "Vous n'avez aucune Fnotification",
@ -421,6 +423,8 @@
"DEMAND_TEXT_FIRST_PART_YOU": "Vous avez effectué une demande de ",
"DEMANDE_SEND": " Demande Envoyée",
"DEMAND_RECEIVE": "Demandes reçues",
"DEMAND_VALIDATION_GROUP_RECEIVE": "Demandes de validation",
"DEMAND_DELETE_GROUP_RECEIVE": "Demandes de suppression",
"TO_": " crédit auprès de ",
"DEMAND_SEND_SUCCESFUL": "Votre demande a été envoyée avec succès !",
"SAVE_HISTORY": "Enregistrer l'historique",

View File

@ -1,4 +1,4 @@
import { CREATE_GROUP_PENDING, CREATE_GROUP_SUCCESS, CREATE_GROUP_ERROR, CREATE_GROUP_RESET, GET_DEMAND_GROUP_PENDING, GET_DEMAND_GROUP_SUCCESS, GET_DEMAND_GROUP_ERROR, GET_DEMAND_GROUP_RESET, GET_UNIQUE_DEMAND_GROUP_PENDING, GET_UNIQUE_DEMAND_GROUP_RESET, GET_UNIQUE_DEMAND_GROUP_ERROR, GET_UNIQUE_DEMAND_GROUP_SUCCESS, TREAT_DEMAND_GROUP_PENDING, TREAT_DEMAND_GROUP_SUCCESS, TREAT_DEMAND_GROUP_ERROR, TREAT_DEMAND_GROUP_RESET, JOIN_GROUP_PENDING, JOIN_GROUP_SUCCESS, JOIN_GROUP_RESET, JOIN_GROUP_ERROR, GET_USER_GROUP_DETAIL_PENDING, GET_USER_GROUP_DETAIL_SUCCESS, GET_USER_GROUP_DETAIL_RESET } from "../types/NanoCreditType";
import { CREATE_GROUP_PENDING, CREATE_GROUP_SUCCESS, CREATE_GROUP_ERROR, CREATE_GROUP_RESET, GET_DEMAND_GROUP_PENDING, GET_DEMAND_GROUP_SUCCESS, GET_DEMAND_GROUP_ERROR, GET_DEMAND_GROUP_RESET, GET_UNIQUE_DEMAND_GROUP_PENDING, GET_UNIQUE_DEMAND_GROUP_RESET, GET_UNIQUE_DEMAND_GROUP_ERROR, GET_UNIQUE_DEMAND_GROUP_SUCCESS, TREAT_DEMAND_GROUP_PENDING, TREAT_DEMAND_GROUP_SUCCESS, TREAT_DEMAND_GROUP_ERROR, TREAT_DEMAND_GROUP_RESET, JOIN_GROUP_PENDING, JOIN_GROUP_SUCCESS, JOIN_GROUP_RESET, JOIN_GROUP_ERROR, GET_USER_GROUP_DETAIL_PENDING, GET_USER_GROUP_DETAIL_SUCCESS, GET_USER_GROUP_DETAIL_RESET, GET_USER_GROUP_DETAIL_ERROR, GET_NOTIFICATIONS_ERROR, GET_NOTIFICATIONS_RESET, GET_NOTIFICATIONS_PENDING } from "../types/NanoCreditType";
export const fetchCreateGroupPending = () => ({
type: CREATE_GROUP_PENDING
@ -108,4 +108,23 @@ export const fetchGetUserGroupDetailError = (error) => ({
export const fetchGetUserGroupDetailReset = () => ({
type: GET_USER_GROUP_DETAIL_RESET
});
export const fetchGetNotificationPending = () => ({
type: GET_NOTIFICATIONS_PENDING
});
export const fetchGetNotificationSuccess = (res) => ({
type: GET_NOTIFICATIONS_SUCCESS,
result: res,
});
export const fetchGetNotificationError = (error) => ({
type: GET_NOTIFICATIONS_ERROR,
result: error
});
export const fetchGetNotificationReset = () => ({
type: GET_NOTIFICATIONS_RESET
});

View File

@ -0,0 +1,33 @@
import { GET_NOTIFICATIONS_SUCCESS, GET_NOTIFICATIONS_ERROR, GET_NOTIFICATIONS_RESET, GET_NOTIFICATIONS_PENDING } from "../types/NanoCreditType";
const initialState = {
loading: false,
result: null,
error: null
};
export default (state = initialState, action) => {
switch (action.type) {
case GET_NOTIFICATIONS_PENDING: return {
...state,
loading: true
}
case GET_NOTIFICATIONS_SUCCESS: return {
...state,
loading: false,
result: action.result.data,
error: null
}
case GET_NOTIFICATIONS_ERROR: return {
...state,
loading: false,
result: null,
error: action.result
}
case GET_NOTIFICATIONS_RESET: return initialState;
default: {
return state;
}
}
};

View File

@ -31,6 +31,7 @@ import GetUniqueDemandsGroupReducer from "./GetUniqueDemandsGroupReducer";
import TreatDemandGroupReducer from "./TreatDemandGroupReducer";
import JoinGroupReducer from "./JoinGroupReducer";
import GetUserGroupDetailReducer from "./GetUserGroupDetailReducer";
import GetNotificationReducer from "./GetNotificationReducer";
const persistConfig = {
key: 'root',
@ -71,7 +72,8 @@ const rootReducer = persistCombineReducers(persistConfig, {
getUniqueDemandsGroupReducer: GetUniqueDemandsGroupReducer,
treatDemandGroupReducer: TreatDemandGroupReducer,
joinGroupReducer: JoinGroupReducer,
getUserGroupDetailReducer: GetUserGroupDetailReducer
getUserGroupDetailReducer: GetUserGroupDetailReducer,
getNotificationReducer: GetNotificationReducer
});

View File

@ -27,3 +27,8 @@ export const GET_USER_GROUP_DETAIL_PENDING = 'GET_USER_GROUP_DETAIL_PENDING';
export const GET_USER_GROUP_DETAIL_SUCCESS = 'GET_USER_GROUP_DETAIL_SUCCESS';
export const GET_USER_GROUP_DETAIL_ERROR = 'GET_USER_GROUP_DETAIL_ERROR';
export const GET_USER_GROUP_DETAIL_RESET = 'GET_USER_GROUP_DETAIL_RESET';
export const GET_NOTIFICATIONS_PENDING = 'GET_NOTIFICATIONS_PENDING';
export const GET_NOTIFICATIONS_SUCCESS = 'GET_NOTIFICATIONS_SUCCESS';
export const GET_NOTIFICATIONS_ERROR = 'GET_NOTIFICATIONS_ERROR';
export const GET_NOTIFICATIONS_RESET = 'GET_NOTIFICATIONS_RESET';

View File

@ -24,6 +24,30 @@ let route = require('../../route.json');
class CreateGroupNanoCredit extends Component {
constructor(props) {
super(props);
this.state = {
montant: null,
password: null,
nomGroupe: null,
limitCredit: null,
codeSponsor1: null,
codeSponsor2: null,
codeSponsor3: null,
codeGroup: null,
loading: false,
user: null,
triggerSubmitClick: false,
isSubmitClick: false,
isDataSubmit: false,
isModalConfirmVisible: false,
isGroupToModify: false,
wallet: store.getState().walletDetailReducer.result.response
};
}
static navigatorStyle = {
navBarBackgroundColor: Color.primaryColor,
statusBarColor: Color.primaryDarkColor,
@ -35,7 +59,7 @@ class CreateGroupNanoCredit extends Component {
static navigationOptions = () => {
return {
drawerLabel: () => null,
headerTitle: I18n.t('CREATE_GROUP'),
headerTitle: I18n.t('MANAGE_GROUP'),
headerTintColor: 'white',
headerStyle: {
backgroundColor: Color.primaryColor,
@ -49,32 +73,23 @@ class CreateGroupNanoCredit extends Component {
}
};
constructor(props) {
super(props);
this.state = {
montant: null,
password: null,
nomGroupe: null,
limitCredit: null,
codeSponsor1: null,
codeSponsor2: null,
codeSponsor3: null,
loading: false,
user: null,
triggerSubmitClick: false,
isSubmitClick: false,
isDataSubmit: false,
isModalConfirmVisible: false,
wallet: store.getState().walletDetailReducer.result.response
};
}
componentDidMount() {
readUser().then((user) => {
if (user) {
if (user !== undefined) {
const groupToModify = this.props.navigation.getParam('group', null);
if (!isNil(groupToModify)) {
this.setState({
limitCredit: groupToModify.limite_credit,
nomGroupe: groupToModify.nom,
codeSponsor1: groupToModify.codeSponsor1,
codeSponsor2: groupToModify.codeSponsor2,
codeSponsor3: groupToModify.codeSponsor3,
codeGroup: groupToModify.code_groupe,
isGroupToModify: true
});
}
this.setState({ user });
}
}
@ -182,16 +197,31 @@ class CreateGroupNanoCredit extends Component {
this.passwordAnim.shake(800);
else {
this.props.createGroupAction({
id_user: this.state.user.id,
nom: this.state.nomGroupe,
code_sponsor1: this.state.codeSponsor1,
code_sponsor2: this.state.codeSponsor2,
code_sponsor3: this.state.codeSponsor3,
password: this.state.password,
limite_credit: this.state.limitCredit
});
if (this.state.isGroupToModify) {
this.props.createGroupAction({
id_user: this.state.user.id,
nom: this.state.nomGroupe,
code_group: this.state.codeGroup,
code_sponsor1: this.state.codeSponsor1,
code_sponsor2: this.state.codeSponsor2,
code_sponsor3: this.state.codeSponsor3,
password: this.state.password,
limite_credit: this.state.limitCredit,
code_groupe: this.state.codeGroup
}, 1);
} else {
this.props.createGroupAction({
id_user: this.state.user.id,
nom: this.state.nomGroupe,
code_sponsor1: this.state.codeSponsor1,
code_sponsor2: this.state.codeSponsor2,
code_sponsor3: this.state.codeSponsor3,
password: this.state.password,
limite_credit: this.state.limitCredit
}, 0);
}
}
this.setState({
isDataSubmit: true
@ -330,7 +360,7 @@ class CreateGroupNanoCredit extends Component {
<Button style={styles.btnvalide}
textStyle={styles.textbtnvalide}
onPress={() => { this.onSubmitSendWalletToCard(); }}>
{I18n.t('SUBMIT_LABEL')}</Button>
{this.state.isGroupToModify ? I18n.t('MODIFY') : I18n.t('SUBMIT_LABEL')}</Button>
</ScrollView>
</>
)

View File

@ -59,44 +59,6 @@ import { Color } from '../../config/Color';
class DemandValidationGroup extends React.Component {
static navigatorStyle = {
navBarBackgroundColor: primary,
statusBarColor: primaryDark,
navBarTextColor: '#FFFFFF',
navBarButtonColor: '#FFFFFF',
contextualMenuStatusBarColor: theme.accent,
contextualMenuBackgroundColor: theme.accentLight,
contextualMenuButtonsColor: '#ffffff'
};
static navigationOptions = ({ navigation }) => {
const { routeName } = navigation.state
return {
tabBarLabel: routeName === "demandeValidationGroupe" ? I18n.t('DEMAND_VALIDATION_GROUP_RECEIVE')
: routeName === "myNanoCreditGroup" ? I18n.t('My_GROUP')
: I18n.t('DEMAND_DELETE_GROUP_RECEIVE'),
tabBarIcon: ({ focused, horizontal, tintColor }) => {
return (<IconWithBadge
badgeCount={navigation.getParam("count", 0)}
size={20}
name={routeName === "demandeValidationGroupe" ? "account-multiple-plus"
: routeName === "myNanoCreditGroup" ? "account-multiple"
: "account-multiple-minus"}
color={focused ? tintColor : "grey"}
/>)
},
drawerLabel: I18n.t('MANAGE_GROUP'),
drawerIcon: ({ tintColor }) => (
<Icon
name={'credit-card'}
size={24}
/>
),
}
};
constructor(props) {
super(props, true);
this.state = {
@ -132,10 +94,24 @@ class DemandValidationGroup extends React.Component {
//IlinkEmitter.on('treatNanoGroupDemand', this.refreshData);
};
static navigatorStyle = {
navBarBackgroundColor: primary,
statusBarColor: primaryDark,
navBarTextColor: '#FFFFFF',
navBarButtonColor: '#FFFFFF',
contextualMenuStatusBarColor: theme.accent,
contextualMenuBackgroundColor: theme.accentLight,
contextualMenuButtonsColor: '#ffffff'
};
componentDidMount() {
const { routeName } = this.navigation.state
this.setState({ position: routeName === "demandeValidationGroupe" ? 0 : 1,
isDataSubmit: true });
this.setState({
position: routeName === "demandeValidationGroupe" ? 0
: routeName === "myNanoCreditGroup" ? 1
: 2
});
this.animateSlidingUp(false)
}
@ -328,6 +304,7 @@ class DemandValidationGroup extends React.Component {
<Appbar.Action icon="refresh" onPress={() => { this.refreshData() }} />
{/* <Appbar.Action icon="more-vert" onPress={() => { this._openMenu(); this.renderSliding(); }} /> */}
</Appbar.Header>
{this.state.position === 0 ?
this.props.loadingGetDemandsGroup ?
this.renderLoader() :

View File

@ -24,7 +24,7 @@ import Dialog from "react-native-dialog";
import { FontWeight } from '../../config/typography'
import DeviceInfo from 'react-native-device-info'
import { getNanoCreditUniqueDemandsAction, getNanoCreditUniqueDemandsReset } from '../../webservice/user/NanoCreditApi'
import { treatDemandGroupAction, treatDemandGroupReset } from '../../webservice/NanoCreditApi'
import { treatDemandGroupAction, treatDemandGroupReset, cancelDemandGroupAction } from '../../webservice/NanoCreditApi'
import { IlinkEmitter } from '../../utils/events';
class DemandGroupNanoCreditDetail extends Component {
@ -123,17 +123,15 @@ class DemandGroupNanoCreditDetail extends Component {
this.props.treatDemandGroupReset();
this.props.treatDemandGroupAction({
id_demande: this.props.resultGetUniqueDemand.response.id,
id_user: this.state.user.id,
type: "creation"
id_user: this.state.user.id
});
}
onCancelDemand = () => {
this.props.treatDemandGroupReset();
this.props.treatDemandGroupAction({
this.props.cancelDemandGroupAction({
id_demande: this.props.resultGetUniqueDemand.response.id,
id_user: this.state.user.id,
type: "suppression"
id_user: this.state.user.id
});
}
@ -506,6 +504,7 @@ const mapDispatchToProps = dispatch => bindActionCreators({
getNanoCreditUniqueDemandsReset: getNanoCreditUniqueDemandsReset,
treatDemandGroupAction: treatDemandGroupAction,
cancelDemandGroupAction: cancelDemandGroupAction,
treatDemandGroupReset: treatDemandGroupReset,
treatCreditDemand: treatCreditDemand,

View File

@ -1,443 +1,549 @@
import React, { Component } from 'react';
import { StyleSheet, View, Text, Image, StatusBar, TouchableOpacity, ScrollView, ProgressBarAndroid, Alert } from 'react-native';
let theme = require('./../../utils/theme.json');
import React, { Component } from 'react'
import { StyleSheet, View, Text, Alert, Platform, ScrollView, ProgressBarAndroid, StatusBar } from 'react-native'
import CardView from 'react-native-cardview'
import Button from 'apsl-react-native-button'
import { responsiveHeight, responsiveWidth } from 'react-native-responsive-dimensions'
import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
import { readUser, deleteUser } from './../../webservice/AuthApi';
import { getAgentNetworksList } from './../../webservice/NetworkApi'
import { responsiveHeight, responsiveWidth } from 'react-native-responsive-dimensions';
import MapView, { Marker } from 'react-native-maps';
import * as Utils from '../../utils/DeviceUtils';
import Button from 'apsl-react-native-button';
import { Typography, FontWeight } from '../../config/typography';
import CardView from "react-native-cardview";
import I18n from 'react-native-i18n'
import { Header } from 'react-native-elements'
import { IlinkEmitter } from "../../utils/events";
import { Card, CardTitle, CardContent, CardAction, CardButton, CardImage } from 'react-native-material-cards'
import { Color } from '../../config/Color';
let route = require('../../route.json');
import { updateCreditDemand } from "../../webservice/HistoryRequestApi";
import { readUser } from "../../webservice/AuthApi";
let typesta = 0
let moment = require('moment-timezone')
var colorback = 'white'
import I18n from "react-native-i18n";
import { treatCreditDemand, creditDemandResetReducer } from '../../webservice/CreditTreatDemandApi';
import { treatCancelDemand, creditCancelResetReducer } from '../../webservice/CreditCancelDemandeApi';
import { getAgentNetworksList } from "../../webservice/NetworkApi";
import { Header } from "react-native-elements";
let theme = require('./../../utils/theme.json');
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import Toast from 'react-native-root-toast';
import { Color } from '../../config/Color'
const route = require("./../../route.json");
import Dialog from "react-native-dialog";
import { FontWeight } from '../../config/typography'
import DeviceInfo from 'react-native-device-info'
import { getNanoCreditUniqueDemandsAction, getNanoCreditUniqueDemandsReset, getUserGroupDetailAction, getUserGroupDetailReset } from '../../webservice/user/NanoCreditApi'
import { treatDemandGroupAction, treatDemandGroupReset, createGroupAction, createGroupReset } from '../../webservice/NanoCreditApi'
import { IlinkEmitter } from '../../utils/events';
import { Appbar, Paragraph, Menu, Divider, Provider } from 'react-native-paper';
require('./../../utils/Translations')
const height = responsiveHeight(100) - 250;
/*
var Fabric = require('react-native-fabric');
var { Crashlytics } = Fabric;*/
export default class MyNanoCreditGroup extends Component {
class MyNanoCreditGroup extends Component {
static navigatorStyle = {
navBarHidden: false,
navBarBackgroundColor: theme.primaryDark,
navBarTextColor: 'white',
navBarButtonColor: 'white',
drawUnderStatusBar: false,
statusBarColor: theme.primaryDarkAdvanced,
statusBarTextColorScheme: 'light',
navBarBackgroundColor: theme.accentLight,
statusBarColor: theme.accent,
navBarTextColor: '#FFFFFF',
navBarButtonColor: '#FFFFFF',
};
static navigationOptions = ({ navigation }) => {
return {
headerTitle: I18n.t('USER_ACCOUNT'),
headerStyle: {
backgroundColor: theme.primary,
paddingTop: 10
},
headerTitleStyle: {
color: "white"
},
drawerIcon: ({ tintColor }) => (
<Icon
name={'person'}
size={24}
/>
),
drawerLabel: () => null,
title: I18n.t('GROUP') + ' N°' + navigation.getParam("id", "-")
}
};
static options(passProps) {
return {
topBar: {
drawBehind: false,
visible: true,
animate: true,
buttonColor: 'white',
background: {
color: theme.primaryDark,
},
rightButtons: []
},
backButton: {
visible: true,
color: "white"
},
buttonColor: "white",
background: {
color: theme.primaryDark
},
statusBar: {
drawBehind: false,
visible: true,
}
};
}
constructor(props) {
super(props)
this.state = this.initState();
IlinkEmitter.on("langueChange", this.updateLangue.bind(this))
readUser().then((user) => {
if (user !== null) {
this.setState({ user: user })
this.updateContent(user)
constructor(props) {
super(props);
/* this.item = this.props.navigation.getParam("item", null);
let sta = ''
if (this.item.status === '1') {
typesta = 1
colorback = '#AEAEAE'
sta = I18n.t('TREAT_DEMAND')
} else if (this.item.status === '0') {
colorback = 'green'
typesta = 2
sta = I18n.t('ACCEPTER_DEMANDE')
}
else {
colorback = '#AEAEAE'
typesta = 2
sta = I18n.t('REFUSED')
} */
this.state = {
displayAmountModifyDialog: false,
/* statut: sta, */
user: null,
networks: [],
loadingTreat: false,
loadingCancel: false,
triggerTreatmentClick: false,
triggerCancelClick: false,
color: colorback,
montant: null,
isBtnModifyAmountEnabled: false,
id: this.props.navigation.getParam("id", null)
}
this.currentLocale = DeviceInfo.getDeviceLocale().includes("fr") ? "fr" : "en-gb";
moment.locale(this.currentLocale);
this.props.getUserGroupDetailAction();
this.props.createGroupReset();
readUser().then((user) => {
if (user) {
if (user !== undefined) {
this.props.getUserGroupDetailAction(user.user_code);
}
}
})
}
updateLangue() {
this.props.navigation.setParams({ name: I18n.t('USER_ACCOUNT') })
this.forceUpdate()
}
updateContent(user) {
getAgentNetworksList(user.agentId).then((networks) => {
if (networks['success'] !== undefined) {
this.setState({ mynetworks: networks.networks })
componentDidMount() {
readUser().then((user) => {
if (user) {
if (user !== undefined) {
this.setState({ user });
}
}
});
this.setState({ user: user });
}
initState() {
return {
user: {},
mynetworks: []
displayToast = (message) => {
Toast.show(message, {
duration: Toast.durations.SHORT,
position: Toast.positions.BOTTOM,
backgroundColor: Color.primaryColor,
shadow: true,
animation: true,
hideOnPress: true,
delay: 0,
onShow: () => {
// calls on toast\`s appear animation start
},
onShown: () => {
// calls on toast\`s appear animation end.
},
onHide: () => {
// calls on toast\`s hide animation start.
},
onHidden: () => {
// calls on toast\`s hide animation end.
}
});
}
onCancelDemand = () => {
this.props.createGroupReset();
this.props.createGroupAction({
id_demande: this.props.resultGetUniqueDemand.response.id,
id_user: this.state.user.id,
code_groupe: this.props.resultGetUniqueDemand.response.code_groupe
});
}
renderAlertErrorDeleteDemand = () => {
const { errorTreatDemand, resultTreatDemand, resultCancelDemand, errorCancelDemand } = this.props;
if (errorTreatDemand !== null) {
if (typeof errorTreatDemand.data !== 'undefined') {
Alert.alert(
I18n.t("ERROR_TREATMENT_DEMAND"),
errorTreatDemand.data.error,
[
{
text: I18n.t("OK"), onPress: () => {
this.props.createGroupReset();
}
}
],
{ cancelable: false }
);
}
}
if (resultTreatDemand !== null) {
console.log("resultTreatDemand", resultTreatDemand);
if (resultTreatDemand.status === 200) {
this.displayToast(resultTreatDemand.response);
this.props.navigation.goBack();
//IlinkEmitter.emit('treatNanoGroupDemand');
this.props.createGroupReset();
}
}
}
render() {
renderLabelState = (state) => {
if (state === 0)
return I18n.t('NO_TREAT')
else if (state === 1)
return I18n.t('TREAT')
else
return I18n.t('REFUSED')
}
let cat = "";
const { user } = this.state
if (user.category !== undefined || user.category !== null)
cat = user.category === 'super' ? I18n.t("ADMIN") : user.category === 'hyper' ?
I18n.t("SUPER_ADMIN") : user.category === 'geolocated' ?
I18n.t("GEOLOCATED") : I18n.t("SIMPLE_USER")
renderBtn() {
const { resultGetUniqueDemand } = this.props
return (
<View style={styles.container}>
<StatusBar
backgroundColor={theme.primaryDark}
barStyle="light-content"
translucent={false}
/>
<ScrollView style={{
<View style={{
flexDirection: 'row',
paddingTop: 10
}}>
<View style={{
flex: 1,
marginTop: -5
alignItems: 'center'
}}>
<View style={styles.userInformation}>
<ScrollView>
<View style={{ flex: 1, justifyContent: 'center', alignItems: 'center' }}>
<Image source={require('./../../datas/img/users/man.png')} style={{ width: 92, height: 92 }} />
</View>
<View style={{ flex: 1, flexDirection: 'row' }}>
{user.category === undefined || user.category === null ?
this.getHeaderLeftProfil(user) : this.getHeaderLeftAgentProfil(user)
}
<View style={{ flex: user.category === undefined || user.category === null ? 2 : 2 }}>
<Text style={styles.textInformation} >{this.state.user.firstname}</Text>
<Text style={styles.textInformation} >{this.state.user.lastname}</Text>
{<Text style={{ color: 'white', fontSize: 17, fontWeight: 'bold', textAlign: 'center' }}>{cat}</Text>
}
<Button
style={{
borderColor: 'transparent',
borderRadius: 6,
marginLeft: 5,
marginRight: 5,
backgroundColor: 'green'
}}
onPress={() => {
this.setState({
triggerTreatmentClick: true
});
this.props.navigation.push(route.createGroupNanoCredit, { group: resultGetUniqueDemand.response })
}}
textStyle={styles.textbtnstyle}
>
{I18n.t('MODIFY_GROUP')}
</Button>
</View>
</View>
{user.category === undefined || user.category === null ?
this.getHeaderRight(user)
: this.getHeaderRightAgent(user)}
<View style={{
flex: 1,
alignItems: 'center'
}}>
<Button
style={{
borderColor: 'transparent',
borderRadius: 6,
marginLeft: 5,
marginRight: 5,
backgroundColor: Color.redColor
}}
isLoading={this.props.loadingTreatDemand}
onPress={() => {
this.setState({
triggerCancelClick: true
});
this.onCancelDemand();
}}
textStyle={styles.textbtnstyle}
>
{I18n.t('DELETE_GROUP')}
</Button>
</View>
</View>)
</View>
</ScrollView>
}
</View>
<View style={styles.networkInformation}>
<Text style={{
marginLeft: 10, marginRight: 10, marginTop: 15, marginBottom: 5, fontSize: 17,
fontWeight: 'bold', color: 'black'
}}>{I18n.t("ACCOUNT_INFO")}</Text>
<CardView style={{ marginLeft: 10, marginRight: 10, paddingBottom: 20 }}>
<ScrollView>
{user.category !== undefined && user.category !== null ? this
.addAgentInformation(user) : null}
<Text style={styles.textInformation2}>
<Icon name={"location-on"} size={18} />{" " + this.state.user.country}</Text>
{user.balance !== undefined && user.balance !== null ? this.showBalance(user) : null}
<Text style={styles.textInformation2}>
<Icon name={"mail"} size={18} />{" " + this.state.user.email}</Text>
<Text style={styles.textInformation2}>
<Icon name={"phone"} size={18} />
{" " + this.state.user.phone}</Text>
{this.showPhoneSup()}
<Text style={styles.textInformation2}>
<Icon name={"signal-cellular-4-bar"} size={18} />
{" " + this.state.user.network}</Text>
</ScrollView>
</CardView>
{user.category === 'geolocated' ?
(<Text style={{ marginLeft: 10, marginRight: 10, marginTop: 15, marginBottom: 5, fontSize: 17, fontWeight: 'bold', color: 'black' }}>{I18n.t("MY_NETWORK")}</Text>)
: null}
{user.category === 'geolocated' ? (this.state.mynetworks.length > 0 ? this.state.mynetworks.map(item => this.generateItemNetwork(item)) : this.showLoader()) : null}
</View>
</ScrollView>
renderLoader = () => {
return (
<View style={{ flex: 1, justifyContent: 'center', alignItems: 'center' }}>
{Platform.OS === 'android'
?
(
<>
<ProgressBarAndroid />
<Text>{I18n.t('LOADING_DOTS')}</Text>
</>
) :
<>
<ActivityIndicator size="large" color={'#ccc'} />
<Text>{I18n.t('LOADING_DOTS')}</Text>
</>
}
</View>
)
}
showPhoneSup() {
if (this.state.user.phoneTransaction != undefined && this.state.user.phoneTransaction != null) {
return (<Text style={styles.textInformation2}>
renderDetail = () => {
<Icon name={"phone"} size={18} />
{" " + this.state.user.phoneTransaction}</Text>
)
}
}
getHeaderLeftProfil(user) {
return (<View style={{ flex: 2 }}>
<Text style={{ color: 'white', fontSize: 15, fontWeight: 'bold', textAlign: 'center' }}>{I18n.t("NETWORK")}</Text>
<Text style={{ color: 'white', fontSize: 15, textAlign: 'center' }}>{user.network}</Text>
</View>)
}
getHeaderRight(user) {
return (<View style={{ flex: 0 }}>
</View>)
}
getHeaderRightAgent(user) {
return (<View style={{ flex: 2 }}>
<Text style={{ color: 'white', fontSize: 15, textAlign: 'center', fontWeight: 'bold' }}>{I18n.t("MEMBER_CODE")}</Text>
<Text style={{ color: 'white', fontSize: 13, textAlign: 'center' }}>{user.code_membre}</Text>
</View>)
}
getHeaderLeftAgentProfil(user) {
return (<View style={{ flex: 2 }}>
<Text style={{ color: 'white', fontSize: 15, fontWeight: 'bold', textAlign: 'center' }}>{I18n.t("NETWORK")}</Text>
<Text style={{ color: 'white', fontSize: 13, textAlign: 'center' }}>{user.network}</Text>
</View>)
}
addAgentInformation(user) {
console.log(user)
if (user.category === "geolocated") {
(<View>
<Text style={{ marginLeft: 10, marginTop: 10, color: theme.primaryDark }}>
<Icon name={'code'} size={18} color={theme.primaryDark} style={{ paddingRight: 10 }} />
{" " + user.code_parrain}</Text>
</View>)
} else
return (<View>
<Text style={{ marginLeft: 10, marginTop: 10, color: theme.primaryDark }}>
<Icon name={'code'} size={18} color={theme.primaryDark} style={{ paddingRight: 10 }} />
{" " + user.code_parrain}</Text>
<View style={{ flexDirection: 'row', justifyContent: 'space-between', width: responsiveWidth(90), marginRight: 50 }}>
<Text style={{ marginLeft: 12, marginTop: 10, color: theme.primaryDark }}>
<Icon name={"group-work"} color={theme.primaryDark} size={18} />
{" " + ((user.nbre_reseau === null || user.nbre_reseau === undefined) ? 0 : user.nbre_reseau) + " " + I18n.t("FREE")}</Text>
<Text style={{ marginLeft: 12, marginTop: 10, color: theme.primaryDark }}>
<Icon name={"book"} color={theme.primaryDark} size={18} />{" " + ((user.nbre_reseau === null || user.nbre_membre === undefined) ? 0 : user.nbre_membre) + " " + I18n.t("SAVED")}</Text>
const { resultGetUniqueDemand } = this.props;
let ago = moment.tz(resultGetUniqueDemand.response.date_creation, 'Etc/GMT+0').format();
ago = moment(ago)
return (<View style={styles.container}>
<CardView
style={styles.cardcontainer1}
>
<Text style={{
fontSize: 17,
fontWeight: 'bold',
color: 'black',
marginLeft: responsiveWidth(5)
}}>
{resultGetUniqueDemand.response.nom}
</Text>
<View style={{
flexDirection: 'row',
justifyContent: 'flex-start'
}}>
<Icon name='account'
size={28}
color={theme.accent}
style={{
marginLeft: 20
}}
/>
<Text style={styles.simpleuser}>{`${I18n.t('CREATOR')}: ${resultGetUniqueDemand.response.createur}`}</Text>
</View>
</View>)
<View style={{
flexDirection: 'row',
justifyContent: 'flex-start'
}}>
<Icon name='map-marker'
size={28}
color={theme.accent}
style={{
marginLeft: 20
}}
/>
<Text style={styles.simpleuser}>{`${I18n.t('COUNTRY')}: ${resultGetUniqueDemand.response.country}`}</Text>
</View>
</CardView>
<CardView
style={styles.cardcontainer}
>
<View style={{
flexDirection: 'row',
justifyContent: 'flex-start'
}}>
<Icon name='account-multiple'
size={28}
color={theme.accent}
style={{
marginLeft: 20
}}
/>
<Text style={styles.simpleuser}>{`SPONSOR 1: ${resultGetUniqueDemand.response.sponsor1}`}</Text>
</View>
<View style={{
flexDirection: 'row',
justifyContent: 'flex-start'
}}>
<Icon name='account-multiple'
size={28}
color={theme.accent}
style={{
marginLeft: 20
}}
/>
<Text style={styles.simpleuser}>{`SPONSOR 2: ${resultGetUniqueDemand.response.sponsor2}`}</Text>
</View>
<View style={{
flexDirection: 'row',
justifyContent: 'flex-start'
}}>
<Icon name='account-multiple'
size={28}
color={theme.accent}
style={{
marginLeft: 20
}}
/>
<Text style={styles.simpleuser}>{`SPONSOR 3: ${resultGetUniqueDemand.response.sponsor3}`}</Text>
</View>
</CardView>
<CardView style={styles.cardcontainer}>
{/* <Text style={{
fontSize: 17,
fontWeight: 'bold',
color: 'black',
marginLeft: responsiveWidth(5)
}}>{I18n.t('DEMAND_INFO')}</Text>
<View style={{
flexDirection: 'row',
justifyContent: 'flex-start'
}}>
<Icon name='md-git-branch'
size={28}
color={theme.accent}
style={{
marginLeft: 20
}}
/>
<Text style={styles.simpleuser}>{this.item.code_parrain}</Text>
</View> */}
<View style={{
flexDirection: 'row',
justifyContent: 'flex-start'
}}>
<Icon name='code-tags'
size={28}
color={theme.accent}
style={{
marginLeft: 20
}}
/>
<Text style={styles.simpleuser}>{resultGetUniqueDemand.response.code_groupe}</Text>
</View>
<View style={{
flexDirection: 'row',
justifyContent: 'flex-start'
}}>
<Icon name='cash'
size={28}
color={theme.accent}
style={{
marginLeft: 20
}}
/>
<Text style={styles.simpleuser}>{`${I18n.t('LIMITE_GROUP')}: ${resultGetUniqueDemand.response.limite_credit} ${resultGetUniqueDemand.response.currency_code}`}</Text>
</View>
<View style={{
flexDirection: 'row',
justifyContent: 'flex-start'
}}>
<Icon name='calendar'
size={28}
color={theme.accent}
style={{
marginLeft: 20
}}
/>
<Text style={styles.simpleuser}>{`${I18n.t('CREATION_DATE')}: ${ago.format(" Do MMMM YYYY à HH:mm")}`}</Text>
</View>
<View style={{
flexDirection: 'row',
alignSelf: 'flex-end',
marginRight: 20,
justifyContent: 'flex-start'
}}>
<Icon name='update'
size={28}
color={theme.accent}
/>
<Text style={{
marginLeft: responsiveWidth(2),
fontSize: 16,
color: theme.accent
}}>{ago.fromNow()}</Text>
</View>
</CardView>
{this.renderBtn()}
</View>);
}
mapUser(user) {
const myPosition = { latitude: parseFloat(user.latitude), longitude: parseFloat(user.longitude) }
render() {
console.log('MY PROPS', this.props);
return (
<Provider>
<View style={{ flex: 1 }}
>
<StatusBar
backgroundColor={theme.primaryDark}
barStyle="light-content"
translucent={false}
/>
return (<MapView
liteMode
ref={(ref) => { this.mapRef = ref }}
style={styles.map}
>
{this.state.myPosition !== undefined ?
<Marker
title={"Vous êtes ici"}
minZoomLevel={10}
coordinate={{ longitude: myPosition.longitude, latitude: myPosition.latitude }}
/> :
null}
</MapView>
<Appbar.Header dark={true} style={{ backgroundColor: theme.primary }}>
<Appbar.BackAction
onPress={() => { this.props.navigation.pop() }}
/>
<Appbar.Content
title={I18n.t('MY_GROUP')}
/>
</Appbar.Header>
<>
{(this.state.triggerTreatmentClick || this.state.triggerCancelClick) && this.renderAlertErrorDeleteDemand()}
{
this.props.loadingGetUniqueDemand ?
this.renderLoader() :
this.props.resultGetUniqueDemand != null ?
this.renderDetail() :
null
}
</>
</View>
</Provider>
)
}
showBalance(user) {
return <Text style={styles.textInformation2}>
<Icon name={"folder"} size={18} />{" " + this.state.user.balance + " "}</Text>
}
makeGeolocatedNetworkList() {
return (<View>
<Text style={{ marginLeft: 10, marginRight: 10, marginTop: 15, marginBottom: 5, fontSize: 17, fontWeight: 'bold', color: 'black' }}>Mes reseaux</Text>
</View>)
}
generateItemNetwork(item) {
return (
<Card >
<CardTitle
title={item.name}
subtitle={item.phone}
/>
<CardContent>
<View Style={{ flex: 1 }}>
<Text style={styles.textInformation2}>
<Icon name={"code"} size={18} />{" " + item.code_membre + " "}</Text>
<Text style={styles.textInformation2}>
<Icon name={"people"} size={18} />{" " + item.code_parrain + " "}</Text>
</View>
</CardContent>
<CardAction
separator={true}
inColumn={false}>
<CardButton
onPress={() => {
Alert.alert(
I18n.t("TITLE_SUPPRESS_CONFIRM"),
I18n.t("TEXT_SUPPRESS_CONFIRM"),
[
{ text: I18n.t('NO'), onPress: () => { } },
{
text: I18n.t("YES"), onPress: () => {
deleteUser(item).then(() => {
this.setState({ isLoading: true })
this.updateContent(this.state.user)
})
},
style: 'cancel'
},
],
)
}}
title={I18n.t('DELETE_GEOLOCATED_USER')}
color="crimson"
/>
</CardAction>
</Card>)
}
showLoader() {
return (<View style={{ height: responsiveHeight(20) }}><ProgressBarAndroid
style={{ justifyContent: "center", alignItems: "center" }}
/></View>)
}
}
const mapStateToProps = state => ({
loadingGetUniqueDemand: state.getUserGroupDetailReducer.loading,
resultGetUniqueDemand: state.getUserGroupDetailReducer.result,
errorGetUniqueDemand: state.getUserGroupDetailReducer.error,
loadingTreatDemand: state.createGroupReducer.loading,
resultTreatDemand: state.createGroupReducer.result,
errorTreatDemand: state.createGroupReducer.error,
});
const mapDispatchToProps = dispatch => bindActionCreators({
getUserGroupDetailAction: getUserGroupDetailAction,
getUserGroupDetailReset: getUserGroupDetailReset,
createGroupAction: createGroupAction,
createGroupReset: createGroupReset,
getNanoCreditUniqueDemandsAction: getNanoCreditUniqueDemandsAction,
getNanoCreditUniqueDemandsReset: getNanoCreditUniqueDemandsReset,
treatDemandGroupAction: treatDemandGroupAction,
treatDemandGroupReset: treatDemandGroupReset,
treatCreditDemand: treatCreditDemand,
creditDemandResetReducer: creditDemandResetReducer,
treatCancelDemand: treatCancelDemand,
creditCancelResetReducer: creditCancelResetReducer
}, dispatch);
export default connect(mapStateToProps, mapDispatchToProps)(MyNanoCreditGroup);
const styles = StyleSheet.create({
userInformation: {
backgroundColor: theme.primary,
flex: 1,
justifyContent: 'center',
paddingTop: responsiveHeight(2),
paddingBottom: responsiveHeight(5)
},
map: {
height: 200,
marginRight: responsiveWidth(5),
marginLeft: responsiveWidth(5),
marginVertical: 10,
},
networkInformation: {
width: responsiveWidth(100),
backgroundColor: '#EEEEEE',
flex: 1
},
container: {
flex: 1,
backgroundColor: '#EEEEEE',
},
contain: {
flexDirection: 'row',
justifyContent: 'space-between',
},
identificationOptionMenuContainer: {
flexDirection: 'row',
paddingTop: 10,
paddingLeft: 10,
paddingRight: 10,
},
containerTouch: {
flex: 1,
flexDirection: 'row',
marginRight: 2.5,
alignItems: 'center',
shadowColor: Color.borderColor,
borderColor: Color.borderColor,
shadowOffset: { width: 1.5, height: 1.5 },
shadowOpacity: 1.0,
elevation: 5,
borderRadius: 10,
backgroundColor: Color.cardBackgroundColor
},
contain: {
flexDirection: 'row',
justifyContent: 'space-between',
},
imageBanner: {
marginTop: 15,
marginLeft: 5,
width: Utils.scaleWithPixel(30),
height: Utils.scaleWithPixel(30)
},
content: {
height: Utils.scaleWithPixel(60),
paddingHorizontal: 10,
justifyContent: 'space-between',
alignItems: 'flex-start',
flex: 1,
},
contentTitle: {
paddingTop: 5,
},
textInformation: {
fontSize: 16,
color: 'white',
textAlign: 'center'
},
textInformation2: {
fontSize: 15,
marginTop: 7,
color: theme.primaryDark,
marginLeft: 10,
},
textTitle: {
fontSize: 25,
color: 'white',
fontWeight: 'bold'
btnstyle: {
},
textTitle2: {
fontSize: 25,
color: theme.primaryDark,
fontWeight: 'bold'
inputAmountText: {
...Platform.select({
android: {
borderBottomColor: Color.borderColor,
borderBottomWidth: 0.5,
}
})
},
simpleuser: {
marginLeft: responsiveWidth(2),
fontSize: 16,
color: '#3E3E3E'
},
textbtnstyle: {
color: "white",
fontWeight: "bold",
fontSize: 18
},
cardcontainer1: {
justifyContent: 'space-evenly',
flex: 2,
marginRight: 3,
marginLeft: 3,
},
cardcontainer: {
justifyContent: 'space-evenly',
flex: 3,
margin: 3,
}
});
})

View File

@ -1,65 +1,121 @@
import React,{Component} from 'react'
import {StyleSheet,Text,View,StatusBar} from 'react-native'
import React, { Component } from 'react'
import { StyleSheet, Text, View, StatusBar, Platform, ProgressBarAndroid } from 'react-native'
import BaseScreen from './../BaseScreen'
import I18n from "react-native-i18n";
import Icon from 'react-native-vector-icons/MaterialIcons'
import LottieView from 'lottie-react-native'; // if you have "esModuleInterop": true
import {Header} from "react-native-elements";
const theme=require('./../../utils/theme.json')
export default class Notifications extends BaseScreen{
static navigatorStyle = {
navBarBackgroundColor:theme.primaryDark,
navBarTextColor:'white',
statusBarBackgroundColor:theme.primaryDarkAdvanced,
navBarButtonColor:'white',
statusBarTextColorScheme: 'light',
};
static navigationOptions = {
headerTitle: I18n.t('NOTIFICATIONS'),
drawerIcon: ({ tintColor }) => (
<Icon
name={'notifications-active'}
size={24}
/>
),
};
constructor(props){
super(props,true)
import { Header } from "react-native-elements";
import { bindActionCreators } from 'redux';
import { getNotificationAction, getNotificationReset } from '../../webservice/OnesignalApi';
import { connect } from 'react-redux';
const theme = require('./../../utils/theme.json')
class Notifications extends BaseScreen {
static navigatorStyle = {
navBarBackgroundColor: theme.primaryDark,
navBarTextColor: 'white',
statusBarBackgroundColor: theme.primaryDarkAdvanced,
navBarButtonColor: 'white',
statusBarTextColorScheme: 'light',
};
static navigationOptions = {
headerTitle: I18n.t('NOTIFICATIONS'),
drawerIcon: ({ tintColor }) => (
<Icon
name={'notifications-active'}
size={24}
/>
),
};
constructor(props) {
super(props);
}
render() {
return (
<View style={styles.container}>
<StatusBar
backgroundColor="#00000030"
barStyle="light-content"
translucent={false}
/>
<View style={{justifyContent:"center",alignItems:'center',marginTop:100}}>
}
<LottieView
style={styles.lottie}
source={require("./../../datas/json/781-no-notifications.json")}
autoPlay
loop
/>
<Text style={styles.text}>{I18n.t('NO_NOTIFICATION')}</Text>
</View>
</View>)
}
updateLangue() {
this.props.navigation.setParams({ name: I18n.t('WALLET') })
this.forceUpdate()
}
renderLoader = () => {
return (
<View style={{ flex: 1, justifyContent: 'center', alignItems: 'center' }}>
{Platform.OS === 'android'
?
(
<>
<ProgressBarAndroid />
<Text>{I18n.t('LOADING_DOTS')}</Text>
</>
) :
<>
<ActivityIndicator size="large" color={'#ccc'} />
<Text>{I18n.t('LOADING_DOTS')}</Text>
</>
}
</View>
)
}
componentDidMount() {
readUser().then((user) => {
if (user) {
if (user !== undefined) {
if (user.phone !== undefined) {
this.props.getNotificationAction(user.user_code);
}
}
}
});
}
render() {
return (
<View style={styles.container}>
<StatusBar
backgroundColor="#00000030"
barStyle="light-content"
translucent={false}
/>
<View style={{ justifyContent: "center", alignItems: 'center', marginTop: 100 }}>
<LottieView
style={styles.lottie}
source={require("./../../datas/json/781-no-notifications.json")}
autoPlay
loop
/>
<Text style={styles.text}>{I18n.t('NO_NOTIFICATION')}</Text>
</View>
</View>)
}
}
const styles=StyleSheet.create({
container:{
flex:1,
backgroundColor:'white'
},
text:{
fontSize:17,
fontWeight:'bold',
},
lottie: {
width: 248,
height: 248
},
const mapStateToProps = state => ({
loading: state.getNotificationReducer.loading,
result: state.getNotificationReducer.result,
error: state.getNotificationReducer.error
});
const mapDispatchToProps = dispatch => bindActionCreators({
getNotificationAction: getNotificationAction,
getNotificationReset: getNotificationReset
}, dispatch);
export default connect(mapStateToProps, mapDispatchToProps)(Notifications);
const styles = StyleSheet.create({
container: {
flex: 1,
backgroundColor: 'white'
},
text: {
fontSize: 17,
fontWeight: 'bold',
},
lottie: {
width: 248,
height: 248
},
})

View File

@ -171,6 +171,8 @@
"ACTIVATED": "has been activated",
"CREDIT_MANAGE": "Credit Management",
"GROUP_MANAGE": "Group Management",
"MODIFY_GROUP": "Modify group",
"DELETE_GROUP": "Delete group",
"CREATOR": "Creator",
"NOTIFICATIONS": "Notification",
"NO_NOTIFICATION": "You haven't any notification",

View File

@ -176,6 +176,8 @@
"ACTIVATED": "a été activé",
"CREDIT_MANAGE": "Gestion de credit",
"GROUP_MANAGE": "Gestion du groupe",
"MODIFY_GROUP": "Modifier le groupe",
"DELETE_GROUP": "Supprimer le groupe",
"CREATOR": "Créateur",
"NOTIFICATIONS": "Notification",
"NO_NOTIFICATION": "Vous n'avez aucune Fnotification",

View File

@ -54,8 +54,10 @@ export const getCreditDemand = testBaseUrl + '/walletService/groups/demands';
export const linkCardUrl = testBaseUrl + '/walletService/identifications/rattach_card';
export const groupUrl = testBaseUrl + '/walletService/groups';
export const treatDemandUrl = testBaseUrl + '/walletService/groups/demands/validate';
export const cancelDemandUrl = testBaseUrl + '/walletService/groups/demands/cancel';
export const joinGroupUrl = testBaseUrl + '/walletService/groups/join';
export const saveOnesignalIds = testBaseUrl + '/notificationService/onesignal';
export const getNotificationUrl = testBaseUrl + '/notificationService/notifications';
export const authKeyUrl = testBaseUrl + '/oauth/token';
export const videoUrl = "https://www.youtube.com/watch?v=wwGPDPsSLWY";

View File

@ -3,9 +3,15 @@ import axios from "axios";
import I18n from 'react-native-i18n';
import { fetchCreateGroupError, fetchCreateGroupPending, fetchCreateGroupReset, fetchCreateGroupSuccess, fetchTreatDemandsGroupPending, fetchTreatDemandsGroupSuccess, fetchTreatDemandsGroupError, fetchTreatDemandsGroupReset, fetchJoinGroupPending, fetchJoinGroupSuccess, fetchJoinGroupError, fetchJoinGroupReset } from "../redux/actions/NanoCreditAction";
import { store } from "../redux/store";
import { groupUrl, treatDemandUrl, joinGroupUrl } from "./IlinkConstants";
import { groupUrl, treatDemandUrl, joinGroupUrl, cancelDemandUrl } from "./IlinkConstants";
/**
*
* @param {*} data
* @param {*} isToMofidy | 0-> CREATE 1->MODIFY 2->DELETE
*/
export const createGroupAction = (data, isToMofidy) => {
export const createGroupAction = (data) => {
const auth = store.getState().authKeyReducer;
const authKey = auth !== null ? `${auth.authKey.token_type} ${auth.authKey.access_token}` : '';
@ -15,7 +21,9 @@ export const createGroupAction = (data) => {
axios({
url: `${groupUrl}`,
method: 'POST',
method: isToMofidy === 0 ?
'POST' :
isToMofidy === 1 ? 'PUT' : 'DELETE',
data,
headers: {
'Authorization': authKey,
@ -75,6 +83,38 @@ export const treatDemandGroupAction = (data) => {
}
}
export const cancelDemandGroupAction = (data) => {
const auth = store.getState().authKeyReducer;
const authKey = auth !== null ? `${auth.authKey.token_type} ${auth.authKey.access_token}` : '';
return dispatch => {
dispatch(fetchTreatDemandsGroupPending());
axios({
url: `${cancelDemandUrl}`,
method: 'POST',
data,
headers: {
'Authorization': authKey,
'X-Localization': I18n.currentLocale()
}
})
.then(response => {
console.log(response);
dispatch(fetchTreatDemandsGroupSuccess(response));
})
.catch(error => {
if (error.response)
dispatch(fetchTreatDemandsGroupError(error.response));
else if (error.request)
dispatch(fetchTreatDemandsGroupError(error.request))
else
dispatch(fetchTreatDemandsGroupError(error.message))
});
}
}
export const treatDemandGroupReset = () => {
return dispatch => {
dispatch(fetchTreatDemandsGroupReset());

View File

@ -2,8 +2,9 @@
import axios from "axios";
import I18n from 'react-native-i18n';
import { store } from "../redux/store";
import { saveOnesignalIds } from "./IlinkConstants";
import { saveOnesignalIds, getNotificationUrl } from "./IlinkConstants";
import { fetchSaveOnesignalPlayerIdsPending, fetchSaveOnesignalPlayerIdsSuccess, fetchSaveOnesignalPlayerIdsError, fetchSaveOnesignalPlayerIdsReset } from "../redux/actions/NotificationAction";
import { fetchGetNotificationSuccess } from "../redux/actions/NanoCreditAction";
export const saveOnesignalIdsAction = (isUser, data) => {
@ -42,3 +43,42 @@ export const saveOnesignalIdsReset = () => {
dispatch(fetchSaveOnesignalPlayerIdsReset());
}
}
export const getNotificationAction = (data) => {
const auth = store.getState().authKeyReducer;
const authKey = auth !== null ? `${auth.authKey.token_type} ${auth.authKey.access_token}` : '';
return dispatch => {
dispatch(fetchGetNotificationPending());
axios({
url: getNotificationUrl,
method: 'POST',
data,
headers: {
'Authorization': authKey,
'X-Localization': I18n.currentLocale()
}
})
.then(response => {
console.log(response);
dispatch(fetchGetNotificationSuccess(response));
})
.catch(error => {
if (error.response)
dispatch(fetchGetNotificationError(error.response));
else if (error.request)
dispatch(fetchGetNotificationError(error.request))
else
dispatch(fetchGetNotificationError(error.message))
});
}
}
export const getNotificationReset = () => {
return dispatch => {
dispatch(fetchGetNotificationReset());
}
}

View File

@ -4,7 +4,7 @@ import I18n from 'react-native-i18n';
import { store } from "../../redux/store";
import { idVerificationUrl, getCreditDemand, groupUrl } from "../IlinkConstants";
import { fetchRetraitCashAgentIdVerificationPending, fetchRetraitCashAgentIdVerificationSuccess, fetchRetraitCashAgentIdVerificationError, fetchRetraitCashAgentIdVerificationReset } from "../../redux/actions/EnvoieAgentAction";
import { fetchGetDemandsGroupSuccess, fetchGetDemandsGroupPending, fetchGetDemandsGroupError, fetchGetDemandsGroupReset, fetchGetUniqueDemandsGroupPending, fetchGetUniqueDemandsGroupSuccess, fetchGetUniqueDemandsGroupReset, fetchGetUniqueDemandsGroupError, fetchGetUserGroupDetailPending, fetchGetUserGroupDetailSuccess, fetchGetUserGroupDetailReset } from "../../redux/actions/NanoCreditAction";
import { fetchGetDemandsGroupSuccess, fetchGetDemandsGroupPending, fetchGetDemandsGroupError, fetchGetDemandsGroupReset, fetchGetUniqueDemandsGroupPending, fetchGetUniqueDemandsGroupSuccess, fetchGetUniqueDemandsGroupReset, fetchGetUniqueDemandsGroupError, fetchGetUserGroupDetailPending, fetchGetUserGroupDetailSuccess, fetchGetUserGroupDetailReset, fetchGetUserGroupDetailError } from "../../redux/actions/NanoCreditAction";
export const getNanoCreditDemandsAction = (id) => {