Chronopost - Version 0.1.7

Version Notes

New shipping module

Download this release

Release Info

Developer Magento Core Team
Extension Chronopost
Version 0.1.7
Comparing to
See all releases


Code changes from version 0.1.6 to 0.1.7

Files changed (3) hide show
  1. app/code/community/Chronopost/Chronorelais/Model/Carrier/AbstractChronorelaisShipping.php +5 -4
  2. app/code/community/Chronopost/Chronorelais/etc/config.xml +1 -1
  3. package.xml +4 -4
app/code/community/Chronopost/Chronorelais/Model/Carrier/AbstractChronorelaisShipping.php CHANGED
@@ -305,10 +305,10 @@ abstract class Chronopost_Chronorelais_Model_Carrier_AbstractChronorelaisShippin
305
  $process_continue = true;
306
 
307
  //Set error messages if not any matching
308
- $errorMsg = '';
309
  $defaultErrorMsg = Mage::helper('shipping')->__('The shipping module is not available.');
310
  $configErrorMsg = $this->__getConfigData('specificerrmsg');
311
- $configErrorMsg = ($configErrorMsg ? $configErrorMsg : $defaultErrorMsg);
312
  $freeShippingEnable = $this->__getConfigData('free_shipping_enable');
313
  $freeShippingSubtotal = $this->__getConfigData('free_shipping_subtotal');
314
  $applicationFee = $this->__getConfigData('application_fee');
@@ -338,10 +338,11 @@ abstract class Chronopost_Chronorelais_Model_Carrier_AbstractChronorelaisShippin
338
  }
339
  }
340
  }
 
341
  $this->_helper->printDebug();
342
 
343
- $this->_appendErrors($process,$this->_messages);
344
- if (!$value_found) $this->__appendError($process,$this->__($configErrorMsg));
345
  }
346
 
347
  protected function _getConfig() {
305
  $process_continue = true;
306
 
307
  //Set error messages if not any matching
308
+ /*$errorMsg = '';
309
  $defaultErrorMsg = Mage::helper('shipping')->__('The shipping module is not available.');
310
  $configErrorMsg = $this->__getConfigData('specificerrmsg');
311
+ $configErrorMsg = ($configErrorMsg ? $configErrorMsg : $defaultErrorMsg);*/
312
  $freeShippingEnable = $this->__getConfigData('free_shipping_enable');
313
  $freeShippingSubtotal = $this->__getConfigData('free_shipping_subtotal');
314
  $applicationFee = $this->__getConfigData('application_fee');
338
  }
339
  }
340
  }
341
+
342
  $this->_helper->printDebug();
343
 
344
+ //$this->_appendErrors($process,$this->_messages);
345
+ //if (!$value_found) $this->__appendError($process,$this->__($configErrorMsg));
346
  }
347
 
