Version Notes
- Added field Sh_email
Download this release
Release Info
Developer | Magento Core Team |
Extension | Eabi_DpdEE |
Version | 0.1.25 |
Comparing to | |
See all releases |
Code changes from version 0.1.24 to 0.1.25
app/code/community/Eabi/DpdEE/CHANGELOG.txt
CHANGED
@@ -81,4 +81,7 @@
|
|
81 |
- SUPEE-6788 Compatibility
|
82 |
|
83 |
0.1.24
|
84 |
-
- SUPEE-6788 Compatibility further improvement
|
|
|
|
|
|
81 |
- SUPEE-6788 Compatibility
|
82 |
|
83 |
0.1.24
|
84 |
+
- SUPEE-6788 Compatibility further improvement
|
85 |
+
|
86 |
+
0.1.25
|
87 |
+
- Added field Sh_email
|
app/code/community/Eabi/DpdEE/Model/Api.php
CHANGED
@@ -175,18 +175,26 @@ class Eabi_DpdEE_Model_Api extends Varien_Object {
|
|
175 |
}
|
176 |
$client = new Zend_Http_Client($url);
|
177 |
$options = array(
|
178 |
-
'timeout' => $this->getConfigData('http_request_timeout')>10
|
179 |
);
|
180 |
$client->setConfig($options);
|
181 |
-
$client->setParameterPost($params);
|
182 |
-
$resp = $client->request(Zend_Http_Client::POST);
|
183 |
$dataToLog = array(
|
184 |
'url' => $url,
|
185 |
'method' => Zend_Http_Client::POST,
|
186 |
'params' => $this->_debugReplace($params),
|
187 |
);
|
188 |
-
|
189 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
190 |
$decodeResult = @json_decode($resp->getBody(), true);
|
191 |
if (!is_array($decodeResult) || !isset($decodeResult['Error_code'])
|
192 |
|| $decodeResult['Error_code'] !== 0) {
|
175 |
}
|
176 |
$client = new Zend_Http_Client($url);
|
177 |
$options = array(
|
178 |
+
'timeout' => $this->getConfigData('http_request_timeout') > 10 ? $this->getConfigData('http_request_timeout') : 10,
|
179 |
);
|
180 |
$client->setConfig($options);
|
|
|
|
|
181 |
$dataToLog = array(
|
182 |
'url' => $url,
|
183 |
'method' => Zend_Http_Client::POST,
|
184 |
'params' => $this->_debugReplace($params),
|
185 |
);
|
186 |
+
try {
|
187 |
+
$client->setParameterPost($params);
|
188 |
+
$resp = $client->request(Zend_Http_Client::POST);
|
189 |
+
} catch (Exception $ex) {
|
190 |
+
$dataToLog['exception'] = $ex->__toString();
|
191 |
+
if ($this->_isLogEnabled()) {
|
192 |
+
Mage::log($dataToLog, Zend_Log::DEBUG, __CLASS__ . '.log');
|
193 |
+
}
|
194 |
+
throw $ex;
|
195 |
+
}
|
196 |
+
|
197 |
+
|
198 |
$decodeResult = @json_decode($resp->getBody(), true);
|
199 |
if (!is_array($decodeResult) || !isset($decodeResult['Error_code'])
|
200 |
|| $decodeResult['Error_code'] !== 0) {
|
app/code/community/Eabi/DpdEE/Model/Post.php
CHANGED
@@ -206,6 +206,7 @@ class Eabi_DpdEE_Model_Post extends Eabi_Postoffice_Model_Carrier_Abstract {
|
|
206 |
'Sh_phone' => $this->_getPhoneFromDescription($selectedOffice),
|
207 |
'Po_remark' => $this->_getRemark($order),
|
208 |
'Sh_remark' => '',
|
|
|
209 |
'Sh_pudo' => 'true',
|
210 |
'Sh_pudo_id' => $selectedOfficeId,
|
211 |
'Sh_parcel_qty' => $this->_getNumberOfPackagesForOrder($order),
|
206 |
'Sh_phone' => $this->_getPhoneFromDescription($selectedOffice),
|
207 |
'Po_remark' => $this->_getRemark($order),
|
208 |
'Sh_remark' => '',
|
209 |
+
'Sh_email' => $order->getCustomerEmail(),
|
210 |
'Sh_pudo' => 'true',
|
211 |
'Sh_pudo_id' => $selectedOfficeId,
|
212 |
'Sh_parcel_qty' => $this->_getNumberOfPackagesForOrder($order),
|
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.25</version>
|
40 |
</Eabi_DpdEE>
|
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.25</version>
|
43 |
</Eabi_DpdEE>
|
44 |
</modules>
|
45 |
</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,11 @@
|
|
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>2015-
|
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="274e3aa4aad16160469d577af41ead2c"/></dir></dir></dir></dir><dir name="Info"><file name="Payment.php" hash="3a88ba8f59b923856a308bb9139d7910"/></dir><dir name="Order"><file name="Courier.php" hash="758e928635b2e7108153e3156ad7095b"/></dir><file name="Invoice.php" hash="e99999135dad4bad12609d9acbff637e"/></dir><dir name="Helper"><file name="Data.php" hash="56d1e034e1dc8e2b2f1830ae61a81bb7"/></dir><dir name="Model"><dir name="Action"><dir name="Carrier"><dir name="Order"><file name="Courier.php" hash="c380d8524072c4c194a18f797fc77f8c"/></dir></dir></dir><dir name="Button"><file name="Courier.php" hash="70b3e4a079f6805914de4c48dde9f11b"/></dir><dir name="Payment"><file name="Processor.php" hash="144fe8ad22dbefcd55fced2021ae18d0"/></dir><dir name="Source"><dir name="Label"><file name="Position.php" hash="b07167f21359c12540b274cbdecbb8fc"/></dir><file name="Service.php" hash="5b6c2ead82b90761a27555eb1c38cd4f"/></dir><file name="Api.php" 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.25</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>- Added field Sh_email</notes>
|
21 |
<authors><author><name>Matis Matis</name><user>auto-converted</user><email>info@e-abi.ee</email></author></authors>
|
22 |
+
<date>2015-12-22</date>
|
23 |
+
<time>01:34:59</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="274e3aa4aad16160469d577af41ead2c"/></dir></dir></dir></dir><dir name="Info"><file name="Payment.php" hash="3a88ba8f59b923856a308bb9139d7910"/></dir><dir name="Order"><file name="Courier.php" hash="758e928635b2e7108153e3156ad7095b"/></dir><file name="Invoice.php" hash="e99999135dad4bad12609d9acbff637e"/></dir><dir name="Helper"><file name="Data.php" hash="56d1e034e1dc8e2b2f1830ae61a81bb7"/></dir><dir name="Model"><dir name="Action"><dir name="Carrier"><dir name="Order"><file name="Courier.php" hash="c380d8524072c4c194a18f797fc77f8c"/></dir></dir></dir><dir name="Button"><file name="Courier.php" hash="70b3e4a079f6805914de4c48dde9f11b"/></dir><dir name="Payment"><file name="Processor.php" hash="144fe8ad22dbefcd55fced2021ae18d0"/></dir><dir name="Source"><dir name="Label"><file name="Position.php" hash="b07167f21359c12540b274cbdecbb8fc"/></dir><file name="Service.php" hash="5b6c2ead82b90761a27555eb1c38cd4f"/></dir><file name="Api.php" hash="33736152afdb6c6e38253c8040935f29"/><file name="Config.php" hash="6c61f2e9d337a819f4817d87463d6715"/><file name="Flat.php" hash="ad6a01393c5b2989f49e5574850714fd"/><file name="Observer.php" hash="6b43c309bbd4f4a2830b15059c27b467"/><file name="Post.php" hash="568ebfae18a5dabd4c0d5cb27278906e"/></dir><dir name="etc"><file name="config.xml" hash="9b4bf63d5dfc898949c07938efa9c07b"/><file name="system.xml" hash="16564a595918ffc90bc04bd019eec56d"/></dir><dir name="sql"><dir name="eabi_dpdee_setup"><file name="mysql4-install-0.1.0.php" hash="dd703e035f111caff06859c09f4e3eb5"/><file name="mysql4-upgrade-0.1.0-0.1.1.php" hash="4dffece4db7dec27f0d70fedcfce6a75"/><file name="mysql4-upgrade-0.1.1-0.1.2.php" hash="84855893b48f9025e80164956e51d301"/><file name="mysql4-upgrade-0.1.2-0.1.3.php" hash="d26a012199c29fd38191cefa9c567668"/><file name="mysql4-upgrade-0.1.3-0.1.4.php" hash="d72b3a1dc6a4d7d0470ef55c4447370f"/><file name="mysql4-upgrade-0.1.6-0.1.7.php" hash="8b2535e4d515a3ce6648f41158b20a69"/><file name="mysql4-upgrade-0.1.9-0.1.10.php" hash="439aa9cd15f5d274d1ca8494c8248524"/></dir></dir><file name="CHANGELOG.txt" hash="d515ef91c18ee970692d67aa5e538278"/><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="9f8512f2d7b8c88940e5571e4deb5c01"/><file name="Remove.php" hash="aecee3efce9c584f6e5c62db36ea2d99"/></dir></dir></dir></dir><dir name="Config"><file name="Rebuildbutton.php" hash="2f2f1c621f8987db5c1f45250ec1af43"/></dir></dir><dir name="Helper"><file name="Countrycode.php" hash="9c6d163d6c8dff19c381adb5fa06c211"/><file name="Data.php" hash="00bc797ccc643332618732f51e5b41d3"/></dir><dir name="Model"><dir name="Carrier"><file name="Abstract.php" hash="98f641820518ed02d87c198331d51ce5"/><file name="Result.php" hash="b087842bb78decbeab2b352aac5fa741"/></dir><dir name="Email"><dir name="Template"><file name="Mailer.php" hash="6649ba87a1b47e083b3c9284a4aadda5"/></dir></dir><dir name="Licenceable"><dir name="Autosend"><file name="Method.php" hash="ddcfe7c15b3d528f016cb8968e10b690"/></dir><dir name="Payment"><file name="Method.php" hash="2a02e190756887fa9beef275dac91993"/></dir><dir name="Shipping"><file name="Method.php" hash="896dfa0d9ce4bd61d04f479830f66262"/></dir><file name="Method.php" hash="94768cb740a9382340f182c4c6d8b82c"/></dir><dir name="Mysql4"><dir name="Carriermodule"><file name="Collection.php" hash="34095268b71d7aeb8d1a520c0ed4422b"/></dir><dir name="Office"><file name="Collection.php" hash="4ba141a461a61e9f04cd32af8241cccc"/></dir><file name="Carriermodule.php" hash="5fa967a34c175f08c33d9bf28110c83c"/><file name="Office.php" hash="419ce5aa8c17b33cc5fc8eb9ba22b77e"/></dir><dir name="Source"><file name="Sendevent.php" hash="d6d9b4b9e09796e0dcef2969d7538b8e"/></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="Country.php" hash="601467914ec74d8272541a60a2ac9768"/></dir></dir></dir><file name="Carriermodule.php" hash="ef7ed997237ef59e8d809cdcf66fd3bd"/><file name="Observer.php" hash="311c99f5e6c8279ace6aa98647a9c96f"/><file name="Office.php" hash="fdd0202194912bd71dcbae000831b0e3"/><file name="Orderview.php" hash="b11c1a5cb5f53b781897e63a5281e8e1"/><file name="Updater.php" hash="31919cc1e0dc02229cbc8f0a1c489f7b"/></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Eabi"><dir name="Postoffice"><file name="PostofficeController.php" hash="a18bca4afc8147d2d0b94b010feb8067"/></dir></dir><file name="PostofficeController.php" hash="ed5dee97f26a4d876d8ee0842e1e5c7b"/></dir><file name="IndexController.php" hash="b3288b535547c1642b955b748ec18f9f"/></dir><dir name="etc"><file name="config.xml" hash="0edfec149961a133d796686ade80be1e"/></dir><dir name="sql"><dir name="eabi_postoffice_setup"><file name="mysql4-install-0.1.0.php" hash="cd14642248c474276fcc0bc44b47f679"/><file name="mysql4-upgrade-0.1.0-0.1.1.php" hash="7e482871358ce4286c8df3e1ec76c416"/><file name="mysql4-upgrade-0.1.1-0.1.2.php" hash="e88ad26ba8b6e5c1b5b9c53705ebb814"/><file name="mysql4-upgrade-0.1.11-0.1.12.php" hash="9e457075ce6ea781401eb444356f572f"/><file name="mysql4-upgrade-0.1.5-0.1.6.php" hash="9660ecf5d0122312b53691cc732aac79"/><file name="mysql4-upgrade-0.1.6-0.1.7.php" hash="3b425429ab1f75db336626f042f62f72"/></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="6db252214380599864969ff3bb920597"/></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="2cb860aeb28ddf641d9cb682ead6629a"/></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="891b37e8e618898bccad4e5393746d43"/></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="04cdbd8a12d570fb27016065e57baaaf"/></dir><file name="available.phtml" hash="f6e9e10c0afeb31756271011187b75a7"/><file name="multishipping.phtml" hash="69557c06e48f9e17acb464631935e8bc"/><file name="shipping.phtml" hash="864293a6b07ac3ea97d7b6be78f12911"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Eabi_Postoffice.xml" hash="df387d06071935c4c98c6a92808b60e3"/><file name="Eabi_DpdEE.xml" hash="ce9ea1450cabd690a0cd7ab3d2dbca5a"/></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="61ebb61afb3fee7aa4967bc309372f2d"/><file name="eabi_postoffice.css" hash="35d7b5905cead7922bd0c924d1de6a18"/></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><file name="eabi_postoffice.css" hash="e5f0da3ae91e28c2b72a94d0962b03bb"/></dir></dir></dir><dir name="default"><dir name="default"><dir name="css"><file name="eabi_postoffice.css" hash="e5f0da3ae91e28c2b72a94d0962b03bb"/></dir></dir></dir></dir></target><target name="mageweb"><dir name="js"><dir name="eabi_js"><file name="eabi_dpdee.js" hash="f56b37daf1563510c92858497dbd6d74"/></dir></dir></target></contents>
|
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>
|