ColiPoste_La_Poste_So_Colissimo - Version 2.2.1

Version Notes

Compatible 1.7

Download this release

Release Info

Developer Magento Core Team
Extension ColiPoste_La_Poste_So_Colissimo
Version 2.2.1
Comparing to
See all releases


Code changes from version 2.2.0 to 2.2.1

Files changed (3) hide show
  1. app/code/community/LaPoste/SoColissimoSimplicite/Model/Observer.php +57 -57
  2. app/code/community/LaPoste/SoColissimoSimplicite/etc/config.xml +1 -1
  3. package.xml +6 -6
app/code/community/LaPoste/SoColissimoSimplicite/Model/Observer.php CHANGED
@@ -35,7 +35,6 @@ class LaPoste_SoColissimoSimplicite_Model_Observer
35
  'CECOMPANYNAME' => 'company',
36
  'PRZIPCODE' => 'postcode',
37
  'PRTOWN' => 'city',
38
-
39
  );
40
 
41
  /**
@@ -191,62 +190,63 @@ class LaPoste_SoColissimoSimplicite_Model_Observer
191
  $customerNotesArray = array();
192
 
193
  foreach ($shippingData as $fieldSoCo => $valueSoCo) {
194
- if (array_key_exists($fieldSoCo, $this->_mapFields)) {
195
- $fieldMagento = $this->_mapFields[$fieldSoCo];
196
- // So Colissimo renvoie de l'iso8859-1, on encode en utf8
197
- $arrayData[$fieldMagento] = $valueSoCo;
198
- } elseif ($valueSoCo) {
199
- $shippingValue = $shippingData[$fieldSoCo];
200
- switch ($fieldSoCo) {
201
- // cas civilité
202
- case 'CECIVILITY':
203
- $arrayData['prefix'] = $helper->getPrefixForMagento($shippingValue);
204
- break;
205
-
206
- // cas livraison à domicile
207
- case 'CEADRESS3':
208
- $street['0'] = $shippingValue; //mis en 1er car numéro de rue obligatoire côté SoCo
209
- break;
210
- case 'CEADRESS1':
211
- $street['1'] = $shippingValue;
212
- break;
213
- case 'CEADRESS2':
214
- $street['2'] = $shippingValue;
215
- break;
216
- case 'CEADRESS4':
217
- $street['3'] = $shippingValue;
218
- break;
219
-
220
- // cas livraison en point relais
221
- case 'PRNAME':
222
- $street['0'] = $shippingValue;
223
- break;
224
- case 'PRCOMPLADRESS':
225
- $street['1'] = $shippingValue;
226
- break;
227
- case 'PRADRESS1':
228
- $street['2'] = $shippingValue;
229
- break;
230
- case 'PRADRESS2':
231
- $street['3'] = $shippingValue;
232
- break;
233
-
234
- // autres informations sur la livraison
235
- case 'CEENTRYPHONE':
236
- $customerNotesArray['0'] = $helper->__('Interphone').' : '.$shippingValue;
237
- break;
238
- case 'CEDOORCODE1':
239
- $customerNotesArray['1'] = $helper->__('Code porte').' : '.$shippingValue;
240
- break;
241
- case 'CEDOORCODE2':
242
- $customerNotesArray['2'] = $helper->__('Code porte 2').' : '.$shippingValue;
243
- break;
244
- case 'CEDELIVERYINFORMATION':
245
- $customerNotesArray['3'] = $shippingValue;
246
- break;
247
-
248
- default:
249
- break;
 
250
  }
251
  }
252
  }
35
  'CECOMPANYNAME' => 'company',
36
  'PRZIPCODE' => 'postcode',
37
  'PRTOWN' => 'city',
 
38
  );
39
 
40
  /**
190
  $customerNotesArray = array();
191
 
192
  foreach ($shippingData as $fieldSoCo => $valueSoCo) {
193
+ // ne pas traiter les champs vides (SoCo peut par exemple renvoyer un numéro de téléphone vide)
194
+ if ($valueSoCo !== '') {
195
+ if (array_key_exists($fieldSoCo, $this->_mapFields)) {
196
+ $fieldMagento = $this->_mapFields[$fieldSoCo];
197
+ $arrayData[$fieldMagento] = $valueSoCo;
198
+ } else {
199
+ switch ($fieldSoCo) {
200
+ // cas civilité
201
+ case 'CECIVILITY':
202
+ $arrayData['prefix'] = $helper->getPrefixForMagento($valueSoCo);
203
+ break;
204
+
205
+ // cas livraison à domicile
206
+ case 'CEADRESS3':
207
+ $street['0'] = $valueSoCo; //mis en 1er car numéro de rue obligatoire côté SoCo
208
+ break;
209
+ case 'CEADRESS1':
210
+ $street['1'] = $valueSoCo;
211
+ break;
212
+ case 'CEADRESS2':
213
+ $street['2'] = $valueSoCo;
214
+ break;
215
+ case 'CEADRESS4':
216
+ $street['3'] = $valueSoCo;
217
+ break;
218
+
219
+ // cas livraison en point relais
220
+ case 'PRNAME':
221
+ $street['0'] = $valueSoCo;
222
+ break;
223
+ case 'PRCOMPLADRESS':
224
+ $street['1'] = $valueSoCo;
225
+ break;
226
+ case 'PRADRESS1':
227
+ $street['2'] = $valueSoCo;
228
+ break;
229
+ case 'PRADRESS2':
230
+ $street['3'] = $valueSoCo;
231
+ break;
232
+
233
+ // autres informations sur la livraison
234
+ case 'CEENTRYPHONE':
235
+ $customerNotesArray['0'] = $helper->__('Interphone') . ' : ' . $valueSoCo;
236
+ break;
237
+ case 'CEDOORCODE1':
238
+ $customerNotesArray['1'] = $helper->__('Code porte') . ' : ' . $valueSoCo;
239
+ break;
240
+ case 'CEDOORCODE2':
241
+ $customerNotesArray['2'] = $helper->__('Code porte 2') . ' : ' . $valueSoCo;
242
+ break;
243
+ case 'CEDELIVERYINFORMATION':
244
+ $customerNotesArray['3'] = $valueSoCo;
245
+ break;
246
+
247
+ default:
248
+ break;
249
+ }
250
  }
251
  }
252
  }
app/code/community/LaPoste/SoColissimoSimplicite/etc/config.xml CHANGED
@@ -13,7 +13,7 @@
13
  <config>
14
  <modules>
15
  <LaPoste_SoColissimoSimplicite>
16
- <version>2.2.0</version>
17
  </LaPoste_SoColissimoSimplicite>
18
  </modules>
19
 
13
  <config>
14
  <modules>
15
  <LaPoste_SoColissimoSimplicite>
16
+ <version>2.2.1</version>
17
  </LaPoste_SoColissimoSimplicite>
18
  </modules>
19
 
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>ColiPoste_La_Poste_So_Colissimo</name>
4
- <version>2.2.0</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>
@@ -24,10 +24,10 @@ Test&#xE9; et valid&#xE9; sur Magento :&#xD;
24
  &#xD;
25
  R&#xE9;alisation par Smile.</description>
26
  <notes>Compatible 1.7</notes>
27
- <authors><author><name>Berlioz</name><user>Aline</user><email>Aline.BERLIOZ@laposte.fr</email></author></authors>
28
- <date>2013-05-14</date>
29
- <time>15:49:24</time>
30
- <contents><target name="magedesign"><dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="template"><dir name="socolissimosimplicite"><file name="empty.phtml" hash="e23b28c9dc36e8e3fae4a71a504ced16"/><dir name="form"><file name="failure.phtml" hash="6899294fef95e8ba97e923a95ce6e800"/></dir><file name="form.phtml" hash="25e9ef6a8adea89c8a85554d06102da3"/><dir name="onepage"><dir name="shipping_method"><dir name="available"><file name="default.phtml" hash="abd730520d57a1eaf53f9b1e145c9496"/><file name="socolissimosimplicite.phtml" hash="b3f9065c10b7f6aee499e8a25ef210e8"/></dir><file name="available.phtml" hash="caa8262a0d3f5dd3d12e7714843fa8f3"/></dir><file name="shipping_method.phtml" hash="2084ca8fe9c3b38f98b76b16dd5e753b"/></dir></dir></dir><dir name="layout"><file name="socolissimosimplicite.xml" hash="9ac746d2644eae5c257290e6845421cb"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir><dir name="fr_FR"><file name="LaPoste_SoColissimoSimplicite.csv" hash="ddc252df7c3ca35cc4bf5bbe7fdb9433"/></dir></dir></target><target name="magecommunity"><dir><dir name="LaPoste"><dir name="SoColissimoSimplicite"><dir name="Block"><file name="Form.php" hash="df4d1dfbd6f8fbb6088b505b285ed7fa"/><dir name="Onepage"><dir name="Shipping"><dir name="Method"><dir name="Available"><file name="Item.php" hash="28d54a8b59dfff7365e3de0db158ac72"/></dir><file name="Available.php" hash="87903ab9334a817c6970d5225ff4129d"/></dir></dir></dir><file name="Onepage.php" hash="9c479fb9298c513ecc5b1473b6366391"/></dir><dir name="Helper"><file name="Data.php" hash="83b0fc3ee84ccaf4e21bbf4759960502"/></dir><dir name="Model"><dir name="Carrier"><file name="ShippingMethod.php" hash="a824ef65678448f9e38e49a659546297"/></dir><dir name="Mysql4"><dir name="Transaction"><file name="Collection.php" hash="af31dc43455baed304eb087a1f5a022b"/></dir><file name="Transaction.php" hash="8cf12de5f6a6a50cf69e42e6da77d2f9"/></dir><file name="Observer.php" hash="563e26117a0cc90affcad28a503cef5d"/><dir name="System"><dir name="Config"><dir name="Source"><dir name="Shipping"><file name="Amountbasetype.php" hash="210a1f9bd6c9daac92fb213d3b4d662b"/></dir></dir></dir></dir><file name="Transaction.php" hash="023d0f47d98584520dad99f2b06ed681"/></dir><dir name="Test"><dir name="Model"><dir name="Carrier"><file name="ShippingMethodTest.php" hash="09e08117c7f70ca3304f3c0002f62e0f"/></dir></dir></dir><dir name="controllers"><file name="FormController.php" hash="aeeb7dcc7ce076d8f13ff136bd49dd6d"/></dir><dir name="etc"><file name="config.xml" hash="26f3d2ccbb9634de3184b3bec24dfe12"/><file name="system.xml" hash="2b6391525f70bbb55b9c5c53db301f87"/></dir><dir name="sql"><dir name="socolissimosimplicite_setup"><file name="mysql4-install-1.0.0.php" hash="39d84d2cee2d8c2c0633c17891e045aa"/><file name="mysql4-uninstall-0.1.0.php" hash="471abbb64f1a962e8cc09d7bf48fe46c"/><file name="mysql4-upgrade-1.0.6-1.0.7.php" hash="b7939e9bd64cadbdc9ccd77b52d19d16"/><file name="mysql4-upgrade-1.1.1-2.0.0.php" hash="bd7915ab8d3871491e496f33617d3754"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir><dir name="modules"><file name="LaPoste_SoColissimoSimplicite.xml" hash="154dd96df1089ac29e87eaa8677693c3"/></dir></dir></target></contents>
31
  <compatible/>
32
- <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
33
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>ColiPoste_La_Poste_So_Colissimo</name>
4
+ <version>2.2.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>
24
  &#xD;
25
  R&#xE9;alisation par Smile.</description>
26
  <notes>Compatible 1.7</notes>
27
+ <authors><author><name>Berlioz</name><user>auto-converted</user><email>Aline.BERLIOZ@laposte.fr</email></author></authors>
28
+ <date>2013-06-27</date>
29
+ <time>10:25:56</time>
30
+ <contents><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="default"><dir name="template"><dir name="socolissimosimplicite"><dir name="form"><file name="failure.phtml" hash="6899294fef95e8ba97e923a95ce6e800"/></dir><dir name="onepage"><dir name="shipping_method"><dir name="available"><file name="default.phtml" hash="abd730520d57a1eaf53f9b1e145c9496"/><file name="socolissimosimplicite.phtml" hash="b3f9065c10b7f6aee499e8a25ef210e8"/></dir><file name="available.phtml" hash="caa8262a0d3f5dd3d12e7714843fa8f3"/></dir><file name="shipping_method.phtml" hash="2084ca8fe9c3b38f98b76b16dd5e753b"/></dir><file name="empty.phtml" hash="e23b28c9dc36e8e3fae4a71a504ced16"/><file name="form.phtml" hash="25e9ef6a8adea89c8a85554d06102da3"/></dir></dir><dir name="layout"><file name="socolissimosimplicite.xml" hash="9ac746d2644eae5c257290e6845421cb"/></dir></dir></dir></dir></target><target name="magelocale"><dir name="fr_FR"><file name="LaPoste_SoColissimoSimplicite.csv" hash="ddc252df7c3ca35cc4bf5bbe7fdb9433"/></dir></target><target name="magecommunity"><dir name="LaPoste"><dir name="SoColissimoSimplicite"><dir name="Block"><dir name="Onepage"><dir name="Shipping"><dir name="Method"><dir name="Available"><file name="Item.php" hash="28d54a8b59dfff7365e3de0db158ac72"/></dir><file name="Available.php" hash="87903ab9334a817c6970d5225ff4129d"/></dir></dir></dir><file name="Form.php" hash="df4d1dfbd6f8fbb6088b505b285ed7fa"/><file name="Onepage.php" hash="9c479fb9298c513ecc5b1473b6366391"/></dir><dir name="Helper"><file name="Data.php" hash="83b0fc3ee84ccaf4e21bbf4759960502"/></dir><dir name="Model"><dir name="Carrier"><file name="ShippingMethod.php" hash="a824ef65678448f9e38e49a659546297"/></dir><dir name="Mysql4"><dir name="Transaction"><file name="Collection.php" hash="af31dc43455baed304eb087a1f5a022b"/></dir><file name="Transaction.php" hash="8cf12de5f6a6a50cf69e42e6da77d2f9"/></dir><dir name="System"><dir name="Config"><dir name="Source"><dir name="Shipping"><file name="Amountbasetype.php" hash="210a1f9bd6c9daac92fb213d3b4d662b"/></dir></dir></dir></dir><file name="Observer.php" hash="7cc5c28b41dff45b54ddf997b181ed41"/><file name="Transaction.php" hash="023d0f47d98584520dad99f2b06ed681"/></dir><dir name="Test"><dir name="Model"><dir name="Carrier"><file name="ShippingMethodTest.php" hash="09e08117c7f70ca3304f3c0002f62e0f"/></dir></dir></dir><dir name="controllers"><file name="FormController.php" hash="aeeb7dcc7ce076d8f13ff136bd49dd6d"/></dir><dir name="etc"><file name="config.xml" hash="a7dc37f47f13385d6be9c4a8fe58e63d"/><file name="system.xml" hash="2b6391525f70bbb55b9c5c53db301f87"/></dir><dir name="sql"><dir name="socolissimosimplicite_setup"><file name="mysql4-install-1.0.0.php" hash="39d84d2cee2d8c2c0633c17891e045aa"/><file name="mysql4-uninstall-0.1.0.php" hash="471abbb64f1a962e8cc09d7bf48fe46c"/><file name="mysql4-upgrade-1.0.6-1.0.7.php" hash="b7939e9bd64cadbdc9ccd77b52d19d16"/><file name="mysql4-upgrade-1.1.1-2.0.0.php" hash="bd7915ab8d3871491e496f33617d3754"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="LaPoste_SoColissimoSimplicite.xml" hash="154dd96df1089ac29e87eaa8677693c3"/></dir></target></contents>
31
  <compatible/>
32
+ <dependencies/>
33
  </package>