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 1a9ca1e..7450611 100644 --- a/android/app/src/main/res/raw/utils_i18n_en.json +++ b/android/app/src/main/res/raw/utils_i18n_en.json @@ -1,5 +1,5 @@ { - "WELCOME": "Welcome to iLink World !", + "WELCOME": "Welcome to SIM_ba !", "WAITING_LONG": "Waiting for a moment", "HELP": "Help", "SIMPLE_USER": "Simple User", @@ -136,7 +136,7 @@ "QUARTIER_COMMUNE": "Neighborhood in the town", "ARRONDISSEMENT": "Borough", "PATENTE": "Patent", - "TVA": "TVA", + "TVA": "VAT", "IRPP": "IRPP", "ANNEE_TAXE": "Paid year taxed", "ANNEE_TAXE_N": "Paid year taxed N", @@ -275,6 +275,8 @@ "IMAGE_TAKE": "Image take", "NAME": "Last name(s)", "FIRSTNAME": "First name(s) ", + "CIVILITY": "Civility", + "NATIONALITY": "Nationality", "NAME_EMETTEUR": "Issuer first name(s)", "EMETTEUR": "Issuer", "FIRSTNAME_EMETTEUR": "Issuer last name(s) ", @@ -449,7 +451,6 @@ "CHOOSE_LANGUAGE": "Choose the language", "MODIFY_PASSWORD": "Forgotten password", "CONTACT": "Contact", - "UPDATE": "... update", "FAQ": "FAQ", "UPDATE_POSITION_TEXT": "Update my position", "YOU_ARE": "Are you?", @@ -536,8 +537,8 @@ "MEMBERSHIP_REQUEST": "Membership applications", "HISTORY_TYPE_REQUEST": "Queries", "TREAT": "Processed", - "EXIT_TITLE": "Close iLink World!", - "EXIT_DESC": "Do you really want to close iLink World?", + "EXIT_TITLE": "Close SIM_ba!", + "EXIT_DESC": "Do you really want to close SIM_ba?", "NO_TREAT": "Unprocessed", "EXIT": "Close", "PERIOD": "Period", @@ -550,7 +551,7 @@ "ACCOUNT_ACTIVATE_TEXT": "Your account has been activated successfully!", "HISTORY_END": "End", "DONT_VALIDATE_ACCOUNT": "Account not validated", - "CONNEXION_SUCCESSFULL_TEXT": "Successful login Welcome to iLink World!", + "CONNEXION_SUCCESSFULL_TEXT": "Successful login Welcome to SIM_ba!", "UNVALIDATE_ACCOUNT_TEXT": "Your hypervisor has not yet verified your account", "TEXT_NEED_POSITION": "Please update your location!", "TITLE_NEED_POSITION": "Your location needs to be updated", @@ -563,12 +564,12 @@ "TITLE_PROBLE_COME": "A problem has been encountered", "TITLE_SUPPRESS_CONFIRM": "Confirm deletion", "TEXT_SUPPRESS_CONFIRM": "Do you really want to delete this user ?", - "TEXT_ERROR_START_APPLICATION": "An error occurred while starting iLink World, please restart iLink World", - "TEXT_UNABLE_TO_GET_YOUR_POSITION": "Unable to retrieve your location, please make sure your GPS is enabled and restart iLink World", + "TEXT_ERROR_START_APPLICATION": "An error occurred while starting SIM_ba, please restart SIM_ba", + "TEXT_UNABLE_TO_GET_YOUR_POSITION": "Unable to retrieve your location, please make sure your GPS is enabled and restart SIM_ba", "RESTART": "REPEAT", "TEXT_UNABLE_TO_GET_COUNTRY_INFO": "Unable to retrieve information from your country, check your internet connection, click \" Ok \"to try again,", "TITLE_UNABLE_TO_AUTORISE": "Failed to Authorize", - "MISSING_AUTORISATION_LOCATION": "iLink World is not authorized to access your location, please allow iLink World to access your location and restart iLink World", + "MISSING_AUTORISATION_LOCATION": "SIM_ba is not authorized to access your location, please allow SIM_ba to access your location and restart SIM_ba", "TEXT_FORGOTTEN_PASSWORD": "Enter your username, we will send you a new password", "TEXT_NETWORK_UNABLE": "Network not available, want to try again?", "LOADING_TEXT_MARKERS": "More points", @@ -577,7 +578,7 @@ "NO_POINT_FOUND": "No points found ", "LAUNCH_POINT_WITH_FILTER": "Do you want to restart the search within a radius of ", "UNABLE_GET_INFORMATION": "Problem of retrieval of information", - "UNABLE_GET_INFORMATION_TEXT": "Make sure your GPS is turned on and put in high precision mode and restart iLink World", + "UNABLE_GET_INFORMATION_TEXT": "Make sure your GPS is turned on and put in high precision mode and restart SIM_ba", "TITLE_HELP_SOON": "Help not available!", "YOUR_NETWORK": "Select your network", "YOUR_NETWORK_SELECTED": "Your network", @@ -593,18 +594,17 @@ "MODIFICATION_ORDRE_RECETTE": "Modify recipe order", "SAISIE_NUMERO_QUITANCE": "Enter receipt number", "MODIFICATION_NUMERO_QUITANCE": "Modify receipt number", - "SAISIR_QUITANCE": "Making a payment", + "SAISIR_QUITANCE": "Enter receipt", "CODE_AGENT": "Agent code ", "AVIS_IMPOSITION": "Tax notice", "AGENT_INFORMATION": "Agent Information", "UPDATE_DATE": "Date updated", "ASSIGN_TO_AGENT": "Assign to an agent", "AVIS_MODIFY_SUCCESS": "Notice successfully amended", - "ORDRE_RECETTE_SUCCES": "Recipe order entered successfully", "NUMERO_QUITANCE_SUCCES": "Successful receipt number", "ORDRE_RECETTE_MODIFY_SUCCES": "Recipe order number successfully changed", "NUMERO_QUITANCE_MODIFY_SUCCES": "Receipt number changed successfully", - "TAXES_SUR_LA_PROPRETE": "Tax on cleanliness", + "TAXES_SUR_LA_PROPRETE": "Synthetic general tax *", "SAVE": "Save", "TEXT_SUPPRESS_CONFIRM_TAXE": "Are you sure you want to remove this tax?", "NUMERO_QUITANCE": "Receipt number", @@ -631,12 +631,10 @@ "PAYMENT_DEADLINE": "Payment deadline", "TAX_NOTICE_CREATED_AT": "Tax notice created at", "TOTAL_AMOUNT": "Total amount", - "UPDATE_DATE": "Update date", "YEAR": "Year", "TYPE": "Type", "CODE_MEMBRE": "Sponsor code", "DISTRICT": "District", - "IDENTIFICATION_NUMBER": "Identification number", "MUNICIPALITY": "Municipality", "ID_PATENTE": "ID patent", "NETWORK_ID": "Network ID", @@ -649,7 +647,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 ebd857d..31e8722 100644 --- a/android/app/src/main/res/raw/utils_i18n_fr.json +++ b/android/app/src/main/res/raw/utils_i18n_fr.json @@ -1,5 +1,5 @@ { - "WELCOME": "Bienvenue sur Sim_ba mobile !", + "WELCOME": "Bienvenue sur iLink City !", "WAITING_LONG": "Veuillez patienter un instant", "HELP": "Aide", "SIMPLE_USER": "Utilisateur simple", @@ -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", @@ -248,7 +248,7 @@ "HISTORY": "Historique", "WITHDRAWAL_TRANSACTION_HISTORY_DESCRIPTION": "Retrait de", "DEPOSIT_TRANSACTION_HISTORY_DESCRIPTION": "Dépôt de", - "NO_WALLET_HISTORY": "Aucun historique", + "NO_WALLET_HISTORY": "Aucune transaction à ce jour", "DEMAND_SEND": "Demande envoyé", "EPARGNE_DEPOSE": "Epargne déposée", "BREAK_EPARGNE_DONE": "Epargne cassée avec succès", @@ -285,6 +285,8 @@ "IMAGE_TAKE": "Prise d'image", "NAME": "Nom(s)", "FIRSTNAME": "Prénom(s) ", + "CIVILITY": "Civilité", + "NATIONALITY": "Nationalité", "NAME_EMETTEUR": "Nom(s) émetteur", "EMETTEUR": "Emetteur", "FIRSTNAME_EMETTEUR": "Prénom(s) émetteur", @@ -301,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 classe de taxes", - "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...", @@ -384,7 +386,7 @@ "OK": "OK", "SIMPLE": "Simple", "BLOCKED": "Bloqué", - "APP_FULLNAME": "Sim_ba mobile", + "APP_FULLNAME": "Ilink City", "GUIDE_TITLE": "Bienvenue dans le Guide de", "GUIDE_USER_SIMPLE": "Guide pour un utilisateur", "GUIDE_AGENT": "Guide pour un agent", @@ -426,7 +428,7 @@ "WAY": "Itinéraire", "ADD_NETWORK": "Ajouter une classe de taxes", "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", @@ -457,7 +459,6 @@ "CHOOSE_LANGUAGE": "Choisir la langue", "MODIFY_PASSWORD": "Mot de passe oublié", "CONTACT": "Contact", - "UPDATE": "... mise à jour", "FAQ": "FAQ", "UPDATE_POSITION_TEXT": "Mettre à jour ma position", "YOU_ARE": "Vous êtes ?", @@ -543,8 +544,8 @@ "MEMBERSHIP_REQUEST": "Demandes d'adhésion", "HISTORY_TYPE_REQUEST": "Requêtes", "TREAT": "Traité", - "EXIT_TITLE": "Fermer Sim_ba mobile !", - "EXIT_DESC": "Voulez-vous vraiment fermer Sim_ba mobile ?", + "EXIT_TITLE": "Fermer iLink City !", + "EXIT_DESC": "Voulez-vous vraiment fermer iLink City ?", "NO_TREAT": "Non traité", "EXIT": "Fermer", "PERIOD": "Période", @@ -557,7 +558,7 @@ "ACCOUNT_ACTIVATE_TEXT": "Votre compte a été activé avec succès !", "HISTORY_END": "Fin", "DONT_VALIDATE_ACCOUNT": "Compte non validé", - "CONNEXION_SUCCESSFULL_TEXT": "Connexion réussie. Bienvenue dans Sim_ba mobile ! ", + "CONNEXION_SUCCESSFULL_TEXT": "Connexion réussie. Bienvenue dans iLink City ! ", "UNVALIDATE_ACCOUNT_TEXT": "Votre hyperviseur n'a pas encore validé votre compte", "TEXT_NEED_POSITION": "Veuillez mettre à jour votre position !", "TITLE_NEED_POSITION": "Votre position doit être mise à jour", @@ -570,12 +571,12 @@ "TITLE_PROBLE_COME": "Un problème a été rencontré", "TITLE_SUPPRESS_CONFIRM": "Confirmation de suppression", "TEXT_SUPPRESS_CONFIRM": "Voulez vous vraiment supprimer cet utilisateur ?", - "TEXT_ERROR_START_APPLICATION": "Une erreur est survenue au démarrage de Sim_ba mobile. Veuillez relancer Sim_ba mobile", - "TEXT_UNABLE_TO_GET_YOUR_POSITION": "Impossible de recupérez votre position. Veuillez verifier que votre GPS est activé et relancez Sim_ba mobile", + "TEXT_ERROR_START_APPLICATION": "Une erreur est survenue au démarrage de iLink City. Veuillez relancer iLink City", + "TEXT_UNABLE_TO_GET_YOUR_POSITION": "Impossible de recupérez votre position. Veuillez verifier que votre GPS est activé et relancez iLink City", "RESTART": "RECOMMENCER", "TEXT_UNABLE_TO_GET_COUNTRY_INFO": "Impossible de recupérer les informations de votre pays. Verifiez votre connexion internet ! cliquez sur \"Ok\" pour reessayer", "TITLE_UNABLE_TO_AUTORISE": "Echec de l'autorisation", - "MISSING_AUTORISATION_LOCATION": "Sim_ba mobile n'est pas autorisé à acceder à votre position. Veuillez autoriser Sim_ba mobile à accéder à votre localisation et relancez Sim_ba mobile", + "MISSING_AUTORISATION_LOCATION": "iLink City n'est pas autorisé à acceder à votre position. Veuillez autoriser iLink City à accéder à votre localisation et relancez iLink City", "TEXT_FORGOTTEN_PASSWORD": "Saisissez votre identifiant,nous vous enverrons un nouveau mot de passe\n", "TEXT_NETWORK_UNABLE": "Réseau non disponible, voulez vous réessayer ?", "LOADING_TEXT_MARKERS": "Suite des points ", @@ -584,10 +585,10 @@ "LAUNCH_POINT_WITH_FILTER": "Voulez-vous relancer la recherche dans un rayon de ", "LOADING_TEXT_MARKERS_2": "autour", "UNABLE_GET_INFORMATION": "Problème de récuperation des Informations", - "UNABLE_GET_INFORMATION_TEXT": "Vérifiez que votre GPS est activé et mis en mode haute precision et relancez Sim_ba mobile", + "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", @@ -598,23 +599,21 @@ "ORDRE_RECETTE": "Ordre recette", "NO_ORDRE_RECETTE": "Aucun ordre de recette", "MODIFICATION_ORDRE_RECETTE": "Modifier ordre recette", - "SAISIE_NUMERO_QUITANCE": "Saisir numéro quitance", - "MODIFICATION_NUMERO_QUITANCE": "Modifier numéro quitance", - "SAISIR_QUITANCE": "Effectuer un paiement", + "SAISIE_NUMERO_QUITANCE": "Saisir numéro quittance", + "MODIFICATION_NUMERO_QUITANCE": "Modifier numéro quittance", + "SAISIR_QUITANCE": "Saisir paiement ou quittance", "CODE_AGENT": "Code agent ", "AVIS_IMPOSITION": "Déclaration", "AGENT_INFORMATION": "Informations sur l'agent", - "UPDATE_DATE": "Date de mis à jour", "ASSIGN_TO_AGENT": "Assigner à un agent", "AVIS_MODIFY_SUCCESS": "Avis modifié avec succès", - "ORDRE_RECETTE_SUCCES": "Ordre de recette saisi avec succès", - "NUMERO_QUITANCE_SUCCES": "Numéro de quitance enregistré avec succès", + "NUMERO_QUITANCE_SUCCES": "Numéro de quittance enregistré avec succès", "ORDRE_RECETTE_MODIFY_SUCCES": "Numéro ordre de recette modifié avec succès", - "NUMERO_QUITANCE_MODIFY_SUCCES": "Numéro de quitance modifié avec succès", - "TAXES_SUR_LA_PROPRETE": "Impôt général synthétique", + "NUMERO_QUITANCE_MODIFY_SUCCES": "Numéro de quittance modifié avec succès", + "TAXES_SUR_LA_PROPRETE": "Impôt général synthétique *", "SAVE": "Enregistrer", "TEXT_SUPPRESS_CONFIRM_TAXE": "Voulez vous vraiment supprimer cette taxe?", - "NUMERO_QUITANCE": "Numéro quitance", + "NUMERO_QUITANCE": "Numéro quittance", "QUITANCE": "Quitance", "ORDRE_DE_RECETTE": "Ordre de recette", "MODIFY_ORDRE_DE_RECETTE": "Modifier ordre de recette", @@ -643,12 +642,11 @@ "TYPE": "Type", "CODE_MEMBRE": "Code sponsor", "DISTRICT": "District", - "IDENTIFICATION_NUMBER": "Numéro d'identification", "MUNICIPALITY": "Municipalité", "ID_PATENTE": "ID patente", "NETWORK_ID": "ID du réseau", "NEIGHTBORHOOD": "Quartier", - "ORDRE_RECETTE_RECEIPT": "Recette et quitance", + "ORDRE_RECETTE_RECEIPT": "Recette et quittance", "HISTORY_OF": "Historique des", "AVIS_IMPOSITIONS": "déclarations", "ORDRE_RECETTES_RECEIPTS": "recettes et quitances", @@ -656,7 +654,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", @@ -692,7 +690,6 @@ "ACTIF": "actif", "ACTIFS": "actifs", "TAXE_INFORMATION": "Informations sur la déclaration", - "ACTIFS": "actifs", "NUMERO_AVIS_IMPOSITION": "N° déclaration", "ADD_ORDRE_RECETTE": "Ajouter un ordre de recette", "PENALITE_ON_TAXE": "Pénalité sur les taxes", @@ -705,14 +702,14 @@ "DELETE_PENALITE": "Supprimer la pénalité", "TAUX_PENALITE": "Taux de pénalité (%)", "TAUX": "Taux", - "NO_ORDRE_RECETTE_WITH_QUITANCE": "Aucun ordre de recette sans quitance", + "NO_ORDRE_RECETTE_WITH_QUITANCE": "Aucun ordre de recette sans quittance", "SAVE_PENALITY": "Taux", "SAISIE_PENALITY": "Saisie des pénalités", "MODIFICATION_SAISIE_PENALITY": "Modification/Suppression", "YOU_HAVE_DEFINED_PENALITY_FOR_THIS_YEAR": "Vous avez déjà définit une pénalité pour les années suivantes:", "AMOUNT_ORDRE_RECETTE": "Montant de l'ordre de recette", "AMOUNT_TAX_NOTICE": "Montant de la déclaration", - "YOU_CANT_DELETE_LAST_TAX_NOTICE": "Une quitance doit contenir au moins un ordre de recette", + "YOU_CANT_DELETE_LAST_TAX_NOTICE": "Une quittance doit contenir au moins un ordre de recette", "WOULD_YOU_WANT_SEARCH_BY_NAME": "Voulez-vous rechercher l'usager par son nom ?", "USAGER_NAME": "Nom de l'usager", "NO_USAGER_CORRESPONDING_TO_SEARCH": "Aucun usager ne correspond à votre recherche", @@ -727,9 +724,8 @@ "PENALITE_INCLUSE": "Pénalité incluse", "SOINS": "Soins", "INVOICE": "Facture", - "ORDRE_RECETTE_QUITANCE": "Ordre et quitance", + "ORDRE_RECETTE_QUITANCE": "Ordre et quittance", "ID": "ID", "CONNEXION_CHOICE": "Choix de connexion", "CONNEXION_CHOICE_DESCRIPTION": "Un compte agent de recharge est associé à votre numéro. Voulez vous continuer en tant que agent recharge ?" - } diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index d680e91..d52c84d 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ - Douala3 + SIM_ba mobile CAD3 diff --git a/app/screens/WebviewScreen.js b/app/screens/WebviewScreen.js index f3c0a1a..5c28209 100644 --- a/app/screens/WebviewScreen.js +++ b/app/screens/WebviewScreen.js @@ -324,7 +324,7 @@ const WebviewScreen = ({ const params = queryString.parse(webViewState.url); let transaction_id = ''; - let token = ''; + let token = null; const keys = Object.keys(params); keys.forEach(elt => { if (elt.includes('transaction_id')) transaction_id = params[elt]; diff --git a/app/screens/account/AddNetwork.js b/app/screens/account/AddNetwork.js index 123b797..a2b4b5a 100644 --- a/app/screens/account/AddNetwork.js +++ b/app/screens/account/AddNetwork.js @@ -496,6 +496,7 @@ export default class AddNetwork extends Component { this.setState({isLoading: false}); }); } else { + console.log("ICI===>") if (this.ckeckIfFieldIsOK(this.state.password)) this.passwordAnim.shake(800); else diff --git a/app/screens/login/CreateUserStep.js b/app/screens/login/CreateUserStep.js index d9c26ef..b66c800 100644 --- a/app/screens/login/CreateUserStep.js +++ b/app/screens/login/CreateUserStep.js @@ -382,8 +382,9 @@ class CreateUserStep extends Component { } async watchLocation(param) { - if (this.isOffline) { + if (this.isOffline) { Geolocation.getCurrentPosition((position) => { + console.log("Abena1===>>",this.isOffline) this.setState({ modalVisible: false, latitude: position.coords.latitude, @@ -450,6 +451,8 @@ class CreateUserStep extends Component { if (!_.isEqual(myPosition, myLastPosition)) { getPositionInformation(myPosition).then((response) => { + console.log("Abena3===>>",response.results) + console.log("Abena3===>>",response.results.length) if (response.results !== undefined) { if (response.results.length > 0) { let most = response.results[0] @@ -620,7 +623,7 @@ class CreateUserStep extends Component { renderRequiredTaxesDropdown = (item, index) => { return ( <> - + {/* - + */} { item.measurement_unit !== "forfait" && <> @@ -1434,7 +1437,7 @@ handleTaxSlection = (selectedTax) => { { borderRadius: 5,}}> - Date de naissance * + {I18n.t('BIRTH_DATE')} @@ -1482,7 +1485,7 @@ handleTaxSlection = (selectedTax) => { { { { this.setState({ father_lastname: text })} - /> - this.setState({ father_firstname: text })} - /> - { this.setState({ mother_firstname: text })} /> + this.setState({ father_lastname: text })} + /> + this.setState({ father_firstname: text })} + /> {/* Masquer les champs TECHNICAL AGREMENT et PATENTE */} )} @@ -1555,7 +1558,7 @@ handleTaxSlection = (selectedTax) => { { borderRadius: 5,}}> - Date de création + {I18n.t('CREATION_DATE')} @@ -1603,7 +1606,7 @@ handleTaxSlection = (selectedTax) => { { { { this.ProprierteTypeAnim = comp }} > - { }}> { return value }} - //value={item.name} labelExtractor={(value) => { return value.name }} onChangeText={this.handleTaxSlection} - // onChangeText={(value) => { - - // let tax_units_count = this.state.required_taxes; - // if (value === "") - // tax_units_count[index].tax_units_count = null; - // else - // tax_units_count[index].tax_units_count = value; - // this.setState({required_taxes: tax_units_count}); - // }} - - /> - + */} ) : ( @@ -1870,7 +1860,7 @@ handleTaxSlection = (selectedTax) => { - { + {/* { this.neightborhoodAnim = comp }}> { onChangeText={(text) => { this.setState({neighborhood: text}) }}/> - + */} + { this.neightborhoodAnim = comp }}> + {console.log("ICI===>>",this.state.result)} + {console.log("ICI===>>",this.state.result.neighborhoods)} + { + const id = parseInt(selectedItem.id, 10); + this.setState({ neighborhood: selectedItem.name }); + }} + /> + {/* { }); data['secondary_taxes'] = publicites_taxes; } - + data['taxes'] = taxes_to_send; data['required_taxes'] = this.state.required_taxes.filter((element, i) => element.id_network_tax === this.state.selectedTax?.id) //data['required_taxes'] = this.state.required_taxes; @@ -2423,6 +2425,7 @@ handleTaxSlection = (selectedTax) => { data['longitude'] = this.state.data.longitude; data['player_id'] = this.state.player_id; data['accountType'] = this.state.accountType; + data['cni_number'] = this.state.cni_number; data['birth_date'] = this.state.birth_date; data['birth_place'] = this.state.birth_place; @@ -2432,6 +2435,7 @@ handleTaxSlection = (selectedTax) => { data['father_firstname'] = this.state.father_firstname; data['mother_lastname'] = this.state.mother_lastname; data['mother_firstname'] = this.state.mother_firstname; + data['signboard'] = this.state.signboard; data['entreprise_creation_date'] = this.state.entreprise_creation_date; for (let i in user) { @@ -2440,6 +2444,25 @@ handleTaxSlection = (selectedTax) => { data['category'] = user.category; data['active'] = '0'; + // Ajout de la logique conditionnelle pour vider les champs en fonction du type de compte. + if (this.state.accountType === "PP") { + // Pour une personne physique, on s'assure que les champs spécifiques à une personne morale soient à null. + data['signboard'] = null; + data['entreprise_creation_date'] = null; + data['technical_approval'] = null; + data['id_patente'] = null; + } else if (this.state.accountType === "PM") { + // Pour une personne morale, on met à null les champs spécifiques à une personne physique. + data['cni_number'] = null; + data['birth_date'] = null; + data['birth_place'] = null; + data['birth_country'] = null; + data['nationality_country'] = null; + data['father_lastname'] = null; + data['father_firstname'] = null; + data['mother_lastname'] = null; + data['mother_firstname'] = null; + } console.log("DATA TO SEND CONVERT", data); let idsNetworksGroup1 = ["15", "16", "21", "17"]; @@ -2538,7 +2561,7 @@ handleTaxSlection = (selectedTax) => { } else this.setState({isLoading: false}); } else { - console.log("here===>>",data); + console.log("here===>>",JSON.stringify(data, null, 2)); createGeolocatedAccount(data).then((result) => { console.log("here2===>>",result); if (result.success !== undefined && result.success === 1) { diff --git a/app/screens/login/FilteredList .js b/app/screens/login/FilteredList .js index f8f3f84..90e136d 100644 --- a/app/screens/login/FilteredList .js +++ b/app/screens/login/FilteredList .js @@ -1,6 +1,7 @@ import React, { Component } from 'react'; import { View, Text, TextInput, FlatList, TouchableOpacity } from 'react-native'; import { responsiveWidth} from 'react-native-responsive-dimensions'; +import I18n from "react-native-i18n"; class FilteredList extends Component { constructor(props) { @@ -52,7 +53,7 @@ class FilteredList extends Component { > {I18n.t('NEXT')} - - 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 + + + + {I18n.t('HIERACHIC_CODE')} : + {' '} + {I18n.t('HIERACHIC_CODE_DESCRIPTION')} + + + {I18n.t('TAX_CODE')} :{' '} + {I18n.t('TAX_CODE_DESCRIPTION')} + ); diff --git a/app/screens/login/createUserStep2.js b/app/screens/login/createUserStep2.js index e7f5786..fb941b1 100644 --- a/app/screens/login/createUserStep2.js +++ b/app/screens/login/createUserStep2.js @@ -175,6 +175,7 @@ export default class CreateUserStep2 extends Component { return new Promise(async (resolve, reject) => { try { let datas = await getCodeInformation(membre); + console.log("ICI datas===>>",datas) // Assuming the API returns country and dial_code const { country, dial_code, ...otherData } = datas; resolve({ country, dial_code, ...otherData }); @@ -513,7 +514,7 @@ export default class CreateUserStep2 extends Component { town = result; this.setState({town: { name: "Douala", - id: "38", + id: "2", indicatif: "+237" }}); }) @@ -527,7 +528,7 @@ export default class CreateUserStep2 extends Component { town = resultTowwn; this.setState({town: { name: "Douala", - id: "38", + id: "2", indicatif: "+237" }}); }); @@ -1158,7 +1159,7 @@ export default class CreateUserStep2 extends Component { // data['town'] = this.state.town; data['town'] = { name: "Douala", - id: "38", + id: "2", indicatif: "+237" } data['latitude'] = myPosition.latitude; diff --git a/app/utils/i18n/en.json b/app/utils/i18n/en.json index fe48d87..7995808 100644 --- a/app/utils/i18n/en.json +++ b/app/utils/i18n/en.json @@ -1,5 +1,5 @@ { - "WELCOME": "Welcome to iLink World !", + "WELCOME": "Welcome to SIM_ba !", "WAITING_LONG": "Waiting for a moment", "HELP": "Help", "SIMPLE_USER": "Simple User", @@ -13,6 +13,7 @@ "THE_AGENT": "Agent", "USER": "User", "HYPERVISOR": "Hypervisor", + "YOU_HAVE": "You have", "OPEN": "Open", "POSITION": "My position", "TAKE_MY_PLACE": "Take my position", @@ -34,25 +35,18 @@ "ASK_FOR_SUPERVISOR1": "Ask to become a supervisor", "CREDIT_ASK_FROM_MEMBERS": "Credit requests from your members", "ASK_MEMBERS": "Membership applications", - "MY_ACCOUNT": "My account", - "WALLET": "Wallet", + "AMOUNT_LABEL": "Amount", + "AMOUNT_LABEL_DESCRIPTION": "Please enter the amount", + "DESTINATAIRE": "Recipient", + "ERROR_LABEL": "Error", "NO_BANK_AVAILABLE": "No bank available", "BANK_LIST": "Bank list", "NO_OPERATOR_AVAILABLE": "No operator available", - "ENTER_VALID_AMOUNT": "Enter a valid amount", - "ENTER_AMOUNT_SUPERIOR_ZEROR": "Enter amount superior to zero", - "AMOUNT_SUPERIOR_TO_PRINCIPAL_ACCOUNT": "Amount greater than that of the agent's main account", - "PAYMENT_DONE": "Payment done", - "PAYMENT_ERROR": "Payment error", - "MAKE_DEPOSIT": "Make a deposit", - "MAKE_WITHDRAWAL": "Make withdrawal", - "WITHDRAWAL_TYPE": "Withdrawal mode", - "DEPOSIT_DESCRIPTION": "Make a deposit", - "ERROR_TRANSFER": "Transfer error", - "SUCCESS_TRANSFER": "Transfer done", - "WITHDRAWAL_SUCCESS": "Withdrawal done", - "WITHDRAWAL_ERROR": "Withdrawal error", - "WALLET_TO_WALLET_SUCCESS_TRANSFER": "Wallet to wallet transfer successfully completed", + "DEPOSIT_SUCCESS": "Deposit done successfully", + "SUCCESS": "Success", + "ETAT": "State", + "MY_ACCOUNT": "My account", + "WALLET": "Wallet", "DEPOSIT": "Deposit", "EN_ATTENTE_DE_VALIDATION": "Waiting for validation", "REMBOURSE": "Reimbursed", @@ -62,8 +56,17 @@ "RETRAIT_ARGENT": "Receive money", "CONFIRM_DEPOSIT": "Confirm deposit", "CONFIRM_WITHDRAWAL": "Confirm withdrawal", - "CHANGE_SOURCE_CARD": "Change the type of entry number", + "ENTER_VALID_AMOUNT": "Enter a valid amount", + "ENTER_AMOUNT_SUPERIOR_ZEROR": "Enter amount superior to zero", + "AMOUNT_SUPERIOR_TO_PRINCIPAL_ACCOUNT": "Amount greater than that of the agent's main account", + "ENTER_VALID_SERIAL_NUMBER": "Please enter the correct serial number", + "MAKE_DEPOSIT": "Make a deposit", + "MAKE_WITHDRAWAL": "Make withdrawal", + "WITHDRAWAL_TYPE": "Withdrawal mode", + "PAYMENT_DONE": "Payment done", + "PAYMENT_ERROR": "Payment error", "CHOOSE_SOURCE": "Choose source", + "CHANGE_SOURCE_CARD": "Change the type of entry number", "CREDIT_CARD": "Credit card", "CREDIT_ACCOUNT": "Credit account", "SAVINGS_ACCOUNT": "Saving account", @@ -77,15 +80,18 @@ "CARD_EXPIRY_LABEL": "Expiry.", "CARD_CVC_LABEL": "CVC/CCV", "CVC_CARD_ERROR": "CVC card error format", + "DEPOSIT_DESCRIPTION": "Make a deposit", + "ERROR_TRANSFER": "Transfer error", + "SUCCESS_TRANSFER": "Transfer done", + "WITHDRAWAL_SUCCESS": "Withdrawal done", + "WITHDRAWAL_ERROR": "Withdrawal error", + "WALLET_TO_WALLET_SUCCESS_TRANSFER": "Wallet to wallet transfer successfully completed", "THIS_FIELD_IS_REQUIRED": "This field is required", "PLEASE_ENTER_THE_AMOUNT": "Please enter the amount", "CHOOSE_OPTION": "Please choose an option", "CHOOSE_OPERATOR": "Please choose an operator", "EXPIRY_CARD_ERROR": "Date incorrect", "CARD_NUMBER_ERROR": "Card number incorrect", - "AMOUNT_LABEL": "Amount", - "AMOUNT_LABEL_DESCRIPTION": "Please enter the amount", - "DESTINATAIRE": "Recipient", "WITHDRAWAL": "Withdrawal", "LINK_CARD": "Link my card", "LINK_CARD_REATTACH": "Link | Reattach", @@ -137,16 +143,21 @@ "QUARTIER_COMMUNE": "Neighborhood in the town", "ARRONDISSEMENT": "Borough", "PATENTE": "Patent", - "TVA": "TVA", + "TVA": "VAT", "IRPP": "IRPP", "ANNEE_TAXE": "Paid year taxed", "ANNEE_TAXE_N": "Paid year taxed N", "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": "Technical approval or license", + "IMMATRICULATION_DGI": "UIN", + "INFORMATION_FICHE_CIRCUIT": "Identification sheet", + "OTHERS_INFORMATIONS": "Other information", "SUCCESS_CREATION_GROUP": "Creation information", "ERROR_CREATION_GROUP": "Creation error", "ERROR_JOIN_GROUP": "Join error", + "SUCCES_JOIN_GROUP": "Group join success", "CREATE_GROUP": "Create group", "MANAGE_GROUP": "Manage group", "VALIDATION_DEMAND": "Validation request", @@ -234,7 +245,6 @@ "COMMISSION_TRANSFER_ERROR_EMPTY": "The commission balance is empty", "CONFIRM": "Confirm", "CONFIRM_TRANSFER_COMMISSION": "Confirm commission transfer", - "CREATION_DATE": "Creation date", "PRINCIPAL_ACCOUNT_TITLE": "Principal account", "NUMERO_COMPTE": "Account number", "NO_WALLET_ACTIVED": "No wallet is activated for your account", @@ -276,6 +286,8 @@ "IMAGE_TAKE": "Image take", "NAME": "Last name(s)", "FIRSTNAME": "First name(s) ", + "CIVILITY": "Civility", + "NATIONALITY": "Nationality", "NAME_EMETTEUR": "Issuer first name(s)", "EMETTEUR": "Issuer", "FIRSTNAME_EMETTEUR": "Issuer last name(s) ", @@ -403,10 +415,6 @@ "CANCEL_LABEL": "Cancel", "SUBMIT_LABEL": "Submit", "PHISIC_SECURITY": "Physic security", - "ERROR_LABEL": "Error", - "SUCCESS": "Success", - "ETAT": "State", - "DEPOSIT_SUCCESS": "Deposit done successfully", "TEXT_GUIDE_USER_1": "You have just connected.\n Your location is marked in the center of the map with the indication \"You are here\" ", "TEXT_GUIDE_USER_3": "Clicking the '+' button will open the options menu", "TEXT_GUIDE_USER_4": "Click on a marker to get the information on a point", @@ -450,7 +458,6 @@ "CHOOSE_LANGUAGE": "Choose the language", "MODIFY_PASSWORD": "Forgotten password", "CONTACT": "Contact", - "UPDATE": "... update", "FAQ": "FAQ", "UPDATE_POSITION_TEXT": "Update my position", "YOU_ARE": "Are you?", @@ -514,11 +521,13 @@ "HISTORY_TYPE": "Type", "HISTORY_TYPE_ASK": "Requests", "REQUEST_RECEIVE": "Requests received", + "DEMANDE_RECEIVE": "Request received", "MY_DEMANDE": "My requests", "PHONE_TRANSACTION": "Transaction number", "DEMAND_TEXT_FIRST_PART": "made a request for", "DEMAND_TEXT_FIRST_PART_YOU": "You made a request for ", "REQUEST_SEND": "Request Sent", + "DEMANDE_SEND": "Request sent", "DEMAND_RECEIVE": "Requests received", "DEMAND_VALIDATION_GROUP_RECEIVE": "Validation requests", "DEMAND_DELETE_GROUP_RECEIVE": "Removal requests", @@ -537,8 +546,8 @@ "MEMBERSHIP_REQUEST": "Membership applications", "HISTORY_TYPE_REQUEST": "Queries", "TREAT": "Processed", - "EXIT_TITLE": "Close iLink World!", - "EXIT_DESC": "Do you really want to close iLink World?", + "EXIT_TITLE": "Close SIM_ba!", + "EXIT_DESC": "Do you really want to close SIM_ba?", "NO_TREAT": "Unprocessed", "EXIT": "Close", "PERIOD": "Period", @@ -551,7 +560,7 @@ "ACCOUNT_ACTIVATE_TEXT": "Your account has been activated successfully!", "HISTORY_END": "End", "DONT_VALIDATE_ACCOUNT": "Account not validated", - "CONNEXION_SUCCESSFULL_TEXT": "Successful login Welcome to iLink World!", + "CONNEXION_SUCCESSFULL_TEXT": "Successful login Welcome to SIM_ba!", "UNVALIDATE_ACCOUNT_TEXT": "Your hypervisor has not yet verified your account", "TEXT_NEED_POSITION": "Please update your location!", "TITLE_NEED_POSITION": "Your location needs to be updated", @@ -564,12 +573,12 @@ "TITLE_PROBLE_COME": "A problem has been encountered", "TITLE_SUPPRESS_CONFIRM": "Confirm deletion", "TEXT_SUPPRESS_CONFIRM": "Do you really want to delete this user ?", - "TEXT_ERROR_START_APPLICATION": "An error occurred while starting iLink World, please restart iLink World", - "TEXT_UNABLE_TO_GET_YOUR_POSITION": "Unable to retrieve your location, please make sure your GPS is enabled and restart iLink World", + "TEXT_ERROR_START_APPLICATION": "An error occurred while starting SIM_ba, please restart SIM_ba", + "TEXT_UNABLE_TO_GET_YOUR_POSITION": "Unable to retrieve your location, please make sure your GPS is enabled and restart SIM_ba", "RESTART": "REPEAT", "TEXT_UNABLE_TO_GET_COUNTRY_INFO": "Unable to retrieve information from your country, check your internet connection, click \" Ok \"to try again,", "TITLE_UNABLE_TO_AUTORISE": "Failed to Authorize", - "MISSING_AUTORISATION_LOCATION": "iLink World is not authorized to access your location, please allow iLink World to access your location and restart iLink World", + "MISSING_AUTORISATION_LOCATION": "SIM_ba is not authorized to access your location, please allow SIM_ba to access your location and restart SIM_ba", "TEXT_FORGOTTEN_PASSWORD": "Enter your username, we will send you a new password", "TEXT_NETWORK_UNABLE": "Network not available, want to try again?", "LOADING_TEXT_MARKERS": "More points", @@ -578,7 +587,7 @@ "NO_POINT_FOUND": "No points found ", "LAUNCH_POINT_WITH_FILTER": "Do you want to restart the search within a radius of ", "UNABLE_GET_INFORMATION": "Problem of retrieval of information", - "UNABLE_GET_INFORMATION_TEXT": "Make sure your GPS is turned on and put in high precision mode and restart iLink World", + "UNABLE_GET_INFORMATION_TEXT": "Make sure your GPS is turned on and put in high precision mode and restart SIM_ba", "TITLE_HELP_SOON": "Help not available!", "YOUR_NETWORK": "Select your network", "YOUR_NETWORK_SELECTED": "Your network", @@ -594,7 +603,7 @@ "MODIFICATION_ORDRE_RECETTE": "Modify recipe order", "SAISIE_NUMERO_QUITANCE": "Enter receipt number", "MODIFICATION_NUMERO_QUITANCE": "Modify receipt number", - "SAISIR_QUITANCE": "Making a payment", + "SAISIR_QUITANCE": "Enter receipt", "CODE_AGENT": "Agent code ", "AVIS_IMPOSITION": "Tax notice", "AGENT_INFORMATION": "Agent Information", @@ -605,7 +614,7 @@ "NUMERO_QUITANCE_SUCCES": "Successful receipt number", "ORDRE_RECETTE_MODIFY_SUCCES": "Recipe order number successfully changed", "NUMERO_QUITANCE_MODIFY_SUCCES": "Receipt number changed successfully", - "TAXES_SUR_LA_PROPRETE": "Tax on cleanliness", + "TAXES_SUR_LA_PROPRETE": "Synthetic general tax *", "SAVE": "Save", "TEXT_SUPPRESS_CONFIRM_TAXE": "Are you sure you want to remove this tax?", "NUMERO_QUITANCE": "Receipt number", @@ -613,7 +622,6 @@ "ORDRE_DE_RECETTE": "Recipe order", "MODIFY_ORDRE_DE_RECETTE": "Change recipe order", "ORDRE_DE_RECETTE_NUMBER": "Recipe order number", - "ORDRE_RECETTE_SUCCES": "Recipe order successfully changed", "RECEIPT_NUMBER": "Receipt number", "NUMBER": "Number", "ACTION": "Action", @@ -632,12 +640,10 @@ "PAYMENT_DEADLINE": "Payment deadline", "TAX_NOTICE_CREATED_AT": "Tax notice created at", "TOTAL_AMOUNT": "Total amount", - "UPDATE_DATE": "Update date", "YEAR": "Year", "TYPE": "Type", "CODE_MEMBRE": "Sponsor code", "DISTRICT": "District", - "IDENTIFICATION_NUMBER": "Identification number", "MUNICIPALITY": "Municipality", "ID_PATENTE": "ID patent", "NETWORK_ID": "Network ID", @@ -650,7 +656,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 hiérarchique ou taxe", + "ENTER_SPONSOR_CODE": "Enter your hierarchical code or tax", "NOM_SOCIETE": "Society name", "TAKE_My_POSITION": "Retreive position", "CREATE_ACTIF": "Create asset", @@ -691,6 +697,7 @@ "PENALITE_ON_TAXE": "Penalty on taxes", "PENALITE_MANAGE": "Penalty management", "PENALITE": "Penalty", + "PENALITES": "Penalty", "NO_PENALITE": "No penality", "MODIFY_PENALITE": "Modify penality", "DELETE_PENALITE": "Delete penality", @@ -698,10 +705,12 @@ "TAUX_PENALITE": "Penalty rate (%)", "TAUX": "Rate", "NO_ORDRE_RECETTE_WITH_QUITANCE": "No recipe order with tax notice", + "SAVE_PENALITY": "Penalty saved", "SAISIE_PENALITY": "Entering penalties", "MODIFICATION_SAISIE_PENALITY": "Modification/Deletion", "YOU_HAVE_DEFINED_PENALITY_FOR_THIS_YEAR": "You have already set a penalty for the following year(s)", "AMOUNT_ORDRE_RECETTE": "Revenue order amount", + "AMOUNT_TAX_NOTICE": "Tax Notice Amount", "YOU_CANT_DELETE_LAST_TAX_NOTICE": "A discharge must contain at least one receipt order", "WOULD_YOU_WANT_SEARCH_BY_NAME": "Would you want to make search by name ?", "USAGER_NAME": "User name", @@ -711,5 +720,41 @@ "BY_QR_CODE": "By QR Code", "SCAN": "Scan", "BRING_YOUR_CAMERA_CLOSER_TO_SCAN_QR_CODE": "Bring your camera closer to the QR Code to scan it", - "LOADING_CREDIT_TRANSFER": "Credit transfert in progress..." -} \ No newline at end of file + "CLOSE": "Close", + "NUMBER_OF_DAYS": "Number of days", + "NUMBER_OF_DAYS_INCORRECT": "The number of days must be between 1 and 366", + "PENALITE_INCLUSE": "Penalty included", + "SOINS": "Care", + "INVOICE": "Invoice", + "ORDRE_RECETTE_QUITANCE": "Order and receipt", + "ID": "ID", + "CONNEXION_CHOICE": "Choice of connection", + "CONNEXION_CHOICE_DESCRIPTION": "A recharge agent account is associated to your number. Would you like to continue as a recharge agent?", + "AGENTS_RECHARGE": "Refill agents", + "LOADING_CREDIT_TRANSFER": "Credit transfert in progress...", + "MOBILE_MONEY": "Mobile Money", + "PAYMENT_METHOD": "Payment Method", + "PAYMENT": "Payment", + "AVIS_NON_EMIS": "Notice Not Issued", + "PAYMENT_COULD_NOT_MADE": "The payment could not be made", + "CASH": "Cash", + "HIERACHIC_CODE": "Hierachic code", + "HIERACHIC_CODE_DESCRIPTION": "Code entered when creating a tax administrator or registrar", + "TAX_CODE": "Tax code", + "TAX_CODE_DESCRIPTION": "Code entered when creating a taxpayer", + "FIND_A_NEIGHBORHOOD": "Find a neighborhood *", + "WHATS_YOUR_BUSINESS": "What's your business? *", + "ID_CARD_NUMBER": "ID Card Number", + "BIRTH_DATE": "Date of Birth *", + "BIRTH_PLACE": "Place of Birth *", + "BIRTH_COUNTRY": "Country of Birth *", + "NATIONALITY_FORM": "Nationality *", + "MOTHER_LASTNAME": "Mother's Last Name *", + "MOTHER_FIRSTNAME": "Mother's First Name", + "FATHER_LASTNAME": "Father's Last Name *", + "FATHER_FIRSTNAME": "Father's First Name", + "SIGNBOARD": "Acronym *", + "CREATION_DATE": "Creation Date", + "TECHNICAL_APPROVAL": "Technical Approval", + "TRADE_LICENSE": "Business License" +} diff --git a/app/utils/i18n/fr.json b/app/utils/i18n/fr.json index 0b19a09..e66edb2 100644 --- a/app/utils/i18n/fr.json +++ b/app/utils/i18n/fr.json @@ -1,5 +1,5 @@ { - "WELCOME": "Bienvenue sur Sim_ba mobile !", + "WELCOME": "Bienvenue sur iLink City !", "WAITING_LONG": "Veuillez patienter un instant", "HELP": "Aide", "SIMPLE_USER": "Utilisateur simple", @@ -134,7 +134,6 @@ "TAXE": "Taxe", "INTERET": "Intérêt", "SOCIETY_TYPE": "Type de société", - "IDENTIFICATION_NUMBER": "Numéro d'identification", "REGISTRE_COMMERCE": "Registre de commerce", "NOM_RESPONSABLE": "Nom du responsable", "COMMUNE_SIEGE_SOCIAL": "Commune du siège social", @@ -248,7 +247,7 @@ "HISTORY": "Historique", "WITHDRAWAL_TRANSACTION_HISTORY_DESCRIPTION": "Retrait de", "DEPOSIT_TRANSACTION_HISTORY_DESCRIPTION": "Dépôt de", - "NO_WALLET_HISTORY": "Aucun historique", + "NO_WALLET_HISTORY": "Aucune transaction à ce jour", "DEMAND_SEND": "Demande envoyé", "EPARGNE_DEPOSE": "Epargne déposée", "BREAK_EPARGNE_DONE": "Epargne cassée avec succès", @@ -258,7 +257,6 @@ "NO_WALLET_ACTIVED": "Aucun wallet n'est activé pour votre compte", "TRANSFER_TO_PRINCIPAL_ACCOUNT": "Transférer commissions", "PRINCIPAL": "Principal", - "CREATION_DATE": "Date de création", "ENTER_YOUR_CARD_ID": "Entrer vos identifiants bancaires", "THE_ACCOUNT": "Le compte ", "NO_GEO_POINT_CODE": "Vous n'avez aucun point geolocalisé libre", @@ -285,6 +283,8 @@ "IMAGE_TAKE": "Prise d'image", "NAME": "Nom(s)", "FIRSTNAME": "Prénom(s) ", + "CIVILITY": "Civilité", + "NATIONALITY": "Nationalité", "NAME_EMETTEUR": "Nom(s) émetteur", "EMETTEUR": "Emetteur", "FIRSTNAME_EMETTEUR": "Prénom(s) émetteur", @@ -301,7 +301,7 @@ "SUPER_ADMIN": "Super administrateur", "GEOLOCATED": "Agent géo-localisé", "DELETE_GEOLOCATED_USER": "Supprimer", - "ADDRESS": "Lieu dit EX:TotalEnergies Bonateki", + "ADDRESS": "Adresse EX:TotalEnergies Bonateki", "CREDIT": "Crédit", "NEXT": "Suivant", "PREVIOUS": "Précédent", @@ -384,7 +384,7 @@ "OK": "OK", "SIMPLE": "Simple", "BLOCKED": "Bloqué", - "APP_FULLNAME": "Sim_ba mobile", + "APP_FULLNAME": "Ilink City", "GUIDE_TITLE": "Bienvenue dans le Guide de", "GUIDE_USER_SIMPLE": "Guide pour un utilisateur", "GUIDE_AGENT": "Guide pour un agent", @@ -521,11 +521,13 @@ "HISTORY_TYPE": "Type", "INVALID_MONTANT": "Montant invalide", "HISTORY_TYPE_ASK": "Demandes", + "REQUEST_RECEIVE": "Demande reçue", "DEMANDE_RECEIVE": "Demandes reçues", "MY_DEMANDE": "Mes demandes", "PHONE_TRANSACTION": "Numéro de transaction", "DEMAND_TEXT_FIRST_PART": "a effectué une demande de ", "DEMAND_TEXT_FIRST_PART_YOU": "Vous avez effectué une demande de ", + "REQUEST_SEND": "Demande envoyée", "DEMANDE_SEND": " Demande Envoyée", "DEMAND_RECEIVE": "Demandes reçues", "DEMAND_VALIDATION_GROUP_RECEIVE": "Demandes de validation", @@ -544,8 +546,8 @@ "MEMBERSHIP_REQUEST": "Demandes d'adhésion", "HISTORY_TYPE_REQUEST": "Requêtes", "TREAT": "Traité", - "EXIT_TITLE": "Fermer Sim_ba mobile !", - "EXIT_DESC": "Voulez-vous vraiment fermer Sim_ba mobile ?", + "EXIT_TITLE": "Fermer iLink City !", + "EXIT_DESC": "Voulez-vous vraiment fermer iLink City ?", "NO_TREAT": "Non traité", "EXIT": "Fermer", "PERIOD": "Période", @@ -558,7 +560,7 @@ "ACCOUNT_ACTIVATE_TEXT": "Votre compte a été activé avec succès !", "HISTORY_END": "Fin", "DONT_VALIDATE_ACCOUNT": "Compte non validé", - "CONNEXION_SUCCESSFULL_TEXT": "Connexion réussie. Bienvenue dans Sim_ba mobile ! ", + "CONNEXION_SUCCESSFULL_TEXT": "Connexion réussie. Bienvenue dans iLink City ! ", "UNVALIDATE_ACCOUNT_TEXT": "Votre hyperviseur n'a pas encore validé votre compte", "TEXT_NEED_POSITION": "Veuillez mettre à jour votre position !", "TITLE_NEED_POSITION": "Votre position doit être mise à jour", @@ -571,12 +573,12 @@ "TITLE_PROBLE_COME": "Un problème a été rencontré", "TITLE_SUPPRESS_CONFIRM": "Confirmation de suppression", "TEXT_SUPPRESS_CONFIRM": "Voulez vous vraiment supprimer cet utilisateur ?", - "TEXT_ERROR_START_APPLICATION": "Une erreur est survenue au démarrage de Sim_ba mobile. Veuillez relancer Sim_ba mobile", - "TEXT_UNABLE_TO_GET_YOUR_POSITION": "Impossible de recupérez votre position. Veuillez verifier que votre GPS est activé et relancez Sim_ba mobile", + "TEXT_ERROR_START_APPLICATION": "Une erreur est survenue au démarrage de iLink City. Veuillez relancer iLink City", + "TEXT_UNABLE_TO_GET_YOUR_POSITION": "Impossible de recupérez votre position. Veuillez verifier que votre GPS est activé et relancez iLink City", "RESTART": "RECOMMENCER", "TEXT_UNABLE_TO_GET_COUNTRY_INFO": "Impossible de recupérer les informations de votre pays. Verifiez votre connexion internet ! cliquez sur \"Ok\" pour reessayer", "TITLE_UNABLE_TO_AUTORISE": "Echec de l'autorisation", - "MISSING_AUTORISATION_LOCATION": "Sim_ba mobile n'est pas autorisé à acceder à votre position. Veuillez autoriser Sim_ba mobile à accéder à votre localisation et relancez Sim_ba mobile", + "MISSING_AUTORISATION_LOCATION": "iLink City n'est pas autorisé à acceder à votre position. Veuillez autoriser iLink City à accéder à votre localisation et relancez iLink City", "TEXT_FORGOTTEN_PASSWORD": "Saisissez votre identifiant,nous vous enverrons un nouveau mot de passe\n", "TEXT_NETWORK_UNABLE": "Réseau non disponible, voulez vous réessayer ?", "LOADING_TEXT_MARKERS": "Suite des points ", @@ -585,7 +587,7 @@ "LAUNCH_POINT_WITH_FILTER": "Voulez-vous relancer la recherche dans un rayon de ", "LOADING_TEXT_MARKERS_2": "autour", "UNABLE_GET_INFORMATION": "Problème de récuperation des Informations", - "UNABLE_GET_INFORMATION_TEXT": "Vérifiez que votre GPS est activé et mis en mode haute precision et relancez Sim_ba mobile", + "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": "Classe de la taxe", @@ -599,23 +601,21 @@ "ORDRE_RECETTE": "Ordre recette", "NO_ORDRE_RECETTE": "Aucun ordre de recette", "MODIFICATION_ORDRE_RECETTE": "Modifier ordre recette", - "SAISIE_NUMERO_QUITANCE": "Saisir numéro quitance", - "MODIFICATION_NUMERO_QUITANCE": "Modifier numéro quitance", - "SAISIR_QUITANCE": "Effectuer un paiement", + "SAISIE_NUMERO_QUITANCE": "Saisir numéro quittance", + "MODIFICATION_NUMERO_QUITANCE": "Modifier numéro quittance", + "SAISIR_QUITANCE": "Saisir paiement ou quittance", "CODE_AGENT": "Code agent ", "AVIS_IMPOSITION": "Déclaration", "AGENT_INFORMATION": "Informations sur l'agent", - "UPDATE_DATE": "Date de mis à jour", "ASSIGN_TO_AGENT": "Assigner à un agent", "AVIS_MODIFY_SUCCESS": "Avis modifié avec succès", - "ORDRE_RECETTE_SUCCES": "Ordre de recette saisi avec succès", - "NUMERO_QUITANCE_SUCCES": "Numéro de quitance enregistré avec succès", + "NUMERO_QUITANCE_SUCCES": "Numéro de quittance enregistré avec succès", "ORDRE_RECETTE_MODIFY_SUCCES": "Numéro ordre de recette modifié avec succès", - "NUMERO_QUITANCE_MODIFY_SUCCES": "Numéro de quitance modifié avec succès", + "NUMERO_QUITANCE_MODIFY_SUCCES": "Numéro de quittance modifié avec succès", "TAXES_SUR_LA_PROPRETE": "Impôt général synthétique *", "SAVE": "Enregistrer", "TEXT_SUPPRESS_CONFIRM_TAXE": "Voulez vous vraiment supprimer cette taxe?", - "NUMERO_QUITANCE": "Numéro quitance", + "NUMERO_QUITANCE": "Numéro quittance", "QUITANCE": "Quitance", "ORDRE_DE_RECETTE": "Ordre de recette", "MODIFY_ORDRE_DE_RECETTE": "Modifier ordre de recette", @@ -624,7 +624,6 @@ "RECEIPT_NUMBER": "Numéro de reçu", "NUMBER": "Numéro", "ACTION": "Action", - "UPDATE": "Mis à jour", "ADD": "Ajout", "ID_REVENUE_ORDRE": "ID ordre de recette", "ID_SUPER": "ID superviseur", @@ -649,7 +648,7 @@ "ID_PATENTE": "ID patente", "NETWORK_ID": "ID du réseau", "NEIGHTBORHOOD": "Quartier", - "ORDRE_RECETTE_RECEIPT": "Recette et quitance", + "ORDRE_RECETTE_RECEIPT": "Recette et quittance", "HISTORY_OF": "Historique des", "AVIS_IMPOSITIONS": "déclarations", "ORDRE_RECETTES_RECEIPTS": "recettes et quitances", @@ -693,7 +692,6 @@ "ACTIF": "actif", "ACTIFS": "actifs", "TAXE_INFORMATION": "Informations sur la déclaration", - "ACTIFS": "actifs", "NUMERO_AVIS_IMPOSITION": "N° déclaration", "ADD_ORDRE_RECETTE": "Ajouter un ordre de recette", "PENALITE_ON_TAXE": "Pénalité sur les taxes", @@ -706,14 +704,14 @@ "DELETE_PENALITE": "Supprimer la pénalité", "TAUX_PENALITE": "Taux de pénalité (%)", "TAUX": "Taux", - "NO_ORDRE_RECETTE_WITH_QUITANCE": "Aucun ordre de recette sans quitance", + "NO_ORDRE_RECETTE_WITH_QUITANCE": "Aucun ordre de recette sans quittance", "SAVE_PENALITY": "Taux", "SAISIE_PENALITY": "Saisie des pénalités", "MODIFICATION_SAISIE_PENALITY": "Modification/Suppression", "YOU_HAVE_DEFINED_PENALITY_FOR_THIS_YEAR": "Vous avez déjà définit une pénalité pour les années suivantes:", "AMOUNT_ORDRE_RECETTE": "Montant de l'ordre de recette", "AMOUNT_TAX_NOTICE": "Montant de la déclaration", - "YOU_CANT_DELETE_LAST_TAX_NOTICE": "Une quitance doit contenir au moins un ordre de recette", + "YOU_CANT_DELETE_LAST_TAX_NOTICE": "Une quittance doit contenir au moins un ordre de recette", "WOULD_YOU_WANT_SEARCH_BY_NAME": "Voulez-vous rechercher l'usager par son nom ?", "USAGER_NAME": "Nom de l'usager", "NO_USAGER_CORRESPONDING_TO_SEARCH": "Aucun usager ne correspond à votre recherche", @@ -728,7 +726,7 @@ "PENALITE_INCLUSE": "Pénalité incluse", "SOINS": "Soins", "INVOICE": "Facture", - "ORDRE_RECETTE_QUITANCE": "Ordre et quitance", + "ORDRE_RECETTE_QUITANCE": "Ordre et quittance", "ID": "ID", "CONNEXION_CHOICE": "Choix de connexion", "CONNEXION_CHOICE_DESCRIPTION": "Un compte agent de recharge est associé à votre numéro. Voulez vous continuer en tant que agent recharge ?", @@ -739,5 +737,24 @@ "PAYMENT": "Paiement", "AVIS_NON_EMIS": "Avis non émis", "PAYMENT_COULD_NOT_MADE": "Le paiement n'a pas pu être effectué", - "CASH": "Cash" -} \ No newline at end of file + "CASH": "Cash", + "HIERACHIC_CODE": "Code hiérarchique", + "HIERACHIC_CODE_DESCRIPTION": "Code entré lors de la création d'un administrateur de taxe ou d'un régisseur", + "TAX_CODE": "Code taxe", + "TAX_CODE_DESCRIPTION": "Code entré lors de la création d'un contribuable", + "FIND_A_NEIGHBORHOOD": "Rechercher un quartier *", + "WHATS_YOUR_BUSINESS": "Quelle est votre activité *", + "ID_CARD_NUMBER": "Numéro de la CNI", + "BIRTH_DATE": "Date de naissance *", + "BIRTH_PLACE": "Lieu de naissance *", + "BIRTH_COUNTRY": "Pays de naissance *", + "NATIONALITY_FORM": "Nationalité *", + "MOTHER_LASTNAME": "Nom de la mère *", + "MOTHER_FIRSTNAME": "Prénom de la mère", + "FATHER_LASTNAME": "Nom du père *", + "FATHER_FIRSTNAME": "Prénom du père", + "SIGNBOARD": "Sigle *", + "CREATION_DATE": "Date de création", + "TECHNICAL_APPROVAL": "Agrément technique", + "TRADE_LICENSE": "Patente" +} diff --git a/app/webservice/MapService.js b/app/webservice/MapService.js index 53b7de9..0b4066a 100644 --- a/app/webservice/MapService.js +++ b/app/webservice/MapService.js @@ -5,7 +5,7 @@ import I18n from 'react-native-i18n' import {readUser} from './AuthApi' import {isDebugMode, MARKER_URL, mobileAppVersion, opencageDataApiUrl} from "./IlinkConstants"; -let GEOCODDING_URL = "https://test-city.ilink-app.com:8081/geocode"; +let GEOCODDING_URL = "https://city-douala3.ilink-app.com:8081/geocode"; let API_KEY = "AIzaSyAme0ZMQjUynvo6AeSVlMRzUPdcOSuPbZE" export const getLocalMarkers = () => { return db.markers.get_all() @@ -47,6 +47,7 @@ export const loadNetwork = (network, userid) => { return queryMap(data) } export const getPositionInformation = async (position) => { + console.log("Messi===>>",position,mobileAppVersion) let url = GEOCODDING_URL.concat('?latitude=' + position.latitude + "&longitude=" + position.longitude + "&mobile_app_version=" + mobileAppVersion); console.log("GEOCODING", url); const data = fetch(url, { @@ -57,8 +58,9 @@ export const getPositionInformation = async (position) => { } }) .then((response) => response.json()) - .then((responseJson) => - responseJson + .then((responseJson) =>{ + console.log("Messi2===>>",responseJson) + return responseJson} ).catch((error) => { console.log("error get position") console.log(error)