Version Notes
- SUPEE-6788 Compatibility further improvement
Download this release
Release Info
| Developer | Magento Core Team |
| Extension | Eabi_DpdEE |
| Version | 0.1.24 |
| Comparing to | |
| See all releases | |
Code changes from version 0.1.23 to 0.1.24
- app/code/community/Eabi/DpdEE/CHANGELOG.txt +3 -0
- app/code/community/Eabi/DpdEE/etc/config.xml +1 -1
- app/code/community/Eabi/Postoffice/Block/Adminhtml/Config/Form/Field/Remove.php +1 -1
- app/code/community/Eabi/Postoffice/Block/Config/Rebuildbutton.php +1 -1
- app/code/community/Eabi/Postoffice/Model/Carrier/Abstract.php +1 -1
- app/code/community/Eabi/Postoffice/Model/Orderview.php +3 -3
- app/code/community/Eabi/Postoffice/controllers/Adminhtml/Eabi/Postoffice/PostofficeController.php +373 -0
- app/code/community/Eabi/Postoffice/controllers/Adminhtml/PostofficeController.php +2 -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 -6
app/code/community/Eabi/DpdEE/CHANGELOG.txt
CHANGED
|
@@ -79,3 +79,6 @@
|
|
| 79 |
|
| 80 |
0.1.23
|
| 81 |
- SUPEE-6788 Compatibility
|
|
|
|
|
|
|
|
|
| 79 |
|
| 80 |
0.1.23
|
| 81 |
- SUPEE-6788 Compatibility
|
| 82 |
+
|
| 83 |
+
0.1.24
|
| 84 |
+
- SUPEE-6788 Compatibility further improvement
|
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.24</version>
|
| 40 |
</Eabi_DpdEE>
|
| 41 |
</modules>
|
| 42 |
|
app/code/community/Eabi/Postoffice/Block/Adminhtml/Config/Form/Field/Remove.php
CHANGED
|
@@ -56,7 +56,7 @@ function {$divId}make_request(actionName) {
|
|
| 56 |
|
| 57 |
if (confirmR) {
|
| 58 |
new Ajax.Request(
|
| 59 |
-
'{$this->getUrl('
|
| 60 |
{
|
| 61 |
method: 'post',
|
| 62 |
asynchronous: true,
|
| 56 |
|
| 57 |
if (confirmR) {
|
| 58 |
new Ajax.Request(
|
| 59 |
+
'{$this->getUrl('adminhtml/eabi_postoffice_postoffice/remove', array())}',
|
| 60 |
{
|
| 61 |
method: 'post',
|
| 62 |
asynchronous: true,
|
app/code/community/Eabi/Postoffice/Block/Config/Rebuildbutton.php
CHANGED
|
@@ -74,7 +74,7 @@ class Eabi_Postoffice_Block_Config_Rebuildbutton extends Mage_Adminhtml_Block_Sy
|
|
| 74 |
if ($carrierName == '') {
|
| 75 |
throw new Exception('Invalid carrier name');
|
| 76 |
}
|
| 77 |
-
$url = Mage::helper('adminhtml')->getUrl('
|
| 78 |
|
| 79 |
$rebuildText = Mage::helper('eabi_postoffice')->__('Rebuild postoffices for this carrier');
|
| 80 |
$rebuildTextConfirm = addslashes(sprintf(Mage::helper('eabi_postoffice')->__('Rebuilding postoffices for the carrier %s takes a little while... Continue?'), $carrierName));
|
| 74 |
if ($carrierName == '') {
|
| 75 |
throw new Exception('Invalid carrier name');
|
| 76 |
}
|
| 77 |
+
$url = Mage::helper('adminhtml')->getUrl('adminhtml/eabi_postoffice_postoffice/rebuild', array('carrier_code' => $carrierName));
|
| 78 |
|
| 79 |
$rebuildText = Mage::helper('eabi_postoffice')->__('Rebuild postoffices for this carrier');
|
| 80 |
$rebuildTextConfirm = addslashes(sprintf(Mage::helper('eabi_postoffice')->__('Rebuilding postoffices for the carrier %s takes a little while... Continue?'), $carrierName));
|
app/code/community/Eabi/Postoffice/Model/Carrier/Abstract.php
CHANGED
|
@@ -399,7 +399,7 @@ abstract class Eabi_Postoffice_Model_Carrier_Abstract extends Mage_Shipping_Mode
|
|
| 399 |
$url = Mage::getUrl('eabi_postoffice/index/office', array('_secure' => true));
|
| 400 |
|
| 401 |
if (Mage::app()->getStore()->isAdmin()) {
|
| 402 |
-
$url = Mage::helper('adminhtml')->getUrl('
|
| 403 |
}
|
| 404 |
|
| 405 |
$carrierId = 's_method_'.$this->_code.'_'.$this->_code;
|
| 399 |
$url = Mage::getUrl('eabi_postoffice/index/office', array('_secure' => true));
|
| 400 |
|
| 401 |
if (Mage::app()->getStore()->isAdmin()) {
|
| 402 |
+
$url = Mage::helper('adminhtml')->getUrl('adminhtml/eabi_postoffice_postoffice/office', array('store_id' => $request->getStoreId(), '_secure' => true));
|
| 403 |
}
|
| 404 |
|
| 405 |
$carrierId = 's_method_'.$this->_code.'_'.$this->_code;
|
app/code/community/Eabi/Postoffice/Model/Orderview.php
CHANGED
|
@@ -60,7 +60,7 @@ class Eabi_Postoffice_Model_Orderview extends Eabi_Livehandler_Model_Adminhtml_G
|
|
| 60 |
$barcode = Mage::helper('eabi_postoffice')->getBarcode($order->getIncrementId());
|
| 61 |
|
| 62 |
if (is_string($barcode) || is_array($barcode)) {
|
| 63 |
-
$url = Mage::helper('adminhtml')->getUrl('
|
| 64 |
|
| 65 |
$this->addActionButton('eabi_get_addresscard', Mage::helper('eabi_postoffice')->__('Print packing slip'), "setLocation('".$url."')");
|
| 66 |
}
|
|
@@ -68,7 +68,7 @@ class Eabi_Postoffice_Model_Orderview extends Eabi_Livehandler_Model_Adminhtml_G
|
|
| 68 |
if (Mage::helper('eabi_postoffice')->isDataSent($order->getIncrementId()) === false) {
|
| 69 |
$confirmText = str_replace('\"', '"', addslashes(Mage::helper('eabi_postoffice')->__('Send shipping data to server') . '?'));
|
| 70 |
$dataSendTextSuccess = str_replace('\"', '"', addslashes(Mage::helper('eabi_postoffice')->__('Data sent to server, please verify the status from the order comments')));
|
| 71 |
-
$url = Mage::helper('adminhtml')->getUrl('
|
| 72 |
$js = <<<EOT
|
| 73 |
if(confirm("{$confirmText}")){new Ajax.Request("{$url}",{method:"get",onSuccess:function(a){json=a.responseText.evalJSON(true);if(json){if(json["error"]){alert(json["error"])}else if(json["success"]){alert("{$dataSendTextSuccess}");location.reload(true)}}else{alert("Fatal error")}},onFailure:function(){alert("Fatal error")}})}; return false;
|
| 74 |
EOT;
|
|
@@ -85,7 +85,7 @@ EOT;
|
|
| 85 |
if ($currentJs != '' && $this->_incrementId != '') {
|
| 86 |
$confirmText = str_replace('\"', '"', addslashes(Mage::helper('eabi_postoffice')->__('Send shipping data to server') . '?'));
|
| 87 |
$dataSendTextSuccess = str_replace('\"', '"', addslashes(Mage::helper('eabi_postoffice')->__('Data sent to server, please verify the status from the order comments')));
|
| 88 |
-
$url = Mage::helper('adminhtml')->getUrl('
|
| 89 |
return '';
|
| 90 |
|
| 91 |
|
| 60 |
$barcode = Mage::helper('eabi_postoffice')->getBarcode($order->getIncrementId());
|
| 61 |
|
| 62 |
if (is_string($barcode) || is_array($barcode)) {
|
| 63 |
+
$url = Mage::helper('adminhtml')->getUrl('adminhtml/eabi_postoffice_postoffice/addresscardpdf', array('order_id'=> $orderId));
|
| 64 |
|
| 65 |
$this->addActionButton('eabi_get_addresscard', Mage::helper('eabi_postoffice')->__('Print packing slip'), "setLocation('".$url."')");
|
| 66 |
}
|
| 68 |
if (Mage::helper('eabi_postoffice')->isDataSent($order->getIncrementId()) === false) {
|
| 69 |
$confirmText = str_replace('\"', '"', addslashes(Mage::helper('eabi_postoffice')->__('Send shipping data to server') . '?'));
|
| 70 |
$dataSendTextSuccess = str_replace('\"', '"', addslashes(Mage::helper('eabi_postoffice')->__('Data sent to server, please verify the status from the order comments')));
|
| 71 |
+
$url = Mage::helper('adminhtml')->getUrl('adminhtml/eabi_postoffice_postoffice/autosend', array('order_id' => $this->_orderId));
|
| 72 |
$js = <<<EOT
|
| 73 |
if(confirm("{$confirmText}")){new Ajax.Request("{$url}",{method:"get",onSuccess:function(a){json=a.responseText.evalJSON(true);if(json){if(json["error"]){alert(json["error"])}else if(json["success"]){alert("{$dataSendTextSuccess}");location.reload(true)}}else{alert("Fatal error")}},onFailure:function(){alert("Fatal error")}})}; return false;
|
| 74 |
EOT;
|
| 85 |
if ($currentJs != '' && $this->_incrementId != '') {
|
| 86 |
$confirmText = str_replace('\"', '"', addslashes(Mage::helper('eabi_postoffice')->__('Send shipping data to server') . '?'));
|
| 87 |
$dataSendTextSuccess = str_replace('\"', '"', addslashes(Mage::helper('eabi_postoffice')->__('Data sent to server, please verify the status from the order comments')));
|
| 88 |
+
$url = Mage::helper('adminhtml')->getUrl('adminhtml/eabi_postoffice_postoffice/autosend', array('order_id' => $this->_orderId));
|
| 89 |
return '';
|
| 90 |
|
| 91 |
|
app/code/community/Eabi/Postoffice/controllers/Adminhtml/Eabi/Postoffice/PostofficeController.php
ADDED
|
@@ -0,0 +1,373 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/*
|
| 3 |
+
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
| 8 |
+
* or OpenGPL v3 license (GNU Public License V3.0)
|
| 9 |
+
* that is bundled with this package in the file LICENSE.txt.
|
| 10 |
+
* It is also available through the world-wide-web at this URL:
|
| 11 |
+
* http://opensource.org/licenses/osl-3.0.php
|
| 12 |
+
* or
|
| 13 |
+
* http://www.gnu.org/licenses/gpl-3.0.txt
|
| 14 |
+
* If you did not receive a copy of the license and are unable to
|
| 15 |
+
* obtain it through the world-wide-web, please send an email
|
| 16 |
+
* to info@e-abi.ee so we can send you a copy immediately.
|
| 17 |
+
*
|
| 18 |
+
* DISCLAIMER
|
| 19 |
+
*
|
| 20 |
+
* Do not edit or add to this file if you wish to upgrade this module to newer
|
| 21 |
+
* versions in the future.
|
| 22 |
+
*
|
| 23 |
+
* @category Eabi
|
| 24 |
+
* @package Eabi_Dpd
|
| 25 |
+
* @copyright Copyright (c) 2015 Aktsiamaailm LLC (http://en.e-abi.ee/)
|
| 26 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 27 |
+
* @license http://www.gnu.org/licenses/gpl-3.0.txt GNU Public License V3.0
|
| 28 |
+
* @author Matis Halmann
|
| 29 |
+
*
|
| 30 |
+
|
| 31 |
+
*/
|
| 32 |
+
|
| 33 |
+
/**
|
| 34 |
+
*
|
| 35 |
+
* Contains the functions, which helps store administrator to place an order using this carrier or the subclasses of this carrier and
|
| 36 |
+
* also contains actions related to printing packing slips and sending automatic parcel data to the third party carrier server.
|
| 37 |
+
* @author matishalmann
|
| 38 |
+
*/
|
| 39 |
+
class Eabi_Postoffice_Adminhtml_Eabi_Postoffice_PostofficeController extends Mage_Adminhtml_Controller_Action {
|
| 40 |
+
|
| 41 |
+
protected function _initAction() {
|
| 42 |
+
return $this;
|
| 43 |
+
}
|
| 44 |
+
|
| 45 |
+
protected function _construct() {
|
| 46 |
+
|
| 47 |
+
}
|
| 48 |
+
|
| 49 |
+
/**
|
| 50 |
+
* Rebuilds the list of postoffices for the selected carrier immediately and returns json response.
|
| 51 |
+
*
|
| 52 |
+
*
|
| 53 |
+
*/
|
| 54 |
+
public function rebuildAction() {
|
| 55 |
+
$result = $this->_rebuild();
|
| 56 |
+
echo json_encode($result);
|
| 57 |
+
die();
|
| 58 |
+
}
|
| 59 |
+
|
| 60 |
+
protected function _rebuild() {
|
| 61 |
+
$carrierCode = $this->getRequest()->getParam('carrier_code', '');
|
| 62 |
+
if ($carrierCode == '') {
|
| 63 |
+
return array('error' => Mage::helper('eabi_postoffice')->__('Invalid Carrier code'));
|
| 64 |
+
}
|
| 65 |
+
$carrierModule = Mage::getModel('eabi_postoffice/carriermodule')->load($carrierCode, 'carrier_code');
|
| 66 |
+
if (!is_object($carrierModule) ||$carrierModule->getId() <= 0) {
|
| 67 |
+
return array('error' => Mage::helper('eabi_postoffice')->__('Invalid Carrier code'));
|
| 68 |
+
}
|
| 69 |
+
try {
|
| 70 |
+
$carrierModule->updateCarrierData(true);
|
| 71 |
+
} catch (Exception $e) {
|
| 72 |
+
return array('error' => $e->getMessage());
|
| 73 |
+
}
|
| 74 |
+
return array('success' => true);
|
| 75 |
+
|
| 76 |
+
}
|
| 77 |
+
|
| 78 |
+
/**
|
| 79 |
+
* Prints out packing slip pdf for the selected order as response or echoes that barcode is not available.
|
| 80 |
+
*
|
| 81 |
+
*
|
| 82 |
+
* @return type
|
| 83 |
+
*/
|
| 84 |
+
public function addresscardpdfAction() {
|
| 85 |
+
$orderId = (int)$this->getRequest()->getParam('order_id', 0);
|
| 86 |
+
if ($orderId <= 0) {
|
| 87 |
+
return;
|
| 88 |
+
}
|
| 89 |
+
$order = Mage::getModel('sales/order')->load($orderId);
|
| 90 |
+
if (!$order || $order->getId() <= 0) {
|
| 91 |
+
return;
|
| 92 |
+
}
|
| 93 |
+
$incrementId = $order->getIncrementId();
|
| 94 |
+
$res = Mage::helper('eabi_postoffice')->getBarcodePdf($incrementId);
|
| 95 |
+
if ($res !== false) {
|
| 96 |
+
header('Content-Type: application/pdf');
|
| 97 |
+
header('Content-Disposition: attachment; filename="addresscard-' . $incrementId . '.pdf"');
|
| 98 |
+
echo $res;
|
| 99 |
+
} else {
|
| 100 |
+
echo 'No barcode available';
|
| 101 |
+
}
|
| 102 |
+
}
|
| 103 |
+
|
| 104 |
+
/**
|
| 105 |
+
* Attempts to automatically send the shipment data for the selected order to the third party carrier server
|
| 106 |
+
* and returns the result as json response.
|
| 107 |
+
*
|
| 108 |
+
*
|
| 109 |
+
*
|
| 110 |
+
*/
|
| 111 |
+
public function autosendAction() {
|
| 112 |
+
$result = $this->_autoSend();
|
| 113 |
+
echo json_encode($result);
|
| 114 |
+
die();
|
| 115 |
+
}
|
| 116 |
+
|
| 117 |
+
protected function _autoSend() {
|
| 118 |
+
//get the order id
|
| 119 |
+
$orderId = (int)$this->getRequest()->getParam('order_id', 0);
|
| 120 |
+
if ($orderId <= 0) {
|
| 121 |
+
return array('error' => Mage::helper('eabi_postoffice')->__('Invalid Order ID'));
|
| 122 |
+
}
|
| 123 |
+
$order = Mage::getModel('sales/order')->load($orderId);
|
| 124 |
+
if (!$order || $order->getId() <= 0) {
|
| 125 |
+
return array('error' => Mage::helper('eabi_postoffice')->__('Invalid Order ID'));
|
| 126 |
+
}
|
| 127 |
+
|
| 128 |
+
//get the carrier
|
| 129 |
+
$shippingMethod = $order->getShippingMethod();
|
| 130 |
+
$paymentMethod = $order->getPayment();
|
| 131 |
+
|
| 132 |
+
//get the shipping code from the order and call the module from it.
|
| 133 |
+
$shippingCarrierCode = substr($shippingMethod, 0, strpos($shippingMethod, '_'));
|
| 134 |
+
$shippingMethodModel = Mage::getModel('shipping/shipping')->getCarrierByCode($shippingCarrierCode, $order->getStoreId());
|
| 135 |
+
|
| 136 |
+
if (!($shippingMethodModel instanceof Eabi_Postoffice_Model_Carrier_Abstract)){
|
| 137 |
+
return array('error' => Mage::helper('eabi_postoffice')->__('This carrier is not subclass of Eabi_Postoffice_Model_Carrier_Abstract'));
|
| 138 |
+
}
|
| 139 |
+
$shippingMethodModel->setStoreId($order->getStoreId());
|
| 140 |
+
|
| 141 |
+
//determine if auto send is available
|
| 142 |
+
if (!$shippingMethodModel->isAutoSendAvailable()) {
|
| 143 |
+
return array('error' => Mage::helper('eabi_postoffice')->__('Automatic data sending is not available for the selected carrier'));
|
| 144 |
+
}
|
| 145 |
+
|
| 146 |
+
if (!$this->_getOfficeHelper()->canSendData($order)) {
|
| 147 |
+
return array('error' => Mage::helper('eabi_postoffice')->__('This order has not yet been fully paid'));
|
| 148 |
+
}
|
| 149 |
+
|
| 150 |
+
|
| 151 |
+
if (($order->isCanceled() || $order->getIsVirtual())) {
|
| 152 |
+
return array('error' => Mage::helper('eabi_postoffice')->__('This order cannot be shipped'));
|
| 153 |
+
}
|
| 154 |
+
|
| 155 |
+
|
| 156 |
+
//send the data
|
| 157 |
+
Mage::helper('eabi_postoffice')->sendManualOrderData($order->getIncrementId(), $shippingMethodModel->getConfigData('senddata_event'));
|
| 158 |
+
|
| 159 |
+
|
| 160 |
+
//return the results
|
| 161 |
+
return array('success' => true);
|
| 162 |
+
|
| 163 |
+
}
|
| 164 |
+
|
| 165 |
+
/**
|
| 166 |
+
* <p>Returns the contents for the selected carriers.</p>
|
| 167 |
+
* <p>Mainly it returns two select menus, where first select menu contains all the groups and
|
| 168 |
+
* second select menu contains actual offices, which belong to the selected group</p>
|
| 169 |
+
*
|
| 170 |
+
*
|
| 171 |
+
*
|
| 172 |
+
*
|
| 173 |
+
* @return html
|
| 174 |
+
* @throws Exception
|
| 175 |
+
*/
|
| 176 |
+
public function officeAction() {
|
| 177 |
+
try {
|
| 178 |
+
if ($this->getRequest()->isPost()) {
|
| 179 |
+
$this->getResponse()->setHeader('Content-type', 'application/json');
|
| 180 |
+
$jsonResponse = array(
|
| 181 |
+
'html' => false,
|
| 182 |
+
'comment' => false,
|
| 183 |
+
);
|
| 184 |
+
|
| 185 |
+
$post = $this->getRequest()->getPost();
|
| 186 |
+
$storeId = (int)$this->getRequest()->getParam('store_id', 0);
|
| 187 |
+
if ($storeId <= 0) {
|
| 188 |
+
throw new Exception('Store ID must be supplied');
|
| 189 |
+
}
|
| 190 |
+
$url = $this->getUrl('adminhtml/eabi_postoffice_postoffice/office', array('store_id' => $storeId, '_secure' => true));
|
| 191 |
+
$addressId = $post['address_id'];
|
| 192 |
+
$carrierCode = $post['carrier_code'];
|
| 193 |
+
$carrierId = $post['carrier_id'];
|
| 194 |
+
$divId = $post['div_id'];
|
| 195 |
+
$groupId = isset($post['group_id']) ? ((int) $post['group_id']) : 0;
|
| 196 |
+
$placeId = isset($post['place_id']) ? ((int) $post['place_id']) : 0;
|
| 197 |
+
$shippingModel = Mage::getModel('shipping/shipping')->getCarrierByCode($carrierCode, $storeId);
|
| 198 |
+
|
| 199 |
+
//we are in admin section, so we need to set the store it manually
|
| 200 |
+
$shippingModel->setStoreId($storeId);
|
| 201 |
+
|
| 202 |
+
if (!$shippingModel->isAjaxInsertAllowed($addressId)) {
|
| 203 |
+
throw new Exception('Invalid Shipping method');
|
| 204 |
+
}
|
| 205 |
+
if (!($shippingModel instanceof Eabi_Postoffice_Model_Carrier_Abstract)) {
|
| 206 |
+
throw new Exception('Invalid Shipping model');
|
| 207 |
+
}
|
| 208 |
+
|
| 209 |
+
if ($placeId > 0) {
|
| 210 |
+
$place = $shippingModel->getTerminal($placeId);
|
| 211 |
+
if ($place) {
|
| 212 |
+
$shippingModel->setOfficeToSession($addressId, $place);
|
| 213 |
+
$jsonResponse['html'] = true;
|
| 214 |
+
$terminalComment = $shippingModel->getTerminalComment($place);
|
| 215 |
+
$isError = $terminalComment->getIsError();
|
| 216 |
+
if ($isError) {
|
| 217 |
+
$jsonResponse['html'] = false;
|
| 218 |
+
$jsonResponse['comment'] = $terminalComment->getComment();
|
| 219 |
+
}
|
| 220 |
+
|
| 221 |
+
// $jsonResponse['comment'] = '<a id="why-to-buy" href="#" onclick="return false;">*<span class="why-to-buy-tooltip">' .$shippingModel->getTerminalComment($place) . '</span></a>';
|
| 222 |
+
$this->getResponse()->setBody(json_encode($jsonResponse));
|
| 223 |
+
return;
|
| 224 |
+
} else {
|
| 225 |
+
$jsonResponse['html'] = false;
|
| 226 |
+
$this->getResponse()->setBody(json_encode($jsonResponse));
|
| 227 |
+
return;
|
| 228 |
+
}
|
| 229 |
+
}
|
| 230 |
+
|
| 231 |
+
$groups = $shippingModel->getGroups($addressId);
|
| 232 |
+
$html = '';
|
| 233 |
+
|
| 234 |
+
if ($groups) {
|
| 235 |
+
$groupSelectWidth = (int)$shippingModel->getConfigData('group_width');
|
| 236 |
+
$style = '';
|
| 237 |
+
if ($groupSelectWidth > 0) {
|
| 238 |
+
$style = ' style="width:'.$groupSelectWidth.'px"';
|
| 239 |
+
}
|
| 240 |
+
$html .= '<select onclick="return false;" '.$style.' name="' . $carrierCode . '_select_group" onchange="new Ajax.Request(\'' . $url . '\',{method:\'post\',parameters:{carrier_id:\'' . $carrierId . '\',carrier_code:\'' . $carrierCode . '\',div_id:\'' . $divId . '\',address_id:\'' . $addressId . '\',group_id: $(this).getValue()},onSuccess:function(a){$(\'' . $divId . '\').update(a.responseJSON.html)}});">';
|
| 241 |
+
$html .= '<option value="">';
|
| 242 |
+
$html .= htmlspecialchars(Mage::helper('eabi_postoffice')->__('-- select --'));
|
| 243 |
+
$html .= '</option>';
|
| 244 |
+
|
| 245 |
+
foreach ($groups as $group) {
|
| 246 |
+
$html .= '<option value="' . $group->getGroupId() . '"';
|
| 247 |
+
if ($groupId > 0 && $groupId == $group->getGroupId()) {
|
| 248 |
+
$html .= ' selected="selected"';
|
| 249 |
+
}
|
| 250 |
+
$html .= '>';
|
| 251 |
+
$html .= $shippingModel->getGroupTitle($group);
|
| 252 |
+
$html .= '</option>';
|
| 253 |
+
}
|
| 254 |
+
$html .= '</select>';
|
| 255 |
+
}
|
| 256 |
+
|
| 257 |
+
//get the group values
|
| 258 |
+
if ($groupId > 0 || $groups === false) {
|
| 259 |
+
$terminals = array();
|
| 260 |
+
if ($groups !== false) {
|
| 261 |
+
$terminals = $shippingModel->getTerminals($groupId, $addressId);
|
| 262 |
+
} else {
|
| 263 |
+
$terminals = $shippingModel->getTerminals(null, $addressId);
|
| 264 |
+
}
|
| 265 |
+
$officeSelectWidth = (int)$shippingModel->getConfigData('office_width');
|
| 266 |
+
$style = '';
|
| 267 |
+
if ($officeSelectWidth > 0) {
|
| 268 |
+
$style = ' style="width:'.$officeSelectWidth.'px"';
|
| 269 |
+
}
|
| 270 |
+
$html .= '<select onclick="return false;" '.$style.' name="' . $carrierCode . '_select_office" onchange="var sel = $(this); new Ajax.Request(\'' . $url . '\',{method:\'post\',parameters:{carrier_id:\'' . $carrierId . '\',carrier_code:\'' . $carrierCode . '\',div_id:\'' . $divId . '\',address_id:\'' . $addressId . '\',place_id: sel.getValue()},onSuccess:function(a){ if (a.responseJSON.html === true) { if (typeof a.responseJSON.comment === \'string\') { sel.next().update(a.responseJSON.comment); sel.next().removeClassName(\'eabi_postoffice_comment_error\'); sel.next().show(); $$(\'.eabi_carrier\').each(function() { $(this).addClassName(\'over\'); });} else { sel.next().hide(); } $(\'' . $carrierId . '\').writeAttribute(\'value\', \'' . $carrierCode . '_' . $carrierCode . '_\' + sel.getValue()); $(\'' . $carrierId . '\').click(); } else if (a.responseJSON.html === false) { if (typeof a.responseJSON.comment === \'string\') { sel.next().update(a.responseJSON.comment); sel.next().addClassName(\'eabi_postoffice_comment_error\'); sel.next().show(); } else { sel.next().hide(); } } else { sel.next().hide(); }}});">';
|
| 271 |
+
$html .= '<option value="">';
|
| 272 |
+
$html .= htmlspecialchars(Mage::helper('eabi_postoffice')->__('-- select --'));
|
| 273 |
+
$html .= '</option>';
|
| 274 |
+
|
| 275 |
+
$optionsHtml = '';
|
| 276 |
+
$previousGroup = false;
|
| 277 |
+
$optGroupHtml = '';
|
| 278 |
+
$groupCount = 0;
|
| 279 |
+
|
| 280 |
+
foreach ($terminals as $terminal) {
|
| 281 |
+
if ($shippingModel->getGroupTitle($terminal) != $previousGroup && !$shippingModel->getConfigData('disable_group_titles')) {
|
| 282 |
+
if ($previousGroup != false) {
|
| 283 |
+
$optionsHtml .= '</optgroup>';
|
| 284 |
+
$optionsHtml .= '<optgroup label="'.$shippingModel->getGroupTitle($terminal).'">';
|
| 285 |
+
} else {
|
| 286 |
+
$optGroupHtml .= '<optgroup label="'.$shippingModel->getGroupTitle($terminal).'">';
|
| 287 |
+
}
|
| 288 |
+
$groupCount++;
|
| 289 |
+
}
|
| 290 |
+
$optionsHtml .= '<option value="' . $terminal->getRemotePlaceId() . '"';
|
| 291 |
+
if (false) {
|
| 292 |
+
$optionsHtml .= ' selected="selected"';
|
| 293 |
+
}
|
| 294 |
+
$optionsHtml .= '>';
|
| 295 |
+
$optionsHtml .= $shippingModel->getTerminalTitle($terminal);
|
| 296 |
+
$optionsHtml .= '</option>';
|
| 297 |
+
|
| 298 |
+
$previousGroup = $shippingModel->getGroupTitle($terminal);
|
| 299 |
+
}
|
| 300 |
+
if ($groupCount > 1) {
|
| 301 |
+
$html .= $optGroupHtml . $optionsHtml . '</optgroup>';
|
| 302 |
+
} else {
|
| 303 |
+
$html .= $optionsHtml;
|
| 304 |
+
}
|
| 305 |
+
|
| 306 |
+
$html .= '</select>';
|
| 307 |
+
|
| 308 |
+
|
| 309 |
+
}
|
| 310 |
+
$html .= '<span class="eabi_postoffice_comment" style="display:none;"></span>';
|
| 311 |
+
|
| 312 |
+
|
| 313 |
+
$jsonResponse['html'] = $html;
|
| 314 |
+
$this->getResponse()->setBody(json_encode($jsonResponse));
|
| 315 |
+
} else {
|
| 316 |
+
throw new Exception('Invalid request method');
|
| 317 |
+
}
|
| 318 |
+
} catch (Exception $e) {
|
| 319 |
+
$this->getResponse()->setHeader('HTTP/1.1', '500 Internal error');
|
| 320 |
+
$this->getResponse()->setHeader('Status', '500 Internal error');
|
| 321 |
+
throw $e;
|
| 322 |
+
}
|
| 323 |
+
return;
|
| 324 |
+
}
|
| 325 |
+
|
| 326 |
+
|
| 327 |
+
/**
|
| 328 |
+
* <p>If older instance of Eabi_Postoffice exists, then this function attempts to remove it</p>
|
| 329 |
+
* @return null
|
| 330 |
+
*/
|
| 331 |
+
public function removeAction() {
|
| 332 |
+
$result = array('status' => 'failed');
|
| 333 |
+
if ($this->getRequest()->isPost() && $this->getRequest()->getPost('remove') == 'true') {
|
| 334 |
+
$dirName = Mage::getBaseDir('code').'/local/Eabi/Postoffice';
|
| 335 |
+
if (is_dir($dirName) && file_exists($dirName.'/etc/config.xml')) {
|
| 336 |
+
$directory = new Varien_Io_File();
|
| 337 |
+
$deleteResult = $directory->rmdir($dirName, true);
|
| 338 |
+
if ($deleteResult) {
|
| 339 |
+
$result['status'] = 'success';
|
| 340 |
+
}
|
| 341 |
+
}
|
| 342 |
+
|
| 343 |
+
}
|
| 344 |
+
$this->getResponse()->setRawHeader('Content-type: application/json');
|
| 345 |
+
$this->getResponse()->setBody(json_encode($result));
|
| 346 |
+
return;
|
| 347 |
+
}
|
| 348 |
+
|
| 349 |
+
|
| 350 |
+
protected function _isAllowed() {
|
| 351 |
+
return Mage::getSingleton('admin/session')->isAllowed('sales/order/actions/create');
|
| 352 |
+
}
|
| 353 |
+
|
| 354 |
+
|
| 355 |
+
/**
|
| 356 |
+
*
|
| 357 |
+
* @return Eabi_Livehandler_Helper_Data
|
| 358 |
+
*/
|
| 359 |
+
protected function _getEabi() {
|
| 360 |
+
return Mage::helper('eabi');
|
| 361 |
+
}
|
| 362 |
+
|
| 363 |
+
/**
|
| 364 |
+
*
|
| 365 |
+
* @return Eabi_Postoffice_Helper_Data
|
| 366 |
+
*/
|
| 367 |
+
protected function _getOfficeHelper() {
|
| 368 |
+
return Mage::helper('eabi_postoffice');
|
| 369 |
+
}
|
| 370 |
+
|
| 371 |
+
|
| 372 |
+
}
|
| 373 |
+
|
app/code/community/Eabi/Postoffice/controllers/Adminhtml/PostofficeController.php
CHANGED
|
@@ -35,6 +35,7 @@
|
|
| 35 |
* Contains the functions, which helps store administrator to place an order using this carrier or the subclasses of this carrier and
|
| 36 |
* also contains actions related to printing packing slips and sending automatic parcel data to the third party carrier server.
|
| 37 |
* @author matishalmann
|
|
|
|
| 38 |
*/
|
| 39 |
class Eabi_Postoffice_Adminhtml_PostofficeController extends Mage_Adminhtml_Controller_Action {
|
| 40 |
|
|
@@ -187,7 +188,7 @@ class Eabi_Postoffice_Adminhtml_PostofficeController extends Mage_Adminhtml_Cont
|
|
| 187 |
if ($storeId <= 0) {
|
| 188 |
throw new Exception('Store ID must be supplied');
|
| 189 |
}
|
| 190 |
-
$url = $this->getUrl('
|
| 191 |
$addressId = $post['address_id'];
|
| 192 |
$carrierCode = $post['carrier_code'];
|
| 193 |
$carrierId = $post['carrier_id'];
|
| 35 |
* Contains the functions, which helps store administrator to place an order using this carrier or the subclasses of this carrier and
|
| 36 |
* also contains actions related to printing packing slips and sending automatic parcel data to the third party carrier server.
|
| 37 |
* @author matishalmann
|
| 38 |
+
* @deprecated since version 0.1.14
|
| 39 |
*/
|
| 40 |
class Eabi_Postoffice_Adminhtml_PostofficeController extends Mage_Adminhtml_Controller_Action {
|
| 41 |
|
| 188 |
if ($storeId <= 0) {
|
| 189 |
throw new Exception('Store ID must be supplied');
|
| 190 |
}
|
| 191 |
+
$url = $this->getUrl('adminhtml/eabi_postoffice_postoffice/office', array('store_id' => $storeId, '_secure' => true));
|
| 192 |
$addressId = $post['address_id'];
|
| 193 |
$carrierCode = $post['carrier_code'];
|
| 194 |
$carrierId = $post['carrier_id'];
|
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.14</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.24</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.14</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,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>- SUPEE-6788 Compatibility</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="67af3ec2e1d22f5ee7b4d6c75b86e463"/><file name="Config.php" hash="6c61f2e9d337a819f4817d87463d6715"/><file name="Flat.php" hash="ad6a01393c5b2989f49e5574850714fd"/><file name="Observer.php" hash="6b43c309bbd4f4a2830b15059c27b467"/><file name="Post.php" hash="071d4cabe5ea01fa43f2600aa4b7de61"/></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.
|
| 27 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Eabi_DpdEE</name>
|
| 4 |
+
<version>0.1.24</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>- SUPEE-6788 Compatibility further improvement</notes>
|
| 21 |
<authors><author><name>Matis Matis</name><user>auto-converted</user><email>info@e-abi.ee</email></author></authors>
|
| 22 |
+
<date>2015-11-12</date>
|
| 23 |
+
<time>00:05:29</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="67af3ec2e1d22f5ee7b4d6c75b86e463"/><file name="Config.php" hash="6c61f2e9d337a819f4817d87463d6715"/><file name="Flat.php" hash="ad6a01393c5b2989f49e5574850714fd"/><file name="Observer.php" hash="6b43c309bbd4f4a2830b15059c27b467"/><file name="Post.php" hash="071d4cabe5ea01fa43f2600aa4b7de61"/></dir><dir name="etc"><file name="config.xml" hash="ef249311d3ef02d883f8b93d16482fdc"/><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="7c54d8257c95decf80e3792cf0538fa6"/><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="921b4d328fb629afb07110517acd043a"/></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>
|
