Owebia_Shipping_2 - Version 2.4.7

Version Notes

[2.4.7 - 20 mars 2012]
Correction du code PHP pour supprimer des erreurs E_STRICT

Download this release

Release Info

Developer Magento Core Team
Extension Owebia_Shipping_2
Version 2.4.7
Comparing to
See all releases


Code changes from version 2.4.6 to 2.4.7

Files changed (5) hide show
  1. app/code/community/Owebia/Shipping2/Model/Carrier/AbstractOwebiaShipping.php +4 -2
  2. app/code/community/Owebia/Shipping2/changelog +3 -0
  3. app/code/community/Owebia/Shipping2/etc/config.xml +1 -1
  4. app/code/community/Owebia/Shipping2/includes/OwebiaShippingHelper.php +5 -8
  5. package.xml +6 -13
app/code/community/Owebia/Shipping2/Model/Carrier/AbstractOwebiaShipping.php CHANGED
@@ -354,7 +354,9 @@ abstract class Owebia_Shipping2_Model_Carrier_AbstractOwebiaShipping extends Mag
354
  }
355
 
356
  public function getTrackingInfo($tracking_number) {
357
- $tracking_url = $this->__getConfigData('tracking_view_url');
 
 
358
  $parts = explode(':',$tracking_number);
359
  if (count($parts)>=2) {
360
  $tracking_number = $parts[1];
@@ -375,7 +377,7 @@ abstract class Owebia_Shipping2_Model_Carrier_AbstractOwebiaShipping extends Mag
375
  ->setTracking($tracking_number)
376
  ->addData(
377
  array(
378
- 'status'=>'<a target="_blank" href="'.str_replace('{tracking_number}',$tracking_number,$tracking_url).'">'.__('track the package').'</a>'
379
  )
380
  )
381
  ;
354
  }
355
 
356
  public function getTrackingInfo($tracking_number) {
357
+ $original_tracking_number = $tracking_number;
358
+ $global_tracking_url = $this->__getConfigData('tracking_view_url');
359
+ $tracking_url = $global_tracking_url;
360
  $parts = explode(':',$tracking_number);
361
  if (count($parts)>=2) {
362
  $tracking_number = $parts[1];
377
  ->setTracking($tracking_number)
378
  ->addData(
379
  array(
380
+ 'status'=> $tracking_url ? '<a target="_blank" href="'.str_replace('{tracking_number}',$tracking_number,$tracking_url).'">'.__('track the package').'</a>' : "suivi non disponible pour le colis {$tracking_number} (original_tracking_number='{$original_tracking_number}', global_tracking_url='{$global_tracking_url}'".(isset($row) ? ", tmp_tracking_url='{$tmp_tracking_url}'" : '').")"
381
  )
382
  )
383
  ;
app/code/community/Owebia/Shipping2/changelog CHANGED
@@ -1,3 +1,6 @@
 
 
 
1
  [2.4.6 - 19 janvier 2012]
2
  Correction d'un bug dans l'utilisation de la fonction {table ... in ...} : lorsque la variable de r�f�rence est ind�finie, le r�sultat �tait invalide (valeur pr�c�dente de la variable $replacement)
3
  Correction d'un probl�me avec les produits packag�s (bundle product) : les produits 'bundle' et les produits 'simple' �taient tous deux r�cup�r�s ce qui faussait les r�sultats
1
+ [2.4.7 - 20 mars 2012]
2
+ Correction du code PHP pour supprimer des erreurs E_STRICT
3
+
4
  [2.4.6 - 19 janvier 2012]
5
  Correction d'un bug dans l'utilisation de la fonction {table ... in ...} : lorsque la variable de r�f�rence est ind�finie, le r�sultat �tait invalide (valeur pr�c�dente de la variable $replacement)
6
  Correction d'un probl�me avec les produits packag�s (bundle product) : les produits 'bundle' et les produits 'simple' �taient tous deux r�cup�r�s ce qui faussait les r�sultats
app/code/community/Owebia/Shipping2/etc/config.xml CHANGED
@@ -22,7 +22,7 @@
22
  <config>
23
  <modules>
24
  <Owebia_Shipping2>
25
- <version>2.4.5</version>
26
  <depends>
27
  <Mage_Shipping />
28
  </depends>
22
  <config>
23
  <modules>
24
  <Owebia_Shipping2>
25
+ <version>2.4.7</version>
26
  <depends>
27
  <Mage_Shipping />
28
  </depends>
app/code/community/Owebia/Shipping2/includes/OwebiaShippingHelper.php CHANGED
@@ -51,7 +51,7 @@ class OwebiaShippingHelper
51
  '{s.',
52
  );
53
 
54
- public function toString($value) {
55
  if (!isset($value)) return 'null';
56
  else if (is_bool($value)) return $value ? 'true' : 'false';
57
  else if (is_float($value)) return str_replace(',', '.', (string)$value); // To avoid locale problems
@@ -123,20 +123,17 @@ class OwebiaShippingHelper
123
  }
124
 
125
  protected $_input;
126
- protected $_config;
127
- protected $_messages;
128
- protected $_formula_cache;
129
- protected $_expression_cache;
130
  public $debug_code = null;
131
  public $debug_output = '';
132
  public $debug_header = null;
133
  protected $debug_prefix = '';
134
 
135
  public function __construct($input) {
136
- $this->_formula_cache = array();
137
- $this->_messages = array();
138
  $this->_input = $input;
139
- $this->_config = array();
140
  $this->_parseInput();
141
  }
142
 
51
  '{s.',
52
  );
53
 
54
+ public static function toString($value) {
55
  if (!isset($value)) return 'null';
56
  else if (is_bool($value)) return $value ? 'true' : 'false';
57
  else if (is_float($value)) return str_replace(',', '.', (string)$value); // To avoid locale problems
123
  }
124
 
125
  protected $_input;
126
+ protected $_config = array();
127
+ protected $_messages = array();
128
+ protected $_formula_cache = array();
129
+ protected $_expression_cache = array();
130
  public $debug_code = null;
131
  public $debug_output = '';
132
  public $debug_header = null;
133
  protected $debug_prefix = '';
134
 
135
  public function __construct($input) {
 
 
136
  $this->_input = $input;
 
137
  $this->_parseInput();
138
  }
139
 
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Owebia_Shipping_2</name>
4
- <version>2.4.6</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/MIT">The MIT License (MIT)</license>
7
  <channel>community</channel>
@@ -10,19 +10,12 @@
10
  <description>[EN] This module provides 3 shipping modes configurable with a very flexible syntax. The first method of delivery allows by default the management of Colissimo, Chronopost and Export 3J.
11
 
12
  [FR] Ce module met &#xE0; disposition 3 modes de livraison configurables avec une syntaxe tr&#xE8;s souple. Le premier mode de livraison permet par d&#xE9;faut la gestion des modes de livraison Colissimo, Chronopost et Export 3J.</description>
13
- <notes>[2.4.6 - 19 janvier 2012]
14
- Correction d'un bug dans l'utilisation de la fonction {table ... in ...} : lorsque la variable de r&#xE9;f&#xE9;rence est ind&#xE9;finie, le r&#xE9;sultat &#xE9;tait invalide (valeur pr&#xE9;c&#xE9;dente de la variable $replacement)
15
- Correction d'un probl&#xE8;me avec les produits packag&#xE9;s (bundle product) : les produits 'bundle' et les produits 'simple' &#xE9;taient tous deux r&#xE9;cup&#xE9;r&#xE9;s ce qui faussait les r&#xE9;sultats
16
- Support des sets d'attributs
17
- product.attribute_set dans les conditions de boucle foreach
18
- {product.attribute_set} et {product.attribute_set.id} comme variables dans les boucles foreach
19
- product.attribute_set, product.attribute_set.id dans les conditions des op&#xE9;rations sum, count, min et max
20
- Optimisation du chargement de certaines valeurs (cat&#xE9;gories, attribute set, ...)
21
- Correction d'un probl&#xE8;me avec les castings successifs (string), (float) qui posent probl&#xE8;me lorsque la locale utilise la virgule comme s&#xE9;parateur de d&#xE9;cimales</notes>
22
  <authors><author><name>owebia</name><user>auto-converted</user><email>antoine.lemoine@owebia.com</email></author></authors>
23
- <date>2012-01-19</date>
24
- <time>15:51:25</time>
25
- <contents><target name="magelocale"><dir name="en_US"><file name="Owebia_Shipping2.csv" hash="4e8a3f8dafc61de2e0286ce81ea57c0c"/></dir><dir name="fr_FR"><file name="Owebia_Shipping2.csv" hash="f42f7e4b27b254a18ea11799cea6aac6"/></dir></target><target name="mage"><dir name="js"><dir name="owebia"><dir name="shipping2"><file name="os2editor.css" hash="56bf6537741dec42f2d23883477ad1b7"/><file name="os2editor.js" hash="83f8726e9d8dc2edf8f9f00bb29d9045"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Owebia_Shipping2.xml" hash="586171bce13c5fb46298a7033f62bab6"/><file name="Owebia_Shipping_2.xml" hash="2f84a53934b37c860e25bc0c6217467f"/></dir></target><target name="magecommunity"><dir name="Owebia"><dir name="Shipping2"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Config.php" hash="7b274b9050875d714274531a3d7f0f53"/></dir></dir></dir></dir></dir></dir><dir name="Controller"><file name="Abstract.php" hash="9ddc7de1f825a865765faac63b065308"/></dir><dir name="controllers"><dir name="Checkout"><file name="CartController.php" hash="8c6ee136298e0e2dd0052143887282ce"/></dir><file name="AjaxController.php" hash="d033c5b278d6cb8e6e774a3c9873a2be"/></dir><dir name="etc"><file name="adminhtml.xml" hash="be7b084254925764ad58959c953d1a84"/><file name="config.xml" hash="da4e7dbab55a40a740b15a6b3de7c560"/><file name="system.xml" hash="03b293e729e515687335fc0a2192a628"/></dir><dir name="includes"><dir name="cache"><file name="countries" hash="6b1a5494b6dddcc65f2946dbf0226c29"/></dir><file name="OS2_AddressFilter.php" hash="fc94ad7b41dcac2bece6ae32cf2d56f1"/><file name="OS2_CustomerGroup.php" hash="17e2ef78299cc3fef9233315cb6eb2a6"/><file name="OwebiaShippingHelper.php" hash="ce0871c59c7424d0a4132ea3bb419531"/></dir><dir name="Model"><dir name="Carrier"><file name="AbstractOwebiaShipping.php" hash="c2ba9bbfa304229c830ecd0f2f3c1770"/><file name="OwebiaShipping1.php" hash="72a7cf31f9341a186169667ed33c525f"/><file name="OwebiaShipping2.php" hash="cb61efb5d144bf20aada0ea9faebbcb5"/><file name="OwebiaShipping3.php" hash="8da3a9e93a85083fd0f7d050991539be"/></dir></dir><file name="changelog" hash="ca18abfd6c265094b53bc60f88e4da83"/></dir></dir></target></contents>
26
  <compatible/>
27
  <dependencies/>
28
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Owebia_Shipping_2</name>
4
+ <version>2.4.7</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/MIT">The MIT License (MIT)</license>
7
  <channel>community</channel>
10
  <description>[EN] This module provides 3 shipping modes configurable with a very flexible syntax. The first method of delivery allows by default the management of Colissimo, Chronopost and Export 3J.
11
 
12
  [FR] Ce module met &#xE0; disposition 3 modes de livraison configurables avec une syntaxe tr&#xE8;s souple. Le premier mode de livraison permet par d&#xE9;faut la gestion des modes de livraison Colissimo, Chronopost et Export 3J.</description>
13
+ <notes>[2.4.7 - 20 mars 2012]
14
+ Correction du code PHP pour supprimer des erreurs E_STRICT</notes>
 
 
 
 
 
 
 
15
  <authors><author><name>owebia</name><user>auto-converted</user><email>antoine.lemoine@owebia.com</email></author></authors>
16
+ <date>2012-03-20</date>
17
+ <time>13:19:16</time>
18
+ <contents><target name="magelocale"><dir name="en_US"><file name="Owebia_Shipping2.csv" hash="4e8a3f8dafc61de2e0286ce81ea57c0c"/></dir><dir name="fr_FR"><file name="Owebia_Shipping2.csv" hash="f42f7e4b27b254a18ea11799cea6aac6"/></dir></target><target name="mage"><dir name="js"><dir name="owebia"><dir name="shipping2"><file name="os2editor.css" hash="56bf6537741dec42f2d23883477ad1b7"/><file name="os2editor.js" hash="83f8726e9d8dc2edf8f9f00bb29d9045"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Owebia_Shipping2.xml" hash="586171bce13c5fb46298a7033f62bab6"/><file name="Owebia_Shipping_2.xml" hash="2f84a53934b37c860e25bc0c6217467f"/></dir></target><target name="magecommunity"><dir name="Owebia"><dir name="Shipping2"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Config.php" hash="7b274b9050875d714274531a3d7f0f53"/></dir></dir></dir></dir></dir></dir><dir name="Controller"><file name="Abstract.php" hash="9ddc7de1f825a865765faac63b065308"/></dir><dir name="controllers"><dir name="Checkout"><file name="CartController.php" hash="8c6ee136298e0e2dd0052143887282ce"/></dir><file name="AjaxController.php" hash="d033c5b278d6cb8e6e774a3c9873a2be"/></dir><dir name="etc"><file name="adminhtml.xml" hash="be7b084254925764ad58959c953d1a84"/><file name="config.xml" hash="720543dbb65e796941fd4995b3ec71fb"/><file name="system.xml" hash="03b293e729e515687335fc0a2192a628"/></dir><dir name="includes"><dir name="cache"><file name="countries" hash="6b1a5494b6dddcc65f2946dbf0226c29"/></dir><file name="OS2_AddressFilter.php" hash="fc94ad7b41dcac2bece6ae32cf2d56f1"/><file name="OS2_CustomerGroup.php" hash="17e2ef78299cc3fef9233315cb6eb2a6"/><file name="OwebiaShippingHelper.php" hash="95104c45f3b49ef8d2cf91e9f954902b"/></dir><dir name="Model"><dir name="Carrier"><file name="AbstractOwebiaShipping.php" hash="093a9dc858be2fa29108527e3d18a4b7"/><file name="OwebiaShipping1.php" hash="72a7cf31f9341a186169667ed33c525f"/><file name="OwebiaShipping2.php" hash="cb61efb5d144bf20aada0ea9faebbcb5"/><file name="OwebiaShipping3.php" hash="8da3a9e93a85083fd0f7d050991539be"/></dir></dir><file name="changelog" hash="f3f7e4f83c4a35d64ef5f3ac80bb438c"/></dir></dir></target></contents>
19
  <compatible/>
20
  <dependencies/>
21
  </package>