Version Notes
DPDFrance_Shipping for Magento CE 1.4 - 1.9
Download this release
Release Info
Developer | DPD France S.A.S. |
Extension | DPDFrance_Shipping |
Version | 5.1.1 |
Comparing to | |
See all releases |
Code changes from version 5.1.0 to 5.1.1
- app/code/community/DPDFrance/Classic/etc/config.xml +1 -1
- app/code/community/DPDFrance/Export/etc/config.xml +1 -1
- app/code/community/DPDFrance/Predict/etc/config.xml +1 -1
- app/code/community/DPDFrance/Relais/controllers/{DPDFranceRelaisController.php → PickupController.php} +2 -2
- app/code/community/DPDFrance/Relais/etc/config.xml +2 -2
- app/design/frontend/base/default/template/dpdfrpredict/checkout/onepage/shipping_method/available.phtml +1 -1
- app/design/frontend/base/default/template/dpdfrrelais/checkout/onepage/shipping_method/available.phtml +1 -1
- package.xml +5 -5
app/code/community/DPDFrance/Classic/etc/config.xml
CHANGED
@@ -132,7 +132,7 @@
|
|
132 |
</default>
|
133 |
<modules>
|
134 |
<DPDFrance_Classic>
|
135 |
-
<version>5.
|
136 |
<depends>
|
137 |
<Mage_Shipping/>
|
138 |
</depends>
|
132 |
</default>
|
133 |
<modules>
|
134 |
<DPDFrance_Classic>
|
135 |
+
<version>5.1.1</version>
|
136 |
<depends>
|
137 |
<Mage_Shipping/>
|
138 |
</depends>
|
app/code/community/DPDFrance/Export/etc/config.xml
CHANGED
@@ -13,7 +13,7 @@
|
|
13 |
<config>
|
14 |
<modules>
|
15 |
<DPDFrance_Export>
|
16 |
-
<version>5.1.
|
17 |
<depends>
|
18 |
<Mage_Shipping/>
|
19 |
</depends>
|
13 |
<config>
|
14 |
<modules>
|
15 |
<DPDFrance_Export>
|
16 |
+
<version>5.1.1</version>
|
17 |
<depends>
|
18 |
<Mage_Shipping/>
|
19 |
</depends>
|
app/code/community/DPDFrance/Predict/etc/config.xml
CHANGED
@@ -72,7 +72,7 @@
|
|
72 |
</default>
|
73 |
<modules>
|
74 |
<DPDFrance_Predict>
|
75 |
-
<version>5.
|
76 |
<depends>
|
77 |
<Mage_Shipping/>
|
78 |
</depends>
|
72 |
</default>
|
73 |
<modules>
|
74 |
<DPDFrance_Predict>
|
75 |
+
<version>5.1.1</version>
|
76 |
<depends>
|
77 |
<Mage_Shipping/>
|
78 |
</depends>
|
app/code/community/DPDFrance/Relais/controllers/{DPDFranceRelaisController.php → PickupController.php}
RENAMED
@@ -9,7 +9,7 @@
|
|
9 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
10 |
*/
|
11 |
|
12 |
-
class
|
13 |
{
|
14 |
public static function stripAccents($str)
|
15 |
{
|
@@ -46,7 +46,7 @@ class DPDFrance_Relais_DPDFranceRelaisController extends Mage_Core_Controller_Fr
|
|
46 |
public function indexAction()
|
47 |
{
|
48 |
$address = $this->getRequest()->getParam('address');
|
49 |
-
$address = mb_convert_encoding(urldecode(
|
50 |
$address = self::stripAccents($address);
|
51 |
|
52 |
$zipcode = $this->getRequest()->getParam('zipcode');
|
9 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
10 |
*/
|
11 |
|
12 |
+
class DPDFrance_Relais_PickupController extends Mage_Core_Controller_Front_Action
|
13 |
{
|
14 |
public static function stripAccents($str)
|
15 |
{
|
46 |
public function indexAction()
|
47 |
{
|
48 |
$address = $this->getRequest()->getParam('address');
|
49 |
+
$address = mb_convert_encoding(urldecode($address),'UTF-8');
|
50 |
$address = self::stripAccents($address);
|
51 |
|
52 |
$zipcode = $this->getRequest()->getParam('zipcode');
|
app/code/community/DPDFrance/Relais/etc/config.xml
CHANGED
@@ -75,7 +75,7 @@
|
|
75 |
</default>
|
76 |
<modules>
|
77 |
<DPDFrance_Relais>
|
78 |
-
<version>5.
|
79 |
<depends>
|
80 |
<Mage_Shipping/>
|
81 |
</depends>
|
@@ -161,7 +161,7 @@
|
|
161 |
<use>standard</use>
|
162 |
<args>
|
163 |
<module>DPDFrance_Relais</module>
|
164 |
-
<frontName>
|
165 |
</args>
|
166 |
</dpdfrrelais>
|
167 |
</routers>
|
75 |
</default>
|
76 |
<modules>
|
77 |
<DPDFrance_Relais>
|
78 |
+
<version>5.1.1</version>
|
79 |
<depends>
|
80 |
<Mage_Shipping/>
|
81 |
</depends>
|
161 |
<use>standard</use>
|
162 |
<args>
|
163 |
<module>DPDFrance_Relais</module>
|
164 |
+
<frontName>dpdfrrelais</frontName>
|
165 |
</args>
|
166 |
</dpdfrrelais>
|
167 |
</routers>
|
app/design/frontend/base/default/template/dpdfrpredict/checkout/onepage/shipping_method/available.phtml
CHANGED
@@ -51,7 +51,7 @@
|
|
51 |
<input id="address" name="address" type="text" class="relaypoint-input-address" value="<?php echo $this->htmlEscape($this->getAddress()->getStreet(1))?>"/><br>
|
52 |
<input id="zipcode" name="zipcode" type="text" class="relaypoint-input-zipcode" value="<?php echo $this->htmlEscape($this->getAddress()->getPostcode())?>"/>
|
53 |
<input id="city" name="city" type="text" class="relaypoint-input-city" value="<?php echo $this->htmlEscape($this->getAddress()->getCity())?>"/>
|
54 |
-
<button class="dpdfrbutton" onclick="fetchPoint('<?php echo substr(Mage::getUrl('
|
55 |
<span>OK</span>
|
56 |
</button>
|
57 |
<span id="loadingpointswait" style="display:none;">
|
51 |
<input id="address" name="address" type="text" class="relaypoint-input-address" value="<?php echo $this->htmlEscape($this->getAddress()->getStreet(1))?>"/><br>
|
52 |
<input id="zipcode" name="zipcode" type="text" class="relaypoint-input-zipcode" value="<?php echo $this->htmlEscape($this->getAddress()->getPostcode())?>"/>
|
53 |
<input id="city" name="city" type="text" class="relaypoint-input-city" value="<?php echo $this->htmlEscape($this->getAddress()->getCity())?>"/>
|
54 |
+
<button class="dpdfrbutton" onclick="fetchPoint('<?php echo substr(Mage::getUrl('dpdfrrelais/pickup/index', array('_secure' => true)),0,-1)?>','suggestion')" type="button" style="height: 20px;padding: 0;width: 36px;">
|
55 |
<span>OK</span>
|
56 |
</button>
|
57 |
<span id="loadingpointswait" style="display:none;">
|
app/design/frontend/base/default/template/dpdfrrelais/checkout/onepage/shipping_method/available.phtml
CHANGED
@@ -51,7 +51,7 @@
|
|
51 |
<input id="address" name="address" type="text" class="relaypoint-input-address" value="<?php echo $this->htmlEscape($this->getAddress()->getStreet(1))?>"/><br>
|
52 |
<input id="zipcode" name="zipcode" type="text" class="relaypoint-input-zipcode" value="<?php echo $this->htmlEscape($this->getAddress()->getPostcode())?>"/>
|
53 |
<input id="city" name="city" type="text" class="relaypoint-input-city" value="<?php echo $this->htmlEscape($this->getAddress()->getCity())?>"/>
|
54 |
-
<button class="dpdfrbutton" onclick="fetchPoint('<?php echo substr(Mage::getUrl('
|
55 |
<span>OK</span>
|
56 |
</button>
|
57 |
<span id="loadingpointswait" style="display:none;">
|
51 |
<input id="address" name="address" type="text" class="relaypoint-input-address" value="<?php echo $this->htmlEscape($this->getAddress()->getStreet(1))?>"/><br>
|
52 |
<input id="zipcode" name="zipcode" type="text" class="relaypoint-input-zipcode" value="<?php echo $this->htmlEscape($this->getAddress()->getPostcode())?>"/>
|
53 |
<input id="city" name="city" type="text" class="relaypoint-input-city" value="<?php echo $this->htmlEscape($this->getAddress()->getCity())?>"/>
|
54 |
+
<button class="dpdfrbutton" onclick="fetchPoint('<?php echo substr(Mage::getUrl('dpdfrrelais/pickup/index', array('_secure' => true)),0,-1)?>','suggestion')" type="button" style="height: 20px;padding: 0;width: 36px;">
|
55 |
<span>OK</span>
|
56 |
</button>
|
57 |
<span id="loadingpointswait" style="display:none;">
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>DPDFrance_Shipping</name>
|
4 |
-
<version>5.1.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
|
7 |
<channel>community</channel>
|
@@ -10,10 +10,10 @@
|
|
10 |
<description>Ce module permet d'ajouter les offres de livraison DPD Relais, Predict, Classic et Intercontinental sur votre site e-commerce.
|
11 |
Il est destiné aux e-commerçants situés en France métropolitaine et détenteurs d'un contrat de transport chez DPD.</description>
|
12 |
<notes>DPDFrance_Shipping for Magento CE 1.4 - 1.9</notes>
|
13 |
-
<authors><author><name>DPD S.A.S.</name><user>DSI</user><email>
|
14 |
-
<date>2015-04-
|
15 |
-
<time>
|
16 |
-
<contents><target name="magecommunity"><dir name="DPDFrance"><dir name="Classic"><dir name="Helper"><file name="Data.php" hash="cfa2d8cf36a41f14ec1971b0407d2360"/></dir><dir name="Model"><dir name="Carrier"><file name="DPDFranceClassicShipping.php" hash="8841cc024ce0022faecfbeb25a5fb81c"/></dir><file name="Owebia.php" hash="d15ddf3d66f3a7712e0422165b8e88cd"/></dir><dir name="etc"><file name="config.xml" hash="
|
17 |
<compatible/>
|
18 |
<dependencies><required><php><min>5.0.0</min><max>6.0.0</max></php><extension><name>soap</name><min>1.0</min><max></max></extension></required></dependencies>
|
19 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>DPDFrance_Shipping</name>
|
4 |
+
<version>5.1.1</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
|
7 |
<channel>community</channel>
|
10 |
<description>Ce module permet d'ajouter les offres de livraison DPD Relais, Predict, Classic et Intercontinental sur votre site e-commerce.
|
11 |
Il est destiné aux e-commerçants situés en France métropolitaine et détenteurs d'un contrat de transport chez DPD.</description>
|
12 |
<notes>DPDFrance_Shipping for Magento CE 1.4 - 1.9</notes>
|
13 |
+
<authors><author><name>DPD France S.A.S.</name><user>DSI</user><email>support.ecommerce@dpd.fr</email></author></authors>
|
14 |
+
<date>2015-04-10</date>
|
15 |
+
<time>14:36:41</time>
|
16 |
+
<contents><target name="magecommunity"><dir name="DPDFrance"><dir name="Classic"><dir name="Helper"><file name="Data.php" hash="cfa2d8cf36a41f14ec1971b0407d2360"/></dir><dir name="Model"><dir name="Carrier"><file name="DPDFranceClassicShipping.php" hash="8841cc024ce0022faecfbeb25a5fb81c"/></dir><file name="Owebia.php" hash="d15ddf3d66f3a7712e0422165b8e88cd"/></dir><dir name="etc"><file name="config.xml" hash="1571b05a2fd0f6a8afb0def459a3dff7"/><file name="system.xml" hash="a08a0b981998e81d1477e86a31a4a0dc"/></dir></dir><dir name="Export"><dir name="Block"><dir name="Export"><dir name="Orders"><file name="Grid.php" hash="517cb396294ce8ec1d911dcd72b4459e"/></dir><file name="Orders.php" hash="c5fe378d1a9e4e3152803b9aae98b95c"/></dir><dir name="Tracking"><dir name="Orders"><file name="Grid.php" hash="3c548f639b97a1cb59634e32f5212a4c"/></dir><file name="Orders.php" hash="0727142364db150a3993afeb4dacd197"/></dir></dir><dir name="Helper"><file name="Data.php" hash="428d1b543f2550aedde558b6753eb832"/></dir><dir name="controllers"><file name="ExportController.php" hash="b9adffa016f7700a58c7ea67c3480629"/><file name="TrackingController.php" hash="d16659a6668988ad3e5773a921558238"/></dir><dir name="etc"><file name="config.xml" hash="db209afe4e185b6ff0fcba8d764313e6"/></dir></dir><dir name="Predict"><dir name="Helper"><file name="Data.php" hash="a38b8d10c687205740b99f0831ba9718"/></dir><dir name="Model"><dir name="Carrier"><file name="DPDFrancePredictShipping.php" hash="1c2ef6b5e79f5f25d495670d9e07c8af"/></dir><file name="Observer.php" hash="303925d00db6e1187803965e4bfb5331"/><file name="Owebia.php" hash="bff0ef2121438663f13e7ec24ec741e8"/></dir><dir name="etc"><file name="config.xml" hash="ea4cbc13ce499fdcd555f058be887f48"/><file name="system.xml" hash="1c0b8b0be33879df1c7ff5944da29afe"/></dir></dir><dir name="Relais"><dir name="Helper"><file name="Data.php" hash="d0d47baa19f1415f8aa2046658f9b094"/></dir><dir name="Model"><dir name="Carrier"><file name="DPDFranceRelaisShipping.php" hash="0351edcfbd38f7131af3579d2773faba"/></dir><file name="Observer.php" hash="e89d9e7d2af396c56f3b1731f3cf4ebe"/><file name="Outputs.php" hash="d4752d22b5044ce3bc29c15617832a2b"/><file name="Owebia.php" hash="f45517e834fa786d97a130b9d92474bd"/></dir><dir name="controllers"><file name="PickupController.php" hash="58116e151a1d3dd0e90879cfca2c69e5"/></dir><dir name="etc"><file name="config.xml" hash="217e12435923430da1921cbbfc5a271a"/><file name="system.xml" hash="a8c6d4e7c23832defa2d5abd7b3acb60"/></dir></dir></dir></target><target name="magemedia"><dir name="dpdfrance"><dir name="admin"><file name="logo.png" hash="e7b47272859a42f42d41339f6a2cd346"/><file name="rss_icon.png" hash="5df63e9d18e8af642108289ae2f1749b"/><file name="service_dom.png" hash="658f00232b8bcae034954b19c8681e6c"/><file name="service_predict.png" hash="31c279f0025ccd80ad427706a1614d0e"/><file name="service_relais.png" hash="93ea3df8e255fce572fe38ea114a6ce0"/><file name="service_world.png" hash="6b0a33dec808c936c4340a742f325796"/></dir><dir name="fonts"><file name="PlutoSansDPDExtraLight-Web.ttf" hash="133a30691494add15177142cd9fa9d28"/><file name="PlutoSansDPDLight-Web.ttf" hash="3b7b428b357ae09836153e4814352af1"/><file name="PlutoSansDPDRegular-Web.ttf" hash="7638f688c25d2268a6f5b2e70b949bbf"/><file name="PlutoSansDPDThin-Web.ttf" hash="2291598279cff8ed31fdc6af39dba22a"/></dir><dir name="front"><dir name="predict"><file name="carrier_logo.jpg" hash="2f65b000e843aca95fd1de9ee2ab06fe"/><file name="carrier_logo_alt.jpg" hash="692de3c50f19ca126f0d3f5dd469fa3e"/><file name="dpd_logo.png" hash="3a03db004b6105d9c499d5d9c64ab5d0"/><file name="dpd_predict_logo.png" hash="b562a9641ca4e90c31d263f41c3f637b"/><file name="predict_receive.jpg" hash="cbc5309345d1196f88d657d68ac7f908"/></dir><dir name="relais"><file name="DPD_Logo.png" hash="747d0dbdbc6df6afabf9698a389557d5"/><file name="carrier_logo.jpg" hash="2f98ce3752c2d7a055a7c19e43b0abf5"/><file name="carrier_logo_alt.jpg" hash="118958c4e3e0be20548c05a068fe3e7b"/><file name="horaires.png" hash="0ce51016d04a27600113e3762107fc15"/><file name="info.png" hash="e42e3b90b5611aaf3c170b569add2d93"/><file name="loader.gif" hash="6c322059292b30838a50f15a939a0200"/><file name="logo-max-png.png" hash="b80e78588624115fe3d8067107da8866"/><file name="pointrelais.png" hash="3ece61e5e6505b941fb318280b4040ce"/><file name="warning.png" hash="e1055c336abc2e5d76805c380f2b0134"/></dir></dir><file name="readme_dpdfrance_magento.pdf" hash="b016d9187ac1a4923a5f399b7a83fe38"/></dir></target><target name="mageetc"><dir name="modules"><file name="DPDFrance_Classic.xml" hash="a028196822d67576427c45f463311ac4"/><file name="DPDFrance_Export.xml" hash="ee030b0a83049695ddb6ec19db36e304"/><file name="DPDFrance_Predict.xml" hash="3f816b679509f1d67d707c60c7f99cb5"/><file name="DPDFrance_Relais.xml" hash="1411953b5c7abf08e231c02b35b5def4"/></dir></target><target name="magelocale"><dir><dir name="en_US"><file name="DPDFrance_Classic.csv" hash="c01554087d5bafd2af36faf4101d682b"/><file name="DPDFrance_Export.csv" hash="cdc0421a6d7d1510272241249f229607"/><file name="DPDFrance_Predict.csv" hash="9bf03682e6614c490f2924dd76fbc5cb"/><file name="DPDFrance_Relais.csv" hash="827b1971092f0d31fb599c41544c87ce"/></dir><dir name="fr_FR"><file name="DPDFrance_Classic.csv" hash="261b0c9ef9d958665f690617021f51c3"/><file name="DPDFrance_Export.csv" hash="f483d063866b3729b992f7433af1a5db"/><file name="DPDFrance_Predict.csv" hash="3a46cff3925afcee31125cd1c7c3f443"/><file name="DPDFrance_Relais.csv" hash="dca527e399bc74ab91389aac0101a667"/></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="dpdfrpredict.xml" hash="19876f7ce2842a19ed32e4f1ab79ecb9"/><file name="dpdfrrelais.xml" hash="4fb280b9ce764c7918a9da3bbc7d7171"/></dir><dir name="template"><dir name="dpdfrpredict"><dir name="checkout"><dir name="onepage"><dir name="progress"><file name="shipping.phtml" hash="217f4563764644f476cff918917906fb"/><file name="shipping_method.phtml" hash="9dcf148b32aae41860edc7f970732174"/></dir><dir name="shipping_method"><file name="available.phtml" hash="f88fdd53c9778d4c0d65627a2bc1b2d7"/></dir><file name="shipping_method.phtml" hash="09e9c8a50c7f27358eae55cd8b3fb55b"/></dir></dir></dir><dir name="dpdfrrelais"><dir name="checkout"><dir name="onepage"><dir name="progress"><file name="shipping.phtml" hash="217f4563764644f476cff918917906fb"/><file name="shipping_method.phtml" hash="9dcf148b32aae41860edc7f970732174"/></dir><dir name="shipping_method"><file name="available.phtml" hash="e7a0d13205e5cebcd102c106b45e9c49"/></dir><file name="shipping_method.phtml" hash="95e653732828a28d3be1ff20ff0199dd"/></dir></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="dpdfrance"><file name="dpdfrpredict.css" hash="9e03b7f9597e3e32bf70179a7c778a43"/><file name="dpdfrrelais.css" hash="82e15d0d2ea496235c47ce712f06a637"/></dir></dir><dir name="js"><dir name="dpdfrance"><file name="dpdfrpredict.js" hash="778a88ce7e382dfd1417022b48da276b"/><file name="dpdfrrelais.js" hash="8dbd5aceb1662cbe6efaa4d04229f3bb"/></dir></dir></dir></dir></dir></target></contents>
|
17 |
<compatible/>
|
18 |
<dependencies><required><php><min>5.0.0</min><max>6.0.0</max></php><extension><name>soap</name><min>1.0</min><max></max></extension></required></dependencies>
|
19 |
</package>
|