[-] MO : TNT Carrier (1.1)

modules/tntcarrier/config.xml

@@ -2,7 +2,7 @@
 <module>
 	<name>tntcarrier</name>
 	<displayName><![CDATA[TNT Express]]></displayName>
-	<version><![CDATA[1.0]]></version>
+	<version><![CDATA[1.1]]></version>
 	<description><![CDATA[Offer your customers, different delivery methods with TNT]]></description>
 	<author><![CDATA[PrestaShop]]></author>
 	<tab><![CDATA[shipping_logistics]]></tab>

modules/tntcarrier/css/tntB2CRelaisColis.css

@@ -24,7 +24,7 @@
 }
 
 .tntRCSubHeader {
-	background-color: #ffffff;
+	//background-color: #ffffff;
 	border-width: 0px;
 	color: #a0a0a0;
 	display: bloc;

modules/tntcarrier/follow.php

@@ -1,9 +1,8 @@
 <?php
 require('../../config/config.inc.php');
 require_once(_PS_MODULE_DIR_."/tntcarrier/classes/TntWebService.php");
-
+//$erreur = '';
 global $smarty;
-
 try
 {
 	$tntWebService = new TntWebService();
@@ -20,7 +19,7 @@ catch( Exception $e )
 }
 $config['date'] = '%d/%m/%y';
 $config['time'] = '%I:%M %p';
-$smarty->assign('erreur', $erreur);
+//$smarty->assign('erreur', $erreur);
 $smarty->assign('config',$config);
 $smarty->assign( 'follow', $follow );
 $smarty->display('tpl/follow.tpl' );

modules/tntcarrier/fr.php

@@ -4,69 +4,40 @@ global $_MODULE;
 $_MODULE = array();
 $_MODULE['<{tntcarrier}prestashop>tntcarrier_58ec6a48b4720ef0aa2adfded1ccf8a3'] = 'TNT Express';
 $_MODULE['<{tntcarrier}prestashop>tntcarrier_9b7637001f5d2bcb42efb4ab6b3e93da'] = 'Offre aux clients, différentes methodes de livraison';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_416900392875e9effb318da8648fbdcb'] = 'doit ou doivent etre configuré(s) pour utiliser le module correctement';
+$_MODULE['<{tntcarrier}prestashop>tntcarrier_416900392875e9effb318da8648fbdcb'] = 'doivent etre configurés pour utiliser le module correctement';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_632cae5cf3af08786414932a8e6f96a0'] = 'Pseudonyme TNT';
+$_MODULE['<{tntcarrier}prestashop>tntcarrier_e2236d4f47edb104d62eaa4168b298f0'] = 'doit être configuré pour utiliser le module correctement.';
+$_MODULE['<{tntcarrier}prestashop>tntcarrier_632cae5cf3af08786414932a8e6f96a0'] = 'Identifiant TNT';
 $_MODULE['<{tntcarrier}prestashop>tntcarrier_3b4f51300711a1eb61770d1696702402'] = 'Mot de passe TNT';
 $_MODULE['<{tntcarrier}prestashop>tntcarrier_0e3b102c1a4938889716cea423a95001'] = 'Numéro de compte TNT';
 $_MODULE['<{tntcarrier}prestashop>tntcarrier_e81d9f25acf7fa457ab32527a882ed50'] = 'Transporteur TNT';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_d968787921c136e1cf9f766562aec8bc'] = 'Les paramètres suivants vous ont été fournis par TNT';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_af7c2efe81330e4c9089f2c90781282e'] = 'Si vous n\'êtes pas encore inscrit, cliquez sur';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_6c92285fa6d3e827b198d120ea3ac674'] = 'ici';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_8af703b2bf59cc9742883ae7f4cb0e5b'] = 'Paramètres du compte';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_927e079056c2709236d4167bbb96e799'] = 'Réglages d\'expédition';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_82fe86ee1a21af1c1db5c8c4c5e5a188'] = 'Paramètres du service';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_160f61d02d22b76b47b4305094bf36a6'] = 'Compte TNT';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_99dea78007133396a7b8ed70578ac6ae'] = 'Identifiant';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_dc647eb65e6711e155375218212b3964'] = 'Mot de passe';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_05e642d027a22d12780ccf91bf9d7d34'] = 'Numéro de compte';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_8005dfbbaf4c9333592f26e82ddfd0af'] = 'Remplissez le formulaire avec les données';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_ea9cf7e47ff33b2be14e6dd07cbcefc6'] = 'Expédition';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_4d8ff211a4a8a140e293736f92ac39d5'] = 'Aimeriez-vous que TNT ramasse votre colis ?';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_581bf6fa6cd6d4bf4b0bbe2cfe6e404c'] = 'Non (via un dépôt)';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_93cba07454f06a4a960172bbd6e2a435'] = 'Oui';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_f5234754269687df652c9f6f2f80cc10'] = 'Choisissez votre emplacement dépositaire';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_e7a7e191423e6a9ce3b59fd51ecbde87'] = 'Le code pex';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_e7b47c58815acf1d3afa59a84b5db7fb'] = 'Nom de l\'entreprise';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_8d3f5eff9c40ee315d452392bed5309b'] = 'Nom de famille';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_20db0bfeecd8fe60533206a2b5e9891a'] = 'Prénom';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_e9f79aa2b1f455a52497a126d9442582'] = 'Adresse ligne 1';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_3d4d4cac03e194ab20154382cd544e0f'] = 'Adresse ligne 2';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_d30f507473129e70c4b962ceccf175cf'] = 'Zip / Code Postal';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_d0585aac6bb77bb49423b2effca0e067'] = 'Votre ville';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_f775ad1fbb08939178d4df9c457601f2'] = 'Votre adresse email';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_67c19a5276428fb9e49c557b1a3526d5'] = 'Votre numéro de téléphone';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_6222760252f52bb4dc70835d238d5484'] = 'Votre heure de clôture';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_cf67059a7bd51c3543def1ee4bdc4fe1'] = 'Livraison le samedi';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_bafd7322c6e97d25b6299b5d6fe8920b'] = 'Aucun';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_dc86b23a40568ae3ece2d3008ca61442'] = 'Format de l\'étiquette pour l\'impression (Cette étiquette doit être collée sur l\'emballage)';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_2976cd63d00184e3f0a45c1337cd31f0'] = 'Impression A4';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_2f95a5450ee306f7faca792e379ccb34'] = 'sans imprimer le logo de TNT';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_44fca4829aecbdf69a2200ea0a10a8aa'] = 'avec une impression inverse';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_a67ee8b3121d0ceb601e9f0600db9692'] = 'sans imprimer le logo TNT et avec une impression inverse';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_1c85ce46031e67c95be9aa05b859f955'] = 'Nouveau service';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_b718adec73e04ce3ec720dd11a06a308'] = 'ID';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_49ee3087348e8d44e1feda1917443987'] = 'Nom';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_b5a7adde1af5c87d7fd797b6245c2a39'] = 'Description';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_ca0dbad92a874b2f69b549293387925e'] = 'Code';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_7ec0def44906b0cd2848459349eea638'] = 'Frais additionnels (€)';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_cb456215c3333db0551bd0788bc258c7'] = 'Activé';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_de95b43bceeb4b998aed4aed5cef1ae7'] = 'modifier';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_099af53f601532dbd31e0ea99ffdeb64'] = 'supprimer';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_7b9cf007806ed854cd12ab800c8a982b'] = 'Lieu';
 $_MODULE['<{tntcarrier}prestashop>tntcarrier_b06cdf3c0c75a1a58b82761f87f458e4'] = 'Etat du module transporteur TNT';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_4c7b2960da33c41e9bbea499696702ca'] = 'Le module transporteur TNT est configuré et en ligne';
+$_MODULE['<{tntcarrier}prestashop>tntcarrier_1fc73713174ad5eb03c739919ac430e0'] = 'Les paramètres suivants sont correctement configurés et activés sur votre boutique :';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_efce38300739e2fd6cef1acd9ce68a1c'] = 'Le module transporteur TNT n\'est pas encore configuré, s\'il vous plait :';
+$_MODULE['<{tntcarrier}prestashop>tntcarrier_a26e3a6c254d271fc27418f8b70359b8'] = 'Compte TNT. (Onglet Paramètres de compte)';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_a8341741d73ef0a3ca5e8a7facc9a738'] = 'Assurez vous d\'avoir un compte TNT';
+$_MODULE['<{tntcarrier}prestashop>tntcarrier_6ffb536c94a6c31c53bf5dff30e9279e'] = 'Adresse d\'expédition. (Onglet adresse d\'expédition)';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_3dab1e2673a4acc557135ccf795d4e31'] = 'Assurez vous d\'avoir une adresse correcte d\'expedition';
+$_MODULE['<{tntcarrier}prestashop>tntcarrier_b691e01572a1a26f81b45a59485eeef0'] = 'Choix du mode de livraison spécifique TNT que vous voulez offrir à vos clients. (Onglet Mode de livraison)';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_057c674e4d23b04c0cbe1bfe81a0bec1'] = 'Assurez vous que certains services sont actifs';
+$_MODULE['<{tntcarrier}prestashop>tntcarrier_a37a7157334806e3c62eea1592bd71e5'] = 'Les paramètres suivants doivent être configurés pour être en mesure d\'utiliser correctement le module TNT:';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_9d5b24e0e3516fcef94916366fadae67'] = 'Nouvelle option Poids';
+$_MODULE['<{tntcarrier}prestashop>tntcarrier_3bdbda3bf0eaeb6d537e8e71831ccd51'] = 'Ajouter des frais supplémentaires en fonction du poids du colis';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_02f6a536789c7b8399ddbd1652d85d9c'] = 'Poids Min';
+$_MODULE['<{tntcarrier}prestashop>tntcarrier_b718adec73e04ce3ec720dd11a06a308'] = 'ID';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_03b4258831663af9e7f48bc6bc574e6c'] = 'Poids Max';
+$_MODULE['<{tntcarrier}prestashop>tntcarrier_02f6a536789c7b8399ddbd1652d85d9c'] = 'Poids Min (Kg)';
+$_MODULE['<{tntcarrier}prestashop>tntcarrier_03b4258831663af9e7f48bc6bc574e6c'] = 'Poids Max (Kg)';
+$_MODULE['<{tntcarrier}prestashop>tntcarrier_7ec0def44906b0cd2848459349eea638'] = 'Frais additionnels (€)';
 $_MODULE['<{tntcarrier}prestashop>tntcarrier_7dce122004969d56ae2e0245cb754d35'] = 'Modifier';
 $_MODULE['<{tntcarrier}prestashop>tntcarrier_f2a6c498fb90ee345d997f888fce3b18'] = 'Supprimer';
 $_MODULE['<{tntcarrier}prestashop>tntcarrier_0619bef93192e574f288fe2e55c3a7f7'] = 'Poids min';
-$_MODULE['<{tntcarrier}prestashop>tntcarrier_d8c74112ba3622be2e79d4d4dc24eaf4'] = 'Poids max';
+$_MODULE['<{tntcarrier}prestashop>tntcarrier_d57c218ba8993f897e7d0d607cb0919b'] = 'Poids max (peut être vide)';
 $_MODULE['<{tntcarrier}prestashop>tntcarrier_508ccf43328cac4c93d1de242d2ddffb'] = 'Frais additionnels';
