Version Notes
- Added support to activate licenses on some E-Abi Shipping and Payment modules
- Fixed compatiblity with getBarcodeFunction on E-Abi shipping modules in a way that packing slip could be printed, when barcodes are returned as array
Download this release
Release Info
| Developer | Magento Core Team |
| Extension | Eabi_Livehandler |
| Version | 0.1.9 |
| Comparing to | |
| See all releases | |
Code changes from version 0.1.8 to 0.1.9
- app/code/community/Eabi/Livehandler/CHANGELOG.txt +5 -0
- app/code/community/Eabi/Livehandler/Helper/Data.php +34 -0
- app/code/community/Eabi/Livehandler/Helper/Keypair.php +162 -0
- app/code/community/Eabi/Livehandler/Model/Action/Postoffice/Print.php +1 -1
- app/code/community/Eabi/Livehandler/Model/Action/Postoffice/Send.php +1 -1
- app/code/community/Eabi/Livehandler/etc/config.xml +4 -1
- app/code/community/Eabi/Livehandler/etc/system.xml +32 -0
- app/code/community/Eabi/Livehandler/sql/eabi_livehandler_setup/mysql4-upgrade-0.1.8-0.1.9.php +60 -0
- app/etc/modules/Eabi_Livehandler.xml +1 -1
- app/locale/en_US/Eabi_Livehandler.csv +4 -0
- app/locale/et_EE/Eabi_Livehandler.csv +4 -0
- app/locale/fi_FI/Eabi_Livehandler.csv +4 -0
- app/locale/lt_LT/Eabi_Livehandler.csv +4 -0
- app/locale/sv_SE/Eabi_Livehandler.csv +4 -0
- package.xml +8 -7
app/code/community/Eabi/Livehandler/CHANGELOG.txt
CHANGED
|
@@ -22,3 +22,8 @@
|
|
| 22 |
|
| 23 |
0.1.8
|
| 24 |
- Auto send buttons ability to auto-send-data to server is now checked by canSendData function in Postoffice abstract carrier
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 22 |
|
| 23 |
0.1.8
|
| 24 |
- Auto send buttons ability to auto-send-data to server is now checked by canSendData function in Postoffice abstract carrier
|
| 25 |
+
|
| 26 |
+
0.1.9
|
| 27 |
+
- Added support to activate licenses on some E-Abi Shipping and Payment modules
|
| 28 |
+
- Fixed compatiblity with getBarcodeFunction on E-Abi shipping modules in a way that packing slip could be printed, when barcodes are returned as array
|
| 29 |
+
|
app/code/community/Eabi/Livehandler/Helper/Data.php
CHANGED
|
@@ -170,6 +170,40 @@ class Eabi_Livehandler_Helper_Data extends Mage_Core_Helper_Abstract {
|
|
| 170 |
return $this;
|
| 171 |
}
|
| 172 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 173 |
|
| 174 |
|
| 175 |
}
|
| 170 |
return $this;
|
| 171 |
}
|
| 172 |
|
| 173 |
+
/**
|
| 174 |
+
* <p>Returns all hosts for current Magento installation</p>
|
| 175 |
+
* @return array
|
| 176 |
+
*/
|
| 177 |
+
final public function getAllStoreUrls() {
|
| 178 |
+
$stores = Mage::app()->getStores();
|
| 179 |
+
$urls = array();
|
| 180 |
+
$databaseUrls = $this->_getCoreConfigDataModel()->getCollection()
|
| 181 |
+
->addFieldToFilter('path', array('in' => array('web/unsecure/base_url', 'web/secure/base_url')))
|
| 182 |
+
;
|
| 183 |
+
|
| 184 |
+
foreach ($databaseUrls as $databaseUrl) {
|
| 185 |
+
/* @var $store Mage_Core_Model_Store */
|
| 186 |
+
try {
|
| 187 |
+
$url = Zend_Uri_Http::fromString($databaseUrl->getValue())->getHost();
|
| 188 |
+
if (!in_array($url, $urls)) {
|
| 189 |
+
$urls[] = $url;
|
| 190 |
+
}
|
| 191 |
+
} catch (Exception $ex) {
|
| 192 |
+
//do nothing or log
|
| 193 |
+
Mage::log(sprintf('Invalid base url %s for store id %s', $databaseUrl->getValue(), $databaseUrl->getScopeId()), Zend_Log::WARN);
|
| 194 |
+
|
| 195 |
+
}
|
| 196 |
+
}
|
| 197 |
+
return $urls;
|
| 198 |
+
}
|
| 199 |
+
|
| 200 |
+
/**
|
| 201 |
+
*
|
| 202 |
+
* @return Mage_Core_Model_Config_Data
|
| 203 |
+
*/
|
| 204 |
+
protected function _getCoreConfigDataModel() {
|
| 205 |
+
return Mage::getModel('core/config_data');
|
| 206 |
+
}
|
| 207 |
|
| 208 |
|
| 209 |
}
|
app/code/community/Eabi/Livehandler/Helper/Keypair.php
ADDED
|
@@ -0,0 +1,162 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 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_Livehandler
|
| 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 |
+
* <p>Helper class for generating RSA public and private keys</p>
|
| 36 |
+
*
|
| 37 |
+
* @author Matis
|
| 38 |
+
*/
|
| 39 |
+
class Eabi_Livehandler_Helper_Keypair extends Mage_Core_Helper_Abstract {
|
| 40 |
+
|
| 41 |
+
|
| 42 |
+
/**
|
| 43 |
+
* <p>Generates new RSA keypair and returns it as assoc array with following keys:</p>
|
| 44 |
+
* <ul>
|
| 45 |
+
<li><strong>privkey</strong> - private key .pem encoded string</li>
|
| 46 |
+
<li><strong>csr</strong> - public key which has been signed with generated private key</li>
|
| 47 |
+
<li><strong>pubkey</strong> - public key .pem encoded certificate string</li>
|
| 48 |
+
</ul>
|
| 49 |
+
* <p>Input uses following options:</p>
|
| 50 |
+
* <ul>
|
| 51 |
+
<li><strong>countryName</strong> - Country code uppercase goes here, like EE</li>
|
| 52 |
+
<li><strong>stateOrProvinceName</strong> - County or state name goes here</li>
|
| 53 |
+
<li><strong>localityName</strong> - Name of the city goes here</li>
|
| 54 |
+
<li><strong>organizationName</strong> - Name of the company goes here</li>
|
| 55 |
+
<li><strong>organizationalUnitName</strong> - Company www goes here</li>
|
| 56 |
+
<li><strong>commonName</strong> - Name of the person who generated this cert goes here or name of the person on board</li>
|
| 57 |
+
<li><strong>emailAddress</strong> - Ggeneric company e-mail goes here</li>
|
| 58 |
+
</ul>
|
| 59 |
+
* <p>Private key is not encrypted with any password</p>
|
| 60 |
+
*
|
| 61 |
+
* @param array $input
|
| 62 |
+
* @param array $conf
|
| 63 |
+
*/
|
| 64 |
+
public function generateKeyPair(array $input, array $conf = array('private_key_bits' => 2048), $numberofdays = 3650) {
|
| 65 |
+
$publickey = null;
|
| 66 |
+
$privatekey = null;
|
| 67 |
+
$csrStr = null;
|
| 68 |
+
$privkeypass = null;
|
| 69 |
+
$privkey = openssl_pkey_new($conf);
|
| 70 |
+
$csr = openssl_csr_new($input, $privkey);
|
| 71 |
+
$sscert = openssl_csr_sign($csr, null, $privkey, $numberofdays);
|
| 72 |
+
openssl_x509_export($sscert, $publickey);
|
| 73 |
+
openssl_pkey_export($privkey, $privatekey, $privkeypass);
|
| 74 |
+
openssl_csr_export($csr, $csrStr);
|
| 75 |
+
$pubkey=openssl_pkey_get_details($privkey);
|
| 76 |
+
$pubkey=$pubkey["key"];
|
| 77 |
+
|
| 78 |
+
return array(
|
| 79 |
+
'privkey' => $privatekey,
|
| 80 |
+
'pubkey' => $publickey,
|
| 81 |
+
'csr' => $csrStr,
|
| 82 |
+
);
|
| 83 |
+
}
|
| 84 |
+
|
| 85 |
+
/**
|
| 86 |
+
* <p>Returns assoc array of values used to initiate public-private certificates for this installation.</p>
|
| 87 |
+
* <p>Default values are:</p>
|
| 88 |
+
* <ul>
|
| 89 |
+
<li><strong>countryName</strong> - Default declared country for this installation</li>
|
| 90 |
+
<li><strong>stateOrProvinceName</strong> - N/A</li>
|
| 91 |
+
<li><strong>localityName</strong> - N/A</li>
|
| 92 |
+
<li><strong>organizationName</strong> - N/A</li>
|
| 93 |
+
<li><strong>organizationalUnitName</strong> - Store base url hosts, comma separated</li>
|
| 94 |
+
<li><strong>commonName</strong> - Aktsiamaailm LLC</li>
|
| 95 |
+
<li><strong>emailAddress</strong> - Default general e-mail address for this installation</li>
|
| 96 |
+
</ul>
|
| 97 |
+
* @return array
|
| 98 |
+
*/
|
| 99 |
+
final public function getDefaultKeyData() {
|
| 100 |
+
$keyInputData = array(
|
| 101 |
+
"countryName" => $this->_getStringOrDefault($this->_getStoreConfig('general/country/default'), 'US'),
|
| 102 |
+
"stateOrProvinceName" => 'N/A',
|
| 103 |
+
"localityName" => 'N/A',
|
| 104 |
+
"organizationName" => 'N/A',
|
| 105 |
+
"organizationalUnitName" => $this->_getStringOrDefault(implode(',', $this->_getEabi()->getAllStoreUrls())),
|
| 106 |
+
"commonName" => 'Aktsiamaailm LLC',
|
| 107 |
+
"emailAddress" => $this->_getStringOrDefault($this->_getStoreConfig('trans_email/ident_general/email')),
|
| 108 |
+
);
|
| 109 |
+
|
| 110 |
+
return $keyInputData;
|
| 111 |
+
}
|
| 112 |
+
|
| 113 |
+
/**
|
| 114 |
+
* <p>Returns <code>input</code> or <code>default</code> if input is empty of false or not string</p>
|
| 115 |
+
* @param string $input
|
| 116 |
+
* @param string $default
|
| 117 |
+
* @return string
|
| 118 |
+
*/
|
| 119 |
+
private function _getStringOrDefault($input, $default = 'N/A') {
|
| 120 |
+
if (!$input || !is_string($input)) {
|
| 121 |
+
return (string)$default;
|
| 122 |
+
}
|
| 123 |
+
return $input;
|
| 124 |
+
}
|
| 125 |
+
|
| 126 |
+
|
| 127 |
+
/**
|
| 128 |
+
* <p>Fetches config data when Mage::getStoreConfig is not available</p>
|
| 129 |
+
* @param string $path
|
| 130 |
+
* @return boolean|string
|
| 131 |
+
*/
|
| 132 |
+
protected function _getStoreConfig($path) {
|
| 133 |
+
$storeId = Mage_Core_Model_App::ADMIN_STORE_ID;
|
| 134 |
+
$configItem = $this->_getCoreConfigDataModel()
|
| 135 |
+
->getCollection()
|
| 136 |
+
->addFieldToFilter('path', $path)
|
| 137 |
+
->addFieldToFilter('scope_id', Mage_Core_Model_App::ADMIN_STORE_ID)
|
| 138 |
+
->getFirstItem();
|
| 139 |
+
if ($configItem) {
|
| 140 |
+
return $configItem->getValue();
|
| 141 |
+
}
|
| 142 |
+
return false;
|
| 143 |
+
}
|
| 144 |
+
|
| 145 |
+
/**
|
| 146 |
+
*
|
| 147 |
+
* @return Eabi_Livehandler_Helper_Data
|
| 148 |
+
*/
|
| 149 |
+
protected function _getEabi() {
|
| 150 |
+
return Mage::helper('eabi');
|
| 151 |
+
}
|
| 152 |
+
|
| 153 |
+
/**
|
| 154 |
+
*
|
| 155 |
+
* @return Mage_Core_Model_Config_Data
|
| 156 |
+
*/
|
| 157 |
+
protected function _getCoreConfigDataModel() {
|
| 158 |
+
return Mage::getModel('core/config_data');
|
| 159 |
+
}
|
| 160 |
+
|
| 161 |
+
|
| 162 |
+
}
|
app/code/community/Eabi/Livehandler/Model/Action/Postoffice/Print.php
CHANGED
|
@@ -70,7 +70,7 @@ class Eabi_Livehandler_Model_Action_Postoffice_Print extends Eabi_Livehandler_Mo
|
|
| 70 |
if (self::$_module_exists) {
|
| 71 |
$this->_label = Mage::helper('eabi_postoffice')->__('Print packing slip');
|
| 72 |
$barcode = Mage::helper('eabi_postoffice')->getBarcode($order->getIncrementId());
|
| 73 |
-
if (is_string($barcode)) {
|
| 74 |
$url = Mage::helper('adminhtml')->getUrl('eabi_postoffice/adminhtml_postoffice/addresscardpdf', array('order_id'=> $order->getId()));
|
| 75 |
$this->_onClick = "setLocation('".$url."')";
|
| 76 |
return true;
|
| 70 |
if (self::$_module_exists) {
|
| 71 |
$this->_label = Mage::helper('eabi_postoffice')->__('Print packing slip');
|
| 72 |
$barcode = Mage::helper('eabi_postoffice')->getBarcode($order->getIncrementId());
|
| 73 |
+
if (is_string($barcode) || is_array($barcode)) {
|
| 74 |
$url = Mage::helper('adminhtml')->getUrl('eabi_postoffice/adminhtml_postoffice/addresscardpdf', array('order_id'=> $order->getId()));
|
| 75 |
$this->_onClick = "setLocation('".$url."')";
|
| 76 |
return true;
|
app/code/community/Eabi/Livehandler/Model/Action/Postoffice/Send.php
CHANGED
|
@@ -92,7 +92,7 @@ class Eabi_Livehandler_Model_Action_Postoffice_Send extends Eabi_Livehandler_Mod
|
|
| 92 |
$errors = array();
|
| 93 |
//get the shipping code from the order and call the module from it.
|
| 94 |
$shippingCarrierCode = substr($shippingMethod, 0, strpos($shippingMethod, '_'));
|
| 95 |
-
$shippingMethodModel = Mage::getModel('shipping/shipping')->getCarrierByCode($shippingCarrierCode);
|
| 96 |
|
| 97 |
if (!($shippingMethodModel instanceof Eabi_Postoffice_Model_Carrier_Abstract)){
|
| 98 |
$errors[] = $this->_getOfficeHelper()->__('This carrier is not subclass of Eabi_Postoffice_Model_Carrier_Abstract');
|
| 92 |
$errors = array();
|
| 93 |
//get the shipping code from the order and call the module from it.
|
| 94 |
$shippingCarrierCode = substr($shippingMethod, 0, strpos($shippingMethod, '_'));
|
| 95 |
+
$shippingMethodModel = Mage::getModel('shipping/shipping')->getCarrierByCode($shippingCarrierCode, $order->getStoreId());
|
| 96 |
|
| 97 |
if (!($shippingMethodModel instanceof Eabi_Postoffice_Model_Carrier_Abstract)){
|
| 98 |
$errors[] = $this->_getOfficeHelper()->__('This carrier is not subclass of Eabi_Postoffice_Model_Carrier_Abstract');
|
app/code/community/Eabi/Livehandler/etc/config.xml
CHANGED
|
@@ -36,7 +36,7 @@
|
|
| 36 |
<config>
|
| 37 |
<modules>
|
| 38 |
<Eabi_Livehandler>
|
| 39 |
-
<version>0.1.
|
| 40 |
</Eabi_Livehandler>
|
| 41 |
</modules>
|
| 42 |
|
|
@@ -181,6 +181,9 @@
|
|
| 181 |
<eabi_livehandler>
|
| 182 |
<main>
|
| 183 |
<enabled>1</enabled>
|
|
|
|
|
|
|
|
|
|
| 184 |
</main>
|
| 185 |
<admintools>
|
| 186 |
<enabled>1</enabled>
|
| 36 |
<config>
|
| 37 |
<modules>
|
| 38 |
<Eabi_Livehandler>
|
| 39 |
+
<version>0.1.9</version>
|
| 40 |
</Eabi_Livehandler>
|
| 41 |
</modules>
|
| 42 |
|
| 181 |
<eabi_livehandler>
|
| 182 |
<main>
|
| 183 |
<enabled>1</enabled>
|
| 184 |
+
<!--privkey backend_model="adminhtml/system_config_backend_encrypted"/>
|
| 185 |
+
<pubkey backend_model="adminhtml/system_config_backend_encrypted"/>
|
| 186 |
+
<csr backend_model="adminhtml/system_config_backend_encrypted"/-->
|
| 187 |
</main>
|
| 188 |
<admintools>
|
| 189 |
<enabled>1</enabled>
|
app/code/community/Eabi/Livehandler/etc/system.xml
CHANGED
|
@@ -66,6 +66,38 @@
|
|
| 66 |
<show_in_website>0</show_in_website>
|
| 67 |
<show_in_store>0</show_in_store>
|
| 68 |
</enabled>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 69 |
</fields>
|
| 70 |
</main>
|
| 71 |
<admintools translate="label" module="eabi_livehandler">
|
| 66 |
<show_in_website>0</show_in_website>
|
| 67 |
<show_in_store>0</show_in_store>
|
| 68 |
</enabled>
|
| 69 |
+
<!--privkey translate="label comment">
|
| 70 |
+
<label>Private key</label>
|
| 71 |
+
<comment>Used to activate E-Abi licenses</comment>
|
| 72 |
+
<frontend_type>textarea</frontend_type>
|
| 73 |
+
<backend_model>adminhtml/system_config_backend_encrypted</backend_model>
|
| 74 |
+
<sort_order>20</sort_order>
|
| 75 |
+
<show_in_default>1</show_in_default>
|
| 76 |
+
<show_in_website>0</show_in_website>
|
| 77 |
+
<show_in_store>0</show_in_store>
|
| 78 |
+
</privkey>
|
| 79 |
+
<pubkey translate="label comment">
|
| 80 |
+
<label>Public key</label>
|
| 81 |
+
<comment>Used to activate E-Abi licenses</comment>
|
| 82 |
+
<frontend_type>textarea</frontend_type>
|
| 83 |
+
<backend_model>adminhtml/system_config_backend_encrypted</backend_model>
|
| 84 |
+
<sort_order>30</sort_order>
|
| 85 |
+
<show_in_default>1</show_in_default>
|
| 86 |
+
<show_in_website>0</show_in_website>
|
| 87 |
+
<show_in_store>0</show_in_store>
|
| 88 |
+
</pubkey>
|
| 89 |
+
<csr translate="label comment">
|
| 90 |
+
<label>Certificate signing request</label>
|
| 91 |
+
<comment>Used to activate E-Abi licenses</comment>
|
| 92 |
+
<frontend_type>textarea</frontend_type>
|
| 93 |
+
<backend_model>adminhtml/system_config_backend_encrypted</backend_model>
|
| 94 |
+
<sort_order>40</sort_order>
|
| 95 |
+
<show_in_default>1</show_in_default>
|
| 96 |
+
<show_in_website>0</show_in_website>
|
| 97 |
+
<show_in_store>0</show_in_store>
|
| 98 |
+
</csr-->
|
| 99 |
+
|
| 100 |
+
|
| 101 |
</fields>
|
| 102 |
</main>
|
| 103 |
<admintools translate="label" module="eabi_livehandler">
|
app/code/community/Eabi/Livehandler/sql/eabi_livehandler_setup/mysql4-upgrade-0.1.8-0.1.9.php
ADDED
|
@@ -0,0 +1,60 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 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_Livehandler
|
| 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 |
+
/* @var $installer Mage_Core_Model_Resource_Setup */
|
| 36 |
+
$installer = $this;
|
| 37 |
+
|
| 38 |
+
$installer->startSetup();
|
| 39 |
+
/*
|
| 40 |
+
*/
|
| 41 |
+
$installer->run("
|
| 42 |
+
|
| 43 |
+
|
| 44 |
+
|
| 45 |
+
");
|
| 46 |
+
|
| 47 |
+
/*
|
| 48 |
+
* Create private-public keypair and store it encrypted under eabi_livehandler/main/*
|
| 49 |
+
* Generated keys are used to identify the Magento installation and decrypt data sent from e-abi server
|
| 50 |
+
*/
|
| 51 |
+
|
| 52 |
+
//$generatedKeys = Mage::helper('eabi/keypair')->generateKeyPair(Mage::helper('eabi/keypair')->getDefaultKeyData());
|
| 53 |
+
//postponed to next version
|
| 54 |
+
|
| 55 |
+
|
| 56 |
+
//$installer->setConfigData('eabi_livehandler/main/privkey', Mage::helper('core')->encrypt($generatedKeys['privkey']));
|
| 57 |
+
//$installer->setConfigData('eabi_livehandler/main/pubkey', Mage::helper('core')->encrypt($generatedKeys['pubkey']));
|
| 58 |
+
//$installer->setConfigData('eabi_livehandler/main/csr', Mage::helper('core')->encrypt($generatedKeys['csr']));
|
| 59 |
+
|
| 60 |
+
$installer->endSetup();
|
app/etc/modules/Eabi_Livehandler.xml
CHANGED
|
@@ -38,7 +38,7 @@
|
|
| 38 |
<Eabi_Livehandler>
|
| 39 |
<active>true</active>
|
| 40 |
<codePool>community</codePool>
|
| 41 |
-
<version>0.1.
|
| 42 |
</Eabi_Livehandler>
|
| 43 |
</modules>
|
| 44 |
</config>
|
| 38 |
<Eabi_Livehandler>
|
| 39 |
<active>true</active>
|
| 40 |
<codePool>community</codePool>
|
| 41 |
+
<version>0.1.9</version>
|
| 42 |
</Eabi_Livehandler>
|
| 43 |
</modules>
|
| 44 |
</config>
|
app/locale/en_US/Eabi_Livehandler.csv
CHANGED
|
@@ -18,3 +18,7 @@
|
|
| 18 |
"Manage the order from here by adding <a href='%s' target='_blank'>action buttons</a>","Manage the order from here by adding <a href='%s' target='_blank'>action buttons</a>"
|
| 19 |
"http://en.e-abi.ee/magento/better-order-management.html","http://en.e-abi.ee/magento/better-order-management.html"
|
| 20 |
"This order has not yet been fully paid","This order has not yet been fully paid"
|
|
|
|
|
|
|
|
|
|
|
|
| 18 |
"Manage the order from here by adding <a href='%s' target='_blank'>action buttons</a>","Manage the order from here by adding <a href='%s' target='_blank'>action buttons</a>"
|
| 19 |
"http://en.e-abi.ee/magento/better-order-management.html","http://en.e-abi.ee/magento/better-order-management.html"
|
| 20 |
"This order has not yet been fully paid","This order has not yet been fully paid"
|
| 21 |
+
"Private key","Private key"
|
| 22 |
+
"Public key","Public key"
|
| 23 |
+
"Certificate signing request","Certificate signing request"
|
| 24 |
+
"Used to activate E-Abi licenses","Used to activate E-Abi licenses"
|
app/locale/et_EE/Eabi_Livehandler.csv
CHANGED
|
@@ -18,3 +18,7 @@
|
|
| 18 |
"Manage the order from here by adding <a href='%s' target='_blank'>action buttons</a>","Halda tellimust <a href='%s' target='_blank'>nupukeste abil</a> siitsamast!"
|
| 19 |
"http://en.e-abi.ee/magento/better-order-management.html","http://www.e-abi.ee/magento/better-order-management.html"
|
| 20 |
"This order has not yet been fully paid","Käesolev tellimus ei ole täielikult tasutud"
|
|
|
|
|
|
|
|
|
|
|
|
| 18 |
"Manage the order from here by adding <a href='%s' target='_blank'>action buttons</a>","Halda tellimust <a href='%s' target='_blank'>nupukeste abil</a> siitsamast!"
|
| 19 |
"http://en.e-abi.ee/magento/better-order-management.html","http://www.e-abi.ee/magento/better-order-management.html"
|
| 20 |
"This order has not yet been fully paid","Käesolev tellimus ei ole täielikult tasutud"
|
| 21 |
+
"Private key","Privaatvõti"
|
| 22 |
+
"Public key","Avalik võti"
|
| 23 |
+
"Certificate signing request","Sertifikaadipäring"
|
| 24 |
+
"Used to activate E-Abi licenses","Kasutatakse E-Abi litsentside aktiveerimisel"
|
app/locale/fi_FI/Eabi_Livehandler.csv
CHANGED
|
@@ -18,3 +18,7 @@
|
|
| 18 |
"Manage the order from here by adding <a href='%s' target='_blank'>action buttons</a>","Manage the order from here by adding <a href='%s' target='_blank'>action buttons</a>"
|
| 19 |
"http://en.e-abi.ee/magento/better-order-management.html","http://en.e-abi.ee/magento/better-order-management.html"
|
| 20 |
"This order has not yet been fully paid","This order has not yet been fully paid"
|
|
|
|
|
|
|
|
|
|
|
|
| 18 |
"Manage the order from here by adding <a href='%s' target='_blank'>action buttons</a>","Manage the order from here by adding <a href='%s' target='_blank'>action buttons</a>"
|
| 19 |
"http://en.e-abi.ee/magento/better-order-management.html","http://en.e-abi.ee/magento/better-order-management.html"
|
| 20 |
"This order has not yet been fully paid","This order has not yet been fully paid"
|
| 21 |
+
"Private key","Private key"
|
| 22 |
+
"Public key","Public key"
|
| 23 |
+
"Certificate signing request","Certificate signing request"
|
| 24 |
+
"Used to activate E-Abi licenses","Used to activate E-Abi licenses"
|
app/locale/lt_LT/Eabi_Livehandler.csv
CHANGED
|
@@ -18,3 +18,7 @@
|
|
| 18 |
"Manage the order from here by adding <a href='%s' target='_blank'>action buttons</a>","Manage the order from here by adding <a href='%s' target='_blank'>action buttons</a>"
|
| 19 |
"http://en.e-abi.ee/magento/better-order-management.html","http://en.e-abi.ee/magento/better-order-management.html"
|
| 20 |
"This order has not yet been fully paid","This order has not yet been fully paid"
|
|
|
|
|
|
|
|
|
|
|
|
| 18 |
"Manage the order from here by adding <a href='%s' target='_blank'>action buttons</a>","Manage the order from here by adding <a href='%s' target='_blank'>action buttons</a>"
|
| 19 |
"http://en.e-abi.ee/magento/better-order-management.html","http://en.e-abi.ee/magento/better-order-management.html"
|
| 20 |
"This order has not yet been fully paid","This order has not yet been fully paid"
|
| 21 |
+
"Private key","Private key"
|
| 22 |
+
"Public key","Public key"
|
| 23 |
+
"Certificate signing request","Certificate signing request"
|
| 24 |
+
"Used to activate E-Abi licenses","Used to activate E-Abi licenses"
|
app/locale/sv_SE/Eabi_Livehandler.csv
CHANGED
|
@@ -18,3 +18,7 @@
|
|
| 18 |
"Manage the order from here by adding <a href='%s' target='_blank'>action buttons</a>","Manage the order from here by adding <a href='%s' target='_blank'>action buttons</a>"
|
| 19 |
"http://en.e-abi.ee/magento/better-order-management.html","http://en.e-abi.ee/magento/better-order-management.html"
|
| 20 |
"This order has not yet been fully paid","Beställningen är inte betalats"
|
|
|
|
|
|
|
|
|
|
|
|
| 18 |
"Manage the order from here by adding <a href='%s' target='_blank'>action buttons</a>","Manage the order from here by adding <a href='%s' target='_blank'>action buttons</a>"
|
| 19 |
"http://en.e-abi.ee/magento/better-order-management.html","http://en.e-abi.ee/magento/better-order-management.html"
|
| 20 |
"This order has not yet been fully paid","Beställningen är inte betalats"
|
| 21 |
+
"Private key","Private key"
|
| 22 |
+
"Public key","Public key"
|
| 23 |
+
"Certificate signing request","Certificate signing request"
|
| 24 |
+
"Used to activate E-Abi licenses","Used to activate E-Abi licenses"
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Eabi_Livehandler</name>
|
| 4 |
-
<version>0.1.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">OSL 3.0</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -12,11 +12,12 @@
|
|
| 12 |
<p>You can navigate between orders by pressing directional keys or by pressing left/right icons on the order view</p>
|
| 13 |
<p>Possibility to create your own action buttons, which allows to save lots of time when managing orders</p>
|
| 14 |
<p>Possibility to purchase action buttons like <strong>Add order comment</strong>, <strong>Create invoice</strong>, <strong>Ship order</strong> and more</p></description>
|
| 15 |
-
<notes
|
| 16 |
-
|
| 17 |
-
<
|
| 18 |
-
<
|
| 19 |
-
<
|
|
|
|
| 20 |
<compatible/>
|
| 21 |
-
<dependencies
|
| 22 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Eabi_Livehandler</name>
|
| 4 |
+
<version>0.1.9</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">OSL 3.0</license>
|
| 7 |
<channel>community</channel>
|
| 12 |
<p>You can navigate between orders by pressing directional keys or by pressing left/right icons on the order view</p>
|
| 13 |
<p>Possibility to create your own action buttons, which allows to save lots of time when managing orders</p>
|
| 14 |
<p>Possibility to purchase action buttons like <strong>Add order comment</strong>, <strong>Create invoice</strong>, <strong>Ship order</strong> and more</p></description>
|
| 15 |
+
<notes>- Added support to activate licenses on some E-Abi Shipping and Payment modules
|
| 16 |
+
- Fixed compatiblity with getBarcodeFunction on E-Abi shipping modules in a way that packing slip could be printed, when barcodes are returned as array</notes>
|
| 17 |
+
<authors><author><name>Matis Matis</name><user>auto-converted</user><email>info@e-abi.ee</email></author></authors>
|
| 18 |
+
<date>2014-11-24</date>
|
| 19 |
+
<time>18:54:47</time>
|
| 20 |
+
<contents><target name="magecommunity"><dir name="Eabi"><dir name="Livehandler"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Button.php" hash="98dfbc3163873ad3d00fe312e7186d1f"/><file name="Remove.php" hash="7d2f3fd7d4735fe54b2cb26cfd01d46f"/></dir></dir></dir></dir><file name="Email.php" hash="cb14489488376999ad49cdcaaa23d4c8"/><file name="Footer.php" hash="a6cfb62605b0b98a807bb63f50a5f609"/></dir><dir name="Helper"><file name="Data.php" hash="75a10383d428ef728f8b099b7e41fada"/><file name="Keypair.php" hash="833c2c487f8e14828e9ef0c5e21ed739"/></dir><dir name="Model"><dir name="Action"><dir name="Postoffice"><file name="Print.php" hash="6d581a1d8abe30b13e4f8d98b7db3216"/><file name="Send.php" hash="0708e6abe93649e97e4cc0f83a4560ea"/></dir><file name="Abstract.php" hash="abd8c6897a6f06e63e5135f65fc4d787"/></dir><dir name="Adminhtml"><file name="Gridmanager.php" hash="0072348f310cbb1a8bedb4ed26aa5f4e"/></dir><dir name="Directory"><file name="Collection.php" hash="b0d8ba1d72e234efdea5b54e3a0c3ef0"/></dir><dir name="File"><file name="Object.php" hash="995211f621cb9ff660ebae266c654be0"/></dir><dir name="Mysql4"><dir name="Entry"><file name="Collection.php" hash="b9dc657da52f122f3b8b17ef05c8a365"/></dir><file name="Entry.php" hash="6037308bd30e7701ddf47c40bdf651d1"/></dir><dir name="System"><dir name="Config"><dir name="Backend"><file name="Button.php" hash="b7f6dd7f8a52163fe48c7c21cd8dfb27"/></dir></dir></dir><file name="Abstract.php" hash="5dbb059785d6ec34918ae807d973f90e"/><file name="Entry.php" hash="f358a1099935e8c9792806575c5cc65f"/><file name="Ordergrid.php" hash="4c9283e59040ea8078e3c1251620e739"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="LivehandlerController.php" hash="d2c3b5227c93cd062920951185726115"/><file name="RemoveController.php" hash="a429842dd15032034af2efb4b11660b1"/></dir><file name="IndexController.php" hash="cb6b1a81baf62e552eabb5f7613b046d"/></dir><dir name="etc"><file name="config.xml" hash="c3c1acfce122830fa5d34fac5e6fec0a"/><file name="system.xml" hash="86033f7ab9f7c3da2f9d7b870f153f54"/></dir><dir name="sql"><dir name="eabi_livehandler_setup"><file name="mysql4-install-0.1.0.php" hash="ae2da894e465ff901547b6cfcf4f8ecc"/><file name="mysql4-upgrade-0.1.0-0.1.1.php" hash="d5f49d7270343200655ffd1e3bf99949"/><file name="mysql4-upgrade-0.1.8-0.1.9.php" hash="09cf89fa4d5571d8cdc407d393b093ed"/></dir></dir><file name="CHANGELOG.txt" hash="b75f561b3c7624cc4ae799e74b71a611"/><file name="LICENCE.txt" hash="7a9e279147a63af4f63a16ca67fae07b"/></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="eabi_livehandler.xml" hash="0ac7a8b08f0b94e508ec0f845453e68f"/></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="eabi_livehandler.xml" hash="84207dbf7a067c9af7bb65a8449f9bac"/></dir></dir></dir><dir name="base"><dir name="default"><dir name="layout"><file name="eabi_livehandler.xml" hash="84207dbf7a067c9af7bb65a8449f9bac"/></dir><dir name="template"><dir name="eabi_livehandler"><file name="email.phtml" hash="1771fd066edee01f437faf4499259b82"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Eabi_Livehandler.xml" hash="f6d13fafd17c3d1721c0926190efadb1"/></dir></target><target name="magelocale"><dir name="en_US"><file name="Eabi_Livehandler.csv" hash="ad0836f450de2d09c67be6d469059f00"/></dir><dir name="et_EE"><file name="Eabi_Livehandler.csv" hash="b4eda88fc7029e1cb1966e857c993732"/></dir><dir name="fi_FI"><file name="Eabi_Livehandler.csv" hash="ad0836f450de2d09c67be6d469059f00"/></dir><dir name="lt_LT"><file name="Eabi_Livehandler.csv" hash="ad0836f450de2d09c67be6d469059f00"/></dir><dir name="sv_SE"><file name="Eabi_Livehandler.csv" hash="f4c1547b19391dbc20036e7a400ea8d4"/></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><file name="eabi_admintools.css" hash="0868ed1bfcc8afff6643d5a3b8aab5b9"/></dir></dir></dir></target><target name="mageweb"><dir name="js"><dir name="eabi_js"><file name="crossBrowser_initKeyboardEvent.js" hash="8600c5536225fd70c56ef313ee430e08"/></dir><dir name="livepipe"><file name="contextmenu.js" hash="a5dbab9663d94d9d848e84b524c1f925"/><file name="cookie.js" hash="eab2042ac637aec7777c7c64e3e2bb1a"/><file name="event_behavior.js" hash="a59a00ad652efb1596b5bd2e6f5cfe48"/><file name="hotkey.js" hash="c6193fc03e4cd4c94ee4fb37e3d5ed6b"/><file name="livepipe.js" hash="6e569402b2686976e7390f0b7a25b1eb"/><file name="progressbar.js" hash="69719eccbecbc0378d9919c53a3ef7dd"/><file name="rating.js" hash="adb5ce773c37b40fb590a877d949be7a"/><file name="resizable.js" hash="38fd18daa37e5612495cc7b42fd32b3d"/><file name="scrollbar.js" hash="7a2603c2107944b8a70e41e7a84133ba"/><file name="selection.js" hash="3f48981cccffdb5fcc5f5ff27d0b0b68"/><file name="selectmultiple.js" hash="d8f044eb344061bdcce405f671b15654"/><file name="tabs.js" hash="22abb9a3ec3933d54ff9ede0338ca7f3"/><file name="textarea.js" hash="9825782bf78d38efa53200a206d8cd77"/><file name="window.js" hash="f6eba488d6a80e05f59d97a0cef59730"/></dir></dir></target></contents>
|
| 21 |
<compatible/>
|
| 22 |
+
<dependencies/>
|
| 23 |
</package>
|
