Version Notes
Integration of econda Web Controlling functions.
Download this release
Release Info
| Developer | ecdev |
| Extension | Mage_Econda |
| Version | 1.5.7 |
| Comparing to | |
| See all releases | |
Code changes from version 1.5.6 to 1.5.7
- app/code/local/Mage/Econda/Block/Econda.php +12 -7
- app/code/local/Mage/Econda/Block/EcondaOp.php +2 -2
- app/code/local/Mage/Econda/Block/Emos.php +1 -1
- app/code/local/Mage/Econda/Helper/Data.php +1 -1
- app/code/local/Mage/Econda/Model/Base.php +15 -9
- app/code/local/Mage/Econda/Model/Basket.php +1 -1
- app/code/local/Mage/Econda/Model/Cancellation.php +0 -188
- app/code/local/Mage/Econda/Model/Item.php +1 -1
- app/code/local/Mage/Econda/Model/System/Config/Source/Billing.php +1 -1
- app/code/local/Mage/Econda/Model/System/Config/Source/Langid.php +32 -0
- app/code/local/Mage/Econda/Model/System/Config/Source/Language.php +1 -1
- app/code/local/Mage/Econda/Model/System/Config/Source/Siteid.php +1 -1
- app/code/local/Mage/Econda/etc/config.xml +2 -2
- app/code/local/Mage/Econda/etc/system.xml +19 -9
- app/design/frontend/base/default/layout/econda.xml +1 -1
- app/design/frontend/base/default/template/econda/tracker.phtml +1 -1
- app/design/frontend/default/default/layout/econda.xml +1 -1
- app/design/frontend/default/default/template/econda/tracker.phtml +1 -1
- app/etc/modules/Mage_Econda.xml +1 -1
- app/locale/de_AT/Mage_Econda.csv +1 -0
- app/locale/de_CH/Mage_Econda.csv +1 -0
- app/locale/de_DE/Mage_Econda.csv +1 -0
- app/locale/en_US/Mage_Econda.csv +1 -0
- js/tracker/emosop.js +1 -1
- package.xml +7 -7
app/code/local/Mage/Econda/Block/Econda.php
CHANGED
|
@@ -14,7 +14,7 @@
|
|
| 14 |
*
|
| 15 |
* @category Mage
|
| 16 |
* @package Mage_Econda
|
| 17 |
-
* @copyright Copyright (c)
|
| 18 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 19 |
*/
|
| 20 |
|
|
@@ -86,9 +86,14 @@ class Mage_Econda_Block_Econda extends Mage_Core_Block_Template
|
|
| 86 |
$contentPath = "Start";
|
| 87 |
$contentPath .= Mage::getModel('econda/base')->getContentBreadcrumb();
|
| 88 |
$contentPath .= Mage::getModel('econda/base')->getContentCustom();
|
| 89 |
-
|
| 90 |
-
|
| 91 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 92 |
}
|
| 93 |
$contentPath = str_replace('//','/',$contentPath);
|
| 94 |
|
|
@@ -114,8 +119,8 @@ class Mage_Econda_Block_Econda extends Mage_Core_Block_Template
|
|
| 114 |
/**
|
| 115 |
* Add lang id
|
| 116 |
*/
|
| 117 |
-
$
|
| 118 |
-
$emos->addLangID($
|
| 119 |
|
| 120 |
/**
|
| 121 |
* Save pageID, siteID and langID into session for onePageCheckout
|
|
@@ -232,7 +237,7 @@ class Mage_Econda_Block_Econda extends Mage_Core_Block_Template
|
|
| 232 |
/**
|
| 233 |
* Display script code
|
| 234 |
*/
|
| 235 |
-
$emosString = "\n\n<!-- Start Econda-Monitor
|
| 236 |
$emosString .= $emos->toString();
|
| 237 |
$emosString .= "<!-- End Econda-Monitor -->\n\n";
|
| 238 |
|
| 14 |
*
|
| 15 |
* @category Mage
|
| 16 |
* @package Mage_Econda
|
| 17 |
+
* @copyright Copyright (c) 2012 econda GmbH (http://www.econda.de)
|
| 18 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 19 |
*/
|
| 20 |
|
| 86 |
$contentPath = "Start";
|
| 87 |
$contentPath .= Mage::getModel('econda/base')->getContentBreadcrumb();
|
| 88 |
$contentPath .= Mage::getModel('econda/base')->getContentCustom();
|
| 89 |
+
$pageRoute = Mage::app()->getRequest()->getRouteName();
|
| 90 |
+
$PageName = Mage::getSingleton('cms/page')->getIdentifier();
|
| 91 |
+
|
| 92 |
+
if($pageRoute != 'cms' && $PageName != 'home') {
|
| 93 |
+
if(trim($contentPath) == 'Start' || trim($contentPath) == 'Start/') {
|
| 94 |
+
$contentPath = str_replace('/','',$contentPath);
|
| 95 |
+
$contentPath .= Mage::getModel('econda/base')->getContentDefault();
|
| 96 |
+
}
|
| 97 |
}
|
| 98 |
$contentPath = str_replace('//','/',$contentPath);
|
| 99 |
|
| 119 |
/**
|
| 120 |
* Add lang id
|
| 121 |
*/
|
| 122 |
+
$langName = Mage::getModel('econda/base')->getLangId($storeId);
|
| 123 |
+
$emos->addLangID($langName);
|
| 124 |
|
| 125 |
/**
|
| 126 |
* Save pageID, siteID and langID into session for onePageCheckout
|
| 237 |
/**
|
| 238 |
* Display script code
|
| 239 |
*/
|
| 240 |
+
$emosString = "\n\n<!-- Start Econda-Monitor M157 -->\n";
|
| 241 |
$emosString .= $emos->toString();
|
| 242 |
$emosString .= "<!-- End Econda-Monitor -->\n\n";
|
| 243 |
|
app/code/local/Mage/Econda/Block/EcondaOp.php
CHANGED
|
@@ -14,7 +14,7 @@
|
|
| 14 |
*
|
| 15 |
* @category Mage
|
| 16 |
* @package Mage_Econda
|
| 17 |
-
* @copyright Copyright (c)
|
| 18 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 19 |
*/
|
| 20 |
|
|
@@ -66,7 +66,7 @@ class Mage_Econda_Block_EcondaOp extends Mage_Core_Block_Template
|
|
| 66 |
$emosLogin .= " emospro.login = [['".$customerId."','0']];\n";
|
| 67 |
$opsession->setData('econda_logged','2');
|
| 68 |
}
|
| 69 |
-
$emosOut = "\n\n<!-- Start Econda-Monitor
|
| 70 |
$emosOut .= "<script type=\"text/javascript\">\n//<![CDATA[\n";
|
| 71 |
$emosOut .= " window.emosTrackVersion = 2;\n";
|
| 72 |
$emosOut .= "//]]>\n</script>";
|
| 14 |
*
|
| 15 |
* @category Mage
|
| 16 |
* @package Mage_Econda
|
| 17 |
+
* @copyright Copyright (c) 2012 econda GmbH (http://www.econda.de)
|
| 18 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 19 |
*/
|
| 20 |
|
| 66 |
$emosLogin .= " emospro.login = [['".$customerId."','0']];\n";
|
| 67 |
$opsession->setData('econda_logged','2');
|
| 68 |
}
|
| 69 |
+
$emosOut = "\n\n<!-- Start Econda-Monitor M157 -->\n";
|
| 70 |
$emosOut .= "<script type=\"text/javascript\">\n//<![CDATA[\n";
|
| 71 |
$emosOut .= " window.emosTrackVersion = 2;\n";
|
| 72 |
$emosOut .= "//]]>\n</script>";
|
app/code/local/Mage/Econda/Block/Emos.php
CHANGED
|
@@ -4,7 +4,7 @@
|
|
| 4 |
* $Id: emos.php,v 1.15 2009/11/17 13:24:00 egaiser Exp $
|
| 5 |
********************************************************************************
|
| 6 |
|
| 7 |
-
Copyright (c) 2004 -
|
| 8 |
All rights reserved.
|
| 9 |
|
| 10 |
ECONDA GmbH
|
| 4 |
* $Id: emos.php,v 1.15 2009/11/17 13:24:00 egaiser Exp $
|
| 5 |
********************************************************************************
|
| 6 |
|
| 7 |
+
Copyright (c) 2004 - 2012 ECONDA GmbH Karlsruhe
|
| 8 |
All rights reserved.
|
| 9 |
|
| 10 |
ECONDA GmbH
|
app/code/local/Mage/Econda/Helper/Data.php
CHANGED
|
@@ -14,7 +14,7 @@
|
|
| 14 |
*
|
| 15 |
* @category Mage
|
| 16 |
* @package Mage_Econda
|
| 17 |
-
* @copyright Copyright (c)
|
| 18 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 19 |
*/
|
| 20 |
|
| 14 |
*
|
| 15 |
* @category Mage
|
| 16 |
* @package Mage_Econda
|
| 17 |
+
* @copyright Copyright (c) 2012 econda GmbH (http://www.econda.de)
|
| 18 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 19 |
*/
|
| 20 |
|
app/code/local/Mage/Econda/Model/Base.php
CHANGED
|
@@ -14,7 +14,7 @@
|
|
| 14 |
*
|
| 15 |
* @category Mage
|
| 16 |
* @package Mage_Econda
|
| 17 |
-
* @copyright Copyright (c)
|
| 18 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 19 |
*/
|
| 20 |
|
|
@@ -56,13 +56,13 @@ class Mage_Econda_Model_Base extends Mage_Core_Model_Abstract
|
|
| 56 |
public function getSearch()
|
| 57 |
{
|
| 58 |
$search = null;
|
| 59 |
-
if(Mage::helper('
|
| 60 |
-
$searchQuery = Mage::helper('
|
| 61 |
-
$getQuery = Mage::helper('
|
| 62 |
$searchQuery = $getQuery->query_text;
|
| 63 |
$searchHitsRes = $getQuery->num_results;
|
| 64 |
$searchHits = (int)$searchHitsRes;
|
| 65 |
-
$search = array($searchQuery, $searchHits);
|
| 66 |
}
|
| 67 |
if(stristr($this->realUrl,'/catalogsearch/advanced/result/?') != false) {
|
| 68 |
$searchQuery = '';
|
|
@@ -71,7 +71,7 @@ class Mage_Econda_Model_Base extends Mage_Core_Model_Abstract
|
|
| 71 |
$searchQuery .= $val['value'];
|
| 72 |
}
|
| 73 |
$productCollectionRes = Mage::getSingleton('catalogsearch/advanced')->getProductCollection();
|
| 74 |
-
$productCollection =
|
| 75 |
$search = array($searchQuery, $productCollection);
|
| 76 |
}
|
| 77 |
return $search;
|
|
@@ -111,10 +111,16 @@ class Mage_Econda_Model_Base extends Mage_Core_Model_Abstract
|
|
| 111 |
*
|
| 112 |
* @return string
|
| 113 |
*/
|
| 114 |
-
public function getLangId()
|
| 115 |
{
|
| 116 |
-
|
| 117 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 118 |
}
|
| 119 |
|
| 120 |
/**
|
| 14 |
*
|
| 15 |
* @category Mage
|
| 16 |
* @package Mage_Econda
|
| 17 |
+
* @copyright Copyright (c) 2012 econda GmbH (http://www.econda.de)
|
| 18 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 19 |
*/
|
| 20 |
|
| 56 |
public function getSearch()
|
| 57 |
{
|
| 58 |
$search = null;
|
| 59 |
+
if(Mage::helper('catalogsearch')->getQueryText() != null) {
|
| 60 |
+
$searchQuery = Mage::helper('catalogsearch')->getQueryText();
|
| 61 |
+
$getQuery = Mage::helper('catalogsearch')->getQuery();
|
| 62 |
$searchQuery = $getQuery->query_text;
|
| 63 |
$searchHitsRes = $getQuery->num_results;
|
| 64 |
$searchHits = (int)$searchHitsRes;
|
| 65 |
+
$search = array($searchQuery, $searchHits);
|
| 66 |
}
|
| 67 |
if(stristr($this->realUrl,'/catalogsearch/advanced/result/?') != false) {
|
| 68 |
$searchQuery = '';
|
| 71 |
$searchQuery .= $val['value'];
|
| 72 |
}
|
| 73 |
$productCollectionRes = Mage::getSingleton('catalogsearch/advanced')->getProductCollection();
|
| 74 |
+
$productCollection = $productCollectionRes->getSize();
|
| 75 |
$search = array($searchQuery, $productCollection);
|
| 76 |
}
|
| 77 |
return $search;
|
| 111 |
*
|
| 112 |
* @return string
|
| 113 |
*/
|
| 114 |
+
public function getLangId($storeId)
|
| 115 |
{
|
| 116 |
+
$langidOv = Mage::getStoreConfig('econda/econda_settings/tracking_langid', $storeId);
|
| 117 |
+
if(!empty($langidOv) && trim($langidOv) != "") {
|
| 118 |
+
$langName = trim($langidOv);
|
| 119 |
+
}
|
| 120 |
+
else {
|
| 121 |
+
$langName = Mage::app()->getStore()->getStoreId();
|
| 122 |
+
}
|
| 123 |
+
return $langName;
|
| 124 |
}
|
| 125 |
|
| 126 |
/**
|
app/code/local/Mage/Econda/Model/Basket.php
CHANGED
|
@@ -14,7 +14,7 @@
|
|
| 14 |
*
|
| 15 |
* @category Mage
|
| 16 |
* @package Mage_Econda
|
| 17 |
-
* @copyright Copyright (c)
|
| 18 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 19 |
*/
|
| 20 |
|
| 14 |
*
|
| 15 |
* @category Mage
|
| 16 |
* @package Mage_Econda
|
| 17 |
+
* @copyright Copyright (c) 2012 econda GmbH (http://www.econda.de)
|
| 18 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 19 |
*/
|
| 20 |
|
app/code/local/Mage/Econda/Model/Cancellation.php
DELETED
|
@@ -1,188 +0,0 @@
|
|
| 1 |
-
<?php
|
| 2 |
-
/**
|
| 3 |
-
* Magento
|
| 4 |
-
*
|
| 5 |
-
* NOTICE OF LICENSE
|
| 6 |
-
*
|
| 7 |
-
* This source file is subject to the Open Software License (OSL 3.0)
|
| 8 |
-
* that is bundled with this package in the file LICENSE.txt.
|
| 9 |
-
* It is also available through the world-wide-web at this URL:
|
| 10 |
-
* http://opensource.org/licenses/osl-3.0.php
|
| 11 |
-
* If you did not receive a copy of the license and are unable to
|
| 12 |
-
* obtain it through the world-wide-web, please send an email
|
| 13 |
-
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
-
*
|
| 15 |
-
* @category Mage
|
| 16 |
-
* @package Mage_Econda
|
| 17 |
-
* @copyright Copyright (c) 2010 econda GmbH (http://www.econda.de)
|
| 18 |
-
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 19 |
-
*/
|
| 20 |
-
|
| 21 |
-
/**
|
| 22 |
-
* Generate standard tracking values
|
| 23 |
-
*/
|
| 24 |
-
class Mage_Econda_Model_Cancellation extends Mage_Core_Model_Abstract
|
| 25 |
-
{
|
| 26 |
-
/**
|
| 27 |
-
* Default param
|
| 28 |
-
*
|
| 29 |
-
*/
|
| 30 |
-
private $_wsdl = "Cancellation.wsdl";
|
| 31 |
-
private $_headers = array();
|
| 32 |
-
private $_response = null;
|
| 33 |
-
private $_client = null;
|
| 34 |
-
private $_data = null;
|
| 35 |
-
private $_dataArray = null;
|
| 36 |
-
private $_responseSize = 0;
|
| 37 |
-
private $_connSuccess = false;
|
| 38 |
-
|
| 39 |
-
/**
|
| 40 |
-
* Set wsdl file
|
| 41 |
-
*
|
| 42 |
-
* @param wsdl|url
|
| 43 |
-
* @return void
|
| 44 |
-
*/
|
| 45 |
-
public function setWsdl($wsdlFile)
|
| 46 |
-
{
|
| 47 |
-
$this->_wsdl = $wsdlFile;
|
| 48 |
-
return;
|
| 49 |
-
}
|
| 50 |
-
|
| 51 |
-
/**
|
| 52 |
-
* Initialize web service
|
| 53 |
-
*
|
| 54 |
-
* @param user|password|client id
|
| 55 |
-
* @return void
|
| 56 |
-
*/
|
| 57 |
-
public function openWebservice($username, $password, $client)
|
| 58 |
-
{
|
| 59 |
-
try {
|
| 60 |
-
$this->_client = new SoapClient($this->_wsdl);
|
| 61 |
-
}
|
| 62 |
-
catch(Exception $e) {
|
| 63 |
-
$this->_response .= "The Webservice could not be established! Probably wsdl file is not found.";
|
| 64 |
-
return;
|
| 65 |
-
}
|
| 66 |
-
$this->_connSuccess = true;
|
| 67 |
-
$this->_setHeaders($username, $password, $client);
|
| 68 |
-
return;
|
| 69 |
-
}
|
| 70 |
-
|
| 71 |
-
/**
|
| 72 |
-
* Set headers for connection
|
| 73 |
-
*
|
| 74 |
-
* @param user|password|client id
|
| 75 |
-
* @return void
|
| 76 |
-
*/
|
| 77 |
-
private function _setHeaders($username, $password, $client)
|
| 78 |
-
{
|
| 79 |
-
if($this->_connSuccess) {
|
| 80 |
-
$this->_headers[] = new SoapHeader('webservices.econda.de', 'username', $username);
|
| 81 |
-
$this->_headers[] = new SoapHeader('webservices.econda.de', 'password', $password);
|
| 82 |
-
$this->_headers[] = new SoapHeader('webservices.econda.de', 'client', $client);
|
| 83 |
-
$this->_client->__setSoapHeaders($this->_headers);
|
| 84 |
-
}
|
| 85 |
-
return;
|
| 86 |
-
}
|
| 87 |
-
|
| 88 |
-
/**
|
| 89 |
-
* Submit single cancellation
|
| 90 |
-
*
|
| 91 |
-
* @param order id|order sum|cancellation type
|
| 92 |
-
* @return void
|
| 93 |
-
*/
|
| 94 |
-
public function doCancellation($order, $sum, $type = 'Storno')
|
| 95 |
-
{
|
| 96 |
-
if($this->_connSuccess) {
|
| 97 |
-
$order = strval($order);
|
| 98 |
-
$type = strval(utf8_encode($type));
|
| 99 |
-
$gregorianDate = date("Y-m-d")."T".date("H:i:s");
|
| 100 |
-
$this->_data = array("data" => array("cancellationDate" => $gregorianDate,
|
| 101 |
-
"cancellationSum" => $this->_convertPrice($sum),
|
| 102 |
-
"cancellationType" => $type,
|
| 103 |
-
"orderNo" => $order));
|
| 104 |
-
$this->_response = $this->_client->doCancellation($this->_data);
|
| 105 |
-
}
|
| 106 |
-
return;
|
| 107 |
-
}
|
| 108 |
-
|
| 109 |
-
/**
|
| 110 |
-
* Submit multi cancellations
|
| 111 |
-
*
|
| 112 |
-
* @param cancellation array
|
| 113 |
-
* @return void;
|
| 114 |
-
*/
|
| 115 |
-
public function doCancellations($cancellations)
|
| 116 |
-
{
|
| 117 |
-
if($this->_connSuccess) {
|
| 118 |
-
$stornoArray = array();
|
| 119 |
-
$gregorianDate = date("Y-m-d")."T".date("H:i:s");
|
| 120 |
-
for($i=0,$count=sizeof($cancellations);$i<$count;$i++) {
|
| 121 |
-
$order = strval($cancellations[$i][0]);
|
| 122 |
-
$type = strval(utf8_encode($cancellations[$i][2]));
|
| 123 |
-
$sum = $cancellations[$i][1];
|
| 124 |
-
$stornoArray[] = array("cancellationDate" => $gregorianDate,
|
| 125 |
-
"cancellationSum" => $this->_convertPrice($sum),
|
| 126 |
-
"cancellationType" => $type,
|
| 127 |
-
"orderNo" => $order
|
| 128 |
-
);
|
| 129 |
-
}
|
| 130 |
-
$this->_responseSize = sizeof($cancellations);
|
| 131 |
-
$this->_dataArray = array("dataArray" => $stornoArray);
|
| 132 |
-
$this->_response = $this->_client->doCancellations($this->_dataArray);
|
| 133 |
-
}
|
| 134 |
-
return;
|
| 135 |
-
}
|
| 136 |
-
|
| 137 |
-
/**
|
| 138 |
-
* Get response from webservice
|
| 139 |
-
*
|
| 140 |
-
* @return string
|
| 141 |
-
*/
|
| 142 |
-
public function getResponse()
|
| 143 |
-
{
|
| 144 |
-
if($this->_connSuccess) {
|
| 145 |
-
$retString = "Response from econda Webservice:<br />";
|
| 146 |
-
if($this->_responseSize > 0) {
|
| 147 |
-
for($i=0; $i<$this->_responseSize; $i++) {
|
| 148 |
-
$retString .= $this->_response->doCancellationsReturn->messages->item[$i]->type.": ";
|
| 149 |
-
$retString .= $this->_response->doCancellationsReturn->messages->item[$i]->code." - ";;
|
| 150 |
-
$retString .= $this->_response->doCancellationsReturn->messages->item[$i]->message."<br />";
|
| 151 |
-
}
|
| 152 |
-
}
|
| 153 |
-
else {
|
| 154 |
-
$retString .= $this->_response->doCancellationReturn->messages->item->type.": ";
|
| 155 |
-
$retString .= $this->_response->doCancellationReturn->messages->item->code." - ";;
|
| 156 |
-
$retString .= $this->_response->doCancellationReturn->messages->item->message."<br />";
|
| 157 |
-
}
|
| 158 |
-
return $retString;
|
| 159 |
-
}
|
| 160 |
-
else {
|
| 161 |
-
return $this->_response;
|
| 162 |
-
}
|
| 163 |
-
}
|
| 164 |
-
|
| 165 |
-
/**
|
| 166 |
-
* Format price
|
| 167 |
-
*
|
| 168 |
-
* @param price string
|
| 169 |
-
* @return number
|
| 170 |
-
*/
|
| 171 |
-
private function _convertPrice($price)
|
| 172 |
-
{
|
| 173 |
-
$price = preg_replace('/[^0-9,.]/i','',$price);
|
| 174 |
-
$price = str_replace(',','.',$price);
|
| 175 |
-
$priceArr = explode('.', $price);
|
| 176 |
-
$priceCorr = $price;
|
| 177 |
-
if(count($priceArr) > 2) {
|
| 178 |
-
$priceCorr = "";
|
| 179 |
-
for($i=0; $i<=count($priceArr)-2; $i++) {
|
| 180 |
-
$priceCorr .= $priceArr[$i];
|
| 181 |
-
}
|
| 182 |
-
$priceCorr .= ".".$priceArr[count($priceArr)-1];
|
| 183 |
-
}
|
| 184 |
-
$priceCorr = number_format($priceCorr,2,".","");
|
| 185 |
-
return $priceCorr;
|
| 186 |
-
}
|
| 187 |
-
}
|
| 188 |
-
?>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/local/Mage/Econda/Model/Item.php
CHANGED
|
@@ -14,7 +14,7 @@
|
|
| 14 |
*
|
| 15 |
* @category Mage
|
| 16 |
* @package Mage_Econda
|
| 17 |
-
* @copyright Copyright (c)
|
| 18 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 19 |
*/
|
| 20 |
class Mage_Econda_Model_Item extends Mage_Core_Model_Abstract
|
| 14 |
*
|
| 15 |
* @category Mage
|
| 16 |
* @package Mage_Econda
|
| 17 |
+
* @copyright Copyright (c) 2012 econda GmbH (http://www.econda.de)
|
| 18 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 19 |
*/
|
| 20 |
class Mage_Econda_Model_Item extends Mage_Core_Model_Abstract
|
app/code/local/Mage/Econda/Model/System/Config/Source/Billing.php
CHANGED
|
@@ -14,7 +14,7 @@
|
|
| 14 |
*
|
| 15 |
* @category Mage
|
| 16 |
* @package Mage_Econda
|
| 17 |
-
* @copyright Copyright (c)
|
| 18 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 19 |
*/
|
| 20 |
class Mage_Econda_Model_System_Config_Source_Billing
|
| 14 |
*
|
| 15 |
* @category Mage
|
| 16 |
* @package Mage_Econda
|
| 17 |
+
* @copyright Copyright (c) 2012 econda GmbH (http://www.econda.de)
|
| 18 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 19 |
*/
|
| 20 |
class Mage_Econda_Model_System_Config_Source_Billing
|
app/code/local/Mage/Econda/Model/System/Config/Source/Langid.php
ADDED
|
@@ -0,0 +1,32 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magento
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
| 11 |
+
* If you did not receive a copy of the license and are unable to
|
| 12 |
+
* obtain it through the world-wide-web, please send an email
|
| 13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 14 |
+
*
|
| 15 |
+
* @category Mage
|
| 16 |
+
* @package Mage_Econda
|
| 17 |
+
* @copyright Copyright (c) 2012 econda GmbH (http://www.econda.de)
|
| 18 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 19 |
+
*/
|
| 20 |
+
class Mage_Econda_Model_System_Config_Source_Langid
|
| 21 |
+
{
|
| 22 |
+
|
| 23 |
+
/**
|
| 24 |
+
* returns the value for siteid field in backend
|
| 25 |
+
*/
|
| 26 |
+
public function toOptionArray()
|
| 27 |
+
{
|
| 28 |
+
return array(
|
| 29 |
+
array('value'=>'', 'label'=>Mage::helper('econda')->__(''))
|
| 30 |
+
);
|
| 31 |
+
}
|
| 32 |
+
}
|
app/code/local/Mage/Econda/Model/System/Config/Source/Language.php
CHANGED
|
@@ -14,7 +14,7 @@
|
|
| 14 |
*
|
| 15 |
* @category Mage
|
| 16 |
* @package Mage_Econda
|
| 17 |
-
* @copyright Copyright (c)
|
| 18 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 19 |
*/
|
| 20 |
class Mage_Econda_Model_System_Config_Source_Language
|
| 14 |
*
|
| 15 |
* @category Mage
|
| 16 |
* @package Mage_Econda
|
| 17 |
+
* @copyright Copyright (c) 2012 econda GmbH (http://www.econda.de)
|
| 18 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 19 |
*/
|
| 20 |
class Mage_Econda_Model_System_Config_Source_Language
|
app/code/local/Mage/Econda/Model/System/Config/Source/Siteid.php
CHANGED
|
@@ -14,7 +14,7 @@
|
|
| 14 |
*
|
| 15 |
* @category Mage
|
| 16 |
* @package Mage_Econda
|
| 17 |
-
* @copyright Copyright (c)
|
| 18 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 19 |
*/
|
| 20 |
class Mage_Econda_Model_System_Config_Source_Siteid
|
| 14 |
*
|
| 15 |
* @category Mage
|
| 16 |
* @package Mage_Econda
|
| 17 |
+
* @copyright Copyright (c) 2012 econda GmbH (http://www.econda.de)
|
| 18 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 19 |
*/
|
| 20 |
class Mage_Econda_Model_System_Config_Source_Siteid
|
app/code/local/Mage/Econda/etc/config.xml
CHANGED
|
@@ -6,12 +6,12 @@
|
|
| 6 |
receive a copy of the license and are unable to * obtain it through the world-wide-web,
|
| 7 |
please send an email * to license@magentocommerce.com so we can send you
|
| 8 |
a copy immediately. * * @category Mage * @package Mage_Econda * @copyright
|
| 9 |
-
Copyright (c)
|
| 10 |
Open Software License (OSL 3.0) */ -->
|
| 11 |
<config>
|
| 12 |
<modules>
|
| 13 |
<Mage_Econda>
|
| 14 |
-
<version>1.5.
|
| 15 |
</Mage_Econda>
|
| 16 |
</modules>
|
| 17 |
<frontend>
|
| 6 |
receive a copy of the license and are unable to * obtain it through the world-wide-web,
|
| 7 |
please send an email * to license@magentocommerce.com so we can send you
|
| 8 |
a copy immediately. * * @category Mage * @package Mage_Econda * @copyright
|
| 9 |
+
Copyright (c) 2012 econda GmbH (http://www.econda.de) * @license http://opensource.org/licenses/osl-3.0.php
|
| 10 |
Open Software License (OSL 3.0) */ -->
|
| 11 |
<config>
|
| 12 |
<modules>
|
| 13 |
<Mage_Econda>
|
| 14 |
+
<version>1.5.7</version>
|
| 15 |
</Mage_Econda>
|
| 16 |
</modules>
|
| 17 |
<frontend>
|
app/code/local/Mage/Econda/etc/system.xml
CHANGED
|
@@ -15,7 +15,7 @@
|
|
| 15 |
*
|
| 16 |
* @category Mage
|
| 17 |
* @package Mage_Econda
|
| 18 |
-
* @copyright Copyright (c)
|
| 19 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 20 |
*/
|
| 21 |
-->
|
|
@@ -28,7 +28,7 @@
|
|
| 28 |
<sort_order>335</sort_order>
|
| 29 |
<show_in_default>1</show_in_default>
|
| 30 |
<show_in_website>1</show_in_website>
|
| 31 |
-
<show_in_store>
|
| 32 |
<groups>
|
| 33 |
<info translate="label">
|
| 34 |
<label>Info</label>
|
|
@@ -36,7 +36,7 @@
|
|
| 36 |
<frontend_type>text</frontend_type>
|
| 37 |
<show_in_default>1</show_in_default>
|
| 38 |
<show_in_website>1</show_in_website>
|
| 39 |
-
<show_in_store>
|
| 40 |
<comment><