Version Notes
[2.5.23 - August 18, 2016]
Fix special functions call issue: missing opening parenthesis
[2.5.22 - July 18, 2016]
Add composer.json and modman files
[2.5.21 - May 9, 2016]
Fix replacement of special functions, thanks to Sébastien L.
[2.5.20 - 25 avril 2016]
Fix code indentation
Fix version number
Add readme file in package
[2.5.19 - 09 novembre 2015]
Note: the extension is not affected by the patch SUPEE-6788 since it uses the new admin url routing syntax for 3 years (version 2.4.8.0)
Fix bug: deactivation of auto-escaping by default since it can cause some bugs (ex: impossible to use {address_filter.EU-27} in shipto)
Fix bug: fix auto-escaping of properties like {{shipto.country_name}}
Fix bug: variable replacements in labels (variables {cart.price-tax-discount}, {cart.price-tax+discount}, {cart.price+tax-discount} and {cart.price+tax+discount})
Fix bug: use items and not quote to retrieve values {cart.price-tax-discount}, {cart.price-tax+discount}, {cart.price+tax-discount} and {cart.price+tax+discount} (quote totals are not available at this time, calculating them causes duplications of addresses and a false grand_total value)
Fix bug: retrieve customer in backoffice order
Fix unicode accented chars in json_encode for PHP < 5.4
Fix bug: usage of regular expressions inside {count ...}, {sum ...}, {min ...} and {max ...}
Allow usage of php functions date and strtotime (ex: "label": "'Your package will be delivered between ' . date('d/m', strtotime('+5 days')) . ' and ' . date('d/m Y', strtotime('+7 days'))",
Release Info
Developer | owebia |
Extension | Owebia_Shipping_2 |
Version | 2.5.23 |
Comparing to | |
See all releases |
Code changes from version 2.5.22 to 2.5.23
- app/code/community/Owebia/Shipping2/changelog +3 -0
- app/code/community/Owebia/Shipping2/doc_en_US.html +3 -0
- app/code/community/Owebia/Shipping2/doc_fr_FR.html +3 -0
- app/code/community/Owebia/Shipping2/etc/config.xml +1 -1
- app/code/community/Owebia/Shipping2/includes/OwebiaShippingHelper.php +1 -1
- package.xml +8 -5
@@ -1,3 +1,6 @@
|
|
|
|
|
|
|
|
1 |
[2.5.22 - July 18, 2016]
|
2 |
Add composer.json and modman files
|
3 |
|
1 |
+
[2.5.23 - August 18, 2016]
|
2 |
+
Fix special functions call issue: missing opening parenthesis
|
3 |
+
|
4 |
[2.5.22 - July 18, 2016]
|
5 |
Add composer.json and modman files
|
6 |
|
@@ -844,6 +844,9 @@ pre.changelog{white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre
|
|
844 |
<h2>Changelog</h2>
|
845 |
|
846 |
<pre class=changelog>
|
|
|
|
|
|
|
847 |
[2.5.22 - July 18, 2016]
|
848 |
Add composer.json and modman files
|
849 |
|
844 |
<h2>Changelog</h2>
|
845 |
|
846 |
<pre class=changelog>
|
847 |
+
[2.5.23 - August 18, 2016]
|
848 |
+
Fix special functions call issue: missing opening parenthesis
|
849 |
+
|
850 |
[2.5.22 - July 18, 2016]
|
851 |
Add composer.json and modman files
|
852 |
|
@@ -840,6 +840,9 @@ pre.changelog{white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre
|
|
840 |
<h2>Changelog</h2>
|
841 |
|
842 |
<pre class=changelog>
|
|
|
|
|
|
|
843 |
[2.5.22 - July 18, 2016]
|
844 |
Add composer.json and modman files
|
845 |
|
840 |
<h2>Changelog</h2>
|
841 |
|
842 |
<pre class=changelog>
|
843 |
+
[2.5.23 - August 18, 2016]
|
844 |
+
Fix special functions call issue: missing opening parenthesis
|
845 |
+
|
846 |
[2.5.22 - July 18, 2016]
|
847 |
Add composer.json and modman files
|
848 |
|
@@ -22,7 +22,7 @@
|
|
22 |
<config>
|
23 |
<modules>
|
24 |
<Owebia_Shipping2>
|
25 |
-
<version>2.5.
|
26 |
<depends>
|
27 |
<Mage_Shipping />
|
28 |
</depends>
|
22 |
<config>
|
23 |
<modules>
|
24 |
<Owebia_Shipping2>
|
25 |
+
<version>2.5.23</version>
|
26 |
<depends>
|
27 |
<Mage_Shipping />
|
28 |
</depends>
|
@@ -872,7 +872,7 @@ class OwebiaShippingHelper
|
|
872 |
$this->debug(' doesn\'t match ('.self::esc($error).')');
|
873 |
return null;
|
874 |
}
|
875 |
-
$formula = preg_replace('@\b(min|max|range|array_match_any|array_match_all)\(@', '\$this->_\1', $formula);
|
876 |
$eval_result = null;
|
877 |
//echo $formula.'<br/>';
|
878 |
@eval('$eval_result = ('.$formula.');');
|
872 |
$this->debug(' doesn\'t match ('.self::esc($error).')');
|
873 |
return null;
|
874 |
}
|
875 |
+
$formula = preg_replace('@\b(min|max|range|array_match_any|array_match_all)\(@', '\$this->_\1(', $formula);
|
876 |
$eval_result = null;
|
877 |
//echo $formula.'<br/>';
|
878 |
@eval('$eval_result = ('.$formula.');');
|
@@ -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,7 +10,10 @@
|
|
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 |
Add composer.json and modman files
|
15 |

|
16 |
[2.5.21 - May 9, 2016]
|
@@ -33,9 +36,9 @@ Fix bug: usage of regular expressions inside {count ...}, {sum ...}, {min ...} a
|
|
33 |
Allow usage of php functions date and strtotime (ex: "label": "'Your package will be delivered between ' . date('d/m', strtotime('+5 days')) . ' and ' . date('d/m Y', strtotime('+7 days'))",
|
34 |
</notes>
|
35 |
<authors><author><name>owebia</name><user>owebia</user><email>antoine.lemoine@owebia.com</email></author></authors>
|
36 |
-
<date>2016-
|
37 |
-
<time>
|
38 |
-
<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="1f005c722d2a1aed36392b35b15a5ff8"/></dir></dir><file name="Editor.php" hash="3c9023bbd9599746eb59c03a1f880bb4"/><file name="Help.php" hash="8717b49c17a27648608f8f9bdab38a6a"/></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Config.php" hash="5a477abaf6e1a424a8b3c356bd7dbe1a"/><file name="Informations.php" hash="62e5bb722fdcdcab685bf61ac0074f9a"/></dir></dir></dir></dir></dir></dir><dir name="Controller"><file name="Abstract.php" hash="efcaf634de41e1a4077178ea6312639a"/></dir><dir name="Helper"><file name="Data.php" hash="bd60dce3af42acadc34981e9ac69f786"/></dir><dir name="Model"><dir name="Carrier"><file name="Abstract.php" hash="b24045dbbb2b1b94387b906cda15dba9"/><file name="OwebiaShipping1.php" hash="ff3b8bdbe01b9301ee742cecf9226477"/><file name="OwebiaShipping2.php" hash="2dc52a08f61991c4d09ba3cf217a32df"/><file name="OwebiaShipping3.php" hash="37ac69f726b7ad13f59902dbefd8a700"/></dir><dir name="Mysql4"><file name="Setup.php" hash="e09d64ce594327962d6b1b7d6c3ed40b"/></dir><dir name="Os2"><dir name="Data"><file name="Abstract.php" hash="aef3cc68958a3cf83bca10f429934b77"/><file name="AbstractWithAttributes.php" hash="6d18a42d3a0d79b55a7ddd4114a6fb9e"/><file name="Address.php" hash="7f26ec3694d31d50a4d005ca0751b808"/><file name="AddressFilter.php" hash="28acce2d71dba78c181d429cadaab40f"/><file name="AttributeSet.php" hash="8bf97bd54b0a8e0dd4187544dc3d7fc8"/><file name="Billto.php" hash="0a8a43a84f9d3c06f7ea55d8f1990642"/><file name="Cart.php" hash="efea6a0bd6ef8b1bc2cdaea5dcace2b3"/><file name="CartItem.php" hash="4edb6009ea6aa6656818ef1b1ce26c82"/><file name="Category.php" hash="3003514d1e8dac8805ec8dd26d4eb3f6"/><file name="Customer.php" hash="3afdc4f40f91f7c1ee1678037af0b9ce"/><file name="CustomerGroup.php" hash="c736f20d6e896a8129d623ff1ce77eaa"/><file name="Customvar.php" hash="92dbfd486307d080c142cd0d35675cd3"/><file name="Date.php" hash="2b3fa47f2fc916237e6ba3dd42a62c89"/><file name="Info.php" hash="7fd36af64125336c0d20aac799e638f0"/><file name="Product.php" hash="1c60fca3aff8d45e7f1aeb2241b9b09c"/><file name="Quote.php" hash="da284da608d12947da48e7fafa7e5d81"/><file name="Selection.php" hash="89691512c0e9757a4555c35ced8334d5"/><file name="StockItem.php" hash="fbcc58d7681b69e496c5794d4bcf4b55"/><file name="Store.php" hash="a9d1dc040da92aeb9786e52f31749668"/></dir></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="LoadOnParent.php" hash="79591634a7c58ad32daf800cbd66b2c9"/><file name="ProcessChildren.php" hash="8d59e235c55d1c5eef4dbeafbfc045eb"/></dir></dir></dir></dir><file name="changelog" hash="
|
39 |
<compatible/>
|
40 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
41 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Owebia_Shipping_2</name>
|
4 |
+
<version>2.5.23</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.23 - August 18, 2016]
|
14 |
+
Fix special functions call issue: missing opening parenthesis
|
15 |
+

|
16 |
+
[2.5.22 - July 18, 2016]
|
17 |
Add composer.json and modman files
|
18 |

|
19 |
[2.5.21 - May 9, 2016]
|
36 |
Allow usage of php functions date and strtotime (ex: "label": "'Your package will be delivered between ' . date('d/m', strtotime('+5 days')) . ' and ' . date('d/m Y', strtotime('+7 days'))",
|
37 |
</notes>
|
38 |
<authors><author><name>owebia</name><user>owebia</user><email>antoine.lemoine@owebia.com</email></author></authors>
|
39 |
+
<date>2016-08-18</date>
|
40 |
+
<time>12:07:50</time>
|
41 |
+
<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="1f005c722d2a1aed36392b35b15a5ff8"/></dir></dir><file name="Editor.php" hash="3c9023bbd9599746eb59c03a1f880bb4"/><file name="Help.php" hash="8717b49c17a27648608f8f9bdab38a6a"/></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Config.php" hash="5a477abaf6e1a424a8b3c356bd7dbe1a"/><file name="Informations.php" hash="62e5bb722fdcdcab685bf61ac0074f9a"/></dir></dir></dir></dir></dir></dir><dir name="Controller"><file name="Abstract.php" hash="efcaf634de41e1a4077178ea6312639a"/></dir><dir name="Helper"><file name="Data.php" hash="bd60dce3af42acadc34981e9ac69f786"/></dir><dir name="Model"><dir name="Carrier"><file name="Abstract.php" hash="b24045dbbb2b1b94387b906cda15dba9"/><file name="OwebiaShipping1.php" hash="ff3b8bdbe01b9301ee742cecf9226477"/><file name="OwebiaShipping2.php" hash="2dc52a08f61991c4d09ba3cf217a32df"/><file name="OwebiaShipping3.php" hash="37ac69f726b7ad13f59902dbefd8a700"/></dir><dir name="Mysql4"><file name="Setup.php" hash="e09d64ce594327962d6b1b7d6c3ed40b"/></dir><dir name="Os2"><dir name="Data"><file name="Abstract.php" hash="aef3cc68958a3cf83bca10f429934b77"/><file name="AbstractWithAttributes.php" hash="6d18a42d3a0d79b55a7ddd4114a6fb9e"/><file name="Address.php" hash="7f26ec3694d31d50a4d005ca0751b808"/><file name="AddressFilter.php" hash="28acce2d71dba78c181d429cadaab40f"/><file name="AttributeSet.php" hash="8bf97bd54b0a8e0dd4187544dc3d7fc8"/><file name="Billto.php" hash="0a8a43a84f9d3c06f7ea55d8f1990642"/><file name="Cart.php" hash="efea6a0bd6ef8b1bc2cdaea5dcace2b3"/><file name="CartItem.php" hash="4edb6009ea6aa6656818ef1b1ce26c82"/><file name="Category.php" hash="3003514d1e8dac8805ec8dd26d4eb3f6"/><file name="Customer.php" hash="3afdc4f40f91f7c1ee1678037af0b9ce"/><file name="CustomerGroup.php" hash="c736f20d6e896a8129d623ff1ce77eaa"/><file name="Customvar.php" hash="92dbfd486307d080c142cd0d35675cd3"/><file name="Date.php" hash="2b3fa47f2fc916237e6ba3dd42a62c89"/><file name="Info.php" hash="7fd36af64125336c0d20aac799e638f0"/><file name="Product.php" hash="1c60fca3aff8d45e7f1aeb2241b9b09c"/><file name="Quote.php" hash="da284da608d12947da48e7fafa7e5d81"/><file name="Selection.php" hash="89691512c0e9757a4555c35ced8334d5"/><file name="StockItem.php" hash="fbcc58d7681b69e496c5794d4bcf4b55"/><file name="Store.php" hash="a9d1dc040da92aeb9786e52f31749668"/></dir></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="LoadOnParent.php" hash="79591634a7c58ad32daf800cbd66b2c9"/><file name="ProcessChildren.php" hash="8d59e235c55d1c5eef4dbeafbfc045eb"/></dir></dir></dir></dir><file name="changelog" hash="caa6931a305f3b042ec31f061760818a"/><dir name="controllers"><dir name="Adminhtml"><dir name="Os2"><file name="AjaxController.php" hash="534f70706d1e3987e72c0fa5fd3cdaf1"/></dir></dir><dir name="Checkout"><file name="CartController.php" hash="71fbc28d6d6aea32bc8594c4c52e2f50"/></dir></dir><file name="doc_en_US.html" hash="a0b4854ebdb9fcec938b899931c1dc87"/><file name="doc_fr_FR.html" hash="b43d0c05c6fa528e752ff79dbfb23a03"/><dir name="etc"><file name="adminhtml.xml" hash="676a879b29e5aa7da838823ae809712e"/><file name="config.xml" hash="dfd76f87f99092bdd41fdfad39c073d4"/><file name="system.xml" hash="b2475166887331725c844f5c3369c578"/></dir><dir name="includes"><file name="OS2_AddressFilterParser.php" hash="18c3c0c0c7bc397b8ac0a26219752bf8"/><file name="OwebiaShippingHelper.php" hash="4ca6a29e30e8f278a0f628ca50e55be3"/></dir><dir name="sql"><dir name="owebia_shipping2_setup"><file name="mysql4-install-2.5.13.php" hash="ac3e7a144feee98c135478970f5a39a2"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Owebia_Shipping2.xml" hash="83124ea7b75f38d07ee381f02a8bf038"/></dir></target><target name="magelocale"><dir name="fr_FR"><file name="Owebia_Shipping2.csv" hash="f0acbd884002e91c169cd01f0b95a9c7"/></dir><dir name="en_US"><file name="Owebia_Shipping2.csv" hash="b287f5594199379e78a3b88f8f279899"/></dir></target><target name="mageweb"><dir name="js"><dir name="owebia"><dir name="shipping2"><dir name="colorbox"><file name="colorbox.css" hash="1a7dd23f5d2962260d5bb26a57046db1"/><dir name="images"><file name="border.png" hash="439d585a4e35279cf1eddec5729f7144"/><file name="border.png-" hash="7ca8a1d2eb0763b35c266cd54bee2fa5"/><file name="controls.png" hash="4cbe54bbf6c352ea181a5739842215e2"/><file name="controls.png-" hash="b68b9ecaae424de4862ba0d055b7a560"/><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="loading.gif" hash="e6611f867d63754b7a2a974fb0a0e7dc"/><file name="loading_background.png" hash="acf427e932fb9413700a4b8b58b41eec"/><file name="overlay.png" hash="790376e15a036959e358a19d4a7ea437"/></dir><file name="jquery.colorbox-min.js" hash="afa27e7333f494cf87e4c07297c2160b"/></dir><dir name="img"><file name="btn-edit.png" hash="abc9f604977fc6dc75547a2e04c9748f"/><file name="btn-help.png" hash="b743486f26c3b69871490049147ef14b"/><file name="btn-remove.png" hash="42492684e24356a4081134894eabeb9e"/><dir name="famfamsilk"><file name="help.png" hash="c3812c74bc524179f4ccf5d2db7b3cbf"/><file name="pencil.png" hash="a34e71ab08a6d1162b948d26321dea50"/></dir></dir><file name="jquery-1.8.2.min.js" hash="cfa9051cc0b05eb519f1e16b2a6645d7"/><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.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><target name="mage"><dir name="."><file name="README.md" hash="9efbb43e081442a1fbeefa9cfdc26b62"/></dir></target></contents>
|
42 |
<compatible/>
|
43 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
44 |
</package>
|