TNT_Express_Fr - Version 2.0.5

Version Notes

Extension officielle vous permettant de proposer les services TNT à vos clients.

- suppression de la ligne "Choisissez votre Relais Colis" lors de la sélection du mode entreprise.
- comparaison de la ville saisie correspondante au CP avec les villes renvoyées par le WS, si correspondance on n'affiche pas les choix retournés par le WS.
- traitement du format "0033"

Download this release

Release Info

Developer Magento Core Team
Extension TNT_Express_Fr
Version 2.0.5
Comparing to
See all releases


Code changes from version 2.0.2 to 2.0.5

Files changed (46) hide show
  1. app/code/community/Infostrates/Tnt/Model/Shipping/Carrier/Tnt.php +116 -75
  2. app/code/community/Infostrates/Tnt/Model/Shipping/Carrier/Tnt/Source/Method.php +2 -2
  3. app/code/community/Infostrates/Tnt/Model/Shipping/Carrier/Tnt/Source/Tntmaxweight.php +65 -0
  4. app/code/community/Infostrates/Tnt/controllers/Sales/Order/ShipmentController.php +3 -0
  5. app/code/community/Infostrates/Tnt/controllers/TntController.php +12 -1
  6. app/code/community/Infostrates/Tnt/etc/config.xml +2 -1
  7. app/code/community/Infostrates/Tnt/etc/system.xml +12 -2
  8. app/code/community/Infostrates/Tnt/sql/tnt_setup/mysql4-upgrade-2.0.1-2.0.3.php +11 -0
  9. app/design/frontend/default/default/template/tnt/onepage/shipping_method/available.phtml +6 -6
  10. package.xml +9 -8
  11. skin/frontend/default/default/css/tnt/jquery.superbox.css +19 -1
  12. skin/frontend/default/default/css/tnt/tntB2CRelaisColis.css +11 -10
  13. skin/frontend/default/default/css/tnt/tntB2CSuiviColis.css +2 -2
  14. skin/frontend/default/default/css/tnt/ui.tabs.css +4 -4
  15. skin/frontend/default/default/images/tnt/24h_domicile.jpg +0 -0
  16. skin/frontend/default/default/images/tnt/24h_entreprise.jpg +0 -0
  17. skin/frontend/default/default/images/tnt/24h_relais.jpg +0 -0
  18. skin/frontend/default/default/images/tnt/_24h_relais.jpg +0 -0
  19. skin/frontend/default/default/images/tnt/_tnt_j.png +0 -0
  20. skin/frontend/default/default/images/tnt/_tnt_jd.png +0 -0
  21. skin/frontend/default/default/images/tnt/_tnt_jz.png +0 -0
  22. skin/frontend/default/default/images/tnt/relaisColis/24_relaiscolis.jpg +0 -0
  23. skin/frontend/default/default/images/tnt/relaisColis/_logo_24_chezmoi.jpg +0 -0
  24. skin/frontend/default/default/images/tnt/relaisColis/_logo_24_relaiscolis.jpg +0 -0
  25. skin/frontend/default/default/images/tnt/relaisColis/_logo_24h_chezmoi_RVB.gif +0 -0
  26. skin/frontend/default/default/images/tnt/relaisColis/_logo_24h_relaiscolis_RVB.gif +0 -0
  27. skin/frontend/default/default/images/tnt/relaisColis/_logos_24.jpg +0 -0
  28. skin/frontend/default/default/images/tnt/relaisColis/bt-CodePostal.jpg +0 -0
  29. skin/frontend/default/default/images/tnt/relaisColis/bt-Continuer.jpg +0 -0
  30. skin/frontend/default/default/images/tnt/relaisColis/bt-OK.jpg +0 -0
  31. skin/frontend/default/default/images/tnt/relaisColis/google/relaisColis2.png +0 -0
  32. skin/frontend/default/default/images/tnt/relaisColis/logo_24_chezmoi.jpg +0 -0
  33. skin/frontend/default/default/images/tnt/relaisColis/logo_24_relaiscolis.jpg +0 -0
  34. skin/frontend/default/default/images/tnt/relaisColis/logo_24h_chezmoi_RVB.gif +0 -0
  35. skin/frontend/default/default/images/tnt/relaisColis/logo_24h_relaiscolis_RVB.gif +0 -0
  36. skin/frontend/default/default/images/tnt/relaisColis/logos_24.jpg +0 -0
  37. skin/frontend/default/default/images/tnt/relaisColis/loupe.gif +0 -0
  38. skin/frontend/default/default/images/tnt/relaisColis/picto-delai.gif +0 -0
  39. skin/frontend/default/default/images/tnt/tnt_j.png +0 -0
  40. skin/frontend/default/default/images/tnt/tnt_jd.png +0 -0
  41. skin/frontend/default/default/images/tnt/tnt_jz.png +0 -0
  42. skin/frontend/default/default/js/tnt/relaisColis.js +7 -7
  43. skin/frontend/default/default/js/tnt/relaisColisIE7.js +6 -6
  44. skin/frontend/default/default/js/tnt/suiviColis.js +2 -2
  45. skin/frontend/default/default/js/tnt/tnt.js +11 -5
  46. skin/frontend/default/default/tnt_relaisColis.php +6 -2
app/code/community/Infostrates/Tnt/Model/Shipping/Carrier/Tnt.php CHANGED
@@ -7,30 +7,47 @@ implements Mage_Shipping_Model_Carrier_Interface
7
 
8
  protected $_code = 'tnt';
9
  protected $_request = null;
10
- protected $_result = null;
11
 
12
  public function collectRates(Mage_Shipping_Model_Rate_Request $request)
13
- {
14
  $quote = Mage::getSingleton('checkout/session')->getQuote();
15
 
16
  if (!$this->getConfigFlag('active') || $quote->getShippingAddress()->getCountryId() != 'FR') {
17
  return false;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
18
  }
19
 
20
- if( date('D') == 'Sat' ) {
21
- $date = date('Y-m-d', mktime(0, 0, 0, date("m") , date("d")+2, date("Y")));
22
-
23
- } elseif( date('D') == 'Sun' ) {
24
- $date = date('Y-m-d', mktime(0, 0, 0, date("m") , date("d")+1, date("Y")));
25
  } else {
26
- $date = date('Y-m-d');
27
  }
28
  //vérification des informations du compte saisies dans l'admin
29
  $sender = array('zipCode' => $this->getConfigData('code_postal'), 'city' => $this->getConfigData('ville'));
30
- $receiver = array('zipCode' => $this->getConfigData('code_postal'), 'city' => $this->getConfigData('ville'));
31
  $feasi_params = array('shippingDate' => $date, 'accountNumber' => $this->getConfigData('account'), 'sender' => $sender, 'receiver' => $receiver );
32
  $feasi_result = Mage::getModel('tnt/shipping_carrier_tnt')->_tnt_feasibility( $feasi_params );
33
-
34
  if( is_string($feasi_result) ) {
35
  return false;
36
  }
@@ -121,30 +138,30 @@ implements Mage_Shipping_Model_Carrier_Interface
121
  </wsse:UsernameToken>
122
  </wsse:Security>', htmlspecialchars($username), htmlspecialchars( $password ));
123
 
124
- $authvars = new SoapVar($authheader, XSD_ANYXML);
125
- $header = new SoapHeader("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd", "Security", $authvars);
126
 
127
- $soap = new SoapClient($url, array('trace'=>1));
128
- $soap->__setSOAPHeaders(array($header));
129
 
130
- try {
131
- if($fonction == 'feasibility') {
132
- $result = $soap->feasibility( array('parameters' => $parametres) );
133
- }
134
- if($fonction == 'dropOffPoints') {
135
- $result = $soap->dropOffPoints($parametres);
136
- }
137
- if($fonction == 'citiesGuide') {
138
- $result = $soap->citiesGuide($parametres);
139
- }
140
- if($fonction == 'expeditionCreation') {
141
- $result = $soap->expeditionCreation( $parametres );
142
- }
143
- } catch (Exception $e) {
144
- $result = $e->getMessage();
145
  }
146
-
147
- return $result;
 
 
 
 
 
 
 
 
 
 
 
 
148
  }
149
 
150
  /*
@@ -152,7 +169,7 @@ implements Mage_Shipping_Model_Carrier_Interface
152
  * $params = array(params,array sender,array receiver)
153
  */
154
  public function _tnt_feasibility($params)
155
- {
156
  $debugData = array();
157
  $fonction = 'feasibility';
158
  $results = array();
@@ -167,7 +184,7 @@ implements Mage_Shipping_Model_Carrier_Interface
167
 
168
  if ($nb > 1) {
169
  // Cas où une liste de services est renvoyée
170
- foreach ($result->Service as $Service) {
171
  $results[] = array("serviceCode" => $Service->serviceCode, "serviceLabel" => $Service->serviceLabel." (".$Service->dueDate.")");
172
  }
173
  } elseif($nb == 1) {
@@ -178,7 +195,7 @@ implements Mage_Shipping_Model_Carrier_Interface
178
  }
179
  }
180
 
181
- $this->_debug($debugData);
182
 
183
  return $results;
184
  }
@@ -186,7 +203,7 @@ implements Mage_Shipping_Model_Carrier_Interface
186
  //Retourne les services choisis par le commercant
187
  protected function _parseTntFeasibilityResponse($servicesDispos)
