Version Notes
Added the ability to make shipping to custom parcelshops free of charge
Download this release
Release Info
| Developer | PHPro |
| Extension | dpdshipping |
| Version | 1.0.6 |
| Comparing to | |
| See all releases | |
Code changes from version 1.0.5 to 1.0.6
- app/code/community/DPD/Shipping/Block/Carrier/Parcelshop.php +14 -0
- app/code/community/DPD/Shipping/Model/Adminhtml/Dpdgrid.php +4 -2
- app/code/community/DPD/Shipping/Model/Carrier/Dpdclassic.php +2 -1
- app/code/community/DPD/Shipping/Model/Carrier/Dpdparcelshops.php +6 -2
- app/code/community/DPD/Shipping/Model/Webservice.php +6 -0
- app/code/community/DPD/Shipping/controllers/AjaxController.php +17 -3
- app/code/community/DPD/Shipping/etc/config.xml +1 -1
- app/code/community/DPD/Shipping/etc/system.xml +9 -0
- app/code/community/DPD/Shipping/sql/dpd_setup/mysql4-upgrade-1.0.5-1.0.6.php +16 -0
- app/design/frontend/base/default/template/dpd/parcelshopselected.phtml +1 -0
- js/dpd/shipping.js +21 -6
- package.xml +5 -5
app/code/community/DPD/Shipping/Block/Carrier/Parcelshop.php
CHANGED
|
@@ -81,6 +81,7 @@ class DPD_Shipping_Block_Carrier_Parcelshop extends Mage_Core_Block_Template
|
|
| 81 |
$this->_configArray["gmapsCustomIcon"] = (Mage::getStoreConfig('carriers/dpdparcelshops/google_maps_icon') ? Mage::getBaseUrl('media') . "dpd/" . Mage::getStoreConfig('carriers/dpdparcelshops/google_maps_icon') : "");
|
| 82 |
$this->_configArray["gmapsDisplay"] = (bool)Mage::getStoreConfig('carriers/dpdparcelshops/google_maps_display');
|
| 83 |
$this->_configArray["loaderimage"] = $this->getSkinUrl('images/dpd/ajax-loader.gif');
|
|
|
|
| 84 |
return Mage::helper('core')->jsonEncode($this->_configArray);
|
| 85 |
}
|
| 86 |
|
|
@@ -291,4 +292,17 @@ class DPD_Shipping_Block_Carrier_Parcelshop extends Mage_Core_Block_Template
|
|
| 291 |
return Mage::getModel('checkout/cart')->getQuote();
|
| 292 |
}
|
| 293 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 294 |
}
|
| 81 |
$this->_configArray["gmapsCustomIcon"] = (Mage::getStoreConfig('carriers/dpdparcelshops/google_maps_icon') ? Mage::getBaseUrl('media') . "dpd/" . Mage::getStoreConfig('carriers/dpdparcelshops/google_maps_icon') : "");
|
| 82 |
$this->_configArray["gmapsDisplay"] = (bool)Mage::getStoreConfig('carriers/dpdparcelshops/google_maps_display');
|
| 83 |
$this->_configArray["loaderimage"] = $this->getSkinUrl('images/dpd/ajax-loader.gif');
|
| 84 |
+
$this->_configArray["freeShippingOnCustom"] = (bool)Mage::getStoreConfig('carriers/dpdparcelshops/custom_parcelshops_free_shipping');
|
| 85 |
return Mage::helper('core')->jsonEncode($this->_configArray);
|
| 86 |
}
|
| 87 |
|
| 292 |
return Mage::getModel('checkout/cart')->getQuote();
|
| 293 |
}
|
| 294 |
|
| 295 |
+
/**
|
| 296 |
+
* Returns shipping cost.
|
| 297 |
+
*
|
| 298 |
+
* @return string
|
| 299 |
+
*/
|
| 300 |
+
public function getShippingAmount() {
|
| 301 |
+
$cost = $this->getQuote()->getShippingAddress()->getShippingAmount();
|
| 302 |
+
|
| 303 |
+
return number_format((float)$cost, 2, '.', '');
|
| 304 |
+
}
|
| 305 |
+
|
| 306 |
+
|
| 307 |
+
|
| 308 |
}
|
app/code/community/DPD/Shipping/Model/Adminhtml/Dpdgrid.php
CHANGED
|
@@ -37,8 +37,9 @@ class DPD_Shipping_Model_Adminhtml_Dpdgrid extends Mage_Core_Model_Abstract
|
|
| 37 |
$dpdused = true;
|
| 38 |
$locale = Mage::app()->getStore($order->getStoreId())->getConfig('general/locale/code');
|
| 39 |
$localeCode = explode('_', $locale);
|
|
|
|
| 40 |
$shipment->setDpdLabelPath($labelName . ".pdf");
|
| 41 |
-
$shipment->setDpdTrackingUrl('<a target="_blank" href="' . "http://tracking.dpd.de/cgi-bin/delistrack?typ=32&lang=" . $localeCode[0] . "&pknr=" . $
|
| 42 |
$tracker->setData('number', $labelName);
|
| 43 |
$transactionSave = Mage::getModel('core/resource_transaction')
|
| 44 |
->addObject($shipment)
|
|
@@ -72,8 +73,9 @@ class DPD_Shipping_Model_Adminhtml_Dpdgrid extends Mage_Core_Model_Abstract
|
|
| 72 |
$explodeForCarrier = explode('_', $order->getShippingMethod(), 3);
|
| 73 |
$locale = Mage::app()->getStore($order->getStoreId())->getConfig('general/locale/code');
|
| 74 |
$localeCode = explode('_', $locale);
|
|
|
|
| 75 |
$shipment->setDpdLabelPath($labelName . ".pdf");
|
| 76 |
-
$shipment->setDpdTrackingUrl('<a target="_blank" href="' . "http://tracking.dpd.de/cgi-bin/delistrack?typ=32&lang=" . $localeCode[0] . "&pknr=" . $
|
| 77 |
$order->setIsInProcess(true);
|
| 78 |
$order->addStatusHistoryComment(Mage::helper('dpd')->__('Shipped with DPD generateLabelAndComplete'), true);
|
| 79 |
$order->setDpdLabelExists(1);
|
| 37 |
$dpdused = true;
|
| 38 |
$locale = Mage::app()->getStore($order->getStoreId())->getConfig('general/locale/code');
|
| 39 |
$localeCode = explode('_', $locale);
|
| 40 |
+
$labelNameCode = explode('-', $labelName);
|
| 41 |
$shipment->setDpdLabelPath($labelName . ".pdf");
|
| 42 |
+
$shipment->setDpdTrackingUrl('<a target="_blank" href="' . "http://tracking.dpd.de/cgi-bin/delistrack?typ=32&lang=" . $localeCode[0] . "&pknr=" . $labelNameCode[1] . "&var=" . Mage::getStoreConfig('shipping/dpd_classic/userid') . '">' . Mage::helper('dpd')->__('Track this shipment') . '</a>');
|
| 43 |
$tracker->setData('number', $labelName);
|
| 44 |
$transactionSave = Mage::getModel('core/resource_transaction')
|
| 45 |
->addObject($shipment)
|
| 73 |
$explodeForCarrier = explode('_', $order->getShippingMethod(), 3);
|
| 74 |
$locale = Mage::app()->getStore($order->getStoreId())->getConfig('general/locale/code');
|
| 75 |
$localeCode = explode('_', $locale);
|
| 76 |
+
$labelNameCode = explode('-', $labelName);
|
| 77 |
$shipment->setDpdLabelPath($labelName . ".pdf");
|
| 78 |
+
$shipment->setDpdTrackingUrl('<a target="_blank" href="' . "http://tracking.dpd.de/cgi-bin/delistrack?typ=32&lang=" . $localeCode[0] . "&pknr=" . $labelNameCode[1] . "&var=" . Mage::getStoreConfig('shipping/dpd_classic/userid') . '">' . Mage::helper('dpd')->__('Track this shipment') . '</a>');
|
| 79 |
$order->setIsInProcess(true);
|
| 80 |
$order->addStatusHistoryComment(Mage::helper('dpd')->__('Shipped with DPD generateLabelAndComplete'), true);
|
| 81 |
$order->setDpdLabelExists(1);
|
app/code/community/DPD/Shipping/Model/Carrier/Dpdclassic.php
CHANGED
|
@@ -151,6 +151,7 @@ class DPD_Shipping_Model_Carrier_Dpdclassic extends Mage_Shipping_Model_Carrier_
|
|
| 151 |
*/
|
| 152 |
public function getTracking($tracking_number)
|
| 153 |
{
|
|
|
|
| 154 |
$tracking_result = Mage::getModel('shipping/tracking_result');
|
| 155 |
$tracking_status = Mage::getModel('shipping/tracking_result_status');
|
| 156 |
$localeExploded = explode('_', Mage::app()->getLocale()->getLocaleCode());
|
|
@@ -159,7 +160,7 @@ class DPD_Shipping_Model_Carrier_Dpdclassic extends Mage_Shipping_Model_Carrier_
|
|
| 159 |
$tracking_status->setTracking($tracking_number);
|
| 160 |
$tracking_status->addData(
|
| 161 |
array(
|
| 162 |
-
'status' => '<a target="_blank" href="' . "http://tracking.dpd.de/cgi-bin/delistrack?typ=32&lang=" . $localeExploded[0] . "&pknr=" . $
|
| 163 |
)
|
| 164 |
);
|
| 165 |
$tracking_result->append($tracking_status);
|
| 151 |
*/
|
| 152 |
public function getTracking($tracking_number)
|
| 153 |
{
|
| 154 |
+
$tracking_numberExploded = explode('-', $tracking_number);
|
| 155 |
$tracking_result = Mage::getModel('shipping/tracking_result');
|
| 156 |
$tracking_status = Mage::getModel('shipping/tracking_result_status');
|
| 157 |
$localeExploded = explode('_', Mage::app()->getLocale()->getLocaleCode());
|
| 160 |
$tracking_status->setTracking($tracking_number);
|
| 161 |
$tracking_status->addData(
|
| 162 |
array(
|
| 163 |
+
'status' => '<a target="_blank" href="' . "http://tracking.dpd.de/cgi-bin/delistrack?typ=32&lang=" . $localeExploded[0] . "&pknr=" . $tracking_numberExploded[1] . "&var=" . Mage::getStoreConfig('shipping/dpdclassic/userid') . '">' . Mage::helper('dpd')->__('Track this shipment') . '</a>'
|
| 164 |
)
|
| 165 |
);
|
| 166 |
$tracking_result->append($tracking_status);
|
app/code/community/DPD/Shipping/Model/Carrier/Dpdparcelshops.php
CHANGED
|
@@ -32,9 +32,9 @@ class DPD_Shipping_Model_Carrier_Dpdparcelshops extends Mage_Shipping_Model_Carr
|
|
| 32 |
if (!Mage::getStoreConfig('carriers/' . $this->_code . '/active') || Mage::app()->getStore()->isAdmin() || !Mage::getSingleton('dpd/webservice')->getLoginResult() || $quote->getData('is_multi_shipping')) {
|
| 33 |
return false;
|
| 34 |
}
|
| 35 |
-
|
| 36 |
$method = Mage::getModel('shipping/rate_result_method');
|
| 37 |
$result = Mage::getModel('shipping/rate_result');
|
|
|
|
| 38 |
if (!$this->getConfigData('ratetype')) {
|
| 39 |
$price = $this->getConfigData('flatrateprice');
|
| 40 |
if ($request->getFreeShipping() === true) {
|
|
@@ -107,6 +107,9 @@ class DPD_Shipping_Model_Carrier_Dpdparcelshops extends Mage_Shipping_Model_Carr
|
|
| 107 |
}
|
| 108 |
|
| 109 |
}
|
|
|
|
|
|
|
|
|
|
| 110 |
$method->setCarrier($this->_code);
|
| 111 |
$method->setMethod($this->_code);
|
| 112 |
$method->setMethodTitle($this->getConfigData('name'));
|
|
@@ -155,6 +158,7 @@ class DPD_Shipping_Model_Carrier_Dpdparcelshops extends Mage_Shipping_Model_Carr
|
|
| 155 |
*/
|
| 156 |
public function getTracking($tracking_number)
|
| 157 |
{
|
|
|
|
| 158 |
$tracking_result = Mage::getModel('shipping/tracking_result');
|
| 159 |
$tracking_status = Mage::getModel('shipping/tracking_result_status');
|
| 160 |
$localeExploded = explode('_', Mage::app()->getLocale()->getLocaleCode());
|
|
@@ -163,7 +167,7 @@ class DPD_Shipping_Model_Carrier_Dpdparcelshops extends Mage_Shipping_Model_Carr
|
|
| 163 |
$tracking_status->setTracking($tracking_number);
|
| 164 |
$tracking_status->addData(
|
| 165 |
array(
|
| 166 |
-
'status' => '<a target="_blank" href="' . "http://tracking.dpd.de/cgi-bin/delistrack?typ=32&lang=" . $localeExploded[0] . "&pknr=" . $
|
| 167 |
)
|
| 168 |
);
|
| 169 |
$tracking_result->append($tracking_status);
|
| 32 |
if (!Mage::getStoreConfig('carriers/' . $this->_code . '/active') || Mage::app()->getStore()->isAdmin() || !Mage::getSingleton('dpd/webservice')->getLoginResult() || $quote->getData('is_multi_shipping')) {
|
| 33 |
return false;
|
| 34 |
}
|
|
|
|
| 35 |
$method = Mage::getModel('shipping/rate_result_method');
|
| 36 |
$result = Mage::getModel('shipping/rate_result');
|
| 37 |
+
|
| 38 |
if (!$this->getConfigData('ratetype')) {
|
| 39 |
$price = $this->getConfigData('flatrateprice');
|
| 40 |
if ($request->getFreeShipping() === true) {
|
| 107 |
}
|
| 108 |
|
| 109 |
}
|
| 110 |
+
if($quote->getDpdSpecialPoint()){
|
| 111 |
+
$price = 0;
|
| 112 |
+
}
|
| 113 |
$method->setCarrier($this->_code);
|
| 114 |
$method->setMethod($this->_code);
|
| 115 |
$method->setMethodTitle($this->getConfigData('name'));
|
| 158 |
*/
|
| 159 |
public function getTracking($tracking_number)
|
| 160 |
{
|
| 161 |
+
$tracking_numberExploded = explode('-', $tracking_number);
|
| 162 |
$tracking_result = Mage::getModel('shipping/tracking_result');
|
| 163 |
$tracking_status = Mage::getModel('shipping/tracking_result_status');
|
| 164 |
$localeExploded = explode('_', Mage::app()->getLocale()->getLocaleCode());
|
| 167 |
$tracking_status->setTracking($tracking_number);
|
| 168 |
$tracking_status->addData(
|
| 169 |
array(
|
| 170 |
+
'status' => '<a target="_blank" href="' . "http://tracking.dpd.de/cgi-bin/delistrack?typ=32&lang=" . $localeExploded[0] . "&pknr=" . $tracking_numberExploded[1] . "&var=" . Mage::getStoreConfig('shipping/dpdclassic/userid') . '">' . Mage::helper('dpd')->__('Track this shipment') . '</a>'
|
| 171 |
)
|
| 172 |
);
|
| 173 |
$tracking_result->append($tracking_status);
|
app/code/community/DPD/Shipping/Model/Webservice.php
CHANGED
|
@@ -277,6 +277,12 @@ class DPD_Shipping_Model_Webservice extends Mage_Core_Model_Abstract
|
|
| 277 |
$result = $client->__soapCall($method, array($parameters));
|
| 278 |
$stop = true;
|
| 279 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 280 |
Mage::helper('dpd')->log('Webservice ' . $method . ' succeeded', Zend_Log::INFO);
|
| 281 |
Mage::helper('dpd')->log($result, Zend_Log::DEBUG);
|
| 282 |
|
| 277 |
$result = $client->__soapCall($method, array($parameters));
|
| 278 |
$stop = true;
|
| 279 |
|
| 280 |
+
if($result->orderResult->shipmentResponses->faults) {
|
| 281 |
+
Mage::helper('dpd')->log('Webservice ' . $method . ' failed:', Zend_Log::ERR);
|
| 282 |
+
Mage::helper('dpd')->log($result->orderResult->shipmentResponses->faults, Zend_Log::ERR);
|
| 283 |
+
return false;
|
| 284 |
+
}
|
| 285 |
+
|
| 286 |
Mage::helper('dpd')->log('Webservice ' . $method . ' succeeded', Zend_Log::INFO);
|
| 287 |
Mage::helper('dpd')->log($result, Zend_Log::DEBUG);
|
| 288 |
|
app/code/community/DPD/Shipping/controllers/AjaxController.php
CHANGED
|
@@ -35,7 +35,13 @@ class DPD_Shipping_AjaxController extends Mage_Core_Controller_Front_Action {
|
|
| 35 |
*/
|
| 36 |
public function saveparcelAction(){
|
| 37 |
$parcelData = $this->getRequest()->getPost();
|
| 38 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 39 |
->setDpdSelected(1)
|
| 40 |
->setDpdParcelshopId($parcelData['parcelShopId'])
|
| 41 |
->setDpdCompany($parcelData['company'])
|
|
@@ -44,9 +50,17 @@ class DPD_Shipping_AjaxController extends Mage_Core_Controller_Front_Action {
|
|
| 44 |
->setDpdCity($parcelData['city'])
|
| 45 |
->setDpdCountry($parcelData['country'])
|
| 46 |
->setDpdExtraInfo($parcelData['extra_info'])
|
|
|
|
| 47 |
->save();
|
| 48 |
-
|
| 49 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 50 |
}
|
| 51 |
|
| 52 |
/**
|
| 35 |
*/
|
| 36 |
public function saveparcelAction(){
|
| 37 |
$parcelData = $this->getRequest()->getPost();
|
| 38 |
+
if($parcelData['special'] === 'false') {
|
| 39 |
+
$parcelData['special'] = false;
|
| 40 |
+
}
|
| 41 |
+
|
| 42 |
+
$quote = Mage::getModel('checkout/cart')->getQuote();
|
| 43 |
+
|
| 44 |
+
$quote
|
| 45 |
->setDpdSelected(1)
|
| 46 |
->setDpdParcelshopId($parcelData['parcelShopId'])
|
| 47 |
->setDpdCompany($parcelData['company'])
|
| 50 |
->setDpdCity($parcelData['city'])
|
| 51 |
->setDpdCountry($parcelData['country'])
|
| 52 |
->setDpdExtraInfo($parcelData['extra_info'])
|
| 53 |
+
->setDpdSpecialPoint(Mage::getStoreConfig('carriers/dpdparcelshops/custom_parcelshops_free_shipping') && $parcelData['special'])
|
| 54 |
->save();
|
| 55 |
+
|
| 56 |
+
$quote->getShippingAddress()
|
| 57 |
+
->setShippingMethod('dpdparcelshops_dpdparcelshops')
|
| 58 |
+
->requestShippingRates();
|
| 59 |
+
|
| 60 |
+
$quote->save();
|
| 61 |
+
|
| 62 |
+
$this->loadLayout();
|
| 63 |
+
$this->renderLayout();
|
| 64 |
}
|
| 65 |
|
| 66 |
/**
|
app/code/community/DPD/Shipping/etc/config.xml
CHANGED
|
@@ -2,7 +2,7 @@
|
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<DPD_Shipping>
|
| 5 |
-
<version>1.0.
|
| 6 |
</DPD_Shipping>
|
| 7 |
</modules>
|
| 8 |
<global>
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<DPD_Shipping>
|
| 5 |
+
<version>1.0.6</version>
|
| 6 |
</DPD_Shipping>
|
| 7 |
</modules>
|
| 8 |
<global>
|
app/code/community/DPD/Shipping/etc/system.xml
CHANGED
|
@@ -476,6 +476,15 @@
|
|
| 476 |
<show_in_store>1</show_in_store>Enabled
|
| 477 |
<comment>Map pointer image. (57x57 px)</comment>
|
| 478 |
</google_maps_icon>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 479 |
</fields>
|
| 480 |
</dpdparcelshops>
|
| 481 |
</groups>
|
| 476 |
<show_in_store>1</show_in_store>Enabled
|
| 477 |
<comment>Map pointer image. (57x57 px)</comment>
|
| 478 |
</google_maps_icon>
|
| 479 |
+
<custom_parcelshops_free_shipping translate="label">
|
| 480 |
+
<label>Free shipping for custom parcel shops</label>
|
| 481 |
+
<frontend_type>select</frontend_type>
|
| 482 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
| 483 |
+
<sort_order>22</sort_order>
|
| 484 |
+
<show_in_default>1</show_in_default>
|
| 485 |
+
<show_in_website>1</show_in_website>
|
| 486 |
+
<show_in_store>0</show_in_store>
|
| 487 |
+
</custom_parcelshops_free_shipping>
|
| 488 |
</fields>
|
| 489 |
</dpdparcelshops>
|
| 490 |
</groups>
|
app/code/community/DPD/Shipping/sql/dpd_setup/mysql4-upgrade-1.0.5-1.0.6.php
ADDED
|
@@ -0,0 +1,16 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Created by PHPro
|
| 4 |
+
*
|
| 5 |
+
* @package DPD
|
| 6 |
+
* @subpackage Shipping
|
| 7 |
+
* @category Checkout
|
| 8 |
+
* @author PHPro (info@phpro.be)
|
| 9 |
+
*/
|
| 10 |
+
$installer = $this;
|
| 11 |
+
$installer->startSetup();
|
| 12 |
+
// add quote attributes
|
| 13 |
+
|
| 14 |
+
$installer->getConnection()->addColumn($installer->getTable('sales/quote'), 'dpd_special_point', "boolean default '0'");
|
| 15 |
+
|
| 16 |
+
$installer->endSetup();
|
app/design/frontend/base/default/template/dpd/parcelshopselected.phtml
CHANGED
|
@@ -18,6 +18,7 @@ $dpdExtraInfoDecoded = json_decode($dpdExtraInfo);
|
|
| 18 |
$this->getShopsHtml();
|
| 19 |
?>
|
| 20 |
<div id="parcelshop" class="parcelshopwrapper">
|
|
|
|
| 21 |
<ul>
|
| 22 |
<img class="left parcelshoplogo"
|
| 23 |
src="<?php echo Mage::getDesign()->getSkinUrl('images/dpd/dpd_parcelshop_logo.png') ?>"
|
| 18 |
$this->getShopsHtml();
|
| 19 |
?>
|
| 20 |
<div id="parcelshop" class="parcelshopwrapper">
|
| 21 |
+
<input type="hidden" id="custom-shipping-amount" value="€<?php echo $this->getShippingAmount()?>">
|
| 22 |
<ul>
|
| 23 |
<img class="left parcelshoplogo"
|
| 24 |
src="<?php echo Mage::getDesign()->getSkinUrl('images/dpd/dpd_parcelshop_logo.png') ?>"
|
js/dpd/shipping.js
CHANGED
|
@@ -145,7 +145,7 @@ DPD.Shipping = Class.create({
|
|
| 145 |
this.checkInfoClick();
|
| 146 |
}
|
| 147 |
}, saveParcelShop: function (evt) {
|
| 148 |
-
|
| 149 |
var shopId = evt.target.id;
|
| 150 |
setTimeout(function () {
|
| 151 |
parent.Windows.close("DPD_window", evt);
|
|
@@ -163,14 +163,29 @@ DPD.Shipping = Class.create({
|
|
| 163 |
var data = this.config[shopId];
|
| 164 |
var loaderurl = this.config.loaderimage;
|
| 165 |
var parcelshop = this.container.down('#parcelshop');
|
| 166 |
-
parcelshop.update('<div class="dpdloaderwrapper" style="margin-bottom:35px;"><span class="dpdloader"></span><span class="message"></span></div><input type="hidden" class="DPD-confirmed" value="0"/>');
|
| 167 |
|
| 168 |
-
|
|
|
|
| 169 |
method: "POST",
|
| 170 |
-
asynchronous:
|
| 171 |
evalScripts: true,
|
| 172 |
-
parameters: data
|
| 173 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 174 |
|
| 175 |
}, invalidateParcel: function (evt) {
|
| 176 |
var reloadurl = this.config.invalidateParcelUrl;
|
| 145 |
this.checkInfoClick();
|
| 146 |
}
|
| 147 |
}, saveParcelShop: function (evt) {
|
| 148 |
+
if (this.container.id == "parcelshop") {
|
| 149 |
var shopId = evt.target.id;
|
| 150 |
setTimeout(function () {
|
| 151 |
parent.Windows.close("DPD_window", evt);
|
| 163 |
var data = this.config[shopId];
|
| 164 |
var loaderurl = this.config.loaderimage;
|
| 165 |
var parcelshop = this.container.down('#parcelshop');
|
|
|
|
| 166 |
|
| 167 |
+
parcelshop.update('<div class="dpdloaderwrapper" style="margin-bottom:35px;"><span class="dpdloader"></span><span class="message"></span></div><input type="hidden" class="DPD-confirmed" value="0"/>');
|
| 168 |
+
new parent.Ajax.Request(reloadurl, {
|
| 169 |
method: "POST",
|
| 170 |
+
asynchronous: false,
|
| 171 |
evalScripts: true,
|
| 172 |
+
parameters: data,
|
| 173 |
+
onSuccess: function(data) {
|
| 174 |
+
this.container.down('#dpd').update(data.responseText);
|
| 175 |
+
|
| 176 |
+
var price = this.container.down('#custom-shipping-amount').value;
|
| 177 |
+
var priceContainer = this.container.down('label[for="s_method_dpdparcelshops_dpdparcelshops"] span');
|
| 178 |
+
var oldPrice = priceContainer.innerHTML;
|
| 179 |
+
priceContainer.update(price);
|
| 180 |
+
if(price.substring(1) != oldPrice.substring(1)) {
|
| 181 |
+
priceContainer.addClassName('price-changed');
|
| 182 |
+
parent.setTimeout(function(){
|
| 183 |
+
priceContainer.removeClassName('price-changed');
|
| 184 |
+
}.bind(this), 2000)
|
| 185 |
+
}
|
| 186 |
+
checkout.reloadProgressBlock();
|
| 187 |
+
}.bind(this)
|
| 188 |
+
});
|
| 189 |
|
| 190 |
}, invalidateParcel: function (evt) {
|
| 191 |
var reloadurl = this.config.invalidateParcelUrl;
|
package.xml
CHANGED
|
@@ -1,18 +1,18 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>dpdshipping</name>
|
| 4 |
-
<version>1.0.
|
| 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>Added
|
| 12 |
<authors><author><name>PHPro</name><user>heremke</user><email>info@phpro.be</email></author></authors>
|
| 13 |
-
<date>2014-
|
| 14 |
-
<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="
|
| 16 |
<compatible/>
|
| 17 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
| 18 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>dpdshipping</name>
|
| 4 |
+
<version>1.0.6</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>Added the ability to make shipping to custom parcelshops free of charge</notes>
|
| 12 |
<authors><author><name>PHPro</name><user>heremke</user><email>info@phpro.be</email></author></authors>
|
| 13 |
+
<date>2014-05-20</date>
|
| 14 |
+
<time>15:26:33</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="590ba1a9b25b15a71816a0ece6ecd198"/></dir><dir name="Model"><dir name="Adminhtml"><file name="Dpdgrid.php" hash="04df9b505ed4a4be409da14675d6117f"/><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="0e80c70924be85308ff8754abc142ce5"/><file name="Returnlabels.php" hash="5fa12afaf88cecc73cbd3d0f3163c6f2"/><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="9f7f542f04ddea210c1851838e05318f"/></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="b2adf5b7c6c26fbe351b4944c8adb902"/></dir><dir name="etc"><file name="adminhtml.xml" hash="9b48a3489a485e86c8f2720a7a4380d8"/><file name="config.xml" hash="92884d043c0706b4f94406caf36cc0eb"/><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="05f2c2afda6a6732ee49b77ed074a947"/></dir><dir name="template"><dir name="dpd"><file name="gmapsapi.phtml" hash="e0073b425f55c844918b5c83aea20b1b"/><file name="ordertracking.phtml" hash="2273e469b6f129b2f174424ddebe83a3"/><file name="parcelshop.phtml" hash="9bd08955732d22e70e917c4189ccdb97"/><file name="parcelshoplink.phtml" hash="3a19aa648c56399d07aeeb803764719a"/><file name="parcelshopselected.phtml" hash="b2e10852f1c801a59bc98949c158ad89"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="DPD_Shipping.xml" hash="2014a79baf3f800f46222ceb11310d59"/></dir></target><target name="magelocale"><dir name="en_US"><file name="DPD_Shipping.csv" hash="5db7a4010010a70022aa3b5ee867d005"/><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="cfaffcf986a75c05d3d06ba2ddc91e52"/><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="df65ec21c388aa68fa5b95754e1a0e61"/><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="cd4d80a1710639bf67994858dffce459"/><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="shipping.js" hash="a8525ae2e6a39ad7df1ccacbdb0bd16a"/><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="b37446a478b7cce62cf34279ee962d36"/><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>
|
