TNT_Express_Fr - Version 2.0.10

Version Notes

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

- corrige la gestion des frais de port sur les produits configurables.
- corrige le poids max par colis sur les étiquettes en fonction du mode choisi (relais, indiv = 20kg, entreprise = 30kg)
- ajout du dispatche manuel du poids des colis
- modification du dispatche manuel du poids des colis
- modification du + d'infos TNT 24 domicile
- suppression de l'image du calendar spécifique - ajout de l'image calendar générique

Download this release

Release Info

Developer Infostrates
Extension TNT_Express_Fr
Version 2.0.10
Comparing to
See all releases


Code changes from version 3.0.10 to 2.0.10

Files changed (11) hide show
  1. app/code/community/Infostrates/Tnt/Model/Shipping/Carrier/Tnt.php +9 -9
  2. app/code/community/Infostrates/Tnt/etc/config.xml +1 -1
  3. app/code/local/Varien/Data/Collection/Db.php +200 -135
  4. app/design/adminhtml/default/tnt/template/sales/items/column/name.phtml +1 -1
  5. app/design/adminhtml/default/tnt/template/sales/order/shipment/create/form.phtml +1 -1
  6. app/design/adminhtml/default/tnt/template/sales/order/shipment/create/items.phtml +7 -22
  7. app/design/frontend/default/default/template/tnt/form/_failure.phtml +14 -0
  8. app/design/frontend/default/default/template/tnt/onepage/shipping_method/available.phtml +254 -82
  9. app/design/frontend/default/default/template/tnt/sales/order/info.phtml +151 -138
  10. app/design/frontend/default/default/template/tnt/sales/order/view.phtml +148 -120
  11. package.xml +10 -5
