Version Notes
[2.5.15 - 07 juin 2014]
Remplacement de static:: par self:: pour une rétro-compatibilité avec PHP < 5.3
Download this release
Release Info
Developer | Magento Core Team |
Extension | Owebia_Shipping_2 |
Version | 2.5.15 |
Comparing to | |
See all releases |
Code changes from version 2.5.14 to 2.5.15
app/code/community/Owebia/Shipping2/changelog
CHANGED
@@ -1,3 +1,6 @@
|
|
|
|
|
|
|
|
1 |
[2.5.14 - 26 mai 2014]
|
2 |
Correction des retours lignes dans 3 fichiers : CR => CRLF (merci � Christophe S.)
|
3 |
Correction d'un bug avec l'utilisation des expressions r�guli�res et des caract�res joker dans le filtrage des adresses (merci � Alexis A., Morgan R., Maxime L.)
|
1 |
+
[2.5.15 - 07 juin 2014]
|
2 |
+
Remplacement de static:: par self:: pour une r�tro-compatibilit� avec PHP < 5.3
|
3 |
+
|
4 |
[2.5.14 - 26 mai 2014]
|
5 |
Correction des retours lignes dans 3 fichiers : CR => CRLF (merci � Christophe S.)
|
6 |
Correction d'un bug avec l'utilisation des expressions r�guli�res et des caract�res joker dans le filtrage des adresses (merci � Alexis A., Morgan R., Maxime L.)
|
app/code/community/Owebia/Shipping2/includes/OwebiaShippingHelper.php
CHANGED
@@ -204,7 +204,7 @@ class OwebiaShippingHelper
|
|
204 |
|
205 |
public static function escapeString($input)
|
206 |
{
|
207 |
-
return
|
208 |
}
|
209 |
|
210 |
protected $_input;
|
@@ -1183,11 +1183,11 @@ class OwebiaShippingHelper
|
|
1183 |
if (is_array($input)) {
|
1184 |
$items = array();
|
1185 |
foreach ($input as $v) {
|
1186 |
-
$items[] = isset($v) && (is_string($v) || empty($v)) ?
|
1187 |
}
|
1188 |
return 'array('.join(',', $items).')';
|
1189 |
} else {
|
1190 |
-
return isset($input) && (is_string($input)/* || empty($input)*/) ?
|
1191 |
}
|
1192 |
}
|
1193 |
|
204 |
|
205 |
public static function escapeString($input)
|
206 |
{
|
207 |
+
return self::json_encode($input);
|
208 |
}
|
209 |
|
210 |
protected $_input;
|
1183 |
if (is_array($input)) {
|
1184 |
$items = array();
|
1185 |
foreach ($input as $v) {
|
1186 |
+
$items[] = isset($v) && (is_string($v) || empty($v)) ? self::escapeString($v) : self::toString($v);
|
1187 |
}
|
1188 |
return 'array('.join(',', $items).')';
|
1189 |
} else {
|
1190 |
+
return isset($input) && (is_string($input)/* || empty($input)*/) ? self::escapeString($input) : self::toString($input);
|
1191 |
}
|
1192 |
}
|
1193 |
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Owebia_Shipping_2</name>
|
4 |
-
<version>2.5.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.opensource.org/licenses/MIT">The MIT License (MIT)</license>
|
7 |
<channel>community</channel>
|
@@ -10,17 +10,12 @@
|
|
10 |
<description>[EN] This module provides 3 shipping modes configurable with a very flexible syntax.
|
11 |

