Version Notes
Änderung:
Wegen unterschiedlicher Formate von Adressen verschiedener Länder wird nun die Straße in Bezug auf womöglich fehlende Hausnummer nicht mehr überprüft.
Download this release
Release Info
Developer | Magento Core Team |
Extension | Novalnet |
Version | 1.2.1 |
Comparing to | |
See all releases |
Code changes from version 1.2.0 to 1.2.1
- app/code/community/Mage/Novalnet/Block/Cc/Info.php +8 -0
- app/code/community/Mage/Novalnet/Block/Elvaustria/Info.php +4 -0
- app/code/community/Mage/Novalnet/Block/Elvgerman/Info.php +4 -0
- app/code/community/Mage/Novalnet/Model/NovalnetCc.php +15 -10
- app/code/community/Mage/Novalnet/Model/NovalnetElvaustria.php +14 -6
- app/code/community/Mage/Novalnet/Model/NovalnetElvgerman.php +44 -18
- app/code/community/Mage/Novalnet/Model/NovalnetInstantbanktransfer.php +318 -0
- app/code/community/Mage/Novalnet/Model/NovalnetInvoice.php +13 -5
- app/code/community/Mage/Novalnet/Model/NovalnetPhonepayment.php +12 -5
- app/code/community/Mage/Novalnet/Model/NovalnetPrepayment.php +11 -5
- app/code/community/Mage/Novalnet/Model/NovalnetSecure.php +1 -0
- app/code/community/Mage/Novalnet/sql/novalnet_setup/mysql4-upgrade-1.1.8-1.1.9.php +25 -0
- app/code/community/Mage/Novalnet/sql/novalnet_setup/mysql4-upgrade-1.1.9-1.2.0.php +25 -0
- app/code/community/Mage/Novalnet/sql/novalnet_setup/mysql4-upgrade-1.2.0-1.2.1.php +25 -0
- app/design/frontend/default/default/template/novalnet/cc/form.phtml +6 -2
- app/design/frontend/default/default/template/novalnet/cc/info.phtml +1 -0
- app/design/frontend/default/default/template/novalnet/elvaustria/form.phtml +6 -2
- app/design/frontend/default/default/template/novalnet/elvaustria/info.phtml +1 -1
- app/design/frontend/default/default/template/novalnet/elvgerman/form.phtml +6 -2
- app/design/frontend/default/default/template/novalnet/elvgerman/info.phtml +1 -1
- app/design/frontend/default/default/template/novalnet/invoice/form.phtml +5 -1
- app/design/frontend/default/default/template/novalnet/phonepayment/form.phtml +4 -1
- app/design/frontend/default/default/template/novalnet/prepayment/form.phtml +4 -1
- app/locale/de_AT/Mage_Novalnet.csv +2 -1
- app/locale/de_CH/Mage_Novalnet.csv +2 -1
- app/locale/de_DE/Mage_Novalnet.csv +1 -0
- app/locale/en_US/Mage_Novalnet.csv +2 -1
- package.xml +6 -8
app/code/community/Mage/Novalnet/Block/Cc/Info.php
CHANGED
@@ -83,4 +83,12 @@ class Mage_Novalnet_Block_Cc_Info extends Mage_Payment_Block_Info
|
|
83 |
$this->setTemplate('payment/info/pdf/cc.phtml');
|
84 |
return $this->toHtml();
|
85 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
86 |
}
|
83 |
$this->setTemplate('payment/info/pdf/cc.phtml');
|
84 |
return $this->toHtml();
|
85 |
}
|
86 |
+
public function getMethod()
|
87 |
+
{
|
88 |
+
return $this->getInfo()->getMethodInstance();
|
89 |
+
}
|
90 |
+
public function getPaymentMethod()
|
91 |
+
{
|
92 |
+
return $this->htmlEscape($this->getMethod()->getConfigData('title'));
|
93 |
+
}
|
94 |
}
|
app/code/community/Mage/Novalnet/Block/Elvaustria/Info.php
CHANGED
@@ -53,6 +53,10 @@ class Mage_Novalnet_Block_Elvaustria_Info extends Mage_Payment_Block_Info
|
|
53 |
{
|
54 |
return $this->getInfo()->getMethodInstance();
|
55 |
}
|
|
|
|
|
|
|
|
|
56 |
public function getInfoData($field)
|
57 |
{
|
58 |
return $this->htmlEscape($this->getMethod()->getInfoInstance()->getData($field));
|
53 |
{
|
54 |
return $this->getInfo()->getMethodInstance();
|
55 |
}
|
56 |
+
public function getPaymentMethod()
|
57 |
+
{
|
58 |
+
return $this->htmlEscape($this->getMethod()->getConfigData('title'));
|
59 |
+
}
|
60 |
public function getInfoData($field)
|
61 |
{
|
62 |
return $this->htmlEscape($this->getMethod()->getInfoInstance()->getData($field));
|
app/code/community/Mage/Novalnet/Block/Elvgerman/Info.php
CHANGED
@@ -53,6 +53,10 @@ class Mage_Novalnet_Block_Elvgerman_Info extends Mage_Payment_Block_Info
|
|
53 |
{
|
54 |
return $this->getInfo()->getMethodInstance();
|
55 |
}
|
|
|
|
|
|
|
|
|
56 |
public function getInfoData($field)
|
57 |
{
|
58 |
return $this->htmlEscape($this->getMethod()->getInfoInstance()->getData($field));
|
53 |
{
|
54 |
return $this->getInfo()->getMethodInstance();
|
55 |
}
|
56 |
+
public function getPaymentMethod()
|
57 |
+
{
|
58 |
+
return $this->htmlEscape($this->getMethod()->getConfigData('title'));
|
59 |
+
}
|
60 |
public function getInfoData($field)
|
61 |
{
|
62 |
return $this->htmlEscape($this->getMethod()->getInfoInstance()->getData($field));
|
app/code/community/Mage/Novalnet/Model/NovalnetCc.php
CHANGED
@@ -30,6 +30,7 @@
|
|
30 |
class Mage_Novalnet_Model_NovalnetCc extends Mage_Payment_Model_Method_Cc
|
31 |
{
|
32 |
const CGI_URL = 'https://payport.novalnet.de/paygate.jsp';
|
|
|
33 |
const RESPONSE_DELIM_CHAR = '&';
|
34 |
const RESPONSE_CODE_APPROVED = 100;
|
35 |
/**
|
@@ -175,14 +176,20 @@ class Mage_Novalnet_Model_NovalnetCc extends Mage_Payment_Model_Method_Cc
|
|
175 |
$request->setinput1($order->getIncrementId());
|
176 |
|
177 |
$billing = $order->getBillingAddress();
|
178 |
-
|
179 |
-
if (!isset($street[1])
|
180 |
-
if (!isset($street[2])
|
|
|
|
|
|
|
|
|
|
|
|
|
181 |
if (!empty($billing)) {
|
182 |
$request->setfirst_name($billing->getFirstname())
|
183 |
->setlast_name($billing->getLastname())
|
184 |
-
->
|
185 |
-
->
|
186 |
->setcity($billing->getCity())
|
187 |
->setzip($billing->getPostcode())
|
188 |
->setcountry($billing->getCountry())
|
@@ -192,8 +199,8 @@ class Mage_Novalnet_Model_NovalnetCc extends Mage_Payment_Model_Method_Cc
|
|
192 |
->setgender('u')
|
193 |
->setemail($order->getCustomerEmail());
|
194 |
}#->setremote_ip($order->getRemoteIp())
|
195 |
-
|
196 |
-
|
197 |
}
|
198 |
|
199 |
if($payment->getCcNumber()){
|
@@ -268,9 +275,7 @@ class Mage_Novalnet_Model_NovalnetCc extends Mage_Payment_Model_Method_Cc
|
|
268 |
}
|
269 |
|
270 |
} else {
|
271 |
-
Mage::throwException(
|
272 |
-
Mage::helper('paygate')->__('Error in payment gateway')
|
273 |
-
);
|
274 |
}
|
275 |
$result->toUtf8();
|
276 |
return $result;
|
30 |
class Mage_Novalnet_Model_NovalnetCc extends Mage_Payment_Model_Method_Cc
|
31 |
{
|
32 |
const CGI_URL = 'https://payport.novalnet.de/paygate.jsp';
|
33 |
+
const PAYMENT_METHOD = 'Credit Card';
|
34 |
const RESPONSE_DELIM_CHAR = '&';
|
35 |
const RESPONSE_CODE_APPROVED = 100;
|
36 |
/**
|
176 |
$request->setinput1($order->getIncrementId());
|
177 |
|
178 |
$billing = $order->getBillingAddress();
|
179 |
+
/*$street = preg_split("/(\d)/",$billing->getStreet(1),2,PREG_SPLIT_DELIM_CAPTURE);
|
180 |
+
if (!isset($street[1])){$street[1]='';}
|
181 |
+
if (!isset($street[2])){$street[2]='';}
|
182 |
+
if (!$street[0]){$street[0] = $street[1].$street[2];}
|
183 |
+
if (!$street[0])
|
184 |
+
{
|
185 |
+
Mage::throwException(Mage::helper('novalnet')->__('Street missing'));
|
186 |
+
}*/
|
187 |
+
if (!$billing->getStreet(1)){Mage::throwException(Mage::helper('novalnet')->__('Street missing'));}
|
188 |
if (!empty($billing)) {
|
189 |
$request->setfirst_name($billing->getFirstname())
|
190 |
->setlast_name($billing->getLastname())
|
191 |
+
->setsearch_in_street(1)
|
192 |
+
->setstreet($billing->getStreet(1))
|
193 |
->setcity($billing->getCity())
|
194 |
->setzip($billing->getPostcode())
|
195 |
->setcountry($billing->getCountry())
|
199 |
->setgender('u')
|
200 |
->setemail($order->getCustomerEmail());
|
201 |
}#->setremote_ip($order->getRemoteIp())
|
202 |
+
#->setstreet($street[0])
|
203 |
+
#->sethouse_no($street[1].$street[2])
|
204 |
}
|
205 |
|
206 |
if($payment->getCcNumber()){
|
275 |
}
|
276 |
|
277 |
} else {
|
278 |
+
Mage::throwException(Mage::helper('paygate')->__('Error in payment gateway'));
|
|
|
|
|
279 |
}
|
280 |
$result->toUtf8();
|
281 |
return $result;
|
app/code/community/Mage/Novalnet/Model/NovalnetElvaustria.php
CHANGED
@@ -29,6 +29,7 @@
|
|
29 |
class Mage_Novalnet_Model_NovalnetElvaustria extends Mage_Payment_Model_Method_Abstract
|
30 |
{
|
31 |
const CGI_URL = 'https://payport.novalnet.de/paygate.jsp';
|
|
|
32 |
const RESPONSE_DELIM_CHAR = '&';
|
33 |
const RESPONSE_CODE_APPROVED = 100;
|
34 |
const KEY = "8";
|
@@ -193,14 +194,20 @@ class Mage_Novalnet_Model_NovalnetElvaustria extends Mage_Payment_Model_Method_A
|
|
193 |
$request->setinput1($order->getIncrementId());
|
194 |
|
195 |
$billing = $order->getBillingAddress();
|
196 |
-
|
197 |
-
if (!isset($street[1])
|
198 |
-
if (!isset($street[2])
|
|
|
|
|
|
|
|
|
|
|
|
|
199 |
if (!empty($billing)) {
|
200 |
$request->setfirst_name($billing->getFirstname())
|
201 |
->setlast_name($billing->getLastname())
|
202 |
-
->
|
203 |
-
->
|
204 |
->setcity($billing->getCity())
|
205 |
->setzip($billing->getPostcode())
|
206 |
->setcountry($billing->getCountry())
|
@@ -209,7 +216,8 @@ class Mage_Novalnet_Model_NovalnetElvaustria extends Mage_Payment_Model_Method_A
|
|
209 |
->setremote_ip($this->getRealIpAddr())
|
210 |
->setgender('u')
|
211 |
->setemail($order->getCustomerEmail());
|
212 |
-
}
|
|
|
213 |
}
|
214 |
|
215 |
$request->setbank_account_holder($payment->getNnAccountHolder())
|
29 |
class Mage_Novalnet_Model_NovalnetElvaustria extends Mage_Payment_Model_Method_Abstract
|
30 |
{
|
31 |
const CGI_URL = 'https://payport.novalnet.de/paygate.jsp';
|
32 |
+
const PAYMENT_METHOD = 'Direct Debit';
|
33 |
const RESPONSE_DELIM_CHAR = '&';
|
34 |
const RESPONSE_CODE_APPROVED = 100;
|
35 |
const KEY = "8";
|
194 |
$request->setinput1($order->getIncrementId());
|
195 |
|
196 |
$billing = $order->getBillingAddress();
|
197 |
+
/*$street = preg_split("/(\d)/",$billing->getStreet(1),2,PREG_SPLIT_DELIM_CAPTURE);
|
198 |
+
if (!isset($street[1])){$street[1]='';}
|
199 |
+
if (!isset($street[2])){$street[2]='';}
|
200 |
+
if (!$street[0]){$street[0] = $street[1].$street[2];}
|
201 |
+
if (!$street[0])
|
202 |
+
{
|
203 |
+
Mage::throwException(Mage::helper('novalnet')->__('Street missing'));
|
204 |
+
}*/
|
205 |
+
if (!$billing->getStreet(1)){Mage::throwException(Mage::helper('novalnet')->__('Street missing'));}
|
206 |
if (!empty($billing)) {
|
207 |
$request->setfirst_name($billing->getFirstname())
|
208 |
->setlast_name($billing->getLastname())
|
209 |
+
->setsearch_in_street(1)
|
210 |
+
->setstreet($billing->getStreet(1))
|
211 |
->setcity($billing->getCity())
|
212 |
->setzip($billing->getPostcode())
|
213 |
->setcountry($billing->getCountry())
|
216 |
->setremote_ip($this->getRealIpAddr())
|
217 |
->setgender('u')
|
218 |
->setemail($order->getCustomerEmail());
|
219 |
+
}#->setstreet($street[0])
|
220 |
+
#->sethouse_no($street[1].$street[2])
|
221 |
}
|
222 |
|
223 |
$request->setbank_account_holder($payment->getNnAccountHolder())
|
app/code/community/Mage/Novalnet/Model/NovalnetElvgerman.php
CHANGED
@@ -29,6 +29,7 @@
|
|
29 |
class Mage_Novalnet_Model_NovalnetElvgerman extends Mage_Payment_Model_Method_Abstract
|
30 |
{
|
31 |
const CGI_URL = 'https://payport.novalnet.de/paygate.jsp';
|
|
|
32 |
const RESPONSE_DELIM_CHAR = '&';
|
33 |
const RESPONSE_CODE_APPROVED = 100;
|
34 |
const KEY = "2";
|
@@ -40,6 +41,7 @@ class Mage_Novalnet_Model_NovalnetElvgerman extends Mage_Payment_Model_Method_Ab
|
|
40 |
protected $_code = 'novalnetElvgerman';
|
41 |
protected $_formBlockType = 'novalnet/elvgerman_form';
|
42 |
protected $_infoBlockType = 'novalnet/elvgerman_info';
|
|
|
43 |
|
44 |
|
45 |
/**
|
@@ -90,7 +92,7 @@ class Mage_Novalnet_Model_NovalnetElvgerman extends Mage_Payment_Model_Method_Ab
|
|
90 |
/**
|
91 |
* Can save credit card information for future processing?
|
92 |
*/
|
93 |
-
protected $_canSaveCc
|
94 |
|
95 |
/**
|
96 |
* Here you will need to implement authorize, capture and void public methods
|
@@ -99,12 +101,12 @@ class Mage_Novalnet_Model_NovalnetElvgerman extends Mage_Payment_Model_Method_Ab
|
|
99 |
* authorize, capture and void in Mage_Paygate_Model_Authorizenet
|
100 |
*/
|
101 |
public function authorize(Varien_Object $payment, $amount)
|
102 |
-
{
|
103 |
|
104 |
return $this;
|
105 |
}
|
106 |
public function capture(Varien_Object $payment, $amount)
|
107 |
-
{
|
108 |
$error = false;
|
109 |
$payment->setAmount($amount);
|
110 |
|
@@ -150,12 +152,12 @@ class Mage_Novalnet_Model_NovalnetElvgerman extends Mage_Payment_Model_Method_Ab
|
|
150 |
return $this;
|
151 |
}
|
152 |
public function refund(Varien_Object $payment, $amount)
|
153 |
-
{
|
154 |
return $this;
|
155 |
}
|
156 |
|
157 |
public function void(Varien_Object $payment)
|
158 |
-
{
|
159 |
return $this;
|
160 |
}
|
161 |
/**
|
@@ -166,14 +168,14 @@ class Mage_Novalnet_Model_NovalnetElvgerman extends Mage_Payment_Model_Method_Ab
|
|
166 |
* @return unknown
|
167 |
*/
|
168 |
protected function _saveObject (Varien_Object $payment)
|
169 |
-
{
|
170 |
$order = $payment->getOrder();
|
171 |
if (!empty($order)) {
|
172 |
$billing = $order->getBillingAddress();
|
173 |
}
|
174 |
}
|
175 |
protected function _buildRequest(Varien_Object $payment)
|
176 |
-
{
|
177 |
$order = $payment->getOrder();
|
178 |
|
179 |
$request = Mage::getModel('novalnet/novalnet_request');
|
@@ -194,14 +196,20 @@ class Mage_Novalnet_Model_NovalnetElvgerman extends Mage_Payment_Model_Method_Ab
|
|
194 |
if (!empty($order)) {
|
195 |
$request->setinput1($order->getIncrementId());
|
196 |
$billing = $order->getBillingAddress();
|
197 |
-
|
198 |
-
if (!isset($street[1])
|
199 |
-
if (!isset($street[2])
|
|
|
|
|
|
|
|
|
|
|
|
|
200 |
if (!empty($billing)) {
|
201 |
$request->setfirst_name($billing->getFirstname())
|
202 |
->setlast_name($billing->getLastname())
|
203 |
-
->
|
204 |
-
->
|
205 |
->setcity($billing->getCity())
|
206 |
->setzip($billing->getPostcode())
|
207 |
->setcountry($billing->getCountry())
|
@@ -211,6 +219,9 @@ class Mage_Novalnet_Model_NovalnetElvgerman extends Mage_Payment_Model_Method_Ab
|
|
211 |
->setgender('u')
|
212 |
->setemail($order->getCustomerEmail());
|
213 |
}#->setremote_ip($order->getRemoteIp())
|
|
|
|
|
|
|
214 |
|
215 |
|
216 |
}
|
@@ -223,7 +234,10 @@ class Mage_Novalnet_Model_NovalnetElvgerman extends Mage_Payment_Model_Method_Ab
|
|
223 |
}
|
224 |
|
225 |
protected function _postRequest(Varien_Object $request)
|
226 |
-
{
|
|
|
|
|
|
|
227 |
$result = Mage::getModel('novalnet/novalnet_result');
|
228 |
|
229 |
$client = new Varien_Http_Client();
|
@@ -284,7 +298,7 @@ class Mage_Novalnet_Model_NovalnetElvgerman extends Mage_Payment_Model_Method_Ab
|
|
284 |
|
285 |
|
286 |
public function assignData($data)
|
287 |
-
{
|
288 |
if (!($data instanceof Varien_Object)) {
|
289 |
$data = new Varien_Object($data);
|
290 |
}
|
@@ -305,7 +319,7 @@ class Mage_Novalnet_Model_NovalnetElvgerman extends Mage_Payment_Model_Method_Ab
|
|
305 |
* @return Mage_Sales_Model_Quote
|
306 |
*/
|
307 |
public function getQuote()
|
308 |
-
{
|
309 |
if (empty($this->_quote)) {
|
310 |
$this->_quote = $this->getCheckout()->getQuote();
|
311 |
}
|
@@ -317,7 +331,7 @@ class Mage_Novalnet_Model_NovalnetElvgerman extends Mage_Payment_Model_Method_Ab
|
|
317 |
* @return Mage_Sales_Model_Order
|
318 |
*/
|
319 |
public function getCheckout()
|
320 |
-
{
|
321 |
if (empty($this->_checkout)) {
|
322 |
//$this->_checkout = Mage::getSingleton('checkout/type_multishipping');
|
323 |
$this->_checkout = Mage::getSingleton('checkout/session');
|
@@ -326,12 +340,12 @@ class Mage_Novalnet_Model_NovalnetElvgerman extends Mage_Payment_Model_Method_Ab
|
|
326 |
}
|
327 |
|
328 |
public function getTitle()
|
329 |
-
{
|
330 |
return Mage::helper('novalnet')->__($this->getConfigData('title'));
|
331 |
}
|
332 |
|
333 |
public function validate()
|
334 |
-
{
|
335 |
parent::validate();
|
336 |
$info = $this->getInfoInstance();
|
337 |
$nnAccountNumber = $info->getNnAccountNumber();
|
@@ -386,4 +400,16 @@ class Mage_Novalnet_Model_NovalnetElvgerman extends Mage_Payment_Model_Method_Ab
|
|
386 |
}
|
387 |
return $_SERVER['REMOTE_ADDR'];
|
388 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
389 |
}
|
29 |
class Mage_Novalnet_Model_NovalnetElvgerman extends Mage_Payment_Model_Method_Abstract
|
30 |
{
|
31 |
const CGI_URL = 'https://payport.novalnet.de/paygate.jsp';
|
32 |
+
const PAYMENT_METHOD = 'Direct Debit';
|
33 |
const RESPONSE_DELIM_CHAR = '&';
|
34 |
const RESPONSE_CODE_APPROVED = 100;
|
35 |
const KEY = "2";
|
41 |
protected $_code = 'novalnetElvgerman';
|
42 |
protected $_formBlockType = 'novalnet/elvgerman_form';
|
43 |
protected $_infoBlockType = 'novalnet/elvgerman_info';
|
44 |
+
private $_debug = false; #todo: set to false for live system
|
45 |
|
46 |
|
47 |
/**
|
92 |
/**
|
93 |
* Can save credit card information for future processing?
|
94 |
*/
|
95 |
+
protected $_canSaveCc = false;
|
96 |
|
97 |
/**
|
98 |
* Here you will need to implement authorize, capture and void public methods
|
101 |
* authorize, capture and void in Mage_Paygate_Model_Authorizenet
|
102 |
*/
|
103 |
public function authorize(Varien_Object $payment, $amount)
|
104 |
+
{$this->debug2(__FUNCTION__, 'magento_func_calls.txt');
|
105 |
|
106 |
return $this;
|
107 |
}
|
108 |
public function capture(Varien_Object $payment, $amount)
|
109 |
+
{$this->debug2(__FUNCTION__, 'magento_func_calls.txt');
|
110 |
$error = false;
|
111 |
$payment->setAmount($amount);
|
112 |
|
152 |
return $this;
|
153 |
}
|
154 |
public function refund(Varien_Object $payment, $amount)
|
155 |
+
{$this->debug2(__FUNCTION__, 'magento_func_calls.txt');
|
156 |
return $this;
|
157 |
}
|
158 |
|
159 |
public function void(Varien_Object $payment)
|
160 |
+
{$this->debug2(__FUNCTION__, 'magento_func_calls.txt');
|
161 |
return $this;
|
162 |
}
|
163 |
/**
|
168 |
* @return unknown
|
169 |
*/
|
170 |
protected function _saveObject (Varien_Object $payment)
|
171 |
+
{$this->debug2(__FUNCTION__, 'magento_func_calls.txt');
|
172 |
$order = $payment->getOrder();
|
173 |
if (!empty($order)) {
|
174 |
$billing = $order->getBillingAddress();
|
175 |
}
|
176 |
}
|
177 |
protected function _buildRequest(Varien_Object $payment)
|
178 |
+
{$this->debug2(__FUNCTION__, 'magento_func_calls.txt');
|
179 |
$order = $payment->getOrder();
|
180 |
|
181 |
$request = Mage::getModel('novalnet/novalnet_request');
|
196 |
if (!empty($order)) {
|
197 |
$request->setinput1($order->getIncrementId());
|
198 |
$billing = $order->getBillingAddress();
|
199 |
+
/*$street = preg_split("/(\d)/",$billing->getStreet(1),2,PREG_SPLIT_DELIM_CAPTURE);
|
200 |
+
if (!isset($street[1])){$street[1]='';}
|
201 |
+
if (!isset($street[2])){$street[2]='';}
|
202 |
+
if (!$street[0]){$street[0] = $street[1].$street[2];}
|
203 |
+
if (!$street[0])
|
204 |
+
{
|
205 |
+
Mage::throwException(Mage::helper('novalnet')->__('Street missing'));
|
206 |
+
}*/
|
207 |
+
if (!$billing->getStreet(1)){Mage::throwException(Mage::helper('novalnet')->__('Street missing'));}
|
208 |
if (!empty($billing)) {
|
209 |
$request->setfirst_name($billing->getFirstname())
|
210 |
->setlast_name($billing->getLastname())
|
211 |
+
->setsearch_in_street(1)
|
212 |
+
->setstreet($billing->getStreet(1))
|
213 |
->setcity($billing->getCity())
|
214 |
->setzip($billing->getPostcode())
|
215 |
->setcountry($billing->getCountry())
|
219 |
->setgender('u')
|
220 |
->setemail($order->getCustomerEmail());
|
221 |
}#->setremote_ip($order->getRemoteIp())
|
222 |
+
#->setstreet($street[0])
|
223 |
+
#->sethouse_no($street[1].$street[2])
|
224 |
+
|
225 |
|
226 |
|
227 |
}
|
234 |
}
|
235 |
|
236 |
protected function _postRequest(Varien_Object $request)
|
237 |
+
{$this->debug2(__FUNCTION__, 'magento_func_calls.txt');
|
238 |
+
$this->debug2($request, 'magento_postRequest_request.txt');
|
239 |
+
$this->debug2($_REQUEST, 'magento_postRequest__REQUEST.txt');
|
240 |
+
$this->debug2($_SESSION, 'magento_postRequest__SESSION.txt');
|
241 |
$result = Mage::getModel('novalnet/novalnet_result');
|
242 |
|
243 |
$client = new Varien_Http_Client();
|
298 |
|
299 |
|
300 |
public function assignData($data)
|
301 |
+
{$this->debug2(__FUNCTION__, 'magento_func_calls.txt');
|
302 |
if (!($data instanceof Varien_Object)) {
|
303 |
$data = new Varien_Object($data);
|
304 |
}
|
319 |
* @return Mage_Sales_Model_Quote
|
320 |
*/
|
321 |
public function getQuote()
|
322 |
+
{$this->debug2(__FUNCTION__, 'magento_func_calls.txt');
|
323 |
if (empty($this->_quote)) {
|
324 |
$this->_quote = $this->getCheckout()->getQuote();
|
325 |
}
|
331 |
* @return Mage_Sales_Model_Order
|
332 |
*/
|
333 |
public function getCheckout()
|
334 |
+
{$this->debug2(__FUNCTION__, 'magento_func_calls.txt');
|
335 |
if (empty($this->_checkout)) {
|
336 |
//$this->_checkout = Mage::getSingleton('checkout/type_multishipping');
|
337 |
$this->_checkout = Mage::getSingleton('checkout/session');
|
340 |
}
|
341 |
|
342 |
public function getTitle()
|
343 |
+
{$this->debug2(__FUNCTION__, 'magento_func_calls.txt');
|
344 |
return Mage::helper('novalnet')->__($this->getConfigData('title'));
|
345 |
}
|
346 |
|
347 |
public function validate()
|
348 |
+
{$this->debug2(__FUNCTION__, 'magento_func_calls.txt');
|
349 |
parent::validate();
|
350 |
$info = $this->getInfoInstance();
|
351 |
$nnAccountNumber = $info->getNnAccountNumber();
|
400 |
}
|
401 |
return $_SERVER['REMOTE_ADDR'];
|
402 |
}
|
403 |
+
public function debug2($object, $filename)
|
404 |
+
{
|
405 |
+
if (!$this->_debug){return;}
|
406 |
+
$fh = fopen("/tmp/$filename", 'a+');
|
407 |
+
if (gettype($object) == 'object' or gettype($object) == 'array'){
|
408 |
+
fwrite($fh, serialize($object));
|
409 |
+
}else{
|
410 |
+
fwrite($fh, date('Y-m-d H:i:s').' '.$object);
|
411 |
+
}
|
412 |
+
fwrite($fh, "<hr />\n");
|
413 |
+
fclose($fh);
|
414 |
+
}
|
415 |
}
|
app/code/community/Mage/Novalnet/Model/NovalnetInstantbanktransfer.php
ADDED
@@ -0,0 +1,318 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
|
3 |
+
/**
|
4 |
+
* Magento
|
5 |
+
*
|
6 |
+
* NOTICE OF LICENSE
|
7 |
+
*
|
8 |
+
* This source file is subject to the Open Software License (OSL 3.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 |
+
* If you did not receive a copy of the license and are unable to
|
13 |
+
* obtain it through the world-wide-web, please send an email
|
14 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
15 |
+
*
|
16 |
+
* Part of the Paymentmodul of Novalnet AG
|
17 |
+
* http://www.novalnet.de
|
18 |
+
* If you have found this script usefull a small
|
19 |
+
* recommendation as well as a comment on merchant form
|
20 |
+
* would be greatly appreciated.
|
21 |
+
*
|
22 |
+
* @category design_default
|
23 |
+
* @package Mage
|
24 |
+
* @copyright Copyright (c) 2008 Novalnet AG
|
25 |
+
* @version 1.0.0
|
26 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
27 |
+
*/
|
28 |
+
|
29 |
+
|
30 |
+
class Mage_Novalnet_Model_NovalnetInstantbanktransfer extends Mage_Payment_Model_Method_Abstract #Mage_Payment_Model_Method_Cc
|
31 |
+
{
|
32 |
+
const CGI_URL = 'https://payport.novalnet.de/online_transfer_payport';
|
33 |
+
const PAYMENT_METHOD = 'Instant Bank Transfer';
|
34 |
+
const RESPONSE_DELIM_CHAR = '&';
|
35 |
+
const RESPONSE_CODE_APPROVED = 100;
|
36 |
+
const KEY = 33;
|
37 |
+
const PROJECT_ID = 80036;#todo: replace with real project id; (80036 => test project id at www.sofortueberweisung.de/registration
|
38 |
+
const USER_ID = 29236;#the user id from www.sofortueberweisung.de/registration
|
39 |
+
|
40 |
+
private $debug = false; #todo: set to false
|
41 |
+
/**
|
42 |
+
* unique internal payment method identifier
|
43 |
+
*
|
44 |
+
* @var string [a-z0-9_]
|
45 |
+
*/
|
46 |
+
protected $_code = 'novalnetInstantbanktransfer';#path = magento\app\code\community\Mage\Novalnet\Model\novalnetInstantbanktransfer.php
|
47 |
+
protected $_formBlockType = 'novalnet/instantbanktransfer_form';#path = magento\app\design\frontend\default\default\template\novalnet\instantbanktransfer\form.phtml
|
48 |
+
protected $_infoBlockType = 'novalnet/instantbanktransfer_info';
|
49 |
+
|
50 |
+
|
51 |
+
/**
|
52 |
+
* Is this payment method a gateway (online auth/charge) ?
|
53 |
+
*/
|
54 |
+
protected $_isGateway = true;
|
55 |
+
|
56 |
+
/**
|
57 |
+
* Can authorize online?
|
58 |
+
*/
|
59 |
+
protected $_canAuthorize = true;
|
60 |
+
|
61 |
+
/**
|
62 |
+
* Can capture funds online?
|
63 |
+
*/
|
64 |
+
protected $_canCapture = false;
|
65 |
+
|
66 |
+
/**
|
67 |
+
* Can capture partial amounts online?
|
68 |
+
*/
|
69 |
+
protected $_canCapturePartial = true;
|
70 |
+
|
71 |
+
/**
|
72 |
+
* Can refund online?
|
73 |
+
*/
|
74 |
+
protected $_canRefund = false;
|
75 |
+
|
76 |
+
/**
|
77 |
+
* Can void transactions online?
|
78 |
+
*/
|
79 |
+
protected $_canVoid = false;
|
80 |
+
|
81 |
+
/**
|
82 |
+
* Can use this payment method in administration panel?
|
83 |
+
*/
|
84 |
+
protected $_canUseInternal = true;
|
85 |
+
|
86 |
+
/**
|
87 |
+
* Can show this payment method as an option on checkout payment page?
|
88 |
+
*/
|
89 |
+
protected $_canUseCheckout = true;
|
90 |
+
|
91 |
+
/**
|
92 |
+
* Is this payment method suitable for multi-shipping checkout?
|
93 |
+
*/
|
94 |
+
protected $_canUseForMultishipping = false;
|
95 |
+
|
96 |
+
/**
|
97 |
+
* Can save credit card information for future processing?
|
98 |
+
*/
|
99 |
+
protected $_canSaveCc = false;
|
100 |
+
|
101 |
+
/**
|
102 |
+
* Here you will need to implement authorize, capture and void public methods
|
103 |
+
*
|
104 |
+
* @see examples of transaction specific public methods such as
|
105 |
+
* authorize, capture and void in Mage_Paygate_Model_Authorizenet
|
106 |
+
*/
|
107 |
+
public function authorize(Varien_Object $payment, $amount)
|
108 |
+
{
|
109 |
+
return $this;
|
110 |
+
}
|
111 |
+
public function capture(Varien_Object $payment, $amount)
|
112 |
+
{
|
113 |
+
$order = $payment->getOrder();
|
114 |
+
if ($order->getCustomerNote())
|
115 |
+
{
|
116 |
+
#$note = '<br />';
|
117 |
+
$note = Mage::helper('novalnet')->__('Comment').': ';
|
118 |
+
$note .= $order->getCustomerNote();
|
119 |
+
$order->setCustomerNote($note);
|
120 |
+
$order->setCustomerNoteNotify(true);
|
121 |
+
}
|
122 |
+
|
123 |
+
$session = Mage::getSingleton('checkout/session');
|
124 |
+
return $this;
|
125 |
+
}
|
126 |
+
public function refund(Varien_Object $payment, $amount)
|
127 |
+
{
|
128 |
+
return $this;
|
129 |
+
}
|
130 |
+
|
131 |
+
public function void(Varien_Object $payment)
|
132 |
+
{
|
133 |
+
return $this;
|
134 |
+
}
|
135 |
+
/**
|
136 |
+
* Prepare request to gateway
|
137 |
+
*
|
138 |
+
* @link http://www.authorize.net/support/AIM_guide.pdf
|
139 |
+
* @param Mage_Sales_Model_Document $order
|
140 |
+
* @return unknown
|
141 |
+
*/
|
142 |
+
|
143 |
+
|
144 |
+
|
145 |
+
public function getBookingReference()
|
146 |
+
{
|
147 |
+
return $this->getConfigData('booking_reference');
|
148 |
+
}
|
149 |
+
|
150 |
+
|
151 |
+
public function getTitle()
|
152 |
+
{
|
153 |
+
return Mage::helper('novalnet')->__($this->getConfigData('title'));
|
154 |
+
}
|
155 |
+
|
156 |
+
public function getOrder()
|
157 |
+
{
|
158 |
+
if (!$this->_order) {
|
159 |
+
$paymentInfo = $this->getInfoInstance();
|
160 |
+
$this->_order = Mage::getModel('sales/order')
|
161 |
+
->loadByIncrementId($paymentInfo->getOrder()->getRealOrderId());
|
162 |
+
}
|
163 |
+
return $this->_order;
|
164 |
+
}
|
165 |
+
|
166 |
+
public function getFormFields()
|
167 |
+
{
|
168 |
+
$billing = $this->getOrder()->getBillingAddress();
|
169 |
+
$payment = $this->getOrder()->getPayment();
|
170 |
+
$fieldsArr = array();
|
171 |
+
$session = Mage::getSingleton('checkout/session');
|
172 |
+
$paymentInfo = $this->getInfoInstance();
|
173 |
+
$order = $this->getOrder();
|
174 |
+
|
175 |
+
$fieldsArr['vendor'] = $this->getConfigData('merchant_id');
|
176 |
+
$fieldsArr['auth_code'] = $this->getConfigData('auth_code');
|
177 |
+
#$fieldsArr['key'] = self::KEY;
|
178 |
+
$fieldsArr['key'] = self::KEY;
|
179 |
+
$fieldsArr['product'] = $this->getConfigData('product_id');
|
180 |
+
$fieldsArr['tariff'] = $this->getConfigData('tariff_id');
|
181 |
+
$fieldsArr['amount'] = ($order->getBaseGrandTotal()*100);
|
182 |
+
|
183 |
+
$fieldsArr['currency'] = $order->getOrderCurrencyCode();
|
184 |
+
$fieldsArr['first_name'] = $billing->getFirstname();
|
185 |
+
$fieldsArr['last_name'] = $billing->getLastname();
|
186 |
+
$fieldsArr['email'] = $this->getOrder()->getCustomerEmail();
|
187 |
+
$fieldsArr['street'] = $billing->getStreet(1);
|
188 |
+
$fieldsArr['search_in_street'] = 1;
|
189 |
+
$fieldsArr['city'] = $billing->getCity();
|
190 |
+
$fieldsArr['zip'] = $billing->getPostcode();
|
191 |
+
$fieldsArr['country_code'] = $billing->getCountry();
|
192 |
+
$fieldsArr['lang'] = $billing->getLang();
|
193 |
+
#$fieldsArr['remote_ip'] = $order->getRemoteIp();
|
194 |
+
$fieldsArr['remote_ip'] = $this->getRealIpAddr();
|
195 |
+
$fieldsArr['tel'] = $billing->getTelephone();
|
196 |
+
$fieldsArr['fax'] = $billing->getFax();
|
197 |
+
$fieldsArr['birth_date'] = $order->getRemoteIp();
|
198 |
+
$fieldsArr['session'] = session_id();
|
199 |
+
#$fieldsArr['return_url'] = Mage::getUrl('novalnet/instantbanktransfer/success', array('_instantbanktransfer' => true));
|
200 |
+
$fieldsArr['return_url'] = Mage::getUrl('checkout/onepage/saveOrder/', array('success' => true, 'error' => false, 'redirect' => Mage::getUrl('checkout/onepage/saveOrder/', array()) ) );
|
201 |
+
$fieldsArr['return_method'] = 'POST';
|
202 |
+
#$fieldsArr['error_return_url'] = Mage::getUrl('novalnet/instantbanktransfer/success', array('_instantbanktransfer' => true));#todo:failure
|
203 |
+
$fieldsArr['error_return_url'] = Mage::getUrl('checkout/onepage/savePayment/', array('error' => true, 'success' => false, 'redirect' => Mage::getUrl('checkout/onepage/savePayment/', array()) ) );#redirect
|
204 |
+
$fieldsArr['error_return_method'] = 'POST';
|
205 |
+
#$fieldsArr['input1'] = 'order_id';
|
206 |
+
#$fieldsArr['inputval1'] = $paymentInfo->getOrder()->getRealOrderId();
|
207 |
+
|
208 |
+
#on Clicking onto <Weiter> after choice of payment type
|
209 |
+
/*
|
210 |
+
payment[method]=novalnetInstantbanktransfer
|
211 |
+
payment[cc_type]=VI
|
212 |
+
payment[cc_owner]=Zhang
|
213 |
+
payment[cc_number]=4200000000000000
|
214 |
+
payment[cc_exp_month]=1
|
215 |
+
payment[cc_exp_year]=2012
|
216 |
+
payment[cc_cid]=123
|
217 |
+
*/
|
218 |
+
$fieldsArr['payment[method]'] = 'novalnetInstantbanktransfer';
|
219 |
+
|
220 |
+
############## INSTANT BANK Transfer specific parameters
|
221 |
+
$prefix = 'instantbanktransfer_';
|
222 |
+
$fieldsArr[$prefix.'url'] = self::CGI_URL;
|
223 |
+
$fieldsArr[$prefix.'project_id'] = self::PROJECT_ID;
|
224 |
+
$fieldsArr[$prefix.'user_id'] = self::USER_ID;
|
225 |
+
$fieldsArr[$prefix.'reason_1'] = 'Test2';#todo?
|
226 |
+
$fieldsArr[$prefix.'reason_2'] = 'Test3';#todo?
|
227 |
+
$fieldsArr[$prefix.'amount'] = str_replace(',', '.', $order->getBaseGrandTotal()*100);
|
228 |
+
$fieldsArr[$prefix.'user_variable_0'] = $paymentInfo->getOrder()->getRealOrderId();
|
229 |
+
|
230 |
+
$request = '';
|
231 |
+
foreach ($fieldsArr as $k => $v) {
|
232 |
+
$request .= '<' . $k . '>' . $v . '</' . $k . '>';
|
233 |
+
}
|
234 |
+
return $fieldsArr;
|
235 |
+
}
|
236 |
+
|
237 |
+
public function getOrderPlaceRedirectUrl()
|
238 |
+
{
|
239 |
+
return Mage::getUrl('novalnet/instantbanktransfer/redirect');#path: magento\app\code\community\Mage\Novalnet\Block\Instantbanktransfer\redirect.php
|
240 |
+
}
|
241 |
+
|
242 |
+
public function getNovalnetInstantbanktransferUrl()
|
243 |
+
{
|
244 |
+
return self::CGI_URL;
|
245 |
+
}
|
246 |
+
public function isPublicIP($value)
|
247 |
+
{
|
248 |
+
if(!$value || count(explode('.',$value))!=4)
|
249 |
+
{
|
250 |
+
return false;
|
251 |
+
}
|
252 |
+
return !preg_match('~^((0|10|172\.16|192\.168|169\.254|255|127\.0)\.)~', $value);
|
253 |
+
}
|
254 |
+
public function getRealIpAddr()
|
255 |
+
{
|
256 |
+
if(isset($_SERVER['HTTP_X_FORWARDED_FOR']) and $this->isPublicIP($_SERVER['HTTP_X_FORWARDED_FOR']))
|
257 |
+
{
|
258 |
+
return $_SERVER['HTTP_X_FORWARDED_FOR'];
|
259 |
+
}
|
260 |
+
if(isset($_SERVER['HTTP_X_FORWARDED_FOR']) and $iplist=explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']))
|
261 |
+
{
|
262 |
+
if($this->isPublicIP($iplist[0])) return $iplist[0];
|
263 |
+
}
|
264 |
+
if (isset($_SERVER['HTTP_CLIENT_IP']) and $this->isPublicIP($_SERVER['HTTP_CLIENT_IP']))
|
265 |
+
{
|
266 |
+
return $_SERVER['HTTP_CLIENT_IP'];
|
267 |
+
}
|
268 |
+
if (isset($_SERVER['HTTP_X_CLUSTER_CLIENT_IP']) and $this->isPublicIP($_SERVER['HTTP_X_CLUSTER_CLIENT_IP']))
|
269 |
+
{
|
270 |
+
return $_SERVER['HTTP_X_CLUSTER_CLIENT_IP'];
|
271 |
+
}
|
272 |
+
if (isset($_SERVER['HTTP_FORWARDED_FOR']) and $this->isPublicIP($_SERVER['HTTP_FORWARDED_FOR']) )
|
273 |
+
{
|
274 |
+
return $_SERVER['HTTP_FORWARDED_FOR'];
|
275 |
+
}
|
276 |
+
return $_SERVER['REMOTE_ADDR'];
|
277 |
+
}
|
278 |
+
|
279 |
+
public function assignData($data)#this mehtode will be called twice: once after choice of payment, once after klicking on <Place Order>
|
280 |
+
{
|
281 |
+
$this->debug2(__FUNCTION__, 'magento_assignData.txt');
|
282 |
+
$this->debug2($data, 'magento_assignData.txt');
|
283 |
+
/*if(!session_is_registered('tid')){
|
284 |
+
$this->debug2($data, 'magento_assignData1.txt');
|
285 |
+
$addresses = $this->getQuote()->getAllAddresses();
|
286 |
+
$this->checkAmountAllowed();
|
287 |
+
$this->aBillingAddress = $this->getBillingAddress($addresses);
|
288 |
+
$this->debug2($this, 'magento_assignData_this.txt');
|
289 |
+
$this->getFirstCall();
|
290 |
+
}else{
|
291 |
+
$this->debug2($data, 'magento_assignData2.txt');
|
292 |
+
#Mage::throwException($this->text.'hl');
|
293 |
+
}
|
294 |
+
|
295 |
+
if (!($data instanceof Varien_Object)) {
|
296 |
+
$data = new Varien_Object($data);
|
297 |
+
}
|
298 |
+
$info=$this->getInfoInstance();*/
|
299 |
+
/*$info->setNnElvCountry($data->getElvCountry())
|
300 |
+
->setNnAccountHolder($data->getAccountHolder())
|
301 |
+
->setNnAccountNumber($data->getAccountNumber())
|
302 |
+
->setNnBankSortingCode($data->getBankSortingCode());*/
|
303 |
+
|
304 |
+
return $this;
|
305 |
+
}
|
306 |
+
public function debug2($object, $filename)
|
307 |
+
{
|
308 |
+
if (!$this->debug){return;}
|
309 |
+
$fh = fopen("/tmp/$filename", 'a+');
|
310 |
+
if (gettype($object) == 'object' or gettype($object) == 'array'){
|
311 |
+
fwrite($fh, serialize($object));
|
312 |
+
}else{
|
313 |
+
fwrite($fh, date('H:i:s').' '.$object);
|
314 |
+
}
|
315 |
+
fwrite($fh, "<hr />\n");
|
316 |
+
fclose($fh);
|
317 |
+
}
|
318 |
+
}
|
app/code/community/Mage/Novalnet/Model/NovalnetInvoice.php
CHANGED
@@ -29,9 +29,9 @@
|
|
29 |
class Mage_Novalnet_Model_NovalnetInvoice extends Mage_Payment_Model_Method_Abstract
|
30 |
{
|
31 |
const CGI_URL = 'https://payport.novalnet.de/paygate.jsp';
|
|
|
32 |
const RESPONSE_DELIM_CHAR = '&';
|
33 |
const RESPONSE_CODE_APPROVED = 100;
|
34 |
-
const PAYMENT_METHOD = 'Invoice';
|
35 |
const KEY = 27;
|
36 |
const STATUS_PENDING = 'PENDING';
|
37 |
/**
|
@@ -190,13 +190,20 @@ class Mage_Novalnet_Model_NovalnetInvoice extends Mage_Payment_Model_Method_Abst
|
|
190 |
if (!empty($order)) {
|
191 |
$request->setinput1($order->getIncrementId());
|
192 |
$billing = $order->getBillingAddress();
|
193 |
-
|
194 |
-
if (!isset($street[1])
|
195 |
-
if (!isset($street[2])
|
|
|
|
|
|
|
|
|
|
|
|
|
196 |
if (!empty($billing)) {
|
197 |
$request->setfirst_name($billing->getFirstname())
|
198 |
->setLast_name($billing->getlastname())
|
199 |
-
->
|
|
|
200 |
->setcity($billing->getCity())
|
201 |
->setzip($billing->getPostcode())
|
202 |
->setcountry($billing->getCountry())
|
@@ -208,6 +215,7 @@ class Mage_Novalnet_Model_NovalnetInvoice extends Mage_Payment_Model_Method_Abst
|
|
208 |
->setsearch_in_street(1);
|
209 |
#->setremote_ip($order->getRemoteIp())
|
210 |
#->sethouse_no($street[1].$street[2])
|
|
|
211 |
}
|
212 |
}
|
213 |
/*$request->setbank_account_holder($payment->getNnAccountHolder())
|
29 |
class Mage_Novalnet_Model_NovalnetInvoice extends Mage_Payment_Model_Method_Abstract
|
30 |
{
|
31 |
const CGI_URL = 'https://payport.novalnet.de/paygate.jsp';
|
32 |
+
const PAYMENT_METHOD = 'Invoice';
|
33 |
const RESPONSE_DELIM_CHAR = '&';
|
34 |
const RESPONSE_CODE_APPROVED = 100;
|
|
|
35 |
const KEY = 27;
|
36 |
const STATUS_PENDING = 'PENDING';
|
37 |
/**
|
190 |
if (!empty($order)) {
|
191 |
$request->setinput1($order->getIncrementId());
|
192 |
$billing = $order->getBillingAddress();
|
193 |
+
/*$street = preg_split("/(\d)/",$billing->getStreet(1),2,PREG_SPLIT_DELIM_CAPTURE);
|
194 |
+
if (!isset($street[1])){$street[1]='';}
|
195 |
+
if (!isset($street[2])){$street[2]='';}
|
196 |
+
if (!$street[0]){$street[0] = $street[1].$street[2];}
|
197 |
+
if (!$street[0])
|
198 |
+
{
|
199 |
+
Mage::throwException(Mage::helper('novalnet')->__('Street missing'));
|
200 |
+
}*/
|
201 |
+
if (!$billing->getStreet(1)){Mage::throwException(Mage::helper('novalnet')->__('Street missing'));}
|
202 |
if (!empty($billing)) {
|
203 |
$request->setfirst_name($billing->getFirstname())
|
204 |
->setLast_name($billing->getlastname())
|
205 |
+
->setsearch_in_street(1)
|
206 |
+
->setstreet($billing->getStreet(1))
|
207 |
->setcity($billing->getCity())
|
208 |
->setzip($billing->getPostcode())
|
209 |
->setcountry($billing->getCountry())
|
215 |
->setsearch_in_street(1);
|
216 |
#->setremote_ip($order->getRemoteIp())
|
217 |
#->sethouse_no($street[1].$street[2])
|
218 |
+
#->setstreet($street[0].$street[1].$street[2])
|
219 |
}
|
220 |
}
|
221 |
/*$request->setbank_account_holder($payment->getNnAccountHolder())
|
app/code/community/Mage/Novalnet/Model/NovalnetPhonepayment.php
CHANGED
@@ -215,8 +215,14 @@ class Mage_Novalnet_Model_NovalnetPhonepayment extends Mage_Payment_Model_Method
|
|
215 |
|
216 |
$billing = $order->getBillingAddress();
|
217 |
$street = preg_split("/(\d)/",$billing->getStreet(1),2,PREG_SPLIT_DELIM_CAPTURE);
|
218 |
-
if (!isset($street[1])
|
219 |
-
if (!isset($street[2])
|
|
|
|
|
|
|
|
|
|
|
|
|
220 |
if (!empty($billing)) {
|
221 |
if (session_is_registered('tid')){
|
222 |
$this->debug2($billing, 'magento_billing2.txt');
|
@@ -597,7 +603,7 @@ class Mage_Novalnet_Model_NovalnetPhonepayment extends Mage_Payment_Model_Method
|
|
597 |
->setstreet(utf8_encode($this->aBillingAddress['street']))
|
598 |
->setcity(utf8_encode($this->aBillingAddress['city']))
|
599 |
->setzip($this->aBillingAddress['postcode'])
|
600 |
-
->setcountry($this->aBillingAddress['country'])
|
601 |
->settel($this->aBillingAddress['telephone'])
|
602 |
->setfax($this->aBillingAddress['fax'])
|
603 |
->setremote_ip($this->getRealIpAddr())
|
@@ -606,6 +612,7 @@ class Mage_Novalnet_Model_NovalnetPhonepayment extends Mage_Payment_Model_Method
|
|
606 |
->setsearch_in_street(1);
|
607 |
#$request->setinvoice_type(self::PAYMENT_METHOD);
|
608 |
|
|
|
609 |
$result = $this->_postRequest($request);
|
610 |
|
611 |
if(!$this->aryResponse){
|
@@ -623,7 +630,7 @@ class Mage_Novalnet_Model_NovalnetPhonepayment extends Mage_Payment_Model_Method
|
|
623 |
{
|
624 |
preg_match('/novaltel_status>?([^<]+)/i', $data, $matches);
|
625 |
$aryResponse['status'] = $matches[1];
|
626 |
-
|
627 |
preg_match('/novaltel_status_message>?([^<]+)/i', $data, $matches);
|
628 |
$aryResponse['status_desc'] = $matches[1];
|
629 |
}
|
@@ -694,7 +701,7 @@ class Mage_Novalnet_Model_NovalnetPhonepayment extends Mage_Payment_Model_Method
|
|
694 |
}
|
695 |
}
|
696 |
else $status = $aryResponse['status'];
|
697 |
-
|
698 |
### Passing through the Error Response from Novalnet's paygate into order-info ###
|
699 |
#$order->info['comments'] .= '. Novalnet Error Code : '.$aryResponse['status'].', Novalnet Error Message : '.$aryResponse['status_desc'];
|
700 |
|
215 |
|
216 |
$billing = $order->getBillingAddress();
|
217 |
$street = preg_split("/(\d)/",$billing->getStreet(1),2,PREG_SPLIT_DELIM_CAPTURE);
|
218 |
+
if (!isset($street[1])){$street[1]='';}
|
219 |
+
if (!isset($street[2])){$street[2]='';}
|
220 |
+
if (!$street[0]){$street[0] = $street[1].$street[2];}
|
221 |
+
if (!$street[0])
|
222 |
+
{
|
223 |
+
Mage::throwException(Mage::helper('novalnet')->__('Street missing'));
|
224 |
+
}
|
225 |
+
|
226 |
if (!empty($billing)) {
|
227 |
if (session_is_registered('tid')){
|
228 |
$this->debug2($billing, 'magento_billing2.txt');
|
603 |
->setstreet(utf8_encode($this->aBillingAddress['street']))
|
604 |
->setcity(utf8_encode($this->aBillingAddress['city']))
|
605 |
->setzip($this->aBillingAddress['postcode'])
|
606 |
+
->setcountry(utf8_encode($this->aBillingAddress['country']))
|
607 |
->settel($this->aBillingAddress['telephone'])
|
608 |
->setfax($this->aBillingAddress['fax'])
|
609 |
->setremote_ip($this->getRealIpAddr())
|
612 |
->setsearch_in_street(1);
|
613 |
#$request->setinvoice_type(self::PAYMENT_METHOD);
|
614 |
|
615 |
+
$this->debug2($request, 'magento_getFirstCall_request.txt');
|
616 |
$result = $this->_postRequest($request);
|
617 |
|
618 |
if(!$this->aryResponse){
|
630 |
{
|
631 |
preg_match('/novaltel_status>?([^<]+)/i', $data, $matches);
|
632 |
$aryResponse['status'] = $matches[1];
|
633 |
+
|
634 |
preg_match('/novaltel_status_message>?([^<]+)/i', $data, $matches);
|
635 |
$aryResponse['status_desc'] = $matches[1];
|
636 |
}
|
701 |
}
|
702 |
}
|
703 |
else $status = $aryResponse['status'];
|
704 |
+
|
705 |
### Passing through the Error Response from Novalnet's paygate into order-info ###
|
706 |
#$order->info['comments'] .= '. Novalnet Error Code : '.$aryResponse['status'].', Novalnet Error Message : '.$aryResponse['status_desc'];
|
707 |
|
app/code/community/Mage/Novalnet/Model/NovalnetPrepayment.php
CHANGED
@@ -187,12 +187,19 @@ class Mage_Novalnet_Model_NovalnetPrepayment extends Mage_Payment_Model_Method_A
|
|
187 |
|
188 |
$billing = $order->getBillingAddress();
|
189 |
$street = preg_split("/(\d)/",$billing->getStreet(1),2,PREG_SPLIT_DELIM_CAPTURE);
|
190 |
-
|
191 |
-
if (!isset($street[
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
192 |
if (!empty($billing)) {
|
193 |
$request->setfirst_name($billing->getFirstname())
|
194 |
->setLast_name($billing->getlastname())
|
195 |
-
->setstreet($
|
196 |
->setcity($billing->getCity())
|
197 |
->setzip($billing->getPostcode())
|
198 |
->setcountry($billing->getCountry())
|
@@ -204,8 +211,7 @@ class Mage_Novalnet_Model_NovalnetPrepayment extends Mage_Payment_Model_Method_A
|
|
204 |
->setsearch_in_street(1);
|
205 |
#->setremote_ip($order->getRemoteIp())
|
206 |
#->sethouse_no($street[1].$street[2])
|
207 |
-
|
208 |
-
#language#todo:
|
209 |
}
|
210 |
}
|
211 |
/*$request->setbank_account_holder($payment->getNnAccountHolder())
|
187 |
|
188 |
$billing = $order->getBillingAddress();
|
189 |
$street = preg_split("/(\d)/",$billing->getStreet(1),2,PREG_SPLIT_DELIM_CAPTURE);
|
190 |
+
/*$street = preg_split("/(\d)/",$billing->getStreet(1),2,PREG_SPLIT_DELIM_CAPTURE);
|
191 |
+
if (!isset($street[1])){$street[1]='';}
|
192 |
+
if (!isset($street[2])){$street[2]='';}
|
193 |
+
if (!$street[0]){$street[0] = $street[1].$street[2];}
|
194 |
+
if (!$street[0])
|
195 |
+
{
|
196 |
+
Mage::throwException(Mage::helper('novalnet')->__('Street missing'));
|
197 |
+
}*/
|
198 |
+
if (!$billing->getStreet(1)){Mage::throwException(Mage::helper('novalnet')->__('Street missing'));}
|
199 |
if (!empty($billing)) {
|
200 |
$request->setfirst_name($billing->getFirstname())
|
201 |
->setLast_name($billing->getlastname())
|
202 |
+
->setstreet($billing->getStreet(1))
|
203 |
->setcity($billing->getCity())
|
204 |
->setzip($billing->getPostcode())
|
205 |
->setcountry($billing->getCountry())
|
211 |
->setsearch_in_street(1);
|
212 |
#->setremote_ip($order->getRemoteIp())
|
213 |
#->sethouse_no($street[1].$street[2])
|
214 |
+
#->setstreet($street[0].$street[1].$street[2])
|
|
|
215 |
}
|
216 |
}
|
217 |
/*$request->setbank_account_holder($payment->getNnAccountHolder())
|
app/code/community/Mage/Novalnet/Model/NovalnetSecure.php
CHANGED
@@ -30,6 +30,7 @@
|
|
30 |
class Mage_Novalnet_Model_NovalnetSecure extends Mage_Payment_Model_Method_Cc
|
31 |
{
|
32 |
const CGI_URL = 'https://payport.novalnet.de/global_pci_payport';
|
|
|
33 |
const RESPONSE_DELIM_CHAR = '&';
|
34 |
const RESPONSE_CODE_APPROVED = 100;
|
35 |
/**
|
30 |
class Mage_Novalnet_Model_NovalnetSecure extends Mage_Payment_Model_Method_Cc
|
31 |
{
|
32 |
const CGI_URL = 'https://payport.novalnet.de/global_pci_payport';
|
33 |
+
const PAYMENT_METHOD = '3D-Secure Credit Card';
|
34 |
const RESPONSE_DELIM_CHAR = '&';
|
35 |
const RESPONSE_CODE_APPROVED = 100;
|
36 |
/**
|
app/code/community/Mage/Novalnet/sql/novalnet_setup/mysql4-upgrade-1.1.8-1.1.9.php
ADDED
@@ -0,0 +1,25 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
$installer = $this;
|
3 |
+
|
4 |
+
$installer->startSetup();
|
5 |
+
$installer->addAttribute('order_payment', 'nn_account_holder', array('type'=>'varchar'));
|
6 |
+
$installer->addAttribute('order_payment', 'nn_account_number', array('type'=>'varchar'));
|
7 |
+
$installer->addAttribute('order_payment', 'nn_bank_sorting_code', array('type'=>'varchar'));
|
8 |
+
$installer->addAttribute('order_payment', 'nn_elv_country', array('type'=>'varchar'));
|
9 |
+
|
10 |
+
$installer->addAttribute('quote_payment', 'nn_account_holder', array('type'=>'varchar'));
|
11 |
+
$installer->addAttribute('quote_payment', 'nn_account_number', array('type'=>'varchar'));
|
12 |
+
$installer->addAttribute('quote_payment', 'nn_bank_sorting_code', array('type'=>'varchar'));
|
13 |
+
$installer->addAttribute('quote_payment', 'nn_elv_country', array('type'=>'varchar'));
|
14 |
+
|
15 |
+
|
16 |
+
if (Mage::getVersion() >= 1.1) {
|
17 |
+
$installer->startSetup();
|
18 |
+
$installer->getConnection()->addColumn($installer->getTable('sales_flat_quote_payment'), 'nn_account_holder', 'VARCHAR(255) NOT NULL');
|
19 |
+
$installer->getConnection()->addColumn($installer->getTable('sales_flat_quote_payment'), 'nn_account_number', 'VARCHAR(255) NOT NULL');
|
20 |
+
$installer->getConnection()->addColumn($installer->getTable('sales_flat_quote_payment'), 'nn_bank_sorting_code', 'VARCHAR(255) NOT NULL');
|
21 |
+
$installer->getConnection()->addColumn($installer->getTable('sales_flat_quote_payment'), 'nn_elv_country', 'VARCHAR(255) NOT NULL');
|
22 |
+
$installer->endSetup();
|
23 |
+
}
|
24 |
+
|
25 |
+
?>
|
app/code/community/Mage/Novalnet/sql/novalnet_setup/mysql4-upgrade-1.1.9-1.2.0.php
ADDED
@@ -0,0 +1,25 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
$installer = $this;
|
3 |
+
|
4 |
+
$installer->startSetup();
|
5 |
+
$installer->addAttribute('order_payment', 'nn_account_holder', array('type'=>'varchar'));
|
6 |
+
$installer->addAttribute('order_payment', 'nn_account_number', array('type'=>'varchar'));
|
7 |
+
$installer->addAttribute('order_payment', 'nn_bank_sorting_code', array('type'=>'varchar'));
|
8 |
+
$installer->addAttribute('order_payment', 'nn_elv_country', array('type'=>'varchar'));
|
9 |
+
|
10 |
+
$installer->addAttribute('quote_payment', 'nn_account_holder', array('type'=>'varchar'));
|
11 |
+
$installer->addAttribute('quote_payment', 'nn_account_number', array('type'=>'varchar'));
|
12 |
+
$installer->addAttribute('quote_payment', 'nn_bank_sorting_code', array('type'=>'varchar'));
|
13 |
+
$installer->addAttribute('quote_payment', 'nn_elv_country', array('type'=>'varchar'));
|
14 |
+
|
15 |
+
|
16 |
+
if (Mage::getVersion() >= 1.1) {
|
17 |
+
$installer->startSetup();
|
18 |
+
$installer->getConnection()->addColumn($installer->getTable('sales_flat_quote_payment'), 'nn_account_holder', 'VARCHAR(255) NOT NULL');
|
19 |
+
$installer->getConnection()->addColumn($installer->getTable('sales_flat_quote_payment'), 'nn_account_number', 'VARCHAR(255) NOT NULL');
|
20 |
+
$installer->getConnection()->addColumn($installer->getTable('sales_flat_quote_payment'), 'nn_bank_sorting_code', 'VARCHAR(255) NOT NULL');
|
21 |
+
$installer->getConnection()->addColumn($installer->getTable('sales_flat_quote_payment'), 'nn_elv_country', 'VARCHAR(255) NOT NULL');
|
22 |
+
$installer->endSetup();
|
23 |
+
}
|
24 |
+
|
25 |
+
?>
|
app/code/community/Mage/Novalnet/sql/novalnet_setup/mysql4-upgrade-1.2.0-1.2.1.php
ADDED
@@ -0,0 +1,25 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
$installer = $this;
|
3 |
+
|
4 |
+
$installer->startSetup();
|
5 |
+
$installer->addAttribute('order_payment', 'nn_account_holder', array('type'=>'varchar'));
|
6 |
+
$installer->addAttribute('order_payment', 'nn_account_number', array('type'=>'varchar'));
|
7 |
+
$installer->addAttribute('order_payment', 'nn_bank_sorting_code', array('type'=>'varchar'));
|
8 |
+
$installer->addAttribute('order_payment', 'nn_elv_country', array('type'=>'varchar'));
|
9 |
+
|
10 |
+
$installer->addAttribute('quote_payment', 'nn_account_holder', array('type'=>'varchar'));
|
11 |
+
$installer->addAttribute('quote_payment', 'nn_account_number', array('type'=>'varchar'));
|
12 |
+
$installer->addAttribute('quote_payment', 'nn_bank_sorting_code', array('type'=>'varchar'));
|
13 |
+
$installer->addAttribute('quote_payment', 'nn_elv_country', array('type'=>'varchar'));
|
14 |
+
|
15 |
+
|
16 |
+
if (Mage::getVersion() >= 1.1) {
|
17 |
+
$installer->startSetup();
|
18 |
+
$installer->getConnection()->addColumn($installer->getTable('sales_flat_quote_payment'), 'nn_account_holder', 'VARCHAR(255) NOT NULL');
|
19 |
+
$installer->getConnection()->addColumn($installer->getTable('sales_flat_quote_payment'), 'nn_account_number', 'VARCHAR(255) NOT NULL');
|
20 |
+
$installer->getConnection()->addColumn($installer->getTable('sales_flat_quote_payment'), 'nn_bank_sorting_code', 'VARCHAR(255) NOT NULL');
|
21 |
+
$installer->getConnection()->addColumn($installer->getTable('sales_flat_quote_payment'), 'nn_elv_country', 'VARCHAR(255) NOT NULL');
|
22 |
+
$installer->endSetup();
|
23 |
+
}
|
24 |
+
|
25 |
+
?>
|
app/design/frontend/default/default/template/novalnet/cc/form.phtml
CHANGED
@@ -27,9 +27,13 @@
|
|
27 |
?>
|
28 |
<?php $_code=$this->getMethodCode();?>
|
29 |
<?php
|
30 |
-
$customer_id = $_SESSION['customer_base']['id'];
|
31 |
-
$accountData = $this->getCcData($customer_id);
|
32 |
$cc_type = $cc_last4 = $cc_owner = $cc_exp_month = $cc_exp_year = '';
|
|
|
|
|
|
|
|
|
|
|
|
|
33 |
if ($accountData){
|
34 |
list($cc_type, $cc_last4, $cc_owner, $cc_exp_month, $cc_exp_year) = array_values($accountData);
|
35 |
}
|
27 |
?>
|
28 |
<?php $_code=$this->getMethodCode();?>
|
29 |
<?php
|
|
|
|
|
30 |
$cc_type = $cc_last4 = $cc_owner = $cc_exp_month = $cc_exp_year = '';
|
31 |
+
if ($_SESSION and $_SESSION['customer_base'] and $_SESSION['customer_base']['id'])
|
32 |
+
{
|
33 |
+
$customer_id = $_SESSION['customer_base']['id'];
|
34 |
+
$accountData = $this->getCcData($customer_id);
|
35 |
+
}
|
36 |
+
|
37 |
if ($accountData){
|
38 |
list($cc_type, $cc_last4, $cc_owner, $cc_exp_month, $cc_exp_year) = array_values($accountData);
|
39 |
}
|
app/design/frontend/default/default/template/novalnet/cc/info.phtml
CHANGED
@@ -26,6 +26,7 @@
|
|
26 |
*/
|
27 |
?>
|
28 |
<?php if($_info = $this->getInfo()): ?>
|
|
|
29 |
<?php echo $this->__('Name on the Card: %s', $this->htmlEscape($this->getInfo()->getCcOwner())) ?><br />
|
30 |
<?php echo $this->__('Credit Card Type: %s', $this->htmlEscape($this->getCcTypeName())) ?><br />
|
31 |
<?php echo $this->__('Credit Card Number: xxxx-%s', $this->htmlEscape($this->getInfo()->getCcLast4())) ?><br />
|
26 |
*/
|
27 |
?>
|
28 |
<?php if($_info = $this->getInfo()): ?>
|
29 |
+
<?php echo $this->__($this->htmlEscape($this->getPaymentMethod())) ?><br />
|
30 |
<?php echo $this->__('Name on the Card: %s', $this->htmlEscape($this->getInfo()->getCcOwner())) ?><br />
|
31 |
<?php echo $this->__('Credit Card Type: %s', $this->htmlEscape($this->getCcTypeName())) ?><br />
|
32 |
<?php echo $this->__('Credit Card Number: xxxx-%s', $this->htmlEscape($this->getInfo()->getCcLast4())) ?><br />
|
app/design/frontend/default/default/template/novalnet/elvaustria/form.phtml
CHANGED
@@ -28,9 +28,13 @@
|
|
28 |
|
29 |
?>
|
30 |
<?php
|
31 |
-
$customer_id = $_SESSION['customer_base']['id'];
|
32 |
-
$accountData = $this->getAccountData($customer_id);
|
33 |
$nn_account_holder = $nn_account_number = $nn_bank_sorting_code = $nn_elv_country = '';
|
|
|
|
|
|
|
|
|
|
|
|
|
34 |
if ($accountData){
|
35 |
list($nn_account_holder, $nn_account_number, $nn_bank_sorting_code, $nn_elv_country) = array_values($accountData);
|
36 |
$nn_account_number = substr($nn_account_number, 0, -4);
|
28 |
|
29 |
?>
|
30 |
<?php
|
|
|
|
|
31 |
$nn_account_holder = $nn_account_number = $nn_bank_sorting_code = $nn_elv_country = '';
|
32 |
+
if ($_SESSION and $_SESSION['customer_base'] and $_SESSION['customer_base']['id'])
|
33 |
+
{
|
34 |
+
$customer_id = $_SESSION['customer_base']['id'];
|
35 |
+
$accountData = $this->getAccountData($customer_id);
|
36 |
+
}
|
37 |
+
|
38 |
if ($accountData){
|
39 |
list($nn_account_holder, $nn_account_number, $nn_bank_sorting_code, $nn_elv_country) = array_values($accountData);
|
40 |
$nn_account_number = substr($nn_account_number, 0, -4);
|
app/design/frontend/default/default/template/novalnet/elvaustria/info.phtml
CHANGED
@@ -26,7 +26,7 @@
|
|
26 |
*/
|
27 |
?>
|
28 |
<?php if($_info = $this->getInfo()):?>
|
29 |
-
|
30 |
<?php #echo $this->__('Country: ').$this->__($this->htmlEscape($this->getInfo()->getNnElvCountry())) ?><!--br /-->
|
31 |
<?php echo $this->__('Account Holder: %s', $this->htmlEscape($this->getInfo()->getNnAccountHolder())) ?><br />
|
32 |
<?php echo $this->__('Account Number: %s', $this->htmlEscape($this->getInfo()->getNnAccountNumber())) ?><br />
|
26 |
*/
|
27 |
?>
|
28 |
<?php if($_info = $this->getInfo()):?>
|
29 |
+
<?php echo $this->__($this->htmlEscape($this->getPaymentMethod())) ?><br />
|
30 |
<?php #echo $this->__('Country: ').$this->__($this->htmlEscape($this->getInfo()->getNnElvCountry())) ?><!--br /-->
|
31 |
<?php echo $this->__('Account Holder: %s', $this->htmlEscape($this->getInfo()->getNnAccountHolder())) ?><br />
|
32 |
<?php echo $this->__('Account Number: %s', $this->htmlEscape($this->getInfo()->getNnAccountNumber())) ?><br />
|
app/design/frontend/default/default/template/novalnet/elvgerman/form.phtml
CHANGED
@@ -27,9 +27,13 @@
|
|
27 |
*/
|
28 |
?>
|
29 |
<?php
|
30 |
-
$customer_id = $_SESSION['customer_base']['id'];
|
31 |
-
$accountData = $this->getAccountData($customer_id);
|
32 |
$nn_account_holder = $nn_account_number = $nn_bank_sorting_code = $nn_elv_country = '';
|
|
|
|
|
|
|
|
|
|
|
|
|
33 |
if ($accountData){
|
34 |
list($nn_account_holder, $nn_account_number, $nn_bank_sorting_code, $nn_elv_country) = array_values($accountData);
|
35 |
$nn_account_number = substr($nn_account_number, 0, -4);
|
27 |
*/
|
28 |
?>
|
29 |
<?php
|
|
|
|
|
30 |
$nn_account_holder = $nn_account_number = $nn_bank_sorting_code = $nn_elv_country = '';
|
31 |
+
if ($_SESSION and $_SESSION['customer_base'] and $_SESSION['customer_base']['id'])
|
32 |
+
{
|
33 |
+
$customer_id = $_SESSION['customer_base']['id'];
|
34 |
+
$accountData = $this->getAccountData($customer_id);
|
35 |
+
}
|
36 |
+
|
37 |
if ($accountData){
|
38 |
list($nn_account_holder, $nn_account_number, $nn_bank_sorting_code, $nn_elv_country) = array_values($accountData);
|
39 |
$nn_account_number = substr($nn_account_number, 0, -4);
|
app/design/frontend/default/default/template/novalnet/elvgerman/info.phtml
CHANGED
@@ -26,7 +26,7 @@
|
|
26 |
*/
|
27 |
?>
|
28 |
<?php if($_info = $this->getInfo()):?>
|
29 |
-
|
30 |
<?php #echo $this->__('Country: ').$this->__($this->htmlEscape($this->getInfo()->getNnElvCountry())) ?><!--br /-->
|
31 |
<?php echo $this->__('Account Holder: %s', $this->htmlEscape($this->getInfo()->getNnAccountHolder())) ?><br />
|
32 |
<?php echo $this->__('Account Number: %s', $this->htmlEscape($this->getInfo()->getNnAccountNumber())) ?><br />
|
26 |
*/
|
27 |
?>
|
28 |
<?php if($_info = $this->getInfo()):?>
|
29 |
+
<?php echo $this->__($this->htmlEscape($this->getPaymentMethod())) ?><br />
|
30 |
<?php #echo $this->__('Country: ').$this->__($this->htmlEscape($this->getInfo()->getNnElvCountry())) ?><!--br /-->
|
31 |
<?php echo $this->__('Account Holder: %s', $this->htmlEscape($this->getInfo()->getNnAccountHolder())) ?><br />
|
32 |
<?php echo $this->__('Account Number: %s', $this->htmlEscape($this->getInfo()->getNnAccountNumber())) ?><br />
|
app/design/frontend/default/default/template/novalnet/invoice/form.phtml
CHANGED
@@ -29,7 +29,11 @@
|
|
29 |
?>
|
30 |
<?php
|
31 |
$_code=$this->getMethodCode();
|
32 |
-
$
|
|
|
|
|
|
|
|
|
33 |
$user_group_id = $this->getUserGroupId($customer_id);
|
34 |
$user_group_name = $this->getUserGroupExcluded();
|
35 |
if (!$user_group_name){$allowed = true;}
|
29 |
?>
|
30 |
<?php
|
31 |
$_code=$this->getMethodCode();
|
32 |
+
if ($_SESSION and $_SESSION['customer_base'] and $_SESSION['customer_base']['id'])
|
33 |
+
{
|
34 |
+
$customer_id = $_SESSION['customer_base']['id'];
|
35 |
+
}
|
36 |
+
|
37 |
$user_group_id = $this->getUserGroupId($customer_id);
|
38 |
$user_group_name = $this->getUserGroupExcluded();
|
39 |
if (!$user_group_name){$allowed = true;}
|
app/design/frontend/default/default/template/novalnet/phonepayment/form.phtml
CHANGED
@@ -31,7 +31,10 @@
|
|
31 |
<?php $baseUrl=Mage::getBaseUrl('skin') ?>
|
32 |
<?php
|
33 |
$_code=$this->getMethodCode();
|
34 |
-
$
|
|
|
|
|
|
|
35 |
$user_group_id = $this->getUserGroupId($customer_id);
|
36 |
$user_group_name = $this->getUserGroupExcluded();
|
37 |
if (!$user_group_name){$allowed = true;}
|
31 |
<?php $baseUrl=Mage::getBaseUrl('skin') ?>
|
32 |
<?php
|
33 |
$_code=$this->getMethodCode();
|
34 |
+
if ($_SESSION and $_SESSION['customer_base'] and $_SESSION['customer_base']['id'])
|
35 |
+
{
|
36 |
+
$customer_id = $_SESSION['customer_base']['id'];
|
37 |
+
}
|
38 |
$user_group_id = $this->getUserGroupId($customer_id);
|
39 |
$user_group_name = $this->getUserGroupExcluded();
|
40 |
if (!$user_group_name){$allowed = true;}
|
app/design/frontend/default/default/template/novalnet/prepayment/form.phtml
CHANGED
@@ -31,7 +31,10 @@
|
|
31 |
<?php $baseUrl=Mage::getBaseUrl('skin') ?>
|
32 |
<?php
|
33 |
$_code=$this->getMethodCode();
|
34 |
-
$
|
|
|
|
|
|
|
35 |
$user_group_id = $this->getUserGroupId($customer_id);
|
36 |
$user_group_name = $this->getUserGroupExcluded();
|
37 |
if (!$user_group_name){$allowed = true;}
|
31 |
<?php $baseUrl=Mage::getBaseUrl('skin') ?>
|
32 |
<?php
|
33 |
$_code=$this->getMethodCode();
|
34 |
+
if ($_SESSION and $_SESSION['customer_base'] and $_SESSION['customer_base']['id'])
|
35 |
+
{
|
36 |
+
$customer_id = $_SESSION['customer_base']['id'];
|
37 |
+
}
|
38 |
$user_group_id = $this->getUserGroupId($customer_id);
|
39 |
$user_group_name = $this->getUserGroupExcluded();
|
40 |
if (!$user_group_name){$allowed = true;}
|
app/locale/de_AT/Mage_Novalnet.csv
CHANGED
@@ -100,4 +100,5 @@
|
|
100 |
"User Group Excluded","Ausgeschlossene Benutzergruppe"
|
101 |
"Parameter missing","Parameter fehlt"
|
102 |
"Comment","Bemerkung"
|
103 |
-
"Email address missing","Emailadresse nicht vorhanden"
|
|
100 |
"User Group Excluded","Ausgeschlossene Benutzergruppe"
|
101 |
"Parameter missing","Parameter fehlt"
|
102 |
"Comment","Bemerkung"
|
103 |
+
"Email address missing","Emailadresse nicht vorhanden"
|
104 |
+
"Instant Bank Transfer","Sofortüberweisung"
|
app/locale/de_CH/Mage_Novalnet.csv
CHANGED
@@ -100,4 +100,5 @@
|
|
100 |
"User Group Excluded","Ausgeschlossene Benutzergruppe"
|
101 |
"Parameter missing","Parameter fehlt"
|
102 |
"Comment","Bemerkung"
|
103 |
-
"Email address missing","Emailadresse nicht vorhanden"
|
|
100 |
"User Group Excluded","Ausgeschlossene Benutzergruppe"
|
101 |
"Parameter missing","Parameter fehlt"
|
102 |
"Comment","Bemerkung"
|
103 |
+
"Email address missing","Emailadresse nicht vorhanden"
|
104 |
+
"Instant Bank Transfer","Sofortüberweisung"
|
app/locale/de_DE/Mage_Novalnet.csv
CHANGED
@@ -101,3 +101,4 @@
|
|
101 |
"Parameter missing","Parameter fehlt"
|
102 |
"Comment","Bemerkung"
|
103 |
"Email address missing","Emailadresse nicht vorhanden"
|
|
101 |
"Parameter missing","Parameter fehlt"
|
102 |
"Comment","Bemerkung"
|
103 |
"Email address missing","Emailadresse nicht vorhanden"
|
104 |
+
"Instant Bank Transfer","Sofortüberweisung"
|
app/locale/en_US/Mage_Novalnet.csv
CHANGED
@@ -97,4 +97,5 @@
|
|
97 |
"User Group Excluded","User Group Excluded"
|
98 |
"Parameter missing","Parameter missing"
|
99 |
"Comment","Comment"
|
100 |
-
"Email address missing","Email address missing"
|
|
97 |
"User Group Excluded","User Group Excluded"
|
98 |
"Parameter missing","Parameter missing"
|
99 |
"Comment","Comment"
|
100 |
+
"Email address missing","Email address missing"
|
101 |
+
"Instant Bank Transfer","Instant Bank Transfer"
|
package.xml
CHANGED
@@ -1,22 +1,20 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Novalnet</name>
|
4 |
-
<version>1.2.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>Novalnet AG ist ein deutsches EPayment - Unternehmen, bietet alle relevanten Zahlungsarten weltweit. / Novalnet is a German based payment service provider, which offers all the available payments and solutions worldwide.</summary>
|
10 |
<description>The NOVALNET AG is an essential component of e-Payment platform that facilitates your company to process all type of payments. As one of the leading company in Online-Payment the NOVALNET AG provides its customers an individual, technically qualified secured Payment system and also the best possible support throughout. NOVALNET AG is not only an e-Payment provider but also we offer our Merchants an optimal strategic solution for easy payment processing which is pocket-friendly for our customer.</description>
|
11 |
-
<notes>Ä
|
12 |
|
13 |
-
|
14 |
-
|
15 |
-
2. In einem bislang einzigen Fall wurde aus unerklärlichen Gründen eine leere Emailadresse im Phonepayment-Modul an Novalnet AG übermittelt, was zur Fehlermeldung geführt hat. Es wird nun ein Plausi-Check durchgeführt. Falls die Emailadresse leer ist, wird ein Hinweis angezeigt.</notes>
|
16 |
<authors><author><name>Dixon Rajdaniel</name><user>auto-converted</user><email>dr@novalnet.de</email></author></authors>
|
17 |
-
<date>2009-
|
18 |
-
<time>
|
19 |
-
<contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="novalnet"><dir name="cc"><file name="form.phtml" hash="f533486929ca1e56736e72356888f1d2"/><file name="info.phtml" hash="cec3097648d7f53a2ce898c3ef0fdfd4"/></dir><dir name="elvaustria"><file name="form.phtml" hash="91dad9be6ecd4a19ec3e016684b76d71"/><file name="info.phtml" hash="5f1138c9af0f954851f173830cbd6f05"/></dir><dir name="elvgerman"><file name="form.phtml" hash="b4af054ac7786a541f6784ca786f3d99"/><file name="info.phtml" hash="5f1138c9af0f954851f173830cbd6f05"/></dir><dir name="invoice"><file name="form.phtml" hash="2dcea7005b16c665e523ecd362c5dd03"/><file name="info.phtml" hash="995bdbdb29181b0e68ab72e97c54ed77"/></dir><dir name="phonepayment"><file name="form.phtml" hash="715e3cfbda4eb427ad53bc0eff82f271"/><file name="info.phtml" hash="f905f359e8bafa12d31b65ce6c710743"/></dir><dir name="prepayment"><file name="form.phtml" hash="63fa5a47af9d203d1b72502b3fd958fb"/><file name="info.phtml" hash="f905f359e8bafa12d31b65ce6c710743"/></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="template"><dir name="novalnet"><dir name="cc"><file name="form.phtml" hash="
|
20 |
<compatible/>
|
21 |
<dependencies/>
|
22 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Novalnet</name>
|
4 |
+
<version>1.2.1</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>Novalnet AG ist ein deutsches EPayment - Unternehmen, bietet alle relevanten Zahlungsarten weltweit. / Novalnet is a German based payment service provider, which offers all the available payments and solutions worldwide.</summary>
|
10 |
<description>The NOVALNET AG is an essential component of e-Payment platform that facilitates your company to process all type of payments. As one of the leading company in Online-Payment the NOVALNET AG provides its customers an individual, technically qualified secured Payment system and also the best possible support throughout. NOVALNET AG is not only an e-Payment provider but also we offer our Merchants an optimal strategic solution for easy payment processing which is pocket-friendly for our customer.</description>
|
11 |
+
<notes>Änderung:
|
12 |
|
13 |
+
Wegen unterschiedlicher Formate von Adressen verschiedener Länder wird nun die Straße in Bezug auf womöglich fehlende Hausnummer nicht mehr überprüft.</notes>
|
|
|
|
|
14 |
<authors><author><name>Dixon Rajdaniel</name><user>auto-converted</user><email>dr@novalnet.de</email></author></authors>
|
15 |
+
<date>2009-11-13</date>
|
16 |
+
<time>14:58:33</time>
|
17 |
+
<contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="novalnet"><dir name="cc"><file name="form.phtml" hash="f533486929ca1e56736e72356888f1d2"/><file name="info.phtml" hash="cec3097648d7f53a2ce898c3ef0fdfd4"/></dir><dir name="elvaustria"><file name="form.phtml" hash="91dad9be6ecd4a19ec3e016684b76d71"/><file name="info.phtml" hash="5f1138c9af0f954851f173830cbd6f05"/></dir><dir name="elvgerman"><file name="form.phtml" hash="b4af054ac7786a541f6784ca786f3d99"/><file name="info.phtml" hash="5f1138c9af0f954851f173830cbd6f05"/></dir><dir name="invoice"><file name="form.phtml" hash="2dcea7005b16c665e523ecd362c5dd03"/><file name="info.phtml" hash="995bdbdb29181b0e68ab72e97c54ed77"/></dir><dir name="phonepayment"><file name="form.phtml" hash="715e3cfbda4eb427ad53bc0eff82f271"/><file name="info.phtml" hash="f905f359e8bafa12d31b65ce6c710743"/></dir><dir name="prepayment"><file name="form.phtml" hash="63fa5a47af9d203d1b72502b3fd958fb"/><file name="info.phtml" hash="f905f359e8bafa12d31b65ce6c710743"/></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="template"><dir name="novalnet"><dir name="cc"><file name="form.phtml" hash="83da1112fcd7b7de8a44288d26d8c03a"/><file name="info.phtml" hash="c606874c228dc547b5ee058169c0536d"/></dir><dir name="elvaustria"><file name="form.phtml" hash="338c255778ba91e4258d05242551e739"/><file name="info.phtml" hash="df166d57f6680b5945706ebeb88c28e0"/></dir><dir name="elvgerman"><file name="form.phtml" hash="4e6ce04c9fbee8554e75eea33745038e"/><file name="info.phtml" hash="df166d57f6680b5945706ebeb88c28e0"/></dir><dir name="invoice"><file name="form.phtml" hash="aba37d227c47c534a4c76e6ab94f7819"/><file name="info.phtml" hash="f8d4c1a6d3f9fb3d8278e7fa82d661b8"/></dir><dir name="phonepayment"><file name="form.phtml" hash="55fdbe443a690d13ca6f66bf988b95e0"/><file name="info.phtml" hash="6a50f5400b1c9b38629ea9314a08d3b1"/></dir><dir name="prepayment"><file name="form.phtml" hash="74bfd83d7e194628dea10f0934837af8"/><file name="info.phtml" hash="6a50f5400b1c9b38629ea9314a08d3b1"/></dir><dir name="secure"><file name="failure.phtml" hash="d33ccb69a08a2195df3586bf36dc9d85"/></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="de_AT"><file name="Mage_Novalnet.csv" hash="d42ba7fb8a23d4af790da49cac518656"/></dir><dir name="de_CH"><file name="Mage_Novalnet.csv" hash="d42ba7fb8a23d4af790da49cac518656"/></dir><dir name="de_DE"><file name="Mage_Novalnet.csv" hash="2749861768903567c4e357724b5d34f6"/></dir><dir name="en_US"><file name="Mage_Novalnet.csv" hash="e5d4d57ef09788f77c350e84ed542a41"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="default"><dir name="default"><dir name="images"><dir name="novalnet"><file name="acdc_info.png" hash="fa69e3f3098c4f85d9d3c796d82bdf0a"/><file name="AE_Logo.png" hash="ed3b558031a1f03e1bd536ecf1233e0e"/><file name="ELV_Logo.png" hash="b265493a083f03e4da7d24c23cc55b67"/><file name="MC_Logo.png" hash="cd17acdae3de28aeff7da7952d2ef802"/><file name="NN_Logo.png" hash="e17794ee0b984fd6e1ec2b884da1a29b"/><file name="NN_Logo_T.png" hash="4d442efcb94c9fee7749022478a9d1f3"/><file name="VI_Logo.png" hash="5e963373aa1db58369730238cf311548"/></dir></dir></dir></dir></dir></target><target name="magecommunity"><dir name="Mage"><dir name="Novalnet"><dir name="Block"><dir name="Cc"><file name="Form.php" hash="d85d4f5f3cfc19abee8a3b9388de7fe7"/><file name="Info.php" hash="c96a58aa8542b8cbe375650206b40cd8"/></dir><dir name="Elvaustria"><file name="Form.php" hash="deaa6cef24778a8267f269852d295ea8"/><file name="Info.php" hash="d3b662ae5a3b5c795ebb8a1b2e3ab62c"/></dir><dir name="Elvgerman"><file name="Form.php" hash="d50a54a153cb9f72f257ed217ea6f7ab"/><file name="Info.php" hash="4517cd593bfdb4e02a84cc11259ab3ee"/></dir><dir name="Invoice"><file name="Form.php" hash="09416dc8b843b8edbec01a2a5ae3b96c"/><file name="Info.php" hash="5525c9ae3534663b5d5da0a326c9c2fa"/></dir><dir name="Phonepayment"><file name="Form.php" hash="f7cbfe3fe0cf97ae69108ad5d4e9cf82"/><file name="Info.php" hash="1d3542d6eba2396d2ac2908b3932a181"/></dir><dir name="Prepayment"><file name="Form.php" hash="2742a76acca7614d9dcfd0ec130c7334"/><file name="Info.php" hash="9cab5ed40e74dca7fdc76b819ee11de6"/></dir><dir name="Secure"><file name="Failure.php" hash="38cdb224914c9551cbdb0b884b808a33"/><file name="Redirect.php" hash="e94a51bd54e4aa17803ec240e8f1a25d"/></dir></dir><dir name="controllers"><file name="SecureController.php" hash="740aa237bf2578a1f07820c4f0eb56c5"/></dir><dir name="etc"><file name="config.xml" hash="e67970f092ec8925d1270e765843a1ba"/><file name="system.xml" hash="49dc37fb95f89f79c55cc28eba298e58"/></dir><dir name="Helper"><file name="Data.php" hash="5cd27f9fbb7e3b7083c3d80c8354a5d3"/></dir><dir name="Model"><dir name="Mysql4"><file name="Setup.php" hash="bda93bd1825c67b2eac9943ec42076f1"/></dir><dir name="Novalnet"><dir name="Source"><file name="Cctype.php" hash="e886ba7736877e589abfd6f7343f98d4"/></dir><file name="Request.php" hash="87fd92d8890377ab2e3fb1dc2c1790bf"/><file name="Result.php" hash="fa36462e819f3581e27d50b201d9fb99"/></dir><file name="NovalnetCc.php" hash="25d146988e6c04e59b980bf38f0fabb6"/><file name="NovalnetElvaustria.php" hash="af5bbccaf0f3d81058955b7608d843e9"/><file name="NovalnetElvgerman.php" hash="c1358e31c6b74d4deffb91004257cfd5"/><file name="NovalnetInstantbanktransfer.php" hash="d8575bde0997191e77beae3919e20841"/><file name="NovalnetInvoice.php" hash="393070ca3a37def33533a01daab1c484"/><file name="NovalnetPhonepayment.php" hash="7bea822b5ea6c670009fa4003820aa10"/><file name="NovalnetPrepayment.php" hash="3d8ddd15cae754b7d1f614e6602c43eb"/><file name="NovalnetSecure.php" hash="d929538867236421c3afb6918e6c2607"/></dir><dir name="sql"><dir name="novalnet_setup"><file name="mysql4-install-1.0.0.php" hash="d15297ab95ca0b76038e32a4ad9fff79"/><file name="mysql4-upgrade-1.0.0-1.0.1.php" hash="d15297ab95ca0b76038e32a4ad9fff79"/><file name="mysql4-upgrade-1.0.1-1.0.2.php" hash="d15297ab95ca0b76038e32a4ad9fff79"/><file name="mysql4-upgrade-1.0.2-1.0.3.php" hash="d15297ab95ca0b76038e32a4ad9fff79"/><file name="mysql4-upgrade-1.0.3-1.1.0.php" hash="d15297ab95ca0b76038e32a4ad9fff79"/><file name="mysql4-upgrade-1.1.0-1.1.1.php" hash="d15297ab95ca0b76038e32a4ad9fff79"/><file name="mysql4-upgrade-1.1.1-1.1.2.php" hash="d15297ab95ca0b76038e32a4ad9fff79"/><file name="mysql4-upgrade-1.1.2-1.1.3.php" hash="d15297ab95ca0b76038e32a4ad9fff79"/><file name="mysql4-upgrade-1.1.3-1.1.4.php" hash="d15297ab95ca0b76038e32a4ad9fff79"/><file name="mysql4-upgrade-1.1.4-1.1.5.php" hash="d15297ab95ca0b76038e32a4ad9fff79"/><file name="mysql4-upgrade-1.1.5-1.1.6.php" hash="d15297ab95ca0b76038e32a4ad9fff79"/><file name="mysql4-upgrade-1.1.6-1.1.7.php" hash="d15297ab95ca0b76038e32a4ad9fff79"/><file name="mysql4-upgrade-1.1.7-1.1.8.php" hash="d15297ab95ca0b76038e32a4ad9fff79"/><file name="mysql4-upgrade-1.1.8-1.1.9.php" hash="d15297ab95ca0b76038e32a4ad9fff79"/><file name="mysql4-upgrade-1.1.9-1.2.0.php" hash="d15297ab95ca0b76038e32a4ad9fff79"/><file name="mysql4-upgrade-1.2.0-1.2.1.php" hash="d15297ab95ca0b76038e32a4ad9fff79"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Mage_Novalnet.xml" hash="752f2f1df5ae673d9deafdaa6f021b32"/></dir></target></contents>
|
18 |
<compatible/>
|
19 |
<dependencies/>
|
20 |
</package>
|