188
  {
189
- $already_showed = array();
190
 
191
  $result = Mage::getModel('shipping/rate_result');
192
  $rate = Mage::getModel('shipping/rate_result_method');
@@ -200,9 +217,28 @@ implements Mage_Shipping_Model_Carrier_Interface
200
 
201
  $items = Mage::getSingleton('checkout/session')->getQuote()->getAllItems();
202
  $shipping_weight = 0;
 
203
  foreach($items as $item) {
 
 
 
 
204
  $shipping_weight += ($item->getWeight() * $item->getQty()) ;
 
 
 
 
 
 
 
 
 
 
205
  }
 
 
 
 
206
 
207
  if (empty($servicesDispos)) {
208
  $error = Mage::getModel('shipping/rate_result_error');
@@ -212,48 +248,53 @@ implements Mage_Shipping_Model_Carrier_Interface
212
  $result->append($error);
213
  } else {
214
  foreach ($servicesDispos as $m) {
215
- if(in_array($m['serviceLabel'],$already_showed)) { continue; } else { $already_showed[] = $m['serviceLabel']; }
216
-
217
- $rate = Mage::getModel('shipping/rate_result_method');
218
- $rate->setCarrier($this->_code);
219
- $rate->setCarrierTitle($this->getConfigData('title'));
220
- $rate->setMethod( $m['serviceCode'] );
221
- $rate->setMethodTitle( $m['serviceLabel'] );
222
- $rate->setMethodDescription( $m['serviceDescription']."|||".$m['serviceLien']."|||".$m['serviceLogo'] );
223
-
224
- if( $this->getConfigData($m['serviceCode'].'_free') != 0 && $this->getConfigData($m['serviceCode'].'_free') <= $totalCart ) {
225
- $tarif = '0';
226
- } else {
227
- $table = split("[:,]" , $this->getConfigData($m['serviceCode'].'_amount'));
228
- $tarifTrouve=true;
229
- //si le commercant choisi un forfait plutot qu'une table de correspondance poids:prix
230
- if(count($table) == 1) {
231
- $tarif = $table[0];
232
- } else {
233
- for ($i = 0; $i < sizeof($table); $i+=2) {
234
- if ($shipping_weight > $table[$i])
235
- continue;
236
- if (($shipping_weight <= $table[$i]) AND $tarifTrouve) {
237
- $tarif=$table[$i+1];
238
- $tarifTrouve=false;
239
- }
 
 
 
 
 
240
  }
241
- }
242
- }
243
-
244
- //si il s'agit d'un envoi vers la Corse je gère le supplément
245
- $cp = Mage::getSingleton('checkout/session')->getQuote()->getShippingAddress()->getPostcode();
246
- $cp_tmp = substr($cp, 0, 3);
247
- if( $cp_tmp == '200' || $cp_tmp == '201' || $cp_tmp == '202' ) {
248
- if( $this->getConfigData('corse_free') != 0 && $this->getConfigData('corse_free') <= $totalCart ) {
249
- //$tarif = $tarif;
250
- } else {
251
- $tarif += $this->getConfigData('corse_amount');
252
  }
253
- }
254
-
255
- $rate->setPrice( $tarif );
256
- $result->append($rate);
 
 
 
 
 
 
 
 
 
 
 
257
  }
258
  }
259
 
7
 
8
  protected $_code = 'tnt';
9
  protected $_request = null;
10
+ protected $_result = null;
11
 
12
  public function collectRates(Mage_Shipping_Model_Rate_Request $request)
13
+ {
14
  $quote = Mage::getSingleton('checkout/session')->getQuote();
15
 
16
  if (!$this->getConfigFlag('active') || $quote->getShippingAddress()->getCountryId() != 'FR') {
17
  return false;
18
+ }
19
+
20
+ //corrige le bug de la fonction date() de PHP dans Magento par l'utilisation du timestamp de magento...
21
+ //$timestamp = Mage::getModel('core/date')->timestamp(time());
22
+
23
+ //permet de passer outre les jours fériés en imposant le 10/01/xx à la faisabilité TNT
24
+ $currentTimestamp = Mage::getModel('core/date')->timestamp(time());
25
+ $currentYear = date('Y', $currentTimestamp);
26
+
27
+ $anyDate = $currentYear.'-01-10 00:00:00';
28
+ $dateTimestamp = Mage::getModel('core/date')->timestamp(strtotime($anyDate));
29
+
30
+ if( $currentTimestamp < $dateTimestamp ) {
31
+ $timestamp = Mage::getModel('core/date')->timestamp(strtotime($anyDate));
32
+ } else {
33
+ $currentYear++;
34
+ $anyDate = $currentYear.'-01-10 00:00:00';
35
+ $timestamp = Mage::getModel('core/date')->timestamp(strtotime($anyDate));
36
  }
37
 
38
+ if( date('D', $timestamp) == 'Sat' ) {
39
+ $date = date('Y-m-d', mktime(0, 0, 0, date("m",$timestamp) , date("d",$timestamp)+2, date("Y",$timestamp)));
40
+ } elseif( date('D',$timestamp) == 'Sun' ) {
41
+ $date = date('Y-m-d', mktime(0, 0, 0, date("m",$timestamp) , date("d",$timestamp)+1, date("Y",$timestamp)));
 
42
  } else {
43
+ $date = date('Y-m-d',$timestamp);
44
  }
45
  //vérification des informations du compte saisies dans l'admin
46
  $sender = array('zipCode' => $this->getConfigData('code_postal'), 'city' => $this->getConfigData('ville'));
47
+ $receiver = array('zipCode' => $this->getConfigData('code_postal'), 'city' => $this->getConfigData('ville'));
48
  $feasi_params = array('shippingDate' => $date, 'accountNumber' => $this->getConfigData('account'), 'sender' => $sender, 'receiver' => $receiver );
49
  $feasi_result = Mage::getModel('tnt/shipping_carrier_tnt')->_tnt_feasibility( $feasi_params );
50
+
51
  if( is_string($feasi_result) ) {
52
  return false;
53
  }
138
  </wsse:UsernameToken>
139
  </wsse:Security>', htmlspecialchars($username), htmlspecialchars( $password ));
140
 
141
+ $authvars = new SoapVar($authheader, XSD_ANYXML);
142
+ $header = new SoapHeader("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd", "Security", $authvars);
143
 
144
+ $soap = new SoapClient($url, array('trace'=>1));
145
+ $soap->__setSOAPHeaders(array($header));
146
 
147
+ try {
148
+ if($fonction == 'feasibility') {
149
+ $result = $soap->feasibility( array('parameters' => $parametres) );
 
 
 
 
 
 
 
 
 
 
 
 
150
  }
151
+ if($fonction == 'dropOffPoints') {
152
+ $result = $soap->dropOffPoints( $parametres );
153
+ }
154
+ if($fonction == 'citiesGuide') {
155
+ $result = $soap->citiesGuide( $parametres );
156
+ }
157
+ if($fonction == 'expeditionCreation') {
158
+ $result = $soap->expeditionCreation( $parametres );
159
+ }
160
+ } catch (Exception $e) {
161
+ $result = $e->getMessage();
162
+ }
163
+
164
+ return $result;
165
  }
166
 
167
  /*
169
  * $params = array(params,array sender,array receiver)
170
  */
171
  public function _tnt_feasibility($params)
172
+ {
173
  $debugData = array();
174
  $fonction = 'feasibility';
175
  $results = array();
184
 
185
  if ($nb > 1) {
186
  // Cas où une liste de services est renvoyée
187
+ foreach ($result->Service as $Service) {
188
  $results[] = array("serviceCode" => $Service->serviceCode, "serviceLabel" => $Service->serviceLabel." (".$Service->dueDate.")");
189
  }
190
  } elseif($nb == 1) {
195
  }
196
  }
197
 
198
+ $this->_debug($debugData);
199
 
200
  return $results;
201
  }
203
  //Retourne les services choisis par le commercant
204
  protected function _parseTntFeasibilityResponse($servicesDispos)
205
  {
206
+ $already_showed = array();
207
 
208
  $result = Mage::getModel('shipping/rate_result');
209
  $rate = Mage::getModel('shipping/rate_result_method');
217
 
218
  $items = Mage::getSingleton('checkout/session')->getQuote()->getAllItems();
219
  $shipping_weight = 0;
220
+ $heaviest_item = 0;
221
  foreach($items as $item) {
222
+ //check l'article le plus lourd
223
+ if( $item->getWeight() > $heaviest_item) {
224
+ $heaviest_item = $item->getWeight();
225
+ }
226
  $shipping_weight += ($item->getWeight() * $item->getQty()) ;
227
+ }
228
+
229
+ //si le poids total du colis dépasse la limite pour TNT (définie par le commercant)
230
+ if( $shipping_weight > $this->getConfigData('tnt_max_weight') ) {
231
+ return $result;
232
+ }
233
+
234
+ $filter_jdjz = 0;
235
+ if( $heaviest_item > ($this->getConfigData('max_package_weight')-10) ) { // > 20 je ne propose pas JD/JZ
236
+ $filter_jdjz = 1;
237
  }
238
+
239
+ if( $heaviest_item > $this->getConfigData('max_package_weight') ) { // > 30 je ne propose pas J/A, donc je ne propose pas de produits TNT
240
+ return $result;
241
+ }
242
 
243
  if (empty($servicesDispos)) {
244
  $error = Mage::getModel('shipping/rate_result_error');
248
  $result->append($error);
249
  } else {
250
  foreach ($servicesDispos as $m) {
251
+
252
+ if( $filter_jdjz == 1 && ($m['serviceCode'] == 'JZ' || $m['serviceCode'] == 'JD') ) {
253
+ //on n'ajoute pas de le service
254
+ } else {
255
+ if(in_array($m['serviceLabel'],$already_showed)) { continue; } else { $already_showed[] = $m['serviceLabel']; }
256
+
257
+ $rate = Mage::getModel('shipping/rate_result_method');
258
+ $rate->setCarrier($this->_code);
259
+ $rate->setCarrierTitle($this->getConfigData('title'));
260
+ $rate->setMethod( $m['serviceCode'] );
261
+ $rate->setMethodTitle( $m['serviceLabel'] );
262
+ $rate->setMethodDescription( $m['serviceDescription']."|||".$m['serviceLien']."|||".$m['serviceLogo'] );
263
+
264
+ if( $this->getConfigData($m['serviceCode'].'_free') != 0 && $this->getConfigData($m['serviceCode'].'_free') <= $totalCart ) {
265
+ $tarif = '0';
266
+ } else {
267
+ $table = split("[:,]" , $this->getConfigData($m['serviceCode'].'_amount'));
268
+ $tarifTrouve=true;
269
+ //si le commercant choisi un forfait plutot qu'une table de correspondance poids:prix
270
+ if(count($table) == 1) {
271
+ $tarif = $table[0];
272
+ } else {
273
+ for ($i = 0; $i < sizeof($table); $i+=2) {
274
+ if ($shipping_weight > $table[$i])
275
+ continue;
276
+ if (($shipping_weight <= $table[$i]) AND $tarifTrouve) {
277
+ $tarif=$table[$i+1];
278
+ $tarifTrouve=false;
279
+ }
280
+ }
281
  }
 
 
 
 
 
 
 
 
 
 
 
282
  }
283
+
284
+ //si il s'agit d'un envoi vers la Corse je gère le supplément
285
+ $cp = Mage::getSingleton('checkout/session')->getQuote()->getShippingAddress()->getPostcode();
286
+ $cp_tmp = substr($cp, 0, 3);
287
+ if( $cp_tmp == '200' || $cp_tmp == '201' || $cp_tmp == '202' ) {
288
+ if( $this->getConfigData('corse_free') != 0 && $this->getConfigData('corse_free') <= $totalCart ) {
289
+ //$tarif = $tarif;
290
+ } else {
291
+ $tarif += $this->getConfigData('corse_amount');
292
+ }
293
+ }
294
+
295
+ $rate->setPrice( $tarif );
296
+ $result->append($rate);
297
+ }
298
  }
299
  }
300
 
app/code/community/Infostrates/Tnt/Model/Shipping/Carrier/Tnt/Source/Method.php CHANGED
@@ -9,7 +9,7 @@ class Infostrates_Tnt_Model_Shipping_Carrier_Tnt_Source_Method
9
  'value'=>'JZ',
10
  'label'=>Mage::helper('tnt')->__('TNT 24h à Domicile : Votre colis livré demain matin chez vous.'),
11
  'description'=>Mage::helper('tnt')->__("Livraison en main propre contre signature, en 24h après expédition de votre commande, et avant 13h*, du lundi au samedi* de 8H à 13H**. En cas d'absence ou d'impossibilité de livraison, le colis est déposé dans le Relais Colis® le plus proche, et vous pouvez le retirer le jour même dès 14h."),
12
- 'lien'=> 'http://www.tnt.fr/BtoC/page_domicile.html',
13
  'logo'=> 'tnt_jz.png'),
14
  array(
15
  'value'=>'J',
@@ -21,7 +21,7 @@ class Infostrates_Tnt_Model_Shipping_Carrier_Tnt_Source_Method
21
  'value'=>'JD',
22
  'label'=>Mage::helper('tnt')->__('TNT 24h en Relais Colis® : Votre colis livré demain matin dans le Relais Colis® de votre choix.'),
23
  'description'=>Mage::helper('tnt')->__("Livraison en 24h, après expédition de votre commande, dans l'un des 4000 Relais Colis® partout en France métropolitaine. Retrait possible dés 14h et distribution après vérification d’une pièce d'identité et contre signature."),
24
- 'lien'=> "http://www.tnt.fr/BtoC/page_relais-colis.html",
25
  'logo'=> 'tnt_jd.png'),
26
  );
27
  }
9
  'value'=>'JZ',
10
  'label'=>Mage::helper('tnt')->__('TNT 24h à Domicile : Votre colis livré demain matin chez vous.'),
11
  'description'=>Mage::helper('tnt')->__("Livraison en main propre contre signature, en 24h après expédition de votre commande, et avant 13h*, du lundi au samedi* de 8H à 13H**. En cas d'absence ou d'impossibilité de livraison, le colis est déposé dans le Relais Colis® le plus proche, et vous pouvez le retirer le jour même dès 14h."),
12
+ 'lien'=> 'images/tnt/24h_domicile.jpg',
13
  'logo'=> 'tnt_jz.png'),
14
  array(
15
  'value'=>'J',
21
  'value'=>'JD',
22
  'label'=>Mage::helper('tnt')->__('TNT 24h en Relais Colis® : Votre colis livré demain matin dans le Relais Colis® de votre choix.'),
23
  'description'=>Mage::helper('tnt')->__("Livraison en 24h, après expédition de votre commande, dans l'un des 4000 Relais Colis® partout en France métropolitaine. Retrait possible dés 14h et distribution après vérification d’une pièce d'identité et contre signature."),
24
+ 'lien'=> "images/tnt/24h_relais.jpg",
25
  'logo'=> 'tnt_jd.png'),
26
  );
27
  }
