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

adhesion groupe termine

This commit is contained in:
Brice Zele 2020-08-25 09:26:21 +01:00
parent bca8f308b2
commit 5b0af68c08
11 changed files with 830 additions and 802 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1587
android/app/src/main/assets/index.android.bundle
View File

File diff suppressed because one or more lines are too long

2
android/app/src/main/res/raw/utils_i18n_en.json
View File

@ -108,6 +108,7 @@
"MANAGE_GROUP": "Manage group",
"VALIDATION_DEMAND": "Validation request",
"DELETE_DEMAND": "Deletion request",
"TYPE_DEMAND": "Demand type",
"GROUP_INFOS": "Fill in the group information",
"GROUP_CODE": "Group code",
"NOM_GROUP": "Group name",
@ -209,6 +210,7 @@
"NEXT": "Next",
"PREVIOUS": "Previous",
"SPONSOR_CODE": "Sponsor Code",
"CODE_SPONSOR": "Sponsor code",
"SOLDE_UNVAIBLE": "solde unavailable",
"TEXT_BIG_CREATE_AGENT_1": "Register as Agent",
"EMAIL": "Email",

2
android/app/src/main/res/raw/utils_i18n_fr.json
View File

@ -109,6 +109,7 @@
"MANAGE_GROUP": "Gérer le groupe",
"VALIDATION_DEMAND": "Demandes de validation",
"DELETE_DEMAND": "Demande de suppression",
"TYPE_DEMAND": "Type de demande",
"GROUP_INFOS": "Renseigner les informations du groupe",
"GROUP_CODE": "Code du groupe",
"SUCCESS_CREATION_GROUP": "Informations sur la création",
@ -214,6 +215,7 @@
"NEXT": "Suivant",
"PREVIOUS": "Précédent",
"SPONSOR_CODE": "Code parrain",
"CODE_SPONSOR": "Code sponsor",
"SOLDE_UNVAIBLE": "solde non disponible",
"TEXT_BIG_CREATE_AGENT_1": "Inscrivez-vous en comme Agent",
"EMAIL": "Email",