+$_MODULE['<{tntcarrier}prestashop>tntcarrier_43781db5c40ecc39fd718685594f0956'] = 'Enregistrer';
+$_MODULE['<{tntcarrier}prestashop>tntcarrier_31233b21c141d4a9d6aa01a02d1122ae'] = 'Tous les champs sont obligatoires';
+$_MODULE['<{tntcarrier}prestashop>tntcarrier_7671f3696ad03d80261fb2bbcf333b0e'] = 'Le code de pex est manquant';
+$_MODULE['<{tntcarrier}prestashop>tntcarrier_f7ccaf14e6a159fbf74c3574f24f6c98'] = 'Le nom de votre société est manquant';
+$_MODULE['<{tntcarrier}prestashop>tntcarrier_ed0e7964e931baea6fe213b85d47dcae'] = 'Votre nom de famille est manquant';
+$_MODULE['<{tntcarrier}prestashop>tntcarrier_bc76583af7e30c752071c4c22becb202'] = 'Votre prénom est manquant';
+$_MODULE['<{tntcarrier}prestashop>tntcarrier_a6940761269d856d96b9ab14cd2a6622'] = 'Votre adresse est manquante';
+$_MODULE['<{tntcarrier}prestashop>tntcarrier_9213e685b255732fa7505b6204aeaa79'] = 'Votre adresse ligne 2 doit être inférieur à 32 caractères';
+$_MODULE['<{tntcarrier}prestashop>tntcarrier_eb935b898b0fb568b9508bbc1a0fcc37'] = 'Votre code postal est manquant';
+$_MODULE['<{tntcarrier}prestashop>tntcarrier_d9f4b12b8eee0330f2085cd50f52211b'] = 'Votre adresse email est manquante';
+$_MODULE['<{tntcarrier}prestashop>tntcarrier_afaa05f3479edb1d285563be231f8552'] = 'Votre numéro de téléphone est manquant';
+$_MODULE['<{tntcarrier}prestashop>tntcarrier_450af965cc6328e0f4713a4bf9f8f705'] = 'Votre heure de fermeture est manquante';
 $_MODULE['<{tntcarrier}prestashop>tntcarrier_69d865b41dc0e6611be76776c4a9456d'] = 'Vous devez donner un nom au service';
 $_MODULE['<{tntcarrier}prestashop>tntcarrier_e71361626c48f42620b92cc81fd41ba2'] = 'Vous devez donner un code au service';
 $_MODULE['<{tntcarrier}prestashop>tntcarrier_d2f2575c30fa33e53905ae05bc02f281'] = 'Vous devez donner une description au service';
@@ -74,8 +45,41 @@ $_MODULE['<{tntcarrier}prestashop>tntcarrier_4a015051e9e879952cf4215d344ec101']
 $_MODULE['<{tntcarrier}prestashop>tntcarrier_74d87a5cbf64f95c490b2cf85710a4eb'] = 'Le(s) numéro(s) d\'expédition(s)';
 $_MODULE['<{tntcarrier}prestashop>tntcarrier_2fd7870126dd86cedc2be112e7e59ebc'] = 'L\'étiquette';
 $_MODULE['<{tntcarrier}prestashop>tntcarrier_d5aad80114d8aa47f31a6f5050ef6835'] = 'Expédition';
+$_MODULE['<{tntcarrier}prestashop>accountform_d968787921c136e1cf9f766562aec8bc'] = 'Les paramètres suivants vous ont été fournis par TNT';
+$_MODULE['<{tntcarrier}prestashop>accountform_af7c2efe81330e4c9089f2c90781282e'] = 'Si vous n\'êtes pas encore inscrit, cliquez ';
+$_MODULE['<{tntcarrier}prestashop>accountform_6c92285fa6d3e827b198d120ea3ac674'] = 'ici';
+$_MODULE['<{tntcarrier}prestashop>accountform_160f61d02d22b76b47b4305094bf36a6'] = 'Compte TNT';
+$_MODULE['<{tntcarrier}prestashop>accountform_99dea78007133396a7b8ed70578ac6ae'] = 'Identifiant';
+$_MODULE['<{tntcarrier}prestashop>accountform_dc647eb65e6711e155375218212b3964'] = 'Mot de passe';
+$_MODULE['<{tntcarrier}prestashop>accountform_05e642d027a22d12780ccf91bf9d7d34'] = 'Numéro de compte';
+$_MODULE['<{tntcarrier}prestashop>accountform_43781db5c40ecc39fd718685594f0956'] = 'Enregistrer';
+$_MODULE['<{tntcarrier}prestashop>country_7b9cf007806ed854cd12ab800c8a982b'] = 'Lieu';
+$_MODULE['<{tntcarrier}prestashop>country_4dd77960e89b80d1b11e7c095e47d8e0'] = 'Frais additionnels (€)';
+$_MODULE['<{tntcarrier}prestashop>country_de95b43bceeb4b998aed4aed5cef1ae7'] = 'modifier';
+$_MODULE['<{tntcarrier}prestashop>countryform_43781db5c40ecc39fd718685594f0956'] = 'Enregistrer';
+$_MODULE['<{tntcarrier}prestashop>follow_1a315e32fa4a411ea6a2ea8bd8ccc622'] = 'Information sur le Colis';
+$_MODULE['<{tntcarrier}prestashop>follow_910d956cb2615e5739ac06c7f08fba26'] = 'Numéro d\'expedition';
+$_MODULE['<{tntcarrier}prestashop>follow_b858b5e76fea1f971f69c7395e6e2235'] = 'État d\'expédition';
+$_MODULE['<{tntcarrier}prestashop>follow_63d5049791d9d79d86e9a108b0a999ca'] = 'Référence';
+$_MODULE['<{tntcarrier}prestashop>follow_c2ba7e785c49050f48da9aacc45c2b85'] = 'Service';
+$_MODULE['<{tntcarrier}prestashop>follow_8c489d0946f66d17d73f26366a4bf620'] = 'Poids';
+$_MODULE['<{tntcarrier}prestashop>follow_a4ecfc70574394990cf17bd83df499f7'] = 'Evénement';
+$_MODULE['<{tntcarrier}prestashop>follow_44749712dbec183e983dcd78a7736c41'] = 'Date';
+$_MODULE['<{tntcarrier}prestashop>follow_6a7e73161603d87b26a8eac49dab0a9c'] = 'Heures';
+$_MODULE['<{tntcarrier}prestashop>follow_84246e5b819bd9afe465dc44eec0d528'] = 'Nom du centre';
+$_MODULE['<{tntcarrier}prestashop>follow_16328b440b4698eae30df60adc198623'] = 'Dépôt de départ';
+$_MODULE['<{tntcarrier}prestashop>follow_ff0aa49d3eeadb46b41cf22eeaf41fb5'] = 'Présentation du chauffeur';
+$_MODULE['<{tntcarrier}prestashop>follow_e2560f1841797910acf77fee40e3715d'] = 'la signature';
 $_MODULE['<{tntcarrier}prestashop>formerror_c3f15ecc6da0827a8da712cb43a0b596'] = 'information d\'expédition';
+$_MODULE['<{tntcarrier}prestashop>formerror_53335695e4675e831a73dec05e417886'] = 'Le poids de l\'emballage doit être compris entre 0,1 et 30,0 kg ou appelez votre contact commercial TNT.';
+$_MODULE['<{tntcarrier}prestashop>formerror_8c489d0946f66d17d73f26366a4bf620'] = 'Poids';
+$_MODULE['<{tntcarrier}prestashop>formerror_7423cbf15a98a1e3eb9cd4d3f8333776'] = 'Vous devez changer la date d\'expédition';
+$_MODULE['<{tntcarrier}prestashop>formerror_44749712dbec183e983dcd78a7736c41'] = 'Date';
 $_MODULE['<{tntcarrier}prestashop>formerror_7f090bbab1cc7f9c08bf4e54d932d3c0'] = 'Modifier';
+$_MODULE['<{tntcarrier}prestashop>main_8af703b2bf59cc9742883ae7f4cb0e5b'] = 'Paramètres du compte';
+$_MODULE['<{tntcarrier}prestashop>main_927e079056c2709236d4167bbb96e799'] = 'Adresse d\'expédition';
+$_MODULE['<{tntcarrier}prestashop>main_82fe86ee1a21af1c1db5c8c4c5e5a188'] = 'Mode de livraison';
+$_MODULE['<{tntcarrier}prestashop>service_00c54a75a559bba7732d9b2c810a852b'] = 'Les services dont le code n\'a qu\'une seule lettre sont ceux proposés aux entreprises. Ainsi, ils seront uniquement proposés aux clients qui ont rempli le champ Société';
 $_MODULE['<{tntcarrier}prestashop>service_ca0dbad92a874b2f69b549293387925e'] = 'Code';
 $_MODULE['<{tntcarrier}prestashop>service_41350c4c9683f48b15d04adc3f76925b'] = '08h00 express';
 $_MODULE['<{tntcarrier}prestashop>service_4b0977efd9aa11417b7139f35ed777a0'] = '09h00 express';
@@ -87,4 +91,46 @@ $_MODULE['<{tntcarrier}prestashop>service_c24eb7cd3484f223c03e64f2728a61ae'] = '
 $_MODULE['<{tntcarrier}prestashop>service_b5410e878f792a03b81e7803a626caaa'] = 'Colis relais';
 $_MODULE['<{tntcarrier}prestashop>service_6cefaa978ccec960693d10cefeb2c2bf'] = 'Livraison à domicile';
 $_MODULE['<{tntcarrier}prestashop>service_9582039a366d19cb0b957bd4220dd6f7'] = 'Service entreprise ';
+$_MODULE['<{tntcarrier}prestashop>service_7e0de5b1122d90d8bfb6ee3ffc5f96d1'] = 'Ajouter un service TNT via son code spécifique';
+$_MODULE['<{tntcarrier}prestashop>service_490aa6e856ccf208a054389e47ce0d06'] = 'Id';
+$_MODULE['<{tntcarrier}prestashop>service_49ee3087348e8d44e1feda1917443987'] = 'Nom';
+$_MODULE['<{tntcarrier}prestashop>service_b5a7adde1af5c87d7fd797b6245c2a39'] = 'Description';
+$_MODULE['<{tntcarrier}prestashop>service_c13367945d5d4c91047b3b50234aa7ab'] = 'Code';
+$_MODULE['<{tntcarrier}prestashop>service_ce0022ab4f29f07dcc5f63ac1ed92bfa'] = 'Frais Supplémentaire (€)';
+$_MODULE['<{tntcarrier}prestashop>service_cb456215c3333db0551bd0788bc258c7'] = 'Actif';
+$_MODULE['<{tntcarrier}prestashop>service_de95b43bceeb4b998aed4aed5cef1ae7'] = 'modifier';
+$_MODULE['<{tntcarrier}prestashop>service_099af53f601532dbd31e0ea99ffdeb64'] = 'supprimer';
+$_MODULE['<{tntcarrier}prestashop>serviceform_49ee3087348e8d44e1feda1917443987'] = 'Nom';
+$_MODULE['<{tntcarrier}prestashop>serviceform_b5a7adde1af5c87d7fd797b6245c2a39'] = 'Description';
+$_MODULE['<{tntcarrier}prestashop>serviceform_c13367945d5d4c91047b3b50234aa7ab'] = 'Code';
+$_MODULE['<{tntcarrier}prestashop>serviceform_51866de17fcc83e505a2a43fa054082d'] = 'Frais Supplémentaire';
+$_MODULE['<{tntcarrier}prestashop>serviceform_cb456215c3333db0551bd0788bc258c7'] = 'Actif';
+$_MODULE['<{tntcarrier}prestashop>serviceform_43781db5c40ecc39fd718685594f0956'] = 'Enregistrer';
+$_MODULE['<{tntcarrier}prestashop>shippingform_ea9cf7e47ff33b2be14e6dd07cbcefc6'] = 'Expédition';
+$_MODULE['<{tntcarrier}prestashop>shippingform_15dcb6be9acfca3fd8044a98b3353586'] = 'Souhaitez-vous que TNT récupère vos colis directement à votre entrepôt ?';
+$_MODULE['<{tntcarrier}prestashop>shippingform_6f0e9e4cb6a2da23bb2d51a24abbf1c4'] = 'Non (il vous faudra alors déposer vos colis dans un dépôt TNT. Merci de choisir dans le formulaire l\'agence dépôt par laquelle vous souhaitez passer)';
+$_MODULE['<{tntcarrier}prestashop>shippingform_93cba07454f06a4a960172bbd6e2a435'] = 'Oui';
+$_MODULE['<{tntcarrier}prestashop>shippingform_f5234754269687df652c9f6f2f80cc10'] = 'Choisissez votre emplacement dépositaire';
+$_MODULE['<{tntcarrier}prestashop>shippingform_c0e57adbf247c582693be5803459b20e'] = 'Vos informations';
+$_MODULE['<{tntcarrier}prestashop>shippingform_46e1a902c9f386120e65e976ad1a3c77'] = 'Information de l\'agence dépôt';
+$_MODULE['<{tntcarrier}prestashop>shippingform_86f7dcec9578f27ac23b12cd2497d580'] = 'Pex code';
+$_MODULE['<{tntcarrier}prestashop>shippingform_e7b47c58815acf1d3afa59a84b5db7fb'] = 'Nom de l\'entreprise';
+$_MODULE['<{tntcarrier}prestashop>shippingform_8d3f5eff9c40ee315d452392bed5309b'] = 'Nom de famille';
+$_MODULE['<{tntcarrier}prestashop>shippingform_20db0bfeecd8fe60533206a2b5e9891a'] = 'Prénom';
+$_MODULE['<{tntcarrier}prestashop>shippingform_e9f79aa2b1f455a52497a126d9442582'] = 'Adresse ligne 1';
+$_MODULE['<{tntcarrier}prestashop>shippingform_3d4d4cac03e194ab20154382cd544e0f'] = 'Adresse ligne 2';
+$_MODULE['<{tntcarrier}prestashop>shippingform_25f75488c91cb6c3bab92672e479619f'] = 'Code postal';
+$_MODULE['<{tntcarrier}prestashop>shippingform_57d056ed0984166336b7879c2af3657f'] = 'Ville';
+$_MODULE['<{tntcarrier}prestashop>shippingform_f775ad1fbb08939178d4df9c457601f2'] = 'Votre adresse email';
+$_MODULE['<{tntcarrier}prestashop>shippingform_67c19a5276428fb9e49c557b1a3526d5'] = 'Votre numéro de téléphone';
+$_MODULE['<{tntcarrier}prestashop>shippingform_6222760252f52bb4dc70835d238d5484'] = 'Votre heure de clôture';
+$_MODULE['<{tntcarrier}prestashop>shippingform_cf67059a7bd51c3543def1ee4bdc4fe1'] = 'Livraison le samedi';
+$_MODULE['<{tntcarrier}prestashop>shippingform_bafd7322c6e97d25b6299b5d6fe8920b'] = 'Non';
+$_MODULE['<{tntcarrier}prestashop>shippingform_dc86b23a40568ae3ece2d3008ca61442'] = 'Format de l\'étiquette pour l\'impression (Cette étiquette doit être collée sur l\'emballage)';
+$_MODULE['<{tntcarrier}prestashop>shippingform_2976cd63d00184e3f0a45c1337cd31f0'] = 'impression A4';
+$_MODULE['<{tntcarrier}prestashop>shippingform_2f95a5450ee306f7faca792e379ccb34'] = 'sans imprimer le logo de TNT';
+$_MODULE['<{tntcarrier}prestashop>shippingform_44fca4829aecbdf69a2200ea0a10a8aa'] = 'avec une impression inverse';
+$_MODULE['<{tntcarrier}prestashop>shippingform_a67ee8b3121d0ceb601e9f0600db9692'] = 'sans imprimer le logo TNT et avec une impression inverse';
+$_MODULE['<{tntcarrier}prestashop>shippingform_43781db5c40ecc39fd718685594f0956'] = 'Enregistrer';
+$_MODULE['<{tntcarrier}prestashop>shippingform_70397c4b252a5168c5ec003931cea215'] = 'Champs obligatoire';
 $_MODULE['<{tntcarrier}prestashop>shippingnumber_c3f15ecc6da0827a8da712cb43a0b596'] = 'L\'information d\'expédition';

