ColiPoste_La_Poste_Expeditor_Inet_So_Colissimo - Version 1.0.2

Version Notes

Ajout du champ code réseau point de retrait

Download this release

Release Info

Developer Berlioz
Extension ColiPoste_La_Poste_Expeditor_Inet_So_Colissimo
Version 1.0.2
Comparing to
See all releases


Code changes from version 1.0.1 to 1.0.2

Files changed (2) hide show
  1. app/code/community/LaPoste/ExpeditorINet/Block/Export/Orders/Grid.php +9 -6
  2. package.xml +11 -7
app/code/community/LaPoste/ExpeditorINet/Block/Export/Orders/Grid.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /**
3
  * LaPoste_ExpeditorINet
4
- *
5
  * @category LaPoste
6
  * @package LaPoste_ExpeditorINet
7
  * @copyright Copyright (c) 2010 La Poste
@@ -31,7 +31,7 @@ class LaPoste_ExpeditorINet_Block_Export_Orders_Grid extends Mage_Adminhtml_Bloc
31
  {
32
  if (version_compare(Mage::getVersion(), '1.4', '>=')) {
33
  $collection = Mage::getResourceModel('sales/order_grid_collection')
34
- ->join('order', 'main_table.entity_id = order.entity_id', array('shipping_method'));
35
 
36
  } else {
37
  $collection = Mage::getResourceModel('sales/order_collection')
@@ -75,15 +75,18 @@ class LaPoste_ExpeditorINet_Block_Export_Orders_Grid extends Mage_Adminhtml_Bloc
75
  $this->addColumn('real_order_id', $columnData);
76
 
77
  if (!Mage::app()->isSingleStoreMode()) {
78
- $this->addColumn(
79
- 'store_id', array(
80
  'header' => Mage::helper('sales')->__('Purchased from (store)'),
81
  'index' => 'store_id',
82
  'type' => 'store',
83
  'store_view'=> true,
84
  'display_deleted' => true,
85
- )
86
  );
 
 
 
 
 
87
  }
88
 
89
  $columnData = array(
@@ -189,7 +192,7 @@ class LaPoste_ExpeditorINet_Block_Export_Orders_Grid extends Mage_Adminhtml_Bloc
189
  }
190
 
191
  /**
192
- * Get url called when user click on a grid row
193
  * @return string|boolean
194
  */
195
  public function getRowUrl($row)
1
  <?php
2
  /**
3
  * LaPoste_ExpeditorINet
4
+ *
5
  * @category LaPoste
6
  * @package LaPoste_ExpeditorINet
7
  * @copyright Copyright (c) 2010 La Poste
31
  {
32
  if (version_compare(Mage::getVersion(), '1.4', '>=')) {
33
  $collection = Mage::getResourceModel('sales/order_grid_collection')
34
+ ->join('order', 'main_table.entity_id = order.entity_id', array('shipping_method'));
35
 
36
  } else {
37
  $collection = Mage::getResourceModel('sales/order_collection')
75
  $this->addColumn('real_order_id', $columnData);
76
 
77
  if (!Mage::app()->isSingleStoreMode()) {
78
+ $columnData = array(
 
79
  'header' => Mage::helper('sales')->__('Purchased from (store)'),
80
  'index' => 'store_id',
81
  'type' => 'store',
82
  'store_view'=> true,
83
  'display_deleted' => true,
 
84
  );
85
+ if (version_compare(Mage::getVersion(), '1.4', '>=')) {
86
+ $columnData['filter_index'] = 'main_table.'.$columnData['index'];
87
+ }
88
+
89
+ $this->addColumn('store_id', $columnData);
90
  }
91
 
92
  $columnData = array(
192
  }
193
 
194
  /**
195
+ * Get url called when user click on a grid row
196
  * @return string|boolean
197
  */
198
  public function getRowUrl($row)
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>ColiPoste_La_Poste_Expeditor_Inet_So_Colissimo</name>
4
- <version>1.0.1</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>
@@ -11,13 +11,17 @@
11
  &#xD;
12
  Ce module est compatible avec les commandes utilisant le mode de livraison So Colissimo.&#xD;
13
  &#xD;
14
- Test&amp;eacute; et valid&amp;eacute; sur Magento CE 1.3.2.4, 1.4.1.1, PE 1.8, EE 1.8 et EE 1.9.&#xD;
15
- R&amp;eacute;alisation par Smile sur la base du module cr&#xE9;&#xE9; par Jib&#xE9;.</description>
16
- <notes>Compatible 1.5</notes>
 
 
 
 
17
  <authors><author><name>Berlioz</name><user>Aline</user><email>Aline.BERLIOZ@laposte.fr</email></author></authors>