348
  protected function _getConfig() {
app/code/community/Chronopost/Chronorelais/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Chronopost_Chronorelais>
5
- <version>0.1.6</version>
6
  <depends>
7
  <Mage_Shipping />
8
  <Mage_Sales />
2
  <config>
3
  <modules>
4
  <Chronopost_Chronorelais>
5
+ <version>0.1.7</version>
6
  <depends>
7
  <Mage_Shipping />
8
  <Mage_Sales />
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Chronopost</name>
4
- <version>0.1.6</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
@@ -12,9 +12,9 @@
12
  Afin de vous accompagner dans le d&#xE9;veloppement des sites e-marchands sur la plateforme Magento, vous trouverez dans le module Chronopost un package de solutions :&#x2013; La g&#xE9;olocalisation des points Chrono Relais&#x2013; Le calcul du co&#xFB;t du transport (via logiciel QuickCost)&#x2013; Le suivi int&#xE9;gr&#xE9;&#x2013; Le choix entre 3 solutions possibles d&#x2019;&#xE9;tiquetage des envois selon les besoins de l&#x2019;e-commer&#xE7;antTest&#xE9; et valid&#xE9; sur Magento 1.4 et.1.5--&gt; Un manuel d'installation est &#xE0; votre disposition dans la partie 'Docs' afin de vous guider dans l'installation du module. (A lire imp&#xE9;rativement)ATTENTION : Pour toutes mise en production du module Chronopost, un contrat avec Chronopost est n&#xE9;cessaire. Si vous n&#x2019;avez pas de contrat merci de prendre contact &#xE0; l&#x2019;adresse suivante : mychrono@chronopost.fr</description>
13
  <notes>New shipping module</notes>
14
  <authors><author><name>Benjamin GOSSELET</name><user>auto-converted</user><email>chronopost@adexos.fr</email></author></authors>
15
- <date>2011-09-02</date>
16
- <time>20:16:54</time>
17
- <contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="chronorelais"><dir name="import"><file name="form.phtml" hash="356aadf2bb0182b23f7af38888a0cd38"/></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="chronorelais.xml" hash="054fa1c126747c9c24c9c87057fa2c35"/></dir><dir name="template"><dir name="chronorelais"><dir name="checkout"><dir name="onepage"><dir name="shipping_method"><file name="available.phtml" hash="7377a159a92db28c30f86ad52921a5b0"/><file name="chronorelais.phtml" hash="066b7b46e68ab109c497ac167d8cd333"/></dir><file name="shipping_method.phtml" hash="4f084424b6dcdb187753f09357f46898"/></dir></dir><dir name="sales"><dir name="order"><file name="history.phtml" hash="f95a1860a4cf463f6fca48273cc45eaf"/><file name="recent.phtml" hash="8045fbbe75510efc55da31455d2cc47a"/></dir></dir></dir></dir></dir></dir></dir></target><target name="magecommunity"><dir name="Chronopost"><dir name="Chronorelais"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Config.php" hash="b38741ddd97fcae5dd276239fb3c6b70"/></dir></dir></dir></dir></dir><dir name="Checkout"><dir name="Onepage"><dir name="Shipping"><dir name="Method"><file name="Chronorelais.php" hash="c4d908310310e4cd90833378df260599"/></dir></dir></dir></dir><dir name="Export"><dir name="Orders"><file name="Grid.php" hash="d79a797a01c1e7405d78fa08a1cd8805"/></dir><file name="Orders.php" hash="9ada10bd85cb58122e722b3e82c71e37"/></dir><dir name="Import"><file name="Form.php" hash="56c6e3787c05e58d57b48ec4b1421468"/></dir><dir name="Sales"><dir name="Order"><dir name="Shipment"><file name="View.php" hash="f5407d7d14aa59acb844479da5046900"/></dir></dir><dir name="Shipment"><file name="Copy of Grid.php" hash="f72d35dcf2b3be9d8d5f24342c0633f4"/><file name="Grid-bkp-03-02-11.php" hash="e3b798fa5259cca5e9d3a08a75fb3f76"/><file name="Grid.php" hash="ffdfa3caf30f292211f4a7c65b54a866"/></dir><file name="Impression.php" hash="619599b136b9cc49f01dba5b08ee8428"/></dir><file name="Detail.php" hash="005fa3b6e5918c6c9779402fab5713f2"/><file name="Filter.php" hash="28f80e3ab34f6ff03b61f070ccbac697"/></dir><dir name="Controller"><file name="Abstract.php" hash="94680cd88c6af59764dedb613b08d5f6"/></dir><dir name="controllers"><dir name="Checkout"><file name="OnepageController.php" hash="180def68d8f23900be5bb3f5f2214fc3"/></dir><dir name="Sales"><dir name="Order"><file name="ShipmentController.php" hash="748e773c4558f24f1cf54e462fa24a88"/></dir><file name="ImpressionController.php" hash="a5692a173c2c941f2ab8c8bef02a6ddd"/></dir><file name="AjaxController.php" hash="1905b32a1366d3c27277836364737e98"/><file name="ExportController.php" hash="8fbffc0b31a55ac422a52e5972c05b01"/><file name="ImportController.php" hash="f2a840c80d8a2c267a20950b7d11e42f"/><file name="RelaisController.php" hash="5d48155ddb7cc2d4effbbfdeb4f3946d"/></dir><dir name="etc"><file name="config.xml" hash="ec6b770de30384e9f1dd41dc15fa5101"/><file name="system.xml" hash="024697b3c6f3808ef1f89d44bd422a72"/></dir><dir name="Helper"><file name="Data.php" hash="70531f8f903a63986c063f65553d643d"/></dir><dir name="includes"><file name="ChronorelaisShippingHelper.php" hash="9a3aa6bb5b3846102d78450d76c93fdf"/><file name="countries.inc.php" hash="d21cd393c7c0ebc83beccc99950d6ab1"/></dir><dir name="Model"><dir name="Carrier"><file name="AbstractChronorelais.php" hash="f4957f6d660c4adb0328f9f2d73da1e2"/><file name="AbstractChronorelaisShipping.php" hash="edd5adbd2af7c5ad48ca8843d96d3866"/><file name="Chronoexpress.php" hash="bc867a6b98966ada549a0b81ec334b64"/><file name="Chronopost.php" hash="c4d4525447d2801d28d921eaedc35a9a"/><file name="Chronorelais.php" hash="5cfcb83c23d05585fdc50f8b2747fc40"/></dir><dir name="Config"><dir name="Source"><file name="Civility.php" hash="fe6ec6eebe6faffdd0bb65479d91cd5d"/><file name="EndOfLineCharacter.php" hash="3fe6b6069a9efdc29ad0d3f7d1cf4794"/><file name="FieldDelimiter.php" hash="3e023d40aeca50932e62ff97eed6317e"/><file name="FieldSeparator.php" hash="ce30c5974a893bd5467334d574dd578a"/><file name="FileCharset.php" hash="6cc4ebab95735bd121af16e0eedd90d6"/><file name="FileExtension.php" hash="597c3e78e7584bf7c4b7b2ebad6d2a65"/><file name="PrintMode.php" hash="67e8a6e98e12c7e72624ba5322076c00"/></dir></dir><dir name="Sales"><dir name="Quote"><dir name="Address"><dir name="Total"><file name="Shipping.php" hash="2e69db363011f84ef2cdb5d0e9d4c4df"/></dir></dir></dir></dir></dir><dir name="sql"><dir name="chronorelais_setup"><file name="mysql4-install-0.1.0.php" hash="c307802a7bd10c1ecce06799b04569c2"/><file name="mysql4-upgrade-0.1.0-0.1.1.php" hash="ea3358055a851a96b673c721202045be"/><file name="mysql4-upgrade-0.1.1-0.1.2.php" hash="961f41dc1012d0917504f9bb5f5d106c"/><file name="mysql4-upgrade-0.1.2-0.1.3.php" hash="b85470889421f652c3d01b96072f579c"/><file name="mysql4-upgrade-0.1.3-0.1.4.php" hash="def69d0ae26b0d130d2ce6e0838e5d7f"/></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Chronopost_Chronorelais.csv" hash="351140a6ab727666e06cc7fe5d28c1b0"/></dir><dir name="fr_FR"><file name="Chronopost_Chronorelais.csv" hash="723a027f77a05e598cefe3c522bd5c0c"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="default"><dir name="default"><dir name="chronorelais"><file name="ac.png" hash="0c04f70da35d43a2636cfbd6ad2b10d5"/><file name="chronopost.png" hash="93e5b22e2f280923df8d503f5c8e5b92"/><file name="chronorelais.css" hash="990db2d6f277650fb487161bcf4b0eb5"/><file name="chronorelais.png" hash="0383895b061b4a1210f9435fcf3a726a"/><file name="chronorelaismap.js" hash="41d3d363b046ed8ad5ff6a799341a507"/><file name="home.png" hash="7904b495e94047eb3406e260bc660cce"/><file name="ico_ac_shaded.gif" hash="e55d9b2071fb976cf5331b6273a40731"/><file name="Picto_Chrono_Relais.png" hash="1ea0f0c410d237adf23d5905cd8431f5"/><file name="Thumbs.db" hash="2e16ed23c37d1aa29a6caf73f513a648"/></dir></dir></dir></dir></target><target name="mage"><dir name="js"><dir name="chronopost"><dir name="chronorelais"><file name="ocseditor.css" hash="1bfc847153768d6729cdad7cb1abe443"/><file name="ocseditor.js" hash="8b7f29ddf7faff2fd3a63af18ba666aa"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="WSChronopost_Chronorelais.xml" hash="e614759d6b46c0c25f6c26d6e9dff45a"/></dir></target></contents>
18
  <compatible/>
19
  <dependencies/>
20
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Chronopost</name>
4
+ <version>0.1.7</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
12
  Afin de vous accompagner dans le d&#xE9;veloppement des sites e-marchands sur la plateforme Magento, vous trouverez dans le module Chronopost un package de solutions :&#x2013; La g&#xE9;olocalisation des points Chrono Relais&#x2013; Le calcul du co&#xFB;t du transport (via logiciel QuickCost)&#x2013; Le suivi int&#xE9;gr&#xE9;&#x2013; Le choix entre 3 solutions possibles d&#x2019;&#xE9;tiquetage des envois selon les besoins de l&#x2019;e-commer&#xE7;antTest&#xE9; et valid&#xE9; sur Magento 1.4 et.1.5--&gt; Un manuel d'installation est &#xE0; votre disposition dans la partie 'Docs' afin de vous guider dans l'installation du module. (A lire imp&#xE9;rativement)ATTENTION : Pour toutes mise en production du module Chronopost, un contrat avec Chronopost est n&#xE9;cessaire. Si vous n&#x2019;avez pas de contrat merci de prendre contact &#xE0; l&#x2019;adresse suivante : mychrono@chronopost.fr</description>
13
  <notes>New shipping module</notes>
14
  <authors><author><name>Benjamin GOSSELET</name><user>auto-converted</user><email>chronopost@adexos.fr</email></author></authors>
15
+ <date>2011-09-27</date>
16
+ <time>14:31:00</time>
17
+ <contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="chronorelais"><dir name="import"><file name="form.phtml" hash="356aadf2bb0182b23f7af38888a0cd38"/></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="chronorelais.xml" hash="054fa1c126747c9c24c9c87057fa2c35"/></dir><dir name="template"><dir name="chronorelais"><dir name="checkout"><dir name="onepage"><dir name="shipping_method"><file name="available.phtml" hash="7377a159a92db28c30f86ad52921a5b0"/><file name="chronorelais.phtml" hash="066b7b46e68ab109c497ac167d8cd333"/></dir><file name="shipping_method.phtml" hash="4f084424b6dcdb187753f09357f46898"/></dir></dir><dir name="sales"><dir name="order"><file name="history.phtml" hash="f95a1860a4cf463f6fca48273cc45eaf"/><file name="recent.phtml" hash="8045fbbe75510efc55da31455d2cc47a"/></dir></dir></dir></dir></dir></dir></dir></target><target name="magecommunity"><dir name="Chronopost"><dir name="Chronorelais"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Config.php" hash="b38741ddd97fcae5dd276239fb3c6b70"/></dir></dir></dir></dir></dir><dir name="Checkout"><dir name="Onepage"><dir name="Shipping"><dir name="Method"><file name="Chronorelais.php" hash="c4d908310310e4cd90833378df260599"/></dir></dir></dir></dir><dir name="Export"><dir name="Orders"><file name="Grid.php" hash="d79a797a01c1e7405d78fa08a1cd8805"/></dir><file name="Orders.php" hash="9ada10bd85cb58122e722b3e82c71e37"/></dir><dir name="Import"><file name="Form.php" hash="56c6e3787c05e58d57b48ec4b1421468"/></dir><dir name="Sales"><dir name="Order"><dir name="Shipment"><file name="View.php" hash="f5407d7d14aa59acb844479da5046900"/></dir></dir><dir name="Shipment"><file name="Copy of Grid.php" hash="f72d35dcf2b3be9d8d5f24342c0633f4"/><file name="Grid-bkp-03-02-11.php" hash="e3b798fa5259cca5e9d3a08a75fb3f76"/><file name="Grid.php" hash="ffdfa3caf30f292211f4a7c65b54a866"/></dir><file name="Impression.php" hash="619599b136b9cc49f01dba5b08ee8428"/></dir><file name="Detail.php" hash="005fa3b6e5918c6c9779402fab5713f2"/><file name="Filter.php" hash="28f80e3ab34f6ff03b61f070ccbac697"/></dir><dir name="Controller"><file name="Abstract.php" hash="94680cd88c6af59764dedb613b08d5f6"/></dir><dir name="controllers"><dir name="Checkout"><file name="OnepageController.php" hash="180def68d8f23900be5bb3f5f2214fc3"/></dir><dir name="Sales"><dir name="Order"><file name="ShipmentController.php" hash="748e773c4558f24f1cf54e462fa24a88"/></dir><file name="ImpressionController.php" hash="a5692a173c2c941f2ab8c8bef02a6ddd"/></dir><file name="AjaxController.php" hash="1905b32a1366d3c27277836364737e98"/><file name="ExportController.php" hash="8fbffc0b31a55ac422a52e5972c05b01"/><file name="ImportController.php" hash="f2a840c80d8a2c267a20950b7d11e42f"/><file name="RelaisController.php" hash="5d48155ddb7cc2d4effbbfdeb4f3946d"/></dir><dir name="etc"><file name="config.xml" hash="587ae8c22564a2d9edac1247425fff84"/><file name="system.xml" hash="024697b3c6f3808ef1f89d44bd422a72"/></dir><dir name="Helper"><file name="Data.php" hash="70531f8f903a63986c063f65553d643d"/></dir><dir name="includes"><file name="ChronorelaisShippingHelper.php" hash="9a3aa6bb5b3846102d78450d76c93fdf"/><file name="countries.inc.php" hash="d21cd393c7c0ebc83beccc99950d6ab1"/></dir><dir name="Model"><dir name="Carrier"><file name="AbstractChronorelais.php" hash="f4957f6d660c4adb0328f9f2d73da1e2"/><file name="AbstractChronorelaisShipping.php" hash="1adab13f3659559803b338ad86205d43"/><file name="Chronoexpress.php" hash="bc867a6b98966ada549a0b81ec334b64"/><file name="Chronopost.php" hash="c4d4525447d2801d28d921eaedc35a9a"/><file name="Chronorelais.php" hash="5cfcb83c23d05585fdc50f8b2747fc40"/></dir><dir name="Config"><dir name="Source"><file name="Civility.php" hash="fe6ec6eebe6faffdd0bb65479d91cd5d"/><file name="EndOfLineCharacter.php" hash="3fe6b6069a9efdc29ad0d3f7d1cf4794"/><file name="FieldDelimiter.php" hash="3e023d40aeca50932e62ff97eed6317e"/><file name="FieldSeparator.php" hash="ce30c5974a893bd5467334d574dd578a"/><file name="FileCharset.php" hash="6cc4ebab95735bd121af16e0eedd90d6"/><file name="FileExtension.php" hash="597c3e78e7584bf7c4b7b2ebad6d2a65"/><file name="PrintMode.php" hash="67e8a6e98e12c7e72624ba5322076c00"/></dir></dir><dir name="Sales"><dir name="Quote"><dir name="Address"><dir name="Total"><file name="Shipping.php" hash="2e69db363011f84ef2cdb5d0e9d4c4df"/></dir></dir></dir></dir></dir><dir name="sql"><dir name="chronorelais_setup"><file name="mysql4-install-0.1.0.php" hash="c307802a7bd10c1ecce06799b04569c2"/><file name="mysql4-upgrade-0.1.0-0.1.1.php" hash="ea3358055a851a96b673c721202045be"/><file name="mysql4-upgrade-0.1.1-0.1.2.php" hash="961f41dc1012d0917504f9bb5f5d106c"/><file name="mysql4-upgrade-0.1.2-0.1.3.php" hash="b85470889421f652c3d01b96072f579c"/><file name="mysql4-upgrade-0.1.3-0.1.4.php" hash="def69d0ae26b0d130d2ce6e0838e5d7f"/></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Chronopost_Chronorelais.csv" hash="351140a6ab727666e06cc7fe5d28c1b0"/></dir><dir name="fr_FR"><file name="Chronopost_Chronorelais.csv" hash="723a027f77a05e598cefe3c522bd5c0c"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="default"><dir name="default"><dir name="chronorelais"><file name="ac.png" hash="0c04f70da35d43a2636cfbd6ad2b10d5"/><file name="chronopost.png" hash="93e5b22e2f280923df8d503f5c8e5b92"/><file name="chronorelais.css" hash="990db2d6f277650fb487161bcf4b0eb5"/><file name="chronorelais.png" hash="0383895b061b4a1210f9435fcf3a726a"/><file name="chronorelaismap.js" hash="41d3d363b046ed8ad5ff6a799341a507"/><file name="home.png" hash="7904b495e94047eb3406e260bc660cce"/><file name="ico_ac_shaded.gif" hash="e55d9b2071fb976cf5331b6273a40731"/><file name="Picto_Chrono_Relais.png" hash="1ea0f0c410d237adf23d5905cd8431f5"/><file name="Thumbs.db" hash="2e16ed23c37d1aa29a6caf73f513a648"/></dir></dir></dir></dir></target><target name="mage"><dir name="js"><dir name="chronopost"><dir name="chronorelais"><file name="ocseditor.css" hash="1bfc847153768d6729cdad7cb1abe443"/><file name="ocseditor.js" hash="8b7f29ddf7faff2fd3a63af18ba666aa"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="WSChronopost_Chronorelais.xml" hash="e614759d6b46c0c25f6c26d6e9dff45a"/></dir></target></contents>
18
  <compatible/>
19
  <dependencies/>
20
  </package>