modules/tntcarrier/js/relaisColis.js

@@ -148,7 +148,6 @@ function tntRCafficheRelais(jData) {
 			
 	tntRCjTable.append(tntRCligneBlanche6Col());
 	jMessage.append(tntRCjTable);
-	
     jMessage.append(tntRCchangerCodePostal());
 };
 
@@ -159,10 +158,10 @@ function tntB2CRelaisColisGetBodyMain() {
 			"<table>"+
 				"<tr>"+
 					"<td>" + tntRCMsgBodyInput + "</td>"+
-				 	"<td><input type='text' id='tntRCInputCP' class='tntRCInput' maxlength='5' size='5' value=''/></td>"+
+				 	"<td><input type='text' id='tntRCInputCP' class='tntRCInput' maxlength='3' size='3' value=''/></td>"+
 					"<td><a href='#' onclick='tntRCgetDepot();'><img class='tntRCButton' src='" + pathToImages + "bt-OK-2.jpg' onmouseover='this.src=\"" + pathToImages + "bt-OK-1.jpg\"' onmouseout='this.src=\"" + pathToImages + "bt-OK-2.jpg\"'></a></td>" + 
 				"</tr>"+
-			"</table>" +	 
+			"</table>" +
 		"</div>"+
 		"<div id='tntRCLoading' style='display:none;'>" + tntRCMsgBodyLoading + "</div>"+
 		"<div id='tntRCError' class='tntRCError' style='display:none;'></div>");			
