DPDFrance_Shipping - Version 5.1.4

Version Notes

DPDFrance_Shipping for Magento CE 1.4 - 1.9

Download this release

Release Info

Developer DPD France S.A.S.
Extension DPDFrance_Shipping
Version 5.1.4
Comparing to
See all releases


Code changes from version 5.1.3 to 5.1.4

Files changed (34) hide show
  1. app/code/community/DPDFrance/Classic/Helper/Data.php +1 -1
  2. app/code/community/DPDFrance/Classic/Model/Carrier/DPDFranceClassicShipping.php +3 -3
  3. app/code/community/DPDFrance/Classic/Model/Owebia.php +3 -3
  4. app/code/community/DPDFrance/Classic/etc/config.xml +1 -1
  5. app/code/community/DPDFrance/Classic/etc/system.xml +1 -1
  6. app/code/community/DPDFrance/Export/Block/Export/Orders.php +4 -4
  7. app/code/community/DPDFrance/Export/Block/Export/Orders/Grid.php +15 -16
  8. app/code/community/DPDFrance/Export/Block/Tracking/Orders.php +4 -4
  9. app/code/community/DPDFrance/Export/Block/Tracking/Orders/Grid.php +4 -4
  10. app/code/community/DPDFrance/Export/Helper/Data.php +1 -1
  11. app/code/community/DPDFrance/Export/controllers/Adminhtml/DPDFrance/ExportController.php +4 -4
  12. app/code/community/DPDFrance/Export/controllers/Adminhtml/DPDFrance/TrackingController.php +4 -4
  13. app/code/community/DPDFrance/Export/etc/config.xml +18 -18
  14. app/code/community/DPDFrance/Predict/Helper/Data.php +1 -1
  15. app/code/community/DPDFrance/Predict/Model/Carrier/DPDFrancePredictShipping.php +3 -3
  16. app/code/community/DPDFrance/Predict/Model/Observer.php +2 -3
  17. app/code/community/DPDFrance/Predict/Model/Owebia.php +3 -3
  18. app/code/community/DPDFrance/Predict/etc/config.xml +1 -1
  19. app/code/community/DPDFrance/Predict/etc/system.xml +1 -1
  20. app/code/community/DPDFrance/Relais/Helper/Data.php +1 -1
  21. app/code/community/DPDFrance/Relais/Model/Carrier/DPDFranceRelaisShipping.php +3 -3
  22. app/code/community/DPDFrance/Relais/Model/Observer.php +1 -1
  23. app/code/community/DPDFrance/Relais/Model/Outputs.php +1 -1
  24. app/code/community/DPDFrance/Relais/Model/Owebia.php +3 -3
  25. app/code/community/DPDFrance/Relais/controllers/PickupController.php +1 -1
  26. app/code/community/DPDFrance/Relais/etc/config.xml +1 -1
  27. app/code/community/DPDFrance/Relais/etc/system.xml +1 -1
  28. app/design/frontend/base/default/template/dpdfrpredict/checkout/onepage/shipping_method/available.phtml +2 -1
  29. app/design/frontend/base/default/template/dpdfrrelais/checkout/onepage/shipping_method/available.phtml +3 -2
  30. package.xml +4 -4
  31. skin/frontend/base/default/css/dpdfrance/dpdfrpredict.css +1 -1
  32. skin/frontend/base/default/css/dpdfrance/dpdfrrelais.css +1 -1
  33. skin/frontend/base/default/js/dpdfrance/dpdfrpredict.js +1 -1
  34. skin/frontend/base/default/js/dpdfrance/dpdfrrelais.js +1 -1
app/code/community/DPDFrance/Classic/Helper/Data.php CHANGED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * DPD France v5.1.3 shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
1
  <?php
2
  /**
3
+ * DPD France shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
app/code/community/DPDFrance/Classic/Model/Carrier/DPDFranceClassicShipping.php CHANGED
@@ -1,11 +1,11 @@
1
  <?php
2
  /**
3
- * DPD France v5.1.3 shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
7
- * @author DPD France S.A.S. <ensavoirplus.ecommerce@dpd.fr>
8
- * @copyright 2015 DPD France S.A.S., société par actions simplifiée, au capital de 18.500.000 euros, dont le siège social est situé 27 Rue du Colonel Pierre Avia - 75015 PARIS, immatriculée au registre du commerce et des sociétés de Paris sous le numéro 444 420 830
9
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10
  */
11
 
1
  <?php
2
  /**
3
+ * DPD France shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
7
+ * @author Antoine Lemoine, DPD France S.A.S. <ensavoirplus.ecommerce@dpd.fr>
8
+ * @copyright Copyright (c) 2008-10 Owebia (http://www.owebia.com/) , 2015 DPD France S.A.S., société par actions simplifiée, au capital de 18.500.000 euros, dont le siège social est situé 27 Rue du Colonel Pierre Avia - 75015 PARIS, immatriculée au registre du commerce et des sociétés de Paris sous le numéro 444 420 830
9
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10
  */
11
 
app/code/community/DPDFrance/Classic/Model/Owebia.php CHANGED
@@ -1,11 +1,11 @@
1
  <?php
2
  /**
3
- * DPD France v5.1.3 shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
7
- * @author DPD France S.A.S. <ensavoirplus.ecommerce@dpd.fr>
8
- * @copyright 2015 DPD France S.A.S., société par actions simplifiée, au capital de 18.500.000 euros, dont le siège social est situé 27 Rue du Colonel Pierre Avia - 75015 PARIS, immatriculée au registre du commerce et des sociétés de Paris sous le numéro 444 420 830
9
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10
  */
11
 
1
  <?php
2
  /**
3
+ * DPD France shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
7
+ * @author Antoine Lemoine, DPD France S.A.S. <ensavoirplus.ecommerce@dpd.fr>
8
+ * @copyright Copyright (c) 2008-10 Owebia (http://www.owebia.com/) , 2015 DPD France S.A.S., société par actions simplifiée, au capital de 18.500.000 euros, dont le siège social est situé 27 Rue du Colonel Pierre Avia - 75015 PARIS, immatriculée au registre du commerce et des sociétés de Paris sous le numéro 444 420 830
9
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10
  */
11
 
app/code/community/DPDFrance/Classic/etc/config.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0" encoding="UTF-8"?>
2
  <!--
3
  /**
4
- * DPD France v5.1.3 shipping module for Magento
5
  *
6
  * @category DPDFrance
7
  * @package DPDFrance_Shipping
1
  <?xml version="1.0" encoding="UTF-8"?>
2
  <!--
3
  /**
4
+ * DPD France shipping module for Magento
5
  *
6
  * @category DPDFrance
7
  * @package DPDFrance_Shipping
app/code/community/DPDFrance/Classic/etc/system.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0" encoding="UTF-8"?>
2
  <!--
3
  /**
4
- * DPD France v5.1.3 shipping module for Magento
5
  *
6
  * @category DPDFrance
7
  * @package DPDFrance_Shipping
1
  <?xml version="1.0" encoding="UTF-8"?>
2
  <!--
3
  /**
4
+ * DPD France shipping module for Magento
5
  *
6
  * @category DPDFrance
7
  * @package DPDFrance_Shipping
app/code/community/DPDFrance/Export/Block/Export/Orders.php CHANGED
@@ -1,10 +1,10 @@
1
  <?php
2
  /**
3
- * DPD France v5.1.3 shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
7
- * @author DPD France S.A.S. <ensavoirplus.ecommerce@dpd.fr>
8
  * @copyright 2015 DPD France S.A.S., société par actions simplifiée, au capital de 18.500.000 euros, dont le siège social est situé 27 Rue du Colonel Pierre Avia - 75015 PARIS, immatriculée au registre du commerce et des sociétés de Paris sous le numéro 444 420 830
9
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10
  */
