Novalnet - Version 10.2.0

Version Notes

- Credit Card Iframe implemented.
- Giropay payment has been implemented.
- Novalnet payment module has been optimized as per new testcase.
- Logo control has been implemented in global configuration.

Download this release

Release Info

Developer Gabriel Dixon
Extension Novalnet
Version 10.2.0
Comparing to
See all releases


Code changes from version 10.1.0 to 10.2.0

Files changed (122) hide show
  1. app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order/View.php +8 -12
  2. app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Cc.php +5 -76
  3. app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Giropay.php +49 -0
  4. app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Sepa.php +0 -1
  5. app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Giropay.php +70 -0
  6. app/code/community/Novalnet/Payment/Block/Payment/Method/NovalnetRedirect.php +10 -14
  7. app/code/community/Novalnet/Payment/Helper/AssignData.php +18 -82
  8. app/code/community/Novalnet/Payment/Helper/Data.php +32 -80
  9. app/code/community/Novalnet/Payment/Model/Callbackscript.php +148 -118
  10. app/code/community/Novalnet/Payment/Model/Config.php +28 -15
  11. app/code/community/Novalnet/Payment/Model/Factory.php +20 -40
  12. app/code/community/Novalnet/Payment/Model/Ipn.php +5 -5
  13. app/code/community/Novalnet/Payment/Model/Novalnet/Request.php +1 -0
  14. app/code/community/Novalnet/Payment/Model/Novalnet/Source/Callbacktypes.php +0 -1
  15. app/code/community/Novalnet/Payment/Model/Novalnet/Source/Cctype.php +5 -10
  16. app/code/community/Novalnet/Payment/Model/Payment/Method/Abstract.php +71 -119
  17. app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetGiropay.php +34 -0
  18. app/code/community/Novalnet/Payment/Model/Recurring.php +1 -0
  19. app/code/community/Novalnet/Payment/Model/Separefill.php +6 -1
  20. app/code/community/Novalnet/Payment/Model/System/Config/Activemethods.php +2 -5
  21. app/code/community/Novalnet/Payment/Model/System/Config/Backend/Notifyurl.php +45 -0
  22. app/code/community/Novalnet/Payment/controllers/Adminhtml/Novalnetpayment/Sales/OrderController.php +7 -9
  23. app/code/community/Novalnet/Payment/controllers/CcController.php +98 -0
  24. app/code/community/Novalnet/Payment/controllers/GatewayController.php +19 -36
  25. app/code/community/Novalnet/Payment/etc/config.xml +36 -19
  26. app/code/community/Novalnet/Payment/etc/system.xml +228 -113
  27. app/code/community/Novalnet/Payment/sql/novalnet_setup/{mysql4-install-10.1.0.php → mysql4-install-10.2.0.php} +0 -0
  28. app/design/adminhtml/default/default/layout/novalnet/configuration.xml +0 -3
  29. app/design/adminhtml/default/default/template/novalnet/payment/method/form/Cc.phtml +0 -121
  30. app/design/adminhtml/default/default/template/novalnet/payment/method/form/Invoice.phtml +8 -6
  31. app/design/adminhtml/default/default/template/novalnet/payment/method/form/Prepayment.phtml +8 -6
  32. app/design/adminhtml/default/default/template/novalnet/payment/method/form/Sepa.phtml +12 -10
  33. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Cc.phtml +1 -1
  34. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Giropay.phtml +49 -0
  35. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Invoice.phtml +1 -1
  36. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Prepayment.phtml +1 -1
  37. app/design/adminhtml/default/default/template/novalnet/payment/method/info/Sepa.phtml +1 -1
  38. app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Cc.phtml +1 -1
  39. app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Giropay.phtml +49 -0
  40. app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Invoice.phtml +1 -1
  41. app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Prepayment.phtml +2 -1
  42. app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Sepa.phtml +1 -1
  43. app/design/adminhtml/default/default/template/novalnet/sales/order/view/info.phtml +4 -2
  44. app/design/adminhtml/default/default/template/novalnet/sales/order/view/tab/info.phtml +13 -22
  45. app/design/frontend/base/default/layout/novalnet.xml +8 -3
  46. app/design/frontend/base/default/template/novalnet/payment/method/form/Banktransfer.phtml +11 -9
  47. app/design/frontend/base/default/template/novalnet/payment/method/form/Cc.phtml +13 -141
  48. app/design/frontend/base/default/template/novalnet/payment/method/form/Cciframe.phtml +54 -0
  49. app/design/frontend/base/default/template/novalnet/payment/method/form/Eps.phtml +11 -9
  50. app/design/frontend/base/default/template/novalnet/payment/method/form/Giropay.phtml +63 -0
  51. app/design/frontend/base/default/template/novalnet/payment/method/form/Ideal.phtml +11 -9
  52. app/design/frontend/base/default/template/novalnet/payment/method/form/Invoice.phtml +10 -16
  53. app/design/frontend/base/default/template/novalnet/payment/method/form/Paypal.phtml +11 -9
  54. app/design/frontend/base/default/template/novalnet/payment/method/form/Prepayment.phtml +8 -6
  55. app/design/frontend/base/default/template/novalnet/payment/method/form/Sepa.phtml +14 -20
  56. app/design/frontend/base/default/template/novalnet/payment/method/info/Cc.phtml +1 -1
  57. app/design/frontend/base/default/template/novalnet/payment/method/info/Giropay.phtml +49 -0
  58. app/design/frontend/base/default/template/novalnet/payment/method/info/Invoice.phtml +1 -1
  59. app/design/frontend/base/default/template/novalnet/payment/method/info/Prepayment.phtml +1 -1
  60. app/design/frontend/base/default/template/novalnet/payment/method/info/Sepa.phtml +1 -1
  61. app/design/frontend/base/default/template/novalnet/payment/method/pdf/Cc.phtml +1 -1
  62. app/design/frontend/base/default/template/novalnet/payment/method/pdf/Giropay.phtml +49 -0
  63. app/design/frontend/base/default/template/novalnet/payment/method/pdf/Invoice.phtml +2 -3
  64. app/design/frontend/base/default/template/novalnet/payment/method/pdf/Prepayment.phtml +3 -3
  65. app/design/frontend/base/default/template/novalnet/payment/method/pdf/Sepa.phtml +1 -1
  66. app/design/frontend/default/default/layout/novalnet.xml +8 -3
  67. app/design/frontend/default/default/template/novalnet/payment/method/form/Banktransfer.phtml +11 -9
  68. app/design/frontend/default/default/template/novalnet/payment/method/form/Cc.phtml +13 -141
  69. app/design/frontend/default/default/template/novalnet/payment/method/form/Cciframe.phtml +54 -0
  70. app/design/frontend/default/default/template/novalnet/payment/method/form/Eps.phtml +11 -9
  71. app/design/frontend/default/default/template/novalnet/payment/method/form/Giropay.phtml +63 -0
  72. app/design/frontend/default/default/template/novalnet/payment/method/form/Ideal.phtml +11 -9
  73. app/design/frontend/default/default/template/novalnet/payment/method/form/Invoice.phtml +9 -15
  74. app/design/frontend/default/default/template/novalnet/payment/method/form/Paypal.phtml +11 -9
  75. app/design/frontend/default/default/template/novalnet/payment/method/form/Prepayment.phtml +8 -6
  76. app/design/frontend/default/default/template/novalnet/payment/method/form/Sepa.phtml +13 -19
  77. app/design/frontend/default/default/template/novalnet/payment/method/info/Cc.phtml +1 -1
  78. app/design/frontend/default/default/template/novalnet/payment/method/info/Giropay.phtml +49 -0
  79. app/design/frontend/default/default/template/novalnet/payment/method/info/Invoice.phtml +1 -1
  80. app/design/frontend/default/default/template/novalnet/payment/method/info/Prepayment.phtml +1 -1
  81. app/design/frontend/default/default/template/novalnet/payment/method/info/Sepa.phtml +1 -1
  82. app/design/frontend/rwd/default/layout/novalnet.xml +8 -3
  83. app/design/frontend/rwd/default/template/novalnet/payment/method/form/Banktransfer.phtml +11 -9
  84. app/design/frontend/rwd/default/template/novalnet/payment/method/form/Cc.phtml +13 -142
  85. app/design/frontend/rwd/default/template/novalnet/payment/method/form/Cciframe.phtml +54 -0
  86. app/design/frontend/rwd/default/template/novalnet/payment/method/form/Eps.phtml +11 -9
  87. app/design/frontend/rwd/default/template/novalnet/payment/method/form/Giropay.phtml +63 -0
  88. app/design/frontend/rwd/default/template/novalnet/payment/method/form/Ideal.phtml +11 -9
  89. app/design/frontend/rwd/default/template/novalnet/payment/method/form/Invoice.phtml +8 -15
  90. app/design/frontend/rwd/default/template/novalnet/payment/method/form/Paypal.phtml +11 -9
  91. app/design/frontend/rwd/default/template/novalnet/payment/method/form/Prepayment.phtml +8 -6
  92. app/design/frontend/rwd/default/template/novalnet/payment/method/form/Sepa.phtml +12 -19
  93. app/design/frontend/rwd/default/template/novalnet/payment/method/info/Cc.phtml +1 -1
  94. app/design/frontend/rwd/default/template/novalnet/payment/method/info/Giropay.phtml +49 -0
  95. app/design/frontend/rwd/default/template/novalnet/payment/method/info/Invoice.phtml +1 -1
  96. app/design/frontend/rwd/default/template/novalnet/payment/method/info/Prepayment.phtml +1 -1
  97. app/design/frontend/rwd/default/template/novalnet/payment/method/info/Sepa.phtml +1 -1
  98. app/locale/de_DE/Novalnet_Payment.csv +17 -26
  99. app/locale/en_US/Novalnet_Payment.csv +16 -24
  100. js/novalnet/novalnetcc.js +0 -238
  101. js/novalnet/novalnetsepa.js +4 -13
  102. package.xml +8 -6
  103. skin/frontend/base/default/images/novalnet/AE.png +0 -0
  104. skin/frontend/base/default/images/novalnet/MC.png +0 -0
  105. skin/frontend/base/default/images/novalnet/T.png +0 -0
  106. skin/frontend/base/default/images/novalnet/TO.png +0 -0
  107. skin/frontend/base/default/images/novalnet/VI.png +0 -0
  108. skin/frontend/base/default/images/novalnet/amex.png +0 -0
  109. skin/frontend/base/default/images/novalnet/banktransfer.png +0 -0
  110. skin/frontend/base/default/images/novalnet/cartasi.png +0 -0
  111. skin/frontend/base/default/images/novalnet/creditcard_cvc.png +0 -0
  112. skin/frontend/base/default/images/novalnet/cvc_hint.png +0 -0
  113. skin/frontend/base/default/images/novalnet/eps.png +0 -0
  114. skin/frontend/base/default/images/novalnet/giropay.png +0 -0
  115. skin/frontend/base/default/images/novalnet/ideal.png +0 -0
  116. skin/frontend/base/default/images/novalnet/invoice.png +0 -0
  117. skin/frontend/base/default/images/novalnet/maestro.png +0 -0
  118. skin/frontend/base/default/images/novalnet/mastercard.png +0 -0
  119. skin/frontend/base/default/images/novalnet/paypal.png +0 -0
  120. skin/frontend/base/default/images/novalnet/prepayment.png +0 -0
  121. skin/frontend/base/default/images/novalnet/sepa.png +0 -0
  122. skin/frontend/base/default/images/novalnet/visacard.png +0 -0
app/code/community/Novalnet/Payment/Block/Adminhtml/Sales/Order/View.php CHANGED
@@ -32,30 +32,24 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_View extends Mage_Adminhtml_B
32
  $order = $this->getOrder();
33
  $payment = $order->getPayment();
34
  $paymentMethod = $payment->getMethodInstance()->getCode();
35
- $helper = Mage::helper('novalnet_payment');
36
- $getTid = $helper->makeValidNumber($payment->getLastTransId());
37
-
38
 
39
  if (preg_match("/novalnet/i", $paymentMethod)) {
 
 
40
  $this->_removeButton('order_creditmemo');
41
  $getTransactionStatus = $helper->loadTransactionStatus($getTid);
42
-
43
  $this->_updateButton('order_invoice', 'label', Mage::helper('novalnet_payment')->__('Capture'));
44
 
45
- if ($paymentMethod == Novalnet_Payment_Model_Config::NN_PAYPAL) {
 
46
  $this->_removeButton('order_invoice');
47
  }
48
-
49
- if ($getTransactionStatus->getTransactionStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
50
  $this->_removeButton('void_payment');
51
  }
52
 
53
- if ($getTransactionStatus->getTransactionStatus() == Novalnet_Payment_Model_Config::PAYMENT_VOID_STATUS) {
54
- $this->_removeButton('order_invoice');
55
- }
56
-
57
  if (in_array($paymentMethod, array(Novalnet_Payment_Model_Config::NN_INVOICE,
58
- Novalnet_Payment_Model_Config::NN_PREPAYMENT))) {
59
  $this->_removeButton('order_invoice');
60
  if ($getTransactionStatus->getTransactionStatus() == 91) {
61
  $this->_removeButton('order_invoice');
@@ -65,6 +59,7 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_View extends Mage_Adminhtml_B
65
  ), 0);
66
  }
67
  }
 
68
  if ($order->canCancel() && $getTransactionStatus->getTransactionStatus()
69
  < Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
70
  $this->_removeButton('void_payment');
@@ -74,6 +69,7 @@ class Novalnet_Payment_Block_Adminhtml_Sales_Order_View extends Mage_Adminhtml_B
74
  'onclick' => "confirmSetLocation('{$message}', '{$this->getVoidPaymentUrl()}')",
75
  ));
76
  }
 
77
  if ($this->_isAllowedAction('ship') && $order->canShip()
78
  && !$order->getForcedDoShipmentWithInvoice()) {
79
  $this->_addButton('order_ship', array(
32
  $order = $this->getOrder();
33
  $payment = $order->getPayment();
34
  $paymentMethod = $payment->getMethodInstance()->getCode();
 
 
 
35
 
36
  if (preg_match("/novalnet/i", $paymentMethod)) {
37
+ $helper = Mage::helper('novalnet_payment');
38
+ $getTid = $helper->makeValidNumber($payment->getLastTransId());
39
  $this->_removeButton('order_creditmemo');
40
  $getTransactionStatus = $helper->loadTransactionStatus($getTid);
 
41
  $this->_updateButton('order_invoice', 'label', Mage::helper('novalnet_payment')->__('Capture'));
42
 
43
+ if ($paymentMethod == Novalnet_Payment_Model_Config::NN_PAYPAL ||
44
+ $getTransactionStatus->getTransactionStatus() == Novalnet_Payment_Model_Config::PAYMENT_VOID_STATUS) {
45
  $this->_removeButton('order_invoice');
46
  }
47
+ if ($getTransactionStatus->getTransactionStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED ) {
 
48
  $this->_removeButton('void_payment');
49
  }
50
 
 
 
 
 
51
  if (in_array($paymentMethod, array(Novalnet_Payment_Model_Config::NN_INVOICE,
52
+ Novalnet_Payment_Model_Config::NN_PREPAYMENT))) {
53
  $this->_removeButton('order_invoice');
54
  if ($getTransactionStatus->getTransactionStatus() == 91) {
55
  $this->_removeButton('order_invoice');
59
  ), 0);
60
  }
61
  }
62
+
63
  if ($order->canCancel() && $getTransactionStatus->getTransactionStatus()
64
  < Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
65
  $this->_removeButton('void_payment');
69
  'onclick' => "confirmSetLocation('{$message}', '{$this->getVoidPaymentUrl()}')",
70
  ));
71
  }
72
+
73
  if ($this->_isAllowedAction('ship') && $order->canShip()
74
  && !$order->getForcedDoShipmentWithInvoice()) {
75
  $this->_addButton('order_ship', array(
app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Cc.php CHANGED
@@ -35,26 +35,6 @@ class Novalnet_Payment_Block_Payment_Method_Form_Cc extends Mage_Payment_Block_F
35
  $this->setTemplate('novalnet/payment/method/form/Cc.phtml');
36
  }
37
 
38
- /**
39
- * Check whether Callback type allowed
40
- *
41
- * @return bool
42
- */
43
- public function isCallbackTypeCall()
44
- {
45
- return $this->getMethod()->isCallbackTypeCall();
46
- }
47
-
48
- /**
49
- * Novalnet Callback data getter
50
- *
51
- * @return string
52
- */
53
- public function getCallbackConfigData()
54
- {
55
- return $this->getMethod()->getNovalnetConfig('callback');
56
- }
57
-
58
  /**
59
  * Retrieve availables Credit Card types
60
  *
@@ -63,11 +43,11 @@ class Novalnet_Payment_Block_Payment_Method_Form_Cc extends Mage_Payment_Block_F
63
  public function getCcAvailableTypes()
64
  {
65
  $types = array(
66
- 'VI' => 'Visa',
67
- 'MC' => 'MasterCard',
68
- 'AE' => 'American Express',
69
- 'TO' => 'Maestro',
70
- 'T' => 'CarteSi',
71
  );
72
  $method = $this->getMethod();
73
  if ($method) {
@@ -97,57 +77,6 @@ class Novalnet_Payment_Block_Payment_Method_Form_Cc extends Mage_Payment_Block_F
97
  return $this->_localConfig;
98
  }
99
 
100
- /**
101
- * Retrieve Credit Card expiry months
102
- *
103
- * @return array
104
- */
105
- public function getCcMonths()
106
- {
107
- $months = $this->getData('cc_months');
108
- if (is_null($months)) {
109
- $months = $this->_getConfig()->getMonths();
110
- $this->setData('cc_months', $months);
111
- }
112
- return $months;
113
- }
114
-
115
- /**
116
- * Retrieve Credit Card expiry years
117
- *
118
- * @return array
119
- */
120
- public function getCcYears()
121
- {
122
- $years = $this->getData('cc_years');
123
- if (is_null($years)) {
124
- $years = $this->getYears();
125
- $this->setData('cc_years', $years);
126
- }
127
- return $years;
128
- }
129
-
130
- /**
131
- * Retrieve Credit Card expiry years from Novalnet configuration
132
- *
133
- * @return array
134
- */
135
- private function getYears()
136
- {
137
- $method = $this->getMethod();
138
- $configYears = $method->getConfigData('cc_valid_year');
139
- $count = $configYears ? $configYears : 25;
140
-
141
- $years = array();
142
- $first = date("Y");
143
-
144
- for ($index = 0; $index < $count; $index++) {
145
- $year = $first + $index;
146
- $years[$year] = $year;
147
- }
148
- return $years;
149
- }
150
-
151
  /**
152
  * Get information to end user from config
153
  *
35
  $this->setTemplate('novalnet/payment/method/form/Cc.phtml');
36
  }
37
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
38
  /**
39
  * Retrieve availables Credit Card types
40
  *
43
  public function getCcAvailableTypes()
44
  {
45
  $types = array(
46
+ 'visacard' => 'Visa',
47
+ 'mastercard' => 'MasterCard',
48
+ 'amex' => 'American Express',
49
+ 'maestro' => 'Maestro',
50
+ 'cartasi' => 'CarteSi',
51
  );
52
  $method = $this->getMethod();
53
  if ($method) {
77
  return $this->_localConfig;
78
  }
79
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
80
  /**
81
  * Get information to end user from config
82
  *
app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Giropay.php ADDED
@@ -0,0 +1,49 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the payment module of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ class Novalnet_Payment_Block_Payment_Method_Form_Giropay extends Mage_Payment_Block_Form
27
+ {
28
+
29
+ /**
30
+ * Init default template for block
31
+ *
32
+ */
33
+ protected function _construct()
34
+ {
35
+ parent::_construct();
36
+ $this->setTemplate('novalnet/payment/method/form/Giropay.phtml');
37
+ }
38
+
39
+ /**
40
+ * Get information to end user from config
41
+ *
42
+ * @return string
43
+ */
44
+ public function getUserInfo()
45
+ {
46
+ return trim(strip_tags(trim($this->getMethod()->getConfigData('booking_reference'))));
47
+ }
48
+
49
+ }
app/code/community/Novalnet/Payment/Block/Payment/Method/Form/Sepa.php CHANGED
@@ -64,5 +64,4 @@ class Novalnet_Payment_Block_Payment_Method_Form_Sepa extends Mage_Payment_Block
64
  {
65
  return trim(strip_tags(trim($this->getMethod()->getConfigData('booking_reference'))));
66
  }
67
-
68
  }
64
  {
65
  return trim(strip_tags(trim($this->getMethod()->getConfigData('booking_reference'))));
66
  }
 
67
  }
app/code/community/Novalnet/Payment/Block/Payment/Method/Info/Giropay.php ADDED
@@ -0,0 +1,70 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the payment module of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ class Novalnet_Payment_Block_Payment_Method_Info_Giropay extends Mage_Payment_Block_Info
27
+ {
28
+
29
+ /**
30
+ * Init default template for block
31
+ *
32
+ */
33
+ protected function _construct()
34
+ {
35
+ parent::_construct();
36
+ $this->setTemplate('novalnet/payment/method/info/Giropay.phtml');
37
+ }
38
+
39
+ /**
40
+ * Retrieve payment method model
41
+ *
42
+ * @return Mage_Payment_Model_Method_Abstract
43
+ */
44
+ public function getMethod()
45
+ {
46
+ return $this->getInfo()->getMethodInstance();
47
+ }
48
+
49
+ /**
50
+ * Render as PDF
51
+ *
52
+ * @return string
53
+ */
54
+ public function toPdf()
55
+ {
56
+ $this->setTemplate('novalnet/payment/method/pdf/Giropay.phtml');
57
+ return $this->toHtml();
58
+ }
59
+
60
+ /**
61
+ * Get some specific information
62
+ *
63
+ * @return array
64
+ */
65
+ public function getAdditionalData($key)
66
+ {
67
+ return Mage::helper('novalnet_payment')->getAdditionalData($this->getInfo(), $key);
68
+ }
69
+
70
+ }
app/code/community/Novalnet/Payment/Block/Payment/Method/NovalnetRedirect.php CHANGED
@@ -47,31 +47,27 @@ class Novalnet_Payment_Block_Payment_Method_NovalnetRedirect extends Mage_Core_B
47
  foreach ($getFormData as $field => $value) {
48
  $form->addField($field, 'hidden', array('name' => $field, 'value' => $value));
49
  }
50
-
51
- $logFormData = Mage::helper('novalnet_payment/AssignData')->doRemoveSensitiveData($getFormData, $paymentCode);
52
- $authCode = $paymentCode == Novalnet_Payment_Model_Config::NN_CC ? $logFormData['auth_code']
53
- : $helper->getDecodedParam($logFormData['auth_code'], $authorizeKey);
54
- $productId = $paymentCode == Novalnet_Payment_Model_Config::NN_CC ? $logFormData['product']
55
- : $helper->getDecodedParam($logFormData['product'], $authorizeKey);
56
- $tariffId = $paymentCode == Novalnet_Payment_Model_Config::NN_CC ? $logFormData['tariff']
57
- : $helper->getDecodedParam($logFormData['tariff'], $authorizeKey);
58
- $data = array('vendor' => $logFormData['vendor'],
59
  'auth_code' => $authCode,
60
  'product' => $productId,
61
  'tariff' => $tariffId,
62
- 'key' => $logFormData['key'],
63
  'authorize_key' => $authorizeKey
64
  );
65
- if ($paymentCode == Novalnet_Payment_Model_Config::NN_CC && $paymentObj->getNovalnetConfig('active_cc3d')) {
66
- $data['ActiveCc3d'] = 1;
67
- }
68
  $payment->setAdditionalData(serialize($data))
69
  ->save();
70
 
71
  //Save Transaction request data
72
  $modNnTransOverview = $helper->getModelTransactionOverview();
73
  $modNnTransOverview->setOrderId($getFormData['order_no'])
74
- ->setRequestData(serialize($logFormData))
75
  ->setCreatedDate($helper->getCurrentDateTime())
76
  ->save();
77
 
47
  foreach ($getFormData as $field => $value) {
48
  $form->addField($field, 'hidden', array('name' => $field, 'value' => $value));
49
  }
50
+ $authCode = $paymentCode == Novalnet_Payment_Model_Config::NN_CC ? $getFormData['auth_code']
51
+ : $helper->getDecodedParam($getFormData['auth_code'], $authorizeKey);
52
+ $productId = $paymentCode == Novalnet_Payment_Model_Config::NN_CC ? $getFormData['product']
53
+ : $helper->getDecodedParam($getFormData['product'], $authorizeKey);
54
+ $tariffId = $paymentCode == Novalnet_Payment_Model_Config::NN_CC ? $getFormData['tariff']
55
+ : $helper->getDecodedParam($getFormData['tariff'], $authorizeKey);
56
+ $data = array('vendor' => $getFormData['vendor'],
 
 
57
  'auth_code' => $authCode,
58
  'product' => $productId,
59
  'tariff' => $tariffId,
60
+ 'key' => $getFormData['key'],
61
  'authorize_key' => $authorizeKey
62
  );
63
+
 
 
64
  $payment->setAdditionalData(serialize($data))
65
  ->save();
66
 
67
  //Save Transaction request data
68
  $modNnTransOverview = $helper->getModelTransactionOverview();
69
  $modNnTransOverview->setOrderId($getFormData['order_no'])
70
+ ->setRequestData(serialize($getFormData))
71
  ->setCreatedDate($helper->getCurrentDateTime())
72
  ->save();
73
 
app/code/community/Novalnet/Payment/Helper/AssignData.php CHANGED
@@ -78,33 +78,12 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
78
  }
79
  $this->getCheckout()->setRefilldatavalues($data);
80
  switch ($paymentCode) {
81
- case Novalnet_Payment_Model_Config::NN_CC:
82
- $infoInstance->setNnCallbackTelNovalnetCc($data->getCallbackTel())
83
- ->setNnCallbackPinNovalnetCc(trim($data->getCallbackPin()))
84
- ->setNnNewCallbackPinNovalnetCc($data->getNewCallbackPin())
85
- ->setNnCallbackEmailNovalnetCc($data->getCallbackEmail());
86
- if ($this->getModel($paymentCode)->getNovalnetConfig('callback')
87
- != 3) {
88
- $infoInstance->setCallbackPinValidationFlag(true);
89
- }
90
- $this->getCheckout()->setCcPanHash($this->novalnetCardDetails('novalnet_cc_hash'))
91
- ->setCcUniqueId($this->novalnetCardDetails('novalnet_cc_unique_id'))
92
- ->setNnCcCvc($data->getNnCcCid())
93
- ->setNnPaymentCode($paymentCode);
94
-
95
- break;
96
  case Novalnet_Payment_Model_Config::NN_SEPA:
97
  $infoInstance->setNnCallbackTelNovalnetSepa($data->getCallbackTel())
98
  ->setNnCallbackPinNovalnetSepa(trim($data->getCallbackPin()))
99
  ->setNnNewCallbackPinNovalnetSepa($data->getNewCallbackPin())
100
- ->setNnCallbackEmailNovalnetSepa($data->getCallbackEmail())
101
- ->setSepaDuedate($this->getModel($paymentCode)->getNovalnetConfig('sepa_due_date'));
102
-
103
- if ($this->getModel($paymentCode)->getNovalnetConfig('callback')
104
- != 3) {
105
- $infoInstance->setCallbackPinValidationFlag(true);
106
- }
107
-
108
  $this->getCheckout()->setSepaHash($this->novalnetCardDetails('result_sepa_hash'))
109
  ->setSepaUniqueId($this->novalnetCardDetails('result_mandate_unique'))
110
  ->setNnPaymentCode($paymentCode);
@@ -113,11 +92,7 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
113
  $infoInstance->setNnCallbackTelNovalnetInvoice($data->getCallbackTel())
114
  ->setNnCallbackPinNovalnetInvoice(trim($data->getCallbackPin()))
115
  ->setNnNewCallbackPinNovalnetInvoice($data->getNewCallbackPin())
116
- ->setNnCallbackEmailNovalnetInvoice($data->getCallbackEmail());
117
- if ($this->getModel($paymentCode)->getNovalnetConfig('callback')
118
- != 3) {
119
- $infoInstance->setCallbackPinValidationFlag(true);
120
- }
121
  $this->getCheckout()->setNnPaymentCode($paymentCode);
122
  break;
123
  }
@@ -134,29 +109,6 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
134
  public function validateNovalnetData($paymentCode, $infoInstance)
135
  {
136
  switch ($paymentCode) {
137
- case Novalnet_Payment_Model_Config::NN_CC:
138
- $accessKey = $this->getModel($paymentCode)->loadAffAccDetail();
139
- $creditCardSecure = $this->getModel($paymentCode)->getNovalnetConfig('active_cc3d');
140
- $callbackVal = $this->getModel($paymentCode)->getNovalnetConfig('callback');
141
-
142
- if (!$this->checkIsAdmin() && $creditCardSecure && !$accessKey) {
143
- Mage::throwException($this->__('Basic parameter not valid') . '!');
144
- } elseif (!$this->getCheckout()->getCcPanHash() || !$this->getCheckout()->getCcUniqueId()) {
145
- Mage::throwException($this->__('Your credit card details are invalid'));
146
- } elseif (!$creditCardSecure && $this->checkCallbackAmount($paymentCode)
147
- && $callbackVal == '1' && !$infoInstance->getNnCallbackTelNovalnetCc()
148
- && !$this->checkIsAdmin()) {
149
- Mage::throwException($this->__('Please enter your telephone number') . '!');
150
- } elseif (!$creditCardSecure && $this->checkCallbackAmount($paymentCode)
151
- && $callbackVal == '2' && !$infoInstance->getNnCallbackTelNovalnetCc()
152
- && !$this->checkIsAdmin()) {
153
- Mage::throwException($this->__('Please enter your mobile number') . '!');
154
- } elseif (!$creditCardSecure && $this->checkCallbackAmount($paymentCode)
155
- && $callbackVal == '3' && !$this->validateEmail($infoInstance->getNnCallbackEmailNovalnetCc())
156
- && !$this->checkIsAdmin()) {
157
- Mage::throwException($this->__('Your E-mail address is invalid') . '!');
158
- }
159
- break;
160
  case Novalnet_Payment_Model_Config::NN_SEPA:
161
  $paymentInfo = $this->novalnetCardDetails('payment');
162
  $sepaHolder = $paymentInfo['account_holder'];
@@ -179,11 +131,7 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
179
  && $callbackVal == '2' && !$infoInstance->getNnCallbackTelNovalnetSepa()
180
  && !$this->checkIsAdmin()) {
181
  Mage::throwException($this->__('Please enter your mobile number') . '!');
182
- } elseif ($this->checkCallbackAmount($paymentCode)
183
- && $callbackVal == '3' && !$this->validateEmail($infoInstance->getNnCallbackEmailNovalnetSepa())
184
- && !$this->checkIsAdmin()) {
185
- Mage::throwException($this->__('Your E-mail address is invalid') . '!');
186
- }
187
  break;
188
  case Novalnet_Payment_Model_Config::NN_INVOICE:
189
  case Novalnet_Payment_Model_Config::NN_PREPAYMENT:
@@ -192,13 +140,15 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
192
  $paymentRefThree = $this->getModel($paymentCode)->getNovalnetConfig('payment_ref_three');
193
 
194
  if (!$paymentRefOne && !$paymentRefTwo && !$paymentRefThree) {
195
- Mage::throwException('Please select atleast one payment reference.');
196
  }
197
  break;
 
198
  case Novalnet_Payment_Model_Config::NN_IDEAL:
199
  case Novalnet_Payment_Model_Config::NN_PAYPAL:
200
  case Novalnet_Payment_Model_Config::NN_SOFORT:
201
  case Novalnet_Payment_Model_Config::NN_EPS:
 
202
  $accessKey = $this->getModel($paymentCode)->loadAffAccDetail();
203
 
204
  if (!$accessKey) {
@@ -233,11 +183,12 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
233
  *
234
  * @param varien_object $dataObj
235
  * @param string $key
 
236
  * @return mixed
237
  */
238
- public function importNovalnetEncodeData(Varien_Object $dataObj, $key)
239
  {
240
- $encoding = $this->getPciEncodedParam($dataObj, $key);
241
  if ($encoding != true) {
242
  $this->getCoresession()->addError(
243
  $this->__('The methods for the handling of character sets are not available!'));
@@ -246,7 +197,7 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
246
  Mage::app()->getResponse()->sendResponse();
247
  exit;
248
  }
249
- $this->importNovalnetHashData($dataObj, $key);
250
  return $dataObj;
251
  }
252
 
@@ -255,11 +206,12 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
255
  *
256
  * @param varien_object $dataObj
257
  * @param string $key
 
258
  * @return mixed
259
  */
260
- public function importNovalnetHashData(Varien_Object $dataObj, $key)
261
  {
262
- $hash = $this->generateHash($dataObj, $key);
263
  if ($hash == false) {
264
  $this->getCoresession()->addError($this->__('The hash functions are not available!'));
265
  $url = Mage::getModel('core/url')->getUrl("checkout/onepage/failure");
@@ -332,26 +284,10 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
332
  */
333
  public function doRemoveSensitiveData($request = NULL, $paymentCode)
334
  {
335
- if ($paymentCode) {
336
- switch ($paymentCode) {
337
- case Novalnet_Payment_Model_Config::NN_CC:
338
- if ($this->getModel($paymentCode)->getNovalnetConfig('active_cc3d')
339
- == 1) {
340
- unset($request['cc_cvc2'], $request['pan_hash'], $request['unique_id']);
341
- } else {
342
- $request->unsCcCvc2()
343
- ->unsPanHash()
344
- ->unsUniqueId();
345
- }
346
- break;
347
- case Novalnet_Payment_Model_Config::NN_SEPA:
348
- if ($request) {
349
  $request->unsBankAccountHolder()
350
  ->unsSepaHash()
351
  ->unsSepaUniqueId();
352
- }
353
- break;
354
- }
355
  }
356
  return $request;
357
  }
@@ -382,7 +318,7 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
382
  $dueDate = $invoiceDuedate;
383
  }
384
 
385
- return ($dueDate) ? ($this->__('Due Date') . ' : <b>' . Mage::helper('core')->formatDate($dueDate) . "</b><br />")
386
  : NULL;
387
  }
388
 
@@ -397,7 +333,7 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
397
  $dueDate = $result->getDueDate();
398
  $note = NULL;
399
  $note .= $dueDate
400
- ? 'Due Date: <b>' . Mage::helper('core')->formatDate($dueDate) . '</b>|NN Account Holder: <b>NOVALNET AG</b>'
401
  : 'NN Account Holder: <b>NOVALNET AG</b>';
402
  $note .= '|IBAN: <b> ' . $result->getInvoiceIban() . '</b>';
403
  $note .= '|BIC: <b>' . $result->getInvoiceBic() . '</b>';
@@ -458,7 +394,7 @@ class Novalnet_Payment_Helper_AssignData extends Novalnet_Payment_Helper_Data
458
 
459
  if (!empty($paymentRefThree)) {
460
  $i = ($refCount == 1) ? '' : $i + 1;
461
- $note .= "|NN_Reference$i:Order No&$orderNo";
462
  }
463
  return $note;
464
  }
78
  }
79
  $this->getCheckout()->setRefilldatavalues($data);
80
  switch ($paymentCode) {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
81
  case Novalnet_Payment_Model_Config::NN_SEPA:
82
  $infoInstance->setNnCallbackTelNovalnetSepa($data->getCallbackTel())
83
  ->setNnCallbackPinNovalnetSepa(trim($data->getCallbackPin()))
84
  ->setNnNewCallbackPinNovalnetSepa($data->getNewCallbackPin())
85
+ ->setSepaDuedate($this->getModel($paymentCode)->getNovalnetConfig('sepa_due_date'))
86
+ ->setCallbackPinValidationFlag(true);
 
 
 
 
 
 
87
  $this->getCheckout()->setSepaHash($this->novalnetCardDetails('result_sepa_hash'))
88
  ->setSepaUniqueId($this->novalnetCardDetails('result_mandate_unique'))
89
  ->setNnPaymentCode($paymentCode);
92
  $infoInstance->setNnCallbackTelNovalnetInvoice($data->getCallbackTel())
93
  ->setNnCallbackPinNovalnetInvoice(trim($data->getCallbackPin()))
94
  ->setNnNewCallbackPinNovalnetInvoice($data->getNewCallbackPin())
95
+ ->setCallbackPinValidationFlag(true);
 
 
 
 
96
  $this->getCheckout()->setNnPaymentCode($paymentCode);
97
  break;
98
  }
109
  public function validateNovalnetData($paymentCode, $infoInstance)
110
  {
111
  switch ($paymentCode) {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
112
  case Novalnet_Payment_Model_Config::NN_SEPA:
113
  $paymentInfo = $this->novalnetCardDetails('payment');
114
  $sepaHolder = $paymentInfo['account_holder'];
131
  && $callbackVal == '2' && !$infoInstance->getNnCallbackTelNovalnetSepa()
132
  && !$this->checkIsAdmin()) {
133
  Mage::throwException($this->__('Please enter your mobile number') . '!');
134
+ }
 
 
 
 
135
  break;
136
  case Novalnet_Payment_Model_Config::NN_INVOICE:
137
  case Novalnet_Payment_Model_Config::NN_PREPAYMENT:
140
  $paymentRefThree = $this->getModel($paymentCode)->getNovalnetConfig('payment_ref_three');
141
 
142
  if (!$paymentRefOne && !$paymentRefTwo && !$paymentRefThree) {
143
+ Mage::throwException('Payment reference is missing or invalid');
144
  }
145
  break;
146
+ case Novalnet_Payment_Model_Config::NN_CC:
147
  case Novalnet_Payment_Model_Config::NN_IDEAL:
148
  case Novalnet_Payment_Model_Config::NN_PAYPAL:
149
  case Novalnet_Payment_Model_Config::NN_SOFORT:
150
  case Novalnet_Payment_Model_Config::NN_EPS:
151
+ case Novalnet_Payment_Model_Config::NN_GIROPAY:
152
  $accessKey = $this->getModel($paymentCode)->loadAffAccDetail();
153
 
154
  if (!$accessKey) {
183
  *
184
  * @param varien_object $dataObj
185
  * @param string $key
186
+ * @param string $type
187
  * @return mixed
188
  */
189
+ public function importNovalnetEncodeData(Varien_Object $dataObj, $key, $type = 'PHP')
190
  {
191
+ $encoding = $this->getPciEncodedParam($dataObj, $key, $type);
192
  if ($encoding != true) {
193
  $this->getCoresession()->addError(
194
  $this->__('The methods for the handling of character sets are not available!'));
197
  Mage::app()->getResponse()->sendResponse();
198
  exit;
199
  }
200
+ $this->importNovalnetHashData($dataObj, $key, $type);
201
  return $dataObj;
202
  }
203
 
206
  *
207
  * @param varien_object $dataObj
208
  * @param string $key
209
+ * @param string $type
210
  * @return mixed
211
  */
212
+ public function importNovalnetHashData(Varien_Object $dataObj, $key, $type = 'PHP')
213
  {
214
+ $hash = $this->generateHash($dataObj, $key, $type);
215
  if ($hash == false) {
216
  $this->getCoresession()->addError($this->__('The hash functions are not available!'));
217
  $url = Mage::getModel('core/url')->getUrl("checkout/onepage/failure");
284
  */
285
  public function doRemoveSensitiveData($request = NULL, $paymentCode)
286
  {
287
+ if ($paymentCode == Novalnet_Payment_Model_Config::NN_SEPA && $request) {
 
 
 
 
 
 
 
 
 
 
 
 
 
288
  $request->unsBankAccountHolder()
289
  ->unsSepaHash()
290
  ->unsSepaUniqueId();
 
 
 
291
  }
292
  return $request;
293
  }
318
  $dueDate = $invoiceDuedate;
319
  }
320
 
321
+ return ($dueDate) ? ($this->__('Due Date') . ' : <b><span id="due_date">' . Mage::helper('core')->formatDate($dueDate) . "</span></b><br />")
322
  : NULL;
323
  }
324
 
333
  $dueDate = $result->getDueDate();
334
  $note = NULL;
335
  $note .= $dueDate
336
+ ? 'Due Date: <b><span id="due_date">' . Mage::helper('core')->formatDate($dueDate) . '</span></b>|NN Account Holder: <b>NOVALNET AG</b>'
337
  : 'NN Account Holder: <b>NOVALNET AG</b>';
338
  $note .= '|IBAN: <b> ' . $result->getInvoiceIban() . '</b>';
339
  $note .= '|BIC: <b>' . $result->getInvoiceBic() . '</b>';
394
 
395
  if (!empty($paymentRefThree)) {
396
  $i = ($refCount == 1) ? '' : $i + 1;
397
+ $note .= "|NN_Reference$i:NN Order No&$orderNo";
398
  }
399
  return $note;
400
  }
app/code/community/Novalnet/Payment/Helper/Data.php CHANGED
@@ -47,7 +47,7 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
47
  'paymentSave' => array(
48
  'group_name' => array('novalnetCc', 'novalnetSepa', 'novalnetInvoice',
49
  'novalnetPrepayment',
50
- 'novalnetBanktransfer', 'novalnetPaypal', 'novalnetEps', 'novalnetIdeal'),
51
  'header_text' => 'Novalnet Global Configuration',
52
  'codes' => array(
53
  'page' => 'paymentSave',
@@ -487,52 +487,31 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
487
  $exludedGroupes = trim($userGroupId);
488
  if (strlen($exludedGroupes)) {
489
  $exludedGroupes = explode(',', $exludedGroupes);
490
- $custGrpId = $this->getCustomerSession()->getCustomerGroupId();
491
- return !in_array($custGrpId, $exludedGroupes,true);
 
 
 
492
  }
493
  return true;
494
  }
495
 
496
- /**
497
- * Function to Encode Novalnet data
498
- *
499
- * @param string $data
500
- * @param string $key
501
- * @return string
502
- */
503
- public function getEncodedParam($data, $key)
504
- {
505
- $data = trim($data);
506
- if (!$data) {
507
- return'Error: no data';
508
- }
509
- if (!function_exists('base64_decode') or ! function_exists('pack') or ! function_exists('crc32')) {
510
- return'Error: func n/a';
511
- }
512
- try {
513
- $crc = sprintf('%u', crc32($data)); // %u is a must for ccrc32 returns a signed value
514
- $data = $crc . "|" . $data;
515
- $data = bin2hex($data . $key);
516
- $data = strrev(base64_encode($data));
517
- } catch (Exception $e) {
518
- Mage::logException('Error: ' . $e);
519
- }
520
- return $data;
521
- }
522
-
523
  /**
524
  * Function to Encode Novalnet PCI data
525
  *
526
  * @param string $data
527
  * @param string $key
 
528
  * @return boolean
529
  */
530
- public function getPciEncodedParam(&$fields, $key)
531
  {
532
  if (!function_exists('base64_encode') || !function_exists('pack') || !function_exists('crc32')) {
533
  return false;
534
  }
535
- $toBeEncoded = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('novalnetHashParams');
 
 
536
  foreach ($toBeEncoded as $_value) {
537
  $data = $fields->$_value;
538
  if ($this->isEmptyString($data)) {
@@ -603,14 +582,17 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
603
  *
604
  * @param array $data
605
  * @param string $key
 
606
  * @return string
607
  */
608
- public function generateHash($data, $key)
609
  {
610
  if (!function_exists('md5') || $this->isEmptyString($key)) {
611
  return false;
612
  }
613
- $hashFields = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('novalnetHashParams');
 
 
614
  $str = NULL;
615
  foreach ($hashFields as $_value) {
616
  if ($this->isEmptyString($data->$_value)) {
@@ -626,9 +608,10 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
626
  *
627
  * @param array $request
628
  * @param string $key
 
629
  * @return string
630
  */
631
- public function getHash($request, $key)
632
  {
633
  if (empty($request)) {
634
  return'Error: no data';
@@ -636,7 +619,13 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
636
  if (!function_exists('md5')) {
637
  return'Error: func n/a';
638
  }
639
- return md5($request['auth_code'] . $request['product'] . $request['tariff'] . $request['amount'] . $request['test_mode'] . $request['uniqid'] . strrev($key));
 
 
 
 
 
 
640
  }
641
 
642
  /**
@@ -644,12 +633,13 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
644
  *
645
  * @param array $request
646
  * @param string $key
 
647
  * @return boolean
648
  */
649
- public function checkHash($request, $key)
650
  {
651
  if (!$request) return false;
652
- if ($request['hash2'] != $this->getHash($request, $key)) {
653
  return false;
654
  }
655
  return true;
@@ -660,14 +650,15 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
660
  *
661
  * @param array $response
662
  * @param string $password
 
663
  * @return int
664
  */
665
- public function checkParams($response, $password)
666
  {
667
  $status = $response['status'];
668
  if (!$response['hash2']) {
669
  $status = '94';
670
- }if (!$this->checkHash($response, $password)) {
671
  $status = '91';
672
  }
673
  $response['amount'] = $this->getDecodedParam($response['amount'], $password);
@@ -995,8 +986,6 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
995
  */
996
  public function getPayportUrl($reqType, $paymentCode = NULL)
997
  {
998
- $protocol = Mage::app()->getStore()->isCurrentlySecure() ? 'https' : 'http';
999
-
1000
  if ($paymentCode && $reqType == 'redirect') {
1001
  $redirectUrl = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('redirectPayportUrl');
1002
  $payportUrl = $redirectUrl[$paymentCode];
@@ -1007,44 +996,7 @@ class Novalnet_Payment_Helper_Data extends Mage_Core_Helper_Abstract
1007
  );
1008
  $payportUrl = $urlType[$reqType];
1009
  }
1010
- return $protocol . $payportUrl;
1011
- }
1012
-
1013
- /**
1014
- * Get Next Cycle Date
1015
- *
1016
- * @param $nextCycleId
1017
- * @return mixed
1018
- */
1019
- public function getCycleDate($nextCycleId)
1020
- {
1021
- $_order = new Mage_Sales_Model_Order();
1022
- $orderId = Mage::app()->getRequest()->getParam('order_id');
1023
- if (!$orderId) {
1024
- $request = Mage::app()->getRequest();
1025
- $invoiceId = $request->getParam('invoice_id');
1026
- $shipmentId = $request->getParam('shipment_id');
1027
- $creditmemoId = $request->getParam('creditmemo_id');
1028
- if ($invoiceId) {
1029
- $invoice = Mage::getModel('sales/order_invoice')->load($invoiceId);
1030
- $orderId = $invoice->getOrder()->getId();
1031
- } else if ($shipmentId) {
1032
- $ship = Mage::getModel('sales/order_shipment')->load($shipmentId);
1033
- $orderId = $ship->getOrder()->getId();
1034
- } else if ($creditmemoId) {
1035
- $creditmemo = Mage::getModel('sales/order_creditmemo')->load($creditmemoId);
1036
- $orderId = $creditmemo->getOrder()->getId();
1037
- }
1038
- }
1039
- if (isset($orderId) && $orderId) {
1040
- $order = $_order->load($orderId);
1041
- $payment = $order->getPayment();
1042
- if ($payment) {
1043
- $paymentObj = $payment->getMethodInstance();
1044
- $statusCall = $paymentObj->doNovalnetStatusCall($nextCycleId,$payment);
1045
- return $statusCall->getNextSubsCycle();
1046
- }
1047
- }
1048
  }
1049
 
1050
  /**
47
  'paymentSave' => array(
48
  'group_name' => array('novalnetCc', 'novalnetSepa', 'novalnetInvoice',
49
  'novalnetPrepayment',
50
+ 'novalnetBanktransfer', 'novalnetPaypal', 'novalnetEps', 'novalnetIdeal', 'novalnetGiropay'),
51
  'header_text' => 'Novalnet Global Configuration',
52
  'codes' => array(
53
  'page' => 'paymentSave',
487
  $exludedGroupes = trim($userGroupId);
488
  if (strlen($exludedGroupes)) {
489
  $exludedGroupes = explode(',', $exludedGroupes);
490
+ $custGrpId = $this->getCustomerSession()->getCustomerGroupId();
491
+ if ($this->checkIsAdmin()) {
492
+ $custGrpId = $this->getAdminCheckoutSession()->getQuote()->getCustomerId();
493
+ }
494
+ return !in_array($custGrpId, $exludedGroupes);
495
  }
496
  return true;
497
  }
498
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
499
  /**
500
  * Function to Encode Novalnet PCI data
501
  *
502
  * @param string $data
503
  * @param string $key
504
+ * @param string $type
505
  * @return boolean
506
  */
507
+ public function getPciEncodedParam(&$fields, $key, $type = 'PHP')
508
  {
509
  if (!function_exists('base64_encode') || !function_exists('pack') || !function_exists('crc32')) {
510
  return false;
511
  }
512
+ $toBeEncoded = ($type == 'PHP_PCI')
513
+ ? Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('pciHashParams')
514
+ : Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('novalnetHashParams');
515
  foreach ($toBeEncoded as $_value) {
516
  $data = $fields->$_value;
517
  if ($this->isEmptyString($data)) {
582
  *
583
  * @param array $data
584
  * @param string $key
585
+ * @param string $type
586
  * @return string
587
  */
588
+ public function generateHash($data, $key, $type = 'PHP')
589
  {
590
  if (!function_exists('md5') || $this->isEmptyString($key)) {
591
  return false;
592
  }
593
+ $hashFields = ($type == 'PHP_PCI')
594
+ ? Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('pciHashParams')
595
+ : Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('novalnetHashParams');
596
  $str = NULL;
597
  foreach ($hashFields as $_value) {
598
  if ($this->isEmptyString($data->$_value)) {
608
  *
609
  * @param array $request
610
  * @param string $key
611
+ * @param string $type
612
  * @return string
613
  */
614
+ public function getHash($request, $key, $type)
615
  {
616
  if (empty($request)) {
617
  return'Error: no data';
619
  if (!function_exists('md5')) {
620
  return'Error: func n/a';
621
  }
622
+
623
+ if ($type == 'PHP_PCI') {
624
+ $hash = md5($request['vendor_authcode'] . $request['product_id'] . $request['tariff_id'] . $request['amount'] . $request['test_mode'] . $request['uniqid'] . strrev($key));
625
+ } else {
626
+ $hash = md5($request['auth_code'] . $request['product'] . $request['tariff'] . $request['amount'] . $request['test_mode'] . $request['uniqid'] . strrev($key));
627
+ }
628
+ return $hash;
629
  }
630
 
631
  /**
633
  *
634
  * @param array $request
635
  * @param string $key
636
+ * @param string $type
637
  * @return boolean
638
  */
639
+ public function checkHash($request, $key, $type)
640
  {
641
  if (!$request) return false;
642
+ if ($request['hash2'] != $this->getHash($request, $key, $type)) {
643
  return false;
644
  }
645
  return true;
650
  *
651
  * @param array $response
652
  * @param string $password
653
+ * @param string $type
654
  * @return int
655
  */
656
+ public function checkParams($response, $password, $type)
657
  {
658
  $status = $response['status'];
659
  if (!$response['hash2']) {
660
  $status = '94';
661
+ }if (!$this->checkHash($response, $password, $type)) {
662
  $status = '91';
663
  }
664
  $response['amount'] = $this->getDecodedParam($response['amount'], $password);
986
  */
987
  public function getPayportUrl($reqType, $paymentCode = NULL)
988
  {
 
 
989
  if ($paymentCode && $reqType == 'redirect') {
990
  $redirectUrl = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('redirectPayportUrl');
991
  $payportUrl = $redirectUrl[$paymentCode];
996
  );
997
  $payportUrl = $urlType[$reqType];
998
  }
999
+ return $payportUrl;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1000
  }
1001
 
1002
  /**
app/code/community/Novalnet/Payment/Model/Callbackscript.php CHANGED
@@ -48,8 +48,9 @@ class Novalnet_Payment_Model_Callbackscript
48
  'novalnetinvoice' => array('INVOICE_START', 'INVOICE_CREDIT', 'SUBSCRIPTION_STOP'),
49
  'novalnetprepayment' => array('INVOICE_START', 'INVOICE_CREDIT', 'SUBSCRIPTION_STOP'),
50
  'novalnetideal' => array('IDEAL'),
51
- 'novalnetpaypal' => array('PAYPAL'),
52
  'novalneteps' => array('EPS'),
 
53
  'novalnetbanktransfer' => array('ONLINE_TRANSFER', 'REFUND_BY_BANK_TRANSFER_EU'),
54
  'novalnetsepa' => array('DIRECT_DEBIT_SEPA', 'RETURN_DEBIT_SEPA', 'SUBSCRIPTION_STOP',
55
  'DEBT_COLLECTION_SEPA', 'CREDIT_ENTRY_SEPA'));
@@ -59,10 +60,10 @@ class Novalnet_Payment_Model_Callbackscript
59
 
60
  /** @Array Type of payment available - Level : 0 */
61
  $this->paymentTypes = array('INVOICE_START', 'PAYPAL', 'ONLINE_TRANSFER',
62
- 'CREDITCARD', 'IDEAL', 'DIRECT_DEBIT_SEPA', 'PAYSAFECARD', 'EPS', 'GUARANTEED_INVOICE_START');
63
  /** @Array Type of Chargebacks available - Level : 1 */
64
  $this->chargebacks = array('CREDITCARD_CHARGEBACK', 'RETURN_DEBIT_SEPA',
65
- 'CREDITCARD_BOOKBACK', 'REFUND_BY_BANK_TRANSFER_EU');
66
  /** @Array Type of CreditEntry payment and Collections available - Level : 2 */
67
  $this->aryCollection = array('INVOICE_CREDIT', 'GUARANTEED_INVOICE_CREDIT',
68
  'CREDIT_ENTRY_CREDITCARD', 'CREDIT_ENTRY_SEPA', 'DEBT_COLLECTION_SEPA',
@@ -117,7 +118,6 @@ class Novalnet_Payment_Model_Callbackscript
117
 
118
  // ################### Main Prog. ##########################
119
  try {
120
-
121
  //Check Params
122
  if ($this->checkIP()) {
123
 
@@ -133,6 +133,8 @@ class Novalnet_Payment_Model_Callbackscript
133
  $this->orderNo = $this->getOrderIdByTransId();
134
  }
135
  }
 
 
136
 
137
  if (empty($response['payment_type'])) {
138
  $this->showDebug("Required param (payment_type) missing!");
@@ -144,7 +146,6 @@ class Novalnet_Payment_Model_Callbackscript
144
  $order = $this->getOrderByIncrementId($this->orderNo);
145
  $storeId = $order->getStoreId();
146
  $this->getEmailConfig($storeId);
147
- $this->setLanguageStore($storeId);
148
  if ($order->getIncrementId()) {
149
  $payment = $order->getPayment();
150
  $paymentObj = $payment->getMethodInstance();
@@ -159,7 +160,6 @@ class Novalnet_Payment_Model_Callbackscript
159
  } else {
160
  $paymentTid = (in_array($response['payment_type'], $this->chargebacks)) ? $response['tid_payment'] : (in_array($response['payment_type'], $this->invoiceAllowed)) ? $response['tid_payment'] : $response['tid'];
161
  }
162
- $this->getAdminTransaction = $paymentObj->doNovalnetStatusCall($paymentTid, $payment);
163
  $checkTidExist = $payment->getLastTransId();
164
  $this->paymentTypeValidation($order);
165
  if (!empty($this->orderNo) && $order->getIncrementId() == $this->orderNo && empty($checkTidExist)) {
@@ -185,7 +185,8 @@ class Novalnet_Payment_Model_Callbackscript
185
  $this->doTransactionStatusSave($dataObj); // Save the Transaction status
186
  // Payment process based on response status
187
  if ($payment->getAdditionalInformation($paymentObj->getCode() . '_successAction') != 1) {
188
- if ($order->canInvoice() && $this->getAdminTransaction->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
 
189
  $payment->setTransactionId($txnId) // Add capture text to make the new transaction
190
  ->setParentTransactionId(null)
191
  ->setIsTransactionClosed(true)
@@ -200,12 +201,17 @@ class Novalnet_Payment_Model_Callbackscript
200
  }
201
  $onHoldStatus = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('paymentOnholdStaus');
202
  array_push($onHoldStatus, '100', '90');
203
- if (in_array($this->getAdminTransaction->getStatus(), $onHoldStatus)) {
204
  $orderStatus = $this->getOrderStatus($order);
205
  $order->setState(Mage_Sales_Model_Order::STATE_PROCESSING, $orderStatus, $helper->__('Customer successfully returned from Novalnet'), true
206
  )->save();
 
207
  } else {
 
 
 
208
  $paymentObj->saveCancelledOrder($dataObj, $payment);
 
209
  }
210
  }
211
 
@@ -213,7 +219,7 @@ class Novalnet_Payment_Model_Callbackscript
213
  $this->doTransactionOrderLog($response);
214
  //sendNewOrderEmail
215
  if (!$order->getEmailSent() && $order->getId()
216
- && in_array($this->getAdminTransaction->getStatus(), $onHoldStatus)) {
217
  try {
218
  $order->sendNewOrderEmail()
219
  ->setEmailSent(true)
@@ -223,18 +229,14 @@ class Novalnet_Payment_Model_Callbackscript
223
  }
224
  }
225
  $order->save();
226
- $this->emailBody = "Novalnet Callback received for the TID: " . $txnId;
227
  }
228
 
229
  //Get Order ID and Set New Order Status
230
  if ($this->checkParams($response)) {
231
  $orderCheckStatus = $this->BasicValidation();
232
  if ($orderCheckStatus) {
233
- if ($response['payment_type'] != 'INVOICE_CREDIT' || ($response['payment_type'] == 'INVOICE_CREDIT' && $this->getAdminTransaction->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED)) {
234
- $this->setOrderStatus(); //and send error mails if any
235
- } else {
236
- $this->showDebug(isset($this->getAdminTransaction['transaction_status']['status_message']) ? ($this->getAdminTransaction['transaction_status']['status_message']) : 'Error in processing the transactions status');
237
- }
238
  }
239
  }
240
  } else {
@@ -323,7 +325,7 @@ class Novalnet_Payment_Model_Callbackscript
323
  $emailTemplateVariables['toEmail'] = $this->emailToAddr;
324
  $emailTemplateVariables['subject'] = $this->emailSubject;
325
  $emailTemplateVariables['body'] = $emailBody;
326
- $processedTemplate = $emailTemplate->getProcessedTemplate($emailTemplVariables);
327
 
328
  $mail = new Zend_Mail();
329
  $mail->setBodyHtml($processedTemplate);
@@ -410,7 +412,7 @@ class Novalnet_Payment_Model_Callbackscript
410
  if (isset($k) && $k == 'amount'
411
  && (!is_numeric($request[$k]) || $request[$k] < 0)) {
412
  $this->showDebug('Required param (' . $k . ') missing!');
413
- } elseif (isset($k) && $k != 'amount'
414
  && (!isset($request[$k]) || empty($request[$k]))) {
415
  $this->showDebug('Required param (' . $k . ') missing!');
416
  }
@@ -509,108 +511,110 @@ class Novalnet_Payment_Model_Callbackscript
509
  $order->getPayment()->getMethodInstance()->setCanCapture(true);
510
  $payment = $order->getPayment();
511
  $data = unserialize($payment->getAdditionalData());
512
- $currency = $this->getAdminTransaction->getCurrency();
513
  if ($this->level == 1) { //level 1 payments - Type of Chargebacks
514
- // Update callback comments for Chargebacks
515
- if (in_array($this->request['payment_type'], $this->chargebacks)) {
516
- $bookBack = array('CREDITCARD_BOOKBACK', 'REFUND_BY_BANK_TRANSFER_EU');
517
- $tId = !$this->recurring ? $request['tid_payment'] : $request['signup_tid'];
518
- if (in_array($request['payment_type'], $bookBack)) {
519
- $script = 'Novalnet callback received. Refund/Bookback executed successfully for the TID: ' . $tId . ' amount: ' . ($request['amount'])
520
- / 100 . ' ' . $currency . " on " . date('Y-m-d H:i:s') . '. The subsequent TID: ' . $request['tid'];
521
- } else {
522
- $script = 'Novalnet Callback script received. Chargeback executed sucessfully for the TID ' . $tId . ' amount ' . ($request['amount']) / 100 . ' ' . $currency . " on " . $this->currentTime . '. The subsequent TID: ' . $request['tid'];
 
 
 
 
 
523
  }
524
- $this->emailBody = $script;
525
- $this->saveAdditionalInfo($payment, $data, $script, $order);
526
- return true;
527
  }
528
  }
529
-
530
  if ($request['payment_type'] == 'SUBSCRIPTION_STOP') { ### Cancellation of a Subscription
531
  ### UPDATE THE STATUS OF THE USER SUBSCRIPTION ###
532
- $script = 'Novalnet Callback script received. Subscription has been stopped for the TID:' . $request['signup_tid'] . " on " . $this->currentTime;
533
- $script .= '<br>Reason for Cancellation: ' . $request['termination_reason'];
534
- $this->emailBody = $script;
535
- $recurringProfileId = $this->getProfileInformation($request);
536
- $orderNumber = $helper->getModelRecurring()->getRecurringOrderNo($recurringProfileId);
537
- $parentOrder = $this->getOrderByIncrementId($orderNumber[0]);
538
- $parentPayment = $parentOrder->getPayment();
539
- $parentData = unserialize($parentPayment->getAdditionalData());
540
- $this->saveAdditionalInfo($parentPayment, $parentData, $script, $parentOrder);
541
- $recurringProfileId->setState('canceled');
542
- $recurringProfileId->save();
543
  return true;
544
  }
545
 
546
  $invoice = $order->getInvoiceCollection()->getFirstItem();
547
  $paid = $invoice->getState();
 
548
  if ($this->level == 0 || $this->level == 2) {
549
- $subsPaymentType = array('CREDITCARD', 'DIRECT_DEBIT_SEPA', 'INVOICE_START');
550
- if ($this->recurring && in_array($this->request['payment_type'], $subsPaymentType) && !empty($this->request['signup_tid']) && $this->request['subs_billing'] == 1) {
551
- $recurringProfileId = $this->getProfileInformation($request);
552
- $periodMaxCycles = $recurringProfileId->getPeriodMaxCycles();
553
- $profileId = $recurringProfileId->getId();
554
- $helper = $this->_getNovalnetHelper();
555
- if (!$this->getAdminTransaction->getNextSubsCycle()) {
556
- $this->showDebug("Novalnet callback received. Subscription Suspended. Refer Order :" . $this->orderNo);
557
- }
558
- $script = 'Novalnet Callback script received. Recurring was executed sucessfully for the TID ' . $request['signup_tid'] . ' with amount ' . ($request['amount']) / 100 . ' ' . $currency . ' ' . " on " . $this->currentTime . '.';
559
 
560
- $callbackCycle = $this->getRecurringCallbackSave($request, $periodMaxCycles, $helper, $profileId);
561
- $this->getEndTime($request, $recurringProfileId, $callbackCycle);
562
- $paidAmount = ($request['amount'] / 100);
563
- $loadTransaction = $helper->loadTransactionStatus($request['signup_tid'])
564
- ->setAmount($paidAmount)
565
- ->save();
566
- $this->createOrder($order, $script, $data, $payment, $profileId);
567
- return true;
568
- }
569
 
570
- $saveInvoice = '';
571
- if (($request['payment_type'] != 'PAYPAL')
572
- || (($request['payment_type'] == 'PAYPAL') && ($this->getAdminTransaction->getStatus() == 100))) {
573
- $saveInvoice = $this->saveInvoice($order, $nominalItem, $paid);
574
- }
575
 
576
- if ($invoice) {
577
- if ($saveInvoice) {
578
- $order->setState($state, true, 'Novalnet callback set state ' . $state . ' for Order-ID = ' . $this->orderNo);
579
- $order->addStatusToHistory($status, 'Novalnet callback added order status ' . $status);
580
- $this->emailBody .= 'Novalnet callback set state to ' . $state . $this->lineBreak;
581
- $this->emailBody .= 'Novalnet callback set status to ' . $status . ' ... ' . $this->lineBreak;
582
- $order->save();
583
-
584
- $transMode = (version_compare($helper->getMagentoVersion(), '1.6', '<')) ? false : true;
585
- if (in_array($request['payment_type'], $this->invoiceAllowed)) {
586
- if ($nominalItem) {
587
- $tidPayment = isset($request['signup_tid']) && $request['signup_tid'] && $request['subs_billing'] ? trim($request['signup_tid']) : trim($request['tid_payment']);
588
  } else {
589
- $tidPayment = trim($request['tid']);
 
 
590
  }
591
- $payment->setTransactionId($tidPayment)
592
- ->setIsTransactionClosed($transMode);
593
- $transaction = $payment->addTransaction(Mage_Sales_Model_Order_Payment_Transaction::TYPE_CAPTURE, null, false);
594
- $transaction->setParentTxnId(null)
595
- ->save();
596
- $amount = $this->_getNovalnetHelper()->getFormatedAmount($request['amount'], 'RAW');
597
- $currency = $this->getAdminTransaction->getCurrency();
598
- $script = 'Novalnet Callback Script executed successfully for the TID: ' . $request['tid_payment'] . ' with amount ' . $amount . ' ' . $currency . ' on ' . $this->currentTime . '. Please refer PAID transaction in our Novalnet Merchant Administration with the TID: ' . $request['tid'];
599
  } else {
600
- $script = 'Novalnet Callback Script executed successfully on ' . $this->currentTime;
601
  }
602
- $this->saveAdditionalInfo($payment, $data, $script, $order);
603
-
604
-
605
- $changeAmount = $helper->getAmountCollection($order->getId(), 1, NULL);
606
- if ($changeAmount) {
607
- $loadTransStatus = $helper->loadTransactionStatus($request['tid_payment']);
608
- $loadTransStatus->setAmount($changeAmount)
609
- ->save();
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
610
  }
 
 
611
  }
612
  } else {
613
- $this->showDebug("Novalnet Callback: No invoice for order (" . $order->getId() . ") found");
614
  }
615
  }
616
  } else {
@@ -646,12 +650,12 @@ class Novalnet_Payment_Model_Callbackscript
646
  } else {
647
  $tidPayment = $request['signup_tid'];
648
  }
649
-
650
  if (in_array($request['payment_type'], $this->invoiceAllowed) && $sum < $grandTotal) {
 
651
  $this->doNovalnetCallbackLog($novalnetCallbackModel, $request, $sum);
652
  $amount = $helper->getFormatedAmount($request['amount'], 'RAW');
653
- $this->emailBody = "Novalnet Callback Script executed successfully for the TID: " . $tidPayment . " with amount " . $amount . " " . $this->getAdminTransaction->getCurrency() . " on " . $this->currentTime . ". Please refer PAID transaction in our Novalnet Merchant Administration with the TID: " . $request['tid'] . "$this->lineBreak$this->lineBreak";
654
- $script = "Novalnet Callback Script executed successfully for the TID: " . $tidPayment . " with amount " . $amount . " " . $this->getAdminTransaction->getCurrency() . " on " . $this->currentTime . ". Please refer PAID transaction in our Novalnet Merchant Administration with the TID: " . $request['tid'] . $this->lineBreak;
655
  $this->saveAdditionalInfo($payment, $data, $script, $order);
656
  return false;
657
  } else {
@@ -668,6 +672,8 @@ class Novalnet_Payment_Model_Callbackscript
668
  ->addObject($invoice)
669
  ->addObject($invoice->getOrder())
670
  ->save();
 
 
671
  if ($this->recurring || $nominalItem) {
672
  $profileInfo = $this->getProfileInformation($request);
673
  if ($profileInfo->getState() != 'canceled') {
@@ -678,15 +684,16 @@ class Novalnet_Payment_Model_Callbackscript
678
 
679
  $amount = $helper->getFormatedAmount($request['amount'], 'RAW');
680
  if (in_array($request['payment_type'], $this->invoiceAllowed)) {
681
- $emailText = "Novalnet Callback Script executed successfully for the TID: " . $tidPayment . " with amount " . $amount . " ". $this->getAdminTransaction->getCurrency() . " on " . $this->currentTime . ". Please refer PAID transaction in our Novalnet Merchant Administration with the TID: " . $request['tid'] . "$this->lineBreak$this->lineBreak";
682
 
683
  $this->emailBody = ($sum > $grandTotal) ? $emailText . "Your paid amount is greater than the order total amount. $this->lineBreak" : $emailText;
684
  } else {
685
- $this->emailBody = "Novalnet Callback Script executed successfully for the TID: " . $request['tid'] . " with amount " . $amount . " ". $this->getAdminTransaction->getCurrency() . " on " . $this->currentTime . ". $this->lineBreak$this->lineBreak";
686
  }
 
687
  } else {
688
  if ($paymentObj->getCode() == Novalnet_Payment_Model_Config::NN_INVOICE && $paid == 1) {
689
- $currency = $this->getAdminTransaction->getCurrency();
690
  $scriptText = 'Novalnet Callback Script executed successfully for the TID: ' . $request['tid_payment'] . ' with amount ' . $amount . ' ' . $currency . ' on ' . $this->currentTime . '. Please refer PAID transaction in our Novalnet Merchant Administration with the TID: ' . $request['tid'];
691
  $script = ($sum > $grandTotal) ? $scriptText . '.Your paid amount is greater than the order total amount.' : $scriptText;
692
  $this->emailBody = $script;
@@ -772,6 +779,7 @@ class Novalnet_Payment_Model_Callbackscript
772
  $callerIp = $this->_getNovalnetHelper()->getRealIpAddr();
773
 
774
  if (!in_array($callerIp, $this->ipAllowed) && !$this->test) {
 
775
  $this->showDebug('Novalnet callback received. Unauthorised access from the IP [' . $callerIp . ']');
776
  }
777
 
@@ -785,10 +793,9 @@ class Novalnet_Payment_Model_Callbackscript
785
  */
786
  public function doTransactionStatusSave($response)
787
  {
788
- $transactionStatus = $this->getAdminTransaction;
789
  $order = $this->getOrderByIncrementId($this->orderNo);
790
  $amount = $response['amount'];
791
- $status = trim($transactionStatus->getStatus());
792
  $ncNo = (isset($response['nc_no'])) ? $response['nc_no'] : NULL;
793
  $helper = $this->_getNovalnetHelper();
794
  $payment = $order->getPayment();
@@ -849,6 +856,28 @@ class Novalnet_Payment_Model_Callbackscript
849
  ->save();
850
  }
851
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
852
  /**
853
  * Log Affiliate account details
854
  *
@@ -918,15 +947,17 @@ class Novalnet_Payment_Model_Callbackscript
918
  $storeId = $order->getStoreId();
919
  $getResponseData = unserialize($payment->getAdditionalData());
920
  $redirectPayment = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('redirectPayments');
921
- array_push($redirectPayment, Novalnet_Payment_Model_Config::NN_PREPAYMENT, Novalnet_Payment_Model_Config::NN_INVOICE);
922
 
923
  $status = $paymentObj->getNovalnetConfig('order_status', '', $storeId);
924
- if (($paymentObj->getCode() && (in_array($paymentObj->getCode(), $redirectPayment))) || ($paymentObj->getCode() == Novalnet_Payment_Model_Config::NN_CC && isset($getResponseData['ActiveCc3d']) && $getResponseData['ActiveCc3d'])) {
925
  $status = $paymentObj->getNovalnetConfig('order_status_after_payment', '', $storeId);
926
  }
927
- if ($paymentObj->getCode() && $paymentObj->getCode() == Novalnet_Payment_Model_Config::NN_PAYPAL && ($this->getAdminTransaction->getStatus() == Novalnet_Payment_Model_Config::PAYPAL_PENDING_CODE)) {
 
928
  $status = $paymentObj->getNovalnetConfig('order_status', '', $storeId) ? $paymentObj->getNovalnetConfig('order_status', '', $storeId) : Mage_Sales_Model_Order::STATE_PENDING_PAYMENT;
929
  }
 
930
  if (!$status) {
931
  $status = Mage_Sales_Model_Order::STATE_PROCESSING;
932
  }
@@ -1010,8 +1041,6 @@ class Novalnet_Payment_Model_Callbackscript
1010
  */
1011
  private function getEndTime($request, $recurringProfileId, $callbackCycle)
1012
  {
1013
- $periodUnit = $recurringProfileId->getPeriodUnit();
1014
- $periodFrequency = $recurringProfileId->getPeriodFrequency();
1015
  $periodMaxCycles = $recurringProfileId->getPeriodMaxCycles();
1016
  $this->endTime = 0;
1017
 
@@ -1255,8 +1284,8 @@ class Novalnet_Payment_Model_Callbackscript
1255
  $newOrderId = $orderNew->getId();
1256
  $parentOrderNo = $this->getOrderIdByTransId() ? $this->getOrderIdByTransId() : $orderNew->getIncrementId();
1257
  $script .= $comments = ' Recurring Payment for order id : ' . $parentOrderNo . '<br>';
1258
-
1259
- $script .= $nextDate = !$this->endTime ? '<br>Next Payment Date is: ' . $this->getAdminTransaction->getNextSubsCycle() . '<br>' : '';
1260
  $this->emailBody = $script;
1261
 
1262
  $newData = array('NnTestOrder' => $this->request['test_mode'],
@@ -1269,12 +1298,13 @@ class Novalnet_Payment_Model_Callbackscript
1269
  'key' => $data['key'],
1270
  'NnComments' => ($comments . $nextDate)
1271
  );
 
1272
  if ($paymentCode == 'novalnetPrepayment' || $paymentCode == 'novalnetInvoice') {
1273
  $dataObj = new Varien_Object($this->request);
1274
  $dataHelper = Mage::helper('novalnet_payment/AssignData');
1275
  $newData['NnNoteDesc'] = $dataHelper->getNoteDescription();
1276
  $newData['NnRecurringOrder'] = 1;
1277
- $newData['NnDueDate'] = isset($this->request['due_date']) ? ($helper->__('Due Date') . ' : <b>' . Mage::helper('core')->formatDate($this->request['due_date']) . "</b><br />") : '';
1278
  $newData['NnNote'] = $dataHelper->getNote($dataObj);
1279
  $newData['NnNoteAmount'] = $dataHelper->getBankDetailsAmount(($this->request['amount'] / 100));
1280
  }
@@ -1290,9 +1320,8 @@ class Novalnet_Payment_Model_Callbackscript
1290
  ->setPayment($payment)
1291
  ->save();
1292
  $this->insertOrderId($newOrderId, $profileId);
1293
- $getTransactionStatus = $paymentObj->doNovalnetStatusCall($tid, $payment);
1294
- $this->_logStatusData($getTransactionStatus, $tid, $orderNew, $paymentCode);
1295
- if ($orderNew->canInvoice() && $getTransactionStatus->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED && $paymentCode != Novalnet_Payment_Model_Config::NN_PREPAYMENT) {
1296
  $invoice = $orderNew->prepareInvoice();
1297
  $invoice->setTransactionId($tid);
1298
  $invoice->setRequestedCaptureCase(Mage_Sales_Model_Order_Invoice::CAPTURE_ONLINE)
@@ -1310,6 +1339,7 @@ class Novalnet_Payment_Model_Callbackscript
1310
  $payment->setTransactionId($tid)
1311
  ->setIsTransactionClosed($transMode);
1312
  }
 
1313
  $transaction = $payment->addTransaction(Mage_Sales_Model_Order_Payment_Transaction::TYPE_CAPTURE, null, false);
1314
  $transaction->setParentTxnId(null)
1315
  ->save();
@@ -1325,7 +1355,7 @@ class Novalnet_Payment_Model_Callbackscript
1325
  * @param string $paymentCode
1326
  * @return null
1327
  */
1328
- private function _logStatusData($response, $txnId, $order, $paymentCode)
1329
  {
1330
  $helper = $this->_getNovalnetHelper();
1331
  $customerId = $order->getCustomerId() ? $order->getCustomerId() : '';
@@ -1334,7 +1364,7 @@ class Novalnet_Payment_Model_Callbackscript
1334
  $modNovalTransactionStatus = $helper->getModelTransactionStatus();
1335
  $modNovalTransactionStatus->setTransactionNo($txnId)
1336
  ->setOrderId($order->getIncrementId()) // Order number
1337
- ->setTransactionStatus($response->getStatus()) // Transaction status code
1338
  ->setCustomerId($customerId) // Customer number
1339
  ->setPaymentName($paymentCode) // Payment name
1340
  ->setAmount($amount) // Amount
48
  'novalnetinvoice' => array('INVOICE_START', 'INVOICE_CREDIT', 'SUBSCRIPTION_STOP'),
49
  'novalnetprepayment' => array('INVOICE_START', 'INVOICE_CREDIT', 'SUBSCRIPTION_STOP'),
50
  'novalnetideal' => array('IDEAL'),
51
+ 'novalnetpaypal' => array('PAYPAL', 'PAYPAL_BOOKBACK'),
52
  'novalneteps' => array('EPS'),
53
+ 'novalnetgiropay' => array('GIROPAY'),
54
  'novalnetbanktransfer' => array('ONLINE_TRANSFER', 'REFUND_BY_BANK_TRANSFER_EU'),
55
  'novalnetsepa' => array('DIRECT_DEBIT_SEPA', 'RETURN_DEBIT_SEPA', 'SUBSCRIPTION_STOP',
56
  'DEBT_COLLECTION_SEPA', 'CREDIT_ENTRY_SEPA'));
60
 
61
  /** @Array Type of payment available - Level : 0 */
62
  $this->paymentTypes = array('INVOICE_START', 'PAYPAL', 'ONLINE_TRANSFER',
63
+ 'CREDITCARD', 'IDEAL', 'DIRECT_DEBIT_SEPA', 'PAYSAFECARD', 'EPS', 'GUARANTEED_INVOICE_START', 'GIROPAY');
64
  /** @Array Type of Chargebacks available - Level : 1 */
65
  $this->chargebacks = array('CREDITCARD_CHARGEBACK', 'RETURN_DEBIT_SEPA',
66
+ 'CREDITCARD_BOOKBACK', 'REFUND_BY_BANK_TRANSFER_EU', 'PAYPAL_BOOKBACK');
67
  /** @Array Type of CreditEntry payment and Collections available - Level : 2 */
68
  $this->aryCollection = array('INVOICE_CREDIT', 'GUARANTEED_INVOICE_CREDIT',
69
  'CREDIT_ENTRY_CREDITCARD', 'CREDIT_ENTRY_SEPA', 'DEBT_COLLECTION_SEPA',
118
 
119
  // ################### Main Prog. ##########################
120
  try {
 
121
  //Check Params
122
  if ($this->checkIP()) {
123
 
133
  $this->orderNo = $this->getOrderIdByTransId();
134
  }
135
  }
136
+ $this->order = Mage::getModel('sales/order')->loadByIncrementId($this->orderNo); // Get order object
137
+ $this->currency = $this->order->getOrderCurrencyCode(); // Get order currency
138
 
139
  if (empty($response['payment_type'])) {
140
  $this->showDebug("Required param (payment_type) missing!");
146
  $order = $this->getOrderByIncrementId($this->orderNo);
147
  $storeId = $order->getStoreId();
148
  $this->getEmailConfig($storeId);
 
149
  if ($order->getIncrementId()) {
150
  $payment = $order->getPayment();
151
  $paymentObj = $payment->getMethodInstance();
160
  } else {
161
  $paymentTid = (in_array($response['payment_type'], $this->chargebacks)) ? $response['tid_payment'] : (in_array($response['payment_type'], $this->invoiceAllowed)) ? $response['tid_payment'] : $response['tid'];
162
  }
 
163
  $checkTidExist = $payment->getLastTransId();
164
  $this->paymentTypeValidation($order);
165
  if (!empty($this->orderNo) && $order->getIncrementId() == $this->orderNo && empty($checkTidExist)) {
185
  $this->doTransactionStatusSave($dataObj); // Save the Transaction status
186
  // Payment process based on response status
187
  if ($payment->getAdditionalInformation($paymentObj->getCode() . '_successAction') != 1) {
188
+ $payment->setAdditionalInformation($paymentObj->getCode() . '_successAction', 1);
189
+ if ($order->canInvoice() && $this->request['status'] == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED && in_array($this->request['tid_status'], array(100,99,98,91,90)) ) {
190
  $payment->setTransactionId($txnId) // Add capture text to make the new transaction
191
  ->setParentTransactionId(null)
192
  ->setIsTransactionClosed(true)
201
  }
202
  $onHoldStatus = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('paymentOnholdStaus');
203
  array_push($onHoldStatus, '100', '90');
204
+ if (in_array($this->request['status'], $onHoldStatus) && in_array($this->request['tid_status'], array(100,99,98,91,90)) ) {
205
  $orderStatus = $this->getOrderStatus($order);
206
  $order->setState(Mage_Sales_Model_Order::STATE_PROCESSING, $orderStatus, $helper->__('Customer successfully returned from Novalnet'), true
207
  )->save();
208
+ $this->showDebug("Novalnet callback received. Order details are updated");
209
  } else {
210
+ $payment->setStatus(Mage_Sales_Model_Order::STATE_CANCELED)
211
+ ->setIsTransactionClosed(true)
212
+ ->save();
213
  $paymentObj->saveCancelledOrder($dataObj, $payment);
214
+ $this->showDebug("Novalnet callback received. Transaction status not valid");
215
  }
216
  }
217
 
219
  $this->doTransactionOrderLog($response);
220
  //sendNewOrderEmail
221
  if (!$order->getEmailSent() && $order->getId()
222
+ && in_array($this->request['status'], $onHoldStatus)) {
223
  try {
224
  $order->sendNewOrderEmail()
225
  ->setEmailSent(true)
229
  }
230
  }
231
  $order->save();
232
+ $this->emailBody = "Novalnet Callback received for the TID: " . $txnId . ".";
233
  }
234
 
235
  //Get Order ID and Set New Order Status
236
  if ($this->checkParams($response)) {
237
  $orderCheckStatus = $this->BasicValidation();
238
  if ($orderCheckStatus) {
239
+ $this->setOrderStatus();
 
 
 
 
240
  }
241
  }
242
  } else {
325
  $emailTemplateVariables['toEmail'] = $this->emailToAddr;
326
  $emailTemplateVariables['subject'] = $this->emailSubject;
327
  $emailTemplateVariables['body'] = $emailBody;
328
+ $processedTemplate = $emailTemplate->getProcessedTemplate($emailTemplateVariables);
329
 
330
  $mail = new Zend_Mail();
331
  $mail->setBodyHtml($processedTemplate);
412
  if (isset($k) && $k == 'amount'
413
  && (!is_numeric($request[$k]) || $request[$k] < 0)) {
414
  $this->showDebug('Required param (' . $k . ') missing!');
415
+ } elseif (isset($k) && !in_array($k, array('amount', 'status'))
416
  && (!isset($request[$k]) || empty($request[$k]))) {
417
  $this->showDebug('Required param (' . $k . ') missing!');
418
  }
511
  $order->getPayment()->getMethodInstance()->setCanCapture(true);
512
  $payment = $order->getPayment();
513
  $data = unserialize($payment->getAdditionalData());
514
+ $currency = $this->currency;
515
  if ($this->level == 1) { //level 1 payments - Type of Chargebacks
516
+ if ($request['status'] == 100 && $request['tid_status'] == 100) {
517
+ // Update callback comments for Chargebacks
518
+ if (in_array($this->request['payment_type'], $this->chargebacks)) {
519
+ $bookBack = array('CREDITCARD_BOOKBACK', 'REFUND_BY_BANK_TRANSFER_EU', 'PAYPAL_BOOKBACK');
520
+ $tId = !$this->recurring ? $request['tid_payment'] : $request['signup_tid'];
521
+ if (in_array($request['payment_type'], $bookBack)) {
522
+ $script = 'Novalnet callback received. Refund/Bookback executed successfully for the TID: ' . $tId . ' amount: ' . ($request['amount'])
523
+ / 100 . ' ' . $currency . " on " . date('Y-m-d H:i:s') . '. The subsequent TID: ' . $request['tid'];
524
+ } else {
525
+ $script = 'Novalnet Callback script received. Chargeback executed sucessfully for the TID ' . $tId . ' amount ' . ($request['amount']) / 100 . ' ' . $currency . " on " . $this->currentTime . '. The subsequent TID: ' . $request['tid'];
526
+ }
527
+ $this->emailBody = $script;
528
+ $this->saveAdditionalInfo($payment, $data, $script, $order);
529
+ return true;
530
  }
531
+ } else {
532
+ $this->showDebug("Novalnet callback received. Status is not valid.");
 
533
  }
534
  }
 
535
  if ($request['payment_type'] == 'SUBSCRIPTION_STOP') { ### Cancellation of a Subscription
536
  ### UPDATE THE STATUS OF THE USER SUBSCRIPTION ###
537
+ $this->subscriptionCancel($request);
 
 
 
 
 
 
 
 
 
 
538
  return true;
539
  }
540
 
541
  $invoice = $order->getInvoiceCollection()->getFirstItem();
542
  $paid = $invoice->getState();
543
+ $subsPaymentType = array('DIRECT_DEBIT_SEPA', 'INVOICE_START');
544
  if ($this->level == 0 || $this->level == 2) {
545
+ if($this->recurring && in_array($this->request['payment_type'], $subsPaymentType)) {
546
+ if(!empty($request['tid_status']) && !empty($request['status']) && in_array($request['tid_status'], array('91', '98', '99', '100') )) {
547
+ if (!empty($this->request['signup_tid']) && $this->request['subs_billing'] == 1 && $request['status'] == 100 ) {
548
+ $recurringProfileId = $this->getProfileInformation($request);
549
+ $periodMaxCycles = $recurringProfileId->getPeriodMaxCycles();
550
+ $profileId = $recurringProfileId->getId();
551
+ $helper = $this->_getNovalnetHelper();
552
+ if (!$this->request['paid_until']) {
553
+ $this->showDebug("Novalnet callback received. Subscription Suspended. Refer Order :" . $this->orderNo);
554
+ }
555
 
556
+ $script = 'Novalnet Callback Script executed successfully for the subscription TID: ' . $request['signup_tid'] . ' with amount ' . ($request['amount']) / 100 . ' ' . $currency . ' ' . ' on ' . $this->currentTime . '. Please refer PAID transaction in our Novalnet Merchant Administration with the TID: '. $request['tid'];
 
 
 
 
 
 
 
 
557
 
558
+ $callbackCycle = $this->getRecurringCallbackSave($request, $periodMaxCycles, $helper, $profileId);
559
+ $this->getEndTime($request, $recurringProfileId, $callbackCycle);
560
+ $paidAmount = ($request['amount'] / 100);
 
 
561
 
562
+ $helper->loadTransactionStatus($request['tid'])
563
+ ->setAmount($paidAmount)
564
+ ->save();
565
+ $this->createOrder($order, $script, $data, $payment, $profileId);
566
+ return true;
 
 
 
 
 
 
 
567
  } else {
568
+ $request['termination_reason'] = $request['status_message'];
569
+ $this->subscriptionCancel($request);
570
+ return true;
571
  }
 
 
 
 
 
 
 
 
572
  } else {
573
+ $this->showDebug("Novalnet callback received. Status is not valid.");
574
  }
575
+ }
576
+ if((isset($request['status']) && $request['status'] == 100) && (isset($request['tid_status']) && $request['tid_status'] == 100) ) {
577
+ $saveInvoice = '';
578
+ $saveInvoice = $this->saveInvoice($order, $nominalItem, $paid);
579
+ if ($invoice) {
580
+ if ($saveInvoice && $request['payment_type'] == 'INVOICE_CREDIT') {
581
+ $order->setState($state, true, 'Novalnet callback set state ' . $state . ' for Order-ID = ' . $this->orderNo);
582
+ $order->addStatusToHistory($status, 'Novalnet callback added order status ' . $status);
583
+ $this->emailBody .= 'Novalnet callback set state to ' . $state . $this->lineBreak;
584
+ $this->emailBody .= 'Novalnet callback set status to ' . $status . ' ... ' . $this->lineBreak;
585
+ $order->save();
586
+
587
+ $transMode = (version_compare($helper->getMagentoVersion(), '1.6', '<')) ? false : true;
588
+ if (in_array($request['payment_type'], $this->invoiceAllowed)) {
589
+ if ($nominalItem) {
590
+ $tidPayment = isset($request['signup_tid']) && $request['signup_tid'] && $request['subs_billing'] ? trim($request['signup_tid']) : trim($request['tid_payment']);
591
+ } else {
592
+ $tidPayment = trim($request['tid']);
593
+ }
594
+ $payment->setTransactionId($tidPayment)
595
+ ->setIsTransactionClosed($transMode);
596
+ $transaction = $payment->addTransaction(Mage_Sales_Model_Order_Payment_Transaction::TYPE_CAPTURE, null, false);
597
+ $transaction->setParentTxnId(null)
598
+ ->save();
599
+ $amount = $this->_getNovalnetHelper()->getFormatedAmount($request['amount'], 'RAW');
600
+ $currency = $this->currency;
601
+ $script = 'Novalnet Callback Script executed successfully for the TID: ' . $request['tid_payment'] . ' with amount ' . $amount . ' ' . $currency . ' on ' . $this->currentTime . '. Please refer PAID transaction in our Novalnet Merchant Administration with the TID: ' . $request['tid'];
602
+ } else {
603
+ $script = 'Novalnet Callback Script executed successfully on ' . $this->currentTime;
604
+ }
605
+ $this->saveAdditionalInfo($payment, $data, $script, $order);
606
+ $changeAmount = $helper->getAmountCollection($order->getId(), 1, NULL);
607
+ if ($changeAmount) {
608
+ $loadTransStatus = $helper->loadTransactionStatus($request['tid_payment']);
609
+ $loadTransStatus->setAmount($changeAmount)
610
+ ->save();
611
+ }
612
  }
613
+ } else {
614
+ $this->showDebug("Novalnet Callback: No invoice for order (" . $order->getId() . ") found");
615
  }
616
  } else {
617
+ $this->showDebug("Novalnet callback received. Status is not valid.");
618
  }
619
  }
620
  } else {
650
  } else {
651
  $tidPayment = $request['signup_tid'];
652
  }
 
653
  if (in_array($request['payment_type'], $this->invoiceAllowed) && $sum < $grandTotal) {
654
+
655
  $this->doNovalnetCallbackLog($novalnetCallbackModel, $request, $sum);
656
  $amount = $helper->getFormatedAmount($request['amount'], 'RAW');
657
+ $this->emailBody = "Novalnet Callback Script executed successfully for the TID: " . $tidPayment . " with amount " . $amount . " " . $this->currency . " on " . $this->currentTime . ". Please refer PAID transaction in our Novalnet Merchant Administration with the TID: " . $request['tid'] . "$this->lineBreak$this->lineBreak";
658
+ $script = "Novalnet Callback Script executed successfully for the TID: " . $tidPayment . " with amount " . $amount . " " . $this->currency . " on " . $this->currentTime . ". Please refer PAID transaction in our Novalnet Merchant Administration with the TID: " . $request['tid'] . $this->lineBreak;
659
  $this->saveAdditionalInfo($payment, $data, $script, $order);
660
  return false;
661
  } else {
672
  ->addObject($invoice)
673
  ->addObject($invoice->getOrder())
674
  ->save();
675
+ $orderStatus = $this->getOrderStatus($order);
676
+ $order->setState($orderStatus, true)->save();
677
  if ($this->recurring || $nominalItem) {
678
  $profileInfo = $this->getProfileInformation($request);
679
  if ($profileInfo->getState() != 'canceled') {
684
 
685
  $amount = $helper->getFormatedAmount($request['amount'], 'RAW');
686
  if (in_array($request['payment_type'], $this->invoiceAllowed)) {
687
+ $emailText = "Novalnet Callback Script executed successfully for the TID: " . $tidPayment . " with amount " . $amount . " ". $this->currency . " on " . $this->currentTime . ". Please refer PAID transaction in our Novalnet Merchant Administration with the TID: " . $request['tid'] . "$this->lineBreak$this->lineBreak";
688
 
689
  $this->emailBody = ($sum > $grandTotal) ? $emailText . "Your paid amount is greater than the order total amount. $this->lineBreak" : $emailText;
690
  } else {
691
+ $this->emailBody = "Novalnet Callback Script executed successfully for the TID: " . $request['tid'] . " with amount " . $amount . " ". $this->currency . " on " . $this->currentTime . ". $this->lineBreak$this->lineBreak";
692
  }
693
+ $this->saveAdditionalInfo($payment, $data, $this->emailBody, $order);
694
  } else {
695
  if ($paymentObj->getCode() == Novalnet_Payment_Model_Config::NN_INVOICE && $paid == 1) {
696
+ $currency = $this->currency;
697
  $scriptText = 'Novalnet Callback Script executed successfully for the TID: ' . $request['tid_payment'] . ' with amount ' . $amount . ' ' . $currency . ' on ' . $this->currentTime . '. Please refer PAID transaction in our Novalnet Merchant Administration with the TID: ' . $request['tid'];
698
  $script = ($sum > $grandTotal) ? $scriptText . '.Your paid amount is greater than the order total amount.' : $scriptText;
699
  $this->emailBody = $script;
779
  $callerIp = $this->_getNovalnetHelper()->getRealIpAddr();
780
 
781
  if (!in_array($callerIp, $this->ipAllowed) && !$this->test) {
782
+ $this->debug = true;
783
  $this->showDebug('Novalnet callback received. Unauthorised access from the IP [' . $callerIp . ']');
784
  }
785
 
793
  */
794
  public function doTransactionStatusSave($response)
795
  {
 
796
  $order = $this->getOrderByIncrementId($this->orderNo);
797
  $amount = $response['amount'];
798
+ $status = trim($this->request['status']);
799
  $ncNo = (isset($response['nc_no'])) ? $response['nc_no'] : NULL;
800
  $helper = $this->_getNovalnetHelper();
801
  $payment = $order->getPayment();
856
  ->save();
857
  }
858
 
859
+ /**
860
+ * Subscription cancellation
861
+ *
862
+ * @param $subscriptionParams
863
+ */
864
+ public function subscriptionCancel($request)
865
+ {
866
+ $helper = $this->_getNovalnetHelper();
867
+ $script = 'Novalnet Callback script received. Subscription has been stopped for the TID:' . $request['signup_tid'] . " on " . $this->currentTime;
868
+ $script .= '<br>Reason for Cancellation: ' . $request['termination_reason'];
869
+ $this->emailBody = $script;
870
+ $recurringProfileId = $this->getProfileInformation($request);
871
+ $orderNumber = $helper->getModelRecurring()->getRecurringOrderNo($recurringProfileId);
872
+ $parentOrder = $this->getOrderByIncrementId($orderNumber[0]);
873
+ $parentPayment = $parentOrder->getPayment();
874
+
875
+ $parentData = unserialize($parentPayment->getAdditionalData());
876
+ $this->saveAdditionalInfo($parentPayment, $parentData, $script, $parentOrder);
877
+ $recurringProfileId->setState('canceled');
878
+ $recurringProfileId->save();
879
+ }
880
+
881
  /**
882
  * Log Affiliate account details
883
  *
947
  $storeId = $order->getStoreId();
948
  $getResponseData = unserialize($payment->getAdditionalData());
949
  $redirectPayment = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('redirectPayments');
950
+ array_push($redirectPayment, Novalnet_Payment_Model_Config::NN_PREPAYMENT, Novalnet_Payment_Model_Config::NN_INVOICE, Novalnet_Payment_Model_Config::NN_CC);
951
 
952
  $status = $paymentObj->getNovalnetConfig('order_status', '', $storeId);
953
+ if ($paymentObj->getCode() && in_array($paymentObj->getCode(), $redirectPayment)) {
954
  $status = $paymentObj->getNovalnetConfig('order_status_after_payment', '', $storeId);
955
  }
956
+
957
+ if ($paymentObj->getCode() && $paymentObj->getCode() == Novalnet_Payment_Model_Config::NN_PAYPAL && ($this->request['status'] == Novalnet_Payment_Model_Config::PAYPAL_PENDING_CODE)) {
958
  $status = $paymentObj->getNovalnetConfig('order_status', '', $storeId) ? $paymentObj->getNovalnetConfig('order_status', '', $storeId) : Mage_Sales_Model_Order::STATE_PENDING_PAYMENT;
959
  }
960
+
961
  if (!$status) {
962
  $status = Mage_Sales_Model_Order::STATE_PROCESSING;
963
  }
1041
  */
1042
  private function getEndTime($request, $recurringProfileId, $callbackCycle)
1043
  {
 
 
1044
  $periodMaxCycles = $recurringProfileId->getPeriodMaxCycles();
1045
  $this->endTime = 0;
1046
 
1284
  $newOrderId = $orderNew->getId();
1285
  $parentOrderNo = $this->getOrderIdByTransId() ? $this->getOrderIdByTransId() : $orderNew->getIncrementId();
1286
  $script .= $comments = ' Recurring Payment for order id : ' . $parentOrderNo . '<br>';
1287
+ $next_charging_date = isset($this->request['next_subs_cycle']) ? $this->request['next_subs_cycle'] : $this->request['paid_until'] ;
1288
+ $script .= $nextDate = !$this->endTime ? '<br>Next charging date is: ' . $next_charging_date . '<br>' : '';
1289
  $this->emailBody = $script;
1290
 
1291
  $newData = array('NnTestOrder' => $this->request['test_mode'],
1298
  'key' => $data['key'],
1299
  'NnComments' => ($comments . $nextDate)
1300
  );
1301
+
1302
  if ($paymentCode == 'novalnetPrepayment' || $paymentCode == 'novalnetInvoice') {
1303
  $dataObj = new Varien_Object($this->request);
1304
  $dataHelper = Mage::helper('novalnet_payment/AssignData');
1305
  $newData['NnNoteDesc'] = $dataHelper->getNoteDescription();
1306
  $newData['NnRecurringOrder'] = 1;
1307
+ $newData['NnDueDate'] = isset($this->request['due_date']) ? ($helper->__('Due Date') . ' : <b><span id="due_date">' . Mage::helper('core')->formatDate($this->request['due_date']) . "</span></b><br />") : '';
1308
  $newData['NnNote'] = $dataHelper->getNote($dataObj);
1309
  $newData['NnNoteAmount'] = $dataHelper->getBankDetailsAmount(($this->request['amount'] / 100));
1310
  }
1320
  ->setPayment($payment)
1321
  ->save();
1322
  $this->insertOrderId($newOrderId, $profileId);
1323
+ $this->_logStatusData($tid, $orderNew, $paymentCode);
1324
+ if ($orderNew->canInvoice() && $this->request['status'] == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED && $paymentCode != Novalnet_Payment_Model_Config::NN_PREPAYMENT && $this->request['tid_status'] == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
 
1325
  $invoice = $orderNew->prepareInvoice();
1326
  $invoice->setTransactionId($tid);
1327
  $invoice->setRequestedCaptureCase(Mage_Sales_Model_Order_Invoice::CAPTURE_ONLINE)
1339
  $payment->setTransactionId($tid)
1340
  ->setIsTransactionClosed($transMode);
1341
  }
1342
+
1343
  $transaction = $payment->addTransaction(Mage_Sales_Model_Order_Payment_Transaction::TYPE_CAPTURE, null, false);
1344
  $transaction->setParentTxnId(null)
1345
  ->save();
1355
  * @param string $paymentCode
1356
  * @return null
1357
  */
1358
+ private function _logStatusData($txnId, $order, $paymentCode)
1359
  {
1360
  $helper = $this->_getNovalnetHelper();
1361
  $customerId = $order->getCustomerId() ? $order->getCustomerId() : '';
1364
  $modNovalTransactionStatus = $helper->getModelTransactionStatus();
1365
  $modNovalTransactionStatus->setTransactionNo($txnId)
1366
  ->setOrderId($order->getIncrementId()) // Order number
1367
+ ->setTransactionStatus($this->request['tid_status']) // Transaction status code
1368
  ->setCustomerId($customerId) // Customer number
1369
  ->setPaymentName($paymentCode) // Payment name
1370
  ->setAmount($amount) // Amount
app/code/community/Novalnet/Payment/Model/Config.php CHANGED
@@ -28,24 +28,23 @@ class Novalnet_Payment_Model_Config
28
  /* ******************************************** */
29
  /* NOVALNET GLOBAL PARAMS STARTS */
30
  /* ******************************************* */
31
- const CALLBACK_PIN_LENGTH = 4; //PIN Length
32
  const RESPONSE_CODE_APPROVED = 100; //On Payment Success
33
  const PAYMENT_VOID_STATUS = 103; //On Payment void
34
- const CVV_MIN_LENGTH = 3; //MIN CVV No
35
  const NOVALNET_RETURN_METHOD = 'POST';
36
  const NOVALNET_REDIRECT_BLOCK = 'novalnet_payment/payment_method_novalnetRedirect';
37
  const GATEWAY_REDIRECT_URL = 'novalnet_payment/gateway/redirect';
38
  const GATEWAY_DIRECT_URL = 'novalnet_payment/gateway/payment';
39
  const GATEWAY_RETURN_URL = 'novalnet_payment/gateway/return';
40
  const GATEWAY_ERROR_RETURN_URL = 'novalnet_payment/gateway/error';
41
- const PAYPORT_URL = '://payport.novalnet.de/paygate.jsp';
42
- const INFO_REQUEST_URL = '://payport.novalnet.de/nn_infoport.xml';
 
 
43
  const INVOICE_PAYMENT_METHOD = 'Invoice';
44
  const PREPAYMENT_PAYMENT_METHOD = 'Prepayment';
45
  const TRANS_STATUS = 'TRANSACTION_STATUS';
46
  const SUBS_PAUSE = 'SUBSCRIPTION_PAUSE';
47
  const TRANSMIT_PIN_AGAIN = 'TRANSMIT_PIN_AGAIN';
48
- const REPLY_EMAIL_STATUS = 'REPLY_EMAIL_STATUS';
49
  const PIN_STATUS = 'PIN_STATUS';
50
  const METHOD_DISABLE_CODE = '0529006';
51
  const PAYPAL_PENDING_CODE = 90;
@@ -55,25 +54,29 @@ class Novalnet_Payment_Model_Config
55
  static protected $_instance;
56
  protected $_novalnetPaymentKey = array('novalnetCc' => 6, 'novalnetInvoice' => 27,
57
  'novalnetPrepayment' => 27, 'novalnetPaypal' => 34, 'novalnetBanktransfer' => 33,
58
- 'novalnetIdeal' => 49, 'novalnetEps' => 50, 'novalnetSepa' => 37);
59
  protected $_novalnetPaymentMethods = array('novalnetCc' => 'Novalnet Credit Card', 'novalnetInvoice' => 'Novalnet Invoice',
60
  'novalnetPrepayment' => 'Novalnet Prepayment',
61
  'novalnetPaypal' => 'Novalnet PayPal', 'novalnetBanktransfer' => 'Novalnet Instant Bank Transfer',
62
- 'novalnetIdeal' => 'Novalnet iDEAL', 'novalnetEps' => 'Novalnet Eps', 'novalnetSepa' => 'Novalnet Direct Debit SEPA');
 
63
  protected $_novalnetPaymentTypes = array('novalnetCc' => 'CREDITCARD', 'novalnetInvoice' => 'INVOICE',
64
  'novalnetPrepayment' => 'PREPAYMENT', 'novalnetPaypal' => 'PAYPAL', 'novalnetBanktransfer' => 'ONLINE_TRANSFER',
65
- 'novalnetIdeal' => 'IDEAL', 'novalnetEps' => 'EPS', 'novalnetSepa' => 'DIRECT_DEBIT_SEPA');
66
- protected $_redirectPayportUrl = array('novalnetPaypal' => '://payport.novalnet.de/paypal_payport',
67
- 'novalnetBanktransfer' => '://payport.novalnet.de/online_transfer_payport',
68
- 'novalnetIdeal' => '://payport.novalnet.de/online_transfer_payport', 'novalnetEps' => '://payport.novalnet.de/eps_payport',
69
- 'novalnetCc' => '://payport.novalnet.de/global_pci_payport');
 
70
  protected $_redirectPayments = array('novalnetPaypal', 'novalnetBanktransfer',
71
- 'novalnetIdeal', 'novalnetEps');
72
- protected $_subscriptionPayments = array('novalnetCc', 'novalnetSepa',
73
  'novalnetPrepayment', 'novalnetInvoice');
74
  protected $_setonholdPayments = array('novalnetCc', 'novalnetSepa', 'novalnetInvoice');
75
  protected $_callbackAllowedCountry = array('AT', 'DE', 'CH');
76
  protected $_paymentOnholdStaus = array('91', '98', '99');
 
 
77
  protected $_novalnetHashParams = array('auth_code', 'product', 'tariff', 'amount',
78
  'test_mode', 'uniqid');
79
  protected $_fraudCheckPayment = array('novalnetInvoice', 'novalnetSepa');
@@ -84,8 +87,8 @@ class Novalnet_Payment_Model_Config
84
 
85
  const NN_CC = 'novalnetCc';
86
  const NN_CC_CAN_CAPTURE = true;
87
- const NN_CC_CAN_USE_INTERNAL = true;
88
  const NN_CC_CAN_USE_MULTISHIPPING = false;
 
89
  const NN_CC_FORM_BLOCK = 'novalnet_payment/payment_method_form_Cc';
90
  const NN_CC_INFO_BLOCK = 'novalnet_payment/payment_method_info_Cc';
91
 
@@ -137,6 +140,16 @@ class Novalnet_Payment_Model_Config
137
  const NN_EPS_FORM_BLOCK = 'novalnet_payment/payment_method_form_Eps';
138
  const NN_EPS_INFO_BLOCK = 'novalnet_payment/payment_method_info_Eps';
139
 
 
 
 
 
 
 
 
 
 
 
140
  /* ******************************************** */
141
  /* NOVALNET PAYPAL PARAMS */
142
  /* ******************************************* */
28
  /* ******************************************** */
29
  /* NOVALNET GLOBAL PARAMS STARTS */
30
  /* ******************************************* */
 
31
  const RESPONSE_CODE_APPROVED = 100; //On Payment Success
32
  const PAYMENT_VOID_STATUS = 103; //On Payment void
 
33
  const NOVALNET_RETURN_METHOD = 'POST';
34
  const NOVALNET_REDIRECT_BLOCK = 'novalnet_payment/payment_method_novalnetRedirect';
35
  const GATEWAY_REDIRECT_URL = 'novalnet_payment/gateway/redirect';
36
  const GATEWAY_DIRECT_URL = 'novalnet_payment/gateway/payment';
37
  const GATEWAY_RETURN_URL = 'novalnet_payment/gateway/return';
38
  const GATEWAY_ERROR_RETURN_URL = 'novalnet_payment/gateway/error';
39
+ const CC_IFRAME_URL = 'novalnet_payment/cc/index';
40
+ const CC_PCI_PAYPORT_URL = 'https://payport.novalnet.de/pci_payport';
41
+ const PAYPORT_URL = 'https://payport.novalnet.de/paygate.jsp';
42
+ const INFO_REQUEST_URL = 'https://payport.novalnet.de/nn_infoport.xml';
43
  const INVOICE_PAYMENT_METHOD = 'Invoice';
44
  const PREPAYMENT_PAYMENT_METHOD = 'Prepayment';
45
  const TRANS_STATUS = 'TRANSACTION_STATUS';
46
  const SUBS_PAUSE = 'SUBSCRIPTION_PAUSE';
47
  const TRANSMIT_PIN_AGAIN = 'TRANSMIT_PIN_AGAIN';
 
48
  const PIN_STATUS = 'PIN_STATUS';
49
  const METHOD_DISABLE_CODE = '0529006';
50
  const PAYPAL_PENDING_CODE = 90;
54
  static protected $_instance;
55
  protected $_novalnetPaymentKey = array('novalnetCc' => 6, 'novalnetInvoice' => 27,
56
  'novalnetPrepayment' => 27, 'novalnetPaypal' => 34, 'novalnetBanktransfer' => 33,
57
+ 'novalnetIdeal' => 49, 'novalnetEps' => 50, 'novalnetSepa' => 37, 'novalnetGiropay' => 69);
58
  protected $_novalnetPaymentMethods = array('novalnetCc' => 'Novalnet Credit Card', 'novalnetInvoice' => 'Novalnet Invoice',
59
  'novalnetPrepayment' => 'Novalnet Prepayment',
60
  'novalnetPaypal' => 'Novalnet PayPal', 'novalnetBanktransfer' => 'Novalnet Instant Bank Transfer',
61
+ 'novalnetIdeal' => 'Novalnet iDEAL', 'novalnetEps' => 'Novalnet Eps', 'novalnetSepa' => 'Novalnet Direct Debit SEPA',
62
+ 'novalnetGiropay' => 'Novalnet Giropay');
63
  protected $_novalnetPaymentTypes = array('novalnetCc' => 'CREDITCARD', 'novalnetInvoice' => 'INVOICE',
64
  'novalnetPrepayment' => 'PREPAYMENT', 'novalnetPaypal' => 'PAYPAL', 'novalnetBanktransfer' => 'ONLINE_TRANSFER',
65
+ 'novalnetIdeal' => 'IDEAL', 'novalnetEps' => 'EPS', 'novalnetSepa' => 'DIRECT_DEBIT_SEPA', 'novalnetGiropay' => 'GIROPAY');
66
+ protected $_redirectPayportUrl = array('novalnetPaypal' => 'https://payport.novalnet.de/paypal_payport',
67
+ 'novalnetBanktransfer' => 'https://payport.novalnet.de/online_transfer_payport',
68
+ 'novalnetIdeal' => 'https://payport.novalnet.de/online_transfer_payport',
69
+ 'novalnetEps' => 'https://payport.novalnet.de/giropay',
70
+ 'novalnetGiropay' => 'https://payport.novalnet.de/giropay');
71
  protected $_redirectPayments = array('novalnetPaypal', 'novalnetBanktransfer',
72
+ 'novalnetIdeal', 'novalnetEps', 'novalnetGiropay');
73
+ protected $_subscriptionPayments = array('novalnetSepa',
74
  'novalnetPrepayment', 'novalnetInvoice');
75
  protected $_setonholdPayments = array('novalnetCc', 'novalnetSepa', 'novalnetInvoice');
76
  protected $_callbackAllowedCountry = array('AT', 'DE', 'CH');
77
  protected $_paymentOnholdStaus = array('91', '98', '99');
78
+ protected $_pciHashParams = array('vendor_authcode', 'product_id', 'tariff_id', 'amount',
79
+ 'test_mode', 'uniqid');
80
  protected $_novalnetHashParams = array('auth_code', 'product', 'tariff', 'amount',
81
  'test_mode', 'uniqid');
82
  protected $_fraudCheckPayment = array('novalnetInvoice', 'novalnetSepa');
87
 
88
  const NN_CC = 'novalnetCc';
89
  const NN_CC_CAN_CAPTURE = true;
 
90
  const NN_CC_CAN_USE_MULTISHIPPING = false;
91
+ const NN_CC_CAN_USE_INTERNAL = false;
92
  const NN_CC_FORM_BLOCK = 'novalnet_payment/payment_method_form_Cc';
93
  const NN_CC_INFO_BLOCK = 'novalnet_payment/payment_method_info_Cc';
94
 
140
  const NN_EPS_FORM_BLOCK = 'novalnet_payment/payment_method_form_Eps';
141
  const NN_EPS_INFO_BLOCK = 'novalnet_payment/payment_method_info_Eps';
142
 
143
+ /* ******************************************** */
144
+ /* NOVALNET GIROPAY PARAMS */
145
+ /* ******************************************* */
146
+ const NN_GIROPAY = 'novalnetGiropay';
147
+ const NN_GIROPAY_CAN_CAPTURE = true;
148
+ const NN_GIROPAY_CAN_USE_INTERNAL = false;
149
+ const NN_GIROPAY_CAN_USE_MULTISHIPPING = false;
150
+ const NN_GIROPAY_FORM_BLOCK = 'novalnet_payment/payment_method_form_Giropay';
151
+ const NN_GIROPAY_INFO_BLOCK = 'novalnet_payment/payment_method_info_Giropay';
152
+
153
  /* ******************************************** */
154
  /* NOVALNET PAYPAL PARAMS */
155
  /* ******************************************* */
app/code/community/Novalnet/Payment/Model/Factory.php CHANGED
@@ -53,7 +53,6 @@ class Novalnet_Payment_Model_Factory
53
  }
54
 
55
  if ($transStatus != Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
56
-
57
  $transMode = (version_compare($magentoVersion, '1.6', '<')) ? false : true;
58
  $payment->setTransactionId($lastTranId)
59
  ->setIsTransactionClosed($transMode);
@@ -75,16 +74,15 @@ class Novalnet_Payment_Model_Factory
75
  * @param array $response
76
  * @return mixed
77
  */
78
- public function callTransactionStatus($getTid, $payment, $amountAfterRefund, $call, $refundTid
79
  = NULL, $customerId = NULL, $response = NULL)
80
- {
81
  $helper = Mage::helper('novalnet_payment');
82
- $paymentObj = $payment->getMethodInstance();
83
- $getTransactionStatus = $paymentObj->doNovalnetStatusCall($getTid, $payment, Novalnet_Payment_Model_Config::TRANS_STATUS, NULL, NULL);
84
- $amount = $helper->getFormatedAmount($getTransactionStatus->getAmount(), 'RAW');
85
- if ($call == 1) {
86
  $loadTransaction = $helper->loadTransactionStatus($getTid);
87
- $loadTransaction->setTransactionStatus($getTransactionStatus->getStatus())
88
  ->setAmount($amount)
89
  ->save();
90
  if (in_array($paymentObj->getCode(), array(Novalnet_Payment_Model_Config::NN_INVOICE,
@@ -92,13 +90,14 @@ class Novalnet_Payment_Model_Factory
92
  $loadTransaction->setAmount($amountAfterRefund)
93
  ->save();
94
  }
95
- } else {
96
  if ($refundTid) { // Only log the novalnet transaction which contains TID
97
- $response->setStatus($getTransactionStatus->getStatus());
98
- $paymentObj->logNovalnetStatusData($response, $refundTid, $customerId, NULL, $amount);
99
  }
100
- }
101
- return $getTransactionStatus;
 
102
  }
103
 
104
  /**
@@ -129,7 +128,7 @@ class Novalnet_Payment_Model_Factory
129
  ->save();
130
  }
131
  }
132
-
133
  /**
134
  * Set RequestParams Form
135
  *
@@ -144,14 +143,17 @@ class Novalnet_Payment_Model_Factory
144
  $helper = Mage::helper('novalnet_payment');
145
  $billing = $infoObject->getBillingAddress();
146
  $shipping = $infoObject->getShippingAddress();
147
- $company = $billing->getCompany() ? $billing->getCompany() : ($shipping->getCompany() ? $shipping->getCompany() : '');
 
148
  $email = $billing->getEmail() ? $billing->getEmail() : $infoObject->getCustomerEmail();
149
  $request = $company ? $request->setCompany($company) : $request;
 
 
 
150
  $request->setTestMode($livemode)
151
  ->setAmount($amount)
152
  ->setCurrency($infoObject->getBaseCurrencyCode())
153
  ->setCustomerNo($helper->getCustomerId())
154
- ->setUseUtf8(1)
155
  ->setFirstName($billing->getFirstname())
156
  ->setLastName($billing->getLastname())
157
  ->setSearchInStreet(1)
@@ -172,8 +174,9 @@ class Novalnet_Payment_Model_Factory
172
  ->setSystemIp($helper->getServerAddr())
173
  ->setSystemName('Magento')
174
  ->setSystemVersion($helper->getMagentoVersion() . '-' . $helper->getNovalnetVersion())
 
175
  ->setInput1('order_id')
176
- ->setInputval1($orderId);
177
  }
178
 
179
  /**
@@ -354,29 +357,6 @@ class Novalnet_Payment_Model_Factory
354
  }
355
  }
356
 
357
- /**
358
- * Verify the final amount for the transaction id
359
- *
360
- * @param string $currency
361
- * @param int $getTid
362
- * @param varien_object $payment
363
- * @param int $refundAmount
364
- * @return int
365
- */
366
- public function checkNovalnetCardAmount($currency, $getTid, $payment, $refundAmount)
367
- {
368
- $helper = Mage::helper('novalnet_payment');
369
- $paymentObj = $payment->getMethodInstance();
370
- $statusCallSub = $paymentObj->doNovalnetStatusCall($getTid,$payment);
371
- $respnseCode = $statusCallSub->getStatus();
372
- $cardAmount = $statusCallSub->getAmount();
373
-
374
- if($respnseCode == 100 && $refundAmount > $cardAmount) {
375
- Mage::throwException($helper->__('Refund amount greater than Novalnet card Amount, amount in card') . ' '. $currency . $helper->getFormatedAmount($cardAmount, 'RAW'));
376
- }
377
- return $cardAmount;
378
- }
379
-
380
  /**
381
  * Build the refund details for reference
382
  *
53
  }
54
 
55
  if ($transStatus != Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
 
56
  $transMode = (version_compare($magentoVersion, '1.6', '<')) ? false : true;
57
  $payment->setTransactionId($lastTranId)
58
  ->setIsTransactionClosed($transMode);
74
  * @param array $response
75
  * @return mixed
76
  */
77
+ public function getTransactionData($getTid, $payment, $amountAfterRefund, $call, $refundTid
78
  = NULL, $customerId = NULL, $response = NULL)
79
+ {
80
  $helper = Mage::helper('novalnet_payment');
81
+ $paymentObj = $payment->getMethodInstance();
82
+ $amount = $helper->getFormatedAmount($response->getAmount(), 'RAW');
83
+ if ($call == 1) {
 
84
  $loadTransaction = $helper->loadTransactionStatus($getTid);
85
+ $loadTransaction->setTransactionStatus($response->getTidStatus())
86
  ->setAmount($amount)
87
  ->save();
88
  if (in_array($paymentObj->getCode(), array(Novalnet_Payment_Model_Config::NN_INVOICE,
90
  $loadTransaction->setAmount($amountAfterRefund)
91
  ->save();
92
  }
93
+ } else {
94
  if ($refundTid) { // Only log the novalnet transaction which contains TID
95
+ $response->setStatus($response->getTidStatus());
96
+ $paymentObj->logNovalnetStatusData($response, $refundTid, $customerId, NULL, $response->getAmount());
97
  }
98
+ }
99
+ return $response;
100
+
101
  }
102
 
103
  /**
128
  ->save();
129
  }
130
  }
131
+
132
  /**
133
  * Set RequestParams Form
134
  *
143
  $helper = Mage::helper('novalnet_payment');
144
  $billing = $infoObject->getBillingAddress();
145
  $shipping = $infoObject->getShippingAddress();
146
+ if (!$infoObject->getIsVirtual())
147
+ $company = $billing->getCompany() ? $billing->getCompany() : ($shipping->getCompany() ? $shipping->getCompany() : '');
148
  $email = $billing->getEmail() ? $billing->getEmail() : $infoObject->getCustomerEmail();
149
  $request = $company ? $request->setCompany($company) : $request;
150
+ $vendorScriptUrlConfig = Mage::getStoreConfig('novalnet_global/novalnetsetting/vendor_script_url');
151
+ $vendorScriptUrl = $vendorScriptUrlConfig ? $vendorScriptUrlConfig :
152
+ Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB).'callback_novalnet2magento.php';
153
  $request->setTestMode($livemode)
154
  ->setAmount($amount)
155
  ->setCurrency($infoObject->getBaseCurrencyCode())
156
  ->setCustomerNo($helper->getCustomerId())
 
157
  ->setFirstName($billing->getFirstname())
158
  ->setLastName($billing->getLastname())
159
  ->setSearchInStreet(1)
174
  ->setSystemIp($helper->getServerAddr())
175
  ->setSystemName('Magento')
176
  ->setSystemVersion($helper->getMagentoVersion() . '-' . $helper->getNovalnetVersion())
177
+ ->setNotifyUrl($vendorScriptUrl)
178
  ->setInput1('order_id')
179
+ ->setInputval1($orderId);
180
  }
181
 
182
  /**
357
  }
358
  }
359
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
360
  /**
361
  * Build the refund details for reference
362
  *
app/code/community/Novalnet/Payment/Model/Ipn.php CHANGED
@@ -303,16 +303,15 @@ class Novalnet_Payment_Model_Ipn
303
 
304
  $order = $recurringProfile->createOrder($productItemInfo);
305
  $this->_order = $order;
306
- $payment = $order->getPayment();
307
  $order->save();
308
  $payment->setAdditionalData($this->getRequestData('additional_data'))
309
  ->save();
310
  $paymentObj = $payment->getMethodInstance();
311
 
312
  $paymentMethod = $paymentObj->getCode();
313
- $getTransactionStatus = $paymentObj->doNovalnetStatusCall($tid,$payment);
314
- $getStatus = $getTransactionStatus->getStatus();
315
- $subsId = $getTransactionStatus->getSubsId();
316
  $resultdata->setStatus($getStatus);
317
  if (!$referenceId
318
  && (in_array($paymentMethod, array(Novalnet_Payment_Model_Config::NN_PREPAYMENT, Novalnet_Payment_Model_Config::NN_INVOICE)) && $getStatus != 100)) {
@@ -327,7 +326,8 @@ class Novalnet_Payment_Model_Ipn
327
  $payment->setTransactionId($tid)
328
  ->setPreparedMessage($this->_createIpnComment(''))
329
  ->setAdditionalInformation('subs_id', $subsId)
330
- ->setIsTransactionClosed($closed);
 
331
  $paymentObj->logNovalnetStatusData($resultdata, trim($tid));
332
  $paymentObj->logNovalnetTransactionData($requestdata, $resultdata, trim($tid), $this->_helper->getCustomerId(), $this->_helper->getMagentoStoreId());
333
  $payment->registerCaptureNotification($originalPrice, 0);
303
 
304
  $order = $recurringProfile->createOrder($productItemInfo);
305
  $this->_order = $order;
306
+ $payment = $order->getPayment();
307
  $order->save();
308
  $payment->setAdditionalData($this->getRequestData('additional_data'))
309
  ->save();
310
  $paymentObj = $payment->getMethodInstance();
311
 
312
  $paymentMethod = $paymentObj->getCode();
313
+ $getStatus = $resultdata->getTidStatus();
314
+ $subsId = $resultdata->getSubsId();
 
315
  $resultdata->setStatus($getStatus);
316
  if (!$referenceId
317
  && (in_array($paymentMethod, array(Novalnet_Payment_Model_Config::NN_PREPAYMENT, Novalnet_Payment_Model_Config::NN_INVOICE)) && $getStatus != 100)) {
326
  $payment->setTransactionId($tid)
327
  ->setPreparedMessage($this->_createIpnComment(''))
328
  ->setAdditionalInformation('subs_id', $subsId)
329
+ ->setIsTransactionClosed($closed);
330
+ $resultdata->setAmount($order->getGrandTotal());
331
  $paymentObj->logNovalnetStatusData($resultdata, trim($tid));
332
  $paymentObj->logNovalnetTransactionData($requestdata, $resultdata, trim($tid), $this->_helper->getCustomerId(), $this->_helper->getMagentoStoreId());
333
  $payment->registerCaptureNotification($originalPrice, 0);
app/code/community/Novalnet/Payment/Model/Novalnet/Request.php CHANGED
@@ -28,6 +28,7 @@ class Novalnet_Payment_Model_Novalnet_Request extends Varien_Object
28
  public function toLatin1()
29
  {
30
  $data = $this->toArray();
 
31
  foreach ($data as $key => $val) {
32
  $setKey = "set" . ucfirst($key);
33
  $this->$setKey(utf8_decode($val));
28
  public function toLatin1()
29
  {
30
  $data = $this->toArray();
31
+ mage::log($data, null, 'test.log', true);
32
  foreach ($data as $key => $val) {
33
  $setKey = "set" . ucfirst($key);
34
  $this->$setKey(utf8_decode($val));
app/code/community/Novalnet/Payment/Model/Novalnet/Source/Callbacktypes.php CHANGED
@@ -30,7 +30,6 @@ class Novalnet_Payment_Model_Novalnet_Source_Callbacktypes
30
  return array(0 => Mage::helper('novalnet_payment')->__('None'),
31
  1 => Mage::helper('novalnet_payment')->__('PIN by callback'),
32
  2 => Mage::helper('novalnet_payment')->__('PIN by SMS'),
33
- 3 => Mage::helper('novalnet_payment')->__('Reply via E-mail')
34
  );
35
  }
36
  }
30
  return array(0 => Mage::helper('novalnet_payment')->__('None'),
31
  1 => Mage::helper('novalnet_payment')->__('PIN by callback'),
32
  2 => Mage::helper('novalnet_payment')->__('PIN by SMS'),
 
33
  );
34
  }
35
  }
app/code/community/Novalnet/Payment/Model/Novalnet/Source/Cctype.php CHANGED
@@ -30,24 +30,19 @@ class Novalnet_Payment_Model_Novalnet_Source_Cctype
30
  public function toOptionArray()
31
  {
32
  $cardTypes = array(
33
- 'VI' => 'Visa',
34
- 'MC' => 'MasterCard',
35
- 'AE' => 'American Express',
36
- 'TO' => 'Maestro',
37
- 'T' => 'CartaSi',
38
  );
39
-
40
- $allowed = array('AE', 'VI', 'MC', 'TO', 'T');
41
  $options = array();
42
  foreach ($cardTypes as $code => $name) {
43
- if (in_array($code, $allowed) || !count($allowed)) {
44
  $options[] = array(
45
  'value' => $code,
46
  'label' => $name
47
  );
48
- }
49
  }
50
-
51
  return $options;
52
  }
53
 
30
  public function toOptionArray()
31
  {
32
  $cardTypes = array(
33
+ 'visacard' => 'Visa',
34
+ 'mastercard' => 'MasterCard',
35
+ 'amex' => 'American Express',
36
+ 'maestro' => 'Maestro',
37
+ 'cartasi' => 'CartaSi',
38
  );
 
 
39
  $options = array();
40
  foreach ($cardTypes as $code => $name) {
 
41
  $options[] = array(
42
  'value' => $code,
43
  'label' => $name
44
  );
 
45
  }
 
46
  return $options;
47
  }
48
 
app/code/community/Novalnet/Payment/Model/Payment/Method/Abstract.php CHANGED
@@ -79,9 +79,10 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
79
  public function canUseCheckout() {
80
  $quote = Mage::getModel('checkout/cart')->getQuote();
81
  $redirectPayment = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('redirectPayments');
82
-
83
- if (!empty($quote) && $quote->hasNominalItems() && (in_array($this->_code, $redirectPayment)
84
- || $this->getNovalnetConfig('active_cc3d') || $this->helper->checkIsAdmin())) {
 
85
  return false;
86
  }
87
  return true;
@@ -284,9 +285,8 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
284
  return false;
285
  } elseif (!$helper->checkCustomerAccess($this->getNovalnetConfig('user_group_excluded'))) {
286
  return false;
287
- } elseif ($helper->checkIsAdmin() && $this->getNovalnetConfig('active_cc3d')) {
288
- return false;
289
- } elseif (!empty($quote) && !$quote->hasNominalItems() && !$helper->isModuleActive($quote->getGrandTotal())) {
290
  return false;
291
  } elseif (time() < $this->_getCheckout()->$getNnDisableTime()) {
292
  return false;
@@ -340,8 +340,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
340
  }
341
 
342
  $callbackPayment = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('fraudCheckPayment');
343
- if ((in_array($this->_code, $callbackPayment) || ($this->_code == 'novalnetCc'
344
- && !$this->getNovalnetConfig('active_cc3d')))) {
345
  $this->_initiateCallbackProcess($this->_code, $infoInstance);
346
  }
347
 
@@ -394,15 +393,9 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
394
  private function _sendRequestToNovalnet()
395
  {
396
  $redirectPayment = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('redirectPayments');
397
- if ($this->_code && !in_array($this->_code, $redirectPayment)) {
398
- $helper = $this->helper;
399
-
400
- if ($this->_code == Novalnet_Payment_Model_Config::NN_CC && !$helper->checkIsAdmin()
401
- && $this->getNovalnetConfig('active_cc3d') == 1) {
402
- return false;
403
- }
404
 
405
- $storeId = $helper->getMagentoStoreId();
 
406
  $request = $this->buildRequest(Novalnet_Payment_Model_Config::POST_NORMAL, $storeId);
407
  $this->_getCheckout()->setPaymentReqData($request);
408
  }
@@ -489,7 +482,6 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
489
  if ($type == Novalnet_Payment_Model_Config::POST_CALLBACK) {
490
  $paymentCode = ucfirst($this->_code);
491
  $callbackTelNo = "getNnCallbackTel" . $paymentCode;
492
- $callbackEmail = "getNnCallbackEmail" . $paymentCode;
493
 
494
  if ($this->getConfigData('callback') == 1) { //PIN By Callback
495
  $request->setTel($this->getInfoInstance()->$callbackTelNo());
@@ -497,9 +489,6 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
497
  } else if ($this->getConfigData('callback') == 2) { //PIN By SMS
498
  $request->setMobile($this->getInfoInstance()->$callbackTelNo());
499
  $request->setPinBySms(true);
500
- } else if ($this->getConfigData('callback') == 3) { //Reply By EMail
501
- $request->setEmail($this->getInfoInstance()->$callbackEmail());
502
- $request->setReplyEmailCheck(true);
503
  }
504
  }
505
 
@@ -550,8 +539,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
550
  $quote = $this->_getCheckout()->getQuote();
551
  $payportUrl = $helper->getPayportUrl('paygate');
552
 
553
- if ($this->_validateBasicParams() && $helper->checkIsNumeric($paymentKey)
554
- && $paymentKey == $request->getKey() && $request->getAmount() && $helper->checkIsNumeric($request->getAmount())) {
555
  $response = $this->setNovalnetRequestCall($request->getData(), $payportUrl);
556
  parse_str($response->getBody(), $data);
557
  $result->addData($data);
@@ -560,6 +548,18 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
560
  }
561
  return $result;
562
  }
 
 
 
 
 
 
 
 
 
 
 
 
563
 
564
  /**
565
  * Assign Novalnet authentication Data
@@ -658,18 +658,18 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
658
  $this->_refundValidation($payment, $refundAmount);
659
  }
660
 
661
- $cardAmount = NULL;
662
  $modelFactory = $helper->getModelFactory();
663
  if ($nominalItem) {
664
  $currency = Mage::app()->getLocale()->currency($this->_getInfoObject()->getBaseCurrencyCode())->getSymbol();
665
- $cardAmount = $modelFactory->checkNovalnetCardAmount($currency, $getTid, $payment, $refundAmount);
666
  }
667
-
668
- $response = $this->payportRequest($payment, 'refund', $refundAmount, $getTid,$cardAmount);
669
 
670
  if ($response->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
671
  $amountAfterRefund = ($order->getTotalPaid() - $order->getBaseTotalRefunded());
672
- $statusCode = $modelFactory->callTransactionStatus($getTid, $payment, $amountAfterRefund,1);
 
673
  $txnId = $response->getTid();
674
  $refundTid = !empty($txnId) ? $txnId : $payment->getLastTransId() . '-refund';
675
  $data['fullRefund'] = ((string)$this->_getAmount() == (string)$amount) ? true : false;
@@ -695,7 +695,8 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
695
 
696
  $modelFactory->refundValidateProcess($helper, $payment, $refundTid,$data);
697
  if ($txnId) {
698
- $modelFactory->callTransactionStatus($refundTid, $payment, $amountAfterRefund, 2, $refundTid, $order->getCustomerId(), $response);
 
699
  }
700
  } else {
701
  $this->showException($response->getStatusDesc(), false);
@@ -767,7 +768,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
767
  ->setLastTransId($voidTid)
768
  ->setAdditionalData(serialize($data))
769
  ->save();
770
- $helper->getModelFactory()->callTransactionStatus($getTid, $payment, NULL,1);
771
  } else {
772
  $this->showException('Error in you void request');
773
  }
@@ -944,9 +945,8 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
944
  public function saveCancelledOrder($result, $payment)
945
  {
946
  $order = $payment->getOrder();
947
-
948
  $statusMessage = $result->getStatusMessage() ? $result->getStatusMessage() : ($result->getStatusDesc() ? $result->getStatusDesc()
949
- : ($result->getStatusText() ? $result->getStatusText() : $this->helper->__('Payment was not successfull')));
950
  $paystatus = "<b><font color='red'>" . $this->helper->__('Payment Failed') . "</font> - " . $statusMessage . "</b>";
951
  $data = unserialize($payment->getAdditionalData());
952
  // Set Novalnet Mode
@@ -956,7 +956,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
956
  : $this->helper->getDecodedParam($result->getTestMode(), $authorizeKey);
957
  $shopMode = $this->getNovalnetConfig('live_mode', true);
958
  $testMode = (((isset($serverResponse) && $serverResponse == 1) || (isset($shopMode)
959
- && $shopMode == 0)) ? 1 : 0 );
960
  $data['NnTestOrder'] = $testMode;
961
  $data['NnComments'] = $paystatus;
962
  $payment->setLastTransId($result->getTid())
@@ -966,46 +966,6 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
966
  ->save();
967
  }
968
 
969
- /**
970
- * Send order_no to server after the Completion of payment
971
- *
972
- * @param array $response
973
- * @return array
974
- */
975
- public function doNovalnetPostbackCall($response)
976
- {
977
- //Required Parameters to be passed to the Server
978
- $request = $result = array();
979
- $helper = $this->helper;
980
- $paymentKey = $helper->getPaymentId($this->_code);
981
-
982
- if ($this->_validateBasicParams() && $helper->checkIsNumeric($paymentKey)) {
983
- $request['vendor'] = $this->_vendorId;
984
- $request['auth_code'] = $this->_authcode;
985
- $request['product'] = $this->_productId;
986
- $request['tariff'] = $this->_tariffId;
987
- $request['key'] = $paymentKey;
988
- $request['tid'] = $response->getTid();
989
- $request['status'] = Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED;
990
- $request['order_no'] = $this->_getOrderId();
991
- $payportUrl = $helper->getPayportUrl('paygate');
992
-
993
- if ($request['key'] == 27) {
994
- $request['invoice_ref'] = 'BNR-' . $request['product'] . '-' . $request['order_no'];
995
- }
996
-
997
- $result = new Varien_Object();
998
- $response = $this->setNovalnetRequestCall($request, $payportUrl);
999
- $result = $response->getRawBody();
1000
-
1001
- $nnAffId = $helper->getCoresession()->getNnAffId();
1002
- if ($nnAffId) {
1003
- $this->doNovalnetAffUserInfoLog($nnAffId);
1004
- }
1005
- }
1006
- return $result;
1007
- }
1008
-
1009
  /**
1010
  * Log Affiliate user details
1011
  *
@@ -1105,9 +1065,9 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1105
  case Novalnet_Payment_Model_Config::NN_PAYPAL:
1106
  case Novalnet_Payment_Model_Config::NN_IDEAL:
1107
  case Novalnet_Payment_Model_Config::NN_EPS:
 
1108
  $authorizeKey = $this->loadAffAccDetail();
1109
  $request->setUniqid(uniqid())
1110
- ->setCountryCode($request->getCountry())
1111
  ->setSession(session_id())
1112
  ->setImplementation('PHP');
1113
  $this->dataHelper->assignNovalnetReturnData($request, $this->_code);
@@ -1115,19 +1075,25 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1115
  break;
1116
  case Novalnet_Payment_Model_Config::NN_CC:
1117
  $checkoutSession = $this->_getCheckout();
1118
- $request->setCcCvc2($checkoutSession->getNnCcCvc())
1119
- ->setPanHash($checkoutSession->getCcPanHash())
1120
- ->setUniqueId($checkoutSession->getCcUniqueId());
1121
- if ($this->_code == Novalnet_Payment_Model_Config::NN_CC && !$helper->checkIsAdmin()
1122
- && $this->getNovalnetConfig('active_cc3d') == 1) {
1123
- $amount = $helper->getFormatedAmount($this->_getAmount());
1124
- $authorizeKey = $this->loadAffAccDetail();
1125
- $request->setCountryCode($request->getCountry())
1126
- ->setSession(session_id())
1127
- ->setencodedAmount($helper->getEncodedParam($amount, $authorizeKey));
1128
- $dataHelper->assignNovalnetReturnData($request, $this->_code);
1129
- $request->unsUserVariable_0(); // Unset uservariable as CC3D doesnot requires it
 
 
 
 
1130
  }
 
 
1131
  break;
1132
  case Novalnet_Payment_Model_Config::NN_SEPA:
1133
  $paymentInfo = $dataHelper->novalnetCardDetails('payment');
@@ -1173,10 +1139,8 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1173
  ->save();
1174
  $order->setPayment($payment);
1175
  $order->save();
1176
-
1177
  /* Update the transaction status and transaction overview */
1178
- $getTransactionStatus = $this->doNovalnetStatusCall($txnId,$payment);
1179
- $result->setStatus($getTransactionStatus->getStatus());
1180
  $this->logNovalnetStatusData($result, $txnId);
1181
 
1182
  $helper = $this->helper;
@@ -1184,7 +1148,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1184
  ? false : true;
1185
 
1186
  // Capture the payment only if status is 100
1187
- if ($order->canInvoice() && $getTransactionStatus->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED
1188
  && $this->_code != Novalnet_Payment_Model_Config::NN_PREPAYMENT) {
1189
  $payment->setTransactionId($txnId) // Add capture text to make the new transaction
1190
  ->setIsTransactionClosed($captureMode) // Close the transaction
@@ -1201,8 +1165,10 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1201
  ->save();
1202
  $order->setPayment($payment);
1203
  $order->save();
1204
-
1205
- $this->doNovalnetPostbackCall($result); //Second Call
 
 
1206
  if (!$this->isCallbackTypeCall()) {
1207
  $this->logNovalnetTransactionData($request, $result, $txnId, $this->helper->getCustomerId(), $this->helper->getMagentoStoreId());
1208
  }
@@ -1299,10 +1265,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1299
  */
1300
  public function unsetFormMethodSession()
1301
  {
1302
- $this->_getCheckout()->unsNnCcCvc()
1303
- ->unsCcPanHash()
1304
- ->unsCcUniqueId()
1305
- ->unsSepaHash()
1306
  ->unsSepaUniqueId()
1307
  ->unsRefilldatavalues()
1308
  ->unsNnPaymentCode()
@@ -1338,7 +1301,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1338
  */
1339
  public function doNovalnetStatusCall($tid, $payment = NULL, $reqType = Novalnet_Payment_Model_Config::TRANS_STATUS, $extraOption
1340
  = NULL, $requestData = NULL, $params = NULL)
1341
- {
1342
  $requestType = ($reqType == Novalnet_Payment_Model_Config::TRANS_STATUS)
1343
  ? Novalnet_Payment_Model_Config::TRANS_STATUS : $reqType;
1344
 
@@ -1352,7 +1315,6 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1352
  $this->_authcode = $callbackReqData->getAuthCode();
1353
  $this->_productId = $callbackReqData->getProduct();
1354
  }
1355
-
1356
  $request = '<?xml version="1.0" encoding="UTF-8"?>';
1357
  $request .= '<nnxml><info_request>';
1358
  $request .= '<vendor_id>' . $this->_vendorId . '</vendor_id>';
@@ -1365,9 +1327,6 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1365
  if ($this->_vendorId && $this->_authcode && $this->_productId) {
1366
  $infoRequestUrl = $this->helper->getPayportUrl('infoport');
1367
  $result = $this->setNovalnetRequestCall($request, $infoRequestUrl, 'XML');
1368
- if ($requestType == 'NOVALTEL_STATUS') {
1369
- $requestData->setData($request);
1370
- }
1371
  return $result;
1372
  }
1373
  }
@@ -1425,7 +1384,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1425
  : $infoObjBilling->getLastname();
1426
  $helper = $this->helper;
1427
  if (!$this->_validateBasicParams()) {
1428
- $this->showException($helper->__('Basic parameter not valid') . '!', false);
1429
  return false;
1430
  } elseif (!$helper->validateEmail($cusEmail) || !$cusFirstname || !$cusLastname) {
1431
  $this->showException($helper->__('Customer name/email fields are not valid') . '!', false);
@@ -1535,7 +1494,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1535
  }
1536
 
1537
  if ($isCallbackTypeCall && !$isPlaceOrder) {
1538
- if ($methodSession->$callbackTid() && $this->getNovalnetConfig('callback') != 3) {
1539
  $infoInstance->$callbackNewPin() ? $this->_regenerateCallbackPin($methodSession)
1540
  : $methodSession->$setcallbackPin($infoInstance->$callbackPin());
1541
  } elseif (!$methodSession->$callbackTid()) {
@@ -1633,9 +1592,7 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1633
  ->setOrderAmount($request->getAmount())
1634
  ->setNnCallbackSuccessState(true)
1635
  ->$callbackOrderNo(trim($response->getOrderNo()));
1636
- if ($this->getNovalnetConfig('callback') == 3) {
1637
- $text = $this->helper->__('Please reply to the e-mail');
1638
- } elseif($this->getNovalnetConfig('callback') == 2) {
1639
  $text = $this->helper->__('You will shortly receive an SMS containing your transaction PIN to complete the payment');
1640
  } else {
1641
  $text = $this->helper->__('You will shortly receive a transaction PIN through phone call to complete the payment');
@@ -1681,13 +1638,8 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1681
  $methodSession = $this->_getMethodSession();
1682
 
1683
  if ($methodSession->getNnCallbackSuccessState()) {
1684
- if ($this->getNovalnetConfig('callback') == 3) {
1685
- $type = Novalnet_Payment_Model_Config::REPLY_EMAIL_STATUS;
1686
- $extraOption = '';
1687
- } else {
1688
- $type = Novalnet_Payment_Model_Config::PIN_STATUS;
1689
- $extraOption = '<pin>' . $methodSession->$callbackPin() . '</pin>';
1690
- }
1691
  $result = $this->doNovalnetStatusCall($methodSession->$callbackTid(), NULL, $type, $extraOption);
1692
  $result->setTid($methodSession->$callbackTid());
1693
  $result->setTestMode($methodSession->getNnTestMode());
@@ -1965,19 +1917,19 @@ class Novalnet_Payment_Model_Payment_Method_Abstract extends Mage_Payment_Model_
1965
  /**
1966
  * Get redirect URL
1967
  *
1968
- * @param null
1969
  * @return string
1970
  */
1971
  public function getOrderPlaceRedirectUrl()
1972
  {
1973
  $redirectPayment = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('redirectPayments');
1974
- $helper = $this->helper;
1975
- if ((in_array($this->_code, $redirectPayment)) || ($this->_code == Novalnet_Payment_Model_Config::NN_CC
1976
- && !$helper->checkIsAdmin() && $this->getNovalnetConfig('active_cc3d')
1977
- == 1)) {
1978
- $actionUrl = $helper->getUrl(Novalnet_Payment_Model_Config::GATEWAY_REDIRECT_URL);
1979
  } else {
1980
- $actionUrl = $helper->getUrl(Novalnet_Payment_Model_Config::GATEWAY_DIRECT_URL);
1981
  }
1982
  return $actionUrl;
1983
  }
79
  public function canUseCheckout() {
80
  $quote = Mage::getModel('checkout/cart')->getQuote();
81
  $redirectPayment = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('redirectPayments');
82
+ array_push($redirectPayment, Novalnet_Payment_Model_Config::NN_CC);
83
+ if (!empty($quote) && $quote->hasNominalItems()
84
+ && (in_array($this->_code, $redirectPayment)
85
+ || $this->helper->checkIsAdmin())) {
86
  return false;
87
  }
88
  return true;
285
  return false;
286
  } elseif (!$helper->checkCustomerAccess($this->getNovalnetConfig('user_group_excluded'))) {
287
  return false;
288
+ } elseif (!empty($quote) && !$quote->hasNominalItems()
289
+ && !$helper->isModuleActive($quote->getGrandTotal())) {
 
290
  return false;
291
  } elseif (time() < $this->_getCheckout()->$getNnDisableTime()) {
292
  return false;
340
  }
341
 
342
  $callbackPayment = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('fraudCheckPayment');
343
+ if (in_array($this->_code, $callbackPayment)) {
 
344
  $this->_initiateCallbackProcess($this->_code, $infoInstance);
345
  }
346
 
393
  private function _sendRequestToNovalnet()
394
  {
395
  $redirectPayment = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('redirectPayments');
 
 
 
 
 
 
 
396
 
397
+ if ($this->_code && !in_array($this->_code, $redirectPayment)) {
398
+ $storeId = $this->helper->getMagentoStoreId();
399
  $request = $this->buildRequest(Novalnet_Payment_Model_Config::POST_NORMAL, $storeId);
400
  $this->_getCheckout()->setPaymentReqData($request);
401
  }
482
  if ($type == Novalnet_Payment_Model_Config::POST_CALLBACK) {
483
  $paymentCode = ucfirst($this->_code);
484
  $callbackTelNo = "getNnCallbackTel" . $paymentCode;
 
485
 
486
  if ($this->getConfigData('callback') == 1) { //PIN By Callback
487
  $request->setTel($this->getInfoInstance()->$callbackTelNo());
489
  } else if ($this->getConfigData('callback') == 2) { //PIN By SMS
490
  $request->setMobile($this->getInfoInstance()->$callbackTelNo());
491
  $request->setPinBySms(true);
 
 
 
492
  }
493
  }
494
 
539
  $quote = $this->_getCheckout()->getQuote();
540
  $payportUrl = $helper->getPayportUrl('paygate');
541
 
542
+ if ($this->_validateBasicParams()) {
 
543
  $response = $this->setNovalnetRequestCall($request->getData(), $payportUrl);
544
  parse_str($response->getBody(), $data);
545
  $result->addData($data);
548
  }
549
  return $result;
550
  }
551
+
552
+ /**
553
+ * load order transaction details
554
+ *
555
+ * @param tid
556
+ * @return integer
557
+ */
558
+ public function updatedAmount($tid)
559
+ {
560
+ $updated_amount = $this->helper->loadTransactionStatus($tid);
561
+ return $updated_amount;
562
+ }
563
 
564
  /**
565
  * Assign Novalnet authentication Data
658
  $this->_refundValidation($payment, $refundAmount);
659
  }
660
 
661
+ $orderAmount = NULL;
662
  $modelFactory = $helper->getModelFactory();
663
  if ($nominalItem) {
664
  $currency = Mage::app()->getLocale()->currency($this->_getInfoObject()->getBaseCurrencyCode())->getSymbol();
665
+ $orderAmount = $helper->getFormatedAmount($this->_getAmount());
666
  }
667
+ $response = $this->payportRequest($payment, 'refund', $refundAmount, $getTid, $orderAmount);
 
668
 
669
  if ($response->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
670
  $amountAfterRefund = ($order->getTotalPaid() - $order->getBaseTotalRefunded());
671
+ $response->setAmount($helper->getFormatedAmount($this->_getAmount()));
672
+ $statusCode = $modelFactory->getTransactionData($getTid, $payment, $amountAfterRefund, 1, NULL, NULL, $response);
673
  $txnId = $response->getTid();
674
  $refundTid = !empty($txnId) ? $txnId : $payment->getLastTransId() . '-refund';
675
  $data['fullRefund'] = ((string)$this->_getAmount() == (string)$amount) ? true : false;
695
 
696
  $modelFactory->refundValidateProcess($helper, $payment, $refundTid,$data);
697
  if ($txnId) {
698
+ $response->setAmount($amount);
699
+ $modelFactory->getTransactionData($refundTid, $payment, $amountAfterRefund, 2, $refundTid, $order->getCustomerId(), $response);
700
  }
701
  } else {
702
  $this->showException($response->getStatusDesc(), false);
768
  ->setLastTransId($voidTid)
769
  ->setAdditionalData(serialize($data))
770
  ->save();
771
+ $helper->getModelFactory()->getTransactionData($getTid, $payment, NULL, 1, NULL, NULL, $response);
772
  } else {
773
  $this->showException('Error in you void request');
774
  }
945
  public function saveCancelledOrder($result, $payment)
946
  {
947
  $order = $payment->getOrder();
 
948
  $statusMessage = $result->getStatusMessage() ? $result->getStatusMessage() : ($result->getStatusDesc() ? $result->getStatusDesc()
949
+ : ($result->getStatusText() ? $result->getStatusText() : $this->helper->__('Payment was not successfull')));
950
  $paystatus = "<b><font color='red'>" . $this->helper->__('Payment Failed') . "</font> - " . $statusMessage . "</b>";
951
  $data = unserialize($payment->getAdditionalData());
952
  // Set Novalnet Mode
956
  : $this->helper->getDecodedParam($result->getTestMode(), $authorizeKey);
957
  $shopMode = $this->getNovalnetConfig('live_mode', true);
958
  $testMode = (((isset($serverResponse) && $serverResponse == 1) || (isset($shopMode)
959
+ && $shopMode == 0)) ? 1 : 0 );
960
  $data['NnTestOrder'] = $testMode;
961
  $data['NnComments'] = $paystatus;
962
  $payment->setLastTransId($result->getTid())
966
  ->save();
967
  }
968
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
969
  /**
970
  * Log Affiliate user details
971
  *
1065
  case Novalnet_Payment_Model_Config::NN_PAYPAL:
1066
  case Novalnet_Payment_Model_Config::NN_IDEAL:
1067
  case Novalnet_Payment_Model_Config::NN_EPS:
1068
+ case Novalnet_Payment_Model_Config::NN_GIROPAY:
1069
  $authorizeKey = $this->loadAffAccDetail();
1070
  $request->setUniqid(uniqid())
 
1071
  ->setSession(session_id())
1072
  ->setImplementation('PHP');
1073
  $this->dataHelper->assignNovalnetReturnData($request, $this->_code);
1075
  break;
1076
  case Novalnet_Payment_Model_Config::NN_CC:
1077
  $checkoutSession = $this->_getCheckout();
1078
+ $amount = $helper->getFormatedAmount($this->_getAmount());
1079
+ $authorizeKey = $this->loadAffAccDetail();
1080
+ $request->setUniqid(uniqid())
1081
+ ->setSession(session_id())
1082
+ ->setImplementation('PHP_PCI')
1083
+ ->setVendorId($request->getVendor())
1084
+ ->setVendorAuthcode($request->getAuthCode())
1085
+ ->setTariffId($request->getTariff())
1086
+ ->setProductId($request->getProduct());
1087
+ $request->unsVendor()
1088
+ ->unsAuthCode()
1089
+ ->unsProduct()
1090
+ ->unsTariff();
1091
+ // Add Credit Card 3D Secure payment process params
1092
+ if ($this->getNovalnetConfig('active_cc3d')) {
1093
+ $request->setCc_3d(1);
1094
  }
1095
+ $dataHelper->assignNovalnetReturnData($request, $this->_code);
1096
+ $this->dataHelper->importNovalnetEncodeData($request, $authorizeKey, 'PHP_PCI');
1097
  break;
1098
  case Novalnet_Payment_Model_Config::NN_SEPA:
1099
  $paymentInfo = $dataHelper->novalnetCardDetails('payment');
1139
  ->save();
1140
  $order->setPayment($payment);
1141
  $order->save();
 
1142
  /* Update the transaction status and transaction overview */
1143
+ $result->setStatus($result->getTidStatus());
 
1144
  $this->logNovalnetStatusData($result, $txnId);
1145
 
1146
  $helper = $this->helper;
1148
  ? false : true;
1149
 
1150
  // Capture the payment only if status is 100
1151
+ if ($order->canInvoice() && $result->getTidStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED
1152
  && $this->_code != Novalnet_Payment_Model_Config::NN_PREPAYMENT) {
1153
  $payment->setTransactionId($txnId) // Add capture text to make the new transaction
1154
  ->setIsTransactionClosed($captureMode) // Close the transaction
1165
  ->save();
1166
  $order->setPayment($payment);
1167
  $order->save();
1168
+ $nnAffId = $helper->getCoresession()->getNnAffId();
1169
+ if ($nnAffId) {
1170
+ $this->doNovalnetAffUserInfoLog($nnAffId);
1171
+ }
1172
  if (!$this->isCallbackTypeCall()) {
1173
  $this->logNovalnetTransactionData($request, $result, $txnId, $this->helper->getCustomerId(), $this->helper->getMagentoStoreId());
1174
  }
1265
  */
1266
  public function unsetFormMethodSession()
1267
  {
1268
+ $this->_getCheckout()->unsSepaHash()
 
 
 
1269
  ->unsSepaUniqueId()
1270
  ->unsRefilldatavalues()
1271
  ->unsNnPaymentCode()
1301
  */
1302
  public function doNovalnetStatusCall($tid, $payment = NULL, $reqType = Novalnet_Payment_Model_Config::TRANS_STATUS, $extraOption
1303
  = NULL, $requestData = NULL, $params = NULL)
1304
+ {
1305
  $requestType = ($reqType == Novalnet_Payment_Model_Config::TRANS_STATUS)
1306
  ? Novalnet_Payment_Model_Config::TRANS_STATUS : $reqType;
1307
 
1315
  $this->_authcode = $callbackReqData->getAuthCode();
1316
  $this->_productId = $callbackReqData->getProduct();
1317
  }
 
1318
  $request = '<?xml version="1.0" encoding="UTF-8"?>';
1319
  $request .= '<nnxml><info_request>';
1320
  $request .= '<vendor_id>' . $this->_vendorId . '</vendor_id>';
1327
  if ($this->_vendorId && $this->_authcode && $this->_productId) {
1328
  $infoRequestUrl = $this->helper->getPayportUrl('infoport');
1329
  $result = $this->setNovalnetRequestCall($request, $infoRequestUrl, 'XML');
 
 
 
1330
  return $result;
1331
  }
1332
  }
1384
  : $infoObjBilling->getLastname();
1385
  $helper = $this->helper;
1386
  if (!$this->_validateBasicParams()) {
1387
+ $this->showException($helper->__('Please fill in all the mandatory fields') . '!', false);
1388
  return false;
1389
  } elseif (!$helper->validateEmail($cusEmail) || !$cusFirstname || !$cusLastname) {
1390
  $this->showException($helper->__('Customer name/email fields are not valid') . '!', false);
1494
  }
1495
 
1496
  if ($isCallbackTypeCall && !$isPlaceOrder) {
1497
+ if ($methodSession->$callbackTid()) {
1498
  $infoInstance->$callbackNewPin() ? $this->_regenerateCallbackPin($methodSession)
1499
  : $methodSession->$setcallbackPin($infoInstance->$callbackPin());
1500
  } elseif (!$methodSession->$callbackTid()) {
1592
  ->setOrderAmount($request->getAmount())
1593
  ->setNnCallbackSuccessState(true)
1594
  ->$callbackOrderNo(trim($response->getOrderNo()));
1595
+ if($this->getNovalnetConfig('callback') == 2) {
 
 
1596
  $text = $this->helper->__('You will shortly receive an SMS containing your transaction PIN to complete the payment');
1597
  } else {
1598
  $text = $this->helper->__('You will shortly receive a transaction PIN through phone call to complete the payment');
1638
  $methodSession = $this->_getMethodSession();
1639
 
1640
  if ($methodSession->getNnCallbackSuccessState()) {
1641
+ $type = Novalnet_Payment_Model_Config::PIN_STATUS;
1642
+ $extraOption = '<pin>' . $methodSession->$callbackPin() . '</pin>';
 
 
 
 
 
1643
  $result = $this->doNovalnetStatusCall($methodSession->$callbackTid(), NULL, $type, $extraOption);
1644
  $result->setTid($methodSession->$callbackTid());
1645
  $result->setTestMode($methodSession->getNnTestMode());
1917
  /**
1918
  * Get redirect URL
1919
  *
1920
+ * @param none
1921
  * @return string
1922
  */
1923
  public function getOrderPlaceRedirectUrl()
1924
  {
1925
  $redirectPayment = Novalnet_Payment_Model_Config::getInstance()->getNovalnetVariable('redirectPayments');
1926
+
1927
+ if ($this->_code == Novalnet_Payment_Model_Config::NN_CC) {
1928
+ $actionUrl = $this->helper->getUrl(Novalnet_Payment_Model_Config::CC_IFRAME_URL);
1929
+ } elseif(in_array($this->_code, $redirectPayment)) {
1930
+ $actionUrl = $this->helper->getUrl(Novalnet_Payment_Model_Config::GATEWAY_REDIRECT_URL);
1931
  } else {
1932
+ $actionUrl = $this->helper->getUrl(Novalnet_Payment_Model_Config::GATEWAY_DIRECT_URL);
1933
  }
1934
  return $actionUrl;
1935
  }
app/code/community/Novalnet/Payment/Model/Payment/Method/NovalnetGiropay.php ADDED
@@ -0,0 +1,34 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the payment module of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ class Novalnet_Payment_Model_Payment_Method_NovalnetGiropay extends Novalnet_Payment_Model_Payment_Method_Abstract
27
+ {
28
+ protected $_code = Novalnet_Payment_Model_Config::NN_GIROPAY;
29
+ protected $_canCapture = Novalnet_Payment_Model_Config::NN_GIROPAY_CAN_CAPTURE;
30
+ protected $_canUseInternal = Novalnet_Payment_Model_Config::NN_GIROPAY_CAN_USE_INTERNAL;
31
+ protected $_canUseForMultishipping = Novalnet_Payment_Model_Config::NN_GIROPAY_CAN_USE_MULTISHIPPING;
32
+ protected $_formBlockType = Novalnet_Payment_Model_Config::NN_GIROPAY_FORM_BLOCK;
33
+ protected $_infoBlockType = Novalnet_Payment_Model_Config::NN_GIROPAY_INFO_BLOCK;
34
+ }
app/code/community/Novalnet/Payment/Model/Recurring.php CHANGED
@@ -106,6 +106,7 @@ class Novalnet_Payment_Model_Recurring extends Mage_Core_Model_Abstract
106
  $testMode = (((isset($serverResponse) && $serverResponse == 1) || (isset($shopMode)
107
  && $shopMode == 0)) ? 1 : 0 );
108
  $data = $paymentObj->setPaymentAddtionaldata($result, $config);
 
109
  $request->setVendor($config->getVendor())
110
  ->setAuthCode($config->getAuthCode())
111
  ->setProduct($config->getProduct())
106
  $testMode = (((isset($serverResponse) && $serverResponse == 1) || (isset($shopMode)
107
  && $shopMode == 0)) ? 1 : 0 );
108
  $data = $paymentObj->setPaymentAddtionaldata($result, $config);
109
+ $data['paidUntil'] = $result->getPaidUntil();
110
  $request->setVendor($config->getVendor())
111
  ->setAuthCode($config->getAuthCode())
112
  ->setProduct($config->getProduct())
app/code/community/Novalnet/Payment/Model/Separefill.php CHANGED
@@ -50,7 +50,12 @@ class Novalnet_Payment_Model_Separefill extends Mage_Core_Model_Abstract
50
  $modNovalSeparefill->addFieldToFilter('customer_id', $customerId);
51
  $modNovalSeparefill->addFieldToSelect('pan_hash');
52
  $modNovalSeparefillcount = count($modNovalSeparefill);
53
- if ($modNovalSeparefillcount > 0) {
 
 
 
 
 
54
  foreach ($modNovalSeparefill as $modNovalSeparefillvalue) {
55
  $panhash = $modNovalSeparefillvalue->getPanHash();
56
  }
50
  $modNovalSeparefill->addFieldToFilter('customer_id', $customerId);
51
  $modNovalSeparefill->addFieldToSelect('pan_hash');
52
  $modNovalSeparefillcount = count($modNovalSeparefill);
53
+ $orderCollection = Mage::getResourceModel('sales/order_collection')
54
+ ->addAttributeToSelect('*')
55
+ ->addFieldToFilter('customer_id', $customerId);
56
+ $order = $orderCollection->getLastItem();
57
+ $paymentMethod = $order->getPayment()->getMethod();
58
+ if ($modNovalSeparefillcount > 0 && $paymentMethod == Novalnet_Payment_Model_Config::NN_SEPA) {
59
  foreach ($modNovalSeparefill as $modNovalSeparefillvalue) {
60
  $panhash = $modNovalSeparefillvalue->getPanHash();
61
  }
app/code/community/Novalnet/Payment/Model/System/Config/Activemethods.php CHANGED
@@ -34,7 +34,6 @@ class Novalnet_Payment_Model_System_Config_Activemethods
34
  {
35
  $methods = array();
36
  $activePayment = false;
37
- $inactivePayment = false;
38
 
39
  if (strlen($code = Mage::app()->getRequest()->getParam('store'))) { // store level
40
  $scopeId = Mage::getModel('core/store')->load($code)->getId();
@@ -57,12 +56,10 @@ class Novalnet_Payment_Model_System_Config_Activemethods
57
  'value' => $paymentCode,
58
  );
59
  $activePayment = true;
60
- } else {
61
- $inactivePayment = true;
62
- }
63
  }
64
 
65
- if (!$activePayment && $inactivePayment) {
66
  $methods[$paymentCode] = array(
67
  'label' => Mage::helper('novalnet_payment')->__('No active payment method for this store'),
68
  'value' => false,
34
  {
35
  $methods = array();
36
  $activePayment = false;
 
37
 
38
  if (strlen($code = Mage::app()->getRequest()->getParam('store'))) { // store level
39
  $scopeId = Mage::getModel('core/store')->load($code)->getId();
56
  'value' => $paymentCode,
57
  );
58
  $activePayment = true;
59
+ }
 
 
60
  }
61
 
62
+ if (!$activePayment) {
63
  $methods[$paymentCode] = array(
64
  'label' => Mage::helper('novalnet_payment')->__('No active payment method for this store'),
65
  'value' => false,
app/code/community/Novalnet/Payment/Model/System/Config/Backend/Notifyurl.php ADDED
@@ -0,0 +1,45 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
+ *
15
+ * DISCLAIMER
16
+ *
17
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
18
+ * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
+ *
21
+ * @category Mage
22
+ * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2016 X.commerce, Inc. and affiliates (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+
27
+
28
+ class Novalnet_Payment_Model_System_Config_Backend_Notifyurl extends Mage_Core_Model_Config_Data
29
+ {
30
+
31
+ /**
32
+ * Processing object after load data
33
+ *
34
+ * @return Mage_Core_Model_Abstract
35
+ */
36
+ protected function _afterLoad()
37
+ {
38
+ $value = $this->getValue();
39
+ $baseUrl = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB);
40
+ $notifyurl = $baseUrl.'callback_novalnet2magento.php';
41
+ $value = !empty($value) ? $value : $notifyurl;
42
+ $this->setValue($value);
43
+ return parent::_afterLoad();
44
+ }
45
+ }
app/code/community/Novalnet/Payment/controllers/Adminhtml/Novalnetpayment/Sales/OrderController.php CHANGED
@@ -246,18 +246,16 @@ class Novalnet_Payment_Adminhtml_Novalnetpayment_Sales_OrderController extends M
246
 
247
  $amountChanged = $rawAmount;
248
  $loadTransStatus = $helper->loadTransactionStatus($lastTranId);
249
- $transStatus = $loadTransStatus->getTransactionStatus();
250
- // set transaction amount
251
- $loadTransStatus->setAmount($amountChanged)
252
- ->save();
253
-
254
  if (!in_array(NULL, $request->toArray()) && !empty($transStatus)) {
255
  $buildNovalnetParam = http_build_query($request->getData());
256
  $payportUrl = $helper->getPayportUrl('paygate');
257
  $dataHelper = Mage::helper('novalnet_payment/AssignData');
258
  $response = $dataHelper->setRawCallRequest($buildNovalnetParam, $payportUrl, $paymentObj);
259
-
260
  if ($response->getStatus() == $responseCodeApproved) {
 
 
 
261
  // make capture transaction open for lower versions to make refund
262
  if (version_compare($helper->getMagentoVersion(), '1.6', '<')) {
263
  $payment->setIsTransactionClosed(false)
@@ -270,7 +268,7 @@ class Novalnet_Payment_Adminhtml_Novalnetpayment_Sales_OrderController extends M
270
  if ($invoiceDuedate) {
271
  $note = explode('|',$data['NnNote']);
272
  $formatDate = Mage::helper('core')->formatDate($invoiceDuedate);
273
- $note[0] = "Due Date: <b>$formatDate</b>";
274
  $data['NnNote'] = implode('|',$note);
275
  }
276
  $data['NnNoteAmount'] = $dataHelper->getBankDetailsAmount($amountChanged);
@@ -278,7 +276,7 @@ class Novalnet_Payment_Adminhtml_Novalnetpayment_Sales_OrderController extends M
278
  ->save();
279
  $modNovalamountchanged->setInvoiceDuedate($invoiceDuedate);
280
  }
281
- $countAmount = $helper->getAmountCollection($orderId, NULL, NULL);
282
  $modNovalamountchanged = $countAmount ? $helper->getModelAmountchanged()->load($orderId, 'order_id')
283
  : $helper->getModelAmountchanged();
284
  $modNovalamountchanged->setOrderId($orderId)
@@ -309,7 +307,7 @@ class Novalnet_Payment_Adminhtml_Novalnetpayment_Sales_OrderController extends M
309
  }
310
  } else {
311
  Mage::throwException($response->getStatusDesc());
312
- }
313
  $customerId = $order->getCustomerId();
314
  $paymentObj->logNovalnetTransactionData($request, $response, $lastTranId, $customerId, $storeId);
315
  $this->_getSession()->addSuccess(
246
 
247
  $amountChanged = $rawAmount;
248
  $loadTransStatus = $helper->loadTransactionStatus($lastTranId);
249
+ $transStatus = $loadTransStatus->getTransactionStatus();
 
 
 
 
250
  if (!in_array(NULL, $request->toArray()) && !empty($transStatus)) {
251
  $buildNovalnetParam = http_build_query($request->getData());
252
  $payportUrl = $helper->getPayportUrl('paygate');
253
  $dataHelper = Mage::helper('novalnet_payment/AssignData');
254
  $response = $dataHelper->setRawCallRequest($buildNovalnetParam, $payportUrl, $paymentObj);
 
255
  if ($response->getStatus() == $responseCodeApproved) {
256
+ // set transaction amount
257
+ $loadTransStatus->setAmount($amountChanged)
258
+ ->save();
259
  // make capture transaction open for lower versions to make refund
260
  if (version_compare($helper->getMagentoVersion(), '1.6', '<')) {
261
  $payment->setIsTransactionClosed(false)
268
  if ($invoiceDuedate) {
269
  $note = explode('|',$data['NnNote']);
270
  $formatDate = Mage::helper('core')->formatDate($invoiceDuedate);
271
+ $note[0] = 'Due Date: <b><span id="due_date">'.$formatDate.'</span></b>';
272
  $data['NnNote'] = implode('|',$note);
273
  }
274
  $data['NnNoteAmount'] = $dataHelper->getBankDetailsAmount($amountChanged);
276
  ->save();
277
  $modNovalamountchanged->setInvoiceDuedate($invoiceDuedate);
278
  }
279
+ $countAmount = $helper->getAmountCollection($orderId, NULL, NULL);
280
  $modNovalamountchanged = $countAmount ? $helper->getModelAmountchanged()->load($orderId, 'order_id')
281
  : $helper->getModelAmountchanged();
282
  $modNovalamountchanged->setOrderId($orderId)
307
  }
308
  } else {
309
  Mage::throwException($response->getStatusDesc());
310
+ }
311
  $customerId = $order->getCustomerId();
312
  $paymentObj->logNovalnetTransactionData($request, $response, $lastTranId, $customerId, $storeId);
313
  $this->_getSession()->addSuccess(
app/code/community/Novalnet/Payment/controllers/CcController.php ADDED
@@ -0,0 +1,98 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the Paymentmodule of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script usefull a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Novalnet AG
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ class Novalnet_Payment_CcController extends Mage_Core_Controller_Front_Action
27
+ {
28
+
29
+ /**
30
+ * Get Credit Card iframe
31
+ *
32
+ * @param none
33
+ * @return none
34
+ */
35
+ public function indexAction()
36
+ {
37
+ // Loading current layout
38
+ $this->loadLayout();
39
+
40
+ // Creating a new block
41
+ $block = $this->getLayout()->createBlock('Mage_Core_Block_Template', 'CcForm', array(
42
+ 'template' => 'novalnet/payment/method/form/Cciframe.phtml'));
43
+ $this->getLayout()->getBlock('content')->append($block);
44
+
45
+ // Set on-hold status
46
+ $helper = $this->_getHelper();
47
+ $order = $this->_getOrder();
48
+ $payment = $order->getPayment();
49
+ $paymentObj = $payment->getMethodInstance();
50
+ $authorizeKey = $paymentObj->loadAffAccDetail();
51
+ $paymentRequest = $helper->getCheckoutSession()->getPaymentReqData();
52
+
53
+ // Get Vendor configuration values from payport request
54
+ $authCode = $helper->getDecodedParam($paymentRequest->getVendorAuthcode(), $authorizeKey);
55
+ $productId = $helper->getDecodedParam($paymentRequest->getProductId(), $authorizeKey);
56
+ $tariffId = $helper->getDecodedParam($paymentRequest->getTariffId(), $authorizeKey);
57
+
58
+ // Payment additional data
59
+ $data = array('vendor' => $paymentRequest->getVendorId(),
60
+ 'auth_code' => $authCode,
61
+ 'product' => $productId,
62
+ 'tariff' => $tariffId,
63
+ 'key' => $paymentRequest->getKey(),
64
+ 'authorize_key' => $authorizeKey
65
+ );
66
+
67
+ $payment->setAdditionalData(serialize($data))->save();
68
+ $status = $state = Mage_Sales_Model_Order::STATE_HOLDED; //set State,Status to HOLD
69
+ $order->setState($state, $status, $helper->__('Customer was redirected to Novalnet'), false)->save();
70
+
71
+ //Now showing it with rendering of layout
72
+ $this->renderLayout();
73
+ }
74
+
75
+ /**
76
+ * Get Last placed order object
77
+ *
78
+ * @param none
79
+ * @return Varien_Object
80
+ */
81
+ private function _getOrder()
82
+ {
83
+ $incrementId = $this->_getHelper()->getCheckoutSession()->getLastRealOrderId();
84
+ return Mage::getModel('sales/order')->loadByIncrementId($incrementId);
85
+ }
86
+
87
+ /**
88
+ * Get Novalnet payment helper
89
+ *
90
+ * @param none
91
+ * @return Novalnet_Payment_Helper_Data
92
+ */
93
+ private function _getHelper()
94
+ {
95
+ return Mage::helper('novalnet_payment');
96
+ }
97
+
98
+ }
app/code/community/Novalnet/Payment/controllers/GatewayController.php CHANGED
@@ -111,7 +111,6 @@ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Acti
111
  $helper->getCoresession()->addError($statusMessage);
112
  }
113
 
114
- $this->unsetNovalnetSessionData($paymentObj->getCode());
115
  $this->_redirect('checkout/onepage/failure', array('_secure' => true));
116
  }
117
 
@@ -193,21 +192,19 @@ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Acti
193
  $data = unserialize($payment->getAdditionalData());
194
  $authorizeKey = $data['authorize_key'];
195
  // unset payment method session
196
- $this->unsetNovalnetSessionData($paymentObj->getCode());
197
  $paymentObj->unsetFormMethodSession();
198
 
199
  // check response status
200
  $response = $this->responseStatus($authorizeKey,$response,$paymentObj);
201
- if ($paymentObj->getCode() != Novalnet_Payment_Model_Config::NN_CC) {
202
- $checkHash = $helper->checkHash($response, $authorizeKey);
203
- if (!$checkHash) {
204
- $response['status_text'] = $helper->__('checkHash failed');
205
- $dataObj = new Varien_Object($response);
206
- $paymentObj->saveCancelledOrder($dataObj, $payment);
207
- $helper->getCoresession()->addError($helper->__('checkHash failed'));
208
- return false;
209
- }
210
  }
 
211
  //success
212
  if (($paymentObj->getCode() == Novalnet_Payment_Model_Config::NN_PAYPAL
213
  && $response['status'] == Novalnet_Payment_Model_Config::PAYPAL_PENDING_CODE)
@@ -217,13 +214,11 @@ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Acti
217
  $data['NnTestOrder'] = $testMode;
218
  $data['NnTid'] = $response['tid'];
219
  $amount = is_numeric($response['amount']) ? $response['amount'] : $helper->getDecodedParam($response['amount'], $authorizeKey);
220
- $transMode = ($paymentObj->getCode() == Novalnet_Payment_Model_Config::NN_CC)
221
- ? false : true;
222
 
223
  $payment->setStatus(Novalnet_Payment_Model_Payment_Method_Abstract::STATUS_SUCCESS)
224
  ->setStatusDescription($helper->__('Payment was successful.'))
225
  ->setAdditionalData(serialize($data))
226
- ->setIsTransactionClosed($transMode)
227
  ->save();
228
  $order->setPayment($payment);
229
  $order->save(); //Save details in order
@@ -262,16 +257,16 @@ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Acti
262
  private function _saveSuccessOrder($order, $response, $authorizeKey)
263
  {
264
  $payment = $order->getPayment();
 
265
  $paymentObj = $payment->getMethodInstance();
266
  $txnId = $response['tid'];
267
- $getAdminTransaction = $paymentObj->doNovalnetStatusCall($txnId, $payment);
268
  $helper = $this->_getNovalnetHelper();
269
  // save transaction id
270
  $payment->setTransactionId($txnId)
271
  ->setLastTransId($txnId)
272
  ->setParentTransactionId(null);
273
  // capture process
274
- if ($order->canInvoice() && $getAdminTransaction->getStatus() == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
275
  $captureMode = (version_compare($helper->getMagentoVersion(), '1.6', '<')) ? false : true;
276
  $payment->setIsTransactionClosed($captureMode)
277
  ->capture(null);
@@ -301,14 +296,17 @@ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Acti
301
  }
302
 
303
  $dataObj = new Varien_Object($response);
304
- $paymentObj->doNovalnetPostbackCall($dataObj); //Do Second Call
 
 
 
305
  $statusText = ($response['status_text']) ? $response['status_text']
306
  : $helper->__('successful');
307
  $helper->getCoresession()->addSuccess($statusText);
308
  $order->save();
309
  $amount = is_numeric($response['amount']) ? $response['amount'] : $helper->getDecodedParam($response['amount'], $authorizeKey);
310
  // Save the Transaction status
311
- $this->doTransactionStatusSave($response, $getAdminTransaction,$amount, $paymentObj->getCode());
312
  }
313
 
314
  /**
@@ -397,18 +395,6 @@ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Acti
397
  ->save();
398
  }
399
 
400
- /**
401
- * Unset Novalnet session
402
- *
403
- * @param string $paymentCode
404
- */
405
- private function unsetNovalnetSessionData($paymentCode)
406
- {
407
- if ($paymentCode == Novalnet_Payment_Model_Config::NN_CC) {
408
- $this->_getCheckout()->unsNnCcCvc();
409
- }
410
- }
411
-
412
  /**
413
  * Set payment status for Novalnet redirect payment methods
414
  *
@@ -419,9 +405,8 @@ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Acti
419
  */
420
  private function responseStatus($authorizeKey,$response,$paymentObj)
421
  {
422
- if ($response['status'] == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED
423
- && $paymentObj->getCode() != Novalnet_Payment_Model_Config::NN_CC) {
424
- $response['status'] = $this->_getNovalnetHelper()->checkParams($response, $authorizeKey);
425
  }
426
  return $response;
427
  }
@@ -436,9 +421,7 @@ class Novalnet_Payment_GatewayController extends Mage_Core_Controller_Front_Acti
436
  */
437
  private function setNovalnetMode($paymentObj,$response,$authorizeKey)
438
  {
439
- $serverResponse = ($paymentObj->getCode() != Novalnet_Payment_Model_Config::NN_CC)
440
- ? $this->_getNovalnetHelper()->getDecodedParam($response['test_mode'], $authorizeKey)
441
- : $response['test_mode'];
442
  $shopMode = $paymentObj->getNovalnetConfig('live_mode');
443
  $testMode = (((isset($serverResponse) && $serverResponse == 1) || (isset($shopMode)
444
  && $shopMode == 0)) ? 1 : 0 );
111
  $helper->getCoresession()->addError($statusMessage);
112
  }
113
 
 
114
  $this->_redirect('checkout/onepage/failure', array('_secure' => true));
115
  }
116
 
192
  $data = unserialize($payment->getAdditionalData());
193
  $authorizeKey = $data['authorize_key'];
194
  // unset payment method session
 
195
  $paymentObj->unsetFormMethodSession();
196
 
197
  // check response status
198
  $response = $this->responseStatus($authorizeKey,$response,$paymentObj);
199
+ $checkHash = $helper->checkHash($response, $authorizeKey, $response['implementation']);
200
+ if (!$checkHash) {
201
+ $response['status_text'] = $helper->__('checkHash failed');
202
+ $dataObj = new Varien_Object($response);
203
+ $paymentObj->saveCancelledOrder($dataObj, $payment);
204
+ $helper->getCoresession()->addError($helper->__('checkHash failed'));
205
+ return false;
 
 
206
  }
207
+
208
  //success
209
  if (($paymentObj->getCode() == Novalnet_Payment_Model_Config::NN_PAYPAL
210
  && $response['status'] == Novalnet_Payment_Model_Config::PAYPAL_PENDING_CODE)
214
  $data['NnTestOrder'] = $testMode;
215
  $data['NnTid'] = $response['tid'];
216
  $amount = is_numeric($response['amount']) ? $response['amount'] : $helper->getDecodedParam($response['amount'], $authorizeKey);
 
 
217
 
218
  $payment->setStatus(Novalnet_Payment_Model_Payment_Method_Abstract::STATUS_SUCCESS)
219
  ->setStatusDescription($helper->__('Payment was successful.'))
220
  ->setAdditionalData(serialize($data))
221
+ ->setIsTransactionClosed(true)
222
  ->save();
223
  $order->setPayment($payment);
224
  $order->save(); //Save details in order
257
  private function _saveSuccessOrder($order, $response, $authorizeKey)
258
  {
259
  $payment = $order->getPayment();
260
+ $payment->setStatus($response['tid_status']);
261
  $paymentObj = $payment->getMethodInstance();
262
  $txnId = $response['tid'];
 
263
  $helper = $this->_getNovalnetHelper();
264
  // save transaction id
265
  $payment->setTransactionId($txnId)
266
  ->setLastTransId($txnId)
267
  ->setParentTransactionId(null);
268
  // capture process
269
+ if ($order->canInvoice() && $response['tid_status'] == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
270
  $captureMode = (version_compare($helper->getMagentoVersion(), '1.6', '<')) ? false : true;
271
  $payment->setIsTransactionClosed($captureMode)
272
  ->capture(null);
296
  }
297
 
298
  $dataObj = new Varien_Object($response);
299
+ $nnAffId = $helper->getCoresession()->getNnAffId();
300
+ if ($nnAffId) {
301
+ $paymentObj->doNovalnetAffUserInfoLog($nnAffId);
302
+ }
303
  $statusText = ($response['status_text']) ? $response['status_text']
304
  : $helper->__('successful');
305
  $helper->getCoresession()->addSuccess($statusText);
306
  $order->save();
307
  $amount = is_numeric($response['amount']) ? $response['amount'] : $helper->getDecodedParam($response['amount'], $authorizeKey);
308
  // Save the Transaction status
309
+ $this->doTransactionStatusSave($response, $payment, $amount, $paymentObj->getCode());
310
  }
311
 
312
  /**
395
  ->save();
396
  }
397
 
 
 
 
 
 
 
 
 
 
 
 
 
398
  /**
399
  * Set payment status for Novalnet redirect payment methods
400
  *
405
  */
406
  private function responseStatus($authorizeKey,$response,$paymentObj)
407
  {
408
+ if ($response['status'] == Novalnet_Payment_Model_Config::RESPONSE_CODE_APPROVED) {
409
+ $response['status'] = $this->_getNovalnetHelper()->checkParams($response, $authorizeKey, $response['implementation']);
 
410
  }
411
  return $response;
412
  }
421
  */
422
  private function setNovalnetMode($paymentObj,$response,$authorizeKey)
423
  {
424
+ $serverResponse = $this->_getNovalnetHelper()->getDecodedParam($response['test_mode'], $authorizeKey);
 
 
425
  $shopMode = $paymentObj->getNovalnetConfig('live_mode');
426
  $testMode = (((isset($serverResponse) && $serverResponse == 1) || (isset($shopMode)
427
  && $shopMode == 0)) ? 1 : 0 );
app/code/community/Novalnet/Payment/etc/config.xml CHANGED
@@ -29,7 +29,7 @@
29
  <modules>
30
  <Novalnet_Payment>
31
  <!-- declare module's version information for database updates -->
32
- <version>10.1.0</version>
33
  </Novalnet_Payment>
34
  </modules>
35
 
@@ -306,21 +306,18 @@
306
  <novalnet_global>
307
  <novalnet>
308
  <gateway_timeout>240</gateway_timeout>
 
 
309
  </novalnet>
310
- <novalnetsetting>
311
- <emailsendoption>1</emailsendoption>
312
- </novalnetsetting>
313
  </novalnet_global>
314
  <!-- 'payment' configuration section (tab) -->
315
  <payment>
316
- <!-- 'module' configuration group (fieldset) -->
317
  <novalnetInvoice translate="title" module="novalnet_payment">
318
- <!-- by default this payment method is inactive -->
319
  <active>0</active>
320
- <!-- model to handle logic for this payment method -->
321
  <model>novalnet_payment/payment_method_novalnetInvoice</model>
322
- <!-- default title for payment checkout page and order view page -->
323
- <title>Novalnet Kauf auf Rechnung</title>
 
324
  <allowspecific>0</allowspecific>
325
  <group>novalnet</group>
326
  <payment_ref_one>1</payment_ref_one>
@@ -330,7 +327,9 @@
330
  <novalnetPrepayment translate="title" module="novalnet_payment">
331
  <active>0</active>
332
  <model>novalnet_payment/payment_method_novalnetPrepayment</model>
333
- <title>Novalnet Vorauskasse</title>
 
 
334
  <allowspecific>0</allowspecific>
335
  <group>novalnet</group>
336
  <payment_ref_one>1</payment_ref_one>
@@ -338,12 +337,12 @@
338
  <payment_ref_three>1</payment_ref_three>
339
  </novalnetPrepayment>
340
  <novalnetCc translate="title" module="novalnet_payment">
341
- <cctypes>VI,MC</cctypes>
342
  <active>0</active>
343
- <cc_refill>0</cc_refill>
344
- <cc_valid_year>25</cc_valid_year>
345
  <model>novalnet_payment/payment_method_novalnetCc</model>
346
- <title>Novalnet Kreditkarte</title>
 
 
347
  <allowspecific>0</allowspecific>
348
  <group>novalnet</group>
349
  </novalnetCc>
@@ -352,37 +351,55 @@
352
  <sepa_refill>0</sepa_refill>
353
  <model>novalnet_payment/payment_method_novalnetSepa</model>
354
  <allowspecific>0</allowspecific>
355
- <title>Novalnet Lastschrift SEPA</title>
 
356
  <group>novalnet</group>
357
  </novalnetSepa>
358
  <novalnetBanktransfer translate="title" module="novalnet_payment">
359
  <active>0</active>
360
  <model>novalnet_payment/payment_method_novalnetBanktransfer</model>
361
- <title>Novalnet Sofortüberweisung</title>
 
 
362
  <allowspecific>0</allowspecific>
363
  <group>novalnet</group>
364
  </novalnetBanktransfer>
365
  <novalnetPaypal translate="title" module="novalnet_payment">
366
  <active>0</active>
367
  <model>novalnet_payment/payment_method_novalnetPaypal</model>
368
- <title>Novalnet PayPal</title>
 
 
369
  <allowspecific>0</allowspecific>
370
  <group>novalnet</group>
371
  </novalnetPaypal>
372
  <novalnetIdeal translate="title" module="novalnet_payment">
373
  <active>0</active>
374
  <model>novalnet_payment/payment_method_novalnetIdeal</model>
375
- <title>Novalnet iDEAL</title>
 
 
376
  <allowspecific>0</allowspecific>
377
  <group>novalnet</group>
378
  </novalnetIdeal>
379
  <novalnetEps translate="title" module="novalnet_payment">
380
  <active>0</active>
381
  <model>novalnet_payment/payment_method_novalnetEps</model>
382
- <title>Novalnet Eps</title>
 
 
383
  <allowspecific>0</allowspecific>
384
  <group>novalnet</group>
385
  </novalnetEps>
 
 
 
 
 
 
 
 
 
386
  </payment>
387
  </default>
388
  </config>
29
  <modules>
30
  <Novalnet_Payment>
31
  <!-- declare module's version information for database updates -->
32
+ <version>10.2.0</version>
33
  </Novalnet_Payment>
34
  </modules>
35
 
306
  <novalnet_global>
307
  <novalnet>
308
  <gateway_timeout>240</gateway_timeout>
309
+ <order_status>processing</order_status>
310
+ <void_status>canceled</void_status>
311
  </novalnet>
 
 
 
312
  </novalnet_global>
313
  <!-- 'payment' configuration section (tab) -->
314
  <payment>
 
315
  <novalnetInvoice translate="title" module="novalnet_payment">
 
316
  <active>0</active>
 
317
  <model>novalnet_payment/payment_method_novalnetInvoice</model>
318
+ <title>Kauf auf Rechnung</title>
319
+ <order_status>pending</order_status>
320
+ <order_status_after_payment>processing</order_status_after_payment>
321
  <allowspecific>0</allowspecific>
322
  <group>novalnet</group>
323
  <payment_ref_one>1</payment_ref_one>
327
  <novalnetPrepayment translate="title" module="novalnet_payment">
328
  <active>0</active>
329
  <model>novalnet_payment/payment_method_novalnetPrepayment</model>
330
+ <title>Vorauskasse</title>
331
+ <order_status>pending</order_status>
332
+ <order_status_after_payment>processing</order_status_after_payment>
333
  <allowspecific>0</allowspecific>
334
  <group>novalnet</group>
335
  <payment_ref_one>1</payment_ref_one>
337
  <payment_ref_three>1</payment_ref_three>
338
  </novalnetPrepayment>
339
  <novalnetCc translate="title" module="novalnet_payment">
340
+ <cctypes>visacard,mastercard</cctypes>
341
  <active>0</active>
 
 
342
  <model>novalnet_payment/payment_method_novalnetCc</model>
343
+ <title>Kreditkarte</title>
344
+ <order_status>pending</order_status>
345
+ <order_status_after_payment>processing</order_status_after_payment>
346
  <allowspecific>0</allowspecific>
347
  <group>novalnet</group>
348
  </novalnetCc>
351
  <sepa_refill>0</sepa_refill>
352
  <model>novalnet_payment/payment_method_novalnetSepa</model>
353
  <allowspecific>0</allowspecific>
354
+ <title>Lastschrift SEPA</title>
355
+ <order_status>processing</order_status>
356
  <group>novalnet</group>
357
  </novalnetSepa>
358
  <novalnetBanktransfer translate="title" module="novalnet_payment">
359
  <active>0</active>
360
  <model>novalnet_payment/payment_method_novalnetBanktransfer</model>
361
+ <title>Sofortüberweisung</title>
362
+ <order_status>pending</order_status>
363
+ <order_status_after_payment>processing</order_status_after_payment>
364
  <allowspecific>0</allowspecific>
365
  <group>novalnet</group>
366
  </novalnetBanktransfer>
367
  <novalnetPaypal translate="title" module="novalnet_payment">
368
  <active>0</active>
369
  <model>novalnet_payment/payment_method_novalnetPaypal</model>
370
+ <title>PayPal</title>
371
+ <order_status>pending</order_status>
372
+ <order_status_after_payment>processing</order_status_after_payment>
373
  <allowspecific>0</allowspecific>
374
  <group>novalnet</group>
375
  </novalnetPaypal>
376
  <novalnetIdeal translate="title" module="novalnet_payment">
377
  <active>0</active>
378
  <model>novalnet_payment/payment_method_novalnetIdeal</model>
379
+ <title>iDEAL</title>
380
+ <order_status>pending</order_status>
381
+ <order_status_after_payment>processing</order_status_after_payment>
382
  <allowspecific>0</allowspecific>
383
  <group>novalnet</group>
384
  </novalnetIdeal>
385
  <novalnetEps translate="title" module="novalnet_payment">
386
  <active>0</active>
387
  <model>novalnet_payment/payment_method_novalnetEps</model>
388
+ <title>Eps</title>
389
+ <order_status>pending</order_status>
390
+ <order_status_after_payment>processing</order_status_after_payment>
391
  <allowspecific>0</allowspecific>
392
  <group>novalnet</group>
393
  </novalnetEps>
394
+ <novalnetGiropay translate="title" module="novalnet_payment">
395
+ <active>0</active>
396
+ <model>novalnet_payment/payment_method_novalnetGiropay</model>
397
+ <title>Giropay</title>
398
+ <order_status>pending</order_status>
399
+ <order_status_after_payment>processing</order_status_after_payment>
400
+ <allowspecific>0</allowspecific>
401
+ <group>novalnet</group>
402
+ </novalnetGiropay>
403
  </payment>
404
  </default>
405
  </config>
app/code/community/Novalnet/Payment/etc/system.xml CHANGED
@@ -153,22 +153,12 @@
153
  <show_in_website>1</show_in_website>
154
  <show_in_store>1</show_in_store>
155
  </referrer_id>
156
- <auto_refill translate="label">
157
- <label>Enable auto-fill</label>
158
- <comment>Autofill description</comment>
159
- <frontend_type>select</frontend_type>
160
- <source_model>adminhtml/system_config_source_yesno</source_model>
161
- <sort_order>11</sort_order>
162
- <show_in_default>1</show_in_default>
163
- <show_in_website>1</show_in_website>
164
- <show_in_store>1</show_in_store>
165
- </auto_refill>
166
  <payment_last_success translate="label">
167
  <label>Enable default payment method</label>
168
  <comment>Payment last success description</comment>
169
  <frontend_type>select</frontend_type>
170
  <source_model>adminhtml/system_config_source_yesno</source_model>
171
- <sort_order>12</sort_order>
172
  <show_in_default>1</show_in_default>
173
  <show_in_website>1</show_in_website>
174
  <show_in_store>1</show_in_store>
@@ -177,7 +167,7 @@
177
  <label>Novalnet Use Proxy</label>
178
  <frontend_type>select</frontend_type>
179
  <source_model>adminhtml/system_config_source_yesno</source_model>
180
- <sort_order>13</sort_order>
181
  <show_in_default>1</show_in_default>
182
  <show_in_website>1</show_in_website>
183
  <shared>1</shared>
@@ -185,7 +175,7 @@
185
  <proxy_host translate="label">
186
  <label>Proxy Host</label>
187
  <frontend_type>text</frontend_type>
188
- <sort_order>14</sort_order>
189
  <show_in_default>1</show_in_default>
190
  <show_in_website>1</show_in_website>
191
  <depends>
@@ -196,7 +186,7 @@
196
  <proxy_port translate="label">
197
  <label>Proxy Port</label>
198
  <frontend_type>text</frontend_type>
199
- <sort_order>15</sort_order>
200
  <show_in_default>1</show_in_default>
201
  <show_in_website>1</show_in_website>
202
  <depends>
@@ -204,6 +194,16 @@
204
  </depends>
205
  <shared>1</shared>
206
  </proxy_port>
 
 
 
 
 
 
 
 
 
 
207
  <order_status translate="label">
208
  <label>OnHold transaction completion status</label>
209
  <frontend_type>select</frontend_type>
@@ -284,6 +284,16 @@
284
  <show_in_website>1</show_in_website>
285
  <show_in_store>1</show_in_store>
286
  </emailBcc>
 
 
 
 
 
 
 
 
 
 
287
  </fields>
288
  </novalnetsetting>
289
  </groups>
@@ -327,83 +337,53 @@
327
  <show_in_website>1</show_in_website>
328
  <show_in_store>1</show_in_store>
329
  </title>
330
- <active_cc3d translate="label">
331
- <label>Enable 3D secure</label>
332
- <comment>CC-3D secure description</comment>
333
- <frontend_type>select</frontend_type>
334
- <source_model>adminhtml/system_config_source_yesno</source_model>
335
- <config_path>payment/novalnetCc/active_cc3d</config_path>
336
- <sort_order>3</sort_order>
337
- <show_in_default>1</show_in_default>
338
- <show_in_website>1</show_in_website>
339
- <show_in_store>1</show_in_store>
340
- </active_cc3d>
341
  <order_status translate="label">
342
- <label>Order completion status</label>
343
- <frontend_type>select</frontend_type>
344
- <config_path>payment/novalnetCc/order_status</config_path>
345
- <source_model>adminhtml/system_config_source_order_status</source_model>
346
- <sort_order>4</sort_order>
347
- <show_in_default>1</show_in_default>
348
- <show_in_website>1</show_in_website>
349
- <show_in_store>1</show_in_store>
350
- <depends>
351
- <active_cc3d>0</active_cc3d>
352
- </depends>
353
- </order_status>
354
- <order_status_before_payment translate="label">
355
  <label>Order status for the pending payment</label>
356
  <frontend_type>select</frontend_type>
357
  <config_path>payment/novalnetCc/order_status</config_path>
358
  <source_model>adminhtml/system_config_source_order_status</source_model>
359
- <sort_order>5</sort_order>
360
  <show_in_default>1</show_in_default>
361
  <show_in_website>1</show_in_website>
362
  <show_in_store>1</show_in_store>
363
- <depends>
364
- <active_cc3d>1</active_cc3d>
365
- </depends>
366
- </order_status_before_payment>
367
  <order_status_after_payment translate="label">
368
  <label>Order completion status</label>
369
  <frontend_type>select</frontend_type>
370
  <config_path>payment/novalnetCc/order_status_after_payment</config_path>
371
  <source_model>adminhtml/system_config_source_order_status</source_model>
372
- <sort_order>6</sort_order>
373
  <show_in_default>1</show_in_default>
374
  <show_in_website>1</show_in_website>
375
  <show_in_store>1</show_in_store>
376
- <depends>
377
- <active_cc3d>1</active_cc3d>
378
- </depends>
379
  </order_status_after_payment>
 
 
 
 
 
 
 
 
 
 
 
380
  <cctypes translate="label">
381
  <label>Novalnet Credit Card Types</label>
382
  <frontend_type>multiselect</frontend_type>
383
  <config_path>payment/novalnetCc/cctypes</config_path>
384
  <source_model>novalnet_payment/novalnet_source_cctype</source_model>
385
- <sort_order>7</sort_order>
386
  <show_in_default>1</show_in_default>
387
  <show_in_website>1</show_in_website>
388
  <show_in_store>1</show_in_store>
389
  </cctypes>
390
- <cc_valid_year translate="label">
391
- <label>Limit for expiry year</label>
392
- <comment>Limit for expiry year description</comment>
393
- <frontend_type>text</frontend_type>
394
- <validate>validate-number validate-greater-than-zero</validate>
395
- <config_path>payment/novalnetCc/cc_valid_year</config_path>
396
- <sort_order>8</sort_order>
397
- <show_in_default>1</show_in_default>
398
- <show_in_website>1</show_in_website>
399
- <show_in_store>1</show_in_store>
400
- </cc_valid_year>
401
  <reference_one translate="label">
402
  <label>Transaction reference 1</label>
403
  <comment>This reference will appear in your bank account statement</comment>
404
  <frontend_type>text</frontend_type>
405
  <config_path>payment/novalnetCc/reference_one</config_path>
406
- <sort_order>9</sort_order>
407
  <show_in_default>1</show_in_default>
408
  <show_in_website>1</show_in_website>
409
  <show_in_store>1</show_in_store>
@@ -413,7 +393,7 @@
413
  <comment>This reference will appear in your bank account statement</comment>
414
  <frontend_type>text</frontend_type>
415
  <config_path>payment/novalnetCc/reference_two</config_path>
416
- <sort_order>10</sort_order>
417
  <show_in_default>1</show_in_default>
418
  <show_in_website>1</show_in_website>
419
  <show_in_store>1</show_in_store>
@@ -423,7 +403,7 @@
423
  <comment>The entered text will be displayed on the checkout page</comment>
424
  <frontend_type>text</frontend_type>
425
  <config_path>payment/novalnetCc/booking_reference</config_path>
426
- <sort_order>11</sort_order>
427
  <show_in_default>1</show_in_default>
428
  <show_in_website>1</show_in_website>
429
  <show_in_store>1</show_in_store>
@@ -433,7 +413,7 @@
433
  <comment>Excluded User Group description</comment>
434
  <frontend_type>text</frontend_type>
435
  <config_path>payment/novalnetCc/user_group_excluded</config_path>
436
- <sort_order>12</sort_order>
437
  <show_in_default>1</show_in_default>
438
  <show_in_website>1</show_in_website>
439
  <show_in_store>1</show_in_store>
@@ -442,7 +422,7 @@
442
  <label>Payment from applicable countries</label>
443
  <frontend_type>select</frontend_type>
444
  <config_path>payment/novalnetCc/allowspecific</config_path>
445
- <sort_order>13</sort_order>
446
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
447
  <show_in_default>1</show_in_default>
448
  <show_in_website>1</show_in_website>
@@ -452,7 +432,7 @@
452
  <label>Payment from Specific countries</label>
453
  <frontend_type>multiselect</frontend_type>
454
  <config_path>payment/novalnetCc/specificcountry</config_path>
455
- <sort_order>14</sort_order>
456
  <source_model>adminhtml/system_config_source_country</source_model>
457
  <show_in_default>1</show_in_default>
458
  <show_in_website>1</show_in_website>
@@ -466,7 +446,7 @@
466
  <frontend_type>text</frontend_type>
467
  <config_path>payment/novalnetCc/min_order_total</config_path>
468
  <validate>validate-number</validate>
469
- <sort_order>15</sort_order>
470
  <show_in_default>1</show_in_default>
471
  <show_in_website>1</show_in_website>
472
  <show_in_store>1</show_in_store>
@@ -475,7 +455,7 @@
475
  <label>Novalnet Maximum Order Total</label>
476
  <frontend_type>text</frontend_type>
477
  <config_path>payment/novalnetCc/max_order_total</config_path>
478
- <sort_order>16</sort_order>
479
  <validate>validate-number</validate>
480
  <show_in_default>1</show_in_default>
481
  <show_in_website>1</show_in_website>
@@ -486,7 +466,7 @@
486
  <frontend_type>text</frontend_type>
487
  <config_path>payment/novalnetCc/orderscount</config_path>
488
  <validate>validate-digits</validate>
489
- <sort_order>17</sort_order>
490
  <comment>Novalnet Minimum Orders Count Desc</comment>
491
  <show_in_default>1</show_in_default>
492
  <show_in_website>1</show_in_website>
@@ -498,7 +478,7 @@
498
  <frontend_type>text</frontend_type>
499
  <config_path>payment/novalnetCc/sort_order</config_path>
500
  <validate>validate-digits</validate>
501
- <sort_order>18</sort_order>
502
  <show_in_default>1</show_in_default>
503
  <show_in_website>1</show_in_website>
504
  <show_in_store>1</show_in_store>
@@ -555,13 +535,24 @@
555
  <show_in_website>1</show_in_website>
556
  <show_in_store>1</show_in_store>
557
  </sepa_duedate>
 
 
 
 
 
 
 
 
 
 
 
558
  <sepa_payment_refill translate="label">
559
  <label>Enable auto-fill for payment data</label>
560
  <comment>Enable auto-fill for payment data description</comment>
561
  <frontend_type>select</frontend_type>
562
  <source_model>adminhtml/system_config_source_yesno</source_model>
563
  <config_path>payment/novalnetSepa/sepa_payment_refill</config_path>
564
- <sort_order>5</sort_order>
565
  <show_in_default>1</show_in_default>
566
  <show_in_website>1</show_in_website>
567
  <show_in_store>1</show_in_store>
@@ -571,7 +562,7 @@
571
  <comment>This reference will appear in your bank account statement</comment>
572
  <frontend_type>text</frontend_type>
573
  <config_path>payment/novalnetSepa/reference_one</config_path>
574
- <sort_order>6</sort_order>
575
  <show_in_default>1</show_in_default>
576
  <show_in_website>1</show_in_website>
577
  <show_in_store>1</show_in_store>
@@ -581,7 +572,7 @@
581
  <comment>This reference will appear in your bank account statement</comment>
582
  <frontend_type>text</frontend_type>
583
  <config_path>payment/novalnetSepa/reference_two</config_path>
584
- <sort_order>7</sort_order>
585
  <show_in_default>1</show_in_default>
586
  <show_in_website>1</show_in_website>
587
  <show_in_store>1</show_in_store>
@@ -591,7 +582,7 @@
591
  <comment>The entered text will be displayed on the checkout page</comment>
592
  <frontend_type>text</frontend_type>
593
  <config_path>payment/novalnetSepa/booking_reference</config_path>
594
- <sort_order>8</sort_order>
595
  <show_in_default>1</show_in_default>
596
  <show_in_website>1</show_in_website>
597
  <show_in_store>1</show_in_store>
@@ -601,7 +592,7 @@
601
  <comment>Excluded User Group description</comment>
602
  <frontend_type>text</frontend_type>
603
  <config_path>payment/novalnetSepa/user_group_excluded</config_path>
604
- <sort_order>9</sort_order>
605
  <show_in_default>1</show_in_default>
606
  <show_in_website>1</show_in_website>
607
  <show_in_store>1</show_in_store>
@@ -610,7 +601,7 @@
610
  <label>Payment from applicable countries</label>
611
  <frontend_type>select</frontend_type>
612
  <config_path>payment/novalnetSepa/allowspecific</config_path>
613
- <sort_order>10</sort_order>
614
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
615
  <show_in_default>1</show_in_default>
616
  <show_in_website>1</show_in_website>
@@ -620,7 +611,7 @@
620
  <label>Payment from Specific countries</label>
621
  <frontend_type>multiselect</frontend_type>
622
  <config_path>payment/novalnetSepa/specificcountry</config_path>
623
- <sort_order>11</sort_order>
624
  <source_model>adminhtml/system_config_source_country</source_model>
625
  <show_in_default>1</show_in_default>
626
  <show_in_website>1</show_in_website>
@@ -634,7 +625,7 @@
634
  <frontend_type>text</frontend_type>
635
  <config_path>payment/novalnetSepa/min_order_total</config_path>
636
  <validate>validate-number</validate>
637
- <sort_order>12</sort_order>
638
  <show_in_default>1</show_in_default>
639
  <show_in_website>1</show_in_website>
640
  <show_in_store>1</show_in_store>
@@ -644,7 +635,7 @@
644
  <frontend_type>text</frontend_type>
645
  <config_path>payment/novalnetSepa/max_order_total</config_path>
646
  <validate>validate-number</validate>
647
- <sort_order>13</sort_order>
648
  <show_in_default>1</show_in_default>
649
  <show_in_website>1</show_in_website>
650
  <show_in_store>1</show_in_store>
@@ -655,7 +646,7 @@
655
  <frontend_type>text</frontend_type>
656
  <config_path>payment/novalnetSepa/orderscount</config_path>
657
  <validate>validate-digits</validate>
658
- <sort_order>14</sort_order>
659
  <show_in_default>1</show_in_default>
660
  <show_in_website>1</show_in_website>
661
  <show_in_store>1</show_in_store>
@@ -666,7 +657,7 @@
666
  <frontend_type>text</frontend_type>
667
  <config_path>payment/novalnetSepa/sort_order</config_path>
668
  <validate>validate-digits</validate>
669
- <sort_order>15</sort_order>
670
  <show_in_default>1</show_in_default>
671
  <show_in_website>1</show_in_website>
672
  <show_in_store>1</show_in_store>
@@ -1684,58 +1675,182 @@
1684
  </fields>
1685
  </novalnetEps>
1686
  <!--}}} Novalnet Eps-->
1687
- </groups>
1688
- </novalnet_paymethods>
1689
- <!-- Novalnet payment methods -->
1690
-
1691
- <!-- Fraud prevention -->
1692
- <fraud_prevent translate="label" module="novalnet_payment">
1693
- <label>Risk and Control</label>
1694
- <tab>novalnet</tab>
1695
- <frontend_type>text</frontend_type>
1696
- <sort_order>3</sort_order>
1697
- <show_in_default>1</show_in_default>
1698
- <show_in_website>1</show_in_website>
1699
- <show_in_store>1</show_in_store>
1700
- <groups>
1701
- <novalnetCc translate="label" module="novalnet_payment">
1702
- <label>Novalnet Credit Card</label>
1703
- <comment>Enable the payment Method and activate the Risk and Control option</comment>
1704
  <frontend_type>text</frontend_type>
1705
- <sort_order>1</sort_order>
1706
  <show_in_default>1</show_in_default>
1707
  <show_in_website>1</show_in_website>
1708
  <show_in_store>1</show_in_store>
1709
  <fields>
1710
- <callback translate="label">
1711
- <label>Enable fraud prevention</label>
1712
- <comment>Enable fraud prevention description</comment>
1713
  <frontend_type>select</frontend_type>
1714
- <source_model>novalnet_payment/novalnet_source_callbacktypes</source_model>
1715
- <config_path>payment/novalnetCc/callback</config_path>
1716
  <sort_order>1</sort_order>
1717
  <show_in_default>1</show_in_default>
1718
  <show_in_website>1</show_in_website>
1719
  <show_in_store>1</show_in_store>
1720
- </callback>
1721
- <callback_minimum_amount>
1722
- <label>Minimum Amount For Callback</label>
1723
- <comment>Minimum Amount For Callback description</comment>
1724
  <frontend_type>text</frontend_type>
1725
- <config_path>payment/novalnetCc/callback_minimum_amount</config_path>
1726
- <validate>validate-digits</validate>
1727
  <sort_order>2</sort_order>
1728
  <show_in_default>1</show_in_default>
1729
  <show_in_website>1</show_in_website>
1730
  <show_in_store>1</show_in_store>
1731
- </callback_minimum_amount>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1732
  </fields>
1733
- </novalnetCc>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1734
  <novalnetInvoice translate="label" module="novalnet_payment">
1735
  <label>Novalnet Invoice</label>
1736
  <comment>Enable the payment Method and activate the Risk and Control option</comment>
1737
  <frontend_type>text</frontend_type>
1738
- <sort_order>2</sort_order>
1739
  <show_in_default>1</show_in_default>
1740
  <show_in_website>1</show_in_website>
1741
  <show_in_store>1</show_in_store>
@@ -1768,7 +1883,7 @@
1768
  <label>Novalnet Direct Debit SEPA</label>
1769
  <comment>Enable the payment Method and activate the Risk and Control option</comment>
1770
  <frontend_type>text</frontend_type>
1771
- <sort_order>3</sort_order>
1772
  <show_in_default>1</show_in_default>
1773
  <show_in_website>1</show_in_website>
1774
  <show_in_store>1</show_in_store>
153
  <show_in_website>1</show_in_website>
154
  <show_in_store>1</show_in_store>
155
  </referrer_id>
 
 
 
 
 
 
 
 
 
 
156
  <payment_last_success translate="label">
157
  <label>Enable default payment method</label>
158
  <comment>Payment last success description</comment>
159
  <frontend_type>select</frontend_type>
160
  <source_model>adminhtml/system_config_source_yesno</source_model>
161
+ <sort_order>11</sort_order>
162
  <show_in_default>1</show_in_default>
163
  <show_in_website>1</show_in_website>
164
  <show_in_store>1</show_in_store>
167
  <label>Novalnet Use Proxy</label>
168
  <frontend_type>select</frontend_type>
169
  <source_model>adminhtml/system_config_source_yesno</source_model>
170
+ <sort_order>12</sort_order>
171
  <show_in_default>1</show_in_default>
172
  <show_in_website>1</show_in_website>
173
  <shared>1</shared>
175
  <proxy_host translate="label">
176
  <label>Proxy Host</label>
177
  <frontend_type>text</frontend_type>
178
+ <sort_order>13</sort_order>
179
  <show_in_default>1</show_in_default>
180
  <show_in_website>1</show_in_website>
181
  <depends>
186
  <proxy_port translate="label">
187
  <label>Proxy Port</label>
188
  <frontend_type>text</frontend_type>
189
+ <sort_order>14</sort_order>
190
  <show_in_default>1</show_in_default>
191
  <show_in_website>1</show_in_website>
192
  <depends>
194
  </depends>
195
  <shared>1</shared>
196
  </proxy_port>
197
+ <enable_payment_logo translate="label">
198
+ <label>Display payment method logo</label>
199
+ <comment>The payment method logo will be displayed on the checkout page</comment>
200
+ <frontend_type>select</frontend_type>
201
+ <source_model>adminhtml/system_config_source_yesno</source_model>
202
+ <sort_order>15</sort_order>
203
+ <show_in_default>1</show_in_default>
204
+ <show_in_website>1</show_in_website>
205
+ <show_in_store>1</show_in_store>
206
+ </enable_payment_logo>
207
  <order_status translate="label">
208
  <label>OnHold transaction completion status</label>
209
  <frontend_type>select</frontend_type>
284
  <show_in_website>1</show_in_website>
285
  <show_in_store>1</show_in_store>
286
  </emailBcc>
287
+ <vendor_script_url translate="label">
288
+ <label>Vendor script url</label>
289
+ <comment>Vendor script url description</comment>
290
+ <frontend_type>text</frontend_type>
291
+ <backend_model>novalnet_payment/system_config_backend_notifyurl</backend_model>
292
+ <sort_order>6</sort_order>
293
+ <show_in_default>1</show_in_default>
294
+ <show_in_website>1</show_in_website>
295
+ <show_in_store>1</show_in_store>
296
+ </vendor_script_url>
297
  </fields>
298
  </novalnetsetting>
299
  </groups>
337
  <show_in_website>1</show_in_website>
338
  <show_in_store>1</show_in_store>
339
  </title>
 
 
 
 
 
 
 
 
 
 
 
340
  <order_status translate="label">
 
 
 
 
 
 
 
 
 
 
 
 
 
341
  <label>Order status for the pending payment</label>
342
  <frontend_type>select</frontend_type>
343
  <config_path>payment/novalnetCc/order_status</config_path>
344
  <source_model>adminhtml/system_config_source_order_status</source_model>
345
+ <sort_order>3</sort_order>
346
  <show_in_default>1</show_in_default>
347
  <show_in_website>1</show_in_website>
348
  <show_in_store>1</show_in_store>
349
+ </order_status>
 
 
 
350
  <order_status_after_payment translate="label">
351
  <label>Order completion status</label>
352
  <frontend_type>select</frontend_type>
353
  <config_path>payment/novalnetCc/order_status_after_payment</config_path>
354
  <source_model>adminhtml/system_config_source_order_status</source_model>
355
+ <sort_order>4</sort_order>
356
  <show_in_default>1</show_in_default>
357
  <show_in_website>1</show_in_website>
358
  <show_in_store>1</show_in_store>
 
 
 
359
  </order_status_after_payment>
360
+ <active_cc3d translate="label">
361
+ <label>Enable 3D secure</label>
362
+ <comment>CC-3D secure description</comment>
363
+ <frontend_type>select</frontend_type>
364
+ <source_model>adminhtml/system_config_source_yesno</source_model>
365
+ <config_path>payment/novalnetCc/active_cc3d</config_path>
366
+ <sort_order>5</sort_order>
367
+ <show_in_default>1</show_in_default>
368
+ <show_in_website>1</show_in_website>
369
+ <show_in_store>1</show_in_store>
370
+ </active_cc3d>
371
  <cctypes translate="label">
372
  <label>Novalnet Credit Card Types</label>
373
  <frontend_type>multiselect</frontend_type>
374
  <config_path>payment/novalnetCc/cctypes</config_path>
375
  <source_model>novalnet_payment/novalnet_source_cctype</source_model>
376
+ <sort_order>6</sort_order>
377
  <show_in_default>1</show_in_default>
378
  <show_in_website>1</show_in_website>
379
  <show_in_store>1</show_in_store>
380
  </cctypes>
 
 
 
 
 
 
 
 
 
 
 
381
  <reference_one translate="label">
382
  <label>Transaction reference 1</label>
383
  <comment>This reference will appear in your bank account statement</comment>
384
  <frontend_type>text</frontend_type>
385
  <config_path>payment/novalnetCc/reference_one</config_path>
386
+ <sort_order>7</sort_order>
387
  <show_in_default>1</show_in_default>
388
  <show_in_website>1</show_in_website>
389
  <show_in_store>1</show_in_store>
393
  <comment>This reference will appear in your bank account statement</comment>
394
  <frontend_type>text</frontend_type>
395
  <config_path>payment/novalnetCc/reference_two</config_path>
396
+ <sort_order>8</sort_order>
397
  <show_in_default>1</show_in_default>
398
  <show_in_website>1</show_in_website>
399
  <show_in_store>1</show_in_store>
403
  <comment>The entered text will be displayed on the checkout page</comment>
404
  <frontend_type>text</frontend_type>
405
  <config_path>payment/novalnetCc/booking_reference</config_path>
406
+ <sort_order>9</sort_order>
407
  <show_in_default>1</show_in_default>
408
  <show_in_website>1</show_in_website>
409
  <show_in_store>1</show_in_store>
413
  <comment>Excluded User Group description</comment>
414
  <frontend_type>text</frontend_type>
415
  <config_path>payment/novalnetCc/user_group_excluded</config_path>
416
+ <sort_order>10</sort_order>
417
  <show_in_default>1</show_in_default>
418
  <show_in_website>1</show_in_website>
419
  <show_in_store>1</show_in_store>
422
  <label>Payment from applicable countries</label>
423
  <frontend_type>select</frontend_type>
424
  <config_path>payment/novalnetCc/allowspecific</config_path>
425
+ <sort_order>11</sort_order>
426
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
427
  <show_in_default>1</show_in_default>
428
  <show_in_website>1</show_in_website>
432
  <label>Payment from Specific countries</label>
433
  <frontend_type>multiselect</frontend_type>
434
  <config_path>payment/novalnetCc/specificcountry</config_path>
435
+ <sort_order>12</sort_order>
436
  <source_model>adminhtml/system_config_source_country</source_model>
437
  <show_in_default>1</show_in_default>
438
  <show_in_website>1</show_in_website>
446
  <frontend_type>text</frontend_type>
447
  <config_path>payment/novalnetCc/min_order_total</config_path>
448
  <validate>validate-number</validate>
449
+ <sort_order>13</sort_order>
450
  <show_in_default>1</show_in_default>
451
  <show_in_website>1</show_in_website>
452
  <show_in_store>1</show_in_store>
455
  <label>Novalnet Maximum Order Total</label>
456
  <frontend_type>text</frontend_type>
457
  <config_path>payment/novalnetCc/max_order_total</config_path>
458
+ <sort_order>14</sort_order>
459
  <validate>validate-number</validate>
460
  <show_in_default>1</show_in_default>
461
  <show_in_website>1</show_in_website>
466
  <frontend_type>text</frontend_type>
467
  <config_path>payment/novalnetCc/orderscount</config_path>
468
  <validate>validate-digits</validate>
469
+ <sort_order>15</sort_order>
470
  <comment>Novalnet Minimum Orders Count Desc</comment>
471
  <show_in_default>1</show_in_default>
472
  <show_in_website>1</show_in_website>
478
  <frontend_type>text</frontend_type>
479
  <config_path>payment/novalnetCc/sort_order</config_path>
480
  <validate>validate-digits</validate>
481
+ <sort_order>16</sort_order>
482
  <show_in_default>1</show_in_default>
483
  <show_in_website>1</show_in_website>
484
  <show_in_store>1</show_in_store>
535
  <show_in_website>1</show_in_website>
536
  <show_in_store>1</show_in_store>
537
  </sepa_duedate>
538
+ <auto_refill translate="label">
539
+ <label>Enable auto-fill</label>
540
+ <comment>Autofill description</comment>
541
+ <frontend_type>select</frontend_type>
542
+ <source_model>adminhtml/system_config_source_yesno</source_model>
543
+ <config_path>payment/novalnetSepa/auto_refill</config_path>
544
+ <sort_order>5</sort_order>
545
+ <show_in_default>1</show_in_default>
546
+ <show_in_website>1</show_in_website>
547
+ <show_in_store>1</show_in_store>
548
+ </auto_refill>
549
  <sepa_payment_refill translate="label">
550
  <label>Enable auto-fill for payment data</label>
551
  <comment>Enable auto-fill for payment data description</comment>
552
  <frontend_type>select</frontend_type>
553
  <source_model>adminhtml/system_config_source_yesno</source_model>
554
  <config_path>payment/novalnetSepa/sepa_payment_refill</config_path>
555
+ <sort_order>6</sort_order>
556
  <show_in_default>1</show_in_default>
557
  <show_in_website>1</show_in_website>
558
  <show_in_store>1</show_in_store>
562
  <comment>This reference will appear in your bank account statement</comment>
563
  <frontend_type>text</frontend_type>
564
  <config_path>payment/novalnetSepa/reference_one</config_path>
565
+ <sort_order>7</sort_order>
566
  <show_in_default>1</show_in_default>
567
  <show_in_website>1</show_in_website>
568
  <show_in_store>1</show_in_store>
572
  <comment>This reference will appear in your bank account statement</comment>
573
  <frontend_type>text</frontend_type>
574
  <config_path>payment/novalnetSepa/reference_two</config_path>
575
+ <sort_order>8</sort_order>
576
  <show_in_default>1</show_in_default>
577
  <show_in_website>1</show_in_website>
578
  <show_in_store>1</show_in_store>
582
  <comment>The entered text will be displayed on the checkout page</comment>
583
  <frontend_type>text</frontend_type>
584
  <config_path>payment/novalnetSepa/booking_reference</config_path>
585
+ <sort_order>9</sort_order>
586
  <show_in_default>1</show_in_default>
587
  <show_in_website>1</show_in_website>
588
  <show_in_store>1</show_in_store>
592
  <comment>Excluded User Group description</comment>
593
  <frontend_type>text</frontend_type>
594
  <config_path>payment/novalnetSepa/user_group_excluded</config_path>
595
+ <sort_order>10</sort_order>
596
  <show_in_default>1</show_in_default>
597
  <show_in_website>1</show_in_website>
598
  <show_in_store>1</show_in_store>
601
  <label>Payment from applicable countries</label>
602
  <frontend_type>select</frontend_type>
603
  <config_path>payment/novalnetSepa/allowspecific</config_path>
604
+ <sort_order>11</sort_order>
605
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
606
  <show_in_default>1</show_in_default>
607
  <show_in_website>1</show_in_website>
611
  <label>Payment from Specific countries</label>
612
  <frontend_type>multiselect</frontend_type>
613
  <config_path>payment/novalnetSepa/specificcountry</config_path>
614
+ <sort_order>12</sort_order>
615
  <source_model>adminhtml/system_config_source_country</source_model>
616
  <show_in_default>1</show_in_default>
617
  <show_in_website>1</show_in_website>
625
  <frontend_type>text</frontend_type>
626
  <config_path>payment/novalnetSepa/min_order_total</config_path>
627
  <validate>validate-number</validate>
628
+ <sort_order>13</sort_order>
629
  <show_in_default>1</show_in_default>
630
  <show_in_website>1</show_in_website>
631
  <show_in_store>1</show_in_store>
635
  <frontend_type>text</frontend_type>
636
  <config_path>payment/novalnetSepa/max_order_total</config_path>
637
  <validate>validate-number</validate>
638
+ <sort_order>14</sort_order>
639
  <show_in_default>1</show_in_default>
640
  <show_in_website>1</show_in_website>
641
  <show_in_store>1</show_in_store>
646
  <frontend_type>text</frontend_type>
647
  <config_path>payment/novalnetSepa/orderscount</config_path>
648
  <validate>validate-digits</validate>
649
+ <sort_order>15</sort_order>
650
  <show_in_default>1</show_in_default>
651
  <show_in_website>1</show_in_website>
652
  <show_in_store>1</show_in_store>
657
  <frontend_type>text</frontend_type>
658
  <config_path>payment/novalnetSepa/sort_order</config_path>
659
  <validate>validate-digits</validate>
660
+ <sort_order>16</sort_order>
661
  <show_in_default>1</show_in_default>
662
  <show_in_website>1</show_in_website>
663
  <show_in_store>1</show_in_store>
1675
  </fields>
1676
  </novalnetEps>
1677
  <!--}}} Novalnet Eps-->
1678
+ <!--{{{ Novalnet Giropay-->
1679
+ <novalnetGiropay translate="label" module="novalnet_payment">
1680
+ <label>Novalnet Giropay</label>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1681
  <frontend_type>text</frontend_type>
1682
+ <sort_order>9</sort_order>
1683
  <show_in_default>1</show_in_default>
1684
  <show_in_website>1</show_in_website>
1685
  <show_in_store>1</show_in_store>
1686
  <fields>
1687
+ <active translate="label">
1688
+ <label>Enable module</label>
 
1689
  <frontend_type>select</frontend_type>
1690
+ <config_path>payment/novalnetGiropay/active</config_path>
1691
+ <source_model>adminhtml/system_config_source_yesno</source_model>
1692
  <sort_order>1</sort_order>
1693
  <show_in_default>1</show_in_default>
1694
  <show_in_website>1</show_in_website>
1695
  <show_in_store>1</show_in_store>
1696
+ </active>
1697
+ <title translate="label">
1698
+ <label>Title</label>
 
1699
  <frontend_type>text</frontend_type>
1700
+ <config_path>payment/novalnetGiropay/title</config_path>
1701
+ <validate>required-entry</validate>
1702
  <sort_order>2</sort_order>
1703
  <show_in_default>1</show_in_default>
1704
  <show_in_website>1</show_in_website>
1705
  <show_in_store>1</show_in_store>
1706
+ </title>
1707
+ <order_status translate="label">
1708
+ <label>Order status for the pending payment</label>
1709
+ <frontend_type>select</frontend_type>
1710
+ <source_model>adminhtml/system_config_source_order_status</source_model>
1711
+ <config_path>payment/novalnetGiropay/order_status</config_path>
1712
+ <sort_order>3</sort_order>
1713
+ <show_in_default>1</show_in_default>
1714
+ <show_in_website>1</show_in_website>
1715
+ <show_in_store>1</show_in_store>
1716
+ </order_status>
1717
+ <order_status_after_payment translate="label">
1718
+ <label>Order completion status</label>
1719
+ <frontend_type>select</frontend_type>
1720
+ <source_model>adminhtml/system_config_source_order_status</source_model>
1721
+ <config_path>payment/novalnetGiropay/order_status_after_payment</config_path>
1722
+ <sort_order>4</sort_order>
1723
+ <show_in_default>1</show_in_default>
1724
+ <show_in_website>1</show_in_website>
1725
+ <show_in_store>1</show_in_store>
1726
+ </order_status_after_payment>
1727
+ <booking_reference translate="label">
1728
+ <label>Notification for the buyer</label>
1729
+ <comment>The entered text will be displayed on the checkout page</comment>
1730
+ <frontend_type>text</frontend_type>
1731
+ <config_path>payment/novalnetGiropay/booking_reference</config_path>
1732
+ <sort_order>5</sort_order>
1733
+ <show_in_default>1</show_in_default>
1734
+ <show_in_website>1</show_in_website>
1735
+ <show_in_store>1</show_in_store>
1736
+ </booking_reference>
1737
+ <reference_one translate="label">
1738
+ <label>Transaction reference 1</label>
1739
+ <comment>This reference will appear in your bank account statement</comment>
1740
+ <frontend_type>text</frontend_type>
1741
+ <config_path>payment/novalnetGiropay/reference_one</config_path>
1742
+ <sort_order>6</sort_order>
1743
+ <show_in_default>1</show_in_default>
1744
+ <show_in_website>1</show_in_website>
1745
+ <show_in_store>1</show_in_store>
1746
+ </reference_one>
1747
+ <reference_two translate="label">
1748
+ <label>Transaction reference 2</label>
1749
+ <comment>This reference will appear in your bank account statement</comment>
1750
+ <frontend_type>text</frontend_type>
1751
+ <config_path>payment/novalnetGiropay/reference_two</config_path>
1752
+ <sort_order>7</sort_order>
1753
+ <show_in_default>1</show_in_default>
1754
+ <show_in_website>1</show_in_website>
1755
+ <show_in_store>1</show_in_store>
1756
+ </reference_two>
1757
+ <user_group_excluded translate="label">
1758
+ <label>User Group Excluded</label>
1759
+ <comment>Excluded User Group description</comment>
1760
+ <frontend_type>text</frontend_type>
1761
+ <config_path>payment/novalnetGiropay/user_group_excluded</config_path>
1762
+ <sort_order>8</sort_order>
1763
+ <show_in_default>1</show_in_default>
1764
+ <show_in_website>1</show_in_website>
1765
+ <show_in_store>1</show_in_store>
1766
+ </user_group_excluded>
1767
+ <allowspecific translate="label">
1768
+ <label>Payment from applicable countries</label>
1769
+ <frontend_type>select</frontend_type>
1770
+ <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
1771
+ <config_path>payment/novalnetGiropay/allowspecific</config_path>
1772
+ <sort_order>9</sort_order>
1773
+ <show_in_default>1</show_in_default>
1774
+ <show_in_website>1</show_in_website>
1775
+ <show_in_store>1</show_in_store>
1776
+ </allowspecific>
1777
+ <specificcountry translate="label">
1778
+ <label>Payment from Specific countries</label>
1779
+ <frontend_type>multiselect</frontend_type>
1780
+ <source_model>adminhtml/system_config_source_country</source_model>
1781
+ <config_path>payment/novalnetGiropay/specificcountry</config_path>
1782
+ <sort_order>10</sort_order>
1783
+ <show_in_default>1</show_in_default>
1784
+ <show_in_website>1</show_in_website>
1785
+ <show_in_store>1</show_in_store>
1786
+ <depends>
1787
+ <allowspecific>1</allowspecific>
1788
+ </depends>
1789
+ </specificcountry>
1790
+ <min_order_total translate="label">
1791
+ <label>Novalnet Minimum Order Total</label>
1792
+ <frontend_type>text</frontend_type>
1793
+ <config_path>payment/novalnetGiropay/min_order_total</config_path>
1794
+ <validate>validate-number</validate>
1795
+ <sort_order>11</sort_order>
1796
+ <show_in_default>1</show_in_default>
1797
+ <show_in_website>1</show_in_website>
1798
+ <show_in_store>1</show_in_store>
1799
+ </min_order_total>
1800
+ <max_order_total translate="label">
1801
+ <label>Novalnet Maximum Order Total</label>
1802
+ <frontend_type>text</frontend_type>
1803
+ <config_path>payment/novalnetGiropay/max_order_total</config_path>
1804
+ <validate>validate-number</validate>
1805
+ <sort_order>12</sort_order>
1806
+ <show_in_default>1</show_in_default>
1807
+ <show_in_website>1</show_in_website>
1808
+ <show_in_store>1</show_in_store>
1809
+ </max_order_total>
1810
+ <orderscount translate="label">
1811
+ <label>Novalnet Minimum Orders Count</label>
1812
+ <comment>Novalnet Minimum Orders Count Desc</comment>
1813
+ <frontend_type>text</frontend_type>
1814
+ <config_path>payment/novalnetGiropay/orderscount</config_path>
1815
+ <validate>validate-digits</validate>
1816
+ <sort_order>13</sort_order>
1817
+ <show_in_default>1</show_in_default>
1818
+ <show_in_website>1</show_in_website>
1819
+ <show_in_store>1</show_in_store>
1820
+ </orderscount>
1821
+ <sort_order translate="label">
1822
+ <label>Novalnet Sort Order</label>
1823
+ <comment>Sort order of display. Lowest is displayed first.</comment>
1824
+ <frontend_type>text</frontend_type>
1825
+ <config_path>payment/novalnetGiropay/sort_order</config_path>
1826
+ <validate>validate-digits</validate>
1827
+ <sort_order>14</sort_order>
1828
+ <show_in_default>1</show_in_default>
1829
+ <show_in_website>1</show_in_website>
1830
+ <show_in_store>1</show_in_store>
1831
+ </sort_order>
1832
  </fields>
1833
+ </novalnetGiropay>
1834
+ <!--}}} Novalnet Giropay-->
1835
+ </groups>
1836
+ </novalnet_paymethods>
1837
+ <!-- Novalnet payment methods -->
1838
+
1839
+ <!-- Fraud prevention -->
1840
+ <fraud_prevent translate="label" module="novalnet_payment">
1841
+ <label>Risk and Control</label>
1842
+ <tab>novalnet</tab>
1843
+ <frontend_type>text</frontend_type>
1844
+ <sort_order>3</sort_order>
1845
+ <show_in_default>1</show_in_default>
1846
+ <show_in_website>1</show_in_website>
1847
+ <show_in_store>1</show_in_store>
1848
+ <groups>
1849
  <novalnetInvoice translate="label" module="novalnet_payment">
1850
  <label>Novalnet Invoice</label>
1851
  <comment>Enable the payment Method and activate the Risk and Control option</comment>
1852
  <frontend_type>text</frontend_type>
1853
+ <sort_order>1</sort_order>
1854
  <show_in_default>1</show_in_default>
1855
  <show_in_website>1</show_in_website>
1856
  <show_in_store>1</show_in_store>
1883
  <label>Novalnet Direct Debit SEPA</label>
1884
  <comment>Enable the payment Method and activate the Risk and Control option</comment>
1885
  <frontend_type>text</frontend_type>
1886
+ <sort_order>2</sort_order>
1887
  <show_in_default>1</show_in_default>
1888
  <show_in_website>1</show_in_website>
1889
  <show_in_store>1</show_in_store>
app/code/community/Novalnet/Payment/sql/novalnet_setup/{mysql4-install-10.1.0.php → mysql4-install-10.2.0.php} RENAMED
File without changes
app/design/adminhtml/default/default/layout/novalnet/configuration.xml CHANGED
@@ -31,9 +31,6 @@
31
  <action method="addJs">
32
  <script>novalnet/novalnetJquery.js</script>
33
  </action>
34
- <action method="addJs">
35
- <script>novalnet/novalnetcc.js</script>
36
- </action>
37
  <action method="addJs">
38
  <script>novalnet/novalnetsepa.js</script>
39
  </action>
31
  <action method="addJs">
32
  <script>novalnet/novalnetJquery.js</script>
33
  </action>
 
 
 
34
  <action method="addJs">
35
  <script>novalnet/novalnetsepa.js</script>
36
  </action>
app/design/adminhtml/default/default/template/novalnet/payment/method/form/Cc.phtml DELETED
@@ -1,121 +0,0 @@
1
- <?php
2
- /**
3
- * Magento
4
- *
5
- * NOTICE OF LICENSE
6
- *
7
- * This source file is subject to the Open Software License (OSL 3.0)
8
- * that is bundled with this package in the file LICENSE.txt.
9
- * It is also available through the world-wide-web at this URL:
10
- * http://opensource.org/licenses/osl-3.0.php
11
- * If you did not receive a copy of the license and are unable to
12
- * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
- *
15
- * Part of the payment module of Novalnet AG
16
- * https://www.novalnet.de
17
- * If you have found this script useful a small
18
- * recommendation as well as a comment on merchant form
19
- * would be greatly appreciated.
20
- *
21
- * @category Novalnet
22
- * @package Novalnet_Payment
23
- * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
- */
26
- $code = $this->getMethodCode();
27
- $helper = Mage::helper('novalnet_payment');
28
- $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
29
- $ccRefill = $this->getMethod()->getNovalnetConfig('auto_refill', true);
30
- // get quote billing address
31
- $billingaddress = Mage::getSingleton('adminhtml/session_quote')->getQuote()->getBillingAddress();
32
- ?>
33
- <fieldset class="form-list" id="fieldset_<?php echo $code ?>">
34
- <!--{{{ Payment Logo -->
35
- <div>
36
- <a href="<?php echo $helper->getNovalnetUrl(); ?>" target="_new" style="text-decoration:none;float:none;">
37
- <?php foreach ($this->getCcAvailableTypes() as $typeCode => $typeName): ?>
38
- <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $typeCode . ".png"; ?>
39
- <img style="height:20px;display:inline;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
40
- <?php endforeach; ?>
41
- </a>
42
- </div>
43
- <!--}}} Payment Logo -->
44
- <!--{{{ Novalnet Cc Form -->
45
- <ul id="payment_form_<?php echo $code ?>" style="display:none">
46
- <div class="nnccloader" id='cc_loading' style='display:none;'></div>
47
- <li>
48
- <?php echo $this->__('The amount will be debited from your credit card once the order is submitted'); ?>
49
- </li>
50
- <?php if ($this->getUserInfo()): ?>
51
- <li>
52
- <?php echo $this->getUserInfo() ?>
53
- </li>
54
- <?php endif ?>
55
- <?php if (Mage::helper('novalnet_payment')->getModel('novalnetCc')->getNovalnetConfig('live_mode', true) == 0): ?>
56
- <li>
57
- <div style="font-weight:bold;color:red;font-size:12px;">
58
- <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
59
- </div>
60
- </li>
61
- <?php endif ?>
62
- <li>
63
- <div class="input-box">
64
- <label for="<?php echo $code ?>_cc_owner"><?php echo $this->__('NN CC holder') ?><span class="required">*</span></label><br/>
65
- <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="required-entry input-text" id="<?php echo $code ?>_cc_owner" autocomplete="off" onkeypress="return accHolderValidate(event)" onchange="cchashcall()" value="<?php echo $billingaddress->getFirstname() . ' ' . $billingaddress->getLastname(); ?>" />
66
- </div>
67
- </li>
68
- <li>
69
- <div class="input-box">
70
- <label for="<?php echo $code ?>_cc_number"><?php echo $this->__('NN CC number') ?><span class="required">*</span></label><br/>
71
- <input type="text" id="<?php echo $code ?>_cc_number" title="<?php echo $this->__('Credit Card Number') ?>" class="required-entry input-text" autocomplete="off" onchange="cchashcall()" onkeypress="return isNumberKey(event,true)" value="" />
72
- </div>
73
- </li>
74
- <li>
75
- <div class="input-box">
76
- <label for="<?php echo $code ?>_expiration"><?php echo $this->__('NN Expiration Date') ?><span class="required">*</span></label><br />
77
- <select id="<?php echo $code ?>_expiration" style="width:140px;" onchange="cchashcall()" class="month validate-cc-exp required-entry">
78
- <option value=""><?php echo $this->__('Month'); ?></option>
79
- <?php foreach ($this->getCcMonths() as $k => $v): ?>
80
- <option value="<?php echo $k ?>"><?php echo $v ?></option>
81
- <?php endforeach; ?>
82
- </select>
83
- <select id="<?php echo $code ?>_expiration_yr" style="width:103px;" onchange="cchashcall()" class="required-entry">
84
- <option value=""><?php echo $this->__('Year'); ?></option>
85
- <?php foreach ($this->getCcYears() as $k => $v): ?>
86
- <option value="<?php echo $k ?>"><?php echo $v ?></option>
87
- <?php endforeach; ?>
88
- </select>
89
- </div>
90
- </li>
91
- <li>
92
- <div class="input-box">
93
- <label for="<?php echo $code ?>_cc_cid"><?php echo $this->__('NN CVC') ?><span class="required">*</span></label><br />
94
- <input type="text" title="<?php echo $this->__('Card Verification Number') ?>" onkeypress="return isNumberKey(event, false)" class="required-entry input-text validate-cc-cvn" id="<?php echo $code ?>_cc_cid" name="payment[nn_cc_cid]" style="width:3em;" autocomplete="off" />
95
- </div>
96
- </li>
97
- </ul>
98
-
99
- <input type="hidden" id="original_vendor_id" value="<?php echo trim($this->getMethod()->getNovalnetConfig('merchant_id', true)) ?>" />
100
- <input type="hidden" id="original_vendor_authcode" value="<?php echo trim($this->getMethod()->getNovalnetConfig('auth_code', true)) ?>" />
101
- <input type="hidden" id="novalnet_cc_pan_hash" value="<?php
102
- echo $ccRefill ? $assignDatahelper->getCheckout()->getCcPanHash() : '';
103
- ?>" />
104
- <input type="hidden" name="novalnet_cc_hash" id="novalnet_cc_hash" value="" />
105
- <input type="hidden" name="novalnet_cc_unique_id" id="novalnet_cc_unique_id" value="<?php echo $ccRefill ? $assignDatahelper->getCheckout()->getCcUniqueId() : '';
106
- ?>" />
107
- <input type="hidden" id="nn_cc_merchant_validate_error_message" value="<?php echo $this->__('Basic parameter not valid') . '!'; ?>" />
108
- <input type="hidden" id="nn_cc_validate_error_message" value="<?php echo $this->__('Your credit card details are invalid') . '!'; ?>" />
109
- <!--}}} Novalnet Cc Form -->
110
- </fieldset>
111
- <style>
112
- .nnccloader {
113
- position: fixed;
114
- left: 0px;
115
- top: 0px;
116
- width: 100%;
117
- height: 100%;
118
- z-index: 9999;
119
- background: url('<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif') 50% 50% no-repeat;
120
- }
121
- </style>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/adminhtml/default/default/template/novalnet/payment/method/form/Invoice.phtml CHANGED
@@ -28,12 +28,14 @@ $helper = Mage::helper('novalnet_payment');
28
  ?>
29
  <fieldset class="form-list">
30
  <!-- PAYMENT LOGO -->
31
- <div>
32
- <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
33
- <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "invoice.png"; ?>
34
- <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
35
- </a>
36
- </div>
 
 
37
  <!-- PAYMENT LOGO -->
38
  <ul id="payment_form_<?php echo $code ?>" style="display:none">
39
  <!--{{{ PAYMENT DESCRIPTION -->
28
  ?>
29
  <fieldset class="form-list">
30
  <!-- PAYMENT LOGO -->
31
+ <?php if ($helper->getModel($code)->getNovalnetConfig('enable_payment_logo', true)): ?>
32
+ <div>
33
+ <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
34
+ <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "invoice.png"; ?>
35
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
36
+ </a>
37
+ </div>
38
+ <?php endif; ?>
39
  <!-- PAYMENT LOGO -->
40
  <ul id="payment_form_<?php echo $code ?>" style="display:none">
41
  <!--{{{ PAYMENT DESCRIPTION -->
app/design/adminhtml/default/default/template/novalnet/payment/method/form/Prepayment.phtml CHANGED
@@ -28,12 +28,14 @@ $helper = Mage::helper('novalnet_payment');
28
  ?>
29
  <fieldset class="form-list">
30
  <!-- PAYMENT LOGO -->
31
- <div>
32
- <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
33
- <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "prepayment.png"; ?>
34
- <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
35
- </a>
36
- </div>
 
 
37
  <!-- PAYMENT LOGO -->
38
  <ul id="payment_form_<?php echo $code ?>" style="display:none">
39
  <!--{{{ PAYMENT DESCRIPTION -->
28
  ?>
29
  <fieldset class="form-list">
30
  <!-- PAYMENT LOGO -->
31
+ <?php if ($helper->getModel($code)->getNovalnetConfig('enable_payment_logo', true)): ?>
32
+ <div>
33
+ <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
34
+ <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "prepayment.png"; ?>
35
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
36
+ </a>
37
+ </div>
38
+ <?php endif; ?>
39
  <!-- PAYMENT LOGO -->
40
  <ul id="payment_form_<?php echo $code ?>" style="display:none">
41
  <!--{{{ PAYMENT DESCRIPTION -->
app/design/adminhtml/default/default/template/novalnet/payment/method/form/Sepa.phtml CHANGED
@@ -26,7 +26,7 @@
26
  $code = $this->getMethodCode();
27
  $helper = Mage::helper('novalnet_payment');
28
  $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
29
- $sepaRefill = $this->getMethod()->getNovalnetConfig('auto_refill', true);
30
  $sepaPaymentRefill = $this->getMethod()->getConfigData('sepa_payment_refill');
31
  $refillValues = $assignDatahelper->getCheckout()->getRefilldatavalues();
32
  $refillMethod = ($sepaRefill && $refillValues && $code == $refillValues->getMethod());
@@ -45,15 +45,17 @@ $panhash = (($sepaPaymentRefill || $sepaRefill) && $panhash) ? $panhash : '';
45
  ?>
46
  <fieldset class="form-list" id="fieldset_<?php echo $code ?>">
47
  <!--{{{ Payment Logo -->
48
- <div>
49
- <a href="<?php echo $helper->getNovalnetUrl(); ?>" target="_new" style="text-decoration:none;">
50
- <?php
51
- $image = "sepa.png";
52
- $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
53
- ?>
54
- <img src="<?php echo $imgpath; ?>" alt="<?php echo $this->getMethod()->getConfigData('title'); ?>" title="<?php echo $this->getMethod()->getConfigData('title'); ?>" />
55
- </a>
56
- </div>
 
 
57
  <!--}}} Payment Logo -->
58
  <!--{{{ Novalnet SEPA Form -->
59
  <ul id="payment_form_<?php echo $code ?>" style="display:none">
26
  $code = $this->getMethodCode();
27
  $helper = Mage::helper('novalnet_payment');
28
  $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
29
+ $sepaRefill = $this->getMethod()->getNovalnetConfig('auto_refill');
30
  $sepaPaymentRefill = $this->getMethod()->getConfigData('sepa_payment_refill');
31
  $refillValues = $assignDatahelper->getCheckout()->getRefilldatavalues();
32
  $refillMethod = ($sepaRefill && $refillValues && $code == $refillValues->getMethod());
45
  ?>
46
  <fieldset class="form-list" id="fieldset_<?php echo $code ?>">
47
  <!--{{{ Payment Logo -->
48
+ <?php if ($helper->getModel($code)->getNovalnetConfig('enable_payment_logo', true)): ?>
49
+ <div>
50
+ <a href="<?php echo $helper->getNovalnetUrl(); ?>" target="_new" style="text-decoration:none;">
51
+ <?php
52
+ $image = "sepa.png";
53
+ $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
54
+ ?>
55
+ <img src="<?php echo $imgpath; ?>" alt="<?php echo $this->getMethod()->getConfigData('title'); ?>" title="<?php echo $this->getMethod()->getConfigData('title'); ?>" />
56
+ </a>
57
+ </div>
58
+ <?php endif; ?>
59
  <!--}}} Payment Logo -->
60
  <!--{{{ Novalnet SEPA Form -->
61
  <ul id="payment_form_<?php echo $code ?>" style="display:none">
app/design/adminhtml/default/default/template/novalnet/payment/method/info/Cc.phtml CHANGED
@@ -29,7 +29,7 @@ $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditiona
29
  $helper = Mage::helper('novalnet_payment');
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
- $nextCycleDate = $helper->getCycleDate($nextCycleId);
33
  if ($_info):
34
  ?>
35
  <?php
29
  $helper = Mage::helper('novalnet_payment');
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
+ $nextCycleDate = $this->getAdditionalData('paidUntil') ? $this->getAdditionalData('paidUntil') : '';
33
  if ($_info):
34
  ?>
35
  <?php
app/design/adminhtml/default/default/template/novalnet/payment/method/info/Giropay.phtml ADDED
@@ -0,0 +1,49 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the payment module of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ $_info = $this->getInfo();
27
+ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('NnTid') : $_info->getLastTransId();
28
+ $helper = Mage::helper('novalnet_payment');
29
+ $currentTime = $this->getAdditionalData('voidCreateAt');
30
+ if ($_info):
31
+ ?>
32
+ <?php
33
+ if ($this->getAdditionalData('NnTestOrder'))
34
+ echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
35
+ ?>
36
+ <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
37
+ <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>
38
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>
39
+ <?php
40
+ if ($this->getAdditionalData('refunded_tid')):
41
+ foreach ($this->getAdditionalData('refunded_tid') as $key => $value):
42
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s', $helper->makeValidNumber($value['reqtid']), $value['refamount']) . '<br><br>';
43
+ endforeach;
44
+ endif;
45
+ ?>
46
+ <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
47
+ <?php else: ?>
48
+ <?php echo $this->__('Error in getting payment method') ?>
49
+ <?php endif; ?>
app/design/adminhtml/default/default/template/novalnet/payment/method/info/Invoice.phtml CHANGED
@@ -30,7 +30,7 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditionalData('NnSepaParentTid') : $this->getAdditionalData('NnTid');
33
- $nextCycleDate = $helper->getCycleDate($nextCycleId);
34
  ?>
35
  <?php if ($_info): ?>
36
  <?php
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditionalData('NnSepaParentTid') : $this->getAdditionalData('NnTid');
33
+ $nextCycleDate = $this->getAdditionalData('paidUntil') ? $this->getAdditionalData('paidUntil') : '';
34
  ?>
35
  <?php if ($_info): ?>
36
  <?php
app/design/adminhtml/default/default/template/novalnet/payment/method/info/Prepayment.phtml CHANGED
@@ -30,7 +30,7 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditionalData('NnSepaParentTid') : $this->getAdditionalData('NnTid');
33
- $nextCycleDate = $helper->getCycleDate($nextCycleId);
34
  ?>
35
  <?php if ($_info): ?>
36
  <?php
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditionalData('NnSepaParentTid') : $this->getAdditionalData('NnTid');
33
+ $nextCycleDate = $this->getAdditionalData('paidUntil') ? $this->getAdditionalData('paidUntil') : '';
34
  ?>
35
  <?php if ($_info): ?>
36
  <?php
app/design/adminhtml/default/default/template/novalnet/payment/method/info/Sepa.phtml CHANGED
@@ -29,7 +29,7 @@ $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditiona
29
  $helper = Mage::helper('novalnet_payment');
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
- $nextCycleDate = $helper->getCycleDate($nextCycleId);
33
  if ($_info):
34
  ?>
35
  <?php
29
  $helper = Mage::helper('novalnet_payment');
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
+ $nextCycleDate = $this->getAdditionalData('paidUntil') ? $this->getAdditionalData('paidUntil') : '';
33
  if ($_info):
34
  ?>
35
  <?php
app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Cc.phtml CHANGED
@@ -29,7 +29,7 @@ $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditiona
29
  $helper = Mage::helper('novalnet_payment');
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
- $nextCycleDate = $helper->getCycleDate($nextCycleId);
33
  if ($_info):
34
  ?>
35
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
29
  $helper = Mage::helper('novalnet_payment');
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
+ $nextCycleDate = $this->getAdditionalData('paidUntil') ? $this->getAdditionalData('paidUntil') : '';
33
  if ($_info):
34
  ?>
35
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Giropay.phtml ADDED
@@ -0,0 +1,49 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the payment module of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ $_info = $this->getInfo();
27
+ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('NnTid') : $_info->getLastTransId();
28
+ $helper = Mage::helper('novalnet_payment');
29
+ $currentTime = $this->getAdditionalData('voidCreateAt');
30
+ if ($_info):
31
+ ?>
32
+ <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
33
+ <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?>{{pdf_row_separator}}
34
+ <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>{{pdf_row_separator}}
35
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>{{pdf_row_separator}}
36
+ <?php
37
+ if ($this->getAdditionalData('refunded_tid')):
38
+ foreach ($this->getAdditionalData('refunded_tid') as $key => $value):
39
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s', $helper->makeValidNumber($value['reqtid']), $value['refamount']) . '<br><br>';
40
+ ?>
41
+ {{pdf_row_separator}}
42
+ <?php
43
+ endforeach;
44
+ endif;
45
+ ?>{{pdf_row_separator}}
46
+ <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
47
+ <?php else: ?>
48
+ <?php echo $this->__('Error in getting payment method') ?>
49
+ <?php endif; ?>
app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Invoice.phtml CHANGED
@@ -30,7 +30,7 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditionalData('NnSepaParentTid') : $this->getAdditionalData('NnTid');
33
- $nextCycleDate = $helper->getCycleDate($nextCycleId);
34
  ?>
35
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
36
  <strong><?php echo Mage::helper('novalnet_payment')->__('%s', $this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditionalData('NnSepaParentTid') : $this->getAdditionalData('NnTid');
33
+ $nextCycleDate = $this->getAdditionalData('paidUntil') ? $this->getAdditionalData('paidUntil') : '';
34
  ?>
35
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
36
  <strong><?php echo Mage::helper('novalnet_payment')->__('%s', $this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Prepayment.phtml CHANGED
@@ -30,7 +30,8 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditionalData('NnSepaParentTid') : $this->getAdditionalData('NnTid');
33
- $nextCycleDate = $helper->getCycleDate($nextCycleId);
 
34
  ?>
35
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
36
  <strong><?php echo Mage::helper('novalnet_payment')->__('%s', $this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditionalData('NnSepaParentTid') : $this->getAdditionalData('NnTid');
33
+ $nextCycleDate = $this->getAdditionalData('paidUntil') ? $this->getAdditionalData('paidUntil') : '';
34
+
35
  ?>
36
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
37
  <strong><?php echo Mage::helper('novalnet_payment')->__('%s', $this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
app/design/adminhtml/default/default/template/novalnet/payment/method/pdf/Sepa.phtml CHANGED
@@ -29,7 +29,7 @@ $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditiona
29
  $helper = Mage::helper('novalnet_payment');
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
- $nextCycleDate = $helper->getCycleDate($nextCycleId);
33
  if ($_info):
34
  ?>
35
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
29
  $helper = Mage::helper('novalnet_payment');
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
+ $nextCycleDate = $this->getAdditionalData('paidUntil') ? $this->getAdditionalData('paidUntil') : '';
33
  if ($_info):
34
  ?>
35
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
app/design/adminhtml/default/default/template/novalnet/sales/order/view/info.phtml CHANGED
@@ -209,7 +209,9 @@ $getpayment = array(
209
  Novalnet_Payment_Model_Config::NN_PREPAYMENT,
210
  Novalnet_Payment_Model_Config::NN_INVOICE,
211
  Novalnet_Payment_Model_Config::NN_IDEAL,
212
- Novalnet_Payment_Model_Config::NN_SOFORT
 
 
213
  );
214
  if (in_array($paymentname, $getpayment)):
215
  $firstName = $_order->getBillingAddress()->getData('firstname');
@@ -225,7 +227,7 @@ if (in_array($paymentname, $getpayment)):
225
  <table>
226
  <tr>
227
  <td>
228
- <input type='radio' name='refund_payment_type' id='refund_payment_type_none' value='NONE' checked onclick="refund_payment_type_element_handle('none');"/> <?php echo Mage::helper('sales')->__('None'); ?>
229
  <input type='radio' name='refund_payment_type' id='refund_payment_type_sepa' value='SEPA' onclick="refund_payment_type_element_handle();"/> <?php echo Mage::helper('sales')->__('Novalnet Direct Debit SEPA'); ?>
230
  </td>
231
  </tr>
209
  Novalnet_Payment_Model_Config::NN_PREPAYMENT,
210
  Novalnet_Payment_Model_Config::NN_INVOICE,
211
  Novalnet_Payment_Model_Config::NN_IDEAL,
212
+ Novalnet_Payment_Model_Config::NN_SOFORT,
213
+ Novalnet_Payment_Model_Config::NN_EPS,
214
+ Novalnet_Payment_Model_Config::NN_GIROPAY
215
  );
216
  if (in_array($paymentname, $getpayment)):
217
  $firstName = $_order->getBillingAddress()->getData('firstname');
227
  <table>
228
  <tr>
229
  <td>
230
+ <input type='radio' name='refund_payment_type' id='refund_payment_type_none' value='NONE' checked onclick="refund_payment_type_element_handle('none');"/> <?php echo $this->__('Novalnet None'); ?>
231
  <input type='radio' name='refund_payment_type' id='refund_payment_type_sepa' value='SEPA' onclick="refund_payment_type_element_handle();"/> <?php echo Mage::helper('sales')->__('Novalnet Direct Debit SEPA'); ?>
232
  </td>
233
  </tr>
app/design/adminhtml/default/default/template/novalnet/sales/order/view/tab/info.phtml CHANGED
@@ -31,6 +31,10 @@ $paymentObj = $payment->getMethodInstance();
31
  $data = unserialize($payment->getAdditionalData());
32
  $parentTid = isset($data['NnTid']) ? $data['NnTid'] : '';
33
  $sepaparentTid = isset($data['NnSepaParentTid']) ? $data['NnSepaParentTid'] : '';
 
 
 
 
34
  ?>
35
  <div>
36
  <div id="order-messages">
@@ -80,17 +84,14 @@ $sepaparentTid = isset($data['NnSepaParentTid']) ? $data['NnSepaParentTid'] : '
80
  $amount = $helper->getAmountCollection($_order->getId(), 1, 0);
81
  $amount = !$amount ? $amount : $grandTotal;
82
  $amount = $helper->getFormatedAmount($amount);
83
-
84
  if (in_array($paymentname, array_merge($sepapayment,$invoicepayment))) {
85
- $statusCall = $paymentObj->doNovalnetStatusCall($checkTidExist,$payment);
86
  }
87
-
88
  $amount = '';
89
  $date = '';
90
-
91
  if ($status == 99 && $getTransactionStatus->getTransactionStatus() && in_array($paymentname, $sepapayment)
92
  && $_order->canInvoice()) {
93
- $amount = $statusCall->getAmount();
94
  ?>
95
  <div class="entry-edit">
96
  <div class="entry-edit-head">
@@ -111,8 +112,8 @@ $sepaparentTid = isset($data['NnSepaParentTid']) ? $data['NnSepaParentTid'] : '
111
  <?php
112
  } else if ($status == 100 && in_array($paymentname, $invoicepayment)
113
  && ($paid == 1 || !$paid)) {
114
- $amount = $statusCall->getAmount();
115
- $date = $statusCall->getInvoiceDueDate();
116
  ?>
117
  <div class="entry-edit">
118
  <div class="entry-edit-head">
@@ -244,20 +245,11 @@ $sepaparentTid = isset($data['NnSepaParentTid']) ? $data['NnSepaParentTid'] : '
244
 
245
  function novalnetAllowNumeric(evt) {
246
 
247
- var charCode = (evt.which) ? evt.which : evt.keyCode
248
-
249
- if((charCode == 35 || charCode == 36 ||charCode == 37
250
- || charCode == 39) && evt.shiftKey == false) {
251
- return true;
252
- }
253
- else if((evt.ctrlKey == true && charCode == 114)|| charCode == 116) {
254
- return true;
255
- }
256
- else if(charCode > 31 && (charCode < 48 || charCode > 57)) {
257
- return false;
258
- }else{
259
- return true;
260
- }
261
  }
262
 
263
  function reformatDate(dateStr)
@@ -281,7 +273,6 @@ $sepaparentTid = isset($data['NnSepaParentTid']) ? $data['NnSepaParentTid'] : '
281
  var dt_year = dt_array[1];
282
  }
283
 
284
-
285
  if ((one == 1 || paymentcode == 'novalnetPrepayment') && !invoice_duedate && !amountchanged) {
286
  alert(lang1);
287
  return false;
31
  $data = unserialize($payment->getAdditionalData());
32
  $parentTid = isset($data['NnTid']) ? $data['NnTid'] : '';
33
  $sepaparentTid = isset($data['NnSepaParentTid']) ? $data['NnSepaParentTid'] : '';
34
+ preg_match('|<span id="due_date">(.+?)</span>|s', $this->getPaymentHtml(), $match);
35
+ if($match) {
36
+ $due_date = date("Y-m-d", strtotime($match['1'] .' +1 day'));
37
+ }
38
  ?>
39
  <div>
40
  <div id="order-messages">
84
  $amount = $helper->getAmountCollection($_order->getId(), 1, 0);
85
  $amount = !$amount ? $amount : $grandTotal;
86
  $amount = $helper->getFormatedAmount($amount);
 
87
  if (in_array($paymentname, array_merge($sepapayment,$invoicepayment))) {
88
+ $update_details = $paymentObj->updatedAmount($checkTidExist);
89
  }
 
90
  $amount = '';
91
  $date = '';
 
92
  if ($status == 99 && $getTransactionStatus->getTransactionStatus() && in_array($paymentname, $sepapayment)
93
  && $_order->canInvoice()) {
94
+ $amount = $helper->getFormatedAmount($update_details->getAmount());
95
  ?>
96
  <div class="entry-edit">
97
  <div class="entry-edit-head">
112
  <?php
113
  } else if ($status == 100 && in_array($paymentname, $invoicepayment)
114
  && ($paid == 1 || !$paid)) {
115
+ $amount = $helper->getFormatedAmount($update_details->getAmount());
116
+ $date = $due_date;
117
  ?>
118
  <div class="entry-edit">
119
  <div class="entry-edit-head">
245
 
246
  function novalnetAllowNumeric(evt) {
247
 
248
+ var keycode = ( 'which' in evt ) ? evt.which : evt.keyCode,
249
+ event = evt || window.evt,
250
+ reg = '' ;
251
+ var reg = /^(?:[0-9]+$)/;
252
+ return ( reg.test( String.fromCharCode( keycode ) ) || keycode == 0 || keycode == 8 );
 
 
 
 
 
 
 
 
 
253
  }
254
 
255
  function reformatDate(dateStr)
273
  var dt_year = dt_array[1];
274
  }
275
 
 
276
  if ((one == 1 || paymentcode == 'novalnetPrepayment') && !invoice_duedate && !amountchanged) {
277
  alert(lang1);
278
  return false;
app/design/frontend/base/default/layout/novalnet.xml CHANGED
@@ -31,12 +31,17 @@
31
  <action method="addJs">
32
  <script>novalnet/novalnetJquery.js</script>
33
  </action>
34
- <action method="addJs">
35
- <script>novalnet/novalnetcc.js</script>
36
- </action>
37
  <action method="addJs">
38
  <script>novalnet/novalnetsepa.js</script>
39
  </action>
40
  </reference>
41
  </checkout_onepage_index>
 
 
 
 
 
 
 
 
42
  </layout>
31
  <action method="addJs">
32
  <script>novalnet/novalnetJquery.js</script>
33
  </action>
 
 
 
34
  <action method="addJs">
35
  <script>novalnet/novalnetsepa.js</script>
36
  </action>
37
  </reference>
38
  </checkout_onepage_index>
39
+ <!-- Adjusts Credit Card hosted page loaded in iframe -->
40
+ <novalnet_payment_novalnetcc_index>
41
+ <reference name="root">
42
+ <remove name="right"/>
43
+ <remove name="left"/>
44
+ </reference>
45
+ </novalnet_payment_novalnetcc_index>
46
+ <!-- Adjusts Credit Card hosted page loaded in iframe -->
47
  </layout>
app/design/frontend/base/default/template/novalnet/payment/method/form/Banktransfer.phtml CHANGED
@@ -28,15 +28,17 @@ $helper = Mage::helper('novalnet_payment');
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!--{{{ Payment Logo -->
31
- <div>
32
- <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
33
- <?php
34
- $image = "banktransfer.png";
35
- $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
36
- ?>
37
- <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
38
- </a>
39
- </div>
 
 
40
  <!--}}} Payment Logo -->
41
  <!--{{{ Payment Description -->
42
  <li>
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!--{{{ Payment Logo -->
31
+ <?php if ($helper->getModel($code)->getNovalnetConfig('enable_payment_logo', true)): ?>
32
+ <div>
33
+ <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
34
+ <?php
35
+ $image = "banktransfer.png";
36
+ $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
37
+ ?>
38
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
39
+ </a>
40
+ </div>
41
+ <?php endif; ?>
42
  <!--}}} Payment Logo -->
43
  <!--{{{ Payment Description -->
44
  <li>
app/design/frontend/base/default/template/novalnet/payment/method/form/Cc.phtml CHANGED
@@ -25,39 +25,24 @@
25
  */
26
  $code = $this->getMethodCode();
27
  $helper = Mage::helper('novalnet_payment');
28
- $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
29
- $refillValues = $assignDatahelper->getCheckout()->getRefilldatavalues();
30
- $creditCardSecure = $this->getMethod()->getConfigData('active_cc3d');
31
- $ccRefill = $this->getMethod()->getNovalnetConfig('auto_refill', true);
32
- // get quote billing address
33
- $checkoutSession = Mage::getSingleton('checkout/session');
34
- $billingaddress = $checkoutSession->getQuote()->getBillingAddress();
35
- $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getTelephone())
36
- ? $billingaddress->getTelephone() : '' ;
37
- $vendorId = $checkoutSession->getNnVendor()
38
- ? $checkoutSession->getNnVendor() : trim($this->getMethod()->getNovalnetConfig('merchant_id', true));
39
- $authCode = $checkoutSession->getNnAuthcode()
40
- ? $checkoutSession->getNnAuthcode() : trim($this->getMethod()->getNovalnetConfig('auth_code', true));
41
  ?>
42
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
43
  <!--{{{ Payment Logo -->
44
- <div>
45
- <a href="<?php echo $helper->getNovalnetUrl(); ?>" target="_new" style="text-decoration:none;float:none;">
46
- <?php foreach ($this->getCcAvailableTypes() as $typeCode => $typeName): ?>
47
- <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $typeCode . ".png"; ?>
48
- <img style="height:20px;display:inline;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
49
- <?php endforeach; ?>
50
- </a>
51
- </div>
 
 
52
  <!--}}} Payment Logo -->
53
- <!--{{{ Novalnet Cc Form -->
54
- <div class="nnccloader" id='cc_loading' style='display:none;'></div>
55
  <li>
56
  <?php
57
- echo $this->__('The amount will be debited from your credit card once the order is submitted');
58
- if ($this->getMethod()->getConfigData('active_cc3d')):
59
- echo "<br>".$this->__('Please don’t close the browser after successful payment, until you have been redirected back to the Shop');
60
- endif;
61
  ?>
62
  </li>
63
  <?php if ($this->getUserInfo()): ?>
@@ -65,124 +50,11 @@ $authCode = $checkoutSession->getNnAuthcode()
65
  <?php echo $this->getUserInfo() ?>
66
  </li>
67
  <?php endif ?>
68
- <?php if (Mage::helper('novalnet_payment')->getModel('novalnetCc')->getNovalnetConfig('live_mode', true) == 0): ?>
69
  <li>
70
  <div style="font-weight:bold;color:red;font-size:12px;">
71
  <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
72
  </div>
73
  </li>
74
  <?php endif ?>
75
- <li>
76
- <label for="<?php echo $code ?>_cc_owner" class="required"><em>*</em><?php echo $this->__('NN CC holder') ?></label>
77
- <div class="input-box">
78
- <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="required-entry input-text" id="<?php echo $code ?>_cc_owner" autocomplete="off" onkeypress="return accHolderValidate(event)" onchange="cchashcall()" value="<?php echo $billingaddress->getFirstname() . ' ' . $billingaddress->getLastname(); ?>" />
79
- </div>
80
- </li>
81
- <li>
82
- <label for="<?php echo $code ?>_cc_number" class="required"><em>*</em><?php echo $this->__('NN CC number') ?></label>
83
- <div class="input-box">
84
- <input type="text" id="<?php echo $code ?>_cc_number" title="<?php echo $this->__('Credit Card Number') ?>" class="required-entry input-text validate-cc-number validate-cc-type" autocomplete="off" onchange="cchashcall()" onkeypress="return isNumberKey(event,true)" value="" />
85
- </div>
86
- </li>
87
- <li>
88
- <label for="<?php echo $code ?>_expiration" class="required"><em>*</em><?php echo $this->__('NN Expiration Date') ?></label>
89
- <div class="input-box">
90
- <div class="v-fix">
91
- <select id="<?php echo $code ?>_expiration" onchange="cchashcall()" class="month validate-cc-exp required-entry" name="<?php echo $code ?>_expiration">
92
- <option value=""><?php echo $this->__('Month'); ?></option>
93
- <?php foreach ($this->getCcMonths() as $k => $v): ?>
94
- <option value="<?php echo $k ?>"><?php echo $v ?></option>
95
- <?php endforeach; ?>
96
- </select>
97
- </div>
98
- <div class="v-fix">
99
- <select id="<?php echo $code ?>_expiration_yr" onchange="cchashcall()" class="year required-entry" name="<?php echo $code ?>_expiration_yr">
100
- <option value=""><?php echo $this->__('Year'); ?></option>
101
- <?php foreach ($this->getCcYears() as $k => $v): ?>
102
- <option value="<?php echo $k ?>"><?php echo $v ?></option>
103
- <?php endforeach; ?>
104
- </select>
105
- </div>
106
- </div>
107
- </li>
108
- <li>
109
- <label for="<?php echo $code ?>_cc_cid" class="required"><em>*</em><?php echo $this->__('NN CVC') ?></label>
110
- <div class="input-box">
111
- <div class="v-fix">
112
- <input type="text" title="<?php echo $this->__('Card Verification Number') ?>" class="input-text cvv required-entry validate-cc-cvn" id="<?php echo $code ?>_cc_cid" name="payment[nn_cc_cid]" value="" onkeypress="return isNumberKey(event, false);"/>
113
- </div>
114
- <a href="#" class="cvv-what-is-this"><?php echo $this->__('What is this?') ?></a>
115
- </div>
116
- </li>
117
- <!--{{{ CallbackType-->
118
- <?php if (!$creditCardSecure && $this->isCallbackTypeCall()): ?>
119
- <!--{{{ PIN by Callback-->
120
- <?php
121
- if ($this->getCallbackConfigData() != 3):
122
- ?>
123
- <li>
124
- <label for="<?php echo $code ?>_callback_tel" class="required"><em>*</em>
125
- <?php if ($this->getCallbackConfigData() == 2): ?>
126
- <?php echo $this->__('Mobile phone number'); ?>
127
- <?php else: ?>
128
- <?php echo $this->__('NN Mobile Number'); ?>
129
- <?php endif; ?>
130
- </label>
131
- <div class="input-box">
132
- <input type="text" autocomplete="off" id="<?php echo $code ?>_callback_tel" name="payment[callback_tel]" title="<?php echo $this->__('Callback') ?>" class="required-entry input-text validate-number" value="<?php echo $telephoneNumber; ?>"/>
133
- </div>
134
- </li>
135
- <li>
136
- <div class="nncallbacknote">
137
- <?php echo $this->__('Note for pin by sms and callback') ?>
138
- </div>
139
- <label for="<?php echo $code ?>_callback_pin" class="required"><em>*</em><?php echo $this->__('PIN') ?></label>
140
- <div class="input-box">
141
- <input onkeydown="document.getElementById('<?php echo $code ?>_new_callback_pin').checked = false;" size="4" type="text" id="<?php echo $code ?>_callback_pin" name="payment[callback_pin]" title="<?php echo $this->__('Callback') ?>" class="input-text" /><br/>
142
- <input id="<?php echo $code ?>_new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
143
- <label style="float:none;" for="<?php echo $code ?>_new_callback_pin"><?php echo $this->__('Forgot PIN? [New PIN Request]') ?></label>
144
- </div>
145
- </li>
146
- <!--}}} PIN by Callback-->
147
- <!--{{{ Reply by Email-->
148
- <?php elseif ($this->getCallbackConfigData() == 3): ?>
149
- <li>
150
- <label for="<?php echo $code ?>_callback_email" class="required"><em>*</em><?php echo $this->__('E-mail Address') ?></label>
151
- <div class="input-box">
152
- <input type="text" autocomplete="off" id="<?php echo $code ?>_callback_email" name="payment[callback_email]" title="<?php echo $this->__('Callback Email') ?>" class="input-text validate-email required-entry" value="<?php echo $billingaddress->getEmail(); ?>"/>
153
- </div>
154
- </li>
155
- <?php endif ?>
156
- <!--}}} Reply by Email-->
157
- <?php endif ?>
158
- <!--}}} CallbackType-->
159
- <input type="hidden" id="original_vendor_id" value="<?php echo $vendorId ?>" />
160
- <input type="hidden" id="original_vendor_authcode" value="<?php echo $authCode ?>" />
161
- <input type="hidden" id="novalnet_cc_pan_hash" value="<?php echo $ccRefill ? $assignDatahelper->getCheckout()->getCcPanHash() : ''; ?>" />
162
- <input type="hidden" name="novalnet_cc_hash" id="novalnet_cc_hash" value="" />
163
- <input type="hidden" name="novalnet_cc_unique_id" id="novalnet_cc_unique_id" value="<?php echo $ccRefill ? $assignDatahelper->getCheckout()->getCcUniqueId() : ''; ?>" />
164
- <input type="hidden" id="nn_cc_merchant_validate_error_message" value="<?php echo $this->__('Basic parameter not valid') . '!'; ?>" />
165
- <input type="hidden" id="nn_cc_validate_error_message" value="<?php echo $this->__('Your credit card details are invalid') . '!'; ?>" />
166
- <!--}}} Novalnet Cc Form -->
167
  </ul>
168
- <style>
169
- .nnccloader {
170
- position: fixed;
171
- left: 0px;
172
- top: 0px;
173
- width: 100%;
174
- height: 100%;
175
- z-index: 9999;
176
- background: url('<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif') 50% 50% no-repeat;
177
- }
178
- .nncallbacknote {
179
- font-weight:bold;
180
- font-size:11px;
181
- color:gray;
182
- border:1px solid #BFBFBF;
183
- background:#FEFFBF;
184
- padding:10px;
185
- margin-top:10px;
186
- width:400px;
187
- }
188
- </style>
25
  */
26
  $code = $this->getMethodCode();
27
  $helper = Mage::helper('novalnet_payment');
 
 
 
 
 
 
 
 
 
 
 
 
 
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!--{{{ Payment Logo -->
31
+ <?php if ($helper->getModel($code)->getNovalnetConfig('enable_payment_logo', true)): ?>
32
+ <div>
33
+ <a href="<?php echo $helper->getNovalnetUrl(); ?>" target="_new" style="text-decoration:none;float:none;">
34
+ <?php foreach ($this->getCcAvailableTypes() as $typeCode => $typeName): ?>
35
+ <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $typeCode . ".png"; ?>
36
+ <img style="display:inline;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
37
+ <?php endforeach; ?>
38
+ </a>
39
+ </div>
40
+ <?php endif; ?>
41
  <!--}}} Payment Logo -->
 
 
42
  <li>
43
  <?php
44
+ echo $this->__('redirect payment description');
45
+ echo "<br>".$this->__('Please don’t close the browser after successful payment, until you have been redirected back to the Shop');
 
 
46
  ?>
47
  </li>
48
  <?php if ($this->getUserInfo()): ?>
50
  <?php echo $this->getUserInfo() ?>
51
  </li>
52
  <?php endif ?>
53
+ <?php if ($helper->getModel('novalnetCc')->getNovalnetConfig('live_mode', true) == 0): ?>
54
  <li>
55
  <div style="font-weight:bold;color:red;font-size:12px;">
56
  <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
57
  </div>
58
  </li>
59
  <?php endif ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
60
  </ul>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/base/default/template/novalnet/payment/method/form/Cciframe.phtml ADDED
@@ -0,0 +1,54 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the payment module of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ ?>
27
+ <?php
28
+ $code = Novalnet_Payment_Model_Config::NN_CC;
29
+ $helper = Mage::helper('novalnet_payment');
30
+ $paymentRequest = $helper->getCheckoutSession()->getPaymentReqData();
31
+ $payportUrl = Novalnet_Payment_Model_Config::CC_PCI_PAYPORT_URL;
32
+
33
+ // Save Transaction request data
34
+ $transactionTraces = $helper->getModelTransactionOverview();
35
+ $transactionTraces->setOrderId($paymentRequest->getOrderNo())
36
+ ->setRequestData(serialize($paymentRequest->getData()))
37
+ ->setCreatedDate($helper->getCurrentDateTime())
38
+ ->save();
39
+ ?>
40
+ <div class="nnloader style='position: fixed; left: z-index: 9999;' " id="nnloader"
41
+ style="background: url('<?php echo $helper->getNovalnetPaymentFormLogoUrl(); ?>novalnet-loading-icon.gif') 70% 60% no-repeat; height: 70px; "></div>
42
+ <?php
43
+ $form = new Varien_Data_Form();
44
+ $html = '<html><body>';
45
+ echo "<form action='$payportUrl' id='$code' name='$code' method='POST' target='cc_iframe'>";
46
+ foreach ($paymentRequest->getData() as $field=>$value) {
47
+ $form->addField($field, 'hidden', array('name'=>$field, 'value'=>$value));
48
+ }
49
+
50
+ $html.= $form->toHtml();
51
+ $html.="<iframe id='cc_iframe' scrolling='no' style='width:100%;height:450px;border:none;' name='cc_iframe' onload=document.getElementById('nnloader').style.display='none'></iframe></form>";
52
+ $html.= '<script type="text/javascript">document.getElementById("' . $code . '").submit();</script>';
53
+ $html.= '</body></html>';
54
+ echo $html;
app/design/frontend/base/default/template/novalnet/payment/method/form/Eps.phtml CHANGED
@@ -28,15 +28,17 @@ $helper = Mage::helper('novalnet_payment');
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!--{{{ Payment Logo -->
31
- <div>
32
- <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
33
- <?php
34
- $image = "eps.png";
35
- $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
36
- ?>
37
- <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
38
- </a>
39
- </div>
 
 
40
  <!--}}} Payment Logo -->
41
  <!--{{{ Payment Description -->
42
  <li>
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!--{{{ Payment Logo -->
31
+ <?php if ($helper->getModel($code)->getNovalnetConfig('enable_payment_logo', true)): ?>
32
+ <div>
33
+ <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
34
+ <?php
35
+ $image = "eps.png";
36
+ $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
37
+ ?>
38
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
39
+ </a>
40
+ </div>
41
+ <?php endif; ?>
42
  <!--}}} Payment Logo -->
43
  <!--{{{ Payment Description -->
44
  <li>
app/design/frontend/base/default/template/novalnet/payment/method/form/Giropay.phtml ADDED
@@ -0,0 +1,63 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the payment module of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ $code = $this->getMethodCode();
27
+ $helper = Mage::helper('novalnet_payment');
28
+ ?>
29
+ <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
+ <!--{{{ Payment Logo -->
31
+ <?php if ($helper->getModel($code)->getNovalnetConfig('enable_payment_logo', true)): ?>
32
+ <div>
33
+ <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
34
+ <?php
35
+ $image = "giropay.png";
36
+ $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
37
+ ?>
38
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
39
+ </a>
40
+ </div>
41
+ <?php endif; ?>
42
+ <!--}}} Payment Logo -->
43
+ <!--{{{ Payment Description -->
44
+ <li>
45
+ <?php
46
+ echo $this->__('redirect payment description');
47
+ echo "<br>".$this->__('Please don’t close the browser after successful payment, until you have been redirected back to the Shop');
48
+ ?>
49
+ </li>
50
+ <?php if ($this->getUserInfo()): ?>
51
+ <li>
52
+ <?php echo $this->getUserInfo() ?>
53
+ </li>
54
+ <?php endif; ?>
55
+ <?php if ($this->getMethod()->getNovalnetConfig('live_mode', true) == 0): ?>
56
+ <li>
57
+ <div style="font-weight:bold;color:red;font-size:12px;">
58
+ <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
59
+ </div>
60
+ </li>
61
+ <?php endif ?>
62
+ <!--}}} Payment Description -->
63
+ </ul>
app/design/frontend/base/default/template/novalnet/payment/method/form/Ideal.phtml CHANGED
@@ -28,15 +28,17 @@ $helper = Mage::helper('novalnet_payment');
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!--{{{ Payment Logo -->
31
- <div>
32
- <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
33
- <?php
34
- $image = "ideal.png";
35
- $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
36
- ?>
37
- <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
38
- </a>
39
- </div>
 
 
40
  <!--}}} Payment Logo -->
41
  <!--{{{ Payment Description -->
42
  <li>
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!--{{{ Payment Logo -->
31
+ <?php if ($helper->getModel($code)->getNovalnetConfig('enable_payment_logo', true)): ?>
32
+ <div>
33
+ <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
34
+ <?php
35
+ $image = "ideal.png";
36
+ $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
37
+ ?>
38
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
39
+ </a>
40
+ </div>
41
+ <?php endif; ?>
42
  <!--}}} Payment Logo -->
43
  <!--{{{ Payment Description -->
44
  <li>
app/design/frontend/base/default/template/novalnet/payment/method/form/Invoice.phtml CHANGED
@@ -31,12 +31,14 @@ $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getT
31
  ?>
32
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
33
  <!-- PAYMENT LOGO -->
34
- <div>
35
- <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
36
- <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "invoice.png"; ?>
37
- <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
38
- </a>
39
- </div>
 
 
40
  <!-- PAYMENT LOGO -->
41
  <!--{{{ PAYMENT DESCRIPTION -->
42
  <li>
@@ -60,6 +62,7 @@ $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getT
60
  <!--{{{ PIN by Callback-->
61
  <?php if ($this->getCallbackConfigData() != 3): ?>
62
  <li>
 
63
  <label for="<?php echo $code ?>_callback_tel" class="required"><em>*</em>
64
  <?php if ($this->getCallbackConfigData() == 2): ?>
65
  <?php echo $this->__('Mobile phone number'); ?>
@@ -82,17 +85,8 @@ $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getT
82
  <label style="float:none;" for="<?php echo $code ?>_new_callback_pin"><?php echo $this->__('Forgot PIN? [New PIN Request]') ?></label>
83
  </div>
84
  </li>
85
- <!--}}} PIN by Callback-->
86
- <!--{{{ Reply by Email-->
87
- <?php elseif ($this->getCallbackConfigData() == 3): ?>
88
- <li>
89
- <label for="<?php echo $code ?>_callback_email" class="required"><em>*</em><?php echo $this->__('E-mail Address') ?></label>
90
- <div class="input-box">
91
- <input type="text" value="<?php echo $billingaddress->getEmail(); ?>" id="<?php echo $code ?>_callback_email" name="payment[callback_email]" title="<?php echo $this->__('Callback Email') ?>" class="input-text validate-email required-entry" />
92
- </div>
93
- </li>
94
  <?php endif ?>
95
- <!--}}} Reply by Email-->
96
  <?php endif ?>
97
  <!--}}} CallbackType-->
98
  </ul>
31
  ?>
32
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
33
  <!-- PAYMENT LOGO -->
34
+ <?php if ($helper->getModel($code)->getNovalnetConfig('enable_payment_logo', true)): ?>
35
+ <div>
36
+ <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
37
+ <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "invoice.png"; ?>
38
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
39
+ </a>
40
+ </div>
41
+ <?php endif; ?>
42
  <!-- PAYMENT LOGO -->
43
  <!--{{{ PAYMENT DESCRIPTION -->
44
  <li>
62
  <!--{{{ PIN by Callback-->
63
  <?php if ($this->getCallbackConfigData() != 3): ?>
64
  <li>
65
+ <p class="required"><?php echo $this->__('* Required Fields') ?></p>
66
  <label for="<?php echo $code ?>_callback_tel" class="required"><em>*</em>
67
  <?php if ($this->getCallbackConfigData() == 2): ?>
68
  <?php echo $this->__('Mobile phone number'); ?>
85
  <label style="float:none;" for="<?php echo $code ?>_new_callback_pin"><?php echo $this->__('Forgot PIN? [New PIN Request]') ?></label>
86
  </div>
87
  </li>
88
+ <!--}}} PIN by Callback-->
 
 
 
 
 
 
 
 
89
  <?php endif ?>
 
90
  <?php endif ?>
91
  <!--}}} CallbackType-->
92
  </ul>
app/design/frontend/base/default/template/novalnet/payment/method/form/Paypal.phtml CHANGED
@@ -28,15 +28,17 @@ $helper = Mage::helper('novalnet_payment');
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!--{{{ Payment Logo -->
31
- <div>
32
- <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
33
- <?php
34
- $image = "paypal.png";
35
- $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
36
- ?>
37
- <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
38
- </a>
39
- </div>
 
 
40
  <!--}}} Payment Logo -->
41
  <!--{{{ Payment Description -->
42
  <li>
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!--{{{ Payment Logo -->
31
+ <?php if ($helper->getModel($code)->getNovalnetConfig('enable_payment_logo', true)): ?>
32
+ <div>
33
+ <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
34
+ <?php
35
+ $image = "paypal.png";
36
+ $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
37
+ ?>
38
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
39
+ </a>
40
+ </div>
41
+ <?php endif; ?>
42
  <!--}}} Payment Logo -->
43
  <!--{{{ Payment Description -->
44
  <li>
app/design/frontend/base/default/template/novalnet/payment/method/form/Prepayment.phtml CHANGED
@@ -28,12 +28,14 @@ $helper = Mage::helper('novalnet_payment');
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!-- PAYMENT LOGO -->
31
- <div>
32
- <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
33
- <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "prepayment.png"; ?>
34
- <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
35
- </a>
36
- </div>
 
 
37
  <!-- PAYMENT LOGO -->
38
  <!--{{{ PAYMENT DESCRIPTION -->
39
  <li>
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!-- PAYMENT LOGO -->
31
+ <?php if ($helper->getModel($code)->getNovalnetConfig('enable_payment_logo', true)): ?>
32
+ <div>
33
+ <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
34
+ <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "prepayment.png"; ?>
35
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
36
+ </a>
37
+ </div>
38
+ <?php endif; ?>
39
  <!-- PAYMENT LOGO -->
40
  <!--{{{ PAYMENT DESCRIPTION -->
41
  <li>
app/design/frontend/base/default/template/novalnet/payment/method/form/Sepa.phtml CHANGED
@@ -26,7 +26,7 @@
26
  $code = $this->getMethodCode();
27
  $helper = Mage::helper('novalnet_payment');
28
  $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
29
- $sepaRefill = $this->getMethod()->getNovalnetConfig('auto_refill', true);
30
  $sepaPaymentRefill = $this->getMethod()->getConfigData('sepa_payment_refill');
31
  $refillValues = $assignDatahelper->getCheckout()->getRefilldatavalues();
32
  $refillMethod = ($sepaRefill && $refillValues && $code == $refillValues->getMethod());
@@ -51,15 +51,17 @@ $authCode = $checkoutSession->getNnAuthcode() ? $checkoutSession->getNnAuthcode(
51
  ?>
52
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
53
  <!--{{{ Payment Logo -->
54
- <div>
55
- <a href="<?php echo $helper->getNovalnetUrl(); ?>" target="_new" style="text-decoration:none;">
56
- <?php
57
- $image = "sepa.png";
58
- $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
59
- ?>
60
- <img src="<?php echo $imgpath; ?>" alt="<?php echo $this->getMethod()->getConfigData('title'); ?>" title="<?php echo $this->getMethod()->getConfigData('title'); ?>" />
61
- </a>
62
- </div>
 
 
63
  <!--}}} Payment Logo -->
64
  <!--{{{ Novalnet SEPA Form -->
65
  <div class="nnsepaloader" id='sepa_loading' style='display:none;'></div>
@@ -80,6 +82,7 @@ $authCode = $checkoutSession->getNnAuthcode() ? $checkoutSession->getNnAuthcode(
80
  <?php endif ?>
81
 
82
  <li>
 
83
  <label for="<?php echo $code ?>_account_holder" class="required"><em>*</em><?php echo $this->__('Account Holder') ?></label>
84
  <div class="input-box">
85
  <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="required-entry input-text" id="<?php echo $code ?>_account_holder" onkeypress="return ibanbicValidate(event)" onchange="unsetHashRelatedElements();" name="payment[account_holder]" autocomplete="off" value="<?php echo $billingaddress->getFirstname() . ' ' . $billingaddress->getLastname(); ?>" />
@@ -158,17 +161,8 @@ $authCode = $checkoutSession->getNnAuthcode() ? $checkoutSession->getNnAuthcode(
158
  <label style="float:none;" for="<?php echo $code ?>_new_callback_pin"><?php echo $this->__('Forgot PIN? [New PIN Request]') ?></label>
159
  </div>
160
  </li>
161
- <!--}}} PIN by Callback-->
162
- <!--{{{ Reply by Email-->
163
- <?php elseif ($this->getCallbackConfigData() == 3): ?>
164
- <li>
165
- <label for="<?php echo $code ?>_callback_email" class="required"><em>*</em><?php echo $this->__('E-mail Address') ?></label>
166
- <div class="input-box">
167
- <input type="text" autocomplete="off" id="<?php echo $code ?>_callback_email" name="payment[callback_email]" title="<?php echo $this->__('Callback Email') ?>" class="input-text validate-email required-entry" value="<?php echo $billingaddress->getEmail(); ?>"/>
168
- </div>
169
- </li>
170
  <?php endif ?>
171
- <!--}}} Reply by Email-->
172
  <?php endif ?>
173
  <!--}}} CallbackType-->
174
  <input id="process_vendor_id" type="hidden" value="<?php echo $vendorId ?>"/>
26
  $code = $this->getMethodCode();
27
  $helper = Mage::helper('novalnet_payment');
28
  $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
29
+ $sepaRefill = $this->getMethod()->getConfigData('auto_refill');
30
  $sepaPaymentRefill = $this->getMethod()->getConfigData('sepa_payment_refill');
31
  $refillValues = $assignDatahelper->getCheckout()->getRefilldatavalues();
32
  $refillMethod = ($sepaRefill && $refillValues && $code == $refillValues->getMethod());
51
  ?>
52
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
53
  <!--{{{ Payment Logo -->
54
+ <?php if ($helper->getModel($code)->getNovalnetConfig('enable_payment_logo', true)): ?>
55
+ <div>
56
+ <a href="<?php echo $helper->getNovalnetUrl(); ?>" target="_new" style="text-decoration:none;">
57
+ <?php
58
+ $image = "sepa.png";
59
+ $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
60
+ ?>
61
+ <img src="<?php echo $imgpath; ?>" alt="<?php echo $this->getMethod()->getConfigData('title'); ?>" title="<?php echo $this->getMethod()->getConfigData('title'); ?>" />
62
+ </a>
63
+ </div>
64
+ <?php endif; ?>
65
  <!--}}} Payment Logo -->
66
  <!--{{{ Novalnet SEPA Form -->
67
  <div class="nnsepaloader" id='sepa_loading' style='display:none;'></div>
82
  <?php endif ?>
83
 
84
  <li>
85
+ <p class="required"><?php echo $this->__('* Required Fields') ?></p>
86
  <label for="<?php echo $code ?>_account_holder" class="required"><em>*</em><?php echo $this->__('Account Holder') ?></label>
87
  <div class="input-box">
88
  <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="required-entry input-text" id="<?php echo $code ?>_account_holder" onkeypress="return ibanbicValidate(event)" onchange="unsetHashRelatedElements();" name="payment[account_holder]" autocomplete="off" value="<?php echo $billingaddress->getFirstname() . ' ' . $billingaddress->getLastname(); ?>" />
161
  <label style="float:none;" for="<?php echo $code ?>_new_callback_pin"><?php echo $this->__('Forgot PIN? [New PIN Request]') ?></label>
162
  </div>
163
  </li>
164
+ <!--}}} PIN by Callback-->
 
 
 
 
 
 
 
 
165
  <?php endif ?>
 
166
  <?php endif ?>
167
  <!--}}} CallbackType-->
168
  <input id="process_vendor_id" type="hidden" value="<?php echo $vendorId ?>"/>
app/design/frontend/base/default/template/novalnet/payment/method/info/Cc.phtml CHANGED
@@ -29,7 +29,7 @@ $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditiona
29
  $helper = Mage::helper('novalnet_payment');
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
- $nextCycleDate = $helper->getCycleDate($nextCycleId);
33
  if ($_info):
34
  ?>
35
  <?php
29
  $helper = Mage::helper('novalnet_payment');
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
+ $nextCycleDate = $this->getAdditionalData('paidUntil') ? $this->getAdditionalData('paidUntil') : '';
33
  if ($_info):
34
  ?>
35
  <?php
app/design/frontend/base/default/template/novalnet/payment/method/info/Giropay.phtml ADDED
@@ -0,0 +1,49 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the payment module of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ $_info = $this->getInfo();
27
+ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('NnTid') : $_info->getLastTransId();
28
+ $helper = Mage::helper('novalnet_payment');
29
+ $currentTime = $this->getAdditionalData('voidCreateAt');
30
+ if ($_info):
31
+ ?>
32
+ <?php
33
+ if ($this->getAdditionalData('NnTestOrder'))
34
+ echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
35
+ ?>
36
+ <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
37
+ <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>
38
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>
39
+ <?php
40
+ if ($this->getAdditionalData('refunded_tid')):
41
+ foreach ($this->getAdditionalData('refunded_tid') as $key => $value):
42
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s', $helper->makeValidNumber($value['reqtid']), $value['refamount']) . '<br><br>';
43
+ endforeach;
44
+ endif;
45
+ ?>
46
+ <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
47
+ <?php else: ?>
48
+ <?php echo $this->__('Error in getting payment method') ?>
49
+ <?php endif; ?>
app/design/frontend/base/default/template/novalnet/payment/method/info/Invoice.phtml CHANGED
@@ -30,7 +30,7 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditionalData('NnSepaParentTid') : $this->getAdditionalData('NnTid');
33
- $nextCycleDate = $helper->getCycleDate($nextCycleId);
34
  $recurringOrder = $this->getAdditionalData('NnRecurringOrder') ? true : false;
35
  ?>
36
  <?php if ($_info): ?>
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditionalData('NnSepaParentTid') : $this->getAdditionalData('NnTid');
33
+ $nextCycleDate = $this->getAdditionalData('paidUntil') ? $this->getAdditionalData('paidUntil') : '';
34
  $recurringOrder = $this->getAdditionalData('NnRecurringOrder') ? true : false;
35
  ?>
36
  <?php if ($_info): ?>
app/design/frontend/base/default/template/novalnet/payment/method/info/Prepayment.phtml CHANGED
@@ -30,7 +30,7 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditionalData('NnSepaParentTid') : $this->getAdditionalData('NnTid');
33
- $nextCycleDate = $helper->getCycleDate($nextCycleId);
34
  $recurringOrder = $this->getAdditionalData('NnRecurringOrder') ? true : false;
35
  ?>
36
  <?php if ($_info): ?>
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditionalData('NnSepaParentTid') : $this->getAdditionalData('NnTid');
33
+ $nextCycleDate = $this->getAdditionalData('paidUntil') ? $this->getAdditionalData('paidUntil') : '';
34
  $recurringOrder = $this->getAdditionalData('NnRecurringOrder') ? true : false;
35
  ?>
36
  <?php if ($_info): ?>
app/design/frontend/base/default/template/novalnet/payment/method/info/Sepa.phtml CHANGED
@@ -29,7 +29,7 @@ $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditiona
29
  $helper = Mage::helper('novalnet_payment');
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
- $nextCycleDate = $helper->getCycleDate($nextCycleId);
33
  if ($_info):
34
  ?>
35
  <?php
29
  $helper = Mage::helper('novalnet_payment');
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
+ $nextCycleDate = $this->getAdditionalData('paidUntil') ? $this->getAdditionalData('paidUntil') : '';
33
  if ($_info):
34
  ?>
35
  <?php
app/design/frontend/base/default/template/novalnet/payment/method/pdf/Cc.phtml CHANGED
@@ -29,7 +29,7 @@ $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditiona
29
  $helper = Mage::helper('novalnet_payment');
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
- $nextCycleDate = $helper->getCycleDate($nextCycleId);
33
  if ($_info):
34
  ?>
35
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
29
  $helper = Mage::helper('novalnet_payment');
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
+ $nextCycleDate = $this->getAdditionalData('paidUntil') ? $this->getAdditionalData('paidUntil') : '';
33
  if ($_info):
34
  ?>
35
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
app/design/frontend/base/default/template/novalnet/payment/method/pdf/Giropay.phtml ADDED
@@ -0,0 +1,49 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the payment module of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ $_info = $this->getInfo();
27
+ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('NnTid') : $_info->getLastTransId();
28
+ $helper = Mage::helper('novalnet_payment');
29
+ $currentTime = $this->getAdditionalData('voidCreateAt');
30
+ if ($_info):
31
+ ?>
32
+ <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
33
+ <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?>{{pdf_row_separator}}
34
+ <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>{{pdf_row_separator}}
35
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>{{pdf_row_separator}}
36
+ <?php
37
+ if ($this->getAdditionalData('refunded_tid')):
38
+ foreach ($this->getAdditionalData('refunded_tid') as $key => $value):
39
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s', $helper->makeValidNumber($value['reqtid']), $value['refamount']) . '<br><br>';
40
+ ?>
41
+ {{pdf_row_separator}}
42
+ <?php
43
+ endforeach;
44
+ endif;
45
+ ?>{{pdf_row_separator}}
46
+ <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
47
+ <?php else: ?>
48
+ <?php echo $this->__('Error in getting payment method') ?>
49
+ <?php endif; ?>
app/design/frontend/base/default/template/novalnet/payment/method/pdf/Invoice.phtml CHANGED
@@ -30,8 +30,7 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditionalData('NnSepaParentTid') : $this->getAdditionalData('NnTid');
33
- $nextCycleDate = $helper->getCycleDate($nextCycleId);
34
- $recurringOrder = $this->getAdditionalData('NnRecurringOrder') ? true : false;
35
  ?>
36
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
37
  <strong><?php echo Mage::helper('novalnet_payment')->__('%s', $this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
@@ -50,7 +49,7 @@ if ($this->getAdditionalData('refunded_tid')):
50
  endforeach;
51
  endif;
52
  ?>{{pdf_row_separator}}
53
- <?php if (!preg_match("/creditmemo|callback_novalnet2magento/i", $currentUrl) || $recurringOrder): ?>
54
  <?php
55
  if (strlen($this->getAdditionalData('NnNote'))):
56
  if (strstr($this->getAdditionalData('NnNote'), 'br')):
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditionalData('NnSepaParentTid') : $this->getAdditionalData('NnTid');
33
+ $nextCycleDate = $this->getAdditionalData('paidUntil') ? $this->getAdditionalData('paidUntil') : '';
 
34
  ?>
35
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
36
  <strong><?php echo Mage::helper('novalnet_payment')->__('%s', $this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
49
  endforeach;
50
  endif;
51
  ?>{{pdf_row_separator}}
52
+ <?php if (!preg_match("/creditmemo|callback_novalnet2magento/i", $currentUrl)): ?>
53
  <?php
54
  if (strlen($this->getAdditionalData('NnNote'))):
55
  if (strstr($this->getAdditionalData('NnNote'), 'br')):
app/design/frontend/base/default/template/novalnet/payment/method/pdf/Prepayment.phtml CHANGED
@@ -30,8 +30,8 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditionalData('NnSepaParentTid') : $this->getAdditionalData('NnTid');
33
- $nextCycleDate = $helper->getCycleDate($nextCycleId);
34
- $recurringOrder = $this->getAdditionalData('NnRecurringOrder') ? true : false;
35
  ?>
36
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
37
  <strong><?php echo Mage::helper('novalnet_payment')->__('%s', $this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
@@ -50,7 +50,7 @@ if ($this->getAdditionalData('refunded_tid')):
50
  endforeach;
51
  endif;
52
  ?>{{pdf_row_separator}}
53
- <?php if (!preg_match("/invoice|creditmemo|shipment|callback_novalnet2magento/i", $currentUrl) || $recurringOrder): ?>
54
  <?php
55
  if (strlen($this->getAdditionalData('NnNote'))):
56
  if (strstr($this->getAdditionalData('NnNote'), 'br')):
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditionalData('NnSepaParentTid') : $this->getAdditionalData('NnTid');
33
+ $nextCycleDate = $this->getAdditionalData('paidUntil') ? $this->getAdditionalData('paidUntil') : '';
34
+
35
  ?>
36
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
37
  <strong><?php echo Mage::helper('novalnet_payment')->__('%s', $this->getMethod()->getTitle()) ?></strong>{{pdf_row_separator}}
50
  endforeach;
51
  endif;
52
  ?>{{pdf_row_separator}}
53
+ <?php if (!preg_match("/invoice|creditmemo|shipment|callback_novalnet2magento/i", $currentUrl)): ?>
54
  <?php
55
  if (strlen($this->getAdditionalData('NnNote'))):
56
  if (strstr($this->getAdditionalData('NnNote'), 'br')):
app/design/frontend/base/default/template/novalnet/payment/method/pdf/Sepa.phtml CHANGED
@@ -29,7 +29,7 @@ $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditiona
29
  $helper = Mage::helper('novalnet_payment');
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
- $nextCycleDate = $helper->getCycleDate($nextCycleId);
33
  if ($_info):
34
  ?>
35
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
29
  $helper = Mage::helper('novalnet_payment');
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
+ $nextCycleDate = $this->getAdditionalData('paidUntil') ? $this->getAdditionalData('paidUntil') : '';
33
  if ($_info):
34
  ?>
35
  <?php if ($this->getAdditionalData('NnTestOrder')) echo $this->__('Testorder'); ?>{{pdf_row_separator}}
app/design/frontend/default/default/layout/novalnet.xml CHANGED
@@ -31,12 +31,17 @@
31
  <action method="addJs">
32
  <script>novalnet/novalnetJquery.js</script>
33
  </action>
34
- <action method="addJs">
35
- <script>novalnet/novalnetcc.js</script>
36
- </action>
37
  <action method="addJs">
38
  <script>novalnet/novalnetsepa.js</script>
39
  </action>
40
  </reference>
41
  </checkout_onepage_index>
 
 
 
 
 
 
 
 
42
  </layout>
31
  <action method="addJs">
32
  <script>novalnet/novalnetJquery.js</script>
33
  </action>
 
 
 
34
  <action method="addJs">
35
  <script>novalnet/novalnetsepa.js</script>
36
  </action>
37
  </reference>
38
  </checkout_onepage_index>
39
+ <!-- Adjusts Credit Card hosted page loaded in iframe -->
40
+ <novalnet_payment_novalnetcc_index>
41
+ <reference name="root">
42
+ <remove name="right"/>
43
+ <remove name="left"/>
44
+ </reference>
45
+ </novalnet_payment_novalnetcc_index>
46
+ <!-- Adjusts Credit Card hosted page loaded in iframe -->
47
  </layout>
app/design/frontend/default/default/template/novalnet/payment/method/form/Banktransfer.phtml CHANGED
@@ -28,15 +28,17 @@ $helper = Mage::helper('novalnet_payment');
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!--{{{ Payment Logo -->
31
- <div>
32
- <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
33
- <?php
34
- $image = "banktransfer.png";
35
- $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
36
- ?>
37
- <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
38
- </a>
39
- </div>
 
 
40
  <!--}}} Payment Logo -->
41
  <!--{{{ Payment Description -->
42
  <li>
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!--{{{ Payment Logo -->
31
+ <?php if ($helper->getModel($code)->getNovalnetConfig('enable_payment_logo', true)): ?>
32
+ <div>
33
+ <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
34
+ <?php
35
+ $image = "banktransfer.png";
36
+ $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
37
+ ?>
38
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
39
+ </a>
40
+ </div>
41
+ <?php endif; ?>
42
  <!--}}} Payment Logo -->
43
  <!--{{{ Payment Description -->
44
  <li>
app/design/frontend/default/default/template/novalnet/payment/method/form/Cc.phtml CHANGED
@@ -25,39 +25,24 @@
25
  */
26
  $code = $this->getMethodCode();
27
  $helper = Mage::helper('novalnet_payment');
28
- $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
29
- $refillValues = $assignDatahelper->getCheckout()->getRefilldatavalues();
30
- $creditCardSecure = $this->getMethod()->getConfigData('active_cc3d');
31
- $ccRefill = $this->getMethod()->getNovalnetConfig('auto_refill', true);
32
- // get quote billing address
33
- $checkoutSession = Mage::getSingleton('checkout/session');
34
- $billingaddress = $checkoutSession->getQuote()->getBillingAddress();
35
- $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getTelephone())
36
- ? $billingaddress->getTelephone() : '' ;
37
- $vendorId = $checkoutSession->getNnVendor()
38
- ? $checkoutSession->getNnVendor() : trim($this->getMethod()->getNovalnetConfig('merchant_id', true));
39
- $authCode = $checkoutSession->getNnAuthcode()
40
- ? $checkoutSession->getNnAuthcode() : trim($this->getMethod()->getNovalnetConfig('auth_code', true));
41
  ?>
42
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
43
  <!--{{{ Payment Logo -->
44
- <div>
45
- <a href="<?php echo $helper->getNovalnetUrl(); ?>" target="_new" style="text-decoration:none;float:none;">
46
- <?php foreach ($this->getCcAvailableTypes() as $typeCode => $typeName): ?>
47
- <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $typeCode . ".png"; ?>
48
- <img style="height:20px;display:inline;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
49
- <?php endforeach; ?>
50
- </a>
51
- </div>
 
 
52
  <!--}}} Payment Logo -->
53
- <!--{{{ Novalnet Cc Form -->
54
- <div class="nnccloader" id='cc_loading' style='display:none;'></div>
55
  <li>
56
  <?php
57
- echo $this->__('The amount will be debited from your credit card once the order is submitted');
58
- if ($this->getMethod()->getConfigData('active_cc3d')):
59
- echo "<br>".$this->__('Please don’t close the browser after successful payment, until you have been redirected back to the Shop');
60
- endif;
61
  ?>
62
  </li>
63
  <?php if ($this->getUserInfo()): ?>
@@ -65,124 +50,11 @@ $authCode = $checkoutSession->getNnAuthcode()
65
  <?php echo $this->getUserInfo() ?>
66
  </li>
67
  <?php endif ?>
68
- <?php if (Mage::helper('novalnet_payment')->getModel('novalnetCc')->getNovalnetConfig('live_mode', true) == 0): ?>
69
  <li>
70
  <div style="font-weight:bold;color:red;font-size:12px;">
71
  <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
72
  </div>
73
  </li>
74
  <?php endif ?>
75
- <li>
76
- <label for="<?php echo $code ?>_cc_owner" class="required"><em>*</em><?php echo $this->__('NN CC holder') ?></label>
77
- <div class="input-box">
78
- <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="required-entry input-text" id="<?php echo $code ?>_cc_owner" autocomplete="off" onkeypress="return accHolderValidate(event)" onchange="cchashcall()" value="<?php echo $billingaddress->getFirstname() . ' ' . $billingaddress->getLastname(); ?>" />
79
- </div>
80
- </li>
81
- <li>
82
- <label for="<?php echo $code ?>_cc_number" class="required"><em>*</em><?php echo $this->__('NN CC number') ?></label>
83
- <div class="input-box">
84
- <input type="text" id="<?php echo $code ?>_cc_number" title="<?php echo $this->__('Credit Card Number') ?>" class="required-entry input-text validate-cc-number validate-cc-type" autocomplete="off" onchange="cchashcall()" onkeypress="return isNumberKey(event,true)" value="" />
85
- </div>
86
- </li>
87
- <li>
88
- <label for="<?php echo $code ?>_expiration" class="required"><em>*</em><?php echo $this->__('NN Expiration Date') ?></label>
89
- <div class="input-box">
90
- <div class="v-fix">
91
- <select id="<?php echo $code ?>_expiration" onchange="cchashcall()" class="month validate-cc-exp required-entry" name="<?php echo $code ?>_expiration">
92
- <option value=""><?php echo $this->__('Month'); ?></option>
93
- <?php foreach ($this->getCcMonths() as $k => $v): ?>
94
- <option value="<?php echo $k ?>"><?php echo $v ?></option>
95
- <?php endforeach; ?>
96
- </select>
97
- </div>
98
- <div class="v-fix">
99
- <select id="<?php echo $code ?>_expiration_yr" onchange="cchashcall()" class="year required-entry" name="<?php echo $code ?>_expiration_yr">
100
- <option value=""><?php echo $this->__('Year'); ?></option>
101
- <?php foreach ($this->getCcYears() as $k => $v): ?>
102
- <option value="<?php echo $k ?>"><?php echo $v ?></option>
103
- <?php endforeach; ?>
104
- </select>
105
- </div>
106
- </div>
107
- </li>
108
- <li>
109
- <label for="<?php echo $code ?>_cc_cid" class="required"><em>*</em><?php echo $this->__('NN CVC') ?></label>
110
- <div class="input-box">
111
- <div class="v-fix">
112
- <input type="text" title="<?php echo $this->__('Card Verification Number') ?>" class="input-text cvv required-entry validate-cc-cvn" id="<?php echo $code ?>_cc_cid" name="payment[nn_cc_cid]" value="" onkeypress="return isNumberKey(event, false);"/>
113
- </div>
114
- <a href="#" class="cvv-what-is-this"><?php echo $this->__('What is this?') ?></a>
115
- </div>
116
- </li>
117
- <!--{{{ CallbackType-->
118
- <?php if (!$creditCardSecure && $this->isCallbackTypeCall()): ?>
119
- <!--{{{ PIN by Callback-->
120
- <?php
121
- if ($this->getCallbackConfigData() != 3):
122
- ?>
123
- <li>
124
- <label for="<?php echo $code ?>_callback_tel" class="required"><em>*</em>
125
- <?php if ($this->getCallbackConfigData() == 2): ?>
126
- <?php echo $this->__('Mobile phone number'); ?>
127
- <?php else: ?>
128
- <?php echo $this->__('NN Mobile Number'); ?>
129
- <?php endif; ?>
130
- </label>
131
- <div class="input-box">
132
- <input type="text" autocomplete="off" id="<?php echo $code ?>_callback_tel" name="payment[callback_tel]" title="<?php echo $this->__('Callback') ?>" class="required-entry input-text validate-number" value="<?php echo $telephoneNumber; ?>"/>
133
- </div>
134
- </li>
135
- <li>
136
- <div class="nncallbacknote">
137
- <?php echo $this->__('Note for pin by sms and callback') ?>
138
- </div>
139
- <label for="<?php echo $code ?>_callback_pin" class="required"><em>*</em><?php echo $this->__('PIN') ?></label>
140
- <div class="input-box">
141
- <input onkeydown="document.getElementById('<?php echo $code ?>_new_callback_pin').checked = false;" size="4" type="text" id="<?php echo $code ?>_callback_pin" name="payment[callback_pin]" title="<?php echo $this->__('Callback') ?>" class="input-text" /><br/>
142
- <input id="<?php echo $code ?>_new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
143
- <label style="float:none;" for="<?php echo $code ?>_new_callback_pin"><?php echo $this->__('Forgot PIN? [New PIN Request]') ?></label>
144
- </div>
145
- </li>
146
- <!--}}} PIN by Callback-->
147
- <!--{{{ Reply by Email-->
148
- <?php elseif ($this->getCallbackConfigData() == 3): ?>
149
- <li>
150
- <label for="<?php echo $code ?>_callback_email" class="required"><em>*</em><?php echo $this->__('E-mail Address') ?></label>
151
- <div class="input-box">
152
- <input type="text" autocomplete="off" id="<?php echo $code ?>_callback_email" name="payment[callback_email]" title="<?php echo $this->__('Callback Email') ?>" class="input-text validate-email required-entry" value="<?php echo $billingaddress->getEmail(); ?>"/>
153
- </div>
154
- </li>
155
- <?php endif ?>
156
- <!--}}} Reply by Email-->
157
- <?php endif ?>
158
- <!--}}} CallbackType-->
159
- <input type="hidden" id="original_vendor_id" value="<?php echo $vendorId ?>" />
160
- <input type="hidden" id="original_vendor_authcode" value="<?php echo $authCode ?>" />
161
- <input type="hidden" id="novalnet_cc_pan_hash" value="<?php echo $ccRefill ? $assignDatahelper->getCheckout()->getCcPanHash() : ''; ?>" />
162
- <input type="hidden" name="novalnet_cc_hash" id="novalnet_cc_hash" value="" />
163
- <input type="hidden" name="novalnet_cc_unique_id" id="novalnet_cc_unique_id" value="<?php echo $ccRefill ? $assignDatahelper->getCheckout()->getCcUniqueId() : ''; ?>" />
164
- <input type="hidden" id="nn_cc_merchant_validate_error_message" value="<?php echo $this->__('Basic parameter not valid') . '!'; ?>" />
165
- <input type="hidden" id="nn_cc_validate_error_message" value="<?php echo $this->__('Your credit card details are invalid') . '!'; ?>" />
166
- <!--}}} Novalnet Cc Form -->
167
  </ul>
168
- <style>
169
- .nnccloader {
170
- position: fixed;
171
- left: 0px;
172
- top: 0px;
173
- width: 100%;
174
- height: 100%;
175
- z-index: 9999;
176
- background: url('<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif') 50% 50% no-repeat;
177
- }
178
- .nncallbacknote {
179
- font-weight:bold;
180
- font-size:11px;
181
- color:gray;
182
- border:1px solid #BFBFBF;
183
- background:#FEFFBF;
184
- padding:10px;
185
- margin-top:10px;
186
- width:400px;
187
- }
188
- </style>
25
  */
26
  $code = $this->getMethodCode();
27
  $helper = Mage::helper('novalnet_payment');
 
 
 
 
 
 
 
 
 
 
 
 
 
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!--{{{ Payment Logo -->
31
+ <?php if ($helper->getModel($code)->getNovalnetConfig('enable_payment_logo', true)): ?>
32
+ <div>
33
+ <a href="<?php echo $helper->getNovalnetUrl(); ?>" target="_new" style="text-decoration:none;float:none;">
34
+ <?php foreach ($this->getCcAvailableTypes() as $typeCode => $typeName): ?>
35
+ <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $typeCode . ".png"; ?>
36
+ <img style="display:inline;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
37
+ <?php endforeach; ?>
38
+ </a>
39
+ </div>
40
+ <?php endif; ?>
41
  <!--}}} Payment Logo -->
 
 
42
  <li>
43
  <?php
44
+ echo $this->__('redirect payment description');
45
+ echo "<br>".$this->__('Please don’t close the browser after successful payment, until you have been redirected back to the Shop');
 
 
46
  ?>
47
  </li>
48
  <?php if ($this->getUserInfo()): ?>
50
  <?php echo $this->getUserInfo() ?>
51
  </li>
52
  <?php endif ?>
53
+ <?php if ($helper->getModel('novalnetCc')->getNovalnetConfig('live_mode', true) == 0): ?>
54
  <li>
55
  <div style="font-weight:bold;color:red;font-size:12px;">
56
  <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
57
  </div>
58
  </li>
59
  <?php endif ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
60
  </ul>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/default/default/template/novalnet/payment/method/form/Cciframe.phtml ADDED
@@ -0,0 +1,54 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the payment module of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ ?>
27
+ <?php
28
+ $code = Novalnet_Payment_Model_Config::NN_CC;
29
+ $helper = Mage::helper('novalnet_payment');
30
+ $paymentRequest = $helper->getCheckoutSession()->getPaymentReqData();
31
+ $payportUrl = Novalnet_Payment_Model_Config::CC_PCI_PAYPORT_URL;
32
+
33
+ // Save Transaction request data
34
+ $transactionTraces = $helper->getModelTransactionOverview();
35
+ $transactionTraces->setOrderId($paymentRequest->getOrderNo())
36
+ ->setRequestData(serialize($paymentRequest->getData()))
37
+ ->setCreatedDate($helper->getCurrentDateTime())
38
+ ->save();
39
+ ?>
40
+ <div class="nnloader style='position: fixed; left: z-index: 9999;' " id="nnloader"
41
+ style="background: url('<?php echo $helper->getNovalnetPaymentFormLogoUrl(); ?>novalnet-loading-icon.gif') 70% 60% no-repeat; height: 70px; "></div>
42
+ <?php
43
+ $form = new Varien_Data_Form();
44
+ $html = '<html><body>';
45
+ echo "<form action='$payportUrl' id='$code' name='$code' method='POST' target='cc_iframe'>";
46
+ foreach ($paymentRequest->getData() as $field=>$value) {
47
+ $form->addField($field, 'hidden', array('name'=>$field, 'value'=>$value));
48
+ }
49
+
50
+ $html.= $form->toHtml();
51
+ $html.="<iframe id='cc_iframe' scrolling='no' style='width:100%;height:450px;border:none;' name='cc_iframe' onload=document.getElementById('nnloader').style.display='none'></iframe></form>";
52
+ $html.= '<script type="text/javascript">document.getElementById("' . $code . '").submit();</script>';
53
+ $html.= '</body></html>';
54
+ echo $html;
app/design/frontend/default/default/template/novalnet/payment/method/form/Eps.phtml CHANGED
@@ -28,15 +28,17 @@ $helper = Mage::helper('novalnet_payment');
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!--{{{ Payment Logo -->
31
- <div>
32
- <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
33
- <?php
34
- $image = "eps.png";
35
- $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
36
- ?>
37
- <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
38
- </a>
39
- </div>
 
 
40
  <!--}}} Payment Logo -->
41
  <!--{{{ Payment Description -->
42
  <li>
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!--{{{ Payment Logo -->
31
+ <?php if ($helper->getModel($code)->getNovalnetConfig('enable_payment_logo', true)): ?>
32
+ <div>
33
+ <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
34
+ <?php
35
+ $image = "eps.png";
36
+ $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
37
+ ?>
38
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
39
+ </a>
40
+ </div>
41
+ <?php endif; ?>
42
  <!--}}} Payment Logo -->
43
  <!--{{{ Payment Description -->
44
  <li>
app/design/frontend/default/default/template/novalnet/payment/method/form/Giropay.phtml ADDED
@@ -0,0 +1,63 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the payment module of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ $code = $this->getMethodCode();
27
+ $helper = Mage::helper('novalnet_payment');
28
+ ?>
29
+ <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
+ <!--{{{ Payment Logo -->
31
+ <?php if ($helper->getModel($code)->getNovalnetConfig('enable_payment_logo', true)): ?>
32
+ <div>
33
+ <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
34
+ <?php
35
+ $image = "giropay.png";
36
+ $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
37
+ ?>
38
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
39
+ </a>
40
+ </div>
41
+ <?php endif; ?>
42
+ <!--}}} Payment Logo -->
43
+ <!--{{{ Payment Description -->
44
+ <li>
45
+ <?php
46
+ echo $this->__('redirect payment description');
47
+ echo "<br>".$this->__('Please don’t close the browser after successful payment, until you have been redirected back to the Shop');
48
+ ?>
49
+ </li>
50
+ <?php if ($this->getUserInfo()): ?>
51
+ <li>
52
+ <?php echo $this->getUserInfo() ?>
53
+ </li>
54
+ <?php endif; ?>
55
+ <?php if ($this->getMethod()->getNovalnetConfig('live_mode', true) == 0): ?>
56
+ <li>
57
+ <div style="font-weight:bold;color:red;font-size:12px;">
58
+ <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
59
+ </div>
60
+ </li>
61
+ <?php endif ?>
62
+ <!--}}} Payment Description -->
63
+ </ul>
app/design/frontend/default/default/template/novalnet/payment/method/form/Ideal.phtml CHANGED
@@ -28,15 +28,17 @@ $helper = Mage::helper('novalnet_payment');
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!--{{{ Payment Logo -->
31
- <div>
32
- <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
33
- <?php
34
- $image = "ideal.png";
35
- $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
36
- ?>
37
- <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
38
- </a>
39
- </div>
 
 
40
  <!--}}} Payment Logo -->
41
  <!--{{{ Payment Description -->
42
  <li>
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!--{{{ Payment Logo -->
31
+ <?php if ($helper->getModel($code)->getNovalnetConfig('enable_payment_logo', true)): ?>
32
+ <div>
33
+ <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
34
+ <?php
35
+ $image = "ideal.png";
36
+ $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
37
+ ?>
38
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
39
+ </a>
40
+ </div>
41
+ <?php endif; ?>
42
  <!--}}} Payment Logo -->
43
  <!--{{{ Payment Description -->
44
  <li>
app/design/frontend/default/default/template/novalnet/payment/method/form/Invoice.phtml CHANGED
@@ -31,12 +31,14 @@ $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getT
31
  ?>
32
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
33
  <!-- PAYMENT LOGO -->
34
- <div>
35
- <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
36
- <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "invoice.png"; ?>
37
- <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
38
- </a>
39
- </div>
 
 
40
  <!-- PAYMENT LOGO -->
41
  <!--{{{ PAYMENT DESCRIPTION -->
42
  <li>
@@ -60,6 +62,7 @@ $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getT
60
  <!--{{{ PIN by Callback-->
61
  <?php if ($this->getCallbackConfigData() != 3): ?>
62
  <li>
 
63
  <label for="<?php echo $code ?>_callback_tel" class="required"><em>*</em>
64
  <?php if ($this->getCallbackConfigData() == 2): ?>
65
  <?php echo $this->__('Mobile phone number'); ?>
@@ -83,16 +86,7 @@ $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getT
83
  </div>
84
  </li>
85
  <!--}}} PIN by Callback-->
86
- <!--{{{ Reply by Email-->
87
- <?php elseif ($this->getCallbackConfigData() == 3): ?>
88
- <li>
89
- <label for="<?php echo $code ?>_callback_email" class="required"><em>*</em><?php echo $this->__('E-mail Address') ?></label>
90
- <div class="input-box">
91
- <input type="text" value="<?php echo $billingaddress->getEmail(); ?>" id="<?php echo $code ?>_callback_email" name="payment[callback_email]" title="<?php echo $this->__('Callback Email') ?>" class="input-text validate-email required-entry" />
92
- </div>
93
- </li>
94
  <?php endif ?>
95
- <!--}}} Reply by Email-->
96
  <?php endif ?>
97
  <!--}}} CallbackType-->
98
  </ul>
31
  ?>
32
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
33
  <!-- PAYMENT LOGO -->
34
+ <?php if ($helper->getModel($code)->getNovalnetConfig('enable_payment_logo', true)): ?>
35
+ <div>
36
+ <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
37
+ <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "invoice.png"; ?>
38
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
39
+ </a>
40
+ </div>
41
+ <?php endif; ?>
42
  <!-- PAYMENT LOGO -->
43
  <!--{{{ PAYMENT DESCRIPTION -->
44
  <li>
62
  <!--{{{ PIN by Callback-->
63
  <?php if ($this->getCallbackConfigData() != 3): ?>
64
  <li>
65
+ <p class="required"><?php echo $this->__('* Required Fields') ?></p>
66
  <label for="<?php echo $code ?>_callback_tel" class="required"><em>*</em>
67
  <?php if ($this->getCallbackConfigData() == 2): ?>
68
  <?php echo $this->__('Mobile phone number'); ?>
86
  </div>
87
  </li>
88
  <!--}}} PIN by Callback-->
 
 
 
 
 
 
 
 
89
  <?php endif ?>
 
90
  <?php endif ?>
91
  <!--}}} CallbackType-->
92
  </ul>
app/design/frontend/default/default/template/novalnet/payment/method/form/Paypal.phtml CHANGED
@@ -28,15 +28,17 @@ $helper = Mage::helper('novalnet_payment');
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!--{{{ Payment Logo -->
31
- <div>
32
- <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
33
- <?php
34
- $image = "paypal.png";
35
- $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
36
- ?>
37
- <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
38
- </a>
39
- </div>
 
 
40
  <!--}}} Payment Logo -->
41
  <!--{{{ Payment Description -->
42
  <li>
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!--{{{ Payment Logo -->
31
+ <?php if ($helper->getModel($code)->getNovalnetConfig('enable_payment_logo', true)): ?>
32
+ <div>
33
+ <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
34
+ <?php
35
+ $image = "paypal.png";
36
+ $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
37
+ ?>
38
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
39
+ </a>
40
+ </div>
41
+ <?php endif; ?>
42
  <!--}}} Payment Logo -->
43
  <!--{{{ Payment Description -->
44
  <li>
app/design/frontend/default/default/template/novalnet/payment/method/form/Prepayment.phtml CHANGED
@@ -28,12 +28,14 @@ $helper = Mage::helper('novalnet_payment');
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!-- PAYMENT LOGO -->
31
- <div>
32
- <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
33
- <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "prepayment.png"; ?>
34
- <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
35
- </a>
36
- </div>
 
 
37
  <!-- PAYMENT LOGO -->
38
  <!--{{{ PAYMENT DESCRIPTION -->
39
  <li>
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!-- PAYMENT LOGO -->
31
+ <?php if ($helper->getModel($code)->getNovalnetConfig('enable_payment_logo', true)): ?>
32
+ <div>
33
+ <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
34
+ <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "prepayment.png"; ?>
35
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
36
+ </a>
37
+ </div>
38
+ <?php endif; ?>
39
  <!-- PAYMENT LOGO -->
40
  <!--{{{ PAYMENT DESCRIPTION -->
41
  <li>
app/design/frontend/default/default/template/novalnet/payment/method/form/Sepa.phtml CHANGED
@@ -26,7 +26,7 @@
26
  $code = $this->getMethodCode();
27
  $helper = Mage::helper('novalnet_payment');
28
  $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
29
- $sepaRefill = $this->getMethod()->getNovalnetConfig('auto_refill', true);
30
  $sepaPaymentRefill = $this->getMethod()->getConfigData('sepa_payment_refill');
31
  $refillValues = $assignDatahelper->getCheckout()->getRefilldatavalues();
32
  $refillMethod = ($sepaRefill && $refillValues && $code == $refillValues->getMethod());
@@ -51,15 +51,17 @@ $authCode = $checkoutSession->getNnAuthcode() ? $checkoutSession->getNnAuthcode(
51
  ?>
52
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
53
  <!--{{{ Payment Logo -->
54
- <div>
55
- <a href="<?php echo $helper->getNovalnetUrl(); ?>" target="_new" style="text-decoration:none;">
56
- <?php
57
- $image = "sepa.png";
58
- $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
59
- ?>
60
- <img src="<?php echo $imgpath; ?>" alt="<?php echo $this->getMethod()->getConfigData('title'); ?>" title="<?php echo $this->getMethod()->getConfigData('title'); ?>" />
61
- </a>
62
- </div>
 
 
63
  <!--}}} Payment Logo -->
64
  <!--{{{ Novalnet SEPA Form -->
65
  <div class="nnsepaloader" id='sepa_loading' style='display:none;'></div>
@@ -80,6 +82,7 @@ $authCode = $checkoutSession->getNnAuthcode() ? $checkoutSession->getNnAuthcode(
80
  <?php endif ?>
81
 
82
  <li>
 
83
  <label for="<?php echo $code ?>_account_holder" class="required"><em>*</em><?php echo $this->__('Account Holder') ?></label>
84
  <div class="input-box">
85
  <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="required-entry input-text" id="<?php echo $code ?>_account_holder" onkeypress="return ibanbicValidate(event)" onchange="unsetHashRelatedElements();" name="payment[account_holder]" autocomplete="off" value="<?php echo $billingaddress->getFirstname() . ' ' . $billingaddress->getLastname(); ?>" />
@@ -159,16 +162,7 @@ $authCode = $checkoutSession->getNnAuthcode() ? $checkoutSession->getNnAuthcode(
159
  </div>
160
  </li>
161
  <!--}}} PIN by Callback-->
162
- <!--{{{ Reply by Email-->
163
- <?php elseif ($this->getCallbackConfigData() == 3): ?>
164
- <li>
165
- <label for="<?php echo $code ?>_callback_email" class="required"><em>*</em><?php echo $this->__('E-mail Address') ?></label>
166
- <div class="input-box">
167
- <input type="text" autocomplete="off" id="<?php echo $code ?>_callback_email" name="payment[callback_email]" title="<?php echo $this->__('Callback Email') ?>" class="input-text validate-email required-entry" value="<?php echo $billingaddress->getEmail(); ?>"/>
168
- </div>
169
- </li>
170
  <?php endif ?>
171
- <!--}}} Reply by Email-->
172
  <?php endif ?>
173
  <!--}}} CallbackType-->
174
  <input id="process_vendor_id" type="hidden" value="<?php echo $vendorId ?>"/>
26
  $code = $this->getMethodCode();
27
  $helper = Mage::helper('novalnet_payment');
28
  $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
29
+ $sepaRefill = $this->getMethod()->getConfigData('auto_refill');
30
  $sepaPaymentRefill = $this->getMethod()->getConfigData('sepa_payment_refill');
31
  $refillValues = $assignDatahelper->getCheckout()->getRefilldatavalues();
32
  $refillMethod = ($sepaRefill && $refillValues && $code == $refillValues->getMethod());
51
  ?>
52
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
53
  <!--{{{ Payment Logo -->
54
+ <?php if ($helper->getModel($code)->getNovalnetConfig('enable_payment_logo', true)): ?>
55
+ <div>
56
+ <a href="<?php echo $helper->getNovalnetUrl(); ?>" target="_new" style="text-decoration:none;">
57
+ <?php
58
+ $image = "sepa.png";
59
+ $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
60
+ ?>
61
+ <img src="<?php echo $imgpath; ?>" alt="<?php echo $this->getMethod()->getConfigData('title'); ?>" title="<?php echo $this->getMethod()->getConfigData('title'); ?>" />
62
+ </a>
63
+ </div>
64
+ <?php endif; ?>
65
  <!--}}} Payment Logo -->
66
  <!--{{{ Novalnet SEPA Form -->
67
  <div class="nnsepaloader" id='sepa_loading' style='display:none;'></div>
82
  <?php endif ?>
83
 
84
  <li>
85
+ <p class="required"><?php echo $this->__('* Required Fields') ?></p>
86
  <label for="<?php echo $code ?>_account_holder" class="required"><em>*</em><?php echo $this->__('Account Holder') ?></label>
87
  <div class="input-box">
88
  <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="required-entry input-text" id="<?php echo $code ?>_account_holder" onkeypress="return ibanbicValidate(event)" onchange="unsetHashRelatedElements();" name="payment[account_holder]" autocomplete="off" value="<?php echo $billingaddress->getFirstname() . ' ' . $billingaddress->getLastname(); ?>" />
162
  </div>
163
  </li>
164
  <!--}}} PIN by Callback-->
 
 
 
 
 
 
 
 
165
  <?php endif ?>
 
166
  <?php endif ?>
167
  <!--}}} CallbackType-->
168
  <input id="process_vendor_id" type="hidden" value="<?php echo $vendorId ?>"/>
app/design/frontend/default/default/template/novalnet/payment/method/info/Cc.phtml CHANGED
@@ -29,7 +29,7 @@ $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditiona
29
  $helper = Mage::helper('novalnet_payment');
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
- $nextCycleDate = $helper->getCycleDate($nextCycleId);
33
  if ($_info):
34
  ?>
35
  <?php
29
  $helper = Mage::helper('novalnet_payment');
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
+ $nextCycleDate = $this->getAdditionalData('paidUntil') ? $this->getAdditionalData('paidUntil') : '';
33
  if ($_info):
34
  ?>
35
  <?php
app/design/frontend/default/default/template/novalnet/payment/method/info/Giropay.phtml ADDED
@@ -0,0 +1,49 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the payment module of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ $_info = $this->getInfo();
27
+ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('NnTid') : $_info->getLastTransId();
28
+ $helper = Mage::helper('novalnet_payment');
29
+ $currentTime = $this->getAdditionalData('voidCreateAt');
30
+ if ($_info):
31
+ ?>
32
+ <?php
33
+ if ($this->getAdditionalData('NnTestOrder'))
34
+ echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
35
+ ?>
36
+ <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
37
+ <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>
38
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>
39
+ <?php
40
+ if ($this->getAdditionalData('refunded_tid')):
41
+ foreach ($this->getAdditionalData('refunded_tid') as $key => $value):
42
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s', $helper->makeValidNumber($value['reqtid']), $value['refamount']) . '<br><br>';
43
+ endforeach;
44
+ endif;
45
+ ?>
46
+ <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
47
+ <?php else: ?>
48
+ <?php echo $this->__('Error in getting payment method') ?>
49
+ <?php endif; ?>
app/design/frontend/default/default/template/novalnet/payment/method/info/Invoice.phtml CHANGED
@@ -30,7 +30,7 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditionalData('NnSepaParentTid') : $this->getAdditionalData('NnTid');
33
- $nextCycleDate = $helper->getCycleDate($nextCycleId);
34
  $recurringOrder = $this->getAdditionalData('NnRecurringOrder') ? true : false;
35
  ?>
36
  <?php if ($_info): ?>
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditionalData('NnSepaParentTid') : $this->getAdditionalData('NnTid');
33
+ $nextCycleDate = $this->getAdditionalData('paidUntil') ? $this->getAdditionalData('paidUntil') : '';
34
  $recurringOrder = $this->getAdditionalData('NnRecurringOrder') ? true : false;
35
  ?>
36
  <?php if ($_info): ?>
app/design/frontend/default/default/template/novalnet/payment/method/info/Prepayment.phtml CHANGED
@@ -30,7 +30,7 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditionalData('NnSepaParentTid') : $this->getAdditionalData('NnTid');
33
- $nextCycleDate = $helper->getCycleDate($nextCycleId);
34
  $recurringOrder = $this->getAdditionalData('NnRecurringOrder') ? true : false;
35
  ?>
36
  <?php if ($_info): ?>
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditionalData('NnSepaParentTid') : $this->getAdditionalData('NnTid');
33
+ $nextCycleDate = $this->getAdditionalData('paidUntil') ? $this->getAdditionalData('paidUntil') : '';
34
  $recurringOrder = $this->getAdditionalData('NnRecurringOrder') ? true : false;
35
  ?>
36
  <?php if ($_info): ?>
app/design/frontend/default/default/template/novalnet/payment/method/info/Sepa.phtml CHANGED
@@ -29,7 +29,7 @@ $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditiona
29
  $helper = Mage::helper('novalnet_payment');
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
- $nextCycleDate = $helper->getCycleDate($nextCycleId);
33
  if ($_info):
34
  ?>
35
  <?php
29
  $helper = Mage::helper('novalnet_payment');
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
+ $nextCycleDate = $this->getAdditionalData('paidUntil') ? $this->getAdditionalData('paidUntil') : '';
33
  if ($_info):
34
  ?>
35
  <?php
app/design/frontend/rwd/default/layout/novalnet.xml CHANGED
@@ -31,12 +31,17 @@
31
  <action method="addJs">
32
  <script>novalnet/novalnetJquery.js</script>
33
  </action>
34
- <action method="addJs">
35
- <script>novalnet/novalnetcc.js</script>
36
- </action>
37
  <action method="addJs">
38
  <script>novalnet/novalnetsepa.js</script>
39
  </action>
40
  </reference>
41
  </checkout_onepage_index>
 
 
 
 
 
 
 
 
42
  </layout>
31
  <action method="addJs">
32
  <script>novalnet/novalnetJquery.js</script>
33
  </action>
 
 
 
34
  <action method="addJs">
35
  <script>novalnet/novalnetsepa.js</script>
36
  </action>
37
  </reference>
38
  </checkout_onepage_index>
39
+ <!-- Adjusts Credit Card hosted page loaded in iframe -->
40
+ <novalnet_payment_novalnetcc_index>
41
+ <reference name="root">
42
+ <remove name="right"/>
43
+ <remove name="left"/>
44
+ </reference>
45
+ </novalnet_payment_novalnetcc_index>
46
+ <!-- Adjusts Credit Card hosted page loaded in iframe -->
47
  </layout>
app/design/frontend/rwd/default/template/novalnet/payment/method/form/Banktransfer.phtml CHANGED
@@ -28,15 +28,17 @@ $helper = Mage::helper('novalnet_payment');
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!--{{{ Payment Logo -->
31
- <div>
32
- <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
33
- <?php
34
- $image = "banktransfer.png";
35
- $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
36
- ?>
37
- <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
38
- </a>
39
- </div>
 
 
40
  <!--}}} Payment Logo -->
41
  <!--{{{ Payment Description -->
42
  <li>
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!--{{{ Payment Logo -->
31
+ <?php if ($helper->getModel($code)->getNovalnetConfig('enable_payment_logo', true)): ?>
32
+ <div>
33
+ <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
34
+ <?php
35
+ $image = "banktransfer.png";
36
+ $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
37
+ ?>
38
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
39
+ </a>
40
+ </div>
41
+ <?php endif; ?>
42
  <!--}}} Payment Logo -->
43
  <!--{{{ Payment Description -->
44
  <li>
app/design/frontend/rwd/default/template/novalnet/payment/method/form/Cc.phtml CHANGED
@@ -25,39 +25,24 @@
25
  */
26
  $code = $this->getMethodCode();
27
  $helper = Mage::helper('novalnet_payment');
28
- $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
29
- $refillValues = $assignDatahelper->getCheckout()->getRefilldatavalues();
30
- $creditCardSecure = $this->getMethod()->getConfigData('active_cc3d');
31
- $ccRefill = $this->getMethod()->getNovalnetConfig('auto_refill', true);
32
- // get quote billing address
33
- $checkoutSession = Mage::getSingleton('checkout/session');
34
- $billingaddress = $checkoutSession->getQuote()->getBillingAddress();
35
- $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getTelephone())
36
- ? $billingaddress->getTelephone() : '' ;
37
- $vendorId = $checkoutSession->getNnVendor()
38
- ? $checkoutSession->getNnVendor() : trim($this->getMethod()->getNovalnetConfig('merchant_id', true));
39
- $authCode = $checkoutSession->getNnAuthcode()
40
- ? $checkoutSession->getNnAuthcode() : trim($this->getMethod()->getNovalnetConfig('auth_code', true));
41
  ?>
42
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
43
  <!--{{{ Payment Logo -->
44
- <div>
45
- <a href="<?php echo $helper->getNovalnetUrl(); ?>" target="_new" style="text-decoration:none;float:none;">
46
- <?php foreach ($this->getCcAvailableTypes() as $typeCode => $typeName): ?>
47
- <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $typeCode . ".png"; ?>
48
- <img style="height:20px;display:inline;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
49
- <?php endforeach; ?>
50
- </a>
51
- </div>
 
 
52
  <!--}}} Payment Logo -->
53
- <!--{{{ Novalnet Cc Form -->
54
- <div class="nnccloader" id='cc_loading' style='display:none;'></div>
55
  <li>
56
  <?php
57
- echo $this->__('The amount will be debited from your credit card once the order is submitted');
58
- if ($this->getMethod()->getConfigData('active_cc3d')):
59
- echo "<br>".$this->__('Please don’t close the browser after successful payment, until you have been redirected back to the Shop');
60
- endif;
61
  ?>
62
  </li>
63
  <?php if ($this->getUserInfo()): ?>
@@ -65,125 +50,11 @@ $authCode = $checkoutSession->getNnAuthcode()
65
  <?php echo $this->getUserInfo() ?>
66
  </li>
67
  <?php endif ?>
68
- <?php if (Mage::helper('novalnet_payment')->getModel('novalnetCc')->getNovalnetConfig('live_mode', true) == 0): ?>
69
  <li>
70
  <div style="font-weight:bold;color:red;font-size:12px;">
71
  <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
72
  </div>
73
  </li>
74
  <?php endif ?>
75
- <li>
76
- <p class="required"><?php echo $this->__('* Required Fields') ?></p>
77
- <label for="<?php echo $code ?>_cc_owner" class="required"><em>*</em><?php echo $this->__('NN CC holder') ?></label>
78
- <div class="input-box">
79
- <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="required-entry input-text" id="<?php echo $code ?>_cc_owner" autocomplete="off" onkeypress="return accHolderValidate(event)" onchange="cchashcall()" value="<?php echo $billingaddress->getFirstname() . ' ' . $billingaddress->getLastname(); ?>" />
80
- </div>
81
- </li>
82
- <li>
83
- <label for="<?php echo $code ?>_cc_number" class="required"><em>*</em><?php echo $this->__('NN CC number') ?></label>
84
- <div class="input-box">
85
- <input type="text" id="<?php echo $code ?>_cc_number" title="<?php echo $this->__('Credit Card Number') ?>" class="required-entry input-text" autocomplete="off" onchange="cchashcall()" onkeypress="return isNumberKey(event,true)" value="" />
86
- </div>
87
- </li>
88
- <li>
89
- <label for="<?php echo $code ?>_expiration" class="required"><em>*</em><?php echo $this->__('NN Expiration Date') ?></label>
90
- <div class="input-box">
91
- <div class="v-fix">
92
- <select id="<?php echo $code ?>_expiration" onchange="cchashcall()" class="month validate-cc-exp required-entry" name="<?php echo $code ?>_expiration">
93
- <option value=""><?php echo $this->__('Month'); ?></option>
94
- <?php foreach ($this->getCcMonths() as $k => $v): ?>
95
- <option value="<?php echo $k ?>"><?php echo $v ?></option>
96
- <?php endforeach; ?>
97
- </select>
98
- </div>
99
- <div class="v-fix">
100
- <select id="<?php echo $code ?>_expiration_yr" onchange="cchashcall()" class="year required-entry" name="<?php echo $code ?>_expiration_yr">
101
- <option value=""><?php echo $this->__('Year'); ?></option>
102
- <?php foreach ($this->getCcYears() as $k => $v): ?>
103
- <option value="<?php echo $k ?>"><?php echo $v ?></option>
104
- <?php endforeach; ?>
105
- </select>
106
- </div>
107
- </div>
108
- </li>
109
- <li>
110
- <label for="<?php echo $code ?>_cc_cid" class="required"><em>*</em><?php echo $this->__('NN CVC') ?></label>
111
- <div class="input-box">
112
- <div class="v-fix">
113
- <input type="text" title="<?php echo $this->__('Card Verification Number') ?>" class="input-text cvv required-entry validate-cc-cvn" id="<?php echo $code ?>_cc_cid" name="payment[nn_cc_cid]" value="" onkeypress="return isNumberKey(event, false);"/>
114
- </div>
115
- <a href="#" class="cvv-what-is-this"><?php echo $this->__('What is this?') ?></a>
116
- </div>
117
- </li>
118
- <!--{{{ CallbackType-->
119
- <?php if (!$creditCardSecure && $this->isCallbackTypeCall()): ?>
120
- <!--{{{ PIN by Callback-->
121
- <?php
122
- if ($this->getCallbackConfigData() != 3):
123
- ?>
124
- <li>
125
- <label for="<?php echo $code ?>_callback_tel" class="required"><em>*</em>
126
- <?php if ($this->getCallbackConfigData() == 2): ?>
127
- <?php echo $this->__('Mobile phone number'); ?>
128
- <?php else: ?>
129
- <?php echo $this->__('NN Mobile Number'); ?>
130
- <?php endif; ?>
131
- </label>
132
- <div class="input-box">
133
- <input type="text" autocomplete="off" id="<?php echo $code ?>_callback_tel" name="payment[callback_tel]" title="<?php echo $this->__('Callback') ?>" class="required-entry input-text validate-number" value="<?php echo $telephoneNumber; ?>"/>
134
- </div>
135
- </li>
136
- <li>
137
- <div class="nncallbacknote">
138
- <?php echo $this->__('Note for pin by sms and callback') ?>
139
- </div>
140
- <label for="<?php echo $code ?>_callback_pin" class="required"><em>*</em><?php echo $this->__('PIN') ?></label>
141
- <div class="input-box">
142
- <input onkeydown="document.getElementById('<?php echo $code ?>_new_callback_pin').checked = false;" size="4" type="text" id="<?php echo $code ?>_callback_pin" name="payment[callback_pin]" title="<?php echo $this->__('Callback') ?>" class="input-text" /><br/>
143
- <input id="<?php echo $code ?>_new_callback_pin" type="checkbox" name="payment[new_callback_pin]" value="1">
144
- <label style="float:none;" for="<?php echo $code ?>_new_callback_pin"><?php echo $this->__('Forgot PIN? [New PIN Request]') ?></label>
145
- </div>
146
- </li>
147
- <!--}}} PIN by Callback-->
148
- <!--{{{ Reply by Email-->
149
- <?php elseif ($this->getCallbackConfigData() == 3): ?>
150
- <li>
151
- <label for="<?php echo $code ?>_callback_email" class="required"><em>*</em><?php echo $this->__('E-mail Address') ?></label>
152
- <div class="input-box">
153
- <input type="text" autocomplete="off" id="<?php echo $code ?>_callback_email" name="payment[callback_email]" title="<?php echo $this->__('Callback Email') ?>" class="input-text validate-email required-entry" value="<?php echo $billingaddress->getEmail(); ?>"/>
154
- </div>
155
- </li>
156
- <?php endif ?>
157
- <!--}}} Reply by Email-->
158
- <?php endif ?>
159
- <!--}}} CallbackType-->
160
- <input type="hidden" id="original_vendor_id" value="<?php echo $vendorId ?>" />
161
- <input type="hidden" id="original_vendor_authcode" value="<?php echo $authCode ?>" />
162
- <input type="hidden" id="novalnet_cc_pan_hash" value="<?php echo $ccRefill ? $assignDatahelper->getCheckout()->getCcPanHash() : ''; ?>" />
163
- <input type="hidden" name="novalnet_cc_hash" id="novalnet_cc_hash" value="" />
164
- <input type="hidden" name="novalnet_cc_unique_id" id="novalnet_cc_unique_id" value="<?php echo $ccRefill ? $assignDatahelper->getCheckout()->getCcUniqueId() : ''; ?>" />
165
- <input type="hidden" id="nn_cc_merchant_validate_error_message" value="<?php echo $this->__('Basic parameter not valid') . '!'; ?>" />
166
- <input type="hidden" id="nn_cc_validate_error_message" value="<?php echo $this->__('Your credit card details are invalid') . '!'; ?>" />
167
- <!--}}} Novalnet Cc Form -->
168
  </ul>
169
- <style>
170
- .nnccloader {
171
- position: fixed;
172
- left: 0px;
173
- top: 0px;
174
- width: 100%;
175
- height: 100%;
176
- z-index: 9999;
177
- background: url('<?php echo $helper->getNovalnetPaymentFormLogoUrl() ?>novalnet-loading-icon.gif') 50% 50% no-repeat;
178
- }
179
- .nncallbacknote {
180
- font-weight:bold;
181
- font-size:11px;
182
- color:gray;
183
- border:1px solid #BFBFBF;
184
- background:#FEFFBF;
185
- padding:10px;
186
- margin-top:10px;
187
- width:400px;
188
- }
189
- </style>
25
  */
26
  $code = $this->getMethodCode();
27
  $helper = Mage::helper('novalnet_payment');
 
 
 
 
 
 
 
 
 
 
 
 
 
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!--{{{ Payment Logo -->
31
+ <?php if ($helper->getModel($code)->getNovalnetConfig('enable_payment_logo', true)): ?>
32
+ <div>
33
+ <a href="<?php echo $helper->getNovalnetUrl(); ?>" target="_new" style="text-decoration:none;float:none;">
34
+ <?php foreach ($this->getCcAvailableTypes() as $typeCode => $typeName): ?>
35
+ <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $typeCode . ".png"; ?>
36
+ <img style="display:inline;" src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
37
+ <?php endforeach; ?>
38
+ </a>
39
+ </div>
40
+ <?php endif; ?>
41
  <!--}}} Payment Logo -->
 
 
42
  <li>
43
  <?php
44
+ echo $this->__('redirect payment description');
45
+ echo "<br>".$this->__('Please don’t close the browser after successful payment, until you have been redirected back to the Shop');
 
 
46
  ?>
47
  </li>
48
  <?php if ($this->getUserInfo()): ?>
50
  <?php echo $this->getUserInfo() ?>
51
  </li>
52
  <?php endif ?>
53
+ <?php if ($helper->getModel('novalnetCc')->getNovalnetConfig('live_mode', true) == 0): ?>
54
  <li>
55
  <div style="font-weight:bold;color:red;font-size:12px;">
56
  <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
57
  </div>
58
  </li>
59
  <?php endif ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
60
  </ul>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/rwd/default/template/novalnet/payment/method/form/Cciframe.phtml ADDED
@@ -0,0 +1,54 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the payment module of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ ?>
27
+ <?php
28
+ $code = Novalnet_Payment_Model_Config::NN_CC;
29
+ $helper = Mage::helper('novalnet_payment');
30
+ $paymentRequest = $helper->getCheckoutSession()->getPaymentReqData();
31
+ $payportUrl = Novalnet_Payment_Model_Config::CC_PCI_PAYPORT_URL;
32
+
33
+ // Save Transaction request data
34
+ $transactionTraces = $helper->getModelTransactionOverview();
35
+ $transactionTraces->setOrderId($paymentRequest->getOrderNo())
36
+ ->setRequestData(serialize($paymentRequest->getData()))
37
+ ->setCreatedDate($helper->getCurrentDateTime())
38
+ ->save();
39
+ ?>
40
+ <div class="nnloader style='position: fixed; left: z-index: 9999;' " id="nnloader"
41
+ style="background: url('<?php echo $helper->getNovalnetPaymentFormLogoUrl(); ?>novalnet-loading-icon.gif') 70% 60% no-repeat; height: 70px; "></div>
42
+ <?php
43
+ $form = new Varien_Data_Form();
44
+ $html = '<html><body>';
45
+ echo "<form action='$payportUrl' id='$code' name='$code' method='POST' target='cc_iframe'>";
46
+ foreach ($paymentRequest->getData() as $field=>$value) {
47
+ $form->addField($field, 'hidden', array('name'=>$field, 'value'=>$value));
48
+ }
49
+
50
+ $html.= $form->toHtml();
51
+ $html.="<iframe id='cc_iframe' scrolling='no' style='width:100%;height:450px;border:none;margin-left:-30%' name='cc_iframe' onload=document.getElementById('nnloader').style.display='none'></iframe></form>";
52
+ $html.= '<script type="text/javascript">document.getElementById("' . $code . '").submit();</script>';
53
+ $html.= '</body></html>';
54
+ echo $html;
app/design/frontend/rwd/default/template/novalnet/payment/method/form/Eps.phtml CHANGED
@@ -28,15 +28,17 @@ $helper = Mage::helper('novalnet_payment');
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!--{{{ Payment Logo -->
31
- <div>
32
- <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
33
- <?php
34
- $image = "eps.png";
35
- $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
36
- ?>
37
- <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
38
- </a>
39
- </div>
 
 
40
  <!--}}} Payment Logo -->
41
  <!--{{{ Payment Description -->
42
  <li>
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!--{{{ Payment Logo -->
31
+ <?php if ($helper->getModel($code)->getNovalnetConfig('enable_payment_logo', true)): ?>
32
+ <div>
33
+ <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
34
+ <?php
35
+ $image = "eps.png";
36
+ $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
37
+ ?>
38
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
39
+ </a>
40
+ </div>
41
+ <?php endif; ?>
42
  <!--}}} Payment Logo -->
43
  <!--{{{ Payment Description -->
44
  <li>
app/design/frontend/rwd/default/template/novalnet/payment/method/form/Giropay.phtml ADDED
@@ -0,0 +1,63 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the payment module of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ $code = $this->getMethodCode();
27
+ $helper = Mage::helper('novalnet_payment');
28
+ ?>
29
+ <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
+ <!--{{{ Payment Logo -->
31
+ <?php if ($helper->getModel($code)->getNovalnetConfig('enable_payment_logo', true)): ?>
32
+ <div>
33
+ <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
34
+ <?php
35
+ $image = "giropay.png";
36
+ $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
37
+ ?>
38
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
39
+ </a>
40
+ </div>
41
+ <?php endif; ?>
42
+ <!--}}} Payment Logo -->
43
+ <!--{{{ Payment Description -->
44
+ <li>
45
+ <?php
46
+ echo $this->__('redirect payment description');
47
+ echo "<br>".$this->__('Please don’t close the browser after successful payment, until you have been redirected back to the Shop');
48
+ ?>
49
+ </li>
50
+ <?php if ($this->getUserInfo()): ?>
51
+ <li>
52
+ <?php echo $this->getUserInfo() ?>
53
+ </li>
54
+ <?php endif; ?>
55
+ <?php if ($this->getMethod()->getNovalnetConfig('live_mode', true) == 0): ?>
56
+ <li>
57
+ <div style="font-weight:bold;color:red;font-size:12px;">
58
+ <?php echo $this->__('Please Note: This transaction will run on TEST MODE and the amount will not be charged') ?>
59
+ </div>
60
+ </li>
61
+ <?php endif ?>
62
+ <!--}}} Payment Description -->
63
+ </ul>
app/design/frontend/rwd/default/template/novalnet/payment/method/form/Ideal.phtml CHANGED
@@ -28,15 +28,17 @@ $helper = Mage::helper('novalnet_payment');
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!--{{{ Payment Logo -->
31
- <div>
32
- <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
33
- <?php
34
- $image = "ideal.png";
35
- $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
36
- ?>
37
- <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
38
- </a>
39
- </div>
 
 
40
  <!--}}} Payment Logo -->
41
  <!--{{{ Payment Description -->
42
  <li>
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!--{{{ Payment Logo -->
31
+ <?php if ($helper->getModel($code)->getNovalnetConfig('enable_payment_logo', true)): ?>
32
+ <div>
33
+ <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
34
+ <?php
35
+ $image = "ideal.png";
36
+ $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
37
+ ?>
38
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
39
+ </a>
40
+ </div>
41
+ <?php endif; ?>
42
  <!--}}} Payment Logo -->
43
  <!--{{{ Payment Description -->
44
  <li>
app/design/frontend/rwd/default/template/novalnet/payment/method/form/Invoice.phtml CHANGED
@@ -31,12 +31,14 @@ $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getT
31
  ?>
32
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
33
  <!-- PAYMENT LOGO -->
34
- <div>
35
- <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
36
- <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "invoice.png"; ?>
37
- <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
38
- </a>
39
- </div>
 
 
40
  <!-- PAYMENT LOGO -->
41
  <!--{{{ PAYMENT DESCRIPTION -->
42
  <li>
@@ -84,16 +86,7 @@ $telephoneNumber = ($this->getCallbackConfigData() == 1 && $billingaddress->getT
84
  </div>
85
  </li>
86
  <!--}}} PIN by Callback-->
87
- <!--{{{ Reply by Email-->
88
- <?php elseif ($this->getCallbackConfigData() == 3): ?>
89
- <li>
90
- <label for="<?php echo $code ?>_callback_email" class="required"><em>*</em><?php echo $this->__('E-mail Address') ?></label>
91
- <div class="input-box">
92
- <input type="text" value="<?php echo $billingaddress->getEmail(); ?>" id="<?php echo $code ?>_callback_email" name="payment[callback_email]" title="<?php echo $this->__('Callback Email') ?>" class="input-text validate-email required-entry" />
93
- </div>
94
- </li>
95
  <?php endif ?>
96
- <!--}}} Reply by Email-->
97
  <?php endif ?>
98
  <!--}}} CallbackType-->
99
  </ul>
31
  ?>
32
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
33
  <!-- PAYMENT LOGO -->
34
+ <?php if ($helper->getModel($code)->getNovalnetConfig('enable_payment_logo', true)): ?>
35
+ <div>
36
+ <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
37
+ <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "invoice.png"; ?>
38
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
39
+ </a>
40
+ </div>
41
+ <?php endif; ?>
42
  <!-- PAYMENT LOGO -->
43
  <!--{{{ PAYMENT DESCRIPTION -->
44
  <li>
86
  </div>
87
  </li>
88
  <!--}}} PIN by Callback-->
 
 
 
 
 
 
 
 
89
  <?php endif ?>
 
90
  <?php endif ?>
91
  <!--}}} CallbackType-->
92
  </ul>
app/design/frontend/rwd/default/template/novalnet/payment/method/form/Paypal.phtml CHANGED
@@ -28,15 +28,17 @@ $helper = Mage::helper('novalnet_payment');
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!--{{{ Payment Logo -->
31
- <div>
32
- <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
33
- <?php
34
- $image = "paypal.png";
35
- $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
36
- ?>
37
- <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
38
- </a>
39
- </div>
 
 
40
  <!--}}} Payment Logo -->
41
  <!--{{{ Payment Description -->
42
  <li>
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!--{{{ Payment Logo -->
31
+ <?php if ($helper->getModel($code)->getNovalnetConfig('enable_payment_logo', true)): ?>
32
+ <div>
33
+ <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
34
+ <?php
35
+ $image = "paypal.png";
36
+ $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
37
+ ?>
38
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
39
+ </a>
40
+ </div>
41
+ <?php endif; ?>
42
  <!--}}} Payment Logo -->
43
  <!--{{{ Payment Description -->
44
  <li>
app/design/frontend/rwd/default/template/novalnet/payment/method/form/Prepayment.phtml CHANGED
@@ -28,12 +28,14 @@ $helper = Mage::helper('novalnet_payment');
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!-- PAYMENT LOGO -->
31
- <div>
32
- <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
33
- <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "prepayment.png"; ?>
34
- <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
35
- </a>
36
- </div>
 
 
37
  <!-- PAYMENT LOGO -->
38
  <!--{{{ PAYMENT DESCRIPTION -->
39
  <li>
28
  ?>
29
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
30
  <!-- PAYMENT LOGO -->
31
+ <?php if ($helper->getModel($code)->getNovalnetConfig('enable_payment_logo', true)): ?>
32
+ <div>
33
+ <a href="<?php echo $helper->getNovalnetUrl() ?>" target="_new" style="text-decoration:none;">
34
+ <?php $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . "prepayment.png"; ?>
35
+ <img src="<?php echo $imgpath ?>" alt="<?php echo $this->getMethod()->getConfigData('title') ?>" title="<?php echo $this->getMethod()->getConfigData('title') ?>" />
36
+ </a>
37
+ </div>
38
+ <?php endif; ?>
39
  <!-- PAYMENT LOGO -->
40
  <!--{{{ PAYMENT DESCRIPTION -->
41
  <li>
app/design/frontend/rwd/default/template/novalnet/payment/method/form/Sepa.phtml CHANGED
@@ -26,7 +26,7 @@
26
  $code = $this->getMethodCode();
27
  $helper = Mage::helper('novalnet_payment');
28
  $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
29
- $sepaRefill = $this->getMethod()->getNovalnetConfig('auto_refill', true);
30
  $sepaPaymentRefill = $this->getMethod()->getConfigData('sepa_payment_refill');
31
  $refillValues = $assignDatahelper->getCheckout()->getRefilldatavalues();
32
  $refillMethod = ($sepaRefill && $refillValues && $code == $refillValues->getMethod());
@@ -51,15 +51,17 @@ $authCode = $checkoutSession->getNnAuthcode() ? $checkoutSession->getNnAuthcode(
51
  ?>
52
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
53
  <!--{{{ Payment Logo -->
54
- <div>
55
- <a href="<?php echo $helper->getNovalnetUrl(); ?>" target="_new" style="text-decoration:none;">
56
- <?php
57
- $image = "sepa.png";
58
- $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
59
- ?>
60
- <img src="<?php echo $imgpath; ?>" alt="<?php echo $this->getMethod()->getConfigData('title'); ?>" title="<?php echo $this->getMethod()->getConfigData('title'); ?>" />
61
- </a>
62
- </div>
 
 
63
  <!--}}} Payment Logo -->
64
  <!--{{{ Novalnet SEPA Form -->
65
  <div class="nnsepaloader" id='sepa_loading' style='display:none;'></div>
@@ -160,16 +162,7 @@ $authCode = $checkoutSession->getNnAuthcode() ? $checkoutSession->getNnAuthcode(
160
  </div>
161
  </li>
162
  <!--}}} PIN by Callback-->
163
- <!--{{{ Reply by Email-->
164
- <?php elseif ($this->getCallbackConfigData() == 3): ?>
165
- <li>
166
- <label for="<?php echo $code ?>_callback_email" class="required"><em>*</em><?php echo $this->__('E-mail Address') ?></label>
167
- <div class="input-box">
168
- <input type="text" autocomplete="off" id="<?php echo $code ?>_callback_email" name="payment[callback_email]" title="<?php echo $this->__('Callback Email') ?>" class="input-text validate-email required-entry" value="<?php echo $billingaddress->getEmail(); ?>"/>
169
- </div>
170
- </li>
171
  <?php endif ?>
172
- <!--}}} Reply by Email-->
173
  <?php endif ?>
174
  <!--}}} CallbackType-->
175
  <input id="process_vendor_id" type="hidden" value="<?php echo $vendorId ?>"/>
26
  $code = $this->getMethodCode();
27
  $helper = Mage::helper('novalnet_payment');
28
  $assignDatahelper = Mage::helper('novalnet_payment/AssignData');
29
+ $sepaRefill = $this->getMethod()->getConfigData('auto_refill');
30
  $sepaPaymentRefill = $this->getMethod()->getConfigData('sepa_payment_refill');
31
  $refillValues = $assignDatahelper->getCheckout()->getRefilldatavalues();
32
  $refillMethod = ($sepaRefill && $refillValues && $code == $refillValues->getMethod());
51
  ?>
52
  <ul class="form-list" id="payment_form_<?php echo $code ?>" style="display:none;">
53
  <!--{{{ Payment Logo -->
54
+ <?php if ($helper->getModel($code)->getNovalnetConfig('enable_payment_logo', true)): ?>
55
+ <div>
56
+ <a href="<?php echo $helper->getNovalnetUrl(); ?>" target="_new" style="text-decoration:none;">
57
+ <?php
58
+ $image = "sepa.png";
59
+ $imgpath = $helper->getNovalnetPaymentFormLogoUrl() . $image;
60
+ ?>
61
+ <img src="<?php echo $imgpath; ?>" alt="<?php echo $this->getMethod()->getConfigData('title'); ?>" title="<?php echo $this->getMethod()->getConfigData('title'); ?>" />
62
+ </a>
63
+ </div>
64
+ <?php endif; ?>
65
  <!--}}} Payment Logo -->
66
  <!--{{{ Novalnet SEPA Form -->
67
  <div class="nnsepaloader" id='sepa_loading' style='display:none;'></div>
162
  </div>
163
  </li>
164
  <!--}}} PIN by Callback-->
 
 
 
 
 
 
 
 
165
  <?php endif ?>
 
166
  <?php endif ?>
167
  <!--}}} CallbackType-->
168
  <input id="process_vendor_id" type="hidden" value="<?php echo $vendorId ?>"/>
app/design/frontend/rwd/default/template/novalnet/payment/method/info/Cc.phtml CHANGED
@@ -29,7 +29,7 @@ $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditiona
29
  $helper = Mage::helper('novalnet_payment');
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
- $nextCycleDate = $helper->getCycleDate($nextCycleId);
33
  if ($_info):
34
  ?>
35
  <?php
29
  $helper = Mage::helper('novalnet_payment');
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
+ $nextCycleDate = $this->getAdditionalData('paidUntil') ? $this->getAdditionalData('paidUntil') : '';
33
  if ($_info):
34
  ?>
35
  <?php
app/design/frontend/rwd/default/template/novalnet/payment/method/info/Giropay.phtml ADDED
@@ -0,0 +1,49 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * Part of the payment module of Novalnet AG
16
+ * https://www.novalnet.de
17
+ * If you have found this script useful a small
18
+ * recommendation as well as a comment on merchant form
19
+ * would be greatly appreciated.
20
+ *
21
+ * @category Novalnet
22
+ * @package Novalnet_Payment
23
+ * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+ $_info = $this->getInfo();
27
+ $transactionId = $this->getAdditionalData('NnTid') ? $this->getAdditionalData('NnTid') : $_info->getLastTransId();
28
+ $helper = Mage::helper('novalnet_payment');
29
+ $currentTime = $this->getAdditionalData('voidCreateAt');
30
+ if ($_info):
31
+ ?>
32
+ <?php
33
+ if ($this->getAdditionalData('NnTestOrder'))
34
+ echo '<div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">!', $this->__('Testorder'), '!</div>'
35
+ ?>
36
+ <?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?><br />
37
+ <?php if ($transactionId) echo $this->__('Novalnet Transaction ID: %s', $helper->makeValidNumber($transactionId)) . '<br /><br>' ?>
38
+ <?php if ($this->getAdditionalData('voidTid')) echo $this->__('The transaction has been canceled on %s', $currentTime) . '<br><br>' ?>
39
+ <?php
40
+ if ($this->getAdditionalData('refunded_tid')):
41
+ foreach ($this->getAdditionalData('refunded_tid') as $key => $value):
42
+ echo $this->__('The refund has been executed for the TID: %s with the amount of %s', $helper->makeValidNumber($value['reqtid']), $value['refamount']) . '<br><br>';
43
+ endforeach;
44
+ endif;
45
+ ?>
46
+ <?php if ($this->getAdditionalData('NnComments')) echo $this->getAdditionalData('NnComments'); ?>
47
+ <?php else: ?>
48
+ <?php echo $this->__('Error in getting payment method') ?>
49
+ <?php endif; ?>
app/design/frontend/rwd/default/template/novalnet/payment/method/info/Invoice.phtml CHANGED
@@ -30,7 +30,7 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditionalData('NnSepaParentTid') : $this->getAdditionalData('NnTid');
33
- $nextCycleDate = $helper->getCycleDate($nextCycleId);
34
  $recurringOrder = $this->getAdditionalData('NnRecurringOrder') ? true : false;
35
  ?>
36
  <?php if ($_info): ?>
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditionalData('NnSepaParentTid') : $this->getAdditionalData('NnTid');
33
+ $nextCycleDate = $this->getAdditionalData('paidUntil') ? $this->getAdditionalData('paidUntil') : '';
34
  $recurringOrder = $this->getAdditionalData('NnRecurringOrder') ? true : false;
35
  ?>
36
  <?php if ($_info): ?>
app/design/frontend/rwd/default/template/novalnet/payment/method/info/Prepayment.phtml CHANGED
@@ -30,7 +30,7 @@ $currentUrl = Mage::helper('core/url')->getCurrentUrl();
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditionalData('NnSepaParentTid') : $this->getAdditionalData('NnTid');
33
- $nextCycleDate = $helper->getCycleDate($nextCycleId);
34
  $recurringOrder = $this->getAdditionalData('NnRecurringOrder') ? true : false;
35
  ?>
36
  <?php if ($_info): ?>
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
  $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditionalData('NnSepaParentTid') : $this->getAdditionalData('NnTid');
33
+ $nextCycleDate = $this->getAdditionalData('paidUntil') ? $this->getAdditionalData('paidUntil') : '';
34
  $recurringOrder = $this->getAdditionalData('NnRecurringOrder') ? true : false;
35
  ?>
36
  <?php if ($_info): ?>
app/design/frontend/rwd/default/template/novalnet/payment/method/info/Sepa.phtml CHANGED
@@ -29,7 +29,7 @@ $nextCycleId = $this->getAdditionalData('NnSepaParentTid') ? $this->getAdditiona
29
  $helper = Mage::helper('novalnet_payment');
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
- $nextCycleDate = $helper->getCycleDate($nextCycleId);
33
  if ($_info):
34
  ?>
35
  <?php
29
  $helper = Mage::helper('novalnet_payment');
30
  $currentTime = $this->getAdditionalData('voidCreateAt');
31
  $captureTime = $this->getAdditionalData('CaptureCreateAt');
32
+ $nextCycleDate = $this->getAdditionalData('paidUntil') ? $this->getAdditionalData('paidUntil') : '';
33
  if ($_info):
34
  ?>
35
  <?php
app/locale/de_DE/Novalnet_Payment.csv CHANGED
@@ -19,7 +19,7 @@
19
  "Referrer id description","Geben Sie die Partner-ID der Person / des Unternehmens ein, welche / welches Ihnen Novalnet empfohlen hat."
20
  "Enable auto-fill","Automatisches Eintragen aktivieren"
21
  "Autofill description","Die Zahlungsdetails werden automatisch während des Checkout-Vorgangs in das Zahlungsformular eingetragen."
22
- "Enable default payment method","Default-Zahlungsart aktivieren."
23
  "Payment last success description","Für registrierte Benutzer wird die letzte ausgewählte Zahlungsart als Standardeinstellung beim Checkout ausgewählt."
24
  "Novalnet Use Proxy","Proxy-Server"
25
  "Proxy Host","Host des Proxyservers"
@@ -31,7 +31,7 @@
31
  "Merchant script management","Verwaltung des Händlerskripts"
32
  "Enable debug mode","Debugmodus aktivieren"
33
  "Debug mode description","Setzen Sie den Debugmodus, um das Händlerskript im Debugmodus aufzurufen."
34
- "Enable test mode","Testmodus aktivieren."
35
  "Test mode description","Die Zahlung wird im Testmodus durchgeführt, daher wird der Betrag für diese Transaktion nicht eingezogen."
36
  "Callback order status","Callback-Bestellstatus"
37
  "Enable E-mail notification for callback","Email-Benachrichtigung für Callback aktivieren"
@@ -48,6 +48,7 @@
48
  "Novalnet PayPal","Novalnet PayPal"
49
  "Novalnet iDEAL","Novalnet iDEAL"
50
  "Novalnet Eps","Novalnet Eps"
 
51
  "Enable module","Zahlungsart aktivieren"
52
  "Title","Titel *"
53
  "Enable 3D secure","3D-Secure aktivieren"
@@ -56,8 +57,6 @@
56
  "Order status for the pending payment","Bestellstatus der ausstehenden Zahlung"
57
  "The order has been updated.","Der Auftrag wurde aktualisiert."
58
  "Novalnet Credit Card Types","Kreditkartentyp"
59
- "Limit for expiry year","Limit für das Ablaufjahr"
60
- "Limit for expiry year description","Geben Sie die Zahl für das maximale Limit des Kreditkarten-Ablaufjahres ein. Falls dieses Feld leer ist, wird ein Limit von 25 Jahren ab dem aktuellen Jahr als Standard gesetzt."
61
  "Transaction reference 1","1. Referenz zur Transaktion"
62
  "Transaction reference 2","2. Referenz zur Transaktion"
63
  "Notification for the buyer","Benachrichtigung des Käufers"
@@ -81,7 +80,7 @@
81
  "Invoice payment duration description","Geben Sie die Anzahl der Tage ein, binnen derer die Zahlung bei Novalnet eingehen soll (muss größer als 7 Tage sein). Falls dieses Feld leer ist, werden 14 Tage als Standard-Zahlungsfrist gesetzt."
82
  "Enable the payment Method and activate the Risk and Control option","Zahlungsart und Risikomanagement-Einstellungen aktivieren"
83
  "Enable fraud prevention","Betrugsprüfung aktivieren"
84
- "Enable fraud prevention description","Um den Käufer einer Transaktion zu authentifizieren, werden die PIN oder Email automatisch generiert und an den Käufer geschickt. Dieser Dienst wird nur für Kunden aus DE, AT und CH angeboten."
85
  "Minimum Amount For Callback","Mindestwarenwert für Betrugsprüfungsmodul (in Cent)"
86
  "Minimum Amount For Callback description","Geben Sie den Mindestwarenwert ein, von dem ab das Betrugsprüfungsmodul aktiviert sein soll."
87
  "Orders","Bestellungen"
@@ -97,12 +96,12 @@
97
  "Information","Informationen"
98
  "Novalnet Merchant Admin","Novalnet Händler Admin"
99
  "Novalnet Magento Module","Novalnet Magento Modul"
100
- "None","Keiner"
101
  "PIN by callback","PIN-by-Callback"
102
  "PIN by SMS","PIN-by-SMS"
103
- "Reply via E-mail","Antwort per Email"
104
  "Novalnet Capture","Novalnet Erfassen"
105
- "Novalnet transaction amount","Novalnet Transaktionsbetrag (in Cent)"
 
106
  "Amount Changed","Änderung des Betrags"
107
  "Amount Changed button","Ändern"
108
  "Updated Amount","Geänderter Betrag"
@@ -117,7 +116,6 @@
117
  "Are you sure you want to change the order amount?","Sind Sie sich sicher, dass Sie den Bestellbetrag ändern wollen?"
118
  "Are you sure you want to change the order amount or due date?","Sind Sie sich sicher, dass Sie den Betrag / das Fälligkeitsdatum der Bestellung ändern wollen?"
119
  "Refund payment type","Wählen Sie die Option Rückerstattung aus."
120
- "Account holder","Kontoinhaber"
121
  "IBAN","IBAN"
122
  "BIC","BIC"
123
  "Novalnet Recurring Profiles","Novalnet Wiederkehrende Profile"
@@ -127,7 +125,7 @@
127
  "Payment was successful.","Die Zahlung war erfolgreich."
128
  "Customer successfully returned from Novalnet","Der Kunde wurde erfolgreich von Novalnet zurückgeleitet."
129
  "Novalnet Adjusted Amount","Novalnet Bereinigt Betrag"
130
- "Novalnet Transaction Amount","Novalnet Transaktion betrag"
131
  "Novalnet refunded Amount","Novalnet Betrag erstattet"
132
  "Are you sure you want to do this?","Sind Sie sicher, daß Sie das machen wollen?"
133
  "Cancel","Stornieren"
@@ -158,7 +156,6 @@
158
  "Logging in problems,","Zugangsprobleme,"
159
  "Other reasons","Sonstige"
160
  "Please select the reason of subscription cancellation","Wählen Sie bitte den Grund für die Abonnementskündigung aus."
161
- "Your credit card details are invalid","Ihre Kreditkartendaten sind ungültig."
162
  "Your account details are invalid","Ihre Kontodaten sind ungültig."
163
  "No active payment method for this store","Für diesen Shop ist keine Zahlungsart aktiviert."
164
  "Trial Billing Cycles are not support novalnet payment","Testzeiträume werden von den Novalnet-Zahlungsarten nicht unterstützt"
@@ -168,7 +165,8 @@
168
  "Payment Failed","Zahlung fehlgeschlagen"
169
  "Error in capturing the payment","Fehler bei der Durchführung der Zahlung"
170
  "Gateway request error: %s","Fehler beim übertragen der Daten: %s"
171
- "Basic parameter not valid","Füllen Sie bitte alle Pflichtfelder aus."
 
172
  "Please enter the E-Mail Address","Ihre Emailadresse ist ungültig."
173
  "Novalnet Order Information","Novalnet Bestellinformationen"
174
  "Order-ID","Bestellnummer"
@@ -193,7 +191,7 @@
193
  "Testorder","Testbestellung"
194
  "TID: %s","Novalnet-Transaktions-ID: %s"
195
  "Novalnet Transaction ID: %s","Novalnet-Transaktions-ID: %s"
196
- "Next Payment Date is: %s","Nächste Zahlungstermin ist: %s"
197
  "The transaction has been canceled on %s","Die Transaktion wurde am %s storniert."
198
  "The transaction has been confirmed on %s","Die Buchung wurde am %s bestätigt."
199
  "Subscription Cancellation: %s","Das Abonnement wurde gekündigt wegen: %s"
@@ -209,8 +207,6 @@
209
  "Please transfer the invoice amount with the following information to our payment provider Novalnet AG","Überweisen Sie bitte den Betrag an die unten aufgeführte Bankverbindung unseres Zahlungsdienstleisters Novalnet."
210
  "Due Date","Fälligkeitsdatum"
211
  "NN Account Holder","Kontoinhaber"
212
- "Account Holder2","Kontoinhaber"
213
- "NnAccount number","Kontonummer"
214
  "NN_Bank","Bank"
215
  "NN_Amount","Betrag"
216
  "NN Order No","Bestellnummer"
@@ -219,15 +215,8 @@
219
  "redirect payment description","Nach der erfolgreichen Überprüfung werden Sie auf die abgesicherte Novalnet-Bestellseite umgeleitet, um die Zahlung fortzusetzen."
220
  "Your account will be debited upon the order submission","Ihr Konto wird nach Abschicken der Bestellung belastet."
221
  "Invoice/Prepayment payment description","Nachdem Sie die Bestellung abgeschickt haben, erhalten Sie eine Email mit den Bankdaten, um die Zahlung durchzuführen."
222
- "The amount will be debited from your credit card once the order is submitted","Der Betrag wird von Ihrer Kreditkarte abgebucht, sobald die Bestellung abgeschickt wird."
223
- "NN Select","Auswählen"
224
- "NN CC holder","Name des Karteninhabers"
225
- "NN CC number","Kreditkartennummer"
226
- "NN Expiration Date","Ablaufdatum"
227
- "NN CVC","CVC/CVV/CID"
228
  "Account Holder","Kontoinhaber"
229
  "NN Country","Land der Bank"
230
- "Account Holder","Kontoinhaber"
231
  "IBAN or Account number","IBAN oder Kontonummer"
232
  "BIC or Bank code","BIC oder Bankleitzahl"
233
  "NN Confirm","Hiermit erteile ich das SEPA-Lastschriftmandat und bestätige, dass die angegebene IBAN und BIC korrekt sind."
@@ -239,15 +228,13 @@
239
  "PIN","PIN zu Ihrer Transaktion"
240
  "Forgot PIN? [New PIN Request]","PIN vergessen?"
241
  "The order amount has been changed, please proceed with the new order","Der Bestellbetrag hat sich geändert, setzen Sie bitte die neue Bestellung fort."
242
- "Please reply to the e-mail","In Kürze erhalten Sie eine Email mit Informationen. Schicken Sie bitte eine leere Antwortemail mit der Original-Email zurück."
243
  "You will shortly receive an SMS containing your transaction PIN to complete the payment","In Kürze erhalten Sie eine SMS mit der PIN zu Ihrer Transaktion, um die Zahlung abzuschließen."
244
  "You will shortly receive a transaction PIN through phone call to complete the payment","In Kürze erhalten Sie einen Telefonanruf mit der PIN zu Ihrer Transaktion, um die Zahlung abzuschließen"
245
  "The PIN you entered is incorrect","Die von Ihnen eingegebene PIN ist falsch."
246
  "Please enter your telephone number","Geben Sie bitte Ihre Telefonnummer ein"
247
  "Please enter your mobile number","Geben Sie bitte Ihre Mobiltelefonnummer ein."
248
- "Your E-mail address is invalid","Ihre Emailadresse ist ungültig."
249
  "Customer name/email fields are not valid","Ungültige Werte für die Felder Kundenname-/email"
250
- "The transaction amount %s has been updated successfully on %s","Der Betrag der Transaktion %s wurde am %s Uhr erfolgreich geändert."
251
  "Refund reference","Referenz für die Rückerstattung"
252
  "Period for subsequent subscription cycle","Zeitraum für den folgenden Abonnementzyklus"
253
  "The period of the subsequent subscription cycle (E.g: 1d/1m/1y)","Beschreibung: Zeitraum des folgenden Abonnementzyklus (z.B. 1d/1m/1y)"
@@ -264,8 +251,12 @@
264
  "payment reference three","Verwendungszweck 3: (Bestellnummer)"
265
  "NN_Reference_desc1","Bitte verwenden Sie einen der unten angegebenen Verwendungszwecke für die Überweisung, da nur so Ihr Geldeingang zugeordnet werden kann:"
266
  "NN_Reference_desc2","Bitte verwenden Sie nun der unten angegebenen Verwendungszweck für die Überweisung, da nur so Ihr Geldeingang zugeordnet werden kann:"
267
- "Please select atleast one payment reference.","Wählen Sie mindestens einen Verwendungszweck aus."
268
  "The refund has been executed for the TID: %s with the amount of %s.Your new TID for the refund amount: %s","Die Rückerstattung wurde für die TID: %s mit dem Betrag %s durchgeführt. Ihre neue TID für den erstatteten Betrag: %s"
269
  "The refund has been executed for the TID: %s with the amount of %s","Die Rückerstattung wurde für die TID: %s mit dem Betrag %s durchgeführt."
270
  "Login here with Novalnet merchant credentials. For the activation of new payment methods please contact","Loggen Sie sich hier mit Ihren Novalnet Händler-Zugangsdaten ein. Um neue Zahlungsarten zu aktivieren, kontaktieren Sie bitte"
271
  "Please don’t close the browser after successful payment, until you have been redirected back to the Shop","Bitte schließen Sie den Browser nach der erfolgreichen Zahlung nicht, bis Sie zum Shop zurückgeleitet wurden."
 
 
 
 
19
  "Referrer id description","Geben Sie die Partner-ID der Person / des Unternehmens ein, welche / welches Ihnen Novalnet empfohlen hat."
20
  "Enable auto-fill","Automatisches Eintragen aktivieren"
21
  "Autofill description","Die Zahlungsdetails werden automatisch während des Checkout-Vorgangs in das Zahlungsformular eingetragen."
22
+ "Enable default payment method","Default-Zahlungsart aktivieren"
23
  "Payment last success description","Für registrierte Benutzer wird die letzte ausgewählte Zahlungsart als Standardeinstellung beim Checkout ausgewählt."
24
  "Novalnet Use Proxy","Proxy-Server"
25
  "Proxy Host","Host des Proxyservers"
31
  "Merchant script management","Verwaltung des Händlerskripts"
32
  "Enable debug mode","Debugmodus aktivieren"
33
  "Debug mode description","Setzen Sie den Debugmodus, um das Händlerskript im Debugmodus aufzurufen."
34
+ "Enable test mode","Testmodus aktivieren"
35
  "Test mode description","Die Zahlung wird im Testmodus durchgeführt, daher wird der Betrag für diese Transaktion nicht eingezogen."
36
  "Callback order status","Callback-Bestellstatus"
37
  "Enable E-mail notification for callback","Email-Benachrichtigung für Callback aktivieren"
48
  "Novalnet PayPal","Novalnet PayPal"
49
  "Novalnet iDEAL","Novalnet iDEAL"
50
  "Novalnet Eps","Novalnet Eps"
51
+ "Novalnet Giropay","Novalnet giropay"
52
  "Enable module","Zahlungsart aktivieren"
53
  "Title","Titel *"
54
  "Enable 3D secure","3D-Secure aktivieren"
57
  "Order status for the pending payment","Bestellstatus der ausstehenden Zahlung"
58
  "The order has been updated.","Der Auftrag wurde aktualisiert."
59
  "Novalnet Credit Card Types","Kreditkartentyp"
 
 
60
  "Transaction reference 1","1. Referenz zur Transaktion"
61
  "Transaction reference 2","2. Referenz zur Transaktion"
62
  "Notification for the buyer","Benachrichtigung des Käufers"
80
  "Invoice payment duration description","Geben Sie die Anzahl der Tage ein, binnen derer die Zahlung bei Novalnet eingehen soll (muss größer als 7 Tage sein). Falls dieses Feld leer ist, werden 14 Tage als Standard-Zahlungsfrist gesetzt."
81
  "Enable the payment Method and activate the Risk and Control option","Zahlungsart und Risikomanagement-Einstellungen aktivieren"
82
  "Enable fraud prevention","Betrugsprüfung aktivieren"
83
+ "Enable fraud prevention description","Um den Käufer einer Transaktion zu authentifizieren, werden die PIN automatisch generiert und an den Käufer geschickt. Dieser Dienst wird nur für Kunden aus DE, AT und CH angeboten."
84
  "Minimum Amount For Callback","Mindestwarenwert für Betrugsprüfungsmodul (in Cent)"
85
  "Minimum Amount For Callback description","Geben Sie den Mindestwarenwert ein, von dem ab das Betrugsprüfungsmodul aktiviert sein soll."
86
  "Orders","Bestellungen"
96
  "Information","Informationen"
97
  "Novalnet Merchant Admin","Novalnet Händler Admin"
98
  "Novalnet Magento Module","Novalnet Magento Modul"
99
+ "Novalnet None","Keiner"
100
  "PIN by callback","PIN-by-Callback"
101
  "PIN by SMS","PIN-by-SMS"
 
102
  "Novalnet Capture","Novalnet Erfassen"
103
+ "Novalnet transaction amount","Transaktionsbetrag (in Cent)"
104
+ "Please enter valid account details","Geben Sie bitte gültige Kontodaten ein"
105
  "Amount Changed","Änderung des Betrags"
106
  "Amount Changed button","Ändern"
107
  "Updated Amount","Geänderter Betrag"
116
  "Are you sure you want to change the order amount?","Sind Sie sich sicher, dass Sie den Bestellbetrag ändern wollen?"
117
  "Are you sure you want to change the order amount or due date?","Sind Sie sich sicher, dass Sie den Betrag / das Fälligkeitsdatum der Bestellung ändern wollen?"
118
  "Refund payment type","Wählen Sie die Option Rückerstattung aus."
 
119
  "IBAN","IBAN"
120
  "BIC","BIC"
121
  "Novalnet Recurring Profiles","Novalnet Wiederkehrende Profile"
125
  "Payment was successful.","Die Zahlung war erfolgreich."
126
  "Customer successfully returned from Novalnet","Der Kunde wurde erfolgreich von Novalnet zurückgeleitet."
127
  "Novalnet Adjusted Amount","Novalnet Bereinigt Betrag"
128
+ "Novalnet Transaction Amount","Novalnet Transaktionsbetrag"
129
  "Novalnet refunded Amount","Novalnet Betrag erstattet"
130
  "Are you sure you want to do this?","Sind Sie sicher, daß Sie das machen wollen?"
131
  "Cancel","Stornieren"
156
  "Logging in problems,","Zugangsprobleme,"
157
  "Other reasons","Sonstige"
158
  "Please select the reason of subscription cancellation","Wählen Sie bitte den Grund für die Abonnementskündigung aus."
 
159
  "Your account details are invalid","Ihre Kontodaten sind ungültig."
160
  "No active payment method for this store","Für diesen Shop ist keine Zahlungsart aktiviert."
161
  "Trial Billing Cycles are not support novalnet payment","Testzeiträume werden von den Novalnet-Zahlungsarten nicht unterstützt"
165
  "Payment Failed","Zahlung fehlgeschlagen"
166
  "Error in capturing the payment","Fehler bei der Durchführung der Zahlung"
167
  "Gateway request error: %s","Fehler beim übertragen der Daten: %s"
168
+ "Please fill in all the mandatory fields","Füllen Sie bitte alle Pflichtfelder aus."
169
+ "Basic parameter not valid","Ungültige Parameter für die Händlereinstellungen"
170
  "Please enter the E-Mail Address","Ihre Emailadresse ist ungültig."
171
  "Novalnet Order Information","Novalnet Bestellinformationen"
172
  "Order-ID","Bestellnummer"
191
  "Testorder","Testbestellung"
192
  "TID: %s","Novalnet-Transaktions-ID: %s"
193
  "Novalnet Transaction ID: %s","Novalnet-Transaktions-ID: %s"
194
+ "Next Payment Date is: %s","Nächstes Belastungsdatum: %s"
195
  "The transaction has been canceled on %s","Die Transaktion wurde am %s storniert."
196
  "The transaction has been confirmed on %s","Die Buchung wurde am %s bestätigt."
197
  "Subscription Cancellation: %s","Das Abonnement wurde gekündigt wegen: %s"
207
  "Please transfer the invoice amount with the following information to our payment provider Novalnet AG","Überweisen Sie bitte den Betrag an die unten aufgeführte Bankverbindung unseres Zahlungsdienstleisters Novalnet."
208
  "Due Date","Fälligkeitsdatum"
209
  "NN Account Holder","Kontoinhaber"
 
 
210
  "NN_Bank","Bank"
211
  "NN_Amount","Betrag"
212
  "NN Order No","Bestellnummer"
215
  "redirect payment description","Nach der erfolgreichen Überprüfung werden Sie auf die abgesicherte Novalnet-Bestellseite umgeleitet, um die Zahlung fortzusetzen."
216
  "Your account will be debited upon the order submission","Ihr Konto wird nach Abschicken der Bestellung belastet."
217
  "Invoice/Prepayment payment description","Nachdem Sie die Bestellung abgeschickt haben, erhalten Sie eine Email mit den Bankdaten, um die Zahlung durchzuführen."
 
 
 
 
 
 
218
  "Account Holder","Kontoinhaber"
219
  "NN Country","Land der Bank"
 
220
  "IBAN or Account number","IBAN oder Kontonummer"
221
  "BIC or Bank code","BIC oder Bankleitzahl"
222
  "NN Confirm","Hiermit erteile ich das SEPA-Lastschriftmandat und bestätige, dass die angegebene IBAN und BIC korrekt sind."
228
  "PIN","PIN zu Ihrer Transaktion"
229
  "Forgot PIN? [New PIN Request]","PIN vergessen?"
230
  "The order amount has been changed, please proceed with the new order","Der Bestellbetrag hat sich geändert, setzen Sie bitte die neue Bestellung fort."
 
231
  "You will shortly receive an SMS containing your transaction PIN to complete the payment","In Kürze erhalten Sie eine SMS mit der PIN zu Ihrer Transaktion, um die Zahlung abzuschließen."
232
  "You will shortly receive a transaction PIN through phone call to complete the payment","In Kürze erhalten Sie einen Telefonanruf mit der PIN zu Ihrer Transaktion, um die Zahlung abzuschließen"
233
  "The PIN you entered is incorrect","Die von Ihnen eingegebene PIN ist falsch."
234
  "Please enter your telephone number","Geben Sie bitte Ihre Telefonnummer ein"
235
  "Please enter your mobile number","Geben Sie bitte Ihre Mobiltelefonnummer ein."
 
236
  "Customer name/email fields are not valid","Ungültige Werte für die Felder Kundenname-/email"
237
+ "The transaction amount %s has been updated successfully on %s","Der Betrag der Transaktion %s wurde am %s erfolgreich geändert."
238
  "Refund reference","Referenz für die Rückerstattung"
239
  "Period for subsequent subscription cycle","Zeitraum für den folgenden Abonnementzyklus"
240
  "The period of the subsequent subscription cycle (E.g: 1d/1m/1y)","Beschreibung: Zeitraum des folgenden Abonnementzyklus (z.B. 1d/1m/1y)"
251
  "payment reference three","Verwendungszweck 3: (Bestellnummer)"
252
  "NN_Reference_desc1","Bitte verwenden Sie einen der unten angegebenen Verwendungszwecke für die Überweisung, da nur so Ihr Geldeingang zugeordnet werden kann:"
253
  "NN_Reference_desc2","Bitte verwenden Sie nun der unten angegebenen Verwendungszweck für die Überweisung, da nur so Ihr Geldeingang zugeordnet werden kann:"
254
+ "Payment reference is missing or invalid","Zahlungsreferenz fehlt oder ist ungültig"
255
  "The refund has been executed for the TID: %s with the amount of %s.Your new TID for the refund amount: %s","Die Rückerstattung wurde für die TID: %s mit dem Betrag %s durchgeführt. Ihre neue TID für den erstatteten Betrag: %s"
256
  "The refund has been executed for the TID: %s with the amount of %s","Die Rückerstattung wurde für die TID: %s mit dem Betrag %s durchgeführt."
257
  "Login here with Novalnet merchant credentials. For the activation of new payment methods please contact","Loggen Sie sich hier mit Ihren Novalnet Händler-Zugangsdaten ein. Um neue Zahlungsarten zu aktivieren, kontaktieren Sie bitte"
258
  "Please don’t close the browser after successful payment, until you have been redirected back to the Shop","Bitte schließen Sie den Browser nach der erfolgreichen Zahlung nicht, bis Sie zum Shop zurückgeleitet wurden."
259
+ "Vendor script url","URL für Benachrichtigungen"
260
+ "Vendor script url description","Der URL für Benachrichtigungen dient dazu, Ihre Datenbank / Ihr System auf einem aktuellen Stand zu halten und den Novalnet-Transaktionsstatus abzugleichen."
261
+ "Display payment method logo","Logo der Zahlungsart anzeigen"
262
+ "The payment method logo will be displayed on the checkout page","Das Logo der Zahlungsart wird auf der Checkout-Seite angezeigt."
app/locale/en_US/Novalnet_Payment.csv CHANGED
@@ -37,7 +37,7 @@
37
  "Enable E-mail notification for callback","Enable E-mail notification for callback"
38
  "E-mail To Address","E-mail address (To)"
39
  "Email To address description","E-Mail address of the recipient"
40
- "E-mail Bcc Address","Email address (Bcc)"
41
  "Email Bcc address description","E-Mail address of the recipient for BCC"
42
  "Novalnet Credit Card","Novalnet Credit Card"
43
  "Novalnet Direct Debit SEPA","Novalnet Direct Debit SEPA"
@@ -47,16 +47,15 @@
47
  "Novalnet PayPal","Novalnet PayPal"
48
  "Novalnet iDEAL","Novalnet iDEAL"
49
  "Novalnet Eps","Novalnet Eps"
 
50
  "Enable module","Enable payment method"
51
- "Title","Title *"
52
  "Enable 3D secure","Enable 3D secure"
53
  "CC-3D secure description","The 3D-Secure will be activated for credit cards. The issuing bank prompts the buyer for a password what, in turn, help to prevent a fraudulent payment. It can be used by the issuing bank as evidence that the buyer is indeed their card holder. This is intended to help decrease a risk of charge-back."
54
  "Order completion status","Order completion status"
55
  "Order status for the pending payment","Order status for the pending payment"
56
  "The order has been updated.","The order has been updated."
57
  "Novalnet Credit Card Types","Credit Card type"
58
- "Limit for expiry year","Limit for expiry year"
59
- "Limit for expiry year description","Enter the number for the maximum limit of credit card expiry year. In case if the field is empty, limit of 25 years from the current year will be set by default"
60
  "Transaction reference 1","Transaction reference 1"
61
  "Transaction reference 2","Transaction reference 2"
62
  "Notification for the buyer","Notification for the buyer"
@@ -80,7 +79,7 @@
80
  "Invoice payment duration description","Enter the number of days to transfer the payment amount to Novalnet (must be greater than 7 days). In case if the field is empty, 14 days will be set as due date by default"
81
  "Enable the payment Method and activate the Risk and Control option","Enable the payment Method and activate the Risk and Control option"
82
  "Enable fraud prevention","Enable fraud prevention"
83
- "Enable fraud prevention description","To authenticate the buyer for a transaction, the PIN or E-Mail will be automatically generated and sent to the buyer. This service is only available for customers from DE, AT, CH"
84
  "Minimum Amount For Callback","Minimum value of goods for the fraud module (in cents)"
85
  "Minimum Amount For Callback description","Enter the minimum value of goods from which the fraud module should be activated"
86
  "Orders","Orders"
@@ -96,10 +95,9 @@
96
  "Information","Information"
97
  "Novalnet Merchant Admin","Novalnet Merchant Admin"
98
  "Novalnet Magento Module","Novalnet Magento Module"
99
- "None","None"
100
  "PIN by callback","PIN by callback"
101
  "PIN by SMS","PIN by SMS"
102
- "Reply via E-mail","Reply via E-mail"
103
  "Novalnet Capture","Novalnet Capture"
104
  "Amount Changed","Amount Change"
105
  "Amount Changed button","Update"
@@ -117,7 +115,6 @@
117
  "Are you sure you want to change the order amount?","Are you sure you want to change the order amount?"
118
  "Are you sure you want to change the order amount or due date?","Are you sure you want to change the order amount or due date?"
119
  "Refund payment type","Select the refund option"
120
- "Account holder","Account holder"
121
  "IBAN","IBAN"
122
  "BIC","BIC"
123
  "Novalnet Recurring Profiles","Novalnet Recurring Profiles"
@@ -129,7 +126,8 @@
129
  "Novalnet Adjusted Amount","Novalnet Adjusted Amount"
130
  "Novalnet Transaction Amount","Novalnet Transaction Amount"
131
  "Novalnet refunded Amount","Novalnet refunded Amount"
132
- "Novalnet transaction amount","Novalnet transaction amount (in cents)"
 
133
  "Are you sure you want to do this?","Are you sure you want to do this?"
134
  "Cancel","Cancel"
135
  "Continue","Continue"
@@ -161,7 +159,6 @@
161
  "Logging in problems,","Logging in problems,"
162
  "Other reasons","Other"
163
  "Please select the reason of subscription cancellation","Please select the reason of subscription cancellation"
164
- "Your credit card details are invalid","Your credit card details are invalid"
165
  "Your account details are invalid","Your account details are invalid"
166
  "No active payment method for this store","No active payment method for this store"
167
  "Trial Billing Cycles are not support novalnet payment","Trial Billing Cycles are not support novalnet payment"
@@ -171,7 +168,8 @@
171
  "Payment Failed","Payment Failed"
172
  "Error in capturing the payment","Error in capturing the payment"
173
  "Gateway request error: %s","Gateway request error: %s"
174
- "Basic parameter not valid","Please fill in all the mandatory fields"
 
175
  "Please enter the E-Mail Address","Your E-mail address is invalid"
176
  "Novalnet Order Information","Novalnet Order Information"
177
  "Order-ID","Order-ID"
@@ -196,7 +194,7 @@
196
  "Testorder","Testorder"
197
  "TID: %s","Novalnet Transaction ID: %s"
198
  "Novalnet Transaction ID: %s","Novalnet Transaction ID: %s"
199
- "Next Payment Date is: %s","Next Payment Date is: %s"
200
  "The transaction has been canceled on %s","The transaction has been canceled on %s"
201
  "The transaction has been confirmed on %s","The transaction has been confirmed on %s"
202
  "Subscription Cancellation: %s","Subscription has been canceled due to: %s"
@@ -212,8 +210,6 @@
212
  "Please transfer the invoice amount with the following information to our payment provider Novalnet AG","Please transfer the amount to the below mentioned account details of our payment processor Novalnet"
213
  "Due Date","Due date"
214
  "NN Account Holder","Account holder"
215
- "Account Holder2","Account holder"
216
- "NnAccount number","Account Number"
217
  "NN_Bank","Bank"
218
  "NN_Amount","Amount"
219
  "NN Order No","Order number"
@@ -221,12 +217,6 @@
221
  "redirect payment description","After the successful verification, you will be redirected to Novalnet secure order page to proceed with the payment"
222
  "Your account will be debited upon the order submission","Your account will be debited upon the order submission"
223
  "Invoice/Prepayment payment description","Once you've submitted the order, you will receive an e-mail with account details to make payment"
224
- "The amount will be debited from your credit card once the order is submitted","The amount will be debited from your credit card once the order is submitted"
225
- "NN Select","Select"
226
- "NN CC holder","Card holder name"
227
- "NN CC number","Card number"
228
- "NN Expiration Date","Expiry date"
229
- "NN CVC","CVC/CVV/CID"
230
  "Account Holder","Account holder"
231
  "NN Country","Bank country"
232
  "IBAN or Account number","IBAN or Account number"
@@ -241,12 +231,10 @@
241
  "PIN","Transaction PIN"
242
  "Forgot PIN? [New PIN Request]","Forgot your PIN?"
243
  "The order amount has been changed, please proceed with the new order","The order amount has been changed, please proceed with the new order"
244
- "Please reply to the e-mail","You will shortly receive an information e-mail, please send the empty reply incl. the original e-mail"
245
  "You will shortly receive an SMS containing your transaction PIN to complete the payment","You will shortly receive an SMS containing your transaction PIN to complete the payment"
246
  "The PIN you entered is incorrect","The PIN you entered is incorrect"
247
  "Please enter your telephone number","Please enter your telephone number"
248
  "Please enter your mobile number","Please enter your mobile number"
249
- "Your E-mail address is invalid","Your E-mail address is invalid"
250
  "Customer name/email fields are not valid","Customer name/email fields are not valid"
251
  "Refund reference","Refund reference"
252
  "Period for subsequent subscription cycle","Period for subsequent subscription cycle"
@@ -258,11 +246,15 @@
258
  "NN_Reference3","Payment Reference 3"
259
  "payment reference one","Payment Reference 1 (Novalnet Invoice Reference)"
260
  "payment reference two","Payment Reference 2 (TID)"
261
- "payment reference three","Payment Reference 3 (Order No)"
262
  "NN_Reference_desc1","Please use any one of the following references as the payment reference, as only through this way your payment is matched and assigned to the order:"
263
  "NN_Reference_desc2","Please use the following payment reference for your money transfer, as only through this way your payment is matched and assigned to the order:"
264
- "Please select atleast one payment reference.","Please select atleast one payment reference."
265
  "The refund has been executed for the TID: %s with the amount of %s.Your new TID for the refund amount: %s","The refund has been executed for the TID: %s with the amount of %s.Your new TID for the refund amount: %s"
266
  "The refund has been executed for the TID: %s with the amount of %s","The refund has been executed for the TID: %s with the amount of %s."
267
  "Login here with Novalnet merchant credentials. For the activation of new payment methods please contact","Login here with Novalnet merchant credentials. For the activation of new payment methods please contact"
268
  "Please don’t close the browser after successful payment, until you have been redirected back to the Shop","Please don’t close the browser after successful payment, until you have been redirected back to the Shop"
 
 
 
 
37
  "Enable E-mail notification for callback","Enable E-mail notification for callback"
38
  "E-mail To Address","E-mail address (To)"
39
  "Email To address description","E-Mail address of the recipient"
40
+ "E-mail Bcc Address","E-mail address (Bcc)"
41
  "Email Bcc address description","E-Mail address of the recipient for BCC"
42
  "Novalnet Credit Card","Novalnet Credit Card"
43
  "Novalnet Direct Debit SEPA","Novalnet Direct Debit SEPA"
47
  "Novalnet PayPal","Novalnet PayPal"
48
  "Novalnet iDEAL","Novalnet iDEAL"
49
  "Novalnet Eps","Novalnet Eps"
50
+ "Novalnet Giropay","Novalnet giropay"
51
  "Enable module","Enable payment method"
52
+ "Title","Novalnet Title *"
53
  "Enable 3D secure","Enable 3D secure"
54
  "CC-3D secure description","The 3D-Secure will be activated for credit cards. The issuing bank prompts the buyer for a password what, in turn, help to prevent a fraudulent payment. It can be used by the issuing bank as evidence that the buyer is indeed their card holder. This is intended to help decrease a risk of charge-back."
55
  "Order completion status","Order completion status"
56
  "Order status for the pending payment","Order status for the pending payment"
57
  "The order has been updated.","The order has been updated."
58
  "Novalnet Credit Card Types","Credit Card type"
 
 
59
  "Transaction reference 1","Transaction reference 1"
60
  "Transaction reference 2","Transaction reference 2"
61
  "Notification for the buyer","Notification for the buyer"
79
  "Invoice payment duration description","Enter the number of days to transfer the payment amount to Novalnet (must be greater than 7 days). In case if the field is empty, 14 days will be set as due date by default"
80
  "Enable the payment Method and activate the Risk and Control option","Enable the payment Method and activate the Risk and Control option"
81
  "Enable fraud prevention","Enable fraud prevention"
82
+ "Enable fraud prevention description","To authenticate the buyer for a transaction, the PIN will be automatically generated and sent to the buyer. This service is only available for customers from DE, AT, CH"
83
  "Minimum Amount For Callback","Minimum value of goods for the fraud module (in cents)"
84
  "Minimum Amount For Callback description","Enter the minimum value of goods from which the fraud module should be activated"
85
  "Orders","Orders"
95
  "Information","Information"
96
  "Novalnet Merchant Admin","Novalnet Merchant Admin"
97
  "Novalnet Magento Module","Novalnet Magento Module"
98
+ "Novalnet None","None"
99
  "PIN by callback","PIN by callback"
100
  "PIN by SMS","PIN by SMS"
 
101
  "Novalnet Capture","Novalnet Capture"
102
  "Amount Changed","Amount Change"
103
  "Amount Changed button","Update"
115
  "Are you sure you want to change the order amount?","Are you sure you want to change the order amount?"
116
  "Are you sure you want to change the order amount or due date?","Are you sure you want to change the order amount or due date?"
117
  "Refund payment type","Select the refund option"
 
118
  "IBAN","IBAN"
119
  "BIC","BIC"
120
  "Novalnet Recurring Profiles","Novalnet Recurring Profiles"
126
  "Novalnet Adjusted Amount","Novalnet Adjusted Amount"
127
  "Novalnet Transaction Amount","Novalnet Transaction Amount"
128
  "Novalnet refunded Amount","Novalnet refunded Amount"
129
+ "Please enter valid account details","Please enter valid account details"
130
+ "Novalnet transaction amount","Transaction amount (in cents)"
131
  "Are you sure you want to do this?","Are you sure you want to do this?"
132
  "Cancel","Cancel"
133
  "Continue","Continue"
159
  "Logging in problems,","Logging in problems,"
160
  "Other reasons","Other"
161
  "Please select the reason of subscription cancellation","Please select the reason of subscription cancellation"
 
162
  "Your account details are invalid","Your account details are invalid"
163
  "No active payment method for this store","No active payment method for this store"
164
  "Trial Billing Cycles are not support novalnet payment","Trial Billing Cycles are not support novalnet payment"
168
  "Payment Failed","Payment Failed"
169
  "Error in capturing the payment","Error in capturing the payment"
170
  "Gateway request error: %s","Gateway request error: %s"
171
+ "Please fill in all the mandatory fields","Please fill in all the mandatory fields"
172
+ "Basic parameter not valid","Basic parameter not valid"
173
  "Please enter the E-Mail Address","Your E-mail address is invalid"
174
  "Novalnet Order Information","Novalnet Order Information"
175
  "Order-ID","Order-ID"
194
  "Testorder","Testorder"
195
  "TID: %s","Novalnet Transaction ID: %s"
196
  "Novalnet Transaction ID: %s","Novalnet Transaction ID: %s"
197
+ "Next Payment Date is: %s","Next charging date: %s"
198
  "The transaction has been canceled on %s","The transaction has been canceled on %s"
199
  "The transaction has been confirmed on %s","The transaction has been confirmed on %s"
200
  "Subscription Cancellation: %s","Subscription has been canceled due to: %s"
210
  "Please transfer the invoice amount with the following information to our payment provider Novalnet AG","Please transfer the amount to the below mentioned account details of our payment processor Novalnet"
211
  "Due Date","Due date"
212
  "NN Account Holder","Account holder"
 
 
213
  "NN_Bank","Bank"
214
  "NN_Amount","Amount"
215
  "NN Order No","Order number"
217
  "redirect payment description","After the successful verification, you will be redirected to Novalnet secure order page to proceed with the payment"
218
  "Your account will be debited upon the order submission","Your account will be debited upon the order submission"
219
  "Invoice/Prepayment payment description","Once you've submitted the order, you will receive an e-mail with account details to make payment"
 
 
 
 
 
 
220
  "Account Holder","Account holder"
221
  "NN Country","Bank country"
222
  "IBAN or Account number","IBAN or Account number"
231
  "PIN","Transaction PIN"
232
  "Forgot PIN? [New PIN Request]","Forgot your PIN?"
233
  "The order amount has been changed, please proceed with the new order","The order amount has been changed, please proceed with the new order"
 
234
  "You will shortly receive an SMS containing your transaction PIN to complete the payment","You will shortly receive an SMS containing your transaction PIN to complete the payment"
235
  "The PIN you entered is incorrect","The PIN you entered is incorrect"
236
  "Please enter your telephone number","Please enter your telephone number"
237
  "Please enter your mobile number","Please enter your mobile number"
 
238
  "Customer name/email fields are not valid","Customer name/email fields are not valid"
239
  "Refund reference","Refund reference"
240
  "Period for subsequent subscription cycle","Period for subsequent subscription cycle"
246
  "NN_Reference3","Payment Reference 3"
247
  "payment reference one","Payment Reference 1 (Novalnet Invoice Reference)"
248
  "payment reference two","Payment Reference 2 (TID)"
249
+ "payment reference three","Payment Reference 3 (Order Number)"
250
  "NN_Reference_desc1","Please use any one of the following references as the payment reference, as only through this way your payment is matched and assigned to the order:"
251
  "NN_Reference_desc2","Please use the following payment reference for your money transfer, as only through this way your payment is matched and assigned to the order:"
252
+ "Payment reference is missing or invalid","Payment reference is missing or invalid"
253
  "The refund has been executed for the TID: %s with the amount of %s.Your new TID for the refund amount: %s","The refund has been executed for the TID: %s with the amount of %s.Your new TID for the refund amount: %s"
254
  "The refund has been executed for the TID: %s with the amount of %s","The refund has been executed for the TID: %s with the amount of %s."
255
  "Login here with Novalnet merchant credentials. For the activation of new payment methods please contact","Login here with Novalnet merchant credentials. For the activation of new payment methods please contact"
256
  "Please don’t close the browser after successful payment, until you have been redirected back to the Shop","Please don’t close the browser after successful payment, until you have been redirected back to the Shop"
257
+ "Vendor script url","Notification URL"
258
+ "Vendor script url description","The notification URL is used to keep your database/system actual and synchronizes with the Novalnet transaction status."
259
+ "Display payment method logo","Display payment method logo"
260
+ "The payment method logo will be displayed on the checkout page","The payment method logo will be displayed on the checkout page"
js/novalnet/novalnetcc.js DELETED
@@ -1,238 +0,0 @@
1
- /**
2
- * Magento
3
- *
4
- * NOTICE OF LICENSE
5
- *
6
- * This source file is subject to the Open Software License (OSL 3.0)
7
- * that is bundled with this package in the file LICENSE.txt.
8
- * It is also available through the world-wide-web at this URL:
9
- * http://opensource.org/licenses/osl-3.0.php
10
- * If you did not receive a copy of the license and are unable to
11
- * obtain it through the world-wide-web, please send an email
12
- * to license@magentocommerce.com so we can send you a copy immediately.
13
- *
14
- * Part of the payment module of Novalnet AG
15
- * https://www.novalnet.de
16
- * If you have found this script useful a small
17
- * recommendation as well as a comment on merchant form
18
- * would be greatly appreciated.
19
- *
20
- * @category js
21
- * @package Novalnet_Payment
22
- * @copyright Copyright (c) Novalnet AG. (https://www.novalnet.de)
23
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
24
- */
25
- var $nncc_j = jQuery.noConflict();
26
-
27
- function cchashcall()
28
- {
29
- $nncc_j('#novalnet_cc_hash').val('');
30
- $nncc_j('#novalnet_cc_unique_id').val('');
31
- var merchantVendor = $nncc_j('#original_vendor_id').val();
32
- var merchantAuthcode = $nncc_j('#original_vendor_authcode').val();
33
-
34
- if (merchantVendor == undefined || merchantVendor == '' || merchantAuthcode == undefined || merchantAuthcode == '') {
35
- alert($nncc_j('#nn_cc_merchant_validate_error_message').val());
36
- return false;
37
- }
38
-
39
- var ccParams = {'ccHolder':'cc_owner', 'ccNo':'cc_number', 'ccExpMonth':'expiration', 'ccExpYear':'expiration_yr'};
40
-
41
- var isNotEmpty = true;
42
- $nncc_j.each(ccParams, function( key, value ) {
43
- if (key == 'ccHolder' && (/[\/\\|\]\[|#,+()$@~%.`'":;*?<>!^{}=_]/g).test($nncc_j('#novalnetCc_'+value).val())) {
44
- alert($nncc_j('#nn_cc_validate_error_message').val());
45
- isNotEmpty = false;
46
- return isNotEmpty;
47
- }
48
- ccParams[key] = $nncc_j.trim($nncc_j('#novalnetCc_'+value).val());
49
- if (ccParams[key] == undefined || ccParams[key] == '') {
50
- isNotEmpty = false;
51
- return isNotEmpty;
52
- }
53
- });
54
-
55
- if (isNotEmpty) {
56
- var currentDateVal = new Date();
57
- if (ccParams['ccExpYear'] == currentDateVal.getFullYear() && ccParams['ccExpMonth'] < (currentDateVal.getMonth()+1)) {
58
- alert($nncc_j('#nn_cc_validate_error_message').val());
59
- return false;
60
- }
61
-
62
- $nncc_j('#cc_loading').show();
63
- var ccUniqueId = generateUniqueId();
64
- var ccNum = ccParams['ccNo'].replace(/\s+/g, '');
65
-
66
- var ccPayportParams = {"noval_cc_exp_month" : ccParams['ccExpMonth'], "noval_cc_exp_year" : ccParams['ccExpYear'], "noval_cc_holder" : ccParams['ccHolder'], "noval_cc_no" : ccNum, "noval_cc_type" : "VI", "unique_id": ccUniqueId, "vendor_authcode" : merchantAuthcode,"vendor_id" : merchantVendor};
67
-
68
- ccPayportParams = $nncc_j.param(ccPayportParams);
69
-
70
- ccCrossDomainAjax(ccPayportParams, 'hash_call');
71
- }
72
- }
73
-
74
- function ccCrossDomainAjax(reqData, reqCall)
75
- {
76
- // IE8 & 9 only Cross domain JSON POST request
77
- if ('XDomainRequest' in window && window.XDomainRequest !== '') {
78
- var xdr = new XDomainRequest(); // Use Microsoft XDR
79
- var payportUrl = getCcHttpProtocol();
80
- xdr.open('POST', payportUrl);
81
- xdr.onload = function() {
82
- getCcHashResult($nncc_j.parseJSON(this.responseText), reqCall);
83
- };
84
-
85
- xdr.onerror = function() {
86
- $nncc_j('#cc_loading').hide();
87
- };
88
-
89
- xdr.send(reqData);
90
- } else {
91
- var payportUrl = getCcHttpProtocol();
92
- $nncc_j.ajax({
93
- type: 'POST',
94
- url: payportUrl,
95
- data: reqData,
96
- dataType: 'json',
97
- success: function(data) {
98
- getCcHashResult(data, reqCall);
99
- },
100
- error: function (error) {
101
- $nncc_j('#cc_loading').hide();
102
- }
103
- });
104
- }
105
- }
106
-
107
- function getCcHashResult(response, reqCall)
108
- {
109
- $nncc_j('#cc_loading').hide();
110
- if(response.hash_result == 'success') {
111
- if (reqCall == 'hash_call') {
112
- $nncc_j('#novalnet_cc_hash').val(response.pan_hash);
113
- $nncc_j('#novalnet_cc_hash').attr('disabled',false);
114
- $nncc_j('#novalnet_cc_unique_id').val(response.unique_id);
115
- $nncc_j('#novalnet_cc_unique_id').attr('disabled',false);
116
- } else if (reqCall == 'refill_call') {
117
- var params = response.hash_string+"&";
118
- params = params.split("=");
119
- var arrayResult={};
120
- $nncc_j.each( params, function( i, keyVal ){
121
- var rkey = rval ="";
122
- if(i >0 ){
123
- rkey = params[i -1].substring(params[i -1].lastIndexOf("&") + 1, params[i -1].length);
124
- rval = keyVal.substring(0, keyVal.lastIndexOf("&") + 0);
125
- arrayResult[rkey] = rval;
126
- }
127
- });
128
-
129
- try
130
- {
131
- $nncc_j('#novalnetCc_cc_owner').val(removeUnwantedSpecialCharsForCc($nncc_j.trim(decodeURIComponent(escape(arrayResult.cc_holder)))));
132
- } catch(e) {
133
- $nncc_j('#novalnetCc_cc_owner').val(removeUnwantedSpecialCharsForCc($nncc_j.trim(arrayResult.cc_holder)));
134
- }
135
-
136
- $nncc_j('#novalnetCc_cc_number').val(arrayResult.cc_no);
137
- $nncc_j('#novalnetCc_expiration').val(arrayResult.cc_exp_month);
138
- $nncc_j('#novalnetCc_expiration_yr').val(arrayResult.cc_exp_year);
139
- $nncc_j('#novalnet_cc_hash').val(response.pan_hash);
140
- }
141
- } else {
142
- alert(response.hash_result);
143
- return false;
144
- }
145
- }
146
-
147
- function removeUnwantedSpecialCharsForCc(value)
148
- {
149
- if (value != 'undefined' || value != '') {
150
- value.replace(/^\s+|\s+$/g, '');
151
- return value.replace(/[\/\\|\]\[|#@,+()'`$~%.":;*?<>!^{}=_-]/g,'');
152
- }
153
- }
154
-
155
- function getNumbersOnly(value)
156
- {
157
- return value.replace(/[^0-9]/g, '');
158
- }
159
-
160
- function ccRefillCall()
161
- {
162
- var ccPanhash = '';
163
- var ccPanhash = $nncc_j('#novalnet_cc_pan_hash').val();
164
- if(ccPanhash == '' || ccPanhash == undefined) {return false;}
165
-
166
- var merchantVendor = $nncc_j('#original_vendor_id').val();
167
- var merchantAuthcode = $nncc_j('#original_vendor_authcode').val();
168
- var ccUniqueid = $nncc_j('#novalnet_cc_unique_id').val();
169
- if (merchantVendor == undefined || merchantVendor == '' || merchantAuthcode == undefined || merchantAuthcode == ''
170
- || ccUniqueid == undefined || ccUniqueid == '') {
171
- return false;
172
- }
173
-
174
- $nncc_j('#cc_loading').show();
175
- var ccPayportParams = "pan_hash="+ccPanhash+"&unique_id="+ccUniqueid+"&vendor_authcode="+merchantAuthcode+"&vendor_id="+merchantVendor;
176
- ccCrossDomainAjax(ccPayportParams, 'refill_call');
177
- }
178
-
179
- function getCcHttpProtocol()
180
- {
181
- var url = location.href;
182
- var urlArr = url.split('://');
183
- var urlPrefix = ((urlArr[0] != '' && urlArr[0] == 'https') ? 'https' : 'http');
184
- return urlPrefix + "://payport.novalnet.de/payport_cc_pci";
185
- }
186
-
187
- function isNumberKey(evt, allowspace)
188
- {
189
- var charCode = (evt.which) ? evt.which : evt.keyCode;
190
- if (String.fromCharCode(evt.which) == '.' || String.fromCharCode(evt.which) == "'" || String.fromCharCode(evt.which) == '#') return false;
191
-
192
- if ((charCode == 32 && allowspace == true) || (charCode == 35 || charCode == 36 || charCode == 37 || charCode == 39 || charCode == 46) && evt.shiftKey == false) {
193
- return true;
194
- } else if (evt.ctrlKey == true && charCode == 114) {
195
- return true;
196
- } else if (charCode > 31 && (charCode < 48 || charCode > 57)) {
197
- return false;
198
- } else {
199
- return true;
200
- }
201
-
202
- return true;
203
- }
204
-
205
- function accHolderValidate(event)
206
- {
207
- var keycode = ('which' in event) ? event.which : event.keyCode;
208
- var reg = /^(?:[A-Za-z0-9&\s-]+$)/;
209
- return (reg.test(String.fromCharCode(keycode)) || keycode == 0 || keycode == 8 || (event.ctrlKey == true && keycode == 114))? true : false;
210
- }
211
-
212
- function generateUniqueId()
213
- {
214
- var length = 30; //Maximum Hash Limit
215
- var str = "";
216
- for (var i = 0; i < length; ++i) {
217
- str += String.fromCharCode(Math.floor(Math.random() * (90 - 65 + 1)) + 65); //Uppercase Char
218
- if (Math.floor(Math.random() * (122 * Math.random())) > 5) {
219
- str += String.fromCharCode(Math.floor(Math.random() * (97 - 122 + 1)) + 122); //Lowercase Char
220
- }
221
- if (Math.floor(Math.random() * (122 * Math.random())) > 30) {
222
- str += Math.floor(Math.random() * (97 - 122 + 1)) + 122; //Random number from 97 to 122
223
- }
224
- }
225
- fromLimit = Math.floor(Math.random() * (5 - 30 + 1)) + 20; //Random split from limit
226
- return str.substring(fromLimit, fromLimit + length);
227
- }
228
-
229
- ccRefillCall();
230
- $nncc_j(document).ready(function() {
231
- Ajax.Responders.register({ onComplete: function() {
232
- if (Ajax.activeRequestCount == 0 && $nncc_j('input[name="payment[method]"]:checked').val() == 'novalnetCc'
233
- && $nncc_j('#novalnetCc_cc_cid').val() == '') {
234
- ccRefillCall();
235
- }
236
- }
237
- });
238
- });
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
js/novalnet/novalnetsepa.js CHANGED
@@ -194,10 +194,10 @@ function sepaRefillcall()
194
 
195
  function sepaCrossDomainAjax(reqData, reqCall)
196
  {
 
197
  // IE8 & 9 only Cross domain JSON POST request
198
  if ('XDomainRequest' in window && window.XDomainRequest !== '') {
199
  var xdr = new XDomainRequest(); // Use Microsoft XDR
200
- var payportUrl = getSepaHttpProtocol();
201
  xdr.open('POST', payportUrl);
202
  xdr.onload = function() {
203
  getSepaHashResult($nnsepa_j.parseJSON(this.responseText), reqCall);
@@ -210,7 +210,6 @@ function sepaCrossDomainAjax(reqData, reqCall)
210
 
211
  xdr.send(reqData);
212
  } else {
213
- var payportUrl = getSepaHttpProtocol();
214
  $nnsepa_j.ajax({
215
  type: 'POST',
216
  url: payportUrl,
@@ -303,9 +302,9 @@ function removeUnwantedSpecialChars(value, req)
303
  if (value != 'undefined' || value != '') {
304
  value.replace(/^\s+|\s+$/g, '');
305
  if (req != 'undefined' && req == 'holder') {
306
- return value.replace(/[\/\\|\]\[|#@,+()`'$~%.":;*?<>!^{}=_]/g,'');
307
  } else {
308
- return value.replace(/[\/\\|\]\[|#@,+()`'$~%.":;*?<>!^{}=_-]/g,'');
309
  }
310
  }
311
  }
@@ -314,7 +313,7 @@ function ibanbicValidate(event)
314
  {
315
  var keycode = ('which' in event) ? event.which : event.keyCode;
316
  var reg = /^(?:[A-Za-z0-9]+$)/;
317
- if(event.target.id == 'novalnetSepa_account_holder') var reg = /^(?:[A-Za-z0-9&\s-]+$)/;
318
  return (reg.test(String.fromCharCode(keycode)) || keycode == 0 || keycode == 8 || (event.ctrlKey == true && keycode == 114))? true : false;
319
  }
320
 
@@ -335,14 +334,6 @@ function generateUniqueId()
335
  return str.substring(fromLimit, fromLimit + length);
336
  }
337
 
338
- function getSepaHttpProtocol()
339
- {
340
- var url = location.href;
341
- var urlArr = url.split('://');
342
- var urlPrefix = ((urlArr[0] != '' && urlArr[0] == 'https') ? 'https' : 'http');
343
- return urlPrefix + "://payport.novalnet.de/sepa_iban";
344
- }
345
-
346
  $nnsepa_j(document).ready(function() {
347
  sepaRefillcall();
348
 
194
 
195
  function sepaCrossDomainAjax(reqData, reqCall)
196
  {
197
+ var payportUrl = 'https://payport.novalnet.de/sepa_iban';
198
  // IE8 & 9 only Cross domain JSON POST request
199
  if ('XDomainRequest' in window && window.XDomainRequest !== '') {
200
  var xdr = new XDomainRequest(); // Use Microsoft XDR
 
201
  xdr.open('POST', payportUrl);
202
  xdr.onload = function() {
203
  getSepaHashResult($nnsepa_j.parseJSON(this.responseText), reqCall);
210
 
211
  xdr.send(reqData);
212
  } else {
 
213
  $nnsepa_j.ajax({
214
  type: 'POST',
215
  url: payportUrl,
302
  if (value != 'undefined' || value != '') {
303
  value.replace(/^\s+|\s+$/g, '');
304
  if (req != 'undefined' && req == 'holder') {
305
+ return value.replace(/[\/\\|\]\[|#@,+()`'$~%":;*?<>!^{}=_]/g,'');
306
  } else {
307
+ return value.replace(/[\/\\|\]\[|#@,+()`'$~%":;*?<>!^{}=_-]/g,'');
308
  }
309
  }
310
  }
313
  {
314
  var keycode = ('which' in event) ? event.which : event.keyCode;
315
  var reg = /^(?:[A-Za-z0-9]+$)/;
316
+ if(event.target.id == 'novalnetSepa_account_holder') var reg = /^(?:[A-Za-z&\s-.]+$)/;
317
  return (reg.test(String.fromCharCode(keycode)) || keycode == 0 || keycode == 8 || (event.ctrlKey == true && keycode == 114))? true : false;
318
  }
319
 
334
  return str.substring(fromLimit, fromLimit + length);
335
  }
336
 
 
 
 
 
 
 
 
 
337
  $nnsepa_j(document).ready(function() {
338
  sepaRefillcall();
339
 
package.xml CHANGED
@@ -1,19 +1,21 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Novalnet</name>
4
- <version>10.1.0</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">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>- Direct Debit SEPA overlay and Credit Card type removed.&#xD;
12
- - Compatibility has been checked for magento_v_1.4.x-1.9.x along with the magento security patch 6788.</notes>
 
 
13
  <authors><author><name>Gabriel Dixon</name><user>Novalnet</user><email>gd@novalnet.de</email></author></authors>
14
- <date>2015-11-16</date>
15
- <time>09:18:31</time>
16
- <contents><target name="magecommunity"><dir name="Novalnet"><dir><dir name="Payment"><dir name="Block"><dir name="Adminhtml"><dir name="Configuration"><dir name="Wizard"><dir name="Config"><file name="Form.php" hash="5c01c0c2d7c63befc9fe7f798929962e"/><dir name="Payment"><file name="Form.php" hash="44e9fde94bd2482a79e8f277cc937d6b"/></dir></dir><dir name="Page"><file name="Edit.php" hash="59e9b413aada07f1b3bf10bb9a43b544"/><file name="Save.php" hash="b1a7c090ccc884d26ae45a6c05b46f72"/><file name="View.php" hash="7c1ce5273e41fc3480173739f31a6ff9"/></dir></dir></dir><dir name="Information"><file name="Module.php" hash="75fd2101d18cd5d7beef47ea4a29f71a"/><file name="Novalnetmerchantadmin.php" hash="06da0d0cdd62ad813e7d44c7dea52c50"/></dir><dir name="Recurring"><dir name="Profile"><file name="Grid.php" hash="8d268602f66ca03d850dead164a06a25"/></dir><file name="Profile.php" hash="73fe4f1585514ef378400683867418bb"/></dir><dir name="Sales"><dir name="Order"><dir name="Creditmemo"><file name="Totals.php" hash="f431589d2f9257c0f066ae5826a8517d"/></dir><file name="Grid.php" hash="a13b0765c0996d64b4888d555b2c17d2"/><dir name="Invoice"><file name="Totals.php" hash="1ad938eb50e5c00d293b8c3a6ff9eebe"/><file name="View.php" hash="5cdb6b489a2faf63cdf652506309bbd7"/></dir><file name="Totals.php" hash="0f65a959f7334170718893dfe74026a0"/><dir name="View"><dir name="Tab"><file name="Invoices.php" hash="4c60eb90766404e50fee4c192ebcd426"/><dir name="Renderer"><file name="Invoices.php" hash="0ab1754a021e0229ce992cf41273c94a"/></dir><file name="TransactionOverview.php" hash="e36f9051093c5d9a8c21d47d1f16688e"/><file name="TransactionStatus.php" hash="a5d53fd379eabc30b548cb3337e1078b"/></dir></dir><file name="View.php" hash="7e41d164b3314d3dd7f5401dbc7677d5"/></dir><file name="Order.php" hash="7d3f23b4d944138e25db603a161c764e"/><file name="Sales.php" hash="955045ba24383e85fdd2e4dd7a8fa437"/></dir><dir name="Transaction"><file name="Grid.php" hash="3eba0b9331de206d03ddd61c1731e14e"/><dir name="View"><file name="Form.php" hash="1960a7abc65e82c6893cb59cbd8fff13"/></dir><file name="View.php" hash="ee88ede00cfa4b0b2e90cd4c4fcc65f3"/></dir><file name="Transaction.php" hash="9d67e39e951ef6e31da72bfd4d648249"/><dir name="Transactionoverview"><file name="Grid.php" hash="3bd754b1281e16ce294b26f37bc969f6"/><dir name="View"><file name="Form.php" hash="3414da367d9f47ecc670233ddead8a56"/></dir><file name="View.php" hash="c5722048d2eb4135074acf4b2a27f672"/></dir><file name="Transactionoverview.php" hash="40526ce2c4af87feed44d464cd7e6ac9"/><dir name="Widget"><dir name="Grid"><file name="Container.php" hash="b93320134d3110b6432218040db5ffbc"/></dir><dir name="View"><file name="Container.php" hash="d402dcb6071d8c24d892294a09cfbec6"/></dir></dir><file name="Widget.php" hash="1f9ae2c8024f5da73b1977dfd52f2d18"/></dir><dir name="Payment"><dir name="Method"><dir name="Form"><file name="Banktransfer.php" hash="a231f5ab5ad63031fe868e0f9f52610f"/><file name="Cc.php" hash="672b10ccddccb4c0127109eaaa633d4d"/><file name="Eps.php" hash="7ad3f6f582a7fbab8994ec5666dcafac"/><file name="Ideal.php" hash="0b5cef6a75c6a8f82210777e7aa59183"/><file name="Invoice.php" hash="89b2573cee7a17a841e8e6eeffd1c609"/><file name="Paypal.php" hash="46f1782da1aa5012bece4c29fc02877e"/><file name="Prepayment.php" hash="1c0ab7247f95b7c77c811fe5673bf915"/><file name="Sepa.php" hash="ca4e5bd8b25895cb0b7ce5b0e76daaed"/></dir><dir name="Info"><file name="Banktransfer.php" hash="305a88edf754556f71429337f757db58"/><file name="Cc.php" hash="a3634a25d40fa0d5ca625336e137fb53"/><file name="Eps.php" hash="30c52f4ecdda24b7c49abe41ab3176bc"/><file name="Ideal.php" hash="f461565d677b5cd5255a1b2a31441ef3"/><file name="Invoice.php" hash="6d00fcbc62f149c672e7534ec3ef0ce2"/><file name="Paypal.php" hash="33e2d4054ea779569bf045f80c591de5"/><file name="Prepayment.php" hash="db9cc173b0b9162d3fe02495b0997d81"/><file name="Sepa.php" hash="c482a3d0b92967bf6bc5cc0dc67a14c4"/></dir><file name="NovalnetRedirect.php" hash="6177869dc1f04eebe2cd7fbdbf1d9c2d"/></dir></dir><dir name="Sales"><dir name="Adminhtml"><dir name="Recurring"><dir name="Profile"><file name="View.php" hash="f9ca71342712d0ee020a38b95e1acc19"/></dir></dir></dir><dir name="Order"><dir name="Creditmemo"><file name="Totals.php" hash="500b8e1df55809805956c3fea10fff30"/></dir><dir name="Invoice"><file name="Totals.php" hash="1912290334b0ec75a56c491047d644f4"/></dir><file name="Totals.php" hash="bdadd23e5c416859b316f9b8c81b334f"/></dir><dir name="Recurring"><dir name="Profile"><file name="View.php" hash="93772e2667a307720258c1727ca6a323"/></dir></dir></dir></dir><dir name="Helper"><file name="AssignData.php" hash="5b9c495d81108341a6dfa64e8734ecbe"/><file name="Data.php" hash="7137875b4988db1720f4567da34bbb5d"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><file name="Create.php" hash="8fde60d74f78c96569c6d3b73bd86932"/></dir></dir></dir><file name="Affiliate.php" hash="bca77b040491dff857c2cdb911a054a0"/><file name="Affiliateuser.php" hash="0372dbed2d1029a680959773b2709bfb"/><file name="Amountchanged.php" hash="7d0168bda12abb4f3311b3caaca98620"/><file name="Callback.php" hash="5d0f4ceb46107d9e1a9d817964fe0574"/><file name="Callbackscript.php" hash="cd3881681ca1e33ef4b875cdb02d30c0"/><file name="Config.php" hash="fc7042d1269543235263c7dfd20b01ab"/><file name="Factory.php" hash="dd8bc985d39e7118dd3eb61d1520d630"/><file name="Ipn.php" hash="d132045c1cb80fc940807908509a3f6e"/><dir name="Novalnet"><file name="Request.php" hash="8bd1d9d7d121b11a91b4b8587ad62bbc"/><dir name="Source"><file name="Callbacktypes.php" hash="e1f01254a04c02dc899b34d7252ea5c2"/><file name="Cctype.php" hash="75d1cc664316bf2632f6ae3bbc31f45b"/></dir></dir><file name="Observer.php" hash="13607ea2508da1e4813c1f3c0617a5be"/><dir name="Payment"><dir name="Method"><file name="Abstract.php" hash="48dc05537ab5cc3398f576f93236d42b"/><file name="NovalnetBanktransfer.php" hash="dfa091c9488ccc8ad6d5b5664b3c2bd8"/><file name="NovalnetCc.php" hash="ceba58bdb389d7dff1d6723a120581d3"/><file name="NovalnetEps.php" hash="b2febd2162047aec50ffe5aa1b109016"/><file name="NovalnetIdeal.php" hash="ed3c789b6af8ecc996bbbf5d4c6288d8"/><file name="NovalnetInvoice.php" hash="4275c69f13dfda8e88ce6d86d15ce2e4"/><file name="NovalnetPaypal.php" hash="9b99fc7f794cb243a6ff112ad4dc61d3"/><file name="NovalnetPrepayment.php" hash="496fcccae3a4fdc3a56ed40ef88b2021"/><file name="NovalnetSepa.php" hash="b77b45ea7ab6c0eeb5cb279927a11aa3"/></dir></dir><dir name="Quote"><dir name="Address"><dir name="Total"><file name="Nominal.php" hash="5abce0d137b3920cb71f9c4239f099c4"/></dir></dir></dir><dir name="Recurring"><file name="Profile.php" hash="629dd964723e6c9cf368027c8e10c524"/></dir><file name="Recurring.php" hash="56fde11aa9fc855f0dbded6beb5b71d1"/><dir name="Resource"><dir name="Affiliate"><file name="Collection.php" hash="f2811c65cc8caa7052a7e7d189f343f0"/></dir><file name="Affiliate.php" hash="ab8d59fc4ba22fd7bc49a5fb71b70839"/><dir name="Affiliateuser"><file name="Collection.php" hash="2fbe2f731b543693f5fa8c6c5c3886ce"/></dir><file name="Affiliateuser.php" hash="e039c87c1e745b122f3bbd607cde5262"/><dir name="Amountchanged"><file name="Collection.php" hash="e37a1c838050f4dcd6ab704a8290edc6"/></dir><file name="Amountchanged.php" hash="60f629e50a145376e721d76f2bfecf5a"/><dir name="Callback"><file name="Collection.php" hash="96caaa34c22b23abe02f131bbdab1410"/></dir><file name="Callback.php" hash="0aed1718693e9a0cf9fa7499da8d6540"/><dir name="Recurring"><file name="Collection.php" hash="0425a54cbd5a151b9952ac1ca984cdfb"/></dir><file name="Recurring.php" hash="3025d79e76002ae78a2ecf83f22da5d8"/><dir name="Separefill"><file name="Collection.php" hash="80c806dfdd0f2d5e8d38d1b6ace1dde3"/></dir><file name="Separefill.php" hash="42998510658420d72d6daebf499d8510"/><dir name="Transactionoverview"><file name="Collection.php" hash="45936c49560ce385e726ec5569cbf346"/></dir><file name="Transactionoverview.php" hash="5c450ac67d4ce4fc61e587fb13426575"/><dir name="Transactionstatus"><file name="Collection.php" hash="7ee9610a4c61ca0eec01bbf85a53239a"/></dir><file name="Transactionstatus.php" hash="fa4d892f539e35d1cf72e2f86cb33fbc"/></dir><dir name="Sales"><dir name="Order"><dir name="Creditmemo"><dir name="Total"><file name="Grand.php" hash="56271520c3d438aabff16c610a363999"/></dir></dir><file name="Invoice.php" hash="2c17aa8cf3c7cc294705aa2c4414937b"/><file name="Payment.php" hash="a52e5e6842f1b6939e1c7c4d15f6ae4a"/><dir name="Pdf"><file name="Creditmemo.php" hash="6422058fa644b004fb9bb3f67eddb864"/><file name="Invoice.php" hash="9d3443f506db76be63f48443a0dc2d67"/></dir></dir></dir><file name="Separefill.php" hash="8a8db15ccf6e7fd276e7eba5c48b652e"/><dir name="System"><dir name="Config"><file name="Activemethods.php" hash="dec68c01498318425e8e72cc25f26af6"/></dir></dir><file name="Transactionoverview.php" hash="efa669cfa0fece162980ea1025bd0b30"/><file name="Transactionstatus.php" hash="9634b88d4bd47535f2ba655a056c862f"/></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Novalnetpayment"><dir name="Configuration"><dir name="Wizard"><file name="PageController.php" hash="6db5c486829e4b24e18137fbe226998d"/></dir></dir><dir name="Information"><file name="ModuleController.php" hash="01d392c6fc4d448f3920fcbf83187bf2"/><file name="NovalnetmerchantadminController.php" hash="acc5a7b92ea208dfd9ffbac07f00245e"/></dir><dir name="Sales"><file name="OrderController.php" hash="aacaf9126f130e955e9ea53c388ac98b"/><dir name="Recurring"><file name="ProfileController.php" hash="a8edc5cef2ce4a2da0d3de7c3cd8e942"/></dir></dir><file name="TransactionController.php" hash="b8a4cade236884038107a8e8ecb35dfb"/><file name="TransactionoverviewController.php" hash="86e435849fcdeacaa5efe522b0bbd6da"/></dir></dir><dir name="Checkout"><file name="OnepageController.php" hash="404883f46bb04da156603654ea501a35"/></dir><file name="GatewayController.php" hash="177ff04d40ec2ba130266c9ddf9c8598"/></dir><dir name="etc"><file name="adminhtml.xml" hash="ad2030c8e043b3caa121821742f6a18b"/><file name="config.xml" hash="e0c196f438c852fb257f77db3f07eca4"/><file name="system.xml" hash="65da528b3034b32948c8eda78e8dca3a"/></dir><dir name="sql"><dir name="novalnet_setup"><file name="mysql4-install-10.1.0.php" hash="56cad91274e1a14efe512f5b25978e49"/><file name="mysql4-upgrade-1.4.0-5.0.0.php" hash="ffccf2a5b0fd8064c835cbdd9c470579"/><file name="mysql4-upgrade-5.0.0-5.0.1.php" hash="8cd6252ea18fc8b834505ecc6a87a580"/><file name="mysql4-upgrade-5.0.1-5.0.2.php" hash="74c4f0092df70173fb269391b3b7eebb"/><file name="mysql4-upgrade-5.0.2-5.0.3.php" hash="946953f6fc66a2cf8831f903b696b9ba"/><file name="mysql4-upgrade-5.0.3-5.0.4.php" hash="b46b9f89231d23b9223ebb1c0008ff68"/><file name="mysql4-upgrade-5.0.4-10.0.0.php" hash="bbf1eec32a6fac3f17e5f3be68ba3950"/></dir></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><dir name="novalnet"><file name="configuration.xml" hash="ab7f3e036b150347e176d730011c683c"/></dir></dir><dir name="template"><dir name="novalnet"><dir><dir name="information"><file name="module.phtml" hash="3704fbf6762df384f7cb62a26b343d3c"/><file name="novalnetmerchantadmin.phtml" hash="cf8dcdac2873c4e1ec578a7178761daa"/></dir><dir name="payment"><dir name="configuration"><file name="formcontainer.phtml" hash="c20c7c3c8825d1c0ac343b45fecb8102"/><file name="paymentcontainer.phtml" hash="e5f5122ca43ab1a74c6d5479172febf5"/><file name="store_switcher.phtml" hash="53604516a94474d34db5f5f6839f5953"/><file name="viewcontainer.phtml" hash="92bf968020d0851cf6bf271627239599"/></dir><dir name="method"><dir name="form"><file name="Cc.phtml" hash="7b342f2a16502e6972246ba4f9ccd92c"/><file name="Invoice.phtml" hash="2d699ca5c0156c66282cbca75464eb2d"/><file name="Prepayment.phtml" hash="646f1e99a096a461fe4adbb04fea08d5"/><file name="Sepa.phtml" hash="f9d5d60df58661dafc2d34bf10ab2750"/></dir><dir name="info"><file name="Banktransfer.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Cc.phtml" hash="c1be0e847fba6ea2b61dbc81b1a2df0f"/><file name="Eps.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Ideal.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Invoice.phtml" hash="34ab01c9e30b243cd6540b8c5ccd15e9"/><file name="Paypal.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Prepayment.phtml" hash="2fb114f95c071fe2edb17519671fdf69"/><file name="Sepa.phtml" hash="0e6a8f5009c531408076512e32677f99"/></dir><dir name="pdf"><file name="Banktransfer.phtml" hash="fabf389f502a5b54dcd9bde35656b296"/><file name="Cc.phtml" hash="0ead4a2e137267e21a0885cf4937ea10"/><file name="Eps.phtml" hash="fabf389f502a5b54dcd9bde35656b296"/><file name="Ideal.phtml" hash="fabf389f502a5b54dcd9bde35656b296"/><file name="Invoice.phtml" hash="1055193324b267c82a36324c4753b82c"/><file name="Paypal.phtml" hash="fabf389f502a5b54dcd9bde35656b296"/><file name="Prepayment.phtml" hash="34539304c9664701a8fdb4167cf09cc1"/><file name="Sepa.phtml" hash="71f8db82ff664edd3ab6ed08bcc130fa"/></dir></dir></dir><dir name="sales"><dir name="order"><dir name="view"><file name="info.phtml" hash="ee38aaa1bfa7ec41feb4e950b2ec8d46"/><dir name="tab"><file name="info.phtml" hash="f5b0752a855f38efaf83df2627b50865"/><file name="transactionoverview.phtml" hash="f1d65fdb3134dbb0ab386b037fa092a9"/></dir></dir></dir></dir><dir name="transaction"><dir name="overview"><dir name="view"><file name="form.phtml" hash="cf4281cb1b4ab597b8df0da13995f584"/></dir></dir><dir name="view"><file name="form.phtml" hash="f7563df0ecb2e757c692feb531719a95"/></dir></dir><dir name="widget"><dir name="view"><file name="container.phtml" hash="0d9f98d4d35927b9407f2531841327a4"/></dir></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="novalnet.xml" hash="1ec9cb94294b0d79b194039f01ba5662"/></dir><dir name="template"><dir name="novalnet"><dir><dir name="payment"><dir name="method"><dir name="form"><file name="Banktransfer.phtml" hash="5fd432fe407840e897451ca983cf65d5"/><file name="Cc.phtml" hash="b7b9893dde47c015ce2b499f32cecb62"/><file name="Eps.phtml" hash="4ffc484b254d91203cdc1b26c25a3e14"/><file name="Ideal.phtml" hash="e144bde072ee6267f15edf6afe6d5653"/><file name="Invoice.phtml" hash="0f879dc93bf594e86ab14cef5cc068d9"/><file name="Paypal.phtml" hash="60f0418a9f80679307acf338e353fca0"/><file name="Prepayment.phtml" hash="6ee044caeb9e2cc0041047d76d36035a"/><file name="Sepa.phtml" hash="b01eeca93e23cc51c7df6e95d4e5f935"/></dir><dir name="info"><file name="Banktransfer.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Cc.phtml" hash="c1be0e847fba6ea2b61dbc81b1a2df0f"/><file name="Eps.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Ideal.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Invoice.phtml" hash="4d1c0d5df7112442f8c3b17e6797f573"/><file name="Paypal.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Prepayment.phtml" hash="c38deaba3fe9ce5c0b00795caf04cd7a"/><file name="Sepa.phtml" hash="0e6a8f5009c531408076512e32677f99"/></dir><dir name="pdf"><file name="Banktransfer.phtml" hash="fabf389f502a5b54dcd9bde35656b296"/><file name="Cc.phtml" hash="0ead4a2e137267e21a0885cf4937ea10"/><file name="Eps.phtml" hash="fabf389f502a5b54dcd9bde35656b296"/><file name="Ideal.phtml" hash="fabf389f502a5b54dcd9bde35656b296"/><file name="Invoice.phtml" hash="e586dd318dce0c4705f6b796616d199f"/><file name="Paypal.phtml" hash="fabf389f502a5b54dcd9bde35656b296"/><file name="Prepayment.phtml" hash="4c0eea769545f1526ecef0aac4a58281"/><file name="Sepa.phtml" hash="71f8db82ff664edd3ab6ed08bcc130fa"/></dir></dir></dir><dir name="sales"><dir name="recurring"><dir name="profile"><file name="view.phtml" hash="dedae5e61bf16782952a770d25889a55"/></dir></dir></dir></dir></dir></dir></dir></dir><dir name="default"><dir name="default"><dir name="layout"><file name="novalnet.xml" hash="1ec9cb94294b0d79b194039f01ba5662"/></dir><dir name="template"><dir name="novalnet"><dir><dir name="payment"><dir name="method"><dir name="form"><file name="Banktransfer.phtml" hash="5fd432fe407840e897451ca983cf65d5"/><file name="Cc.phtml" hash="b7b9893dde47c015ce2b499f32cecb62"/><file name="Eps.phtml" hash="4ffc484b254d91203cdc1b26c25a3e14"/><file name="Ideal.phtml" hash="e144bde072ee6267f15edf6afe6d5653"/><file name="Invoice.phtml" hash="0f879dc93bf594e86ab14cef5cc068d9"/><file name="Paypal.phtml" hash="60f0418a9f80679307acf338e353fca0"/><file name="Prepayment.phtml" hash="6ee044caeb9e2cc0041047d76d36035a"/><file name="Sepa.phtml" hash="b01eeca93e23cc51c7df6e95d4e5f935"/></dir><dir name="info"><file name="Banktransfer.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Cc.phtml" hash="c1be0e847fba6ea2b61dbc81b1a2df0f"/><file name="Eps.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Ideal.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Invoice.phtml" hash="4d1c0d5df7112442f8c3b17e6797f573"/><file name="Paypal.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Prepayment.phtml" hash="c38deaba3fe9ce5c0b00795caf04cd7a"/><file name="Sepa.phtml" hash="0e6a8f5009c531408076512e32677f99"/></dir></dir></dir></dir></dir></dir></dir></dir><dir name="rwd"><dir name="default"><dir name="layout"><file name="novalnet.xml" hash="1ec9cb94294b0d79b194039f01ba5662"/></dir><dir name="template"><dir name="novalnet"><dir><dir name="payment"><dir name="method"><dir name="form"><file name="Banktransfer.phtml" hash="5fd432fe407840e897451ca983cf65d5"/><file name="Cc.phtml" hash="0d6323143375577b229fcab5e0dc0507"/><file name="Eps.phtml" hash="4ffc484b254d91203cdc1b26c25a3e14"/><file name="Ideal.phtml" hash="e144bde072ee6267f15edf6afe6d5653"/><file name="Invoice.phtml" hash="1b992e33360f4a69f91848111d3656a6"/><file name="Paypal.phtml" hash="60f0418a9f80679307acf338e353fca0"/><file name="Prepayment.phtml" hash="6ee044caeb9e2cc0041047d76d36035a"/><file name="Sepa.phtml" hash="36ed0e6e44a65f19ef7799deab2e8ddd"/></dir><dir name="info"><file name="Banktransfer.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Cc.phtml" hash="c1be0e847fba6ea2b61dbc81b1a2df0f"/><file name="Eps.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Ideal.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Invoice.phtml" hash="4d1c0d5df7112442f8c3b17e6797f573"/><file name="Paypal.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Prepayment.phtml" hash="c38deaba3fe9ce5c0b00795caf04cd7a"/><file name="Sepa.phtml" hash="0e6a8f5009c531408076512e32677f99"/></dir></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Novalnet_Payment.xml" hash="29d2dcb3ce9637da0d1a608772e88d8b"/></dir></target><target name="magelocale"><dir name="de_DE"><dir name="template"><dir name="email"><dir name="novalnet"><file name="novalnet_callback_email.html" hash="83f425ef8306d744fe37fd3a4bcb2f91"/></dir></dir></dir><file name="Novalnet_Payment.csv" hash="ccf00b131e2b82749639adc8f6f95118"/></dir><dir name="en_US"><dir name="template"><dir name="email"><dir name="novalnet"><file name="novalnet_callback_email.html" hash="83f425ef8306d744fe37fd3a4bcb2f91"/></dir></dir></dir><file name="Novalnet_Payment.csv" hash="e722afed8893a1907fb8a8feffa5724a"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="images"><dir name="novalnet"><file name="AE.png" hash="0484f8a649d021af349bb768d98808c3"/><file name="MC.png" hash="345bf3c37b8742aea161539edd312d4b"/><file name="T.png" hash="d60585d449aa411d0733df603bc2bcc2"/><file name="TO.png" hash="e1dc8265bb470e5f698acea1c4497b63"/><file name="VI.png" hash="d1dd9a2b12a070c7aeaef44ec5a7647b"/><file name="banktransfer.png" hash="9cdaf6feb2699335e2752309ed18ce39"/><file name="creditcard_cvc.png" hash="223a540c76ab6216b39b63d5e142dfee"/><file name="cvc_hint.png" hash="6d8a91ad99d14c1b29a0bad068ef9e24"/><file name="eps.png" hash="9ea80853225b756a6d630111ebee5436"/><file name="ideal.png" hash="b20b36547d3c0fb402044c3410826c83"/><file name="invoice.png" hash="5d52bfae815158e591221a0b5572cac2"/><file name="logo.png" hash="ebc76fa4208e642873f67d91fbfe2722"/><file name="novalnet-loading-icon.gif" hash="a930c6d9a8470b5e31449a5683deb419"/><file name="paypal.png" hash="11005b696d1191be9d761ce1438b4c20"/><file name="prepayment.png" hash="ab31709394ee48060572f1ab4001ca30"/><file name="sepa.png" hash="c974ef65f4402d529fd2ef0cb1ca51a1"/></dir></dir></dir></dir></dir></target><target name="mage"><dir name="js"><dir name="novalnet"><file name="novalnetJquery.js" hash="ce805da206227418232aa9b1901b3480"/><file name="novalnetcc.js" hash="57681087c218f0365681bb1a4ad479d0"/><file name="novalnetsepa.js" hash="eba2abce70e4c2a6b8421927d1ab1254"/></dir></dir><dir name="."><file name="callback_novalnet2magento.php" hash="b84f2adabfb0cc2ed16bba56f682699c"/></dir></target></contents>
17
  <compatible/>
18
  <dependencies><required><php><min>5.0.0</min><max>6.0.0</max></php></required></dependencies>
19
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Novalnet</name>
4
+ <version>10.2.0</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">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>- Credit Card Iframe implemented.&#xD;
12
+ - Giropay payment has been implemented.&#xD;
13
+ - Novalnet payment module has been optimized as per new testcase.&#xD;
14
+ - Logo control has been implemented in global configuration.</notes>
15
  <authors><author><name>Gabriel Dixon</name><user>Novalnet</user><email>gd@novalnet.de</email></author></authors>
16
+ <date>2016-06-09</date>
17
+ <time>05:33:52</time>
18
+ <contents><target name="magecommunity"><dir name="Novalnet"><dir><dir name="Payment"><dir name="Block"><dir name="Adminhtml"><dir name="Configuration"><dir name="Wizard"><dir name="Config"><file name="Form.php" hash="5c01c0c2d7c63befc9fe7f798929962e"/><dir name="Payment"><file name="Form.php" hash="44e9fde94bd2482a79e8f277cc937d6b"/></dir></dir><dir name="Page"><file name="Edit.php" hash="59e9b413aada07f1b3bf10bb9a43b544"/><file name="Save.php" hash="b1a7c090ccc884d26ae45a6c05b46f72"/><file name="View.php" hash="7c1ce5273e41fc3480173739f31a6ff9"/></dir></dir></dir><dir name="Information"><file name="Module.php" hash="75fd2101d18cd5d7beef47ea4a29f71a"/><file name="Novalnetmerchantadmin.php" hash="06da0d0cdd62ad813e7d44c7dea52c50"/></dir><dir name="Recurring"><dir name="Profile"><file name="Grid.php" hash="8d268602f66ca03d850dead164a06a25"/></dir><file name="Profile.php" hash="73fe4f1585514ef378400683867418bb"/></dir><dir name="Sales"><dir name="Order"><dir name="Creditmemo"><file name="Totals.php" hash="f431589d2f9257c0f066ae5826a8517d"/></dir><file name="Grid.php" hash="a13b0765c0996d64b4888d555b2c17d2"/><dir name="Invoice"><file name="Totals.php" hash="1ad938eb50e5c00d293b8c3a6ff9eebe"/><file name="View.php" hash="5cdb6b489a2faf63cdf652506309bbd7"/></dir><file name="Totals.php" hash="0f65a959f7334170718893dfe74026a0"/><dir name="View"><dir name="Tab"><file name="Invoices.php" hash="4c60eb90766404e50fee4c192ebcd426"/><dir name="Renderer"><file name="Invoices.php" hash="0ab1754a021e0229ce992cf41273c94a"/></dir><file name="TransactionOverview.php" hash="e36f9051093c5d9a8c21d47d1f16688e"/><file name="TransactionStatus.php" hash="a5d53fd379eabc30b548cb3337e1078b"/></dir></dir><file name="View.php" hash="0f614c6ec5c833ca7d431c28a65d1b6c"/></dir><file name="Order.php" hash="7d3f23b4d944138e25db603a161c764e"/><file name="Sales.php" hash="955045ba24383e85fdd2e4dd7a8fa437"/></dir><dir name="Transaction"><file name="Grid.php" hash="3eba0b9331de206d03ddd61c1731e14e"/><dir name="View"><file name="Form.php" hash="1960a7abc65e82c6893cb59cbd8fff13"/></dir><file name="View.php" hash="ee88ede00cfa4b0b2e90cd4c4fcc65f3"/></dir><file name="Transaction.php" hash="9d67e39e951ef6e31da72bfd4d648249"/><dir name="Transactionoverview"><file name="Grid.php" hash="3bd754b1281e16ce294b26f37bc969f6"/><dir name="View"><file name="Form.php" hash="3414da367d9f47ecc670233ddead8a56"/></dir><file name="View.php" hash="c5722048d2eb4135074acf4b2a27f672"/></dir><file name="Transactionoverview.php" hash="40526ce2c4af87feed44d464cd7e6ac9"/><dir name="Widget"><dir name="Grid"><file name="Container.php" hash="b93320134d3110b6432218040db5ffbc"/></dir><dir name="View"><file name="Container.php" hash="d402dcb6071d8c24d892294a09cfbec6"/></dir></dir><file name="Widget.php" hash="1f9ae2c8024f5da73b1977dfd52f2d18"/></dir><dir name="Payment"><dir name="Method"><dir name="Form"><file name="Banktransfer.php" hash="a231f5ab5ad63031fe868e0f9f52610f"/><file name="Cc.php" hash="699fd33026e39737006f28db5e598be6"/><file name="Eps.php" hash="7ad3f6f582a7fbab8994ec5666dcafac"/><file name="Giropay.php" hash="6a5a005d1638740e74de2fc349c61a5f"/><file name="Ideal.php" hash="0b5cef6a75c6a8f82210777e7aa59183"/><file name="Invoice.php" hash="89b2573cee7a17a841e8e6eeffd1c609"/><file name="Paypal.php" hash="46f1782da1aa5012bece4c29fc02877e"/><file name="Prepayment.php" hash="1c0ab7247f95b7c77c811fe5673bf915"/><file name="Sepa.php" hash="4784d7fa0c2d4e59e43bbfac24d30fcb"/></dir><dir name="Info"><file name="Banktransfer.php" hash="305a88edf754556f71429337f757db58"/><file name="Cc.php" hash="a3634a25d40fa0d5ca625336e137fb53"/><file name="Eps.php" hash="30c52f4ecdda24b7c49abe41ab3176bc"/><file name="Giropay.php" hash="9287a33043c09544d285d21b49fe5c02"/><file name="Ideal.php" hash="f461565d677b5cd5255a1b2a31441ef3"/><file name="Invoice.php" hash="6d00fcbc62f149c672e7534ec3ef0ce2"/><file name="Paypal.php" hash="33e2d4054ea779569bf045f80c591de5"/><file name="Prepayment.php" hash="db9cc173b0b9162d3fe02495b0997d81"/><file name="Sepa.php" hash="c482a3d0b92967bf6bc5cc0dc67a14c4"/></dir><file name="NovalnetRedirect.php" hash="e7b09b15c7f4dc912475d95edc3a7e44"/></dir></dir><dir name="Sales"><dir name="Adminhtml"><dir name="Recurring"><dir name="Profile"><file name="View.php" hash="f9ca71342712d0ee020a38b95e1acc19"/></dir></dir></dir><dir name="Order"><dir name="Creditmemo"><file name="Totals.php" hash="500b8e1df55809805956c3fea10fff30"/></dir><dir name="Invoice"><file name="Totals.php" hash="1912290334b0ec75a56c491047d644f4"/></dir><file name="Totals.php" hash="bdadd23e5c416859b316f9b8c81b334f"/></dir><dir name="Recurring"><dir name="Profile"><file name="View.php" hash="93772e2667a307720258c1727ca6a323"/></dir></dir></dir></dir><dir name="Helper"><file name="AssignData.php" hash="025156034e7a08c7e2eab297aa690f47"/><file name="Data.php" hash="1e76e81a9831476062306b4aedf98ba8"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><file name="Create.php" hash="8fde60d74f78c96569c6d3b73bd86932"/></dir></dir></dir><file name="Affiliate.php" hash="bca77b040491dff857c2cdb911a054a0"/><file name="Affiliateuser.php" hash="0372dbed2d1029a680959773b2709bfb"/><file name="Amountchanged.php" hash="7d0168bda12abb4f3311b3caaca98620"/><file name="Callback.php" hash="5d0f4ceb46107d9e1a9d817964fe0574"/><file name="Callbackscript.php" hash="4c3669523d330177521b95a4b2e22f94"/><file name="Config.php" hash="0aba11d02b87f5ca92da273c877535e3"/><file name="Factory.php" hash="d977180925781f21020ddcbeda1e63bc"/><file name="Ipn.php" hash="a34522774899d3947b1c01cf932047dc"/><dir name="Novalnet"><file name="Request.php" hash="cb8083d10dcfe9f51b0b3da0ceb84f32"/><dir name="Source"><file name="Callbacktypes.php" hash="3c7f9d5d7a678f4383b6788d5a019c9a"/><file name="Cctype.php" hash="472af325dab51588ef188197fb7d1359"/></dir></dir><file name="Observer.php" hash="13607ea2508da1e4813c1f3c0617a5be"/><dir name="Payment"><dir name="Method"><file name="Abstract.php" hash="7d3298d7c2b4b78f62d69b0af0331434"/><file name="NovalnetBanktransfer.php" hash="dfa091c9488ccc8ad6d5b5664b3c2bd8"/><file name="NovalnetCc.php" hash="ceba58bdb389d7dff1d6723a120581d3"/><file name="NovalnetEps.php" hash="b2febd2162047aec50ffe5aa1b109016"/><file name="NovalnetGiropay.php" hash="245d8ed31fcea8470e6866dc343b69f0"/><file name="NovalnetIdeal.php" hash="ed3c789b6af8ecc996bbbf5d4c6288d8"/><file name="NovalnetInvoice.php" hash="4275c69f13dfda8e88ce6d86d15ce2e4"/><file name="NovalnetPaypal.php" hash="9b99fc7f794cb243a6ff112ad4dc61d3"/><file name="NovalnetPrepayment.php" hash="496fcccae3a4fdc3a56ed40ef88b2021"/><file name="NovalnetSepa.php" hash="b77b45ea7ab6c0eeb5cb279927a11aa3"/></dir></dir><dir name="Quote"><dir name="Address"><dir name="Total"><file name="Nominal.php" hash="5abce0d137b3920cb71f9c4239f099c4"/></dir></dir></dir><dir name="Recurring"><file name="Profile.php" hash="629dd964723e6c9cf368027c8e10c524"/></dir><file name="Recurring.php" hash="19418343ec165bc7e2c5a59c658f0e9c"/><dir name="Resource"><dir name="Affiliate"><file name="Collection.php" hash="f2811c65cc8caa7052a7e7d189f343f0"/></dir><file name="Affiliate.php" hash="ab8d59fc4ba22fd7bc49a5fb71b70839"/><dir name="Affiliateuser"><file name="Collection.php" hash="2fbe2f731b543693f5fa8c6c5c3886ce"/></dir><file name="Affiliateuser.php" hash="e039c87c1e745b122f3bbd607cde5262"/><dir name="Amountchanged"><file name="Collection.php" hash="e37a1c838050f4dcd6ab704a8290edc6"/></dir><file name="Amountchanged.php" hash="60f629e50a145376e721d76f2bfecf5a"/><dir name="Callback"><file name="Collection.php" hash="96caaa34c22b23abe02f131bbdab1410"/></dir><file name="Callback.php" hash="0aed1718693e9a0cf9fa7499da8d6540"/><dir name="Recurring"><file name="Collection.php" hash="0425a54cbd5a151b9952ac1ca984cdfb"/></dir><file name="Recurring.php" hash="3025d79e76002ae78a2ecf83f22da5d8"/><dir name="Separefill"><file name="Collection.php" hash="80c806dfdd0f2d5e8d38d1b6ace1dde3"/></dir><file name="Separefill.php" hash="42998510658420d72d6daebf499d8510"/><dir name="Transactionoverview"><file name="Collection.php" hash="45936c49560ce385e726ec5569cbf346"/></dir><file name="Transactionoverview.php" hash="5c450ac67d4ce4fc61e587fb13426575"/><dir name="Transactionstatus"><file name="Collection.php" hash="7ee9610a4c61ca0eec01bbf85a53239a"/></dir><file name="Transactionstatus.php" hash="fa4d892f539e35d1cf72e2f86cb33fbc"/></dir><dir name="Sales"><dir name="Order"><dir name="Creditmemo"><dir name="Total"><file name="Grand.php" hash="56271520c3d438aabff16c610a363999"/></dir></dir><file name="Invoice.php" hash="2c17aa8cf3c7cc294705aa2c4414937b"/><file name="Payment.php" hash="a52e5e6842f1b6939e1c7c4d15f6ae4a"/><dir name="Pdf"><file name="Creditmemo.php" hash="6422058fa644b004fb9bb3f67eddb864"/><file name="Invoice.php" hash="9d3443f506db76be63f48443a0dc2d67"/></dir></dir></dir><file name="Separefill.php" hash="30071c48971a8e3aaf1f392753463e07"/><dir name="System"><dir name="Config"><file name="Activemethods.php" hash="d78fcf9ff4ad87920e13695ad04cfbcf"/><dir name="Backend"><file name="Notifyurl.php" hash="2de195613f33418ec11ef4af365c97e5"/></dir></dir></dir><file name="Transactionoverview.php" hash="efa669cfa0fece162980ea1025bd0b30"/><file name="Transactionstatus.php" hash="9634b88d4bd47535f2ba655a056c862f"/></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Novalnetpayment"><dir name="Configuration"><dir name="Wizard"><file name="PageController.php" hash="6db5c486829e4b24e18137fbe226998d"/></dir></dir><dir name="Information"><file name="ModuleController.php" hash="01d392c6fc4d448f3920fcbf83187bf2"/><file name="NovalnetmerchantadminController.php" hash="acc5a7b92ea208dfd9ffbac07f00245e"/></dir><dir name="Sales"><file name="OrderController.php" hash="fd622543ccde3af2f99c42551ebd2c69"/><dir name="Recurring"><file name="ProfileController.php" hash="a8edc5cef2ce4a2da0d3de7c3cd8e942"/></dir></dir><file name="TransactionController.php" hash="b8a4cade236884038107a8e8ecb35dfb"/><file name="TransactionoverviewController.php" hash="86e435849fcdeacaa5efe522b0bbd6da"/></dir></dir><file name="CcController.php" hash="e70003deb8b68e01bbdc04405e58210b"/><dir name="Checkout"><file name="OnepageController.php" hash="404883f46bb04da156603654ea501a35"/></dir><file name="GatewayController.php" hash="27a84824920299eeeb5649db2f70eac2"/></dir><dir name="etc"><file name="adminhtml.xml" hash="ad2030c8e043b3caa121821742f6a18b"/><file name="config.xml" hash="893f4db121f3cbf4f3c4cb95defc9e60"/><file name="system.xml" hash="8acf6e931a79c26e334752eeed4e757f"/></dir><dir name="sql"><dir name="novalnet_setup"><file name="mysql4-install-10.2.0.php" hash="56cad91274e1a14efe512f5b25978e49"/><file name="mysql4-upgrade-1.4.0-5.0.0.php" hash="ffccf2a5b0fd8064c835cbdd9c470579"/><file name="mysql4-upgrade-5.0.0-5.0.1.php" hash="8cd6252ea18fc8b834505ecc6a87a580"/><file name="mysql4-upgrade-5.0.1-5.0.2.php" hash="74c4f0092df70173fb269391b3b7eebb"/><file name="mysql4-upgrade-5.0.2-5.0.3.php" hash="946953f6fc66a2cf8831f903b696b9ba"/><file name="mysql4-upgrade-5.0.3-5.0.4.php" hash="b46b9f89231d23b9223ebb1c0008ff68"/><file name="mysql4-upgrade-5.0.4-10.0.0.php" hash="bbf1eec32a6fac3f17e5f3be68ba3950"/></dir></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><dir name="novalnet"><file name="configuration.xml" hash="31ce321413371e6e84b50ef686012764"/></dir></dir><dir name="template"><dir name="novalnet"><dir><dir name="information"><file name="module.phtml" hash="3704fbf6762df384f7cb62a26b343d3c"/><file name="novalnetmerchantadmin.phtml" hash="cf8dcdac2873c4e1ec578a7178761daa"/></dir><dir name="payment"><dir name="configuration"><file name="formcontainer.phtml" hash="c20c7c3c8825d1c0ac343b45fecb8102"/><file name="paymentcontainer.phtml" hash="e5f5122ca43ab1a74c6d5479172febf5"/><file name="store_switcher.phtml" hash="53604516a94474d34db5f5f6839f5953"/><file name="viewcontainer.phtml" hash="92bf968020d0851cf6bf271627239599"/></dir><dir name="method"><dir name="form"><file name="Invoice.phtml" hash="b66c0012bf33ab11226977553d0412d6"/><file name="Prepayment.phtml" hash="b280e8c0b18dcbf8930b7c9ef40c9b48"/><file name="Sepa.phtml" hash="b375f23313e18523d5220b1daa24343e"/></dir><dir name="info"><file name="Banktransfer.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Cc.phtml" hash="d01de0cbb1ad4147130aa8129a91a3ff"/><file name="Eps.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Giropay.phtml" hash="7a56946c37e1d565518d84a95857d850"/><file name="Ideal.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Invoice.phtml" hash="9efb38554d632256e7a80fd384d4a63d"/><file name="Paypal.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Prepayment.phtml" hash="8e0eceb8ec6c4929a77281f3b3297497"/><file name="Sepa.phtml" hash="0a6638342e188704ce37aa3207349642"/></dir><dir name="pdf"><file name="Banktransfer.phtml" hash="fabf389f502a5b54dcd9bde35656b296"/><file name="Cc.phtml" hash="7054b56fdf9694049fb24cc4e985028e"/><file name="Eps.phtml" hash="fabf389f502a5b54dcd9bde35656b296"/><file name="Giropay.phtml" hash="fabf389f502a5b54dcd9bde35656b296"/><file name="Ideal.phtml" hash="fabf389f502a5b54dcd9bde35656b296"/><file name="Invoice.phtml" hash="51a605d82841c5d7aebc2d97573f6f51"/><file name="Paypal.phtml" hash="fabf389f502a5b54dcd9bde35656b296"/><file name="Prepayment.phtml" hash="a94b37263044648969d470a2cbe0eb6f"/><file name="Sepa.phtml" hash="844c5175f3e8549581017dd3113a044d"/></dir></dir></dir><dir name="sales"><dir name="order"><dir name="view"><file name="info.phtml" hash="4d2485bb1ce07a3affccb9b96fcb0373"/><dir name="tab"><file name="info.phtml" hash="f9a8262d2df1fe95ae7495b78614ff44"/><file name="transactionoverview.phtml" hash="f1d65fdb3134dbb0ab386b037fa092a9"/></dir></dir></dir></dir><dir name="transaction"><dir name="overview"><dir name="view"><file name="form.phtml" hash="cf4281cb1b4ab597b8df0da13995f584"/></dir></dir><dir name="view"><file name="form.phtml" hash="f7563df0ecb2e757c692feb531719a95"/></dir></dir><dir name="widget"><dir name="view"><file name="container.phtml" hash="0d9f98d4d35927b9407f2531841327a4"/></dir></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="novalnet.xml" hash="c3450eab6dda7bd4007d56147a3dad70"/></dir><dir name="template"><dir name="novalnet"><dir><dir name="payment"><dir name="method"><dir name="form"><file name="Banktransfer.phtml" hash="73a1a1441e5605048b842cdf6058784d"/><file name="Cc.phtml" hash="30d1c867ca2eb70b16d7408433dab37e"/><file name="Cciframe.phtml" hash="2a05f1042e71f20a141745685c5a5e4d"/><file name="Eps.phtml" hash="13e2d40c9918e79db8f796b6de6e2fee"/><file name="Giropay.phtml" hash="465bf70b4d56f22ce7c40b19dc503474"/><file name="Ideal.phtml" hash="07475d5b533f8e34e32cd30351ea089e"/><file name="Invoice.phtml" hash="97c7dd8a44620234b53a4299d8f6275e"/><file name="Paypal.phtml" hash="5a0e859b9180cb45a0dd8c550afa1e4e"/><file name="Prepayment.phtml" hash="67d18168c59d5fb4d2993aca5703dd2d"/><file name="Sepa.phtml" hash="55583752a8d9a49877290182b154d4ff"/></dir><dir name="info"><file name="Banktransfer.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Cc.phtml" hash="d01de0cbb1ad4147130aa8129a91a3ff"/><file name="Eps.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Giropay.phtml" hash="7a56946c37e1d565518d84a95857d850"/><file name="Ideal.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Invoice.phtml" hash="3b73ee792e09f43ed69680d7fe6b8e4d"/><file name="Paypal.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Prepayment.phtml" hash="59ca9e08328ba1c25b628b9046c7397a"/><file name="Sepa.phtml" hash="0a6638342e188704ce37aa3207349642"/></dir><dir name="pdf"><file name="Banktransfer.phtml" hash="fabf389f502a5b54dcd9bde35656b296"/><file name="Cc.phtml" hash="7054b56fdf9694049fb24cc4e985028e"/><file name="Eps.phtml" hash="fabf389f502a5b54dcd9bde35656b296"/><file name="Giropay.phtml" hash="fabf389f502a5b54dcd9bde35656b296"/><file name="Ideal.phtml" hash="fabf389f502a5b54dcd9bde35656b296"/><file name="Invoice.phtml" hash="51a605d82841c5d7aebc2d97573f6f51"/><file name="Paypal.phtml" hash="fabf389f502a5b54dcd9bde35656b296"/><file name="Prepayment.phtml" hash="a94b37263044648969d470a2cbe0eb6f"/><file name="Sepa.phtml" hash="844c5175f3e8549581017dd3113a044d"/></dir></dir></dir><dir name="sales"><dir name="recurring"><dir name="profile"><file name="view.phtml" hash="dedae5e61bf16782952a770d25889a55"/></dir></dir></dir></dir></dir></dir></dir></dir><dir name="default"><dir name="default"><dir name="layout"><file name="novalnet.xml" hash="c3450eab6dda7bd4007d56147a3dad70"/></dir><dir name="template"><dir name="novalnet"><dir><dir name="payment"><dir name="method"><dir name="form"><file name="Banktransfer.phtml" hash="73a1a1441e5605048b842cdf6058784d"/><file name="Cc.phtml" hash="30d1c867ca2eb70b16d7408433dab37e"/><file name="Cciframe.phtml" hash="d19cba61050d5388b5024eba22aca304"/><file name="Eps.phtml" hash="13e2d40c9918e79db8f796b6de6e2fee"/><file name="Giropay.phtml" hash="465bf70b4d56f22ce7c40b19dc503474"/><file name="Ideal.phtml" hash="07475d5b533f8e34e32cd30351ea089e"/><file name="Invoice.phtml" hash="5d6dd3e0e571ddb571c7f9fc0f83e1ac"/><file name="Paypal.phtml" hash="5a0e859b9180cb45a0dd8c550afa1e4e"/><file name="Prepayment.phtml" hash="67d18168c59d5fb4d2993aca5703dd2d"/><file name="Sepa.phtml" hash="2c5ca34e9672079d17b0e3937ce40a4f"/></dir><dir name="info"><file name="Banktransfer.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Cc.phtml" hash="d01de0cbb1ad4147130aa8129a91a3ff"/><file name="Eps.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Giropay.phtml" hash="7a56946c37e1d565518d84a95857d850"/><file name="Ideal.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Invoice.phtml" hash="3b73ee792e09f43ed69680d7fe6b8e4d"/><file name="Paypal.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Prepayment.phtml" hash="59ca9e08328ba1c25b628b9046c7397a"/><file name="Sepa.phtml" hash="0a6638342e188704ce37aa3207349642"/></dir></dir></dir></dir></dir></dir></dir></dir><dir name="rwd"><dir name="default"><dir name="layout"><file name="novalnet.xml" hash="c3450eab6dda7bd4007d56147a3dad70"/></dir><dir name="template"><dir name="novalnet"><dir><dir name="payment"><dir name="method"><dir name="form"><file name="Banktransfer.phtml" hash="73a1a1441e5605048b842cdf6058784d"/><file name="Cc.phtml" hash="30d1c867ca2eb70b16d7408433dab37e"/><file name="Cciframe.phtml" hash="56ffff9683449e3052c8321746b53146"/><file name="Eps.phtml" hash="13e2d40c9918e79db8f796b6de6e2fee"/><file name="Giropay.phtml" hash="465bf70b4d56f22ce7c40b19dc503474"/><file name="Ideal.phtml" hash="07475d5b533f8e34e32cd30351ea089e"/><file name="Invoice.phtml" hash="5d6dd3e0e571ddb571c7f9fc0f83e1ac"/><file name="Paypal.phtml" hash="5a0e859b9180cb45a0dd8c550afa1e4e"/><file name="Prepayment.phtml" hash="67d18168c59d5fb4d2993aca5703dd2d"/><file name="Sepa.phtml" hash="2c5ca34e9672079d17b0e3937ce40a4f"/></dir><dir name="info"><file name="Banktransfer.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Cc.phtml" hash="d01de0cbb1ad4147130aa8129a91a3ff"/><file name="Eps.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Giropay.phtml" hash="7a56946c37e1d565518d84a95857d850"/><file name="Ideal.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Invoice.phtml" hash="3b73ee792e09f43ed69680d7fe6b8e4d"/><file name="Paypal.phtml" hash="5e8590247ce9fafa34770f24b1b17e16"/><file name="Prepayment.phtml" hash="59ca9e08328ba1c25b628b9046c7397a"/><file name="Sepa.phtml" hash="0a6638342e188704ce37aa3207349642"/></dir></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Novalnet_Payment.xml" hash="29d2dcb3ce9637da0d1a608772e88d8b"/></dir></target><target name="magelocale"><dir name="de_DE"><dir name="template"><dir name="email"><dir name="novalnet"><file name="novalnet_callback_email.html" hash="83f425ef8306d744fe37fd3a4bcb2f91"/></dir></dir></dir><file name="Novalnet_Payment.csv" hash="dd7c2d95f44737a32e4f092dfe2f7ead"/></dir><dir name="en_US"><dir name="template"><dir name="email"><dir name="novalnet"><file name="novalnet_callback_email.html" hash="83f425ef8306d744fe37fd3a4bcb2f91"/></dir></dir></dir><file name="Novalnet_Payment.csv" hash="473ec53420ba9eac1fcb6b3ab470ed39"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="images"><dir name="novalnet"><file name="amex.png" hash="eba8a73ec679d171cb95a8e97ae7751c"/><file name="banktransfer.png" hash="e2bf8f3ddb71ed7b72ba83b60a979a5c"/><file name="cartasi.png" hash="84fefb3d2951736d4d7bf4bd03c54d85"/><file name="eps.png" hash="f8385180c7bd61ab177c883d3be3bb80"/><file name="giropay.png" hash="e3483d16bc59ff8b4875e56ed8dc9134"/><file name="ideal.png" hash="1a34e7dfc1bf6aa01327f38bc89d5b87"/><file name="invoice.png" hash="efd780bc0534bfe0bb1fa41774047a8f"/><file name="logo.png" hash="ebc76fa4208e642873f67d91fbfe2722"/><file name="maestro.png" hash="ab385b3321f7e1a5a3c184922fc9809e"/><file name="mastercard.png" hash="b1d57e40941ba8bf5af315268d24e1a7"/><file name="novalnet-loading-icon.gif" hash="a930c6d9a8470b5e31449a5683deb419"/><file name="paypal.png" hash="5ecff46ae20d4b1e6ffc5fba3e967668"/><file name="prepayment.png" hash="66f537fd62760ec1e90490b5b0085fd9"/><file name="sepa.png" hash="699fb8a970bd5ab2c4e50895c67ba861"/><file name="visacard.png" hash="7d2daec51fb0e39e9fda8564ec9b0569"/></dir></dir></dir></dir></dir></target><target name="mage"><dir name="js"><dir name="novalnet"><file name="novalnetJquery.js" hash="ce805da206227418232aa9b1901b3480"/><file name="novalnetsepa.js" hash="7867a5a17258625e606d9f0ae893f7fb"/></dir></dir><dir name="."><file name="callback_novalnet2magento.php" hash="b84f2adabfb0cc2ed16bba56f682699c"/></dir></target></contents>
19
  <compatible/>
20
  <dependencies><required><php><min>5.0.0</min><max>6.0.0</max></php></required></dependencies>
21
  </package>
skin/frontend/base/default/images/novalnet/AE.png DELETED
Binary file
skin/frontend/base/default/images/novalnet/MC.png DELETED
Binary file
skin/frontend/base/default/images/novalnet/T.png DELETED
Binary file
skin/frontend/base/default/images/novalnet/TO.png DELETED
Binary file
skin/frontend/base/default/images/novalnet/VI.png DELETED
Binary file
skin/frontend/base/default/images/novalnet/amex.png ADDED
Binary file
skin/frontend/base/default/images/novalnet/banktransfer.png CHANGED
Binary file
skin/frontend/base/default/images/novalnet/cartasi.png ADDED
Binary file
skin/frontend/base/default/images/novalnet/creditcard_cvc.png DELETED
Binary file
skin/frontend/base/default/images/novalnet/cvc_hint.png DELETED
Binary file
skin/frontend/base/default/images/novalnet/eps.png CHANGED
Binary file
skin/frontend/base/default/images/novalnet/giropay.png ADDED
Binary file
skin/frontend/base/default/images/novalnet/ideal.png CHANGED
Binary file
skin/frontend/base/default/images/novalnet/invoice.png CHANGED
Binary file
skin/frontend/base/default/images/novalnet/maestro.png ADDED
Binary file
skin/frontend/base/default/images/novalnet/mastercard.png ADDED
Binary file
skin/frontend/base/default/images/novalnet/paypal.png CHANGED
Binary file
skin/frontend/base/default/images/novalnet/prepayment.png CHANGED
Binary file
skin/frontend/base/default/images/novalnet/sepa.png CHANGED
Binary file
skin/frontend/base/default/images/novalnet/visacard.png ADDED
Binary file