@@ -181,7 +180,7 @@ function tntB2CRelaisColis() {
 	var tntRelaisColisB2C = $("#tntB2CRelaisColis");
 	tntRelaisColisB2C.html(
 		"<div id='tntRCblocEntete'>"+
-			"<div class='tntRCHeader'>"+ tntRCMsgHeaderTitle + "</div>"+
+			"<!--<div class='tntRCHeader'>"+ tntRCMsgHeaderTitle + "</div>-->"+
 			"<div class='tntRCSubHeader'>" + tntRCMsgSubHeaderTitle + "</div>"+
 		"</div>"+
 		"<div id='blocCodePostal' class='tntRCBody'>"+
@@ -308,7 +307,7 @@ function tntRCafficheCommunes(jData) {
 		tntRCligneBlanche6Col());
 	
 	blocCodePostal.html(tntRCjTable);	
-	
+	alert('lol');
 	// Bloc de saisie d'un nouveau code postal			
     blocCodePostal.append(tntRCchangerCodePostal());
 }
@@ -556,7 +555,7 @@ function tntRCchangerCodePostal(){
 			"<table>"+
 				"<tr>"+
 					"<td width='300px'>Vous pouvez choisir un autre code postal de livraison :</td>"+
-				 	"<td width='55px'><input type='text' id='tntRCInputCP' class='tntRCInput' maxlength='5' size='5' value='' /></td>"+
+				 	"<td width='55px'><input type='text' id='tntRCInputCP' class='tntRCInput' maxlength='3' size='3' value='' /></td>"+
 					"<td><a href='#' onclick='tntRCgetDepot();'><img class='tntRCButton' src='" + pathToImages + "bt-OK-2.jpg' onmouseover='this.src=\"" + pathToImages + "bt-OK-1.jpg\"' onmouseout='this.src=\"" + pathToImages + "bt-OK-2.jpg\"'></a></td>" + 
 				"</tr>"+
 			"</table>"+

modules/tntcarrier/js/shipping.js

@@ -4,16 +4,22 @@ function tntRCgetDepot()
 	tntRCcodePostal = $("#tntRCInputCP").val();
 	if (tntRCcodePostal=="") return;
 	if (isNaN(parseInt(tntRCcodePostal))) {
-		tntRCgetRelaisColis(tntRCMsgErrCodePostal);
+		tntRCgetRelaisColis("Veuillez saisir un code départemental correct");
 		return;
 	}
 	tntRCsetChargementEnCours();
-	$("#tntRCLoading").load(
+	$.get(
 		"../modules/tntcarrier/tntGetDepot.php?code="+tntRCcodePostal,
 		function(response, status, xhr) 
 			{
 				if (status == "error") 
 					$("#tntRCLoading").html(xhr.status + " " + xhr.statusText);
+				if (response == "The field 'department' is not a valid french department code.\n")
+					$("#tntRCLoading").html("Vous n'avez pas saisi un code correct départemental français\n");
+				else if (response.indexOf("The security token could not be authenticated or authorized") >= 0)
+					$("#tntRCLoading").html("Vos identifiants sont incorrects\n");
+				else
+					$("#tntRCLoading").html(response);
 			}
 	);
 }
@@ -34,10 +40,12 @@ $(document).ready(function() {
 	transport1.click(function() {
 		$("#divPex").css("display", "none");
 		$("#divClosing").css("display", "");
+		$("#tnt_exp_names").css("display", "");
 	});
 	transport2.click(function() {
 		$("#divPex").css("display", "");
 		$("#divClosing").css("display", "none");
+		$("#tnt_exp_names").css("display", "none");
 	});
 });
 
@@ -51,7 +59,7 @@ function callbackSelectionRelais()
 	var city = document.getElementById("tntRCSelectedCommune").value;
 	
 	if (!code || code == "")
-		alert("Aucun depot selectionne");
+		alert("Aucune agence d\351pot selectionn\351e");
 	else 
 	{
 		document.getElementById("tnt_carrier_shipping_pex").value = code;

modules/tntcarrier/relaisColis/js/relaisColis.js

@@ -180,7 +180,7 @@ function tntB2CRelaisColis() {
 	var tntRelaisColisB2C = $("#tntB2CRelaisColis");
 	tntRelaisColisB2C.html(
 		"<div id='tntRCblocEntete'>"+
-			"<div class='tntRCHeader'>"+ tntRCMsgHeaderTitle + "</div>"+
+			
 			"<div class='tntRCSubHeader'>" + tntRCMsgSubHeaderTitle + "</div>"+
 			"<input type='hidden' id='tntRCSelectedCode' value=''/>"+
 			"<input type='hidden' id='tntRCSelectedNom' value=''/>"+

modules/tntcarrier/relaisColis/relaisColis.php

@@ -10,15 +10,23 @@ $relais = Db::getInstance()->getValue('SELECT c.id_carrier
  {
 ?>
 		<script type="text/javascript">
-		$("#form").submit(function()
+        $('input[name=processCarrier]').click(function()
+                                              {
+                                              if ($("#tntRCSelectedCode").val() == '')
+                                              {
+                                              alert("Vous n'avez pas choisi de relais colis");
+                                              return false;
+                                              }
+                                              });
+		/*$("#form").submit(function()
 		{
-			if ($("#tntRCSelectedCode").val() == '')
+                          if ($("#tntRCSelectedCode").val() == '')
-			{
+                          {
-				alert("Vous n'avez pas choisi de relais colis");
+                          //alert("Vous n'avez pas choisi de relais colis");
-				return false;
+                          return false;
-			}
+                          }
 		}
-		);
+		);*/
 		</script>
 		<script type="text/javascript" src="./modules/tntcarrier/relaisColis/js/jquery.js"></script>
 		<script type="text/javascript" src="./modules/tntcarrier/relaisColis/js/jquery-ui.js"></script>

modules/tntcarrier/relaisColis/tntRelais.php

@@ -35,7 +35,7 @@
 <link rel="stylesheet" href="./modules/tntcarrier/relaisColis/css/tntB2CRelaisColis.css" type="text/css" />
 <div id="tntB2CRelaisColis" class="exemplePresentation">
 	<div id="tntRCblocEntete">
-		<div class="tntRCHeader">Mode de livraison</div>
+		<!--<div class="tntRCHeader">Mode de livraison</div>-->
 		<div class="tntRCSubHeader">
 			Choisissez le Relais Colis
 			<sup class="tntRCSup">&reg;</sup>

modules/tntcarrier/tntGetDepot.php

@@ -42,80 +42,87 @@ else
 	}
 	if (isset($follow))
 	{
-		//var_dump($follow->DepotInfo);
+		//var_dump($follow);
-		$v = $follow->DepotInfo;
+		if (isset($follow->DepotInfo))
-		if (!is_array($follow->DepotInfo))
+		{	
-			echo "
+			$v = $follow->DepotInfo;
-				<input type='hidden' id='tntRCSelectedCode' value='$v->pexCode'/>
+			if (!is_array($follow->DepotInfo))
-				<input type='hidden' id='tntRCSelectedNom' value='$v->name'/>
+				echo "
-				<input type='hidden' id='tntRCSelectedAdresse' value='$v->address1'/>
+					<input type='hidden' id='tntRCSelectedCode' value='$v->pexCode'/>
-				<input type='hidden' id='tntRCSelectedAdresse2' value='$v->address2'/>
+					<input type='hidden' id='tntRCSelectedNom' value='$v->name'/>
-				<input type='hidden' id='tntRCSelectedCodePostal' value='$v->zipCode'/>
+					<input type='hidden' id='tntRCSelectedAdresse' value='$v->address1'/>
-				<input type='hidden' id='tntRCSelectedCommune' value='$v->city'/>";
+					<input type='hidden' id='tntRCSelectedAdresse2' value='$v->address2'/>
-		else
+					<input type='hidden' id='tntRCSelectedCodePostal' value='$v->zipCode'/>
-			echo "
+					<input type='hidden' id='tntRCSelectedCommune' value='$v->city'/>";
-				<input type='hidden' id='tntRCSelectedCode' />
-				<input type='hidden' id='tntRCSelectedNom' />
-				<input type='hidden' id='tntRCSelectedAdresse' />
-				<input type='hidden' id='tntRCSelectedAdresse2' />
-				<input type='hidden' id='tntRCSelectedCodePostal' />
-				<input type='hidden' id='tntRCSelectedCommune' />";
-		echo "
-		<table width='480px' cellspacing='0' cellpadding='0' style='border:1px solid gray;'>
-			<tbody>
-			<tr height='8px'>
-			<td class='tntRCblanc' colspan='6'></td>
-			</tr>
-			<tr>
-			<td class='tntRCblanc' width='5px'></td>
-			<td class='tntRCgris'  colspan='2'>&nbsp;Agences TNT</td>";
-		if (is_array($follow->DepotInfo))
-			echo "<td class='tntRCgris'>Choix</td>";
-		else
-			echo "<td></td>";
-		echo "
-			<td class='tntRCblanc' width='5px'></td>
-			</tr>";
-			if (is_array($follow->DepotInfo))
-				foreach ($follow->DepotInfo as $key => $v)
-				{
-					echo"
-						<tr>
-						<td class='tntRCblanc' ></td>
-						<td class='tntRCblanc' ><img src='../modules/tntcarrier/img/logo-tnt-petit.jpg'></td>
-						<td class='tntRCrelaisColis'> $v->name $v->address1 $v->address2 <br/>$v->zipCode $v->city</td>
-						<td><input type='radio' name='depotTnt' value='$key' onclick='changeValueTntRC(\"$v->pexCode\", \"$v->name\", \"$v->address1\", \"$v->address2\", \"$v->zipCode\", \"$v->city\")'/></td>
-						<td class='tntRCblanc' ></td>
-						</tr>
-						<tr><td class='tntRCblanc'></td><td class='tntRCrelaisColis' colspan='2'>$v->message</td><td class='tntRCblanc' ></td></tr>
-						<tr id='tntRcDetail'>
-						<td class='tntRCblanc'></td>
-						<td></td>
-						<td></td>
-						<td></td>
-						<td class='tntRCblanc'></td>
-						</tr>";
-				}
 			else
-				echo"
+				echo "
-						<tr>
+					<input type='hidden' id='tntRCSelectedCode' />
-						<td class='tntRCblanc' ></td>
+					<input type='hidden' id='tntRCSelectedNom' />
-						<td class='tntRCblanc' ><img src='../modules/tntcarrier/img/logo-tnt-petit.jpg'></td>
+					<input type='hidden' id='tntRCSelectedAdresse' />
-						<td class='tntRCrelaisColis'> $v->name $v->address1 $v->address2 <br/>$v->zipCode $v->city</td>
+					<input type='hidden' id='tntRCSelectedAdresse2' />
-						<td></td>
+					<input type='hidden' id='tntRCSelectedCodePostal' />
-						<td class='tntRCblanc' ></td>
+					<input type='hidden' id='tntRCSelectedCommune' />";
-						</tr>
+			echo "
-						<tr><td class='tntRCblanc'></td><td class='tntRCrelaisColis' colspan='2'>$v->message</td><td class='tntRCblanc' ></td></tr>
+				<table width='480px' cellspacing='0' cellpadding='0' style='border:1px solid gray;'>
-						<tr id='tntRcDetail'>
+				<tbody>
-						<td class='tntRCblanc'></td>
+				<tr height='8px'>
-						<td></td>
+				<td class='tntRCblanc' colspan='6'></td>
-						<td></td>
+				</tr>
-						<td></td>
+				<tr>
-						<td class='tntRCblanc'></td>
+				<td class='tntRCblanc' width='5px'></td>
-						</tr>";
+				<td class='tntRCgris'  colspan='2'>&nbsp;Agences TNT</td>";
-		echo "
+			if (is_array($follow->DepotInfo))
-		</table>
+				echo "<td class='tntRCgris'>Choix</td>";
-		";
+			else
+				echo "<td></td>";
+			echo "
+				<td class='tntRCblanc' width='5px'></td>
+				</tr>";
+				if (is_array($follow->DepotInfo))
+					foreach ($follow->DepotInfo as $key => $v)
+					{
+						echo"
+							<tr>
+							<td class='tntRCblanc' ></td>
+							<td class='tntRCblanc' ><img src='../modules/tntcarrier/img/logo-tnt-petit.jpg'></td>
+							<td class='tntRCrelaisColis'> $v->name $v->address1 $v->address2 <br/>$v->zipCode $v->city</td>
+							<td><input type='radio' name='depotTnt' value='$key' onclick='changeValueTntRC(\"$v->pexCode\", \"$v->name\", \"$v->address1\", \"$v->address2\", \"$v->zipCode\", \"$v->city\")'/></td>
+							<td class='tntRCblanc' ></td>
+							</tr>
+							<tr><td class='tntRCblanc'></td><td class='tntRCrelaisColis' colspan='2'>$v->message</td><td class='tntRCblanc' ></td></tr>
+							<tr id='tntRcDetail'>
+							<td class='tntRCblanc'></td>
+							<td></td>
+							<td></td>
+							<td></td>
+							<td class='tntRCblanc'></td>
+							</tr>";
+					}
+				else
+					echo"
+							<tr>
+							<td class='tntRCblanc' ></td>
+							<td class='tntRCblanc' ><img src='../modules/tntcarrier/img/logo-tnt-petit.jpg'></td>
+							<td class='tntRCrelaisColis'> $v->name $v->address1 $v->address2 <br/>$v->zipCode $v->city</td>
+							<td></td>
+							<td class='tntRCblanc' ></td>
+							</tr>
+							<tr><td class='tntRCblanc'></td><td class='tntRCrelaisColis' colspan='2'>$v->message</td><td class='tntRCblanc' ></td></tr>
+							<tr id='tntRcDetail'>
+							<td class='tntRCblanc'></td>
+							<td></td>
+							<td></td>
+							<td></td>
+							<td class='tntRCblanc'></td>
+							</tr>";
+			echo "
+				</table>
+				<div style='margin-top:5px;text-align:center'>
+				<input class='button' type='button' value='Remplir les informations de l&rsquo;agence' onclick='callbackSelectionRelais();return false;' />
+				</div>";
+		}
+		else
+			echo "Aucun d&eacute;p&ocirc;t trouv&eacute;";
 	}
 }
 ?>

modules/tntcarrier/tntcarrier.php

@@ -26,7 +26,7 @@ class TntCarrier extends CarrierModule
 	{
 		$this->name = 'tntcarrier';
 		$this->tab = 'shipping_logistics';
-		$this->version = '1.0';
+		$this->version = '1.1';
 		$this->author = 'PrestaShop';
 		$this->limited_countries = array('fr');
 
@@ -51,8 +51,10 @@ class TntCarrier extends CarrierModule
 			foreach($carriers as $carrier)
 				$id_carrier_list[] .= $carrier['id_carrier'];
 			
-			if (count($warning))
+			if (count($warning) > 1)
 				$this->warning .= implode(' , ',$warning).$this->l('must be configured to use this module correctly.').' ';
+            if (count($warning) == 1)
+				$this->warning .= implode(' , ',$warning).$this->l('has to be configured to use this module correctly.').' ';
 		}
 	}
 
@@ -221,7 +223,7 @@ class TntCarrier extends CarrierModule
 
 	public function getContent()
 	{
-		$this->_html .= '<h2><a href="http://www.tnt.fr/"><img src="'.$this->_path.'logo.gif" alt="' . $this->l('TNT Carrier').'" /></a></h2>';
+		$this->_html .= '<h2><a href="https://www.tnt.fr/public/utilisateurs/adminExt/new.do"><img src="'.$this->_path.'carrier.jpg" alt="' . $this->l('TNT Carrier').'" /></a></h2>';
 		if (!empty($_POST) AND Tools::isSubmit('submitSave'))
 		{
 			$this->_postValidation();
@@ -229,7 +231,7 @@ class TntCarrier extends CarrierModule
 				$this->_postProcess();
 			else
 				foreach ($this->_postErrors AS $err)
-					$this->_html .= '<div class="alert error"><img src="'._PS_IMG_.'admin/forbbiden.gif" alt="nok" />&nbsp;'.$err.'</div>';
+					$this->_html .= '<div class="error"><img src="'._PS_IMG_.'admin/forbbiden.gif" alt="nok" />&nbsp;'.$err.'</div>';
 		}
 		$this->_displayForm();
 		return $this->_html;
@@ -248,20 +250,6 @@ class TntCarrier extends CarrierModule
 		
 		$smarty->assign('glob', $globalVar);
 		
-		$lang = array(
-					'followParameters' => $this->l('The following parameters were provided to you by TNT'), 'registered' => $this->l('If you are not yet registered, click '), 'here' => $this->l('here'),
-					'accountSetting' => $this->l('Account settings'), 'shippingSetting' => $this->l('Shipping Settings'), 'serviceSetting' => $this->l('Service Settings'),
-					'accountTNT' => $this->l('Account TNT'), 'login' => $this->l('Login'), 'password' => $this->l('Password'), 'numberAccount' => $this->l('Number account'),
-					'fillDataInTheForm' => $this->l('Fill Data in the form'), 'shipping' => $this->l('Shipping'), 'collect' => $this->l('Would you like TNT to pick up your package ?'), 'noDeposit' => $this->l('No (Deposit)'), 
-					'yes' => $this->l('Yes'), 'chooseYourDepositoryLocation' => $this->l('Choose your depository location'), 'pexCode' => $this->l('Pex Code'), 'companyName' => $this->l('Company Name'),
-					'lastName' => $this->l('Last name'), 'firstName' => $this->l('First name'), 'address1' => $this->l('Address line 1'), 'address2' => $this->l('Address line 2'), 'zip' => $this->l('Zip / Postal Code'), 'city' => $this->l('Your City'), 
-					'email' => $this->l('Your Email Address'), 'phone' => $this->l('Your Phone Number'), 'closingTime' => $this->l('Your Closing Time'), 'saturdayDelivery' => $this->l('Saturday Delivery'), 'no' => $this->l('No'),
-					'labelFormatPrinting' => $this->l('Label Format for printing (This Label will have to be sticked on the package)'), 'a4printing' => $this->l('A4 printing'), 'withoutPrintingLogoTNT' => $this->l('without printing the logo TNT'), 'withReversePrint' => $this->l('with a reverse print'), 'withoutPrintingLogoTNTWithReversePrint' => $this->l('without printing the logo TNT and with a reverse print'),
-					'newService' => $this->l('New Service'), 'id' => $this->l('ID'), 'name' => $this->l('Name'), 'description' => $this->l('Description'), 'code' => $this->l('Code'), 'additionnalCharge' => $this->l('Additionnal charge (Euros)'), 'activated' => $this->l('Activated'), 'edit' => $this->l('edit'), 'delete' => $this->l('delete'), 'place' => $this->l('Place')
-					);
-		
-		$smarty->assign('lang', $lang);
-		
 		$this->_html .= '<fieldset>
 		<legend>'.$this->l('TNT Carrier Module Status').'</legend>';
 		
@@ -277,14 +265,23 @@ class TntCarrier extends CarrierModule
 			$alert['shipping'] = 1;
 		if ((Db::getInstance()->getValue('SELECT * FROM `'._DB_PREFIX_.'carrier` WHERE `external_module_name` = "'.$this->_moduleName.'" AND deleted = "0"')) < 1)
 			$alert['service'] = 1;
-		if (!count($alert))
+		if (count($alert) < 3)
-			$this->_html .= '<img src="'._PS_IMG_.'admin/module_install.png" /><strong>'.$this->l('TNT Carrier is configured and online!').'</strong>';
+        {
-		else
+			$this->_html .= '<img src="'._PS_IMG_.'admin/module_install.png" /><strong>'.$this->l('The following parameters are correctly configured and activated on your online store :').'</strong>';
+            $this->_html .= '<ul>';
+			$this->_html .= (!isset($alert['account']) ? '<li>'.$this->l('TNT account. (Account setting tab)').'</li>' : '');
+			$this->_html .= (!isset($alert['shipping']) ? '<li>'.$this->l('Shipping address. (Shipping settings tab)').'</li>' : '');
+			$this->_html .= (!isset($alert['service']) ? '<li>'.$this->l('Choice of specific TNT delivery mode you want to offer to your customers. (Service settings tab)').'</li>' : '');
+            $this->_html .= '</ul>';
+        }
+		if (count($alert) > 0)
 		{
-			$this->_html .= '<img src="'._PS_IMG_.'admin/warn2.png" /><strong>'.$this->l('TNT Carrier is not configured yet, please:').'</strong>';
+			$this->_html .= '<img src="'._PS_IMG_.'admin/warn2.png" /><strong>'.$this->l('The following parameters have to be configured to be able to use correctly the TNT module :').'</strong>';
-			$this->_html .= '<br />'.(isset($alert['account']) ? '<img src="'._PS_IMG_.'admin/warn2.png" />' : '<img src="'._PS_IMG_.'admin/module_install.png" />').' '.$this->l('Make sure you have a tnt account.');
+            $this->_html .= '<ul>';
-			$this->_html .= '<br />'.(isset($alert['shipping']) ? '<img src="'._PS_IMG_.'admin/warn2.png" />' : '<img src="'._PS_IMG_.'admin/module_install.png" />').' '.$this->l('Make sure you have a correct shipping address.');
+			$this->_html .= (isset($alert['account']) ? '<li>'.$this->l('TNT account. (Account setting tab)').'</li>' : '');
-			$this->_html .= '<br />'.(isset($alert['service']) ? '<img src="'._PS_IMG_.'admin/warn2.png" />' : '<img src="'._PS_IMG_.'admin/module_install.png" />').' '.$this->l('Make sure services are activated after a bill.');
+			$this->_html .= (isset($alert['shipping']) ? '<li>'.$this->l('Shipping address. (Shipping settings tab)').'</li>' : '');
+			$this->_html .= (isset($alert['service']) ? '<li>'.$this->l('Choice of specific TNT delivery mode you want to offer to your customers. (Service settings tab)').'</li>' : '');
+            $this->_html .= '</ul>';
 		}
 
 		$this->_html .= '</fieldset><div class="clear">&nbsp;</div>';
@@ -348,7 +345,7 @@ class TntCarrier extends CarrierModule
 		foreach ($serviceList as $k => $v)
 			{
 				$serviceList[$k]['optionId'] = Configuration::get('TNT_CARRIER_'.$v['option'].'_ID');
-				$serviceList[$k]['optionOvercost'] = Configuration::get('TNT_CARRIER_'.$v['option'].'_OVERCOST');
+				$serviceList[$k]['optionOvercost'] = (Configuration::get('TNT_CARRIER_'.$v['option'].'_OVERCOST') ? Configuration::get('TNT_CARRIER_'.$v['option'].'_OVERCOST') : '0');
 			}
 		
 		$var = array('serviceList' => $serviceList,
@@ -369,7 +366,7 @@ class TntCarrier extends CarrierModule
 		
 		$html = '
 		<a href="index.php?tab='.Tools::getValue('tab').'&configure='.Tools::getValue('configure').'&token='.Tools::getValue('token').'&tab_module='.Tools::getValue('tab_module').'&module_name='.Tools::getValue('module_name').'&id_tab=3&section='.$cat.'&action=new">
-		<img src="../img/admin/add.gif" alt="add"/> '.$this->l('New weight option').'</a></br><br/>
+		<img src="../img/admin/add.gif" alt="add"/> '.$this->l('Add additional charges depending on the package weight').'</a></br><br/>
 		<table class="table" cellspacing="0" cellpading="0">
 			<tr>
 				<th>'.$this->l('ID').'</th><th>'.$this->l('Weight Min').'</th><th>'.$this->l('Weight Max').'</th><th>'.$this->l('Additionnal charge (Euros)').'</th><th></th>
@@ -381,7 +378,7 @@ class TntCarrier extends CarrierModule
 			$html .= '<tr '.($irow++ % 2 ? 'class="alt_row"' : '').'>
 			<td>'.$v['id_'.$cat.''].'</td>
 			<td>'.$v[''.$cat.'_min'].'</td>
-			<td>'.$v[''.$cat.'_max'].'</td>
+			<td>'.((float)$v[''.$cat.'_max'] == 0 ? '&infin;' : $v[''.$cat.'_max']).'</td>
 			<td>'.$v['additionnal_charges'].'</td>
 			<td>
 			<a href="index.php?tab='.Tools::getValue('tab').'&configure='.Tools::getValue('configure').'&token='.Tools::getValue('token').'&tab_module='.Tools::getValue('tab_module').'&module_name='.Tools::getValue('module_name').'&id_tab=3&section='.$cat.'&action=edit&'.$cat.'='.$v['id_'.$cat.''].'">
@@ -404,7 +401,7 @@ class TntCarrier extends CarrierModule
 		
 		$var = array(
 		'country' => $country,
-		'overcost' => Configuration::get('TNT_CARRIER_'.strtoupper($country).'_OVERCOST'),
+                     'overcost' => (Configuration::get('TNT_CARRIER_'.strtoupper($country).'_OVERCOST') ? Configuration::get('TNT_CARRIER_'.strtoupper($country).'_OVERCOST') : '0'),
 		'action' => Tools::getValue('action'),
 		'section' => Tools::getValue('section'),
 		'getCountry' => Tools::getValue('country'),
@@ -452,7 +449,7 @@ class TntCarrier extends CarrierModule
 		{
 			$info = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'tnt_carrier_'.$cat.'` WHERE `id_'.$cat.'` = "'.$id.'"');
 			$info_min = $info[0][$cat.'_min'];
-			$info_max = $info[0][$cat.'_max'];
+			$info_max = ((float)$info[0][$cat.'_max'] == 0 ? '': $info[0][$cat.'_max']);
 			$charge = $info[0]['additionnal_charges'];
 		}
 		
@@ -461,13 +458,13 @@ class TntCarrier extends CarrierModule
 			'.($id != null ? '<input type="hidden" name="'.$cat.'_id" value="'.$id.'"/>' : '').'
 			<table class="table" cellspacing="0" cellpadding="0">
 				<tr>
-					<th>'.$this->l('Weight min').'</th><th>'.$this->l('Weight max').'</th><th>'.$this->l('Additionnal charge').'</th><th></th>
+					<th>'.$this->l('Weight min').'</th><th>'.$this->l('Weight max (can be empty)').'</th><th>'.$this->l('Additionnal charge').'</th><th></th>
 				</tr>
 				<tr>
 					<td><input type="text" name="tnt_carrier_'.$cat.'_min" size="20" value="'.$info_min.'"/></td>
 					<td><input type="text" name="tnt_carrier_'.$cat.'_max" size="20" value="'.$info_max.'"/></td>
 					<td><input type="text" name="tnt_carrier_'.$cat.'_charge" size="10" value="'.$charge.'"/></td>
-					<td><input class="button" name="submitSave" type="submit"></td>
+					<td><input class="button" name="submitSave" type="submit" value="'.$this->l('save').'"></td>
 				</tr>
 			</table>
 		</form>';
@@ -511,7 +508,7 @@ class TntCarrier extends CarrierModule
 		$password = Tools::getValue('tnt_carrier_password');
 		$number = Tools::getValue('tnt_carrier_number_account');
 		if (!$login || !$password || !$number)
-			$this->_postErrors[] = $this->l("All the fields are required");
+			$this->_postErrors[] = $this->l('All the fields are required');
 		Configuration::updateValue('TNT_CARRIER_LOGIN', $login);
 		Configuration::updateValue('TNT_CARRIER_PASSWORD', $password);
 		Configuration::updateValue('TNT_CARRIER_NUMBER_ACCOUNT', $number);
@@ -519,7 +516,7 @@ class TntCarrier extends CarrierModule
 	
 	private function _postValidationShipping()
 	{
-		$collect = $email = Tools::getValue('tnt_carrier_shipping_collect');
+		$collect = '1';//Tools::getValue('tnt_carrier_shipping_collect');
 		$company = Tools::getValue('tnt_carrier_shipping_company');
 		$pex = Tools::getValue('tnt_carrier_shipping_pex');
 		$lname = Tools::getValue('tnt_carrier_shipping_last_name');
@@ -535,23 +532,25 @@ class TntCarrier extends CarrierModule
 		$print = Tools::getValue('tnt_carrier_print_sticker');
 		
 		if (!$collect && $pex == '')
-			$this->_postErrors[] = $this->l("The pex code is missing");
+			$this->_postErrors[] = $this->l('The pex code is missing');
 		if ($collect && $company == '')
-			$this->_postErrors[] = $this->l("Your company name is missing");
+			$this->_postErrors[] = $this->l('Company name is missing');
 		if ($collect && !$lname)
-			$this->_postErrors[] = $this->l("Your last name is missing");
+			$this->_postErrors[] = $this->l('Contact last name is missing');
 		if ($collect && !$fname)
-			$this->_postErrors[] = $this->l("Your first name is missing");
+			$this->_postErrors[] = $this->l('Contact first name is missing');
 		if (!$address1)
-			$this->_postErrors[] = $this->l("Your address is missing");
+			$this->_postErrors[] = $this->l('Address is missing');
+		if (isset($address2) && strlen($address2) >= 32)
+			$this->_postErrors[] = $this->l('Address line 2 must be under 32 characters');
 		if (!$postal_code)
-			$this->_postErrors[] = $this->l("Your zip code is missing");
+			$this->_postErrors[] = $this->l('Postal code is missing');
 		if (!$email)
-			$this->_postErrors[] = $this->l("Your email address is missing");
+			$this->_postErrors[] = $this->l('Contact email address is missing');
 		if (!$phone)
-			$this->_postErrors[] = $this->l("Your phone number is missing");
+			$this->_postErrors[] = $this->l('Contact phone number is missing');
 		if ($collect && $closing == '')
-			$this->_postErrors[] = $this->l("Your closing time is missing");
+			$this->_postErrors[] = $this->l('Company closing time is missing');
 		
 		Configuration::updateValue('TNT_CARRIER_SHIPPING_COLLECT', $collect);
 		Configuration::updateValue('TNT_CARRIER_SHIPPING_COMPANY', $company);
@@ -704,6 +703,11 @@ class TntCarrier extends CarrierModule
 		Configuration::updateValue('TNT_CARRIER_'.strtoupper($country).'_OVERCOST', $overcost);
 	}
 	
+    public function get_followup($shipping_number)
+	{
+		return false;
+	}
+    
 	/*
 	** Hook update carrier
 	**
@@ -823,6 +827,7 @@ class TntCarrier extends CarrierModule
 		$erreur = null;
 		$follow = array();
 		$carrierName = Db::getInstance()->ExecuteS('SELECT external_module_name FROM `'._DB_PREFIX_.'carrier` WHERE `id_carrier` = "'.(int)($id_carrier).'"');
+        
 		if ($carrierName != null && $carrierName[0]['external_module_name'] == $this->_moduleName && $shipping_number != '')
 		{
 			$pack = new PackageTnt($params['order']->id);
@@ -834,6 +839,10 @@ class TntCarrier extends CarrierModule
 	
 	public function hookupdateCarrier($params)
 	{
+        $option = Db::getInstance()->ExecuteS('SELECT option
+                                                   FROM `'._DB_PREFIX_.'tnt_carrier_option`
+                                                   WHERE id_carrier = "'.(int)$params['id_carrier'].'"');
+        Configuration::updateValue('TNT_CARRIER_'.$option[0]['option'].'_ID', (int)($params['carrier']->id));
 	}
 
 	/*
@@ -849,6 +858,8 @@ class TntCarrier extends CarrierModule
 	
 	public function getOrderShippingCost($params, $shipping_cost)
 	{	
+        if (!Tools::getValue('step'))
+            return false;
 		if ((int)(Tools::getValue('step')) > 2)
 			serviceCache::deleteServices($params->id);
 		$product = $params->getProducts();
@@ -857,6 +868,7 @@ class TntCarrier extends CarrierModule
 		$id_customer = $params->id_customer;
 		$date_exp = $params->date_upd;
 		$id_adress_delivery = $params->id_address_delivery;
+		$info = Db::getInstance()->ExecuteS('SELECT postcode, city, company FROM `'._DB_PREFIX_.'address` WHERE `id_address` = "'.(int)($id_adress_delivery).'"');
 		
 		foreach($product as $k => $v)
 				$weight += (float)($v['weight']);
@@ -867,7 +879,6 @@ class TntCarrier extends CarrierModule
 				return false;
 			if (!Configuration::get('TNT_CARRIER_SHIPPING_ADDRESS1') || !Configuration::get('TNT_CARRIER_SHIPPING_ZIPCODE') || !Configuration::get('TNT_CARRIER_SHIPPING_CITY'))
 				return false;
-			$info = Db::getInstance()->ExecuteS('SELECT postcode, city, company FROM `'._DB_PREFIX_.'address` WHERE `id_address` = "'.(int)($id_adress_delivery).'"');
 			
 			$serviceCache = new serviceCache($params->id, $info[0]['postcode']);
 			if (!$serviceCache->getFaisabilityAtThisTime())
@@ -902,18 +913,13 @@ class TntCarrier extends CarrierModule
 								$priceCarrier = Configuration::get('TNT_CARRIER_'.$v['code'].'_OVERCOST');
 					}
 		}
-		if (!isset($priceCarrier))
+        if (!isset($priceCarrier))
 			{
-				if (isset($params->id_carrier) && (int)($params->id_carrier) > 0)
+				if ($option = Db::getInstance()->ExecuteS('SELECT `option` FROM `'._DB_PREFIX_.'tnt_carrier_option` WHERE `id_carrier` = "'.(int)($this->id_carrier).'"'))
-				{
+					$priceCarrier = Configuration::get('TNT_CARRIER_'.$option[0]['option'].'_OVERCOST');
-					if ($option = Db::getInstance()->ExecuteS('SELECT `option` FROM `'._DB_PREFIX_.'tnt_carrier_option` WHERE `id_carrier` = "'.(int)($params->id_carrier).'"'))
-						$priceCarrier = Configuration::get('TNT_CARRIER_'.$option[0]['option'].'_OVERCOST');
-				}
-				else
-					$priceCarrier = 0;
 			}
-		
+		$zero = 0;
-		$weightLimit = Db::getInstance()->ExecuteS('SELECT additionnal_charges FROM `'._DB_PREFIX_.'tnt_carrier_weight` WHERE `weight_min` < "'.(float)($weight).'" AND `weight_max` > "'.(float)($weight).'"');
+		$weightLimit = Db::getInstance()->ExecuteS('SELECT additionnal_charges FROM `'._DB_PREFIX_.'tnt_carrier_weight` WHERE `weight_min` < "'.(float)($weight).'" AND (`weight_max` > "'.(float)($weight).'" OR `weight_max` = "'.(float)$zero.'")');
 		$currency = Db::getInstance()->ExecuteS('SELECT conversion_rate FROM `'._DB_PREFIX_.'currency` WHERE `id_currency` = "'.(int)($params->id_currency).'"');
 		if ($weightLimit != null)
 			$add += (float)($weightLimit[0]['additionnal_charges']);

modules/tntcarrier/tpl/accountForm.tpl

@@ -1,14 +1,13 @@
-<!--<div id="ajaxAnswer" style="float:right;text-align:center;width:50%;margin-top:100px"></div>-->
+<p>{l s='The following parameters were provided to you by TNT' mod='tntcarrier'}. {l s='If you are not yet registered, click ' mod='tntcarrier'} <a style="color:blue;text-decoration:underline" href="https://www.tnt.fr/public/utilisateurs/adminExt/new.do">{l s='here' mod='tntcarrier'}</a></p>
-<p>{$lang.followParameters}. {$lang.registered} <a style="color:blue;text-decoration:underline" href="https://www.tnt.fr/public/utilisateurs/adminExt/new.do">{$lang.here}</a></p>
 	<form action="index.php?tab={$glob.tab}&configure={$glob.configure}&token={$glob.token}&tab_module={$glob.tab_module}&module_name={$glob.module_name}&id_tab=1&section=account" method="post" class="form" id="configFormAccount">
 		<fieldset style="border: 0px;">
-			<h4>{$lang.accountTNT} :</h4>
+			<h4>{l s='Account TNT' mod='tntcarrier'} :</h4>
-			<label>{$lang.login} : </label>
+			<label>{l s='Login' mod='tntcarrier'} : </label>
 			<div class="margin-form"><input type="text" size="20" name="tnt_carrier_login" value="{$varAccount.login}" /></div>
-			<label>{$lang.password} : </label>
+			<label>{l s='Password' mod='tntcarrier'} : </label>
 			<div class="margin-form"><input type="password" size="20" name="tnt_carrier_password" value="{$varAccount.password}" /></div>
-			<label>{$lang.numberAccount} : </label>
+			<label>{l s='Number account' mod='tntcarrier'} : </label>
 			<div class="margin-form"><input type="text" size="20" name="tnt_carrier_number_account" value="{$varAccount.account}" /></div>
 		</fieldset>
-	<div class="margin-form"><input class="button" name="submitSave" type="submit"></div>
+	<div class="margin-form"><input class="button" name="submitSave" type="submit" value="{l s='save' mod='tntcarrier'}"></div>
-</form>
+</form>

modules/tntcarrier/tpl/country.tpl

@@ -1,12 +1,12 @@
 <table class="table" cellspacing="0" cellpading="0">
 	<tr>
-		<th>{$lang.place}</th><th>{$lang.additionnalCharge}</th><th></th>
+		<th>{l s='Place' mod='tntcarrier'}</th><th>{l s='Additionnal charge(Euros)' mod='tntcarrier'}</th><th></th>
 	</tr>
 	<tr>
 		<td>{$varCountry.country}</td><td>{$varCountry.overcost}</td>
 		<td>
 		<a href="index.php?tab={$glob.tab}&configure={$glob.configure}&token={$glob.token}&tab_module={$glob.tab_module}&module_name={$glob.module_name}&id_tab=3&section=country&action=edit&country={$varCountry.country}">
-			<img src="../img/admin/edit.gif" alt="edit" title="{$lang.edit}"/></a>
+			<img src="../img/admin/edit.gif" alt="edit" title="{l s='edit' mod='tntcarrier'}"/></a>
 		</td>
 	</tr>
 </table>

modules/tntcarrier/tpl/countryForm.tpl

@@ -3,7 +3,7 @@
 		<tr>
 			<td><input type="hidden" name="tnt_carrier_country" size="20" value="{$varCountryForm.country}"/>{$varCountryForm.country}</td>
 			<td><input type="text" name="tnt_carrier_{$varCountryForm.country}_overcost" size="20" value="{$varCountryForm.overcost}"/></td>
-			<td><input class="button" name="submitSave" type="submit"></td>
+			<td><input class="button" name="submitSave" type="submit" value="{l s='save' mod='tntcarrier'}"></td>
 		</tr>
 	</table>
 </form>

modules/tntcarrier/tpl/follow.tpl

@@ -25,42 +25,41 @@
 *}
 
 <br/>
-{$erreur}
+{if isset($follow)}
-{if !isset($erreur)}
 {foreach from="$follow" item="f"}
 <table class="std" style="text-align:left">
 	<thead>
 	<tr>
-		<th class="first_item" colspan="2">{l s="Package Information"}</th>
+		<th class="first_item" colspan="2">{l s='Package Information'}</th>
 		<th class="last_item" colspan="2"></th>
 	</tr>
 	<tr class="item">
-		<td class="bold">{l s="Shipping number"}</td>
+		<td class="bold">{l s='Shipping number'}</td>
 		<td>{$f.number}</td>
-		<td class="bold">{l s="Shipping status"}</td>
+		<td class="bold">{l s='Shipping status'}</td>
 		<td>{$f.status}</td>
 	</tr>
 	<tr class="item">
-		<td class="bold">{l s="Reference"}</td>
+		<td class="bold">{l s='Reference'}</td>
 		<td>{$f.reference}</td>
-		<td class="bold">{l s="Service"}</td>
+		<td class="bold">{l s='Service'}</td>
 		<td>{$f.service}</td>
 	<tr>
 	<tr class="item">
-		<td class="bold">{l s="Weight"}</td>
+		<td class="bold">{l s='Weight'}</td>
 		<td>{$f.weight}</td>
 		<td></td>
 		<td></td>
 	</tr>
 	<tr class="item" style="border-top:1px solid black">
-		<td class="bold">{l s="Event"}</th>
+		<td class="bold">{l s='Event'}</th>
-		<td class="bold">{l s="Date"}</th>
+		<td class="bold">{l s='Date'}</th>
-		<td class="bold">{l s="Hours"}</th>
+		<td class="bold">{l s='Hours'}</th>
-		<td class="bold">{l s="Name Center"}</th>
+		<td class="bold">{l s='Name Center'}</th>
 	</tr>
 	{if $f.request}
 	<tr class="item">
-		<td>{l s="Package on request"}</td>
+		<td>{l s='Package on request'}</td>
 		<td>{$f.requestDate|date_format:$config.date}</td>
 		<td>{$f.requestDate|date_format:$config.time}</td>
 		<td></td>
@@ -68,7 +67,7 @@
 	{/if}
 	{if $f.process}
 	<tr class="item">
-		<td>{l s="Package on its way"}</td>
+		<td>{l s='Package on its way'}</td>
 		<td>{$f.process_date|date_format:$config.date}</td>
 		<td>{$f.process_date|date_format:$config.time}</td>
 		<td>{$f.process_center}</td>
@@ -76,7 +75,7 @@
 	{/if}
 	{if $f.delivery_departure}
 	<tr class="item">
-		<td>{l s="Deposit departure"}</td>
+		<td>{l s='Deposit departure'}</td>
 		<td>{$f.delivery_departure_date|date_format:$config.date}</td>
 		<td>{$f.delivery_departure_date|date_format:$config.time}</td>
 		<td>{$f.delivery_departure_center}</td>
@@ -84,7 +83,7 @@
 	{/if}
 	{if $f.delivery}
 	<tr class="item">
-		<td>{l s="driver presentation"}</td>
+		<td>{l s='driver presentation'}</td>
 		<td>{$f.delivery_date|date_format:$config.date}</td>
 		<td>{$f.delivery_date|date_format:$config.time}</td>
 		<td></td>
@@ -97,7 +96,7 @@
 			{$line}<br/>
 			{/foreach}
 			{if $f.linkPicture != ''}
-			<a href="{$f.linkPicture}" target="_blank">{l s="proof signature"}</a>
+			<a href="{$f.linkPicture}" target="_blank">{l s='proof signature' mod='tntcarrier'}</a>
 			{/if}
 		</td>
 	</tr>

modules/tntcarrier/tpl/formerror.tpl

@@ -26,17 +26,17 @@
 <br/>
 <fieldset style="width:400px">
 			<legend><img src="../img/admin/delivery.gif" />{l s='Shipping information'}</legend>
-			{$var.error}<br/>
+			<!--{$var.error}--><br/>
 			<form action="{$var.currentIndex}&view{$var.table}&token={$var.token}" method="post" style="margin-top:10px;">
 			{if $var.weight}
-			{l s="The package weight must be between 0.1 and 30.0 kg"}<br/><br/>
+			{l s='The package weight must be between 0.1 and 30.0 kg or call your TNT commercial' mod='tntcarrier'}<br/><br/>
-			{l s="Weight"} : <input type="text" name="weightErrorOrder" /><br/><br/>
+			{l s='Weight' mod='tntcarrier'} : <input type="text" name="weightErrorOrder" /><br/><br/>
 			{/if}
 			{if $var.weightHidden}<input type="hidden" value="{$var.weightHidden}" name="weightErrorOrder" />{/if}
 			{if $var.date}
-			{l s="You must change the expedition date"}<br/><br/>
+			{l s='You must change the expedition date' mod='tntcarrier'}<br/><br/>
-			{l s="Date"} : <input type="text" value="{$var.date}" name="dateErrorOrder" /><br/><br/>
+			{l s='Date' mod='tntcarrier'} : <input type="text" value="{$var.date}" name="dateErrorOrder" /><br/><br/>
 			{/if}
 			{if $var.dateHidden}<input type="hidden" value="{$var.dateHidden}" name="dateErrorOrder" />{/if}
-			{if !$var.dateHidden || !$var.weightHidden}<input type="submit" value="{l s='Modify'}" class="button" />{/if}
+			{if !$var.dateHidden || !$var.weightHidden}<input type="submit" value="{l s='Modify' mod='tntcarrier'}" class="button" />{/if}
 </fieldset>

modules/tntcarrier/tpl/main.tpl

@@ -1,7 +1,7 @@
 <ul id="menuTab">
-	<li id="menuTab1" class="menuTabButton selected">{$lang.accountSetting}</li>
+	<li id="menuTab1" class="menuTabButton selected">{l s='Account settings' mod='tntcarrier'}</li>
-	<li id="menuTab2" class="menuTabButton">{$lang.shippingSetting}</li>
+	<li id="menuTab2" class="menuTabButton">{l s='Shipping Settings' mod='tntcarrier'}</li>
-	<li id="menuTab3" class="menuTabButton">{$lang.serviceSetting}</li>
+	<li id="menuTab3" class="menuTabButton">{l s='Service Settings' mod='tntcarrier'}</li>
 </ul>
 <div id="tabList">
 	<div id="menuTab1Sheet" class="tabItem selected">{$varMain.account}</div>
@@ -12,7 +12,7 @@
 <br />
 <style>
 	#menuTab { float: left; padding: 0; margin: 0; text-align: left; }
-	#menuTab li { text-align: left; float: left; display: inline; padding: 5px; padding-right: 10px; background: #EFEFEF; font-weight: bold; cursor: pointer; border-left: 1px solid #EFEFEF; border-right: 1px solid #EFEFEF; border-top: 1px solid #EFEFEF; }
+	#menuTab li { text-align: left; float: left; display: inline; padding: 5px; padding-right: 10px; background: #EFEFEF; font-weight: bold; cursor: pointer; border-left: 1px solid #CCCCCC; border-right: 1px solid #CCCCCC; border-top: 1px solid #CCCCCC; }
 	#menuTab li.menuTabButton.selected { background: #FFF6D3; border-left: 1px solid #CCCCCC; border-right: 1px solid #CCCCCC; border-top: 1px solid #CCCCCC; }
 	#tabList { clear: left; }
 	.tabItem { display: none; }

modules/tntcarrier/tpl/relaisColis.tpl

@@ -1,21 +1,38 @@
 <script type="text/javascript">
+    $("input[name='id_carrier']").click(function() {
+    getAjaxRelais($("input[name='id_carrier']:checked").val());
+    });
+
 	function getAjaxRelais(id)
 	{
-		$("#relaisColisCarrier").load(
+       /* var parent = document.getElementById("id_carrier"+id).parentNode.parentNode.parentNode;
+
+        if (document.getElementById("tr_carrier_relais"))
+            {
+                var node = document.getElementById("tr_carrier_relais");
+                var father = node.parentNode;
+                father.removeChild(node);
+                return;
+            }
+        var tr = document.createElement("tr");
+        tr.innerHTML = "<td colspan='4' style='display:none' id='tr_carrier_relais'></td>";
+        
+        parent.insertBefore(tr, document.getElementById("id_carrier"+id).parentNode.parentNode.nextSibling);
+*/
+		$.get(
 			"./modules/tntcarrier/relaisColis/relaisColis.php?id_carrier="+id,
 			function(response, status, xhr) 
 			{
 				if (status == "error") 
-					$("#relaisColisCarrier").html(xhr.status + " " + xhr.statusText);
+					$("#tr_carrier_relais").html(xhr.status + " " + xhr.statusText);
+                if (status == 'success')
+                    $("#tr_carrier_relais").html(response);
 			}
 		);
-		$("#relaisColisCarrier").slideDown('slow');
+		$("#tr_carrier_relais").slideDown('slow');
 	}
 	
-	$("input[name='id_carrier']").click(function() {
-	getAjaxRelais($("input[name='id_carrier']:checked").val());
-	});
 </script>
-<div id="relaisColisCarrier" style="display:none">
+<div id="tr_carrier_relais" style="display:none">
 </div>
 <input type="hidden" id="cartRelaisColis" value="{$id_cart}" name="cartRelaisColis" />

modules/tntcarrier/tpl/service.tpl

@@ -1,23 +1,25 @@
+<script type="text/javascript" src="../modules/{$glob.module_name}/js/service.js"></script>
+<p>{l s='Services which the code has only one letter are those offers to companies. So they will only be proposed to customers who filled out the Company field' mod='tntcarrier'}</p><br/>
 <div style="float:right;margin-right: 100px;margin-top: 30px;">
 	<table class="table" cellspacing="0" cellpading="0">
-		<tr><th colspan="2">{l s='Code'}</th></tr>
+		<tr><th colspan="2">{l s='Code' mod='tntcarier'}</th></tr>
-		<tr><td>N : </td><td>{l s='8:00 Express'}</td></tr>
+		<tr><td>N : </td><td>{l s='8:00 Express' mod='tntcarier'}</td></tr>
-		<tr><td>A : </td><td>{l s='9:00 Express'}</td></tr>
+		<tr><td>A : </td><td>{l s='9:00 Express' mod='tntcarier'}</td></tr>
-		<tr><td>T : </td><td>{l s='10:00 Express'}</td></tr>
+		<tr><td>T : </td><td>{l s='10:00 Express' mod='tntcarier'}</td></tr>
-		<tr><td>M : </td><td>{l s='12:00 Express'}</td></tr>
+		<tr><td>M : </td><td>{l s='12:00 Express' mod='tntcarier'}</td></tr>
-		<tr><td>J : </td><td>{l s='Express'}</td></tr>
+		<tr><td>J : </td><td>{l s='Express' mod='tntcarier'}</td></tr>
-		<tr><td>P : </td><td>{l s='Express (P)'}</td></tr>
+		<tr><td>P : </td><td>{l s='Express (P)' mod='tntcarier'}</td></tr>
-		<tr><th colspan="2">{l s='Code Option (Optional)'}</th></tr>
+		<tr><th colspan="2">{l s='Code Option (Optional)' mod='tntcarrier'}</th></tr>
-		<tr><td>D : </td><td>{l s='relay package'}</td></tr>
+		<tr><td>D : </td><td>{l s='relay package' mod='tntcarier'}</td></tr>
-		<tr><td>Z : </td><td>{l s='Home delivery'}</td></tr>
+		<tr><td>Z : </td><td>{l s='Home delivery' mod='tntcarier'}</td></tr>
-		<tr><td>&Oslash; : </td><td>{l s='Enterprise Service'}</td></tr>
+		<tr><td>&Oslash; : </td><td>{l s='Enterprise Service' mod='tntcarier'}</td></tr>
 	</table>
 </div>
 <a href="index.php?tab={$glob.tab}&configure={$glob.configure}&token={$glob.token}&tab_module={$glob.tab_module}&module_name={$glob.module_name}&id_tab=3&section=service&action=new">
-<img src="../img/admin/add.gif" alt="add"/> {$lang.newService}</a></br><br/>
+<img src="../img/admin/add.gif" alt="add"/> {l s='Add a TNT service via its specific code' mod='tntcarrier'}</a></br><br/>
 <table class="table" cellspacing="0" cellpading="0">
 	<tr>
-		<th>{$lang.id}</th><th>{$lang.name}</th><th>{$lang.description}</th><th>{$lang.code}</th><th>{$lang.additionnalCharge}</th><th>{$lang.activated}</th><th></th>
+		<th>{l s='Id' mod='tntcarrier'}</th><th>{l s='Name' mod='tntcarrier'}</th><th>{l s='Description' mod='tntcarrier'}</th><th>{l s='code' mod='tntcarrier'}</th><th>{l s='Additionnal Charge(Euros)' mod='tntcarrier'}</th><th>{l s='Activated' mod='tntcarrier'}</th><th></th>
 	</tr>
 {foreach from=$varService.serviceList  key=k item=v}
 	<tr '.($irow++ % 2 ? 'class="alt_row"' : '').'>
@@ -28,16 +30,16 @@
 		<td>{$v.optionOvercost}</td>
 		<td>
 			{if $v.deleted != 1}
-			<img src="../img/admin/enabled.gif" />
+			<img style="cursor:pointer" onclick="changeActive(this,'{$v.optionId}')" src="../img/admin/enabled.gif" />
 			{else}
-			<img src="../img/admin/disabled.gif" />
+			<img style="cursor:pointer" onclick="changeActive(this,'{$v.optionId}')" src="../img/admin/disabled.gif" />
 			{/if}
 		</td>
 		<td>
 			<a href="index.php?tab={$glob.tab}&configure={$glob.configure}&token={$glob.token}&tab_module={$glob.tab_module}&module_name={$glob.module_name}&id_tab=3&section=service&action=edit&service={$v.optionId}">
-				<img src="../img/admin/edit.gif" alt="edit" title="{$lang.edit}"/></a>
+				<img src="../img/admin/edit.gif" alt="edit" title="{l s='edit' mod='tntcarrier'}"/></a>
 			<a href="index.php?tab={$glob.tab}&configure={$glob.configure}&token={$glob.token}&tab_module={$glob.tab_module}&module_name={$glob.module_name}&id_tab=3&section=service&action=del&service={$v.optionId}">
-				<img src="../img/admin/delete.gif" alt="delete" title="{$lang.delete}"/></a></td></tr>
+				<img src="../img/admin/delete.gif" alt="delete" title="{l s='delete' mod='tntcarrier'}"/></a></td></tr>
 {/foreach}
 </table><br/>
 <div id="divFormService">

modules/tntcarrier/tpl/serviceForm.tpl

@@ -4,7 +4,7 @@
 	{/if}
 	<table class="table" cellspacing="0" cellpadding="0">
 		<tr>
-			<th>{$lang.name}</th><th>{$lang.description}</th><th>{$lang.code}</th><th>{$lang.additionnalCharge}</th><th>{$lang.activated}</th><th></th>
+			<th>{l s='Name' mod='tntcarrier'}</th><th>{l s='Description' mod='tntcarrier'}</th><th>{l s='code' mod='tntcarrier'}</th><th>{l s='Additionnal Charge' mod='tntcarrier'}</th><th>{l s='Activated' mod='tntcarrier'}</th><th></th>
 		</tr>
 		<tr>
 			<td><input type="text" name="tnt_carrier_service_name" size="20" value="{$varServiceForm.name}"/></td>
@@ -14,7 +14,7 @@
 			<td><input type="radio" name="tnt_carrier_service_display" value="0" {if $varServiceForm.display == '1'} checked="checked"	{/if} /> <img src="../img/admin/disabled.gif" /><br/>
 				<input type="radio" name="tnt_carrier_service_display" value="1" {if $varServiceForm.display == '0'} checked="checked"	{/if} /> <img src="../img/admin/enabled.gif" />
 			</td>
-			<td><input class="button" name="submitSave" type="submit"></td>
+			<td><input class="button" name="submitSave" type="submit" value="{l s='save' mod='tntcarrier'}"></td>
 		</tr>
 	</table>
 </form>

modules/tntcarrier/tpl/shippingForm.tpl

@@ -5,66 +5,81 @@
 <link type="text/css" href="../modules/{$varShipping.moduleName}/css/ui.dialog.css" rel="stylesheet">
 <link type="text/css" href="../modules/{$varShipping.moduleName}/css/tntB2CRelaisColis.css" rel="stylesheet">
 <fieldset style="border: 0px;">
-	<div id="googleMapTnt" style="float:right;display:{if $varShipping.collect == '1'}none{/if}">
-		<div id="tntB2CRelaisColis" class="exemplePresentation">
-			<script type="text/javascript"> tntB2CRelaisColis();</script>
-		</div>
-		<div style="text-align: justify; font-family: arial,helvetica,sans-serif; font-size: 10pt;">
-			<div style="height: 25px;">&nbsp;</div>
-			<div id="exempleIntegration">
-				<input style="float:right" type="button" value="{$lang.fillDataInTheForm}" onclick="callbackSelectionRelais();" />
-			</div>
-		</div>
-	</div>
 	<form action="index.php?tab={$glob.tab}&configure={$glob.configure}&token={$glob.token}&tab_module={$glob.tab_module}&module_name={$glob.module_name}&id_tab=2&section=shipping" method="post" class="form" id="configFormShipping">		
-		<h4>{$lang.shipping} :</h4>
+		<h4>{l s='Shipping' mod='tntcarrier'} :</h4>
-		<label>{$lang.collect} : </label>
+		<!--<span style="font-weight:bold">{l s='Would you like TNT to pick up your package directly at your warehouse ?' mod='tntcarrier'}</span><br/><br/>
-		<div class="margin-form">
+        <div style='color: #7F7F7F;font-size: 0.85em;padding: 0 0 1em 80px;'>
-			<input type="radio" id="tnt_carrier_collect_no" name="tnt_carrier_shipping_collect" value="0" {if $varShipping.collect == '0'} checked="checked" {/if} /> : {$lang.noDeposit}<br/>
+			<input type="radio" id="tnt_carrier_collect_no" name="tnt_carrier_shipping_collect" onclick="depositButtonClick()" value="0" {if $varShipping.collect == '0'} checked="checked" {/if} /> : {l s='No (then you will have to deposit your packages in a TNT depositary. Thank you to choose in the form the depositary agency you wish to)' mod='tntcarrier'}<br/>
-			<input type="radio" id="tnt_carrier_collect_yes" onclick="collectButtonClick()" name="tnt_carrier_shipping_collect" value="1" {if $varShipping.collect == '1'} checked="checked" {/if} /> : {$lang.yes}
+			<input type="radio" id="tnt_carrier_collect_yes" onclick="collectButtonClick()" name="tnt_carrier_shipping_collect" value="1" {if $varShipping.collect == '1'} checked="checked" {/if} /> : {l s='Yes' mod='tntcarrier'}
-		</div>
+		</div>-->
-		<div id="divPex" style="display:{if $varShipping.collect == '1'}none{/if}">
+		<!--<div id="divPex" style="display:{if $varShipping.collect == '1'}none{/if}">
-			<a href="#" style="color:blue" onclick="depositButtonClick();return false;">{$lang.chooseYourDepositoryLocation}</a><br/><br/>
+			<input type='button' class='button' onclick="depositButtonClick();return false;" value="{l s='Choose your depository location' mod='tntcarrier'}" /><br/><br/>
-			<label>{$lang.pexCode} : </label>
+		</div>-->
-			<div class="margin-form"><input type="text" size="20" id="tnt_carrier_shipping_pex" name="tnt_carrier_shipping_pex" value="{$varShipping.pex}" /></div>
+        <!--<div id="googleMapTnt" style="float:right;display:{if $varShipping.collect == '1'}none{/if}">
-		</div>
+            <div id="tntB2CRelaisColis" class="exemplePresentation">
-		<label>{$lang.companyName} : </label>
+                <script type="text/javascript"> tntB2CRelaisColis();</script>
-		<div class="margin-form"><input type="text" size="20" id="tnt_carrier_shipping_company" name="tnt_carrier_shipping_company" value="{$varShipping.company}" /></div>
+            </div>
-		<label>{$lang.lastName} : </label>
+            <div style="text-align: justify; font-family: arial,helvetica,sans-serif; font-size: 10pt;">
-		<div class="margin-form"><input type="text" size="20" id="tnt_carrier_shipping_last_name" name="tnt_carrier_shipping_last_name" value="{$varShipping.lastName}" /></div>
+                <div style="height: 25px;">&nbsp;</div>
-		<label>{$lang.firstName} : </label>
+                <div id="exempleIntegration">
-		<div class="margin-form"><input type="text" size="20" id="tnt_carrier_shipping_first_name" name="tnt_carrier_shipping_first_name" value="{$varShipping.firstName}" /></div>
+                </div>
-		<label>{$lang.address1} : </label>
+            </div>
-		<div class="margin-form"><input type="text" size="20" id="tnt_carrier_shipping_address1" name="tnt_carrier_shipping_address1" value="{$varShipping.address1}" /></div>
+        </div>-->
-		<label>{$lang.address2} : </label>
+        <!--{if $varShipping.collect == '1'}
-		<div class="margin-form"><input type="text" size="20" id="tnt_carrier_shipping_address2" name="tnt_carrier_shipping_address2" value="{$varShipping.address2}" /></div>
+        <h4>{l s='Your informations' mod='tntcarrier'}</h4>
-		<label>{$lang.zip} : </label>
+        {else}
-		<div class="margin-form"><input type="text" size="20" id="tnt_carrier_shipping_postal_code" name="tnt_carrier_shipping_postal_code" value="{$varShipping.zipCode}" /></div>
+        <h4>{l s='Depository agency information' mod='tntcarrier'}</h4>
-		<label>{$lang.city} : </label>
+        {/if}-->
-		<div class="margin-form"><input type="text" size="20" id="tnt_carrier_shipping_city" name="tnt_carrier_shipping_city" value="{$varShipping.city}" /></div><br/>
+        <!--<label>{l s='Pex code' mod='tntcarrier'} : </label>-->
-		<label>{$lang.email} : </label>
+        <div class="margin-form"><input type="hidden" size="20" id="tnt_carrier_shipping_pex" name="tnt_carrier_shipping_pex" value="{$varShipping.pex}" /></div>
-		<div class="margin-form"><input type="text" size="20" name="tnt_carrier_shipping_email" value="{$varShipping.email}" /></div>
+        <label>{l s='Company Name' mod='tntcarrier'} : </label>
-		<label>{$lang.phone} : </label>
+		<div class="margin-form"><input type="text" size="20" id="tnt_carrier_shipping_company" name="tnt_carrier_shipping_company" value="{$varShipping.company}" /> <span style="color:red">*</span></div>
-		<div class="margin-form"><input type="text" size="20" name="tnt_carrier_shipping_phone" value="{$varShipping.phone}" /></div>
+		<!--<div id='tnt_exp_names' style="display:{if $varShipping.collect == '0'}none{/if}">
-		<div id="divClosing" style="display:{if $varShipping.collect == '0'}none{/if}">
+			<label>{l s='Last name' mod='tntcarrier'} : </label>
-			<label>{$lang.closingTime} : </label>
+			<div class="margin-form"><input type="text" size="20" id="tnt_carrier_shipping_last_name" name="tnt_carrier_shipping_last_name" value="{$varShipping.lastName}" /> <span style="color:red">*</div>
-			<div class="margin-form"><input type="text" size="20" name="tnt_carrier_shipping_closing" value="{$varShipping.closing}" /> (HH:MM)</div>
+			<label>{l s='First name' mod='tntcarrier'} : </label>
+			<div class="margin-form"><input type="text" size="20" id="tnt_carrier_shipping_first_name" name="tnt_carrier_shipping_first_name" value="{$varShipping.firstName}" /> <span style="color:red">*</div>
+		</div>-->
+		<label>{l s='Address line 1' mod='tntcarrier'} : </label>
+		<div class="margin-form"><input type="text" size="20" id="tnt_carrier_shipping_address1" name="tnt_carrier_shipping_address1" value="{$varShipping.address1}" /> <span style="color:red">*</div>
+		<label>{l s='Address line 2' mod='tntcarrier'} : </label>
+		<div class="margin-form"><input type="text" size="20" id="tnt_carrier_shipping_address2" name="tnt_carrier_shipping_address2" value="{$varShipping.address2}" /> <span style="color:red">*</div>
+		<label>{l s='Postal Code' mod='tntcarrier'} : </label>
+		<div class="margin-form"><input type="text" size="20" id="tnt_carrier_shipping_postal_code" name="tnt_carrier_shipping_postal_code" value="{$varShipping.zipCode}" /> <span style="color:red">*</div>
+		<label>{l s='City' mod='tntcarrier'} : </label>
+		<div class="margin-form"><input type="text" size="20" id="tnt_carrier_shipping_city" name="tnt_carrier_shipping_city" value="{$varShipping.city}" /> <span style="color:red">*</div>
+		<label>{l s='Company Closing Time' mod='tntcarrier'} : </label>
+		<div class="margin-form"><input type="text" size="20" name="tnt_carrier_shipping_closing" value="{$varShipping.closing}" /> (HH:MM) <span style="color:red">*</div>
+		<br/>
+		<label>{l s='Contact last name' mod='tntcarrier'} : </label>
+		<div class="margin-form"><input type="text" size="20" id="tnt_carrier_shipping_last_name" name="tnt_carrier_shipping_last_name" value="{$varShipping.lastName}" /> <span style="color:red">*</div>
+		<label>{l s='Contact first name' mod='tntcarrier'} : </label>
+		<div class="margin-form"><input type="text" size="20" id="tnt_carrier_shipping_first_name" name="tnt_carrier_shipping_first_name" value="{$varShipping.firstName}" /> <span style="color:red">*</div>
+		<label>{l s='Contact Email Address' mod='tntcarrier'} : </label>
+		<div class="margin-form"><input type="text" size="20" name="tnt_carrier_shipping_email" value="{$varShipping.email}" /> <span style="color:red">*</div>
+		<label>{l s='Contact Phone Number' mod='tntcarrier'} : </label>
+		<div class="margin-form"><input type="text" size="20" name="tnt_carrier_shipping_phone" value="{$varShipping.phone}" /> <span style="color:red">*</div>
+		<!--<div id="divClosing" style="display:{if $varShipping.collect == '0'}none{/if}">
+			<label>{l s='Your Closing Time' mod='tntcarrier'} : </label>
+			<div class="margin-form"><input type="text" size="20" name="tnt_carrier_shipping_closing" value="{$varShipping.closing}" /> (HH:MM) <span style="color:red">*</div>
 			<br/>
-		</div>
+		</div>-->
-		<!--<label>{$lang.saturdayDelivery} : </label>
+		<!--<label>{l s='Saturday Delivery' mod='tntcarrier'} : </label>
 		<div class="margin-form">
-			<input type="radio" id="tnt_carrier_delivery_yes" name="tnt_carrier_shipping_delivery" value="1" '.(Configuration::get('TNT_CARRIER_SHIPPING_DELIVERY') == 1 ? 'checked="checked"' : ''} /> : {$lang.yes}<br/>
+			<input type="radio" id="tnt_carrier_delivery_yes" name="tnt_carrier_shipping_delivery" value="1" '.(Configuration::get('TNT_CARRIER_SHIPPING_DELIVERY') == 1 ? 'checked="checked"' : ''} /> : {l s='Yes' mod='tntcarrier'}<br/>
-			<input type="radio" id="tnt_carrier_delivery_no" name="tnt_carrier_shipping_delivery" value="0" '.(Configuration::get('TNT_CARRIER_SHIPPING_DELIVERY') == 0 ? 'checked="checked"' : ''} /> : {$lang.no}
+			<input type="radio" id="tnt_carrier_delivery_no" name="tnt_carrier_shipping_delivery" value="0" '.(Configuration::get('TNT_CARRIER_SHIPPING_DELIVERY') == 0 ? 'checked="checked"' : ''} /> : {l s='No' mod='tntcarrier'}
 		</div>-->
 		<br/><br/>
-		<label>{$lang.labelFormatPrinting} : </label><br/><br/>
+		<span style="font-weight:bold">{l s='Label Format for printing (This Label will have to be sticked on the package)' mod='tntcarrier'} : </span><br/><br/>
+        <div style="padding-left:210px">
 		<select name="tnt_carrier_print_sticker" value="{$varShipping.sticker}" >
-			<option value="STDA4">{$lang.a4printing}</option>
+			<option value="STDA4">{l s='A4 printing' mod='tntcarrier'}</option>
 			<option value="THERMAL">THERMAL</option>
-			<option value="THERMAL,NO_LOGO">THERMAL {$lang.withoutPrintingLogoTNT}</option>
+			<option value="THERMAL,NO_LOGO">THERMAL {l s='without printing the logo TNT' mod='tntcarrier'}</option>
-			<option value="THERMAL,ROTATE_180">THERMAL {$lang.withReversePrint}</option>
+			<option value="THERMAL,ROTATE_180">THERMAL {l s='with a reverse print' mod='tntcarrier'}</option>
-			<option value="THERMAL,NO_LOGO,ROTATE_180">THERMAL {$lang.withoutPrintingLogoTNTWithReversePrint}</option>
+			<option value="THERMAL,NO_LOGO,ROTATE_180">THERMAL {l s='without printing the logo TNT and with a reverse print' mod='tntcarrier'}</option>
-		</select><br/><br/>
+		</select></div><br/><br/>
-		<div class="margin-form"><input class="button" name="submitSave" type="submit"></div>
+		<div class="margin-form"><input class="button" name="submitSave" type="submit" value="{l s='save' mod='tntcarrier'}"></div>
 	</form>
+<span style="color:red">* : {l s='Required fields' mod='tntcarrier'}</span>
 </fieldset>

modules/tntcarrier/tpl/waitingFollow.tpl

@@ -15,7 +15,6 @@
 				}
 			);
 		}
-	/**/
 	});
 </script>
 <div id="followPackage" style="clear:both">