2
redux/actions/NanoCreditAction.js
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, GET_USER_GROUP_DETAIL_ERROR, GET_NOTIFICATIONS_ERROR, GET_NOTIFICATIONS_RESET, GET_NOTIFICATIONS_PENDING } 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, GET_NOTIFICATIONS_SUCCESS } from "../types/NanoCreditType";
export const fetchCreateGroupPending = () => ({
type: CREATE_GROUP_PENDING

4
screens/home/Home.js
View File

@ -1426,7 +1426,7 @@ class Home extends BaseScreen {
translucent={true}
/>
{/* Start here to comment */}
{/* {
{
(this.state.loadingDialog || this.props.loading) ?
<View
style={{ position: "absolute", zIndex: 1, backgroundColor: "#00000050", width: this.state.loadingDialog ? responsiveWidth(100) : 0, height: this.state.loadingDialog ? responsiveHeight(100) : 0, flex: 1, justifyContent: 'center', alignItems: 'center' }}
@ -1462,7 +1462,7 @@ class Home extends BaseScreen {
this.setState({ showProgress: false })
Alert.alert(I18n.t("PROBLEM_OCCUR"), I18n.t("PROBLEM_OCCUR_DIRECTION"), [{ text: "Ok", onPress: () => { } }])
}}
/> */}
/>
{this.makeCardSearch()}
{this.makeSlidingUp()}
{this.makeDialogLoader()}

23
screens/nano-credit/AdhererGroupNanoCredit.js
View File

@ -54,6 +54,7 @@ class AdhererGroupNanoCredit extends Component {
codeGroupe: null,
codeSponsor: null,
nomGroupe: null,
codeSponsor: null,
user: null,
triggerSubmitClick: false,
isSubmitClick: false,
@ -129,17 +130,18 @@ class AdhererGroupNanoCredit extends Component {
onSubmitSendWalletToCard = () => {
const { codeGroupe } = this.state;
const { codeGroupe, codeSponsor } = this.state;
if (this.ckeckIfFieldIsOK(codeGroupe))
this.nomGroupeAnim.shake(800);
else if (this.ckeckIfFieldIsOK(codeSponsor))
this.nomGroupeAnim.shake(800);
else {
this.props.joinGroupAction({
id_user: this.state.user.id,
code_groupe: this.state.codeGroupe,
code_sponsor: this.state.user.user_code,
id_user: 12
code_sponsor: this.state.codeSponsor,
});
}
@ -183,6 +185,21 @@ class AdhererGroupNanoCredit extends Component {
</Fumi>
</Animatable.View>
<Animatable.View ref={(comp) => { this.codeSponsorAnim = comp }}>
<Fumi iconClass={FontAwesomeIcon} iconName={'user-secret'}
label={I18n.t('CODE_SPONSOR')}
iconColor={'#f95a25'}
iconSize={20}
value={this.state.codeSponsor}
onChangeText={(codeSponsor) => {
this.setState({ codeSponsor })
}}
style={styles.input}
>
</Fumi>
</Animatable.View>
<Button style={styles.btnvalide}
textStyle={styles.textbtnvalide}
onPress={() => { this.onSubmitSendWalletToCard(); }}>

3
screens/nano-credit/MyNanoCreditGroup.js
View File

@ -18,6 +18,7 @@ let theme = require('./../../utils/theme.json');
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import Toast from 'react-native-root-toast';
import _ from 'lodash';
import { Color } from '../../config/Color'
const route = require("./../../route.json");
import Dialog from "react-native-dialog";
@ -431,7 +432,7 @@ class MyNanoCreditGroup extends Component {
</View>
</CardView>
{this.renderBtn()}
{_.isEqual(parseInt(this.state.user.id), resultGetUniqueDemand.response.id_createur) && this.renderBtn()}
</View>);
}

5
screens/notifications/Notifications.js
View File

@ -8,6 +8,7 @@ import { Header } from "react-native-elements";
import { bindActionCreators } from 'redux';
import { getNotificationAction, getNotificationReset } from '../../webservice/OnesignalApi';
import { connect } from 'react-redux';
import { readUser } from '../../webservice/AuthApi';
const theme = require('./../../utils/theme.json')
class Notifications extends BaseScreen {
static navigatorStyle = {
@ -63,7 +64,9 @@ class Notifications extends BaseScreen {
if (user) {
if (user !== undefined) {
if (user.phone !== undefined) {
this.props.getNotificationAction(user.user_code);
this.props.getNotificationAction({
user_code: user.user_code
});
}
}
}

1
utils/i18n/en.json
View File

@ -210,6 +210,7 @@
"NEXT": "Next",
"PREVIOUS": "Previous",
"SPONSOR_CODE": "Sponsor Code",
"CODE_SPONSOR": "Sponsor code",
"SOLDE_UNVAIBLE": "solde unavailable",
"TEXT_BIG_CREATE_AGENT_1": "Register as Agent",
"EMAIL": "Email",

1
utils/i18n/fr.json
View File

@ -215,6 +215,7 @@
"NEXT": "Suivant",
"PREVIOUS": "Précédent",
"SPONSOR_CODE": "Code parrain",
"CODE_SPONSOR": "Code sponsor",
"SOLDE_UNVAIBLE": "solde non disponible",
"TEXT_BIG_CREATE_AGENT_1": "Inscrivez-vous en comme Agent",
"EMAIL": "Email",

2
webservice/OnesignalApi.js
View File

@ -4,7 +4,7 @@ import I18n from 'react-native-i18n';
import { store } from "../redux/store";
import { saveOnesignalIds, getNotificationUrl } from "./IlinkConstants";
import { fetchSaveOnesignalPlayerIdsPending, fetchSaveOnesignalPlayerIdsSuccess, fetchSaveOnesignalPlayerIdsError, fetchSaveOnesignalPlayerIdsReset } from "../redux/actions/NotificationAction";
import { fetchGetNotificationSuccess } from "../redux/actions/NanoCreditAction";
import { fetchGetNotificationSuccess, fetchGetNotificationPending, fetchGetNotificationError } from "../redux/actions/NanoCreditAction";
export const saveOnesignalIdsAction = (isUser, data) => {