|
12 |
[FR] Ce module met à disposition 3 modes de livraison configurables avec une syntaxe très souple.</description>
|
13 |
-
<notes>[2.5.
|
14 |
-
|
15 |
-
Correction d'un bug avec l'utilisation des expressions régulières et des caractères joker dans le filtrage des adresses (merci à Alexis A., Morgan R., Maxime L.)
|
16 |
-
Correction d'un bug dans le calcul de la valeur {cart.price+tax+discount}
|
17 |
-
Correction d'un bug dans la récupération de la session (merci à Gabriel F.)
|
18 |
-
Support des nombres au format 2.04e2 avec le e en minuscule (merci à Morgan R.)
|
19 |
-
Ajout de la possibilité d'avoir des espaces, des virgules et des tirets dans le nom des codes région en entourant les valeurs par des guillemets (ne pas oublier de les échapper si nécessaire)</notes>
|
20 |
<authors><author><name>owebia</name><user>auto-converted</user><email>antoine.lemoine@owebia.com</email></author></authors>
|
21 |
-
<date>2014-
|
22 |
-
<time>
|
23 |
-
<contents><target name="magecommunity"><dir name="Owebia"><dir name="Shipping2"><dir name="Block"><dir name="Adminhtml"><dir name="Os2"><dir name="Editor"><dir name="Property"><file name="Input.php" hash="3d6cbadd3f93b7456c07aea93e95c351"/></dir></dir><file name="Editor.php" hash="e7e687f1777024f59905ff7c294240b2"/><file name="Help.php" hash="2344a81adf3ef3cb4de7bef0254fc91b"/></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Config.php" hash="a8fa16d6fbe0040dbe3f82a5d35c3549"/><file name="Informations.php" hash="8cc48900c8d21eb1f6da4e4c81022707"/></dir></dir></dir></dir></dir></dir><dir name="Controller"><file name="Abstract.php" hash="271c15e20d257ff8852149728cbf1625"/></dir><dir name="Helper"><file name="Data.php" hash="09d2c0209a5db7af579ecc1b73cd3843"/></dir><dir name="Model"><dir name="Carrier"><file name="Abstract.php" hash="e99b2ee4aefaa3ccf63873c590c1a644"/><file name="OwebiaShipping1.php" hash="0c6ef06ce84e8af21d1c44480af6391b"/><file name="OwebiaShipping2.php" hash="b9696696be13ee5f284b705cf2adb3d2"/><file name="OwebiaShipping3.php" hash="d8c488dda9ab5adf835d9a2bea169b3c"/><file name="OwebiaShipping4.php" hash="d19c02368763dea101dc33dae7abad41"/></dir><dir name="Mysql4"><file name="Setup.php" hash="aa7ede8eb6c0cf2c36a8f0bbff447165"/></dir><dir name="Os2"><dir name="Data"><file name="Abstract.php" hash="7de45e45599f1a21e7a76aed4a326e8d"/><file name="AbstractWithAttributes.php" hash="53296361d4c5b793db565c9617537f1d"/><file name="Address.php" hash="152f918ee67fa1127b7f5c72f7b6ff7c"/><file name="AddressFilter.php" hash="2d6bff3709ac903b4fd02c9af1afb820"/><file name="AttributeSet.php" hash="c2871abf3d8fdf0c5d8c820fd3f2d0c3"/><file name="Billto.php" hash="21cd103dcf3deeb1c1e9113569e9fff9"/><file name="Cart.php" hash="0b829d168d5e692e34a998c7eff02655"/><file name="CartItem.php" hash="291de4e670969f904b4e597e31c87e4c"/><file name="Category.php" hash="9976b5038f13c6f725816eadf7870fa8"/><file name="Customer.php" hash="3ebaeaffa0097552874d102bc35da987"/><file name="CustomerGroup.php" hash="8ba23c3ad93f5e59d50175274e8c0b63"/><file name="Customvar.php" hash="505a38c3803ebe0f863616e1a41afc2b"/><file name="Date.php" hash="4204356324da1c89622723927421e56f"/><file name="Info.php" hash="60e8158d518ff4d6368b549ad24e27ee"/><file name="Product.php" hash="9005d84d17f8147f9b1cee5131d73f6a"/><file name="Quote.php" hash="a05ed6a2526b7f8768d5b61b476c98b2"/><file name="Selection.php" hash="b0435629222bdcc95040dae39c3b9d5f"/><file name="StockItem.php" hash="180807358f2e1f04c58ec175c2975736"/><file name="Store.php" hash="1cdbe0feae559a6f0ba6060fe6cd532f"/></dir></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="LoadOnParent.php" hash="5982d79417ab309daa6a05217b0058b0"/><file name="ProcessChildren.php" hash="8dbe7c271b79d4b93ddd360a4bbc49b7"/></dir></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Os2"><file name="AjaxController.php" hash="80f4591fd20de88467e0f5996e3d3f1c"/></dir></dir><dir name="Checkout"><file name="CartController.php" hash="8c6ee136298e0e2dd0052143887282ce"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="9c290c251a8612b5bfd00f9254cc17c8"/><file name="config.xml" hash="e1b79b36a0dc4bc25f7cd2a417a7df25"/><file name="system.xml" hash="b0319b613b8a127352f113a3c518ab9c"/></dir><dir name="includes"><file name="OS2_AddressFilterParser.php" hash="997021a4b3b2e4bcbad548723e1148d8"/><file name="OwebiaShippingHelper.php" hash="
|
24 |
<compatible/>
|
25 |
<dependencies/>
|
26 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Owebia_Shipping_2</name>
|
4 |
+
<version>2.5.15</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.
|
11 |

|
12 |
[FR] Ce module met à disposition 3 modes de livraison configurables avec une syntaxe très souple.</description>
|
13 |
+
<notes>[2.5.15 - 07 juin 2014]
|
14 |
+
Remplacement de static:: par self:: pour une rétro-compatibilité avec PHP < 5.3</notes>
|
|
|
|
|
|
|
|
|
|
|
15 |
<authors><author><name>owebia</name><user>auto-converted</user><email>antoine.lemoine@owebia.com</email></author></authors>
|
16 |
+
<date>2014-06-07</date>
|
17 |
+
<time>00:55:51</time>
|
18 |
+
<contents><target name="magecommunity"><dir name="Owebia"><dir name="Shipping2"><dir name="Block"><dir name="Adminhtml"><dir name="Os2"><dir name="Editor"><dir name="Property"><file name="Input.php" hash="3d6cbadd3f93b7456c07aea93e95c351"/></dir></dir><file name="Editor.php" hash="e7e687f1777024f59905ff7c294240b2"/><file name="Help.php" hash="2344a81adf3ef3cb4de7bef0254fc91b"/></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Config.php" hash="a8fa16d6fbe0040dbe3f82a5d35c3549"/><file name="Informations.php" hash="8cc48900c8d21eb1f6da4e4c81022707"/></dir></dir></dir></dir></dir></dir><dir name="Controller"><file name="Abstract.php" hash="271c15e20d257ff8852149728cbf1625"/></dir><dir name="Helper"><file name="Data.php" hash="09d2c0209a5db7af579ecc1b73cd3843"/></dir><dir name="Model"><dir name="Carrier"><file name="Abstract.php" hash="e99b2ee4aefaa3ccf63873c590c1a644"/><file name="OwebiaShipping1.php" hash="0c6ef06ce84e8af21d1c44480af6391b"/><file name="OwebiaShipping2.php" hash="b9696696be13ee5f284b705cf2adb3d2"/><file name="OwebiaShipping3.php" hash="d8c488dda9ab5adf835d9a2bea169b3c"/><file name="OwebiaShipping4.php" hash="d19c02368763dea101dc33dae7abad41"/></dir><dir name="Mysql4"><file name="Setup.php" hash="aa7ede8eb6c0cf2c36a8f0bbff447165"/></dir><dir name="Os2"><dir name="Data"><file name="Abstract.php" hash="7de45e45599f1a21e7a76aed4a326e8d"/><file name="AbstractWithAttributes.php" hash="53296361d4c5b793db565c9617537f1d"/><file name="Address.php" hash="152f918ee67fa1127b7f5c72f7b6ff7c"/><file name="AddressFilter.php" hash="2d6bff3709ac903b4fd02c9af1afb820"/><file name="AttributeSet.php" hash="c2871abf3d8fdf0c5d8c820fd3f2d0c3"/><file name="Billto.php" hash="21cd103dcf3deeb1c1e9113569e9fff9"/><file name="Cart.php" hash="0b829d168d5e692e34a998c7eff02655"/><file name="CartItem.php" hash="291de4e670969f904b4e597e31c87e4c"/><file name="Category.php" hash="9976b5038f13c6f725816eadf7870fa8"/><file name="Customer.php" hash="3ebaeaffa0097552874d102bc35da987"/><file name="CustomerGroup.php" hash="8ba23c3ad93f5e59d50175274e8c0b63"/><file name="Customvar.php" hash="505a38c3803ebe0f863616e1a41afc2b"/><file name="Date.php" hash="4204356324da1c89622723927421e56f"/><file name="Info.php" hash="60e8158d518ff4d6368b549ad24e27ee"/><file name="Product.php" hash="9005d84d17f8147f9b1cee5131d73f6a"/><file name="Quote.php" hash="a05ed6a2526b7f8768d5b61b476c98b2"/><file name="Selection.php" hash="b0435629222bdcc95040dae39c3b9d5f"/><file name="StockItem.php" hash="180807358f2e1f04c58ec175c2975736"/><file name="Store.php" hash="1cdbe0feae559a6f0ba6060fe6cd532f"/></dir></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="LoadOnParent.php" hash="5982d79417ab309daa6a05217b0058b0"/><file name="ProcessChildren.php" hash="8dbe7c271b79d4b93ddd360a4bbc49b7"/></dir></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Os2"><file name="AjaxController.php" hash="80f4591fd20de88467e0f5996e3d3f1c"/></dir></dir><dir name="Checkout"><file name="CartController.php" hash="8c6ee136298e0e2dd0052143887282ce"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="9c290c251a8612b5bfd00f9254cc17c8"/><file name="config.xml" hash="e1b79b36a0dc4bc25f7cd2a417a7df25"/><file name="system.xml" hash="b0319b613b8a127352f113a3c518ab9c"/></dir><dir name="includes"><file name="OS2_AddressFilterParser.php" hash="997021a4b3b2e4bcbad548723e1148d8"/><file name="OwebiaShippingHelper.php" hash="d5b744f8fedf59800c963054a2313864"/></dir><dir name="sql"><dir name="owebia_shipping2_setup"><file name="mysql4-install-2.5.13.php" hash="807dad21a089045946ab1cf2b433f954"/></dir></dir><file name="changelog" hash="9084089e9694c30168b5f07dc8cdafb0"/><file name="doc_en_US.html" hash="d4b2e41297f2ad3cbee2fa964ef491a2"/><file name="doc_fr_FR.html" hash="1dba3654b5c525a8ff677d27c7c1e458"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Owebia_Shipping2.xml" hash="046e4a5822bd9a6c2e781bfbb33f7ebd"/></dir></target><target name="magelocale"><dir name="en_US"><file name="Owebia_Shipping2.csv" hash="e9d54947d5b38eb975fc0de4145ffe23"/></dir><dir name="fr_FR"><file name="Owebia_Shipping2.csv" hash="a8c41b1a205a92de71b9e4621532c97d"/></dir></target><target name="mage"><dir name="js"><dir name="owebia"><dir name="shipping2"><dir name="colorbox"><dir name="images"><dir name="ie6"><file name="borderBottomCenter.png" hash="1936585831e8bcf4eb5ef1081c8e2574"/><file name="borderBottomLeft.png" hash="7ceeb01563f030dc47837fd8bad29488"/><file name="borderBottomRight.png" hash="297fb77440870d91f519bcecdb312725"/><file name="borderMiddleLeft.png" hash="64df0244eeaade27764d2cf33606527b"/><file name="borderMiddleRight.png" hash="9fa458eaaa35b80b2452f35a1d6b4d0c"/><file name="borderTopCenter.png" hash="01ecb01841270f3a765aadf4900929f3"/><file name="borderTopLeft.png" hash="bf4949b95b09d255edd9bcb8358a3557"/><file name="borderTopRight.png" hash="51315fa19507a33d5f1b5411598593e7"/></dir><file name="border.png" hash="439d585a4e35279cf1eddec5729f7144"/><file name="border.png-" hash="7ca8a1d2eb0763b35c266cd54bee2fa5"/><file name="controls.png" hash="4cbe54bbf6c352ea181a5739842215e2"/><file name="controls.png-" hash="b68b9ecaae424de4862ba0d055b7a560"/><file name="loading.gif" hash="e6611f867d63754b7a2a974fb0a0e7dc"/><file name="loading_background.png" hash="acf427e932fb9413700a4b8b58b41eec"/><file name="overlay.png" hash="790376e15a036959e358a19d4a7ea437"/></dir><file name="colorbox.css" hash="1a7dd23f5d2962260d5bb26a57046db1"/><file name="jquery.colorbox-min.js" hash="afa27e7333f494cf87e4c07297c2160b"/></dir><dir name="img"><dir name="famfamsilk"><file name="help.png" hash="c3812c74bc524179f4ccf5d2db7b3cbf"/><file name="pencil.png" hash="a34e71ab08a6d1162b948d26321dea50"/></dir><file name="btn-edit.png" hash="abc9f604977fc6dc75547a2e04c9748f"/><file name="btn-help.png" hash="b743486f26c3b69871490049147ef14b"/><file name="btn-remove.png" hash="42492684e24356a4081134894eabeb9e"/></dir><dir name="jquery-ui-1.8.23.custom"><dir name="css"><dir name="ui-lightness"><dir name="images"><file name="ui-bg_diagonals-thick_18_b81900_40x40.png" hash="95f9cceeb9d742dd3e917ec16ed754f8"/><file name="ui-bg_diagonals-thick_20_666666_40x40.png" hash="f040b255ca13e693da34ab33c7d6b554"/><file name="ui-bg_flat_10_000000_40x100.png" hash="c18cd01623c7fed23c80d53e2f5e7c78"/><file name="ui-bg_glass_100_f6f6f6_1x400.png" hash="5f1847175ba18c41322cb9cb0581e0fb"/><file name="ui-bg_glass_100_fdf5ce_1x400.png" hash="d26e8f463195a7b86f86b7d550cfc114"/><file name="ui-bg_glass_65_ffffff_1x400.png" hash="e5a8f32e28fd5c27bf0fed33c8a8b9b5"/><file name="ui-bg_gloss-wave_35_f6a828_500x100.png" hash="58d2cd501e01573cf537089c694ba899"/><file name="ui-bg_highlight-soft_100_eeeeee_1x100.png" hash="384c3f17709ba0f809b023b6e7b10b84"/><file name="ui-bg_highlight-soft_75_ffe45c_1x100.png" hash="b806658954cb4d16ade8977af737f486"/><file name="ui-icons_222222_256x240.png" hash="ebe6b6902a408fbf9cac6379a1477525"/><file name="ui-icons_228ef1_256x240.png" hash="79f41c0765e9ec18562b20b0801d748b"/><file name="ui-icons_ef8c08_256x240.png" hash="ef9a6ccfe3b14041928ddc708665b226"/><file name="ui-icons_ffd27a_256x240.png" hash="ab8c30acc0e3608fb79e01fccf832c70"/><file name="ui-icons_ffffff_256x240.png" hash="342bc03f6264c75d3f1d7f99e34295b9"/></dir><file name="jquery-ui-1.8.23.custom.css" hash="d4a4e04116e9bed6a2b00c5e8c260914"/></dir></dir><dir name="js"><file name="jquery-1.8.0.min.js" hash="cd8b0bffc85bb5614385ee4ce3596d07"/><file name="jquery-ui-1.8.23.custom.min.js" hash="c406c4654466fbeee1cf9173b69ec55c"/></dir></dir><file name="jquery-1.8.2.min.js" hash="cfa9051cc0b05eb519f1e16b2a6645d7"/><file name="jquery.caret.1.02.min.js" hash="ee130de5e6b9ae2be7579a5fd77f7b23"/><file name="jquery.layout-1.3.0-rc30.6.min.js" hash="745e5e2084b6330c3f837a0169a96320"/><file name="jquery.layout.min.js" hash="d91b61c69554cd02f4cf3bbbf97b95a8"/><file name="jquery.noconflict.js" hash="3179f2255b046d5f2e9a71e365287bef"/><file name="os2editor.css" hash="96805f469cf7d6f2a7269d5d372fa46b"/><file name="os2editor.js" hash="107807e905cb39f178c1e349c7d89cb8"/></dir></dir></dir></target></contents>
|
19 |
<compatible/>
|
20 |
<dependencies/>
|
21 |
</package>
|