app/code/community/Infostrates/Tnt/Model/Shipping/Carrier/Tnt/Source/Tntmaxweight.php ADDED
@@ -0,0 +1,65 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ class Infostrates_Tnt_Model_Shipping_Carrier_Tnt_Source_Tntmaxweight
4
+ {
5
+ public function toOptionArray()
6
+ {
7
+ return array(
8
+ array( 'value'=>'1', 'label'=>'1'),
9
+ array( 'value'=>'2', 'label'=>'2'),
10
+ array( 'value'=>'3', 'label'=>'3'),
11
+ array( 'value'=>'4', 'label'=>'4'),
12
+ array( 'value'=>'5', 'label'=>'5'),
13
+ array( 'value'=>'6', 'label'=>'6'),
14
+ array( 'value'=>'7', 'label'=>'7'),
15
+ array( 'value'=>'8', 'label'=>'8'),
16
+ array( 'value'=>'9', 'label'=>'9'),
17
+ array( 'value'=>'10', 'label'=>'10'),
18
+ array( 'value'=>'11', 'label'=>'11'),
19
+ array( 'value'=>'12', 'label'=>'12'),
20
+ array( 'value'=>'13', 'label'=>'13'),
21
+ array( 'value'=>'14', 'label'=>'14'),
22
+ array( 'value'=>'15', 'label'=>'15'),
23
+ array( 'value'=>'16', 'label'=>'16'),
24
+ array( 'value'=>'17', 'label'=>'17'),
25
+ array( 'value'=>'18', 'label'=>'18'),
26
+ array( 'value'=>'19', 'label'=>'19'),
27
+ array( 'value'=>'20', 'label'=>'20'),
28
+ array( 'value'=>'21', 'label'=>'21'),
29
+ array( 'value'=>'22', 'label'=>'22'),
30
+ array( 'value'=>'23', 'label'=>'23'),
31
+ array( 'value'=>'24', 'label'=>'24'),
32
+ array( 'value'=>'25', 'label'=>'25'),
33
+ array( 'value'=>'26', 'label'=>'26'),
34
+ array( 'value'=>'27', 'label'=>'27'),
35
+ array( 'value'=>'28', 'label'=>'28'),
36
+ array( 'value'=>'29', 'label'=>'29'),
37
+ array( 'value'=>'30', 'label'=>'30'),
38
+ array( 'value'=>'31', 'label'=>'31'),
39
+ array( 'value'=>'32', 'label'=>'32'),
40
+ array( 'value'=>'33', 'label'=>'33'),
41
+ array( 'value'=>'34', 'label'=>'34'),
42
+ array( 'value'=>'35', 'label'=>'35'),
43
+ array( 'value'=>'36', 'label'=>'36'),
44
+ array( 'value'=>'37', 'label'=>'37'),
45
+ array( 'value'=>'38', 'label'=>'38'),
46
+ array( 'value'=>'39', 'label'=>'39'),
47
+ array( 'value'=>'40', 'label'=>'40'),
48
+ array( 'value'=>'41', 'label'=>'41'),
49
+ array( 'value'=>'42', 'label'=>'42'),
50
+ array( 'value'=>'43', 'label'=>'43'),
51
+ array( 'value'=>'44', 'label'=>'44'),
52
+ array( 'value'=>'45', 'label'=>'45'),
53
+ array( 'value'=>'46', 'label'=>'46'),
54
+ array( 'value'=>'47', 'label'=>'47'),
55
+ array( 'value'=>'48', 'label'=>'48'),
56
+ array( 'value'=>'49', 'label'=>'49'),
57
+ array( 'value'=>'50', 'label'=>'50'),
58
+ array( 'value'=>'60', 'label'=>'60'),
59
+ array( 'value'=>'70', 'label'=>'70'),
60
+ array( 'value'=>'80', 'label'=>'80'),
61
+ array( 'value'=>'90', 'label'=>'90'),
62
+ array( 'value'=>'100', 'label'=>'100')
63
+ );
64
+ }
65
+ }
app/code/community/Infostrates/Tnt/controllers/Sales/Order/ShipmentController.php CHANGED
@@ -114,6 +114,9 @@ class Infostrates_Tnt_Sales_Order_ShipmentController extends Mage_Adminhtml_Sale
114
  }
115
 
116
  $phoneNumber = str_replace(' ', '', $phoneNumber);
 
 
 
117
  $phoneNumber = str_replace('+33', '0', $phoneNumber);
118
  $phoneNumber = str_replace('(+33)', '0', $phoneNumber);
119
  $phoneNumber = str_replace('-', '', $phoneNumber);
114
  }
115
 
116
  $phoneNumber = str_replace(' ', '', $phoneNumber);
117
+ if( preg_match('/^0033/', $phoneNumber) ) {
118
+ $phoneNumber = substr_replace($phoneNumber, '0', 0, 4);
119
+ }
120
  $phoneNumber = str_replace('+33', '0', $phoneNumber);
121
  $phoneNumber = str_replace('(+33)', '0', $phoneNumber);
122
  $phoneNumber = str_replace('-', '', $phoneNumber);
app/code/community/Infostrates/Tnt/controllers/TntController.php CHANGED
@@ -2,7 +2,7 @@
2
  require_once ('app/code/core/Mage/Core/Controller/Front/Action.php');
3
 