@@ -13,9 +13,9 @@ class DPDFrance_Export_Block_Export_Orders extends Mage_Adminhtml_Block_Widget_G
13
  {
14
  public function __construct()
15
  {
16
- $this->_blockGroup = 'export';
17
  $this->_controller = 'export_orders';
18
- $this->_headerText = '<img src="'.Mage::getBaseUrl('media').'dpdfrance/admin/logo.png"/> <span style="color:#424143;">'.Mage::helper('export')->__('Orders management').'</span>';
19
  parent::__construct();
20
  $this->_removeButton('add');
21
  }
1
  <?php
2
  /**
3
+ * DPD France shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
7
+ * @author Smile, Jibé, DPD France S.A.S. <ensavoirplus.ecommerce@dpd.fr>
8
  * @copyright 2015 DPD France S.A.S., société par actions simplifiée, au capital de 18.500.000 euros, dont le siège social est situé 27 Rue du Colonel Pierre Avia - 75015 PARIS, immatriculée au registre du commerce et des sociétés de Paris sous le numéro 444 420 830
9
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10
  */
13
  {
14
  public function __construct()
15
  {
16
+ $this->_blockGroup = 'dpdfrexport';
17
  $this->_controller = 'export_orders';
18
+ $this->_headerText = '<img src="'.Mage::getBaseUrl('media').'dpdfrance/admin/logo.png"/> <span style="color:#424143;">'.Mage::helper('dpdfrexport')->__('Orders management').'</span>';
19
  parent::__construct();
20
  $this->_removeButton('add');
21
  }
app/code/community/DPDFrance/Export/Block/Export/Orders/Grid.php CHANGED
@@ -1,10 +1,10 @@
1
  <?php
2
  /**
3
- * DPD France v5.1.3 shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
7
- * @author DPD France S.A.S. <ensavoirplus.ecommerce@dpd.fr>
8
  * @copyright 2015 DPD France S.A.S., société par actions simplifiée, au capital de 18.500.000 euros, dont le siège social est situé 27 Rue du Colonel Pierre Avia - 75015 PARIS, immatriculée au registre du commerce et des sociétés de Paris sous le numéro 444 420 830
9
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10
  */
@@ -17,7 +17,7 @@ class DPDFrance_Export_Block_Export_Orders_Grid extends Mage_Adminhtml_Block_Wid
17
  public function __construct()
18
  {
19
  parent::__construct();
20
- $this->setId('export_export_order_grid');
21
  $this->setDefaultSort('created_at');
22
  $this->setDefaultDir('DESC');
23
  $this->setSaveParametersInSession(true);
@@ -101,7 +101,7 @@ class DPDFrance_Export_Block_Export_Orders_Grid extends Mage_Adminhtml_Block_Wid
101
  </style>
102
  <script type="text/javascript">
103
  function LoadMyJs() {
104
- var d = document.getElementById("export_export_order_grid_table").children[2]
105
  if (d)
106
  {
107
  for(var i = 0; i < d.childNodes.length; i++)
@@ -132,7 +132,6 @@ class DPDFrance_Export_Block_Export_Orders_Grid extends Mage_Adminhtml_Block_Wid
132
  if (!empty($rss->channel->item))
133
  {
134
  echo '
135
-
136
  <script type="text/javascript">
137
  function show_rss(){
138
  document.getElementById("div_rss").style.display="block";
@@ -145,26 +144,26 @@ class DPDFrance_Export_Block_Export_Orders_Grid extends Mage_Adminhtml_Block_Wid
145
  document.getElementById("button_hide").style.display = "none";
146
  }
147
  function setup(){
148
- $(\'moverlo\').update($(\'moverlo\').innerHTML.times(10));
149
  }
150
- function MoveNoticias(){
151
- new Effect.Move(\'moverlo\', {
152
  x:-40,
153
  y:0,
154
  mode:\'relative\',
155
  transition:Effect.Transitions.linear,
156
- afterFinish:MoveNoticias
157
  });
158
  }
159
  Event.observe(window, "load", function(){
160
  setup();
161
- MoveNoticias();
162
  });
163
  </script>
164
 
165
  <div id="div_header" style="font-family:DPDPlutoSansLight; width:300px;margin-left: 20px;">
166
  <div id="rss_logo" style="float:left; width:135px; height:24px; margin-top:-7px;">
167
- <img src="'.Mage::getBaseUrl('media').'dpdfrance/admin/rss_icon.png" width="24" height="24"/><p> '.Mage::helper('export')->__('DPD News').'</p>
168
  </div>
169
  <div id="button_show" style="display:none;">
170
  <a style="float:left;margin-left:0px;text-decoration: none;color: #424143;height: 24px;width: 24px;font-size: 32px;" href="javascript:void(0)" onclick="show_rss()">+</a>
@@ -176,7 +175,7 @@ class DPDFrance_Export_Block_Export_Orders_Grid extends Mage_Adminhtml_Block_Wid
176
  <br/>
177
  ';
178
  echo '
179
- <div id="div_rss" style="font-family:DPDPlutoSansLight; display:block; background-color: #e6e7e7; color: #424143; border-style: none; margin-left: 20px; margin-right: 20px; margin-top: 10px; padding: 10px;white-space:nowrap;overflow:hidden"><div id="moverlo">';
180
  foreach ($rss->channel->item as $item)
181
  echo '<strong style="font-family:DPDPlutoSansRegular; color:#dc0032;">'.$item->category.' > '.$item->title.' : </strong> '.$item->description.'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
182
  echo '</div></div></div><br/>';
@@ -237,7 +236,7 @@ class DPDFrance_Export_Block_Export_Orders_Grid extends Mage_Adminhtml_Block_Wid
237
  $this->addColumn('shipping_method', $columnData);
238
 
239
  $columnData = array(
240
- 'header' => Mage::helper('sales')->__('Company').' / '.Mage::helper('export')->__('DPD Pickup point'),
241
  'index' => 'shipping_company',
242
  'width' => '140px',
243
  );
@@ -360,7 +359,7 @@ class DPDFrance_Export_Block_Export_Orders_Grid extends Mage_Adminhtml_Block_Wid
360
  // Menu "exporter les commandes - Assurance intégrée"
361
  $this->getMassactionBlock()->addItem(
362
  'export_order', array(
363
- 'label'=> Mage::helper('export')->__('Export to DPD Station - Integrated insurance'),
364
  'url' => $this->getUrl('*/dpdfrance_export/export'),
365
  )
366
  );
@@ -368,7 +367,7 @@ class DPDFrance_Export_Block_Export_Orders_Grid extends Mage_Adminhtml_Block_Wid
368
  // Menu "exporter les commandes - Assurance Ad Valorem"
369
  $this->getMassactionBlock()->addItem(
370
  'exportav_order', array(
371
- 'label'=> Mage::helper('export')->__('Export to DPD Station - Ad Valorem insurance'),
372
  'url' => $this->getUrl('*/dpdfrance_export/exportav'),
373
  )
374
  );
@@ -376,7 +375,7 @@ class DPDFrance_Export_Block_Export_Orders_Grid extends Mage_Adminhtml_Block_Wid
376
  // Menu "créer les trackings"
377
  $this->getMassactionBlock()->addItem(
378
  'tracking_order', array(
379
- 'label'=> Mage::helper('export')->__('Update sent orders'),
380
  'url' => $this->getUrl('*/dpdfrance_tracking/tracking'),
381
  )
382
  );
1
  <?php
2
  /**
3
+ * DPD France shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
7
+ * @author Smile, Jibé, DPD France S.A.S. <ensavoirplus.ecommerce@dpd.fr>
8
  * @copyright 2015 DPD France S.A.S., société par actions simplifiée, au capital de 18.500.000 euros, dont le siège social est situé 27 Rue du Colonel Pierre Avia - 75015 PARIS, immatriculée au registre du commerce et des sociétés de Paris sous le numéro 444 420 830
9
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10
  */
17
  public function __construct()
18
  {
19
  parent::__construct();
20
+ $this->setId('dpdfrexport_export_order_grid');
21
  $this->setDefaultSort('created_at');
22
  $this->setDefaultDir('DESC');
23
  $this->setSaveParametersInSession(true);
101
  </style>
102
  <script type="text/javascript">
103
  function LoadMyJs() {
104
+ var d = document.getElementById("dpdfrexport_export_order_grid_table").children[2]
105
  if (d)
106
  {
107
  for(var i = 0; i < d.childNodes.length; i++)
132
  if (!empty($rss->channel->item))
133
  {
134
  echo '
 
135
  <script type="text/javascript">
136
  function show_rss(){
137
  document.getElementById("div_rss").style.display="block";
144
  document.getElementById("button_hide").style.display = "none";
145
  }
146
  function setup(){
147
+ $(\'deplacer\').update($(\'deplacer\').innerHTML.times(10));
148
  }
149
+ function MoveNews(){
150
+ new Effect.Move(\'deplacer\', {
151
  x:-40,
152
  y:0,
153
  mode:\'relative\',
154
  transition:Effect.Transitions.linear,
155
+ afterFinish:MoveNews
156
  });
157
  }
158
  Event.observe(window, "load", function(){
159
  setup();
160
+ MoveNews();
161
  });
162
  </script>
163
 
164
  <div id="div_header" style="font-family:DPDPlutoSansLight; width:300px;margin-left: 20px;">
165
  <div id="rss_logo" style="float:left; width:135px; height:24px; margin-top:-7px;">
166
+ <img src="'.Mage::getBaseUrl('media').'dpdfrance/admin/rss_icon.png" width="24" height="24"/><p> '.Mage::helper('dpdfrexport')->__('DPD News').'</p>
167
  </div>
168
  <div id="button_show" style="display:none;">
169
  <a style="float:left;margin-left:0px;text-decoration: none;color: #424143;height: 24px;width: 24px;font-size: 32px;" href="javascript:void(0)" onclick="show_rss()">+</a>
175
  <br/>
176
  ';
177
  echo '
178
+ <div id="div_rss" style="font-family:DPDPlutoSansLight; display:block; background-color: #e6e7e7; color: #424143; border-style: none; margin-left: 20px; margin-right: 20px; margin-top: 10px; padding: 10px;white-space:nowrap;overflow:hidden"><div id="deplacer">';
179
  foreach ($rss->channel->item as $item)
180
  echo '<strong style="font-family:DPDPlutoSansRegular; color:#dc0032;">'.$item->category.' > '.$item->title.' : </strong> '.$item->description.'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
181
  echo '</div></div></div><br/>';
236
  $this->addColumn('shipping_method', $columnData);
237
 
238
  $columnData = array(
239
+ 'header' => Mage::helper('sales')->__('Company').' / '.Mage::helper('dpdfrexport')->__('DPD Pickup point'),
240
  'index' => 'shipping_company',
241
  'width' => '140px',
242
  );
359
  // Menu "exporter les commandes - Assurance intégrée"
360
  $this->getMassactionBlock()->addItem(
361
  'export_order', array(
362
+ 'label'=> Mage::helper('dpdfrexport')->__('Export to DPD Station - Integrated insurance'),
363
  'url' => $this->getUrl('*/dpdfrance_export/export'),
364
  )
365
  );
367
  // Menu "exporter les commandes - Assurance Ad Valorem"
368
  $this->getMassactionBlock()->addItem(
369
  'exportav_order', array(
370
+ 'label'=> Mage::helper('dpdfrexport')->__('Export to DPD Station - Ad Valorem insurance'),
371
  'url' => $this->getUrl('*/dpdfrance_export/exportav'),
372
  )
373
  );
375
  // Menu "créer les trackings"
376
  $this->getMassactionBlock()->addItem(
377
  'tracking_order', array(
378
+ 'label'=> Mage::helper('dpdfrexport')->__('Update sent orders'),
379
  'url' => $this->getUrl('*/dpdfrance_tracking/tracking'),
380
  )
381
  );
app/code/community/DPDFrance/Export/Block/Tracking/Orders.php CHANGED
@@ -1,10 +1,10 @@
1
  <?php
2
  /**
3
- * DPD France v5.1.3 shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
7
- * @author DPD France S.A.S. <ensavoirplus.ecommerce@dpd.fr>
8
  * @copyright 2015 DPD France S.A.S., société par actions simplifiée, au capital de 18.500.000 euros, dont le siège social est situé 27 Rue du Colonel Pierre Avia - 75015 PARIS, immatriculée au registre du commerce et des sociétés de Paris sous le numéro 444 420 830
9
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10
  */
@@ -13,9 +13,9 @@ class DPDFrance_Export_Block_Tracking_Orders extends Mage_Adminhtml_Block_Widget
13
  {
14
  public function __construct()
15
  {
16
- $this->_blockGroup = 'export';
17
  $this->_controller = 'tracking_orders';
18
- $this->_headerText = Mage::helper('export')->__('Suivi des colis DPD France');
19
  parent::__construct();
20
  $this->_removeButton('add');
21
  }
1
  <?php
2
  /**
3
+ * DPD France shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
7
+ * @author Smile, Jibé, DPD France S.A.S. <ensavoirplus.ecommerce@dpd.fr>
8
  * @copyright 2015 DPD France S.A.S., société par actions simplifiée, au capital de 18.500.000 euros, dont le siège social est situé 27 Rue du Colonel Pierre Avia - 75015 PARIS, immatriculée au registre du commerce et des sociétés de Paris sous le numéro 444 420 830
9
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10
  */
13
  {
14
  public function __construct()
15
  {
16
+ $this->_blockGroup = 'dpdfrexport';
17
  $this->_controller = 'tracking_orders';
18
+ $this->_headerText = Mage::helper('dpdfrexport')->__('Suivi des colis DPD France');
19
  parent::__construct();
20
  $this->_removeButton('add');
21
  }
app/code/community/DPDFrance/Export/Block/Tracking/Orders/Grid.php CHANGED
@@ -1,10 +1,10 @@
1
  <?php
2
  /**
3
- * DPD France v5.1.3 shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
7
- * @author DPD France S.A.S. <ensavoirplus.ecommerce@dpd.fr>
8
  * @copyright 2015 DPD France S.A.S., société par actions simplifiée, au capital de 18.500.000 euros, dont le siège social est situé 27 Rue du Colonel Pierre Avia - 75015 PARIS, immatriculée au registre du commerce et des sociétés de Paris sous le numéro 444 420 830
9
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10
  */
@@ -18,7 +18,7 @@ class DPDFrance_Export_Block_Tracking_Orders_Grid extends Mage_Adminhtml_Block_W
18
  public function __construct()
19
  {
20
  parent::__construct();
21
- $this->setId('export_tracking_order_grid');
22
  $this->setDefaultSort('created_at');
23
  $this->setDefaultDir('DESC');
24
  $this->setSaveParametersInSession(true);
@@ -180,7 +180,7 @@ class DPDFrance_Export_Block_Tracking_Orders_Grid extends Mage_Adminhtml_Block_W
180
 
181
  $this->getMassactionBlock()->addItem(
182
  'tracking_order', array(
183
- 'label'=> Mage::helper('export')->__('Generer les trackings'),
184
  'url' => $this->getUrl('*/*/tracking'),
185
  )
186
  );
1
  <?php
2
  /**
3
+ * DPD France shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
7
+ * @author Smile, Jibé, DPD France S.A.S. <ensavoirplus.ecommerce@dpd.fr>
8
  * @copyright 2015 DPD France S.A.S., société par actions simplifiée, au capital de 18.500.000 euros, dont le siège social est situé 27 Rue du Colonel Pierre Avia - 75015 PARIS, immatriculée au registre du commerce et des sociétés de Paris sous le numéro 444 420 830
9
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10
  */
18
  public function __construct()
19
  {
20
  parent::__construct();
21
+ $this->setId('dpdfrexport_tracking_order_grid');
22
  $this->setDefaultSort('created_at');
23
  $this->setDefaultDir('DESC');
24
  $this->setSaveParametersInSession(true);
180
 
181
  $this->getMassactionBlock()->addItem(
182
  'tracking_order', array(
183
+ 'label'=> Mage::helper('dpdfrexport')->__('Generer les trackings'),
184
  'url' => $this->getUrl('*/*/tracking'),
185
  )
186
  );
app/code/community/DPDFrance/Export/Helper/Data.php CHANGED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * DPD France v5.1.3 shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
1
  <?php
2
  /**
3
+ * DPD France shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
app/code/community/DPDFrance/Export/controllers/Adminhtml/DPDFrance/ExportController.php CHANGED
@@ -1,10 +1,10 @@
1
  <?php
2
  /**
3
- * DPD France v5.1.3 shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
7
- * @author DPD France S.A.S. <ensavoirplus.ecommerce@dpd.fr>
8
  * @copyright 2015 DPD France S.A.S., société par actions simplifiée, au capital de 18.500.000 euros, dont le siège social est situé 27 Rue du Colonel Pierre Avia - 75015 PARIS, immatriculée au registre du commerce et des sociétés de Paris sous le numéro 444 420 830
9
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10
  */
@@ -25,8 +25,8 @@ class DPDFrance_Export_Adminhtml_DPDFrance_ExportController extends Mage_Adminht
25
  */
26
  public function indexAction() {
27
  $this->loadLayout()
28
- ->_setActiveMenu('sales/export/export')
29
- ->_addContent($this->getLayout()->createBlock('export/export_orders'))
30
  ->renderLayout();
31
  }
32
 
1
  <?php
2
  /**
3
+ * DPD France shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
7
+ * @author Smile, Jibé, DPD France S.A.S. <ensavoirplus.ecommerce@dpd.fr>
8
  * @copyright 2015 DPD France S.A.S., société par actions simplifiée, au capital de 18.500.000 euros, dont le siège social est situé 27 Rue du Colonel Pierre Avia - 75015 PARIS, immatriculée au registre du commerce et des sociétés de Paris sous le numéro 444 420 830
9
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10
  */
25
  */
26
  public function indexAction() {
27
  $this->loadLayout()
28
+ ->_setActiveMenu('sales/dpdfrexport/export')
29
+ ->_addContent($this->getLayout()->createBlock('dpdfrexport/export_orders'))
30
  ->renderLayout();
31
  }
32
 
app/code/community/DPDFrance/Export/controllers/Adminhtml/DPDFrance/TrackingController.php CHANGED
@@ -1,10 +1,10 @@
1
  <?php
2
  /**
3
- * DPD France v5.1.3 shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
7
- * @author DPD France S.A.S. <ensavoirplus.ecommerce@dpd.fr>
8
  * @copyright 2015 DPD France S.A.S., société par actions simplifiée, au capital de 18.500.000 euros, dont le siège social est situé 27 Rue du Colonel Pierre Avia - 75015 PARIS, immatriculée au registre du commerce et des sociétés de Paris sous le numéro 444 420 830
9
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10
  */
@@ -25,8 +25,8 @@ class DPDFrance_Export_Adminhtml_DPDFrance_TrackingController extends Mage_Admin
25
  */
26
  public function indexAction() {
27
  $this->loadLayout()
28
- ->_setActiveMenu('sales/export/tracking')
29
- ->_addContent($this->getLayout()->createBlock('export/tracking_orders'))
30
  ->renderLayout();
31
  }
32
  #Method to go to previous page
1
  <?php
2
  /**
3
+ * DPD France shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
7
+ * @author Smile, Jibé, DPD France S.A.S. <ensavoirplus.ecommerce@dpd.fr>
8
  * @copyright 2015 DPD France S.A.S., société par actions simplifiée, au capital de 18.500.000 euros, dont le siège social est situé 27 Rue du Colonel Pierre Avia - 75015 PARIS, immatriculée au registre du commerce et des sociétés de Paris sous le numéro 444 420 830
9
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10
  */
25
  */
26
  public function indexAction() {
27
  $this->loadLayout()
28
+ ->_setActiveMenu('sales/dpdfrexport/tracking')
29
+ ->_addContent($this->getLayout()->createBlock('dpdfrexport/tracking_orders'))
30
  ->renderLayout();
31
  }
32
  #Method to go to previous page
app/code/community/DPDFrance/Export/etc/config.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0" encoding="UTF-8"?>
2
  <!--
3
  /**
4
- * DPD France v5.1.3 shipping module for Magento
5
  *
6
  * @category DPDFrance
7
  * @package DPDFrance_Shipping
@@ -13,7 +13,7 @@
13
  <config>
14
  <modules>
15
  <DPDFrance_Export>
16
- <version>5.1.3</version>
17
  <depends>
18
  <Mage_Shipping/>
19
  </depends>
@@ -21,34 +21,34 @@
21
  </modules>
22
  <global>
23
  <blocks>
24
- <export>
25
  <class>DPDFrance_Export_Block</class>
26
- </export>
27
  </blocks>
28
  <helpers>
29
- <export>
30
  <class>DPDFrance_Export_Helper</class>
31
- </export>
32
  </helpers>
33
  <resources>
34
- <export_setup>
35
  <setup>
36
  <module>DPDFrance_Export</module>
37
  </setup>
38
  <connection>
39
  <use>core_setup</use>
40
  </connection>
41
- </export_setup>
42
- <export_write>
43
  <connection>
44
  <use>core_write</use>
45
  </connection>
46
- </export_write>
47
- <export_read>
48
  <connection>
49
  <use>core_read</use>
50
  </connection>
51
- </export_read>
52
  </resources>
53
  </global>
54
  <admin>
@@ -75,11 +75,11 @@
75
  <menu>
76
  <sales>
77
  <children>
78
- <export translate="title">
79
  <title>DPD France</title>
80
  <sort_order>1000</sort_order>
81
  <action>adminhtml/dpdfrance_export</action>
82
- </export>
83
  </children>
84
  </sales>
85
  </menu>
@@ -89,20 +89,20 @@
89
  <children>
90
  <sales>
91
  <children>
92
- <export translate="title">
93
  <title>DPD France</title>
94
  <sort_order>1000</sort_order>
95
  <action>adminhtml/dpdfrance_export</action>
96
- </export>
97
  </children>
98
  </sales>
99
  <system>
100
  <children>
101
  <config>
102
  <children>
103
- <export>
104
  <title>DPD France</title>
105
- </export>
106
  </children>
107
  </config>
108
  </children>
1
  <?xml version="1.0" encoding="UTF-8"?>
2
  <!--
3
  /**
4
+ * DPD France shipping module for Magento
5
  *
6
  * @category DPDFrance
7
  * @package DPDFrance_Shipping
13
  <config>
14
  <modules>
15
  <DPDFrance_Export>
16
+ <version>5.1.4</version>
17
  <depends>
18
  <Mage_Shipping/>
19
  </depends>
21
  </modules>
22
  <global>
23
  <blocks>
24
+ <dpdfrexport>
25
  <class>DPDFrance_Export_Block</class>
26
+ </dpdfrexport>
27
  </blocks>
28
  <helpers>
29
+ <dpdfrexport>
30
  <class>DPDFrance_Export_Helper</class>
31
+ </dpdfrexport>
32
  </helpers>
33
  <resources>
34
+ <dpdfrexport_setup>
35
  <setup>
36
  <module>DPDFrance_Export</module>
37
  </setup>
38
  <connection>
39
  <use>core_setup</use>
40
  </connection>
41
+ </dpdfrexport_setup>
42
+ <dpdfrexport_write>
43
  <connection>
44
  <use>core_write</use>
45
  </connection>
46
+ </dpdfrexport_write>
47
+ <dpdfrexport_read>
48
  <connection>
49
  <use>core_read</use>
50
  </connection>
51
+ </dpdfrexport_read>
52
  </resources>
53
  </global>
54
  <admin>
75
  <menu>
76
  <sales>
77
  <children>
78
+ <dpdfrexport translate="title">
79
  <title>DPD France</title>
80
  <sort_order>1000</sort_order>
81
  <action>adminhtml/dpdfrance_export</action>
82
+ </dpdfrexport>
83
  </children>
84
  </sales>
85
  </menu>
89
  <children>
90
  <sales>
91
  <children>
92
+ <dpdfrexport translate="title">
93
  <title>DPD France</title>
94
  <sort_order>1000</sort_order>
95
  <action>adminhtml/dpdfrance_export</action>
96
+ </dpdfrexport>
97
  </children>
98
  </sales>
99
  <system>
100
  <children>
101
  <config>
102
  <children>
103
+ <dpdfrexport>
104
  <title>DPD France</title>
105
+ </dpdfrexport>
106
  </children>
107
  </config>
108
  </children>
app/code/community/DPDFrance/Predict/Helper/Data.php CHANGED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * DPD France v5.1.3 shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
1
  <?php
2
  /**
3
+ * DPD France shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
app/code/community/DPDFrance/Predict/Model/Carrier/DPDFrancePredictShipping.php CHANGED
@@ -1,11 +1,11 @@
1
  <?php
2
  /**
3
- * DPD France v5.1.3 shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
7
- * @author DPD France S.A.S. <ensavoirplus.ecommerce@dpd.fr>
8
- * @copyright 2015 DPD France S.A.S., société par actions simplifiée, au capital de 18.500.000 euros, dont le siège social est situé 27 Rue du Colonel Pierre Avia - 75015 PARIS, immatriculée au registre du commerce et des sociétés de Paris sous le numéro 444 420 830
9
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10
  */
11
 
1
  <?php
2
  /**
3
+ * DPD France shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
7
+ * @author Antoine Lemoine, DPD France S.A.S. <ensavoirplus.ecommerce@dpd.fr>
8
+ * @copyright Copyright (c) 2008-10 Owebia (http://www.owebia.com/) , 2015 DPD France S.A.S., société par actions simplifiée, au capital de 18.500.000 euros, dont le siège social est situé 27 Rue du Colonel Pierre Avia - 75015 PARIS, immatriculée au registre du commerce et des sociétés de Paris sous le numéro 444 420 830
9
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10
  */
11
 
app/code/community/DPDFrance/Predict/Model/Observer.php CHANGED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * DPD France v5.1.3 shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
@@ -13,9 +13,8 @@ class DPDFrance_Predict_Model_Observer extends Mage_Core_Model_Abstract {
13
 
14
  protected function _construct() {}
15
 
16
-
17
  public function dpdfrpredictgsmAction() {
18
-
19
  $current = Mage::getSingleton('checkout/session')->getQuote(); // Récupération de la session checkout
20
  $modeliv = $current->getShippingAddress()->getShippingMethod(); // Récupération de la methode de livraison choisie par le client
21
 
1
  <?php
2
  /**
3
+ * DPD France shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
13
 
14
  protected function _construct() {}
15
 
 
16
  public function dpdfrpredictgsmAction() {
17
+
18
  $current = Mage::getSingleton('checkout/session')->getQuote(); // Récupération de la session checkout
19
  $modeliv = $current->getShippingAddress()->getShippingMethod(); // Récupération de la methode de livraison choisie par le client
20
 
app/code/community/DPDFrance/Predict/Model/Owebia.php CHANGED
@@ -1,11 +1,11 @@
1
  <?php
2
  /**
3
- * DPD France v5.1.3 shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
7
- * @author DPD France S.A.S. <ensavoirplus.ecommerce@dpd.fr>
8
- * @copyright 2015 DPD France S.A.S., société par actions simplifiée, au capital de 18.500.000 euros, dont le siège social est situé 27 Rue du Colonel Pierre Avia - 75015 PARIS, immatriculée au registre du commerce et des sociétés de Paris sous le numéro 444 420 830
9
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10
  */
11
 
1
  <?php
2
  /**
3
+ * DPD France shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
7
+ * @author Antoine Lemoine, DPD France S.A.S. <ensavoirplus.ecommerce@dpd.fr>
8
+ * @copyright Copyright (c) 2008-10 Owebia (http://www.owebia.com/) , 2015 DPD France S.A.S., société par actions simplifiée, au capital de 18.500.000 euros, dont le siège social est situé 27 Rue du Colonel Pierre Avia - 75015 PARIS, immatriculée au registre du commerce et des sociétés de Paris sous le numéro 444 420 830
9
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10
  */
11
 
app/code/community/DPDFrance/Predict/etc/config.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0" encoding="UTF-8"?>
2
  <!--
3
  /**
4
- * DPD France v5.1.3 shipping module for Magento
5
  *
6
  * @category DPDFrance
7
  * @package DPDFrance_Shipping
1
  <?xml version="1.0" encoding="UTF-8"?>
2
  <!--
3
  /**
4
+ * DPD France shipping module for Magento
5
  *
6
  * @category DPDFrance
7
  * @package DPDFrance_Shipping
app/code/community/DPDFrance/Predict/etc/system.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0" encoding="UTF-8"?>
2
  <!--
3
  /**
4
- * DPD France v5.1.3 shipping module for Magento
5
  *
6
  * @category DPDFrance
7
  * @package DPDFrance_Shipping
1
  <?xml version="1.0" encoding="UTF-8"?>
2
  <!--
3
  /**
4
+ * DPD France shipping module for Magento
5
  *
6
  * @category DPDFrance
7
  * @package DPDFrance_Shipping
app/code/community/DPDFrance/Relais/Helper/Data.php CHANGED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * DPD France v5.1.3 shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
1
  <?php
2
  /**
3
+ * DPD France shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
app/code/community/DPDFrance/Relais/Model/Carrier/DPDFranceRelaisShipping.php CHANGED
@@ -1,11 +1,11 @@
1
  <?php
2
  /**
3
- * DPD France v5.1.3 shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
7
- * @author DPD France S.A.S. <ensavoirplus.ecommerce@dpd.fr>
8
- * @copyright 2015 DPD France S.A.S., société par actions simplifiée, au capital de 18.500.000 euros, dont le siège social est situé 27 Rue du Colonel Pierre Avia - 75015 PARIS, immatriculée au registre du commerce et des sociétés de Paris sous le numéro 444 420 830
9
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10
  */
11
 
1
  <?php
2
  /**
3
+ * DPD France shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
7
+ * @author Antoine Lemoine, DPD France S.A.S. <ensavoirplus.ecommerce@dpd.fr>
8
+ * @copyright Copyright (c) 2008-10 Owebia (http://www.owebia.com/) , 2015 DPD France S.A.S., société par actions simplifiée, au capital de 18.500.000 euros, dont le siège social est situé 27 Rue du Colonel Pierre Avia - 75015 PARIS, immatriculée au registre du commerce et des sociétés de Paris sous le numéro 444 420 830
9
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10
  */
11
 
app/code/community/DPDFrance/Relais/Model/Observer.php CHANGED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * DPD France v5.1.3 shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
1
  <?php
2
  /**
3
+ * DPD France shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
app/code/community/DPDFrance/Relais/Model/Outputs.php CHANGED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * DPD France v5.1.3 shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
1
  <?php
2
  /**
3
+ * DPD France shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
app/code/community/DPDFrance/Relais/Model/Owebia.php CHANGED
@@ -1,11 +1,11 @@
1
  <?php
2
  /**
3
- * DPD France v5.1.3 shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
7
- * @author DPD France S.A.S. <ensavoirplus.ecommerce@dpd.fr>
8
- * @copyright 2015 DPD France S.A.S., société par actions simplifiée, au capital de 18.500.000 euros, dont le siège social est situé 27 Rue du Colonel Pierre Avia - 75015 PARIS, immatriculée au registre du commerce et des sociétés de Paris sous le numéro 444 420 830
9
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10
  */
11
 
1
  <?php
2
  /**
3
+ * DPD France shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
7
+ * @author Antoine Lemoine, DPD France S.A.S. <ensavoirplus.ecommerce@dpd.fr>
8
+ * @copyright Copyright (c) 2008-10 Owebia (http://www.owebia.com/) , 2015 DPD France S.A.S., société par actions simplifiée, au capital de 18.500.000 euros, dont le siège social est situé 27 Rue du Colonel Pierre Avia - 75015 PARIS, immatriculée au registre du commerce et des sociétés de Paris sous le numéro 444 420 830
9
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10
  */
11
 
app/code/community/DPDFrance/Relais/controllers/PickupController.php CHANGED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * DPD France v5.1.3 shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
1
  <?php
2
  /**
3
+ * DPD France shipping module for Magento
4
  *
5
  * @category DPDFrance
6
  * @package DPDFrance_Shipping
app/code/community/DPDFrance/Relais/etc/config.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0" encoding="UTF-8"?>
2
  <!--
3
  /**
4
- * DPD France v5.1.3 shipping module for Magento
5
  *
6
  * @category DPDFrance
7
  * @package DPDFrance_Shipping
1
  <?xml version="1.0" encoding="UTF-8"?>
2
  <!--
3
  /**
4
+ * DPD France shipping module for Magento
5
  *
6
  * @category DPDFrance
7
  * @package DPDFrance_Shipping
app/code/community/DPDFrance/Relais/etc/system.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0" encoding="UTF-8"?>
2
  <!--
3
  /**
4
- * DPD France v5.1.3 shipping module for Magento
5
  *
6
  * @category DPDFrance
7
  * @package DPDFrance_Shipping
1
  <?xml version="1.0" encoding="UTF-8"?>
2
  <!--
3
  /**
4
+ * DPD France shipping module for Magento
5
  *
6
  * @category DPDFrance
7
  * @package DPDFrance_Shipping
app/design/frontend/base/default/template/dpdfrpredict/checkout/onepage/shipping_method/available.phtml CHANGED
@@ -22,7 +22,8 @@
22
  <?php if ($_rate->getErrorMessage()): ?>
23
  <ul class="messages"><li class="error-msg"><ul><li><?php echo $_rate->getErrorMessage() ?></li></ul></li></ul>
24
  <?php else: ?>
25
- <?php // Ajout DPD France - ajout onClick="radioCheck()" sur les boutons radio pour afficher/masquer les div DPD Relais et Predict ?>
 
26
  <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" onClick="radioCheck()" />
27
  <?php // Fin DPD France ?>
28
  <label for="s_method_<?php echo $_rate->getCode() ?>"><?php echo $_rate->getMethodTitle() ?>
22
  <?php if ($_rate->getErrorMessage()): ?>
23
  <ul class="messages"><li class="error-msg"><ul><li><?php echo $_rate->getErrorMessage() ?></li></ul></li></ul>
24
  <?php else: ?>
25
+ <?php // Ajout DPD France - ajout radioCheck au load + onClick="radioCheck()" sur les boutons radio pour afficher/masquer les div DPD Relais et Predict ?>
26
+ <?php echo '<script type="text/javascript">radioCheck();</script>'; ?>
27
  <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" onClick="radioCheck()" />
28
  <?php // Fin DPD France ?>
29
  <label for="s_method_<?php echo $_rate->getCode() ?>"><?php echo $_rate->getMethodTitle() ?>
app/design/frontend/base/default/template/dpdfrrelais/checkout/onepage/shipping_method/available.phtml CHANGED
@@ -20,9 +20,10 @@
20
  <?php $_sole = $_sole && count($_rates) == 1; foreach ($_rates as $_rate): ?>
21
  <li>
22
  <?php if ($_rate->getErrorMessage()): ?>
23
- <ul class="messages"><li class="error-msg"><ul><li><?php echo $_rate->getErrorMessage() ?></li></ul></li></ul>
24
  <?php else: ?>
25
- <?php // Ajout DPD France - ajout onClick="radioCheck()" sur les boutons radio pour afficher/masquer les div DPD Relais et Predict ?>
 
26
  <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" onClick="radioCheck()" />
27
  <?php // Fin DPD France ?>
28
  <label for="s_method_<?php echo $_rate->getCode() ?>"><?php echo $_rate->getMethodTitle() ?>
20
  <?php $_sole = $_sole && count($_rates) == 1; foreach ($_rates as $_rate): ?>
21
  <li>
22
  <?php if ($_rate->getErrorMessage()): ?>
23
+ <ul class="messages"><li class="error-msg"><ul><li><?php echo $_rate->getErrorMessage() ?></li></ul></li></ul>
24
  <?php else: ?>
25
+ <?php // Ajout DPD France - ajout radioCheck au load + onClick="radioCheck()" sur les boutons radio pour afficher/masquer les div DPD Relais et Predict ?>
26
+ <?php echo '<script type="text/javascript">radioCheck();</script>'; ?>
27
  <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" onClick="radioCheck()" />
28
  <?php // Fin DPD France ?>
29
  <label for="s_method_<?php echo $_rate->getCode() ?>"><?php echo $_rate->getMethodTitle() ?>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>DPDFrance_Shipping</name>
4
- <version>5.1.3</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
7
  <channel>community</channel>
@@ -11,9 +11,9 @@
11
  Il est destin&#xE9; aux e-commer&#xE7;ants situ&#xE9;s en France m&#xE9;tropolitaine et d&#xE9;tenteurs d'un contrat de transport chez DPD.</description>
12
  <notes>DPDFrance_Shipping for Magento CE 1.4 - 1.9</notes>
13
  <authors><author><name>DPD France S.A.S.</name><user>DSI</user><email>support.ecommerce@dpd.fr</email></author></authors>
14
- <date>2015-11-03</date>
15
- <time>09:22:43</time>
16
- <contents><target name="magecommunity"><dir name="DPDFrance"><dir name="Classic"><dir name="Helper"><file name="Data.php" hash="793cb4b8c7bed33dfcb9cebc7092e729"/></dir><dir name="Model"><dir name="Carrier"><file name="DPDFranceClassicShipping.php" hash="964f7e7b25ad9dc0e9ada01368af5c49"/></dir><file name="Owebia.php" hash="759e84ec91ef738a50062c399c3960a9"/></dir><dir name="etc"><file name="config.xml" hash="4781b29bd19f55eb5659d559495f2f73"/><file name="system.xml" hash="90b130b04b1706074e1821a417e4fb42"/></dir></dir><dir name="Export"><dir name="Block"><dir name="Export"><dir name="Orders"><file name="Grid.php" hash="d4888e6b3bbc2ea3825a88f03bb72c90"/></dir><file name="Orders.php" hash="4aeee59038a8ad549a0d59913334ef3b"/></dir><dir name="Tracking"><dir name="Orders"><file name="Grid.php" hash="f20e6b619c0850b5b143121bf6f96ca0"/></dir><file name="Orders.php" hash="627d1dae1d1f65d08a3f685668acd2e2"/></dir></dir><dir name="Helper"><file name="Data.php" hash="b8613da90cda73438519803a70ab0d1b"/></dir><dir name="controllers"><dir name="Adminhtml"><dir name="DPDFrance"><file name="ExportController.php" hash="178d446fd0b581ce5ab41e0f0f4086cc"/><file name="TrackingController.php" hash="5075a9bb4ff2b35ed4c3dc3215ac2298"/></dir></dir></dir><dir name="etc"><file name="config.xml" hash="91f049e08b8c9e6108114cf77f30b332"/></dir></dir><dir name="Predict"><dir name="Helper"><file name="Data.php" hash="23b7a45641d4faefc23b16f230b977a3"/></dir><dir name="Model"><dir name="Carrier"><file name="DPDFrancePredictShipping.php" hash="f779f92dd56f01c6a25987cf2f8fe97b"/></dir><file name="Observer.php" hash="2d181c8b9e3cc453e9fa85e223e25582"/><file name="Owebia.php" hash="341fd3b3041aaca44b97eef89d3e18b0"/></dir><dir name="etc"><file name="config.xml" hash="a7cda6e1f139580dc877b6cd90fcb49c"/><file name="system.xml" hash="9838f1dd8481b50b149b8f958c91ffc9"/></dir></dir><dir name="Relais"><dir name="Helper"><file name="Data.php" hash="bc8e5bc884ff58df1b51ac436c0e7a8e"/></dir><dir name="Model"><dir name="Carrier"><file name="DPDFranceRelaisShipping.php" hash="ac61f12b604438cfc042b9efb22d7f6f"/></dir><file name="Observer.php" hash="a4f895971ee4bc71aaa59f8d8adc496a"/><file name="Outputs.php" hash="1d085483284c532606e57b5e39ee037f"/><file name="Owebia.php" hash="4ac05fb78f7148071c2941635b9f1ab3"/></dir><dir name="controllers"><file name="PickupController.php" hash="42fe68628aa503514a078ba8b29c5359"/></dir><dir name="etc"><file name="config.xml" hash="c5b94cd4e507be48c648b04cfe9644b1"/><file name="system.xml" hash="64aeaccc28e94e95f9d87bc6afa0bf61"/></dir></dir></dir></target><target name="magemedia"><dir name="dpdfrance"><dir name="admin"><file name="logo.png" hash="e7b47272859a42f42d41339f6a2cd346"/><file name="rss_icon.png" hash="5df63e9d18e8af642108289ae2f1749b"/><file name="service_dom.png" hash="658f00232b8bcae034954b19c8681e6c"/><file name="service_predict.png" hash="31c279f0025ccd80ad427706a1614d0e"/><file name="service_relais.png" hash="93ea3df8e255fce572fe38ea114a6ce0"/><file name="service_world.png" hash="6b0a33dec808c936c4340a742f325796"/></dir><dir name="fonts"><file name="PlutoSansDPDExtraLight-Web.ttf" hash="133a30691494add15177142cd9fa9d28"/><file name="PlutoSansDPDLight-Web.ttf" hash="3b7b428b357ae09836153e4814352af1"/><file name="PlutoSansDPDRegular-Web.ttf" hash="7638f688c25d2268a6f5b2e70b949bbf"/><file name="PlutoSansDPDThin-Web.ttf" hash="2291598279cff8ed31fdc6af39dba22a"/></dir><dir name="front"><dir name="predict"><file name="carrier_logo.jpg" hash="2f65b000e843aca95fd1de9ee2ab06fe"/><file name="carrier_logo_alt.jpg" hash="692de3c50f19ca126f0d3f5dd469fa3e"/><file name="dpd_logo.png" hash="3a03db004b6105d9c499d5d9c64ab5d0"/><file name="dpd_predict_logo.png" hash="b562a9641ca4e90c31d263f41c3f637b"/><file name="predict_receive.jpg" hash="cbc5309345d1196f88d657d68ac7f908"/></dir><dir name="relais"><file name="DPD_Logo.png" hash="747d0dbdbc6df6afabf9698a389557d5"/><file name="carrier_logo.jpg" hash="2f98ce3752c2d7a055a7c19e43b0abf5"/><file name="carrier_logo_alt.jpg" hash="118958c4e3e0be20548c05a068fe3e7b"/><file name="horaires.png" hash="0ce51016d04a27600113e3762107fc15"/><file name="info.png" hash="e42e3b90b5611aaf3c170b569add2d93"/><file name="loader.gif" hash="6c322059292b30838a50f15a939a0200"/><file name="logo-max-png.png" hash="b80e78588624115fe3d8067107da8866"/><file name="pointrelais.png" hash="3ece61e5e6505b941fb318280b4040ce"/><file name="warning.png" hash="e1055c336abc2e5d76805c380f2b0134"/></dir></dir><file name="readme_dpdfrance_magento.pdf" hash="64195149fdec687f5bd3e5b7e9385228"/></dir></target><target name="mageetc"><dir name="modules"><file name="DPDFrance_Classic.xml" hash="a028196822d67576427c45f463311ac4"/><file name="DPDFrance_Export.xml" hash="ee030b0a83049695ddb6ec19db36e304"/><file name="DPDFrance_Predict.xml" hash="3f816b679509f1d67d707c60c7f99cb5"/><file name="DPDFrance_Relais.xml" hash="1411953b5c7abf08e231c02b35b5def4"/></dir></target><target name="magelocale"><dir><dir name="en_US"><file name="DPDFrance_Classic.csv" hash="c01554087d5bafd2af36faf4101d682b"/><file name="DPDFrance_Export.csv" hash="cdc0421a6d7d1510272241249f229607"/><file name="DPDFrance_Predict.csv" hash="9bf03682e6614c490f2924dd76fbc5cb"/><file name="DPDFrance_Relais.csv" hash="827b1971092f0d31fb599c41544c87ce"/></dir><dir name="fr_FR"><file name="DPDFrance_Classic.csv" hash="261b0c9ef9d958665f690617021f51c3"/><file name="DPDFrance_Export.csv" hash="f483d063866b3729b992f7433af1a5db"/><file name="DPDFrance_Predict.csv" hash="3a46cff3925afcee31125cd1c7c3f443"/><file name="DPDFrance_Relais.csv" hash="dca527e399bc74ab91389aac0101a667"/></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="dpdfrpredict.xml" hash="8c2ce1fdce416541f35754135eaa3621"/><file name="dpdfrrelais.xml" hash="48e838a95949fa6c19222e6a9693e117"/></dir><dir name="template"><dir name="dpdfrpredict"><dir name="checkout"><dir name="onepage"><dir name="progress"><file name="shipping.phtml" hash="e4fbbb7bceb6e377d7c6e31c15b6b85b"/><file name="shipping_method.phtml" hash="0d1786ba186d312c2105f5cc19562446"/></dir><dir name="shipping_method"><file name="available.phtml" hash="1bfa05b6cd7e36b1ca2e524183369664"/></dir><file name="shipping_method.phtml" hash="26a34b69737f3bc0f9638597b5073b8c"/></dir></dir></dir><dir name="dpdfrrelais"><dir name="checkout"><dir name="onepage"><dir name="progress"><file name="shipping.phtml" hash="e4fbbb7bceb6e377d7c6e31c15b6b85b"/><file name="shipping_method.phtml" hash="0d1786ba186d312c2105f5cc19562446"/></dir><dir name="shipping_method"><file name="available.phtml" hash="2da6fb049985450e4cf2717c528384c1"/></dir><file name="shipping_method.phtml" hash="56d641fc2fe201c7754b050811d5f7de"/></dir></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="dpdfrance"><file name="dpdfrpredict.css" hash="b3f075a9f40c73144558fb01e45f5a76"/><file name="dpdfrrelais.css" hash="a3f0e24a3efd713ad8581c790031de5f"/></dir></dir><dir name="js"><dir name="dpdfrance"><file name="dpdfrpredict.js" hash="f645f0ccc6160fd3a5d3a69438f81f18"/><file name="dpdfrrelais.js" hash="ff829bea008b957e5e651ce2b52d771d"/></dir></dir></dir></dir></dir></target></contents>
17
  <compatible/>
18
  <dependencies><required><php><min>5.0.0</min><max>6.0.0</max></php><extension><name>soap</name><min>1.0</min><max></max></extension></required></dependencies>
19
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>DPDFrance_Shipping</name>
4
+ <version>5.1.4</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
7
  <channel>community</channel>
11
  Il est destin&#xE9; aux e-commer&#xE7;ants situ&#xE9;s en France m&#xE9;tropolitaine et d&#xE9;tenteurs d'un contrat de transport chez DPD.</description>
12
  <notes>DPDFrance_Shipping for Magento CE 1.4 - 1.9</notes>
13
  <authors><author><name>DPD France S.A.S.</name><user>DSI</user><email>support.ecommerce@dpd.fr</email></author></authors>
14
+ <date>2015-11-24</date>
15
+ <time>08:40:05</time>
16
+ <contents><target name="magecommunity"><dir name="DPDFrance"><dir name="Classic"><dir name="Helper"><file name="Data.php" hash="9bf657310ece70b07d90a2306620b1b0"/></dir><dir name="Model"><dir name="Carrier"><file name="DPDFranceClassicShipping.php" hash="d8a80e291759650b84351fab1cf94765"/></dir><file name="Owebia.php" hash="b9b433a1f2092275689494150726023e"/></dir><dir name="etc"><file name="config.xml" hash="46117cb03b4f8598849e20ad0ab9f24b"/><file name="system.xml" hash="12a23934719c4a503e6072dcb145cd83"/></dir></dir><dir name="Export"><dir name="Block"><dir name="Export"><dir name="Orders"><file name="Grid.php" hash="f9ecf2a79c89c4547d138eaa9529eb01"/></dir><file name="Orders.php" hash="7b9ed7747100c6c50d6c66b9f6b0988d"/></dir><dir name="Tracking"><dir name="Orders"><file name="Grid.php" hash="ea40824db1476cbc56997494c214bd8b"/></dir><file name="Orders.php" hash="39cc00e9cc1b76484e5d78d636b2fa9f"/></dir></dir><dir name="Helper"><file name="Data.php" hash="dc211c124b9534705dd68cabe35be264"/></dir><dir name="controllers"><dir name="Adminhtml"><dir name="DPDFrance"><file name="ExportController.php" hash="14bfae70bce68cb4f330f68c988ad17c"/><file name="TrackingController.php" hash="39eef2e0c2b74a89b3ef6a4821b61dc3"/></dir></dir></dir><dir name="etc"><file name="config.xml" hash="fbb675569223dde64157e842548ebf71"/></dir></dir><dir name="Predict"><dir name="Helper"><file name="Data.php" hash="058137e6b41963649dbcd64fbf01d678"/></dir><dir name="Model"><dir name="Carrier"><file name="DPDFrancePredictShipping.php" hash="12d64c801f96597115d902b2cdbd8f09"/></dir><file name="Observer.php" hash="d74d895c747c060e87fe97be0dc2e33c"/><file name="Owebia.php" hash="3952f112fde1d45ee728173daba87197"/></dir><dir name="etc"><file name="config.xml" hash="0aed6f7e3b45376ab82591c63fbfe7b9"/><file name="system.xml" hash="ac7830a1a43a41e6661d5e49ad432120"/></dir></dir><dir name="Relais"><dir name="Helper"><file name="Data.php" hash="4da6bc63ced4c3e70455b44208f3e3eb"/></dir><dir name="Model"><dir name="Carrier"><file name="DPDFranceRelaisShipping.php" hash="946dbffb190003a0f4b34bf892892c4d"/></dir><file name="Observer.php" hash="81074eeb1cb77edee510650b40f38b3c"/><file name="Outputs.php" hash="9894607e8e1096e0cc3b685d4a0053f0"/><file name="Owebia.php" hash="52c141e1f7942d304ca98aaab1b9981c"/></dir><dir name="controllers"><file name="PickupController.php" hash="4f9d06d0d2ebe424a0bf458ccc2b9366"/></dir><dir name="etc"><file name="config.xml" hash="4817b89248f0e71cc4683ea078307cbc"/><file name="system.xml" hash="d6e7303c4bf82df6c9d8f3f2e5ffa158"/></dir></dir></dir></target><target name="magemedia"><dir name="dpdfrance"><dir name="admin"><file name="logo.png" hash="e7b47272859a42f42d41339f6a2cd346"/><file name="rss_icon.png" hash="5df63e9d18e8af642108289ae2f1749b"/><file name="service_dom.png" hash="658f00232b8bcae034954b19c8681e6c"/><file name="service_predict.png" hash="31c279f0025ccd80ad427706a1614d0e"/><file name="service_relais.png" hash="93ea3df8e255fce572fe38ea114a6ce0"/><file name="service_world.png" hash="6b0a33dec808c936c4340a742f325796"/></dir><dir name="fonts"><file name="PlutoSansDPDExtraLight-Web.ttf" hash="133a30691494add15177142cd9fa9d28"/><file name="PlutoSansDPDLight-Web.ttf" hash="3b7b428b357ae09836153e4814352af1"/><file name="PlutoSansDPDRegular-Web.ttf" hash="7638f688c25d2268a6f5b2e70b949bbf"/><file name="PlutoSansDPDThin-Web.ttf" hash="2291598279cff8ed31fdc6af39dba22a"/></dir><dir name="front"><dir name="predict"><file name="carrier_logo.jpg" hash="2f65b000e843aca95fd1de9ee2ab06fe"/><file name="carrier_logo_alt.jpg" hash="692de3c50f19ca126f0d3f5dd469fa3e"/><file name="dpd_logo.png" hash="3a03db004b6105d9c499d5d9c64ab5d0"/><file name="dpd_predict_logo.png" hash="b562a9641ca4e90c31d263f41c3f637b"/><file name="predict_receive.jpg" hash="cbc5309345d1196f88d657d68ac7f908"/></dir><dir name="relais"><file name="DPD_Logo.png" hash="747d0dbdbc6df6afabf9698a389557d5"/><file name="carrier_logo.jpg" hash="2f98ce3752c2d7a055a7c19e43b0abf5"/><file name="carrier_logo_alt.jpg" hash="118958c4e3e0be20548c05a068fe3e7b"/><file name="horaires.png" hash="0ce51016d04a27600113e3762107fc15"/><file name="info.png" hash="e42e3b90b5611aaf3c170b569add2d93"/><file name="loader.gif" hash="6c322059292b30838a50f15a939a0200"/><file name="logo-max-png.png" hash="b80e78588624115fe3d8067107da8866"/><file name="pointrelais.png" hash="3ece61e5e6505b941fb318280b4040ce"/><file name="warning.png" hash="e1055c336abc2e5d76805c380f2b0134"/></dir></dir><file name="readme_dpdfrance_magento.pdf" hash="64195149fdec687f5bd3e5b7e9385228"/></dir></target><target name="mageetc"><dir name="modules"><file name="DPDFrance_Classic.xml" hash="a028196822d67576427c45f463311ac4"/><file name="DPDFrance_Export.xml" hash="ee030b0a83049695ddb6ec19db36e304"/><file name="DPDFrance_Predict.xml" hash="3f816b679509f1d67d707c60c7f99cb5"/><file name="DPDFrance_Relais.xml" hash="1411953b5c7abf08e231c02b35b5def4"/></dir></target><target name="magelocale"><dir><dir name="en_US"><file name="DPDFrance_Classic.csv" hash="c01554087d5bafd2af36faf4101d682b"/><file name="DPDFrance_Export.csv" hash="cdc0421a6d7d1510272241249f229607"/><file name="DPDFrance_Predict.csv" hash="9bf03682e6614c490f2924dd76fbc5cb"/><file name="DPDFrance_Relais.csv" hash="827b1971092f0d31fb599c41544c87ce"/></dir><dir name="fr_FR"><file name="DPDFrance_Classic.csv" hash="261b0c9ef9d958665f690617021f51c3"/><file name="DPDFrance_Export.csv" hash="f483d063866b3729b992f7433af1a5db"/><file name="DPDFrance_Predict.csv" hash="3a46cff3925afcee31125cd1c7c3f443"/><file name="DPDFrance_Relais.csv" hash="dca527e399bc74ab91389aac0101a667"/></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="dpdfrpredict.xml" hash="8c2ce1fdce416541f35754135eaa3621"/><file name="dpdfrrelais.xml" hash="48e838a95949fa6c19222e6a9693e117"/></dir><dir name="template"><dir name="dpdfrpredict"><dir name="checkout"><dir name="onepage"><dir name="progress"><file name="shipping.phtml" hash="e4fbbb7bceb6e377d7c6e31c15b6b85b"/><file name="shipping_method.phtml" hash="0d1786ba186d312c2105f5cc19562446"/></dir><dir name="shipping_method"><file name="available.phtml" hash="14eac353a43a417eed373c19db4a4fea"/></dir><file name="shipping_method.phtml" hash="26a34b69737f3bc0f9638597b5073b8c"/></dir></dir></dir><dir name="dpdfrrelais"><dir name="checkout"><dir name="onepage"><dir name="progress"><file name="shipping.phtml" hash="e4fbbb7bceb6e377d7c6e31c15b6b85b"/><file name="shipping_method.phtml" hash="0d1786ba186d312c2105f5cc19562446"/></dir><dir name="shipping_method"><file name="available.phtml" hash="2015b1083b3d69bd5cff1535acb508e1"/></dir><file name="shipping_method.phtml" hash="56d641fc2fe201c7754b050811d5f7de"/></dir></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="dpdfrance"><file name="dpdfrpredict.css" hash="88e41f3988feb8b98c5314df68c9af9c"/><file name="dpdfrrelais.css" hash="9739e7ce7dfede841d997df08a357c83"/></dir></dir><dir name="js"><dir name="dpdfrance"><file name="dpdfrpredict.js" hash="bab6329ba5d4487e14d823a212657882"/><file name="dpdfrrelais.js" hash="8f1540702f9d4e3bea74ca27017ebdef"/></dir></dir></dir></dir></dir></target></contents>
17
  <compatible/>
18
  <dependencies><required><php><min>5.0.0</min><max>6.0.0</max></php><extension><name>soap</name><min>1.0</min><max></max></extension></required></dependencies>
19
  </package>
skin/frontend/base/default/css/dpdfrance/dpdfrpredict.css CHANGED
@@ -1,5 +1,5 @@
1
  /**
2
- * DPD France v5.1.2 shipping module for Magento
3
  *
4
  * @category DPDFrance
5
  * @package DPDFrance_Shipping
1
  /**
2
+ * DPD France shipping module for Magento
3
  *
4
  * @category DPDFrance
5
  * @package DPDFrance_Shipping
skin/frontend/base/default/css/dpdfrance/dpdfrrelais.css CHANGED
@@ -1,5 +1,5 @@
1
  /**
2
- * DPD France v5.1.2 shipping module for Magento
3
  *
4
  * @category DPDFrance
5
  * @package DPDFrance_Shipping
1
  /**
2
+ * DPD France shipping module for Magento
3
  *
4
  * @category DPDFrance
5
  * @package DPDFrance_Shipping
skin/frontend/base/default/js/dpdfrance/dpdfrpredict.js CHANGED
@@ -1,5 +1,5 @@
1
  /**
2
- * DPD France v5.1.2 shipping module for Magento
3
  *
4
  * @category DPDFrance
5
  * @package DPDFrance_Shipping
1
  /**
2
+ * DPD France shipping module for Magento
3
  *
4
  * @category DPDFrance
5
  * @package DPDFrance_Shipping
skin/frontend/base/default/js/dpdfrance/dpdfrrelais.js CHANGED
@@ -1,5 +1,5 @@
1
  /**
2
- * DPD France v5.1.2 shipping module for Magento
3
  *
4
  * @category DPDFrance
5
  * @package DPDFrance_Shipping
1
  /**
2
+ * DPD France shipping module for Magento
3
  *
4
  * @category DPDFrance
5
  * @package DPDFrance_Shipping