Version Notes
Bugfix: ParcelShops for map not filtered correctly when calling webservice
Download this release
Release Info
Developer | PHPro |
Extension | dpdshipping |
Version | 1.1.1 |
Comparing to | |
See all releases |
Code changes from version 1.1.0 to 1.1.1
app/code/community/DPD/Shipping/Model/Webservice.php
CHANGED
@@ -351,7 +351,8 @@ class DPD_Shipping_Model_Webservice extends Mage_Core_Model_Abstract
|
|
351 |
$parameters = array(
|
352 |
'longitude' => $longitude,
|
353 |
'latitude' => $latitude,
|
354 |
-
'limit' => $limit
|
|
|
355 |
);
|
356 |
|
357 |
$result = $this->_webserviceCall($webserviceUrl, 'findParcelShopsByGeoData', $parameters);
|
351 |
$parameters = array(
|
352 |
'longitude' => $longitude,
|
353 |
'latitude' => $latitude,
|
354 |
+
'limit' => $limit,
|
355 |
+
'consigneePickupAllowed' => 'true'
|
356 |
);
|
357 |
|
358 |
$result = $this->_webserviceCall($webserviceUrl, 'findParcelShopsByGeoData', $parameters);
|
app/code/community/DPD/Shipping/etc/config.xml
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
<config>
|
3 |
<modules>
|
4 |
<DPD_Shipping>
|
5 |
-
<version>1.1.
|
6 |
</DPD_Shipping>
|
7 |
</modules>
|
8 |
<global>
|
2 |
<config>
|
3 |
<modules>
|
4 |
<DPD_Shipping>
|
5 |
+
<version>1.1.1</version>
|
6 |
</DPD_Shipping>
|
7 |
</modules>
|
8 |
<global>
|
package.xml
CHANGED
@@ -1,22 +1,18 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>dpdshipping</name>
|
4 |
-
<version>1.1.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>DPD Shipping</summary>
|
10 |
<description>DPD Shipping By PHPro</description>
|
11 |
-
<notes
|
12 |
-
- Improvement: better error logging for web service errors
|
13 |
-
- Improvement: Checkout field “Company” also added on label
|
14 |
-
- Bugfix: billing address used on certain labels
|
15 |
-
- Bugfix: weight calculation incorrect if parcel has multiple items of same product or a product belongs to a configurable or bundled product</notes>
|
16 |
<authors><author><name>PHPro</name><user>heremke</user><email>info@phpro.be</email></author></authors>
|
17 |
-
<date>2014-
|
18 |
-
<time>
|
19 |
-
<contents><target name="magecommunity"><dir name="DPD"><dir name="Shipping"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><dir name="Grid"><dir name="Renderer"><file name="Shippingmethod.php" hash="b70aad5bba5c4eb5cc897dcc12e3c199"/></dir></dir><file name="Grid.php" hash="8b0c167082dd0dbdc91e7c52b5ba5e6b"/><dir name="View"><dir name="Tab"><file name="Returnlabels.php" hash="7917e9cd5107154a83561e9a399de876"/></dir></dir></dir><file name="Order.php" hash="3bf3e1fb85abbfe21a051442920ab479"/></dir><dir name="Shipping"><dir name="Carrier"><dir name="Dpdclassic"><dir name="Tablerate"><file name="Grid.php" hash="e7ac634260c5f6d3c70b5f9c8875f265"/></dir></dir><dir name="Dpdparcelshops"><dir name="Tablerate"><file name="Grid.php" hash="dfe9582089ac0729d66853415a5e57f3"/></dir></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Form"><file name="Availability.php" hash="7883b99fbec71aa29486a81065476b12"/><file name="Dpdclassicexport.php" hash="b8bb24d799599844e8a9174f7dc4606c"/><file name="Dpdparcelshopsexport.php" hash="a5facc313e5249cc9d73249b40956a49"/></dir></dir></dir></dir><dir name="Carrier"><file name="Parcelshop.php" hash="04f72fb040c0808f953f0fefa758fa13"/></dir></dir><dir name="Helper"><file name="Data.php" hash="351a65c59caa16990d34f891b6a41bae"/></dir><dir name="Model"><dir name="Adminhtml"><file name="Dpdgrid.php" hash="8932dff306c5e8faff5975bd173e1c6b"/><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Shipping"><dir name="Dpdclassic"><file name="Tablerate.php" hash="2448a6974c41d4361a1125c7c26d02a9"/></dir><dir name="Dpdparcelshops"><file name="Tablerate.php" hash="259c9918f4c2e29a0d8478409da879e4"/></dir><file name="Specialparcelshops.php" hash="67d996d145f0206e9fab5954bf6b0063"/></dir></dir></dir></dir></dir><dir name="Carrier"><file name="Dpdclassic.php" hash="7a422443b2b84020a11bf268f7dd0451"/><file name="Dpdparcelshops.php" hash="5da790abc3bfc0e314a63970ed2c64b9"/></dir><dir name="Dpdclassic"><file name="Tablerate.php" hash="9cec2a0a694a1af5fc44fe9cbf3b8283"/></dir><dir name="Dpdparcelshops"><file name="Tablerate.php" hash="be1dfb643e62f3ea0a6c527b6ef88ca9"/></dir><dir name="Mysql4"><dir name="Dpdclassic"><dir name="Tablerate"><file name="Collection.php" hash="8eadb25daf3962f3adba71d380129683"/></dir><file name="Tablerate.php" hash="3e4c4062ad5b6e7c2e72262c28e6ca86"/></dir><dir name="Dpdparcelshops"><dir name="Tablerate"><file name="Collection.php" hash="bbfbfdcb550a97195e2f13e582d96d59"/></dir><file name="Tablerate.php" hash="4da8aeed439f685ea031ed73f09c17c6"/></dir><dir name="Returnlabels"><file name="Collection.php" hash="80fe36b9f31d150f02aebb64a769fc5d"/></dir><file name="Returnlabels.php" hash="1d75562904a21b572535483d2d086cdd"/><dir name="Specialparcelshops"><file name="Collection.php" hash="cd7d740fa52301b798ace547820473ef"/></dir><file name="Specialparcelshops.php" hash="64dd72846b549e7fd3a73e96c3542b54"/></dir><file name="Observer.php" hash="3f9d7ceccf63701c16b596a0c31f1c27"/><file name="Returnlabels.php" hash="13886c6c9050d6f67a14b32af89362e6"/><file name="Specialparcelshops.php" hash="d1f2b72ffab70117fcd2b9f2820cd028"/><dir name="System"><dir name="Config"><dir name="Source"><file name="Display.php" hash="af239a08df6796995e0c580d59d88c46"/><file name="Paperformat.php" hash="e0c638d918566a8b868cca06a459627b"/><file name="Ratetypes.php" hash="1fdeeb0624939d674d625e2c664f907c"/><file name="Weightunit.php" hash="857dd1b887f0f8485616107e6d66db01"/></dir></dir></dir><file name="Webservice.php" hash="
|
20 |
<compatible/>
|
21 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
22 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>dpdshipping</name>
|
4 |
+
<version>1.1.1</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>DPD Shipping</summary>
|
10 |
<description>DPD Shipping By PHPro</description>
|
11 |
+
<notes>Bugfix: ParcelShops for map not filtered correctly when calling webservice</notes>
|
|
|
|
|
|
|
|
|
12 |
<authors><author><name>PHPro</name><user>heremke</user><email>info@phpro.be</email></author></authors>
|
13 |
+
<date>2014-08-19</date>
|
14 |
+
<time>13:46:36</time>
|
15 |
+
<contents><target name="magecommunity"><dir name="DPD"><dir name="Shipping"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><dir name="Grid"><dir name="Renderer"><file name="Shippingmethod.php" hash="b70aad5bba5c4eb5cc897dcc12e3c199"/></dir></dir><file name="Grid.php" hash="8b0c167082dd0dbdc91e7c52b5ba5e6b"/><dir name="View"><dir name="Tab"><file name="Returnlabels.php" hash="7917e9cd5107154a83561e9a399de876"/></dir></dir></dir><file name="Order.php" hash="3bf3e1fb85abbfe21a051442920ab479"/></dir><dir name="Shipping"><dir name="Carrier"><dir name="Dpdclassic"><dir name="Tablerate"><file name="Grid.php" hash="e7ac634260c5f6d3c70b5f9c8875f265"/></dir></dir><dir name="Dpdparcelshops"><dir name="Tablerate"><file name="Grid.php" hash="dfe9582089ac0729d66853415a5e57f3"/></dir></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Form"><file name="Availability.php" hash="7883b99fbec71aa29486a81065476b12"/><file name="Dpdclassicexport.php" hash="b8bb24d799599844e8a9174f7dc4606c"/><file name="Dpdparcelshopsexport.php" hash="a5facc313e5249cc9d73249b40956a49"/></dir></dir></dir></dir><dir name="Carrier"><file name="Parcelshop.php" hash="04f72fb040c0808f953f0fefa758fa13"/></dir></dir><dir name="Helper"><file name="Data.php" hash="351a65c59caa16990d34f891b6a41bae"/></dir><dir name="Model"><dir name="Adminhtml"><file name="Dpdgrid.php" hash="8932dff306c5e8faff5975bd173e1c6b"/><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Shipping"><dir name="Dpdclassic"><file name="Tablerate.php" hash="2448a6974c41d4361a1125c7c26d02a9"/></dir><dir name="Dpdparcelshops"><file name="Tablerate.php" hash="259c9918f4c2e29a0d8478409da879e4"/></dir><file name="Specialparcelshops.php" hash="67d996d145f0206e9fab5954bf6b0063"/></dir></dir></dir></dir></dir><dir name="Carrier"><file name="Dpdclassic.php" hash="7a422443b2b84020a11bf268f7dd0451"/><file name="Dpdparcelshops.php" hash="5da790abc3bfc0e314a63970ed2c64b9"/></dir><dir name="Dpdclassic"><file name="Tablerate.php" hash="9cec2a0a694a1af5fc44fe9cbf3b8283"/></dir><dir name="Dpdparcelshops"><file name="Tablerate.php" hash="be1dfb643e62f3ea0a6c527b6ef88ca9"/></dir><dir name="Mysql4"><dir name="Dpdclassic"><dir name="Tablerate"><file name="Collection.php" hash="8eadb25daf3962f3adba71d380129683"/></dir><file name="Tablerate.php" hash="3e4c4062ad5b6e7c2e72262c28e6ca86"/></dir><dir name="Dpdparcelshops"><dir name="Tablerate"><file name="Collection.php" hash="bbfbfdcb550a97195e2f13e582d96d59"/></dir><file name="Tablerate.php" hash="4da8aeed439f685ea031ed73f09c17c6"/></dir><dir name="Returnlabels"><file name="Collection.php" hash="80fe36b9f31d150f02aebb64a769fc5d"/></dir><file name="Returnlabels.php" hash="1d75562904a21b572535483d2d086cdd"/><dir name="Specialparcelshops"><file name="Collection.php" hash="cd7d740fa52301b798ace547820473ef"/></dir><file name="Specialparcelshops.php" hash="64dd72846b549e7fd3a73e96c3542b54"/></dir><file name="Observer.php" hash="3f9d7ceccf63701c16b596a0c31f1c27"/><file name="Returnlabels.php" hash="13886c6c9050d6f67a14b32af89362e6"/><file name="Specialparcelshops.php" hash="d1f2b72ffab70117fcd2b9f2820cd028"/><dir name="System"><dir name="Config"><dir name="Source"><file name="Display.php" hash="af239a08df6796995e0c580d59d88c46"/><file name="Paperformat.php" hash="e0c638d918566a8b868cca06a459627b"/><file name="Ratetypes.php" hash="1fdeeb0624939d674d625e2c664f907c"/><file name="Weightunit.php" hash="857dd1b887f0f8485616107e6d66db01"/></dir></dir></dir><file name="Webservice.php" hash="42b9710a945500ee85a49a6bfac92244"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="DpdconfigController.php" hash="c04b8c67343fcb446948dde216cb7052"/><file name="DpdorderController.php" hash="7d325d000c3aa44cab90fdb275cbbece"/></dir><file name="AjaxController.php" hash="9e70595106f2dccd8b6d6b007f104d16"/></dir><dir name="etc"><file name="adminhtml.xml" hash="9b48a3489a485e86c8f2720a7a4380d8"/><file name="config.xml" hash="45d19935f4eb776fd6472cd1d7a4cca7"/><file name="system.xml" hash="3b19eb465b3409f4cfe062bf698b1aa4"/></dir><dir name="sql"><dir name="dpd_setup"><file name="mysql4-install-0.0.1.php" hash="3dc22f7bf34a98be9b7f746e21832988"/><file name="mysql4-upgrade-0.0.1-0.0.2.php" hash="1d5467d1cc3b7ed2019bd6eb05aa1f08"/><file name="mysql4-upgrade-0.0.2-0.0.3.php" hash="a1a30b8234ef4b8cc26e220f559af25f"/><file name="mysql4-upgrade-0.0.3-0.0.4.php" hash="ee870d8941ff7f5565c148e6a26056bb"/><file name="mysql4-upgrade-0.0.4-0.0.5.php" hash="2d4632b58e315f3de7d630d41bd2d3f9"/><file name="mysql4-upgrade-0.0.5-0.0.6.php" hash="e75ee16a3c996fc9204a52f6a130f1c8"/><file name="mysql4-upgrade-0.0.6-0.0.7.php" hash="80226a27f1a62aeebef355490e89613a"/><file name="mysql4-upgrade-0.0.7-0.0.8.php" hash="14e65f350882cf315a7dc3779fbf4fc8"/><file name="mysql4-upgrade-0.0.8-0.0.9.php" hash="13712f377f95f127001df8ad31a33b9f"/><file name="mysql4-upgrade-0.0.9-0.1.0.php" hash="213b96a22d752e7d8059da44d17dec2a"/><file name="mysql4-upgrade-1.0.5-1.0.6.php" hash="d1b875f6e476a4485666621259ffd612"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><dir name="dpd"><file name="shipping.xml" hash="489b47b14eb3bec23bbfd254fda398df"/></dir></dir><dir name="template"><dir name="dpd"><dir name="order"><dir name="view"><dir name="tab"><file name="returnlabels.phtml" hash="cc2f679da3a728fbbe1ddc510c04cdae"/></dir></dir></dir><dir name="system"><dir name="config"><file name="availability.phtml" hash="5f17246a65c243bf0c8c4dfea499578e"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="dpd_shipping.xml" hash="de035fc33a659e5f22e6dc76ac616eb0"/></dir><dir name="template"><dir name="dpd"><file name="gmapsapi.phtml" hash="e0073b425f55c844918b5c83aea20b1b"/><file name="ordertracking.phtml" hash="2273e469b6f129b2f174424ddebe83a3"/><file name="parcelshop.phtml" hash="14294a6481c403cd5167ce0cb13cf31f"/><file name="parcelshoplink.phtml" hash="e2fde828602b04e9eb6e8c26b6077986"/><file name="parcelshopselected.phtml" hash="dff97c974b3bb449dc8abdb8c1f764de"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="zDPD_Shipping.xml" hash="2014a79baf3f800f46222ceb11310d59"/></dir></target><target name="magelocale"><dir name="en_US"><file name="DPD_Shipping.csv" hash="89dc69f206a0ee6396fcc8a213a86354"/><dir name="template"><dir name="email"><dir name="sales"><file name="dpd_returnlabel.html" hash="e5752017a877b81487e262ae2e5e3a40"/></dir></dir></dir></dir><dir name="de_DE"><file name="DPD_Shipping.csv" hash="dad8bbae787e4328e07ce917a904860d"/><dir name="template"><dir name="email"><dir name="sales"><file name="dpd_returnlabel.html" hash="f7db3882a6f0067c410911298ef919a2"/></dir></dir></dir></dir><dir name="fr_FR"><file name="DPD_Shipping.csv" hash="d09d91cebb4616185228748e81948f9c"/><dir name="template"><dir name="email"><dir name="sales"><file name="dpd_returnlabel.html" hash="565cd604928a8474a4d62f42e1fc49a6"/></dir></dir></dir></dir><dir name="nl_NL"><file name="DPD_Shipping.csv" hash="5538d6053277df2da478b2d0f5f3a806"/><dir name="template"><dir name="email"><dir name="sales"><file name="dpd_returnlabel.html" hash="cd2911dd92a2a3ff14acb6fa9fc9ed16"/></dir></dir></dir></dir></target><target name="mageweb"><dir name="js"><dir name="dpd"><file name="onestepcheckout_shipping.js" hash="e3cce95f7b071c7560a7b5ddfb7f024c"/><file name="shipping.js" hash="620eca95f1de0f20d9336567062c5238"/><dir name="window"><file name="shipping.js" hash="7ad8ea9367757797676269a40ec32067"/></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="dpd"><file name="shipping.css" hash="a0996bb45a96e7228efe417715f79cc1"/><file name="window.css" hash="b0b31c19dd3b52e7408df6ab53e25dcd"/></dir></dir><dir name="images"><dir name="dpd"><file name="ajax-loader.gif" hash="f3dbc538b63d07156155acf0631ae375"/><file name="button_close.png" hash="040640376fe4f699f97f0d59b64e79cf"/><file name="dpd_parcelshop_logo.png" hash="43e479d6bb23dea74f2ec6ff8a1e390c"/><file name="icon_info.gif" hash="4c85c6937f19e50c5e871c2699e99bee"/><file name="icon_info.png" hash="53faeafe236c775f54752bc2008efa97"/><file name="icon_parcelshop.png" hash="202e38024b9f41483285a7b2d34d2a56"/><file name="icon_parcelshop_shadow.png" hash="263ee734ba6bb38060fd47a5b3de64ae"/><file name="icon_route.png" hash="fe07947b6f600723e682f2fcb8fca88f"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="dpd"><dir name="returnlabel"><file name="instructions.pdf" hash="2481e2a62ed1ea7c5b309dc70edece63"/></dir></dir></dir></dir></dir></target></contents>
|
16 |
<compatible/>
|
17 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
18 |
</package>
|