Version Notes
Extension officielle vous permettant de proposer les services TNT à vos clients.
- 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 | 3.0.10 |
Comparing to | |
See all releases |
Code changes from version 3.0.7 to 3.0.10
- app/code/community/Infostrates/Tnt/Model/Shipping/Carrier/Tnt.php +9 -5
- app/code/community/Infostrates/Tnt/controllers/Sales/Order/ShipmentController.php +5 -14
- app/code/community/Infostrates/Tnt/etc/config.xml +1 -1
- app/design/adminhtml/default/tnt/template/sales/items/column/name.phtml +61 -0
- app/design/adminhtml/default/tnt/template/sales/order/shipment/create/form.phtml +30 -4
- app/design/adminhtml/default/tnt/template/sales/order/shipment/create/items.phtml +154 -0
- package.xml +7 -10
- skin/adminhtml/default/tnt/images/calendar.gif +0 -0
- skin/frontend/default/default/images/tnt/24h_domicile.jpg +0 -0
- skin/frontend/default/default/images/tnt/_24h_relais.jpg +0 -0
- skin/frontend/default/default/images/tnt/_tnt_j.png +0 -0
- skin/frontend/default/default/images/tnt/_tnt_jd.png +0 -0
- skin/frontend/default/default/images/tnt/_tnt_jz.png +0 -0
app/code/community/Infostrates/Tnt/Model/Shipping/Carrier/Tnt.php
CHANGED
@@ -218,13 +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 |
foreach($items as $item) {
|
222 |
-
|
223 |
-
|
224 |
-
|
|
|
|
|
|
|
|
|
225 |
}
|
226 |
-
|
227 |
-
}
|
228 |
|
229 |
//si le poids total du colis dépasse la limite pour TNT (définie par le commercant)
|
230 |
//si la limite est à 0 alors on passe en mode 'Pas de limite'
|
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'
|
app/code/community/Infostrates/Tnt/controllers/Sales/Order/ShipmentController.php
CHANGED
@@ -42,17 +42,20 @@ class Infostrates_Tnt_Sales_Order_ShipmentController extends Mage_Adminhtml_Sale
|
|
42 |
|
43 |
$rec_typeid = '';
|
44 |
$rec_name = '';
|
|
|
45 |
|
46 |
if($_shippingMethod['1'] == "A" || $_shippingMethod['1'] == "T" || $_shippingMethod['1'] == "M" || $_shippingMethod['1'] == "J") {
|
47 |
$rec_type = 'ENTERPRISE';
|
48 |
$rec_name = trim($_order->getShippingAddress()->getCompany());
|
49 |
} elseif($_shippingMethod['1'] == "AZ" || $_shippingMethod['1'] == "TZ" || $_shippingMethod['1'] == "MZ" || $_shippingMethod['1'] == "JZ") {
|
50 |
$rec_type = 'INDIVIDUAL';
|
|
|
51 |
} else {
|
52 |
$rec_type = 'DROPOFFPOINT';
|
53 |
$extt = explode(' ',trim($_order->getShippingAddress()->getCompany()));
|
54 |
$rec_typeid = end($extt);
|
55 |
$rec_name = str_replace($rec_typeid, '', $_order->getShippingAddress()->getCompany());
|
|
|
56 |
}
|
57 |
|
58 |
$rec_address1 = $_order->getShippingAddress()->getStreet(1);
|
@@ -71,20 +74,8 @@ class Infostrates_Tnt_Sales_Order_ShipmentController extends Mage_Adminhtml_Sale
|
|
71 |
|
72 |
$poids_restant = $_order->getWeight();
|
73 |
for($i=1;$i<=$nb_colis;$i++) {
|
74 |
-
|
75 |
-
|
76 |
-
$parcelWeight = $this->getConfigData('max_package_weight');
|
77 |
-
} else {
|
78 |
-
$parcelWeight = $poids_restant;
|
79 |
-
}
|
80 |
-
} else {
|
81 |
-
$parcelWeight = $this->getConfigData('max_package_weight');
|
82 |
-
$poids_restant = $poids_restant - $parcelWeight;
|
83 |
-
}
|
84 |
-
|
85 |
-
if($parcelWeight < '0.1') {
|
86 |
-
$parcelWeight = '0.1';
|
87 |
-
}
|
88 |
|
89 |
$parcelsRequest[] = array('sequenceNumber'=>$i,'customerReference' => $_order->getRealOrderId(), 'weight' => $parcelWeight);
|
90 |
}
|
42 |
|
43 |
$rec_typeid = '';
|
44 |
$rec_name = '';
|
45 |
+
$poids_colis_max = $this->getConfigData('max_package_weight');
|
46 |
|
47 |
if($_shippingMethod['1'] == "A" || $_shippingMethod['1'] == "T" || $_shippingMethod['1'] == "M" || $_shippingMethod['1'] == "J") {
|
48 |
$rec_type = 'ENTERPRISE';
|
49 |
$rec_name = trim($_order->getShippingAddress()->getCompany());
|
50 |
} elseif($_shippingMethod['1'] == "AZ" || $_shippingMethod['1'] == "TZ" || $_shippingMethod['1'] == "MZ" || $_shippingMethod['1'] == "JZ") {
|
51 |
$rec_type = 'INDIVIDUAL';
|
52 |
+
$poids_colis_max = ($this->getConfigData('max_package_weight')-10);
|
53 |
} else {
|
54 |
$rec_type = 'DROPOFFPOINT';
|
55 |
$extt = explode(' ',trim($_order->getShippingAddress()->getCompany()));
|
56 |
$rec_typeid = end($extt);
|
57 |
$rec_name = str_replace($rec_typeid, '', $_order->getShippingAddress()->getCompany());
|
58 |
+
$poids_colis_max = ($this->getConfigData('max_package_weight')-10);
|
59 |
}
|
60 |
|
61 |
$rec_address1 = $_order->getShippingAddress()->getStreet(1);
|
74 |
|
75 |
$poids_restant = $_order->getWeight();
|
76 |
for($i=1;$i<=$nb_colis;$i++) {
|
77 |
+
$colis = "colis".$i;
|
78 |
+
$parcelWeight = $this->getRequest()->getPost($colis);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
79 |
|
80 |
$parcelsRequest[] = array('sequenceNumber'=>$i,'customerReference' => $_order->getRealOrderId(), 'weight' => $parcelWeight);
|
81 |
}
|
app/code/community/Infostrates/Tnt/etc/config.xml
CHANGED
@@ -3,7 +3,7 @@
|
|
3 |
<config>
|
4 |
<modules>
|
5 |
<Infostrates_Tnt>
|
6 |
-
<version>3.0.
|
7 |
<depends>
|
8 |
<Mage_Adminhtml />
|
9 |
<Mage_Shipping />
|
3 |
<config>
|
4 |
<modules>
|
5 |
<Infostrates_Tnt>
|
6 |
+
<version>3.0.10</version>
|
7 |
<depends>
|
8 |
<Mage_Adminhtml />
|
9 |
<Mage_Shipping />
|
app/design/adminhtml/default/tnt/template/sales/items/column/name.phtml
ADDED
@@ -0,0 +1,61 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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 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 |
+
?>
|
27 |
+
<?php
|
28 |
+
/**
|
29 |
+
* @see Mage_Adminhtml_Block_Sales_Items_Column_Name
|
30 |
+
*/
|
31 |
+
?>
|
32 |
+
|
33 |
+
<?php if ($_item = $this->getItem()): ?>
|
34 |
+
<h5 class="title"><span id="order_item_<?php echo $_item->getId() ?>_title"><?php echo $this->htmlEscape($_item->getName()) ?></span></h5>
|
35 |
+
<div><strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong> <?php echo implode('<br />', Mage::helper('catalog')->splitSku($this->htmlEscape($this->getSku()))); ?></div>
|
36 |
+
<div><strong><?php echo $this->helper('sales')->__('Poids') ?>:</strong> <?php echo $_item->getWeight(); ?></div>
|
37 |
+
<?php if ($this->getOrderOptions()): ?>
|
38 |
+
<dl class="item-options">
|
39 |
+
<?php foreach ($this->getOrderOptions() as $_option): ?>
|
40 |
+
<dt><?php echo $_option['label'] ?></dt>
|
41 |
+
<dd>
|
42 |
+
<?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
|
43 |
+
<?php echo $this->getCustomizedOptionValue($_option); ?>
|
44 |
+
<?php else: ?>
|
45 |
+
<?php $_option = $this->getFormattedOption($_option['value']); ?>
|
46 |
+
<?php echo $_option['value']; ?><?php if (isset($_option['remainder']) && $_option['remainder']): ?><span id="<?php echo $_dots = 'dots' . uniqid()?>"> ...</span><span id="<?php echo $_id = 'id' . uniqid()?>"><?php echo $_option['remainder'] ?></span>
|
47 |
+
<script type="text/javascript">
|
48 |
+
$('<?php echo $_id ?>').hide();
|
49 |
+
$('<?php echo $_id ?>').up().observe('mouseover', function(){$('<?php echo $_id ?>').show();});
|
50 |
+
$('<?php echo $_id ?>').up().observe('mouseover', function(){$('<?php echo $_dots?>').hide();});
|
51 |
+
$('<?php echo $_id ?>').up().observe('mouseout', function(){$('<?php echo $_id ?>').hide();});
|
52 |
+
$('<?php echo $_id ?>').up().observe('mouseout', function(){$('<?php echo $_dots ?>').show();});
|
53 |
+
</script>
|
54 |
+
<?php endif; ?>
|
55 |
+
<?php endif; ?>
|
56 |
+
</dd>
|
57 |
+
<?php endforeach; ?>
|
58 |
+
</dl>
|
59 |
+
<?php endif; ?>
|
60 |
+
<?php echo $this->htmlEscape($_item->getDescription()) ?>
|
61 |
+
<?php endif; ?>
|
app/design/adminhtml/default/tnt/template/sales/order/shipment/create/form.phtml
CHANGED
@@ -1,6 +1,6 @@
|
|
1 |
<form id="edit_form" method="post" action="<?php echo $this->getSaveUrl() ?>">
|
2 |
<?php echo $this->getBlockHtml('formkey')?>
|
3 |
-
<?php $_order = $this->getShipment()->getOrder() ?>
|
4 |
<?php $_shippingMethod = explode("_",$_order->getShippingMethod()); ?>
|
5 |
<?php echo $this->getChildHtml('order_info') ?>
|
6 |
|
@@ -53,10 +53,25 @@
|
|
53 |
$entreprise = '1';
|
54 |
} ?>
|
55 |
|
56 |
-
<?php if (($_shippingMethod[0] == 'tnt')) :
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
57 |
<div><?php echo $this->helper('tnt')->__('Le numéro de tracking TNT sera ajouté automatiquement'); ?></div>
|
58 |
-
<div><label><?php echo $this->helper('tnt')->__("Date d'expédition"); ?></label> <input type="text" id="shippingDate" name="shippingDate" value="<?php echo date('d-m-Y'); ?>" class="input-text" /> <img title="Date d'exédition" id="sd_trig" alt="" src="<?php echo $this->getSkinUrl(
|
59 |
-
<div><label><?php echo $this->helper('tnt')->__('Nombre de colis à expédier'); ?></label> <select id="nb_colis" name="nb_colis" onchange="
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
60 |
<?php if( $entreprise == '1' ) { ?>
|
61 |
<div><i>* le poids de chaque colis ne doit pas dépasser 30 kg</i></div>
|
62 |
<?php } else { ?>
|
@@ -80,6 +95,17 @@
|
|
80 |
}
|
81 |
}
|
82 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
83 |
function checkSamedi(date) {
|
84 |
var maDate = date.split("-");
|
85 |
var laDate = new Date(maDate[2], maDate[1]-1, maDate[0]);
|
1 |
<form id="edit_form" method="post" action="<?php echo $this->getSaveUrl() ?>">
|
2 |
<?php echo $this->getBlockHtml('formkey')?>
|
3 |
+
<?php $_order = $this->getShipment()->getOrder(); ?>
|
4 |
<?php $_shippingMethod = explode("_",$_order->getShippingMethod()); ?>
|
5 |
<?php echo $this->getChildHtml('order_info') ?>
|
6 |
|
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);
|
59 |
+
$nbColis = $orderPoids/$poidsMaxColis; //nb de colis
|
60 |
+
|
61 |
+
if( is_float($nbColis) ) {
|
62 |
+
$nbColis = ceil($nbColis); //nb de colis arrondi
|
63 |
+
} ?>
|
64 |
<div><?php echo $this->helper('tnt')->__('Le numéro de tracking TNT sera ajouté automatiquement'); ?></div>
|
65 |
+
<div><label><?php echo $this->helper('tnt')->__("Date d'expédition"); ?></label> <input type="text" id="shippingDate" name="shippingDate" value="<?php echo date('d-m-Y'); ?>" class="input-text" /> <img title="Date d'exédition" id="sd_trig" alt="" src="<?php echo $this->getSkinUrl('images/grid-cal.gif'); ?>" style="cursor: pointer; height: 15px; vertical-align: middle; width: 15px;" /></div>
|
66 |
+
<div><label><?php echo $this->helper('tnt')->__('Nombre de colis à expédier'); ?></label> <select id="nb_colis" name="nb_colis" onchange="createColis();"><?php for($i=$nbColis;$i<=10;$i++) { ?><option value="<?php echo $i; ?>" <?php if( $i == $nbColis ) { ?>selected="selected" <?php } ?>><?php echo $i; ?></option><?php } ?></select> <strong>Poids de l'expédition : <?php echo $orderPoids; ?> kg</strong></div>
|
67 |
+
<input type="hidden" id="orderPoids" name="orderPoids" value="<?php echo $orderPoids; ?>" />
|
68 |
+
<input type="hidden" id="maxPoids" name="maxPoids" value="<?php echo $poidsMaxColis; ?>" />
|
69 |
+
<div id="createColis">
|
70 |
+
<?php for($c=1; $c<=$nbColis; $c++) {
|
71 |
+
//if( $c == $nbColis ) { $poidsColis = $reste; } else { $poidsColis = $poidsMaxColis; $reste-= $poidsColis; } ?>
|
72 |
+
Poids colis <?php echo $c; ?> : <input type="text" name="colis<?php echo $c; ?>" value="<?php //echo $poidsColis; ?>" class="colis" /><br />
|
73 |
+
<?php } ?>
|
74 |
+
</div>
|
75 |
<?php if( $entreprise == '1' ) { ?>
|
76 |
<div><i>* le poids de chaque colis ne doit pas dépasser 30 kg</i></div>
|
77 |
<?php } else { ?>
|
95 |
}
|
96 |
}
|
97 |
|
98 |
+
function createColis() {
|
99 |
+
$('createColis').empty();
|
100 |
+
var inputs = "";
|
101 |
+
for( var c=1; c<=$("nb_colis").value;c++ ) {
|
102 |
+
inputs = inputs+"Poids colis "+c+" : <input type='text' name='colis"+c+"' value='' class='colis' /><br />";
|
103 |
+
}
|
104 |
+
$('createColis').update(inputs);
|
105 |
+
|
106 |
+
checkNbColis();
|
107 |
+
}
|
108 |
+
|
109 |
function checkSamedi(date) {
|
110 |
var maDate = date.split("-");
|
111 |
var laDate = new Date(maDate[2], maDate[1]-1, maDate[0]);
|
app/design/adminhtml/default/tnt/template/sales/order/shipment/create/items.phtml
ADDED
@@ -0,0 +1,154 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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 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 |
+
?>
|
27 |
+
<div class="grid np">
|
28 |
+
<div class="hor-scroll">
|
29 |
+
<table cellspacing="0" class="data order-tables">
|
30 |
+
<col />
|
31 |
+
<col width="1" />
|
32 |
+
<col width="1" />
|
33 |
+
<?php if (!$this->canShipPartiallyItem()): ?>
|
34 |
+
<col width="20" />
|
35 |
+
<?php endif; ?>
|
36 |
+
<thead>
|
37 |
+
<tr class="headings">
|
38 |
+
<th><?php echo $this->helper('sales')->__('Product') ?></th>
|
39 |
+
<th class="a-center"><?php echo $this->helper('sales')->__('Qty') ?></th>
|
40 |
+
<th<?php if ($this->isShipmentRegular()): ?> class="last"<?php endif; ?>><span class="nobr"><?php echo $this->helper('sales')->__('Qty to Ship') ?></span></th>
|
41 |
+
|
42 |
+
<?php if (!$this->canShipPartiallyItem()): ?>
|
43 |
+
<th class="a-center last"><span class="nobr"><?php echo $this->helper('sales')->__('Ship') ?></span></th>
|
44 |
+
<?php endif; ?>
|
45 |
+
|
46 |
+
</tr>
|
47 |
+
</thead>
|
48 |
+
<?php $_items = $this->getShipment()->getAllItems() ?>
|
49 |
+
<?php $_i=0;foreach ($_items as $_item): if ($_item->getOrderItem()->getIsVirtual() || $_item->getOrderItem()->getParentItem()): continue; endif; $_i++ ?>
|
50 |
+
<tbody class="<?php echo $_i%2?'odd':'even' ?>">
|
51 |
+
<?php echo $this->getItemHtml($_item) ?>
|
52 |
+
<?php echo $this->getItemExtraInfoHtml($_item->getOrderItem()) ?>
|
53 |
+
</tbody>
|
54 |
+
<?php endforeach; ?>
|
55 |
+
</table>
|
56 |
+
</div>
|
57 |
+
</div>
|
58 |
+
<br />
|
59 |
+
<div class="box-left entry-edit">
|
60 |
+
<div class="entry-edit-head"><h4><?php echo $this->__('Shipment Comments') ?></h4></div>
|
61 |
+
<fieldset>
|
62 |
+
<div id="order-history_form">
|
63 |
+
<span class="field-row">
|
64 |
+
<label class="normal" for="shipment_comment_text"><?php echo Mage::helper('sales')->__('Shipment Comments') ?></label>
|
65 |
+
<textarea id="shipment_comment_text" name="shipment[comment_text]" rows="3" cols="5" style="height:6em; width:99%;"><?php echo $this->getShipment()->getCommentText(); ?></textarea>
|
66 |
+
</span>
|
67 |
+
<div class="clear"></div>
|
68 |
+
</div>
|
69 |
+
</fieldset>
|
70 |
+
</div>
|
71 |
+
|
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" />
|
84 |
+
</p>
|
85 |
+
<?php if ($this->canSendShipmentEmail()): ?>
|
86 |
+
<p>
|
87 |
+
<label class="normal" for="send_email"><?php echo Mage::helper('sales')->__('Email Copy of Shipment') ?></label>
|
88 |
+
<input id="send_email" name="shipment[send_email]" value="1" type="checkbox" />
|
89 |
+
</p>
|
90 |
+
<?php endif; ?>
|
91 |
+
<div class="a-right">
|
92 |
+
<?php echo $this->getChildHtml('submit_button') ?>
|
93 |
+
</div>
|
94 |
+
</div>
|
95 |
+
</div>
|
96 |
+
</div>
|
97 |
+
<div class="clear"></div>
|
98 |
+
<script type="text/javascript">
|
99 |
+
//<![CDATA[
|
100 |
+
var sendEmailCheckbox = $('send_email');
|
101 |
+
if (sendEmailCheckbox) {
|
102 |
+
var notifyCustomerCheckbox = $('notify_customer');
|
103 |
+
var shipmentCommentText = $('shipment_comment_text');
|
104 |
+
Event.observe(sendEmailCheckbox, 'change', bindSendEmail);
|
105 |
+
bindSendEmail();
|
106 |
+
}
|
107 |
+
function bindSendEmail()
|
108 |
+
{
|
109 |
+
if (sendEmailCheckbox.checked == true) {
|
110 |
+
notifyCustomerCheckbox.disabled = false;
|
111 |
+
//shipmentCommentText.disabled = false;
|
112 |
+
}
|
113 |
+
else {
|
114 |
+
notifyCustomerCheckbox.disabled = true;
|
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) {
|
131 |
+
checkPoids = parseFloat(checkPoids)+parseFloat(e.value);
|
132 |
+
if( parseInt(e.value) > parseInt($('maxPoids').value) ) {
|
133 |
+
alert( "Le poids de chaque colis ne doit pas dépasser "+$('maxPoids').value+"Kg" );
|
134 |
+
return false;
|
135 |
+
}
|
136 |
+
});
|
137 |
+
|
138 |
+
if( checkPoids == '0' || checkPoids != $('orderPoids').value ) {
|
139 |
+
if( isNaN(checkPoids) ) { checkPoids = '0'; }
|
140 |
+
if(!confirm("La somme de vos colis n'est pas correcte ("+checkPoids+"Kg au lieu de "+$('orderPoids').value+"Kg).")) {
|
141 |
+
return false;
|
142 |
+
}
|
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 |
+
}
|
153 |
+
//]]>
|
154 |
+
</script>
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>TNT_Express_Fr</name>
|
4 |
-
<version>3.0.
|
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,16 +10,13 @@
|
|
10 |
<description>Extension officielle vous permettant de proposer les services TNT à vos clients.</description>
|
11 |
<notes>Extension officielle vous permettant de proposer les services TNT à vos clients.
|
12 |

|
13 |
-
-
|
14 |
-
-
|
15 |
-
-
|
16 |
-
- suppression alert "cout supplémentaire le samedi" côté admin.
|
17 |
-
- modification avertissement 20kg ou 30kg en fonction du type d'envoi côté admin.
|
18 |
-
</notes>
|
19 |
<authors><author><name>Infostrates</name><user>InfoDev</user><email>magento@infostrates.fr</email></author></authors>
|
20 |
-
<date>
|
21 |
-
<time>
|
22 |
-
<contents><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="tnt"><dir><dir name="images"><file name="calendar.gif" hash="b1468e5239504974c689eea5d93f86d4"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="css"><dir name="tnt"><file name="jquery.superbox.css" hash="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="45334759cd925b64ad7dfd29f547cd45"/><file name="24h_entreprise.jpg" hash="eab57029f655d350d37047822c30b85a"/><file name="24h_relais.jpg" hash="1ab1dc90034ab68830c69070e45b5248"/><file name="_24h_relais.jpg" hash="6344a1fc8c0bd49f957d184c6506b16b"/><file name="_tnt_j.png" hash="2a11f2e71231a05d86d5031ca81f17a1"/><file name="_tnt_jd.png" hash="2b5725dacd06a08a2055884fbd9b2397"/><file name="_tnt_jz.png" hash="2bd28bb1b58294f4d84aa0e5d058b66a"/><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="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="35508dbc75a2494c82cdc6b489ed687d"/></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="972cd3557ba9528d604aca2c7507a3a0"/></dir></dir></dir><dir name="controllers"><dir name="Sales"><file name="ImpressionController.php" hash="515ece46edde3d3634e289d92afb1b34"/><dir name="Order"><file name="ShipmentController.php" hash="bbd5ef5cbb49d109e1e57196ae95f64b"/></dir></dir><file name="TntController.php" hash="f430e24ea87fbd43c7647320fd2a0f07"/></dir><dir name="etc"><file name="config.xml" hash="93f447fdd87b2fe4c80017c3adab811b"/><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>
|
23 |
<compatible/>
|
24 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
25 |
</package>
|
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 |
<description>Extension officielle vous permettant de proposer les services TNT à vos clients.</description>
|
11 |
<notes>Extension officielle vous permettant de proposer les services TNT à vos clients.
|
12 |

|
13 |
+
- modification du dispatche manuel du poids des colis
|
14 |
+
- modification du + d'infos TNT 24 domicile
|
15 |
+
- suppression de l'image du calendar spécifique - ajout de l'image calendar géné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>
|
skin/adminhtml/default/tnt/images/calendar.gif
DELETED
Binary file
|
skin/frontend/default/default/images/tnt/24h_domicile.jpg
CHANGED
Binary file
|
skin/frontend/default/default/images/tnt/_24h_relais.jpg
DELETED
Binary file
|
skin/frontend/default/default/images/tnt/_tnt_j.png
DELETED
Binary file
|
skin/frontend/default/default/images/tnt/_tnt_jd.png
DELETED
Binary file
|
skin/frontend/default/default/images/tnt/_tnt_jz.png
DELETED
Binary file
|