man4x_mondialrelay - Version 1.1.6

Version Notes

(EN)
Fixes buggy helper (my very fault !) screewing up web service registration (thank you Alain).
Fixes bug with floating item weight (thank you Lionel).
-----------------------------------------------------------
(FR)
Supprime un var_dump oublié empêchant l'enregistrement des commandes (merci Alain !).
Corrige un bug dans le cas de poids non entiers (merci à Lionel)

Download this release

Release Info

Developer Emmanuel Catrysse
Extension man4x_mondialrelay
Version 1.1.6
Comparing to
See all releases


Code changes from version 1.1.5 to 1.1.6

Files changed (3) hide show
  1. app/code/community/Man4x/MondialRelay/Helper/Data.php +2 -3
  2. app/code/community/Man4x/MondialRelay/etc/config.xml +1 -1
  3. package.xml +8 -6
app/code/community/Man4x/MondialRelay/Helper/Data.php CHANGED
@@ -160,7 +160,7 @@ class Man4x_MondialRelay_Helper_Data
160
  *
161
  * @param float $weight
162
  * @param string unit
163
- * @return float
164
  */
165
  public function convertWeight($weight, $unit)
166
  {
@@ -175,7 +175,7 @@ class Man4x_MondialRelay_Helper_Data
175
  case 'lb':
176
  $weight *= 453.6;
177
  }
178
- return $weight;
179
  }
180
 
181
  /**
@@ -232,7 +232,6 @@ class Man4x_MondialRelay_Helper_Data
232
  {
233
  $data['mondialrelay_ws_error_msg'] = $this->convertStatToTxt($errorCode);
234
  }
235
- die(var_dump($data));
236
  Mage::log(print_r($data, true) . self::CSV_EOL, Zend_Log::DEBUG, self::LOG_FILE, true);
237
  }
238
 
160
  *
161
  * @param float $weight
162
  * @param string unit
163
+ * @return integer
164
  */
165
  public function convertWeight($weight, $unit)
166
  {
175
  case 'lb':
176
  $weight *= 453.6;
177
  }
178
+ return ceil($weight);
179
  }
180
 
