ColiPoste_La_Poste_So_Colissimo - Version 2.3.3

Version Notes

Compatibilité Community 1.9

Download this release

Release Info

Developer Berlioz
Extension ColiPoste_La_Poste_So_Colissimo
Version 2.3.3
Comparing to
See all releases


Code changes from version 2.3.2 to 2.3.3

Files changed (3) hide show
  1. app/code/community/LaPoste/SoColissimoSimplicite/etc/config.xml +2 -10
  2. package.xml +7 -7
  3. skin/frontend/base/default/js/socolissimosimplicite/shipping_method.js +13 -6
app/code/community/LaPoste/SoColissimoSimplicite/etc/config.xml CHANGED
@@ -13,7 +13,7 @@
13
  <config>
14
  <modules>
15
  <LaPoste_SoColissimoSimplicite>
16
- <version>2.3.2</version>
17
  </LaPoste_SoColissimoSimplicite>
18
  </modules>
19
 
@@ -178,15 +178,7 @@
178
  <sallowspecific>1</sallowspecific>
179
  <model>LaPoste_SoColissimoSimplicite_Model_Carrier_ShippingMethod</model>
180
  <!-- association entre les civilités utilisées dans Magento et celles utilisées dans So Colissimo -->
181
- <mapprefix>
182
- <![CDATA[
183
- {
184
- "MR":"M."
185
- ,"MLE":"Mlle"
186
- ,"MME":"Mme"
187
- }
188
- ]]>
189
- </mapprefix>
190
  <!-- langues disponibles dans l'interface So Colissimo -->
191
  <!-- l'IFrame So Colissimo utilisera la même langue que Magento si celle-ci fait partie de la liste ci-dessous -->
192
  <!-- n'intégrer dans cette liste que les langues connues de So Colissimo (pour l'instant, uniquement le français) -->
13
  <config>
14
  <modules>
15
  <LaPoste_SoColissimoSimplicite>
16
+ <version>2.3.3</version>
17
  </LaPoste_SoColissimoSimplicite>
18
  </modules>
19
 
178
  <sallowspecific>1</sallowspecific>
179
  <model>LaPoste_SoColissimoSimplicite_Model_Carrier_ShippingMethod</model>
180
  <!-- association entre les civilités utilisées dans Magento et celles utilisées dans So Colissimo -->
181
+ <mapprefix><![CDATA[{"MR": "M.", "MLE": "Mlle", "MME": "Mme"}]]></mapprefix>
 
 
 
 
 
 
 
 
182
  <!-- langues disponibles dans l'interface So Colissimo -->
183
  <!-- l'IFrame So Colissimo utilisera la même langue que Magento si celle-ci fait partie de la liste ci-dessous -->
184
  <!-- n'intégrer dans cette liste que les langues connues de So Colissimo (pour l'instant, uniquement le français) -->
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.3.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>
@@ -18,16 +18,16 @@ So Colissimo offre le choix parmi 5 solutions de livraison et un grand r&#xE9;se
18
  * mon commer&#xE7;ant : livraison chez l'un des nombreux commer&#xE7;ants de notre r&#xE9;seau partenaire.&#xD;
19
  &#xD;
20
  Test&#xE9; et valid&#xE9; sur Magento :&#xD;
21
- - Community : 1.3.3.0, 1.4.2.0, 1.5.1.0, 1.6.2.0, 1.7.0.2, 1.8.1.0, 1.9.0.1&#xD;
22
- - Professional : 1.8.0.0&#xD;
23
- - Enterprise : 1.8.0.0, 1.9.0.0, 1.10.1.1, 1.11.0.0, 1.12.0.0, 1.13.0.0&#xD;
24
  &#xD;
25
  R&#xE9;alisation par Smile.</description>
26
  <notes>Compatibilit&#xE9; Community 1.9</notes>
27
  <authors><author><name>Berlioz</name><user>Aline</user><email>Aline.BERLIOZ@laposte.fr</email></author></authors>
