Version Notes
- Changed test URL to http://demo.surflink.ee:51680/rpc/gateway/
- Fixed bugs related to not auto-sending data when module was disabled on global scale, but was enabled in a specified store
Download this release
Release Info
| Developer | Magento Core Team |
| Extension | Eabi_DpdEE |
| Version | 0.1.10 |
| Comparing to | |
| See all releases | |
Code changes from version 0.1.9 to 0.1.10
- app/code/community/Eabi/DpdEE/CHANGELOG.txt +10 -0
- app/code/community/Eabi/DpdEE/etc/config.xml +1 -1
- app/code/community/Eabi/DpdEE/etc/system.xml +1 -1
- app/code/community/Eabi/DpdEE/sql/eabi_dpdee_setup/mysql4-upgrade-0.1.9-0.1.10.php +69 -0
- app/code/community/Eabi/Postoffice/Block/Adminhtml/Config/Form/Field/License.php +184 -0
- app/code/community/Eabi/Postoffice/Helper/Data.php +68 -9
- app/code/community/Eabi/Postoffice/Model/Carrier/Abstract.php +8 -0
- app/code/community/Eabi/Postoffice/Model/Observer.php +66 -0
- app/code/community/Eabi/Postoffice/Model/Orderview.php +1 -1
- app/code/community/Eabi/Postoffice/controllers/Adminhtml/PostofficeController.php +2 -2
- app/code/community/Eabi/Postoffice/etc/config.xml +21 -1
- app/code/community/Eabi/Postoffice/sql/eabi_postoffice_setup/mysql4-upgrade-0.1.5-0.1.6.php +47 -0
- app/code/community/Eabi/Postoffice/sql/eabi_postoffice_setup/mysql4-upgrade-0.1.6-0.1.7.php +50 -0
- app/design/adminhtml/default/default/layout/eabi_postoffice.xml +7 -0
- app/etc/modules/Eabi_DpdEE.xml +1 -1
- app/etc/modules/Eabi_Postoffice.xml +1 -1
- app/locale/en_US/Eabi_Postoffice.csv +7 -0
- app/locale/et_EE/Eabi_Postoffice.csv +7 -0
- app/locale/fi_FI/Eabi_Postoffice.csv +7 -0
- app/locale/hu_HU/Eabi_Postoffice.csv +7 -0
- app/locale/lt_LT/Eabi_Postoffice.csv +7 -0
- app/locale/ru_RU/Eabi_Postoffice.csv +7 -0
- app/locale/sv_SE/Eabi_Postoffice.csv +7 -0
- package.xml +7 -6
app/code/community/Eabi/DpdEE/CHANGELOG.txt
CHANGED
|
@@ -21,3 +21,13 @@
|
|
| 21 |
- Added isCodEnabled and _applyPriceFromCod functions to Postoffice abstract carrier
|
| 22 |
- Ability to auto-send-data to server is now checked by canSendData function in Postoffice abstract carrier
|
| 23 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 21 |
- Added isCodEnabled and _applyPriceFromCod functions to Postoffice abstract carrier
|
| 22 |
- Ability to auto-send-data to server is now checked by canSendData function in Postoffice abstract carrier
|
| 23 |
|
| 24 |
+
0.1.8
|
| 25 |
+
- Fix recoverable error with isCodEnabled and getCodFee functions (remove Mage_Customer_Model_Address parameter type requirement)
|
| 26 |
+
- Fix error which prohibited confirming the checkout when one of the shipping methods have been disabled via ~/app/etc/modules/*.xml
|
| 27 |
+
|
| 28 |
+
0.1.9
|
| 29 |
+
- Added ability to disable only parcelstore or courier carrier by and html comments respectively
|
| 30 |
+
|
| 31 |
+
0.1.10
|
| 32 |
+
- Changed test URL to http://demo.surflink.ee:51680/rpc/gateway/
|
| 33 |
+
- Fixed bugs related to not auto-sending data when module was disabled on global scale, but was enabled in a specified store
|
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.10</version>
|
| 40 |
</Eabi_DpdEE>
|
| 41 |
</modules>
|
| 42 |
|
app/code/community/Eabi/DpdEE/etc/system.xml
CHANGED
|
@@ -362,7 +362,7 @@
|
|
| 362 |
<show_in_default>1</show_in_default>
|
| 363 |
<show_in_website>0</show_in_website>
|
| 364 |
<show_in_store>0</show_in_store>
|
| 365 |
-
<comment><![CDATA[<ul><li><b>Live:</b> http://www.pakivedu.ee/rpc/gateway</li><li><b>Test:</b> http://
|
| 366 |
<depends>
|
| 367 |
<senddata_enable>1</senddata_enable>
|
| 368 |
</depends>
|
| 362 |
<show_in_default>1</show_in_default>
|
| 363 |
<show_in_website>0</show_in_website>
|
| 364 |
<show_in_store>0</show_in_store>
|
| 365 |
+
<comment><![CDATA[<ul><li><b>Live:</b> http://www.pakivedu.ee/rpc/gateway</li><li><b>Test:</b> http://demo.surflink.ee:51680/rpc/gateway/</li></ul>]]></comment>
|
| 366 |
<depends>
|
| 367 |
<senddata_enable>1</senddata_enable>
|
| 368 |
</depends>
|
app/code/community/Eabi/DpdEE/sql/eabi_dpdee_setup/mysql4-upgrade-0.1.9-0.1.10.php
ADDED
|
@@ -0,0 +1,69 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 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) 2014 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 |
+
$installer = $this;
|
| 34 |
+
|
| 35 |
+
$installer->startSetup();
|
| 36 |
+
|
| 37 |
+
|
| 38 |
+
/*
|
| 39 |
+
* Set default CASH on delivery fee to following countries:
|
| 40 |
+
* EE
|
| 41 |
+
* LV
|
| 42 |
+
* LT
|
| 43 |
+
*
|
| 44 |
+
* Set this fee to all defined config scopes
|
| 45 |
+
*/
|
| 46 |
+
$configPaths = array(
|
| 47 |
+
'carriers/eabidpdee/api_url',
|
| 48 |
+
);
|
| 49 |
+
|
| 50 |
+
//echo '<pre>'.(print_r(get_class_methods(Mage::getModel('core/config_data')), true)).'</pre>';
|
| 51 |
+
|
| 52 |
+
$configDatas = Mage::getModel('core/config_data')->getCollection()->addFieldToFilter('path', array('in' => $configPaths));
|
| 53 |
+
|
| 54 |
+
foreach ($configDatas as $configData) {
|
| 55 |
+
$oldValue = $configData->getValue();
|
| 56 |
+
if ($oldValue == 'http://dpd.surflink.ee/rpc/gateway/' || $oldValue == 'http://dpd.surflink.ee/rpc/gateway') {
|
| 57 |
+
$configData->setValue('http://demo.surflink.ee:51680/rpc/gateway/');
|
| 58 |
+
$configData->save();
|
| 59 |
+
}
|
| 60 |
+
}
|
| 61 |
+
|
| 62 |
+
$installer->run("
|
| 63 |
+
|
| 64 |
+
|
| 65 |
+
");
|
| 66 |
+
|
| 67 |
+
|
| 68 |
+
//end install
|
| 69 |
+
$installer->endSetup();
|
app/code/community/Eabi/Postoffice/Block/Adminhtml/Config/Form/Field/License.php
ADDED
|
@@ -0,0 +1,184 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 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) 2014 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 |
+
* <p>Renders yes/no select box with licensing information</p>
|
| 35 |
+
*
|
| 36 |
+
* @author Matis
|
| 37 |
+
*/
|
| 38 |
+
class Eabi_Postoffice_Block_Adminhtml_Config_Form_Field_License extends Mage_Adminhtml_Block_System_Config_Form_Field {
|
| 39 |
+
|
| 40 |
+
protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) {
|
| 41 |
+
/*
|
| 42 |
+
* structure
|
| 43 |
+
* array()
|
| 44 |
+
*
|
| 45 |
+
*
|
| 46 |
+
*/
|
| 47 |
+
$stores = Mage::app()->getStores();
|
| 48 |
+
$urls = array();
|
| 49 |
+
foreach ($stores as $store) {
|
| 50 |
+
/* @var $store Mage_Core_Model_Store */
|
| 51 |
+
try {
|
| 52 |
+
$url = Zend_Uri_Http::fromString($store->getBaseUrl())->getHost();
|
| 53 |
+
if (!in_array($url, $urls)) {
|
| 54 |
+
$urls[] = $url;
|
| 55 |
+
}
|
| 56 |
+
} catch (Exception $ex) {
|
| 57 |
+
//do nothing or log
|
| 58 |
+
Mage::log(sprintf('Invalid base url %s for store id %s', $store->getBaseUrl(), $store->getId()), Zend_Log::WARN);
|
| 59 |
+
|
| 60 |
+
}
|
| 61 |
+
}
|
| 62 |
+
$date = new Zend_Date(time(), Zend_Date::TIMESTAMP);
|
| 63 |
+
$timezone = Mage::app()->getStore(Mage_Core_Model_App::ADMIN_STORE_ID)->getConfig(Mage_Core_Model_Locale::XML_PATH_DEFAULT_TIMEZONE);
|
| 64 |
+
$date->setTimezone($timezone);
|
| 65 |
+
|
| 66 |
+
|
| 67 |
+
$license = array(
|
| 68 |
+
'urls' => $urls,
|
| 69 |
+
'countries' => array(
|
| 70 |
+
'EE' => array('Y', 'Y', 'Y'),
|
| 71 |
+
'LV' => array('T', 'T', 'T'),
|
| 72 |
+
'LT' => array('T', 'N', 'N'),
|
| 73 |
+
),
|
| 74 |
+
'date' => $date->get(Zend_Date::ISO_8601),
|
| 75 |
+
'sku' => '010125',
|
| 76 |
+
'token' => '12346789',
|
| 77 |
+
);
|
| 78 |
+
// $this->_getOfficeHelper()->setCarrierLicense('eabiomnivaterminal', $license);
|
| 79 |
+
$l = $this->_getOfficeHelper()->getCarrierLicense('eabiomnivaterminal');
|
| 80 |
+
// $license = false;
|
| 81 |
+
$inputData = array(
|
| 82 |
+
"countryName" => Mage::getStoreConfig('general/country/default'),
|
| 83 |
+
"stateOrProvinceName" => 'N/A',
|
| 84 |
+
"localityName" => 'N/A',
|
| 85 |
+
"organizationName" => 'N/A',
|
| 86 |
+
"organizationalUnitName" => implode(',', $urls),
|
| 87 |
+
"commonName" => 'Aktsiamaailm LLC',
|
| 88 |
+
"emailAddress" => Mage::getStoreConfig('trans_email/ident_general/email'),
|
| 89 |
+
);
|
| 90 |
+
$keys = $this->_getKeypairHelper()->generateKeyPair($inputData);
|
| 91 |
+
|
| 92 |
+
$text = 'Change license';
|
| 93 |
+
if (!$license) {
|
| 94 |
+
$text = 'Register license';
|
| 95 |
+
}
|
| 96 |
+
// $this->_getEabi()->setConfigData('carriers/eabiomnivaterminal/test', Mage::helper('core')->encrypt('onukala_onukala_onukala_onukala_onukala_onukala_onukala_onukala_onukala'));
|
| 97 |
+
|
| 98 |
+
return $element->getElementHtml().'<br/>' . '<pre>'.htmlspecialchars(print_r(Mage::getStoreConfig('carriers/eabiomnivaterminal/test'), true), ENT_COMPAT | ENT_HTML401 | ENT_IGNORE).'</pre>'
|
| 99 |
+
. <<<HTML
|
| 100 |
+
<ul class="eabi_postoffice_license">
|
| 101 |
+
<li><strong>{$this->_getOfficeHelper()->__('Basic license')}</strong> {$this->_getBasicLicense($license)}</li>
|
| 102 |
+
<li><strong>{$this->_getOfficeHelper()->__('Automatic data sending')}</strong>{$this->_getDatasendLicense($license)}</li>
|
| 103 |
+
<li><strong>{$this->_getOfficeHelper()->__('Cash on delivery')}</strong>{$this->_getCodLicense($license)}</li>
|
| 104 |
+
<li><strong>{$this->_getOfficeHelper()->__('Allowed for URL-s')}</strong>{$this->_getUrlsLicense($license)}</li>
|
| 105 |
+
<li><strong> </strong><span class="change-license"><a href="">{$this->_getOfficeHelper()->__($text)}</a></span></li>
|
| 106 |
+
</ul>
|
| 107 |
+
HTML;
|
| 108 |
+
}
|
| 109 |
+
|
| 110 |
+
protected function _getUrlsLicense($input) {
|
| 111 |
+
$urls = $input['urls'];
|
| 112 |
+
if (!count($urls)) {
|
| 113 |
+
return '<span class="no-license">'.$this->_getOfficeHelper()->__('not-licensed').'</span>';
|
| 114 |
+
}
|
| 115 |
+
return '<span class="countries">' .implode(', ', $urls).'</span>';
|
| 116 |
+
}
|
| 117 |
+
protected function _getBasicLicense($input) {
|
| 118 |
+
$result = $this->_getGenericLicense($input, 0);
|
| 119 |
+
return $result;
|
| 120 |
+
}
|
| 121 |
+
|
| 122 |
+
protected function _getDatasendLicense($input) {
|
| 123 |
+
$result = $this->_getGenericLicense($input, 1);
|
| 124 |
+
return $result;
|
| 125 |
+
}
|
| 126 |
+
|
| 127 |
+
protected function _getCodLicense($input) {
|
| 128 |
+
$result = $this->_getGenericLicense($input, 2);
|
| 129 |
+
return $result;
|
| 130 |
+
}
|
| 131 |
+
|
| 132 |
+
private function _getGenericLicense($input, $index) {
|
| 133 |
+
$result = array();
|
| 134 |
+
$isTimedOut = false;
|
| 135 |
+
foreach ($input['countries'] as $countryCode => $data) {
|
| 136 |
+
$test = $data[$index];
|
| 137 |
+
if ($test == 'Y') {
|
| 138 |
+
$result[] = $this->_getCountryName($countryCode);
|
| 139 |
+
} else if ($test == 'T' && !$isTimedOut) {
|
| 140 |
+
$result[] = $this->_getCountryName($countryCode) . '-' . $this->_getOfficeHelper()->__('demo');
|
| 141 |
+
}
|
| 142 |
+
}
|
| 143 |
+
if (!count($result)) {
|
| 144 |
+
return '<span class="no-license">'.$this->_getOfficeHelper()->__('not-licensed').'</span>';
|
| 145 |
+
}
|
| 146 |
+
return '<span class="countries">' .implode(', ', $result).'</span>';
|
| 147 |
+
}
|
| 148 |
+
|
| 149 |
+
private function _getCountryName($code) {
|
| 150 |
+
return Mage::app()->getLocale()->getCountryTranslation($code);
|
| 151 |
+
}
|
| 152 |
+
|
| 153 |
+
|
| 154 |
+
private function _toJson($input) {
|
| 155 |
+
return json_encode($input);
|
| 156 |
+
}
|
| 157 |
+
|
| 158 |
+
/**
|
| 159 |
+
*
|
| 160 |
+
* @return Eabi_Postoffice_Helper_Data
|
| 161 |
+
*/
|
| 162 |
+
protected function _getOfficeHelper() {
|
| 163 |
+
return Mage::helper('eabi_postoffice');
|
| 164 |
+
}
|
| 165 |
+
|
| 166 |
+
/**
|
| 167 |
+
*
|
| 168 |
+
* @return Eabi_Livehandler_Helper_Keypair
|
| 169 |
+
*/
|
| 170 |
+
protected function _getKeypairHelper() {
|
| 171 |
+
return Mage::helper('eabi/keypair');
|
| 172 |
+
}
|
| 173 |
+
|
| 174 |
+
|
| 175 |
+
/**
|
| 176 |
+
*
|
| 177 |
+
* @return Eabi_Livehandler_Helper_Data
|
| 178 |
+
*/
|
| 179 |
+
protected function _getEabi() {
|
| 180 |
+
return Mage::helper('eabi');
|
| 181 |
+
}
|
| 182 |
+
|
| 183 |
+
}
|
| 184 |
+
|
app/code/community/Eabi/Postoffice/Helper/Data.php
CHANGED
|
@@ -175,7 +175,7 @@ class Eabi_Postoffice_Helper_Data extends Mage_Core_Helper_Abstract {
|
|
| 175 |
}
|
| 176 |
$shippingMethod = $order->getShippingMethod();
|
| 177 |
$shippingCarrierCode = substr($shippingMethod, 0, strpos($shippingMethod, '_'));
|
| 178 |
-
$shippingMethodModel = Mage::getModel('shipping/shipping')->getCarrierByCode($shippingCarrierCode);
|
| 179 |
if ($shippingMethodModel && ($shippingMethodModel instanceof Eabi_Postoffice_Model_Carrier_Abstract)) {
|
| 180 |
return $shippingMethodModel->getBarcode($order);
|
| 181 |
}
|
|
@@ -196,7 +196,7 @@ class Eabi_Postoffice_Helper_Data extends Mage_Core_Helper_Abstract {
|
|
| 196 |
}
|
| 197 |
$shippingMethod = $order->getShippingMethod();
|
| 198 |
$shippingCarrierCode = substr($shippingMethod, 0, strpos($shippingMethod, '_'));
|
| 199 |
-
$shippingMethodModel = Mage::getModel('shipping/shipping')->getCarrierByCode($shippingCarrierCode);
|
| 200 |
if ($shippingMethodModel && ($shippingMethodModel instanceof Eabi_Postoffice_Model_Carrier_Abstract)) {
|
| 201 |
$shippingMethodModel->setStore($order->getStore());
|
| 202 |
return $shippingMethodModel;
|
|
@@ -221,7 +221,7 @@ class Eabi_Postoffice_Helper_Data extends Mage_Core_Helper_Abstract {
|
|
| 221 |
}
|
| 222 |
$shippingMethod = $order->getShippingMethod();
|
| 223 |
$shippingCarrierCode = substr($shippingMethod, 0, strpos($shippingMethod, '_'));
|
| 224 |
-
$shippingMethodModel = Mage::getModel('shipping/shipping')->getCarrierByCode($shippingCarrierCode);
|
| 225 |
if ($shippingMethodModel && ($shippingMethodModel instanceof Eabi_Postoffice_Model_Carrier_Abstract)) {
|
| 226 |
return $shippingMethodModel->getBarcodePdf($order);
|
| 227 |
}
|
|
@@ -243,7 +243,7 @@ class Eabi_Postoffice_Helper_Data extends Mage_Core_Helper_Abstract {
|
|
| 243 |
}
|
| 244 |
$shippingMethod = $order->getShippingMethod();
|
| 245 |
$shippingCarrierCode = substr($shippingMethod, 0, strpos($shippingMethod, '_'));
|
| 246 |
-
$shippingMethodModel = Mage::getModel('shipping/shipping')->getCarrierByCode($shippingCarrierCode);
|
| 247 |
if ($shippingMethodModel && ($shippingMethodModel instanceof Eabi_Postoffice_Model_Carrier_Abstract)) {
|
| 248 |
if ($shippingMethodModel->isAutoSendAvailable()) {
|
| 249 |
return $shippingMethodModel->isDataSent($order);
|
|
@@ -272,7 +272,7 @@ class Eabi_Postoffice_Helper_Data extends Mage_Core_Helper_Abstract {
|
|
| 272 |
|
| 273 |
//get the shipping code from the order and call the module from it.
|
| 274 |
$shippingCarrierCode = substr($shippingMethod, 0, strpos($shippingMethod, '_'));
|
| 275 |
-
$shippingMethodModel = Mage::getModel('shipping/shipping')->getCarrierByCode($shippingCarrierCode);
|
| 276 |
}
|
| 277 |
|
| 278 |
|
|
@@ -320,7 +320,7 @@ class Eabi_Postoffice_Helper_Data extends Mage_Core_Helper_Abstract {
|
|
| 320 |
|
| 321 |
//get the shipping code from the order and call the module from it.
|
| 322 |
$shippingCarrierCode = substr($shippingMethod, 0, strpos($shippingMethod, '_'));
|
| 323 |
-
$shippingMethodModel = Mage::getModel('shipping/shipping')->getCarrierByCode($shippingCarrierCode);
|
| 324 |
$codMethods = array(
|
| 325 |
'eabicodpayment',
|
| 326 |
'dpdcodpayment',
|
|
@@ -333,15 +333,29 @@ class Eabi_Postoffice_Helper_Data extends Mage_Core_Helper_Abstract {
|
|
| 333 |
/* order due is 0*/
|
| 334 |
&& (!(round($order->getTotalDue(), 2) > 0)
|
| 335 |
/* order due is larger than 0 and payment method is in allowed list */
|
| 336 |
-
|| ((round($order->getTotalDue(), 2) > 0 && in_array($paymentMethod->getMethod(), $codMethods))))
|
| 337 |
-
&& !($order->isCanceled() || $order->getIsVirtual())
|
| 338 |
-
&& $shippingMethodModel->isDataSent($order) === false) {
|
| 339 |
try {
|
| 340 |
$resultCarrierId = substr($shippingMethod, strrpos($shippingMethod, '_') + 1);
|
| 341 |
//TODO - make sure the correct store is selected, for example in admin.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 342 |
$result = $shippingMethodModel->autoSendData($order, $resultCarrierId);
|
| 343 |
if ($result) {
|
| 344 |
$order->addStatusHistoryComment(print_r($result, true));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 345 |
} else {
|
| 346 |
$order->addStatusHistoryComment($this->__('Automatic data sending not applicable'));
|
| 347 |
}
|
|
@@ -541,6 +555,51 @@ class Eabi_Postoffice_Helper_Data extends Mage_Core_Helper_Abstract {
|
|
| 541 |
}
|
| 542 |
|
| 543 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 544 |
/**
|
| 545 |
*
|
| 546 |
* @return Eabi_Postoffice_Helper_Countrycode
|
| 175 |
}
|
| 176 |
$shippingMethod = $order->getShippingMethod();
|
| 177 |
$shippingCarrierCode = substr($shippingMethod, 0, strpos($shippingMethod, '_'));
|
| 178 |
+
$shippingMethodModel = Mage::getModel('shipping/shipping')->getCarrierByCode($shippingCarrierCode, $order->getStoreId());
|
| 179 |
if ($shippingMethodModel && ($shippingMethodModel instanceof Eabi_Postoffice_Model_Carrier_Abstract)) {
|
| 180 |
return $shippingMethodModel->getBarcode($order);
|
| 181 |
}
|
| 196 |
}
|
| 197 |
$shippingMethod = $order->getShippingMethod();
|
| 198 |
$shippingCarrierCode = substr($shippingMethod, 0, strpos($shippingMethod, '_'));
|
| 199 |
+
$shippingMethodModel = Mage::getModel('shipping/shipping')->getCarrierByCode($shippingCarrierCode, $order->getStoreId());
|
| 200 |
if ($shippingMethodModel && ($shippingMethodModel instanceof Eabi_Postoffice_Model_Carrier_Abstract)) {
|
| 201 |
$shippingMethodModel->setStore($order->getStore());
|
| 202 |
return $shippingMethodModel;
|
| 221 |
}
|
| 222 |
$shippingMethod = $order->getShippingMethod();
|
| 223 |
$shippingCarrierCode = substr($shippingMethod, 0, strpos($shippingMethod, '_'));
|
| 224 |
+
$shippingMethodModel = Mage::getModel('shipping/shipping')->getCarrierByCode($shippingCarrierCode, $order->getStoreId());
|
| 225 |
if ($shippingMethodModel && ($shippingMethodModel instanceof Eabi_Postoffice_Model_Carrier_Abstract)) {
|
| 226 |
return $shippingMethodModel->getBarcodePdf($order);
|
| 227 |
}
|
| 243 |
}
|
| 244 |
$shippingMethod = $order->getShippingMethod();
|
| 245 |
$shippingCarrierCode = substr($shippingMethod, 0, strpos($shippingMethod, '_'));
|
| 246 |
+
$shippingMethodModel = Mage::getModel('shipping/shipping')->getCarrierByCode($shippingCarrierCode, $order->getStoreId());
|
| 247 |
if ($shippingMethodModel && ($shippingMethodModel instanceof Eabi_Postoffice_Model_Carrier_Abstract)) {
|
| 248 |
if ($shippingMethodModel->isAutoSendAvailable()) {
|
| 249 |
return $shippingMethodModel->isDataSent($order);
|
| 272 |
|
| 273 |
//get the shipping code from the order and call the module from it.
|
| 274 |
$shippingCarrierCode = substr($shippingMethod, 0, strpos($shippingMethod, '_'));
|
| 275 |
+
$shippingMethodModel = Mage::getModel('shipping/shipping')->getCarrierByCode($shippingCarrierCode, $order->getStoreId());
|
| 276 |
}
|
| 277 |
|
| 278 |
|
| 320 |
|
| 321 |
//get the shipping code from the order and call the module from it.
|
| 322 |
$shippingCarrierCode = substr($shippingMethod, 0, strpos($shippingMethod, '_'));
|
| 323 |
+
$shippingMethodModel = Mage::getModel('shipping/shipping')->getCarrierByCode($shippingCarrierCode, $order->getStoreId());
|
| 324 |
$codMethods = array(
|
| 325 |
'eabicodpayment',
|
| 326 |
'dpdcodpayment',
|
| 333 |
/* order due is 0*/
|
| 334 |
&& (!(round($order->getTotalDue(), 2) > 0)
|
| 335 |
/* order due is larger than 0 and payment method is in allowed list */
|
| 336 |
+
|| ((round($order->getTotalDue(), 2) > 0 && in_array($paymentMethod->getMethod(), $codMethods)))) && !($order->isCanceled() || $order->getIsVirtual()) && $shippingMethodModel->isDataSent($order) === false) {
|
|
|
|
|
|
|
| 337 |
try {
|
| 338 |
$resultCarrierId = substr($shippingMethod, strrpos($shippingMethod, '_') + 1);
|
| 339 |
//TODO - make sure the correct store is selected, for example in admin.
|
| 340 |
+
$request = new Varien_Object();
|
| 341 |
+
Mage::dispatchEvent('eabi_postoffice_autosend_data_before', array(
|
| 342 |
+
'request' => $request,
|
| 343 |
+
'shipment_method' => $shippingMethodModel,
|
| 344 |
+
'order' => $order,
|
| 345 |
+
));
|
| 346 |
+
|
| 347 |
+
|
| 348 |
$result = $shippingMethodModel->autoSendData($order, $resultCarrierId);
|
| 349 |
if ($result) {
|
| 350 |
$order->addStatusHistoryComment(print_r($result, true));
|
| 351 |
+
|
| 352 |
+
$request = new Varien_Object();
|
| 353 |
+
Mage::dispatchEvent('eabi_postoffice_autosend_data_success', array(
|
| 354 |
+
'request' => $request,
|
| 355 |
+
'shipment_method' => $shippingMethodModel,
|
| 356 |
+
'order' => $order,
|
| 357 |
+
'result' => $result,
|
| 358 |
+
));
|
| 359 |
} else {
|
| 360 |
$order->addStatusHistoryComment($this->__('Automatic data sending not applicable'));
|
| 361 |
}
|
| 555 |
}
|
| 556 |
|
| 557 |
|
| 558 |
+
public function setCarrierLicense($carrierCode, array $data) {
|
| 559 |
+
$carrierModule = $this->_getCarrierModule($carrierCode);
|
| 560 |
+
if ($carrierModule->getNeedsLicense()) {
|
| 561 |
+
$license = base64_encode(gzcompress(json_encode($data)));
|
| 562 |
+
$carrierModule->setLicenseData($license);
|
| 563 |
+
$carrierModule->save();
|
| 564 |
+
return true;
|
| 565 |
+
}
|
| 566 |
+
return false;
|
| 567 |
+
}
|
| 568 |
+
|
| 569 |
+
public function getCarrierLicense($carrierCode) {
|
| 570 |
+
$carrierModule = $this->_getCarrierModule($carrierCode);
|
| 571 |
+
if ($carrierModule->getNeedsLicense() && $carrierModule->getLicenseData()) {
|
| 572 |
+
$license = @json_decode(@gzuncompress(@base64_decode($carrierModule->getLicenseData())), true);
|
| 573 |
+
if (!is_array($license)) {
|
| 574 |
+
return false;
|
| 575 |
+
}
|
| 576 |
+
return $license;
|
| 577 |
+
}
|
| 578 |
+
return false;
|
| 579 |
+
}
|
| 580 |
+
|
| 581 |
+
|
| 582 |
+
/**
|
| 583 |
+
*
|
| 584 |
+
* @return Eabi_Postoffice_Model_Carriermodule
|
| 585 |
+
*/
|
| 586 |
+
protected function _getCarrierModule($carrierCode) {
|
| 587 |
+
$carrierModules = $this->_getCarrierModuleModel()
|
| 588 |
+
->getCollection()
|
| 589 |
+
->addFieldToFilter('carrier_code', $carrierCode);
|
| 590 |
+
return $carrierModules->getFirstItem();
|
| 591 |
+
}
|
| 592 |
+
|
| 593 |
+
/**
|
| 594 |
+
*
|
| 595 |
+
* @return Eabi_Postoffice_Model_Carriermodule
|
| 596 |
+
*/
|
| 597 |
+
protected function _getCarrierModuleModel() {
|
| 598 |
+
return Mage::getModel('eabi_postoffice/carriermodule');
|
| 599 |
+
}
|
| 600 |
+
|
| 601 |
+
|
| 602 |
+
|
| 603 |
/**
|
| 604 |
*
|
| 605 |
* @return Eabi_Postoffice_Helper_Countrycode
|
app/code/community/Eabi/Postoffice/Model/Carrier/Abstract.php
CHANGED
|
@@ -359,6 +359,14 @@ abstract class Eabi_Postoffice_Model_Carrier_Abstract extends Mage_Shipping_Mode
|
|
| 359 |
if ($price === false) {
|
| 360 |
return false;
|
| 361 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 362 |
$session = Mage::getSingleton('core/session');
|
| 363 |
|
| 364 |
$this->registerAddressId($addressId);
|
| 359 |
if ($price === false) {
|
| 360 |
return false;
|
| 361 |
}
|
| 362 |
+
Mage::dispatchEvent('eabi_postoffice_collect_rates_terminals_load_before', array(
|
| 363 |
+
'request' => $request,
|
| 364 |
+
'shipment_method' => $this,
|
| 365 |
+
));
|
| 366 |
+
|
| 367 |
+
if ($request->getCancelRateCollection()) {
|
| 368 |
+
return false;
|
| 369 |
+
}
|
| 370 |
$session = Mage::getSingleton('core/session');
|
| 371 |
|
| 372 |
$this->registerAddressId($addressId);
|
app/code/community/Eabi/Postoffice/Model/Observer.php
ADDED
|
@@ -0,0 +1,66 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
|
| 3 |
+
/*
|
| 4 |
+
|
| 5 |
+
*
|
| 6 |
+
* NOTICE OF LICENSE
|
| 7 |
+
*
|
| 8 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
| 9 |
+
* or OpenGPL v3 license (GNU Public License V3.0)
|
| 10 |
+
* that is bundled with this package in the file LICENSE.txt.
|
| 11 |
+
* It is also available through the world-wide-web at this URL:
|
| 12 |
+
* http://opensource.org/licenses/osl-3.0.php
|
| 13 |
+
* or
|
| 14 |
+
* http://www.gnu.org/licenses/gpl-3.0.txt
|
| 15 |
+
* If you did not receive a copy of the license and are unable to
|
| 16 |
+
* obtain it through the world-wide-web, please send an email
|
| 17 |
+
* to info@e-abi.ee so we can send you a copy immediately.
|
| 18 |
+
*
|
| 19 |
+
* DISCLAIMER
|
| 20 |
+
*
|
| 21 |
+
* Do not edit or add to this file if you wish to upgrade this module to newer
|
| 22 |
+
* versions in the future.
|
| 23 |
+
*
|
| 24 |
+
* @category Eabi
|
| 25 |
+
* @package Eabi_Dpd
|
| 26 |
+
* @copyright Copyright (c) 2014 Aktsiamaailm LLC (http://en.e-abi.ee/)
|
| 27 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 28 |
+
* @license http://www.gnu.org/licenses/gpl-3.0.txt GNU Public License V3.0
|
| 29 |
+
* @author Matis Halmann
|
| 30 |
+
*
|
| 31 |
+
|
| 32 |
+
*/
|
| 33 |
+
|
| 34 |
+
/**
|
| 35 |
+
* Description of Observer
|
| 36 |
+
*
|
| 37 |
+
* @author Matis
|
| 38 |
+
*/
|
| 39 |
+
class Eabi_Postoffice_Model_Observer {
|
| 40 |
+
|
| 41 |
+
|
| 42 |
+
/**
|
| 43 |
+
* @param Varien_Event_Observer $observer
|
| 44 |
+
*/
|
| 45 |
+
public function listenLicense($observer) {
|
| 46 |
+
/* @var $shipmentMethod Eabi_Postoffice_Model_Carrier_Abstract */
|
| 47 |
+
$shipmentMethod = $observer->getEvent()->getShipmentMethod();
|
| 48 |
+
/* @var $request Mage_Shipping_Model_Rate_Request */
|
| 49 |
+
$request = $observer->getEvent()->getRequest();
|
| 50 |
+
|
| 51 |
+
// $request->setCancelRateCollection(true);
|
| 52 |
+
|
| 53 |
+
}
|
| 54 |
+
|
| 55 |
+
|
| 56 |
+
/**
|
| 57 |
+
* @param Varien_Event_Observer $observer
|
| 58 |
+
*/
|
| 59 |
+
public function registerUsage($observer) {
|
| 60 |
+
$order = $observer->getEvent()->getOrder();
|
| 61 |
+
/* @var $order Mage_Sales_Model_Order */
|
| 62 |
+
}
|
| 63 |
+
|
| 64 |
+
|
| 65 |
+
|
| 66 |
+
}
|
app/code/community/Eabi/Postoffice/Model/Orderview.php
CHANGED
|
@@ -59,7 +59,7 @@ class Eabi_Postoffice_Model_Orderview extends Eabi_Livehandler_Model_Adminhtml_G
|
|
| 59 |
$this->_orderId = $order->getId();
|
| 60 |
$barcode = Mage::helper('eabi_postoffice')->getBarcode($order->getIncrementId());
|
| 61 |
|
| 62 |
-
if (is_string($barcode)) {
|
| 63 |
$url = Mage::helper('adminhtml')->getUrl('eabi_postoffice/adminhtml_postoffice/addresscardpdf', array('order_id'=> $orderId));
|
| 64 |
|
| 65 |
$this->addActionButton('eabi_get_addresscard', Mage::helper('eabi_postoffice')->__('Print packing slip'), "setLocation('".$url."')");
|
| 59 |
$this->_orderId = $order->getId();
|
| 60 |
$barcode = Mage::helper('eabi_postoffice')->getBarcode($order->getIncrementId());
|
| 61 |
|
| 62 |
+
if (is_string($barcode) || is_array($barcode)) {
|
| 63 |
$url = Mage::helper('adminhtml')->getUrl('eabi_postoffice/adminhtml_postoffice/addresscardpdf', array('order_id'=> $orderId));
|
| 64 |
|
| 65 |
$this->addActionButton('eabi_get_addresscard', Mage::helper('eabi_postoffice')->__('Print packing slip'), "setLocation('".$url."')");
|
app/code/community/Eabi/Postoffice/controllers/Adminhtml/PostofficeController.php
CHANGED
|
@@ -131,7 +131,7 @@ class Eabi_Postoffice_Adminhtml_PostofficeController extends Mage_Adminhtml_Cont
|
|
| 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);
|
| 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'));
|
|
@@ -189,7 +189,7 @@ class Eabi_Postoffice_Adminhtml_PostofficeController extends Mage_Adminhtml_Cont
|
|
| 189 |
$divId = $post['div_id'];
|
| 190 |
$groupId = isset($post['group_id']) ? ((int) $post['group_id']) : 0;
|
| 191 |
$placeId = isset($post['place_id']) ? ((int) $post['place_id']) : 0;
|
| 192 |
-
$shippingModel = Mage::getModel('shipping/shipping')->getCarrierByCode($carrierCode);
|
| 193 |
|
| 194 |
//we are in admin section, so we need to set the store it manually
|
| 195 |
$shippingModel->setStoreId($storeId);
|
| 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'));
|
| 189 |
$divId = $post['div_id'];
|
| 190 |
$groupId = isset($post['group_id']) ? ((int) $post['group_id']) : 0;
|
| 191 |
$placeId = isset($post['place_id']) ? ((int) $post['place_id']) : 0;
|
| 192 |
+
$shippingModel = Mage::getModel('shipping/shipping')->getCarrierByCode($carrierCode, $storeId);
|
| 193 |
|
| 194 |
//we are in admin section, so we need to set the store it manually
|
| 195 |
$shippingModel->setStoreId($storeId);
|
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 |
|
|
@@ -116,6 +116,17 @@
|
|
| 116 |
</eabi_postoffice_send_shipment>
|
| 117 |
</observers>
|
| 118 |
</sales_order_shipment_save_before>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 119 |
</events>
|
| 120 |
</adminhtml>
|
| 121 |
<admin>
|
|
@@ -205,6 +216,15 @@
|
|
| 205 |
</eabi_postoffice_clear_session>
|
| 206 |
</observers>
|
| 207 |
</sales_order_place_before>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 208 |
</events>
|
| 209 |
<translate>
|
| 210 |
<modules>
|
| 36 |
<config>
|
| 37 |
<modules>
|
| 38 |
<Eabi_Postoffice>
|
| 39 |
+
<version>0.1.6</version>
|
| 40 |
</Eabi_Postoffice>
|
| 41 |
</modules>
|
| 42 |
|
| 116 |
</eabi_postoffice_send_shipment>
|
| 117 |
</observers>
|
| 118 |
</sales_order_shipment_save_before>
|
| 119 |
+
<!-- eabi_postoffice_autosend_data_before -->
|
| 120 |
+
<!-- eabi_postoffice_collect_rates_terminals_load_before -->
|
| 121 |
+
<eabi_postoffice_collect_rates_terminals_load_before>
|
| 122 |
+
<observers>
|
| 123 |
+
<eabi_postoffice_listen_license>
|
| 124 |
+
<type>singleton</type>
|
| 125 |
+
<class>Eabi_Postoffice_Model_Observer</class>
|
| 126 |
+
<method>listenLicense</method>
|
| 127 |
+
</eabi_postoffice_listen_license>
|
| 128 |
+
</observers>
|
| 129 |
+
</eabi_postoffice_collect_rates_terminals_load_before>
|
| 130 |
</events>
|
| 131 |
</adminhtml>
|
| 132 |
<admin>
|
| 216 |
</eabi_postoffice_clear_session>
|
| 217 |
</observers>
|
| 218 |
</sales_order_place_before>
|
| 219 |
+
<sales_order_place_after>
|
| 220 |
+
<observers>
|
| 221 |
+
<eabi_postoffice_register_usage>
|
| 222 |
+
<class>eabi_postoffice/observer</class>
|
| 223 |
+
<method>registerUsage</method>
|
| 224 |
+
</eabi_postoffice_register_usage>
|
| 225 |
+
</observers>
|
| 226 |
+
</sales_order_place_after>
|
| 227 |
+
|
| 228 |
</events>
|
| 229 |
<translate>
|
| 230 |
<modules>
|
app/code/community/Eabi/Postoffice/sql/eabi_postoffice_setup/mysql4-upgrade-0.1.5-0.1.6.php
ADDED
|
@@ -0,0 +1,47 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 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) 2014 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 |
+
$installer = $this;
|
| 34 |
+
|
| 35 |
+
$installer->startSetup();
|
| 36 |
+
|
| 37 |
+
/*
|
| 38 |
+
* Adds license information to the shipping module
|
| 39 |
+
*
|
| 40 |
+
*/
|
| 41 |
+
$installer->run("
|
| 42 |
+
|
| 43 |
+
|
| 44 |
+
");
|
| 45 |
+
|
| 46 |
+
|
| 47 |
+
$installer->endSetup();
|
app/code/community/Eabi/Postoffice/sql/eabi_postoffice_setup/mysql4-upgrade-0.1.6-0.1.7.php
ADDED
|
@@ -0,0 +1,50 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 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) 2014 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 |
+
$installer = $this;
|
| 34 |
+
|
| 35 |
+
$installer->startSetup();
|
| 36 |
+
|
| 37 |
+
/*
|
| 38 |
+
* Adds license information to the shipping module
|
| 39 |
+
*
|
| 40 |
+
*/
|
| 41 |
+
$installer->run("
|
| 42 |
+
|
| 43 |
+
ALTER TABLE {$this->getTable('eabi_carriermodule')} ADD COLUMN `needs_license` TINYINT(1) NOT NULL default 0;
|
| 44 |
+
ALTER TABLE {$this->getTable('eabi_carriermodule')} ADD COLUMN `license_data` LONGTEXT NULL;
|
| 45 |
+
ALTER TABLE {$this->getTable('eabi_carriermodule')} ADD COLUMN `license_signature` LONGTEXT NULL;
|
| 46 |
+
|
| 47 |
+
");
|
| 48 |
+
|
| 49 |
+
|
| 50 |
+
$installer->endSetup();
|
app/design/adminhtml/default/default/layout/eabi_postoffice.xml
CHANGED
|
@@ -77,5 +77,12 @@
|
|
| 77 |
</reference>
|
| 78 |
</reference>
|
| 79 |
</adminhtml_sales_order_create_load_block_data>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 80 |
|
| 81 |
</layout>
|
| 77 |
</reference>
|
| 78 |
</reference>
|
| 79 |
</adminhtml_sales_order_create_load_block_data>
|
| 80 |
+
<adminhtml_system_config_edit>
|
| 81 |
+
<reference name="head">
|
| 82 |
+
<action method="addCss">
|
| 83 |
+
<name>eabi_postoffice.css</name>
|
| 84 |
+
</action>
|
| 85 |
+
</reference>
|
| 86 |
+
</adminhtml_system_config_edit>
|
| 87 |
|
| 88 |
</layout>
|
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.10</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.6</version>
|
| 46 |
</Eabi_Postoffice>
|
| 47 |
</modules>
|
| 48 |
</config>
|
app/locale/en_US/Eabi_Postoffice.csv
CHANGED
|
@@ -40,3 +40,10 @@
|
|
| 40 |
"Per Order: Shipping cost equals Shipping price<br/>Per Package: Shipping cost equals Number of Items in cart multiplied by shipping price","Per Order: Shipping cost equals Shipping price<br/>Per Package: Shipping cost equals Number of Items in cart multiplied by shipping price"
|
| 41 |
"It is not recommended to update the list of offices more often than once a day.","It is not recommended to update the list of offices more often than once a day."
|
| 42 |
"If post offices are not displayed correctly, then rebuilding the list may help","If post offices are not displayed correctly, then rebuilding the list may help"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 40 |
"Per Order: Shipping cost equals Shipping price<br/>Per Package: Shipping cost equals Number of Items in cart multiplied by shipping price","Per Order: Shipping cost equals Shipping price<br/>Per Package: Shipping cost equals Number of Items in cart multiplied by shipping price"
|
| 41 |
"It is not recommended to update the list of offices more often than once a day.","It is not recommended to update the list of offices more often than once a day."
|
| 42 |
"If post offices are not displayed correctly, then rebuilding the list may help","If post offices are not displayed correctly, then rebuilding the list may help"
|
| 43 |
+
"Basic license","Basic license"
|
| 44 |
+
"Automatic data sending","Automatic data sending"
|
| 45 |
+
"Cash on delivery","Cash on delivery"
|
| 46 |
+
"Allowed for URL-s","Allowed for URL-s"
|
| 47 |
+
"not-licensed","not-licensed"
|
| 48 |
+
"Change license","Change license"
|
| 49 |
+
"Register license","Register license"
|
app/locale/et_EE/Eabi_Postoffice.csv
CHANGED
|
@@ -40,3 +40,10 @@
|
|
| 40 |
"Per Order: Shipping cost equals Shipping price<br/>Per Package: Shipping cost equals Number of Items in cart multiplied by shipping price","Tellimuse kohta: Tarnehind on võrdne siin määratud hinnaga<br/>Eseme kohta: Tarne hind on võrdne siin määratud hinna ja ostukorvis olevate esemete arvu korrutisega"
|
| 41 |
"It is not recommended to update the list of offices more often than once a day.","On soovitatav mitte uuendada tarnepunktide nimekirja tihedamini kui kord ööpäevas."
|
| 42 |
"If post offices are not displayed correctly, then rebuilding the list may help","Kui tarnepunkte ei kuvata korrektselt, võib nimekirja uuendus lahendada probleemi"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 40 |
"Per Order: Shipping cost equals Shipping price<br/>Per Package: Shipping cost equals Number of Items in cart multiplied by shipping price","Tellimuse kohta: Tarnehind on võrdne siin määratud hinnaga<br/>Eseme kohta: Tarne hind on võrdne siin määratud hinna ja ostukorvis olevate esemete arvu korrutisega"
|
| 41 |
"It is not recommended to update the list of offices more often than once a day.","On soovitatav mitte uuendada tarnepunktide nimekirja tihedamini kui kord ööpäevas."
|
| 42 |
"If post offices are not displayed correctly, then rebuilding the list may help","Kui tarnepunkte ei kuvata korrektselt, võib nimekirja uuendus lahendada probleemi"
|
| 43 |
+
"Basic license","Baaslitsents"
|
| 44 |
+
"Automatic data sending","Automaatne pakiandmete saatmine"
|
| 45 |
+
"Cash on delivery","Lunamakseteenus"
|
| 46 |
+
"Allowed for URL-s","Lubatud URLidele"
|
| 47 |
+
"not-licensed","litsenseerimata"
|
| 48 |
+
"Change license","Muuda litsentsi"
|
| 49 |
+
"Register license","Registreeri litsents"
|
app/locale/fi_FI/Eabi_Postoffice.csv
CHANGED
|
@@ -40,3 +40,10 @@
|
|
| 40 |
"Per Order: Shipping cost equals Shipping price<br/>Per Package: Shipping cost equals Number of Items in cart multiplied by shipping price","Per Order: Shipping cost equals Shipping price<br/>Per Package: Shipping cost equals Number of Items in cart multiplied by shipping price"
|
| 41 |
"It is not recommended to update the list of offices more often than once a day.","It is not recommended to update the list of offices more often than once a day."
|
| 42 |
"If post offices are not displayed correctly, then rebuilding the list may help","If post offices are not displayed correctly, then rebuilding the list may help"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 40 |
"Per Order: Shipping cost equals Shipping price<br/>Per Package: Shipping cost equals Number of Items in cart multiplied by shipping price","Per Order: Shipping cost equals Shipping price<br/>Per Package: Shipping cost equals Number of Items in cart multiplied by shipping price"
|
| 41 |
"It is not recommended to update the list of offices more often than once a day.","It is not recommended to update the list of offices more often than once a day."
|
| 42 |
"If post offices are not displayed correctly, then rebuilding the list may help","If post offices are not displayed correctly, then rebuilding the list may help"
|
| 43 |
+
"Basic license","Basic license"
|
| 44 |
+
"Automatic data sending","Automatic data sending"
|
| 45 |
+
"Cash on delivery","Cash on delivery"
|
| 46 |
+
"Allowed for URL-s","Allowed for URL-s"
|
| 47 |
+
"not-licensed","not-licensed"
|
| 48 |
+
"Change license","Change license"
|
| 49 |
+
"Register license","Register license"
|
app/locale/hu_HU/Eabi_Postoffice.csv
CHANGED
|
@@ -40,3 +40,10 @@
|
|
| 40 |
"Per Order: Shipping cost equals Shipping price<br/>Per Package: Shipping cost equals Number of Items in cart multiplied by shipping price","Per Order: Shipping cost equals Shipping price<br/>Per Package: Shipping cost equals Number of Items in cart multiplied by shipping price"
|
| 41 |
"It is not recommended to update the list of offices more often than once a day.","It is not recommended to update the list of offices more often than once a day."
|
| 42 |
"If post offices are not displayed correctly, then rebuilding the list may help","If post offices are not displayed correctly, then rebuilding the list may help"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 40 |
"Per Order: Shipping cost equals Shipping price<br/>Per Package: Shipping cost equals Number of Items in cart multiplied by shipping price","Per Order: Shipping cost equals Shipping price<br/>Per Package: Shipping cost equals Number of Items in cart multiplied by shipping price"
|
| 41 |
"It is not recommended to update the list of offices more often than once a day.","It is not recommended to update the list of offices more often than once a day."
|
| 42 |
"If post offices are not displayed correctly, then rebuilding the list may help","If post offices are not displayed correctly, then rebuilding the list may help"
|
| 43 |
+
"Basic license","Basic license"
|
| 44 |
+
"Automatic data sending","Automatic data sending"
|
| 45 |
+
"Cash on delivery","Cash on delivery"
|
| 46 |
+
"Allowed for URL-s","Allowed for URL-s"
|
| 47 |
+
"not-licensed","not-licensed"
|
| 48 |
+
"Change license","Change license"
|
| 49 |
+
"Register license","Register license"
|
app/locale/lt_LT/Eabi_Postoffice.csv
CHANGED
|
@@ -40,3 +40,10 @@
|
|
| 40 |
"Per Order: Shipping cost equals Shipping price<br/>Per Package: Shipping cost equals Number of Items in cart multiplied by shipping price","Per Order: Shipping cost equals Shipping price<br/>Per Package: Shipping cost equals Number of Items in cart multiplied by shipping price"
|
| 41 |
"It is not recommended to update the list of offices more often than once a day.","It is not recommended to update the list of offices more often than once a day."
|
| 42 |
"If post offices are not displayed correctly, then rebuilding the list may help","If post offices are not displayed correctly, then rebuilding the list may help"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 40 |
"Per Order: Shipping cost equals Shipping price<br/>Per Package: Shipping cost equals Number of Items in cart multiplied by shipping price","Per Order: Shipping cost equals Shipping price<br/>Per Package: Shipping cost equals Number of Items in cart multiplied by shipping price"
|
| 41 |
"It is not recommended to update the list of offices more often than once a day.","It is not recommended to update the list of offices more often than once a day."
|
| 42 |
"If post offices are not displayed correctly, then rebuilding the list may help","If post offices are not displayed correctly, then rebuilding the list may help"
|
| 43 |
+
"Basic license","Basic license"
|
| 44 |
+
"Automatic data sending","Automatic data sending"
|
| 45 |
+
"Cash on delivery","Cash on delivery"
|
| 46 |
+
"Allowed for URL-s","Allowed for URL-s"
|
| 47 |
+
"not-licensed","not-licensed"
|
| 48 |
+
"Change license","Change license"
|
| 49 |
+
"Register license","Register license"
|
app/locale/ru_RU/Eabi_Postoffice.csv
CHANGED
|
@@ -40,3 +40,10 @@
|
|
| 40 |
"Per Order: Shipping cost equals Shipping price<br/>Per Package: Shipping cost equals Number of Items in cart multiplied by shipping price","Per Order: Shipping cost equals Shipping price<br/>Per Package: Shipping cost equals Number of Items in cart multiplied by shipping price"
|
| 41 |
"It is not recommended to update the list of offices more often than once a day.","It is not recommended to update the list of offices more often than once a day."
|
| 42 |
"If post offices are not displayed correctly, then rebuilding the list may help","If post offices are not displayed correctly, then rebuilding the list may help"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 40 |
"Per Order: Shipping cost equals Shipping price<br/>Per Package: Shipping cost equals Number of Items in cart multiplied by shipping price","Per Order: Shipping cost equals Shipping price<br/>Per Package: Shipping cost equals Number of Items in cart multiplied by shipping price"
|
| 41 |
"It is not recommended to update the list of offices more often than once a day.","It is not recommended to update the list of offices more often than once a day."
|
| 42 |
"If post offices are not displayed correctly, then rebuilding the list may help","If post offices are not displayed correctly, then rebuilding the list may help"
|
| 43 |
+
"Basic license","Basic license"
|
| 44 |
+
"Automatic data sending","Automatic data sending"
|
| 45 |
+
"Cash on delivery","Cash on delivery"
|
| 46 |
+
"Allowed for URL-s","Allowed for URL-s"
|
| 47 |
+
"not-licensed","not-licensed"
|
| 48 |
+
"Change license","Change license"
|
| 49 |
+
"Register license","Register license"
|
app/locale/sv_SE/Eabi_Postoffice.csv
CHANGED
|
@@ -46,3 +46,10 @@
|
|
| 46 |
"Per Order: Shipping cost equals Shipping price<br/>Per Package: Shipping cost equals Number of Items in cart multiplied by shipping price","Per Order: Shipping cost equals Shipping price<br/>Per Package: Shipping cost equals Number of Items in cart multiplied by shipping price"
|
| 47 |
"It is not recommended to update the list of offices more often than once a day.","It is not recommended to update the list of offices more often than once a day."
|
| 48 |
"If post offices are not displayed correctly, then rebuilding the list may help","If post offices are not displayed correctly, then rebuilding the list may help"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 46 |
"Per Order: Shipping cost equals Shipping price<br/>Per Package: Shipping cost equals Number of Items in cart multiplied by shipping price","Per Order: Shipping cost equals Shipping price<br/>Per Package: Shipping cost equals Number of Items in cart multiplied by shipping price"
|
| 47 |
"It is not recommended to update the list of offices more often than once a day.","It is not recommended to update the list of offices more often than once a day."
|
| 48 |
"If post offices are not displayed correctly, then rebuilding the list may help","If post offices are not displayed correctly, then rebuilding the list may help"
|
| 49 |
+
"Basic license","Basic license"
|
| 50 |
+
"Automatic data sending","Automatic data sending"
|
| 51 |
+
"Cash on delivery","Cash on delivery"
|
| 52 |
+
"Allowed for URL-s","Allowed for URL-s"
|
| 53 |
+
"not-licensed","not-licensed"
|
| 54 |
+
"Change license","Change license"
|
| 55 |
+
"Register license","Register license"
|
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,12 @@
|
|
| 17 |
<p>Allows to call the courier from Magento admin</p>
|
| 18 |
<p>Allows cash on delivery payment and allows to set an extra fee per country which will be appended to shipping fee</p>
|
| 19 |
<p>Intended to use for Estonian merchant who sends parcels to all Baltic states</p></description>
|
| 20 |
-
<notes>-
|
|
|
|
| 21 |
<authors><author><name>Matis Matis</name><user>auto-converted</user><email>info@e-abi.ee</email></author></authors>
|
| 22 |
-
<date>2014-
|
| 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="eea442b65d8f6a096e91c3087aa7a1d8"/></dir></dir></dir></dir><dir name="Info"><file name="Payment.php" hash="b2fee225c6e1d5df02cf39b46aa0f8b2"/></dir><dir name="Order"><file name="Courier.php" hash="dc7a838e0cbb5ea83fa706c4f627e397"/></dir><file name="Invoice.php" hash="4b66c452996bfe08f5ff3f0cac346ab1"/></dir><dir name="Helper"><file name="Data.php" hash="e309fa33bbd4eb0d0b607b9428313837"/></dir><dir name="Model"><dir name="Action"><dir name="Carrier"><dir name="Order"><file name="Courier.php" hash="a7188340758f43b53302cd0146467daf"/></dir></dir></dir><dir name="Button"><file name="Courier.php" hash="e18911389141943fb0aa02de7c14574b"/></dir><dir name="Payment"><file name="Processor.php" hash="0cd6e6138c88069b36eae2e37e8e73ff"/></dir><dir name="Source"><dir name="Label"><file name="Position.php" hash="92238059519dcdec87401ef8cafe3fe7"/></dir><file name="Service.php" hash="3f61777107806dd84e360c3d0867b2bb"/></dir><file name="Api.php" hash="083c3534789282ca18e377247fd35bd9"/><file name="Config.php" hash="9adeafdbd2cf7a15128f2ff9b5dacdee"/><file name="Flat.php" hash="77975d48ae295ae15e0b6bc49319856e"/><file name="Observer.php" hash="2c1b22592eb9d7361fe2f42545f75b63"/><file name="Post.php" hash="d41eb1d814e47cd0e78cf0b1b489be99"/></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.10</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>- Changed test URL to http://demo.surflink.ee:51680/rpc/gateway/
|
| 21 |
+
- Fixed bugs related to not auto-sending data when module was disabled on global scale, but was enabled in a specified store</notes>
|
| 22 |
<authors><author><name>Matis Matis</name><user>auto-converted</user><email>info@e-abi.ee</email></author></authors>
|
| 23 |
+
<date>2014-11-24</date>
|
| 24 |
+
<time>19:31:05</time>
|
| 25 |
+
<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="eea442b65d8f6a096e91c3087aa7a1d8"/></dir></dir></dir></dir><dir name="Info"><file name="Payment.php" hash="b2fee225c6e1d5df02cf39b46aa0f8b2"/></dir><dir name="Order"><file name="Courier.php" hash="dc7a838e0cbb5ea83fa706c4f627e397"/></dir><file name="Invoice.php" hash="4b66c452996bfe08f5ff3f0cac346ab1"/></dir><dir name="Helper"><file name="Data.php" hash="e309fa33bbd4eb0d0b607b9428313837"/></dir><dir name="Model"><dir name="Action"><dir name="Carrier"><dir name="Order"><file name="Courier.php" hash="a7188340758f43b53302cd0146467daf"/></dir></dir></dir><dir name="Button"><file name="Courier.php" hash="e18911389141943fb0aa02de7c14574b"/></dir><dir name="Payment"><file name="Processor.php" hash="0cd6e6138c88069b36eae2e37e8e73ff"/></dir><dir name="Source"><dir name="Label"><file name="Position.php" hash="92238059519dcdec87401ef8cafe3fe7"/></dir><file name="Service.php" hash="3f61777107806dd84e360c3d0867b2bb"/></dir><file name="Api.php" hash="083c3534789282ca18e377247fd35bd9"/><file name="Config.php" hash="9adeafdbd2cf7a15128f2ff9b5dacdee"/><file name="Flat.php" hash="77975d48ae295ae15e0b6bc49319856e"/><file name="Observer.php" hash="2c1b22592eb9d7361fe2f42545f75b63"/><file name="Post.php" hash="d41eb1d814e47cd0e78cf0b1b489be99"/></dir><dir name="etc"><file name="config.xml" hash="876d5ee243c6d5513f801032e0bc288f"/><file name="system.xml" hash="9277288e489beaec4cd2170f034ec8a6"/></dir><dir name="sql"><dir name="eabi_dpdee_setup"><file name="mysql4-install-0.1.0.php" hash="9899be85206a5ab3a36cf9acf176f1ba"/><file name="mysql4-upgrade-0.1.0-0.1.1.php" hash="867f9921932996c3a0f77fa9bb2fdb04"/><file name="mysql4-upgrade-0.1.1-0.1.2.php" hash="182c47a3d5fab4a466a07ef996dfe4d1"/><file name="mysql4-upgrade-0.1.2-0.1.3.php" hash="6a7ef422fd05c87c0c7b29557cd064ae"/><file name="mysql4-upgrade-0.1.3-0.1.4.php" hash="3c20db4f5d9de485f51b4cb28ca9eb87"/><file name="mysql4-upgrade-0.1.6-0.1.7.php" hash="d54424c11c48db64ed514ced1df4d60c"/><file name="mysql4-upgrade-0.1.9-0.1.10.php" hash="52c70756d6542e054699d922f752e123"/></dir></dir><file name="CHANGELOG.txt" hash="669d8b7ef49b80d191d4d8826e00e284"/><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="5d3e88fcea3dc7352254910c60d43cc8"/><file name="Remove.php" hash="11818c816c7e37c0f37e8732d02d7711"/></dir></dir></dir></dir><dir name="Config"><file name="Rebuildbutton.php" hash="b54ac12fa93514f5fd772e4512be945e"/></dir></dir><dir name="Helper"><file name="Countrycode.php" hash="11b598e6008f18baa7dafc3b579c6c96"/><file name="Data.php" hash="5aacd52d6c3066b54efe5cbfdb1b21fb"/></dir><dir name="Model"><dir name="Carrier"><file name="Abstract.php" hash="5b1521692777fa6132d0bffd207ee739"/><file name="Result.php" hash="452b5250a1eeaa2647106d896f170f0e"/></dir><dir name="Mysql4"><dir name="Carriermodule"><file name="Collection.php" hash="8ccfde755a7ef4d3eecb09144919ae9a"/></dir><dir name="Office"><file name="Collection.php" hash="26894ab3a3079edf21a722b46d495d07"/></dir><file name="Carriermodule.php" hash="06fb7663d449a1a559e482807e8a8e9e"/><file name="Office.php" hash="f1ab374d9041692dabd1a1c569bc5065"/></dir><dir name="Source"><file name="Sendevent.php" hash="4d0a215ab10eb52c4de46a66155899b8"/></dir><file name="Carriermodule.php" hash="cc4ad05756dc8f8fbb66e5a3561d61ea"/><file name="Observer.php" hash="bcb306008ea025cd84d33337af75712c"/><file name="Office.php" hash="6f3829a91a2d3c474f0127de8e8279da"/><file name="Orderview.php" hash="9654a4b6c60f3c9d07930b56957f22f7"/><file name="Updater.php" hash="1bd7d37a9a2e814e85a14b3c669ef4ba"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="PostofficeController.php" hash="33f599acf627639007d657209dca7062"/></dir><file name="IndexController.php" hash="43f17e0e603d6e671db1e4cd49938dc8"/></dir><dir name="etc"><file name="config.xml" hash="b9fe4f46ed3e3ffee89e513677909b8a"/></dir><dir name="sql"><dir name="eabi_postoffice_setup"><file name="mysql4-install-0.1.0.php" hash="6c8c1a726bbebeaa707b007bdff592d9"/><file name="mysql4-upgrade-0.1.0-0.1.1.php" hash="641d3015c6f3b761759a882ed8fea5c2"/><file name="mysql4-upgrade-0.1.1-0.1.2.php" hash="c61dcac734cc0be364afe3262a710729"/><file name="mysql4-upgrade-0.1.5-0.1.6.php" hash="2a71344a96b5b5ef191956443fa2eadb"/><file name="mysql4-upgrade-0.1.6-0.1.7.php" hash="d8e6cf582360e0fa6141f802d97e9606"/></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="07337df8c9022da702e360a1c6920efe"/></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="542898a02261b0bccf075424fd0b4903"/></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="1af217a15c9429cf194ea2cf111fac69"/></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="c6d8cc592aaa7bee1ec20dc1c202d841"/></dir><file name="available.phtml" hash="0afb1521ac8c2ab4c80364dd3cef051a"/><file name="multishipping.phtml" hash="f27c3d8ac939a97ab160feef8f5370d1"/><file name="shipping.phtml" hash="b041efafbcbbea2f2b4a6584cba83e2f"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Eabi_Postoffice.xml" hash="847eae398a42259d580abe6d4b4e2f9b"/><file name="Eabi_DpdEE.xml" hash="2e189d1c21c0a6192cf10627796a9c47"/></dir></target><target name="magelocale"><dir name="en_US"><file name="Eabi_DpdEE.csv" hash="d98963cb668ca0c0174b1503c1eb0a34"/><file name="Eabi_Postoffice.csv" hash="3cb31d71e0c1bfae19768695d85f1cda"/></dir><dir name="et_EE"><file name="Eabi_DpdEE.csv" hash="fe3c32249528cfb77519cff7e90ffb33"/><file name="Eabi_Postoffice.csv" hash="d47c85ee5ba53c6e2227622d84ee0dec"/></dir><dir name="ru_RU"><file name="Eabi_DpdEE.csv" hash="bb76f70e2c91160b11f570651ee0b8ee"/><file name="Eabi_Postoffice.csv" hash="3cb31d71e0c1bfae19768695d85f1cda"/></dir><dir name="hu_HU"><file name="Eabi_Postoffice.csv" hash="3cb31d71e0c1bfae19768695d85f1cda"/></dir><dir name="fi_FI"><file name="Eabi_Postoffice.csv" hash="3cb31d71e0c1bfae19768695d85f1cda"/></dir><dir name="lt_LT"><file name="Eabi_Postoffice.csv" hash="3cb31d71e0c1bfae19768695d85f1cda"/></dir><dir name="sv_SE"><file name="Eabi_Postoffice.csv" hash="3718400135d99617e2dd760c425ff92a"/></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><file name="eabi_dpdee.css" hash="fc08519f26a3b0819b4c925bd2f1ef1a"/></dir></dir></dir></target><target name="mageweb"><dir name="js"><dir name="eabi_js"><file name="eabi_dpdee.js" hash="1339c149edea070f9908ceb2e7bf559d"/></dir></dir></target></contents>
|
| 26 |
<compatible/>
|
| 27 |
+
<dependencies><required><package><name>Eabi_Livehandler</name><channel>community</channel><min>0.1.9</min><max>1.0.0</max></package></required></dependencies>
|
| 28 |
</package>
|
