Version Notes
- Fixed country code add logic to phone numbers
- Fixed XML variable generation
Download this release
Release Info
Developer | Magento Core Team |
Extension | Eabi_DpdEE |
Version | 0.1.31 |
Comparing to | |
See all releases |
Code changes from version 0.1.30 to 0.1.31
- app/code/community/Eabi/DpdEE/CHANGELOG.txt +5 -0
- app/code/community/Eabi/DpdEE/etc/config.xml +1 -1
- app/code/community/Eabi/Postoffice/Helper/Countrycode.php +2 -2
- app/code/community/Eabi/Postoffice/Helper/Xml.php +1 -1
- app/code/community/Eabi/Postoffice/Model/Carrier/Abstract.php +8 -1
- app/code/community/Eabi/Postoffice/etc/config.xml +1 -1
- app/etc/modules/Eabi_DpdEE.xml +1 -1
- app/etc/modules/Eabi_Postoffice.xml +1 -1
- package.xml +6 -5
app/code/community/Eabi/DpdEE/CHANGELOG.txt
CHANGED
@@ -98,3 +98,8 @@
|
|
98 |
|
99 |
0.1.30
|
100 |
- Added XML helper into postoffice package
|
|
|
|
|
|
|
|
|
|
98 |
|
99 |
0.1.30
|
100 |
- Added XML helper into postoffice package
|
101 |
+
|
102 |
+
|
103 |
+
0.1.31
|
104 |
+
- Fixed country code add logic to phone numbers
|
105 |
+
- Fixed XML variable generation
|
app/code/community/Eabi/DpdEE/etc/config.xml
CHANGED
@@ -36,7 +36,7 @@
|
|
36 |
<config>
|
37 |
<modules>
|
38 |
<Eabi_DpdEE>
|
39 |
-
<version>0.1.
|
40 |
</Eabi_DpdEE>
|
41 |
</modules>
|
42 |
|
36 |
<config>
|
37 |
<modules>
|
38 |
<Eabi_DpdEE>
|
39 |
+
<version>0.1.31</version>
|
40 |
</Eabi_DpdEE>
|
41 |
</modules>
|
42 |
|
app/code/community/Eabi/Postoffice/Helper/Countrycode.php
CHANGED
@@ -324,8 +324,8 @@ class Eabi_Postoffice_Helper_Countrycode {
|
|
324 |
);
|
325 |
$defaultDialCode = $this->getCountryCode($countryId);
|
326 |
|
327 |
-
//remove
|
328 |
-
$phonenumber =
|
329 |
|
330 |
//when country code is supplied, then it can:
|
331 |
//start with country code
|
324 |
);
|
325 |
$defaultDialCode = $this->getCountryCode($countryId);
|
326 |
|
327 |
+
//remove everything that is outside numbers and + sign
|
328 |
+
$phonenumber = preg_replace("/[^0-9\+]/", '', $phonenumber);
|
329 |
|
330 |
//when country code is supplied, then it can:
|
331 |
//start with country code
|
app/code/community/Eabi/Postoffice/Helper/Xml.php
CHANGED
@@ -97,7 +97,7 @@ class Eabi_Postoffice_Helper_Xml extends Mage_Core_Helper_Abstract {
|
|
97 |
*/
|
98 |
public function toXmlVar($variable, array &$attributes = array(), $namespace = null) {
|
99 |
$this->_queryDetails = array();
|
100 |
-
$result = '';
|
101 |
if (is_array($variable)) {
|
102 |
$this->_toXmlVar($result, $variable, $namespace, -1, '');
|
103 |
$attributes = $this->_queryDetails;
|
97 |
*/
|
98 |
public function toXmlVar($variable, array &$attributes = array(), $namespace = null) {
|
99 |
$this->_queryDetails = array();
|
100 |
+
$result = '<?xml version="1.0" encoding="utf-8"?>';
|
101 |
if (is_array($variable)) {
|
102 |
$this->_toXmlVar($result, $variable, $namespace, -1, '');
|
103 |
$attributes = $this->_queryDetails;
|
app/code/community/Eabi/Postoffice/Model/Carrier/Abstract.php
CHANGED
@@ -290,10 +290,17 @@ abstract class Eabi_Postoffice_Model_Carrier_Abstract extends Mage_Shipping_Mode
|
|
290 |
}
|
291 |
|
292 |
if ($this->getConfigData('min_package_weight') > 0) {
|
293 |
-
if (
|
|
|
|
|
|
|
294 |
$this->clearAddressId($addressId);
|
295 |
return false;
|
296 |
}
|
|
|
|
|
|
|
|
|
297 |
}
|
298 |
$request->setEabiProductWeights($loadedProductWeights);
|
299 |
|
290 |
}
|
291 |
|
292 |
if ($this->getConfigData('min_package_weight') > 0) {
|
293 |
+
if ($request->getPackageWeight() < (float) $this->getConfigData('min_package_weight')) {
|
294 |
+
//use same algo as "whole cart weight"
|
295 |
+
//because if single item in cart is 0 and others are in allowed range, then current method is disabled.
|
296 |
+
//better to convert it to be used to calculate whole cart weight instead
|
297 |
$this->clearAddressId($addressId);
|
298 |
return false;
|
299 |
}
|
300 |
+
// if (min($loadedProductWeights) < (float) $this->getConfigData('min_package_weight')) {
|
301 |
+
// $this->clearAddressId($addressId);
|
302 |
+
// return false;
|
303 |
+
// }
|
304 |
}
|
305 |
$request->setEabiProductWeights($loadedProductWeights);
|
306 |
|
app/code/community/Eabi/Postoffice/etc/config.xml
CHANGED
@@ -36,7 +36,7 @@
|
|
36 |
<config>
|
37 |
<modules>
|
38 |
<Eabi_Postoffice>
|
39 |
-
<version>0.1.
|
40 |
</Eabi_Postoffice>
|
41 |
</modules>
|
42 |
|
36 |
<config>
|
37 |
<modules>
|
38 |
<Eabi_Postoffice>
|
39 |
+
<version>0.1.17</version>
|
40 |
</Eabi_Postoffice>
|
41 |
</modules>
|
42 |
|
app/etc/modules/Eabi_DpdEE.xml
CHANGED
@@ -39,7 +39,7 @@
|
|
39 |
<depends>
|
40 |
<Eabi_Postoffice />
|
41 |
</depends>
|
42 |
-
<version>0.1.
|
43 |
</Eabi_DpdEE>
|
44 |
</modules>
|
45 |
</config>
|
39 |
<depends>
|
40 |
<Eabi_Postoffice />
|
41 |
</depends>
|
42 |
+
<version>0.1.31</version>
|
43 |
</Eabi_DpdEE>
|
44 |
</modules>
|
45 |
</config>
|
app/etc/modules/Eabi_Postoffice.xml
CHANGED
@@ -42,7 +42,7 @@
|
|
42 |
<Mage_Shipping />
|
43 |
<Eabi_Livehandler />
|
44 |
</depends>
|
45 |
-
<version>0.1.
|
46 |
</Eabi_Postoffice>
|
47 |
</modules>
|
48 |
</config>
|
42 |
<Mage_Shipping />
|
43 |
<Eabi_Livehandler />
|
44 |
</depends>
|
45 |
+
<version>0.1.17</version>
|
46 |
</Eabi_Postoffice>
|
47 |
</modules>
|
48 |
</config>
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Eabi_DpdEE</name>
|
4 |
-
<version>0.1.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.gnu.org/licenses/gpl-3.0.txt">GNU Public License V3.0</license>
|
7 |
<channel>community</channel>
|
@@ -17,11 +17,12 @@
|
|
17 |
<p>Allows to call the courier from Magento admin</p>
|
18 |
<p>Allows cash on delivery payment and allows to set an extra fee per country which will be appended to shipping fee</p>
|
19 |
<p>Intended to use for Estonian merchant who sends parcels to all Baltic states</p></description>
|
20 |
-
<notes>-
|
|
|
21 |
<authors><author><name>Matis Matis</name><user>auto-converted</user><email>info@e-abi.ee</email></author></authors>
|
22 |
-
<date>2016-
|
23 |
-
<time>
|
24 |
-
<contents><target name="magecommunity"><dir name="Eabi"><dir name="DpdEE"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Country.php" hash="3a0ce3bedf19b868d81f4117740778ce"/></dir></dir></dir></dir><dir name="Info"><file name="Payment.php" hash="5c362a3835374edcd3f06c03bf1807d9"/></dir><dir name="Order"><file name="Courier.php" hash="897aa2fb30241802e04db8e997cc5eb8"/></dir><file name="Invoice.php" hash="3b6991a3f7a08763c16ccc73ceab2111"/></dir><dir name="Helper"><file name="Data.php" hash="5599ef7d77c5769653d3b655b7f18d72"/></dir><dir name="Model"><dir name="Action"><dir name="Carrier"><dir name="Order"><file name="Courier.php" hash="bfec69ca2b190b71cc5d649d00b685f9"/></dir></dir></dir><dir name="Button"><file name="Courier.php" hash="b60b161082d23d9596473fc4f942484a"/></dir><dir name="Payment"><file name="Processor.php" hash="18f56c72f9b897f40e97bae83e440d1f"/></dir><dir name="Source"><dir name="Label"><file name="Position.php" hash="d3c89fbc76ab10ab8daa86800fe19083"/></dir><file name="Service.php" hash="504b474a715c21d943b61b7eaddac974"/></dir><file name="Api.php" hash="5fb56e2ba77e5275c9479ad56cfaa1be"/><file name="Config.php" hash="27f77c56c64cefa4b7ccfb3df1b877b5"/><file name="Flat.php" hash="1bafdae148495a356031343f83bed390"/><file name="Observer.php" hash="8a1eeac07c99ee53c1fb0a27f14a0984"/><file name="Post.php" hash="95028daf7aa8cdbf20d046c3e3e9db8f"/></dir><dir name="etc"><file name="config.xml" hash="
|
25 |
<compatible/>
|
26 |
<dependencies><required><package><name>Eabi_Livehandler</name><channel>community</channel><min>0.1.15</min><max>1.0.0</max></package></required></dependencies>
|
27 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Eabi_DpdEE</name>
|
4 |
+
<version>0.1.31</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.gnu.org/licenses/gpl-3.0.txt">GNU Public License V3.0</license>
|
7 |
<channel>community</channel>
|
17 |
<p>Allows to call the courier from Magento admin</p>
|
18 |
<p>Allows cash on delivery payment and allows to set an extra fee per country which will be appended to shipping fee</p>
|
19 |
<p>Intended to use for Estonian merchant who sends parcels to all Baltic states</p></description>
|
20 |
+
<notes>- Fixed country code add logic to phone numbers
|
21 |
+
- Fixed XML variable generation</notes>
|
22 |
<authors><author><name>Matis Matis</name><user>auto-converted</user><email>info@e-abi.ee</email></author></authors>
|
23 |
+
<date>2016-03-21</date>
|
24 |
+
<time>21:33:21</time>
|
25 |
+
<contents><target name="magecommunity"><dir name="Eabi"><dir name="DpdEE"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Country.php" hash="3a0ce3bedf19b868d81f4117740778ce"/></dir></dir></dir></dir><dir name="Info"><file name="Payment.php" hash="5c362a3835374edcd3f06c03bf1807d9"/></dir><dir name="Order"><file name="Courier.php" hash="897aa2fb30241802e04db8e997cc5eb8"/></dir><file name="Invoice.php" hash="3b6991a3f7a08763c16ccc73ceab2111"/></dir><dir name="Helper"><file name="Data.php" hash="5599ef7d77c5769653d3b655b7f18d72"/></dir><dir name="Model"><dir name="Action"><dir name="Carrier"><dir name="Order"><file name="Courier.php" hash="bfec69ca2b190b71cc5d649d00b685f9"/></dir></dir></dir><dir name="Button"><file name="Courier.php" hash="b60b161082d23d9596473fc4f942484a"/></dir><dir name="Payment"><file name="Processor.php" hash="18f56c72f9b897f40e97bae83e440d1f"/></dir><dir name="Source"><dir name="Label"><file name="Position.php" hash="d3c89fbc76ab10ab8daa86800fe19083"/></dir><file name="Service.php" hash="504b474a715c21d943b61b7eaddac974"/></dir><file name="Api.php" hash="5fb56e2ba77e5275c9479ad56cfaa1be"/><file name="Config.php" hash="27f77c56c64cefa4b7ccfb3df1b877b5"/><file name="Flat.php" hash="1bafdae148495a356031343f83bed390"/><file name="Observer.php" hash="8a1eeac07c99ee53c1fb0a27f14a0984"/><file name="Post.php" hash="95028daf7aa8cdbf20d046c3e3e9db8f"/></dir><dir name="etc"><file name="config.xml" hash="314e0972af817b5de2eee03bd8d0ddb5"/><file name="system.xml" hash="f159733074600175fe21a3245fa06328"/></dir><dir name="sql"><dir name="eabi_dpdee_setup"><file name="mysql4-install-0.1.0.php" hash="d87dbd3080d98c183956319f20110433"/><file name="mysql4-upgrade-0.1.0-0.1.1.php" hash="56765009037b3699a7c871f14704a00c"/><file name="mysql4-upgrade-0.1.1-0.1.2.php" hash="411745561f0ddec025db8a48cb2abd26"/><file name="mysql4-upgrade-0.1.2-0.1.3.php" hash="6ad16e795c12646cd77242434c43cab0"/><file name="mysql4-upgrade-0.1.3-0.1.4.php" hash="dfbd21903d6e85592c994ec5dee5e374"/><file name="mysql4-upgrade-0.1.6-0.1.7.php" hash="a852db2e91ae253593d499a230e08013"/><file name="mysql4-upgrade-0.1.9-0.1.10.php" hash="456f749bc3e49363561153b3e0e57d96"/></dir></dir><file name="CHANGELOG.txt" hash="4cb796ebb209b06b9eda38505283c21f"/><file name="LICENCE.txt" hash="0191312e121c0b3e1165619b96efcf9f"/></dir><dir name="Postoffice"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Form"><dir name="Field"><file name="License.php" hash="2f5750200eb5e1ba7fd5ba10f82b8a18"/><file name="Remove.php" hash="f94c1e6fb2ca0d054fb5c87dc98b289c"/></dir></dir></dir></dir><dir name="Config"><file name="Rebuildbutton.php" hash="b9139075530956f874b72d1592c95890"/></dir></dir><dir name="Helper"><file name="Countrycode.php" hash="fa1aeb2e43d3108da722c677ea4b8d13"/><file name="Data.php" hash="76aa3727765746553c4e5c3d77e09b43"/><file name="Xml.php" hash="f1cef91cda5027900c260d14caa8f147"/></dir><dir name="Model"><dir name="Carrier"><file name="Abstract.php" hash="cf4c9afc1ea42c416a0f674ae78b6f0e"/><file name="Result.php" hash="77e183bf5f9b31b9ae9c4c12182b0f43"/></dir><dir name="Email"><dir name="Template"><file name="Mailer.php" hash="ad050d051f143033273328c6c6d365cb"/></dir></dir><dir name="Licenceable"><dir name="Autosend"><file name="Method.php" hash="f06c99a1a4311de474cd63afed947220"/></dir><dir name="Payment"><file name="Method.php" hash="18fe727f3ac4db9ccfa93486115432ba"/></dir><dir name="Shipping"><file name="Method.php" hash="b34ba5c1bee4c3c818514c125f9ee882"/></dir><file name="Method.php" hash="f054356db17488890b3275cc9608ef39"/></dir><dir name="Mysql4"><dir name="Carriermodule"><file name="Collection.php" hash="7079738f5fe7591b98aa93a8d9f02dab"/></dir><dir name="Office"><file name="Collection.php" hash="7941e291c5fa7e613d3ecdf785e1d98f"/></dir><file name="Carriermodule.php" hash="e7074af5aa20080065cf5ee44a4e8708"/><file name="Office.php" hash="55ac0e86fe5b89cfaeca3250872d977a"/></dir><dir name="Source"><file name="Sendevent.php" hash="a62dda6f3551e1ae961fc3bb4a91fa11"/></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="Country.php" hash="cd46d97cad9d45a0eaf86a193ebe142c"/></dir></dir></dir><file name="Carriermodule.php" hash="4d4a5b6b72d102e26136b49eafb07d9d"/><file name="Observer.php" hash="13140483e2d7dcfd3a808ef1441bdf9e"/><file name="Office.php" hash="13926ff31c40ca796a15d1e2369559d7"/><file name="Orderview.php" hash="2f67fd0efa38f508fb7a438c98ec4517"/><file name="Updater.php" hash="075fd8691affe5fc79f16c7291b0a13e"/></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Eabi"><dir name="Postoffice"><file name="PostofficeController.php" hash="a51d4f075e8d9a606871946dc5cb53ed"/></dir></dir><file name="PostofficeController.php" hash="72a194bbe8bc3bc0685be1f8101f4d13"/></dir><file name="IndexController.php" hash="674711f386853981403317113f6fe128"/></dir><dir name="etc"><file name="config.xml" hash="2d4c172e62084bd52faf2e730f705079"/></dir><dir name="sql"><dir name="eabi_postoffice_setup"><file name="mysql4-install-0.1.0.php" hash="6c25a503d5bc3bef7fdecf12123f7b57"/><file name="mysql4-upgrade-0.1.0-0.1.1.php" hash="00be7881382e9e904cb2bc2cedc89818"/><file name="mysql4-upgrade-0.1.1-0.1.2.php" hash="a9cf1ab713568971161e0caeb0ad19dc"/><file name="mysql4-upgrade-0.1.11-0.1.12.php" hash="40014409962d19234b62913c63b2252f"/><file name="mysql4-upgrade-0.1.5-0.1.6.php" hash="2330590d882eda1bb14dfa0982af096c"/><file name="mysql4-upgrade-0.1.6-0.1.7.php" hash="08580cbaa3ead11e28388998acbec5d8"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="eabi_dpdee.xml" hash="85311cb850eb13eadaed47cdc9c44fb3"/><file name="eabi_postoffice.xml" hash="3248575e76fe484b1e13ee20b11d7b49"/></dir><dir name="template"><dir name="eabi_dpdee"><dir name="order"><file name="courier.phtml" hash="0310f24e96ca3873e78e0e2a0ab26743"/></dir><file name="payment_info.phtml" hash="3f8a01e4bcd2efab555d729bee8335da"/></dir><dir name="eabi_postoffice"><file name="shipping_method_form.phtml" hash="2b74940d708277d75ac29917f52055a4"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="eabi_dpdee.xml" hash="27179eee219a0a8c85b87b8d670ae9e1"/><file name="eabi_postoffice.xml" hash="1b5b7e81226f5a8fdefc19ef618f38f5"/></dir><dir name="template"><dir name="eabi_dpdee"><file name="payment_info.phtml" hash="3f8a01e4bcd2efab555d729bee8335da"/></dir><dir name="eabi_postoffice"><dir name="tracking"><file name="popup.phtml" hash="bdfccfd7127864575a27587a95e3930c"/></dir><file name="available.phtml" hash="c24db2206654d096e898cc034370676b"/><file name="multishipping.phtml" hash="b18864cf6636826fd9b9ef11cd35657f"/><file name="shipping.phtml" hash="b0edc38cd43bdcfede1f4cf5348c9dd6"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Eabi_Postoffice.xml" hash="6ce03705525001d2762c0c44aa1be3f5"/><file name="Eabi_DpdEE.xml" hash="e1e4750f48585ed8900bae8e096e7bb1"/></dir></target><target name="magelocale"><dir name="en_US"><file name="Eabi_DpdEE.csv" hash="d53a6b36efac9db3dfad081f31712b40"/><file name="Eabi_Postoffice.csv" hash="651b14b0e55dbeeb55de579a1a993eab"/></dir><dir name="et_EE"><file name="Eabi_DpdEE.csv" hash="0a64d6699de9f680874acbc9869d4837"/><file name="Eabi_Postoffice.csv" hash="ea423904bbab2d44e6b68a537576c567"/></dir><dir name="ru_RU"><file name="Eabi_DpdEE.csv" hash="a208ad8515648b555ca13c9209c4f833"/><file name="Eabi_Postoffice.csv" hash="651b14b0e55dbeeb55de579a1a993eab"/></dir><dir name="hu_HU"><file name="Eabi_Postoffice.csv" hash="651b14b0e55dbeeb55de579a1a993eab"/></dir><dir name="fi_FI"><file name="Eabi_Postoffice.csv" hash="651b14b0e55dbeeb55de579a1a993eab"/></dir><dir name="lt_LT"><file name="Eabi_Postoffice.csv" hash="651b14b0e55dbeeb55de579a1a993eab"/></dir><dir name="sv_SE"><file name="Eabi_Postoffice.csv" hash="bbad7cd0c48e9482913265b2f0f0cef9"/></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><file name="eabi_dpdee.css" hash="dcffac29e30c23248afd296ba6eba357"/><file name="eabi_postoffice.css" hash="1baea3a2164029da5adcb67df9ae42da"/></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><file name="eabi_postoffice.css" hash="df0bc2bfd582fc01eb23ffe23fe56e90"/></dir></dir></dir><dir name="default"><dir name="default"><dir name="css"><file name="eabi_postoffice.css" hash="df0bc2bfd582fc01eb23ffe23fe56e90"/></dir></dir></dir></dir></target><target name="mageweb"><dir name="js"><dir name="eabi_js"><file name="eabi_dpdee.js" hash="bced7e30c8c108c77b773e8c921b7d12"/></dir></dir></target></contents>
|
26 |
<compatible/>
|
27 |
<dependencies><required><package><name>Eabi_Livehandler</name><channel>community</channel><min>0.1.15</min><max>1.0.0</max></package></required></dependencies>
|
28 |
</package>
|