28
- <date>2014-06-16</date>
29
- <time>13:54:26</time>
30
- <contents><target name="magedesign"><dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="socolissimosimplicite"><file name="empty.phtml" hash="5726ba2edea823965827685b3bdc3d95"/><dir name="form"><file name="failure.phtml" hash="259bc094879a81cc06b0672c31f2df1b"/></dir><file name="form.phtml" hash="f46decffe3510c59688c5925617e4d1c"/><file name="iframe.phtml" hash="48aabfc24e2cbe6845da1169c6576c10"/><dir name="onepage"><dir name="shipping_method"><file name="socolissimosimplicite.phtml" hash="c0ce496d1dc9369fb06db452aedd2167"/></dir></dir></dir></dir><dir name="layout"><file name="socolissimosimplicite.xml" hash="7cbeeb8095261ca622174d7ed447589f"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir><dir name="fr_FR"><file name="LaPoste_SoColissimoSimplicite.csv" hash="c70f610f8160ec6415d10bc18ff0ab41"/></dir></dir></target><target name="magecommunity"><dir><dir name="LaPoste"><dir name="SoColissimoSimplicite"><dir name="Block"><file name="Form.php" hash="df4d1dfbd6f8fbb6088b505b285ed7fa"/><file name="Iframe.php" hash="518d7af1a92e9feae96ac2982204dfd1"/><file name="Onepage.php" hash="81d36d830a778e83c0a8f22f3b90ee56"/></dir><dir name="Helper"><file name="Data.php" hash="21dfcfd401fee817010fbf012f38d7a9"/></dir><dir name="Model"><dir name="Carrier"><file name="ShippingMethod.php" hash="1679042ae9465ab6877752860a7c7cc7"/></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="1fdd106d6ddd0554466701b18a35b7f0"/><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="controllers"><file name="FormController.php" hash="f4d0c4574c1ad127f680b38286d1bbcb"/></dir><dir name="etc"><file name="config.xml" hash="02d8a54497ab8a9afc48c9cd1d517e52"/><file name="system.xml" hash="be505597ba2f1ddb7ad4a8623619aa74"/></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="03712141361b873740de91b7d0f721f0"/><file name="mysql4-upgrade-1.1.1-2.0.0.php" hash="bd7915ab8d3871491e496f33617d3754"/><file name="mysql4-upgrade-2.2.1-2.3.0.php" hash="c578ca0c71a7a6d53dbfd3daff5e594e"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir><dir name="modules"><file name="LaPoste_SoColissimoSimplicite.xml" hash="c7097370b5cc0e66fc2127df191740a6"/></dir></dir></target><target name="mageskin"><dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="js"><dir name="socolissimosimplicite"><file name="shipping_method.js" hash="04fb2f6ed105d2c7891fd999e7914c4f"/></dir></dir></dir></dir></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.3.3</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>
18
  * mon commer&#xE7;ant : livraison chez l'un des nombreux commer&#xE7;ants de notre r&#xE9;seau partenaire.&#xD;
19
  &#xD;
20
  Test&#xE9; et valid&#xE9; sur Magento :&#xD;
21
+ - Community : 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9&#xD;
22
+ - Professional : 1.8&#xD;
23
+ - Enterprise : 1.8, 1.9, 1.10, 1.11, 1.12, 1.13, 1.14&#xD;
24
  &#xD;
25
  R&#xE9;alisation par Smile.</description>
26
  <notes>Compatibilit&#xE9; Community 1.9</notes>
27
  <authors><author><name>Berlioz</name><user>Aline</user><email>Aline.BERLIOZ@laposte.fr</email></author></authors>
