Novalnet - Version 1.2.5

Version Notes

1.2.5 stable
Wir weisen hiermit ausdrücklich darauf hin, dass es sich bei dieser Version um eine BETA-VERSION handelt. Offenbar kann der Magento Connect Manager nicht korrekt mit Betas umgehen. So müssen wir diese Version als stable herausgeben.
Außer Sofortüberweisung können jedoch alle anderen Zahlarten nach wie vor live benutzt werden.

Neu:
1. Man kann die Zahlart sofortüberweisung ab sofort testen. Bitte den Livemodus NICHT auf 'ja' setzen!
2. Ein Auswahlfeld "Livemodus" steht für alle Zahlarten (außer Telefonpayment) zur Verfügung. Der Livemodus steht per Default auf Nein, d.h. der Testmodus ist in diesem Fall eingeschaltet. Das Auswahlfeld "Testmodus" bei der Zahlart "Sofortüberweisung" ist nun durch den "Livemodus" ersetzt worden. Bei Testbestellungen wird das Word "TESTBESTELLUNG" bei Bestellinfos mitangezeigt.
Bitte beachten Sie, dass eine Bezahlmethode erst live benutzt werden kann, wenn der Livemodus auf 'Ja' steht (Sofortüberweisung ausgenommen).

Buxfix für den sporadisch auftretenden Hinweis: 'Notice: Undefined index: customer_base in /var/www/magento/app/design/frontend/default/default/template/novalnet/cc/form.phtml on line 32'
------------------------------------------------------------------------------------------------------
Please note, this version is a BETA-VERSION. We had to do so because of the fact, that the Magento Connect Manager seems not to be able to handle Betas correctly.
But all payment modules except instant bank transfer / online transfer can be used for real bank transactions.

What's New:
1. The new module instant bank transfer / online transfer is ready for tests. Do not set the live mode to 'yes', please!
2. A option "Live mode" is available for all modules except phonepayment. It's default value is 'No', that means, the Test Mode is active. The Word "Test order" is added to order details for test orders.
For real bank transactions set the Live Mode to 'Yes', please (except online transfer)!

Buxfix: the notice appeared sometimes: 'Notice: Undefined index: customer_base in /var/www/magento/app/design/frontend/default/default/template/novalnet/cc/form.phtml on line 32'

Download this release

Release Info

Developer Magento Core Team
Extension Novalnet
Version 1.2.5
Comparing to
See all releases


Code changes from version 1.2.4 to 1.2.5

Files changed (23) hide show
  1. app/code/community/Mage/Novalnet/Model/NovalnetCc.php +17 -12
  2. app/code/community/Mage/Novalnet/Model/NovalnetElvaustria.php +16 -13
  3. app/code/community/Mage/Novalnet/Model/NovalnetElvgerman.php +16 -13
  4. app/code/community/Mage/Novalnet/Model/NovalnetInstantbanktransfer.php +59 -36
  5. app/code/community/Mage/Novalnet/Model/NovalnetInvoice.php +46 -41
  6. app/code/community/Mage/Novalnet/Model/NovalnetPhonepayment.php +62 -58
  7. app/code/community/Mage/Novalnet/Model/NovalnetPrepayment.php +16 -12
  8. app/code/community/Mage/Novalnet/Model/NovalnetSecure.php +30 -24
  9. app/code/community/Mage/Novalnet/controllers/InstantbanktransferController.php +55 -7
  10. app/code/community/Mage/Novalnet/controllers/SecureController.php +16 -2
  11. app/code/community/Mage/Novalnet/etc/system.xml +100 -19
  12. app/design/frontend/default/default/template/novalnet/cc/form.phtml +1 -1
  13. app/design/frontend/default/default/template/novalnet/elvaustria/form.phtml +1 -1
  14. app/design/frontend/default/default/template/novalnet/elvgerman/form.phtml +1 -1
  15. app/design/frontend/default/default/template/novalnet/instantbanktransfer/form.phtml +1 -1
  16. app/design/frontend/default/default/template/novalnet/invoice/form.phtml +1 -1
  17. app/design/frontend/default/default/template/novalnet/phonepayment/form.phtml +1 -1
  18. app/design/frontend/default/default/template/novalnet/prepayment/form.phtml +1 -1
  19. app/locale/de_AT/Mage_Novalnet.csv +4 -1
  20. app/locale/de_CH/Mage_Novalnet.csv +4 -1
  21. app/locale/de_DE/Mage_Novalnet.csv +4 -1
  22. app/locale/en_US/Mage_Novalnet.csv +4 -1
  23. package.xml +24 -9
app/code/community/Mage/Novalnet/Model/NovalnetCc.php CHANGED
@@ -108,22 +108,23 @@ class Mage_Novalnet_Model_NovalnetCc extends Mage_Payment_Model_Method_Cc
108
  $error = false;
109
  $payment->setAmount($amount);
110
 
111
- $order = $payment->getOrder();
112
- if ($order->getCustomerNote())
113
- {
114
- $note = '<br />';
115
- $note .= Mage::helper('novalnet')->__('Comment').': ';
116
- $note .= $order->getCustomerNote();
117
- $order->setCustomerNote($note);
118
- $order->setCustomerNoteNotify(true);
119
- }
 
120
 
121
  $request = $this->_buildRequest($payment);
122
  $result = $this->_postRequest($request);
123
 
124
  if ($result->getStatus() == self::RESPONSE_CODE_APPROVED) {
125
  $payment->setStatus(self::STATUS_APPROVED);
126
- $payment->setCcTransId($result->getTid());
127
  $payment->setLastTransId($result->getTid());
128
  }
