diff --git a/android/app/src/main/res/raw/utils_i18n_en.json b/android/app/src/main/res/raw/utils_i18n_en.json index 348012b..2cf831d 100644 --- a/android/app/src/main/res/raw/utils_i18n_en.json +++ b/android/app/src/main/res/raw/utils_i18n_en.json @@ -651,7 +651,7 @@ "PRINCIPAL_AMOUNT": "Principal amount", "DATE_AVIS_IMPOSITION": "Tax notice date", "TEXT_NETWORK_UNABLE_CHOOSE_ANOTHER": "This network is inactive, please choose another", - "ENTER_SPONSOR_CODE": "Renseignez votre code parrain", + "ENTER_SPONSOR_CODE": "Renseignez votre code hiérarchique ou taxe", "NOM_SOCIETE": "Society name", "TAKE_My_POSITION": "Retreive position", "CREATE_ACTIF": "Create asset", diff --git a/android/app/src/main/res/raw/utils_i18n_fr.json b/android/app/src/main/res/raw/utils_i18n_fr.json index f0815d0..c85a63f 100644 --- a/android/app/src/main/res/raw/utils_i18n_fr.json +++ b/android/app/src/main/res/raw/utils_i18n_fr.json @@ -148,9 +148,9 @@ "ANNEE_TAXE_N_1": "Année taxé payée N-1", "ANNEE_TAXE_N_2": "Année taxé payée N-2", "TYPE_ACTIVITE": "Type d'activité", - "TECHNICAL_AGREMENT": "Agrément technique", - "IMMATRICULATION_DGI": "Immatriculation DGI", - "INFORMATION_FICHE_CIRCUIT": "Information fiche circuit", + "TECHNICAL_AGREMENT": "Agrément technique ou Licence", + "IMMATRICULATION_DGI": "NIU", + "INFORMATION_FICHE_CIRCUIT": "Fiche d'identification", "OTHERS_INFORMATIONS": "Autres informations", "CREATE_GROUP": "Créer un groupe", "MANAGE_GROUP": "Gérer le groupe", @@ -303,15 +303,15 @@ "SUPER_ADMIN": "Super administrateur", "GEOLOCATED": "Agent géo-localisé", "DELETE_GEOLOCATED_USER": "Supprimer", - "ADDRESS": "Adresse", + "ADDRESS": "Adresse EX:TotalEnergies Bonateki", "CREDIT": "Crédit", "NEXT": "Suivant", "PREVIOUS": "Précédent", "SPONSOR_CODE": "Code réseau de taxe", - "CODE_PARRAIN": "Code parrain", + "CODE_PARRAIN": "Code hiérarchique ou taxe", "CODE_SPONSOR": "Code sponsor", "SOLDE_UNVAIBLE": "solde non disponible", - "TEXT_BIG_CREATE_AGENT_1": "Inscrivez-vous en tant qu'agent", + "TEXT_BIG_CREATE_AGENT_1": "Créer un acteur", "EMAIL": "Email", "COUNTRY": "Pays", "LOADING_INFO": "Chargement des informations...", @@ -428,7 +428,7 @@ "WAY": "Itinéraire", "ADD_NETWORK": "Ajouter réseau de taxe", "POINT_NUMBER": "Nombres de points", - "SUPERIOR_CODE": "Code parrain", + "SUPERIOR_CODE": "Code hiérarchique ou taxe", "ADD_SUCCES": "Ajout reussi", "ADD_SUCCESS_TEXT": "La taxe a été ajoutée avec succès ", "MEMBER_CODE": "Code membre", @@ -589,7 +589,7 @@ "UNABLE_GET_INFORMATION_TEXT": "Vérifiez que votre GPS est activé et mis en mode haute precision et relancez iLink City", "TITLE_HELP_SOON": "Aide non disponible !", "YOUR_NETWORK": "Sélectionner votre réseau", - "YOUR_NETWORK_SELECTED": "Votre réseau", + "YOUR_NETWORK_SELECTED": "Classe de la taxe", "UNIT_PER_TAXE_UNIT_COUNT": "Taxe par unité", "HELP_SOON": "Un tutoriel vous aidant dans la compréhension des fonctionnalités de l'application vous sera bientôt mis à disposition.", "UPLOAD_PHOTO": "Chargement de la photo", @@ -658,7 +658,7 @@ "PRINCIPAL_AMOUNT": "Montant principal", "DATE_AVIS_IMPOSITION": "Date avis imposition", "TEXT_NETWORK_UNABLE_CHOOSE_ANOTHER": "Ce réseau n'est pas actif, veuillez choisir un autre", - "ENTER_SPONSOR_CODE": "Renseignez votre code parrain", + "ENTER_SPONSOR_CODE": "Renseignez votre code hiérarchique ou taxe", "NOM_SOCIETE": "Nom de la société", "TAKE_My_POSITION": "Récupération de votre position", "CREATE_ACTIF": "Créer un actif", diff --git a/app/assets/img/by-ilink-world.png b/app/assets/img/by-ilink-world.png new file mode 100644 index 0000000..236adf3 Binary files /dev/null and b/app/assets/img/by-ilink-world.png differ diff --git a/app/assets/img/icon3.png b/app/assets/img/icon3.png index 02e3763..d6fc35f 100644 Binary files a/app/assets/img/icon3.png and b/app/assets/img/icon3.png differ diff --git a/app/screens/account/AddNetwork.js b/app/screens/account/AddNetwork.js index 6456a6c..a13b36f 100644 --- a/app/screens/account/AddNetwork.js +++ b/app/screens/account/AddNetwork.js @@ -420,7 +420,10 @@ export default class AddNetwork extends Component { + style={{width: responsiveWidth(90), resizeMode: "contain", + height: responsiveHeight(16), // Delete this line if the image size sucks and change the width and the height of icon3.png to 257 x 112 + + }}/> {I18n.t('ADD_NETWORK')} diff --git a/app/screens/configurations/About.js b/app/screens/configurations/About.js index 6e73071..b7d38a1 100644 --- a/app/screens/configurations/About.js +++ b/app/screens/configurations/About.js @@ -52,7 +52,10 @@ export default class About extends React.Component { - + {I18n.t("ABOUT_TEXT")} diff --git a/app/screens/help/HelpMenu.js b/app/screens/help/HelpMenu.js index 6e1bd8e..dd5d29e 100644 --- a/app/screens/help/HelpMenu.js +++ b/app/screens/help/HelpMenu.js @@ -105,6 +105,7 @@ const styles = StyleSheet.create({ }, img_style: { resizeMode: 'contain', - width: responsiveWidth(90) + width: responsiveWidth(90), + height: responsiveHeight(16), // Delete this line if the image size sucks and change the width and the height of icon3.png to 257 x 112 } }); diff --git a/app/screens/login/ActivateAccount.js b/app/screens/login/ActivateAccount.js index 9163508..711a26b 100644 --- a/app/screens/login/ActivateAccount.js +++ b/app/screens/login/ActivateAccount.js @@ -126,7 +126,9 @@ export default class ActivateAccount extends Component { alignItems: 'center', }}> - @@ -177,7 +179,9 @@ export default class ActivateAccount extends Component { alignItems: 'center', }}> - @@ -284,7 +288,9 @@ export default class ActivateAccount extends Component { alignItems: 'center', }}> - diff --git a/app/screens/login/CreateUserStep.js b/app/screens/login/CreateUserStep.js index 81025c1..2fabf67 100644 --- a/app/screens/login/CreateUserStep.js +++ b/app/screens/login/CreateUserStep.js @@ -124,6 +124,7 @@ class CreateUserStep extends Component { latlng: [], id_company_type: null, identification_number: null, + remainingCharacters: 14, trade_registry: null, tabTaxe: [0], taxes_selected: [], @@ -366,7 +367,7 @@ class CreateUserStep extends Component { } }, (e) => { - Alert.alert(I18n.t('TITLE_PROBLE_COME'), "Impossible de recuperer les informations du code parrain", [{ + Alert.alert(I18n.t('TITLE_PROBLE_COME'), "Impossible de recuperer les informations du code hiérarchique ou taxe", [{ text: "Reesayer", onPress: () => this.watchLocation(param) }]) @@ -804,7 +805,7 @@ class CreateUserStep extends Component { backgroundColor: 'white' }}> { @@ -1229,7 +1230,7 @@ class CreateUserStep extends Component { null} - + {/* {this.state.textadress !== undefined ? this.state.textadress : I18n.t('TAKE_MY_POSITION')} - + */} } { @@ -1336,8 +1337,9 @@ handleTaxSlection = (selectedTax) => { paddingRight: 20, backgroundColor: 'white' }}> + {console.log("this.state.result===>>",this.state.result)} { @@ -1463,13 +1465,27 @@ handleTaxSlection = (selectedTax) => { { - this.setState({identification_number: text}) - }}/> + // Update the identification_number state + this.setState({ + identification_number: text, + remainingCharacters: 14 - text.length // Update the remaining characters + }); + }}/> + + {this.state.remainingCharacters} caractères restants + @@ -1501,7 +1517,7 @@ handleTaxSlection = (selectedTax) => { }}> { backgroundColor: 'white' }}> { @@ -1557,7 +1573,7 @@ handleTaxSlection = (selectedTax) => { backgroundColor: 'white' }}> { @@ -1578,7 +1594,7 @@ handleTaxSlection = (selectedTax) => { }}> { style={styles.checkbox}/> {I18n.t('IRPP')} - + this.setState({IRPP: value})} + value={this.state.IRPP} + style={styles.checkbox}/> + Licence + + + {/* this.setState({year_tax_paid_N: value})} @@ -1635,12 +1659,12 @@ handleTaxSlection = (selectedTax) => { style={styles.checkbox}/> {I18n.t('ANNEE_TAXE')} {Number(year.getFullYear() - 1)} - + */} - { {I18n.t('ANNEE_TAXE')} {Number(year.getFullYear() - 2)} - + */} - { {I18n.t('ANNEE_TAXE')} {Number(year.getFullYear() - 3)} - + */} + + Code Hierachique : Code entré lors de la création d'un administrateur de taxe ou d'un régisseur + Code Taxe : Code entré lors de la création d'un contribuable + ); } @@ -888,6 +892,19 @@ const styles = StyleSheet.create({ textAlign: 'center', margin: 5, }, + indication: { + color: 'white', + fontSize: 14, + marginLeft: 20, + marginRight: 20, + marginBottom: 10, + }, + indicationTitle: { + color: 'white', + fontSize: 14, + marginLeft: 20, + fontWeight: '600', + }, btnvalide: { marginTop: 20, marginLeft: 20, diff --git a/app/screens/login/createUserStep2.js b/app/screens/login/createUserStep2.js index 02bba32..dfbef6f 100644 --- a/app/screens/login/createUserStep2.js +++ b/app/screens/login/createUserStep2.js @@ -120,7 +120,8 @@ export default class CreateUserStep2 extends Component { isLoging: false, countries: '', selectedCountry: null, - indicatif: '', + indicatif: '+237', + country: "Cameroon", snackVisible: false, snackText: '', disableNetwork: false, @@ -145,11 +146,10 @@ export default class CreateUserStep2 extends Component { loadingUpload: false, latitude: "", longitude: "", - // town: this.data !== null && this.data.town ? this.data.town : { - // name: "", - // id: "2", - // indicatif: "", - // districts: [] + // town: { + // name: "Douala", + // id: "38", + // indicatif: "+237" // }, }; @@ -223,11 +223,12 @@ export default class CreateUserStep2 extends Component { } const { category, country, dial_code, child, network } = result; + console.log("network1===>>",network) this.setState({ result, - country, - indicatif: dial_code + // country, + // indicatif: dial_code }); if (child) { @@ -243,10 +244,12 @@ export default class CreateUserStep2 extends Component { } : {}) }); } else { - throw new Error("Impossible de récupérer les informations du code parrain"); + throw new Error("Impossible de récupérer les informations du code hiérarchique ou taxe"); } } else { - const networks = await getCountryNetwork(indicatif); + console.log("indicatif1===>>",indicatif) + const networks = await getCountryNetwork("+237"); + console.log("network2===>>",networks) const reseaux = Object.values(networks).filter(network => network !== ""); this.setState({ networks: reseaux, @@ -257,7 +260,7 @@ export default class CreateUserStep2 extends Component { console.error("Erreur dans getNetworks:", error); this.setState({ modalVisible: false }); - if (error.message === "Impossible de récupérer les informations du code parrain") { + if (error.message === "Impossible de récupérer les informations du code hiérarchique ou taxe") { Alert.alert(I18n.t('TITLE_PROBLE_COME'), error.message, [{ text: "Revenir", onPress: () => this.props.navigation.pop() @@ -320,13 +323,13 @@ export default class CreateUserStep2 extends Component { code_dial: country.code_dial, code_country: country.code_country })); - + console.log("formattedCountries===>>",formattedCountries) this.setState({ - country: formattedCountries, + // country: formattedCountries, countries: formattedCountries[0], isLoading: false, selectedCountry: formattedCountries[0], // Sélectionne le premier pays par défaut - indicatif: formattedCountries[0].code_dial + // indicatif: formattedCountries[0].code_dial }); this.getNetworks(formattedCountries[0].label); } catch (error) { @@ -338,7 +341,7 @@ export default class CreateUserStep2 extends Component { onSelectCountry = (country) => { this.setState({ selectedCountry: country, - indicatif: country.code_dial, + // indicatif: country.code_dial, modalVisible: false }); this.getNetworks(country.code_dial); @@ -386,7 +389,7 @@ export default class CreateUserStep2 extends Component { const selectedCountry = this.state.countries[index]; this.setState({ selectedCountry: selectedCountry, - indicatif: selectedCountry.code_dial, + // indicatif: selectedCountry.code_dial, network: null }); this.getNetworks(selectedCountry.code_dial); @@ -456,7 +459,7 @@ export default class CreateUserStep2 extends Component { } }, (e) => { - Alert.alert(I18n.t('TITLE_PROBLE_COME'), "Impossible de recuperer les informations du code parrain", [{ + Alert.alert(I18n.t('TITLE_PROBLE_COME'), "Impossible de recuperer les informations du code hiérarchique ou taxe", [{ text: "Reesayer", onPress: () => this.watchLocation() }]) @@ -510,7 +513,11 @@ export default class CreateUserStep2 extends Component { town = result[0]; } else town = result; - this.setState({town: town}); + this.setState({town: { + name: "Douala", + id: "38", + indicatif: "+237" + }}); }) } else { getDefaultTown().then(result => { @@ -520,7 +527,11 @@ export default class CreateUserStep2 extends Component { town = resultTowwn[0]; } else town = resultTowwn; - this.setState({town: town}); + this.setState({town: { + name: "Douala", + id: "38", + indicatif: "+237" + }}); }); }) } @@ -533,7 +544,10 @@ export default class CreateUserStep2 extends Component { for (let i of cnt) { if (i.code_country === shortcountry) { found = true - this.setState({indicatif: i.code_dial, country: i.name}) + this.setState({ + // indicatif: i.code_dial, + country: i.name + }) this.getNetworks(i.code_dial); } } @@ -678,14 +692,40 @@ export default class CreateUserStep2 extends Component { - + + {selectedCountry ? `${selectedCountry.label}` : ''} + */} + {/* + /> */} {/* { this.numanim = comp }}> + {/* */} - { - // let phonenum = text + (this.state.contact !== undefined ? this.state.contact : ""); - // this.setState({indicatif: text, phone: phonenum}); - // }} - style={{ - width: responsiveWidth(30), - height: responsiveHeight(10), - alignSelf: 'center', - marginTop: responsiveHeight(2), - marginLeft: responsiveWidth(5), - marginRight: responsiveWidth(5), - borderRadius: 5, - }} - /> + @@ -824,8 +846,8 @@ export default class CreateUserStep2 extends Component { marginTop: responsiveHeight(2), marginRight: responsiveWidth(5), - - width: responsiveWidth(55), + marginLeft: responsiveWidth(5), + width: responsiveWidth(90), borderRadius: 5, }} > @@ -845,22 +867,22 @@ export default class CreateUserStep2 extends Component { borderRadius: 10, paddingLeft: 20, paddingRight: 20, - backgroundColor: 'white' + backgroundColor:"#ef4444", }} > - + @@ -939,7 +961,7 @@ export default class CreateUserStep2 extends Component { null} - + {/* {this.state.textadress !== undefined ? this.state.textadress : I18n.t('TAKE_MY_POSITION')} - + */} }