18
- <date>2011-05-05</date>
19
- <time>14:22:58</time>
20
- <contents><target name="magedesign"><dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="expeditorinet"><dir name="import"><file name="form.phtml" hash="1413b5588abae748f040c73e655f3932"/></dir></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir><dir name="fr_FR"><file name="LaPoste_ExpeditorINet.csv" hash="b59e1a3a7f65747aea2386606e7a89e8"/></dir></dir></target><target name="magecommunity"><dir><dir name="LaPoste"><dir name="ExpeditorINet"><dir name="Block"><dir name="Export"><dir name="Orders"><file name="Grid.php" hash="790cd1c34966bfeb863f73784dabc005"/></dir><file name="Orders.php" hash="9b53cb8c1bb73ca5c3091fbf1f3c070b"/></dir><dir name="Import"><file name="Form.php" hash="8efe032ad2523ce95d00fd2436528002"/></dir></dir><dir name="Helper"><file name="Data.php" hash="d3d3efa2b60302d4eb719c60cb6cb39b"/></dir><dir name="Model"><dir name="Config"><dir name="Source"><file name="EndOfLineCharacter.php" hash="6cf85adc9a0e733d0ebd6e46c35b436d"/><file name="FieldDelimiter.php" hash="7c5702eff84345a5aeb1691033031602"/><file name="FieldSeparator.php" hash="1f7b189cd8e390044ff044a12abe2484"/><file name="FileCharset.php" hash="2a562111c2c7d9e8e3f8ad7094bcff8c"/><file name="FileExtension.php" hash="1702d1540a90608f52c0421476b3cc2c"/></dir></dir></dir><dir name="controllers"><file name="ExportController.php" hash="514c1f165effe2954e9538da23e381f1"/><file name="ImportController.php" hash="c2e94c15c78dcb7ea07eee005cdd2927"/></dir><dir name="etc"><file name="config.xml" hash="20f1935333b25648b7b9c6d7799a804a"/><file name="system.xml" hash="a1465132f56c4a574887fc776cbd7342"/></dir></dir></dir></dir></target><target name="mageetc"><dir><dir name="modules"><file name="LaPoste_ExpeditorINet.xml" hash="2a7c93ada6b605d49fb6c047d0feb72e"/></dir></dir></target></contents>
21
  <compatible/>
22
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
23
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>ColiPoste_La_Poste_Expeditor_Inet_So_Colissimo</name>
4
+ <version>1.0.2</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
11
  &#xD;
12
  Ce module est compatible avec les commandes utilisant le mode de livraison So Colissimo.&#xD;
13
  &#xD;
14
+ Test&#xE9; et valid&#xE9; sur Magento :&#xD;
15
+ - Community : 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9&#xD;
16
+ - Professional : 1.8&#xD;
17
+ - Enterprise : 1.8, 1.9, 1.10, 1.11, 1.12, 1.13, 1.14&#xD;
18
+ &#xD;
19
+ R&#xE9;alis&#xE9; par Smile sur la base du module cr&#xE9;&#xE9; par Jib&#xE9;.</description>
20
+ <notes>Ajout du champ code r&#xE9;seau point de retrait</notes>
21
  <authors><author><name>Berlioz</name><user>Aline</user><email>Aline.BERLIOZ@laposte.fr</email></author></authors>
22
+ <date>2014-06-19</date>
23
+ <time>15:05:27</time>
24
+ <contents><target name="magedesign"><dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="expeditorinet"><dir name="import"><file name="form.phtml" hash="1413b5588abae748f040c73e655f3932"/></dir></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir><dir name="fr_FR"><file name="LaPoste_ExpeditorINet.csv" hash="b59e1a3a7f65747aea2386606e7a89e8"/></dir></dir></target><target name="magecommunity"><dir><dir name="LaPoste"><dir name="ExpeditorINet"><dir name="Block"><dir name="Export"><dir name="Orders"><file name="Grid.php" hash="f1f401650b4beebf8b378dfdc92f7b78"/></dir><file name="Orders.php" hash="9b53cb8c1bb73ca5c3091fbf1f3c070b"/></dir><dir name="Import"><file name="Form.php" hash="8efe032ad2523ce95d00fd2436528002"/></dir></dir><dir name="Helper"><file name="Data.php" hash="d3d3efa2b60302d4eb719c60cb6cb39b"/></dir><dir name="Model"><dir name="Config"><dir name="Source"><file name="EndOfLineCharacter.php" hash="6cf85adc9a0e733d0ebd6e46c35b436d"/><file name="FieldDelimiter.php" hash="7c5702eff84345a5aeb1691033031602"/><file name="FieldSeparator.php" hash="1f7b189cd8e390044ff044a12abe2484"/><file name="FileCharset.php" hash="2a562111c2c7d9e8e3f8ad7094bcff8c"/><file name="FileExtension.php" hash="1702d1540a90608f52c0421476b3cc2c"/></dir></dir></dir><dir name="controllers"><file name="ExportController.php" hash="514c1f165effe2954e9538da23e381f1"/><file name="ImportController.php" hash="c2e94c15c78dcb7ea07eee005cdd2927"/></dir><dir name="etc"><file name="config.xml" hash="20f1935333b25648b7b9c6d7799a804a"/><file name="system.xml" hash="a1465132f56c4a574887fc776cbd7342"/></dir></dir></dir></dir></target><target name="mageetc"><dir><dir name="modules"><file name="LaPoste_ExpeditorINet.xml" hash="2a7c93ada6b605d49fb6c047d0feb72e"/></dir></dir></target></contents>
25
  <compatible/>
26
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
27
  </package>