181
  /**
232
  {
233
  $data['mondialrelay_ws_error_msg'] = $this->convertStatToTxt($errorCode);
234
  }
 
235
  Mage::log(print_r($data, true) . self::CSV_EOL, Zend_Log::DEBUG, self::LOG_FILE, true);
236
  }
237
 
app/code/community/Man4x/MondialRelay/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Man4x_MondialRelay>
5
- <version>1.1.5</version>
6
  <depends>
7
  <Mage_Adminhtml />
8
  <Mage_Shipping />
2
  <config>
3
  <modules>
4
  <Man4x_MondialRelay>
5
+ <version>1.1.6</version>
6
  <depends>
7
  <Mage_Adminhtml />
8
  <Mage_Shipping />
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>man4x_mondialrelay</name>
4
- <version>1.1.5</version>
5
  <stability>stable</stability>
6
  <license>Massachusetts Institute of Technology License (MITL)</license>
7
  <channel>community</channel>
@@ -14,14 +14,16 @@ WARNING: this module is not compatible with MondialRelay_Pointsrelais unless man
14
  (FR) Ce module a &#xE9;t&#xE9; inspir&#xE9; par le module MondialRelay_Pointsrelais disponible sur Magento Connect dans le but de corriger certaines limitations de ce dernier (exp&#xE9;ditions par lot, s&#xE9;lection des points relais sur carte ou par liste, interception des erreurs d'enregistrement...)&#xD;
15
  ATTENTION: ce module n'est pas compatible en l'&#xE9;tat avec le module MondialRelay_Pointsrelais (voir documentation).</description>
16
  <notes>(EN) &#xD;
17
- Responsive design for small media screens (320px)&#xD;
 
18
  -----------------------------------------------------------&#xD;
19
  (FR)&#xD;
20
- - Responsive design pour petits &#xE9;crans (320px)</notes>
 
21
  <authors><author><name>Emmanuel Catrysse</name><user>Peppermay</user><email>man4x@hotmail.fr</email></author></authors>
22
- <date>2013-11-12</date>
23
- <time>10:48:50</time>
24
- <contents><target name="magecommunity"><dir name="Man4x"><dir name="MondialRelay"><dir name="Block"><dir name="Checkout"><file name="Pickupinfo.php" hash="f680aaaff2440322a2e52466c82ada29"/><file name="Pickuppopup.php" hash="2ba541c8dc6f7879ed253247203a2845"/><file name="Shippingmethods.php" hash="b7b8add2c3c4ff0b3e62cb40b51723c3"/></dir><dir name="Sales"><dir name="Labelprinting"><file name="Grid.php" hash="d857aff4471f24384b0c5297ccb0cb78"/></dir><file name="Labelprinting.php" hash="9e990a4eb0ceefa636ebc32bba6b6a8f"/><dir name="Massshipping"><file name="Grid.php" hash="ce414d6219b1b1af560c0088edf77368"/></dir><file name="Massshipping.php" hash="9a57748baaf79fb6e60d1644d2135fda"/></dir></dir><dir name="Helper"><file name="Data.php" hash="72df1f45251e0478dbca7b297e2a681e"/></dir><dir name="Model"><dir name="Carrier"><file name="Abstract.php" hash="f6a030cf13c9c1318fe443bbd6e98f76"/><file name="Home.php" hash="ad17938c4cce4cf0016706389acba36e"/><file name="Pickup.php" hash="2131f0b7985c85f78c6281f0dbd619d8"/></dir><file name="Observer.php" hash="9d5dea24dcfad2443e2ccc9690b811f0"/><dir name="System"><dir name="Config"><dir name="Source"><file name="Condition.php" hash="efba05e86889f72a3df7ce18b6f72ada"/><file name="Weightunit.php" hash="ccd1e3db82344d3474cbfc14ae99bd4b"/></dir><dir name="Validation"><file name="Senderaddress.php" hash="ca607aa992c55449506e281bd77955c7"/><file name="Tablerate.php" hash="2eefc73133b5a0876024b6f528e53a8e"/></dir></dir></dir></dir><dir name="controllers"><file name="IndexController.php" hash="ffd62c82cec4f6ee9a577df12241064e"/><dir name="Sales"><file name="ShippingController.php" hash="9c02e4cd4ef508b9b9779ed4a709907c"/></dir></dir><dir name="doc"><file name="guide_module_man4x_mondialrelay_1_1_0_en.pdf" hash="60cd8884d5d22b748b30c10b9697514b"/><file name="guide_module_man4x_mondialrelay_1_1_0_fr.pdf" hash="99bd87f2d497b6f176b76add0f77c3f8"/></dir><dir name="etc"><dir name="_notes"><file name="dwsync.xml" hash="790b00208c48e411a4fe1d7acc407648"/></dir><file name="adminhtml.xml" hash="8c62dc7ecb883783e2e65d46a60b154f"/><file name="config.xml" hash="d0e914466c91731471475b8947f77309"/><file name="system.xml" hash="307636e6456d1ae72492344bb6fa9ecc"/></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="Man4x_MondialRelay.xml" hash="eaf0e0972f6ab93544fdd8a6ca45a244"/></dir><dir name="template"><dir name="Man4x_MondialRelay"><file name="pickupinfo.phtml" hash="e0daf3278c83ab590dab924b1644648a"/><file name="pickuppopup.phtml" hash="48eb0f72577f343cf1782a618863b235"/><file name="shippingmethods.phtml" hash="762d33ce8636227788f8d94387317776"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Man4x_MondialRelay.xml" hash="cbf764631c906fbf3b9bcee94199d078"/></dir></target><target name="magelocale"><dir><dir name="en_US"><file name="Man4x_MondialRelay.csv" hash="3e6321757d1c6e970ebcc8bf0a321d88"/></dir><dir name="fr_FR"><file name="Man4x_MondialRelay.csv" hash="3a93fa043d92acd925cce3e3f399da22"/></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><file name="Man4x_MondialRelay.css" hash="dc8d96392983ea2c3178b2af1cb512be"/></dir><dir name="images"><dir name="Man4x_MondialRelay"><file name="close_icon.png" hash="f8422d11f273f2690226160682d80f10"/><file name="logo_mondialrelay.gif" hash="95bc996ef1c8fce2b8cc7b0b864d6f52"/><file name="logo_mondialrelay_20.gif" hash="ac7ca03f8638455ce33dd8ca9c17c475"/><file name="mondialrelay_ajax_loading.gif" hash="ef4b7ef99db4254577aac23fff5ff50b"/><file name="mondialrelay_ajax_loading_50x55.gif" hash="b260ebcedb57b84557917ecc748469ff"/><file name="mondialrelay_mapicon.png" hash="42af394899f3cb4dee42dacea2acb5b5"/></dir></dir></dir></dir></dir></target></contents>
25
  <compatible/>
26
  <dependencies><required><php><min>5.0.0</min><max>5.5.3</max></php></required></dependencies>
27
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>man4x_mondialrelay</name>
4
+ <version>1.1.6</version>
5
  <stability>stable</stability>
6
  <license>Massachusetts Institute of Technology License (MITL)</license>
7
  <channel>community</channel>
14
  (FR) Ce module a &#xE9;t&#xE9; inspir&#xE9; par le module MondialRelay_Pointsrelais disponible sur Magento Connect dans le but de corriger certaines limitations de ce dernier (exp&#xE9;ditions par lot, s&#xE9;lection des points relais sur carte ou par liste, interception des erreurs d'enregistrement...)&#xD;
15
  ATTENTION: ce module n'est pas compatible en l'&#xE9;tat avec le module MondialRelay_Pointsrelais (voir documentation).</description>
16
  <notes>(EN) &#xD;
17
+ Fixes buggy helper (my very fault !) screewing up web service registration (thank you Alain).&#xD;
18
+ Fixes bug with floating item weight (thank you Lionel).&#xD;
19
  -----------------------------------------------------------&#xD;
20
  (FR)&#xD;
21
+ Supprime un var_dump oubli&#xE9; emp&#xEA;chant l'enregistrement des commandes (merci Alain !).&#xD;
22
+ Corrige un bug dans le cas de poids non entiers (merci &#xE0; Lionel)</notes>
23
  <authors><author><name>Emmanuel Catrysse</name><user>Peppermay</user><email>man4x@hotmail.fr</email></author></authors>
24
+ <date>2013-11-16</date>
25
+ <time>09:38:35</time>
26
+ <contents><target name="magecommunity"><dir name="Man4x"><dir name="MondialRelay"><dir name="Block"><dir name="Checkout"><file name="Pickupinfo.php" hash="f680aaaff2440322a2e52466c82ada29"/><file name="Pickuppopup.php" hash="2ba541c8dc6f7879ed253247203a2845"/><file name="Shippingmethods.php" hash="b7b8add2c3c4ff0b3e62cb40b51723c3"/></dir><dir name="Sales"><dir name="Labelprinting"><file name="Grid.php" hash="d857aff4471f24384b0c5297ccb0cb78"/></dir><file name="Labelprinting.php" hash="9e990a4eb0ceefa636ebc32bba6b6a8f"/><dir name="Massshipping"><file name="Grid.php" hash="ce414d6219b1b1af560c0088edf77368"/></dir><file name="Massshipping.php" hash="9a57748baaf79fb6e60d1644d2135fda"/></dir></dir><dir name="Helper"><file name="Data.php" hash="aff3d13a064c87b8a1e2d7747b27be25"/></dir><dir name="Model"><dir name="Carrier"><file name="Abstract.php" hash="f6a030cf13c9c1318fe443bbd6e98f76"/><file name="Home.php" hash="ad17938c4cce4cf0016706389acba36e"/><file name="Pickup.php" hash="2131f0b7985c85f78c6281f0dbd619d8"/></dir><file name="Observer.php" hash="9d5dea24dcfad2443e2ccc9690b811f0"/><dir name="System"><dir name="Config"><dir name="Source"><file name="Condition.php" hash="efba05e86889f72a3df7ce18b6f72ada"/><file name="Weightunit.php" hash="ccd1e3db82344d3474cbfc14ae99bd4b"/></dir><dir name="Validation"><file name="Senderaddress.php" hash="ca607aa992c55449506e281bd77955c7"/><file name="Tablerate.php" hash="2eefc73133b5a0876024b6f528e53a8e"/></dir></dir></dir></dir><dir name="controllers"><file name="IndexController.php" hash="ffd62c82cec4f6ee9a577df12241064e"/><dir name="Sales"><file name="ShippingController.php" hash="9c02e4cd4ef508b9b9779ed4a709907c"/></dir></dir><dir name="doc"><file name="guide_module_man4x_mondialrelay_1_1_0_en.pdf" hash="60cd8884d5d22b748b30c10b9697514b"/><file name="guide_module_man4x_mondialrelay_1_1_0_fr.pdf" hash="99bd87f2d497b6f176b76add0f77c3f8"/></dir><dir name="etc"><dir name="_notes"><file name="dwsync.xml" hash="790b00208c48e411a4fe1d7acc407648"/></dir><file name="adminhtml.xml" hash="8c62dc7ecb883783e2e65d46a60b154f"/><file name="config.xml" hash="de18586e8bbc266b0b7fe49ab0ade2c9"/><file name="system.xml" hash="307636e6456d1ae72492344bb6fa9ecc"/></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="Man4x_MondialRelay.xml" hash="eaf0e0972f6ab93544fdd8a6ca45a244"/></dir><dir name="template"><dir name="Man4x_MondialRelay"><file name="pickupinfo.phtml" hash="e0daf3278c83ab590dab924b1644648a"/><file name="pickuppopup.phtml" hash="48eb0f72577f343cf1782a618863b235"/><file name="shippingmethods.phtml" hash="762d33ce8636227788f8d94387317776"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Man4x_MondialRelay.xml" hash="cbf764631c906fbf3b9bcee94199d078"/></dir></target><target name="magelocale"><dir><dir name="en_US"><file name="Man4x_MondialRelay.csv" hash="3e6321757d1c6e970ebcc8bf0a321d88"/></dir><dir name="fr_FR"><file name="Man4x_MondialRelay.csv" hash="3a93fa043d92acd925cce3e3f399da22"/></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><file name="Man4x_MondialRelay.css" hash="dc8d96392983ea2c3178b2af1cb512be"/></dir><dir name="images"><dir name="Man4x_MondialRelay"><file name="close_icon.png" hash="f8422d11f273f2690226160682d80f10"/><file name="logo_mondialrelay.gif" hash="95bc996ef1c8fce2b8cc7b0b864d6f52"/><file name="logo_mondialrelay_20.gif" hash="ac7ca03f8638455ce33dd8ca9c17c475"/><file name="mondialrelay_ajax_loading.gif" hash="ef4b7ef99db4254577aac23fff5ff50b"/><file name="mondialrelay_ajax_loading_50x55.gif" hash="b260ebcedb57b84557917ecc748469ff"/><file name="mondialrelay_mapicon.png" hash="42af394899f3cb4dee42dacea2acb5b5"/></dir></dir></dir></dir></dir></target></contents>
27
  <compatible/>
28
  <dependencies><required><php><min>5.0.0</min><max>5.5.3</max></php></required></dependencies>
29
  </package>