4
  class Infostrates_Tnt_TntController extends Mage_Core_Controller_Front_Action {
5
-
6
  public function indexAction() {
7
  $zipcode = $this->getRequest ()->getParam ( 'zipcode' );
8
  $zipcode = trim(urldecode($zipcode));
@@ -147,6 +147,12 @@ class Infostrates_Tnt_TntController extends Mage_Core_Controller_Front_Action {
147
  if(count($allVilles) > 1) {
148
  $html.= '<label>' . Mage::helper ( 'tnt' )->__ ( 'Choisissez précisemment la ville de livraison' ) . ': </label><ul>';
149
  foreach ( $allVilles as $ville ) {
 
 
 
 
 
 
150
  ++ $offset;
151
  if ($offset <= 50) {
152
  $html.= '<li>
@@ -158,6 +164,11 @@ class Infostrates_Tnt_TntController extends Mage_Core_Controller_Front_Action {
158
  }
159
  }
160
  $html.='</ul>';
 
 
 
 
 
161
  } else {
162
  $html.= '<input name="tnt_ville" type="radio" id="tnt_ville1" class="radio" value="'.$street.'&&&'.$company.'&&&'.$zipcode.'&&&'.$allVilles[0]['name'].'" checked="checked" style="display:none;" />';
163
  }
2
  require_once ('app/code/core/Mage/Core/Controller/Front/Action.php');
3
 
4
  class Infostrates_Tnt_TntController extends Mage_Core_Controller_Front_Action {
5
+
6
  public function indexAction() {
7
  $zipcode = $this->getRequest ()->getParam ( 'zipcode' );
8
  $zipcode = trim(urldecode($zipcode));
147
  if(count($allVilles) > 1) {
148
  $html.= '<label>' . Mage::helper ( 'tnt' )->__ ( 'Choisissez précisemment la ville de livraison' ) . ': </label><ul>';
149
  foreach ( $allVilles as $ville ) {
150
+
151
+ if( $ville['name'] == strtoupper($city) ) {
152
+ $correspondance = '<input name="tnt_ville" type="radio" id="tnt_ville1" class="radio" value="'.$street.'&&&'.$company.'&&&'.$zipcode.'&&&'.$ville['name'].'" checked="checked" style="display:none;" />';
153
+ break;
154
+ }
155
+
156
  ++ $offset;
157
  if ($offset <= 50) {
158
  $html.= '<li>
164
  }
165
  }
166
  $html.='</ul>';
167
+
168
+ if( isset($correspondance) ) {
169
+ $html = $correspondance;
170
+ }
171
+
172
  } else {
173
  $html.= '<input name="tnt_ville" type="radio" id="tnt_ville1" class="radio" value="'.$street.'&&&'.$company.'&&&'.$zipcode.'&&&'.$allVilles[0]['name'].'" checked="checked" style="display:none;" />';
174
  }
app/code/community/Infostrates/Tnt/etc/config.xml CHANGED
@@ -3,7 +3,7 @@
3
  <config>
4
  <modules>
5
  <Infostrates_Tnt>
6
- <version>2.0.1</version>
7
  <depends>
8
  <Mage_Adminhtml />
9
  <Mage_Shipping />
@@ -186,6 +186,7 @@
186
  <active>0</active>
187
  <label_format>STDA4</label_format>
188
  <tracking_url>http://www.tnt.fr/public/suivi_colis/recherche/visubontransport.do?bonTransport=</tracking_url>
 
189
  <J_amount>10:23.90,20:52.30,1000:99</J_amount>
190
  <JZ_amount>10:23.90,20:52.30,1000:99</JZ_amount>
191
  <JD_amount>10:23.90,20:52.30,1000:99</JD_amount>
3
  <config>
4
  <modules>
5
  <Infostrates_Tnt>
6
+ <version>2.0.5</version>
7
  <depends>
8
  <Mage_Adminhtml />
9
  <Mage_Shipping />
186
  <active>0</active>
187
  <label_format>STDA4</label_format>
188
  <tracking_url>http://www.tnt.fr/public/suivi_colis/recherche/visubontransport.do?bonTransport=</tracking_url>
189
+ <tnt_max_weight>60</tnt_max_weight>
190
  <J_amount>10:23.90,20:52.30,1000:99</J_amount>
191
  <JZ_amount>10:23.90,20:52.30,1000:99</JZ_amount>
192
  <JD_amount>10:23.90,20:52.30,1000:99</JD_amount>
app/code/community/Infostrates/Tnt/etc/system.xml CHANGED
@@ -119,11 +119,21 @@
119
  <sort_order>16</sort_order>
120
  <show_in_default>1</show_in_default>
121
  <show_in_website>1</show_in_website>
 
 
 
 
 
 
 
 
 
122
  <show_in_store>0</show_in_store>
123
- </label_format>
 
124
  <JZ_amount>
125
  <label>TNT 24h à Domicile</label>
126
- <frontend_type>text</frontend_type>
127
  <sort_order>23</sort_order>
128
  <show_in_default>1</show_in_default>
129
  <show_in_website>1</show_in_website>
119
  <sort_order>16</sort_order>
120
  <show_in_default>1</show_in_default>
121
  <show_in_website>1</show_in_website>
122
+ <show_in_store>0</show_in_store>
123
+ </label_format>
124
+ <tnt_max_weight>
125
+ <label>Poids maximum pour TNT</label>
126
+ <frontend_type>select</frontend_type>
127
+ <source_model>tnt/shipping_carrier_tnt_source_tntmaxweight</source_model>
128
+ <sort_order>17</sort_order>
129
+ <show_in_default>1</show_in_default>
130
+ <show_in_website>1</show_in_website>
131
  <show_in_store>0</show_in_store>
132
+ <comment>Au dessus de ce poids les produits TNT de seront pas proposés au client</comment>
133
+ </tnt_max_weight>
134
  <JZ_amount>
135
  <label>TNT 24h à Domicile</label>
136
+ <frontend_type>text</frontend_type>
137
  <sort_order>23</sort_order>
138
  <show_in_default>1</show_in_default>
139
  <show_in_website>1</show_in_website>
app/code/community/Infostrates/Tnt/sql/tnt_setup/mysql4-upgrade-2.0.1-2.0.3.php ADDED
@@ -0,0 +1,11 @@
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ $installer = $this;
3
+ $installer->startSetup();
4
+
5
+ $installer->run("
6
+ INSERT INTO {$installer->getTable('core/config_data')} (path,value) VALUES ('carriers/tnt/tnt_max_weight','60');
7
+ UPDATE {$installer->getTable('core/config_data')} SET path = 'carriers/tnt/max_package_weight', value = '30' WHERE path = 'carriers/tnt/max_package_weight';
8
+ ");
9
+
10
+ $installer->endSetup();
11
+ ?>
app/design/frontend/default/default/template/tnt/onepage/shipping_method/available.phtml CHANGED
@@ -91,11 +91,11 @@
91
  <span>
92
  <?php echo $tmp_desc['0']; ?>
93
  <?php if( $tmp_desc['1'] != '' ) {
94
- if($_rate->getCode() == 'tnt_J') { ?>
95
  &nbsp;<a href="<?php echo $this->getSkinUrl($tmp_desc['1']); ?>" rel="superbox[image]" class="moreInfos">+ d'infos</a>
96
- <?php } else { ?>
97
  &nbsp;<a href="<?php echo $tmp_desc['1']; ?>" rel="superbox[iframe]" class="moreInfos">+ d'infos</a>
98
- <?php }?>
99
  <?php } ?>
100
  </span>
101
  <div style="clear:both;"></div>
@@ -262,11 +262,11 @@
262
  <span>
263
  <?php echo $tmp_desc['0']; ?>
264
  <?php if( $tmp_desc['1'] != '' ) {
265
- if($_rate->getCode() == 'tnt_J') { ?>
266
  &nbsp;<a href="<?php echo $this->getSkinUrl($tmp_desc['1']); ?>" rel="superbox[image]" class="moreInfos">+ d'infos</a>
267
- <?php } else { ?>
268
  &nbsp;<a href="<?php echo $tmp_desc['1']; ?>" rel="superbox[iframe]" class="moreInfos">+ d'infos</a>
269
- <?php }?>
270
  <?php } ?>
271
  </span>
272
  <div style="clear:both;"></div>
91
  <span>
92
  <?php echo $tmp_desc['0']; ?>
93
  <?php if( $tmp_desc['1'] != '' ) {
94
+ //if($_rate->getCode() == 'tnt_J') { ?>
95
  &nbsp;<a href="<?php echo $this->getSkinUrl($tmp_desc['1']); ?>" rel="superbox[image]" class="moreInfos">+ d'infos</a>
96
+ <?php /*} else { ?>
97
  &nbsp;<a href="<?php echo $tmp_desc['1']; ?>" rel="superbox[iframe]" class="moreInfos">+ d'infos</a>
98
+ <?php }*/?>
99
  <?php } ?>
100
  </span>
101
  <div style="clear:both;"></div>
262
  <span>
263
  <?php echo $tmp_desc['0']; ?>
264
  <?php if( $tmp_desc['1'] != '' ) {
265
+ //if($_rate->getCode() == 'tnt_J') { ?>
266
  &nbsp;<a href="<?php echo $this->getSkinUrl($tmp_desc['1']); ?>" rel="superbox[image]" class="moreInfos">+ d'infos</a>
267
+ <?php /*} else { ?>
268
  &nbsp;<a href="<?php echo $tmp_desc['1']; ?>" rel="superbox[iframe]" class="moreInfos">+ d'infos</a>
269
+ <?php }*/?>
270
  <?php } ?>
271
  </span>
272
  <div style="clear:both;"></div>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>TNT_Express_Fr</name>
4
- <version>2.0.2</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
@@ -10,12 +10,13 @@
10
  <description>Extension officielle vous permettant de proposer les services TNT &#xE0; vos clients.</description>
11
  <notes>Extension officielle vous permettant de proposer les services TNT &#xE0; vos clients.&#xD;
12
  &#xD;
13
- - Correction de bug JS lors de la d&#xE9;sactivation du module.&#xD;
14
- - Correction animation flash suivi de colis</notes>
15
- <authors><author><name>Infostrates</name><user>InfoDev</user><email>magento@infostrates.fr</email></author></authors>
16
- <date>2012-05-23</date>
17
- <time>14:45:02</time>
18
- <contents><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="tnt"><dir><dir name="images"><file name="calendar.gif" hash="b1468e5239504974c689eea5d93f86d4"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="css"><dir name="tnt"><file name="jquery.superbox.css" hash="0d9938955b1416e2dd4396c471f4ffef"/><file name="tnt.css" hash="ea01254b4cfbdebf89be561c7d23c752"/><file name="tntB2CRelaisColis.css" hash="9c82ecb9ad69f34d56513156072c1859"/><file name="tntB2CSuiviColis.css" hash="747617fe2434a271120ec2b3e153d5cb"/><file name="ui.dialog.css" hash="4f3c0afd97f9ccc5bcc31fe3f8fdec7f"/><file name="ui.tabs.css" hash="ab99412a657e5272f0306a3ff92c2a64"/></dir></dir><dir name="images"><dir name="tnt"><file name="24h_entreprise.jpg" hash="249ace5ffbe19eec2f31c219d9493e38"/><dir><dir name="relaisColis"><file name="5-puce-choix-gris2.gif" hash="f44619bac31b7e043bc74292b8dfe4d4"/><file name="_5-puce-choix-gris2.gif" hash="f96ef8fba6563b2235a8d09ffb4b7ae1"/><file name="_picto_localiser.png" hash="ba0a3fce978e167d96915bf06cf03c32"/><file name="bt-CodePostal-1.jpg" hash="1f7f61d1201fa69ef65bb2ce656b768f"/><file name="bt-CodePostal-2.jpg" hash="0bdf3314a4e098f8e1a2397c08dc5ff9"/><file name="bt-CodePostal.jpg" hash="06de46a2bae2d4eee4c0949527adc777"/><file name="bt-Continuer-1.jpg" hash="9b9e4090bc8fda9e4d2d798a65812928"/><file name="bt-Continuer-2.jpg" hash="5804403af6a183f097b39b903961bea2"/><file name="bt-Continuer.jpg" hash="a98357491aa77ae10f5d1f76fccc27f3"/><file name="bt-OK-1.jpg" hash="ce026dcdcdcc602dd328832a37a2decd"/><file name="bt-OK-2.jpg" hash="c7fc5c48be5a95b2afecbe0e5c1b5fda"/><file name="bt-OK.jpg" hash="53857cac0c22a96bf3df253c1d46f334"/><file name="bt-Retour.gif" hash="7c9fbc4a1db1817d7067b38275e79be5"/><file name="close_icon_double.png" hash="ed52a65fb5a37b3ab1c9d738c86b8d39"/><file name="exception.gif" hash="14462eb5176873950105cb78cfd1c04b"/><file name="exception2.gif" hash="cae24d8d4eafdbc2419b4f9c654a3bcc"/><dir name="google"><file name="agenceTnt.png" hash="c9161d6c4ada4a5456bea12941ba0903"/><file name="red-pushpin-s.png" hash="7d9f46d93a22ed450fdfdb8fb9879315"/><file name="red-pushpin.png" hash="5238107f41902ba37131e0c5198f9ab4"/><file name="relaisColis.png" hash="15e24cbcc83f4e4c0d7e94e71c80368e"/></dir><file name="lg_tnt.gif" hash="78bb3e001b1a6bc4bd616f032b81ace6"/><file name="livreur.gif" hash="49dd7ebf54141aec0d39cd97af1b3385"/><file name="logo-tnt-petit.jpg" hash="0e35a515b81d1753e31e7746669b92c5"/><file name="logo_24_chezmoi.jpg" hash="6c8a989da7d879fabe6441d06be1d490"/><file name="logo_24_relaiscolis.jpg" hash="b306bc299490f9711c3e0406bbd8e4e8"/><file name="logo_24h_chezmoi_RVB.gif" hash="ccd78b8af3cfb2b27d9ffea6c2b60201"/><file name="logo_24h_relaiscolis_RVB.gif" hash="7711185412061132689da9e6f212c5a8"/><file name="logos_24.jpg" hash="65a78581e9207eadcd5e9797032bdf4f"/><file name="loupe.gif" hash="1d398c60a6f7e5826ea283c6f5ba71de"/><file name="notes.gif" hash="5f39e1129163dc549d59b8818432035c"/><file name="picto-delai.gif" hash="65fdd89dd166c3a139cd35f738e13af4"/><file name="picto_localiser.jpg" hash="14c7373ef0a05236301a80657b94c429"/><file name="tnt_logo.gif" hash="5ebdea118496c59e473afbf6168c72b2"/><dir name="ui-dialog"><file name="217bc0_11x11_icon_arrows_leftright.gif" hash="a508197674479672df0cae36dc3e992b"/><file name="217bc0_11x11_icon_arrows_updown.gif" hash="2b164351ff902aa671d2162fe7ef80de"/><file name="217bc0_11x11_icon_close.gif" hash="aa11d350f6f257b30c51854c7457bdf7"/><file name="217bc0_11x11_icon_doc.gif" hash="6cd3d31f9de2072fe5cdc37697fa7047"/><file name="217bc0_11x11_icon_folder_closed.gif" hash="e1f6751b382b9f44c59793b9fd65b973"/><file name="217bc0_11x11_icon_folder_open.gif" hash="8c974aa27045cc6b2b4b18a502809af5"/><file name="217bc0_11x11_icon_minus.gif" hash="13b2ecea240c868c8a8886e085e41151"/><file name="217bc0_11x11_icon_plus.gif" hash="343c341f26245649be3af43962d3970c"/><file name="217bc0_7x7_arrow_down.gif" hash="8488267c8578c890eb9188964007eb42"/><file name="217bc0_7x7_arrow_left.gif" hash="30e3c1f097e6fec149583d21e9aaf721"/><file name="217bc0_7x7_arrow_right.gif" hash="3aff45eeae4f2f25625db2562ee64b4a"/><file name="217bc0_7x7_arrow_up.gif" hash="d7d60619ed69b64d3d6b61e78c6cf99f"/><file name="469bdd_11x11_icon_arrows_leftright.gif" hash="70f1a152ac20476191607b63e0129406"/><file name="469bdd_11x11_icon_arrows_updown.gif" hash="28debf817357b696699e709c010240e0"/><file name="469bdd_11x11_icon_doc.gif" hash="590aa4403d141186cc4430caefa644a2"/><file name="469bdd_11x11_icon_minus.gif" hash="715e3925135ef192149d1ec62763c9a8"/><file name="469bdd_11x11_icon_plus.gif" hash="a4aa61ec7cf9a274ac42224d0418d16d"/><file name="469bdd_11x11_icon_resize_se.gif" hash="d840dafe31b345b43dcd608983f4d2f2"/><file name="469bdd_7x7_arrow_down.gif" hash="794c5003bb6baa630c1664560293ed22"/><file name="469bdd_7x7_arrow_left.gif" hash="95f61faab2a3052985b81ba63b9e5143"/><file name="469bdd_7x7_arrow_right.gif" hash="363bb40ec764ff0ee8971e0e603614b4"/><file name="469bdd_7x7_arrow_up.gif" hash="e82fb46bea72014c55b24de8cf4e5816"/><file name="6da8d5_11x11_icon_arrows_leftright.gif" hash="ed511d07417fb6e54521e6d069118c3e"/><file name="6da8d5_11x11_icon_arrows_updown.gif" hash="4c183fc8665336cc06b6b5ecec5ab9d4"/><file name="6da8d5_11x11_icon_close.gif" hash="f5c1a073a4516aa1bcb1d2adc11d694d"/><file name="6da8d5_11x11_icon_doc.gif" hash="d4c31ffd164bd11dafda91f71154fd94"/><file name="6da8d5_11x11_icon_folder_closed.gif" hash="75cca9e354d9c70493956701036d17b3"/><file name="6da8d5_11x11_icon_folder_open.gif" hash="b6d4ccf28bc8135f5447e4d7037f4273"/><file name="6da8d5_11x11_icon_minus.gif" hash="ce777f34f7d0c45d97f8a4a81dc7a864"/><file name="6da8d5_11x11_icon_plus.gif" hash="4ee03d80718cda0dfed3dc40da49defe"/><file name="6da8d5_7x7_arrow_down.gif" hash="5f14085c6a95eefb7de0298fde0f8cf7"/><file name="6da8d5_7x7_arrow_left.gif" hash="c1830e94ea979068a24bf65cb3273bbc"/><file name="6da8d5_7x7_arrow_right.gif" hash="f07a63dc872885b363ab0263e9e87a81"/><file name="6da8d5_7x7_arrow_up.gif" hash="23388675052b0e0b1c377a39b8e33daf"/><file name="d0e5f5_40x100_textures_02_glass_75.png" hash="4227dfeb91bc0ada19e6ce9c9dd1d177"/><file name="dfeffc_40x100_textures_02_glass_85.png" hash="65821097dd7360af378ba87064657c5a"/><file name="f5f8f9_40x100_textures_06_inset_hard_100.png" hash="d0b8b7bc1da19027c5f1928821ca2425"/><file name="f9bd01_11x11_icon_arrows_leftright.gif" hash="a606b4cf221bc4835e888045582d3741"/><file name="f9bd01_11x11_icon_arrows_updown.gif" hash="fd37fbab3d065ff801423592ce9ddef4"/><file name="f9bd01_11x11_icon_close.gif" hash="2f29d1345450fc6ceff21b47b1299add"/><file name="f9bd01_11x11_icon_doc.gif" hash="b496d9150cf0b5485773d1809a15711e"/><file name="f9bd01_11x11_icon_folder_closed.gif" hash="10f1f11a9e8511c58780bd4c27bc58bf"/><file name="f9bd01_11x11_icon_folder_open.gif" hash="a93490b49caa0d29e0a4a74a19db5a75"/><file name="f9bd01_11x11_icon_minus.gif" hash="aae85e05c6fc1c89aaa40ed81d6a5745"/><file name="f9bd01_11x11_icon_plus.gif" hash="8d336dad6b6d735c8caffa6979111ec8"/><file name="f9bd01_7x7_arrow_down.gif" hash="7245b25313350cf9c42630cf56a77b32"/><file name="f9bd01_7x7_arrow_left.gif" hash="d52f626932d222de01e6ae56d693de30"/><file name="f9bd01_7x7_arrow_right.gif" hash="dda3a08ff0a655d2098eea93f8d40f1c"/><file name="f9bd01_7x7_arrow_up.gif" hash="9fc71f02a267f44015b8fcdad65652ae"/><file name="fcfdfd_40x100_textures_06_inset_hard_100.png" hash="9a409d5eae9edcb987ee579e1d2fd1ca"/></dir></dir><dir name="swf"><file name="banniere_TNT_0.swf" hash="2d5ff87f17c339506cf94e14ed02049b"/><file name="banniere_TNT_1.swf" hash="19452213d15cac22ea4400f9a2428d54"/><file name="banniere_TNT_2.swf" hash="774c739c758226638ea18eb9840cbeae"/><file name="banniere_TNT_3.swf" hash="7d7312336f6fd5b7e1eb3bad903dea29"/><file name="banniere_TNT_4.swf" hash="cbb9dd4c5f24b9754c5c30133e09f6f1"/><file name="banniere_TNT_5.swf" hash="96c51a21962293691471973bc9f9020a"/><file name="banniere_TNT_6.swf" hash="a4dab8afecc0a26e5149787026e9591d"/><file name="banniere_TNT_7.swf" hash="22a76b62d84d1dbf9bc2ffe7f67249e3"/></dir></dir><file name="tnt_j.png" hash="2a11f2e71231a05d86d5031ca81f17a1"/><file name="tnt_jd.png" hash="2b5725dacd06a08a2055884fbd9b2397"/><file name="tnt_jz.png" hash="2bd28bb1b58294f4d84aa0e5d058b66a"/><file name="tnt_sure_we_can.png" hash="6e609b1dfea22cc59b5f1699857cbc58"/><file name="tnt_t.png" hash="58348232c798883b70d008b98da8d0ec"/></dir></dir><dir name="js"><dir name="tnt"><file name="jquery-ui.js" hash="c4338f18312354facf7fcaecadf07e04"/><file name="jquery.js" hash="3d5c23458ff980bd76bee32e76faac86"/><file name="jquery.superbox.js" hash="30228a5235fa735bdfb03130cc64ddbe"/><file name="jquery_162.js" hash="8752b76fb981b68e7283ef4341a1c29a"/><file name="relaisColis.js" hash="43c080a05b84f8d03db5801e6869a2fb"/><file name="relaisColisIE7.js" hash="e59d9ab38047117aa3d1728c74564722"/><file name="suiviColis.js" hash="36e18708ebb16225b2b6fb614d01153d"/><file name="swfobject.js" hash="892a543f3abb54e8ec1ada55be3b0649"/><file name="tnt.js" hash="da042f18e074024794f1a43178f1f0f6"/></dir></dir><file name="tnt_relaisColis.php" hash="5a7ab05b566edcbbefaa9399742391e8"/><file name="tnt_suiviColis.php" hash="3083a2d8a8229d6f37d8bb2402b6553b"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="WS_Tnt.xml" hash="2176fa2b98c129841599ac0cf2b96d87"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="tnt"><dir><dir name="template"><dir name="sales"><dir name="order"><dir name="invoice"><dir name="create"><file name="form.phtml" hash="39a5685c507a02242ba2145e5a2d2efe"/><file name="tracking.phtml" hash="a03541d8ca4f4061e74a37fe33f4a75a"/></dir></dir><dir name="shipment"><dir name="create"><file name="form.phtml" hash="3ffd2752b9e8c6209603678ef6358421"/></dir></dir></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="tnt.xml" hash="5308155ce5230e3c298b6d407fde4fba"/></dir><dir name="template"><dir name="tnt"><dir><dir name="form"><file name="_failure.phtml" hash="0e75f6a5b51dc97568f3407c58be480d"/></dir><dir name="onepage"><dir name="shipping_method"><file name="available.phtml" hash="e025586f65258ebf882a43179470e542"/></dir><file name="shipping_method.phtml" hash="ec7ad924d51398d83d6854ad24f7ca16"/></dir><dir name="sales"><dir name="order"><file name="info.phtml" hash="bcad3e1dbc7bdafb8728dc1421fe7e67"/><file name="view.phtml" hash="edd2db8d7bf157ebbe7c7248723c32a4"/></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="magecommunity"><dir name="Infostrates"><dir name="Tnt"><dir><dir name="Block"><dir name="Onepage"><dir name="Shipping"><dir name="Method"><dir name="Available"><file name="Item.php" hash="c8c409dbee12a674b2a4581c82d1e943"/></dir><file name="Available.php" hash="e962d4ad442a82575bc84e64b94c82ce"/></dir></dir></dir><dir name="Sales"><file name="Impression.php" hash="c72cb0a7611a83d977fc3d69df36ab8d"/><dir name="Order"><dir name="Shipment"><file name="View.php" hash="805c992e53d98f35f3103364ecf4ff46"/></dir></dir><dir name="Shipment"><file name="Grid.php" hash="1b0b98ab13ceea3ba1299ca20f5c10f9"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="d4893de82f6c207dfcb81acdebe3f713"/></dir><dir name="Model"><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="1b29213ab1939cc37df340994587c90e"/></dir></dir><dir name="Shipping"><dir name="Carrier"><dir name="Tnt"><dir name="Source"><file name="Labelformat.php" hash="c70d28c1c54620b87719da9b91aab5db"/><file name="Method.php" hash="c9580beb10e6522182524422d7367f3a"/></dir></dir><file name="Tnt.php" hash="89475e94c210d314ee3b2e9348ee5ad3"/></dir></dir></dir><dir name="controllers"><dir name="Sales"><file name="ImpressionController.php" hash="515ece46edde3d3634e289d92afb1b34"/><dir name="Order"><file name="ShipmentController.php" hash="b942c0f3f29bf80c6be2f7955ab3f547"/></dir></dir><file name="TntController.php" hash="ab0c05ff20be0248d9aaca435f7ee5a1"/></dir><dir name="etc"><file name="config.xml" hash="9a4433c64ed881e18319c289b3668cdd"/><file name="system.xml" hash="37d855e7ae5e16d9ee488f59be73ea25"/></dir><dir name="sql"><dir name="tnt_setup"><file name="mysql4-install-0.1.0-0.1.1.php" hash="f8b88a51166fca8f990340a748b48245"/><file name="mysql4-install-0.1.0.php" hash="eb0dac832f3182d6111adb8618296a03"/><file name="mysql4-upgrade-1.0.0-2.0.0.php" hash="0b69a4c2f5fe40403d5f1ff37d36197c"/></dir></dir></dir></dir></dir></target><target name="magemedia"><dir name="pdf_bt"><file name="index.html" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir></target><target name="magelocal"><dir name="Varien"><dir name="Data"><dir name="Collection"><file name="Db.php" hash="addfdabc43503b33845dc193c88205ab"/></dir></dir></dir></target></contents>
 
19
  <compatible/>
20
- <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
21
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>TNT_Express_Fr</name>
4
+ <version>2.0.5</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
10
  <description>Extension officielle vous permettant de proposer les services TNT &#xE0; vos clients.</description>
11
  <notes>Extension officielle vous permettant de proposer les services TNT &#xE0; vos clients.&#xD;
12
  &#xD;
13
+ - suppression de la ligne "Choisissez votre Relais Colis" lors de la s&#xE9;lection du mode entreprise.&#xD;
14
+ - comparaison de la ville saisie correspondante au CP avec les villes renvoy&#xE9;es par le WS, si correspondance on n'affiche pas les choix retourn&#xE9;s par le WS.&#xD;
15
+ - traitement du format "0033"</notes>
16
+ <authors><author><name>Infostrates</name><user>auto-converted</user><email>magento@infostrates.fr</email></author></authors>
17
+ <date>2012-09-17</date>
18
+ <time>08:35:43</time>
19
+ <contents><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="tnt"><dir name="images"><file name="calendar.gif" hash="b1468e5239504974c689eea5d93f86d4"/></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="css"><dir name="tnt"><file name="jquery.superbox.css" hash="37f0e7a9f1df77385dd867fa9dadd60c"/><file name="tnt.css" hash="ea01254b4cfbdebf89be561c7d23c752"/><file name="tntB2CRelaisColis.css" hash="8588bc35d86524d2f4cdb26e7c39e337"/><file name="tntB2CSuiviColis.css" hash="b36325da4e3ca8dc4e819674a4e82166"/><file name="ui.dialog.css" hash="4f3c0afd97f9ccc5bcc31fe3f8fdec7f"/><file name="ui.tabs.css" hash="9a9fd1b8fef22474fcbf1917975acfbd"/></dir></dir><dir name="images"><dir name="tnt"><dir name="relaisColis"><dir name="google"><file name="agenceTnt.png" hash="c9161d6c4ada4a5456bea12941ba0903"/><file name="red-pushpin-s.png" hash="7d9f46d93a22ed450fdfdb8fb9879315"/><file name="red-pushpin.png" hash="5238107f41902ba37131e0c5198f9ab4"/><file name="relaisColis.png" hash="15e24cbcc83f4e4c0d7e94e71c80368e"/><file name="relaisColis2.png" hash="4643153e81e18762f745e8827c82b252"/></dir><dir name="ui-dialog"><file name="217bc0_11x11_icon_arrows_leftright.gif" hash="a508197674479672df0cae36dc3e992b"/><file name="217bc0_11x11_icon_arrows_updown.gif" hash="2b164351ff902aa671d2162fe7ef80de"/><file name="217bc0_11x11_icon_close.gif" hash="aa11d350f6f257b30c51854c7457bdf7"/><file name="217bc0_11x11_icon_doc.gif" hash="6cd3d31f9de2072fe5cdc37697fa7047"/><file name="217bc0_11x11_icon_folder_closed.gif" hash="e1f6751b382b9f44c59793b9fd65b973"/><file name="217bc0_11x11_icon_folder_open.gif" hash="8c974aa27045cc6b2b4b18a502809af5"/><file name="217bc0_11x11_icon_minus.gif" hash="13b2ecea240c868c8a8886e085e41151"/><file name="217bc0_11x11_icon_plus.gif" hash="343c341f26245649be3af43962d3970c"/><file name="217bc0_7x7_arrow_down.gif" hash="8488267c8578c890eb9188964007eb42"/><file name="217bc0_7x7_arrow_left.gif" hash="30e3c1f097e6fec149583d21e9aaf721"/><file name="217bc0_7x7_arrow_right.gif" hash="3aff45eeae4f2f25625db2562ee64b4a"/><file name="217bc0_7x7_arrow_up.gif" hash="d7d60619ed69b64d3d6b61e78c6cf99f"/><file name="469bdd_11x11_icon_arrows_leftright.gif" hash="70f1a152ac20476191607b63e0129406"/><file name="469bdd_11x11_icon_arrows_updown.gif" hash="28debf817357b696699e709c010240e0"/><file name="469bdd_11x11_icon_doc.gif" hash="590aa4403d141186cc4430caefa644a2"/><file name="469bdd_11x11_icon_minus.gif" hash="715e3925135ef192149d1ec62763c9a8"/><file name="469bdd_11x11_icon_plus.gif" hash="a4aa61ec7cf9a274ac42224d0418d16d"/><file name="469bdd_11x11_icon_resize_se.gif" hash="d840dafe31b345b43dcd608983f4d2f2"/><file name="469bdd_7x7_arrow_down.gif" hash="794c5003bb6baa630c1664560293ed22"/><file name="469bdd_7x7_arrow_left.gif" hash="95f61faab2a3052985b81ba63b9e5143"/><file name="469bdd_7x7_arrow_right.gif" hash="363bb40ec764ff0ee8971e0e603614b4"/><file name="469bdd_7x7_arrow_up.gif" hash="e82fb46bea72014c55b24de8cf4e5816"/><file name="6da8d5_11x11_icon_arrows_leftright.gif" hash="ed511d07417fb6e54521e6d069118c3e"/><file name="6da8d5_11x11_icon_arrows_updown.gif" hash="4c183fc8665336cc06b6b5ecec5ab9d4"/><file name="6da8d5_11x11_icon_close.gif" hash="f5c1a073a4516aa1bcb1d2adc11d694d"/><file name="6da8d5_11x11_icon_doc.gif" hash="d4c31ffd164bd11dafda91f71154fd94"/><file name="6da8d5_11x11_icon_folder_closed.gif" hash="75cca9e354d9c70493956701036d17b3"/><file name="6da8d5_11x11_icon_folder_open.gif" hash="b6d4ccf28bc8135f5447e4d7037f4273"/><file name="6da8d5_11x11_icon_minus.gif" hash="ce777f34f7d0c45d97f8a4a81dc7a864"/><file name="6da8d5_11x11_icon_plus.gif" hash="4ee03d80718cda0dfed3dc40da49defe"/><file name="6da8d5_7x7_arrow_down.gif" hash="5f14085c6a95eefb7de0298fde0f8cf7"/><file name="6da8d5_7x7_arrow_left.gif" hash="c1830e94ea979068a24bf65cb3273bbc"/><file name="6da8d5_7x7_arrow_right.gif" hash="f07a63dc872885b363ab0263e9e87a81"/><file name="6da8d5_7x7_arrow_up.gif" hash="23388675052b0e0b1c377a39b8e33daf"/><file name="d0e5f5_40x100_textures_02_glass_75.png" hash="4227dfeb91bc0ada19e6ce9c9dd1d177"/><file name="dfeffc_40x100_textures_02_glass_85.png" hash="65821097dd7360af378ba87064657c5a"/><file name="f5f8f9_40x100_textures_06_inset_hard_100.png" hash="d0b8b7bc1da19027c5f1928821ca2425"/><file name="f9bd01_11x11_icon_arrows_leftright.gif" hash="a606b4cf221bc4835e888045582d3741"/><file name="f9bd01_11x11_icon_arrows_updown.gif" hash="fd37fbab3d065ff801423592ce9ddef4"/><file name="f9bd01_11x11_icon_close.gif" hash="2f29d1345450fc6ceff21b47b1299add"/><file name="f9bd01_11x11_icon_doc.gif" hash="b496d9150cf0b5485773d1809a15711e"/><file name="f9bd01_11x11_icon_folder_closed.gif" hash="10f1f11a9e8511c58780bd4c27bc58bf"/><file name="f9bd01_11x11_icon_folder_open.gif" hash="a93490b49caa0d29e0a4a74a19db5a75"/><file name="f9bd01_11x11_icon_minus.gif" hash="aae85e05c6fc1c89aaa40ed81d6a5745"/><file name="f9bd01_11x11_icon_plus.gif" hash="8d336dad6b6d735c8caffa6979111ec8"/><file name="f9bd01_7x7_arrow_down.gif" hash="7245b25313350cf9c42630cf56a77b32"/><file name="f9bd01_7x7_arrow_left.gif" hash="d52f626932d222de01e6ae56d693de30"/><file name="f9bd01_7x7_arrow_right.gif" hash="dda3a08ff0a655d2098eea93f8d40f1c"/><file name="f9bd01_7x7_arrow_up.gif" hash="9fc71f02a267f44015b8fcdad65652ae"/><file name="fcfdfd_40x100_textures_06_inset_hard_100.png" hash="9a409d5eae9edcb987ee579e1d2fd1ca"/></dir><file name="24_relaiscolis.jpg" hash="70927a36854fefdee6da4811dead9e78"/><file name="5-puce-choix-gris2.gif" hash="f44619bac31b7e043bc74292b8dfe4d4"/><file name="_5-puce-choix-gris2.gif" hash="f96ef8fba6563b2235a8d09ffb4b7ae1"/><file name="_logo_24_chezmoi.jpg" hash="6c8a989da7d879fabe6441d06be1d490"/><file name="_logo_24_relaiscolis.jpg" hash="b306bc299490f9711c3e0406bbd8e4e8"/><file name="_logo_24h_chezmoi_RVB.gif" hash="ccd78b8af3cfb2b27d9ffea6c2b60201"/><file name="_logo_24h_relaiscolis_RVB.gif" hash="7711185412061132689da9e6f212c5a8"/><file name="_logos_24.jpg" hash="65a78581e9207eadcd5e9797032bdf4f"/><file name="_picto_localiser.png" hash="ba0a3fce978e167d96915bf06cf03c32"/><file name="bt-CodePostal-1.jpg" hash="1f7f61d1201fa69ef65bb2ce656b768f"/><file name="bt-CodePostal-2.jpg" hash="0bdf3314a4e098f8e1a2397c08dc5ff9"/><file name="bt-CodePostal.jpg" hash="c5bc1cbc689c7fd0949b4c903d347b7f"/><file name="bt-Continuer-1.jpg" hash="9b9e4090bc8fda9e4d2d798a65812928"/><file name="bt-Continuer-2.jpg" hash="5804403af6a183f097b39b903961bea2"/><file name="bt-Continuer.jpg" hash="534c8b990fbad574e47477ab9e7de70b"/><file name="bt-OK-1.jpg" hash="ce026dcdcdcc602dd328832a37a2decd"/><file name="bt-OK-2.jpg" hash="c7fc5c48be5a95b2afecbe0e5c1b5fda"/><file name="bt-OK.jpg" hash="9ed6a96f09935b5bb23b678b8cffec1a"/><file name="bt-Retour.gif" hash="7c9fbc4a1db1817d7067b38275e79be5"/><file name="close_icon_double.png" hash="ed52a65fb5a37b3ab1c9d738c86b8d39"/><file name="exception.gif" hash="14462eb5176873950105cb78cfd1c04b"/><file name="exception2.gif" hash="cae24d8d4eafdbc2419b4f9c654a3bcc"/><file name="lg_tnt.gif" hash="78bb3e001b1a6bc4bd616f032b81ace6"/><file name="livreur.gif" hash="49dd7ebf54141aec0d39cd97af1b3385"/><file name="logo-tnt-petit.jpg" hash="0e35a515b81d1753e31e7746669b92c5"/><file name="logo_24_chezmoi.jpg" hash="b5afafec026f93c6c04bbe9e005521be"/><file name="logo_24_relaiscolis.jpg" hash="259879aa1cf663479f74db1b62518e90"/><file name="logo_24h_chezmoi_RVB.gif" hash="b8ea43f3b62ae1db6f4562a6fed53647"/><file name="logo_24h_relaiscolis_RVB.gif" hash="3521b422871a2e054135f83bd979be98"/><file name="logos_24.jpg" hash="ae1b3561e501ec8ce536b66fff1e2372"/><file name="loupe.gif" hash="1c66ca841e102964ee7e70f574b13bb1"/><file name="notes.gif" hash="5f39e1129163dc549d59b8818432035c"/><file name="picto-delai.gif" hash="6f40c84eada13e0802de3d573b978023"/><file name="picto_localiser.jpg" hash="14c7373ef0a05236301a80657b94c429"/><file name="tnt_logo.gif" hash="5ebdea118496c59e473afbf6168c72b2"/></dir><dir name="swf"><file name="banniere_TNT_0.swf" hash="2d5ff87f17c339506cf94e14ed02049b"/><file name="banniere_TNT_1.swf" hash="19452213d15cac22ea4400f9a2428d54"/><file name="banniere_TNT_2.swf" hash="774c739c758226638ea18eb9840cbeae"/><file name="banniere_TNT_3.swf" hash="7d7312336f6fd5b7e1eb3bad903dea29"/><file name="banniere_TNT_4.swf" hash="cbb9dd4c5f24b9754c5c30133e09f6f1"/><file name="banniere_TNT_5.swf" hash="96c51a21962293691471973bc9f9020a"/><file name="banniere_TNT_6.swf" hash="a4dab8afecc0a26e5149787026e9591d"/><file name="banniere_TNT_7.swf" hash="22a76b62d84d1dbf9bc2ffe7f67249e3"/></dir><file name="24h_domicile.jpg" hash="45334759cd925b64ad7dfd29f547cd45"/><file name="24h_entreprise.jpg" hash="eab57029f655d350d37047822c30b85a"/><file name="24h_relais.jpg" hash="1ab1dc90034ab68830c69070e45b5248"/><file name="_24h_relais.jpg" hash="6344a1fc8c0bd49f957d184c6506b16b"/><file name="_tnt_j.png" hash="2a11f2e71231a05d86d5031ca81f17a1"/><file name="_tnt_jd.png" hash="2b5725dacd06a08a2055884fbd9b2397"/><file name="_tnt_jz.png" hash="2bd28bb1b58294f4d84aa0e5d058b66a"/><file name="tnt_j.png" hash="8d0f21db3ea7d8466948d0b661c65b71"/><file name="tnt_jd.png" hash="d98546789b206f87424ecae50307b97a"/><file name="tnt_jz.png" hash="4420aba4343d1d170a1e3662d53130dc"/><file name="tnt_sure_we_can.png" hash="6e609b1dfea22cc59b5f1699857cbc58"/><file name="tnt_t.png" hash="58348232c798883b70d008b98da8d0ec"/></dir></dir><dir name="js"><dir name="tnt"><file name="jquery-ui.js" hash="c4338f18312354facf7fcaecadf07e04"/><file name="jquery.js" hash="3d5c23458ff980bd76bee32e76faac86"/><file name="jquery.superbox.js" hash="30228a5235fa735bdfb03130cc64ddbe"/><file name="jquery_162.js" hash="8752b76fb981b68e7283ef4341a1c29a"/><file name="relaisColis.js" hash="a7ac4aafa111b0e5906e585925314eb6"/><file name="relaisColisIE7.js" hash="9825ac3a00a44431e499180c4edefb5a"/><file name="suiviColis.js" hash="f702e717d80c9b2806c54a91149e2571"/><file name="swfobject.js" hash="892a543f3abb54e8ec1ada55be3b0649"/><file name="tnt.js" hash="9bc11f07a50bbfba02b3d14dc0383de6"/></dir></dir><file name="tnt_relaisColis.php" hash="dacf44bb13b29a788bbd44d61f72b656"/><file name="tnt_suiviColis.php" hash="3083a2d8a8229d6f37d8bb2402b6553b"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="WS_Tnt.xml" hash="2176fa2b98c129841599ac0cf2b96d87"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="tnt"><dir name="template"><dir name="sales"><dir name="order"><dir name="invoice"><dir name="create"><file name="form.phtml" hash="39a5685c507a02242ba2145e5a2d2efe"/><file name="tracking.phtml" hash="a03541d8ca4f4061e74a37fe33f4a75a"/></dir></dir><dir name="shipment"><dir name="create"><file name="form.phtml" hash="3ffd2752b9e8c6209603678ef6358421"/></dir></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="tnt.xml" hash="5308155ce5230e3c298b6d407fde4fba"/></dir><dir name="template"><dir name="tnt"><dir name="form"><file name="_failure.phtml" hash="0e75f6a5b51dc97568f3407c58be480d"/></dir><dir name="onepage"><dir name="shipping_method"><file name="available.phtml" hash="c4e8c7f6d325bc2daf784e9f88375fd7"/></dir><file name="shipping_method.phtml" hash="ec7ad924d51398d83d6854ad24f7ca16"/></dir><dir name="sales"><dir name="order"><file name="info.phtml" hash="bcad3e1dbc7bdafb8728dc1421fe7e67"/><file name="view.phtml" hash="edd2db8d7bf157ebbe7c7248723c32a4"/></dir></dir></dir></dir></dir></dir></dir></target><target name="magecommunity"><dir name="Infostrates"><dir name="Tnt"><dir name="Block"><dir name="Onepage"><dir name="Shipping"><dir name="Method"><dir name="Available"><file name="Item.php" hash="c8c409dbee12a674b2a4581c82d1e943"/></dir><file name="Available.php" hash="e962d4ad442a82575bc84e64b94c82ce"/></dir></dir></dir><dir name="Sales"><dir name="Order"><dir name="Shipment"><file name="View.php" hash="805c992e53d98f35f3103364ecf4ff46"/></dir></dir><dir name="Shipment"><file name="Grid.php" hash="1b0b98ab13ceea3ba1299ca20f5c10f9"/></dir><file name="Impression.php" hash="c72cb0a7611a83d977fc3d69df36ab8d"/></dir></dir><dir name="Helper"><file name="Data.php" hash="d4893de82f6c207dfcb81acdebe3f713"/></dir><dir name="Model"><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="1b29213ab1939cc37df340994587c90e"/></dir></dir><dir name="Shipping"><dir name="Carrier"><dir name="Tnt"><dir name="Source"><file name="Labelformat.php" hash="c70d28c1c54620b87719da9b91aab5db"/><file name="Method.php" hash="72131007614ea7eba8a82018bb259517"/><file name="Tntmaxweight.php" hash="f440ed47a1d73b49f60237eaa0a3b7c4"/></dir></dir><file name="Tnt.php" hash="7dc7585d717fe2fde6da50b4e55d996f"/></dir></dir></dir><dir name="controllers"><dir name="Sales"><dir name="Order"><file name="ShipmentController.php" hash="ca219089870c45039d9d715066a99b12"/></dir><file name="ImpressionController.php" hash="515ece46edde3d3634e289d92afb1b34"/></dir><file name="TntController.php" hash="f430e24ea87fbd43c7647320fd2a0f07"/></dir><dir name="etc"><file name="config.xml" hash="9a575b157da362a17f489b382d7a0118"/><file name="system.xml" hash="0e553bc8e1e37204917a0090e80ddc6a"/></dir><dir name="sql"><dir name="tnt_setup"><file name="mysql4-install-0.1.0-0.1.1.php" hash="f8b88a51166fca8f990340a748b48245"/><file name="mysql4-install-0.1.0.php" hash="eb0dac832f3182d6111adb8618296a03"/><file name="mysql4-upgrade-1.0.0-2.0.0.php" hash="0b69a4c2f5fe40403d5f1ff37d36197c"/><file name="mysql4-upgrade-2.0.1-2.0.3.php" hash="88109fe619040cbf466b269e800597b2"/></dir></dir></dir></dir></target><target name="magemedia"><dir name="pdf_bt"><file name="index.html" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir></target><target name="magelocal"><dir name="Varien"><dir name="Data"><dir name="Collection"><file name="Db.php" hash="addfdabc43503b33845dc193c88205ab"/></dir></dir></dir></target></contents>
20
  <compatible/>
21
+ <dependencies/>
22
  </package>
skin/frontend/default/default/css/tnt/jquery.superbox.css CHANGED
@@ -18,13 +18,31 @@
18
  #superbox-overlay{background:#000;}
19
  #superbox-container .loading{text-align:center;font-size:40px;color:#fff;}
20
  #superbox{padding:10px;background:#fff;outline:0;}
21
- #superbox-innerbox{padding:10px 0;}
22
  #superbox.image{text-align:center;}
23
  #superbox .close,
24
  #superbox .nextprev{overflow:hidden;margin:0;padding:1px; cursor:pointer; }
25
  #superbox .close a:focus,
26
  #superbox .nextprev a:focus{outline:1px dotted;}
27
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
28
 
29
  .checkout-onepage-index #superbox {
30
  border: 5px solid #FF6600;
18
  #superbox-overlay{background:#000;}
19
  #superbox-container .loading{text-align:center;font-size:40px;color:#fff;}
20
  #superbox{padding:10px;background:#fff;outline:0;}
21
+ #superbox-innerbox{padding:10px 0; clear:right;}
22
  #superbox.image{text-align:center;}
23
  #superbox .close,
24
  #superbox .nextprev{overflow:hidden;margin:0;padding:1px; cursor:pointer; }
25
  #superbox .close a:focus,
26
  #superbox .nextprev a:focus{outline:1px dotted;}
27
 
28
+ #superbox .close {
29
+ background-color: #787878;
30
+ line-height:25px;
31
+ width:75px;
32
+ float:right;
33
+ margin-right:8px;
34
+ }
35
+
36
+ #superbox .close a {
37
+ color:white;
38
+ text-decoration: none;
39
+ display: block;
40
+ }
41
+
42
+ #superbox .close a:hover {
43
+ text-decoration: underline;
44
+ }
45
+
46
 
47
  .checkout-onepage-index #superbox {
48
  border: 5px solid #FF6600;
skin/frontend/default/default/css/tnt/tntB2CRelaisColis.css CHANGED
@@ -6,7 +6,7 @@
6
  border-color: gray;
7
  border-style: solid;
8
  border-width: 0px;
9
- color: #676767;
10
  display: bloc;
11
  font-family: arial,helvetica,sans-serif;
12
  font-size: 30pt;
@@ -134,7 +134,7 @@
134
  .tntRCnoirPetit {
135
  font-family: arial,helvetica,sans-serif;
136
  font-size: 10pt;
137
- color: black;
138
  background-color: #ffffff;
139
  }
140
  .tntRCdetailPetit {
@@ -293,7 +293,7 @@ sup.tntRCSup {
293
 
294
  table.horairesRCPopup tr.selected td {
295
  background-color: #eeeeee;
296
- color: #ff6600;
297
  }
298
 
299
  td.horaireRCPopup {
@@ -322,14 +322,14 @@ sup.tntRCSup {
322
  }
323
 
324
  div.rc {
325
- background-image: url(../../images/tnt/relaisColis/google/relaisColis.png);
326
  background-repeat: no-repeat;
327
- padding-left:50px;
328
  }
329
 
330
 
331
  .lien_reset {
332
- color : #ff6600;
333
  font-family: arial,helvetica,sans-serif;
334
  font-weight: bold;
335
  font-size : 11px;
@@ -337,8 +337,8 @@ sup.tntRCSup {
337
  }
338
 
339
  a {
340
- color: #f60;
341
- outline-color: #f60 !important;
342
  outline: none;
343
  }
344
 
@@ -359,8 +359,9 @@ a:hover {
359
 
360
  #promoRelaisColis {
361
  position: absolute;
362
- top: 200px;
363
- width: 380px;
 
364
  left:10px;
365
  }
366
 
6
  border-color: gray;
7
  border-style: solid;
8
  border-width: 0px;
9
+ color: #98cb3e;
10
  display: bloc;
11
  font-family: arial,helvetica,sans-serif;
12
  font-size: 30pt;
134
  .tntRCnoirPetit {
135
  font-family: arial,helvetica,sans-serif;
136
  font-size: 10pt;
137
+ color: #676767;
138
  background-color: #ffffff;
139
  }
140
  .tntRCdetailPetit {
293
 
294
  table.horairesRCPopup tr.selected td {
295
  background-color: #eeeeee;
296
+ color: #9acb3c;
297
  }
298
 
299
  td.horaireRCPopup {
322
  }
323
 
324
  div.rc {
325
+ background-image: url(../../images/tnt/relaisColis/google/relaisColis2.png);
326
  background-repeat: no-repeat;
327
+ padding-left:95px;
328
  }
329
 
330
 
331
  .lien_reset {
332
+ color : #787878;
333
  font-family: arial,helvetica,sans-serif;
334
  font-weight: bold;
335
  font-size : 11px;
337
  }
338
 
339
  a {
340
+ color: #999;
341
+ outline-color: #999 !important;
342
  outline: none;
343
  }
344
 
359
 
360
  #promoRelaisColis {
361
  position: absolute;
362
+ top:130px;
363
+ width:365px;
364
+ height:384px;
365
  left:10px;
366
  }
367
 
skin/frontend/default/default/css/tnt/tntB2CSuiviColis.css CHANGED
@@ -66,13 +66,13 @@ div.tntSCBodySearch table tbody tr td input{
66
 
67
  td.tntSCFooterCell1 {
68
  background-image: url(../../images/tnt/relaisColis/logo_24h_chezmoi_RVB.gif);
69
- background-position: right center;
70
  background-repeat: no-repeat;
71
  }
72
 
73
  td.tntSCFooterCell2 {
74
  background-image: url(../../images/tnt/relaisColis/logo_24h_relaiscolis_RVB.gif);
75
- background-position: right center;
76
  background-repeat: no-repeat;
77
  }
78
 
66
 
67
  td.tntSCFooterCell1 {
68
  background-image: url(../../images/tnt/relaisColis/logo_24h_chezmoi_RVB.gif);
69
+ background-position: right bottom;
70
  background-repeat: no-repeat;
71
  }
72
 
73
  td.tntSCFooterCell2 {
74
  background-image: url(../../images/tnt/relaisColis/logo_24h_relaiscolis_RVB.gif);
75
+ background-position: right bottom;
76
  background-repeat: no-repeat;
77
  }
78
 
skin/frontend/default/default/css/tnt/ui.tabs.css CHANGED
@@ -35,19 +35,19 @@
35
  }
36
  .ui-tabs-nav li.ui-tabs-selected {
37
  /*border-bottom: none;*/
38
- border: 1px solid #ff6600;
39
  border-bottom:none;
40
  }
41
  .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs-nav li.ui-tabs-selected a:hover {
42
  /*background: #f5f8f9 url(../images/tnt/relaisColis/ui-dialog/f5f8f9_40x100_textures_06_inset_hard_100.png) 0 50% repeat-x;*/
43
  color: white;
44
- background-color: #ff6600;
45
  }
46
  .ui-tabs-panel {
47
  /*resets*/margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; /*font-size: 100%;*/ list-style: none;
48
  /*font-family: Lucida Grande, Lucida Sans, Arial, sans-serif;*/
49
  clear:left;
50
- border: 1px solid #ff6600;
51
  /*background: #fcfdfd url(../images/tnt/relaisColis/ui-dialog/fcfdfd_40x100_textures_06_inset_hard_100.png) 0 bottom repeat-x;*/
52
  /*color: #222222;*/
53
  padding: 1em 1em;
@@ -65,6 +65,6 @@
65
 
66
  .ui-tabs-panel input.bt {
67
  border: 0px solid;
68
- background-color: #ff6600;
69
  color:white;
70
  }
35
  }
36
  .ui-tabs-nav li.ui-tabs-selected {
37
  /*border-bottom: none;*/
38
+ border: 1px solid #9dca3b;
39
  border-bottom:none;
40
  }
41
  .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs-nav li.ui-tabs-selected a:hover {
42
  /*background: #f5f8f9 url(../images/tnt/relaisColis/ui-dialog/f5f8f9_40x100_textures_06_inset_hard_100.png) 0 50% repeat-x;*/
43
  color: white;
44
+ background-color: #9dca3b;
45
  }
46
  .ui-tabs-panel {
47
  /*resets*/margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; /*font-size: 100%;*/ list-style: none;
48
  /*font-family: Lucida Grande, Lucida Sans, Arial, sans-serif;*/
49
  clear:left;
50
+ border: 1px solid #9dca3b;
51
  /*background: #fcfdfd url(../images/tnt/relaisColis/ui-dialog/fcfdfd_40x100_textures_06_inset_hard_100.png) 0 bottom repeat-x;*/
52
  /*color: #222222;*/
53
  padding: 1em 1em;
65
 
66
  .ui-tabs-panel input.bt {
67
  border: 0px solid;
68
+ background-color: #7e7e7e;
69
  color:white;
70
  }
skin/frontend/default/default/images/tnt/24h_domicile.jpg ADDED
Binary file
skin/frontend/default/default/images/tnt/24h_entreprise.jpg CHANGED
Binary file
skin/frontend/default/default/images/tnt/24h_relais.jpg ADDED
Binary file
skin/frontend/default/default/images/tnt/_24h_relais.jpg ADDED
Binary file
skin/frontend/default/default/images/tnt/_tnt_j.png ADDED
Binary file
skin/frontend/default/default/images/tnt/_tnt_jd.png ADDED
Binary file
skin/frontend/default/default/images/tnt/_tnt_jz.png ADDED
Binary file
skin/frontend/default/default/images/tnt/relaisColis/24_relaiscolis.jpg ADDED
Binary file
skin/frontend/default/default/images/tnt/relaisColis/_logo_24_chezmoi.jpg ADDED
Binary file
skin/frontend/default/default/images/tnt/relaisColis/_logo_24_relaiscolis.jpg ADDED
Binary file
skin/frontend/default/default/images/tnt/relaisColis/_logo_24h_chezmoi_RVB.gif ADDED
Binary file
skin/frontend/default/default/images/tnt/relaisColis/_logo_24h_relaiscolis_RVB.gif ADDED
Binary file
skin/frontend/default/default/images/tnt/relaisColis/_logos_24.jpg ADDED
Binary file
skin/frontend/default/default/images/tnt/relaisColis/bt-CodePostal.jpg CHANGED
Binary file
skin/frontend/default/default/images/tnt/relaisColis/bt-Continuer.jpg CHANGED
Binary file
skin/frontend/default/default/images/tnt/relaisColis/bt-OK.jpg CHANGED
Binary file
skin/frontend/default/default/images/tnt/relaisColis/google/relaisColis2.png ADDED
Binary file
skin/frontend/default/default/images/tnt/relaisColis/logo_24_chezmoi.jpg CHANGED
Binary file
skin/frontend/default/default/images/tnt/relaisColis/logo_24_relaiscolis.jpg CHANGED
Binary file
skin/frontend/default/default/images/tnt/relaisColis/logo_24h_chezmoi_RVB.gif CHANGED
Binary file
skin/frontend/default/default/images/tnt/relaisColis/logo_24h_relaiscolis_RVB.gif CHANGED
Binary file
skin/frontend/default/default/images/tnt/relaisColis/logos_24.jpg CHANGED
Binary file
skin/frontend/default/default/images/tnt/relaisColis/loupe.gif CHANGED
Binary file
skin/frontend/default/default/images/tnt/relaisColis/picto-delai.gif CHANGED
Binary file
skin/frontend/default/default/images/tnt/tnt_j.png CHANGED
Binary file
skin/frontend/default/default/images/tnt/tnt_jd.png CHANGED
Binary file
skin/frontend/default/default/images/tnt/tnt_jz.png CHANGED
Binary file
skin/frontend/default/default/js/tnt/relaisColis.js CHANGED
@@ -126,8 +126,8 @@ function tntRCafficheRelais(jData) {
126
  tntRCjTable.append(
127
  "<tr>"+
128
  "<td class='tntRCblanc' width='" + tntRCsize5 + "'></td>"+
129
- "<td class='tntRCblanc' width='" + tntRCsize50 + "'><img src='" + pathToImages + "logo-tnt-petit.jpg'>&nbsp;" + logo_point + "</td>"+
130
- "<td class='tntRCrelaisColis' width='" + tntRCsize650 + "'>" + nomRelais + " - " + adresse + " - " + codePostal + " - " + commune + "<BR>&nbsp;&nbsp;&nbsp;&nbsp;>> Ouvert jusqu'&agrave; " + heureFermeture + "</td>"+
131
  //"<td class='tntRCrelaisColis' width='" + tntRCsize10 + "'>&nbsp;</td>"+
132
  "<td class='tntRCrelaisColis' valign='middle' align='center' width='" + tntRCsize109 + "'>"+
133
  "<a href='#' onclick='tntRCafficheDetail(" + i + ");'><img src='" + pathToImages + "loupe.gif' class='tntRCBoutonLoupe'></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"+
@@ -306,10 +306,10 @@ function tntRCafficheCommunes(jData) {
306
 
307
  tntRCjTable.append(
308
  "<tr>"+
309
- "<td class='tntRCblanc' width='" + tntRCsize50 + "'><img src='" + pathToImages + "logo-tnt-petit.jpg'></td>" +
310
- "<td class='tntRCrelaisColis' width='80%'> " + nomVille + " (" + tntRCcodePostal + ") </td>" +
311
  //"<td class='tntRCrelaisColis' width='" + tntRCsize10 + "'>&nbsp;</td>"+
312
- "<td class='tntRCrelaisColis' align='center' width='20%'>"+
313
  "<input type='radio' name='tntRCchoixComm' value='" + nomVille + "' " + ( i ==1 ? "checked" : "") + ">"+
314
  "</td>"+
315
  //"<td class='tntRCblanc' width='" + tntRCsize6 + "'></td>"+
@@ -474,7 +474,7 @@ function tntRCafficheDetail(i) {
474
  + "</tr>"
475
  + "<tr>"
476
  + "<td>"
477
- + "<table class='tntRCHoraire' cellpadding='0' cellspacing='0' rules='all' width='" + tntRCsize206 + "'>"
478
  + "<tr>"
479
  + "<td class='tntRCHoraireJour'>Lundi</td>"
480
  + "<td class='tntRCHoraireHeure'>" + lundi_am + "</td>"
@@ -559,7 +559,7 @@ function tntRCenteteGrise6Col() {
559
 
560
  //Table entête de colonnes grises
561
  function tntRCenteteGrise6Col2() {
562
- return("<tr height='25px'><td class='tntRCgris' colspan='2' width='80%'>&nbsp;Les diff&eacute;rents Relais Colis&#174;</td><td class='tntRCgris' width='20%'>&nbsp;Mon choix</td></tr>");
563
  };
564
 
565
  // Zone de saisie d'un code postal nouveau
126
  tntRCjTable.append(
127
  "<tr>"+
128
  "<td class='tntRCblanc' width='" + tntRCsize5 + "'></td>"+
129
+ "<td class='tntRCblanc' width='1%'></td>"+
130
+ "<td class='tntRCrelaisColis' width='75%'>" + nomRelais + " - " + adresse + " - " + codePostal + " - " + commune + "<BR>&nbsp;&nbsp;&nbsp;&nbsp;>> Ouvert jusqu'&agrave; " + heureFermeture + "</td>"+
131
  //"<td class='tntRCrelaisColis' width='" + tntRCsize10 + "'>&nbsp;</td>"+
132
  "<td class='tntRCrelaisColis' valign='middle' align='center' width='" + tntRCsize109 + "'>"+
133
  "<a href='#' onclick='tntRCafficheDetail(" + i + ");'><img src='" + pathToImages + "loupe.gif' class='tntRCBoutonLoupe'></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"+
306
 
307
  tntRCjTable.append(
308
  "<tr>"+
309
+ "<td class='tntRCblanc' width='1%'></td>" +
310
+ "<td class='tntRCrelaisColis' width='69%'> " + nomVille + " (" + tntRCcodePostal + ") </td>" +
311
  //"<td class='tntRCrelaisColis' width='" + tntRCsize10 + "'>&nbsp;</td>"+
312
+ "<td class='tntRCrelaisColis' align='center' width='30%'>"+
313
  "<input type='radio' name='tntRCchoixComm' value='" + nomVille + "' " + ( i ==1 ? "checked" : "") + ">"+
314
  "</td>"+
315
  //"<td class='tntRCblanc' width='" + tntRCsize6 + "'></td>"+
474
  + "</tr>"
475
  + "<tr>"
476
  + "<td>"
477
+ + "<table class='tntRCHoraire' cellpadding='0' cellspacing='0' rules='all' border='1' border-color='gray' width='" + tntRCsize206 + "'>"
478
  + "<tr>"
479
  + "<td class='tntRCHoraireJour'>Lundi</td>"
480
  + "<td class='tntRCHoraireHeure'>" + lundi_am + "</td>"
559
 
560
  //Table entête de colonnes grises
561
  function tntRCenteteGrise6Col2() {
562
+ return("<tr height='25px'><td class='tntRCgris' colspan='2' width='70%'>&nbsp;Les diff&eacute;rents Relais Colis&#174;</td><td class='tntRCgris' width='30%' align='center'>&nbsp;Mon choix</td></tr>");
563
  };
564
 
565
  // Zone de saisie d'un code postal nouveau
skin/frontend/default/default/js/tnt/relaisColisIE7.js CHANGED
@@ -127,8 +127,8 @@ function tntRCafficheRelais(jData) {
127
  tntRCjTable.append(
128
  "<tr>"+
129
  "<td class='tntRCblanc' width='" + tntRCsize5 + "'></td>"+
130
- "<td class='tntRCblanc' width='" + tntRCsize50 + "'><img src='" + pathToImages + "logo-tnt-petit.jpg'>&nbsp;" + logo_point + "</td>"+
131
- "<td class='tntRCrelaisColis' width='" + tntRCsize650 + "'>" + nomRelais + " - " + adresse + " - " + codePostal + " - " + commune + "<BR>&nbsp;&nbsp;&nbsp;&nbsp;>> Ouvert jusqu'&agrave; " + heureFermeture + "</td>"+
132
  //"<td class='tntRCrelaisColis' width='" + tntRCsize10 + "'>&nbsp;</td>"+
133
  "<td class='tntRCrelaisColis' valign='middle' align='center' width='" + tntRCsize109 + "'>"+
134
  "<a href='#' onclick='tntRCafficheDetail(" + i + ");'><img src='" + pathToImages + "loupe.gif' class='tntRCBoutonLoupe'></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"+
@@ -308,10 +308,10 @@ function tntRCafficheCommunes(jData) {
308
 
309
  tntRCjTable.append(
310
  "<tr>"+
311
- "<td class='tntRCblanc' width='" + tntRCsize50 + "'><img src='" + pathToImages + "logo-tnt-petit.jpg'></td>" +
312
- "<td class='tntRCrelaisColis' width='80%'> " + nomVille + " (" + tntRCcodePostal + ") </td>" +
313
  //"<td class='tntRCrelaisColis' width='" + tntRCsize10 + "'>&nbsp;</td>"+
314
- "<td class='tntRCrelaisColis' align='center' width='20%'>"+
315
  "<input type='radio' name='tntRCchoixComm' value='" + nomVille + "' " + ( i ==1 ? "checked" : "") + ">"+
316
  "</td>"+
317
  //"<td class='tntRCblanc' width='" + tntRCsize6 + "'></td>"+
@@ -561,7 +561,7 @@ function tntRCenteteGrise6Col() {
561
 
562
  //Table entête de colonnes grises
563
  function tntRCenteteGrise6Col2() {
564
- return("<tr height='25px'><td class='tntRCgris' colspan='2' width='80%'>&nbsp;Les diff&eacute;rents Relais Colis&#174;</td><td class='tntRCgris' width='20%'>&nbsp;Mon choix</td></tr>");
565
  };
566
 
567
  // Zone de saisie d'un code postal nouveau
127
  tntRCjTable.append(
128
  "<tr>"+
129
  "<td class='tntRCblanc' width='" + tntRCsize5 + "'></td>"+
130
+ "<td class='tntRCblanc' width='1%'></td>"+
131
+ "<td class='tntRCrelaisColis' width='75%'>" + nomRelais + " - " + adresse + " - " + codePostal + " - " + commune + "<BR>&nbsp;&nbsp;&nbsp;&nbsp;>> Ouvert jusqu'&agrave; " + heureFermeture + "</td>"+
132
  //"<td class='tntRCrelaisColis' width='" + tntRCsize10 + "'>&nbsp;</td>"+
133
  "<td class='tntRCrelaisColis' valign='middle' align='center' width='" + tntRCsize109 + "'>"+
134
  "<a href='#' onclick='tntRCafficheDetail(" + i + ");'><img src='" + pathToImages + "loupe.gif' class='tntRCBoutonLoupe'></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"+
308
 
309
  tntRCjTable.append(
310
  "<tr>"+
311
+ "<td class='tntRCblanc' width='1%'></td>" +
312
+ "<td class='tntRCrelaisColis' width='69%'> " + nomVille + " (" + tntRCcodePostal + ") </td>" +
313
  //"<td class='tntRCrelaisColis' width='" + tntRCsize10 + "'>&nbsp;</td>"+
314
+ "<td class='tntRCrelaisColis' align='center' width='30%'>"+
315
  "<input type='radio' name='tntRCchoixComm' value='" + nomVille + "' " + ( i ==1 ? "checked" : "") + ">"+
316
  "</td>"+
317
  //"<td class='tntRCblanc' width='" + tntRCsize6 + "'></td>"+
561
 
562
  //Table entête de colonnes grises
563
  function tntRCenteteGrise6Col2() {
564
+ return("<tr height='25px'><td class='tntRCgris' colspan='2' width='70%'>&nbsp;Les diff&eacute;rents Relais Colis&#174;</td><td class='tntRCgris' width='30%' align='center'>&nbsp;Mon choix</td></tr>");
565
  };
566
 
567
  // Zone de saisie d'un code postal nouveau
skin/frontend/default/default/js/tnt/suiviColis.js CHANGED
@@ -204,8 +204,8 @@ function tntB2CSuiviColisDisplayDetail(jsondoc) {
204
  "<td width='10px'></td>"+
205
  "<td width='100px'><b>Bon de transport</b></td>"+
206
  "<td width='135px' id='ancestor'>" + bonTransport + "</td>"+
207
- "<td width='75px' style='color:#FF6600;'><b>Statut colis</b></td>"+
208
- "<td width='150px' style='color:#FF6600;'>" + status + "</td>"+
209
  "<td width='10px'></td>"+
210
  "</tr>"+
211
  "<tr><td colspan='6' height='1px'></td></tr>"+
204
  "<td width='10px'></td>"+
205
  "<td width='100px'><b>Bon de transport</b></td>"+
206
  "<td width='135px' id='ancestor'>" + bonTransport + "</td>"+
207
+ "<td width='75px' style='color:#FF6600;'></td>"+
208
+ "<td width='150px' style='color:#FF6600;'></td>"+
209
  "<td width='10px'></td>"+
210
  "</tr>"+
211
  "<tr><td colspan='6' height='1px'></td></tr>"+
skin/frontend/default/default/js/tnt/tnt.js CHANGED
@@ -19,20 +19,26 @@ function radioCheck(){
19
  $("tnt_pr").show();
20
  $("tnt_pr_choix").hide();
21
 
22
- } else {
23
- if($("tnt_pr")) { $("tnt_pr").hide(); }
24
- $("tnt_relais1").value = '';
25
- $("tnt_pr_choix").innerHTML = '';
26
- $("tnt_pr_choix").hide();
27
 
28
  fetchVille($("city_url").value, 'villes');
29
  $("tnt_cp").show();
30
 
31
  if ($('s_method_tnt_JZ') && $("s_method_tnt_JZ").checked){
 
 
 
 
 
32
  $("comp_entreprise").hide();
33
  $("comp_domicile").show();
34
  }
35
  if ($('s_method_tnt_J') && $("s_method_tnt_J").checked){
 
 
 
 
 
36
  $("comp_domicile").hide();
37
  $("comp_entreprise").show();
38
  }
19
  $("tnt_pr").show();
20
  $("tnt_pr_choix").hide();
21
 
22
+ } else {
 
 
 
 
23
 
24
  fetchVille($("city_url").value, 'villes');
25
  $("tnt_cp").show();
26
 
27
  if ($('s_method_tnt_JZ') && $("s_method_tnt_JZ").checked){
28
+ if($("tnt_pr")) { $("tnt_pr").hide(); }
29
+ $("tnt_relais1").value = '';
30
+ $("tnt_pr_choix").innerHTML = '';
31
+ $("tnt_pr_choix").hide();
32
+
33
  $("comp_entreprise").hide();
34
  $("comp_domicile").show();
35
  }
36
  if ($('s_method_tnt_J') && $("s_method_tnt_J").checked){
37
+ if($("tnt_pr")) { $("tnt_pr").hide(); }
38
+ $("tnt_relais1").value = '';
39
+ $("tnt_pr_choix").innerHTML = '';
40
+ $("tnt_pr_choix").hide();
41
+
42
  $("comp_domicile").hide();
43
  $("comp_entreprise").show();
44
  }
skin/frontend/default/default/tnt_relaisColis.php CHANGED
@@ -22,8 +22,12 @@
22
  <div id="tntB2CRelaisColis" class="exemplePresentation"></div>
23
 
24
  <div id="promoRelaisColis">
25
- <div class="logo"><div class="image"><img src="images/tnt/relaisColis/logo_24_relaiscolis.jpg" width="130"></div><div class="desc">Votre colis est livré le lendemain matin de son expédition dans le Relais Colis<sup class='tntRCSup'>&#174;</sup> sélectionné.</div></div>
26
- <div class="description">Avec 4000 Relais Colis<sup class='tntRCSup'>&#174;</sup> 85% de la population française est située à moins de 5 km d'un commerçant Relais Colis<sup class='tntRCSup'>&#174;</sup>.</div>
 
 
 
 
27
  </div>
28
 
29
  <!-- Element (optionel) à définir pour afficher une Google Map associée à la liste de relais
22
  <div id="tntB2CRelaisColis" class="exemplePresentation"></div>
23
 
24
  <div id="promoRelaisColis">
25
+ <img src="images/tnt/relaisColis/24_relaiscolis.jpg" width="363">
26
+ <!-- div class="logo">
27
+ <div class="image"><img src="images/tnt/relaisColis/logo_24_relaiscolis.jpg" width="130"></div>
28
+ <div class="desc">Votre colis est livré le lendemain matin de son expédition dans le Relais Colis<sup class='tntRCSup'>&#174;</sup> sélectionné.</div>
29
+ </div>
30
+ <div class="description">Avec 4000 Relais Colis<sup class='tntRCSup'>&#174;</sup> 85% de la population française est située à moins de 5 km d'un commerçant Relais Colis<sup class='tntRCSup'>&#174;</sup>.</div-->
31
  </div>
32
 
33
  <!-- Element (optionel) à définir pour afficher une Google Map associée à la liste de relais