ColiPoste_La_Poste_Expeditor_Inet_So_Colissimo - Version 1.0.5

Version Notes

Compatibilité avec certains modules communautaires modifiant le contenu de la table sales_flat_order_grid

Download this release

Release Info

Developer Berlioz
Extension ColiPoste_La_Poste_Expeditor_Inet_So_Colissimo
Version 1.0.5
Comparing to
See all releases


Code changes from version 1.0.4 to 1.0.5

Files changed (3) hide show
  1. app/code/community/LaPoste/ExpeditorINet/Block/Export/Orders/Grid.php +21 -7
  2. app/code/community/LaPoste/ExpeditorINet/etc/config.xml +1 -1
  3. package.xml +5 -5
app/code/community/LaPoste/ExpeditorINet/Block/Export/Orders/Grid.php CHANGED
@@ -33,7 +33,11 @@ class LaPoste_ExpeditorINet_Block_Export_Orders_Grid extends Mage_Adminhtml_Bloc
33
  {
34
  if (version_compare(Mage::getVersion(), '1.4', '>=')) {
35
  $collection = Mage::getResourceModel('sales/order_grid_collection')
36
- ->join('order', 'main_table.entity_id = order.entity_id', array('shipping_method'));
 
 
 
 
37
  } else {
38
  $collection = Mage::getResourceModel('sales/order_collection')
39
  ->addAttributeToSelect(array('status', 'shipping_method'))
@@ -125,12 +129,22 @@ class LaPoste_ExpeditorINet_Block_Export_Orders_Grid extends Mage_Adminhtml_Bloc
125
  }
126
  $this->addColumn('base_grand_total', $columnData);
127
 
128
- $this->addColumn(
129
- 'carrier', array(
130
- 'header' => Mage::helper('sales')->__('Carrier'),
131
- 'index' => 'shipping_method',
132
- )
133
- );
 
 
 
 
 
 
 
 
 
 
134
 
135
  $columnData = array(
136
  'header' => Mage::helper('sales')->__('Status'),
33
  {
34
  if (version_compare(Mage::getVersion(), '1.4', '>=')) {
35
  $collection = Mage::getResourceModel('sales/order_grid_collection')
36
+ ->join(
37
+ array('orders' => 'order'),
38
+ 'main_table.entity_id = orders.entity_id',
39
+ array('carrier_code' => 'shipping_method')
40
+ );
41
  } else {
42
  $collection = Mage::getResourceModel('sales/order_collection')
43
  ->addAttributeToSelect(array('status', 'shipping_method'))
129
  }
130
  $this->addColumn('base_grand_total', $columnData);
131
 
132
+ if (version_compare(Mage::getVersion(), '1.4', '>=')) {
133
+ $this->addColumn(
134
+ 'carrier', array(
135
+ 'header' => Mage::helper('sales')->__('Carrier'),
136
+ 'index' => 'carrier_code',
137
+ 'filter_index' => 'orders.shipping_method',
138
+ )
139
+ );
140
+ } else {
141
+ $this->addColumn(
142
+ 'carrier', array(
143
+ 'header' => Mage::helper('sales')->__('Carrier'),
144
+ 'index' => 'shipping_method',
145
+ )
146
+ );
147
+ }
148
 
149
  $columnData = array(
150
  'header' => Mage::helper('sales')->__('Status'),
app/code/community/LaPoste/ExpeditorINet/etc/config.xml CHANGED
@@ -13,7 +13,7 @@
13
  <config>
14
  <modules>
15
  <LaPoste_ExpeditorINet>
16
- <version>1.0.4</version>
17
  <depends>
18
  <Mage_Sales />
19
  <Mage_Adminhtml />
13
  <config>
14
  <modules>
15
  <LaPoste_ExpeditorINet>
16
+ <version>1.0.5</version>
17
  <depends>
18
  <Mage_Sales />
19
  <Mage_Adminhtml />
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.4</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>
@@ -17,11 +17,11 @@ Test&#xE9; et valid&#xE9; sur Magento :&#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 de la possibilit&#xE9; d'exiger une remise contre signature pour les livraisons &#xE0; domicile</notes>
21
  <authors><author><name>Berlioz</name><user>Aline</user><email>Aline.BERLIOZ@laposte.fr</email></author></authors>
22
- <date>2015-03-03</date>
23
- <time>11:24:16</time>
24
- <contents><target name="mageetc"><dir name="modules"><file name="LaPoste_ExpeditorINet.xml" hash="f2198321021ba493d81d064eb99e6aec"/></dir></target><target name="magecommunity"><dir name="LaPoste"><dir name="ExpeditorINet"><dir name="Block"><dir name="Export"><dir name="Orders"><file name="Grid.php" hash="0160b61df3bd9f9df92adc57fe73063c"/></dir><file name="Orders.php" hash="eddae8e734c4b12a36343ef330cdcb32"/></dir><dir name="Import"><file name="Form.php" hash="375c120395760e50ce8eb6e6edf2cdca"/></dir></dir><dir name="Helper"><file name="Data.php" hash="026ea878ecf24e84711b27ad8b10edaf"/></dir><dir name="Model"><dir name="Config"><dir name="Source"><file name="EndOfLineCharacter.php" hash="b8c600ab0371995b790bbb9f9ce43185"/><file name="FieldDelimiter.php" hash="d82eacb4771e2db3168bc360dbd9586b"/><file name="FieldSeparator.php" hash="30c60175102f0c138798d6ce095e1439"/><file name="FileCharset.php" hash="67ae7384d6c71a535e1d93fd683a4d80"/><file name="FileExtension.php" hash="b5d4b7b193e63270f30c5624ff7e9921"/></dir></dir></dir><dir name="controllers"><file name="ExportController.php" hash="7a1dab0be2737b026bf566a6540899a0"/><file name="ImportController.php" hash="81ed1330737f49c111478411f5287b2c"/></dir><dir name="etc"><file name="config.xml" hash="2bd79e7b2106611ec29f73eb8f4390df"/><file name="system.xml" hash="62af9a91e02ae96358dbee7422f1d165"/></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="expeditorinet"><dir name="import"><file name="form.phtml" hash="0afef5bb21747ce26466f7367b3f6d19"/></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir><dir name="fr_FR"><file name="LaPoste_ExpeditorINet.csv" hash="b519614a28683786e3d60293bdc551f6"/></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>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>ColiPoste_La_Poste_Expeditor_Inet_So_Colissimo</name>
4
+ <version>1.0.5</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
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>Compatibilit&#xE9; avec certains modules communautaires modifiant le contenu de la table sales_flat_order_grid</notes>
21
  <authors><author><name>Berlioz</name><user>Aline</user><email>Aline.BERLIOZ@laposte.fr</email></author></authors>
22
+ <date>2015-04-30</date>
23
+ <time>13:00:27</time>
24
+ <contents><target name="mageetc"><dir name="modules"><file name="LaPoste_ExpeditorINet.xml" hash="f2198321021ba493d81d064eb99e6aec"/></dir></target><target name="magecommunity"><dir name="LaPoste"><dir name="ExpeditorINet"><dir name="Block"><dir name="Export"><dir name="Orders"><file name="Grid.php" hash="3e3fed1303adfec81c963e5dd883f7b8"/></dir><file name="Orders.php" hash="eddae8e734c4b12a36343ef330cdcb32"/></dir><dir name="Import"><file name="Form.php" hash="375c120395760e50ce8eb6e6edf2cdca"/></dir></dir><dir name="Helper"><file name="Data.php" hash="026ea878ecf24e84711b27ad8b10edaf"/></dir><dir name="Model"><dir name="Config"><dir name="Source"><file name="EndOfLineCharacter.php" hash="b8c600ab0371995b790bbb9f9ce43185"/><file name="FieldDelimiter.php" hash="d82eacb4771e2db3168bc360dbd9586b"/><file name="FieldSeparator.php" hash="30c60175102f0c138798d6ce095e1439"/><file name="FileCharset.php" hash="67ae7384d6c71a535e1d93fd683a4d80"/><file name="FileExtension.php" hash="b5d4b7b193e63270f30c5624ff7e9921"/></dir></dir></dir><dir name="controllers"><file name="ExportController.php" hash="7a1dab0be2737b026bf566a6540899a0"/><file name="ImportController.php" hash="81ed1330737f49c111478411f5287b2c"/></dir><dir name="etc"><file name="config.xml" hash="7e58278b244bde4597247728ef67cacf"/><file name="system.xml" hash="62af9a91e02ae96358dbee7422f1d165"/></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="expeditorinet"><dir name="import"><file name="form.phtml" hash="0afef5bb21747ce26466f7367b3f6d19"/></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir><dir name="fr_FR"><file name="LaPoste_ExpeditorINet.csv" hash="b519614a28683786e3d60293bdc551f6"/></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>