129
  else {
@@ -166,7 +167,8 @@ class Mage_Novalnet_Model_NovalnetCc extends Mage_Payment_Model_Method_Cc
166
  ->setauth_code($this->getConfigData('auth_code'))
167
  ->setkey('6')
168
  ->setproduct($this->getConfigData('product_id'))
169
- ->settariff($this->getConfigData('tariff_id'));
 
170
 
171
  if($payment->getAmount()){
172
  $request->setamount($payment->getAmount()*100);
@@ -273,7 +275,10 @@ class Mage_Novalnet_Model_NovalnetCc extends Mage_Payment_Model_Method_Cc
273
  if (isset($aryResponse['status_desc'])){
274
  $result->setStatusDesc($aryResponse['status_desc']);
275
  }
276
-
 
 
 
277
  } else {
278
  Mage::throwException(Mage::helper('paygate')->__('Error in payment gateway'));
279
  }
108
  $error = false;
109
  $payment->setAmount($amount);
110
 
111
+ $order = $payment->getOrder();
112
+ $note = $order->getCustomerNote();
113
+ if ($note){
114
+ $note = '<br />'.Mage::helper('novalnet')->__('Comment').': '.$note;
115
+ }
116
+ if ( !$this->getConfigData('live_mode') ){
117
+ $note .= '<br /><b><font color="red">'.strtoupper(Mage::helper('novalnet')->__('Testorder')).'</font></b>';
118
+ }
119
+ $order->setCustomerNote($note);
120
+ $order->setCustomerNoteNotify(true);
121
 
122
  $request = $this->_buildRequest($payment);
123
  $result = $this->_postRequest($request);
124
 
125
  if ($result->getStatus() == self::RESPONSE_CODE_APPROVED) {
126
  $payment->setStatus(self::STATUS_APPROVED);
127
+ $payment->setCcTransId($result->getTid());
128
  $payment->setLastTransId($result->getTid());
129
  }
130
  else {
167
  ->setauth_code($this->getConfigData('auth_code'))
168
  ->setkey('6')
169
  ->setproduct($this->getConfigData('product_id'))
170
+ ->settariff($this->getConfigData('tariff_id'))
171
+ ->settest_mode((!$this->getConfigData('live_mode'))? 1: 0);
172
 
173
  if($payment->getAmount()){
174
  $request->setamount($payment->getAmount()*100);
275
  if (isset($aryResponse['status_desc'])){
276
  $result->setStatusDesc($aryResponse['status_desc']);
277
  }
278
+ /*if ( $this->getConfigData('live_mode') == 0 ){
279
+ $result->setTestmode(strtoupper(Mage::helper('paygate')->__('Testorder')));
280
+ }*/
281
+
282
  } else {
283
  Mage::throwException(Mage::helper('paygate')->__('Error in payment gateway'));
284
  }
app/code/community/Mage/Novalnet/Model/NovalnetElvaustria.php CHANGED
@@ -109,15 +109,16 @@ class Mage_Novalnet_Model_NovalnetElvaustria extends Mage_Payment_Model_Method_A
109
  $error = false;
110
  $payment->setAmount($amount);
111
 
112
- $order = $payment->getOrder();
113
- if ($order->getCustomerNote())
114
- {
115
- #$note = '<br />';
116
- $note = Mage::helper('novalnet')->__('Comment').': ';
117
- $note .= $order->getCustomerNote();
118
- $order->setCustomerNote($note);
119
- $order->setCustomerNoteNotify(true);
120
- }
 
121
 
122
  $request = $this->_buildRequest($payment);
123
  $result = $this->_postRequest($request);
@@ -181,10 +182,12 @@ class Mage_Novalnet_Model_NovalnetElvaustria extends Mage_Payment_Model_Method_A
181
  $request->setvendor($this->getConfigData('merchant_id'))
182
  ->setauth_code($this->getConfigData('auth_code'))
183
  ->setproduct($this->getConfigData('product_id'))
184
- ->settariff($this->getConfigData('tariff_id'));
185
- if ($this->getConfigData('acdc_check')){
186
- $request->setacdc($this->getConfigData('acdc_check'));
187
- }
 
 
188
 
189
  if($payment->getAmount()){
190
  $request->setamount($payment->getAmount()*100);
109
  $error = false;
110
  $payment->setAmount($amount);
111
 
112
+ $order = $payment->getOrder();
113
+ $note = $order->getCustomerNote();
114
+ if ($note){
115
+ $note = '<br />'.Mage::helper('novalnet')->__('Comment').': '.$note;
116
+ }
117
+ if ( !$this->getConfigData('live_mode') ){
118
+ $note .= '<br /><b><font color="red">'.strtoupper(Mage::helper('novalnet')->__('Testorder')).'</font></b>';
119
+ }
120
+ $order->setCustomerNote($note);
121
+ $order->setCustomerNoteNotify(true);
122
 
123
  $request = $this->_buildRequest($payment);
124
  $result = $this->_postRequest($request);
182
  $request->setvendor($this->getConfigData('merchant_id'))
183
  ->setauth_code($this->getConfigData('auth_code'))
184
  ->setproduct($this->getConfigData('product_id'))
185
+ ->settariff($this->getConfigData('tariff_id'))
186
+ ->settest_mode((!$this->getConfigData('live_mode'))? 1: 0);
187
+
188
+ if ($this->getConfigData('acdc_check')){
189
+ $request->setacdc($this->getConfigData('acdc_check'));
190
+ }
191
 
192
  if($payment->getAmount()){
193
  $request->setamount($payment->getAmount()*100);
app/code/community/Mage/Novalnet/Model/NovalnetElvgerman.php CHANGED
@@ -110,15 +110,16 @@ class Mage_Novalnet_Model_NovalnetElvgerman extends Mage_Payment_Model_Method_Ab
110
  $error = false;
111
  $payment->setAmount($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
  $request = $this->_buildRequest($payment);
124
  $result = $this->_postRequest($request);
@@ -184,10 +185,12 @@ class Mage_Novalnet_Model_NovalnetElvgerman extends Mage_Payment_Model_Method_Ab
184
  $request->setvendor($this->getConfigData('merchant_id'))
185
  ->setauth_code($this->getConfigData('auth_code'))
186
  ->setproduct($this->getConfigData('product_id'))
187
- ->settariff($this->getConfigData('tariff_id'));
188
- if ($this->getConfigData('acdc_check')){
189
- $request->setacdc($this->getConfigData('acdc_check'));
190
- }
 
 
191
 
192
  if($payment->getAmount()){
193
  $request->setamount($payment->getAmount()*100);
110
  $error = false;
111
  $payment->setAmount($amount);
112
 
113
+ $order = $payment->getOrder();
114
+ $note = $order->getCustomerNote();
115
+ if ($note){
116
+ $note = '<br />'.Mage::helper('novalnet')->__('Comment').': '.$note;
117
+ }
118
+ if ( !$this->getConfigData('live_mode') ){
119
+ $note .= '<br /><b><font color="red">'.strtoupper(Mage::helper('novalnet')->__('Testorder')).'</font></b>';
120
+ }
121
+ $order->setCustomerNote($note);
122
+ $order->setCustomerNoteNotify(true);
123
 
124
  $request = $this->_buildRequest($payment);
125
  $result = $this->_postRequest($request);
185
  $request->setvendor($this->getConfigData('merchant_id'))
186
  ->setauth_code($this->getConfigData('auth_code'))
187
  ->setproduct($this->getConfigData('product_id'))
188
+ ->settariff($this->getConfigData('tariff_id'))
189
+ ->settest_mode((!$this->getConfigData('live_mode'))? 1: 0);
190
+
191
+ if ($this->getConfigData('acdc_check')){
192
+ $request->setacdc($this->getConfigData('acdc_check'));
193
+ }
194
 
195
  if($payment->getAmount()){
196
  $request->setamount($payment->getAmount()*100);
app/code/community/Mage/Novalnet/Model/NovalnetInstantbanktransfer.php CHANGED
@@ -21,7 +21,7 @@
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
  */
@@ -44,9 +44,8 @@ class Mage_Novalnet_Model_NovalnetInstantbanktransfer extends Mage_Payment_Model
44
  */
45
  protected $_code = 'novalnetInstantbanktransfer';#path = magento\app\code\community\Mage\Novalnet\Model\novalnetInstantbanktransfer.php
46
  protected $_formBlockType = 'novalnet/instantbanktransfer_form';#path = magento\app\design\frontend\default\default\template\novalnet\instantbanktransfer\form.phtml
47
- protected $_infoBlockType = 'novalnet/instantbanktransfer_info';
48
 
49
-
50
  /**
51
  * Is this payment method a gateway (online auth/charge) ?
52
  */
@@ -109,18 +108,23 @@ class Mage_Novalnet_Model_NovalnetInstantbanktransfer extends Mage_Payment_Model
109
  }
110
  public function capture(Varien_Object $payment, $amount)
111
  {
112
- $order = $payment->getOrder();
113
- if ($order->getCustomerNote())
114
- {
115
- #$note = '<br />';
116
- $note = Mage::helper('novalnet')->__('Comment').': ';
117
- $note .= $order->getCustomerNote();
118
- $order->setCustomerNote($note);
119
- $order->setCustomerNoteNotify(true);
120
- }
 
 
 
 
 
121
 
122
- $session = Mage::getSingleton('checkout/session');
123
- return $this;
124
  }
125
  public function refund(Varien_Object $payment, $amount)
126
  {
@@ -173,13 +177,25 @@ class Mage_Novalnet_Model_NovalnetInstantbanktransfer extends Mage_Payment_Model
173
  $paymentInfo = $this->getInfoInstance();
174
  $order = $this->getOrder();
175
 
 
 
 
 
 
 
 
 
 
 
 
176
  $fieldsArr['key'] = self::KEY;
177
  $fieldsArr['vendor'] = $this->getConfigData('merchant_id');
178
  $fieldsArr['auth_code'] = $this->encode($this->getConfigData('auth_code'), $this->password);
179
  $fieldsArr['product'] = $this->encode($this->getConfigData('product_id'), $this->password);
180
  $fieldsArr['tariff'] = $this->encode($this->getConfigData('tariff_id'), $this->password);
181
  $fieldsArr['amount'] = $this->encode(($order->getBaseGrandTotal()*100), $this->password);
182
- $fieldsArr['test_mode'] = $this->encode($this->getConfigData('test_mode'), $this->password);
 
183
  $fieldsArr['uniqid'] = $this->encode(uniqid(), $this->password);
184
 
185
  $hParams['auth_code'] = $fieldsArr['auth_code'];
@@ -213,28 +229,28 @@ class Mage_Novalnet_Model_NovalnetInstantbanktransfer extends Mage_Payment_Model
213
  $fieldsArr['inputval1'] = $paymentInfo->getOrder()->getRealOrderId();
214
  $fieldsArr['user_variable_0'] = str_replace(array('http://', 'www.'), array('', ''), $_SERVER['SERVER_NAME']);
215
 
216
- #on Clicking onto <Weiter> after choice of payment type
217
- /*
218
- payment[method]=novalnetInstantbanktransfer
219
- payment[cc_type]=VI
220
- payment[cc_owner]=Zhang
221
- payment[cc_number]=4200000000000000
222
- payment[cc_exp_month]=1
223
- payment[cc_exp_year]=2012
224
- payment[cc_cid]=123
225
- */
226
- #$fieldsArr['payment[method]'] = 'novalnetInstantbanktransfer';
227
 
228
- ############## INSTANT BANK Transfer specific parameters
229
- $fieldsArr['user_variable_0'] = str_replace('http://', '', Mage::getBaseUrl());
230
 
231
- $request = '';
232
- foreach ($fieldsArr as $k => $v) {
233
- $request .= '<' . $k . '>' . $v . '</' . $k . '>';
234
- }
235
- return $fieldsArr;
236
  }
237
-
238
  public function getOrderPlaceRedirectUrl()
239
  {
240
  return Mage::getUrl('novalnet/instantbanktransfer/redirect', array('_secure' => true));#path: magento\app\code\community\Mage\Novalnet\Block\Instantbanktransfer\redirect.php
@@ -282,9 +298,9 @@ class Mage_Novalnet_Model_NovalnetInstantbanktransfer extends Mage_Payment_Model
282
  {
283
  return $this;
284
  }
285
- public function debug2($object, $filename)
286
  {
287
- if (!$this->_debug){return;}
288
  $fh = fopen("/tmp/$filename", 'a+');
289
  if (gettype($object) == 'object' or gettype($object) == 'array'){
290
  fwrite($fh, serialize($object));
@@ -356,4 +372,11 @@ class Mage_Novalnet_Model_NovalnetInstantbanktransfer extends Mage_Payment_Model
356
  }
357
  return true;
358
  }
 
 
 
 
 
 
 
359
  }
21
  *
22
  * @category design_default
23
  * @package Mage
24
+ * @copyright Copyright (c) 2008-2010 Novalnet AG
25
  * @version 1.0.0
26
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
27
  */
44
  */
45
  protected $_code = 'novalnetInstantbanktransfer';#path = magento\app\code\community\Mage\Novalnet\Model\novalnetInstantbanktransfer.php
46
  protected $_formBlockType = 'novalnet/instantbanktransfer_form';#path = magento\app\design\frontend\default\default\template\novalnet\instantbanktransfer\form.phtml
47
+ protected $_infoBlockType = 'novalnet/instantbanktransfer_info';
48
 
 
49
  /**
50
  * Is this payment method a gateway (online auth/charge) ?
51
  */
108
  }
109
  public function capture(Varien_Object $payment, $amount)
110
  {
111
+ $order = $payment->getOrder();
112
+ $note = $order->getCustomerNote();
113
+ if ($note){
114
+ $note = '<br />'.Mage::helper('novalnet')->__('Comment').': ';
115
+ $note .= $order->getCustomerNote();
116
+ }
117
+ if ( !$this->getConfigData('live_mode') ){
118
+ $note .= '<br /><b><font color="red">'.strtoupper(Mage::helper('novalnet')->__('Testorder')).'</font></b>';
119
+ }
120
+ $order->setComment($note);
121
+ $order->setCustomerNote($note);
122
+ $order->setCustomerNoteNotify(true);
123
+ $order->save();
124
+ #$this->debug2($order, $filename='magent_ibt.txt', true);
125
 
126
+ $session = Mage::getSingleton('checkout/session');
127
+ return $this;
128
  }
129
  public function refund(Varien_Object $payment, $amount)
130
  {
177
  $paymentInfo = $this->getInfoInstance();
178
  $order = $this->getOrder();
179
 
180
+ $note = $order->getCustomerNote();
181
+ if ($note){
182
+ $note = '<br />'.Mage::helper('novalnet')->__('Comment').': '.$note;
183
+ }
184
+ if ( !$this->getConfigData('live_mode') ){
185
+ $note .= '<br /><b><font color="red">'.strtoupper(Mage::helper('novalnet')->__('Testorder')).'</font></b>';
186
+ }
187
+ $order->setComment($note);
188
+ $order->setCustomerNote($note);
189
+ $order->setCustomerNoteNotify(true);
190
+
191
  $fieldsArr['key'] = self::KEY;
192
  $fieldsArr['vendor'] = $this->getConfigData('merchant_id');
193
  $fieldsArr['auth_code'] = $this->encode($this->getConfigData('auth_code'), $this->password);
194
  $fieldsArr['product'] = $this->encode($this->getConfigData('product_id'), $this->password);
195
  $fieldsArr['tariff'] = $this->encode($this->getConfigData('tariff_id'), $this->password);
196
  $fieldsArr['amount'] = $this->encode(($order->getBaseGrandTotal()*100), $this->password);
197
+ #$fieldsArr['test_mode'] = $this->encode($this->getConfigData('test_mode'), $this->password);
198
+ $fieldsArr['test_mode'] = $this->encode((!$this->getConfigData('live_mode'))? 1: 0, $this->password);
199
  $fieldsArr['uniqid'] = $this->encode(uniqid(), $this->password);
200
 
201
  $hParams['auth_code'] = $fieldsArr['auth_code'];
229
  $fieldsArr['inputval1'] = $paymentInfo->getOrder()->getRealOrderId();
230
  $fieldsArr['user_variable_0'] = str_replace(array('http://', 'www.'), array('', ''), $_SERVER['SERVER_NAME']);
231
 
232
+ #on Clicking onto <Weiter> after choice of payment type
233
+ /*
234
+ payment[method]=novalnetInstantbanktransfer
235
+ payment[cc_type]=VI
236
+ payment[cc_owner]=Zhang
237
+ payment[cc_number]=4200000000000000
238
+ payment[cc_exp_month]=1
239
+ payment[cc_exp_year]=2012
240
+ payment[cc_cid]=123
241
+ */
242
+ #$fieldsArr['payment[method]'] = 'novalnetInstantbanktransfer';
243
 
244
+ ############## INSTANT BANK Transfer specific parameters
245
+ $fieldsArr['user_variable_0'] = str_replace('http://', '', Mage::getBaseUrl());
246
 
247
+ $request = '';
248
+ foreach ($fieldsArr as $k => $v) {
249
+ $request .= '<' . $k . '>' . $v . '</' . $k . '>';
250
+ }
251
+ return $fieldsArr;
252
  }
253
+
254
  public function getOrderPlaceRedirectUrl()
255
  {
256
  return Mage::getUrl('novalnet/instantbanktransfer/redirect', array('_secure' => true));#path: magento\app\code\community\Mage\Novalnet\Block\Instantbanktransfer\redirect.php
298
  {
299
  return $this;
300
  }
301
+ private function debug2($object, $filename, $debug = false)
302
  {
303
+ if (!$this->debug and !$debug){return;}
304
  $fh = fopen("/tmp/$filename", 'a+');
305
  if (gettype($object) == 'object' or gettype($object) == 'array'){
306
  fwrite($fh, serialize($object));
372
  }
373
  return true;
374
  }
375
+ /*order of func
376
+ 19:30:01 redirectAction<hr />controller
377
+ 19:30:03 getFormFields<hr />
378
+ 19:30:47 successAction<hr />controller
379
+ 19:30:47 _checkReturnedPost<hr />controller
380
+ 19:30:48 capture<hr />
381
+ */
382
  }
app/code/community/Mage/Novalnet/Model/NovalnetInvoice.php CHANGED
@@ -115,7 +115,7 @@ class Mage_Novalnet_Model_NovalnetInvoice extends Mage_Payment_Model_Method_Abst
115
 
116
  if ($result->getStatus() == self::RESPONSE_CODE_APPROVED) {
117
  #$payment->setStatus(self::STATUS_APPROVED);
118
- $payment->setStatus(self::STATUS_PENDING);
119
  $payment->setCcTransId($result->getTid());
120
  $payment->setLastTransId($result->getTid());
121
  $payment->setNnAccountNumber(substr($payment->getNnAccountNumber(),0,-4)."XXXX");
@@ -175,7 +175,8 @@ class Mage_Novalnet_Model_NovalnetInvoice extends Mage_Payment_Model_Method_Abst
175
  $request->setvendor($this->getConfigData('merchant_id'))
176
  ->setauth_code($this->getConfigData('auth_code'))
177
  ->setproduct($this->getConfigData('product_id'))
178
- ->settariff($this->getConfigData('tariff_id'));
 
179
 
180
  $request->setcurrency($order->getOrderCurrency());
181
 
@@ -274,12 +275,16 @@ class Mage_Novalnet_Model_NovalnetInvoice extends Mage_Payment_Model_Method_Abst
274
  $result->toUtf8();
275
  $note = $this->getNote($aryResponse);
276
  $order = $payment->getOrder();
277
- if ($order->getCustomerNote())
278
- {
279
- $note .= '<br /><br />';
280
- $note .= Mage::helper('novalnet')->__('Comment').': ';
281
- $note .= $order->getCustomerNote();
282
- }
 
 
 
 
283
  $order->setCustomerNote($note);
284
  $order->setCustomerNoteNotify(true);
285
  #$fh = fopen('/temp/magento.txt', 'w');fwrite($fh, $note);
@@ -420,39 +425,39 @@ class Mage_Novalnet_Model_NovalnetInvoice extends Mage_Payment_Model_Method_Abst
420
  }
421
  public function getNote($aryResponse)
422
  {
423
- #todo: Kontoinhaber fehlt
424
- $note = Mage::helper('novalnet')->__('Please transfer the amount at the latest, untill').' '.$this->due_date.' '.Mage::helper('novalnet')->__('to following account').":<br /><br />\n\n";
425
-
426
- $note.= Mage::helper('novalnet')->__('Account Holder2').": NOVALNET AG<br />\n";
427
- $note.= Mage::helper('novalnet')->__('Account Number').": ".$aryResponse['invoice_account']."<br />\n";
428
- $note.= Mage::helper('novalnet')->__('Bank Sorting Code').": ".$aryResponse['invoice_bankcode']."<br />\n";
429
- $note.= Mage::helper('novalnet')->__('Bank').": ".$aryResponse['invoice_bankname'].', Muenchen<br /><br />'."\n\n"; #.$aryResponse['invoice_bankplace']."\n\n";
430
-
431
- $note.= "IBAN: ".$aryResponse['invoice_iban']."<br />\n";
432
- $note.= "SWIFT / BIC: ".$aryResponse['invoice_bic']."<br /><br />\n\n";
433
-
434
- $note.= Mage::helper('novalnet')->__('Amount').": ".str_replace('.', ',', $aryResponse['amount'])." EUR<br />\n";
435
- $note.= Mage::helper('novalnet')->__('Reference').": TID ".$aryResponse['tid']."<br />\n";
436
- $note.= Mage::helper('novalnet')->__('Please note that the Transfer can only be identified with the above mentioned Reference').'.';
437
-
438
- /*
439
- aryResponce:
440
- status=>100
441
- nc_no=>2200224420635320
442
- tid=>11934900002719418
443
- memburl=>http://magento.gsoftpro.de/
444
- login=>
445
- password=>
446
- end_date=>
447
- amount=>1204.97 => 1204,97
448
- invoice_account=>660983147
449
- invoice_bankcode=>70020270
450
- invoice_iban=>DE55700202700660983147
451
- invoice_bic=>HYVEDEMMXXX
452
- invoice_bankname=>Hypovereinsbank
453
- invoice_bankplace=>M��nchen
454
- */
455
- return$note;
456
  }
457
 
458
  private function debug2($object, $filename)
115
 
116
  if ($result->getStatus() == self::RESPONSE_CODE_APPROVED) {
117
  #$payment->setStatus(self::STATUS_APPROVED);
118
+ $payment->setStatus(self::STATUS_PENDING);
119
  $payment->setCcTransId($result->getTid());
120
  $payment->setLastTransId($result->getTid());
121
  $payment->setNnAccountNumber(substr($payment->getNnAccountNumber(),0,-4)."XXXX");
175
  $request->setvendor($this->getConfigData('merchant_id'))
176
  ->setauth_code($this->getConfigData('auth_code'))
177
  ->setproduct($this->getConfigData('product_id'))
178
+ ->settariff($this->getConfigData('tariff_id'))
179
+ ->settest_mode((!$this->getConfigData('live_mode'))? 1: 0);
180
 
181
  $request->setcurrency($order->getOrderCurrency());
182
 
275
  $result->toUtf8();
276
  $note = $this->getNote($aryResponse);
277
  $order = $payment->getOrder();
278
+ if ($order->getCustomerNote())
279
+ {
280
+ $note .= '<br /><br />';
281
+ $note .= Mage::helper('novalnet')->__('Comment').': ';
282
+ $note .= $order->getCustomerNote();
283
+ }
284
+ if ( !$this->getConfigData('live_mode') ){
285
+ $note .= '<br /><b><font color="red">'.strtoupper(Mage::helper('novalnet')->__('Testorder')).'</font></b>';
286
+ }
287
+
288
  $order->setCustomerNote($note);
289
  $order->setCustomerNoteNotify(true);
290
  #$fh = fopen('/temp/magento.txt', 'w');fwrite($fh, $note);
425
  }
426
  public function getNote($aryResponse)
427
  {
428
+ #todo: Kontoinhaber fehlt
429
+ $note = Mage::helper('novalnet')->__('Please transfer the amount at the latest, untill').' '.$this->due_date.' '.Mage::helper('novalnet')->__('to following account').":<br /><br />\n\n";
430
+
431
+ $note.= Mage::helper('novalnet')->__('Account Holder2').": NOVALNET AG<br />\n";
432
+ $note.= Mage::helper('novalnet')->__('Account Number').": ".$aryResponse['invoice_account']."<br />\n";
433
+ $note.= Mage::helper('novalnet')->__('Bank Sorting Code').": ".$aryResponse['invoice_bankcode']."<br />\n";
434
+ $note.= Mage::helper('novalnet')->__('Bank').": ".$aryResponse['invoice_bankname'].', Muenchen<br /><br />'."\n\n"; #.$aryResponse['invoice_bankplace']."\n\n";
435
+
436
+ $note.= "IBAN: ".$aryResponse['invoice_iban']."<br />\n";
437
+ $note.= "SWIFT / BIC: ".$aryResponse['invoice_bic']."<br /><br />\n\n";
438
+
439
+ $note.= Mage::helper('novalnet')->__('Amount').": ".str_replace('.', ',', $aryResponse['amount'])." EUR<br />\n";
440
+ $note.= Mage::helper('novalnet')->__('Reference').": TID ".$aryResponse['tid']."<br />\n";
441
+ $note.= Mage::helper('novalnet')->__('Please note that the Transfer can only be identified with the above mentioned Reference').'.';
442
+
443
+ /*
444
+ aryResponce:
445
+ status=>100
446
+ nc_no=>2200224420635320
447
+ tid=>11934900002719418
448
+ memburl=>http://magento.gsoftpro.de/
449
+ login=>
450
+ password=>
451
+ end_date=>
452
+ amount=>1204.97 => 1204,97
453
+ invoice_account=>660983147
454
+ invoice_bankcode=>70020270
455
+ invoice_iban=>DE55700202700660983147
456
+ invoice_bic=>HYVEDEMMXXX
457
+ invoice_bankname=>Hypovereinsbank
458
+ invoice_bankplace=>M��nchen
459
+ */
460
+ return$note;
461
  }
462
 
463
  private function debug2($object, $filename)
app/code/community/Mage/Novalnet/Model/NovalnetPhonepayment.php CHANGED
@@ -28,12 +28,12 @@
28
 
29
  class Mage_Novalnet_Model_NovalnetPhonepayment extends Mage_Payment_Model_Method_Abstract
30
  {
31
- const CGI_URL = 'https://payport.novalnet.de/paygate.jsp';
32
- const CGI_URL2= 'https://payport.novalnet.de/nn_infoport.xml';#'nn_infoport_test.xml';
33
- const RESPONSE_DELIM_CHAR = '&';
34
- const RESPONSE_CODE_APPROVED = 100;
35
- const PAYMENT_METHOD = 'PHONEPAYMENT';
36
- const KEY = 18;
37
  const AMOUNT_MIN = 90;
38
  const AMOUNT_MAX = 1000;#10;#todo:
39
  const CURRENCY = 'EUR';
@@ -43,9 +43,9 @@ class Mage_Novalnet_Model_NovalnetPhonepayment extends Mage_Payment_Model_Method
43
  *
44
  * @var string [a-z0-9_]
45
  */
46
- protected $_code = 'novalnetPhonepayment';
47
- protected $_formBlockType = 'novalnet/phonepayment_form';
48
- protected $_infoBlockType = 'novalnet/phonepayment_info';
49
  protected $code = 'novalnet_tel';
50
  protected $public_title = 'Telefonpayment';
51
  protected $amount = 0;
@@ -118,26 +118,30 @@ class Mage_Novalnet_Model_NovalnetPhonepayment extends Mage_Payment_Model_Method
118
  }
119
  public function capture(Varien_Object $payment, $amount)
120
  {
121
- $error = false;
122
- $payment->setAmount($amount);
123
- $this->debug2($amount, 'magento_capture_amount.txt');
124
-
125
- $order = $payment->getOrder();
126
- if ($order->getCustomerNote())
127
- {
128
- #$note = '<br />';
129
- $note = Mage::helper('novalnet')->__('Comment').': ';
130
- $note .= $order->getCustomerNote();
131
- $order->setCustomerNote($note);
132
- $order->setCustomerNoteNotify(true);
133
- }
 
 
 
 
134
 
135
  $request = $this->_buildRequest($payment);
136
- $this->debug2($request, 'magento_capture_request.txt');
137
  $result = $this->_postRequest($request, $payment);
138
- $this->debug2($result, 'magento_capture_result.txt');
139
  if ($result->getStatus() == self::RESPONSE_CODE_APPROVED) {
140
- $this->debug2($result, 'magento_capture_resultok.txt');
141
  $payment->setStatus(self::STATUS_APPROVED);
142
  $payment->setCcTransId($result->getTid());
143
  $payment->setLastTransId($result->getTid());
@@ -145,15 +149,15 @@ class Mage_Novalnet_Model_NovalnetPhonepayment extends Mage_Payment_Model_Method
145
  $payment->setNnBankSortingCode(substr($payment->getNnBankSortingCode(),0,-3)."XXX");
146
  $id = $payment->getNnId();
147
  $quote_payment = $this->getQuote()->getPaymentById($id);
148
- if ($quote_payment)#to avoid error msg. in admin interface
149
- {
150
- $quote_payment->setNnAccountNumber(substr($payment->getNnAccountNumber(),0,-4)."XXXX");
151
- $quote_payment->setNnBankSortingCode(substr($payment->getNnBankSortingCode(),0,-3)."XXX");
152
- $quote_payment->save();
153
- }
154
  }
155
  else {
156
- $this->debug2($result, 'magento_capture_resultnotok.txt');
157
  if ($result->getStatusDesc()) {
158
  $error = Mage::helper('novalnet')->htmlEscape($result->getStatusDesc());
159
  }else {
@@ -162,8 +166,8 @@ class Mage_Novalnet_Model_NovalnetPhonepayment extends Mage_Payment_Model_Method
162
  }
163
 
164
  if ($error !== false) {
165
- $this->debug2($error, 'magento_error.txt');
166
- Mage::throwException($error);
167
  }
168
  return $this;
169
  }
@@ -193,15 +197,16 @@ class Mage_Novalnet_Model_NovalnetPhonepayment extends Mage_Payment_Model_Method
193
  protected function _buildRequest(Varien_Object $payment)
194
  {
195
  $order = $payment->getOrder();
196
- if (session_is_registered('tid')){
197
- $this->debug2($order, 'magento_order2.txt');
198
- }
199
  $request = Mage::getModel('novalnet/novalnet_request');
200
 
201
  $request->setvendor($this->getConfigData('merchant_id'))
202
  ->setauth_code($this->getConfigData('auth_code'))
203
  ->setproduct($this->getConfigData('product_id'))
204
- ->settariff($this->getConfigData('tariff_id'));
 
205
 
206
  $request->setcurrency($order->getOrderCurrency());
207
 
@@ -217,14 +222,14 @@ class Mage_Novalnet_Model_NovalnetPhonepayment extends Mage_Payment_Model_Method
217
  $street = preg_split("/(\d)/",$billing->getStreet(1),2,PREG_SPLIT_DELIM_CAPTURE);
218
  if (!$billing->getStreet(1)){Mage::throwException(Mage::helper('novalnet')->__('Street missing'));}
219
  if (!empty($billing)) {
220
- if (session_is_registered('tid')){
221
- $this->debug2($billing, 'magento_billing2.txt');
222
- }
223
 
224
- if (!$order->getCustomerEmail())
225
- {
226
- Mage::throwException(Mage::helper('novalnet')->__('Email address missing'));
227
- }
228
 
229
  $request->setfirst_name($billing->getFirstname())
230
  ->setLast_name($billing->getlastname())
@@ -262,14 +267,13 @@ class Mage_Novalnet_Model_NovalnetPhonepayment extends Mage_Payment_Model_Method
262
  protected function _postRequest(Varien_Object $request, Varien_Object $payment=null)
263
  {
264
  $result = Mage::getModel('novalnet/novalnet_result');
265
-
266
  $client = new Varien_Http_Client();
267
 
268
  if (!session_is_registered('tid')){#first call
269
- $client->setUri(self::CGI_URL);
270
- }else{#second call
271
- $client->setUri(self::CGI_URL2);
272
- }
273
 
274
  $client->setConfig(array(
275
  'maxredirects'=>0,
@@ -298,13 +302,13 @@ class Mage_Novalnet_Model_NovalnetPhonepayment extends Mage_Payment_Model_Method
298
  }
299
  $response = $client->request($method2);
300
  } catch (Exception $e) {
301
- $this->debug2($e->getMessage(), 'magento_exceptionMsg.txt');
302
- $result->setResponseCode(-1)
303
- ->setResponseReasonCode($e->getCode())
304
- ->setResponseReasonText($e->getMessage());
305
- Mage::throwException(
306
- Mage::helper('novalnet')->__('Gateway request error: %s', $e->getMessage())
307
- );
308
  }
309
  $responseBody = $response->getBody();
310
 
@@ -528,7 +532,7 @@ class Mage_Novalnet_Model_NovalnetPhonepayment extends Mage_Payment_Model_Method
528
  $amount = str_replace(array('.', ','), array('',''), $amount);
529
  return$amount;
530
  }
531
- public function getNote($aryResponse)
532
  {
533
  #todo: Kontoinhaber fehlt
534
  $note = Mage::helper('novalnet')->__('Please transfer the amount to following account').":<br /><br />\n\n";
28
 
29
  class Mage_Novalnet_Model_NovalnetPhonepayment extends Mage_Payment_Model_Method_Abstract
30
  {
31
+ const CGI_URL = 'https://payport.novalnet.de/paygate.jsp';
32
+ const CGI_URL2= 'https://payport.novalnet.de/nn_infoport.xml';#'nn_infoport_test.xml';
33
+ const RESPONSE_DELIM_CHAR = '&';
34
+ const RESPONSE_CODE_APPROVED = 100;
35
+ const PAYMENT_METHOD = 'PHONEPAYMENT';
36
+ const KEY = 18;
37
  const AMOUNT_MIN = 90;
38
  const AMOUNT_MAX = 1000;#10;#todo:
39
  const CURRENCY = 'EUR';
43
  *
44
  * @var string [a-z0-9_]
45
  */
46
+ protected $_code = 'novalnetPhonepayment';
47
+ protected $_formBlockType = 'novalnet/phonepayment_form';
48
+ protected $_infoBlockType = 'novalnet/phonepayment_info';
49
  protected $code = 'novalnet_tel';
50
  protected $public_title = 'Telefonpayment';
51
  protected $amount = 0;
118
  }
119
  public function capture(Varien_Object $payment, $amount)
120
  {
121
+ $error = false;
122
+ $payment->setAmount($amount);
123
+ $this->debug2($amount, 'magento_capture_amount.txt');
124
+
125
+ $order = $payment->getOrder();
126
+ $note = $order->getCustomerNote();
127
+ if ($note)
128
+ {
129
+ $note .= '<br />'.Mage::helper('novalnet')->__('Comment').': ';
130
+ $note .= $order->getCustomerNote();
131
+ }
132
+ if ( !$this->getConfigData('live_mode') ){
133
+ $note .= '<br /><b><font color="red">'.strtoupper(Mage::helper('novalnet')->__('Testorder')).'</font></b>';
134
+ }
135
+
136
+ $order->setCustomerNote($note);
137
+ $order->setCustomerNoteNotify(true);
138
 
139
  $request = $this->_buildRequest($payment);
140
+ $this->debug2($request, 'magento_capture_request.txt');
141
  $result = $this->_postRequest($request, $payment);
142
+ $this->debug2($result, 'magento_capture_result.txt');
143
  if ($result->getStatus() == self::RESPONSE_CODE_APPROVED) {
144
+ $this->debug2($result, 'magento_capture_resultok.txt');
145
  $payment->setStatus(self::STATUS_APPROVED);
146
  $payment->setCcTransId($result->getTid());
147
  $payment->setLastTransId($result->getTid());
149
  $payment->setNnBankSortingCode(substr($payment->getNnBankSortingCode(),0,-3)."XXX");
150
  $id = $payment->getNnId();
151
  $quote_payment = $this->getQuote()->getPaymentById($id);
152
+ if ($quote_payment)#to avoid error msg. in admin interface
153
+ {
154
+ $quote_payment->setNnAccountNumber(substr($payment->getNnAccountNumber(),0,-4)."XXXX");
155
+ $quote_payment->setNnBankSortingCode(substr($payment->getNnBankSortingCode(),0,-3)."XXX");
156
+ $quote_payment->save();
157
+ }
158
  }
159
  else {
160
+ $this->debug2($result, 'magento_capture_resultnotok.txt');
161
  if ($result->getStatusDesc()) {
162
  $error = Mage::helper('novalnet')->htmlEscape($result->getStatusDesc());
163
  }else {
166
  }
167
 
168
  if ($error !== false) {
169
+ $this->debug2($error, 'magento_error.txt');
170
+ Mage::throwException($error);
171
  }
172
  return $this;
173
  }
197
  protected function _buildRequest(Varien_Object $payment)
198
  {
199
  $order = $payment->getOrder();
200
+ if (session_is_registered('tid')){
201
+ $this->debug2($order, 'magento_order2.txt');
202
+ }
203
  $request = Mage::getModel('novalnet/novalnet_request');
204
 
205
  $request->setvendor($this->getConfigData('merchant_id'))
206
  ->setauth_code($this->getConfigData('auth_code'))
207
  ->setproduct($this->getConfigData('product_id'))
208
+ ->settariff($this->getConfigData('tariff_id'))
209
+ ->settest_mode((!$this->getConfigData('live_mode'))? 1: 0);
210
 
211
  $request->setcurrency($order->getOrderCurrency());
212
 
222
  $street = preg_split("/(\d)/",$billing->getStreet(1),2,PREG_SPLIT_DELIM_CAPTURE);
223
  if (!$billing->getStreet(1)){Mage::throwException(Mage::helper('novalnet')->__('Street missing'));}
224
  if (!empty($billing)) {
225
+ if (session_is_registered('tid')){
226
+ $this->debug2($billing, 'magento_billing2.txt');
227
+ }
228
 
229
+ if (!$order->getCustomerEmail())
230
+ {
231
+ Mage::throwException(Mage::helper('novalnet')->__('Email address missing'));
232
+ }
233
 
234
  $request->setfirst_name($billing->getFirstname())
235
  ->setLast_name($billing->getlastname())
267
  protected function _postRequest(Varien_Object $request, Varien_Object $payment=null)
268
  {
269
  $result = Mage::getModel('novalnet/novalnet_result');
 
270
  $client = new Varien_Http_Client();
271
 
272
  if (!session_is_registered('tid')){#first call
273
+ $client->setUri(self::CGI_URL);
274
+ }else{#second call
275
+ $client->setUri(self::CGI_URL2);
276
+ }
277
 
278
  $client->setConfig(array(
279
  'maxredirects'=>0,
302
  }
303
  $response = $client->request($method2);
304
  } catch (Exception $e) {
305
+ $this->debug2($e->getMessage(), 'magento_exceptionMsg.txt');
306
+ $result->setResponseCode(-1)
307
+ ->setResponseReasonCode($e->getCode())
308
+ ->setResponseReasonText($e->getMessage());
309
+ Mage::throwException(
310
+ Mage::helper('novalnet')->__('Gateway request error: %s', $e->getMessage())
311
+ );
312
  }
313
  $responseBody = $response->getBody();
314
 
532
  $amount = str_replace(array('.', ','), array('',''), $amount);
533
  return$amount;
534
  }
535
+ public function getNote($aryResponse)
536
  {
537
  #todo: Kontoinhaber fehlt
538
  $note = Mage::helper('novalnet')->__('Please transfer the amount to following account').":<br /><br />\n\n";
app/code/community/Mage/Novalnet/Model/NovalnetPrepayment.php CHANGED
@@ -33,7 +33,7 @@ class Mage_Novalnet_Model_NovalnetPrepayment extends Mage_Payment_Model_Method_A
33
  const RESPONSE_CODE_APPROVED = 100;
34
  const PAYMENT_METHOD = 'PREPAYMENT';
35
  const KEY = 27;
36
- const STATUS_PENDING = 'PENDING';
37
  /**
38
  * unique internal payment method identifier
39
  *
@@ -173,7 +173,8 @@ class Mage_Novalnet_Model_NovalnetPrepayment extends Mage_Payment_Model_Method_A
173
  $request->setvendor($this->getConfigData('merchant_id'))
174
  ->setauth_code($this->getConfigData('auth_code'))
175
  ->setproduct($this->getConfigData('product_id'))
176
- ->settariff($this->getConfigData('tariff_id'));
 
177
 
178
  $request->setcurrency($order->getOrderCurrency());
179
 
@@ -271,19 +272,22 @@ class Mage_Novalnet_Model_NovalnetPrepayment extends Mage_Payment_Model_Method_A
271
  );
272
  }
273
  $result->toUtf8();
274
- $note = $this->getNote($aryResponse);
275
- $order = $payment->getOrder();
276
- if ($order->getCustomerNote())
277
- {
278
- $note .= '<br /><br />';
279
- $note .= Mage::helper('novalnet')->__('Comment').': ';
280
- $note .= $order->getCustomerNote();
281
- }
 
 
 
282
  $order->setCustomerNote($note);
283
  $order->setCustomerNoteNotify(true);
284
  #Mage::throwException($order->getEmailCustomerNote());#todo:
285
- #$fh = fopen('/temp/magento2.txt', 'w');fwrite($fh, $note);
286
- return $result;
287
  }
288
 
289
 
33
  const RESPONSE_CODE_APPROVED = 100;
34
  const PAYMENT_METHOD = 'PREPAYMENT';
35
  const KEY = 27;
36
+ const STATUS_PENDING = 'PENDING';
37
  /**
38
  * unique internal payment method identifier
39
  *
173
  $request->setvendor($this->getConfigData('merchant_id'))
174
  ->setauth_code($this->getConfigData('auth_code'))
175
  ->setproduct($this->getConfigData('product_id'))
176
+ ->settariff($this->getConfigData('tariff_id'))
177
+ ->settest_mode((!$this->getConfigData('live_mode'))? 1: 0);
178
 
179
  $request->setcurrency($order->getOrderCurrency());
180
 
272
  );
273
  }
274
  $result->toUtf8();
275
+ $note = $this->getNote($aryResponse);
276
+ $order = $payment->getOrder();
277
+ if ($order->getCustomerNote())
278
+ {
279
+ $note .= '<br /><br />';
280
+ $note .= Mage::helper('novalnet')->__('Comment').': ';
281
+ $note .= $order->getCustomerNote();
282
+ }
283
+ if ( !$this->getConfigData('live_mode') ){
284
+ $note .= '<br /><b><font color="red">'.strtoupper(Mage::helper('novalnet')->__('Testorder')).'</font></b>';
285
+ }
286
  $order->setCustomerNote($note);
287
  $order->setCustomerNoteNotify(true);
288
  #Mage::throwException($order->getEmailCustomerNote());#todo:
289
+ #$fh = fopen('/temp/magento2.txt', 'w');fwrite($fh, $note);
290
+ return $result;
291
  }
292
 
293
 
app/code/community/Mage/Novalnet/Model/NovalnetSecure.php CHANGED
@@ -105,19 +105,25 @@ class Mage_Novalnet_Model_NovalnetSecure extends Mage_Payment_Model_Method_Cc
105
  }
106
  public function capture(Varien_Object $payment, $amount)
107
  {
108
- $order = $payment->getOrder();
109
- if ($order->getCustomerNote())
110
- {
111
- #$note = '<br />';
112
- $note = Mage::helper('novalnet')->__('Comment').': ';
113
- $note .= $order->getCustomerNote();
114
- $order->setCustomerNote($note);
115
- $order->setCustomerNoteNotify(true);
116
- }
117
 
118
  $session = Mage::getSingleton('checkout/session');
119
- $session->setCcNumber(Mage::helper('core')->encrypt($payment->getCcNumber()));
 
120
  $session->setCcCid(Mage::helper('core')->encrypt($payment->getCcCid()));
 
 
 
 
 
121
  return $this;
122
  }
123
  public function refund(Varien_Object $payment, $amount)
@@ -165,28 +171,28 @@ class Mage_Novalnet_Model_NovalnetSecure extends Mage_Payment_Model_Method_Cc
165
  $billing = $this->getOrder()->getBillingAddress();
166
  $payment = $this->getOrder()->getPayment();
167
  $fieldsArr = array();
168
- $session = Mage::getSingleton('checkout/session');
169
- $paymentInfo = $this->getInfoInstance();
170
- $order = $this->getOrder();
171
- $fieldsArr['vendor'] = $this->getConfigData('merchant_id');
172
  $fieldsArr['auth_code'] = $this->getConfigData('auth_code');
173
- $fieldsArr['key'] = 6;
174
- $fieldsArr['product'] = $this->getConfigData('product_id');
175
- $fieldsArr['tariff'] = $this->getConfigData('tariff_id');
176
- $fieldsArr['amount'] = ($order->getBaseGrandTotal()*100);
177
-
178
- $fieldsArr['currency'] = $order->getOrderCurrencyCode();
179
- $fieldsArr['first_name'] = $billing->getFirstname();
180
  $fieldsArr['last_name'] = $billing->getLastname();
181
- $fieldsArr['email'] = $this->getOrder()->getCustomerEmail();
182
- $fieldsArr['street'] = $billing->getStreet(1);
183
  $fieldsArr['search_in_street'] = 1;
184
  $fieldsArr['city'] = $billing->getCity();
185
  $fieldsArr['zip'] = $billing->getPostcode();
186
  $fieldsArr['country_code'] = $billing->getCountry();
187
  $fieldsArr['lang'] = $billing->getLang();
188
  #$fieldsArr['remote_ip'] = $order->getRemoteIp();
189
- $fieldsArr['remote_ip'] = $this->getRealIpAddr();
190
  $fieldsArr['tel'] = $billing->getTelephone();
191
  $fieldsArr['fax'] = $billing->getFax();
192
  $fieldsArr['birth_date'] = $order->getRemoteIp();
105
  }
106
  public function capture(Varien_Object $payment, $amount)
107
  {
108
+ $order = $payment->getOrder();
109
+ if ($order->getCustomerNote())
110
+ {
111
+ #$note = '<br />';
112
+ $note = Mage::helper('novalnet')->__('Comment').': ';
113
+ $note .= $order->getCustomerNote();
114
+ $order->setCustomerNote($note);
115
+ $order->setCustomerNoteNotify(true);
116
+ }
117
 
118
  $session = Mage::getSingleton('checkout/session');
119
+ #$session->setCcNumber(Mage::helper('core')->encrypt($payment->getCcNumber()));
120
+ $session->setcc_no(Mage::helper('core')->encrypt($payment->getCcNumber()));
121
  $session->setCcCid(Mage::helper('core')->encrypt($payment->getCcCid()));
122
+ $session->setcc_exp_month(Mage::helper('core')->encrypt($payment->getCcExpMonth()));
123
+ $session->setcc_exp_year(Mage::helper('core')->encrypt($payment->getCcExpYear()));
124
+ $session->setcc_cvc2(Mage::helper('core')->encrypt($payment->getCcCid()));
125
+ $session->setcc_holder(Mage::helper('core')->encrypt($payment->getCcOwner()));
126
+
127
  return $this;
128
  }
129
  public function refund(Varien_Object $payment, $amount)
171
  $billing = $this->getOrder()->getBillingAddress();
172
  $payment = $this->getOrder()->getPayment();
173
  $fieldsArr = array();
174
+ $session = Mage::getSingleton('checkout/session');
175
+ $paymentInfo = $this->getInfoInstance();
176
+ $order = $this->getOrder();
177
+ $fieldsArr['vendor'] = $this->getConfigData('merchant_id');
178
  $fieldsArr['auth_code'] = $this->getConfigData('auth_code');
179
+ $fieldsArr['key'] = 6;
180
+ $fieldsArr['product'] = $this->getConfigData('product_id');
181
+ $fieldsArr['tariff'] = $this->getConfigData('tariff_id');
182
+ $fieldsArr['amount'] = ($order->getBaseGrandTotal()*100);
183
+ $fieldsArr['test_mode'] = (!$this->getConfigData('live_mode'))? 1: 0;
184
+ $fieldsArr['currency'] = $order->getOrderCurrencyCode();
185
+ $fieldsArr['first_name']= $billing->getFirstname();
186
  $fieldsArr['last_name'] = $billing->getLastname();
187
+ $fieldsArr['email'] = $this->getOrder()->getCustomerEmail();
188
+ $fieldsArr['street'] = $billing->getStreet(1);
189
  $fieldsArr['search_in_street'] = 1;
190
  $fieldsArr['city'] = $billing->getCity();
191
  $fieldsArr['zip'] = $billing->getPostcode();
192
  $fieldsArr['country_code'] = $billing->getCountry();
193
  $fieldsArr['lang'] = $billing->getLang();
194
  #$fieldsArr['remote_ip'] = $order->getRemoteIp();
195
+ $fieldsArr['remote_ip'] = $this->getRealIpAddr();
196
  $fieldsArr['tel'] = $billing->getTelephone();
197
  $fieldsArr['fax'] = $billing->getFax();
198
  $fieldsArr['birth_date'] = $order->getRemoteIp();
app/code/community/Mage/Novalnet/controllers/InstantbanktransferController.php CHANGED
@@ -38,9 +38,21 @@ class Mage_Novalnet_InstantbanktransferController extends Mage_Core_Controller_F
38
  $order = Mage::getModel('sales/order');
39
  $order->loadByIncrementId($session->getLastRealOrderId());
40
  $order->addStatusToHistory($order->getStatus(), Mage::helper('novalnet')->__('Customer was redirected to Novalnet'));
 
 
 
 
 
 
 
 
 
 
 
 
41
  $order->save();
42
  #todo: update order status to open
43
- $_SESSION['status_zh'] = $order->getStatus();
44
  $this->setOrderStatus($session->getLastRealOrderId(), 'pending');
45
 
46
  $this->getResponse()->setBody(
@@ -69,6 +81,18 @@ class Mage_Novalnet_InstantbanktransferController extends Mage_Core_Controller_F
69
 
70
  $order = Mage::getModel('sales/order');
71
  $order->load($this->getCheckout()->getLastOrderId());
 
 
 
 
 
 
 
 
 
 
 
 
72
  if($order->getId()) {
73
  $order->sendNewOrderEmail();
74
  }
@@ -141,10 +165,27 @@ class Mage_Novalnet_InstantbanktransferController extends Mage_Core_Controller_F
141
  $payment->setLastTransId($response['tid']);
142
  $payment->setCcTransId($response['tid']);
143
  $order->addStatusToHistory($order->getStatus(), Mage::helper('novalnet')->__('Customer successfully returned from Novalnet'));
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
144
  $order->save();
145
  $this->setOrderStatus($response['inputval1'], $_SESSION['status_zh']);#new
 
146
  //}
147
- } else {
148
  $paymentInst->setTransactionId($response['tid']);
149
  $payment->setLastTransId($response['tid']);
150
  $payment->setCcTransId($response['tid']);
@@ -172,7 +213,7 @@ class Mage_Novalnet_InstantbanktransferController extends Mage_Core_Controller_F
172
  return $status;
173
  }
174
 
175
- public function debug2($object, $filename, $debug = false)
176
  {
177
  if (!$this->debug and !$debug){return;}
178
  $fh = fopen("/tmp/$filename", 'a+');
@@ -228,11 +269,11 @@ class Mage_Novalnet_InstantbanktransferController extends Mage_Core_Controller_F
228
  {
229
  if (!$request) return false; #'Error: no data';
230
  $h['auth_code'] = $request['auth_code'];#encoded
231
- $h['product_id'] = $request['product'];#encoded
232
- $h['tariff'] = $request['tariff'];#encoded
233
- $h['amount'] = $request['amount'];#encoded
234
  $h['test_mode'] = $request['test_mode'];#encoded
235
- $h['uniqid'] = $request['uniqid'];#encoded
236
 
237
  if ($request['hash2'] != $this->hash($h, $key)){
238
  return false;
@@ -287,5 +328,12 @@ class Mage_Novalnet_InstantbanktransferController extends Mage_Core_Controller_F
287
  }
288
  }
289
  }
 
 
 
 
 
 
 
290
  }
291
  ?>
38
  $order = Mage::getModel('sales/order');
39
  $order->loadByIncrementId($session->getLastRealOrderId());
40
  $order->addStatusToHistory($order->getStatus(), Mage::helper('novalnet')->__('Customer was redirected to Novalnet'));
41
+
42
+ $note = $order->getCustomerNote();
43
+ if ($note){
44
+ $note = '<br />'.Mage::helper('novalnet')->__('Comment').': '.$note;
45
+ }
46
+ #if (!$this->getConfigData('live_mode')) {
47
+ $note .= '<br /><b><font color="red">'.strtoupper(Mage::helper('novalnet')->__('Testorder')).'</font></b>';
48
+ #}
49
+ $order->setComment($note);
50
+ $order->setCustomerNote($note);
51
+ $order->setCustomerNoteNotify(true);
52
+
53
  $order->save();
54
  #todo: update order status to open
55
+ $_SESSION['status_zh'] = $order->getStatus();
56
  $this->setOrderStatus($session->getLastRealOrderId(), 'pending');
57
 
58
  $this->getResponse()->setBody(
81
 
82
  $order = Mage::getModel('sales/order');
83
  $order->load($this->getCheckout()->getLastOrderId());
84
+
85
+ $note = $order->getCustomerNote();
86
+ if ($note){
87
+ $note = '<br />'.Mage::helper('novalnet')->__('Comment').': '.$note;
88
+ }
89
+ #if ( !$this->getConfigData('live_mode') ){
90
+ $note .= '<br /><b><font color="red">'.strtoupper(Mage::helper('novalnet')->__('Testorder')).'</font></b>';
91
+ #}
92
+ $order->setComment($note);
93
+ $order->setCustomerNote($note);
94
+ $order->setCustomerNoteNotify(true);
95
+
96
  if($order->getId()) {
97
  $order->sendNewOrderEmail();
98
  }
165
  $payment->setLastTransId($response['tid']);
166
  $payment->setCcTransId($response['tid']);
167
  $order->addStatusToHistory($order->getStatus(), Mage::helper('novalnet')->__('Customer successfully returned from Novalnet'));
168
+ if ( $this->decode($response['test_mode'], $_SESSION['mima'])) {
169
+ $note = '<br /><b><font color="red">'.strtoupper(Mage::helper('novalnet')->__('Testorder')).'</font></b>';
170
+ $order->addStatusToHistory($order->getStatus(), $note);
171
+ }
172
+
173
+ $note = $order->getCustomerNote();
174
+ if ($note){
175
+ $note = '<br />'.Mage::helper('novalnet')->__('Comment').': '.$note;
176
+ }
177
+ if ( $this->decode($response['test_mode'], $_SESSION['mima'])) {
178
+ $note .= '<br /><b><font color="red">'.strtoupper(Mage::helper('novalnet')->__('Testorder')).'</font></b>';
179
+ }
180
+ $order->setComment($note);
181
+ $order->setCustomerNote($note);
182
+ $order->setCustomerNoteNotify(true);
183
+
184
  $order->save();
185
  $this->setOrderStatus($response['inputval1'], $_SESSION['status_zh']);#new
186
+ unset($_SESSION['status_zh']);
187
  //}
188
+ } else {#failed
189
  $paymentInst->setTransactionId($response['tid']);
190
  $payment->setLastTransId($response['tid']);
191
  $payment->setCcTransId($response['tid']);
213
  return $status;
214
  }
215
 
216
+ private function debug2($object, $filename, $debug = false)
217
  {
218
  if (!$this->debug and !$debug){return;}
219
  $fh = fopen("/tmp/$filename", 'a+');
269
  {
270
  if (!$request) return false; #'Error: no data';
271
  $h['auth_code'] = $request['auth_code'];#encoded
272
+ $h['product_id'] = $request['product']; #encoded
273
+ $h['tariff'] = $request['tariff']; #encoded
274
+ $h['amount'] = $request['amount']; #encoded
275
  $h['test_mode'] = $request['test_mode'];#encoded
276
+ $h['uniqid'] = $request['uniqid']; #encoded
277
 
278
  if ($request['hash2'] != $this->hash($h, $key)){
279
  return false;
328
  }
329
  }
330
  }
331
+ /*order of func
332
+ 19:30:01 redirectAction<hr />controller
333
+ 19:30:03 getFormFields<hr />
334
+ 19:30:47 successAction<hr />controller
335
+ 19:30:47 _checkReturnedPost<hr />controller
336
+ 19:30:48 capture<hr />
337
+ */
338
  }
339
  ?>
app/code/community/Mage/Novalnet/controllers/SecureController.php CHANGED
@@ -68,10 +68,13 @@ class Mage_Novalnet_SecureController extends Mage_Core_Controller_Front_Action
68
  $order->sendNewOrderEmail();
69
  }
70
 
71
- if ($status) {
72
  $this->_redirect('checkout/onepage/success');
73
  } else {
74
- $this->_redirect('*/*/failure');
 
 
 
75
  }
76
  }
77
 
@@ -127,6 +130,17 @@ class Mage_Novalnet_SecureController extends Mage_Core_Controller_Front_Action
127
  $payment->setLastTransId($response['tid']);
128
  $payment->setCcTransId($response['tid']);
129
  $order->addStatusToHistory($order->getStatus(), Mage::helper('novalnet')->__('Customer successfully returned from Novalnet'));
 
 
 
 
 
 
 
 
 
 
 
130
  //}
131
  } else {
132
  $paymentInst->setTransactionId($response['tid']);
68
  $order->sendNewOrderEmail();
69
  }
70
 
71
+ if ($status == 100) {
72
  $this->_redirect('checkout/onepage/success');
73
  } else {
74
+ #$this->_redirect('*/*/failure');#orig
75
+ #$this->_redirect('checkout/onepage/failure');#ok, but not so good; $this->_redirect('*/*/failure');
76
+ $this->_redirect('checkout/cart');#new; ok
77
+
78
  }
79
  }
80
 
130
  $payment->setLastTransId($response['tid']);
131
  $payment->setCcTransId($response['tid']);
132
  $order->addStatusToHistory($order->getStatus(), Mage::helper('novalnet')->__('Customer successfully returned from Novalnet'));
133
+
134
+ $note = $order->getCustomerNote();
135
+ if ($note){
136
+ $note = '<br />'.Mage::helper('novalnet')->__('Comment').': '.$note;
137
+ }
138
+ if ( $response['test_mode']) {
139
+ $note .= '<br /><b><font color="red">'.strtoupper(Mage::helper('novalnet')->__('Testorder')).'</font></b>';
140
+ }
141
+ $order->setCustomerNote($note);
142
+ $order->setCustomerNoteNotify(true);
143
+ $order->setComment($note);
144
  //}
145
  } else {
146
  $paymentInst->setTransactionId($response['tid']);
app/code/community/Mage/Novalnet/etc/system.xml CHANGED
@@ -7,6 +7,7 @@
7
  <novalnetElvgerman translate="label" module="novalnet">
8
  <!-- will have title 'New Module' -->
9
  <label>Direct Debit German</label>
 
10
  <!-- position between other payment methods -->
11
  <sort_order>680</sort_order>
12
  <!-- do not show this configuration options in store scope -->
@@ -103,11 +104,21 @@
103
  <show_in_website>1</show_in_website>
104
  <show_in_store>0</show_in_store>
105
  </comment>
 
 
 
 
 
 
 
 
 
106
  </fields>
107
  </novalnetElvgerman>
108
  <novalnetElvaustria translate="label" module="novalnet">
109
  <!-- will have title 'New Module' -->
110
  <label>Direct Debit Austria</label>
 
111
  <!-- position between other payment methods -->
112
  <sort_order>681</sort_order>
113
  <!-- do not show this configuration options in store scope -->
@@ -195,11 +206,21 @@
195
  <show_in_website>1</show_in_website>
196
  <show_in_store>0</show_in_store>
197
  </comment>
 
 
 
 
 
 
 
 
 
198
  </fields>
199
  </novalnetElvaustria>
200
  <novalnetCc translate="label" module="novalnet">
201
  <!-- will have title 'New Module' -->
202
  <label>Credit Card</label>
 
203
  <!-- position between other payment methods -->
204
  <sort_order>682</sort_order>
205
  <!-- do not show this configuration options in store scope -->
@@ -240,14 +261,14 @@
240
  <show_in_store>0</show_in_store>
241
  </title>
242
  <cctypes translate="label">
243
- <label>Credit Card Types</label>
244
- <frontend_type>multiselect</frontend_type>
245
- <source_model>novalnet/novalnet_source_cctype</source_model>
246
- <sort_order>5</sort_order>
247
- <show_in_default>1</show_in_default>
248
- <show_in_website>1</show_in_website>
249
- <show_in_store>0</show_in_store>
250
- </cctypes>
251
  <merchant_id translate="label">
252
  <label>Novalnet Merchant ID</label>
253
  <frontend_type>text</frontend_type>
@@ -296,11 +317,21 @@
296
  <show_in_website>1</show_in_website>
297
  <show_in_store>0</show_in_store>
298
  </user_group_excluded>
 
 
 
 
 
 
 
 
 
299
  </fields>
300
  </novalnetCc>
301
  <novalnet_secure translate="label" module="novalnet">
302
  <!-- will have title 'New Module' -->
303
  <label>Novalnet 3D-Secure Credit Card</label>
 
304
  <!-- position between other payment methods -->
305
  <sort_order>683</sort_order>
306
  <!-- do not show this configuration options in store scope -->
@@ -341,14 +372,14 @@
341
  <show_in_store>0</show_in_store>
342
  </title>
343
  <cctypes translate="label">
344
- <label>Credit Card Types</label>
345
- <frontend_type>multiselect</frontend_type>
346
- <source_model>novalnet/novalnet_source_cctype</source_model>
347
- <sort_order>5</sort_order>
348
- <show_in_default>1</show_in_default>
349
- <show_in_website>1</show_in_website>
350
- <show_in_store>0</show_in_store>
351
- </cctypes>
352
  <merchant_id translate="label">
353
  <label>Novalnet Merchant ID</label>
354
  <frontend_type>text</frontend_type>
@@ -397,11 +428,21 @@
397
  <show_in_website>1</show_in_website>
398
  <show_in_store>0</show_in_store>
399
  </user_group_excluded>
 
 
 
 
 
 
 
 
 
400
  </fields>
401
  </novalnet_secure>
402
  <novalnetPrepayment translate="label" module="novalnet">
403
  <!-- will have title 'New Module' -->
404
  <label>Prepayment</label>
 
405
  <!-- position between other payment methods -->
406
  <sort_order>690</sort_order>
407
  <!-- do not show this configuration options in store scope -->
@@ -481,11 +522,21 @@
481
  <show_in_website>1</show_in_website>
482
  <show_in_store>0</show_in_store>
483
  </user_group_excluded>
 
 
 
 
 
 
 
 
 
484
  </fields>
485
  </novalnetPrepayment>
486
  <novalnetInvoice translate="label" module="novalnet">
487
  <!-- will have title 'New Module' -->
488
  <label>Invoice</label>
 
489
  <!-- position between other payment methods -->
490
  <sort_order>689</sort_order>
491
  <!-- do not show this configuration options in store scope -->
@@ -573,11 +624,21 @@
573
  <show_in_website>1</show_in_website>
574
  <show_in_store>0</show_in_store>
575
  </user_group_excluded>
 
 
 
 
 
 
 
 
 
576
  </fields>
577
  </novalnetInvoice>
578
  <novalnetPhonepayment translate="label" module="novalnet">
579
  <!-- will have title 'New Module' -->
580
  <label>Phonepayment</label>
 
581
  <!-- position between other payment methods -->
582
  <sort_order>691</sort_order>
583
  <!-- do not show this configuration options in store scope -->
@@ -657,11 +718,22 @@
657
  <show_in_website>1</show_in_website>
658
  <show_in_store>0</show_in_store>
659
  </user_group_excluded>
 
 
 
 
 
 
 
 
 
660
  </fields>
661
  </novalnetPhonepayment>
662
  <novalnetInstantbanktransfer translate="label" module="novalnet">
663
  <!-- will have title 'New Module' -->
664
  <label>Instant Bank Transfer</label>
 
 
665
  <!-- position between other payment methods -->
666
  <sort_order>692</sort_order>
667
  <!-- do not show this configuration options in store scope -->
@@ -749,15 +821,15 @@
749
  <show_in_website>1</show_in_website>
750
  <show_in_store>0</show_in_store>
751
  </comment>
752
- <test_mode translate="label">
753
- <label>Test Mode</label>
754
  <frontend_type>select</frontend_type>
755
  <source_model>adminhtml/system_config_source_yesno</source_model>
756
  <sort_order>15</sort_order>
757
  <show_in_default>1</show_in_default>
758
  <show_in_website>1</show_in_website>
759
  <show_in_store>0</show_in_store>
760
- </test_mode>
761
  <password translate="label">
762
  <label>Password</label>
763
  <frontend_type>text</frontend_type>
@@ -766,6 +838,15 @@
766
  <show_in_website>1</show_in_website>
767
  <show_in_store>0</show_in_store>
768
  </password>
 
 
 
 
 
 
 
 
 
769
  </fields>
770
  </novalnetInstantbanktransfer>
771
  </groups>
7
  <novalnetElvgerman translate="label" module="novalnet">
8
  <!-- will have title 'New Module' -->
9
  <label>Direct Debit German</label>
10
+ <comment>Zur Liveschaltung muessen Sie den Livemodus auf 'Ja' setzen. You have to set the live mode to 'yes' for real payments.</comment>
11
  <!-- position between other payment methods -->
12
  <sort_order>680</sort_order>
13
  <!-- do not show this configuration options in store scope -->
104
  <show_in_website>1</show_in_website>
105
  <show_in_store>0</show_in_store>
106
  </comment>
107
+ <live_mode translate="label">
108
+ <label>Live Mode</label>
109
+ <frontend_type>select</frontend_type>
110
+ <source_model>adminhtml/system_config_source_yesno</source_model>
111
+ <sort_order>15</sort_order>
112
+ <show_in_default>1</show_in_default>
113
+ <show_in_website>1</show_in_website>
114
+ <show_in_store>0</show_in_store>
115
+ </live_mode>
116
  </fields>
117
  </novalnetElvgerman>
118
  <novalnetElvaustria translate="label" module="novalnet">
119
  <!-- will have title 'New Module' -->
120
  <label>Direct Debit Austria</label>
121
+ <comment>Zur Liveschaltung muessen Sie den Livemodus auf 'Ja' setzen. You have to set the live mode to 'yes' for real payments.</comment>
122
  <!-- position between other payment methods -->
123
  <sort_order>681</sort_order>
124
  <!-- do not show this configuration options in store scope -->
206
  <show_in_website>1</show_in_website>
207
  <show_in_store>0</show_in_store>
208
  </comment>
209
+ <live_mode translate="label">
210
+ <label>Live Mode</label>
211
+ <frontend_type>select</frontend_type>
212
+ <source_model>adminhtml/system_config_source_yesno</source_model>
213
+ <sort_order>15</sort_order>
214
+ <show_in_default>1</show_in_default>
215
+ <show_in_website>1</show_in_website>
216
+ <show_in_store>0</show_in_store>
217
+ </live_mode>
218
  </fields>
219
  </novalnetElvaustria>
220
  <novalnetCc translate="label" module="novalnet">
221
  <!-- will have title 'New Module' -->
222
  <label>Credit Card</label>
223
+ <comment>Zur Liveschaltung muessen Sie den Livemodus auf 'Ja' setzen. You have to set the live mode to 'yes' for real payments.</comment>
224
  <!-- position between other payment methods -->
225
  <sort_order>682</sort_order>
226
  <!-- do not show this configuration options in store scope -->
261
  <show_in_store>0</show_in_store>
262
  </title>
263
  <cctypes translate="label">
264
+ <label>Credit Card Types</label>
265
+ <frontend_type>multiselect</frontend_type>
266
+ <source_model>novalnet/novalnet_source_cctype</source_model>
267
+ <sort_order>5</sort_order>
268
+ <show_in_default>1</show_in_default>
269
+ <show_in_website>1</show_in_website>
270
+ <show_in_store>0</show_in_store>
271
+ </cctypes>
272
  <merchant_id translate="label">
273
  <label>Novalnet Merchant ID</label>
274
  <frontend_type>text</frontend_type>
317
  <show_in_website>1</show_in_website>
318
  <show_in_store>0</show_in_store>
319
  </user_group_excluded>
320
+ <live_mode translate="label">
321
+ <label>Live Mode</label>
322
+ <frontend_type>select</frontend_type>
323
+ <source_model>adminhtml/system_config_source_yesno</source_model>
324
+ <sort_order>15</sort_order>
325
+ <show_in_default>1</show_in_default>
326
+ <show_in_website>1</show_in_website>
327
+ <show_in_store>0</show_in_store>
328
+ </live_mode>
329
  </fields>
330
  </novalnetCc>
331
  <novalnet_secure translate="label" module="novalnet">
332
  <!-- will have title 'New Module' -->
333
  <label>Novalnet 3D-Secure Credit Card</label>
334
+ <comment>Zur Liveschaltung muessen Sie den Livemodus auf 'Ja' setzen. You have to set the live mode to 'yes' for real payments.</comment>
335
  <!-- position between other payment methods -->
336
  <sort_order>683</sort_order>
337
  <!-- do not show this configuration options in store scope -->
372
  <show_in_store>0</show_in_store>
373
  </title>
374
  <cctypes translate="label">
375
+ <label>Credit Card Types</label>
376
+ <frontend_type>multiselect</frontend_type>
377
+ <source_model>novalnet/novalnet_source_cctype</source_model>
378
+ <sort_order>5</sort_order>
379
+ <show_in_default>1</show_in_default>
380
+ <show_in_website>1</show_in_website>
381
+ <show_in_store>0</show_in_store>
382
+ </cctypes>
383
  <merchant_id translate="label">
384
  <label>Novalnet Merchant ID</label>
385
  <frontend_type>text</frontend_type>
428
  <show_in_website>1</show_in_website>
429
  <show_in_store>0</show_in_store>
430
  </user_group_excluded>
431
+ <live_mode translate="label">
432
+ <label>Live Mode</label>
433
+ <frontend_type>select</frontend_type>
434
+ <source_model>adminhtml/system_config_source_yesno</source_model>
435
+ <sort_order>15</sort_order>
436
+ <show_in_default>1</show_in_default>
437
+ <show_in_website>1</show_in_website>
438
+ <show_in_store>0</show_in_store>
439
+ </live_mode>
440
  </fields>
441
  </novalnet_secure>
442
  <novalnetPrepayment translate="label" module="novalnet">
443
  <!-- will have title 'New Module' -->
444
  <label>Prepayment</label>
445
+ <comment>Zur Liveschaltung muessen Sie den Livemodus auf 'Ja' setzen. You have to set the live mode to 'yes' for real payments.</comment>
446
  <!-- position between other payment methods -->
447
  <sort_order>690</sort_order>
448
  <!-- do not show this configuration options in store scope -->
522
  <show_in_website>1</show_in_website>
523
  <show_in_store>0</show_in_store>
524
  </user_group_excluded>
525
+ <live_mode translate="label">
526
+ <label>Live Mode</label>
527
+ <frontend_type>select</frontend_type>
528
+ <source_model>adminhtml/system_config_source_yesno</source_model>
529
+ <sort_order>15</sort_order>
530
+ <show_in_default>1</show_in_default>
531
+ <show_in_website>1</show_in_website>
532
+ <show_in_store>0</show_in_store>
533
+ </live_mode>
534
  </fields>
535
  </novalnetPrepayment>
536
  <novalnetInvoice translate="label" module="novalnet">
537
  <!-- will have title 'New Module' -->
538
  <label>Invoice</label>
539
+ <comment>Zur Liveschaltung muessen Sie den Livemodus auf 'Ja' setzen. You have to set the live mode to 'yes' for real payments.</comment>
540
  <!-- position between other payment methods -->
541
  <sort_order>689</sort_order>
542
  <!-- do not show this configuration options in store scope -->
624
  <show_in_website>1</show_in_website>
625
  <show_in_store>0</show_in_store>
626
  </user_group_excluded>
627
+ <live_mode translate="label">
628
+ <label>Live Mode</label>
629
+ <frontend_type>select</frontend_type>
630
+ <source_model>adminhtml/system_config_source_yesno</source_model>
631
+ <sort_order>15</sort_order>
632
+ <show_in_default>1</show_in_default>
633
+ <show_in_website>1</show_in_website>
634
+ <show_in_store>0</show_in_store>
635
+ </live_mode>
636
  </fields>
637
  </novalnetInvoice>
638
  <novalnetPhonepayment translate="label" module="novalnet">
639
  <!-- will have title 'New Module' -->
640
  <label>Phonepayment</label>
641
+ <comment>Wenn Sie Telefonpayment testen wollen, kontaktieren Sie bitte die Novalnet AG (Tel.: 0049 89 923068320). If you like to test phonepayment contact Novalnet AG (Phone: 0049 89 923068320), please!</comment>
642
  <!-- position between other payment methods -->
643
  <sort_order>691</sort_order>
644
  <!-- do not show this configuration options in store scope -->
718
  <show_in_website>1</show_in_website>
719
  <show_in_store>0</show_in_store>
720
  </user_group_excluded>
721
+ <!--live_mode translate="label">
722
+ <label>Live Mode</label>
723
+ <frontend_type>select</frontend_type>
724
+ <source_model>adminhtml/system_config_source_yesno</source_model>
725
+ <sort_order>15</sort_order>
726
+ <show_in_default>1</show_in_default>
727
+ <show_in_website>1</show_in_website>
728
+ <show_in_store>0</show_in_store>
729
+ </live_mode-->
730
  </fields>
731
  </novalnetPhonepayment>
732
  <novalnetInstantbanktransfer translate="label" module="novalnet">
733
  <!-- will have title 'New Module' -->
734
  <label>Instant Bank Transfer</label>
735
+ <comment>Das ist noch eine Betaversion. Daher muss der Livemodus auf 'Nein' stehen.</comment>
736
+ <comment>Das Passwort ist auf admin.novalnet.de: Stammdaten - Paymentzugriffsschluessel einzusehen. The password is available at admin.novalnet.de: Stammdaten - Paymentzugriffsschluessel.</comment>
737
  <!-- position between other payment methods -->
738
  <sort_order>692</sort_order>
739
  <!-- do not show this configuration options in store scope -->
821
  <show_in_website>1</show_in_website>
822
  <show_in_store>0</show_in_store>
823
  </comment>
824
+ <live_mode translate="label">
825
+ <label>Live Mode</label>
826
  <frontend_type>select</frontend_type>
827
  <source_model>adminhtml/system_config_source_yesno</source_model>
828
  <sort_order>15</sort_order>
829
  <show_in_default>1</show_in_default>
830
  <show_in_website>1</show_in_website>
831
  <show_in_store>0</show_in_store>
832
+ </live_mode>
833
  <password translate="label">
834
  <label>Password</label>
835
  <frontend_type>text</frontend_type>
838
  <show_in_website>1</show_in_website>
839
  <show_in_store>0</show_in_store>
840
  </password>
841
+ <!--live_mode translate="label">
842
+ <label>Live Mode</label>
843
+ <frontend_type>checkbox</frontend_type>
844
+ <source_model>adminhtml/system_config_source_checktype</source_model>
845
+ <sort_order>17</sort_order>
846
+ <show_in_default>1</show_in_default>
847
+ <show_in_website>1</show_in_website>
848
+ <show_in_store>1</show_in_store>
849
+ </live_mode-->
850
  </fields>
851
  </novalnetInstantbanktransfer>
852
  </groups>
app/design/frontend/default/default/template/novalnet/cc/form.phtml CHANGED
@@ -29,7 +29,7 @@
29
  <?php
30
  $cc_type = $cc_last4 = $cc_owner = $cc_exp_month = $cc_exp_year = '';#
31
  $customer_id = '';
32
- if ($_SESSION and $_SESSION['customer_base'] and $_SESSION['customer_base']['id'])
33
  {
34
  $customer_id = $_SESSION['customer_base']['id'];
35
  $accountData = $this->getCcData($customer_id);
29
  <?php
30
  $cc_type = $cc_last4 = $cc_owner = $cc_exp_month = $cc_exp_year = '';#
31
  $customer_id = '';
32
+ if (isset($_SESSION) and isset($_SESSION['customer_base']) and isset($_SESSION['customer_base']['id']))
33
  {
34
  $customer_id = $_SESSION['customer_base']['id'];
35
  $accountData = $this->getCcData($customer_id);
app/design/frontend/default/default/template/novalnet/elvaustria/form.phtml CHANGED
@@ -30,7 +30,7 @@
30
  <?php
31
  $nn_account_holder = $nn_account_number = $nn_bank_sorting_code = $nn_elv_country = '';
32
  $customer_id = '';
33
- if ($_SESSION and $_SESSION['customer_base'] and $_SESSION['customer_base']['id'])
34
  {
35
  $customer_id = $_SESSION['customer_base']['id'];
36
  $accountData = $this->getAccountData($customer_id);
30
  <?php
31
  $nn_account_holder = $nn_account_number = $nn_bank_sorting_code = $nn_elv_country = '';
32
  $customer_id = '';
33
+ if (isset($_SESSION) and isset($_SESSION['customer_base']) and isset($_SESSION['customer_base']['id']))
34
  {
35
  $customer_id = $_SESSION['customer_base']['id'];
36
  $accountData = $this->getAccountData($customer_id);
app/design/frontend/default/default/template/novalnet/elvgerman/form.phtml CHANGED
@@ -29,7 +29,7 @@
29
  <?php
30
  $nn_account_holder = $nn_account_number = $nn_bank_sorting_code = $nn_elv_country = '';
31
  $customer_id = '';
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);
29
  <?php
30
  $nn_account_holder = $nn_account_number = $nn_bank_sorting_code = $nn_elv_country = '';
31
  $customer_id = '';
32
+ if (isset($_SESSION) and isset($_SESSION['customer_base']) and isset($_SESSION['customer_base']['id']))
33
  {
34
  $customer_id = $_SESSION['customer_base']['id'];
35
  $accountData = $this->getAccountData($customer_id);
app/design/frontend/default/default/template/novalnet/instantbanktransfer/form.phtml CHANGED
@@ -29,7 +29,7 @@
29
  <?php
30
  $cc_type = $cc_last4 = $cc_owner = $cc_exp_month = $cc_exp_year = '';
31
  $customer_id = '';
32
- if ($_SESSION and $_SESSION['customer_base'] and $_SESSION['customer_base']['id'])
33
  {
34
  $customer_id = $_SESSION['customer_base']['id'];
35
  $accountData = $this->getCcData($customer_id);
29
  <?php
30
  $cc_type = $cc_last4 = $cc_owner = $cc_exp_month = $cc_exp_year = '';
31
  $customer_id = '';
32
+ if (isset($_SESSION) and isset($_SESSION['customer_base']) and isset($_SESSION['customer_base']['id']))
33
  {
34
  $customer_id = $_SESSION['customer_base']['id'];
35
  $accountData = $this->getCcData($customer_id);
app/design/frontend/default/default/template/novalnet/invoice/form.phtml CHANGED
@@ -30,7 +30,7 @@
30
  <?php
31
  $_code=$this->getMethodCode();
32
  $customer_id = '';
33
- if ($_SESSION and $_SESSION['customer_base'] and $_SESSION['customer_base']['id'])
34
  {
35
  $customer_id = $_SESSION['customer_base']['id'];
36
  }
30
  <?php
31
  $_code=$this->getMethodCode();
32
  $customer_id = '';
33
+ if (isset($_SESSION) and isset($_SESSION['customer_base']) and isset($_SESSION['customer_base']['id']))
34
  {
35
  $customer_id = $_SESSION['customer_base']['id'];
36
  }
app/design/frontend/default/default/template/novalnet/phonepayment/form.phtml CHANGED
@@ -32,7 +32,7 @@
32
  <?php
33
  $_code=$this->getMethodCode();
34
  $customer_id = '';
35
- if ($_SESSION and $_SESSION['customer_base'] and $_SESSION['customer_base']['id'])
36
  {
37
  $customer_id = $_SESSION['customer_base']['id'];
38
  }
32
  <?php
33
  $_code=$this->getMethodCode();
34
  $customer_id = '';
35
+ if (isset($_SESSION) and isset($_SESSION['customer_base']) and isset($_SESSION['customer_base']['id']))
36
  {
37
  $customer_id = $_SESSION['customer_base']['id'];
38
  }
app/design/frontend/default/default/template/novalnet/prepayment/form.phtml CHANGED
@@ -32,7 +32,7 @@
32
  <?php
33
  $_code=$this->getMethodCode();
34
  $customer_id = '';
35
- if ($_SESSION and $_SESSION['customer_base'] and $_SESSION['customer_base']['id'])
36
  {
37
  $customer_id = $_SESSION['customer_base']['id'];
38
  }
32
  <?php
33
  $_code=$this->getMethodCode();
34
  $customer_id = '';
35
+ if (isset($_SESSION) and isset($_SESSION['customer_base']) and isset($_SESSION['customer_base']['id']))
36
  {
37
  $customer_id = $_SESSION['customer_base']['id'];
38
  }
app/locale/de_AT/Mage_Novalnet.csv CHANGED
@@ -106,4 +106,7 @@
106
  "Customer was redirected to Novalnet","Besteller zu Novalnet umgeleitet"
107
  "Customer aborted payment process","Besteller hat den Bezahlvorgang abgebrochen"
108
  "Customer was rejected by Novalnet","Besteller von Novalnet abgelehnt"
109
- "Password","Passwort"
 
 
 
106
  "Customer was redirected to Novalnet","Besteller zu Novalnet umgeleitet"
107
  "Customer aborted payment process","Besteller hat den Bezahlvorgang abgebrochen"
108
  "Customer was rejected by Novalnet","Besteller von Novalnet abgelehnt"
109
+ "Password","Passwort"
110
+ "Test Mode","Testmodus"
111
+ "Live Mode","Livemodus"
112
+ "Testorder","Testbestellung"
app/locale/de_CH/Mage_Novalnet.csv CHANGED
@@ -106,4 +106,7 @@
106
  "Customer was redirected to Novalnet","Besteller zu Novalnet umgeleitet"
107
  "Customer aborted payment process","Besteller hat den Bezahlvorgang abgebrochen"
108
  "Customer was rejected by Novalnet","Besteller von Novalnet abgelehnt"
109
- "Password","Passwort"
 
 
 
106
  "Customer was redirected to Novalnet","Besteller zu Novalnet umgeleitet"
107
  "Customer aborted payment process","Besteller hat den Bezahlvorgang abgebrochen"
108
  "Customer was rejected by Novalnet","Besteller von Novalnet abgelehnt"
109
+ "Password","Passwort"
110
+ "Test Mode","Testmodus"
111
+ "Live Mode","Livemodus"
112
+ "Testorder","Testbestellung"
app/locale/de_DE/Mage_Novalnet.csv CHANGED
@@ -106,4 +106,7 @@
106
  "Customer was redirected to Novalnet","Besteller zu Novalnet umgeleitet"
107
  "Customer aborted payment process","Besteller hat den Bezahlvorgang abgebrochen"
108
  "Customer was rejected by Novalnet","Besteller von Novalnet abgelehnt"
109
- "Password","Passwort"
 
 
 
106
  "Customer was redirected to Novalnet","Besteller zu Novalnet umgeleitet"
107
  "Customer aborted payment process","Besteller hat den Bezahlvorgang abgebrochen"
108
  "Customer was rejected by Novalnet","Besteller von Novalnet abgelehnt"
109
+ "Password","Passwort"
110
+ "Test Mode","Testmodus"
111
+ "Live Mode","Livemodus"
112
+ "Testorder","Testbestellung"
app/locale/en_US/Mage_Novalnet.csv CHANGED
@@ -103,4 +103,7 @@
103
  "Customer was redirected to Novalnet","Customer was redirected to Novalnet"
104
  "Customer aborted payment process","Customer aborted payment process"
105
  "Customer was rejected by Novalnet","Customer was rejected by Novalnet"
106
- "Password","Password"
 
 
 
103
  "Customer was redirected to Novalnet","Customer was redirected to Novalnet"
104
  "Customer aborted payment process","Customer aborted payment process"
105
  "Customer was rejected by Novalnet","Customer was rejected by Novalnet"
106
+ "Password","Password"
107
+ "Test Mode","Test mode"
108
+ "Live Mode","Live mode"
109
+ "Testorder","Test order"
package.xml CHANGED
@@ -1,22 +1,37 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Novalnet</name>
4
- <version>1.2.4</version>
5
- <stability>beta</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>Dies ist eine Beta-Version.
12
- Neu: Sofort&#xFC;berweisung ist nun implementiert und kann getestet werden. F&#xFC;r die Nutzung ist das Eintragen eines Passwortes im Magento-Adminbereich Voraussetzung. Das Passwort k&#xF6;nnen Sie im Admintool auf admin.novalnet.de unter Stammdaten -&gt; Paymentzugriffsschluessel einsehen.
 
13
 
14
- This is a beta release.
15
- What's new: Instant bank transfer or online transfer is now implemented and can be tested. You have to enter a password in the Magento's admin area before starting. You cann get the password in your admin tool at admin.novalnet.de: Stammdaten -&gt; Paymentzugriffsschluessel.</notes>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
16
  <authors><author><name>Dixon Rajdaniel</name><user>auto-converted</user><email>dr@novalnet.de</email></author></authors>
17
- <date>2010-01-26</date>
18
- <time>17:17:23</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="196838e8d027b2bf46c052d606e4e7c6"/><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="instantbanktransfer"><file name="form.phtml" hash="27dce7378209ee7ee839fde490b38815"/><file name="info.phtml" hash="1735a3fec2b6f55a317161a6b6695114"/></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="b87bf1e82c96b17c01fca88dd4578b7e"/><file name="info.phtml" hash="c606874c228dc547b5ee058169c0536d"/></dir><dir name="elvaustria"><file name="form.phtml" hash="9d12f579603f8e766f8e28d47f802645"/><file name="info.phtml" hash="df166d57f6680b5945706ebeb88c28e0"/></dir><dir name="elvgerman"><file name="form.phtml" hash="36ab89d337d702706a8aa0868dba7d84"/><file name="info.phtml" hash="df166d57f6680b5945706ebeb88c28e0"/></dir><dir name="instantbanktransfer"><file name="failure.phtml" hash="d33ccb69a08a2195df3586bf36dc9d85"/><file name="form.phtml" hash="079a89a4ad8957ea675e6222dd6140ad"/><file name="info.phtml" hash="dc0e26c00ce9abd340e32e5f99c03fc4"/></dir><dir name="invoice"><file name="form.phtml" hash="7ea6e3ce7efb3d00f19cb158edb22ba9"/><file name="info.phtml" hash="f8d4c1a6d3f9fb3d8278e7fa82d661b8"/></dir><dir name="phonepayment"><file name="form.phtml" hash="f3c57e4b7b96f97bf660a38b851cc65b"/><file name="info.phtml" hash="6a50f5400b1c9b38629ea9314a08d3b1"/></dir><dir name="prepayment"><file name="form.phtml" hash="2b85410c616f40694eceb0a4ec9d3e77"/><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="702ea76034676bd89d684f2702570575"/></dir><dir name="de_CH"><file name="Mage_Novalnet.csv" hash="702ea76034676bd89d684f2702570575"/></dir><dir name="de_DE"><file name="Mage_Novalnet.csv" hash="702ea76034676bd89d684f2702570575"/></dir><dir name="en_US"><file name="Mage_Novalnet.csv" hash="1ab815b986f34a08deb5aa7cc36ec601"/></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="Sofort_Logo_t.jpg" hash="3b88302d88393b582c1cccd152e267bc"/><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="Instantbanktransfer"><file name="Failure.php" hash="eff4ad5092570e0a6aac5560aa1466a4"/><file name="Form.php" hash="479141cd4ebf61820c702e3032796c44"/><file name="Info.php" hash="9ba8ff30244f48409aadb4671b7dd02f"/><file name="Redirect.php" hash="a877cfb3bda97ce9014f0e9d5ca8e001"/></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="InstantbanktransferController.php" hash="d37080ee0a7a0fdb3f2079fabc7e39ce"/><file name="InstantbanktransferController_orig.php" hash="513e95d803149b253c41374d59ced219"/><file name="SecureController.php" hash="25a88a7b3b38bb3306048d7f6c49f220"/></dir><dir name="etc"><file name="config.xml" hash="3885351b7c88a2ba997aa50fae6f2ea8"/><file name="system.xml" hash="81e86ae4c16e4b4a6adac44e52a67429"/></dir><dir name="Helper"><file name="Data.php" hash="5cd27f9fbb7e3b7083c3d80c8354a5d3"/></dir><dir name="Model"><file name="include_all.php" hash="bd2d91378b834650e3bff5afebd58236"/><file name="NovalnetCc.php" hash="25d146988e6c04e59b980bf38f0fabb6"/><file name="NovalnetElvaustria.php" hash="af5bbccaf0f3d81058955b7608d843e9"/><file name="NovalnetElvgerman.php" hash="319a1b433fdfefbac5100402d155accf"/><file name="NovalnetInstantbanktransfer.php" hash="3ca4b8657c74831b33533824d343087e"/><file name="NovalnetInvoice.php" hash="3d6a270b2b3d3cf7465c63b0b8961ff5"/><file name="NovalnetPhonepayment.php" hash="ed69de03976d4d32f1acc6476a514fac"/><file name="NovalnetPrepayment.php" hash="44011849d5f5b21bd364c4ba0b29b73b"/><file name="NovalnetSecure.php" hash="d929538867236421c3afb6918e6c2607"/><dir name="Mysql4"><file name="Setup.php" hash="bda93bd1825c67b2eac9943ec42076f1"/></dir><dir name="Novalnet"><file name="Request.php" hash="87fd92d8890377ab2e3fb1dc2c1790bf"/><file name="Result.php" hash="fa36462e819f3581e27d50b201d9fb99"/><dir name="Source"><file name="Cctype.php" hash="e886ba7736877e589abfd6f7343f98d4"/></dir></dir></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>
20
  <compatible/>
21
  <dependencies/>
22
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Novalnet</name>
4
+ <version>1.2.5</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>1.2.5 stable
12
+ Wir weisen hiermit ausdr&#xFC;cklich darauf hin, dass es sich bei dieser Version um eine &lt;b&gt;BETA-VERSION&lt;/b&gt; handelt. Offenbar kann der Magento Connect Manager nicht korrekt mit Betas umgehen. So m&#xFC;ssen wir diese Version als stable herausgeben.
13
+ Au&#xDF;er Sofort&#xFC;berweisung k&#xF6;nnen jedoch alle anderen Zahlarten nach wie vor live benutzt werden.
14
 
15
+ Neu:
16
+ 1. Man kann die Zahlart sofort&#xFC;berweisung ab sofort testen. Bitte den Livemodus NICHT auf 'ja' setzen!
17
+ 2. Ein Auswahlfeld "Livemodus" steht f&#xFC;r alle Zahlarten (au&#xDF;er Telefonpayment) zur Verf&#xFC;gung. Der Livemodus steht per Default auf Nein, d.h. der Testmodus ist in diesem Fall eingeschaltet. Das Auswahlfeld "Testmodus" bei der Zahlart "Sofort&#xFC;berweisung" ist nun durch den "Livemodus" ersetzt worden. Bei Testbestellungen wird das Word "TESTBESTELLUNG" bei Bestellinfos mitangezeigt.
18
+ Bitte beachten Sie, dass eine Bezahlmethode erst live benutzt werden kann, wenn der Livemodus auf 'Ja' steht (Sofort&#xFC;berweisung ausgenommen).
19
+
20
+ Buxfix f&#xFC;r den sporadisch auftretenden Hinweis: 'Notice: Undefined index: customer_base in /var/www/magento/app/design/frontend/default/default/template/novalnet/cc/form.phtml on line 32'
21
+ ------------------------------------------------------------------------------------------------------
22
+ Please note, this version is a &lt;b&gt;BETA-VERSION&lt;/b&gt;. We had to do so because of the fact, that the Magento Connect Manager seems not to be able to handle Betas correctly.
23
+ But all payment modules except instant bank transfer / online transfer can be used for real bank transactions.
24
+
25
+ What's New:
26
+ 1. The new module instant bank transfer / online transfer is ready for tests. Do not set the live mode to 'yes', please!
27
+ 2. A option "Live mode" is available for all modules except phonepayment. It's default value is 'No', that means, the Test Mode is active. The Word "Test order" is added to order details for test orders.
28
+ For real bank transactions set the Live Mode to 'Yes', please (except online transfer)!
29
+
30
+ Buxfix: the notice appeared sometimes: 'Notice: Undefined index: customer_base in /var/www/magento/app/design/frontend/default/default/template/novalnet/cc/form.phtml on line 32'</notes>
31
  <authors><author><name>Dixon Rajdaniel</name><user>auto-converted</user><email>dr@novalnet.de</email></author></authors>
32
+ <date>2010-01-29</date>
33
+ <time>17:32:28</time>
34
+ <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="196838e8d027b2bf46c052d606e4e7c6"/><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="instantbanktransfer"><file name="form.phtml" hash="27dce7378209ee7ee839fde490b38815"/><file name="info.phtml" hash="1735a3fec2b6f55a317161a6b6695114"/></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="7f116332fc720c3cc5aec141343f340f"/><file name="info.phtml" hash="c606874c228dc547b5ee058169c0536d"/></dir><dir name="elvaustria"><file name="form.phtml" hash="119db3e733935da40a8868a21daad41a"/><file name="info.phtml" hash="df166d57f6680b5945706ebeb88c28e0"/></dir><dir name="elvgerman"><file name="form.phtml" hash="9a53f1912c0f7eb9eefa667650fe133a"/><file name="info.phtml" hash="df166d57f6680b5945706ebeb88c28e0"/></dir><dir name="instantbanktransfer"><file name="failure.phtml" hash="d33ccb69a08a2195df3586bf36dc9d85"/><file name="form.phtml" hash="efda97400504ef4b38f6e5689eb24afb"/><file name="info.phtml" hash="dc0e26c00ce9abd340e32e5f99c03fc4"/></dir><dir name="invoice"><file name="form.phtml" hash="94ff33ec2dedd22cf9454923c7742e7e"/><file name="info.phtml" hash="f8d4c1a6d3f9fb3d8278e7fa82d661b8"/></dir><dir name="phonepayment"><file name="form.phtml" hash="d7fe99d0203dc26b92a55640a849bbe0"/><file name="info.phtml" hash="6a50f5400b1c9b38629ea9314a08d3b1"/></dir><dir name="prepayment"><file name="form.phtml" hash="87a76df5e6ddaa442bd3a544b152eab7"/><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="38bdc4d98aad5d27ceac773d5fa6d6f7"/></dir><dir name="de_CH"><file name="Mage_Novalnet.csv" hash="38bdc4d98aad5d27ceac773d5fa6d6f7"/></dir><dir name="de_DE"><file name="Mage_Novalnet.csv" hash="38bdc4d98aad5d27ceac773d5fa6d6f7"/></dir><dir name="en_US"><file name="Mage_Novalnet.csv" hash="7608edbf9414eb688f345715f475700b"/></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="Sofort_Logo_t.jpg" hash="3b88302d88393b582c1cccd152e267bc"/><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="Instantbanktransfer"><file name="Failure.php" hash="eff4ad5092570e0a6aac5560aa1466a4"/><file name="Form.php" hash="479141cd4ebf61820c702e3032796c44"/><file name="Info.php" hash="9ba8ff30244f48409aadb4671b7dd02f"/><file name="Redirect.php" hash="a877cfb3bda97ce9014f0e9d5ca8e001"/></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="InstantbanktransferController.php" hash="3e54bbcac286096086d092174ffe34b9"/><file name="InstantbanktransferController_orig.php" hash="513e95d803149b253c41374d59ced219"/><file name="SecureController.php" hash="d9b80d46f0d528966ca80729284c57f4"/></dir><dir name="etc"><file name="config.xml" hash="3885351b7c88a2ba997aa50fae6f2ea8"/><file name="system.xml" hash="4901c5be3c9c8db2f59608c0ee549051"/></dir><dir name="Helper"><file name="Data.php" hash="5cd27f9fbb7e3b7083c3d80c8354a5d3"/></dir><dir name="Model"><file name="include_all.php" hash="bd2d91378b834650e3bff5afebd58236"/><file name="NovalnetCc.php" hash="f1af657c5a1ddcc7bfd83b514d6e50d1"/><file name="NovalnetElvaustria.php" hash="33c7b766df17b6d8d5dc38662a143dcb"/><file name="NovalnetElvgerman.php" hash="4721b6a2491e589c7d895e6c36440d8e"/><file name="NovalnetInstantbanktransfer.php" hash="7cbbc5bb874713fbbd6da7e2f91b232f"/><file name="NovalnetInvoice.php" hash="7b4fc4bbd6e6372a6d33bfe0a2598303"/><file name="NovalnetPhonepayment.php" hash="df678a8fb2c52a1c30aae8fdcf0411c3"/><file name="NovalnetPrepayment.php" hash="82750d0ae7a55e5bfd2236181d35bc2f"/><file name="NovalnetSecure.php" hash="88ff77bf8fa033ff86ea446b42f979fd"/><dir name="Mysql4"><file name="Setup.php" hash="bda93bd1825c67b2eac9943ec42076f1"/></dir><dir name="Novalnet"><file name="Request.php" hash="87fd92d8890377ab2e3fb1dc2c1790bf"/><file name="Result.php" hash="fa36462e819f3581e27d50b201d9fb99"/><dir name="Source"><file name="Cctype.php" hash="e886ba7736877e589abfd6f7343f98d4"/></dir></dir></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>
35
  <compatible/>
36
  <dependencies/>
37
  </package>