app/code/community/Infostrates/Tnt/Model/Shipping/Carrier/Tnt.php CHANGED
@@ -21,10 +21,10 @@ implements Mage_Shipping_Model_Carrier_Interface
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 ) {
@@ -218,17 +218,17 @@ implements Mage_Shipping_Model_Carrier_Interface
218
  $items = Mage::getSingleton('checkout/session')->getQuote()->getAllItems();
219
  $shipping_weight = 0;
220
  $heaviest_item = 0;
221
-
222
  foreach($items as $item) {
223
  if( $item->getProductType() == 'configurable' ) {
224
- } else {
225
  //check l'article le plus lourd
226
- if( $item->getWeight() > $heaviest_item) {
227
  $heaviest_item = $item->getWeight();
228
  }
229
  $shipping_weight += ($item->getWeight() * $item->getQty()) ;
230
  }
231
- }
232
 
233
  //si le poids total du colis dépasse la limite pour TNT (définie par le commercant)
234
  //si la limite est à 0 alors on passe en mode 'Pas de limite'
@@ -268,7 +268,7 @@ implements Mage_Shipping_Model_Carrier_Interface
268
 
269
  if( $this->getConfigData($m['serviceCode'].'_free') != 0 && $this->getConfigData($m['serviceCode'].'_free') <= $totalCart ) {
270
  $tarif = '0';
271
- } else {
272
  $table = explode(",", $this->getConfigData($m['serviceCode'].'_amount'));
273
 
274
  $tarifTrouve=true;
@@ -317,9 +317,9 @@ implements Mage_Shipping_Model_Carrier_Interface
317
  $city = '';
318
 
319
  $parametres = array('zipCode' => $cp);
320
-
321
  $result = $this->ws_tnt_communication($fonction, $parametres);
322
-
323
  if( is_string($result) ) {
324
  $debugData['result'] = array('error' => $result);
325
  $city = $result;
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 ) {
218
  $items = Mage::getSingleton('checkout/session')->getQuote()->getAllItems();
219
  $shipping_weight = 0;
220
  $heaviest_item = 0;
221
+
222
  foreach($items as $item) {
223
  if( $item->getProductType() == 'configurable' ) {
224
+ } else {
225
  //check l'article le plus lourd
226
+ if( $item->getWeight() > $heaviest_item) {
227
  $heaviest_item = $item->getWeight();
228
  }
229
  $shipping_weight += ($item->getWeight() * $item->getQty()) ;
230
  }
231
+ }
232
 
233
  //si le poids total du colis dépasse la limite pour TNT (définie par le commercant)
234
  //si la limite est à 0 alors on passe en mode 'Pas de limite'
268
 
269
  if( $this->getConfigData($m['serviceCode'].'_free') != 0 && $this->getConfigData($m['serviceCode'].'_free') <= $totalCart ) {
270
  $tarif = '0';
271
+ } else {
272
  $table = explode(",", $this->getConfigData($m['serviceCode'].'_amount'));
273
 
274
  $tarifTrouve=true;
317
  $city = '';
318
 
319
  $parametres = array('zipCode' => $cp);
320
+
321
  $result = $this->ws_tnt_communication($fonction, $parametres);
322
+
323
  if( is_string($result) ) {
324
  $debugData['result'] = array('error' => $result);
325
  $city = $result;
app/code/community/Infostrates/Tnt/etc/config.xml CHANGED
@@ -3,7 +3,7 @@
3
  <config>
4
  <modules>
5
  <Infostrates_Tnt>
6
- <version>3.0.10</version>
7
  <depends>
8
  <Mage_Adminhtml />
9
  <Mage_Shipping />
3
  <config>
4
  <modules>
5
  <Infostrates_Tnt>
6
+ <version>2.0.10</version>
7
  <depends>
8
  <Mage_Adminhtml />
9
  <Mage_Shipping />
app/code/local/Varien/Data/Collection/Db.php CHANGED
@@ -26,11 +26,11 @@
26
 
27
 
28
  /**
29
- * Base items collection class
30
  *
31
  * @category Varien
32
  * @package Varien_Data
33
- * @author Magento Core Team <core@magentocommerce.com>
34
  */
35
  class Varien_Data_Collection_Db extends Varien_Data_Collection
36
  {
@@ -93,13 +93,6 @@ class Varien_Data_Collection_Db extends Varien_Data_Collection
93
  */
94
  protected $_fetchStmt = null;
95
 
96
- /**
97
- * Whether orders are rendered
98
- *
99
- * @var bool
100
- */
101
- protected $_isOrdersRendered = false;
102
-
103
  public function __construct($conn=null)
104
  {
105
  parent::__construct();
@@ -189,7 +182,6 @@ class Varien_Data_Collection_Db extends Varien_Data_Collection
189
 
190
  $this->_conn = $conn;
191
  $this->_select = $this->_conn->select();
192
- $this->_isOrdersRendered = false;
193
  return $this;
194
  }
195
 
@@ -206,7 +198,7 @@ class Varien_Data_Collection_Db extends Varien_Data_Collection
206
  /**
207
  * Retrieve connection object
208
  *
209
- * @return Varien_Db_Adapter_Interface
210
  */
211
  public function getConnection()
212
  {
@@ -232,29 +224,29 @@ class Varien_Data_Collection_Db extends Varien_Data_Collection
232
  *
233
  * @return Varien_Db_Select
234
  */
235
- public function getSelectCountSql()
236
- {
237
- $this->_renderFilters();
238
-
239
- $countSelect = clone $this->getSelect();
240
- $countSelect->reset(Zend_Db_Select::ORDER);
241
- $countSelect->reset(Zend_Db_Select::LIMIT_COUNT);
242
- $countSelect->reset(Zend_Db_Select::LIMIT_OFFSET);
243
- $countSelect->reset(Zend_Db_Select::COLUMNS);
244
-
245
- //Added this code - START -------------------->
246
- if (Mage::getSingleton('adminhtml/url')->getRequest()->getModuleName() == 'tnt') {
247
- $countSelect->reset(Zend_Db_Select::GROUP);
248
- $countSelect->from('', 'COUNT(DISTINCT main_table.entity_id)');
249
- $countSelect->resetJoinLeft();
250
- } else {
251
- $countSelect->columns('COUNT(*)');
252
- }
253
- //Added this code - END -----------------------<
254
-
255
- return $countSelect;
256
- }
257
-
258
  /**
259
  * Get sql select string or object
260
  *
@@ -315,19 +307,20 @@ class Varien_Data_Collection_Db extends Varien_Data_Collection
315
  */
316
  private function _setOrder($field, $direction, $unshift = false)
317
  {
318
- $this->_isOrdersRendered = false;
319
  $field = (string)$this->_getMappedField($field);
320
  $direction = (strtoupper($direction) == self::SORT_ORDER_ASC) ? self::SORT_ORDER_ASC : self::SORT_ORDER_DESC;
321
-
322
- unset($this->_orders[$field]); // avoid ordering by the same field twice
323
  if ($unshift) {
324
- $orders = array($field => $direction);
325
- foreach ($this->_orders as $key => $dir) {
326
- $orders[$key] = $dir;
 
 
327
  }
328
  $this->_orders = $orders;
329
- } else {
330
- $this->_orders[$field] = $direction;
 
331
  }
332
  return $this;
333
  }
@@ -381,114 +374,183 @@ class Varien_Data_Collection_Db extends Varien_Data_Collection
381
  * Add field filter to collection
382
  *
383
  * @see self::_getConditionSql for $condition
384
- *
385
- * @param string|array $field
386
- * @param null|string|array $condition
387
- *
388
- * @return Mage_Eav_Model_Entity_Collection_Abstract
389
- */
390
- public function addFieldToFilter($field, $condition = null)
391
- {
392
- if (!is_array($field)) {
393
- $resultCondition = $this->_translateCondition($field, $condition);
394
- } else {
395
- $conditions = array();
396
- foreach ($field as $key => $currField) {
397
- $conditions[] = $this->_translateCondition(
398
- $currField,
399
- isset($condition[$key]) ? $condition[$key] : null
400
- );
401
- }
402
-
403
- $resultCondition = '(' . join(') ' . Zend_Db_Select::SQL_OR . ' (', $conditions) . ')';
404
- }
405
-
406
- $this->_select->where($resultCondition);
407
-
408
- return $this;
409
- }
410
-
411
- /**
412
- * Build sql where condition part
413
- *
414
- * @param string|array $field
415
- * @param null|string|array $condition
416
- *
417
- * @return string
418
  */
419
- protected function _translateCondition($field, $condition)
420
  {
421
  $field = $this->_getMappedField($field);
422
- return $this->_getConditionSql($field, $condition);
 
423
  }
424
 
425
  /**
426
  * Try to get mapped field name for filter to collection
427
  *
428
- * @param string $field
429
- * @return string
430
  */
431
  protected function _getMappedField($field)
432
  {
 
 
433
  $mapper = $this->_getMapper();
434
 
435
  if (isset($mapper['fields'][$field])) {
436
  $mappedFiled = $mapper['fields'][$field];
437
- } else {
438
- $mappedFiled = $field;
439
  }
440
 
441
  return $mappedFiled;
442
  }
443
 
444
- /**
445
- * Retrieve mapper data
446
- *
447
- * @return array|bool|null
448
- */
449
  protected function _getMapper()
450
  {
451
  if (isset($this->_map)) {
452
  return $this->_map;
453
- } else {
 
454
  return false;
455
  }
456
  }
457
-
458
- /**
459
  * Build SQL statement for condition
460
  *
461
- * If $condition integer or string - exact value will be filtered ('eq' condition)
462
- *
463
- * If $condition is array - one of the following structures is expected:
464
- * - array("from" => $fromValue, "to" => $toValue)
465
- * - array("eq" => $equalValue)
466
- * - array("neq" => $notEqualValue)
467
- * - array("like" => $likeValue)
468
- * - array("in" => array($inValues))
469
- * - array("nin" => array($notInValues))
470
- * - array("notnull" => $valueIsNotNull)
471
- * - array("null" => $valueIsNull)
472
- * - array("moreq" => $moreOrEqualValue)
473
- * - array("gt" => $greaterValue)
474
- * - array("lt" => $lessValue)
475
- * - array("gteq" => $greaterOrEqualValue)
476
- * - array("lteq" => $lessOrEqualValue)
477
- * - array("finset" => $valueInSet)
478
- * - array("regexp" => $regularExpression)
479
- * - array("seq" => $stringValue)
480
- * - array("sneq" => $stringValue)
481
  *
482
  * If non matched - sequential array is expected and OR conditions
483
  * will be built using above mentioned structure
484
  *
485
- * @param string $fieldName
486
  * @param integer|string|array $condition
487
  * @return string
488
  */
489
- protected function _getConditionSql($fieldName, $condition)
490
- {
491
- return $this->getConnection()->prepareSqlCondition($fieldName, $condition);
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
492
  }
493
 
494
  protected function _getConditionFieldName($fieldName)
@@ -503,11 +565,12 @@ class Varien_Data_Collection_Db extends Varien_Data_Collection
503
  */
504
  protected function _renderOrders()
505
  {
506
- if (!$this->_isOrdersRendered) {
507
- foreach ($this->_orders as $field => $direction) {
508
- $this->_select->order(new Zend_Db_Expr($field . ' ' . $direction));
509
- }
510
- $this->_isOrdersRendered = true;
 
511
  }
512
 
513
  return $this;
@@ -530,9 +593,7 @@ class Varien_Data_Collection_Db extends Varien_Data_Collection
530
  /**
531
  * Set select distinct
532
  *
533
- * @param bool $flag
534
- *
535
- * @return Varien_Data_Collection_Db
536
  */
537
  public function distinct($flag)
538
  {
@@ -553,9 +614,6 @@ class Varien_Data_Collection_Db extends Varien_Data_Collection
553
  /**
554
  * Load data
555
  *
556
- * @param bool $printQuery
557
- * @param bool $logQuery
558
- *
559
  * @return Varien_Data_Collection_Db
560
  */
561
  public function load($printQuery = false, $logQuery = false)
@@ -571,6 +629,7 @@ class Varien_Data_Collection_Db extends Varien_Data_Collection
571
  ->_renderLimit();
572
 
573
  $this->printLogQuery($printQuery, $logQuery);
 
574
  $data = $this->getData();
575
  $this->resetData();
576
 
@@ -594,7 +653,7 @@ class Varien_Data_Collection_Db extends Varien_Data_Collection
594
  * Returns a collection item that corresponds to the fetched row
595
  * and moves the internal data pointer ahead
596
  *
597
- * @return Varien_Object|bool
598
  */
599
  public function fetchItem()
600
  {
@@ -690,10 +749,8 @@ class Varien_Data_Collection_Db extends Varien_Data_Collection
690
  /**
691
  * Print and/or log query
692
  *
693
- * @param bool $printQuery
694
- * @param bool $logQuery
695
- * @param string $sql
696
- *
697
  * @return Varien_Data_Collection_Db
698
  */
699
  public function printLogQuery($printQuery = false, $logQuery = false, $sql = null) {
@@ -783,21 +840,29 @@ class Varien_Data_Collection_Db extends Varien_Data_Collection
783
  {
784
  return $this->_getCacheInstance();
785
  }
786
-
787
  /**
788
  * Get cache identifier base on select
789
  *
790
- * @param Zend_Db_Select|string $select
791
  * @return string
792
  */
793
  protected function _getSelectCacheId($select)
794
  {
795
- $id = md5((string)$select);
 
796
  if (isset($this->_cacheConf['prefix'])) {
797
  $id = $this->_cacheConf['prefix'].'_'.$id;
798
  }
799
  return $id;
800
- }
 
 
 
 
 
 
 
801
 
802
  /**
803
  * Retrieve cache instance
@@ -845,4 +910,4 @@ class Varien_Data_Collection_Db extends Varien_Data_Collection
845
 
846
  return $this;
847
  }
848
- }
26
 
27
 
28
  /**
29
+ * Base items collection class TNT
30
  *
31
  * @category Varien
32
  * @package Varien_Data
33
+ * @author Infostrates TNT
34
  */
35
  class Varien_Data_Collection_Db extends Varien_Data_Collection
36
  {
93
  */
94
  protected $_fetchStmt = null;
95
 
 
 
 
 
 
 
 
96
  public function __construct($conn=null)
97
  {
98
  parent::__construct();
182
 
183
  $this->_conn = $conn;
184
  $this->_select = $this->_conn->select();
 
185
  return $this;
186
  }
187
 
198
  /**
199
  * Retrieve connection object
200
  *
201
+ * @return Zend_Db_Adapter_Abstract
202
  */
203
  public function getConnection()
204
  {
224
  *
225
  * @return Varien_Db_Select
226
  */
227
+ public function getSelectCountSql()
228
+ {
229
+ $this->_renderFilters();
230
+
231
+ $countSelect = clone $this->getSelect();
232
+ $countSelect->reset(Zend_Db_Select::ORDER);
233
+ $countSelect->reset(Zend_Db_Select::LIMIT_COUNT);
234
+ $countSelect->reset(Zend_Db_Select::LIMIT_OFFSET);
235
+ $countSelect->reset(Zend_Db_Select::COLUMNS);
236
+
237
+ //Added this code - START -------------------->
238
+ if (Mage::getSingleton('adminhtml/url')->getRequest()->getModuleName() == 'tnt') {
239
+ $countSelect->reset(Zend_Db_Select::GROUP);
240
+ $countSelect->from('', 'COUNT(DISTINCT main_table.entity_id)');
241
+ $countSelect->resetJoinLeft();
242
+ } else {
243
+ $countSelect->columns('COUNT(*)');
244
+ }
245
+ //Added this code - END -----------------------<
246
+
247
+ return $countSelect;
248
+ }
249
+
250
  /**
251
  * Get sql select string or object
252
  *
307
  */
308
  private function _setOrder($field, $direction, $unshift = false)
309
  {
 
310
  $field = (string)$this->_getMappedField($field);
311
  $direction = (strtoupper($direction) == self::SORT_ORDER_ASC) ? self::SORT_ORDER_ASC : self::SORT_ORDER_DESC;
312
+ // emulate associative unshift
 
313
  if ($unshift) {
314
+ $orders = array($field => new Zend_Db_Expr($field . ' ' . $direction));
315
+ foreach ($this->_orders as $key => $expression) {
316
+ if (!isset($orders[$key])) {
317
+ $orders[$key] = $expression;
318
+ }
319
  }
320
  $this->_orders = $orders;
321
+ }
322
+ else {
323
+ $this->_orders[$field] = new Zend_Db_Expr($field . ' ' . $direction);
324
  }
325
  return $this;
326
  }
374
  * Add field filter to collection
375
  *
376
  * @see self::_getConditionSql for $condition
377
+ * @param string $field
378
+ * @param null|string|array $condition
379
+ * @return Mage_Eav_Model_Entity_Collection_Abstract
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
380
  */
381
+ public function addFieldToFilter($field, $condition=null)
382
  {
383
  $field = $this->_getMappedField($field);
384
+ $this->_select->where($this->_getConditionSql($field, $condition), null, Varien_Db_Select::TYPE_CONDITION);
385
+ return $this;
386
  }
387
 
388
  /**
389
  * Try to get mapped field name for filter to collection
390
  *
391
+ * @param string
392
+ * @return string
393
  */
394
  protected function _getMappedField($field)
395
  {
396
+ $mappedFiled = $field;
397
+
398
  $mapper = $this->_getMapper();
399
 
400
  if (isset($mapper['fields'][$field])) {
401
  $mappedFiled = $mapper['fields'][$field];
 
 
402
  }
403
 
404
  return $mappedFiled;
405
  }
406
 
 
 
 
 
 
407
  protected function _getMapper()
408
  {
409
  if (isset($this->_map)) {
410
  return $this->_map;
411
+ }
412
+ else {
413
  return false;
414
  }
415
  }
416
+
417
+ /**
418
  * Build SQL statement for condition
419
  *
420
+ * If $condition integer or string - exact value will be filtered
421
+ *
422
+ * If $condition is array is - one of the following structures is expected:
423
+ * - array("from"=>$fromValue, "to"=>$toValue)
424
+ * - array("like"=>$likeValue)
425
+ * - array("neq"=>$notEqualValue)
426
+ * - array("in"=>array($inValues))
427
+ * - array("nin"=>array($notInValues))
 
 
 
 
 
 
 
 
 
 
 
 
428
  *
429
  * If non matched - sequential array is expected and OR conditions
430
  * will be built using above mentioned structure
431
  *
432
+ * @param string|array $fieldName
433
  * @param integer|string|array $condition
434
  * @return string
435
  */
436
+ protected function _getConditionSql($fieldName, $condition) {
437
+ if ( version_compare(Mage::getVersion(), '1.6.0.0', '<') ) {
438
+ if (is_array($fieldName)) {
439
+ $orSql = array();
440
+ foreach ($fieldName as $key=>$name) {
441
+ if (isset($condition[$key])) {
442
+ $orSql[] = '('.$this->_getConditionSql($name, $condition[$key]).')';
443
+ } else {
444
+ //if nothing passed as condition adding empty condition to avoid sql error
445
+ $orSql[] = $this->getConnection()->quoteInto("$name = ?", '');
446
+ }
447
+ }
448
+ $sql = '('. join(' or ', $orSql) .')';
449
+ return $sql;
450
+ }
451
+
452
+ $sql = '';
453
+ $fieldName = $this->_getConditionFieldName($fieldName);
454
+ if (is_array($condition) && isset($condition['field_expr'])) {
455
+ $fieldName = str_replace(
456
+ '#?',
457
+ $this->getConnection()->quoteIdentifier($fieldName),
458
+ $condition['field_expr']
459
+ );
460
+ }
461
+ if (is_array($condition)) {
462
+ if (isset($condition['from']) || isset($condition['to'])) {
463
+ if (isset($condition['from'])) {
464
+ if (empty($condition['date'])) {
465
+ if ( empty($condition['datetime'])) {
466
+ $from = $condition['from'];
467
+ }
468
+ else {
469
+ $from = $this->getConnection()->convertDateTime($condition['from']);
470
+ }
471
+ }
472
+ else {
473
+ $from = $this->getConnection()->convertDate($condition['from']);
474
+ }
475
+ $sql.= $this->getConnection()->quoteInto("$fieldName >= ?", $from);
476
+ }
477
+ if (isset($condition['to'])) {
478
+ $sql.= empty($sql) ? '' : ' and ';
479
+
480
+ if (empty($condition['date'])) {
481
+ if ( empty($condition['datetime'])) {
482
+ $to = $condition['to'];
483
+ }
484
+ else {
485
+ $to = $this->getConnection()->convertDateTime($condition['to']);
486
+ }
487
+ }
488
+ else {
489
+ $to = $this->getConnection()->convertDate($condition['to']);
490
+ }
491
+
492
+ $sql.= $this->getConnection()->quoteInto("$fieldName <= ?", $to);
493
+ }
494
+ }
495
+ elseif (isset($condition['eq'])) {
496
+ $sql = $this->getConnection()->quoteInto("$fieldName = ?", $condition['eq']);
497
+ }
498
+ elseif (isset($condition['neq'])) {
499
+ $sql = $this->getConnection()->quoteInto("$fieldName != ?", $condition['neq']);
500
+ }
501
+ elseif (isset($condition['like'])) {
502
+ $sql = $this->getConnection()->quoteInto("$fieldName like ?", $condition['like']);
503
+ }
504
+ elseif (isset($condition['nlike'])) {
505
+ $sql = $this->getConnection()->quoteInto("$fieldName not like ?", $condition['nlike']);
506
+ }
507
+ elseif (isset($condition['in'])) {
508
+ $sql = $this->getConnection()->quoteInto("$fieldName in (?)", $condition['in']);
509
+ }
510
+ elseif (isset($condition['nin'])) {
511
+ $sql = $this->getConnection()->quoteInto("$fieldName not in (?)", $condition['nin']);
512
+ }
513
+ elseif (isset($condition['is'])) {
514
+ $sql = $this->getConnection()->quoteInto("$fieldName is ?", $condition['is']);
515
+ }
516
+ elseif (isset($condition['notnull'])) {
517
+ $sql = "$fieldName is NOT NULL";
518
+ }
519
+ elseif (isset($condition['null'])) {
520
+ $sql = "$fieldName is NULL";
521
+ }
522
+ elseif (isset($condition['moreq'])) {
523
+ $sql = $this->getConnection()->quoteInto("$fieldName >= ?", $condition['moreq']);
524
+ }
525
+ elseif (isset($condition['gt'])) {
526
+ $sql = $this->getConnection()->quoteInto("$fieldName > ?", $condition['gt']);
527
+ }
528
+ elseif (isset($condition['lt'])) {
529
+ $sql = $this->getConnection()->quoteInto("$fieldName < ?", $condition['lt']);
530
+ }
531
+ elseif (isset($condition['gteq'])) {
532
+ $sql = $this->getConnection()->quoteInto("$fieldName >= ?", $condition['gteq']);
533
+ }
534
+ elseif (isset($condition['lteq'])) {
535
+ $sql = $this->getConnection()->quoteInto("$fieldName <= ?", $condition['lteq']);
536
+ }
537
+ elseif (isset($condition['finset'])) {
538
+ $sql = $this->getConnection()->quoteInto("find_in_set(?,$fieldName)", $condition['finset']);
539
+ }
540
+ else {
541
+ $orSql = array();
542
+ foreach ($condition as $orCondition) {
543
+ $orSql[] = "(".$this->_getConditionSql($fieldName, $orCondition).")";
544
+ }
545
+ $sql = "(".join(" or ", $orSql).")";
546
+ }
547
+ } else {
548
+ $sql = $this->getConnection()->quoteInto("$fieldName = ?", (string)$condition);
549
+ }
550
+ return $sql;
551
+ } else {
552
+ return $this->getConnection()->prepareSqlCondition($fieldName, $condition);
553
+ }
554
  }
555
 
556
  protected function _getConditionFieldName($fieldName)
565
  */
566
  protected function _renderOrders()
567
  {
568
+ $ordersInSelect = $this->_select->getPart(Zend_Db_Select::ORDER);
569
+
570
+ foreach ($this->_orders as $orderExpr) {
571
+ if (!in_array($orderExpr, $ordersInSelect)) {
572
+ $this->_select->order($orderExpr);
573
+ }
574
  }
575
 
576
  return $this;
593
  /**
594
  * Set select distinct
595
  *
596
+ * @param bool $flag
 
 
597
  */
598
  public function distinct($flag)
599
  {
614
  /**
615
  * Load data
616
  *
 
 
 
617
  * @return Varien_Data_Collection_Db
618
  */
619
  public function load($printQuery = false, $logQuery = false)
629
  ->_renderLimit();
630
 
631
  $this->printLogQuery($printQuery, $logQuery);
632
+
633
  $data = $this->getData();
634
  $this->resetData();
635
 
653
  * Returns a collection item that corresponds to the fetched row
654
  * and moves the internal data pointer ahead
655
  *
656
+ * return Varien_Object|bool
657
  */
658
  public function fetchItem()
659
  {
749
  /**
750
  * Print and/or log query
751
  *
752
+ * @param boolean $printQuery
753
+ * @param boolean $logQuery
 
 
754
  * @return Varien_Data_Collection_Db
755
  */
756
  public function printLogQuery($printQuery = false, $logQuery = false, $sql = null) {
840
  {
841
  return $this->_getCacheInstance();
842
  }
843
+
844
  /**
845
  * Get cache identifier base on select
846
  *
847
+ * @param Zend_Db_Select $select
848
  * @return string
849
  */
850
  protected function _getSelectCacheId($select)
851
  {
852
+ if ( version_compare(Mage::getVersion(), '1.6.0.0', '<') ) {
853
+ $id = md5($select->__toString());
854
  if (isset($this->_cacheConf['prefix'])) {
855
  $id = $this->_cacheConf['prefix'].'_'.$id;
856
  }
857
  return $id;
858
+ } else {
859
+ $id = md5((string)$select);
860
+ if (isset($this->_cacheConf['prefix'])) {
861
+ $id = $this->_cacheConf['prefix'].'_'.$id;
862
+ }
863
+ return $id;
864
+ }
865
+ }
866
 
867
  /**
868
  * Retrieve cache instance
910
 
911
  return $this;
912
  }
913
+ }
app/design/adminhtml/default/tnt/template/sales/items/column/name.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/adminhtml/default/tnt/template/sales/order/shipment/create/form.phtml CHANGED
@@ -52,7 +52,7 @@
52
  if($_shippingMethod[1] == 'A' || $_shippingMethod[1] == 'T' || $_shippingMethod[1] == 'M' || $_shippingMethod[1] == 'J') {
53
  $entreprise = '1';
54
  } ?>
55
-
56
  <?php if (($_shippingMethod[0] == 'tnt')) :
57
  if( $entreprise == '1' ) { $poidsMaxColis = '30'; } else { $poidsMaxColis = '20'; }
58
  $reste = $orderPoids = round($_order->getWeight(),2);
52
  if($_shippingMethod[1] == 'A' || $_shippingMethod[1] == 'T' || $_shippingMethod[1] == 'M' || $_shippingMethod[1] == 'J') {
53
  $entreprise = '1';
54
  } ?>
55
+
56
  <?php if (($_shippingMethod[0] == 'tnt')) :
57
  if( $entreprise == '1' ) { $poidsMaxColis = '30'; } else { $poidsMaxColis = '20'; }
58
  $reste = $orderPoids = round($_order->getWeight(),2);
app/design/adminhtml/default/tnt/template/sales/order/shipment/create/items.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package default_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -72,12 +72,6 @@
72
  <div class="box-right entry-edit">
73
  <div class="order-totals">
74
  <div class="order-totals-bottom">
75
- <?php if ($this->canCreateShippingLabel()): ?>
76
- <p>
77
- <label class="normal" for="create_shipping_label"><?php echo Mage::helper('sales')->__('Create Shipping Label') ?></label>
78
- <input id="create_shipping_label" name="shipment[create_shipping_label]" value="1" type="checkbox" onclick="toggleCreateLabelCheckbox();" />
79
- </p>
80
- <?php endif ?>
81
  <p>
82
  <label class="normal" for="notify_customer"><?php echo Mage::helper('sales')->__('Append Comments') ?></label>
83
  <input id="notify_customer" name="shipment[comment_customer_notify]" value="1" type="checkbox" />
@@ -89,7 +83,9 @@
89
  </p>
90
  <?php endif; ?>
91
  <div class="a-right">
92
- <?php echo $this->getChildHtml('submit_button') ?>
 
 
93
  </div>
94
  </div>
95
  </div>
@@ -115,16 +111,8 @@ function bindSendEmail()
115
  //shipmentCommentText.disabled = true;
116
  }
117
  }
118
- function toggleCreateLabelCheckbox(){
119
- var checkbox = $('create_shipping_label');
120
- var submitButton = checkbox.up('.order-totals').select('.submit-button span')[0];
121
- if (checkbox.checked) {
122
- submitButton.innerText += '...';
123
- } else {
124
- submitButton.innerText = submitButton.innerText.replace(/\.\.\.$/, '');
125
- }
126
- }
127
- function submitShipment(btn){
128
  if( $('orderPoids') ) {
129
  var checkPoids = '0';
130
  var colis = $$('.colis').each(function(e) {
@@ -143,10 +131,7 @@ function submitShipment(btn){
143
  }
144
  }
145
 
146
- var checkbox = $(btn).up('.order-totals').select('#create_shipping_label')[0];
147
- if (checkbox && checkbox.checked) {
148
- packaging.showWindow();
149
- } else if(editForm.submit()) {
150
  disableElements('submit-button');
151
  }
152
  }
20
  *
21
  * @category design
22
  * @package default_default
23
+ * @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
72
  <div class="box-right entry-edit">
73
  <div class="order-totals">
74
  <div class="order-totals-bottom">
 
 
 
 
 
 
75
  <p>
76
  <label class="normal" for="notify_customer"><?php echo Mage::helper('sales')->__('Append Comments') ?></label>
77
  <input id="notify_customer" name="shipment[comment_customer_notify]" value="1" type="checkbox" />
83
  </p>
84
  <?php endif; ?>
85
  <div class="a-right">
86
+ <button class="scalable save submit-button" id="id_db23f4f646fabd5a75afdea661f17e98" onclick="disableElements2('submit-button');" type="button">
87
+ <span><?php echo Mage::helper('sales')->__('Submit Shipment'); ?></span>
88
+ </button>
89
  </div>
90
  </div>
91
  </div>
111
  //shipmentCommentText.disabled = true;
112
  }
113
  }
114
+
115
+ function disableElements2(btn){
 
 
 
 
 
 
 
 
116
  if( $('orderPoids') ) {
117
  var checkPoids = '0';
118
  var colis = $$('.colis').each(function(e) {
131
  }
132
  }
133
 
134
+ if(editForm.submit()) {
 
 
 
135
  disableElements('submit-button');
136
  }
137
  }
app/design/frontend/default/default/template/tnt/form/_failure.phtml ADDED
@@ -0,0 +1,14 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Infostrates_Tnt
4
+ *
5
+ * @category Infostrates
6
+ * @package Infostrates_Tnt
7
+ * @copyright Copyright (c) 2011 Infostrates
8
+ * @author Infostrates (http://www.infostrates.fr)
9
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10
+ */
11
+ ?>
12
+ <h1><?php echo $this->__('Une erreur technique a été rencontrée') ?></h1>
13
+
14
+ <p><?php echo $this->__('Merci de soumettre votre commande ultérieurement') ?></p>
app/design/frontend/default/default/template/tnt/onepage/shipping_method/available.phtml CHANGED
@@ -22,34 +22,189 @@
22
 
23
  var lastPrice='';
24
  </script>
25
-
26
- <?php $_shippingRateGroups = $this->getShippingRates(); ?>
27
- <?php if (!$_shippingRateGroups): ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
28
  <p><?php echo $this->__('Sorry, no quotes are available for this order at this time.') ?></p>
29
  <?php else: ?>
30
  <dl class="sp-methods">
31
- <?php $shippingCodePrice = array(); ?>
32
- <?php $_sole = count($_shippingRateGroups) == 1;
33
- $quote = Mage::getSingleton('checkout/session')->getQuote();
34
-
 
35
  foreach ($_shippingRateGroups as $code => $_rates): ?>
36
- <dt><?php echo $this->escapeHtml($this->getCarrierName($code)) ?></dt>
37
  <dd>
38
  <ul>
39
- <?php $_sole = $_sole && count($_rates) == 1;
40
-
41
- foreach ($_rates as $_rate): ?>
42
  <?php $shippingCodePrice[] = "'".$_rate->getCode()."':".(float)$_rate->getPrice(); ?>
43
- <li>
44
  <?php if ($_rate->getErrorMessage()): ?>
45
- <ul class="messages"><li class="error-msg"><ul><li><?php echo $this->escapeHtml($_rate->getErrorMessage()) ?></li></ul></li></ul>
46
  <?php else: ?>
47
- <?php if( preg_match('/tnt_/', $_rate->getCode()) == 0 ) { ?>
 
48
  <?php if ($_sole) : ?>
49
  <span class="no-display"><input name="shipping_method" type="radio" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_rate->getCode() ?>" checked="checked" /></span>
50
  <?php else: ?>
51
- <input name="shipping_method" type="radio" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$this->getAddressShippingMethod()) echo ' checked="checked"' ?> class="radio"/>
52
-
53
  <?php if ($_rate->getCode() === $this->getAddressShippingMethod()): ?>
54
  <script type="text/javascript">
55
  //<![CDATA[
@@ -57,9 +212,9 @@
57
  //]]>
58
  </script>
59
  <?php endif; ?>
60
-
61
  <?php endif; ?>
62
- <label for="s_method_<?php echo $_rate->getCode() ?>"><?php echo $this->escapeHtml($_rate->getMethodTitle()) ?>
63
  <?php $_excl = $this->getShippingPrice($_rate->getPrice(), $this->helper('tax')->displayShippingPriceIncludingTax()); ?>
64
  <?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
65
  <?php echo $_excl; ?>
@@ -67,15 +222,16 @@
67
  (<?php echo $this->__('Incl. Tax'); ?> <?php echo $_incl; ?>)
68
  <?php endif; ?>
69
  </label>
70
- <?php } ?>
71
 
72
- <?php //je filtre les envois TNT vers les entreprises si le champ company n'est pas renseigné
 
 
73
  if( (($_rate->getCode() == 'tnt_AZ' || $_rate->getCode() == 'tnt_TZ' || $_rate->getCode() == 'tnt_MZ' || $_rate->getCode() == 'tnt_JZ')
74
  && $quote->getShippingAddress()->getCompany() == '')
75
  || (($_rate->getCode() == 'tnt_A' || $_rate->getCode() == 'tnt_T' || $_rate->getCode() == 'tnt_M' || $_rate->getCode() == 'tnt_J')
76
  && $quote->getShippingAddress()->getCompany() != '' )
77
  || $_rate->getCode() == 'tnt_JD' ) { ?>
78
-
79
 
80
  <?php if ($_sole) : ?>
81
  <span class="no-display"><input name="shipping_method" type="radio" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_rate->getCode() ?>" checked="checked" /></span>
@@ -91,7 +247,8 @@
91
  <?php endif; ?>
92
 
93
  <?php endif; ?>
94
- <label for="s_method_<?php echo $_rate->getCode() ?>"><?php echo $this->escapeHtml($_rate->getMethodTitle()) ?>
 
95
  <?php $_excl = $this->getShippingPrice($_rate->getPrice(), $this->helper('tax')->displayShippingPriceIncludingTax()); ?>
96
  <?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
97
  <?php echo $_excl; ?>
@@ -106,63 +263,67 @@
106
  <img src="<?php echo $this->getSkinUrl("images/tnt/".$tmp_desc['2']); ?>" alt="<?php echo $_rate->getMethodTitle() ?>" style="float:left;margin-right:10px;" />
107
  <span>
108
  <?php echo $tmp_desc['0']; ?>
109
- <?php if( $tmp_desc['1'] != '' ) { ?>
 
110
  &nbsp;<a href="<?php echo $this->getSkinUrl($tmp_desc['1']); ?>" rel="superbox[image]" class="moreInfos">+ d'infos</a>
 
 
 
111
  <?php } ?>
112
  </span>
113
  <div style="clear:both;"></div>
114
 
115
- <?php if( $_rate->getCode() != 'tnt_JD' ) {
116
- $telephone = $quote->getShippingAddress()->getTelephone();
117
- $telephone = str_replace(' ', '', $telephone);
118
- $telephone = str_replace('-', '', $telephone);
119
- $telephone = str_replace('.', '', $telephone);
120
- $telephone = str_replace('/', '', $telephone);
121
- $telephone = str_replace('+33', '0', $telephone);
122
-
123
- $style_tel = "block";
124
- if( substr($telephone, 0, 2) == '06' || substr($telephone, 0, 2) == '07' ) {
125
- $style_tel = "none";
126
- } else {
127
- $telephone = '';
128
- } ?>
129
- <div id="tnt_cp" style="display:none" >
130
- <div id="villes"></div>
131
- <div id="comp_domicile" style="display:none">
132
- <span>Pour assurer une livraison dans les meilleures conditions, merci de renseigner les champs ci-dessous qui vous concernent.</span>
133
- <div class="clr-left" style="display:<?php echo $style_tel; ?>;"><label>Téléphone portable :</label> <input type="text" id="portable" name="portable" maxlength="10" value="<?php echo $telephone; ?>" /> <span>Ex : 0602030405</span></div>
134
- <div class="clr-left"><label>Code porte :</label> <input type="text" id="code" name="code" maxlength="7" /><span>Ex : A8120</span></div>
135
- <div class="clr-left"><label>Etage :</label> <input type="text" id="etage" name="etage" maxlength="2" /><span>Ex : 4</span></div>
136
- <div class="clr-left"><label>Bâtiment :</label> <input type="text" id="batiment" name="batiment" maxlength="3" /><span>Ex : B37</span></div>
137
- <div class="clr-left"></div>
138
- </div>
139
- <div id="comp_entreprise" style="display:none">
140
- <span>Pour assurer une livraison dans les meilleures conditions, merci de renseigner les champs ci-dessous qui vous concernent.</span>
141
- <div class="clr-left">
142
- <label>Instruction complémentaire de livraison :</label>
143
- <br />
144
- <textarea rows="3" cols="45" name="compl" id="compl" onkeyup="this.value = this.value.slice(0, 60)" onchange="this.value = this.value.slice(0, 60)"></textarea>
145
- <br />
146
- <span>(60 caractères maximum)<br />
147
- Ex : Déposer le colis au comptoir d'accueil de l'entreprise</span>
148
- </div>
149
- </div>
150
- <div class="input-box">
151
- <input id="street" name="street" type="hidden" value="<?php echo $quote->getShippingAddress()->getStreetFull(); ?>"/>
152
- <input id="zipcode" name="zipcode" type="hidden" value="<?php echo $quote->getShippingAddress()->getPostcode(); ?>"/>
153
- <input id="city" name="city" type="hidden" value="<?php echo $quote->getShippingAddress()->getCity(); ?>"/>
154
- <input id="company" name="company" type="hidden" value="<?php echo $quote->getShippingAddress()->getcompany(); ?>"/>
155
- <input id="city_url" name="city_url" type="hidden" value="<?php echo substr(Mage::getUrl('tnt/tnt/ville'),0,-1); ?>"/>
156
- </div>
157
- <span id="loadingvilleswait" style="display:none;">
158
- <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="" class="v-middle" /> <?php echo $this->__('Vérification des informations...') ?>
159
- </span>
160
- </div>
161
- <?php } ?>
 
162
  </div>
163
  <?php } ?>
164
-
165
- <?php if($_rate->getCode() == 'tnt_JD') { ?>
166
  <input name="tnt_relais" type="hidden" id="tnt_relais1" class="radio" value="" />
167
  <div id="tnt_pr" style="display:none">
168
  <?php if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false) {
@@ -174,15 +335,16 @@
174
  } else { ?>
175
  <a href="<?php echo Mage::getBaseUrl ('skin'); ?>/frontend/default/default/tnt_relaisColis.php?cp=<?php echo $quote->getShippingAddress()->getPostcode(); ?>" rel="superbox[iframe]" id="openRelais">Choisissez votre Relais Colis®</a>
176
  <?php } ?>
 
177
  </div>
178
- <div id="tnt_pr_choix" style="display:none"></div>
179
- <?php } ?>
180
- <?php endif ?>
181
  </li>
182
- <?php endforeach; ?>
183
- </ul>
184
  </dd>
185
- <?php endforeach; ?>
186
  </dl>
187
  <script type="text/javascript">
188
  //<![CDATA[
@@ -196,20 +358,30 @@
196
  var getShippingCode = el.getValue();
197
  <?php if (!empty($shippingCodePrice)): ?>
198
  var newPrice = shippingCodePrice[getShippingCode];
199
- if (!lastPrice) {
200
  lastPrice = newPrice;
201
- quoteBaseGrandTotal += newPrice;
 
 
 
 
202
  }
203
  if (newPrice != lastPrice) {
204
- quoteBaseGrandTotal += (newPrice-lastPrice);
 
 
 
 
205
  lastPrice = newPrice;
206
  }
207
  <?php endif; ?>
208
- checkQuoteBaseGrandTotal = quoteBaseGrandTotal;
209
  return false;
210
  }
211
  });
212
  });
213
  //]]>
214
  </script>
 
 
215
  <?php endif; ?>
22
 
23
  var lastPrice='';
24
  </script>
25
+
26
+ <?php if (version_compare(Mage::getVersion(), '1.4.2.0', '<=') or (version_compare(Mage::getVersion(), '1.7.0.0', '>=') and version_compare(Mage::getVersion(), '1.10.0.0', '<'))): ?>
27
+
28
+ <?php if (!($_shippingRateGroups = $this->getShippingRates())): ?>
29
+ <p><?php echo $this->__('Sorry, no quotes are available for this order at this time.') ?></p>
30
+ <?php else: ?>
31
+ <dl class="sp-methods">
32
+ <?php $_sole = count($_shippingRateGroups) == 1;
33
+
34
+ $quote = Mage::getSingleton('checkout/session')->getQuote();
35
+
36
+ foreach ($_shippingRateGroups as $code => $_rates): ?>
37
+ <dt><?php echo $this->getCarrierName($code) ?></dt>
38
+ <dd>
39
+ <ul>
40
+ <?php $_sole = $_sole && count($_rates) == 1;
41
+ foreach ($_rates as $_rate): ?>
42
+ <li>
43
+ <?php if ($_rate->getErrorMessage()): ?>
44
+ <ul class="messages"><li class="error-msg"><ul><li><?php echo $_rate->getErrorMessage() ?></li></ul></li></ul>
45
+ <?php else: ?>
46
+ <?php if( preg_match('/tnt_/', $_rate->getCode()) == 0 ) { ?>
47
+
48
+ <?php if ($_sole) : ?>
49
+ <span class="no-display"><input name="shipping_method" type="radio" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_rate->getCode() ?>" checked="checked" /></span>
50
+ <?php else: ?>
51
+ <input name="shipping_method" type="radio" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$this->getAddressShippingMethod()) echo ' checked="checked"' ?> class="radio" />
52
+ <?php endif; ?>
53
+ <label for="s_method_<?php echo $_rate->getCode() ?>"><?php echo $_rate->getMethodTitle() ?>
54
+ <?php $_excl = $this->getShippingPrice($_rate->getPrice(), $this->helper('tax')->displayShippingPriceIncludingTax()); ?>
55
+ <?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
56
+ <?php echo $_excl; ?>
57
+ <?php if ($this->helper('tax')->displayShippingBothPrices() && $_incl != $_excl): ?>
58
+ (<?php echo $this->__('Incl. Tax'); ?> <?php echo $_incl; ?>)
59
+ <?php endif; ?>
60
+ </label>
61
+
62
+ <?php } ?>
63
+
64
+ <?php //je filtre les envois TNT vers les entreprises si le champ company n'est pas renseigné
65
+ if( (($_rate->getCode() == 'tnt_AZ' || $_rate->getCode() == 'tnt_TZ' || $_rate->getCode() == 'tnt_MZ' || $_rate->getCode() == 'tnt_JZ')
66
+ && $quote->getShippingAddress()->getCompany() == '')
67
+ || (($_rate->getCode() == 'tnt_A' || $_rate->getCode() == 'tnt_T' || $_rate->getCode() == 'tnt_M' || $_rate->getCode() == 'tnt_J')
68
+ && $quote->getShippingAddress()->getCompany() != '' )
69
+ || $_rate->getCode() == 'tnt_JD' ) { ?>
70
+
71
+
72
+ <?php if ($_sole) : ?>
73
+ <span class="no-display"><input name="shipping_method" type="radio" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_rate->getCode() ?>" checked="checked" /></span>
74
+ <?php else: ?>
75
+ <input name="shipping_method" type="radio" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_rate->getCode() ?>" class="radio" onClick="radioCheck()" />
76
+ <?php endif; ?>
77
+
78
+ <label for="s_method_<?php echo $_rate->getCode() ?>"><?php echo $_rate->getMethodTitle() ?>
79
+ <?php $_excl = $this->getShippingPrice($_rate->getPrice(), $this->helper('tax')->displayShippingPriceIncludingTax()); ?>
80
+ <?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
81
+ <?php echo $_excl; ?>
82
+ <?php if ($this->helper('tax')->displayShippingBothPrices() && $_incl != $_excl): ?>
83
+ (<?php echo $this->__('Incl. Tax'); ?> <?php echo $_incl; ?>)
84
+ <?php endif; ?>
85
+ </label>
86
+ <?php if($_rate->getMethodDescription() != '') {
87
+ $tmp_desc = explode('|||', $_rate->getMethodDescription());
88
+ } ?>
89
+ <div id="tnt_description_<?php echo $_rate->getCode(); ?>" style="display:block;" class="tnt_description">
90
+ <img src="<?php echo $this->getSkinUrl("images/tnt/".$tmp_desc['2']); ?>" alt="<?php echo $_rate->getMethodTitle() ?>" style="float:left;margin-right:10px;" />
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>
102
+
103
+ <?php if( $_rate->getCode() != 'tnt_JD' ) {
104
+ $telephone = $quote->getShippingAddress()->getTelephone();
105
+ $telephone = str_replace(' ', '', $telephone);
106
+ $telephone = str_replace('-', '', $telephone);
107
+ $telephone = str_replace('.', '', $telephone);
108
+ $telephone = str_replace('/', '', $telephone);
109
+ $telephone = str_replace('+33', '0', $telephone);
110
+
111
+ $style_tel = "block";
112
+ if( substr($telephone, 0, 2) == '06' || substr($telephone, 0, 2) == '07' ) {
113
+ $style_tel = "none";
114
+ } else {
115
+ $telephone = '';
116
+ } ?>
117
+ <div id="tnt_cp" style="display:none" >
118
+ <div id="villes"></div>
119
+ <div id="comp_domicile" style="display:none">
120
+ <span>Pour assurer une livraison dans les meilleures conditions, merci de renseigner les champs ci-dessous qui vous concernent.</span>
121
+ <div class="clr-left" style="display:<?php echo $style_tel; ?>;"><label>Téléphone portable :</label> <input type="text" id="portable" name="portable" maxlength="10" value="<?php echo $telephone; ?>" /> <span>Ex : 0602030405</span></div>
122
+ <div class="clr-left"><label>Code porte :</label> <input type="text" id="code" name="code" maxlength="7" /><span>Ex : A8120</span></div>
123
+ <div class="clr-left"><label>Etage :</label> <input type="text" id="etage" name="etage" maxlength="2" /><span>Ex : 4</span></div>
124
+ <div class="clr-left"><label>Bâtiment :</label> <input type="text" id="batiment" name="batiment" maxlength="3" /><span>Ex : B37</span></div>
125
+ <div class="clr-left"></div>
126
+ </div>
127
+ <div id="comp_entreprise" style="display:none">
128
+ <span>Pour assurer une livraison dans les meilleures conditions, merci de renseigner les champs ci-dessous qui vous concernent.</span>
129
+ <div class="clr-left">
130
+ <label>Instruction complémentaire de livraison :</label>
131
+ <br />
132
+ <textarea rows="3" cols="45" name="compl" id="compl" onkeyup="this.value = this.value.slice(0, 60)" onchange="this.value = this.value.slice(0, 60)"></textarea>
133
+ <br />
134
+ <span>(60 caractères maximum)<br />
135
+ Ex : Déposer le colis au comptoir d'accueil de l'entreprise</span>
136
+ </div>
137
+ </div>
138
+ <div class="input-box">
139
+ <input id="street" name="street" type="hidden" value="<?php echo $quote->getShippingAddress()->getStreetFull(); ?>"/>
140
+ <input id="zipcode" name="zipcode" type="hidden" value="<?php echo $quote->getShippingAddress()->getPostcode(); ?>"/>
141
+ <input id="city" name="city" type="hidden" value="<?php echo $quote->getShippingAddress()->getCity(); ?>"/>
142
+ <input id="company" name="company" type="hidden" value="<?php echo $quote->getShippingAddress()->getcompany(); ?>"/>
143
+ <input id="city_url" name="city_url" type="hidden" value="<?php echo substr(Mage::getUrl('tnt/tnt/ville'),0,-1); ?>"/>
144
+ </div>
145
+ <span id="loadingvilleswait" style="display:none;">
146
+ <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="" class="v-middle" /> <?php echo $this->__('Vérification des informations...') ?>
147
+ </span>
148
+ </div>
149
+ <?php } ?>
150
+
151
+ </div>
152
+ <?php } ?>
153
+
154
+ <?php if($_rate->getCode() == 'tnt_JD') { ?>
155
+ <input name="tnt_relais" type="hidden" id="tnt_relais1" class="radio" value="" />
156
+ <div id="tnt_pr" style="display:none">
157
+ <?php if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false) {
158
+ if (intval(substr($_SERVER['HTTP_USER_AGENT'], strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')+5)) <= 8) { ?>
159
+ <a href="javascript:fenetreCent('<?php echo Mage::getBaseUrl ('skin'); ?>/frontend/default/default/tnt_relaisColis.php?cp=<?php echo $quote->getShippingAddress()->getPostcode(); ?>', 'popup_tnt' ,'900', '530','scrollbars=no,location:no,menubar=no,status=no,resizable=no');" onclick="javascript:fenetreCent('<?php echo Mage::getBaseUrl ('skin'); ?>/frontend/default/default/tnt_relaisColis.php?cp=<?php echo $quote->getShippingAddress()->getPostcode(); ?>', 'popup_tnt' ,'900', '530','scrollbars=no,location:no,menubar=no,status=no,resizable=no');" id="openRelais">Choisissez votre Relais Colis®</a>
160
+ <?php } else { ?>
161
+ <a href="<?php echo Mage::getBaseUrl ('skin'); ?>/frontend/default/default/tnt_relaisColis.php?cp=<?php echo $quote->getShippingAddress()->getPostcode(); ?>" rel="superbox[iframe]" id="openRelais">Choisissez votre Relais Colis®</a>
162
+ <?php }
163
+ } else { ?>
164
+ <a href="<?php echo Mage::getBaseUrl ('skin'); ?>/frontend/default/default/tnt_relaisColis.php?cp=<?php echo $quote->getShippingAddress()->getPostcode(); ?>" rel="superbox[iframe]" id="openRelais">Choisissez votre Relais Colis®</a>
165
+ <?php } ?>
166
+ </div>
167
+ <div id="tnt_pr_choix" style="display:none"></div>
168
+ <?php } ?>
169
+
170
+ <?php endif ?>
171
+ </li>
172
+ <?php endforeach; ?>
173
+ </ul>
174
+ </dd>
175
+ <?php endforeach; ?>
176
+ </dl>
177
+ <?php endif; ?>
178
+
179
+ <?php // Magento >= 1.5 < 1.7?>
180
+ <?php else: ?>
181
+
182
+ <?php if (!($_shippingRateGroups = $this->getShippingRates())): ?>
183
  <p><?php echo $this->__('Sorry, no quotes are available for this order at this time.') ?></p>
184
  <?php else: ?>
185
  <dl class="sp-methods">
186
+ <?php $shippingCodePrice = array(); ?>
187
+ <?php $_sole = count($_shippingRateGroups) == 1;
188
+
189
+ $quote = Mage::getSingleton('checkout/session')->getQuote();
190
+
191
  foreach ($_shippingRateGroups as $code => $_rates): ?>
192
+ <dt><?php echo $this->getCarrierName($code) ?></dt>
193
  <dd>
194
  <ul>
195
+ <?php $_sole = $_sole && count($_rates) == 1; foreach ($_rates as $_rate): ?>
 
 
196
  <?php $shippingCodePrice[] = "'".$_rate->getCode()."':".(float)$_rate->getPrice(); ?>
197
+ <li>
198
  <?php if ($_rate->getErrorMessage()): ?>
199
+ <ul class="messages"><li class="error-msg"><ul><li><?php echo $_rate->getErrorMessage() ?></li></ul></li></ul>
200
  <?php else: ?>
201
+ <?php if( preg_match('/tnt_/', $_rate->getCode()) == 0 ) { ?>
202
+
203
  <?php if ($_sole) : ?>
204
  <span class="no-display"><input name="shipping_method" type="radio" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_rate->getCode() ?>" checked="checked" /></span>
205
  <?php else: ?>
206
+ <input name="shipping_method" type="radio" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$this->getAddressShippingMethod()) echo ' checked="checked"' ?> class="radio" />
207
+
208
  <?php if ($_rate->getCode() === $this->getAddressShippingMethod()): ?>
209
  <script type="text/javascript">
210
  //<![CDATA[
212
  //]]>
213
  </script>
214
  <?php endif; ?>
215
+
216
  <?php endif; ?>
217
+ <label for="s_method_<?php echo $_rate->getCode() ?>"><?php echo $_rate->getMethodTitle() ?>
218
  <?php $_excl = $this->getShippingPrice($_rate->getPrice(), $this->helper('tax')->displayShippingPriceIncludingTax()); ?>
219
  <?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
220
  <?php echo $_excl; ?>
222
  (<?php echo $this->__('Incl. Tax'); ?> <?php echo $_incl; ?>)
223
  <?php endif; ?>
224
  </label>
 
225
 
226
+ <?php } ?>
227
+
228
+ <?php //je filtre les envois TNT vers les entreprises si le champ company n'est pas renseigné
229
  if( (($_rate->getCode() == 'tnt_AZ' || $_rate->getCode() == 'tnt_TZ' || $_rate->getCode() == 'tnt_MZ' || $_rate->getCode() == 'tnt_JZ')
230
  && $quote->getShippingAddress()->getCompany() == '')
231
  || (($_rate->getCode() == 'tnt_A' || $_rate->getCode() == 'tnt_T' || $_rate->getCode() == 'tnt_M' || $_rate->getCode() == 'tnt_J')
232
  && $quote->getShippingAddress()->getCompany() != '' )
233
  || $_rate->getCode() == 'tnt_JD' ) { ?>
234
+
235
 
236
  <?php if ($_sole) : ?>
237
  <span class="no-display"><input name="shipping_method" type="radio" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_rate->getCode() ?>" checked="checked" /></span>
247
  <?php endif; ?>
248
 
249
  <?php endif; ?>
250
+
251
+ <label for="s_method_<?php echo $_rate->getCode() ?>"><?php echo $_rate->getMethodTitle() ?>
252
  <?php $_excl = $this->getShippingPrice($_rate->getPrice(), $this->helper('tax')->displayShippingPriceIncludingTax()); ?>
253
  <?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
254
  <?php echo $_excl; ?>
263
  <img src="<?php echo $this->getSkinUrl("images/tnt/".$tmp_desc['2']); ?>" alt="<?php echo $_rate->getMethodTitle() ?>" style="float:left;margin-right:10px;" />
264
  <span>
265
  <?php echo $tmp_desc['0']; ?>
266
+ <?php if( $tmp_desc['1'] != '' ) {
267
+ //if($_rate->getCode() == 'tnt_J') { ?>
268
  &nbsp;<a href="<?php echo $this->getSkinUrl($tmp_desc['1']); ?>" rel="superbox[image]" class="moreInfos">+ d'infos</a>
269
+ <?php /*} else { ?>
270
+ &nbsp;<a href="<?php echo $tmp_desc['1']; ?>" rel="superbox[iframe]" class="moreInfos">+ d'infos</a>
271
+ <?php }*/?>
272
  <?php } ?>
273
  </span>
274
  <div style="clear:both;"></div>
275
 
276
+ <?php if( $_rate->getCode() != 'tnt_JD' ) {
277
+ $telephone = $quote->getShippingAddress()->getTelephone();
278
+ $telephone = str_replace(' ', '', $telephone);
279
+ $telephone = str_replace('-', '', $telephone);
280
+ $telephone = str_replace('.', '', $telephone);
281
+ $telephone = str_replace('/', '', $telephone);
282
+ $telephone = str_replace('+33', '0', $telephone);
283
+
284
+ $style_tel = "block";
285
+ if( substr($telephone, 0, 2) == '06' || substr($telephone, 0, 2) == '07' ) {
286
+ $style_tel = "none";
287
+ } else {
288
+ $telephone = '';
289
+ } ?>
290
+ <div id="tnt_cp" style="display:none">
291
+ <div id="villes"></div>
292
+ <div id="comp_domicile" style="display:none">
293
+ <span>Pour assurer une livraison dans les meilleures conditions, merci de renseigner les champs ci-dessous qui vous concernent.</span>
294
+ <div class="clr-left" style="display:<?php echo $style_tel; ?>;"><label>Téléphone portable :</label> <input type="text" id="portable" name="portable" maxlength="10" value="<?php echo $telephone; ?>" /> <span>Ex : 0602030405</span></div>
295
+ <div class="clr-left"><label>Code porte :</label> <input type="text" id="code" name="code" maxlength="7" /><span>Ex : A8120</span></div>
296
+ <div class="clr-left"><label>Etage :</label> <input type="text" id="etage" name="etage" maxlength="2" /><span>Ex : 4</span></div>
297
+ <div class="clr-left"><label>Bâtiment :</label> <input type="text" id="batiment" name="batiment" maxlength="3" /><span>Ex : B37</span></div>
298
+ <div class="clr-left"></div>
299
+ </div>
300
+ <div id="comp_entreprise" style="display:none">
301
+ <span>Pour assurer une livraison dans les meilleures conditions, merci de renseigner les champs ci-dessous qui vous concernent.</span>
302
+ <div class="clr-left">
303
+ <label>Instruction complémentaire de livraison :</label>
304
+ <br />
305
+ <textarea rows="3" cols="45" name="compl" id="compl" onkeyup="this.value = this.value.slice(0, 60)" onchange="this.value = this.value.slice(0, 60)"></textarea>
306
+ <br />
307
+ <span>(60 caractères maximum)<br />
308
+ Ex : Déposer le colis au comptoir d'accueil de l'entreprise</span>
309
+ </div>
310
+ </div>
311
+ <div class="input-box">
312
+ <input id="street" name="street" type="hidden" value="<?php echo $quote->getShippingAddress()->getStreetFull(); ?>"/>
313
+ <input id="zipcode" name="zipcode" type="hidden" value="<?php echo $quote->getShippingAddress()->getPostcode(); ?>"/>
314
+ <input id="city" name="city" type="hidden" value="<?php echo $quote->getShippingAddress()->getCity(); ?>"/>
315
+ <input id="company" name="company" type="hidden" value="<?php echo $quote->getShippingAddress()->getcompany(); ?>"/>
316
+ <input id="city_url" name="city_url" type="hidden" value="<?php echo substr(Mage::getUrl('tnt/tnt/ville'),0,-1); ?>"/>
317
+ </div>
318
+ <span id="loadingvilleswait" style="display:none;">
319
+ <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="" class="v-middle" /> <?php echo $this->__('Vérification des informations...') ?>
320
+ </span>
321
+ </div>
322
+ <?php } ?>
323
+
324
  </div>
325
  <?php } ?>
326
+ <?php if($_rate->getCode() == 'tnt_JD') { ?>
 
327
  <input name="tnt_relais" type="hidden" id="tnt_relais1" class="radio" value="" />
328
  <div id="tnt_pr" style="display:none">
329
  <?php if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false) {
335
  } else { ?>
336
  <a href="<?php echo Mage::getBaseUrl ('skin'); ?>/frontend/default/default/tnt_relaisColis.php?cp=<?php echo $quote->getShippingAddress()->getPostcode(); ?>" rel="superbox[iframe]" id="openRelais">Choisissez votre Relais Colis®</a>
337
  <?php } ?>
338
+
339
  </div>
340
+ <div id="tnt_pr_choix" style="display:none;"></div>
341
+ <?php } ?>
342
+ <?php endif ?>
343
  </li>
344
+ <?php endforeach; ?>
345
+ </ul>
346
  </dd>
347
+ <?php endforeach; ?>
348
  </dl>
349
  <script type="text/javascript">
350
  //<![CDATA[
358
  var getShippingCode = el.getValue();
359
  <?php if (!empty($shippingCodePrice)): ?>
360
  var newPrice = shippingCodePrice[getShippingCode];
361
+ if (typeof lastPrice === 'undefined') {
362
  lastPrice = newPrice;
363
+ if(typeof quoteBaseGrandTotal === 'undefined') {
364
+ quoteBaseGrandTotal = newPrice;
365
+ } else {
366
+ quoteBaseGrandTotal += newPrice;
367
+ }
368
  }
369
  if (newPrice != lastPrice) {
370
+ if(typeof quoteBaseGrandTotal === 'undefined') {
371
+ quoteBaseGrandTotal = (newPrice-lastPrice);
372
+ } else {
373
+ quoteBaseGrandTotal += (newPrice-lastPrice);
374
+ }
375
  lastPrice = newPrice;
376
  }
377
  <?php endif; ?>
378
+ checkQuoteBaseGrandTotal = quoteBaseGrandTotal;
379
  return false;
380
  }
381
  });
382
  });
383
  //]]>
384
  </script>
385
+ <?php endif; ?>
386
+
387
  <?php endif; ?>
app/design/frontend/default/default/template/tnt/sales/order/info.phtml CHANGED
@@ -20,150 +20,163 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
- <?php /** @var $this Mage_Sales_Block_Order_Info */ ?>
28
- <?php $_order = $this->getOrder() ?>
29
 
30
  <?php //commande non TNT
31
  if( preg_match('/^tnt_/',$_order->getShippingMethod()) == 0 ) { ?>
32
-
33
 
34
- <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
35
- <div class="page-title title-buttons">
36
- <h1><?php echo $this->__('Order #%s - %s', $_order->getRealOrderId(), $_order->getStatusLabel()) ?></h1>
37
- <?php echo $this->getChildHtml('buttons') ?>
38
- </div>
39
- <?php echo $this->getStatusHistoryRssUrl($_order) ?>
40
- <dl class="order-info">
41
- <dt><?php echo $this->__('About This Order:') ?></dt>
42
- <dd>
43
- <?php $_links = $this->getLinks(); ?>
44
- <ul id="order-info-tabs">
45
- <?php foreach ($_links as $_link): ?>
46
- <?php if($_link->getUrl()): ?>
47
- <li><a href="<?php echo $_link->getUrl() ?>"><?php echo $_link->getLabel() ?></a></li>
48
- <?php else: ?>
49
- <li class="current"><?php echo $_link->getLabel() ?></li>
50
- <?php endif; ?>
51
- <?php endforeach; ?>
52
- </ul>
53
- <script type="text/javascript">decorateGeneric($('order-info-tabs').select('LI'),['first','last']);</script>
54
- </dd>
55
- </dl>
56
- <p class="order-date"><?php echo $this->__('Order Date: %s', $this->formatDate($_order->getCreatedAtStoreDate(), 'long')) ?></p>
57
- <?php if (!$_order->getIsVirtual()): ?>
58
- <div class="col2-set order-info-box">
59
- <div class="col-1">
60
- <div class="box">
61
- <div class="box-title">
62
- <h2><?php echo $this->__('Shipping Address') ?></h2>
63
- </div>
64
- <div class="box-content">
65
- <address><?php echo $_order->getShippingAddress()->format('html') ?></address>
66
- </div>
67
- </div>
68
- </div>
69
- <div class="col-2">
70
- <div class="box">
71
- <div class="box-title">
72
- <h2><?php echo $this->__('Shipping Method') ?></h2>
73
- </div>
74
- <div class="box-content">
75
- <?php if ($_order->getShippingDescription()): ?>
76
- <?php echo $this->escapeHtml($_order->getShippingDescription()) ?>
77
- <?php else: ?>
78
- <p><?php echo $this->helper('sales')->__('No shipping information available'); ?></p>
79
- <?php endif; ?>
80
- </div>
81
- </div>
82
- </div>
83
- </div>
84
- <?php endif; ?>
85
- <div class="col2-set order-info-box">
86
- <div class="col-1">
87
- <div class="box">
88
- <div class="box-title">
89
- <h2><?php echo $this->__('Billing Address') ?></h2>
90
- </div>
91
- <div class="box-content">
92
- <address><?php echo $_order->getBillingAddress()->format('html') ?></address>
93
- </div>
94
- </div>
95
- </div>
96
- <div class="col-2">
97
- <div class="box box-payment">
98
- <div class="box-title">
99
- <h2><?php echo $this->__('Payment Method') ?></h2>
100
- </div>
101
- <div class="box-content">
102
- <?php echo $this->getPaymentInfoHtml() ?>
103
- </div>
104
- </div>
105
- </div>
106
- </div>
 
 
 
 
 
 
 
 
107
  <?php } else { //commande tnt ?>
108
 
109
- <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
110
- <div class="page-title title-buttons">
111
- <h1><?php echo $this->__('Order #%s - %s', $_order->getRealOrderId(), $_order->getStatusLabel()) ?></h1>
112
- <?php echo $this->getChildHtml('buttons') ?>
113
- </div>
114
-
115
- <?php echo $this->getStatusHistoryRssUrl($_order) ?>
116
-
117
- <p class="order-date"><?php echo $this->__('Order Date: %s', $this->formatDate($_order->getCreatedAtStoreDate(), 'long')) ?></p>
118
- <?php if (!$_order->getIsVirtual()): ?>
119
- <div class="col2-set order-info-box">
120
- <div class="col-1">
121
- <div class="box">
122
- <div class="box-title">
123
- <h2><?php echo $this->__('Shipping Address') ?></h2>
124
- </div>
125
- <div class="box-content">
126
- <address><?php echo $_order->getShippingAddress()->format('html') ?></address>
127
- </div>
128
- </div>
129
- </div>
130
- <div class="col-2">
131
- <div class="box">
132
- <div class="box-title">
133
- <h2><?php echo $this->__('Shipping Method') ?></h2>
134
- </div>
135
- <div class="box-content">
136
- <?php if ($_order->getShippingDescription()): ?>
137
- <?php echo $this->escapeHtml($_order->getShippingDescription()) ?>
138
- <?php else: ?>
139
- <p><?php echo $this->helper('sales')->__('No shipping information available'); ?></p>
140
- <?php endif; ?>
141
- </div>
142
- </div>
143
- </div>
144
- </div>
145
- <?php endif; ?>
146
- <div class="col2-set order-info-box">
147
- <div class="col-1">
148
- <div class="box">
149
- <div class="box-title">
150
- <h2><?php echo $this->__('Billing Address') ?></h2>
151
- </div>
152
- <div class="box-content">
153
- <address><?php echo $_order->getBillingAddress()->format('html') ?></address>
154
- </div>
155
- </div>
156
- </div>
157
- <div class="col-2">
158
- <div class="box box-payment">
159
- <div class="box-title">
160
- <h2><?php echo $this->__('Payment Method') ?></h2>
161
- </div>
162
- <div class="box-content">
163
- <?php echo $this->getPaymentInfoHtml() ?>
164
- </div>
165
- </div>
166
- </div>
167
- </div>
168
-
169
- <?php } ?>
 
 
 
 
 
 
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
+ <?php $_order = $this->getOrder(); ?>
 
28
 
29
  <?php //commande non TNT
30
  if( preg_match('/^tnt_/',$_order->getShippingMethod()) == 0 ) { ?>
 
31
 
32
+ <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
33
+ <div class="page-title title-buttons">
34
+ <h1><?php echo $this->__('Order #%s - %s', $_order->getRealOrderId(), $_order->getStatusLabel()) ?></h1>
35
+ <?php if($this->helper('rss/order')->isStatusNotificationAllow()): ?>
36
+ <a href="<?php echo $this->helper('rss/order')->getStatusHistoryRssUrl($_order) ?>" class="link-rss"><?php echo $this->__('Subscribe to Order Status') ?></a>
37
+ <span class="separator">|</span>
38
+ <?php endif; ?>
39
+ <?php if ($this->helper('sales/reorder')->canReorder($_order)) : ?>
40
+ <a href="<?php echo $this->getReorderUrl($_order) ?>" class="link-reorder"><?php echo $this->__('Reorder') ?></a>
41
+ <span class="separator">|</span>
42
+ <?php endif ?>
43
+ <a href="<?php echo $this->getPrintUrl($_order) ?>" class="link-print" onclick="this.target='_blank';"><?php echo $this->__('Print Order') ?></a>
44
+ </div>
45
+ <?php echo $this->getStatusHistoryRssUrl($_order) ?>
46
+ <dl class="order-info">
47
+ <dt><?php echo $this->__('About This Order:') ?></dt>
48
+ <dd>
49
+ <?php $_links = $this->getLinks(); ?>
50
+ <ul id="order-info-tabs">
51
+ <?php foreach ($_links as $_link): ?>
52
+ <?php if($_link->getUrl()): ?>
53
+ <li><a href="<?php echo $_link->getUrl() ?>"><?php echo $_link->getLabel() ?></a></li>
54
+ <?php else: ?>
55
+ <li class="current"><?php echo $_link->getLabel() ?></li>
56
+ <?php endif; ?>
57
+ <?php endforeach; ?>
58
+ </ul>
59
+ <script type="text/javascript">decorateGeneric($('order-info-tabs').select('LI'),['first','last']);</script>
60
+ </dd>
61
+ </dl>
62
+ <p class="order-date"><?php echo $this->__('Order Date: %s', $this->formatDate($_order->getCreatedAtStoreDate(), 'long')) ?></p>
63
+ <?php if (!$_order->getIsVirtual()): ?>
64
+ <div class="col2-set order-info-box">
65
+ <div class="col-1">
66
+ <div class="box">
67
+ <div class="box-title">
68
+ <h2><?php echo $this->__('Shipping Address') ?></h2>
69
+ </div>
70
+ <div class="box-content">
71
+ <address><?php echo $_order->getShippingAddress()->format('html') ?></address>
72
+ </div>
73
+ </div>
74
+ </div>
75
+ <div class="col-2">
76
+ <div class="box">
77
+ <div class="box-title">
78
+ <h2><?php echo $this->__('Shipping Method') ?></h2>
79
+ </div>
80
+ <div class="box-content">
81
+ <?php if ($_order->getShippingDescription()): ?>
82
+ <?php echo $_order->getShippingDescription() ?>
83
+ <?php else: ?>
84
+ <p><?php echo $this->helper('sales')->__('No shipping information available'); ?></p>
85
+ <?php endif; ?>
86
+ </div>
87
+ </div>
88
+ </div>
89
+ </div>
90
+ <?php endif; ?>
91
+ <div class="col2-set order-info-box">
92
+ <div class="col-1">
93
+ <div class="box">
94
+ <div class="box-title">
95
+ <h2><?php echo $this->__('Billing Address') ?></h2>
96
+ </div>
97
+ <div class="box-content">
98
+ <address><?php echo $_order->getBillingAddress()->format('html') ?></address>
99
+ </div>
100
+ </div>
101
+ </div>
102
+ <div class="col-2">
103
+ <div class="box box-payment">
104
+ <div class="box-title">
105
+ <h2><?php echo $this->__('Payment Method') ?></h2>
106
+ </div>
107
+ <div class="box-content">
108
+ <?php echo $this->getPaymentInfoHtml() ?>
109
+ </div>
110
+ </div>
111
+ </div>
112
+ </div>
113
  <?php } else { //commande tnt ?>
114
 
115
+ <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
116
+ <div class="page-title title-buttons">
117
+ <h1><?php echo $this->__('Order #%s - %s', $_order->getRealOrderId(), $_order->getStatusLabel()) ?></h1>
118
+ <?php if($this->helper('rss/order')->isStatusNotificationAllow()): ?>
119
+ <a href="<?php echo $this->helper('rss/order')->getStatusHistoryRssUrl($_order) ?>" class="link-rss"><?php echo $this->__('Subscribe to Order Status') ?></a>
120
+ <span class="separator">|</span>
121
+ <?php endif; ?>
122
+ <?php if ($this->helper('sales/reorder')->canReorder($_order)) : ?>
123
+ <a href="<?php echo $this->getReorderUrl($_order) ?>" class="link-reorder"><?php echo $this->__('Reorder') ?></a>
124
+ <span class="separator">|</span>
125
+ <?php endif ?>
126
+ <a href="<?php echo $this->getPrintUrl($_order) ?>" class="link-print" onclick="this.target='_blank';"><?php echo $this->__('Print Order') ?></a>
127
+ </div>
128
+
129
+ <?php echo $this->getStatusHistoryRssUrl($_order) ?>
130
+
131
+ <p class="order-date"><?php echo $this->__('Order Date: %s', $this->formatDate($_order->getCreatedAtStoreDate(), 'long')) ?></p>
132
+ <?php if (!$_order->getIsVirtual()): ?>
133
+ <div class="col2-set order-info-box">
134
+ <div class="col-1">
135
+ <div class="box">
136
+ <div class="box-title">
137
+ <h2><?php echo $this->__('Shipping Address') ?></h2>
138
+ </div>
139
+ <div class="box-content">
140
+ <address><?php echo $_order->getShippingAddress()->format('html') ?></address>
141
+ </div>
142
+ </div>
143
+ </div>
144
+ <div class="col-2">
145
+ <div class="box">
146
+ <div class="box-title">
147
+ <h2><?php echo $this->__('Shipping Method') ?></h2>
148
+ </div>
149
+ <div class="box-content">
150
+ <?php if ($_order->getShippingDescription()): ?>
151
+ <?php echo $_order->getShippingDescription() ?>
152
+ <?php else: ?>
153
+ <p><?php echo $this->helper('sales')->__('No shipping information available'); ?></p>
154
+ <?php endif; ?>
155
+ </div>
156
+ </div>
157
+ </div>
158
+ </div>
159
+ <?php endif; ?>
160
+ <div class="col2-set order-info-box">
161
+ <div class="col-1">
162
+ <div class="box">
163
+ <div class="box-title">
164
+ <h2><?php echo $this->__('Billing Address') ?></h2>
165
+ </div>
166
+ <div class="box-content">
167
+ <address><?php echo $_order->getBillingAddress()->format('html') ?></address>
168
+ </div>
169
+ </div>
170
+ </div>
171
+ <div class="col-2">
172
+ <div class="box box-payment">
173
+ <div class="box-title">
174
+ <h2><?php echo $this->__('Payment Method') ?></h2>
175
+ </div>
176
+ <div class="box-content">
177
+ <?php echo $this->getPaymentInfoHtml() ?>
178
+ </div>
179
+ </div>
180
+ </div>
181
+ </div>
182
+ <?php } ?>
app/design/frontend/default/default/template/tnt/sales/order/view.phtml CHANGED
@@ -1,120 +1,148 @@
1
- <div class="order-items order-details">
2
- <?php if ($this->helper('giftmessage/message')->getIsMessagesAvailable('items', $this->getOrder())): ?>
3
- <script type="text/javascript">
4
- //<![CDATA[
5
- function giftMessageToogle(giftMessageIdentifier)
6
- {
7
- var link = $('order-item-gift-message-link-'+giftMessageIdentifier);
8
- var container = $('order-item-gift-message-'+giftMessageIdentifier);
9
- var row = $('order-item-row-'+giftMessageIdentifier);
10
- if(link.expanded) {
11
- link.expanded = false;
12
- link.removeClassName('expanded');
13
- if(container.hasClassName('last')) {
14
- row.addClassName('last');
15
- }
16
- container.hide();
17
- } else {
18
- link.expanded = true;
19
- link.addClassName('expanded');
20
- if(container.hasClassName('last')) {
21
- row.removeClassName('last');
22
- }
23
- container.show();
24
- }
25
-
26
- return false;
27
- }
28
- //]]>
29
- </script>
30
- <?php endif; ?>
31
- <?php $_order = $this->getOrder() ?>
32
- <h2 class="table-caption"><?php echo $this->__('Items Ordered') ?>
33
- <?php if ($_order->getTracksCollection()->count()) : ?>
34
- <?php if( preg_match('/tnt_/',$_order->getShippingMethod()) == 0 ) { //commande non TNT ?>
35
- <span class="separator">|</span> <a href="#" onclick="popWin('<?php echo $this->helper('shipping')->getTrackingPopupUrlBySalesModel($_order) ?>','trackorder','top=0,left=0,width=800,height=600,resizable=yes,scrollbars=yes'); return false;" title="<?php echo $this->__('Track your order') ?>"><?php echo $this->__('Track your order') ?></a>
36
- <?php } ?>
37
- <?php endif; ?>
38
- </h2>
39
-
40
- <?php echo $this->getChildHtml('order_items') ?>
41
-
42
- <?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order', $_order) && $_order->getGiftMessageId()): ?>
43
- <div class="order-additional order-gift-message">
44
- <h2 class="sub-title"><?php echo $this->__('Gift Message for This Order') ?></h2>
45
- <?php $_giftMessage=$this->helper('giftmessage/message')->getGiftMessageForEntity($_order); ?>
46
- <dl class="gift-message">
47
- <dt><strong><?php echo $this->__('From:') ?></strong> <?php echo $this->htmlEscape($_giftMessage->getSender()) ?></dt>
48
- <dt><strong><?php echo $this->__('To:') ?></strong> <?php echo $this->htmlEscape($_giftMessage->getRecipient()) ?></dt>
49
- <dd><?php echo $this->helper('giftmessage/message')->getEscapedGiftMessage($_order) ?></dd>
50
- </dl>
51
- </div>
52
- <?php endif; ?>
53
- <?php $_history = $this->getOrder()->getVisibleStatusHistory() ?>
54
- <?php if (count($_history)): ?>
55
- <div class="order-additional order-comments">
56
- <h2 class="sub-title"><?php echo $this->__('About Your Order') ?></h2>
57
- <dl class="order-about">
58
- <?php foreach ($_history as $_historyItem): ?>
59
- <dt><?php echo $this->formatDate($_historyItem->getCreatedAtStoreDate(), 'medium', true) ?></dt>
60
- <dd><?php echo $this->escapeHtml($_historyItem->getComment()) ?></dd>
61
- <?php endforeach; ?>
62
- </dl>
63
- </div>
64
- <?php endif; ?>
65
-
66
-
67
- <?php if( preg_match('/^tnt_/',$_order->getShippingMethod()) != 0 ) { //commande TNT ?>
68
- <p class="order-links"></p>
69
-
70
- <?php foreach ($_order->getShipmentsCollection() as $_shipment): ?>
71
- <h2 class="sub-title"><?php echo $this->__('Shipment #') ?><?php echo $_shipment->getIncrementId(); ?></h2>
72
- <?php $tracks = $_shipment->getTracksCollection(); ?>
73
- <?php if ($tracks->count()): ?>
74
- <table class="data-table tracking-table" id="my-tracking-table-<?php echo $_shipment->getId(); ?>">
75
- <tbody>
76
- <tr>
77
- <th class="label">Cliquez sur le(s) numéro(s) de suivi pour suivre vos colis :</th>
78
- <td>&nbsp;
79
- <?php
80
- $i = 1;
81
- $_size = $tracks->count();
82
- foreach($tracks as $track): ?>
83
- <?php if($track->isCustom()): ?>
84
- <?php echo $track->getNumber() ?>
85
- <?php else: ?>
86
- <a href="<?php echo Mage::getBaseUrl ('skin'); ?>/frontend/default/default/tnt_suiviColis.php?suivi=<?php echo $track->getNumber() ?>" rel="superbox[iframe]"><?php echo $track->getNumber() ?></a>
87
- <?php endif; ?>
88
- <?php if($i!=$_size): ?>, <?php endif; ?>
89
- <?php $i++;
90
- endforeach; ?>
91
- </td>
92
- </tr>
93
- </tbody>
94
- </table>
95
- <script type="text/javascript">decorateTable('my-tracking-table-<?php echo $_shipment->getId(); ?>')</script>
96
- <?php endif; ?>
97
- <script type="text/javascript">decorateTable('my-shipment-table-<?php echo $_shipment->getId(); ?>', {'tbody' : ['odd', 'even'], 'tbody tr' : ['first', 'last']})</script>
98
- <?php echo $this->getCommentsHtml($_shipment)?>
99
- <?php endforeach; ?>
100
- <?php } ?>
101
-
102
- <script type="text/javascript">
103
- jQuery(function(){
104
- jQuery.superbox.settings = {
105
- boxId: "superbox",
106
- boxClasses: "",
107
- overlayOpacity: .8,
108
- boxWidth: "600",
109
- boxHeight: "600",
110
- loadTxt: "Chargement ...",
111
- closeTxt: "Fermer"
112
- };
113
- jQuery.superbox();
114
- });
115
- </script>
116
-
117
- <div class="buttons-set">
118
- <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>&laquo; </small><?php echo $this->getBackTitle() ?></a></p>
119
- </div>
120
- </div>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Academic Free License (AFL 3.0)
8
+ * that is bundled with this package in the file LICENSE_AFL.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/afl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * DISCLAIMER
16
+ *
17
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
18
+ * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magentocommerce.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+ ?>
27
+ <div class="order-items order-details">
28
+ <?php if ($this->helper('giftmessage/message')->getIsMessagesAvailable('items', $this->getOrder())): ?>
29
+ <script type="text/javascript">
30
+ //<![CDATA[
31
+ function giftMessageToogle(giftMessageIdentifier)
32
+ {
33
+ var link = $('order-item-gift-message-link-'+giftMessageIdentifier);
34
+ var container = $('order-item-gift-message-'+giftMessageIdentifier);
35
+ var row = $('order-item-row-'+giftMessageIdentifier);
36
+ if(link.expanded) {
37
+ link.expanded = false;
38
+ link.removeClassName('expanded');
39
+ if(container.hasClassName('last')) {
40
+ row.addClassName('last');
41
+ }
42
+ container.hide();
43
+ } else {
44
+ link.expanded = true;
45
+ link.addClassName('expanded');
46
+ if(container.hasClassName('last')) {
47
+ row.removeClassName('last');
48
+ }
49
+ container.show();
50
+ }
51
+
52
+ return false;
53
+ }
54
+ //]]>
55
+ </script>
56
+ <?php endif; ?>
57
+ <?php $_order = $this->getOrder() ?>
58
+ <h2 class="table-caption"><?php echo $this->__('Items Ordered') ?>
59
+ <?php if ($_order->getTracksCollection()->count()) : ?>
60
+ <?php if( preg_match('/tnt_/',$_order->getShippingMethod()) == 0 ) { //commande non TNT ?>
61
+ <span class="separator">|</span> <a href="#" onclick="popWin('<?php echo $this->helper('shipping')->getTrackingPopupUrlBySalesModel($_order) ?>','trackorder','top=0,left=0,width=800,height=600,resizable=yes,scrollbars=yes'); return false;" title="<?php echo $this->__('Track your order') ?>"><?php echo $this->__('Track your order') ?></a>
62
+ <?php } ?>
63
+ <?php endif; ?>
64
+ </h2>
65
+
66
+ <?php echo $this->getChildHtml('order_items') ?>
67
+
68
+ <?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order', $_order) && $_order->getGiftMessageId()): ?>
69
+ <div class="order-additional order-gift-message">
70
+ <h2 class="sub-title"><?php echo $this->__('Gift Message for This Order') ?></h2>
71
+ <?php $_giftMessage=$this->helper('giftmessage/message')->getGiftMessageForEntity($_order); ?>
72
+ <dl class="gift-message">
73
+ <dt><strong><?php echo $this->__('From:') ?></strong> <?php echo $this->htmlEscape($_giftMessage->getSender()) ?></dt>
74
+ <dt><strong><?php echo $this->__('To:') ?></strong> <?php echo $this->htmlEscape($_giftMessage->getRecipient()) ?></dt>
75
+ <dd><?php echo $this->helper('giftmessage/message')->getEscapedGiftMessage($_order) ?></dd>
76
+ </dl>
77
+ </div>
78
+ <?php endif; ?>
79
+ <?php $_history = $this->getOrder()->getVisibleStatusHistory() ?>
80
+ <?php if (count($_history)): ?>
81
+ <div class="order-additional order-comments">
82
+ <h2 class="sub-title"><?php echo $this->__('About Your Order') ?></h2>
83
+ <dl class="order-about">
84
+ <?php foreach ($_history as $_historyItem): ?>
85
+ <dt><?php echo $this->formatDate($_historyItem->getCreatedAtStoreDate(), 'medium', true) ?></dt>
86
+ <dd><?php echo $this->escapeHtml($_historyItem->getComment()) ?></dd>
87
+ <?php endforeach; ?>
88
+ </dl>
89
+ </div>
90
+ <?php endif; ?>
91
+
92
+
93
+ <?php if( preg_match('/^tnt_/',$_order->getShippingMethod()) != 0 ) { //commande TNT ?>
94
+
95
+ <p class="order-links"></p>
96
+
97
+ <?php foreach ($_order->getShipmentsCollection() as $_shipment): ?>
98
+ <h2 class="sub-title"><?php echo $this->__('Shipment #') ?><?php echo $_shipment->getIncrementId(); ?> <span class="separator">|</span> <a href="<?php echo $this->getPrintShipmentUrl($_shipment) ?>" onclick="this.target='_blank'" class="link-print"><?php echo $this->__('Print Shipment') ?></a></h2>
99
+ <?php $tracks = $_shipment->getTracksCollection(); ?>
100
+ <?php if ($tracks->count()): ?>
101
+ <table class="data-table tracking-table" id="my-tracking-table-<?php echo $_shipment->getId(); ?>">
102
+ <tbody>
103
+ <tr>
104
+ <th class="label">Cliquez sur le(s) numéro(s) de suivi pour suivre vos colis :</th>
105
+ <td>&nbsp;
106
+ <?php
107
+ $i = 1;
108
+ $_size = $tracks->count();
109
+ foreach($tracks as $track): ?>
110
+ <?php if($track->isCustom()): ?>
111
+ <?php echo $track->getNumber() ?>
112
+ <?php else: ?>
113
+ <a href="<?php echo Mage::getBaseUrl ('skin'); ?>/frontend/default/default/tnt_suiviColis.php?suivi=<?php echo $track->getNumber() ?>" rel="superbox[iframe]"><?php echo $track->getNumber() ?></a>
114
+ <?php endif; ?>
115
+ <?php if($i!=$_size): ?>, <?php endif; ?>
116
+ <?php $i++;
117
+ endforeach; ?>
118
+ </td>
119
+ </tr>
120
+ </tbody>
121
+ </table>
122
+ <script type="text/javascript">decorateTable('my-tracking-table-<?php echo $_shipment->getId(); ?>')</script>
123
+ <?php endif; ?>
124
+ <script type="text/javascript">decorateTable('my-shipment-table-<?php echo $_shipment->getId(); ?>', {'tbody' : ['odd', 'even'], 'tbody tr' : ['first', 'last']})</script>
125
+ <?php echo $this->getCommentsHtml($_shipment)?>
126
+ <?php endforeach; ?>
127
+ <?php } ?>
128
+
129
+ <script type="text/javascript">
130
+ jQuery(function(){
131
+ jQuery.superbox.settings = {
132
+ boxId: "superbox",
133
+ boxClasses: "",
134
+ overlayOpacity: .8,
135
+ boxWidth: "600",
136
+ boxHeight: "600",
137
+ loadTxt: "Chargement ...",
138
+ closeTxt: "Fermer"
139
+ };
140
+ jQuery.superbox();
141
+ });
142
+ </script>
143
+
144
+
145
+ <div class="buttons-set">
146
+ <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>&laquo; </small><?php echo $this->__('Back to My Orders') ?></a></p>
147
+ </div>
148
+ </div>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>TNT_Express_Fr</name>
4
- <version>3.0.10</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,13 +10,18 @@
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
  - modification du dispatche manuel du poids des colis&#xD;
14
  - modification du + d'infos TNT 24 domicile&#xD;
15
- - suppression de l'image du calendar sp&#xE9;cifique - ajout de l'image calendar g&#xE9;n&#xE9;rique</notes>
 
 
16
  <authors><author><name>Infostrates</name><user>InfoDev</user><email>magento@infostrates.fr</email></author></authors>
17
- <date>2014-01-09</date>
18
- <time>16:06:26</time>
19
- <contents><target name="mageskin"><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="faf9c57cc23546009a0ef17bbec18f46"/><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"><file name="24h_domicile.jpg" hash="4f3895df09982e1eb04a5a11360e88ec"/><file name="24h_entreprise.jpg" hash="eab57029f655d350d37047822c30b85a"/><file name="24h_relais.jpg" hash="1ab1dc90034ab68830c69070e45b5248"/><dir><dir name="relaisColis"><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"/><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><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 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="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><dir name="template"><dir name="sales"><dir name="items"><dir name="column"><file name="name.phtml" hash="37c3722f4eee055b79febe30b06f3c46"/></dir></dir><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="197fbba3d7d93344a12224a893d6334d"/><file name="items.phtml" hash="88f5f24c3b00b0fdb88f9cd3a6601624"/></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="onepage"><dir name="shipping_method"><file name="available.phtml" hash="e778a63e5d668669607abbbae578d9fa"/></dir><file name="shipping_method.phtml" hash="ec7ad924d51398d83d6854ad24f7ca16"/></dir><dir name="sales"><dir name="order"><file name="info.phtml" hash="d3a94a5affd8c5cde40555d97c784962"/><file name="view.phtml" hash="82e3780bde649e34a49217b9199f70bf"/></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="9bfa61660b7c6f897fbb87b133afbd09"/></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="72131007614ea7eba8a82018bb259517"/><file name="Tntmaxweight.php" hash="ee2f5213c81fab21fbeff78134ac3207"/></dir></dir><file name="Tnt.php" hash="95c053d623036b2ff3d138307f6d90d7"/></dir></dir></dir><dir name="controllers"><dir name="Sales"><file name="ImpressionController.php" hash="515ece46edde3d3634e289d92afb1b34"/><dir name="Order"><file name="ShipmentController.php" hash="1d92c90103bdd53326eaf237cb582a67"/></dir></dir><file name="TntController.php" hash="f430e24ea87fbd43c7647320fd2a0f07"/></dir><dir name="etc"><file name="config.xml" hash="2930d5c06d226cde340858b0b26f5a67"/><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></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="5b3a003f583929b8f518790bffe4e533"/></dir></dir></dir></target></contents>
20
  <compatible/>
21
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
22
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>TNT_Express_Fr</name>
4
+ <version>2.0.10</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
+ - corrige la gestion des frais de port sur les produits configurables.&#xD;
14
+ - corrige le poids max par colis sur les &#xE9;tiquettes en fonction du mode choisi (relais, indiv = 20kg, entreprise = 30kg)&#xD;
15
+ - ajout du dispatche manuel du poids des colis&#xD;
16
  - modification du dispatche manuel du poids des colis&#xD;
17
  - modification du + d'infos TNT 24 domicile&#xD;
18
+ - suppression de l'image du calendar sp&#xE9;cifique - ajout de l'image calendar g&#xE9;n&#xE9;rique&#xD;
19
+ &#xD;
20
+ </notes>
21
  <authors><author><name>Infostrates</name><user>InfoDev</user><email>magento@infostrates.fr</email></author></authors>
22
+ <date>2014-02-25</date>
23
+ <time>15:43:51</time>
24
+ <contents><target name="mageskin"><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="faf9c57cc23546009a0ef17bbec18f46"/><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"><file name="24h_domicile.jpg" hash="4f3895df09982e1eb04a5a11360e88ec"/><file name="24h_entreprise.jpg" hash="eab57029f655d350d37047822c30b85a"/><file name="24h_relais.jpg" hash="1ab1dc90034ab68830c69070e45b5248"/><dir><dir name="relaisColis"><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"/><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><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 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="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><dir name="template"><dir name="sales"><dir name="items"><dir name="column"><file name="name.phtml" hash="8224a57aa31c26d5688a48fe55d6a392"/></dir></dir><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="54f686b1bb9a3eb40b6ce6c396e3c980"/><file name="items.phtml" hash="5730a98c8b54268d18b192a282e4863b"/></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="3ce022f355b76c06ad59085f85b6d26e"/></dir><file name="shipping_method.phtml" hash="ec7ad924d51398d83d6854ad24f7ca16"/></dir><dir name="sales"><dir name="order"><file name="info.phtml" hash="dc72c0885c2bb745f57a281c4fe59471"/><file name="view.phtml" hash="fe15ca351879a3d03ac0414659815acd"/></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="9bfa61660b7c6f897fbb87b133afbd09"/></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="72131007614ea7eba8a82018bb259517"/><file name="Tntmaxweight.php" hash="ee2f5213c81fab21fbeff78134ac3207"/></dir></dir><file name="Tnt.php" hash="95f49de93fce785d2cfb0feb8411aa98"/></dir></dir></dir><dir name="controllers"><dir name="Sales"><file name="ImpressionController.php" hash="515ece46edde3d3634e289d92afb1b34"/><dir name="Order"><file name="ShipmentController.php" hash="1d92c90103bdd53326eaf237cb582a67"/></dir></dir><file name="TntController.php" hash="f430e24ea87fbd43c7647320fd2a0f07"/></dir><dir name="etc"><file name="config.xml" hash="dd33313da77251170d0f1a3b55eb8cae"/><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></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>
25
  <compatible/>
26
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
27
  </package>