28
+ <date>2014-09-29</date>
29
+ <time>13:48:33</time>
30
+ <contents><target name="magedesign"><dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="socolissimosimplicite"><file name="empty.phtml" hash="5726ba2edea823965827685b3bdc3d95"/><dir name="form"><file name="failure.phtml" hash="259bc094879a81cc06b0672c31f2df1b"/></dir><file name="form.phtml" hash="f46decffe3510c59688c5925617e4d1c"/><file name="iframe.phtml" hash="48aabfc24e2cbe6845da1169c6576c10"/><dir name="onepage"><dir name="shipping_method"><file name="socolissimosimplicite.phtml" hash="c0ce496d1dc9369fb06db452aedd2167"/></dir></dir></dir></dir><dir name="layout"><file name="socolissimosimplicite.xml" hash="7cbeeb8095261ca622174d7ed447589f"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir><dir name="fr_FR"><file name="LaPoste_SoColissimoSimplicite.csv" hash="c70f610f8160ec6415d10bc18ff0ab41"/></dir></dir></target><target name="magecommunity"><dir><dir name="LaPoste"><dir name="SoColissimoSimplicite"><dir name="Block"><file name="Form.php" hash="df4d1dfbd6f8fbb6088b505b285ed7fa"/><file name="Iframe.php" hash="518d7af1a92e9feae96ac2982204dfd1"/><file name="Onepage.php" hash="81d36d830a778e83c0a8f22f3b90ee56"/></dir><dir name="Helper"><file name="Data.php" hash="21dfcfd401fee817010fbf012f38d7a9"/></dir><dir name="Model"><dir name="Carrier"><file name="ShippingMethod.php" hash="1679042ae9465ab6877752860a7c7cc7"/></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="1fdd106d6ddd0554466701b18a35b7f0"/><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="controllers"><file name="FormController.php" hash="f4d0c4574c1ad127f680b38286d1bbcb"/></dir><dir name="etc"><file name="config.xml" hash="7fb24193be6ee19ff8d88071ddb0f94b"/><file name="system.xml" hash="be505597ba2f1ddb7ad4a8623619aa74"/></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="03712141361b873740de91b7d0f721f0"/><file name="mysql4-upgrade-1.1.1-2.0.0.php" hash="bd7915ab8d3871491e496f33617d3754"/><file name="mysql4-upgrade-2.2.1-2.3.0.php" hash="c578ca0c71a7a6d53dbfd3daff5e594e"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir><dir name="modules"><file name="LaPoste_SoColissimoSimplicite.xml" hash="c7097370b5cc0e66fc2127df191740a6"/></dir></dir></target><target name="mageskin"><dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="js"><dir name="socolissimosimplicite"><file name="shipping_method.js" hash="4f0c0754e221c8981537c82cc34d4324"/></dir></dir></dir></dir></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>
skin/frontend/base/default/js/socolissimosimplicite/shipping_method.js CHANGED
@@ -84,7 +84,7 @@ SocoShippingMethod.prototype = {
84
  var socoIFrameContainer = $('socolissimosimplicite_iframe_wrapper');
85
  if (socoIFrameContainer === null) {
86
  socoIFrameContainer = new Element('div', {id: 'socolissimosimplicite_iframe_wrapper'});
87
- $$('input[value="' + this.options.rateCode + '"]').first().up().appendChild(socoIFrameContainer);
88
  }
89
 
90
  // création de l'IFrame
@@ -106,7 +106,17 @@ SocoShippingMethod.prototype = {
106
  },
107
 
108
  /**
109
- * Cancel So Cocolissimo IFrame and reenable disabled checkout feature
 
 
 
 
 
 
 
 
 
 
110
  */
111
  cancel: function() {
112
  // réactivation des modes de livraison
@@ -116,10 +126,7 @@ SocoShippingMethod.prototype = {
116
  }
117
 
118
  // suppression de l'IFrame
119
- var socoIframeContainer = $('socolissimosimplicite_iframe_wrapper');
120
- while (socoIframeContainer.firstChild) {
121
- socoIframeContainer.removeChild(socoIframeContainer.firstChild);
122
- }
123
 
124
  // annulation du blocage du passage à l'étape suivante
125
  shippingMethod.resetLoadWaiting();
84
  var socoIFrameContainer = $('socolissimosimplicite_iframe_wrapper');
85
  if (socoIFrameContainer === null) {
86
  socoIFrameContainer = new Element('div', {id: 'socolissimosimplicite_iframe_wrapper'});
87
+ $$('input[value="' + this.options.rateCode + '"]').first().up('li').appendChild(socoIFrameContainer);
88
  }
89
 
90
  // création de l'IFrame
106
  },
107
 
108
  /**
109
+ * Suppression de l'IFrame So Colissimo
110
+ */
111
+ removeIFrame: function() {
112
+ var socoIframeContainer = $('socolissimosimplicite_iframe_wrapper');
113
+ if (socoIframeContainer !== null) {
114
+ socoIframeContainer.remove();
115
+ }
116
+ },
117
+
118
+ /**
119
+ * Supprime l'IFrame So Colissimo et réactive le choix des autres moyens de livraison
120
  */
121
  cancel: function() {
122
  // réactivation des modes de livraison
126
  }
127
 
128
  // suppression de l'IFrame
129
+ this.removeIFrame();
 
 
 
130
 
131
  // annulation du blocage du passage à l'étape suivante
132
  shippingMethod.resetLoadWaiting();